summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/8080bw.cpp4
-rw-r--r--src/mame/audio/alesis.cpp8
-rw-r--r--src/mame/audio/arcadia.cpp6
-rw-r--r--src/mame/audio/arcadia.h11
-rw-r--r--src/mame/audio/atarijsa.cpp33
-rw-r--r--src/mame/audio/atarijsa.h26
-rw-r--r--src/mame/audio/cage.cpp15
-rw-r--r--src/mame/audio/cage.h17
-rw-r--r--src/mame/audio/cclimber.cpp7
-rw-r--r--src/mame/audio/cclimber.h10
-rw-r--r--src/mame/audio/channelf.cpp4
-rw-r--r--src/mame/audio/channelf.h12
-rw-r--r--src/mame/audio/cinemat.cpp2
-rw-r--r--src/mame/audio/cps3.cpp12
-rw-r--r--src/mame/audio/cps3.h11
-rw-r--r--src/mame/audio/csd.cpp4
-rw-r--r--src/mame/audio/csd.h6
-rw-r--r--src/mame/audio/dai_snd.cpp22
-rw-r--r--src/mame/audio/dai_snd.h11
-rw-r--r--src/mame/audio/dcs.cpp40
-rw-r--r--src/mame/audio/dcs.h36
-rw-r--r--src/mame/audio/decobsmt.cpp17
-rw-r--r--src/mame/audio/decobsmt.h49
-rw-r--r--src/mame/audio/dsbz80.cpp4
-rw-r--r--src/mame/audio/dsbz80.h9
-rw-r--r--src/mame/audio/efo_zsu.cpp32
-rw-r--r--src/mame/audio/efo_zsu.h21
-rw-r--r--src/mame/audio/exidy.cpp20
-rw-r--r--src/mame/audio/exidy.h16
-rw-r--r--src/mame/audio/exidy440.cpp4
-rw-r--r--src/mame/audio/exidy440.h73
-rw-r--r--src/mame/audio/galaxian.cpp8
-rw-r--r--src/mame/audio/galaxian.h13
-rw-r--r--src/mame/audio/gamate.cpp9
-rw-r--r--src/mame/audio/gamate.h (renamed from src/mame/includes/gamate.h)16
-rw-r--r--src/mame/audio/geebee.cpp4
-rw-r--r--src/mame/audio/geebee.h11
-rw-r--r--src/mame/audio/gomoku.cpp14
-rw-r--r--src/mame/audio/gomoku.h73
-rw-r--r--src/mame/audio/gottlieb.cpp23
-rw-r--r--src/mame/audio/gottlieb.h13
-rw-r--r--src/mame/audio/gridlee.cpp4
-rw-r--r--src/mame/audio/harddriv.cpp7
-rw-r--r--src/mame/audio/hyprolyb.cpp16
-rw-r--r--src/mame/audio/hyprolyb.h11
-rw-r--r--src/mame/audio/irem.cpp48
-rw-r--r--src/mame/audio/irem.h28
-rw-r--r--src/mame/audio/leland.cpp43
-rw-r--r--src/mame/audio/leland.h135
-rw-r--r--src/mame/audio/lynx.cpp19
-rw-r--r--src/mame/audio/lynx.h63
-rw-r--r--src/mame/audio/m72.cpp4
-rw-r--r--src/mame/audio/m72.h11
-rw-r--r--src/mame/audio/micro3d.cpp181
-rw-r--r--src/mame/audio/micro3d.h78
-rw-r--r--src/mame/audio/midway.cpp16
-rw-r--r--src/mame/audio/midway.h14
-rw-r--r--src/mame/audio/namco52.cpp4
-rw-r--r--src/mame/audio/namco52.h12
-rw-r--r--src/mame/audio/namco54.cpp4
-rw-r--r--src/mame/audio/namco54.h8
-rw-r--r--src/mame/audio/phoenix.cpp8
-rw-r--r--src/mame/audio/phoenix.h62
-rw-r--r--src/mame/audio/pleiads.cpp23
-rw-r--r--src/mame/audio/pleiads.h89
-rw-r--r--src/mame/audio/polepos.cpp11
-rw-r--r--src/mame/audio/rax.cpp14
-rw-r--r--src/mame/audio/rax.h24
-rw-r--r--src/mame/audio/redbaron.cpp11
-rw-r--r--src/mame/audio/redbaron.h10
-rw-r--r--src/mame/audio/s11c_bg.cpp16
-rw-r--r--src/mame/audio/s11c_bg.h14
-rw-r--r--src/mame/audio/scramble.cpp9
-rw-r--r--src/mame/audio/segag80r.cpp13
-rw-r--r--src/mame/audio/segam1audio.cpp11
-rw-r--r--src/mame/audio/segam1audio.h14
-rw-r--r--src/mame/audio/segasnd.cpp153
-rw-r--r--src/mame/audio/segasnd.h187
-rw-r--r--src/mame/audio/seibu.cpp12
-rw-r--r--src/mame/audio/seibu.h12
-rw-r--r--src/mame/audio/snes_snd.cpp6
-rw-r--r--src/mame/audio/snes_snd.h71
-rw-r--r--src/mame/audio/snk6502.cpp12
-rw-r--r--src/mame/audio/snk6502.h86
-rw-r--r--src/mame/audio/socrates.cpp6
-rw-r--r--src/mame/audio/socrates.h10
-rw-r--r--src/mame/audio/special.cpp10
-rw-r--r--src/mame/audio/special.h14
-rw-r--r--src/mame/audio/svis_snd.cpp65
-rw-r--r--src/mame/audio/svis_snd.h167
-rw-r--r--src/mame/audio/t5182.cpp4
-rw-r--r--src/mame/audio/t5182.h10
-rw-r--r--src/mame/audio/taito_en.cpp4
-rw-r--r--src/mame/audio/taito_en.h9
-rw-r--r--src/mame/audio/taito_zm.cpp4
-rw-r--r--src/mame/audio/taito_zm.h9
-rw-r--r--src/mame/audio/taitosnd.cpp7
-rw-r--r--src/mame/audio/taitosnd.h9
-rw-r--r--src/mame/audio/tiamc1.cpp6
-rw-r--r--src/mame/audio/tiamc1.h67
-rw-r--r--src/mame/audio/timeplt.cpp10
-rw-r--r--src/mame/audio/timeplt.h13
-rw-r--r--src/mame/audio/trackfld.cpp10
-rw-r--r--src/mame/audio/trackfld.h13
-rw-r--r--src/mame/audio/turrett.cpp10
-rw-r--r--src/mame/audio/tvc.cpp4
-rw-r--r--src/mame/audio/tvc.h14
-rw-r--r--src/mame/audio/tx1.cpp16
-rw-r--r--src/mame/audio/vboy.cpp6
-rw-r--r--src/mame/audio/vboy.h91
-rw-r--r--src/mame/audio/vc4000.cpp16
-rw-r--r--src/mame/audio/vc4000.h12
-rw-r--r--src/mame/audio/vicdual-97271p.cpp4
-rw-r--r--src/mame/audio/vicdual-97271p.h8
-rw-r--r--src/mame/audio/warpwarp.cpp4
-rw-r--r--src/mame/audio/warpwarp.h12
-rw-r--r--src/mame/audio/williams.cpp14
-rw-r--r--src/mame/audio/williams.h6
-rw-r--r--src/mame/audio/wiping.cpp10
-rw-r--r--src/mame/audio/wiping.h37
-rw-r--r--src/mame/audio/wpcsnd.cpp20
-rw-r--r--src/mame/audio/wpcsnd.h12
-rw-r--r--src/mame/audio/wswan.cpp4
-rw-r--r--src/mame/audio/wswan.h10
-rw-r--r--src/mame/audio/zaccaria.cpp26
-rw-r--r--src/mame/audio/zaccaria.h43
-rw-r--r--src/mame/drivers/1942.cpp4
-rw-r--r--src/mame/drivers/1943.cpp2
-rw-r--r--src/mame/drivers/1945kiii.cpp15
-rw-r--r--src/mame/drivers/20pacgal.cpp8
-rw-r--r--src/mame/drivers/24cdjuke.cpp4
-rw-r--r--src/mame/drivers/2mindril.cpp2
-rw-r--r--src/mame/drivers/30test.cpp6
-rw-r--r--src/mame/drivers/39in1.cpp16
-rw-r--r--src/mame/drivers/3do.cpp14
-rw-r--r--src/mame/drivers/3x3puzzl.cpp10
-rw-r--r--src/mame/drivers/4004clk.cpp6
-rw-r--r--src/mame/drivers/40love.cpp8
-rw-r--r--src/mame/drivers/4dpi.cpp6
-rw-r--r--src/mame/drivers/4enlinea.cpp10
-rw-r--r--src/mame/drivers/4enraya.cpp6
-rw-r--r--src/mame/drivers/4roses.cpp4
-rw-r--r--src/mame/drivers/5clown.cpp6
-rw-r--r--src/mame/drivers/68ksbc.cpp6
-rw-r--r--src/mame/drivers/8080bw.cpp294
-rw-r--r--src/mame/drivers/88games.cpp8
-rw-r--r--src/mame/drivers/a1supply.cpp10
-rw-r--r--src/mame/drivers/a2600.cpp10
-rw-r--r--src/mame/drivers/a5105.cpp6
-rw-r--r--src/mame/drivers/a51xx.cpp8
-rw-r--r--src/mame/drivers/a6809.cpp24
-rw-r--r--src/mame/drivers/a7150.cpp6
-rw-r--r--src/mame/drivers/a7800.cpp16
-rw-r--r--src/mame/drivers/aa310.cpp4
-rw-r--r--src/mame/drivers/abc1600.cpp14
-rw-r--r--src/mame/drivers/abc80.cpp24
-rw-r--r--src/mame/drivers/abc80x.cpp60
-rw-r--r--src/mame/drivers/ac1.cpp10
-rw-r--r--src/mame/drivers/ace.cpp4
-rw-r--r--src/mame/drivers/aceex.cpp6
-rw-r--r--src/mame/drivers/acefruit.cpp8
-rw-r--r--src/mame/drivers/aces1.cpp96
-rw-r--r--src/mame/drivers/acesp.cpp2
-rw-r--r--src/mame/drivers/acommand.cpp8
-rw-r--r--src/mame/drivers/acrnsys1.cpp6
-rw-r--r--src/mame/drivers/actfancr.cpp18
-rw-r--r--src/mame/drivers/adam.cpp6
-rw-r--r--src/mame/drivers/adp.cpp20
-rw-r--r--src/mame/drivers/advision.cpp6
-rw-r--r--src/mame/drivers/aeroboto.cpp6
-rw-r--r--src/mame/drivers/aerofgt.cpp88
-rw-r--r--src/mame/drivers/agat.cpp8
-rw-r--r--src/mame/drivers/age_candy.cpp4
-rw-r--r--src/mame/drivers/aim65.cpp12
-rw-r--r--src/mame/drivers/aim65_40.cpp6
-rw-r--r--src/mame/drivers/airbustr.cpp10
-rw-r--r--src/mame/drivers/airraid.cpp6
-rw-r--r--src/mame/drivers/ajax.cpp8
-rw-r--r--src/mame/drivers/akaiax80.cpp4
-rw-r--r--src/mame/drivers/albazc.cpp4
-rw-r--r--src/mame/drivers/albazg.cpp4
-rw-r--r--src/mame/drivers/aleck64.cpp22
-rw-r--r--src/mame/drivers/aleisttl.cpp6
-rw-r--r--src/mame/drivers/alesis.cpp12
-rw-r--r--src/mame/drivers/alesis_qs.cpp6
-rw-r--r--src/mame/drivers/alg.cpp20
-rw-r--r--src/mame/drivers/alien.cpp4
-rw-r--r--src/mame/drivers/aliens.cpp16
-rw-r--r--src/mame/drivers/alinvade.cpp4
-rw-r--r--src/mame/drivers/allied.cpp26
-rw-r--r--src/mame/drivers/alpha68k.cpp30
-rw-r--r--src/mame/drivers/alphasma.cpp10
-rw-r--r--src/mame/drivers/alphatro.cpp4
-rw-r--r--src/mame/drivers/altair.cpp8
-rw-r--r--src/mame/drivers/alto2.cpp2
-rw-r--r--src/mame/drivers/altos486.cpp4
-rw-r--r--src/mame/drivers/altos5.cpp10
-rw-r--r--src/mame/drivers/alvg.cpp28
-rw-r--r--src/mame/drivers/amaticmg.cpp2
-rw-r--r--src/mame/drivers/ambush.cpp16
-rw-r--r--src/mame/drivers/amerihok.cpp4
-rw-r--r--src/mame/drivers/amico2k.cpp6
-rw-r--r--src/mame/drivers/amiga.cpp66
-rw-r--r--src/mame/drivers/ampoker2.cpp24
-rw-r--r--src/mame/drivers/ampro.cpp10
-rw-r--r--src/mame/drivers/amspdwy.cpp6
-rw-r--r--src/mame/drivers/amstr_pc.cpp23
-rw-r--r--src/mame/drivers/amstrad.cpp28
-rw-r--r--src/mame/drivers/amusco.cpp8
-rw-r--r--src/mame/drivers/amust.cpp12
-rw-r--r--src/mame/drivers/angelkds.cpp2
-rw-r--r--src/mame/drivers/anzterm.cpp4
-rw-r--r--src/mame/drivers/apc.cpp2
-rw-r--r--src/mame/drivers/apexc.cpp22
-rw-r--r--src/mame/drivers/apf.cpp14
-rw-r--r--src/mame/drivers/apogee.cpp6
-rw-r--r--src/mame/drivers/apollo.cpp28
-rw-r--r--src/mame/drivers/apple1.cpp6
-rw-r--r--src/mame/drivers/apple2.cpp38
-rw-r--r--src/mame/drivers/apple2e.cpp42
-rw-r--r--src/mame/drivers/apple2gs.cpp16
-rw-r--r--src/mame/drivers/apple3.cpp6
-rw-r--r--src/mame/drivers/applix.cpp8
-rw-r--r--src/mame/drivers/appoooh.cpp10
-rw-r--r--src/mame/drivers/apricot.cpp10
-rw-r--r--src/mame/drivers/apricotf.cpp16
-rw-r--r--src/mame/drivers/apricotp.cpp14
-rw-r--r--src/mame/drivers/aquarium.cpp4
-rw-r--r--src/mame/drivers/aquarius.cpp8
-rw-r--r--src/mame/drivers/arabian.cpp6
-rw-r--r--src/mame/drivers/arachnid.cpp8
-rw-r--r--src/mame/drivers/arcadecl.cpp8
-rw-r--r--src/mame/drivers/arcadia.cpp4
-rw-r--r--src/mame/drivers/argo.cpp6
-rw-r--r--src/mame/drivers/argox.cpp6
-rw-r--r--src/mame/drivers/argus.cpp16
-rw-r--r--src/mame/drivers/aristmk4.cpp2
-rw-r--r--src/mame/drivers/aristmk5.cpp2
-rw-r--r--src/mame/drivers/aristmk6.cpp482
-rw-r--r--src/mame/drivers/arkanoid.cpp58
-rw-r--r--src/mame/drivers/armedf.cpp20
-rw-r--r--src/mame/drivers/arsystems.cpp40
-rw-r--r--src/mame/drivers/artmagic.cpp4
-rw-r--r--src/mame/drivers/ashnojoe.cpp4
-rw-r--r--src/mame/drivers/asst128.cpp17
-rw-r--r--src/mame/drivers/asterix.cpp2
-rw-r--r--src/mame/drivers/asteroid.cpp30
-rw-r--r--src/mame/drivers/astinvad.cpp14
-rw-r--r--src/mame/drivers/astrafr.cpp378
-rw-r--r--src/mame/drivers/astrcorp.cpp24
-rw-r--r--src/mame/drivers/astrocde.cpp26
-rw-r--r--src/mame/drivers/astrof.cpp38
-rw-r--r--src/mame/drivers/astrohome.cpp10
-rw-r--r--src/mame/drivers/astropc.cpp2
-rw-r--r--src/mame/drivers/asuka.cpp58
-rw-r--r--src/mame/drivers/at.cpp20
-rw-r--r--src/mame/drivers/atari400.cpp72
-rw-r--r--src/mame/drivers/atari_s1.cpp12
-rw-r--r--src/mame/drivers/atari_s2.cpp10
-rw-r--r--src/mame/drivers/atarifb.cpp16
-rw-r--r--src/mame/drivers/atarig1.cpp8
-rw-r--r--src/mame/drivers/atarig42.cpp2
-rw-r--r--src/mame/drivers/atarigt.cpp19
-rw-r--r--src/mame/drivers/atarigx2.cpp17
-rw-r--r--src/mame/drivers/atarist.cpp90
-rw-r--r--src/mame/drivers/atarisy1.cpp34
-rw-r--r--src/mame/drivers/atarisy2.cpp76
-rw-r--r--src/mame/drivers/atarisy4.cpp4
-rw-r--r--src/mame/drivers/atarittl.cpp72
-rw-r--r--src/mame/drivers/atetris.cpp14
-rw-r--r--src/mame/drivers/atlantis.cpp4
-rw-r--r--src/mame/drivers/atm.cpp12
-rw-r--r--src/mame/drivers/atom.cpp14
-rw-r--r--src/mame/drivers/atpci.cpp11
-rw-r--r--src/mame/drivers/atronic.cpp62
-rw-r--r--src/mame/drivers/attache.cpp6
-rw-r--r--src/mame/drivers/attckufo.cpp6
-rw-r--r--src/mame/drivers/atvtrack.cpp10
-rw-r--r--src/mame/drivers/aussiebyte.cpp6
-rw-r--r--src/mame/drivers/avalnche.cpp8
-rw-r--r--src/mame/drivers/avigo.cpp14
-rw-r--r--src/mame/drivers/avt.cpp12
-rw-r--r--src/mame/drivers/ax20.cpp6
-rw-r--r--src/mame/drivers/aztarac.cpp4
-rw-r--r--src/mame/drivers/b16.cpp6
-rw-r--r--src/mame/drivers/b2m.cpp8
-rw-r--r--src/mame/drivers/babbage.cpp6
-rw-r--r--src/mame/drivers/backfire.cpp2
-rw-r--r--src/mame/drivers/badlands.cpp8
-rw-r--r--src/mame/drivers/bagman.cpp32
-rw-r--r--src/mame/drivers/bailey.cpp8
-rw-r--r--src/mame/drivers/balsente.cpp2
-rw-r--r--src/mame/drivers/banctec.cpp6
-rw-r--r--src/mame/drivers/bankp.cpp6
-rw-r--r--src/mame/drivers/baraduke.cpp2
-rw-r--r--src/mame/drivers/barata.cpp4
-rw-r--r--src/mame/drivers/barni.cpp4
-rw-r--r--src/mame/drivers/bartop52.cpp17
-rw-r--r--src/mame/drivers/basic52.cpp14
-rw-r--r--src/mame/drivers/batman.cpp4
-rw-r--r--src/mame/drivers/battlane.cpp8
-rw-r--r--src/mame/drivers/battlera.cpp12
-rw-r--r--src/mame/drivers/battlex.cpp4
-rw-r--r--src/mame/drivers/battlnts.cpp14
-rw-r--r--src/mame/drivers/bbc.cpp8
-rw-r--r--src/mame/drivers/bbcbc.cpp6
-rw-r--r--src/mame/drivers/bbusters.cpp22
-rw-r--r--src/mame/drivers/bcs3.cpp12
-rw-r--r--src/mame/drivers/beaminv.cpp6
-rw-r--r--src/mame/drivers/beathead.cpp4
-rw-r--r--src/mame/drivers/bebox.cpp10
-rw-r--r--src/mame/drivers/beehive.cpp6
-rw-r--r--src/mame/drivers/beezer.cpp8
-rw-r--r--src/mame/drivers/belatra.cpp16
-rw-r--r--src/mame/drivers/berzerk.cpp14
-rw-r--r--src/mame/drivers/besta.cpp25
-rw-r--r--src/mame/drivers/bestleag.cpp8
-rw-r--r--src/mame/drivers/beta.cpp12
-rw-r--r--src/mame/drivers/bfcobra.cpp2
-rw-r--r--src/mame/drivers/bfm_ad5.cpp2
-rw-r--r--src/mame/drivers/bfm_sc1.cpp4
-rw-r--r--src/mame/drivers/bfm_sc2.cpp16
-rw-r--r--src/mame/drivers/bfm_sc4.cpp60
-rw-r--r--src/mame/drivers/bfm_sc5.cpp2
-rw-r--r--src/mame/drivers/bfm_swp.cpp12
-rw-r--r--src/mame/drivers/bfmsys83.cpp6
-rw-r--r--src/mame/drivers/bfmsys85.cpp4
-rw-r--r--src/mame/drivers/bgt.cpp10
-rw-r--r--src/mame/drivers/big10.cpp6
-rw-r--r--src/mame/drivers/bigbord2.cpp16
-rw-r--r--src/mame/drivers/bigevglf.cpp6
-rw-r--r--src/mame/drivers/bigstrkb.cpp10
-rw-r--r--src/mame/drivers/binbug.cpp28
-rw-r--r--src/mame/drivers/bingo.cpp56
-rw-r--r--src/mame/drivers/bingoc.cpp4
-rw-r--r--src/mame/drivers/bingoman.cpp6
-rw-r--r--src/mame/drivers/bingor.cpp16
-rw-r--r--src/mame/drivers/bionicc.cpp14
-rw-r--r--src/mame/drivers/bishi.cpp10
-rw-r--r--src/mame/drivers/bitgraph.cpp10
-rw-r--r--src/mame/drivers/bk.cpp12
-rw-r--r--src/mame/drivers/bking.cpp8
-rw-r--r--src/mame/drivers/blackt96.cpp8
-rw-r--r--src/mame/drivers/bladestl.cpp14
-rw-r--r--src/mame/drivers/blitz.cpp8
-rw-r--r--src/mame/drivers/blitz68k.cpp34
-rw-r--r--src/mame/drivers/blktiger.cpp14
-rw-r--r--src/mame/drivers/blmbycar.cpp8
-rw-r--r--src/mame/drivers/blockade.cpp16
-rw-r--r--src/mame/drivers/blockhl.cpp6
-rw-r--r--src/mame/drivers/blockout.cpp14
-rw-r--r--src/mame/drivers/bloodbro.cpp12
-rw-r--r--src/mame/drivers/blstroid.cpp2
-rw-r--r--src/mame/drivers/blueprnt.cpp10
-rw-r--r--src/mame/drivers/bmcbowl.cpp4
-rw-r--r--src/mame/drivers/bmcpokr.cpp10
-rw-r--r--src/mame/drivers/bmjr.cpp8
-rw-r--r--src/mame/drivers/bml3.cpp10
-rw-r--r--src/mame/drivers/bnstars.cpp2
-rw-r--r--src/mame/drivers/bntyhunt.cpp4
-rw-r--r--src/mame/drivers/bob85.cpp6
-rw-r--r--src/mame/drivers/bogeyman.cpp4
-rw-r--r--src/mame/drivers/bombjack.cpp8
-rw-r--r--src/mame/drivers/boogwing.cpp6
-rw-r--r--src/mame/drivers/bottom9.cpp8
-rw-r--r--src/mame/drivers/bowltry.cpp4
-rw-r--r--src/mame/drivers/boxer.cpp4
-rw-r--r--src/mame/drivers/bpmmicro.cpp4
-rw-r--r--src/mame/drivers/br8641.cpp4
-rw-r--r--src/mame/drivers/brkthru.cpp8
-rw-r--r--src/mame/drivers/bsktball.cpp4
-rw-r--r--src/mame/drivers/btime.cpp40
-rw-r--r--src/mame/drivers/btoads.cpp4
-rw-r--r--src/mame/drivers/bublbobl.cpp49
-rw-r--r--src/mame/drivers/buggychl.cpp6
-rw-r--r--src/mame/drivers/bullet.cpp15
-rw-r--r--src/mame/drivers/busicom.cpp6
-rw-r--r--src/mame/drivers/buster.cpp4
-rw-r--r--src/mame/drivers/bw12.cpp8
-rw-r--r--src/mame/drivers/bw2.cpp8
-rw-r--r--src/mame/drivers/bwidow.cpp22
-rw-r--r--src/mame/drivers/bwing.cpp2
-rw-r--r--src/mame/drivers/by17.cpp20
-rw-r--r--src/mame/drivers/by35.cpp138
-rw-r--r--src/mame/drivers/by6803.cpp50
-rw-r--r--src/mame/drivers/by68701.cpp10
-rw-r--r--src/mame/drivers/byvid.cpp12
-rw-r--r--src/mame/drivers/bzone.cpp14
-rw-r--r--src/mame/drivers/c10.cpp6
-rw-r--r--src/mame/drivers/c128.cpp42
-rw-r--r--src/mame/drivers/c64.cpp52
-rw-r--r--src/mame/drivers/c64dtv.cpp4
-rw-r--r--src/mame/drivers/c65.cpp2
-rw-r--r--src/mame/drivers/c80.cpp6
-rw-r--r--src/mame/drivers/c900.cpp13
-rw-r--r--src/mame/drivers/cabal.cpp22
-rw-r--r--src/mame/drivers/cabaret.cpp2
-rw-r--r--src/mame/drivers/calchase.cpp8
-rw-r--r--src/mame/drivers/calomega.cpp2
-rw-r--r--src/mame/drivers/calorie.cpp4
-rw-r--r--src/mame/drivers/camplynx.cpp20
-rw-r--r--src/mame/drivers/canon_s80.cpp9
-rw-r--r--src/mame/drivers/canyon.cpp6
-rw-r--r--src/mame/drivers/capbowl.cpp4
-rw-r--r--src/mame/drivers/capcom.cpp2
-rw-r--r--src/mame/drivers/capr1.cpp6
-rw-r--r--src/mame/drivers/caprcyc.cpp4
-rw-r--r--src/mame/drivers/cardline.cpp6
-rw-r--r--src/mame/drivers/carjmbre.cpp4
-rw-r--r--src/mame/drivers/carpolo.cpp2
-rw-r--r--src/mame/drivers/carrera.cpp4
-rw-r--r--src/mame/drivers/casloopy.cpp2
-rw-r--r--src/mame/drivers/castle.cpp8
-rw-r--r--src/mame/drivers/caswin.cpp10
-rw-r--r--src/mame/drivers/cat.cpp4
-rw-r--r--src/mame/drivers/cave.cpp178
-rw-r--r--src/mame/drivers/cavepc.cpp2
-rw-r--r--src/mame/drivers/cb2001.cpp6
-rw-r--r--src/mame/drivers/cball.cpp4
-rw-r--r--src/mame/drivers/cbasebal.cpp4
-rw-r--r--src/mame/drivers/cbm2.cpp42
-rw-r--r--src/mame/drivers/cbuster.cpp6
-rw-r--r--src/mame/drivers/cc40.cpp4
-rw-r--r--src/mame/drivers/ccastles.cpp18
-rw-r--r--src/mame/drivers/cchance.cpp4
-rw-r--r--src/mame/drivers/cchasm.cpp6
-rw-r--r--src/mame/drivers/cclimber.cpp52
-rw-r--r--src/mame/drivers/ccs2810.cpp21
-rw-r--r--src/mame/drivers/ccs300.cpp11
-rw-r--r--src/mame/drivers/cd2650.cpp12
-rw-r--r--src/mame/drivers/cdc721.cpp4
-rw-r--r--src/mame/drivers/cdi.cpp40
-rw-r--r--src/mame/drivers/cedar_magnet.cpp8
-rw-r--r--src/mame/drivers/centiped.cpp32
-rw-r--r--src/mame/drivers/cesclass.cpp10
-rw-r--r--src/mame/drivers/cfx9850.cpp4
-rw-r--r--src/mame/drivers/cgc7900.cpp6
-rw-r--r--src/mame/drivers/cgenie.cpp18
-rw-r--r--src/mame/drivers/chaknpop.cpp6
-rw-r--r--src/mame/drivers/cham24.cpp2
-rw-r--r--src/mame/drivers/champbas.cpp12
-rw-r--r--src/mame/drivers/champbwl.cpp8
-rw-r--r--src/mame/drivers/chanbara.cpp2
-rw-r--r--src/mame/drivers/chance32.cpp8
-rw-r--r--src/mame/drivers/changela.cpp4
-rw-r--r--src/mame/drivers/channelf.cpp26
-rw-r--r--src/mame/drivers/chaos.cpp12
-rw-r--r--src/mame/drivers/cheekyms.cpp4
-rw-r--r--src/mame/drivers/chessmst.cpp14
-rw-r--r--src/mame/drivers/chesstrv.cpp10
-rw-r--r--src/mame/drivers/chexx.cpp6
-rw-r--r--src/mame/drivers/chicago.cpp6
-rw-r--r--src/mame/drivers/chihiro.cpp142
-rw-r--r--src/mame/drivers/chinagat.cpp20
-rw-r--r--src/mame/drivers/chinsan.cpp6
-rw-r--r--src/mame/drivers/chqflag.cpp8
-rw-r--r--src/mame/drivers/chsuper.cpp2
-rw-r--r--src/mame/drivers/cidelsa.cpp16
-rw-r--r--src/mame/drivers/cinemat.cpp48
-rw-r--r--src/mame/drivers/circus.cpp18
-rw-r--r--src/mame/drivers/circusc.cpp2
-rw-r--r--src/mame/drivers/cischeat.cpp28
-rw-r--r--src/mame/drivers/citycon.cpp2
-rw-r--r--src/mame/drivers/clayshoo.cpp4
-rw-r--r--src/mame/drivers/clcd.cpp6
-rw-r--r--src/mame/drivers/cliffhgr.cpp14
-rw-r--r--src/mame/drivers/cloak.cpp18
-rw-r--r--src/mame/drivers/cloud9.cpp6
-rw-r--r--src/mame/drivers/clowndwn.cpp4
-rw-r--r--src/mame/drivers/clpoker.cpp4
-rw-r--r--src/mame/drivers/clshroad.cpp10
-rw-r--r--src/mame/drivers/cm1800.cpp23
-rw-r--r--src/mame/drivers/cmi.cpp9
-rw-r--r--src/mame/drivers/cmmb.cpp4
-rw-r--r--src/mame/drivers/cninja.cpp80
-rw-r--r--src/mame/drivers/cntsteer.cpp10
-rw-r--r--src/mame/drivers/cobra.cpp14
-rw-r--r--src/mame/drivers/coco12.cpp20
-rw-r--r--src/mame/drivers/coco3.cpp10
-rw-r--r--src/mame/drivers/cocoloco.cpp8
-rw-r--r--src/mame/drivers/codata.cpp13
-rw-r--r--src/mame/drivers/coinmstr.cpp10
-rw-r--r--src/mame/drivers/coinmvga.cpp10
-rw-r--r--src/mame/drivers/coleco.cpp16
-rw-r--r--src/mame/drivers/combatsc.cpp18
-rw-r--r--src/mame/drivers/comebaby.cpp4
-rw-r--r--src/mame/drivers/commando.cpp2
-rw-r--r--src/mame/drivers/compgolf.cpp2
-rw-r--r--src/mame/drivers/compis.cpp12
-rw-r--r--src/mame/drivers/compucolor.cpp4
-rw-r--r--src/mame/drivers/comquest.cpp6
-rw-r--r--src/mame/drivers/comx35.cpp18
-rw-r--r--src/mame/drivers/concept.cpp6
-rw-r--r--src/mame/drivers/contra.cpp22
-rw-r--r--src/mame/drivers/coolpool.cpp18
-rw-r--r--src/mame/drivers/coolridr.cpp6
-rw-r--r--src/mame/drivers/cop01.cpp10
-rw-r--r--src/mame/drivers/cops.cpp8
-rw-r--r--src/mame/drivers/copsnrob.cpp4
-rw-r--r--src/mame/drivers/corona.cpp30
-rw-r--r--src/mame/drivers/cortex.cpp6
-rw-r--r--src/mame/drivers/cosmic.cpp32
-rw-r--r--src/mame/drivers/cosmicos.cpp6
-rw-r--r--src/mame/drivers/cp1.cpp6
-rw-r--r--src/mame/drivers/cps1.cpp4
-rw-r--r--src/mame/drivers/cps2.cpp6
-rw-r--r--src/mame/drivers/cps3.cpp16
-rw-r--r--src/mame/drivers/craft.cpp4
-rw-r--r--src/mame/drivers/crbaloon.cpp6
-rw-r--r--src/mame/drivers/crgolf.cpp18
-rw-r--r--src/mame/drivers/crimfght.cpp8
-rw-r--r--src/mame/drivers/crospang.cpp4
-rw-r--r--src/mame/drivers/crshrace.cpp4
-rw-r--r--src/mame/drivers/crvision.cpp32
-rw-r--r--src/mame/drivers/crystal.cpp14
-rw-r--r--src/mame/drivers/csplayh5.cpp2
-rw-r--r--src/mame/drivers/cswat.cpp4
-rw-r--r--src/mame/drivers/ct486.cpp15
-rw-r--r--src/mame/drivers/cubeqst.cpp10
-rw-r--r--src/mame/drivers/cubo.cpp2
-rw-r--r--src/mame/drivers/cultures.cpp8
-rw-r--r--src/mame/drivers/cupidon.cpp18
-rw-r--r--src/mame/drivers/cv1k.cpp2
-rw-r--r--src/mame/drivers/cvicny.cpp6
-rw-r--r--src/mame/drivers/cvs.cpp46
-rw-r--r--src/mame/drivers/cxgz80.cpp6
-rw-r--r--src/mame/drivers/cxhumax.cpp6
-rw-r--r--src/mame/drivers/cyberbal.cpp22
-rw-r--r--src/mame/drivers/cybertnk.cpp2
-rw-r--r--src/mame/drivers/cybiko.cpp12
-rw-r--r--src/mame/drivers/cyclemb.cpp4
-rw-r--r--src/mame/drivers/czk80.cpp12
-rw-r--r--src/mame/drivers/d6800.cpp6
-rw-r--r--src/mame/drivers/d6809.cpp12
-rw-r--r--src/mame/drivers/d9final.cpp4
-rw-r--r--src/mame/drivers/dacholer.cpp10
-rw-r--r--src/mame/drivers/dai.cpp7
-rw-r--r--src/mame/drivers/dai3wksi.cpp4
-rw-r--r--src/mame/drivers/dambustr.cpp8
-rw-r--r--src/mame/drivers/darius.cpp14
-rw-r--r--src/mame/drivers/darkmist.cpp2
-rw-r--r--src/mame/drivers/darkseal.cpp6
-rw-r--r--src/mame/drivers/daruma.cpp6
-rw-r--r--src/mame/drivers/dassault.cpp6
-rw-r--r--src/mame/drivers/datum.cpp6
-rw-r--r--src/mame/drivers/dblcrown.cpp6
-rw-r--r--src/mame/drivers/dblewing.cpp4
-rw-r--r--src/mame/drivers/dbz.cpp8
-rw-r--r--src/mame/drivers/dccons.cpp12
-rw-r--r--src/mame/drivers/dcheese.cpp20
-rw-r--r--src/mame/drivers/dcon.cpp10
-rw-r--r--src/mame/drivers/dct11em.cpp6
-rw-r--r--src/mame/drivers/dday.cpp2
-rw-r--r--src/mame/drivers/ddayjlc.cpp2
-rw-r--r--src/mame/drivers/ddealer.cpp2
-rw-r--r--src/mame/drivers/ddenlovr.cpp142
-rw-r--r--src/mame/drivers/ddragon.cpp20
-rw-r--r--src/mame/drivers/ddragon3.cpp42
-rw-r--r--src/mame/drivers/ddribble.cpp12
-rw-r--r--src/mame/drivers/de_2.cpp70
-rw-r--r--src/mame/drivers/de_3.cpp2
-rw-r--r--src/mame/drivers/de_3b.cpp64
-rw-r--r--src/mame/drivers/deadang.cpp6
-rw-r--r--src/mame/drivers/dec0.cpp28
-rw-r--r--src/mame/drivers/dec8.cpp66
-rw-r--r--src/mame/drivers/deco156.cpp8
-rw-r--r--src/mame/drivers/deco32.cpp40
-rw-r--r--src/mame/drivers/deco_ld.cpp12
-rw-r--r--src/mame/drivers/deco_mlc.cpp4
-rw-r--r--src/mame/drivers/decocass.cpp2
-rw-r--r--src/mame/drivers/dectalk.cpp6
-rw-r--r--src/mame/drivers/decwritr.cpp6
-rw-r--r--src/mame/drivers/deniam.cpp16
-rw-r--r--src/mame/drivers/deshoros.cpp4
-rw-r--r--src/mame/drivers/destroyr.cpp6
-rw-r--r--src/mame/drivers/dfruit.cpp4
-rw-r--r--src/mame/drivers/dgn_beta.cpp6
-rw-r--r--src/mame/drivers/dgpix.cpp2
-rw-r--r--src/mame/drivers/didact.cpp22
-rw-r--r--src/mame/drivers/dietgo.cpp4
-rw-r--r--src/mame/drivers/digel804.cpp10
-rw-r--r--src/mame/drivers/digijet.cpp6
-rw-r--r--src/mame/drivers/dim68k.cpp14
-rw-r--r--src/mame/drivers/discoboy.cpp4
-rw-r--r--src/mame/drivers/divebomb.cpp4
-rw-r--r--src/mame/drivers/diverboy.cpp6
-rw-r--r--src/mame/drivers/djboy.cpp6
-rw-r--r--src/mame/drivers/djmain.cpp2
-rw-r--r--src/mame/drivers/dkong.cpp90
-rw-r--r--src/mame/drivers/dlair.cpp4
-rw-r--r--src/mame/drivers/dlair2.cpp34
-rw-r--r--src/mame/drivers/dm7000.cpp14
-rw-r--r--src/mame/drivers/dmax8000.cpp8
-rw-r--r--src/mame/drivers/dmndrby.cpp8
-rw-r--r--src/mame/drivers/dms5000.cpp6
-rw-r--r--src/mame/drivers/dms86.cpp18
-rw-r--r--src/mame/drivers/dmv.cpp6
-rw-r--r--src/mame/drivers/docastle.cpp58
-rw-r--r--src/mame/drivers/dogfgt.cpp8
-rw-r--r--src/mame/drivers/dolphunk.cpp6
-rw-r--r--src/mame/drivers/dominob.cpp6
-rw-r--r--src/mame/drivers/dooyong.cpp812
-rw-r--r--src/mame/drivers/dorachan.cpp4
-rw-r--r--src/mame/drivers/dotrikun.cpp6
-rw-r--r--src/mame/drivers/dps1.cpp8
-rw-r--r--src/mame/drivers/dragon.cpp26
-rw-r--r--src/mame/drivers/dragrace.cpp4
-rw-r--r--src/mame/drivers/dreambal.cpp4
-rw-r--r--src/mame/drivers/dreamwld.cpp20
-rw-r--r--src/mame/drivers/drgnmst.cpp6
-rw-r--r--src/mame/drivers/dribling.cpp8
-rw-r--r--src/mame/drivers/drmicro.cpp6
-rw-r--r--src/mame/drivers/drtomy.cpp6
-rw-r--r--src/mame/drivers/drw80pkr.cpp4
-rw-r--r--src/mame/drivers/dsb46.cpp8
-rw-r--r--src/mame/drivers/dual68.cpp19
-rw-r--r--src/mame/drivers/dunhuang.cpp6
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp6
-rw-r--r--src/mame/drivers/dvk_ksm.cpp6
-rw-r--r--src/mame/drivers/dwarfd.cpp18
-rw-r--r--src/mame/drivers/dynadice.cpp2
-rw-r--r--src/mame/drivers/dynax.cpp122
-rw-r--r--src/mame/drivers/dynduke.cpp18
-rw-r--r--src/mame/drivers/eacc.cpp6
-rw-r--r--src/mame/drivers/ec184x.cpp16
-rw-r--r--src/mame/drivers/ec65.cpp32
-rw-r--r--src/mame/drivers/ecoinf1.cpp20
-rw-r--r--src/mame/drivers/ecoinf2.cpp24
-rw-r--r--src/mame/drivers/ecoinf3.cpp26
-rw-r--r--src/mame/drivers/ecoinfr.cpp36
-rw-r--r--src/mame/drivers/egghunt.cpp6
-rw-r--r--src/mame/drivers/einstein.cpp50
-rw-r--r--src/mame/drivers/electra.cpp6
-rw-r--r--src/mame/drivers/electron.cpp8
-rw-r--r--src/mame/drivers/elekscmp.cpp6
-rw-r--r--src/mame/drivers/elf.cpp6
-rw-r--r--src/mame/drivers/elwro800.cpp6
-rw-r--r--src/mame/drivers/embargo.cpp4
-rw-r--r--src/mame/drivers/enigma2.cpp10
-rw-r--r--src/mame/drivers/enmirage.cpp59
-rw-r--r--src/mame/drivers/eolith.cpp2
-rw-r--r--src/mame/drivers/eolith16.cpp4
-rw-r--r--src/mame/drivers/ep64.cpp10
-rw-r--r--src/mame/drivers/epos.cpp22
-rw-r--r--src/mame/drivers/eprom.cpp8
-rw-r--r--src/mame/drivers/equites.cpp4
-rw-r--r--src/mame/drivers/ertictac.cpp10
-rw-r--r--src/mame/drivers/esd16.cpp42
-rw-r--r--src/mame/drivers/esh.cpp10
-rw-r--r--src/mame/drivers/espial.cpp8
-rw-r--r--src/mame/drivers/esq1.cpp18
-rw-r--r--src/mame/drivers/esq5505.cpp42
-rw-r--r--src/mame/drivers/esqasr.cpp10
-rw-r--r--src/mame/drivers/esqkt.cpp4
-rw-r--r--src/mame/drivers/esqmr.cpp8
-rw-r--r--src/mame/drivers/esripsys.cpp2
-rw-r--r--src/mame/drivers/et3400.cpp4
-rw-r--r--src/mame/drivers/eti660.cpp10
-rw-r--r--src/mame/drivers/ettrivia.cpp24
-rw-r--r--src/mame/drivers/eurocom2.cpp37
-rw-r--r--src/mame/drivers/europc.cpp9
-rw-r--r--src/mame/drivers/evmbug.cpp14
-rw-r--r--src/mame/drivers/excali64.cpp10
-rw-r--r--src/mame/drivers/exedexes.cpp6
-rw-r--r--src/mame/drivers/exelv.cpp26
-rw-r--r--src/mame/drivers/exerion.cpp2
-rw-r--r--src/mame/drivers/exidy.cpp54
-rw-r--r--src/mame/drivers/exidy440.cpp30
-rw-r--r--src/mame/drivers/exidyttl.cpp12
-rw-r--r--src/mame/drivers/exp85.cpp6
-rw-r--r--src/mame/drivers/expro02.cpp64
-rw-r--r--src/mame/drivers/exprraid.cpp2
-rw-r--r--src/mame/drivers/exterm.cpp4
-rw-r--r--src/mame/drivers/extrema.cpp22
-rw-r--r--src/mame/drivers/exzisus.cpp8
-rw-r--r--src/mame/drivers/f-32.cpp12
-rw-r--r--src/mame/drivers/f1gp.cpp12
-rw-r--r--src/mame/drivers/famibox.cpp4
-rw-r--r--src/mame/drivers/fantland.cpp26
-rw-r--r--src/mame/drivers/fanucs15.cpp6
-rw-r--r--src/mame/drivers/fanucspmg.cpp8
-rw-r--r--src/mame/drivers/fastfred.cpp14
-rw-r--r--src/mame/drivers/fastinvaders.cpp6
-rw-r--r--src/mame/drivers/fastlane.cpp4
-rw-r--r--src/mame/drivers/fb01.cpp6
-rw-r--r--src/mame/drivers/fc100.cpp8
-rw-r--r--src/mame/drivers/fccpu20.cpp28
-rw-r--r--src/mame/drivers/fccpu30.cpp34
-rw-r--r--src/mame/drivers/fcombat.cpp2
-rw-r--r--src/mame/drivers/fcrash.cpp46
-rw-r--r--src/mame/drivers/feversoc.cpp4
-rw-r--r--src/mame/drivers/fgoal.cpp6
-rw-r--r--src/mame/drivers/fidel6502.cpp114
-rw-r--r--src/mame/drivers/fidel68k.cpp20
-rw-r--r--src/mame/drivers/fidelmcs48.cpp6
-rw-r--r--src/mame/drivers/fidelz80.cpp52
-rw-r--r--src/mame/drivers/finalizr.cpp6
-rw-r--r--src/mame/drivers/fireball.cpp6
-rw-r--r--src/mame/drivers/firebeat.cpp4
-rw-r--r--src/mame/drivers/firefox.cpp6
-rw-r--r--src/mame/drivers/firetrap.cpp16
-rw-r--r--src/mame/drivers/firetrk.cpp8
-rw-r--r--src/mame/drivers/fitfight.cpp16
-rw-r--r--src/mame/drivers/fk1.cpp6
-rw-r--r--src/mame/drivers/flicker.cpp6
-rw-r--r--src/mame/drivers/flipjack.cpp4
-rw-r--r--src/mame/drivers/flkatck.cpp8
-rw-r--r--src/mame/drivers/flower.cpp6
-rw-r--r--src/mame/drivers/flstory.cpp20
-rw-r--r--src/mame/drivers/flyball.cpp6
-rw-r--r--src/mame/drivers/fm7.cpp26
-rw-r--r--src/mame/drivers/fmtowns.cpp28
-rw-r--r--src/mame/drivers/foodf.cpp10
-rw-r--r--src/mame/drivers/force68k.cpp26
-rw-r--r--src/mame/drivers/forte2.cpp2
-rw-r--r--src/mame/drivers/fortecar.cpp4
-rw-r--r--src/mame/drivers/fp1100.cpp4
-rw-r--r--src/mame/drivers/fp200.cpp4
-rw-r--r--src/mame/drivers/fp6000.cpp6
-rw-r--r--src/mame/drivers/freekick.cpp38
-rw-r--r--src/mame/drivers/fresh.cpp4
-rw-r--r--src/mame/drivers/fromanc2.cpp10
-rw-r--r--src/mame/drivers/fromance.cpp28
-rw-r--r--src/mame/drivers/fruitpc.cpp4
-rw-r--r--src/mame/drivers/ft68m.cpp15
-rw-r--r--src/mame/drivers/fungames.cpp8
-rw-r--r--src/mame/drivers/funkball.cpp4
-rw-r--r--src/mame/drivers/funkybee.cpp10
-rw-r--r--src/mame/drivers/funkyjet.cpp4
-rw-r--r--src/mame/drivers/funtech.cpp4
-rw-r--r--src/mame/drivers/funworld.cpp144
-rw-r--r--src/mame/drivers/funybubl.cpp8
-rw-r--r--src/mame/drivers/fuukifg2.cpp10
-rw-r--r--src/mame/drivers/fuukifg3.cpp8
-rw-r--r--src/mame/drivers/g627.cpp2
-rw-r--r--src/mame/drivers/gaelco.cpp28
-rw-r--r--src/mame/drivers/gaelco2.cpp22
-rw-r--r--src/mame/drivers/gaelco3d.cpp4
-rw-r--r--src/mame/drivers/gaelcopc.cpp12
-rw-r--r--src/mame/drivers/gaiden.cpp44
-rw-r--r--src/mame/drivers/gal3.cpp12
-rw-r--r--src/mame/drivers/galaga.cpp50
-rw-r--r--src/mame/drivers/galastrm.cpp4
-rw-r--r--src/mame/drivers/galaxi.cpp12
-rw-r--r--src/mame/drivers/galaxia.cpp14
-rw-r--r--src/mame/drivers/galaxian.cpp2
-rw-r--r--src/mame/drivers/galaxold.cpp70
-rw-r--r--src/mame/drivers/galaxy.cpp10
-rw-r--r--src/mame/drivers/galeb.cpp6
-rw-r--r--src/mame/drivers/galgame.cpp2
-rw-r--r--src/mame/drivers/galgames.cpp55
-rw-r--r--src/mame/drivers/galivan.cpp26
-rw-r--r--src/mame/drivers/galpani2.cpp26
-rw-r--r--src/mame/drivers/galpani3.cpp10
-rw-r--r--src/mame/drivers/galpanic.cpp10
-rw-r--r--src/mame/drivers/galspnbl.cpp8
-rw-r--r--src/mame/drivers/gamate.cpp11
-rw-r--r--src/mame/drivers/gambl186.cpp8
-rw-r--r--src/mame/drivers/gamecom.cpp6
-rw-r--r--src/mame/drivers/gamecstl.cpp4
-rw-r--r--src/mame/drivers/gameking.cpp6
-rw-r--r--src/mame/drivers/gameplan.cpp20
-rw-r--r--src/mame/drivers/gamepock.cpp4
-rw-r--r--src/mame/drivers/gammagic.cpp8
-rw-r--r--src/mame/drivers/gamtor.cpp2
-rw-r--r--src/mame/drivers/gaplus.cpp14
-rw-r--r--src/mame/drivers/gatron.cpp10
-rw-r--r--src/mame/drivers/gauntlet.cpp66
-rw-r--r--src/mame/drivers/gb.cpp22
-rw-r--r--src/mame/drivers/gba.cpp6
-rw-r--r--src/mame/drivers/gberet.cpp10
-rw-r--r--src/mame/drivers/gcpinbal.cpp10
-rw-r--r--src/mame/drivers/gei.cpp128
-rw-r--r--src/mame/drivers/geneve.cpp30
-rw-r--r--src/mame/drivers/geniusiq.cpp22
-rw-r--r--src/mame/drivers/genpc.cpp14
-rw-r--r--src/mame/drivers/ggconnie.cpp8
-rw-r--r--src/mame/drivers/ghosteo.cpp8
-rw-r--r--src/mame/drivers/giclassic.cpp12
-rw-r--r--src/mame/drivers/gijoe.cpp10
-rw-r--r--src/mame/drivers/gimix.cpp6
-rw-r--r--src/mame/drivers/ginganin.cpp2
-rw-r--r--src/mame/drivers/gizmondo.cpp2
-rw-r--r--src/mame/drivers/gkigt.cpp22
-rw-r--r--src/mame/drivers/gladiatr.cpp8
-rw-r--r--src/mame/drivers/glasgow.cpp16
-rw-r--r--src/mame/drivers/glass.cpp4
-rw-r--r--src/mame/drivers/globalfr.cpp50
-rw-r--r--src/mame/drivers/globalvr.cpp24
-rw-r--r--src/mame/drivers/gluck2.cpp6
-rw-r--r--src/mame/drivers/gmaster.cpp2
-rw-r--r--src/mame/drivers/gng.cpp24
-rw-r--r--src/mame/drivers/go2000.cpp4
-rw-r--r--src/mame/drivers/goal92.cpp6
-rw-r--r--src/mame/drivers/goindol.cpp4
-rw-r--r--src/mame/drivers/goldngam.cpp8
-rw-r--r--src/mame/drivers/goldnpkr.cpp206
-rw-r--r--src/mame/drivers/goldstar.cpp138
-rw-r--r--src/mame/drivers/gomoku.cpp7
-rw-r--r--src/mame/drivers/good.cpp10
-rw-r--r--src/mame/drivers/goodejan.cpp10
-rw-r--r--src/mame/drivers/gotcha.cpp8
-rw-r--r--src/mame/drivers/gottlieb.cpp8
-rw-r--r--src/mame/drivers/gotya.cpp6
-rw-r--r--src/mame/drivers/goupil.cpp10
-rw-r--r--src/mame/drivers/gp2x.cpp4
-rw-r--r--src/mame/drivers/gp32.cpp4
-rw-r--r--src/mame/drivers/gp_1.cpp22
-rw-r--r--src/mame/drivers/gp_2.cpp32
-rw-r--r--src/mame/drivers/gpworld.cpp4
-rw-r--r--src/mame/drivers/gradius3.cpp10
-rw-r--r--src/mame/drivers/grchamp.cpp4
-rw-r--r--src/mame/drivers/grfd2301.cpp4
-rw-r--r--src/mame/drivers/gridlee.cpp4
-rw-r--r--src/mame/drivers/groundfx.cpp2
-rw-r--r--src/mame/drivers/gstream.cpp14
-rw-r--r--src/mame/drivers/gstriker.cpp8
-rw-r--r--src/mame/drivers/gsword.cpp8
-rw-r--r--src/mame/drivers/gticlub.cpp8
-rw-r--r--src/mame/drivers/gts1.cpp2
-rw-r--r--src/mame/drivers/gts3.cpp2
-rw-r--r--src/mame/drivers/gts3a.cpp80
-rw-r--r--src/mame/drivers/gts80.cpp50
-rw-r--r--src/mame/drivers/gts80a.cpp52
-rw-r--r--src/mame/drivers/gts80b.cpp136
-rw-r--r--src/mame/drivers/guab.cpp14
-rw-r--r--src/mame/drivers/gumbo.cpp18
-rw-r--r--src/mame/drivers/gunbustr.cpp8
-rw-r--r--src/mame/drivers/gundealr.cpp16
-rw-r--r--src/mame/drivers/gunpey.cpp6
-rw-r--r--src/mame/drivers/gunsmoke.cpp14
-rw-r--r--src/mame/drivers/gyruss.cpp8
-rw-r--r--src/mame/drivers/h19.cpp11
-rw-r--r--src/mame/drivers/h8.cpp8
-rw-r--r--src/mame/drivers/h89.cpp6
-rw-r--r--src/mame/drivers/halleys.cpp12
-rw-r--r--src/mame/drivers/hanaawas.cpp4
-rw-r--r--src/mame/drivers/hankin.cpp12
-rw-r--r--src/mame/drivers/hapyfish.cpp5
-rw-r--r--src/mame/drivers/harddriv.cpp268
-rw-r--r--src/mame/drivers/harriet.cpp25
-rw-r--r--src/mame/drivers/hazelgr.cpp4
-rw-r--r--src/mame/drivers/hazeltin.cpp66
-rw-r--r--src/mame/drivers/hcastle.cpp12
-rw-r--r--src/mame/drivers/headonb.cpp4
-rw-r--r--src/mame/drivers/hec2hrp.cpp30
-rw-r--r--src/mame/drivers/hexion.cpp10
-rw-r--r--src/mame/drivers/hh_amis2k.cpp4
-rw-r--r--src/mame/drivers/hh_cop400.cpp46
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp162
-rw-r--r--src/mame/drivers/hh_melps4.cpp10
-rw-r--r--src/mame/drivers/hh_pic16.cpp48
-rw-r--r--src/mame/drivers/hh_sm500.cpp6
-rw-r--r--src/mame/drivers/hh_sm510.cpp38
-rw-r--r--src/mame/drivers/hh_tms1k.cpp270
-rw-r--r--src/mame/drivers/hh_ucom4.cpp88
-rw-r--r--src/mame/drivers/hideseek.cpp2
-rw-r--r--src/mame/drivers/higemaru.cpp4
-rw-r--r--src/mame/drivers/highvdeo.cpp42
-rw-r--r--src/mame/drivers/hikaru.cpp18
-rw-r--r--src/mame/drivers/himesiki.cpp8
-rw-r--r--src/mame/drivers/hitme.cpp14
-rw-r--r--src/mame/drivers/hitpoker.cpp2
-rw-r--r--src/mame/drivers/hk68v10.cpp6
-rw-r--r--src/mame/drivers/hnayayoi.cpp8
-rw-r--r--src/mame/drivers/hng64.cpp2
-rw-r--r--src/mame/drivers/holeland.cpp14
-rw-r--r--src/mame/drivers/homedata.cpp44
-rw-r--r--src/mame/drivers/homelab.cpp18
-rw-r--r--src/mame/drivers/homerun.cpp8
-rw-r--r--src/mame/drivers/homez80.cpp6
-rw-r--r--src/mame/drivers/horizon.cpp8
-rw-r--r--src/mame/drivers/hornet.cpp6
-rw-r--r--src/mame/drivers/hotblock.cpp4
-rw-r--r--src/mame/drivers/hotstuff.cpp4
-rw-r--r--src/mame/drivers/hp16500.cpp16
-rw-r--r--src/mame/drivers/hp48.cpp12
-rw-r--r--src/mame/drivers/hp49gp.cpp2
-rw-r--r--src/mame/drivers/hp64k.cpp1175
-rw-r--r--src/mame/drivers/hp9845.cpp140
-rw-r--r--src/mame/drivers/hp9k.cpp6
-rw-r--r--src/mame/drivers/hp9k_3xx.cpp30
-rw-r--r--src/mame/drivers/hp_ipc.cpp8
-rw-r--r--src/mame/drivers/hprot1.cpp4
-rw-r--r--src/mame/drivers/hpz80unk.cpp12
-rw-r--r--src/mame/drivers/ht68k.cpp10
-rw-r--r--src/mame/drivers/huebler.cpp6
-rw-r--r--src/mame/drivers/hunter2.cpp4
-rw-r--r--src/mame/drivers/hvyunit.cpp10
-rw-r--r--src/mame/drivers/hx20.cpp8
-rw-r--r--src/mame/drivers/hyhoo.cpp6
-rw-r--r--src/mame/drivers/hyperscan.cpp6
-rw-r--r--src/mame/drivers/hyperspt.cpp14
-rw-r--r--src/mame/drivers/hyprduel.cpp8
-rw-r--r--src/mame/drivers/i7000.cpp5
-rw-r--r--src/mame/drivers/ibm3153.cpp6
-rw-r--r--src/mame/drivers/ibm6580.cpp6
-rw-r--r--src/mame/drivers/ibmpc.cpp14
-rw-r--r--src/mame/drivers/ibmpcjr.cpp4
-rw-r--r--src/mame/drivers/icatel.cpp6
-rw-r--r--src/mame/drivers/ice_bozopail.cpp12
-rw-r--r--src/mame/drivers/ice_tbd.cpp8
-rw-r--r--src/mame/drivers/icecold.cpp6
-rw-r--r--src/mame/drivers/ichiban.cpp4
-rw-r--r--src/mame/drivers/idsa.cpp6
-rw-r--r--src/mame/drivers/ie15.cpp6
-rw-r--r--src/mame/drivers/if800.cpp6
-rw-r--r--src/mame/drivers/igs009.cpp6
-rw-r--r--src/mame/drivers/igs011.cpp4
-rw-r--r--src/mame/drivers/igs017.cpp36
-rw-r--r--src/mame/drivers/igs_fear.cpp2
-rw-r--r--src/mame/drivers/igs_m027.cpp4
-rw-r--r--src/mame/drivers/igs_m036.cpp12
-rw-r--r--src/mame/drivers/igspc.cpp6
-rw-r--r--src/mame/drivers/igspoker.cpp6
-rw-r--r--src/mame/drivers/ikki.cpp6
-rw-r--r--src/mame/drivers/imds.cpp12
-rw-r--r--src/mame/drivers/imds2.cpp6
-rw-r--r--src/mame/drivers/imolagp.cpp8
-rw-r--r--src/mame/drivers/imsai.cpp12
-rw-r--r--src/mame/drivers/inder.cpp18
-rw-r--r--src/mame/drivers/inderp.cpp6
-rw-r--r--src/mame/drivers/indiana.cpp10
-rw-r--r--src/mame/drivers/indigo.cpp8
-rw-r--r--src/mame/drivers/indy_indigo2.cpp36
-rw-r--r--src/mame/drivers/instantm.cpp4
-rw-r--r--src/mame/drivers/instruct.cpp6
-rw-r--r--src/mame/drivers/interact.cpp10
-rw-r--r--src/mame/drivers/interpro.cpp4
-rw-r--r--src/mame/drivers/intrscti.cpp2
-rw-r--r--src/mame/drivers/intv.cpp14
-rw-r--r--src/mame/drivers/inufuku.cpp6
-rw-r--r--src/mame/drivers/invqix.cpp6
-rw-r--r--src/mame/drivers/ipc.cpp16
-rw-r--r--src/mame/drivers/ipds.cpp12
-rw-r--r--src/mame/drivers/iq151.cpp6
-rw-r--r--src/mame/drivers/iqblock.cpp2
-rw-r--r--src/mame/drivers/iris3130.cpp4
-rw-r--r--src/mame/drivers/irisha.cpp6
-rw-r--r--src/mame/drivers/irobot.cpp2
-rw-r--r--src/mame/drivers/ironhors.cpp8
-rw-r--r--src/mame/drivers/isbc.cpp40
-rw-r--r--src/mame/drivers/isbc8010.cpp10
-rw-r--r--src/mame/drivers/isbc8030.cpp6
-rw-r--r--src/mame/drivers/iskr103x.cpp8
-rw-r--r--src/mame/drivers/istellar.cpp6
-rw-r--r--src/mame/drivers/istrebiteli.cpp10
-rw-r--r--src/mame/drivers/iteagle.cpp36
-rw-r--r--src/mame/drivers/itech32.cpp2
-rw-r--r--src/mame/drivers/itech8.cpp48
-rw-r--r--src/mame/drivers/itgambl2.cpp44
-rw-r--r--src/mame/drivers/itgambl3.cpp18
-rw-r--r--src/mame/drivers/itgamble.cpp30
-rw-r--r--src/mame/drivers/itt3030.cpp45
-rw-r--r--src/mame/drivers/jack.cpp2
-rw-r--r--src/mame/drivers/jackal.cpp14
-rw-r--r--src/mame/drivers/jackie.cpp2
-rw-r--r--src/mame/drivers/jackpool.cpp4
-rw-r--r--src/mame/drivers/jade.cpp12
-rw-r--r--src/mame/drivers/jaguar.cpp14
-rw-r--r--src/mame/drivers/jailbrek.cpp8
-rw-r--r--src/mame/drivers/jalmah.cpp14
-rw-r--r--src/mame/drivers/jangou.cpp38
-rw-r--r--src/mame/drivers/jankenmn.cpp6
-rw-r--r--src/mame/drivers/jantotsu.cpp6
-rw-r--r--src/mame/drivers/jchan.cpp6
-rw-r--r--src/mame/drivers/jclub2.cpp28
-rw-r--r--src/mame/drivers/jedi.cpp4
-rw-r--r--src/mame/drivers/jeutel.cpp11
-rw-r--r--src/mame/drivers/joctronic.cpp14
-rw-r--r--src/mame/drivers/jokrwild.cpp4
-rw-r--r--src/mame/drivers/jollyjgr.cpp2
-rw-r--r--src/mame/drivers/jongkyo.cpp2
-rw-r--r--src/mame/drivers/jonos.cpp6
-rw-r--r--src/mame/drivers/joystand.cpp6
-rw-r--r--src/mame/drivers/jp.cpp26
-rw-r--r--src/mame/drivers/jpmimpct.cpp38
-rw-r--r--src/mame/drivers/jpmmps.cpp418
-rw-r--r--src/mame/drivers/jpms80.cpp18
-rw-r--r--src/mame/drivers/jpmsru.cpp28
-rw-r--r--src/mame/drivers/jpmsys5.cpp16
-rw-r--r--src/mame/drivers/jpmsys5sw.cpp372
-rw-r--r--src/mame/drivers/jpmsys7.cpp26
-rw-r--r--src/mame/drivers/jr100.cpp8
-rw-r--r--src/mame/drivers/jr200.cpp8
-rw-r--r--src/mame/drivers/jrpacman.cpp2
-rw-r--r--src/mame/drivers/jtc.cpp18
-rw-r--r--src/mame/drivers/jubilee.cpp6
-rw-r--r--src/mame/drivers/juicebox.cpp2
-rw-r--r--src/mame/drivers/jungleyo.cpp6
-rw-r--r--src/mame/drivers/junior.cpp23
-rw-r--r--src/mame/drivers/junofrst.cpp4
-rw-r--r--src/mame/drivers/jupace.cpp6
-rw-r--r--src/mame/drivers/jupiter.cpp16
-rw-r--r--src/mame/drivers/jvh.cpp4
-rw-r--r--src/mame/drivers/k1003.cpp6
-rw-r--r--src/mame/drivers/k28.cpp6
-rw-r--r--src/mame/drivers/k8915.cpp12
-rw-r--r--src/mame/drivers/kaneko16.cpp36
-rw-r--r--src/mame/drivers/kangaroo.cpp10
-rw-r--r--src/mame/drivers/karnov.cpp24
-rw-r--r--src/mame/drivers/kas89.cpp4
-rw-r--r--src/mame/drivers/kaypro.cpp26
-rw-r--r--src/mame/drivers/kc.cpp14
-rw-r--r--src/mame/drivers/kchamp.cpp10
-rw-r--r--src/mame/drivers/kenseim.cpp2
-rw-r--r--src/mame/drivers/kickgoal.cpp12
-rw-r--r--src/mame/drivers/kim1.cpp6
-rw-r--r--src/mame/drivers/kingdrby.cpp12
-rw-r--r--src/mame/drivers/kingobox.cpp12
-rw-r--r--src/mame/drivers/kingpin.cpp6
-rw-r--r--src/mame/drivers/kinst.cpp4
-rw-r--r--src/mame/drivers/kissproto.cpp4
-rw-r--r--src/mame/drivers/klax.cpp16
-rw-r--r--src/mame/drivers/kncljoe.cpp8
-rw-r--r--src/mame/drivers/koftball.cpp8
-rw-r--r--src/mame/drivers/koikoi.cpp4
-rw-r--r--src/mame/drivers/konamigq.cpp6
-rw-r--r--src/mame/drivers/konamigv.cpp36
-rw-r--r--src/mame/drivers/konamigx.cpp2
-rw-r--r--src/mame/drivers/konamim2.cpp6
-rw-r--r--src/mame/drivers/konendev.cpp2
-rw-r--r--src/mame/drivers/konin.cpp6
-rw-r--r--src/mame/drivers/konmedal.cpp4
-rw-r--r--src/mame/drivers/kontest.cpp4
-rw-r--r--src/mame/drivers/kopunch.cpp4
-rw-r--r--src/mame/drivers/kramermc.cpp6
-rw-r--r--src/mame/drivers/kron.cpp6
-rw-r--r--src/mame/drivers/ksayakyu.cpp4
-rw-r--r--src/mame/drivers/ksys573.cpp234
-rw-r--r--src/mame/drivers/kungfur.cpp8
-rw-r--r--src/mame/drivers/kurukuru.cpp14
-rw-r--r--src/mame/drivers/kyocera.cpp28
-rw-r--r--src/mame/drivers/kyugo.cpp42
-rw-r--r--src/mame/drivers/labyrunr.cpp8
-rw-r--r--src/mame/drivers/ladybug.cpp16
-rw-r--r--src/mame/drivers/ladyfrog.cpp8
-rw-r--r--src/mame/drivers/laser3k.cpp6
-rw-r--r--src/mame/drivers/laserbas.cpp8
-rw-r--r--src/mame/drivers/laserbat.cpp18
-rw-r--r--src/mame/drivers/lasso.cpp16
-rw-r--r--src/mame/drivers/lastbank.cpp8
-rw-r--r--src/mame/drivers/lastduel.cpp24
-rw-r--r--src/mame/drivers/lastfght.cpp2
-rw-r--r--src/mame/drivers/laz_aftrshok.cpp8
-rw-r--r--src/mame/drivers/laz_awetoss.cpp6
-rw-r--r--src/mame/drivers/laz_ribrac.cpp6
-rw-r--r--src/mame/drivers/lazercmd.cpp6
-rw-r--r--src/mame/drivers/lb186.cpp21
-rw-r--r--src/mame/drivers/lbeach.cpp4
-rw-r--r--src/mame/drivers/lc80.cpp12
-rw-r--r--src/mame/drivers/lcmate2.cpp6
-rw-r--r--src/mame/drivers/ldplayer.cpp14
-rw-r--r--src/mame/drivers/leapster.cpp6
-rw-r--r--src/mame/drivers/legionna.cpp60
-rw-r--r--src/mame/drivers/leland.cpp6
-rw-r--r--src/mame/drivers/lemmings.cpp6
-rw-r--r--src/mame/drivers/lethal.cpp18
-rw-r--r--src/mame/drivers/lethalj.cpp24
-rw-r--r--src/mame/drivers/lft.cpp17
-rw-r--r--src/mame/drivers/lg-dvd.cpp12
-rw-r--r--src/mame/drivers/lgp.cpp8
-rw-r--r--src/mame/drivers/liberate.cpp4
-rw-r--r--src/mame/drivers/liberatr.cpp6
-rw-r--r--src/mame/drivers/limenko.cpp16
-rw-r--r--src/mame/drivers/lindbergh.cpp40
-rw-r--r--src/mame/drivers/lisa.cpp12
-rw-r--r--src/mame/drivers/littlerb.cpp4
-rw-r--r--src/mame/drivers/lkage.cpp18
-rw-r--r--src/mame/drivers/llc.cpp29
-rw-r--r--src/mame/drivers/lockon.cpp6
-rw-r--r--src/mame/drivers/lola8a.cpp6
-rw-r--r--src/mame/drivers/looping.cpp2
-rw-r--r--src/mame/drivers/lordgun.cpp16
-rw-r--r--src/mame/drivers/lsasquad.cpp10
-rw-r--r--src/mame/drivers/ltcasino.cpp8
-rw-r--r--src/mame/drivers/ltd.cpp4
-rw-r--r--src/mame/drivers/luckgrln.cpp8
-rw-r--r--src/mame/drivers/lucky74.cpp16
-rw-r--r--src/mame/drivers/lvcards.cpp8
-rw-r--r--src/mame/drivers/lviv.cpp6
-rw-r--r--src/mame/drivers/lwings.cpp38
-rw-r--r--src/mame/drivers/lwriter.cpp6
-rw-r--r--src/mame/drivers/lynx.cpp8
-rw-r--r--src/mame/drivers/m10.cpp16
-rw-r--r--src/mame/drivers/m107.cpp14
-rw-r--r--src/mame/drivers/m14.cpp4
-rw-r--r--src/mame/drivers/m20.cpp16
-rw-r--r--src/mame/drivers/m24.cpp15
-rw-r--r--src/mame/drivers/m5.cpp14
-rw-r--r--src/mame/drivers/m52.cpp10
-rw-r--r--src/mame/drivers/m57.cpp6
-rw-r--r--src/mame/drivers/m58.cpp16
-rw-r--r--src/mame/drivers/m62.cpp46
-rw-r--r--src/mame/drivers/m63.cpp4
-rw-r--r--src/mame/drivers/m6805evs.cpp6
-rw-r--r--src/mame/drivers/m68705prg.cpp20
-rw-r--r--src/mame/drivers/m72.cpp66
-rw-r--r--src/mame/drivers/m79152pc.cpp6
-rw-r--r--src/mame/drivers/m79amb.cpp2
-rw-r--r--src/mame/drivers/m90.cpp38
-rw-r--r--src/mame/drivers/m92.cpp4
-rw-r--r--src/mame/drivers/mac.cpp106
-rw-r--r--src/mame/drivers/mac128.cpp2
-rw-r--r--src/mame/drivers/macp.cpp20
-rw-r--r--src/mame/drivers/macpci.cpp6
-rw-r--r--src/mame/drivers/macrossp.cpp2
-rw-r--r--src/mame/drivers/macs.cpp16
-rw-r--r--src/mame/drivers/madalien.cpp8
-rw-r--r--src/mame/drivers/madmotor.cpp6
-rw-r--r--src/mame/drivers/magic10.cpp6
-rw-r--r--src/mame/drivers/magicard.cpp4
-rw-r--r--src/mame/drivers/magicfly.cpp10
-rw-r--r--src/mame/drivers/magictg.cpp6
-rw-r--r--src/mame/drivers/magmax.cpp4
-rw-r--r--src/mame/drivers/magnum.cpp19
-rw-r--r--src/mame/drivers/magtouch.cpp4
-rw-r--r--src/mame/drivers/mainevt.cpp20
-rw-r--r--src/mame/drivers/mainsnk.cpp6
-rw-r--r--src/mame/drivers/majorpkr.cpp4
-rw-r--r--src/mame/drivers/malzak.cpp6
-rw-r--r--src/mame/drivers/manohman.cpp12
-rw-r--r--src/mame/drivers/mappy.cpp78
-rw-r--r--src/mame/drivers/marineb.cpp22
-rw-r--r--src/mame/drivers/marinedt.cpp4
-rw-r--r--src/mame/drivers/mario.cpp12
-rw-r--r--src/mame/drivers/markham.cpp4
-rw-r--r--src/mame/drivers/marywu.cpp6
-rw-r--r--src/mame/drivers/mastboy.cpp10
-rw-r--r--src/mame/drivers/matmania.cpp12
-rw-r--r--src/mame/drivers/maxaflex.cpp22
-rw-r--r--src/mame/drivers/maygay1b.cpp2
-rw-r--r--src/mame/drivers/maygayep.cpp2
-rw-r--r--src/mame/drivers/maygaysw.cpp22
-rw-r--r--src/mame/drivers/maygayv1.cpp2
-rw-r--r--src/mame/drivers/mazerbla.cpp6
-rw-r--r--src/mame/drivers/mbc200.cpp16
-rw-r--r--src/mame/drivers/mbc55x.cpp6
-rw-r--r--src/mame/drivers/mbee.cpp12
-rw-r--r--src/mame/drivers/mc10.cpp14
-rw-r--r--src/mame/drivers/mc1000.cpp6
-rw-r--r--src/mame/drivers/mc1502.cpp8
-rw-r--r--src/mame/drivers/mc80.cpp10
-rw-r--r--src/mame/drivers/mcatadv.cpp14
-rw-r--r--src/mame/drivers/mcb216.cpp18
-rw-r--r--src/mame/drivers/mccpm.cpp12
-rw-r--r--src/mame/drivers/mcr.cpp2
-rw-r--r--src/mame/drivers/mcr3.cpp2
-rw-r--r--src/mame/drivers/mcr68.cpp2
-rw-r--r--src/mame/drivers/meadows.cpp12
-rw-r--r--src/mame/drivers/meadwttl.cpp12
-rw-r--r--src/mame/drivers/mediagx.cpp2
-rw-r--r--src/mame/drivers/megadriv.cpp23
-rw-r--r--src/mame/drivers/megadrvb.cpp6
-rw-r--r--src/mame/drivers/megaphx.cpp2
-rw-r--r--src/mame/drivers/megaplay.cpp16
-rw-r--r--src/mame/drivers/megasys1.cpp34
-rw-r--r--src/mame/drivers/megatech.cpp14
-rw-r--r--src/mame/drivers/megazone.cpp14
-rw-r--r--src/mame/drivers/meijinsn.cpp4
-rw-r--r--src/mame/drivers/mekd2.cpp6
-rw-r--r--src/mame/drivers/mephisto.cpp4
-rw-r--r--src/mame/drivers/mephistp.cpp8
-rw-r--r--src/mame/drivers/merit.cpp52
-rw-r--r--src/mame/drivers/meritm.cpp106
-rw-r--r--src/mame/drivers/mermaid.cpp10
-rw-r--r--src/mame/drivers/mes.cpp8
-rw-r--r--src/mame/drivers/metalmx.cpp2
-rw-r--r--src/mame/drivers/metlclsh.cpp4
-rw-r--r--src/mame/drivers/metlfrzr.cpp2
-rw-r--r--src/mame/drivers/metro.cpp86
-rw-r--r--src/mame/drivers/mexico86.cpp14
-rw-r--r--src/mame/drivers/meyc8080.cpp12
-rw-r--r--src/mame/drivers/meyc8088.cpp4
-rw-r--r--src/mame/drivers/mgames.cpp6
-rw-r--r--src/mame/drivers/mgavegas.cpp16
-rw-r--r--src/mame/drivers/mgolf.cpp4
-rw-r--r--src/mame/drivers/mhavoc.cpp12
-rw-r--r--src/mame/drivers/mice.cpp19
-rw-r--r--src/mame/drivers/micral.cpp6
-rw-r--r--src/mame/drivers/micro20.cpp14
-rw-r--r--src/mame/drivers/micro3d.cpp13
-rw-r--r--src/mame/drivers/microdec.cpp10
-rw-r--r--src/mame/drivers/microkit.cpp6
-rw-r--r--src/mame/drivers/micronic.cpp6
-rw-r--r--src/mame/drivers/micropin.cpp4
-rw-r--r--src/mame/drivers/microtan.cpp6
-rw-r--r--src/mame/drivers/microvsn.cpp4
-rw-r--r--src/mame/drivers/midas.cpp6
-rw-r--r--src/mame/drivers/midqslvr.cpp12
-rw-r--r--src/mame/drivers/midtunit.cpp2
-rw-r--r--src/mame/drivers/midvunit.cpp2
-rw-r--r--src/mame/drivers/midwunit.cpp2
-rw-r--r--src/mame/drivers/midxunit.cpp2
-rw-r--r--src/mame/drivers/midyunit.cpp6
-rw-r--r--src/mame/drivers/midzeus.cpp30
-rw-r--r--src/mame/drivers/mikie.cpp8
-rw-r--r--src/mame/drivers/mikro80.cpp10
-rw-r--r--src/mame/drivers/mikromik.cpp12
-rw-r--r--src/mame/drivers/mikrosha.cpp8
-rw-r--r--src/mame/drivers/mil4000.cpp18
-rw-r--r--src/mame/drivers/mini2440.cpp4
-rw-r--r--src/mame/drivers/miniboy7.cpp8
-rw-r--r--src/mame/drivers/minicom.cpp8
-rw-r--r--src/mame/drivers/miniforce.cpp6
-rw-r--r--src/mame/drivers/minitel_2_rpic.cpp4
-rw-r--r--src/mame/drivers/minivadr.cpp4
-rw-r--r--src/mame/drivers/mirage.cpp6
-rw-r--r--src/mame/drivers/mirax.cpp4
-rw-r--r--src/mame/drivers/missb2.cpp21
-rw-r--r--src/mame/drivers/missile.cpp20
-rw-r--r--src/mame/drivers/mitchell.cpp22
-rw-r--r--src/mame/drivers/mits680b.cpp21
-rw-r--r--src/mame/drivers/mjkjidai.cpp6
-rw-r--r--src/mame/drivers/mjsenpu.cpp4
-rw-r--r--src/mame/drivers/mjsister.cpp4
-rw-r--r--src/mame/drivers/mk1.cpp6
-rw-r--r--src/mame/drivers/mk14.cpp6
-rw-r--r--src/mame/drivers/mk2.cpp6
-rw-r--r--src/mame/drivers/mk85.cpp6
-rw-r--r--src/mame/drivers/mk90.cpp6
-rw-r--r--src/mame/drivers/mkit09.cpp10
-rw-r--r--src/mame/drivers/mlanding.cpp8
-rw-r--r--src/mame/drivers/mmagic.cpp6
-rw-r--r--src/mame/drivers/mmd1.cpp14
-rw-r--r--src/mame/drivers/mmm.cpp4
-rw-r--r--src/mame/drivers/mmodular.cpp52
-rw-r--r--src/mame/drivers/mod8.cpp12
-rw-r--r--src/mame/drivers/model1.cpp28
-rw-r--r--src/mame/drivers/model2.cpp136
-rw-r--r--src/mame/drivers/model3.cpp40
-rw-r--r--src/mame/drivers/modellot.cpp10
-rw-r--r--src/mame/drivers/mogura.cpp4
-rw-r--r--src/mame/drivers/mole.cpp4
-rw-r--r--src/mame/drivers/molecular.cpp4
-rw-r--r--src/mame/drivers/momoko.cpp8
-rw-r--r--src/mame/drivers/monacogp.cpp8
-rw-r--r--src/mame/drivers/monty.cpp8
-rw-r--r--src/mame/drivers/monzagp.cpp6
-rw-r--r--src/mame/drivers/moo.cpp26
-rw-r--r--src/mame/drivers/mosaic.cpp8
-rw-r--r--src/mame/drivers/mouser.cpp4
-rw-r--r--src/mame/drivers/mpf1.cpp12
-rw-r--r--src/mame/drivers/mps1230.cpp8
-rw-r--r--src/mame/drivers/mpu12wbk.cpp4
-rw-r--r--src/mame/drivers/mpu2.cpp6
-rw-r--r--src/mame/drivers/mpu3.cpp80
-rw-r--r--src/mame/drivers/mpu4.cpp2
-rw-r--r--src/mame/drivers/mpu4dealem.cpp4
-rw-r--r--src/mame/drivers/mpu4plasma.cpp16
-rw-r--r--src/mame/drivers/mpu4vid.cpp110
-rw-r--r--src/mame/drivers/mpu5.cpp4
-rw-r--r--src/mame/drivers/mpu5.hxx1260
-rw-r--r--src/mame/drivers/mpz80.cpp6
-rw-r--r--src/mame/drivers/mquake.cpp2
-rw-r--r--src/mame/drivers/mrdo.cpp16
-rw-r--r--src/mame/drivers/mrflea.cpp4
-rw-r--r--src/mame/drivers/mrgame.cpp8
-rw-r--r--src/mame/drivers/mrjong.cpp8
-rw-r--r--src/mame/drivers/ms0515.cpp42
-rw-r--r--src/mame/drivers/ms32.cpp22
-rw-r--r--src/mame/drivers/ms9540.cpp12
-rw-r--r--src/mame/drivers/msbc1.cpp6
-rw-r--r--src/mame/drivers/msisaac.cpp4
-rw-r--r--src/mame/drivers/mstation.cpp6
-rw-r--r--src/mame/drivers/msx.cpp500
-rw-r--r--src/mame/drivers/mt735.cpp4
-rw-r--r--src/mame/drivers/mtouchxl.cpp24
-rw-r--r--src/mame/drivers/mtx.cpp12
-rw-r--r--src/mame/drivers/mugsmash.cpp6
-rw-r--r--src/mame/drivers/multfish.cpp230
-rw-r--r--src/mame/drivers/multfish_boot.cpp248
-rw-r--r--src/mame/drivers/multi16.cpp6
-rw-r--r--src/mame/drivers/multi8.cpp6
-rw-r--r--src/mame/drivers/multigam.cpp16
-rw-r--r--src/mame/drivers/munchmo.cpp6
-rw-r--r--src/mame/drivers/murogem.cpp10
-rw-r--r--src/mame/drivers/murogmbl.cpp4
-rw-r--r--src/mame/drivers/mustache.cpp2
-rw-r--r--src/mame/drivers/mvme147.cpp18
-rw-r--r--src/mame/drivers/mw18w.cpp6
-rw-r--r--src/mame/drivers/mw8080bw.cpp60
-rw-r--r--src/mame/drivers/mwarr.cpp8
-rw-r--r--src/mame/drivers/mwsub.cpp4
-rw-r--r--src/mame/drivers/mx2178.cpp12
-rw-r--r--src/mame/drivers/myb3k.cpp39
-rw-r--r--src/mame/drivers/mycom.cpp10
-rw-r--r--src/mame/drivers/mystston.cpp8
-rw-r--r--src/mame/drivers/mystwarr.cpp70
-rw-r--r--src/mame/drivers/myvision.cpp6
-rw-r--r--src/mame/drivers/mz2000.cpp12
-rw-r--r--src/mame/drivers/mz2500.cpp8
-rw-r--r--src/mame/drivers/mz3500.cpp4
-rw-r--r--src/mame/drivers/mz6500.cpp6
-rw-r--r--src/mame/drivers/mz700.cpp10
-rw-r--r--src/mame/drivers/mz80.cpp8
-rw-r--r--src/mame/drivers/mzr8105.cpp6
-rw-r--r--src/mame/drivers/n64.cpp6
-rw-r--r--src/mame/drivers/n8080.cpp32
-rw-r--r--src/mame/drivers/nakajies.cpp18
-rw-r--r--src/mame/drivers/namcofl.cpp4
-rw-r--r--src/mame/drivers/namcona1.cpp44
-rw-r--r--src/mame/drivers/namconb1.cpp6
-rw-r--r--src/mame/drivers/namcond1.cpp12
-rw-r--r--src/mame/drivers/namcops2.cpp106
-rw-r--r--src/mame/drivers/namcos1.cpp2
-rw-r--r--src/mame/drivers/namcos10.cpp4
-rw-r--r--src/mame/drivers/namcos11.cpp54
-rw-r--r--src/mame/drivers/namcos12.cpp4
-rw-r--r--src/mame/drivers/namcos2.cpp36
-rw-r--r--src/mame/drivers/namcos21.cpp16
-rw-r--r--src/mame/drivers/namcos22.cpp4
-rw-r--r--src/mame/drivers/namcos23.cpp6
-rw-r--r--src/mame/drivers/namcos86.cpp2
-rw-r--r--src/mame/drivers/nanos.cpp6
-rw-r--r--src/mame/drivers/naomi.cpp32
-rw-r--r--src/mame/drivers/nascom1.cpp10
-rw-r--r--src/mame/drivers/naughtyb.cpp26
-rw-r--r--src/mame/drivers/nbmj8688.cpp84
-rw-r--r--src/mame/drivers/nbmj8891.cpp58
-rw-r--r--src/mame/drivers/nbmj8900.cpp2
-rw-r--r--src/mame/drivers/nbmj8991.cpp34
-rw-r--r--src/mame/drivers/nbmj9195.cpp74
-rw-r--r--src/mame/drivers/nc.cpp4
-rw-r--r--src/mame/drivers/nemesis.cpp66
-rw-r--r--src/mame/drivers/neogeo.cpp11
-rw-r--r--src/mame/drivers/neogeocd.cpp11
-rw-r--r--src/mame/drivers/neopcb.cpp2
-rw-r--r--src/mame/drivers/neoprint.cpp15
-rw-r--r--src/mame/drivers/neptunp2.cpp4
-rw-r--r--src/mame/drivers/nes.cpp56
-rw-r--r--src/mame/drivers/newbrain.cpp10
-rw-r--r--src/mame/drivers/news.cpp8
-rw-r--r--src/mame/drivers/next.cpp20
-rw-r--r--src/mame/drivers/nexus3d.cpp6
-rw-r--r--src/mame/drivers/ngen.cpp12
-rw-r--r--src/mame/drivers/ngp.cpp8
-rw-r--r--src/mame/drivers/nibble.cpp6
-rw-r--r--src/mame/drivers/nightgal.cpp18
-rw-r--r--src/mame/drivers/ninjakd2.cpp10
-rw-r--r--src/mame/drivers/ninjaw.cpp14
-rw-r--r--src/mame/drivers/nitedrvr.cpp4
-rw-r--r--src/mame/drivers/niyanpai.cpp2
-rw-r--r--src/mame/drivers/nmg5.cpp4
-rw-r--r--src/mame/drivers/nmk16.cpp286
-rw-r--r--src/mame/drivers/nokia_3310.cpp28
-rw-r--r--src/mame/drivers/norautp.cpp82
-rw-r--r--src/mame/drivers/notetaker.cpp11
-rw-r--r--src/mame/drivers/nova2001.cpp22
-rw-r--r--src/mame/drivers/novag6502.cpp28
-rw-r--r--src/mame/drivers/novag68k.cpp6
-rw-r--r--src/mame/drivers/novagmcs48.cpp8
-rw-r--r--src/mame/drivers/nsm.cpp4
-rw-r--r--src/mame/drivers/nsmpoker.cpp6
-rw-r--r--src/mame/drivers/nss.cpp4
-rw-r--r--src/mame/drivers/nwk-tr.cpp12
-rw-r--r--src/mame/drivers/nycaptor.cpp12
-rw-r--r--src/mame/drivers/nyny.cpp8
-rw-r--r--src/mame/drivers/ob68k1a.cpp6
-rw-r--r--src/mame/drivers/octopus.cpp14
-rw-r--r--src/mame/drivers/odyssey2.cpp20
-rw-r--r--src/mame/drivers/offtwall.cpp2
-rw-r--r--src/mame/drivers/ohmygod.cpp8
-rw-r--r--src/mame/drivers/ojankohs.cpp28
-rw-r--r--src/mame/drivers/okean240.cpp39
-rw-r--r--src/mame/drivers/olibochu.cpp4
-rw-r--r--src/mame/drivers/omegrace.cpp2
-rw-r--r--src/mame/drivers/ondra.cpp8
-rw-r--r--src/mame/drivers/oneshot.cpp10
-rw-r--r--src/mame/drivers/onetwo.cpp8
-rw-r--r--src/mame/drivers/onyx.cpp12
-rw-r--r--src/mame/drivers/opwolf.cpp24
-rw-r--r--src/mame/drivers/orao.cpp8
-rw-r--r--src/mame/drivers/orbit.cpp4
-rw-r--r--src/mame/drivers/oric.cpp20
-rw-r--r--src/mame/drivers/orion.cpp22
-rw-r--r--src/mame/drivers/osbexec.cpp20
-rw-r--r--src/mame/drivers/osborne1.cpp10
-rw-r--r--src/mame/drivers/osi.cpp20
-rw-r--r--src/mame/drivers/othello.cpp4
-rw-r--r--src/mame/drivers/othunder.cpp12
-rw-r--r--src/mame/drivers/otomedius.cpp4
-rw-r--r--src/mame/drivers/overdriv.cpp8
-rw-r--r--src/mame/drivers/p112.cpp6
-rw-r--r--src/mame/drivers/p2000t.cpp10
-rw-r--r--src/mame/drivers/p8k.cpp22
-rw-r--r--src/mame/drivers/pachifev.cpp4
-rw-r--r--src/mame/drivers/pacland.cpp12
-rw-r--r--src/mame/drivers/pacman.cpp136
-rw-r--r--src/mame/drivers/palm.cpp36
-rw-r--r--src/mame/drivers/palmz22.cpp4
-rw-r--r--src/mame/drivers/pandoras.cpp4
-rw-r--r--src/mame/drivers/pangofun.cpp2
-rw-r--r--src/mame/drivers/panicr.cpp2
-rw-r--r--src/mame/drivers/paradise.cpp6
-rw-r--r--src/mame/drivers/paranoia.cpp6
-rw-r--r--src/mame/drivers/parodius.cpp10
-rw-r--r--src/mame/drivers/partner.cpp10
-rw-r--r--src/mame/drivers/pasha2.cpp6
-rw-r--r--src/mame/drivers/paso1600.cpp6
-rw-r--r--src/mame/drivers/pasogo.cpp7
-rw-r--r--src/mame/drivers/pasopia.cpp6
-rw-r--r--src/mame/drivers/pasopia7.cpp4
-rw-r--r--src/mame/drivers/pass.cpp6
-rw-r--r--src/mame/drivers/pastelg.cpp10
-rw-r--r--src/mame/drivers/patapata.cpp12
-rw-r--r--src/mame/drivers/patinho_feio.cpp30
-rw-r--r--src/mame/drivers/pb1000.cpp10
-rw-r--r--src/mame/drivers/pbaction.cpp10
-rw-r--r--src/mame/drivers/pc.cpp62
-rw-r--r--src/mame/drivers/pc100.cpp6
-rw-r--r--src/mame/drivers/pc1500.cpp6
-rw-r--r--src/mame/drivers/pc1512.cpp30
-rw-r--r--src/mame/drivers/pc2000.cpp44
-rw-r--r--src/mame/drivers/pc4.cpp6
-rw-r--r--src/mame/drivers/pc6001.cpp14
-rw-r--r--src/mame/drivers/pc8001.cpp10
-rw-r--r--src/mame/drivers/pc8401a.cpp10
-rw-r--r--src/mame/drivers/pc8801.cpp38
-rw-r--r--src/mame/drivers/pc88va.cpp8
-rw-r--r--src/mame/drivers/pc9801.cpp36
-rw-r--r--src/mame/drivers/pcat_dyn.cpp6
-rw-r--r--src/mame/drivers/pcat_nit.cpp4
-rw-r--r--src/mame/drivers/pcd.cpp12
-rw-r--r--src/mame/drivers/pce.cpp14
-rw-r--r--src/mame/drivers/pce220.cpp14
-rw-r--r--src/mame/drivers/pcfx.cpp10
-rw-r--r--src/mame/drivers/pcipc.cpp8
-rw-r--r--src/mame/drivers/pcktgal.cpp6
-rw-r--r--src/mame/drivers/pcm.cpp6
-rw-r--r--src/mame/drivers/pcw.cpp14
-rw-r--r--src/mame/drivers/pcw16.cpp6
-rw-r--r--src/mame/drivers/pcxt.cpp17
-rw-r--r--src/mame/drivers/pda600.cpp6
-rw-r--r--src/mame/drivers/pdp1.cpp30
-rw-r--r--src/mame/drivers/pdp11.cpp18
-rw-r--r--src/mame/drivers/pecom.cpp10
-rw-r--r--src/mame/drivers/pegasus.cpp8
-rw-r--r--src/mame/drivers/pencil2.cpp6
-rw-r--r--src/mame/drivers/pengadvb.cpp2
-rw-r--r--src/mame/drivers/pengo.cpp18
-rw-r--r--src/mame/drivers/pentagon.cpp8
-rw-r--r--src/mame/drivers/peoplepc.cpp4
-rw-r--r--src/mame/drivers/peplus.cpp2
-rw-r--r--src/mame/drivers/pes.cpp10
-rw-r--r--src/mame/drivers/pet.cpp84
-rw-r--r--src/mame/drivers/peyper.cpp28
-rw-r--r--src/mame/drivers/pg685.cpp20
-rw-r--r--src/mame/drivers/pgm.cpp2
-rw-r--r--src/mame/drivers/pgm2.cpp2
-rw-r--r--src/mame/drivers/pgm3.cpp2
-rw-r--r--src/mame/drivers/phc25.cpp12
-rw-r--r--src/mame/drivers/phoenix.cpp65
-rw-r--r--src/mame/drivers/photon.cpp8
-rw-r--r--src/mame/drivers/photon2.cpp8
-rw-r--r--src/mame/drivers/photoply.cpp2
-rw-r--r--src/mame/drivers/phunsy.cpp10
-rw-r--r--src/mame/drivers/piggypas.cpp18
-rw-r--r--src/mame/drivers/pimps.cpp12
-rw-r--r--src/mame/drivers/pinball2k.cpp2
-rw-r--r--src/mame/drivers/pingpong.cpp8
-rw-r--r--src/mame/drivers/pinkiri8.cpp16
-rw-r--r--src/mame/drivers/pipbug.cpp6
-rw-r--r--src/mame/drivers/pipedrm.cpp14
-rw-r--r--src/mame/drivers/pipeline.cpp4
-rw-r--r--src/mame/drivers/pirates.cpp8
-rw-r--r--src/mame/drivers/piratesh.cpp6
-rw-r--r--src/mame/drivers/pitagjr.cpp6
-rw-r--r--src/mame/drivers/pitnrun.cpp6
-rw-r--r--src/mame/drivers/pk8000.cpp10
-rw-r--r--src/mame/drivers/pk8020.cpp12
-rw-r--r--src/mame/drivers/pkscram.cpp2
-rw-r--r--src/mame/drivers/pktgaldx.cpp14
-rw-r--r--src/mame/drivers/plan80.cpp6
-rw-r--r--src/mame/drivers/play_1.cpp12
-rw-r--r--src/mame/drivers/play_2.cpp18
-rw-r--r--src/mame/drivers/play_3.cpp44
-rw-r--r--src/mame/drivers/playch10.cpp4
-rw-r--r--src/mame/drivers/playmark.cpp38
-rw-r--r--src/mame/drivers/plus4.cpp32
-rw-r--r--src/mame/drivers/pluto5.cpp4
-rw-r--r--src/mame/drivers/plygonet.cpp10
-rw-r--r--src/mame/drivers/pm68k.cpp12
-rw-r--r--src/mame/drivers/pmd85.cpp22
-rw-r--r--src/mame/drivers/pmi80.cpp6
-rw-r--r--src/mame/drivers/pntnpuzl.cpp2
-rw-r--r--src/mame/drivers/pockchal.cpp6
-rw-r--r--src/mame/drivers/pocketc.cpp46
-rw-r--r--src/mame/drivers/pockstat.cpp6
-rw-r--r--src/mame/drivers/pofo.cpp12
-rw-r--r--src/mame/drivers/poisk1.cpp7
-rw-r--r--src/mame/drivers/pokechmp.cpp4
-rw-r--r--src/mame/drivers/pokemini.cpp4
-rw-r--r--src/mame/drivers/poker72.cpp2
-rw-r--r--src/mame/drivers/polepos.cpp26
-rw-r--r--src/mame/drivers/policetr.cpp18
-rw-r--r--src/mame/drivers/poly.cpp12
-rw-r--r--src/mame/drivers/poly88.cpp8
-rw-r--r--src/mame/drivers/poly880.cpp6
-rw-r--r--src/mame/drivers/polyplay.cpp10
-rw-r--r--src/mame/drivers/pong.cpp38
-rw-r--r--src/mame/drivers/poolshrk.cpp2
-rw-r--r--src/mame/drivers/pooyan.cpp8
-rw-r--r--src/mame/drivers/popeye.cpp14
-rw-r--r--src/mame/drivers/popobear.cpp6
-rw-r--r--src/mame/drivers/popper.cpp6
-rw-r--r--src/mame/drivers/portrait.cpp6
-rw-r--r--src/mame/drivers/potgoldu.cpp6
-rw-r--r--src/mame/drivers/powerbal.cpp10
-rw-r--r--src/mame/drivers/powerins.cpp16
-rw-r--r--src/mame/drivers/pp01.cpp6
-rw-r--r--src/mame/drivers/ppmast93.cpp4
-rw-r--r--src/mame/drivers/prehisle.cpp12
-rw-r--r--src/mame/drivers/prestige.cpp44
-rw-r--r--src/mame/drivers/primo.cpp18
-rw-r--r--src/mame/drivers/pro80.cpp6
-rw-r--r--src/mame/drivers/proconn.cpp4
-rw-r--r--src/mame/drivers/prodigy.cpp12
-rw-r--r--src/mame/drivers/prof180x.cpp8
-rw-r--r--src/mame/drivers/prof80.cpp6
-rw-r--r--src/mame/drivers/progolf.cpp6
-rw-r--r--src/mame/drivers/prophet600.cpp2
-rw-r--r--src/mame/drivers/proteus3.cpp12
-rw-r--r--src/mame/drivers/ps2.cpp22
-rw-r--r--src/mame/drivers/pse.cpp16
-rw-r--r--src/mame/drivers/psikyo.cpp42
-rw-r--r--src/mame/drivers/psikyo4.cpp20
-rw-r--r--src/mame/drivers/psikyosh.cpp30
-rw-r--r--src/mame/drivers/psion.cpp28
-rw-r--r--src/mame/drivers/psx.cpp22
-rw-r--r--src/mame/drivers/psychic5.cpp10
-rw-r--r--src/mame/drivers/pt68k4.cpp22
-rw-r--r--src/mame/drivers/ptcsol.cpp10
-rw-r--r--src/mame/drivers/pturn.cpp2
-rw-r--r--src/mame/drivers/puckpkmn.cpp6
-rw-r--r--src/mame/drivers/pulsar.cpp10
-rw-r--r--src/mame/drivers/punchout.cpp18
-rw-r--r--src/mame/drivers/pv1000.cpp14
-rw-r--r--src/mame/drivers/pv2000.cpp6
-rw-r--r--src/mame/drivers/pv9234.cpp22
-rw-r--r--src/mame/drivers/pve500.cpp6
-rw-r--r--src/mame/drivers/pwrview.cpp4
-rw-r--r--src/mame/drivers/px4.cpp4
-rw-r--r--src/mame/drivers/px8.cpp6
-rw-r--r--src/mame/drivers/pyl601.cpp6
-rw-r--r--src/mame/drivers/pyson.cpp8
-rw-r--r--src/mame/drivers/pzletime.cpp6
-rw-r--r--src/mame/drivers/qdrmfgp.cpp10
-rw-r--r--src/mame/drivers/qix.cpp38
-rw-r--r--src/mame/drivers/ql.cpp32
-rw-r--r--src/mame/drivers/qtsbc.cpp12
-rw-r--r--src/mame/drivers/quakeat.cpp4
-rw-r--r--src/mame/drivers/quantum.cpp8
-rw-r--r--src/mame/drivers/quasar.cpp6
-rw-r--r--src/mame/drivers/queen.cpp4
-rw-r--r--src/mame/drivers/quizdna.cpp10
-rw-r--r--src/mame/drivers/quizo.cpp2
-rw-r--r--src/mame/drivers/quizpani.cpp6
-rw-r--r--src/mame/drivers/quizpun2.cpp6
-rw-r--r--src/mame/drivers/quizshow.cpp2
-rw-r--r--src/mame/drivers/qx10.cpp6
-rw-r--r--src/mame/drivers/r2dtank.cpp4
-rw-r--r--src/mame/drivers/r2dx_v33.cpp8
-rw-r--r--src/mame/drivers/r9751.cpp6
-rw-r--r--src/mame/drivers/rabbit.cpp2
-rw-r--r--src/mame/drivers/radio86.cpp26
-rw-r--r--src/mame/drivers/raiden.cpp8
-rw-r--r--src/mame/drivers/raiden2.cpp10
-rw-r--r--src/mame/drivers/rainbow.cpp20
-rw-r--r--src/mame/drivers/rallyx.cpp38
-rw-r--r--src/mame/drivers/rambo.cpp6
-rw-r--r--src/mame/drivers/rampart.cpp6
-rw-r--r--src/mame/drivers/ramtek.cpp18
-rw-r--r--src/mame/drivers/rastan.cpp22
-rw-r--r--src/mame/drivers/rastersp.cpp6
-rw-r--r--src/mame/drivers/ravens.cpp16
-rw-r--r--src/mame/drivers/rbisland.cpp12
-rw-r--r--src/mame/drivers/rbmk.cpp6
-rw-r--r--src/mame/drivers/rc702.cpp12
-rw-r--r--src/mame/drivers/rc759.cpp64
-rw-r--r--src/mame/drivers/rcorsair.cpp4
-rw-r--r--src/mame/drivers/rd100.cpp6
-rw-r--r--src/mame/drivers/rd110.cpp4
-rw-r--r--src/mame/drivers/re900.cpp8
-rw-r--r--src/mame/drivers/realbrk.cpp16
-rw-r--r--src/mame/drivers/redalert.cpp16
-rw-r--r--src/mame/drivers/redclash.cpp18
-rw-r--r--src/mame/drivers/relief.cpp4
-rw-r--r--src/mame/drivers/renegade.cpp4
-rw-r--r--src/mame/drivers/replicator.cpp6
-rw-r--r--src/mame/drivers/retofinv.cpp8
-rw-r--r--src/mame/drivers/rex6000.cpp12
-rw-r--r--src/mame/drivers/rgum.cpp4
-rw-r--r--src/mame/drivers/risc2500.cpp10
-rw-r--r--src/mame/drivers/riscpc.cpp24
-rw-r--r--src/mame/drivers/rltennis.cpp4
-rw-r--r--src/mame/drivers/rm380z.cpp22
-rw-r--r--src/mame/drivers/rmhaihai.cpp4
-rw-r--r--src/mame/drivers/rmnimbus.cpp14
-rw-r--r--src/mame/drivers/rmt32.cpp6
-rw-r--r--src/mame/drivers/rockrage.cpp8
-rw-r--r--src/mame/drivers/rocnrope.cpp4
-rw-r--r--src/mame/drivers/rohga.cpp36
-rw-r--r--src/mame/drivers/rollerg.cpp6
-rw-r--r--src/mame/drivers/rollext.cpp2
-rw-r--r--src/mame/drivers/rollrace.cpp8
-rw-r--r--src/mame/drivers/rotaryf.cpp4
-rw-r--r--src/mame/drivers/roul.cpp4
-rw-r--r--src/mame/drivers/route16.cpp34
-rw-r--r--src/mame/drivers/rowamet.cpp4
-rw-r--r--src/mame/drivers/royalmah.cpp76
-rw-r--r--src/mame/drivers/rpunch.cpp16
-rw-r--r--src/mame/drivers/rsc55.cpp4
-rw-r--r--src/mame/drivers/rt1715.cpp30
-rw-r--r--src/mame/drivers/runaway.cpp6
-rw-r--r--src/mame/drivers/rungun.cpp24
-rw-r--r--src/mame/drivers/rvoice.cpp12
-rw-r--r--src/mame/drivers/rx78.cpp2
-rw-r--r--src/mame/drivers/s11.cpp20
-rw-r--r--src/mame/drivers/s11a.cpp26
-rw-r--r--src/mame/drivers/s11b.cpp110
-rw-r--r--src/mame/drivers/s11c.cpp2
-rw-r--r--src/mame/drivers/s3.cpp16
-rw-r--r--src/mame/drivers/s4.cpp36
-rw-r--r--src/mame/drivers/s6.cpp24
-rw-r--r--src/mame/drivers/s6a.cpp10
-rw-r--r--src/mame/drivers/s7.cpp52
-rw-r--r--src/mame/drivers/s8.cpp6
-rw-r--r--src/mame/drivers/s8a.cpp4
-rw-r--r--src/mame/drivers/s9.cpp18
-rw-r--r--src/mame/drivers/sacstate.cpp12
-rw-r--r--src/mame/drivers/safarir.cpp6
-rw-r--r--src/mame/drivers/sage2.cpp6
-rw-r--r--src/mame/drivers/sam.cpp398
-rw-r--r--src/mame/drivers/samcoupe.cpp6
-rw-r--r--src/mame/drivers/sandscrp.cpp10
-rw-r--r--src/mame/drivers/sangho.cpp6
-rw-r--r--src/mame/drivers/sanremmg.cpp4
-rw-r--r--src/mame/drivers/sanremo.cpp6
-rw-r--r--src/mame/drivers/sansa_fuze.cpp6
-rw-r--r--src/mame/drivers/sapi1.cpp24
-rw-r--r--src/mame/drivers/saturn.cpp4
-rw-r--r--src/mame/drivers/sauro.cpp12
-rw-r--r--src/mame/drivers/savia84.cpp6
-rw-r--r--src/mame/drivers/savquest.cpp4
-rw-r--r--src/mame/drivers/sbasketb.cpp10
-rw-r--r--src/mame/drivers/sbc6510.cpp6
-rw-r--r--src/mame/drivers/sbowling.cpp4
-rw-r--r--src/mame/drivers/sbrain.cpp6
-rw-r--r--src/mame/drivers/sbrkout.cpp10
-rw-r--r--src/mame/drivers/sbugger.cpp6
-rw-r--r--src/mame/drivers/sc1.cpp6
-rw-r--r--src/mame/drivers/sc2.cpp6
-rw-r--r--src/mame/drivers/scm_500.cpp4
-rw-r--r--src/mame/drivers/scobra.cpp44
-rw-r--r--src/mame/drivers/scorpion.cpp14
-rw-r--r--src/mame/drivers/scotrsht.cpp4
-rw-r--r--src/mame/drivers/scramble.cpp6
-rw-r--r--src/mame/drivers/scregg.cpp10
-rw-r--r--src/mame/drivers/scv.cpp8
-rw-r--r--src/mame/drivers/scyclone.cpp18
-rw-r--r--src/mame/drivers/sderby.cpp40
-rw-r--r--src/mame/drivers/sdk80.cpp6
-rw-r--r--src/mame/drivers/sdk85.cpp6
-rw-r--r--src/mame/drivers/sdk86.cpp6
-rw-r--r--src/mame/drivers/seabattl.cpp6
-rw-r--r--src/mame/drivers/sealy.cpp6
-rw-r--r--src/mame/drivers/seattle.cpp2
-rw-r--r--src/mame/drivers/seattlecmp.cpp13
-rw-r--r--src/mame/drivers/sega_sawatte.cpp4
-rw-r--r--src/mame/drivers/segac2.cpp2
-rw-r--r--src/mame/drivers/segacoin.cpp4
-rw-r--r--src/mame/drivers/segae.cpp24
-rw-r--r--src/mame/drivers/segag80r.cpp20
-rw-r--r--src/mame/drivers/segag80v.cpp26
-rw-r--r--src/mame/drivers/segahang.cpp2
-rw-r--r--src/mame/drivers/segajw.cpp4
-rw-r--r--src/mame/drivers/segald.cpp14
-rw-r--r--src/mame/drivers/segam1.cpp6
-rw-r--r--src/mame/drivers/segaorun.cpp2
-rw-r--r--src/mame/drivers/segapico.cpp9
-rw-r--r--src/mame/drivers/segapm.cpp6
-rw-r--r--src/mame/drivers/segas16a.cpp2
-rw-r--r--src/mame/drivers/segas16b.cpp14
-rw-r--r--src/mame/drivers/segas18.cpp2
-rw-r--r--src/mame/drivers/segas24.cpp24
-rw-r--r--src/mame/drivers/segas32.cpp108
-rw-r--r--src/mame/drivers/segasp.cpp22
-rw-r--r--src/mame/drivers/segaufo.cpp16
-rw-r--r--src/mame/drivers/segaxbd.cpp162
-rw-r--r--src/mame/drivers/segaybd.cpp38
-rw-r--r--src/mame/drivers/seibuspi.cpp10
-rw-r--r--src/mame/drivers/seicross.cpp16
-rw-r--r--src/mame/drivers/seicupbl.cpp10
-rw-r--r--src/mame/drivers/selz80.cpp8
-rw-r--r--src/mame/drivers/sengokmj.cpp6
-rw-r--r--src/mame/drivers/senjyo.cpp16
-rw-r--r--src/mame/drivers/seta.cpp208
-rw-r--r--src/mame/drivers/seta2.cpp68
-rw-r--r--src/mame/drivers/sf.cpp18
-rw-r--r--src/mame/drivers/sfbonus.cpp4
-rw-r--r--src/mame/drivers/sfcbox.cpp12
-rw-r--r--src/mame/drivers/sfkick.cpp2
-rw-r--r--src/mame/drivers/sg1000.cpp28
-rw-r--r--src/mame/drivers/sg1000a.cpp8
-rw-r--r--src/mame/drivers/sh4robot.cpp6
-rw-r--r--src/mame/drivers/shadfrce.cpp10
-rw-r--r--src/mame/drivers/shangha3.cpp12
-rw-r--r--src/mame/drivers/shanghai.cpp16
-rw-r--r--src/mame/drivers/shangkid.cpp18
-rw-r--r--src/mame/drivers/shaolins.cpp10
-rw-r--r--src/mame/drivers/shisen.cpp12
-rw-r--r--src/mame/drivers/shootout.cpp4
-rw-r--r--src/mame/drivers/shougi.cpp8
-rw-r--r--src/mame/drivers/shtzone.cpp4
-rw-r--r--src/mame/drivers/shuuz.cpp8
-rw-r--r--src/mame/drivers/sidearms.cpp6
-rw-r--r--src/mame/drivers/sidepckt.cpp4
-rw-r--r--src/mame/drivers/sigmab52.cpp2
-rw-r--r--src/mame/drivers/sigmab98.cpp12
-rw-r--r--src/mame/drivers/silkroad.cpp6
-rw-r--r--src/mame/drivers/silvmil.cpp6
-rw-r--r--src/mame/drivers/simpl156.cpp8
-rw-r--r--src/mame/drivers/simple_st0016.cpp12
-rw-r--r--src/mame/drivers/simpsons.cpp16
-rw-r--r--src/mame/drivers/sitcom.cpp10
-rw-r--r--src/mame/drivers/skeetsht.cpp6
-rw-r--r--src/mame/drivers/skimaxx.cpp12
-rw-r--r--src/mame/drivers/skullxbo.cpp2
-rw-r--r--src/mame/drivers/skyarmy.cpp4
-rw-r--r--src/mame/drivers/skydiver.cpp4
-rw-r--r--src/mame/drivers/skyfox.cpp2
-rw-r--r--src/mame/drivers/skykid.cpp2
-rw-r--r--src/mame/drivers/skylncr.cpp22
-rw-r--r--src/mame/drivers/skyraid.cpp4
-rw-r--r--src/mame/drivers/slapfght.cpp22
-rw-r--r--src/mame/drivers/slapshot.cpp10
-rw-r--r--src/mame/drivers/slc1.cpp6
-rw-r--r--src/mame/drivers/sleic.cpp10
-rw-r--r--src/mame/drivers/slicer.cpp44
-rw-r--r--src/mame/drivers/sliver.cpp8
-rw-r--r--src/mame/drivers/slotcarn.cpp10
-rw-r--r--src/mame/drivers/sm1800.cpp6
-rw-r--r--src/mame/drivers/sm7238.cpp6
-rw-r--r--src/mame/drivers/smc777.cpp26
-rw-r--r--src/mame/drivers/sms.cpp48
-rw-r--r--src/mame/drivers/sms_bootleg.cpp8
-rw-r--r--src/mame/drivers/smsmcorp.cpp10
-rw-r--r--src/mame/drivers/snes.cpp14
-rw-r--r--src/mame/drivers/snesb.cpp12
-rw-r--r--src/mame/drivers/snk.cpp120
-rw-r--r--src/mame/drivers/snk6502.cpp52
-rw-r--r--src/mame/drivers/snk68.cpp28
-rw-r--r--src/mame/drivers/snookr10.cpp16
-rw-r--r--src/mame/drivers/snowbros.cpp84
-rw-r--r--src/mame/drivers/socrates.cpp16
-rw-r--r--src/mame/drivers/softbox.cpp12
-rw-r--r--src/mame/drivers/solomon.cpp6
-rw-r--r--src/mame/drivers/sonson.cpp6
-rw-r--r--src/mame/drivers/sorcerer.cpp8
-rw-r--r--src/mame/drivers/sothello.cpp6
-rw-r--r--src/mame/drivers/spacefb.cpp20
-rw-r--r--src/mame/drivers/spaceg.cpp4
-rw-r--r--src/mame/drivers/spartanxtec.cpp4
-rw-r--r--src/mame/drivers/spbactn.cpp14
-rw-r--r--src/mame/drivers/spc1000.cpp8
-rw-r--r--src/mame/drivers/spc1500.cpp6
-rw-r--r--src/mame/drivers/spcforce.cpp10
-rw-r--r--src/mame/drivers/spdodgeb.cpp12
-rw-r--r--src/mame/drivers/spec128.cpp10
-rw-r--r--src/mame/drivers/special.cpp22
-rw-r--r--src/mame/drivers/spectra.cpp4
-rw-r--r--src/mame/drivers/spectrum.cpp68
-rw-r--r--src/mame/drivers/speedatk.cpp4
-rw-r--r--src/mame/drivers/speedbal.cpp2
-rw-r--r--src/mame/drivers/speedspn.cpp6
-rw-r--r--src/mame/drivers/speglsht.cpp2
-rw-r--r--src/mame/drivers/spiders.cpp10
-rw-r--r--src/mame/drivers/spinb.cpp10
-rw-r--r--src/mame/drivers/splash.cpp28
-rw-r--r--src/mame/drivers/splus.cpp4
-rw-r--r--src/mame/drivers/spoker.cpp8
-rw-r--r--src/mame/drivers/spool99.cpp4
-rw-r--r--src/mame/drivers/sprcros2.cpp6
-rw-r--r--src/mame/drivers/sprint2.cpp2
-rw-r--r--src/mame/drivers/sprint4.cpp6
-rw-r--r--src/mame/drivers/sprint8.cpp6
-rw-r--r--src/mame/drivers/spy.cpp6
-rw-r--r--src/mame/drivers/spyhuntertec.cpp2
-rw-r--r--src/mame/drivers/squale.cpp13
-rw-r--r--src/mame/drivers/srmp2.cpp28
-rw-r--r--src/mame/drivers/srmp5.cpp2
-rw-r--r--src/mame/drivers/srmp6.cpp4
-rw-r--r--src/mame/drivers/srumbler.cpp10
-rw-r--r--src/mame/drivers/ssem.cpp6
-rw-r--r--src/mame/drivers/ssfindo.cpp8
-rw-r--r--src/mame/drivers/sshangha.cpp4
-rw-r--r--src/mame/drivers/sshot.cpp6
-rw-r--r--src/mame/drivers/ssingles.cpp2
-rw-r--r--src/mame/drivers/sslam.cpp14
-rw-r--r--src/mame/drivers/ssozumo.cpp4
-rw-r--r--src/mame/drivers/sspeedr.cpp4
-rw-r--r--src/mame/drivers/ssrj.cpp4
-rw-r--r--src/mame/drivers/sstrangr.cpp6
-rw-r--r--src/mame/drivers/ssv.cpp2
-rw-r--r--src/mame/drivers/ssystem3.cpp4
-rw-r--r--src/mame/drivers/st17xx.cpp24
-rw-r--r--src/mame/drivers/st_mp100.cpp26
-rw-r--r--src/mame/drivers/st_mp200.cpp46
-rw-r--r--src/mame/drivers/stactics.cpp4
-rw-r--r--src/mame/drivers/stadhero.cpp4
-rw-r--r--src/mame/drivers/starcrus.cpp4
-rw-r--r--src/mame/drivers/starfire.cpp2
-rw-r--r--src/mame/drivers/stargame.cpp6
-rw-r--r--src/mame/drivers/starshp1.cpp6
-rw-r--r--src/mame/drivers/starwars.cpp2
-rw-r--r--src/mame/drivers/statriv2.cpp32
-rw-r--r--src/mame/drivers/stellafr.cpp6
-rw-r--r--src/mame/drivers/stfight.cpp4
-rw-r--r--src/mame/drivers/stlforce.cpp4
-rw-r--r--src/mame/drivers/stratos.cpp2
-rw-r--r--src/mame/drivers/strnskil.cpp10
-rw-r--r--src/mame/drivers/studio2.cpp24
-rw-r--r--src/mame/drivers/stuntair.cpp4
-rw-r--r--src/mame/drivers/stv.cpp186
-rw-r--r--src/mame/drivers/su2000.cpp4
-rw-r--r--src/mame/drivers/sub.cpp4
-rw-r--r--src/mame/drivers/subhuntr.cpp4
-rw-r--r--src/mame/drivers/subs.cpp4
-rw-r--r--src/mame/drivers/subsino.cpp14
-rw-r--r--src/mame/drivers/subsino2.cpp14
-rw-r--r--src/mame/drivers/summit.cpp4
-rw-r--r--src/mame/drivers/sumt8035.cpp6
-rw-r--r--src/mame/drivers/sun1.cpp19
-rw-r--r--src/mame/drivers/sun2.cpp10
-rw-r--r--src/mame/drivers/sun3.cpp18
-rw-r--r--src/mame/drivers/sun3x.cpp10
-rw-r--r--src/mame/drivers/sun4.cpp28
-rw-r--r--src/mame/drivers/suna16.cpp18
-rw-r--r--src/mame/drivers/suna8.cpp12
-rw-r--r--src/mame/drivers/supbtime.cpp16
-rw-r--r--src/mame/drivers/supdrapo.cpp10
-rw-r--r--src/mame/drivers/supduck.cpp6
-rw-r--r--src/mame/drivers/super6.cpp8
-rw-r--r--src/mame/drivers/super80.cpp6
-rw-r--r--src/mame/drivers/superchs.cpp4
-rw-r--r--src/mame/drivers/supercrd.cpp8
-rw-r--r--src/mame/drivers/superdq.cpp8
-rw-r--r--src/mame/drivers/superqix.cpp26
-rw-r--r--src/mame/drivers/superslave.cpp6
-rw-r--r--src/mame/drivers/supertnk.cpp2
-rw-r--r--src/mame/drivers/superwng.cpp4
-rw-r--r--src/mame/drivers/supracan.cpp6
-rw-r--r--src/mame/drivers/suprgolf.cpp10
-rw-r--r--src/mame/drivers/suprloco.cpp4
-rw-r--r--src/mame/drivers/suprnova.cpp32
-rw-r--r--src/mame/drivers/suprridr.cpp4
-rw-r--r--src/mame/drivers/suprslam.cpp4
-rw-r--r--src/mame/drivers/supstarf.cpp4
-rw-r--r--src/mame/drivers/surpratk.cpp8
-rw-r--r--src/mame/drivers/sv8000.cpp6
-rw-r--r--src/mame/drivers/svi318.cpp12
-rw-r--r--src/mame/drivers/svision.cpp14
-rw-r--r--src/mame/drivers/svmu.cpp6
-rw-r--r--src/mame/drivers/swtpc.cpp21
-rw-r--r--src/mame/drivers/swtpc09.cpp16
-rw-r--r--src/mame/drivers/swyft.cpp6
-rw-r--r--src/mame/drivers/sym1.cpp6
-rw-r--r--src/mame/drivers/symbolics.cpp4
-rw-r--r--src/mame/drivers/sys2900.cpp4
-rw-r--r--src/mame/drivers/systec.cpp12
-rw-r--r--src/mame/drivers/system1.cpp126
-rw-r--r--src/mame/drivers/system16.cpp70
-rw-r--r--src/mame/drivers/tagteam.cpp6
-rw-r--r--src/mame/drivers/tail2nos.cpp14
-rw-r--r--src/mame/drivers/taito.cpp72
-rw-r--r--src/mame/drivers/taito_b.cpp98
-rw-r--r--src/mame/drivers/taito_f2.cpp136
-rw-r--r--src/mame/drivers/taito_f3.cpp6
-rw-r--r--src/mame/drivers/taito_h.cpp22
-rw-r--r--src/mame/drivers/taito_l.cpp80
-rw-r--r--src/mame/drivers/taito_o.cpp4
-rw-r--r--src/mame/drivers/taito_x.cpp28
-rw-r--r--src/mame/drivers/taito_z.cpp88
-rw-r--r--src/mame/drivers/taitoair.cpp12
-rw-r--r--src/mame/drivers/taitogn.cpp58
-rw-r--r--src/mame/drivers/taitojc.cpp4
-rw-r--r--src/mame/drivers/taitopjc.cpp2
-rw-r--r--src/mame/drivers/taitosj.cpp26
-rw-r--r--src/mame/drivers/taitottl.cpp12
-rw-r--r--src/mame/drivers/taitotx.cpp8
-rw-r--r--src/mame/drivers/taitotz.cpp22
-rw-r--r--src/mame/drivers/taitowlf.cpp2
-rw-r--r--src/mame/drivers/tamag1.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp29
-rw-r--r--src/mame/drivers/tandy2k.cpp14
-rw-r--r--src/mame/drivers/tank8.cpp8
-rw-r--r--src/mame/drivers/tankbatt.cpp6
-rw-r--r--src/mame/drivers/tankbust.cpp4
-rw-r--r--src/mame/drivers/taotaido.cpp8
-rw-r--r--src/mame/drivers/tapatune.cpp8
-rw-r--r--src/mame/drivers/targeth.cpp8
-rw-r--r--src/mame/drivers/tasman.cpp12
-rw-r--r--src/mame/drivers/tatsumi.cpp16
-rw-r--r--src/mame/drivers/tattack.cpp2
-rw-r--r--src/mame/drivers/tavernie.cpp18
-rw-r--r--src/mame/drivers/taxidriv.cpp4
-rw-r--r--src/mame/drivers/tb303.cpp4
-rw-r--r--src/mame/drivers/tbowl.cpp12
-rw-r--r--src/mame/drivers/tceptor.cpp8
-rw-r--r--src/mame/drivers/tcl.cpp2
-rw-r--r--src/mame/drivers/tdv2324.cpp6
-rw-r--r--src/mame/drivers/tec1.cpp10
-rw-r--r--src/mame/drivers/techno.cpp6
-rw-r--r--src/mame/drivers/tecmo.cpp22
-rw-r--r--src/mame/drivers/tecmo16.cpp12
-rw-r--r--src/mame/drivers/tecmosys.cpp6
-rw-r--r--src/mame/drivers/tecnbras.cpp6
-rw-r--r--src/mame/drivers/tehkanwc.cpp14
-rw-r--r--src/mame/drivers/tek405x.cpp14
-rw-r--r--src/mame/drivers/tek410x.cpp8
-rw-r--r--src/mame/drivers/tek440x.cpp6
-rw-r--r--src/mame/drivers/tekxp33x.cpp6
-rw-r--r--src/mame/drivers/tempest.cpp14
-rw-r--r--src/mame/drivers/terak.cpp6
-rw-r--r--src/mame/drivers/terracre.cpp14
-rw-r--r--src/mame/drivers/test_t400.cpp8
-rw-r--r--src/mame/drivers/testconsole.cpp4
-rw-r--r--src/mame/drivers/tetrisp2.cpp30
-rw-r--r--src/mame/drivers/tgtpanic.cpp4
-rw-r--r--src/mame/drivers/thayers.cpp8
-rw-r--r--src/mame/drivers/thedealr.cpp4
-rw-r--r--src/mame/drivers/thedeep.cpp6
-rw-r--r--src/mame/drivers/thepit.cpp44
-rw-r--r--src/mame/drivers/thief.cpp10
-rw-r--r--src/mame/drivers/thomson.cpp28
-rw-r--r--src/mame/drivers/thoop2.cpp6
-rw-r--r--src/mame/drivers/thunderj.cpp2
-rw-r--r--src/mame/drivers/thunderx.cpp12
-rw-r--r--src/mame/drivers/ti630.cpp6
-rw-r--r--src/mame/drivers/ti74.cpp8
-rw-r--r--src/mame/drivers/ti85.cpp26
-rw-r--r--src/mame/drivers/ti89.cpp14
-rw-r--r--src/mame/drivers/ti990_10.cpp8
-rw-r--r--src/mame/drivers/ti990_4.cpp18
-rw-r--r--src/mame/drivers/ti99_2.cpp8
-rw-r--r--src/mame/drivers/ti99_4p.cpp22
-rw-r--r--src/mame/drivers/ti99_4x.cpp44
-rw-r--r--src/mame/drivers/ti99_8.cpp30
-rw-r--r--src/mame/drivers/tiamc1.cpp15
-rw-r--r--src/mame/drivers/ticalc1x.cpp56
-rw-r--r--src/mame/drivers/tickee.cpp26
-rw-r--r--src/mame/drivers/tigeroad.cpp32
-rw-r--r--src/mame/drivers/tiki100.cpp8
-rw-r--r--src/mame/drivers/tim011.cpp6
-rw-r--r--src/mame/drivers/tim100.cpp4
-rw-r--r--src/mame/drivers/timelimt.cpp6
-rw-r--r--src/mame/drivers/timeplt.cpp16
-rw-r--r--src/mame/drivers/timetrv.cpp6
-rw-r--r--src/mame/drivers/tispeak.cpp32
-rw-r--r--src/mame/drivers/tispellb.cpp12
-rw-r--r--src/mame/drivers/tk2000.cpp6
-rw-r--r--src/mame/drivers/tk80.cpp16
-rw-r--r--src/mame/drivers/tk80bs.cpp12
-rw-r--r--src/mame/drivers/tm990189.cpp20
-rw-r--r--src/mame/drivers/tmaster.cpp60
-rw-r--r--src/mame/drivers/tmc1800.cpp18
-rw-r--r--src/mame/drivers/tmc2000e.cpp6
-rw-r--r--src/mame/drivers/tmc600.cpp8
-rw-r--r--src/mame/drivers/tmmjprd.cpp6
-rw-r--r--src/mame/drivers/tmnt.cpp158
-rw-r--r--src/mame/drivers/tmspoker.cpp4
-rw-r--r--src/mame/drivers/tnzs.cpp94
-rw-r--r--src/mame/drivers/toaplan1.cpp78
-rw-r--r--src/mame/drivers/toaplan2.cpp220
-rw-r--r--src/mame/drivers/toki.cpp8
-rw-r--r--src/mame/drivers/tomcat.cpp4
-rw-r--r--src/mame/drivers/tonton.cpp2
-rw-r--r--src/mame/drivers/toobin.cpp14
-rw-r--r--src/mame/drivers/topspeed.cpp12
-rw-r--r--src/mame/drivers/toratora.cpp10
-rw-r--r--src/mame/drivers/tosh1000.cpp6
-rw-r--r--src/mame/drivers/tourtabl.cpp6
-rw-r--r--src/mame/drivers/tourvis.cpp6
-rw-r--r--src/mame/drivers/toypop.cpp12
-rw-r--r--src/mame/drivers/tp84.cpp14
-rw-r--r--src/mame/drivers/tr606.cpp4
-rw-r--r--src/mame/drivers/trackfld.cpp30
-rw-r--r--src/mame/drivers/tranz330.cpp6
-rw-r--r--src/mame/drivers/travrusa.cpp12
-rw-r--r--src/mame/drivers/tricep.cpp35
-rw-r--r--src/mame/drivers/triforce.cpp134
-rw-r--r--src/mame/drivers/triplhnt.cpp2
-rw-r--r--src/mame/drivers/trs80.cpp70
-rw-r--r--src/mame/drivers/trs80m2.cpp22
-rw-r--r--src/mame/drivers/truco.cpp6
-rw-r--r--src/mame/drivers/trucocl.cpp5
-rw-r--r--src/mame/drivers/trvmadns.cpp6
-rw-r--r--src/mame/drivers/trvquest.cpp4
-rw-r--r--src/mame/drivers/tryout.cpp2
-rw-r--r--src/mame/drivers/ts802.cpp12
-rw-r--r--src/mame/drivers/ts803.cpp8
-rw-r--r--src/mame/drivers/ts816.cpp12
-rw-r--r--src/mame/drivers/tsamurai.cpp32
-rw-r--r--src/mame/drivers/tsispch.cpp17
-rw-r--r--src/mame/drivers/ttchamp.cpp8
-rw-r--r--src/mame/drivers/tubep.cpp18
-rw-r--r--src/mame/drivers/tugboat.cpp8
-rw-r--r--src/mame/drivers/tumbleb.cpp30
-rw-r--r--src/mame/drivers/tumblep.cpp4
-rw-r--r--src/mame/drivers/tunhunt.cpp8
-rw-r--r--src/mame/drivers/turbo.cpp28
-rw-r--r--src/mame/drivers/turrett.cpp13
-rw-r--r--src/mame/drivers/tutankhm.cpp6
-rw-r--r--src/mame/drivers/tutor.cpp10
-rw-r--r--src/mame/drivers/tv910.cpp6
-rw-r--r--src/mame/drivers/tv950.cpp6
-rw-r--r--src/mame/drivers/tv990.cpp6
-rw-r--r--src/mame/drivers/tvc.cpp10
-rw-r--r--src/mame/drivers/tvcapcom.cpp4
-rw-r--r--src/mame/drivers/tvgame.cpp6
-rw-r--r--src/mame/drivers/twin16.cpp38
-rw-r--r--src/mame/drivers/twincobr.cpp2
-rw-r--r--src/mame/drivers/twinkle.cpp40
-rw-r--r--src/mame/drivers/twins.cpp12
-rw-r--r--src/mame/drivers/tx0.cpp32
-rw-r--r--src/mame/drivers/tx1.cpp16
-rw-r--r--src/mame/drivers/uapce.cpp12
-rw-r--r--src/mame/drivers/uknc.cpp6
-rw-r--r--src/mame/drivers/ultraman.cpp6
-rw-r--r--src/mame/drivers/ultratnk.cpp4
-rw-r--r--src/mame/drivers/ultrsprt.cpp4
-rw-r--r--src/mame/drivers/umipoker.cpp6
-rw-r--r--src/mame/drivers/undrfire.cpp14
-rw-r--r--src/mame/drivers/unichamp.cpp25
-rw-r--r--src/mame/drivers/unico.cpp24
-rw-r--r--src/mame/drivers/unior.cpp8
-rw-r--r--src/mame/drivers/unistar.cpp6
-rw-r--r--src/mame/drivers/univac.cpp6
-rw-r--r--src/mame/drivers/unixpc.cpp10
-rw-r--r--src/mame/drivers/unkhorse.cpp4
-rw-r--r--src/mame/drivers/upscope.cpp2
-rw-r--r--src/mame/drivers/usbilliards.cpp6
-rw-r--r--src/mame/drivers/usgames.cpp18
-rw-r--r--src/mame/drivers/ut88.cpp8
-rw-r--r--src/mame/drivers/uzebox.cpp6
-rw-r--r--src/mame/drivers/v1050.cpp8
-rw-r--r--src/mame/drivers/v6809.cpp16
-rw-r--r--src/mame/drivers/vamphalf.cpp60
-rw-r--r--src/mame/drivers/vaportra.cpp6
-rw-r--r--src/mame/drivers/vastar.cpp12
-rw-r--r--src/mame/drivers/vax11.cpp12
-rw-r--r--src/mame/drivers/vball.cpp12
-rw-r--r--src/mame/drivers/vboy.cpp6
-rw-r--r--src/mame/drivers/vc4000.cpp54
-rw-r--r--src/mame/drivers/vcombat.cpp8
-rw-r--r--src/mame/drivers/vcs80.cpp6
-rw-r--r--src/mame/drivers/vd.cpp6
-rw-r--r--src/mame/drivers/vector06.cpp20
-rw-r--r--src/mame/drivers/vector4.cpp21
-rw-r--r--src/mame/drivers/vectrex.cpp8
-rw-r--r--src/mame/drivers/vega.cpp2
-rw-r--r--src/mame/drivers/vegaeo.cpp2
-rw-r--r--src/mame/drivers/vegas.cpp50
-rw-r--r--src/mame/drivers/vendetta.cpp24
-rw-r--r--src/mame/drivers/vertigo.cpp4
-rw-r--r--src/mame/drivers/vg5k.cpp6
-rw-r--r--src/mame/drivers/vgmplay.cpp11
-rw-r--r--src/mame/drivers/vic10.cpp4
-rw-r--r--src/mame/drivers/vic20.cpp12
-rw-r--r--src/mame/drivers/vicdual.cpp92
-rw-r--r--src/mame/drivers/victor9k.cpp18
-rw-r--r--src/mame/drivers/victory.cpp6
-rw-r--r--src/mame/drivers/vidbrain.cpp6
-rw-r--r--src/mame/drivers/videopin.cpp6
-rw-r--r--src/mame/drivers/videopkr.cpp20
-rw-r--r--src/mame/drivers/vigilant.cpp42
-rw-r--r--src/mame/drivers/vii.cpp10
-rw-r--r--src/mame/drivers/vindictr.cpp2
-rw-r--r--src/mame/drivers/vip.cpp8
-rw-r--r--src/mame/drivers/viper.cpp2
-rw-r--r--src/mame/drivers/vis.cpp13
-rw-r--r--src/mame/drivers/vixen.cpp6
-rw-r--r--src/mame/drivers/vk100.cpp4
-rw-r--r--src/mame/drivers/vlc.cpp5
-rw-r--r--src/mame/drivers/volfied.cpp14
-rw-r--r--src/mame/drivers/votrpss.cpp13
-rw-r--r--src/mame/drivers/votrtnt.cpp6
-rw-r--r--src/mame/drivers/voyager.cpp2
-rw-r--r--src/mame/drivers/vp101.cpp12
-rw-r--r--src/mame/drivers/vpoker.cpp8
-rw-r--r--src/mame/drivers/vroulet.cpp4
-rw-r--r--src/mame/drivers/vsmilepro.cpp6
-rw-r--r--src/mame/drivers/vsnes.cpp116
-rw-r--r--src/mame/drivers/vt100.cpp26
-rw-r--r--src/mame/drivers/vt220.cpp6
-rw-r--r--src/mame/drivers/vt240.cpp8
-rw-r--r--src/mame/drivers/vt320.cpp12
-rw-r--r--src/mame/drivers/vt520.cpp10
-rw-r--r--src/mame/drivers/vta2000.cpp6
-rw-r--r--src/mame/drivers/vtech1.cpp16
-rw-r--r--src/mame/drivers/vtech2.cpp10
-rw-r--r--src/mame/drivers/vulgus.cpp8
-rw-r--r--src/mame/drivers/wacky_gator.cpp4
-rw-r--r--src/mame/drivers/wallc.cpp10
-rw-r--r--src/mame/drivers/wangpc.cpp6
-rw-r--r--src/mame/drivers/wardner.cpp8
-rw-r--r--src/mame/drivers/warpsped.cpp4
-rw-r--r--src/mame/drivers/warpwarp.cpp4
-rw-r--r--src/mame/drivers/warriorb.cpp14
-rw-r--r--src/mame/drivers/wc90.cpp12
-rw-r--r--src/mame/drivers/wc90b.cpp10
-rw-r--r--src/mame/drivers/wecleman.cpp4
-rw-r--r--src/mame/drivers/welltris.cpp8
-rw-r--r--src/mame/drivers/wgp.cpp12
-rw-r--r--src/mame/drivers/wheelfir.cpp4
-rw-r--r--src/mame/drivers/white_mod.cpp308
-rw-r--r--src/mame/drivers/whitestar.cpp390
-rw-r--r--src/mame/drivers/wicat.cpp8
-rw-r--r--src/mame/drivers/wico.cpp4
-rw-r--r--src/mame/drivers/wildpkr.cpp8
-rw-r--r--src/mame/drivers/williams.cpp52
-rw-r--r--src/mame/drivers/wink.cpp2
-rw-r--r--src/mame/drivers/wiping.cpp6
-rw-r--r--src/mame/drivers/witch.cpp2
-rw-r--r--src/mame/drivers/wiz.cpp20
-rw-r--r--src/mame/drivers/wmg.cpp2
-rw-r--r--src/mame/drivers/wms.cpp2
-rw-r--r--src/mame/drivers/wolfpack.cpp4
-rw-r--r--src/mame/drivers/wpc_95.cpp2
-rw-r--r--src/mame/drivers/wpc_an.cpp40
-rw-r--r--src/mame/drivers/wpc_dcs.cpp2
-rw-r--r--src/mame/drivers/wpc_dot.cpp2
-rw-r--r--src/mame/drivers/wpc_flip1.cpp2
-rw-r--r--src/mame/drivers/wpc_flip2.cpp100
-rw-r--r--src/mame/drivers/wpc_s.cpp2
-rw-r--r--src/mame/drivers/wrally.cpp12
-rw-r--r--src/mame/drivers/wswan.cpp8
-rw-r--r--src/mame/drivers/wwfsstar.cpp14
-rw-r--r--src/mame/drivers/wyvernf0.cpp4
-rw-r--r--src/mame/drivers/x07.cpp2
-rw-r--r--src/mame/drivers/x1.cpp8
-rw-r--r--src/mame/drivers/x1twin.cpp6
-rw-r--r--src/mame/drivers/x68k.cpp26
-rw-r--r--src/mame/drivers/xain.cpp12
-rw-r--r--src/mame/drivers/xavix.cpp4
-rw-r--r--src/mame/drivers/xbox.cpp8
-rw-r--r--src/mame/drivers/xerox820.cpp20
-rw-r--r--src/mame/drivers/xexex.cpp2
-rw-r--r--src/mame/drivers/xmen.cpp28
-rw-r--r--src/mame/drivers/xor100.cpp6
-rw-r--r--src/mame/drivers/xorworld.cpp2
-rw-r--r--src/mame/drivers/xtheball.cpp4
-rw-r--r--src/mame/drivers/xtom3d.cpp4
-rw-r--r--src/mame/drivers/xxmissio.cpp4
-rw-r--r--src/mame/drivers/xybots.cpp2
-rw-r--r--src/mame/drivers/xyonix.cpp4
-rw-r--r--src/mame/drivers/yiear.cpp6
-rw-r--r--src/mame/drivers/ymmu100.cpp9
-rw-r--r--src/mame/drivers/yunsun16.cpp22
-rw-r--r--src/mame/drivers/yunsung8.cpp14
-rw-r--r--src/mame/drivers/z100.cpp10
-rw-r--r--src/mame/drivers/z1013.cpp14
-rw-r--r--src/mame/drivers/z80dev.cpp6
-rw-r--r--src/mame/drivers/z80ne.cpp14
-rw-r--r--src/mame/drivers/z88.cpp27
-rw-r--r--src/mame/drivers/z9001.cpp22
-rw-r--r--src/mame/drivers/zac2650.cpp8
-rw-r--r--src/mame/drivers/zac_1.cpp26
-rw-r--r--src/mame/drivers/zac_2.cpp84
-rw-r--r--src/mame/drivers/zac_proto.cpp8
-rw-r--r--src/mame/drivers/zaccaria.cpp10
-rw-r--r--src/mame/drivers/zapcomputer.cpp6
-rw-r--r--src/mame/drivers/zaurus.cpp14
-rw-r--r--src/mame/drivers/zaxxon.cpp26
-rw-r--r--src/mame/drivers/zerozone.cpp8
-rw-r--r--src/mame/drivers/zexall.cpp6
-rw-r--r--src/mame/drivers/zn.cpp214
-rw-r--r--src/mame/drivers/zodiack.cpp12
-rw-r--r--src/mame/drivers/zorba.cpp6
-rw-r--r--src/mame/drivers/zr107.cpp8
-rw-r--r--src/mame/drivers/zrt80.cpp12
-rw-r--r--src/mame/drivers/zsbc3.cpp13
-rw-r--r--src/mame/drivers/zwackery.cpp6
-rw-r--r--src/mame/drivers/zx.cpp4
-rw-r--r--src/mame/etc/template_cpu.cpp35
-rw-r--r--src/mame/etc/template_cpu.h14
-rw-r--r--src/mame/etc/template_device.cpp6
-rw-r--r--src/mame/etc/template_device.h18
-rw-r--r--src/mame/etc/template_driver.cpp20
-rw-r--r--src/mame/includes/abc1600.h10
-rw-r--r--src/mame/includes/abc80.h12
-rw-r--r--src/mame/includes/alesis.h10
-rw-r--r--src/mame/includes/amiga.h10
-rw-r--r--src/mame/includes/apollo.h40
-rw-r--r--src/mame/includes/apple3.h2
-rw-r--r--src/mame/includes/arcadia.h6
-rw-r--r--src/mame/includes/archimds.h2
-rw-r--r--src/mame/includes/atarigt.h3
-rw-r--r--src/mame/includes/atarigx2.h16
-rw-r--r--src/mame/includes/atarist.h10
-rw-r--r--src/mame/includes/aussiebyte.h2
-rw-r--r--src/mame/includes/b2m.h74
-rw-r--r--src/mame/includes/bbc.h4
-rw-r--r--src/mame/includes/bfm_sc4.h14
-rw-r--r--src/mame/includes/bullet.h85
-rw-r--r--src/mame/includes/bw2.h10
-rw-r--r--src/mame/includes/capbowl.h8
-rw-r--r--src/mame/includes/cidelsa.h20
-rw-r--r--src/mame/includes/dgn_beta.h2
-rw-r--r--src/mame/includes/dgnalpha.h24
-rw-r--r--src/mame/includes/dm7000.h10
-rw-r--r--src/mame/includes/dooyong.h297
-rw-r--r--src/mame/includes/einstein.h102
-rw-r--r--src/mame/includes/fm7.h23
-rw-r--r--src/mame/includes/fmtowns.h2
-rw-r--r--src/mame/includes/gomoku.h76
-rw-r--r--src/mame/includes/gridlee.h5
-rw-r--r--src/mame/includes/harddriv.h80
-rw-r--r--src/mame/includes/hec2hrp.h8
-rw-r--r--src/mame/includes/hp48.h9
-rw-r--r--src/mame/includes/jpmimpct.h2
-rw-r--r--src/mame/includes/jpmsys5.h2
-rw-r--r--src/mame/includes/jupiter.h18
-rw-r--r--src/mame/includes/kaypro.h9
-rw-r--r--src/mame/includes/leland.h125
-rw-r--r--src/mame/includes/llc.h5
-rw-r--r--src/mame/includes/m5.h75
-rw-r--r--src/mame/includes/mario.h8
-rw-r--r--src/mame/includes/maygay1b.h2
-rw-r--r--src/mame/includes/mbc55x.h54
-rw-r--r--src/mame/includes/mbee.h4
-rw-r--r--src/mame/includes/micro3d.h76
-rw-r--r--src/mame/includes/model1.h2
-rw-r--r--src/mame/includes/model2.h2
-rw-r--r--src/mame/includes/mpu4.h2
-rw-r--r--src/mame/includes/mpz80.h10
-rw-r--r--src/mame/includes/n64.h10
-rw-r--r--src/mame/includes/namcos2.h8
-rw-r--r--src/mame/includes/nb1413m3.h7
-rw-r--r--src/mame/includes/nb1414m4.h13
-rw-r--r--src/mame/includes/nes.h62
-rw-r--r--src/mame/includes/newbrain.h2
-rw-r--r--src/mame/includes/orion.h42
-rw-r--r--src/mame/includes/osborne1.h2
-rw-r--r--src/mame/includes/partner.h12
-rw-r--r--src/mame/includes/patinhofeio.h22
-rw-r--r--src/mame/includes/pc1512.h2
-rw-r--r--src/mame/includes/pes.h2
-rw-r--r--src/mame/includes/phoenix.h104
-rw-r--r--src/mame/includes/pk8020.h2
-rw-r--r--src/mame/includes/plygonet.h8
-rw-r--r--src/mame/includes/polepos.h8
-rw-r--r--src/mame/includes/rm380z.h13
-rw-r--r--src/mame/includes/rmnimbus.h11
-rw-r--r--src/mame/includes/samcoupe.h2
-rw-r--r--src/mame/includes/segag80r.h9
-rw-r--r--src/mame/includes/segas16b.h2
-rw-r--r--src/mame/includes/segas24.h6
-rw-r--r--src/mame/includes/segas32.h11
-rw-r--r--src/mame/includes/segaxbd.h33
-rw-r--r--src/mame/includes/slapstic.h30
-rw-r--r--src/mame/includes/snk6502.h81
-rw-r--r--src/mame/includes/softbox.h2
-rw-r--r--src/mame/includes/special.h10
-rw-r--r--src/mame/includes/super6.h52
-rw-r--r--src/mame/includes/super80.h2
-rw-r--r--src/mame/includes/swtpc09.h76
-rw-r--r--src/mame/includes/tandy2k.h8
-rw-r--r--src/mame/includes/thomson.h10
-rw-r--r--src/mame/includes/tiamc1.h76
-rw-r--r--src/mame/includes/tiki100.h53
-rw-r--r--src/mame/includes/tranz330.h2
-rw-r--r--src/mame/includes/trs80.h2
-rw-r--r--src/mame/includes/trs80m2.h92
-rw-r--r--src/mame/includes/tsispch.h31
-rw-r--r--src/mame/includes/turrett.h8
-rw-r--r--src/mame/includes/tx1.h13
-rw-r--r--src/mame/includes/v1050.h13
-rw-r--r--src/mame/includes/vector06.h2
-rw-r--r--src/mame/includes/vixen.h10
-rw-r--r--src/mame/includes/x1.h58
-rw-r--r--src/mame/includes/xbox_pci.h4
-rw-r--r--src/mame/includes/xbox_usb.h10
-rw-r--r--src/mame/includes/xerox820.h59
-rw-r--r--src/mame/includes/xor100.h62
-rw-r--r--src/mame/includes/z80ne.h10
-rw-r--r--src/mame/includes/zorba.h8
-rw-r--r--src/mame/machine/315-5838_317-0229_comp.cpp4
-rw-r--r--src/mame/machine/315-5838_317-0229_comp.h19
-rw-r--r--src/mame/machine/315-5881_crypt.cpp4
-rw-r--r--src/mame/machine/315-5881_crypt.h8
-rw-r--r--src/mame/machine/315_5296.cpp4
-rw-r--r--src/mame/machine/315_5296.h10
-rw-r--r--src/mame/machine/6883sam.cpp4
-rw-r--r--src/mame/machine/6883sam.h16
-rw-r--r--src/mame/machine/abc1600mac.cpp4
-rw-r--r--src/mame/machine/abc1600mac.h9
-rw-r--r--src/mame/machine/abc80kb.cpp10
-rw-r--r--src/mame/machine/abc80kb.h11
-rw-r--r--src/mame/machine/alpha8201.cpp8
-rw-r--r--src/mame/machine/alpha8201.h8
-rw-r--r--src/mame/machine/amstrad.cpp10
-rw-r--r--src/mame/machine/apollo.cpp31
-rw-r--r--src/mame/machine/apollo_dbg.h8
-rw-r--r--src/mame/machine/apollo_kbd.cpp11
-rw-r--r--src/mame/machine/apollo_kbd.h12
-rw-r--r--src/mame/machine/apricotkb.cpp4
-rw-r--r--src/mame/machine/apricotkb.h10
-rw-r--r--src/mame/machine/asic65.cpp4
-rw-r--r--src/mame/machine/asic65.h12
-rw-r--r--src/mame/machine/at.cpp4
-rw-r--r--src/mame/machine/at.h2
-rw-r--r--src/mame/machine/atari_vg.cpp4
-rw-r--r--src/mame/machine/atari_vg.h20
-rw-r--r--src/mame/machine/atarifdc.cpp15
-rw-r--r--src/mame/machine/atarifdc.h8
-rw-r--r--src/mame/machine/atarigen.cpp20
-rw-r--r--src/mame/machine/atarigen.h12
-rw-r--r--src/mame/machine/atarixga.cpp8
-rw-r--r--src/mame/machine/atarixga.h22
-rw-r--r--src/mame/machine/awboard.cpp4
-rw-r--r--src/mame/machine/awboard.h10
-rw-r--r--src/mame/machine/b2m.cpp3
-rw-r--r--src/mame/machine/balsente.cpp28
-rw-r--r--src/mame/machine/bebox.cpp32
-rw-r--r--src/mame/machine/beta.cpp7
-rw-r--r--src/mame/machine/beta.h17
-rw-r--r--src/mame/machine/bfm_bd1.cpp34
-rw-r--r--src/mame/machine/bfm_bd1.h17
-rw-r--r--src/mame/machine/bfm_bda.cpp28
-rw-r--r--src/mame/machine/bfm_bda.h17
-rw-r--r--src/mame/machine/c117.cpp4
-rw-r--r--src/mame/machine/c117.h8
-rw-r--r--src/mame/machine/cammu.cpp22
-rw-r--r--src/mame/machine/cammu.h20
-rw-r--r--src/mame/machine/cat702.cpp4
-rw-r--r--src/mame/machine/cat702.h12
-rw-r--r--src/mame/machine/cdi070.cpp7
-rw-r--r--src/mame/machine/cdi070.h10
-rw-r--r--src/mame/machine/cdicdic.cpp10
-rw-r--r--src/mame/machine/cdicdic.h10
-rw-r--r--src/mame/machine/cdislave.cpp8
-rw-r--r--src/mame/machine/cdislave.h6
-rw-r--r--src/mame/machine/cedar_magnet_board.h6
-rw-r--r--src/mame/machine/cedar_magnet_flop.cpp4
-rw-r--r--src/mame/machine/cedar_magnet_flop.h28
-rw-r--r--src/mame/machine/cedar_magnet_plane.cpp6
-rw-r--r--src/mame/machine/cedar_magnet_plane.h21
-rw-r--r--src/mame/machine/cedar_magnet_sprite.cpp4
-rw-r--r--src/mame/machine/cedar_magnet_sprite.h44
-rw-r--r--src/mame/machine/coco_vhd.cpp6
-rw-r--r--src/mame/machine/coco_vhd.h10
-rw-r--r--src/mame/machine/compiskb.cpp4
-rw-r--r--src/mame/machine/compiskb.h9
-rw-r--r--src/mame/machine/cuda.cpp4
-rw-r--r--src/mame/machine/cuda.h2
-rw-r--r--src/mame/machine/dc-ctrl.cpp4
-rw-r--r--src/mame/machine/dc-ctrl.h10
-rw-r--r--src/mame/machine/dec_lk201.cpp4
-rw-r--r--src/mame/machine/dec_lk201.h10
-rw-r--r--src/mame/machine/deco104.cpp10
-rw-r--r--src/mame/machine/deco104.h24
-rw-r--r--src/mame/machine/deco146.cpp29
-rw-r--r--src/mame/machine/deco146.h32
-rw-r--r--src/mame/machine/deco156.h6
-rw-r--r--src/mame/machine/deco222.cpp8
-rw-r--r--src/mame/machine/deco222.h10
-rw-r--r--src/mame/machine/decocass_tape.cpp7
-rw-r--r--src/mame/machine/decocass_tape.h10
-rw-r--r--src/mame/machine/decocpu6.cpp4
-rw-r--r--src/mame/machine/decocpu6.h7
-rw-r--r--src/mame/machine/decocpu7.cpp4
-rw-r--r--src/mame/machine/decocpu7.h8
-rw-r--r--src/mame/machine/decopincpu.cpp43
-rw-r--r--src/mame/machine/decopincpu.h60
-rw-r--r--src/mame/machine/dmv_keyb.cpp4
-rw-r--r--src/mame/machine/dmv_keyb.h11
-rw-r--r--src/mame/machine/docg3.cpp6
-rw-r--r--src/mame/machine/docg3.h15
-rw-r--r--src/mame/machine/egret.cpp4
-rw-r--r--src/mame/machine/egret.h11
-rw-r--r--src/mame/machine/einstein.cpp18
-rw-r--r--src/mame/machine/esqlcd.cpp62
-rw-r--r--src/mame/machine/esqlcd.h34
-rw-r--r--src/mame/machine/esqpanel.cpp22
-rw-r--r--src/mame/machine/esqpanel.h93
-rw-r--r--src/mame/machine/esqvfd.cpp55
-rw-r--r--src/mame/machine/esqvfd.h60
-rw-r--r--src/mame/machine/fd1089.cpp15
-rw-r--r--src/mame/machine/fd1089.h18
-rw-r--r--src/mame/machine/fd1094.cpp7
-rw-r--r--src/mame/machine/fd1094.h8
-rw-r--r--src/mame/machine/fm_scsi.cpp24
-rw-r--r--src/mame/machine/fm_scsi.h32
-rw-r--r--src/mame/machine/fmt_icmem.cpp4
-rw-r--r--src/mame/machine/fmt_icmem.h13
-rw-r--r--src/mame/machine/gaelco3d.cpp32
-rw-r--r--src/mame/machine/gaelco3d.h73
-rw-r--r--src/mame/machine/gdrom.cpp4
-rw-r--r--src/mame/machine/gdrom.h11
-rw-r--r--src/mame/machine/hp48.cpp6
-rw-r--r--src/mame/machine/ibm6580_fdc.cpp6
-rw-r--r--src/mame/machine/ibm6580_fdc.h17
-rw-r--r--src/mame/machine/ibm6580_kbd.cpp7
-rw-r--r--src/mame/machine/ibm6580_kbd.h17
-rw-r--r--src/mame/machine/igs022.cpp4
-rw-r--r--src/mame/machine/igs022.h4
-rw-r--r--src/mame/machine/igs025.cpp8
-rw-r--r--src/mame/machine/igs025.h3
-rw-r--r--src/mame/machine/igs028.cpp4
-rw-r--r--src/mame/machine/igs028.h4
-rw-r--r--src/mame/machine/inder_sb.cpp10
-rw-r--r--src/mame/machine/inder_sb.h23
-rw-r--r--src/mame/machine/inder_vid.cpp4
-rw-r--r--src/mame/machine/inder_vid.h22
-rw-r--r--src/mame/machine/interpro_ioga.cpp4
-rw-r--r--src/mame/machine/interpro_ioga.h10
-rw-r--r--src/mame/machine/interpro_mcga.cpp4
-rw-r--r--src/mame/machine/interpro_mcga.h10
-rw-r--r--src/mame/machine/interpro_sga.cpp4
-rw-r--r--src/mame/machine/interpro_sga.h10
-rw-r--r--src/mame/machine/intv.cpp16
-rw-r--r--src/mame/machine/isbc_208.cpp7
-rw-r--r--src/mame/machine/isbc_208.h13
-rw-r--r--src/mame/machine/isbc_215g.cpp4
-rw-r--r--src/mame/machine/isbc_215g.h10
-rw-r--r--src/mame/machine/iteagle_fpga.cpp24
-rw-r--r--src/mame/machine/iteagle_fpga.h14
-rw-r--r--src/mame/machine/jvs13551.cpp50
-rw-r--r--src/mame/machine/jvs13551.h37
-rw-r--r--src/mame/machine/k573cass.cpp44
-rw-r--r--src/mame/machine/k573cass.h30
-rw-r--r--src/mame/machine/k573dio.cpp4
-rw-r--r--src/mame/machine/k573dio.h10
-rw-r--r--src/mame/machine/k573mcr.cpp4
-rw-r--r--src/mame/machine/k573mcr.h8
-rw-r--r--src/mame/machine/k573msu.cpp4
-rw-r--r--src/mame/machine/k573msu.h8
-rw-r--r--src/mame/machine/k573npu.cpp4
-rw-r--r--src/mame/machine/k573npu.h8
-rw-r--r--src/mame/machine/k7659kb.cpp4
-rw-r--r--src/mame/machine/k7659kb.h11
-rw-r--r--src/mame/machine/kaneko_calc3.cpp7
-rw-r--r--src/mame/machine/kaneko_calc3.h9
-rw-r--r--src/mame/machine/kaneko_hit.cpp4
-rw-r--r--src/mame/machine/kaneko_hit.h70
-rw-r--r--src/mame/machine/kaneko_toybox.cpp325
-rw-r--r--src/mame/machine/kaneko_toybox.h346
-rw-r--r--src/mame/machine/kc_keyb.cpp12
-rw-r--r--src/mame/machine/kc_keyb.h24
-rw-r--r--src/mame/machine/km035.cpp4
-rw-r--r--src/mame/machine/km035.h10
-rw-r--r--src/mame/machine/konami1.cpp4
-rw-r--r--src/mame/machine/konami1.h9
-rw-r--r--src/mame/machine/konppc.cpp4
-rw-r--r--src/mame/machine/konppc.h26
-rw-r--r--src/mame/machine/leland.cpp4
-rw-r--r--src/mame/machine/lviv.cpp26
-rw-r--r--src/mame/machine/m1comm.cpp65
-rw-r--r--src/mame/machine/m1comm.h12
-rw-r--r--src/mame/machine/m20_8086.cpp4
-rw-r--r--src/mame/machine/m20_8086.h14
-rw-r--r--src/mame/machine/m20_kbd.cpp4
-rw-r--r--src/mame/machine/m20_kbd.h2
-rw-r--r--src/mame/machine/m24_kbd.cpp4
-rw-r--r--src/mame/machine/m24_kbd.h22
-rw-r--r--src/mame/machine/m24_z8000.cpp4
-rw-r--r--src/mame/machine/m24_z8000.h19
-rw-r--r--src/mame/machine/m2comm.cpp29
-rw-r--r--src/mame/machine/m2comm.h14
-rw-r--r--src/mame/machine/m3comm.cpp4
-rw-r--r--src/mame/machine/m3comm.h10
-rw-r--r--src/mame/machine/mackbd.cpp4
-rw-r--r--src/mame/machine/mackbd.h11
-rw-r--r--src/mame/machine/macrtc.cpp4
-rw-r--r--src/mame/machine/macrtc.h10
-rw-r--r--src/mame/machine/maple-dc.cpp4
-rw-r--r--src/mame/machine/maple-dc.h10
-rw-r--r--src/mame/machine/mapledev.cpp2
-rw-r--r--src/mame/machine/mapledev.h10
-rw-r--r--src/mame/machine/mathbox.cpp4
-rw-r--r--src/mame/machine/mathbox.h8
-rw-r--r--src/mame/machine/mc8123.cpp6
-rw-r--r--src/mame/machine/mc8123.h9
-rw-r--r--src/mame/machine/mega32x.cpp36
-rw-r--r--src/mame/machine/mega32x.h85
-rw-r--r--src/mame/machine/megacd.cpp48
-rw-r--r--src/mame/machine/megacd.h244
-rw-r--r--src/mame/machine/megacdcd.cpp127
-rw-r--r--src/mame/machine/megacdcd.h236
-rw-r--r--src/mame/machine/meters.cpp6
-rw-r--r--src/mame/machine/meters.h19
-rw-r--r--src/mame/machine/micro3d.cpp72
-rw-r--r--src/mame/machine/microdrv.cpp4
-rw-r--r--src/mame/machine/microdrv.h14
-rw-r--r--src/mame/machine/micropolis.cpp11
-rw-r--r--src/mame/machine/micropolis.h17
-rw-r--r--src/mame/machine/midikbd.cpp4
-rw-r--r--src/mame/machine/midikbd.h15
-rw-r--r--src/mame/machine/midwayic.cpp41
-rw-r--r--src/mame/machine/midwayic.h33
-rw-r--r--src/mame/machine/mie.cpp8
-rw-r--r--src/mame/machine/mie.h14
-rw-r--r--src/mame/machine/mm1kb.cpp24
-rw-r--r--src/mame/machine/mm1kb.h18
-rw-r--r--src/mame/machine/ms7004.cpp4
-rw-r--r--src/mame/machine/ms7004.h14
-rw-r--r--src/mame/machine/msx_matsushita.cpp4
-rw-r--r--src/mame/machine/msx_matsushita.h11
-rw-r--r--src/mame/machine/msx_s1985.cpp4
-rw-r--r--src/mame/machine/msx_s1985.h8
-rw-r--r--src/mame/machine/msx_systemflags.cpp4
-rw-r--r--src/mame/machine/msx_systemflags.h8
-rw-r--r--src/mame/machine/n64.cpp4
-rw-r--r--src/mame/machine/namco06.cpp85
-rw-r--r--src/mame/machine/namco06.h66
-rw-r--r--src/mame/machine/namco50.cpp4
-rw-r--r--src/mame/machine/namco50.h10
-rw-r--r--src/mame/machine/namco51.cpp32
-rw-r--r--src/mame/machine/namco51.h39
-rw-r--r--src/mame/machine/namco53.cpp27
-rw-r--r--src/mame/machine/namco53.h33
-rw-r--r--src/mame/machine/namco62.cpp24
-rw-r--r--src/mame/machine/namco62.h36
-rw-r--r--src/mame/machine/namco_c139.cpp4
-rw-r--r--src/mame/machine/namco_c139.h8
-rw-r--r--src/mame/machine/namco_c148.cpp18
-rw-r--r--src/mame/machine/namco_c148.h8
-rw-r--r--src/mame/machine/namco_settings.cpp4
-rw-r--r--src/mame/machine/namco_settings.h10
-rw-r--r--src/mame/machine/namcoic.cpp3
-rw-r--r--src/mame/machine/namcoic.h (renamed from src/mame/includes/namcoic.h)9
-rw-r--r--src/mame/machine/namcoio.cpp130
-rw-r--r--src/mame/machine/namcoio.h76
-rw-r--r--src/mame/machine/namcoio_gearbox.cpp4
-rw-r--r--src/mame/machine/namcoio_gearbox.h8
-rw-r--r--src/mame/machine/namcomcu.cpp20
-rw-r--r--src/mame/machine/namcomcu.h18
-rw-r--r--src/mame/machine/naomibd.cpp4
-rw-r--r--src/mame/machine/naomibd.h12
-rw-r--r--src/mame/machine/naomig1.cpp6
-rw-r--r--src/mame/machine/naomig1.h15
-rw-r--r--src/mame/machine/naomigd.cpp4
-rw-r--r--src/mame/machine/naomigd.h9
-rw-r--r--src/mame/machine/naomim1.cpp6
-rw-r--r--src/mame/machine/naomim1.h10
-rw-r--r--src/mame/machine/naomim2.cpp8
-rw-r--r--src/mame/machine/naomim2.h10
-rw-r--r--src/mame/machine/naomim4.cpp4
-rw-r--r--src/mame/machine/naomim4.h8
-rw-r--r--src/mame/machine/naomirom.cpp6
-rw-r--r--src/mame/machine/naomirom.h8
-rw-r--r--src/mame/machine/nb1413m3.cpp7
-rw-r--r--src/mame/machine/nb1414m4.cpp4
-rw-r--r--src/mame/machine/nes.cpp6
-rw-r--r--src/mame/machine/nextkbd.cpp4
-rw-r--r--src/mame/machine/nextkbd.h16
-rw-r--r--src/mame/machine/nextmo.cpp4
-rw-r--r--src/mame/machine/nextmo.h12
-rw-r--r--src/mame/machine/ng_memcard.cpp8
-rw-r--r--src/mame/machine/ng_memcard.h8
-rw-r--r--src/mame/machine/ngen_kb.cpp4
-rw-r--r--src/mame/machine/ngen_kb.h4
-rw-r--r--src/mame/machine/nmk004.cpp14
-rw-r--r--src/mame/machine/nmk004.h37
-rw-r--r--src/mame/machine/nmk112.cpp4
-rw-r--r--src/mame/machine/nmk112.h11
-rw-r--r--src/mame/machine/ns10crypt.cpp90
-rw-r--r--src/mame/machine/ns10crypt.h75
-rw-r--r--src/mame/machine/ns11prot.cpp40
-rw-r--r--src/mame/machine/ns11prot.h27
-rw-r--r--src/mame/machine/octo_kbd.cpp6
-rw-r--r--src/mame/machine/octo_kbd.h10
-rw-r--r--src/mame/machine/pc1512kb.cpp52
-rw-r--r--src/mame/machine/pc1512kb.h25
-rw-r--r--src/mame/machine/pc9801_118.cpp4
-rw-r--r--src/mame/machine/pc9801_118.h14
-rw-r--r--src/mame/machine/pc9801_26.cpp4
-rw-r--r--src/mame/machine/pc9801_26.h14
-rw-r--r--src/mame/machine/pc9801_86.cpp4
-rw-r--r--src/mame/machine/pc9801_86.h8
-rw-r--r--src/mame/machine/pc9801_cbus.cpp6
-rw-r--r--src/mame/machine/pc9801_cbus.h14
-rw-r--r--src/mame/machine/pc9801_cd.cpp4
-rw-r--r--src/mame/machine/pc9801_cd.h8
-rw-r--r--src/mame/machine/pc9801_kbd.cpp4
-rw-r--r--src/mame/machine/pc9801_kbd.h10
-rw-r--r--src/mame/machine/pcd_kbd.cpp4
-rw-r--r--src/mame/machine/pcd_kbd.h4
-rw-r--r--src/mame/machine/pce220_ser.cpp6
-rw-r--r--src/mame/machine/pce220_ser.h11
-rw-r--r--src/mame/machine/pce_cd.cpp16
-rw-r--r--src/mame/machine/pce_cd.h11
-rw-r--r--src/mame/machine/pecom.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs025_igs012.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs025_igs022.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs025_igs028.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type1.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type2.cpp2
-rw-r--r--src/mame/machine/pgmprot_igs027a_type3.cpp2
-rw-r--r--src/mame/machine/pgmprot_orlegend.cpp2
-rw-r--r--src/mame/machine/playch10.cpp8
-rw-r--r--src/mame/machine/poly88.cpp2
-rw-r--r--src/mame/machine/prof80mmu.cpp8
-rw-r--r--src/mame/machine/prof80mmu.h13
-rw-r--r--src/mame/machine/psion_pack.cpp6
-rw-r--r--src/mame/machine/psion_pack.h9
-rw-r--r--src/mame/machine/psxcd.cpp4
-rw-r--r--src/mame/machine/psxcd.h16
-rw-r--r--src/mame/machine/qimi.cpp26
-rw-r--r--src/mame/machine/qimi.h20
-rw-r--r--src/mame/machine/qx10kbd.cpp4
-rw-r--r--src/mame/machine/qx10kbd.h8
-rw-r--r--src/mame/machine/radio86.cpp3
-rw-r--r--src/mame/machine/rm380z.cpp2
-rw-r--r--src/mame/machine/rmnimbus.cpp2
-rw-r--r--src/mame/machine/rmnkbd.cpp5
-rw-r--r--src/mame/machine/rmnkbd.h1
-rw-r--r--src/mame/machine/rx01.cpp4
-rw-r--r--src/mame/machine/rx01.h10
-rw-r--r--src/mame/machine/s32comm.cpp29
-rw-r--r--src/mame/machine/s32comm.h16
-rw-r--r--src/mame/machine/segabb.cpp4
-rw-r--r--src/mame/machine/segabb.h10
-rw-r--r--src/mame/machine/segacrp2_device.cpp48
-rw-r--r--src/mame/machine/segacrp2_device.h32
-rw-r--r--src/mame/machine/segacrpt_device.cpp116
-rw-r--r--src/mame/machine/segacrpt_device.h86
-rw-r--r--src/mame/machine/segaic16.cpp16
-rw-r--r--src/mame/machine/segaic16.h14
-rw-r--r--src/mame/machine/seibucop/seibucop.cpp4
-rw-r--r--src/mame/machine/seibucop/seibucop.h2
-rw-r--r--src/mame/machine/seicop.cpp4
-rw-r--r--src/mame/machine/seicop.h10
-rw-r--r--src/mame/machine/sgi.cpp4
-rw-r--r--src/mame/machine/sgi.h15
-rw-r--r--src/mame/machine/slapstic.cpp14
-rw-r--r--src/mame/machine/sms.cpp32
-rw-r--r--src/mame/machine/snes.cpp58
-rw-r--r--src/mame/machine/st0016.cpp74
-rw-r--r--src/mame/machine/st0016.h48
-rw-r--r--src/mame/machine/swim.cpp4
-rw-r--r--src/mame/machine/swim.h8
-rw-r--r--src/mame/machine/swtpc09.cpp10
-rw-r--r--src/mame/machine/tait8741.cpp16
-rw-r--r--src/mame/machine/tait8741.h54
-rw-r--r--src/mame/machine/taito68705interface.cpp34
-rw-r--r--src/mame/machine/taito68705interface.h26
-rw-r--r--src/mame/machine/taitoio.cpp12
-rw-r--r--src/mame/machine/taitoio.h47
-rw-r--r--src/mame/machine/tandy2kb.cpp4
-rw-r--r--src/mame/machine/tandy2kb.h16
-rw-r--r--src/mame/machine/teleprinter.cpp30
-rw-r--r--src/mame/machine/teleprinter.h22
-rw-r--r--src/mame/machine/thomflop.cpp6
-rw-r--r--src/mame/machine/thomson.cpp6
-rw-r--r--src/mame/machine/ticket.cpp4
-rw-r--r--src/mame/machine/ticket.h6
-rw-r--r--src/mame/machine/trs80.cpp8
-rw-r--r--src/mame/machine/trs80m2kb.cpp4
-rw-r--r--src/mame/machine/trs80m2kb.h12
-rw-r--r--src/mame/machine/upd65031.cpp4
-rw-r--r--src/mame/machine/upd65031.h11
-rw-r--r--src/mame/machine/v1050kb.cpp4
-rw-r--r--src/mame/machine/v1050kb.h14
-rw-r--r--src/mame/machine/vector06.cpp6
-rw-r--r--src/mame/machine/victor9k_fdc.cpp180
-rw-r--r--src/mame/machine/victor9k_fdc.h29
-rw-r--r--src/mame/machine/victor9k_kb.cpp (renamed from src/mame/machine/victor9kb.cpp)36
-rw-r--r--src/mame/machine/victor9k_kb.h (renamed from src/mame/machine/victor9kb.h)24
-rw-r--r--src/mame/machine/vs9209.cpp8
-rw-r--r--src/mame/machine/vs9209.h8
-rw-r--r--src/mame/machine/vsnes.cpp8
-rw-r--r--src/mame/machine/wangpckb.cpp48
-rw-r--r--src/mame/machine/wangpckb.h22
-rw-r--r--src/mame/machine/wpc.cpp4
-rw-r--r--src/mame/machine/wpc.h42
-rw-r--r--src/mame/machine/wpc_lamp.cpp4
-rw-r--r--src/mame/machine/wpc_lamp.h10
-rw-r--r--src/mame/machine/wpc_out.cpp4
-rw-r--r--src/mame/machine/wpc_out.h10
-rw-r--r--src/mame/machine/wpc_pic.cpp4
-rw-r--r--src/mame/machine/wpc_pic.h10
-rw-r--r--src/mame/machine/wpc_shift.cpp4
-rw-r--r--src/mame/machine/wpc_shift.h8
-rw-r--r--src/mame/machine/x1.cpp6
-rw-r--r--src/mame/machine/x68k_hdc.cpp75
-rw-r--r--src/mame/machine/x68k_hdc.h85
-rw-r--r--src/mame/machine/x68k_kbd.cpp4
-rw-r--r--src/mame/machine/x68k_kbd.h2
-rw-r--r--src/mame/machine/x820kb.cpp44
-rw-r--r--src/mame/machine/x820kb.h21
-rw-r--r--src/mame/machine/xbox.cpp2
-rw-r--r--src/mame/machine/xbox_pci.cpp48
-rw-r--r--src/mame/machine/xbox_usb.cpp26
-rw-r--r--src/mame/machine/z80bin.cpp2
-rw-r--r--src/mame/machine/z80bin.h10
-rw-r--r--src/mame/machine/z80ne.cpp54
-rw-r--r--src/mame/machine/znmcu.cpp4
-rw-r--r--src/mame/machine/znmcu.h20
-rw-r--r--src/mame/machine/zorbakbd.cpp12
-rw-r--r--src/mame/machine/zorbakbd.h8
-rw-r--r--src/mame/machine/zs01.cpp4
-rw-r--r--src/mame/machine/zs01.h8
-rw-r--r--src/mame/machine/zx8302.cpp10
-rw-r--r--src/mame/machine/zx8302.h36
-rw-r--r--src/mame/video/733_asr.cpp4
-rw-r--r--src/mame/video/733_asr.h30
-rw-r--r--src/mame/video/911_vdt.cpp86
-rw-r--r--src/mame/video/911_vdt.h80
-rw-r--r--src/mame/video/abc1600.cpp4
-rw-r--r--src/mame/video/abc1600.h8
-rw-r--r--src/mame/video/agat7.cpp5
-rw-r--r--src/mame/video/agat7.h13
-rw-r--r--src/mame/video/airraid_dev.cpp4
-rw-r--r--src/mame/video/airraid_dev.h2
-rw-r--r--src/mame/video/antic.cpp335
-rw-r--r--src/mame/video/antic.h452
-rw-r--r--src/mame/video/apollo.cpp16
-rw-r--r--src/mame/video/apple2.cpp4
-rw-r--r--src/mame/video/apple2.h2
-rw-r--r--src/mame/video/asterix.cpp10
-rw-r--r--src/mame/video/atarimo.cpp4
-rw-r--r--src/mame/video/atarimo.h8
-rw-r--r--src/mame/video/atarirle.cpp4
-rw-r--r--src/mame/video/atarirle.h10
-rw-r--r--src/mame/video/avgdvg.cpp50
-rw-r--r--src/mame/video/avgdvg.h64
-rw-r--r--src/mame/video/aztarac.cpp4
-rw-r--r--src/mame/video/bfm_adr2.cpp8
-rw-r--r--src/mame/video/bfm_adr2.h11
-rw-r--r--src/mame/video/bfm_dm01.cpp50
-rw-r--r--src/mame/video/bfm_dm01.h29
-rw-r--r--src/mame/video/c45.cpp4
-rw-r--r--src/mame/video/c45.h28
-rw-r--r--src/mame/video/capbowl.cpp6
-rw-r--r--src/mame/video/cchasm.cpp2
-rw-r--r--src/mame/video/cinemat.cpp16
-rw-r--r--src/mame/video/comx35.cpp12
-rw-r--r--src/mame/video/crt.cpp4
-rw-r--r--src/mame/video/crt.h31
-rw-r--r--src/mame/video/dbz.cpp14
-rw-r--r--src/mame/video/decbac06.cpp4
-rw-r--r--src/mame/video/decbac06.h11
-rw-r--r--src/mame/video/deckarn.cpp4
-rw-r--r--src/mame/video/deckarn.h8
-rw-r--r--src/mame/video/decmxc06.cpp4
-rw-r--r--src/mame/video/decmxc06.h12
-rw-r--r--src/mame/video/deco16ic.cpp4
-rw-r--r--src/mame/video/deco16ic.h8
-rw-r--r--src/mame/video/deco_zoomspr.cpp4
-rw-r--r--src/mame/video/deco_zoomspr.h8
-rw-r--r--src/mame/video/decocomn.cpp4
-rw-r--r--src/mame/video/decocomn.h9
-rw-r--r--src/mame/video/decodmd1.cpp4
-rw-r--r--src/mame/video/decodmd1.h18
-rw-r--r--src/mame/video/decodmd2.cpp4
-rw-r--r--src/mame/video/decodmd2.h31
-rw-r--r--src/mame/video/decodmd3.cpp4
-rw-r--r--src/mame/video/decodmd3.h28
-rw-r--r--src/mame/video/decospr.cpp4
-rw-r--r--src/mame/video/decospr.h11
-rw-r--r--src/mame/video/dooyong.cpp552
-rw-r--r--src/mame/video/dooyong.h145
-rw-r--r--src/mame/video/excellent_spr.cpp6
-rw-r--r--src/mame/video/excellent_spr.h12
-rw-r--r--src/mame/video/exterm.cpp2
-rw-r--r--src/mame/video/fuukifg.cpp4
-rw-r--r--src/mame/video/fuukifg.h7
-rw-r--r--src/mame/video/gic.cpp31
-rw-r--r--src/mame/video/gic.h42
-rw-r--r--src/mame/video/gijoe.cpp12
-rw-r--r--src/mame/video/gime.cpp12
-rw-r--r--src/mame/video/gime.h20
-rw-r--r--src/mame/video/gp9001.cpp174
-rw-r--r--src/mame/video/gp9001.h154
-rw-r--r--src/mame/video/gstriker.cpp6
-rw-r--r--src/mame/video/gtia.cpp8
-rw-r--r--src/mame/video/gtia.h211
-rw-r--r--src/mame/video/igs017_igs031.cpp4
-rw-r--r--src/mame/video/igs017_igs031.h46
-rw-r--r--src/mame/video/intv.cpp4
-rw-r--r--src/mame/video/itech8.cpp14
-rw-r--r--src/mame/video/jalblend.cpp6
-rw-r--r--src/mame/video/jalblend.h9
-rw-r--r--src/mame/video/k001005.cpp6
-rw-r--r--src/mame/video/k001005.h38
-rw-r--r--src/mame/video/k001006.cpp4
-rw-r--r--src/mame/video/k001006.h8
-rw-r--r--src/mame/video/k001604.cpp4
-rw-r--r--src/mame/video/k001604.h10
-rw-r--r--src/mame/video/k007121.cpp6
-rw-r--r--src/mame/video/k007121.h11
-rw-r--r--src/mame/video/k007342.cpp4
-rw-r--r--src/mame/video/k007342.h11
-rw-r--r--src/mame/video/k007420.cpp4
-rw-r--r--src/mame/video/k007420.h11
-rw-r--r--src/mame/video/k037122.cpp4
-rw-r--r--src/mame/video/k037122.h11
-rw-r--r--src/mame/video/k051316.cpp7
-rw-r--r--src/mame/video/k051316.h14
-rw-r--r--src/mame/video/k051733.cpp7
-rw-r--r--src/mame/video/k051733.h11
-rw-r--r--src/mame/video/k051960.cpp7
-rw-r--r--src/mame/video/k051960.h14
-rw-r--r--src/mame/video/k052109.cpp7
-rw-r--r--src/mame/video/k052109.h7
-rw-r--r--src/mame/video/k053244_k053245.cpp7
-rw-r--r--src/mame/video/k053244_k053245.h15
-rw-r--r--src/mame/video/k053246_k053247_k055673.cpp23
-rw-r--r--src/mame/video/k053246_k053247_k055673.h20
-rw-r--r--src/mame/video/k053250.cpp4
-rw-r--r--src/mame/video/k053250.h10
-rw-r--r--src/mame/video/k053250_ps.cpp4
-rw-r--r--src/mame/video/k053250_ps.h10
-rw-r--r--src/mame/video/k053251.cpp7
-rw-r--r--src/mame/video/k053251.h26
-rw-r--r--src/mame/video/k053936.cpp6
-rw-r--r--src/mame/video/k053936.h9
-rw-r--r--src/mame/video/k054000.cpp7
-rw-r--r--src/mame/video/k054000.h12
-rw-r--r--src/mame/video/k054156_k054157_k056832.cpp21
-rw-r--r--src/mame/video/k054156_k054157_k056832.h23
-rw-r--r--src/mame/video/k054338.cpp8
-rw-r--r--src/mame/video/k054338.h10
-rw-r--r--src/mame/video/k055555.cpp11
-rw-r--r--src/mame/video/k055555.h9
-rw-r--r--src/mame/video/k057714.cpp6
-rw-r--r--src/mame/video/k057714.h11
-rw-r--r--src/mame/video/k1ge.cpp15
-rw-r--r--src/mame/video/k1ge.h25
-rw-r--r--src/mame/video/kan_pand.cpp4
-rw-r--r--src/mame/video/kan_pand.h11
-rw-r--r--src/mame/video/kaneko_grap2.cpp4
-rw-r--r--src/mame/video/kaneko_grap2.h8
-rw-r--r--src/mame/video/kaneko_spr.cpp15
-rw-r--r--src/mame/video/kaneko_spr.h15
-rw-r--r--src/mame/video/kaneko_tmap.cpp4
-rw-r--r--src/mame/video/kaneko_tmap.h31
-rw-r--r--src/mame/video/leland.cpp1
-rw-r--r--src/mame/video/maria.cpp4
-rw-r--r--src/mame/video/maria.h10
-rw-r--r--src/mame/video/mb60553.cpp38
-rw-r--r--src/mame/video/mb60553.h43
-rw-r--r--src/mame/video/mcd212.cpp6
-rw-r--r--src/mame/video/mcd212.h10
-rw-r--r--src/mame/video/micro3d.cpp4
-rw-r--r--src/mame/video/model2.cpp2
-rw-r--r--src/mame/video/moo.cpp12
-rw-r--r--src/mame/video/ms1_tmap.cpp4
-rw-r--r--src/mame/video/ms1_tmap.h8
-rw-r--r--src/mame/video/namco_c116.cpp4
-rw-r--r--src/mame/video/namco_c116.h8
-rw-r--r--src/mame/video/namcofl.cpp3
-rw-r--r--src/mame/video/namconb1.cpp3
-rw-r--r--src/mame/video/namcos2.cpp2
-rw-r--r--src/mame/video/namcos21.cpp4
-rw-r--r--src/mame/video/neogeo.cpp3
-rw-r--r--src/mame/video/neogeo_spr.cpp19
-rw-r--r--src/mame/video/neogeo_spr.h23
-rw-r--r--src/mame/video/nes.cpp2
-rw-r--r--src/mame/video/newport.cpp4
-rw-r--r--src/mame/video/newport.h213
-rw-r--r--src/mame/video/nick.cpp4
-rw-r--r--src/mame/video/nick.h2
-rw-r--r--src/mame/video/overdriv.cpp10
-rw-r--r--src/mame/video/parodius.cpp16
-rw-r--r--src/mame/video/pc080sn.cpp4
-rw-r--r--src/mame/video/pc080sn.h11
-rw-r--r--src/mame/video/pc090oj.cpp4
-rw-r--r--src/mame/video/pc090oj.h11
-rw-r--r--src/mame/video/pc_t1t.cpp12
-rw-r--r--src/mame/video/pc_t1t.h65
-rw-r--r--src/mame/video/pcd.cpp12
-rw-r--r--src/mame/video/pcd.h18
-rw-r--r--src/mame/video/pecom.cpp6
-rw-r--r--src/mame/video/powervr2.cpp8
-rw-r--r--src/mame/video/powervr2.h10
-rw-r--r--src/mame/video/sega16sp.cpp51
-rw-r--r--src/mame/video/sega16sp.h28
-rw-r--r--src/mame/video/segag80v.cpp2
-rw-r--r--src/mame/video/segahang.cpp20
-rw-r--r--src/mame/video/segaic16.cpp26
-rw-r--r--src/mame/video/segaic16.h143
-rw-r--r--src/mame/video/segaic16_road.cpp40
-rw-r--r--src/mame/video/segaic16_road.h63
-rw-r--r--src/mame/video/segaic24.cpp90
-rw-r--r--src/mame/video/segaic24.h28
-rw-r--r--src/mame/video/segaorun.cpp40
-rw-r--r--src/mame/video/segas16a.cpp18
-rw-r--r--src/mame/video/segas16b.cpp16
-rw-r--r--src/mame/video/segas18.cpp18
-rw-r--r--src/mame/video/segas24.cpp4
-rw-r--r--src/mame/video/segaxbd.cpp22
-rw-r--r--src/mame/video/segaybd.cpp2
-rw-r--r--src/mame/video/seibu_crtc.cpp4
-rw-r--r--src/mame/video/seibu_crtc.h20
-rw-r--r--src/mame/video/seta001.cpp4
-rw-r--r--src/mame/video/seta001.h8
-rw-r--r--src/mame/video/simpsons.cpp16
-rw-r--r--src/mame/video/sknsspr.cpp6
-rw-r--r--src/mame/video/sknsspr.h9
-rw-r--r--src/mame/video/snk6502.cpp7
-rw-r--r--src/mame/video/snk68_spr.cpp4
-rw-r--r--src/mame/video/snk68_spr.h9
-rw-r--r--src/mame/video/st0020.cpp4
-rw-r--r--src/mame/video/st0020.h9
-rw-r--r--src/mame/video/stfight_dev.cpp4
-rw-r--r--src/mame/video/stfight_dev.h8
-rw-r--r--src/mame/video/stic.cpp711
-rw-r--r--src/mame/video/stic.h512
-rw-r--r--src/mame/video/surpratk.cpp16
-rw-r--r--src/mame/video/tc0080vco.cpp4
-rw-r--r--src/mame/video/tc0080vco.h11
-rw-r--r--src/mame/video/tc0100scn.cpp4
-rw-r--r--src/mame/video/tc0100scn.h13
-rw-r--r--src/mame/video/tc0110pcr.cpp4
-rw-r--r--src/mame/video/tc0110pcr.h11
-rw-r--r--src/mame/video/tc0150rod.cpp6
-rw-r--r--src/mame/video/tc0150rod.h11
-rw-r--r--src/mame/video/tc0180vcu.cpp4
-rw-r--r--src/mame/video/tc0180vcu.h11
-rw-r--r--src/mame/video/tc0280grd.cpp4
-rw-r--r--src/mame/video/tc0280grd.h12
-rw-r--r--src/mame/video/tc0360pri.cpp4
-rw-r--r--src/mame/video/tc0360pri.h11
-rw-r--r--src/mame/video/tc0480scp.cpp4
-rw-r--r--src/mame/video/tc0480scp.h11
-rw-r--r--src/mame/video/tc0780fpa.cpp6
-rw-r--r--src/mame/video/tc0780fpa.h11
-rw-r--r--src/mame/video/tecmo_mix.cpp4
-rw-r--r--src/mame/video/tecmo_mix.h10
-rw-r--r--src/mame/video/tecmo_spr.cpp10
-rw-r--r--src/mame/video/tecmo_spr.h9
-rw-r--r--src/mame/video/tia.cpp20
-rw-r--r--src/mame/video/tia.h14
-rw-r--r--src/mame/video/tigeroad_spr.cpp4
-rw-r--r--src/mame/video/tigeroad_spr.h8
-rw-r--r--src/mame/video/tmc600.cpp6
-rw-r--r--src/mame/video/tmnt.cpp62
-rw-r--r--src/mame/video/toaplan2.cpp28
-rw-r--r--src/mame/video/toaplan_scu.cpp6
-rw-r--r--src/mame/video/toaplan_scu.h13
-rw-r--r--src/mame/video/uv201.cpp4
-rw-r--r--src/mame/video/uv201.h7
-rw-r--r--src/mame/video/vendetta.cpp14
-rw-r--r--src/mame/video/vertigo.cpp2
-rw-r--r--src/mame/video/vicdual-97269pb.cpp4
-rw-r--r--src/mame/video/vicdual-97269pb.h8
-rw-r--r--src/mame/video/vrender0.cpp4
-rw-r--r--src/mame/video/vrender0.h58
-rw-r--r--src/mame/video/vs920a.cpp26
-rw-r--r--src/mame/video/vs920a.h26
-rw-r--r--src/mame/video/vsystem_gga.cpp4
-rw-r--r--src/mame/video/vsystem_gga.h8
-rw-r--r--src/mame/video/vsystem_spr.cpp59
-rw-r--r--src/mame/video/vsystem_spr.h65
-rw-r--r--src/mame/video/vsystem_spr2.cpp123
-rw-r--r--src/mame/video/vsystem_spr2.h76
-rw-r--r--src/mame/video/vtvideo.cpp12
-rw-r--r--src/mame/video/vtvideo.h20
-rw-r--r--src/mame/video/wpc_dmd.cpp4
-rw-r--r--src/mame/video/wpc_dmd.h10
-rw-r--r--src/mame/video/wswan.cpp6
-rw-r--r--src/mame/video/wswan.h10
-rw-r--r--src/mame/video/xexex.cpp14
-rw-r--r--src/mame/video/xmen.cpp32
-rw-r--r--src/mame/video/ygv608.cpp193
-rw-r--r--src/mame/video/ygv608.h378
-rw-r--r--src/mame/video/zx8301.cpp4
-rw-r--r--src/mame/video/zx8301.h12
2972 files changed, 30762 insertions, 30187 deletions
diff --git a/src/mame/audio/8080bw.cpp b/src/mame/audio/8080bw.cpp
index 8928b1468bf..b8ec710d20f 100644
--- a/src/mame/audio/8080bw.cpp
+++ b/src/mame/audio/8080bw.cpp
@@ -908,7 +908,7 @@ WRITE8_MEMBER(_8080bw_state::schaser_sh_port_1_w)
m_sn->amplitude_res_w(RES_K(200));
}
m_sn->enable_w(!(m_schaser_effect_555_is_low || m_schaser_explosion));
- m_sn->one_shot_cap_voltage_w(!(m_schaser_effect_555_is_low || m_schaser_explosion) ? 0 : SN76477_EXTERNAL_VOLTAGE_DISCONNECT);
+ m_sn->one_shot_cap_voltage_w(!(m_schaser_effect_555_is_low || m_schaser_explosion) ? 0 : sn76477_device::EXTERNAL_VOLTAGE_DISCONNECT);
m_sn->mixer_b_w(m_schaser_explosion);
}
@@ -958,7 +958,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(_8080bw_state::schaser_effect_555_cb)
}
m_schaser_effect_555_timer->adjust(new_time, effect);
m_sn->enable_w(!(m_schaser_effect_555_is_low || m_schaser_explosion));
- m_sn->one_shot_cap_voltage_w(!(m_schaser_effect_555_is_low || m_schaser_explosion) ? 0 : SN76477_EXTERNAL_VOLTAGE_DISCONNECT);
+ m_sn->one_shot_cap_voltage_w(!(m_schaser_effect_555_is_low || m_schaser_explosion) ? 0 : sn76477_device::EXTERNAL_VOLTAGE_DISCONNECT);
}
diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp
index 16fbc6249ff..bc08e7f2ef5 100644
--- a/src/mame/audio/alesis.cpp
+++ b/src/mame/audio/alesis.cpp
@@ -19,7 +19,7 @@
#define LOG 1
// device type definition
-const device_type ALESIS_DM3AG = device_creator<alesis_dm3ag_device>;
+DEFINE_DEVICE_TYPE(ALESIS_DM3AG, alesis_dm3ag_device, "alesis_dm3ag", "Alesis DM3AG")
/***************************************************************************
IMPLEMENTATION
@@ -38,9 +38,9 @@ MACHINE_CONFIG_END
//-------------------------------------------------
alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ALESIS_DM3AG, "Alesis DM3AG", tag, owner, clock, "alesis_dm3ag", __FILE__),
- m_dac(*this, "dac"),
- m_samples(*this, DEVICE_SELF)
+ : device_t(mconfig, ALESIS_DM3AG, tag, owner, clock)
+ , m_dac(*this, "dac")
+ , m_samples(*this, DEVICE_SELF)
{
}
diff --git a/src/mame/audio/arcadia.cpp b/src/mame/audio/arcadia.cpp
index 6b2d632f906..796d8e816e5 100644
--- a/src/mame/audio/arcadia.cpp
+++ b/src/mame/audio/arcadia.cpp
@@ -42,15 +42,15 @@
// device type definition
-const device_type ARCADIA_SOUND = device_creator<arcadia_sound_device>;
+DEFINE_DEVICE_TYPE(ARCADIA_SOUND, arcadia_sound_device, "arcadia_sound", "Arcadia Audio Custom")
//-------------------------------------------------
// arcadia_sound_device - constructor
//-------------------------------------------------
arcadia_sound_device::arcadia_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ARCADIA_SOUND, "Arcadia Audio Custom", tag, owner, clock, "arcadia_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, ARCADIA_SOUND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/audio/arcadia.h b/src/mame/audio/arcadia.h
index 0b95e0c44b5..931801d74d8 100644
--- a/src/mame/audio/arcadia.h
+++ b/src/mame/audio/arcadia.h
@@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Peter Trauner
-#ifndef ARCADIA_SOUND_H_
-#define ARCADIA_SOUND_H_
+#ifndef MAME_AUDIO_ARCADIA_H
+#define MAME_AUDIO_ARCADIA_H
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
@@ -16,8 +16,7 @@
// ======================> arcadia_sound_device
-class arcadia_sound_device : public device_t,
- public device_sound_interface
+class arcadia_sound_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
@@ -39,6 +38,6 @@ protected:
};
// device type definition
-extern const device_type ARCADIA_SOUND;
+DECLARE_DEVICE_TYPE(ARCADIA_SOUND, arcadia_sound_device)
-#endif /* ARCADIA_SOUND_H_ */
+#endif // MAME_AUDIO_ARCADIA_H
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index 1aa9ea1e3d1..ca8a852e28c 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -84,10 +84,10 @@ ALL: the LPF (low pass filter) bit which selectively places a lowpass filter in
// GLOBAL VARIABLES
//**************************************************************************
-const device_type ATARI_JSA_I = device_creator<atari_jsa_i_device>;
-const device_type ATARI_JSA_II = device_creator<atari_jsa_ii_device>;
-const device_type ATARI_JSA_III = device_creator<atari_jsa_iii_device>;
-const device_type ATARI_JSA_IIIS = device_creator<atari_jsa_iiis_device>;
+DEFINE_DEVICE_TYPE(ATARI_JSA_I, atari_jsa_i_device, "atjsa1", "Atari JSA I Sound Board")
+DEFINE_DEVICE_TYPE(ATARI_JSA_II, atari_jsa_ii_device, "atjsa2", "Atari JSA II Sound Board")
+DEFINE_DEVICE_TYPE(ATARI_JSA_III, atari_jsa_iii_device, "atjsa3", "Atari JSA III Sound Board")
+DEFINE_DEVICE_TYPE(ATARI_JSA_IIIS, atari_jsa_iiis_device, "atjsa3s", "Atari JSA IIIs Sound Board")
@@ -205,7 +205,7 @@ MACHINE_CONFIG_FRAGMENT( jsa_ii_config )
MCFG_YM2151_PORT_WRITE_HANDLER(WRITE8(atari_jsa_base_device, ym2151_port_w))
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.60, 0)
- MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", JSA_MASTER_CLOCK/3, PIN7_HIGH)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.75, 0)
MACHINE_CONFIG_END
@@ -228,7 +228,7 @@ MACHINE_CONFIG_DERIVED( jsa_iiis_config, jsa_iii_config )
MCFG_DEVICE_MODIFY("ym2151")
MCFG_MIXER_ROUTE(1, DEVICE_SELF_OWNER, 0.60, 1)
- MCFG_OKIM6295_ADD("oki2", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", JSA_MASTER_CLOCK/3, PIN7_HIGH)
MCFG_MIXER_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.75, 1)
MCFG_DEVICE_ADDRESS_MAP(AS_0, jsa3_oki2_map)
MACHINE_CONFIG_END
@@ -285,8 +285,8 @@ INPUT_PORTS_END
// atari_jsa_base_device - constructor
//-------------------------------------------------
-atari_jsa_base_device::atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int channels)
- : device_t(mconfig, devtype, name, tag, owner, clock, shortname, __FILE__),
+atari_jsa_base_device::atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner, uint32_t clock, int channels)
+ : device_t(mconfig, devtype, tag, owner, clock),
device_mixer_interface(mconfig, *this, channels),
m_soundcomm(*this, "soundcomm"),
m_jsacpu(*this, "cpu"),
@@ -412,8 +412,8 @@ WRITE_LINE_MEMBER( atari_jsa_base_device::main_int_write_line )
// atari_jsa_oki_base_device: Constructor
//-------------------------------------------------
-atari_jsa_oki_base_device::atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int channels)
- : atari_jsa_base_device(mconfig, devtype, name, tag, owner, clock, shortname, channels),
+atari_jsa_oki_base_device::atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner, uint32_t clock, int channels)
+ : atari_jsa_base_device(mconfig, devtype, tag, owner, clock, channels),
m_oki1(*this, "oki1"),
m_oki2(*this, "oki2"),
m_oki1_region(*this, "oki1"),
@@ -629,7 +629,7 @@ void atari_jsa_oki_base_device::update_all_volumes()
//-------------------------------------------------
atari_jsa_i_device::atari_jsa_i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : atari_jsa_base_device(mconfig, ATARI_JSA_I, "Atari JSA I Sound Board", tag, owner, clock, "atjsa1", 2),
+ : atari_jsa_base_device(mconfig, ATARI_JSA_I, tag, owner, clock, 2),
m_pokey(*this, "pokey"),
m_tms5220(*this, "tms"),
m_jsai(*this, "JSAI"),
@@ -844,7 +844,7 @@ void atari_jsa_i_device::update_all_volumes()
//-------------------------------------------------
atari_jsa_ii_device::atari_jsa_ii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : atari_jsa_oki_base_device(mconfig, ATARI_JSA_II, "Atari JSA II Sound Board", tag, owner, clock, "atjsa2", 1)
+ : atari_jsa_oki_base_device(mconfig, ATARI_JSA_II, tag, owner, clock, 1)
, m_jsaii(*this, "JSAII")
{
}
@@ -908,13 +908,12 @@ ioport_constructor atari_jsa_ii_device::device_input_ports() const
//-------------------------------------------------
atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : atari_jsa_oki_base_device(mconfig, ATARI_JSA_III, "Atari JSA III Sound Board", tag, owner, clock, "atjsa3", 1)
- , m_jsaiii(*this, "JSAIII")
+ : atari_jsa_iii_device(mconfig, ATARI_JSA_III, tag, owner, clock, 1)
{
}
-atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int channels)
- : atari_jsa_oki_base_device(mconfig, devtype, name, tag, owner, clock, shortname, channels)
+atari_jsa_iii_device::atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner, uint32_t clock, int channels)
+ : atari_jsa_oki_base_device(mconfig, devtype, tag, owner, clock, channels)
, m_jsaiii(*this, "JSAIII")
{
}
@@ -977,7 +976,7 @@ ioport_constructor atari_jsa_iii_device::device_input_ports() const
//-------------------------------------------------
atari_jsa_iiis_device::atari_jsa_iiis_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : atari_jsa_iii_device(mconfig, ATARI_JSA_IIIS, "Atari JSA IIIs Sound Board", tag, owner, clock, "atjsa3s", 2)
+ : atari_jsa_iii_device(mconfig, ATARI_JSA_IIIS, tag, owner, clock, 2)
{
}
diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h
index de3ff0dc144..a6664452765 100644
--- a/src/mame/audio/atarijsa.h
+++ b/src/mame/audio/atarijsa.h
@@ -8,10 +8,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_AUDIO_ATARI_JSA_H
+#define MAME_AUDIO_ATARI_JSA_H
-#ifndef __ATARI_JSA__
-#define __ATARI_JSA__
+#pragma once
#include "cpu/m6502/m6502.h"
#include "sound/tms5220.h"
@@ -25,10 +25,10 @@
// GLOBAL VARIABLES
//**************************************************************************
-extern const device_type ATARI_JSA_I;
-extern const device_type ATARI_JSA_II;
-extern const device_type ATARI_JSA_III;
-extern const device_type ATARI_JSA_IIIS;
+DECLARE_DEVICE_TYPE(ATARI_JSA_I, atari_jsa_i_device)
+DECLARE_DEVICE_TYPE(ATARI_JSA_II, atari_jsa_ii_device)
+DECLARE_DEVICE_TYPE(ATARI_JSA_III, atari_jsa_iii_device)
+DECLARE_DEVICE_TYPE(ATARI_JSA_IIIS, atari_jsa_iiis_device)
@@ -80,12 +80,12 @@ class atari_jsa_base_device : public device_t,
{
protected:
// construction/destruction
- atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int channels);
+ atari_jsa_base_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner, uint32_t clock, int channels);
public:
// static configuration
- template<class _Object> static devcb_base &static_set_test_read_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_test_read_cb.set_callback(object); }
- template<class _Object> static devcb_base &static_set_main_int_cb(device_t &device, _Object object) { return downcast<atari_jsa_base_device &>(device).m_main_int_cb.set_callback(object); }
+ template <class Object> static devcb_base &static_set_test_read_cb(device_t &device, Object &&cb) { return downcast<atari_jsa_base_device &>(device).m_test_read_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &static_set_main_int_cb(device_t &device, Object &&cb) { return downcast<atari_jsa_base_device &>(device).m_main_int_cb.set_callback(std::forward<Object>(cb)); }
// getters
m6502_device &soundcpu() const { return *m_jsacpu; }
@@ -140,7 +140,7 @@ class atari_jsa_oki_base_device : public atari_jsa_base_device
{
protected:
// derived construction/destruction
- atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int channels);
+ atari_jsa_oki_base_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner, uint32_t clock, int channels);
public:
// read/write handlers
@@ -245,7 +245,7 @@ public:
protected:
// derived construction/destruction
- atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, int channels);
+ atari_jsa_iii_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner, uint32_t clock, int channels);
public:
// read/write handlers
@@ -274,4 +274,4 @@ protected:
};
-#endif
+#endif // MAME_AUDIO_ATARI_JSA_H
diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp
index 87dca1ebcb0..42a8c74c2c0 100644
--- a/src/mame/audio/cage.cpp
+++ b/src/mame/audio/cage.cpp
@@ -106,7 +106,7 @@ static const char *const register_names[] =
*
*************************************/
-const device_type ATARI_CAGE = device_creator<atari_cage_device>;
+DEFINE_DEVICE_TYPE(ATARI_CAGE, atari_cage_device, "atari_cage", "Atari CAGE")
//-------------------------------------------------
@@ -114,15 +114,12 @@ const device_type ATARI_CAGE = device_creator<atari_cage_device>;
//-------------------------------------------------
atari_cage_device::atari_cage_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ATARI_CAGE, "Atari CAGE", tag, owner, clock, "atari_cage", __FILE__),
- m_cageram(*this, "cageram"),
- m_soundlatch(*this, "soundlatch"),
- m_irqhandler(*this)
+ atari_cage_device(mconfig, ATARI_CAGE, tag, owner, clock)
{
}
-atari_cage_device::atari_cage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+atari_cage_device::atari_cage_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
m_cageram(*this, "cageram"),
m_soundlatch(*this, "soundlatch"),
m_irqhandler(*this)
@@ -684,7 +681,7 @@ machine_config_constructor atari_cage_device::device_mconfig_additions() const
}
-const device_type ATARI_CAGE_SEATTLE = device_creator<atari_cage_seattle_device>;
+DEFINE_DEVICE_TYPE(ATARI_CAGE_SEATTLE, atari_cage_seattle_device, "atari_cage_seattle", "Atari CAGE Seattle")
//-------------------------------------------------
@@ -692,7 +689,7 @@ const device_type ATARI_CAGE_SEATTLE = device_creator<atari_cage_seattle_device>
//-------------------------------------------------
atari_cage_seattle_device::atari_cage_seattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- atari_cage_device(mconfig, ATARI_CAGE_SEATTLE, "Atari CAGE Seattle", tag, owner, clock, "atari_cage_seattle", __FILE__)
+ atari_cage_device(mconfig, ATARI_CAGE_SEATTLE, tag, owner, clock)
{
}
diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h
index a4e36acac55..65a136f114b 100644
--- a/src/mame/audio/cage.h
+++ b/src/mame/audio/cage.h
@@ -6,8 +6,10 @@
****************************************************************************/
-#ifndef __ATARI_CAGE__
-#define __ATARI_CAGE__
+#ifndef MAME_AUDIO_CAGE_H
+#define MAME_AUDIO_CAGE_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "sound/dmadac.h"
@@ -26,10 +28,9 @@ class atari_cage_device : public device_t
public:
// construction/destruction
atari_cage_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- atari_cage_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
static void static_set_speedup(device_t &device, offs_t speedup) { downcast<atari_cage_device &>(device).m_speedup = speedup; }
- template<class _Object> static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<atari_cage_device &>(device).m_irqhandler.set_callback(object); }
+ template <class Object> static devcb_base &set_irqhandler_callback(device_t &device, Object &&cb) { return downcast<atari_cage_device &>(device).m_irqhandler.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -58,6 +59,8 @@ public:
WRITE32_MEMBER( speedup_w );
protected:
+ atari_cage_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
@@ -94,7 +97,7 @@ private:
// device type definition
-extern const device_type ATARI_CAGE;
+DECLARE_DEVICE_TYPE(ATARI_CAGE, atari_cage_device)
class atari_cage_seattle_device : public atari_cage_device
{
@@ -108,6 +111,6 @@ public:
};
// device type definition
-extern const device_type ATARI_CAGE_SEATTLE;
+DECLARE_DEVICE_TYPE(ATARI_CAGE_SEATTLE, atari_cage_seattle_device)
-#endif // __ATARI_CAGE__
+#endif // MAME_AUDIO_CAGE_H
diff --git a/src/mame/audio/cclimber.cpp b/src/mame/audio/cclimber.cpp
index cdec09a7308..d9f6eaa9f35 100644
--- a/src/mame/audio/cclimber.cpp
+++ b/src/mame/audio/cclimber.cpp
@@ -1,9 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
#include "emu.h"
-#include "sound/ay8910.h"
#include "audio/cclimber.h"
+#include "sound/ay8910.h"
+
/* macro to convert 4-bit unsigned samples to 16-bit signed samples */
#define SAMPLE_CONV4(a) (0x1111*((a&0x0f))-0x8000)
@@ -34,7 +35,7 @@ MACHINE_CONFIG_END
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CCLIMBER_AUDIO = device_creator<cclimber_audio_device>;
+DEFINE_DEVICE_TYPE(CCLIMBER_AUDIO, cclimber_audio_device, "cclimber_audio", "Crazy Climber Sound Board")
//**************************************************************************
@@ -46,7 +47,7 @@ const device_type CCLIMBER_AUDIO = device_creator<cclimber_audio_device>;
//-------------------------------------------------
cclimber_audio_device::cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CCLIMBER_AUDIO, "Crazy Climber Sound Board", tag, owner, clock, "cclimber_audio", __FILE__),
+ : device_t(mconfig, CCLIMBER_AUDIO, tag, owner, clock),
m_sample_buf(nullptr),
m_sample_num(0),
m_sample_freq(0),
diff --git a/src/mame/audio/cclimber.h b/src/mame/audio/cclimber.h
index f839cb800e0..c5cc6faefaf 100644
--- a/src/mame/audio/cclimber.h
+++ b/src/mame/audio/cclimber.h
@@ -7,18 +7,18 @@
Functions to emulate the cclimber audio boards
***************************************************************************/
+#ifndef MAME_AUDIO_CCLIMBER_H
+#define MAME_AUDIO_CCLIMBER_H
#pragma once
-#ifndef __CCLIMBER_AUDIO__
-#define __CCLIMBER_AUDIO__
-
#include "sound/samples.h"
+
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
-extern const device_type CCLIMBER_AUDIO;
+DECLARE_DEVICE_TYPE(CCLIMBER_AUDIO, cclimber_audio_device)
//**************************************************************************
// DEVICE CONFIGURATION MACROS
@@ -60,4 +60,4 @@ private:
};
-#endif
+#endif // MAME_AUDIO_CCLIMBER_H
diff --git a/src/mame/audio/channelf.cpp b/src/mame/audio/channelf.cpp
index 50576cc0297..8823294c75e 100644
--- a/src/mame/audio/channelf.cpp
+++ b/src/mame/audio/channelf.cpp
@@ -6,10 +6,10 @@
#define MAX_AMPLITUDE 0x7fff
-const device_type CHANNELF_SOUND = device_creator<channelf_sound_device>;
+DEFINE_DEVICE_TYPE(CHANNELF_SOUND, channelf_sound_device, "channelf_sound", "Channel F Sound")
channelf_sound_device::channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CHANNELF_SOUND, "Channel F Sound", tag, owner, clock, "channelf_sound", __FILE__),
+ : device_t(mconfig, CHANNELF_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
m_sound_mode(0),
diff --git a/src/mame/audio/channelf.h b/src/mame/audio/channelf.h
index f06c1e09bb9..167c4e15d08 100644
--- a/src/mame/audio/channelf.h
+++ b/src/mame/audio/channelf.h
@@ -6,11 +6,10 @@
*
****************************************************************************/
-#ifndef CHANNELF_SOUND_H_
-#define CHANNELF_SOUND_H_
+#ifndef MAME_AUDIO_CHANNELF_H
+#define MAME_AUDIO_CHANNELF_H
-class channelf_sound_device : public device_t,
- public device_sound_interface
+class channelf_sound_device : public device_t, public device_sound_interface
{
public:
channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -35,7 +34,6 @@ private:
};
-extern const device_type CHANNELF_SOUND;
+DECLARE_DEVICE_TYPE(CHANNELF_SOUND, channelf_sound_device)
-
-#endif /* CHANNELF_SOUND_H_ */
+#endif // MAME_AUDIO_CHANNELF_H
diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp
index 3e87c390eb4..6d1c65e1f61 100644
--- a/src/mame/audio/cinemat.cpp
+++ b/src/mame/audio/cinemat.cpp
@@ -1350,7 +1350,7 @@ MACHINE_CONFIG_END
WRITE8_MEMBER(cinemat_state::qb3_sound_w)
{
- uint16_t rega = m_maincpu->state_int(CCPU_A);
+ uint16_t rega = m_maincpu->state_int(ccpu_cpu_device::CCPU_A);
demon_sound_w(0x00 | (~rega & 0x0f), 0x10);
}
diff --git a/src/mame/audio/cps3.cpp b/src/mame/audio/cps3.cpp
index c5008a17b59..0c5c3c764dd 100644
--- a/src/mame/audio/cps3.cpp
+++ b/src/mame/audio/cps3.cpp
@@ -11,7 +11,7 @@
// device type definition
-const device_type CPS3 = device_creator<cps3_sound_device>;
+DEFINE_DEVICE_TYPE(CPS3, cps3_sound_device, "cps3_custom", "CPS3 Audio Custom")
//**************************************************************************
@@ -23,11 +23,11 @@ const device_type CPS3 = device_creator<cps3_sound_device>;
//-------------------------------------------------
cps3_sound_device::cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CPS3, "CPS3 Audio Custom", tag, owner, clock, "cps3_custom", __FILE__),
- device_sound_interface(mconfig, *this),
- m_stream(nullptr),
- m_key(0),
- m_base(nullptr)
+ : device_t(mconfig, CPS3, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_stream(nullptr)
+ , m_key(0)
+ , m_base(nullptr)
{
}
diff --git a/src/mame/audio/cps3.h b/src/mame/audio/cps3.h
index 41c7b6c041f..3dc78d2e967 100644
--- a/src/mame/audio/cps3.h
+++ b/src/mame/audio/cps3.h
@@ -5,6 +5,10 @@
Capcom CPS-3 Sound Hardware
****************************************************************************/
+#ifndef MAME_AUDIO_CPS3_H
+#define MAME_AUDIO_CPS3_H
+
+#pragma once
//**************************************************************************
// TYPE DEFINITIONS
@@ -26,8 +30,7 @@ struct cps3_voice
// ======================> cps3_sound_device
-class cps3_sound_device : public device_t,
- public device_sound_interface
+class cps3_sound_device : public device_t, public device_sound_interface
{
public:
cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -52,4 +55,6 @@ private:
int8_t* m_base;
};
-extern const device_type CPS3;
+DECLARE_DEVICE_TYPE(CPS3, cps3_sound_device)
+
+#endif // MAME_AUDIO_CPS3_H
diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp
index cea1053a8f9..c008292d025 100644
--- a/src/mame/audio/csd.cpp
+++ b/src/mame/audio/csd.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MIDWAY_CHEAP_SQUEAK_DELUXE = device_creator<midway_cheap_squeak_deluxe_device>;
+DEFINE_DEVICE_TYPE(MIDWAY_CHEAP_SQUEAK_DELUXE, midway_cheap_squeak_deluxe_device, "midcsd", "Cheap Squeak Deluxe Sound Board")
//-------------------------------------------------
// audio cpu map
@@ -74,7 +74,7 @@ const tiny_rom_entry *midway_cheap_squeak_deluxe_device::device_rom_region() con
//-------------------------------------------------
midway_cheap_squeak_deluxe_device::midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MIDWAY_CHEAP_SQUEAK_DELUXE, "Cheap Squeak Deluxe Sound Board", tag, owner, clock, "midcsd", __FILE__),
+ device_t(mconfig, MIDWAY_CHEAP_SQUEAK_DELUXE, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
diff --git a/src/mame/audio/csd.h b/src/mame/audio/csd.h
index 87e657135b9..2c9062dd73b 100644
--- a/src/mame/audio/csd.h
+++ b/src/mame/audio/csd.h
@@ -5,11 +5,11 @@
Cheap Squeak Deluxe / Artificial Artist Sound Board
***************************************************************************/
+#ifndef MAME_AUDIO_CSD_H
+#define MAME_AUDIO_CSD_H
#pragma once
-#ifndef MAME_AUDIO_CSD_H
-#define MAME_AUDIO_CSD_H
#include "cpu/m68000/m68000.h"
#include "machine/6821pia.h"
@@ -58,6 +58,6 @@ private:
};
// device type definition
-extern const device_type MIDWAY_CHEAP_SQUEAK_DELUXE;
+DECLARE_DEVICE_TYPE(MIDWAY_CHEAP_SQUEAK_DELUXE, midway_cheap_squeak_deluxe_device)
#endif // MAME_AUDIO_CSD_H
diff --git a/src/mame/audio/dai_snd.cpp b/src/mame/audio/dai_snd.cpp
index 09bef90e5b5..3e59797b817 100644
--- a/src/mame/audio/dai_snd.cpp
+++ b/src/mame/audio/dai_snd.cpp
@@ -14,7 +14,7 @@
#include "dai_snd.h"
// device type definition
-const device_type DAI_SOUND = device_creator<dai_sound_device>;
+DEFINE_DEVICE_TYPE(DAI_SOUND, dai_sound_device, "dai_sound", "DAI Audio Custom")
//-------------------------------------------------
@@ -22,8 +22,8 @@ const device_type DAI_SOUND = device_creator<dai_sound_device>;
//-------------------------------------------------
dai_sound_device::dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DAI_SOUND, "DAI Audio Custom", tag, owner, clock, "dai_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, DAI_SOUND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
@@ -53,10 +53,10 @@ void dai_sound_device::device_reset()
//-------------------------------------------------
const uint16_t dai_sound_device::s_osc_volume_table[] = {
- 0, 500, 1000, 1500,
- 2000, 2500, 3000, 3500,
- 4000, 4500, 5000, 5500,
- 6000, 6500, 7000, 7500
+ 0, 500, 1000, 1500,
+ 2000, 2500, 3000, 3500,
+ 4000, 4500, 5000, 5500,
+ 6000, 6500, 7000, 7500
};
//-------------------------------------------------
@@ -64,10 +64,10 @@ const uint16_t dai_sound_device::s_osc_volume_table[] = {
//-------------------------------------------------
const uint16_t dai_sound_device::s_noise_volume_table[] = {
- 0, 0, 0, 0,
- 0, 0, 0, 0,
- 500, 1000, 1500, 2000,
- 2500, 3000, 3500, 4000
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ 500, 1000, 1500, 2000,
+ 2500, 3000, 3500, 4000
};
diff --git a/src/mame/audio/dai_snd.h b/src/mame/audio/dai_snd.h
index 82aab50027a..20111be1663 100644
--- a/src/mame/audio/dai_snd.h
+++ b/src/mame/audio/dai_snd.h
@@ -6,14 +6,13 @@
*
****************************************************************************/
-#ifndef DAI_SND_H_
-#define DAI_SND_H_
+#ifndef MAME_AUDIO_DAI_SND_H
+#define MAME_AUDIO_DAI_SND_H
// ======================> dai_sound_device
-class dai_sound_device : public device_t,
- public device_sound_interface
+class dai_sound_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
@@ -40,6 +39,6 @@ private:
static const uint16_t s_noise_volume_table[];
};
-extern const device_type DAI_SOUND;
+DECLARE_DEVICE_TYPE(DAI_SOUND, dai_sound_device)
-#endif /* DAI_H_ */
+#endif // MAME_AUDIO_DAI_SND_H
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 3d71d0fc354..f91417f8525 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -825,8 +825,8 @@ void dcs_audio_device::dcs_register_state()
// dcs_audio_device - constructor
//-------------------------------------------------
-dcs_audio_device::dcs_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int rev) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+dcs_audio_device::dcs_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int rev) :
+ device_t(mconfig, type, tag, owner, clock),
m_cpu(nullptr),
m_program(nullptr),
m_data(nullptr),
@@ -2488,14 +2488,14 @@ int dcs_audio_device::preprocess_write(uint16_t data)
return result;
}
-const device_type DCS_AUDIO_2K = device_creator<dcs_audio_2k_device>;
+DEFINE_DEVICE_TYPE(DCS_AUDIO_2K, dcs_audio_2k_device, "dcs_audio_2k", "DCS Audio 2K")
//-------------------------------------------------
// dcs_audio_2k_device - constructor
//-------------------------------------------------
dcs_audio_2k_device::dcs_audio_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs_audio_device(mconfig, DCS_AUDIO_2K, "DCS Audio 2K", tag, owner, clock, "dcs_audio_2k", __FILE__)
+ dcs_audio_device(mconfig, DCS_AUDIO_2K, tag, owner, clock, 1)
{
}
@@ -2504,14 +2504,14 @@ machine_config_constructor dcs_audio_2k_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( dcs_audio_2k );
}
-const device_type DCS_AUDIO_2K_UART = device_creator<dcs_audio_2k_uart_device>;
+DEFINE_DEVICE_TYPE(DCS_AUDIO_2K_UART, dcs_audio_2k_uart_device, "dcs_audio_2k_uart", "DCS Audio 2K UART")
//-------------------------------------------------
// dcs_audio_2k_uart_device - constructor
//-------------------------------------------------
dcs_audio_2k_uart_device::dcs_audio_2k_uart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs_audio_device(mconfig, DCS_AUDIO_2K_UART, "DCS Audio 2K UART", tag, owner, clock, "dcs_audio_2k_uart", __FILE__)
+ dcs_audio_device(mconfig, DCS_AUDIO_2K_UART, tag, owner, clock, 1)
{
}
@@ -2520,14 +2520,14 @@ machine_config_constructor dcs_audio_2k_uart_device::device_mconfig_additions()
return MACHINE_CONFIG_NAME( dcs_audio_2k_uart );
}
-const device_type DCS_AUDIO_8K = device_creator<dcs_audio_8k_device>;
+DEFINE_DEVICE_TYPE(DCS_AUDIO_8K, dcs_audio_8k_device, "dcs_audio_8k", "DCS Audio 8K")
//-------------------------------------------------
// dcs_audio_8k_device - constructor
//-------------------------------------------------
dcs_audio_8k_device::dcs_audio_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs_audio_device(mconfig, DCS_AUDIO_8K, "DCS Audio 8K", tag, owner, clock, "dcs_audio_8k", __FILE__)
+ dcs_audio_device(mconfig, DCS_AUDIO_8K, tag, owner, clock, 1)
{
}
@@ -2536,14 +2536,14 @@ machine_config_constructor dcs_audio_8k_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( dcs_audio_8k );
}
-const device_type DCS_AUDIO_WPC = device_creator<dcs_audio_wpc_device>;
+DEFINE_DEVICE_TYPE(DCS_AUDIO_WPC, dcs_audio_wpc_device, "dcs_audio_wpc", "DCS Audio WPC")
//-------------------------------------------------
// dcs_audio_wpc_device - constructor
//-------------------------------------------------
dcs_audio_wpc_device::dcs_audio_wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs_audio_device(mconfig, DCS_AUDIO_WPC, "DCS Audio WPC", tag, owner, clock, "dcs_audio_wpc", __FILE__, 15)
+ dcs_audio_device(mconfig, DCS_AUDIO_WPC, tag, owner, clock, 15)
{
}
@@ -2558,20 +2558,20 @@ machine_config_constructor dcs_audio_wpc_device::device_mconfig_additions() cons
// dcs2_audio_device - constructor
//-------------------------------------------------
-dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- dcs_audio_device(mconfig, type, name, tag, owner, clock, shortname, source)
+dcs2_audio_device::dcs2_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ dcs_audio_device(mconfig, type, tag, owner, clock, 1)
{
}
-const device_type DCS2_AUDIO_2115 = device_creator<dcs2_audio_2115_device>;
+DEFINE_DEVICE_TYPE(DCS2_AUDIO_2115, dcs2_audio_2115_device, "dcs2_audio_2115", "DCS2 Audio 2115")
//-------------------------------------------------
// dcs2_audio_2115_device - constructor
//-------------------------------------------------
dcs2_audio_2115_device::dcs2_audio_2115_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs2_audio_device(mconfig, DCS2_AUDIO_2115, "DCS2 Audio 2115", tag, owner, clock, "dcs2_audio_2115", __FILE__)
+ dcs2_audio_device(mconfig, DCS2_AUDIO_2115, tag, owner, clock)
{
}
@@ -2580,14 +2580,14 @@ machine_config_constructor dcs2_audio_2115_device::device_mconfig_additions() co
return MACHINE_CONFIG_NAME( dcs2_audio_2115 );
}
-const device_type DCS2_AUDIO_2104 = device_creator<dcs2_audio_2104_device>;
+DEFINE_DEVICE_TYPE(DCS2_AUDIO_2104, dcs2_audio_2104_device, "dcs2_audio_2104", "DCS2 Audio 2104")
//-------------------------------------------------
// dcs2_audio_2104_device - constructor
//-------------------------------------------------
dcs2_audio_2104_device::dcs2_audio_2104_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs2_audio_device(mconfig, DCS2_AUDIO_2104, "DCS2 Audio 2104", tag, owner, clock, "dcs2_audio_2104", __FILE__)
+ dcs2_audio_device(mconfig, DCS2_AUDIO_2104, tag, owner, clock)
{
}
@@ -2597,14 +2597,14 @@ machine_config_constructor dcs2_audio_2104_device::device_mconfig_additions() co
}
-const device_type DCS2_AUDIO_DSIO = device_creator<dcs2_audio_dsio_device>;
+DEFINE_DEVICE_TYPE(DCS2_AUDIO_DSIO, dcs2_audio_dsio_device, "dcs2_audio_dsio", "DCS2 Audio DSIO")
//-------------------------------------------------
// dcs2_audio_dsio_device - constructor
//-------------------------------------------------
dcs2_audio_dsio_device::dcs2_audio_dsio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs2_audio_device(mconfig, DCS2_AUDIO_DSIO, "DCS2 Audio DSIO", tag, owner, clock, "dcs2_audio_dsio", __FILE__)
+ dcs2_audio_device(mconfig, DCS2_AUDIO_DSIO, tag, owner, clock)
{
}
@@ -2613,14 +2613,14 @@ machine_config_constructor dcs2_audio_dsio_device::device_mconfig_additions() co
return MACHINE_CONFIG_NAME( dcs2_audio_dsio );
}
-const device_type DCS2_AUDIO_DENVER = device_creator<dcs2_audio_denver_device>;
+DEFINE_DEVICE_TYPE(DCS2_AUDIO_DENVER, dcs2_audio_denver_device, "dcs2_audio_denver", "DCS2 Audio Denver")
//-------------------------------------------------
// dcs2_audio_denver_device - constructor
//-------------------------------------------------
dcs2_audio_denver_device::dcs2_audio_denver_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- dcs2_audio_device(mconfig, DCS2_AUDIO_DENVER, "DCS2 Audio Denver", tag, owner, clock, "dcs2_audio_denver", __FILE__)
+ dcs2_audio_device(mconfig, DCS2_AUDIO_DENVER, tag, owner, clock)
{
}
diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h
index e041512dbd1..bd3f7e0643c 100644
--- a/src/mame/audio/dcs.h
+++ b/src/mame/audio/dcs.h
@@ -6,8 +6,10 @@
****************************************************************************/
-#ifndef __DCS_H__
-#define __DCS_H__
+#ifndef MAME_AUDIO_DCS_H
+#define MAME_AUDIO_DCS_H
+
+#pragma once
#include "cpu/adsp2100/adsp2100.h"
#include "sound/dmadac.h"
@@ -23,9 +25,6 @@
class dcs_audio_device : public device_t
{
public:
- // construction/destruction
- dcs_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int rev = 1);
-
// for dcs2 (int dram_in_mb, offs_t polling_offset)
static void static_set_dram_in_mb(device_t &device, int dram_in_mb) { downcast<dcs_audio_device &>(device).m_dram_in_mb = dram_in_mb; }
static void static_set_polling_offset(device_t &device, offs_t polling_offset) { downcast<dcs_audio_device &>(device).m_polling_offset = polling_offset; }
@@ -106,11 +105,13 @@ public:
int preprocess_write(uint16_t data);
protected:
+ // construction/destruction
+ dcs_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int rev);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-protected:
struct sdrc_state
{
uint16_t reg[4];
@@ -233,7 +234,7 @@ public:
};
// device type definition
-extern const device_type DCS_AUDIO_2K;
+DECLARE_DEVICE_TYPE(DCS_AUDIO_2K, dcs_audio_2k_device)
// dcs_audio_2k_uart_device
@@ -249,7 +250,7 @@ public:
};
// device type definition
-extern const device_type DCS_AUDIO_2K_UART;
+DECLARE_DEVICE_TYPE(DCS_AUDIO_2K_UART, dcs_audio_2k_uart_device)
// dcs_audio_8k_device
@@ -265,7 +266,7 @@ public:
};
// device type definition
-extern const device_type DCS_AUDIO_8K;
+DECLARE_DEVICE_TYPE(DCS_AUDIO_8K, dcs_audio_8k_device)
// dcs_audio_wpc_device
@@ -280,18 +281,17 @@ public:
};
// device type definition
-extern const device_type DCS_AUDIO_WPC;
+DECLARE_DEVICE_TYPE(DCS_AUDIO_WPC, dcs_audio_wpc_device)
// dcs2_audio_device
class dcs2_audio_device : public dcs_audio_device
{
-public:
+protected:
// construction/destruction
- dcs2_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ dcs2_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-protected:
// device-level overrides
virtual void device_start() override;
};
@@ -310,7 +310,7 @@ public:
};
// device type definition
-extern const device_type DCS2_AUDIO_2115;
+DECLARE_DEVICE_TYPE(DCS2_AUDIO_2115, dcs2_audio_2115_device)
// dcs2_audio_2104_device
@@ -326,7 +326,7 @@ public:
};
// device type definition
-extern const device_type DCS2_AUDIO_2104;
+DECLARE_DEVICE_TYPE(DCS2_AUDIO_2104, dcs2_audio_2104_device)
// dcs2_audio_dsio_device
@@ -342,7 +342,7 @@ public:
};
// device type definition
-extern const device_type DCS2_AUDIO_DSIO;
+DECLARE_DEVICE_TYPE(DCS2_AUDIO_DSIO, dcs2_audio_dsio_device)
// dcs2_audio_denver_device
@@ -358,6 +358,6 @@ public:
};
// device type definition
-extern const device_type DCS2_AUDIO_DENVER;
+DECLARE_DEVICE_TYPE(DCS2_AUDIO_DENVER, dcs2_audio_denver_device)
-#endif
+#endif // MAME_AUDIO_DCS_H
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index 6ce93a8e84a..6e1415f975a 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -30,10 +30,9 @@ static ADDRESS_MAP_START( bsmt_map, AS_0, 8, decobsmt_device )
AM_RANGE(0x000000, 0xffffff) AM_ROM AM_REGION(":bsmt", 0)
ADDRESS_MAP_END
-static void bsmt_ready_callback(bsmt2000_device &device)
+void decobsmt_device::bsmt_ready_callback()
{
- decobsmt_device *decobsmt = device.machine().device<decobsmt_device>(DECOBSMT_TAG);
- decobsmt->m_ourcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); /* BSMT is ready */
+ m_ourcpu->set_input_line(M6809_IRQ_LINE, ASSERT_LINE); /* BSMT is ready */
}
MACHINE_CONFIG_FRAGMENT( decobsmt )
@@ -44,7 +43,7 @@ MACHINE_CONFIG_FRAGMENT( decobsmt )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_BSMT2000_ADD(BSMT_TAG, 24000000)
MCFG_DEVICE_ADDRESS_MAP(AS_0, bsmt_map)
- MCFG_BSMT2000_READY_CALLBACK(bsmt_ready_callback)
+ MCFG_BSMT2000_READY_CALLBACK(decobsmt_device, bsmt_ready_callback)
MCFG_SOUND_ROUTE(0, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 2.0)
MACHINE_CONFIG_END
@@ -53,7 +52,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DECOBSMT = device_creator<decobsmt_device>;
+DEFINE_DEVICE_TYPE(DECOBSMT, decobsmt_device, "decobsmt", "Data East/Sega/Stern BSMT2000 Sound Board")
//-------------------------------------------------
@@ -74,10 +73,10 @@ machine_config_constructor decobsmt_device::device_mconfig_additions() const
// decobsmt_device - constructor
//-------------------------------------------------
-decobsmt_device::decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, DECOBSMT, "Data East/Sega/Stern BSMT2000 Sound Board", tag, owner, clock, "decobsmt", __FILE__),
- m_ourcpu(*this, M6809_TAG),
- m_bsmt(*this, BSMT_TAG)
+decobsmt_device::decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, DECOBSMT, tag, owner, clock)
+ , m_ourcpu(*this, M6809_TAG)
+ , m_bsmt(*this, BSMT_TAG)
{
}
diff --git a/src/mame/audio/decobsmt.h b/src/mame/audio/decobsmt.h
index a16165e0b22..9615a7649bd 100644
--- a/src/mame/audio/decobsmt.h
+++ b/src/mame/audio/decobsmt.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#pragma once
+#ifndef MAME_AUDIO_DECOBSMT_H
+#define MAME_AUDIO_DECOBSMT_H
-#ifndef __DECOBSMT_H__
-#define __DECOBSMT_H__
+#pragma once
#include "cpu/m6809/m6809.h"
#include "sound/bsmt2000.h"
@@ -20,37 +20,40 @@
class decobsmt_device : public device_t
{
public:
- // construction/destruction
- decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ // construction/destruction
+ decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER(bsmt_reset_w);
- DECLARE_READ8_MEMBER(bsmt_status_r);
- DECLARE_WRITE8_MEMBER(bsmt0_w);
- DECLARE_WRITE8_MEMBER(bsmt1_w);
- DECLARE_READ8_MEMBER(bsmt_comms_r);
- DECLARE_WRITE8_MEMBER(bsmt_comms_w);
+ DECLARE_WRITE8_MEMBER(bsmt_reset_w);
+ DECLARE_READ8_MEMBER(bsmt_status_r);
+ DECLARE_WRITE8_MEMBER(bsmt0_w);
+ DECLARE_WRITE8_MEMBER(bsmt1_w);
+ DECLARE_READ8_MEMBER(bsmt_comms_r);
+ DECLARE_WRITE8_MEMBER(bsmt_comms_w);
- DECLARE_WRITE_LINE_MEMBER(bsmt_reset_line);
+ DECLARE_WRITE_LINE_MEMBER(bsmt_reset_line);
- INTERRUPT_GEN_MEMBER(decobsmt_firq_interrupt);
+ INTERRUPT_GEN_MEMBER(decobsmt_firq_interrupt);
- required_device<cpu_device> m_ourcpu;
- required_device<bsmt2000_device> m_bsmt;
+ void bsmt_ready_callback();
protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual machine_config_constructor device_mconfig_additions() const override;
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual machine_config_constructor device_mconfig_additions() const override;
private:
- uint8_t m_bsmt_latch;
- uint8_t m_bsmt_reset;
- uint8_t m_bsmt_comms;
+ required_device<cpu_device> m_ourcpu;
+ required_device<bsmt2000_device> m_bsmt;
+
+ uint8_t m_bsmt_latch;
+ uint8_t m_bsmt_reset;
+ uint8_t m_bsmt_comms;
};
// device type definition
extern const device_type DECOBSMT;
+DECLARE_DEVICE_TYPE(DECOBSMT, decobsmt_device)
-#endif /* __DECOBSMT_H__ */
+#endif // MAME_AUDIO_DECOBSMT_H
diff --git a/src/mame/audio/dsbz80.cpp b/src/mame/audio/dsbz80.cpp
index e4ff29782a4..d7e9726c636 100644
--- a/src/mame/audio/dsbz80.cpp
+++ b/src/mame/audio/dsbz80.cpp
@@ -49,7 +49,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type DSBZ80 = device_creator<dsbz80_device>;
+DEFINE_DEVICE_TYPE(DSBZ80, dsbz80_device, "dsbz80_device", "Sega Z80-based Digital Sound Board")
//-------------------------------------------------
@@ -71,7 +71,7 @@ machine_config_constructor dsbz80_device::device_mconfig_additions() const
//-------------------------------------------------
dsbz80_device::dsbz80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, DSBZ80, "Sega Z80-based Digital Sound Board", tag, owner, clock, "dsbz80", __FILE__),
+ device_t(mconfig, DSBZ80, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_ourcpu(*this, Z80_TAG),
m_uart(*this, "uart"),
diff --git a/src/mame/audio/dsbz80.h b/src/mame/audio/dsbz80.h
index 944e494dccc..e8c18c96781 100644
--- a/src/mame/audio/dsbz80.h
+++ b/src/mame/audio/dsbz80.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Olivier Galibert
-#pragma once
+#ifndef MAME_AUDIO_DSBZ80_H
+#define MAME_AUDIO_DSBZ80_H
-#ifndef __DSBZ80_H__
-#define __DSBZ80_H__
+#pragma once
#include "cpu/z80/z80.h"
#include "machine/i8251.h"
@@ -65,5 +65,6 @@ private:
// device type definition
extern const device_type DSBZ80;
+DECLARE_DEVICE_TYPE(DSBZ80, dsbz80_device)
-#endif /* __DSBZ80_H__ */
+#endif // MAME_AUDIO_DSBZ80_H
diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp
index 5b8c69ace47..57087816a7d 100644
--- a/src/mame/audio/efo_zsu.cpp
+++ b/src/mame/audio/efo_zsu.cpp
@@ -41,37 +41,37 @@
#include "speaker.h"
-const device_type EFO_ZSU = device_creator<efo_zsu_device>;
-const device_type EFO_ZSU1 = device_creator<efo_zsu1_device>;
-const device_type CEDAR_MAGNET_SOUND = device_creator<cedar_magnet_sound_device>;
-
-
-efo_zsu_device::efo_zsu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_ctc0(*this, "ctc0"),
- m_ctc1(*this, "ctc1"),
- m_soundlatch(*this, "soundlatch"),
- m_fifo(*this, "fifo"),
- m_adpcm(*this, "adpcm")
+DEFINE_DEVICE_TYPE(EFO_ZSU, efo_zsu_device, "efo_zsu", "ZSU Sound Control Unit")
+DEFINE_DEVICE_TYPE(EFO_ZSU1, efo_zsu1_device, "efo_zsu1", "ZSU1 Sound Control Unit")
+DEFINE_DEVICE_TYPE(CEDAR_MAGNET_SOUND, cedar_magnet_sound_device, "gedmag_sound", "Cedar Sound")
+
+
+efo_zsu_device::efo_zsu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_ctc0(*this, "ctc0")
+ , m_ctc1(*this, "ctc1")
+ , m_soundlatch(*this, "soundlatch")
+ , m_fifo(*this, "fifo")
+ , m_adpcm(*this, "adpcm")
{
}
efo_zsu_device::efo_zsu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : efo_zsu_device(mconfig, EFO_ZSU, "ZSU Sound Control Unit", tag, owner, clock, "efo_zsu", __FILE__)
+ : efo_zsu_device(mconfig, EFO_ZSU, tag, owner, clock)
{
}
efo_zsu1_device::efo_zsu1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : efo_zsu_device(mconfig, EFO_ZSU1, "ZSU1 Sound Control Unit", tag, owner, clock, "efo_zsu1", __FILE__)
+ : efo_zsu_device(mconfig, EFO_ZSU1, tag, owner, clock)
{
}
cedar_magnet_sound_device::cedar_magnet_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : efo_zsu_device(mconfig, CEDAR_MAGNET_SOUND, "Cedar Sound", tag, owner, clock, "cedmag_sound", __FILE__),
- cedar_magnet_board_interface(mconfig, *this, "soundcpu", "ram")
+ : efo_zsu_device(mconfig, CEDAR_MAGNET_SOUND, tag, owner, clock)
+ , cedar_magnet_board_interface(mconfig, *this, "soundcpu", "ram")
{
}
diff --git a/src/mame/audio/efo_zsu.h b/src/mame/audio/efo_zsu.h
index 928f7800a8e..c0e6bf00542 100644
--- a/src/mame/audio/efo_zsu.h
+++ b/src/mame/audio/efo_zsu.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood,AJR
-#pragma once
+#ifndef MAME_AUDIO_EFO_ZSU_H
+#define MAME_AUDIO_EFO_ZSU_H
-#ifndef CEDAR_MAGNET_SOUND_DEF
-#define CEDAR_MAGNET_SOUND_DEF
+#pragma once
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
@@ -15,9 +15,9 @@
#include "sound/msm5205.h"
#include "machine/cedar_magnet_board.h"
-extern const device_type EFO_ZSU;
-extern const device_type EFO_ZSU1;
-extern const device_type CEDAR_MAGNET_SOUND;
+DECLARE_DEVICE_TYPE(EFO_ZSU, efo_zsu_device)
+DECLARE_DEVICE_TYPE(EFO_ZSU1, efo_zsu1_device)
+DECLARE_DEVICE_TYPE(CEDAR_MAGNET_SOUND, cedar_magnet_sound_device)
#define MCFG_CEDAR_MAGNET_SOUND_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CEDAR_MAGNET_SOUND, 0)
@@ -27,7 +27,6 @@ class efo_zsu_device : public device_t
{
public:
// construction/destruction
- efo_zsu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source);
efo_zsu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
required_device<z80ctc_device> m_ctc0;
@@ -49,10 +48,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(fifo_dor_w);
protected:
+ efo_zsu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
-
-private:
};
@@ -80,8 +79,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
-
-private:
};
-#endif
+#endif // MAME_AUDIO_EFO_ZSU_H
diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp
index b738e7e2b1f..6a3435d98cc 100644
--- a/src/mame/audio/exidy.cpp
+++ b/src/mame/audio/exidy.cpp
@@ -205,16 +205,16 @@ void exidy_sound_device::common_sh_start()
sh6840_register_state_globals();
}
-const device_type EXIDY = device_creator<exidy_sound_device>;
+DEFINE_DEVICE_TYPE(EXIDY, exidy_sound_device, "exidy_sfx", "Exidy SFX")
exidy_sound_device::exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EXIDY, "Exidy SFX", tag, owner, clock, "exidy_sfx", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, EXIDY, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
-exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+exidy_sound_device::exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_riot_irq_state(0),
m_stream(nullptr),
@@ -659,10 +659,10 @@ WRITE8_MEMBER( venture_sound_device::filter_w )
*************************************/
-const device_type EXIDY_VENTURE = device_creator<venture_sound_device>;
+DEFINE_DEVICE_TYPE(EXIDY_VENTURE, venture_sound_device, "venture_sound", "Exidy SFX+PSG")
venture_sound_device::venture_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : exidy_sound_device(mconfig, EXIDY_VENTURE, "Exidy SFX+PSG", tag, owner, clock, "venture_sound", __FILE__)
+ : exidy_sound_device(mconfig, EXIDY_VENTURE, tag, owner, clock)
{
}
@@ -904,11 +904,11 @@ WRITE_LINE_MEMBER( victory_sound_device::main_ack_w )
}
-const device_type EXIDY_VICTORY = device_creator<victory_sound_device>;
+DEFINE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device, "victory_sound", "Exidy SFX+PSG+Speech")
victory_sound_device::victory_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : exidy_sound_device(mconfig, EXIDY_VICTORY, "Exidy SFX+PSG+Speech", tag, owner, clock, "victory_sound", __FILE__),
- m_victory_sound_response_ack_clk(0)
+ : exidy_sound_device(mconfig, EXIDY_VICTORY, tag, owner, clock)
+ , m_victory_sound_response_ack_clk(0)
{
}
diff --git a/src/mame/audio/exidy.h b/src/mame/audio/exidy.h
index f2a459433af..02d1aafabd6 100644
--- a/src/mame/audio/exidy.h
+++ b/src/mame/audio/exidy.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_EXIDY_H
+#define MAME_AUDIO_EXIDY_H
+
+#pragma once
+
#include "machine/6532riot.h"
#include "machine/6821pia.h"
#include "sound/hc55516.h"
@@ -38,7 +43,6 @@ class exidy_sound_device : public device_t,
{
public:
exidy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- exidy_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
~exidy_sound_device() {}
DECLARE_READ8_MEMBER( sh6840_r );
@@ -57,6 +61,8 @@ public:
DECLARE_READ8_MEMBER( sh8253_r );
protected:
+ exidy_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -111,7 +117,7 @@ private:
inline int sh6840_update_noise(int clocks);
};
-extern const device_type EXIDY;
+DECLARE_DEVICE_TYPE(EXIDY, exidy_sound_device)
class venture_sound_device : public exidy_sound_device
{
@@ -132,7 +138,7 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
};
-extern const device_type EXIDY_VENTURE;
+DECLARE_DEVICE_TYPE(EXIDY_VENTURE, venture_sound_device)
class victory_sound_device : public exidy_sound_device
{
@@ -163,10 +169,12 @@ private:
int m_pia1_cb1;
};
-extern const device_type EXIDY_VICTORY;
+DECLARE_DEVICE_TYPE(EXIDY_VICTORY, victory_sound_device)
MACHINE_CONFIG_EXTERN( venture_audio );
MACHINE_CONFIG_EXTERN( mtrap_cvsd_audio );
MACHINE_CONFIG_EXTERN( victory_audio );
+
+#endif // MAME_AUDIO_EXIDY_H
diff --git a/src/mame/audio/exidy440.cpp b/src/mame/audio/exidy440.cpp
index 7c902298406..14ef74c644c 100644
--- a/src/mame/audio/exidy440.cpp
+++ b/src/mame/audio/exidy440.cpp
@@ -48,10 +48,10 @@ static const int channel_bits[4] =
};
-const device_type EXIDY440 = device_creator<exidy440_sound_device>;
+DEFINE_DEVICE_TYPE(EXIDY440, exidy440_sound_device, "exidy440_sound", "Exidy 440 CVSD")
exidy440_sound_device::exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EXIDY440, "Exidy 440 CVSD", tag, owner, clock, "exidy440_sound", __FILE__),
+ : device_t(mconfig, EXIDY440, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_sound_command(0),
m_sound_command_ack(0),
diff --git a/src/mame/audio/exidy440.h b/src/mame/audio/exidy440.h
index ea9b35174f3..5d8129195e3 100644
--- a/src/mame/audio/exidy440.h
+++ b/src/mame/audio/exidy440.h
@@ -1,39 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-/* channel_data structure holds info about each 6844 DMA channel */
-struct m6844_channel_data
-{
- int active;
- int address;
- int counter;
- uint8_t control;
- int start_address;
- int start_counter;
-};
-
-
-/* channel_data structure holds info about each active sound channel */
-struct sound_channel_data
-{
- int16_t *base;
- int offset;
- int remaining;
-};
+#ifndef MAME_AUDIO_EXIDY440_H
+#define MAME_AUDIO_EXIDY440_H
+#pragma once
-/* sound_cache_entry structure contains info on each decoded sample */
-struct sound_cache_entry
-{
- struct sound_cache_entry *next;
- int address;
- int length;
- int bits;
- int frequency;
- int16_t data[1];
-};
-
-class exidy440_sound_device : public device_t,
- public device_sound_interface
+class exidy440_sound_device : public device_t, public device_sound_interface
{
public:
exidy440_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -59,6 +31,39 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
private:
+ /* channel_data structure holds info about each 6844 DMA channel */
+ struct m6844_channel_data
+ {
+ int active;
+ int address;
+ int counter;
+ uint8_t control;
+ int start_address;
+ int start_counter;
+ };
+
+
+ /* channel_data structure holds info about each active sound channel */
+ struct sound_channel_data
+ {
+ int16_t *base;
+ int offset;
+ int remaining;
+ };
+
+
+ /* sound_cache_entry structure contains info on each decoded sample */
+ struct sound_cache_entry
+ {
+ struct sound_cache_entry *next;
+ int address;
+ int length;
+ int bits;
+ int frequency;
+ int16_t data[1];
+ };
+
+
// internal state
uint8_t m_sound_command;
uint8_t m_sound_command_ack;
@@ -104,6 +109,8 @@ private:
void mix_to_16(int length, stream_sample_t *dest_left, stream_sample_t *dest_right);
};
-extern const device_type EXIDY440;
+DECLARE_DEVICE_TYPE(EXIDY440, exidy440_sound_device)
MACHINE_CONFIG_EXTERN( exidy440_audio );
+
+#endif // MAME_AUDIO_EXIDY440_H
diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp
index 161fb5c79d7..2f84c831f9b 100644
--- a/src/mame/audio/galaxian.cpp
+++ b/src/mame/audio/galaxian.cpp
@@ -386,12 +386,12 @@ static DISCRETE_SOUND_START(mooncrst)
DISCRETE_MIXER7(NODE_280, 1, NODE_133_00, NODE_133_02, NODE_133_02,NODE_133_03, NODE_120, NODE_157, NODE_182, &mooncrst_mixer_desc)
DISCRETE_SOUND_END
-const device_type GALAXIAN = device_creator<galaxian_sound_device>;
+DEFINE_DEVICE_TYPE(GALAXIAN, galaxian_sound_device, "galaxian_sound", "Galaxian Audio Custom")
galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GALAXIAN, "Galaxian Audio Custom", tag, owner, clock, "galaxian_sound", __FILE__),
- device_sound_interface(mconfig, *this),
- m_lfo_val(0)
+ : device_t(mconfig, GALAXIAN, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_lfo_val(0)
{
}
diff --git a/src/mame/audio/galaxian.h b/src/mame/audio/galaxian.h
index 73778702447..b842f1c9628 100644
--- a/src/mame/audio/galaxian.h
+++ b/src/mame/audio/galaxian.h
@@ -1,15 +1,18 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_GALAXIAN_H
+#define MAME_AUDIO_GALAXIAN_H
+
+#pragma once
+
#include "sound/discrete.h"
#define GAL_AUDIO "discrete"
-class galaxian_sound_device : public device_t,
- public device_sound_interface
+class galaxian_sound_device : public device_t, public device_sound_interface
{
public:
galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~galaxian_sound_device() {}
DECLARE_WRITE8_MEMBER( sound_w );
DECLARE_WRITE8_MEMBER( pitch_w );
@@ -32,7 +35,9 @@ private:
discrete_device *m_discrete;
};
-extern const device_type GALAXIAN;
+DECLARE_DEVICE_TYPE(GALAXIAN, galaxian_sound_device)
MACHINE_CONFIG_EXTERN( mooncrst_audio );
MACHINE_CONFIG_EXTERN( galaxian_audio );
+
+#endif // MAME_AUDIO_GALAXIAN_H
diff --git a/src/mame/audio/gamate.cpp b/src/mame/audio/gamate.cpp
index c53b5cf55ee..8af8c1ce166 100644
--- a/src/mame/audio/gamate.cpp
+++ b/src/mame/audio/gamate.cpp
@@ -7,13 +7,13 @@
***************************************************************************/
#include "emu.h"
-#include "includes/gamate.h"
+#include "audio/gamate.h"
enum { ClockDelay=32 };
// device type definition
-const device_type GAMATE_SND = device_creator<gamate_sound_device>;
+DEFINE_DEVICE_TYPE(GAMATE_SND, gamate_sound_device, "gamate_sound", "Gamate Audio Custom")
const int gamate_sound_device::DAConverter[]={ 0, 3, 7, 13, 23, 41, 75, 137, 249, 453, 825, 1499, 2726, 4956, 9011, 16383 }; // (*.55) on the real below index 8 bareless measureable
const uint8_t Mask[]={ 0xff, 0x0f, 0xff, 0x0f, 0xff, 0x0f, 0x1f, 0x3f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xf };
@@ -27,10 +27,11 @@ const int EnvelopeVolumes[]={ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
//-------------------------------------------------
gamate_sound_device::gamate_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GAMATE_SND, "Gamate Audio Custom", tag, owner, clock, "gamate_sound", __FILE__)
+ : device_t(mconfig, GAMATE_SND, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, m_mixer_channel(nullptr)
- {}
+{
+}
//-------------------------------------------------
// device_start - device-specific startup
diff --git a/src/mame/includes/gamate.h b/src/mame/audio/gamate.h
index 9e387f8e7f0..f43bf793f09 100644
--- a/src/mame/includes/gamate.h
+++ b/src/mame/audio/gamate.h
@@ -6,12 +6,8 @@
*
****************************************************************************/
-#ifndef GAMATE_H_
-#define GAMATE_H_
-
-#include "cpu/m6502/m6502.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
+#ifndef MAME_AUDIO_GAMATE_H
+#define MAME_AUDIO_GAMATE_H
// ======================> gamate_sound_device
@@ -20,7 +16,6 @@ class gamate_sound_device : public device_t, public device_sound_interface
{
public:
gamate_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~gamate_sound_device() { }
DECLARE_WRITE8_MEMBER( device_w );
DECLARE_READ8_MEMBER( device_r );
@@ -47,7 +42,8 @@ private:
volume(0),
pos(0),
size(0)
- {}
+ {
+ }
bool envelope_on, level;
bool tone/*else noise*/, full_cycle/* else square signal/pulse */;
@@ -95,6 +91,6 @@ private:
uint8_t reg[14];
};
-extern const device_type GAMATE_SND;
+DECLARE_DEVICE_TYPE(GAMATE_SND, gamate_sound_device)
-#endif /* GAMATE_H_ */
+#endif // MAME_AUDIO_GAMATE_H
diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp
index 91660fe91e5..8400b80ea04 100644
--- a/src/mame/audio/geebee.cpp
+++ b/src/mame/audio/geebee.cpp
@@ -13,10 +13,10 @@
#include "audio/geebee.h"
-const device_type GEEBEE = device_creator<geebee_sound_device>;
+DEFINE_DEVICE_TYPE(GEEBEE, geebee_sound_device, "geebee_sound", "Gee Bee Audio Custom")
geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GEEBEE, "Gee Bee Audio Custom", tag, owner, clock, "geebee_sound", __FILE__),
+ : device_t(mconfig, GEEBEE, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_decay(nullptr),
m_channel(nullptr),
diff --git a/src/mame/audio/geebee.h b/src/mame/audio/geebee.h
index 94d5fa01561..e1316df83b4 100644
--- a/src/mame/audio/geebee.h
+++ b/src/mame/audio/geebee.h
@@ -1,8 +1,11 @@
// license:GPL-2.0+
// copyright-holders:Juergen Buchmueller
+#ifndef MAME_AUDIO_GEEBEE_H
+#define MAME_AUDIO_GEEBEE_H
-class geebee_sound_device : public device_t,
- public device_sound_interface
+#pragma once
+
+class geebee_sound_device : public device_t, public device_sound_interface
{
public:
geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -35,4 +38,6 @@ private:
int m_vcount;
};
-extern const device_type GEEBEE;
+DECLARE_DEVICE_TYPE(GEEBEE, geebee_sound_device)
+
+#endif // MAME_AUDIO_GEEBEE_H
diff --git a/src/mame/audio/gomoku.cpp b/src/mame/audio/gomoku.cpp
index d4084838088..46b81b532d2 100644
--- a/src/mame/audio/gomoku.cpp
+++ b/src/mame/audio/gomoku.cpp
@@ -9,14 +9,14 @@
***************************************************************************/
#include "emu.h"
-#include "includes/gomoku.h"
+#include "audio/gomoku.h"
-static const int samplerate = 48000;
-static const int defgain = 48;
+static constexpr int samplerate = 48000;
+static constexpr int defgain = 48;
// device type definition
-const device_type GOMOKU = device_creator<gomoku_sound_device>;
+DEFINE_DEVICE_TYPE(GOMOKU, gomoku_sound_device, "gomoku_sound", "Gomoku Narabe Renju Audio Custom")
//**************************************************************************
@@ -28,7 +28,7 @@ const device_type GOMOKU = device_creator<gomoku_sound_device>;
//-------------------------------------------------
gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GOMOKU, "Gomoku Narabe Renju Audio Custom", tag, owner, clock, "gomoku_sound", __FILE__),
+ : device_t(mconfig, GOMOKU, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_last_channel(nullptr),
m_sound_rom(nullptr),
@@ -40,7 +40,7 @@ gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, const ch
m_mixer_buffer(nullptr),
m_mixer_buffer_2(nullptr)
{
- memset(m_channel_list, 0, sizeof(gomoku_sound_channel)*GOMOKU_MAX_VOICES);
+ memset(m_channel_list, 0, sizeof(gomoku_sound_channel)*MAX_VOICES);
memset(m_soundregs1, 0, sizeof(uint8_t)*0x20);
memset(m_soundregs2, 0, sizeof(uint8_t)*0x20);
}
@@ -66,7 +66,7 @@ void gomoku_sound_device::device_start()
make_mixer_table(8, defgain);
/* extract globals from the interface */
- m_num_voices = GOMOKU_MAX_VOICES;
+ m_num_voices = MAX_VOICES;
m_last_channel = m_channel_list + m_num_voices;
m_sound_rom = memregion(":gomoku")->base();
diff --git a/src/mame/audio/gomoku.h b/src/mame/audio/gomoku.h
new file mode 100644
index 00000000000..6b71fab0d49
--- /dev/null
+++ b/src/mame/audio/gomoku.h
@@ -0,0 +1,73 @@
+// license:BSD-3-Clause
+// copyright-holders:Takahiro Nogi, David Haywood
+#ifndef MAME_AUDIO_GOMOKU_H
+#define MAME_AUDIO_GOMOKU_H
+
+//**************************************************************************
+// TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> gomoku_sound_device
+
+class gomoku_sound_device : public device_t,
+ public device_sound_interface
+{
+public:
+ gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_WRITE8_MEMBER( sound1_w );
+ DECLARE_WRITE8_MEMBER( sound2_w );
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+private:
+ void make_mixer_table(int voices, int gain);
+
+ /* 4 voices max */
+ static constexpr unsigned MAX_VOICES = 4;
+
+ struct gomoku_sound_channel
+ {
+ gomoku_sound_channel():
+ channel(0),
+ frequency(0),
+ counter(0),
+ volume(0),
+ oneshotplaying(0) {}
+
+ int channel;
+ int frequency;
+ int counter;
+ int volume;
+ int oneshotplaying;
+ };
+
+
+ /* data about the sound system */
+ gomoku_sound_channel m_channel_list[MAX_VOICES];
+ gomoku_sound_channel *m_last_channel;
+
+ /* global sound parameters */
+ const uint8_t *m_sound_rom;
+ int m_num_voices;
+ int m_sound_enable;
+ sound_stream *m_stream;
+
+ /* mixer tables and internal buffers */
+ std::unique_ptr<int16_t[]> m_mixer_table;
+ int16_t *m_mixer_lookup;
+ std::unique_ptr<short[]> m_mixer_buffer;
+ short *m_mixer_buffer_2;
+
+ uint8_t m_soundregs1[0x20];
+ uint8_t m_soundregs2[0x20];
+};
+
+DECLARE_DEVICE_TYPE(GOMOKU, gomoku_sound_device)
+
+#endif // MAME_AUDIO_GOMOKU_H
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index fa30276265c..1e8aed6785d 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -25,10 +25,10 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type GOTTLIEB_SOUND_REV0 = device_creator<gottlieb_sound_r0_device>;
-const device_type GOTTLIEB_SOUND_REV1 = device_creator<gottlieb_sound_r1_device>;
-const device_type GOTTLIEB_SOUND_REV1_WITH_VOTRAX = device_creator<gottlieb_sound_r1_with_votrax_device>;
-const device_type GOTTLIEB_SOUND_REV2 = device_creator<gottlieb_sound_r2_device>;
+DEFINE_DEVICE_TYPE(GOTTLIEB_SOUND_REV0, gottlieb_sound_r0_device, "gotsndr0", "Gottlieb Sound rev. 0")
+DEFINE_DEVICE_TYPE(GOTTLIEB_SOUND_REV1, gottlieb_sound_r1_device, "gotsndr1", "Gottlieb Sound rev. 1")
+DEFINE_DEVICE_TYPE(GOTTLIEB_SOUND_REV1_VOTRAX, gottlieb_sound_r1_with_votrax_device, "gotsndr1vt", "Gottlieb Sound rev. 1 with Votrax")
+DEFINE_DEVICE_TYPE(GOTTLIEB_SOUND_REV2, gottlieb_sound_r2_device, "gotsndr2", "Gottlieb Sound rev. 2")
//**************************************************************************
@@ -40,7 +40,7 @@ const device_type GOTTLIEB_SOUND_REV2 = device_creator<gottlieb_sound_r2_device>
//-------------------------------------------------
gottlieb_sound_r0_device::gottlieb_sound_r0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GOTTLIEB_SOUND_REV0, "Gottlieb Sound rev. 0", tag, owner, clock, "gotsndr0", __FILE__)
+ : device_t(mconfig, GOTTLIEB_SOUND_REV0, tag, owner, clock)
, device_mixer_interface(mconfig, *this)
, m_audiocpu(*this, "audiocpu")
, m_r6530(*this, "r6530")
@@ -165,20 +165,17 @@ void gottlieb_sound_r0_device::device_start()
//-------------------------------------------------
gottlieb_sound_r1_device::gottlieb_sound_r1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : gottlieb_sound_r1_device(mconfig, GOTTLIEB_SOUND_REV1, "Gottlieb Sound rev. 1", tag, owner, clock, "gotsndr1", __FILE__)
+ : gottlieb_sound_r1_device(mconfig, GOTTLIEB_SOUND_REV1, tag, owner, clock)
{
}
gottlieb_sound_r1_device::gottlieb_sound_r1_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_mixer_interface(mconfig, *this)
, m_audiocpu(*this, "audiocpu")
, m_riot(*this, "riot")
@@ -389,7 +386,7 @@ void gottlieb_sound_r1_device::device_start()
//-------------------------------------------------
gottlieb_sound_r1_with_votrax_device::gottlieb_sound_r1_with_votrax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : gottlieb_sound_r1_device(mconfig, GOTTLIEB_SOUND_REV1_WITH_VOTRAX, "Gottlieb Sound rev. 1 with Votrax", tag, owner, clock, "gotsndr1vt", __FILE__)
+ : gottlieb_sound_r1_device(mconfig, GOTTLIEB_SOUND_REV1_VOTRAX, tag, owner, clock)
{
}
@@ -426,7 +423,7 @@ ioport_constructor gottlieb_sound_r1_with_votrax_device::device_input_ports() co
//-------------------------------------------------
gottlieb_sound_r2_device::gottlieb_sound_r2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GOTTLIEB_SOUND_REV2, "Gottlieb Sound rev. 2", tag, owner, clock, "gotsndr2", __FILE__),
+ : device_t(mconfig, GOTTLIEB_SOUND_REV2, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_audiocpu(*this, "audiocpu"),
m_speechcpu(*this, "speechcpu"),
diff --git a/src/mame/audio/gottlieb.h b/src/mame/audio/gottlieb.h
index 722c256e6a7..f8b49933c18 100644
--- a/src/mame/audio/gottlieb.h
+++ b/src/mame/audio/gottlieb.h
@@ -18,10 +18,10 @@
// GLOBAL VARIABLES
//**************************************************************************
-extern const device_type GOTTLIEB_SOUND_REV0;
-extern const device_type GOTTLIEB_SOUND_REV1;
-extern const device_type GOTTLIEB_SOUND_REV1_WITH_VOTRAX;
-extern const device_type GOTTLIEB_SOUND_REV2;
+DECLARE_DEVICE_TYPE(GOTTLIEB_SOUND_REV0, gottlieb_sound_r0_device)
+DECLARE_DEVICE_TYPE(GOTTLIEB_SOUND_REV1, gottlieb_sound_r1_device)
+DECLARE_DEVICE_TYPE(GOTTLIEB_SOUND_REV1_VOTRAX, gottlieb_sound_r1_with_votrax_device)
+DECLARE_DEVICE_TYPE(GOTTLIEB_SOUND_REV2, gottlieb_sound_r2_device)
@@ -90,12 +90,9 @@ protected:
gottlieb_sound_r1_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source);
+ uint32_t clock);
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
diff --git a/src/mame/audio/gridlee.cpp b/src/mame/audio/gridlee.cpp
index d34a6ca1c4e..78280b7511e 100644
--- a/src/mame/audio/gridlee.cpp
+++ b/src/mame/audio/gridlee.cpp
@@ -11,7 +11,7 @@
// device type definition
-const device_type GRIDLEE = device_creator<gridlee_sound_device>;
+DEFINE_DEVICE_TYPE(GRIDLEE, gridlee_sound_device, "gridlee_sound", "Gridlee Audio Custom")
//**************************************************************************
@@ -23,7 +23,7 @@ const device_type GRIDLEE = device_creator<gridlee_sound_device>;
//-------------------------------------------------
gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GRIDLEE, "Gridlee Audio Custom", tag, owner, clock, "gridlee_sound", __FILE__),
+ : device_t(mconfig, GRIDLEE, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_tone_step(0),
m_tone_fraction(0),
diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp
index 8250b40f6cc..690a8eef269 100644
--- a/src/mame/audio/harddriv.cpp
+++ b/src/mame/audio/harddriv.cpp
@@ -8,8 +8,9 @@
#include "emu.h"
#include "includes/harddriv.h"
-#include "cpu/tms32010/tms32010.h"
#include "machine/atarigen.h"
+
+#include "cpu/tms32010/tms32010.h"
#include "sound/volt_reg.h"
#include "speaker.h"
@@ -26,10 +27,10 @@
// harddriv_sound_board_device - constructor
//-------------------------------------------------
-const device_type HARDDRIV_SOUND_BOARD_DEVICE = device_creator<harddriv_sound_board_device>;
+DEFINE_DEVICE_TYPE(HARDDRIV_SOUND_BOARD, harddriv_sound_board_device, "harddriv_sound", "Hard Drivin' Sound Board")
harddriv_sound_board_device::harddriv_sound_board_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, HARDDRIV_SOUND_BOARD_DEVICE, "Hard Drivin' Sound Board", tag, owner, clock, "harddriv_sound", __FILE__),
+ device_t(mconfig, HARDDRIV_SOUND_BOARD, tag, owner, clock),
m_soundcpu(*this, "soundcpu"),
m_dac(*this, "dac"),
m_sounddsp(*this, "sounddsp"),
diff --git a/src/mame/audio/hyprolyb.cpp b/src/mame/audio/hyprolyb.cpp
index 02b55b2ff8c..0baf0113634 100644
--- a/src/mame/audio/hyprolyb.cpp
+++ b/src/mame/audio/hyprolyb.cpp
@@ -4,15 +4,15 @@
#include "cpu/m6800/m6800.h"
#include "audio/hyprolyb.h"
-const device_type HYPROLYB_ADPCM = device_creator<hyprolyb_adpcm_device>;
+DEFINE_DEVICE_TYPE(HYPROLYB_ADPCM, hyprolyb_adpcm_device, "hyprolyb_adpcm", "Hyper Olympics Audio")
hyprolyb_adpcm_device::hyprolyb_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, HYPROLYB_ADPCM, "Hyper Olympics Audio", tag, owner, clock, "hyprolyb_adpcm", __FILE__),
- device_sound_interface(mconfig, *this),
- m_soundlatch2(*this, ":soundlatch2"),
- m_adpcm_ready(0),
- m_adpcm_busy(0),
- m_vck_ready(0)
+ : device_t(mconfig, HYPROLYB_ADPCM, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_soundlatch2(*this, ":soundlatch2")
+ , m_adpcm_ready(0)
+ , m_adpcm_busy(0)
+ , m_vck_ready(0)
{
}
@@ -113,7 +113,7 @@ MACHINE_CONFIG_FRAGMENT( hyprolyb_adpcm )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(DEVWRITELINE("hyprolyb_adpcm", hyprolyb_adpcm_device, vck_callback)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/hyprolyb.h b/src/mame/audio/hyprolyb.h
index 67ab8c27f74..fccea4779be 100644
--- a/src/mame/audio/hyprolyb.h
+++ b/src/mame/audio/hyprolyb.h
@@ -1,15 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Chris Hardy
+#ifndef MAME_AUDIO_HYPROLYB_H
+#define MAME_AUDIO_HYPROLYB_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
-class hyprolyb_adpcm_device : public device_t,
- public device_sound_interface
+class hyprolyb_adpcm_device : public device_t, public device_sound_interface
{
public:
hyprolyb_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~hyprolyb_adpcm_device() {}
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( busy_r );
@@ -42,3 +44,6 @@ protected:
MACHINE_CONFIG_EXTERN( hyprolyb_adpcm );
extern const device_type HYPROLYB_ADPCM;
+DECLARE_DEVICE_TYPE(HYPROLYB_ADPCM, hyprolyb_adpcm_device)
+
+#endif // MAME_AUDIO_HYPROLYB_H
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index ccc1a6852cd..7675fef06cf 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -14,32 +14,36 @@
#include "speaker.h"
-const device_type IREM_M62_AUDIO = device_creator<m62_audio_device>;
-const device_type IREM_M52_SOUNDC_AUDIO = device_creator<m52_soundc_audio_device>;
-const device_type IREM_M52_LARGE_AUDIO = device_creator<m52_large_audio_device>;
-
-irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_port1(0),
- m_port2(0),
- m_soundlatch(0)
- //m_ay_45L(*this, "ay_45l"),
- //m_ay_45M(*this, "ay_45m")
+DEFINE_DEVICE_TYPE(IREM_M62_AUDIO, m62_audio_device, "m62_audio", "Irem M62 Audio")
+DEFINE_DEVICE_TYPE(IREM_M52_SOUNDC_AUDIO, m52_soundc_audio_device, "m52_soundc_audio", "Irem M52 SoundC Audio")
+DEFINE_DEVICE_TYPE(IREM_M52_LARGE_AUDIO, m52_large_audio_device, "m52_large_audio", "Irem M52 Large Audio")
+
+irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_port1(0)
+ , m_port2(0)
+ , m_soundlatch(0)
+ //, m_ay_45L(*this, "ay_45l")
+ //, m_ay_45M(*this, "ay_45m")
+ , m_audio_BD(*this, "snd_nl:ibd")
+ , m_audio_SD(*this, "snd_nl:isd")
+ , m_audio_OH(*this, "snd_nl:ioh")
+ , m_audio_CH(*this, "snd_nl:ich")
{
}
m62_audio_device::m62_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : irem_audio_device(mconfig, IREM_M62_AUDIO, "Irem M62 Audio", tag, owner, clock, "irem_m62_audio", __FILE__)
+ : irem_audio_device(mconfig, IREM_M62_AUDIO, tag, owner, clock)
{
}
m52_soundc_audio_device::m52_soundc_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : irem_audio_device(mconfig, IREM_M52_SOUNDC_AUDIO, "Irem M52 SoundC Audio", tag, owner, clock, "irem_m52_soundc_audio", __FILE__)
+ : irem_audio_device(mconfig, IREM_M52_SOUNDC_AUDIO, tag, owner, clock)
{
}
m52_large_audio_device::m52_large_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : irem_audio_device(mconfig, IREM_M52_LARGE_AUDIO, "Irem M52 Large Audio", tag, owner, clock, "irem_m52_large_audio", __FILE__)
+ : irem_audio_device(mconfig, IREM_M52_LARGE_AUDIO, tag, owner, clock)
{
}
@@ -54,11 +58,7 @@ void irem_audio_device::device_start()
m_ay_45L = subdevice<ay8910_device>("ay_45l");
m_ay_45M = subdevice<ay8910_device>("ay_45m");
- m_audio_BD = subdevice<netlist_mame_logic_input_t>("snd_nl:ibd");
- m_audio_SD = subdevice<netlist_mame_logic_input_t>("snd_nl:isd");
- m_audio_OH = subdevice<netlist_mame_logic_input_t>("snd_nl:ioh");
- m_audio_CH = subdevice<netlist_mame_logic_input_t>("snd_nl:ich");
- m_audio_SINH = subdevice<netlist_mame_logic_input_t>("snd_nl:sinh");
+ m_audio_SINH = subdevice<netlist_mame_logic_input_device>("snd_nl:sinh");
save_item(NAME(m_port1));
save_item(NAME(m_port2));
@@ -457,11 +457,11 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(irem_audio_device, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* default to 4KHz, but can be changed at run time */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 6)
MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 7)
/* NETLIST configuration using internal AY8910 resistor values */
@@ -522,7 +522,7 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(irem_audio_device, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* default to 4KHz, but can be changed at run time */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2)
MCFG_SOUND_ADD("filtermix", DISCRETE, 0)
@@ -556,11 +556,11 @@ MACHINE_CONFIG_FRAGMENT( m52_large_audio) /* 10 yard fight */
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(irem_audio_device, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* default to 4KHz, but can be changed at run time */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz) /* verified on pcb */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* default to 4KHz, but can be changed at run time, slave */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/irem.h b/src/mame/audio/irem.h
index 9704b98b35f..756f3355d22 100644
--- a/src/mame/audio/irem.h
+++ b/src/mame/audio/irem.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Couriersud
+#ifndef MAME_AUDIO_IREM_H
+#define MAME_AUDIO_IREM_H
+
+#pragma once
+
#include "sound/ay8910.h"
#include "sound/msm5205.h"
#include "machine/netlist.h"
@@ -8,9 +13,6 @@
class irem_audio_device : public device_t
{
public:
- irem_audio_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- ~irem_audio_device() {}
-
DECLARE_WRITE8_MEMBER( cmd_w );
DECLARE_READ8_MEMBER( soundlatch_r );
DECLARE_WRITE8_MEMBER( m6803_port1_w );
@@ -25,9 +27,11 @@ public:
void adpcm_int(int st);
- netlist_mame_logic_input_t * m_audio_SINH;
+ netlist_mame_logic_input_device * m_audio_SINH;
protected:
+ irem_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -46,10 +50,10 @@ private:
msm5205_device *m_adpcm1;
msm5205_device *m_adpcm2;
- netlist_mame_logic_input_t * m_audio_BD;
- netlist_mame_logic_input_t * m_audio_SD;
- netlist_mame_logic_input_t * m_audio_OH;
- netlist_mame_logic_input_t * m_audio_CH;
+ optional_device<netlist_mame_logic_input_device> m_audio_BD;
+ optional_device<netlist_mame_logic_input_device> m_audio_SD;
+ optional_device<netlist_mame_logic_input_device> m_audio_OH;
+ optional_device<netlist_mame_logic_input_device> m_audio_CH;
};
class m62_audio_device : public irem_audio_device
@@ -77,6 +81,8 @@ public:
//MACHINE_CONFIG_EXTERN( m52_large_audio );
//MACHINE_CONFIG_EXTERN( m62_audio );
-extern const device_type IREM_M62_AUDIO;
-extern const device_type IREM_M52_SOUNDC_AUDIO;
-extern const device_type IREM_M52_LARGE_AUDIO;
+DECLARE_DEVICE_TYPE(IREM_M62_AUDIO, m62_audio_device)
+DECLARE_DEVICE_TYPE(IREM_M52_SOUNDC_AUDIO, m52_soundc_audio_device)
+DECLARE_DEVICE_TYPE(IREM_M52_LARGE_AUDIO, m52_large_audio_device)
+
+#endif // MAME_AUDIO_IREM_H
diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp
index 0ae2dcf0644..4ff229e9b8e 100644
--- a/src/mame/audio/leland.cpp
+++ b/src/mame/audio/leland.cpp
@@ -80,7 +80,7 @@
***************************************************************************/
#include "emu.h"
-#include "includes/leland.h"
+#include "audio/leland.h"
#include "cpu/z80/z80.h"
#include "sound/volt_reg.h"
@@ -351,37 +351,16 @@ void leland_80186_sound_device::device_reset()
m_ext_active = 0;
}
-const device_type LELAND_80186 = device_creator<leland_80186_sound_device>;
+DEFINE_DEVICE_TYPE(LELAND_80186, leland_80186_sound_device, "leland_80186_sound", "80186 DAC (Leland)")
leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, LELAND_80186, "80186 DAC (Leland)", tag, owner, clock, "leland_80186_sound", __FILE__),
- m_dac1(*this, "dac1"),
- m_dac2(*this, "dac2"),
- m_dac3(*this, "dac3"),
- m_dac4(*this, "dac4"),
- m_dac5(*this, "dac5"),
- m_dac6(*this, "dac6"),
- m_dac7(*this, "dac7"),
- m_dac8(*this, "dac8"),
- m_dac9(*this, "dac9"),
- m_dac1vol(*this, "dac1vol"),
- m_dac2vol(*this, "dac2vol"),
- m_dac3vol(*this, "dac3vol"),
- m_dac4vol(*this, "dac4vol"),
- m_dac5vol(*this, "dac5vol"),
- m_dac6vol(*this, "dac6vol"),
- m_dac7vol(*this, "dac7vol"),
- m_dac8vol(*this, "dac8vol"),
- m_pit0(*this, "pit0"),
- m_pit1(*this, "pit1"),
- m_pit2(*this, "pit2"),
- m_ymsnd(*this, "ymsnd")
+ : leland_80186_sound_device(mconfig, LELAND_80186, tag, owner, clock)
{
m_type = TYPE_LELAND;
}
-leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
m_dac1(*this, "dac1"),
m_dac2(*this, "dac2"),
m_dac3(*this, "dac3"),
@@ -406,26 +385,26 @@ leland_80186_sound_device::leland_80186_sound_device(const machine_config &mconf
{
}
-const device_type REDLINE_80186 = device_creator<redline_80186_sound_device>;
+DEFINE_DEVICE_TYPE(REDLINE_80186, redline_80186_sound_device, "redline_80186_sound", "80186 DAC (Redline Racer)")
redline_80186_sound_device::redline_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : leland_80186_sound_device(mconfig, REDLINE_80186, "80186 DAC (Redline Racer)", tag, owner, clock, "redline_80186_sound", __FILE__)
+ : leland_80186_sound_device(mconfig, REDLINE_80186, tag, owner, clock)
{
m_type = TYPE_REDLINE;
}
-const device_type ATAXX_80186 = device_creator<ataxx_80186_sound_device>;
+DEFINE_DEVICE_TYPE(ATAXX_80186, ataxx_80186_sound_device, "ataxx_80186_sound", "80186 DAC (Ataxx)")
ataxx_80186_sound_device::ataxx_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : leland_80186_sound_device(mconfig, ATAXX_80186, "80186 DAC (Ataxx)", tag, owner, clock, "ataxx_80186_sound", __FILE__)
+ : leland_80186_sound_device(mconfig, ATAXX_80186, tag, owner, clock)
{
m_type = TYPE_ATAXX;
}
-const device_type WSF_80186 = device_creator<wsf_80186_sound_device>;
+DEFINE_DEVICE_TYPE(WSF_80186, wsf_80186_sound_device, "wsf_80186_sound", "80186 DAC (WSF)")
wsf_80186_sound_device::wsf_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : leland_80186_sound_device(mconfig, WSF_80186, "80186 DAC (WSF)", tag, owner, clock, "wsf_80186_sound", __FILE__)
+ : leland_80186_sound_device(mconfig, WSF_80186, tag, owner, clock)
{
m_type = TYPE_WSF;
}
diff --git a/src/mame/audio/leland.h b/src/mame/audio/leland.h
new file mode 100644
index 00000000000..1ffea93257c
--- /dev/null
+++ b/src/mame/audio/leland.h
@@ -0,0 +1,135 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/*************************************************************************
+
+ Cinemat/Leland driver
+
+*************************************************************************/
+#ifndef MAME_AUDIO_LELAND_H
+#define MAME_AUDIO_LELAND_H
+
+#pragma once
+
+#include "cpu/i86/i186.h"
+#include "machine/pit8253.h"
+#include "sound/dac.h"
+#include "sound/ym2151.h"
+
+
+class leland_80186_sound_device : public device_t
+{
+public:
+ leland_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual machine_config_constructor device_mconfig_additions() const override;
+
+ DECLARE_WRITE16_MEMBER(peripheral_ctrl);
+ DECLARE_WRITE8_MEMBER(leland_80186_control_w);
+ DECLARE_WRITE8_MEMBER(ataxx_80186_control_w);
+ DECLARE_READ16_MEMBER(peripheral_r);
+ DECLARE_WRITE16_MEMBER(peripheral_w);
+ DECLARE_WRITE8_MEMBER(leland_80186_command_lo_w);
+ DECLARE_WRITE8_MEMBER(leland_80186_command_hi_w);
+ DECLARE_READ8_MEMBER(leland_80186_response_r);
+ DECLARE_WRITE16_MEMBER(dac_w);
+ DECLARE_WRITE16_MEMBER(ataxx_dac_control);
+ DECLARE_WRITE_LINE_MEMBER(pit0_2_w);
+ DECLARE_WRITE_LINE_MEMBER(pit1_0_w);
+ DECLARE_WRITE_LINE_MEMBER(pit1_1_w);
+ DECLARE_WRITE_LINE_MEMBER(pit1_2_w);
+ DECLARE_WRITE_LINE_MEMBER(i80186_tmr0_w);
+ DECLARE_WRITE_LINE_MEMBER(i80186_tmr1_w);
+
+protected:
+ leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ int m_type;
+
+ enum {
+ TYPE_LELAND,
+ TYPE_REDLINE,
+ TYPE_ATAXX,
+ TYPE_WSF
+ };
+
+ required_device<dac_byte_interface> m_dac1;
+ required_device<dac_byte_interface> m_dac2;
+ required_device<dac_byte_interface> m_dac3;
+ required_device<dac_byte_interface> m_dac4;
+ optional_device<dac_byte_interface> m_dac5;
+ optional_device<dac_byte_interface> m_dac6;
+ optional_device<dac_byte_interface> m_dac7;
+ optional_device<dac_byte_interface> m_dac8;
+ optional_device<dac_word_interface> m_dac9;
+ required_device<dac_byte_interface> m_dac1vol;
+ required_device<dac_byte_interface> m_dac2vol;
+ required_device<dac_byte_interface> m_dac3vol;
+ required_device<dac_byte_interface> m_dac4vol;
+ optional_device<dac_byte_interface> m_dac5vol;
+ optional_device<dac_byte_interface> m_dac6vol;
+ optional_device<dac_byte_interface> m_dac7vol;
+ optional_device<dac_byte_interface> m_dac8vol;
+
+private:
+ void command_lo_sync(void *ptr, int param);
+ void delayed_response_r(void *ptr, int param);
+ void set_clock_line(int which, int state) { m_clock_active = state ? (m_clock_active | (1<<which)) : (m_clock_active & ~(1<<which)); }
+
+ // internal state
+ i80186_cpu_device *m_audiocpu;
+ uint16_t m_peripheral;
+ uint8_t m_last_control;
+ uint8_t m_clock_active;
+ uint8_t m_clock_tick;
+ uint16_t m_sound_command;
+ uint16_t m_sound_response;
+ uint32_t m_ext_start;
+ uint32_t m_ext_stop;
+ uint8_t m_ext_active;
+ uint8_t* m_ext_base;
+
+ required_device<pit8254_device> m_pit0;
+ optional_device<pit8254_device> m_pit1;
+ optional_device<pit8254_device> m_pit2;
+ optional_device<ym2151_device> m_ymsnd;
+};
+
+
+class redline_80186_sound_device : public leland_80186_sound_device
+{
+public:
+ redline_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ DECLARE_WRITE16_MEMBER(redline_dac_w);
+ virtual machine_config_constructor device_mconfig_additions() const override;
+};
+
+
+class ataxx_80186_sound_device : public leland_80186_sound_device
+{
+public:
+ ataxx_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual machine_config_constructor device_mconfig_additions() const override;
+};
+
+
+class wsf_80186_sound_device : public leland_80186_sound_device
+{
+public:
+ wsf_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ virtual machine_config_constructor device_mconfig_additions() const override;
+};
+
+
+DECLARE_DEVICE_TYPE(LELAND_80186, leland_80186_sound_device)
+DECLARE_DEVICE_TYPE(REDLINE_80186, redline_80186_sound_device)
+DECLARE_DEVICE_TYPE(ATAXX_80186, ataxx_80186_sound_device)
+DECLARE_DEVICE_TYPE(WSF_80186, wsf_80186_sound_device)
+
+ADDRESS_MAP_EXTERN(leland_80186_map_program, 16);
+ADDRESS_MAP_EXTERN(leland_80186_map_io, 16);
+ADDRESS_MAP_EXTERN(redline_80186_map_io, 16);
+ADDRESS_MAP_EXTERN(ataxx_80186_map_io, 16);
+
+#endif // MAME_AUDIO_LELAND_H
diff --git a/src/mame/audio/lynx.cpp b/src/mame/audio/lynx.cpp
index 89ff60be811..0571d1205fd 100644
--- a/src/mame/audio/lynx.cpp
+++ b/src/mame/audio/lynx.cpp
@@ -85,8 +85,8 @@ AUD_A_RIGHT EQU %00000001
// device type definition
-const device_type LYNX_SND = device_creator<lynx_sound_device>;
-const device_type LYNX2_SND = device_creator<lynx2_sound_device>;
+DEFINE_DEVICE_TYPE(LYNX_SND, lynx_sound_device, "lynx_sound", "Mikey")
+DEFINE_DEVICE_TYPE(LYNX2_SND, lynx2_sound_device, "lynx2_sound", "Mikey (Lynx II)")
//**************************************************************************
// LIVE DEVICE
@@ -97,25 +97,24 @@ const device_type LYNX2_SND = device_creator<lynx2_sound_device>;
//-------------------------------------------------
lynx_sound_device::lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, LYNX_SND, "Mikey", tag, owner, clock, "lynx_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : lynx_sound_device(mconfig, LYNX_SND, tag, owner, clock)
{
- m_timer_delegate = lynx_sound_timer_delegate();
+ m_timer_delegate = timer_delegate();
}
-lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- device_sound_interface(mconfig, *this)
+lynx_sound_device::lynx_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
lynx2_sound_device::lynx2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : lynx_sound_device(mconfig, LYNX2_SND, "Mikey (Lynx II)", tag, owner, clock, "lynx2_sound", __FILE__)
+ : lynx_sound_device(mconfig, LYNX2_SND, tag, owner, clock)
{
}
-void lynx_sound_device::set_timer_delegate(device_t &device, lynx_sound_timer_delegate cb)
+void lynx_sound_device::set_timer_delegate(device_t &device, timer_delegate cb)
{
lynx_sound_device &dev = downcast<lynx_sound_device &>(device);
dev.m_timer_delegate = cb;
diff --git a/src/mame/audio/lynx.h b/src/mame/audio/lynx.h
index a9958e868cd..0d660ce3224 100644
--- a/src/mame/audio/lynx.h
+++ b/src/mame/audio/lynx.h
@@ -1,43 +1,44 @@
// license:GPL-2.0+
// copyright-holders:Peter Trauner
+#ifndef MAME_AUDIO_LYNX_H
+#define MAME_AUDIO_LYNX_H
-#ifndef __LYNXSOUND_H__
-#define __LYNXSOUND_H__
-
-struct LYNX_AUDIO {
- struct {
- int8_t volume;
- uint8_t feedback;
- int8_t output;
- uint8_t shifter;
- uint8_t bakup;
- uint8_t control1;
- uint8_t counter;
- uint8_t control2;
- } reg;
- uint8_t attenuation;
- uint16_t mask; // 12-bit
- uint16_t shifter; // 12-bit
- float ticks;
- int count;
-};
-
-typedef device_delegate<void (void)> lynx_sound_timer_delegate;
+#pragma once
-class lynx_sound_device : public device_t,
- public device_sound_interface
+class lynx_sound_device : public device_t, public device_sound_interface
{
public:
- lynx_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ typedef device_delegate<void (void)> timer_delegate;
+
lynx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
void count_down(int nr);
- static void set_timer_delegate(device_t &device, lynx_sound_timer_delegate cb);
+ static void set_timer_delegate(device_t &device, timer_delegate cb);
protected:
+ struct LYNX_AUDIO {
+ struct {
+ int8_t volume;
+ uint8_t feedback;
+ int8_t output;
+ uint8_t shifter;
+ uint8_t bakup;
+ uint8_t control1;
+ uint8_t counter;
+ uint8_t control2;
+ } reg;
+ uint8_t attenuation;
+ uint16_t mask; // 12-bit
+ uint16_t shifter; // 12-bit
+ float ticks;
+ int count;
+ };
+
+ lynx_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
@@ -53,7 +54,7 @@ protected:
void register_save();
sound_stream *m_mixer_channel;
- lynx_sound_timer_delegate m_timer_delegate; // this calls lynx_timer_count_down from the driver state
+ timer_delegate m_timer_delegate; // this calls lynx_timer_count_down from the driver state
float m_usec_per_sample;
std::unique_ptr<int[]> m_shift_mask;
@@ -78,12 +79,12 @@ protected:
};
-extern const device_type LYNX_SND;
-extern const device_type LYNX2_SND;
+DECLARE_DEVICE_TYPE(LYNX_SND, lynx_sound_device)
+DECLARE_DEVICE_TYPE(LYNX2_SND, lynx2_sound_device)
#define MCFG_LYNX_SND_SET_TIMER( _class, _method) \
- lynx_sound_device::set_timer_delegate(*device, lynx_sound_timer_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
+ lynx_sound_device::set_timer_delegate(*device, lynx_sound_device::timer_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
-#endif
+#endif // MAME_AUDIO_LYNX_H
diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp
index d07a86751ec..ced76a57daf 100644
--- a/src/mame/audio/m72.cpp
+++ b/src/mame/audio/m72.cpp
@@ -47,10 +47,10 @@ Shisensho II 1993 Rev 3.34 M81 Yes
#include "m72.h"
-const device_type M72 = device_creator<m72_audio_device>;
+DEFINE_DEVICE_TYPE(IREM_M72_AUDIO, m72_audio_device, "m72_audio", "Irem M72 Audio")
m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, M72, "Irem M72 Audio Custom", tag, owner, clock, "m72_audio", __FILE__)
+ : device_t(mconfig, IREM_M72_AUDIO, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, m_irqvector(0)
, m_sample_addr(0)
diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h
index 26317e436ab..b5ccf69cb01 100644
--- a/src/mame/audio/m72.h
+++ b/src/mame/audio/m72.h
@@ -5,12 +5,15 @@
M72 audio interface
****************************************************************************/
+#ifndef MAME_AUDIO_M72_H
+#define MAME_AUDIO_M72_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "sound/dac.h"
-class m72_audio_device : public device_t,
- public device_sound_interface
+class m72_audio_device : public device_t, public device_sound_interface
{
public:
m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -59,4 +62,6 @@ private:
TIMER_CALLBACK_MEMBER( setvector_callback );
};
-extern const device_type M72;
+DECLARE_DEVICE_TYPE(IREM_M72_AUDIO, m72_audio_device)
+
+#endif // MAME_AUDIO_M72_H
diff --git a/src/mame/audio/micro3d.cpp b/src/mame/audio/micro3d.cpp
index eebed7887a7..8e117894a9a 100644
--- a/src/mame/audio/micro3d.cpp
+++ b/src/mame/audio/micro3d.cpp
@@ -9,7 +9,7 @@
***************************************************************************/
#include "emu.h"
-#include "includes/micro3d.h"
+#include "audio/micro3d.h"
#define MM5837_CLOCK 100000
@@ -22,23 +22,23 @@
*************************************/
/* Borrowed from segasnd.c */
-static inline void configure_filter(m3d_filter_state *state, double r, double c)
+inline void micro3d_sound_device::m3d_filter_state::configure(double r, double c)
{
- state->capval = 0;
- state->exponent = 1.0 - exp(-1.0 / (r * c * 2000000/8));
+ capval = 0;
+ exponent = 1.0 - exp(-1.0 / (r * c * 2000000/8));
}
#if 0
-static inline double step_rc_filter(m3d_filter_state *state, double input)
+inline double micro3d_sound_device::m3d_filter_state::step_rc_filter(double input)
{
- state->capval += (input - state->capval) * state->exponent;
- return state->capval;
+ capval += (input - capval) * exponent;
+ return capval;
}
-static inline double step_cr_filter(m3d_filter_state *state, double input)
+inline double micro3d_sound_device::m3d_filter_state::step_cr_filter(double input)
{
- double result = (input - state->capval);
- state->capval += (input - state->capval) * state->exponent;
+ double const result = input - capval;
+ capval += result * exponent;
return result;
}
#endif
@@ -50,27 +50,27 @@ static inline double step_cr_filter(m3d_filter_state *state, double input)
*
*************************************/
-static void filter_init(running_machine &machine, lp_filter *iir, double fs)
+void micro3d_sound_device::lp_filter::init(double fsval)
{
/* Section 1 */
- iir->ProtoCoef[0].a0 = 1.0;
- iir->ProtoCoef[0].a1 = 0;
- iir->ProtoCoef[0].a2 = 0;
- iir->ProtoCoef[0].b0 = 1.0;
- iir->ProtoCoef[0].b1 = 0.765367;
- iir->ProtoCoef[0].b2 = 1.0;
+ proto_coef[0].a0 = 1.0;
+ proto_coef[0].a1 = 0;
+ proto_coef[0].a2 = 0;
+ proto_coef[0].b0 = 1.0;
+ proto_coef[0].b1 = 0.765367;
+ proto_coef[0].b2 = 1.0;
/* Section 2 */
- iir->ProtoCoef[1].a0 = 1.0;
- iir->ProtoCoef[1].a1 = 0;
- iir->ProtoCoef[1].a2 = 0;
- iir->ProtoCoef[1].b0 = 1.0;
- iir->ProtoCoef[1].b1 = 1.847759;
- iir->ProtoCoef[1].b2 = 1.0;
-
- iir->coef = make_unique_clear<float[]>(4 * 2 + 1);
- iir->fs = fs;
- iir->history = make_unique_clear<float[]>(2 * 2);
+ proto_coef[1].a0 = 1.0;
+ proto_coef[1].a1 = 0;
+ proto_coef[1].a2 = 0;
+ proto_coef[1].b0 = 1.0;
+ proto_coef[1].b1 = 1.847759;
+ proto_coef[1].b2 = 1.0;
+
+ coef = make_unique_clear<float[]>(4 * 2 + 1);
+ fs = fsval;
+ history = make_unique_clear<float[]>(2 * 2);
}
static void prewarp(double *a0, double *a1, double *a2,double fc, double fs)
@@ -102,47 +102,42 @@ static void bilinear(double a0, double a1, double a2,
*coef = (4. * a2 * fs * fs - 2. * a1 * fs + a0) / ad;
}
-static void recompute_filter(lp_filter *iir, double k, double q, double fc)
+void micro3d_sound_device::lp_filter::recompute(double k, double q, double fc)
{
- int nInd;
- double a0, a1, a2, b0, b1, b2;
+ float *c = coef.get() + 1;
- float *coef = iir->coef.get() + 1;
-
- for (nInd = 0; nInd < 2; nInd++)
+ for (int nInd = 0; nInd < 2; nInd++)
{
- a0 = iir->ProtoCoef[nInd].a0;
- a1 = iir->ProtoCoef[nInd].a1;
- a2 = iir->ProtoCoef[nInd].a2;
+ double a0 = proto_coef[nInd].a0;
+ double a1 = proto_coef[nInd].a1;
+ double a2 = proto_coef[nInd].a2;
- b0 = iir->ProtoCoef[nInd].b0;
- b1 = iir->ProtoCoef[nInd].b1 / q;
- b2 = iir->ProtoCoef[nInd].b2;
+ double b0 = proto_coef[nInd].b0;
+ double b1 = proto_coef[nInd].b1 / q;
+ double b2 = proto_coef[nInd].b2;
- prewarp(&a0, &a1, &a2, fc, iir->fs);
- prewarp(&b0, &b1, &b2, fc, iir->fs);
- bilinear(a0, a1, a2, b0, b1, b2, &k, iir->fs, coef);
+ prewarp(&a0, &a1, &a2, fc, fs);
+ prewarp(&b0, &b1, &b2, fc, fs);
+ bilinear(a0, a1, a2, b0, b1, b2, &k, fs, c);
- coef += 4;
+ c += 4;
}
- iir->coef[0] = k;
+ coef[0] = k;
}
-void micro3d_sound_device::noise_sh_w(uint8_t data)
+void micro3d_sound_device::noise_sh_w(u8 data)
{
- micro3d_state *state = machine().driver_data<micro3d_state>();
-
if (~data & 8)
{
- if (state->m_dac_data != m_dac[data & 3])
+ if (m_dac_data != m_dac[data & 3])
{
double q;
double fc;
m_stream->update();
- m_dac[data & 3] = state->m_dac_data;
+ m_dac[data & 3] = m_dac_data;
if (m_dac[VCA] == 255)
m_gain = 0;
@@ -152,7 +147,7 @@ void micro3d_sound_device::noise_sh_w(uint8_t data)
q = 0.75/255 * (255 - m_dac[VCQ]) + 0.1;
fc = 4500.0/255 * (255 - m_dac[VCF]) + 100;
- recompute_filter(&m_filter, m_gain, q, fc);
+ m_filter.recompute(m_gain, q, fc);
}
}
}
@@ -165,10 +160,10 @@ void micro3d_sound_device::noise_sh_w(uint8_t data)
*************************************/
-const device_type MICRO3D = device_creator<micro3d_sound_device>;
+DEFINE_DEVICE_TYPE(MICRO3D, micro3d_sound_device, "micro3d_sound", "Microprose Audio Custom")
-micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MICRO3D, "Microprose Audio Custom", tag, owner, clock, "micro3d_sound", __FILE__),
+micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : device_t(mconfig, MICRO3D, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_gain(0),
m_noise_shift(0),
@@ -177,7 +172,7 @@ micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const
m_stream(nullptr)
{
- memset(m_dac, 0, sizeof(uint8_t)*4);
+ memset(m_dac, 0, sizeof(u8)*4);
}
//-------------------------------------------------
@@ -188,13 +183,13 @@ void micro3d_sound_device::device_start()
{
/* Allocate the stream */
m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
- filter_init(machine(), &m_filter, machine().sample_rate());
+ m_filter.init(machine().sample_rate());
- configure_filter(&m_noise_filters[0], 2.7e3 + 2.7e3, 1.0e-6);
- configure_filter(&m_noise_filters[1], 2.7e3 + 1e3, 0.30e-6);
- configure_filter(&m_noise_filters[2], 2.7e3 + 270, 0.15e-6);
- configure_filter(&m_noise_filters[3], 2.7e3 + 0, 0.082e-6);
-// configure_filter(&m_noise_filters[4], 33e3, 0.1e-6);
+ m_noise_filters[0].configure(2.7e3 + 2.7e3, 1.0e-6);
+ m_noise_filters[1].configure(2.7e3 + 1e3, 0.30e-6);
+ m_noise_filters[2].configure(2.7e3 + 270, 0.15e-6);
+ m_noise_filters[3].configure(2.7e3 + 0, 0.082e-6);
+// m_noise_filters[4].configure(33e3, 0.1e-6);
}
//-------------------------------------------------
@@ -296,69 +291,3 @@ void micro3d_sound_device::sound_stream_update(sound_stream &stream, stream_samp
*fr++ = output * pan_r;
}
}
-
-/***************************************************************************
-
- 8031 port mappings:
-
- Port 1 Port 2
- ======= ======
- 0: S/H sel A (O) 0:
- 1: S/H sel B (O) 1:
- 2: S/H sel C (O) 2: uPD bank select (O)
- 3: S/H en (O) 3: /uPD busy (I)
- 4: DS1267 data (O) 4: /uPD reset (O)
- 5: DS1267 clock (O) 5: Watchdog reset (O)
- 6: /DS1267 reset (O) 6:
- 7: Test SW (I) 7:
-
-***************************************************************************/
-
-
-WRITE8_MEMBER(micro3d_state::micro3d_snd_dac_a)
-{
- m_dac_data = data;
-}
-
-WRITE8_MEMBER(micro3d_state::micro3d_snd_dac_b)
-{
- /* TODO: This controls upd7759 volume */
-}
-
-WRITE8_MEMBER(micro3d_state::micro3d_sound_io_w)
-{
- m_sound_port_latch[offset] = data;
-
- switch (offset)
- {
- case 0x01:
- {
- micro3d_sound_device *noise = (data & 4) ? m_noise_2 : m_noise_1;
- noise->noise_sh_w(data);
- break;
- }
- case 0x03:
- {
- m_upd7759->set_bank_base((data & 0x4) ? 0x20000 : 0);
- m_upd7759->reset_w((data & 0x10) ? 0 : 1);
- break;
- }
- }
-}
-
-READ8_MEMBER(micro3d_state::micro3d_sound_io_r)
-{
- switch (offset)
- {
- case 0x01: return (m_sound_port_latch[offset] & 0x7f) | m_sound_sw->read();
- case 0x03: return (m_sound_port_latch[offset] & 0xf7) | (m_upd7759->busy_r() ? 0x08 : 0);
- default: return 0;
- }
-}
-
-WRITE8_MEMBER(micro3d_state::micro3d_upd7759_w)
-{
- m_upd7759->port_w(space, 0, data);
- m_upd7759->start_w(0);
- m_upd7759->start_w(1);
-}
diff --git a/src/mame/audio/micro3d.h b/src/mame/audio/micro3d.h
new file mode 100644
index 00000000000..827a8de4877
--- /dev/null
+++ b/src/mame/audio/micro3d.h
@@ -0,0 +1,78 @@
+// license:BSD-3-Clause
+// copyright-holders:Philip Bennett
+/*************************************************************************
+
+ Microprose Games 3D hardware
+
+*************************************************************************/
+#ifndef MAME_AUDIO_MICRO3D_H
+#define MAME_AUDIO_MICRO3D_H
+
+#pragma once
+
+class micro3d_sound_device : public device_t, public device_sound_interface
+{
+public:
+ micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+ void dac_w(u8 data) { m_dac_data = data; }
+ void noise_sh_w(u8 data);
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+private:
+ enum dac_registers {
+ VCF,
+ VCQ,
+ VCA,
+ PAN
+ };
+
+ struct biquad
+ {
+ double a0, a1, a2; /* Numerator coefficients */
+ double b0, b1, b2; /* Denominator coefficients */
+ };
+
+ struct lp_filter
+ {
+ void init(double fs);
+ void recompute(double k, double q, double fc);
+
+ std::unique_ptr<float[]> history;
+ std::unique_ptr<float[]> coef;
+ double fs;
+ biquad proto_coef[2];
+ };
+
+ struct m3d_filter_state
+ {
+ void configure(double r, double c);
+
+ double capval;
+ double exponent;
+ };
+
+ u8 m_dac_data;
+
+ u8 m_dac[4];
+
+ float m_gain;
+ u32 m_noise_shift;
+ u8 m_noise_value;
+ u8 m_noise_subcount;
+
+ m3d_filter_state m_noise_filters[4];
+ lp_filter m_filter;
+ sound_stream *m_stream;
+};
+
+DECLARE_DEVICE_TYPE(MICRO3D, micro3d_sound_device)
+
+#endif // MAME_AUDIO_MICRO3D_H
diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp
index 4b83e1562dc..8ec572c0a8d 100644
--- a/src/mame/audio/midway.cpp
+++ b/src/mame/audio/midway.cpp
@@ -31,10 +31,10 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type MIDWAY_SSIO = device_creator<midway_ssio_device>;
-const device_type MIDWAY_SOUNDS_GOOD = device_creator<midway_sounds_good_device>;
-const device_type MIDWAY_TURBO_CHEAP_SQUEAK = device_creator<midway_turbo_cheap_squeak_device>;
-const device_type MIDWAY_SQUAWK_N_TALK = device_creator<midway_squawk_n_talk_device>;
+DEFINE_DEVICE_TYPE(MIDWAY_SSIO, midway_ssio_device, "midssio", "Midway SSIO Sound Board")
+DEFINE_DEVICE_TYPE(MIDWAY_SOUNDS_GOOD, midway_sounds_good_device, "midsg", "Midway Sounds Good Sound Board")
+DEFINE_DEVICE_TYPE(MIDWAY_TURBO_CHEAP_SQUEAK, midway_turbo_cheap_squeak_device, "midtcs", "Midway Turbo Cheap Squeak Sound Board")
+DEFINE_DEVICE_TYPE(MIDWAY_SQUAWK_N_TALK, midway_squawk_n_talk_device, "midsnt", "Midway Squawk 'n' Talk Sound Board")
@@ -47,7 +47,7 @@ const device_type MIDWAY_SQUAWK_N_TALK = device_creator<midway_squawk_n_talk_dev
//-------------------------------------------------
midway_ssio_device::midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MIDWAY_SSIO, "Midway SSIO Sound Board", tag, owner, clock, "midssio", __FILE__),
+ : device_t(mconfig, MIDWAY_SSIO, tag, owner, clock),
device_mixer_interface(mconfig, *this, 2),
m_cpu(*this, "cpu"),
m_ay0(*this, "ay0"),
@@ -490,7 +490,7 @@ void midway_ssio_device::device_timer(emu_timer &timer, device_timer_id id, int
//-------------------------------------------------
midway_sounds_good_device::midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MIDWAY_SOUNDS_GOOD, "Midway Sounds Good Sound Board", tag, owner, clock, "midsg", __FILE__),
+ : device_t(mconfig, MIDWAY_SOUNDS_GOOD, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -661,7 +661,7 @@ void midway_sounds_good_device::device_timer(emu_timer &timer, device_timer_id i
//-------------------------------------------------
midway_turbo_cheap_squeak_device::midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MIDWAY_TURBO_CHEAP_SQUEAK, "Midway Turbo Cheap Squeak Sound Board", tag, owner, clock, "midtcs", __FILE__),
+ : device_t(mconfig, MIDWAY_TURBO_CHEAP_SQUEAK, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -825,7 +825,7 @@ void midway_turbo_cheap_squeak_device::device_timer(emu_timer &timer, device_tim
//-------------------------------------------------
midway_squawk_n_talk_device::midway_squawk_n_talk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MIDWAY_SQUAWK_N_TALK, "Midway Squawk 'n' Talk Sound Board", tag, owner, clock, "midsnt", __FILE__),
+ : device_t(mconfig, MIDWAY_SQUAWK_N_TALK, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia0(*this, "pia0"),
diff --git a/src/mame/audio/midway.h b/src/mame/audio/midway.h
index 0d8f7e073b3..891bb75e2eb 100644
--- a/src/mame/audio/midway.h
+++ b/src/mame/audio/midway.h
@@ -7,11 +7,11 @@
Functions to emulate general the various Midway sound cards.
***************************************************************************/
+#ifndef MAME_AUDIO_MIDWAY_H
+#define MAME_AUDIO_MIDWAY_H
#pragma once
-#ifndef __MIDWAY_AUDIO__
-#define __MIDWAY_AUDIO__
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
@@ -27,10 +27,10 @@
// GLOBAL VARIABLES
//**************************************************************************
-extern const device_type MIDWAY_SSIO;
-extern const device_type MIDWAY_SOUNDS_GOOD;
-extern const device_type MIDWAY_TURBO_CHEAP_SQUEAK;
-extern const device_type MIDWAY_SQUAWK_N_TALK;
+DECLARE_DEVICE_TYPE(MIDWAY_SSIO, midway_ssio_device)
+DECLARE_DEVICE_TYPE(MIDWAY_SOUNDS_GOOD, midway_sounds_good_device)
+DECLARE_DEVICE_TYPE(MIDWAY_TURBO_CHEAP_SQUEAK, midway_turbo_cheap_squeak_device)
+DECLARE_DEVICE_TYPE(MIDWAY_SQUAWK_N_TALK, midway_squawk_n_talk_device)
@@ -232,4 +232,4 @@ private:
AM_RANGE(0x1c, 0x1f) AM_DEVWRITE(ssio, midway_ssio_device, write)
-#endif /* __MIDWAY_AUDIO__ */
+#endif // MAME_AUDIO_MIDWAY_H
diff --git a/src/mame/audio/namco52.cpp b/src/mame/audio/namco52.cpp
index b1183a556fd..478e83bbb67 100644
--- a/src/mame/audio/namco52.cpp
+++ b/src/mame/audio/namco52.cpp
@@ -157,10 +157,10 @@ ROM_START( namco_52xx )
ROM_END
-const device_type NAMCO_52XX = device_creator<namco_52xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_52XX, namco_52xx_device, "namco52", "Namco 52xx")
namco_52xx_device::namco_52xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_52XX, "Namco 52xx", tag, owner, clock, "namco52", __FILE__),
+ : device_t(mconfig, NAMCO_52XX, tag, owner, clock),
m_cpu(*this, "mcu"),
m_discrete(*this, finder_base::DUMMY_TAG),
m_basenode(0),
diff --git a/src/mame/audio/namco52.h b/src/mame/audio/namco52.h
index b88565dd647..6fb1c0b59a6 100644
--- a/src/mame/audio/namco52.h
+++ b/src/mame/audio/namco52.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#ifndef NAMCO52_H
-#define NAMCO52_H
+#ifndef MAME_AUDIO_NAMCO52_H
+#define MAME_AUDIO_NAMCO52_H
#include "sound/discrete.h"
#include "cpu/mb88xx/mb88xx.h"
@@ -33,8 +33,8 @@ public:
static void set_discrete(device_t &device, const char *tag) { downcast<namco_52xx_device &>(device).m_discrete.set_tag(tag); }
static void set_basenote(device_t &device, int node) { downcast<namco_52xx_device &>(device).m_basenode = node; }
static void set_extclock(device_t &device, attoseconds_t clk) { downcast<namco_52xx_device &>(device).m_extclock = clk; }
- template<class _Object> static devcb_base &set_romread_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_romread.set_callback(object); }
- template<class _Object> static devcb_base &set_si_callback(device_t &device, _Object object) { return downcast<namco_52xx_device &>(device).m_si.set_callback(object); }
+ template <class Object> static devcb_base &set_romread_callback(device_t &device, Object &&cb) { return downcast<namco_52xx_device &>(device).m_romread.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_si_callback(device_t &device, Object &&cb) { return downcast<namco_52xx_device &>(device).m_si.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE8_MEMBER(write);
@@ -71,7 +71,7 @@ private:
uint32_t m_address;
};
-extern const device_type NAMCO_52XX;
+DECLARE_DEVICE_TYPE(NAMCO_52XX, namco_52xx_device)
@@ -79,4 +79,4 @@ extern const device_type NAMCO_52XX;
#define NAMCO_52XX_P_DATA(base) (base)
-#endif /* NAMCO52_H */
+#endif // MAME_AUDIO_NAMCO52_H
diff --git a/src/mame/audio/namco54.cpp b/src/mame/audio/namco54.cpp
index db18a3e2df5..4c15b088928 100644
--- a/src/mame/audio/namco54.cpp
+++ b/src/mame/audio/namco54.cpp
@@ -128,10 +128,10 @@ ROM_START( namco_54xx )
ROM_LOAD( "54xx.bin", 0x0000, 0x0400, CRC(ee7357e0) SHA1(01bdf984a49e8d0cc8761b2cc162fd6434d5afbe) )
ROM_END
-const device_type NAMCO_54XX = device_creator<namco_54xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_54XX, namco_54xx_device, "namco54", "Namco 54xx")
namco_54xx_device::namco_54xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_54XX, "Namco 54xx", tag, owner, clock, "namco54", __FILE__),
+ : device_t(mconfig, NAMCO_54XX, tag, owner, clock),
m_cpu(*this, "mcu"),
m_discrete(*this, finder_base::DUMMY_TAG),
m_basenode(0),
diff --git a/src/mame/audio/namco54.h b/src/mame/audio/namco54.h
index bdfe8b7e519..383e5983920 100644
--- a/src/mame/audio/namco54.h
+++ b/src/mame/audio/namco54.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#ifndef NAMCO54_H
-#define NAMCO54_H
+#ifndef MAME_AUDIO_NAMCO54_H
+#define MAME_AUDIO_NAMCO54_H
#include "sound/discrete.h"
#include "cpu/mb88xx/mb88xx.h"
@@ -48,7 +48,7 @@ private:
uint8_t m_latched_cmd;
};
-extern const device_type NAMCO_54XX;
+DECLARE_DEVICE_TYPE(NAMCO_54XX, namco_54xx_device)
@@ -59,4 +59,4 @@ extern const device_type NAMCO_54XX;
#define NAMCO_54XX_P_DATA(base) (NODE_RELATIVE(base, 3))
-#endif /* NAMCO54_H */
+#endif // MAME_AUDIO_NAMCO54_H
diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp
index ede90fb999f..92e0eb7dcb4 100644
--- a/src/mame/audio/phoenix.cpp
+++ b/src/mame/audio/phoenix.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
-#include "includes/phoenix.h"
+#include "audio/phoenix.h"
/****************************************************************************
* 4006
@@ -48,11 +48,11 @@
-const device_type PHOENIX = device_creator<phoenix_sound_device>;
+DEFINE_DEVICE_TYPE(PHOENIX, phoenix_sound_device, "phoenix_sound", "Phoenix Audio Custom")
phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PHOENIX, "Phoenix Audio Custom", tag, owner, clock, "phoenix_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, PHOENIX, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/audio/phoenix.h b/src/mame/audio/phoenix.h
new file mode 100644
index 00000000000..38e80c3d31f
--- /dev/null
+++ b/src/mame/audio/phoenix.h
@@ -0,0 +1,62 @@
+// license:BSD-3-Clause
+// copyright-holders:Richard Davies
+#ifndef MAME_AUDIO_PHOENIX_H
+#define MAME_AUDIO_PHOENIX_H
+
+#pragma once
+
+#include "sound/discrete.h"
+#include "sound/tms36xx.h"
+
+
+class phoenix_sound_device : public device_t, public device_sound_interface
+{
+public:
+ phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_WRITE8_MEMBER( control_a_w );
+ DECLARE_WRITE8_MEMBER( control_b_w );
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+private:
+ struct c_state
+ {
+ int32_t counter;
+ int32_t level;
+ };
+
+ struct n_state
+ {
+ int32_t counter;
+ int32_t polyoffs;
+ int32_t polybit;
+ int32_t lowpass_counter;
+ int32_t lowpass_polybit;
+ };
+
+ // internal state
+ struct c_state m_c24_state;
+ struct c_state m_c25_state;
+ struct n_state m_noise_state;
+ uint8_t m_sound_latch_a;
+ sound_stream * m_channel;
+ std::unique_ptr<uint32_t[]> m_poly18;
+ discrete_device *m_discrete;
+ tms36xx_device *m_tms;
+
+ int update_c24(int samplerate);
+ int update_c25(int samplerate);
+ int noise(int samplerate);
+};
+
+DECLARE_DEVICE_TYPE(PHOENIX, phoenix_sound_device)
+
+DISCRETE_SOUND_EXTERN(phoenix);
+
+#endif // MAME_AUDIO_PHOENIX_H
diff --git a/src/mame/audio/pleiads.cpp b/src/mame/audio/pleiads.cpp
index 0472617fa3e..68d79f79e25 100644
--- a/src/mame/audio/pleiads.cpp
+++ b/src/mame/audio/pleiads.cpp
@@ -18,16 +18,15 @@
#define TONE1_CLOCK 8000
-const device_type PLEIADS = device_creator<pleiads_sound_device>;
+DEFINE_DEVICE_TYPE(PLEIADS, pleiads_sound_device, "pleiads_sound", "Pleiads Audio Custom")
pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PLEIADS, "Pleiads Audio Custom", tag, owner, clock, "pleiads_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : pleiads_sound_device(mconfig, PLEIADS, tag, owner, clock)
{
}
-pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
m_sound_latch_a(0),
@@ -48,9 +47,9 @@ pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, device
void pleiads_sound_device::device_start()
{
- /* The real values are _unknown_!
- * I took the ones from Naughty Boy / Pop Flamer
- */
+ /* The real values are _unknown_!
+ * I took the ones from Naughty Boy / Pop Flamer
+ */
/* charge 10u?? (C??) through 330K?? (R??) -> 3.3s */
m_pa5.charge_time = 3.3;
@@ -107,10 +106,10 @@ void pleiads_sound_device::device_start()
common_start();
}
-const device_type NAUGHTYB = device_creator<naughtyb_sound_device>;
+DEFINE_DEVICE_TYPE(NAUGHTYB, naughtyb_sound_device, "naughtyb_sound", "Naughty Boy Audio Custom")
naughtyb_sound_device::naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pleiads_sound_device(mconfig, NAUGHTYB, "Naughty Boy Audio Custom", tag, owner, clock, "naughtyb_sound", __FILE__)
+ : pleiads_sound_device(mconfig, NAUGHTYB, tag, owner, clock)
{
}
@@ -175,10 +174,10 @@ void naughtyb_sound_device::device_start()
common_start();
}
-const device_type POPFLAME = device_creator<popflame_sound_device>;
+DEFINE_DEVICE_TYPE(POPFLAME, popflame_sound_device, "popflame_sound", "Pop Flamer Audio Custom")
popflame_sound_device::popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pleiads_sound_device(mconfig, POPFLAME, "Pop Flamer Audio Custom", tag, owner, clock, "popflame_sound", __FILE__)
+ : pleiads_sound_device(mconfig, POPFLAME, tag, owner, clock)
{
}
diff --git a/src/mame/audio/pleiads.h b/src/mame/audio/pleiads.h
index 01cc05e1505..f7139b42928 100644
--- a/src/mame/audio/pleiads.h
+++ b/src/mame/audio/pleiads.h
@@ -1,58 +1,52 @@
// license:GPL-2.0+
// copyright-holders:Juergen Buchmueller
-#include "sound/tms36xx.h"
+#ifndef MAME_AUDIO_PLEIADS_H
+#define MAME_AUDIO_PLEIADS_H
-struct pl_t_state
-{
- pl_t_state():
- counter(0),
- output(0),
- max_freq(0) {}
-
- int counter;
- int output;
- int max_freq;
-};
-
-struct pl_c_state
-{
- pl_c_state():
- counter(0),
- level(0),
- charge_time(0),
- discharge_time(0) {}
-
- int counter;
- int level;
- double charge_time;
- double discharge_time;
-};
+#pragma once
-struct pl_n_state
-{
- pl_n_state():
- counter(0),
- polyoffs(0),
- freq(0) {}
-
- int counter;
- int polyoffs;
- int freq;
-};
+#include "sound/tms36xx.h"
-class pleiads_sound_device : public device_t,
- public device_sound_interface
+class pleiads_sound_device : public device_t, public device_sound_interface
{
public:
pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- pleiads_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- ~pleiads_sound_device() {}
DECLARE_WRITE8_MEMBER( control_a_w );
DECLARE_WRITE8_MEMBER( control_b_w );
DECLARE_WRITE8_MEMBER( control_c_w );
protected:
+ struct pl_t_state
+ {
+ pl_t_state() { }
+
+ int counter = 0;
+ int output = 0;
+ int max_freq = 0;
+ };
+
+ struct pl_c_state
+ {
+ pl_c_state() { }
+
+ int counter = 0;
+ int level = 0;
+ double charge_time = 0;
+ double discharge_time = 0;
+ };
+
+ struct pl_n_state
+ {
+ pl_n_state() { }
+
+ int counter = 0;
+ int polyoffs = 0;
+ int freq = 0;
+ };
+
+ pleiads_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
@@ -100,23 +94,22 @@ protected:
int m_opamp_resistor;
};
-extern const device_type PLEIADS;
+DECLARE_DEVICE_TYPE(PLEIADS, pleiads_sound_device)
class naughtyb_sound_device : public pleiads_sound_device
{
public:
naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
protected:
// device-level overrides
virtual void device_start() override;
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-private:
- // internal state
};
-extern const device_type NAUGHTYB;
+DECLARE_DEVICE_TYPE(NAUGHTYB, naughtyb_sound_device)
class popflame_sound_device : public pleiads_sound_device
{
@@ -128,8 +121,8 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-private:
- // internal state
};
-extern const device_type POPFLAME;
+DECLARE_DEVICE_TYPE(POPFLAME, popflame_sound_device)
+
+#endif // MAME_AUDIO_PLEIADS_H
diff --git a/src/mame/audio/polepos.cpp b/src/mame/audio/polepos.cpp
index 2a06964c400..9f23e69ccaa 100644
--- a/src/mame/audio/polepos.cpp
+++ b/src/mame/audio/polepos.cpp
@@ -5,10 +5,13 @@
Sound handler
****************************************************************************/
#include "emu.h"
-#include "machine/rescap.h"
+#include "includes/polepos.h"
+
#include "namco52.h"
#include "namco54.h"
-#include "includes/polepos.h"
+
+#include "machine/rescap.h"
+
#define OUTPUT_RATE 24000
@@ -213,7 +216,7 @@ static void filter_opamp_m_bandpass_setup(device_t *device, double r1, double r2
// device type definition
-const device_type POLEPOS = device_creator<polepos_sound_device>;
+DEFINE_DEVICE_TYPE(POLEPOS, polepos_sound_device, "polepos_sound", "Pole Position Audio Custom")
//**************************************************************************
@@ -225,7 +228,7 @@ const device_type POLEPOS = device_creator<polepos_sound_device>;
//-------------------------------------------------
polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, POLEPOS, "Pole Position Audio Custom", tag, owner, clock, "polepos_sound", __FILE__),
+ : device_t(mconfig, POLEPOS, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_current_position(0),
m_sample_msb(0),
diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp
index 6cc930e221c..97cb5639558 100644
--- a/src/mame/audio/rax.cpp
+++ b/src/mame/audio/rax.cpp
@@ -494,19 +494,19 @@ MACHINE_CONFIG_FRAGMENT( rax )
MACHINE_CONFIG_END
-const device_type ACCLAIM_RAX = device_creator<acclaim_rax_device>;
+DEFINE_DEVICE_TYPE(ACCLAIM_RAX, acclaim_rax_device, "rax_audio", "Acclaim RAX")
//-------------------------------------------------
// acclaim_rax_device - constructor
//-------------------------------------------------
acclaim_rax_device::acclaim_rax_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ACCLAIM_RAX, "Acclaim RAX", tag, owner, clock, "rax_audio", __FILE__),
- m_cpu(*this, "adsp"),
- m_adsp_pram(*this, "adsp_pram"),
- m_adsp_data_bank(*this, "databank"),
- m_data_in(*this, "data_in"),
- m_data_out(*this, "data_out")
+ : device_t(mconfig, ACCLAIM_RAX, tag, owner, clock)
+ , m_cpu(*this, "adsp")
+ , m_adsp_pram(*this, "adsp_pram")
+ , m_adsp_data_bank(*this, "databank")
+ , m_data_in(*this, "data_in")
+ , m_data_out(*this, "data_out")
{
}
diff --git a/src/mame/audio/rax.h b/src/mame/audio/rax.h
index 45058a82eab..16af77fd944 100644
--- a/src/mame/audio/rax.h
+++ b/src/mame/audio/rax.h
@@ -5,9 +5,10 @@
Acclaim RAX Sound Board
****************************************************************************/
+#ifndef MAME_AUDIO_RAX_H
+#define MAME_AUDIO_RAX_H
-#ifndef __ACCLAIM_H__
-#define __ACCLAIM_H__
+#pragma once
#include "cpu/adsp2100/adsp2100.h"
#include "machine/gen_latch.h"
@@ -40,7 +41,15 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(adsp_irq0);
TIMER_DEVICE_CALLBACK_MEMBER(sport0_irq);
WRITE32_MEMBER(dmovlay_callback);
+ TIMER_DEVICE_CALLBACK_MEMBER( dma_timer_callback );
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual machine_config_constructor device_mconfig_additions() const override;
+private:
required_device<adsp2181_device> m_cpu;
required_shared_ptr<uint32_t> m_adsp_pram;
required_memory_bank m_adsp_data_bank;
@@ -79,16 +88,9 @@ public:
required_device<generic_latch_16_device> m_data_out;
timer_device *m_dma_timer;
- TIMER_DEVICE_CALLBACK_MEMBER( dma_timer_callback );
-
-protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual machine_config_constructor device_mconfig_additions() const override;
};
// device type definition
-extern const device_type ACCLAIM_RAX;
+DECLARE_DEVICE_TYPE(ACCLAIM_RAX, acclaim_rax_device)
-#endif
+#endif // MAME_AUDIO_RAX_H
diff --git a/src/mame/audio/redbaron.cpp b/src/mame/audio/redbaron.cpp
index f13a5a201e1..15f1cc8f537 100644
--- a/src/mame/audio/redbaron.cpp
+++ b/src/mame/audio/redbaron.cpp
@@ -17,14 +17,17 @@
*/
#include "emu.h"
-#include "includes/bzone.h"
+#include "audio/redbaron.h"
#include "sound/pokey.h"
+#include <algorithm>
+
+
#define OUTPUT_RATE (48000)
// device type definition
-const device_type REDBARON = device_creator<redbaron_sound_device>;
+DEFINE_DEVICE_TYPE(REDBARON, redbaron_sound_device, "redbaron_custom", "Red Baron Audio Custom")
//**************************************************************************
@@ -36,7 +39,7 @@ const device_type REDBARON = device_creator<redbaron_sound_device>;
//-------------------------------------------------
redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, REDBARON, "Red Baron Audio Custom", tag, owner, clock, "redbaron_custom", __FILE__),
+ : device_t(mconfig, REDBARON, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_vol_lookup(nullptr),
m_channel(nullptr),
@@ -53,7 +56,7 @@ redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, cons
m_squeal_on_counter(0),
m_squeal_out(0)
{
- memset(m_vol_crash, 0, sizeof(int16_t)*16);
+ std::fill(std::begin(m_vol_crash), std::end(m_vol_crash), 0);
}
diff --git a/src/mame/audio/redbaron.h b/src/mame/audio/redbaron.h
index 03ac07b535b..2294d905fda 100644
--- a/src/mame/audio/redbaron.h
+++ b/src/mame/audio/redbaron.h
@@ -1,13 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Brad Oliver, Nicola Salmoria
+#ifndef MAME_AUDIO_REDBARON_H
+#define MAME_AUDIO_REDBARON_H
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
// ======================> redbaron_sound_device
-class redbaron_sound_device : public device_t,
- public device_sound_interface
+class redbaron_sound_device : public device_t, public device_sound_interface
{
public:
redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -44,4 +46,6 @@ private:
int m_squeal_out;
};
-extern const device_type REDBARON;
+DECLARE_DEVICE_TYPE(REDBARON, redbaron_sound_device)
+
+#endif // MAME_AUDIO_REDBARON_H
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index 961c4014204..942d0378c16 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -13,16 +13,16 @@
#include "sound/volt_reg.h"
-const device_type S11C_BG = device_creator<s11c_bg_device>;
+DEFINE_DEVICE_TYPE(S11C_BG, s11c_bg_device, "s11c_bg", "Williams System 11C Background Music")
s11c_bg_device::s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig,S11C_BG,"Williams System 11C Background Music",tag,owner,clock, "s11c_bg", __FILE__),
- device_mixer_interface(mconfig, *this),
- m_cpu(*this,"bgcpu"),
- m_ym2151(*this,"ym2151"),
- m_hc55516(*this,"hc55516_bg"),
- m_pia40(*this,"pia40"),
- m_cpubank(*this,"bgbank")
+ : device_t(mconfig, S11C_BG,tag,owner,clock)
+ , device_mixer_interface(mconfig, *this)
+ , m_cpu(*this, "bgcpu")
+ , m_ym2151(*this, "ym2151")
+ , m_hc55516(*this, "hc55516_bg")
+ , m_pia40(*this, "pia40")
+ , m_cpubank(*this, "bgbank")
{
}
diff --git a/src/mame/audio/s11c_bg.h b/src/mame/audio/s11c_bg.h
index 3dc1a79a8e0..723837c2fe7 100644
--- a/src/mame/audio/s11c_bg.h
+++ b/src/mame/audio/s11c_bg.h
@@ -6,13 +6,15 @@
* Created on: 2/10/2013
*/
-#ifndef S11C_BG_H_
-#define S11C_BG_H_
+#ifndef MAME_AUDIO_S11C_BG_H
+#define MAME_AUDIO_S11C_BG_H
+
+#pragma once
#include "cpu/m6809/m6809.h"
-#include "sound/ym2151.h"
-#include "sound/hc55516.h"
#include "machine/6821pia.h"
+#include "sound/hc55516.h"
+#include "sound/ym2151.h"
#define MCFG_S11C_BG_ROM_REGION(_region) \
@@ -55,6 +57,6 @@ private:
const char* m_regiontag;
};
-extern const device_type S11C_BG;
+DECLARE_DEVICE_TYPE(S11C_BG, s11c_bg_device)
-#endif /* S11C_BG_H_ */
+#endif // MAME_AUDIO_S11C_BG_H
diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp
index 24ad43ec1f8..03682cfac40 100644
--- a/src/mame/audio/scramble.cpp
+++ b/src/mame/audio/scramble.cpp
@@ -128,16 +128,13 @@ READ8_MEMBER( scramble_state::hotshock_soundlatch_r )
static void filter_w(device_t *device, int data)
{
- int C;
-
-
- C = 0;
+ int C = 0;
if (data & 1)
C += 220000; /* 220000pF = 0.220uF */
if (data & 2)
C += 47000; /* 47000pF = 0.047uF */
- if (device != nullptr)
- dynamic_cast<filter_rc_device*>(device)->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 5100, 0, CAP_P(C));
+ if (device)
+ downcast<filter_rc_device*>(device)->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 5100, 0, CAP_P(C));
}
WRITE8_MEMBER(scramble_state::scramble_filter_w)
diff --git a/src/mame/audio/segag80r.cpp b/src/mame/audio/segag80r.cpp
index 7f4838be1b0..8b731584086 100644
--- a/src/mame/audio/segag80r.cpp
+++ b/src/mame/audio/segag80r.cpp
@@ -10,8 +10,9 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/mcs48/mcs48.h"
#include "includes/segag80r.h"
+
+#include "cpu/mcs48/mcs48.h"
#include "machine/i8255.h"
#include "machine/i8243.h"
#include "sound/samples.h"
@@ -29,13 +30,13 @@
#define SEGA005_555_TIMER_FREQ (1.44 / ((15000 + 2 * 4700) * 1.5e-6))
#define SEGA005_COUNTER_FREQ (100000) /* unknown, just a guess */
-const device_type SEGA005 = device_creator<sega005_sound_device>;
+DEFINE_DEVICE_TYPE(SEGA005, sega005_sound_device, "sega005_sound", "Sega 005 Audio Custom")
sega005_sound_device::sega005_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA005, "Sega 005 Audio Custom", tag, owner, clock, "sega005_sound", __FILE__),
- device_sound_interface(mconfig, *this),
- m_sega005_sound_timer(nullptr),
- m_sega005_stream(nullptr)
+ : device_t(mconfig, SEGA005, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_sega005_sound_timer(nullptr)
+ , m_sega005_stream(nullptr)
{
}
diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp
index 504287cb095..2f38bf43bde 100644
--- a/src/mame/audio/segam1audio.cpp
+++ b/src/mame/audio/segam1audio.cpp
@@ -9,8 +9,9 @@
***************************************************************************/
#include "emu.h"
-#include "machine/clock.h"
#include "audio/segam1audio.h"
+
+#include "machine/clock.h"
#include "speaker.h"
#define M68000_TAG "sndcpu"
@@ -20,8 +21,8 @@
#define UART_TAG "uart"
static ADDRESS_MAP_START( segam1audio_map, AS_PROGRAM, 16, segam1audio_device )
- AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_REGION(":m1sndcpu", 0)
- AM_RANGE(0x080000, 0x09ffff) AM_ROM AM_REGION(":m1sndcpu", 0x20000) // mirror of upper ROM socket
+ AM_RANGE(0x000000, 0x03ffff) AM_ROM AM_REGION(":m1sndcpu", 0)
+ AM_RANGE(0x080000, 0x09ffff) AM_ROM AM_REGION(":m1sndcpu", 0x20000) // mirror of upper ROM socket
AM_RANGE(0xc20000, 0xc20001) AM_DEVREADWRITE8(UART_TAG, i8251_device, data_r, data_w, 0x00ff)
AM_RANGE(0xc20002, 0xc20003) AM_DEVREADWRITE8(UART_TAG, i8251_device, status_r, control_w, 0x00ff)
AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8(MULTIPCM_1_TAG, multipcm_device, read, write, 0x00ff)
@@ -74,7 +75,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type SEGAM1AUDIO = device_creator<segam1audio_device>;
+DEFINE_DEVICE_TYPE(SEGAM1AUDIO, segam1audio_device, "segam1audio", "Sega Model 1 Sound Board")
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -95,7 +96,7 @@ machine_config_constructor segam1audio_device::device_mconfig_additions() const
//-------------------------------------------------
segam1audio_device::segam1audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, SEGAM1AUDIO, "Sega Model 1 Sound Board", tag, owner, clock, "segam1audio", __FILE__),
+ device_t(mconfig, SEGAM1AUDIO, tag, owner, clock),
m_audiocpu(*this, M68000_TAG),
m_multipcm_1(*this, MULTIPCM_1_TAG),
m_multipcm_2(*this, MULTIPCM_2_TAG),
diff --git a/src/mame/audio/segam1audio.h b/src/mame/audio/segam1audio.h
index fcbacf98dc1..d6f2ea3620a 100644
--- a/src/mame/audio/segam1audio.h
+++ b/src/mame/audio/segam1audio.h
@@ -1,15 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#pragma once
-
-#ifndef __SEGAM1AUDIO_H__
-#define __SEGAM1AUDIO_H__
+#ifndef MAME_AUDIO_SEGAM1AUDIO_H
+#define MAME_AUDIO_SEGAM1AUDIO_H
#include "cpu/m68000/m68000.h"
#include "machine/i8251.h"
#include "sound/2612intf.h"
#include "sound/multipcm.h"
+#pragma once
+
#define M1AUDIO_CPU_REGION "m1sndcpu"
#define M1AUDIO_MPCM1_REGION "m1pcm1"
#define M1AUDIO_MPCM2_REGION "m1pcm2"
@@ -35,7 +35,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const override;
// static configuration
- template<class _Object> static devcb_base &set_rxd_handler(device_t &device, _Object &&object) { return downcast<segam1audio_device &>(device).m_rxd_handler.set_callback(std::forward<_Object>(object)); }
+ template <class Object> static devcb_base &set_rxd_handler(device_t &device, Object &&cb) { return downcast<segam1audio_device &>(device).m_rxd_handler.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE16_MEMBER(m1_snd_mpcm_bnk1_w);
DECLARE_WRITE16_MEMBER(m1_snd_mpcm_bnk2_w);
@@ -60,6 +60,6 @@ private:
// device type definition
-extern const device_type SEGAM1AUDIO;
+DECLARE_DEVICE_TYPE(SEGAM1AUDIO, segam1audio_device)
-#endif /* __SEGAM1AUDIO_H__ */
+#endif // MAME_AUDIO_SEGAM1AUDIO_H
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp
index 5f81c3d2281..ba9d4d86728 100644
--- a/src/mame/audio/segasnd.cpp
+++ b/src/mame/audio/segasnd.cpp
@@ -9,12 +9,15 @@
***************************************************************************/
#include "emu.h"
-#include "sound/sp0250.h"
#include "segasnd.h"
+#include "sound/sp0250.h"
+
+#include <cmath>
+
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
/***************************************************************************
@@ -37,24 +40,23 @@
INLINE FUNCTIONS
***************************************************************************/
-static inline void configure_filter(g80_filter_state *state, double r, double c)
+inline void usb_sound_device::g80_filter_state::configure(double r, double c)
{
- state->capval = 0;
- state->exponent = 1.0 - exp(-1.0 / (r * c * SAMPLE_RATE));
+ capval = 0.0;
+ exponent = 1.0 - std::exp(-1.0 / (r * c * SAMPLE_RATE));
}
-static inline double step_rc_filter(g80_filter_state *state, double input)
+inline double usb_sound_device::g80_filter_state::step_rc(double input)
{
- state->capval += (input - state->capval) * state->exponent;
- return state->capval;
+ return capval += (input - capval) * exponent;
}
-static inline double step_cr_filter(g80_filter_state *state, double input)
+inline double usb_sound_device::g80_filter_state::step_cr(double input)
{
- double result = (input - state->capval);
- state->capval += (input - state->capval) * state->exponent;
+ double const result = input - capval;
+ capval += result * exponent;
return result;
}
@@ -64,10 +66,10 @@ static inline double step_cr_filter(g80_filter_state *state, double input)
SPEECH BOARD
***************************************************************************/
-const device_type SEGASPEECH = device_creator<speech_sound_device>;
+DEFINE_DEVICE_TYPE(SEGASPEECH, speech_sound_device, "sega_speech_sound", "Sega Speech Sound Board")
-speech_sound_device::speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGASPEECH, "Sega Speech Sound Board", tag, owner, clock, "sega_speech_sound", __FILE__),
+speech_sound_device::speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : device_t(mconfig, SEGASPEECH, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_drq(0),
m_latch(0),
@@ -155,7 +157,7 @@ WRITE_LINE_MEMBER(speech_sound_device::drq_w)
TIMER_CALLBACK_MEMBER( speech_sound_device::delayed_speech_w )
{
int data = param;
- uint8_t old = m_latch;
+ u8 old = m_latch;
/* all 8 bits are latched */
m_latch = data;
@@ -177,7 +179,7 @@ WRITE8_MEMBER( speech_sound_device::data_w )
WRITE8_MEMBER( speech_sound_device::control_w )
{
- LOG(("Speech control = %X\n", data));
+ LOG("Speech control = %X\n", data);
}
@@ -238,10 +240,10 @@ MACHINE_CONFIG_END
UNIVERSAL SOUND BOARD
***************************************************************************/
-const device_type SEGAUSB = device_creator<usb_sound_device>;
+DEFINE_DEVICE_TYPE(SEGAUSB, usb_sound_device, "segausb", "Sega Universal Sound Board")
-usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_ourcpu(*this, "ourcpu"),
m_stream(nullptr),
@@ -259,12 +261,8 @@ usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type ty
{
}
-usb_sound_device::usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGAUSB, "Sega Universal Sound Board", tag, owner, clock, "segausb", __FILE__),
- device_sound_interface(mconfig, *this),
- m_ourcpu(*this, "ourcpu"),
- m_program_ram(*this, "pgmram"),
- m_work_ram(*this, "workram")
+usb_sound_device::usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : usb_sound_device(mconfig, SEGAUSB, tag, owner, clock)
{
}
@@ -287,31 +285,30 @@ void usb_sound_device::device_start()
/* initialize state */
m_noise_shift = 0x15555;
- for (tgroup = 0; tgroup < 3; tgroup++)
+ for (timer8253 &g : m_timer_group)
{
- timer8253 *g = &m_timer_group[tgroup];
- configure_filter(&g->chan_filter[0], 10e3, 1e-6);
- configure_filter(&g->chan_filter[1], 10e3, 1e-6);
- configure_filter(&g->gate1, 100e3, 0.01e-6);
- configure_filter(&g->gate2, 2 * 100e3, 0.01e-6);
+ g.chan_filter[0].configure(10e3, 1e-6);
+ g.chan_filter[1].configure(10e3, 1e-6);
+ g.gate1.configure(100e3, 0.01e-6);
+ g.gate2.configure(2 * 100e3, 0.01e-6);
}
- configure_filter(&temp, 100e3, 0.01e-6);
+ temp.configure(100e3, 0.01e-6);
m_gate_rc1_exp[0] = temp.exponent;
- configure_filter(&temp, 1e3, 0.01e-6);
+ temp.configure(1e3, 0.01e-6);
m_gate_rc1_exp[1] = temp.exponent;
- configure_filter(&temp, 2 * 100e3, 0.01e-6);
+ temp.configure(2 * 100e3, 0.01e-6);
m_gate_rc2_exp[0] = temp.exponent;
- configure_filter(&temp, 2 * 1e3, 0.01e-6);
+ temp.configure(2 * 1e3, 0.01e-6);
m_gate_rc2_exp[1] = temp.exponent;
- configure_filter(&m_noise_filters[0], 2.7e3 + 2.7e3, 1.0e-6);
- configure_filter(&m_noise_filters[1], 2.7e3 + 1e3, 0.30e-6);
- configure_filter(&m_noise_filters[2], 2.7e3 + 270, 0.15e-6);
- configure_filter(&m_noise_filters[3], 2.7e3 + 0, 0.082e-6);
- configure_filter(&m_noise_filters[4], 33e3, 0.1e-6);
+ m_noise_filters[0].configure(2.7e3 + 2.7e3, 1.0e-6);
+ m_noise_filters[1].configure(2.7e3 + 1e3, 0.30e-6);
+ m_noise_filters[2].configure(2.7e3 + 270, 0.15e-6);
+ m_noise_filters[3].configure(2.7e3 + 0, 0.082e-6);
+ m_noise_filters[4].configure(33e3, 0.1e-6);
- configure_filter(&m_final_filter, 100e3, 4.7e-6);
+ m_final_filter.configure(100e3, 4.7e-6);
/* register for save states */
save_item(NAME(m_in_latch));
@@ -325,7 +322,7 @@ void usb_sound_device::device_start()
timer8253 *group = &m_timer_group[tgroup];
for (tchan = 0; tchan < 3; tchan++)
{
- timer8253_channel *channel = &group->chan[tchan];
+ timer8253::channel *channel = &group->chan[tchan];
save_item(NAME(channel->holding), tgroup * 3 + tchan);
save_item(NAME(channel->latchmode), tgroup * 3 + tchan);
save_item(NAME(channel->latchtoggle), tgroup * 3 + tchan);
@@ -392,7 +389,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( usb_sound_device::increment_t1_clock_timer_cb )
READ8_MEMBER( usb_sound_device::status_r )
{
- LOG(("%04X:usb_data_r = %02X\n", m_maincpu->safe_pc(), (m_out_latch & 0x81) | (m_in_latch & 0x7e)));
+ LOG("%04X:usb_data_r = %02X\n", m_maincpu->safe_pc(), (m_out_latch & 0x81) | (m_in_latch & 0x7e));
m_maincpu->execute().adjust_icount(-200);
@@ -420,7 +417,7 @@ TIMER_CALLBACK_MEMBER( usb_sound_device::delayed_usb_data_w )
WRITE8_MEMBER( usb_sound_device::data_w )
{
- LOG(("%04X:usb_data_w = %02X\n", m_maincpu->safe_pc(), data));
+ LOG("%04X:usb_data_w = %02X\n", m_maincpu->safe_pc(), data);
space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(usb_sound_device::delayed_usb_data_w), this), data);
/* boost the interleave so that sequences can be sent */
@@ -439,7 +436,7 @@ WRITE8_MEMBER( usb_sound_device::ram_w )
if (m_in_latch & 0x80)
m_program_ram[offset] = data;
else
- LOG(("%04X:sega_usb_ram_w(%03X) = %02X while /LOAD disabled\n", m_maincpu->safe_pc(), offset, data));
+ LOG("%04X:sega_usb_ram_w(%03X) = %02X while /LOAD disabled\n", m_maincpu->safe_pc(), offset, data);
}
@@ -454,7 +451,7 @@ READ8_MEMBER( usb_sound_device::p1_r )
{
/* bits 0-6 are inputs and map to bits 0-6 of the input latch */
if ((m_in_latch & 0x7f) != 0)
- LOG(("%03X: P1 read = %02X\n", m_maincpu->safe_pc(), m_in_latch & 0x7f));
+ LOG("%03X: P1 read = %02X\n", m_maincpu->safe_pc(), m_in_latch & 0x7f);
return m_in_latch & 0x7f;
}
@@ -463,13 +460,13 @@ WRITE8_MEMBER( usb_sound_device::p1_w )
{
/* bit 7 maps to bit 0 on the output latch */
m_out_latch = (m_out_latch & 0xfe) | (data >> 7);
- LOG(("%03X: P1 write = %02X\n", m_maincpu->safe_pc(), data));
+ LOG("%03X: P1 write = %02X\n", m_maincpu->safe_pc(), data);
}
WRITE8_MEMBER( usb_sound_device::p2_w )
{
- uint8_t old = m_last_p2_value;
+ u8 old = m_last_p2_value;
m_last_p2_value = data;
/* low 2 bits control the bank of work RAM we are addressing */
@@ -485,7 +482,7 @@ WRITE8_MEMBER( usb_sound_device::p2_w )
if ((old & 0x80) && !(data & 0x80))
m_t1_clock = 0;
- LOG(("%03X: P2 write -> bank=%d ready=%d clock=%d\n", m_maincpu->safe_pc(), data & 3, (data >> 6) & 1, (data >> 7) & 1));
+ LOG("%03X: P2 write -> bank=%d ready=%d clock=%d\n", m_maincpu->safe_pc(), data & 3, (data >> 6) & 1, (data >> 7) & 1);
}
@@ -504,41 +501,41 @@ READ_LINE_MEMBER( usb_sound_device::t1_r )
*
*************************************/
-static inline void clock_channel(timer8253_channel *ch)
+inline void usb_sound_device::timer8253::channel::clock()
{
- uint8_t lastgate = ch->lastgate;
+ u8 const old_lastgate = lastgate;
/* update the gate */
- ch->lastgate = ch->gate;
+ lastgate = gate;
/* if we're holding, skip */
- if (ch->holding)
+ if (holding)
return;
/* switch off the clock mode */
- switch (ch->clockmode)
+ switch (clockmode)
{
/* oneshot; waits for trigger to restart */
case 1:
- if (!lastgate && ch->gate)
+ if (!old_lastgate && gate)
{
- ch->output = 0;
- ch->remain = ch->count;
+ output = 0;
+ remain = count;
}
else
{
- if (--ch->remain == 0)
- ch->output = 1;
+ if (--remain == 0)
+ output = 1;
}
break;
/* square wave: counts down by 2 and toggles output */
case 3:
- ch->remain = (ch->remain - 1) & ~1;
- if (ch->remain == 0)
+ remain = (remain - 1) & ~1;
+ if (remain == 0)
{
- ch->output ^= 1;
- ch->remain = ch->count;
+ output ^= 1;
+ remain = count;
}
break;
}
@@ -551,10 +548,10 @@ static inline void clock_channel(timer8253_channel *ch)
*
*************************************/
-void usb_sound_device::timer_w(int which, uint8_t offset, uint8_t data)
+void usb_sound_device::timer_w(int which, u8 offset, u8 data)
{
timer8253 *g = &m_timer_group[which];
- timer8253_channel *ch;
+ timer8253::channel *ch;
int was_holding;
m_stream->update();
@@ -620,7 +617,7 @@ void usb_sound_device::timer_w(int which, uint8_t offset, uint8_t data)
}
-void usb_sound_device::env_w(int which, uint8_t offset, uint8_t data)
+void usb_sound_device::env_w(int which, u8 offset, u8 data)
{
timer8253 *g = &m_timer_group[which];
@@ -725,7 +722,7 @@ void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
/* final output goes through a CR filter; the scaling factor is arbitrary to get the noise to the */
/* correct relative volume */
- noiseval = step_cr_filter(&m_noise_filters[4], noiseval);
+ noiseval = m_noise_filters[4].step_cr(noiseval);
noiseval *= 0.075;
/* there are 3 identical groups of circuits, each with its own 8253 */
@@ -748,12 +745,12 @@ void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
{
g->chan[0].subcount = USB_2MHZ_CLOCK / USB_PCS_CLOCK;
g->chan[0].gate = 1;
- clock_channel(&g->chan[0]);
+ g->chan[0].clock();
}
g->chan[0].subcount -= step;
/* channel 0 is mixed in with a resistance of 100k */
- chan0 = step_cr_filter(&g->chan_filter[0], g->chan[0].output) * g->env[0] * (1.0/100.0);
+ chan0 = g->chan_filter[0].step_cr(g->chan[0].output) * g->env[0] * (1.0/100.0);
/*-------------
@@ -769,12 +766,12 @@ void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
{
g->chan[1].subcount = USB_2MHZ_CLOCK / USB_PCS_CLOCK;
g->chan[1].gate = 1;
- clock_channel(&g->chan[1]);
+ g->chan[1].clock();
}
g->chan[1].subcount -= step;
/* channel 1 is mixed in with a resistance of 100k */
- chan1 = step_cr_filter(&g->chan_filter[1], g->chan[1].output) * g->env[1] * (1.0/100.0);
+ chan1 = g->chan_filter[1].step_cr(g->chan[1].output) * g->env[1] * (1.0/100.0);
/*-------------
@@ -802,7 +799,7 @@ void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
g->chan[2].subcount = USB_2MHZ_CLOCK / USB_GOS_CLOCK / 2 - 1;
g->chan[2].gate = !g->chan[2].gate;
}
- clock_channel(&g->chan[2]);
+ g->chan[2].clock();
}
/* the exponents for the gate filters are determined by channel 2's output */
@@ -812,14 +809,14 @@ void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
/* based on the envelope mode, we do one of two things with source 2 */
if (g->config == 0)
{
- chan2 = step_rc_filter(&g->gate2, step_rc_filter(&g->gate1, noiseval)) * -1.56 * g->env[2] * (1.0/33.0);
+ chan2 = g->gate2.step_rc(g->gate1.step_rc(noiseval)) * -1.56 * g->env[2] * (1.0/33.0);
mix = chan0 + chan1 + chan2;
}
else
{
chan2 = -noiseval * g->env[2] * (1.0/33.0);
mix = chan0 + chan1 + chan2;
- mix = step_rc_filter(&g->gate2, step_rc_filter(&g->gate1, -mix)) * 1.56;
+ mix = g->gate2.step_rc(g->gate1.step_rc(-mix)) * 1.56;
}
/* accumulate the sample */
@@ -836,7 +833,7 @@ void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t
WEIGHT
*/
- *dest++ = 4000 * step_cr_filter(&m_final_filter, sample);
+ *dest++ = 4000 * m_final_filter.step_cr(sample);
}
}
@@ -881,10 +878,10 @@ machine_config_constructor usb_sound_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( segausb );
}
-const device_type SEGAUSBROM = device_creator<usb_rom_sound_device>;
+DEFINE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device, "segausbrom", "Sega Universal Sound Board with ROM")
-usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : usb_sound_device(mconfig, SEGAUSBROM, "Sega Universal Sound Board with ROM", tag, owner, clock, "segausbrom", __FILE__)
+usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : usb_sound_device(mconfig, SEGAUSBROM, tag, owner, clock)
{
}
diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h
index e36014732a1..70781658466 100644
--- a/src/mame/audio/segasnd.h
+++ b/src/mame/audio/segasnd.h
@@ -5,15 +5,18 @@
Sega g80 common sound hardware
*************************************************************************/
+#ifndef MAME_AUDIO_SEGASND_H
+#define MAME_AUDIO_SEGASND_H
+
+#pragma once
#include "cpu/mcs48/mcs48.h"
-class speech_sound_device : public device_t,
- public device_sound_interface
+
+class speech_sound_device : public device_t, public device_sound_interface
{
public:
- speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~speech_sound_device() {}
+ speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
DECLARE_WRITE8_MEMBER( data_w );
DECLARE_WRITE8_MEMBER( control_w );
@@ -36,88 +39,24 @@ protected:
private:
// internal state
- uint8_t m_drq;
- uint8_t m_latch;
- uint8_t m_t0;
- uint8_t m_p2;
- uint8_t *m_speech;
+ u8 m_drq;
+ u8 m_latch;
+ u8 m_t0;
+ u8 m_p2;
+ u8 *m_speech;
TIMER_CALLBACK_MEMBER( delayed_speech_w );
};
-extern const device_type SEGASPEECH;
+DECLARE_DEVICE_TYPE(SEGASPEECH, speech_sound_device)
MACHINE_CONFIG_EXTERN( sega_speech_board );
-
-
-struct g80_filter_state
-{
- g80_filter_state():
- capval(0),
- exponent(0) {}
-
- double capval; /* current capacitor value */
- double exponent; /* constant exponent */
-};
-
-
-struct timer8253_channel
-{
- timer8253_channel():
- holding(0),
- latchmode(0),
- latchtoggle(0),
- clockmode(0),
- bcdmode(0),
- output(0),
- lastgate(0),
- gate(0),
- subcount(0),
- count(0),
- remain(0) {}
-
- uint8_t holding; /* holding until counts written? */
- uint8_t latchmode; /* latching mode */
- uint8_t latchtoggle; /* latching state */
- uint8_t clockmode; /* clocking mode */
- uint8_t bcdmode; /* BCD mode? */
- uint8_t output; /* current output value */
- uint8_t lastgate; /* previous gate value */
- uint8_t gate; /* current gate value */
- uint8_t subcount; /* subcount (2MHz clocks per input clock) */
- uint16_t count; /* initial count */
- uint16_t remain; /* current down counter value */
-};
-
-
-struct timer8253
-{
- timer8253()
- {
- env[0] = 0;
- env[1] = 0;
- env[2] = 0;
- config = 0;
- }
-
- timer8253_channel chan[3]; /* three channels' worth of information */
- double env[3]; /* envelope value for each channel */
- g80_filter_state chan_filter[2]; /* filter states for the first two channels */
- g80_filter_state gate1; /* first RC filter state */
- g80_filter_state gate2; /* second RC filter state */
- uint8_t config; /* configuration for this timer */
-};
-
-
-class usb_sound_device : public device_t,
- public device_sound_interface
+class usb_sound_device : public device_t, public device_sound_interface
{
public:
- usb_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~usb_sound_device() {}
+ usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
required_device<i8035_device> m_ourcpu; /* CPU index of the 8035 */
DECLARE_READ8_MEMBER( status_r );
@@ -136,6 +75,8 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER( increment_t1_clock_timer_cb );
protected:
+ usb_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
@@ -145,46 +86,92 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
private:
+ struct g80_filter_state
+ {
+ g80_filter_state() { }
+
+ void configure(double r, double c);
+ double step_rc(double input);
+ double step_cr(double input);
+
+ double capval = 0.0; // current capacitor value
+ double exponent = 0.0; // constant exponent
+ };
+
+
+ struct timer8253
+ {
+ struct channel
+ {
+ channel() { }
+
+ void clock();
+
+ u8 holding = 0; // holding until counts written? */
+ u8 latchmode = 0; // latching mode */
+ u8 latchtoggle = 0; // latching state */
+ u8 clockmode = 0; // clocking mode */
+ u8 bcdmode = 0; // BCD mode? */
+ u8 output = 0; // current output value */
+ u8 lastgate = 0; // previous gate value */
+ u8 gate = 0; // current gate value */
+ u8 subcount = 0; // subcount (2MHz clocks per input clock) */
+ u16 count = 0; // initial count
+ u16 remain = 0; // current down counter value
+ };
+
+ timer8253() : env{ 0.0, 0.0, 0.0 } { }
+
+ channel chan[3]; // three channels' worth of information
+ double env[3]; // envelope value for each channel
+ g80_filter_state chan_filter[2]; // filter states for the first two channels
+ g80_filter_state gate1; // first RC filter state
+ g80_filter_state gate2; // second RC filter state
+ u8 config = 0; // configuration for this timer
+ };
+
+
// internal state
- sound_stream *m_stream; /* output stream */
- device_t *m_maincpu;
- uint8_t m_in_latch; /* input latch */
- uint8_t m_out_latch; /* output latch */
- uint8_t m_last_p2_value; /* current P2 output value */
- optional_shared_ptr<uint8_t> m_program_ram; /* pointer to program RAM */
- required_shared_ptr<uint8_t> m_work_ram; /* pointer to work RAM */
- uint8_t m_work_ram_bank; /* currently selected work RAM bank */
- uint8_t m_t1_clock; /* T1 clock value */
- uint8_t m_t1_clock_mask; /* T1 clock mask (configured via jumpers) */
- timer8253 m_timer_group[3]; /* 3 groups of timers */
- uint8_t m_timer_mode[3]; /* mode control for each group */
- uint32_t m_noise_shift;
- uint8_t m_noise_state;
- uint8_t m_noise_subcount;
- double m_gate_rc1_exp[2];
- double m_gate_rc2_exp[2];
+ sound_stream *m_stream; // output stream
+ device_t *m_maincpu;
+ u8 m_in_latch; // input latch
+ u8 m_out_latch; // output latch
+ u8 m_last_p2_value; // current P2 output value
+ optional_shared_ptr<u8> m_program_ram; // pointer to program RAM
+ required_shared_ptr<u8> m_work_ram; // pointer to work RAM
+ u8 m_work_ram_bank; // currently selected work RAM bank
+ u8 m_t1_clock; // T1 clock value
+ u8 m_t1_clock_mask; // T1 clock mask (configured via jumpers)
+ timer8253 m_timer_group[3]; // 3 groups of timers
+ u8 m_timer_mode[3]; // mode control for each group
+ u32 m_noise_shift;
+ u8 m_noise_state;
+ u8 m_noise_subcount;
+ double m_gate_rc1_exp[2];
+ double m_gate_rc2_exp[2];
g80_filter_state m_final_filter;
g80_filter_state m_noise_filters[5];
TIMER_CALLBACK_MEMBER( delayed_usb_data_w );
- void timer_w(int which, uint8_t offset, uint8_t data);
- void env_w(int which, uint8_t offset, uint8_t data);
+ void timer_w(int which, u8 offset, u8 data);
+ void env_w(int which, u8 offset, u8 data);
};
-extern const device_type SEGAUSB;
+DECLARE_DEVICE_TYPE(SEGAUSB, usb_sound_device)
+
class usb_rom_sound_device : public usb_sound_device
{
public:
- usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~usb_rom_sound_device() {}
+ usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
protected:
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
};
-extern const device_type SEGAUSBROM;
+DECLARE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device)
+
#define MCFG_SEGAUSB_ADD(_tag) \
MCFG_SOUND_ADD(_tag, SEGAUSB, 0) \
@@ -193,3 +180,5 @@ extern const device_type SEGAUSBROM;
#define MCFG_SEGAUSBROM_ADD(_tag) \
MCFG_SOUND_ADD(_tag, SEGAUSBROM, 0) \
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
+
+#endif // MAME_AUDIO_SEGASND_H
diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp
index 5814b51ba44..9399a422779 100644
--- a/src/mame/audio/seibu.cpp
+++ b/src/mame/audio/seibu.cpp
@@ -71,10 +71,10 @@
00002CA2: 17 37
*/
-const device_type SEIBU_SOUND = device_creator<seibu_sound_device>;
+DEFINE_DEVICE_TYPE(SEIBU_SOUND, seibu_sound_device, "seibu_sound", "Seibu Sound System")
seibu_sound_device::seibu_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEIBU_SOUND, "Seibu Sound System", tag, owner, clock, "seibu_sound", __FILE__),
+ : device_t(mconfig, SEIBU_SOUND, tag, owner, clock),
m_ym_read_cb(*this),
m_ym_write_cb(*this),
m_sound_cpu(*this, finder_base::DUMMY_TAG),
@@ -320,10 +320,10 @@ ADDRESS_MAP_END
/***************************************************************************/
-const device_type SEI80BU = device_creator<sei80bu_device>;
+DEFINE_DEVICE_TYPE(SEI80BU, sei80bu_device, "sei80bu", "SEI80BU Encrypted Z80 Interface")
sei80bu_device::sei80bu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEI80BU, "SEI80BU Encrypted Z80 Interface", tag, owner, clock, "sei80bu", __FILE__),
+ : device_t(mconfig, SEI80BU, tag, owner, clock),
device_rom_interface(mconfig, *this, 16)
{
}
@@ -374,10 +374,10 @@ READ8_MEMBER(sei80bu_device::opcode_r)
FIXME: hook up an actual MSM5205 in place of this custom implementation
***************************************************************************/
-const device_type SEIBU_ADPCM = device_creator<seibu_adpcm_device>;
+DEFINE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device, "seibu_adpcm", "Seibu ADPCM (MSM5205)")
seibu_adpcm_device::seibu_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEIBU_ADPCM, "Seibu ADPCM (MSM5205)", tag, owner, clock, "seibu_adpcm", __FILE__),
+ : device_t(mconfig, SEIBU_ADPCM, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
m_current(0),
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index 20909371d2c..4137b8d703e 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -24,6 +24,10 @@
* = encrypted
***************************************************************************/
+#ifndef MAME_AUDIO_SEIBU_H
+#define MAME_AUDIO_SEIBU_H
+
+#pragma once
#include "cpu/z80/z80.h"
#include "sound/okiadpcm.h"
@@ -91,7 +95,7 @@ private:
};
};
-extern const device_type SEIBU_SOUND;
+DECLARE_DEVICE_TYPE(SEIBU_SOUND, seibu_sound_device)
// SEI80BU (Z80 program decryption)
@@ -110,7 +114,7 @@ protected:
virtual void rom_bank_updated() override { }
};
-extern const device_type SEI80BU;
+DECLARE_DEVICE_TYPE(SEI80BU, sei80bu_device)
// Seibu ADPCM device
@@ -143,7 +147,7 @@ private:
required_region_ptr<uint8_t> m_base;
};
-extern const device_type SEIBU_ADPCM;
+DECLARE_DEVICE_TYPE(SEIBU_ADPCM, seibu_adpcm_device)
/**************************************************************************/
@@ -182,3 +186,5 @@ extern const device_type SEIBU_ADPCM;
devcb = &seibu_sound_device::set_ym_write_callback(*device, DEVCB_##_devcb);
/**************************************************************************/
+
+#endif // MAME_AUDIO_SEIBU_H
diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp
index cf29796f185..714b1ca8f15 100644
--- a/src/mame/audio/snes_snd.cpp
+++ b/src/mame/audio/snes_snd.cpp
@@ -153,11 +153,11 @@ static const int ENVCNT[0x20]
#define MEtoLE16( x ) little_endianize_int16(x)
-const device_type SNES = device_creator<snes_sound_device>;
+DEFINE_DEVICE_TYPE(SNES, snes_sound_device, "snes_sound", "SNES Custom DSP (SPC700)")
snes_sound_device::snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SNES, "SNES Custom DSP (SPC700)", tag, owner, clock, "snes_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, SNES, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/audio/snes_snd.h b/src/mame/audio/snes_snd.h
index e54e51ba538..68c8a204917 100644
--- a/src/mame/audio/snes_snd.h
+++ b/src/mame/audio/snes_snd.h
@@ -6,11 +6,8 @@
*
****************************************************************************/
-#ifndef __SNES_SPC_H__
-#define __SNES_SPC_H__
-
-
-#define SNES_SPCRAM_SIZE 0x10000
+#ifndef MAME_AUDIO_SNES_SND_H
+#define MAME_AUDIO_SNES_SND_H
/***************************************************************************
@@ -27,34 +24,6 @@ enum env_state_t32 /* ADSR state type */
ALLOW_SAVE_TYPE(env_state_t32);
-struct voice_state_type /* Voice state type */
-{
- uint16_t mem_ptr; /* Sample data memory pointer */
- int end; /* End or loop after block */
- int envcnt; /* Counts to envelope update */
- env_state_t32 envstate; /* Current envelope state */
- int envx; /* Last env height (0-0x7FFF) */
- int filter; /* Last header's filter */
- int half; /* Active nybble of BRR */
- int header_cnt; /* Bytes before new header (0-8)*/
- int mixfrac; /* Fractional part of smpl pstn */
- int on_cnt; /* Is it time to turn on yet? */
- int pitch; /* Sample pitch (4096->32000Hz) */
- int range; /* Last header's range */
- uint32_t samp_id; /* Sample ID# */
- int sampptr; /* Where in sampbuf we are */
- int32_t smp1; /* Last sample (for BRR filter) */
- int32_t smp2; /* Second-to-last sample decoded*/
- short sampbuf[4]; /* Buffer for Gaussian interp */
-};
-
-struct src_dir_type /* Source directory entry */
-{
- uint16_t vptr; /* Ptr to start of sample data */
- uint16_t lptr; /* Loop pointer in sample data */
-};
-
-
/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/
@@ -64,7 +33,6 @@ class snes_sound_device : public device_t,
{
public:
snes_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~snes_sound_device() {}
void set_volume(int volume);
@@ -87,6 +55,37 @@ protected:
private:
+ static constexpr unsigned SNES_SPCRAM_SIZE = 0x10000;
+
+
+ struct voice_state_type /* Voice state type */
+ {
+ uint16_t mem_ptr; /* Sample data memory pointer */
+ int end; /* End or loop after block */
+ int envcnt; /* Counts to envelope update */
+ env_state_t32 envstate; /* Current envelope state */
+ int envx; /* Last env height (0-0x7FFF) */
+ int filter; /* Last header's filter */
+ int half; /* Active nybble of BRR */
+ int header_cnt; /* Bytes before new header (0-8)*/
+ int mixfrac; /* Fractional part of smpl pstn */
+ int on_cnt; /* Is it time to turn on yet? */
+ int pitch; /* Sample pitch (4096->32000Hz) */
+ int range; /* Last header's range */
+ uint32_t samp_id; /* Sample ID# */
+ int sampptr; /* Where in sampbuf we are */
+ int32_t smp1; /* Last sample (for BRR filter) */
+ int32_t smp2; /* Second-to-last sample decoded*/
+ short sampbuf[4]; /* Buffer for Gaussian interp */
+ };
+
+ struct src_dir_type /* Source directory entry */
+ {
+ uint16_t vptr; /* Ptr to start of sample data */
+ uint16_t lptr; /* Loop pointer in sample data */
+ };
+
+
DECLARE_READ8_MEMBER(dsp_io_r);
DECLARE_WRITE8_MEMBER(dsp_io_w);
TIMER_CALLBACK_MEMBER(spc_timer);
@@ -127,7 +126,7 @@ private:
uint8_t m_port_out[4]; /* SPC output ports */
};
-extern const device_type SNES;
+DECLARE_DEVICE_TYPE(SNES, snes_sound_device)
-#endif /* __SNES_SPC_H__ */
+#endif // MAME_AUDIO_SNES_SND_H
diff --git a/src/mame/audio/snk6502.cpp b/src/mame/audio/snk6502.cpp
index 2b367d2690b..3fc0b7a632b 100644
--- a/src/mame/audio/snk6502.cpp
+++ b/src/mame/audio/snk6502.cpp
@@ -13,9 +13,9 @@
#include "emu.h"
-#include "sound/samples.h"
-#include "includes/snk6502.h"
-#include "sound/discrete.h"
+#include "audio/snk6502.h"
+
+#include "sound/sn76477.h"
#ifndef M_LN2
@@ -128,10 +128,10 @@ DISCRETE_SOUND_START( fantasy )
DISCRETE_SOUND_END
-const device_type SNK6502 = device_creator<snk6502_sound_device>;
+DEFINE_DEVICE_TYPE(SNK6502, snk6502_sound_device, "snk6502_sound", "SNK6502 Audio Custom")
snk6502_sound_device::snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SNK6502, "SNK6502 Audio Custom", tag, owner, clock, "snk6502_sound", __FILE__),
+ : device_t(mconfig, SNK6502, tag, owner, clock),
device_sound_interface(mconfig, *this),
//m_tone_channels[CHANNELS],
m_tone_clock_expire(0),
@@ -711,8 +711,6 @@ WRITE8_MEMBER( snk6502_sound_device::fantasy_sound_w )
/* select tune in ROM based on sound command byte */
m_tone_channels[2].base = 0x1000 + ((data & 0x70) << 4);
m_tone_channels[2].mask = 0xff;
- snk6502_state *drvstate = space.machine().driver_data<snk6502_state>();
- drvstate->flipscreen_w(space, 0, data);
break;
}
}
diff --git a/src/mame/audio/snk6502.h b/src/mame/audio/snk6502.h
new file mode 100644
index 00000000000..bd03457376e
--- /dev/null
+++ b/src/mame/audio/snk6502.h
@@ -0,0 +1,86 @@
+// license:BSD-3-Clause
+// copyright-holders:Nicola Salmoria, Dan Boris
+/*************************************************************************
+
+ rokola hardware
+
+*************************************************************************/
+#ifndef MAME_AUDIO_SNK6502_H
+#define MAME_AUDIO_SNK6502_H
+
+#pragma once
+
+#include "sound/discrete.h"
+#include "sound/samples.h"
+
+
+class snk6502_sound_device : public device_t, public device_sound_interface
+{
+public:
+ snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_WRITE8_MEMBER( sasuke_sound_w );
+ DECLARE_WRITE8_MEMBER( satansat_sound_w );
+ DECLARE_WRITE8_MEMBER( vanguard_sound_w );
+ DECLARE_WRITE8_MEMBER( vanguard_speech_w );
+ DECLARE_WRITE8_MEMBER( fantasy_sound_w );
+ DECLARE_WRITE8_MEMBER( fantasy_speech_w );
+
+ void set_music_clock(double clock_time);
+ void set_music_freq(int freq);
+ int music0_playing();
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+private:
+ static constexpr unsigned CHANNELS = 3;
+
+ struct TONE
+ {
+ int mute;
+ int offset;
+ int base;
+ int mask;
+ int32_t sample_rate;
+ int32_t sample_step;
+ int32_t sample_cur;
+ int16_t form[16];
+ };
+
+ // internal state
+ TONE m_tone_channels[CHANNELS];
+ int32_t m_tone_clock_expire;
+ int32_t m_tone_clock;
+ sound_stream * m_tone_stream;
+
+ optional_device<samples_device> m_samples;
+ uint8_t *m_ROM;
+ int m_Sound0StopOnRollover;
+ uint8_t m_LastPort1;
+
+ int m_hd38880_cmd;
+ uint32_t m_hd38880_addr;
+ int m_hd38880_data_bytes;
+ double m_hd38880_speed;
+
+ inline void validate_tone_channel(int channel);
+ void sasuke_build_waveform(int mask);
+ void satansat_build_waveform(int mask);
+ void build_waveform(int channel, int mask);
+ void speech_w(uint8_t data, const uint16_t *table, int start);
+};
+
+DECLARE_DEVICE_TYPE(SNK6502, snk6502_sound_device)
+
+DISCRETE_SOUND_EXTERN( fantasy );
+
+extern char const *const sasuke_sample_names[];
+extern char const *const vanguard_sample_names[];
+extern char const *const fantasy_sample_names[];
+
+#endif // MAME_AUDIO_SNK6502_H
diff --git a/src/mame/audio/socrates.cpp b/src/mame/audio/socrates.cpp
index e50b06d9b8a..0b86830d412 100644
--- a/src/mame/audio/socrates.cpp
+++ b/src/mame/audio/socrates.cpp
@@ -16,7 +16,7 @@
// device type definition
-const device_type SOCRATES_SOUND = device_creator<socrates_snd_device>;
+DEFINE_DEVICE_TYPE(SOCRATES_SOUND, socrates_snd_device, "socrates_snd", "Socrates Sound")
//-------------------------------------------------
@@ -24,8 +24,8 @@ const device_type SOCRATES_SOUND = device_creator<socrates_snd_device>;
//-------------------------------------------------
socrates_snd_device::socrates_snd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SOCRATES_SOUND, "Socrates Sound", tag, owner, clock, "socrates_snd", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, SOCRATES_SOUND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/audio/socrates.h b/src/mame/audio/socrates.h
index c42a3d44671..4f840bca384 100644
--- a/src/mame/audio/socrates.h
+++ b/src/mame/audio/socrates.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Jonathan Gevaryahu
-#pragma once
+#ifndef MAME_AUDIO_SOCRATES_H
+#define MAME_AUDIO_SOCRATES_H
-#ifndef __SOCR_SND_H__
-#define __SOCR_SND_H__
+#pragma once
class socrates_snd_device : public device_t,
public device_sound_interface
@@ -38,7 +38,7 @@ private:
uint16_t m_DAC_output; // output
};
-extern const device_type SOCRATES_SOUND;
+DECLARE_DEVICE_TYPE(SOCRATES_SOUND, socrates_snd_device)
-#endif /* __SOCR_SND_H__ */
+#endif // MAME_AUDIO_SOCRATES_H
diff --git a/src/mame/audio/special.cpp b/src/mame/audio/special.cpp
index 61bcccc3959..6edc3cebcdf 100644
--- a/src/mame/audio/special.cpp
+++ b/src/mame/audio/special.cpp
@@ -14,7 +14,7 @@
// device type definition
-const device_type SPECIMX_SND = device_creator<specimx_sound_device>;
+DEFINE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device, "specimx_sound", "Specialist MX Audio Custom")
//**************************************************************************
@@ -26,11 +26,11 @@ const device_type SPECIMX_SND = device_creator<specimx_sound_device>;
//-------------------------------------------------
specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SPECIMX_SND, "Specialist MX Audio Custom", tag, owner, clock, "specimx_sound", __FILE__),
- device_sound_interface(mconfig, *this),
- m_mixer_channel(nullptr)
+ : device_t(mconfig, SPECIMX_SND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_mixer_channel(nullptr)
+ , m_specimx_input{ 0, 0, 0 }
{
- memset(m_specimx_input, 0, sizeof(int)*3);
}
diff --git a/src/mame/audio/special.h b/src/mame/audio/special.h
index 7fceceaf1ea..8fbcfe176cc 100644
--- a/src/mame/audio/special.h
+++ b/src/mame/audio/special.h
@@ -6,16 +6,16 @@
*
****************************************************************************/
-#ifndef SPECIAL_SND_H_
-#define SPECIAL_SND_H_
+#ifndef MAME_AUDIO_SPECIAL_H
+#define MAME_AUDIO_SPECIAL_H
+#pragma once
-class specimx_sound_device : public device_t,
- public device_sound_interface
+
+class specimx_sound_device : public device_t, public device_sound_interface
{
public:
specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~specimx_sound_device() { }
DECLARE_WRITE_LINE_MEMBER(set_input_ch0);
DECLARE_WRITE_LINE_MEMBER(set_input_ch1);
@@ -33,6 +33,6 @@ private:
int m_specimx_input[3];
};
-extern const device_type SPECIMX_SND;
+DECLARE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device)
-#endif /* SPECIAL_SND_H_ */
+#endif // MAME_AUDIO_SPECIAL_H
diff --git a/src/mame/audio/svis_snd.cpp b/src/mame/audio/svis_snd.cpp
index eb94212eb85..55b1921e713 100644
--- a/src/mame/audio/svis_snd.cpp
+++ b/src/mame/audio/svis_snd.cpp
@@ -11,7 +11,7 @@
// device type definition
-const device_type SVISION_SND = device_creator<svision_sound_device>;
+DEFINE_DEVICE_TYPE(SVISION_SND, svision_sound_device, "svision_sound", "Super Vision Audio Custom")
//**************************************************************************
@@ -23,9 +23,9 @@ const device_type SVISION_SND = device_creator<svision_sound_device>;
//-------------------------------------------------
svision_sound_device::svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SVISION_SND, "Super Vision Audio Custom", tag, owner, clock, "svision_sound", __FILE__),
- device_sound_interface(mconfig, *this),
- m_mixer_channel(nullptr)
+ : device_t(mconfig, SVISION_SND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_mixer_channel(nullptr)
{
}
@@ -54,47 +54,46 @@ void svision_sound_device::device_start()
void svision_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
{
stream_sample_t *left=outputs[0], *right=outputs[1];
- int i, j;
- SVISION_CHANNEL *channel;
- for (i = 0; i < samples; i++, left++, right++)
+ for (int i = 0; i < samples; i++, left++, right++)
{
*left = 0;
*right = 0;
- for (channel=m_channel, j=0; j<ARRAY_LENGTH(m_channel); j++, channel++)
+ for (int j = 0; j < ARRAY_LENGTH(m_channel); j++)
{
- if (channel->size != 0)
+ CHANNEL &channel(m_channel[j]);
+ if (channel.size != 0)
{
- if (channel->on||channel->count)
+ if (channel.on||channel.count)
{
bool on = false;
- switch (channel->waveform)
+ switch (channel.waveform)
{
case 0:
- on = channel->pos <= (28 * channel->size) >> 5;
+ on = channel.pos <= (28 * channel.size) >> 5;
break;
case 1:
- on = channel->pos <= (24 * channel->size) >> 5;
+ on = channel.pos <= (24 * channel.size) >> 5;
break;
default:
case 2:
- on = channel->pos <= channel->size / 2;
+ on = channel.pos <= channel.size / 2;
break;
case 3:
- on = channel->pos <= (9 * channel->size) >> 5;
+ on = channel.pos <= (9 * channel.size) >> 5;
break;
}
{
- int16_t s = on ? channel->volume << 8 : 0;
+ int16_t s = on ? channel.volume << 8 : 0;
if (j == 0)
*right += s;
else
*left += s;
}
}
- channel->pos++;
- if (channel->pos >= channel->size)
- channel->pos = 0;
+ channel.pos++;
+ if (channel.pos >= channel.size)
+ channel.pos = 0;
}
}
if (m_noise.on && (m_noise.play || m_noise.count))
@@ -110,13 +109,13 @@ void svision_sound_device::sound_stream_update(sound_stream &stream, stream_samp
{
switch (m_noise.type)
{
- case SVISION_NOISE_Type7Bit:
+ case NOISE::Type::Type7Bit:
m_noise.value = m_noise.state & 0x40 ? 1 : 0;
b1 = (m_noise.state & 0x40) != 0;
b2 = (m_noise.state & 0x20) != 0;
m_noise.state=(m_noise.state<<1)+(b1!=b2?1:0);
break;
- case SVISION_NOISE_Type14Bit:
+ case NOISE::Type::Type14Bit:
default:
m_noise.value = m_noise.state & 0x2000 ? 1 : 0;
b1 = (m_noise.state & 0x2000) != 0;
@@ -204,7 +203,7 @@ WRITE8_MEMBER( svision_sound_device::noise_w )
m_noise.count = data + 1;
break;
case 2:
- m_noise.type = (SVISION_NOISE_Type) (data & 1);
+ m_noise.type = NOISE::Type(data & 1);
m_noise.play = data & 2;
m_noise.right = data & 4;
m_noise.left = data & 8;
@@ -235,35 +234,35 @@ void svision_sound_device::sound_decrement()
void svision_sound_device::soundport_w(int which, int offset, int data)
{
- SVISION_CHANNEL *channel = &m_channel[which];
+ CHANNEL &channel(m_channel[which]);
uint16_t size;
m_mixer_channel->update();
- channel->reg[offset] = data;
+ channel.reg[offset] = data;
switch (offset)
{
case 0:
case 1:
- size = channel->reg[0] | ((channel->reg[1] & 7) << 8);
+ size = channel.reg[0] | ((channel.reg[1] & 7) << 8);
if (size)
{
- // channel->size=(int)(device->machine().sample_rate()*(size<<5)/4e6);
- channel->size= (int) (machine().sample_rate() * (size << 5) / machine().device("maincpu")->unscaled_clock());
+ // channel.size=(int)(device->machine().sample_rate()*(size<<5)/4e6);
+ channel.size= (int) (machine().sample_rate() * (size << 5) / machine().device("maincpu")->unscaled_clock());
}
else
{
- channel->size = 0;
+ channel.size = 0;
}
- channel->pos = 0;
+ channel.pos = 0;
break;
case 2:
- channel->on = data & 0x40;
- channel->waveform = (data & 0x30) >> 4;
- channel->volume = data & 0xf;
+ channel.on = data & 0x40;
+ channel.waveform = (data & 0x30) >> 4;
+ channel.volume = data & 0xf;
break;
case 3:
- channel->count = data + 1;
+ channel.count = data + 1;
break;
}
}
diff --git a/src/mame/audio/svis_snd.h b/src/mame/audio/svis_snd.h
index 46b18a29968..1a3777434ae 100644
--- a/src/mame/audio/svis_snd.h
+++ b/src/mame/audio/svis_snd.h
@@ -6,110 +6,39 @@
*
****************************************************************************/
-#ifndef SVIS_SND_H_
-#define SVIS_SND_H_
+#ifndef MAME_AUDIO_SVIS_SND_H
+#define MAME_AUDIO_SVIS_SND_H
+
+#pragma once
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
-enum SVISION_NOISE_Type
-{
- SVISION_NOISE_Type7Bit,
- SVISION_NOISE_Type14Bit
-};
-
-struct SVISION_NOISE
-{
- SVISION_NOISE() :
- on(0),
- right(0),
- left(0),
- play(0),
- type(SVISION_NOISE_Type7Bit),
- state(0),
- volume(0),
- count(0),
- step(0.0),
- pos(0.0),
- value(0)
- {
- memset(reg, 0, sizeof(uint8_t)*3);
- }
-
- uint8_t reg[3];
- int on, right, left, play;
- SVISION_NOISE_Type type;
- int state;
- int volume;
- int count;
- double step, pos;
- int value; // currently simple random function
-};
-
-struct SVISION_DMA
-{
- SVISION_DMA() :
- on(0),
- right(0),
- left(0),
- ca14to16(0),
- start(0),
- size(0),
- pos(0.0),
- step(0.0),
- finished(0)
- {
- memset(reg, 0, sizeof(uint8_t)*5);
- }
-
- uint8_t reg[5];
- int on, right, left;
- int ca14to16;
- int start,size;
- double pos, step;
- int finished;
-};
-
-struct SVISION_CHANNEL
-{
- SVISION_CHANNEL() :
- on(0),
- waveform(0),
- volume(0),
- pos(0),
- size(0),
- count(0)
- {
- memset(reg, 0, sizeof(uint8_t)*4);
- }
-
- uint8_t reg[4];
- int on;
- int waveform, volume;
- int pos;
- int size;
- int count;
-};
-
-typedef device_delegate<void (void)> svision_snd_irq_delegate;
#define SVISION_SND_IRQ_MEMBER(_name) void _name(void)
#define SVISION_SND_IRQ_CB(_class, _method) \
- svision_sound_device::set_irq_callback(*device, svision_snd_irq_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
+ svision_sound_device::set_irq_callback(*device, svision_sound_device::irq_delegate(&_class::_method, #_class "::" #_method, downcast<_class *>(owner)));
// ======================> svision_sound_device
-class svision_sound_device : public device_t,
- public device_sound_interface
+class svision_sound_device : public device_t, public device_sound_interface
{
public:
+ typedef device_delegate<void ()> irq_delegate;
+
svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~svision_sound_device() { }
// static configuration
- static void set_irq_callback(device_t &device, svision_snd_irq_delegate callback) { downcast<svision_sound_device &>(device).m_irq_cb = callback; }
+ static void set_irq_callback(device_t &device, irq_delegate callback) { downcast<svision_sound_device &>(device).m_irq_cb = callback; }
+
+ DECLARE_WRITE8_MEMBER( sounddma_w );
+ DECLARE_WRITE8_MEMBER( noise_w );
+
+ int *dma_finished();
+ void sound_decrement();
+ void soundport_w(int which, int offset, int data);
protected:
// device-level overrides
@@ -118,25 +47,59 @@ protected:
// sound stream update overrides
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-public:
- DECLARE_WRITE8_MEMBER( sounddma_w );
- DECLARE_WRITE8_MEMBER( noise_w );
+private:
+ struct NOISE
+ {
+ enum class Type
+ {
+ Type7Bit = 0,
+ Type14Bit = 1
+ };
+
+ NOISE() : reg{ 0, 0, 0 } { }
+
+ uint8_t reg[3];
+ int on = 0, right = 0, left = 0, play = 0;
+ Type type = Type::Type7Bit;
+ int state = 0;
+ int volume = 0;
+ int count = 0;
+ double step = 0, pos = 0;
+ int value = 0; // currently simple random function
+ };
+
+ struct DMA
+ {
+ DMA() : reg{ 0, 0, 0, 0, 0 } { }
-public:
- int *dma_finished();
- void sound_decrement();
- void soundport_w(int which, int offset, int data);
+ uint8_t reg[5];
+ int on = 0, right = 0, left = 0;
+ int ca14to16 = 0;
+ int start = 0, size = 0;
+ double pos = 0, step = 0;
+ int finished = 0;
+ };
-private:
- svision_snd_irq_delegate m_irq_cb;
+ struct CHANNEL
+ {
+ CHANNEL() : reg{ 0, 0, 0, 0 } { }
+
+ uint8_t reg[4];
+ int on = 0;
+ int waveform = 0, volume = 0;
+ int pos = 0;
+ int size = 0;
+ int count = 0;
+ };
+
+ irq_delegate m_irq_cb;
sound_stream *m_mixer_channel;
- SVISION_DMA m_dma;
- SVISION_NOISE m_noise;
- SVISION_CHANNEL m_channel[2];
+ DMA m_dma;
+ NOISE m_noise;
+ CHANNEL m_channel[2];
};
-extern const device_type SVISION_SND;
-
+DECLARE_DEVICE_TYPE(SVISION_SND, svision_sound_device)
-#endif /* SVIS_SND_H_ */
+#endif // MAME_AUDIO_SVIS_SND_H
diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp
index 2106b0fc53c..1f20307f31a 100644
--- a/src/mame/audio/t5182.cpp
+++ b/src/mame/audio/t5182.cpp
@@ -151,10 +151,10 @@ rom.
#define T5182_CLOCK XTAL_14_31818MHz/4
-const device_type T5182 = device_creator<t5182_device>;
+DEFINE_DEVICE_TYPE(T5182, t5182_device, "t5182", "T5182 MCU")
t5182_device::t5182_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, T5182, "T5182 MCU", tag, owner, clock, "t5182", __FILE__),
+ : device_t(mconfig, T5182, tag, owner, clock),
m_ourcpu(*this, "t5182_z80"),
m_sharedram(*this, "sharedram"),
m_irqstate(0),
diff --git a/src/mame/audio/t5182.h b/src/mame/audio/t5182.h
index 4783f626236..e4f8ab4533e 100644
--- a/src/mame/audio/t5182.h
+++ b/src/mame/audio/t5182.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Jonathan Gevaryahu
+#ifndef MAME_AUDIO_T5182_H
+#define MAME_AUDIO_T5182_H
+
+#pragma once
+
#include "sound/ym2151.h"
#include "cpu/z80/z80.h"
@@ -8,7 +13,6 @@ class t5182_device : public device_t
{
public:
t5182_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~t5182_device() {}
enum
{
@@ -57,4 +61,6 @@ private:
TIMER_CALLBACK_MEMBER( setirq_callback );
};
-extern const device_type T5182;
+DECLARE_DEVICE_TYPE(T5182, t5182_device)
+
+#endif // MAME_AUDIO_T5182_H
diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp
index 80ef6b085e0..e6fc3cdf820 100644
--- a/src/mame/audio/taito_en.cpp
+++ b/src/mame/audio/taito_en.cpp
@@ -17,10 +17,10 @@
#include "speaker.h"
-const device_type TAITO_EN = device_creator<taito_en_device>;
+DEFINE_DEVICE_TYPE(TAITO_EN, taito_en_device, "taito_en", "Taito Ensoniq Sound System")
taito_en_device::taito_en_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TAITO_EN, "Taito Ensoniq Sound System", tag, owner, clock, "taito_en", __FILE__),
+ : device_t(mconfig, TAITO_EN, tag, owner, clock),
m_audiocpu(*this, "audiocpu"),
m_ensoniq(*this, "ensoniq"),
m_duart68681(*this, "duart68681"),
diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h
index 5733748d19f..5504dc248a5 100644
--- a/src/mame/audio/taito_en.h
+++ b/src/mame/audio/taito_en.h
@@ -5,6 +5,10 @@
Taito Ensoniq ES5505-based sound hardware
****************************************************************************/
+#ifndef MAME_AUDIO_TAITO_EN_H
+#define MAME_AUDIO_TAITO_EN_H
+
+#pragma once
#include "cpu/m68000/m68000.h"
#include "sound/es5506.h"
@@ -16,7 +20,6 @@ class taito_en_device : public device_t
{
public:
taito_en_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~taito_en_device() {}
DECLARE_READ8_MEMBER( en_68000_share_r );
DECLARE_WRITE8_MEMBER( en_68000_share_w );
@@ -56,4 +59,6 @@ private:
uint8_t m_es5510_ram_sel;
};
-extern const device_type TAITO_EN;
+DECLARE_DEVICE_TYPE(TAITO_EN, taito_en_device)
+
+#endif // MAME_AUDIO_TAITO_EN_H
diff --git a/src/mame/audio/taito_zm.cpp b/src/mame/audio/taito_zm.cpp
index a29f1aea9b4..02ad6318778 100644
--- a/src/mame/audio/taito_zm.cpp
+++ b/src/mame/audio/taito_zm.cpp
@@ -31,14 +31,14 @@ TODO:
/**************************************************************************/
-const device_type TAITO_ZOOM = device_creator<taito_zoom_device>;
+DEFINE_DEVICE_TYPE(TAITO_ZOOM, taito_zoom_device, "taito_zoom", "Taito Zoom Sound System")
//-------------------------------------------------
// taito_zoom_device - constructor
//-------------------------------------------------
taito_zoom_device::taito_zoom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TAITO_ZOOM, "Taito Zoom Sound System", tag, owner, clock, "taito_zoom", __FILE__),
+ : device_t(mconfig, TAITO_ZOOM, tag, owner, clock),
m_soundcpu(*this, ":mn10200"),
m_zsg2(*this, ":zsg2"),
m_reg_address(0),
diff --git a/src/mame/audio/taito_zm.h b/src/mame/audio/taito_zm.h
index 353cb898f54..edf0b3e8438 100644
--- a/src/mame/audio/taito_zm.h
+++ b/src/mame/audio/taito_zm.h
@@ -5,6 +5,10 @@
Taito Zoom ZSG-2 sound board
***************************************************************************/
+#ifndef MAME_AUDIO_TAITO_ZM_H
+#define MAME_AUDIO_TAITO_ZM_H
+
+#pragma once
#include "cpu/mn10200/mn10200.h"
#include "cpu/tms57002/tms57002.h"
@@ -17,7 +21,6 @@ class taito_zoom_device : public device_t
{
public:
taito_zoom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~taito_zoom_device() {}
DECLARE_WRITE16_MEMBER(sound_irq_w);
DECLARE_READ16_MEMBER(sound_irq_r);
@@ -45,9 +48,11 @@ private:
std::unique_ptr<uint8_t[]> m_snd_shared_ram;
};
-extern const device_type TAITO_ZOOM;
+DECLARE_DEVICE_TYPE(TAITO_ZOOM, taito_zoom_sound)
MACHINE_CONFIG_EXTERN( taito_zoom_sound );
#define MCFG_TAITO_ZOOM_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, TAITO_ZOOM, 0)
+
+#endif // MAME_AUDIO_TAITO_ZM_H
diff --git a/src/mame/audio/taitosnd.cpp b/src/mame/audio/taitosnd.cpp
index 2f885674d66..6dc984d925e 100644
--- a/src/mame/audio/taitosnd.cpp
+++ b/src/mame/audio/taitosnd.cpp
@@ -11,9 +11,10 @@
**********************************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "taitosnd.h"
+#include "cpu/z80/z80.h"
+
/**********************************************************************************************
@@ -29,7 +30,7 @@
// device type definition
-const device_type TC0140SYT = device_creator<tc0140syt_device>;
+DEFINE_DEVICE_TYPE(TC0140SYT, tc0140syt_device, "tc0140syt", "Taito TC0140SYT")
//**************************************************************************
@@ -41,7 +42,7 @@ const device_type TC0140SYT = device_creator<tc0140syt_device>;
//-------------------------------------------------
tc0140syt_device::tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0140SYT, "Taito TC0140SYT", tag, owner, clock, "tc0140syt", __FILE__)
+ : device_t(mconfig, TC0140SYT, tag, owner, clock)
, m_mainmode(0)
, m_submode(0)
, m_status(0)
diff --git a/src/mame/audio/taitosnd.h b/src/mame/audio/taitosnd.h
index e6f20e1bec1..3738575cb02 100644
--- a/src/mame/audio/taitosnd.h
+++ b/src/mame/audio/taitosnd.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Philip Bennett
-#ifndef __TAITOSND_H__
-#define __TAITOSND_H__
+#ifndef MAME_AUDIO_TAITOSND_H
+#define MAME_AUDIO_TAITOSND_H
//**************************************************************************
@@ -25,7 +25,6 @@ class tc0140syt_device : public device_t
{
public:
tc0140syt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0140syt_device() { }
static void set_master_tag(device_t &device, const char *tag) { downcast<tc0140syt_device &>(device).m_mastercpu.set_tag(tag); }
static void set_slave_tag(device_t &device, const char *tag) { downcast<tc0140syt_device &>(device).m_slavecpu.set_tag(tag); }
@@ -59,7 +58,7 @@ private:
required_device<cpu_device> m_slavecpu; /* this is the audiocpu */
};
-extern const device_type TC0140SYT;
+DECLARE_DEVICE_TYPE(TC0140SYT, tc0140syt_device)
-#endif /*__TAITOSND_H__*/
+#endif // MAME_AUDIO_TAITOSND_H
diff --git a/src/mame/audio/tiamc1.cpp b/src/mame/audio/tiamc1.cpp
index 3be08b7b551..09ac9e8aa4a 100644
--- a/src/mame/audio/tiamc1.cpp
+++ b/src/mame/audio/tiamc1.cpp
@@ -34,7 +34,7 @@
***************************************************************************/
#include "emu.h"
-#include "includes/tiamc1.h"
+#include "audio/tiamc1.h"
#define CLOCK_DIVIDER 16
#define BUF_LEN 100000
@@ -46,7 +46,7 @@
// device type definition
-const device_type TIAMC1 = device_creator<tiamc1_sound_device>;
+DEFINE_DEVICE_TYPE(TIAMC1, tiamc1_sound_device, "tiamc1_sound", "TIA-MC1 Audio Custom")
//**************************************************************************
@@ -58,7 +58,7 @@ const device_type TIAMC1 = device_creator<tiamc1_sound_device>;
//-------------------------------------------------
tiamc1_sound_device::tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TIAMC1, "TIA-MC1 Audio Custom", tag, owner, clock, "tiamc1_sound", __FILE__),
+ : device_t(mconfig, TIAMC1, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
m_timer1_divider(0)
diff --git a/src/mame/audio/tiamc1.h b/src/mame/audio/tiamc1.h
new file mode 100644
index 00000000000..638d6caefc4
--- /dev/null
+++ b/src/mame/audio/tiamc1.h
@@ -0,0 +1,67 @@
+// license:BSD-3-Clause
+// copyright-holders:Eugene Sandulenko
+#ifndef MAME_AUDIO_TIAMC1_H
+#define MAME_AUDIO_TIAMC1_H
+
+#pragma once
+
+//**************************************************************************
+// TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> tiamc1_sound_device
+
+class tiamc1_sound_device : public device_t, public device_sound_interface
+{
+public:
+ tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_WRITE8_MEMBER( tiamc1_timer0_w );
+ DECLARE_WRITE8_MEMBER( tiamc1_timer1_w );
+ DECLARE_WRITE8_MEMBER( tiamc1_timer1_gate_w );
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+private:
+ struct timer8253chan
+ {
+ timer8253chan() { }
+
+ uint16_t count = 0;
+ uint16_t cnval = 0;
+ uint8_t bcdMode = 0;
+ uint8_t cntMode = 0;
+ uint8_t valMode = 0;
+ uint8_t gate = 0;
+ uint8_t output = 0;
+ uint8_t loadCnt = 0;
+ uint8_t enable = 0;
+ };
+
+ struct timer8253struct
+ {
+ struct timer8253chan channel[3];
+ };
+
+
+ void timer8253_reset(struct timer8253struct *t);
+ void timer8253_tick(struct timer8253struct *t,int chn);
+ void timer8253_wr(struct timer8253struct *t, int reg, uint8_t val);
+ char timer8253_get_output(struct timer8253struct *t, int chn);
+ void timer8253_set_gate(struct timer8253struct *t, int chn, uint8_t gate);
+
+ sound_stream *m_channel;
+ int m_timer1_divider;
+
+ timer8253struct m_timer0;
+ timer8253struct m_timer1;
+};
+
+DECLARE_DEVICE_TYPE(TIAMC1, tiamc1_sound_device)
+
+#endif // MAME_AUDIO_TIAMC1_H
diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp
index e27f3b32c3a..fe8663c41da 100644
--- a/src/mame/audio/timeplt.cpp
+++ b/src/mame/audio/timeplt.cpp
@@ -22,12 +22,12 @@
#define MASTER_CLOCK XTAL_14_31818MHz
-const device_type TIMEPLT_AUDIO = device_creator<timeplt_audio_device>;
+DEFINE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device, "timplt_audio", "Time Pilot Audio")
timeplt_audio_device::timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TIMEPLT_AUDIO, "Time Pilot Audio", tag, owner, clock, "timeplt_audio", __FILE__),
- device_sound_interface(mconfig, *this),
- m_last_irq_state(0)
+ : device_t(mconfig, TIMEPLT_AUDIO, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_last_irq_state(0)
{
}
@@ -100,7 +100,7 @@ void timeplt_audio_device::filter_w( device_t *device, int data )
if (data & 2)
C += 47000; /* 47000pF = 0.047uF */
- dynamic_cast<filter_rc_device*>(device)->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 5100, 0, CAP_P(C));
+ downcast<filter_rc_device*>(device)->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 5100, 0, CAP_P(C));
}
diff --git a/src/mame/audio/timeplt.h b/src/mame/audio/timeplt.h
index abe88e3360c..98fab24a429 100644
--- a/src/mame/audio/timeplt.h
+++ b/src/mame/audio/timeplt.h
@@ -1,15 +1,18 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
+#ifndef MAME_AUDIO_TIMEPLT_H
+#define MAME_AUDIO_TIMEPLT_H
+
+#pragma once
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/flt_rc.h"
-class timeplt_audio_device : public device_t,
- public device_sound_interface
+class timeplt_audio_device : public device_t, public device_sound_interface
{
public:
timeplt_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~timeplt_audio_device() {}
DECLARE_WRITE8_MEMBER( sh_irqtrigger_w );
DECLARE_WRITE8_MEMBER( filter_w );
@@ -40,4 +43,6 @@ private:
MACHINE_CONFIG_EXTERN( timeplt_sound );
MACHINE_CONFIG_EXTERN( locomotn_sound );
-extern const device_type TIMEPLT_AUDIO;
+DECLARE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device)
+
+#endif // MAME_AUDIO_TIMEPLT_H
diff --git a/src/mame/audio/trackfld.cpp b/src/mame/audio/trackfld.cpp
index 389ec21479b..598d6775a0a 100644
--- a/src/mame/audio/trackfld.cpp
+++ b/src/mame/audio/trackfld.cpp
@@ -11,13 +11,13 @@
-const device_type TRACKFLD_AUDIO = device_creator<trackfld_audio_device>;
+DEFINE_DEVICE_TYPE(TRACKFLD_AUDIO, trackfld_audio_device, "trackfld_audio", "Track And Field Audio")
trackfld_audio_device::trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TRACKFLD_AUDIO, "Track And Field Audio", tag, owner, clock, "trackfld_audio", __FILE__),
- device_sound_interface(mconfig, *this),
- m_last_addr(0),
- m_last_irq(0)
+ : device_t(mconfig, TRACKFLD_AUDIO, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_last_addr(0)
+ , m_last_irq(0)
{
}
diff --git a/src/mame/audio/trackfld.h b/src/mame/audio/trackfld.h
index 908e28787de..c1819437b70 100644
--- a/src/mame/audio/trackfld.h
+++ b/src/mame/audio/trackfld.h
@@ -1,14 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Chris Hardy
+#ifndef MAME_AUDIO_TRACKFLD_H
+#define MAME_AUDIO_TRACKFLD_H
+
+#pragma once
+
#include "sound/vlm5030.h"
#include "cpu/m6800/m6800.h"
-class trackfld_audio_device : public device_t,
- public device_sound_interface
+class trackfld_audio_device : public device_t, public device_sound_interface
{
public:
trackfld_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~trackfld_audio_device() {}
DECLARE_WRITE8_MEMBER(konami_sh_irqtrigger_w );
DECLARE_READ8_MEMBER(trackfld_sh_timer_r );
@@ -34,4 +37,6 @@ private:
vlm5030_device *m_vlm;
};
-extern const device_type TRACKFLD_AUDIO;
+DECLARE_DEVICE_TYPE(TRACKFLD_AUDIO, trackfld_audio_device)
+
+#endif // MAME_AUDIO_TRACKFLD_H
diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp
index 379907093f6..8fa19efdb72 100644
--- a/src/mame/audio/turrett.cpp
+++ b/src/mame/audio/turrett.cpp
@@ -9,7 +9,7 @@
#include "emu.h"
#include "includes/turrett.h"
-const device_type TURRETT = device_creator<turrett_device>;
+DEFINE_DEVICE_TYPE(TURRETT, turrett_device, "ttsnd", "Turret Tower Sound")
//-------------------------------------------------
@@ -17,10 +17,10 @@ const device_type TURRETT = device_creator<turrett_device>;
//-------------------------------------------------
turrett_device::turrett_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TURRETT, "Turret Tower Sound", tag, owner, clock, "ttsnd", __FILE__),
- device_sound_interface(mconfig, *this),
- device_memory_interface(mconfig, *this),
- m_space_config("ttsound", ENDIANNESS_LITTLE, 16, 28, 0, nullptr)
+ : device_t(mconfig, TURRETT, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , device_memory_interface(mconfig, *this)
+ , m_space_config("ttsound", ENDIANNESS_LITTLE, 16, 28, 0, nullptr)
{
}
diff --git a/src/mame/audio/tvc.cpp b/src/mame/audio/tvc.cpp
index 693de81fb18..0c4a70d22b6 100644
--- a/src/mame/audio/tvc.cpp
+++ b/src/mame/audio/tvc.cpp
@@ -10,14 +10,14 @@
#include "tvc.h"
// device type definition
-const device_type TVC_SOUND = device_creator<tvc_sound_device>;
+DEFINE_DEVICE_TYPE(TVC_SOUND, tvc_sound_device, "tvc_sound", "TVC 64 Audio Custom")
//-------------------------------------------------
// tvc_sound_device - constructor
//-------------------------------------------------
tvc_sound_device::tvc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, TVC_SOUND, "TVC 64 Audio Custom", tag, owner, clock, "tvc_sound", __FILE__),
+ device_t(mconfig, TVC_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_write_sndint(*this)
{
diff --git a/src/mame/audio/tvc.h b/src/mame/audio/tvc.h
index 00fb29e899e..fed6d7f467c 100644
--- a/src/mame/audio/tvc.h
+++ b/src/mame/audio/tvc.h
@@ -6,10 +6,10 @@
*
****************************************************************************/
-#pragma once
+#ifndef MAME_AUDIO_TVC_H
+#define MAME_AUDIO_TVC_H
-#ifndef _TVC_SND_H_
-#define _TVC_SND_H_
+#pragma once
#define MCFG_TVC_SOUND_SNDINT_CALLBACK(_write) \
devcb = &tvc_sound_device::set_sndint_wr_callback(*device, DEVCB_##_write);
@@ -20,14 +20,13 @@
// ======================> tvc_sound_device
-class tvc_sound_device : public device_t,
- public device_sound_interface
+class tvc_sound_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
tvc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_sndint_wr_callback(device_t &device, _Object object) { return downcast<tvc_sound_device &>(device).m_write_sndint.set_callback(object); }
+ template <class Object> static devcb_base &set_sndint_wr_callback(device_t &device, Object &&cb) { return downcast<tvc_sound_device &>(device).m_write_sndint.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE8_MEMBER(write);
void reset_divider();
@@ -55,5 +54,6 @@ private:
// device type definition
extern const device_type TVC_SOUND;
+DECLARE_DEVICE_TYPE(TVC_SOUND, tvc_sound_device)
-#endif
+#endif // MAME_AUDIO_TVC_H
diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp
index a8e3d53e4d1..f462fb20b31 100644
--- a/src/mame/audio/tx1.cpp
+++ b/src/mame/audio/tx1.cpp
@@ -7,9 +7,10 @@
***************************************************************************/
#include "emu.h"
+#include "includes/tx1.h"
+
#include "sound/ay8910.h"
#include "video/resnet.h"
-#include "includes/tx1.h"
/*************************************
@@ -51,16 +52,15 @@ static const double tx1_engine_gains[16] =
};
-const device_type TX1 = device_creator<tx1_sound_device>;
+DEFINE_DEVICE_TYPE(TX1, tx1_sound_device, "tx1_sound", "TX-1 Audio Custom")
tx1_sound_device::tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TX1, "TX-1 Audio Custom", tag, owner, clock, "tx1_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : tx1_sound_device(mconfig, TX1, tag, owner, clock)
{
}
-tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+tx1_sound_device::tx1_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_stream(nullptr),
m_freq_to_step(0),
@@ -335,10 +335,10 @@ static const double bb_engine_gains[16] =
-1.0/(1.0/(BUGGYBOY_R1S + BUGGYBOY_R2S + BUGGYBOY_R3S + BUGGYBOY_R4S) + 1.0/100e3)/100e3,
};
-const device_type BUGGYBOY = device_creator<buggyboy_sound_device>;
+DEFINE_DEVICE_TYPE(BUGGYBOY, buggyboy_sound_device, "buggyboy_sound", "Buggy Boy Audio Custom")
buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : tx1_sound_device(mconfig, BUGGYBOY, "Buggy Boy Audio Custom", tag, owner, clock, "buggyboy_sound", __FILE__)
+ : tx1_sound_device(mconfig, BUGGYBOY, tag, owner, clock)
{
}
diff --git a/src/mame/audio/vboy.cpp b/src/mame/audio/vboy.cpp
index 707fdf8ce3c..38755b9208e 100644
--- a/src/mame/audio/vboy.cpp
+++ b/src/mame/audio/vboy.cpp
@@ -11,7 +11,7 @@
#include "vboy.h"
// device type definition
-const device_type VBOYSND = device_creator<vboysnd_device>;
+DEFINE_DEVICE_TYPE(VBOYSND, vboysnd_device, "vboysnd", "Virtual Boy Audio")
//#define LAME_COMPILER_BUG
@@ -196,8 +196,8 @@ static inline void mputb(uint8_t *ptr, int8_t data) { *ptr = data; }
//-------------------------------------------------
vboysnd_device::vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VBOYSND, "Virtual Boy audio", tag, owner, clock, "vboysnd", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, VBOYSND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
diff --git a/src/mame/audio/vboy.h b/src/mame/audio/vboy.h
index fce19d5b5b4..72793b66404 100644
--- a/src/mame/audio/vboy.h
+++ b/src/mame/audio/vboy.h
@@ -6,72 +6,33 @@
By Richard Bannister and Gil Pedersen.
MESS device adaptation by R. Belmont
*/
+#ifndef MAME_AUDIO_VBOY_H
+#define MAME_AUDIO_VBOY_H
#pragma once
-#ifndef __VBOY_SND_H__
-#define __VBOY_SND_H__
-
-//**************************************************************************
-// CONSTANTS
-//**************************************************************************
-
-#define AUDIO_FREQ 44100
-#define CHANNELS 4
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
#define MCFG_VBOYSND_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, VBOYSND, AUDIO_FREQ)
+ MCFG_DEVICE_ADD(_tag, VBOYSND, vboysnd_device::AUDIO_FREQ)
#define MCFG_VBOYSND_REPLACE(_tag) \
- MCFG_DEVICE_REPLACE(_tag, VBOYSND, AUDIO_FREQ)
+ MCFG_DEVICE_REPLACE(_tag, VBOYSND, vboysnd_device::AUDIO_FREQ)
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
-struct s_snd_channel {
- int8_t playing; // the sound is playing
-
- // state when sound was enabled
- uint32_t env_steptime; // Envelope step time
- uint8_t env0; // Envelope data
- uint8_t env1; // Envelope data
- uint8_t volLeft; // Left output volume
- uint8_t volRight; // Right output volume
- uint8_t sample[580]; // sample to play
- int sample_len; // length of sample
-
- // values that change, as the sample is played
- int offset; // current offset in sample
- int time; // the duration that this sample is to be played
- uint8_t envelope; // Current envelope level (604)
- int env_time; // The duration between envelope decay/grow (608)
-};
-
-struct s_regchan {
- int32_t sINT;
- int32_t sLRV;
- int32_t sFQL;
- int32_t sFQH;
- int32_t sEV0;
- int32_t sEV1;
- int32_t sRAM;
-};
-
-struct s_sreg {
- // Sound registers structure
- s_regchan c[4];
-};
-
// ======================> vboysnd_device
class vboysnd_device : public device_t, public device_sound_interface
{
public:
+ static constexpr unsigned AUDIO_FREQ = 44100;
+
// construction/destruction
vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -81,6 +42,42 @@ public:
sound_stream *m_stream;
protected:
+ static constexpr unsigned CHANNELS = 4;
+
+ struct s_snd_channel {
+ int8_t playing; // the sound is playing
+
+ // state when sound was enabled
+ uint32_t env_steptime; // Envelope step time
+ uint8_t env0; // Envelope data
+ uint8_t env1; // Envelope data
+ uint8_t volLeft; // Left output volume
+ uint8_t volRight; // Right output volume
+ uint8_t sample[580]; // sample to play
+ int sample_len; // length of sample
+
+ // values that change, as the sample is played
+ int offset; // current offset in sample
+ int time; // the duration that this sample is to be played
+ uint8_t envelope; // Current envelope level (604)
+ int env_time; // The duration between envelope decay/grow (608)
+ };
+
+ struct s_regchan {
+ int32_t sINT;
+ int32_t sLRV;
+ int32_t sFQL;
+ int32_t sFQH;
+ int32_t sEV0;
+ int32_t sEV1;
+ int32_t sRAM;
+ };
+
+ struct s_sreg {
+ // Sound registers structure
+ s_regchan c[4];
+ };
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -100,6 +97,6 @@ protected:
};
// device type definition
-extern const device_type VBOYSND;
+DECLARE_DEVICE_TYPE(VBOYSND, vboysnd_device)
-#endif //__VBOY_SND_H__
+#endif //MAME_AUDIO_VBOY_H
diff --git a/src/mame/audio/vc4000.cpp b/src/mame/audio/vc4000.cpp
index cb00aa57d8c..3d0b921fd32 100644
--- a/src/mame/audio/vc4000.cpp
+++ b/src/mame/audio/vc4000.cpp
@@ -11,17 +11,17 @@
#include "vc4000.h"
-const device_type VC4000_SND = device_creator<vc4000_sound_device>;
+DEFINE_DEVICE_TYPE(VC4000_SND, vc4000_sound_device, "vc4000_sound", "Interton Electronic VC 4000 Audio Custom")
vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VC4000_SND, "Intertion Electronic VC 4000 Audio Custom", tag, owner, clock, "vc4000_sound", __FILE__),
- device_sound_interface(mconfig, *this),
- m_channel(nullptr),
- m_size(0),
- m_pos(0),
- m_level(0)
+ : device_t(mconfig, VC4000_SND, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_channel(nullptr)
+ , m_reg{ 0 }
+ , m_size(0)
+ , m_pos(0)
+ , m_level(0)
{
- memset(m_reg, 0, sizeof(uint8_t)*1);
}
diff --git a/src/mame/audio/vc4000.h b/src/mame/audio/vc4000.h
index ab62a5e5965..e906dc601c4 100644
--- a/src/mame/audio/vc4000.h
+++ b/src/mame/audio/vc4000.h
@@ -6,9 +6,10 @@
*
****************************************************************************/
-#ifndef _VC4000SND_H_
-#define _VC4000SND_H_
+#ifndef MAME_AUDIO_VC4000_H
+#define MAME_AUDIO_VC4000_H
+#pragma once
//**************************************************************************
// TYPE DEFINITIONS
@@ -16,8 +17,7 @@
// ======================> vc4000_sound_device
-class vc4000_sound_device : public device_t,
- public device_sound_interface
+class vc4000_sound_device : public device_t, public device_sound_interface
{
public:
vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -41,6 +41,6 @@ private:
unsigned m_level;
};
-extern const device_type VC4000_SND;
+DECLARE_DEVICE_TYPE(VC4000_SND, vc4000_sound_device)
-#endif /* _VC4000SND_H_ */
+#endif // MAME_AUDIO_VC4000_H
diff --git a/src/mame/audio/vicdual-97271p.cpp b/src/mame/audio/vicdual-97271p.cpp
index bf46df5b6e1..1819ef96e90 100644
--- a/src/mame/audio/vicdual-97271p.cpp
+++ b/src/mame/audio/vicdual-97271p.cpp
@@ -17,7 +17,7 @@ for the time being this is a simple sample player based on the work by MASH.
// GLOBAL VARIABLES
//**************************************************************************
-const device_type S97271P = device_creator<s97271p_device>;
+DEFINE_DEVICE_TYPE(S97271P, s97271p_device, "s97271p", "N-Sub Oscillator 97271-P")
/* bit definitions - sound effect drive outputs */
#define S97271P_WARNING 0x01
@@ -91,7 +91,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
s97271p_device::s97271p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, S97271P, "N-Sub Oscillator 97271-P", tag, owner, clock, "s97271p", __FILE__),
+ device_t(mconfig, S97271P, tag, owner, clock),
m_samples(*this, "samples")
{
}
diff --git a/src/mame/audio/vicdual-97271p.h b/src/mame/audio/vicdual-97271p.h
index 7098724f326..78bce842084 100644
--- a/src/mame/audio/vicdual-97271p.h
+++ b/src/mame/audio/vicdual-97271p.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Ariane Fugmann
-#pragma once
-
#ifndef MAME_AUDIO_VICDUAL_97271P_H
#define MAME_AUDIO_VICDUAL_97271P_H
+#pragma once
+
#include "sound/samples.h"
#define MCFG_S97271P_ADD(_tag ) \
@@ -38,6 +38,6 @@ private:
};
// device type definition
-extern const device_type S97271P;
+DECLARE_DEVICE_TYPE(S97271P, s97271p_device)
-#endif /* MAME_AUDIO_VICDUAL_97271P_H */
+#endif // MAME_AUDIO_VICDUAL_97271P_H
diff --git a/src/mame/audio/warpwarp.cpp b/src/mame/audio/warpwarp.cpp
index 301a99de38c..bd8490e49b7 100644
--- a/src/mame/audio/warpwarp.cpp
+++ b/src/mame/audio/warpwarp.cpp
@@ -16,10 +16,10 @@
#define CLOCK_1V (18432000/3/2/384)
-const device_type WARPWARP = device_creator<warpwarp_sound_device>;
+DEFINE_DEVICE_TYPE(WARPWARP, warpwarp_sound_device, "warpwarp_sound", "Warp Warp Audio Custom")
warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WARPWARP, "Warp Warp Audio Custom", tag, owner, clock, "warpwarp_sound", __FILE__),
+ : device_t(mconfig, WARPWARP, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_decay(nullptr),
m_channel(nullptr),
diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h
index a4e96df0dde..9cf2343e1bd 100644
--- a/src/mame/audio/warpwarp.h
+++ b/src/mame/audio/warpwarp.h
@@ -1,8 +1,12 @@
// license:BSD-3-Clause
// copyright-holders:Allard van der Bas
+#ifndef MAME_AUDIO_WARPWARP_H
+#define MAME_AUDIO_WARPWARP_H
-class warpwarp_sound_device : public device_t,
- public device_sound_interface
+#pragma once
+
+
+class warpwarp_sound_device : public device_t, public device_sound_interface
{
public:
warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -48,4 +52,6 @@ private:
int m_mcount;
};
-extern const device_type WARPWARP;
+DECLARE_DEVICE_TYPE(WARPWARP, warpwarp_sound_device)
+
+#endif // MAME_AUDIO_WARPWARP_H
diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp
index 8b5021daeb4..9095683eae1 100644
--- a/src/mame/audio/williams.cpp
+++ b/src/mame/audio/williams.cpp
@@ -56,9 +56,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type WILLIAMS_NARC_SOUND = device_creator<williams_narc_sound_device>;
-const device_type WILLIAMS_CVSD_SOUND = device_creator<williams_cvsd_sound_device>;
-const device_type WILLIAMS_ADPCM_SOUND = device_creator<williams_adpcm_sound_device>;
+DEFINE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device, "wmscvsd", "Williams CVSD Sound Board")
+DEFINE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device, "wmsnarc", "Williams NARC Sound Board")
+DEFINE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device, "wmsadpcm", "Williams ADPCM Sound Board")
@@ -71,7 +71,7 @@ const device_type WILLIAMS_ADPCM_SOUND = device_creator<williams_adpcm_sound_dev
//-------------------------------------------------
williams_cvsd_sound_device::williams_cvsd_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WILLIAMS_CVSD_SOUND, "Williams CVSD Sound Board", tag, owner, clock, "wmscvsd", __FILE__),
+ : device_t(mconfig, WILLIAMS_CVSD_SOUND, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_pia(*this, "pia"),
@@ -305,7 +305,7 @@ void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id
//-------------------------------------------------
williams_narc_sound_device::williams_narc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WILLIAMS_NARC_SOUND, "Williams NARC Sound Board", tag, owner, clock, "wmsnarc", __FILE__),
+ : device_t(mconfig, WILLIAMS_NARC_SOUND, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu0(*this, "cpu0"),
m_cpu1(*this, "cpu1"),
@@ -678,7 +678,7 @@ void williams_narc_sound_device::device_timer(emu_timer &timer, device_timer_id
//-------------------------------------------------
williams_adpcm_sound_device::williams_adpcm_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WILLIAMS_ADPCM_SOUND, "Williams ADPCM Sound Board", tag, owner, clock, "wmsadpcm", __FILE__),
+ : device_t(mconfig, WILLIAMS_ADPCM_SOUND, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
m_latch(0),
@@ -832,7 +832,7 @@ static MACHINE_CONFIG_FRAGMENT( williams_adpcm_sound )
MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
- MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", ADPCM_MASTER_CLOCK/8, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, williams_adpcm_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, DEVICE_SELF_OWNER, 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/williams.h b/src/mame/audio/williams.h
index be8de0b0765..3171ef57361 100644
--- a/src/mame/audio/williams.h
+++ b/src/mame/audio/williams.h
@@ -20,9 +20,9 @@
// GLOBAL VARIABLES
//**************************************************************************
-extern const device_type WILLIAMS_NARC_SOUND;
-extern const device_type WILLIAMS_CVSD_SOUND;
-extern const device_type WILLIAMS_ADPCM_SOUND;
+DECLARE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device)
+DECLARE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device)
+DECLARE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device)
diff --git a/src/mame/audio/wiping.cpp b/src/mame/audio/wiping.cpp
index cd518d9e567..7618ce74ce9 100644
--- a/src/mame/audio/wiping.cpp
+++ b/src/mame/audio/wiping.cpp
@@ -11,14 +11,14 @@
#include "emu.h"
#include "audio/wiping.h"
-static const int samplerate = 48000;
-static const int defgain = 48;
+static constexpr int samplerate = 48000;
+static constexpr int defgain = 48;
-const device_type WIPING = device_creator<wiping_sound_device>;
+DEFINE_DEVICE_TYPE(WIPING, wiping_sound_device, "wiping_sound", "Wiping Audio Custom")
wiping_sound_device::wiping_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WIPING, "Wiping Audio Custom", tag, owner, clock, "wiping_sound", __FILE__),
- device_sound_interface(mconfig, *this),
+ : device_t(mconfig, WIPING, tag, owner, clock),
+ device_sound_interface(mconfig, *this),
m_last_channel(nullptr),
m_sound_prom(nullptr),
m_sound_rom(nullptr),
diff --git a/src/mame/audio/wiping.h b/src/mame/audio/wiping.h
index 5c9df701148..11924852bd9 100644
--- a/src/mame/audio/wiping.h
+++ b/src/mame/audio/wiping.h
@@ -1,25 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Allard van der Bas
-/* 8 voices max */
-#define MAX_VOICES 8
+#ifndef MAME_AUDIO_WIPING_H
+#define MAME_AUDIO_WIPING_H
-/* this structure defines the parameters for a channel */
-struct wp_sound_channel
-{
- int frequency;
- int counter;
- int volume;
- const uint8_t *wave;
- int oneshot;
- int oneshotplaying;
-};
+#pragma once
-class wiping_sound_device : public device_t,
- public device_sound_interface
+class wiping_sound_device : public device_t, public device_sound_interface
{
public:
wiping_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~wiping_sound_device() {}
DECLARE_WRITE8_MEMBER( sound_w );
@@ -31,6 +20,20 @@ protected:
virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
private:
+ /* 8 voices max */
+ static constexpr unsigned MAX_VOICES = 8;
+
+ /* this structure defines the parameters for a channel */
+ struct wp_sound_channel
+ {
+ int frequency;
+ int counter;
+ int volume;
+ const uint8_t *wave;
+ int oneshot;
+ int oneshotplaying;
+ };
+
// internal state
/* data about the sound system */
@@ -55,4 +58,6 @@ private:
void make_mixer_table(int voices, int gain);
};
-extern const device_type WIPING;
+DECLARE_DEVICE_TYPE(WIPING, wiping_sound_device)
+
+#endif // MAME_AUDIO_WIPING_H
diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp
index 481ca882529..508d89cf027 100644
--- a/src/mame/audio/wpcsnd.cpp
+++ b/src/mame/audio/wpcsnd.cpp
@@ -14,18 +14,18 @@
#define LOG_WPCSND (0)
-const device_type WPCSND = device_creator<wpcsnd_device>;
+DEFINE_DEVICE_TYPE(WPCSND, wpcsnd_device, "wpcsnd", "Williams WPC Sound")
wpcsnd_device::wpcsnd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig,WPCSND,"Williams WPC Sound",tag,owner,clock, "wpcsnd", __FILE__),
- device_mixer_interface(mconfig, *this),
- m_cpu(*this, "bgcpu"),
- m_ym2151(*this, "ym2151"),
- m_hc55516(*this, "hc55516"),
- m_cpubank(*this, "rombank"),
- m_fixedbank(*this, "fixed"),
- m_rom(*this, finder_base::DUMMY_TAG),
- m_reply_cb(*this)
+ : device_t(mconfig, WPCSND, tag, owner, clock)
+ , device_mixer_interface(mconfig, *this)
+ , m_cpu(*this, "bgcpu")
+ , m_ym2151(*this, "ym2151")
+ , m_hc55516(*this, "hc55516")
+ , m_cpubank(*this, "rombank")
+ , m_fixedbank(*this, "fixed")
+ , m_rom(*this, finder_base::DUMMY_TAG)
+ , m_reply_cb(*this)
{
}
diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h
index f0eab0ce220..74dfd752ea0 100644
--- a/src/mame/audio/wpcsnd.h
+++ b/src/mame/audio/wpcsnd.h
@@ -6,8 +6,10 @@
* Created on: 4/10/2013
*/
-#ifndef WPCSND_H_
-#define WPCSND_H_
+#ifndef MAME_AUDIO_WPCSND_H
+#define MAME_AUDIO_WPCSND_H
+
+#pragma once
#include "cpu/m6809/m6809.h"
#include "sound/ym2151.h"
@@ -51,7 +53,7 @@ public:
static void static_set_romregion(device_t &device, const char *tag);
// callbacks
- template<class _reply> void set_reply_callback(_reply reply) { m_reply_cb.set_callback(reply); }
+ template <class Reply> void set_reply_callback(Reply &&cb) { m_reply_cb.set_callback(std::forward<Reply>(cb)); }
protected:
// overrides
@@ -68,6 +70,6 @@ private:
devcb_write_line m_reply_cb;
};
-extern const device_type WPCSND;
+DECLARE_DEVICE_TYPE(WPCSND, wpcsnd_device)
-#endif /* WPCSND_H_ */
+#endif // MAME_AUDIO_WPCSND_H
diff --git a/src/mame/audio/wswan.cpp b/src/mame/audio/wswan.cpp
index 1459acdc390..acd698eea1c 100644
--- a/src/mame/audio/wswan.cpp
+++ b/src/mame/audio/wswan.cpp
@@ -18,7 +18,7 @@ The noise taps and behavior are the same as the Virtual Boy.
// device type definition
-const device_type WSWAN_SND = device_creator<wswan_sound_device>;
+DEFINE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device, "wswan_sound", "WonderSwan Audio Custom")
//**************************************************************************
@@ -30,7 +30,7 @@ const device_type WSWAN_SND = device_creator<wswan_sound_device>;
//-------------------------------------------------
wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WSWAN_SND, "WonderSwan Audio Custom", tag, owner, clock, "wswan_sound", __FILE__),
+ : device_t(mconfig, WSWAN_SND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
m_sweep_step(0),
diff --git a/src/mame/audio/wswan.h b/src/mame/audio/wswan.h
index 8d957e80b5e..96ea8a0b416 100644
--- a/src/mame/audio/wswan.h
+++ b/src/mame/audio/wswan.h
@@ -6,10 +6,10 @@
*
****************************************************************************/
-#pragma once
+#ifndef MAME_AUDIO_WSWAN_H
+#define MAME_AUDIO_WSWAN_H
-#ifndef _WSWAN_SND_H_
-#define _WSWAN_SND_H_
+#pragma once
//**************************************************************************
@@ -85,6 +85,6 @@ private:
uint8_t m_master_volume; /* Master volume */
};
-extern const device_type WSWAN_SND;
+DECLARE_DEVICE_TYPE(WSWAN_SND, wswan_sound_device)
-#endif
+#endif // MAME_AUDIO_WSWAN_H
diff --git a/src/mame/audio/zaccaria.cpp b/src/mame/audio/zaccaria.cpp
index b880608fd48..805d7326090 100644
--- a/src/mame/audio/zaccaria.cpp
+++ b/src/mame/audio/zaccaria.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Vas Crabb
#include "emu.h"
#include "audio/zaccaria.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/clock.h"
#include "machine/rescap.h"
@@ -13,8 +14,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-device_type const ZACCARIA_1B11107 = device_creator<zac1b11107_audio_device>;
-device_type const ZACCARIA_1B11142 = device_creator<zac1b11142_audio_device>;
+DEFINE_DEVICE_TYPE(ZACCARIA_1B11107, zac1b11107_audio_device, "zac1b11107", "Zaccaria 1B11107 Sound Board")
+DEFINE_DEVICE_TYPE(ZACCARIA_1B11142, zac1b11142_audio_device, "zac1b11142", "Zaccaria 1B11142 Sound Board")
@@ -239,13 +240,10 @@ INPUT_PORTS_END
zac1b111xx_melody_base::zac1b111xx_melody_base(
machine_config const &mconfig,
device_type devtype,
- char const *name,
char const *tag,
device_t *owner,
- uint32_t clock,
- char const *shortname,
- char const *source)
- : device_t(mconfig, devtype, name, tag, owner, clock, shortname, source)
+ u32 clock)
+ : device_t(mconfig, devtype, tag, owner, clock)
, device_mixer_interface(mconfig, *this, 1)
, m_melodycpu(*this, "melodycpu")
, m_melodypia(*this, "melodypia")
@@ -257,8 +255,8 @@ zac1b111xx_melody_base::zac1b111xx_melody_base(
READ8_MEMBER(zac1b111xx_melody_base::melodypia_porta_r)
{
- uint8_t const control = m_melodypia->b_output();
- uint8_t data = 0xff;
+ u8 const control = m_melodypia->b_output();
+ u8 data = 0xff;
if (0x01 == (control & 0x03))
data &= m_melodypsg1->data_r(space, 0);
@@ -271,7 +269,7 @@ READ8_MEMBER(zac1b111xx_melody_base::melodypia_porta_r)
WRITE8_MEMBER(zac1b111xx_melody_base::melodypia_porta_w)
{
- uint8_t const control = m_melodypia->b_output();
+ u8 const control = m_melodypia->b_output();
if (control & 0x02)
m_melodypsg1->data_address_w(space, (control >> 0) & 0x01, data);
@@ -310,8 +308,8 @@ void zac1b111xx_melody_base::device_reset()
// 1B11107-SPECIFIC IMPLEMENTATION
//**************************************************************************
-zac1b11107_audio_device::zac1b11107_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
- : zac1b111xx_melody_base(mconfig, ZACCARIA_1B11107, "Zaccaria 1B11107 Sound Board", tag, owner, clock, "zac1b11107", __FILE__)
+zac1b11107_audio_device::zac1b11107_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ : zac1b111xx_melody_base(mconfig, ZACCARIA_1B11107, tag, owner, clock)
{
}
@@ -364,8 +362,8 @@ machine_config_constructor zac1b11107_audio_device::device_mconfig_additions() c
// 1B11142-SPECIFIC IMPLEMENTATION
//**************************************************************************
-zac1b11142_audio_device::zac1b11142_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
- : zac1b111xx_melody_base(mconfig, ZACCARIA_1B11142, "Zaccaria 1B11142 Sound Board", tag, owner, clock, "zac1b11142", __FILE__)
+zac1b11142_audio_device::zac1b11142_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ : zac1b111xx_melody_base(mconfig, ZACCARIA_1B11142, tag, owner, clock)
, m_acs_cb(*this)
, m_audiocpu(*this, "audiocpu")
, m_pia_1i(*this, "pia_1i")
diff --git a/src/mame/audio/zaccaria.h b/src/mame/audio/zaccaria.h
index 3b77bb0e637..4b6da268517 100644
--- a/src/mame/audio/zaccaria.h
+++ b/src/mame/audio/zaccaria.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
-#pragma once
+#ifndef MAME_AUDIO_ZACCARIA_H
+#define MAME_AUDIO_ZACCARIA_H
-#ifndef __AUDIO_ZACCARIA_H__
-#define __AUDIO_ZACCARIA_H__
+#pragma once
#include "machine/6821pia.h"
#include "machine/netlist.h"
@@ -15,8 +15,8 @@
// GLOBAL VARIABLES
//**************************************************************************
-extern device_type const ZACCARIA_1B11107;
-extern device_type const ZACCARIA_1B11142;
+DECLARE_DEVICE_TYPE(ZACCARIA_1B11107, zac1b11107_audio_device)
+DECLARE_DEVICE_TYPE(ZACCARIA_1B11142, zac1b11142_audio_device)
@@ -36,22 +36,19 @@ extern device_type const ZACCARIA_1B11142;
class zac1b111xx_melody_base : public device_t, public device_mixer_interface
{
public:
- zac1b111xx_melody_base(
- machine_config const &mconfig,
- device_type devtype,
- char const *name,
- char const *tag,
- device_t *owner,
- uint32_t clock,
- char const *shortname,
- char const *source);
-
DECLARE_READ8_MEMBER(melodypia_porta_r);
DECLARE_WRITE8_MEMBER(melodypia_porta_w);
DECLARE_WRITE8_MEMBER(melodypia_portb_w);
DECLARE_READ8_MEMBER(melodypsg1_portb_r);
protected:
+ zac1b111xx_melody_base(
+ machine_config const &mconfig,
+ device_type devtype,
+ char const *tag,
+ device_t *owner,
+ u32 clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -60,14 +57,14 @@ protected:
required_device<ay8910_device> m_melodypsg1;
required_device<ay8910_device> m_melodypsg2;
- uint8_t m_melody_command;
+ u8 m_melody_command;
};
class zac1b11107_audio_device : public zac1b111xx_melody_base
{
public:
- zac1b11107_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ zac1b11107_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
// host interface
DECLARE_WRITE8_MEMBER(sound_w);
@@ -85,10 +82,10 @@ protected:
class zac1b11142_audio_device : public zac1b111xx_melody_base
{
public:
- template<class _Object> static devcb_base &static_set_acs_cb(device_t &device, _Object object)
- { return downcast<zac1b11142_audio_device &>(device).m_acs_cb.set_callback(object); }
+ template <class Object> static devcb_base &static_set_acs_cb(device_t &device, Object &&cb)
+ { return downcast<zac1b11142_audio_device &>(device).m_acs_cb.set_callback(std::forward<Object>(cb)); }
- zac1b11142_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ zac1b11142_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
// host interface
DECLARE_WRITE8_MEMBER(hs_w);
@@ -114,15 +111,15 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- devcb_write_line m_acs_cb;
+ devcb_write_line m_acs_cb;
required_device<cpu_device> m_audiocpu;
required_device<pia6821_device> m_pia_1i;
required_device<tms5220_device> m_speech;
- required_ioport m_inputs;
+ required_ioport m_inputs;
- uint8_t m_host_command;
+ u8 m_host_command;
};
#endif // __AUDIO_ZACCARIA_H__
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index 551d519d3ac..ff5e8c6383a 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -560,7 +560,7 @@ void _1942_state::machine_reset()
m_scroll[1] = 0;
}
-static MACHINE_CONFIG_START( 1942, _1942_state )
+static MACHINE_CONFIG_START( 1942 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */
@@ -628,7 +628,7 @@ static MACHINE_CONFIG_START( 1942, _1942_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( 1942p, _1942_state )
+static MACHINE_CONFIG_START( 1942p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index 76685cd365d..6a53e87a952 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -309,7 +309,7 @@ void _1943_state::machine_reset()
m_prot_value = 0;
}
-static MACHINE_CONFIG_START( 1943, _1943_state )
+static MACHINE_CONFIG_START( 1943 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index aef9295fd60..53f6550d03b 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -367,7 +367,7 @@ void k3_state::machine_start()
{
}
-static MACHINE_CONFIG_START( flagrall, k3_state )
+static MACHINE_CONFIG_START( flagrall )
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK ) // ?
MCFG_CPU_PROGRAM_MAP(flagrall_map)
@@ -388,7 +388,7 @@ static MACHINE_CONFIG_START( flagrall, k3_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
+ MCFG_OKIM6295_ADD("oki1", MASTER_CLOCK/16, PIN7_HIGH) /* dividers? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -398,7 +398,7 @@ static MACHINE_CONFIG_DERIVED( k3, flagrall )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(k3_map)
- MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* dividers? */
+ MCFG_OKIM6295_ADD("oki2", MASTER_CLOCK/16, PIN7_HIGH) /* dividers? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SCREEN_MODIFY("screen")
@@ -512,9 +512,8 @@ ROM_START( flagrall )
ROM_END
-GAME( 2000, 1945kiii, 0, k3, k3, driver_device, 0, ROT270, "Oriental Soft", "1945k III (newer, OPCX2 PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, 1945kiiin, 1945kiii, k3, k3, driver_device, 0, ROT270, "Oriental Soft", "1945k III (newer, OPCX1 PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, 1945kiiio, 1945kiii, k3, k3, driver_device, 0, ROT270, "Oriental Soft", "1945k III (older, OPCX1 PCB)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1996, flagrall, 0, flagrall, flagrall, driver_device, 0, ROT0, "Promat?", "'96 Flag Rally", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, 1945kiii, 0, k3, k3, k3_state, 0, ROT270, "Oriental Soft", "1945k III (newer, OPCX2 PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, 1945kiiin, 1945kiii, k3, k3, k3_state, 0, ROT270, "Oriental Soft", "1945k III (newer, OPCX1 PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, 1945kiiio, 1945kiii, k3, k3, k3_state, 0, ROT270, "Oriental Soft", "1945k III (older, OPCX1 PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, flagrall, 0, flagrall, flagrall, k3_state, 0, ROT0, "Promat?", "'96 Flag Rally", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index dce6c82f6cd..ce558dc56aa 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -389,7 +389,7 @@ INTERRUPT_GEN_MEMBER(_20pacgal_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE); // TODO: assert breaks the inputs in 25pacman test mode
}
-static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state )
+static MACHINE_CONFIG_START( 20pacgal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, MAIN_CPU_CLOCK)
@@ -417,7 +417,7 @@ static MACHINE_CONFIG_START( 20pacgal, _20pacgal_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( 25pacman, 20pacgal, _25pacman_state )
+static MACHINE_CONFIG_DERIVED( 25pacman, 20pacgal )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -534,8 +534,8 @@ DRIVER_INIT_MEMBER(_20pacgal_state,25pacman)
*
*************************************/
-GAME( 2006, 25pacman, 0, 25pacman, 25pacman, _20pacgal_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 3.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 2005, 25pacmano, 25pacman, 20pacgal, 25pacmano,_20pacgal_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 2.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
+GAME( 2006, 25pacman, 0, 25pacman, 25pacman, _25pacman_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 3.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 2005, 25pacmano, 25pacman, 20pacgal, 25pacmano,_25pacman_state, 25pacman, ROT90, "Namco / Cosmodog", "Pac-Man - 25th Anniversary Edition (Rev 2.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
GAME( 2000, 20pacgal, 0, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.08)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
GAME( 2000, 20pacgalr4, 20pacgal, 20pacgal, 20pacgal, _20pacgal_state, 20pacgal, ROT90, "Namco / Cosmodog", "Ms. Pac-Man/Galaga - 20th Anniversary Class of 1981 Reunion (V1.04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp
index 9d84a16ac8a..4d1cd57249a 100644
--- a/src/mame/drivers/24cdjuke.cpp
+++ b/src/mame/drivers/24cdjuke.cpp
@@ -273,7 +273,7 @@ void midcoin24cdjuke_state::machine_reset()
}
-static MACHINE_CONFIG_START( midcoin24cdjuke, midcoin24cdjuke_state )
+static MACHINE_CONFIG_START( midcoin24cdjuke )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(midcoin24cdjuke_map)
@@ -313,4 +313,4 @@ ROM_START( 24cdjuke )
ROM_END
-GAME( 1988, 24cdjuke, 0, midcoin24cdjuke, midcoin24cdjuke, driver_device, 0, ROT0, "Midcoin", "Midcoin Juke Box 24CD", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // what name was it sold under? name is from the PCB text
+GAME( 1988, 24cdjuke, 0, midcoin24cdjuke, midcoin24cdjuke, midcoin24cdjuke_state, 0, ROT0, "Midcoin", "Midcoin Juke Box 24CD", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // what name was it sold under? name is from the PCB text
diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp
index 201ad89c7f3..30746694ebe 100644
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@@ -445,7 +445,7 @@ MACHINE_RESET_MEMBER(_2mindril_state,drill)
m_irq_reg = 0;
}
-static MACHINE_CONFIG_START( drill, _2mindril_state )
+static MACHINE_CONFIG_START( drill )
MCFG_CPU_ADD("maincpu", M68000, 16000000 )
MCFG_CPU_PROGRAM_MAP(drill_map)
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index 264603adad2..a54d5af72d6 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -237,7 +237,7 @@ void namco_30test_state::machine_reset()
}
-static MACHINE_CONFIG_START( 30test, namco_30test_state )
+static MACHINE_CONFIG_START( 30test )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MC68HC11,MAIN_CLOCK/4)
@@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( 30test, namco_30test_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -269,4 +269,4 @@ ROM_START( 30test )
ROM_LOAD( "tt1-voi0.7p", 0x0000, 0x80000, CRC(b4fc5921) SHA1(92a88d5adb50dae48715847f12e88a35e37ef78c) )
ROM_END
-GAMEL( 1997, 30test, 0, 30test, 30test, driver_device, 0, ROT0, "Namco", "30 Test (Remake)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK, layout_30test )
+GAMEL( 1997, 30test, 0, 30test, 30test, namco_30test_state, 0, ROT0, "Namco", "30 Test (Remake)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK, layout_30test )
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp
index 49cd262b39b..45e24a02733 100644
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@@ -1572,7 +1572,7 @@ MACHINE_START_MEMBER(_39in1_state,60in1)
pxa255_start();
}
-static MACHINE_CONFIG_START( 39in1, _39in1_state )
+static MACHINE_CONFIG_START( 39in1 )
MCFG_CPU_ADD("maincpu", PXA255, 200000000)
MCFG_CPU_PROGRAM_MAP(39in1_map)
@@ -1718,11 +1718,11 @@ ROM_START( 19in1 )
ROM_LOAD16_WORD_SWAP( "19in1_eeprom.bin", 0x000, 0x200, NO_DUMP )
ROM_END
-GAME(2004, 4in1a, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 1, ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 4in1b, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 19in1, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "19 in 1 MAME bootleg", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 39in1, 0, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "39 in 1 MAME bootleg", MACHINE_IMPERFECT_SOUND)
-GAME(2004, 48in1, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 1, ver 3.09)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 4in1a, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 1, ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 4in1b, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "4 in 1 MAME bootleg (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 19in1, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "19 in 1 MAME bootleg", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 39in1, 0, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "39 in 1 MAME bootleg", MACHINE_IMPERFECT_SOUND)
+GAME(2004, 48in1, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 1, ver 3.09)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
GAME(2004, 48in1b, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 2, ver 3.09, alt flash)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 48in1a, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 3, ver 3.02)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 60in1, 39in1, 60in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "60 in 1 MAME bootleg (ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 48in1a, 39in1, 39in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "48 in 1 MAME bootleg (set 3, ver 3.02)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 60in1, 39in1, 60in1, 39in1, _39in1_state, 39in1, ROT270, "bootleg", "60 in 1 MAME bootleg (ver 3.00)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp
index db5db112604..0aba64cf887 100644
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@@ -154,7 +154,7 @@ void _3do_state::machine_reset()
m_clio.cstatbits = 0x01; /* bit 0 = reset of clio caused by power on */
}
-static MACHINE_CONFIG_START( 3do, _3do_state )
+static MACHINE_CONFIG_START( 3do )
/* Basic machine hardware */
MCFG_CPU_ADD( "maincpu", ARM7_BE, XTAL_50MHz/4 )
@@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( 3do, _3do_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( 3do_pal, _3do_state )
+static MACHINE_CONFIG_START( 3do_pal )
/* Basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7_BE, XTAL_50MHz/4 )
@@ -248,9 +248,9 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1991, 3do, 0, 0, 3do, 3do, driver_device, 0, "The 3DO Company", "3DO (NTSC)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-CONS( 1991, 3do_pal, 3do, 0, 3do_pal, 3do, driver_device, 0, "The 3DO Company", "3DO (PAL)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1991, 3do, 0, 0, 3do, 3do, _3do_state, 0, "The 3DO Company", "3DO (NTSC)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 1991, 3do_pal, 3do, 0, 3do_pal, 3do, _3do_state, 0, "The 3DO Company", "3DO (PAL)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1991, 3dobios, 0, 3do, 3do, driver_device, 0, ROT0, "The 3DO Company", "3DO Bios", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT )
-GAME( 199?, orbatak, 3dobios,3do, 3do, driver_device, 0, ROT0, "<unknown>", "Orbatak (prototype)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1991, 3dobios, 0, 3do, 3do, _3do_state, 0, ROT0, "The 3DO Company", "3DO Bios", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT )
+GAME( 199?, orbatak, 3dobios,3do, 3do, _3do_state, 0, ROT0, "<unknown>", "Orbatak (prototype)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index 814333ff455..7b9cb8ab12f 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -382,7 +382,7 @@ void _3x3puzzle_state::machine_reset()
}
-static MACHINE_CONFIG_START( _3x3puzzle, _3x3puzzle_state )
+static MACHINE_CONFIG_START( _3x3puzzle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,MAIN_CLOCK)
@@ -404,7 +404,7 @@ static MACHINE_CONFIG_START( _3x3puzzle, _3x3puzzle_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -503,6 +503,6 @@ ROM_END
-GAME( 1998, 3x3puzzl, 0, _3x3puzzle, _3x3puzzle, driver_device, 0, ROT0, "Ace Enterprise", "3X3 Puzzle (Enterprise)", MACHINE_SUPPORTS_SAVE ) // 1998. 5. 28
-GAME( 1998, 3x3puzzla, 3x3puzzl, _3x3puzzle, _3x3puzzle, driver_device, 0, ROT0, "Ace Enterprise", "3X3 Puzzle (Normal)", MACHINE_SUPPORTS_SAVE ) // 1998. 5. 28
-GAME( 199?, casanova, 0, _3x3puzzle, casanova, driver_device, 0, ROT0, "Promat", "Casanova", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, 3x3puzzl, 0, _3x3puzzle, _3x3puzzle, _3x3puzzle_state, 0, ROT0, "Ace Enterprise", "3X3 Puzzle (Enterprise)", MACHINE_SUPPORTS_SAVE ) // 1998. 5. 28
+GAME( 1998, 3x3puzzla, 3x3puzzl, _3x3puzzle, _3x3puzzle, _3x3puzzle_state, 0, ROT0, "Ace Enterprise", "3X3 Puzzle (Normal)", MACHINE_SUPPORTS_SAVE ) // 1998. 5. 28
+GAME( 199?, casanova, 0, _3x3puzzle, casanova, _3x3puzzle_state, 0, ROT0, "Promat", "Casanova", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index db89509ff84..c9cb98538cb 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -142,7 +142,7 @@ void nixieclock_state::machine_start()
save_pointer(NAME(m_nixie), 6);
}
-static MACHINE_CONFIG_START( 4004clk, nixieclock_state )
+static MACHINE_CONFIG_START( 4004clk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I4004, XTAL_5MHz / 8)
@@ -185,5 +185,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-SYST( 2008, 4004clk, 0, 0, 4004clk, 4004clk, driver_device, 0, "John L. Weinrich", "4004 Nixie Clock", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+SYST( 2008, 4004clk, 0, 0, 4004clk, 4004clk, nixieclock_state, 0, "John L. Weinrich", "4004 Nixie Clock", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp
index 4ab8a49dc7f..a3ebd11ea5d 100644
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@@ -1046,7 +1046,7 @@ MACHINE_RESET_MEMBER(fortyl_state,undoukai)
}
}
-static MACHINE_CONFIG_START( 40love, fortyl_state )
+static MACHINE_CONFIG_START( 40love )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,8000000/2) /* OK */
@@ -1105,7 +1105,7 @@ static MACHINE_CONFIG_START( 40love, fortyl_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( undoukai, fortyl_state )
+static MACHINE_CONFIG_START( undoukai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,8000000/2)
@@ -1279,6 +1279,6 @@ ROM_START( undoukai )
ROM_LOAD( "a17-18.23v", 0x0c00, 0x0400, CRC(3023a1da) SHA1(08ce4c6e99d04b358d66f0588852311d07183619) ) /* ??? */
ROM_END
-GAME( 1984, 40love, 0, 40love, 40love, fortyl_state, 40love, ROT0, "Taito Corporation", "Forty-Love", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1984, fieldday, 0, undoukai, undoukai, fortyl_state, undoukai, ROT0, "Taito Corporation", "Field Day", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, 40love, 0, 40love, 40love, fortyl_state, 40love, ROT0, "Taito Corporation", "Forty-Love", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, fieldday, 0, undoukai, undoukai, fortyl_state, undoukai, ROT0, "Taito Corporation", "Field Day", MACHINE_SUPPORTS_SAVE )
GAME( 1984, undoukai, fieldday, undoukai, undoukai, fortyl_state, undoukai, ROT0, "Taito Corporation", "The Undoukai (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp
index b7d359fc845..47603c27db2 100644
--- a/src/mame/drivers/4dpi.cpp
+++ b/src/mame/drivers/4dpi.cpp
@@ -227,7 +227,7 @@ ADDRESS_MAP_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( sgi_ip6, sgi_ip6_state )
+static MACHINE_CONFIG_START( sgi_ip6 )
MCFG_CPU_ADD( "maincpu", R3041, 20000000 ) // FIXME: Should be R2000
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
MCFG_CPU_PROGRAM_MAP( sgi_ip6_map )
@@ -265,5 +265,5 @@ ROM_START( sgi_ip6 )
ROM_LOAD( "4d202031.bin", 0x000000, 0x040000, CRC(065a290a) SHA1(6f5738e79643f94901e6efe3612468d14177f65b) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1988, sgi_ip6, 0, 0, sgi_ip6, sgi_ip6, sgi_ip6_state, sgi_ip6, "Silicon Graphics Inc", "4D/PI (R2000, 20MHz)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1988, sgi_ip6, 0, 0, sgi_ip6, sgi_ip6, sgi_ip6_state, sgi_ip6, "Silicon Graphics Inc", "4D/PI (R2000, 20MHz)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 7651be0d2d6..93adb57bde7 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -258,10 +258,10 @@ const tiny_rom_entry *isa8_cga_4enlinea_device::device_rom_region() const
return nullptr;
}
-const device_type ISA8_CGA_4ENLINEA = device_creator<isa8_cga_4enlinea_device>;
+DEFINE_DEVICE_TYPE(ISA8_CGA_4ENLINEA, isa8_cga_4enlinea_device, "4enlinea_cga", "ISA8 CGA - 4enlinea")
isa8_cga_4enlinea_device::isa8_cga_4enlinea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- isa8_cga_device( mconfig, ISA8_CGA_4ENLINEA, "ISA8_CGA_4ENLINEA", tag, owner, clock, "4enlinea_cga", __FILE__)
+ isa8_cga_device( mconfig, ISA8_CGA_4ENLINEA, tag, owner, clock)
{
}
@@ -489,7 +489,7 @@ INTERRUPT_GEN_MEMBER(_4enlinea_state::_4enlinea_audio_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( 4enlinea, _4enlinea_state )
+static MACHINE_CONFIG_START( 4enlinea )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, PRG_CPU_CLOCK)
@@ -549,5 +549,5 @@ ROM_END
* Game Drivers *
***********************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1991, 4enlinea, 0, 4enlinea, 4enlinea, driver_device, 0, ROT0, "Compumatic", "Cuatro en Linea", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+GAME( 1991, 4enlinea, 0, 4enlinea, 4enlinea, _4enlinea_state, 0, ROT0, "Compumatic", "Cuatro en Linea", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index 199172c4f45..ecd60061d5f 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -423,7 +423,7 @@ void _4enraya_state::machine_reset()
* Machine Drivers *
***********************************/
-static MACHINE_CONFIG_START( 4enraya, _4enraya_state )
+static MACHINE_CONFIG_START( 4enraya )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2)
@@ -530,6 +530,6 @@ DRIVER_INIT_MEMBER(_4enraya_state, unkpacg)
***********************************/
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1990, 4enraya, 0, 4enraya, 4enraya, driver_device, 0, ROT0, "IDSA", "4 En Raya (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, 4enrayaa, 4enraya, 4enraya, 4enraya, driver_device, 0, ROT0, "IDSA", "4 En Raya (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, 4enraya, 0, 4enraya, 4enraya, _4enraya_state, 0, ROT0, "IDSA", "4 En Raya (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, 4enrayaa, 4enraya, 4enraya, 4enraya, _4enraya_state, 0, ROT0, "IDSA", "4 En Raya (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 199?, unkpacg, 0, unkpacg, unkpacg, _4enraya_state, unkpacg, ROT0, "<unknown>", "unknown Pac-Man gambling game", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index 8d7a41c02d4..e3e611cccb0 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -353,7 +353,7 @@ GFXDECODE_END
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( 4roses, _4roses_state )
+static MACHINE_CONFIG_START( 4roses )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, MASTER_CLOCK/8) /* 2MHz, guess */
MCFG_CPU_PROGRAM_MAP(4roses_map)
@@ -465,7 +465,7 @@ DRIVER_INIT_MEMBER(_4roses_state,4roses)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
GAME( 1999, 4roses, 0, 4roses, 4roses, _4roses_state, 4roses, ROT0, "<unknown>", "Four Roses (encrypted, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
GAME( 1999, 4rosesa, 4roses, 4roses, 4roses, _4roses_state, 4roses, ROT0, "<unknown>", "Four Roses (encrypted, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
GAME( 1999, rugby, 0, 4roses, 4roses, _4roses_state, 4roses, ROT0, "C.M.C.", "Rugby? (four roses hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index 3fad2e4af5a..2b00a245855 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -1014,7 +1014,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( fclown, _5clown_state )
+static MACHINE_CONFIG_START( fclown )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8) /* guess, seems ok */
@@ -1060,7 +1060,7 @@ static MACHINE_CONFIG_START( fclown, _5clown_state )
MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess, seems ok */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, OKIM6295_PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
+ MCFG_OKIM6295_ADD("oki6295", MASTER_CLOCK/12, PIN7_LOW) /* guess, seems ok; pin7 guessed, seems ok */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.20)
MACHINE_CONFIG_END
@@ -1225,7 +1225,7 @@ DRIVER_INIT_MEMBER(_5clown_state,fclown)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS... */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS...
GAME( 1993, 5clown, 0, fclown, fclown, _5clown_state, fclown, ROT0, "IGS", "Five Clown (English, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1993, 5clowna, 5clown, fclown, fclown, _5clown_state, fclown, ROT0, "IGS", "Five Clown (English, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1993, 5clownsp, 5clown, fclown, fclown, _5clown_state, fclown, ROT0, "IGS", "Five Clown (Spanish hack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp
index ad824e11f61..507fb13f65a 100644
--- a/src/mame/drivers/68ksbc.cpp
+++ b/src/mame/drivers/68ksbc.cpp
@@ -70,7 +70,7 @@ WRITE_LINE_MEMBER(c68ksbc_state::write_acia_clock)
m_acia->write_rxc(state);
}
-static MACHINE_CONFIG_START( c68ksbc, c68ksbc_state )
+static MACHINE_CONFIG_START( c68ksbc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) // text says 8MHz, schematic says 10MHz
MCFG_CPU_PROGRAM_MAP(c68ksbc_mem)
@@ -95,5 +95,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 2002, 68ksbc, 0, 0, c68ksbc, c68ksbc, driver_device, 0, "Wichit Sirichote", "68k Single Board Computer", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 2002, 68ksbc, 0, 0, c68ksbc, c68ksbc, c68ksbc_state, 0, "Wichit Sirichote", "68k Single Board Computer", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index 1818a769326..145d7a7c415 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -408,7 +408,7 @@ INPUT_PORTS_END
/* same as regular invaders, but with a color board added */
-static MACHINE_CONFIG_DERIVED_CLASS( invadpt2, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( invadpt2, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -451,7 +451,7 @@ static ADDRESS_MAP_START( spacerng_io_map, AS_IO, 8, _8080bw_state )
AM_RANGE(0x06, 0x06) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_DERIVED_CLASS( spacerng, invadpt2, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( spacerng, invadpt2 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -492,7 +492,7 @@ static INPUT_PORTS_START( spcewars )
PORT_DIPSETTING( 0x08, "2000" )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( spcewars, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( spcewars, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -600,7 +600,7 @@ static INPUT_PORTS_START( astropal )
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( astropal, invaders, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( astropal, invaders )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -651,7 +651,7 @@ static INPUT_PORTS_START( cosmo )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW1:8" ) /* must be HIGH normally or the joystick won't work */
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( cosmo, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( cosmo, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -808,7 +808,7 @@ static ADDRESS_MAP_START( spacecom_io_map, AS_IO, 8, _8080bw_state )
AM_RANGE(0x44, 0x44) AM_READ_PORT("IN2") AM_WRITE(invaders_audio_2_w)
ADDRESS_MAP_END
-MACHINE_CONFIG_START( spacecom, _8080bw_state )
+MACHINE_CONFIG_START( spacecom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz / 10) // divider guessed
@@ -920,7 +920,7 @@ static INPUT_PORTS_START( invrvnge )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( invrvnge, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( invrvnge, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1058,7 +1058,7 @@ static ADDRESS_MAP_START( starw1_io_map, AS_IO, 8, _8080bw_state )
AM_RANGE(0x07, 0x07) AM_WRITENOP /* writes 89 at boot */
ADDRESS_MAP_END
-static MACHINE_CONFIG_DERIVED_CLASS( starw1, invadpt2, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( starw1, invadpt2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(starw1_io_map)
MACHINE_CONFIG_END
@@ -1097,7 +1097,7 @@ static INPUT_PORTS_START( lrescue )
PORT_DIPUNUSED_DIPLOC( 0x80, 0x00, "SW1:8" )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( lrescue, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( lrescue, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1126,7 +1126,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( lrescue, mw8080bw_root, _8080bw_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( escmars, _8080bw_state )
+MACHINE_CONFIG_START( escmars )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed
@@ -1224,7 +1224,7 @@ static ADDRESS_MAP_START( cosmicmo_io_map, AS_IO, 8, _8080bw_state )
AM_RANGE(0x06, 0x06) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_DERIVED_CLASS( cosmicmo, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( cosmicmo, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1374,7 +1374,7 @@ MACHINE_START_MEMBER(_8080bw_state,rollingc)
MACHINE_START_CALL_MEMBER(mw8080bw);
}
-static MACHINE_CONFIG_DERIVED_CLASS( rollingc, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( rollingc, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1514,7 +1514,7 @@ MACHINE_RESET_MEMBER(_8080bw_state,schaser)
MACHINE_RESET_CALL_MEMBER(mw8080bw);
}
-static MACHINE_CONFIG_DERIVED_CLASS( schaser, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( schaser, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
@@ -1637,7 +1637,7 @@ MACHINE_START_MEMBER(_8080bw_state,schasercv)
MACHINE_START_CALL_MEMBER(mw8080bw);
}
-static MACHINE_CONFIG_DERIVED_CLASS( schasercv, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( schasercv, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1728,7 +1728,7 @@ MACHINE_START_MEMBER(_8080bw_state,sflush)
MACHINE_START_CALL_MEMBER(mw8080bw);
}
-static MACHINE_CONFIG_DERIVED_CLASS( sflush, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( sflush, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_REPLACE("maincpu",M6800,1500000) // ?
@@ -1831,7 +1831,7 @@ static INPUT_PORTS_START( lupin3a )
PORT_DIPSETTING( 0x10, DEF_STR( Japanese ) )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( lupin3, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( lupin3, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1995,7 +1995,7 @@ static INPUT_PORTS_START( polaris )
PORT_ADJUSTER( 90, "Sub Volume VR3" )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( polaris, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( polaris, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_REPLACE("maincpu",I8080,1996800) /* 19.968MHz / 10 */
@@ -2127,7 +2127,7 @@ static INPUT_PORTS_START( ballbomb )
PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x00, "SW1:8" )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( ballbomb, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( ballbomb, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -2207,7 +2207,7 @@ static INPUT_PORTS_START( yosakdon )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( yosakdon, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( yosakdon, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -2370,7 +2370,7 @@ static ADDRESS_MAP_START( indianbtbr_io_map, AS_IO, 8, _8080bw_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_DERIVED_CLASS( indianbt, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( indianbt, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -2395,7 +2395,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( indianbt, mw8080bw_root, _8080bw_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( indianbtbr, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( indianbtbr, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -2470,7 +2470,7 @@ static INPUT_PORTS_START( steelwkr )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( steelwkr, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( steelwkr, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -2642,7 +2642,7 @@ static ADDRESS_MAP_START( shuttlei_io_map, AS_IO, 8, _8080bw_state )
ADDRESS_MAP_END
-MACHINE_CONFIG_START( shuttlei, _8080bw_state )
+MACHINE_CONFIG_START( shuttlei )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_18MHz / 10) // divider guessed
@@ -2766,7 +2766,7 @@ static INPUT_PORTS_START( darthvdr )
INVADERS_CAB_TYPE_PORT
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( darthvdr, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( darthvdr, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -2839,7 +2839,7 @@ static INPUT_PORTS_START( vortex )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_1C ) )
INPUT_PORTS_END
-MACHINE_CONFIG_DERIVED_CLASS( vortex, mw8080bw_root, _8080bw_state )
+MACHINE_CONFIG_DERIVED( vortex, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -3147,7 +3147,7 @@ MACHINE_START_MEMBER(_8080bw_state, claybust)
MACHINE_START_CALL_MEMBER(mw8080bw);
}
-MACHINE_CONFIG_DERIVED_CLASS( claybust, invaders, _8080bw_state )
+MACHINE_CONFIG_DERIVED( claybust, invaders )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -3262,7 +3262,7 @@ static INPUT_PORTS_START( attackfc )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( attackfc, mw8080bw_root, _8080bw_state )
+static MACHINE_CONFIG_DERIVED( attackfc, mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -3400,7 +3400,7 @@ WRITE8_MEMBER(_8080bw_state::invmulti_bank_w)
membank("bank2")->set_entry(bank);
}
-MACHINE_CONFIG_DERIVED_CLASS( invmulti, invaders, _8080bw_state )
+MACHINE_CONFIG_DERIVED( invmulti, invaders )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -3743,7 +3743,7 @@ ROM_START( spcewarla ) // PCB was in a Space Invarders Part II cabinet
ROM_REGION( 0x0800, "proms", 0 ) /* color map */
ROM_LOAD( "cv01_1.bin", 0x0000, 0x0400, BAD_DUMP CRC(aac24f34) SHA1(ad110e776547fb48baac568bb50d61854537ca34) ) // the dumper didn't actually dump this yet
- ROM_LOAD( "cv02_2.bin", 0x0400, 0x0400, BAD_DUMP CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) ) // the dumper didn't actually dump this yet
+ ROM_LOAD( "cv02_2.bin", 0x0400, 0x0400, BAD_DUMP CRC(2bdf83a0) SHA1(01ffbd43964c41987e7d44816271308f9a70802b) ) // the dumper didn't actually dump this yet
ROM_END
ROM_START( spacewr3 )
@@ -4995,150 +4995,150 @@ ROM_START( attackfc )
ROM_END
-/* board # rom parent machine inp init monitor, .. */
+// year rom parent machine inp state init monitor ...
// Taito games (+clones), starting with Space Invaders
-GAME( 1978, sisv1, invaders, invaders, sitv, driver_device, 0, ROT270, "Taito", "Space Invaders (SV Version rev 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1978, sisv2, invaders, invaders, sitv, driver_device, 0, ROT270, "Taito", "Space Invaders (SV Version rev 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1978, sisv3, invaders, invaders, sitv, driver_device, 0, ROT270, "Taito", "Space Invaders (SV Version rev 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1978, sisv, invaders, invaders, sitv, driver_device, 0, ROT270, "Taito", "Space Invaders (SV Version rev 4)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1978, sitv1, invaders, invaders, sitv, driver_device, 0, ROT270, "Taito", "Space Invaders (TV Version rev 1)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, sitv, invaders, invaders, sitv, driver_device, 0, ROT270, "Taito", "Space Invaders (TV Version rev 2)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAME( 1979, sicv, invaders, invadpt2, sicv, driver_device, 0, ROT270, "Taito", "Space Invaders (CV Version, larger roms)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sicv1, invaders, invadpt2, sicv, driver_device, 0, ROT270, "Taito", "Space Invaders (CV Version, smaller roms)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1978, invadrmr, invaders, invaders, invadrmr, driver_device, 0, ROT270, "Taito / Model Racing", "Space Invaders (Model Racing)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
-GAMEL(1978, invaderl, invaders, invaders, sicv, driver_device, 0, ROT270, "Taito / Logitec", "Space Invaders (Logitec)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
-GAMEL(1978, spcewars, invaders, spcewars, spcewars, driver_device, 0, ROT270, "Taito / Sanritsu", "Space War (Sanritsu)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
-GAME (1979, spcewarla, invaders, spcewarla, spcewars, driver_device, 0, ROT270, "bootleg (Leisure and Allied)", "Space War (Leisure and Allied)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // unclassified, licensed or bootleg?
-GAMEL(1978, spceking, invaders, invaders, sicv, driver_device, 0, ROT270, "Taito / Leijac Corporation", "Space King", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
-GAMEL(1979, cosmicmo, invaders, cosmicmo, cosmicmo, driver_device, 0, ROT270, "Taito / Universal", "Cosmic Monsters (version II)", MACHINE_SUPPORTS_SAVE, layout_cosmicm ) // unclassified, licensed or bootleg?
-GAMEL(1979, cosmicm2, invaders, cosmicmo, cosmicmo, driver_device, 0, ROT270, "Taito / Universal", "Cosmic Monsters 2", MACHINE_SUPPORTS_SAVE, layout_cosmicm ) // unclassified, licensed or bootleg?
-GAMEL(1980?,sinvzen, invaders, invaders, sinvzen, driver_device, 0, ROT270, "Taito / Zenitone-Microsec Ltd.", "Super Invaders (Zenitone-Microsec)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
-GAMEL(1980, ultrainv, invaders, invaders, sicv, driver_device, 0, ROT270, "Taito / Konami", "Ultra Invaders", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
-GAMEL(1978, spaceatt, invaders, invaders, sicv, driver_device, 0, ROT270, "bootleg (Video Games GmbH)", "Space Attack (bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, spaceattbp, invaders, invaders, sicv, driver_device, 0, ROT270, "bootleg (Video Games GmbH)", "Space Attack (bproms)(bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, spaceatt2k, invaders, invaders, sicv, driver_device, 0, ROT270, "bootleg (Video Games GmbH)", "Space Attack (2k roms)(bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, cosmicin, invaders, invaders, sicv, driver_device, 0, ROT270, "bootleg", "Cosmic Invaders (bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, galmonst, invaders, invaders, sicv, driver_device, 0, ROT270, "bootleg (Laguna S.A.)", "Galaxy Monsters (Laguna S.A. Spanish bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1980, spaceat2, invaders, invaders, spaceat2, driver_device, 0, ROT270, "bootleg (Video Games UK)", "Space Attack II (bootleg of Super Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // bootleg of Zenitone-Microsec Super Invaders
-GAMEL(1979, spacecom, invaders, spacecom, spacecom, _8080bw_state, spacecom, ROT270, "bootleg", "Space Combat (bootleg of Space Invaders)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_spacecom )
-GAME( 1978, spacerng, invaders, spacerng, sitv, driver_device, 0, ROT90, "bootleg (Leisure Time Electronics)", "Space Ranger", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // many modifications
-GAMEL(19??, invasion, invaders, invaders, invasion, driver_device, 0, ROT270, "bootleg (Sidam)", "Invasion (Sidam)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(19??, invasiona, invaders, invaders, invasion, driver_device, 0, ROT270, "bootleg", "Invasion (bootleg set 1, normal graphics)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // has Sidam replaced with 'Ufo Monster Attack' and standard GFX
-GAMEL(19??, invasionb, invaders, invaders, invasion, driver_device, 0, ROT270, "bootleg", "Invasion (bootleg set 2, no copyright)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(19??, invasionrz, invaders, invaders, invasion, driver_device, 0, ROT270, "bootleg (R Z SRL Bologna)", "Invasion (bootleg set 3, R Z SRL Bologna)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_invaders )
-GAMEL(19??, invasionrza,invaders, invaders, invasion, driver_device, 0, ROT270, "bootleg (R Z SRL Bologna)", "Invasion (bootleg set 4, R Z SRL Bologna)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_invaders )
-GAMEL(19??, invadersem, invaders, invaders, sitv, driver_device, 0, ROT270, "Electromar", "Space Invaders (Electromar, Spanish)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // possibly licensed
-GAMEL(1978, superinv, invaders, invaders, superinv, driver_device, 0, ROT270, "bootleg", "Super Invaders (bootleg set 1)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // not related to Zenitone-Microsec version
-GAMEL(1978, sinvemag, invaders, invaders, sinvemag, driver_device, 0, ROT270, "bootleg (Emag)", "Super Invaders (bootleg set 2)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // not related to Zenitone-Microsec version
-GAMEL(1980, searthin, invaders, invaders, searthin, driver_device, 0, ROT270, "bootleg (Competitive Video)", "Super Earth Invasion (set 1)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1980, searthina, invaders, invaders, searthin, driver_device, 0, ROT270, "bootleg (Competitive Video)", "Super Earth Invasion (set 2)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1980, searthie, invaders, invaders, searthin, driver_device, 0, ROT270, "bootleg (Electrocoin)", "Super Earth Invasion (set 3)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(19??, alieninv, invaders, invaders, alieninv, driver_device, 0, ROT270, "bootleg (Margamatics)", "Alien Invasion", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(19??, alieninvp2, invaders, invaders, searthin, driver_device, 0, ROT270, "bootleg", "Alien Invasion Part II", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1979, jspecter, invaders, invaders, jspecter, driver_device, 0, ROT270, "bootleg (Jatre)", "Jatre Specter (set 1)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1979, jspecter2, invaders, invaders, jspecter, driver_device, 0, ROT270, "bootleg (Jatre)", "Jatre Specter (set 2)", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, spacewr3, invaders, spcewars, sicv, driver_device, 0, ROT270, "bootleg", "Space War Part 3", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invaders ) // unrelated to Sanritsu's version?
-GAMEL(1978, swipeout, invaders, spcewars, sicv, driver_device, 0, ROT270, "bootleg (Beyer and Brown)", "Space Wipeout", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAMEL(1978, invader4, invaders, invaders, sicv, driver_device, 0, ROT270, "bootleg", "Space Invaders Part Four", MACHINE_SUPPORTS_SAVE, layout_invaders )
-GAME( 1978, darthvdr, invaders, darthvdr, darthvdr, driver_device, 0, ROT270, "bootleg", "Darth Vader (bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAMEL(19??, tst_invd, invaders, invaders, sicv, driver_device, 0, ROT0, "<unknown>", "Space Invaders Test ROM", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAME( 1978, sisv1, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Taito", "Space Invaders (SV Version rev 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, sisv2, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Taito", "Space Invaders (SV Version rev 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, sisv3, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Taito", "Space Invaders (SV Version rev 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, sisv, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Taito", "Space Invaders (SV Version rev 4)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1978, sitv1, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Taito", "Space Invaders (TV Version rev 1)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, sitv, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Taito", "Space Invaders (TV Version rev 2)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAME( 1979, sicv, invaders, invadpt2, sicv, _8080bw_state, 0, ROT270, "Taito", "Space Invaders (CV Version, larger roms)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sicv1, invaders, invadpt2, sicv, _8080bw_state, 0, ROT270, "Taito", "Space Invaders (CV Version, smaller roms)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1978, invadrmr, invaders, invaders, invadrmr, mw8080bw_state, 0, ROT270, "Taito / Model Racing", "Space Invaders (Model Racing)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
+GAMEL(1978, invaderl, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "Taito / Logitec", "Space Invaders (Logitec)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
+GAMEL(1978, spcewars, invaders, spcewars, spcewars, _8080bw_state, 0, ROT270, "Taito / Sanritsu", "Space War (Sanritsu)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
+GAME (1979, spcewarla, invaders, spcewarla, spcewars, _8080bw_state, 0, ROT270, "bootleg (Leisure and Allied)", "Space War (Leisure and Allied)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // unclassified, licensed or bootleg?
+GAMEL(1978, spceking, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "Taito / Leijac Corporation", "Space King", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
+GAMEL(1979, cosmicmo, invaders, cosmicmo, cosmicmo, _8080bw_state, 0, ROT270, "Taito / Universal", "Cosmic Monsters (version II)", MACHINE_SUPPORTS_SAVE, layout_cosmicm ) // unclassified, licensed or bootleg?
+GAMEL(1979, cosmicm2, invaders, cosmicmo, cosmicmo, _8080bw_state, 0, ROT270, "Taito / Universal", "Cosmic Monsters 2", MACHINE_SUPPORTS_SAVE, layout_cosmicm ) // unclassified, licensed or bootleg?
+GAMEL(1980?,sinvzen, invaders, invaders, sinvzen, mw8080bw_state, 0, ROT270, "Taito / Zenitone-Microsec Ltd.", "Super Invaders (Zenitone-Microsec)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
+GAMEL(1980, ultrainv, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "Taito / Konami", "Ultra Invaders", MACHINE_SUPPORTS_SAVE, layout_invaders ) // unclassified, licensed or bootleg?
+GAMEL(1978, spaceatt, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "bootleg (Video Games GmbH)", "Space Attack (bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, spaceattbp, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "bootleg (Video Games GmbH)", "Space Attack (bproms)(bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, spaceatt2k, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "bootleg (Video Games GmbH)", "Space Attack (2k roms)(bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, cosmicin, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "bootleg", "Cosmic Invaders (bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, galmonst, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "bootleg (Laguna S.A.)", "Galaxy Monsters (Laguna S.A. Spanish bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1980, spaceat2, invaders, invaders, spaceat2, mw8080bw_state, 0, ROT270, "bootleg (Video Games UK)", "Space Attack II (bootleg of Super Invaders)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // bootleg of Zenitone-Microsec Super Invaders
+GAMEL(1979, spacecom, invaders, spacecom, spacecom, _8080bw_state, spacecom, ROT270, "bootleg", "Space Combat (bootleg of Space Invaders)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_spacecom )
+GAME( 1978, spacerng, invaders, spacerng, sitv, _8080bw_state, 0, ROT90, "bootleg (Leisure Time Electronics)", "Space Ranger", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // many modifications
+GAMEL(19??, invasion, invaders, invaders, invasion, mw8080bw_state, 0, ROT270, "bootleg (Sidam)", "Invasion (Sidam)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(19??, invasiona, invaders, invaders, invasion, mw8080bw_state, 0, ROT270, "bootleg", "Invasion (bootleg set 1, normal graphics)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // has Sidam replaced with 'Ufo Monster Attack' and standard GFX
+GAMEL(19??, invasionb, invaders, invaders, invasion, mw8080bw_state, 0, ROT270, "bootleg", "Invasion (bootleg set 2, no copyright)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(19??, invasionrz, invaders, invaders, invasion, mw8080bw_state, 0, ROT270, "bootleg (R Z SRL Bologna)", "Invasion (bootleg set 3, R Z SRL Bologna)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_invaders )
+GAMEL(19??, invasionrza,invaders, invaders, invasion, mw8080bw_state, 0, ROT270, "bootleg (R Z SRL Bologna)", "Invasion (bootleg set 4, R Z SRL Bologna)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_invaders )
+GAMEL(19??, invadersem, invaders, invaders, sitv, mw8080bw_state, 0, ROT270, "Electromar", "Space Invaders (Electromar, Spanish)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // possibly licensed
+GAMEL(1978, superinv, invaders, invaders, superinv, mw8080bw_state, 0, ROT270, "bootleg", "Super Invaders (bootleg set 1)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // not related to Zenitone-Microsec version
+GAMEL(1978, sinvemag, invaders, invaders, sinvemag, mw8080bw_state, 0, ROT270, "bootleg (Emag)", "Super Invaders (bootleg set 2)", MACHINE_SUPPORTS_SAVE, layout_invaders ) // not related to Zenitone-Microsec version
+GAMEL(1980, searthin, invaders, invaders, searthin, mw8080bw_state, 0, ROT270, "bootleg (Competitive Video)", "Super Earth Invasion (set 1)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1980, searthina, invaders, invaders, searthin, mw8080bw_state, 0, ROT270, "bootleg (Competitive Video)", "Super Earth Invasion (set 2)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1980, searthie, invaders, invaders, searthin, mw8080bw_state, 0, ROT270, "bootleg (Electrocoin)", "Super Earth Invasion (set 3)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(19??, alieninv, invaders, invaders, alieninv, mw8080bw_state, 0, ROT270, "bootleg (Margamatics)", "Alien Invasion", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(19??, alieninvp2, invaders, invaders, searthin, mw8080bw_state, 0, ROT270, "bootleg", "Alien Invasion Part II", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1979, jspecter, invaders, invaders, jspecter, mw8080bw_state, 0, ROT270, "bootleg (Jatre)", "Jatre Specter (set 1)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1979, jspecter2, invaders, invaders, jspecter, mw8080bw_state, 0, ROT270, "bootleg (Jatre)", "Jatre Specter (set 2)", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, spacewr3, invaders, spcewars, sicv, _8080bw_state, 0, ROT270, "bootleg", "Space War Part 3", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invaders ) // unrelated to Sanritsu's version?
+GAMEL(1978, swipeout, invaders, spcewars, sicv, _8080bw_state, 0, ROT270, "bootleg (Beyer and Brown)", "Space Wipeout", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAMEL(1978, invader4, invaders, invaders, sicv, mw8080bw_state, 0, ROT270, "bootleg", "Space Invaders Part Four", MACHINE_SUPPORTS_SAVE, layout_invaders )
+GAME( 1978, darthvdr, invaders, darthvdr, darthvdr, _8080bw_state, 0, ROT270, "bootleg", "Darth Vader (bootleg of Space Invaders)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAMEL(19??, tst_invd, invaders, invaders, sicv, mw8080bw_state, 0, ROT0, "<unknown>", "Space Invaders Test ROM", MACHINE_SUPPORTS_SAVE, layout_invaders )
// other Taito
-GAME( 1979, invadpt2, 0, invadpt2, invadpt2, driver_device, 0, ROT270, "Taito", "Space Invaders Part II (Taito)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1979, invadpt2br, invadpt2, invadpt2, invadpt2, driver_device, 0, ROT270, "Taito do Brasil", "Space Invaders Part II (Brazil)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980, invaddlx, invadpt2, invaders, invadpt2, driver_device, 0, ROT270, "Taito (Midway license)", "Space Invaders Deluxe", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, moonbase, invadpt2, invadpt2, invadpt2, driver_device, 0, ROT270, "Taito / Nichibutsu", "Moon Base Zeta (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // this has a 'Taito Corp' string hidden away in the rom - to display it, press P1 Right+P1 Fire+2P Start then P1 Left+P1 Fire+P1 Start at the attract gameplay sequence
-GAME( 1979, moonbasea, invadpt2, invadpt2, invadpt2, driver_device, 0, ROT270, "Taito / Nichibutsu", "Moon Base Zeta (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // this has the same string replaced with Nichibutsu, no other differences
+GAME( 1979, invadpt2, 0, invadpt2, invadpt2, _8080bw_state, 0, ROT270, "Taito", "Space Invaders Part II (Taito)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, invadpt2br, invadpt2, invadpt2, invadpt2, _8080bw_state, 0, ROT270, "Taito do Brasil", "Space Invaders Part II (Brazil)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, invaddlx, invadpt2, invaders, invadpt2, mw8080bw_state, 0, ROT270, "Taito (Midway license)", "Space Invaders Deluxe", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, moonbase, invadpt2, invadpt2, invadpt2, _8080bw_state, 0, ROT270, "Taito / Nichibutsu", "Moon Base Zeta (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // this has a 'Taito Corp' string hidden away in the rom - to display it, press P1 Right+P1 Fire+2P Start then P1 Left+P1 Fire+P1 Start at the attract gameplay sequence
+GAME( 1979, moonbasea, invadpt2, invadpt2, invadpt2, _8080bw_state, 0, ROT270, "Taito / Nichibutsu", "Moon Base Zeta (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // this has the same string replaced with Nichibutsu, no other differences
-GAME( 1980, spclaser, 0, invadpt2, spclaser, driver_device, 0, ROT270, "Taito", "Space Laser", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, intruder, spclaser, invadpt2, spclaser, driver_device, 0, ROT270, "Taito (Game Plan license)", "Intruder", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980, laser, spclaser, invadpt2, spclaser, driver_device, 0, ROT270, "bootleg (Leisure Time Electronics)", "Astro Laser (bootleg of Space Laser)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, spcewarl, spclaser, invadpt2, spclaser, driver_device, 0, ROT270, "Leijac Corporation", "Space War (Leijac Corporation)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Taito's version is actually a spin-off of this?
+GAME( 1980, spclaser, 0, invadpt2, spclaser, _8080bw_state, 0, ROT270, "Taito", "Space Laser", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, intruder, spclaser, invadpt2, spclaser, _8080bw_state, 0, ROT270, "Taito (Game Plan license)", "Intruder", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, laser, spclaser, invadpt2, spclaser, _8080bw_state, 0, ROT270, "bootleg (Leisure Time Electronics)", "Astro Laser (bootleg of Space Laser)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spcewarl, spclaser, invadpt2, spclaser, _8080bw_state, 0, ROT270, "Leijac Corporation", "Space War (Leijac Corporation)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Taito's version is actually a spin-off of this?
-GAME( 1979, lrescue, 0, lrescue, lrescue, driver_device, 0, ROT270, "Taito", "Lunar Rescue", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1979, grescue, lrescue, lrescue, lrescue, driver_device, 0, ROT270, "Taito (Universal license?)", "Galaxy Rescue", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980, mlander, lrescue, lrescue, lrescue, driver_device, 0, ROT270, "bootleg (Leisure Time Electronics)", "Moon Lander (bootleg of Lunar Rescue)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, lrescuem, lrescue, lrescue, lrescue, driver_device, 0, ROT270, "bootleg (Model Racing)", "Lunar Rescue (Model Racing bootleg, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1979, lrescuem2, lrescue, lrescue, lrescue, driver_device, 0, ROT270, "bootleg (Model Racing)", "Lunar Rescue (Model Racing bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1979, desterth, lrescue, lrescue, lrescue, driver_device, 0, ROT270, "bootleg", "Destination Earth (bootleg of Lunar Rescue)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAMEL( 1980,escmars, lrescue, escmars, lrescue, driver_device, 0, ROT270, "bootleg", "Escape from Mars (bootleg of Lunar Rescue)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_escmars )
+GAME( 1979, lrescue, 0, lrescue, lrescue, _8080bw_state, 0, ROT270, "Taito", "Lunar Rescue", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, grescue, lrescue, lrescue, lrescue, _8080bw_state, 0, ROT270, "Taito (Universal license?)", "Galaxy Rescue", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, mlander, lrescue, lrescue, lrescue, _8080bw_state, 0, ROT270, "bootleg (Leisure Time Electronics)", "Moon Lander (bootleg of Lunar Rescue)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, lrescuem, lrescue, lrescue, lrescue, _8080bw_state, 0, ROT270, "bootleg (Model Racing)", "Lunar Rescue (Model Racing bootleg, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, lrescuem2, lrescue, lrescue, lrescue, _8080bw_state, 0, ROT270, "bootleg (Model Racing)", "Lunar Rescue (Model Racing bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, desterth, lrescue, lrescue, lrescue, _8080bw_state, 0, ROT270, "bootleg", "Destination Earth (bootleg of Lunar Rescue)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAMEL( 1980,escmars, lrescue, escmars, lrescue, _8080bw_state, 0, ROT270, "bootleg", "Escape from Mars (bootleg of Lunar Rescue)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_escmars )
-GAME( 1979, schaser, 0, schaser, schaser, driver_device, 0, ROT270, "Taito", "Space Chaser (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, schasera, schaser, schaser, schaser, driver_device, 0, ROT270, "Taito", "Space Chaser (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, schaserb, schaser, schaser, schaser, driver_device, 0, ROT270, "Taito", "Space Chaser (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, schaserc, schaser, schaser, schaser, driver_device, 0, ROT270, "Taito", "Space Chaser (set 4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS )
-GAME( 1979, schasercv, schaser, schasercv, schasercv, driver_device, 0, ROT270, "Taito", "Space Chaser (CV version - set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS )
-GAME( 1979, schaserm, schaser, schaser, schaserm, driver_device, 0, ROT270, "bootleg (Model Racing)", "Space Chaser (Model Racing bootleg)", MACHINE_SUPPORTS_SAVE ) // on original Taito PCB, hacked to be harder?
+GAME( 1979, schaser, 0, schaser, schaser, _8080bw_state, 0, ROT270, "Taito", "Space Chaser (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, schasera, schaser, schaser, schaser, _8080bw_state, 0, ROT270, "Taito", "Space Chaser (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, schaserb, schaser, schaser, schaser, _8080bw_state, 0, ROT270, "Taito", "Space Chaser (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, schaserc, schaser, schaser, schaser, _8080bw_state, 0, ROT270, "Taito", "Space Chaser (set 4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS )
+GAME( 1979, schasercv, schaser, schasercv, schasercv, _8080bw_state, 0, ROT270, "Taito", "Space Chaser (CV version - set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS )
+GAME( 1979, schaserm, schaser, schaser, schaserm, _8080bw_state, 0, ROT270, "bootleg (Model Racing)", "Space Chaser (Model Racing bootleg)", MACHINE_SUPPORTS_SAVE ) // on original Taito PCB, hacked to be harder?
-GAME( 1979, sflush, 0, sflush, sflush, driver_device, 0, ROT270, "Taito", "Straight Flush", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL)
+GAME( 1979, sflush, 0, sflush, sflush, _8080bw_state, 0, ROT270, "Taito", "Straight Flush", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL)
-GAME( 1980, lupin3, 0, lupin3, lupin3, driver_device, 0, ROT270, "Taito", "Lupin III (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980, lupin3a, lupin3, lupin3a, lupin3a, driver_device, 0, ROT270, "Taito", "Lupin III (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, lupin3, 0, lupin3, lupin3, _8080bw_state, 0, ROT270, "Taito", "Lupin III (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, lupin3a, lupin3, lupin3a, lupin3a, _8080bw_state, 0, ROT270, "Taito", "Lupin III (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980, polaris, 0, polaris, polaris, driver_device, 0, ROT270, "Taito", "Polaris (Latest version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, polarisa, polaris, polaris, polaris, driver_device, 0, ROT270, "Taito", "Polaris (First revision)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, polariso, polaris, polaris, polaris, driver_device, 0, ROT270, "Taito", "Polaris (Original version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, polarisbr, polaris, polaris, polaris, driver_device, 0, ROT270, "Taito do Brasil", "Polaris (Brazil)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, polaris, 0, polaris, polaris, _8080bw_state, 0, ROT270, "Taito", "Polaris (Latest version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, polarisa, polaris, polaris, polaris, _8080bw_state, 0, ROT270, "Taito", "Polaris (First revision)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, polariso, polaris, polaris, polaris, _8080bw_state, 0, ROT270, "Taito", "Polaris (Original version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, polarisbr, polaris, polaris, polaris, _8080bw_state, 0, ROT270, "Taito do Brasil", "Polaris (Brazil)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, ballbomb, 0, ballbomb, ballbomb, driver_device, 0, ROT270, "Taito", "Balloon Bomber", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) /* missing clouds */
+GAME( 1980, ballbomb, 0, ballbomb, ballbomb, _8080bw_state, 0, ROT270, "Taito", "Balloon Bomber", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) /* missing clouds */
-GAME( 1980, indianbt, 0, indianbt, indianbt, driver_device, 0, ROT270, "Taito", "Indian Battle", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1983, indianbtbr, indianbt, indianbtbr,indianbtbr,driver_device, 0, ROT270, "Taito do Brasil", "Indian Battle (Brazil)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, indianbt, 0, indianbt, indianbt, _8080bw_state, 0, ROT270, "Taito", "Indian Battle", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, indianbtbr, indianbt, indianbtbr,indianbtbr,_8080bw_state, 0, ROT270, "Taito do Brasil", "Indian Battle (Brazil)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980, steelwkr, 0, steelwkr, steelwkr, driver_device, 0, ROT0 , "Taito", "Steel Worker", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980, steelwkr, 0, steelwkr, steelwkr, _8080bw_state, 0, ROT0 , "Taito", "Steel Worker", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAMEL(1980?,galactic, 0, invaders, galactic, driver_device, 0, ROT270, "Taito do Brasil", "Galactica - Batalha Espacial", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_galactic )
-GAMEL(1980?,spacmiss, galactic, invaders, galactic, driver_device, 0, ROT270, "bootleg?", "Space Missile - Space Fighting Game", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_galactic )
+GAMEL(1980?,galactic, 0, invaders, galactic, mw8080bw_state, 0, ROT270, "Taito do Brasil", "Galactica - Batalha Espacial", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_galactic )
+GAMEL(1980?,spacmiss, galactic, invaders, galactic, mw8080bw_state, 0, ROT270, "bootleg?", "Space Missile - Space Fighting Game", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_galactic )
// Misc. manufacturers
-GAME( 1979, galxwars, 0, invadpt2, galxwars, driver_device, 0, ROT270, "Universal", "Galaxy Wars (Universal set 1)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, galxwars2, galxwars, invadpt2, galxwars, driver_device, 0, ROT270, "Universal", "Galaxy Wars (Universal set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, galxwarst, galxwars, invadpt2, galxwars, driver_device, 0, ROT270, "Universal (Taito license?)", "Galaxy Wars (Taito?)" , MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Copyright not displayed
-GAME( 1979, galxwarst2, galxwars, invadpt2, galxwars, driver_device, 0, ROT270, "Universal (Taito Corporation license)", "Galaxy Wars (Taito)" , MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Copyright displayed, quite different codebase from galxwarst
-GAME( 1979, starw, galxwars, invaders, galxwars, driver_device, 0, ROT270, "bootleg", "Star Wars (bootleg of Galaxy Wars, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, starw1, galxwars, starw1, galxwars, driver_device, 0, ROT270, "bootleg (Yamashita)", "Star Wars (bootleg of Galaxy Wars, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, galxwars, 0, invadpt2, galxwars, _8080bw_state, 0, ROT270, "Universal", "Galaxy Wars (Universal set 1)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, galxwars2, galxwars, invadpt2, galxwars, _8080bw_state, 0, ROT270, "Universal", "Galaxy Wars (Universal set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, galxwarst, galxwars, invadpt2, galxwars, _8080bw_state, 0, ROT270, "Universal (Taito license?)", "Galaxy Wars (Taito?)" , MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Copyright not displayed
+GAME( 1979, galxwarst2, galxwars, invadpt2, galxwars, _8080bw_state, 0, ROT270, "Universal (Taito Corporation license)", "Galaxy Wars (Taito)" , MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Copyright displayed, quite different codebase from galxwarst
+GAME( 1979, starw, galxwars, invaders, galxwars, mw8080bw_state, 0, ROT270, "bootleg", "Star Wars (bootleg of Galaxy Wars, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, starw1, galxwars, starw1, galxwars, _8080bw_state, 0, ROT270, "bootleg (Yamashita)", "Star Wars (bootleg of Galaxy Wars, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, cosmo, 0, cosmo, cosmo, driver_device, 0, ROT90, "TDS & MINTS", "Cosmo", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, cosmo, 0, cosmo, cosmo, _8080bw_state, 0, ROT90, "TDS & MINTS", "Cosmo", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1980?,invrvnge, 0, invrvnge, invrvnge, driver_device, 0, ROT270, "Zenitone-Microsec Ltd.", "Invader's Revenge (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // copyright is either late-1980, or early-1981
-GAME( 1980?,invrvngea, invrvnge, invrvnge, invrvnge, driver_device, 0, ROT270, "Zenitone-Microsec Ltd.", "Invader's Revenge (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-GAME( 1980?,invrvngeb, invrvnge, invrvnge, invrvnge, driver_device, 0, ROT270, "Zenitone-Microsec Ltd.", "Invader's Revenge (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-GAME( 1980?,invrvngedu, invrvnge, invrvnge, invrvnge, driver_device, 0, ROT270, "Zenitone-Microsec Ltd. (Dutchford license)", "Invader's Revenge (Dutchford, single PCB)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-GAME( 1980?,invrvngegw, invrvnge, invrvnge, invrvnge, driver_device, 0, ROT270, "Zenitone-Microsec Ltd. (Game World license)", "Invader's Revenge (Game World, single PCB)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+GAME( 1980?,invrvnge, 0, invrvnge, invrvnge, _8080bw_state, 0, ROT270, "Zenitone-Microsec Ltd.", "Invader's Revenge (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // copyright is either late-1980, or early-1981
+GAME( 1980?,invrvngea, invrvnge, invrvnge, invrvnge, _8080bw_state, 0, ROT270, "Zenitone-Microsec Ltd.", "Invader's Revenge (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+GAME( 1980?,invrvngeb, invrvnge, invrvnge, invrvnge, _8080bw_state, 0, ROT270, "Zenitone-Microsec Ltd.", "Invader's Revenge (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+GAME( 1980?,invrvngedu, invrvnge, invrvnge, invrvnge, _8080bw_state, 0, ROT270, "Zenitone-Microsec Ltd. (Dutchford license)", "Invader's Revenge (Dutchford, single PCB)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+GAME( 1980?,invrvngegw, invrvnge, invrvnge, invrvnge, _8080bw_state, 0, ROT270, "Zenitone-Microsec Ltd. (Game World license)", "Invader's Revenge (Game World, single PCB)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-GAME( 1980, vortex, 0, vortex, vortex, _8080bw_state, vortex, ROT270, "Zilec Electronics", "Vortex", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) /* Encrypted 8080/IO */
+GAME( 1980, vortex, 0, vortex, vortex, _8080bw_state, vortex, ROT270, "Zilec Electronics", "Vortex", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) /* Encrypted 8080/IO */
-GAME( 1979, rollingc, 0, rollingc, rollingc, driver_device, 0, ROT270, "Nichibutsu", "Rolling Crash / Moon Base", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, rollingc, 0, rollingc, rollingc, _8080bw_state, 0, ROT270, "Nichibutsu", "Rolling Crash / Moon Base", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, ozmawars, 0, invadpt2, ozmawars, driver_device, 0, ROT270, "SNK", "Ozma Wars (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, ozmawars2, ozmawars, invadpt2, ozmawars, driver_device, 0, ROT270, "SNK", "Ozma Wars (set 2)", MACHINE_SUPPORTS_SAVE ) /* Uses Taito's three board color version of Space Invaders PCB */
-GAME( 1979, ozmawarsmr, ozmawars, invaders, ozmawars, driver_device, 0, ROT270, "bootleg (Model Racing)", "Ozma Wars (Model Racing bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, spaceph, ozmawars, invaders, spaceph, driver_device, 0, ROT270, "bootleg? (Zilec Games)", "Space Phantoms (bootleg of Ozma Wars)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, solfight, ozmawars, invaders, ozmawars, driver_device, 0, ROT270, "bootleg", "Solar Fight (bootleg of Ozma Wars)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, ozmawars, 0, invadpt2, ozmawars, _8080bw_state, 0, ROT270, "SNK", "Ozma Wars (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, ozmawars2, ozmawars, invadpt2, ozmawars, _8080bw_state, 0, ROT270, "SNK", "Ozma Wars (set 2)", MACHINE_SUPPORTS_SAVE ) /* Uses Taito's three board color version of Space Invaders PCB */
+GAME( 1979, ozmawarsmr, ozmawars, invaders, ozmawars, mw8080bw_state, 0, ROT270, "bootleg (Model Racing)", "Ozma Wars (Model Racing bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spaceph, ozmawars, invaders, spaceph, mw8080bw_state, 0, ROT270, "bootleg? (Zilec Games)", "Space Phantoms (bootleg of Ozma Wars)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, solfight, ozmawars, invaders, ozmawars, mw8080bw_state, 0, ROT270, "bootleg", "Solar Fight (bootleg of Ozma Wars)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, yosakdon, 0, yosakdon, yosakdon, driver_device, 0, ROT270, "Wing", "Yosaku To Donbei (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1979, yosakdona, yosakdon, yosakdon, yosakdon, driver_device, 0, ROT270, "Wing", "Yosaku To Donbei (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, yosakdon, 0, yosakdon, yosakdon, _8080bw_state, 0, ROT270, "Wing", "Yosaku To Donbei (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, yosakdona, yosakdon, yosakdon, yosakdon, _8080bw_state, 0, ROT270, "Wing", "Yosaku To Donbei (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAMEL(1979, shuttlei, 0, shuttlei, shuttlei, driver_device, 0, ROT270, "Omori Electric Co., Ltd.", "Shuttle Invader", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_shuttlei )
+GAMEL(1979, shuttlei, 0, shuttlei, shuttlei, _8080bw_state, 0, ROT270, "Omori Electric Co., Ltd.", "Shuttle Invader", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_shuttlei )
-GAMEL(1979, skylove, 0, shuttlei, skylove, driver_device, 0, ROT270, "Omori Electric Co., Ltd.", "Sky Love", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_shuttlei )
+GAMEL(1979, skylove, 0, shuttlei, skylove, _8080bw_state, 0, ROT270, "Omori Electric Co., Ltd.", "Sky Love", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_shuttlei )
-GAME (1978, claybust, 0, claybust, claybust, driver_device, 0, ROT0, "Model Racing", "Claybuster", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // no titlescreen, Claybuster according to flyers
+GAME (1978, claybust, 0, claybust, claybust, _8080bw_state, 0, ROT0, "Model Racing", "Claybuster", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // no titlescreen, Claybuster according to flyers
-GAMEL(1980, gunchamp, 0, claybust, gunchamp, driver_device, 0, ROT0, "Model Racing", "Gun Champ", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_gunchamp ) // no titlescreen, Gun Champ according to original cab
+GAMEL(1980, gunchamp, 0, claybust, gunchamp, _8080bw_state, 0, ROT0, "Model Racing", "Gun Champ", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_gunchamp ) // no titlescreen, Gun Champ according to original cab
-GAME( 1980?,astropal, 0, astropal, astropal, driver_device, 0, ROT0, "Sidam?", "Astropal", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1980?,astropal, 0, astropal, astropal, _8080bw_state, 0, ROT0, "Sidam?", "Astropal", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAMEL(1979?,attackfc, 0, attackfc, attackfc, _8080bw_state, attackfc, ROT0, "Electronic Games Systems", "Attack Force", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_attackfc )
+GAMEL(1979?,attackfc, 0, attackfc, attackfc, _8080bw_state, attackfc, ROT0, "Electronic Games Systems", "Attack Force", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_attackfc )
-GAME( 2002, invmulti, 0, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.03D)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultim3a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.03A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultim2c,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.02C)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultim2a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.02A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultim1a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.01A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultit3d,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (T8.03D)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultis3a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (S0.83A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultis2a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (S0.82A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultis1a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (S0.81A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, invmultip, invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmulti, 0, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.03D)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultim3a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.03A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultim2c,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.02C)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultim2a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.02A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultim1a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (M8.01A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultit3d,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (T8.03D)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultis3a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (S0.83A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultis2a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (S0.82A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultis1a,invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (S0.81A)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, invmultip, invmulti, invmulti, invmulti, _8080bw_state, invmulti, ROT270, "hack (Braze Technologies)", "Space Invaders Multigame (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp
index 17364b242d5..870915b813d 100644
--- a/src/mame/drivers/88games.cpp
+++ b/src/mame/drivers/88games.cpp
@@ -302,7 +302,7 @@ void _88games_state::machine_reset()
m_k88games_priority = 0;
}
-static MACHINE_CONFIG_START( 88games, _88games_state )
+static MACHINE_CONFIG_START( 88games )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
@@ -536,6 +536,6 @@ ROM_END
*
*************************************/
-GAME( 1988, 88games, 0, 88games, 88games, driver_device, 0, ROT0, "Konami", "'88 Games", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, konami88, 88games, 88games, 88games, driver_device, 0, ROT0, "Konami", "Konami '88", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hypsptsp, 88games, 88games, 88games, driver_device, 0, ROT0, "Konami", "Hyper Sports Special (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, 88games, 0, 88games, 88games, _88games_state, 0, ROT0, "Konami", "'88 Games", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, konami88, 88games, 88games, 88games, _88games_state, 0, ROT0, "Konami", "Konami '88", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hypsptsp, 88games, 88games, 88games, _88games_state, 0, ROT0, "Konami", "Hyper Sports Special (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/a1supply.cpp b/src/mame/drivers/a1supply.cpp
index 12f9a7447d1..145348a9701 100644
--- a/src/mame/drivers/a1supply.cpp
+++ b/src/mame/drivers/a1supply.cpp
@@ -46,7 +46,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -89,7 +89,7 @@ void a1supply_state::video_start()
{
}
-static MACHINE_CONFIG_START( a1supply, a1supply_state )
+static MACHINE_CONFIG_START( a1supply )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -164,6 +164,6 @@ ROM_START( tvpoker )
ROM_END
-GAME( 197?, tv21, 0, a1supply, 0, driver_device, 0, ROT0, "A-1 Supply", "T.V. 21", MACHINE_IS_SKELETON )
-GAME( 197?, tv21_3, 0, a1supply, 0, driver_device, 0, ROT0, "A-1 Supply", "T.V. 21 III", MACHINE_IS_SKELETON )
-GAME( 197?, tvpoker, 0, a1supply, 0, driver_device, 0, ROT0, "A-1 Supply", "T.V. Poker", MACHINE_IS_SKELETON )
+GAME( 197?, tv21, 0, a1supply, 0, a1supply_state, 0, ROT0, "A-1 Supply", "T.V. 21", MACHINE_IS_SKELETON )
+GAME( 197?, tv21_3, 0, a1supply, 0, a1supply_state, 0, ROT0, "A-1 Supply", "T.V. 21 III", MACHINE_IS_SKELETON )
+GAME( 197?, tvpoker, 0, a1supply, 0, a1supply_state, 0, ROT0, "A-1 Supply", "T.V. Poker", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp
index 1c949132035..a76e57746b9 100644
--- a/src/mame/drivers/a2600.cpp
+++ b/src/mame/drivers/a2600.cpp
@@ -570,7 +570,7 @@ static MACHINE_CONFIG_FRAGMENT(a2600_cartslot)
MCFG_SOFTWARE_LIST_ADD("cass_list","a2600_cass")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( a2600, a2600_state )
+static MACHINE_CONFIG_START( a2600 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_NTSC / 3)
MCFG_M6502_DISABLE_DIRECT()
@@ -619,7 +619,7 @@ static MACHINE_CONFIG_START( a2600, a2600_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( a2600p, a2600_state )
+static MACHINE_CONFIG_START( a2600p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6507, MASTER_CLOCK_PAL / 3)
MCFG_CPU_PROGRAM_MAP(a2600_mem)
@@ -675,6 +675,6 @@ ROM_END
#define rom_a2600p rom_a2600
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS( 1977, a2600, 0, 0, a2600, a2600, driver_device, 0, "Atari", "Atari 2600 (NTSC)" , MACHINE_SUPPORTS_SAVE )
-CONS( 1978, a2600p, a2600, 0, a2600p, a2600, driver_device, 0, "Atari", "Atari 2600 (PAL)", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+CONS( 1977, a2600, 0, 0, a2600, a2600, a2600_state, 0, "Atari", "Atari 2600 (NTSC)" , MACHINE_SUPPORTS_SAVE )
+CONS( 1978, a2600p, a2600, 0, a2600p, a2600, a2600_state, 0, "Atari", "Atari 2600 (PAL)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index 7b0cdd48a33..39389733bf7 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -556,7 +556,7 @@ static const z80_daisy_config a5105_daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( a5105, a5105_state )
+static MACHINE_CONFIG_START( a5105 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_15MHz / 4)
MCFG_CPU_PROGRAM_MAP(a5105_mem)
@@ -623,5 +623,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, a5105, 0, 0, a5105, a5105, driver_device, 0, "VEB Robotron", "BIC A5105", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, a5105, 0, 0, a5105, a5105, a5105_state, 0, "VEB Robotron", "BIC A5105", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp
index 80162f77bfd..b38b668591f 100644
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@@ -112,7 +112,7 @@ static GFXDECODE_START( a51xx )
GFXDECODE_ENTRY( "chargen", 0x0000, a51xx_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( a5120, a51xx_state )
+static MACHINE_CONFIG_START( a5120 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(a5120_mem)
@@ -174,6 +174,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, a5120, 0, 0, a5120, a5120, driver_device, 0, "VEB Robotron", "A5120", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1983, a5130, a5120, 0, a5130, a5130, driver_device, 0, "VEB Robotron", "A5130", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, a5120, 0, 0, a5120, a5120, a51xx_state, 0, "VEB Robotron", "A5120", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1983, a5130, a5120, 0, a5130, a5130, a51xx_state, 0, "VEB Robotron", "A5130", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index fbf33520990..744d855fd69 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -73,7 +73,7 @@ public:
, m_crtc(*this, "mc6845")
{ }
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(videoram_r);
DECLARE_WRITE8_MEMBER(a6809_address_w);
DECLARE_WRITE8_MEMBER(a6809_register_w);
@@ -203,23 +203,23 @@ TIMER_DEVICE_CALLBACK_MEMBER(a6809_state::a6809_p)
}
}
-WRITE8_MEMBER( a6809_state::kbd_put )
+void a6809_state::kbd_put(u8 data)
{
uint8_t d = data & 0x7f;
if (d == 8) d = 0x7f; // allow backspace to work
- m_via->write_pb0((d>>0)&1);
- m_via->write_pb1((d>>1)&1);
- m_via->write_pb2((d>>2)&1);
- m_via->write_pb3((d>>3)&1);
- m_via->write_pb4((d>>4)&1);
- m_via->write_pb5((d>>5)&1);
- m_via->write_pb6((d>>6)&1);
+ m_via->write_pb0(BIT(d, 0));
+ m_via->write_pb1(BIT(d, 1));
+ m_via->write_pb2(BIT(d, 2));
+ m_via->write_pb3(BIT(d, 3));
+ m_via->write_pb4(BIT(d, 4));
+ m_via->write_pb5(BIT(d, 5));
+ m_via->write_pb6(BIT(d, 6));
m_via->write_cb1(1);
m_via->write_cb1(0);
}
-static MACHINE_CONFIG_START( a6809, a6809_state )
+static MACHINE_CONFIG_START( a6809 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809E, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(a6809_mem)
@@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( a6809, a6809_state )
MCFG_SAA5050_SCREEN_SIZE(40, 25, 40)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(a6809_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(a6809_state, kbd_put))
MCFG_CASSETTE_ADD( "cassette" )
MCFG_TIMER_DRIVER_ADD_PERIODIC("a6809_c", a6809_state, a6809_c, attotime::from_hz(4800))
MCFG_TIMER_DRIVER_ADD_PERIODIC("a6809_p", a6809_state, a6809_p, attotime::from_hz(40000))
@@ -272,4 +272,4 @@ ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, a6809, 0, 0, a6809, a6809, driver_device, 0, "Acorn", "System 3 (6809 CPU)", 0 )
+COMP( 1980, a6809, 0, 0, a6809, a6809, a6809_state, 0, "Acorn", "System 3 (6809 CPU)", 0 )
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index 26a716bc043..cc6974e19c3 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -412,7 +412,7 @@ static const z80_daisy_config k7070_daisy_chain[] =
*
* (framebuffer and terminal should be slot devices.)
*/
-static MACHINE_CONFIG_START( a7150, a7150_state )
+static MACHINE_CONFIG_START( a7150 )
MCFG_CPU_ADD("maincpu", I8086, XTAL_9_832MHz/2)
MCFG_CPU_PROGRAM_MAP(a7150_mem)
MCFG_CPU_IO_MAP(a7150_io)
@@ -508,5 +508,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, a7150, 0, 0, a7150, a7150, driver_device, 0, "VEB Robotron", "A7150", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, a7150, 0, 0, a7150, a7150, a7150_state, 0, "VEB Robotron", "A7150", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index 9c61a85c3c3..d4d5360b4a4 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -283,8 +283,8 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
AM_RANGE(0x0020, 0x003f) AM_MIRROR(0x300) AM_DEVREADWRITE("maria", atari_maria_device, read, write)
AM_RANGE(0x0040, 0x00ff) AM_RAMBANK("zpmirror") // mirror of 0x2040-0x20ff, for zero page
AM_RANGE(0x0140, 0x01ff) AM_RAMBANK("spmirror") // mirror of 0x2140-0x21ff, for stack page
- AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x160) AM_DEVICE("riot", mos6532_t, io_map)
- AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_DEVICE("riot", mos6532_t, ram_map)
+ AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x160) AM_DEVICE("riot", mos6532_new_device, io_map)
+ AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_DEVICE("riot", mos6532_new_device, ram_map)
AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("6116_1")
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("6116_2")
// According to the official Software Guide, the RAM at 0x2000 is
@@ -1351,7 +1351,7 @@ void a7800_state::machine_reset()
m_bios_enabled = 0;
}
-static MACHINE_CONFIG_START( a7800_ntsc, a7800_state )
+static MACHINE_CONFIG_START( a7800_ntsc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, A7800_NTSC_Y1/8) /* 1.79 MHz (switches to 1.19 MHz on TIA or RIOT access) */
MCFG_CPU_PROGRAM_MAP(a7800_mem)
@@ -1375,7 +1375,7 @@ static MACHINE_CONFIG_START( a7800_ntsc, a7800_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
- MCFG_DEVICE_ADD("riot", MOS6532n, A7800_NTSC_Y1/8)
+ MCFG_DEVICE_ADD("riot", MOS6532_NEW, A7800_NTSC_Y1/8)
MCFG_MOS6530n_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
MCFG_MOS6530n_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
@@ -1402,7 +1402,7 @@ static MACHINE_CONFIG_DERIVED( a7800_pal, a7800_ntsc )
/* devices */
MCFG_DEVICE_REMOVE("riot")
- MCFG_DEVICE_ADD("riot", MOS6532n, CLK_PAL)
+ MCFG_DEVICE_ADD("riot", MOS6532_NEW, CLK_PAL)
MCFG_MOS6530n_IN_PA_CB(READ8(a7800_state, riot_joystick_r))
MCFG_MOS6530n_IN_PB_CB(READ8(a7800_state, riot_console_button_r))
MCFG_MOS6530n_OUT_PB_CB(WRITE8(a7800_state, riot_button_pullup_w))
@@ -1458,6 +1458,6 @@ DRIVER_INIT_MEMBER(a7800_state,a7800_pal)
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS( 1986, a7800, 0, 0, a7800_ntsc, a7800, a7800_state, a7800_ntsc, "Atari", "Atari 7800 (NTSC)" , 0)
-CONS( 1986, a7800p, a7800, 0, a7800_pal, a7800, a7800_state, a7800_pal, "Atari", "Atari 7800 (PAL)" , 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+CONS( 1986, a7800, 0, 0, a7800_ntsc, a7800, a7800_state, a7800_ntsc, "Atari", "Atari 7800 (NTSC)" , 0)
+CONS( 1986, a7800p, a7800, 0, a7800_pal, a7800, a7800_state, a7800_pal, "Atari", "Atari 7800 (PAL)" , 0)
diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp
index de81fa4514a..ba6aa80b829 100644
--- a/src/mame/drivers/aa310.cpp
+++ b/src/mame/drivers/aa310.cpp
@@ -381,11 +381,11 @@ WRITE_LINE_MEMBER( archimedes_state::a310_kart_rx_w )
archimedes_clear_irq_b(ARCHIMEDES_IRQB_KBD_XMIT_EMPTY);
}
-static MACHINE_CONFIG_START( aa310, aa310_state )
+static MACHINE_CONFIG_START( aa310 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz / 3) /* ARM2 8 MHz */
MCFG_CPU_PROGRAM_MAP(aa310_mem)
- MCFG_ARM_COPRO(ARM_COPRO_TYPE_VL86C020)
+ MCFG_ARM_COPRO(VL86C020)
MCFG_DEVICE_ADD("kart", AAKART, 8000000/256)
MCFG_AAKART_OUT_TX_CB(WRITELINE(archimedes_state, a310_kart_tx_w))
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index 6e0fc84551a..ec7228402d7 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -480,10 +480,10 @@ static ADDRESS_MAP_START( mac_mem, AS_PROGRAM, 8, abc1600_state )
AM_RANGE(0x000000, 0x0fffff) AM_RAM
AM_RANGE(0x100000, 0x17ffff) AM_DEVICE(ABC1600_MOVER_TAG, abc1600_mover_device, vram_map)
AM_RANGE(0x1fe000, 0x1fefff) AM_READWRITE(bus_r, bus_w)
- AM_RANGE(0x1ff000, 0x1ff000) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_t, status_r, cmd_w)
- AM_RANGE(0x1ff002, 0x1ff002) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_t, track_r, track_w)
- AM_RANGE(0x1ff004, 0x1ff004) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_t, sector_r, sector_w)
- AM_RANGE(0x1ff006, 0x1ff006) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_t, data_r, data_w)
+ AM_RANGE(0x1ff000, 0x1ff000) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_device, status_r, cmd_w)
+ AM_RANGE(0x1ff002, 0x1ff002) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_device, track_r, track_w)
+ AM_RANGE(0x1ff004, 0x1ff004) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_device, sector_r, sector_w)
+ AM_RANGE(0x1ff006, 0x1ff006) AM_MIRROR(0xf9) AM_DEVREADWRITE(SAB1797_02P_TAG, fd1797_device, data_r, data_w)
AM_RANGE(0x1ff100, 0x1ff101) AM_MIRROR(0xfe) AM_DEVICE(ABC1600_MOVER_TAG, abc1600_mover_device, crtc_map)
AM_RANGE(0x1ff200, 0x1ff207) AM_MIRROR(0xf8) AM_READWRITE(dart_r, dart_w)
AM_RANGE(0x1ff300, 0x1ff300) AM_MIRROR(0xff) AM_DEVREADWRITE(Z8410AB1_0_TAG, z80dma_device, read, write)
@@ -849,7 +849,7 @@ void abc1600_state::machine_reset()
// MACHINE_CONFIG( abc1600 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( abc1600, abc1600_state )
+static MACHINE_CONFIG_START( abc1600 )
// basic machine hardware
MCFG_CPU_ADD(MC68008P8_TAG, M68008, XTAL_64MHz/8)
MCFG_CPU_PROGRAM_MAP(abc1600_mem)
@@ -973,5 +973,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1985, abc1600, 0, 0, abc1600, abc1600, driver_device, 0, "Luxor", "ABC 1600", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, abc1600, 0, 0, abc1600, abc1600, abc1600_state, 0, "Luxor", "ABC 1600", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 3edf3578444..cd6ce4c780e 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -190,14 +190,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( abc80_io, AS_IO, 8, abc80_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x17)
- AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, inp_r, out_w)
- AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, stat_r, cs_w)
- AM_RANGE(0x02, 0x02) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c1_w)
- AM_RANGE(0x03, 0x03) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c2_w)
- AM_RANGE(0x04, 0x04) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c3_w)
- AM_RANGE(0x05, 0x05) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c4_w)
+ AM_RANGE(0x00, 0x00) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w)
+ AM_RANGE(0x01, 0x01) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w)
+ AM_RANGE(0x02, 0x02) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w)
+ AM_RANGE(0x03, 0x03) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w)
+ AM_RANGE(0x04, 0x04) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w)
+ AM_RANGE(0x05, 0x05) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w)
AM_RANGE(0x06, 0x06) AM_WRITE(csg_w)
- AM_RANGE(0x07, 0x07) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_t, rst_r)
+ AM_RANGE(0x07, 0x07) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r)
AM_RANGE(0x10, 0x13) AM_MIRROR(0x04) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read_alt, write_alt)
ADDRESS_MAP_END
@@ -349,7 +349,7 @@ WRITE_LINE_MEMBER( abc80_state::keydown_w )
m_pio->port_a_write(m_key_strobe << 7);
}
-WRITE8_MEMBER( abc80_state::kbd_w )
+void abc80_state::kbd_w(u8 data)
{
m_key_data = data;
m_key_strobe = 1;
@@ -483,7 +483,7 @@ QUICKLOAD_LOAD_MEMBER( abc80_state, bac )
// MACHINE_CONFIG( abc80 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( abc80, abc80_state )
+static MACHINE_CONFIG_START( abc80 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_11_9808MHz/2/2) // 2.9952 MHz
MCFG_CPU_PROGRAM_MAP(abc80_mem)
@@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( abc80, abc80_state )
MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, nullptr)
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(abc80_state, kbd_w))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(abc80_state, kbd_w))
MCFG_QUICKLOAD_ADD("quickload", abc80_state, bac, "bac", 2)
@@ -590,5 +590,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1978, abc80, 0, 0, abc80, 0, driver_device, 0, "Luxor Datorer AB", "ABC 80", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_KEYBOARD )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, abc80, 0, 0, abc80, 0, abc80_state, 0, "Luxor Datorer AB", "ABC 80", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_KEYBOARD )
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index f2a5d93890b..69910735097 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -448,15 +448,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( abc800c_io, AS_IO, 8, abc800_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, inp_r, out_w)
- AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, stat_r, cs_w)
- AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c1_w)
- AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c2_w)
- AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c3_w)
- AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c4_w)
+ AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w)
+ AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w)
+ AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w)
+ AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w)
+ AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w)
+ AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w)
AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_READ(pling_r)
AM_RANGE(0x06, 0x06) AM_MIRROR(0x18) AM_WRITE(hrs_w)
- AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_t, rst_r) AM_WRITE(hrc_w)
+ AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r) AM_WRITE(hrc_w)
AM_RANGE(0x20, 0x23) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x40, 0x43) AM_MIRROR(0x1c) AM_DEVREADWRITE(Z80SIO_TAG, z80sio2_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x60, 0x63) AM_MIRROR(0x1c) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write)
@@ -507,14 +507,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( abc802_io, AS_IO, 8, abc802_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, inp_r, out_w)
- AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, stat_r, cs_w)
- AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c1_w)
- AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c2_w)
- AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c3_w)
- AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c4_w)
+ AM_RANGE(0x00, 0x00) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w)
+ AM_RANGE(0x01, 0x01) AM_MIRROR(0x18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w)
+ AM_RANGE(0x02, 0x02) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w)
+ AM_RANGE(0x03, 0x03) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w)
+ AM_RANGE(0x04, 0x04) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w)
+ AM_RANGE(0x05, 0x05) AM_MIRROR(0x18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w)
AM_RANGE(0x05, 0x05) AM_MIRROR(0x08) AM_READ(pling_r)
- AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_t, rst_r)
+ AM_RANGE(0x07, 0x07) AM_MIRROR(0x18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r)
AM_RANGE(0x20, 0x23) AM_MIRROR(0x0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x31, 0x31) AM_MIRROR(0x06) AM_DEVREAD(MC6845_TAG, mc6845_device, register_r)
AM_RANGE(0x38, 0x38) AM_MIRROR(0x06) AM_DEVWRITE(MC6845_TAG, mc6845_device, address_w)
@@ -555,14 +555,14 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( abc806_io, AS_IO, 8, abc806_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00, 0x00) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, inp_r, out_w)
- AM_RANGE(0x01, 0x01) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_t, stat_r, cs_w)
- AM_RANGE(0x02, 0x02) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c1_w)
- AM_RANGE(0x03, 0x03) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c2_w)
- AM_RANGE(0x04, 0x04) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c3_w)
- AM_RANGE(0x05, 0x05) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_t, c4_w)
+ AM_RANGE(0x00, 0x00) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, inp_r, out_w)
+ AM_RANGE(0x01, 0x01) AM_MIRROR(0xff18) AM_DEVREADWRITE(ABCBUS_TAG, abcbus_slot_device, stat_r, cs_w)
+ AM_RANGE(0x02, 0x02) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c1_w)
+ AM_RANGE(0x03, 0x03) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c2_w)
+ AM_RANGE(0x04, 0x04) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c3_w)
+ AM_RANGE(0x05, 0x05) AM_MIRROR(0xff18) AM_DEVWRITE(ABCBUS_TAG, abcbus_slot_device, c4_w)
AM_RANGE(0x06, 0x06) AM_MIRROR(0xff18) AM_WRITE(hrs_w)
- AM_RANGE(0x07, 0x07) AM_MIRROR(0xff18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_t, rst_r) AM_WRITE(hrc_w)
+ AM_RANGE(0x07, 0x07) AM_MIRROR(0xff18) AM_DEVREAD(ABCBUS_TAG, abcbus_slot_device, rst_r) AM_WRITE(hrc_w)
AM_RANGE(0x20, 0x23) AM_MIRROR(0xff0c) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x31, 0x31) AM_MIRROR(0xff00) AM_DEVREAD(MC6845_TAG, mc6845_device, register_r)
AM_RANGE(0x34, 0x34) AM_SELECT(0xff00) AM_READWRITE(mai_r, mao_w)
@@ -1018,7 +1018,7 @@ void abc806_state::machine_reset()
// MACHINE_CONFIG( abc800c )
//-------------------------------------------------
-static MACHINE_CONFIG_START( abc800c, abc800c_state )
+static MACHINE_CONFIG_START( abc800c )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
@@ -1093,7 +1093,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( abc800m )
//-------------------------------------------------
-static MACHINE_CONFIG_START( abc800m, abc800m_state )
+static MACHINE_CONFIG_START( abc800m )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
@@ -1168,7 +1168,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( abc802 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( abc802, abc802_state )
+static MACHINE_CONFIG_START( abc802 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
@@ -1244,7 +1244,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( abc806 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( abc806, abc806_state )
+static MACHINE_CONFIG_START( abc806 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, ABC800_X01/2/2)
MCFG_Z80_DAISY_CHAIN(abc800_daisy_chain)
@@ -1581,8 +1581,8 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1981, abc800c, 0, 0, abc800c, abc800, driver_device, 0, "Luxor Datorer AB", "ABC 800 C/HR", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, abc800m, abc800c, 0, abc800m, abc800, driver_device, 0, "Luxor Datorer AB", "ABC 800 M/HR", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1983, abc802, 0, 0, abc802, abc802, driver_device, 0, "Luxor Datorer AB", "ABC 802", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1983, abc806, 0, 0, abc806, abc806, driver_device, 0, "Luxor Datorer AB", "ABC 806", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, abc800c, 0, 0, abc800c, abc800, abc800c_state, 0, "Luxor Datorer AB", "ABC 800 C/HR", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, abc800m, abc800c, 0, abc800m, abc800, abc800m_state, 0, "Luxor Datorer AB", "ABC 800 M/HR", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1983, abc802, 0, 0, abc802, abc802, abc802_state, 0, "Luxor Datorer AB", "ABC 802", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1983, abc806, 0, 0, abc806, abc806, abc806_state, 0, "Luxor Datorer AB", "ABC 806", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index 3f3dc6518d6..291c714aa86 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -126,7 +126,7 @@ static INPUT_PORTS_START( ac1 )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( ac1, ac1_state )
+static MACHINE_CONFIG_START( ac1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 4)
MCFG_CPU_PROGRAM_MAP(ac1_mem)
@@ -216,7 +216,7 @@ ROM_START( ac1scch )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, ac1, 0, 0, ac1, ac1, ac1_state, ac1, "Frank Heyder", "Amateurcomputer AC1 Berlin", 0 )
-COMP( 1984, ac1_32, ac1, 0, ac1_32, ac1, ac1_state, ac1, "Frank Heyder", "Amateurcomputer AC1 Berlin (32 lines)", 0 )
-COMP( 1984, ac1scch, ac1, 0, ac1_32, ac1, ac1_state, ac1, "Frank Heyder", "Amateurcomputer AC1 SCCH", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, ac1, 0, 0, ac1, ac1, ac1_state, ac1, "Frank Heyder", "Amateurcomputer AC1 Berlin", 0 )
+COMP( 1984, ac1_32, ac1, 0, ac1_32, ac1, ac1_state, ac1, "Frank Heyder", "Amateurcomputer AC1 Berlin (32 lines)", 0 )
+COMP( 1984, ac1scch, ac1, 0, ac1_32, ac1, ac1_state, ac1, "Frank Heyder", "Amateurcomputer AC1 SCCH", 0 )
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index a7c855c71ef..3199f95285d 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -316,7 +316,7 @@ void aceal_state::machine_reset()
elem = 0;
}
-static MACHINE_CONFIG_START( ace, aceal_state )
+static MACHINE_CONFIG_START( ace )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* 2 MHz ? */
@@ -358,4 +358,4 @@ ROM_START( ace )
ROM_END
-GAMEL(1976, ace, 0, ace, ace, driver_device, 0, ROT0, "Allied Leisure", "Ace", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_ace )
+GAMEL(1976, ace, 0, ace, ace, aceal_state, 0, ROT0, "Allied Leisure", "Ace", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_ace )
diff --git a/src/mame/drivers/aceex.cpp b/src/mame/drivers/aceex.cpp
index aa0864d74f6..2ce5a81ed86 100644
--- a/src/mame/drivers/aceex.cpp
+++ b/src/mame/drivers/aceex.cpp
@@ -78,7 +78,7 @@ void aceex2814_state::machine_reset()
#define Y1_CLOCK 40320000
#define Y2_CLOCK 45342720
-static MACHINE_CONFIG_START( aceex2814, aceex2814_state )
+static MACHINE_CONFIG_START( aceex2814 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, Y2_CLOCK)
@@ -90,5 +90,5 @@ ROM_START( aceex2814 )
ROM_LOAD( "dm2814u16-194.bin", 0x00000, 0x10000, CRC(36dc423d) SHA1(0f350b7c533eb5270a72587ab3e050e5fe453006) )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1995, aceex2814, 0, 0, aceex2814, aceex2814, driver_device, 0, "Aceex Corporation", "Aceex 2814", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1995, aceex2814, 0, 0, aceex2814, aceex2814, aceex2814_state, 0, "Aceex Corporation", "Aceex 2814", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index 1b67896a6c6..d8b6197948c 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -604,7 +604,7 @@ static GFXDECODE_START( acefruit )
GFXDECODE_ENTRY( "gfx1", 0x1800, charlayout, 8, 4 )
GFXDECODE_END
-static MACHINE_CONFIG_START( acefruit, acefruit_state )
+static MACHINE_CONFIG_START( acefruit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2500000) /* 2.5MHz */
@@ -773,7 +773,7 @@ ROM_END
GAMEL( 1981?, sidewndr, 0, acefruit, sidewndr, acefruit_state, sidewndr, ROT270, "ACE", "Sidewinder", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_sidewndr )
-GAMEL( 1981?, spellbnd, 0, acefruit, spellbnd, driver_device, 0, ROT270, "ACE", "Spellbound", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_sidewndr )
-GAME ( 1982?, starspnr, 0, acefruit, starspnr, driver_device, 0, ROT270, "ACE", "Starspinner (Dutch/Nederlands)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME ( 1982?, acefruit, 0, acefruit, spellbnd, driver_device, 0, ROT270, "ACE", "Silhouette", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // inputs and video in bonus game need fixing on this one
+GAMEL( 1981?, spellbnd, 0, acefruit, spellbnd, acefruit_state, 0, ROT270, "ACE", "Spellbound", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_sidewndr )
+GAME ( 1982?, starspnr, 0, acefruit, starspnr, acefruit_state, 0, ROT270, "ACE", "Starspinner (Dutch/Nederlands)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME ( 1982?, acefruit, 0, acefruit, spellbnd, acefruit_state, 0, ROT270, "ACE", "Silhouette", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // inputs and video in bonus game need fixing on this one
// not dumped: Magnum?
diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp
index 4c1e55cf97a..48ab87c7adf 100644
--- a/src/mame/drivers/aces1.cpp
+++ b/src/mame/drivers/aces1.cpp
@@ -428,7 +428,7 @@ static INPUT_PORTS_START( aces1 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( aces1, aces1_state )
+static MACHINE_CONFIG_START( aces1 )
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */
MCFG_CPU_PROGRAM_MAP(aces1_map)
@@ -835,50 +835,50 @@ DRIVER_INIT_MEMBER(aces1_state,aces1)
{
}
-GAMEL( 199?, ac1clbmn ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Club Money (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL, layout_ac1clbmn )
-GAMEL( 199?, ac1gogld ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Go For Gold (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL, layout_ac1gogld )
-GAME( 199?, ac1hotpf ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Hot Profit (Ace) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, ac1pster ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Pound Sterling (Ace) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL, layout_ac1pster )
-GAMEL( 199?, ac1pstrt ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Pcp", "Pound Stretcher (Pcp) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL, layout_ac1pstrt )
-GAMEL( 199?, ac1primt ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Primetime (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL, layout_ac1primt )
-GAMEL( 199?, ac1taklv ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Take It Or Leave It (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL, layout_ac1taklv )
-GAME( 199?, ac1cshtw ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Cash Towers (Ace) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL ) // same ROM as above, combined, original machine apparently plays the same, reskinned machine?
-GAME( 199?, ac1bbclb ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Big Break Club (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1bbclba ,ac1bbclb ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Big Break Club (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1clbsv ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Club Sovereign (Ace) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1clbxt ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Club Xtra (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1clbxta ,ac1clbxt ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Club Xtra (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1piaca ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Play It Again Casino (Ace) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL ) // Same ROMs were in 'Play It Again Deluxe'
-GAME( 199?, ac1piacl ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Play It Again Club (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1piacla ,ac1piacl ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Play It Again Club (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1piaclb ,ac1piacl ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Play It Again Club (Ace) (ACESYS1) (set 3)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1piaclc ,ac1piacl ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Play It Again Club (Ace) (ACESYS1) (set 4)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1prmcl ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Premier Club (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1prmcla ,ac1prmcl ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Premier Club (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1prmclb ,ac1prmcl ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Premier Club (Ace) (ACESYS1) (set 3)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1prmclc ,ac1prmcl ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Premier Club (Ace) (ACESYS1) (set 4)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1rundx ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Runner Deluxe Club (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1rundxa ,ac1rundx ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Runner Deluxe Club (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1totb ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Top Of The Bill (Ace) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1shid ,0 ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Super Hi De Hi (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, ac1shida ,ac1shid ,aces1 ,aces1 , aces1_state,aces1 ,ROT0 ,"Ace", "Super Hi De Hi (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1dbldx ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Double Deluxe (Pcp) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1nudbk ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1nudbka ,ac1nudbk ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1nudbkb ,ac1nudbk ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 3)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1nudbkc ,ac1nudbk ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 4)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1nudbkd ,ac1nudbk ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 5)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1sstrk ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Starstruck (Pcp) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1sstrka ,ac1sstrk ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Starstruck (Pcp) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1sstrkb ,ac1sstrk ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Starstruck (Pcp) (ACESYS1) (set 3)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1xpres ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Xpress (Pcp) (ACESYS1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1roll ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Roll Up (Pcp) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1rolla ,ac1roll ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Roll Up (Pcp) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1rollb ,ac1roll ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Roll Up (Pcp) (ACESYS1) (set 3)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1bluec ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1blueca ,ac1bluec ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1bluecb ,ac1bluec ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 3)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1bluecc ,ac1bluec ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 4)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1bluecd ,ac1bluec ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 5)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, ac1hideh ,0 ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Ace", "Hi De Hi Deluxe (Ace) (ACESYS1) (set 1)",MACHINE_IS_SKELETON_MECHANICAL ) // was in Hi De Hi (Ace) (sp.ACE) set
-GAME(199?, ac1hideha ,sp_hideh ,aces1 ,aces1 , aces1_state,aces1, ROT0, "Ace", "Hi De Hi Deluxe (Ace) (ACESYS1) (set 2)",MACHINE_IS_SKELETON_MECHANICAL ) // ^^
+GAMEL( 199?, ac1clbmn , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Club Money (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1clbmn )
+GAMEL( 199?, ac1gogld , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Go For Gold (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1gogld )
+GAME( 199?, ac1hotpf , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Hot Profit (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL( 199?, ac1pster , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Pound Sterling (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1pster )
+GAMEL( 199?, ac1pstrt , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Pound Stretcher (Pcp) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1pstrt )
+GAMEL( 199?, ac1primt , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Primetime (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1primt )
+GAMEL( 199?, ac1taklv , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Take It Or Leave It (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1taklv )
+GAME( 199?, ac1cshtw , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Cash Towers (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL ) // same ROM as above, combined, original machine apparently plays the same, reskinned machine?
+GAME( 199?, ac1bbclb , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Big Break Club (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1bbclba , ac1bbclb , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Big Break Club (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1clbsv , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Club Sovereign (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1clbxt , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Club Xtra (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1clbxta , ac1clbxt , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Club Xtra (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1piaca , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Play It Again Casino (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL ) // Same ROMs were in 'Play It Again Deluxe'
+GAME( 199?, ac1piacl , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Play It Again Club (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1piacla , ac1piacl , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Play It Again Club (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1piaclb , ac1piacl , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Play It Again Club (Ace) (ACESYS1) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1piaclc , ac1piacl , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Play It Again Club (Ace) (ACESYS1) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1prmcl , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Premier Club (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1prmcla , ac1prmcl , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Premier Club (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1prmclb , ac1prmcl , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Premier Club (Ace) (ACESYS1) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1prmclc , ac1prmcl , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Premier Club (Ace) (ACESYS1) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1rundx , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Runner Deluxe Club (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1rundxa , ac1rundx , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Runner Deluxe Club (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1totb , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Top Of The Bill (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1shid , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Super Hi De Hi (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1shida , ac1shid , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Super Hi De Hi (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1dbldx , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Double Deluxe (Pcp) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1nudbk , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1nudbka , ac1nudbk , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1nudbkb , ac1nudbk , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1nudbkc , ac1nudbk , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1nudbkd , ac1nudbk , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Nudge Break (Pcp) (ACESYS1) (set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1sstrk , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Starstruck (Pcp) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1sstrka , ac1sstrk , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Starstruck (Pcp) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1sstrkb , ac1sstrk , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Starstruck (Pcp) (ACESYS1) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1xpres , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Xpress (Pcp) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1roll , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Roll Up (Pcp) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1rolla , ac1roll , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Roll Up (Pcp) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1rollb , ac1roll , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Roll Up (Pcp) (ACESYS1) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1bluec , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1blueca , ac1bluec , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1bluecb , ac1bluec , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1bluecc , ac1bluec , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1bluecd , ac1bluec , aces1, aces1, aces1_state, aces1, ROT0, "Pcp", "Blue Chip (Pcp) (ACESYS1) (set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, ac1hideh , 0 , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Hi De Hi Deluxe (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL ) // was in Hi De Hi (Ace) (sp.ACE) set
+GAME( 199?, ac1hideha , sp_hideh , aces1, aces1, aces1_state, aces1, ROT0, "Ace", "Hi De Hi Deluxe (Ace) (ACESYS1) (set 2)", MACHINE_IS_SKELETON_MECHANICAL ) // ^^
diff --git a/src/mame/drivers/acesp.cpp b/src/mame/drivers/acesp.cpp
index 80567301201..43ad6558617 100644
--- a/src/mame/drivers/acesp.cpp
+++ b/src/mame/drivers/acesp.cpp
@@ -79,7 +79,7 @@ static INPUT_PORTS_START( ace_sp )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ace_sp, ace_sp_state )
+static MACHINE_CONFIG_START( ace_sp )
MCFG_CPU_ADD("maincpu", HD6303Y, 1000000)
MCFG_CPU_PROGRAM_MAP(ace_sp_map)
MCFG_CPU_IO_MAP(ace_sp_portmap)
diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp
index 690b745dcd3..0ea7854d02b 100644
--- a/src/mame/drivers/acommand.cpp
+++ b/src/mame/drivers/acommand.cpp
@@ -458,7 +458,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(acommand_state::acommand_scanline)
m_maincpu->set_input_line(3, HOLD_LINE);
}
-static MACHINE_CONFIG_START( acommand, acommand_state )
+static MACHINE_CONFIG_START( acommand )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,12000000)
@@ -484,11 +484,11 @@ static MACHINE_CONFIG_START( acommand, acommand_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -531,4 +531,4 @@ ROM_START( acommand )
ROM_LOAD( "jalmr17.bin", 0x080000, 0x080000, CRC(9d428fb7) SHA1(02f72938d73db932bd217620a175a05215f6016a) )
ROM_END
-GAMEL( 1994, acommand, 0, acommand, acommand, driver_device, 0, ROT0, "Jaleco", "Alien Command" , MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_acommand )
+GAMEL( 1994, acommand, 0, acommand, acommand, acommand_state, 0, ROT0, "Jaleco", "Alien Command" , MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_acommand )
diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp
index a9faef5e6df..5ac7f7eb17c 100644
--- a/src/mame/drivers/acrnsys1.cpp
+++ b/src/mame/drivers/acrnsys1.cpp
@@ -242,7 +242,7 @@ INPUT_PORTS_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( acrnsys1, acrnsys1_state )
+static MACHINE_CONFIG_START( acrnsys1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1008000) /* 1.008 MHz */
MCFG_CPU_PROGRAM_MAP(acrnsys1_map)
@@ -280,5 +280,5 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, acrnsys1, 0, 0, acrnsys1, acrnsys1, driver_device, 0, "Acorn", "Acorn System 1", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1978, acrnsys1, 0, 0, acrnsys1, acrnsys1, acrnsys1_state, 0, "Acorn", "Acorn System 1", 0 )
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 679feec959e..c4b5a9c38ad 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -290,7 +290,7 @@ MACHINE_RESET_MEMBER(actfancr_state,triothep)
/******************************************************************************/
-static MACHINE_CONFIG_START( actfancr, actfancr_state )
+static MACHINE_CONFIG_START( actfancr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, 21477200/3) /* Should be accurate */
@@ -340,11 +340,11 @@ static MACHINE_CONFIG_START( actfancr, actfancr_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MCFG_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1024188, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( triothep, actfancr_state )
+static MACHINE_CONFIG_START( triothep )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
@@ -397,7 +397,7 @@ static MACHINE_CONFIG_START( triothep, actfancr_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_CONFIG_END
@@ -571,8 +571,8 @@ ROM_END
/******************************************************************************/
-GAME( 1989, actfancr, 0, actfancr, actfancr, driver_device, 0, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (World revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, actfancr1,actfancr, actfancr, actfancr, driver_device, 0, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (World revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, actfancrj,actfancr, actfancr, actfancr, driver_device, 0, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (Japan revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, triothep, 0, triothep, triothep, driver_device, 0, ROT0, "Data East Corporation", "Trio The Punch - Never Forget Me... (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, triothepj,triothep, triothep, triothep, driver_device, 0, ROT0, "Data East Corporation", "Trio The Punch - Never Forget Me... (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, actfancr, 0, actfancr, actfancr, actfancr_state, 0, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (World revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, actfancr1,actfancr, actfancr, actfancr, actfancr_state, 0, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (World revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, actfancrj,actfancr, actfancr, actfancr, actfancr_state, 0, ROT0, "Data East Corporation", "Act-Fancer Cybernetick Hyper Weapon (Japan revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, triothep, 0, triothep, triothep, actfancr_state, 0, ROT0, "Data East Corporation", "Trio The Punch - Never Forget Me... (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, triothepj,triothep, triothep, triothep, actfancr_state, 0, ROT0, "Data East Corporation", "Trio The Punch - Never Forget Me... (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index 230518deb05..bb9ffe50744 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -1047,7 +1047,7 @@ DEVICE_INPUT_DEFAULTS_END
// MACHINE_CONFIG( adam )
//-------------------------------------------------
-static MACHINE_CONFIG_START( adam, adam_state )
+static MACHINE_CONFIG_START( adam )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_15909MHz/2)
MCFG_CPU_PROGRAM_MAP(adam_mem)
@@ -1146,5 +1146,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1982, adam, 0, coleco, adam, adam, driver_device, 0, "Coleco", "Adam", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, adam, 0, coleco, adam, adam, adam_state, 0, "Coleco", "Adam", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index eec373a4bf3..e12f46bec30 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -177,7 +177,7 @@ public:
m_duart(*this, "duart68681"),
m_palette(*this, "palette"),
m_in0(*this, "IN0")
- { }
+ { }
required_device<microtouch_device> m_microtouch;
required_device<cpu_device> m_maincpu;
@@ -533,7 +533,7 @@ static ADDRESS_MAP_START( fstation_hd63484_map, AS_0, 16, adp_state )
AM_RANGE(0x80000, 0xfffff) AM_RAM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( quickjac, adp_state )
+static MACHINE_CONFIG_START( quickjac )
MCFG_CPU_ADD("maincpu", M68000, 8000000)
MCFG_CPU_PROGRAM_MAP(quickjac_mem)
@@ -721,11 +721,11 @@ ROM_START( fstation )
ROM_END
-GAME( 1990, backgamn, 0, backgamn, skattv, driver_device, 0, ROT0, "ADP", "Backgammon", MACHINE_NOT_WORKING )
-GAME( 1993, quickjac, 0, quickjac, quickjac, driver_device, 0, ROT0, "ADP", "Quick Jack", MACHINE_NOT_WORKING )
-GAME( 1994, skattv, 0, skattv, skattv, driver_device, 0, ROT0, "ADP", "Skat TV", MACHINE_NOT_WORKING )
-GAME( 1995, skattva, skattv, skattva, skattva, driver_device, 0, ROT0, "ADP", "Skat TV (version TS3)", MACHINE_NOT_WORKING )
-GAME( 1997, fashiong, 0, fashiong, skattv, driver_device, 0, ROT0, "ADP", "Fashion Gambler (set 1)", MACHINE_NOT_WORKING )
-GAME( 1997, fashiong2, fashiong, fashiong, skattv, driver_device, 0, ROT0, "ADP", "Fashion Gambler (set 2)", MACHINE_NOT_WORKING )
-GAME( 1999, funlddlx, 0, funland, skattv, driver_device, 0, ROT0, "Stella", "Funny Land de Luxe", MACHINE_NOT_WORKING )
-GAME( 2000, fstation, 0, fstation, fstation, driver_device, 0, ROT0, "ADP", "Fun Station Spielekoffer 9 Spiele", MACHINE_NOT_WORKING )
+GAME( 1990, backgamn, 0, backgamn, skattv, adp_state, 0, ROT0, "ADP", "Backgammon", MACHINE_NOT_WORKING )
+GAME( 1993, quickjac, 0, quickjac, quickjac, adp_state, 0, ROT0, "ADP", "Quick Jack", MACHINE_NOT_WORKING )
+GAME( 1994, skattv, 0, skattv, skattv, adp_state, 0, ROT0, "ADP", "Skat TV", MACHINE_NOT_WORKING )
+GAME( 1995, skattva, skattv, skattva, skattva, adp_state, 0, ROT0, "ADP", "Skat TV (version TS3)", MACHINE_NOT_WORKING )
+GAME( 1997, fashiong, 0, fashiong, skattv, adp_state, 0, ROT0, "ADP", "Fashion Gambler (set 1)", MACHINE_NOT_WORKING )
+GAME( 1997, fashiong2, fashiong, fashiong, skattv, adp_state, 0, ROT0, "ADP", "Fashion Gambler (set 2)", MACHINE_NOT_WORKING )
+GAME( 1999, funlddlx, 0, funland, skattv, adp_state, 0, ROT0, "Stella", "Funny Land de Luxe", MACHINE_NOT_WORKING )
+GAME( 2000, fstation, 0, fstation, fstation, adp_state, 0, ROT0, "ADP", "Fun Station Spielekoffer 9 Spiele", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index 7b4645726bf..88b545390fa 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -61,7 +61,7 @@ INPUT_PORTS_END
/* Machine Driver */
-static MACHINE_CONFIG_START( advision, advision_state )
+static MACHINE_CONFIG_START( advision )
/* basic machine hardware */
MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_11MHz)
MCFG_CPU_PROGRAM_MAP(program_map)
@@ -114,5 +114,5 @@ ROM_END
/* Game Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1982, advision, 0, 0, advision, advision, driver_device, 0, "Entex", "Adventure Vision", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1982, advision, 0, 0, advision, advision, advision_state, 0, "Entex", "Adventure Vision", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index 25dd1ee8cf4..ea0f5ffce98 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -236,7 +236,7 @@ void aeroboto_state::machine_reset()
m_sy = 0;
}
-static MACHINE_CONFIG_START( formatz, aeroboto_state )
+static MACHINE_CONFIG_START( formatz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_10MHz/8) /* verified on pcb */
@@ -338,5 +338,5 @@ ROM_END
-GAME( 1984, formatz, 0, formatz, formatz, driver_device, 0, ROT0, "Jaleco", "Formation Z", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, aeroboto, formatz, formatz, formatz, driver_device, 0, ROT0, "Jaleco (Williams license)", "Aeroboto", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, formatz, 0, formatz, formatz, aeroboto_state, 0, ROT0, "Jaleco", "Formation Z", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, aeroboto, formatz, formatz, formatz, aeroboto_state, 0, ROT0, "Jaleco (Williams license)", "Aeroboto", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 0ef45ccc3c6..5a1d4b662b6 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -1332,7 +1332,7 @@ MACHINE_RESET_MEMBER(aerofgt_state,aerofgt)
m_soundbank->set_entry(0); /* needed by spinlbrk */
}
-static MACHINE_CONFIG_START( pspikes, aerofgt_state )
+static MACHINE_CONFIG_START( pspikes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@@ -1382,7 +1382,7 @@ static MACHINE_CONFIG_START( pspikes, aerofgt_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spikes91, aerofgt_state )
+static MACHINE_CONFIG_START( spikes91 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1420,7 +1420,7 @@ static MACHINE_CONFIG_START( spikes91, aerofgt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pspikesb, aerofgt_state )
+static MACHINE_CONFIG_START( pspikesb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1450,11 +1450,11 @@ static MACHINE_CONFIG_START( pspikesb, aerofgt_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified, pin high causes sound pitch to be too high
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_LOW) // clock frequency & pin 7 not verified, pin high causes sound pitch to be too high
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pspikesc, aerofgt_state )
+static MACHINE_CONFIG_START( pspikesc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1489,11 +1489,11 @@ static MACHINE_CONFIG_START( pspikesc, aerofgt_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( karatblz, aerofgt_state )
+static MACHINE_CONFIG_START( karatblz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1548,7 +1548,7 @@ static MACHINE_CONFIG_START( karatblz, aerofgt_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( karatblzbl, aerofgt_state )
+static MACHINE_CONFIG_START( karatblzbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1604,7 +1604,7 @@ static MACHINE_CONFIG_START( karatblzbl, aerofgt_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spinlbrk, aerofgt_state )
+static MACHINE_CONFIG_START( spinlbrk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@@ -1660,7 +1660,7 @@ static MACHINE_CONFIG_START( spinlbrk, aerofgt_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( turbofrc, aerofgt_state )
+static MACHINE_CONFIG_START( turbofrc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@@ -1715,7 +1715,7 @@ static MACHINE_CONFIG_START( turbofrc, aerofgt_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aerofgtb, aerofgt_state )
+static MACHINE_CONFIG_START( aerofgtb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1771,7 +1771,7 @@ static MACHINE_CONFIG_START( aerofgtb, aerofgt_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aerofgt, aerofgt_state )
+static MACHINE_CONFIG_START( aerofgt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@@ -1830,7 +1830,7 @@ static MACHINE_CONFIG_START( aerofgt, aerofgt_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aerfboot, aerofgt_state )
+static MACHINE_CONFIG_START( aerfboot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1866,12 +1866,12 @@ static MACHINE_CONFIG_START( aerfboot, aerofgt_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aerfboo2, aerofgt_state )
+static MACHINE_CONFIG_START( aerfboo2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1902,11 +1902,11 @@ static MACHINE_CONFIG_START( aerfboo2, aerofgt_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wbbc97, aerofgt_state )
+static MACHINE_CONFIG_START( wbbc97 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */
@@ -1949,7 +1949,7 @@ static MACHINE_CONFIG_START( wbbc97, aerofgt_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -2856,34 +2856,34 @@ DRIVER_INIT_MEMBER(aerofgt_state, banked_oki)
}
-GAME( 1990, spinlbrk, 0, spinlbrk, spinlbrk, driver_device, 0, ROT0, "V-System Co.", "Spinal Breakers (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1990, spinlbrku,spinlbrk, spinlbrk, spinlbrku, driver_device,0, ROT0, "V-System Co.", "Spinal Breakers (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1990, spinlbrkj,spinlbrk, spinlbrk, spinlbrk, driver_device, 0, ROT0, "V-System Co.", "Spinal Breakers (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1990, spinlbrk, 0, spinlbrk, spinlbrk, aerofgt_state, 0, ROT0, "V-System Co.", "Spinal Breakers (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1990, spinlbrku, spinlbrk, spinlbrk, spinlbrku, aerofgt_state, 0, ROT0, "V-System Co.", "Spinal Breakers (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1990, spinlbrkj, spinlbrk, spinlbrk, spinlbrk, aerofgt_state, 0, ROT0, "V-System Co.", "Spinal Breakers (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, pspikes, 0, pspikes, pspikes, driver_device, 0, ROT0, "Video System Co.", "Power Spikes (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, pspikesk, pspikes, pspikes, pspikes, driver_device, 0, ROT0, "Video System Co.", "Power Spikes (Korea)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, pspikesu, pspikes, pspikes, pspikes, driver_device, 0, ROT0, "Video System Co.", "Power Spikes (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, svolly91, pspikes, pspikes, pspikes, driver_device, 0, ROT0, "Video System Co.", "Super Volley '91 (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, pspikesb, pspikes, pspikesb, pspikesb, driver_device, 0, ROT0, "bootleg", "Power Spikes (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, pspikesba,pspikes, pspikesb, pspikesb, driver_device, 0, ROT0, "bootleg (Playmark?)","Power Spikes (Italian bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, spikes91, pspikes, spikes91, pspikes, driver_device, 0, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL )
-GAME( 1991, spikes91b,pspikes, spikes91, pspikes, driver_device, 0, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL )
-GAME( 1991, pspikesc, pspikes, pspikesc, pspikesc, driver_device, 0, ROT0, "bootleg", "Power Spikes (China)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, wbbc97, 0, wbbc97, wbbc97, driver_device, 0, ROT0, "Comad", "Beach Festival World Championship 1997", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // based on power spikes codebase
+GAME( 1991, pspikes, 0, pspikes, pspikes, aerofgt_state, 0, ROT0, "Video System Co.", "Power Spikes (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, pspikesk, pspikes, pspikes, pspikes, aerofgt_state, 0, ROT0, "Video System Co.", "Power Spikes (Korea)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, pspikesu, pspikes, pspikes, pspikes, aerofgt_state, 0, ROT0, "Video System Co.", "Power Spikes (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, svolly91, pspikes, pspikes, pspikes, aerofgt_state, 0, ROT0, "Video System Co.", "Super Volley '91 (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, pspikesb, pspikes, pspikesb, pspikesb, aerofgt_state, 0, ROT0, "bootleg", "Power Spikes (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, pspikesba, pspikes, pspikesb, pspikesb, aerofgt_state, 0, ROT0, "bootleg (Playmark?)","Power Spikes (Italian bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, spikes91, pspikes, spikes91, pspikes, aerofgt_state, 0, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL )
+GAME( 1991, spikes91b, pspikes, spikes91, pspikes, aerofgt_state, 0, ROT0, "bootleg", "1991 Spikes (Italian bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL )
+GAME( 1991, pspikesc, pspikes, pspikesc, pspikesc, aerofgt_state, 0, ROT0, "bootleg", "Power Spikes (China)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, wbbc97, 0, wbbc97, wbbc97, aerofgt_state, 0, ROT0, "Comad", "Beach Festival World Championship 1997", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // based on power spikes codebase
-GAME( 1991, karatblz, 0, karatblz, karatblz, driver_device, 0, ROT0, "Video System Co.", "Karate Blazers (World, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, karatblza,karatblz, karatblz, karatblz, driver_device, 0, ROT0, "Video System Co.", "Karate Blazers (World, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, karatblzu,karatblz, karatblz, karatblz, driver_device, 0, ROT0, "Video System Co.", "Karate Blazers (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, karatblzj,karatblz, karatblz, karatblz, driver_device, 0, ROT0, "Video System Co.", "Toushin Blazers (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, karatblzbl,karatblz,karatblzbl,karatblz,driver_device, 0, ROT0, "bootleg", "Karate Blazers (bootleg with Street Smart sound hardware)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1991, karatblz, 0, karatblz, karatblz, aerofgt_state, 0, ROT0, "Video System Co.", "Karate Blazers (World, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, karatblza, karatblz, karatblz, karatblz, aerofgt_state, 0, ROT0, "Video System Co.", "Karate Blazers (World, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, karatblzu, karatblz, karatblz, karatblz, aerofgt_state, 0, ROT0, "Video System Co.", "Karate Blazers (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, karatblzj, karatblz, karatblz, karatblz, aerofgt_state, 0, ROT0, "Video System Co.", "Toushin Blazers (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, karatblzbl, karatblz, karatblzbl, karatblz, aerofgt_state, 0, ROT0, "bootleg", "Karate Blazers (bootleg with Street Smart sound hardware)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
-GAME( 1991, turbofrc, 0, turbofrc, turbofrc, driver_device, 0, ROT270, "Video System Co.", "Turbo Force (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1991, turbofrcu,turbofrc, turbofrc, turbofrc, driver_device, 0, ROT270, "Video System Co.", "Turbo Force (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, turbofrc, 0, turbofrc, turbofrc, aerofgt_state, 0, ROT270, "Video System Co.", "Turbo Force (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1991, turbofrcu, turbofrc, turbofrc, turbofrc, aerofgt_state, 0, ROT270, "Video System Co.", "Turbo Force (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
// the tiles on these also contain an alt title 'The Final War' for both the title screen and attract logo was it ever used?
-GAME( 1992, aerofgt, 0, aerofgt, aerofgt, driver_device, 0, ROT270, "Video System Co.", "Aero Fighters (World / USA + Canada / Korea / Hong Kong / Taiwan) (newer hardware)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // this has the newer sprite chip etc. unlike all other games in this driver..
-GAME( 1992, aerofgtb, aerofgt, aerofgtb, aerofgtb, driver_device, 0, ROT270, "Video System Co.", "Aero Fighters (Taiwan / Japan, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // probably intended for Taiwan because the Japanese name is Sonic Wings (below)
-GAME( 1992, aerofgtc, aerofgt, aerofgtb, aerofgtb, driver_device, 0, ROT270, "Video System Co.", "Aero Fighters (Taiwan / Japan, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1992, sonicwi, aerofgt, aerofgtb, aerofgtb, driver_device, 0, ROT270, "Video System Co.", "Sonic Wings (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1992, aerfboot, aerofgt, aerfboot, aerofgtb, aerofgt_state, banked_oki, ROT270, "bootleg", "Aero Fighters (bootleg set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
-GAME( 1992, aerfboo2, aerofgt, aerfboo2, aerofgtb, driver_device, 0, ROT270, "bootleg", "Aero Fighters (bootleg set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1992, aerofgt, 0, aerofgt, aerofgt, aerofgt_state, 0, ROT270, "Video System Co.", "Aero Fighters (World / USA + Canada / Korea / Hong Kong / Taiwan) (newer hardware)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // this has the newer sprite chip etc. unlike all other games in this driver..
+GAME( 1992, aerofgtb, aerofgt, aerofgtb, aerofgtb, aerofgt_state, 0, ROT270, "Video System Co.", "Aero Fighters (Taiwan / Japan, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) // probably intended for Taiwan because the Japanese name is Sonic Wings (below)
+GAME( 1992, aerofgtc, aerofgt, aerofgtb, aerofgtb, aerofgt_state, 0, ROT270, "Video System Co.", "Aero Fighters (Taiwan / Japan, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1992, sonicwi, aerofgt, aerofgtb, aerofgtb, aerofgt_state, 0, ROT270, "Video System Co.", "Sonic Wings (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1992, aerfboot, aerofgt, aerfboot, aerofgtb, aerofgt_state, banked_oki, ROT270, "bootleg", "Aero Fighters (bootleg set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1992, aerfboo2, aerofgt, aerfboo2, aerofgtb, aerofgt_state, 0, ROT270, "bootleg", "Aero Fighters (bootleg set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 44f13c83a9e..546122ead74 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -1004,7 +1004,7 @@ static SLOT_INTERFACE_START(agat7_cards)
// Nippel Co-processor (R65C02 clone + dual-ported RAM)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( agat7, agat7_state )
+static MACHINE_CONFIG_START( agat7 )
MCFG_CPU_ADD("maincpu", M6502, XTAL_14_3MHz / 14)
MCFG_CPU_PROGRAM_MAP(agat7_map)
@@ -1110,6 +1110,6 @@ ROM_START( agat9 )
ROM_LOAD( "agathe9.fnt", 0x0000, 0x0800, CRC(8c55c984) SHA1(5a5a202000576b88b4ae2e180dd2d1b9b337b594))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, agat7, apple2, 0, agat7, agat7, driver_device, 0, "Agat", "Agat-7", MACHINE_NOT_WORKING)
-COMP( 1984, agat9, apple2, 0, agat7, agat7, driver_device, 0, "Agat", "Agat-9", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, agat7, apple2, 0, agat7, agat7, agat7_state, 0, "Agat", "Agat-7", MACHINE_NOT_WORKING)
+COMP( 1984, agat9, apple2, 0, agat7, agat7, agat7_state, 0, "Agat", "Agat-9", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp
index 42ac7a8e293..3c7a4a2df8d 100644
--- a/src/mame/drivers/age_candy.cpp
+++ b/src/mame/drivers/age_candy.cpp
@@ -44,7 +44,7 @@ void age_candy_state::machine_reset()
}
-static MACHINE_CONFIG_START( age_candy, age_candy_state )
+static MACHINE_CONFIG_START( age_candy )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown (vectors at end? 6xxx ?)
@@ -62,4 +62,4 @@ ROM_START( age_cand )
ROM_LOAD( "AGEcandy.u3", 0x0000, 0x8000, CRC(c8cfc666) SHA1(a1c475ae105746e984741af0723a712f09d7b847) )
ROM_END
-GAME( 19??, age_cand, 0, age_candy, age_candy, driver_device, 0, ROT0, "Advanced Game Engineering", "Candy Crane (AGE)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 19??, age_cand, 0, age_candy, age_candy, age_candy_state, 0, ROT0, "Advanced Game Engineering", "Candy Crane (AGE)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp
index 24345c59557..17f9b005ddb 100644
--- a/src/mame/drivers/aim65.cpp
+++ b/src/mame/drivers/aim65.cpp
@@ -43,8 +43,8 @@ static ADDRESS_MAP_START( aim65_mem, AS_PROGRAM, 8, aim65_state )
AM_RANGE( 0x4000, 0x7fff ) AM_ROM /* 4 ROM sockets in 16K PROM/ROM module */
AM_RANGE( 0x8000, 0x9fff ) AM_NOP /* User available expansions */
AM_RANGE( 0xa000, 0xa00f ) AM_MIRROR(0x3f0) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) // user via
- AM_RANGE( 0xa400, 0xa47f ) AM_DEVICE("riot", mos6532_t, ram_map)
- AM_RANGE( 0xa480, 0xa497 ) AM_DEVICE("riot", mos6532_t, io_map)
+ AM_RANGE( 0xa400, 0xa47f ) AM_DEVICE("riot", mos6532_new_device, ram_map)
+ AM_RANGE( 0xa480, 0xa497 ) AM_DEVICE("riot", mos6532_new_device, io_map)
AM_RANGE( 0xa498, 0xa7ff ) AM_NOP /* Not available */
AM_RANGE( 0xa800, 0xa80f ) AM_MIRROR(0x3f0) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) // system via
AM_RANGE( 0xac00, 0xac03 ) AM_DEVREADWRITE("pia6821", pia6821_device, read, write)
@@ -176,7 +176,7 @@ image_init_result aim65_state::load_cart(device_image_interface &image, generic_
}
-static MACHINE_CONFIG_START( aim65, aim65_state )
+static MACHINE_CONFIG_START( aim65 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, AIM65_CLOCK) /* 1 MHz */
MCFG_CPU_PROGRAM_MAP(aim65_mem)
@@ -201,7 +201,7 @@ static MACHINE_CONFIG_START( aim65, aim65_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* other devices */
- MCFG_DEVICE_ADD("riot", MOS6532n, AIM65_CLOCK)
+ MCFG_DEVICE_ADD("riot", MOS6532_NEW, AIM65_CLOCK)
MCFG_MOS6530n_OUT_PA_CB(WRITE8(aim65_state, aim65_riot_a_w))
MCFG_MOS6530n_IN_PB_CB(READ8(aim65_state, aim65_riot_b_r))
MCFG_MOS6530n_IRQ_CB(INPUTLINE("maincpu", M6502_IRQ_LINE))
@@ -306,5 +306,5 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP(1977, aim65, 0, 0, aim65, aim65, driver_device, 0, "Rockwell", "AIM 65", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP(1977, aim65, 0, 0, aim65, aim65, aim65_state, 0, "Rockwell", "AIM 65", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp
index df749db8493..62e19748afd 100644
--- a/src/mame/drivers/aim65_40.cpp
+++ b/src/mame/drivers/aim65_40.cpp
@@ -107,7 +107,7 @@ INPUT_PORTS_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( aim65_40, aim65_40_state )
+static MACHINE_CONFIG_START( aim65_40 )
/* basic machine hardware */
MCFG_CPU_ADD(M6502_TAG, M6502, 1000000)
MCFG_CPU_PROGRAM_MAP(aim65_40_mem)
@@ -141,5 +141,5 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, aim65_40, 0, 0, aim65_40, aim65_40, driver_device, 0, "Rockwell", "AIM-65/40", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, aim65_40, 0, 0, aim65_40, aim65_40, aim65_40_state, 0, "Rockwell", "AIM-65/40", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index 54062dc6619..7f7f2043719 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -569,7 +569,7 @@ void airbustr_state::machine_reset()
/* Machine Driver */
-static MACHINE_CONFIG_START( airbustr, airbustr_state )
+static MACHINE_CONFIG_START( airbustr )
/* basic machine hardware */
MCFG_CPU_ADD("master", Z80, XTAL_12MHz/2) /* verified on pcb */
@@ -625,7 +625,7 @@ static MACHINE_CONFIG_START( airbustr, airbustr_state )
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -740,6 +740,6 @@ DRIVER_INIT_MEMBER(airbustr_state,airbustr)
/* Game Drivers */
-GAME( 1990, airbustr, 0, airbustr, airbustr, airbustr_state, airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (World)", MACHINE_SUPPORTS_SAVE ) // 891220
-GAME( 1990, airbustrj, airbustr, airbustr, airbustrj, airbustr_state,airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (Japan)", MACHINE_SUPPORTS_SAVE) // 891229
-GAME( 1990, airbustrb, airbustr, airbustrb,airbustrj, driver_device,0, ROT0, "bootleg", "Air Buster: Trouble Specialty Raid Unit (bootleg)", MACHINE_SUPPORTS_SAVE) // based on Japan set (891229)
+GAME( 1990, airbustr, 0, airbustr, airbustr, airbustr_state, airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (World)", MACHINE_SUPPORTS_SAVE ) // 891220
+GAME( 1990, airbustrj, airbustr, airbustr, airbustrj, airbustr_state, airbustr, ROT0, "Kaneko (Namco license)", "Air Buster: Trouble Specialty Raid Unit (Japan)", MACHINE_SUPPORTS_SAVE ) // 891229
+GAME( 1990, airbustrb, airbustr, airbustrb,airbustrj, airbustr_state, 0, ROT0, "bootleg", "Air Buster: Trouble Specialty Raid Unit (bootleg)", MACHINE_SUPPORTS_SAVE ) // based on Japan set (891229)
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index 483e0215932..12b53b1a789 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -387,7 +387,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( airraid, airraid_state )
+static MACHINE_CONFIG_START( airraid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* verified on pcb */
@@ -628,6 +628,6 @@ DRIVER_INIT_MEMBER(airraid_state,cshootere)
}
// There's also an undumped International Games version
-GAME( 1987, cshooter, airraid, airraid_crypt, airraid, airraid_state, cshootere, ROT270, "Seibu Kaihatsu (J.K.H. license)", "Cross Shooter (Single PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, airraid, 0, airraid_crypt, airraid, airraid_state, cshootere, ROT270, "Seibu Kaihatsu", "Air Raid (Single PCB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1987, cshooter, airraid, airraid_crypt, airraid, airraid_state, cshootere, ROT270, "Seibu Kaihatsu (J.K.H. license)", "Cross Shooter (Single PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, airraid, 0, airraid_crypt, airraid, airraid_state, cshootere, ROT270, "Seibu Kaihatsu", "Air Raid (Single PCB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index 71e22cdc537..bd4db94f2be 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -167,7 +167,7 @@ WRITE8_MEMBER(ajax_state::volume_callback1)
}
-static MACHINE_CONFIG_START( ajax, ajax_state )
+static MACHINE_CONFIG_START( ajax )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 12/4 MHz*/
@@ -377,6 +377,6 @@ ROM_START( ajaxj )
ROM_END
-GAME( 1987, ajax, 0, ajax, ajax, driver_device, 0, ROT90, "Konami", "Ajax", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, typhoon, ajax, ajax, ajax, driver_device, 0, ROT90, "Konami", "Typhoon", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ajaxj, ajax, ajax, ajax, driver_device, 0, ROT90, "Konami", "Ajax (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ajax, 0, ajax, ajax, ajax_state, 0, ROT90, "Konami", "Ajax", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, typhoon, ajax, ajax, ajax, ajax_state, 0, ROT90, "Konami", "Typhoon", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ajaxj, ajax, ajax, ajax, ajax_state, 0, ROT90, "Konami", "Ajax (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/akaiax80.cpp b/src/mame/drivers/akaiax80.cpp
index 6d04b1b0dca..0cb00e9148d 100644
--- a/src/mame/drivers/akaiax80.cpp
+++ b/src/mame/drivers/akaiax80.cpp
@@ -71,7 +71,7 @@ static ADDRESS_MAP_START( ax80_map, AS_PROGRAM, 8, ax80_state )
AM_RANGE(0xff00, 0xffff) AM_RAM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( ax80, ax80_state )
+static MACHINE_CONFIG_START( ax80 )
MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(ax80_map)
//MCFG_CPU_IO_MAP(ax80_io)
@@ -98,4 +98,4 @@ ROM_START( ax80 )
ROM_LOAD( "akai ax80 (rev k) rom.bin", 0x001000, 0x002000, CRC(a2f95ccf) SHA1(4e5f2c4c9a08ec1d38146cae786b400261a3dbb7) )
ROM_END
-CONS( 1984, ax80, 0, 0, ax80, ax80, driver_device, 0, "Akai", "AX80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 1984, ax80, 0, 0, ax80, ax80, ax80_state, 0, "Akai", "AX80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp
index 75d9d3d992c..bf10836f198 100644
--- a/src/mame/drivers/albazc.cpp
+++ b/src/mame/drivers/albazc.cpp
@@ -271,7 +271,7 @@ static GFXDECODE_START( hanaroku )
GFXDECODE_END
-static MACHINE_CONFIG_START( hanaroku, albazc_state )
+static MACHINE_CONFIG_START( hanaroku )
MCFG_CPU_ADD("maincpu", Z80,6000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(hanaroku_map)
@@ -321,4 +321,4 @@ ROM_START( hanaroku )
ROM_END
-GAME( 1988, hanaroku, 0, hanaroku, hanaroku, driver_device, 0, ROT0, "Alba", "Hanaroku", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hanaroku, 0, hanaroku, hanaroku, albazc_state, 0, ROT0, "Alba", "Hanaroku", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 87631b6fc1a..146e22876c4 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -346,7 +346,7 @@ void albazg_state::machine_reset()
m_prot_lock = 0;
}
-static MACHINE_CONFIG_START( yumefuda, albazg_state )
+static MACHINE_CONFIG_START( yumefuda )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80 , MASTER_CLOCK/2) /* xtal is 12 Mhz, unknown divider*/
@@ -410,4 +410,4 @@ ROM_START( yumefuda )
ROM_LOAD("zg1-007.u13", 0x000, 0x100, NO_DUMP ) //could be either PROM or PAL
ROM_END
-GAME( 1991, yumefuda, 0, yumefuda, yumefuda, driver_device, 0, ROT0, "Alba", "Yumefuda [BET]", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, yumefuda, 0, yumefuda, yumefuda, albazg_state, 0, ROT0, "Alba", "Yumefuda [BET]", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp
index 25c8e89478c..db82130e0f6 100644
--- a/src/mame/drivers/aleck64.cpp
+++ b/src/mame/drivers/aleck64.cpp
@@ -898,7 +898,7 @@ static INPUT_PORTS_START( srmvs )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( aleck64, aleck64_state )
+static MACHINE_CONFIG_START( aleck64 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", VR4300BE, 93750000)
@@ -1227,13 +1227,13 @@ ROM_END
GAME( 1998, aleck64, 0, aleck64, aleck64, aleck64_state, aleck64, ROT0, "Nintendo / Seta", "Aleck64 PIF BIOS", MACHINE_IS_BIOS_ROOT)
// games
-GAME( 1998, 11beat, aleck64, aleck64, 11beat, aleck64_state, aleck64, ROT0, "Hudson", "Eleven Beat", MACHINE_IMPERFECT_GRAPHICS ) // crashes at kick off / during attract with DRC
-GAME( 1998, mtetrisc, aleck64, a64_e90, mtetrisc, aleck64_state, aleck64, ROT0, "Capcom", "Magical Tetris Challenge (981009 Japan)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) // missing E90 gfxs (playfield)
-GAME( 1998, starsldr, aleck64, aleck64, starsldr, aleck64_state, aleck64, ROT0, "Hudson / Seta", "Star Soldier: Vanishing Earth", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, vivdolls, aleck64, aleck64, vivdolls, aleck64_state, aleck64, ROT0, "Visco", "Vivid Dolls", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, srmvs, aleck64, aleck64, srmvs, aleck64_state, aleck64, ROT0, "Seta", "Super Real Mahjong VS", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, mayjin3, aleck64, aleck64, aleck64, aleck64_state, aleck64, ROT0, "Seta / Able Corporation", "Mayjinsen 3", MACHINE_IMPERFECT_SOUND|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2003, twrshaft, aleck64, aleck64, twrshaft, aleck64_state, aleck64, ROT0, "Aruze", "Tower & Shaft", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2003, hipai, aleck64, aleck64, hipai, aleck64_state, aleck64, ROT0, "Aruze / Seta", "Hi Pai Paradise", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2003, doncdoon, aleck64, aleck64, doncdoon, aleck64_state, aleck64, ROT0, "Aruze", "Hanabi de Doon! - Don-chan Puzzle", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2003, kurufev, aleck64, aleck64, kurufev, aleck64_state, aleck64, ROT0, "Aruze / Takumi", "Kurukuru Fever", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, 11beat, aleck64, aleck64, 11beat, aleck64_state, aleck64, ROT0, "Hudson", "Eleven Beat", MACHINE_IMPERFECT_GRAPHICS ) // crashes at kick off / during attract with DRC
+GAME( 1998, mtetrisc, aleck64, a64_e90, mtetrisc, aleck64_state, aleck64, ROT0, "Capcom", "Magical Tetris Challenge (981009 Japan)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) // missing E90 gfxs (playfield)
+GAME( 1998, starsldr, aleck64, aleck64, starsldr, aleck64_state, aleck64, ROT0, "Hudson / Seta", "Star Soldier: Vanishing Earth", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, vivdolls, aleck64, aleck64, vivdolls, aleck64_state, aleck64, ROT0, "Visco", "Vivid Dolls", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, srmvs, aleck64, aleck64, srmvs, aleck64_state, aleck64, ROT0, "Seta", "Super Real Mahjong VS", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, mayjin3, aleck64, aleck64, aleck64, aleck64_state, aleck64, ROT0, "Seta / Able Corporation", "Mayjinsen 3", MACHINE_IMPERFECT_SOUND|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2003, twrshaft, aleck64, aleck64, twrshaft, aleck64_state, aleck64, ROT0, "Aruze", "Tower & Shaft", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2003, hipai, aleck64, aleck64, hipai, aleck64_state, aleck64, ROT0, "Aruze / Seta", "Hi Pai Paradise", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2003, doncdoon, aleck64, aleck64, doncdoon, aleck64_state, aleck64, ROT0, "Aruze", "Hanabi de Doon! - Don-chan Puzzle", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2003, kurufev, aleck64, aleck64, kurufev, aleck64_state, aleck64, ROT0, "Aruze / Takumi", "Kurukuru Fever", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/aleisttl.cpp b/src/mame/drivers/aleisttl.cpp
index dce966f2c5e..a6b1ac5bfa2 100644
--- a/src/mame/drivers/aleisttl.cpp
+++ b/src/mame/drivers/aleisttl.cpp
@@ -58,7 +58,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -101,7 +101,7 @@ void sburners_state::video_start()
{
}
-static MACHINE_CONFIG_START( sburners, sburners_state )
+static MACHINE_CONFIG_START( sburners )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -132,4 +132,4 @@ ROM_START( sburners )
ROM_END
-GAME( 1975, sburners, 0, sburners, 0, driver_device, 0, ROT0, "Allied Leisure", "Street Burners [TTL]", MACHINE_IS_SKELETON )
+GAME( 1975, sburners, 0, sburners, 0, sburners_state, 0, ROT0, "Allied Leisure", "Street Burners [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index 5c6710d4630..4a18d1fd05e 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -355,7 +355,7 @@ HD44780_PIXEL_UPDATE(alesis_state::sr16_pixel_update)
bitmap.pix16(line*9 + y, pos*6 + x) = state;
}
-static MACHINE_CONFIG_START( hr16, alesis_state )
+static MACHINE_CONFIG_START( hr16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8031, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(hr16_mem)
@@ -477,8 +477,8 @@ DRIVER_INIT_MEMBER(alesis_state,hr16)
}
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-SYST( 1987, hr16, 0, 0, hr16, hr16, alesis_state, hr16, "Alesis", "HR-16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-SYST( 1987, mmt8, 0, 0, mmt8, mmt8, driver_device, 0, "Alesis", "MMT-8", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-SYST( 1989, hr16b, hr16, 0, hr16, hr16, alesis_state, hr16, "Alesis", "HR-16B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-SYST( 1990, sr16, 0, 0, sr16, sr16, driver_device, 0, "Alesis", "SR-16 (Alesis)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+SYST( 1987, hr16, 0, 0, hr16, hr16, alesis_state, hr16, "Alesis", "HR-16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+SYST( 1987, mmt8, 0, 0, mmt8, mmt8, alesis_state, 0, "Alesis", "MMT-8", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+SYST( 1989, hr16b, hr16, 0, hr16, hr16, alesis_state, hr16, "Alesis", "HR-16B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+SYST( 1990, sr16, 0, 0, sr16, sr16, alesis_state, 0, "Alesis", "SR-16 (Alesis)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/alesis_qs.cpp b/src/mame/drivers/alesis_qs.cpp
index 019f9cfc585..b41bcfea26c 100644
--- a/src/mame/drivers/alesis_qs.cpp
+++ b/src/mame/drivers/alesis_qs.cpp
@@ -46,7 +46,7 @@ static ADDRESS_MAP_START( qs7_prog_map, AS_PROGRAM, 16, qs_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( qs7, qs_state )
+static MACHINE_CONFIG_START( qs7 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83048, XTAL_10MHz) /* FIX-ME! Actual CPU is H8/510 and XTAL value is a guess */
MCFG_CPU_PROGRAM_MAP(qs7_prog_map)
@@ -88,5 +88,5 @@ ROM_START( alesqs7 )
// ROM_LOAD( "?.u?", 0x00000, 0x200000, NO_DUMP )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1996, alesqs7, 0, 0, qs7, qs7, driver_device, 0, "Alesis", "Alesis QS7 musical keyboard", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
+COMP( 1996, alesqs7, 0, 0, qs7, qs7, qs_state, 0, "Alesis", "Alesis QS7 musical keyboard", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp
index 4a41651b219..38ce8fedeb1 100644
--- a/src/mame/drivers/alg.cpp
+++ b/src/mame/drivers/alg.cpp
@@ -289,7 +289,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( alg_r1, alg_state )
+static MACHINE_CONFIG_START( alg_r1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
@@ -783,25 +783,25 @@ DRIVER_INIT_MEMBER(alg_state,aplatoon)
*************************************/
/* BIOS */
-GAME( 199?, alg_bios, 0, alg_r1, alg, alg_state, ntsc, ROT0, "American Laser Games", "American Laser Games BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 199?, alg_bios, 0, alg_r1, alg, alg_state, ntsc, ROT0, "American Laser Games", "American Laser Games BIOS", MACHINE_IS_BIOS_ROOT )
/* Rev. A board */
/* PAL R1 */
-GAME( 1990, maddoga, maddog, alg_r1, alg, alg_state, palr1, ROT0, "American Laser Games", "Mad Dog McCree v1C board rev.A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1990, maddoga, maddog, alg_r1, alg, alg_state, palr1, ROT0, "American Laser Games", "Mad Dog McCree v1C board rev.A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* PAL R3 */
-GAME( 1991, wsjr, alg_bios, alg_r1, alg, alg_state, palr3, ROT0, "American Laser Games", "Who Shot Johnny Rock? v1.6", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1991, wsjr_15, wsjr, alg_r1, alg, alg_state, palr3, ROT0, "American Laser Games", "Who Shot Johnny Rock? v1.5", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1991, wsjr, alg_bios, alg_r1, alg, alg_state, palr3, ROT0, "American Laser Games", "Who Shot Johnny Rock? v1.6", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1991, wsjr_15, wsjr, alg_r1, alg, alg_state, palr3, ROT0, "American Laser Games", "Who Shot Johnny Rock? v1.5", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* Rev. B board */
/* PAL R6 */
GAME( 1990, maddog, alg_bios, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog McCree v2.03 board rev.B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1990, maddog_202, maddog, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog McCree v2.02 board rev.B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1990, maddog_202, maddog, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog McCree v2.02 board rev.B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* works ok but uses right player (2) controls only for trigger and holster */
GAME( 1992, maddog2, alg_bios, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v2.04", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, maddog2_202, maddog2, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v2.02", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, maddog2_202, maddog2, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v2.02", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1992, maddog2_110, maddog2, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v1.10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1992, maddog2_100, maddog2, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Mad Dog II: The Lost Gold v1.00", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* works ok but uses right player (2) controls only for trigger and holster */
@@ -818,13 +818,13 @@ GAME( 1993, crimepat_12, crimepat, alg_r2, alg_2p, alg_state, palr6, ROT0,
GAME( 1993, crimep2, alg_bios, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Crime Patrol 2: Drug Wars v1.3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1993, crimep2_11, crimep2, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "Crime Patrol 2: Drug Wars v1.1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1994, lastbh, alg_bios, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "The Last Bounty Hunter v1.01", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, lastbh_006, lastbh, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "The Last Bounty Hunter v0.06", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, lastbh_006, lastbh, alg_r2, alg_2p, alg_state, palr6, ROT0, "American Laser Games", "The Last Bounty Hunter v0.06", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1995, fastdraw, alg_bios, alg_r2, alg_2p, alg_state, palr6, ROT90, "American Laser Games", "Fast Draw Showdown v1.31", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1995, fastdraw_130,fastdraw, alg_r2, alg_2p, alg_state, palr6, ROT90, "American Laser Games", "Fast Draw Showdown v1.30", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* works ok but uses right player (2) controls only for trigger and holster */
/* NOVA games on ALG hardware with own address scramble */
-GAME( 199?, aplatoon, alg_bios, alg_r2, alg, alg_state, aplatoon, ROT0, "Nova?", "Platoon V.3.1 US", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 199?, aplatoon, alg_bios, alg_r2, alg, alg_state, aplatoon, ROT0, "Nova?", "Platoon V.3.1 US", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* Web Picmatic games PAL tv standard, own rom board */
-GAME( 1993, zortonbr, alg_bios, picmatic, alg, alg_state, pal, ROT0, "Web Picmatic", "Zorton Brothers (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, zortonbr, alg_bios, picmatic, alg, alg_state, pal, ROT0, "Web Picmatic", "Zorton Brothers (Los Justicieros)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp
index 4b18f13034e..62ca9b7427e 100644
--- a/src/mame/drivers/alien.cpp
+++ b/src/mame/drivers/alien.cpp
@@ -80,7 +80,7 @@ void alien_state::machine_reset()
//m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( alien, alien_state )
+static MACHINE_CONFIG_START( alien )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, MASTER_CLOCK) /* 200MHz */
MCFG_CPU_PROGRAM_MAP(alien_map)
@@ -122,4 +122,4 @@ ROM_START( alien )
ROM_END
-GAME( 2005, alien, 0, alien, alien, driver_device, 0, ROT0, "Capcom", "Alien: The Arcade Medal Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2005, alien, 0, alien, alien, alien_state, 0, ROT0, "Capcom", "Alien: The Arcade Medal Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index 4809e3846e6..692eb06e770 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -191,7 +191,7 @@ WRITE8_MEMBER( aliens_state::banking_callback )
m_rombank->set_entry(data & 0x1f);
}
-static MACHINE_CONFIG_START( aliens, aliens_state )
+static MACHINE_CONFIG_START( aliens )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
@@ -479,10 +479,10 @@ ROM_END
***************************************************************************/
-GAME( 1990, aliens, 0, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (World set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aliens2, aliens, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (World set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aliens3, aliens, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (World set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aliensu, aliens, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aliensj, aliens, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aliensj2, aliens, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aliensa, aliens, aliens, aliens, driver_device, 0, ROT0, "Konami", "Aliens (Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliens, 0, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (World set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliens2, aliens, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (World set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliens3, aliens, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (World set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliensu, aliens, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliensj, aliens, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliensj2, aliens, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aliensa, aliens, aliens, aliens, aliens_state, 0, ROT0, "Konami", "Aliens (Asia)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp
index f7d83ccc975..f6fa6c073f1 100644
--- a/src/mame/drivers/alinvade.cpp
+++ b/src/mame/drivers/alinvade.cpp
@@ -202,7 +202,7 @@ INTERRUPT_GEN_MEMBER(alinvade_state::vblank_irq)
m_maincpu->set_input_line(0,HOLD_LINE);
}
-static MACHINE_CONFIG_START( alinvade, alinvade_state )
+static MACHINE_CONFIG_START( alinvade )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
@@ -241,4 +241,4 @@ ROM_START( alinvade )
ROM_END
-GAMEL( 198?, alinvade, 0, alinvade, alinvade, driver_device, 0, ROT90, "Forbes?", "Alien Invaders", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_alinvade )
+GAMEL( 198?, alinvade, 0, alinvade, alinvade, alinvade_state, 0, ROT90, "Forbes?", "Alien Invaders", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_alinvade )
diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp
index a268442da83..d076bd08ef9 100644
--- a/src/mame/drivers/allied.cpp
+++ b/src/mame/drivers/allied.cpp
@@ -608,7 +608,7 @@ void allied_state::machine_reset()
output().set_value("led0", 1); //1=off
}
-static MACHINE_CONFIG_START( allied, allied_state )
+static MACHINE_CONFIG_START( allied )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6504, 3572549/4)
MCFG_CPU_PROGRAM_MAP(allied_map)
@@ -709,15 +709,15 @@ ROM_END
#define rom_starshot rom_allied
-GAME(1977, allied, 0, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Allied System", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
-GAME(1977, suprpick, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Super Picker", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1977, royclark, allied, allied, allied, driver_device, 0, ROT0, "Fascination Int.", "Roy Clark - The Entertainer", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1977, thndbolt, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Thunderbolt", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, hoedown, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Hoe Down", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, takefive, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Take Five", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, heartspd, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Hearts & Spades", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, foathens, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Flame of Athens", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1979, disco79, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Disco '79", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1979, erosone, allied, allied, allied, driver_device, 0, ROT0, "Fascination Int.", "Eros One", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1979, circa33, allied, allied, allied, driver_device, 0, ROT0, "Fascination Int.", "Circa 1933", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1979, starshot, allied, allied, allied, driver_device, 0, ROT0, "Allied Leisure", "Star Shooter", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1977, allied, 0, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Allied System", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
+GAME(1977, suprpick, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Super Picker", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1977, royclark, allied, allied, allied, allied_state, 0, ROT0, "Fascination Int.", "Roy Clark - The Entertainer", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1977, thndbolt, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Thunderbolt", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, hoedown, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Hoe Down", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, takefive, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Take Five", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, heartspd, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Hearts & Spades", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, foathens, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Flame of Athens", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, disco79, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Disco '79", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, erosone, allied, allied, allied, allied_state, 0, ROT0, "Fascination Int.", "Eros One", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, circa33, allied, allied, allied, allied_state, 0, ROT0, "Fascination Int.", "Circa 1933", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, starshot, allied, allied, allied, allied_state, 0, ROT0, "Allied Leisure", "Star Shooter", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index b1482900157..3b08c13d933 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -1911,7 +1911,7 @@ MACHINE_START_MEMBER(alpha68k_state,alpha68k_II)
#define ALPHA68K_VBEND 16
#define ALPHA68K_VBSTART 240
-static MACHINE_CONFIG_START( sstingry, alpha68k_state )
+static MACHINE_CONFIG_START( sstingry )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
@@ -1972,7 +1972,7 @@ static MACHINE_CONFIG_START( sstingry, alpha68k_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kyros, alpha68k_state )
+static MACHINE_CONFIG_START( kyros )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* Verified on bootleg PCB */
@@ -2024,7 +2024,7 @@ static MACHINE_CONFIG_START( kyros, alpha68k_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jongbou, alpha68k_state )
+static MACHINE_CONFIG_START( jongbou )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
@@ -2066,7 +2066,7 @@ static MACHINE_CONFIG_START( jongbou, alpha68k_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.65)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state )
+static MACHINE_CONFIG_START( alpha68k_I )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 6000000) /* 24MHz/4? */
@@ -2111,7 +2111,7 @@ INTERRUPT_GEN_MEMBER(alpha68k_state::alpha68k_sound_nmi)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( alpha68k_II, alpha68k_state )
+static MACHINE_CONFIG_START( alpha68k_II )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* Correct */
@@ -2166,7 +2166,7 @@ static MACHINE_CONFIG_DERIVED( btlfieldb, alpha68k_II )
MCFG_CPU_PERIODIC_INT_DRIVER(alpha68k_state, irq2_line_hold, 60*4) // MCU irq
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
+static MACHINE_CONFIG_START( alpha68k_II_gm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
@@ -2216,7 +2216,7 @@ static MACHINE_CONFIG_START( alpha68k_II_gm, alpha68k_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
+static MACHINE_CONFIG_START( alpha68k_V )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
@@ -2265,7 +2265,7 @@ static MACHINE_CONFIG_START( alpha68k_V, alpha68k_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
+static MACHINE_CONFIG_START( alpha68k_V_sb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* ? */
@@ -2314,7 +2314,7 @@ static MACHINE_CONFIG_START( alpha68k_V_sb, alpha68k_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tnextspc, alpha68k_state )
+static MACHINE_CONFIG_START( tnextspc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 9000000) /* Confirmed 18 MHz/2 */
@@ -3492,10 +3492,10 @@ DRIVER_INIT_MEMBER(alpha68k_state,tnextspc)
GAME( 1986, sstingry, 0, sstingry, sstingry, alpha68k_state, sstingry, ROT90, "Alpha Denshi Co.", "Super Stingray (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1987, kyros, 0, kyros, kyros, alpha68k_state, kyros, ROT90, "Alpha Denshi Co. (World Games Inc. license)", "Kyros", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, kyrosj, kyros, kyros, kyros, alpha68k_state, kyros, ROT90, "Alpha Denshi Co.", "Kyros No Yakata (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, kyros, 0, kyros, kyros, alpha68k_state, kyros, ROT90, "Alpha Denshi Co. (World Games Inc. license)", "Kyros", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, kyrosj, kyros, kyros, kyros, alpha68k_state, kyros, ROT90, "Alpha Denshi Co.", "Kyros No Yakata (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, jongbou, 0, jongbou, jongbou, alpha68k_state, jongbou, ROT90, "SNK", "Mahjong Block Jongbou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, jongbou, 0, jongbou, jongbou, alpha68k_state, jongbou, ROT90, "SNK", "Mahjong Block Jongbou (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, paddlema, 0, alpha68k_I, paddlema, alpha68k_state, paddlema, ROT90, "SNK", "Paddle Mania", MACHINE_SUPPORTS_SAVE )
@@ -3503,7 +3503,7 @@ GAME( 1987, timesold, 0, alpha68k_II, timesold, alpha68k_state, times
GAME( 1987, timesold1, timesold, alpha68k_II, timesold, alpha68k_state, timesold1,ROT90, "Alpha Denshi Co. (SNK/Romstar license)", "Time Soldiers (US Rev 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, btlfield, timesold, alpha68k_II, btlfield, alpha68k_state, btlfield, ROT90, "Alpha Denshi Co. (SNK license)", "Battle Field (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, btlfieldb, timesold, btlfieldb, btlfieldb, alpha68k_state,btlfieldb,ROT90, "bootleg", "Battle Field (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, btlfieldb, timesold, btlfieldb, btlfieldb,alpha68k_state, btlfieldb,ROT90, "bootleg", "Battle Field (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, skysoldr, 0, alpha68k_II, skysoldr, alpha68k_state, skysoldr, ROT90, "Alpha Denshi Co. (SNK of America/Romstar license)", "Sky Soldiers (US)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, skysoldrbl,skysoldr, alpha68k_II, skysoldr, alpha68k_state, skysoldr, ROT90, "bootleg", "Sky Soldiers (bootleg)", MACHINE_SUPPORTS_SAVE )
@@ -3514,12 +3514,12 @@ GAME( 1988, goldmedla, goldmedl, alpha68k_II_gm, goldmedl, alpha68k_state, goldm
GAME( 1988, goldmedlb, goldmedl, alpha68k_II_gm, goldmedl, alpha68k_state, goldmedla,ROT0, "bootleg", "Gold Medalist (bootleg)", MACHINE_UNEMULATED_PROTECTION|MACHINE_IMPERFECT_GRAPHICS ) // same as above
GAME( 1989, skyadvnt, 0, alpha68k_V, skyadvnt, alpha68k_state, skyadvnt, ROT90, "Alpha Denshi Co.", "Sky Adventure (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, skyadvntu, skyadvnt, alpha68k_V, skyadvntu, alpha68k_state,skyadvntu,ROT90, "Alpha Denshi Co. (SNK of America license)", "Sky Adventure (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, skyadvntu, skyadvnt, alpha68k_V, skyadvntu,alpha68k_state, skyadvntu,ROT90, "Alpha Denshi Co. (SNK of America license)", "Sky Adventure (US)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, skyadvntj, skyadvnt, alpha68k_V, skyadvnt, alpha68k_state, skyadvnt, ROT90, "Alpha Denshi Co.", "Sky Adventure (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, gangwars, 0, alpha68k_V, gangwars, alpha68k_state, gangwars, ROT0, "Alpha Denshi Co.", "Gang Wars", MACHINE_SUPPORTS_SAVE )
GAME( 1989, gangwarsj, gangwars, alpha68k_V, gangwars, alpha68k_state, gangwars, ROT0, "Alpha Denshi Co.", "Gang Wars (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, gangwarsu, gangwars, alpha68k_V, gangwarsu, alpha68k_state,gangwarsu,ROT0, "Alpha Denshi Co.", "Gang Wars (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gangwarsu, gangwars, alpha68k_V, gangwarsu,alpha68k_state, gangwarsu,ROT0, "Alpha Denshi Co.", "Gang Wars (US)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, gangwarsb, gangwars, alpha68k_V, gangwars, alpha68k_state, gangwars, ROT0, "bootleg", "Gang Wars (bootleg)", MACHINE_SUPPORTS_SAVE ) // has (undumped) 68705 MCU in place of Alpha MCU, otherwise the same as 'gangwars'
GAME( 1989, sbasebal, 0, alpha68k_V_sb, sbasebal, alpha68k_state, sbasebal, ROT0, "Alpha Denshi Co. (SNK of America license)", "Super Champion Baseball (US)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // calculated pitcher launching speed
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp
index 86b6145ab2b..7710970f54c 100644
--- a/src/mame/drivers/alphasma.cpp
+++ b/src/mame/drivers/alphasma.cpp
@@ -418,7 +418,7 @@ void alphasmart_state::machine_reset()
m_port_d = 0;
}
-static MACHINE_CONFIG_START( alphasmart, alphasmart_state )
+static MACHINE_CONFIG_START( alphasmart )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MC68HC11, XTAL_8MHz/2) // MC68HC11D0, XTAL is 8 Mhz, unknown divider
MCFG_CPU_PROGRAM_MAP(alphasmart_mem)
@@ -449,7 +449,7 @@ static MACHINE_CONFIG_START( alphasmart, alphasmart_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( asma2k, alphasmart, asma2k_state )
+static MACHINE_CONFIG_DERIVED( asma2k, alphasmart )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(asma2k_mem)
MACHINE_CONFIG_END
@@ -477,6 +477,6 @@ ROM_START( asma2k )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1995, asmapro, 0, 0, alphasmart, alphasmart, driver_device, 0, "Intelligent Peripheral Devices", "AlphaSmart Pro" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1997, asma2k , 0, 0, asma2k , alphasmart, driver_device, 0, "Intelligent Peripheral Devices", "AlphaSmart 2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1995, asmapro, 0, 0, alphasmart, alphasmart, alphasmart_state, 0, "Intelligent Peripheral Devices", "AlphaSmart Pro" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1997, asma2k, 0, 0, asma2k, alphasmart, asma2k_state, 0, "Intelligent Peripheral Devices", "AlphaSmart 2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 9380cd1db3a..5ca590401da 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -440,7 +440,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(alphatro_state::timer_p)
}
}
-static MACHINE_CONFIG_START( alphatro, alphatro_state )
+static MACHINE_CONFIG_START( alphatro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK)
@@ -510,4 +510,4 @@ ROM_START( alphatro )
ROM_LOAD( "2732.ic-1067", 0x0000, 0x1000, CRC(61f38814) SHA1(35ba31c58a10d5bd1bdb202717792ca021dbe1a8) )
ROM_END
-COMP( 1983, alphatro, 0, 0, alphatro, alphatro, driver_device, 0, "Triumph-Adler", "Alphatronic PC", MACHINE_NOT_WORKING )
+COMP( 1983, alphatro, 0, 0, alphatro, alphatro, alphatro_state, 0, "Triumph-Adler", "Alphatronic PC", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp
index a72174da336..e4fe515b417 100644
--- a/src/mame/drivers/altair.cpp
+++ b/src/mame/drivers/altair.cpp
@@ -99,10 +99,10 @@ WRITE_LINE_MEMBER(altair_state::write_acia_clock)
void altair_state::machine_reset()
{
// Set startup address done by turn-key
- m_maincpu->set_state_int(I8085_PC, 0xFD00);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_PC, 0xFD00);
}
-static MACHINE_CONFIG_START( altair, altair_state )
+static MACHINE_CONFIG_START( altair )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(altair_mem)
@@ -134,5 +134,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, al8800bt, 0, 0, altair, altair, driver_device, 0, "MITS", "Altair 8800bt", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, al8800bt, 0, 0, altair, altair, altair_state, 0, "MITS", "Altair 8800bt", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp
index 3d3ae5cdb9e..8ec29569952 100644
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@@ -272,7 +272,7 @@ ADDRESS_MAP_START( alto2_iomem_map, AS_2, 16, alto2_state )
AM_RANGE(0, 2*ALTO2_RAM_SIZE-1) AM_DEVICE16( "maincpu", alto2_cpu_device, iomem_map, 0xffffU )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( alto2, alto2_state )
+static MACHINE_CONFIG_START( alto2 )
// Basic machine hardware
// SYSCLK is Display Control part A51 (tagged 29.4MHz) divided by 5(?)
// 5.8MHz according to de.wikipedia.org/wiki/Xerox_Alto
diff --git a/src/mame/drivers/altos486.cpp b/src/mame/drivers/altos486.cpp
index 59ebf8fab11..4698f0be9e8 100644
--- a/src/mame/drivers/altos486.cpp
+++ b/src/mame/drivers/altos486.cpp
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START(altos486_z80_io, AS_IO, 8, altos486_state)
//AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("sio2", z80sio0_device, read, write)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( altos486, altos486_state )
+static MACHINE_CONFIG_START( altos486 )
MCFG_CPU_ADD("maincpu", I80186, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(altos486_mem)
MCFG_CPU_IO_MAP(altos486_io)
@@ -219,4 +219,4 @@ ROM_START( altos486 )
ROM_LOAD("16019_z80.bin", 0x0000, 0x1000, CRC(68b1b2e1) SHA1(5d83609a465029212d5e3f72ac9c520b3dbed838))
ROM_END
-COMP( 1984, altos486, 0, 0, altos486, 0, driver_device, 0, "Altos Computer Systems", "Altos 486", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1984, altos486, 0, 0, altos486, 0, altos486_state, 0, "Altos Computer Systems", "Altos 486", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 356fc28c48f..bd816db962b 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -70,7 +70,7 @@ private:
required_device<z80sio0_device> m_sio;
required_device<z80dma_device> m_dma;
required_device<z80ctc_device> m_ctc;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
};
@@ -98,7 +98,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(altos5_io, AS_IO, 8, altos5_state)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("dma", z80dma_device, read, write)
- AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("fdc", fd1797_t, read, write)
+ AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("fdc", fd1797_device, read, write)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("pio0", z80pio_device, read, write)
AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("pio1", z80pio_device, read, write)
@@ -369,7 +369,7 @@ DRIVER_INIT_MEMBER( altos5_state, altos5 )
membank("bankwf")->configure_entries(0, 50, &RAM[0], 0x1000);
}
-static MACHINE_CONFIG_START( altos5, altos5_state )
+static MACHINE_CONFIG_START( altos5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(altos5_mem)
@@ -448,5 +448,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP(1982, altos5, 0, 0, altos5, altos5, altos5_state, altos5, "Altos", "Altos 5-15", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP(1982, altos5, 0, 0, altos5, altos5, altos5_state, altos5, "Altos", "Altos 5-15", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/alvg.cpp b/src/mame/drivers/alvg.cpp
index 08e3371c6b3..2c613d365e9 100644
--- a/src/mame/drivers/alvg.cpp
+++ b/src/mame/drivers/alvg.cpp
@@ -41,7 +41,7 @@ DRIVER_INIT_MEMBER(alvg_state,alvg)
{
}
-static MACHINE_CONFIG_START( alvg, alvg_state )
+static MACHINE_CONFIG_START( alvg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, 2000000)
MCFG_CPU_PROGRAM_MAP(alvg_map)
@@ -361,16 +361,16 @@ ROM_START(usafootba)
ROM_END
-GAME(1991, agsoccer, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "A.G. Soccer Ball", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, wrldtour, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Al's Garage Band Goes On A World Tour", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, wrldtour2, wrldtour, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Al's Garage Band Goes On A World Tour (R02b)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, wrldtour3, wrldtour, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Al's Garage Band Goes On A World Tour (R06a)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, usafootb, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "U.S.A. Football (R06u)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, usafootba, usafootb, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "U.S.A. Football (R01u)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, mystcast, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Mystery Castle (R02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, mystcasta, mystcast, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Mystery Castle (R03)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, pstlpkr, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Pistol Poker (R02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, pstlpkr1, pstlpkr, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Pistol Poker (R01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, punchy, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Punchy The Clown (R02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, punchy3, punchy, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Punchy The Clown (R03)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, dinoeggs, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Dinosaur Eggs", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, agsoccer, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "A.G. Soccer Ball", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, wrldtour, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Al's Garage Band Goes On A World Tour", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, wrldtour2, wrldtour, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Al's Garage Band Goes On A World Tour (R02b)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, wrldtour3, wrldtour, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Al's Garage Band Goes On A World Tour (R06a)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, usafootb, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "U.S.A. Football", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, usafootba, usafootb, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "U.S.A. Football (R01u)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, mystcast, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Mystery Castle (R02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, mystcasta, mystcast, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Mystery Castle (R03)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, pstlpkr, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Pistol Poker (R02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, pstlpkr1, pstlpkr, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Pistol Poker (R01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, punchy, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Punchy The Clown (R02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, punchy3, punchy, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Punchy The Clown (R03)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, dinoeggs, 0, alvg, alvg, alvg_state, alvg, ROT0, "Alvin G", "Dinosaur Eggs", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index 95a50029ada..d2cf7a98511 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -819,7 +819,7 @@ void amaticmg_state::machine_reset()
* Machine Drivers *
************************************/
-static MACHINE_CONFIG_START( amaticmg, amaticmg_state )
+static MACHINE_CONFIG_START( amaticmg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* WRONG! */
MCFG_CPU_PROGRAM_MAP(amaticmg_map)
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 963881a350e..2becacfa56e 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -667,7 +667,7 @@ WRITE8_MEMBER( ambush_state::unk_w )
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( ambush, ambush_state )
+static MACHINE_CONFIG_START( ambush )
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_portmap)
@@ -872,10 +872,10 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
-GAME( 1983, ambush, 0, ambush, ambusht, driver_device, 0, ROT0, "Tecfri", "Ambush", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ambushh, ambush, ambush, ambusht, driver_device, 0, ROT0, "Tecfri", "Ambush (hack?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ambushj, ambush, ambush, ambush, driver_device, 0, ROT0, "Tecfri (Nippon Amuse license)", "Ambush (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ambushv, ambush, ambush, ambush, driver_device, 0, ROT0, "Tecfri (Volt Electronics license)", "Ambush (Volt Electronics)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, mariobl, mario, mariobl, mariobl, driver_device, 0, ROT180, "bootleg", "Mario Bros. (bootleg on Ambush Hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, dkong3abl, dkong3, dkong3abl, dkong3abl, driver_device, 0, ROT90, "bootleg", "Donkey Kong 3 (bootleg on Ambush hardware)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
+GAME( 1983, ambush, 0, ambush, ambusht, ambush_state, 0, ROT0, "Tecfri", "Ambush", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ambushh, ambush, ambush, ambusht, ambush_state, 0, ROT0, "Tecfri", "Ambush (hack?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ambushj, ambush, ambush, ambush, ambush_state, 0, ROT0, "Tecfri (Nippon Amuse license)", "Ambush (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ambushv, ambush, ambush, ambush, ambush_state, 0, ROT0, "Tecfri (Volt Electronics license)", "Ambush (Volt Electronics)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mariobl, mario, mariobl, mariobl, ambush_state, 0, ROT180, "bootleg", "Mario Bros. (bootleg on Ambush Hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, dkong3abl, dkong3, dkong3abl, dkong3abl, ambush_state, 0, ROT90, "bootleg", "Donkey Kong 3 (bootleg on Ambush hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index 9813a6f0379..98701c931f8 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -48,7 +48,7 @@ void amerihok_state::machine_reset()
}
-static MACHINE_CONFIG_START( amerihok, amerihok_state )
+static MACHINE_CONFIG_START( amerihok )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
@@ -59,7 +59,7 @@ static MACHINE_CONFIG_START( amerihok, amerihok_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // maybe
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // maybe
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp
index 10c4f59a0ec..ea6d890008d 100644
--- a/src/mame/drivers/amico2k.cpp
+++ b/src/mame/drivers/amico2k.cpp
@@ -206,7 +206,7 @@ void amico2k_state::machine_start()
save_item(NAME(m_segment));
}
-static MACHINE_CONFIG_START( amico2k, amico2k_state )
+static MACHINE_CONFIG_START( amico2k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1MHz */
MCFG_CPU_PROGRAM_MAP(amico2k_mem)
@@ -237,5 +237,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, amico2k, 0, 0, amico2k, amico2k, driver_device, 0, "A.S.E.L.", "Amico 2000", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, amico2k, 0, 0, amico2k, amico2k, amico2k_state, 0, "A.S.E.L.", "Amico 2000", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index a720e471bc8..fb28f7911b2 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -163,7 +163,7 @@ protected:
private:
// devices
required_device<msm6242_device> m_rtc;
- required_device<dmac_device> m_dmac;
+ required_device<amiga_dmac_device> m_dmac;
required_device<tpi6525_device> m_tpi;
required_device<cr511b_device> m_cdrom;
@@ -1310,7 +1310,7 @@ static SLOT_INTERFACE_START( amiga_floppies )
SLOT_INTERFACE_END
// basic elements common to all amigas
-static MACHINE_CONFIG_START( amiga_base, amiga_state )
+static MACHINE_CONFIG_START( amiga_base )
// video
MCFG_FRAGMENT_ADD(pal_video)
@@ -1332,7 +1332,7 @@ static MACHINE_CONFIG_START( amiga_base, amiga_state )
MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(amiga_state, cia_1_irq))
MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(amiga_state, cia_1_port_a_read))
MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(amiga_state, cia_1_port_a_write))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8("fdc", amiga_fdc, ciaaprb_w))
+ MCFG_MOS6526_PB_OUTPUT_CALLBACK(DEVWRITE8("fdc", amiga_fdc_device, ciaaprb_w))
// audio
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -1346,13 +1346,13 @@ static MACHINE_CONFIG_START( amiga_base, amiga_state )
// floppy drives
MCFG_DEVICE_ADD("fdc", AMIGA_FDC, amiga_state::CLK_7M_PAL)
- MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", amiga_fdc::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("fdc:0", amiga_floppies, "35dd", amiga_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, nullptr, amiga_fdc::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("fdc:1", amiga_floppies, nullptr, amiga_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, nullptr, amiga_fdc::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("fdc:2", amiga_floppies, nullptr, amiga_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
- MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, nullptr, amiga_fdc::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("fdc:3", amiga_floppies, nullptr, amiga_fdc_device::floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
// rs232
@@ -1385,7 +1385,7 @@ static MACHINE_CONFIG_START( amiga_base, amiga_state )
MCFG_SOFTWARE_LIST_ADD("ocs_list", "amigaocs_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a1000, amiga_base, a1000_state )
+static MACHINE_CONFIG_DERIVED( a1000, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
MCFG_CPU_PROGRAM_MAP(a1000_mem)
@@ -1407,7 +1407,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a1000, amiga_base, a1000_state )
MCFG_SOFTWARE_LIST_ADD("a1000_list", "amiga_a1000")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a1000n, a1000, a1000_state )
+static MACHINE_CONFIG_DERIVED( a1000n, a1000 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_REMOVE("screen")
@@ -1422,7 +1422,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a1000n, a1000, a1000_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a2000, amiga_base, a2000_state )
+static MACHINE_CONFIG_DERIVED( a2000, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
MCFG_CPU_PROGRAM_MAP(a2000_mem)
@@ -1451,7 +1451,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a2000, amiga_base, a2000_state )
MCFG_ZORRO2_SLOT_ADD("zorro5", zorro2_cards, nullptr)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a2000n, a2000, a2000_state )
+static MACHINE_CONFIG_DERIVED( a2000n, a2000 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_REMOVE("screen")
@@ -1466,7 +1466,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a2000n, a2000, a2000_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a500, amiga_base, a500_state )
+static MACHINE_CONFIG_DERIVED( a500, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
MCFG_CPU_PROGRAM_MAP(a500_mem)
@@ -1485,7 +1485,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a500, amiga_base, a500_state )
MCFG_EXPANSION_SLOT_INT6_HANDLER(WRITELINE(a500_state, side_int6_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a500n, a500, a500_state )
+static MACHINE_CONFIG_DERIVED( a500n, a500 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_REMOVE("screen")
@@ -1500,7 +1500,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a500n, a500, a500_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( cdtv, amiga_base, cdtv_state )
+static MACHINE_CONFIG_DERIVED( cdtv, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
MCFG_CPU_PROGRAM_MAP(cdtv_mem)
@@ -1550,14 +1550,14 @@ static MACHINE_CONFIG_DERIVED_CLASS( cdtv, amiga_base, cdtv_state )
MCFG_CR511B_STCH_HANDLER(DEVWRITELINE("u32", tpi6525_device, i2_w)) MCFG_DEVCB_INVERT
MCFG_CR511B_STEN_HANDLER(DEVWRITELINE("u32", tpi6525_device, i3_w))
MCFG_CR511B_XAEN_HANDLER(DEVWRITELINE("u32", tpi6525_device, pb2_w))
- MCFG_CR511B_DRQ_HANDLER(DEVWRITELINE("u36", dmac_device, xdreq_w))
- MCFG_CR511B_DTEN_HANDLER(DEVWRITELINE("u36", dmac_device, xdreq_w))
+ MCFG_CR511B_DRQ_HANDLER(DEVWRITELINE("u36", amiga_dmac_device, xdreq_w))
+ MCFG_CR511B_DTEN_HANDLER(DEVWRITELINE("u36", amiga_dmac_device, xdreq_w))
// software
MCFG_SOFTWARE_LIST_ADD("cd_list", "cdtv")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( cdtvn, cdtv, cdtv_state )
+static MACHINE_CONFIG_DERIVED( cdtvn, cdtv )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_REMOVE("screen")
@@ -1574,7 +1574,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( cdtvn, cdtv, cdtv_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a3000, amiga_base, a3000_state )
+static MACHINE_CONFIG_DERIVED( a3000, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68030, XTAL_32MHz / 2)
MCFG_CPU_PROGRAM_MAP(a3000_mem)
@@ -1596,7 +1596,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a3000, amiga_base, a3000_state )
MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a3000n, a3000, a3000_state )
+static MACHINE_CONFIG_DERIVED( a3000n, a3000 )
MCFG_DEVICE_REMOVE("screen")
MCFG_FRAGMENT_ADD(ntsc_video)
MCFG_DEVICE_MODIFY("cia_0")
@@ -1607,7 +1607,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a3000n, a3000, a3000_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a500p, amiga_base, a500p_state )
+static MACHINE_CONFIG_DERIVED( a500p, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
MCFG_CPU_PROGRAM_MAP(a500p_mem)
@@ -1629,7 +1629,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a500p, amiga_base, a500p_state )
MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a500pn, a500p, a500p_state )
+static MACHINE_CONFIG_DERIVED( a500pn, a500p )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_REMOVE("screen")
@@ -1644,7 +1644,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a500pn, a500p, a500p_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a600, amiga_base, a600_state )
+static MACHINE_CONFIG_DERIVED( a600, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_PAL)
MCFG_CPU_PROGRAM_MAP(a600_mem)
@@ -1672,7 +1672,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a600, amiga_base, a600_state )
MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a600n, a600, a600_state )
+static MACHINE_CONFIG_DERIVED( a600n, a600 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MCFG_DEVICE_MODIFY("gayle")
@@ -1689,7 +1689,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a600n, a600, a600_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a1200, amiga_base, a1200_state )
+static MACHINE_CONFIG_DERIVED( a1200, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
MCFG_CPU_PROGRAM_MAP(a1200_mem)
@@ -1732,7 +1732,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a1200, amiga_base, a1200_state )
MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a1200n, a1200, a1200_state )
+static MACHINE_CONFIG_DERIVED( a1200n, a1200 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2)
MCFG_DEVICE_MODIFY("gayle")
@@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a1200n, a1200, a1200_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a4000, amiga_base, a4000_state )
+static MACHINE_CONFIG_DERIVED( a4000, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2)
MCFG_CPU_PROGRAM_MAP(a4000_mem)
@@ -1786,7 +1786,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a4000, amiga_base, a4000_state )
MCFG_SOFTWARE_LIST_ADD("ecs_list", "amigaecs_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a4000n, a4000, a4000_state )
+static MACHINE_CONFIG_DERIVED( a4000n, a4000 )
MCFG_DEVICE_REMOVE("screen")
MCFG_FRAGMENT_ADD(ntsc_video)
MCFG_DEVICE_MODIFY("screen")
@@ -1802,7 +1802,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a4000n, a4000, a4000_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a400030, a4000, a4000_state )
+static MACHINE_CONFIG_DERIVED( a400030, a4000 )
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
MCFG_CPU_ADD("maincpu", M68EC030, XTAL_50MHz / 2)
@@ -1811,7 +1811,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a400030, a4000, a4000_state )
// todo: ide
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a400030n, a400030, a4000_state )
+static MACHINE_CONFIG_DERIVED( a400030n, a400030 )
MCFG_DEVICE_REMOVE("screen")
MCFG_FRAGMENT_ADD(ntsc_video)
MCFG_DEVICE_MODIFY("screen")
@@ -1827,7 +1827,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a400030n, a400030, a4000_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( cd32, amiga_base, cd32_state )
+static MACHINE_CONFIG_DERIVED( cd32, amiga_base )
// main cpu
MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
MCFG_CPU_PROGRAM_MAP(cd32_mem)
@@ -1873,7 +1873,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( cd32, amiga_base, cd32_state )
MCFG_DEVICE_REMOVE("kbd")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( cd32n, cd32, cd32_state )
+static MACHINE_CONFIG_DERIVED( cd32n, cd32 )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_CLOCK(amiga_state::CLK_28M_NTSC / 2)
MCFG_DEVICE_REMOVE("screen")
@@ -1891,7 +1891,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( cd32n, cd32, cd32_state )
MCFG_DEVICE_CLOCK(amiga_state::CLK_7M_NTSC)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a4000t, a4000, a4000_state )
+static MACHINE_CONFIG_DERIVED( a4000t, a4000 )
// main cpu
MCFG_DEVICE_REMOVE("maincpu")
MCFG_CPU_ADD("maincpu", M68040, XTAL_50MHz / 2)
@@ -1900,7 +1900,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( a4000t, a4000, a4000_state )
// todo: ide, zorro3, scsi, super dmac
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( a4000tn, a4000, a4000_state )
+static MACHINE_CONFIG_DERIVED( a4000tn, a4000 )
MCFG_DEVICE_REMOVE("screen")
MCFG_FRAGMENT_ADD(ntsc_video)
MCFG_DEVICE_MODIFY("screen")
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index 741185eb5ba..e5da31eb8ed 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -1139,7 +1139,7 @@ GFXDECODE_END
* Machine Driver *
*************************/
-static MACHINE_CONFIG_START( ampoker2, ampoker2_state )
+static MACHINE_CONFIG_START( ampoker2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/2) /* 3 MHz */
@@ -1444,16 +1444,16 @@ DRIVER_INIT_MEMBER(ampoker2_state, piccolop)
*************************/
// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
-GAMEL( 1990, ampoker2, 0, ampoker2, ampoker2, driver_device, 0, ROT0, "Novomatic", "American Poker II", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1990, ampkr2b1, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg", "American Poker II (bootleg, set 1)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1990, ampkr2b2, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg", "American Poker II (bootleg, set 2)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1994, ampkr2b3, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg", "American Poker II (bootleg, set 3)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1994, ampkr2b4, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg", "American Poker II (bootleg, set 4)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1994, ampkr228, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg?", "American Poker II (iamp2 v28)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1995, ampkr95, ampoker2, ampoker2, ampkr95, driver_device, 0, ROT0, "bootleg", "American Poker 95", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1990, pkrdewin, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg", "Poker De Win", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1990, videomat, ampoker2, ampoker2, ampoker2, driver_device, 0, ROT0, "bootleg", "Videomat (Polish bootleg)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1990, ampoker2, 0, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "Novomatic", "American Poker II", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1990, ampkr2b1, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg", "American Poker II (bootleg, set 1)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1990, ampkr2b2, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg", "American Poker II (bootleg, set 2)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1994, ampkr2b3, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg", "American Poker II (bootleg, set 3)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1994, ampkr2b4, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg", "American Poker II (bootleg, set 4)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1994, ampkr228, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg?", "American Poker II (iamp2 v28)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1995, ampkr95, ampoker2, ampoker2, ampkr95, ampoker2_state, 0, ROT0, "bootleg", "American Poker 95", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1990, pkrdewin, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg", "Poker De Win", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
+GAMEL( 1990, videomat, ampoker2, ampoker2, ampoker2, ampoker2_state, 0, ROT0, "bootleg", "Videomat (Polish bootleg)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
GAMEL( 1990, rabbitpk, ampoker2, ampoker2, ampoker2, ampoker2_state, rabbitpk, ROT0, "bootleg", "Rabbit Poker (Arizona Poker v1.1?)", MACHINE_SUPPORTS_SAVE, layout_ampoker2 )
-GAMEL( 1995, sigmapkr, 0, ampoker2, sigmapkr, driver_device, 0, ROT0, "Sigma Inc.", "Sigma Poker", MACHINE_SUPPORTS_SAVE, layout_sigmapkr )
-GAMEL( 1998, sigma2k, 0, sigma2k, sigma2k, driver_device, 0, ROT0, "Sigma Inc.", "Sigma Poker 2000", MACHINE_SUPPORTS_SAVE, layout_sigmapkr )
+GAMEL( 1995, sigmapkr, 0, ampoker2, sigmapkr, ampoker2_state, 0, ROT0, "Sigma Inc.", "Sigma Poker", MACHINE_SUPPORTS_SAVE, layout_sigmapkr )
+GAMEL( 1998, sigma2k, 0, sigma2k, sigma2k, ampoker2_state, 0, ROT0, "Sigma Inc.", "Sigma Poker 2000", MACHINE_SUPPORTS_SAVE, layout_sigmapkr )
GAME( 1990, piccolop, ampoker2, ampoker2, piccolop, ampoker2_state, piccolop, ROT0, "Admiral/Novomatic", "Piccolo Poker 100", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 1064043115f..213c26e8fdd 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -56,7 +56,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<z80dart_device> m_dart;
required_device<z80ctc_device> m_ctc;
- required_device<wd1772_t> m_fdc;
+ required_device<wd1772_device> m_fdc;
required_device<floppy_connector> m_floppy0;
};
@@ -110,8 +110,8 @@ static ADDRESS_MAP_START(ampro_io, AS_IO, 8, ampro_state)
//AM_RANGE(0x28, 0x28) AM_WRITE(port28_w) // scsi control
//AM_RANGE(0x29, 0x29) AM_READ(port29_r) // ID port
AM_RANGE(0x40, 0x8f) AM_READWRITE(io_r,io_w)
- AM_RANGE(0xc0, 0xc3) AM_DEVWRITE("fdc", wd1772_t, write)
- AM_RANGE(0xc4, 0xc7) AM_DEVREAD("fdc", wd1772_t, read)
+ AM_RANGE(0xc0, 0xc3) AM_DEVWRITE("fdc", wd1772_device, write)
+ AM_RANGE(0xc4, 0xc7) AM_DEVREAD("fdc", wd1772_device, read)
ADDRESS_MAP_END
static const z80_daisy_config daisy_chain_intf[] =
@@ -157,7 +157,7 @@ DRIVER_INIT_MEMBER( ampro_state, ampro )
membank("bankw0")->configure_entry(0, &main[0x0000]);
}
-static MACHINE_CONFIG_START( ampro, ampro_state )
+static MACHINE_CONFIG_START( ampro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(ampro_mem)
@@ -202,5 +202,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1980, ampro, 0, 0, ampro, ampro, ampro_state, ampro, "Ampro", "Little Z80 Board", 0 )
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp
index 2cd9a43f0f3..c7fafc48090 100644
--- a/src/mame/drivers/amspdwy.cpp
+++ b/src/mame/drivers/amspdwy.cpp
@@ -250,7 +250,7 @@ void amspdwy_state::machine_reset()
m_wheel_return[1] = 0;
}
-static MACHINE_CONFIG_START( amspdwy, amspdwy_state )
+static MACHINE_CONFIG_START( amspdwy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3000000)
@@ -383,5 +383,5 @@ ROM_END
/* (C) 1987 ETI 8402 MAGNOLIA ST. #C SANTEE, CA 92071 */
-GAME( 1987, amspdwy, 0, amspdwy, amspdwy, driver_device, 0, ROT0, "Enerdyne Technologies Inc.", "American Speedway (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, amspdwya, amspdwy, amspdwy, amspdwya, driver_device, 0, ROT0, "Enerdyne Technologies Inc.", "American Speedway (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, amspdwy, 0, amspdwy, amspdwy, amspdwy_state, 0, ROT0, "Enerdyne Technologies Inc.", "American Speedway (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, amspdwya, amspdwy, amspdwy, amspdwya, amspdwy_state, 0, ROT0, "Enerdyne Technologies Inc.", "American Speedway (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/amstr_pc.cpp b/src/mame/drivers/amstr_pc.cpp
index b0fc7a62038..aa773ecfab1 100644
--- a/src/mame/drivers/amstr_pc.cpp
+++ b/src/mame/drivers/amstr_pc.cpp
@@ -34,6 +34,7 @@ More information can be found at http://www.seasip.info/AmstradXT/1640tech/index
#include "machine/genpc.h"
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
+#include "bus/pc_joy/pc_joy.h"
#include "machine/pckeybrd.h"
#include "machine/pc_lpt.h"
@@ -47,8 +48,10 @@ public:
m_mb(*this, "mb"),
m_keyboard(*this, "pc_keyboard"),
m_lpt1(*this, "lpt_1"),
- m_lpt2(*this, "lpt_2")
- { m_mouse.x =0; m_mouse.y=0;}
+ m_lpt2(*this, "lpt_2"),
+ m_mouse{ 0, 0 }
+ {
+ }
required_device<cpu_device> m_maincpu;
required_device<pc_noppi_mb_device> m_mb;
@@ -466,7 +469,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_com )
MCFG_SLOT_DEFAULT_OPTION(nullptr)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc200, amstrad_pc_state )
+static MACHINE_CONFIG_START( pc200 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 8000000)
MCFG_CPU_PROGRAM_MAP(ppc640_map)
@@ -629,10 +632,10 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1987, ppc512, ibm5150, 0, ppc512, pc200, driver_device, 0, "Amstrad plc", "Amstrad PPC512", MACHINE_NOT_WORKING)
-COMP( 1987, ppc640, ibm5150, 0, ppc640, pc200, driver_device, 0, "Amstrad plc", "Amstrad PPC640", MACHINE_NOT_WORKING)
-COMP( 1988, pc20, ibm5150, 0, pc200, pc200, driver_device, 0, "Amstrad plc", "Amstrad PC20" , MACHINE_NOT_WORKING)
-COMP( 1988, pc200, ibm5150, 0, pc200, pc200, driver_device, 0, "Sinclair Research Ltd", "PC200 Professional Series", MACHINE_NOT_WORKING)
-COMP( 1988, pc2086, ibm5150, 0, pc2086, pc200, driver_device, 0, "Amstrad plc", "Amstrad PC2086", MACHINE_NOT_WORKING )
-COMP( 1990, pc3086, ibm5150, 0, pc2086, pc200, driver_device, 0, "Amstrad plc", "Amstrad PC3086", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1987, ppc512, ibm5150, 0, ppc512, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PPC512", MACHINE_NOT_WORKING)
+COMP( 1987, ppc640, ibm5150, 0, ppc640, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PPC640", MACHINE_NOT_WORKING)
+COMP( 1988, pc20, ibm5150, 0, pc200, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PC20" , MACHINE_NOT_WORKING)
+COMP( 1988, pc200, ibm5150, 0, pc200, pc200, amstrad_pc_state, 0, "Sinclair Research Ltd", "PC200 Professional Series", MACHINE_NOT_WORKING)
+COMP( 1988, pc2086, ibm5150, 0, pc2086, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PC2086", MACHINE_NOT_WORKING )
+COMP( 1990, pc3086, ibm5150, 0, pc2086, pc200, amstrad_pc_state, 0, "Amstrad plc", "Amstrad PC3086", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index a608bfa6118..ecf6684364e 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -885,7 +885,7 @@ SLOT_INTERFACE_START(amstrad_centronics_devices)
SLOT_INTERFACE("digiblst", CENTRONICS_DIGIBLASTER)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( amstrad_base, amstrad_state )
+static MACHINE_CONFIG_START( amstrad_base )
/* Machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
@@ -1010,7 +1010,7 @@ static MACHINE_CONFIG_DERIVED( kccomp, cpc6128 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cpcplus, amstrad_state )
+static MACHINE_CONFIG_START( cpcplus )
/* Machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
@@ -1089,7 +1089,7 @@ static MACHINE_CONFIG_START( cpcplus, amstrad_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gx4000, amstrad_state )
+static MACHINE_CONFIG_START( gx4000 )
/* Machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_40MHz / 10)
MCFG_CPU_PROGRAM_MAP(amstrad_mem)
@@ -1286,14 +1286,14 @@ ROM_END
*
*************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, cpc464, 0, 0, cpc464, cpc464, driver_device, 0, "Amstrad plc", "Amstrad CPC464", 0 )
-COMP( 1985, cpc664, cpc464, 0, cpc664, cpc664, driver_device, 0, "Amstrad plc", "Amstrad CPC664", 0 )
-COMP( 1985, cpc6128, cpc464, 0, cpc6128, cpc6128, driver_device, 0, "Amstrad plc", "Amstrad CPC6128", 0 )
-COMP( 1985, cpc6128f, cpc464, 0, cpc6128, cpc6128f, driver_device, 0, "Amstrad plc", "Amstrad CPC6128 (France, AZERTY Keyboard)", 0 )
-COMP( 1985, cpc6128s, cpc464, 0, cpc6128, cpc6128s, driver_device, 0, "Amstrad plc", "Amstrad CPC6128 (Sweden/Finland)", 0 )
-COMP( 1990, cpc464p, 0, 0, cpcplus, plus, driver_device, 0, "Amstrad plc", "Amstrad CPC464+", 0 )
-COMP( 1990, cpc6128p, 0, 0, cpcplus, plus, driver_device, 0, "Amstrad plc", "Amstrad CPC6128+", 0 )
-CONS( 1990, gx4000, 0, 0, gx4000, gx4000, driver_device, 0, "Amstrad plc", "Amstrad GX4000", 0 )
-COMP( 1989, kccomp, cpc464, 0, kccomp, kccomp, driver_device, 0, "VEB Mikroelektronik", "KC Compact", 0 )
-COMP( 1993, al520ex, cpc464, 0, aleste, aleste, driver_device, 0, "Patisonic", "Aleste 520EX", MACHINE_IMPERFECT_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, cpc464, 0, 0, cpc464, cpc464, amstrad_state, 0, "Amstrad plc", "Amstrad CPC464", 0 )
+COMP( 1985, cpc664, cpc464, 0, cpc664, cpc664, amstrad_state, 0, "Amstrad plc", "Amstrad CPC664", 0 )
+COMP( 1985, cpc6128, cpc464, 0, cpc6128, cpc6128, amstrad_state, 0, "Amstrad plc", "Amstrad CPC6128", 0 )
+COMP( 1985, cpc6128f, cpc464, 0, cpc6128, cpc6128f, amstrad_state, 0, "Amstrad plc", "Amstrad CPC6128 (France, AZERTY Keyboard)", 0 )
+COMP( 1985, cpc6128s, cpc464, 0, cpc6128, cpc6128s, amstrad_state, 0, "Amstrad plc", "Amstrad CPC6128 (Sweden/Finland)", 0 )
+COMP( 1990, cpc464p, 0, 0, cpcplus, plus, amstrad_state, 0, "Amstrad plc", "Amstrad CPC464+", 0 )
+COMP( 1990, cpc6128p, 0, 0, cpcplus, plus, amstrad_state, 0, "Amstrad plc", "Amstrad CPC6128+", 0 )
+CONS( 1990, gx4000, 0, 0, gx4000, gx4000, amstrad_state, 0, "Amstrad plc", "Amstrad GX4000", 0 )
+COMP( 1989, kccomp, cpc464, 0, kccomp, kccomp, amstrad_state, 0, "VEB Mikroelektronik", "KC Compact", 0 )
+COMP( 1993, al520ex, cpc464, 0, aleste, aleste, amstrad_state, 0, "Patisonic", "Aleste 520EX", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index ac67cb8cb7b..d3e9bb2ecdd 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -469,7 +469,7 @@ MC6845_UPDATE_ROW(amusco_state::update_row)
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( amusco, amusco_state )
+static MACHINE_CONFIG_START( amusco )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK) // 5 MHz ?
@@ -586,6 +586,6 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1987, amusco, 0, amusco, amusco, driver_device, 0, ROT0, "Amusco", "American Music Poker (V1.4)", MACHINE_IMPERFECT_COLORS | MACHINE_NODEVICE_PRINTER, layout_amusco ) // palette totally wrong
-GAMEL( 1988, draw88pkr, 0, draw88pkr,draw88pkr,driver_device, 0, ROT0, "BTE, Inc.", "Draw 88 Poker (V2.0)", MACHINE_IMPERFECT_COLORS | MACHINE_NODEVICE_PRINTER, layout_amusco ) // palette totally wrong
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+GAMEL( 1987, amusco, 0, amusco, amusco, amusco_state, 0, ROT0, "Amusco", "American Music Poker (V1.4)", MACHINE_IMPERFECT_COLORS | MACHINE_NODEVICE_PRINTER, layout_amusco ) // palette totally wrong
+GAMEL( 1988, draw88pkr, 0, draw88pkr,draw88pkr, amusco_state, 0, ROT0, "BTE, Inc.", "Draw 88 Poker (V2.0)", MACHINE_IMPERFECT_COLORS | MACHINE_NODEVICE_PRINTER, layout_amusco ) // palette totally wrong
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index ddfabb1315d..cbb745fecf9 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -128,7 +128,7 @@ public:
DECLARE_READ8_MEMBER(port0a_r);
DECLARE_WRITE8_MEMBER(port0a_w);
DECLARE_WRITE8_MEMBER(port0d_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
INTERRUPT_GEN_MEMBER(irq_vs);
MC6845_UPDATE_ROW(crtc_update_row);
@@ -316,7 +316,7 @@ WRITE8_MEMBER( amust_state::port0d_w )
m_p_videoram[video_address] = data;
}
-WRITE8_MEMBER( amust_state::kbd_put )
+void amust_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -391,7 +391,7 @@ DRIVER_INIT_MEMBER( amust_state, amust )
membank("bankw0")->configure_entry(0, &main[0xf800]);
}
-static MACHINE_CONFIG_START( amust, amust_state )
+static MACHINE_CONFIG_START( amust )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(amust_mem)
@@ -421,7 +421,7 @@ static MACHINE_CONFIG_START( amust, amust_state )
MCFG_MC6845_UPDATE_ROW_CB(amust_state, crtc_update_row)
MCFG_DEVICE_ADD("keybd", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(amust_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(amust_state, kbd_put))
MCFG_UPD765A_ADD("fdc", false, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", amust_floppies, "drive0", floppy_image_device::default_floppy_formats)
MCFG_FLOPPY_DRIVE_SOUND(true)
@@ -476,5 +476,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, amust, 0, 0, amust, amust, amust_state, amust, "Amust", "Amust Executive 816", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, amust, 0, 0, amust, amust, amust_state, amust, "Amust", "Amust Executive 816", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index 508ee65216f..4088bc2ceb6 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -511,7 +511,7 @@ void angelkds_state::machine_reset()
m_bgtopbank = 0;
}
-static MACHINE_CONFIG_START( angelkds, angelkds_state )
+static MACHINE_CONFIG_START( angelkds )
MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp
index a35bb37c52d..cfdc746b3f0 100644
--- a/src/mame/drivers/anzterm.cpp
+++ b/src/mame/drivers/anzterm.cpp
@@ -408,7 +408,7 @@ ADDRESS_MAP_START( anzterm, AS_PROGRAM, 8, anzterm_state )
ADDRESS_MAP_END
-MACHINE_CONFIG_START( anzterm, anzterm_state )
+MACHINE_CONFIG_START( anzterm )
MCFG_CPU_ADD("maincpu", M6809, 15974400/4)
MCFG_CPU_PROGRAM_MAP(anzterm)
@@ -478,4 +478,4 @@ ROM_START( anzterm )
ROM_LOAD( "ebb-fea-v96-9-23-83-f43a.u11", 0x4000, 0x1000, CRC(0e572470) SHA1(966e5eeb0114589a7cab3c29a1db48cdd8634be5) )
ROM_END
-COMP( 1986?, anzterm, 0, 0, anzterm, anzterm, driver_device, 0, "Burroughs", "EF315-I220 Teller Terminal (ANZ)", MACHINE_IS_SKELETON ) // year comes from sticker on bottom of case, it's more likely a 1983 revision
+COMP( 1986?, anzterm, 0, 0, anzterm, anzterm, anzterm_state, 0, "Burroughs", "EF315-I220 Teller Terminal (ANZ)", MACHINE_IS_SKELETON ) // year comes from sticker on bottom of case, it's more likely a 1983 revision
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index 6d5a6014e8e..91f27c3d382 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -909,7 +909,7 @@ static SLOT_INTERFACE_START( apc_floppies )
SLOT_INTERFACE( "8", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( apc, apc_state )
+static MACHINE_CONFIG_START( apc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8086,MAIN_CLOCK)
diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp
index fc515fa2fbc..fb4c5f6ca9e 100644
--- a/src/mame/drivers/apexc.cpp
+++ b/src/mame/drivers/apexc.cpp
@@ -96,11 +96,11 @@ private:
int m_writable;
};
-const device_type APEXC_CYLINDER = device_creator<apexc_cylinder_image_device>;
+DEFINE_DEVICE_TYPE(APEXC_CYLINDER, apexc_cylinder_image_device, "apexc_cylinder_image", "APEXC Cylinder")
apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, APEXC_CYLINDER, "APEXC Cylinder", tag, owner, clock, "apexc_cylinder_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, APEXC_CYLINDER, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -217,11 +217,11 @@ protected:
virtual void device_start() override { }
};
-const device_type APEXC_TAPE_PUNCHER = device_creator<apexc_tape_puncher_image_device>;
+DEFINE_DEVICE_TYPE(APEXC_TAPE_PUNCHER, apexc_tape_puncher_image_device, "apexc_tape_puncher_image", "APEXC Tape Puncher")
apexc_tape_puncher_image_device::apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, APEXC_TAPE_PUNCHER, "APEXC Tape Puncher", tag, owner, clock, "apexc_tape_puncher_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, APEXC_TAPE_PUNCHER, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -248,11 +248,11 @@ protected:
virtual void device_start() override { }
};
-const device_type APEXC_TAPE_READER = device_creator<apexc_tape_reader_image_device>;
+DEFINE_DEVICE_TYPE(APEXC_TAPE_READER, apexc_tape_reader_image_device, "apexc_tape_reader_image", "APEXC Tape Reader")
apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, APEXC_TAPE_READER, "APEXC Tape Reader", tag, owner, clock, "apexc_tape_reader_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, APEXC_TAPE_READER, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -858,7 +858,7 @@ static ADDRESS_MAP_START(apexc_io_map, AS_IO, 8, apexc_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( apexc, apexc_state )
+static MACHINE_CONFIG_START( apexc )
/* basic machine hardware */
/* APEXC CPU @ 2.0 kHz (memory word clock frequency) */
@@ -897,6 +897,6 @@ ROM_START(apexc)
/* space filled with our font */
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
//COMP( 1951, apexc53, 0, 0, apexc53, apexc, apexc_state, apexc, "Andrew Donald Booth", "All Purpose Electronic X-ray Computer (as described in 1953)" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
COMP( 1955, apexc, 0, 0, apexc, apexc, apexc_state, apexc, "Andrew Donald Booth", "All Purpose Electronic X-ray Computer (as described in 1957)" , MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 4560eb43d4b..0a9beac6e05 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -138,7 +138,7 @@ private:
optional_device<pia6821_device> m_pia1;
optional_device<cassette_image_device> m_cass;
required_device<apf_cart_slot_device> m_cart;
- optional_device<fd1771_t> m_fdc;
+ optional_device<fd1771_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
required_ioport_array<4> m_joy;
@@ -324,7 +324,7 @@ static ADDRESS_MAP_START( apfimag_map, AS_PROGRAM, 8, apf_state )
AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x03fc) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
// These need to be confirmed, disk does not work
AM_RANGE(0x6400, 0x64ff) AM_READWRITE(serial_r, serial_w)
- AM_RANGE(0x6500, 0x6503) AM_DEVREADWRITE("fdc", fd1771_t, read, write)
+ AM_RANGE(0x6500, 0x6503) AM_DEVREADWRITE("fdc", fd1771_device, read, write)
AM_RANGE(0x6600, 0x6600) AM_WRITE(apf_dischw_w)
AM_RANGE(0xa000, 0xbfff) AM_RAM // standard
AM_RANGE(0xc000, 0xdfff) AM_RAM // expansion
@@ -508,7 +508,7 @@ static SLOT_INTERFACE_START(apf_cart)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( apfm1000, apf_state )
+static MACHINE_CONFIG_START( apfm1000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz / 4 ) // divided by 4 in external clock circuit
@@ -520,7 +520,7 @@ static MACHINE_CONFIG_START( apfm1000, apf_state )
MCFG_DEVICE_ADD("mc6847", MC6847_NTSC, XTAL_3_579545MHz)
MCFG_MC6847_FSYNC_CALLBACK(DEVWRITELINE("pia0", pia6821_device, cb1_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(apf_state, videoram_r))
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM2 | MC6847_MODE_GM1)
+ MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1)
// INTEXT = GND
// other lines not connected
@@ -606,6 +606,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1979, apfimag, apfm1000, 0, apfimag, apfimag, driver_device, 0, "APF Electronics Inc.", "APF Imagination Machine", 0 )
-CONS( 1978, apfm1000, 0, 0, apfm1000, apfm1000, driver_device, 0, "APF Electronics Inc.", "APF M-1000", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
+COMP( 1979, apfimag, apfm1000, 0, apfimag, apfimag, apf_state, 0, "APF Electronics Inc.", "APF Imagination Machine", 0 )
+CONS( 1978, apfm1000, 0, 0, apfm1000, apfm1000, apf_state, 0, "APF Electronics Inc.", "APF M-1000", 0 )
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index eb402beb804..68ad3be8873 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -212,7 +212,7 @@ GFXDECODE_END
/* Machine driver */
-static MACHINE_CONFIG_START( apogee, apogee_state )
+static MACHINE_CONFIG_START( apogee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
MCFG_CPU_PROGRAM_MAP(apogee_mem)
@@ -282,5 +282,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, apogee, radio86,0, apogee, apogee, radio86_state,radio86, "Zavod BRA", "Apogee BK-01", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, apogee, radio86, 0, apogee, apogee, apogee_state, radio86, "Zavod BRA", "Apogee BK-01", 0 )
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 756579c0ea2..8e75ef15ece 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -1048,7 +1048,7 @@ READ_LINE_MEMBER( apollo_state::apollo_kbd_is_german )
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( dn3500, apollo_state )
+static MACHINE_CONFIG_START( dn3500 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
MCFG_CPU_PROGRAM_MAP(dn3500_map)
@@ -1074,7 +1074,7 @@ static MACHINE_CONFIG_START( dn3500, apollo_state )
#endif
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dsp3500, apollo_state )
+static MACHINE_CONFIG_START( dsp3500 )
MCFG_CPU_ADD(MAINCPU, M68030, 25000000) /* 25 MHz 68030 */
MCFG_CPU_PROGRAM_MAP(dsp3500_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
@@ -1122,7 +1122,7 @@ static MACHINE_CONFIG_DERIVED( dn3000, dn3500 )
MCFG_RAM_EXTRA_OPTIONS("4M")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dsp3000, apollo_state )
+static MACHINE_CONFIG_START( dsp3000 )
MCFG_CPU_ADD(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
MCFG_CPU_PROGRAM_MAP(dsp3000_map)
@@ -1168,7 +1168,7 @@ static MACHINE_CONFIG_DERIVED( dn5500, dn3500 )
MCFG_CPU_PROGRAM_MAP(dn5500_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dsp5500, apollo_state )
+static MACHINE_CONFIG_START( dsp5500 )
MCFG_CPU_ADD(MAINCPU, M68040, 25000000) /* 25 MHz */
MCFG_CPU_PROGRAM_MAP(dsp5500_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(apollo_state,apollo_irq_acknowledge)
@@ -1250,15 +1250,15 @@ ROM_END
#define DSP_FLAGS 0
//#define DSP_FLAGS MACHINE_NO_SOUND
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, dn3500, 0, 0, dn3500_15i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500", DN_FLAGS )
-COMP( 1989, dsp3500, dn3500, 0, dsp3500, dsp3500, apollo_state,dsp3500,"Apollo", "Apollo DSP3500", DSP_FLAGS )
-COMP( 1989, dn3500_19i, dn3500, 0, dn3500_19i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500 19\" Monochrome", DN_FLAGS )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1989, dn3500, 0, 0, dn3500_15i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500", DN_FLAGS )
+COMP( 1989, dsp3500, dn3500, 0, dsp3500, dsp3500, apollo_state, dsp3500, "Apollo", "Apollo DSP3500", DSP_FLAGS )
+COMP( 1989, dn3500_19i, dn3500, 0, dn3500_19i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500 19\" Monochrome", DN_FLAGS )
-COMP( 1988, dn3000, dn3500, 0, dn3000_15i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000", DN_FLAGS )
-COMP( 1988, dsp3000, dn3500, 0, dsp3000, dsp3500, apollo_state,dsp3000,"Apollo", "Apollo DSP3000", DSP_FLAGS )
-COMP( 1988, dn3000_19i, dn3500, 0, dn3000_19i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000 19\" Monochrome", DN_FLAGS )
+COMP( 1988, dn3000, dn3500, 0, dn3000_15i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000", DN_FLAGS )
+COMP( 1988, dsp3000, dn3500, 0, dsp3000, dsp3500, apollo_state, dsp3000, "Apollo", "Apollo DSP3000", DSP_FLAGS )
+COMP( 1988, dn3000_19i, dn3500, 0, dn3000_19i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000 19\" Monochrome", DN_FLAGS )
-COMP( 1991, dn5500, dn3500, 0, dn5500_15i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500", MACHINE_NOT_WORKING )
-COMP( 1991, dsp5500, dn3500, 0, dsp5500, dsp3500, apollo_state,dsp5500,"Apollo", "Apollo DSP5500", MACHINE_NOT_WORKING )
-COMP( 1991, dn5500_19i, dn3500, 0, dn5500_19i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500 19\" Monochrome", MACHINE_NOT_WORKING )
+COMP( 1991, dn5500, dn3500, 0, dn5500_15i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500", MACHINE_NOT_WORKING )
+COMP( 1991, dsp5500, dn3500, 0, dsp5500, dsp3500, apollo_state, dsp5500, "Apollo", "Apollo DSP5500", MACHINE_NOT_WORKING )
+COMP( 1991, dn5500_19i, dn3500, 0, dn5500_19i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500 19\" Monochrome", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp
index b343274879f..18c8dc81fe4 100644
--- a/src/mame/drivers/apple1.cpp
+++ b/src/mame/drivers/apple1.cpp
@@ -585,7 +585,7 @@ static SLOT_INTERFACE_START(apple1_cards)
SLOT_INTERFACE("cffa", A1BUS_CFFA)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( apple1, apple1_state )
+static MACHINE_CONFIG_START( apple1 )
MCFG_CPU_ADD(A1_CPU_TAG, M6502, 960000) // effective CPU speed
MCFG_CPU_PROGRAM_MAP(apple1_map)
@@ -623,5 +623,5 @@ ROM_START(apple1)
ROM_LOAD("s2513.d2", 0x0000, 0x0200, CRC(a7e567fc) SHA1(b18aae0a2d4f92f5a7e22640719bbc4652f3f4ee)) // apple1.vid
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
-COMP( 1976, apple1, 0, 0, apple1, apple1, driver_device, 0, "Apple Computer", "Apple I", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1976, apple1, 0, 0, apple1, apple1, apple1_state, 0, "Apple Computer", "Apple I", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index 4fa86e261b7..416e82e68dd 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -1316,7 +1316,7 @@ static SLOT_INTERFACE_START(apple2_cards)
// SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( apple2_common, napple2_state )
+static MACHINE_CONFIG_START( apple2_common )
/* basic machine hardware */
MCFG_CPU_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
MCFG_CPU_PROGRAM_MAP(apple2_map)
@@ -1653,22 +1653,22 @@ ROM_START(laba2p) /* II Plus clone with on-board Disk II controller and Videx-co
ROM_END
#endif
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1977, apple2, 0, 0, apple2, apple2, driver_device, 0, "Apple Computer", "Apple ][", MACHINE_SUPPORTS_SAVE )
-COMP( 1979, apple2p, apple2, 0, apple2p, apple2p, driver_device, 0, "Apple Computer", "Apple ][+", MACHINE_SUPPORTS_SAVE )
-COMP( 1980, apple2jp, apple2, 0, apple2jp, apple2p, driver_device, 0, "Apple Computer", "Apple ][ J-Plus", MACHINE_SUPPORTS_SAVE )
-COMP( 198?, elppa, apple2, 0, apple2p, apple2p, driver_device, 0, "Victor do Brasil", "Elppa II+", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, microeng, apple2, 0, apple2p, apple2p, driver_device, 0, "Spectrum Eletronica (SCOPUS)", "Micro Engenho", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, maxxi, apple2, 0, apple2p, apple2p, driver_device, 0, "Polymax", "Maxxi", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, prav82, apple2, 0, apple2p, apple2p, driver_device, 0, "Pravetz", "Pravetz 82", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, ace100, apple2, 0, apple2, apple2p, driver_device, 0, "Franklin Computer", "Franklin Ace 100", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, uniap2en, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletronica", "Unitron AP II (in English)", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, uniap2pt, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletronica", "Unitron AP II (in Brazilian Portuguese)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, uniap2ti, apple2, 0, apple2p, apple2p, driver_device, 0, "Unitron Eletronica", "Unitron AP II+ (Teclado Inteligente)", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, craft2p, apple2, 0, apple2p, apple2p, driver_device, 0, "Craft", "Craft II+", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME
+COMP( 1977, apple2, 0, 0, apple2, apple2, napple2_state, 0, "Apple Computer", "Apple ][", MACHINE_SUPPORTS_SAVE )
+COMP( 1979, apple2p, apple2, 0, apple2p, apple2p, napple2_state, 0, "Apple Computer", "Apple ][+", MACHINE_SUPPORTS_SAVE )
+COMP( 1980, apple2jp, apple2, 0, apple2jp, apple2p, napple2_state, 0, "Apple Computer", "Apple ][ J-Plus", MACHINE_SUPPORTS_SAVE )
+COMP( 198?, elppa, apple2, 0, apple2p, apple2p, napple2_state, 0, "Victor do Brasil", "Elppa II+", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, microeng, apple2, 0, apple2p, apple2p, napple2_state, 0, "Spectrum Eletronica (SCOPUS)", "Micro Engenho", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, maxxi, apple2, 0, apple2p, apple2p, napple2_state, 0, "Polymax", "Maxxi", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, prav82, apple2, 0, apple2p, apple2p, napple2_state, 0, "Pravetz", "Pravetz 82", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, ace100, apple2, 0, apple2, apple2p, napple2_state, 0, "Franklin Computer", "Franklin Ace 100", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, uniap2en, apple2, 0, apple2p, apple2p, napple2_state, 0, "Unitron Eletronica", "Unitron AP II (in English)", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, uniap2pt, apple2, 0, apple2p, apple2p, napple2_state, 0, "Unitron Eletronica", "Unitron AP II (in Brazilian Portuguese)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, uniap2ti, apple2, 0, apple2p, apple2p, napple2_state, 0, "Unitron Eletronica", "Unitron AP II+ (Teclado Inteligente)", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, craft2p, apple2, 0, apple2p, apple2p, napple2_state, 0, "Craft", "Craft II+", MACHINE_SUPPORTS_SAVE )
// reverse font direction -\/
-COMP( 1984, ivelultr, apple2, 0, apple2p, apple2p, driver_device, 0, "Ivasim", "Ivel Ultra", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, prav8m, apple2, 0, apple2p, apple2p, driver_device, 0, "Pravetz", "Pravetz 8M", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, space84, apple2, 0, space84, apple2p, driver_device, 0, "ComputerTechnik/IBS", "Space 84", MACHINE_NOT_WORKING )
-COMP( 1985, am64, apple2, 0, space84, apple2p, driver_device, 0, "ASEM", "AM 64", MACHINE_SUPPORTS_SAVE )
-//COMP( 19??, laba2p, apple2, 0, laba2p, apple2p, driver_device, 0, "<unknown>", "Lab equipment Apple II Plus clone", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, ivelultr, apple2, 0, apple2p, apple2p, napple2_state, 0, "Ivasim", "Ivel Ultra", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, prav8m, apple2, 0, apple2p, apple2p, napple2_state, 0, "Pravetz", "Pravetz 8M", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, space84, apple2, 0, space84, apple2p, napple2_state, 0, "ComputerTechnik/IBS", "Space 84", MACHINE_NOT_WORKING )
+COMP( 1985, am64, apple2, 0, space84, apple2p, napple2_state, 0, "ASEM", "AM 64", MACHINE_SUPPORTS_SAVE )
+//COMP( 19??, laba2p, apple2, 0, laba2p, apple2p, napple2_state, 0, "<unknown>", "Lab equipment Apple II Plus clone", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index abbcfcb5a13..c1e415969bf 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -3412,7 +3412,7 @@ static SLOT_INTERFACE_START(apple2eaux_cards)
SLOT_INTERFACE("rw3", A2EAUX_RAMWORKS3) /* Applied Engineering RamWorks III */
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( apple2e, apple2e_state )
+static MACHINE_CONFIG_START( apple2e )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
MCFG_CPU_PROGRAM_MAP(apple2e_map)
@@ -4000,23 +4000,23 @@ ROM_START(apple2cp)
ROM_LOAD( "341-0132-d.e12", 0x000, 0x800, CRC(c506efb9) SHA1(8e14e85c645187504ec9d162b3ea614a0c421d32) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, apple2e, 0, apple2, apple2e, apple2e, driver_device, 0, "Apple Computer", "Apple //e", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, apple2euk,apple2e, 0, apple2e, apple2euk,driver_device, 0, "Apple Computer", "Apple //e (UK)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, apple2ees,apple2e, 0, apple2e, apple2ees,driver_device, 0, "Apple Computer", "Apple //e (Spain)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, mprof3, apple2e, 0, mprof3, apple2e, driver_device, 0, "Multitech", "Microprofessor III", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1985, apple2ee, apple2e, 0, apple2ee, apple2e, driver_device, 0, "Apple Computer", "Apple //e (enhanced)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, apple2eeuk,apple2e, 0, apple2ee, apple2euk, driver_device,0, "Apple Computer", "Apple //e (enhanced, UK)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, apple2eefr,apple2e, 0, apple2ee, apple2efr, driver_device,0, "Apple Computer", "Apple //e (enhanced, France)", MACHINE_SUPPORTS_SAVE )
-COMP( 1987, apple2ep, apple2e, 0, apple2ep, apple2ep, driver_device, 0, "Apple Computer", "Apple //e (Platinum)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, apple2c, 0, apple2, apple2c, apple2c, driver_device, 0, "Apple Computer", "Apple //c" , MACHINE_SUPPORTS_SAVE )
-COMP( 1985?,spectred, apple2e, 0, spectred, apple2e, driver_device, 0, "Scopus/Spectrum", "Spectrum ED" , MACHINE_SUPPORTS_SAVE )
-COMP( 1986, tk3000, apple2c, 0, tk3000, apple2e, driver_device, 0, "Microdigital", "TK3000//e" , MACHINE_SUPPORTS_SAVE )
-COMP( 1989, prav8c, apple2e, 0, apple2e, apple2e, driver_device, 0, "Pravetz", "Pravetz 8C", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1987, laser128, apple2c, 0, laser128, apple2e, driver_device, 0, "Video Technology", "Laser 128 (version 4.2)", MACHINE_SUPPORTS_SAVE )
-COMP( 1988, las128ex, apple2c, 0, laser128, apple2e, driver_device, 0, "Video Technology", "Laser 128ex (version 4.5)", MACHINE_SUPPORTS_SAVE )
-COMP( 1988, las128e2, apple2c, 0, laser128ex2, apple2e, driver_device, 0, "Video Technology", "Laser 128ex2 (version 6.1)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, apple2c0, apple2c, 0, apple2c_iwm, apple2c, driver_device, 0, "Apple Computer", "Apple //c (UniDisk 3.5)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, apple2c3, apple2c, 0, apple2c_mem, apple2c, driver_device, 0, "Apple Computer", "Apple //c (Original Memory Expansion)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, apple2c4, apple2c, 0, apple2c_mem, apple2c, driver_device, 0, "Apple Computer", "Apple //c (rev 4)", MACHINE_SUPPORTS_SAVE )
-COMP( 1988, apple2cp, apple2c, 0, apple2cp, apple2c, driver_device, 0, "Apple Computer", "Apple //c Plus", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1983, apple2e, 0, apple2, apple2e, apple2e, apple2e_state, 0, "Apple Computer", "Apple //e", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, apple2euk,apple2e, 0, apple2e, apple2euk, apple2e_state, 0, "Apple Computer", "Apple //e (UK)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, apple2ees,apple2e, 0, apple2e, apple2ees, apple2e_state, 0, "Apple Computer", "Apple //e (Spain)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, mprof3, apple2e, 0, mprof3, apple2e, apple2e_state, 0, "Multitech", "Microprofessor III", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, apple2ee, apple2e, 0, apple2ee, apple2e, apple2e_state, 0, "Apple Computer", "Apple //e (enhanced)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, apple2eeuk,apple2e, 0, apple2ee, apple2euk, apple2e_state, 0, "Apple Computer", "Apple //e (enhanced, UK)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, apple2eefr,apple2e, 0, apple2ee, apple2efr, apple2e_state, 0, "Apple Computer", "Apple //e (enhanced, France)", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, apple2ep, apple2e, 0, apple2ep, apple2ep, apple2e_state, 0, "Apple Computer", "Apple //e (Platinum)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, apple2c, 0, apple2, apple2c, apple2c, apple2e_state, 0, "Apple Computer", "Apple //c" , MACHINE_SUPPORTS_SAVE )
+COMP( 1985?,spectred, apple2e, 0, spectred, apple2e, apple2e_state, 0, "Scopus/Spectrum", "Spectrum ED" , MACHINE_SUPPORTS_SAVE )
+COMP( 1986, tk3000, apple2c, 0, tk3000, apple2e, apple2e_state, 0, "Microdigital", "TK3000//e" , MACHINE_SUPPORTS_SAVE )
+COMP( 1989, prav8c, apple2e, 0, apple2e, apple2e, apple2e_state, 0, "Pravetz", "Pravetz 8C", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, laser128, apple2c, 0, laser128, apple2e, apple2e_state, 0, "Video Technology", "Laser 128 (version 4.2)", MACHINE_SUPPORTS_SAVE )
+COMP( 1988, las128ex, apple2c, 0, laser128, apple2e, apple2e_state, 0, "Video Technology", "Laser 128ex (version 4.5)", MACHINE_SUPPORTS_SAVE )
+COMP( 1988, las128e2, apple2c, 0, laser128ex2, apple2e, apple2e_state, 0, "Video Technology", "Laser 128ex2 (version 6.1)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, apple2c0, apple2c, 0, apple2c_iwm, apple2c, apple2e_state, 0, "Apple Computer", "Apple //c (UniDisk 3.5)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, apple2c3, apple2c, 0, apple2c_mem, apple2c, apple2e_state, 0, "Apple Computer", "Apple //c (Original Memory Expansion)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, apple2c4, apple2c, 0, apple2c_mem, apple2c, apple2e_state, 0, "Apple Computer", "Apple //c (rev 4)", MACHINE_SUPPORTS_SAVE )
+COMP( 1988, apple2cp, apple2c, 0, apple2cp, apple2c, apple2e_state, 0, "Apple Computer", "Apple //c Plus", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 251c754b77c..712c4de94b5 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -307,7 +307,7 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("hsscsi", A2BUS_HSSCSI) /* Apple II High-Speed SCSI Card */
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( apple2gs, apple2gs_state )
+static MACHINE_CONFIG_START( apple2gs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", G65816, APPLE2GS_14M/5)
MCFG_CPU_PROGRAM_MAP(apple2gs_map)
@@ -579,10 +579,10 @@ ROM_START(apple2gsr0p2) // 3/10/1986 Cortland prototype, boots as "Apple //'ing
ROM_LOAD( "341-0132-d.e12", 0x000, 0x800, CRC(c506efb9) SHA1(8e14e85c645187504ec9d162b3ea614a0c421d32) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1989, apple2gs, 0, apple2, apple2gs, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM03)", MACHINE_SUPPORTS_SAVE )
-COMP( 198?, apple2gsr3p, apple2gs, 0, apple2gs, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM03 prototype)", MACHINE_NOT_WORKING )
-COMP( 1987, apple2gsr1, apple2gs, 0, apple2gsr1, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM01)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, apple2gsr0, apple2gs, 0, apple2gsr1, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM00)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, apple2gsr0p, apple2gs, 0, apple2gsr1, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM00 prototype 6/19/1986)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, apple2gsr0p2, apple2gs, 0, apple2gsr1, apple2gs, driver_device, 0, "Apple Computer", "Apple IIgs (ROM00 prototype 3/10/1986)", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1989, apple2gs, 0, apple2, apple2gs, apple2gs, apple2gs_state, 0, "Apple Computer", "Apple IIgs (ROM03)", MACHINE_SUPPORTS_SAVE )
+COMP( 198?, apple2gsr3p, apple2gs, 0, apple2gs, apple2gs, apple2gs_state, 0, "Apple Computer", "Apple IIgs (ROM03 prototype)", MACHINE_NOT_WORKING )
+COMP( 1987, apple2gsr1, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, 0, "Apple Computer", "Apple IIgs (ROM01)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, apple2gsr0, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, 0, "Apple Computer", "Apple IIgs (ROM00)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, apple2gsr0p, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, 0, "Apple Computer", "Apple IIgs (ROM00 prototype 6/19/1986)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, apple2gsr0p2, apple2gs, 0, apple2gsr1, apple2gs, apple2gs_state, 0, "Apple Computer", "Apple IIgs (ROM00 prototype 3/10/1986)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp
index d78f7c6e80b..0885ce7e47a 100644
--- a/src/mame/drivers/apple3.cpp
+++ b/src/mame/drivers/apple3.cpp
@@ -52,7 +52,7 @@ FLOPPY_FORMATS_MEMBER( apple3_state::floppy_formats )
FLOPPY_A216S_FORMAT, FLOPPY_RWTS18_FORMAT, FLOPPY_EDD_FORMAT
FLOPPY_FORMATS_END
-static MACHINE_CONFIG_START( apple3, apple3_state )
+static MACHINE_CONFIG_START( apple3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz */
MCFG_M6502_SYNC_CALLBACK(WRITELINE(apple3_state, apple3_sync_w))
@@ -353,5 +353,5 @@ ROM_START(apple3)
ROM_LOAD( "apple3.rom", 0x0000, 0x1000, CRC(55e8eec9) SHA1(579ee4cd2b208d62915a0aa482ddc2744ff5e967))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1980, apple3, 0, 0, apple3, apple3, apple3_state, apple3, "Apple Computer", "Apple ///", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1980, apple3, 0, 0, apple3, apple3, apple3_state, apple3, "Apple Computer", "Apple ///", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index 04316b8a2a3..be6df17a063 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -166,7 +166,7 @@ private:
required_device<via6522_device> m_via;
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_cent_data_out;
- required_device<wd1772_t> m_fdc;
+ required_device<wd1772_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<dac_byte_interface> m_ldac;
@@ -475,7 +475,7 @@ static ADDRESS_MAP_START( subcpu_io, AS_IO, 8, applix_state )
AM_RANGE(0x10, 0x17) AM_READWRITE(port10_r,port10_w) //IRQ
AM_RANGE(0x18, 0x1f) AM_READWRITE(port18_r,port18_w) //data&command
AM_RANGE(0x20, 0x27) AM_MIRROR(0x18) AM_READWRITE(port20_r,port20_w) //SCSI NCR5380
- AM_RANGE(0x40, 0x43) AM_MIRROR(0x1c) AM_DEVREADWRITE("fdc", wd1772_t, read, write) //FDC
+ AM_RANGE(0x40, 0x43) AM_MIRROR(0x1c) AM_DEVREADWRITE("fdc", wd1772_device, read, write) //FDC
AM_RANGE(0x60, 0x63) AM_MIRROR(0x1c) AM_READWRITE(port60_r,port60_w) //anotherZ80SCC
ADDRESS_MAP_END
@@ -832,7 +832,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(applix_state::cass_timer)
}
}
-static MACHINE_CONFIG_START( applix, applix_state )
+static MACHINE_CONFIG_START( applix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 7500000)
MCFG_CPU_PROGRAM_MAP(applix_mem)
@@ -940,7 +940,7 @@ DRIVER_INIT_MEMBER(applix_state, applix)
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1986, applix, 0, 0, applix, applix, applix_state, applix, "Applix Pty Ltd", "Applix 1616", 0 )
diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp
index 826102a3001..15c24d0ca34 100644
--- a/src/mame/drivers/appoooh.cpp
+++ b/src/mame/drivers/appoooh.cpp
@@ -416,7 +416,7 @@ INTERRUPT_GEN_MEMBER(appoooh_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( appoooh_common, appoooh_state )
+static MACHINE_CONFIG_START( appoooh_common )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
@@ -439,7 +439,7 @@ static MACHINE_CONFIG_START( appoooh_common, appoooh_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(appoooh_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) /* 6KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -611,6 +611,6 @@ DRIVER_INIT_MEMBER(appoooh_state,robowresb)
*
*************************************/
-GAME( 1984, appoooh, 0, appoooh, appoooh, driver_device, 0, ROT0, "Sanritsu / Sega", "Appoooh", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, robowres, 0, robowrese,robowres, driver_device, 0, ROT0, "Sanritsu / Sega", "Robo Wres 2001", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, robowresb, robowres, robowres, robowres, appoooh_state, robowresb,ROT0, "bootleg", "Robo Wres 2001 (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, appoooh, 0, appoooh, appoooh, appoooh_state, 0, ROT0, "Sanritsu / Sega", "Appoooh", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, robowres, 0, robowrese,robowres, appoooh_state, 0, ROT0, "Sanritsu / Sega", "Robo Wres 2001", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, robowresb, robowres, robowres, robowres, appoooh_state, robowresb, ROT0, "bootleg", "Robo Wres 2001 (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index 8926e21e3e8..b995891fad5 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -102,7 +102,7 @@ private:
required_device<z80sio0_device> m_sio;
required_device<rs232_port_device> m_rs232;
required_device<centronics_device> m_centronics;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<palette_device> m_palette;
@@ -327,7 +327,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( apricot_io, AS_IO, 16, apricot_state )
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE8("ic31", pic8259_device, read, write, 0x00ff)
- AM_RANGE(0x40, 0x47) AM_DEVREADWRITE8("ic68", wd2797_t, read, write, 0x00ff)
+ AM_RANGE(0x40, 0x47) AM_DEVREADWRITE8("ic68", wd2797_device, read, write, 0x00ff)
AM_RANGE(0x48, 0x4f) AM_DEVREADWRITE8("ic17", i8255_device, read, write, 0x00ff)
AM_RANGE(0x50, 0x51) AM_MIRROR(0x06) AM_DEVWRITE8("ic7", sn76489_device, write, 0x00ff)
AM_RANGE(0x58, 0x5f) AM_DEVREADWRITE8("ic16", pit8253_device, read, write, 0x00ff)
@@ -347,7 +347,7 @@ ADDRESS_MAP_END
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( apricot, apricot_state )
+static MACHINE_CONFIG_START( apricot )
// main cpu
MCFG_CPU_ADD("ic91", I8086, XTAL_15MHz / 3)
MCFG_CPU_PROGRAM_MAP(apricot_mem)
@@ -487,5 +487,5 @@ ROM_END
//**************************************************************************
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1983, apricot, 0, 0, apricot, 0, driver_device, 0, "ACT", "Apricot PC", 0 )
-COMP( 1984, apricotxi, apricot, 0, apricotxi, 0, driver_device, 0, "ACT", "Apricot Xi", 0 )
+COMP( 1983, apricot, 0, 0, apricot, 0, apricot_state, 0, "ACT", "Apricot PC", 0 )
+COMP( 1984, apricotxi, apricot, 0, apricotxi, 0, apricot_state, 0, "ACT", "Apricot Xi", 0 )
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index ea689b1ea29..b342ab66c0b 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -83,7 +83,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<z80ctc_device> m_ctc;
required_device<z80sio2_device> m_sio;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<centronics_device> m_centronics;
@@ -268,7 +268,7 @@ static ADDRESS_MAP_START( act_f1_io, AS_IO, 16, f1_state )
AM_RANGE(0x0010, 0x0017) AM_DEVREADWRITE8(Z80CTC_TAG, z80ctc_device, read, write, 0x00ff)
AM_RANGE(0x0020, 0x0027) AM_DEVREADWRITE8(Z80SIO2_TAG, z80sio2_device, ba_cd_r, ba_cd_w, 0x00ff)
// AM_RANGE(0x0030, 0x0031) AM_WRITE8(ctc_ack_w, 0x00ff)
- AM_RANGE(0x0040, 0x0047) AM_DEVREADWRITE8(WD2797_TAG, wd2797_t, read, write, 0x00ff)
+ AM_RANGE(0x0040, 0x0047) AM_DEVREADWRITE8(WD2797_TAG, wd2797_device, read, write, 0x00ff)
// AM_RANGE(0x01e0, 0x01ff) winchester
ADDRESS_MAP_END
@@ -329,7 +329,7 @@ SLOT_INTERFACE_END
// MACHINE_CONFIG( act_f1 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( act_f1, f1_state )
+static MACHINE_CONFIG_START( act_f1 )
/* basic machine hardware */
MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_14MHz/4)
MCFG_CPU_PROGRAM_MAP(act_f1_mem)
@@ -411,8 +411,8 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1984, f1, 0, 0, act_f1, act, driver_device, 0, "ACT", "Apricot F1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1984, f1e, f1, 0, act_f1, act, driver_device, 0, "ACT", "Apricot F1e", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1984, f2, f1, 0, act_f1, act, driver_device, 0, "ACT", "Apricot F2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1985, f10, f1, 0, act_f1, act, driver_device, 0, "ACT", "Apricot F10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, f1, 0, 0, act_f1, act, f1_state, 0, "ACT", "Apricot F1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1984, f1e, f1, 0, act_f1, act, f1_state, 0, "ACT", "Apricot F1e", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1984, f2, f1, 0, act_f1, act, f1_state, 0, "ACT", "Apricot F2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1985, f10, f1, 0, act_f1, act, f1_state, 0, "ACT", "Apricot F10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index e80068a7f2a..07e4fed6dcb 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -112,7 +112,7 @@ public:
required_device<pic8259_device> m_pic;
required_device<pit8253_device> m_pit;
required_device<z80dart_device> m_sio;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<mc6845_device> m_crtc;
required_device<ram_device> m_ram;
required_device<floppy_connector> m_floppy0;
@@ -433,7 +433,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( fp_io, AS_IO, 16, fp_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x000, 0x007) AM_DEVREADWRITE8(WD2797_TAG, wd2797_t, read, write, 0x00ff)
+ AM_RANGE(0x000, 0x007) AM_DEVREADWRITE8(WD2797_TAG, wd2797_device, read, write, 0x00ff)
AM_RANGE(0x008, 0x00f) AM_DEVREADWRITE8(I8253A5_TAG, pit8253_device, read, write, 0x00ff)
AM_RANGE(0x018, 0x01f) AM_DEVREADWRITE8(Z80SIO0_TAG, z80sio0_device, ba_cd_r, ba_cd_w, 0x00ff)
AM_RANGE(0x020, 0x021) AM_DEVWRITE8("cent_data_out", output_latch_device, write, 0x00ff)
@@ -574,7 +574,7 @@ SLOT_INTERFACE_END
// MACHINE_CONFIG( fp )
//-------------------------------------------------
-static MACHINE_CONFIG_START( fp, fp_state )
+static MACHINE_CONFIG_START( fp )
/* basic machine hardware */
MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_15MHz/3)
MCFG_CPU_PROGRAM_MAP(fp_mem)
@@ -621,8 +621,8 @@ static MACHINE_CONFIG_START( fp, fp_state )
MCFG_DEVICE_ADD(APRICOT_KEYBOARD_TAG, APRICOT_KEYBOARD, 0)
MCFG_DEVICE_ADD(I8237_TAG, AM9517A, 250000)
MCFG_I8237_OUT_EOP_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir7_w))
- MCFG_I8237_IN_IOR_1_CB(DEVREAD8(WD2797_TAG, wd_fdc_t, data_r))
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8(WD2797_TAG, wd_fdc_t, data_w))
+ MCFG_I8237_IN_IOR_1_CB(DEVREAD8(WD2797_TAG, wd_fdc_device_base, data_r))
+ MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8(WD2797_TAG, wd_fdc_device_base, data_w))
MCFG_PIC8259_ADD(I8259A_TAG, INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0), VCC, NOOP)
MCFG_DEVICE_ADD(I8253A5_TAG, PIT8253, 0)
@@ -688,5 +688,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1984, fp, 0, 0, fp, fp, driver_device, 0, "ACT", "Apricot Portable / FP", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, fp, 0, 0, fp, fp, fp_state, 0, "ACT", "Apricot Portable / FP", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index dd76b6167f4..3f56ea94131 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -322,7 +322,7 @@ void aquarium_state::machine_reset()
m_aquarium_snd_ack = 0;
}
-static MACHINE_CONFIG_START( aquarium, aquarium_state )
+static MACHINE_CONFIG_START( aquarium )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // clock not verified on pcb
@@ -358,7 +358,7 @@ static MACHINE_CONFIG_START( aquarium, aquarium_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index 987e23c69d0..06eaa368fb9 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -347,7 +347,7 @@ GFXDECODE_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( aquarius, aquarius_state )
+static MACHINE_CONFIG_START( aquarius )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // ???
MCFG_CPU_PROGRAM_MAP(aquarius_mem)
@@ -420,6 +420,6 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, aquarius, 0, 0, aquarius, aquarius, aquarius_state, aquarius, "Mattel", "Aquarius (NTSC)", 0 )
-//COMP( 1984, aquariu2, aquarius, 0, aquarius, aquarius, driver_device, 0, "Mattel", "Aquarius II", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, aquarius, 0, 0, aquarius, aquarius, aquarius_state, aquarius, "Mattel", "Aquarius (NTSC)", 0 )
+//COMP( 1984, aquariu2, aquarius, 0, aquarius, aquarius, aquarius_state, 0, "Mattel", "Aquarius II", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp
index fa511214a28..bff3c351427 100644
--- a/src/mame/drivers/arabian.cpp
+++ b/src/mame/drivers/arabian.cpp
@@ -336,7 +336,7 @@ void arabian_state::machine_reset()
m_video_control = 0;
}
-static MACHINE_CONFIG_START( arabian, arabian_state )
+static MACHINE_CONFIG_START( arabian )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC/4)
@@ -422,5 +422,5 @@ ROM_END
*
*************************************/
-GAME( 1983, arabian, 0, arabian, arabian, driver_device, 0, ROT270, "Sun Electronics", "Arabian", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, arabiana, arabian, arabian, arabiana, driver_device, 0, ROT270, "Sun Electronics (Atari license)", "Arabian (Atari)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, arabian, 0, arabian, arabian, arabian_state, 0, ROT270, "Sun Electronics", "Arabian", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, arabiana, arabian, arabian, arabiana, arabian_state, 0, ROT270, "Sun Electronics (Atari license)", "Arabian (Atari)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp
index 8e3e2506e55..a84b40cc2e6 100644
--- a/src/mame/drivers/arachnid.cpp
+++ b/src/mame/drivers/arachnid.cpp
@@ -414,10 +414,10 @@ void arachnid_state::machine_start()
***************************************************************************/
/*-------------------------------------------------
- MACHINE_CONFIG_START( arachnid, arachnid_state )
+ MACHINE_CONFIG_START( arachnid )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( arachnid, arachnid_state )
+static MACHINE_CONFIG_START( arachnid )
// basic machine hardware
MCFG_CPU_ADD(M6809_TAG, M6809, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(arachnid_map)
@@ -469,5 +469,5 @@ ROM_END
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-GAME( 1990, arac6000, 0, arachnid, arachnid, driver_device, 0, ROT0, "Arachnid", "Super Six Plus II English Mark Darts", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+GAME( 1990, arac6000, 0, arachnid, arachnid, arachnid_state, 0, ROT0, "Arachnid", "Super Six Plus II English Mark Darts", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index 0c6b488ea7a..b0236430897 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -317,7 +317,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( arcadecl, arcadecl_state )
+static MACHINE_CONFIG_START( arcadecl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
@@ -351,7 +351,7 @@ static MACHINE_CONFIG_START( arcadecl, arcadecl_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -400,5 +400,5 @@ ROM_END
*
*************************************/
-GAME( 1992, arcadecl, 0, arcadecl, arcadecl, driver_device, 0, ROT0, "Atari Games", "Arcade Classics (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sparkz, 0, sparkz, sparkz, driver_device, 0, ROT0, "Atari Games", "Sparkz (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, arcadecl, 0, arcadecl, arcadecl, arcadecl_state, 0, ROT0, "Atari Games", "Arcade Classics (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sparkz, 0, sparkz, sparkz, arcadecl_state, 0, ROT0, "Atari Games", "Sparkz (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp
index 905f0b0b70d..3238f72a48c 100644
--- a/src/mame/drivers/arcadia.cpp
+++ b/src/mame/drivers/arcadia.cpp
@@ -473,7 +473,7 @@ static SLOT_INTERFACE_START(arcadia_cart)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( arcadia, arcadia_state )
+static MACHINE_CONFIG_START( arcadia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 3580000/4) /* 0.895 MHz */
MCFG_CPU_PROGRAM_MAP(arcadia_mem)
@@ -810,7 +810,7 @@ DRIVER_INIT_MEMBER(arcadia_state,arcadia)
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
CONS(1983, advsnha, arcadia, 0, arcadia, arcadia, arcadia_state, arcadia, "Advision", "Advision Home Arcade", MACHINE_IMPERFECT_SOUND ) /* France */
CONS(1982, bndarc, arcadia, 0, arcadia, arcadia, arcadia_state, arcadia, "Bandai", "Arcadia", MACHINE_IMPERFECT_SOUND ) /* Japan */
CONS(1982, arcadia, 0, 0, arcadia, arcadia, arcadia_state, arcadia, "Emerson", "Arcadia 2001", MACHINE_IMPERFECT_SOUND ) /* U.S.A. */
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index 97e535fe435..38599049be6 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -342,7 +342,7 @@ uint32_t argo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
return 0;
}
-static MACHINE_CONFIG_START( argo, argo_state )
+static MACHINE_CONFIG_START( argo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3500000)
MCFG_CPU_PROGRAM_MAP(argo_mem)
@@ -375,5 +375,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, argo, 0, 0, argo, argo, argo_state, argo, "<unknown>", "Argo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1986, argo, 0, 0, argo, argo, argo_state, argo, "<unknown>", "Argo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/argox.cpp b/src/mame/drivers/argox.cpp
index 432eba83224..e3bf71dd394 100644
--- a/src/mame/drivers/argox.cpp
+++ b/src/mame/drivers/argox.cpp
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( os214_io_map, AS_IO, 8, os214_state )
// ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( os214, os214_state )
+static MACHINE_CONFIG_START( os214 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83002, XTAL_16MHz) /* X1 xtal value is correct,
but there can be some clock divider perhaps ? */
@@ -81,5 +81,5 @@ ROM_START( os214 )
ROM_LOAD16_BYTE( "u8_s2a2-4.03_argox_am.u8", 0x000001, 0x040000, CRC(d49f52af) SHA1(0ca5a70c6c3995f275226af26db965f6ba7ed123) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1996, os214, 0, 0, os214, 0, os214_state, os214, "Argox", "Rabbit Printer (model OS-214)", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1996, os214, 0, 0, os214, 0, os214_state, os214, "Argox", "Rabbit Printer (model OS-214)", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp
index d70019516d4..55bf4ca64bf 100644
--- a/src/mame/drivers/argus.cpp
+++ b/src/mame/drivers/argus.cpp
@@ -530,7 +530,7 @@ static GFXDECODE_START( butasan )
GFXDECODE_END
-static MACHINE_CONFIG_START( argus, argus_state )
+static MACHINE_CONFIG_START( argus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 4 MHz */
@@ -578,7 +578,7 @@ static MACHINE_CONFIG_START( argus, argus_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( valtric, argus_state )
+static MACHINE_CONFIG_START( valtric )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
@@ -626,7 +626,7 @@ static MACHINE_CONFIG_START( valtric, argus_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( butasan, argus_state )
+static MACHINE_CONFIG_START( butasan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5 MHz */
@@ -808,8 +808,8 @@ ROM_START( butasanj )
ROM_END
-/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME ) */
-GAME( 1986, argus, 0, argus, argus, driver_device, 0, ROT270, "NMK (Jaleco license)", "Argus", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, valtric, 0, valtric, valtric, driver_device, 0, ROT270, "NMK (Jaleco license)", "Valtric", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, butasan, 0, butasan, butasan, driver_device, 0, ROT0, "NMK (Jaleco license)", "Butasan - Pig's & Bomber's (Japan, English)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, butasanj, butasan,butasan, butasan, driver_device, 0, ROT0, "NMK (Jaleco license)", "Butasan (Japan, Japanese)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+/* ( YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME ) */
+GAME( 1986, argus, 0, argus, argus, argus_state, 0, ROT270, "NMK (Jaleco license)", "Argus", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, valtric, 0, valtric, valtric, argus_state, 0, ROT270, "NMK (Jaleco license)", "Valtric", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, butasan, 0, butasan, butasan, argus_state, 0, ROT0, "NMK (Jaleco license)", "Butasan - Pig's & Bomber's (Japan, English)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, butasanj, butasan,butasan, butasan, argus_state, 0, ROT0, "NMK (Jaleco license)", "Butasan (Japan, Japanese)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index c551afcf7f3..b6b55fb9f80 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -1709,7 +1709,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(aristmk4_state::aristmk4_pf)
}
}
-static MACHINE_CONFIG_START( aristmk4, aristmk4_state )
+static MACHINE_CONFIG_START( aristmk4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8) // 1.5mhz
MCFG_CPU_PROGRAM_MAP(aristmk4_map)
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index 6b44b0b44e1..bd0202f170b 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -1803,7 +1803,7 @@ void aristmk5_state::machine_reset()
}
-static MACHINE_CONFIG_START( aristmk5, aristmk5_state )
+static MACHINE_CONFIG_START( aristmk5 )
MCFG_CPU_ADD("maincpu", ARM, MASTER_CLOCK/6) // 12000000
MCFG_CPU_PROGRAM_MAP(aristmk5_drame_map)
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index 23fd68d8cf3..5265898ffa4 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -316,7 +316,7 @@ INPUT_PORTS_END
#define ARISTMK6_CPU_CLOCK XTAL_200MHz
// ?
-static MACHINE_CONFIG_START( aristmk6, aristmk6_state )
+static MACHINE_CONFIG_START( aristmk6 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, ARISTMK6_CPU_CLOCK)
MCFG_SH4_MD0(1)
@@ -2912,248 +2912,248 @@ ROM_END
-GAME( 2000, aristmk6, 0, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Aristocrat MK6 System Software", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT)
+GAME( 2000, aristmk6, 0, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Aristocrat MK6 System Software", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_BIOS_ROOT)
// Dates listed below are for the combination (reel layout), not release dates
-GAME( 2004, 5drag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744, C - 14/01/04
-GAME( 2004, 5dragsp, 5drag, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744, C - 14/01/04
-GAME( 2007, 5dragce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Dragons - Cash Express (0152309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US211, A - 01/09/07
-GAME( 2007, 5koipp, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "5 Koi - Power Pay (10250711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744/2, C - 25/10/07
-GAME( 2002, 50lions, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions (10120511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, A - 11/10/02
-GAME( 2003, 50lionsm, 50lions, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions (10156111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, D - 20/10/03
-GAME( 2012, 50lionrr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "50 Lions - Roaring Riches (20301311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 1049, B - 20/08/12
-GAME( 2006, 100lions, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "100 Lions (10219211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/4, B - 13/06/06
-GAME( 2005, adonisa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Adonis (0151178, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US168, A - 05/26/05
-GAME( 2001, adustcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "African Dusk - Mr. Cashman (20006711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 665/1, B- 13/07/01
-GAME( 2004, afterhrs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "After Hours (0251071, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US051, B - 01/20/04
-GAME( 2003, alchemy, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Alchemy (1J009611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013/2, A - 30/05/03
-GAME( 2007, atkgld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "All the King's Gold (0152152, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US209, A - 01/08/07
-GAME( 2001, amzqueen, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Amazon Queen (10005511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 669, A - 02/05/01
-GAME( 2009, amztempl, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Amazon Temple (10299811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 906, A - 29/04/09
-GAME( 2004, antcleo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10163211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 754, A - 15/01/04
-GAME( 2004, antcleom, antcleo, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10177211, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 754, B - 12/07/04
-GAME( 2003, apocof, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Apollo Coffee (0151105, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US083, A - 11/10/03
-GAME( 2001, arabnga6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arabian Nights (2J008211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB009/1, E - 10/12/01
-GAME( 2004, arabnga6u,arabnga6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arabian Nights (0151356, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/21, E - 07/06/04
-GAME( 2003, arwincm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arctic Wins - Mr. Cashman (0151065, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US029, E- 01/27/03
-GAME( 2003, arish, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Arishinko (0151087, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US057, E - 05/28/03
-GAME( 2004, asnprinc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Asian Princess (0352502, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4208, C - 09/13/04
-GAME( 2008, beavbuk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Beaver Bucks (20255111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 850, C - 23/01/08
-GAME( 2003, bigben, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Ben (30126911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 710, B - 17/07/03
-GAME( 1999, bigheart, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Hearted (10000511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 637, D - 15/11/99
-GAME( 2002, bigred, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Red (2J009211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB015, D - 27/09/02
-GAME( 2005, bigred2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Big Red 2 (5J011311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB024, B - 18/05/05
-GAME( 2002, blkbrum, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Black Brumby (1J009111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB010, C - 14/06/02
-GAME( 200?, blkmust, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Black Mustang (0152584, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014/21, (no data)
-GAME( 2007, bluetigr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Blue Tiger (20259511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 855, A - 12/12/07
-GAME( 2007, bobdolly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bob and Dolly (0352298, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US243, A - 10/15/07
-GAME( 2005, brazil, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Brazil (20180311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 783, B - 25/02/05
-GAME( 2004, bucaneer, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buccaneer (10173011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765, A - 05/04/04
-GAME( 2010, buckstop, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Buck Stops Here (10294311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 897/1, A - 22/07/10
-GAME( 2006, buffalo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buffalo (10217811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 806, E - 06/10/06
-GAME( 200?, buffalou, buffalo, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Buffalo (0252636, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4328, (no data)
-GAME( 2005, bmbugs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bumble Bugs (0351180, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US166, A - 05/13/05
-GAME( 2001, bushrngr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Bushranger (10006111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 673, A - 18/04/01
-GAME( 2007, cactusco, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Cactus Corral (10237711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 818, D - 24/07/07
-GAME( 2007, callwld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Call of the Wild (10256611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 827, B - 12/11/07
-GAME( 2005, calyking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Calypso King (20197111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 772/1, B - 25/07/05
-GAME( 2006, canaryrc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Canary Riches (10218211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 809, A - 30/03/06
-GAME( 2005, cmtonig, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Cashman Tonight (30194711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0007, B - 25/05/05
-GAME( 2004, cinhell, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Chance in Hell - Li'l Lucy (0251125, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US119, A - 06/30/04
-GAME( 2002, csd, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (10104011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/04/02
-GAME( 2002, csdsp, csd, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (20104011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/04/02
-GAME( 2003, csdm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa (20131511, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/01/03
-GAME( 2003, csdce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Doa - Cash Express (30149511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 03/02/03
-GAME( 2006, csret, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Choy Sun Returns (20212211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744/2, B - 15/08/06
-GAME( 2005, corrida, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Corrida de Toros (30178311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 771, D - 22/03/05
-GAME( 2003, cryspri, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (10144411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03
-GAME( 2003, crysprim, cryspri, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (10155811, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03
-GAME( 2006, cryspriu, cryspri, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Crystal Springs (0352557, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4255, C - 01/16/06
-GAME( 2009, deepfrz, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Deep Freeze (10282311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB113/2, A - 27/02/09
-GAME( 2009, deepfrzu, deepfrz, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Deep Freeze (0154081, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB113/4, A - 27/07/09
-GAME( 2005, deltabel, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Delta Belle (0252532, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4243, B - 04/29/05
-GAME( 2004, deltaqn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Delta Queen (20185211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 768, A - 13/09/04
-GAME( 2004, dimeye, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamond Eyes (0251312, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB012/20, J - 01/22/04
-GAME( 2004, dimeyece, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamond Eyes - Cash Express (0152039, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB012/20, J - 01/22/04
-GAME( 2002, di4ever, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Diamonds Forever (10105011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 679, B - 14/03/02
-GAME( 2003, dinosa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dinosaur (10118811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 731, C - 08/08/03
-GAME( 2005, dblagent, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Double Agent (0152082, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US180, A - 12/09/05
-GAME( 2000, dbldolph, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Double Dolphins (20000211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 647, C - 18/04/00
-GAME( 2004, drgnlord, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dragon Lord (10173511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 761, A - 22/06/04
-GAME( 2006, drgnmgic, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dragon Magic (2J015711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB051, E - 05/07/06
-GAME( 2003, drmcatch, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dream Catcher (10126721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 704, F - 23/06/03
-GAME( 2008, drmred, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Dream of the Red Chamber (10273811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB027/2, A - 25/8/08
-GAME( 2004, eaglrock, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Rock - Cash Express (0151126, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US021, C - 05/25/04
-GAME( 2010, estrike, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eagle Strike (40289711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 950, A - 20/07/10
-GAME( 2004, eastland, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Easter Island - Cash Express (0151117, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US052, B - 02/22/04
-GAME( 2005, eggsrccm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eggstreme Riches - Mr. Cashman (0351149, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US144, B - 11/3/05
-GAME( 200?, efce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchanted Forest - Cash Express (0151084, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // ???, ???
-GAME( 2007, encspell, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchanted Spell (10257011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB041, B - 18/07/07
-GAME( 2000, enchantr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Enchantress (20000711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 633, C- 15/01/00
-GAME( 2000, eott, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Eyes of the Tiger (10002011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 658, B - 01/06/00
-GAME( 2004, firednc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Fire Dancer (20184911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 772, A - 01/10/04
-GAME( 2002, flamoljc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame of Olympus - Jackpot Carnival (0251048, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4091/3, A - 2/18/02
-GAME( 2002, flamolce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Flame of Olympus - Cash Express (0351025, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4091/3, A - 2/18/02
-GAME( 2000, followst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Follow the Stars (20001411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 659, D - 15/09/00
-GAME( 2007, fortath, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Fortune of Athena (10248611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 847, C - 08/11/07
-GAME( 2004, frogwld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Frog Wild 2 (0251114, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US112, A - 06/03/04
-GAME( 2005, gambjack, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Gamblin' Jack (20197211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 791, D - 23/09/05
-GAME( 2004, gwnn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Game With No Name! (0452501, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4210, C - 09/13/04
-GAME( 2000, geishaa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Geisha (10000811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/18, B - 03/06/00
-GAME( 2001, goape, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Go Ape (10006211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 661/2, B - 14/06/01
-GAME( 2001, gogreen, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Go For Green (10003411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 647/1, A - 22/02/01
-GAME( 2005, goldarch, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Archer (10197411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 770, A - 07/07/05
-GAME( 2003, gldnflc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Golden Fleece (10158311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 680/2, A-07/07/03
-GAME( 2005, gldgong, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Golden Gong (0152558, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4258, C - 08/18/05
-GAME( 2004, goldinc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Incas (10174011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 752, A - 07/04/04
-GAME( 2005, goldincu, goldinc, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Incas (0252533, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4244, A - 03/10/05
-GAME( 2002, goldpym, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Pyramids Special Edition - Maximillions (10130811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02
-GAME( 2007, goldsam, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Golden Samurai (10247811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 832, A - 31/07/07
-GAME( 2002, gbmoney, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "The Good, The Bad & The Money (0351016, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US023, B - 09/11/02
-GAME( 2006, grizzly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Grizzly (10214711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 780, C - 12/04/06
-GAME( 2003, heartgld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Heart of Gold (20169511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/2, A - 15/09/03
-GAME( 2006, heartveg, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Heart of Vegas (10232911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/4, C - 27/06/06
-GAME( 2004, hlntroy, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Helen of Troy (0151336, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014/21, B - 01/16/04
-GAME( 2001, highnoon, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "High Noon (20004111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 671, B - 28/06/01
-GAME( 2002, holdrma, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Hollywood Dreams (10100511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 670/1, A - 31/01/02
-GAME( 2004, househrt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "House of Hearts (10200311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765, C - 09/11/04
-GAME( 2005, incachf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Inca Chief (20190711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 784, C - 21/10/05
-GAME( 2001, indream, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming (10004211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/6, B - 24/04/01
-GAME( 2002, indremce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Cash Express (20109411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/10, A - 12/07/02
-GAME( 2003, indremll, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Lady Luck (20151911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 742, C - 15/10/03
-GAME( 2003, indrem2c, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming 2nd Chance (10150611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 753, B - 08/12/03
-GAME( 2003, indremmm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Dreaming - Maximillions (10130711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/12, A - 17/01/03
-GAME( 2001, indgldcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Gold - Mr. Cashman (10102511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 674/1, A- 21/11/01
-GAME( 2004, indprncs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Indian Princess (10174111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 764, A - 07/04/04
-GAME( 2002, jailbrk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Jailbreak (10125611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 716, A - 14/11/02
-GAME( 2003, jefffox, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "You Might Be A Redneck If... - Jeff Foxworthy (0351068, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US041, B - 06/13/03
-GAME( 2003, jewelcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Jewel of the Enchantress - Mr. Cashman (0151051, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US039, B- 1/24/03
-GAME( 2005, kingnep, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King Neptune (20189111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 789, E - 08/08/05
-GAME( 2002, kingnile, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King of the Nile (20106321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, C - 27/09/02
-GAME( 2003, kingnilea,kingnile, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King of the Nile (30106331, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, D - 07/01/03
-GAME( 2002, kingpeng, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "King Penguin (40109021, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 696, E- 26/11/02
-GAME( 2000, koalama6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Koala Mint (30001011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 643/6, A- 01/09/00
-GAME( 2003, kohinoor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Kohinoor (10136711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/21, B - 10/02/03
-GAME( 2006, lgfish, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Let's Go Fish'n (10220111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, E - 23/05/06
-GAME( 2004, lemrol, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Let 'em Roll (0151115, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US088, B - 06/24/04
-GAME( 2005, lineking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Line King (0252534, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4245, F - 11/10/05
-GAME( 2002, lordleo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Lord Leopard (30111211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 685, B - 27/05/02
-GAME( 2001, lougcm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Louie's Gold - Mr. Cashman (20006911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 674, C- 13/07/01
-GAME( 200?, lovestrk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Love Stuck (0152583, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4285, (no data)
-GAME( 2007, lucky88, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Lucky 88 (10241411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 840, C - 25/06/07
-GAME( 2007, luigibal, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Luigi's Ball (10235411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 822, D - 19/03/07
-GAME( 2005, magforst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Magic Forest (0151139, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US141, D - 02/01/05
-GAME( 2003, magmerm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Magic Mermaid (0251331, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013/20, F - 10/13/03
-GAME( 2007, metestrm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Meteor Storm (0152162, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US217, A - 03/19/07
-GAME( 2007, milkin, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Milkin' It (10251911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 816, B - 13/08/07
-GAME( 2005, mskitty, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Miss Kitty (10216611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, C - 18/04/05
-GAME( 2000, mnytree, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Money Tree (10001211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 657, E - 06/11/00
-GAME( 2007, moonwalt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Moonlight Waltz (10227611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 814/1, B - 11/01/07
-GAME( 2008, mchilli, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "More Chilli (20248711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 844, B - 21/01/08
-GAME( 200?, mrwoo, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mr Woo (0252599, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4276, (no data)
-GAME( 2002, mystarr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Arrow (0151009, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US005, A - 01/07/02
-GAME( 2001, mysteycm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (10008111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 675, A- 09/05/01
-GAME( 2002, mysteycmu,mysteycm, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (0251024, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US020, C- 31/05/02
-GAME( 2002, mystmerm, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Mystic Mermaid (1J008711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013, D - 27/03/02
-GAME( 2005, nerdwild, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Nerds Gone Wild (10197311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, C - 18/04/05
-GAME( 200?, opsesam, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Open Sesame (0351309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // ???, ???
-GAME( 2006, orbeaut, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Oriental Beauty (10213511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 808, A - 07/02/06
-GAME( 2005, outbackj, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Outback Jack (20195211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 691, J - 02/06/05
-GAME( 2001, owlcap, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Owl Capone (10008711, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 594/9, A - 12/06/01
-GAME( 2004, pandpays, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Panda Pays - Mr. Cashman (0151109, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US092, A - 01/27/04
-GAME( 2001, parislgt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Paris Lights (30002611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 670, A - 03/05/01
-GAME( 2002, parislgtu,parislgt, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Paris Lights - Jackpot Carnival (0251031, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US022, A - 07/03/02
-GAME( 2002, pcockmag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Peacock Magic (1J008811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014, B - 09/05/02
-GAME( 2004, pelipete, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pelican Pete (10177511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, A - 22/11/04
-GAME( 2005, pelipeteu,pelipete, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pelican Pete (0252555, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4251, C - 10/28/05
-GAME( 2005, pennyar, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Penny Arcade (0251169, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US159, A - 04/06/05
-GAME( 2003, pengpyce, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Penguin Pays - Cash Express (0151120, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US055, A- 4/14/03
-GAME( 2000, pharfor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pharaoh's Fortune (40000921, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 656, D - 11/01/00
-GAME( 2005, phxfant, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Phoenix Fantasy (20197511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 793, A - 21/07/05
-GAME( 2000, pirata6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pirates (10001511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 661/1, B - 3/11/00
-GAME( 2004, pcfavor, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Favourites (20177311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0002, D - 04/11/04
-GAME( 2006, pcbydem, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - By Demand (10223111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0005, D - 25/09/06
-GAME( 2006, pcmostw, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Most Wanted (20234911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0010, C - 09/11/06
-GAME( 2010, pcgold, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Gold Edition (30291411, New Zealand)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0047, A - 09/04/10
-GAME( 2009, pcplat, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Platinum (20282111, New Zealand)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0031, B - 04/02/09
-GAME( 2004, pcorig, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's Choice - Original (30143011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG001, C - 12/01/04
-GAME( 200?, pwsuper, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Player's World - Super (0154019, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0016, (no data)
-GAME( 2001, pompeia6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pompeii (10002211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/5, A - 22/01/01
-GAME( 2002, pompeia6u,pompeia6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pompeii (0251010, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US008, A - 04/03/02
-GAME( 2005, prideaf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Pride of Africa (10208511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/9, J - 06/12/05
-GAME( 2004, prophecy, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Prophecy (20173411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 734, B - 10/08/04
-GAME( 2005, qnilea6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile (3J011111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB027, C - 16/02/05
-GAME( 2001, qnilese, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition (10102811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683, A - 06/12/01
-GAME( 2002, qnilejc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition - Jackpot Carnival (20123911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02
-GAME( 2002, qnilejcsp, qnilejc, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition - Jackpot Carnival (20123911, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02
-GAME( 2003, qsheeba, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Queen of Sheba (10133711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, F - 04/03/03
-GAME( 2005, raprichs, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Rapid Riches (10194211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 762, D - 09/03/05
-GAME( 2002, redbara6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Red Baron (10119911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 709, B - 21/11/02
-GAME( 2005, roadtrip, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Road Trip (0152539, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4238, C - 08/18/05
-GAME( 2002, ruprup, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Roll Up! Roll Up!! (10115911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 642/5, A - 22/08/02
-GAME( 2002, rubymag, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Ruby Magic (10125711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698, C - 12/11/02
-GAME( 2010, rumbreel, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Rumble Reels (20288611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 949, B - 04/08/10
-GAME( 2000, scatmag2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Scatter Magic II (10001311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 660, C - 24/08/00
-GAME( 2001, scatmag2sa, scatmag2, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Scatter Magic II (10102711, South Australia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 660, G - 15/05/01
-GAME( 2002, sealdeal, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Seal The Deal - Jackpot Carnival (0251029, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US024, A - 06/20/02
-GAME( 2006, shamnmg, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shaman's Magic (10225911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 818, C - 14/11/06
-GAME( 200?, shamnmgu, shamnmg, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shaman's Magic (0152647, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4318/1, (no data)
-GAME( 2004, shorthng, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Shore Thing (0251088, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US087, B - 1/30/04
-GAME( 2001, smtma6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Show Me The Money (10001911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 657/1, B - 08/01/01
-GAME( 2006, silkrda6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Silk Road (0152537, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4248/4, D - 02/09/06
-GAME( 2002, silgola6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Silver & Gold (20100721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 672/1, G - 08/07/02
-GAME( 2008, skydnca6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sky Dancer (10272711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB091/2, A - 28/08/08
-GAME( 1999, spgcarn, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Spring Carnival (10000311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 642, C - 15/11/99
-GAME( 2003, stardrft, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Drifter (20150811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/2, A - 15/09/03
-GAME( 2004, stardrftu,stardrft, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Drifter (0451341, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4204/1, A - 02/16/04
-GAME( 2001, starqst, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Star Quest (10009511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 659/2, B - 29/10/01
-GAME( 2005, statsymb, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Status Symbols (0251147, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US146, A - 02/10/05
-GAME( 2003, sunmoon, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun & Moon (0151303, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4173, C - 04/01/03
-GAME( 200?, sunmonbb, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun & Moon - Bank Buster (0153028, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4173/2, (no data)
-GAME( 2003, sunqndol, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sun Queen - Dollar Storm (0451327, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV2070/1, B - 11/24/03
-GAME( 2005, sbuk5, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Super Bucks V (20203611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 794, A - 03/08/05
-GAME( 2005, swhr2a6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sweethearts II (0151183, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US169, A - 7/5/05
-GAME( 2002, swh2ld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Sweethearts II - Lucky Devil (10119811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 712, C - 16/10/02
-GAME( 2006, tahitim, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tahiti Magic (10238911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765/2, C - 07/12/06
-GAME( 2002, thaiprnc, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thai Princess (10119321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, A - 17/09/02
-GAME( 2003, thaiprncm,thaiprnc, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thai Princess (30127721, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, E - 21/03/03
-GAME( 2004, thndrhrt, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Thunderheart (10173811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 758, B - 11/05/04
-GAME( 2007, tigress, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tigress (20230111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 807, C - 03/04/07
-GAME( 2007, tikitalk, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tiki Talk (10239111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 831, D - 28/03/07
-GAME( 2001, tiktorch, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Tiki Torch (0151003, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4130/4, A - 08/10/01
-GAME( 200?, timbwolf, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Timber Wolf (0154013, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4333/1, (no data)
-GAME( 2002, topshta6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Top Shot (30123211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 714, C - 16/12/02
-GAME( 2000, torgods, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Torch of the Gods (10000411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/19, B - 09/08/00
-GAME( 2001, toprdice, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Touch of Paradice (20007511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 650/2, A - 24/04/01
-GAME( 200?, trsking, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Treasure King (0152570, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4268, (no data)
-GAME( 2006, turtreas, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Turtle Treasure (10234711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 819/1, A - 06/10/06
-GAME( 2002, venetian, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Venetian Nights (1J008911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/1, D - 05/08/02
-GAME( 2004, venice, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Venice (0151355, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/20, F - 07/06/04
-GAME( 2009, werewild, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Werewolf Wild (10288711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 939, A - 03/12/09
-GAME( 2002, whalecsh, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (20155711, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 695, A - 14/06/02
-GAME( 2003, whalecshu,whalecsh, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (0451311, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4174, A - 03/31/03
-GAME( 2005, whalecshua,whalecsh, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Whales of Cash (0451346, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4214, B - 01/14/05
-GAME( 2004, wheregld, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, B - 26/02/04
-GAME( 2004, wheregldsp,wheregld, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, B - 26/02/04
-GAME( 2004, wheregldm,wheregld, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Where's the Gold (20177111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, C - 17/06/04
-GAME( 2003, whtwater, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "White Water (0151075, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US054, A - 4/11/03
-GAME( 2006, wikwin2, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wicked Winnings II - Power Pay (10214011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 796, A - 28/02/06
-GAME( 2002, wldafr, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Africa - Millioniser (0351083, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4076, D - 5/08/02
-GAME( 2006, wldcata6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Cats (10237511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, B - 20/06/06
-GAME( 2003, wldgoos, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Goose (20131911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 732, B - 02/06/03
-GAME( 2009, wgorilla, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Gorilla - Power Pay (20279811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB108/2, B - 19/06/09
-GAME( 2006, wldpanda, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Panda (20218411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 800, E - 07/08/06
-GAME( 2004, wldpanth, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Panthers - Li'l Lucy (0651310, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4187, D- 01/15/04
-GAME( 2006, wldstall, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Stallion (10230811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 805, B - 12/09/06
-GAME( 2007, wtepee, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Tepee - Power Pay (10230211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 820, H - 20/04/07
-GAME( 2006, wwaratah, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Waratah (10215911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, A - 14/02/06
-GAME( 2006, wwaratahsp, wwaratah, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Waratah (10215911, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, A - 14/02/06
-GAME( 2002, wways, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Ways (10106911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698, B - 19/06/02
-GAME( 2003, wwaysm, wways, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wild Ways (10130111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698/1, A - 25/02/03
-GAME( 2005, wingoly, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wings Over Olympus (0252529, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4237/1, A - 03/07/05
-GAME( 2003, wzwaysll, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Wizard Ways - Lady Luck (20139111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 702, H - 30/06/03
-GAME( 2003, zorroa6, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Zorro (30130611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 743, B - 5/09/03
-GAME( 2005, zorroa6u, aristmk6, aristmk6, aristmk6, driver_device, 0, ROT0, "Aristocrat", "Zorro (0151372, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4212, F - 05/13/05
+GAME( 2004, 5drag, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744, C - 14/01/04
+GAME( 2004, 5dragsp, 5drag, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "5 Dragons (20161011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744, C - 14/01/04
+GAME( 2007, 5dragce, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "5 Dragons - Cash Express (0152309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US211, A - 01/09/07
+GAME( 2007, 5koipp, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "5 Koi - Power Pay (10250711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744/2, C - 25/10/07
+GAME( 2002, 50lions, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "50 Lions (10120511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, A - 11/10/02
+GAME( 2003, 50lionsm, 50lions, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "50 Lions (10156111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717, D - 20/10/03
+GAME( 2012, 50lionrr, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "50 Lions - Roaring Riches (20301311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 1049, B - 20/08/12
+GAME( 2006, 100lions, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "100 Lions (10219211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/4, B - 13/06/06
+GAME( 2005, adonisa6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Adonis (0151178, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US168, A - 05/26/05
+GAME( 2001, adustcm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "African Dusk - Mr. Cashman (20006711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 665/1, B- 13/07/01
+GAME( 2004, afterhrs, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "After Hours (0251071, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US051, B - 01/20/04
+GAME( 2003, alchemy, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Alchemy (1J009611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013/2, A - 30/05/03
+GAME( 2007, atkgld, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "All the King's Gold (0152152, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US209, A - 01/08/07
+GAME( 2001, amzqueen, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Amazon Queen (10005511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 669, A - 02/05/01
+GAME( 2009, amztempl, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Amazon Temple (10299811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 906, A - 29/04/09
+GAME( 2004, antcleo, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10163211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 754, A - 15/01/04
+GAME( 2004, antcleom, antcleo, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Antony and Cleopatra (10177211, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 754, B - 12/07/04
+GAME( 2003, apocof, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Apollo Coffee (0151105, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US083, A - 11/10/03
+GAME( 2001, arabnga6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Arabian Nights (2J008211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB009/1, E - 10/12/01
+GAME( 2004, arabnga6u,arabnga6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Arabian Nights (0151356, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/21, E - 07/06/04
+GAME( 2003, arwincm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Arctic Wins - Mr. Cashman (0151065, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US029, E- 01/27/03
+GAME( 2003, arish, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Arishinko (0151087, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US057, E - 05/28/03
+GAME( 2004, asnprinc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Asian Princess (0352502, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4208, C - 09/13/04
+GAME( 2008, beavbuk, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Beaver Bucks (20255111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 850, C - 23/01/08
+GAME( 2003, bigben, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Big Ben (30126911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 710, B - 17/07/03
+GAME( 1999, bigheart, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Big Hearted (10000511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 637, D - 15/11/99
+GAME( 2002, bigred, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Big Red (2J009211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB015, D - 27/09/02
+GAME( 2005, bigred2, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Big Red 2 (5J011311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB024, B - 18/05/05
+GAME( 2002, blkbrum, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Black Brumby (1J009111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB010, C - 14/06/02
+GAME( 200?, blkmust, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Black Mustang (0152584, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014/21, (no data)
+GAME( 2007, bluetigr, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Blue Tiger (20259511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 855, A - 12/12/07
+GAME( 2007, bobdolly, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Bob and Dolly (0352298, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US243, A - 10/15/07
+GAME( 2005, brazil, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Brazil (20180311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 783, B - 25/02/05
+GAME( 2004, bucaneer, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Buccaneer (10173011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765, A - 05/04/04
+GAME( 2010, buckstop, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "The Buck Stops Here (10294311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 897/1, A - 22/07/10
+GAME( 2006, buffalo, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Buffalo (10217811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 806, E - 06/10/06
+GAME( 200?, buffalou, buffalo, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Buffalo (0252636, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4328, (no data)
+GAME( 2005, bmbugs, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Bumble Bugs (0351180, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US166, A - 05/13/05
+GAME( 2001, bushrngr, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Bushranger (10006111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 673, A - 18/04/01
+GAME( 2007, cactusco, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Cactus Corral (10237711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 818, D - 24/07/07
+GAME( 2007, callwld, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Call of the Wild (10256611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 827, B - 12/11/07
+GAME( 2005, calyking, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Calypso King (20197111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 772/1, B - 25/07/05
+GAME( 2006, canaryrc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Canary Riches (10218211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 809, A - 30/03/06
+GAME( 2005, cmtonig, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Cashman Tonight (30194711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0007, B - 25/05/05
+GAME( 2004, cinhell, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Chance in Hell - Li'l Lucy (0251125, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US119, A - 06/30/04
+GAME( 2002, csd, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Choy Sun Doa (10104011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/04/02
+GAME( 2002, csdsp, csd, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Choy Sun Doa (20104011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/04/02
+GAME( 2003, csdm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Choy Sun Doa (20131511, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 23/01/03
+GAME( 2003, csdce, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Choy Sun Doa - Cash Express (30149511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 688, A - 03/02/03
+GAME( 2006, csret, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Choy Sun Returns (20212211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 744/2, B - 15/08/06
+GAME( 2005, corrida, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Corrida de Toros (30178311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 771, D - 22/03/05
+GAME( 2003, cryspri, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Crystal Springs (10144411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03
+GAME( 2003, crysprim, cryspri, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Crystal Springs (10155811, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 740, A - 28/05/03
+GAME( 2006, cryspriu, cryspri, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Crystal Springs (0352557, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4255, C - 01/16/06
+GAME( 2009, deepfrz, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Deep Freeze (10282311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB113/2, A - 27/02/09
+GAME( 2009, deepfrzu, deepfrz, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Deep Freeze (0154081, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB113/4, A - 27/07/09
+GAME( 2005, deltabel, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Delta Belle (0252532, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4243, B - 04/29/05
+GAME( 2004, deltaqn, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Delta Queen (20185211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 768, A - 13/09/04
+GAME( 2004, dimeye, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Diamond Eyes (0251312, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB012/20, J - 01/22/04
+GAME( 2004, dimeyece, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Diamond Eyes - Cash Express (0152039, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB012/20, J - 01/22/04
+GAME( 2002, di4ever, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Diamonds Forever (10105011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 679, B - 14/03/02
+GAME( 2003, dinosa6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Dinosaur (10118811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 731, C - 08/08/03
+GAME( 2005, dblagent, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Double Agent (0152082, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US180, A - 12/09/05
+GAME( 2000, dbldolph, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Double Dolphins (20000211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 647, C - 18/04/00
+GAME( 2004, drgnlord, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Dragon Lord (10173511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 761, A - 22/06/04
+GAME( 2006, drgnmgic, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Dragon Magic (2J015711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB051, E - 05/07/06
+GAME( 2003, drmcatch, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Dream Catcher (10126721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 704, F - 23/06/03
+GAME( 2008, drmred, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Dream of the Red Chamber (10273811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB027/2, A - 25/8/08
+GAME( 2004, eaglrock, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Eagle Rock - Cash Express (0151126, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US021, C - 05/25/04
+GAME( 2010, estrike, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Eagle Strike (40289711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 950, A - 20/07/10
+GAME( 2004, eastland, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Easter Island - Cash Express (0151117, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US052, B - 02/22/04
+GAME( 2005, eggsrccm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Eggstreme Riches - Mr. Cashman (0351149, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US144, B - 11/3/05
+GAME( 200?, efce, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Enchanted Forest - Cash Express (0151084, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // ???, ???
+GAME( 2007, encspell, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Enchanted Spell (10257011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB041, B - 18/07/07
+GAME( 2000, enchantr, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Enchantress (20000711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 633, C- 15/01/00
+GAME( 2000, eott, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Eyes of the Tiger (10002011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 658, B - 01/06/00
+GAME( 2004, firednc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Fire Dancer (20184911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 772, A - 01/10/04
+GAME( 2002, flamoljc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Flame of Olympus - Jackpot Carnival (0251048, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4091/3, A - 2/18/02
+GAME( 2002, flamolce, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Flame of Olympus - Cash Express (0351025, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4091/3, A - 2/18/02
+GAME( 2000, followst, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Follow the Stars (20001411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 659, D - 15/09/00
+GAME( 2007, fortath, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Fortune of Athena (10248611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 847, C - 08/11/07
+GAME( 2004, frogwld, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Frog Wild 2 (0251114, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US112, A - 06/03/04
+GAME( 2005, gambjack, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Gamblin' Jack (20197211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 791, D - 23/09/05
+GAME( 2004, gwnn, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "The Game With No Name! (0452501, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4210, C - 09/13/04
+GAME( 2000, geishaa6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Geisha (10000811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/18, B - 03/06/00
+GAME( 2001, goape, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Go Ape (10006211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 661/2, B - 14/06/01
+GAME( 2001, gogreen, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Go For Green (10003411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 647/1, A - 22/02/01
+GAME( 2005, goldarch, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Golden Archer (10197411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 770, A - 07/07/05
+GAME( 2003, gldnflc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "The Golden Fleece (10158311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 680/2, A-07/07/03
+GAME( 2005, gldgong, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "The Golden Gong (0152558, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4258, C - 08/18/05
+GAME( 2004, goldinc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Golden Incas (10174011, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 752, A - 07/04/04
+GAME( 2005, goldincu, goldinc, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Golden Incas (0252533, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4244, A - 03/10/05
+GAME( 2002, goldpym, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Golden Pyramids Special Edition - Maximillions (10130811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02
+GAME( 2007, goldsam, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Golden Samurai (10247811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 832, A - 31/07/07
+GAME( 2002, gbmoney, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "The Good, The Bad & The Money (0351016, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US023, B - 09/11/02
+GAME( 2006, grizzly, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Grizzly (10214711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 780, C - 12/04/06
+GAME( 2003, heartgld, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Heart of Gold (20169511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/2, A - 15/09/03
+GAME( 2006, heartveg, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Heart of Vegas (10232911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/4, C - 27/06/06
+GAME( 2004, hlntroy, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Helen of Troy (0151336, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014/21, B - 01/16/04
+GAME( 2001, highnoon, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "High Noon (20004111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 671, B - 28/06/01
+GAME( 2002, holdrma, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Hollywood Dreams (10100511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 670/1, A - 31/01/02
+GAME( 2004, househrt, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "House of Hearts (10200311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765, C - 09/11/04
+GAME( 2005, incachf, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Inca Chief (20190711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 784, C - 21/10/05
+GAME( 2001, indream, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Dreaming (10004211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/6, B - 24/04/01
+GAME( 2002, indremce, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Dreaming - Cash Express (20109411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/10, A - 12/07/02
+GAME( 2003, indremll, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Dreaming - Lady Luck (20151911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 742, C - 15/10/03
+GAME( 2003, indrem2c, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Dreaming 2nd Chance (10150611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 753, B - 08/12/03
+GAME( 2003, indremmm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Dreaming - Maximillions (10130711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/12, A - 17/01/03
+GAME( 2001, indgldcm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Gold - Mr. Cashman (10102511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 674/1, A- 21/11/01
+GAME( 2004, indprncs, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Indian Princess (10174111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 764, A - 07/04/04
+GAME( 2002, jailbrk, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Jailbreak (10125611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 716, A - 14/11/02
+GAME( 2003, jefffox, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "You Might Be A Redneck If... - Jeff Foxworthy (0351068, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US041, B - 06/13/03
+GAME( 2003, jewelcm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Jewel of the Enchantress - Mr. Cashman (0151051, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US039, B- 1/24/03
+GAME( 2005, kingnep, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "King Neptune (20189111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 789, E - 08/08/05
+GAME( 2002, kingnile, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "King of the Nile (20106321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, C - 27/09/02
+GAME( 2003, kingnilea,kingnile, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "King of the Nile (30106331, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, D - 07/01/03
+GAME( 2002, kingpeng, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "King Penguin (40109021, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 696, E- 26/11/02
+GAME( 2000, koalama6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Koala Mint (30001011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 643/6, A- 01/09/00
+GAME( 2003, kohinoor, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Kohinoor (10136711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/21, B - 10/02/03
+GAME( 2006, lgfish, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Let's Go Fish'n (10220111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, E - 23/05/06
+GAME( 2004, lemrol, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Let 'em Roll (0151115, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US088, B - 06/24/04
+GAME( 2005, lineking, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Line King (0252534, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4245, F - 11/10/05
+GAME( 2002, lordleo, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Lord Leopard (30111211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 685, B - 27/05/02
+GAME( 2001, lougcm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Louie's Gold - Mr. Cashman (20006911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 674, C- 13/07/01
+GAME( 200?, lovestrk, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Love Stuck (0152583, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4285, (no data)
+GAME( 2007, lucky88, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Lucky 88 (10241411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 840, C - 25/06/07
+GAME( 2007, luigibal, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Luigi's Ball (10235411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 822, D - 19/03/07
+GAME( 2005, magforst, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Magic Forest (0151139, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US141, D - 02/01/05
+GAME( 2003, magmerm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Magic Mermaid (0251331, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013/20, F - 10/13/03
+GAME( 2007, metestrm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Meteor Storm (0152162, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US217, A - 03/19/07
+GAME( 2007, milkin, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Milkin' It (10251911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 816, B - 13/08/07
+GAME( 2005, mskitty, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Miss Kitty (10216611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, C - 18/04/05
+GAME( 2000, mnytree, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Money Tree (10001211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 657, E - 06/11/00
+GAME( 2007, moonwalt, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Moonlight Waltz (10227611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 814/1, B - 11/01/07
+GAME( 2008, mchilli, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "More Chilli (20248711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 844, B - 21/01/08
+GAME( 200?, mrwoo, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Mr Woo (0252599, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4276, (no data)
+GAME( 2002, mystarr, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Mystic Arrow (0151009, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US005, A - 01/07/02
+GAME( 2001, mysteycm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (10008111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 675, A- 09/05/01
+GAME( 2002, mysteycmu,mysteycm, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Mystic Eyes - Mr. Cashman (0251024, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US020, C- 31/05/02
+GAME( 2002, mystmerm, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Mystic Mermaid (1J008711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB013, D - 27/03/02
+GAME( 2005, nerdwild, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Nerds Gone Wild (10197311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, C - 18/04/05
+GAME( 200?, opsesam, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Open Sesame (0351309, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // ???, ???
+GAME( 2006, orbeaut, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Oriental Beauty (10213511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 808, A - 07/02/06
+GAME( 2005, outbackj, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Outback Jack (20195211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 691, J - 02/06/05
+GAME( 2001, owlcap, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Owl Capone (10008711, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 594/9, A - 12/06/01
+GAME( 2004, pandpays, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Panda Pays - Mr. Cashman (0151109, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US092, A - 01/27/04
+GAME( 2001, parislgt, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Paris Lights (30002611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 670, A - 03/05/01
+GAME( 2002, parislgtu,parislgt, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Paris Lights - Jackpot Carnival (0251031, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US022, A - 07/03/02
+GAME( 2002, pcockmag, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Peacock Magic (1J008811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB014, B - 09/05/02
+GAME( 2004, pelipete, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pelican Pete (10177511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 778, A - 22/11/04
+GAME( 2005, pelipeteu,pelipete, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pelican Pete (0252555, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4251, C - 10/28/05
+GAME( 2005, pennyar, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Penny Arcade (0251169, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US159, A - 04/06/05
+GAME( 2003, pengpyce, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Penguin Pays - Cash Express (0151120, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US055, A- 4/14/03
+GAME( 2000, pharfor, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pharaoh's Fortune (40000921, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 656, D - 11/01/00
+GAME( 2005, phxfant, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Phoenix Fantasy (20197511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 793, A - 21/07/05
+GAME( 2000, pirata6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pirates (10001511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 661/1, B - 3/11/00
+GAME( 2004, pcfavor, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's Choice - Favourites (20177311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0002, D - 04/11/04
+GAME( 2006, pcbydem, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's Choice - By Demand (10223111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0005, D - 25/09/06
+GAME( 2006, pcmostw, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's Choice - Most Wanted (20234911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0010, C - 09/11/06
+GAME( 2010, pcgold, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's Choice - Gold Edition (30291411, New Zealand)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0047, A - 09/04/10
+GAME( 2009, pcplat, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's Choice - Platinum (20282111, New Zealand)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0031, B - 04/02/09
+GAME( 2004, pcorig, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's Choice - Original (30143011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG001, C - 12/01/04
+GAME( 200?, pwsuper, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Player's World - Super (0154019, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MG0016, (no data)
+GAME( 2001, pompeia6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pompeii (10002211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/5, A - 22/01/01
+GAME( 2002, pompeia6u,pompeia6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pompeii (0251010, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US008, A - 04/03/02
+GAME( 2005, prideaf, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Pride of Africa (10208511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 628/9, J - 06/12/05
+GAME( 2004, prophecy, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Prophecy (20173411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 734, B - 10/08/04
+GAME( 2005, qnilea6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Queen of the Nile (3J011111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB027, C - 16/02/05
+GAME( 2001, qnilese, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition (10102811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683, A - 06/12/01
+GAME( 2002, qnilejc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition - Jackpot Carnival (20123911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02
+GAME( 2002, qnilejcsp, qnilejc, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Queen of the Nile Special Edition - Jackpot Carnival (20123911, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 683/1, A - 21/10/02
+GAME( 2003, qsheeba, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Queen of Sheba (10133711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 687, F - 04/03/03
+GAME( 2005, raprichs, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Rapid Riches (10194211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 762, D - 09/03/05
+GAME( 2002, redbara6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Red Baron (10119911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 709, B - 21/11/02
+GAME( 2005, roadtrip, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Road Trip (0152539, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4238, C - 08/18/05
+GAME( 2002, ruprup, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Roll Up! Roll Up!! (10115911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 642/5, A - 22/08/02
+GAME( 2002, rubymag, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Ruby Magic (10125711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698, C - 12/11/02
+GAME( 2010, rumbreel, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Rumble Reels (20288611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 949, B - 04/08/10
+GAME( 2000, scatmag2, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Scatter Magic II (10001311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 660, C - 24/08/00
+GAME( 2001, scatmag2sa, scatmag2, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Scatter Magic II (10102711, South Australia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 660, G - 15/05/01
+GAME( 2002, sealdeal, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Seal The Deal - Jackpot Carnival (0251029, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US024, A - 06/20/02
+GAME( 2006, shamnmg, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Shaman's Magic (10225911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 818, C - 14/11/06
+GAME( 200?, shamnmgu, shamnmg, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Shaman's Magic (0152647, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4318/1, (no data)
+GAME( 2004, shorthng, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Shore Thing (0251088, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US087, B - 1/30/04
+GAME( 2001, smtma6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Show Me The Money (10001911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 657/1, B - 08/01/01
+GAME( 2006, silkrda6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Silk Road (0152537, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4248/4, D - 02/09/06
+GAME( 2002, silgola6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Silver & Gold (20100721, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 672/1, G - 08/07/02
+GAME( 2008, skydnca6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Sky Dancer (10272711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB091/2, A - 28/08/08
+GAME( 1999, spgcarn, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Spring Carnival (10000311, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 642, C - 15/11/99
+GAME( 2003, stardrft, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Star Drifter (20150811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 717/2, A - 15/09/03
+GAME( 2004, stardrftu,stardrft, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Star Drifter (0451341, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4204/1, A - 02/16/04
+GAME( 2001, starqst, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Star Quest (10009511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 659/2, B - 29/10/01
+GAME( 2005, statsymb, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Status Symbols (0251147, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US146, A - 02/10/05
+GAME( 2003, sunmoon, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Sun & Moon (0151303, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4173, C - 04/01/03
+GAME( 200?, sunmonbb, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Sun & Moon - Bank Buster (0153028, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4173/2, (no data)
+GAME( 2003, sunqndol, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Sun Queen - Dollar Storm (0451327, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV2070/1, B - 11/24/03
+GAME( 2005, sbuk5, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Super Bucks V (20203611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 794, A - 03/08/05
+GAME( 2005, swhr2a6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Sweethearts II (0151183, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US169, A - 7/5/05
+GAME( 2002, swh2ld, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Sweethearts II - Lucky Devil (10119811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 712, C - 16/10/02
+GAME( 2006, tahitim, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Tahiti Magic (10238911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 765/2, C - 07/12/06
+GAME( 2002, thaiprnc, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Thai Princess (10119321, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, A - 17/09/02
+GAME( 2003, thaiprncm,thaiprnc, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Thai Princess (30127721, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 707, E - 21/03/03
+GAME( 2004, thndrhrt, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Thunderheart (10173811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 758, B - 11/05/04
+GAME( 2007, tigress, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Tigress (20230111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 807, C - 03/04/07
+GAME( 2007, tikitalk, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Tiki Talk (10239111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 831, D - 28/03/07
+GAME( 2001, tiktorch, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Tiki Torch (0151003, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4130/4, A - 08/10/01
+GAME( 200?, timbwolf, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Timber Wolf (0154013, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4333/1, (no data)
+GAME( 2002, topshta6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Top Shot (30123211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 714, C - 16/12/02
+GAME( 2000, torgods, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Torch of the Gods (10000411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 602/19, B - 09/08/00
+GAME( 2001, toprdice, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Touch of Paradice (20007511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 650/2, A - 24/04/01
+GAME( 200?, trsking, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Treasure King (0152570, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4268, (no data)
+GAME( 2006, turtreas, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Turtle Treasure (10234711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 819/1, A - 06/10/06
+GAME( 2002, venetian, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Venetian Nights (1J008911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/1, D - 05/08/02
+GAME( 2004, venice, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Venice (0151355, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB016/20, F - 07/06/04
+GAME( 2009, werewild, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Werewolf Wild (10288711, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 939, A - 03/12/09
+GAME( 2002, whalecsh, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Whales of Cash (20155711, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 695, A - 14/06/02
+GAME( 2003, whalecshu,whalecsh, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Whales of Cash (0451311, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4174, A - 03/31/03
+GAME( 2005, whalecshua,whalecsh, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Whales of Cash (0451346, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4214, B - 01/14/05
+GAME( 2004, wheregld, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, B - 26/02/04
+GAME( 2004, wheregldsp,wheregld, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Where's The Gold (10124811, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, B - 26/02/04
+GAME( 2004, wheregldm,wheregld, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Where's the Gold (20177111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 756, C - 17/06/04
+GAME( 2003, whtwater, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "White Water (0151075, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // US054, A - 4/11/03
+GAME( 2006, wikwin2, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wicked Winnings II - Power Pay (10214011, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 796, A - 28/02/06
+GAME( 2002, wldafr, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Africa - Millioniser (0351083, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4076, D - 5/08/02
+GAME( 2006, wldcata6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Cats (10237511, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, B - 20/06/06
+GAME( 2003, wldgoos, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Goose (20131911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 732, B - 02/06/03
+GAME( 2009, wgorilla, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Gorilla - Power Pay (20279811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // JB108/2, B - 19/06/09
+GAME( 2006, wldpanda, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Panda (20218411, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 800, E - 07/08/06
+GAME( 2004, wldpanth, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Panthers - Li'l Lucy (0651310, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4187, D- 01/15/04
+GAME( 2006, wldstall, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Stallion (10230811, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 805, B - 12/09/06
+GAME( 2007, wtepee, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Tepee - Power Pay (10230211, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 820, H - 20/04/07
+GAME( 2006, wwaratah, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Waratah (10215911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, A - 14/02/06
+GAME( 2006, wwaratahsp, wwaratah, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Waratah (10215911, NSW/ACT, Show Program)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 811, A - 14/02/06
+GAME( 2002, wways, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Ways (10106911, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698, B - 19/06/02
+GAME( 2003, wwaysm, wways, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wild Ways (10130111, Malaysia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 698/1, A - 25/02/03
+GAME( 2005, wingoly, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wings Over Olympus (0252529, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4237/1, A - 03/07/05
+GAME( 2003, wzwaysll, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Wizard Ways - Lady Luck (20139111, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 702, H - 30/06/03
+GAME( 2003, zorroa6, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Zorro (30130611, NSW/ACT)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 743, B - 5/09/03
+GAME( 2005, zorroa6u, aristmk6, aristmk6, aristmk6, aristmk6_state, 0, ROT0, "Aristocrat", "Zorro (0151372, US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // MV4212, F - 05/13/05
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index ad06d8bea83..408e038bb8c 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -1335,7 +1335,7 @@ Pixel clock: 3 MHz = 192 HTotal, assuming it's 6 MHz
#define ARKANOID_VBEND 16
#define ARKANOID_VBSTART 240
-static MACHINE_CONFIG_START( arkanoid, arkanoid_state )
+static MACHINE_CONFIG_START( arkanoid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
@@ -1390,7 +1390,7 @@ static MACHINE_CONFIG_DERIVED( bootleg, arkanoid )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hexa, arkanoid_state )
+static MACHINE_CONFIG_START( hexa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Imported from arkanoid - correct? */
@@ -1431,7 +1431,7 @@ static MACHINE_CONFIG_DERIVED( hexaa, hexa )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( brixian, arkanoid_state )
+static MACHINE_CONFIG_START( brixian )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
@@ -2192,34 +2192,34 @@ DRIVER_INIT_MEMBER(arkanoid_state,brixian)
/* Game Drivers */
// original sets of Arkanoid
-// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1986, arkanoid, 0, arkanoid, arkanoid, driver_device, 0, ROT90, "Taito Corporation Japan", "Arkanoid (World, older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkanoidu, arkanoid, arkanoid, arkanoid, driver_device, 0, ROT90, "Taito America Corporation (Romstar license)", "Arkanoid (US, newer)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkanoiduo, arkanoid, arkanoid, arkanoid, driver_device, 0, ROT90, "Taito America Corporation (Romstar license)", "Arkanoid (US, older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkanoidj, arkanoid, arkanoid, arkanoidj, driver_device, 0, ROT90, "Taito Corporation", "Arkanoid (Japan, newer)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkanoidja, arkanoid, arkanoid, arkanoidj, driver_device, 0, ROT90, "Taito Corporation", "Arkanoid (Japan, newer w/level select)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkanoidjb, arkanoid, arkanoid, arkanoidj, driver_device, 0, ROT90, "Taito Corporation", "Arkanoid (Japan, older)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY, FULLNAME, FLAGS
+GAME( 1986, arkanoid, 0, arkanoid, arkanoid, arkanoid_state, 0, ROT90, "Taito Corporation Japan", "Arkanoid (World, older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoidu, arkanoid, arkanoid, arkanoid, arkanoid_state, 0, ROT90, "Taito America Corporation (Romstar license)", "Arkanoid (US, newer)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoiduo, arkanoid, arkanoid, arkanoid, arkanoid_state, 0, ROT90, "Taito America Corporation (Romstar license)", "Arkanoid (US, older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoidj, arkanoid, arkanoid, arkanoidj, arkanoid_state, 0, ROT90, "Taito Corporation", "Arkanoid (Japan, newer)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoidja, arkanoid, arkanoid, arkanoidj, arkanoid_state, 0, ROT90, "Taito Corporation", "Arkanoid (Japan, newer w/level select)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoidjb, arkanoid, arkanoid, arkanoidj, arkanoid_state, 0, ROT90, "Taito Corporation", "Arkanoid (Japan, older)", MACHINE_SUPPORTS_SAVE )
// bootlegs of Arkanoid
-GAME( 1986, arkanoidjbl, arkanoid, p3mcu, arkanoidj, driver_device, 0, ROT90, "bootleg", "Arkanoid (bootleg with MCU, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkanoidjbl2,arkanoid, p3mcu, arkanoidj, driver_device, 0, ROT90, "bootleg (Beta)", "Arkanoid (bootleg with MCU, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ark1ball, arkanoid, p3mcu, ark1ball, driver_device, 0, ROT90, "bootleg", "Arkanoid (bootleg with MCU, harder)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkangc, arkanoid, bootleg, arkangc, arkanoid_state, arkangc, ROT90, "bootleg (Game Corporation)", "Arkanoid (Game Corporation bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkangc2, arkanoid, bootleg, arkangc2, arkanoid_state, arkangc2, ROT90, "bootleg (Game Corporation)", "Arkanoid (Game Corporation bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkblock, arkanoid, bootleg, arkangc, arkanoid_state, arkblock, ROT90, "bootleg (Game Corporation)", "Block (Game Corporation bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkbloc2, arkanoid, bootleg, arkangc, arkanoid_state, arkbloc2, ROT90, "bootleg (Game Corporation)", "Block (Game Corporation bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkbloc3, arkanoid, bootleg, block2, arkanoid_state, block2, ROT90, "bootleg (Game Corporation)", "Block (Game Corporation bootleg, set 3)", MACHINE_SUPPORTS_SAVE ) // Both these sets (arkblock3, block2) have an extra unknown rom
-GAME( 1986, block2, arkanoid, bootleg, block2, arkanoid_state, block2, ROT90, "bootleg (S.P.A. Co.)", "Block 2 (S.P.A. Co. bootleg)", MACHINE_SUPPORTS_SAVE ) // and scrambled gfx roms with 'space invader' themed gfx
-GAME( 1986, arkgcbl, arkanoid, bootleg, arkgcbl, arkanoid_state, arkgcbl, ROT90, "bootleg", "Arkanoid (bootleg on Block hardware, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkgcbla, arkanoid, bootleg, arkgcbl, arkanoid_state, arkgcbl, ROT90, "bootleg", "Arkanoid (bootleg on Block hardware, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, paddle2, arkanoid, bootleg, paddle2, arkanoid_state, paddle2, ROT90, "bootleg", "Paddle 2 (bootleg on Block hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arkatayt, arkanoid, bootleg, arkatayt, driver_device, 0, ROT90, "bootleg (Tayto)", "Arkanoid (Tayto bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, arktayt2, arkanoid, bootleg, arktayt2, driver_device, 0, ROT90, "bootleg (Tayto)", "Arkanoid (Tayto bootleg, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoidjbl, arkanoid, p3mcu, arkanoidj, arkanoid_state, 0, ROT90, "bootleg", "Arkanoid (bootleg with MCU, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkanoidjbl2,arkanoid, p3mcu, arkanoidj, arkanoid_state, 0, ROT90, "bootleg (Beta)", "Arkanoid (bootleg with MCU, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ark1ball, arkanoid, p3mcu, ark1ball, arkanoid_state, 0, ROT90, "bootleg", "Arkanoid (bootleg with MCU, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkangc, arkanoid, bootleg, arkangc, arkanoid_state, arkangc, ROT90, "bootleg (Game Corporation)", "Arkanoid (Game Corporation bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkangc2, arkanoid, bootleg, arkangc2, arkanoid_state, arkangc2, ROT90, "bootleg (Game Corporation)", "Arkanoid (Game Corporation bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkblock, arkanoid, bootleg, arkangc, arkanoid_state, arkblock, ROT90, "bootleg (Game Corporation)", "Block (Game Corporation bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkbloc2, arkanoid, bootleg, arkangc, arkanoid_state, arkbloc2, ROT90, "bootleg (Game Corporation)", "Block (Game Corporation bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkbloc3, arkanoid, bootleg, block2, arkanoid_state, block2, ROT90, "bootleg (Game Corporation)", "Block (Game Corporation bootleg, set 3)", MACHINE_SUPPORTS_SAVE ) // Both these sets (arkblock3, block2) have an extra unknown rom
+GAME( 1986, block2, arkanoid, bootleg, block2, arkanoid_state, block2, ROT90, "bootleg (S.P.A. Co.)", "Block 2 (S.P.A. Co. bootleg)", MACHINE_SUPPORTS_SAVE ) // and scrambled gfx roms with 'space invader' themed gfx
+GAME( 1986, arkgcbl, arkanoid, bootleg, arkgcbl, arkanoid_state, arkgcbl, ROT90, "bootleg", "Arkanoid (bootleg on Block hardware, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkgcbla, arkanoid, bootleg, arkgcbl, arkanoid_state, arkgcbl, ROT90, "bootleg", "Arkanoid (bootleg on Block hardware, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, paddle2, arkanoid, bootleg, paddle2, arkanoid_state, paddle2, ROT90, "bootleg", "Paddle 2 (bootleg on Block hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arkatayt, arkanoid, bootleg, arkatayt, arkanoid_state, 0, ROT90, "bootleg (Tayto)", "Arkanoid (Tayto bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, arktayt2, arkanoid, bootleg, arktayt2, arkanoid_state, 0, ROT90, "bootleg (Tayto)", "Arkanoid (Tayto bootleg, harder)", MACHINE_SUPPORTS_SAVE )
// Other games
-GAME( 1987, arkatour, 0, arkanoid, arkanoid, driver_device, 0, ROT90, "Taito America Corporation (Romstar license)", "Tournament Arkanoid (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, arkatour, 0, arkanoid, arkanoid, arkanoid_state, 0, ROT90, "Taito America Corporation (Romstar license)", "Tournament Arkanoid (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 19??, tetrsark, 0, bootleg, tetrsark, arkanoid_state, tetrsark, ROT0, "D.R. Korea", "Tetris (D.R. Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 19??, tetrsark, 0, bootleg, tetrsark, arkanoid_state, tetrsark, ROT0, "D.R. Korea", "Tetris (D.R. Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, hexa, 0, hexa, hexa, arkanoid_state, hexa, ROT0, "D.R. Korea", "Hexa", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, hexaa, hexa, hexaa, hexa, arkanoid_state, hexaa, ROT0, "D.R. Korea", "Hexa (with 2xZ80, protected)", MACHINE_NOT_WORKING )
+GAME( 199?, hexa, 0, hexa, hexa, arkanoid_state, hexa, ROT0, "D.R. Korea", "Hexa", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 199?, hexaa, hexa, hexaa, hexa, arkanoid_state, hexaa, ROT0, "D.R. Korea", "Hexa (with 2xZ80, protected)", MACHINE_NOT_WORKING )
-GAME( 1993, brixian, 0, brixian, brixian, arkanoid_state, brixian, ROT0, "Cheil Computer System", "Brixian", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, brixian, 0, brixian, brixian, arkanoid_state, brixian, ROT0, "Cheil Computer System", "Brixian", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index c749e239d40..4b98a37cd28 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -1257,7 +1257,7 @@ static MACHINE_CONFIG_FRAGMENT( terraf_sound )
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( terraf, armedf_state )
+static MACHINE_CONFIG_START( terraf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz?
@@ -1292,7 +1292,7 @@ static MACHINE_CONFIG_START( terraf, armedf_state )
MCFG_FRAGMENT_ADD(terraf_sound)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( terrafjb, armedf_state )
+static MACHINE_CONFIG_START( terrafjb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
@@ -1348,7 +1348,7 @@ static MACHINE_CONFIG_DERIVED( terrafb, terraf )
MCFG_DEVICE_REMOVE("nb1414m4")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kozure, armedf_state )
+static MACHINE_CONFIG_START( kozure )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
@@ -1382,7 +1382,7 @@ static MACHINE_CONFIG_START( kozure, armedf_state )
MCFG_FRAGMENT_ADD(terraf_sound)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( armedf, armedf_state )
+static MACHINE_CONFIG_START( armedf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
@@ -1430,7 +1430,7 @@ static MACHINE_CONFIG_START( armedf, armedf_state )
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cclimbr2, armedf_state )
+static MACHINE_CONFIG_START( cclimbr2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
@@ -1480,7 +1480,7 @@ static MACHINE_CONFIG_START( cclimbr2, armedf_state )
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( legion, armedf_state )
+static MACHINE_CONFIG_START( legion )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
@@ -1530,7 +1530,7 @@ static MACHINE_CONFIG_START( legion, armedf_state )
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( legionjb, armedf_state )
+static MACHINE_CONFIG_START( legionjb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
@@ -1578,7 +1578,7 @@ static MACHINE_CONFIG_START( legionjb, armedf_state )
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bigfghtr, bigfghtr_state )
+static MACHINE_CONFIG_START( bigfghtr )
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // verified
MCFG_CPU_PROGRAM_MAP(bigfghtr_map)
@@ -2247,5 +2247,5 @@ GAME( 1988, cclimbr2a,cclimbr2, cclimbr2, cclimbr2, armedf_state, cclimbr2, RO
GAME( 1988, armedf, 0, armedf, armedf, armedf_state, armedf, ROT270, "Nichibutsu", "Armed Formation", MACHINE_SUPPORTS_SAVE )
GAME( 1988, armedff, armedf, armedf, armedf, armedf_state, armedf, ROT270, "Nichibutsu (Fillmore license)", "Armed Formation (Fillmore license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, skyrobo, 0, bigfghtr, bigfghtr, armedf_state, armedf, ROT0, "Nichibutsu", "Sky Robo", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bigfghtr, skyrobo, bigfghtr, bigfghtr, armedf_state, armedf, ROT0, "Nichibutsu", "Tatakae! Big Fighter (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, skyrobo, 0, bigfghtr, bigfghtr, bigfghtr_state, armedf, ROT0, "Nichibutsu", "Sky Robo", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bigfghtr, skyrobo, bigfghtr, bigfghtr, bigfghtr_state, armedf, ROT0, "Nichibutsu", "Tatakae! Big Fighter (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp
index 1462b3a770e..86b05f5e895 100644
--- a/src/mame/drivers/arsystems.cpp
+++ b/src/mame/drivers/arsystems.cpp
@@ -288,7 +288,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( arcadia, arcadia_amiga_state )
+static MACHINE_CONFIG_START( arcadia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
@@ -975,43 +975,43 @@ DRIVER_INIT_MEMBER(arcadia_amiga_state,argh) { DRIVER_INIT_CALL(arcadia); generi
*************************************/
/* BIOS */
-GAME( 1988, ar_bios, 0, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Arcadia System BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 1988, ar_bios, 0, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Arcadia System BIOS", MACHINE_IS_BIOS_ROOT )
-GAME( 1988, ar_blast, ar_bios, arcadia, arcadia, arcadia_amiga_state, blast, ROT0, "Arcadia Systems", "Blastaball (Arcadia, V 2.1)", 0 )
+GAME( 1988, ar_blast, ar_bios, arcadia, arcadia, arcadia_amiga_state, blast, ROT0, "Arcadia Systems", "Blastaball (Arcadia, V 2.1)", 0 )
-GAME( 1988, ar_airh, ar_bios, arcadia, arcadia, arcadia_amiga_state, airh, ROT0, "Arcadia Systems", "SportTime Table Hockey (Arcadia, set 1, V 2.1)", 0 )
-GAME( 1988, ar_airh2, ar_airh, arcadia, arcadia, arcadia_amiga_state, airh, ROT0, "Arcadia Systems", "SportTime Table Hockey (Arcadia, set 2)", 0 )
+GAME( 1988, ar_airh, ar_bios, arcadia, arcadia, arcadia_amiga_state, airh, ROT0, "Arcadia Systems", "SportTime Table Hockey (Arcadia, set 1, V 2.1)", 0 )
+GAME( 1988, ar_airh2, ar_airh, arcadia, arcadia, arcadia_amiga_state, airh, ROT0, "Arcadia Systems", "SportTime Table Hockey (Arcadia, set 2)", 0 )
-GAME( 1988, ar_bowl, ar_bios, arcadia, arcadia, arcadia_amiga_state, bowl, ROT0, "Arcadia Systems", "SportTime Bowling (Arcadia, V 2.1)", 0 )
+GAME( 1988, ar_bowl, ar_bios, arcadia, arcadia, arcadia_amiga_state, bowl, ROT0, "Arcadia Systems", "SportTime Bowling (Arcadia, V 2.1)", 0 )
-GAME( 1987, ar_dart, ar_bios, arcadia, arcadia, arcadia_amiga_state, dart, ROT0, "Arcadia Systems", "World Darts (Arcadia, set 1, V 2.1)", 0 )
-GAME( 1987, ar_dart2, ar_dart, arcadia, arcadia, arcadia_amiga_state, dart, ROT0, "Arcadia Systems", "World Darts (Arcadia, set 2)", MACHINE_NOT_WORKING ) // bad dump
+GAME( 1987, ar_dart, ar_bios, arcadia, arcadia, arcadia_amiga_state, dart, ROT0, "Arcadia Systems", "World Darts (Arcadia, set 1, V 2.1)", 0 )
+GAME( 1987, ar_dart2, ar_dart, arcadia, arcadia, arcadia_amiga_state, dart, ROT0, "Arcadia Systems", "World Darts (Arcadia, set 2)", MACHINE_NOT_WORKING ) // bad dump
GAME( 1988, ar_fast, ar_bios, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Magic Johnson's Fast Break (Arcadia, V 2.8)", 0 )
GAME( 1988, ar_fasta, ar_fast, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Magic Johnson's Fast Break (Arcadia, V 2.7)", 0 )
-GAME( 1988, ar_ldrb, ar_bios, arcadia, arcadia, arcadia_amiga_state, ldrb, ROT0, "Arcadia Systems", "Leader Board (Arcadia, set 1, V 2.5)", 0 )
+GAME( 1988, ar_ldrb, ar_bios, arcadia, arcadia, arcadia_amiga_state, ldrb, ROT0, "Arcadia Systems", "Leader Board (Arcadia, set 1, V 2.5)", 0 )
GAME( 1988, ar_ldrba, ar_ldrb, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Leader Board (Arcadia, set 2, V 2.4)", 0 )
GAME( 1988, ar_ldrbb, ar_ldrb, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Leader Board (Arcadia, set 3)", 0 )
-GAME( 1987, ar_ninj, ar_bios, arcadia, arcadia, arcadia_amiga_state, ninj, ROT0, "Arcadia Systems", "Ninja Mission (Arcadia, set 1, V 2.5)", 0 )
-GAME( 1987, ar_ninj2, ar_ninj, arcadia, arcadia, arcadia_amiga_state, ninj, ROT0, "Arcadia Systems", "Ninja Mission (Arcadia, set 2)", 0 )
+GAME( 1987, ar_ninj, ar_bios, arcadia, arcadia, arcadia_amiga_state, ninj, ROT0, "Arcadia Systems", "Ninja Mission (Arcadia, set 1, V 2.5)", 0 )
+GAME( 1987, ar_ninj2, ar_ninj, arcadia, arcadia, arcadia_amiga_state, ninj, ROT0, "Arcadia Systems", "Ninja Mission (Arcadia, set 2)", 0 )
-GAME( 1988, ar_rdwr, ar_bios, arcadia, arcadia, arcadia_amiga_state, rdwr, ROT0, "Arcadia Systems", "RoadWars (Arcadia, V 2.3)", 0 )
+GAME( 1988, ar_rdwr, ar_bios, arcadia, arcadia, arcadia_amiga_state, rdwr, ROT0, "Arcadia Systems", "RoadWars (Arcadia, V 2.3)", 0 )
-GAME( 1988, ar_sdwr, ar_bios, arcadia, arcadia, arcadia_amiga_state, sdwr, ROT0, "Arcadia Systems", "Sidewinder (Arcadia, set 1, V 2.1)", 0 )
-GAME( 1988, ar_sdwr2, ar_sdwr, arcadia, arcadia, arcadia_amiga_state, sdwr, ROT0, "Arcadia Systems", "Sidewinder (Arcadia, set 2)", 0 )
+GAME( 1988, ar_sdwr, ar_bios, arcadia, arcadia, arcadia_amiga_state, sdwr, ROT0, "Arcadia Systems", "Sidewinder (Arcadia, set 1, V 2.1)", 0 )
+GAME( 1988, ar_sdwr2, ar_sdwr, arcadia, arcadia, arcadia_amiga_state, sdwr, ROT0, "Arcadia Systems", "Sidewinder (Arcadia, set 2)", 0 )
-GAME( 1989, ar_socc, ar_bios, arcadia, arcadia, arcadia_amiga_state, socc, ROT0, "Arcadia Systems", "World Trophy Soccer (Arcadia, V 3.0)", 0 )
+GAME( 1989, ar_socc, ar_bios, arcadia, arcadia, arcadia_amiga_state, socc, ROT0, "Arcadia Systems", "World Trophy Soccer (Arcadia, V 3.0)", 0 )
GAME( 1990, ar_spot, ar_bios, arcadia, arcadia, arcadia_amiga_state, arcadia, ROT0, "Arcadia Systems", "Spot (Arcadia, V 2.0)", 0 )
-GAME( 1987, ar_sprg, ar_bios, arcadia, arcadia, arcadia_amiga_state, sprg, ROT0, "Arcadia Systems", "Space Ranger (Arcadia, V 2.0)", 0 )
+GAME( 1987, ar_sprg, ar_bios, arcadia, arcadia, arcadia_amiga_state, sprg, ROT0, "Arcadia Systems", "Space Ranger (Arcadia, V 2.0)", 0 )
-GAME( 1988, ar_xeon, ar_bios, arcadia, arcadia, arcadia_amiga_state, xeon, ROT0, "Arcadia Systems", "Xenon (Arcadia, V 2.3)", 0 )
+GAME( 1988, ar_xeon, ar_bios, arcadia, arcadia, arcadia_amiga_state, xeon, ROT0, "Arcadia Systems", "Xenon (Arcadia, V 2.3)", 0 )
-GAME( 1988, ar_pm, ar_bios, arcadia, arcadia, arcadia_amiga_state, pm, ROT0, "Arcadia Systems", "Pharaohs Match (Arcadia)", 0 )
+GAME( 1988, ar_pm, ar_bios, arcadia, arcadia, arcadia_amiga_state, pm, ROT0, "Arcadia Systems", "Pharaohs Match (Arcadia)", 0 )
-GAME( 1988, ar_dlta, ar_bios, arcadia, arcadia, arcadia_amiga_state, dlta, ROT0, "Arcadia Systems", "Delta Command (Arcadia)", 0 )
+GAME( 1988, ar_dlta, ar_bios, arcadia, arcadia, arcadia_amiga_state, dlta, ROT0, "Arcadia Systems", "Delta Command (Arcadia)", 0 )
-GAME( 1988, ar_argh, ar_bios, argh, arcadia, arcadia_amiga_state, argh, ROT0, "Arcadia Systems", "Aaargh (Arcadia)", 0 )
+GAME( 1988, ar_argh, ar_bios, argh, arcadia, arcadia_amiga_state, argh, ROT0, "Arcadia Systems", "Aaargh (Arcadia)", 0 )
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index f28e83c0d47..9d0b820e6da 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -813,7 +813,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( artmagic, artmagic_state )
+static MACHINE_CONFIG_START( artmagic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/2)
@@ -843,7 +843,7 @@ static MACHINE_CONFIG_START( artmagic, artmagic_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MASTER_CLOCK_40MHz/3/10, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK_40MHz/3/10, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp
index bdccb3808de..6e8b9b6b2f8 100644
--- a/src/mame/drivers/ashnojoe.cpp
+++ b/src/mame/drivers/ashnojoe.cpp
@@ -301,7 +301,7 @@ void ashnojoe_state::machine_reset()
}
-static MACHINE_CONFIG_START( ashnojoe, ashnojoe_state )
+static MACHINE_CONFIG_START( ashnojoe )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
@@ -339,7 +339,7 @@ static MACHINE_CONFIG_START( ashnojoe, ashnojoe_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(ashnojoe_state, ashnojoe_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp
index 2838f4e0e99..67f2c7b5d01 100644
--- a/src/mame/drivers/asst128.cpp
+++ b/src/mame/drivers/asst128.cpp
@@ -2,10 +2,15 @@
// copyright-holders:Sergey Svishchev
#include "emu.h"
#include "machine/genpc.h"
+
+#include "cpu/i86/i86.h"
+#include "bus/pc_joy/pc_joy.h"
#include "bus/pc_kbd/keyboards.h"
#include "machine/pc_fdc.h"
+
#include "formats/asst128_dsk.h"
+
extern const device_type ASST128_MOTHERBOARD;
class asst128_mb_device : public ibm5150_mb_device
@@ -13,7 +18,9 @@ class asst128_mb_device : public ibm5150_mb_device
public:
// construction/destruction
asst128_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ibm5150_mb_device(mconfig, ASST128_MOTHERBOARD, "ASST128_MOTHERBOARD", tag, owner, clock, "asst128_mb", __FILE__) { }
+ : ibm5150_mb_device(mconfig, ASST128_MOTHERBOARD, tag, owner, clock)
+ {
+ }
DECLARE_ADDRESS_MAP(map, 8);
};
@@ -26,7 +33,7 @@ DEVICE_ADDRESS_MAP_START( map, 8, asst128_mb_device )
AM_RANGE(0x00a0, 0x00a1) AM_WRITE(nmi_enable_w)
ADDRESS_MAP_END
-const device_type ASST128_MOTHERBOARD = device_creator<asst128_mb_device>;
+DEFINE_DEVICE_TYPE(ASST128_MOTHERBOARD, asst128_mb_device, "asst128_mb", "ASST128_MOTHERBOARD")
class asst128_state : public driver_device
{
@@ -85,7 +92,7 @@ static DEVICE_INPUT_DEFAULTS_START( asst128 )
DEVICE_INPUT_DEFAULTS("DSW0", 0x30, 0x20)
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( asst128, asst128_state )
+static MACHINE_CONFIG_START( asst128 )
MCFG_CPU_ADD("maincpu", I8086, 4772720)
MCFG_CPU_PROGRAM_MAP(asst128_map)
MCFG_CPU_IO_MAP(asst128_io)
@@ -126,5 +133,5 @@ ROM_START( asst128 )
ROM_LOAD( "asst128cg.bin", 0, 0x2000, NO_DUMP )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 198?, asst128, ibm5150, 0, asst128, 0, driver_device, 0, "Schetmash", "Assistent 128", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, asst128, ibm5150, 0, asst128, 0, asst128_state, 0, "Schetmash", "Assistent 128", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index b6f0d8dd47c..44591ecad2d 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -257,7 +257,7 @@ void asterix_state::machine_reset()
}
}
-static MACHINE_CONFIG_START( asterix, asterix_state )
+static MACHINE_CONFIG_START( asterix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) // 12MHz
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index b3dc69b8303..27f846467f9 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -644,7 +644,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( asteroid, asteroid_state )
+static MACHINE_CONFIG_START( asteroid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
@@ -1042,22 +1042,22 @@ DRIVER_INIT_MEMBER(asteroid_state,asterock)
*
*************************************/
-GAME( 1979, asteroid, 0, asteroid, asteroid, driver_device, 0, ROT0, "Atari", "Asteroids (rev 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, asteroid2, asteroid, asteroid, asteroid, driver_device, 0, ROT0, "Atari", "Asteroids (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, asteroid1, asteroid, asteroid, asteroid, driver_device, 0, ROT0, "Atari", "Asteroids (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, asteroid, 0, asteroid, asteroid, asteroid_state, 0, ROT0, "Atari", "Asteroids (rev 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, asteroid2, asteroid, asteroid, asteroid, asteroid_state, 0, ROT0, "Atari", "Asteroids (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, asteroid1, asteroid, asteroid, asteroid, asteroid_state, 0, ROT0, "Atari", "Asteroids (rev 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1979, asteroidb, asteroid, asteroid, asteroidb, asteroid_state, asteroidb, ROT0, "bootleg", "Asteroids (bootleg on Lunar Lander hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, spcrocks, asteroid, asteroid, aerolitos, driver_device, 0, ROT0, "Atari (J.Estevez license)", "Space Rocks (Spanish clone of Asteroids)", MACHINE_SUPPORTS_SAVE ) // Space Rocks seems to be a legit set. Cabinet registered to 'J.Estevez (Barcelona).
-GAME( 1980, aerolitos, asteroid, asteroid, aerolitos, driver_device, 0, ROT0, "bootleg (Rodmar Elec.)","Aerolitos (Spanish bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE ) // 'Aerolitos' appears on the cabinet, this was distributed in Spain, the Spanish text is different to that contained in the original version (corrected)
+GAME( 1981, spcrocks, asteroid, asteroid, aerolitos, asteroid_state, 0, ROT0, "Atari (J.Estevez license)", "Space Rocks (Spanish clone of Asteroids)", MACHINE_SUPPORTS_SAVE ) // Space Rocks seems to be a legit set. Cabinet registered to 'J.Estevez (Barcelona).
+GAME( 1980, aerolitos, asteroid, asteroid, aerolitos, asteroid_state, 0, ROT0, "bootleg (Rodmar Elec.)","Aerolitos (Spanish bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE ) // 'Aerolitos' appears on the cabinet, this was distributed in Spain, the Spanish text is different to that contained in the original version (corrected)
GAME( 1979, asterock, asteroid, asterock, asterock, asteroid_state, asterock, ROT0, "bootleg (Sidam)", "Asterock (Sidam bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
GAME( 1979, asterockv, asteroid, asterock, asterock, asteroid_state, asterock, ROT0, "bootleg (Videotron)", "Asterock (Videotron bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, meteorts, asteroid, asteroid, asteroid, driver_device, 0, ROT0, "bootleg (VGG)", "Meteorites (bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, meteorho, asteroid, asteroid, asteroid, driver_device, 0, ROT0, "bootleg (Hoei)", "Meteor (bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, hyperspc, asteroid, asteroid, asteroid, driver_device, 0, ROT0, "bootleg (Rumiano)", "Hyperspace (bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, meteorts, asteroid, asteroid, asteroid, asteroid_state, 0, ROT0, "bootleg (VGG)", "Meteorites (bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, meteorho, asteroid, asteroid, asteroid, asteroid_state, 0, ROT0, "bootleg (Hoei)", "Meteor (bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, hyperspc, asteroid, asteroid, asteroid, asteroid_state, 0, ROT0, "bootleg (Rumiano)", "Hyperspace (bootleg of Asteroids)", MACHINE_SUPPORTS_SAVE )
-GAMEL(1980, astdelux, 0, astdelux, astdelux, driver_device, 0, ROT0, "Atari", "Asteroids Deluxe (rev 3)", MACHINE_SUPPORTS_SAVE, layout_astdelux )
-GAMEL(1980, astdelux2, astdelux, astdelux, astdelux, driver_device, 0, ROT0, "Atari", "Asteroids Deluxe (rev 2)", MACHINE_SUPPORTS_SAVE, layout_astdelux )
-GAMEL(1980, astdelux1, astdelux, astdelux, astdelux, driver_device, 0, ROT0, "Atari", "Asteroids Deluxe (rev 1)", MACHINE_SUPPORTS_SAVE, layout_astdelux )
+GAMEL(1980, astdelux, 0, astdelux, astdelux, asteroid_state, 0, ROT0, "Atari", "Asteroids Deluxe (rev 3)", MACHINE_SUPPORTS_SAVE, layout_astdelux )
+GAMEL(1980, astdelux2, astdelux, astdelux, astdelux, asteroid_state, 0, ROT0, "Atari", "Asteroids Deluxe (rev 2)", MACHINE_SUPPORTS_SAVE, layout_astdelux )
+GAMEL(1980, astdelux1, astdelux, astdelux, astdelux, asteroid_state, 0, ROT0, "Atari", "Asteroids Deluxe (rev 1)", MACHINE_SUPPORTS_SAVE, layout_astdelux )
-GAME( 1979, llander, 0, llander, llander, driver_device, 0, ROT0, "Atari", "Lunar Lander (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, llander1, llander, llander, llander1, driver_device, 0, ROT0, "Atari", "Lunar Lander (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, llandert, llander, llander, llandert, driver_device, 0, ROT0, "Atari", "Lunar Lander (screen test)", MACHINE_SUPPORTS_SAVE ) // no copyright shown, assume it's an in-house diagnostics romset (PCB came from a seller that has had Atari prototypes in his possession before)
+GAME( 1979, llander, 0, llander, llander, asteroid_state, 0, ROT0, "Atari", "Lunar Lander (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, llander1, llander, llander, llander1, asteroid_state, 0, ROT0, "Atari", "Lunar Lander (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, llandert, llander, llander, llandert, asteroid_state, 0, ROT0, "Atari", "Lunar Lander (screen test)", MACHINE_SUPPORTS_SAVE ) // no copyright shown, assume it's an in-house diagnostics romset (PCB came from a seller that has had Atari prototypes in his possession before)
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp
index 74b8fa73aaf..c85fefdadb2 100644
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@@ -652,7 +652,7 @@ static const char *const astinvad_sample_names[] =
*
*************************************/
-static MACHINE_CONFIG_START( kamikaze, astinvad_state )
+static MACHINE_CONFIG_START( kamikaze )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
@@ -703,7 +703,7 @@ static MACHINE_CONFIG_DERIVED( spcking2, kamikaze )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spaceint, astinvad_state )
+static MACHINE_CONFIG_START( spaceint )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* a guess */
@@ -847,9 +847,9 @@ DRIVER_INIT_MEMBER(astinvad_state,spcking2)
*
*************************************/
-GAME( 1980, kamikaze, 0, kamikaze, kamikaze, astinvad_state, kamikaze, ROT270, "Leijac Corporation", "Kamikaze", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, astinvad, kamikaze, kamikaze, astinvad, astinvad_state, kamikaze, ROT270, "Leijac Corporation (Stern Electronics license)", "Astro Invader", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, kamikaze, 0, kamikaze, kamikaze, astinvad_state, kamikaze, ROT270, "Leijac Corporation", "Kamikaze", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, astinvad, kamikaze, kamikaze, astinvad, astinvad_state, kamikaze, ROT270, "Leijac Corporation (Stern Electronics license)", "Astro Invader", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1980?, kosmokil, kamikaze, kamikaze, kamikaze, astinvad_state, kamikaze, ROT270, "bootleg (BEM)", "Kosmo Killer", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // says >BEM< Mi Italy but it looks hacked in, dif revision of game tho.
-GAME( 1979, spcking2, 0, spcking2, spcking2, astinvad_state, spcking2, ROT270, "Konami", "Space King 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spaceint, 0, spaceint, spaceint, driver_device, 0, ROT90, "Shoei", "Space Intruder", MACHINE_IMPERFECT_SOUND | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spaceintj,spaceint, spaceint, spaceintj, driver_device, 0, ROT90, "Shoei", "Space Intruder (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spcking2, 0, spcking2, spcking2, astinvad_state, spcking2, ROT270, "Konami", "Space King 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spaceint, 0, spaceint, spaceint, astinvad_state, 0, ROT90, "Shoei", "Space Intruder", MACHINE_IMPERFECT_SOUND | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spaceintj,spaceint, spaceint, spaceintj, astinvad_state, 0, ROT90, "Shoei", "Space Intruder (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/astrafr.cpp b/src/mame/drivers/astrafr.cpp
index 81ea2d3eb23..6c461868e5c 100644
--- a/src/mame/drivers/astrafr.cpp
+++ b/src/mame/drivers/astrafr.cpp
@@ -115,8 +115,8 @@ public:
}
// devices
- required_device<m68340cpu_device> m_maincpu;
- optional_device<m68340cpu_device> m_slavecpu;
+ required_device<m68340_cpu_device> m_maincpu;
+ optional_device<m68340_cpu_device> m_slavecpu;
DECLARE_DRIVER_INIT(astradec_sml);
DECLARE_DRIVER_INIT(astradec);
@@ -300,7 +300,7 @@ MACHINE_START_MEMBER(astrafr_state,astra_2e)
}
-static MACHINE_CONFIG_START( astrafr_dual, astrafr_state )
+static MACHINE_CONFIG_START( astrafr_dual )
MCFG_CPU_ADD("maincpu", M68340, 16000000)
MCFG_CPU_PROGRAM_MAP(astrafr_master_map)
@@ -318,7 +318,7 @@ static MACHINE_CONFIG_DERIVED( astrafr_dual_37, astrafr_dual )
MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_37 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( astrafr_dual_alt, astrafr_state )
+static MACHINE_CONFIG_START( astrafr_dual_alt )
MCFG_CPU_ADD("maincpu", M68340, 16000000)
MCFG_CPU_PROGRAM_MAP(astrafr_master_alt_map)
@@ -332,7 +332,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( astra_single, astrafr_state )
+static MACHINE_CONFIG_START( astra_single )
MCFG_CPU_ADD("maincpu", M68340, 16000000)
MCFG_CPU_PROGRAM_MAP(astra_map)
MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
@@ -355,7 +355,7 @@ MACHINE_START_MEMBER(astrafr_state,astra_57)
}
-static MACHINE_CONFIG_START( astra_single_alt, astrafr_state )
+static MACHINE_CONFIG_START( astra_single_alt )
MCFG_CPU_ADD("maincpu", M68340, 16000000)
MCFG_CPU_PROGRAM_MAP(astra_map)
MCFG_MACHINE_START_OVERRIDE(astrafr_state, astra_common )
@@ -2140,202 +2140,202 @@ DRIVER_INIT_MEMBER(astrafr_state,astradec_sml_dual)
}
// Single games?
-GAME( 200?, as_srb, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V004)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_srba, as_srb , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V100)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_srbb, as_srb , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V101)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_srbc, as_srb , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V201)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_srbd, as_srb , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V202)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_srbe, as_srb , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V203)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_srb, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_srba, as_srb , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_srbb, as_srb , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_srbc, as_srb , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V201)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_srbd, as_srb , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_srbe, as_srb , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Ring a Bell (Astra, V203)" , MACHINE_IS_SKELETON_MECHANICAL)
// Linked games (single rom per CPU with master/slave?)
-GAME( 200?, as_party, 0 , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V105)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_partya, as_party , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V110)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_partyb, as_party , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V112)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_partyc, as_party , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V206)" ,MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_partyd, as_party , astrafr_dual_37, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V401)", MACHINE_IS_SKELETON_MECHANICAL) // significantly different set
-GAME( 200?, as_partye, as_party , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V907)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_partyf, as_party , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Party Time (Astra, V906)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_party, 0 , astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_partya, as_party, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V110)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_partyb, as_party, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V112)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_partyc, as_party, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V206)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_partyd, as_party, astrafr_dual_37, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V401)" , MACHINE_IS_SKELETON_MECHANICAL) // significantly different set
+GAME( 200?, as_partye, as_party, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V907)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_partyf, as_party, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Party Time (Astra, V906)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_letsp, 0 , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Let's Party (Astra, V904)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_letsp, 0 , astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Let's Party (Astra, V904)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_topsl, 0 , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Top Slot (Astra, V103)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_topsla, as_topsl , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Top Slot (Astra, V104)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_topslb, as_topsl , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Top Slot (Astra, V201)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_topslc, as_topsl , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Top Slot (Astra, V203)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_topsld, as_topsl , astrafr_dual_2e, astrafr, driver_device, 0, ROT0, "Astra", "Top Slot (Astra, V205)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_topsl, 0 , astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Top Slot (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_topsla, as_topsl, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Top Slot (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_topslb, as_topsl, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Top Slot (Astra, V201)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_topslc, as_topsl, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Top Slot (Astra, V203)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_topsld, as_topsl, astrafr_dual_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Top Slot (Astra, V205)" , MACHINE_IS_SKELETON_MECHANICAL)
// Other HW? (has u1/u2 pairing)
-GAME( 200?, as_bigtm, 0 , astra_single , astrafr, astrafr_state, astradec, ROT0, "Astra", "Big Time (Astra, V003)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_acp, 0 , astra_single , astrafr, astrafr_state, astradec, ROT0, "Astra", "unknown Astra 'ACP' (Astra, V403)", MACHINE_IS_SKELETON_MECHANICAL) // no sound data in here?
-GAME( 200?, as_celeb, 0 , astra_single , astrafr, astrafr_state, astradec, ROT0, "Astra", "Celebration (Astra, V100)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_celeba, as_celeb , astra_single , astrafr, astrafr_state, astradec, ROT0, "Astra", "Celebration (Astra, V101)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_celebb, as_celeb , astra_single , astrafr, astrafr_state, astradec, ROT0, "Astra", "Celebration (Astra, V201)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_bigtm, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Big Time (Astra, V003)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_acp, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "unknown Astra 'ACP' (Astra, V403)" , MACHINE_IS_SKELETON_MECHANICAL) // no sound data in here?
+GAME( 200?, as_celeb, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Celebration (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_celeba, as_celeb , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Celebration (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_celebb, as_celeb , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Celebration (Astra, V201)" , MACHINE_IS_SKELETON_MECHANICAL)
// u1/u2 pairing and Linked?
-GAME( 200?, as_hc, 0 , astrafr_dual_37 , astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V107)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hca, as_hc , astrafr_dual_37 , astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V109)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hcb, as_hc , astrafr_dual_37 , astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V110)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hcc, as_hc , astrafr_dual_37 , astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V111)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hcd, as_hc , astrafr_dual_37 , astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V909)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hc, 0 , astrafr_dual_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hca, as_hc , astrafr_dual_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hcb, as_hc , astrafr_dual_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V110)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hcc, as_hc , astrafr_dual_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V111)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hcd, as_hc , astrafr_dual_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Hokey Cokey (Astra, V909)" , MACHINE_IS_SKELETON_MECHANICAL)
// Non-Astra, same hw?
-GAME( 200?, as_cshah, 0 , astra_single_alt_57 , astrafr, astrafr_state, astradec, ROT0, "Lowen", "Cash Ahoi (Lowen, V105)", MACHINE_IS_SKELETON_MECHANICAL)
-
-
-GAME( 200?, as_big10, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big 10 (Astra, V500)", MACHINE_IS_SKELETON_MECHANICAL) // BB96
-GAME( 200?, as_big10a, as_big10 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big 10 (Astra, V503)", MACHINE_IS_SKELETON_MECHANICAL) // BB96
-GAME( 200?, as_big10b, as_big10 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big 10 (Astra, V507)", MACHINE_IS_SKELETON_MECHANICAL) // BB96
-GAME( 200?, as_big10c, as_big10 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big 10 (Astra, V601)", MACHINE_IS_SKELETON_MECHANICAL) // BB96
-GAME( 200?, as_big10d, as_big10 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big 10 (Astra, V605)", MACHINE_IS_SKELETON_MECHANICAL) // BB96
-GAME( 200?, as_big15, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big 15 (Astra, V101)", MACHINE_IS_SKELETON_MECHANICAL) // DL98
-GAME( 200?, as_bigcs, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big Cash (Astra, V101)", MACHINE_IS_SKELETON_MECHANICAL) // CF97/CF98
-GAME( 200?, as_bigcsa, as_bigcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Big Cash (Astra, V103)", MACHINE_IS_SKELETON_MECHANICAL) // CF97/CF98
-
-GAME( 200?, as_bbr, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL) // FA00/CU98
-GAME( 200?, as_bbra, as_bbr , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V102,alt)" , MACHINE_IS_SKELETON_MECHANICAL) // FA00/CU98
-GAME( 200?, as_bbrb, as_bbr , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V201)" , MACHINE_IS_SKELETON_MECHANICAL) // FA00/CU98
-GAME( 200?, as_bbrc, as_bbr , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V003)" , MACHINE_IS_SKELETON_MECHANICAL) // CU98
-GAME( 200?, as_bbrd, as_bbr , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // CU98
-GAME( 200?, as_bbre, as_bbr , astra_single_37, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL) // FG01
-GAME( 200?, as_bbrf, as_bbr , astra_single_37, astrafr, driver_device, 0, ROT0, "Astra", "Bullion Bars (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL) // FN01
-
-GAME( 200?, as_dblcs, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V110)" , MACHINE_IS_SKELETON_MECHANICAL) // BR97
-GAME( 200?, as_dblcsa, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V112)" , MACHINE_IS_SKELETON_MECHANICAL) // BR97
-GAME( 200?, as_dblcsb, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V108)" , MACHINE_IS_SKELETON_MECHANICAL) // BR97
-GAME( 200?, as_dblcsc, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL) // CN97
-GAME( 200?, as_dblcsd, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL) // CN97
-GAME( 200?, as_dblcse, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // FB00
-GAME( 200?, as_dblcsf, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL) // FB00
-GAME( 200?, as_dblcsg, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V100, alt)" , MACHINE_IS_SKELETON_MECHANICAL) // DN98
-GAME( 200?, as_dblcsh, as_dblcs , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Double Cash (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL) // FO01
-
-GAME( 200?, as_fortn, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Fortune Teller (Astra, V009)" , MACHINE_IS_SKELETON_MECHANICAL)
-
-GAME( 200?, as_gof, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Lowen", "Game Of Fortune (Lowen, V208)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hog, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Hearts Of Gold (Astra, V002)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hxr, 0 , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Hot Cross Run (Astra, V108)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_hr, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Hot Reel (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
-
-GAME( 200?, as_djp, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Double Jackpot (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_djpa, 0 , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Double Jackpot (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_djpb, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Double Jackpot (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_cshcs, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Lowen", "Cash Castle (Lowen, V006)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_colmn, 0 , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Colour Of Money (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_colmna, as_colmn , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Colour Of Money (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_colmnb, as_colmn , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Colour Of Money (Astra, V108)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_colmnc, as_colmn , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Colour Of Money (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_colmnd, as_colmn , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Colour Of Money (Astra, V908)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jackb, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Jackpot Bell (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jpx, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jackpot X (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jpxa, as_jpx , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jackpot X (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jpxb, as_jpx , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jackpot X (Astra, V002)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jolly, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Jolly Roger (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jmpj, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Jumping Jackpots (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jmpja, as_jmpj , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Jumping Jackpots (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjive, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjivea, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjiveb, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjivec, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjived, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjivee, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V101, alt)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjivef, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_jjiveg, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V005)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_kingc, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "King Cash (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_kingca, as_kingc , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "King Cash (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_koc, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "King Of Clubs (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_koca, as_koc , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "King Of Clubs (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_lbt, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Little Big 10 (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_lbta, as_lbt , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Little Big 10 (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-
-GAME( 200?, as_ldl, 0 , astra_single_2e, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V700)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ldla, as_ldl , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V600)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ldlb, as_ldl , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V312)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ldlc, as_ldl , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V003)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ldld, as_ldl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Little Devils (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ldle, as_ldl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Little Devils (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_mp, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Lowen", "Mission Possible (Lowen, V118)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_mp2, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Lowen", "Mission Possible 2 (Lowen, V114)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_otr, 0 , astra_single_2e, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Over The Rainbow (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_otra, as_otr , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Over The Rainbow (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // incomplete set
-GAME( 200?, as_ptf, 0 , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // strange extra sound(?) roms in here
-GAME( 200?, as_ptfa, as_ptf , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra, V803)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ptfb, as_ptf , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra, V905)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ptfc, as_ptf , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_pia, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Pay It Again (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_piaa, as_pia , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Pay It Again (Astra, V206)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_piab, as_pia , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Pay It Again (Astra, V904)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_pharg, 0 , astra_single_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V005)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_pharga, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_phargb, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_phargc, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_phargd, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_pharge, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_pb, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Piggy Banking (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_cshah, 0 , astra_single_alt_57, astrafr, astrafr_state, astradec, ROT0, "Lowen", "Cash Ahoi (Lowen, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
+
+
+GAME( 200?, as_big10, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big 10 (Astra, V500)" , MACHINE_IS_SKELETON_MECHANICAL) // BB96
+GAME( 200?, as_big10a, as_big10 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big 10 (Astra, V503)" , MACHINE_IS_SKELETON_MECHANICAL) // BB96
+GAME( 200?, as_big10b, as_big10 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big 10 (Astra, V507)" , MACHINE_IS_SKELETON_MECHANICAL) // BB96
+GAME( 200?, as_big10c, as_big10 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big 10 (Astra, V601)" , MACHINE_IS_SKELETON_MECHANICAL) // BB96
+GAME( 200?, as_big10d, as_big10 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big 10 (Astra, V605)" , MACHINE_IS_SKELETON_MECHANICAL) // BB96
+GAME( 200?, as_big15, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big 15 (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL) // DL98
+GAME( 200?, as_bigcs, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big Cash (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL) // CF97/CF98
+GAME( 200?, as_bigcsa, as_bigcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Big Cash (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL) // CF97/CF98
+
+GAME( 200?, as_bbr, 0 , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL) // FA00/CU98
+GAME( 200?, as_bbra, as_bbr , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V102,alt)" , MACHINE_IS_SKELETON_MECHANICAL) // FA00/CU98
+GAME( 200?, as_bbrb, as_bbr , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V201)" , MACHINE_IS_SKELETON_MECHANICAL) // FA00/CU98
+GAME( 200?, as_bbrc, as_bbr , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V003)" , MACHINE_IS_SKELETON_MECHANICAL) // CU98
+GAME( 200?, as_bbrd, as_bbr , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // CU98
+GAME( 200?, as_bbre, as_bbr , astra_single_37, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL) // FG01
+GAME( 200?, as_bbrf, as_bbr , astra_single_37, astrafr, astrafr_state, 0, ROT0, "Astra", "Bullion Bars (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL) // FN01
+
+GAME( 200?, as_dblcs, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V110)" , MACHINE_IS_SKELETON_MECHANICAL) // BR97
+GAME( 200?, as_dblcsa, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V112)" , MACHINE_IS_SKELETON_MECHANICAL) // BR97
+GAME( 200?, as_dblcsb, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V108)" , MACHINE_IS_SKELETON_MECHANICAL) // BR97
+GAME( 200?, as_dblcsc, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL) // CN97
+GAME( 200?, as_dblcsd, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL) // CN97
+GAME( 200?, as_dblcse, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // FB00
+GAME( 200?, as_dblcsf, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL) // FB00
+GAME( 200?, as_dblcsg, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V100, alt)" , MACHINE_IS_SKELETON_MECHANICAL) // DN98
+GAME( 200?, as_dblcsh, as_dblcs , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Double Cash (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL) // FO01
+
+GAME( 200?, as_fortn, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Fortune Teller (Astra, V009)" , MACHINE_IS_SKELETON_MECHANICAL)
+
+GAME( 200?, as_gof, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Lowen", "Game Of Fortune (Lowen, V208)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hog, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Hearts Of Gold (Astra, V002)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hxr, 0 , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Hot Cross Run (Astra, V108)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_hr, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Hot Reel (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
+
+GAME( 200?, as_djp, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Double Jackpot (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_djpa, 0 , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Double Jackpot (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_djpb, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Double Jackpot (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_cshcs, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Lowen", "Cash Castle (Lowen, V006)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_colmn, 0 , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Colour Of Money (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_colmna, as_colmn , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Colour Of Money (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_colmnb, as_colmn , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Colour Of Money (Astra, V108)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_colmnc, as_colmn , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Colour Of Money (Astra, V109)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_colmnd, as_colmn , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Colour Of Money (Astra, V908)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jackb, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Jackpot Bell (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jpx, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jackpot X (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jpxa, as_jpx , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jackpot X (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jpxb, as_jpx , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jackpot X (Astra, V002)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jolly, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Jolly Roger (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jmpj, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Jumping Jackpots (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jmpja, as_jmpj , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Jumping Jackpots (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjive, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjivea, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjiveb, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjivec, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjived, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjivee, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V101, alt)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjivef, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_jjiveg, as_jjive , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Jungle Jive (Astra, V005)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_kingc, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "King Cash (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_kingca, as_kingc , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "King Cash (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_koc, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "King Of Clubs (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_koca, as_koc , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "King Of Clubs (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_lbt, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Little Big 10 (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_lbta, as_lbt , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Little Big 10 (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+
+GAME( 200?, as_ldl, 0 , astra_single_2e, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V700)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ldla, as_ldl , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V600)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ldlb, as_ldl , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V312)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ldlc, as_ldl , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Little Devils (Astra, V003)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ldld, as_ldl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Little Devils (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ldle, as_ldl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Little Devils (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_mp, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Lowen", "Mission Possible (Lowen, V118)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_mp2, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Lowen", "Mission Possible 2 (Lowen, V114)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_otr, 0 , astra_single_2e, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Over The Rainbow (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_otra, as_otr , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Over The Rainbow (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // incomplete set
+GAME( 200?, as_ptf, 0 , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL) // strange extra sound(?) roms in here
+GAME( 200?, as_ptfa, as_ptf , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra, V803)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ptfb, as_ptf , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra, V905)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ptfc, as_ptf , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Astra", "Party Fruits (Astra)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_pia, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Pay It Again (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_piaa, as_pia , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Pay It Again (Astra, V206)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_piab, as_pia , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Pay It Again (Astra, V904)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_pharg, 0 , astra_single_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V005)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_pharga, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_phargb, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_phargc, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_phargd, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_pharge, as_pharg , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Pharaoh's Gold (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_pb, 0 , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Piggy Banking (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
// this might be another mix of master / slave sets, and multiple games....
-GAME( 200?, as_rtr, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtra, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101, alt 1)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtrb, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101, alt 2)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtrc, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101, alt 3)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtrd, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V100, )" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtre, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V100, alt)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtrf, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtrg, as_rtr , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V200, alt)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rtrh, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
-
-GAME( 200?, as_rab, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_raba, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rabb, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rabc, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Ring A Bell (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbg, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V304)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbga, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V303)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbgb, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbgc, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbgd, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbge, as_rab , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "River Boat Gambler (Astra, V008)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rbglo, 0 , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Lowen", "River Boat Gambler (Lowen, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_rox, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Roll X (Astra, V006)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_csv, 0 , astra_single_37, astrafr, driver_device, 0, ROT0, "Astra", "Slot Slant (?) (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sltcl, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Slots Classic (?) (Astra)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_stp, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_stpa, as_stp , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_stpb, as_stp , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_siu, 0 , astra_single_37, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Step It Up (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL) // extra sound roms(?) in this set
-GAME( 200?, as_siua, as_siu , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Step It Up (Astra, V203)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sld, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V700)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_slda, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V600)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sldb, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V500)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sldc, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V400)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_sldd, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_slde, as_sld , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Super Little Devil (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tem, 0 , astra_single_alt_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Temptation (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tema, as_tem , astra_single_alt_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Temptation (Astra, V006)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tbl, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tbla, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tblb, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tblc, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tbld, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V304)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tble, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V303)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_tblf, as_tbl , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Triple Bells (Astra, V301)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_td, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Twin Dragons (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-
-GAME( 200?, as_twp, 0 , astra_single_2e, astrafr, driver_device, 0, ROT0, "Astra", "Twin Pots (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_twpa, as_twp , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Twin Pots (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vn, 0 , astrafr_dual_alt_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Vegas Nights (Astra, V205)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vcv, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V005)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vcva, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vcvb, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vcvc, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vcvd, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_vcve, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ww, 0 , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V203)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwa, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V204)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwb, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V205)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwc, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwd, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_wwe, as_ww , astra_single, astrafr, driver_device, 0, ROT0, "Astra", "Wicked Willy (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 200?, as_ws, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Win Streak (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL) // incomplete dump
+GAME( 200?, as_rtr, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtra, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101, alt 1)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtrb, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101, alt 2)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtrc, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V101, alt 3)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtrd, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V100, )" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtre, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V100, alt)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtrf, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtrg, as_rtr , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V200, alt)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rtrh, as_rtr , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Ready To Roll (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
+
+GAME( 200?, as_rab, 0 , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Ring A Bell (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_raba, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Ring A Bell (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rabb, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Ring A Bell (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rabc, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Ring A Bell (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbg, 0 , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "River Boat Gambler (Astra, V304)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbga, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "River Boat Gambler (Astra, V303)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbgb, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "River Boat Gambler (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbgc, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "River Boat Gambler (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbgd, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "River Boat Gambler (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbge, as_rab , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "River Boat Gambler (Astra, V008)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rbglo, 0 , astrafr_dual_37, astrafr, astrafr_state, astradec_sml_dual, ROT0, "Lowen", "River Boat Gambler (Lowen, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_rox, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Roll X (Astra, V006)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_csv, 0 , astra_single_37, astrafr, astrafr_state, 0, ROT0, "Astra", "Slot Slant (?) (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sltcl, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Slots Classic (?) (Astra)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_stp, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_stpa, as_stp , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_stpb, as_stp , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Stampede (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_siu, 0 , astra_single_37, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Step It Up (Astra, V202)" , MACHINE_IS_SKELETON_MECHANICAL) // extra sound roms(?) in this set
+GAME( 200?, as_siua, as_siu , astra_single, astrafr, astrafr_state, astradec_sml, ROT0, "Astra", "Step It Up (Astra, V203)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sld, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Little Devil (Astra, V700)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_slda, as_sld , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Little Devil (Astra, V600)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sldb, as_sld , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Little Devil (Astra, V500)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sldc, as_sld , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Little Devil (Astra, V400)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_sldd, as_sld , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Little Devil (Astra, V200)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_slde, as_sld , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Super Little Devil (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tem, 0 , astra_single_alt_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Temptation (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tema, as_tem , astra_single_alt_37, astrafr, astrafr_state, astradec, ROT0, "Astra", "Temptation (Astra, V006)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tbl, 0 , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tbla, as_tbl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V105)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tblb, as_tbl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tblc, as_tbl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tbld, as_tbl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V304)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tble, as_tbl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V303)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_tblf, as_tbl , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Triple Bells (Astra, V301)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_td, 0 , astra_single_2e, astrafr, astrafr_state, astradec, ROT0, "Astra", "Twin Dragons (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+
+GAME( 200?, as_twp, 0 , astra_single_2e, astrafr, astrafr_state, 0, ROT0, "Astra", "Twin Pots (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_twpa, as_twp , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Twin Pots (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vn, 0 , astrafr_dual_alt_37, astrafr, astrafr_state, astradec_dual, ROT0, "Astra", "Vegas Nights (Astra, V205)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vcv, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V005)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vcva, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V107)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vcvb, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V106)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vcvc, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vcvd, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_vcve, as_vcv , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V101)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ww, 0 , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Wicked Willy (Astra, V203)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwa, as_ww , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Wicked Willy (Astra, V204)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwb, as_ww , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Wicked Willy (Astra, V205)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwc, as_ww , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Wicked Willy (Astra, V104)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwd, as_ww , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Wicked Willy (Astra, V103)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_wwe, as_ww , astra_single, astrafr, astrafr_state, 0, ROT0, "Astra", "Wicked Willy (Astra, V102)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 200?, as_ws, 0 , astra_single, astrafr, astrafr_state, astradec, ROT0, "Astra", "Win Streak (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL) // incomplete dump
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index c6c5d982231..fbf83cf87ce 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -488,7 +488,7 @@ TODO: understand if later hardware uses different parameters (XTAL is almost sur
#define ASTROCORP_VBEND 0
#define ASTROCORP_VBSTART 240
-static MACHINE_CONFIG_START( showhand, astrocorp_state )
+static MACHINE_CONFIG_START( showhand )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
@@ -518,7 +518,7 @@ static MACHINE_CONFIG_START( showhand, astrocorp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz/20, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -540,7 +540,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::skilldrp_scanline)
m_maincpu->set_input_line(2, HOLD_LINE);
}
-static MACHINE_CONFIG_START( skilldrp, astrocorp_state )
+static MACHINE_CONFIG_START( skilldrp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // JX-1689F1028N GRX586.V5
@@ -572,7 +572,7 @@ static MACHINE_CONFIG_START( skilldrp, astrocorp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/24, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/24, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1358,14 +1358,14 @@ DRIVER_INIT_MEMBER(astrocorp_state,astoneag)
GAME( 2000, showhand, 0, showhand, showhand, astrocorp_state, showhand, ROT0, "Astro Corp.", "Show Hand (Italy)", MACHINE_SUPPORTS_SAVE )
GAME( 2000, showhanc, showhand, showhanc, showhanc, astrocorp_state, showhanc, ROT0, "Astro Corp.", "Wang Pai Dui Jue (China)", MACHINE_SUPPORTS_SAVE )
-GAME( 2002, skilldrp, 0, skilldrp, skilldrp, driver_device, 0, ROT0, "Astro Corp.", "Skill Drop Georgia (Ver. G1.0S)", MACHINE_SUPPORTS_SAVE )
-GAME( 2003, speeddrp, 0, speeddrp, skilldrp, driver_device, 0, ROT0, "Astro Corp.", "Speed Drop (Ver. 1.06)", MACHINE_SUPPORTS_SAVE )
+GAME( 2002, skilldrp, 0, skilldrp, skilldrp, astrocorp_state, 0, ROT0, "Astro Corp.", "Skill Drop Georgia (Ver. G1.0S)", MACHINE_SUPPORTS_SAVE )
+GAME( 2003, speeddrp, 0, speeddrp, skilldrp, astrocorp_state, 0, ROT0, "Astro Corp.", "Speed Drop (Ver. 1.06)", MACHINE_SUPPORTS_SAVE )
// Encrypted games (not working):
-GAME( 2003?, dinodino, 0, skilldrp, skilldrp, driver_device, 0, ROT0, "Astro Corp.", "Dino Dino", MACHINE_NOT_WORKING )
+GAME( 2003?, dinodino, 0, skilldrp, skilldrp, astrocorp_state, 0, ROT0, "Astro Corp.", "Dino Dino", MACHINE_NOT_WORKING )
GAME( 2004?, astoneag, 0, skilldrp, skilldrp, astrocorp_state, astoneag, ROT0, "Astro Corp.", "Stone Age (Astro, Ver. ENG.03.A)", MACHINE_NOT_WORKING )
-GAME( 2005?, winbingo, 0, skilldrp, skilldrp, driver_device, 0, ROT0, "Astro Corp.", "Win Win Bingo (set 1)", MACHINE_NOT_WORKING )
-GAME( 2005?, winbingoa, winbingo, skilldrp, skilldrp, driver_device, 0, ROT0, "Astro Corp.", "Win Win Bingo (set 2)", MACHINE_NOT_WORKING )
-GAME( 2005?, hacher, winbingo, skilldrp, skilldrp, driver_device, 0, ROT0, "bootleg (Gametron)", "Hacher (hack of Win Win Bingo)", MACHINE_NOT_WORKING )
-GAME( 2005?, zoo, 0, showhand, showhand, driver_device, 0, ROT0, "Astro Corp.", "Zoo (Ver. ZO.02.D)", MACHINE_NOT_WORKING )
-GAME( 2007?, westvent, 0, skilldrp, skilldrp, driver_device, 0, ROT0, "Astro Corp.", "Western Venture (Ver. AA.02.D)", MACHINE_NOT_WORKING )
+GAME( 2005?, winbingo, 0, skilldrp, skilldrp, astrocorp_state, 0, ROT0, "Astro Corp.", "Win Win Bingo (set 1)", MACHINE_NOT_WORKING )
+GAME( 2005?, winbingoa, winbingo, skilldrp, skilldrp, astrocorp_state, 0, ROT0, "Astro Corp.", "Win Win Bingo (set 2)", MACHINE_NOT_WORKING )
+GAME( 2005?, hacher, winbingo, skilldrp, skilldrp, astrocorp_state, 0, ROT0, "bootleg (Gametron)", "Hacher (hack of Win Win Bingo)", MACHINE_NOT_WORKING )
+GAME( 2005?, zoo, 0, showhand, showhand, astrocorp_state, 0, ROT0, "Astro Corp.", "Zoo (Ver. ZO.02.D)", MACHINE_NOT_WORKING )
+GAME( 2007?, westvent, 0, skilldrp, skilldrp, astrocorp_state, 0, ROT0, "Astro Corp.", "Western Venture (Ver. AA.02.D)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index 243e4c3084d..999e109ad11 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -1238,7 +1238,7 @@ static const z80_daisy_config tenpin_daisy_chain[] =
*
*************************************/
-static MACHINE_CONFIG_START( astrocade_base, astrocde_state )
+static MACHINE_CONFIG_START( astrocade_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4)
@@ -1794,29 +1794,29 @@ DRIVER_INIT_MEMBER(astrocde_state,tenpindx)
*************************************/
/* 90002 CPU board + 90700 game board + 91312 "characterization card" */
-GAMEL(1978, seawolf2, 0, seawolf2, seawolf2, astrocde_state, seawolf2, ROT0, "Dave Nutting Associates / Midway", "Sea Wolf II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_seawolf2 )
+GAMEL(1978, seawolf2, 0, seawolf2, seawolf2, astrocde_state, seawolf2, ROT0, "Dave Nutting Associates / Midway", "Sea Wolf II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_seawolf2 )
/* 91354 CPU board + 90700 game board + 91356 RAM board */
-GAMEL(1980, ebases, 0, ebases, ebases, astrocde_state, ebases, ROT0, "Dave Nutting Associates / Midway", "Extra Bases", MACHINE_SUPPORTS_SAVE, layout_spacezap )
+GAMEL(1980, ebases, 0, ebases, ebases, astrocde_state, ebases, ROT0, "Dave Nutting Associates / Midway", "Extra Bases", MACHINE_SUPPORTS_SAVE, layout_spacezap )
/* 91354 CPU board + 90706 game board + 91356 RAM board + 91355 pattern board */
-GAMEL(1980, spacezap, 0, spacezap, spacezap, astrocde_state, spacezap, ROT0, "Midway", "Space Zap", MACHINE_SUPPORTS_SAVE, layout_spacezap )
+GAMEL(1980, spacezap, 0, spacezap, spacezap, astrocde_state, spacezap, ROT0, "Midway", "Space Zap", MACHINE_SUPPORTS_SAVE, layout_spacezap )
/* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91397 memory board */
-GAME( 1980, wow, 0, wow, wow, astrocde_state, wow, ROT0, "Dave Nutting Associates / Midway", "Wizard of Wor", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, wowg, wow, wow, wowg, astrocde_state, wow, ROT0, "Dave Nutting Associates / Midway", "Wizard of Wor (with German Language ROM)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, wow, 0, wow, wow, astrocde_state, wow, ROT0, "Dave Nutting Associates / Midway", "Wizard of Wor", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, wowg, wow, wow, wowg, astrocde_state, wow, ROT0, "Dave Nutting Associates / Midway", "Wizard of Wor (with German Language ROM)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91364 ROM/RAM board */
-GAMEL(1981, gorf, 0, gorf, gorf, astrocde_state, gorf, ROT270, "Dave Nutting Associates / Midway", "Gorf", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gorf )
-GAMEL(1981, gorfpgm1, gorf, gorf, gorf, astrocde_state, gorf, ROT270, "Dave Nutting Associates / Midway", "Gorf (program 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gorf )
-GAMEL(1981, gorfpgm1g,gorf, gorf, gorfpgm1g, astrocde_state,gorf, ROT270, "Dave Nutting Associates / Midway", "Gorf (program 1, with German Language ROM)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gorf )
+GAMEL(1981, gorf, 0, gorf, gorf, astrocde_state, gorf, ROT270, "Dave Nutting Associates / Midway", "Gorf", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gorf )
+GAMEL(1981, gorfpgm1, gorf, gorf, gorf, astrocde_state, gorf, ROT270, "Dave Nutting Associates / Midway", "Gorf (program 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gorf )
+GAMEL(1981, gorfpgm1g,gorf, gorf, gorfpgm1g, astrocde_state, gorf, ROT270, "Dave Nutting Associates / Midway", "Gorf (program 1, with German Language ROM)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gorf )
/* 91354 CPU board + 90708 game board + 91356 RAM board + 91355 pattern board + 91423 memory board */
-GAME( 1981, robby, 0, robby, robby, astrocde_state, robby, ROT0, "Dave Nutting Associates / Bally Midway", "The Adventures of Robby Roto!", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, robby, 0, robby, robby, astrocde_state, robby, ROT0, "Dave Nutting Associates / Bally Midway", "The Adventures of Robby Roto!", MACHINE_SUPPORTS_SAVE )
/* 91465 CPU board + 91469 game board + 91466 RAM board + 91488 pattern board + 91467 memory board + 91846 EPROM board */
-GAME( 1983, profpac, 0, profpac, profpac, astrocde_state, profpac, ROT0, "Dave Nutting Associates / Bally Midway", "Professor Pac-Man", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, profpac, 0, profpac, profpac, astrocde_state, profpac, ROT0, "Dave Nutting Associates / Bally Midway", "Professor Pac-Man", MACHINE_SUPPORTS_SAVE )
/* 91465 CPU board + 91699 game board + 91466 RAM board + 91488 pattern board + 91467 memory board */
-GAME( 1982, demndrgn, 0, demndrgn, demndrgn, astrocde_state, demndrgn, ROT0, "Dave Nutting Associates / Bally Midway", "Demons & Dragons (prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1983, tenpindx, 0, tenpindx, tenpindx, astrocde_state, tenpindx, ROT0, "Dave Nutting Associates / Bally Midway", "Ten Pin Deluxe", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL, layout_tenpindx )
+GAME( 1982, demndrgn, 0, demndrgn, demndrgn, astrocde_state, demndrgn, ROT0, "Dave Nutting Associates / Bally Midway", "Demons & Dragons (prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1983, tenpindx, 0, tenpindx, tenpindx, astrocde_state, tenpindx, ROT0, "Dave Nutting Associates / Bally Midway", "Ten Pin Deluxe", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL, layout_tenpindx )
diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp
index 9d82c53b56e..5573fca56a8 100644
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@@ -910,7 +910,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( base, astrof_state )
+static MACHINE_CONFIG_START( base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
@@ -1383,21 +1383,21 @@ DRIVER_INIT_MEMBER(astrof_state,acombat3)
*
*************************************/
-GAME( 1979, astrof, 0, astrof, astrof, driver_device, 0, ROT90, "Data East", "Astro Fighter (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, astrof2, astrof, astrof, astrof, driver_device, 0, ROT90, "Data East", "Astro Fighter (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, astrof3, astrof, astrof, astrof, driver_device, 0, ROT90, "Data East", "Astro Fighter (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, abattle, astrof, abattle, abattle, astrof_state, abattle, ROT90, "bootleg? (Sidam)", "Astro Battle (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, abattle2, astrof, abattle, abattle, astrof_state, abattle, ROT90, "bootleg? (Sidam)", "Astro Battle (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, afire, astrof, abattle, abattle, astrof_state, afire, ROT90, "bootleg (Rene Pierre)", "Astro Fire", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, acombat, astrof, abattle, abattle, astrof_state, afire, ROT90, "bootleg", "Astro Combat (newer, CB)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, acombato, astrof, abattle, abattle, astrof_state, afire, ROT90, "bootleg", "Astro Combat (older, PZ)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, acombat3, astrof, abattle, abattle, astrof_state, acombat3,ROT90, "bootleg (Proel)", "Astro Combat (unencrypted)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, acombat4, astrof, abattle, abattle, astrof_state, abattle, ROT90, "bootleg (Proel)", "Astro Combat (encrypted)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, strfight, astrof, abattle, abattle, astrof_state, acombat3,ROT90, "bootleg (VGG)", "Star Fighter (bootleg of Astro Fighter)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sstarbtl, astrof, abattle, abattle, astrof_state, sstarbtl,ROT90, "bootleg", "Super Star Battle", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1979, spfghmk2, 0, spfghmk2, spfghmk2, driver_device,0, ROT90, "Data East", "Space Fighter Mark II (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, spfghmk22,spfghmk2, spfghmk2, spfghmk22,driver_device,0, ROT90, "Data East", "Space Fighter Mark II (set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1980, tomahawk, 0, tomahawk, tomahawk, driver_device,0, ROT90, "Data East", "Tomahawk 777 (rev 5)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tomahawk1,tomahawk, tomahawk, tomahawk1,driver_device,0, ROT90, "Data East", "Tomahawk 777 (rev 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, astrof, 0, astrof, astrof, astrof_state, 0, ROT90, "Data East", "Astro Fighter (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, astrof2, astrof, astrof, astrof, astrof_state, 0, ROT90, "Data East", "Astro Fighter (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, astrof3, astrof, astrof, astrof, astrof_state, 0, ROT90, "Data East", "Astro Fighter (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, abattle, astrof, abattle, abattle, astrof_state, abattle, ROT90, "bootleg? (Sidam)", "Astro Battle (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, abattle2, astrof, abattle, abattle, astrof_state, abattle, ROT90, "bootleg? (Sidam)", "Astro Battle (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, afire, astrof, abattle, abattle, astrof_state, afire, ROT90, "bootleg (Rene Pierre)", "Astro Fire", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, acombat, astrof, abattle, abattle, astrof_state, afire, ROT90, "bootleg", "Astro Combat (newer, CB)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, acombato, astrof, abattle, abattle, astrof_state, afire, ROT90, "bootleg", "Astro Combat (older, PZ)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, acombat3, astrof, abattle, abattle, astrof_state, acombat3,ROT90, "bootleg (Proel)", "Astro Combat (unencrypted)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, acombat4, astrof, abattle, abattle, astrof_state, abattle, ROT90, "bootleg (Proel)", "Astro Combat (encrypted)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, strfight, astrof, abattle, abattle, astrof_state, acombat3,ROT90, "bootleg (VGG)", "Star Fighter (bootleg of Astro Fighter)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sstarbtl, astrof, abattle, abattle, astrof_state, sstarbtl,ROT90, "bootleg", "Super Star Battle", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1979, spfghmk2, 0, spfghmk2, spfghmk2, astrof_state, 0, ROT90, "Data East", "Space Fighter Mark II (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spfghmk22,spfghmk2, spfghmk2, spfghmk22,astrof_state, 0, ROT90, "Data East", "Space Fighter Mark II (set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1980, tomahawk, 0, tomahawk, tomahawk, astrof_state, 0, ROT90, "Data East", "Tomahawk 777 (rev 5)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tomahawk1,tomahawk, tomahawk, tomahawk1,astrof_state, 0, ROT90, "Data East", "Tomahawk 777 (rev 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp
index d26d30c8ce4..e024e535922 100644
--- a/src/mame/drivers/astrohome.cpp
+++ b/src/mame/drivers/astrohome.cpp
@@ -190,7 +190,7 @@ static SLOT_INTERFACE_START(astrocade_exp)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( astrocde, astrocde_mess_state )
+static MACHINE_CONFIG_START( astrocde )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, ASTROCADE_CLOCK/4) /* 1.789 MHz */
MCFG_CPU_PROGRAM_MAP(astrocade_mem)
@@ -272,7 +272,7 @@ MACHINE_START_MEMBER(astrocde_mess_state, astrocde)
*
*************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1978, astrocde, 0, 0, astrocde, astrocde, astrocde_state, astrocde, "Bally Manufacturing", "Bally Professional Arcade", MACHINE_SUPPORTS_SAVE )
-CONS( 1977, astrocdl, astrocde, 0, astrocde, astrocde, astrocde_state, astrocde, "Bally Manufacturing", "Bally Home Library Computer", MACHINE_SUPPORTS_SAVE )
-CONS( 1977, astrocdw, astrocde, 0, astrocde, astrocde, astrocde_state, astrocde, "Bally Manufacturing", "Bally Computer System", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1978, astrocde, 0, 0, astrocde, astrocde, astrocde_mess_state, astrocde, "Bally Manufacturing", "Bally Professional Arcade", MACHINE_SUPPORTS_SAVE )
+CONS( 1977, astrocdl, astrocde, 0, astrocde, astrocde, astrocde_mess_state, astrocde, "Bally Manufacturing", "Bally Home Library Computer", MACHINE_SUPPORTS_SAVE )
+CONS( 1977, astrocdw, astrocde, 0, astrocde, astrocde, astrocde_mess_state, astrocde, "Bally Manufacturing", "Bally Computer System", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/astropc.cpp b/src/mame/drivers/astropc.cpp
index a58eb2335eb..7d190e95660 100644
--- a/src/mame/drivers/astropc.cpp
+++ b/src/mame/drivers/astropc.cpp
@@ -45,7 +45,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( astropc, astropc_state )
+static MACHINE_CONFIG_START( astropc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I486, 40000000 ) // ??
MCFG_CPU_PROGRAM_MAP(astropc_map)
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 5108c8a2b07..e52ed697206 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -816,7 +816,7 @@ WRITE_LINE_MEMBER(asuka_state::screen_vblank_asuka)
}
}
-static MACHINE_CONFIG_START( bonzeadv, asuka_state )
+static MACHINE_CONFIG_START( bonzeadv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* checked on PCB */
@@ -872,7 +872,7 @@ static MACHINE_CONFIG_START( bonzeadv, asuka_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( asuka, asuka_state )
+static MACHINE_CONFIG_START( asuka )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -931,7 +931,7 @@ static MACHINE_CONFIG_START( asuka, asuka_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(asuka_state, asuka_msm5205_vck)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
@@ -942,7 +942,7 @@ static MACHINE_CONFIG_START( asuka, asuka_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cadash, asuka_state )
+static MACHINE_CONFIG_START( cadash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
@@ -1009,7 +1009,7 @@ static MACHINE_CONFIG_START( cadash, asuka_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mofflott, asuka_state )
+static MACHINE_CONFIG_START( mofflott )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
@@ -1068,7 +1068,7 @@ static MACHINE_CONFIG_START( mofflott, asuka_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(asuka_state, asuka_msm5205_vck)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
@@ -1079,7 +1079,7 @@ static MACHINE_CONFIG_START( mofflott, asuka_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( galmedes, asuka_state )
+static MACHINE_CONFIG_START( galmedes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
@@ -1141,7 +1141,7 @@ static MACHINE_CONFIG_START( galmedes, asuka_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( eto, asuka_state )
+static MACHINE_CONFIG_START( eto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz ??? */
@@ -1738,30 +1738,30 @@ DRIVER_INIT_MEMBER(asuka_state, cadash)
m_cadash_int5_timer = timer_alloc(TIMER_CADASH_INTERRUPT5);
}
-GAME( 1988, bonzeadv, 0, bonzeadv, bonzeadv, driver_device, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, Newer)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bonzeadvo, bonzeadv, bonzeadv, bonzeadv, driver_device, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, Older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bonzeadvu, bonzeadv, bonzeadv, jigkmgri, driver_device, 0, ROT0, "Taito America Corporation", "Bonze Adventure (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, jigkmgri, bonzeadv, bonzeadv, jigkmgri, driver_device, 0, ROT0, "Taito Corporation", "Jigoku Meguri (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bonzeadvp, bonzeadv, bonzeadv, jigkmgri, driver_device, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bonzeadv, 0, bonzeadv, bonzeadv, asuka_state, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, Newer)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bonzeadvo, bonzeadv, bonzeadv, bonzeadv, asuka_state, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, Older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bonzeadvu, bonzeadv, bonzeadv, jigkmgri, asuka_state, 0, ROT0, "Taito America Corporation", "Bonze Adventure (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, jigkmgri, bonzeadv, bonzeadv, jigkmgri, asuka_state, 0, ROT0, "Taito Corporation", "Jigoku Meguri (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bonzeadvp, bonzeadv, bonzeadv, jigkmgri, asuka_state, 0, ROT0, "Taito Corporation Japan", "Bonze Adventure (World, prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, asuka, 0, asuka, asuka, driver_device, 0, ROT270, "Taito Corporation", "Asuka & Asuka (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, asukaj, asuka, asuka, asuka, driver_device, 0, ROT270, "Taito Corporation", "Asuka & Asuka (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, asuka, 0, asuka, asuka, asuka_state, 0, ROT270, "Taito Corporation", "Asuka & Asuka (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, asukaj, asuka, asuka, asuka, asuka_state, 0, ROT270, "Taito Corporation", "Asuka & Asuka (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mofflott, 0, mofflott, mofflott, driver_device, 0, ROT270, "Taito Corporation", "Maze of Flott (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mofflott, 0, mofflott, mofflott, asuka_state, 0, ROT270, "Taito Corporation", "Maze of Flott (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cadash, 0, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashj, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashj1, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashjo, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, oldest version)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashu, cadash, cadash, cadashu, asuka_state, cadash, ROT0, "Taito America Corporation", "Cadash (US, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashi, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashf, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (France)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashg, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (Germany, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1989, cadashp, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (World, prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN)
+GAME( 1989, cadash, 0, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (World)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashj, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashj1, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashjo, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation", "Cadash (Japan, oldest version)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashu, cadash, cadash, cadashu, asuka_state, cadash, ROT0, "Taito America Corporation", "Cadash (US, version 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashi, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashf, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (France)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashg, cadash, cadash, cadash, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (Germany, version 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1989, cadashp, cadash, cadash, cadashj, asuka_state, cadash, ROT0, "Taito Corporation Japan", "Cadash (World, prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN)
-GAME( 1992, galmedes, 0, galmedes, galmedes, driver_device, 0, ROT270, "Visco", "Galmedes (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, galmedes, 0, galmedes, galmedes, asuka_state, 0, ROT270, "Visco", "Galmedes (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, earthjkr, 0, galmedes, earthjkr, driver_device, 0, ROT270, "Visco", "U.N. Defense Force: Earth Joker (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, earthjkrp, earthjkr, galmedes, earthjkr, driver_device, 0, ROT270, "Visco", "U.N. Defense Force: Earth Joker (Japan, prototype?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, earthjkr, 0, galmedes, earthjkr, asuka_state, 0, ROT270, "Visco", "U.N. Defense Force: Earth Joker (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, earthjkrp, earthjkr, galmedes, earthjkr, asuka_state, 0, ROT270, "Visco", "U.N. Defense Force: Earth Joker (Japan, prototype?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, eto, 0, eto, eto, driver_device, 0, ROT0, "Visco", "Kokontouzai Eto Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, eto, 0, eto, eto, asuka_state, 0, ROT0, "Visco", "Kokontouzai Eto Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index 2ab4695d0d0..89b339c08d5 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -6,13 +6,13 @@
***************************************************************************/
+#include "emu.h"
+
/* mingw-gcc defines this */
#ifdef i386
#undef i386
#endif /* i386 */
-
-#include "emu.h"
#include "bus/isa/isa_cards.h"
#include "bus/lpci/pci.h"
#include "bus/lpci/vt82c505.h"
@@ -22,10 +22,12 @@
#include "machine/at.h"
#include "machine/cs8221.h"
#include "machine/ds128x.h"
+#include "machine/idectrl.h"
#include "machine/nvram.h"
#include "machine/ram.h"
#include "machine/vt82c496.h"
#include "machine/wd7600.h"
+#include "softlist_dev.h"
#include "speaker.h"
class at_state : public driver_device
@@ -36,7 +38,7 @@ public:
m_maincpu(*this, "maincpu"),
m_mb(*this, "mb"),
m_ram(*this, RAM_TAG)
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<at_mb_device> m_mb;
required_device<ram_device> m_ram;
@@ -61,7 +63,7 @@ public:
m_wd7600(*this, "wd7600"),
m_isabus(*this, "isabus"),
m_speaker(*this, "speaker")
- { }
+ { }
public:
required_device<cpu_device> m_maincpu;
@@ -282,7 +284,7 @@ static SLOT_INTERFACE_START( pci_devices )
SLOT_INTERFACE_INTERNAL("vt82c505", VT82C505)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( ibm5170, at_state )
+static MACHINE_CONFIG_START( ibm5170 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz/2 /*6000000*/)
MCFG_CPU_PROGRAM_MAP(at16_map)
@@ -366,7 +368,7 @@ static MACHINE_CONFIG_DERIVED( k286i, ibm5162 )
MCFG_ISA16_SLOT_ADD("mb:isabus","isa8", pc_isa16_cards, nullptr, false)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( at386, at_state )
+static MACHINE_CONFIG_START( at386 )
MCFG_CPU_ADD("maincpu", I386, 12000000)
MCFG_CPU_PROGRAM_MAP(at32_map)
MCFG_CPU_IO_MAP(at32_io)
@@ -426,7 +428,7 @@ static MACHINE_CONFIG_DERIVED( ct386sx, at386sx )
MCFG_CS8221_ADD("cs8221", "maincpu", "mb:isa", "maincpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( megapc, megapc_state )
+static MACHINE_CONFIG_START( megapc )
MCFG_CPU_ADD("maincpu", I386SX, XTAL_50MHz / 2)
MCFG_CPU_PROGRAM_MAP(megapc_map)
MCFG_CPU_IO_MAP(megapc_io)
@@ -511,7 +513,7 @@ static MACHINE_CONFIG_DERIVED( megapcpl, megapc )
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("wd7600", wd7600_device, intack_cb)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( megapcpla, at_state )
+static MACHINE_CONFIG_START( megapcpla )
MCFG_CPU_ADD("maincpu", I486, 66000000 / 2) // 486SLC
MCFG_CPU_PROGRAM_MAP(at32l_map)
MCFG_CPU_IO_MAP(at32_io)
@@ -545,7 +547,7 @@ static MACHINE_CONFIG_START( megapcpla, at_state )
MCFG_SOFTWARE_LIST_ADD("disk_list","megapc")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ficpio2, at_state )
+static MACHINE_CONFIG_START( ficpio2 )
MCFG_CPU_ADD("maincpu", I486, 25000000)
MCFG_CPU_PROGRAM_MAP(ficpio_map)
MCFG_CPU_IO_MAP(ficpio_io)
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp
index 6ec9f45976a..825c5ef5aae 100644
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@@ -2077,16 +2077,16 @@ WRITE8_MEMBER(a400_state::a800xl_pia_pb_w)
**************************************************************/
-static MACHINE_CONFIG_START( atari_common_nodac, a400_state )
+static MACHINE_CONFIG_START( atari_common_nodac )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
+ MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
MCFG_MACHINE_RESET_OVERRIDE( a400_state, a400 )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1))
- MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
+ MCFG_SCREEN_VISIBLE_AREA_ANTIC()
MCFG_SCREEN_UPDATE_DEVICE("antic", antic_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -2105,7 +2105,7 @@ static MACHINE_CONFIG_START( atari_common_nodac, a400_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("speaker")
- MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
+ MCFG_SOUND_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
MCFG_POKEY_POT0_R_CB(IOPORT("analog_0"))
MCFG_POKEY_POT1_R_CB(IOPORT("analog_1"))
MCFG_POKEY_POT2_R_CB(IOPORT("analog_2"))
@@ -2160,8 +2160,8 @@ static MACHINE_CONFIG_DERIVED( a400, atari_common )
MCFG_MACHINE_START_OVERRIDE( a400_state, a400 )
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MACHINE_CONFIG_END
@@ -2175,8 +2175,8 @@ static MACHINE_CONFIG_DERIVED( a400pal, atari_common )
MCFG_MACHINE_START_OVERRIDE( a400_state, a400 )
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_50HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_50HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ()
+ MCFG_SCREEN_SIZE_ANTIC_50HZ()
MACHINE_CONFIG_END
@@ -2190,8 +2190,8 @@ static MACHINE_CONFIG_DERIVED( a800, atari_common )
MCFG_MACHINE_START_OVERRIDE( a400_state, a800 )
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MCFG_A800_CARTRIDGE_ADD("cartright", a800_right, nullptr)
MACHINE_CONFIG_END
@@ -2207,8 +2207,8 @@ static MACHINE_CONFIG_DERIVED( a800pal, atari_common )
MCFG_MACHINE_START_OVERRIDE( a400_state, a800 )
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_50HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_50HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ()
+ MCFG_SCREEN_SIZE_ANTIC_50HZ()
MCFG_A800_CARTRIDGE_ADD("cartright", a800_right, nullptr)
MACHINE_CONFIG_END
@@ -2227,8 +2227,8 @@ static MACHINE_CONFIG_DERIVED( a600xl, atari_common )
MCFG_MACHINE_START_OVERRIDE( a400_state, a800xl )
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("16K")
@@ -2251,8 +2251,8 @@ static MACHINE_CONFIG_DERIVED( a800xl, atari_common )
MCFG_RAM_DEFAULT_SIZE("64K")
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MACHINE_CONFIG_END
@@ -2263,8 +2263,8 @@ static MACHINE_CONFIG_DERIVED( a800xlpal, a800xl )
MCFG_CPU_CLOCK( 1773000 )
MCFG_SCREEN_MODIFY("screen")
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_50HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_50HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ()
+ MCFG_SCREEN_SIZE_ANTIC_50HZ()
MCFG_SOUND_MODIFY("pokey")
MCFG_SOUND_CLOCK(1773000)
@@ -2335,8 +2335,8 @@ static MACHINE_CONFIG_DERIVED( a5200, atari_common_nodac )
MCFG_MACHINE_START_OVERRIDE( a400_state, a5200 )
MCFG_SCREEN_MODIFY( "screen" )
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MCFG_A5200_CARTRIDGE_ADD("cartleft", a5200_carts, nullptr)
@@ -2461,19 +2461,19 @@ ROM_END
*
**************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1979, a400, 0, 0, a400, a800, driver_device, 0, "Atari", "Atari 400 (NTSC)", 0)
-COMP ( 1979, a400pal, a400, 0, a400pal, a800, driver_device, 0, "Atari", "Atari 400 (PAL)", 0)
-COMP ( 1979, a800, 0, 0, a800, a800, driver_device, 0, "Atari", "Atari 800 (NTSC)", 0)
-COMP ( 1979, a800pal, a800, 0, a800pal, a800, driver_device, 0, "Atari", "Atari 800 (PAL)", 0)
-COMP ( 1982, a1200xl, a800, 0, a1200xl, a800xl, driver_device, 0, "Atari", "Atari 1200XL", MACHINE_NOT_WORKING ) // 64k RAM
-COMP ( 1983, a600xl, a800xl, 0, a600xl, a800xl, driver_device, 0, "Atari", "Atari 600XL", MACHINE_IMPERFECT_GRAPHICS ) // 16k RAM
-COMP ( 1983, a800xl, 0, 0, a800xl, a800xl, driver_device, 0, "Atari", "Atari 800XL (NTSC)", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
-COMP ( 1983, a800xlp, a800xl, 0, a800xlpal, a800xl, driver_device, 0, "Atari", "Atari 800XL (PAL)", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
-COMP ( 1986, a65xe, a800xl, 0, a800xl, a800xl, driver_device, 0, "Atari", "Atari 65XE", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
-COMP ( 1986, a65xea, a800xl, 0, a800xl, a800xl, driver_device, 0, "Atari", "Atari 65XE (Arabic)", MACHINE_NOT_WORKING )
-COMP ( 1986, a130xe, a800xl, 0, a130xe, a800xl, driver_device, 0, "Atari", "Atari 130XE", MACHINE_NOT_WORKING ) // 128k RAM
-COMP ( 1986, a800xe, a800xl, 0, a800xl, a800xl, driver_device, 0, "Atari", "Atari 800XE", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
-COMP ( 1987, xegs, 0, 0, xegs, a800xl, driver_device, 0, "Atari", "Atari XE Game System", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
-
-CONS ( 1982, a5200, 0, 0, a5200, a5200, driver_device, 0, "Atari", "Atari 5200", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP ( 1979, a400, 0, 0, a400, a800, a400_state, 0, "Atari", "Atari 400 (NTSC)", 0)
+COMP ( 1979, a400pal, a400, 0, a400pal, a800, a400_state, 0, "Atari", "Atari 400 (PAL)", 0)
+COMP ( 1979, a800, 0, 0, a800, a800, a400_state, 0, "Atari", "Atari 800 (NTSC)", 0)
+COMP ( 1979, a800pal, a800, 0, a800pal, a800, a400_state, 0, "Atari", "Atari 800 (PAL)", 0)
+COMP ( 1982, a1200xl, a800, 0, a1200xl, a800xl, a400_state, 0, "Atari", "Atari 1200XL", MACHINE_NOT_WORKING ) // 64k RAM
+COMP ( 1983, a600xl, a800xl, 0, a600xl, a800xl, a400_state, 0, "Atari", "Atari 600XL", MACHINE_IMPERFECT_GRAPHICS ) // 16k RAM
+COMP ( 1983, a800xl, 0, 0, a800xl, a800xl, a400_state, 0, "Atari", "Atari 800XL (NTSC)", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
+COMP ( 1983, a800xlp, a800xl, 0, a800xlpal, a800xl, a400_state, 0, "Atari", "Atari 800XL (PAL)", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
+COMP ( 1986, a65xe, a800xl, 0, a800xl, a800xl, a400_state, 0, "Atari", "Atari 65XE", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
+COMP ( 1986, a65xea, a800xl, 0, a800xl, a800xl, a400_state, 0, "Atari", "Atari 65XE (Arabic)", MACHINE_NOT_WORKING )
+COMP ( 1986, a130xe, a800xl, 0, a130xe, a800xl, a400_state, 0, "Atari", "Atari 130XE", MACHINE_NOT_WORKING ) // 128k RAM
+COMP ( 1986, a800xe, a800xl, 0, a800xl, a800xl, a400_state, 0, "Atari", "Atari 800XE", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
+COMP ( 1987, xegs, 0, 0, xegs, a800xl, a400_state, 0, "Atari", "Atari XE Game System", MACHINE_IMPERFECT_GRAPHICS ) // 64k RAM
+
+CONS ( 1982, a5200, 0, 0, a5200, a5200, a400_state, 0, "Atari", "Atari 5200", 0)
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 17b7542c5f9..5b5827d00c3 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -435,7 +435,7 @@ void atari_s1_state::machine_reset()
m_audiores = 0;
}
-static MACHINE_CONFIG_START( atari_s1, atari_s1_state )
+static MACHINE_CONFIG_START( atari_s1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, MASTER_CLK)
MCFG_CPU_PROGRAM_MAP(atari_s1_map)
@@ -528,8 +528,8 @@ ROM_START(spcrider)
ROM_END
-GAME( 1976, atarians, 0, atarians, atari_s1, driver_device, 0, ROT0, "Atari", "The Atarians", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1977, time2000, 0, atari_s1, atari_s1, driver_device, 0, ROT0, "Atari", "Time 2000", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1977, aavenger, 0, atari_s1, atari_s1, driver_device, 0, ROT0, "Atari", "Airborne Avenger", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1978, midearth, 0, midearth, atari_s1, driver_device, 0, ROT0, "Atari", "Middle Earth", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1978, spcrider, 0, atari_s1, atari_s1, driver_device, 0, ROT0, "Atari", "Space Riders", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1976, atarians, 0, atarians, atari_s1, atari_s1_state, 0, ROT0, "Atari", "The Atarians", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1977, time2000, 0, atari_s1, atari_s1, atari_s1_state, 0, ROT0, "Atari", "Time 2000", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1977, aavenger, 0, atari_s1, atari_s1, atari_s1_state, 0, ROT0, "Atari", "Airborne Avenger", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1978, midearth, 0, midearth, atari_s1, atari_s1_state, 0, ROT0, "Atari", "Middle Earth", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1978, spcrider, 0, atari_s1, atari_s1, atari_s1_state, 0, ROT0, "Atari", "Space Riders", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 9c73c3f77d0..daaae16c926 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -464,7 +464,7 @@ void atari_s2_state::machine_reset()
}
-static MACHINE_CONFIG_START( atari_s2, atari_s2_state )
+static MACHINE_CONFIG_START( atari_s2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4)
MCFG_CPU_PROGRAM_MAP(atari_s2_map)
@@ -547,7 +547,7 @@ ROM_START(fourx4)
ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b))
ROM_END
-GAME( 1979, supermap, 0, atari_s2, atari_s2, driver_device, 0, ROT0, "Atari", "Superman (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1979, hercules, 0, atari_s2, atari_s2, driver_device, 0, ROT0, "Atari", "Hercules", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1979, roadrunr, 0, atari_s3, atari_s2, driver_device, 0, ROT0, "Atari", "Road Runner", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1982, fourx4, 0, atari_s3, atari_s2, driver_device, 0, ROT0, "Atari", "4x4", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, supermap, 0, atari_s2, atari_s2, atari_s2_state, 0, ROT0, "Atari", "Superman (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1979, hercules, 0, atari_s2, atari_s2, atari_s2_state, 0, ROT0, "Atari", "Hercules", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1979, roadrunr, 0, atari_s3, atari_s2, atari_s2_state, 0, ROT0, "Atari", "Road Runner", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1982, fourx4, 0, atari_s3, atari_s2, atari_s2_state, 0, ROT0, "Atari", "4x4", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp
index f4974d239a1..e6d2468ae2c 100644
--- a/src/mame/drivers/atarifb.cpp
+++ b/src/mame/drivers/atarifb.cpp
@@ -550,7 +550,7 @@ void atarifb_state::machine_reset()
m_counter_y_in2b = 0;
}
-static MACHINE_CONFIG_START( atarifb, atarifb_state )
+static MACHINE_CONFIG_START( atarifb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 750000)
@@ -790,10 +790,10 @@ ROM_END
*************************************/
/* YEAR NAME PARENT MACHINE INPUT */
-GAMEL( 1978, atarifb, 0, atarifb, atarifb, driver_device, 0, ROT0, "Atari", "Atari Football (revision 2)", MACHINE_SUPPORTS_SAVE, layout_atarifb )
-GAMEL( 1978, atarifb1, atarifb, atarifb, atarifb, driver_device, 0, ROT0, "Atari", "Atari Football (revision 1)", MACHINE_SUPPORTS_SAVE, layout_atarifb )
-GAMEL( 1978, atarifb2, atarifb, atarifb, atarifb, driver_device, 0, ROT0, "Atari", "Atari Football II", MACHINE_SUPPORTS_SAVE, layout_atarifb )
-GAMEL( 1979, atarifb4, atarifb, atarifb4, atarifb4, driver_device, 0, ROT0, "Atari", "Atari Football (4 players)", MACHINE_SUPPORTS_SAVE, layout_atarifb4 )
-GAMEL( 1979, abaseb, 0, abaseb, abaseb, driver_device, 0, ROT0, "Atari", "Atari Baseball (set 1)", MACHINE_SUPPORTS_SAVE, layout_abaseb )
-GAMEL( 1979, abaseb2, abaseb, abaseb, abaseb, driver_device, 0, ROT0, "Atari", "Atari Baseball (set 2)", MACHINE_SUPPORTS_SAVE, layout_abaseb )
-GAME ( 1980, soccer, 0, soccer, soccer, driver_device, 0, ROT0, "Atari", "Atari Soccer", MACHINE_SUPPORTS_SAVE )
+GAMEL( 1978, atarifb, 0, atarifb, atarifb, atarifb_state, 0, ROT0, "Atari", "Atari Football (revision 2)", MACHINE_SUPPORTS_SAVE, layout_atarifb )
+GAMEL( 1978, atarifb1, atarifb, atarifb, atarifb, atarifb_state, 0, ROT0, "Atari", "Atari Football (revision 1)", MACHINE_SUPPORTS_SAVE, layout_atarifb )
+GAMEL( 1978, atarifb2, atarifb, atarifb, atarifb, atarifb_state, 0, ROT0, "Atari", "Atari Football II", MACHINE_SUPPORTS_SAVE, layout_atarifb )
+GAMEL( 1979, atarifb4, atarifb, atarifb4, atarifb4, atarifb_state, 0, ROT0, "Atari", "Atari Football (4 players)", MACHINE_SUPPORTS_SAVE, layout_atarifb4 )
+GAMEL( 1979, abaseb, 0, abaseb, abaseb, atarifb_state, 0, ROT0, "Atari", "Atari Baseball (set 1)", MACHINE_SUPPORTS_SAVE, layout_abaseb )
+GAMEL( 1979, abaseb2, abaseb, abaseb, abaseb, atarifb_state, 0, ROT0, "Atari", "Atari Baseball (set 2)", MACHINE_SUPPORTS_SAVE, layout_abaseb )
+GAME ( 1980, soccer, 0, soccer, soccer, atarifb_state, 0, ROT0, "Atari", "Atari Soccer", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index 2cb0c189ce4..3e18b3dec66 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -423,7 +423,7 @@ static const atari_rle_objects_config modesc_pitfight =
*
*************************************/
-static MACHINE_CONFIG_START( atarig1, atarig1_state )
+static MACHINE_CONFIG_START( atarig1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
@@ -1315,9 +1315,9 @@ DRIVER_INIT_MEMBER(atarig1_state,pitfightb)
*
*************************************/
-GAME( 1990, hydra, 0, hydra, hydra, atarig1_state, hydra, ROT0, "Atari Games", "Hydra", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hydrap, hydra, hydrap, hydra, atarig1_state, hydrap, ROT0, "Atari Games", "Hydra (prototype 5/14/90)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hydrap2, hydra, hydrap, hydra, atarig1_state, hydrap, ROT0, "Atari Games", "Hydra (prototype 5/25/90)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hydra, 0, hydra, hydra, atarig1_state, hydra, ROT0, "Atari Games", "Hydra", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hydrap, hydra, hydrap, hydra, atarig1_state, hydrap, ROT0, "Atari Games", "Hydra (prototype 5/14/90)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hydrap2, hydra, hydrap, hydra, atarig1_state, hydrap, ROT0, "Atari Games", "Hydra (prototype 5/25/90)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, pitfight, 0, pitfight9, pitfight, atarig1_state, pitfight, ROT0, "Atari Games", "Pit Fighter (rev 9)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, pitfight7, pitfight, pitfight7, pitfight, atarig1_state, pitfight, ROT0, "Atari Games", "Pit Fighter (rev 7)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 4bf18c78daf..3dfb46e04db 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -521,7 +521,7 @@ static const atari_rle_objects_config modesc_0x400 =
*
*************************************/
-static MACHINE_CONFIG_START( atarig42, atarig42_state )
+static MACHINE_CONFIG_START( atarig42 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index e21ff4c0dab..2a6a248b72d 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -53,11 +53,10 @@
#include "emu.h"
-#include "machine/atarigen.h"
-#include "video/atarirle.h"
-#include "cpu/m68000/m68000.h"
#include "includes/atarigt.h"
+#include "cpu/m68000/m68000.h"
+
#define LOG_PROTECTION (0)
#define HACK_TMEK_CONTROLS (0)
@@ -800,7 +799,7 @@ static const atari_rle_objects_config modesc =
*
*************************************/
-static MACHINE_CONFIG_START( atarigt, atarigt_state )
+static MACHINE_CONFIG_START( atarigt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_50MHz/2)
@@ -1331,10 +1330,10 @@ DRIVER_INIT_MEMBER(atarigt_state,primrage)
*
*************************************/
-GAME( 1994, tmek, 0, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, The Warlords)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, tmek51p, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, prototype)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, tmek45, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.5)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, tmek44, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.4)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, tmek20, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v2.0, prototype)", 0 )
-GAME( 1994, primrage, 0, primrage, primrage, atarigt_state, primrage, ROT0, "Atari Games", "Primal Rage (version 2.3)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, tmek, 0, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, The Warlords)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, tmek51p, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v5.1, prototype)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, tmek45, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.5)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, tmek44, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v4.4)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, tmek20, tmek, tmek, tmek, atarigt_state, tmek, ROT0, "Atari Games", "T-MEK (v2.0, prototype)", 0 )
+GAME( 1994, primrage, 0, primrage, primrage, atarigt_state, primrage, ROT0, "Atari Games", "Primal Rage (version 2.3)", MACHINE_UNEMULATED_PROTECTION )
GAME( 1994, primrage20, primrage, primrage20,primrage, atarigt_state, primrage, ROT0, "Atari Games", "Primal Rage (version 2.0)", MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp
index 59976ccdc3e..2320667e3b0 100644
--- a/src/mame/drivers/atarigx2.cpp
+++ b/src/mame/drivers/atarigx2.cpp
@@ -26,6 +26,7 @@
#include "emu.h"
#include "includes/atarigx2.h"
+
#include "cpu/m68000/m68000.h"
#include "speaker.h"
@@ -1492,7 +1493,7 @@ static const atari_rle_objects_config modesc_0x400 =
*
*************************************/
-static MACHINE_CONFIG_START( atarigx2, atarigx2_state )
+static MACHINE_CONFIG_START( atarigx2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, ATARI_CLOCK_14MHz)
@@ -2302,16 +2303,16 @@ DRIVER_INIT_MEMBER(atarigx2_state,rrreveng)
*
*************************************/
-GAME( 1992, spclords, 0, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev C)", 0 )
-GAME( 1992, spclordsb, spclords, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev B)", 0 )
-GAME( 1992, spclordsg, spclords, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev A, German)", 0 )
-GAME( 1992, spclordsa, spclords, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev A)", 0 )
+GAME( 1992, spclords, 0, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev C)", 0 )
+GAME( 1992, spclordsb, spclords, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev B)", 0 )
+GAME( 1992, spclordsg, spclords, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev A, German)", 0 )
+GAME( 1992, spclordsa, spclords, atarigx2_0x400, spclords, atarigx2_state, spclords, ROT0, "Atari Games", "Space Lords (rev A)", 0 )
GAME( 1992, motofren, 0, atarigx2_0x200, motofren, atarigx2_state, motofren, ROT0, "Atari Games", "Moto Frenzy", 0 )
GAME( 1992, motofrenmd, motofren, atarigx2_0x200, motofren, atarigx2_state, motofren, ROT0, "Atari Games", "Moto Frenzy (Mini Deluxe)", 0 )
GAME( 1992, motofrenft, motofren, atarigx2_0x200, motofren, atarigx2_state, motofren, ROT0, "Atari Games", "Moto Frenzy (Field Test Version)", 0 )
GAME( 1992, motofrenmf, motofren, atarigx2_0x200, motofren, atarigx2_state, motofren, ROT0, "Atari Games", "Moto Frenzy (Mini Deluxe Field Test Version)", 0 )
-GAME( 1993, rrreveng, 0, atarigx2_0x400, rrreveng, atarigx2_state, rrreveng, ROT0, "Atari Games", "Road Riot's Revenge (prototype, Sep 06, 1994)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1993, rrrevenga, rrreveng, atarigx2_0x400, rrreveng, atarigx2_state, rrreveng, ROT0, "Atari Games", "Road Riot's Revenge (prototype, Jan 27, 1994, set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1993, rrrevengb, rrreveng, atarigx2_0x400, rrreveng, atarigx2_state, rrreveng, ROT0, "Atari Games", "Road Riot's Revenge (prototype, Jan 27, 1994, set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1993, rrreveng, 0, atarigx2_0x400, rrreveng, atarigx2_state, rrreveng, ROT0, "Atari Games", "Road Riot's Revenge (prototype, Sep 06, 1994)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1993, rrrevenga, rrreveng, atarigx2_0x400, rrreveng, atarigx2_state, rrreveng, ROT0, "Atari Games", "Road Riot's Revenge (prototype, Jan 27, 1994, set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1993, rrrevengb, rrreveng, atarigx2_0x400, rrreveng, atarigx2_state, rrreveng, ROT0, "Atari Games", "Road Riot's Revenge (prototype, Jan 27, 1994, set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index c79028441ef..229e0af6565 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -2076,7 +2076,7 @@ SLOT_INTERFACE_END
// MACHINE_CONFIG( st )
//-------------------------------------------------
-static MACHINE_CONFIG_START( st, st_state )
+static MACHINE_CONFIG_START( st )
// basic machine hardware
MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4)
MCFG_CPU_PROGRAM_MAP(st_map)
@@ -2166,7 +2166,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( megast )
//-------------------------------------------------
-static MACHINE_CONFIG_START( megast, megast_state )
+static MACHINE_CONFIG_START( megast )
// basic machine hardware
MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4)
MCFG_CPU_PROGRAM_MAP(megast_map)
@@ -2257,7 +2257,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( ste )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ste, ste_state )
+static MACHINE_CONFIG_START( ste )
// basic machine hardware
MCFG_CPU_ADD(M68000_TAG, M68000, Y2/4)
MCFG_CPU_PROGRAM_MAP(ste_map)
@@ -2372,7 +2372,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( stbook )
//-------------------------------------------------
#if 0
-static MACHINE_CONFIG_START( stbook, stbook_state )
+static MACHINE_CONFIG_START( stbook )
// basic machine hardware
MCFG_CPU_ADD(M68000_TAG, M68000, U517/2)
MCFG_CPU_PROGRAM_MAP(stbook_map)
@@ -3211,44 +3211,44 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1985, st, 0, 0, st, st, driver_device, 0, "Atari", "ST (USA)", MACHINE_NOT_WORKING )
-COMP( 1985, st_uk, st, 0, st, st, driver_device, 0, "Atari", "ST (UK)", MACHINE_NOT_WORKING )
-COMP( 1985, st_de, st, 0, st, st, driver_device, 0, "Atari", "ST (Germany)", MACHINE_NOT_WORKING )
-COMP( 1985, st_es, st, 0, st, st, driver_device, 0, "Atari", "ST (Spain)", MACHINE_NOT_WORKING )
-COMP( 1985, st_fr, st, 0, st, st, driver_device, 0, "Atari", "ST (France)", MACHINE_NOT_WORKING )
-COMP( 1985, st_nl, st, 0, st, st, driver_device, 0, "Atari", "ST (Netherlands)", MACHINE_NOT_WORKING )
-COMP( 1985, st_se, st, 0, st, st, driver_device, 0, "Atari", "ST (Sweden)", MACHINE_NOT_WORKING )
-COMP( 1985, st_sg, st, 0, st, st, driver_device, 0, "Atari", "ST (Switzerland)", MACHINE_NOT_WORKING )
-COMP( 1987, megast, st, 0, megast, st, driver_device, 0, "Atari", "MEGA ST (USA)", MACHINE_NOT_WORKING )
-COMP( 1987, megast_uk, st, 0, megast, st, driver_device, 0, "Atari", "MEGA ST (UK)", MACHINE_NOT_WORKING )
-COMP( 1987, megast_de, st, 0, megast, st, driver_device, 0, "Atari", "MEGA ST (Germany)", MACHINE_NOT_WORKING )
-COMP( 1987, megast_fr, st, 0, megast, st, driver_device, 0, "Atari", "MEGA ST (France)", MACHINE_NOT_WORKING )
-COMP( 1987, megast_se, st, 0, megast, st, driver_device, 0, "Atari", "MEGA ST (Sweden)", MACHINE_NOT_WORKING )
-COMP( 1987, megast_sg, st, 0, megast, st, driver_device, 0, "Atari", "MEGA ST (Switzerland)",MACHINE_NOT_WORKING )
-COMP( 1989, ste, 0, 0, ste, ste, driver_device, 0, "Atari", "STE (USA)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_uk, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (UK)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_de, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (Germany)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_es, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (Spain)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_fr, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (France)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_it, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (Italy)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_se, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (Sweden)", MACHINE_NOT_WORKING )
-COMP( 1989, ste_sg, ste, 0, ste, ste, driver_device, 0, "Atari", "STE (Switzerland)", MACHINE_NOT_WORKING )
-//COMP( 1990, stbook, ste, 0, stbook, stbook, driver_device, 0, "Atari", "STBook", MACHINE_NOT_WORKING )
-COMP( 1990, tt030, 0, 0, tt030, tt030, driver_device, 0, "Atari", "TT030 (USA)", MACHINE_NOT_WORKING )
-COMP( 1990, tt030_uk, tt030, 0, tt030, tt030, driver_device, 0, "Atari", "TT030 (UK)", MACHINE_NOT_WORKING )
-COMP( 1990, tt030_de, tt030, 0, tt030, tt030, driver_device, 0, "Atari", "TT030 (Germany)", MACHINE_NOT_WORKING )
-COMP( 1990, tt030_fr, tt030, 0, tt030, tt030, driver_device, 0, "Atari", "TT030 (France)", MACHINE_NOT_WORKING )
-COMP( 1990, tt030_pl, tt030, 0, tt030, tt030, driver_device, 0, "Atari", "TT030 (Poland)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (USA)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste_uk, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (UK)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste_de, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (Germany)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste_es, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (Spain)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste_fr, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (France)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste_it, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (Italy)", MACHINE_NOT_WORKING )
-COMP( 1991, megaste_se, ste, 0, megaste, st, driver_device, 0, "Atari", "MEGA STE (Sweden)", MACHINE_NOT_WORKING )
-COMP( 1992, falcon30, 0, 0, falcon, falcon, driver_device, 0, "Atari", "Falcon030", MACHINE_NOT_WORKING )
-COMP( 1992, falcon40, falcon30, 0, falcon40, falcon, driver_device, 0, "Atari", "Falcon040 (prototype)",MACHINE_NOT_WORKING )
-//COMP( 1989, stacy, st, 0, stacy, stacy, driver_device, 0, "Atari", "Stacy", MACHINE_NOT_WORKING )
-//COMP( 1991, stpad, ste, 0, stpad, stpad, driver_device, 0, "Atari", "STPad (prototype)", MACHINE_NOT_WORKING )
-//COMP( 1992, fx1, 0, 0, falcon, falcon, driver_device, 0, "Atari", "FX-1 (prototype)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, st, 0, 0, st, st, st_state, 0, "Atari", "ST (USA)", MACHINE_NOT_WORKING )
+COMP( 1985, st_uk, st, 0, st, st, st_state, 0, "Atari", "ST (UK)", MACHINE_NOT_WORKING )
+COMP( 1985, st_de, st, 0, st, st, st_state, 0, "Atari", "ST (Germany)", MACHINE_NOT_WORKING )
+COMP( 1985, st_es, st, 0, st, st, st_state, 0, "Atari", "ST (Spain)", MACHINE_NOT_WORKING )
+COMP( 1985, st_fr, st, 0, st, st, st_state, 0, "Atari", "ST (France)", MACHINE_NOT_WORKING )
+COMP( 1985, st_nl, st, 0, st, st, st_state, 0, "Atari", "ST (Netherlands)", MACHINE_NOT_WORKING )
+COMP( 1985, st_se, st, 0, st, st, st_state, 0, "Atari", "ST (Sweden)", MACHINE_NOT_WORKING )
+COMP( 1985, st_sg, st, 0, st, st, st_state, 0, "Atari", "ST (Switzerland)", MACHINE_NOT_WORKING )
+COMP( 1987, megast, st, 0, megast, st, megast_state, 0, "Atari", "MEGA ST (USA)", MACHINE_NOT_WORKING )
+COMP( 1987, megast_uk, st, 0, megast, st, megast_state, 0, "Atari", "MEGA ST (UK)", MACHINE_NOT_WORKING )
+COMP( 1987, megast_de, st, 0, megast, st, megast_state, 0, "Atari", "MEGA ST (Germany)", MACHINE_NOT_WORKING )
+COMP( 1987, megast_fr, st, 0, megast, st, megast_state, 0, "Atari", "MEGA ST (France)", MACHINE_NOT_WORKING )
+COMP( 1987, megast_se, st, 0, megast, st, megast_state, 0, "Atari", "MEGA ST (Sweden)", MACHINE_NOT_WORKING )
+COMP( 1987, megast_sg, st, 0, megast, st, megast_state, 0, "Atari", "MEGA ST (Switzerland)",MACHINE_NOT_WORKING )
+COMP( 1989, ste, 0, 0, ste, ste, ste_state, 0, "Atari", "STE (USA)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_uk, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (UK)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_de, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (Germany)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_es, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (Spain)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_fr, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (France)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_it, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (Italy)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_se, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (Sweden)", MACHINE_NOT_WORKING )
+COMP( 1989, ste_sg, ste, 0, ste, ste, ste_state, 0, "Atari", "STE (Switzerland)", MACHINE_NOT_WORKING )
+//COMP( 1990, stbook, ste, 0, stbook, stbook, stbook_state, 0, "Atari", "STBook", MACHINE_NOT_WORKING )
+COMP( 1990, tt030, 0, 0, tt030, tt030, ste_state, 0, "Atari", "TT030 (USA)", MACHINE_NOT_WORKING )
+COMP( 1990, tt030_uk, tt030, 0, tt030, tt030, ste_state, 0, "Atari", "TT030 (UK)", MACHINE_NOT_WORKING )
+COMP( 1990, tt030_de, tt030, 0, tt030, tt030, ste_state, 0, "Atari", "TT030 (Germany)", MACHINE_NOT_WORKING )
+COMP( 1990, tt030_fr, tt030, 0, tt030, tt030, ste_state, 0, "Atari", "TT030 (France)", MACHINE_NOT_WORKING )
+COMP( 1990, tt030_pl, tt030, 0, tt030, tt030, ste_state, 0, "Atari", "TT030 (Poland)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (USA)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste_uk, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (UK)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste_de, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (Germany)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste_es, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (Spain)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste_fr, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (France)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste_it, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (Italy)", MACHINE_NOT_WORKING )
+COMP( 1991, megaste_se, ste, 0, megaste, st, megaste_state, 0, "Atari", "MEGA STE (Sweden)", MACHINE_NOT_WORKING )
+COMP( 1992, falcon30, 0, 0, falcon, falcon, ste_state, 0, "Atari", "Falcon030", MACHINE_NOT_WORKING )
+COMP( 1992, falcon40, falcon30, 0, falcon40, falcon, ste_state, 0, "Atari", "Falcon040 (prototype)",MACHINE_NOT_WORKING )
+//COMP( 1989, stacy, st, 0, stacy, stacy, st_state, 0, "Atari", "Stacy", MACHINE_NOT_WORKING )
+//COMP( 1991, stpad, ste, 0, stpad, stpad, st_state, 0, "Atari", "STPad (prototype)", MACHINE_NOT_WORKING )
+//COMP( 1992, fx1, 0, 0, falcon, falcon, ste_state, 0, "Atari", "FX-1 (prototype)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index 6a2401f2a97..199d8fbe609 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -708,7 +708,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( atarisy1, atarisy1_state )
+static MACHINE_CONFIG_START( atarisy1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
@@ -2481,26 +2481,26 @@ DRIVER_INIT_MEMBER(atarisy1_state,roadblst)
*
*************************************/
-GAME( 1984, atarisy1, 0, peterpak, peterpak, atarisy1_state, peterpak, ROT0, "Atari Games", "Atari System 1 BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 1984, atarisy1, 0, peterpak, peterpak, atarisy1_state, peterpak, ROT0, "Atari Games", "Atari System 1 BIOS", MACHINE_IS_BIOS_ROOT )
-GAME( 1984, marble, atarisy1, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 1)", 0 )
-GAME( 1984, marble2, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 2)", 0 )
-GAME( 1984, marble3, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 3)", 0 )
-GAME( 1984, marble4, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 4)", 0 )
-GAME( 1984, marble5, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 5 - LSI Cartridge)", 0 )
+GAME( 1984, marble, atarisy1, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 1)", 0 )
+GAME( 1984, marble2, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 2)", 0 )
+GAME( 1984, marble3, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 3)", 0 )
+GAME( 1984, marble4, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 4)", 0 )
+GAME( 1984, marble5, marble, marble, marble, atarisy1_state, marble, ROT0, "Atari Games", "Marble Madness (set 5 - LSI Cartridge)", 0 )
-GAME( 1984, peterpak, atarisy1, peterpak, peterpak, atarisy1_state, peterpak, ROT0, "Atari Games", "Peter Pack Rat", 0 )
+GAME( 1984, peterpak, atarisy1, peterpak, peterpak, atarisy1_state, peterpak, ROT0, "Atari Games", "Peter Pack Rat", 0 )
-GAME( 1985, indytemp, atarisy1, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 1)", 0 )
-GAME( 1985, indytemp2,indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 2)", 0 )
-GAME( 1985, indytemp3,indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 3)", 0 )
-GAME( 1985, indytemp4,indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 4)", 0 )
-GAME( 1985, indytempd,indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (German)", 0 )
-GAME( 1985, indytempc,indytemp, indytemp, indytemc, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (Cocktail)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1985, indytemp, atarisy1, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 1)", 0 )
+GAME( 1985, indytemp2, indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 2)", 0 )
+GAME( 1985, indytemp3, indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 3)", 0 )
+GAME( 1985, indytemp4, indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (set 4)", 0 )
+GAME( 1985, indytempd, indytemp, indytemp, indytemp, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (German)", 0 )
+GAME( 1985, indytempc, indytemp, indytemp, indytemc, atarisy1_state, indytemp, ROT0, "Atari Games", "Indiana Jones and the Temple of Doom (Cocktail)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1985, roadrunn, atarisy1, roadrunn, roadrunn, atarisy1_state, roadrunn, ROT0, "Atari Games", "Road Runner (rev 2)", 0 )
-GAME( 1985, roadrunn2,roadrunn, roadrunn, roadrunn, atarisy1_state, roadrunn, ROT0, "Atari Games", "Road Runner (rev 1+)", 0 )
-GAME( 1985, roadrunn1,roadrunn, roadrunn, roadrunn, atarisy1_state, roadrunn, ROT0, "Atari Games", "Road Runner (rev 1)", 0 )
+GAME( 1985, roadrunn, atarisy1, roadrunn, roadrunn, atarisy1_state, roadrunn, ROT0, "Atari Games", "Road Runner (rev 2)", 0 )
+GAME( 1985, roadrunn2, roadrunn, roadrunn, roadrunn, atarisy1_state, roadrunn, ROT0, "Atari Games", "Road Runner (rev 1+)", 0 )
+GAME( 1985, roadrunn1, roadrunn, roadrunn, roadrunn, atarisy1_state, roadrunn, ROT0, "Atari Games", "Road Runner (rev 1)", 0 )
GAME( 1987, roadblst, atarisy1, roadb110, roadblst, atarisy1_state, roadblst, ROT0, "Atari Games", "Road Blasters (upright, rev 4)", 0 )
GAME( 1987, roadblstg, roadblst, roadb109, roadblst, atarisy1_state, roadblst, ROT0, "Atari Games", "Road Blasters (upright, German, rev 3)", 0 )
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 504dc4d9e52..9d5c0fbed58 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -1183,7 +1183,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( atarisy2, atarisy2_state )
+static MACHINE_CONFIG_START( atarisy2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", T11, MASTER_CLOCK/2)
@@ -3230,40 +3230,40 @@ DRIVER_INIT_MEMBER(atarisy2_state,apb)
*
*************************************/
-GAME( 1984, paperboy, 0, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, paperboyr2,paperboy, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, paperboyr1,paperboy, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 1)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1986, 720, 0, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, 720r3, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, 720r2, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, 720r1, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, 720g, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, 720gr1, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 1)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1986, ssprint, 0, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ssprint3, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ssprint1, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ssprintg, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (German, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ssprintg1,ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (German, rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ssprintf, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (French)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ssprints, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (Spanish)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1986, csprint, 0, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprint2, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprint1, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprintg, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (German, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprintg1,csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (German, rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprintf, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (French)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprints, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (Spanish, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, csprints1,csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (Spanish, rev 1)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1987, apb, 0, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 7)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apb6, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 6)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apb5, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apb4, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apb3, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apb2, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apb1, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apbg, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (German)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, apbf, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (French)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paperboy, 0, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paperboyr2,paperboy, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paperboyr1,paperboy, paperboy, paperboy, atarisy2_state, paperboy, ROT0, "Atari Games", "Paperboy (rev 1)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1986, 720, 0, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, 720r3, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, 720r2, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, 720r1, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, 720g, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, 720gr1, 720, 720, 720, atarisy2_state, 720, ROT0, "Atari Games", "720 Degrees (German, rev 1)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1986, ssprint, 0, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ssprint3, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ssprint1, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ssprintg, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (German, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ssprintg1,ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (German, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ssprintf, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (French)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ssprints, ssprint, ssprint, ssprint, atarisy2_state, ssprint, ROT0, "Atari Games", "Super Sprint (Spanish)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1986, csprint, 0, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprint2, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprint1, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprintg, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (German, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprintg1,csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (German, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprintf, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (French)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprints, csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (Spanish, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, csprints1,csprint, csprint, csprint, atarisy2_state, csprint, ROT0, "Atari Games", "Championship Sprint (Spanish, rev 1)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1987, apb, 0, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 7)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apb6, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 6)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apb5, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apb4, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apb3, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apb2, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apb1, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apbg, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (German)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, apbf, apb, apb, apb, atarisy2_state, apb, ROT270, "Atari Games", "APB - All Points Bulletin (French)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp
index f9cd66b4a72..d9e9f9a3d6e 100644
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@@ -175,7 +175,7 @@ struct gpu_
*************************************/
atarisy4_renderer::atarisy4_renderer(atarisy4_state &state, screen_device &screen)
- : poly_manager<float, atarisy4_polydata, 2, 8192>(screen, POLYFLAG_NO_WORK_QUEUE),
+ : poly_manager<float, atarisy4_polydata, 2, 8192>(screen, FLAG_NO_WORK_QUEUE),
m_state(state)
{
}
@@ -757,7 +757,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( atarisy4, atarisy4_state )
+static MACHINE_CONFIG_START( atarisy4 )
MCFG_CPU_ADD("maincpu", M68000, 8000000)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", atarisy4_state, vblank_int)
diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp
index 924aec9995e..e85e2e2c76a 100644
--- a/src/mame/drivers/atarittl.cpp
+++ b/src/mame/drivers/atarittl.cpp
@@ -114,7 +114,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -170,7 +170,7 @@ protected:
virtual void machine_reset() override;
private:
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
//required_device<fixedfreq_device> m_video;
required_device<screen_device> m_probe_screen;
@@ -306,7 +306,7 @@ uint32_t stuntcyc_state::screen_update_stuntcyc(screen_device &screen, bitmap_rg
return 0;
}
-static MACHINE_CONFIG_START( atarikee, atarikee_state )
+static MACHINE_CONFIG_START( atarikee )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
MCFG_NETLIST_SETUP(atarikee)
@@ -323,7 +323,7 @@ MACHINE_CONFIG_END
//#define STUNTCYC_NL_CLOCK (14318181*69)
#define STUNTCYC_NL_CLOCK (SC_HTOTAL*SC_VTOTAL*60*140)
-static MACHINE_CONFIG_START( stuntcyc, stuntcyc_state )
+static MACHINE_CONFIG_START( stuntcyc )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, STUNTCYC_NL_CLOCK)
MCFG_NETLIST_SETUP(stuntcyc)
@@ -630,39 +630,39 @@ ROM_END
*/
-GAME(1975, antiairc, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Anti-Aircraft [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, crashnsc, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Crash 'n Score/Stock Car [TTL]", MACHINE_IS_SKELETON)
-GAME(1976, indy4, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Indy 4 [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, indy800, 0, atarikee, 0, driver_device, 0, ROT90, "Atari/Kee", "Indy 800 [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, jetfight, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Jet Fighter/Jet Fighter Cocktail/Launch Aircraft (set 1) [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, jetfighta, jetfight, atarikee, 0, driver_device, 0, ROT0, "Atari", "Jet Fighter/Jet Fighter Cocktail/Launch Aircraft (set 2) [TTL]", MACHINE_IS_SKELETON)
-GAME(1976, outlaw, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Outlaw [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, sharkjaw, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Horror Games", "Shark JAWS [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, steeplec, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Steeplechase [TTL]", MACHINE_IS_SKELETON)
-GAME(1976, stuntcyc, 0, stuntcyc, 0, driver_device, 0, ROT0, "Atari", "Stunt Cycle [TTL]", MACHINE_IS_SKELETON)
-GAME(1974, tank, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Tank/Tank Cocktail [TTL]", MACHINE_IS_SKELETON)
-GAME(1975, tankii, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Tank II [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, antiairc, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Anti-Aircraft [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, crashnsc, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Crash 'n Score/Stock Car [TTL]", MACHINE_IS_SKELETON)
+GAME(1976, indy4, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Indy 4 [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, indy800, 0, atarikee, 0, atarikee_state, 0, ROT90, "Atari/Kee", "Indy 800 [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, jetfight, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Jet Fighter/Jet Fighter Cocktail/Launch Aircraft (set 1) [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, jetfighta, jetfight, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Jet Fighter/Jet Fighter Cocktail/Launch Aircraft (set 2) [TTL]", MACHINE_IS_SKELETON)
+GAME(1976, outlaw, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Outlaw [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, sharkjaw, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Horror Games", "Shark JAWS [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, steeplec, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Steeplechase [TTL]", MACHINE_IS_SKELETON)
+GAME(1976, stuntcyc, 0, stuntcyc, 0, stuntcyc_state, 0, ROT0, "Atari", "Stunt Cycle [TTL]", MACHINE_IS_SKELETON)
+GAME(1974, tank, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Tank/Tank Cocktail [TTL]", MACHINE_IS_SKELETON)
+GAME(1975, tankii, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Tank II [TTL]", MACHINE_IS_SKELETON)
// MISSING ROM DUMPS
-//GAME(1975, astrotrf, steeplec, atarikee, 0, driver_device, 0, ROT0, "Atari", "Astroturf [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, gtrak10, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Gran Trak 10/Trak 10/Formula K [TTL]", MACHINE_IS_SKELETON) //?
-//GAME(1974, gtrak20, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Gran Trak 20/Trak 20/Twin Racer [TTL]", MACHINE_IS_SKELETON) //?
-//GAME(1976, lemans, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Le Mans [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, qwak, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Qwak!/Quack [TTL]", MACHINE_IS_SKELETON)
+//GAME(1975, astrotrf, steeplec, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Astroturf [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, gtrak10, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Gran Trak 10/Trak 10/Formula K [TTL]", MACHINE_IS_SKELETON) //?
+//GAME(1974, gtrak20, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Gran Trak 20/Trak 20/Twin Racer [TTL]", MACHINE_IS_SKELETON) //?
+//GAME(1976, lemans, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Le Mans [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, qwak, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Qwak!/Quack [TTL]", MACHINE_IS_SKELETON)
// 100% TTL
-//GAME(1974, coupfran, worldcup, atarikee, 0, driver_device, 0, ROT0, "Atari Europe", "Coup Franc [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, coupdmnd, worldcup, atarikee, 0, driver_device, 0, ROT0, "Atari France", "Coup du Monde [TTL]", MACHINE_IS_SKELETON)
-//GAME(1975, crossfir, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Crossfire [TTL]", MACHINE_IS_SKELETON)
-//GAME(1973, eliminat, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Elimination! [TTL]", MACHINE_IS_SKELETON)
-//GAME(1975, goaliv, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Goal IV [TTL]", MACHINE_IS_SKELETON)
-//GAME(1973, gotchaat, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Gotcha [TTL]", MACHINE_IS_SKELETON) //?
-//GAME(1973, gotchaatc, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Gotcha Color [TTL]", MACHINE_IS_SKELETON) //?
-//GAME(1975, hiway, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Hi-Way/Highway [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, pinpong, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Pin Pong [TTL]", MACHINE_IS_SKELETON)
-//GAME(1975, pursuit, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Pursuit [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, quadpong, eliminat, atarikee, 0, driver_device, 0, ROT0, "Atari", "Quadrapong [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, rebound, 0, atarikee, 0, driver_device, 0, ROT0, "Atari/Kee", "Rebound/Spike/Volleyball [TTL]", MACHINE_IS_SKELETON)
-//GAME(1973, spacrace, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Space Race [TTL]", MACHINE_IS_SKELETON)
-//GAME(1974, touchme, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "Touch-Me [TTL]", MACHINE_IS_SKELETON) //?
-//GAME(1974, worldcup, 0, atarikee, 0, driver_device, 0, ROT0, "Atari", "World Cup/World Cup Football [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, coupfran, worldcup, atarikee, 0, atarikee_state, 0, ROT0, "Atari Europe", "Coup Franc [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, coupdmnd, worldcup, atarikee, 0, atarikee_state, 0, ROT0, "Atari France", "Coup du Monde [TTL]", MACHINE_IS_SKELETON)
+//GAME(1975, crossfir, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Crossfire [TTL]", MACHINE_IS_SKELETON)
+//GAME(1973, eliminat, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Elimination! [TTL]", MACHINE_IS_SKELETON)
+//GAME(1975, goaliv, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Goal IV [TTL]", MACHINE_IS_SKELETON)
+//GAME(1973, gotchaat, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Gotcha [TTL]", MACHINE_IS_SKELETON) //?
+//GAME(1973, gotchaatc, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Gotcha Color [TTL]", MACHINE_IS_SKELETON) //?
+//GAME(1975, hiway, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Hi-Way/Highway [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, pinpong, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Pin Pong [TTL]", MACHINE_IS_SKELETON)
+//GAME(1975, pursuit, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Pursuit [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, quadpong, eliminat, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Quadrapong [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, rebound, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari/Kee", "Rebound/Spike/Volleyball [TTL]", MACHINE_IS_SKELETON)
+//GAME(1973, spacrace, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Space Race [TTL]", MACHINE_IS_SKELETON)
+//GAME(1974, touchme, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "Touch-Me [TTL]", MACHINE_IS_SKELETON) //?
+//GAME(1974, worldcup, 0, atarikee, 0, atarikee_state, 0, ROT0, "Atari", "World Cup/World Cup Football [TTL]", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 942f5ae08f1..6b454f78d2d 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -326,7 +326,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( atetris, atetris_state )
+static MACHINE_CONFIG_START( atetris )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/8)
@@ -365,7 +365,7 @@ static MACHINE_CONFIG_START( atetris, atetris_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( atetrisb2, atetris_state )
+static MACHINE_CONFIG_START( atetrisb2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,BOOTLEG_CLOCK/8)
@@ -563,10 +563,10 @@ DRIVER_INIT_MEMBER(atetris_state,atetris)
*
*************************************/
-GAME( 1988, atetris, 0, atetris, atetris, atetris_state, atetris, ROT0, "Atari Games", "Tetris (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, atetrisa, atetris, atetris, atetris, atetris_state, atetris, ROT0, "Atari Games", "Tetris (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, atetrisb, atetris, atetris, atetris, atetris_state, atetris, ROT0, "bootleg", "Tetris (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, atetrisb2,atetris, atetrisb2, atetris, atetris_state, atetris, ROT0, "bootleg", "Tetris (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, atetrisb3,atetris, atetrisb3, atetris, atetris_state, atetris, ROT0, "bootleg", "Tetris (bootleg set 3)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, atetris, 0, atetris, atetris, atetris_state, atetris, ROT0, "Atari Games", "Tetris (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, atetrisa, atetris, atetris, atetris, atetris_state, atetris, ROT0, "Atari Games", "Tetris (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, atetrisb, atetris, atetris, atetris, atetris_state, atetris, ROT0, "bootleg", "Tetris (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, atetrisb2,atetris, atetrisb2, atetris, atetris_state, atetris, ROT0, "bootleg", "Tetris (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, atetrisb3,atetris, atetrisb3, atetris, atetris_state, atetris, ROT0, "bootleg", "Tetris (bootleg set 3)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1989, atetrisc, atetris, atetris, atetrisc, atetris_state, atetris, ROT270, "Atari Games", "Tetris (cocktail set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, atetrisc2,atetris, atetris, atetrisc, atetris_state, atetris, ROT270, "Atari Games", "Tetris (cocktail set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 962ed39e825..d2465aca3e3 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -774,7 +774,7 @@ DEVICE_INPUT_DEFAULTS_END
#define PCI_ID_9050 ":pci:0b.0"
#define PCI_ID_IDE ":pci:0c.0"
-static MACHINE_CONFIG_START( mwskins, atlantis_state )
+static MACHINE_CONFIG_START( mwskins )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", VR4310LE, 166666666) // clock is TRUSTED
@@ -822,7 +822,7 @@ static MACHINE_CONFIG_START( mwskins, atlantis_state )
if DEBUG_CONSOLE {
MCFG_MIDWAY_IOASIC_OUT_TX_CB(DEVWRITE8("uart0", generic_terminal_device, write))
MCFG_DEVICE_ADD("uart0", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(DEVWRITE8("ioasic", midway_ioasic_device, serial_rx_w))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(DEVPUT("ioasic", midway_ioasic_device, serial_rx_w))
}
// TL16C552 UART
diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp
index b06e3e5eaeb..91742ec9a7f 100644
--- a/src/mame/drivers/atm.cpp
+++ b/src/mame/drivers/atm.cpp
@@ -171,7 +171,7 @@ static GFXDECODE_START( atmtb2 )
GFXDECODE_END
-static MACHINE_CONFIG_DERIVED_CLASS( atm, spectrum_128, atm_state )
+static MACHINE_CONFIG_DERIVED( atm, spectrum_128 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(atm_io)
MCFG_CPU_DECRYPTED_OPCODES_MAP(atm_switch)
@@ -230,8 +230,8 @@ ROM_START( atmtb2 )
ROM_LOAD( "sgen.rom", 0x0000, 0x0800, CRC(1f4387d6) SHA1(93b3774dc8a486643a1bdd48c606b0c84fa0e22b))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1991, atm, spec128, 0, atm, spec_plus, driver_device, 0, "MicroART", "ATM", MACHINE_NOT_WORKING)
-//COMP( 1991, atmtb1, spec128, 0, atm, spec_plus, driver_device, 0, "MicroART", "ATM-turbo1", MACHINE_NOT_WORKING)
-COMP( 1993, atmtb2, spec128, 0, atmtb2, spec_plus, driver_device, 0, "MicroART", "ATM-turbo2", MACHINE_NOT_WORKING)
-//COMP( 1994, turbo2, spec128, 0, atm, spec_plus, driver_device, 0, "MicroART", "TURBO 2+", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
+COMP( 1991, atm, spec128, 0, atm, spec_plus, atm_state, 0, "MicroART", "ATM", MACHINE_NOT_WORKING)
+//COMP( 1991, atmtb1, spec128, 0, atm, spec_plus, atm_state, 0, "MicroART", "ATM-turbo1", MACHINE_NOT_WORKING)
+COMP( 1993, atmtb2, spec128, 0, atmtb2, spec_plus, atm_state, 0, "MicroART", "ATM-turbo2", MACHINE_NOT_WORKING)
+//COMP( 1994, turbo2, spec128, 0, atm, spec_plus, atm_state, 0, "MicroART", "TURBO 2+", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index 20c35fe70f3..db0969a9912 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -704,7 +704,7 @@ FLOPPY_FORMATS_END0
MACHINE_DRIVER( atom )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( atom, atom_state )
+static MACHINE_CONFIG_START( atom )
/* basic machine hardware */
MCFG_CPU_ADD(SY6502_TAG, M6502, X2/4)
MCFG_CPU_PROGRAM_MAP(atom_mem)
@@ -781,7 +781,7 @@ MACHINE_CONFIG_END
MCFG_GENERIC_EXTENSIONS("bin,rom") \
MCFG_GENERIC_LOAD(atomeb_state, _load)
-static MACHINE_CONFIG_DERIVED_CLASS( atomeb, atom, atomeb_state )
+static MACHINE_CONFIG_DERIVED( atomeb, atom )
MCFG_CPU_MODIFY(SY6502_TAG)
MCFG_CPU_PROGRAM_MAP(atomeb_mem)
@@ -813,7 +813,7 @@ MACHINE_CONFIG_END
MACHINE_DRIVER( atombb )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( atombb, atom_state )
+static MACHINE_CONFIG_START( atombb )
/* basic machine hardware */
MCFG_CPU_ADD(SY6502_TAG, M6502, X2/4)
MCFG_CPU_PROGRAM_MAP(atombb_mem)
@@ -982,10 +982,10 @@ DRIVER_INIT_MEMBER(atomeb_state, atomeb)
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, atom, 0, 0, atom, atom, driver_device, 0, "Acorn", "Atom" , 0)
-COMP( 1979, atomeb, atom, 0, atomeb, atom, atomeb_state, atomeb, "Acorn", "Atom with Eprom Box" , 0)
-COMP( 1982, atombb, atom, 0, atombb, atom, driver_device, 0, "Acorn", "Atom with BBC Basic" , 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1979, atom, 0, 0, atom, atom, atom_state, 0, "Acorn", "Atom" , 0)
+COMP( 1979, atomeb, atom, 0, atomeb, atom, atomeb_state, atomeb, "Acorn", "Atom with Eprom Box" , 0)
+COMP( 1982, atombb, atom, 0, atombb, atom, atom_state, 0, "Acorn", "Atom with BBC Basic" , 0)
//COMP( 1983, prophet2, atom, 0, prophet2, atom, driver_device, 0, "Busicomputers", "Prophet 2" , 0)
//COMP( 1983, prophet3, atom, 0, prophet3, atom, driver_device, 0, "Busicomputers", "Prophet 3" , 0)
//COMP( 2011, atommc, atom, 0, atommc, atom, driver_device, 0, "Acorn", "Atom with AtoMMC2" , 0)
diff --git a/src/mame/drivers/atpci.cpp b/src/mame/drivers/atpci.cpp
index 1bad9917343..0e56d6c398d 100644
--- a/src/mame/drivers/atpci.cpp
+++ b/src/mame/drivers/atpci.cpp
@@ -3,6 +3,7 @@
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "bus/isa/isa_cards.h"
#include "bus/lpci/pci.h"
#include "bus/lpci/i82371ab.h"
#include "bus/lpci/i82371sb.h"
@@ -44,7 +45,7 @@ static ADDRESS_MAP_START( at586_io, AS_IO, 32, at586_state )
AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_bus_device, read, write)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( at586, at586_state )
+static MACHINE_CONFIG_START( at586 )
MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
MCFG_CPU_PROGRAM_MAP(at586_map)
MCFG_CPU_IO_MAP(at586_io)
@@ -69,7 +70,7 @@ static MACHINE_CONFIG_START( at586, at586_state )
MCFG_FRAGMENT_ADD( at_softlists )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( at586x3, at586_state )
+static MACHINE_CONFIG_START( at586x3 )
MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
MCFG_CPU_PROGRAM_MAP(at586_map)
MCFG_CPU_IO_MAP(at586_io)
@@ -129,6 +130,6 @@ ROM_START( ficvt503 )
ROMX_LOAD("115gk140.awd", 0x20000, 0x20000, CRC(65e88956) SHA1(f94bb0732e00b5b0f18f4e349db24a289f8379c5), ROM_BIOS(5))
ROM_END
-COMP ( 1990, at586, ibm5170, 0, at586, 0, driver_device, 0, "<generic>", "PC/AT 586 (PIIX4)", MACHINE_NOT_WORKING )
-COMP ( 1990, at586x3, ibm5170, 0, at586x3, 0, driver_device, 0, "<generic>", "PC/AT 586 (PIIX3)", MACHINE_NOT_WORKING )
-COMP ( 1997, ficvt503, ibm5170, 0, at586, 0, driver_device, 0, "FIC", "VT-503", MACHINE_NOT_WORKING )
+COMP ( 1990, at586, ibm5170, 0, at586, 0, at586_state, 0, "<generic>", "PC/AT 586 (PIIX4)", MACHINE_NOT_WORKING )
+COMP ( 1990, at586x3, ibm5170, 0, at586x3, 0, at586_state, 0, "<generic>", "PC/AT 586 (PIIX3)", MACHINE_NOT_WORKING )
+COMP ( 1997, ficvt503, ibm5170, 0, at586, 0, at586_state, 0, "FIC", "VT-503", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp
index 2dc995b858e..48dd7be2f6a 100644
--- a/src/mame/drivers/atronic.cpp
+++ b/src/mame/drivers/atronic.cpp
@@ -58,7 +58,7 @@ static INPUT_PORTS_START( atronic )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( atronic, atronic_state )
+static MACHINE_CONFIG_START( atronic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, 6000000)
MCFG_CPU_PROGRAM_MAP(atronic_map)
@@ -815,33 +815,33 @@ ROM_END
-GAME( 1999, atronic, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Atronic SetUp/Clear Chips (Russia, set 1)", MACHINE_IS_SKELETON)
-GAME( 1999, atronica, atronic, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Atronic SetUp/Clear Chips (Russia, set 2)", MACHINE_IS_SKELETON)
-
-GAME( 2002, atlantca, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Atlantica (Russia) (Atronic) (set 1)", MACHINE_IS_SKELETON)
-GAME( 2002, atlantcaa, atlantca, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Atlantica (Russia) (Atronic) (set 2)", MACHINE_IS_SKELETON)
-GAME( 2002, baboshka, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Baboshka (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, cfblue, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Crazy Fruits Blue (Russia) (Atronic) (set 1)", MACHINE_IS_SKELETON)
-GAME( 2002, cfbluea, cfblue, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Crazy Fruits Blue (Russia) (Atronic) (set 2)", MACHINE_IS_SKELETON)
-GAME( 2002, cfgreen, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Crazy Fruits Green (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, chicken, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Chicken (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, aclown, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Clown (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, goldglen, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Golden Glenn (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, iccash, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "I C Cash (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, shpinxii, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Sphinx II (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, bearnec, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Bear Necessities (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, beachpt, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Beach Patrol (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, beetleup, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Beetles Unplugged (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, abigchs, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Big Cheese (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, bigblue, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Big Blue (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, castaway, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Castaway (Russia) (Atronic) (set 1)", MACHINE_IS_SKELETON)
-GAME( 2002, castawaya, castaway, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Castaway (Russia) (Atronic) (set 2)", MACHINE_IS_SKELETON)
-GAME( 2002, dncsprt, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Dancing Spirit (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, drmmake, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Dream Maker (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, goldcity, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Gold City (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, jumpjkpt, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Jumping Jackpots (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, mushmagi, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Mushroom Magic (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, santam, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Santa Maria (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, splmastr, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Spell Master (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, tajmah, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Tajmahal (Russia) (Atronic)", MACHINE_IS_SKELETON)
-GAME( 2002, 3wishrd, 0, atronic, atronic, driver_device, 0, ROT0, "Atronic", "Three Wishes Red (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 1999, atronic, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Atronic SetUp/Clear Chips (Russia, set 1)", MACHINE_IS_SKELETON)
+GAME( 1999, atronica, atronic, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Atronic SetUp/Clear Chips (Russia, set 2)", MACHINE_IS_SKELETON)
+
+GAME( 2002, atlantca, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Atlantica (Russia) (Atronic) (set 1)", MACHINE_IS_SKELETON)
+GAME( 2002, atlantcaa, atlantca, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Atlantica (Russia) (Atronic) (set 2)", MACHINE_IS_SKELETON)
+GAME( 2002, baboshka, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Baboshka (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, cfblue, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Crazy Fruits Blue (Russia) (Atronic) (set 1)", MACHINE_IS_SKELETON)
+GAME( 2002, cfbluea, cfblue, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Crazy Fruits Blue (Russia) (Atronic) (set 2)", MACHINE_IS_SKELETON)
+GAME( 2002, cfgreen, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Crazy Fruits Green (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, chicken, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Chicken (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, aclown, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Clown (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, goldglen, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Golden Glenn (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, iccash, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "I C Cash (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, shpinxii, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Sphinx II (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, bearnec, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Bear Necessities (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, beachpt, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Beach Patrol (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, beetleup, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Beetles Unplugged (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, abigchs, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Big Cheese (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, bigblue, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Big Blue (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, castaway, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Castaway (Russia) (Atronic) (set 1)", MACHINE_IS_SKELETON)
+GAME( 2002, castawaya, castaway, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Castaway (Russia) (Atronic) (set 2)", MACHINE_IS_SKELETON)
+GAME( 2002, dncsprt, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Dancing Spirit (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, drmmake, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Dream Maker (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, goldcity, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Gold City (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, jumpjkpt, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Jumping Jackpots (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, mushmagi, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Mushroom Magic (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, santam, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Santa Maria (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, splmastr, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Spell Master (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, tajmah, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Tajmahal (Russia) (Atronic)", MACHINE_IS_SKELETON)
+GAME( 2002, 3wishrd, 0, atronic, atronic, atronic_state, 0, ROT0, "Atronic", "Three Wishes Red (Russia) (Atronic)", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index cefcf0877cb..e26c5ff5521 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -912,7 +912,7 @@ void attache_state::machine_reset()
m_kb_bitpos = 0;
}
-static MACHINE_CONFIG_START( attache, attache_state )
+static MACHINE_CONFIG_START( attache )
MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(attache_map)
MCFG_CPU_IO_MAP(attache_io)
@@ -996,5 +996,5 @@ ROM_START( attache )
ROM_LOAD("u630.bin", 0x0000, 0x0100, CRC(f7a5c821) SHA1(fea07d9ac7e4e5f4f72aa7b2159deaedbd662ead) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, attache, 0, 0, attache, attache, driver_device, 0, "Otrona", "Attach\xC3\xA9", MACHINE_IMPERFECT_GRAPHICS)
+// YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, attache, 0, 0, attache, attache, attache_state, 0, "Otrona", "Attach\xC3\xA9", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index fe89d3ba6b7..6fc3635ccd4 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -110,7 +110,7 @@ READ8_MEMBER(attckufo_state::vic_colorram_r)
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( attckufo, attckufo_state )
+static MACHINE_CONFIG_START( attckufo )
MCFG_CPU_ADD("maincpu", M6502, XTAL_14_31818MHz / 14)
MCFG_CPU_PROGRAM_MAP(cpu_map)
@@ -145,5 +145,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
-GAME( 1980, attckufo, 0, attckufo, attckufo, driver_device, 0, ROT270, "Ryoto Electric Co.", "Attack UFO", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
+GAME( 1980, attckufo, 0, attckufo, attckufo, attckufo_state, 0, ROT270, "Ryoto Electric Co.", "Attack UFO", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp
index e1511d85895..d1b693e01be 100644
--- a/src/mame/drivers/atvtrack.cpp
+++ b/src/mame/drivers/atvtrack.cpp
@@ -541,7 +541,7 @@ INPUT_PORTS_END
#define ATV_CPU_CLOCK XTAL_33MHz*6
-static MACHINE_CONFIG_START( atvtrack, atvtrack_state )
+static MACHINE_CONFIG_START( atvtrack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, ATV_CPU_CLOCK)
MCFG_SH4_MD0(1)
@@ -582,7 +582,7 @@ static MACHINE_CONFIG_START( atvtrack, atvtrack_state )
MCFG_PALETTE_ADD("palette", 0x1000)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( smashdrv, atvtrack, smashdrv_state )
+static MACHINE_CONFIG_DERIVED( smashdrv, atvtrack )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(smashdrv_main_map)
MCFG_CPU_IO_MAP(smashdrv_main_port)
@@ -662,8 +662,8 @@ ROM_START( smashdrv )
// ic21 unpopulated
ROM_END
-GAME( 2002, atvtrack, 0, atvtrack, atvtrack, driver_device, 0, ROT0, "Gaelco", "ATV Track (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, atvtracka, atvtrack, atvtrack, atvtrack, driver_device, 0, ROT0, "Gaelco", "ATV Track (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, atvtrack, 0, atvtrack, atvtrack, atvtrack_state, 0, ROT0, "Gaelco", "ATV Track (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, atvtracka, atvtrack, atvtrack, atvtrack, atvtrack_state, 0, ROT0, "Gaelco", "ATV Track (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// almost identical PCB, FlashROM mapping and master registers addresses different
-GAME( 2000, smashdrv, 0, smashdrv, atvtrack, driver_device, 0, ROT0, "Gaelco", "Smashing Drive (UK)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2000, smashdrv, 0, smashdrv, atvtrack, smashdrv_state, 0, ROT0, "Gaelco", "Smashing Drive (UK)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index 1b15abc1bc9..9e118f17243 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -57,7 +57,7 @@ static ADDRESS_MAP_START( aussiebyte_io, AS_IO, 8, aussiebyte_state )
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("pio1", z80pio_device, read, write)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
AM_RANGE(0x0c, 0x0f) AM_NOP // winchester interface
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", wd2797_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", wd2797_device, read, write)
AM_RANGE(0x14, 0x14) AM_DEVREADWRITE("dma", z80dma_device, read, write)
AM_RANGE(0x15, 0x15) AM_WRITE(port15_w) // boot rom disable
AM_RANGE(0x16, 0x16) AM_WRITE(port16_w) // fdd select
@@ -465,7 +465,7 @@ MACHINE_RESET_MEMBER( aussiebyte_state, aussiebyte )
m_maincpu->reset();
}
-static MACHINE_CONFIG_START( aussiebyte, aussiebyte_state )
+static MACHINE_CONFIG_START( aussiebyte )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(aussiebyte_map)
@@ -595,5 +595,5 @@ ROM_START(aussieby)
ROM_REGION(0x00800, "aram", ROMREGION_ERASEFF) // attribute ram, 2k static
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1984, aussieby, 0, 0, aussiebyte, aussiebyte, aussiebyte_state, aussiebyte, "SME Systems", "Aussie Byte II" , MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index 0ac8ba7b61d..a4960480e4d 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -246,7 +246,7 @@ void avalnche_state::machine_reset()
m_avalance_video_inverted = 0;
}
-static MACHINE_CONFIG_START( avalnche, avalnche_state )
+static MACHINE_CONFIG_START( avalnche )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,MASTER_CLOCK/16) /* clock input is the "2H" signal divided by two */
@@ -328,6 +328,6 @@ ROM_END
*
*************************************/
-GAMEL( 1978, avalnche, 0, avalnche, avalnche, driver_device, 0, ROT0, "Atari", "Avalanche", MACHINE_SUPPORTS_SAVE, layout_avalnche )
-GAMEL( 1978, cascade, avalnche, avalnche, cascade, driver_device, 0, ROT0, "bootleg? (Sidam)", "Cascade", MACHINE_SUPPORTS_SAVE, layout_avalnche )
-GAME ( 1977, catchp, 0, catch, catch, driver_device, 0, ROT0, "Atari", "Catch (prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // pre-production board, evolved into Avalanche
+GAMEL( 1978, avalnche, 0, avalnche, avalnche, avalnche_state, 0, ROT0, "Atari", "Avalanche", MACHINE_SUPPORTS_SAVE, layout_avalnche )
+GAMEL( 1978, cascade, avalnche, avalnche, cascade, avalnche_state, 0, ROT0, "bootleg? (Sidam)", "Cascade", MACHINE_SUPPORTS_SAVE, layout_avalnche )
+GAME ( 1977, catchp, 0, catch, catch, avalnche_state, 0, ROT0, "Atari", "Catch (prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND ) // pre-production board, evolved into Avalanche
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index b0d826f4403..15b6dc5b769 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -746,7 +746,7 @@ void avigo_state::nvram_init(nvram_device &nvram, void *base, size_t size)
memset(base, 0x00, size);
}
-static MACHINE_CONFIG_START( avigo, avigo_state )
+static MACHINE_CONFIG_START( avigo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(avigo_mem)
@@ -904,9 +904,9 @@ ROM_START(avigo_it)
ROMX_LOAD("italian_100.rom", 0x000000, 0x050000, CRC(de359218) SHA1(6185727aba8ffc98723f2df74dda388fd0d70cc9), ROM_BIOS(3))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(1997, avigo, 0, 0, avigo, avigo, driver_device, 0, "Texas Instruments", "TI Avigo 10 PDA", MACHINE_SUPPORTS_SAVE)
-COMP(1997, avigo_de, avigo, 0, avigo, avigo, driver_device, 0, "Texas Instruments", "TI Avigo 10 PDA (German)", MACHINE_SUPPORTS_SAVE)
-COMP(1997, avigo_fr, avigo, 0, avigo, avigo, driver_device, 0, "Texas Instruments", "TI Avigo 10 PDA (French)", MACHINE_SUPPORTS_SAVE)
-COMP(1997, avigo_es, avigo, 0, avigo, avigo, driver_device, 0, "Texas Instruments", "TI Avigo 10 PDA (Spanish)", MACHINE_SUPPORTS_SAVE)
-COMP(1997, avigo_it, avigo, 0, avigo, avigo, driver_device, 0, "Texas Instruments", "TI Avigo 10 PDA (Italian)", MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP(1997, avigo, 0, 0, avigo, avigo, avigo_state, 0, "Texas Instruments", "TI Avigo 10 PDA", MACHINE_SUPPORTS_SAVE)
+COMP(1997, avigo_de, avigo, 0, avigo, avigo, avigo_state, 0, "Texas Instruments", "TI Avigo 10 PDA (German)", MACHINE_SUPPORTS_SAVE)
+COMP(1997, avigo_fr, avigo, 0, avigo, avigo, avigo_state, 0, "Texas Instruments", "TI Avigo 10 PDA (French)", MACHINE_SUPPORTS_SAVE)
+COMP(1997, avigo_es, avigo, 0, avigo, avigo, avigo_state, 0, "Texas Instruments", "TI Avigo 10 PDA (Spanish)", MACHINE_SUPPORTS_SAVE)
+COMP(1997, avigo_it, avigo, 0, avigo, avigo, avigo_state, 0, "Texas Instruments", "TI Avigo 10 PDA (Italian)", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 27a70b3663e..2e8f2d83b22 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -928,7 +928,7 @@ INTERRUPT_GEN_MEMBER(avt_state::avt_vblank_irq)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x06);
}
-static MACHINE_CONFIG_START( avt, avt_state )
+static MACHINE_CONFIG_START( avt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
@@ -1031,8 +1031,8 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1985, avtsym14, 0, avt, symbols, driver_device, 0, ROT0, "Advanced Video Technology", "Symbols (ver 1.4)", MACHINE_NOT_WORKING )
-GAME( 1985, avtsym25, avtsym14, avt, symbols, driver_device, 0, ROT0, "Advanced Video Technology", "Symbols (ver 2.5)", MACHINE_NOT_WORKING )
-GAME( 1985, avtbingo, 0, avt, avtbingo, driver_device, 0, ROT0, "Advanced Video Technology", "Arrow Bingo", MACHINE_NOT_WORKING )
-GAME( 1989, avtnfl, 0, avt, symbols, driver_device, 0, ROT0, "Advanced Video Technology", "NFL (ver 109)", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+GAME( 1985, avtsym14, 0, avt, symbols, avt_state, 0, ROT0, "Advanced Video Technology", "Symbols (ver 1.4)", MACHINE_NOT_WORKING )
+GAME( 1985, avtsym25, avtsym14, avt, symbols, avt_state, 0, ROT0, "Advanced Video Technology", "Symbols (ver 2.5)", MACHINE_NOT_WORKING )
+GAME( 1985, avtbingo, 0, avt, avtbingo, avt_state, 0, ROT0, "Advanced Video Technology", "Arrow Bingo", MACHINE_NOT_WORKING )
+GAME( 1989, avtnfl, 0, avt, symbols, avt_state, 0, ROT0, "Advanced Video Technology", "NFL (ver 109)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp
index 3d4d16805f2..ab4382bf502 100644
--- a/src/mame/drivers/ax20.cpp
+++ b/src/mame/drivers/ax20.cpp
@@ -121,7 +121,7 @@ static SLOT_INTERFACE_START( ax20_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( ax20, ax20_state )
+static MACHINE_CONFIG_START( ax20 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
MCFG_CPU_PROGRAM_MAP(ax20_map)
@@ -156,5 +156,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, ax20, 0, 0, ax20, ax20, driver_device, 0, "Axel", "AX-20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, ax20, 0, 0, ax20, ax20, ax20_state, 0, "Axel", "AX-20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp
index 83d09547a1c..7c4b92ce0fa 100644
--- a/src/mame/drivers/aztarac.cpp
+++ b/src/mame/drivers/aztarac.cpp
@@ -147,7 +147,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( aztarac, aztarac_state )
+static MACHINE_CONFIG_START( aztarac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
@@ -231,4 +231,4 @@ ROM_END
*
*************************************/
-GAME( 1983, aztarac, 0, aztarac, aztarac, driver_device, 0, ROT0, "Centuri", "Aztarac", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, aztarac, 0, aztarac, aztarac, aztarac_state, 0, ROT0, "Centuri", "Aztarac", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index e79f5118d9c..30944f6e273 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -269,7 +269,7 @@ WRITE8_MEMBER(b16_state::memory_write_byte)
}
-static MACHINE_CONFIG_START( b16, b16_state )
+static MACHINE_CONFIG_START( b16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8086, XTAL_14_31818MHz/2) //unknown xtal
MCFG_CPU_PROGRAM_MAP(b16_map)
@@ -309,5 +309,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, b16, 0, 0, b16, b16, driver_device, 0, "Hitachi", "B16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, b16, 0, 0, b16, b16, b16_state, 0, "Hitachi", "B16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp
index e2c5cc17ec5..d9c02c4d791 100644
--- a/src/mame/drivers/b2m.cpp
+++ b/src/mame/drivers/b2m.cpp
@@ -42,7 +42,7 @@ static ADDRESS_MAP_START( b2m_io, AS_IO, 8, b2m_state )
AM_RANGE(0x14, 0x15) AM_DEVREADWRITE("pic8259", pic8259_device, read, write )
AM_RANGE(0x18, 0x18) AM_DEVREADWRITE("uart", i8251_device, data_r, data_w)
AM_RANGE(0x19, 0x19) AM_DEVREADWRITE("uart", i8251_device, status_r, control_w)
- AM_RANGE(0x1c, 0x1f) AM_DEVREADWRITE("fd1793", fd1793_t, read, write)
+ AM_RANGE(0x1c, 0x1f) AM_DEVREADWRITE("fd1793", fd1793_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START( b2m_rom_io, AS_IO, 8, b2m_state )
@@ -185,7 +185,7 @@ SLOT_INTERFACE_END
/* Machine driver */
-static MACHINE_CONFIG_START( b2m, b2m_state )
+static MACHINE_CONFIG_START( b2m )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(b2m_mem)
@@ -271,6 +271,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, b2m, 0, 0, b2m, b2m, b2m_state, b2m, "BNPO", "Bashkiria-2M", MACHINE_SUPPORTS_SAVE)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1989, b2m, 0, 0, b2m, b2m, b2m_state, b2m, "BNPO", "Bashkiria-2M", MACHINE_SUPPORTS_SAVE)
COMP( 1989, b2mrom, b2m, 0, b2mrom, b2m, b2m_state, b2m, "BNPO", "Bashkiria-2M ROM-disk", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index bf1306f8b94..0a95392ff13 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -232,7 +232,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(babbage_state::keyboard_callback)
***************************************************************************/
-static MACHINE_CONFIG_START( babbage, babbage_state )
+static MACHINE_CONFIG_START( babbage )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) //2.5MHz
MCFG_CPU_PROGRAM_MAP(babbage_map)
@@ -274,5 +274,5 @@ ROM_START(babbage)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1986, babbage, 0, 0, babbage, babbage, driver_device, 0, "Mr Takafumi Aihara", "Babbage-2nd" , MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, babbage, 0, 0, babbage, babbage, babbage_state, 0, "Mr Takafumi Aihara", "Babbage-2nd" , MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp
index f47a0122384..4999e338d2f 100644
--- a/src/mame/drivers/backfire.cpp
+++ b/src/mame/drivers/backfire.cpp
@@ -470,7 +470,7 @@ void backfire_state::machine_start()
{
}
-static MACHINE_CONFIG_START( backfire, backfire_state )
+static MACHINE_CONFIG_START( backfire )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index f57601ec47b..74ed52cf817 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -499,7 +499,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( badlands, badlands_state )
+static MACHINE_CONFIG_START( badlands )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -754,7 +754,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(badlands_state::bootleg_sound_scanline)
m_audiocpu->set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( badlandsb, badlands_state )
+static MACHINE_CONFIG_START( badlandsb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* Divisor estimated */
@@ -866,5 +866,5 @@ ROM_END
-GAME( 1989, badlandsb, badlands, badlandsb, badlandsb, driver_device, 0, ROT0, "bootleg (Playmark)", "Bad Lands (bootleg)", MACHINE_NOT_WORKING )
-GAME( 1989, badlandsb2,badlands, badlandsb, badlandsb, driver_device, 0, ROT0, "bootleg (Playmark)", "Bad Lands (bootleg, alternate)", MACHINE_NOT_WORKING )
+GAME( 1989, badlandsb, badlands, badlandsb, badlandsb, badlands_state, 0, ROT0, "bootleg (Playmark)", "Bad Lands (bootleg)", MACHINE_NOT_WORKING )
+GAME( 1989, badlandsb2,badlands, badlandsb, badlandsb, badlands_state, 0, ROT0, "bootleg (Playmark)", "Bad Lands (bootleg, alternate)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp
index c6ee3f2298b..872bd79cdde 100644
--- a/src/mame/drivers/bagman.cpp
+++ b/src/mame/drivers/bagman.cpp
@@ -462,7 +462,7 @@ INTERRUPT_GEN_MEMBER(bagman_state::vblank_irq)
}
-static MACHINE_CONFIG_START( bagman, bagman_state )
+static MACHINE_CONFIG_START( bagman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
@@ -511,7 +511,7 @@ static MACHINE_CONFIG_START( bagman, bagman_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pickin, bagman_state )
+static MACHINE_CONFIG_START( pickin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
@@ -561,7 +561,7 @@ z80
*/
-static MACHINE_CONFIG_START( botanic, bagman_state )
+static MACHINE_CONFIG_START( botanic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, BAGMAN_H0)
@@ -1023,20 +1023,20 @@ DRIVER_INIT_MEMBER(bagman_state,bagman)
}
-GAME( 1982, bagman, 0, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation", "Bagman", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagnard, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation", "Le Bagnard (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagnarda, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation", "Le Bagnard (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagnardi, bagman, bagman, bagman, bagman_state, bagman, ROT90, "Valadon Automation (Itisa license)", "Le Bagnard (Itisa, Spain)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagmans, bagman, bagman, bagmans, bagman_state, bagman, ROT270, "Valadon Automation (Stern Electronics license)", "Bagman (Stern Electronics, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagmans2, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation (Stern Electronics license)", "Bagman (Stern Electronics, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagmanj, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation (Taito license)", "Bagman (Taito)", MACHINE_SUPPORTS_SAVE ) // title screen actually doesn't mention Valadon, only Stern and Taito
+GAME( 1982, bagman, 0, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation", "Bagman", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagnard, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation", "Le Bagnard (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagnarda, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation", "Le Bagnard (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagnardi, bagman, bagman, bagman, bagman_state, bagman, ROT90, "Valadon Automation (Itisa license)", "Le Bagnard (Itisa, Spain)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagmans, bagman, bagman, bagmans, bagman_state, bagman, ROT270, "Valadon Automation (Stern Electronics license)", "Bagman (Stern Electronics, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagmans2, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation (Stern Electronics license)", "Bagman (Stern Electronics, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagmanj, bagman, bagman, bagman, bagman_state, bagman, ROT270, "Valadon Automation (Taito license)", "Bagman (Taito)", MACHINE_SUPPORTS_SAVE ) // title screen actually doesn't mention Valadon, only Stern and Taito
-GAME( 1984, sbagman, 0, bagman, sbagman, driver_device, 0, ROT270, "Valadon Automation", "Super Bagman", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sbagmans, sbagman, bagman, sbagman, driver_device, 0, ROT270, "Valadon Automation (Stern Electronics license)", "Super Bagman (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbagman, 0, bagman, sbagman, bagman_state, 0, ROT270, "Valadon Automation", "Super Bagman", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbagmans, sbagman, bagman, sbagman, bagman_state, 0, ROT270, "Valadon Automation (Stern Electronics license)", "Super Bagman (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, pickin, 0, pickin, pickin, driver_device, 0, ROT270, "Valadon Automation", "Pickin'", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, pickin, 0, pickin, pickin, bagman_state, 0, ROT270, "Valadon Automation", "Pickin'", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, botanic, 0, botanic, botanici,driver_device, 0, ROT90, "Itisa", "Botanic (English / Spanish)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, botanicf, botanic, botanic, botanicf,driver_device, 0, ROT270, "Itisa (Valadon Automation license)", "Botanic (French)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, botanic, 0, botanic, botanici, bagman_state, 0, ROT90, "Itisa", "Botanic (English / Spanish)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, botanicf, botanic, botanic, botanicf, bagman_state, 0, ROT270, "Itisa (Valadon Automation license)", "Botanic (French)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, squaitsa, 0, squaitsa,squaitsa, driver_device,0, ROT0, "Itisa", "Squash (Itisa)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, squaitsa, 0, squaitsa, squaitsa, bagman_state, 0, ROT0, "Itisa", "Squash (Itisa)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bailey.cpp b/src/mame/drivers/bailey.cpp
index 15232f62605..ef1f4c9a34d 100644
--- a/src/mame/drivers/bailey.cpp
+++ b/src/mame/drivers/bailey.cpp
@@ -44,7 +44,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -87,7 +87,7 @@ void bailey_state::video_start()
{
}
-static MACHINE_CONFIG_START( bailey, bailey_state )
+static MACHINE_CONFIG_START( bailey )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -152,5 +152,5 @@ ROM_START( fun4a )
ROM_END
-GAME( 1976, fun4, 0, bailey, 0, driver_device, 0, ROT0, "Bailey International", "Fun Four (set 1) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1976, fun4a, fun4, bailey, 0, driver_device, 0, ROT0, "Bailey International", "Fun Four (set 2) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, fun4, 0, bailey, 0, bailey_state, 0, ROT0, "Bailey International", "Fun Four (set 1) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, fun4a, fun4, bailey, 0, bailey_state, 0, ROT0, "Bailey International", "Fun Four (set 2) [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index a151aeaeb7f..3a5768cb1f4 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -1277,7 +1277,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( balsente, balsente_state )
+static MACHINE_CONFIG_START( balsente )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_20MHz/16) /* xtal verified but not speed */
diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp
index 1fc03c95f40..d98b0d8897c 100644
--- a/src/mame/drivers/banctec.cpp
+++ b/src/mame/drivers/banctec.cpp
@@ -127,7 +127,7 @@ static GFXDECODE_START( banctec )
GFXDECODE_ENTRY( "chargen", 0x00000, banctec_gfx_layout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( banctec, banctec_state )
+static MACHINE_CONFIG_START( banctec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, XTAL_11_0592MHz)
@@ -173,5 +173,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT MONITOR COMPANY FULLNAME */
-CONS( 1989, banctec, 0, 0, banctec, 0, driver_device, 0, "DALE Electronics", "BancTec ESeries Panel", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME */
+CONS( 1989, banctec, 0, 0, banctec, 0, banctec_state, 0, "DALE Electronics", "BancTec ESeries Panel", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp
index d9e507395d5..3f0e4bb52ef 100644
--- a/src/mame/drivers/bankp.cpp
+++ b/src/mame/drivers/bankp.cpp
@@ -291,7 +291,7 @@ INTERRUPT_GEN_MEMBER(bankp_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( bankp, bankp_state )
+static MACHINE_CONFIG_START( bankp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
@@ -398,5 +398,5 @@ ROM_END
*
*************************************/
-GAME( 1984, bankp, 0, bankp, bankp, driver_device, 0, ROT0, "Sanritsu / Sega", "Bank Panic", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, combh, 0, bankp, combh, driver_device, 0, ROT270, "Sanritsu / Sega", "Combat Hawk", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bankp, 0, bankp, bankp, bankp_state, 0, ROT0, "Sanritsu / Sega", "Bank Panic", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, combh, 0, bankp, combh, bankp_state, 0, ROT270, "Sanritsu / Sega", "Combat Hawk", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 3984f5e82d9..831d408aa11 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -370,7 +370,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( baraduke, baraduke_state )
+static MACHINE_CONFIG_START( baraduke )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_49_152MHz/32)
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index 97dedb53ecb..5cd63e07c58 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -304,7 +304,7 @@ ADDRESS_MAP_END
* Machine Drivers *
************************/
-static MACHINE_CONFIG_START( barata, barata_state )
+static MACHINE_CONFIG_START( barata )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8051, CPU_CLOCK)
MCFG_CPU_IO_MAP(i8051_io_port)
@@ -329,4 +329,4 @@ ROM_END
/*************************
* Game Drivers *
*************************/
-GAME( 2002, barata, 0, barata, barata, driver_device, 0, ROT0, "Eletro Matic Equipamentos Eletromec??nicos", "Dona Barata (early prototype)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2002, barata, 0, barata, barata, barata_state, 0, ROT0, "Eletro Matic Equipamentos Eletromec??nicos", "Dona Barata (early prototype)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp
index 2e2c93788c7..05dad500f51 100644
--- a/src/mame/drivers/barni.cpp
+++ b/src/mame/drivers/barni.cpp
@@ -56,7 +56,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( barni )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( barni, barni_state )
+static MACHINE_CONFIG_START( barni )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
@@ -99,4 +99,4 @@ ROM_START(redbarnp)
ROM_END
-GAME( 1985, redbarnp, 0, barni, barni, driver_device, 0, ROT0, "Barni", "Red Baron (Pinball)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1985, redbarnp, 0, barni, barni, barni_state, 0, ROT0, "Barni", "Red Baron (Pinball)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp
index 30b2ba9f84f..37fde21a7bd 100644
--- a/src/mame/drivers/bartop52.cpp
+++ b/src/mame/drivers/bartop52.cpp
@@ -34,12 +34,11 @@ class bartop52_state : public atari_common_state
public:
bartop52_state(const machine_config &mconfig, device_type type, const char *tag)
: atari_common_state(mconfig, type, tag)
- { }
+ { }
TIMER_DEVICE_CALLBACK_MEMBER( bartop_interrupt );
virtual void machine_reset() override;
- //required_device<cpu_device> m_maincpu; // maincpu is already contained in atari_common_state
};
@@ -120,9 +119,9 @@ TIMER_DEVICE_CALLBACK_MEMBER( bartop52_state::bartop_interrupt )
m_antic->generic_interrupt(4);
}
-static MACHINE_CONFIG_START( a5200, bartop52_state )
+static MACHINE_CONFIG_START( a5200 )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
+ MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
MCFG_CPU_PROGRAM_MAP(a5200_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bartop52_state, bartop_interrupt, "screen", 0, 1)
@@ -134,9 +133,9 @@ static MACHINE_CONFIG_START( a5200, bartop52_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1))
- MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_VISIBLE_AREA_ANTIC()
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MCFG_SCREEN_UPDATE_DEVICE("antic", antic_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -146,7 +145,7 @@ static MACHINE_CONFIG_START( a5200, bartop52_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
+ MCFG_SOUND_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
MCFG_POKEY_POT0_R_CB(IOPORT("analog_0"))
MCFG_POKEY_POT1_R_CB(IOPORT("analog_1"))
MCFG_POKEY_POT2_R_CB(IOPORT("analog_2"))
@@ -164,4 +163,4 @@ ROM_START(barbball)
ROM_LOAD( "5200.rom", 0xf800, 0x0800, BAD_DUMP CRC(4248d3e3) SHA1(6ad7a1e8c9fad486fbec9498cb48bf5bc3adc530) )
ROM_END
-GAME( 1983, barbball, 0, a5200, bartop52, driver_device, 0, ROT0, "Atari", "Barroom Baseball (prototype)", MACHINE_NOT_WORKING )
+GAME( 1983, barbball, 0, a5200, bartop52, bartop52_state, 0, ROT0, "Atari", "Barroom Baseball (prototype)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index a972bb9f1d0..e2daa857e20 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -48,7 +48,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(unk_r);
uint8_t m_term_data;
required_device<mcs51_cpu_device> m_maincpu;
@@ -91,14 +91,14 @@ READ8_MEMBER( basic52_state::unk_r)
}
-WRITE8_MEMBER( basic52_state::kbd_put )
+void basic52_state::kbd_put(u8 data)
{
m_maincpu->set_input_line(MCS51_RX_LINE, ASSERT_LINE);
m_maincpu->set_input_line(MCS51_RX_LINE, CLEAR_LINE);
m_term_data = data;
}
-static MACHINE_CONFIG_START( basic31, basic52_state )
+static MACHINE_CONFIG_START( basic31 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8031, XTAL_11_0592MHz)
MCFG_CPU_PROGRAM_MAP(basic52_mem)
@@ -108,7 +108,7 @@ static MACHINE_CONFIG_START( basic31, basic52_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(basic52_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(basic52_state, kbd_put))
MCFG_DEVICE_ADD("ppi8255", I8255, 0)
MACHINE_CONFIG_END
@@ -142,6 +142,6 @@ ROM_START( basic31 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, basic52, 0, 0, basic52, basic52, driver_device, 0, "Intel", "MCS BASIC 52", MACHINE_NO_SOUND_HW)
-COMP( 1985, basic31, basic52, 0, basic31, basic52, driver_device, 0, "Intel", "MCS BASIC 31", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, basic52, 0, 0, basic52, basic52, basic52_state, 0, "Intel", "MCS BASIC 52", MACHINE_NO_SOUND_HW)
+COMP( 1985, basic31, basic52, 0, basic31, basic52, basic52_state, 0, "Intel", "MCS BASIC 31", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp
index aff359cac85..158ee3a7aa0 100644
--- a/src/mame/drivers/batman.cpp
+++ b/src/mame/drivers/batman.cpp
@@ -196,7 +196,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( batman, batman_state )
+static MACHINE_CONFIG_START( batman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz)
@@ -309,4 +309,4 @@ ROM_END
*
*************************************/
-GAME( 1991, batman, 0, batman, batman, driver_device, 0, ROT0, "Atari Games", "Batman", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, batman, 0, batman, batman, batman_state, 0, ROT0, "Atari Games", "Batman", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp
index 4f35cb7c9ad..2b0101e93e5 100644
--- a/src/mame/drivers/battlane.cpp
+++ b/src/mame/drivers/battlane.cpp
@@ -270,7 +270,7 @@ void battlane_state::machine_reset()
m_cpu_control = 0;
}
-static MACHINE_CONFIG_START( battlane, battlane_state )
+static MACHINE_CONFIG_START( battlane )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz ? */
@@ -402,6 +402,6 @@ ROM_END
*
*************************************/
-GAME( 1986, battlane, 0, battlane, battlane, driver_device, 0, ROT90, "Technos Japan (Taito license)", "Battle Lane! Vol. 5 (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, battlane2, battlane, battlane, battlane, driver_device, 0, ROT90, "Technos Japan (Taito license)", "Battle Lane! Vol. 5 (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, battlane3, battlane, battlane, battlane, driver_device, 0, ROT90, "Technos Japan (Taito license)", "Battle Lane! Vol. 5 (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, battlane, 0, battlane, battlane, battlane_state, 0, ROT90, "Technos Japan (Taito license)", "Battle Lane! Vol. 5 (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, battlane2, battlane, battlane, battlane, battlane_state, 0, ROT90, "Technos Japan (Taito license)", "Battle Lane! Vol. 5 (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, battlane3, battlane, battlane, battlane, battlane_state, 0, ROT90, "Technos Japan (Taito license)", "Battle Lane! Vol. 5 (set 3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp
index 42a4d47b1f1..89411d0dfa2 100644
--- a/src/mame/drivers/battlera.cpp
+++ b/src/mame/drivers/battlera.cpp
@@ -268,7 +268,7 @@ uint32_t battlera_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
}
-static MACHINE_CONFIG_START( battlera, battlera_state )
+static MACHINE_CONFIG_START( battlera )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280,21477200/3)
@@ -280,7 +280,7 @@ static MACHINE_CONFIG_START( battlera, battlera_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( battlera_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( battlera, battlera_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(battlera_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MCFG_SOUND_ADD("c6280", C6280, 21477270/6)
@@ -372,6 +372,6 @@ ROM_END
/******************************************************************************/
-GAME( 1988, battlera, 0, battlera, battlera, driver_device, 0, ROT0, "Data East Corporation", "Battle Rangers (World)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bldwolf, battlera, battlera, battlera, driver_device, 0, ROT0, "Data East USA", "Bloody Wolf (US)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bldwolfj, battlera, battlera, battlera, driver_device, 0, ROT0, "Data East Corporation", "Narazumono Sentoubutai Bloody Wolf (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, battlera, 0, battlera, battlera, battlera_state, 0, ROT0, "Data East Corporation", "Battle Rangers (World)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bldwolf, battlera, battlera, battlera, battlera_state, 0, ROT0, "Data East USA", "Bloody Wolf (US)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bldwolfj, battlera, battlera, battlera, battlera_state, 0, ROT0, "Data East Corporation", "Narazumono Sentoubutai Bloody Wolf (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index a46cecc16da..dc3f78f4c94 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -288,7 +288,7 @@ void battlex_state::machine_reset()
m_in0_b4 = 0;
}
-static MACHINE_CONFIG_START( battlex, battlex_state )
+static MACHINE_CONFIG_START( battlex )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_10MHz/4 ) // ?
@@ -430,4 +430,4 @@ DRIVER_INIT_MEMBER(battlex_state,battlex)
*************************************/
GAME( 1982, battlex, 0, battlex, battlex, battlex_state, battlex, ROT180, "Omori Electric Co., Ltd.", "Battle Cross", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1983, dodgeman, 0, dodgeman, dodgeman, battlex_state, battlex, ROT180, "Omori Electric Co., Ltd.", "Dodge Man", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1983, dodgeman, 0, dodgeman, dodgeman, battlex_state, battlex, ROT180, "Omori Electric Co., Ltd.", "Dodge Man", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index a6c298df3a7..c696358af6a 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -229,7 +229,7 @@ void battlnts_state::machine_reset()
m_spritebank = 0;
}
-static MACHINE_CONFIG_START( battlnts, battlnts_state )
+static MACHINE_CONFIG_START( battlnts )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */)
@@ -381,9 +381,9 @@ ROM_END
*
*************************************/
-GAME( 1987, battlnts, 0, battlnts, battlnts, driver_device, 0, ROT90, "Konami", "Battlantis (program code G)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, battlntsa, battlnts, battlnts, battlnts, driver_device, 0, ROT90, "Konami", "Battlantis (program code F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, battlntsj, battlnts, battlnts, battlnts, driver_device, 0, ROT90, "Konami", "Battlantis (Japan, program code E)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rackemup, 0, battlnts, rackemup, driver_device, 0, ROT90, "Konami", "Rack 'em Up (program code L)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, thehustl, rackemup, battlnts, thehustl, driver_device, 0, ROT90, "Konami", "The Hustler (Japan, program code M)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, thehustlj, rackemup, battlnts, thehustl, driver_device, 0, ROT90, "Konami", "The Hustler (Japan, program code J)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, battlnts, 0, battlnts, battlnts, battlnts_state, 0, ROT90, "Konami", "Battlantis (program code G)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, battlntsa, battlnts, battlnts, battlnts, battlnts_state, 0, ROT90, "Konami", "Battlantis (program code F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, battlntsj, battlnts, battlnts, battlnts, battlnts_state, 0, ROT90, "Konami", "Battlantis (Japan, program code E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rackemup, 0, battlnts, rackemup, battlnts_state, 0, ROT90, "Konami", "Rack 'em Up (program code L)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, thehustl, rackemup, battlnts, thehustl, battlnts_state, 0, ROT90, "Konami", "The Hustler (Japan, program code M)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, thehustlj, rackemup, battlnts, thehustl, battlnts_state, 0, ROT90, "Konami", "The Hustler (Japan, program code J)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index eee2bbf9444..47f1cd92fa4 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -221,7 +221,7 @@ static ADDRESS_MAP_START( bbcbp_mem, AS_PROGRAM, 8, bbc_state )
AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */
/* W: fe30-fe3f 84LS161 Paged ROM selector */
AM_RANGE(0xfe80, 0xfe83) AM_WRITE(bbc_wd1770_status_w) /* fe80-fe83 1770 FDC Drive control register */
- AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_t, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */
+ AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_device, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */
AM_IMPORT_FROM(bbc_base)
ADDRESS_MAP_END
@@ -234,7 +234,7 @@ static ADDRESS_MAP_START( bbcbp128_mem, AS_PROGRAM, 8, bbc_state )
AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */
/* W: fe30-fe3f 84LS161 Paged ROM selector */
AM_RANGE(0xfe80, 0xfe83) AM_WRITE(bbc_wd1770_status_w) /* fe80-fe83 1770 FDC Drive control register */
- AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_t, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */
+ AM_RANGE(0xfe84, 0xfe9f) AM_DEVREADWRITE("wd1770", wd1770_device, read, write) /* fe84-fe9f 1770 FDC Floppy disc controller */
AM_IMPORT_FROM(bbc_base)
ADDRESS_MAP_END
@@ -836,7 +836,7 @@ MACHINE_CONFIG_END
****************************************************************************/
-static MACHINE_CONFIG_START( bbca, bbc_state )
+static MACHINE_CONFIG_START( bbca )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_16MHz/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbca_mem)
@@ -1269,7 +1269,7 @@ MACHINE_CONFIG_END
****************************************************************************/
-static MACHINE_CONFIG_START( bbcm, bbc_state )
+static MACHINE_CONFIG_START( bbcm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65SC02, XTAL_16MHz/8) /* 2.00 MHz */
MCFG_CPU_PROGRAM_MAP(bbcm_mem)
diff --git a/src/mame/drivers/bbcbc.cpp b/src/mame/drivers/bbcbc.cpp
index aaa2adff968..f366001a5dd 100644
--- a/src/mame/drivers/bbcbc.cpp
+++ b/src/mame/drivers/bbcbc.cpp
@@ -122,7 +122,7 @@ static const z80_daisy_config bbcbc_daisy_chain[] =
};
-static MACHINE_CONFIG_START( bbcbc, bbcbc_state )
+static MACHINE_CONFIG_START( bbcbc )
MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK / 8 )
MCFG_CPU_PROGRAM_MAP(bbcbc_prg)
MCFG_CPU_IO_MAP(bbcbc_io)
@@ -189,5 +189,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-CONS(1985, bbcbc, 0, 0, bbcbc, bbcbc, driver_device, 0, "Unicard", "BBC Bridge Companion", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS(1985, bbcbc, 0, 0, bbcbc, bbcbc, bbcbc_state, 0, "Unicard", "BBC Bridge Companion", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp
index 9737e107089..6b784911298 100644
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@@ -647,7 +647,7 @@ GFXDECODE_END
/******************************************************************************/
-static MACHINE_CONFIG_START( bbusters, bbusters_state )
+static MACHINE_CONFIG_START( bbusters )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( bbusters, bbusters_state )
MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mechatt, bbusters_state )
+static MACHINE_CONFIG_START( mechatt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1114,12 +1114,12 @@ ROM_END
/******************************************************************************/
// as soon as you calibrate the guns in test mode the game refuses to boot
-GAME( 1989, bbusters, 0, bbusters, bbusters, driver_device, 0, ROT0, "SNK", "Beast Busters (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bbustersu, bbusters, bbusters, bbusters, driver_device, 0, ROT0, "SNK", "Beast Busters (US, Version 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bbustersua, bbusters, bbusters, bbusters, driver_device, 0, ROT0, "SNK", "Beast Busters (US, Version 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bbustersj, bbusters, bbusters, bbusters, driver_device, 0, ROT0, "SNK", "Beast Busters (Japan, Version 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, mechatt, 0, mechatt, mechatt, driver_device, 0, ROT0, "SNK", "Mechanized Attack (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mechattj, mechatt, mechatt, mechattj, driver_device, 0, ROT0, "SNK", "Mechanized Attack (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mechattu, mechatt, mechatt, mechattu, driver_device, 0, ROT0, "SNK", "Mechanized Attack (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mechattu1, mechatt, mechatt, mechattu, driver_device, 0, ROT0, "SNK", "Mechanized Attack (US, Version 1, Single Player)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bbusters, 0, bbusters, bbusters, bbusters_state, 0, ROT0, "SNK", "Beast Busters (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bbustersu, bbusters, bbusters, bbusters, bbusters_state, 0, ROT0, "SNK", "Beast Busters (US, Version 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bbustersua, bbusters, bbusters, bbusters, bbusters_state, 0, ROT0, "SNK", "Beast Busters (US, Version 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bbustersj, bbusters, bbusters, bbusters, bbusters_state, 0, ROT0, "SNK", "Beast Busters (Japan, Version 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, mechatt, 0, mechatt, mechatt, bbusters_state, 0, ROT0, "SNK", "Mechanized Attack (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mechattj, mechatt, mechatt, mechattj, bbusters_state, 0, ROT0, "SNK", "Mechanized Attack (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mechattu, mechatt, mechatt, mechattu, bbusters_state, 0, ROT0, "SNK", "Mechanized Attack (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mechattu1, mechatt, mechatt, mechattu, bbusters_state, 0, ROT0, "SNK", "Mechanized Attack (US, Version 1, Single Player)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index 496b43d317a..e015a97d214 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -374,7 +374,7 @@ DRIVER_INIT_MEMBER( bcs3_state, bcs3d )
s_cols = 29;
}
-static MACHINE_CONFIG_START( bcs3, bcs3_state )
+static MACHINE_CONFIG_START( bcs3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz /2)
@@ -401,7 +401,7 @@ static MACHINE_CONFIG_START( bcs3, bcs3_state )
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bcs3a, bcs3_state )
+static MACHINE_CONFIG_START( bcs3a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_7MHz /2)
@@ -486,9 +486,9 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, bcs3, 0, 0, bcs3, bcs3, driver_device, 0, "Eckhard Schiller", "BCS 3 rev 2.4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, bcs3, 0, 0, bcs3, bcs3, bcs3_state, 0, "Eckhard Schiller", "BCS 3 rev 2.4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
COMP( 1986, bcs3a, bcs3, 0, bcs3a, bcs3, bcs3_state, bcs3a, "Eckhard Schiller", "BCS 3 rev 3.1 29-column", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
COMP( 1986, bcs3b, bcs3, 0, bcs3b, bcs3, bcs3_state, bcs3b, "Eckhard Schiller", "BCS 3 rev 3.1 40-column", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1986, bcs3c, bcs3, 0, bcs3a, bcs3, bcs3_state, bcs3c, "Eckhard Schiller", "BCS 3 rev 3.2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1986, bcs3d, bcs3, 0, bcs3a, bcs3, bcs3_state, bcs3d, "Eckhard Schiller", "BCS 3 rev 3.3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1986, bcs3c, bcs3, 0, bcs3a, bcs3, bcs3_state, bcs3c, "Eckhard Schiller", "BCS 3 rev 3.2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1986, bcs3d, bcs3, 0, bcs3a, bcs3, bcs3_state, bcs3d, "Eckhard Schiller", "BCS 3 rev 3.3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp
index dcd8e7d0594..9056cbef8d8 100644
--- a/src/mame/drivers/beaminv.cpp
+++ b/src/mame/drivers/beaminv.cpp
@@ -335,7 +335,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( beaminv, beaminv_state )
+static MACHINE_CONFIG_START( beaminv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
@@ -389,5 +389,5 @@ ROM_END
*
*************************************/
-GAMEL( 1979, beaminv, 0, beaminv, beaminv, driver_device, 0, ROT270, "Teknon Kogyo", "Beam Invader", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_beaminv )
-GAMEL( 1979, pacominv, beaminv, beaminv, pacominv, driver_device, 0, ROT270, "Pacom Corporation", "Pacom Invader", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_beaminv )
+GAMEL( 1979, beaminv, 0, beaminv, beaminv, beaminv_state, 0, ROT270, "Teknon Kogyo", "Beam Invader", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_beaminv )
+GAMEL( 1979, pacominv, beaminv, beaminv, pacominv, beaminv_state, 0, ROT270, "Pacom Corporation", "Pacom Invader", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_beaminv )
diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp
index cd57cc06e45..67306d9a825 100644
--- a/src/mame/drivers/beathead.cpp
+++ b/src/mame/drivers/beathead.cpp
@@ -360,7 +360,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( beathead, beathead_state )
+static MACHINE_CONFIG_START( beathead )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ASAP, ATARI_CLOCK_14MHz)
@@ -430,4 +430,4 @@ ROM_END
*
*************************************/
-GAME( 1993, beathead, 0, beathead, beathead, driver_device, 0, ROT0, "Atari Games", "BeatHead (prototype)", 0 )
+GAME( 1993, beathead, 0, beathead, beathead, beathead_state, 0, ROT0, "Atari Games", "BeatHead (prototype)", 0 )
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index 047a1486f9c..dd094666a95 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -138,10 +138,10 @@ WRITE_LINE_MEMBER(bebox_state::bebox_keyboard_interrupt)
static SLOT_INTERFACE_START( pci_devices )
SLOT_INTERFACE_INTERNAL("mpc105", MPC105)
- SLOT_INTERFACE("cirrus", CIRRUS)
+ SLOT_INTERFACE("cirrus", PCI_CIRRUS_SVGA)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( bebox, bebox_state )
+static MACHINE_CONFIG_START( bebox )
/* basic machine hardware */
MCFG_CPU_ADD("ppc1", PPC603, 66000000) /* 66 MHz */
MCFG_CPU_PROGRAM_MAP(bebox_mem)
@@ -257,6 +257,6 @@ ROM_START(bebox2)
ROM_LOAD( "bootnub.rom", 0x000000, 0x4000, CRC(5348d09a) SHA1(1b637a3d7a2b072aa128dd5c037bbb440d525c1a) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1995, bebox, 0, 0, bebox, bebox, bebox_state, bebox, "Be Inc", "BeBox Dual603-66", MACHINE_NOT_WORKING )
-COMP( 1996, bebox2, bebox, 0, bebox2, bebox, bebox_state, bebox, "Be Inc", "BeBox Dual603-133", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1995, bebox, 0, 0, bebox, bebox, bebox_state, bebox, "Be Inc", "BeBox Dual603-66", MACHINE_NOT_WORKING )
+COMP( 1996, bebox2, bebox, 0, bebox2, bebox, bebox_state, bebox, "Be Inc", "BeBox Dual603-133", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp
index e8da27e5015..3b3f2153e93 100644
--- a/src/mame/drivers/beehive.cpp
+++ b/src/mame/drivers/beehive.cpp
@@ -285,7 +285,7 @@ uint32_t beehive_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
return 0;
}
-static MACHINE_CONFIG_START( beehive, beehive_state )
+static MACHINE_CONFIG_START( beehive )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(beehive_mem)
@@ -317,5 +317,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, beehive, 0, 0, beehive, beehive, driver_device, 0, "BeeHive", "DM3270", MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, beehive, 0, 0, beehive, beehive, beehive_state, 0, "BeeHive", "DM3270", MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 2490f0eb008..82a0a065e48 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -458,7 +458,7 @@ void beezer_state::machine_reset()
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( beezer, beezer_state )
+static MACHINE_CONFIG_START( beezer )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz / 12)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -596,6 +596,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
-GAME( 1982, beezer, 0, beezer, beezer, driver_device, 0, ROT90, "Tong Electronic", "Beezer (set 1)", MACHINE_IMPERFECT_SOUND )
-GAME( 1982, beezer1, beezer, beezer, beezer, driver_device, 0, ROT90, "Tong Electronic", "Beezer (set 2)", MACHINE_IMPERFECT_SOUND )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
+GAME( 1982, beezer, 0, beezer, beezer, beezer_state, 0, ROT90, "Tong Electronic", "Beezer (set 1)", MACHINE_IMPERFECT_SOUND )
+GAME( 1982, beezer1, beezer, beezer, beezer, beezer_state, 0, ROT90, "Tong Electronic", "Beezer (set 2)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/belatra.cpp b/src/mame/drivers/belatra.cpp
index 7c94c0eec1c..e22320d7d95 100644
--- a/src/mame/drivers/belatra.cpp
+++ b/src/mame/drivers/belatra.cpp
@@ -67,7 +67,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( belatra )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( belatra, belatra_state )
+static MACHINE_CONFIG_START( belatra )
MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess...
MCFG_CPU_PROGRAM_MAP(belatra_map)
@@ -121,12 +121,12 @@ ROM_START( ldrinka )
ROM_END
-GAME( 2004, fairyl2 ,0, belatra, belatra, driver_device, 0, ROT0, "Belatra","Fairy Land 2 (set 1)", MACHINE_IS_SKELETON )
-GAME( 2004, fairyl2a ,fairyl2, belatra, belatra, driver_device, 0, ROT0, "Belatra","Fairy Land 2 (set 2)", MACHINE_IS_SKELETON )
-GAME( 2004, fairyl2b ,fairyl2, belatra, belatra, driver_device, 0, ROT0, "Belatra","Fairy Land 2 (set 3)", MACHINE_IS_SKELETON )
-GAME( 2004, fairyl2bl ,fairyl2, belatra, belatra, driver_device, 0, ROT0, "Belatra","Fairy Land 2 (bootleg)", MACHINE_IS_SKELETON )
+GAME( 2004, fairyl2, 0, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Fairy Land 2 (set 1)", MACHINE_IS_SKELETON )
+GAME( 2004, fairyl2a, fairyl2, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Fairy Land 2 (set 2)", MACHINE_IS_SKELETON )
+GAME( 2004, fairyl2b, fairyl2, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Fairy Land 2 (set 3)", MACHINE_IS_SKELETON )
+GAME( 2004, fairyl2bl, fairyl2, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Fairy Land 2 (bootleg)", MACHINE_IS_SKELETON )
-GAME( 2004, ldrink ,0, belatra, belatra, driver_device, 0, ROT0, "Belatra","Lucky Drink (set 1)", MACHINE_IS_SKELETON )
-GAME( 2004, ldrinka ,ldrink, belatra, belatra, driver_device, 0, ROT0, "Belatra","Lucky Drink (set 2)", MACHINE_IS_SKELETON )
+GAME( 2004, ldrink, 0, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Lucky Drink (set 1)", MACHINE_IS_SKELETON )
+GAME( 2004, ldrinka, ldrink, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Lucky Drink (set 2)", MACHINE_IS_SKELETON )
-GAME( 2004, merryjn ,0, belatra, belatra, driver_device, 0, ROT0, "Belatra","Merry Joiner", MACHINE_IS_SKELETON )
+GAME( 2004, merryjn, 0, belatra, belatra, belatra_state, 0, ROT0, "Belatra","Merry Joiner", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp
index 1b83f20cbe6..c87689ad36b 100644
--- a/src/mame/drivers/berzerk.cpp
+++ b/src/mame/drivers/berzerk.cpp
@@ -1103,7 +1103,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( berzerk, berzerk_state )
+static MACHINE_CONFIG_START( berzerk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
@@ -1321,10 +1321,10 @@ DRIVER_INIT_MEMBER(berzerk_state,moonwarp)
*
*************************************/
-GAME( 1980, berzerk, 0, berzerk, berzerk, driver_device, 0, ROT0, "Stern Electronics", "Berzerk (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, berzerk1, berzerk, berzerk, berzerk, driver_device, 0, ROT0, "Stern Electronics", "Berzerk (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, berzerkf, berzerk, berzerk, berzerkf, driver_device, 0, ROT0, "Stern Electronics", "Berzerk (French Speech)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, berzerkg, berzerk, berzerk, berzerkg, driver_device, 0, ROT0, "Stern Electronics", "Berzerk (German Speech)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, berzerks, berzerk, berzerk, berzerks, driver_device, 0, ROT0, "Stern Electronics (Sonic License)", "Berzerk (Spanish Speech)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, frenzy, 0, frenzy, frenzy, driver_device, 0, ROT0, "Stern Electronics", "Frenzy", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, berzerk, 0, berzerk, berzerk, berzerk_state, 0, ROT0, "Stern Electronics", "Berzerk (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, berzerk1, berzerk, berzerk, berzerk, berzerk_state, 0, ROT0, "Stern Electronics", "Berzerk (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, berzerkf, berzerk, berzerk, berzerkf, berzerk_state, 0, ROT0, "Stern Electronics", "Berzerk (French Speech)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, berzerkg, berzerk, berzerk, berzerkg, berzerk_state, 0, ROT0, "Stern Electronics", "Berzerk (German Speech)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, berzerks, berzerk, berzerk, berzerks, berzerk_state, 0, ROT0, "Stern Electronics (Sonic License)", "Berzerk (Spanish Speech)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, frenzy, 0, frenzy, frenzy, berzerk_state, 0, ROT0, "Stern Electronics", "Frenzy", MACHINE_SUPPORTS_SAVE )
GAME( 1981, moonwarp, 0, frenzy, moonwarp, berzerk_state, moonwarp, ROT0, "Stern Electronics", "Moon War (prototype on Frenzy hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/besta.cpp b/src/mame/drivers/besta.cpp
index 7b3d4af5c5f..76f0ef71c11 100644
--- a/src/mame/drivers/besta.cpp
+++ b/src/mame/drivers/besta.cpp
@@ -42,14 +42,17 @@ public:
DECLARE_READ8_MEMBER( mpcc_reg_r );
DECLARE_WRITE8_MEMBER( mpcc_reg_w );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
+
+protected:
+ virtual void machine_reset() override;
+
uint8_t m_term_data;
uint8_t m_mpcc_regs[32];
required_device<cpu_device> m_maincpu;
required_device<pit68230_device> m_pit1;
required_device<pit68230_device> m_pit2;
- virtual void machine_reset() override;
required_device<generic_terminal_device> m_terminal;
required_shared_ptr<uint32_t> m_p_ram;
@@ -78,25 +81,23 @@ READ8_MEMBER( besta_state::mpcc_reg_r )
WRITE8_MEMBER( besta_state::mpcc_reg_w )
{
- device_t *devconf = machine().device(TERMINAL_TAG);
-
DBG_LOG(1,"mpcc_reg_w",("(%d) <- %02X at %s\n", offset, data, machine().describe_context()));
switch (offset) {
case 2:
- m_term_data = data;
+ kbd_put(data);
break;
case 10:
- dynamic_cast<generic_terminal_device *>(devconf)->write(generic_space(), 0, data);
+ m_terminal->write(generic_space(), 0, data);
default:
m_mpcc_regs[offset] = data;
break;
}
}
-WRITE8_MEMBER( besta_state::kbd_put )
+void besta_state::kbd_put(u8 data)
{
- mpcc_reg_w(space, (offs_t)2, data, mem_mask);
+ m_term_data = data;
}
static ADDRESS_MAP_START(besta_mem, AS_PROGRAM, 32, besta_state)
@@ -132,7 +133,7 @@ void besta_state::machine_reset()
}
/* CP31 processor board */
-static MACHINE_CONFIG_START( besta, besta_state )
+static MACHINE_CONFIG_START( besta )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68030, 2*16670000)
MCFG_CPU_PROGRAM_MAP(besta_mem)
@@ -142,7 +143,7 @@ static MACHINE_CONFIG_START( besta, besta_state )
MCFG_DEVICE_ADD ("pit2", PIT68230, 16670000 / 2) // XXX verify clock
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(besta_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(besta_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -160,5 +161,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, besta88, 0, 0, besta, besta, driver_device, 0, "Sapsan", "Besta-88", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1988, besta88, 0, 0, besta, besta, besta_state, 0, "Sapsan", "Besta-88", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp
index ca0175f0c39..6aee7c966db 100644
--- a/src/mame/drivers/bestleag.cpp
+++ b/src/mame/drivers/bestleag.cpp
@@ -375,7 +375,7 @@ static GFXDECODE_START( bestleag )
GFXDECODE_ENTRY( "gfx2", 0, bestleag_char16layout, 0x300, 16 )
GFXDECODE_END
-static MACHINE_CONFIG_START( bestleag, bestleag_state )
+static MACHINE_CONFIG_START( bestleag )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(bestleag_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bestleag_state, irq6_line_hold)
@@ -394,7 +394,7 @@ static MACHINE_CONFIG_START( bestleag, bestleag_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* Hand-tuned */
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) /* Hand-tuned */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MACHINE_CONFIG_END
@@ -474,5 +474,5 @@ ROM_END
/* GAME drivers */
-GAME( 1993, bestleag, bigstrik, bestleag, bestleag, driver_device, 0, ROT0, "bootleg", "Best League (bootleg of Big Striker, Italian Serie A)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, bestleaw, bigstrik, bestleaw, bestleag, driver_device, 0, ROT0, "bootleg", "Best League (bootleg of Big Striker, World Cup)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, bestleag, bigstrik, bestleag, bestleag, bestleag_state, 0, ROT0, "bootleg", "Best League (bootleg of Big Striker, Italian Serie A)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, bestleaw, bigstrik, bestleaw, bestleag, bestleag_state, 0, ROT0, "bootleg", "Best League (bootleg of Big Striker, World Cup)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index f9e1cbf22de..61c417a5269 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -102,8 +102,8 @@ public:
/* Memory Maps */
static ADDRESS_MAP_START( beta_mem, AS_PROGRAM, 8, beta_state )
- AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x7f00) AM_DEVICE(M6532_TAG, mos6532_t, ram_map)
- AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x7f00) AM_DEVICE(M6532_TAG, mos6532_t, io_map)
+ AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x7f00) AM_DEVICE(M6532_TAG, mos6532_new_device, ram_map)
+ AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x7f00) AM_DEVICE(M6532_TAG, mos6532_new_device, io_map)
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x7800) AM_ROM
ADDRESS_MAP_END
@@ -335,7 +335,7 @@ void beta_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( beta, beta_state )
+static MACHINE_CONFIG_START( beta )
/* basic machine hardware */
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_4MHz/4)
MCFG_CPU_PROGRAM_MAP(beta_mem)
@@ -349,7 +349,7 @@ static MACHINE_CONFIG_START( beta, beta_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
/* devices */
- MCFG_DEVICE_ADD(M6532_TAG, MOS6532n, XTAL_4MHz/4)
+ MCFG_DEVICE_ADD(M6532_TAG, MOS6532_NEW, XTAL_4MHz/4)
MCFG_MOS6530n_IN_PA_CB(READ8(beta_state, riot_pa_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(beta_state, riot_pa_w))
MCFG_MOS6530n_IN_PB_CB(READ8(beta_state, riot_pb_r))
@@ -376,5 +376,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, beta, 0, 0, beta, beta, driver_device, 0, "Pitronics", "Beta", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, beta, 0, 0, beta, beta, beta_state, 0, "Pitronics", "Beta", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp
index 6feee17b8f0..f97a735a284 100644
--- a/src/mame/drivers/bfcobra.cpp
+++ b/src/mame/drivers/bfcobra.cpp
@@ -1631,7 +1631,7 @@ INTERRUPT_GEN_MEMBER(bfcobra_state::vblank_gen)
update_irqs();
}
-static MACHINE_CONFIG_START( bfcobra, bfcobra_state )
+static MACHINE_CONFIG_START( bfcobra )
MCFG_CPU_ADD("maincpu", Z80, Z80_XTAL)
MCFG_CPU_PROGRAM_MAP(z80_prog_map)
MCFG_CPU_IO_MAP(z80_io_map)
diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp
index a40e3782982..07238c4bac8 100644
--- a/src/mame/drivers/bfm_ad5.cpp
+++ b/src/mame/drivers/bfm_ad5.cpp
@@ -77,7 +77,7 @@ INTERRUPT_GEN_MEMBER(adder5_state::ad5_fake_timer_int)
// m_maincpu->set_input_line_and_vector(5, HOLD_LINE, 0x8c);
}
-MACHINE_CONFIG_START( bfm_ad5, adder5_state )
+MACHINE_CONFIG_START( bfm_ad5 )
MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */
MCFG_CPU_PROGRAM_MAP(ad5_map)
MCFG_CPU_PERIODIC_INT_DRIVER(adder5_state, ad5_fake_timer_int, 1000)
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index f0c5764dabc..592736e7bbc 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -213,7 +213,7 @@ public:
required_device<stepper_device> m_reel4;
required_device<stepper_device> m_reel5;
optional_device<upd7759_device> m_upd7759;
- optional_device<bfm_bd1_t> m_vfd0;
+ optional_device<bfm_bd1_device> m_vfd0;
required_device<meters_device> m_meters;
};
@@ -1077,7 +1077,7 @@ INPUT_PORTS_END
// machine driver for scorpion1 board ///////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
-static MACHINE_CONFIG_START( scorpion1, bfm_sc1_state )
+static MACHINE_CONFIG_START( scorpion1 )
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
MCFG_CPU_PROGRAM_MAP(sc1_base) // setup read and write memorymap
MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc1_state, timer_irq, 1000) // generate 1000 IRQ's per second
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index f684fb88430..b1745ca56b9 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -230,9 +230,9 @@ public:
required_device<upd7759_device> m_upd7759;
- optional_device<bfm_bd1_t> m_vfd0;
- optional_device<bfm_bd1_t> m_vfd1;
- optional_device<bfmdm01_device> m_dm01;
+ optional_device<bfm_bd1_device> m_vfd0;
+ optional_device<bfm_bd1_device> m_vfd1;
+ optional_device<bfm_dm01_device> m_dm01;
optional_device<meters_device> m_meters; // scorpion2_vid doesn't use this (scorpion2_vidm does)
int m_sc2gui_update_mmtr; //not used?
@@ -2214,7 +2214,7 @@ MACHINE_START_MEMBER(bfm_sc2_state,bfm_sc2)
save_state();
}
-static MACHINE_CONFIG_START( scorpion2_vid, bfm_sc2_state )
+static MACHINE_CONFIG_START( scorpion2_vid )
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 ) // 6809 CPU at 2 Mhz
MCFG_CPU_PROGRAM_MAP(memmap_vid) // setup scorpion2 board memorymap
MCFG_CPU_PERIODIC_INT_DRIVER(bfm_sc2_state, timer_irq, 1000) // generate 1000 IRQ's per second
@@ -3688,7 +3688,7 @@ MACHINE_START_MEMBER(bfm_sc2_state,sc2dmd)
/* machine driver for scorpion2 board */
-static MACHINE_CONFIG_START( scorpion2, bfm_sc2_state )
+static MACHINE_CONFIG_START( scorpion2 )
MCFG_MACHINE_RESET_OVERRIDE(bfm_sc2_state,awp_init)
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
MCFG_CPU_PROGRAM_MAP(memmap_no_vid)
@@ -3749,7 +3749,7 @@ MACHINE_CONFIG_END
/* machine driver for scorpion2 board + matrix board */
-static MACHINE_CONFIG_START( scorpion2_dm01, bfm_sc2_state )
+static MACHINE_CONFIG_START( scorpion2_dm01 )
MCFG_MACHINE_RESET_OVERRIDE(bfm_sc2_state,dm01_init)
MCFG_QUANTUM_TIME(attotime::from_hz(960)) // needed for serial communication !!
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4 )
@@ -3772,8 +3772,8 @@ static MACHINE_CONFIG_START( scorpion2_dm01, bfm_sc2_state )
/* video hardware */
MCFG_DEFAULT_LAYOUT(layout_sc2_dmd)
- MCFG_DEVICE_ADD("dm01", BF_DM01, 0)
- MCFG_BF_DM01_BUSY_CB(WRITELINE(bfm_sc2_state, bfmdm01_busy))
+ MCFG_DEVICE_ADD("dm01", BFM_DM01, 0)
+ MCFG_BFM_DM01_BUSY_CB(WRITELINE(bfm_sc2_state, bfmdm01_busy))
MCFG_STARPOINT_48STEP_ADD("reel0")
MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(bfm_sc2_state, reel0_optic_cb))
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index 4fa9a38450c..490cc9b7416 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -817,13 +817,11 @@ MACHINE_START_MEMBER(sc4_state,sc4)
{
m_nvram->set_base(m_mainram, sizeof(m_mainram));
-
m_maincpu->set_port_callbacks(
- m68307_porta_read_delegate(FUNC(sc4_state::bfm_sc4_68307_porta_r),this),
- m68307_porta_write_delegate(FUNC(sc4_state::bfm_sc4_68307_porta_w),this),
- m68307_portb_read_delegate(FUNC(sc4_state::bfm_sc4_68307_portb_r),this),
- m68307_portb_write_delegate(FUNC(sc4_state::bfm_sc4_68307_portb_w),this) );
-
+ m68307_cpu_device::porta_read_delegate(FUNC(sc4_state::bfm_sc4_68307_porta_r), this),
+ m68307_cpu_device::porta_write_delegate(FUNC(sc4_state::bfm_sc4_68307_porta_w), this),
+ m68307_cpu_device::portb_read_delegate(FUNC(sc4_state::bfm_sc4_68307_portb_r), this),
+ m68307_cpu_device::portb_write_delegate(FUNC(sc4_state::bfm_sc4_68307_portb_w), this));
}
@@ -923,7 +921,7 @@ MACHINE_CONFIG_FRAGMENT( sc4_common )
MACHINE_CONFIG_END
//Standard 6 reels all connected
-MACHINE_CONFIG_START( sc4, sc4_state )
+MACHINE_CONFIG_START( sc4 )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -941,7 +939,7 @@ MACHINE_CONFIG_START( sc4, sc4_state )
MACHINE_CONFIG_END
//Standard 3 reels
-MACHINE_CONFIG_START( sc4_3reel, sc4_state )
+MACHINE_CONFIG_START( sc4_3reel )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -954,7 +952,7 @@ MACHINE_CONFIG_START( sc4_3reel, sc4_state )
MACHINE_CONFIG_END
//Standard 4 reels
-MACHINE_CONFIG_START( sc4_4reel, sc4_state )
+MACHINE_CONFIG_START( sc4_4reel )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -968,7 +966,7 @@ MACHINE_CONFIG_START( sc4_4reel, sc4_state )
MACHINE_CONFIG_END
//4 reels, with the last connected to RL4 not RL3
-MACHINE_CONFIG_START( sc4_4reel_alt, sc4_state )
+MACHINE_CONFIG_START( sc4_4reel_alt )
MCFG_FRAGMENT_ADD(sc4_common)
@@ -985,7 +983,7 @@ MACHINE_CONFIG_END
//Standard 5 reels
-MACHINE_CONFIG_START( sc4_5reel, sc4_state )
+MACHINE_CONFIG_START( sc4_5reel )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1001,7 +999,7 @@ MACHINE_CONFIG_START( sc4_5reel, sc4_state )
MACHINE_CONFIG_END
//5 reels, with RL4 skipped
-MACHINE_CONFIG_START( sc4_5reel_alt, sc4_state )
+MACHINE_CONFIG_START( sc4_5reel_alt )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1019,7 +1017,7 @@ MACHINE_CONFIG_START( sc4_5reel_alt, sc4_state )
MACHINE_CONFIG_END
//6 reels, last 200 steps
-MACHINE_CONFIG_START( sc4_200_std, sc4_state )
+MACHINE_CONFIG_START( sc4_200_std )
MCFG_FRAGMENT_ADD(sc4_common)
@@ -1038,7 +1036,7 @@ MACHINE_CONFIG_START( sc4_200_std, sc4_state )
MACHINE_CONFIG_END
//6 reels, last 200 steps
-MACHINE_CONFIG_START( sc4_200_alt, sc4_state )
+MACHINE_CONFIG_START( sc4_200_alt )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1056,7 +1054,7 @@ MACHINE_CONFIG_START( sc4_200_alt, sc4_state )
MACHINE_CONFIG_END
//6 reels, RL4 200 steps
-MACHINE_CONFIG_START( sc4_200_alta, sc4_state )
+MACHINE_CONFIG_START( sc4_200_alta )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1074,7 +1072,7 @@ MACHINE_CONFIG_START( sc4_200_alta, sc4_state )
MACHINE_CONFIG_END
//6 reels, 3 48 step, 3 200 step
-MACHINE_CONFIG_START( sc4_200_altb, sc4_state )
+MACHINE_CONFIG_START( sc4_200_altb )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_200STEP_ADD("reel1")
@@ -1092,7 +1090,7 @@ MACHINE_CONFIG_START( sc4_200_altb, sc4_state )
MACHINE_CONFIG_END
//5 reels, last one 200 steps
-MACHINE_CONFIG_START( sc4_200_5r, sc4_state )
+MACHINE_CONFIG_START( sc4_200_5r )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1110,7 +1108,7 @@ MACHINE_CONFIG_END
//5 reels, last one 200 steps, RL4 skipped
-MACHINE_CONFIG_START( sc4_200_5ra, sc4_state )
+MACHINE_CONFIG_START( sc4_200_5ra )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1127,7 +1125,7 @@ MACHINE_CONFIG_START( sc4_200_5ra, sc4_state )
MACHINE_CONFIG_END
//5 reels, last one 200 steps, RL5 skipped
-MACHINE_CONFIG_START( sc4_200_5rb, sc4_state )
+MACHINE_CONFIG_START( sc4_200_5rb )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1144,7 +1142,7 @@ MACHINE_CONFIG_START( sc4_200_5rb, sc4_state )
MACHINE_CONFIG_END
//5 reels, RL5 200 steps, RL4 skipped
-MACHINE_CONFIG_START( sc4_200_5rc, sc4_state )
+MACHINE_CONFIG_START( sc4_200_5rc )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1161,7 +1159,7 @@ MACHINE_CONFIG_START( sc4_200_5rc, sc4_state )
MACHINE_CONFIG_END
//4 reels, last one 200 steps
-MACHINE_CONFIG_START( sc4_200_4r, sc4_state )
+MACHINE_CONFIG_START( sc4_200_4r )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1175,7 +1173,7 @@ MACHINE_CONFIG_START( sc4_200_4r, sc4_state )
MACHINE_CONFIG_END
//4 reels, last one 200 steps, RL4 skipped
-MACHINE_CONFIG_START( sc4_200_4ra, sc4_state )
+MACHINE_CONFIG_START( sc4_200_4ra )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1191,7 +1189,7 @@ MACHINE_CONFIG_END
//4 reels, last one 200 steps, RL4,5 skipped
-MACHINE_CONFIG_START( sc4_200_4rb, sc4_state )
+MACHINE_CONFIG_START( sc4_200_4rb )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_RM20_48STEP_ADD("reel1")
@@ -1205,7 +1203,7 @@ MACHINE_CONFIG_START( sc4_200_4rb, sc4_state )
MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel6_optic_cb))
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( sc4_4reel_200, sc4_state )
+MACHINE_CONFIG_START( sc4_4reel_200 )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_200STEP_ADD("reel1")
@@ -1218,7 +1216,7 @@ MACHINE_CONFIG_START( sc4_4reel_200, sc4_state )
MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( sc4_3reel_200, sc4_state )
+MACHINE_CONFIG_START( sc4_3reel_200 )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_STARPOINT_200STEP_ADD("reel1")
@@ -1229,7 +1227,7 @@ MACHINE_CONFIG_START( sc4_3reel_200, sc4_state )
MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel3_optic_cb))
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( sc4_3reel_200_48, sc4_state )
+MACHINE_CONFIG_START( sc4_3reel_200_48 )
MCFG_FRAGMENT_ADD(sc4_common)
@@ -1243,7 +1241,7 @@ MACHINE_CONFIG_START( sc4_3reel_200_48, sc4_state )
MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(sc4_state, reel4_optic_cb))
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( sc4_no_reels, sc4_state )
+MACHINE_CONFIG_START( sc4_no_reels )
MCFG_FRAGMENT_ADD(sc4_common)
MACHINE_CONFIG_END
@@ -1254,7 +1252,7 @@ MACHINE_START_MEMBER(sc4_adder4_state,adder4)
MACHINE_START_CALL_MEMBER(sc4);
}
-MACHINE_CONFIG_START( sc4_adder4, sc4_adder4_state )
+MACHINE_CONFIG_START( sc4_adder4 )
MCFG_FRAGMENT_ADD(sc4_common)
MCFG_CPU_ADD("adder4", M68340, 25175000) // 68340 (CPU32 core)
@@ -1263,13 +1261,13 @@ MACHINE_CONFIG_START( sc4_adder4, sc4_adder4_state )
MCFG_MACHINE_START_OVERRIDE(sc4_adder4_state, adder4 )
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( sc4dmd, sc4_state )
+MACHINE_CONFIG_START( sc4dmd )
MCFG_FRAGMENT_ADD(sc4_common)
/* video hardware */
//MCFG_DEFAULT_LAYOUT(layout_sc4_dmd)
- MCFG_DEVICE_ADD("dm01", BF_DM01, 0)
- MCFG_BF_DM01_BUSY_CB(WRITELINE(sc4_state, bfmdm01_busy))
+ MCFG_DEVICE_ADD("dm01", BFM_DM01, 0)
+ MCFG_BFM_DM01_BUSY_CB(WRITELINE(sc4_state, bfmdm01_busy))
MCFG_MACHINE_START_OVERRIDE(sc4_state, sc4 )
diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp
index 6093b486c18..6d89ddaf442 100644
--- a/src/mame/drivers/bfm_sc5.cpp
+++ b/src/mame/drivers/bfm_sc5.cpp
@@ -209,7 +209,7 @@ WRITE8_MEMBER(bfm_sc5_state::bfm_sc5_duart_output_w)
logerror("bfm_sc5_duart_output_w\n");
}
-MACHINE_CONFIG_START( bfm_sc5, bfm_sc5_state )
+MACHINE_CONFIG_START( bfm_sc5 )
MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* MCF5206eFT */
MCFG_CPU_PROGRAM_MAP(sc5_map)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp
index da25b10fedf..c43bc51a652 100644
--- a/src/mame/drivers/bfm_swp.cpp
+++ b/src/mame/drivers/bfm_swp.cpp
@@ -130,7 +130,7 @@ public:
protected:
// devices
- required_device<m68340cpu_device> m_maincpu;
+ required_device<m68340_cpu_device> m_maincpu;
virtual void machine_start() override;
};
@@ -198,7 +198,7 @@ void bfm_swp_state::machine_start()
}
-static MACHINE_CONFIG_START( bfm_swp, bfm_swp_state )
+static MACHINE_CONFIG_START( bfm_swp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68340, 16000000)
@@ -301,7 +301,7 @@ ROM_END
-GAME( 199?, c3_rtime , 0 , bfm_swp, bfm_swp, driver_device, 0, ROT0, "BFM", "Radio Times (Bellfruit) (Cobra 3)", MACHINE_IS_SKELETON )
-GAME( 199?, c3_telly , 0 , bfm_swp, bfm_swp, driver_device, 0, ROT0, "BFM", "Telly Addicts (Bellfruit) (Cobra 3)", MACHINE_IS_SKELETON )
-GAME( 199?, c3_totp , 0 , bfm_swp, bfm_swp, driver_device, 0, ROT0, "BFM", "Top of the Pops (Bellfruit) (Cobra 3?)", MACHINE_IS_SKELETON )
-GAME( 199?, c3_ppays , 0 , bfm_swp, bfm_swp, driver_device, 0, ROT0, "BFM", "The Phrase That Pays (Bellfruit) (Cobra 3?)", MACHINE_IS_SKELETON )
+GAME( 199?, c3_rtime , 0 , bfm_swp, bfm_swp, bfm_swp_state, 0, ROT0, "BFM", "Radio Times (Bellfruit) (Cobra 3)", MACHINE_IS_SKELETON )
+GAME( 199?, c3_telly , 0 , bfm_swp, bfm_swp, bfm_swp_state, 0, ROT0, "BFM", "Telly Addicts (Bellfruit) (Cobra 3)", MACHINE_IS_SKELETON )
+GAME( 199?, c3_totp , 0 , bfm_swp, bfm_swp, bfm_swp_state, 0, ROT0, "BFM", "Top of the Pops (Bellfruit) (Cobra 3?)", MACHINE_IS_SKELETON )
+GAME( 199?, c3_ppays , 0 , bfm_swp, bfm_swp, bfm_swp_state, 0, ROT0, "BFM", "The Phrase That Pays (Bellfruit) (Cobra 3?)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/bfmsys83.cpp b/src/mame/drivers/bfmsys83.cpp
index 507846cc83c..e6aa532b181 100644
--- a/src/mame/drivers/bfmsys83.cpp
+++ b/src/mame/drivers/bfmsys83.cpp
@@ -31,7 +31,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( bfmsys83, bfmsys83_state )
+static MACHINE_CONFIG_START( bfmsys83 )
MCFG_CPU_ADD("maincpu", M6802, 40000000/4)
MCFG_CPU_PROGRAM_MAP(memmap)
@@ -63,5 +63,5 @@ ROM_START( b83cops ) // was marked as sys85, but I think this is the sys83 set?
ROM_LOAD( "cops.p4", 0x8000, 0x2000, CRC(ce573b35) SHA1(f2ba22f0d55f882dd91b37e80e4bb14effd9113a) )
ROM_END
-GAME( 198?, b83catms , 0 , bfmsys83 , bfmsys83 , driver_device, 0 , 0, "BFM", "Cat & Mouse (Bellfruit) (System 83)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 198?, b83cops , 0 , bfmsys83 , bfmsys83 , driver_device, 0 , 0, "BFM", "Cops & Robbers (Bellfruit) (System 83)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 198?, b83catms , 0 , bfmsys83 , bfmsys83 , bfmsys83_state, 0 , ROT0, "BFM", "Cat & Mouse (Bellfruit) (System 83)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 198?, b83cops , 0 , bfmsys83 , bfmsys83 , bfmsys83_state, 0 , ROT0, "BFM", "Cops & Robbers (Bellfruit) (System 83)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index af8b8027c53..7933bc6866d 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -126,7 +126,7 @@ public:
virtual void machine_reset() override;
INTERRUPT_GEN_MEMBER(timer_irq);
int b85_find_project_string( );
- optional_device<roc10937_t> m_vfd;
+ optional_device<roc10937_device> m_vfd;
required_device<cpu_device> m_maincpu;
required_device<stepper_device> m_reel0;
required_device<stepper_device> m_reel1;
@@ -388,7 +388,7 @@ ADDRESS_MAP_END
// machine driver for system85 board //////////////////////////////////////
-static MACHINE_CONFIG_START( bfmsys85, bfmsys85_state )
+static MACHINE_CONFIG_START( bfmsys85 )
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4) // 6809 CPU at 1 Mhz
MCFG_CPU_PROGRAM_MAP(memmap) // setup read and write memorymap
MCFG_CPU_PERIODIC_INT_DRIVER(bfmsys85_state, timer_irq, 1000) // generate 1000 IRQ's per second
diff --git a/src/mame/drivers/bgt.cpp b/src/mame/drivers/bgt.cpp
index 740c4a48621..929f1d4bdfe 100644
--- a/src/mame/drivers/bgt.cpp
+++ b/src/mame/drivers/bgt.cpp
@@ -44,7 +44,7 @@ static INPUT_PORTS_START( bgt )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bgt, bgt_state )
+static MACHINE_CONFIG_START( bgt )
MCFG_CPU_ADD("maincpu", V30, 12000000 ) // ? unknown CPU.. definitely x86 based tho
MCFG_CPU_PROGRAM_MAP(bgt_map)
MCFG_CPU_IO_MAP(bgt_io)
@@ -90,7 +90,7 @@ ROM_START( bg_maxa )
ROM_END
-GAME( 199?, bg_ddb, 0, bgt, bgt, driver_device, 0, ROT0, "BGT", "Ding Dong Bells (BGT)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, bg_barmy, 0, bgt, bgt, driver_device, 0, ROT0, "BGT", "Barmy Army (BGT)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, bg_max, 0, bgt, bgt, driver_device, 0, ROT0, "BGT", "Max A Million (BGT) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, bg_maxa, bg_max, bgt, bgt, driver_device, 0, ROT0, "BGT", "Max A Million (BGT) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, bg_ddb, 0, bgt, bgt, bgt_state, 0, ROT0, "BGT", "Ding Dong Bells (BGT)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, bg_barmy, 0, bgt, bgt, bgt_state, 0, ROT0, "BGT", "Barmy Army (BGT)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, bg_max, 0, bgt, bgt, bgt_state, 0, ROT0, "BGT", "Max A Million (BGT) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, bg_maxa, bg_max, bgt, bgt, bgt_state, 0, ROT0, "BGT", "Max A Million (BGT) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp
index 07de2867879..6b5c6bc393a 100644
--- a/src/mame/drivers/big10.cpp
+++ b/src/mame/drivers/big10.cpp
@@ -221,7 +221,7 @@ INPUT_PORTS_END
* Machine Driver *
**************************************/
-static MACHINE_CONFIG_START( big10, big10_state )
+static MACHINE_CONFIG_START( big10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* guess */
@@ -263,5 +263,5 @@ ROM_END
* Game Driver(s) *
**************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 198?, big10, 0, big10, big10, driver_device, 0, ROT0, "<unknown>", "Big 10", 0 )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+GAME( 198?, big10, 0, big10, big10, big10_state, 0, ROT0, "<unknown>", "Big 10", 0 )
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 796532a4ce5..8041e020862 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -114,7 +114,7 @@ public:
DECLARE_WRITE8_MEMBER(portcc_w );
DECLARE_READ8_MEMBER(portc4_r);
DECLARE_READ8_MEMBER(portd0_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE_LINE_MEMBER(clock_w);
DECLARE_WRITE_LINE_MEMBER(busreq_w);
DECLARE_WRITE_LINE_MEMBER(ctc_z1_w);
@@ -148,7 +148,7 @@ private:
required_device<z80ctc_device> m_ctc2;
required_device<z80sio_device> m_sio;
required_device<z80dma_device> m_dma;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<beep_device> m_beeper;
@@ -189,7 +189,7 @@ READ8_MEMBER( bigbord2_state::portd0_r )
return ret;
}
-WRITE8_MEMBER( bigbord2_state::kbd_put )
+void bigbord2_state::kbd_put(u8 data)
{
if (data)
{
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( bigbord2_io, AS_IO, 8, bigbord2_state )
AM_RANGE(0xC8, 0xCB) AM_WRITE(portc8_w)
AM_RANGE(0xCC, 0xCF) AM_WRITE(portcc_w)
AM_RANGE(0xD0, 0xD3) AM_READ (portd0_r)
- AM_RANGE(0xD4, 0xD7) AM_DEVREADWRITE("fdc", mb8877_t, read, write) // u10
+ AM_RANGE(0xD4, 0xD7) AM_DEVREADWRITE("fdc", mb8877_device, read, write) // u10
//AM_RANGE(0xD8, 0xDB) AM_READWRITE(portd8_r, portd8_w) // various external data ports; DB = centronics printer
AM_RANGE(0xDC, 0xDC) AM_MIRROR(2) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w) // u30
AM_RANGE(0xDD, 0xDD) AM_MIRROR(2) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
@@ -579,7 +579,7 @@ MC6845_UPDATE_ROW( bigbord2_state::crtc_update_row )
#define MAIN_CLOCK XTAL_8MHz / 2
-static MACHINE_CONFIG_START( bigbord2, bigbord2_state )
+static MACHINE_CONFIG_START( bigbord2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK)
MCFG_CPU_PROGRAM_MAP(bigbord2_mem)
@@ -635,7 +635,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state )
/* keyboard */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(bigbord2_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(bigbord2_state, kbd_put))
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -656,5 +656,5 @@ ROM_START( bigbord2 )
ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, bigbord2, bigboard, 0, bigbord2, bigbord2, bigbord2_state, bigbord2, "Digital Research Computers", "Big Board II", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, bigbord2, bigboard, 0, bigbord2, bigbord2, bigbord2_state, bigbord2, "Digital Research Computers", "Big Board II", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp
index e4346c0ba16..f0833e8eb5c 100644
--- a/src/mame/drivers/bigevglf.cpp
+++ b/src/mame/drivers/bigevglf.cpp
@@ -443,7 +443,7 @@ void bigevglf_state::machine_reset()
}
-static MACHINE_CONFIG_START( bigevglf, bigevglf_state )
+static MACHINE_CONFIG_START( bigevglf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ? */
@@ -574,5 +574,5 @@ DRIVER_INIT_MEMBER(bigevglf_state,bigevglf)
membank("bank1")->configure_entries(0, 0xff, &ROM[0x10000], 0x800);
}
-GAME( 1986, bigevglf, 0, bigevglf, bigevglf, bigevglf_state, bigevglf, ROT270, "Taito America Corporation", "Big Event Golf (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, bigevglfj, bigevglf, bigevglf, bigevglfj, bigevglf_state,bigevglf, ROT270, "Taito Corporation", "Big Event Golf (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bigevglf, 0, bigevglf, bigevglf, bigevglf_state, bigevglf, ROT270, "Taito America Corporation", "Big Event Golf (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bigevglfj, bigevglf, bigevglf, bigevglfj, bigevglf_state, bigevglf, ROT270, "Taito Corporation", "Big Event Golf (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp
index 77790e633d2..19cda2f6eb0 100644
--- a/src/mame/drivers/bigstrkb.cpp
+++ b/src/mame/drivers/bigstrkb.cpp
@@ -199,7 +199,7 @@ GFXDECODE_END
/* Machine Driver */
-static MACHINE_CONFIG_START( bigstrkb, bigstrkb_state )
+static MACHINE_CONFIG_START( bigstrkb )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(bigstrkb_map)
@@ -222,11 +222,11 @@ static MACHINE_CONFIG_START( bigstrkb, bigstrkb_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
// MCFG_YM2151_ADD("ymsnd", ym2151_config)
- MCFG_OKIM6295_ADD("oki1", 4000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 4000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_OKIM6295_ADD("oki2", 4000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 4000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
@@ -297,5 +297,5 @@ ROM_END
/* GAME drivers */
-GAME( 1992, bigstrkb, bigstrik, bigstrkb, bigstrkb, driver_device, 0, ROT0, "bootleg", "Big Striker (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, bigstrkba,bigstrik, bigstrkb, bigstrkb, driver_device, 0, ROT0, "bootleg", "Big Striker (bootleg w/Italian teams)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, bigstrkb, bigstrik, bigstrkb, bigstrkb, bigstrkb_state, 0, ROT0, "bootleg", "Big Striker (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, bigstrkba,bigstrik, bigstrkb, bigstrkb, bigstrkb_state, 0, ROT0, "bootleg", "Big Striker (bootleg w/Italian teams)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index ddf5fbace5f..0641116823a 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -53,8 +53,12 @@
#include "emu.h"
#include "bus/rs232/keyboard.h"
#include "cpu/s2650/s2650.h"
+#include "cpu/z80/z80daisy.h"
+#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
+#include "machine/z80ctc.h"
+#include "machine/z80pio.h"
#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
@@ -289,7 +293,7 @@ static DEVICE_INPUT_DEFAULTS_START( keyboard )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( binbug, binbug_state )
+static MACHINE_CONFIG_START( binbug )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(binbug_mem)
@@ -335,8 +339,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, binbug, pipbug, 0, binbug, binbug, driver_device, 0, "MicroByte", "BINBUG 3.6", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, binbug, pipbug, 0, binbug, binbug, binbug_state, 0, "MicroByte", "BINBUG 3.6", 0 )
@@ -399,12 +403,6 @@ ToDo:
*/
-#include "cpu/z80/z80.h"
-#include "machine/z80ctc.h"
-#include "machine/z80pio.h"
-#include "cpu/z80/z80daisy.h"
-
-
class dg680_state : public binbug_state
{
public:
@@ -419,7 +417,7 @@ public:
DECLARE_WRITE8_MEMBER(portb_w);
DECLARE_READ8_MEMBER(port08_r);
DECLARE_WRITE8_MEMBER(port08_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
TIMER_DEVICE_CALLBACK_MEMBER(time_tick);
TIMER_DEVICE_CALLBACK_MEMBER(uart_tick);
@@ -470,7 +468,7 @@ static const z80_daisy_config dg680_daisy_chain[] =
static INPUT_PORTS_START( dg680 )
INPUT_PORTS_END
-WRITE8_MEMBER( dg680_state::kbd_put )
+void dg680_state::kbd_put(u8 data)
{
m_term_data = data;
/* strobe in keyboard data */
@@ -526,7 +524,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dg680_state::uart_tick)
m_ctc->trg3(0);
}
-static MACHINE_CONFIG_START( dg680, dg680_state )
+static MACHINE_CONFIG_START( dg680 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 4)
MCFG_CPU_PROGRAM_MAP(dg680_mem)
@@ -547,7 +545,7 @@ static MACHINE_CONFIG_START( dg680, dg680_state )
/* Keyboard */
MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(dg680_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(dg680_state, kbd_put))
/* Cassette */
MCFG_CASSETTE_ADD( "cassette" )
@@ -586,5 +584,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, dg680, 0, 0, dg680, dg680, driver_device, 0, "David Griffiths", "DG680 with DGOS-Z80 1.4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, dg680, 0, 0, dg680, dg680, dg680_state, 0, "David Griffiths", "DG680 with DGOS-Z80 1.4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/bingo.cpp b/src/mame/drivers/bingo.cpp
index 70abc8bba7d..742220ae428 100644
--- a/src/mame/drivers/bingo.cpp
+++ b/src/mame/drivers/bingo.cpp
@@ -43,7 +43,7 @@ DRIVER_INIT_MEMBER(bingo_state,bingo)
{
}
-static MACHINE_CONFIG_START( bingo, bingo_state )
+static MACHINE_CONFIG_START( bingo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 1000000)
MCFG_CPU_PROGRAM_MAP(bingo_map)
@@ -83,7 +83,7 @@ DRIVER_INIT_MEMBER(seeben_state,seeben)
{
}
-static MACHINE_CONFIG_START( seeben, seeben_state )
+static MACHINE_CONFIG_START( seeben )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, 1000000)
MCFG_CPU_PROGRAM_MAP(seeben_map)
@@ -125,7 +125,7 @@ DRIVER_INIT_MEMBER(splin_state,splin)
{
}
-static MACHINE_CONFIG_START( splin, splin_state )
+static MACHINE_CONFIG_START( splin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80186, 16000000)
MCFG_CPU_PROGRAM_MAP(splin_map)
@@ -307,28 +307,28 @@ ROM_START(tripjok)
ROM_END
-GAME(1980, cntinntl, 0, bingo, bingo, bingo_state, bingo, ROT0, "Bally", "Continental (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, cntinntl2, cntinntl, bingo, bingo, bingo_state, bingo, ROT0, "Bally", "Continental (Bingo, alternate version)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, goldgame, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, goldgkitb, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Kit Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, goldgstake, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, goldgnew, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Bingo New (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, goldgkit1, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Kit 1 Generation (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, michigan, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, michkit1, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Bingo Kit 1 Generation (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, michkitb, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Kit Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, michstake, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, michnew, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Bingo New (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, montana, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Montana Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, topgame, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Top Game Laser L10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, topgamet, topgame, splin, splin, splin_state, splin, ROT0, "Splin", "Top Game Turbo (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, penalty, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Penalty (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, brooklyn, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Brooklyn (set 1) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, brooklyna, brooklyn, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Brooklyn (set 2) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, newdixie, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "New Dixieland (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, superdix, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Super Dixieland (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, cntine31, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Continental 3 in 1 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, domino2, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Domino II (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, tripjok, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Triple Joker (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, ggate, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Golden Gate (set 1) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, ggatea, ggate, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Golden Gate (set 2) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, cntinntl, 0, bingo, bingo, bingo_state, bingo, ROT0, "Bally", "Continental (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, cntinntl2, cntinntl, bingo, bingo, bingo_state, bingo, ROT0, "Bally", "Continental (Bingo, alternate version)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, goldgame, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, goldgkitb, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Kit Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, goldgstake, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, goldgnew, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Bingo New (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, goldgkit1, goldgame, splin, splin, splin_state, splin, ROT0, "Splin", "Golden Game Kit 1 Generation (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, michigan, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, michkit1, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Bingo Kit 1 Generation (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, michkitb, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Kit Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, michstake, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, michnew, michigan, splin, splin, splin_state, splin, ROT0, "Splin", "Michigan Bingo New (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, montana, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Montana Bingo Stake 6/10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, topgame, 0, splin, splin, splin_state, splin, ROT0, "Splin", "Top Game Laser L10 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, topgamet, topgame, splin, splin, splin_state, splin, ROT0, "Splin", "Top Game Turbo (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, penalty, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Penalty (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, brooklyn, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Brooklyn (set 1) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, brooklyna, brooklyn, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Brooklyn (set 2) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, newdixie, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "New Dixieland (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, superdix, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Super Dixieland (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, cntine31, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Continental 3 in 1 (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, domino2, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Domino II (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, tripjok, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Triple Joker (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, ggate, 0, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Golden Gate (set 1) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, ggatea, ggate, seeben, seeben, seeben_state, seeben, ROT0, "Seeben (Belgium)", "Golden Gate (set 2) (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp
index 5d4df9034d2..b60f2a5661d 100644
--- a/src/mame/drivers/bingoc.cpp
+++ b/src/mame/drivers/bingoc.cpp
@@ -167,7 +167,7 @@ static INPUT_PORTS_START( bingoc )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bingoc, bingoc_state )
+static MACHINE_CONFIG_START( bingoc )
MCFG_CPU_ADD("maincpu", M68000,8000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -231,4 +231,4 @@ ROM_START( bingoc )
ROM_COPY( "upd", 0x20000, 0x00000, 0x20000 )
ROM_END
-GAME( 1989, bingoc, 0, bingoc, bingoc, driver_device, 0, ROT0, "Sega", "Bingo Circus (Rev. A 891001)", MACHINE_NOT_WORKING )
+GAME( 1989, bingoc, 0, bingoc, bingoc, bingoc_state, 0, ROT0, "Sega", "Bingo Circus (Rev. A 891001)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index 2bfae7e4c33..11b5210af83 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -371,7 +371,7 @@ PALETTE_INIT_MEMBER(bingoman_state, bingoman)
{
}
-static MACHINE_CONFIG_START( bingoman, bingoman_state )
+static MACHINE_CONFIG_START( bingoman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83002, XTAL_20MHz) /* TODO: correct CPU type */
@@ -465,5 +465,5 @@ ROM_END
***************************************************************************/
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1993, bingoman, 0, bingoman, bingoman, driver_device, 0, ROT0, "HP Automaten", "Bingo Mania (P03-P07-P14)", MACHINE_IS_SKELETON )
-GAME( 1993, bingomana, bingoman, bingoman, bingoman, driver_device, 0, ROT0, "HP Automaten", "Bingo Mania (A03)", MACHINE_IS_SKELETON )
+GAME( 1993, bingoman, 0, bingoman, bingoman, bingoman_state, 0, ROT0, "HP Automaten", "Bingo Mania (P03-P07-P14)", MACHINE_IS_SKELETON )
+GAME( 1993, bingomana, bingoman, bingoman, bingoman, bingoman_state, 0, ROT0, "HP Automaten", "Bingo Mania (A03)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index f9a99303cf8..25fc67db29c 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -686,7 +686,7 @@ static GFXDECODE_START( bingor )
GFXDECODE_END
-static MACHINE_CONFIG_START( bingor, bingor_state )
+static MACHINE_CONFIG_START( bingor )
MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(bingor_map)
MCFG_CPU_IO_MAP(bingor_io)
@@ -766,7 +766,7 @@ static ADDRESS_MAP_START( slave_io, AS_IO, 8, bingor_state)
AM_RANGE(0xc000, 0xcfff) AM_RAM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( vip2000, bingor_state )
+static MACHINE_CONFIG_START( vip2000 )
MCFG_CPU_ADD("maincpu", I80186, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(vip2000_map)
MCFG_CPU_IO_MAP(vip2000_io)
@@ -914,10 +914,10 @@ ROM_END
-GAME( 2002, bingor1, 0, bingor, bingor, driver_device, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor2, 0, bingor, bingor, driver_device, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor3, 0, bingor, bingor, driver_device, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 3)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor4, 0, bingor, bingor, driver_device, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 4)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor5, 0, bingor, bingor, driver_device, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star V3? (set 5)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor1, 0, bingor, bingor, bingor_state, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor2, 0, bingor, bingor, bingor_state, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor3, 0, bingor, bingor, bingor_state, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 3)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor4, 0, bingor, bingor, bingor_state, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star? (set 4)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor5, 0, bingor, bingor, bingor_state, 0, ROT0, "<unknown>", "Bingo Roll / Bell Star V3? (set 5)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2001, vip2000, 0, vip2000, bingor, driver_device, 0, ROT0, "Paloma-Elektronik?", "Unknown 'VIP 2000' game", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2001, vip2000, 0, vip2000, bingor, bingor_state, 0, ROT0, "Paloma-Elektronik?", "Unknown 'VIP 2000' game", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index 65534b88dc9..c856dd476fe 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -368,7 +368,7 @@ void bionicc_state::machine_reset()
m_soundcommand = 0;
}
-static MACHINE_CONFIG_START( bionicc, bionicc_state )
+static MACHINE_CONFIG_START( bionicc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz - verified in schematics */
@@ -688,11 +688,11 @@ ROM_END
*
*************************************/
-GAME( 1987, bionicc, 0, bionicc, bionicc, driver_device, 0, ROT0, "Capcom", "Bionic Commando (Euro)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bionicc1, bionicc, bionicc, bionicc, driver_device, 0, ROT0, "Capcom", "Bionic Commando (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bionicc2, bionicc, bionicc, bionicc, driver_device, 0, ROT0, "Capcom", "Bionic Commando (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, topsecrt, bionicc, bionicc, bionicc, driver_device, 0, ROT0, "Capcom", "Top Secret (Japan, old revision)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bioniccbl, bionicc, bionicc, bionicc, driver_device, 0, ROT0, "bootleg", "Bionic Commandos (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bioniccbl2,bionicc, bionicc, bionicc, driver_device, 0, ROT0, "bootleg", "Bionic Commandos (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bionicc, 0, bionicc, bionicc, bionicc_state, 0, ROT0, "Capcom", "Bionic Commando (Euro)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bionicc1, bionicc, bionicc, bionicc, bionicc_state, 0, ROT0, "Capcom", "Bionic Commando (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bionicc2, bionicc, bionicc, bionicc, bionicc_state, 0, ROT0, "Capcom", "Bionic Commando (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, topsecrt, bionicc, bionicc, bionicc, bionicc_state, 0, ROT0, "Capcom", "Top Secret (Japan, old revision)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bioniccbl, bionicc, bionicc, bionicc, bionicc_state, 0, ROT0, "bootleg", "Bionic Commandos (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bioniccbl2,bionicc, bionicc, bionicc, bionicc_state, 0, ROT0, "bootleg", "Bionic Commandos (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
// there's also an undumped JP new revision on which there are no extra lives after 1 million points, plus other bug-fixes / changes
diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp
index d309852008a..dd8cffbb047 100644
--- a/src/mame/drivers/bishi.cpp
+++ b/src/mame/drivers/bishi.cpp
@@ -374,7 +374,7 @@ void bishi_state::machine_reset()
m_cur_control2 = 0;
}
-static MACHINE_CONFIG_START( bishi, bishi_state )
+static MACHINE_CONFIG_START( bishi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 12MHz (24MHz OSC / 2 ) */
@@ -502,7 +502,7 @@ ROM_START( sbishika )
ROM_LOAD( "675kaa04.8f", 0x180000, 0x080000, CRC(ebcbd813) SHA1(d67540d0ea303f09866f4a766e2d5162f05cd4ac) )
ROM_END
-GAME( 1996, bishi, 0, bishi, bishi, driver_device, 0, ROT0, "Konami", "Bishi Bashi Championship Mini Game Senshuken (ver JAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sbishi, 0, bishi, bishi2p, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver JAA, 2 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sbishik, sbishi, bishi, bishi, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAB, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sbishika, sbishi, bishi, bishi, driver_device, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bishi, 0, bishi, bishi, bishi_state, 0, ROT0, "Konami", "Bishi Bashi Championship Mini Game Senshuken (ver JAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sbishi, 0, bishi, bishi2p, bishi_state, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver JAA, 2 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sbishik, sbishi, bishi, bishi, bishi_state, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAB, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sbishika, sbishi, bishi, bishi, bishi_state, 0, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index 152b4aa5e3b..c0358962d35 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -568,7 +568,7 @@ static MACHINE_CONFIG_FRAGMENT( bg_ppu )
MACHINE_CONFIG_END
#endif
-static MACHINE_CONFIG_START( bitgrpha, bitgraph_state )
+static MACHINE_CONFIG_START( bitgrpha )
MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz)
MCFG_CPU_PROGRAM_MAP(bitgrapha_mem)
@@ -591,7 +591,7 @@ static MACHINE_CONFIG_START( bitgrpha, bitgraph_state )
MCFG_RAM_DEFAULT_SIZE("128K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bitgrphb, bitgraph_state )
+static MACHINE_CONFIG_START( bitgrphb )
MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_6_9MHz)
MCFG_CPU_PROGRAM_MAP(bitgraphb_mem)
@@ -637,6 +637,6 @@ ROM_START( bitgrphb )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, bitgrpha, 0, 0, bitgrpha, bitgraph, driver_device, 0, "BBN", "BitGraph rev A", ROT90 | MACHINE_IMPERFECT_KEYBOARD)
-COMP( 1982, bitgrphb, 0, 0, bitgrphb, bitgraph, driver_device, 0, "BBN", "BitGraph rev B", ROT270 | MACHINE_NOT_WORKING|MACHINE_IMPERFECT_KEYBOARD)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, bitgrpha, 0, 0, bitgrpha, bitgraph, bitgraph_state, 0, "BBN", "BitGraph rev A", ROT90 | MACHINE_IMPERFECT_KEYBOARD )
+COMP( 1982, bitgrphb, 0, 0, bitgrphb, bitgraph, bitgraph_state, 0, "BBN", "BitGraph rev B", ROT270 | MACHINE_NOT_WORKING|MACHINE_IMPERFECT_KEYBOARD )
diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp
index 85ad0f6387d..76db0caf56c 100644
--- a/src/mame/drivers/bk.cpp
+++ b/src/mame/drivers/bk.cpp
@@ -162,7 +162,7 @@ static INPUT_PORTS_START( bk0010 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bk0010, bk_state )
+static MACHINE_CONFIG_START( bk0010 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", T11, 3000000)
MCFG_T11_INITIAL_MODE(0x36ff) /* initial mode word has DAL15,14,11,8 pulled low */
@@ -233,8 +233,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, bk0010, 0, 0, bk0010, bk0010, driver_device, 0, "Elektronika", "BK 0010", 0)
-COMP( 1986, bk001001, bk0010, 0, bk0010, bk0010, driver_device, 0, "Elektronika", "BK 0010-01", 0)
-COMP( 1986, bk0010fd, bk0010, 0, bk0010fd, bk0010, driver_device, 0, "Elektronika", "BK 0010 FDD", MACHINE_NOT_WORKING)
-COMP( 1986, bk0011m, bk0010, 0, bk0010fd, bk0010, driver_device, 0, "Elektronika", "BK 0011M", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, bk0010, 0, 0, bk0010, bk0010, bk_state, 0, "Elektronika", "BK 0010", 0)
+COMP( 1986, bk001001, bk0010, 0, bk0010, bk0010, bk_state, 0, "Elektronika", "BK 0010-01", 0)
+COMP( 1986, bk0010fd, bk0010, 0, bk0010fd, bk0010, bk_state, 0, "Elektronika", "BK 0010 FDD", MACHINE_NOT_WORKING)
+COMP( 1986, bk0011m, bk0010, 0, bk0010fd, bk0010, bk_state, 0, "Elektronika", "BK 0011M", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index 031e79b6cf4..e8609acad97 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -396,7 +396,7 @@ MACHINE_RESET_MEMBER(bking_state,bking3)
m_addr_l = 0;
}
-static MACHINE_CONFIG_START( bking, bking_state )
+static MACHINE_CONFIG_START( bking )
/* basic machine hardware */
MCFG_CPU_ADD("main_cpu", Z80, XTAL_12MHz/4) /* 3 MHz */
@@ -750,6 +750,6 @@ ROM_START( bking3 )
ROM_END
-GAME( 1982, bking, 0, bking, bking, driver_device, 0, ROT270, "Taito Corporation", "Birdie King", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, bking2, 0, bking, bking2, driver_device, 0, ROT90, "Taito Corporation", "Birdie King 2", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, bking3, 0, bking3, bking2, driver_device, 0, ROT90, "Taito Corporation", "Birdie King 3", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bking, 0, bking, bking, bking_state, 0, ROT270, "Taito Corporation", "Birdie King", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, bking2, 0, bking, bking2, bking_state, 0, ROT90, "Taito Corporation", "Birdie King 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bking3, 0, bking3, bking2, bking_state, 0, ROT90, "Taito Corporation", "Birdie King 3", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index 8ec6989d997..864c29b01e4 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -340,7 +340,7 @@ void blackt96_state::tile_callback(int &tile, int& fx, int& fy, int& region)
}
-static MACHINE_CONFIG_START( blackt96, blackt96_state )
+static MACHINE_CONFIG_START( blackt96 )
MCFG_CPU_ADD("maincpu", M68000, 18000000 /2)
MCFG_CPU_PROGRAM_MAP(blackt96_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blackt96_state, irq1_line_hold)
@@ -373,11 +373,11 @@ static MACHINE_CONFIG_START( blackt96, blackt96_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 8000000/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
- MCFG_OKIM6295_ADD("oki2", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 8000000/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
@@ -416,4 +416,4 @@ ROM_START( blackt96 )
ROM_CONTINUE( 0x00001, 0x08000 ) // first half is empty
ROM_END
-GAME( 1996, blackt96, 0, blackt96, blackt96, driver_device, 0, ROT0, "D.G.R.M.", "Black Touch '96", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1996, blackt96, 0, blackt96, blackt96, blackt96_state, 0, ROT0, "D.G.R.M.", "Black Touch '96", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index 3aa9b337a15..2f711ff6816 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -99,13 +99,13 @@ WRITE8_MEMBER(bladestl_state::bladestl_port_B_w)
m_upd7759->set_bank_base(((data & 0x38) >> 3) * 0x20000);
// bit 2 = SSG-C rc filter enable
- m_filter3->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 1000, data & 0x04 ? CAP_N(150) : 0); /* YM2203-SSG-C */
+ m_filter3->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x04 ? CAP_N(150) : 0); /* YM2203-SSG-C */
// bit 1 = SSG-B rc filter enable
- m_filter2->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 1000, data & 0x02 ? CAP_N(150) : 0); /* YM2203-SSG-B */
+ m_filter2->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x02 ? CAP_N(150) : 0); /* YM2203-SSG-B */
// bit 0 = SSG-A rc filter enable
- m_filter1->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 1000, data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */
+ m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */
}
READ8_MEMBER(bladestl_state::bladestl_speech_busy_r)
@@ -299,7 +299,7 @@ void bladestl_state::machine_reset()
m_last_track[i] = 0;
}
-static MACHINE_CONFIG_START( bladestl, bladestl_state )
+static MACHINE_CONFIG_START( bladestl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 24000000/2) /* 24MHz/2 (?) */
@@ -443,6 +443,6 @@ ROM_END
*
*************************************/
-GAME( 1987, bladestl, 0, bladestl, bladestl, driver_device, 0, ROT90, "Konami", "Blades of Steel (version T)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bladestll, bladestl, bladestl, bladestle, driver_device,0, ROT90, "Konami", "Blades of Steel (version L)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bladestle, bladestl, bladestl, bladestle, driver_device,0, ROT90, "Konami", "Blades of Steel (version E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bladestl, 0, bladestl, bladestl, bladestl_state, 0, ROT90, "Konami", "Blades of Steel (version T)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bladestll, bladestl, bladestl, bladestle, bladestl_state, 0, ROT90, "Konami", "Blades of Steel (version L)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bladestle, bladestl, bladestl, bladestle, bladestl_state, 0, ROT90, "Konami", "Blades of Steel (version E)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp
index 8100078f6d3..71146c5b56a 100644
--- a/src/mame/drivers/blitz.cpp
+++ b/src/mame/drivers/blitz.cpp
@@ -702,7 +702,7 @@ GFXDECODE_END
* Machine Drivers *
*********************************************/
-static MACHINE_CONFIG_START( megadpkr, blitz_state )
+static MACHINE_CONFIG_START( megadpkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
@@ -833,6 +833,6 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1990, megadpkr, 0, megadpkr, megadpkr, driver_device, 0, ROT0, "Blitz System Inc.", "Mega Double Poker (conversion kit, set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1990, megadpkrb, megadpkr, megadpkr, megadpkr, driver_device, 0, ROT0, "Blitz System Inc.", "Mega Double Poker (conversion kit, set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+GAME( 1990, megadpkr, 0, megadpkr, megadpkr, blitz_state, 0, ROT0, "Blitz System Inc.", "Mega Double Poker (conversion kit, set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1990, megadpkrb, megadpkr, megadpkr, megadpkr, blitz_state, 0, ROT0, "Blitz System Inc.", "Mega Double Poker (conversion kit, set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index 82b0d16dee7..632a5d1d812 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -1673,7 +1673,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, blitz68k_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( ilpag, blitz68k_state )
+static MACHINE_CONFIG_START( ilpag )
MCFG_CPU_ADD("maincpu", M68000, 11059200 ) // ?
MCFG_CPU_PROGRAM_MAP(ilpag_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq4_line_hold) //3 & 6 used, mcu comms?
@@ -1740,7 +1740,7 @@ static MACHINE_CONFIG_DERIVED( steaser, ilpag )
MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", blitz68k_state, steaser_mcu_sim, attotime::from_hz(10000))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cjffruit, blitz68k_state )
+static MACHINE_CONFIG_START( cjffruit )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2)
MCFG_CPU_PROGRAM_MAP(cjffruit_map)
@@ -1768,7 +1768,7 @@ static MACHINE_CONFIG_START( cjffruit, blitz68k_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bankrob, blitz68k_state )
+static MACHINE_CONFIG_START( bankrob )
MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
MCFG_CPU_PROGRAM_MAP(bankrob_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
@@ -1800,7 +1800,7 @@ static MACHINE_CONFIG_START( bankrob, blitz68k_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bankroba, blitz68k_state )
+static MACHINE_CONFIG_START( bankroba )
MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
MCFG_CPU_PROGRAM_MAP(bankroba_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq5_line_hold) // protection prevents correct irq frequency by crtc
@@ -1830,7 +1830,7 @@ static MACHINE_CONFIG_START( bankroba, blitz68k_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( deucesw2, blitz68k_state )
+static MACHINE_CONFIG_START( deucesw2 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz / 2)
MCFG_CPU_PROGRAM_MAP(deucesw2_map)
// irq 2 reads from MCUs
@@ -1859,7 +1859,7 @@ static MACHINE_CONFIG_START( deucesw2, blitz68k_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dualgame, blitz68k_state )
+static MACHINE_CONFIG_START( dualgame )
MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz )
MCFG_CPU_PROGRAM_MAP(dualgame_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq2_line_hold) // lev 2 = MCUs, lev 3 = vblank
@@ -1890,7 +1890,7 @@ static MACHINE_CONFIG_START( dualgame, blitz68k_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hermit, blitz68k_state )
+static MACHINE_CONFIG_START( hermit )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22_1184MHz/2 )
MCFG_CPU_PROGRAM_MAP(hermit_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq1_line_hold) // protection prevents correct irq frequency by crtc
@@ -1919,7 +1919,7 @@ static MACHINE_CONFIG_START( hermit, blitz68k_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( maxidbl, blitz68k_state )
+static MACHINE_CONFIG_START( maxidbl )
MCFG_CPU_ADD("maincpu", M68000, XTAL_11_0592MHz)
MCFG_CPU_PROGRAM_MAP(maxidbl_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", blitz68k_state, irq3_line_hold) // protection prevents correct irq frequency by crtc
@@ -2869,16 +2869,16 @@ DRIVER_INIT_MEMBER(blitz68k_state,megadble)
-GAME( 1992, maxidbl, 0, maxidbl, maxidbl, blitz68k_state, maxidbl, ROT0, "Blitz Systems Inc.", "Maxi Double Poker (Ver. 1.10)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS )
-GAME( 1990, megadblj, 0, maxidbl, maxidbl, blitz68k_state, megadblj, ROT0, "Blitz Systems Inc.", "Mega Double Poker Jackpot (Ver. 1.26)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // JUNE 28TH, 1993
-GAME( 1990, megadble, 0, maxidbl, maxidbl, blitz68k_state, megadble, ROT0, "Blitz Systems Inc.", "Mega Double Poker (Ver. 1.63 Espagnol)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS ) // NOVEMBER 1994
-GAME( 1993, steaser, 0, steaser, steaser, driver_device, 0, ROT0, "<unknown>", "Strip Teaser (Italy, Ver. 1.22)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // In-game strings are in Italian but service mode is half English / half French?
-GAME( 1993, bankrob, 0, bankrob, bankrob, blitz68k_state, bankrob, ROT0, "Entertainment Technology Corp.", "Bank Robbery (Ver. 3.32)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // BLITZ SYSTEM INC APRIL 1995
-GAME( 1993, bankroba, bankrob, bankroba, bankrob, blitz68k_state, bankroba, ROT0, "Entertainment Technology Corp.", "Bank Robbery (Ver. 2.00)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // BLITZ SYSTEM INC MAY 10TH, 1993
-GAME( 1993?, poker52, 0, maxidbl, maxidbl, driver_device, 0, ROT0, "Blitz Systems Inc.", "Poker 52 (Ver. 1.2)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // MARCH 10TH, 1994
+GAME( 1992, maxidbl, 0, maxidbl, maxidbl, blitz68k_state, maxidbl, ROT0, "Blitz Systems Inc.", "Maxi Double Poker (Ver. 1.10)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS )
+GAME( 1990, megadblj, 0, maxidbl, maxidbl, blitz68k_state, megadblj, ROT0, "Blitz Systems Inc.", "Mega Double Poker Jackpot (Ver. 1.26)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // JUNE 28TH, 1993
+GAME( 1990, megadble, 0, maxidbl, maxidbl, blitz68k_state, megadble, ROT0, "Blitz Systems Inc.", "Mega Double Poker (Ver. 1.63 Espagnol)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS ) // NOVEMBER 1994
+GAME( 1993, steaser, 0, steaser, steaser, blitz68k_state, 0, ROT0, "<unknown>", "Strip Teaser (Italy, Ver. 1.22)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // In-game strings are in Italian but service mode is half English / half French?
+GAME( 1993, bankrob, 0, bankrob, bankrob, blitz68k_state, bankrob, ROT0, "Entertainment Technology Corp.", "Bank Robbery (Ver. 3.32)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // BLITZ SYSTEM INC APRIL 1995
+GAME( 1993, bankroba, bankrob, bankroba, bankrob, blitz68k_state, bankroba, ROT0, "Entertainment Technology Corp.", "Bank Robbery (Ver. 2.00)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // BLITZ SYSTEM INC MAY 10TH, 1993
+GAME( 1993?, poker52, 0, maxidbl, maxidbl, blitz68k_state, 0, ROT0, "Blitz Systems Inc.", "Poker 52 (Ver. 1.2)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // MARCH 10TH, 1994
GAME( 1995, dualgame, 0, dualgame, dualgame, blitz68k_state, dualgame, ROT0, "Labtronix Technologies", "Dual Games (prototype)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // SEPTEMBER 5TH, 1995
-GAME( 1995, hermit, 0, hermit, hermit, blitz68k_state, hermit, ROT0, "Dugamex", "The Hermit (Ver. 1.14)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // APRIL 1995
+GAME( 1995, hermit, 0, hermit, hermit, blitz68k_state, hermit, ROT0, "Dugamex", "The Hermit (Ver. 1.14)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // APRIL 1995
GAME( 1997, deucesw2, 0, deucesw2, deucesw2, blitz68k_state, deucesw2, ROT0, "<unknown>", "Deuces Wild 2 - American Heritage (Ver. 2.02F)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // APRIL 10TH, 1997
GAME( 1998, cj3play, 0, cjffruit, cjffruit, blitz68k_state, cj3play, ROT0, "Cadillac Jack", "Triple Play (Ver. 1.10)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // FEBRUARY 24TH, 1999
GAME( 1998, cjffruit, 0, cjffruit, cjffruit, blitz68k_state, cjffruit, ROT0, "Cadillac Jack", "Funny Fruit (Ver. 1.13)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // APRIL 21ST, 1999
-GAME( 199?, ilpag, 0, ilpag, ilpag, driver_device, 0, ROT0, "<unknown>", "Il Pagliaccio (Italy, Ver. 2.7C)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND )
+GAME( 199?, ilpag, 0, ilpag, ilpag, blitz68k_state, 0, ROT0, "<unknown>", "Il Pagliaccio (Italy, Ver. 2.7C)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index cea2db50778..5911e0a29e3 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -295,7 +295,7 @@ void blktiger_state::machine_reset()
m_i8751_latch = 0;
}
-static MACHINE_CONFIG_START( blktiger, blktiger_state )
+static MACHINE_CONFIG_START( blktiger )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
@@ -615,11 +615,11 @@ DRIVER_INIT_MEMBER(blktiger_state,blktigerb3)
memcpy(src, &buffer[0], len);
}
-GAME( 1987, blktiger, 0, blktiger, blktiger, driver_device, 0, ROT0, "Capcom", "Black Tiger", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blktigera, blktiger, blktiger, blktiger, driver_device, 0, ROT0, "Capcom", "Black Tiger (older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blktigerb1, blktiger, blktigerbl, blktiger, driver_device, 0, ROT0, "bootleg", "Black Tiger (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blktigerb2, blktiger, blktigerbl, blktiger, driver_device, 0, ROT0, "bootleg", "Black Tiger (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blkdrgon, blktiger, blktiger, blktiger, driver_device, 0, ROT0, "Capcom", "Black Dragon (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blkdrgonb, blktiger, blktigerbl, blktiger, driver_device, 0, ROT0, "bootleg", "Black Dragon (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blktiger, 0, blktiger, blktiger, blktiger_state, 0, ROT0, "Capcom", "Black Tiger", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blktigera, blktiger, blktiger, blktiger, blktiger_state, 0, ROT0, "Capcom", "Black Tiger (older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blktigerb1, blktiger, blktigerbl, blktiger, blktiger_state, 0, ROT0, "bootleg", "Black Tiger (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blktigerb2, blktiger, blktigerbl, blktiger, blktiger_state, 0, ROT0, "bootleg", "Black Tiger (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blkdrgon, blktiger, blktiger, blktiger, blktiger_state, 0, ROT0, "Capcom", "Black Dragon (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blkdrgonb, blktiger, blktigerbl, blktiger, blktiger_state, 0, ROT0, "bootleg", "Black Dragon (bootleg)", MACHINE_SUPPORTS_SAVE )
// this board has Capcom markings (boards 87118-A-X1 / 87118-B-X1, but no MCU, a mix of bootleg Black Tiger and Black Dragon roms, and an address swapped sound rom? is the latter an alternative security measure?
GAME( 1987, blktigerb3, blktiger, blktigerbl, blktiger, blktiger_state, blktigerb3, ROT0, "bootleg", "Black Tiger / Black Dragon (mixed bootleg?)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index fcb641e12f1..98a47c95fc5 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -343,7 +343,7 @@ MACHINE_RESET_MEMBER(blmbycar_state,blmbycar)
}
-static MACHINE_CONFIG_START( blmbycar, blmbycar_state )
+static MACHINE_CONFIG_START( blmbycar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz */
@@ -370,7 +370,7 @@ static MACHINE_CONFIG_START( blmbycar, blmbycar_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, blmbycar_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -514,5 +514,5 @@ DRIVER_INIT_MEMBER(blmbycar_state,blmbycar)
***************************************************************************/
GAME( 1994, blmbycar, 0, blmbycar, blmbycar, blmbycar_state, blmbycar, ROT0, "ABM & Gecas", "Blomby Car", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, blmbycaru, blmbycar, blmbycar, blmbycar, driver_device, 0, ROT0, "ABM & Gecas", "Blomby Car (not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, watrball, 0, watrball, watrball, driver_device, 0, ROT0, "ABM", "Water Balls", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, blmbycaru, blmbycar, blmbycar, blmbycar, blmbycar_state, 0, ROT0, "ABM & Gecas", "Blomby Car (not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, watrball, 0, watrball, watrball, blmbycar_state, 0, ROT0, "ABM", "Water Balls", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 8b4f9ae6d79..54631399199 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -461,7 +461,7 @@ void blockade_state::device_timer(emu_timer &timer, device_timer_id id, int para
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( blockade, blockade_state )
+static MACHINE_CONFIG_START( blockade )
MCFG_CPU_ADD("maincpu", I8080A, XTAL_20_079MHz / 10)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_io_map)
@@ -565,10 +565,10 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS LAYOUT
-GAMEL(1976, blockade, 0, blockade, blockade, driver_device, 0, ROT0, "Gremlin", "Blockade", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_blockade )
-GAMEL(1976, comotion, 0, blockade, comotion, driver_device, 0, ROT0, "Gremlin", "CoMOTION", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_blockade )
-GAME( 1978, blasto, 0, blockade, blasto, driver_device, 0, ROT0, "Gremlin", "Blasto", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // b/w, no overlay
-GAMEL(1977, hustle, 0, blockade, hustle, driver_device, 0, ROT0, "Gremlin", "Hustle", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_blockade )
-GAME( 1977, mineswpr, 0, blockade, mineswpr, driver_device, 0, ROT0, "Amutech", "Minesweeper", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1977, mineswpr4, mineswpr, blockade, mineswpr4, driver_device, 0, ROT0, "Amutech", "Minesweeper (4-Player)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS LAYOUT
+GAMEL(1976, blockade, 0, blockade, blockade, blockade_state, 0, ROT0, "Gremlin", "Blockade", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_blockade )
+GAMEL(1976, comotion, 0, blockade, comotion, blockade_state, 0, ROT0, "Gremlin", "CoMOTION", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_blockade )
+GAME( 1978, blasto, 0, blockade, blasto, blockade_state, 0, ROT0, "Gremlin", "Blasto", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // b/w, no overlay
+GAMEL(1977, hustle, 0, blockade, hustle, blockade_state, 0, ROT0, "Gremlin", "Hustle", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_blockade )
+GAME( 1977, mineswpr, 0, blockade, mineswpr, blockade_state, 0, ROT0, "Amutech", "Minesweeper", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1977, mineswpr4, mineswpr, blockade, mineswpr4, blockade_state, 0, ROT0, "Amutech", "Minesweeper (4-Player)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index 7c460f1238d..3d53d8a2f5a 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -270,7 +270,7 @@ INPUT_PORTS_END
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( blockhl, blockhl_state )
+static MACHINE_CONFIG_START( blockhl )
// basic machine hardware
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) // Konami 052526
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -378,5 +378,5 @@ ROM_END
//**************************************************************************
// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS
-GAME( 1989, blockhl, 0, blockhl, blockhl, driver_device, 0, ROT0, "Konami", "Block Hole", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, quarth, blockhl, blockhl, blockhl, driver_device, 0, ROT0, "Konami", "Quarth (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, blockhl, 0, blockhl, blockhl, blockhl_state, 0, ROT0, "Konami", "Block Hole", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, quarth, blockhl, blockhl, blockhl, blockhl_state, 0, ROT0, "Konami", "Quarth (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp
index d570082f33f..7317ace4a88 100644
--- a/src/mame/drivers/blockout.cpp
+++ b/src/mame/drivers/blockout.cpp
@@ -295,7 +295,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(blockout_state::blockout_scanline)
m_maincpu->set_input_line(5, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( blockout, blockout_state )
+static MACHINE_CONFIG_START( blockout )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
@@ -328,7 +328,7 @@ static MACHINE_CONFIG_START( blockout, blockout_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -427,8 +427,8 @@ ROM_END
*
*************************************/
-GAME( 1989, blockout, 0, blockout, blockout, driver_device, 0, ROT0, "Technos Japan / California Dreams", "Block Out (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, blockout2,blockout, blockout, blockout, driver_device, 0, ROT0, "Technos Japan / California Dreams", "Block Out (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, blockoutj,blockout, blockout, blockoutj, driver_device,0, ROT0, "Technos Japan / California Dreams", "Block Out (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, agress, 0, agress, agress, driver_device, 0, ROT0, "Palco", "Agress - Missile Daisenryaku (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 2003, agressb, agress, agress, agress, driver_device, 0, ROT0, "bootleg", "Agress - Missile Daisenryaku (English bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, blockout, 0, blockout, blockout, blockout_state, 0, ROT0, "Technos Japan / California Dreams", "Block Out (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, blockout2,blockout, blockout, blockout, blockout_state, 0, ROT0, "Technos Japan / California Dreams", "Block Out (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, blockoutj,blockout, blockout, blockoutj, blockout_state, 0, ROT0, "Technos Japan / California Dreams", "Block Out (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, agress, 0, agress, agress, blockout_state, 0, ROT0, "Palco", "Agress - Missile Daisenryaku (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 2003, agressb, agress, agress, agress, blockout_state, 0, ROT0, "bootleg", "Agress - Missile Daisenryaku (English bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index b9d52b1e27c..550efabf8a9 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -482,7 +482,7 @@ WRITE16_MEMBER( bloodbro_state::weststry_layer_scroll_w )
/* Machine Drivers */
-static MACHINE_CONFIG_START( bloodbro, bloodbro_state )
+static MACHINE_CONFIG_START( bloodbro )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(bloodbro_map)
@@ -517,7 +517,7 @@ static MACHINE_CONFIG_START( bloodbro, bloodbro_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -735,8 +735,8 @@ DRIVER_INIT_MEMBER(bloodbro_state,weststry)
/* Game Drivers */
-GAME( 1990, bloodbro, 0, bloodbro, bloodbro, driver_device, 0, ROT0, "TAD Corporation", "Blood Bros. (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, bloodbroa,bloodbro, bloodbro, bloodbro, driver_device, 0, ROT0, "TAD Corporation", "Blood Bros. (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, bloodbrob,bloodbro, bloodbro, bloodbro, driver_device, 0, ROT0, "TAD Corporation", "Blood Bros. (set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, bloodbro, 0, bloodbro, bloodbro, bloodbro_state, 0, ROT0, "TAD Corporation", "Blood Bros. (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, bloodbroa,bloodbro, bloodbro, bloodbro, bloodbro_state, 0, ROT0, "TAD Corporation", "Blood Bros. (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, bloodbrob,bloodbro, bloodbro, bloodbro, bloodbro_state, 0, ROT0, "TAD Corporation", "Blood Bros. (set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1990, weststry, bloodbro, weststry, weststry, bloodbro_state, weststry, ROT0, "bootleg (Datsu)", "West Story (bootleg of Blood Bros.)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, skysmash, 0, skysmash, skysmash, driver_device, 0, ROT270, "Nihon System", "Sky Smasher", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, skysmash, 0, skysmash, skysmash, bloodbro_state, 0, ROT270, "Nihon System", "Sky Smasher", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp
index cbe8a9c9981..357f1d10516 100644
--- a/src/mame/drivers/blstroid.cpp
+++ b/src/mame/drivers/blstroid.cpp
@@ -174,7 +174,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( blstroid, blstroid_state )
+static MACHINE_CONFIG_START( blstroid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index c506ca81ecd..6d05e2b554a 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -342,7 +342,7 @@ void blueprnt_state::machine_reset()
}
-static MACHINE_CONFIG_START( blueprnt, blueprnt_state )
+static MACHINE_CONFIG_START( blueprnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 7000000/2) // 3.5 MHz
@@ -498,7 +498,7 @@ ROM_END
*
*************************************/
-GAME( 1982, blueprnt, 0, blueprnt, blueprnt, driver_device, 0, ROT270, "Zilec Electronics / Bally Midway", "Blue Print (Midway)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, blueprntj, blueprnt, blueprnt, blueprnt, driver_device, 0, ROT270, "Zilec Electronics / Jaleco", "Blue Print (Jaleco)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, saturnzi, 0, blueprnt, saturn, driver_device, 0, ROT270, "Zilec Electronics / Jaleco", "Saturn", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, grasspin, 0, grasspin, grasspin, driver_device, 0, ROT270, "Zilec Electronics / Jaleco", "Grasspin", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) // a few issues with dip reading + video hw, but nothing major
+GAME( 1982, blueprnt, 0, blueprnt, blueprnt, blueprnt_state, 0, ROT270, "Zilec Electronics / Bally Midway", "Blue Print (Midway)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, blueprntj, blueprnt, blueprnt, blueprnt, blueprnt_state, 0, ROT270, "Zilec Electronics / Jaleco", "Blue Print (Jaleco)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, saturnzi, 0, blueprnt, saturn, blueprnt_state, 0, ROT270, "Zilec Electronics / Jaleco", "Saturn", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, grasspin, 0, grasspin, grasspin, blueprnt_state, 0, ROT270, "Zilec Electronics / Jaleco", "Grasspin", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) // a few issues with dip reading + video hw, but nothing major
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index ac80d19365b..6bff1856186 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -450,7 +450,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, bmcbowl_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( bmcbowl, bmcbowl_state )
+static MACHINE_CONFIG_START( bmcbowl )
MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2 )
MCFG_CPU_PROGRAM_MAP(bmcbowl_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bmcbowl_state, irq2_line_hold)
@@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( bmcbowl, bmcbowl_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1122000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index be65f5cc638..a4565f91f3a 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -42,7 +42,7 @@ public:
m_layerctrl(*this, "layerctrl"),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette")
- { }
+ { }
// Devices
required_device<cpu_device> m_maincpu;
@@ -799,7 +799,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, bmcpokr_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( bmcpokr, bmcpokr_state )
+static MACHINE_CONFIG_START( bmcpokr )
MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz / 4) // 68000 @10.50MHz (42/4)
MCFG_CPU_PROGRAM_MAP(bmcpokr_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", bmcpokr_state, interrupt, "screen", 0, 1)
@@ -827,7 +827,7 @@ static MACHINE_CONFIG_START( bmcpokr, bmcpokr_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_42MHz / 40, OKIM6295_PIN7_HIGH) // M6295 @1.05MHz (42/40), pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_42MHz / 40, PIN7_HIGH) // M6295 @1.05MHz (42/40), pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -949,5 +949,5 @@ ROM_START( mjmaglmp )
ROM_LOAD( "ja-a-901.u6", 0x00000, 0x40000, CRC(25f36d00) SHA1(c182348340ca67ad69d1a67c58b47d6371a725c9) )
ROM_END
-GAME( 1999, bmcpokr, 0, bmcpokr, bmcpokr, driver_device, 0, ROT0, "BMC", "Dongfang Shenlong", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mjmaglmp, 0, mjmaglmp, mjmaglmp, driver_device, 0, ROT0, "BMC", "Mahjong Magic Lamp (v. JAA02)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, bmcpokr, 0, bmcpokr, bmcpokr, bmcpokr_state, 0, ROT0, "BMC", "Dongfang Shenlong", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mjmaglmp, 0, mjmaglmp, mjmaglmp, bmcpokr_state, 0, ROT0, "BMC", "Mahjong Magic Lamp (v. JAA02)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index ff366367ada..28a45ee85b1 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -33,7 +33,7 @@ public:
, m_beep(*this, "beeper")
, m_p_wram(*this, "wram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
DECLARE_READ8_MEMBER(key_r);
DECLARE_WRITE8_MEMBER(key_w);
@@ -333,7 +333,7 @@ void bmjr_state::machine_reset()
m_cass->change_state(CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR);
}
-static MACHINE_CONFIG_START( bmjr, bmjr_state )
+static MACHINE_CONFIG_START( bmjr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4) //unknown clock / divider
MCFG_CPU_PROGRAM_MAP(bmjr_mem)
@@ -379,5 +379,5 @@ DRIVER_INIT_MEMBER(bmjr_state,bmjr)
{
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, bmjr, 0, 0, bmjr, bmjr, bmjr_state, bmjr, "Hitachi", "Basic Master Jr", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, bmjr, 0, 0, bmjr, bmjr, bmjr_state, bmjr, "Hitachi", "Basic Master Jr", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index 2d63a712ab0..7c12982e91a 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -964,7 +964,7 @@ static SLOT_INTERFACE_START(bml3_cards)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( bml3_common, bml3_state )
+static MACHINE_CONFIG_START( bml3_common )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809, CPU_CLOCK)
MCFG_CPU_VBLANK_INT_DRIVER("screen", bml3_state, bml3_timer_firq)
@@ -1113,7 +1113,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, bml3, 0, 0, bml3, bml3, driver_device, 0, "Hitachi", "MB-6890 Basic Master Level 3", MACHINE_NOT_WORKING)
-COMP( 1982, bml3mk2,bml3, 0, bml3mk2, bml3, driver_device, 0, "Hitachi", "MB-6891 Basic Master Level 3 Mark 2", MACHINE_NOT_WORKING)
-COMP( 1983, bml3mk5,bml3, 0, bml3mk5, bml3, driver_device, 0, "Hitachi", "MB-6892 Basic Master Level 3 Mark 5", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1980, bml3, 0, 0, bml3, bml3, bml3_state, 0, "Hitachi", "MB-6890 Basic Master Level 3", MACHINE_NOT_WORKING)
+COMP( 1982, bml3mk2,bml3, 0, bml3mk2, bml3, bml3_state, 0, "Hitachi", "MB-6891 Basic Master Level 3 Mark 2", MACHINE_NOT_WORKING)
+COMP( 1983, bml3mk5,bml3, 0, bml3mk5, bml3, bml3_state, 0, "Hitachi", "MB-6892 Basic Master Level 3 Mark 5", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index f0f26625060..1cdc8f7d913 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -806,7 +806,7 @@ void bnstars_state::machine_reset()
}
-static MACHINE_CONFIG_START( bnstars, bnstars_state )
+static MACHINE_CONFIG_START( bnstars )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
diff --git a/src/mame/drivers/bntyhunt.cpp b/src/mame/drivers/bntyhunt.cpp
index dd26f58f34c..02a266cff5d 100644
--- a/src/mame/drivers/bntyhunt.cpp
+++ b/src/mame/drivers/bntyhunt.cpp
@@ -49,7 +49,7 @@ static INPUT_PORTS_START( bntyhunt )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bntyhunt, bntyhunt_state )
+static MACHINE_CONFIG_START( bntyhunt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM, 200000000) /* Probably a Pentium or higher .. ?? Mhz*/
MCFG_CPU_PROGRAM_MAP(bntyhunt_map)
@@ -76,4 +76,4 @@ ROM_START(bntyhunt)
ROM_END
-GAME( 200?, bntyhunt, 0, bntyhunt, bntyhunt, driver_device, 0, ROT0, "GCTech Co., LTD", "Bounty Hunter (GCTech Co., LTD)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+GAME( 200?, bntyhunt, 0, bntyhunt, bntyhunt, bntyhunt_state, 0, ROT0, "GCTech Co., LTD", "Bounty Hunter (GCTech Co., LTD)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp
index 0b519fb1cba..b2e3fb24504 100644
--- a/src/mame/drivers/bob85.cpp
+++ b/src/mame/drivers/bob85.cpp
@@ -198,7 +198,7 @@ READ_LINE_MEMBER( bob85_state::sid_r )
return m_cass->input() > 0.0;
}
-static MACHINE_CONFIG_START( bob85, bob85_state )
+static MACHINE_CONFIG_START( bob85 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_5MHz)
MCFG_CPU_PROGRAM_MAP(bob85_mem)
@@ -222,5 +222,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, bob85, 0, 0, bob85, bob85, driver_device, 0, "Josef Kratochvil", "BOB-85", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1984, bob85, 0, 0, bob85, bob85, bob85_state, 0, "Josef Kratochvil", "BOB-85", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp
index 21ec9ea846c..bad65f36d24 100644
--- a/src/mame/drivers/bogeyman.cpp
+++ b/src/mame/drivers/bogeyman.cpp
@@ -228,7 +228,7 @@ WRITE8_MEMBER(bogeyman_state::colbank_w)
}
}
-static MACHINE_CONFIG_START( bogeyman, bogeyman_state )
+static MACHINE_CONFIG_START( bogeyman )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6502, 1500000) /* Verified */
@@ -294,4 +294,4 @@ ROM_END
/* Game Driver */
-GAME( 1985, bogeyman, 0, bogeyman, bogeyman, driver_device, 0, ROT0, "Technos Japan", "Bogey Manor", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, bogeyman, 0, bogeyman, bogeyman, bogeyman_state, 0, ROT0, "Technos Japan", "Bogey Manor", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp
index 3f0fb247ef6..fe15cb6b990 100644
--- a/src/mame/drivers/bombjack.cpp
+++ b/src/mame/drivers/bombjack.cpp
@@ -354,7 +354,7 @@ INTERRUPT_GEN_MEMBER(bombjack_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( bombjack, bombjack_state )
+static MACHINE_CONFIG_START( bombjack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) /* Confirmed from PCB */
@@ -507,6 +507,6 @@ ROM_END
*
*************************************/
-GAME( 1984, bombjack, 0, bombjack, bombjack, driver_device, 0, ROT90, "Tehkan", "Bomb Jack (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, bombjack2, bombjack, bombjack, bombjack, driver_device, 0, ROT90, "Tehkan", "Bomb Jack (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, bombjackt, bombjack, bombjack, bombjack, driver_device, 0, ROT90, "Tehkan (Tecfri licence)", "Bomb Jack (Tecfri, Spain)", MACHINE_SUPPORTS_SAVE ) // official licence
+GAME( 1984, bombjack, 0, bombjack, bombjack, bombjack_state, 0, ROT90, "Tehkan", "Bomb Jack (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bombjack2, bombjack, bombjack, bombjack, bombjack_state, 0, ROT90, "Tehkan", "Bomb Jack (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bombjackt, bombjack, bombjack, bombjack, bombjack_state, 0, ROT90, "Tehkan (Tecfri licence)", "Bomb Jack (Tecfri, Spain)", MACHINE_SUPPORTS_SAVE ) // official licence
diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp
index eafe82e6e18..fd4ceab8a50 100644
--- a/src/mame/drivers/boogwing.cpp
+++ b/src/mame/drivers/boogwing.cpp
@@ -321,7 +321,7 @@ DECO16IC_BANK_CB_MEMBER(boogwing_state::bank_callback2)
return offset;
}
-static MACHINE_CONFIG_START( boogwing, boogwing_state )
+static MACHINE_CONFIG_START( boogwing )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000) /* DE102 */
@@ -403,11 +403,11 @@ static MACHINE_CONFIG_START( boogwing, boogwing_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.40)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index b3cc769e523..2979c91f8a2 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -298,7 +298,7 @@ void bottom9_state::machine_reset()
m_nmienable = 0;
}
-static MACHINE_CONFIG_START( bottom9, bottom9_state )
+static MACHINE_CONFIG_START( bottom9 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */
@@ -533,6 +533,6 @@ ROM_END
-GAME( 1989, bottom9, 0, bottom9, bottom9, driver_device, 0, ROT0, "Konami", "Bottom of the Ninth (version T)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bottom9n, bottom9, bottom9, bottom9, driver_device, 0, ROT0, "Konami", "Bottom of the Ninth (version N)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mstadium, bottom9, bottom9, mstadium, driver_device, 0, ROT0, "Konami", "Main Stadium (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bottom9, 0, bottom9, bottom9, bottom9_state, 0, ROT0, "Konami", "Bottom of the Ninth (version T)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bottom9n, bottom9, bottom9, bottom9, bottom9_state, 0, ROT0, "Konami", "Bottom of the Ninth (version N)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mstadium, bottom9, bottom9, mstadium, bottom9_state, 0, ROT0, "Konami", "Main Stadium (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp
index cd3d2d650a7..de49b5f9211 100644
--- a/src/mame/drivers/bowltry.cpp
+++ b/src/mame/drivers/bowltry.cpp
@@ -94,7 +94,7 @@ uint32_t bowltry_state::screen_update_bowltry(screen_device &screen, bitmap_rgb3
-static MACHINE_CONFIG_START( bowltry, bowltry_state )
+static MACHINE_CONFIG_START( bowltry )
MCFG_CPU_ADD("maincpu", H83008, 16000000 )
MCFG_CPU_PROGRAM_MAP( bowltry_map )
// MCFG_CPU_VBLANK_INT_DRIVER("screen", bowltry_state, irq0_line_hold) // uses vector $64, IMIAB according to the manual (timer/compare B, internal to the CPU)
@@ -126,4 +126,4 @@ ROM_START( bowltry )
ROM_END
-GAME( 200?, bowltry, 0, bowltry, bowltry, driver_device, 0, ROT0, "Atlus", "Bowling Try",MACHINE_IS_SKELETON )
+GAME( 200?, bowltry, 0, bowltry, bowltry, bowltry_state, 0, ROT0, "Atlus", "Bowling Try",MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index 02a94862c2f..d6caffc33ac 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -480,7 +480,7 @@ void boxer_state::machine_reset()
}
-static MACHINE_CONFIG_START( boxer, boxer_state )
+static MACHINE_CONFIG_START( boxer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16)
@@ -545,4 +545,4 @@ ROM_END
*
*************************************/
-GAME( 1978, boxer, 0, boxer, boxer, driver_device, 0, 0, "Atari", "Boxer (prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, boxer, 0, boxer, boxer, boxer_state, 0, 0, "Atari", "Boxer (prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bpmmicro.cpp b/src/mame/drivers/bpmmicro.cpp
index 42a1162698f..7e7ca4fc3c4 100644
--- a/src/mame/drivers/bpmmicro.cpp
+++ b/src/mame/drivers/bpmmicro.cpp
@@ -357,7 +357,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( bpmmicro, bpmmicro_state )
+static MACHINE_CONFIG_START( bpmmicro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80286, XTAL_32MHz/4) /* divider is guessed, cpu is an AMD N80L286-16/S part */
MCFG_CPU_PROGRAM_MAP(i286_mem)
@@ -413,5 +413,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1992, bp1200, 0, 0, bpmmicro, bpmmicro, bpmmicro_state, bp1200, "BP Microsystems", "BP-1200", MACHINE_IS_SKELETON | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp
index b24d817be00..c65fdd7272d 100644
--- a/src/mame/drivers/br8641.cpp
+++ b/src/mame/drivers/br8641.cpp
@@ -153,7 +153,7 @@ static const z80_daisy_config daisy_chain_intf[] =
-static MACHINE_CONFIG_START( brandt8641, brandt8641_state )
+static MACHINE_CONFIG_START( brandt8641 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // U4 ,4MHz crystal on board
MCFG_CPU_PROGRAM_MAP(brandt8641_mem)
@@ -190,4 +190,4 @@ ROM_START( br8641 )
ROM_END
/* Driver */
-COMP( 1986, br8641, 0, 0, brandt8641, brandt8641, driver_device, 0, "Brandt", "Brandt 8641", MACHINE_NOT_WORKING )
+COMP( 1986, br8641, 0, 0, brandt8641, brandt8641, brandt8641_state, 0, "Brandt", "Brandt 8641", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index d31a6f7a413..9e1f673f8a8 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -376,7 +376,7 @@ INTERRUPT_GEN_MEMBER(brkthru_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( brkthru, brkthru_state )
+static MACHINE_CONFIG_START( brkthru )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
@@ -416,7 +416,7 @@ static MACHINE_CONFIG_START( brkthru, brkthru_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( darwin, brkthru_state )
+static MACHINE_CONFIG_START( darwin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
@@ -654,7 +654,7 @@ DRIVER_INIT_MEMBER(brkthru_state,brkthru)
*
*************************************/
-GAME( 1986, brkthru, 0, brkthru, brkthru, brkthru_state, brkthru, ROT0, "Data East USA", "Break Thru (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, brkthru, 0, brkthru, brkthru, brkthru_state, brkthru, ROT0, "Data East USA", "Break Thru (US)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, brkthruj, brkthru, brkthru, brkthruj, brkthru_state, brkthru, ROT0, "Data East Corporation", "Kyohkoh-Toppa (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, forcebrk, brkthru, brkthru, brkthruj, brkthru_state, brkthru, ROT0, "bootleg", "Force Break (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, darwin, 0, darwin, darwin, brkthru_state, brkthru, ROT270, "Data East Corporation", "Darwin 4078 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, darwin, 0, darwin, darwin, brkthru_state, brkthru, ROT270, "Data East Corporation", "Darwin 4078 (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp
index 5fcc6bf3cec..acd4c6a3776 100644
--- a/src/mame/drivers/bsktball.cpp
+++ b/src/mame/drivers/bsktball.cpp
@@ -244,7 +244,7 @@ void bsktball_state::machine_reset()
}
-static MACHINE_CONFIG_START( bsktball, bsktball_state )
+static MACHINE_CONFIG_START( bsktball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,750000)
@@ -302,4 +302,4 @@ ROM_END
*
*************************************/
-GAME( 1979, bsktball, 0, bsktball, bsktball, driver_device, 0, ROT0, "Atari", "Basketball", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, bsktball, 0, bsktball, bsktball, bsktball_state, 0, ROT0, "Atari", "Basketball", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index 6697f58b6a0..42be40b45ab 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -1289,7 +1289,7 @@ MACHINE_RESET_MEMBER(btime_state,mmonkey)
m_protection_ret = 0;
}
-static MACHINE_CONFIG_START( btime, btime_state )
+static MACHINE_CONFIG_START( btime )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", DECO_CPU7, HCLK2) /* seletable between H2/H4 via jumper */
@@ -2063,22 +2063,22 @@ DRIVER_INIT_MEMBER(btime_state,sdtennis)
}
-GAME( 1982, btime, 0, btime, btime, btime_state, btime, ROT270, "Data East Corporation", "Burger Time (Data East set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, btime2, btime, btime, btime, btime_state, btime, ROT270, "Data East Corporation", "Burger Time (Data East set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, btime3, btime, btime, btime, btime_state, btime, ROT270, "Data East USA Inc.", "Burger Time (Data East USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, btimem, btime, btime, btime, btime_state, btime, ROT270, "Data East (Bally Midway license)", "Burger Time (Midway)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, cookrace, btime, cookrace, cookrace, btime_state, cookrace, ROT270, "bootleg", "Cook Race", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, tisland, 0, tisland, btime, btime_state, tisland, ROT270, "Data East Corporation", "Treasure Island", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, lnc, 0, lnc, lnc, btime_state, lnc, ROT270, "Data East Corporation", "Lock'n'Chase", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, protennb, 0, disco, disco, btime_state, protennb, ROT270, "bootleg", "Tennis (bootleg of Pro Tennis)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, wtennis, 0, wtennis, wtennis, btime_state, wtennis, ROT270, "bootleg", "World Tennis", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mmonkey, 0, mmonkey, mmonkey, btime_state, lnc, ROT270, "Technos Japan / Roller Tron", "Minky Monkey", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, brubber, 0, bnj, bnj, btime_state, bnj, ROT270, "Data East", "Burnin' Rubber", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bnj, brubber, bnj, bnj, btime_state, bnj, ROT270, "Data East USA", "Bump 'n' Jump", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bnjm, brubber, bnj, bnj, btime_state, bnj, ROT270, "Data East USA (Bally Midway license)", "Bump 'n' Jump (Midway)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, caractn, brubber, bnj, bnj, btime_state, bnj, ROT270, "bootleg", "Car Action (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, caractn2, brubber, bnj, caractn2, btime_state, bnj, ROT270, "bootleg", "Car Action (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zoar, 0, zoar, zoar, btime_state, zoar, ROT270, "Data East USA", "Zoar", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, disco, 0, disco, disco, btime_state, disco, ROT270, "Data East", "Disco No.1", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, discof, disco, disco, disco, btime_state, disco, ROT270, "Data East", "Disco No.1 (Rev.F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, sdtennis, 0, sdtennis, sdtennis, btime_state, sdtennis, ROT270, "Data East Corporation", "Super Doubles Tennis", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, btime, 0, btime, btime, btime_state, btime, ROT270, "Data East Corporation", "Burger Time (Data East set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, btime2, btime, btime, btime, btime_state, btime, ROT270, "Data East Corporation", "Burger Time (Data East set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, btime3, btime, btime, btime, btime_state, btime, ROT270, "Data East USA Inc.", "Burger Time (Data East USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, btimem, btime, btime, btime, btime_state, btime, ROT270, "Data East (Bally Midway license)", "Burger Time (Midway)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, cookrace, btime, cookrace, cookrace, btime_state, cookrace, ROT270, "bootleg", "Cook Race", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, tisland, 0, tisland, btime, btime_state, tisland, ROT270, "Data East Corporation", "Treasure Island", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, lnc, 0, lnc, lnc, btime_state, lnc, ROT270, "Data East Corporation", "Lock'n'Chase", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, protennb, 0, disco, disco, btime_state, protennb, ROT270, "bootleg", "Tennis (bootleg of Pro Tennis)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, wtennis, 0, wtennis, wtennis, btime_state, wtennis, ROT270, "bootleg", "World Tennis", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mmonkey, 0, mmonkey, mmonkey, btime_state, lnc, ROT270, "Technos Japan / Roller Tron", "Minky Monkey", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, brubber, 0, bnj, bnj, btime_state, bnj, ROT270, "Data East", "Burnin' Rubber", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bnj, brubber, bnj, bnj, btime_state, bnj, ROT270, "Data East USA", "Bump 'n' Jump", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bnjm, brubber, bnj, bnj, btime_state, bnj, ROT270, "Data East USA (Bally Midway license)", "Bump 'n' Jump (Midway)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, caractn, brubber, bnj, bnj, btime_state, bnj, ROT270, "bootleg", "Car Action (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, caractn2, brubber, bnj, caractn2, btime_state, bnj, ROT270, "bootleg", "Car Action (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zoar, 0, zoar, zoar, btime_state, zoar, ROT270, "Data East USA", "Zoar", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, disco, 0, disco, disco, btime_state, disco, ROT270, "Data East", "Disco No.1", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, discof, disco, disco, disco, btime_state, disco, ROT270, "Data East", "Disco No.1 (Rev.F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, sdtennis, 0, sdtennis, sdtennis, btime_state, sdtennis, ROT270, "Data East Corporation", "Super Doubles Tennis", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp
index ca703c7c948..86d402c5c41 100644
--- a/src/mame/drivers/btoads.cpp
+++ b/src/mame/drivers/btoads.cpp
@@ -300,7 +300,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( btoads, btoads_state )
+static MACHINE_CONFIG_START( btoads )
MCFG_CPU_ADD("maincpu", TMS34020, CPU_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -369,4 +369,4 @@ ROM_END
*
*************************************/
-GAME( 1994, btoads, 0, btoads, btoads, driver_device, 0, ROT0, "Rare / Electronic Arts", "Battletoads", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, btoads, 0, btoads, btoads, btoads_state, 0, ROT0, "Rare / Electronic Arts", "Battletoads", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp
index 972b1a19c2d..11b139b0557 100644
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@@ -758,7 +758,7 @@ MACHINE_RESET_MEMBER(bublbobl_state,tokio)
-static MACHINE_CONFIG_START( tokio, bublbobl_state )
+static MACHINE_CONFIG_START( tokio )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
@@ -853,7 +853,7 @@ MACHINE_RESET_MEMBER(bublbobl_state,bublbobl)
m_port4_out = 0;
}
-static MACHINE_CONFIG_START( bublbobl, bublbobl_state )
+static MACHINE_CONFIG_START( bublbobl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
@@ -954,7 +954,7 @@ MACHINE_RESET_MEMBER(bub68705_state, bub68705)
m_latch = 0;
}
-static MACHINE_CONFIG_DERIVED_CLASS( bub68705, bublbobl, bub68705_state )
+static MACHINE_CONFIG_DERIVED( bub68705, bublbobl )
/* basic machine hardware */
MCFG_DEVICE_REMOVE("mcu")
@@ -1886,31 +1886,30 @@ DRIVER_INIT_MEMBER(bublbobl_state,dland)
*
*************************************/
-GAME( 1986, tokio, 0, tokio, tokio, bublbobl_state, tokio, ROT90, "Taito Corporation", "Tokio / Scramble Formation (newer)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, tokioo, tokio, tokio, tokio, bublbobl_state, tokio, ROT90, "Taito Corporation", "Tokio / Scramble Formation (older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, tokiou, tokio, tokio, tokio, bublbobl_state, tokio, ROT90, "Taito America Corporation (Romstar license)", "Tokio / Scramble Formation (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, tokiob, tokio, tokiob, tokio_base, bublbobl_state, tokio, ROT90, "bootleg", "Tokio / Scramble Formation (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, tokio, 0, tokio, tokio, bublbobl_state, tokio, ROT90, "Taito Corporation", "Tokio / Scramble Formation (newer)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, tokioo, tokio, tokio, tokio, bublbobl_state, tokio, ROT90, "Taito Corporation", "Tokio / Scramble Formation (older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, tokiou, tokio, tokio, tokio, bublbobl_state, tokio, ROT90, "Taito America Corporation (Romstar license)", "Tokio / Scramble Formation (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, tokiob, tokio, tokiob, tokio_base, bublbobl_state, tokio, ROT90, "bootleg", "Tokio / Scramble Formation (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, bublbobl, 0, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito Corporation", "Bubble Bobble (Japan, Ver 0.1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, bublbobl1, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito Corporation", "Bubble Bobble (Japan, Ver 0.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, bublboblr, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito America Corporation (Romstar license)", "Bubble Bobble (US, Ver 5.1)", MACHINE_SUPPORTS_SAVE ) // newest release, with mode select
-GAME( 1986, bublboblr1, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito America Corporation (Romstar license)", "Bubble Bobble (US, Ver 1.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bublbobl, 0, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito Corporation", "Bubble Bobble (Japan, Ver 0.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bublbobl1, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito Corporation", "Bubble Bobble (Japan, Ver 0.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bublboblr, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito America Corporation (Romstar license)", "Bubble Bobble (US, Ver 5.1)", MACHINE_SUPPORTS_SAVE ) // newest release, with mode select
+GAME( 1986, bublboblr1, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "Taito America Corporation (Romstar license)", "Bubble Bobble (US, Ver 1.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, boblbobl, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Bobble Bobble (bootleg of Bubble Bobble)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sboblbobl, bublbobl, boblbobl, sboblbobl, bublbobl_state, bublbobl, ROT0, "bootleg (Datsu)", "Super Bobble Bobble (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sboblbobla, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sboblboblb, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sboblbobld, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sboblboblc, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bubble Bobble (bootleg)", MACHINE_SUPPORTS_SAVE ) // the title screen on this one isn't hacked
-GAME( 1986, bub68705, bublbobl, bub68705, bublbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Bubble Bobble (bootleg with 68705)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, boblbobl, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Bobble Bobble (bootleg of Bubble Bobble)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sboblbobl, bublbobl, boblbobl, sboblbobl, bublbobl_state, bublbobl, ROT0, "bootleg (Datsu)", "Super Bobble Bobble (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sboblbobla, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sboblboblb, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sboblbobld, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bobble Bobble (bootleg, set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sboblboblc, bublbobl, boblbobl, sboblboblb, bublbobl_state, bublbobl, ROT0, "bootleg", "Super Bubble Bobble (bootleg)", MACHINE_SUPPORTS_SAVE ) // the title screen on this one isn't hacked
+GAME( 1986, bub68705, bublbobl, bub68705, bublbobl, bub68705_state, bublbobl, ROT0, "bootleg", "Bubble Bobble (bootleg with 68705)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, dland, bublbobl, boblbobl, dland, bublbobl_state, dland, ROT0, "bootleg", "Dream Land / Super Dream Land (bootleg of Bubble Bobble)", MACHINE_SUPPORTS_SAVE )
-GAME( 2013, bbredux, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg (Punji)", "Bubble Bobble ('bootleg redux' hack for Bobble Bobble PCB)", MACHINE_SUPPORTS_SAVE ) // for use on non-MCU bootleg boards (Bobble Bobble etc.) has more faithful simulation of the protection device (JAN-04-2015 release)
-GAME( 2013, bublboblb, bublbobl, boblbobl, boblcave, bublbobl_state, bublbobl, ROT0, "bootleg (Aladar)", "Bubble Bobble (for Bobble Bobble PCB)", MACHINE_SUPPORTS_SAVE ) // alt bootleg/hack to restore proper MCU behavior to bootleg boards
+GAME( 2013, bbredux, bublbobl, boblbobl, boblbobl, bublbobl_state, bublbobl, ROT0, "bootleg (Punji)", "Bubble Bobble ('bootleg redux' hack for Bobble Bobble PCB)", MACHINE_SUPPORTS_SAVE ) // for use on non-MCU bootleg boards (Bobble Bobble etc.) has more faithful simulation of the protection device (JAN-04-2015 release)
+GAME( 2013, bublboblb, bublbobl, boblbobl, boblcave, bublbobl_state, bublbobl, ROT0, "bootleg (Aladar)", "Bubble Bobble (for Bobble Bobble PCB)", MACHINE_SUPPORTS_SAVE ) // alt bootleg/hack to restore proper MCU behavior to bootleg boards
-GAME( 2013, bublcave, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.2", MACHINE_SUPPORTS_SAVE )
-GAME( 2013, boblcave, bublbobl, boblbobl, boblcave, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.2 (for Bobble Bobble PCB)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 2012, bublcave11, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.1", MACHINE_SUPPORTS_SAVE )
-GAME( 2012, bublcave10, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.0", MACHINE_SUPPORTS_SAVE )
+GAME( 2013, bublcave, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.2", MACHINE_SUPPORTS_SAVE )
+GAME( 2013, boblcave, bublbobl, boblbobl, boblcave, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.2 (for Bobble Bobble PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, bublcave11, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.1", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, bublcave10, bublbobl, bublbobl, bublbobl, bublbobl_state, bublbobl, ROT0, "hack (Bisboch and Aladar)", "Bubble Bobble: Lost Cave V1.0", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index af4c211167e..ce3b2cafadc 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -366,7 +366,7 @@ void buggychl_state::machine_reset()
m_bg_scrollx = 0;
}
-static MACHINE_CONFIG_START( buggychl, buggychl_state )
+static MACHINE_CONFIG_START( buggychl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz??? */
@@ -495,5 +495,5 @@ ROM_START( buggychlt )
ROM_END
-GAMEL( 1984, buggychl, 0, buggychl, buggychl, driver_device, 0, ROT270, "Taito Corporation", "Buggy Challenge", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_buggychl )
-GAMEL( 1984, buggychlt,buggychl, buggychl, buggychl, driver_device, 0, ROT270, "Taito Corporation (Tecfri license)", "Buggy Challenge (Tecfri)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS| MACHINE_SUPPORTS_SAVE, layout_buggychl )
+GAMEL( 1984, buggychl, 0, buggychl, buggychl, buggychl_state, 0, ROT270, "Taito Corporation", "Buggy Challenge", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_buggychl )
+GAMEL( 1984, buggychlt,buggychl, buggychl, buggychl, buggychl_state, 0, ROT270, "Taito Corporation (Tecfri license)", "Buggy Challenge (Tecfri)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_buggychl )
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index 58d444e0d26..c9ab6ce084f 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -60,6 +60,7 @@ Notes:
#include "emu.h"
#include "includes/bullet.h"
+
#include "bus/rs232/rs232.h"
#include "bus/scsi/scsihd.h"
#include "softlist.h"
@@ -621,7 +622,7 @@ static ADDRESS_MAP_START( bullet_io, AS_IO, 8, bullet_state )
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read, write)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write)
AM_RANGE(0x0c, 0x0c) AM_MIRROR(0x03) AM_READWRITE(win_r, wstrobe_w)
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(MB8877_TAG, mb8877_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(MB8877_TAG, mb8877_device, read, write)
AM_RANGE(0x14, 0x14) AM_DEVREADWRITE(Z80DMA_TAG, z80dma_device, read, write)
AM_RANGE(0x15, 0x15) AM_READWRITE(brom_r, brom_w)
AM_RANGE(0x16, 0x16) AM_WRITE(exdsk_w)
@@ -650,7 +651,7 @@ static ADDRESS_MAP_START( bulletf_io, AS_IO, 8, bulletf_state )
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read, write)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write)
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(MB8877_TAG, mb8877_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(MB8877_TAG, mb8877_device, read, write)
AM_RANGE(0x14, 0x14) AM_WRITE(xdma0_w)
AM_RANGE(0x16, 0x16) AM_WRITE(xfdc_w)
AM_RANGE(0x17, 0x17) AM_WRITE(mbank_w)
@@ -1098,7 +1099,7 @@ void bulletf_state::machine_reset()
// MACHINE_CONFIG( bullet )
//-------------------------------------------------
-static MACHINE_CONFIG_START( bullet, bullet_state )
+static MACHINE_CONFIG_START( bullet )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(bullet_mem)
@@ -1178,7 +1179,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( bulletf )
//-------------------------------------------------
-static MACHINE_CONFIG_START( bulletf, bulletf_state )
+static MACHINE_CONFIG_START( bulletf )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(bulletf_mem)
@@ -1292,7 +1293,7 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
// the setname 'bullet' is used by Sega's Bullet in MAME.
-COMP( 1982, wmbullet, 0, 0, bullet, bullet, driver_device, 0, "Wave Mate", "Bullet", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1984, wmbulletf, wmbullet, 0, bulletf, bulletf, driver_device, 0, "Wave Mate", "Bullet (Revision F)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1982, wmbullet, 0, 0, bullet, bullet, bullet_state, 0, "Wave Mate", "Bullet", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1984, wmbulletf, wmbullet, 0, bulletf, bulletf, bulletf_state, 0, "Wave Mate", "Bullet (Revision F)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp
index 338f42d3cf7..09a685d6114 100644
--- a/src/mame/drivers/busicom.cpp
+++ b/src/mame/drivers/busicom.cpp
@@ -212,7 +212,7 @@ void busicom_state::machine_reset()
//static const char layout_busicom [] = "busicom";
-static MACHINE_CONFIG_START( busicom, busicom_state )
+static MACHINE_CONFIG_START( busicom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I4004, 750000)
MCFG_CPU_PROGRAM_MAP(busicom_rom)
@@ -247,5 +247,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1974, busicom, 0, 0, busicom, busicom, driver_device, 0, "Business Computer Corporation", "Busicom 141-PF", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1974, busicom, 0, 0, busicom, busicom, busicom_state, 0, "Business Computer Corporation", "Busicom 141-PF", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp
index 823fe6dfd35..04a181fa4b0 100644
--- a/src/mame/drivers/buster.cpp
+++ b/src/mame/drivers/buster.cpp
@@ -315,7 +315,7 @@ static GFXDECODE_START( buster )
GFXDECODE_END
-static MACHINE_CONFIG_START( buster, buster_state )
+static MACHINE_CONFIG_START( buster )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_3_579545MHz) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(mainmap)
@@ -359,4 +359,4 @@ ROM_START( buster )
ROM_END
-GAME( 1982, buster, 0, buster, buster, driver_device, 0, ROT0, "Marian Electronics Ltd.", "Buster", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+GAME( 1982, buster, 0, buster, buster, buster_state, 0, ROT0, "Marian Electronics Ltd.", "Buster", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index 0d5b6df097b..326405bc3bc 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -543,7 +543,7 @@ GFXDECODE_END
/* Machine Driver */
-static MACHINE_CONFIG_START( common, bw12_state )
+static MACHINE_CONFIG_START( common )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(bw12_mem)
@@ -674,6 +674,6 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, bw12, 0, 0, bw12, bw12, driver_device, 0, "Bondwell Holding", "Bondwell 12", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, bw14, bw12, 0, bw14, bw12, driver_device, 0, "Bondwell Holding", "Bondwell 14", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, bw12, 0, 0, bw12, bw12, bw12_state, 0, "Bondwell Holding", "Bondwell 12", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, bw14, bw12, 0, bw14, bw12, bw12_state, 0, "Bondwell Holding", "Bondwell 14", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index a20616600af..7af11dd172d 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -222,7 +222,7 @@ static ADDRESS_MAP_START( bw2_io, AS_IO, 8, bw2_state )
AM_RANGE(0x40, 0x40) AM_DEVREADWRITE(I8251_TAG, i8251_device, data_r, data_w)
AM_RANGE(0x41, 0x41) AM_DEVREADWRITE(I8251_TAG, i8251_device, status_r, control_w)
AM_RANGE(0x50, 0x50) AM_DEVWRITE("cent_data_out", output_latch_device, write)
- AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(WD2797_TAG, wd2797_t, read, write)
+ AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(WD2797_TAG, wd2797_device, read, write)
AM_RANGE(0x70, 0x7f) AM_DEVREADWRITE(BW2_EXPANSION_SLOT_TAG, bw2_expansion_slot_device, modsel_r, modsel_w)
ADDRESS_MAP_END
@@ -575,7 +575,7 @@ void bw2_state::machine_start()
// MACHINE_CONFIG( bw2 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( bw2, bw2_state )
+static MACHINE_CONFIG_START( bw2 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(bw2_mem)
@@ -667,5 +667,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1985, bw2, 0, 0, bw2, bw2, driver_device, 0, "Bondwell Holding", "Bondwell Model 2", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, bw2, 0, 0, bw2, bw2, bw2_state, 0, "Bondwell Holding", "Bondwell Model 2", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index 3337d7b043d..31961b9c1b9 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -731,7 +731,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( bwidow, bwidow_state )
+static MACHINE_CONFIG_START( bwidow )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
@@ -1063,13 +1063,13 @@ ROM_END
*
*************************************/
-GAME( 1980, spacduel, 0, spacduel, spacduel, driver_device, 0, ROT0, "Atari", "Space Duel (version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacduel1,spacduel, spacduel, spacduel, driver_device, 0, ROT0, "Atari", "Space Duel (version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacduel0,spacduel, spacduel, spacduel, driver_device, 0, ROT0, "Atari", "Space Duel (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bwidow, 0, bwidow, bwidow, driver_device, 0, ROT0, "Atari", "Black Widow", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bwidowp, bwidow, bwidowp, bwidow, driver_device, 0, ROT0, "Atari", "Black Widow (prototype)", MACHINE_NOT_WORKING )
-GAME( 1982, gravitar, 0, gravitar, gravitar, driver_device, 0, ROT0, "Atari", "Gravitar (version 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, gravitar2,gravitar, gravitar, gravitar, driver_device, 0, ROT0, "Atari", "Gravitar (version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, gravitar1,gravitar, gravitar, gravitar, driver_device, 0, ROT0, "Atari", "Gravitar (version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, lunarbat, gravitar, gravitar, gravitar, driver_device, 0, ROT0, "Atari", "Lunar Battle (prototype, later)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, lunarba1, gravitar, lunarbat, lunarbat, driver_device, 0, ROT0, "Atari", "Lunar Battle (prototype, earlier)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacduel, 0, spacduel, spacduel, bwidow_state, 0, ROT0, "Atari", "Space Duel (version 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacduel1,spacduel, spacduel, spacduel, bwidow_state, 0, ROT0, "Atari", "Space Duel (version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacduel0,spacduel, spacduel, spacduel, bwidow_state, 0, ROT0, "Atari", "Space Duel (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bwidow, 0, bwidow, bwidow, bwidow_state, 0, ROT0, "Atari", "Black Widow", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bwidowp, bwidow, bwidowp, bwidow, bwidow_state, 0, ROT0, "Atari", "Black Widow (prototype)", MACHINE_NOT_WORKING )
+GAME( 1982, gravitar, 0, gravitar, gravitar, bwidow_state, 0, ROT0, "Atari", "Gravitar (version 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, gravitar2,gravitar, gravitar, gravitar, bwidow_state, 0, ROT0, "Atari", "Gravitar (version 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, gravitar1,gravitar, gravitar, gravitar, bwidow_state, 0, ROT0, "Atari", "Gravitar (version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, lunarbat, gravitar, gravitar, gravitar, bwidow_state, 0, ROT0, "Atari", "Lunar Battle (prototype, later)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, lunarba1, gravitar, lunarbat, lunarbat, bwidow_state, 0, ROT0, "Atari", "Lunar Battle (prototype, earlier)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index c6eb42d9052..f298719e5db 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -358,7 +358,7 @@ void bwing_state::bwing_postload()
}
-static MACHINE_CONFIG_START( bwing, bwing_state )
+static MACHINE_CONFIG_START( bwing )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6809, 2000000)
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index 6caa08eabd6..37ce01ef41d 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -973,7 +973,7 @@ MACHINE_RESET_MEMBER( by17_state, by17 )
-static MACHINE_CONFIG_START( by17, by17_state )
+static MACHINE_CONFIG_START( by17 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
MCFG_CPU_PROGRAM_MAP(by17_map)
@@ -1119,12 +1119,12 @@ ROM_END
GAME( 1976, bowarrow, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Bow & Arrow (Prototype)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1977, freedom, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Freedom", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1977, nightrdr, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Night Rider (rev. 21)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1977, nightr20, nightrdr, by17, by17, by17_state, by17, ROT0, "Bally", "Night Rider (rev. 20)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1978, blackjck, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Black Jack (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1977, evelknie, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Evel Knievel", MACHINE_IS_SKELETON_MECHANICAL)
-GAMEL( 1978, matahari, 0, by17, matahari, by17_state, matahari, ROT0, "Bally", "Mata Hari", MACHINE_MECHANICAL | MACHINE_NOT_WORKING, layout_by17_matahari)
-GAME( 1977, eightbll, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Eight Ball", MACHINE_IS_SKELETON_MECHANICAL)
-GAMEL( 1978, pwerplay, 0, by17, pwerplay, by17_state, pwerplay, ROT0, "Bally", "Power Play (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING, layout_by17_pwerplay)
-GAME( 1978, stk_sprs, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Strikes and Spares", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1977, freedom, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Freedom", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1977, nightrdr, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Night Rider (rev. 21)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1977, nightr20, nightrdr, by17, by17, by17_state, by17, ROT0, "Bally", "Night Rider (rev. 20)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1978, blackjck, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Black Jack (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1977, evelknie, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Evel Knievel", MACHINE_IS_SKELETON_MECHANICAL)
+GAMEL( 1978, matahari, 0, by17, matahari, by17_state, matahari, ROT0, "Bally", "Mata Hari", MACHINE_MECHANICAL | MACHINE_NOT_WORKING, layout_by17_matahari)
+GAME( 1977, eightbll, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Eight Ball", MACHINE_IS_SKELETON_MECHANICAL)
+GAMEL( 1978, pwerplay, 0, by17, pwerplay, by17_state, pwerplay, ROT0, "Bally", "Power Play (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING, layout_by17_pwerplay)
+GAME( 1978, stk_sprs, 0, by17, by17, by17_state, by17, ROT0, "Bally", "Strikes and Spares", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index 236aa64d2fb..77da1de80cb 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -1074,7 +1074,7 @@ DISCRETE_SOUND_END
-static MACHINE_CONFIG_START( by35, by35_state )
+static MACHINE_CONFIG_START( by35 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 530000) // No xtal, just 2 chips forming a multivibrator oscillator around 530KHz
MCFG_CPU_PROGRAM_MAP(by35_map)
@@ -2394,83 +2394,83 @@ ROM_START(suprbowl)
ROM_END
// AS-2888 sound
-GAME( 1979, sst, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Supersonic", MACHINE_IS_SKELETON_MECHANICAL)
-GAMEL(1978, playboy, 0, as2888, playboy, by35_state, playboy, ROT0, "Bally", "Playboy", MACHINE_MECHANICAL | MACHINE_NOT_WORKING, layout_by35_playboy)
-GAME( 1978, lostwrlp, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Lost World", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1978, smman, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Six Million Dollar Man", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1978, voltan, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Voltan Escapes Cosmic Doom", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1979, startrep, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Star Trek (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1979, kiss, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Kiss", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, sst, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Supersonic", MACHINE_IS_SKELETON_MECHANICAL)
+GAMEL(1978, playboy, 0, as2888, playboy, by35_state, playboy, ROT0, "Bally", "Playboy", MACHINE_MECHANICAL | MACHINE_NOT_WORKING, layout_by35_playboy)
+GAME( 1978, lostwrlp, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Lost World", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1978, smman, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Six Million Dollar Man", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1978, voltan, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Voltan Escapes Cosmic Doom", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, startrep, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Star Trek (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, kiss, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Kiss", MACHINE_IS_SKELETON_MECHANICAL)
GAME( 1979, hglbtrtr, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Harlem Globetrotters On Tour", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1979, dollyptn, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Dolly Parton", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1979, paragon, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Paragon", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, dollyptn, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Dolly Parton", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, paragon, 0, as2888, by35, by35_state, by35_6, ROT0, "Bally", "Paragon", MACHINE_IS_SKELETON_MECHANICAL)
// AS-3022 sound
-GAME( 1980, ngndshkr, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Nitro Ground Shaker", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, slbmania, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Silverball Mania", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1979, futurspa, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Future Spa", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, spaceinv, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Space Invaders", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, rollston, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Rolling Stones", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, mystic, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Mystic", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, xenon, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Xenon", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, xenonf, xenon, by35, by35, by35_state, by35_6, ROT0, "Bally", "Xenon (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, viking, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Viking", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, hotdoggn, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Hotdoggin'", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, skatebll, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Skateball", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1980, frontier, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Frontier", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, speakesy, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Speakeasy", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, speakesy4p, speakesy, by35, by35, by35_state, by35_7, ROT0, "Bally", "Speakeasy 4 Player", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1983, bmx, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "BMX", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1983, granslam, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Grand Slam", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1983, granslam4, granslam, by35, by35, by35_state, by35_7, ROT0, "Bally", "Grand Slam (4 Players)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1983, goldball, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Gold Ball (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, ngndshkr, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Nitro Ground Shaker", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, slbmania, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Silverball Mania", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1979, futurspa, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Future Spa", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, spaceinv, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Space Invaders", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, rollston, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Rolling Stones", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, mystic, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Mystic", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, xenon, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Xenon", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, xenonf, xenon, by35, by35, by35_state, by35_6, ROT0, "Bally", "Xenon (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, viking, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Viking", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, hotdoggn, 0, by35, by35, by35_state, by35_6, ROT0, "Bally", "Hotdoggin'", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, skatebll, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Skateball", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1980, frontier, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Frontier", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, speakesy, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Speakeasy", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, speakesy4p, speakesy, by35, by35, by35_state, by35_7, ROT0, "Bally", "Speakeasy 4 Player", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1983, bmx, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "BMX", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1983, granslam, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Grand Slam", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1983, granslam4, granslam, by35, by35, by35_state, by35_7, ROT0, "Bally", "Grand Slam (4 Players)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1983, goldball, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Gold Ball (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
GAME( 1983, goldballn, goldball, by35, by35, by35_state, by35_7, ROT0, "Bally", "Gold Ball (Field Service Upgrade)", MACHINE_IS_SKELETON_MECHANICAL)
// Squawk & Talk sound
-GAME( 1981, flashgdn, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Flash Gordon", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, flashgdnf, flashgdn, by35, by35, by35_state, by35_7, ROT0, "Bally", "Flash Gordon (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, flashgdn, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Flash Gordon", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, flashgdnf, flashgdn, by35, by35, by35_state, by35_7, ROT0, "Bally", "Flash Gordon (French)", MACHINE_IS_SKELETON_MECHANICAL)
GAME( 1981, flashgdnv, flashgdn, by35, by35, by35_state, by35_7, ROT0, "Bally", "Flash Gordon (Vocalizer sound)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, fball_ii, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Fireball II", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, eballdlx, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Eight Ball Deluxe (rev. 15)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, eballd14, eballdlx, by35, by35, by35_state, by35_7, ROT0, "Bally", "Eight Ball Deluxe (rev. 14)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, embryon, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Embryon", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, fathom, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Fathom", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, centaur, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Centaur", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, medusa, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Medusa", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, vector, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Vector", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1981, elektra, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Elektra", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, spectrm, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Spectrum", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, spectrm4, spectrm, by35, by35, by35_state, by35_7, ROT0, "Bally", "Spectrum (ver 4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, rapidfip, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Rapid Fire", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1982, m_mpac, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Mr. and Mrs. PacMan", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, fball_ii, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Fireball II", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, eballdlx, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Eight Ball Deluxe (rev. 15)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, eballd14, eballdlx, by35, by35, by35_state, by35_7, ROT0, "Bally", "Eight Ball Deluxe (rev. 14)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, embryon, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Embryon", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, fathom, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Fathom", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, centaur, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Centaur", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, medusa, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Medusa", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, vector, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Vector", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1981, elektra, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Elektra", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, spectrm, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Spectrum", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, spectrm4, spectrm, by35, by35, by35_state, by35_7, ROT0, "Bally", "Spectrum (ver 4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, rapidfip, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Rapid Fire", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1982, m_mpac, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Mr. and Mrs. PacMan", MACHINE_IS_SKELETON_MECHANICAL)
// Cheap Squeak sound
-GAME( 1984, kosteel, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Kings of Steel", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1983, xsandos, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "X's & O's", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, kosteel, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Kings of Steel", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1983, xsandos, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "X's & O's", MACHINE_IS_SKELETON_MECHANICAL)
GAME( 1984, spyhuntr, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Spy Hunter (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1984, fbclass, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Fireball Classic", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1984, blakpyra, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Black Pyramid", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1985, cybrnaut, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Cybernaut", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, fbclass, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Fireball Classic", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, blakpyra, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Black Pyramid", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, cybrnaut, 0, by35, by35, by35_state, by35_7, ROT0, "Bally", "Cybernaut", MACHINE_IS_SKELETON_MECHANICAL)
// Other manufacturers
-GAME( 1984, suprbowl, xsandos, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Super Bowl", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1984, tigerrag, kosteel, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Tiger Rag", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1985, cosflash, flashgdn, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Cosmic Flash", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1985, newwave, blakpyra, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "New Wave", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1985, saturn2, spyhuntr, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Saturn 2", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1985, worlddef, 0, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "World Defender", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, spacehaw, cybrnaut, by35, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Space Hawks", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, darkshad, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Dark Shadow", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, skflight, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Skill Flight", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, cobrap, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Cobra", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, futrquen, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Future Queen", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, f1gpp, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "F1 Grand Prix", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, toppin, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Top Pin", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, uboat65, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "U-boat 65", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, bullseye, 0, by35, by35, by35_state, by35_7, ROT0, "Grand Products", "301/Bullseye", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, bbbowlin, 0, by35, by35, by35_state, by35_7, ROT0, "United", "Big Ball Bowling (Bowler)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, monrobwl, 0, by35, by35, by35_state, by35_7, ROT0, "Monroe Bowling Co.", "Stars & Strikes (Bowler)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1984, bigbat, 0, by35, by35, by35_state, by35_7, ROT0, "Bally Midway", "Big Bat (Bat game)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1984, mdntmrdr, 0, by35, by35, by35_state, by35_6, ROT0, "Bally Midway", "Midnight Marauders (Gun game)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, blbeauty, 0, by35, by35, by35_state, by35_7, ROT0, "Stern", "Black Beauty (Shuffle)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1984, myststar, 0, by35, by35, by35_state, by35_6, ROT0, "Zaccaria", "Mystic Star", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, suprbowl, xsandos, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Super Bowl", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, tigerrag, kosteel, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Tiger Rag", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, cosflash, flashgdn, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Cosmic Flash", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, newwave, blakpyra, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "New Wave", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, saturn2, spyhuntr, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "Saturn 2", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, worlddef, 0, by35, by35, by35_state, by35_7, ROT0, "Bell Games", "World Defender", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, spacehaw, cybrnaut, by35, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Space Hawks", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, darkshad, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Dark Shadow", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, skflight, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Skill Flight", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, cobrap, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Cobra", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, futrquen, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Future Queen", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, f1gpp, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "F1 Grand Prix", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, toppin, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "Top Pin", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, uboat65, 0, nuovo, by35, by35_state, by35_7, ROT0, "Nuova Bell Games", "U-boat 65", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, bullseye, 0, by35, by35, by35_state, by35_7, ROT0, "Grand Products", "301/Bullseye", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, bbbowlin, 0, by35, by35, by35_state, by35_7, ROT0, "United", "Big Ball Bowling (Bowler)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, monrobwl, 0, by35, by35, by35_state, by35_7, ROT0, "Monroe Bowling Co.", "Stars & Strikes (Bowler)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, bigbat, 0, by35, by35, by35_state, by35_7, ROT0, "Bally Midway", "Big Bat (Bat game)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, mdntmrdr, 0, by35, by35, by35_state, by35_6, ROT0, "Bally Midway", "Midnight Marauders (Gun game)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, blbeauty, 0, by35, by35, by35_state, by35_7, ROT0, "Stern", "Black Beauty (Shuffle)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, myststar, 0, by35, by35, by35_state, by35_6, ROT0, "Zaccaria", "Mystic Star", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index fde70694d11..645a7bbe7eb 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -369,7 +369,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( by6803_state::pia0_timer )
m_pia0->cb1_w(m_pia0_timer);
}
-static MACHINE_CONFIG_START( by6803, by6803_state )
+static MACHINE_CONFIG_START( by6803 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz)
MCFG_CPU_PROGRAM_MAP(by6803_map)
@@ -714,27 +714,27 @@ ROM_START(trucksp2)
ROM_END
-GAME( 1985, eballchp, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Eight Ball Champ", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1985, beatclck, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Beat the Clock", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, motrdome, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","MotorDome", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, motrdomeg, motrdome, by6803, by6803, by6803_state, by6803, ROT0, "Bally","MotorDome (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, ladyluck, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Lady Luck", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, strngsci, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Strange Science", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, strngscg, strngsci, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Strange Science (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, specforc, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Special Force", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, blackblt, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Black Belt", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1986, blackblt2, blackblt, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Black Belt (Squawk and Talk)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, cityslck, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","City Slicker", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, hardbody, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Hardbody", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, hardbodyg, hardbody, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Hardbody (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, prtyanim, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Party Animal", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, prtyanimg, prtyanim, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Party Animal (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, hvymetap, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Heavy Metal Meltdown", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, esclwrld, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Escape from the Lost World", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, esclwrldg, esclwrld, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Escape from the Lost World (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, dungdrag, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Dungeons & Dragons", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, black100, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Blackwater 100", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, black100s, black100, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Blackwater 100 (Single Ball Play)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, trucksp3, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Truck Stop (P-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1988, trucksp2, trucksp3, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Truck Stop (P-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1989, atlantip, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally","Atlantis", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, eballchp, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Eight Ball Champ", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1985, beatclck, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Beat the Clock", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, motrdome, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "MotorDome", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, motrdomeg, motrdome, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "MotorDome (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, ladyluck, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Lady Luck", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, strngsci, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Strange Science", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, strngscg, strngsci, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Strange Science (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, specforc, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Special Force", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, blackblt, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Black Belt", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1986, blackblt2, blackblt, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Black Belt (Squawk and Talk)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, cityslck, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "City Slicker", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, hardbody, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Hardbody", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, hardbodyg, hardbody, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Hardbody (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, prtyanim, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Party Animal", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, prtyanimg, prtyanim, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Party Animal (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, hvymetap, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Heavy Metal Meltdown", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, esclwrld, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Escape from the Lost World", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, esclwrldg, esclwrld, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Escape from the Lost World (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, dungdrag, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Dungeons & Dragons", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, black100, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Blackwater 100", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, black100s, black100, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Blackwater 100 (Single Ball Play)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, trucksp3, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Truck Stop (P-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1988, trucksp2, trucksp3, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Truck Stop (P-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1989, atlantip, 0, by6803, by6803, by6803_state, by6803, ROT0, "Bally", "Atlantis", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/by68701.cpp b/src/mame/drivers/by68701.cpp
index 4dbcec6d9b6..797b98188a0 100644
--- a/src/mame/drivers/by68701.cpp
+++ b/src/mame/drivers/by68701.cpp
@@ -43,7 +43,7 @@ DRIVER_INIT_MEMBER(by68701_state,by68701)
{
}
-static MACHINE_CONFIG_START( by68701, by68701_state )
+static MACHINE_CONFIG_START( by68701 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6803, 3579545/4)
MCFG_CPU_PROGRAM_MAP(by68701_map)
@@ -132,7 +132,7 @@ ROM_END
GAME(1981, flashgdnp1, flashgdn, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Flash Gordon (prototype rev. 1)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1981, flashgdnp2, flashgdn, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Flash Gordon (prototype rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, eballdlxp1, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, eballdlxp2, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, eballdlxp3, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, eballdlxp4, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, eballdlxp1, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, eballdlxp2, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, eballdlxp3, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, eballdlxp4, eballdlx, by68701, by68701, by68701_state, by68701, ROT0, "Bally", "Eight Ball Deluxe (prototype rev. 4)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp
index 8a76cd98297..76828c7e2eb 100644
--- a/src/mame/drivers/byvid.cpp
+++ b/src/mame/drivers/byvid.cpp
@@ -740,7 +740,7 @@ uint32_t by133_state::screen_update_granny(screen_device &screen, bitmap_rgb32 &
return 0;
}
-static MACHINE_CONFIG_START( babypac, by133_state )
+static MACHINE_CONFIG_START( babypac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz/4) // no xtal, just 2 chips
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -817,8 +817,8 @@ static MACHINE_CONFIG_DERIVED( granny, babypac )
MCFG_VIDEO_SET_SCREEN("screen")
MCFG_SCREEN_ADD( "screen", RASTER )
- MCFG_SCREEN_RAW_PARAMS( XTAL_10_738635MHz / 2, TMS9928A_TOTAL_HORZ, TMS9928A_HORZ_DISPLAY_START-12, TMS9928A_HORZ_DISPLAY_START + 256 + 12, \
- TMS9928A_TOTAL_VERT_NTSC, TMS9928A_VERT_DISPLAY_START_NTSC - 12, TMS9928A_VERT_DISPLAY_START_NTSC + 192 + 12 )
+ MCFG_SCREEN_RAW_PARAMS( XTAL_10_738635MHz / 2, tms9928a_device::TOTAL_HORZ, tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START + 256 + 12, \
+ tms9928a_device::TOTAL_VERT_NTSC, tms9928a_device::VERT_DISPLAY_START_NTSC - 12, tms9928a_device::VERT_DISPLAY_START_NTSC + 192 + 12 )
MCFG_SCREEN_UPDATE_DRIVER(by133_state, screen_update_granny)
MACHINE_CONFIG_END
@@ -877,6 +877,6 @@ ROM_START(granny)
ROM_END
-GAME( 1982, babypac, 0, babypac, babypac, driver_device, 0, ROT90, "Dave Nutting Associates / Bally", "Baby Pac-Man (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1982, babypac2, babypac, babypac, babypac, driver_device, 0, ROT90, "Dave Nutting Associates / Bally", "Baby Pac-Man (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1984, granny, 0, granny, granny, driver_device, 0, ROT0, "Bally", "Granny and the Gators", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1982, babypac, 0, babypac, babypac, by133_state, 0, ROT90, "Dave Nutting Associates / Bally", "Baby Pac-Man (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1982, babypac2, babypac, babypac, babypac, by133_state, 0, ROT90, "Dave Nutting Associates / Bally", "Baby Pac-Man (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1984, granny, 0, granny, granny, by133_state, 0, ROT0, "Bally", "Granny and the Gators", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp
index 3ec19892346..2923fdf4182 100644
--- a/src/mame/drivers/bzone.cpp
+++ b/src/mame/drivers/bzone.cpp
@@ -535,7 +535,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( bzone_base, bzone_state )
+static MACHINE_CONFIG_START( bzone_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, BZONE_MASTER_CLOCK / 8)
@@ -881,9 +881,9 @@ DRIVER_INIT_MEMBER(bzone_state,bradley)
*
*************************************/
-GAMEL(1980, bzone, 0, bzone, bzone, driver_device, 0, ROT0, "Atari", "Battle Zone (rev 2)", MACHINE_SUPPORTS_SAVE, layout_bzone )
-GAMEL(1980, bzonea, bzone, bzone, bzone, driver_device, 0, ROT0, "Atari", "Battle Zone (rev 1)", MACHINE_SUPPORTS_SAVE, layout_bzone )
-GAMEL(1980, bzonec, bzone, bzone, bzone, driver_device, 0, ROT0, "Atari", "Battle Zone (cocktail)", MACHINE_SUPPORTS_SAVE|MACHINE_NO_COCKTAIL, layout_bzone )
-GAME( 1980, bradley, 0, bzone, bradley, bzone_state, bradley, ROT0, "Atari", "Bradley Trainer", MACHINE_SUPPORTS_SAVE )
-GAMEL(1980, redbaron, 0, redbaron, redbaron, driver_device, 0, ROT0, "Atari", "Red Baron (Revised Hardware)", MACHINE_SUPPORTS_SAVE, layout_redbaron )
-GAMEL(1980, redbarona, redbaron, redbaron, redbaron, driver_device, 0, ROT0, "Atari", "Red Baron", MACHINE_SUPPORTS_SAVE, layout_redbaron )
+GAMEL(1980, bzone, 0, bzone, bzone, bzone_state, 0, ROT0, "Atari", "Battle Zone (rev 2)", MACHINE_SUPPORTS_SAVE, layout_bzone )
+GAMEL(1980, bzonea, bzone, bzone, bzone, bzone_state, 0, ROT0, "Atari", "Battle Zone (rev 1)", MACHINE_SUPPORTS_SAVE, layout_bzone )
+GAMEL(1980, bzonec, bzone, bzone, bzone, bzone_state, 0, ROT0, "Atari", "Battle Zone (cocktail)", MACHINE_SUPPORTS_SAVE|MACHINE_NO_COCKTAIL, layout_bzone )
+GAME( 1980, bradley, 0, bzone, bradley, bzone_state, bradley, ROT0, "Atari", "Bradley Trainer", MACHINE_SUPPORTS_SAVE )
+GAMEL(1980, redbaron, 0, redbaron, redbaron, bzone_state, 0, ROT0, "Atari", "Red Baron (Revised Hardware)", MACHINE_SUPPORTS_SAVE, layout_redbaron )
+GAMEL(1980, redbarona, redbaron, redbaron, redbaron, bzone_state, 0, ROT0, "Atari", "Red Baron", MACHINE_SUPPORTS_SAVE, layout_redbaron )
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index 647fed9995d..7128a632e2f 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -149,7 +149,7 @@ static GFXDECODE_START( c10 )
GFXDECODE_END
-static MACHINE_CONFIG_START( c10, c10_state )
+static MACHINE_CONFIG_START( c10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(c10_mem)
@@ -184,5 +184,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, c10, 0, 0, c10, c10, c10_state, c10, "Cromemco", "C-10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, c10, 0, 0, c10, c10, c10_state, c10, "Cromemco", "C-10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 94476a3f0a0..b61047dfef3 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -1672,7 +1672,7 @@ void c128_state::machine_reset()
// MACHINE_CONFIG( ntsc )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ntsc, c128_state )
+static MACHINE_CONFIG_START( ntsc )
// basic hardware
MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL_14_31818MHz*2/3.5/2)
MCFG_CPU_PROGRAM_MAP(z80_mem)
@@ -1843,7 +1843,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pal )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pal, c128_state )
+static MACHINE_CONFIG_START( pal )
// basic hardware
MCFG_CPU_ADD(Z80A_TAG, Z80, XTAL_17_734472MHz*2/4.5/2)
MCFG_CPU_PROGRAM_MAP(z80_mem)
@@ -2177,22 +2177,22 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1985, c128, 0, 0, c128, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, c128p, 0, 0, c128pal, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128 (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, c128_de, c128, 0, c128pal, c128_de, driver_device, 0, "Commodore Business Machines", "Commodore 128 (Germany)", MACHINE_SUPPORTS_SAVE )
-//COMP( 1985, c128_fr, c128, 0, c128pal, c128_fr, driver_device, 0, "Commodore Business Machines", "Commodore 128 (France)", MACHINE_SUPPORTS_SAVE )
-//COMP( 1985, c128_no, c128, 0, c128pal, c128_it, driver_device, 0, "Commodore Business Machines", "Commodore 128 (Norway)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, c128_se, c128, 0, c128pal, c128_se, driver_device, 0, "Commodore Business Machines", "Commodore 128 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, c128d, c128, 0, c128, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128D (NTSC, prototype)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, c128dp, c128, 0, c128pal, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128D (PAL)", MACHINE_SUPPORTS_SAVE )
-
-COMP( 1986, c128cr, c128, 0, c128, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128CR (NTSC, prototype)", MACHINE_SUPPORTS_SAVE )
-
-COMP( 1987, c128dcr, c128, 0, c128dcr, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128DCR (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1987, c128dcrp, c128, 0, c128dcrp, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128DCR (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1987, c128dcr_de, c128, 0, c128dcrp, c128_de, driver_device, 0, "Commodore Business Machines", "Commodore 128DCR (Germany)", MACHINE_SUPPORTS_SAVE )
-//COMP( 1986, c128dcr_it, c128, 0, c128dcrp, c128_it, driver_device, 0,"Commodore Business Machines", "Commodore 128DCR (Italy)", MACHINE_SUPPORTS_SAVE )
-COMP( 1987, c128dcr_se, c128, 0, c128dcrp, c128_se, driver_device, 0, "Commodore Business Machines", "Commodore 128DCR (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-
-COMP( 1986, c128d81, c128, 0, c128d81, c128, driver_device, 0, "Commodore Business Machines", "Commodore 128D/81 (NTSC, prototype)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE COMPANY FULLNAME FLAGS
+COMP( 1985, c128, 0, 0, c128, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, c128p, 0, 0, c128pal, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, c128_de, c128, 0, c128pal, c128_de, c128_state, 0, "Commodore Business Machines", "Commodore 128 (Germany)", MACHINE_SUPPORTS_SAVE )
+//COMP( 1985, c128_fr, c128, 0, c128pal, c128_fr, c128_state, 0, "Commodore Business Machines", "Commodore 128 (France)", MACHINE_SUPPORTS_SAVE )
+//COMP( 1985, c128_no, c128, 0, c128pal, c128_it, c128_state, 0, "Commodore Business Machines", "Commodore 128 (Norway)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, c128_se, c128, 0, c128pal, c128_se, c128_state, 0, "Commodore Business Machines", "Commodore 128 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, c128d, c128, 0, c128, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128D (NTSC, prototype)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, c128dp, c128, 0, c128pal, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128D (PAL)", MACHINE_SUPPORTS_SAVE )
+
+COMP( 1986, c128cr, c128, 0, c128, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128CR (NTSC, prototype)", MACHINE_SUPPORTS_SAVE )
+
+COMP( 1987, c128dcr, c128, 0, c128dcr, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128DCR (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, c128dcrp, c128, 0, c128dcrp, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128DCR (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, c128dcr_de, c128, 0, c128dcrp, c128_de, c128_state, 0, "Commodore Business Machines", "Commodore 128DCR (Germany)", MACHINE_SUPPORTS_SAVE )
+//COMP( 1986, c128dcr_it, c128, 0, c128dcrp, c128_it, c128_state, 0,"Commodore Business Machines", "Commodore 128DCR (Italy)", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, c128dcr_se, c128, 0, c128dcrp, c128_se, c128_state, 0, "Commodore Business Machines", "Commodore 128DCR (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+
+COMP( 1986, c128d81, c128, 0, c128d81, c128, c128_state, 0, "Commodore Business Machines", "Commodore 128D/81 (NTSC, prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index 616a95b1563..6f4dfc5955b 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -1311,7 +1311,7 @@ void c64_state::machine_reset()
// MACHINE_CONFIG( ntsc )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ntsc, c64_state )
+static MACHINE_CONFIG_START( ntsc )
// basic hardware
MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_14_31818MHz/14)
MCFG_CPU_PROGRAM_MAP(c64_mem)
@@ -1424,7 +1424,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( ntsc_sx )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ntsc_sx, sx64_state )
+static MACHINE_CONFIG_START( ntsc_sx )
MCFG_FRAGMENT_ADD(ntsc)
// basic hardware
@@ -1442,7 +1442,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( ntsc_dx )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ntsc_dx, sx64_state )
+static MACHINE_CONFIG_START( ntsc_dx )
MCFG_FRAGMENT_ADD(ntsc_sx)
// devices
@@ -1455,7 +1455,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( ntsc_c )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( ntsc_c, ntsc, c64c_state )
+static MACHINE_CONFIG_DERIVED( ntsc_c, ntsc )
MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL_14_31818MHz/14)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
@@ -1467,7 +1467,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pal )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pal, c64_state )
+static MACHINE_CONFIG_START( pal )
// basic hardware
MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_17_734472MHz/18)
MCFG_CPU_PROGRAM_MAP(c64_mem)
@@ -1572,7 +1572,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pal_sx )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pal_sx, sx64_state )
+static MACHINE_CONFIG_START( pal_sx )
MCFG_FRAGMENT_ADD(pal)
// basic hardware
@@ -1590,7 +1590,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pal_c )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( pal_c, pal, c64c_state )
+static MACHINE_CONFIG_DERIVED( pal_c, pal )
MCFG_SOUND_REPLACE(MOS6581_TAG, MOS8580, XTAL_17_734472MHz/18)
MCFG_MOS6581_POTX_CALLBACK(READ8(c64_state, sid_potx_r))
MCFG_MOS6581_POTY_CALLBACK(READ8(c64_state, sid_poty_r))
@@ -1602,7 +1602,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pal_gs )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pal_gs, c64gs_state )
+static MACHINE_CONFIG_START( pal_gs )
// basic hardware
MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_17_734472MHz/18)
MCFG_CPU_PROGRAM_MAP(c64_mem)
@@ -2020,21 +2020,21 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1982, c64, 0, 0, ntsc, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, c64_jp, c64, 0, ntsc, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (Japan)", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, c64p, c64, 0, pal, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64 (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1982, c64_se, c64, 0, pal, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64 / VIC-64S (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, pet64, c64, 0, pet64, c64, driver_device, 0, "Commodore Business Machines", "PET 64 / CBM 4064 (NTSC)", MACHINE_SUPPORTS_SAVE | MACHINE_WRONG_COLORS )
-COMP( 1983, edu64, c64, 0, pet64, c64, driver_device, 0, "Commodore Business Machines", "Educator 64 (NTSC)", MACHINE_SUPPORTS_SAVE | MACHINE_WRONG_COLORS )
-COMP( 1984, sx64, c64, 0, ntsc_sx, c64, driver_device, 0, "Commodore Business Machines", "SX-64 / Executive 64 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, sx64p, c64, 0, pal_sx, c64, driver_device, 0, "Commodore Business Machines", "SX-64 / Executive 64 (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, vip64, c64, 0, pal_sx, c64sw, driver_device, 0, "Commodore Business Machines", "VIP-64 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, dx64, c64, 0, ntsc_dx, c64, driver_device, 0, "Commodore Business Machines", "DX-64 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, tesa6240,c64, 0, pal_sx, c64, driver_device, 0, "Tesa Etikett", "Etikettendrucker 6240", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, c64c, c64, 0, ntsc_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64C (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, c64cp, c64, 0, pal_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64C (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1988, c64c_es, c64, 0, pal_c, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64C (Spain)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, c64c_se, c64, 0, pal_c, c64sw, driver_device, 0, "Commodore Business Machines", "Commodore 64C (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, c64g, c64, 0, pal_c, c64, driver_device, 0, "Commodore Business Machines", "Commodore 64G (PAL)", MACHINE_SUPPORTS_SAVE )
-CONS( 1990, c64gs, c64, 0, pal_gs, c64gs, driver_device, 0, "Commodore Business Machines", "Commodore 64 Games System (PAL)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, c64, 0, 0, ntsc, c64, c64_state, 0, "Commodore Business Machines", "Commodore 64 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, c64_jp, c64, 0, ntsc, c64, c64_state, 0, "Commodore Business Machines", "Commodore 64 (Japan)", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, c64p, c64, 0, pal, c64, c64_state, 0, "Commodore Business Machines", "Commodore 64 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, c64_se, c64, 0, pal, c64sw, c64_state, 0, "Commodore Business Machines", "Commodore 64 / VIC-64S (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, pet64, c64, 0, pet64, c64, c64_state, 0, "Commodore Business Machines", "PET 64 / CBM 4064 (NTSC)", MACHINE_SUPPORTS_SAVE | MACHINE_WRONG_COLORS )
+COMP( 1983, edu64, c64, 0, pet64, c64, c64_state, 0, "Commodore Business Machines", "Educator 64 (NTSC)", MACHINE_SUPPORTS_SAVE | MACHINE_WRONG_COLORS )
+COMP( 1984, sx64, c64, 0, ntsc_sx, c64, sx64_state, 0, "Commodore Business Machines", "SX-64 / Executive 64 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, sx64p, c64, 0, pal_sx, c64, sx64_state, 0, "Commodore Business Machines", "SX-64 / Executive 64 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, vip64, c64, 0, pal_sx, c64sw, sx64_state, 0, "Commodore Business Machines", "VIP-64 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, dx64, c64, 0, ntsc_dx, c64, sx64_state, 0, "Commodore Business Machines", "DX-64 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, tesa6240,c64, 0, pal_sx, c64, sx64_state, 0, "Tesa Etikett", "Etikettendrucker 6240", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, c64c, c64, 0, ntsc_c, c64, c64c_state, 0, "Commodore Business Machines", "Commodore 64C (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, c64cp, c64, 0, pal_c, c64, c64c_state, 0, "Commodore Business Machines", "Commodore 64C (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1988, c64c_es, c64, 0, pal_c, c64sw, c64c_state, 0, "Commodore Business Machines", "Commodore 64C (Spain)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, c64c_se, c64, 0, pal_c, c64sw, c64c_state, 0, "Commodore Business Machines", "Commodore 64C (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, c64g, c64, 0, pal_c, c64, c64c_state, 0, "Commodore Business Machines", "Commodore 64G (PAL)", MACHINE_SUPPORTS_SAVE )
+CONS( 1990, c64gs, c64, 0, pal_gs, c64gs, c64gs_state, 0, "Commodore Business Machines", "Commodore 64 Games System (PAL)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/c64dtv.cpp b/src/mame/drivers/c64dtv.cpp
index bb05a15effa..c2d0cf6a62b 100644
--- a/src/mame/drivers/c64dtv.cpp
+++ b/src/mame/drivers/c64dtv.cpp
@@ -37,7 +37,7 @@ INPUT_PORTS_END
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( c64dtv, c64dtv_state )
+static MACHINE_CONFIG_START( c64dtv )
// video hardware
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_UPDATE_DRIVER(c64dtv_state, screen_update)
@@ -66,4 +66,4 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-CONS( 2005, c64dtv, 0, 0, c64dtv, c64dtv, driver_device, 0, "The Toy:Lobster Company", "Commodore 64 Direct-to-TV (Version 2 050711) (PAL)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 2005, c64dtv, 0, 0, c64dtv, c64dtv, c64dtv_state, 0, "The Toy:Lobster Company", "Commodore 64 Direct-to-TV (Version 2 050711) (PAL)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index e7b8c1f192e..82e6ce4bb5e 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -582,7 +582,7 @@ WRITE_LINE_MEMBER(c65_state::cia0_irq)
// c65_irq(state || m_vicirq);
}
-static MACHINE_CONFIG_START( c65, c65_state )
+static MACHINE_CONFIG_START( c65 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M4510,MAIN_CLOCK)
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index 2c0f3163f43..953b98852e0 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -251,7 +251,7 @@ void c80_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( c80, c80_state )
+static MACHINE_CONFIG_START( c80 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 2500000) /* U880D */
MCFG_CPU_PROGRAM_MAP(c80_mem)
@@ -294,5 +294,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, c80, 0, 0, c80, c80, driver_device, 0, "Joachim Czepa", "C-80", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1986, c80, 0, 0, c80, c80, c80_state, 0, "Joachim Czepa", "C-80", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/c900.cpp b/src/mame/drivers/c900.cpp
index cce2db85f8e..4ded9072ca8 100644
--- a/src/mame/drivers/c900.cpp
+++ b/src/mame/drivers/c900.cpp
@@ -39,7 +39,8 @@ public:
DECLARE_READ16_MEMBER(port1e_r);
DECLARE_READ16_MEMBER(key_r);
DECLARE_READ16_MEMBER(stat_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
private:
uint8_t m_term_data;
required_device<cpu_device> m_maincpu;
@@ -83,7 +84,7 @@ READ16_MEMBER( c900_state::stat_r )
return (m_term_data) ? 6 : 4;
}
-WRITE8_MEMBER( c900_state::kbd_put )
+void c900_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -106,7 +107,7 @@ static GFXDECODE_START( c900 )
GFXDECODE_ENTRY( "chargen", 0x0000, c900_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( c900, c900_state )
+static MACHINE_CONFIG_START( c900 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z8001, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(c900_mem)
@@ -114,7 +115,7 @@ static MACHINE_CONFIG_START( c900, c900_state )
MCFG_CPU_IO_MAP(c900_io)
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(c900_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(c900_state, kbd_put))
MCFG_GFXDECODE_ADD("gfxdecode", "palette", c900)
MCFG_PALETTE_ADD_MONOCHROME("palette")
MACHINE_CONFIG_END
@@ -131,5 +132,5 @@ ROM_START( c900 )
ROM_LOAD( "380217-01.u2", 0x0000, 0x1000, CRC(64cb4171) SHA1(e60d796170addfd27e2c33090f9c512c7e3f99f5) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, c900, 0, 0, c900, c900, driver_device, 0, "Commodore", "Commodore 900", MACHINE_IS_SKELETON )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, c900, 0, 0, c900, c900, c900_state, 0, "Commodore", "Commodore 900", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp
index c902f0c13de..9daf83d4b0c 100644
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@@ -502,7 +502,7 @@ static GFXDECODE_START( cabal )
GFXDECODE_END
-static MACHINE_CONFIG_START( cabal, cabal_state )
+static MACHINE_CONFIG_START( cabal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
@@ -560,7 +560,7 @@ MACHINE_CONFIG_END
/* the bootleg has different sound hardware (2 extra Z80s for ADPCM playback) */
-static MACHINE_CONFIG_START( cabalbl, cabal_state )
+static MACHINE_CONFIG_START( cabalbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
@@ -611,11 +611,11 @@ static MACHINE_CONFIG_START( cabalbl, cabal_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.80)
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator) */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_ADD("msm2", MSM5205, XTAL_12MHz/32) /* verified on pcb (no resonator)*/
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -921,11 +921,11 @@ DRIVER_INIT_MEMBER(cabal_state,cabal)
}
-GAME( 1988, cabal, 0, cabal, cabalj, cabal_state, cabal, ROT0, "TAD Corporation", "Cabal (World, Joystick)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cabala, cabal, cabal, cabalj, cabal_state, cabal, ROT0, "TAD Corporation (Alpha Trading license)", "Cabal (Korea?, Joystick)", MACHINE_SUPPORTS_SAVE ) // korea?
-GAME( 1988, cabalbl, cabal, cabalbl, cabalbl,driver_device, 0, ROT0, "bootleg (Red Corporation)", "Cabal (bootleg of Joystick version, set 1, alternate sound hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, cabalbl2,cabal, cabalbl2,cabalj, cabal_state, cabal, ROT0, "bootleg", "Cabal (bootleg of Joystick version, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, cabal, 0, cabal, cabalj, cabal_state, cabal, ROT0, "TAD Corporation", "Cabal (World, Joystick)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cabala, cabal, cabal, cabalj, cabal_state, cabal, ROT0, "TAD Corporation (Alpha Trading license)", "Cabal (Korea?, Joystick)", MACHINE_SUPPORTS_SAVE ) // korea?
+GAME( 1988, cabalbl, cabal, cabalbl, cabalbl, cabal_state, 0, ROT0, "bootleg (Red Corporation)", "Cabal (bootleg of Joystick version, set 1, alternate sound hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, cabalbl2,cabal, cabalbl2,cabalj, cabal_state, cabal, ROT0, "bootleg", "Cabal (bootleg of Joystick version, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, cabalus, cabal, cabal, cabalt, cabal_state, cabal, ROT0, "TAD Corporation (Fabtek license)", "Cabal (US set 1, Trackball)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, cabalus2,cabal, cabal, cabalt, cabal_state, cabal, ROT0, "TAD Corporation (Fabtek license)", "Cabal (US set 2, Trackball)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cabaluk, cabal, cabal, cabalt, cabal_state, cabal, ROT0, "TAD Corporation (Electrocoin license)", "Cabal (UK, Trackball)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, cabalus, cabal, cabal, cabalt, cabal_state, cabal, ROT0, "TAD Corporation (Fabtek license)", "Cabal (US set 1, Trackball)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, cabalus2,cabal, cabal, cabalt, cabal_state, cabal, ROT0, "TAD Corporation (Fabtek license)", "Cabal (US set 2, Trackball)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cabaluk, cabal, cabal, cabalt, cabal_state, cabal, ROT0, "TAD Corporation (Electrocoin license)", "Cabal (UK, Trackball)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index cc4412f52e2..98c8438ab32 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -341,7 +341,7 @@ INTERRUPT_GEN_MEMBER(cabaret_state::cabaret_interrupt)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( cabaret, cabaret_state )
+static MACHINE_CONFIG_START( cabaret )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(cabaret_map)
diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp
index 9f557291980..bed7d0ddce3 100644
--- a/src/mame/drivers/calchase.cpp
+++ b/src/mame/drivers/calchase.cpp
@@ -639,7 +639,7 @@ void calchase_state::machine_reset()
membank("bios_ext")->set_base(memregion("bios")->base() + 0);
}
-static MACHINE_CONFIG_START( calchase, calchase_state )
+static MACHINE_CONFIG_START( calchase )
MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU
MCFG_CPU_PROGRAM_MAP(calchase_map)
MCFG_CPU_IO_MAP(calchase_io)
@@ -671,7 +671,7 @@ static MACHINE_CONFIG_START( calchase, calchase_state )
MCFG_SOUND_ROUTE_EX(0, "rdac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "rdac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hostinv, calchase_state )
+static MACHINE_CONFIG_START( hostinv )
MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Cyrix 686MX-PR200 CPU
MCFG_CPU_PROGRAM_MAP(calchase_map)
MCFG_CPU_IO_MAP(calchase_io)
@@ -773,6 +773,6 @@ ROM_START( eggsplc )
DISK_IMAGE_READONLY( "eggsplc", 0, SHA1(fa38dd6b0d25cde644f68cf639768f137c607eb5) )
ROM_END
-GAME( 1998, hostinv, 0, hostinv, calchase, calchase_state, hostinv, ROT0, "The Game Room", "Host Invaders", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, calchase, 0, calchase, calchase, calchase_state, calchase, ROT0, "The Game Room", "California Chase", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, hostinv, 0, hostinv, calchase, calchase_state, hostinv, ROT0, "The Game Room", "Host Invaders", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, calchase, 0, calchase, calchase, calchase_state, calchase, ROT0, "The Game Room", "California Chase", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 2002, eggsplc, 0, calchase, calchase, calchase_state, hostinv, ROT0, "The Game Room", "Eggs Playing Chicken", 0 )
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index e8b2d46fa88..0ebf5ce8290 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -2568,7 +2568,7 @@ WRITE_LINE_MEMBER(calomega_state::write_acia_clock)
* Machine Drivers *
*************************************************/
-static MACHINE_CONFIG_START( sys903, calomega_state )
+static MACHINE_CONFIG_START( sys903 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
MCFG_CPU_PROGRAM_MAP(sys903_map)
diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp
index 0bae419c172..faaa1bdc8e9 100644
--- a/src/mame/drivers/calorie.cpp
+++ b/src/mame/drivers/calorie.cpp
@@ -452,7 +452,7 @@ void calorie_state::machine_reset()
}
-static MACHINE_CONFIG_START( calorie, calorie_state )
+static MACHINE_CONFIG_START( calorie )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz */
@@ -588,5 +588,5 @@ DRIVER_INIT_MEMBER(calorie_state,calorieb)
*************************************/
/* Note: the bootleg is identical to the original once decrypted */
-GAME( 1986, calorie, 0, caloriee,calorie, driver_device, 0, ROT0, "Sega", "Calorie Kun vs Moguranian", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, calorie, 0, caloriee,calorie, calorie_state, 0, ROT0, "Sega", "Calorie Kun vs Moguranian", MACHINE_SUPPORTS_SAVE )
GAME( 1986, calorieb, calorie, calorie, calorie, calorie_state, calorieb, ROT0, "bootleg", "Calorie Kun vs Moguranian (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index 1c4977bd8e8..5a7a584e23f 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -179,7 +179,7 @@ private:
//required_device<> m_printer;
required_device<mc6845_device> m_crtc;
required_device<dac_byte_interface> m_dac;
- optional_device<fd1793_t> m_fdc;
+ optional_device<fd1793_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
};
@@ -458,15 +458,15 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( lynx96k_io, AS_IO, 8, camplynx_state )
AM_IMPORT_FROM(lynx48k_io)
- AM_RANGE(0x0050,0x0053) AM_MIRROR(0xff80) AM_DEVREAD("fdc", fd1793_t, read)
- AM_RANGE(0x0054,0x0057) AM_MIRROR(0xff80) AM_DEVWRITE("fdc", fd1793_t, write)
+ AM_RANGE(0x0050,0x0053) AM_MIRROR(0xff80) AM_DEVREAD("fdc", fd1793_device, read)
+ AM_RANGE(0x0054,0x0057) AM_MIRROR(0xff80) AM_DEVWRITE("fdc", fd1793_device, write)
AM_RANGE(0x0058,0x0058) AM_MIRROR(0xff80) AM_WRITE(port58_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START( lynx128k_io, AS_IO, 8, camplynx_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0050,0x0053) AM_MIRROR(0xff80) AM_DEVREAD("fdc", fd1793_t, read)
- AM_RANGE(0x0054,0x0057) AM_MIRROR(0xff80) AM_DEVWRITE("fdc", fd1793_t, write)
+ AM_RANGE(0x0050,0x0053) AM_MIRROR(0xff80) AM_DEVREAD("fdc", fd1793_device, read)
+ AM_RANGE(0x0054,0x0057) AM_MIRROR(0xff80) AM_DEVWRITE("fdc", fd1793_device, write)
AM_RANGE(0x0058,0x0058) AM_MIRROR(0xff80) AM_WRITE(port58_w)
// AM_RANGE(0x007a,0x007b) AM_MIRROR(0xff80) AM_READ(lynx128k_joysticks_r)
// AM_RANGE(0x007c,0x007c) AM_MIRROR(0xff80) AM_READ(lynx128k_printer_r)
@@ -810,7 +810,7 @@ static MACHINE_CONFIG_FRAGMENT( lynx_disk )
MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lynx48k, camplynx_state )
+static MACHINE_CONFIG_START( lynx48k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6)
@@ -850,7 +850,7 @@ static MACHINE_CONFIG_DERIVED( lynx96k, lynx48k )
MCFG_FRAGMENT_ADD(lynx_disk)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lynx128k, camplynx_state )
+static MACHINE_CONFIG_START( lynx128k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 4)
@@ -942,7 +942,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, lynx48k, 0, 0, lynx48k, lynx48k, camplynx_state, lynx48k, "Camputers", "Lynx 48k", 0 )
-COMP( 1983, lynx96k, lynx48k, 0, lynx96k, lynx48k, camplynx_state, lynx48k, "Camputers", "Lynx 96k", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, lynx48k, 0, 0, lynx48k, lynx48k, camplynx_state, lynx48k, "Camputers", "Lynx 48k", 0 )
+COMP( 1983, lynx96k, lynx48k, 0, lynx96k, lynx48k, camplynx_state, lynx48k, "Camputers", "Lynx 96k", 0 )
COMP( 1983, lynx128k, lynx48k, 0, lynx128k, lynx48k, camplynx_state, lynx128k, "Camputers", "Lynx 128k", 0 )
diff --git a/src/mame/drivers/canon_s80.cpp b/src/mame/drivers/canon_s80.cpp
index 307c8d69dd0..3038a5b630a 100644
--- a/src/mame/drivers/canon_s80.cpp
+++ b/src/mame/drivers/canon_s80.cpp
@@ -24,8 +24,8 @@ class canons80_state : public driver_device
{
public:
canons80_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag)
- { }
+ : driver_device(mconfig, type, tag)
+ { }
DECLARE_DRIVER_INIT(canons80);
};
@@ -36,14 +36,15 @@ static ADDRESS_MAP_START(canons80_map, AS_PROGRAM, 8, canons80_state )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( canons80, canons80_state )
+static MACHINE_CONFIG_START( canons80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6301, 5000000) /* hd63a01xop 5 MHz guessed: TODO: check on PCB */
MCFG_CPU_PROGRAM_MAP(canons80_map)
MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(canons80_state, canons80)
-{}
+{
+}
ROM_START( canons80 )
ROM_REGION( 0x10000, "maincpu", 0 ) /* 6800 code */
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 3af43dc4181..ae1ba4e12da 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -238,7 +238,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( canyon, canyon_state )
+static MACHINE_CONFIG_START( canyon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16)
@@ -322,5 +322,5 @@ ROM_END
*
*************************************/
-GAME( 1977, canyon, 0, canyon, canyon, driver_device, 0, ROT0, "Atari", "Canyon Bomber", MACHINE_SUPPORTS_SAVE )
-GAME( 1977, canyonp, canyon, canyon, canyon, driver_device, 0, ROT0, "Atari", "Canyon Bomber (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1977, canyon, 0, canyon, canyon, canyon_state, 0, ROT0, "Atari", "Canyon Bomber", MACHINE_SUPPORTS_SAVE )
+GAME( 1977, canyonp, canyon, canyon, canyon, canyon_state, 0, ROT0, "Atari", "Canyon Bomber (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index b9874a45ad4..ed82dc96aff 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -313,7 +313,7 @@ void capbowl_state::machine_reset()
}
-static MACHINE_CONFIG_START( capbowl, capbowl_state )
+static MACHINE_CONFIG_START( capbowl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809E, MASTER_CLOCK)
@@ -482,4 +482,4 @@ GAME( 1988, capbowl2, capbowl, capbowl, capbowl, capbowl_state, capbowl, ROT27
GAME( 1988, capbowl3, capbowl, capbowl, capbowl, capbowl_state, capbowl, ROT270, "Incredible Technologies / Capcom", "Capcom Bowling (set 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, capbowl4, capbowl, capbowl, capbowl, capbowl_state, capbowl, ROT270, "Incredible Technologies / Capcom", "Capcom Bowling (set 4)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, clbowl, capbowl, capbowl, capbowl, capbowl_state, capbowl, ROT270, "Incredible Technologies / Capcom", "Coors Light Bowling", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, bowlrama, 0, bowlrama, capbowl, driver_device, 0, ROT270, "P&P Marketing", "Bowl-O-Rama Rev 1.0", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bowlrama, 0, bowlrama, capbowl, capbowl_state, 0, ROT270, "P&P Marketing", "Bowl-O-Rama Rev 1.0", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/capcom.cpp b/src/mame/drivers/capcom.cpp
index 182a071247b..1baa5e309c8 100644
--- a/src/mame/drivers/capcom.cpp
+++ b/src/mame/drivers/capcom.cpp
@@ -43,7 +43,7 @@ DRIVER_INIT_MEMBER(capcom_state,capcom)
{
}
-static MACHINE_CONFIG_START( capcom, capcom_state )
+static MACHINE_CONFIG_START( capcom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16670000) // M68306
MCFG_CPU_PROGRAM_MAP(capcom_map)
diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp
index d8c614cb99c..71fac9f798e 100644
--- a/src/mame/drivers/capr1.cpp
+++ b/src/mame/drivers/capr1.cpp
@@ -102,7 +102,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( cspin2, capr1_state )
+static MACHINE_CONFIG_START( cspin2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) // clock frequency unknown
@@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( cspin2, capr1_state )
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -156,4 +156,4 @@ ROM_START( cspin2 )
ROM_END
-GAME (1996, cspin2, 0, cspin2, cspin2, driver_device, 0, ROT0, "Taito", "Capriccio Spin 2", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (1996, cspin2, 0, cspin2, cspin2, capr1_state, 0, ROT0, "Taito", "Capriccio Spin 2", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/caprcyc.cpp b/src/mame/drivers/caprcyc.cpp
index 9ac04280b94..4ced7c3d5fa 100644
--- a/src/mame/drivers/caprcyc.cpp
+++ b/src/mame/drivers/caprcyc.cpp
@@ -60,7 +60,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( caprcyc, caprcyc_state )
+static MACHINE_CONFIG_START( caprcyc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", VR4300BE, 100000000) // cpu configuration is unknown
@@ -92,4 +92,4 @@ ROM_START( caprcyc )
ROM_END
-GAME (1999, caprcyc, 0, caprcyc, caprcyc, driver_device, 0, ROT0, "Taito", "Capriccio Cyclone", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (1999, caprcyc, 0, caprcyc, caprcyc, caprcyc_state, 0, ROT0, "Taito", "Capriccio Cyclone", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index 776f1a4da99..3c74d31b663 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -313,7 +313,7 @@ PALETTE_INIT_MEMBER(cardline_state, cardline)
}
}
-static MACHINE_CONFIG_START( cardline, cardline_state )
+static MACHINE_CONFIG_START( cardline )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C32, MASTER_CLOCK)
@@ -349,7 +349,7 @@ static MACHINE_CONFIG_START( cardline, cardline_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -377,4 +377,4 @@ ROM_START( cardline )
ROM_END
-GAME( 199?, cardline, 0, cardline, cardline, driver_device, 0, ROT0, "Veltmeijer", "Card Line" , MACHINE_SUPPORTS_SAVE)
+GAME( 199?, cardline, 0, cardline, cardline, cardline_state, 0, ROT0, "Veltmeijer", "Card Line" , MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index 30442716e7b..b7f2629fe5e 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -345,7 +345,7 @@ static GFXDECODE_START( carjmbre )
GFXDECODE_END
-static MACHINE_CONFIG_START( carjmbre, carjmbre_state )
+static MACHINE_CONFIG_START( carjmbre )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
@@ -419,4 +419,4 @@ ROM_START( carjmbre )
ROM_END
-GAME( 1983, carjmbre, 0, carjmbre, carjmbre, driver_device, 0, ROT90, "Omori Electric Co., Ltd.", "Car Jamboree", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, carjmbre, 0, carjmbre, carjmbre, carjmbre_state, 0, ROT90, "Omori Electric Co., Ltd.", "Car Jamboree", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp
index 6a6c22b420c..93967f1b272 100644
--- a/src/mame/drivers/carpolo.cpp
+++ b/src/mame/drivers/carpolo.cpp
@@ -231,7 +231,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( carpolo, carpolo_state )
+static MACHINE_CONFIG_START( carpolo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz/12) /* 940.75 kHz */
diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp
index 73b05f2e635..4fae5e1dfae 100644
--- a/src/mame/drivers/carrera.cpp
+++ b/src/mame/drivers/carrera.cpp
@@ -308,7 +308,7 @@ PALETTE_INIT_MEMBER(carrera_state, carrera)
}
-static MACHINE_CONFIG_START( carrera, carrera_state )
+static MACHINE_CONFIG_START( carrera )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 6)
MCFG_CPU_PROGRAM_MAP(carrera_map)
@@ -359,4 +359,4 @@ ROM_START( carrera )
ROM_END
-GAME( 19??, carrera, 0, carrera, carrera, driver_device,0, ROT0, "BS Electronics", "Carrera (Version 6.7)", 0 )
+GAME( 19??, carrera, 0, carrera, carrera, carrera_state, 0, ROT0, "BS Electronics", "Carrera (Version 6.7)", 0 )
diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp
index 46de2b0e821..f7e57cc1d2b 100644
--- a/src/mame/drivers/casloopy.cpp
+++ b/src/mame/drivers/casloopy.cpp
@@ -502,7 +502,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart )
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( casloopy, casloopy_state )
+static MACHINE_CONFIG_START( casloopy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",SH2A,8000000)
diff --git a/src/mame/drivers/castle.cpp b/src/mame/drivers/castle.cpp
index 056273db2b1..0ec73496165 100644
--- a/src/mame/drivers/castle.cpp
+++ b/src/mame/drivers/castle.cpp
@@ -76,7 +76,7 @@ static INPUT_PORTS_START( castrev )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( castle_V1rvE, castle_state )
+static MACHINE_CONFIG_START( castle_V1rvE )
MCFG_CPU_ADD("maincpu", HD6303Y, 1000000)
MCFG_CPU_PROGRAM_MAP(V1rvE_mastermap)
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( V2rvA_map, AS_PROGRAM, 8, castle_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( castle_V2rvA, castle_state )
+static MACHINE_CONFIG_START( castle_V2rvA )
MCFG_CPU_ADD("maincpu", HD6303Y, 1000000)
MCFG_CPU_PROGRAM_MAP(V2rvA_map)
MACHINE_CONFIG_END
@@ -113,7 +113,7 @@ ROM_END
// 4.00 JACKPOT. VERSION 1 (for revision E CPU) Written by and copyright of David John Powell - 25th February 1987
-GAME( 1987, castrev, 0, castle_V1rvE, castrev, driver_device, 0, ROT0, "Castle","Revolution (Castle) (MACH2000 V1rvE)",MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, castrev, 0, castle_V1rvE, castrev, castle_state, 0, ROT0, "Castle","Revolution (Castle) (MACH2000 V1rvE)", MACHINE_IS_SKELETON_MECHANICAL )
// I'm *guessing* this is on MACH2000 V2rvA hardware, it contains strings saying 'MACH 2000 test' and is designed for a single CPU.
-GAME( 198?, castfpt, 0, castle_V2rvA, castrev, driver_device, 0, ROT0, "Castle","Fortune Pot (Castle) (MACH2000 V2rvA)",MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 198?, castfpt, 0, castle_V2rvA, castrev, castle_state, 0, ROT0, "Castle","Fortune Pot (Castle) (MACH2000 V2rvA)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index ef2a120315c..10eff0cf4b5 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -321,7 +321,7 @@ PALETTE_INIT_MEMBER(caswin_state, caswin)
}
-static MACHINE_CONFIG_START( vvillage, caswin_state )
+static MACHINE_CONFIG_START( vvillage )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(vvillage_mem)
@@ -416,7 +416,7 @@ ROM_START( rcasinoo )
ROM_LOAD( "prom1.e8", 0x0020, 0x0020, CRC(2b5c7826) SHA1(c0de392aebd6982e5846c12aeb2e871358be60d7) ) /* MB7051 */
ROM_END
-GAME( 1984, rcasino, 0, vvillage, vvillage, driver_device, 0, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-2)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1984, rcasino1, rcasino, vvillage, vvillage, driver_device, 0, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-1, Larger Board)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1984, rcasinoo, rcasino, vvillage, vvillage, driver_device, 0, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-1, Smaller Board)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1985, caswin, rcasino, vvillage, vvillage, driver_device, 0, ROT270, "Aristocrat", "Casino Winner", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, rcasino, 0, vvillage, vvillage, caswin_state, 0, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-2)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, rcasino1, rcasino, vvillage, vvillage, caswin_state, 0, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-1, Larger Board)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, rcasinoo, rcasino, vvillage, vvillage, caswin_state, 0, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-1, Smaller Board)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1985, caswin, rcasino, vvillage, vvillage, caswin_state, 0, ROT270, "Aristocrat", "Casino Winner", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp
index 75d7aab846b..7bb3cb0c79a 100644
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@@ -1047,7 +1047,7 @@ WRITE_LINE_MEMBER(cat_state::prn_ack_ff) // switch the flipflop state on the ris
#endif
}
-static MACHINE_CONFIG_START( cat, cat_state )
+static MACHINE_CONFIG_START( cat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_19_968MHz/4)
@@ -1171,4 +1171,4 @@ ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, cat, 0, 0, cat, cat, driver_device, 0, "Canon", "Cat", MACHINE_NOT_WORKING)
+COMP( 1987, cat, 0, 0, cat, cat, cat_state, 0, "Canon", "Cat", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index 20e4cb57ca2..e184b0edcab 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -2014,7 +2014,7 @@ MACHINE_RESET_MEMBER(cave_state,cave)
Dangun Feveron
***************************************************************************/
-static MACHINE_CONFIG_START( dfeveron, cave_state )
+static MACHINE_CONFIG_START( dfeveron )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2055,7 +2055,7 @@ MACHINE_CONFIG_END
***************************************************************************/
-static MACHINE_CONFIG_START( ddonpach, cave_state )
+static MACHINE_CONFIG_START( ddonpach )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2095,7 +2095,7 @@ MACHINE_CONFIG_END
Donpachi
***************************************************************************/
-static MACHINE_CONFIG_START( donpachi, cave_state )
+static MACHINE_CONFIG_START( donpachi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2125,10 +2125,10 @@ static MACHINE_CONFIG_START( donpachi, cave_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_4_224MHz/4, OKIM6295_PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_4_224MHz/4, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.60)
- MCFG_OKIM6295_ADD("oki2", XTAL_4_224MHz/2, OKIM6295_PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL_4_224MHz/2, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -2142,7 +2142,7 @@ MACHINE_CONFIG_END
Esprade
***************************************************************************/
-static MACHINE_CONFIG_START( esprade, cave_state )
+static MACHINE_CONFIG_START( esprade )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2182,7 +2182,7 @@ MACHINE_CONFIG_END
Gaia Crusaders
***************************************************************************/
-static MACHINE_CONFIG_START( gaia, cave_state )
+static MACHINE_CONFIG_START( gaia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2223,7 +2223,7 @@ MACHINE_CONFIG_END
Guwange
***************************************************************************/
-static MACHINE_CONFIG_START( guwange, cave_state )
+static MACHINE_CONFIG_START( guwange )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2262,7 +2262,7 @@ MACHINE_CONFIG_END
Hotdog Storm
***************************************************************************/
-static MACHINE_CONFIG_START( hotdogst, cave_state )
+static MACHINE_CONFIG_START( hotdogst )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -2305,7 +2305,7 @@ static MACHINE_CONFIG_START( hotdogst, cave_state )
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, OKIM6295_PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -2315,7 +2315,7 @@ MACHINE_CONFIG_END
Koro Koro Quest
***************************************************************************/
-static MACHINE_CONFIG_START( korokoro, cave_state )
+static MACHINE_CONFIG_START( korokoro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2362,7 +2362,7 @@ MACHINE_CONFIG_END
Mazinger Z
***************************************************************************/
-static MACHINE_CONFIG_START( mazinger, cave_state )
+static MACHINE_CONFIG_START( mazinger )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2408,7 +2408,7 @@ static MACHINE_CONFIG_START( mazinger, cave_state )
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -2418,7 +2418,7 @@ MACHINE_CONFIG_END
Metamoqester
***************************************************************************/
-static MACHINE_CONFIG_START( metmqstr, cave_state )
+static MACHINE_CONFIG_START( metmqstr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
@@ -2461,11 +2461,11 @@ static MACHINE_CONFIG_START( metmqstr, cave_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MACHINE_CONFIG_END
@@ -2475,7 +2475,7 @@ MACHINE_CONFIG_END
Pac-Slot
***************************************************************************/
-static MACHINE_CONFIG_START( pacslot, cave_state )
+static MACHINE_CONFIG_START( pacslot )
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2512,12 +2512,12 @@ static MACHINE_CONFIG_START( pacslot, cave_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
// oki2 chip is present but its rom socket is unpopulated
- MCFG_OKIM6295_ADD("oki2", XTAL_28MHz / 28, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2532,7 +2532,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::timer_lev2_cb )
m_maincpu->set_input_line(M68K_IRQ_2, HOLD_LINE); // ppsatan: read touch screens
}
-static MACHINE_CONFIG_START( ppsatan, cave_state )
+static MACHINE_CONFIG_START( ppsatan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2583,7 +2583,7 @@ static MACHINE_CONFIG_START( ppsatan, cave_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0)
MACHINE_CONFIG_END
@@ -2595,7 +2595,7 @@ MACHINE_CONFIG_END
/* X1 = 12 MHz, X2 = 28 MHz, X3 = 16 MHz. OKI: / 165 mode A ; / 132 mode B */
-static MACHINE_CONFIG_START( pwrinst2, cave_state )
+static MACHINE_CONFIG_START( pwrinst2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz */
@@ -2638,10 +2638,10 @@ static MACHINE_CONFIG_START( pwrinst2, cave_state )
MCFG_SOUND_ROUTE(2, "mono", 0.40)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki1", XTAL_3MHz , OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", XTAL_3MHz , PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki2", XTAL_3MHz , OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", XTAL_3MHz , PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -2666,7 +2666,7 @@ MACHINE_RESET_MEMBER(cave_state,sailormn)
MACHINE_RESET_CALL_MEMBER(cave);
}
-static MACHINE_CONFIG_START( sailormn, cave_state )
+static MACHINE_CONFIG_START( sailormn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -2711,11 +2711,11 @@ static MACHINE_CONFIG_START( sailormn, cave_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
- MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
@@ -2727,7 +2727,7 @@ MACHINE_CONFIG_END
Tekken Card World
***************************************************************************/
-static MACHINE_CONFIG_START( tekkencw, cave_state )
+static MACHINE_CONFIG_START( tekkencw )
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2764,7 +2764,7 @@ static MACHINE_CONFIG_START( tekkencw, cave_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -2776,7 +2776,7 @@ MACHINE_CONFIG_END
Tobikose! Jumpman
***************************************************************************/
-static MACHINE_CONFIG_START( tjumpman, cave_state )
+static MACHINE_CONFIG_START( tjumpman )
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -2813,7 +2813,7 @@ static MACHINE_CONFIG_START( tjumpman, cave_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_28MHz / 28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -2825,7 +2825,7 @@ MACHINE_CONFIG_END
Uo Poko
***************************************************************************/
-static MACHINE_CONFIG_START( uopoko, cave_state )
+static MACHINE_CONFIG_START( uopoko )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -5204,86 +5204,86 @@ DRIVER_INIT_MEMBER(cave_state,korokoro)
***************************************************************************/
-GAME( 1994, pwrinst2, 0, pwrinst2, metmqstr, cave_state, pwrinst2, ROT0, "Atlus", "Power Instinct 2 (US, Ver. 94/04/08)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, pwrinst2j, pwrinst2, pwrinst2, metmqstr, cave_state, pwrinst2j,ROT0, "Atlus", "Gouketsuji Ichizoku 2 (Japan, Ver. 94/04/08)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pwrinst2, 0, pwrinst2, metmqstr, cave_state, pwrinst2, ROT0, "Atlus", "Power Instinct 2 (US, Ver. 94/04/08)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pwrinst2j, pwrinst2, pwrinst2, metmqstr, cave_state, pwrinst2j, ROT0, "Atlus", "Gouketsuji Ichizoku 2 (Japan, Ver. 94/04/08)", MACHINE_SUPPORTS_SAVE )
// The EEPROM determines the region, program roms are the same between sets
-GAME( 1994, mazinger, 0, mazinger, cave, cave_state, mazinger, ROT90, "Banpresto / Dynamic Pl. Toei Animation", "Mazinger Z (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mazingerj, mazinger, mazinger, cave, cave_state, mazinger, ROT90, "Banpresto / Dynamic Pl. Toei Animation", "Mazinger Z (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mazinger, 0, mazinger, cave, cave_state, mazinger, ROT90, "Banpresto / Dynamic Pl. Toei Animation", "Mazinger Z (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mazingerj, mazinger, mazinger, cave, cave_state, mazinger, ROT90, "Banpresto / Dynamic Pl. Toei Animation", "Mazinger Z (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, donpachi, 0, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, donpachij, donpachi, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, donpachikr, donpachi, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, donpachihk, donpachi, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (Hong Kong)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, donpachi, 0, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, donpachij, donpachi, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, donpachikr, donpachi, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, donpachihk, donpachi, donpachi, cave, cave_state, donpachi, ROT270, "Cave (Atlus license)", "DonPachi (Hong Kong)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, metmqstr, 0, metmqstr, metmqstr, cave_state, metmqstr, ROT0, "Banpresto / Pandorabox", "Metamoqester (International)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nmaster, metmqstr, metmqstr, metmqstr, cave_state, metmqstr, ROT0, "Banpresto / Pandorabox", "Oni - The Ninja Master (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, metmqstr, 0, metmqstr, metmqstr, cave_state, metmqstr, ROT0, "Banpresto / Pandorabox", "Metamoqester (International)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nmaster, metmqstr, metmqstr, metmqstr, cave_state, metmqstr, ROT0, "Banpresto / Pandorabox", "Oni - The Ninja Master (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, plegends, 0, pwrinst2, metmqstr, cave_state, pwrinst2j,ROT0, "Atlus", "Gogetsuji Legends (US, Ver. 95/06/20)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, plegendsj, plegends, pwrinst2, metmqstr, cave_state, pwrinst2j,ROT0, "Atlus", "Gouketsuji Gaiden - Saikyou Densetsu (Japan, Ver. 95/06/20)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, plegends, 0, pwrinst2, metmqstr, cave_state, pwrinst2j, ROT0, "Atlus", "Gogetsuji Legends (US, Ver. 95/06/20)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, plegendsj, plegends, pwrinst2, metmqstr, cave_state, pwrinst2j, ROT0, "Atlus", "Gouketsuji Gaiden - Saikyou Densetsu (Japan, Ver. 95/06/20)", MACHINE_SUPPORTS_SAVE )
// The EEPROM determines the region, program roms are the same between sets
-GAME( 1995, sailormn, 0, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnu, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnj, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnk, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnt, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Taiwan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnh, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Hong Kong)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormno, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnou, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnoj, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnok, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnot, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Taiwan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sailormnoh, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Hong Kong)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormn, 0, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnu, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnj, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnk, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnt, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Taiwan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnh, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22B, Hong Kong)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormno, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnou, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnoj, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnok, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnot, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Taiwan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sailormnoh, sailormn, sailormn, cave, cave_state, sailormn, ROT0, "Gazelle (Banpresto license)", "Pretty Soldier Sailor Moon (Ver. 95/03/22, Hong Kong)", MACHINE_SUPPORTS_SAVE )
// The EEPROM determines the region, program roms are the same between sets
-GAME( 1996, agallet, 0, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletu, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletj, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Akuu Gallet (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletk, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agallett, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Taiwan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalleth, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Hong Kong)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agallet, 0, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletu, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletj, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Akuu Gallet (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletk, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agallett, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Taiwan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalleth, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (Hong Kong)", MACHINE_SUPPORTS_SAVE )
// this set appears to be older, there is some kind of reset circuit / watchdog circuit check on startup, the same check exists in the above set but the code skips over it so presumably it was removed
// to avoid boards simply hanging on a black screen if the circuit didn't fire.
-GAME( 1996, agalleta, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletau, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletaj, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Akuu Gallet (older, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletak, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletat, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Taiwan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, agalletah, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Hong Kong)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalleta, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletau, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletaj, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Akuu Gallet (older, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletak, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletat, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Taiwan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, agalletah, agallet, sailormn, cave, cave_state, agallet, ROT270, "Gazelle (Banpresto license)", "Air Gallet (older, Hong Kong)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, hotdogst, 0, hotdogst, cave, cave_state, hotdogst, ROT90, "Marble", "Hotdog Storm (International)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, hotdogst, 0, hotdogst, cave, cave_state, hotdogst, ROT90, "Marble", "Hotdog Storm (International)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, pacslot, 0, pacslot, pacslot, cave_state, tjumpman, ROT0, "Namco", "Pac-Slot", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, pacslot, 0, pacslot, pacslot, cave_state, tjumpman, ROT0, "Namco", "Pac-Slot", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ppsatan, 0, ppsatan, ppsatan, cave_state, ppsatan, ROT0, "Kato Seisakujo Co., Ltd.", "Poka Poka Satan (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, ppsatan, 0, ppsatan, ppsatan, cave_state, ppsatan, ROT0, "Kato Seisakujo Co., Ltd.", "Poka Poka Satan (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, tekkencw, 0, tekkencw, tekkencw, cave_state, tjumpman, ROT0, "Namco", "Tekken Card World", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, tekkencw, 0, tekkencw, tekkencw, cave_state, tjumpman, ROT0, "Namco", "Tekken Card World", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, ddonpach, 0, ddonpach, cave, cave_state, ddonpach, ROT270, "Cave (Atlus license)", "DoDonPachi (International, Master Ver. 97/02/05)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, ddonpachj, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "Cave (Atlus license)", "DoDonPachi (Japan, Master Ver. 97/02/05)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, ddonpach, 0, ddonpach, cave, cave_state, ddonpach, ROT270, "Cave (Atlus license)", "DoDonPachi (International, Master Ver. 97/02/05)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, ddonpachj, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "Cave (Atlus license)", "DoDonPachi (Japan, Master Ver. 97/02/05)", MACHINE_SUPPORTS_SAVE )
// NOT an official CAVE release, but several PCBs have been converted to it and used on location.
-GAME( 2012, ddonpacha, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "hack (trap15)", "DoDonPachi (2012/02/12 Arrange Ver. 1.1) (hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, ddonpacha, ddonpach, ddonpach, cave, cave_state, ddonpach, ROT270, "hack (trap15)", "DoDonPachi (2012/02/12 Arrange Ver. 1.1) (hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, dfeveron, feversos, dfeveron, cave, cave_state, dfeveron, ROT270, "Cave (Nihon System license)", "Dangun Feveron (Japan, Ver. 98/09/17)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, feversos, 0, dfeveron, cave, cave_state, feversos, ROT270, "Cave (Nihon System license)", "Fever SOS (International, Ver. 98/09/25)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, dfeveron, feversos, dfeveron, cave, cave_state, dfeveron, ROT270, "Cave (Nihon System license)", "Dangun Feveron (Japan, Ver. 98/09/17)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, feversos, 0, dfeveron, cave, cave_state, feversos, ROT270, "Cave (Nihon System license)", "Fever SOS (International, Ver. 98/09/25)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, esprade, 0, esprade, cave, cave_state, esprade, ROT270, "Cave (Atlus license)", "ESP Ra.De. (International, Ver. 98/04/22)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, espradej, esprade, esprade, cave, cave_state, esprade, ROT270, "Cave (Atlus license)", "ESP Ra.De. (Japan, Ver. 98/04/21)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, espradejo, esprade, esprade, cave, cave_state, esprade, ROT270, "Cave (Atlus license)", "ESP Ra.De. (Japan, Ver. 98/04/14)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, esprade, 0, esprade, cave, cave_state, esprade, ROT270, "Cave (Atlus license)", "ESP Ra.De. (International, Ver. 98/04/22)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, espradej, esprade, esprade, cave, cave_state, esprade, ROT270, "Cave (Atlus license)", "ESP Ra.De. (Japan, Ver. 98/04/21)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, espradejo, esprade, esprade, cave, cave_state, esprade, ROT270, "Cave (Atlus license)", "ESP Ra.De. (Japan, Ver. 98/04/14)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, uopoko, 0, uopoko, cave, cave_state, uopoko, ROT0, "Cave (Jaleco license)", "Puzzle Uo Poko (International)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, uopokoj, uopoko, uopoko, cave, cave_state, uopoko, ROT0, "Cave (Jaleco license)", "Puzzle Uo Poko (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, uopoko, 0, uopoko, cave, cave_state, uopoko, ROT0, "Cave (Jaleco license)", "Puzzle Uo Poko (International)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, uopokoj, uopoko, uopoko, cave, cave_state, uopoko, ROT0, "Cave (Jaleco license)", "Puzzle Uo Poko (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, guwange, 0, guwange, guwange, cave_state, guwange, ROT270, "Cave (Atlus license)", "Guwange (Japan, Master Ver. 99/06/24)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, guwanges, guwange, guwange, guwange, cave_state, guwange, ROT270, "Cave (Atlus license)", "Guwange (Japan, Special Ver. 00/07/07)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, guwange, 0, guwange, guwange, cave_state, guwange, ROT270, "Cave (Atlus license)", "Guwange (Japan, Master Ver. 99/06/24)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, guwanges, guwange, guwange, guwange, cave_state, guwange, ROT270, "Cave (Atlus license)", "Guwange (Japan, Special Ver. 00/07/07)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gaia, 0, gaia, gaia, cave_state, gaia, ROT0, "Noise Factory", "Gaia Crusaders", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // cuts out occasionally
+GAME( 1999, gaia, 0, gaia, gaia, cave_state, gaia, ROT0, "Noise Factory", "Gaia Crusaders", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // cuts out occasionally
-GAME( 1999, korokoro, 0, korokoro, korokoro, cave_state, korokoro, ROT0, "Takumi", "Koro Koro Quest (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, korokoro, 0, korokoro, korokoro, cave_state, korokoro, ROT0, "Takumi", "Koro Koro Quest (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, crusherm, 0, crusherm, korokoro, cave_state, korokoro, ROT0, "Takumi", "Crusher Makochan (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, crusherm, 0, crusherm, korokoro, cave_state, korokoro, ROT0, "Takumi", "Crusher Makochan (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, tjumpman, 0, tjumpman, tjumpman, cave_state, tjumpman, ROT0, "Namco", "Tobikose! Jumpman", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, tjumpman, 0, tjumpman, tjumpman, cave_state, tjumpman, ROT0, "Namco", "Tobikose! Jumpman", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, theroes, 0, gaia, theroes, cave_state, gaia, ROT0, "Primetek Investments", "Thunder Heroes", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // cuts out occasionally
+GAME( 2001, theroes, 0, gaia, theroes, cave_state, gaia, ROT0, "Primetek Investments", "Thunder Heroes", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // cuts out occasionally
diff --git a/src/mame/drivers/cavepc.cpp b/src/mame/drivers/cavepc.cpp
index 84f915d9be8..4a44bf5a132 100644
--- a/src/mame/drivers/cavepc.cpp
+++ b/src/mame/drivers/cavepc.cpp
@@ -106,7 +106,7 @@ void cavepc_state::machine_reset()
membank("bank1")->set_base(memregion("bios")->base() + 0x30000);
}
-static MACHINE_CONFIG_START( cavepc, cavepc_state )
+static MACHINE_CONFIG_START( cavepc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM3, 200000000) /* AMD Athlon 64 X2 5050e Brisbane 2.60GHz, 1024KB L2 Cache ! */
MCFG_CPU_PROGRAM_MAP(cavepc_map)
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp
index 10d2a83fb3e..738e4b73ca5 100644
--- a/src/mame/drivers/cb2001.cpp
+++ b/src/mame/drivers/cb2001.cpp
@@ -807,7 +807,7 @@ PALETTE_INIT_MEMBER(cb2001_state, cb2001)
}
}
-static MACHINE_CONFIG_START( cb2001, cb2001_state )
+static MACHINE_CONFIG_START( cb2001 )
MCFG_CPU_ADD("maincpu", V35, 20000000) // CPU91A-011-0016JK004; encrypted cpu like nec v25/35 used in some irem game
MCFG_V25_CONFIG(cb2001_decryption_table)
MCFG_CPU_PROGRAM_MAP(cb2001_map)
@@ -869,5 +869,5 @@ ROM_START( scherrym )
ROM_LOAD( "n82s135-2.bin", 0x200, 0x100, CRC(a19821db) SHA1(62dda90dd67dfbc0b96f161f1f2b7a46a5805eae) )
ROM_END
-GAME( 2001, cb2001, 0, cb2001, cb2001, driver_device, 0, ROT0, "Dyna", "Cherry Bonus 2001", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
-GAME( 2001, scherrym, 0, cb2001, cb2001, driver_device, 0, ROT0, "Dyna", "Super Cherry Master", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // 2001 version? (we have bootlegs running on z80 hw of a 1996 version)
+GAME( 2001, cb2001, 0, cb2001, cb2001, cb2001_state, 0, ROT0, "Dyna", "Cherry Bonus 2001", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+GAME( 2001, scherrym, 0, cb2001, cb2001, cb2001_state, 0, ROT0, "Dyna", "Super Cherry Master", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // 2001 version? (we have bootlegs running on z80 hw of a 1996 version)
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index 1df363c46c8..1a389a62907 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -259,7 +259,7 @@ static GFXDECODE_START( cball )
GFXDECODE_END
-static MACHINE_CONFIG_START( cball, cball_state )
+static MACHINE_CONFIG_START( cball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16) /* ? */
@@ -304,4 +304,4 @@ ROM_START( cball )
ROM_END
-GAME( 1976, cball, 0, cball, cball, driver_device, 0, ROT0, "Atari", "Cannonball (Atari, prototype)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, cball, 0, cball, cball, cball_state, 0, ROT0, "Atari", "Cannonball (Atari, prototype)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp
index 57066cb94db..c3ef33e1d61 100644
--- a/src/mame/drivers/cbasebal.cpp
+++ b/src/mame/drivers/cbasebal.cpp
@@ -258,7 +258,7 @@ void cbasebal_state::machine_reset()
m_scroll_y[1] = 0;
}
-static MACHINE_CONFIG_START( cbasebal, cbasebal_state )
+static MACHINE_CONFIG_START( cbasebal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 6000000) /* ??? */
@@ -287,7 +287,7 @@ static MACHINE_CONFIG_START( cbasebal, cbasebal_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, 3579545)
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index d77d68f55a0..6114471f732 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -2279,7 +2279,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( p500_ntsc )
//-------------------------------------------------
-static MACHINE_CONFIG_START( p500_ntsc, p500_state )
+static MACHINE_CONFIG_START( p500_ntsc )
MCFG_MACHINE_START_OVERRIDE(p500_state, p500_ntsc)
MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
@@ -2395,7 +2395,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( p500_pal )
//-------------------------------------------------
-static MACHINE_CONFIG_START( p500_pal, p500_state )
+static MACHINE_CONFIG_START( p500_pal )
MCFG_MACHINE_START_OVERRIDE(p500_state, p500_pal)
MCFG_MACHINE_RESET_OVERRIDE(p500_state, p500)
@@ -2508,7 +2508,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( cbm2lp_ntsc )
//-------------------------------------------------
-static MACHINE_CONFIG_START( cbm2lp_ntsc, cbm2_state )
+static MACHINE_CONFIG_START( cbm2lp_ntsc )
MCFG_MACHINE_START_OVERRIDE(cbm2_state, cbm2_ntsc)
MCFG_MACHINE_RESET_OVERRIDE(cbm2_state, cbm2)
@@ -2665,7 +2665,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( cbm2hp_ntsc )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( cbm2hp_ntsc, cbm2lp_ntsc, cbm2hp_state )
+static MACHINE_CONFIG_DERIVED( cbm2hp_ntsc, cbm2lp_ntsc )
MCFG_DEVICE_MODIFY(MOS6525_2_TAG)
MCFG_TPI6525_IN_PC_CB(READ8(cbm2hp_state, tpi2_pc_r))
MACHINE_CONFIG_END
@@ -3037,20 +3037,20 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, p500, 0, 0, p500_ntsc, cbm2, driver_device, 0, "Commodore Business Machines", "P500 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, p500p, p500, 0, p500_pal, cbm2, driver_device, 0, "Commodore Business Machines", "P500 (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, b500, 0, 0, b128, cbm2, driver_device, 0, "Commodore Business Machines", "B500", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, b128, b500, 0, b128, cbm2, driver_device, 0, "Commodore Business Machines", "B128", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, b256, b500, 0, b256, cbm2, driver_device, 0, "Commodore Business Machines", "B256", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm610, b500, 0, cbm610, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 610", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm620, b500, 0, cbm620, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 620", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm620_hu, b500, 0, cbm620, cbm2_hu, driver_device, 0, "Commodore Business Machines", "CBM 620 (Hungary)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, b128hp, 0, 0, b128hp, cbm2, driver_device, 0, "Commodore Business Machines", "B128-80HP", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, b256hp, b128hp, 0, b256hp, cbm2, driver_device, 0, "Commodore Business Machines", "B256-80HP", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, bx256hp, b128hp, 0, bx256hp, cbm2, driver_device, 0, "Commodore Business Machines", "BX256-80HP", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 8088 co-processor is missing
-COMP( 1983, cbm710, b128hp, 0, cbm710, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 710", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm720, b128hp, 0, cbm720, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 720", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm720_de, b128hp, 0, cbm720, cbm2_de, driver_device, 0, "Commodore Business Machines", "CBM 720 (Germany)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm720_se, b128hp, 0, cbm720, cbm2_se, driver_device, 0, "Commodore Business Machines", "CBM 720 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, cbm730, b128hp, 0, cbm730, cbm2, driver_device, 0, "Commodore Business Machines", "CBM 730", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 8088 co-processor is missing
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, p500, 0, 0, p500_ntsc, cbm2, p500_state, 0, "Commodore Business Machines", "P500 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, p500p, p500, 0, p500_pal, cbm2, p500_state, 0, "Commodore Business Machines", "P500 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, b500, 0, 0, b128, cbm2, cbm2_state, 0, "Commodore Business Machines", "B500", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, b128, b500, 0, b128, cbm2, cbm2_state, 0, "Commodore Business Machines", "B128", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, b256, b500, 0, b256, cbm2, cbm2_state, 0, "Commodore Business Machines", "B256", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm610, b500, 0, cbm610, cbm2, cbm2_state, 0, "Commodore Business Machines", "CBM 610", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm620, b500, 0, cbm620, cbm2, cbm2_state, 0, "Commodore Business Machines", "CBM 620", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm620_hu, b500, 0, cbm620, cbm2_hu, cbm2_state, 0, "Commodore Business Machines", "CBM 620 (Hungary)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, b128hp, 0, 0, b128hp, cbm2, cbm2hp_state, 0, "Commodore Business Machines", "B128-80HP", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, b256hp, b128hp, 0, b256hp, cbm2, cbm2hp_state, 0, "Commodore Business Machines", "B256-80HP", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, bx256hp, b128hp, 0, bx256hp, cbm2, cbm2hp_state, 0, "Commodore Business Machines", "BX256-80HP", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 8088 co-processor is missing
+COMP( 1983, cbm710, b128hp, 0, cbm710, cbm2, cbm2hp_state, 0, "Commodore Business Machines", "CBM 710", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm720, b128hp, 0, cbm720, cbm2, cbm2hp_state, 0, "Commodore Business Machines", "CBM 720", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm720_de, b128hp, 0, cbm720, cbm2_de, cbm2hp_state, 0, "Commodore Business Machines", "CBM 720 (Germany)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm720_se, b128hp, 0, cbm720, cbm2_se, cbm2hp_state, 0, "Commodore Business Machines", "CBM 720 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cbm730, b128hp, 0, cbm730, cbm2, cbm2hp_state, 0, "Commodore Business Machines", "CBM 730", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 8088 co-processor is missing
diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp
index e4361c72f8c..afc555c4e31 100644
--- a/src/mame/drivers/cbuster.cpp
+++ b/src/mame/drivers/cbuster.cpp
@@ -298,7 +298,7 @@ void cbuster_state::machine_reset()
m_pri = 0;
}
-static MACHINE_CONFIG_START( twocrude, cbuster_state )
+static MACHINE_CONFIG_START( twocrude )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Custom chip 59 @ 12MHz Verified */
@@ -368,10 +368,10 @@ static MACHINE_CONFIG_START( twocrude, cbuster_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* 1.0068MHz Verified */
+ MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH) /* 1.0068MHz Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH) /* 2.01375MHz Verified */
+ MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH) /* 2.01375MHz Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp
index 072e33967ff..b1e49c0ca09 100644
--- a/src/mame/drivers/cc40.cpp
+++ b/src/mame/drivers/cc40.cpp
@@ -579,7 +579,7 @@ void cc40_state::machine_start()
machine().save().register_postload(save_prepost_delegate(FUNC(cc40_state::postload), this));
}
-static MACHINE_CONFIG_START( cc40, cc40_state )
+static MACHINE_CONFIG_START( cc40 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS70C20, XTAL_5MHz / 2)
@@ -638,4 +638,4 @@ ROM_START( cc40 )
ROM_END
-COMP( 1983, cc40, 0, 0, cc40, cc40, driver_device, 0, "Texas Instruments", "Compact Computer 40", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, cc40, 0, 0, cc40, cc40, cc40_state, 0, "Texas Instruments", "Compact Computer 40", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index 70d3d844d65..8a69828290a 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -453,7 +453,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( ccastles, ccastles_state )
+static MACHINE_CONFIG_START( ccastles )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
@@ -664,11 +664,11 @@ ROM_END
*
*************************************/
-GAME( 1983, ccastles, 0, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastlesg, ccastles, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 3, German)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastlesp, ccastles, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 3, Spanish)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastlesf, ccastles, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 3, French)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastles3, ccastles, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastles2, ccastles, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastles1, ccastles, ccastles, ccastles, driver_device, 0, ROT0, "Atari", "Crystal Castles (version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ccastlesj, ccastles, ccastles, ccastlesj, driver_device,0, ROT0, "Atari", "Crystal Castles (joystick version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastles, 0, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastlesg, ccastles, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 3, German)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastlesp, ccastles, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 3, Spanish)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastlesf, ccastles, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 3, French)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastles3, ccastles, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastles2, ccastles, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastles1, ccastles, ccastles, ccastles, ccastles_state, 0, ROT0, "Atari", "Crystal Castles (version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ccastlesj, ccastles, ccastles, ccastlesj,ccastles_state, 0, ROT0, "Atari", "Crystal Castles (joystick version)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp
index 29cf9653599..02cbdb7c539 100644
--- a/src/mame/drivers/cchance.cpp
+++ b/src/mame/drivers/cchance.cpp
@@ -209,7 +209,7 @@ void cchance_state::machine_reset()
m_bell_io = 0;
}
-static MACHINE_CONFIG_START( cchance, cchance_state )
+static MACHINE_CONFIG_START( cchance )
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -256,4 +256,4 @@ ROM_START( cchance )
ROM_LOAD( "prom2", 0x0200, 0x0200, NO_DUMP )
ROM_END
-GAME( 1987?, cchance, 0, cchance, cchance, driver_device, 0, ROT0, "<unknown>", "Cherry Chance", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987?, cchance, 0, cchance, cchance, cchance_state, 0, ROT0, "<unknown>", "Cherry Chance", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp
index 2806c648439..47283484000 100644
--- a/src/mame/drivers/cchasm.cpp
+++ b/src/mame/drivers/cchasm.cpp
@@ -144,7 +144,7 @@ static const z80_daisy_config daisy_chain[] =
*
*************************************/
-static MACHINE_CONFIG_START( cchasm, cchasm_state )
+static MACHINE_CONFIG_START( cchasm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
@@ -263,5 +263,5 @@ ROM_END
*
*************************************/
-GAME( 1983, cchasm, 0, cchasm, cchasm, driver_device, 0, ROT270, "Cinematronics / GCE", "Cosmic Chasm (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, cchasm1, cchasm, cchasm, cchasm, driver_device, 0, ROT270, "Cinematronics / GCE", "Cosmic Chasm (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cchasm, 0, cchasm, cchasm, cchasm_state, 0, ROT270, "Cinematronics / GCE", "Cosmic Chasm (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cchasm1, cchasm, cchasm, cchasm, cchasm_state, 0, ROT270, "Cinematronics / GCE", "Cosmic Chasm (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 0e0790b370e..44adb8029f5 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -1101,7 +1101,7 @@ INTERRUPT_GEN_MEMBER(cclimber_state::bagmanf_vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( root, cclimber_state )
+static MACHINE_CONFIG_START( root )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* 3.072 MHz */
@@ -1217,7 +1217,7 @@ static MACHINE_CONFIG_DERIVED( toprollr, cclimber )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( swimmer, cclimber_state )
+static MACHINE_CONFIG_START( swimmer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
@@ -2633,53 +2633,53 @@ GAME( 1980, cclimberj, cclimber, cclimberx, cclimberj, cclimber_state,cclimber
GAME( 1980, ccboot, cclimber, cclimberx, cclimber, cclimber_state, cclimberj,ROT0, "bootleg", "Crazy Climber (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1980, ccboot2, cclimber, cclimberx, cclimber, cclimber_state, cclimberj,ROT0, "bootleg", "Crazy Climber (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1980, ccbootmr, cclimber, cclimberx, cclimber, cclimber_state, cclimberj,ROT0, "bootleg (Model Racing)", "Crazy Climber (Model Racing bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, cclimbroper, cclimber, cclimber, cclimber, driver_device, 0, ROT0, "bootleg (Operamatic)", "Crazy Climber (Spanish, Operamatic bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, cclimbrrod, cclimber, cclimber, cclimber, driver_device, 0, ROT0, "bootleg (Rodmar)", "Crazy Climber (Spanish, Rodmar bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, cclimbroper, cclimber, cclimber, cclimber, cclimber_state, 0, ROT0, "bootleg (Operamatic)", "Crazy Climber (Spanish, Operamatic bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, cclimbrrod, cclimber, cclimber, cclimber, cclimber_state, 0, ROT0, "bootleg (Rodmar)", "Crazy Climber (Spanish, Rodmar bootleg)", MACHINE_SUPPORTS_SAVE )
/* these sets have ugly colours, no extra attract screen, and no graphics for the extra attract screen in the BG roms
- there is a Falcon logo in the text roms which is unused
- does the code to display the extra screen still exist in the roms? */
-GAME( 1981, ckong, 0, cclimber, ckong, driver_device, 0, ROT270, "Kyoei / Falcon", "Crazy Kong", MACHINE_SUPPORTS_SAVE ) // on a Falcon FCK-01 PCB, but doesn't display any Falcon copyright
-GAME( 1981, ckongalc, ckong, cclimber, ckong, driver_device, 0, ROT270, "bootleg (Alca)", "Crazy Kong (Alca bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, monkeyd, ckong, cclimber, ckong, driver_device, 0, ROT270, "bootleg", "Monkey Donkey", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dking, ckong, cclimber, ckong, cclimber_state, dking, ROT270, "bootleg", "Donkey King", MACHINE_SUPPORTS_SAVE ) // supposedly, possibly by Hafasonic?
-GAME( 1981, ckongdks, ckong, cclimber, ckong, cclimber_state, dking, ROT270, "bootleg", "Donkey Kong (Spanish Crazy Kong bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckong, 0, cclimber, ckong, cclimber_state, 0, ROT270, "Kyoei / Falcon", "Crazy Kong", MACHINE_SUPPORTS_SAVE ) // on a Falcon FCK-01 PCB, but doesn't display any Falcon copyright
+GAME( 1981, ckongalc, ckong, cclimber, ckong, cclimber_state, 0, ROT270, "bootleg (Alca)", "Crazy Kong (Alca bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, monkeyd, ckong, cclimber, ckong, cclimber_state, 0, ROT270, "bootleg", "Monkey Donkey", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dking, ckong, cclimber, ckong, cclimber_state, dking, ROT270, "bootleg", "Donkey King", MACHINE_SUPPORTS_SAVE ) // supposedly, possibly by Hafasonic?
+GAME( 1981, ckongdks, ckong, cclimber, ckong, cclimber_state, dking, ROT270, "bootleg", "Donkey Kong (Spanish Crazy Kong bootleg)", MACHINE_SUPPORTS_SAVE )
/* these sets have correct colours, and also contain the graphics used for the extra attract screen in the BG roms, but it is unused
- the Falcon logo in the text roms is still unused
- does the code to display the extra screen still exist in the roms? */
-GAME( 1981, ckongo, ckong, cclimber, ckong, driver_device, 0, ROT270, "bootleg (Orca)", "Crazy Kong (Orca bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, bigkong, ckong, cclimber, ckong, driver_device, 0, ROT270, "bootleg", "Big Kong", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongo, ckong, cclimber, ckong, cclimber_state, 0, ROT270, "bootleg (Orca)", "Crazy Kong (Orca bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, bigkong, ckong, cclimber, ckong, cclimber_state, 0, ROT270, "bootleg", "Big Kong", MACHINE_SUPPORTS_SAVE )
/* these sets have correct colours, and the extra attract screen, they also make use of the Falcon logo, some sets hack out the Falcon
text on the extra screen */
-GAME( 1981, ckongpt2, 0, cclimber, ckong, driver_device, 0, ROT270, "Falcon", "Crazy Kong Part II (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ckongpt2a, ckongpt2, cclimber, ckong, driver_device, 0, ROT270, "Falcon", "Crazy Kong Part II (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ckongpt2j, ckongpt2, cclimber, ckong, driver_device, 0, ROT270, "Falcon", "Crazy Kong Part II (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ckongpt2jeu, ckongpt2, cclimber, ckong, driver_device, 0, ROT270, "bootleg (Jeutel)", "Crazy Kong Part II (Jeutel bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongpt2, 0, cclimber, ckong, cclimber_state, 0, ROT270, "Falcon", "Crazy Kong Part II (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongpt2a, ckongpt2, cclimber, ckong, cclimber_state, 0, ROT270, "Falcon", "Crazy Kong Part II (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongpt2j, ckongpt2, cclimber, ckong, cclimber_state, 0, ROT270, "Falcon", "Crazy Kong Part II (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongpt2jeu, ckongpt2, cclimber, ckong, cclimber_state, 0, ROT270, "bootleg (Jeutel)", "Crazy Kong Part II (Jeutel bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, ckongpt2b, ckongpt2, cclimber, ckongb, cclimber_state, ckongb, ROT270, "bootleg", "Crazy Kong Part II (alternative levels)", MACHINE_SUPPORTS_SAVE )
// see bagman.cpp for parent
-GAME( 1982, bagmanf, bagman, bagmanf, bagmanf, driver_device, 0, ROT270, "bootleg", "Le Bagnard (bootleg on Crazy Kong hardware)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagmanf, bagman, bagmanf, bagmanf, cclimber_state, 0, ROT270, "bootleg", "Le Bagnard (bootleg on Crazy Kong hardware)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
GAME( 1981, rpatrol, 0, cclimber, rpatrol, cclimber_state, rpatrol, ROT0, "Orca", "River Patrol (Japan)", MACHINE_SUPPORTS_SAVE)
-GAME( 1981, rpatrola, rpatrol, cclimber, rpatrol, driver_device, 0, ROT0, "bootleg", "River Patrol (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, rpatrolb, rpatrol, cclimber, rpatrol, driver_device, 0, ROT0, "bootleg", "River Patrol (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, silvland, rpatrol, cclimber, rpatrol, driver_device, 0, ROT0, "Falcon", "Silver Land", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, rpatrola, rpatrol, cclimber, rpatrol, cclimber_state, 0, ROT0, "bootleg", "River Patrol (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, rpatrolb, rpatrol, cclimber, rpatrol, cclimber_state, 0, ROT0, "bootleg", "River Patrol (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, silvland, rpatrol, cclimber, rpatrol, cclimber_state, 0, ROT0, "Falcon", "Silver Land", MACHINE_SUPPORTS_SAVE )
// see pacman.cpp for parent
GAME( 1985, cannonb, cannonbp, cannonb, cannonb, cclimber_state, cannonb, ROT90, "bootleg (Soft)", "Cannon Ball (bootleg on Crazy Kong hardware) (set 1, buggy)" , MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // bootleggers missed protection after bonus game
GAME( 1985, cannonb2, cannonbp, cannonb, cannonb, cclimber_state, cannonb2, ROT90, "bootleg (TV Game Gruenberg)", "Cannon Ball (bootleg on Crazy Kong hardware) (set 2, buggy)", MACHINE_SUPPORTS_SAVE ) // bootleggers missed protection after bonus game
GAME( 1985, cannonb3, cannonbp, cannonb, cannonb, cclimber_state, cannonb2, ROT90, "bootleg (Soft)", "Cannon Ball (bootleg on Crazy Kong hardware) (set 3, no bonus game)", MACHINE_SUPPORTS_SAVE ) // the bonus game is patched out, thus avoiding the protection issue
-GAME( 1982, swimmer, 0, swimmer, swimmer, driver_device, 0, ROT0, "Tehkan", "Swimmer (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, swimmera, swimmer, swimmer, swimmer, driver_device, 0, ROT0, "Tehkan", "Swimmer (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, swimmerb, swimmer, swimmer, swimmerb, driver_device, 0, ROT0, "Tehkan", "Swimmer (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, swimmer, 0, swimmer, swimmer, cclimber_state, 0, ROT0, "Tehkan", "Swimmer (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, swimmera, swimmer, swimmer, swimmer, cclimber_state, 0, ROT0, "Tehkan", "Swimmer (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, swimmerb, swimmer, swimmer, swimmerb, cclimber_state, 0, ROT0, "Tehkan", "Swimmer (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, guzzler, 0, guzzler, guzzler, driver_device, 0, ROT90, "Tehkan", "Guzzler", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, guzzlers, guzzler, guzzler, guzzler, driver_device, 0, ROT90, "Tehkan", "Guzzler (Swimmer Conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, guzzler, 0, guzzler, guzzler, cclimber_state, 0, ROT90, "Tehkan", "Guzzler", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, guzzlers, guzzler, guzzler, guzzler, cclimber_state, 0, ROT90, "Tehkan", "Guzzler (Swimmer Conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, yamato, 0, yamato, yamato, cclimber_state, yamato, ROT90, "Sega", "Yamato (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, yamato2, yamato, yamato, yamato, cclimber_state, yamato, ROT90, "Sega", "Yamato (World?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, yamato, 0, yamato, yamato, cclimber_state, yamato, ROT90, "Sega", "Yamato (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, yamato2, yamato, yamato, yamato, cclimber_state, yamato, ROT90, "Sega", "Yamato (World?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
GAME( 1983, toprollr, 0, toprollr, toprollr, cclimber_state, toprollr, ROT90, "Jaleco", "Top Roller", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ccs2810.cpp b/src/mame/drivers/ccs2810.cpp
index f9dc670b051..7cc9676938c 100644
--- a/src/mame/drivers/ccs2810.cpp
+++ b/src/mame/drivers/ccs2810.cpp
@@ -92,7 +92,8 @@ public:
DECLARE_WRITE8_MEMBER(port20_w);
DECLARE_WRITE8_MEMBER(port34_w);
DECLARE_WRITE8_MEMBER(port40_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
private:
uint8_t m_term_data;
uint8_t m_26_count;
@@ -103,7 +104,7 @@ private:
floppy_image_device *m_floppy;
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
- optional_device<mb8877_t> m_fdc;
+ optional_device<mb8877_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
};
@@ -130,7 +131,7 @@ static ADDRESS_MAP_START(ccs2422_io, AS_IO, 8, ccs_state)
AM_RANGE(0x20, 0x20) AM_READWRITE(port20_r,port20_w)
AM_RANGE(0x25, 0x25) AM_READ(port25_r)
AM_RANGE(0x26, 0x26) AM_READ(port26_r)
- AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("fdc", mb8877_t, read, write)
+ AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("fdc", mb8877_device, read, write)
AM_RANGE(0x34, 0x34) AM_READWRITE(port34_r,port34_w)
AM_RANGE(0x40, 0x40) AM_WRITE(port40_w)
ADDRESS_MAP_END
@@ -167,7 +168,7 @@ WRITE8_MEMBER( ccs_state::port20_w )
m_terminal->write(space, 0, data & 0x7f);
}
-WRITE8_MEMBER( ccs_state::kbd_put )
+void ccs_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -325,7 +326,7 @@ SLOT_INTERFACE_END
//SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
-static MACHINE_CONFIG_START( ccs2810, ccs_state )
+static MACHINE_CONFIG_START( ccs2810 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(ccs2810_mem)
@@ -334,13 +335,13 @@ static MACHINE_CONFIG_START( ccs2810, ccs_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ccs_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ccs_state, kbd_put))
/* Devices */
//MCFG_INS8250_ADD( "ins8250", com_intf, XTAL_1_8432MHz )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ccs2422, ccs_state )
+static MACHINE_CONFIG_START( ccs2422 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(ccs2810_mem)
@@ -349,7 +350,7 @@ static MACHINE_CONFIG_START( ccs2422, ccs_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ccs_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ccs_state, kbd_put))
/* Devices */
MCFG_MB8877_ADD("fdc", XTAL_16MHz / 8) // UB1793 or MB8877
@@ -375,6 +376,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, ccs2810, 0, 0, ccs2810, ccs2810, ccs_state, ccs2810, "California Computer Systems", "CCS Model 2810 CPU card", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1980, ccs2810, 0, 0, ccs2810, ccs2810, ccs_state, ccs2810, "California Computer Systems", "CCS Model 2810 CPU card", MACHINE_NO_SOUND_HW)
COMP( 1980, ccs2422, ccs2810, 0, ccs2422, ccs2810, ccs_state, ccs2422, "California Computer Systems", "CCS Model 2422B FDC card", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/ccs300.cpp b/src/mame/drivers/ccs300.cpp
index 7dc4c42788a..78f52e4f770 100644
--- a/src/mame/drivers/ccs300.cpp
+++ b/src/mame/drivers/ccs300.cpp
@@ -41,7 +41,8 @@ public:
DECLARE_READ8_MEMBER(port11_r);
DECLARE_WRITE8_MEMBER(port10_w);
DECLARE_WRITE8_MEMBER(port40_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
private:
uint8_t m_term_data;
required_device<cpu_device> m_maincpu;
@@ -88,7 +89,7 @@ WRITE8_MEMBER( ccs300_state::port10_w )
m_terminal->write(space, 0, data & 0x7f);
}
-WRITE8_MEMBER( ccs300_state::kbd_put )
+void ccs300_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -118,7 +119,7 @@ DRIVER_INIT_MEMBER( ccs300_state, ccs300 )
membank("bankw0")->configure_entry(0, &main[0x0000]);
}
-static MACHINE_CONFIG_START( ccs300, ccs300_state )
+static MACHINE_CONFIG_START( ccs300 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(ccs300_mem)
@@ -127,7 +128,7 @@ static MACHINE_CONFIG_START( ccs300, ccs300_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ccs300_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ccs300_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -138,5 +139,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
COMP( 19??, ccs300, ccs2810, 0, ccs300, ccs300, ccs300_state, ccs300, "California Computer Systems", "CCS Model 300", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index bed15d8e2ea..1cf80f8a3d5 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -53,7 +53,7 @@ public:
DECLARE_READ8_MEMBER(keyin_r);
DECLARE_WRITE8_MEMBER(beep_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(cass_r);
DECLARE_WRITE_LINE_MEMBER(cass_w);
DECLARE_QUICKLOAD_LOAD_MEMBER(cd2650);
@@ -182,7 +182,7 @@ static GFXDECODE_START( cd2650 )
GFXDECODE_ENTRY( "chargen", 0x0000, cd2650_charlayout, 0, 1 )
GFXDECODE_END
-WRITE8_MEMBER( cd2650_state::kbd_put )
+void cd2650_state::kbd_put(u8 data)
{
if (data)
m_term_data = data;
@@ -257,7 +257,7 @@ QUICKLOAD_LOAD_MEMBER( cd2650_state, cd2650 )
return result;
}
-static MACHINE_CONFIG_START( cd2650, cd2650_state )
+static MACHINE_CONFIG_START( cd2650 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(cd2650_mem)
@@ -287,7 +287,7 @@ static MACHINE_CONFIG_START( cd2650, cd2650_state )
/* Devices */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(cd2650_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(cd2650_state, kbd_put))
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
@@ -314,5 +314,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, cd2650, 0, 0, cd2650, cd2650, driver_device, 0, "Central Data", "CD 2650", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1977, cd2650, 0, 0, cd2650, cd2650, cd2650_state, 0, "Central Data", "CD 2650", 0 )
diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp
index e427048a09f..efcb2f64363 100644
--- a/src/mame/drivers/cdc721.cpp
+++ b/src/mame/drivers/cdc721.cpp
@@ -111,7 +111,7 @@ uint32_t cdc721_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
return 0;
}
-static MACHINE_CONFIG_START( cdc721, cdc721_state )
+static MACHINE_CONFIG_START( cdc721 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(cdc721_mem)
@@ -141,4 +141,4 @@ ROM_START( cdc721 )
ROM_LOAD( "66315039", 0x0000, 0x1000, CRC(5c9aa968) SHA1(3ec7c5f25562579e6ed3fda7562428ff5e6b9550) ) // chargen
ROM_END
-COMP( 1981, cdc721, 0, 0, cdc721, cdc721, driver_device, 0, "Control Data Corporation", "CDC721 Terminal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1981, cdc721, 0, 0, cdc721, cdc721, cdc721_state, 0, "Control Data Corporation", "CDC721 Terminal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index ffb6201739b..1e2acade9cb 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -770,7 +770,7 @@ WRITE8_MEMBER( cdi_state::slave_io_w )
*************************/
// CD-i Mono-I system base
-static MACHINE_CONFIG_START( cdimono1_base, cdi_state )
+static MACHINE_CONFIG_START( cdimono1_base )
MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
MCFG_CPU_PROGRAM_MAP(cdimono1_mem)
@@ -816,7 +816,7 @@ static MACHINE_CONFIG_START( cdimono1_base, cdi_state )
MACHINE_CONFIG_END
// CD-i model 220 (Mono-II, NTSC)
-static MACHINE_CONFIG_START( cdimono2, cdi_state )
+static MACHINE_CONFIG_START( cdimono2 )
MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
MCFG_CPU_PROGRAM_MAP(cdimono2_mem)
@@ -870,7 +870,7 @@ static MACHINE_CONFIG_START( cdimono2, cdi_state )
MCFG_MK48T08_ADD( "mk48t08" )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cdi910, cdi_state )
+static MACHINE_CONFIG_START( cdi910 )
MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2)
MCFG_CPU_PROGRAM_MAP(cdi910_mem)
@@ -1278,31 +1278,31 @@ ROM_END
* Game driver(s) *
*************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME */
// BIOS / System
-CONS( 1991, cdimono1, 0, 0, cdimono1, cdi, driver_device, 0, "Philips", "CD-i (Mono-I) (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-CONS( 1991, cdimono2, 0, 0, cdimono2, cdimono2, driver_device, 0, "Philips", "CD-i (Mono-II) (NTSC)", MACHINE_NOT_WORKING )
-CONS( 1991, cdi910, 0, 0, cdi910, cdimono2, driver_device, 0, "Philips", "CD-i 910-17P Mini-MMC (PAL)", MACHINE_NOT_WORKING )
-CONS( 1991, cdi490a, 0, 0, cdimono1, cdi, driver_device, 0, "Philips", "CD-i 490", MACHINE_NOT_WORKING )
+CONS( 1991, cdimono1, 0, 0, cdimono1, cdi, cdi_state, 0, "Philips", "CD-i (Mono-I) (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1991, cdimono2, 0, 0, cdimono2, cdimono2, cdi_state, 0, "Philips", "CD-i (Mono-II) (NTSC)", MACHINE_NOT_WORKING )
+CONS( 1991, cdi910, 0, 0, cdi910, cdimono2, cdi_state, 0, "Philips", "CD-i 910-17P Mini-MMC (PAL)", MACHINE_NOT_WORKING )
+CONS( 1991, cdi490a, 0, 0, cdimono1, cdi, cdi_state, 0, "Philips", "CD-i 490", MACHINE_NOT_WORKING )
// The Quizard games are RETAIL CD-i units, with additional JAMMA adapters & dongles for protection, hence being 'clones' of the system.
-GAME( 1995, cdibios, 0, cdimono1_base, quizard, driver_device, 0, ROT0, "Philips", "CD-i (Mono-I) (PAL) BIOS", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IS_BIOS_ROOT )
+GAME( 1995, cdibios, 0, cdimono1_base, quizard, cdi_state, 0, ROT0, "Philips", "CD-i (Mono-I) (PAL) BIOS", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IS_BIOS_ROOT )
-GAME( 1995, quizard, cdibios, quizard1, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard (v1.8)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1995, quizard_17, quizard, quizard1, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard (v1.7)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1995, quizard_12, quizard, quizard1, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard (v1.2)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1995, quizard_10, quizard, quizard1, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard (v1.0)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard, cdibios, quizard1, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard (v1.8)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard_17, quizard, quizard1, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard (v1.7)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard_12, quizard, quizard1, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard (v1.2)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard_10, quizard, quizard1, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard (v1.0)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1995, quizard2, cdibios, quizard2, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 2 (v2.3)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1995, quizard2_22, quizard2, quizard2, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 2 (v2.2)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard2, cdibios, quizard2, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 2 (v2.3)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard2_22, quizard2, quizard2, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 2 (v2.2)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
// Quizard 3 and 4 will hang after inserting a coin (incomplete protection sims?)
-GAME( 1995, quizard3, cdibios, quizard3, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 3 (v3.4)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1996, quizard3_32, quizard3, quizard3, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 3 (v3.2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, quizard3, cdibios, quizard3, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 3 (v3.4)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1996, quizard3_32, quizard3, quizard3, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 3 (v3.2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1998, quizard4, cdibios, quizard4, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 4 Rainbow (v4.2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1998, quizard4_41, quizard4, quizard4, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 4 Rainbow (v4.1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1997, quizard4_40, quizard4, quizard4, quizard, driver_device, 0, ROT0, "TAB Austria", "Quizard 4 Rainbow (v4.0)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1998, quizard4, cdibios, quizard4, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 4 Rainbow (v4.2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1998, quizard4_41, quizard4, quizard4, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 4 Rainbow (v4.1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1997, quizard4_40, quizard4, quizard4, quizard, cdi_state, 0, ROT0, "TAB Austria", "Quizard 4 Rainbow (v4.0)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp
index efe3a5e1873..e19e894177f 100644
--- a/src/mame/drivers/cedar_magnet.cpp
+++ b/src/mame/drivers/cedar_magnet.cpp
@@ -750,7 +750,7 @@ INTERRUPT_GEN_MEMBER(cedar_magnet_state::irq)
m_cedsprite->irq_hold();
}
-static MACHINE_CONFIG_START( cedar_magnet, cedar_magnet_state )
+static MACHINE_CONFIG_START( cedar_magnet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
@@ -902,8 +902,8 @@ DRIVER_INIT_MEMBER(cedar_magnet_state, mag_exzi)
m_prothack = mag_exzi_protection_hack;
}
-GAME( 1987, cedmag, 0, cedar_magnet, cedar_magnet, driver_device, 0, ROT0, "EFO SA / Cedar", "Magnet System", MACHINE_IS_BIOS_ROOT )
+GAME( 1987, cedmag, 0, cedar_magnet, cedar_magnet, cedar_magnet_state, 0, ROT0, "EFO SA / Cedar", "Magnet System", MACHINE_IS_BIOS_ROOT )
-GAME( 1987, mag_time, cedmag, cedar_magnet, cedar_magnet, cedar_magnet_state, mag_time, ROT90, "EFO SA / Cedar", "Time Scanner (TS 2.0, Magnet System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // original game was by Sega
-GAME( 1987, mag_exzi, cedmag, cedar_magnet, cedar_magnet, cedar_magnet_state, mag_exzi, ROT0, "EFO SA / Cedar", "Exzisus (EX 1.0, Magnet System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // original game was by Taito
+GAME( 1987, mag_time, cedmag, cedar_magnet, cedar_magnet, cedar_magnet_state, mag_time, ROT90, "EFO SA / Cedar", "Time Scanner (TS 2.0, Magnet System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // original game was by Sega
+GAME( 1987, mag_exzi, cedmag, cedar_magnet, cedar_magnet, cedar_magnet_state, mag_exzi, ROT0, "EFO SA / Cedar", "Exzisus (EX 1.0, Magnet System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // original game was by Taito
GAME( 1987, mag_xain, cedmag, cedar_magnet, cedar_magnet, cedar_magnet_state, mag_xain, ROT0, "EFO SA / Cedar", "Xain'd Sleena (SC 3.0, Magnet System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // original game was by Technos
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 21f395df5fa..69116644ac6 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -1679,7 +1679,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( centiped_base, centiped_state )
+static MACHINE_CONFIG_START( centiped_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12096000/8) /* 1.512 MHz (slows down to 0.75MHz while accessing playfield RAM) */
@@ -1842,7 +1842,7 @@ static MACHINE_CONFIG_DERIVED( mazeinv, milliped )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bullsdrt, centiped_state )
+static MACHINE_CONFIG_START( bullsdrt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 12096000/8)
@@ -2191,23 +2191,23 @@ DRIVER_INIT_MEMBER(centiped_state,multiped)
*************************************/
// Centipede, Millipede, and clones
-GAME( 1980, centiped, 0, centiped, centiped4,driver_device, 0, ROT270, "Atari", "Centipede (revision 4)", MACHINE_SUPPORTS_SAVE ) /* 1 Player Only with Timer Options */
-GAME( 1980, centiped3, centiped, centiped, centiped, driver_device, 0, ROT270, "Atari", "Centipede (revision 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, centiped2, centiped, centiped, centiped, driver_device, 0, ROT270, "Atari", "Centipede (revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, centiped1, centiped, centiped, centiped, driver_device, 0, ROT270, "Atari", "Centipede (revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, centipdb, centiped, centipdb, centiped, driver_device, 0, ROT270, "bootleg", "Centipede (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, centipdd, centiped, centiped, centiped, driver_device, 0, ROT270, "hack (Two-Bit Score)", "Centipede Dux (hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, caterplr, centiped, caterplr, caterplr, driver_device, 0, ROT270, "bootleg (Olympia)", "Caterpillar (bootleg of Centipede)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, millpac, centiped, centipdb, centiped, driver_device, 0, ROT270, "bootleg? (Valadon Automation)", "Millpac (bootleg of Centipede)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, magworm, centiped, magworm, magworm, driver_device, 0, ROT270, "bootleg (Sidam)", "Magic Worm (bootleg of Centipede, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, magworma, centiped, magworm, magworm, driver_device, 0, ROT270, "bootleg", "Magic Worm (bootleg of Centipede, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1982, milliped, 0, milliped, milliped, driver_device, 0, ROT270, "Atari", "Millipede", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, millipdd, milliped, milliped, milliped, driver_device, 0, ROT270, "hack (Two-Bit Score)", "Millipede Dux (hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, centiped, 0, centiped, centiped4,centiped_state, 0, ROT270, "Atari", "Centipede (revision 4)", MACHINE_SUPPORTS_SAVE ) /* 1 Player Only with Timer Options */
+GAME( 1980, centiped3, centiped, centiped, centiped, centiped_state, 0, ROT270, "Atari", "Centipede (revision 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, centiped2, centiped, centiped, centiped, centiped_state, 0, ROT270, "Atari", "Centipede (revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, centiped1, centiped, centiped, centiped, centiped_state, 0, ROT270, "Atari", "Centipede (revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, centipdb, centiped, centipdb, centiped, centiped_state, 0, ROT270, "bootleg", "Centipede (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, centipdd, centiped, centiped, centiped, centiped_state, 0, ROT270, "hack (Two-Bit Score)", "Centipede Dux (hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, caterplr, centiped, caterplr, caterplr, centiped_state, 0, ROT270, "bootleg (Olympia)", "Caterpillar (bootleg of Centipede)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, millpac, centiped, centipdb, centiped, centiped_state, 0, ROT270, "bootleg? (Valadon Automation)", "Millpac (bootleg of Centipede)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, magworm, centiped, magworm, magworm, centiped_state, 0, ROT270, "bootleg (Sidam)", "Magic Worm (bootleg of Centipede, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, magworma, centiped, magworm, magworm, centiped_state, 0, ROT270, "bootleg", "Magic Worm (bootleg of Centipede, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1982, milliped, 0, milliped, milliped, centiped_state, 0, ROT270, "Atari", "Millipede", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, millipdd, milliped, milliped, milliped, centiped_state, 0, ROT270, "hack (Two-Bit Score)", "Millipede Dux (hack)", MACHINE_SUPPORTS_SAVE )
GAME( 2002, multiped, 0, multiped, multiped, centiped_state, multiped, ROT270, "hack (Braze Technologies)", "Multipede (Centipede/Millipede multigame kit)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
// other Atari games
-GAME( 1980, warlords, 0, warlords, warlords, driver_device, 0, ROT0, "Atari", "Warlords", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mazeinv, 0, mazeinv, mazeinv, driver_device, 0, ROT270, "Atari", "Maze Invaders (prototype)", 0 )
+GAME( 1980, warlords, 0, warlords, warlords, centiped_state, 0, ROT0, "Atari", "Warlords", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mazeinv, 0, mazeinv, mazeinv, centiped_state, 0, ROT270, "Atari", "Maze Invaders (prototype)", 0 )
// other manufacturers
GAME( 1985, bullsdrt, 0, bullsdrt, bullsdrt, centiped_state, bullsdrt, ROT270, "Shinkai Inc. (Magic Electronics Inc. license)", "Bulls Eye Darts", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp
index 48e0a078c7b..7cb395f0a4d 100644
--- a/src/mame/drivers/cesclass.cpp
+++ b/src/mame/drivers/cesclass.cpp
@@ -247,7 +247,7 @@ PALETTE_INIT_MEMBER(cesclassic_state, cesclassic)
palette.set_pen_color(i, pal2bit(i), 0, 0);
}
-static MACHINE_CONFIG_START( cesclassic, cesclassic_state )
+static MACHINE_CONFIG_START( cesclassic )
MCFG_CPU_ADD("maincpu", M68000, 24000000/2 )
MCFG_CPU_PROGRAM_MAP(cesclassic_map)
@@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( cesclassic, cesclassic_state )
MCFG_PALETTE_INIT_OWNER(cesclassic_state, cesclassic)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 24000000/16, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 24000000/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -301,6 +301,6 @@ ROM_START(tsclass)
ROM_END
-GAME(1997, hrclass, 0, cesclassic, cesclassic, driver_device, 0, ROT0, "Creative Electronics And Software", "Home Run Classic (v1.21 12-feb-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1997, ccclass, 0, cesclassic, cesclassic, driver_device, 0, ROT0, "Creative Electronics And Software", "Country Club Classic (v1.10 03-apr-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1997, tsclass, 0, cesclassic, cesclassic, driver_device, 0, ROT0, "Creative Electronics And Software", "Trap Shoot Classic (v1.0 21-mar-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1997, hrclass, 0, cesclassic, cesclassic, cesclassic_state, 0, ROT0, "Creative Electronics And Software", "Home Run Classic (v1.21 12-feb-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1997, ccclass, 0, cesclassic, cesclassic, cesclassic_state, 0, ROT0, "Creative Electronics And Software", "Country Club Classic (v1.10 03-apr-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1997, tsclass, 0, cesclassic, cesclassic, cesclassic_state, 0, ROT0, "Creative Electronics And Software", "Trap Shoot Classic (v1.0 21-mar-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp
index 84edcf9c8ae..8e2375f82f6 100644
--- a/src/mame/drivers/cfx9850.cpp
+++ b/src/mame/drivers/cfx9850.cpp
@@ -279,7 +279,7 @@ u32 cfx9850_state::screen_update_cfx9850(screen_device &screen, bitmap_ind16 &bi
}
-static MACHINE_CONFIG_START(cfx9850, cfx9850_state)
+static MACHINE_CONFIG_START(cfx9850)
MCFG_CPU_ADD("maincpu", HCD62121, 4300000) /* X1 - 4.3 MHz */
MCFG_CPU_PROGRAM_MAP(cfx9850)
MCFG_HCD62121_KOL_CB(WRITE8(cfx9850_state, kol_w))
@@ -317,4 +317,4 @@ ROM_START(cfx9850)
ROM_END
-COMP(1996, cfx9850, 0, 0, cfx9850, cfx9850, driver_device, 0, "Casio", "CFX-9850G", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
+COMP(1996, cfx9850, 0, 0, cfx9850, cfx9850, cfx9850_state, 0, "Casio", "CFX-9850G", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index 7d6693fa07c..c96adab9e5d 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -355,7 +355,7 @@ void cgc7900_state::machine_reset()
MACHINE_DRIVER( cgc7900 )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( cgc7900, cgc7900_state )
+static MACHINE_CONFIG_START( cgc7900 )
/* basic machine hardware */
MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_28_48MHz/4)
MCFG_CPU_PROGRAM_MAP(cgc7900_mem)
@@ -441,5 +441,5 @@ ROM_END
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, cgc7900, 0, 0, cgc7900, cgc7900, driver_device, 0, "Chromatics", "CGC 7900", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1980, cgc7900, 0, 0, cgc7900, cgc7900, cgc7900_state, 0, "Chromatics", "CGC 7900", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp
index b8e7f6135ec..b4ebf9798fa 100644
--- a/src/mame/drivers/cgenie.cpp
+++ b/src/mame/drivers/cgenie.cpp
@@ -81,7 +81,7 @@ private:
required_device<ram_device> m_ram;
required_device<hd6845_device> m_crtc;
required_device<rs232_port_device> m_rs232;
- required_device<expansion_slot_device> m_exp;
+ required_device<cg_exp_slot_device> m_exp;
required_memory_region m_char_rom;
required_shared_ptr<uint8_t> m_color_ram;
required_shared_ptr<uint8_t> m_font_ram;
@@ -433,7 +433,7 @@ const rgb_t cgenie_state::m_palette_nz[] =
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( cgenie, cgenie_state )
+static MACHINE_CONFIG_START( cgenie )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_17_73447MHz / 8) // 2.2168 MHz
MCFG_CPU_PROGRAM_MAP(cgenie_mem)
@@ -453,10 +453,10 @@ static MACHINE_CONFIG_START( cgenie, cgenie_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ay8910", AY8910, XTAL_17_73447MHz / 8)
- MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("par", parallel_slot_device, pa_r))
- MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("par", parallel_slot_device, pa_w))
- MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("par", parallel_slot_device, pb_r))
- MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("par", parallel_slot_device, pb_w))
+ MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("par", cg_parallel_slot_device, pa_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(DEVWRITE8("par", cg_parallel_slot_device, pa_w))
+ MCFG_AY8910_PORT_B_READ_CB(DEVREAD8("par", cg_parallel_slot_device, pb_r))
+ MCFG_AY8910_PORT_B_WRITE_CB(DEVWRITE8("par", cg_parallel_slot_device, pb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_CASSETTE_ADD("cassette")
@@ -472,11 +472,11 @@ static MACHINE_CONFIG_START( cgenie, cgenie_state )
MCFG_RS232_DCD_HANDLER(WRITELINE(cgenie_state, rs232_dcd_w))
// cartridge expansion slot
- MCFG_EXPANSION_SLOT_ADD("exp")
- MCFG_EXPANSION_SLOT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
+ MCFG_CG_EXP_SLOT_ADD("exp")
+ MCFG_CG_EXP_SLOT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
// parallel slot
- MCFG_PARALLEL_SLOT_ADD("par")
+ MCFG_CG_PARALLEL_SLOT_ADD("par")
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp
index d88f3ba3420..23267791a3c 100644
--- a/src/mame/drivers/chaknpop.cpp
+++ b/src/mame/drivers/chaknpop.cpp
@@ -354,7 +354,7 @@ void chaknpop_state::machine_reset()
m_mcu_select = 0;
}
-static MACHINE_CONFIG_START( chaknpop, chaknpop_state )
+static MACHINE_CONFIG_START( chaknpop )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz / 6) /* Verified on PCB */
@@ -421,5 +421,5 @@ ROM_START( chaknpop )
ROM_END
-/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME ) */
-GAME( 1983, chaknpop, 0, chaknpop, chaknpop, driver_device, 0, ROT0, "Taito Corporation", "Chack'n Pop", MACHINE_SUPPORTS_SAVE )
+/* ( YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS ) */
+GAME( 1983, chaknpop, 0, chaknpop, chaknpop, chaknpop_state, 0, ROT0, "Taito Corporation", "Chack'n Pop", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp
index 4f86c9ffcf6..3ec944ada4b 100644
--- a/src/mame/drivers/cham24.cpp
+++ b/src/mame/drivers/cham24.cpp
@@ -309,7 +309,7 @@ static GFXDECODE_START( cham24 )
/* none, the ppu generates one */
GFXDECODE_END
-static MACHINE_CONFIG_START( cham24, cham24_state )
+static MACHINE_CONFIG_START( cham24 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
MCFG_CPU_PROGRAM_MAP(cham24_map)
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 8db48119ce4..c30c85745c4 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -520,7 +520,7 @@ INTERRUPT_GEN_MEMBER(champbas_state::vblank_irq)
}
-static MACHINE_CONFIG_START( talbot, champbas_state )
+static MACHINE_CONFIG_START( talbot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
@@ -557,7 +557,7 @@ static MACHINE_CONFIG_START( talbot, champbas_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( champbas, champbas_state )
+static MACHINE_CONFIG_START( champbas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
@@ -629,7 +629,7 @@ static MACHINE_CONFIG_DERIVED( champbb2, champbasj )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( exctsccr, champbas_state )
+static MACHINE_CONFIG_START( exctsccr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6 )
@@ -690,7 +690,7 @@ static MACHINE_CONFIG_START( exctsccr, champbas_state )
MACHINE_CONFIG_END
/* Bootleg running on a modified Champion Baseball board */
-static MACHINE_CONFIG_START( exctsccrb, champbas_state )
+static MACHINE_CONFIG_START( exctsccrb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
@@ -1243,8 +1243,8 @@ DRIVER_INIT_MEMBER(champbas_state,exctsccr)
*
*************************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR, COMPANY, FULLNAME, FLAGS */
-GAME( 1982, talbot, 0, talbot, talbot, driver_device, 0, ROT270, "Alpha Denshi Co. (Volt Electronics license)", "Talbot", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY, FULLNAME, FLAGS */
+GAME( 1982, talbot, 0, talbot, talbot, champbas_state, 0, ROT270, "Alpha Denshi Co. (Volt Electronics license)", "Talbot", MACHINE_SUPPORTS_SAVE )
GAME( 1983, champbas, 0, champbas, champbas, champbas_state, champbas, ROT0, "Alpha Denshi Co. (Sega license)", "Champion Base Ball", MACHINE_SUPPORTS_SAVE ) // no protection
GAME( 1983, champbasj, champbas, champbasj, champbas, champbas_state, champbas, ROT0, "Alpha Denshi Co.", "Champion Base Ball (Japan set 1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp
index 44a5b0f2182..7e358ebc34a 100644
--- a/src/mame/drivers/champbwl.cpp
+++ b/src/mame/drivers/champbwl.cpp
@@ -491,7 +491,7 @@ WRITE_LINE_MEMBER(champbwl_state::screen_vblank_champbwl)
}
-static MACHINE_CONFIG_START( champbwl, champbwl_state )
+static MACHINE_CONFIG_START( champbwl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 16000000/4) /* 4MHz */
@@ -556,7 +556,7 @@ MACHINE_START_MEMBER(champbwl_state,doraemon)
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
}
-static MACHINE_CONFIG_START( doraemon, champbwl_state )
+static MACHINE_CONFIG_START( doraemon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/4)
@@ -713,5 +713,5 @@ ROM_START( doraemon )
ROM_LOAD( "u27-01.bin", 0x00200, 0x200, CRC(66245fc7) SHA1(c94d9dce7b557c21a3dc1f3f8a1b29594715c994) )
ROM_END
-GAME( 1993?,doraemon, 0, doraemon, doraemon, driver_device, 0, ROT0, "Sunsoft / Epoch", "Doraemon no Eawase Montage (prototype)", MACHINE_SUPPORTS_SAVE ) // year not shown, datecodes on pcb suggests late-1993
-GAME( 1989, champbwl, 0, champbwl, champbwl, driver_device, 0, ROT270, "Seta / Romstar Inc.", "Championship Bowling", MACHINE_SUPPORTS_SAVE )
+GAME( 1993?,doraemon, 0, doraemon, doraemon, champbwl_state, 0, ROT0, "Sunsoft / Epoch", "Doraemon no Eawase Montage (prototype)", MACHINE_SUPPORTS_SAVE ) // year not shown, datecodes on pcb suggests late-1993
+GAME( 1989, champbwl, 0, champbwl, champbwl, champbwl_state, 0, ROT270, "Seta / Romstar Inc.", "Championship Bowling", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index d31dc17f154..d18ae9f683b 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -385,7 +385,7 @@ void chanbara_state::machine_reset()
m_scrollhi = 0;
}
-static MACHINE_CONFIG_START( chanbara, chanbara_state )
+static MACHINE_CONFIG_START( chanbara )
MCFG_CPU_ADD("maincpu", M6809, 12000000/8)
MCFG_CPU_PROGRAM_MAP(chanbara_map)
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 1e45c54de6a..6da824a83b1 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -444,7 +444,7 @@ void chance32_state::machine_reset()
}
-static MACHINE_CONFIG_START( chance32, chance32_state )
+static MACHINE_CONFIG_START( chance32 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2)
@@ -474,7 +474,7 @@ static MACHINE_CONFIG_START( chance32, chance32_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
/* clock at 1050 kHz match the 8000 Hz samples stored inside the ROM */
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -517,5 +517,5 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 19??, chance32, 0, chance32, chance32, driver_device, 0, ROT0, "PAL System Co, Ltd.", "Chance Thirty Two", 0, layout_chance32 )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+GAMEL( 19??, chance32, 0, chance32, chance32, chance32_state, 0, ROT0, "PAL System Co, Ltd.", "Chance Thirty Two", 0, layout_chance32 )
diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp
index b439776f39a..3d34527dea0 100644
--- a/src/mame/drivers/changela.cpp
+++ b/src/mame/drivers/changela.cpp
@@ -407,7 +407,7 @@ void changela_state::machine_reset()
m_dir_31 = 0;
}
-static MACHINE_CONFIG_START( changela, changela_state )
+static MACHINE_CONFIG_START( changela )
MCFG_CPU_ADD("maincpu", Z80,5000000)
MCFG_CPU_PROGRAM_MAP(changela_map)
@@ -480,4 +480,4 @@ ROM_START( changela )
ROM_LOAD( "cl88", 0x0000, 0x0020, CRC(da4d6625) SHA1(2d9a268973518252eb36f479ab650af8c16c885c) ) /* math train state machine */
ROM_END
-GAMEL( 1983, changela, 0, changela, changela, driver_device, 0, ROT180, "Taito Corporation", "Change Lanes", MACHINE_SUPPORTS_SAVE, layout_changela )
+GAMEL( 1983, changela, 0, changela, changela, changela_state, 0, ROT180, "Taito Corporation", "Change Lanes", MACHINE_SUPPORTS_SAVE, layout_changela )
diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp
index e3f545add2d..d7b666415d3 100644
--- a/src/mame/drivers/channelf.cpp
+++ b/src/mame/drivers/channelf.cpp
@@ -207,7 +207,7 @@ static MACHINE_CONFIG_FRAGMENT( channelf_cart )
MCFG_SOFTWARE_LIST_ADD("cart_list","channelf")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( channelf, channelf_state )
+static MACHINE_CONFIG_START( channelf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", F8, 3579545/2) /* Colorburst/2 */
MCFG_CPU_PROGRAM_MAP(channelf_map)
@@ -234,7 +234,7 @@ static MACHINE_CONFIG_START( channelf, channelf_state )
MCFG_FRAGMENT_ADD( channelf_cart )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sabavdpl, channelf_state )
+static MACHINE_CONFIG_START( sabavdpl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */
MCFG_CPU_PROGRAM_MAP(channelf_map)
@@ -262,7 +262,7 @@ static MACHINE_CONFIG_START( sabavdpl, channelf_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( channlf2, channelf_state )
+static MACHINE_CONFIG_START( channlf2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", F8, 3579545/2) /* Colorburst / 2 */
MCFG_CPU_PROGRAM_MAP(channelf_map)
@@ -290,7 +290,7 @@ static MACHINE_CONFIG_START( channlf2, channelf_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sabavpl2, channelf_state )
+static MACHINE_CONFIG_START( sabavpl2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", F8, MASTER_CLOCK_PAL) /* PAL speed */
MCFG_CPU_PROGRAM_MAP(channelf_map)
@@ -342,12 +342,12 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1976, channelf, 0, 0, channelf, channelf, driver_device, 0, "Fairchild", "Channel F", 0 )
-CONS( 1977, sabavdpl, channelf, 0, sabavdpl, channelf, driver_device, 0, "SABA", "SABA Videoplay", 0 )
-CONS( 197?, luxorves, channelf, 0, sabavdpl, channelf, driver_device, 0, "Luxor", "Luxor Video Entertainment System", 0 )
-CONS( 1978, channlf2, 0, channelf, channlf2, channelf, driver_device, 0, "Fairchild", "Channel F II", 0 )
-CONS( 1978, sabavpl2, channlf2, 0, sabavpl2, channelf, driver_device, 0, "SABA", "SABA Videoplay 2", 0 )
-CONS( 197?, luxorvec, channlf2, 0, sabavpl2, channelf, driver_device, 0, "Luxor", "Luxor Video Entertainment Computer", 0 )
-CONS( 197?, itttelma, channlf2, 0, sabavpl2, channelf, driver_device, 0, "ITT", "ITT Tele-Match Processor", 0 )
-CONS( 1978, ingtelma, channlf2, 0, sabavpl2, channelf, driver_device, 0, "Ingelen", "Ingelen Tele-Match Processor", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1976, channelf, 0, 0, channelf, channelf, channelf_state, 0, "Fairchild", "Channel F", 0 )
+CONS( 1977, sabavdpl, channelf, 0, sabavdpl, channelf, channelf_state, 0, "SABA", "SABA Videoplay", 0 )
+CONS( 197?, luxorves, channelf, 0, sabavdpl, channelf, channelf_state, 0, "Luxor", "Luxor Video Entertainment System", 0 )
+CONS( 1978, channlf2, 0, channelf, channlf2, channelf, channelf_state, 0, "Fairchild", "Channel F II", 0 )
+CONS( 1978, sabavpl2, channlf2, 0, sabavpl2, channelf, channelf_state, 0, "SABA", "SABA Videoplay 2", 0 )
+CONS( 197?, luxorvec, channlf2, 0, sabavpl2, channelf, channelf_state, 0, "Luxor", "Luxor Video Entertainment Computer", 0 )
+CONS( 197?, itttelma, channlf2, 0, sabavpl2, channelf, channelf_state, 0, "ITT", "ITT Tele-Match Processor", 0 )
+CONS( 1978, ingtelma, channlf2, 0, sabavpl2, channelf, channelf_state, 0, "Ingelen", "Ingelen Tele-Match Processor", 0 )
diff --git a/src/mame/drivers/chaos.cpp b/src/mame/drivers/chaos.cpp
index 56d21282bcf..7618cde825b 100644
--- a/src/mame/drivers/chaos.cpp
+++ b/src/mame/drivers/chaos.cpp
@@ -50,7 +50,7 @@ public:
DECLARE_WRITE8_MEMBER(port1f_w);
DECLARE_READ8_MEMBER(port90_r);
DECLARE_READ8_MEMBER(port91_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
private:
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -125,7 +125,7 @@ READ8_MEMBER( chaos_state::port91_r )
return ret;
}
-WRITE8_MEMBER( chaos_state::kbd_put )
+void chaos_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -138,7 +138,7 @@ void chaos_state::machine_reset()
memcpy(m_p_ram+0x7000, ROM+0x3000, 0x1000);
}
-static MACHINE_CONFIG_START( chaos, chaos_state )
+static MACHINE_CONFIG_START( chaos )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(chaos_mem)
@@ -146,7 +146,7 @@ static MACHINE_CONFIG_START( chaos, chaos_state )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(chaos_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(chaos_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -160,5 +160,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, chaos, 0, 0, chaos, chaos, driver_device, 0, "David Greaves", "Chaos 2", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, chaos, 0, 0, chaos, chaos, chaos_state, 0, "David Greaves", "Chaos 2", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp
index 597df4f82de..85f1e09a641 100644
--- a/src/mame/drivers/cheekyms.cpp
+++ b/src/mame/drivers/cheekyms.cpp
@@ -121,7 +121,7 @@ INTERRUPT_GEN_MEMBER(cheekyms_state::vblank_irq)
}
-static MACHINE_CONFIG_START( cheekyms, cheekyms_state )
+static MACHINE_CONFIG_START( cheekyms )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,5000000/2) /* 2.5 MHz */
@@ -197,4 +197,4 @@ ROM_END
-GAME( 1980, cheekyms, 0, cheekyms, cheekyms, driver_device, 0, ROT270, "Universal", "Cheeky Mouse", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, cheekyms, 0, cheekyms, cheekyms, cheekyms_state, 0, ROT270, "Universal", "Cheeky Mouse", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp
index 9b5fb2c5f69..84e21b1e24b 100644
--- a/src/mame/drivers/chessmst.cpp
+++ b/src/mame/drivers/chessmst.cpp
@@ -353,7 +353,7 @@ static const z80_daisy_config chessmstdm_daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( chessmst, chessmst_state )
+static MACHINE_CONFIG_START( chessmst )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_9_8304MHz/4) // U880 Z80 clone
@@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( chessmst, chessmst_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( chessmsta, chessmst_state )
+static MACHINE_CONFIG_START( chessmsta )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/4) // U880 Z80 clone
@@ -403,7 +403,7 @@ static MACHINE_CONFIG_START( chessmsta, chessmst_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( chessmstdm, chessmst_state )
+static MACHINE_CONFIG_START( chessmstdm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) // U880 Z80 clone
@@ -465,7 +465,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-COMP( 1984, chessmst, 0, 0, chessmst, chessmst, driver_device, 0, "VEB Mikroelektronik Erfurt", "Chess-Master (set 1)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
-COMP( 1984, chessmsta, chessmst, 0, chessmsta, chessmst, driver_device, 0, "VEB Mikroelektronik Erfurt", "Chess-Master (set 2)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
-COMP( 1987, chessmstdm,0, 0, chessmstdm, chessmstdm, driver_device, 0, "VEB Mikroelektronik Erfurt", "Chess-Master Diamond", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, chessmst, 0, 0, chessmst, chessmst, chessmst_state, 0, "VEB Mikroelektronik Erfurt", "Chess-Master (set 1)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
+COMP( 1984, chessmsta, chessmst, 0, chessmsta, chessmst, chessmst_state, 0, "VEB Mikroelektronik Erfurt", "Chess-Master (set 2)", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
+COMP( 1987, chessmstdm, 0, 0, chessmstdm, chessmstdm, chessmst_state, 0, "VEB Mikroelektronik Erfurt", "Chess-Master Diamond", MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp
index ee13ff0cff0..8e594e000b3 100644
--- a/src/mame/drivers/chesstrv.cpp
+++ b/src/mame/drivers/chesstrv.cpp
@@ -213,7 +213,7 @@ void chesstrv_state::machine_start()
save_item(NAME(m_matrix));
}
-static MACHINE_CONFIG_START( chesstrv, chesstrv_state )
+static MACHINE_CONFIG_START( chesstrv )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", F8, 3000000 ) // Fairchild 3870
MCFG_CPU_PROGRAM_MAP( chesstrv_mem )
@@ -223,7 +223,7 @@ static MACHINE_CONFIG_START( chesstrv, chesstrv_state )
MCFG_DEFAULT_LAYOUT( layout_chesstrv )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( borisdpl, chesstrv_state )
+static MACHINE_CONFIG_START( borisdpl )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", F8, 30000000 ) // Motorola SC80265P
MCFG_CPU_PROGRAM_MAP( chesstrv_mem )
@@ -251,6 +251,6 @@ ROM_START( borisdpl )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS( 1980, chesstrv, 0, 0, chesstrv, chesstrv, driver_device, 0, "Acetronic", "Chess Traveller", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
-CONS( 1979, borisdpl, 0, 0, borisdpl, borisdpl, driver_device, 0, "Applied Concepts", "Boris Diplomat", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1980, chesstrv, 0, 0, chesstrv, chesstrv, chesstrv_state, 0, "Acetronic", "Chess Traveller", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+CONS( 1979, borisdpl, 0, 0, borisdpl, borisdpl, chesstrv_state, 0, "Applied Concepts", "Boris Diplomat", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index c33e0b8ea8d..6e4266bfd37 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -312,7 +312,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(chexx_state::update)
#endif
}
-static MACHINE_CONFIG_START( chexx83, chexx_state )
+static MACHINE_CONFIG_START( chexx83 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6502, MAIN_CLOCK/2)
@@ -419,5 +419,5 @@ ROM_START( faceoffh )
ROM_FILL( 0xe000, 0x2000, 0xff ) // unpopulated
ROM_END
-GAME( 1983, chexx83, 0, chexx83, chexx83, driver_device, 0, ROT270, "ICE", "Chexx (EM Bubble Hockey, 1983 1.1)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL | MACHINE_NO_SOUND )
-GAME( 1983, faceoffh, chexx83, faceoffh, chexx83, driver_device, 0, ROT270, "SoftLogic (Entertainment Enterprises, Ltd. license)", "Face-Off (EM Bubble Hockey)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, chexx83, 0, chexx83, chexx83, chexx_state, 0, ROT270, "ICE", "Chexx (EM Bubble Hockey, 1983 1.1)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL | MACHINE_NO_SOUND )
+GAME( 1983, faceoffh, chexx83, faceoffh, chexx83, chexx_state, 0, ROT270, "SoftLogic (Entertainment Enterprises, Ltd. license)", "Face-Off (EM Bubble Hockey)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/chicago.cpp b/src/mame/drivers/chicago.cpp
index d426f8ab8f7..fca5cae62f2 100644
--- a/src/mame/drivers/chicago.cpp
+++ b/src/mame/drivers/chicago.cpp
@@ -50,7 +50,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -93,7 +93,7 @@ void chicago_state::video_start()
{
}
-static MACHINE_CONFIG_START( chicago, chicago_state )
+static MACHINE_CONFIG_START( chicago )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -138,4 +138,4 @@ ROM_START( dmodrbcc )
ROM_END
-GAME( 1976, dmodrbcc, 0, chicago, 0, driver_device, 0, ROT0, "Chicago Coin", "Demolition Derby [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, dmodrbcc, 0, chicago, 0, chicago_state, 0, ROT0, "Chicago Coin", "Demolition Derby [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 33578d63850..16421b1e5de 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -394,7 +394,7 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
//#define VERBOSE_MSG
/////////////////////////
-extern const device_type JVS_MASTER;
+DECLARE_DEVICE_TYPE(JVS_MASTER, jvs_master)
class jvs_master : public jvs_host
{
@@ -406,10 +406,10 @@ public:
int received_packet(uint8_t *buffer);
};
-const device_type JVS_MASTER = device_creator<jvs_master>;
+DEFINE_DEVICE_TYPE(JVS_MASTER, jvs_master, "jvs_master", "JVS MASTER")
jvs_master::jvs_master(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : jvs_host(mconfig, JVS_MASTER, "JVS MASTER", tag, owner, clock, "jvs_master", __FILE__)
+ : jvs_host(mconfig, JVS_MASTER, tag, owner, clock)
{
}
@@ -449,7 +449,7 @@ int jvs_master::received_packet(uint8_t *buffer)
/////////////////////////
-extern const device_type OHCI_HLEAN2131QC;
+DECLARE_DEVICE_TYPE(OHCI_HLEAN2131QC, ohci_hlean2131qc_device)
class ohci_hlean2131qc_device : public device_t, public ohci_function
{
@@ -494,9 +494,9 @@ private:
} jvs;
};
-const device_type OHCI_HLEAN2131QC = device_creator<ohci_hlean2131qc_device>;
+DEFINE_DEVICE_TYPE(OHCI_HLEAN2131QC, ohci_hlean2131qc_device, "ohci_hlean2131qc", "OHCI Hlean2131qc")
-extern const device_type OHCI_HLEAN2131SC;
+DECLARE_DEVICE_TYPE(OHCI_HLEAN2131SC, ohci_hlean2131sc_device)
class ohci_hlean2131sc_device : public device_t, public ohci_function
{
@@ -532,7 +532,7 @@ private:
int step;
};
-const device_type OHCI_HLEAN2131SC = device_creator<ohci_hlean2131sc_device>;
+DEFINE_DEVICE_TYPE(OHCI_HLEAN2131SC, ohci_hlean2131sc_device, "ohci_hlean2131sc", "OHCI Hlean2131sc")
class chihiro_state : public xbox_base_state
{
@@ -784,7 +784,7 @@ const uint8_t ohci_hlean2131qc_device::strdesc1[] = { 0x0A,0x03,0x53,0x00,0x45,0
const uint8_t ohci_hlean2131qc_device::strdesc2[] = { 0x0E,0x03,0x42,0x00,0x41,0x00,0x53,0x00,0x45,0x00,0x42,0x03,0xFF,0x0B };
ohci_hlean2131qc_device::ohci_hlean2131qc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, OHCI_HLEAN2131QC, "OHCI Hlean2131qc", tag, owner, clock, "ohci_hlean2131qc", __FILE__),
+ device_t(mconfig, OHCI_HLEAN2131QC, tag, owner, clock),
ohci_function()
{
maximum_send = 0;
@@ -1102,7 +1102,7 @@ const uint8_t ohci_hlean2131sc_device::strdesc1[] = { 0x0A,0x03,0x53,0x00,0x45,0
const uint8_t ohci_hlean2131sc_device::strdesc2[] = { 0x0E,0x03,0x42,0x00,0x41,0x00,0x53,0x00,0x45,0x00,0x42,0x00,0x44,0x00 };
ohci_hlean2131sc_device::ohci_hlean2131sc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, OHCI_HLEAN2131SC, "OHCI Hlean2131sc", tag, owner, clock, "ohci_hlean2131sc", __FILE__),
+ device_t(mconfig, OHCI_HLEAN2131SC, tag, owner, clock),
ohci_function()
{
region = nullptr;
@@ -1432,14 +1432,14 @@ protected:
//**************************************************************************
// device type definition
-const device_type IDE_BASEBOARD = device_creator<ide_baseboard_device>;
+DEFINE_DEVICE_TYPE(IDE_BASEBOARD, ide_baseboard_device, "ide_baseboard", "IDE Baseboard")
//-------------------------------------------------
// ide_baseboard_device - constructor
//-------------------------------------------------
ide_baseboard_device::ide_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ata_mass_storage_device(mconfig, IDE_BASEBOARD, "IDE Baseboard", tag, owner, clock, "ide_baseboard", __FILE__)
+ : ata_mass_storage_device(mconfig, IDE_BASEBOARD, tag, owner, clock)
{
}
@@ -1755,7 +1755,7 @@ static SLOT_INTERFACE_START(ide_baseboard)
SLOT_INTERFACE("bb", IDE_BASEBOARD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_DERIVED_CLASS(chihiro_base, xbox_base, chihiro_state)
+static MACHINE_CONFIG_DERIVED(chihiro_base, xbox_base)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(chihiro_map)
MCFG_CPU_IO_MAP(chihiro_map_io)
@@ -2316,71 +2316,71 @@ ROM_START( gundcb83b )
ROM_END
/* Main board */
-/*Chihiro*/ GAME( 2002, chihiro, 0, chihiro_base, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Bios", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_IS_BIOS_ROOT )
+/*Chihiro*/ GAME( 2002, chihiro, 0, chihiro_base, chihiro, chihiro_state, 0, ROT0, "Sega", "Chihiro Bios", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_IS_BIOS_ROOT )
/* GDX-xxxx (Sega GD-ROM games) */
-/* 0001 */ GAME( 2002, hotd3, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega / Wow Entertainment", "The House of the Dead III (GDX-0001)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0002 GAME( 2003, crtaxhro, crtaxihr, chihirogd, chihiro, driver_device, 0, ROT0, "Sega / Hitmaker", "Crazy Taxi High Roller (GDX-0002)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0002A GAME( 2003, crtaxhra, crtaxihr, chihirogd, chihiro, driver_device, 0, ROT0, "Sega / Hitmaker", "Crazy Taxi High Roller (Rev A) (GDX-0002A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0002B */ GAME( 2003, crtaxihr, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega / Hitmaker", "Crazy Taxi High Roller (Rev B) (GDX-0002B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0003 GAME( 2003, vcop3o, vcop3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Virtua Cop 3 (GDX-0003)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0003A */ GAME( 2003, vcop3a, vcop3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Virtua Cop 3 (Rev A) (GDX-0003A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0003B */ GAME( 2003, vcop3, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Virtua Cop 3 (Rev B) (GDX-0003B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0004 GAME( 2003, outr2o, outr2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "OutRun 2 (GDX-0004)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-/* 0004A */ GAME( 2003, outr2, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "OutRun 2 (Rev A) (GDX-0004A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-// 0005 GAME( 2004, sgolcnpt, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Golf Club Network Pro Tour (GDX-0005)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-// 0006 GAME( 2004, mj2o, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (GDX-0006)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0006A GAME( 2004, mj2a, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev A) (GDX-0006A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0006B GAME( 2004, mj2b, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev B) (GDX-0006B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0006C */ GAME( 2004, mj2c, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev C) (GDX-0006C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0006D GAME( 2004, mj2d, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev D) (GDX-0006D)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0006E GAME( 2004, mj2e, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev E) (GDX-0006E)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0006F */ GAME( 2004, mj2f, mj2, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev F) (GDX-0006F)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0006G */ GAME( 2004, mj2, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev G) (GDX-0006G)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0007 */ GAME( 2004, ollie, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega / Amusement Vision", "Ollie King (GDX-0007)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0008 GAME( 2004, wangmidjo,wangmid, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Japan) (GDX-0008)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0008A GAME( 2004, wangmidja,wangmid, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Japan) (Rev A) (GDX-0008A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0008B */ GAME( 2004, wangmidj, wangmid, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Japan) (Rev B) (GDX-0008B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0009 GAME( 2004, wangmido, wangmid, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Export) (GDX-0009)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0009A GAME( 2004, wangmida, wangmid, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Export) (Rev A) (GDX-0009A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0009B */ GAME( 2004, wangmid, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Export) (Rev B) (GDX-0009B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0001 */ GAME( 2002, hotd3, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega / Wow Entertainment", "The House of the Dead III (GDX-0001)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0002 GAME( 2003, crtaxhro, crtaxihr, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega / Hitmaker", "Crazy Taxi High Roller (GDX-0002)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0002A GAME( 2003, crtaxhra, crtaxihr, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega / Hitmaker", "Crazy Taxi High Roller (Rev A) (GDX-0002A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0002B */ GAME( 2003, crtaxihr, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega / Hitmaker", "Crazy Taxi High Roller (Rev B) (GDX-0002B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0003 GAME( 2003, vcop3o, vcop3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Virtua Cop 3 (GDX-0003)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0003A */ GAME( 2003, vcop3a, vcop3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Virtua Cop 3 (Rev A) (GDX-0003A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0003B */ GAME( 2003, vcop3, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Virtua Cop 3 (Rev B) (GDX-0003B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0004 GAME( 2003, outr2o, outr2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "OutRun 2 (GDX-0004)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+/* 0004A */ GAME( 2003, outr2, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "OutRun 2 (Rev A) (GDX-0004A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+// 0005 GAME( 2004, sgolcnpt, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Golf Club Network Pro Tour (GDX-0005)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+// 0006 GAME( 2004, mj2o, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (GDX-0006)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0006A GAME( 2004, mj2a, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev A) (GDX-0006A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0006B GAME( 2004, mj2b, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev B) (GDX-0006B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0006C */ GAME( 2004, mj2c, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev C) (GDX-0006C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0006D GAME( 2004, mj2d, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev D) (GDX-0006D)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0006E GAME( 2004, mj2e, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev E) (GDX-0006E)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0006F */ GAME( 2004, mj2f, mj2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev F) (GDX-0006F)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0006G */ GAME( 2004, mj2, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 2 (Rev G) (GDX-0006G)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0007 */ GAME( 2004, ollie, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega / Amusement Vision", "Ollie King (GDX-0007)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0008 GAME( 2004, wangmidjo,wangmid, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Japan) (GDX-0008)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0008A GAME( 2004, wangmidja,wangmid, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Japan) (Rev A) (GDX-0008A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0008B */ GAME( 2004, wangmidj, wangmid, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Japan) (Rev B) (GDX-0008B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0009 GAME( 2004, wangmido, wangmid, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Export) (GDX-0009)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0009A GAME( 2004, wangmida, wangmid, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Export) (Rev A) (GDX-0009A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0009B */ GAME( 2004, wangmid, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune (Export) (Rev B) (GDX-0009B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
// 0010
-// 0011 GAME( 2004, outr2stjo,outr2st, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "OutRun 2 Special Tours (Japan) (GDX-0011)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-/* 0011A */ GAME( 2004, outr2stj, outr2st, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "OutRun 2 Special Tours (Japan) (Rev A) (GDX-0011A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-/* 0012 */ GAME( 2004, ghostsqo, ghostsqu, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Ghost Squad (GDX-0012)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0012A */ GAME( 2004, ghostsqu, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Ghost Squad (Rev A) (GDX-0012A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0013 */ GAME( 2005, gundamos, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Banpresto", "Gundam Battle Operating Simulator (GDX-0013)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0014 */ GAME( 2004, outr2sto, outr2st, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "OutRun 2 Special Tours (GDX-0014)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0014A */ GAME( 2004, outr2st, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "OutRun 2 Special Tours (Rev A) (GDX-0014A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0015 */ GAME( 2005, wangmid2j,wangmid2, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Japan) (GDX-0015)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0015A */ GAME( 2005, wangmid2ja,wangmid2,chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Japan) (Rev A) (GDX-0015A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0016 */ GAME( 2005, wangmid2o,wangmid2, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Export) (GDX-0016)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0016A */ GAME( 2005, wangmid2, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Export) (Rev A) (GDX-0016A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0017 GAME( 2005, mj3o, mj3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (GDX-0017)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0017A GAME( 2005, mj3a, mj3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev A) (GDX-0017A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0017B GAME( 2005, mj3b, mj3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev B) (GDX-0017B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0017C GAME( 2005, mj3c, mj3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev C) (GDX-0017C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0017D */ GAME( 2005, mj3d, mj3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev D) (GDX-0017D)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0017E GAME( 2005, mj3e, mj3, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev E) (GDX-0017E)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0017F */ GAME( 2005, mj3, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev F) (GDX-0017F)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0018 GAME( 2005, scg06nto, scg06nt, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Club Golf 2006 Next Tours (GDX-0018)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0018A */ GAME( 2005, scg06nt, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Club Golf 2006 Next Tours (Rev A) (GDX-0018A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0011 GAME( 2004, outr2stjo,outr2st, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "OutRun 2 Special Tours (Japan) (GDX-0011)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+/* 0011A */ GAME( 2004, outr2stj, outr2st, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "OutRun 2 Special Tours (Japan) (Rev A) (GDX-0011A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+/* 0012 */ GAME( 2004, ghostsqo, ghostsqu, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Ghost Squad (GDX-0012)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0012A */ GAME( 2004, ghostsqu, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Ghost Squad (Rev A) (GDX-0012A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0013 */ GAME( 2005, gundamos, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Banpresto", "Gundam Battle Operating Simulator (GDX-0013)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0014 */ GAME( 2004, outr2sto, outr2st, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "OutRun 2 Special Tours (GDX-0014)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0014A */ GAME( 2004, outr2st, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "OutRun 2 Special Tours (Rev A) (GDX-0014A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0015 */ GAME( 2005, wangmid2j,wangmid2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Japan) (GDX-0015)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0015A */ GAME( 2005, wangmid2ja,wangmid2,chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Japan) (Rev A) (GDX-0015A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0016 */ GAME( 2005, wangmid2o,wangmid2, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Export) (GDX-0016)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0016A */ GAME( 2005, wangmid2, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Namco", "Wangan Midnight Maximum Tune 2 (Export) (Rev A) (GDX-0016A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0017 GAME( 2005, mj3o, mj3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (GDX-0017)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0017A GAME( 2005, mj3a, mj3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev A) (GDX-0017A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0017B GAME( 2005, mj3b, mj3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev B) (GDX-0017B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0017C GAME( 2005, mj3c, mj3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev C) (GDX-0017C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0017D */ GAME( 2005, mj3d, mj3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev D) (GDX-0017D)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0017E GAME( 2005, mj3e, mj3, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev E) (GDX-0017E)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0017F */ GAME( 2005, mj3, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 (Rev F) (GDX-0017F)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0018 GAME( 2005, scg06nto, scg06nt, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Club Golf 2006 Next Tours (GDX-0018)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0018A */ GAME( 2005, scg06nt, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Club Golf 2006 Next Tours (Rev A) (GDX-0018A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
// 0019
// 0020
-// 0021 GAME( 2006, mj3evoo, mj3evo, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 Evolution (GDX-0021)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0021A GAME( 2006, mj3evoa, mj3evo, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 Evolution (Rev A) (GDX-0021A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0021B */ GAME( 2007, mj3evo, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 Evolution (Rev B) (GDX-0021B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0021 GAME( 2006, mj3evoo, mj3evo, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 Evolution (GDX-0021)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0021A GAME( 2006, mj3evoa, mj3evo, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 Evolution (Rev A) (GDX-0021A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0021B */ GAME( 2007, mj3evo, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Sega Network Taisen Mahjong MJ 3 Evolution (Rev B) (GDX-0021B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
// 0022
// 0023
-// 0024 GAME( 2009, ccfboxo, ccfboxa, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (GDX-0024)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0024A */ GAME( 2009, ccfboxa, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (4.01) (GDX-0024A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+// 0024 GAME( 2009, ccfboxo, ccfboxa, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (GDX-0024)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0024A */ GAME( 2009, ccfboxa, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Chihiro Firmware Update For Compact Flash Box (4.01) (GDX-0024A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
/* CDV-1xxxx (Sega network CD-ROM and DVD-ROM games) */
-/* 0005C */ GAME( 2004, questofd, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Quest of D (CDV-10005C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0010 */ GAME( 2005, gundcb79, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0079 Card Builder (CDV-10010)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0024B */ GAME( 2006, gundcb79a,gundcb79, chihirogd, chihiro, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0079 Card Builder Ver.2.02 (CDV-10024B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0026D */ GAME( 2007, qofd3, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Quest of D Oukoku no Syugosya Ver. 3.02 (CDV-10026D)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0030 */ GAME( 2007, gundcb83, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0083 Card Builder (CDV-10030)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0031 */ GAME( 2007, gundcb83a,gundcb83, chihirogd, chihiro, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0083 Card Builder Check Disk (CDV-10031)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0035B */ GAME( 2007, qofdtbk, chihiro, chihirogd, chihiro, driver_device, 0, ROT0, "Sega", "Quest of D The Battle Kingdom (CDV-10035B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-/* 0037B */ GAME( 2008, gundcb83b,gundcb83, chihirogd, chihiro, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0083 Card Builder Ver.2.10 (CDV-10037B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0005C */ GAME( 2004, questofd, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Quest of D (CDV-10005C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0010 */ GAME( 2005, gundcb79, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0079 Card Builder (CDV-10010)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0024B */ GAME( 2006, gundcb79a,gundcb79, chihirogd, chihiro, chihiro_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0079 Card Builder Ver.2.02 (CDV-10024B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0026D */ GAME( 2007, qofd3, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Quest of D Oukoku no Syugosya Ver. 3.02 (CDV-10026D)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0030 */ GAME( 2007, gundcb83, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0083 Card Builder (CDV-10030)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0031 */ GAME( 2007, gundcb83a,gundcb83, chihirogd, chihiro, chihiro_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0083 Card Builder Check Disk (CDV-10031)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0035B */ GAME( 2007, qofdtbk, chihiro, chihirogd, chihiro, chihiro_state, 0, ROT0, "Sega", "Quest of D The Battle Kingdom (CDV-10035B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+/* 0037B */ GAME( 2008, gundcb83b,gundcb83, chihirogd, chihiro, chihiro_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam 0083 Card Builder Ver.2.10 (CDV-10037B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index 755079aef68..343d1841754 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -541,7 +541,7 @@ MACHINE_RESET_MEMBER(chinagat_state,chinagat)
}
-static MACHINE_CONFIG_START( chinagat, chinagat_state )
+static MACHINE_CONFIG_START( chinagat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK / 2) /* 1.5 MHz (12MHz oscillator / 4 internally) */
@@ -582,11 +582,11 @@ static MACHINE_CONFIG_START( chinagat, chinagat_state )
MCFG_SOUND_ROUTE(0, "mono", 0.80)
MCFG_SOUND_ROUTE(1, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", 1065000, OKIM6295_PIN7_HIGH) // pin 7 not verified, clock frequency estimated with recording
+ MCFG_OKIM6295_ADD("oki", 1065000, PIN7_HIGH) // pin 7 not verified, clock frequency estimated with recording
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( saiyugoub1, chinagat_state )
+static MACHINE_CONFIG_START( saiyugoub1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
@@ -638,11 +638,11 @@ static MACHINE_CONFIG_START( saiyugoub1, chinagat_state )
MCFG_SOUND_ADD("adpcm", MSM5205, 9263750 / 24)
MCFG_MSM5205_VCLK_CB(WRITELINE(chinagat_state, saiyugoub1_m5205_irq_w)) /* Interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) /* vclk input mode (6030Hz, 4-bit) */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* vclk input mode (6030Hz, 4-bit) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( saiyugoub2, chinagat_state )
+static MACHINE_CONFIG_START( saiyugoub2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz (12MHz oscillator) */
@@ -916,8 +916,8 @@ DRIVER_INIT_MEMBER(chinagat_state,chinagat)
}
-/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS ) */
-GAME( 1988, chinagat, 0, chinagat, chinagat, chinagat_state, chinagat, ROT0, "Technos Japan (Taito / Romstar license)", "China Gate (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, saiyugou, chinagat, chinagat, chinagat, chinagat_state, chinagat, ROT0, "Technos Japan", "Sai Yu Gou Ma Roku (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, saiyugoub1, chinagat, saiyugoub1, chinagat, chinagat_state, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, saiyugoub2, chinagat, saiyugoub2, chinagat, chinagat_state, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 2)", MACHINE_SUPPORTS_SAVE )
+// ( YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS ) */
+GAME( 1988, chinagat, 0, chinagat, chinagat, chinagat_state, chinagat, ROT0, "Technos Japan (Taito / Romstar license)", "China Gate (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, saiyugou, chinagat, chinagat, chinagat, chinagat_state, chinagat, ROT0, "Technos Japan", "Sai Yu Gou Ma Roku (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, saiyugoub1, chinagat, saiyugoub1, chinagat, chinagat_state, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, saiyugoub2, chinagat, saiyugoub2, chinagat, chinagat_state, chinagat, ROT0, "bootleg", "Sai Yu Gou Ma Roku (Japan bootleg 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index 14bd5ae7cac..3a366764cee 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -495,7 +495,7 @@ DRIVER_INIT_MEMBER( chinsan_state, chinsan )
//**************************************************************************
// C1-00114-B
-static MACHINE_CONFIG_START( chinsan, chinsan_state )
+static MACHINE_CONFIG_START( chinsan )
MCFG_CPU_ADD("maincpu", MC8123, XTAL_10MHz/2) // 317-5012
MCFG_CPU_PROGRAM_MAP(chinsan_map)
MCFG_CPU_IO_MAP(chinsan_io_map)
@@ -534,7 +534,7 @@ static MACHINE_CONFIG_START( chinsan, chinsan_state )
MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(chinsan_state, adpcm_int_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) // 8kHz
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) // 8kHz
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -604,4 +604,4 @@ ROM_END
// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
GAME( 1987, chinsan, 0, chinsan, chinsan, chinsan_state, chinsan, ROT0, "Sanritsu", "Ganbare Chinsan Ooshoubu (MC-8123A, 317-5012)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mayumi, 0, mayumi, mayumi, driver_device, 0, ROT0, "Victory L.L.C.", "Kiki-Ippatsu Mayumi-chan", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mayumi, 0, mayumi, mayumi, chinsan_state, 0, ROT0, "Victory L.L.C.", "Kiki-Ippatsu Mayumi-chan", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index e2f97417977..e5197879165 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -288,7 +288,7 @@ void chqflag_state::machine_reset()
m_wheel = 0;
}
-static MACHINE_CONFIG_START( chqflag, chqflag_state )
+static MACHINE_CONFIG_START( chqflag )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
@@ -422,6 +422,6 @@ ROM_START( chqflagj )
ROM_END
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT,MONITOR,COMPANY,FULLNAME,FLAGS
-GAMEL( 1988, chqflag, 0, chqflag, chqflag, driver_device, 0, ROT90, "Konami", "Chequered Flag", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_chqflag )
-GAMEL( 1988, chqflagj, chqflag, chqflag, chqflagj, driver_device, 0, ROT90, "Konami", "Chequered Flag (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_chqflag )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS, LAYOUT
+GAMEL( 1988, chqflag, 0, chqflag, chqflag, chqflag_state, 0, ROT90, "Konami", "Chequered Flag", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_chqflag )
+GAMEL( 1988, chqflagj, chqflag, chqflag, chqflagj, chqflag_state, 0, ROT90, "Konami", "Chequered Flag (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_chqflag )
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index 32ab18639a2..c5919845220 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -351,7 +351,7 @@ ADDRESS_MAP_END
* Machine Drivers *
***************************/
-static MACHINE_CONFIG_START( chsuper, chsuper_state )
+static MACHINE_CONFIG_START( chsuper )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 4) /* HD64180RP8, 8 MHz? */
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 333b670de2d..7c696cf59b9 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -389,7 +389,7 @@ void cidelsa_state::machine_reset()
/* Machine Drivers */
-static MACHINE_CONFIG_START( destryer, cidelsa_state )
+static MACHINE_CONFIG_START( destryer )
/* basic system hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
MCFG_CPU_PROGRAM_MAP(destryer_map)
@@ -404,7 +404,7 @@ static MACHINE_CONFIG_START( destryer, cidelsa_state )
MCFG_FRAGMENT_ADD(destryer_video)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( destryera, cidelsa_state )
+static MACHINE_CONFIG_START( destryera )
/* basic system hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
MCFG_CPU_PROGRAM_MAP(destryera_map)
@@ -419,7 +419,7 @@ static MACHINE_CONFIG_START( destryera, cidelsa_state )
MCFG_FRAGMENT_ADD(destryer_video)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( altair, cidelsa_state )
+static MACHINE_CONFIG_START( altair )
/* basic system hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, ALTAIR_CHR1)
MCFG_CPU_PROGRAM_MAP(altair_map)
@@ -448,7 +448,7 @@ static MACHINE_CONFIG_START( altair, cidelsa_state )
MCFG_FRAGMENT_ADD(altair_video)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( draco, draco_state )
+static MACHINE_CONFIG_START( draco )
/* basic system hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, DRACO_CHR1)
MCFG_CPU_PROGRAM_MAP(draco_map)
@@ -532,7 +532,7 @@ ROM_END
/* Game Drivers */
-GAME( 1980, destryer, 0, destryer, destryer, driver_device, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, destryera,destryer, destryera,destryer, driver_device, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, altair, 0, altair, altair, driver_device, 0, ROT90, "Cidelsa", "Altair", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, draco, 0, draco, draco, driver_device, 0, ROT90, "Cidelsa", "Draco", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, destryer, 0, destryer, destryer, cidelsa_state, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, destryera,destryer, destryera,destryer, cidelsa_state, 0, ROT90, "Cidelsa", "Destroyer (Cidelsa) (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, altair, 0, altair, altair, cidelsa_state, 0, ROT90, "Cidelsa", "Altair", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, draco, 0, draco, draco, draco_state, 0, ROT90, "Cidelsa", "Draco", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp
index bae64d2f0d7..9f8ad15954e 100644
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@@ -149,7 +149,7 @@ READ8_MEMBER(cinemat_state::joystick_read)
return 0;
else
{
- int const xval = int16_t(m_maincpu->state_int(CCPU_X) << 4) >> 4;
+ int const xval = int16_t(m_maincpu->state_int(ccpu_cpu_device::CCPU_X) << 4) >> 4;
return ((m_mux_select ? m_analog_x : m_analog_y).read_safe(0) - xval) < 0x800;
}
}
@@ -274,7 +274,7 @@ READ8_MEMBER(cinemat_state::qb3_frame_r)
WRITE8_MEMBER(cinemat_state::qb3_ram_bank_w)
{
- membank("bank1")->set_entry(m_maincpu->state_int(CCPU_P) & 3);
+ membank("bank1")->set_entry(m_maincpu->state_int(ccpu_cpu_device::CCPU_P) & 3);
}
@@ -958,11 +958,11 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( cinemat_nojmi_4k, cinemat_state )
+static MACHINE_CONFIG_START( cinemat_nojmi_4k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CCPU, MASTER_CLOCK/4)
- MCFG_CCPU_VECTOR_FUNC(ccpu_vector_delegate(FUNC(cinemat_state::cinemat_vector_callback),(cinemat_state*)owner))
+ MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback),(cinemat_state*)owner))
MCFG_CCPU_EXTERNAL_FUNC(READ8(cinemat_state,joystick_read))
MCFG_CPU_PROGRAM_MAP(program_map_4k)
MCFG_CPU_DATA_MAP(data_map)
@@ -981,7 +981,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( cinemat_jmi_4k, cinemat_nojmi_4k )
MCFG_CPU_MODIFY("maincpu")
- MCFG_CCPU_VECTOR_FUNC(ccpu_vector_delegate(FUNC(cinemat_state::cinemat_vector_callback),(cinemat_state*)owner))
+ MCFG_CCPU_VECTOR_FUNC(ccpu_cpu_device::vector_delegate(FUNC(cinemat_state::cinemat_vector_callback),(cinemat_state*)owner))
MCFG_CCPU_EXTERNAL_FUNC(DEVREAD8("maincpu",ccpu_cpu_device,read_jmi))
MACHINE_CONFIG_END
@@ -1463,27 +1463,27 @@ DRIVER_INIT_MEMBER(cinemat_state,qb3)
*
*************************************/
-GAME( 1977, spacewar, 0, spacewar, spacewar, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Space Wars", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1978, spaceshp, spacewar,spacewar, spaceshp, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics (Sega license)", "Space Ship", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1979, barrier, 0, barrier, barrier, driver_device, 0, ORIENTATION_FLIP_X ^ ROT270, "Cinematronics (Vectorbeam license)", "Barrier", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barrier ) // developed by Cinematronics, then (when they noticed it wasn't going to be a successful game) sold to Vectorbeam, and ultimately back in the hands of Cinematronics again after they bought the dying company Vectorbeam
+GAME( 1977, spacewar, 0, spacewar, spacewar, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Space Wars", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, spaceshp, spacewar,spacewar, spaceshp, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics (Sega license)", "Space Ship", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1979, barrier, 0, barrier, barrier, cinemat_state, 0, ORIENTATION_FLIP_X ^ ROT270, "Cinematronics (Vectorbeam license)", "Barrier", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barrier ) // developed by Cinematronics, then (when they noticed it wasn't going to be a successful game) sold to Vectorbeam, and ultimately back in the hands of Cinematronics again after they bought the dying company Vectorbeam
GAME( 1979, speedfrk, 0, speedfrk, speedfrk, cinemat_state, speedfrk, ORIENTATION_FLIP_Y, "Vectorbeam", "Speed Freak", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, starhawk, 0, starhawk, starhawk, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Hawk", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, starhawk, 0, starhawk, starhawk, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Hawk", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAMEL(1979, sundance, 0, sundance, sundance, cinemat_state, sundance, ORIENTATION_FLIP_X ^ ROT270, "Cinematronics", "Sundance", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_sundance )
GAMEL(1979, tailg, 0, tailg, tailg, cinemat_state, tailg, ORIENTATION_FLIP_Y, "Cinematronics", "Tailgunner", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_tailg )
-GAME( 1979, warrior, 0, warrior, warrior, driver_device, 0, ORIENTATION_FLIP_Y, "Vectorbeam", "Warrior", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1980, armora, 0, armora, armora, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Armor Attack", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
-GAMEL(1980, armorap, armora, armora, armora, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Armor Attack (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
-GAMEL(1980, armorar, armora, armora, armora, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics (Rock-Ola license)", "Armor Attack (Rock-Ola)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
-GAME( 1980, ripoff, 0, ripoff, ripoff, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Rip Off", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1980, starcas, 0, starcas, starcas, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Castle (version 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL(1980, starcas1, starcas, starcas, starcas, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Castle (older)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL(1980, starcasp, starcas, starcas, starcas, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Castle (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL(1980, starcase, starcas, starcas, starcas, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics (Mottoeis license)", "Star Castle (Mottoeis)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL(1980, stellcas, starcas, starcas, starcas, driver_device, 0, ORIENTATION_FLIP_Y, "bootleg (Elettronolo)", "Stellar Castle (Elettronolo)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL(1981, spaceftr, starcas, starcas, starcas, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics (Zaccaria license)", "Space Fortress (Zaccaria)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL(1981, solarq, 0, solarq, solarq, driver_device, 0, ORIENTATION_FLIP_Y ^ ORIENTATION_FLIP_X, "Cinematronics", "Solar Quest", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_solarq )
+GAME( 1979, warrior, 0, warrior, warrior, cinemat_state, 0, ORIENTATION_FLIP_Y, "Vectorbeam", "Warrior", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1980, armora, 0, armora, armora, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Armor Attack", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
+GAMEL(1980, armorap, armora, armora, armora, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Armor Attack (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
+GAMEL(1980, armorar, armora, armora, armora, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics (Rock-Ola license)", "Armor Attack (Rock-Ola)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
+GAME( 1980, ripoff, 0, ripoff, ripoff, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Rip Off", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1980, starcas, 0, starcas, starcas, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Castle (version 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL(1980, starcas1, starcas, starcas, starcas, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Castle (older)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL(1980, starcasp, starcas, starcas, starcas, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "Star Castle (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL(1980, starcase, starcas, starcas, starcas, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics (Mottoeis license)", "Star Castle (Mottoeis)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL(1980, stellcas, starcas, starcas, starcas, cinemat_state, 0, ORIENTATION_FLIP_Y, "bootleg (Elettronolo)", "Stellar Castle (Elettronolo)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL(1981, spaceftr, starcas, starcas, starcas, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics (Zaccaria license)", "Space Fortress (Zaccaria)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL(1981, solarq, 0, solarq, solarq, cinemat_state, 0, ORIENTATION_FLIP_Y ^ ORIENTATION_FLIP_X, "Cinematronics", "Solar Quest", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_solarq )
GAME( 1981, boxingb, 0, boxingb, boxingb, cinemat_state, boxingb, ORIENTATION_FLIP_Y, "Cinematronics", "Boxing Bugs", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1981, wotw, 0, wotw, wotw, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "War of the Worlds", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_wotw )
-GAME( 1981, wotwc, wotw, wotwc, wotw, driver_device, 0, ORIENTATION_FLIP_Y, "Cinematronics", "War of the Worlds (color)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL(1982, demon, 0, demon, demon, driver_device, 0, ORIENTATION_FLIP_Y, "Rock-Ola", "Demon", MACHINE_SUPPORTS_SAVE, layout_demon )
+GAMEL(1981, wotw, 0, wotw, wotw, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "War of the Worlds", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_wotw )
+GAME( 1981, wotwc, wotw, wotwc, wotw, cinemat_state, 0, ORIENTATION_FLIP_Y, "Cinematronics", "War of the Worlds (color)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1982, demon, 0, demon, demon, cinemat_state, 0, ORIENTATION_FLIP_Y, "Rock-Ola", "Demon", MACHINE_SUPPORTS_SAVE, layout_demon )
GAME( 1982, qb3, 0, qb3, qb3, cinemat_state, qb3, ORIENTATION_FLIP_Y, "Rock-Ola", "QB-3 (prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp
index facf52901b5..10f3399e1ec 100644
--- a/src/mame/drivers/circus.cpp
+++ b/src/mame/drivers/circus.cpp
@@ -282,7 +282,7 @@ void circus_state::machine_reset()
}
-static MACHINE_CONFIG_START( circus, circus_state )
+static MACHINE_CONFIG_START( circus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
@@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( circus, circus_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( robotbwl, circus_state )
+static MACHINE_CONFIG_START( robotbwl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
@@ -359,7 +359,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(circus_state::crash_scanline)
m_maincpu->set_input_line(0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( crash, circus_state )
+static MACHINE_CONFIG_START( crash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
@@ -393,7 +393,7 @@ static MACHINE_CONFIG_START( crash, circus_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ripcord, circus_state )
+static MACHINE_CONFIG_START( ripcord )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_11_289MHz / 16) /* 705.562kHz */
@@ -580,9 +580,9 @@ DRIVER_INIT_MEMBER(circus_state,ripcord)
}
-GAMEL(1977, circus, 0, circus, circus, circus_state, circus, ROT0, "Exidy / Taito", "Circus / Acrobat TV", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_circus )
-GAMEL(1977, springbd, circus, circus, circus, circus_state, circus, ROT0, "bootleg (Sub-Electro)", "Springboard (bootleg of Circus)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_circus ) // looks like a text hack, but we've seen 2 identical copies so it's worth supporting
+GAMEL(1977, circus, 0, circus, circus, circus_state, circus, ROT0, "Exidy / Taito", "Circus / Acrobat TV", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_circus )
+GAMEL(1977, springbd, circus, circus, circus, circus_state, circus, ROT0, "bootleg (Sub-Electro)", "Springboard (bootleg of Circus)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_circus ) // looks like a text hack, but we've seen 2 identical copies so it's worth supporting
GAME( 1977, robotbwl, 0, robotbwl, robotbwl, circus_state, robotbwl, ROT0, "Exidy", "Robot Bowl", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAMEL(1979, crash, 0, crash, crash, circus_state, crash, ROT0, "Exidy", "Crash", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_crash )
-GAMEL(1979, smash, crash, crash, crash, circus_state, crash, ROT0, "bootleg", "Smash (Crash bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_crash ) // looks like a text hack, but it also had a different bezel
-GAME( 1979, ripcord, 0, ripcord, ripcord, circus_state, ripcord, ROT0, "Exidy", "Rip Cord", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAMEL(1979, crash, 0, crash, crash, circus_state, crash, ROT0, "Exidy", "Crash", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_crash )
+GAMEL(1979, smash, crash, crash, crash, circus_state, crash, ROT0, "bootleg", "Smash (Crash bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND, layout_crash ) // looks like a text hack, but it also had a different bezel
+GAME( 1979, ripcord, 0, ripcord, ripcord, circus_state, ripcord, ROT0, "Exidy", "Rip Cord", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index c2ca81a6df1..3be46e59f90 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -337,7 +337,7 @@ INTERRUPT_GEN_MEMBER(circusc_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( circusc, circusc_state )
+static MACHINE_CONFIG_START( circusc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, 2048000) /* 2 MHz? */
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 6d09ea0ea24..55367f347e0 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -1909,7 +1909,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::bigrun_scanline)
-static MACHINE_CONFIG_START( bigrun, cischeat_state )
+static MACHINE_CONFIG_START( bigrun )
/* basic machine hardware */
MCFG_CPU_ADD("cpu1", M68000, 10000000)
@@ -1959,11 +1959,11 @@ static MACHINE_CONFIG_START( bigrun, cischeat_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki1", STD_OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", STD_OKI_CLOCK, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
- MCFG_OKIM6295_ADD("oki2", STD_OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", STD_OKI_CLOCK, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
@@ -2087,7 +2087,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::scudhamm_scanline)
m_maincpu->set_input_line(2, HOLD_LINE);
}
-static MACHINE_CONFIG_START( scudhamm, cischeat_state )
+static MACHINE_CONFIG_START( scudhamm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, 12000000)
@@ -2117,11 +2117,11 @@ static MACHINE_CONFIG_START( scudhamm, cischeat_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
- MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
MACHINE_CONFIG_END
@@ -2174,7 +2174,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(cischeat_state::captflag_scanline)
m_maincpu->set_input_line(3, HOLD_LINE);
}
-static MACHINE_CONFIG_START( captflag, cischeat_state )
+static MACHINE_CONFIG_START( captflag )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2) // TMP68000P-12
@@ -2213,12 +2213,12 @@ static MACHINE_CONFIG_START( captflag, cischeat_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, captflag_oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
- MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, captflag_oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
@@ -3602,13 +3602,13 @@ DRIVER_INIT_MEMBER(cischeat_state, captflag)
***************************************************************************/
-GAMEL( 1989, bigrun, 0, bigrun, bigrun, cischeat_state, bigrun, ROT0, "Jaleco", "Big Run (11th Rallye version)", MACHINE_IMPERFECT_GRAPHICS, layout_cischeat ) // there's a 13th Rallye version (1991) (only on the SNES? Could just be updated title, 1989 -> 11th Paris-Dakar ...)
+GAMEL( 1989, bigrun, 0, bigrun, bigrun, cischeat_state, bigrun, ROT0, "Jaleco", "Big Run (11th Rallye version)", MACHINE_IMPERFECT_GRAPHICS, layout_cischeat ) // there's a 13th Rallye version (1991) (only on the SNES? Could just be updated title, 1989 -> 11th Paris-Dakar ...)
GAMEL( 1990, cischeat, 0, cischeat, cischeat, cischeat_state, cischeat, ROT0, "Jaleco", "Cisco Heat", MACHINE_IMPERFECT_GRAPHICS, layout_cischeat )
GAMEL( 1991, f1gpstar, 0, f1gpstar, f1gpstar, cischeat_state, f1gpstar, ROT0, "Jaleco", "Grand Prix Star (v3.0)", MACHINE_IMPERFECT_GRAPHICS, layout_f1gpstar )
GAMEL( 1991, f1gpstaro,f1gpstar, f1gpstar, f1gpstar, cischeat_state, f1gpstar, ROT0, "Jaleco", "Grand Prix Star (v2.0)", MACHINE_IMPERFECT_GRAPHICS, layout_f1gpstar )
-GAME ( 1992, armchmp2, 0, armchmp2, armchmp2, driver_device, 0, ROT270, "Jaleco", "Arm Champs II v2.6", MACHINE_IMPERFECT_GRAPHICS )
-GAME ( 1992, armchmp2o,armchmp2, armchmp2, armchmp2, driver_device, 0, ROT270, "Jaleco", "Arm Champs II v1.7", MACHINE_IMPERFECT_GRAPHICS )
-GAME ( 1992, wildplt, 0, wildplt, wildplt, cischeat_state, f1gpstar, ROT0, "Jaleco", "Wild Pilot", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // busted timings
+GAME ( 1992, armchmp2, 0, armchmp2, armchmp2, cischeat_state, 0, ROT270, "Jaleco", "Arm Champs II v2.6", MACHINE_IMPERFECT_GRAPHICS )
+GAME ( 1992, armchmp2o,armchmp2, armchmp2, armchmp2, cischeat_state, 0, ROT270, "Jaleco", "Arm Champs II v1.7", MACHINE_IMPERFECT_GRAPHICS )
+GAME ( 1992, wildplt, 0, wildplt, wildplt, cischeat_state, f1gpstar, ROT0, "Jaleco", "Wild Pilot", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // busted timings
GAMEL( 1993, f1gpstr2, 0, f1gpstr2, f1gpstr2, cischeat_state, f1gpstar, ROT0, "Jaleco", "F-1 Grand Prix Star II", MACHINE_IMPERFECT_GRAPHICS, layout_f1gpstar )
GAME ( 1993, captflag, 0, captflag, captflag, cischeat_state, captflag, ROT270, "Jaleco", "Captain Flag (Japan)", MACHINE_IMPERFECT_GRAPHICS )
-GAME ( 1994, scudhamm, 0, scudhamm, scudhamm, driver_device, 0, ROT270, "Jaleco", "Scud Hammer", MACHINE_IMPERFECT_GRAPHICS )
+GAME ( 1994, scudhamm, 0, scudhamm, scudhamm, cischeat_state, 0, ROT270, "Jaleco", "Scud Hammer", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp
index f78d856f761..366ff4a5ef0 100644
--- a/src/mame/drivers/citycon.cpp
+++ b/src/mame/drivers/citycon.cpp
@@ -186,7 +186,7 @@ void citycon_state::machine_reset()
}
-static MACHINE_CONFIG_START( citycon, citycon_state )
+static MACHINE_CONFIG_START( citycon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2048000) /* 2.048 MHz ??? */
diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp
index 410042c304c..5daba43baea 100644
--- a/src/mame/drivers/clayshoo.cpp
+++ b/src/mame/drivers/clayshoo.cpp
@@ -310,7 +310,7 @@ void clayshoo_state::machine_reset()
m_analog_port_val = 0;
}
-static MACHINE_CONFIG_START( clayshoo, clayshoo_state )
+static MACHINE_CONFIG_START( clayshoo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
@@ -360,4 +360,4 @@ ROM_END
*
*************************************/
-GAME( 1979, clayshoo, 0, clayshoo, clayshoo, driver_device, 0, ROT0, "Allied Leisure", "Clay Shoot", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, clayshoo, 0, clayshoo, clayshoo, clayshoo_state, 0, ROT0, "Allied Leisure", "Clay Shoot", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 411122659f5..5ac1b9124fd 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -734,7 +734,7 @@ static INPUT_PORTS_START( clcd )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // clears screen and goes into infinite loop
INPUT_PORTS_END
-static MACHINE_CONFIG_START(clcd, clcd_state)
+static MACHINE_CONFIG_START(clcd)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, 2000000)
MCFG_CPU_PROGRAM_MAP(clcd_mem)
@@ -840,5 +840,5 @@ ROM_START( clcd )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, clcd, 0, 0, clcd, clcd, driver_device, 0, "Commodore Business Machines", "LCD (Prototype)", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, clcd, 0, 0, clcd, clcd, clcd_state, 0, "Commodore Business Machines", "LCD (Prototype)", 0 )
diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp
index 71771216d4b..c61458986f5 100644
--- a/src/mame/drivers/cliffhgr.cpp
+++ b/src/mame/drivers/cliffhgr.cpp
@@ -674,7 +674,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( cliffhgr, cliffhgr_state )
+static MACHINE_CONFIG_START( cliffhgr )
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4MHz */
MCFG_CPU_PROGRAM_MAP(mainmem)
@@ -684,8 +684,8 @@ static MACHINE_CONFIG_START( cliffhgr, cliffhgr_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_LASERDISC_PR8210_ADD("laserdisc")
- MCFG_LASERDISC_OVERLAY_DEVICE(TMS9928A_TOTAL_HORZ, TMS9928A_TOTAL_VERT_NTSC, "tms9928a", tms9928a_device, screen_update)
- MCFG_LASERDISC_OVERLAY_CLIP(TMS9928A_HORZ_DISPLAY_START-12, TMS9928A_HORZ_DISPLAY_START+32*8+12-1, TMS9928A_VERT_DISPLAY_START_NTSC - 12, TMS9928A_VERT_DISPLAY_START_NTSC+24*8+12-1)
+ MCFG_LASERDISC_OVERLAY_DEVICE(tms9928a_device::TOTAL_HORZ, tms9928a_device::TOTAL_VERT_NTSC, "tms9928a", tms9928a_device, screen_update)
+ MCFG_LASERDISC_OVERLAY_CLIP(tms9928a_device::HORZ_DISPLAY_START-12, tms9928a_device::HORZ_DISPLAY_START+32*8+12-1, tms9928a_device::VERT_DISPLAY_START_NTSC - 12, tms9928a_device::VERT_DISPLAY_START_NTSC+24*8+12-1)
/* start with the TMS9928a video configuration */
MCFG_DEVICE_ADD( "tms9928a", TMS9128, XTAL_10_738635MHz / 2 ) /* TMS9128NL on the board */
@@ -781,7 +781,7 @@ DRIVER_INIT_MEMBER(cliffhgr_state,cliff)
*
*************************************/
-GAME( 1983, cliffhgr, 0, cliffhgr, cliffhgr, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Cliff Hanger (set 1)", 0)
-GAME( 1983, cliffhgra, cliffhgr, cliffhgr, cliffhgra, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Cliff Hanger (set 2)", 0)
-GAME( 1983, cliffhgra2,cliffhgr, cliffhgr, cliffhgra, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Cliff Hanger (set 3)", 0)
-GAME( 1983, goaltogo, 0, cliffhgr, goaltogo, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Goal To Go", MACHINE_NOT_WORKING)
+GAME( 1983, cliffhgr, 0, cliffhgr, cliffhgr, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Cliff Hanger (set 1)", 0 )
+GAME( 1983, cliffhgra, cliffhgr, cliffhgr, cliffhgra, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Cliff Hanger (set 2)", 0 )
+GAME( 1983, cliffhgra2,cliffhgr, cliffhgr, cliffhgra, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Cliff Hanger (set 3)", 0 )
+GAME( 1983, goaltogo, 0, cliffhgr, goaltogo, cliffhgr_state, cliff, ROT0, "Stern Electronics", "Goal To Go", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 1d2b38bb31f..ecaba50da9f 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -313,7 +313,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( cloak, cloak_state )
+static MACHINE_CONFIG_START( cloak )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
@@ -605,11 +605,11 @@ ROM_END
*
*************************************/
-GAME( 1983, cloak, 0, cloak, cloak, driver_device, 0, ROT0, "Atari", "Cloak & Dagger (rev 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, cloaksp, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Cloak & Dagger (Spanish)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, cloakfr, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Cloak & Dagger (French)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, cloakgr, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Cloak & Dagger (German)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, agentx4, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Agent X (prototype, rev 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, agentx3, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Agent X (prototype, rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, agentx2, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Agent X (prototype, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, agentx1, cloak, cloak, cloak, driver_device, 0, ROT0, "Atari", "Agent X (prototype, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cloak, 0, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Cloak & Dagger (rev 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cloaksp, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Cloak & Dagger (Spanish)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cloakfr, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Cloak & Dagger (French)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cloakgr, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Cloak & Dagger (German)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, agentx4, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Agent X (prototype, rev 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, agentx3, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Agent X (prototype, rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, agentx2, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Agent X (prototype, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, agentx1, cloak, cloak, cloak, cloak_state, 0, ROT0, "Atari", "Agent X (prototype, rev 1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index a50ff3ad021..3137af7189d 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -404,7 +404,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( cloud9, cloud9_state )
+static MACHINE_CONFIG_START( cloud9 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
@@ -498,5 +498,5 @@ ROM_END
*
*************************************/
-GAME( 1983, cloud9, 0, cloud9, cloud9, driver_device, 0, ROT0, "Atari", "Cloud 9 (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, firebeas, 0, cloud9, firebeas, driver_device, 0, ROT0, "Atari", "Firebeast (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, cloud9, 0, cloud9, cloud9, cloud9_state, 0, ROT0, "Atari", "Cloud 9 (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, firebeas, 0, cloud9, firebeas, cloud9_state, 0, ROT0, "Atari", "Firebeast (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp
index dc1f154534e..d169924d2c9 100644
--- a/src/mame/drivers/clowndwn.cpp
+++ b/src/mame/drivers/clowndwn.cpp
@@ -41,7 +41,7 @@ void clowndwn_state::machine_reset()
}
-static MACHINE_CONFIG_START( clowndwn, clowndwn_state )
+static MACHINE_CONFIG_START( clowndwn )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown (vectors at end? 6xxx ?)
@@ -63,4 +63,4 @@ ROM_START( clowndwn )
ROM_LOAD( "CLWNROLL.Z9", 0x1000, 0x1000, CRC(aeef885e) SHA1(bc6805b638625a347e1288a927ce30e030afe9e3) )
ROM_END
-GAME( 1987, clowndwn, 0, clowndwn, clowndwn, driver_device, 0, ROT0, "Elwood Electronics", "Clown Roll Down (Elwood)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, clowndwn, 0, clowndwn, clowndwn, clowndwn_state, 0, ROT0, "Elwood Electronics", "Clown Roll Down (Elwood)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index 548d52fe5e2..561bb2ef758 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -246,7 +246,7 @@ static GFXDECODE_START( clpoker )
GFXDECODE_END
-static MACHINE_CONFIG_START( clpoker, clpoker_state )
+static MACHINE_CONFIG_START( clpoker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 3) // Z0840004PSC, divider not verified
MCFG_CPU_PROGRAM_MAP(prg_map)
@@ -308,4 +308,4 @@ ROM_START( clpoker )
ROM_END
-GAME( 1994, clpoker, 0, clpoker, clpoker, driver_device, 0, ROT0, "Chain Leisure", "Poker Genius", MACHINE_SUPPORTS_SAVE ) // Year taken from string in main CPU ROM
+GAME( 1994, clpoker, 0, clpoker, clpoker, clpoker_state, 0, ROT0, "Chain Leisure", "Poker Genius", MACHINE_SUPPORTS_SAVE ) // Year taken from string in main CPU ROM
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index 156e7095829..ebc199ff253 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -276,7 +276,7 @@ INTERRUPT_GEN_MEMBER(clshroad_state::sound_timer_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( firebatl, clshroad_state )
+static MACHINE_CONFIG_START( firebatl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) /* ? */
@@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( firebatl, clshroad_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( clshroad, clshroad_state )
+static MACHINE_CONFIG_START( clshroad )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK) /* ? real speed unknown. 3MHz is too low and causes problems */
@@ -571,6 +571,6 @@ die once, it would be nice to avoid the hack however
}
GAME( 1984, firebatl, 0, firebatl, firebatl, clshroad_state, firebatl, ROT90, "Wood Place Inc. (Taito license)", "Fire Battle", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1986, clshroad, 0, clshroad, clshroad, driver_device, 0, ROT0, "Wood Place Inc.", "Clash-Road", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, clshroads,clshroad, clshroad, clshroad, driver_device, 0, ROT0, "Wood Place Inc. (Status Game Corp. license)", "Clash-Road (Status license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, clshroadd,clshroad, clshroad, clshroad, driver_device, 0, ROT0, "Wood Place Inc. (Data East license)", "Clash-Road (Data East license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, clshroad, 0, clshroad, clshroad, clshroad_state, 0, ROT0, "Wood Place Inc.", "Clash-Road", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, clshroads,clshroad, clshroad, clshroad, clshroad_state, 0, ROT0, "Wood Place Inc. (Status Game Corp. license)", "Clash-Road (Status license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, clshroadd,clshroad, clshroad, clshroad, clshroad_state, 0, ROT0, "Wood Place Inc. (Data East license)", "Clash-Road (Data East license)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cm1800.cpp b/src/mame/drivers/cm1800.cpp
index c2e9d97ef8e..621b45de5bc 100644
--- a/src/mame/drivers/cm1800.cpp
+++ b/src/mame/drivers/cm1800.cpp
@@ -43,19 +43,22 @@ class cm1800_state : public driver_device
{
public:
cm1800_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_terminal(*this, TERMINAL_TAG) ,
- m_maincpu(*this, "maincpu")
+ : driver_device(mconfig, type, tag)
+ , m_terminal(*this, TERMINAL_TAG)
+ , m_maincpu(*this, "maincpu")
{
}
DECLARE_READ8_MEMBER( term_status_r );
DECLARE_READ8_MEMBER( term_r );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
+
+protected:
+ virtual void machine_reset() override;
+
uint8_t m_term_data;
required_device<generic_terminal_device> m_terminal;
- virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
};
@@ -71,7 +74,7 @@ READ8_MEMBER( cm1800_state::term_r )
return ret;
}
-WRITE8_MEMBER( cm1800_state::kbd_put )
+void cm1800_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -97,7 +100,7 @@ void cm1800_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( cm1800, cm1800_state )
+static MACHINE_CONFIG_START( cm1800 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(cm1800_mem)
@@ -106,7 +109,7 @@ static MACHINE_CONFIG_START( cm1800, cm1800_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(cm1800_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(cm1800_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -117,5 +120,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, cm1800, 0, 0, cm1800, cm1800, driver_device, 0, "<unknown>", "CM-1800", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1981, cm1800, 0, 0, cm1800, cm1800, cm1800_state, 0, "<unknown>", "CM-1800", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index 96e9ed2dec3..ea224fff911 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -219,7 +219,6 @@ static const int ch_int_levels[8] =
class cmi01a_device : public device_t, public device_sound_interface {
public:
cmi01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- cmi01a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
static void set_channel_number(device_t &device, int channel) { dynamic_cast<cmi01a_device&>(device).m_channel = channel; }
@@ -298,10 +297,10 @@ private:
int m_irq_state;
};
-const device_type CMI01A_CHANNEL_CARD = device_creator<cmi01a_device>;
+DEFINE_DEVICE_TYPE(CMI01A_CHANNEL_CARD, cmi01a_device, "cmi_01a", "Fairlight CMI-01A Channel Card")
cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CMI01A_CHANNEL_CARD, "Fairlight CMI-01A Channel Card", tag, owner, clock, "cmi_01a", __FILE__)
+ : device_t(mconfig, CMI01A_CHANNEL_CARD, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, m_pia_0(*this, "cmi01a_pia_0")
, m_pia_1(*this, "cmi01a_pia_1")
@@ -601,7 +600,7 @@ protected:
required_memory_region m_qfc9_region;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
- required_device<fd1791_t> m_wd1791;
+ required_device<fd1791_device> m_wd1791;
required_device_array<cmi01a_device, 8> m_channels;
@@ -2745,7 +2744,7 @@ static SLOT_INTERFACE_START( cmi2x_floppies )
SLOT_INTERFACE( "8dssd", FLOPPY_8_DSSD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( cmi2x, cmi_state )
+static MACHINE_CONFIG_START( cmi2x )
MCFG_CPU_ADD("maincpu1", M6809E, Q209_CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(maincpu1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cmi_state, cmi_iix_vblank)
diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp
index 9b43af914f3..e5a4b32074c 100644
--- a/src/mame/drivers/cmmb.cpp
+++ b/src/mame/drivers/cmmb.cpp
@@ -381,7 +381,7 @@ void cmmb_state::machine_reset()
}
-static MACHINE_CONFIG_START( cmmb, cmmb_state )
+static MACHINE_CONFIG_START( cmmb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65SC02, MAIN_CLOCK/5) // Unknown clock, but chip rated for 14MHz
@@ -423,4 +423,4 @@ ROM_START( cmmb162 )
ROM_REGION( 0x1000, "gfx", ROMREGION_ERASE00 )
ROM_END
-GAME( 2002, cmmb162, 0, cmmb, cmmb, driver_device, 0, ROT270, "Cosmodog / Team Play (Licensed from Infogrames via Midway Games West)", "Centipede / Millipede / Missile Command / Let's Go Bowling (rev 1.62)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2002, cmmb162, 0, cmmb, cmmb, cmmb_state, 0, ROT270, "Cosmodog / Team Play (Licensed from Infogrames via Midway Games West)", "Centipede / Millipede / Missile Command / Let's Go Bowling (rev 1.62)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index eb496bb7ba9..eabf178c61c 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -845,7 +845,7 @@ void cninja_state::machine_reset()
m_irq_mask = 0;
}
-static MACHINE_CONFIG_START( cninja, cninja_state )
+static MACHINE_CONFIG_START( cninja )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -924,15 +924,15 @@ static MACHINE_CONFIG_START( cninja, cninja_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( stoneage, cninja_state )
+static MACHINE_CONFIG_START( stoneage )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1010,10 +1010,10 @@ static MACHINE_CONFIG_START( stoneage, cninja_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -1023,7 +1023,7 @@ static MACHINE_CONFIG_DERIVED( cninjabl2, stoneage )
MCFG_SCREEN_UPDATE_DRIVER(cninja_state, screen_update_cninjabl2)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cninjabl, cninja_state )
+static MACHINE_CONFIG_START( cninjabl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1090,12 +1090,12 @@ static MACHINE_CONFIG_START( cninjabl, cninja_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( edrandy, cninja_state )
+static MACHINE_CONFIG_START( edrandy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1173,15 +1173,15 @@ static MACHINE_CONFIG_START( edrandy, cninja_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( robocop2, cninja_state )
+static MACHINE_CONFIG_START( robocop2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -1263,17 +1263,17 @@ static MACHINE_CONFIG_START( robocop2, cninja_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mutantf, cninja_state )
+static MACHINE_CONFIG_START( mutantf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -1353,11 +1353,11 @@ static MACHINE_CONFIG_START( mutantf, cninja_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
@@ -2326,26 +2326,26 @@ DRIVER_INIT_MEMBER(cninja_state,mutantf)
/**********************************************************************************/
-GAME( 1990, edrandy, 0, edrandy, edrandy, driver_device, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (World ver 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, edrandy2, edrandy, edrandy, edrandc, driver_device, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (World ver 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, edrandy1, edrandy, edrandy, edrandc, driver_device, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (World ver 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, edrandyj, edrandy, edrandy, edrandc, driver_device, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (Japan ver 3)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, cninja, 0, cninja, cninja, cninja_state, cninja, ROT0, "Data East Corporation", "Caveman Ninja (World ver 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, cninja1, cninja, cninja, cninja, cninja_state, cninja, ROT0, "Data East Corporation", "Caveman Ninja (World ver 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, cninjau, cninja, cninja, cninjau, cninja_state, cninja, ROT0, "Data East Corporation", "Caveman Ninja (US ver 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, joemac, cninja, cninja, cninja, cninja_state, cninja, ROT0, "Data East Corporation", "Tatakae Genshizin Joe & Mac (Japan ver 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, stoneage, cninja, stoneage, cninja, cninja_state, stoneage, ROT0, "bootleg", "Stoneage (bootleg of Caveman Ninja)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, cninjabl, cninja, cninjabl, cninja, driver_device, 0, ROT0, "bootleg", "Caveman Ninja (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, cninjabl2,cninja, cninjabl2,cninja, cninja_state, cninjabl2,ROT0, "bootleg", "Tatakae Genshizin Joe & Mac (Japan, bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // tile layers need adjusting, sound is wrong
-
-GAME( 1991, robocop2, 0, robocop2, robocop2, driver_device, 0, ROT0, "Data East Corporation", "Robocop 2 (Euro/Asia v0.10)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, robocop2u,robocop2,robocop2, robocop2, driver_device, 0, ROT0, "Data East Corporation", "Robocop 2 (US v0.10)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, robocop2ua,robocop2,robocop2,robocop2, driver_device, 0, ROT0, "Data East Corporation", "Robocop 2 (US v0.05)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, robocop2j,robocop2,robocop2, robocop2, driver_device, 0, ROT0, "Data East Corporation", "Robocop 2 (Japan v0.11)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1992, mutantf, 0, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mutantf4, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mutantf3, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mutantf2, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, deathbrd, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Death Brade (Japan ver JM-3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, edrandy, 0, edrandy, edrandy, cninja_state, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (World ver 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, edrandy2, edrandy, edrandy, edrandc, cninja_state, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (World ver 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, edrandy1, edrandy, edrandy, edrandc, cninja_state, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (World ver 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, edrandyj, edrandy, edrandy, edrandc, cninja_state, 0, ROT0, "Data East Corporation", "The Cliffhanger - Edward Randy (Japan ver 3)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, cninja, 0, cninja, cninja, cninja_state, cninja, ROT0, "Data East Corporation", "Caveman Ninja (World ver 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, cninja1, cninja, cninja, cninja, cninja_state, cninja, ROT0, "Data East Corporation", "Caveman Ninja (World ver 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, cninjau, cninja, cninja, cninjau, cninja_state, cninja, ROT0, "Data East Corporation", "Caveman Ninja (US ver 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, joemac, cninja, cninja, cninja, cninja_state, cninja, ROT0, "Data East Corporation", "Tatakae Genshizin Joe & Mac (Japan ver 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, stoneage, cninja, stoneage, cninja, cninja_state, stoneage, ROT0, "bootleg", "Stoneage (bootleg of Caveman Ninja)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, cninjabl, cninja, cninjabl, cninja, cninja_state, 0, ROT0, "bootleg", "Caveman Ninja (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, cninjabl2,cninja, cninjabl2,cninja, cninja_state, cninjabl2,ROT0, "bootleg", "Tatakae Genshizin Joe & Mac (Japan, bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // tile layers need adjusting, sound is wrong
+
+GAME( 1991, robocop2, 0, robocop2, robocop2, cninja_state, 0, ROT0, "Data East Corporation", "Robocop 2 (Euro/Asia v0.10)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, robocop2u,robocop2, robocop2, robocop2, cninja_state, 0, ROT0, "Data East Corporation", "Robocop 2 (US v0.10)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, robocop2ua,robocop2,robocop2, robocop2, cninja_state, 0, ROT0, "Data East Corporation", "Robocop 2 (US v0.05)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, robocop2j,robocop2, robocop2, robocop2, cninja_state, 0, ROT0, "Data East Corporation", "Robocop 2 (Japan v0.11)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1992, mutantf, 0, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mutantf4, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mutantf3, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mutantf2, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Mutant Fighter (World ver EM-2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, deathbrd, mutantf, mutantf, mutantf, cninja_state, mutantf, ROT0, "Data East Corporation", "Death Brade (Japan ver JM-3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index 56884656be3..20e63ae41df 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -904,7 +904,7 @@ MACHINE_RESET_MEMBER(cntsteer_state,cntsteer)
MACHINE_RESET_CALL_MEMBER(zerotrgt);
}
-static MACHINE_CONFIG_START( cntsteer, cntsteer_state )
+static MACHINE_CONFIG_START( cntsteer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */
@@ -958,7 +958,7 @@ static MACHINE_CONFIG_START( cntsteer, cntsteer_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( zerotrgt, cntsteer_state )
+static MACHINE_CONFIG_START( zerotrgt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ? */
@@ -1221,7 +1221,7 @@ DRIVER_INIT_MEMBER(cntsteer_state,zerotrgt)
/***************************************************************************/
-GAME( 1985, zerotrgt, 0, zerotrgt, zerotrgt, cntsteer_state, zerotrgt, ROT0, "Data East Corporation", "Zero Target (World, CW)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+GAME( 1985, zerotrgt, 0, zerotrgt, zerotrgt, cntsteer_state, zerotrgt, ROT0, "Data East Corporation", "Zero Target (World, CW)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
GAME( 1985, zerotrgta, zerotrgt, zerotrgt, zerotrgta, cntsteer_state, zerotrgt, ROT0, "Data East Corporation", "Zero Target (World, CT)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gekitsui, zerotrgt, zerotrgt, zerotrgta, cntsteer_state, zerotrgt, ROT0, "Data East Corporation", "Gekitsui Oh (Japan)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
-GAME( 1985, cntsteer, 0, cntsteer, cntsteer, cntsteer_state, zerotrgt, ROT270, "Data East Corporation", "Counter Steer (Japan)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_WRONG_COLORS|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gekitsui, zerotrgt, zerotrgt, zerotrgta, cntsteer_state, zerotrgt, ROT0, "Data East Corporation", "Gekitsui Oh (Japan)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
+GAME( 1985, cntsteer, 0, cntsteer, cntsteer, cntsteer_state, zerotrgt, ROT270, "Data East Corporation", "Counter Steer (Japan)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND|MACHINE_WRONG_COLORS|MACHINE_NO_COCKTAIL|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 84dbf06dc1c..1f99a30083c 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -512,10 +512,10 @@ private:
optional_ioport_array<2> m_player_ports;
};
-const device_type COBRA_JVS = device_creator<cobra_jvs>;
+DEFINE_DEVICE_TYPE(COBRA_JVS, cobra_jvs, "cobra_jvs", "JVS (COBRA)")
cobra_jvs::cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : jvs_device(mconfig, COBRA_JVS, "JVS (COBRA)", tag, owner, clock, "cobra_jvs", __FILE__),
+ : jvs_device(mconfig, COBRA_JVS, tag, owner, clock),
m_test_port(*this, ":TEST"),
m_player_ports(*this, {":P1", ":P2"})
{
@@ -640,10 +640,10 @@ private:
int m_send_ptr;
};
-const device_type COBRA_JVS_HOST = device_creator<cobra_jvs_host>;
+DEFINE_DEVICE_TYPE(COBRA_JVS_HOST, cobra_jvs_host, "cobra_jvs_host", "JVS-HOST (COBRA)")
cobra_jvs_host::cobra_jvs_host(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : jvs_host(mconfig, COBRA_JVS_HOST, "JVS-HOST (COBRA)", tag, owner, clock, "cobra_jvs_host", __FILE__)
+ : jvs_host(mconfig, COBRA_JVS_HOST, tag, owner, clock)
{
m_send_ptr = 0;
}
@@ -3318,7 +3318,7 @@ void cobra_state::machine_reset()
dmadac_set_frequency(&m_dmadac[1], 1, 44100);
}
-static MACHINE_CONFIG_START( cobra, cobra_state )
+static MACHINE_CONFIG_START( cobra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC603, 100000000) /* 603EV, 100? MHz */
@@ -3656,5 +3656,5 @@ ROM_END
/*************************************************************************/
-GAME( 1997, bujutsu, 0, cobra, cobra, cobra_state, bujutsu, ROT0, "Konami", "Fighting Bujutsu", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, racjamdx, 0, cobra, cobra, cobra_state, racjamdx, ROT0, "Konami", "Racing Jam DX", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, bujutsu, 0, cobra, cobra, cobra_state, bujutsu, ROT0, "Konami", "Fighting Bujutsu", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, racjamdx, 0, cobra, cobra, cobra_state, racjamdx, ROT0, "Konami", "Racing Jam DX", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 208bb6ad7d6..2baae4d8efb 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -298,7 +298,7 @@ DEVICE_INPUT_DEFAULTS_END
// MACHINE_CONFIG
//-------------------------------------------------
-static MACHINE_CONFIG_START( coco, coco12_state )
+static MACHINE_CONFIG_START( coco )
MCFG_DEVICE_MODIFY(":")
MCFG_DEVICE_CLOCK(XTAL_3_579545MHz)
@@ -465,12 +465,12 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1980, coco, 0, 0, coco, coco, driver_device, 0, "Tandy Radio Shack", "Color Computer", 0)
-COMP( 1981, cocoe, coco, 0, cocoe, coco, driver_device, 0, "Tandy Radio Shack", "Color Computer (Extended BASIC 1.0)", 0)
-COMP( 1983, coco2, coco, 0, coco2, coco, driver_device, 0, "Tandy Radio Shack", "Color Computer 2", 0)
-COMP( 1985?, coco2b, coco, 0, coco2b, coco, driver_device, 0, "Tandy Radio Shack", "Color Computer 2B", 0)
-COMP( 1984, cp400, coco, 0, cp400, coco, driver_device, 0, "Prologica", "CP400", 0)
-COMP( 1984, lzcolor64, coco, 0, coco, coco, driver_device, 0, "Digiponto", "LZ Color64", 0)
-COMP( 1984, mx1600, coco, 0, coco, coco, driver_device, 0, "Dynacom", "MX-1600", 0)
-COMP( 1986, t4426, coco, 0, t4426, coco, driver_device, 0, "Terco AB", "Terco 4426 CNC Programming station", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, coco, 0, 0, coco, coco, coco12_state, 0, "Tandy Radio Shack", "Color Computer", 0 )
+COMP( 1981, cocoe, coco, 0, cocoe, coco, coco12_state, 0, "Tandy Radio Shack", "Color Computer (Extended BASIC 1.0)", 0 )
+COMP( 1983, coco2, coco, 0, coco2, coco, coco12_state, 0, "Tandy Radio Shack", "Color Computer 2", 0 )
+COMP( 1985?, coco2b, coco, 0, coco2b, coco, coco12_state, 0, "Tandy Radio Shack", "Color Computer 2B", 0 )
+COMP( 1984, cp400, coco, 0, cp400, coco, coco12_state, 0, "Prologica", "CP400", 0 )
+COMP( 1984, lzcolor64, coco, 0, coco, coco, coco12_state, 0, "Digiponto", "LZ Color64", 0 )
+COMP( 1984, mx1600, coco, 0, coco, coco, coco12_state, 0, "Dynacom", "MX-1600", 0 )
+COMP( 1986, t4426, coco, 0, t4426, coco, coco12_state, 0, "Terco AB", "Terco 4426 CNC Programming station", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp
index 4426235a201..6253fd7b9c1 100644
--- a/src/mame/drivers/coco3.cpp
+++ b/src/mame/drivers/coco3.cpp
@@ -241,7 +241,7 @@ DEVICE_INPUT_DEFAULTS_END
// MACHINE CONFIGURATION
//**************************************************************************
-static MACHINE_CONFIG_START( coco3, coco3_state )
+static MACHINE_CONFIG_START( coco3 )
MCFG_DEVICE_MODIFY(":")
MCFG_DEVICE_CLOCK(XTAL_3_579545MHz)
@@ -374,7 +374,7 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-COMP( 1986, coco3, coco, 0, coco3, coco3, driver_device, 0, "Tandy Radio Shack", "Color Computer 3 (NTSC)", 0)
-COMP( 1986, coco3p, coco, 0, coco3p, coco3, driver_device, 0, "Tandy Radio Shack", "Color Computer 3 (PAL)", 0)
-COMP( 19??, coco3h, coco, 0, coco3h, coco3, driver_device, 0, "Tandy Radio Shack", "Color Computer 3 (NTSC; HD6309)", MACHINE_UNOFFICIAL)
-COMP( 19??, coco3dw1, coco, 0, coco3dw1, coco3, driver_device, 0, "Tandy Radio Shack", "Color Computer 3 (NTSC; HDB-DOS)", MACHINE_UNOFFICIAL)
+COMP( 1986, coco3, coco, 0, coco3, coco3, coco3_state, 0, "Tandy Radio Shack", "Color Computer 3 (NTSC)", 0 )
+COMP( 1986, coco3p, coco, 0, coco3p, coco3, coco3_state, 0, "Tandy Radio Shack", "Color Computer 3 (PAL)", 0 )
+COMP( 19??, coco3h, coco, 0, coco3h, coco3, coco3_state, 0, "Tandy Radio Shack", "Color Computer 3 (NTSC; HD6309)", MACHINE_UNOFFICIAL )
+COMP( 19??, coco3dw1, coco, 0, coco3dw1, coco3, coco3_state, 0, "Tandy Radio Shack", "Color Computer 3 (NTSC; HDB-DOS)", MACHINE_UNOFFICIAL )
diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp
index e6a4f8b3fdf..e92e4258d4b 100644
--- a/src/mame/drivers/cocoloco.cpp
+++ b/src/mame/drivers/cocoloco.cpp
@@ -519,7 +519,7 @@ INPUT_PORTS_END
* Machine Drivers *
***********************************/
-static MACHINE_CONFIG_START( cocoloco, cocoloco_state )
+static MACHINE_CONFIG_START( cocoloco )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* confirmed */
@@ -632,7 +632,7 @@ DRIVER_INIT_MEMBER(cocoloco_state, cocob)
* Game Drivers *
***********************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 198?, cocoloco, 0, cocoloco, cocoloco, driver_device, 0, ROT90, "Petaco S.A.", "Coco Loco (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 198?, cocolocoa, cocoloco, cocoloco, cocolocoa, driver_device, 0, ROT90, "Recel S.A.", "Coco Loco (set 2)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 198?, cocoloco, 0, cocoloco, cocoloco, cocoloco_state, 0, ROT90, "Petaco S.A.", "Coco Loco (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 198?, cocolocoa, cocoloco, cocoloco, cocolocoa, cocoloco_state, 0, ROT90, "Recel S.A.", "Coco Loco (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 198?, cocolocob, cocoloco, cocoloco, cocoloco, cocoloco_state, cocob, ROT90, "Petaco S.A.", "Coco Loco (set 3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/codata.cpp b/src/mame/drivers/codata.cpp
index c0cfac1652c..4285ed97df7 100644
--- a/src/mame/drivers/codata.cpp
+++ b/src/mame/drivers/codata.cpp
@@ -30,7 +30,8 @@ public:
DECLARE_READ16_MEMBER(keyin_r);
DECLARE_READ16_MEMBER(status_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
private:
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -70,7 +71,7 @@ READ16_MEMBER( codata_state::status_r )
return (m_term_data) ? 0x500 : 0x400;
}
-WRITE8_MEMBER( codata_state::kbd_put )
+void codata_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -83,14 +84,14 @@ void codata_state::machine_reset()
m_maincpu->reset();
}
-static MACHINE_CONFIG_START( codata, codata_state )
+static MACHINE_CONFIG_START( codata )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(codata_mem)
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(codata_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(codata_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -109,5 +110,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, codata, 0, 0, codata, codata, driver_device, 0, "Contel Codata Corporation", "Codata", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, codata, 0, 0, codata, codata, codata_state, 0, "Contel Codata Corporation", "Codata", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index c8818ad16ae..b95ad8d7058 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -1234,7 +1234,7 @@ uint32_t coinmstr_state::screen_update_coinmstr(screen_device &screen, bitmap_in
}
-static MACHINE_CONFIG_START( coinmstr, coinmstr_state )
+static MACHINE_CONFIG_START( coinmstr )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 7 MHz.
MCFG_CPU_PROGRAM_MAP(coinmstr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", coinmstr_state, irq0_line_hold)
@@ -1550,10 +1550,10 @@ DRIVER_INIT_MEMBER(coinmstr_state,coinmstr)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1985, quizmstr, 0, quizmstr, quizmstr, coinmstr_state, coinmstr, ROT0, "Loewen Spielautomaten", "Quizmaster (German)", MACHINE_UNEMULATED_PROTECTION )
GAME( 1987, trailblz, 0, trailblz, trailblz, coinmstr_state, coinmstr, ROT0, "Coinmaster", "Trail Blazer", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING ) // or Trail Blazer 2 ?
GAME( 1989, supnudg2, 0, supnudg2, supnudg2, coinmstr_state, coinmstr, ROT0, "Coinmaster", "Super Nudger II - P173 (Version 5.21)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1990, pokeroul, 0, pokeroul, pokeroul, driver_device, 0, ROT0, "Coinmaster", "Poker Roulette (Version 8.22)", MACHINE_NOT_WORKING )
-GAME( 1985, jpcoin, 0, jpcoin, jpcoin, driver_device, 0, ROT0, "Coinmaster", "Joker Poker (Coinmaster set 1)", 0 )
-GAME( 1990, jpcoin2, 0, jpcoin, jpcoin, driver_device, 0, ROT0, "Coinmaster", "Joker Poker (Coinmaster, Amusement Only)", 0 )
+GAME( 1990, pokeroul, 0, pokeroul, pokeroul, coinmstr_state, 0, ROT0, "Coinmaster", "Poker Roulette (Version 8.22)", MACHINE_NOT_WORKING )
+GAME( 1985, jpcoin, 0, jpcoin, jpcoin, coinmstr_state, 0, ROT0, "Coinmaster", "Joker Poker (Coinmaster set 1)", 0 )
+GAME( 1990, jpcoin2, 0, jpcoin, jpcoin, coinmstr_state, 0, ROT0, "Coinmaster", "Joker Poker (Coinmaster, Amusement Only)", 0 )
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index 2cbb4927d0c..bf1d3671855 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -626,7 +626,7 @@ static ADDRESS_MAP_START( ramdac2_map, AS_0, 8, coinmvga_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( coinmvga, coinmvga_state )
+static MACHINE_CONFIG_START( coinmvga )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83007, CPU_CLOCK) /* xtal */
@@ -882,9 +882,9 @@ DRIVER_INIT_MEMBER(coinmvga_state,cmrltv75)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 2000, colorama, 0, coinmvga, coinmvga, coinmvga_state, colorama, ROT0, "Coinmaster-Gaming, Ltd.", "Colorama (P521, English)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 2000, colorama, 0, coinmvga, coinmvga, coinmvga_state, colorama, ROT0, "Coinmaster-Gaming, Ltd.", "Colorama (P521, English)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
GAME( 2000, coloramas, colorama, coinmvga, coinmvga, coinmvga_state, colorama, ROT0, "Coinmaster-Gaming, Ltd.", "Colorama (P521 V13, Spanish)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
GAME( 2001, cmrltv75, 0, coinmvga, coinmvga, coinmvga_state, cmrltv75, ROT90, "Coinmaster-Gaming, Ltd.", "Coinmaster Roulette P497 V75 (Y2K, Spanish)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 2000, cmkenosp, 0, coinmvga, coinmvga, driver_device, 0, ROT90, "Coinmaster-Gaming, Ltd.", "Coinmaster Keno (Y2K, Spanish, 2000-12-14)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 2000, cmkenospa, cmkenosp, coinmvga, coinmvga, driver_device, 0, ROT90, "Coinmaster-Gaming, Ltd.", "Coinmaster Keno (Y2K, Spanish, 2000-12-02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2000, cmkenosp, 0, coinmvga, coinmvga, coinmvga_state, 0, ROT90, "Coinmaster-Gaming, Ltd.", "Coinmaster Keno (Y2K, Spanish, 2000-12-14)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2000, cmkenospa, cmkenosp, coinmvga, coinmvga, coinmvga_state, 0, ROT90, "Coinmaster-Gaming, Ltd.", "Coinmaster Keno (Y2K, Spanish, 2000-12-02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp
index f52baf74d2f..25ed7bd6624 100644
--- a/src/mame/drivers/coleco.cpp
+++ b/src/mame/drivers/coleco.cpp
@@ -371,7 +371,7 @@ void coleco_state::machine_reset()
/* Machine Drivers */
-static MACHINE_CONFIG_START( coleco, coleco_state )
+static MACHINE_CONFIG_START( coleco )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_7_15909MHz/2) // 3.579545 MHz
@@ -487,10 +487,10 @@ ROM_END
/* System Drivers */
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-CONS( 1982, coleco, 0, 0, coleco, coleco, driver_device, 0, "Coleco", "ColecoVision (NTSC)", 0 )
-CONS( 1982, onyx, coleco, 0, coleco, coleco, driver_device, 0, "Microdigital", "Onyx (Brazil/Prototype)", 0 )
-CONS( 1983, colecop, coleco, 0, colecop, coleco, driver_device, 0, "Coleco", "ColecoVision (PAL)", 0 )
-CONS( 1986, czz50, 0, coleco, czz50, czz50, driver_device, 0, "Bit Corporation", "Chuang Zao Zhe 50", 0 )
-CONS( 1988, dina, czz50, 0, dina, czz50, driver_device, 0, "Telegames", "Dina", 0 )
-CONS( 1988, prsarcde, czz50, 0, czz50, czz50, driver_device, 0, "Telegames", "Personal Arcade", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1982, coleco, 0, 0, coleco, coleco, coleco_state, 0, "Coleco", "ColecoVision (NTSC)", 0 )
+CONS( 1982, onyx, coleco, 0, coleco, coleco, coleco_state, 0, "Microdigital", "Onyx (Brazil/Prototype)", 0 )
+CONS( 1983, colecop, coleco, 0, colecop, coleco, coleco_state, 0, "Coleco", "ColecoVision (PAL)", 0 )
+CONS( 1986, czz50, 0, coleco, czz50, czz50, coleco_state, 0, "Bit Corporation", "Chuang Zao Zhe 50", 0 )
+CONS( 1988, dina, czz50, 0, dina, czz50, coleco_state, 0, "Telegames", "Dina", 0 )
+CONS( 1988, prsarcde, czz50, 0, czz50, czz50, coleco_state, 0, "Telegames", "Personal Arcade", 0 )
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index 6db944fc147..3a2a48fb9e6 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -697,7 +697,7 @@ void combatsc_state::machine_reset()
}
/* combat school (original) */
-static MACHINE_CONFIG_START( combatsc, combatsc_state )
+static MACHINE_CONFIG_START( combatsc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
@@ -751,7 +751,7 @@ MACHINE_CONFIG_END
/* combat school (bootleg on different hardware) */
-static MACHINE_CONFIG_START( combatscb, combatsc_state )
+static MACHINE_CONFIG_START( combatscb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 3 MHz? */
@@ -791,7 +791,7 @@ static MACHINE_CONFIG_START( combatscb, combatsc_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* 8KHz playback ? */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 8KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -1004,9 +1004,9 @@ DRIVER_INIT_MEMBER(combatsc_state,combatsc)
*
*************************************/
-GAME( 1988, combatsc, 0, combatsc, combatsc, combatsc_state, combatsc, ROT0, "Konami", "Combat School (joystick)", 0 )
-GAME( 1987, combatsct, combatsc, combatsc, combatsct, driver_device, 0, ROT0, "Konami", "Combat School (trackball)", MACHINE_NOT_WORKING )
-GAME( 1987, combatscj, combatsc, combatsc, combatsct, driver_device, 0, ROT0, "Konami", "Combat School (Japan trackball)", MACHINE_NOT_WORKING )
-GAME( 1987, bootcamp, combatsc, combatsc, combatsct, driver_device, 0, ROT0, "Konami", "Boot Camp (set 1)", MACHINE_NOT_WORKING )
-GAME( 1987, bootcampa, combatsc, combatsc, combatsct, driver_device, 0, ROT0, "Konami", "Boot Camp (set 2)", MACHINE_NOT_WORKING )
-GAME( 1988, combatscb, combatsc, combatscb, combatscb, driver_device, 0, ROT0, "bootleg", "Combat School (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, combatsc, 0, combatsc, combatsc, combatsc_state, combatsc, ROT0, "Konami", "Combat School (joystick)", 0 )
+GAME( 1987, combatsct, combatsc, combatsc, combatsct, combatsc_state, 0, ROT0, "Konami", "Combat School (trackball)", MACHINE_NOT_WORKING )
+GAME( 1987, combatscj, combatsc, combatsc, combatsct, combatsc_state, 0, ROT0, "Konami", "Combat School (Japan trackball)", MACHINE_NOT_WORKING )
+GAME( 1987, bootcamp, combatsc, combatsc, combatsct, combatsc_state, 0, ROT0, "Konami", "Boot Camp (set 1)", MACHINE_NOT_WORKING )
+GAME( 1987, bootcampa, combatsc, combatsc, combatsct, combatsc_state, 0, ROT0, "Konami", "Boot Camp (set 2)", MACHINE_NOT_WORKING )
+GAME( 1988, combatscb, combatsc, combatscb, combatscb, combatsc_state, 0, ROT0, "bootleg", "Combat School (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/comebaby.cpp b/src/mame/drivers/comebaby.cpp
index 8437f6282fa..c706fdb4e93 100644
--- a/src/mame/drivers/comebaby.cpp
+++ b/src/mame/drivers/comebaby.cpp
@@ -222,7 +222,7 @@ static INPUT_PORTS_START( comebaby )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( comebaby, comebaby_state )
+static MACHINE_CONFIG_START( comebaby )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/
MCFG_CPU_PROGRAM_MAP(comebaby_map)
@@ -249,4 +249,4 @@ ROM_START(comebaby)
ROM_END
-GAME( 2000, comebaby, 0, comebaby, comebaby, driver_device, 0, ROT0, "ExPotato", "Come On Baby", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+GAME( 2000, comebaby, 0, comebaby, comebaby, comebaby_state, 0, ROT0, "ExPotato", "Come On Baby", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp
index 1a46bae8d5c..4b1c92056b7 100644
--- a/src/mame/drivers/commando.cpp
+++ b/src/mame/drivers/commando.cpp
@@ -248,7 +248,7 @@ void commando_state::machine_reset()
}
-static MACHINE_CONFIG_START( commando, commando_state )
+static MACHINE_CONFIG_START( commando )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, PHI_MAIN) // ???
diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp
index ba6f2db68b7..981ff425cda 100644
--- a/src/mame/drivers/compgolf.cpp
+++ b/src/mame/drivers/compgolf.cpp
@@ -221,7 +221,7 @@ void compgolf_state::machine_reset()
m_scrolly_hi = 0;
}
-static MACHINE_CONFIG_START( compgolf, compgolf_state )
+static MACHINE_CONFIG_START( compgolf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp
index da4699fa33b..a5f069136ea 100644
--- a/src/mame/drivers/compis.cpp
+++ b/src/mame/drivers/compis.cpp
@@ -110,7 +110,7 @@ public:
required_device<i8251_device> m_uart;
required_device<mm58274c_device> m_rtc;
required_device<cassette_image_device> m_cassette;
- required_device<compis_graphics_slot_t> m_graphics;
+ required_device<compis_graphics_slot_device> m_graphics;
required_device<isbx_slot_device> m_isbx0;
required_device<isbx_slot_device> m_isbx1;
required_device<ram_device> m_ram;
@@ -415,7 +415,7 @@ static ADDRESS_MAP_START( compis_io, AS_IO, 16, compis_state )
AM_RANGE(0x0000, 0x0007) /* PCS0 */ AM_MIRROR(0x78) AM_DEVREADWRITE8(I8255_TAG, i8255_device, read, write, 0xff00)
AM_RANGE(0x0080, 0x0087) /* PCS1 */ AM_MIRROR(0x78) AM_DEVREADWRITE8(I8253_TAG, pit8253_device, read, write, 0x00ff)
AM_RANGE(0x0100, 0x011f) /* PCS2 */ AM_MIRROR(0x60) AM_DEVREADWRITE8(MM58174A_TAG, mm58274c_device, read, write, 0x00ff)
- AM_RANGE(0x0180, 0x01ff) /* PCS3 */ AM_DEVREADWRITE(GRAPHICS_TAG, compis_graphics_slot_t, pcs3_r, pcs3_w)
+ AM_RANGE(0x0180, 0x01ff) /* PCS3 */ AM_DEVREADWRITE(GRAPHICS_TAG, compis_graphics_slot_device, pcs3_r, pcs3_w)
//AM_RANGE(0x0200, 0x0201) /* PCS4 */ AM_MIRROR(0x7e)
AM_RANGE(0x0280, 0x028f) /* PCS5 */ AM_MIRROR(0x70) AM_DEVICE(I80130_TAG, i80130_device, io_map)
AM_RANGE(0x0300, 0x030f) AM_READWRITE(pcs6_0_1_r, pcs6_0_1_w)
@@ -742,7 +742,7 @@ void compis_state::machine_reset()
// MACHINE_CONFIG( compis )
//-------------------------------------------------
-static MACHINE_CONFIG_START( compis, compis_state )
+static MACHINE_CONFIG_START( compis )
// basic machine hardware
MCFG_CPU_ADD(I80186_TAG, I80186, XTAL_15_36MHz)
MCFG_CPU_PROGRAM_MAP(compis_mem)
@@ -885,6 +885,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP(1985, compis, 0, 0, compis, compis, driver_device, 0, "Telenova", "Compis" , MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-COMP(1986, compis2, compis, 0, compis2, compis, driver_device, 0, "Telenova", "Compis II" , MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, compis, 0, 0, compis, compis, compis_state, 0, "Telenova", "Compis", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1986, compis2, compis, 0, compis2, compis, compis_state, 0, "Telenova", "Compis II", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp
index 73c565c7359..3fa20bcef25 100644
--- a/src/mame/drivers/compucolor.cpp
+++ b/src/mame/drivers/compucolor.cpp
@@ -387,7 +387,7 @@ void compucolor2_state::machine_reset()
m_rs232->write_dtr(1);
}
-static MACHINE_CONFIG_START( compucolor2, compucolor2_state )
+static MACHINE_CONFIG_START( compucolor2 )
// basic machine hardware
MCFG_CPU_ADD(I8080_TAG, I8080, XTAL_17_9712MHz/9)
MCFG_CPU_PROGRAM_MAP(compucolor2_mem)
@@ -457,4 +457,4 @@ ROM_START( compclr2 )
ROM_LOAD( "82s129.ug5", 0x00, 0x20, NO_DUMP ) // Color PROM
ROM_END
-COMP( 1977, compclr2, 0, 0, compucolor2, compucolor2, driver_device, 0, "Intelligent Systems Corporation", "Compucolor II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1977, compclr2, 0, 0, compucolor2, compucolor2, compucolor2_state, 0, "Intelligent Systems Corporation", "Compucolor II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp
index 4c9d82e83fc..88144e85a49 100644
--- a/src/mame/drivers/comquest.cpp
+++ b/src/mame/drivers/comquest.cpp
@@ -212,7 +212,7 @@ void comquest_state::machine_reset()
}
-static MACHINE_CONFIG_START( comquest, comquest_state )
+static MACHINE_CONFIG_START( comquest )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6805, 4000000) /* 4000000? */
/*MCFG_CPU_ADD("maincpu", HD63705, 4000000) instruction set looks like m6805/m6808 */
@@ -304,5 +304,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT MONITOR COMPANY FULLNAME */
-CONS( 1995, comquest, 0, 0, comquest, comquest, driver_device, 0, "Data Concepts", "ComQuest Plus (German)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1995, comquest, 0, 0, comquest, comquest, comquest_state, 0, "Data Concepts", "ComQuest Plus (German)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp
index c1925f003ef..5ebeeadefcc 100644
--- a/src/mame/drivers/comx35.cpp
+++ b/src/mame/drivers/comx35.cpp
@@ -593,9 +593,9 @@ void comx35_state::machine_reset()
// MACHINE_CONFIG( pal )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pal, comx35_state )
+static MACHINE_CONFIG_START( pal )
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1869_CPU_CLK_PAL)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_PAL)
MCFG_CPU_PROGRAM_MAP(comx35_mem)
MCFG_CPU_IO_MAP(comx35_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -609,7 +609,7 @@ static MACHINE_CONFIG_START( pal, comx35_state )
MCFG_FRAGMENT_ADD(comx35_pal_video)
// peripheral hardware
- MCFG_DEVICE_ADD(CDP1871_TAG, CDP1871, CDP1869_CPU_CLK_PAL/8)
+ MCFG_DEVICE_ADD(CDP1871_TAG, CDP1871, cdp1869_device::CPU_CLK_PAL/8)
MCFG_CDP1871_D1_CALLBACK(IOPORT("D1"))
MCFG_CDP1871_D2_CALLBACK(IOPORT("D2"))
MCFG_CDP1871_D3_CALLBACK(IOPORT("D3"))
@@ -643,9 +643,9 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( ntsc )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ntsc, comx35_state )
+static MACHINE_CONFIG_START( ntsc )
// basic system hardware
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1869_CPU_CLK_NTSC)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::CPU_CLK_NTSC)
MCFG_CPU_PROGRAM_MAP(comx35_mem)
MCFG_CPU_IO_MAP(comx35_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -659,7 +659,7 @@ static MACHINE_CONFIG_START( ntsc, comx35_state )
MCFG_FRAGMENT_ADD(comx35_ntsc_video)
// peripheral hardware
- MCFG_DEVICE_ADD(CDP1871_TAG, CDP1871, CDP1869_CPU_CLK_PAL/8)
+ MCFG_DEVICE_ADD(CDP1871_TAG, CDP1871, cdp1869_device::CPU_CLK_PAL/8)
MCFG_CDP1871_D1_CALLBACK(IOPORT("D1"))
MCFG_CDP1871_D2_CALLBACK(IOPORT("D2"))
MCFG_CDP1871_D3_CALLBACK(IOPORT("D3"))
@@ -720,6 +720,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, comx35p, 0, 0, pal, comx35, driver_device, 0, "Comx World Operations Ltd", "COMX 35 (PAL)", MACHINE_IMPERFECT_SOUND )
-COMP( 1983, comx35n, comx35p,0, ntsc, comx35, driver_device, 0, "Comx World Operations Ltd", "COMX 35 (NTSC)", MACHINE_IMPERFECT_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, comx35p, 0, 0, pal, comx35, comx35_state, 0, "Comx World Operations Ltd", "COMX 35 (PAL)", MACHINE_IMPERFECT_SOUND )
+COMP( 1983, comx35n, comx35p,0, ntsc, comx35, comx35_state, 0, "Comx World Operations Ltd", "COMX 35 (NTSC)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp
index 0bfa6f452d2..fe6f6005c76 100644
--- a/src/mame/drivers/concept.cpp
+++ b/src/mame/drivers/concept.cpp
@@ -208,7 +208,7 @@ SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( concept, concept_state )
+static MACHINE_CONFIG_START( concept )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8182000) /* 16.364 MHz / 2 */
MCFG_CPU_PROGRAM_MAP(concept_memmap)
@@ -315,5 +315,5 @@ ROM_START( concept )
ROM_LOAD16_BYTE( "mb20l.bin", 0x000001, 0x001000, CRC(b4b59de9) SHA1(3e8b8b5950b5359203c054f94af1fc5b8f0495b9) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1982, concept, 0, 0, concept, concept, driver_device, 0, "Corvus Systems", "Concept" , 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1982, concept, 0, 0, concept, concept, concept_state, 0, "Corvus Systems", "Concept" , 0 )
diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp
index 70872bf8363..d9f9440ad7c 100644
--- a/src/mame/drivers/contra.cpp
+++ b/src/mame/drivers/contra.cpp
@@ -195,7 +195,7 @@ void contra_state::machine_start()
membank("bank1")->configure_entries(0, 16, &ROM[0x10000], 0x2000);
}
-static MACHINE_CONFIG_START( contra, contra_state )
+static MACHINE_CONFIG_START( contra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz / 2 /* 3000000*4? */)
@@ -562,13 +562,13 @@ ROM_START( contrabj1 )
ROM_LOAD( "633f11.20g", 0x0300, 0x0100, CRC(14ca5e19) SHA1(eeee2f8b3d1e4acf47de1e74c4e507ff924591e7) ) /* 007121 #1 char lookup table */
ROM_END
-GAME( 1987, contra, 0, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (US / Asia, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contra1, contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (US / Asia, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contrae, contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (US / Asia, set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contraj, contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contraj1, contra, contra, contra, driver_device, 0, ROT90, "Konami", "Contra (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, gryzor, contra, contra, gryzor, driver_device, 0, ROT90, "Konami", "Gryzor (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, gryzor1, contra, contra, gryzor, driver_device, 0, ROT90, "Konami", "Gryzor (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contrab, contra, contra, contra, driver_device, 0, ROT90, "bootleg", "Contra (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contrabj, contra, contra, contra, driver_device, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, contrabj1, contra, contra, contra, driver_device, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contra, 0, contra, contra, contra_state, 0, ROT90, "Konami", "Contra (US / Asia, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contra1, contra, contra, contra, contra_state, 0, ROT90, "Konami", "Contra (US / Asia, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contrae, contra, contra, contra, contra_state, 0, ROT90, "Konami", "Contra (US / Asia, set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contraj, contra, contra, contra, contra_state, 0, ROT90, "Konami", "Contra (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contraj1, contra, contra, contra, contra_state, 0, ROT90, "Konami", "Contra (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, gryzor, contra, contra, gryzor, contra_state, 0, ROT90, "Konami", "Gryzor (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, gryzor1, contra, contra, gryzor, contra_state, 0, ROT90, "Konami", "Gryzor (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contrab, contra, contra, contra, contra_state, 0, ROT90, "bootleg", "Contra (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contrabj, contra, contra, contra, contra_state, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, contrabj1, contra, contra, contra, contra_state, 0, ROT90, "bootleg", "Contra (Japan bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp
index f92ee4a445b..ef09bce91c0 100644
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@@ -778,7 +778,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( amerdart, coolpool_state )
+static MACHINE_CONFIG_START( amerdart )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
@@ -815,7 +815,7 @@ static MACHINE_CONFIG_START( amerdart, coolpool_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( coolpool, coolpool_state )
+static MACHINE_CONFIG_START( coolpool )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
@@ -1181,11 +1181,11 @@ DRIVER_INIT_MEMBER(coolpool_state,9ballsht)
*
*************************************/
-GAME( 1989, amerdart, 0, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, amerdart2, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, amerdart3, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, coolpool, 0, coolpool, coolpool, coolpool_state, coolpool, ROT0, "Catalina", "Cool Pool", 0 )
-GAME( 1993, 9ballsht, 0, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 1)", 0 )
-GAME( 1993, 9ballsht2, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 2)", 0 )
-GAME( 1993, 9ballsht3, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 3)", 0 )
+GAME( 1989, amerdart, 0, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, amerdart2, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, amerdart3, amerdart, amerdart, amerdart, coolpool_state, amerdart, ROT0, "Ameri", "AmeriDarts (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, coolpool, 0, coolpool, coolpool, coolpool_state, coolpool, ROT0, "Catalina", "Cool Pool", 0 )
+GAME( 1993, 9ballsht, 0, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 1)", 0 )
+GAME( 1993, 9ballsht2, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 2)", 0 )
+GAME( 1993, 9ballsht3, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout (set 3)", 0 )
GAME( 1993, 9ballshtc, 9ballsht, 9ballsht, 9ballsht, coolpool_state, 9ballsht, ROT0, "E-Scape EnterMedia (Bundra license)", "9-Ball Shootout Championship", 0 )
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 3b4a1d70199..28b18846103 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -3714,7 +3714,7 @@ WRITE_LINE_MEMBER(coolridr_state::scsp2_to_sh1_irq)
#define MAIN_CLOCK XTAL_28_63636MHz
-static MACHINE_CONFIG_START( coolridr, coolridr_state )
+static MACHINE_CONFIG_START( coolridr )
MCFG_CPU_ADD("maincpu", SH2, MAIN_CLOCK) // 28 mhz
MCFG_CPU_PROGRAM_MAP(system_h1_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", coolridr_state, system_h1_main, "screen", 0, 1)
@@ -3940,5 +3940,5 @@ DRIVER_INIT_MEMBER(coolridr_state, aquastge)
m_colbase = 0;
}
-GAME( 1995, coolridr, 0, coolridr, coolridr, coolridr_state, coolridr, ROT0, "Sega", "Cool Riders",MACHINE_IMPERFECT_SOUND) // region is set in test mode, this set is for Japan, USA and Export (all regions)
-GAMEL( 1995, aquastge, 0, aquastge, aquastge, coolridr_state, aquastge, ROT0, "Sega", "Aqua Stage",MACHINE_NOT_WORKING, layout_aquastge)
+GAME ( 1995, coolridr, 0, coolridr, coolridr, coolridr_state, coolridr, ROT0, "Sega", "Cool Riders", MACHINE_IMPERFECT_SOUND) // region is set in test mode, this set is for Japan, USA and Export (all regions)
+GAMEL( 1995, aquastge, 0, aquastge, aquastge, coolridr_state, aquastge, ROT0, "Sega", "Aqua Stage", MACHINE_NOT_WORKING, layout_aquastge)
diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp
index d39649f0faa..e6ebcd6b94b 100644
--- a/src/mame/drivers/cop01.cpp
+++ b/src/mame/drivers/cop01.cpp
@@ -446,7 +446,7 @@ void cop01_state::machine_reset()
}
-static MACHINE_CONFIG_START( cop01, cop01_state )
+static MACHINE_CONFIG_START( cop01 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown clock / divider */
@@ -488,7 +488,7 @@ static MACHINE_CONFIG_START( cop01, cop01_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mightguy, cop01_state )
+static MACHINE_CONFIG_START( mightguy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAINCPU_CLOCK/2) /* unknown divider */
@@ -667,6 +667,6 @@ DRIVER_INIT_MEMBER(cop01_state,mightguy)
*
*************************************/
-GAME( 1985, cop01, 0, cop01, cop01, driver_device, 0, ROT0, "Nichibutsu", "Cop 01 (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, cop01a, cop01, cop01, cop01, driver_device, 0, ROT0, "Nichibutsu", "Cop 01 (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, mightguy, 0, mightguy, mightguy, cop01_state, mightguy, ROT270, "Nichibutsu", "Mighty Guy", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, cop01, 0, cop01, cop01, cop01_state, 0, ROT0, "Nichibutsu", "Cop 01 (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, cop01a, cop01, cop01, cop01, cop01_state, 0, ROT0, "Nichibutsu", "Cop 01 (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, mightguy, 0, mightguy, mightguy, cop01_state, mightguy, ROT270, "Nichibutsu", "Mighty Guy", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index 2ca28f682db..a8c44f360ea 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -912,7 +912,7 @@ DRIVER_INIT_MEMBER(cops_state,cops)
membank("sysbank1")->set_entry(2);
}
-static MACHINE_CONFIG_START( cops, cops_state )
+static MACHINE_CONFIG_START( cops )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6502,MAIN_CLOCK/2)
@@ -948,7 +948,7 @@ static MACHINE_CONFIG_START( cops, cops_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( revlatns, cops_state )
+static MACHINE_CONFIG_START( revlatns )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6502,MAIN_CLOCK/2)
@@ -1023,6 +1023,6 @@ ROM_START( revlatns )
ROM_END
-GAMEL( 1994, cops, 0, cops, cops, cops_state, cops, ROT0, "Atari Games", "Cops (USA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_cops )
-GAMEL( 1994, copsuk, cops,cops, cops, cops_state, cops, ROT0, "Nova Productions / Deith Leisure","Cops (UK)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_cops )
+GAMEL( 1994, cops, 0, cops, cops, cops_state, cops, ROT0, "Atari Games", "Cops (USA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_cops )
+GAMEL( 1994, copsuk, cops,cops, cops, cops_state, cops, ROT0, "Nova Productions / Deith Leisure","Cops (UK)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_cops )
GAMEL( 1994, revlatns, 0, revlatns, revlatns, cops_state, cops, ROT0, "Nova Productions", "Revelations", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_cops )
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index 5081902011f..8d6fab5b159 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -247,7 +247,7 @@ void copsnrob_state::machine_reset()
}
-static MACHINE_CONFIG_START( copsnrob, copsnrob_state )
+static MACHINE_CONFIG_START( copsnrob )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,14318180/16) /* 894886.25 kHz */
@@ -320,4 +320,4 @@ ROM_END
*
*************************************/
-GAMEL( 1976, copsnrob, 0, copsnrob, copsnrob, driver_device, 0, ROT0, "Atari", "Cops'n Robbers", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_copsnrob )
+GAMEL( 1976, copsnrob, 0, copsnrob, copsnrob, copsnrob_state, 0, ROT0, "Atari", "Cops'n Robbers", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_copsnrob )
diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp
index 7f6a48fdc22..8ea7f8695ad 100644
--- a/src/mame/drivers/corona.cpp
+++ b/src/mame/drivers/corona.cpp
@@ -1343,7 +1343,7 @@ INPUT_PORTS_END
* Machine Drivers *
*******************************************/
-static MACHINE_CONFIG_START( winner81, corona_state )
+static MACHINE_CONFIG_START( winner81 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, WC81_MAIN_XTAL/8) /* measured */
MCFG_CPU_PROGRAM_MAP(winner81_map)
@@ -1378,7 +1378,7 @@ static MACHINE_CONFIG_START( winner81, corona_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( winner82, corona_state )
+static MACHINE_CONFIG_START( winner82 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, WC82_MAIN_XTAL/8) /* measured */
MCFG_CPU_PROGRAM_MAP(winner82_map)
@@ -1412,7 +1412,7 @@ static MACHINE_CONFIG_START( winner82, corona_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( re800, corona_state )
+static MACHINE_CONFIG_START( re800 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
MCFG_CPU_PROGRAM_MAP(re800_map)
@@ -1447,7 +1447,7 @@ static MACHINE_CONFIG_START( re800, corona_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rcirulet, corona_state )
+static MACHINE_CONFIG_START( rcirulet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
MCFG_CPU_PROGRAM_MAP(re800_map)
@@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_START( rcirulet, corona_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( luckyrlt, corona_state )
+static MACHINE_CONFIG_START( luckyrlt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, RE_MAIN_XTAL/8) /* measured 2MHz */
MCFG_CPU_PROGRAM_MAP(luckyrlt_map)
@@ -1714,13 +1714,13 @@ ROM_END
* Game Drivers *
******************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAME( 1981, winner81, winner82, winner81, winner81, driver_device, 0, ROT0, "Corona Co, LTD.", "Winners Circle (81, 28*28 PCB)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, winner81b, winner82, winner82, winner82, driver_device, 0, ROT0, "Corona Co, LTD.", "Winners Circle (81, 18*22 PCB)", 0 )
-GAME( 1982, winner82, 0, winner82, winner82, driver_device, 0, ROT0, "Corona Co, LTD.", "Winners Circle (82)", 0 )
-GAME( 198?, legrandc, winner82, winner82, winner82, driver_device, 0, ROT0, "Isermatic France S.A.", "Le Grandchamps", MACHINE_IMPERFECT_COLORS )
-GAMEL( 1991, re800ea, re800v1, re800, re800, driver_device, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-800 (earlier, no attract)", 0, layout_re800 )
-GAMEL( 1991, re800v1, 0, re800, re800, driver_device, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-800 (v1.0)", 0, layout_re800 )
-GAMEL( 1991, re800v3, 0, re800, re800v3, driver_device, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-800 (v3.0)", MACHINE_IMPERFECT_COLORS, layout_re800 )
-GAMEL( 199?, rcirulet, 0, rcirulet, re800, driver_device, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RCI (6-players, Spanish)", 0, layout_re800 )
-GAMEL( 1990, luckyrlt, 0, luckyrlt, luckyrlt, driver_device, 0, ROT90, "<unknown>", "Lucky Roulette Plus (6-players, Spanish)", 0, layout_luckyrlt )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAME( 1981, winner81, winner82, winner81, winner81, corona_state, 0, ROT0, "Corona Co, LTD.", "Winners Circle (81, 28*28 PCB)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, winner81b, winner82, winner82, winner82, corona_state, 0, ROT0, "Corona Co, LTD.", "Winners Circle (81, 18*22 PCB)", 0 )
+GAME( 1982, winner82, 0, winner82, winner82, corona_state, 0, ROT0, "Corona Co, LTD.", "Winners Circle (82)", 0 )
+GAME( 198?, legrandc, winner82, winner82, winner82, corona_state, 0, ROT0, "Isermatic France S.A.", "Le Grandchamps", MACHINE_IMPERFECT_COLORS )
+GAMEL( 1991, re800ea, re800v1, re800, re800, corona_state, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-800 (earlier, no attract)", 0, layout_re800 )
+GAMEL( 1991, re800v1, 0, re800, re800, corona_state, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-800 (v1.0)", 0, layout_re800 )
+GAMEL( 1991, re800v3, 0, re800, re800v3, corona_state, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-800 (v3.0)", MACHINE_IMPERFECT_COLORS, layout_re800 )
+GAMEL( 199?, rcirulet, 0, rcirulet, re800, corona_state, 0, ROT90, "Entretenimientos GEMINIS", "Ruleta RCI (6-players, Spanish)", 0, layout_re800 )
+GAMEL( 1990, luckyrlt, 0, luckyrlt, luckyrlt, corona_state, 0, ROT90, "<unknown>", "Lucky Roulette Plus (6-players, Spanish)", 0, layout_luckyrlt )
diff --git a/src/mame/drivers/cortex.cpp b/src/mame/drivers/cortex.cpp
index fd96bc7feee..628f58b0307 100644
--- a/src/mame/drivers/cortex.cpp
+++ b/src/mame/drivers/cortex.cpp
@@ -74,7 +74,7 @@ void cortex_state::machine_reset()
m_maincpu->ready_line(ASSERT_LINE);
}
-static MACHINE_CONFIG_START( cortex, cortex_state )
+static MACHINE_CONFIG_START( cortex )
/* basic machine hardware */
/* TMS9995 CPU @ 12.0 MHz */
// Standard variant, no overflow int
@@ -102,5 +102,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, cortex, 0, 0, cortex, cortex, driver_device, 0, "Powertran Cybernetics", "Cortex", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, cortex, 0, 0, cortex, cortex, cortex_state, 0, "Powertran Cybernetics", "Cortex", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp
index 9fc7f551b86..8301e79c3ef 100644
--- a/src/mame/drivers/cosmic.cpp
+++ b/src/mame/drivers/cosmic.cpp
@@ -1000,7 +1000,7 @@ MACHINE_RESET_MEMBER(cosmic_state,cosmicg)
m_maincpu->set_input_line(INT_9980A_RESET, CLEAR_LINE);
}
-static MACHINE_CONFIG_START( cosmic, cosmic_state )
+static MACHINE_CONFIG_START( cosmic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,Z80_MASTER_CLOCK/6) /* 1.8026 MHz */
@@ -1082,7 +1082,7 @@ static MACHINE_CONFIG_DERIVED( cosmica, cosmic )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cosmicg, cosmic_state )
+static MACHINE_CONFIG_START( cosmicg )
/* basic machine hardware */
MCFG_TMS99xx_ADD("maincpu", TMS9980A, COSMICG_MASTER_CLOCK/8, cosmicg_map, cosmicg_io_map)
@@ -1597,19 +1597,19 @@ DRIVER_INIT_MEMBER(cosmic_state,panic)
}
-GAME( 1979, cosmicg, 0, cosmicg, cosmicg, cosmic_state, cosmicg, ROT270, "Universal", "Cosmic Guerilla", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL /*| MACHINE_SUPPORTS_SAVE */)
-GAME( 1979, cosmicgi, cosmicg, cosmicg, cosmicg, cosmic_state, cosmicg, ROT270, "bootleg (Inder)", "Cosmic Guerilla (Spanish bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL /*| MACHINE_SUPPORTS_SAVE */)
-GAME( 1979, cosmica, 0, cosmica, cosmica, cosmic_state, cosmica, ROT270, "Universal", "Cosmic Alien (version II)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, cosmica1, cosmica, cosmica, cosmica, cosmic_state, cosmica, ROT270, "Universal", "Cosmic Alien (first version)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, cosmica2, cosmica, cosmica, cosmica, cosmic_state, cosmica, ROT270, "Universal", "Cosmic Alien (early version II?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, nomnlnd, 0, nomnlnd, nomnlnd, cosmic_state, nomnlnd, ROT270, "Universal", "No Man's Land", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, cosmicg, 0, cosmicg, cosmicg, cosmic_state, cosmicg, ROT270, "Universal", "Cosmic Guerilla", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL /*| MACHINE_SUPPORTS_SAVE */)
+GAME( 1979, cosmicgi, cosmicg, cosmicg, cosmicg, cosmic_state, cosmicg, ROT270, "bootleg (Inder)", "Cosmic Guerilla (Spanish bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL /*| MACHINE_SUPPORTS_SAVE */)
+GAME( 1979, cosmica, 0, cosmica, cosmica, cosmic_state, cosmica, ROT270, "Universal", "Cosmic Alien (version II)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, cosmica1, cosmica, cosmica, cosmica, cosmic_state, cosmica, ROT270, "Universal", "Cosmic Alien (first version)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, cosmica2, cosmica, cosmica, cosmica, cosmic_state, cosmica, ROT270, "Universal", "Cosmic Alien (early version II?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, nomnlnd, 0, nomnlnd, nomnlnd, cosmic_state, nomnlnd, ROT270, "Universal", "No Man's Land", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1980, nomnlndg, nomnlnd, nomnlnd, nomnlndg, cosmic_state, nomnlnd, ROT270, "Universal (Gottlieb license)", "No Man's Land (Gottlieb)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, magspot, 0, magspot, magspot, driver_device, 0, ROT270, "Universal", "Magical Spot", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, magspot2, 0, magspot, magspot, driver_device, 0, ROT270, "Universal", "Magical Spot II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, panic, 0, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (version E)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, panic2, panic, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, panic3, panic, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, panich, panic, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (harder)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, panicger, panic, panic, panic, cosmic_state, panic, ROT270, "Universal (ADP Automaten license)", "Space Panic (German)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, devzone, 0, devzone, devzone, cosmic_state, devzone, ROT270, "Universal", "Devil Zone", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, magspot, 0, magspot, magspot, cosmic_state, 0, ROT270, "Universal", "Magical Spot", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, magspot2, 0, magspot, magspot, cosmic_state, 0, ROT270, "Universal", "Magical Spot II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, panic, 0, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (version E)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, panic2, panic, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, panic3, panic, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, panich, panic, panic, panic, cosmic_state, panic, ROT270, "Universal", "Space Panic (harder)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, panicger, panic, panic, panic, cosmic_state, panic, ROT270, "Universal (ADP Automaten license)", "Space Panic (German)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, devzone, 0, devzone, devzone, cosmic_state, devzone, ROT270, "Universal", "Devil Zone", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1980, devzone2, devzone, devzone, devzone2, cosmic_state, devzone, ROT270, "Universal", "Devil Zone (easier)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index 7ab8aa1e817..416c7f16624 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -499,7 +499,7 @@ QUICKLOAD_LOAD_MEMBER( cosmicos_state, cosmicos )
/* Machine Driver */
-static MACHINE_CONFIG_START( cosmicos, cosmicos_state )
+static MACHINE_CONFIG_START( cosmicos )
/* basic machine hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
MCFG_CPU_PROGRAM_MAP(cosmicos_mem)
@@ -558,5 +558,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, cosmicos, 0, 0, cosmicos, cosmicos, driver_device, 0, "Radio Bulletin", "Cosmicos", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, cosmicos, 0, 0, cosmicos, cosmicos, cosmicos_state, 0, "Radio Bulletin", "Cosmicos", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp
index 08133f1a5c3..939ccc0e358 100644
--- a/src/mame/drivers/cp1.cpp
+++ b/src/mame/drivers/cp1.cpp
@@ -251,7 +251,7 @@ QUICKLOAD_LOAD_MEMBER( cp1_state, quickload )
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( cp1, cp1_state )
+static MACHINE_CONFIG_START( cp1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8049, XTAL_6MHz)
MCFG_CPU_IO_MAP(cp1_io)
@@ -297,5 +297,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, cp1, 0, 0, cp1, cp1, driver_device, 0, "Kosmos", "CP1 / Computer Praxis", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, cp1, 0, 0, cp1, cp1, cp1_state, 0, "Kosmos", "CP1 / Computer Praxis", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 32c5bb88b24..490b6489f3c 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3298,7 +3298,7 @@ MACHINE_START_MEMBER(cps_state,qsound)
membank("bank1")->configure_entries(0, 6, memregion("audiocpu")->base() + 0x10000, 0x4000);
}
-static MACHINE_CONFIG_START( cps1_10MHz, cps_state )
+static MACHINE_CONFIG_START( cps1_10MHz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz ) /* verified on pcb */
@@ -3334,7 +3334,7 @@ static MACHINE_CONFIG_START( cps1_10MHz, cps_state )
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index e084bbbe05f..3b305d72538 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -1301,7 +1301,7 @@ MACHINE_START_MEMBER(cps_state,cps2)
}
-static MACHINE_CONFIG_START( cps2, cps_state )
+static MACHINE_CONFIG_START( cps2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -1353,7 +1353,7 @@ static MACHINE_CONFIG_DERIVED( gigaman2, cps2 )
MCFG_CPU_MODIFY("maincpu")
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
@@ -11612,7 +11612,7 @@ ROM_END
GAME( 1993, ddtodd, ddtod, dead_cps2, cps2_4p4b, cps_state, cps2, ROT0, "bootleg", "Dungeons & Dragons: Tower of Doom (Euro 940412 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ecofghtrd,ecofghtr, dead_cps2, ecofghtr, cps_state, ecofghtr, ROT0, "bootleg", "Eco Fighters (World 931203 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ecofghtrd,ecofghtr, dead_cps2, ecofghtr, cps_state, ecofghtr,ROT0, "bootleg", "Eco Fighters (World 931203 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1993, ssf2ud, ssf2, dead_cps2, cps2_2p6b, cps_state, cps2, ROT0, "bootleg", "Super Street Fighter II: The New Challengers (USA 930911 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1993, ssf2tbd, ssf2, dead_cps2, cps2_2p6b, cps_state, ssf2tb, ROT0, "bootleg", "Super Street Fighter II: The Tournament Battle (World 931119 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, armwar1d, armwar, dead_cps2, cps2_3p3b, cps_state, cps2, ROT0, "bootleg", "Armored Warriors (Euro 941011 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index 52ea9c3bf04..f2468a0bc62 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -2519,7 +2519,7 @@ static MACHINE_CONFIG_FRAGMENT( simm6_128mbit )
MCFG_FUJITSU_29F016A_ADD("simm6.7")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cps3, cps3_state )
+static MACHINE_CONFIG_START( cps3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, 6250000*4) // external clock is 6.25 Mhz, it sets the internal multiplier to 4x (this should probably be handled in the core..)
MCFG_CPU_PROGRAM_MAP(cps3_map)
@@ -3942,15 +3942,15 @@ GAME( 1999, jojobaner1,jojoba, jojoba, cps3_jojo, cps3_state, jojoba, ROT0
// bootlegs, hold START1 during bootup to change games
// newest revision, fixes some issues with Warzard decryption.
-GAME( 1999, cps3boot, 0, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "CPS3 Multi-game bootleg for HD6417095 type SH2 (V4)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, cps3boota, cps3boot, sfiii3, cps3_jojo, cps3_state, sfiii2, ROT0, "bootleg", "CPS3 Multi-game bootleg for dead security cart (V5)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, cps3boot, 0, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "CPS3 Multi-game bootleg for HD6417095 type SH2 (V4)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, cps3boota, cps3boot, sfiii3, cps3_jojo, cps3_state, sfiii2, ROT0, "bootleg", "CPS3 Multi-game bootleg for dead security cart (V5)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, cps3booto, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "CPS3 Multi-game bootleg for HD6417095 type SH2 (older)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, cps3bootao, cps3boot, sfiii3, cps3_jojo, cps3_state, sfiii2, ROT0, "bootleg", "CPS3 Multi-game bootleg for dead security cart (older)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, cps3booto, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "CPS3 Multi-game bootleg for HD6417095 type SH2 (older)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, cps3bootao, cps3boot, sfiii3, cps3_jojo, cps3_state, sfiii2, ROT0, "bootleg", "CPS3 Multi-game bootleg for dead security cart (older)", MACHINE_IMPERFECT_GRAPHICS )
// this doesn't play 2nd Impact despite it being listed. 2nd Impact uses separate data/code encryption and can't be decrypted cleanly for a standard SH2. Selecting it just flashes in a copy of 3rd Strike with the 2nd Impact loading screen
-GAME( 1999, cps3booto2, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "CPS3 Multi-game bootleg for HD6417095 type SH2 (oldest) (New Generation, 3rd Strike, JoJo's Venture, JoJo's Bizarre Adventure and Red Earth only)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, cps3booto2, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "CPS3 Multi-game bootleg for HD6417095 type SH2 (oldest) (New Generation, 3rd Strike, JoJo's Venture, JoJo's Bizarre Adventure and Red Earth only)", MACHINE_IMPERFECT_GRAPHICS )
// this does not play Red Earth or the 2 Jojo games. New Generation and 3rd Strike have been heavily modified to work with the separate code/data encryption a dead cart / 2nd Impact cart has. Selecting the other games will give an 'invalid CD' message.
GAME( 1999, cps3bootao2, cps3boot, sfiii3, cps3_jojo, cps3_state, sfiii2, ROT0, "bootleg", "CPS3 Multi-game bootleg for dead security cart (oldest) (New Generation, 2nd Impact and 3rd Strike only)", MACHINE_IMPERFECT_GRAPHICS )
// these are test bootleg CDs for running 2nd Impact on a standard SH2
-GAME( 1999, cps3bs32, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "Street Fighter III 2nd Impact: Giant Attack (USA 970930, bootleg for HD6417095 type SH2, V3)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, cps3bs32a, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "Street Fighter III 2nd Impact: Giant Attack (USA 970930, bootleg for HD6417095 type SH2, older)", MACHINE_IMPERFECT_GRAPHICS ) // older / buggier hack
+GAME( 1999, cps3bs32, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "Street Fighter III 2nd Impact: Giant Attack (USA 970930, bootleg for HD6417095 type SH2, V3)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, cps3bs32a, cps3boot, sfiii3, cps3_jojo, cps3_state, cps3boot, ROT0, "bootleg", "Street Fighter III 2nd Impact: Giant Attack (USA 970930, bootleg for HD6417095 type SH2, older)", MACHINE_IMPERFECT_GRAPHICS ) // older / buggier hack
diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp
index 0693991486f..cf54843ddbf 100644
--- a/src/mame/drivers/craft.cpp
+++ b/src/mame/drivers/craft.cpp
@@ -237,7 +237,7 @@ void craft_state::machine_reset()
m_last_cycles = 0;
}
-static MACHINE_CONFIG_START( craft, craft_state )
+static MACHINE_CONFIG_START( craft )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ATMEGA88, MASTER_CLOCK)
@@ -269,5 +269,5 @@ ROM_START( craft )
ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(e18a2af9) SHA1(81fc6f2d391edfd3244870214fac37929af0ac0c) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
CONS(2008, craft, 0, 0, craft, craft, craft_state, craft, "Linus Akesson", "Craft", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp
index 034acc2d81f..6ee061aecdc 100644
--- a/src/mame/drivers/crbaloon.cpp
+++ b/src/mame/drivers/crbaloon.cpp
@@ -359,7 +359,7 @@ INTERRUPT_GEN_MEMBER(crbaloon_state::vblank_irq)
}
-static MACHINE_CONFIG_START( crbaloon, crbaloon_state )
+static MACHINE_CONFIG_START( crbaloon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CRBALOON_MASTER_XTAL / 3)
@@ -436,5 +436,5 @@ ROM_END
*
*************************************/
-GAME( 1980, crbaloon, 0, crbaloon, crbaloon, driver_device, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, crbaloon2,crbaloon, crbaloon, crbaloon, driver_device, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, crbaloon, 0, crbaloon, crbaloon, crbaloon_state, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, crbaloon2,crbaloon, crbaloon, crbaloon, crbaloon_state, 0, ROT90, "Taito Corporation", "Crazy Balloon (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp
index 90687667347..cbfc7c691a4 100644
--- a/src/mame/drivers/crgolf.cpp
+++ b/src/mame/drivers/crgolf.cpp
@@ -492,7 +492,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( crgolf, crgolf_state )
+static MACHINE_CONFIG_START( crgolf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/3/2)
@@ -535,7 +535,7 @@ static MACHINE_CONFIG_DERIVED( crgolfhi, crgolf )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(crgolf_state, vck_callback))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -796,11 +796,11 @@ DRIVER_INIT_MEMBER(crgolf_state,crgolfhi)
*
*************************************/
-GAME( 1984, crgolf, 0, crgolf, crgolf, driver_device, 0, ROT0, "Nasco Japan", "Crowns Golf (834-5419-04)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, crgolfa, crgolf, crgolf, crgolf, driver_device, 0, ROT0, "Nasco Japan", "Crowns Golf (834-5419-03)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, crgolfb, crgolf, crgolf, crgolf, driver_device, 0, ROT0, "Nasco Japan", "Crowns Golf (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, crgolfc, crgolf, crgolf, crgolf, driver_device, 0, ROT0, "Nasco Japan", "Champion Golf", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, crgolfbt, crgolf, crgolf, crgolf, driver_device, 0, ROT0, "bootleg", "Champion Golf (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, crgolfhi, 0, crgolfhi, crgolf, crgolf_state, crgolfhi, ROT0, "Nasco Japan", "Crowns Golf in Hawaii" , MACHINE_SUPPORTS_SAVE )
+GAME( 1984, crgolf, 0, crgolf, crgolf, crgolf_state, 0, ROT0, "Nasco Japan", "Crowns Golf (834-5419-04)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, crgolfa, crgolf, crgolf, crgolf, crgolf_state, 0, ROT0, "Nasco Japan", "Crowns Golf (834-5419-03)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, crgolfb, crgolf, crgolf, crgolf, crgolf_state, 0, ROT0, "Nasco Japan", "Crowns Golf (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, crgolfc, crgolf, crgolf, crgolf, crgolf_state, 0, ROT0, "Nasco Japan", "Champion Golf", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, crgolfbt, crgolf, crgolf, crgolf, crgolf_state, 0, ROT0, "bootleg", "Champion Golf (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, crgolfhi, 0, crgolfhi, crgolf, crgolf_state, crgolfhi, ROT0, "Nasco Japan", "Crowns Golf in Hawaii", MACHINE_SUPPORTS_SAVE )
-GAME( 198?, mastrglf, 0, mastrglf, crgolf, driver_device, 0, ROT0, "Nasco", "Master's Golf", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 198?, mastrglf, 0, mastrglf, crgolf, crgolf_state, 0, ROT0, "Nasco", "Master's Golf", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index c35f32de4fb..ed3e8cf900c 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -297,7 +297,7 @@ CUSTOM_INPUT_MEMBER( crimfght_state::system_r )
return data >> 4;
}
-static MACHINE_CONFIG_START( crimfght, crimfght_state )
+static MACHINE_CONFIG_START( crimfght )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* 052001 (verified on pcb) */
@@ -435,6 +435,6 @@ ROM_END
***************************************************************************/
-GAME( 1989, crimfght, 0, crimfght, crimfght, driver_device, 0, ROT0, "Konami", "Crime Fighters (World 2 players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimfghtu, crimfght, crimfght, crimfghtu, driver_device,0, ROT0, "Konami", "Crime Fighters (US 4 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimfghtj, crimfght, crimfght, crimfght, driver_device,0, ROT0, "Konami", "Crime Fighters (Japan 2 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimfght, 0, crimfght, crimfght, crimfght_state, 0, ROT0, "Konami", "Crime Fighters (World 2 players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimfghtu, crimfght, crimfght, crimfghtu, crimfght_state, 0, ROT0, "Konami", "Crime Fighters (US 4 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimfghtj, crimfght, crimfght, crimfght, crimfght_state, 0, ROT0, "Konami", "Crime Fighters (Japan 2 Players)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index 827e20ac4bf..78b49862193 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -336,7 +336,7 @@ void crospang_state::machine_reset()
}
-static MACHINE_CONFIG_START( crospang, crospang_state )
+static MACHINE_CONFIG_START( crospang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14318180)
@@ -378,7 +378,7 @@ static MACHINE_CONFIG_START( crospang, crospang_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp
index d5716e20787..ab26cbc1f8a 100644
--- a/src/mame/drivers/crshrace.cpp
+++ b/src/mame/drivers/crshrace.cpp
@@ -418,7 +418,7 @@ void crshrace_state::machine_reset()
m_pending_command = 0;
}
-static MACHINE_CONFIG_START( crshrace, crshrace_state )
+static MACHINE_CONFIG_START( crshrace )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,16000000) /* 16 MHz ??? */
@@ -566,5 +566,5 @@ DRIVER_INIT_MEMBER(crshrace_state,crshrace2)
}
-GAME( 1993, crshrace, 0, crshrace, crshrace, crshrace_state, crshrace, ROT270, "Video System Co.", "Lethal Crash Race (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, crshrace, 0, crshrace, crshrace, crshrace_state, crshrace, ROT270, "Video System Co.", "Lethal Crash Race (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1993, crshrace2, crshrace, crshrace, crshrace2, crshrace_state, crshrace2, ROT270, "Video System Co.", "Lethal Crash Race (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index 2222abc56fd..8676d756ccf 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -731,10 +731,10 @@ static SLOT_INTERFACE_START(crvision_cart)
SLOT_INTERFACE_END
/*-------------------------------------------------
- MACHINE_CONFIG_START( creativision, crvision_state )
+ MACHINE_CONFIG_START( creativision )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( creativision, crvision_state )
+static MACHINE_CONFIG_START( creativision )
// basic machine hardware
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(crvision_map)
@@ -797,7 +797,7 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_DERIVED( pal, creativision )
-------------------------------------------------*/
-static MACHINE_CONFIG_DERIVED_CLASS( pal, creativision, crvision_pal_state )
+static MACHINE_CONFIG_DERIVED( pal, creativision )
// video hardware
MCFG_DEVICE_ADD( TMS9929_TAG, TMS9929, XTAL_10_738635MHz / 2 )
MCFG_TMS9928A_VRAM_SIZE(0x4000)
@@ -807,10 +807,10 @@ static MACHINE_CONFIG_DERIVED_CLASS( pal, creativision, crvision_pal_state )
MACHINE_CONFIG_END
/*-------------------------------------------------
- MACHINE_CONFIG_START( lasr2001, laser2001_state )
+ MACHINE_CONFIG_START( lasr2001 )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( lasr2001, laser2001_state )
+static MACHINE_CONFIG_START( lasr2001 )
// basic machine hardware
MCFG_CPU_ADD(M6502_TAG, M6502, XTAL_17_73447MHz/9)
MCFG_CPU_PROGRAM_MAP(lasr2001_map)
@@ -895,14 +895,14 @@ ROM_END
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS( 1982, crvision, 0, 0, pal, crvision, driver_device, 0, "Video Technology", "CreatiVision", 0 )
-CONS( 1982, fnvision, crvision, 0, pal, crvision, driver_device, 0, "Video Technology", "FunVision", 0 )
-CONS( 1982, crvisioj, crvision, 0, ntsc, crvision, driver_device, 0, "Cheryco", "CreatiVision (Japan)", 0 )
-CONS( 1982, wizzard, crvision, 0, pal, crvision, driver_device, 0, "Dick Smith Electronics", "Wizzard (Oceania)", 0 )
-CONS( 1982, rameses, crvision, 0, pal, crvision, driver_device, 0, "Hanimex", "Rameses (Oceania)", 0 )
-CONS( 1983, vz2000, crvision, 0, pal, crvision, driver_device, 0, "Dick Smith Electronics", "VZ 2000 (Oceania)", 0 )
-CONS( 1983, crvisio2, crvision, 0, pal, crvision, driver_device, 0, "Video Technology", "CreatiVision MK-II (Europe)", 0 )
-//COMP( 1983, lasr2001, 0, 0, lasr2001, lasr2001, driver_device, 0, "Video Technology", "Laser 2001", MACHINE_NOT_WORKING )
-//COMP( 1983, vz2001, lasr2001, 0, lasr2001, lasr2001, driver_device, 0, "Dick Smith Electronics", "VZ 2001 (Oceania)", MACHINE_NOT_WORKING )
-COMP( 1983, manager, 0, 0, lasr2001, manager, driver_device, 0, "Salora", "Manager (Finland)", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1982, crvision, 0, 0, pal, crvision, crvision_pal_state, 0, "Video Technology", "CreatiVision", 0 )
+CONS( 1982, fnvision, crvision, 0, pal, crvision, crvision_pal_state, 0, "Video Technology", "FunVision", 0 )
+CONS( 1982, crvisioj, crvision, 0, ntsc, crvision, crvision_state, 0, "Cheryco", "CreatiVision (Japan)", 0 )
+CONS( 1982, wizzard, crvision, 0, pal, crvision, crvision_pal_state, 0, "Dick Smith Electronics", "Wizzard (Oceania)", 0 )
+CONS( 1982, rameses, crvision, 0, pal, crvision, crvision_pal_state, 0, "Hanimex", "Rameses (Oceania)", 0 )
+CONS( 1983, vz2000, crvision, 0, pal, crvision, crvision_pal_state, 0, "Dick Smith Electronics", "VZ 2000 (Oceania)", 0 )
+CONS( 1983, crvisio2, crvision, 0, pal, crvision, crvision_pal_state, 0, "Video Technology", "CreatiVision MK-II (Europe)", 0 )
+//COMP( 1983, lasr2001, 0, 0, lasr2001, lasr2001, laser2001_state, 0, "Video Technology", "Laser 2001", MACHINE_NOT_WORKING )
+//COMP( 1983, vz2001, lasr2001, 0, lasr2001, lasr2001, laser2001_state, 0, "Dick Smith Electronics", "VZ 2001 (Oceania)", MACHINE_NOT_WORKING )
+COMP( 1983, manager, 0, 0, lasr2001, manager, laser2001_state, 0, "Salora", "Manager (Finland)", 0 )
diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp
index 14009bf4c37..93fe482e5b0 100644
--- a/src/mame/drivers/crystal.cpp
+++ b/src/mame/drivers/crystal.cpp
@@ -1426,7 +1426,7 @@ static INPUT_PORTS_START(crzyddz2)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( crystal, crystal_state )
+static MACHINE_CONFIG_START( crystal )
MCFG_CPU_ADD("maincpu", SE3208, 43000000)
MCFG_CPU_PROGRAM_MAP(crystal_mem)
@@ -1810,17 +1810,17 @@ DRIVER_INIT_MEMBER(crystal_state,psattack)
}
-GAME( 2001, crysbios, 0, crystal, crystal, driver_device, 0, ROT0, "BrezzaSoft", "Crystal System BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 2001, crysbios, 0, crystal, crystal, crystal_state, 0, ROT0, "BrezzaSoft", "Crystal System BIOS", MACHINE_IS_BIOS_ROOT )
GAME( 2001, crysking, crysbios, crystal, crystal, crystal_state, crysking, ROT0, "BrezzaSoft", "The Crystal of Kings", 0 )
GAME( 2001, evosocc, crysbios, crystal, crystal, crystal_state, evosocc, ROT0, "Evoga", "Evolution Soccer", 0 )
GAME( 2003, topbladv, crysbios, crystal, crystal, crystal_state, topbladv, ROT0, "SonoKong / Expotato", "Top Blade V", 0 )
GAME( 2001, officeye, 0, crystal, officeye, crystal_state, officeye, ROT0, "Danbi", "Office Yeo In Cheon Ha (version 1.2)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION ) // still has some instability issues
GAME( 2001, donghaer, 0, crystal, crystal, crystal_state, donghaer, ROT0, "Danbi", "Donggul Donggul Haerong", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 2004?,menghong, 0, crzyddz2, crzyddz2, driver_device, 0, ROT0, "Sealy", "Meng Hong Lou", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 2006, crzyddz2, 0, crzyddz2, crzyddz2, driver_device, 0, ROT0, "Sealy", "Crazy Dou Di Zhu II", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 2009, trivrus, 0, trivrus, trivrus, driver_device, 0, ROT0, "AGT", "Trivia R Us (v1.07)", 0 ) // has a CF card instead of flash roms
-GAME( 200?, crospuzl, 0, crospuzl, crospuzl, driver_device, 0, ROT0, "<unknown>", "Cross Puzzle", MACHINE_NOT_WORKING )
+GAME( 2004?,menghong, 0, crzyddz2, crzyddz2, crystal_state, 0, ROT0, "Sealy", "Meng Hong Lou", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 2006, crzyddz2, 0, crzyddz2, crzyddz2, crystal_state, 0, ROT0, "Sealy", "Crazy Dou Di Zhu II", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 2009, trivrus, 0, trivrus, trivrus, crystal_state, 0, ROT0, "AGT", "Trivia R Us (v1.07)", 0 ) // has a CF card instead of flash roms
+GAME( 200?, crospuzl, 0, crospuzl, crospuzl, crystal_state, 0, ROT0, "<unknown>", "Cross Puzzle", MACHINE_NOT_WORKING )
GAME( 2004, psattack, 0, crystal, crystal, crystal_state, psattack, ROT0, "Uniana", "P's Attack", MACHINE_IS_SKELETON )
// looks like the same kind of hw from strings in the ROM, but scrambled / encrypted?
-GAME( 200?, ddz, 0, crystal, crystal, driver_device, 0, ROT0, "IGS?", "Dou Di Zhu", MACHINE_IS_SKELETON )
+GAME( 200?, ddz, 0, crystal, crystal, crystal_state, 0, ROT0, "IGS?", "Dou Di Zhu", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index 7fb98fc1c9d..e76478ddfd7 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -429,7 +429,7 @@ static const z80_daisy_config daisy_chain_sound[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( csplayh5, csplayh5_state )
+static MACHINE_CONFIG_START( csplayh5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,16000000) /* TMP68301-16 */
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index 5fd6dd3ac84..de9db256c95 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -253,7 +253,7 @@ void cswat_state::machine_start()
save_item(NAME(m_nmi_enabled));
}
-static MACHINE_CONFIG_START( cswat, cswat_state )
+static MACHINE_CONFIG_START( cswat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809E, XTAL_18_432MHz/3/4) // HD68A09EP, 1.5MHz?
@@ -304,4 +304,4 @@ ROM_START( cswat )
ROM_END
-GAME( 1984, cswat, 0, cswat, cswat, driver_device, 0, ROT0, "Namco", "Cosmoswat", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, cswat, 0, cswat, cswat, cswat_state, 0, ROT0, "Namco", "Cosmoswat", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp
index 2d7e0e7c5ac..8fe4b9c53fe 100644
--- a/src/mame/drivers/ct486.cpp
+++ b/src/mame/drivers/ct486.cpp
@@ -20,6 +20,7 @@
#include "bus/pc_kbd/pc_kbdc.h"
#include "softlist.h"
+#include "softlist_dev.h"
#include "speaker.h"
@@ -31,11 +32,11 @@ class ct486_state : public driver_device
{
public:
ct486_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_cs4031(*this, "cs4031"),
- m_isabus(*this, "isabus"),
- m_speaker(*this, "speaker")
+ driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_cs4031(*this, "cs4031"),
+ m_isabus(*this, "isabus"),
+ m_speaker(*this, "speaker")
{ }
required_device<cpu_device> m_maincpu;
@@ -103,7 +104,7 @@ ADDRESS_MAP_END
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( ct486, ct486_state )
+static MACHINE_CONFIG_START( ct486 )
MCFG_CPU_ADD("maincpu", I486, XTAL_25MHz)
MCFG_CPU_PROGRAM_MAP(ct486_map)
MCFG_CPU_IO_MAP(ct486_io)
@@ -199,4 +200,4 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-COMP( 1993, ct486, 0, 0, ct486, 0, driver_device, 0, "<unknown>", "PC/AT 486 with CS4031 chipset", 0 )
+COMP( 1993, ct486, 0, 0, ct486, 0, ct486_state, 0, "<unknown>", "PC/AT 486 with CS4031 chipset", 0 )
diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp
index 02b3de025ff..9908bf4f8a0 100644
--- a/src/mame/drivers/cubeqst.cpp
+++ b/src/mame/drivers/cubeqst.cpp
@@ -48,7 +48,9 @@ public:
"rdac6", "ldac6",
"rdac7", "ldac7"
}),
- m_generic_paletteram_16(*this, "paletteram") { }
+ m_generic_paletteram_16(*this, "paletteram")
+ {
+ }
std::unique_ptr<uint8_t[]> m_depth_buffer;
int m_video_field;
@@ -510,7 +512,7 @@ WRITE16_MEMBER( cubeqst_state::sound_dac_w )
*
*************************************/
-static MACHINE_CONFIG_START( cubeqst, cubeqst_state )
+static MACHINE_CONFIG_START( cubeqst )
MCFG_CPU_ADD("main_cpu", M68000, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(m68k_program_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", cubeqst_state, vblank)
@@ -767,5 +769,5 @@ ROM_END
*
*************************************/
-GAME( 1983, cubeqst, 0, cubeqst, cubeqst, driver_device, 0, ROT0, "Simutrek", "Cube Quest (01/04/84)", 0 )
-GAME( 1983, cubeqsta, cubeqst, cubeqst, cubeqst, driver_device, 0, ROT0, "Simutrek", "Cube Quest (12/30/83)", 0 )
+GAME( 1983, cubeqst, 0, cubeqst, cubeqst, cubeqst_state, 0, ROT0, "Simutrek", "Cube Quest (01/04/84)", 0 )
+GAME( 1983, cubeqsta, cubeqst, cubeqst, cubeqst, cubeqst_state, 0, ROT0, "Simutrek", "Cube Quest (12/30/83)", 0 )
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index 1d79bfd89b8..70cf55fe82f 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -1024,7 +1024,7 @@ static INPUT_PORTS_START( mgprem11 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cubo, cubo_state )
+static MACHINE_CONFIG_START( cubo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, amiga_state::CLK_28M_PAL / 2)
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index 75ab788546b..47cfadc907e 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -38,7 +38,7 @@ public:
m_bg1_regs_y(*this, "bg1_regs_y"),
m_bg2_regs_x(*this, "bg2_regs_x"),
m_bg2_regs_y(*this, "bg2_regs_y")
- { }
+ { }
/* devices */
required_device<cpu_device> m_maincpu;
@@ -394,7 +394,7 @@ void cultures_state::machine_reset()
-static MACHINE_CONFIG_START( cultures, cultures_state )
+static MACHINE_CONFIG_START( cultures )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
@@ -426,7 +426,7 @@ static MACHINE_CONFIG_START( cultures, cultures_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MCLK/8, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", MCLK/8, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
@@ -496,4 +496,4 @@ ROM_START( cultures )
ROM_END
-GAME( 1994, cultures, 0, cultures, cultures, driver_device, 0, ROT0, "Face", "Jibun wo Migaku Culture School Mahjong Hen", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, cultures, 0, cultures, cultures, cultures_state, 0, ROT0, "Face", "Jibun wo Migaku Culture School Mahjong Hen", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp
index 2ecdcf66932..dfa492d297c 100644
--- a/src/mame/drivers/cupidon.cpp
+++ b/src/mame/drivers/cupidon.cpp
@@ -29,7 +29,7 @@ public:
{ }
// devices
- required_device<m68340cpu_device> m_maincpu;
+ required_device<m68340_cpu_device> m_maincpu;
required_shared_ptr<uint32_t> m_gfxram;
uint32_t screen_update_cupidon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -99,7 +99,7 @@ static INPUT_PORTS_START( cupidon )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cupidon, cupidon_state )
+static MACHINE_CONFIG_START( cupidon )
MCFG_CPU_ADD("maincpu", M68340, 16000000) // The access to 3FF00 at the start would suggest this is a 68340 so probably 16 or 25 mhz?
MCFG_CPU_PROGRAM_MAP(cupidon_map)
@@ -172,13 +172,13 @@ DRIVER_INIT_MEMBER(cupidon_state,funnyfm)
}
/* (c) date is from string in ROM, revision date is noted next to sets - Spellings are as found in ROM */
-GAME( 2004, tsarevna ,0, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon","Tsarevna (v1.29)", MACHINE_IS_SKELETON ) // 12 Oct 2005
-GAME( 2004, tsarevnaa ,tsarevna, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon","Tsarevna (v1.31)", MACHINE_IS_SKELETON ) // 17 Jan 2007
+GAME( 2004, tsarevna, 0, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon", "Tsarevna (v1.29)", MACHINE_IS_SKELETON ) // 12 Oct 2005
+GAME( 2004, tsarevnaa, tsarevna, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon", "Tsarevna (v1.31)", MACHINE_IS_SKELETON ) // 17 Jan 2007
-GAME( 2004, gangrose ,0, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon","Gangster's Roses (v4.70)", MACHINE_IS_SKELETON ) // 01 Sep 2004
+GAME( 2004, gangrose, 0, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon", "Gangster's Roses (v4.70)", MACHINE_IS_SKELETON ) // 01 Sep 2004
-GAME( 2004, funnyfm ,0, cupidon, cupidon, cupidon_state, funnyfm, ROT0, "Kupidon","Funny Farm (v1.17)", MACHINE_IS_SKELETON ) // 02 Mar 2005
-GAME( 2004, funnyfma ,funnyfm, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon","Funny Farm (v1.26)", MACHINE_IS_SKELETON ) // 08 Aug 2005
-GAME( 2004, funnyfmb ,funnyfm, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon","Funny Farm (v1.30)", MACHINE_IS_SKELETON ) // 16 May 2006
+GAME( 2004, funnyfm, 0, cupidon, cupidon, cupidon_state, funnyfm, ROT0, "Kupidon", "Funny Farm (v1.17)", MACHINE_IS_SKELETON ) // 02 Mar 2005
+GAME( 2004, funnyfma, funnyfm, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon", "Funny Farm (v1.26)", MACHINE_IS_SKELETON ) // 08 Aug 2005
+GAME( 2004, funnyfmb, funnyfm, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon", "Funny Farm (v1.30)", MACHINE_IS_SKELETON ) // 16 May 2006
-GAME( 2005, cashtrn ,0, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon","Cash Train (v1.10)", MACHINE_IS_SKELETON ) // 09 Jan 2006
+GAME( 2005, cashtrn, 0, cupidon, cupidon, cupidon_state, cupidon, ROT0, "Kupidon", "Cash Train (v1.10)", MACHINE_IS_SKELETON ) // 09 Jan 2006
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 3cc021fecae..50119e3ea2f 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -432,7 +432,7 @@ void cv1k_state::machine_reset()
m_blitter->reset();
}
-static MACHINE_CONFIG_START( cv1k, cv1k_state )
+static MACHINE_CONFIG_START( cv1k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH3BE, XTAL_12_8MHz*8) // 102.4MHz
diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp
index a88c22bcc51..aaa9959447f 100644
--- a/src/mame/drivers/cvicny.cpp
+++ b/src/mame/drivers/cvicny.cpp
@@ -128,7 +128,7 @@ static INPUT_PORTS_START( cvicny )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cvicny, cvicny_state )
+static MACHINE_CONFIG_START( cvicny )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(cvicny_mem)
@@ -145,5 +145,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, cvicny, 0, 0, cvicny, cvicny, driver_device, 0, "<unknown>", "Practice-z80", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, cvicny, 0, 0, cvicny, cvicny, cvicny_state, 0, "<unknown>", "Practice-z80", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index df7d4f5b068..80862607a38 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -974,7 +974,7 @@ MACHINE_RESET_MEMBER(cvs_state,cvs)
}
-static MACHINE_CONFIG_START( cvs, cvs_state )
+static MACHINE_CONFIG_START( cvs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/16)
@@ -1641,25 +1641,25 @@ DRIVER_INIT_MEMBER(cvs_state,raiders)
*
*************************************/
-GAME( 1981, cosmos, 0, cvs, cosmos, driver_device, 0, ROT90, "Century Electronics", "Cosmos", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, darkwar, 0, cvs, darkwar, driver_device, 0, ROT90, "Century Electronics", "Dark Warrior", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, spacefrt, 0, cvs, spacefrt, driver_device, 0, ROT90, "Century Electronics", "Space Fortress (CVS)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, 8ball, 0, cvs, 8ball, driver_device, 0, ROT90, "Century Electronics", "Video Eight Ball", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, 8ball1, 8ball, cvs, 8ball, driver_device, 0, ROT90, "Century Electronics", "Video Eight Ball (Rev.1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, logger, 0, cvs, logger, driver_device, 0, ROT90, "Century Electronics", "Logger", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dazzler, 0, cvs, dazzler, driver_device, 0, ROT90, "Century Electronics", "Dazzler", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, wallst, 0, cvs, wallst, driver_device, 0, ROT90, "Century Electronics", "Wall Street", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, radarzon, 0, cvs, radarzon, driver_device, 0, ROT90, "Century Electronics", "Radar Zone", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, radarzon1, radarzon, cvs, radarzon, driver_device, 0, ROT90, "Century Electronics", "Radar Zone (Rev.1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, radarzont, radarzon, cvs, radarzon, driver_device, 0, ROT90, "Century Electronics (Tuni Electro Service Inc)", "Radar Zone (Tuni)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, outline, radarzon, cvs, radarzon, driver_device, 0, ROT90, "Century Electronics", "Outline", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, goldbug, 0, cvs, goldbug, driver_device, 0, ROT90, "Century Electronics", "Gold Bug", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, diggerc, 0, cvs, diggerc, driver_device, 0, ROT90, "Century Electronics", "Digger (CVS)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, heartatk, 0, cvs, heartatk, driver_device, 0, ROT90, "Century Electronics", "Heart Attack", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hunchbak, 0, cvs, hunchbak, driver_device, 0, ROT90, "Century Electronics", "Hunchback (set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hunchbaka, hunchbak, cvs, hunchbak, cvs_state, hunchbaka, ROT90, "Century Electronics", "Hunchback (set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, superbik, 0, cvs, superbik, cvs_state, superbik, ROT90, "Century Electronics", "Superbike", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, raiders, 0, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, raidersr3, raiders, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders (Rev.3)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, hero, 0, cvs, hero, cvs_state, hero, ROT90, "Century Electronics / Seatongrove Ltd", "Hero", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // (C) 1984 CVS on titlescreen, (C) 1983 Seatongrove on highscore screen
-GAME( 1984, huncholy, 0, cvs, huncholy, cvs_state, huncholy, ROT90, "Century Electronics / Seatongrove Ltd", "Hunchback Olympic", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, cosmos, 0, cvs, cosmos, cvs_state, 0, ROT90, "Century Electronics", "Cosmos", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, darkwar, 0, cvs, darkwar, cvs_state, 0, ROT90, "Century Electronics", "Dark Warrior", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, spacefrt, 0, cvs, spacefrt, cvs_state, 0, ROT90, "Century Electronics", "Space Fortress (CVS)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, 8ball, 0, cvs, 8ball, cvs_state, 0, ROT90, "Century Electronics", "Video Eight Ball", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, 8ball1, 8ball, cvs, 8ball, cvs_state, 0, ROT90, "Century Electronics", "Video Eight Ball (Rev.1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, logger, 0, cvs, logger, cvs_state, 0, ROT90, "Century Electronics", "Logger", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dazzler, 0, cvs, dazzler, cvs_state, 0, ROT90, "Century Electronics", "Dazzler", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, wallst, 0, cvs, wallst, cvs_state, 0, ROT90, "Century Electronics", "Wall Street", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, radarzon, 0, cvs, radarzon, cvs_state, 0, ROT90, "Century Electronics", "Radar Zone", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, radarzon1, radarzon, cvs, radarzon, cvs_state, 0, ROT90, "Century Electronics", "Radar Zone (Rev.1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, radarzont, radarzon, cvs, radarzon, cvs_state, 0, ROT90, "Century Electronics (Tuni Electro Service Inc)", "Radar Zone (Tuni)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, outline, radarzon, cvs, radarzon, cvs_state, 0, ROT90, "Century Electronics", "Outline", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, goldbug, 0, cvs, goldbug, cvs_state, 0, ROT90, "Century Electronics", "Gold Bug", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, diggerc, 0, cvs, diggerc, cvs_state, 0, ROT90, "Century Electronics", "Digger (CVS)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, heartatk, 0, cvs, heartatk, cvs_state, 0, ROT90, "Century Electronics", "Heart Attack", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hunchbak, 0, cvs, hunchbak, cvs_state, 0, ROT90, "Century Electronics", "Hunchback (set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hunchbaka, hunchbak, cvs, hunchbak, cvs_state, hunchbaka, ROT90, "Century Electronics", "Hunchback (set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, superbik, 0, cvs, superbik, cvs_state, superbik, ROT90, "Century Electronics", "Superbike", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, raiders, 0, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, raidersr3, raiders, cvs, raiders, cvs_state, raiders, ROT90, "Century Electronics", "Raiders (Rev.3)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, hero, 0, cvs, hero, cvs_state, hero, ROT90, "Century Electronics / Seatongrove Ltd", "Hero", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // (C) 1984 CVS on titlescreen, (C) 1983 Seatongrove on highscore screen
+GAME( 1984, huncholy, 0, cvs, huncholy, cvs_state, huncholy, ROT90, "Century Electronics / Seatongrove Ltd", "Hunchback Olympic", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp
index ddaf2087692..0a34c800ff3 100644
--- a/src/mame/drivers/cxgz80.cpp
+++ b/src/mame/drivers/cxgz80.cpp
@@ -407,7 +407,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( ch2001, cxgz80_state )
+static MACHINE_CONFIG_START( ch2001 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
@@ -445,5 +445,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1984, ch2001, 0, 0, ch2001, ch2001, driver_device, 0, "CXG", "Chess 2001", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1984, ch2001, 0, 0, ch2001, ch2001, cxgz80_state, 0, "CXG", "Chess 2001", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index d09cf159c53..b30b986caab 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -1053,7 +1053,7 @@ void cxhumax_state::machine_reset()
memset(m_gxa_cmd_regs,0,sizeof(m_gxa_cmd_regs));
}
-static MACHINE_CONFIG_START( cxhumax, cxhumax_state )
+static MACHINE_CONFIG_START( cxhumax )
MCFG_CPU_ADD("maincpu", ARM920T, 180000000) // CX24175 (RevC up?)
MCFG_CPU_PROGRAM_MAP(cxhumax_map)
@@ -1084,5 +1084,5 @@ ROM_START( hxhdci2k )
ROM_LOAD( "24lc64.bin", 0x0000, 0x2000, NO_DUMP)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-SYST( 2008, hxhdci2k, 0, 0, cxhumax, cxhumax, driver_device, 0, "HUMAX", "HUMAX HDCI-2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+SYST( 2008, hxhdci2k, 0, 0, cxhumax, cxhumax, cxhumax_state, 0, "HUMAX", "HUMAX HDCI-2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index 8780d701976..99e897389c8 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -395,7 +395,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( cyberbal, cyberbal_state )
+static MACHINE_CONFIG_START( cyberbal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -483,7 +483,7 @@ static MACHINE_CONFIG_DERIVED( cyberbalt, cyberbal )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cyberbal2p, cyberbal_state )
+static MACHINE_CONFIG_START( cyberbal2p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -1017,14 +1017,14 @@ DRIVER_INIT_MEMBER(cyberbal_state,cyberbalt)
*
*************************************/
-GAMEL(1988, cyberbal, 0, cyberbal, cyberbal, driver_device, 0, ROT0, "Atari Games", "Cyberball (rev 4)", 0, layout_dualhsxs )
-GAMEL(1988, cyberbal2, cyberbal, cyberbal, cyberbal, driver_device, 0, ROT0, "Atari Games", "Cyberball (rev 2)", 0, layout_dualhsxs )
-GAMEL(1988, cyberbalp, cyberbal, cyberbal, cyberbal, driver_device, 0, ROT0, "Atari Games", "Cyberball (prototype)", 0, layout_dualhsxs )
+GAMEL(1988, cyberbal, 0, cyberbal, cyberbal, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball (rev 4)", 0, layout_dualhsxs )
+GAMEL(1988, cyberbal2, cyberbal, cyberbal, cyberbal, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball (rev 2)", 0, layout_dualhsxs )
+GAMEL(1988, cyberbalp, cyberbal, cyberbal, cyberbal, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball (prototype)", 0, layout_dualhsxs )
-GAME( 1989, cyberbal2p, cyberbal, cyberbal2p, cyberbal2p, driver_device, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 4)", 0 )
-GAME( 1989, cyberbal2p3, cyberbal, cyberbal2p, cyberbal2p, driver_device, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 3)", 0 )
-GAME( 1989, cyberbal2p2, cyberbal, cyberbal2p, cyberbal2p, driver_device, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 2)", 0 )
-GAME( 1989, cyberbal2p1, cyberbal, cyberbal2p, cyberbal2p, driver_device, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 1)", 0 )
+GAME( 1989, cyberbal2p, cyberbal, cyberbal2p, cyberbal2p, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 4)", 0 )
+GAME( 1989, cyberbal2p3, cyberbal, cyberbal2p, cyberbal2p, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 3)", 0 )
+GAME( 1989, cyberbal2p2, cyberbal, cyberbal2p, cyberbal2p, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 2)", 0 )
+GAME( 1989, cyberbal2p1, cyberbal, cyberbal2p, cyberbal2p, cyberbal_state, 0, ROT0, "Atari Games", "Cyberball 2072 (2 player, rev 1)", 0 )
-GAMEL(1989, cyberbalt, cyberbal, cyberbalt, cyberbal, cyberbal_state, cyberbalt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 2)", 0, layout_dualhsxs )
-GAMEL(1989, cyberbalt1, cyberbal, cyberbalt, cyberbal, cyberbal_state, cyberbalt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 1)", 0, layout_dualhsxs )
+GAMEL(1989, cyberbalt, cyberbal, cyberbalt, cyberbal, cyberbal_state, cyberbalt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 2)", 0, layout_dualhsxs )
+GAMEL(1989, cyberbalt1, cyberbal, cyberbalt, cyberbal, cyberbal_state, cyberbalt, ROT0, "Atari Games", "Tournament Cyberball 2072 (rev 1)", 0, layout_dualhsxs )
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index b33b2231b5e..27893cc5a88 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -831,7 +831,7 @@ GFXDECODE_END
*/
-static MACHINE_CONFIG_START( cybertnk, cybertnk_state )
+static MACHINE_CONFIG_START( cybertnk )
MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz/2)
MCFG_CPU_PROGRAM_MAP(master_mem)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", cybertnk_state, irq1_line_assert)
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index a9989184623..67b986f7312 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -384,7 +384,7 @@ static DEVICE_INPUT_DEFAULTS_START( debug_serial ) // set up debug port to defau
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( cybikov1, cybiko_state )
+static MACHINE_CONFIG_START( cybikov1 )
// cpu
MCFG_CPU_ADD( "maincpu", H8S2241, XTAL_11_0592MHz )
MCFG_CPU_PROGRAM_MAP( cybikov1_mem )
@@ -397,8 +397,8 @@ static MACHINE_CONFIG_START( cybikov1, cybiko_state )
// screen
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE( 60 )
- MCFG_SCREEN_SIZE( HD66421_WIDTH, HD66421_HEIGHT )
- MCFG_SCREEN_VISIBLE_AREA( 0, HD66421_WIDTH - 1, 0, HD66421_HEIGHT - 1 )
+ MCFG_SCREEN_SIZE( hd66421_device::WIDTH, hd66421_device::HEIGHT )
+ MCFG_SCREEN_VISIBLE_AREA( 0, hd66421_device::WIDTH - 1, 0, hd66421_device::HEIGHT - 1 )
MCFG_SCREEN_UPDATE_DEVICE("hd66421", hd66421_device, update_screen)
MCFG_SCREEN_PALETTE("hd66421:palette")
// video
@@ -531,7 +531,7 @@ ROM_END
// DRIVERS //
//////////////
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 2000, cybikov1, 0, 0, cybikov1, cybiko, cybiko_state, cybiko , "Cybiko Inc", "Cybiko Classic (V1)", MACHINE_IMPERFECT_SOUND )
-COMP( 2000, cybikov2, cybikov1, 0, cybikov2, cybiko, cybiko_state, cybiko , "Cybiko Inc", "Cybiko Classic (V2)", MACHINE_IMPERFECT_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 2000, cybikov1, 0, 0, cybikov1, cybiko, cybiko_state, cybiko, "Cybiko Inc", "Cybiko Classic (V1)", MACHINE_IMPERFECT_SOUND )
+COMP( 2000, cybikov2, cybikov1, 0, cybikov2, cybiko, cybiko_state, cybiko, "Cybiko Inc", "Cybiko Classic (V2)", MACHINE_IMPERFECT_SOUND )
COMP( 2001, cybikoxt, cybikov1, 0, cybikoxt, cybikoxt, cybiko_state, cybikoxt, "Cybiko Inc", "Cybiko Xtreme", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp
index 449366280b4..99ba6e1790e 100644
--- a/src/mame/drivers/cyclemb.cpp
+++ b/src/mame/drivers/cyclemb.cpp
@@ -917,7 +917,7 @@ static GFXDECODE_START( cyclemb )
GFXDECODE_ENTRY( "sprite_data", 0, spritelayout_32x32, 0x00, 0x40 )
GFXDECODE_END
-static MACHINE_CONFIG_START( cyclemb, cyclemb_state )
+static MACHINE_CONFIG_START( cyclemb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/3) // Z8400BPS
MCFG_CPU_PROGRAM_MAP(cyclemb_map)
@@ -1052,5 +1052,5 @@ DRIVER_INIT_MEMBER(cyclemb_state,skydest)
m_dsw_pc_hack = 0x554;
}
-GAME( 1984, cyclemb, 0, cyclemb, cyclemb, cyclemb_state, cyclemb, ROT0, "Taito Corporation", "Cycle Maabou (Japan)", MACHINE_NO_COCKTAIL | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, cyclemb, 0, cyclemb, cyclemb, cyclemb_state, cyclemb, ROT0, "Taito Corporation", "Cycle Maabou (Japan)", MACHINE_NO_COCKTAIL | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1985, skydest, 0, skydest, skydest, cyclemb_state, skydest, ROT0, "Taito Corporation", "Sky Destroyer (Japan)", MACHINE_NO_COCKTAIL | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/czk80.cpp b/src/mame/drivers/czk80.cpp
index af850bfa7d1..0b9ed9622cb 100644
--- a/src/mame/drivers/czk80.cpp
+++ b/src/mame/drivers/czk80.cpp
@@ -69,7 +69,7 @@ public:
DECLARE_READ8_MEMBER(port81_r);
DECLARE_READ8_MEMBER(portc0_r);
DECLARE_WRITE8_MEMBER(port40_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE_LINE_MEMBER(ctc_z0_w);
DECLARE_WRITE_LINE_MEMBER(ctc_z1_w);
DECLARE_WRITE_LINE_MEMBER(ctc_z2_w);
@@ -183,12 +183,12 @@ static SLOT_INTERFACE_START( czk80_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
-WRITE8_MEMBER( czk80_state::kbd_put )
+void czk80_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( czk80, czk80_state )
+static MACHINE_CONFIG_START( czk80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(czk80_mem)
@@ -197,7 +197,7 @@ static MACHINE_CONFIG_START( czk80, czk80_state )
MCFG_MACHINE_RESET_OVERRIDE(czk80_state, czk80)
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(czk80_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(czk80_state, kbd_put))
MCFG_UPD765A_ADD("fdc", false, true)
MCFG_FLOPPY_DRIVE_ADD("fdc:0", czk80_floppies, "525dd", floppy_image_device::default_floppy_formats)
@@ -226,5 +226,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, czk80, 0, 0, czk80, czk80, czk80_state, czk80, "<unknown>", "CZK-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, czk80, 0, 0, czk80, czk80, czk80_state, czk80, "<unknown>", "CZK-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index d3d91ca9c92..974fed413dd 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -379,7 +379,7 @@ QUICKLOAD_LOAD_MEMBER( d6800_state, d6800 )
return result;
}
-static MACHINE_CONFIG_START( d6800, d6800_state )
+static MACHINE_CONFIG_START( d6800 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6800, XTAL_4MHz/4)
MCFG_CPU_PROGRAM_MAP(d6800_map)
@@ -433,5 +433,5 @@ ROM_START( d6800 )
ROMX_LOAD( "d6800d.bin", 0xc000, 0x0800, CRC(ded5712f) SHA1(f594f313a74d7135c9fdd0bcb0093fc5771a9b7d), ROM_BIOS(2) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS, INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, d6800, 0, 0, d6800, d6800, driver_device, 0, "Michael Bauer", "Dream 6800", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1979, d6800, 0, 0, d6800, d6800, d6800_state, 0, "Michael Bauer", "Dream 6800", 0 )
diff --git a/src/mame/drivers/d6809.cpp b/src/mame/drivers/d6809.cpp
index 1453f89bcef..a433c42684e 100644
--- a/src/mame/drivers/d6809.cpp
+++ b/src/mame/drivers/d6809.cpp
@@ -100,7 +100,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER( term_r );
DECLARE_WRITE8_MEMBER( term_w );
uint8_t m_term_data;
@@ -134,7 +134,7 @@ static INPUT_PORTS_START( d6809 )
INPUT_PORTS_END
-WRITE8_MEMBER( d6809_state::kbd_put )
+void d6809_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -144,7 +144,7 @@ void d6809_state::machine_reset()
}
-static MACHINE_CONFIG_START( d6809, d6809_state )
+static MACHINE_CONFIG_START( d6809 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809E, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(d6809_mem)
@@ -152,7 +152,7 @@ static MACHINE_CONFIG_START( d6809, d6809_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(d6809_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(d6809_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -163,5 +163,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, d6809, 0, 0, d6809, d6809, driver_device, 0, "Dunfield", "6809 Portable", MACHINE_IS_SKELETON | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, d6809, 0, 0, d6809, d6809, d6809_state, 0, "Dunfield", "6809 Portable", MACHINE_IS_SKELETON | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index 7223405f627..66db5af67b6 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -293,7 +293,7 @@ void d9final_state::machine_start()
membank("bank1")->set_entry(0);
}
-static MACHINE_CONFIG_START( d9final, d9final_state )
+static MACHINE_CONFIG_START( d9final )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 24000000/4)/* ? MHz */
MCFG_CPU_PROGRAM_MAP(d9final_map)
@@ -340,4 +340,4 @@ ROM_END
-GAME( 1992, d9final, 0, d9final, d9final, driver_device, 0, ROT0, "Excellent System", "Dream 9 Final (v2.24)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, d9final, 0, d9final, d9final, d9final_state, 0, ROT0, "Excellent System", "Dream 9 Final (v2.24)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index 6c328d238b7..4c8163a5a27 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -648,7 +648,7 @@ PALETTE_INIT_MEMBER(dacholer_state, dacholer)
}
/* note: clocks are taken from itaten sound reference recording */
-static MACHINE_CONFIG_START( dacholer, dacholer_state )
+static MACHINE_CONFIG_START( dacholer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) /* ? */
@@ -692,7 +692,7 @@ static MACHINE_CONFIG_START( dacholer, dacholer_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(dacholer_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 1 / 96 = 3906.25Hz playback - guess */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 = 3906.25Hz playback - guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -847,6 +847,6 @@ ROM_START( itaten )
ROM_END
-GAME( 1983, dacholer, 0, dacholer, dacholer, driver_device, 0, ROT0, "Nichibutsu", "Dacholer", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, kickboy, 0, dacholer, kickboy, driver_device, 0, ROT0, "Nichibutsu", "Kick Boy", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, itaten, 0, itaten, itaten, driver_device, 0, ROT0, "Nichibutsu / Alice", "Itazura Tenshi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, dacholer, 0, dacholer, dacholer, dacholer_state, 0, ROT0, "Nichibutsu", "Dacholer", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, kickboy, 0, dacholer, kickboy, dacholer_state, 0, ROT0, "Nichibutsu", "Kick Boy", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, itaten, 0, itaten, itaten, dacholer_state, 0, ROT0, "Nichibutsu / Alice", "Itazura Tenshi (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp
index 9975834117a..3fa1cf8da01 100644
--- a/src/mame/drivers/dai.cpp
+++ b/src/mame/drivers/dai.cpp
@@ -185,7 +185,7 @@ static GFXDECODE_START( dai )
GFXDECODE_END
/* machine definition */
-static MACHINE_CONFIG_START( dai, dai_state )
+static MACHINE_CONFIG_START( dai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(dai_mem)
@@ -245,7 +245,6 @@ static MACHINE_CONFIG_START( dai, dai_state )
MCFG_SOFTWARE_LIST_ADD("cass_list", "dai_cass")
MACHINE_CONFIG_END
-#define io_dai io_NULL
ROM_START(dai)
ROM_REGION(0x14000,"maincpu",0)
@@ -258,5 +257,5 @@ ROM_START(dai)
ROM_LOAD ("nch.bin", 0x0000, 0x1000, CRC(a9f5b30b) SHA1(24119b2984ab4e50dc0dabae1065ff6d6c1f237d))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1978, dai, 0, 0, dai, dai, driver_device, 0, "Data Applications International", "DAI Personal Computer", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1978, dai, 0, 0, dai, dai, dai_state, 0, "Data Applications International", "DAI Personal Computer", 0)
diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp
index 664b9e7a421..f0c0975dfe2 100644
--- a/src/mame/drivers/dai3wksi.cpp
+++ b/src/mame/drivers/dai3wksi.cpp
@@ -400,7 +400,7 @@ void dai3wksi_state::machine_reset()
}
-static MACHINE_CONFIG_START( dai3wksi, dai3wksi_state )
+static MACHINE_CONFIG_START( dai3wksi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4)
@@ -551,4 +551,4 @@ ROM_END
*
*************************************/
-GAME( 1979, dai3wksi, 0, dai3wksi, dai3wksi, driver_device, 0, ROT270, "Sun Electronics", "Dai San Wakusei Meteor (Japan)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, dai3wksi, 0, dai3wksi, dai3wksi, dai3wksi_state, 0, ROT270, "Sun Electronics", "Dai San Wakusei Meteor (Japan)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp
index a1273562894..90351597714 100644
--- a/src/mame/drivers/dambustr.cpp
+++ b/src/mame/drivers/dambustr.cpp
@@ -251,7 +251,7 @@ DRIVER_INIT_MEMBER(dambustr_state,dambustr)
-static MACHINE_CONFIG_START( dambustr, dambustr_state )
+static MACHINE_CONFIG_START( dambustr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(dambustr_map)
@@ -370,6 +370,6 @@ ROM_START( dambustruk )
ROM_END
-GAME( 1981, dambustr, 0, dambustr, dambustr, dambustr_state, dambustr, ROT90, "South West Research", "Dambusters (US, set 1)", 0 )
-GAME( 1981, dambustra, dambustr, dambustr, dambustr, dambustr_state, dambustr, ROT90, "South West Research", "Dambusters (US, set 2)", 0 )
-GAME( 1981, dambustruk, dambustr, dambustr, dambustruk, dambustr_state, dambustr, ROT90, "South West Research", "Dambusters (UK)", 0 )
+GAME( 1981, dambustr, 0, dambustr, dambustr, dambustr_state, dambustr, ROT90, "South West Research", "Dambusters (US, set 1)", 0 )
+GAME( 1981, dambustra, dambustr, dambustr, dambustr, dambustr_state, dambustr, ROT90, "South West Research", "Dambusters (US, set 2)", 0 )
+GAME( 1981, dambustruk, dambustr, dambustr, dambustruk, dambustr_state, dambustr, ROT90, "South West Research", "Dambusters (UK)", 0 )
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp
index 12a4f4b8ec9..639135273d7 100644
--- a/src/mame/drivers/darius.cpp
+++ b/src/mame/drivers/darius.cpp
@@ -734,7 +734,7 @@ void darius_state::machine_reset()
}
-static MACHINE_CONFIG_START( darius, darius_state )
+static MACHINE_CONFIG_START( darius )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 MHz */
@@ -823,7 +823,7 @@ static MACHINE_CONFIG_START( darius, darius_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(darius_state, darius_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.l", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0)
@@ -1160,8 +1160,8 @@ ROM_START( dariuse )
ROM_END
-GAME( 1986, darius, 0, darius, darius, driver_device, 0, ROT0, "Taito Corporation Japan", "Darius (World, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dariusu, darius, darius, dariusu, driver_device, 0, ROT0, "Taito America Corporation", "Darius (US, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dariusj, darius, darius, dariusj, driver_device, 0, ROT0, "Taito Corporation", "Darius (Japan, rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dariuso, darius, darius, dariusj, driver_device, 0, ROT0, "Taito Corporation", "Darius (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dariuse, darius, darius, dariusu, driver_device, 0, ROT0, "Taito Corporation", "Darius Extra Version (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, darius, 0, darius, darius, darius_state, 0, ROT0, "Taito Corporation Japan", "Darius (World, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dariusu, darius, darius, dariusu, darius_state, 0, ROT0, "Taito America Corporation", "Darius (US, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dariusj, darius, darius, dariusj, darius_state, 0, ROT0, "Taito Corporation", "Darius (Japan, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dariuso, darius, darius, dariusj, darius_state, 0, ROT0, "Taito Corporation", "Darius (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dariuse, darius, darius, dariusu, darius_state, 0, ROT0, "Taito Corporation", "Darius Extra Version (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp
index e14f1e4ebd6..e2b454a7513 100644
--- a/src/mame/drivers/darkmist.cpp
+++ b/src/mame/drivers/darkmist.cpp
@@ -237,7 +237,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(darkmist_state::scanline)
-static MACHINE_CONFIG_START( darkmist, darkmist_state )
+static MACHINE_CONFIG_START( darkmist )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(memmap)
diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp
index b2c8c08d9ee..b7d67a87326 100644
--- a/src/mame/drivers/darkseal.cpp
+++ b/src/mame/drivers/darkseal.cpp
@@ -228,7 +228,7 @@ GFXDECODE_END
/******************************************************************************/
-static MACHINE_CONFIG_START( darkseal, darkseal_state )
+static MACHINE_CONFIG_START( darkseal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Custom chip 59 */
@@ -296,10 +296,10 @@ static MACHINE_CONFIG_START( darkseal, darkseal_state )
MCFG_SOUND_ROUTE(0, "mono", 0.55)
MCFG_SOUND_ROUTE(1, "mono", 0.55)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp
index 5290821c49a..49e5f399621 100644
--- a/src/mame/drivers/daruma.cpp
+++ b/src/mame/drivers/daruma.cpp
@@ -140,7 +140,7 @@ static INPUT_PORTS_START( daruma )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( daruma, daruma_state )
+static MACHINE_CONFIG_START( daruma )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C32,11059200) //verified on pcb
MCFG_CPU_PROGRAM_MAP(mem_prg)
@@ -166,5 +166,5 @@ ROM_START( ds348 )
ROM_LOAD( "daruma_ds348_v1_1.rom", 0x0000, 0x10000, CRC(10bf9036) SHA1(d654a13bc582f5384e759ec6fe5309a642bd8e18) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1998, ds348, 0, 0, daruma, daruma, driver_device, 0, "Sigtron Daruma", "Print Plus DS348 - Dot matrix printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1998, ds348, 0, 0, daruma, daruma, daruma_state, 0, "Sigtron Daruma", "Print Plus DS348 - Dot matrix printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index 5248221a79f..16f2dbffaa1 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -537,7 +537,7 @@ DECO16IC_BANK_CB_MEMBER(dassault_state::bank_callback)
return ((bank >> 4) & 0xf) << 12;
}
-static MACHINE_CONFIG_START( dassault, dassault_state )
+static MACHINE_CONFIG_START( dassault )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 14MHz - Accurate */
@@ -628,11 +628,11 @@ static MACHINE_CONFIG_START( dassault, dassault_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) // verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH) // verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH) // verified
+ MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH) // verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp
index d37ebeb4514..aee05bd229b 100644
--- a/src/mame/drivers/datum.cpp
+++ b/src/mame/drivers/datum.cpp
@@ -177,7 +177,7 @@ WRITE8_MEMBER( datum_state::pb_w )
}
-static MACHINE_CONFIG_START( datum, datum_state )
+static MACHINE_CONFIG_START( datum )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6802, XTAL_4MHz) // internally divided to 1 MHz
MCFG_CPU_PROGRAM_MAP(datum_mem)
@@ -207,5 +207,5 @@ ROM_START( datum )
ROM_LOAD( "datum.bin", 0x0000, 0x0800, BAD_DUMP CRC(6fb11628) SHA1(8a77a846b62eee0d12848da76e16b4c66ef445d8) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, datum, 0, 0, datum, datum, driver_device, 0, "Gammatron", "Datum", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, datum, 0, 0, datum, datum, datum_state, 0, "Gammatron", "Datum", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index e4fe267f8fd..90489181cbe 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -591,7 +591,7 @@ It needs at least 64 instances because 0xa05b will be eventually nuked by the vb
}
-static MACHINE_CONFIG_START( dblcrown, dblcrown_state )
+static MACHINE_CONFIG_START( dblcrown )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -653,5 +653,5 @@ ROM_START( dblcrown )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1997, dblcrown, 0, dblcrown, dblcrown, driver_device, 0, ROT0, "Cadence Technology", "Double Crown (v1.0.3)", MACHINE_IMPERFECT_GRAPHICS, layout_dblcrown ) // 1997 DYNA copyright in tile GFX
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+GAMEL( 1997, dblcrown, 0, dblcrown, dblcrown, dblcrown_state, 0, ROT0, "Cadence Technology", "Double Crown (v1.0.3)", MACHINE_IMPERFECT_GRAPHICS, layout_dblcrown ) // 1997 DYNA copyright in tile GFX
diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp
index f5d0265696c..afb2c969b95 100644
--- a/src/mame/drivers/dblewing.cpp
+++ b/src/mame/drivers/dblewing.cpp
@@ -367,7 +367,7 @@ void dblewing_state::dblewing_sound_cb( address_space &space, uint16_t data, uin
m_audiocpu->set_input_line(0, (m_sound_irq != 0) ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( dblewing, dblewing_state )
+static MACHINE_CONFIG_START( dblewing )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 */
@@ -429,7 +429,7 @@ static MACHINE_CONFIG_START( dblewing, dblewing_state )
MCFG_YM2151_IRQ_HANDLER(WRITELINE(dblewing_state, sound_irq))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp
index 3a7b9deab8d..e51979e3d70 100644
--- a/src/mame/drivers/dbz.cpp
+++ b/src/mame/drivers/dbz.cpp
@@ -320,7 +320,7 @@ void dbz_state::machine_reset()
m_control = 0;
}
-static MACHINE_CONFIG_START( dbz, dbz_state )
+static MACHINE_CONFIG_START( dbz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000)
@@ -379,7 +379,7 @@ static MACHINE_CONFIG_START( dbz, dbz_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -586,6 +586,6 @@ DRIVER_INIT_MEMBER(dbz_state,dbz2)
ROM[0xae8/2] = 0x4e71; /* 0x005e */
}
-GAME( 1993, dbz, 0, dbz, dbz, dbz_state, dbz, ROT0, "Banpresto", "Dragonball Z (rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // crashes MAME in tile/PSAC2 ROM test
-GAME( 1993, dbza, dbz, dbz, dbza, dbz_state, dbza, ROT0, "Banpresto", "Dragonball Z (rev A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, dbz, 0, dbz, dbz, dbz_state, dbz, ROT0, "Banpresto", "Dragonball Z (rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // crashes MAME in tile/PSAC2 ROM test
+GAME( 1993, dbza, dbz, dbz, dbza, dbz_state, dbza, ROT0, "Banpresto", "Dragonball Z (rev A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
GAME( 1994, dbz2, 0, dbz, dbz2, dbz_state, dbz2, ROT0, "Banpresto", "Dragonball Z 2 - Super Battle", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // crashes MAME in tile/PSAC2 ROM test
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index f12f7a73951..dc5b8cfb785 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -574,7 +574,7 @@ static MACHINE_CONFIG_FRAGMENT( gdrom_config )
MCFG_SOUND_ROUTE(1, "^^^^rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dc, dc_cons_state )
+static MACHINE_CONFIG_START( dc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK)
MCFG_SH4_MD0(1)
@@ -700,8 +700,8 @@ ROM_START( dcdev )
ROM_LOAD( "hkt-0120-flash.bin", 0x000000, 0x020000, CRC(7784c304) SHA1(31ef57f550d8cd13e40263cbc657253089e53034) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS( 1999, dc, dcjp, 0, dc, dc, dc_cons_state, dcus, "Sega", "Dreamcast (USA, NTSC)", MACHINE_NOT_WORKING )
-CONS( 1998, dcjp, 0, 0, dc, dc, dc_cons_state, dcjp, "Sega", "Dreamcast (Japan, NTSC)", MACHINE_NOT_WORKING )
-CONS( 1999, dceu, dcjp, 0, dc, dc, dc_cons_state, dcus, "Sega", "Dreamcast (Europe, PAL)", MACHINE_NOT_WORKING )
-CONS( 1998, dcdev, 0, 0, dc, dc, dc_cons_state, dc, "Sega", "HKT-0120 Sega Dreamcast Development Box", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+CONS( 1999, dc, dcjp, 0, dc, dc, dc_cons_state, dcus, "Sega", "Dreamcast (USA, NTSC)", MACHINE_NOT_WORKING )
+CONS( 1998, dcjp, 0, 0, dc, dc, dc_cons_state, dcjp, "Sega", "Dreamcast (Japan, NTSC)", MACHINE_NOT_WORKING )
+CONS( 1999, dceu, dcjp, 0, dc, dc, dc_cons_state, dcus, "Sega", "Dreamcast (Europe, PAL)", MACHINE_NOT_WORKING )
+CONS( 1998, dcdev, 0, 0, dc, dc, dc_cons_state, dc, "Sega", "HKT-0120 Sega Dreamcast Development Box", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp
index 2d3a4d0b93d..b31ee921a25 100644
--- a/src/mame/drivers/dcheese.cpp
+++ b/src/mame/drivers/dcheese.cpp
@@ -368,7 +368,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( dcheese, dcheese_state )
+static MACHINE_CONFIG_START( dcheese )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MAIN_OSC)
@@ -768,12 +768,12 @@ ROM_END
*
*************************************/
-GAME( 1993, dcheese, 0, dcheese, dcheese, driver_device, 0, ROT90, "HAR", "Double Cheese", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, lottof2, 0, dcheese, lottof2, driver_device, 0, ROT0, "HAR", "Lotto Fun 2", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, cecmatch, 0, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "ChuckECheese's Match Game", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fredmem, 0, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (World?, Ticket version, 3/17/95)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fredmemus, fredmem, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (US, High Score version, 3/10/95)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fredmemuk, fredmem, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (UK, 3/17/95)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fredmemj, fredmem, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (Japan, High Score version, 3/20/95)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fredmemc, fredmem, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (Mandarin Chinese, 3/17/95)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fredmesp, fredmem, fredmem, fredmem, driver_device, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (Spanish, 3/17/95)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, dcheese, 0, dcheese, dcheese, dcheese_state, 0, ROT90, "HAR", "Double Cheese", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, lottof2, 0, dcheese, lottof2, dcheese_state, 0, ROT0, "HAR", "Lotto Fun 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, cecmatch, 0, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "ChuckECheese's Match Game", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fredmem, 0, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (World?, Ticket version, 3/17/95)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fredmemus, fredmem, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (US, High Score version, 3/10/95)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fredmemuk, fredmem, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (UK, 3/17/95)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fredmemj, fredmem, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (Japan, High Score version, 3/20/95)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fredmemc, fredmem, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (Mandarin Chinese, 3/17/95)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fredmesp, fredmem, fredmem, fredmem, dcheese_state, 0, ROT0, "Coastal Amusements", "Fred Flintstones' Memory Match (Spanish, 3/17/95)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp
index 7bed52872e1..a922d8e6aaa 100644
--- a/src/mame/drivers/dcon.cpp
+++ b/src/mame/drivers/dcon.cpp
@@ -260,7 +260,7 @@ WRITE16_MEMBER( dcon_state::layer_scroll_w )
/******************************************************************************/
-static MACHINE_CONFIG_START( dcon, dcon_state )
+static MACHINE_CONFIG_START( dcon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -294,7 +294,7 @@ static MACHINE_CONFIG_START( dcon, dcon_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( dcon, dcon_state )
MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sdgndmps, dcon_state )
+static MACHINE_CONFIG_START( sdgndmps )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -339,7 +339,7 @@ static MACHINE_CONFIG_START( sdgndmps, dcon_state )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -436,4 +436,4 @@ DRIVER_INIT_MEMBER(dcon_state,sdgndmps)
GAME( 1991, sdgndmps, 0, sdgndmps, sdgndmps, dcon_state, sdgndmps, ROT0, "Banpresto / Bandai", "SD Gundam Psycho Salamander no Kyoui", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dcon, 0, dcon, dcon, driver_device, 0, ROT0, "Success", "D-Con", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dcon, 0, dcon, dcon, dcon_state, 0, ROT0, "Success", "D-Con", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp
index 0c17a23b282..3420130780a 100644
--- a/src/mame/drivers/dct11em.cpp
+++ b/src/mame/drivers/dct11em.cpp
@@ -51,7 +51,7 @@ uint32_t dct11em_state::screen_update_dct11em(screen_device &screen, bitmap_ind1
}
-static MACHINE_CONFIG_START( dct11em, dct11em_state )
+static MACHINE_CONFIG_START( dct11em )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",T11, 7500000) // 7.5MHz XTAL
MCFG_T11_INITIAL_MODE(0x1403) /* according to specs */
@@ -81,5 +81,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, dct11em, 0, 0, dct11em, dct11em, driver_device, 0, "Digital Equipment Corporation", "DCT11-EM", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, dct11em, 0, 0, dct11em, dct11em, dct11em_state, 0, "Digital Equipment Corporation", "DCT11-EM", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp
index ed66022be8b..0320088b53e 100644
--- a/src/mame/drivers/dday.cpp
+++ b/src/mame/drivers/dday.cpp
@@ -253,7 +253,7 @@ void dday_state::machine_reset()
}
-static MACHINE_CONFIG_START( dday, dday_state )
+static MACHINE_CONFIG_START( dday )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz ? */
diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp
index d8c389d181b..dd34b26f4c5 100644
--- a/src/mame/drivers/ddayjlc.cpp
+++ b/src/mame/drivers/ddayjlc.cpp
@@ -510,7 +510,7 @@ PALETTE_INIT_MEMBER(ddayjlc_state, ddayjlc)
}
}
-static MACHINE_CONFIG_START( ddayjlc, ddayjlc_state )
+static MACHINE_CONFIG_START( ddayjlc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/3)
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 4d3779c1684..37e017774ec 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -615,7 +615,7 @@ INTERRUPT_GEN_MEMBER(ddealer_state::interrupt)
device.execute().set_input_line(4, HOLD_LINE);
}
-static MACHINE_CONFIG_START( ddealer, ddealer_state )
+static MACHINE_CONFIG_START( ddealer )
MCFG_CPU_ADD("maincpu" , M68000, XTAL_16MHz/2) /* 8MHz */
MCFG_CPU_PROGRAM_MAP(ddealer)
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index 50c301b6a37..fca54f35cc7 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -4280,7 +4280,7 @@ static ADDRESS_MAP_START( htengoku_mem_map, AS_PROGRAM, 8, ddenlovr_state )
AM_RANGE( 0x8000, 0x81ff ) AM_WRITE(yarunara_palette_w) // Palette or RTC
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( htengoku, ddenlovr_state )
+static MACHINE_CONFIG_START( htengoku )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,20000000 / 4)
@@ -9614,7 +9614,7 @@ MACHINE_START_MEMBER(ddenlovr_state,sryudens)
Don Den Lover Vol.1
***************************************************************************/
-static MACHINE_CONFIG_START( ddenlovr, ddenlovr_state )
+static MACHINE_CONFIG_START( ddenlovr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_24MHz / 2)
@@ -9647,7 +9647,7 @@ static MACHINE_CONFIG_START( ddenlovr, ddenlovr_state )
MCFG_SOUND_ADD("aysnd", YMZ284, XTAL_28_63636MHz / 16) // or /8 ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -9736,7 +9736,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::quizchq_rtc_irq )
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xfc);
}
-static MACHINE_CONFIG_START( quizchq, ddenlovr_state )
+static MACHINE_CONFIG_START( quizchq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Verified */
@@ -9767,7 +9767,7 @@ static MACHINE_CONFIG_START( quizchq, ddenlovr_state )
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz/8) // 3.579545Mhz, verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, OKIM6295_PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, PIN7_HIGH) // clock frequency verified 1.022MHz, pin 7 verified high
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
/* devices */
@@ -9815,7 +9815,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::mmpanic_rtc_irq )
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xdf); // RST 18, clock
}
-static MACHINE_CONFIG_START( mmpanic, ddenlovr_state )
+static MACHINE_CONFIG_START( mmpanic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 8000000)
@@ -9856,7 +9856,7 @@ static MACHINE_CONFIG_START( mmpanic, ddenlovr_state )
MCFG_SOUND_ADD("aysnd", AY8910, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", 1022720, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1022720, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -9899,7 +9899,7 @@ WRITE_LINE_MEMBER(ddenlovr_state::hanakanz_rtc_irq)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xe2);
}
-static MACHINE_CONFIG_START( hanakanz, ddenlovr_state )
+static MACHINE_CONFIG_START( hanakanz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,8000000) // TMPZ84C015BF-8
@@ -9930,7 +9930,7 @@ static MACHINE_CONFIG_START( hanakanz, ddenlovr_state )
MCFG_SOUND_ADD("ym2413", YM2413, 3579545)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", 1022720, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1022720, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -9945,7 +9945,7 @@ static MACHINE_CONFIG_DERIVED( hkagerou, hanakanz )
MCFG_CPU_IO_MAP(hkagerou_portmap)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kotbinyo, ddenlovr_state )
+static MACHINE_CONFIG_START( kotbinyo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
@@ -9976,7 +9976,7 @@ static MACHINE_CONFIG_START( kotbinyo, ddenlovr_state )
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_37516MHz / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_28_37516MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_37516MHz / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -10068,7 +10068,7 @@ MACHINE_CONFIG_END
Mahjong Super Dai Chuuka Ken
***************************************************************************/
-static MACHINE_CONFIG_START( mjschuka, ddenlovr_state )
+static MACHINE_CONFIG_START( mjschuka )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,XTAL_16MHz/2)
@@ -10102,7 +10102,7 @@ static MACHINE_CONFIG_START( mjschuka, ddenlovr_state )
MCFG_SOUND_ADD("aysnd", AY8910, XTAL_28_63636MHz / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -10364,7 +10364,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jongtei, ddenlovr_state )
+static MACHINE_CONFIG_START( jongtei )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2) // TMPZ84C015
@@ -10395,7 +10395,7 @@ static MACHINE_CONFIG_START( jongtei, ddenlovr_state )
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -10416,7 +10416,7 @@ MACHINE_CONFIG_END
Mahjong Seiryu Densetsu
***************************************************************************/
-static MACHINE_CONFIG_START( sryudens, ddenlovr_state )
+static MACHINE_CONFIG_START( sryudens )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2) // ?
@@ -10450,7 +10450,7 @@ static MACHINE_CONFIG_START( sryudens, ddenlovr_state )
MCFG_SOUND_ADD("aysnd", YMZ284, XTAL_28_63636MHz / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -10463,7 +10463,7 @@ MACHINE_CONFIG_END
***************************************************************************/
// PCB: NM7001004
-static MACHINE_CONFIG_START( janshinp, ddenlovr_state )
+static MACHINE_CONFIG_START( janshinp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2)
@@ -10497,7 +10497,7 @@ static MACHINE_CONFIG_START( janshinp, ddenlovr_state )
MCFG_SOUND_ADD("aysnd", YMZ284, XTAL_28_63636MHz / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -10530,7 +10530,7 @@ MACHINE_START_MEMBER(ddenlovr_state,seljan2)
MACHINE_START_CALL_MEMBER(ddenlovr);
}
-static MACHINE_CONFIG_START( seljan2, ddenlovr_state )
+static MACHINE_CONFIG_START( seljan2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz / 2)
@@ -10566,7 +10566,7 @@ static MACHINE_CONFIG_START( seljan2, ddenlovr_state )
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(ddenlovr_state, ddenlovr_select_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -10580,7 +10580,7 @@ MACHINE_CONFIG_END
***************************************************************************/
-static MACHINE_CONFIG_START( daimyojn, ddenlovr_state )
+static MACHINE_CONFIG_START( daimyojn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_20MHz / 2)
@@ -10611,7 +10611,7 @@ static MACHINE_CONFIG_START( daimyojn, ddenlovr_state )
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_28_63636MHz / 8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz / 28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* devices */
@@ -12919,51 +12919,51 @@ ROM_START( htengoku )
ROM_LOAD( "6510.11b", 0x80000, 0x20000, CRC(0fdd6edf) SHA1(c6870ab538987110337e6e154cba98391c68fb98) )
ROM_END
-GAME( 1992, htengoku, 0, htengoku, htengoku, driver_device, 0, ROT180, "Dynax", "Hanafuda Hana Tengoku (Japan)", 0)
-GAME( 1992, mmpanic, 0, mmpanic, mmpanic, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Monkey Mole Panic (USA)", MACHINE_NO_COCKTAIL )
-GAME( 1993, mjmyorn2, 0, mjmyornt, mjmyorn2, driver_device, 0, ROT0, "Dynax", "Mahjong The Mysterious Orient Part 2 - Exotic Dream", MACHINE_NO_COCKTAIL )
-GAME( 1992, mjmyornt, mjmyorn2, mjmyornt, mjmyornt, driver_device, 0, ROT0, "Dynax", "Mahjong The Mysterious Orient", MACHINE_NO_COCKTAIL )
-GAME( 1993, funkyfig, 0, funkyfig, funkyfig, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "The First Funky Fighter (North America, set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) // scrolling, priority?
-GAME( 1993, funkyfiga, funkyfig, funkyfig, funkyfig, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "The First Funky Fighter (North America, set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, quizchq, 0, quizchq, quizchq, driver_device, 0, ROT0, "Nakanihon", "Quiz Channel Question (Ver 1.00) (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1993, quizchql, quizchq, quizchq, quizchq, driver_device, 0, ROT0, "Nakanihon (Laxan license)", "Quiz Channel Question (Ver 1.23) (Taiwan?)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1993, animaljr, 0, mmpanic, animaljr, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Exciting Animal Land Jr. (USA)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
-GAME( 1993, animaljrs, animaljr, mmpanic, animaljr, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Animalandia Jr. (Spanish)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
-GAME( 1993, animaljrj, animaljr, mmpanic, animaljr, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Waiwai Animal Land Jr. (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1994, mjmyster, 0, mjmyster, mjmyster, driver_device, 0, ROT0, "Dynax", "Mahjong The Mysterious World (set 1)", MACHINE_NO_COCKTAIL )
-GAME( 1994, mjmywrld, mjmyster, mjmywrld, mjmyster, driver_device, 0, ROT0, "Dynax", "Mahjong The Mysterious World (set 2)", MACHINE_NO_COCKTAIL )
-GAME( 1994, hginga, 0, hginga, hginga, driver_device, 0, ROT0, "Dynax", "Hanafuda Hana Ginga", MACHINE_NO_COCKTAIL )
-GAME( 1994, mjmyuniv, 0, mjmyuniv, mjmyster, driver_device, 0, ROT0, "Dynax", "Mahjong The Mysterious Universe (Japan, D85)", MACHINE_NO_COCKTAIL )
-GAME( 1994, quiz365, 0, quiz365, quiz365, driver_device, 0, ROT0, "Nakanihon", "Quiz 365 (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, quiz365t, quiz365, quiz365, quiz365, driver_device, 0, ROT0, "Nakanihon / Taito", "Quiz 365 (Hong Kong & Taiwan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, rongrong, 0, rongrong, rongrong, ddenlovr_state,rongrong, ROT0, "Nakanihon (Activision license)", "Puzzle Game Rong Rong (Europe)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
-GAME( 1994, rongrongj, rongrong, rongrong, rongrong, ddenlovr_state,rongrong, ROT0, "Nakanihon (Activision license)", "Puzzle Game Rong Rong (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
-GAME( 1994, rongrongg, rongrong, rongrong, rongrong, ddenlovr_state,rongrong, ROT0, "Nakanihon (Activision license)", "Puzzle Game Rong Rong (Germany)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
-GAME( 1994, hparadis, 0, hparadis, hparadis, driver_device, 0, ROT0, "Dynax", "Super Hana Paradise (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1995, hgokou, 0, hgokou, hgokou, driver_device, 0, ROT0, "Dynax (Alba license)", "Hanafuda Hana Gokou (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1995, hgokbang, hgokou, hgokbang, hgokou, driver_device, 0, ROT0, "Dynax", "Hanafuda Hana Gokou Bangaihen (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1995, mjdchuka, 0, mjchuuka, mjchuuka, driver_device, 0, ROT0, "Dynax", "Mahjong The Dai Chuuka Ken (China, D111)", MACHINE_NO_COCKTAIL )
-GAME( 1995, mjschuka, 0, mjschuka, mjschuka, driver_device, 0, ROT0, "Dynax", "Mahjong Super Dai Chuuka Ken (Japan, D115)", MACHINE_NO_COCKTAIL )
-GAME( 1995, nettoqc, 0, nettoqc, nettoqc, driver_device, 0, ROT0, "Nakanihon", "Nettoh Quiz Champion (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
-GAME( 1995, ultrchmp, nettoqc, ultrchmp, ultrchmp, driver_device, 0, ROT0, "Nakanihon", "Se Gye Hweng Dan Ultra Champion (Korea)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
-GAME( 1995, ultrchmph, nettoqc, ultrchmp, ultrchmp, driver_device, 0, ROT0, "Nakanihon", "Cheng Ba Shi Jie - Chao Shi Kong Guan Jun (Taiwan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
-GAME( 1995, ddenlovj, 0, ddenlovj, ddenlovj, driver_device, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Shiro Kuro Tsukeyo! (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1995, ddenlovrk, ddenlovj, ddenlovrk, ddenlovr, driver_device, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea)", MACHINE_NO_COCKTAIL )
-GAME( 1995, ddenlovrb, ddenlovj, ddenlovr, ddenlovr, driver_device, 0, ROT0, "bootleg", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea, bootleg)", MACHINE_NO_COCKTAIL )
-GAME( 1996, ddenlovr, ddenlovj, ddenlovr, ddenlovr, driver_device, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 (Hong Kong)", MACHINE_NO_COCKTAIL )
-GAME( 1996, hanakanz, 0, hanakanz, hanakanz, driver_device, 0, ROT0, "Dynax", "Hana Kanzashi (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1997, kotbinyo, hanakanz, kotbinyo, kotbinyo, driver_device, 0, ROT0, "Dynax / Shinwhajin", "Kkot Bi Nyo (Korea)", MACHINE_NO_COCKTAIL )
-GAME( 1997, kotbinsp, 0, kotbinsp, kotbinsp, driver_device, 0, ROT0, "Dynax / Shinwhajin", "Kkot Bi Nyo Special (Korea)", MACHINE_NO_COCKTAIL )
-GAME( 1996, akamaru, 0, akamaru, akamaru, driver_device, 0, ROT0, "Dynax (Nakanihon license)", "Panel & Variety Akamaru Q Jousyou Dont-R", MACHINE_NO_COCKTAIL )
-GAME( 1996, janshinp, 0, janshinp, janshinp, driver_device, 0, ROT0, "Dynax / Sigma", "Mahjong Janshin Plus (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1996, dtoyoken, 0, dtoyoken, dtoyoken, driver_device, 0, ROT0, "Dynax / Sigma", "Mahjong Dai Touyouken (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1996, sryudens, 0, sryudens, sryudens, driver_device, 0, ROT0, "Dynax / Face", "Mahjong Seiryu Densetsu (Japan, NM502)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, seljan2, 0, seljan2, seljan2, driver_device, 0, ROT0, "Dynax / Face", "Return Of Sel Jan II (Japan, NM557)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, mjflove, 0, mjflove, mjflove, driver_device, 0, ROT0, "Nakanihon", "Mahjong Fantasic Love (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, hkagerou, 0, hkagerou, hkagerou, driver_device, 0, ROT0, "Nakanihon / Dynax", "Hana Kagerou [BET] (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1998, mjchuuka, 0, mjchuuka, mjchuuka, driver_device, 0, ROT0, "Dynax", "Mahjong Chuukanejyo (China)", MACHINE_NO_COCKTAIL )
-GAME( 1998, mjreach1, 0, mjreach1, mjreach1, driver_device, 0, ROT0, "Nihon System", "Mahjong Reach Ippatsu (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1999, jongtei, 0, jongtei, jongtei, driver_device, 0, ROT0, "Dynax", "Mahjong Jong-Tei (Japan, NM532-01)", MACHINE_NO_COCKTAIL )
-GAME( 2000, mjgnight, 0, mjgnight, mjgnight, driver_device, 0, ROT0, "Techno-Top", "Mahjong Gorgeous Night (Japan, TSM003-01)", MACHINE_NO_COCKTAIL )
-GAME( 2002, daimyojn, 0, daimyojn, daimyojn, driver_device, 0, ROT0, "Dynax / Techno-Top / Techno-Planning", "Mahjong Daimyojin (Japan, T017-PB-00)", MACHINE_NO_COCKTAIL )
-GAME( 2004, momotaro, 0, daimyojn, daimyojn, ddenlovr_state,momotaro, ROT0, "Techno-Top", "Mahjong Momotarou (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1992, htengoku, 0, htengoku, htengoku, ddenlovr_state, 0, ROT180, "Dynax", "Hanafuda Hana Tengoku (Japan)", 0)
+GAME( 1992, mmpanic, 0, mmpanic, mmpanic, ddenlovr_state, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Monkey Mole Panic (USA)", MACHINE_NO_COCKTAIL )
+GAME( 1993, mjmyorn2, 0, mjmyornt, mjmyorn2, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong The Mysterious Orient Part 2 - Exotic Dream", MACHINE_NO_COCKTAIL )
+GAME( 1992, mjmyornt, mjmyorn2, mjmyornt, mjmyornt, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong The Mysterious Orient", MACHINE_NO_COCKTAIL )
+GAME( 1993, funkyfig, 0, funkyfig, funkyfig, ddenlovr_state, 0, ROT0, "Nakanihon / East Technology (Taito license)", "The First Funky Fighter (North America, set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) // scrolling, priority?
+GAME( 1993, funkyfiga, funkyfig, funkyfig, funkyfig, ddenlovr_state, 0, ROT0, "Nakanihon / East Technology (Taito license)", "The First Funky Fighter (North America, set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, quizchq, 0, quizchq, quizchq, ddenlovr_state, 0, ROT0, "Nakanihon", "Quiz Channel Question (Ver 1.00) (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1993, quizchql, quizchq, quizchq, quizchq, ddenlovr_state, 0, ROT0, "Nakanihon (Laxan license)", "Quiz Channel Question (Ver 1.23) (Taiwan?)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1993, animaljr, 0, mmpanic, animaljr, ddenlovr_state, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Exciting Animal Land Jr. (USA)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, animaljrs, animaljr, mmpanic, animaljr, ddenlovr_state, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Animalandia Jr. (Spanish)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, animaljrj, animaljr, mmpanic, animaljr, ddenlovr_state, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Waiwai Animal Land Jr. (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1994, mjmyster, 0, mjmyster, mjmyster, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong The Mysterious World (set 1)", MACHINE_NO_COCKTAIL )
+GAME( 1994, mjmywrld, mjmyster, mjmywrld, mjmyster, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong The Mysterious World (set 2)", MACHINE_NO_COCKTAIL )
+GAME( 1994, hginga, 0, hginga, hginga, ddenlovr_state, 0, ROT0, "Dynax", "Hanafuda Hana Ginga", MACHINE_NO_COCKTAIL )
+GAME( 1994, mjmyuniv, 0, mjmyuniv, mjmyster, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong The Mysterious Universe (Japan, D85)", MACHINE_NO_COCKTAIL )
+GAME( 1994, quiz365, 0, quiz365, quiz365, ddenlovr_state, 0, ROT0, "Nakanihon", "Quiz 365 (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, quiz365t, quiz365, quiz365, quiz365, ddenlovr_state, 0, ROT0, "Nakanihon / Taito", "Quiz 365 (Hong Kong & Taiwan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, rongrong, 0, rongrong, rongrong, ddenlovr_state, rongrong, ROT0, "Nakanihon (Activision license)", "Puzzle Game Rong Rong (Europe)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
+GAME( 1994, rongrongj, rongrong, rongrong, rongrong, ddenlovr_state, rongrong, ROT0, "Nakanihon (Activision license)", "Puzzle Game Rong Rong (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
+GAME( 1994, rongrongg, rongrong, rongrong, rongrong, ddenlovr_state, rongrong, ROT0, "Nakanihon (Activision license)", "Puzzle Game Rong Rong (Germany)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
+GAME( 1994, hparadis, 0, hparadis, hparadis, ddenlovr_state, 0, ROT0, "Dynax", "Super Hana Paradise (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1995, hgokou, 0, hgokou, hgokou, ddenlovr_state, 0, ROT0, "Dynax (Alba license)", "Hanafuda Hana Gokou (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1995, hgokbang, hgokou, hgokbang, hgokou, ddenlovr_state, 0, ROT0, "Dynax", "Hanafuda Hana Gokou Bangaihen (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1995, mjdchuka, 0, mjchuuka, mjchuuka, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong The Dai Chuuka Ken (China, D111)", MACHINE_NO_COCKTAIL )
+GAME( 1995, mjschuka, 0, mjschuka, mjschuka, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong Super Dai Chuuka Ken (Japan, D115)", MACHINE_NO_COCKTAIL )
+GAME( 1995, nettoqc, 0, nettoqc, nettoqc, ddenlovr_state, 0, ROT0, "Nakanihon", "Nettoh Quiz Champion (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
+GAME( 1995, ultrchmp, nettoqc, ultrchmp, ultrchmp, ddenlovr_state, 0, ROT0, "Nakanihon", "Se Gye Hweng Dan Ultra Champion (Korea)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
+GAME( 1995, ultrchmph, nettoqc, ultrchmp, ultrchmp, ddenlovr_state, 0, ROT0, "Nakanihon", "Cheng Ba Shi Jie - Chao Shi Kong Guan Jun (Taiwan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS )
+GAME( 1995, ddenlovj, 0, ddenlovj, ddenlovj, ddenlovr_state, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Shiro Kuro Tsukeyo! (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1995, ddenlovrk, ddenlovj, ddenlovrk, ddenlovr, ddenlovr_state, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea)", MACHINE_NO_COCKTAIL )
+GAME( 1995, ddenlovrb, ddenlovj, ddenlovr, ddenlovr, ddenlovr_state, 0, ROT0, "bootleg", "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea, bootleg)", MACHINE_NO_COCKTAIL )
+GAME( 1996, ddenlovr, ddenlovj, ddenlovr, ddenlovr, ddenlovr_state, 0, ROT0, "Dynax", "Don Den Lover Vol. 1 (Hong Kong)", MACHINE_NO_COCKTAIL )
+GAME( 1996, hanakanz, 0, hanakanz, hanakanz, ddenlovr_state, 0, ROT0, "Dynax", "Hana Kanzashi (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1997, kotbinyo, hanakanz, kotbinyo, kotbinyo, ddenlovr_state, 0, ROT0, "Dynax / Shinwhajin", "Kkot Bi Nyo (Korea)", MACHINE_NO_COCKTAIL )
+GAME( 1997, kotbinsp, 0, kotbinsp, kotbinsp, ddenlovr_state, 0, ROT0, "Dynax / Shinwhajin", "Kkot Bi Nyo Special (Korea)", MACHINE_NO_COCKTAIL )
+GAME( 1996, akamaru, 0, akamaru, akamaru, ddenlovr_state, 0, ROT0, "Dynax (Nakanihon license)", "Panel & Variety Akamaru Q Jousyou Dont-R", MACHINE_NO_COCKTAIL )
+GAME( 1996, janshinp, 0, janshinp, janshinp, ddenlovr_state, 0, ROT0, "Dynax / Sigma", "Mahjong Janshin Plus (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1996, dtoyoken, 0, dtoyoken, dtoyoken, ddenlovr_state, 0, ROT0, "Dynax / Sigma", "Mahjong Dai Touyouken (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1996, sryudens, 0, sryudens, sryudens, ddenlovr_state, 0, ROT0, "Dynax / Face", "Mahjong Seiryu Densetsu (Japan, NM502)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, seljan2, 0, seljan2, seljan2, ddenlovr_state, 0, ROT0, "Dynax / Face", "Return Of Sel Jan II (Japan, NM557)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, mjflove, 0, mjflove, mjflove, ddenlovr_state, 0, ROT0, "Nakanihon", "Mahjong Fantasic Love (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, hkagerou, 0, hkagerou, hkagerou, ddenlovr_state, 0, ROT0, "Nakanihon / Dynax", "Hana Kagerou [BET] (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1998, mjchuuka, 0, mjchuuka, mjchuuka, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong Chuukanejyo (China)", MACHINE_NO_COCKTAIL )
+GAME( 1998, mjreach1, 0, mjreach1, mjreach1, ddenlovr_state, 0, ROT0, "Nihon System", "Mahjong Reach Ippatsu (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1999, jongtei, 0, jongtei, jongtei, ddenlovr_state, 0, ROT0, "Dynax", "Mahjong Jong-Tei (Japan, NM532-01)", MACHINE_NO_COCKTAIL )
+GAME( 2000, mjgnight, 0, mjgnight, mjgnight, ddenlovr_state, 0, ROT0, "Techno-Top", "Mahjong Gorgeous Night (Japan, TSM003-01)", MACHINE_NO_COCKTAIL )
+GAME( 2002, daimyojn, 0, daimyojn, daimyojn, ddenlovr_state, 0, ROT0, "Dynax / Techno-Top / Techno-Planning", "Mahjong Daimyojin (Japan, T017-PB-00)", MACHINE_NO_COCKTAIL )
+GAME( 2004, momotaro, 0, daimyojn, daimyojn, ddenlovr_state, momotaro, ROT0, "Techno-Top", "Mahjong Momotarou (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index a96786496d2..e49ecba2734 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -936,7 +936,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( ddragon, ddragon_state )
+static MACHINE_CONFIG_START( ddragon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
@@ -979,12 +979,12 @@ static MACHINE_CONFIG_START( ddragon, ddragon_state )
MCFG_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK / 32)
MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK / 32)
MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1006,7 +1006,7 @@ static MACHINE_CONFIG_DERIVED( ddragonba, ddragon )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ddragon6809, ddragon_state )
+static MACHINE_CONFIG_START( ddragon6809 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK / 8) /* 1.5 MHz */
@@ -1049,17 +1049,17 @@ static MACHINE_CONFIG_START( ddragon6809, ddragon_state )
MCFG_SOUND_ADD("adpcm1", MSM5205, MAIN_CLOCK/32)
MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("adpcm2", MSM5205, MAIN_CLOCK/32)
MCFG_MSM5205_VCLK_CB(WRITELINE(ddragon_state, dd_adpcm_int_2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ddragon2, ddragon_state )
+static MACHINE_CONFIG_START( ddragon2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK) /* 12 MHz / 4 internally */
@@ -1100,12 +1100,12 @@ static MACHINE_CONFIG_START( ddragon2, ddragon_state )
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( darktowr, ddragon, darktowr_state )
+static MACHINE_CONFIG_DERIVED( darktowr, ddragon )
/* basic machine hardware */
MCFG_CPU_ADD("mcu", M68705P3, XTAL_4MHz)
@@ -1115,7 +1115,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( darktowr, ddragon, darktowr_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( toffy, ddragon, toffy_state )
+static MACHINE_CONFIG_DERIVED( toffy, ddragon )
/* basic machine hardware */
MCFG_DEVICE_REMOVE("sub")
diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp
index dda330d6321..4f6616b16ed 100644
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@@ -828,7 +828,7 @@ void ddragon3_state::machine_reset()
m_io_reg[i] = 0;
}
-static MACHINE_CONFIG_START( ddragon3, ddragon3_state )
+static MACHINE_CONFIG_START( ddragon3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
@@ -861,7 +861,7 @@ static MACHINE_CONFIG_START( ddragon3, ddragon3_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50)
MACHINE_CONFIG_END
@@ -898,7 +898,7 @@ static MACHINE_CONFIG_DERIVED( ctribe, ddragon3 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wwfwfest, wwfwfest_state )
+static MACHINE_CONFIG_START( wwfwfest )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 24 crystal, 12 rated chip */
@@ -931,7 +931,7 @@ static MACHINE_CONFIG_START( wwfwfest, wwfwfest_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) /* Verified - Pin 7 tied to +5VDC */
+ MCFG_OKIM6295_ADD("oki", 1024188, PIN7_HIGH) /* Verified - Pin 7 tied to +5VDC */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
@@ -1479,20 +1479,20 @@ ROM_END
*
*************************************/
-GAME( 1990, ddragon3, 0, ddragon3, ddragon3, driver_device, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ddragon3j,ddragon3, ddragon3, ddragon3, driver_device, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ddragon3p,ddragon3, ddragon3, ddragon3, driver_device, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ddragon3b,ddragon3, ddragon3b,ddragon3b, driver_device,0, ROT0, "bootleg", "Double Dragon 3 - The Rosetta Stone (bootleg)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1990, ctribe, 0, ctribe, ctribe, driver_device, 0, ROT0, "Technos Japan", "The Combatribes (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ctribe1, ctribe, ctribe, ctribe, driver_device, 0, ROT0, "Technos Japan", "The Combatribes (US set 1?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ctribeo, ctribe, ctribe, ctribe, driver_device, 0, ROT0, "Technos Japan", "The Combatribes (US, older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ctribej, ctribe, ctribe, ctribe, driver_device, 0, ROT0, "Technos Japan", "The Combatribes (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ctribeb, ctribe, ctribe, ctribeb, driver_device, 0, ROT0, "bootleg", "The Combatribes (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ctribeb2, ctribe, ctribe, ctribeb, driver_device, 0, ROT0, "bootleg", "The Combatribes (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, wwfwfest, 0, wwfwfest, wwfwfest, driver_device, 0, ROT0, "Technos Japan (Tecmo license)", "WWF WrestleFest (World)", MACHINE_SUPPORTS_SAVE ) /* Euro label but shows FBI "Winners Don't Do drugs" logo */
-GAME( 1991, wwfwfestu, wwfwfest, wwfwfest, wwfwfest, driver_device, 0, ROT0, "Technos Japan", "WWF WrestleFest (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, wwfwfestb, wwfwfest, wwfwfstb, wwfwfest, driver_device, 0, ROT0, "bootleg", "WWF WrestleFest (US bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, wwfwfestj, wwfwfest, wwfwfest, wwfwfesta, driver_device, 0, ROT0, "Technos Japan (Tecmo license)", "WWF WrestleFest (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, wwfwfestk, wwfwfest, wwfwfest, wwfwfesta, driver_device, 0, ROT0, "Technos Japan (Tecmo license)", "WWF WrestleFest (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ddragon3, 0, ddragon3, ddragon3, ddragon3_state, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ddragon3j, ddragon3, ddragon3, ddragon3, ddragon3_state, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ddragon3p, ddragon3, ddragon3, ddragon3, ddragon3_state, 0, ROT0, "Technos Japan", "Double Dragon 3 - The Rosetta Stone (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ddragon3b, ddragon3, ddragon3b, ddragon3b, ddragon3_state, 0, ROT0, "bootleg", "Double Dragon 3 - The Rosetta Stone (bootleg)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1990, ctribe, 0, ctribe, ctribe, ddragon3_state, 0, ROT0, "Technos Japan", "The Combatribes (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ctribe1, ctribe, ctribe, ctribe, ddragon3_state, 0, ROT0, "Technos Japan", "The Combatribes (US set 1?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ctribeo, ctribe, ctribe, ctribe, ddragon3_state, 0, ROT0, "Technos Japan", "The Combatribes (US, older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ctribej, ctribe, ctribe, ctribe, ddragon3_state, 0, ROT0, "Technos Japan", "The Combatribes (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ctribeb, ctribe, ctribe, ctribeb, ddragon3_state, 0, ROT0, "bootleg", "The Combatribes (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ctribeb2, ctribe, ctribe, ctribeb, ddragon3_state, 0, ROT0, "bootleg", "The Combatribes (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, wwfwfest, 0, wwfwfest, wwfwfest, wwfwfest_state, 0, ROT0, "Technos Japan (Tecmo license)", "WWF WrestleFest (World)", MACHINE_SUPPORTS_SAVE ) // Euro label but shows FBI "Winners Don't Do drugs" logo
+GAME( 1991, wwfwfestu, wwfwfest, wwfwfest, wwfwfest, wwfwfest_state, 0, ROT0, "Technos Japan", "WWF WrestleFest (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, wwfwfestb, wwfwfest, wwfwfstb, wwfwfest, wwfwfest_state, 0, ROT0, "bootleg", "WWF WrestleFest (US bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, wwfwfestj, wwfwfest, wwfwfest, wwfwfesta, wwfwfest_state, 0, ROT0, "Technos Japan (Tecmo license)", "WWF WrestleFest (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, wwfwfestk, wwfwfest, wwfwfest, wwfwfesta, wwfwfest_state, 0, ROT0, "Technos Japan (Tecmo license)", "WWF WrestleFest (Korea)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index b4067ab0fd3..51c6d41ba90 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -98,13 +98,13 @@ WRITE8_MEMBER(ddribble_state::ddribble_vlm5030_ctrl_w)
membank("vlmbank")->set_entry(data & 0x08 ? 1 : 0);
/* b2 : SSG-C rc filter enable */
- m_filter3->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 1000, data & 0x04 ? CAP_N(150) : 0); /* YM2203-SSG-C */
+ m_filter3->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x04 ? CAP_N(150) : 0); /* YM2203-SSG-C */
/* b1 : SSG-B rc filter enable */
- m_filter2->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 1000, data & 0x02 ? CAP_N(150) : 0); /* YM2203-SSG-B */
+ m_filter2->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x02 ? CAP_N(150) : 0); /* YM2203-SSG-B */
/* b0 : SSG-A rc filter enable */
- m_filter1->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 1000, data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */
+ m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 1000, data & 0x01 ? CAP_N(150) : 0); /* YM2203-SSG-A */
}
@@ -256,7 +256,7 @@ void ddribble_state::machine_reset()
m_charbank[1] = 0;
}
-static MACHINE_CONFIG_START( ddribble, ddribble_state )
+static MACHINE_CONFIG_START( ddribble )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* verified on pcb */
@@ -379,5 +379,5 @@ ROM_START( ddribblep )
ROM_LOAD( "voice_10.d7", 0x10000, 0x10000, CRC(b4c97494) SHA1(93f7c3c93f6f790c3f480e183da0105b5ac3593b) )
ROM_END
-GAME( 1986, ddribble, 0, ddribble, ddribble, driver_device, 0, ROT0, "Konami", "Double Dribble", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ddribblep, ddribble, ddribble, ddribble, driver_device, 0, ROT0, "Konami", "Double Dribble (prototype?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ddribble, 0, ddribble, ddribble, ddribble_state, 0, ROT0, "Konami", "Double Dribble", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ddribblep, ddribble, ddribble, ddribble, ddribble_state, 0, ROT0, "Konami", "Double Dribble (prototype?)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp
index 51e9f3303de..648cfdf89a4 100644
--- a/src/mame/drivers/de_2.cpp
+++ b/src/mame/drivers/de_2.cpp
@@ -414,7 +414,7 @@ READ8_MEMBER( de_2_state::sound_latch_r )
WRITE8_MEMBER( de_2_state::sample_bank_w )
{
- static const uint8_t prescale[4] = { MSM5205_S96_4B, MSM5205_S48_4B, MSM5205_S64_4B, 0 };
+ static constexpr uint8_t prescale[4] = { msm5205_device::S96_4B, msm5205_device::S48_4B, msm5205_device::S64_4B, 0 };
m_sample_bank_num = (data & 0x07);
m_sample_bank->set_entry(m_sample_bank_num);
@@ -518,7 +518,7 @@ WRITE8_MEMBER(de_2_state::lamps_w)
}
-static MACHINE_CONFIG_START( de_type1, de_2_state )
+static MACHINE_CONFIG_START( de_type1 )
/* basic machine hardware */
MCFG_DECOCPU_TYPE1_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w))
@@ -542,11 +542,11 @@ static MACHINE_CONFIG_START( de_type1, de_2_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(de_2_state, msm5205_irq_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( de_type2, de_2_state )
+static MACHINE_CONFIG_START( de_type2 )
/* basic machine hardware */
MCFG_DECOCPU_TYPE2_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,display_w))
@@ -570,11 +570,11 @@ static MACHINE_CONFIG_START( de_type2, de_2_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(de_2_state, msm5205_irq_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( de_type2_alpha3, de_2_state )
+static MACHINE_CONFIG_START( de_type2_alpha3 )
/* basic machine hardware */
MCFG_DECOCPU_TYPE2_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,type2alpha3_display_w))
@@ -598,11 +598,11 @@ static MACHINE_CONFIG_START( de_type2_alpha3, de_2_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(de_2_state, msm5205_irq_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( de_type3, de_2_state )
+static MACHINE_CONFIG_START( de_type3 )
/* basic machine hardware */
MCFG_DECOCPU_TYPE3_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_2_state,display_r),WRITE8(de_2_state,alpha3_display_w))
@@ -626,7 +626,7 @@ static MACHINE_CONFIG_START( de_type3, de_2_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MCFG_SOUND_ADD("msm5205", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(de_2_state, msm5205_irq_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bg", 0.50)
MACHINE_CONFIG_END
@@ -950,29 +950,29 @@ ROM_START(torp_a16)
ROM_END
-GAME(1990, bttf_a28, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.8)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, bttf_a27, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, bttf_a20, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.0)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, bttf_a21, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To The Future (2.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(199?, bttf_g27, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.7 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, kiko_a10, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "King Kong (1.0)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, lwar_a83, 0, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (8.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, lwar_a81, lwar_a83, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (8.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, lwar_e90, lwar_a83, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (9.0 Europe)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, mnfb_c29, 0, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "Monday Night Football (2.9, 50cts)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, mnfb_c27, mnfb_c29, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "Monday Night Football (2.7, 50cts)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, poto_a32, 0, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "The Phantom of the Opera (3.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, poto_a29, poto_a32, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "The Phantom of the Opera (2.9)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, play_a24, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Playboy 35th Anniversary (2.4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, robo_a34, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Robocop (3.4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, robo_a30, robo_a34, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Robocop (3.0)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, ssvc_a26, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Secret Service (2.6)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, ssvc_b26, ssvc_a26, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Secret Service (2.6 alternate sound)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, ssvc_a42, ssvc_a26, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Secret Service (4.2 alternate sound)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, simp_a27, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "The Simpsons (2.7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, simp_a20, simp_a27, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "The Simpsons (2.0)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, tmac_a24, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Time Machine (2.4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, tmac_a18, tmac_a24, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Time Machine (1.8)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, tmac_g18, tmac_a24, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Time Machine (1.8, Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, torp_e21, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Torpedo Alley (2.1, Europe)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, torp_a16, torp_e21, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Torpedo Alley (1.6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, bttf_a28, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.8)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, bttf_a27, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, bttf_a20, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.0)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, bttf_a21, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To The Future (2.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(199?, bttf_g27, bttf_a28, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Back To the Future (2.7 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, kiko_a10, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "King Kong (1.0)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, lwar_a83, 0, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (8.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, lwar_a81, lwar_a83, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (8.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, lwar_e90, lwar_a83, de_type1, de_2, de_2_state, de_2, ROT0, "Data East", "Laser War (9.0 Europe)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, mnfb_c29, 0, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "Monday Night Football (2.9, 50cts)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, mnfb_c27, mnfb_c29, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "Monday Night Football (2.7, 50cts)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, poto_a32, 0, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "The Phantom of the Opera (3.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, poto_a29, poto_a32, de_type2_alpha3, de_2, de_2_state, de_2, ROT0, "Data East", "The Phantom of the Opera (2.9)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, play_a24, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Playboy 35th Anniversary (2.4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, robo_a34, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Robocop (3.4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, robo_a30, robo_a34, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "Robocop (3.0)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, ssvc_a26, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Secret Service (2.6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, ssvc_b26, ssvc_a26, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Secret Service (2.6 alternate sound)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, ssvc_a42, ssvc_a26, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Secret Service (4.2 alternate sound)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, simp_a27, 0, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "The Simpsons (2.7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, simp_a20, simp_a27, de_type3, de_2, de_2_state, de_2, ROT0, "Data East", "The Simpsons (2.0)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, tmac_a24, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Time Machine (2.4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, tmac_a18, tmac_a24, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Time Machine (1.8)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, tmac_g18, tmac_a24, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Time Machine (1.8, Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, torp_e21, 0, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Torpedo Alley (2.1, Europe)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, torp_a16, torp_e21, de_type2, de_2, de_2_state, de_2, ROT0, "Data East", "Torpedo Alley (1.6)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp
index 1699ad41f39..2217a25314d 100644
--- a/src/mame/drivers/de_3.cpp
+++ b/src/mame/drivers/de_3.cpp
@@ -391,7 +391,7 @@ DRIVER_INIT_MEMBER(de_3_state,de_3)
{
}
-static MACHINE_CONFIG_START( de_3, de_3_state )
+static MACHINE_CONFIG_START( de_3 )
/* basic machine hardware */
MCFG_DECOCPU_TYPE3_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_3_state,display_r),WRITE8(de_3_state,display_w))
diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp
index fa896e1500a..c313f83c317 100644
--- a/src/mame/drivers/de_3b.cpp
+++ b/src/mame/drivers/de_3b.cpp
@@ -239,7 +239,7 @@ DRIVER_INIT_MEMBER(de_3b_state,de_3b)
{
}
-static MACHINE_CONFIG_START( de_3b, de_3b_state )
+static MACHINE_CONFIG_START( de_3b )
/* basic machine hardware */
MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
MCFG_DECOCPU_DISPLAY(READ8(de_3b_state,display_r),WRITE8(de_3b_state,display_w))
@@ -257,7 +257,7 @@ static MACHINE_CONFIG_START( de_3b, de_3b_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( detest, de_3b_state )
+static MACHINE_CONFIG_START( detest )
/* basic machine hardware */
MCFG_DECOCPU_TYPE3B_ADD("decocpu",XTAL_8MHz / 2, ":maincpu")
@@ -677,33 +677,33 @@ ROM_START(detest)
ROM_END
-GAME(1995, batmanf, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (4.0)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, batmanf3, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (3.0)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, batmanf2, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (2.02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, batmanf1, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (1.02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_uk, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (English)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_cn, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Canadian)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_no, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Norwegian)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_sv, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Swedish)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_at, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Austrian)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_ch, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Swiss)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_de, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_be, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Belgian)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_fr, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_nl, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Dutch)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_it, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Italian)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_sp, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Spanish)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_jp, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Japanese)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bmf_time, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Timed Play)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, baywatch, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bay_d300, baywatch, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch (3.00 Dutch)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bay_d400, baywatch, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch (4.00 English)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bay_e400, baywatch, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch (4.00 Dutch)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, frankst, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Mary Shelley's Frankenstein", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, frankstg, frankst, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Mary Shelley's Frankenstein (Germany)",MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, mav_402, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (Display Rev. 4.02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, mav_401, mav_402, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (Display Rev. 4.01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, mav_400, mav_402, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (Display Rev. 4.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, mav_100, mav_402, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (1.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1998, detest, 0, detest, de_3b, de_3b_state, de_3b, ROT0, "Data East", "Data East Test Chip", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1996, ctcheese, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Cut The Cheese (Redemption)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, batmanf, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (4.0)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, batmanf3, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (3.0)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, batmanf2, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (2.02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, batmanf1, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (1.02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_uk, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (English)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_cn, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Canadian)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_no, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Norwegian)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_sv, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Swedish)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_at, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Austrian)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_ch, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Swiss)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_de, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_be, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Belgian)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_fr, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_nl, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Dutch)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_it, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Italian)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_sp, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Spanish)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_jp, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Japanese)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bmf_time, batmanf, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Batman Forever (Timed Play)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, baywatch, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bay_d300, baywatch, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch (3.00 Dutch)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bay_d400, baywatch, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch (4.00 English)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bay_e400, baywatch, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Baywatch (4.00 Dutch)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, frankst, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Mary Shelley's Frankenstein", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, frankstg, frankst, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Mary Shelley's Frankenstein (Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, mav_402, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (Display Rev. 4.02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, mav_401, mav_402, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (Display Rev. 4.01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, mav_400, mav_402, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (Display Rev. 4.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, mav_100, mav_402, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Maverick (1.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1998, detest, 0, detest, de_3b, de_3b_state, de_3b, ROT0, "Data East", "Data East Test Chip", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1996, ctcheese, 0, de_3b, de_3b, de_3b_state, de_3b, ROT0, "Sega", "Cut The Cheese (Redemption)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index d5612a06d73..8a2ba28b320 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -265,7 +265,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(deadang_state::sub_scanline)
/* Machine Drivers */
-static MACHINE_CONFIG_START( deadang, deadang_state )
+static MACHINE_CONFIG_START( deadang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
@@ -532,7 +532,7 @@ DRIVER_INIT_MEMBER(deadang_state,ghunter)
/* Game Drivers */
-GAME( 1988, deadang, 0, deadang, deadang, deadang_state, deadang, ROT0, "Seibu Kaihatsu", "Dead Angle", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, leadang, deadang, deadang, deadang, deadang_state, deadang, ROT0, "Seibu Kaihatsu", "Lead Angle (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, deadang, 0, deadang, deadang, deadang_state, deadang, ROT0, "Seibu Kaihatsu", "Dead Angle", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, leadang, deadang, deadang, deadang, deadang_state, deadang, ROT0, "Seibu Kaihatsu", "Lead Angle (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, ghunter, deadang, deadang, ghunter, deadang_state, ghunter, ROT0, "Seibu Kaihatsu", "Gang Hunter / Dead Angle", MACHINE_SUPPORTS_SAVE ) // Title is 'Gang Hunter' or 'Dead Angle' depending on control method dipswitch
GAME( 1988, ghunters, deadang, deadang, ghunter, deadang_state, ghunter, ROT0, "Seibu Kaihatsu (Segasa/Sonic license)", "Gang Hunter / Dead Angle (Spain)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index 45be093de3d..719b9cbbd10 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -1449,7 +1449,7 @@ GFXDECODE_END
#define DEC0_VBSTART 256-8
-static MACHINE_CONFIG_START( dec0_base, dec0_state )
+static MACHINE_CONFIG_START( dec0_base )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1510,7 +1510,7 @@ static MACHINE_CONFIG_DERIVED( dec0, dec0_base )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 2 / 10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1538,7 +1538,7 @@ static MACHINE_CONFIG_DERIVED( dec1, dec0_base )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 1))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1571,7 +1571,7 @@ WRITE_LINE_MEMBER(dec0_automat_state::msm2_vclk_cb)
}
-static MACHINE_CONFIG_START( automat, dec0_automat_state )
+static MACHINE_CONFIG_START( automat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -1636,17 +1636,17 @@ static MACHINE_CONFIG_START( automat, dec0_automat_state )
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm1_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm2_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
// this seems very similar to the automat bootleg
-static MACHINE_CONFIG_START( secretab, dec0_automat_state )
+static MACHINE_CONFIG_START( secretab )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
@@ -1708,12 +1708,12 @@ static MACHINE_CONFIG_START( secretab, dec0_automat_state )
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm1_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(dec0_automat_state, msm2_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3586,9 +3586,9 @@ GAME( 1989, secretagj, secretag, slyspy, slyspy, dec0_state, slyspy, ROT0
GAME( 1989, slyspy, secretag, slyspy, slyspy, dec0_state, slyspy, ROT0, "Data East USA", "Sly Spy (US revision 4)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, slyspy3, secretag, slyspy, slyspy, dec0_state, slyspy, ROT0, "Data East USA", "Sly Spy (US revision 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, slyspy2, secretag, slyspy, slyspy, dec0_state, slyspy, ROT0, "Data East USA", "Sly Spy (US revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, midres, 0, midres, midres, driver_device, 0, ROT0, "Data East Corporation", "Midnight Resistance (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, midresu, midres, midres, midresu, driver_device, 0, ROT0, "Data East USA", "Midnight Resistance (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, midresj, midres, midres, midresu, driver_device, 0, ROT0, "Data East Corporation", "Midnight Resistance (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, midres, 0, midres, midres, dec0_state, 0, ROT0, "Data East Corporation", "Midnight Resistance (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, midresu, midres, midres, midresu, dec0_state, 0, ROT0, "Data East USA", "Midnight Resistance (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, midresj, midres, midres, midresu, dec0_state, 0, ROT0, "Data East Corporation", "Midnight Resistance (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, bouldash, 0, slyspy, bouldash, dec0_state, slyspy, ROT0, "Data East Corporation (licensed from First Star)", "Boulder Dash / Boulder Dash Part 2 (World)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, bouldashj, bouldash, slyspy, bouldash, dec0_state, slyspy, ROT0, "Data East Corporation (licensed from First Star)", "Boulder Dash / Boulder Dash Part 2 (Japan)", MACHINE_SUPPORTS_SAVE )
@@ -3606,5 +3606,5 @@ GAME( 1989, ffantasybl, hippodrm, ffantasybl, ffantasybl, dec0_state, ffantasybl
GAME( 1988, drgninjab2, baddudes, drgninjab, drgninja, dec0_state, drgninja, ROT0, "bootleg", "Dragonninja (bootleg with 68705)", MACHINE_SUPPORTS_SAVE ) // is this the same board as above? (region warning hacked to World, but still shows Japanese text)
// these are different to the above but quite similar to each other
-GAME( 1988, automat, robocop, automat, robocop, dec0_state, robocop, ROT0, "bootleg", "Automat (bootleg of Robocop)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // sound rom / music from section z with mods for ADPCM?
-GAME( 1989, secretab, secretag, secretab, slyspy, driver_device, 0, ROT0, "bootleg", "Secret Agent (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, automat, robocop, automat, robocop, dec0_automat_state, robocop, ROT0, "bootleg", "Automat (bootleg of Robocop)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // sound rom / music from section z with mods for ADPCM?
+GAME( 1989, secretab, secretag, secretab, slyspy, dec0_automat_state, 0, ROT0, "bootleg", "Secret Agent (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index 0dc3c4af3d9..0d0d93b03c2 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -1987,7 +1987,7 @@ void dec8_state::machine_reset()
#define DEC8_VBEND 8
#define DEC8_VBSTART 256-8
-static MACHINE_CONFIG_START( lastmisn, dec8_state )
+static MACHINE_CONFIG_START( lastmisn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
@@ -2040,7 +2040,7 @@ static MACHINE_CONFIG_START( lastmisn, dec8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( shackled, dec8_state )
+static MACHINE_CONFIG_START( shackled )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
@@ -2094,7 +2094,7 @@ static MACHINE_CONFIG_START( shackled, dec8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gondo, dec8_state )
+static MACHINE_CONFIG_START( gondo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
@@ -2148,7 +2148,7 @@ static MACHINE_CONFIG_START( gondo, dec8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( garyoret, dec8_state )
+static MACHINE_CONFIG_START( garyoret )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP */
@@ -2202,7 +2202,7 @@ static MACHINE_CONFIG_START( garyoret, dec8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ghostb, dec8_state )
+static MACHINE_CONFIG_START( ghostb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4)
@@ -2266,7 +2266,7 @@ static MACHINE_CONFIG_DERIVED( meikyuh, ghostb )
MCFG_CPU_PROGRAM_MAP(dec8_s_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( csilver, dec8_state )
+static MACHINE_CONFIG_START( csilver )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
@@ -2321,11 +2321,11 @@ static MACHINE_CONFIG_START( csilver, dec8_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(dec8_state, csilver_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( oscar, dec8_state )
+static MACHINE_CONFIG_START( oscar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, XTAL_12MHz/2) /* verified on pcb */
@@ -2383,7 +2383,7 @@ static MACHINE_CONFIG_START( oscar, dec8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( srdarwin, dec8_state )
+static MACHINE_CONFIG_START( srdarwin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809,2000000) /* MC68A09EP */
@@ -2429,7 +2429,7 @@ static MACHINE_CONFIG_START( srdarwin, dec8_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cobracom, dec8_state )
+static MACHINE_CONFIG_START( cobracom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
@@ -3704,28 +3704,28 @@ DRIVER_INIT_MEMBER(dec8_state,cobracom)
/******************************************************************************/
-GAME( 1986, lastmisn, 0, lastmisn, lastmisn, dec8_state, lastmisn, ROT270, "Data East USA", "Last Mission (US revision 6)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lastmisno, lastmisn, lastmisn, lastmisn, dec8_state, lastmisn, ROT270, "Data East USA", "Last Mission (US revision 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lastmisn, 0, lastmisn, lastmisn, dec8_state, lastmisn, ROT270, "Data East USA", "Last Mission (US revision 6)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lastmisno, lastmisn, lastmisn, lastmisn, dec8_state, lastmisn, ROT270, "Data East USA", "Last Mission (US revision 5)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, lastmisnj, lastmisn, lastmisn, lastmisnj, dec8_state, lastmisn, ROT270, "Data East Corporation", "Last Mission (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, shackled, 0, shackled, shackled, dec8_state, shackled, ROT0, "Data East USA", "Shackled (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, breywood, shackled, shackled, breywood, dec8_state, shackled, ROT0, "Data East Corporation", "Breywood (Japan revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, gondo, 0, gondo, gondo, dec8_state, gondo, ROT270, "Data East USA", "Gondomania (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, makyosen, gondo, gondo, gondo, dec8_state, gondo, ROT270, "Data East Corporation", "Makyou Senshi (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, garyoret, 0, garyoret, garyoret, dec8_state, garyoret, ROT0, "Data East Corporation", "Garyo Retsuden (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ghostb, 0, ghostb, ghostb, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 2 Players, revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ghostb2a, ghostb, ghostb, ghostb2a, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 2 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ghostb3, ghostb, ghostb, ghostb3, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 3 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ghostb3a, ghostb, ghostb, ghostb3, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 3 Players, revision ?)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // ROMs confirmed working on PCB, confirmed problem with the fake MCU ROM
-GAME( 1987, meikyuh, ghostb, meikyuh, meikyuh, dec8_state, meikyuh, ROT0, "Data East Corporation", "Meikyuu Hunter G (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, meikyuha, ghostb, meikyuh, meikyuh, dec8_state, meikyuh, ROT0, "Data East Corporation", "Meikyuu Hunter G (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, csilver, 0, csilver, csilver, dec8_state, csilver, ROT0, "Data East Corporation", "Captain Silver (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, csilverj, csilver, csilver, csilverj, dec8_state, csilver, ROT0, "Data East Corporation", "Captain Silver (Japan, revision 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, csilverja, csilver, csilver, csilverj, dec8_state, csilver, ROT0, "Data East Corporation", "Captain Silver (Japan, revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, oscar, 0, oscar, oscar, dec8_state, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (World revision 0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, oscaru, oscar, oscar, oscarj, dec8_state, oscar, ROT0, "Data East USA", "Psycho-Nics Oscar (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, oscarj1, oscar, oscar, oscarj, dec8_state, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, oscarj2, oscar, oscar, oscarj, dec8_state, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, srdarwin, 0, srdarwin, srdarwin, dec8_state, srdarwin, ROT270, "Data East Corporation", "Super Real Darwin (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, shackled, 0, shackled, shackled, dec8_state, shackled, ROT0, "Data East USA", "Shackled (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, breywood, shackled, shackled, breywood, dec8_state, shackled, ROT0, "Data East Corporation", "Breywood (Japan revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, gondo, 0, gondo, gondo, dec8_state, gondo, ROT270, "Data East USA", "Gondomania (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, makyosen, gondo, gondo, gondo, dec8_state, gondo, ROT270, "Data East Corporation", "Makyou Senshi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, garyoret, 0, garyoret, garyoret, dec8_state, garyoret, ROT0, "Data East Corporation", "Garyo Retsuden (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ghostb, 0, ghostb, ghostb, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 2 Players, revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ghostb2a, ghostb, ghostb, ghostb2a, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 2 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ghostb3, ghostb, ghostb, ghostb3, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 3 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ghostb3a, ghostb, ghostb, ghostb3, dec8_state, ghostb, ROT0, "Data East USA", "The Real Ghostbusters (US 3 Players, revision ?)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // ROMs confirmed working on PCB, confirmed problem with the fake MCU ROM
+GAME( 1987, meikyuh, ghostb, meikyuh, meikyuh, dec8_state, meikyuh, ROT0, "Data East Corporation", "Meikyuu Hunter G (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, meikyuha, ghostb, meikyuh, meikyuh, dec8_state, meikyuh, ROT0, "Data East Corporation", "Meikyuu Hunter G (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, csilver, 0, csilver, csilver, dec8_state, csilver, ROT0, "Data East Corporation", "Captain Silver (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, csilverj, csilver, csilver, csilverj, dec8_state, csilver, ROT0, "Data East Corporation", "Captain Silver (Japan, revision 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, csilverja, csilver, csilver, csilverj, dec8_state, csilver, ROT0, "Data East Corporation", "Captain Silver (Japan, revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, oscar, 0, oscar, oscar, dec8_state, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (World revision 0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, oscaru, oscar, oscar, oscarj, dec8_state, oscar, ROT0, "Data East USA", "Psycho-Nics Oscar (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, oscarj1, oscar, oscar, oscarj, dec8_state, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, oscarj2, oscar, oscar, oscarj, dec8_state, oscar, ROT0, "Data East Corporation", "Psycho-Nics Oscar (Japan revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, srdarwin, 0, srdarwin, srdarwin, dec8_state, srdarwin, ROT270, "Data East Corporation", "Super Real Darwin (World)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, srdarwinj, srdarwin, srdarwin, srdarwinj, dec8_state, srdarwin, ROT270, "Data East Corporation", "Super Real Darwin (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, cobracom, 0, cobracom, cobracom, dec8_state, cobracom, ROT0, "Data East Corporation", "Cobra-Command (World revision 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, cobracomj, cobracom, cobracom, cobracom, dec8_state, cobracom, ROT0, "Data East Corporation", "Cobra-Command (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, cobracom, 0, cobracom, cobracom, dec8_state, cobracom, ROT0, "Data East Corporation", "Cobra-Command (World revision 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, cobracomj, cobracom, cobracom, cobracom, dec8_state, cobracom, ROT0, "Data East Corporation", "Cobra-Command (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp
index a837dc960f7..d909e9cc1bb 100644
--- a/src/mame/drivers/deco156.cpp
+++ b/src/mame/drivers/deco156.cpp
@@ -339,7 +339,7 @@ DECOSPR_PRIORITY_CB_MEMBER(deco156_state::pri_callback)
return 0;
}
-static MACHINE_CONFIG_START( hvysmsh, deco156_state )
+static MACHINE_CONFIG_START( hvysmsh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
@@ -381,16 +381,16 @@ static MACHINE_CONFIG_START( hvysmsh, deco156_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 28000000/28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 28000000/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 28000000/14, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 28000000/14, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wcvol95, deco156_state )
+static MACHINE_CONFIG_START( wcvol95 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000) /* Unconfirmed */
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp
index ffb6d966dd5..7224cbd3c3a 100644
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@@ -1824,7 +1824,7 @@ DECO16IC_BANK_CB_MEMBER(deco32_state::captaven_bank_callback)
return bank * 0x4000;
}
-static MACHINE_CONFIG_START( captaven, deco32_state )
+static MACHINE_CONFIG_START( captaven )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, XTAL_28MHz/4) /* verified on pcb (Data East 101 custom)*/
@@ -1897,11 +1897,11 @@ static MACHINE_CONFIG_START( captaven, deco32_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
+ MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
+ MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH) /* verified on pcb; pin 7 is floating to 2.5V (left unconnected), so I presume High */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
@@ -1930,7 +1930,7 @@ DECO16IC_BANK_CB_MEMBER(deco32_state::fghthist_bank_callback)
return bank * 0x1000;
}
-static MACHINE_CONFIG_START( fghthist, deco32_state ) /* DE-0380-2 PCB */
+static MACHINE_CONFIG_START( fghthist ) /* DE-0380-2 PCB */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
@@ -2006,16 +2006,16 @@ static MACHINE_CONFIG_START( fghthist, deco32_state ) /* DE-0380-2 PCB */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fghthsta, deco32_state ) /* DE-0395-1 PCB */
+static MACHINE_CONFIG_START( fghthsta ) /* DE-0395-1 PCB */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
@@ -2090,11 +2090,11 @@ static MACHINE_CONFIG_START( fghthsta, deco32_state ) /* DE-0395-1 PCB */
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
@@ -2138,7 +2138,7 @@ DECO16IC_BANK_CB_MEMBER(dragngun_state::bank_2_callback)
return bank * 0x1000;
}
-static MACHINE_CONFIG_START( dragngun, dragngun_state )
+static MACHINE_CONFIG_START( dragngun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
@@ -2216,15 +2216,15 @@ static MACHINE_CONFIG_START( dragngun, dragngun_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
- MCFG_OKIM6295_ADD("oki3", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki3", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2248,7 +2248,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dragngun_state::lockload_vbl_irq)
}
-static MACHINE_CONFIG_START( lockload, dragngun_state )
+static MACHINE_CONFIG_START( lockload )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
@@ -2328,11 +2328,11 @@ static MACHINE_CONFIG_START( lockload, dragngun_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.42)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.42)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35)
MACHINE_CONFIG_END
@@ -2353,7 +2353,7 @@ DECO16IC_BANK_CB_MEMBER(deco32_state::tattass_bank_callback)
return bank * 0x1000;
}
-static MACHINE_CONFIG_START( tattass, deco32_state )
+static MACHINE_CONFIG_START( tattass )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000/4) // unconfirmed
@@ -2420,7 +2420,7 @@ static MACHINE_CONFIG_START( tattass, deco32_state )
MCFG_DECOBSMT_ADD(DECOBSMT_TAG)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nslasher, deco32_state )
+static MACHINE_CONFIG_START( nslasher )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28322000/4)
@@ -2500,11 +2500,11 @@ static MACHINE_CONFIG_START( nslasher, deco32_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp
index b9736735627..7a62b86dfb5 100644
--- a/src/mame/drivers/deco_ld.cpp
+++ b/src/mame/drivers/deco_ld.cpp
@@ -456,7 +456,7 @@ void deco_ld_state::machine_start()
{
}
-static MACHINE_CONFIG_START( rblaster, deco_ld_state )
+static MACHINE_CONFIG_START( rblaster )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6502,8000000/2)
@@ -659,9 +659,9 @@ ROM_END
-GAME( 1983, begas, 0, rblaster, begas, driver_device, 0, ROT0, "Data East", "Bega's Battle (Revision 3)", MACHINE_NOT_WORKING )
-GAME( 1983, begas1, begas, rblaster, begas, driver_device, 0, ROT0, "Data East", "Bega's Battle (Revision 1)", MACHINE_NOT_WORKING )
-GAME( 1984, cobra, 0, rblaster, cobra, driver_device, 0, ROT0, "Data East", "Cobra Command (Data East LD, set 1)", MACHINE_NOT_WORKING )
-GAME( 1984, cobraa, cobra, rblaster, cobra, driver_device, 0, ROT0, "Data East", "Cobra Command (Data East LD, set 2)", MACHINE_NOT_WORKING ) // might be a prototype
+GAME( 1983, begas, 0, rblaster, begas, deco_ld_state, 0, ROT0, "Data East", "Bega's Battle (Revision 3)", MACHINE_NOT_WORKING )
+GAME( 1983, begas1, begas, rblaster, begas, deco_ld_state, 0, ROT0, "Data East", "Bega's Battle (Revision 1)", MACHINE_NOT_WORKING )
+GAME( 1984, cobra, 0, rblaster, cobra, deco_ld_state, 0, ROT0, "Data East", "Cobra Command (Data East LD, set 1)", MACHINE_NOT_WORKING )
+GAME( 1984, cobraa, cobra, rblaster, cobra, deco_ld_state, 0, ROT0, "Data East", "Cobra Command (Data East LD, set 2)", MACHINE_NOT_WORKING ) // might be a prototype
// Thunder Storm (Cobra Command Japanese version)
-GAME( 1985, rblaster, 0, rblaster, rblaster, driver_device, 0, ROT0, "Data East", "Road Blaster (Data East LD)", MACHINE_NOT_WORKING )
+GAME( 1985, rblaster, 0, rblaster, rblaster, deco_ld_state, 0, ROT0, "Data East", "Road Blaster (Data East LD)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp
index c0e336278ca..9fee581cfcc 100644
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@@ -502,7 +502,7 @@ MACHINE_RESET_MEMBER(deco_mlc_state,mlc)
m_raster_irq_timer = machine().device<timer_device>("int_timer");
}
-static MACHINE_CONFIG_START( avengrgs, deco_mlc_state )
+static MACHINE_CONFIG_START( avengrgs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
@@ -535,7 +535,7 @@ static MACHINE_CONFIG_START( avengrgs, deco_mlc_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mlc, deco_mlc_state )
+static MACHINE_CONFIG_START( mlc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index 53660726a53..55b11a0c13b 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -773,7 +773,7 @@ PALETTE_INIT_MEMBER(decocass_state, decocass)
}
-static MACHINE_CONFIG_START( decocass, decocass_state )
+static MACHINE_CONFIG_START( decocass )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", DECO_222, HCLK4) /* the earlier revision board doesn't have the 222 but must have the same thing implemented in logic for the M6502 */
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index 9a7dfa56a52..4c56da881a7 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -864,7 +864,7 @@ DRIVER_INIT_MEMBER(dectalk_state,dectalk)
timer_set(attotime::from_hz(10000), TIMER_OUTFIFO_READ);
}
-static MACHINE_CONFIG_START( dectalk, dectalk_state )
+static MACHINE_CONFIG_START( dectalk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* E74 20MHz OSC (/2) */
MCFG_CPU_PROGRAM_MAP(m68k_mem)
@@ -1010,5 +1010,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, dectalk, 0, 0, dectalk, dectalk, dectalk_state, dectalk, "Digital Equipment Corporation", "DECtalk DTC-01", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, dectalk, 0, 0, dectalk, dectalk, dectalk_state, dectalk, "Digital Equipment Corporation", "DECtalk DTC-01", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index 9a7087ec88e..9b881fff4e7 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -381,7 +381,7 @@ void decwriter_state::machine_reset()
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( la120, decwriter_state )
+static MACHINE_CONFIG_START( la120 )
MCFG_CPU_ADD("maincpu",I8080, XTAL_18MHz / 9) // 18Mhz xtal on schematics, using an i8224 clock divider/reset sanitizer IC
MCFG_CPU_PROGRAM_MAP(la120_mem)
@@ -438,5 +438,5 @@ ROM_END
//**************************************************************************
// DRIVERS
//**************************************************************************
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, la120, 0, 0, la120, la120, driver_device, 0, "Digital Equipment Corporation", "DECwriter III (LA120)", MACHINE_NO_SOUND | MACHINE_IS_SKELETON | MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1978, la120, 0, 0, la120, la120, decwriter_state, 0, "Digital Equipment Corporation", "DECwriter III (LA120)", MACHINE_NO_SOUND | MACHINE_IS_SKELETON | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp
index ea4969c5a8e..ca1e338a95d 100644
--- a/src/mame/drivers/deniam.cpp
+++ b/src/mame/drivers/deniam.cpp
@@ -255,7 +255,7 @@ void deniam_state::machine_reset()
m_oki->set_rom_bank(0);
}
-static MACHINE_CONFIG_START( deniam16b, deniam_state )
+static MACHINE_CONFIG_START( deniam16b )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
@@ -290,11 +290,11 @@ static MACHINE_CONFIG_START( deniam16b, deniam_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( deniam16c, deniam_state )
+static MACHINE_CONFIG_START( deniam16c )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_25MHz/2) /* 12.5Mhz verified */
@@ -322,7 +322,7 @@ static MACHINE_CONFIG_START( deniam16c, deniam_state )
MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -420,7 +420,7 @@ ROM_END
-GAME( 1996, logicpro, 0, deniam16b, logicpr2, deniam_state, logicpro, ROT0, "Deniam", "Logic Pro (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, croquis, logicpro, deniam16b, logicpr2, deniam_state, logicpro, ROT0, "Deniam", "Croquis (Germany)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, karianx, 0, deniam16b, karianx, deniam_state, karianx, ROT0, "Deniam", "Karian Cross (Rev. 1.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, logicpr2, 0, deniam16c, logicpr2, deniam_state, logicpro, ROT0, "Deniam", "Logic Pro 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, logicpro, 0, deniam16b, logicpr2, deniam_state, logicpro, ROT0, "Deniam", "Logic Pro (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, croquis, logicpro, deniam16b, logicpr2, deniam_state, logicpro, ROT0, "Deniam", "Croquis (Germany)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, karianx, 0, deniam16b, karianx, deniam_state, karianx, ROT0, "Deniam", "Karian Cross (Rev. 1.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, logicpr2, 0, deniam16c, logicpr2, deniam_state, logicpro, ROT0, "Deniam", "Logic Pro 2 (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp
index 52669b33d80..b06f519baa4 100644
--- a/src/mame/drivers/deshoros.cpp
+++ b/src/mame/drivers/deshoros.cpp
@@ -261,7 +261,7 @@ void destiny_state::machine_reset()
bank_select_w(m_maincpu->space(AS_PROGRAM), 0, 0);
}
-static MACHINE_CONFIG_START( destiny, destiny_state )
+static MACHINE_CONFIG_START( destiny )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_4MHz/2)
@@ -314,4 +314,4 @@ ROM_START( destiny )
ROM_LOAD( "ag11.18a", 0x16000, 0x2000, CRC(5f7bf9f9) SHA1(281f89c0bccfcc2bdc1d4d0a5b9cc9a8ab2e7869) )
ROM_END
-GAME( 1983, destiny, 0, destiny, destiny, driver_device, 0, ROT0, "Data East Corporation", "Destiny - The Fortuneteller (USA)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NODEVICE_PRINTER )
+GAME( 1983, destiny, 0, destiny, destiny, destiny_state, 0, ROT0, "Data East Corporation", "Destiny - The Fortuneteller (USA)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NODEVICE_PRINTER )
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index 1b643230a0a..16b073f793e 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -490,7 +490,7 @@ void destroyr_state::machine_start()
save_item(NAME(m_potsense));
}
-static MACHINE_CONFIG_START( destroyr, destroyr_state )
+static MACHINE_CONFIG_START( destroyr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 16)
@@ -565,5 +565,5 @@ ROM_START( destroyr1 )
ROM_END
-GAMEL( 1977, destroyr, 0, destroyr, destroyr, driver_device, 0, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_destroyr )
-GAMEL( 1977, destroyr1, destroyr, destroyr, destroyr, driver_device, 0, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_destroyr )
+GAMEL( 1977, destroyr, 0, destroyr, destroyr, destroyr_state, 0, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_destroyr )
+GAMEL( 1977, destroyr1, destroyr, destroyr, destroyr, destroyr_state, 0, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_destroyr )
diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp
index 8b1852a2202..47adce90c6b 100644
--- a/src/mame/drivers/dfruit.cpp
+++ b/src/mame/drivers/dfruit.cpp
@@ -364,7 +364,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dfruit_state::dfruit_irq_scanline)
#define MASTER_CLOCK XTAL_14MHz
-static MACHINE_CONFIG_START( dfruit, dfruit_state )
+static MACHINE_CONFIG_START( dfruit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/2) //!!! TC0091LVC !!!
@@ -417,4 +417,4 @@ ROM_START( dfruit )
ROM_LOAD( "c2.ic10", 0x00000, 0x80000, CRC(d869ab24) SHA1(382e874a846855a7f6f8811625aaa30d9dfa1ce2) )
ROM_END
-GAME( 1993, dfruit, 0, dfruit, dfruit, driver_device, 0, ROT0, "Nippon Data Kiki / Star Fish", "Fruit Dream (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, dfruit, 0, dfruit, dfruit, dfruit_state, 0, ROT0, "Nippon Data Kiki / Star Fish", "Fruit Dream (Japan)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index 56cd9f6ffce..e6f4b25b833 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -317,7 +317,7 @@ static SLOT_INTERFACE_START( dgnbeta_floppies )
SLOT_INTERFACE("dd", FLOPPY_35_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( dgnbeta, dgn_beta_state )
+static MACHINE_CONFIG_START( dgnbeta )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M6809E, DGNBETA_CPU_SPEED_HZ) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(dgnbeta_map)
@@ -418,5 +418,5 @@ ROM_START(dgnbeta)
ROM_LOAD("betachar.rom" ,0x0000 ,0x2000 ,CRC(ca79d66c) SHA1(8e2090d471dd97a53785a7f44a49d3c8c85b41f2))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, dgnbeta, 0, 0, dgnbeta, dgnbeta, driver_device, 0, "Dragon Data Ltd", "Dragon 128 (Beta)", MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1984, dgnbeta, 0, 0, dgnbeta, dgnbeta, dgn_beta_state, 0, "Dragon Data Ltd", "Dragon 128 (Beta)", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp
index 46aaaed084f..3401d14a68e 100644
--- a/src/mame/drivers/dgpix.cpp
+++ b/src/mame/drivers/dgpix.cpp
@@ -422,7 +422,7 @@ void dgpix_state::machine_reset()
}
-static MACHINE_CONFIG_START( dgpix, dgpix_state )
+static MACHINE_CONFIG_START( dgpix )
MCFG_CPU_ADD("maincpu", E132XT, 20000000*4) /* 4x internal multiplier */
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp
index f44f4e65ad8..08c0879f2cf 100644
--- a/src/mame/drivers/didact.cpp
+++ b/src/mame/drivers/didact.cpp
@@ -1353,7 +1353,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(didact_state::scan_artwork)
#define CAN09T_BAUDGEN_CLOCK XTAL_1_8432MHz
#define CAN09T_ACIA_CLOCK (CAN09T_BAUDGEN_CLOCK / 12)
-static MACHINE_CONFIG_START( can09t, can09t_state )
+static MACHINE_CONFIG_START( can09t )
MCFG_CPU_ADD("maincpu", M6809, XTAL_4_9152MHz) // IPL crystal
MCFG_CPU_PROGRAM_MAP(can09t_map)
@@ -1397,7 +1397,7 @@ MACHINE_CONFIG_END
#define CAN09_X1_CLOCK XTAL_22_1184MHz /* UKI 22118.40 Khz */
#define CAN09_CPU_CLOCK (CAN09_X1_CLOCK / 16) /* ~1.38MHz Divider needs to be check but is the most likelly */
-static MACHINE_CONFIG_START( can09, can09_state )
+static MACHINE_CONFIG_START( can09 )
MCFG_CPU_ADD("maincpu", M6809E, CAN09_CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(can09_map)
@@ -1471,7 +1471,7 @@ static MACHINE_CONFIG_START( can09, can09_state )
#endif
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( e100, e100_state )
+static MACHINE_CONFIG_START( e100 )
MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(e100_map)
@@ -1532,7 +1532,7 @@ static MACHINE_CONFIG_START( e100, e100_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("video50hz", e100_state, rtc_w, attotime::from_hz(100)) /* Will be divided by two through toggle in the handler */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( md6802, md6802_state )
+static MACHINE_CONFIG_START( md6802 )
MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(md6802_map)
MCFG_DEFAULT_LAYOUT(layout_md6802)
@@ -1565,7 +1565,7 @@ static MACHINE_CONFIG_START( md6802, md6802_state )
MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mp68a, mp68a_state )
+static MACHINE_CONFIG_START( mp68a )
// Clock source is based on a N9602N Dual Retriggerable Resettable Monostable Multivibrator oscillator at aprox 505KHz.
// Trimpot seems broken/stuck at 5K Ohm thu. ROM code 1Ms delay loops suggest 1MHz+
MCFG_CPU_ADD("maincpu", M6800, 505000)
@@ -1676,9 +1676,9 @@ ROM_START( mp68a ) // ROM image from http://elektronikforumet.com/forum/viewtopi
ROM_LOAD( "didactB.bin", 0x0a00, 0x0200, CRC(592898dc) SHA1(2962f4817712cae97f3ab37b088fc73e66535ff8) )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1979, mp68a, 0, 0, mp68a, mp68a, driver_device, 0, "Didact AB", "mp68a", MACHINE_NO_SOUND_HW )
-COMP( 1982, e100, 0, 0, e100, e100, driver_device, 0, "Didact AB", "Esselte 100", MACHINE_NO_SOUND_HW )
-COMP( 1983, md6802, 0, 0, md6802, md6802, driver_device, 0, "Didact AB", "Mikrodator 6802", MACHINE_NO_SOUND_HW )
-COMP( 1984, can09, 0, 0, can09, can09, driver_device, 0, "Candela Data AB", "Candela CAN09 main unit", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1984, can09t, 0, 0, can09t, can09t, driver_device, 0, "Candela Data AB", "Candela CAN09 terminal", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1979, mp68a, 0, 0, mp68a, mp68a, mp68a_state, 0, "Didact AB", "mp68a", MACHINE_NO_SOUND_HW )
+COMP( 1982, e100, 0, 0, e100, e100, e100_state, 0, "Didact AB", "Esselte 100", MACHINE_NO_SOUND_HW )
+COMP( 1983, md6802, 0, 0, md6802, md6802, md6802_state, 0, "Didact AB", "Mikrodator 6802", MACHINE_NO_SOUND_HW )
+COMP( 1984, can09, 0, 0, can09, can09, can09_state, 0, "Candela Data AB", "Candela CAN09 main unit", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1984, can09t, 0, 0, can09t, can09t, can09t_state, 0, "Candela Data AB", "Candela CAN09 terminal", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp
index b19aa584ac4..263cf340431 100644
--- a/src/mame/drivers/dietgo.cpp
+++ b/src/mame/drivers/dietgo.cpp
@@ -209,7 +209,7 @@ void dietgo_state::machine_start()
{
}
-static MACHINE_CONFIG_START( dietgo, dietgo_state )
+static MACHINE_CONFIG_START( dietgo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
@@ -268,7 +268,7 @@ static MACHINE_CONFIG_START( dietgo, dietgo_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 1)) /* IRQ 2 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_32_22MHz/32, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp
index 50dbb4fa138..95378832eec 100644
--- a/src/mame/drivers/digel804.cpp
+++ b/src/mame/drivers/digel804.cpp
@@ -85,7 +85,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
required_device<mos6551_device> m_acia;
- required_device<roc10937_t> m_vfd;
+ required_device<roc10937_device> m_vfd;
required_device<mm74c922_device> m_kb;
required_device<ram_device> m_ram;
required_memory_bank m_rambank;
@@ -584,7 +584,7 @@ WRITE_LINE_MEMBER( digel804_state::ep804_acia_irq_w )
{
}
-static MACHINE_CONFIG_START( digel804, digel804_state )
+static MACHINE_CONFIG_START( digel804 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_6864MHz/2) /* Z80A, X1(aka E0 on schematics): 3.6864Mhz */
MCFG_CPU_PROGRAM_MAP(z80_mem_804_1_4)
@@ -723,6 +723,6 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, digel804, 0, 0, digel804, digel804, digel804_state, digel804, "Digelec, Inc", "Digelec 804 EPROM Programmer", MACHINE_NOT_WORKING )
-COMP( 1982, ep804, digel804, 0, ep804, digel804, digel804_state, digel804, "Wavetek/Digelec, Inc", "EP804 EPROM Programmer", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, digel804, 0, 0, digel804, digel804, digel804_state, digel804, "Digelec, Inc", "Digelec 804 EPROM Programmer", MACHINE_NOT_WORKING )
+COMP( 1982, ep804, digel804, 0, ep804, digel804, digel804_state, digel804, "Wavetek/Digelec, Inc", "EP804 EPROM Programmer", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/digijet.cpp b/src/mame/drivers/digijet.cpp
index 6a3e18d374d..f21c4a650ad 100644
--- a/src/mame/drivers/digijet.cpp
+++ b/src/mame/drivers/digijet.cpp
@@ -45,7 +45,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( digijet )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( digijet, digijet_state )
+static MACHINE_CONFIG_START( digijet )
/* basic machine hardware */
MCFG_CPU_ADD(I8049_TAG, I8049, XTAL_11MHz)
MCFG_CPU_IO_MAP(io_map)
@@ -56,5 +56,5 @@ ROM_START( digijet )
ROM_LOAD( "vanagon_85_usa_ca.bin", 0x000, 0x800, CRC(2ed7c4c5) SHA1(ae48d8892b44fe76b48bcefd293c15cd47af3fba) ) // Volkswagen Vanagon, 1985, USA, California
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1985, digijet, 0, 0, digijet, digijet, driver_device, 0, "Volkswagen", "Digijet", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1985, digijet, 0, 0, digijet, digijet, digijet_state, 0, "Volkswagen", "Digijet", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index bf528eeff99..8e9830fe9dd 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -54,7 +54,7 @@ public:
, m_ram(*this, "ram")
, m_palette(*this, "palette")
, m_p_chargen(*this, "chargen")
- { }
+ { }
DECLARE_READ16_MEMBER( dim68k_duart_r );
DECLARE_READ16_MEMBER( dim68k_fdc_r );
@@ -69,7 +69,7 @@ public:
DECLARE_WRITE16_MEMBER( dim68k_video_control_w );
DECLARE_WRITE16_MEMBER( dim68k_video_high_w );
DECLARE_WRITE16_MEMBER( dim68k_video_reset_w );
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
MC6845_UPDATE_ROW(crtc_update_row);
private:
@@ -298,12 +298,12 @@ static SLOT_INTERFACE_START( dim68k_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
-WRITE8_MEMBER( dim68k_state::kbd_put )
+void dim68k_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( dim68k, dim68k_state )
+static MACHINE_CONFIG_START( dim68k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(dim68k_mem)
@@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( dim68k, dim68k_state )
MCFG_MC6845_UPDATE_ROW_CB(dim68k_state, crtc_update_row)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(dim68k_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(dim68k_state, kbd_put))
// software lists
MCFG_SOFTWARE_LIST_ADD("flop_list", "dim68k")
@@ -397,5 +397,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, dim68k, 0, 0, dim68k, dim68k, driver_device, 0, "Micro Craft", "Dimension 68000", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, dim68k, 0, 0, dim68k, dim68k, dim68k_state, 0, "Micro Craft", "Dimension 68000", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp
index 4115efef2b8..6bf30e5ad3d 100644
--- a/src/mame/drivers/discoboy.cpp
+++ b/src/mame/drivers/discoboy.cpp
@@ -443,7 +443,7 @@ WRITE_LINE_MEMBER(discoboy_state::yunsung8_adpcm_int)
m_audiocpu->set_input_line(INPUT_LINE_NMI, m_toggle);
}
-static MACHINE_CONFIG_START( discoboy, discoboy_state )
+static MACHINE_CONFIG_START( discoboy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */
@@ -489,7 +489,7 @@ static MACHINE_CONFIG_START( discoboy, discoboy_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(discoboy_state, yunsung8_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp
index e06dc334728..bb1bcfd65e1 100644
--- a/src/mame/drivers/divebomb.cpp
+++ b/src/mame/drivers/divebomb.cpp
@@ -445,7 +445,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( divebomb, divebomb_state )
+static MACHINE_CONFIG_START( divebomb )
MCFG_CPU_ADD("fgcpu", Z80,XTAL1/4) // ?
MCFG_CPU_PROGRAM_MAP(divebomb_fgcpu_map)
@@ -630,4 +630,4 @@ MACHINE_RESET_MEMBER(divebomb_state, divebomb)
*************************************/
// According to a flyer, the world release was to be called 'Gaia'. The Gaia title graphics are present in the ROMs.
-GAME( 1989, divebomb, 0, divebomb, divebomb, driver_device, 0, ROT270, "Konami", "Kyuukoukabakugekitai - Dive Bomber Squad (Japan, prototype)", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, divebomb, 0, divebomb, divebomb, divebomb_state, 0, ROT270, "Konami", "Kyuukoukabakugekitai - Dive Bomber Squad (Japan, prototype)", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp
index 0f6195056f4..0183eb8946e 100644
--- a/src/mame/drivers/diverboy.cpp
+++ b/src/mame/drivers/diverboy.cpp
@@ -265,7 +265,7 @@ void diverboy_state::machine_start()
{
}
-static MACHINE_CONFIG_START( diverboy, diverboy_state )
+static MACHINE_CONFIG_START( diverboy )
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* guess */
MCFG_CPU_PROGRAM_MAP(diverboy_map)
@@ -293,7 +293,7 @@ static MACHINE_CONFIG_START( diverboy, diverboy_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -340,4 +340,4 @@ ROM_END
-GAME( 1992, diverboy, 0, diverboy, diverboy, driver_device, 0, ORIENTATION_FLIP_X, "Gamart (Electronic Devices Italy license)", "Diver Boy", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, diverboy, 0, diverboy, diverboy, diverboy_state, 0, ORIENTATION_FLIP_X, "Gamart (Electronic Devices Italy license)", "Diver Boy", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index 2265b898a08..520b07bca1e 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -547,7 +547,7 @@ void djboy_state::machine_reset()
m_z80_to_beast_full = 0;
}
-static MACHINE_CONFIG_START( djboy, djboy_state )
+static MACHINE_CONFIG_START( djboy )
MCFG_CPU_ADD("maincpu", Z80, 6000000)
MCFG_CPU_PROGRAM_MAP(cpu0_am)
@@ -592,10 +592,10 @@ static MACHINE_CONFIG_START( djboy, djboy_state )
MCFG_SOUND_ADD("ymsnd", YM2203, 3000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki1", 12000000 / 8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 12000000 / 8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki2", 12000000 / 8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 12000000 / 8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index c38d9060599..37a23b46f93 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -1376,7 +1376,7 @@ void djmain_state::machine_reset()
*
*************************************/
-static MACHINE_CONFIG_START( djmainj, djmain_state )
+static MACHINE_CONFIG_START( djmainj )
/* basic machine hardware */
// popn3 works 9.6 MHz or slower in some songs */
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index a0b35c7d9be..b8a96b4fa2a 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -1704,7 +1704,7 @@ WRITE_LINE_MEMBER(dkong_state::busreq_w )
m_dma8257->hlda_w(state);
}
-static MACHINE_CONFIG_START( dkong_base, dkong_state )
+static MACHINE_CONFIG_START( dkong_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CLOCK_1H)
@@ -1776,7 +1776,7 @@ static MACHINE_CONFIG_DERIVED( braze, dkong2b )
MCFG_EEPROM_SERIAL_93C46_8BIT_ADD("eeprom")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dkong3, dkong_state )
+static MACHINE_CONFIG_START( dkong3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) /* verified in schematics */
@@ -3378,50 +3378,50 @@ DRIVER_INIT_MEMBER(dkong_state,dkingjr)
*
*************************************/
-GAME( 1980, radarscp, 0, radarscp, radarscp, driver_device, 0, ROT90, "Nintendo", "Radar Scope", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, radarscp1, radarscp, radarscp1, radarscp, driver_device, 0, ROT90, "Nintendo", "Radar Scope (TRS01)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1981, dkong, 0, dkong2b, dkong, driver_device, 0, ROT90, "Nintendo of America", "Donkey Kong (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dkonghrd, dkong, dkong2b, dkong, driver_device, 0, ROT90, "Nintendo of America", "Donkey Kong (hard kit)", MACHINE_SUPPORTS_SAVE ) // not sure if original or bootleg (see notes on top of driver file)
-GAME( 1981, dkongo, dkong, dkong2b, dkong, driver_device, 0, ROT90, "Nintendo", "Donkey Kong (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dkongj, dkong, dkong2b, dkong, driver_device, 0, ROT90, "Nintendo", "Donkey Kong (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dkongjo, dkong, dkong2b, dkong, driver_device, 0, ROT90, "Nintendo", "Donkey Kong (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dkongjo1, dkong, dkong2b, dkong, driver_device, 0, ROT90, "Nintendo", "Donkey Kong (Japan set 3)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 2004, dkongf, dkong, dkong2b, dkongf, driver_device, 0, ROT90, "hack (Jeff Kulczycki)", "Donkey Kong Foundry (hack)", MACHINE_SUPPORTS_SAVE ) /* from Jeff's Romhack */
-GAME( 2006, dkongx, dkong, braze, dkongx, dkong_state, dkongx, ROT90, "hack (Braze Technologies)", "Donkey Kong II: Jumpman Returns (hack, V1.2)", MACHINE_SUPPORTS_SAVE )
-GAME( 2006, dkongx11, dkong, braze, dkongx, dkong_state, dkongx, ROT90, "hack (Braze Technologies)", "Donkey Kong II: Jumpman Returns (hack, V1.1)", MACHINE_SUPPORTS_SAVE )
-GAME( 2013, dkongpe, dkong, dkong2b, dkong, driver_device, 0, ROT90, "hack (Clay Cowgill and Mike Mika)", "Donkey Kong: Pauline Edition Rev 5 (2013-04-22)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1982, dkongjr, 0, dkongjr, dkongjr, driver_device, 0, ROT90, "Nintendo of America", "Donkey Kong Junior (US set F-2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkongjrj, dkongjr, dkongjr, dkongjr, driver_device, 0, ROT90, "Nintendo", "Donkey Kong Jr. (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkongjnrj, dkongjr, dkongjr, dkongjr, driver_device, 0, ROT90, "Nintendo", "Donkey Kong Junior (Japan?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkongjrb, dkongjr, dkongjr, dkongjr, driver_device, 0, ROT90, "bootleg", "Donkey Kong Jr. (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkongjre, dkongjr, dkongjr, dkongjr, driver_device, 0, ROT90, "Nintendo of America", "Donkey Kong Junior (E kit)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkongjrpb, dkongjr, dkongjr, dkongjr, driver_device, 0, ROT90, "bootleg", "Donkey Kong Junior (P kit, bootleg)", MACHINE_SUPPORTS_SAVE ) // definitely not issued by Nintendo
-GAME( 1982, jrking, dkongjr, dkongjr, dkongjr, driver_device, 0, ROT90, "bootleg", "Junior King (bootleg of Donkey Kong Jr.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkingjr, dkongjr, dkongjr, dkongjr, dkong_state, dkingjr, ROT90, "bootleg", "Donkey King Jr. (bootleg of Donkey Kong Jr.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, maguila, dkongjr, dkongjr, dkongjr, dkong_state, dkingjr, ROT90, "bootleg (Aguipa)", "Up Maguila (bootleg of Donkey Kong Jr.)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1983, dkong3, 0, dkong3, dkong3, driver_device, 0, ROT90, "Nintendo of America", "Donkey Kong 3 (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, dkong3j, dkong3, dkong3, dkong3, driver_device, 0, ROT90, "Nintendo", "Donkey Kong 3 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dkong3b, dkong3, dkong3b, dkong3b, driver_device, 0, ROT90, "bootleg", "Donkey Kong 3 (bootleg on Donkey Kong Jr. hardware)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1983, pestplce, mario, pestplce, pestplce, driver_device, 0, ROT180, "bootleg", "Pest Place", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, radarscp, 0, radarscp, radarscp, dkong_state, 0, ROT90, "Nintendo", "Radar Scope", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, radarscp1, radarscp, radarscp1, radarscp, dkong_state, 0, ROT90, "Nintendo", "Radar Scope (TRS01)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1981, dkong, 0, dkong2b, dkong, dkong_state, 0, ROT90, "Nintendo of America", "Donkey Kong (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dkonghrd, dkong, dkong2b, dkong, dkong_state, 0, ROT90, "Nintendo of America", "Donkey Kong (hard kit)", MACHINE_SUPPORTS_SAVE ) // not sure if original or bootleg (see notes on top of driver file)
+GAME( 1981, dkongo, dkong, dkong2b, dkong, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dkongj, dkong, dkong2b, dkong, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dkongjo, dkong, dkong2b, dkong, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dkongjo1, dkong, dkong2b, dkong, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong (Japan set 3)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 2004, dkongf, dkong, dkong2b, dkongf, dkong_state, 0, ROT90, "hack (Jeff Kulczycki)", "Donkey Kong Foundry (hack)", MACHINE_SUPPORTS_SAVE ) /* from Jeff's Romhack */
+GAME( 2006, dkongx, dkong, braze, dkongx, dkong_state, dkongx, ROT90, "hack (Braze Technologies)", "Donkey Kong II: Jumpman Returns (hack, V1.2)", MACHINE_SUPPORTS_SAVE )
+GAME( 2006, dkongx11, dkong, braze, dkongx, dkong_state, dkongx, ROT90, "hack (Braze Technologies)", "Donkey Kong II: Jumpman Returns (hack, V1.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 2013, dkongpe, dkong, dkong2b, dkong, dkong_state, 0, ROT90, "hack (Clay Cowgill and Mike Mika)", "Donkey Kong: Pauline Edition Rev 5 (2013-04-22)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1982, dkongjr, 0, dkongjr, dkongjr, dkong_state, 0, ROT90, "Nintendo of America", "Donkey Kong Junior (US set F-2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkongjrj, dkongjr, dkongjr, dkongjr, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong Jr. (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkongjnrj, dkongjr, dkongjr, dkongjr, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong Junior (Japan?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkongjrb, dkongjr, dkongjr, dkongjr, dkong_state, 0, ROT90, "bootleg", "Donkey Kong Jr. (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkongjre, dkongjr, dkongjr, dkongjr, dkong_state, 0, ROT90, "Nintendo of America", "Donkey Kong Junior (E kit)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkongjrpb, dkongjr, dkongjr, dkongjr, dkong_state, 0, ROT90, "bootleg", "Donkey Kong Junior (P kit, bootleg)", MACHINE_SUPPORTS_SAVE ) // definitely not issued by Nintendo
+GAME( 1982, jrking, dkongjr, dkongjr, dkongjr, dkong_state, 0, ROT90, "bootleg", "Junior King (bootleg of Donkey Kong Jr.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkingjr, dkongjr, dkongjr, dkongjr, dkong_state, dkingjr, ROT90, "bootleg", "Donkey King Jr. (bootleg of Donkey Kong Jr.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, maguila, dkongjr, dkongjr, dkongjr, dkong_state, dkingjr, ROT90, "bootleg (Aguipa)", "Up Maguila (bootleg of Donkey Kong Jr.)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1983, dkong3, 0, dkong3, dkong3, dkong_state, 0, ROT90, "Nintendo of America", "Donkey Kong 3 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, dkong3j, dkong3, dkong3, dkong3, dkong_state, 0, ROT90, "Nintendo", "Donkey Kong 3 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dkong3b, dkong3, dkong3b, dkong3b, dkong_state, 0, ROT90, "bootleg", "Donkey Kong 3 (bootleg on Donkey Kong Jr. hardware)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1983, pestplce, mario, pestplce, pestplce, dkong_state, 0, ROT180, "bootleg", "Pest Place", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* 2650 based */
-GAME( 1984, herbiedk, huncholy, s2650, herbiedk, driver_device, 0, ROT90, "Century Electronics / Seatongrove Ltd", "Herbie at the Olympics (DK conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hunchbkd, hunchbak, s2650, hunchbkd, driver_device, 0, ROT90, "Century Electronics", "Hunchback (DK conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sbdk, superbik, s2650, sbdk, driver_device, 0, ROT90, "Century Electronics", "Super Bike (DK conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, herodk, hero, s2650, herodk, dkong_state, herodk, ROT90, "Seatongrove Ltd (Crown license)", "Hero in the Castle of Doom (DK conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, herodku, hero, s2650, herodk, driver_device, 0, ROT90, "Seatongrove Ltd (Crown license)", "Hero in the Castle of Doom (DK conversion not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, 8ballact, 0, s2650, 8ballact, driver_device, 0, ROT90, "Seatongrove Ltd (Magic Electronics USA license)", "Eight Ball Action (DK conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, 8ballact2, 8ballact, s2650, 8ballact, driver_device, 0, ROT90, "Seatongrove Ltd (Magic Electronics USA license)", "Eight Ball Action (DKJr conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, shootgal, 0, s2650, shootgal, driver_device, 0, ROT180, "Seatongrove Ltd (Zaccaria license)", "Shooting Gallery", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, spclforc, 0, spclforc, spclforc, driver_device, 0, ROT90, "Senko Industries (Magic Electronics Inc. license)", "Special Forces", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, spcfrcii, 0, spclforc, spclforc, driver_device, 0, ROT90, "Senko Industries (Magic Electronics Inc. license)", "Special Forces II", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, herbiedk, huncholy, s2650, herbiedk, dkong_state, 0, ROT90, "Century Electronics / Seatongrove Ltd", "Herbie at the Olympics (DK conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hunchbkd, hunchbak, s2650, hunchbkd, dkong_state, 0, ROT90, "Century Electronics", "Hunchback (DK conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbdk, superbik, s2650, sbdk, dkong_state, 0, ROT90, "Century Electronics", "Super Bike (DK conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, herodk, hero, s2650, herodk, dkong_state, herodk, ROT90, "Seatongrove Ltd (Crown license)", "Hero in the Castle of Doom (DK conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, herodku, hero, s2650, herodk, dkong_state, 0, ROT90, "Seatongrove Ltd (Crown license)", "Hero in the Castle of Doom (DK conversion not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, 8ballact, 0, s2650, 8ballact, dkong_state, 0, ROT90, "Seatongrove Ltd (Magic Electronics USA license)", "Eight Ball Action (DK conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, 8ballact2, 8ballact, s2650, 8ballact, dkong_state, 0, ROT90, "Seatongrove Ltd (Magic Electronics USA license)", "Eight Ball Action (DKJr conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, shootgal, 0, s2650, shootgal, dkong_state, 0, ROT180, "Seatongrove Ltd (Zaccaria license)", "Shooting Gallery", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, spclforc, 0, spclforc, spclforc, dkong_state, 0, ROT90, "Senko Industries (Magic Electronics Inc. license)", "Special Forces", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, spcfrcii, 0, spclforc, spclforc, dkong_state, 0, ROT90, "Senko Industries (Magic Electronics Inc. license)", "Special Forces II", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
/* EPOS */
-GAME( 1984, drakton, 0, drakton, drakton, dkong_state, drakton, ROT90, "Epos Corporation", "Drakton (DK conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, drktnjr, drakton, drktnjr, drakton, dkong_state, drakton, ROT90, "Epos Corporation", "Drakton (DKJr conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, strtheat, 0, strtheat, strtheat, dkong_state, strtheat, ROT90, "Epos Corporation", "Street Heat", MACHINE_SUPPORTS_SAVE ) // distributed by Cardinal Amusements Products (a division of Epos Corporation)
+GAME( 1984, drakton, 0, drakton, drakton, dkong_state, drakton, ROT90, "Epos Corporation", "Drakton (DK conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, drktnjr, drakton, drktnjr, drakton, dkong_state, drakton, ROT90, "Epos Corporation", "Drakton (DKJr conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, strtheat, 0, strtheat, strtheat, dkong_state, strtheat, ROT90, "Epos Corporation", "Street Heat", MACHINE_SUPPORTS_SAVE ) // distributed by Cardinal Amusements Products (a division of Epos Corporation)
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index bfc45ed180c..8e71830d632 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -707,7 +707,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( dlair_base, dlair_state )
+static MACHINE_CONFIG_START( dlair_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_US/4)
@@ -743,7 +743,7 @@ static MACHINE_CONFIG_DERIVED( dlair_ldv1000, dlair_base )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dleuro, dlair_state )
+static MACHINE_CONFIG_START( dleuro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_EURO/4)
diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp
index 4a590f8d824..fe85c02e5c0 100644
--- a/src/mame/drivers/dlair2.cpp
+++ b/src/mame/drivers/dlair2.cpp
@@ -173,7 +173,7 @@ INTERRUPT_GEN_MEMBER(dlair2_state::dlair2_timer_irq)
device.execute().set_input_line_and_vector(0,HOLD_LINE,0x20/4);
}
-static MACHINE_CONFIG_START( dlair2, dlair2_state )
+static MACHINE_CONFIG_START( dlair2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088 , MAIN_CLOCK/3) /* Schematics show I8088 "max" CPU */
@@ -330,19 +330,19 @@ ROM_START( spacea91_13e )
ROM_END
-GAME( 1991, dlair2, 0, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.19)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_319e, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.19)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_319s, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Spanish v3.19)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_318, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.18)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_317e, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.17)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_316e, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.16)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_315, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.15)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_315s, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Spanish v3.15)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_314, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.14)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_312, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.12)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_300, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.00)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_211, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v2.11)", MACHINE_IS_SKELETON )
-GAME( 1991, dlair2_200, dlair2, dlair2, dlair2, driver_device, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v2.00, AMOA prototype)", MACHINE_IS_SKELETON )
-
-GAME( 1991, spacea91, spaceace, dlair2, dlair2, driver_device, 0, ROT0, "Cinematronics (Leland Corporation license)", "Space Ace (DL2 Conversion) (US v1.3)", MACHINE_IS_SKELETON )
-GAME( 1991, spacea91_13e, spaceace, dlair2, dlair2, driver_device, 0, ROT0, "Cinematronics (Leland Corporation license)", "Space Ace (DL2 Conversion) (Euro v1.3)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2, 0, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.19)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_319e, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.19)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_319s, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Spanish v3.19)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_318, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.18)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_317e, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.17)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_316e, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.16)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_315, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.15)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_315s, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Spanish v3.15)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_314, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.14)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_312, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.12)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_300, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.00)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_211, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v2.11)", MACHINE_IS_SKELETON )
+GAME( 1991, dlair2_200, dlair2, dlair2, dlair2, dlair2_state, 0, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v2.00, AMOA prototype)", MACHINE_IS_SKELETON )
+
+GAME( 1991, spacea91, spaceace, dlair2, dlair2, dlair2_state, 0, ROT0, "Cinematronics (Leland Corporation license)", "Space Ace (DL2 Conversion) (US v1.3)", MACHINE_IS_SKELETON )
+GAME( 1991, spacea91_13e, spaceace, dlair2, dlair2, dlair2_state, 0, ROT0, "Cinematronics (Leland Corporation license)", "Space Ace (DL2 Conversion) (Euro v1.3)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index 239a0e5c895..7a9519dbc69 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -293,14 +293,14 @@ WRITE32_MEMBER( dm7000_state::dcr_w )
dcr[offset] = data;
}
-WRITE8_MEMBER( dm7000_state::kbd_put )
+void dm7000_state::kbd_put(u8 data)
{
//printf("%02X\n", data);
m_term_data = data;
m_scc0_lsr = 1;
}
-static MACHINE_CONFIG_START( dm7000, dm7000_state )
+static MACHINE_CONFIG_START( dm7000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",PPC405GP, 252000000 / 10) // Should be PPC405D4?
// Slowed down 10 times in order to get normal response for now
@@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( dm7000, dm7000_state )
MCFG_SCREEN_UPDATE_DRIVER(dm7000_state, screen_update_dm7000)
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(dm7000_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dm7000_state, kbd_put))
MACHINE_CONFIG_END
@@ -347,7 +347,7 @@ ROM_START( dm500 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-SYST( 2003, dm7000, 0, 0, dm7000, dm7000, driver_device, 0, "Dream Multimedia", "Dreambox 7000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-SYST( 2004, dm5620, dm7000, 0, dm7000, dm7000, driver_device, 0, "Dream Multimedia", "Dreambox 5620", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-SYST( 2006, dm500, dm7000, 0, dm7000, dm7000, driver_device, 0, "Dream Multimedia", "Dreambox 500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+SYST( 2003, dm7000, 0, 0, dm7000, dm7000, dm7000_state, 0, "Dream Multimedia", "Dreambox 7000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+SYST( 2004, dm5620, dm7000, 0, dm7000, dm7000, dm7000_state, 0, "Dream Multimedia", "Dreambox 5620", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+SYST( 2006, dm500, dm7000, 0, dm7000, dm7000, dm7000_state, 0, "Dream Multimedia", "Dreambox 500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/dmax8000.cpp b/src/mame/drivers/dmax8000.cpp
index 40b40fc65d4..079cc54fe8b 100644
--- a/src/mame/drivers/dmax8000.cpp
+++ b/src/mame/drivers/dmax8000.cpp
@@ -65,7 +65,7 @@ private:
required_device<z80dart_device> m_dart1;
required_device<z80dart_device> m_dart2;
required_device<z80ctc_device> m_ctc;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_device<floppy_connector> m_floppy0;
};
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START(dmax8000_io, AS_IO, 8, dmax8000_state)
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("dart1", z80dart_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("pio1", z80pio_device, read, write) // fdd controls
@@ -167,7 +167,7 @@ static SLOT_INTERFACE_START( floppies )
SLOT_INTERFACE( "drive0", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( dmax8000, dmax8000_state )
+static MACHINE_CONFIG_START( dmax8000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz ) // no idea what crystal is used, but 4MHz clock is confirmed
MCFG_CPU_PROGRAM_MAP(dmax8000_mem)
@@ -222,5 +222,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLAS INIT COMPANY FULLNAME FLAGS
COMP( 1981, dmax8000, 0, 0, dmax8000, dmax8000, dmax8000_state, dmax8000, "Datamax", "Datamax 8000", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp
index 6c69ef087c5..64980d656a6 100644
--- a/src/mame/drivers/dmndrby.cpp
+++ b/src/mame/drivers/dmndrby.cpp
@@ -523,7 +523,7 @@ INTERRUPT_GEN_MEMBER(dmndrby_state::dderby_timer_irq)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */
}
-static MACHINE_CONFIG_START( dderby, dmndrby_state )
+static MACHINE_CONFIG_START( dderby )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(memmap)
@@ -658,6 +658,6 @@ ROM_START( dmndrbya )
ROM_END
-/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME */
-GAME( 1994, dmndrby, 0, dderby, dderby, driver_device, 0, ROT0, "Electrocoin", "Diamond Derby (Newer)",MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_COLORS|MACHINE_NOT_WORKING ) // hack?
-GAME( 1986, dmndrbya, dmndrby, dderby, dderbya, driver_device, 0, ROT0, "Electrocoin", "Diamond Derby (Original)",MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_COLORS|MACHINE_NOT_WORKING )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME FLAGS
+GAME( 1994, dmndrby, 0, dderby, dderby, dmndrby_state, 0, ROT0, "Electrocoin", "Diamond Derby (Newer)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_COLORS|MACHINE_NOT_WORKING ) // hack?
+GAME( 1986, dmndrbya, dmndrby, dderby, dderbya, dmndrby_state, 0, ROT0, "Electrocoin", "Diamond Derby (Original)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_COLORS|MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp
index 72a4d2f64cb..5cfd0a1560c 100644
--- a/src/mame/drivers/dms5000.cpp
+++ b/src/mame/drivers/dms5000.cpp
@@ -55,7 +55,7 @@ uint32_t dms5000_state::screen_update_dms5000(screen_device &screen, bitmap_ind1
return 0;
}
-static MACHINE_CONFIG_START( dms5000, dms5000_state )
+static MACHINE_CONFIG_START( dms5000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8086, XTAL_9_8304MHz)
MCFG_CPU_PROGRAM_MAP(dms5000_mem)
@@ -83,5 +83,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, dms5000, 0, 0, dms5000, dms5000, driver_device, 0, "Digital Microsystems", "DMS-5000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, dms5000, 0, 0, dms5000, dms5000, dms5000_state, 0, "Digital Microsystems", "DMS-5000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/dms86.cpp b/src/mame/drivers/dms86.cpp
index 8a8bb7d0997..10be2529544 100644
--- a/src/mame/drivers/dms86.cpp
+++ b/src/mame/drivers/dms86.cpp
@@ -40,13 +40,15 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ16_MEMBER( dms86_82_r );
DECLARE_READ16_MEMBER( dms86_84_r );
DECLARE_READ16_MEMBER( dms86_86_r );
DECLARE_READ16_MEMBER( dms86_9a_r );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
+
+protected:
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
uint8_t *m_ram;
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -102,12 +104,12 @@ void dms86_state::machine_reset()
{
}
-WRITE8_MEMBER( dms86_state::kbd_put )
+void dms86_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( dms86, dms86_state )
+static MACHINE_CONFIG_START( dms86 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8086, XTAL_9_8304MHz)
MCFG_CPU_PROGRAM_MAP(dms86_mem)
@@ -115,7 +117,7 @@ static MACHINE_CONFIG_START( dms86, dms86_state )
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(dms86_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dms86_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -127,5 +129,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, dms86, 0, 0, dms86, dms86, driver_device, 0, "Digital Microsystems", "DMS-86", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, dms86, 0, 0, dms86, dms86, dms86_state, 0, "Digital Microsystems", "DMS-86", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 3277d98ee96..2d0e62d98ed 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -712,7 +712,7 @@ static SLOT_INTERFACE_START(dmv_slot7a)
SLOT_INTERFACE("k235", DMV_K235) // K235 Internal 8088 module with interrupt controller
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( dmv, dmv_state )
+static MACHINE_CONFIG_START( dmv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_24MHz / 6)
MCFG_CPU_PROGRAM_MAP(dmv_mem)
@@ -850,5 +850,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, dmv, 0, 0, dmv, dmv, driver_device, 0, "NCR", "Decision Mate V", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, dmv, 0, 0, dmv, dmv, dmv_state, 0, "NCR", "Decision Mate V", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index b68e02187d2..0eb7d0e3d4e 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -563,7 +563,7 @@ void docastle_state::machine_start()
save_item(NAME(m_buffer1));
}
-static MACHINE_CONFIG_START( docastle, docastle_state )
+static MACHINE_CONFIG_START( docastle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
@@ -579,18 +579,18 @@ static MACHINE_CONFIG_START( docastle, docastle_state )
MCFG_CPU_VBLANK_INT_DRIVER("screen", docastle_state, nmi_line_pulse)
MCFG_DEVICE_ADD("inp1", TMS1025, 0)
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT1, IOPORT("DSW2"))
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT2, IOPORT("DSW1"))
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT3, IOPORT("JOYS"))
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT5, IOPORT("BUTTONS"))
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT7, IOPORT("SYSTEM"))
+ MCFG_TMS1025_READ_PORT_CB(PORT1, IOPORT("DSW2"))
+ MCFG_TMS1025_READ_PORT_CB(PORT2, IOPORT("DSW1"))
+ MCFG_TMS1025_READ_PORT_CB(PORT3, IOPORT("JOYS"))
+ MCFG_TMS1025_READ_PORT_CB(PORT5, IOPORT("BUTTONS"))
+ MCFG_TMS1025_READ_PORT_CB(PORT7, IOPORT("SYSTEM"))
MCFG_DEVICE_ADD("inp2", TMS1025, 0)
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT1, IOPORT("DSW2")) MCFG_DEVCB_RSHIFT(4)
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT2, IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT3, IOPORT("JOYS")) MCFG_DEVCB_RSHIFT(4)
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT5, IOPORT("BUTTONS")) MCFG_DEVCB_RSHIFT(4)
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT7, IOPORT("SYSTEM")) MCFG_DEVCB_RSHIFT(4)
+ MCFG_TMS1025_READ_PORT_CB(PORT1, IOPORT("DSW2")) MCFG_DEVCB_RSHIFT(4)
+ MCFG_TMS1025_READ_PORT_CB(PORT2, IOPORT("DSW1")) MCFG_DEVCB_RSHIFT(4)
+ MCFG_TMS1025_READ_PORT_CB(PORT3, IOPORT("JOYS")) MCFG_DEVCB_RSHIFT(4)
+ MCFG_TMS1025_READ_PORT_CB(PORT5, IOPORT("BUTTONS")) MCFG_DEVCB_RSHIFT(4)
+ MCFG_TMS1025_READ_PORT_CB(PORT7, IOPORT("SYSTEM")) MCFG_DEVCB_RSHIFT(4)
MCFG_WATCHDOG_ADD("watchdog")
@@ -652,10 +652,10 @@ static MACHINE_CONFIG_DERIVED( idsoccer, docastle )
MCFG_CPU_PROGRAM_MAP(idsoccer_map)
MCFG_DEVICE_MODIFY("inp1")
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT4, IOPORT("JOYS_RIGHT"))
+ MCFG_TMS1025_READ_PORT_CB(PORT4, IOPORT("JOYS_RIGHT"))
MCFG_DEVICE_MODIFY("inp2")
- MCFG_TMS1025_READ_PORT_CB(TMS1025_PORT4, IOPORT("JOYS_RIGHT")) MCFG_DEVCB_RSHIFT(4)
+ MCFG_TMS1025_READ_PORT_CB(PORT4, IOPORT("JOYS_RIGHT")) MCFG_DEVCB_RSHIFT(4)
/* video hardware */
MCFG_VIDEO_START_OVERRIDE(docastle_state,dorunrun)
@@ -663,7 +663,7 @@ static MACHINE_CONFIG_DERIVED( idsoccer, docastle )
/* sound hardware */
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* Crystal verified on American Soccer board. */
MCFG_MSM5205_VCLK_CB(WRITELINE(docastle_state, idsoccer_adpcm_int)) // interrupt function
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) // 6 kHz ???
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) // 6 kHz ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -1087,18 +1087,18 @@ ROM_END
/* Game Drivers */
-GAME( 1983, docastle, 0, docastle, docastle, driver_device, 0, ROT270, "Universal", "Mr. Do's Castle (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, docastle2, docastle, docastle, docastle, driver_device, 0, ROT270, "Universal", "Mr. Do's Castle (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, docastleo, docastle, docastle, docastle, driver_device, 0, ROT270, "Universal", "Mr. Do's Castle (older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, douni, docastle, docastle, docastle, driver_device, 0, ROT270, "Universal", "Mr. Do vs. Unicorns", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dorunrun, 0, dorunrun, dorunrun, driver_device, 0, ROT0, "Universal", "Do! Run Run (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dorunrun2, dorunrun, dorunrun, dorunrun, driver_device, 0, ROT0, "Universal", "Do! Run Run (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dorunrunc, dorunrun, docastle, dorunrun, driver_device, 0, ROT0, "Universal", "Do! Run Run (Do's Castle hardware, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dorunrunca,dorunrun, docastle, dorunrun, driver_device, 0, ROT0, "Universal", "Do! Run Run (Do's Castle hardware, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, spiero, dorunrun, dorunrun, dorunrun, driver_device, 0, ROT0, "Universal", "Super Pierrot (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dowild, 0, dorunrun, dowild, driver_device, 0, ROT0, "Universal", "Mr. Do's Wild Ride", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, jjack, 0, dorunrun, jjack, driver_device, 0, ROT270, "Universal", "Jumping Jack", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, kickridr, 0, dorunrun, kickridr, driver_device, 0, ROT0, "Universal", "Kick Rider", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, idsoccer, 0, idsoccer, idsoccer, driver_device, 0, ROT0, "Universal", "Indoor Soccer (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1985, idsoccera, idsoccer, idsoccer, idsoccer, driver_device, 0, ROT0, "Universal", "Indoor Soccer (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
-GAME( 1987, asoccer, idsoccer, idsoccer, idsoccer, driver_device, 0, ROT0, "Universal", "American Soccer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, docastle, 0, docastle, docastle, docastle_state, 0, ROT270, "Universal", "Mr. Do's Castle (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, docastle2, docastle, docastle, docastle, docastle_state, 0, ROT270, "Universal", "Mr. Do's Castle (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, docastleo, docastle, docastle, docastle, docastle_state, 0, ROT270, "Universal", "Mr. Do's Castle (older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, douni, docastle, docastle, docastle, docastle_state, 0, ROT270, "Universal", "Mr. Do vs. Unicorns", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dorunrun, 0, dorunrun, dorunrun, docastle_state, 0, ROT0, "Universal", "Do! Run Run (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dorunrun2, dorunrun, dorunrun, dorunrun, docastle_state, 0, ROT0, "Universal", "Do! Run Run (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dorunrunc, dorunrun, docastle, dorunrun, docastle_state, 0, ROT0, "Universal", "Do! Run Run (Do's Castle hardware, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dorunrunca,dorunrun, docastle, dorunrun, docastle_state, 0, ROT0, "Universal", "Do! Run Run (Do's Castle hardware, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, spiero, dorunrun, dorunrun, dorunrun, docastle_state, 0, ROT0, "Universal", "Super Pierrot (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dowild, 0, dorunrun, dowild, docastle_state, 0, ROT0, "Universal", "Mr. Do's Wild Ride", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, jjack, 0, dorunrun, jjack, docastle_state, 0, ROT270, "Universal", "Jumping Jack", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, kickridr, 0, dorunrun, kickridr, docastle_state, 0, ROT0, "Universal", "Kick Rider", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, idsoccer, 0, idsoccer, idsoccer, docastle_state, 0, ROT0, "Universal", "Indoor Soccer (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1985, idsoccera, idsoccer, idsoccer, idsoccer, docastle_state, 0, ROT0, "Universal", "Indoor Soccer (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
+GAME( 1987, asoccer, idsoccer, idsoccer, idsoccer, docastle_state, 0, ROT0, "Universal", "American Soccer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp
index ff3ff5bd835..77ee7cd7bf2 100644
--- a/src/mame/drivers/dogfgt.cpp
+++ b/src/mame/drivers/dogfgt.cpp
@@ -237,7 +237,7 @@ void dogfgt_state::machine_reset()
}
-static MACHINE_CONFIG_START( dogfgt, dogfgt_state )
+static MACHINE_CONFIG_START( dogfgt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
@@ -379,6 +379,6 @@ ROM_END
-GAME( 1984, dogfgt, 0, dogfgt, dogfgt, driver_device, 0, ROT0, "Technos Japan", "Acrobatic Dog-Fight", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, dogfgtu, dogfgt, dogfgt, dogfgt, driver_device, 0, ROT0, "Technos Japan (Data East USA, Inc. license)", "Acrobatic Dog-Fight (USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, dogfgtj, dogfgt, dogfgt, dogfgt, driver_device, 0, ROT0, "Technos Japan", "Dog-Fight (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dogfgt, 0, dogfgt, dogfgt, dogfgt_state, 0, ROT0, "Technos Japan", "Acrobatic Dog-Fight", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, dogfgtu, dogfgt, dogfgt, dogfgt, dogfgt_state, 0, ROT0, "Technos Japan (Data East USA, Inc. license)", "Acrobatic Dog-Fight (USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dogfgtj, dogfgt, dogfgt, dogfgt, dogfgt_state, 0, ROT0, "Technos Japan", "Dog-Fight (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index df86f67e501..9849a276b79 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( dauphin )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( dauphin, dauphin_state )
+static MACHINE_CONFIG_START( dauphin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(dauphin_mem)
@@ -264,5 +264,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, dauphin, 0, 0, dauphin, dauphin, driver_device, 0, "LCD EPFL Stoppani", "Dauphin", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1979, dauphin, 0, 0, dauphin, dauphin, dauphin_state, 0, "LCD EPFL Stoppani", "Dauphin", 0 )
diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp
index e0a9ab7f6a0..eacdb5cdb5e 100644
--- a/src/mame/drivers/dominob.cpp
+++ b/src/mame/drivers/dominob.cpp
@@ -289,7 +289,7 @@ static GFXDECODE_START( dominob )
GFXDECODE_END
-static MACHINE_CONFIG_START( dominob, dominob_state )
+static MACHINE_CONFIG_START( dominob )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2)
@@ -361,5 +361,5 @@ ROM_START( dominobv2 )
ROM_LOAD( "u114v2", 0xc0000, 0x40000, CRC(df17ee65) SHA1(1cb434719a8c406726d2c966392be03a2dc1d758) )
ROM_END
-GAME( 1996, dominob, 0, dominob, dominob, driver_device, 0, ROT0, "Wonwoo Systems", "Domino Block", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, dominobv2,dominob, dominob, dominob, driver_device, 0, ROT0, "Wonwoo Systems", "Domino Block ver.2", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, dominob, 0, dominob, dominob, dominob_state, 0, ROT0, "Wonwoo Systems", "Domino Block", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, dominobv2,dominob, dominob, dominob, dominob_state, 0, ROT0, "Wonwoo Systems", "Domino Block ver.2", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index 50565655244..d856e9a3fe4 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
+// copyright-holders:Nicola Salmoria,Vas Crabb
/***************************************************************************
Dooyong games
@@ -72,7 +72,7 @@ are almost identical, except for much darker BG layer colors).
***************************************************************************/
#include "emu.h"
-#include "includes/dooyong.h"
+#include "video/dooyong.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
@@ -81,39 +81,681 @@ are almost identical, except for much darker BG layer colors).
#include "sound/okim6295.h"
#include "sound/ym2151.h"
+#include "screen.h"
#include "speaker.h"
-WRITE8_MEMBER(dooyong_z80_state::bankswitch_w)
+namespace {
+
+class dooyong_state : public driver_device
+{
+protected:
+ dooyong_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_gfxdecode(*this, "gfxdecode")
+ , m_palette(*this, "palette")
+ , m_bg(*this, "bg")
+ , m_bg2(*this, "bg2")
+ , m_fg(*this, "fg")
+ , m_fg2(*this, "fg2")
+ {
+ }
+
+ required_device<cpu_device> m_maincpu;
+ required_device<cpu_device> m_audiocpu;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<palette_device> m_palette;
+ optional_device<dooyong_rom_tilemap_device> m_bg;
+ optional_device<dooyong_rom_tilemap_device> m_bg2;
+ optional_device<dooyong_rom_tilemap_device> m_fg;
+ optional_device<dooyong_rom_tilemap_device> m_fg2;
+};
+
+class dooyong_z80_state : public dooyong_state
+{
+public:
+ dooyong_z80_state(const machine_config &mconfig, device_type type, const char *tag)
+ : dooyong_state(mconfig, type, tag)
+ , m_tx(*this, "tx")
+ , m_spriteram(*this, "spriteram")
+ {
+ }
+
+ enum
+ {
+ SPRITE_12BIT = 0x01,
+ SPRITE_HEIGHT = 0x02,
+ SPRITE_YSHIFT_BLUEHAWK = 0x04,
+ SPRITE_YSHIFT_FLYTIGER = 0x08
+ };
+
+ DECLARE_WRITE8_MEMBER(flip_screen_w)
+ {
+ flip_screen_set(data);
+ }
+
+ DECLARE_WRITE8_MEMBER(bankswitch_w)
+ {
+ membank("bank1")->set_entry(data & 0x07);
+ if (data & 0xf8) popmessage("bankswitch %02x",data);
+ }
+
+ DECLARE_READ8_MEMBER(lastday_tx_r)
+ {
+ bool const lane(BIT(offset, 11));
+ return m_tx->tileram_r(space, offset & 0x07ffU) >> (lane ? 8 : 0);
+ }
+
+ DECLARE_WRITE8_MEMBER(lastday_tx_w)
+ {
+ bool const lane(BIT(offset, 11));
+ m_tx->tileram_w(space, offset & 0x07ffU, uint16_t(data) << (lane ? 8 : 0), lane ? 0xff00U : 0x00ffU);
+ }
+
+ DECLARE_READ8_MEMBER(bluehawk_tx_r)
+ {
+ bool const lane(BIT(offset, 0));
+ return m_tx->tileram_r(space, offset >> 1) >> (lane ? 8 : 0);
+ }
+
+ DECLARE_WRITE8_MEMBER(bluehawk_tx_w)
+ {
+ bool const lane(BIT(offset, 0));
+ m_tx->tileram_w(space, offset >> 1, uint16_t(data) << (lane ? 8 : 0), lane ? 0xff00U : 0x00ffU);
+ }
+
+ DECLARE_READ8_MEMBER(paletteram_flytiger_r)
+ {
+ if (m_palette_bank) offset |= 0x800;
+ return m_paletteram_flytiger[offset];
+ }
+
+ DECLARE_WRITE8_MEMBER(paletteram_flytiger_w)
+ {
+ if (m_palette_bank) offset |= 0x800;
+ m_paletteram_flytiger[offset] = data;
+ uint16_t const value = m_paletteram_flytiger[offset & ~1] | (m_paletteram_flytiger[offset | 1] << 8);
+ m_palette->set_pen_color(offset/2, pal5bit(value >> 10), pal5bit(value >> 5), pal5bit(value >> 0));
+ }
+
+ DECLARE_WRITE8_MEMBER(primella_ctrl_w);
+ DECLARE_WRITE8_MEMBER(flytiger_ctrl_w);
+
+ uint32_t screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ DECLARE_MACHINE_START(cpu_z80)
+ {
+ membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base(), 0x4000);
+ }
+
+ DECLARE_VIDEO_START(bluehawk)
+ {
+ }
+
+ DECLARE_VIDEO_START(flytiger)
+ {
+ m_paletteram_flytiger = make_unique_clear<uint8_t[]>(0x1000);
+ save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000);
+
+ m_palette_bank = 0;
+
+ /* Register for save/restore */
+ save_item(NAME(m_palette_bank));
+ save_item(NAME(m_flytiger_pri));
+ }
+
+ DECLARE_VIDEO_START(primella)
+ {
+ /* Register for save/restore */
+ save_item(NAME(m_tx_pri));
+ }
+
+protected:
+ void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions = 0);
+
+ std::unique_ptr<uint8_t[]> m_paletteram_flytiger;
+ uint8_t m_sprites_disabled = 0;
+ uint8_t m_flytiger_pri = 0;
+ uint8_t m_tx_pri = 0;
+ uint8_t m_palette_bank = 0;
+
+ required_device<dooyong_ram_tilemap_device> m_tx;
+ optional_device<buffered_spriteram8_device> m_spriteram;
+};
+
+class dooyong_z80_ym2203_state : public dooyong_z80_state
+{
+public:
+ dooyong_z80_ym2203_state(const machine_config &mconfig, device_type type, const char *tag)
+ : dooyong_z80_state(mconfig, type, tag)
+ {
+ }
+
+ DECLARE_WRITE8_MEMBER(lastday_ctrl_w);
+ DECLARE_WRITE8_MEMBER(pollux_ctrl_w);
+ DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_1);
+ DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_2);
+ DECLARE_READ8_MEMBER(unk_r);
+
+ DECLARE_MACHINE_RESET(sound_ym2203)
+ {
+ m_interrupt_line_1 = 0;
+ m_interrupt_line_2 = 0;
+ }
+
+ uint32_t screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ DECLARE_VIDEO_START(lastday)
+ {
+ /* Register for save/restore */
+ save_item(NAME(m_sprites_disabled));
+ save_item(NAME(m_interrupt_line_1));
+ save_item(NAME(m_interrupt_line_2));
+ }
+
+ DECLARE_VIDEO_START(gulfstrm)
+ {
+ m_palette_bank = 0;
+
+ /* Register for save/restore */
+ save_item(NAME(m_palette_bank));
+ save_item(NAME(m_interrupt_line_1));
+ save_item(NAME(m_interrupt_line_2));
+ }
+
+ DECLARE_VIDEO_START(pollux)
+ {
+ m_paletteram_flytiger = make_unique_clear<uint8_t[]>(0x1000);
+ save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000);
+
+ m_palette_bank = 0;
+
+ /* Register for save/restore */
+ save_item(NAME(m_palette_bank));
+ save_item(NAME(m_interrupt_line_1));
+ save_item(NAME(m_interrupt_line_2));
+ }
+
+protected:
+ int m_interrupt_line_1 = 0;
+ int m_interrupt_line_2 = 0;
+};
+
+
+class dooyong_68k_state : public dooyong_state
+{
+public:
+ dooyong_68k_state(const machine_config &mconfig, device_type type, const char *tag)
+ : dooyong_state(mconfig, type, tag)
+ , m_spriteram(*this, "spriteram")
+ {
+ }
+
+ DECLARE_WRITE16_MEMBER(ctrl_w)
+ {
+ if (ACCESSING_BITS_0_7)
+ {
+ /* bit 0 flips screen */
+ flip_screen_set(data & 0x0001);
+
+ /* bit 4 changes tilemaps priority */
+ m_bg2_priority = data & 0x0010;
+
+ /* bit 5 used but unknown */
+ }
+ }
+
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline);
+
+protected:
+ void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ uint16_t m_bg2_priority = 0;
+ required_device<buffered_spriteram16_device> m_spriteram;
+};
+
+
+class rshark_state : public dooyong_68k_state
+{
+public:
+ rshark_state(const machine_config &mconfig, device_type type, const char *tag)
+ : dooyong_68k_state(mconfig, type, tag)
+ {
+ }
+
+ uint32_t screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ DECLARE_VIDEO_START(rshark)
+ {
+ /* Register for save/restore */
+ save_item(NAME(m_bg2_priority));
+ }
+};
+
+
+class popbingo_state : public dooyong_68k_state
+{
+public:
+ popbingo_state(const machine_config &mconfig, device_type type, const char *tag)
+ : dooyong_68k_state(mconfig, type, tag)
+ , m_bg_bitmap()
+ , m_bg2_bitmap()
+ , m_screen(*this, "screen")
+ {
+ }
+
+ uint32_t screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ DECLARE_VIDEO_START(popbingo)
+ {
+ m_screen->register_screen_bitmap(m_bg_bitmap);
+ m_screen->register_screen_bitmap(m_bg2_bitmap);
+
+ /* Register for save/restore */
+ save_item(NAME(m_bg2_priority)); // Not used atm
+ }
+
+protected:
+ bitmap_ind16 m_bg_bitmap;
+ bitmap_ind16 m_bg2_bitmap;
+
+ required_device<screen_device> m_screen;
+};
+
+
+
+/* Control registers seem to be different on every game */
+
+WRITE8_MEMBER(dooyong_z80_ym2203_state::lastday_ctrl_w)
+{
+ /* bits 0 and 1 are coin counters */
+ machine().bookkeeping().coin_counter_w(0, data & 0x01);
+ machine().bookkeeping().coin_counter_w(1, data & 0x02);
+
+ /* bit 3 is used but unknown */
+
+ /* bit 4 disables sprites */
+ m_sprites_disabled = data & 0x10;
+
+ /* bit 6 is flip screen */
+ flip_screen_set(data & 0x40);
+}
+
+WRITE8_MEMBER(dooyong_z80_ym2203_state::pollux_ctrl_w)
+{
+// printf("pollux_ctrl_w %02x\n", data);
+
+ /* bit 0 is flip screen */
+ flip_screen_set(data & 0x01);
+
+ /* bits 6 and 7 are coin counters */
+ machine().bookkeeping().coin_counter_w(0, data & 0x80);
+ machine().bookkeeping().coin_counter_w(1, data & 0x40);
+
+ /* bit 1 is used but unknown - palette banking (both write and display based on pollux bombs) */
+ uint8_t const last_palbank = m_palette_bank;
+ if (m_paletteram_flytiger) m_palette_bank = BIT(data, 1);
+ if (last_palbank != m_palette_bank)
+ {
+ m_bg->set_palette_bank(m_palette_bank << 6);
+ m_fg->set_palette_bank(m_palette_bank << 6);
+ m_tx->set_palette_bank(m_palette_bank << 6);
+ }
+
+ /* bit 2 is continuously toggled (unknown) */
+
+ /* bit 4 is used but unknown - display disable? */
+}
+
+
+
+WRITE8_MEMBER(dooyong_z80_state::primella_ctrl_w)
{
+ /* bits 0-2 select ROM bank */
membank("bank1")->set_entry(data & 0x07);
- if (data & 0xf8) popmessage("bankswitch %02x",data);
+ /* bit 3 disables tx layer */
+ m_tx_pri = data & 0x08;
+
+ /* bit 4 flips screen */
+ flip_screen_set(data & 0x10);
+
+ /* bit 5 used but unknown */
+
+// logerror("%04x: bankswitch = %02x\n",space.device().safe_pc(),data&0xe0);
+}
+
+
+WRITE8_MEMBER(dooyong_z80_state::flytiger_ctrl_w)
+{
+ /* bit 0 is flip screen */
+ flip_screen_set(data & 0x01);
+
+ /* bits 1, 2 used but unknown */
+
+ /* bit 3 palette banking */
+ uint8_t const last_palbank = m_palette_bank;
+ m_palette_bank = BIT(data, 3);
+ if (last_palbank != m_palette_bank)
+ {
+ m_bg->set_palette_bank(m_palette_bank << 6);
+ m_fg->set_palette_bank(m_palette_bank << 6);
+ m_tx->set_palette_bank(m_palette_bank << 6);
+ }
+
+ /* bit 4 changes tilemaps priority */
+ m_flytiger_pri = data & 0x10;
+}
+
+
+void dooyong_z80_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions)
+{
+ /* Sprites take 32 bytes each in memory:
+ MSB LSB
+ [offs + 0x00] cccc cccc (bits 7-0 of gfx code)
+ [offs + 0x01] cccx CCCC (bits 10-8 of gfx code, bit 8 of x position, bits 3-0 of color code)
+ [offs + 0x02] yyyy yyyy
+ [offs + 0x03] xxxx xxxx (bits 7-0 of x offset)
+ ...
+ [offs + 0x1c] ?hhh XY*c (bits 2-0 of height, x flip, y flip, * see note, bit 11 of gfx code)
+ ...
+ ? = unused/unknown
+ E = enable
+ c = gfx code
+ x = x position
+ y = y position
+ C = color code
+ w = width
+ X = x flip
+ Y = y flip
+ * = alters y position in bluehawk and flytiger - see code below
+ bit 11 of gfx code only used by gulfstrm, pollux, bluehawk and flytiger
+ height only used by pollux, bluehawk and flytiger
+ x flip and y flip only used by pollux and flytiger */
+
+ uint8_t const *const buffered_spriteram = m_spriteram->buffer();
+ for (int offs = 0; offs < m_spriteram->bytes(); offs += 32)
+ {
+ int sx = buffered_spriteram[offs+3] | ((buffered_spriteram[offs+1] & 0x10) << 4);
+ int sy = buffered_spriteram[offs+2];
+ int code = buffered_spriteram[offs] | ((buffered_spriteram[offs+1] & 0xe0) << 3);
+ int color = buffered_spriteram[offs+1] & 0x0f;
+
+ //TODO: This priority mechanism works for known games, but seems a bit strange.
+ //Are we missing something? (The obvious spare palette bit isn't it.)
+ int const pri = (((color == 0x00) || (color == 0x0f)) ? 0xfc : 0xf0);
+
+ bool flipx = false, flipy = false;
+ int height = 0;
+ if (extensions)
+ {
+ uint8_t const ext = buffered_spriteram[offs+0x1c];
+
+ if (extensions & SPRITE_12BIT)
+ code |= ((ext & 0x01) << 11);
+
+ if (extensions & SPRITE_HEIGHT)
+ {
+ height = (ext & 0x70) >> 4;
+ code &= ~height;
+
+ flipx = ext & 0x08;
+ flipy = ext & 0x04;
+ }
+
+ if (extensions & SPRITE_YSHIFT_BLUEHAWK)
+ sy += 6 - ((~ext & 0x02) << 7);
+
+ if (extensions & SPRITE_YSHIFT_FLYTIGER)
+ sy -=(ext & 0x02) << 7;
+ }
+
+ if (flip_screen())
+ {
+ sx = 498 - sx;
+ sy = 240 - (16 * height) - sy;
+ flipx = !flipx;
+ flipy = !flipy;
+ }
+
+ color |= m_palette_bank << 6;
+
+ for (int y = 0; y <= height; y++)
+ {
+ m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect,
+ code + y,
+ color,
+ flipx, flipy,
+ sx, sy + (16 * (flipy ? (height - y) : y)),
+ screen.priority(),
+ pri, 15);
+ }
+ }
+}
+
+
+uint32_t dooyong_z80_ym2203_state::screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ /* Text layer is offset on this machine */
+ m_tx->set_scrolly(flip_screen() ? -8 : 8);
+
+ m_bg->draw(screen, bitmap, cliprect, 0, 1);
+ m_fg->draw(screen, bitmap, cliprect, 0, 2);
+ m_tx->draw(screen, bitmap, cliprect, 0, 4);
+
+ if (!m_sprites_disabled)
+ draw_sprites(screen, bitmap, cliprect);
+
+ return 0;
+}
+
+uint32_t dooyong_z80_ym2203_state::screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ /* Text layer is offset on this machine */
+ m_tx->set_scrolly(flip_screen() ? -8 : 8);
+
+ m_bg->draw(screen, bitmap, cliprect, 0, 1);
+ m_fg->draw(screen, bitmap, cliprect, 0, 2);
+ m_tx->draw(screen, bitmap, cliprect, 0, 4);
+
+ draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT);
+
+ return 0;
+}
+
+uint32_t dooyong_z80_ym2203_state::screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ m_bg->draw(screen, bitmap, cliprect, 0, 1);
+ m_fg->draw(screen, bitmap, cliprect, 0, 2);
+ m_tx->draw(screen, bitmap, cliprect, 0, 4);
+
+ draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT | SPRITE_HEIGHT);
+
+ return 0;
+}
+
+uint32_t dooyong_z80_state::screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ if (m_flytiger_pri)
+ {
+ m_fg->draw(screen, bitmap, cliprect, 0, 1);
+ m_bg->draw(screen, bitmap, cliprect, 0, 2);
+ }
+ else
+ {
+ m_bg->draw(screen, bitmap, cliprect, 0, 1);
+ m_fg->draw(screen, bitmap, cliprect, 0, 2);
+ }
+ m_tx->draw(screen, bitmap, cliprect, 0, 4);
+
+ draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT | SPRITE_HEIGHT | SPRITE_YSHIFT_FLYTIGER);
+
+ return 0;
+}
+
+
+uint32_t dooyong_z80_state::screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ m_bg->draw(screen, bitmap, cliprect, 0, 1);
+ m_fg->draw(screen, bitmap, cliprect, 0, 2);
+ m_fg2->draw(screen, bitmap, cliprect, 0, 4);
+ m_tx->draw(screen, bitmap, cliprect, 0, 4);
+
+ draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT | SPRITE_HEIGHT | SPRITE_YSHIFT_BLUEHAWK);
+
+ return 0;
+}
+
+uint32_t dooyong_z80_state::screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ bitmap.fill(m_palette->black_pen(), cliprect);
+
+ m_bg->draw(screen, bitmap, cliprect, 0, 0);
+ if (m_tx_pri) m_tx->draw(screen, bitmap, cliprect, 0, 0);
+ m_fg->draw(screen, bitmap, cliprect, 0, 0);
+ if (!m_tx_pri) m_tx->draw(screen, bitmap, cliprect, 0, 0);
+
+ return 0;
}
-MACHINE_START_MEMBER(dooyong_z80_state, cpu_z80)
+
+
+void dooyong_68k_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- membank("bank1")->configure_entries(0, 8, memregion("maincpu")->base(), 0x4000);
+ /* Sprites take 8 16-bit words each in memory:
+ MSB LSB
+ [offs + 0] ???? ???? ???? ???E
+ [offs + 1] ???? ???? hhhh wwww
+ [offs + 2] ???? ???? ???? ????
+ [offs + 3] cccc cccc cccc cccc
+ [offs + 4] ???? ???x xxxx xxxx
+ [offs + 5] ???? ???? ???? ????
+ [offs + 6] ???? ???y yyyy yyyy
+ [offs + 7] ???? ???? ???? CCCC
+ ? = unused/unknown
+ E = enable
+ c = gfx code
+ x = x offset
+ y = y offset (signed)
+ C = color code
+ w = width
+ h = height */
+
+ uint16_t const *const buffered_spriteram = m_spriteram->buffer();
+ for (int offs = (m_spriteram->bytes() / 2) - 8; offs >= 0; offs -= 8)
+ {
+ if (buffered_spriteram[offs] & 0x0001) /* enable */
+ {
+ int code = buffered_spriteram[offs+3];
+ int const color = buffered_spriteram[offs+7] & 0x000f;
+ //TODO: This priority mechanism works for known games, but seems a bit strange.
+ //Are we missing something? (The obvious spare palette bit isn't it.)
+ int const pri = (((color == 0x00) || (color == 0x0f)) ? 0xfc : 0xf0);
+ int const width = buffered_spriteram[offs+1] & 0x000f;
+ int const height = (buffered_spriteram[offs+1] & 0x00f0) >> 4;
+
+ bool const flip = flip_screen();
+ int sx = buffered_spriteram[offs+4] & 0x01ff;
+ int sy = (int16_t)buffered_spriteram[offs+6] & 0x01ff;
+ if (sy & 0x0100) sy |= ~(int)0x01ff; // Correctly sign-extend 9-bit number
+ if (flip)
+ {
+ sx = 498 - (16 * width) - sx;
+ sy = 240 - (16 * height) - sy;
+ }
+
+ for (int y = 0; y <= height; y++)
+ {
+ int const _y = sy + (16 * (flip ? (height - y) : y));
+ for (int x = 0; x <= width; x++)
+ {
+ int const _x = sx + (16 * (flip ? (width - x) : x));
+ m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect,
+ code,
+ color,
+ flip, flip,
+ _x, _y,
+ screen.priority(),
+ pri, 15);
+ code++;
+ }
+ }
+ }
+ }
}
-WRITE8_MEMBER(dooyong_z80_state::flip_screen_w)
+
+uint32_t rshark_state::screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- flip_screen_set(data);
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ m_bg->draw(screen, bitmap, cliprect, 0, 1);
+ m_bg2->draw(screen, bitmap, cliprect, 0, (m_bg2_priority ? 2 : 1));
+ m_fg->draw(screen, bitmap, cliprect, 0, 2);
+ m_fg2->draw(screen, bitmap, cliprect, 0, 2);
+
+ draw_sprites(screen, bitmap, cliprect);
+
+ return 0;
}
-MACHINE_RESET_MEMBER(dooyong_z80_ym2203_state, sound_ym2203)
+
+uint32_t popbingo_state::screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m_interrupt_line_1 = 0;
- m_interrupt_line_2 = 0;
+ bitmap.fill(m_palette->black_pen(), cliprect);
+ screen.priority().fill(0, cliprect);
+
+ m_bg_bitmap.fill(m_palette->black_pen(), cliprect);
+ m_bg->draw(screen, m_bg_bitmap, cliprect, 0, 1);
+
+ m_bg2_bitmap.fill(m_palette->black_pen(), cliprect);
+ m_bg2->draw(screen, m_bg2_bitmap, cliprect, 0, 1);
+
+ for (int y = cliprect.min_y; cliprect.max_y >= y; y++)
+ {
+ uint16_t const *const bg_src(&m_bg_bitmap.pix16(y, 0));
+ uint16_t const *const bg2_src(&m_bg2_bitmap.pix16(y, 0));
+ uint16_t *const dst(&bitmap.pix16(y, 0));
+ for (int x = cliprect.min_x; cliprect.max_x >= x; x++)
+ dst[x] = 0x100U | (bg_src[x] << 4) | bg2_src[x];
+ }
+
+ draw_sprites(screen, bitmap, cliprect);
+
+ return 0;
}
+
+
/***************************************************************************
Memory Structure(s)
***************************************************************************/
-static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
+ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc007) AM_DEVWRITE("bg", dooyong_rom_tilemap_device, ctrl_w)
@@ -132,7 +774,7 @@ static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("spriteram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
+ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -150,7 +792,7 @@ static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0xf800, 0xffff) AM_READWRITE(paletteram_flytiger_r, paletteram_flytiger_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
+ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -169,7 +811,7 @@ static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state
AM_RANGE(0xf800, 0xffff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_z80_state )
+ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_z80_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSWA")
@@ -189,7 +831,7 @@ static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8, dooyong_z80_state )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8, dooyong_z80_state )
+ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8, dooyong_z80_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("spriteram")
@@ -208,7 +850,7 @@ static ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8, dooyong_z80_state )
AM_RANGE(0xf000, 0xffff) AM_READWRITE(lastday_tx_r, lastday_tx_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_z80_state )
+ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_z80_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -226,7 +868,7 @@ static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8, dooyong_z80_state )
AM_RANGE(0xfc08, 0xfc0f) AM_DEVWRITE("fg", dooyong_rom_tilemap_device, ctrl_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_68k_state )
+ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_68k_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff) /* super-x needs this and is similar */
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04cfff) AM_RAM
@@ -244,7 +886,7 @@ static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16, dooyong_68k_state )
AM_RANGE(0x0cc010, 0x0cc01f) AM_DEVWRITE8("fg2", dooyong_rom_tilemap_device, ctrl_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_68k_state )
+ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_68k_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0d0000, 0x0dcfff) AM_RAM
@@ -262,7 +904,7 @@ static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16, dooyong_68k_state )
AM_RANGE(0x08c010, 0x08c01f) AM_DEVWRITE8("fg2", dooyong_rom_tilemap_device, ctrl_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_68k_state )
+ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_68k_state )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04cfff) AM_RAM
@@ -282,7 +924,7 @@ static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16, dooyong_68k_state )
AM_RANGE(0x0dc000, 0x0dc01f) AM_RAM // registers of some kind?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
+ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
@@ -290,7 +932,7 @@ static ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_s
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
+ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
@@ -298,7 +940,7 @@ static ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8, dooyong_z80_ym2203_st
AM_RANGE(0xf804, 0xf805) AM_DEVREADWRITE("ym2", ym2203_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bluehawk_sound_map, AS_PROGRAM, 8, dooyong_state )
+ADDRESS_MAP_START( bluehawk_sound_map, AS_PROGRAM, 8, dooyong_state )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_DEVREAD("soundlatch", generic_latch_8_device, read)
@@ -312,7 +954,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static INPUT_PORTS_START( dooyongz80_generic )
+INPUT_PORTS_START( dooyongz80_generic )
PORT_START("DSWA")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SWA:1" )
PORT_DIPNAME( 0x02, 0x02, "Coin Type" ) PORT_DIPLOCATION("SWA:2")
@@ -398,7 +1040,7 @@ INPUT_PORTS_END
***************************************************************************/
-static INPUT_PORTS_START( dooyongm68_generic )
+INPUT_PORTS_START( dooyongm68_generic )
PORT_START("DSW")
PORT_SERVICE_DIPLOC( 0x01, IP_ACTIVE_LOW, "SWA:1" )
PORT_DIPNAME( 0x0002, 0x0002, "Coin Type" ) PORT_DIPLOCATION("SWA:2")
@@ -480,7 +1122,7 @@ INPUT_PORTS_END
***************************************************************************/
-static INPUT_PORTS_START( lastday )
+INPUT_PORTS_START( lastday )
PORT_INCLUDE( dooyongz80_generic )
PORT_MODIFY("DSWB")
@@ -504,7 +1146,7 @@ static INPUT_PORTS_START( lastday )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
INPUT_PORTS_END
-static INPUT_PORTS_START( gulfstrm )
+INPUT_PORTS_START( gulfstrm )
PORT_INCLUDE( dooyongz80_generic )
PORT_MODIFY("DSWB")
@@ -528,7 +1170,7 @@ static INPUT_PORTS_START( gulfstrm )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
-static INPUT_PORTS_START( pollux )
+INPUT_PORTS_START( pollux )
PORT_INCLUDE( dooyongz80_generic )
PORT_MODIFY("SYSTEM")
@@ -542,11 +1184,11 @@ static INPUT_PORTS_START( pollux )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
-static INPUT_PORTS_START( bluehawk )
+INPUT_PORTS_START( bluehawk )
PORT_INCLUDE( dooyongz80_generic )
INPUT_PORTS_END
-static INPUT_PORTS_START( flytiger )
+INPUT_PORTS_START( flytiger )
PORT_INCLUDE( dooyongz80_generic )
PORT_MODIFY("DSWB")
@@ -558,7 +1200,7 @@ static INPUT_PORTS_START( flytiger )
// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") // allows title screen + ending screen colours to cycle (but I'm not sure they're meant to, reference shots suggest not, maybe a debug port?)
INPUT_PORTS_END
-static INPUT_PORTS_START( sadari )
+INPUT_PORTS_START( sadari )
PORT_INCLUDE( dooyongz80_generic )
PORT_MODIFY("DSWB")
@@ -575,7 +1217,7 @@ static INPUT_PORTS_START( sadari )
PORT_DIPSETTING( 0x00, DEF_STR( Asia ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( primella )
+INPUT_PORTS_START( primella )
PORT_INCLUDE( dooyongz80_generic )
PORT_MODIFY("DSWB")
@@ -589,7 +1231,7 @@ static INPUT_PORTS_START( primella )
PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( rshark )
+INPUT_PORTS_START( rshark )
PORT_INCLUDE( dooyongm68_generic )
PORT_MODIFY("DSW")
@@ -604,7 +1246,7 @@ static INPUT_PORTS_START( rshark )
PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW", 0x0002, NOTEQUALS, 0x0002)
INPUT_PORTS_END
-static INPUT_PORTS_START( superx )
+INPUT_PORTS_START( superx )
PORT_INCLUDE( dooyongm68_generic )
PORT_MODIFY("DSW") /* In documentation this switch enables "service mode" but it never had any effect in game */
@@ -613,7 +1255,7 @@ static INPUT_PORTS_START( superx )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
-static INPUT_PORTS_START( popbingo )
+INPUT_PORTS_START( popbingo )
PORT_INCLUDE( dooyongm68_generic )
PORT_MODIFY("DSW")
@@ -636,7 +1278,7 @@ INPUT_PORTS_END
***************************************************************************/
-static const gfx_layout lastday_charlayout =
+const gfx_layout lastday_charlayout =
{
8,8,
RGN_FRAC(1,2),
@@ -647,7 +1289,7 @@ static const gfx_layout lastday_charlayout =
16*8
};
-static const gfx_layout bluehawk_charlayout =
+const gfx_layout bluehawk_charlayout =
{
8,8,
RGN_FRAC(1,1),
@@ -658,7 +1300,7 @@ static const gfx_layout bluehawk_charlayout =
32*8
};
-static const gfx_layout tilelayout =
+const gfx_layout tilelayout =
{
32,32,
RGN_FRAC(1,1),
@@ -675,7 +1317,7 @@ static const gfx_layout tilelayout =
512*8
};
-static const gfx_layout spritelayout =
+const gfx_layout spritelayout =
{
16,16,
RGN_FRAC(1,1),
@@ -688,7 +1330,7 @@ static const gfx_layout spritelayout =
128*8
};
-static const gfx_layout rshark_spritelayout =
+const gfx_layout rshark_spritelayout =
{
16,16,
RGN_FRAC(1,1),
@@ -701,21 +1343,21 @@ static const gfx_layout rshark_spritelayout =
128*8
};
-static GFXDECODE_START( lastday )
+GFXDECODE_START( lastday )
GFXDECODE_ENTRY( "gfx1", 0, lastday_charlayout, 0, 16+64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16+64 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16+64 )
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 512, 16+64 )
GFXDECODE_END
-static GFXDECODE_START( flytiger )
+GFXDECODE_START( flytiger )
GFXDECODE_ENTRY( "gfx1", 0, lastday_charlayout, 0, 16+64 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16+64 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16+64 )
GFXDECODE_ENTRY( "gfx4", 0, tilelayout, 512, 32+64 )
GFXDECODE_END
-static GFXDECODE_START( bluehawk )
+GFXDECODE_START( bluehawk )
GFXDECODE_ENTRY( "gfx1", 0, bluehawk_charlayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 768, 16 )
@@ -723,14 +1365,14 @@ static GFXDECODE_START( bluehawk )
GFXDECODE_ENTRY( "gfx5", 0, tilelayout, 0, 16 )
GFXDECODE_END
-static GFXDECODE_START( primella )
+GFXDECODE_START( primella )
GFXDECODE_ENTRY( "gfx1", 0, bluehawk_charlayout, 0, 16 )
/* no sprites */
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 768, 16 )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 512, 16 )
GFXDECODE_END
-static GFXDECODE_START( rshark )
+GFXDECODE_START( rshark )
/* no chars */
GFXDECODE_ENTRY( "gfx1", 0, rshark_spritelayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 256, 16 )
@@ -739,7 +1381,7 @@ static GFXDECODE_START( rshark )
GFXDECODE_ENTRY( "gfx5", 0, spritelayout, 1024, 16 )
GFXDECODE_END
-static GFXDECODE_START( popbingo )
+GFXDECODE_START( popbingo )
/* no chars */
GFXDECODE_ENTRY( "gfx1", 0, rshark_spritelayout, 0, 16 )
GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0, 1 )
@@ -771,7 +1413,7 @@ WRITE_LINE_MEMBER(dooyong_z80_ym2203_state::irqhandler_2203_2)
***************************************************************************/
-static MACHINE_CONFIG_FRAGMENT( sound_2203 )
+MACHINE_CONFIG_FRAGMENT( sound_2203 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
@@ -787,7 +1429,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_2203 )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_FRAGMENT( sound_2151 )
+MACHINE_CONFIG_FRAGMENT( sound_2151 )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
@@ -797,11 +1439,11 @@ static MACHINE_CONFIG_FRAGMENT( sound_2151 )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_FRAGMENT( sound_2151_4mhz )
+MACHINE_CONFIG_FRAGMENT( sound_2151_4mhz )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
@@ -811,11 +1453,11 @@ static MACHINE_CONFIG_FRAGMENT( sound_2151_4mhz )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lastday, dooyong_z80_ym2203_state )
+MACHINE_CONFIG_START( lastday )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz verified for Last Day / D-day */
@@ -868,7 +1510,7 @@ static MACHINE_CONFIG_START( lastday, dooyong_z80_ym2203_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gulfstrm, dooyong_z80_ym2203_state )
+MACHINE_CONFIG_START( gulfstrm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
@@ -907,7 +1549,7 @@ static MACHINE_CONFIG_START( gulfstrm, dooyong_z80_ym2203_state )
MCFG_FRAGMENT_ADD( sound_2203 ) /* 3.579545MHz */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pollux, dooyong_z80_ym2203_state )
+MACHINE_CONFIG_START( pollux )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8Mhz */
@@ -946,7 +1588,7 @@ static MACHINE_CONFIG_START( pollux, dooyong_z80_ym2203_state )
MCFG_FRAGMENT_ADD( sound_2203 ) /* 3.579545MHz or 4Mhz ??? */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bluehawk, dooyong_z80_state )
+MACHINE_CONFIG_START( bluehawk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 8000000) /* ??? */
@@ -986,7 +1628,7 @@ static MACHINE_CONFIG_START( bluehawk, dooyong_z80_state )
MCFG_FRAGMENT_ADD( sound_2151 ) /* 3.579545MHz or 4Mhz ??? */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( flytiger, dooyong_z80_state )
+MACHINE_CONFIG_START( flytiger )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz */
@@ -1025,7 +1667,7 @@ static MACHINE_CONFIG_START( flytiger, dooyong_z80_state )
MCFG_FRAGMENT_ADD( sound_2151 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( primella, dooyong_z80_state )
+MACHINE_CONFIG_START( primella )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* 8MHz */
@@ -1075,7 +1717,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline)
}
-static MACHINE_CONFIG_START( dooyong_68k, rshark_state )
+MACHINE_CONFIG_START( dooyong_68k )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) // 8MHz measured on Super-X
@@ -1114,17 +1756,17 @@ static MACHINE_CONFIG_START( dooyong_68k, rshark_state )
MCFG_FRAGMENT_ADD(sound_2151_4mhz)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( rshark, dooyong_68k )
+MACHINE_CONFIG_DERIVED( rshark, dooyong_68k )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(rshark_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED( superx, dooyong_68k )
+MACHINE_CONFIG_DERIVED( superx, dooyong_68k )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(superx_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( popbingo, popbingo_state )
+MACHINE_CONFIG_START( popbingo )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) // 10MHz measured
@@ -1161,6 +1803,8 @@ static MACHINE_CONFIG_START( popbingo, popbingo_state )
MCFG_FRAGMENT_ADD(sound_2151_4mhz)
MACHINE_CONFIG_END
+} // anonymous namespace
+
/***************************************************************************
@@ -2092,35 +2736,35 @@ ROM_END
/* The differences between the two lastday sets are only in the sound program and graphics. The main program is the same. */
-GAME( 1990, lastday, 0, lastday, lastday, driver_device, 0, ROT270, "Dooyong", "The Last Day (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, lastdaya, lastday, lastday, lastday, driver_device, 0, ROT270, "Dooyong", "The Last Day (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ddaydoo, lastday, lastday, lastday, driver_device, 0, ROT270, "Dooyong", "Chulgyeok D-Day (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, lastday, 0, lastday, lastday, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "The Last Day (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, lastdaya, lastday, lastday, lastday, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "The Last Day (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ddaydoo, lastday, lastday, lastday, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Chulgyeok D-Day (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, gulfstrm, 0, gulfstrm, gulfstrm, driver_device, 0, ROT270, "Dooyong", "Gulf Storm (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, gulfstrma,gulfstrm, gulfstrm, gulfstrm, driver_device, 0, ROT270, "Dooyong", "Gulf Storm (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, gulfstrmb,gulfstrm, gulfstrm, gulfstrm, driver_device, 0, ROT270, "Dooyong", "Gulf Storm (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, gulfstrmm,gulfstrm, gulfstrm, gulfstrm, driver_device, 0, ROT270, "Dooyong (Media Shoji license)", "Gulf Storm (Media Shoji)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, gulfstrmk,gulfstrm, gulfstrm, gulfstrm, driver_device, 0, ROT270, "Dooyong", "Gulf Storm (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, gulfstrm, 0, gulfstrm, gulfstrm, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Gulf Storm (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, gulfstrma,gulfstrm, gulfstrm, gulfstrm, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Gulf Storm (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, gulfstrmb,gulfstrm, gulfstrm, gulfstrm, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Gulf Storm (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, gulfstrmm,gulfstrm, gulfstrm, gulfstrm, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong (Media Shoji license)", "Gulf Storm (Media Shoji)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, gulfstrmk,gulfstrm, gulfstrm, gulfstrm, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Gulf Storm (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pollux, 0, pollux, pollux, driver_device, 0, ROT270, "Dooyong", "Pollux (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, polluxa, pollux, pollux, pollux, driver_device, 0, ROT270, "Dooyong", "Pollux (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, polluxa2, pollux, pollux, pollux, driver_device, 0, ROT270, "Dooyong", "Pollux (set 3)", MACHINE_SUPPORTS_SAVE ) // Original Dooyong Board distributed by TCH
-GAME( 1991, polluxn, pollux, pollux, pollux, driver_device, 0, ROT270, "Dooyong (NTC / Atlus license)", "Pollux (Japan, NTC license, distributed by Atlus)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pollux, 0, pollux, pollux, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Pollux (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, polluxa, pollux, pollux, pollux, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Pollux (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, polluxa2, pollux, pollux, pollux, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong", "Pollux (set 3)", MACHINE_SUPPORTS_SAVE ) // Original Dooyong Board distributed by TCH
+GAME( 1991, polluxn, pollux, pollux, pollux, dooyong_z80_ym2203_state, 0, ROT270, "Dooyong (NTC / Atlus license)", "Pollux (Japan, NTC license, distributed by Atlus)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, flytiger, 0, flytiger, flytiger, driver_device, 0, ROT270, "Dooyong", "Flying Tiger (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, flytigera,flytiger, flytiger, flytiger, driver_device, 0, ROT270, "Dooyong", "Flying Tiger (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, flytiger, 0, flytiger, flytiger, dooyong_z80_state, 0, ROT270, "Dooyong", "Flying Tiger (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, flytigera,flytiger, flytiger, flytiger, dooyong_z80_state, 0, ROT270, "Dooyong", "Flying Tiger (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, bluehawk, 0, bluehawk, bluehawk, driver_device, 0, ROT270, "Dooyong", "Blue Hawk", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, bluehawkn,bluehawk, bluehawk, bluehawk, driver_device, 0, ROT270, "Dooyong (NTC license)", "Blue Hawk (NTC)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, bluehawk, 0, bluehawk, bluehawk, dooyong_z80_state, 0, ROT270, "Dooyong", "Blue Hawk", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, bluehawkn,bluehawk, bluehawk, bluehawk, dooyong_z80_state, 0, ROT270, "Dooyong (NTC license)", "Blue Hawk (NTC)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, sadari, 0, primella, sadari, driver_device, 0, ROT0, "Dooyong (NTC license)", "Sadari", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sadari, 0, primella, sadari, dooyong_z80_state, 0, ROT0, "Dooyong (NTC license)", "Sadari", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, gundl94, 0, primella, primella, driver_device, 0, ROT0, "Dooyong", "Gun Dealer '94", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, primella, gundl94, primella, primella, driver_device, 0, ROT0, "Dooyong (NTC license)", "Primella", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gundl94, 0, primella, primella, dooyong_z80_state, 0, ROT0, "Dooyong", "Gun Dealer '94", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, primella, gundl94, primella, primella, dooyong_z80_state, 0, ROT0, "Dooyong (NTC license)", "Primella", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, superx, 0, superx, superx, driver_device, 0, ROT270, "Dooyong (NTC license)", "Super-X (NTC)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, superxm, superx, superx, superx, driver_device, 0, ROT270, "Dooyong (Mitchell license)", "Super-X (Mitchell)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, superx, 0, superx, superx, rshark_state, 0, ROT270, "Dooyong (NTC license)", "Super-X (NTC)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, superxm, superx, superx, superx, rshark_state, 0, ROT270, "Dooyong (Mitchell license)", "Super-X (Mitchell)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, rshark, 0, rshark, rshark, driver_device, 0, ROT270, "Dooyong", "R-Shark", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, rshark, 0, rshark, rshark, rshark_state, 0, ROT270, "Dooyong", "R-Shark", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, popbingo, 0, popbingo, popbingo, driver_device, 0, ROT0, "Dooyong", "Pop Bingo", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, popbingo, 0, popbingo, popbingo, popbingo_state, 0, ROT0, "Dooyong", "Pop Bingo", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp
index 0d53cd09e56..2f025a98ee1 100644
--- a/src/mame/drivers/dorachan.cpp
+++ b/src/mame/drivers/dorachan.cpp
@@ -200,7 +200,7 @@ void dorachan_state::machine_reset()
m_flip_screen = 0;
}
-static MACHINE_CONFIG_START( dorachan, dorachan_state )
+static MACHINE_CONFIG_START( dorachan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2000000)
@@ -254,4 +254,4 @@ ROM_END
*
*************************************/
-GAME( 1980, dorachan, 0, dorachan, dorachan, driver_device, 0, ROT270, "Alpha Denshi Co. / Craul Denshi", "Dora-chan (Japan)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, dorachan, 0, dorachan, dorachan, dorachan_state, 0, ROT270, "Alpha Denshi Co. / Craul Denshi", "Dora-chan (Japan)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp
index 76441f045b5..08a76d4747e 100644
--- a/src/mame/drivers/dotrikun.cpp
+++ b/src/mame/drivers/dotrikun.cpp
@@ -185,7 +185,7 @@ void dotrikun_state::machine_reset()
m_color = 0;
}
-static MACHINE_CONFIG_START( dotrikun, dotrikun_state )
+static MACHINE_CONFIG_START( dotrikun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
@@ -224,5 +224,5 @@ ROM_START( dotrikun2 )
ROM_END
-GAMEL(1990, dotrikun, 0, dotrikun, dotrikun, driver_device, 0, ROT0, "Sega", "Dottori Kun (new version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW, layout_dotrikun )
-GAMEL(1990, dotrikun2, dotrikun, dotrikun, dotrikun, driver_device, 0, ROT0, "Sega", "Dottori Kun (old version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW, layout_dotrikun )
+GAMEL(1990, dotrikun, 0, dotrikun, dotrikun, dotrikun_state, 0, ROT0, "Sega", "Dottori Kun (new version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW, layout_dotrikun )
+GAMEL(1990, dotrikun2, dotrikun, dotrikun, dotrikun, dotrikun_state, 0, ROT0, "Sega", "Dottori Kun (old version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW, layout_dotrikun )
diff --git a/src/mame/drivers/dps1.cpp b/src/mame/drivers/dps1.cpp
index cd0f3e04f7f..b961f1d29ef 100644
--- a/src/mame/drivers/dps1.cpp
+++ b/src/mame/drivers/dps1.cpp
@@ -43,7 +43,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
DECLARE_DRIVER_INIT(dps1);
DECLARE_MACHINE_RESET(dps1);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
private:
bool m_dma_dir;
@@ -201,7 +201,7 @@ DRIVER_INIT_MEMBER( dps1_state, dps1 )
static INPUT_PORTS_START( dps1 )
INPUT_PORTS_END
-WRITE8_MEMBER( dps1_state::kbd_put )
+void dps1_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -210,7 +210,7 @@ static SLOT_INTERFACE_START( floppies )
SLOT_INTERFACE( "floppy0", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( dps1, dps1_state )
+static MACHINE_CONFIG_START( dps1 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(dps1_mem)
@@ -219,7 +219,7 @@ static MACHINE_CONFIG_START( dps1, dps1_state )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(dps1_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dps1_state, kbd_put))
// floppy
MCFG_UPD765A_ADD("fdc", false, true)
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index d749aa17156..17fa1daa7ab 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -146,7 +146,7 @@ static SLOT_INTERFACE_START( dragon_alpha_floppies )
SLOT_INTERFACE("dd", FLOPPY_35_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( dragon_base, dragon_state )
+static MACHINE_CONFIG_START( dragon_base )
MCFG_DEVICE_MODIFY(":")
MCFG_DEVICE_CLOCK(XTAL_4_433619MHz)
@@ -213,7 +213,7 @@ static MACHINE_CONFIG_DERIVED( dragon32, dragon_base )
MCFG_COCO_CARTRIDGE_HALT_CB(INPUTLINE(MAINCPU_TAG, INPUT_LINE_HALT))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( dragon64, dragon_base, dragon64_state )
+static MACHINE_CONFIG_DERIVED( dragon64, dragon_base )
// internal ram
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
@@ -233,13 +233,13 @@ static MACHINE_CONFIG_DERIVED_CLASS( dragon64, dragon_base, dragon64_state )
MCFG_SOFTWARE_LIST_ADD("dragon_os9_list", "dragon_os9")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( dragon200e, dragon64, dragon200e_state )
+static MACHINE_CONFIG_DERIVED( dragon200e, dragon64 )
// video hardware
MCFG_DEVICE_MODIFY(VDG_TAG)
MCFG_MC6847_CHARROM_CALLBACK(dragon200e_state, char_rom_r)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( d64plus, dragon64, d64plus_state )
+static MACHINE_CONFIG_DERIVED( d64plus, dragon64 )
// internal ram
MCFG_RAM_MODIFY(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("128K")
@@ -269,7 +269,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( d64plus, dragon64, d64plus_state )
//
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( dgnalpha, dragon_base, dragon_alpha_state )
+static MACHINE_CONFIG_DERIVED( dgnalpha, dragon_base )
// internal ram
MCFG_RAM_ADD(RAM_TAG)
MCFG_RAM_DEFAULT_SIZE("64K")
@@ -386,11 +386,11 @@ ROM_START(dgnalpha)
ROM_LOAD("alpha_ba.rom", 0x8000, 0x4000, CRC(84f68bf9) SHA1(1983b4fb398e3dd9668d424c666c5a0b3f1e2b69))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, dragon32, 0, 0, dragon32, dragon, driver_device, 0, "Dragon Data Ltd", "Dragon 32", 0 )
-COMP( 1983, dragon64, dragon32, 0, dragon64, dragon, driver_device, 0, "Dragon Data Ltd", "Dragon 64", 0 )
-COMP( 1985, dragon200, dragon32, 0, dragon64, dragon, driver_device, 0, "Eurohard S.A.", "Dragon 200", 0 )
-COMP( 1985, dragon200e, dragon32, 0, dragon200e, dragon, driver_device, 0, "Eurohard S.A.", "Dragon 200-E", MACHINE_NOT_WORKING )
-COMP( 1985, d64plus, dragon32, 0, d64plus, dragon, driver_device, 0, "Dragon Data Ltd / Compusense", "Dragon 64 Plus", MACHINE_NOT_WORKING )
-COMP( 1983, tanodr64, dragon32, 0, tanodr64, dragon, driver_device, 0, "Dragon Data Ltd / Tano Ltd", "Tano Dragon 64 (NTSC)", 0 )
-COMP( 1984, dgnalpha, dragon32, 0, dgnalpha, dragon, driver_device, 0, "Dragon Data Ltd", "Dragon Professional (Alpha)", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, dragon32, 0, 0, dragon32, dragon, dragon_state, 0, "Dragon Data Ltd", "Dragon 32", 0 )
+COMP( 1983, dragon64, dragon32, 0, dragon64, dragon, dragon64_state, 0, "Dragon Data Ltd", "Dragon 64", 0 )
+COMP( 1985, dragon200, dragon32, 0, dragon64, dragon, dragon64_state, 0, "Eurohard S.A.", "Dragon 200", 0 )
+COMP( 1985, dragon200e, dragon32, 0, dragon200e, dragon, dragon200e_state, 0, "Eurohard S.A.", "Dragon 200-E", MACHINE_NOT_WORKING )
+COMP( 1985, d64plus, dragon32, 0, d64plus, dragon, d64plus_state, 0, "Dragon Data Ltd / Compusense", "Dragon 64 Plus", MACHINE_NOT_WORKING )
+COMP( 1983, tanodr64, dragon32, 0, tanodr64, dragon, dragon64_state, 0, "Dragon Data Ltd / Tano Ltd", "Tano Dragon 64 (NTSC)", 0 )
+COMP( 1984, dgnalpha, dragon32, 0, dgnalpha, dragon, dragon_alpha_state, 0, "Dragon Data Ltd", "Dragon Professional (Alpha)", 0 )
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index 07c40176dd5..663c2687ebc 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -325,7 +325,7 @@ void dragrace_state::machine_reset()
m_gear[1] = 0;
}
-static MACHINE_CONFIG_START( dragrace, dragrace_state )
+static MACHINE_CONFIG_START( dragrace )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_12_096MHz / 12)
@@ -381,4 +381,4 @@ ROM_START( dragrace )
ROM_END
-GAMEL(1977, dragrace, 0, dragrace, dragrace, driver_device, 0, 0, "Atari (Kee Games)", "Drag Race", MACHINE_SUPPORTS_SAVE, layout_dragrace )
+GAMEL(1977, dragrace, 0, dragrace, dragrace, dragrace_state, 0, 0, "Atari (Kee Games)", "Drag Race", MACHINE_SUPPORTS_SAVE, layout_dragrace )
diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp
index 12ea37fb4c2..f404248ac37 100644
--- a/src/mame/drivers/dreambal.cpp
+++ b/src/mame/drivers/dreambal.cpp
@@ -304,7 +304,7 @@ void dreambal_state::machine_reset()
}
// xtals = 28.000, 9.8304
-static MACHINE_CONFIG_START( dreambal, dreambal_state )
+static MACHINE_CONFIG_START( dreambal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
@@ -346,7 +346,7 @@ static MACHINE_CONFIG_START( dreambal, dreambal_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 9830400/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 9830400/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index 6e6c9089166..d63e70cd1de 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -792,7 +792,7 @@ void dreamwld_state::machine_reset()
}
-static MACHINE_CONFIG_START( baryon, dreamwld_state )
+static MACHINE_CONFIG_START( baryon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz verified */
@@ -816,7 +816,7 @@ static MACHINE_CONFIG_START( baryon, dreamwld_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, OKIM6295_PIN7_LOW) /* 1MHz verified */
+ MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
@@ -830,7 +830,7 @@ static MACHINE_CONFIG_DERIVED( dreamwld, baryon )
MCFG_CPU_PROGRAM_MAP(dreamwld_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", dreamwld_state, irq4_line_hold)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/32, OKIM6295_PIN7_LOW) /* 1MHz verified */
+ MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/32, PIN7_LOW) /* 1MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
@@ -1285,10 +1285,10 @@ ROM_START( gaialast )
ROM_LOAD( "9", 0x000000, 0x10000, CRC(0da8db45) SHA1(7d5bd71c5b0b28ff74c732edd7c662f46f2ab25b) )
ROM_END
-GAME( 1997, baryon, 0, baryon, baryon, driver_device, 0, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, baryona, baryon, baryon, baryon, driver_device, 0, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, cutefght, 0, dreamwld, cutefght, driver_device, 0, ROT0, "SemiCom", "Cute Fighter", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, rolcrush, 0, baryon, rolcrush, driver_device, 0, ROT0, "SemiCom / Exit (Trust license)", "Rolling Crush (version 1.07.E - 1999/02/11, Trust license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, rolcrusha,rolcrush, baryon, rolcrush, driver_device, 0, ROT0, "SemiCom / Exit", "Rolling Crush (version 1.03.E - 1999/01/29)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gaialast, 0, baryon, gaialast, driver_device, 0, ROT0, "SemiCom / XESS", "Gaia - The Last Choice of Earth", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, dreamwld, 0, dreamwld, dreamwld, driver_device, 0, ROT0, "SemiCom", "Dream World", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, baryon, 0, baryon, baryon, dreamwld_state, 0, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, baryona, baryon, baryon, baryon, dreamwld_state, 0, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, cutefght, 0, dreamwld, cutefght, dreamwld_state, 0, ROT0, "SemiCom", "Cute Fighter", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, rolcrush, 0, baryon, rolcrush, dreamwld_state, 0, ROT0, "SemiCom / Exit (Trust license)", "Rolling Crush (version 1.07.E - 1999/02/11, Trust license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, rolcrusha,rolcrush, baryon, rolcrush, dreamwld_state, 0, ROT0, "SemiCom / Exit", "Rolling Crush (version 1.03.E - 1999/01/29)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gaialast, 0, baryon, gaialast, dreamwld_state, 0, ROT0, "SemiCom / XESS", "Gaia - The Last Choice of Earth", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dreamwld, 0, dreamwld, dreamwld, dreamwld_state, 0, ROT0, "SemiCom", "Dream World", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp
index 03a8e521f2c..168e48d8f8a 100644
--- a/src/mame/drivers/drgnmst.cpp
+++ b/src/mame/drivers/drgnmst.cpp
@@ -373,7 +373,7 @@ void drgnmst_state::machine_reset()
m_oki0_bank = 0;
}
-static MACHINE_CONFIG_START( drgnmst, drgnmst_state )
+static MACHINE_CONFIG_START( drgnmst )
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Confirmed */
MCFG_CPU_PROGRAM_MAP(drgnmst_main_map)
@@ -403,11 +403,11 @@ static MACHINE_CONFIG_START( drgnmst, drgnmst_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 32000000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32000000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki2", 32000000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32000000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp
index ac8504aae24..3c460dfe637 100644
--- a/src/mame/drivers/dribling.cpp
+++ b/src/mame/drivers/dribling.cpp
@@ -266,7 +266,7 @@ void dribling_state::machine_reset()
}
-static MACHINE_CONFIG_START( dribling, dribling_state )
+static MACHINE_CONFIG_START( dribling )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000)
@@ -373,6 +373,6 @@ ROM_END
*
*************************************/
-GAME( 1983, dribling, 0, dribling, dribling, driver_device, 0, ROT0, "Model Racing", "Dribbling", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, driblingo, dribling, dribling, dribling, driver_device, 0, ROT0, "Model Racing (Olympia license)", "Dribbling (Olympia)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, driblingbr, dribling, dribling, dribling, driver_device, 0, ROT0, "bootleg (Videomac)", "Dribbling (bootleg, Brazil)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, dribling, 0, dribling, dribling, dribling_state, 0, ROT0, "Model Racing", "Dribbling", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, driblingo, dribling, dribling, dribling, dribling_state, 0, ROT0, "Model Racing (Olympia license)", "Dribbling (Olympia)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, driblingbr, dribling, dribling, dribling, dribling_state, 0, ROT0, "bootleg (Videomac)", "Dribbling (bootleg, Brazil)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp
index 71aa57fbe06..2e407b5aa20 100644
--- a/src/mame/drivers/drmicro.cpp
+++ b/src/mame/drivers/drmicro.cpp
@@ -238,7 +238,7 @@ void drmicro_state::machine_reset()
}
-static MACHINE_CONFIG_START( drmicro, drmicro_state )
+static MACHINE_CONFIG_START( drmicro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MCLK/6) /* 3.072MHz? */
@@ -277,7 +277,7 @@ static MACHINE_CONFIG_START( drmicro, drmicro_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(drmicro_state, pcm_w)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) /* 6 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -322,4 +322,4 @@ ROM_END
*
*************************************/
-GAME( 1983, drmicro, 0, drmicro, drmicro, driver_device, 0, ROT270, "Sanritsu", "Dr. Micro", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, drmicro, 0, drmicro, drmicro, drmicro_state, 0, ROT270, "Sanritsu", "Dr. Micro", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp
index 827d5645e4f..f7bc2dfbe1d 100644
--- a/src/mame/drivers/drtomy.cpp
+++ b/src/mame/drivers/drtomy.cpp
@@ -299,7 +299,7 @@ void drtomy_state::machine_reset()
m_oki_bank = 0;
}
-static MACHINE_CONFIG_START( drtomy, drtomy_state )
+static MACHINE_CONFIG_START( drtomy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* ? MHz */
@@ -324,7 +324,7 @@ static MACHINE_CONFIG_START( drtomy, drtomy_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 26000000/16, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 26000000/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -355,4 +355,4 @@ ROM_START( drtomy )
ROM_END
-GAME( 1993, drtomy, 0, drtomy, drtomy, driver_device, 0, ROT0, "Playmark", "Dr. Tomy", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, drtomy, 0, drtomy, drtomy, drtomy_state, 0, ROT0, "Playmark", "Dr. Tomy", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index 150724fccd0..dc21cffa126 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -438,7 +438,7 @@ INPUT_PORTS_END
* Machine Driver *
*************************/
-static MACHINE_CONFIG_START( drw80pkr, drw80pkr_state )
+static MACHINE_CONFIG_START( drw80pkr )
// basic machine hardware
MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(drw80pkr_map)
@@ -512,6 +512,6 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1982, drw80pkr, 0, drw80pkr, drw80pkr, drw80pkr_state, drw80pkr, ROT0, "IGT - International Game Technology", "Draw 80 Poker", MACHINE_NOT_WORKING )
GAME( 1983, drw80pk2, 0, drw80pkr, drw80pkr, drw80pkr_state, drw80pkr, ROT0, "IGT - International Game Technology", "Draw 80 Poker - Minn", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/dsb46.cpp b/src/mame/drivers/dsb46.cpp
index b6729926993..4b665f66fd9 100644
--- a/src/mame/drivers/dsb46.cpp
+++ b/src/mame/drivers/dsb46.cpp
@@ -36,7 +36,7 @@ public:
DECLARE_READ8_MEMBER(port00_r);
DECLARE_READ8_MEMBER(port01_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE8_MEMBER(port1a_w);
DECLARE_DRIVER_INIT(dsb46);
DECLARE_MACHINE_RESET(dsb46);
@@ -104,12 +104,12 @@ READ8_MEMBER( dsb46_state::port00_r )
return ret;
}
-WRITE8_MEMBER( dsb46_state::kbd_put )
+void dsb46_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( dsb46, dsb46_state )
+static MACHINE_CONFIG_START( dsb46 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(dsb46_mem)
@@ -118,7 +118,7 @@ static MACHINE_CONFIG_START( dsb46, dsb46_state )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(dsb46_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dsb46_state, kbd_put))
MACHINE_CONFIG_END
ROM_START( dsb46 )
diff --git a/src/mame/drivers/dual68.cpp b/src/mame/drivers/dual68.cpp
index ea94a995f08..fb175c129c1 100644
--- a/src/mame/drivers/dual68.cpp
+++ b/src/mame/drivers/dual68.cpp
@@ -26,13 +26,16 @@ public:
{
}
+ void kbd_put(u8 data);
+ DECLARE_WRITE16_MEMBER( dual68_terminal_w );
+
+protected:
+ virtual void machine_reset() override;
+
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
- DECLARE_WRITE8_MEMBER( kbd_put );
- DECLARE_WRITE16_MEMBER( dual68_terminal_w );
//uint8_t m_term_data;
required_shared_ptr<uint16_t> m_p_ram;
- virtual void machine_reset() override;
};
@@ -74,12 +77,12 @@ void dual68_state::machine_reset()
m_maincpu->reset();
}
-WRITE8_MEMBER( dual68_state::kbd_put )
+void dual68_state::kbd_put(u8 data)
{
//m_term_data = data;
}
-static MACHINE_CONFIG_START( dual68, dual68_state )
+static MACHINE_CONFIG_START( dual68 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(dual68_mem)
@@ -91,7 +94,7 @@ static MACHINE_CONFIG_START( dual68, dual68_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(dual68_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(dual68_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -111,5 +114,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, dual68, 0, 0, dual68, dual68, driver_device, 0, "Dual Systems Corporation", "Dual Systems 68000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, dual68, 0, 0, dual68, dual68, dual68_state, 0, "Dual Systems Corporation", "Dual Systems 68000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index a81d7a672dd..0be6895eb68 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -813,7 +813,7 @@ void dunhuang_state::machine_reset()
}
-static MACHINE_CONFIG_START( dunhuang, dunhuang_state )
+static MACHINE_CONFIG_START( dunhuang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2)
@@ -848,7 +848,7 @@ static MACHINE_CONFIG_START( dunhuang, dunhuang_state )
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(dunhuang_state, dunhuang_input_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", 12000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 12000000/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -874,4 +874,4 @@ ROM_START( dunhuang )
ROM_LOAD( "rom6.u1", 0x00000, 0x20000, CRC(31cfdc29) SHA1(725249eae9227eadf05418b799e0da0254bb2f51) )
ROM_END
-GAME( 1995, dunhuang, 0, dunhuang, dunhuang, driver_device, 0, ROT0, "Spirit", "Mahjong Dunhuang", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, dunhuang, 0, dunhuang, dunhuang, dunhuang_state, 0, ROT0, "Spirit", "Mahjong Dunhuang", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp
index a6d1717b72e..d533826c287 100644
--- a/src/mame/drivers/dvk_kcgd.cpp
+++ b/src/mame/drivers/dvk_kcgd.cpp
@@ -342,7 +342,7 @@ static GFXDECODE_START( kcgd )
GFXDECODE_ENTRY("maincpu", 0112236, kcgd_charlayout, 0, 1)
GFXDECODE_END
-static MACHINE_CONFIG_START( kcgd, kcgd_state )
+static MACHINE_CONFIG_START( kcgd )
MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_30_8MHz/4)
MCFG_CPU_PROGRAM_MAP(kcgd_mem)
MCFG_T11_INITIAL_MODE(0100000)
@@ -381,5 +381,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, dvk_kcgd, 0, 0, kcgd, 0, driver_device, 0, "USSR", "DVK KCGD", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, dvk_kcgd, 0, 0, kcgd, 0, kcgd_state, 0, "USSR", "DVK KCGD", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index 755a74eacc3..908bdb2861a 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -341,7 +341,7 @@ static GFXDECODE_START( ksm )
GFXDECODE_ENTRY("chargen", 0x0000, ksm_charlayout, 0, 1)
GFXDECODE_END
-static MACHINE_CONFIG_START( ksm, ksm_state )
+static MACHINE_CONFIG_START( ksm )
MCFG_CPU_ADD("maincpu", I8080, XTAL_15_4MHz/10)
MCFG_CPU_PROGRAM_MAP(ksm_mem)
MCFG_CPU_IO_MAP(ksm_io)
@@ -405,5 +405,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, dvk_ksm, 0, 0, ksm, ksm, driver_device, 0, "USSR", "DVK KSM", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1986, dvk_ksm, 0, 0, ksm, ksm, ksm_state, 0, "USSR", "DVK KSM", 0)
diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp
index fb2675c07b4..e78b7bba441 100644
--- a/src/mame/drivers/dwarfd.cpp
+++ b/src/mame/drivers/dwarfd.cpp
@@ -790,7 +790,7 @@ void dwarfd_state::machine_reset()
m_back_color = false;
}
-static MACHINE_CONFIG_START( dwarfd, dwarfd_state )
+static MACHINE_CONFIG_START( dwarfd )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
@@ -1107,11 +1107,11 @@ DRIVER_INIT_MEMBER(dwarfd_state,qc)
}
-/* YEAR NAME PARENT MACHINE INPUT INIT ORENTATION, COMPANY FULLNAME FLAGS */
-GAME( 1979, pokeresp, 0, pokeresp, dwarfd, dwarfd_state, dwarfd, 0, "Electro-Sport", "Poker (Electro-Sport)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dwarfd, 0, dwarfd, dwarfd, dwarfd_state, dwarfd, 0, "Electro-Sport", "Draw Poker III / Dwarfs Den (Dwarf Gfx)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, dwarfda, dwarfd, dwarfd, dwarfd, dwarfd_state, dwarfd, 0, "Electro-Sport", "Draw Poker III / Dwarfs Den (Card Gfx)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, quarterh, 0, dwarfd, quarterh, dwarfd_state, dwarfd, 0, "Electro-Sport", "Quarter Horse (set 1, Pioneer PR-8210)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1983, quarterha, quarterh, dwarfd, quarterh, dwarfd_state, dwarfd, 0, "Electro-Sport", "Quarter Horse (set 2, Pioneer PR-8210)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1983, quarterhb, quarterh, dwarfd, quarterh, dwarfd_state, dwarfd, 0, "Electro-Sport", "Quarter Horse (set 3, Pioneer LD-V2000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1995, qc, 0, qc, quarterh, dwarfd_state, qc, 0, "ArJay Exports/Prestige Games", "Quarter Horse Classic", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ORENTATION, COMPANY FULLNAME FLAGS
+GAME( 1979, pokeresp, 0, pokeresp, dwarfd, dwarfd_state, dwarfd, ROT0, "Electro-Sport", "Poker (Electro-Sport)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dwarfd, 0, dwarfd, dwarfd, dwarfd_state, dwarfd, ROT0, "Electro-Sport", "Draw Poker III / Dwarfs Den (Dwarf Gfx)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, dwarfda, dwarfd, dwarfd, dwarfd, dwarfd_state, dwarfd, ROT0, "Electro-Sport", "Draw Poker III / Dwarfs Den (Card Gfx)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, quarterh, 0, dwarfd, quarterh, dwarfd_state, dwarfd, ROT0, "Electro-Sport", "Quarter Horse (set 1, Pioneer PR-8210)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1983, quarterha, quarterh, dwarfd, quarterh, dwarfd_state, dwarfd, ROT0, "Electro-Sport", "Quarter Horse (set 2, Pioneer PR-8210)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1983, quarterhb, quarterh, dwarfd, quarterh, dwarfd_state, dwarfd, ROT0, "Electro-Sport", "Quarter Horse (set 3, Pioneer LD-V2000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1995, qc, 0, qc, quarterh, dwarfd_state, qc, ROT0, "ArJay Exports/Prestige Games", "Quarter Horse Classic", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp
index ed8becac6ca..9f4a665fec0 100644
--- a/src/mame/drivers/dynadice.cpp
+++ b/src/mame/drivers/dynadice.cpp
@@ -238,7 +238,7 @@ void dynadice_state::machine_reset()
m_ay_data = 0;
}
-static MACHINE_CONFIG_START( dynadice, dynadice_state )
+static MACHINE_CONFIG_START( dynadice )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080,18432000/8)
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index e625ba97367..d94fd2d0218 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -4381,7 +4381,7 @@ MACHINE_START_MEMBER(dynax_state,hnoridur)
Castle Of Dracula
***************************************************************************/
-static MACHINE_CONFIG_START( cdracula, dynax_state )
+static MACHINE_CONFIG_START( cdracula )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/4) /* 5.3693175MHz measured */
@@ -4411,7 +4411,7 @@ static MACHINE_CONFIG_START( cdracula, dynax_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz / 4, OKIM6295_PIN7_HIGH) /* 1MHz measured */
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz / 4, PIN7_HIGH) /* 1MHz measured */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -4420,7 +4420,7 @@ MACHINE_CONFIG_END
Hana no Mai
***************************************************************************/
-static MACHINE_CONFIG_START( hanamai, dynax_state )
+static MACHINE_CONFIG_START( hanamai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
@@ -4464,7 +4464,7 @@ static MACHINE_CONFIG_START( hanamai, dynax_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4474,7 +4474,7 @@ MACHINE_CONFIG_END
Hana Oriduru
***************************************************************************/
-static MACHINE_CONFIG_START( hnoridur, dynax_state )
+static MACHINE_CONFIG_START( hnoridur )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,XTAL_22MHz / 4) /* 5.5MHz */
@@ -4512,7 +4512,7 @@ static MACHINE_CONFIG_START( hnoridur, dynax_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4521,7 +4521,7 @@ MACHINE_CONFIG_END
Hana Jingi
***************************************************************************/
-static MACHINE_CONFIG_START( hjingi, dynax_state )
+static MACHINE_CONFIG_START( hjingi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_22MHz / 4)
@@ -4559,7 +4559,7 @@ static MACHINE_CONFIG_START( hjingi, dynax_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz )
MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -4568,7 +4568,7 @@ MACHINE_CONFIG_END
Sports Match
***************************************************************************/
-static MACHINE_CONFIG_START( sprtmtch, dynax_state )
+static MACHINE_CONFIG_START( sprtmtch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,22000000 / 4) /* 5.5MHz */
@@ -4613,7 +4613,7 @@ MACHINE_CONFIG_END
Mahjong Friday
***************************************************************************/
-static MACHINE_CONFIG_START( mjfriday, dynax_state )
+static MACHINE_CONFIG_START( mjfriday )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,24000000/4) /* 6 MHz? */
@@ -4747,7 +4747,7 @@ MACHINE_START_MEMBER(dynax_state,jantouki)
}
-static MACHINE_CONFIG_START( jantouki, dynax_state )
+static MACHINE_CONFIG_START( jantouki )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,22000000 / 4) /* 5.5MHz */
@@ -4803,7 +4803,7 @@ static MACHINE_CONFIG_START( jantouki, dynax_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(dynax_state, adpcm_int_cpu1)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* devices */
@@ -4947,7 +4947,7 @@ WRITE_LINE_MEMBER(dynax_state::tenkai_rtc_irq)
}
-static MACHINE_CONFIG_START( tenkai, dynax_state )
+static MACHINE_CONFIG_START( tenkai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",TMP91640, 21472700 / 2)
@@ -5018,7 +5018,7 @@ MACHINE_RESET_MEMBER(dynax_state,gekisha)
gekisha_set_rombank(0);
}
-static MACHINE_CONFIG_START( gekisha, dynax_state )
+static MACHINE_CONFIG_START( gekisha )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",TMP90841, XTAL_10MHz ) // ?
@@ -7475,51 +7475,51 @@ ROM_END
***************************************************************************/
-GAME( 1988, janyuki, 0, janyuki, janyuki, driver_device, 0, ROT0, "Dynax", "Jong Yu Ki (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, hnkochou, 0, hanamai, hnkochou, driver_device, 0, ROT180, "Dynax", "Hana Kochou (Japan, Bet)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hanamai, hnkochou, hanamai, hanamai, driver_device, 0, ROT180, "Dynax", "Hana no Mai (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hjingi, 0, hjingi, hjingi, driver_device, 0, ROT180, "Dynax", "Hana Jingi (Japan, Bet)", MACHINE_SUPPORTS_SAVE ) // 1990 05/01 11:58:24
-GAME( 1990, hjingia, hjingi, hjingi, hjingi, driver_device, 0, ROT180, "Dynax", "Hana Jingi (Japan, Bet, alt.)", MACHINE_SUPPORTS_SAVE ) // 1990 05/01 11:58:24
-GAME( 1989, hnoridur, hjingi, hnoridur, hnoridur, driver_device, 0, ROT180, "Dynax", "Hana Oriduru (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, drgpunch, 0, sprtmtch, drgpunch, driver_device, 0, ROT0, "Dynax", "Dragon Punch (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, sprtmtch, drgpunch, sprtmtch, sprtmtch, driver_device, 0, ROT0, "Dynax (Fabtek license)", "Sports Match", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, janyuki, 0, janyuki, janyuki, dynax_state, 0, ROT0, "Dynax", "Jong Yu Ki (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, hnkochou, 0, hanamai, hnkochou, dynax_state, 0, ROT180, "Dynax", "Hana Kochou (Japan, Bet)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hanamai, hnkochou, hanamai, hanamai, dynax_state, 0, ROT180, "Dynax", "Hana no Mai (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hjingi, 0, hjingi, hjingi, dynax_state, 0, ROT180, "Dynax", "Hana Jingi (Japan, Bet)", MACHINE_SUPPORTS_SAVE ) // 1990 05/01 11:58:24
+GAME( 1990, hjingia, hjingi, hjingi, hjingi, dynax_state, 0, ROT180, "Dynax", "Hana Jingi (Japan, Bet, alt.)", MACHINE_SUPPORTS_SAVE ) // 1990 05/01 11:58:24
+GAME( 1989, hnoridur, hjingi, hnoridur, hnoridur, dynax_state, 0, ROT180, "Dynax", "Hana Oriduru (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, drgpunch, 0, sprtmtch, drgpunch, dynax_state, 0, ROT0, "Dynax", "Dragon Punch (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, sprtmtch, drgpunch, sprtmtch, sprtmtch, dynax_state, 0, ROT0, "Dynax (Fabtek license)", "Sports Match", MACHINE_SUPPORTS_SAVE )
/* these 3 are Korean hacks / bootlegs of Dragon Punch / Sports Match */
-GAME( 1994, maya, 0, sprtmtch, drgpunch, dynax_state, maya, ROT0, "Promat", "Maya (set 1)", MACHINE_SUPPORTS_SAVE ) // this set has backgrounds blacked out in attract
-GAME( 1994, mayaa, maya, sprtmtch, drgpunch, dynax_state, maya, ROT0, "Promat", "Maya (set 2)", MACHINE_SUPPORTS_SAVE ) // this set has backgrounds blacked out in attract
-GAME( 1994, mayab, maya, sprtmtch, drgpunch, dynax_state, maya, ROT0, "Promat", "Maya (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mayac, maya, sprtmtch, drgpunch, dynax_state, mayac, ROT0, "Promat", "Maya (set 4, clean)", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, inca, 0, sprtmtch, drgpunch, dynax_state, maya, ROT0, "<unknown>", "Inca", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, blktouch, 0, sprtmtch, drgpunch, dynax_state, blktouch, ROT0, "Yang Gi Co Ltd.", "Black Touch (Korea)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, mjfriday, 0, mjfriday, mjfriday, driver_device, 0, ROT180, "Dynax", "Mahjong Friday (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, gekisha, 0, gekisha, gekisha, driver_device, 0, ROT180, "Dynax", "Mahjong Gekisha", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mcnpshnt, 0, mcnpshnt, mcnpshnt, driver_device, 0, ROT0, "Dynax", "Mahjong Campus Hunting (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, 7jigen, 0, nanajign, nanajign, driver_device, 0, ROT180, "Dynax", "7jigen no Youseitachi - Mahjong 7 Dimensions (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, jantouki, 0, jantouki, jantouki, driver_device, 0, ROT0, "Dynax", "Jong Tou Ki (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjdialq2, 0, mjdialq2, mjdialq2, driver_device, 0, ROT180, "Dynax", "Mahjong Dial Q2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjdialq2a,mjdialq2, mjdialq2, mjdialq2, driver_device, 0, ROT180, "Dynax", "Mahjong Dial Q2 (Japan, alt.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, yarunara, 0, yarunara, yarunara, driver_device, 0, ROT180, "Dynax", "Mahjong Yarunara (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjangels, 0, yarunara, yarunara, driver_device, 0, ROT180, "Dynax", "Mahjong Angels - Comic Theater Vol.2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, quiztvqq, 0, quiztvqq, quiztvqq, driver_device, 0, ROT180, "Dynax", "Quiz TV Gassyuukoku Q&Q (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, mjelctrn, 0, mjelctrn, mjelctrn, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong Electron Base (parts 2 & 4, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mjembase, mjelctrn, mjembase, mjembase, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong Electromagnetic Base", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mjelct3, mjelctrn, mjelctrn, mjelct3, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong Electron Base (parts 2 & 3, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mjelct3a, mjelctrn, mjelctrn, mjelct3, dynax_state, mjelct3a, ROT180, "Dynax", "Mahjong Electron Base (parts 2 & 3, alt., Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, mjelctrb, mjelctrn, mjelctrn, mjelct3, dynax_state, mjelct3, ROT180, "bootleg", "Mahjong Electron Base (parts 2 & 4, Japan, bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, majxtal7, 0, majxtal7, majxtal7, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong X-Tal 7 - Crystal Mahjong / Mahjong Diamond 7 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, neruton, 0, neruton, neruton, dynax_state, mjelct3, ROT180, "Dynax / Yukiyoshi Tokoro", "Mahjong Neruton Haikujiradan (Japan, Rev. B?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, nerutona, neruton, neruton, neruton, dynax_state, mjelct3, ROT180, "Dynax / Yukiyoshi Tokoro", "Mahjong Neruton Haikujiradan (Japan, Rev. A?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, hanayara, 0, yarunara, hanayara, driver_device, 0, ROT180, "Dynax", "Hana wo Yaraneba! (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjcomv1, 0, yarunara, yarunara, driver_device, 0, ROT180, "Dynax", "Mahjong Comic Gekijou Vol.1 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tenkai, 0, tenkai, tenkai, driver_device, 0, ROT0, "Dynax", "Mahjong Tenkaigen", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tenkai2b, tenkai, tenkai, tenkai, driver_device, 0, ROT0, "bootleg", "Mahjong Tenkaigen Part 2 (bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tenkaibb, tenkai, tenkai, tenkai, driver_device, 0, ROT0, "bootleg", "Mahjong Tenkaigen (bootleg b)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tenkaicb, tenkai, tenkai, tenkai, driver_device, 0, ROT0, "bootleg", "Mahjong Tenkaigen (bootleg c)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tenkaie, tenkai, tenkai, tenkai, driver_device, 0, ROT0, "Dynax", "Mahjong Tenkaigen (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ougonpai, 0, tenkai, tenkai, driver_device, 0, ROT0, "Dynax", "Mahjong Ougon No Pai", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ougonpaib,ougonpai, tenkai, tenkai, driver_device, 0, ROT0, "bootleg", "Mahjong Ougon No Pai (bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mjreach, 0, tenkai, mjreach, dynax_state, mjreach, ROT0, "bootleg / Dynax", "Mahjong Reach (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, cdracula, 0, cdracula, cdracula, driver_device, 0, ROT0, "Yun Sung (Escape license)","Castle Of Dracula", MACHINE_SUPPORTS_SAVE ) // not a dynax board
-GAME( 1995, shpeng, 0, sprtmtch, drgpunch, driver_device, 0, ROT0, "WSAC Systems?", "Sea Hunter Penguin", MACHINE_NO_COCKTAIL | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // not a dynax board. proms?
-GAME( 1995, intrgirl, 0, sprtmtch, drgpunch, driver_device, 0, ROT0, "Barko", "Intergirl", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // not a dynax board.
-GAME( 1996, majrjhdx, 0, majrjhdx, tenkai, driver_device, 0, ROT0, "Dynax", "Mahjong Raijinhai DX", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, maya, 0, sprtmtch, drgpunch, dynax_state, maya, ROT0, "Promat", "Maya (set 1)", MACHINE_SUPPORTS_SAVE ) // this set has backgrounds blacked out in attract
+GAME( 1994, mayaa, maya, sprtmtch, drgpunch, dynax_state, maya, ROT0, "Promat", "Maya (set 2)", MACHINE_SUPPORTS_SAVE ) // this set has backgrounds blacked out in attract
+GAME( 1994, mayab, maya, sprtmtch, drgpunch, dynax_state, maya, ROT0, "Promat", "Maya (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mayac, maya, sprtmtch, drgpunch, dynax_state, mayac, ROT0, "Promat", "Maya (set 4, clean)", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, inca, 0, sprtmtch, drgpunch, dynax_state, maya, ROT0, "<unknown>", "Inca", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, blktouch, 0, sprtmtch, drgpunch, dynax_state, blktouch, ROT0, "Yang Gi Co Ltd.", "Black Touch (Korea)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, mjfriday, 0, mjfriday, mjfriday, dynax_state, 0, ROT180, "Dynax", "Mahjong Friday (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gekisha, 0, gekisha, gekisha, dynax_state, 0, ROT180, "Dynax", "Mahjong Gekisha", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mcnpshnt, 0, mcnpshnt, mcnpshnt, dynax_state, 0, ROT0, "Dynax", "Mahjong Campus Hunting (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, 7jigen, 0, nanajign, nanajign, dynax_state, 0, ROT180, "Dynax", "7jigen no Youseitachi - Mahjong 7 Dimensions (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, jantouki, 0, jantouki, jantouki, dynax_state, 0, ROT0, "Dynax", "Jong Tou Ki (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjdialq2, 0, mjdialq2, mjdialq2, dynax_state, 0, ROT180, "Dynax", "Mahjong Dial Q2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjdialq2a,mjdialq2, mjdialq2, mjdialq2, dynax_state, 0, ROT180, "Dynax", "Mahjong Dial Q2 (Japan, alt.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, yarunara, 0, yarunara, yarunara, dynax_state, 0, ROT180, "Dynax", "Mahjong Yarunara (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjangels, 0, yarunara, yarunara, dynax_state, 0, ROT180, "Dynax", "Mahjong Angels - Comic Theater Vol.2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, quiztvqq, 0, quiztvqq, quiztvqq, dynax_state, 0, ROT180, "Dynax", "Quiz TV Gassyuukoku Q&Q (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, mjelctrn, 0, mjelctrn, mjelctrn, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong Electron Base (parts 2 & 4, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mjembase, mjelctrn, mjembase, mjembase, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong Electromagnetic Base", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mjelct3, mjelctrn, mjelctrn, mjelct3, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong Electron Base (parts 2 & 3, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mjelct3a, mjelctrn, mjelctrn, mjelct3, dynax_state, mjelct3a, ROT180, "Dynax", "Mahjong Electron Base (parts 2 & 3, alt., Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, mjelctrb, mjelctrn, mjelctrn, mjelct3, dynax_state, mjelct3, ROT180, "bootleg", "Mahjong Electron Base (parts 2 & 4, Japan, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, majxtal7, 0, majxtal7, majxtal7, dynax_state, mjelct3, ROT180, "Dynax", "Mahjong X-Tal 7 - Crystal Mahjong / Mahjong Diamond 7 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, neruton, 0, neruton, neruton, dynax_state, mjelct3, ROT180, "Dynax / Yukiyoshi Tokoro", "Mahjong Neruton Haikujiradan (Japan, Rev. B?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, nerutona, neruton, neruton, neruton, dynax_state, mjelct3, ROT180, "Dynax / Yukiyoshi Tokoro", "Mahjong Neruton Haikujiradan (Japan, Rev. A?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, hanayara, 0, yarunara, hanayara, dynax_state, 0, ROT180, "Dynax", "Hana wo Yaraneba! (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjcomv1, 0, yarunara, yarunara, dynax_state, 0, ROT180, "Dynax", "Mahjong Comic Gekijou Vol.1 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tenkai, 0, tenkai, tenkai, dynax_state, 0, ROT0, "Dynax", "Mahjong Tenkaigen", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tenkai2b, tenkai, tenkai, tenkai, dynax_state, 0, ROT0, "bootleg", "Mahjong Tenkaigen Part 2 (bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tenkaibb, tenkai, tenkai, tenkai, dynax_state, 0, ROT0, "bootleg", "Mahjong Tenkaigen (bootleg b)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tenkaicb, tenkai, tenkai, tenkai, dynax_state, 0, ROT0, "bootleg", "Mahjong Tenkaigen (bootleg c)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tenkaie, tenkai, tenkai, tenkai, dynax_state, 0, ROT0, "Dynax", "Mahjong Tenkaigen (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ougonpai, 0, tenkai, tenkai, dynax_state, 0, ROT0, "Dynax", "Mahjong Ougon No Pai", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ougonpaib,ougonpai, tenkai, tenkai, dynax_state, 0, ROT0, "bootleg", "Mahjong Ougon No Pai (bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mjreach, 0, tenkai, mjreach, dynax_state, mjreach, ROT0, "bootleg / Dynax", "Mahjong Reach (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, cdracula, 0, cdracula, cdracula, dynax_state, 0, ROT0, "Yun Sung (Escape license)","Castle Of Dracula", MACHINE_SUPPORTS_SAVE ) // not a dynax board
+GAME( 1995, shpeng, 0, sprtmtch, drgpunch, dynax_state, 0, ROT0, "WSAC Systems?", "Sea Hunter Penguin", MACHINE_NO_COCKTAIL | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // not a dynax board. proms?
+GAME( 1995, intrgirl, 0, sprtmtch, drgpunch, dynax_state, 0, ROT0, "Barko", "Intergirl", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // not a dynax board.
+GAME( 1996, majrjhdx, 0, majrjhdx, tenkai, dynax_state, 0, ROT0, "Dynax", "Mahjong Raijinhai DX", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp
index a96fa9ea05e..cd33836e22a 100644
--- a/src/mame/drivers/dynduke.cpp
+++ b/src/mame/drivers/dynduke.cpp
@@ -304,7 +304,7 @@ INTERRUPT_GEN_MEMBER(dynduke_state::interrupt)
/* Machine Driver */
-static MACHINE_CONFIG_START( dynduke, dynduke_state )
+static MACHINE_CONFIG_START( dynduke )
// basic machine hardware
MCFG_CPU_ADD("maincpu", V30, 16000000/2) // NEC V30-8 CPU
MCFG_CPU_PROGRAM_MAP(master_map)
@@ -347,7 +347,7 @@ static MACHINE_CONFIG_START( dynduke, dynduke_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -732,10 +732,10 @@ ROM_END
/* Game Drivers */
-GAME( 1989, dynduke, 0, dynduke, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Europe, 03SEP89)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dyndukea, dynduke, dynduke, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Europe, 25JUL89)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dyndukej, dynduke, dynduke, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Japan, 03SEP89)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dyndukeja, dynduke, dynduke, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Japan, 25JUL89)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dyndukeu, dynduke, dynduke, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu (Fabtek license)", "Dynamite Duke (US, 25JUL89)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dbldynj, 0, dbldyn, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu", "The Double Dynamites (Japan, 13NOV89)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dbldynu, dbldynj, dynduke, dynduke, driver_device, 0, ROT0, "Seibu Kaihatsu (Fabtek license)", "The Double Dynamites (US, 13NOV89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dynduke, 0, dynduke, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Europe, 03SEP89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dyndukea, dynduke, dynduke, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Europe, 25JUL89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dyndukej, dynduke, dynduke, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Japan, 03SEP89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dyndukeja, dynduke, dynduke, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu", "Dynamite Duke (Japan, 25JUL89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dyndukeu, dynduke, dynduke, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu (Fabtek license)", "Dynamite Duke (US, 25JUL89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dbldynj, 0, dbldyn, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu", "The Double Dynamites (Japan, 13NOV89)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dbldynu, dbldynj, dynduke, dynduke, dynduke_state, 0, ROT0, "Seibu Kaihatsu (Fabtek license)", "The Double Dynamites (US, 13NOV89)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index 877cfec73d6..0827f550ace 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -237,7 +237,7 @@ WRITE8_MEMBER( eacc_state::eacc_digit_w )
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( eacc, eacc_state )
+static MACHINE_CONFIG_START( eacc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_3_579545MHz) /* Divided by 4 inside the m6802*/
MCFG_CPU_PROGRAM_MAP(eacc_mem)
@@ -276,5 +276,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, eacc, 0, 0, eacc, eacc, driver_device, 0, "Electronics Australia", "EA Car Computer", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, eacc, 0, 0, eacc, eacc, eacc_state, 0, "Electronics Australia", "EA Car Computer", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/ec184x.cpp b/src/mame/drivers/ec184x.cpp
index 80752d170b2..4d5566965ed 100644
--- a/src/mame/drivers/ec184x.cpp
+++ b/src/mame/drivers/ec184x.cpp
@@ -208,7 +208,7 @@ ADDRESS_MAP_END
// XXX verify everything
-static MACHINE_CONFIG_START( ec1840, ec184x_state )
+static MACHINE_CONFIG_START( ec1840 )
MCFG_CPU_ADD("maincpu", I8088, 4096000)
MCFG_CPU_PROGRAM_MAP(ec1840_map)
MCFG_CPU_IO_MAP(ec1840_io)
@@ -231,7 +231,7 @@ static MACHINE_CONFIG_START( ec1840, ec184x_state )
MCFG_RAM_DEFAULT_SIZE("512K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ec1841, ec184x_state )
+static MACHINE_CONFIG_START( ec1841 )
MCFG_CPU_ADD("maincpu", I8086, 4096000)
MCFG_CPU_PROGRAM_MAP(ec1841_map)
MCFG_CPU_IO_MAP(ec1841_io)
@@ -258,7 +258,7 @@ static MACHINE_CONFIG_START( ec1841, ec184x_state )
MACHINE_CONFIG_END
// XXX verify everything
-static MACHINE_CONFIG_START( ec1847, ec184x_state )
+static MACHINE_CONFIG_START( ec1847 )
MCFG_CPU_ADD("maincpu", I8088, 4772720)
MCFG_CPU_PROGRAM_MAP(ec1847_map)
MCFG_CPU_IO_MAP(ec1847_io)
@@ -355,8 +355,8 @@ ROM_START( ec1847 )
ROM_LOAD( "317_d28_2732.bin", 0x00000, 0x1000, CRC(8939599b) SHA1(53d02460cf93596882a96758ef4bac5fa1ce55b2)) // monochrome font
ROM_END
-/* YEAR ROM NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1987, ec1840, ibm5150, 0, ec1840, 0, driver_device, 0, "<unknown>", "EC-1840", MACHINE_NOT_WORKING)
-COMP ( 1987, ec1841, ibm5150, 0, ec1841, 0, ec184x_state, ec1841, "<unknown>", "EC-1841", 0)
-COMP ( 1989, ec1845, ibm5150, 0, ec1841, 0, ec184x_state, ec1841, "<unknown>", "EC-1845", MACHINE_NOT_WORKING)
-COMP ( 1990, ec1847, ibm5150, 0, ec1847, 0, driver_device, 0, "<unknown>", "EC-1847", MACHINE_NOT_WORKING)
+// YEAR ROM NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1987, ec1840, ibm5150, 0, ec1840, 0, ec184x_state, 0, "<unknown>", "EC-1840", MACHINE_NOT_WORKING )
+COMP ( 1987, ec1841, ibm5150, 0, ec1841, 0, ec184x_state, ec1841, "<unknown>", "EC-1841", 0 )
+COMP ( 1989, ec1845, ibm5150, 0, ec1841, 0, ec184x_state, ec1841, "<unknown>", "EC-1845", MACHINE_NOT_WORKING )
+COMP ( 1990, ec1847, ibm5150, 0, ec1847, 0, ec184x_state, 0, "<unknown>", "EC-1847", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index c38efea6062..49d04fa7788 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -41,7 +41,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
MC6845_UPDATE_ROW(crtc_update_row);
private:
@@ -90,18 +90,18 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( ec65 )
INPUT_PORTS_END
-WRITE8_MEMBER( ec65_state::kbd_put )
+void ec65_state::kbd_put(u8 data)
{
if (data)
{
- m_via_0->write_pa0((data>>0)&1);
- m_via_0->write_pa1((data>>1)&1);
- m_via_0->write_pa2((data>>2)&1);
- m_via_0->write_pa3((data>>3)&1);
- m_via_0->write_pa4((data>>4)&1);
- m_via_0->write_pa5((data>>5)&1);
- m_via_0->write_pa6((data>>6)&1);
- m_via_0->write_pa7((data>>7)&1);
+ m_via_0->write_pa0(BIT(data, 0));
+ m_via_0->write_pa1(BIT(data, 1));
+ m_via_0->write_pa2(BIT(data, 2));
+ m_via_0->write_pa3(BIT(data, 3));
+ m_via_0->write_pa4(BIT(data, 4));
+ m_via_0->write_pa5(BIT(data, 5));
+ m_via_0->write_pa6(BIT(data, 6));
+ m_via_0->write_pa7(BIT(data, 7));
m_via_0->write_ca1(1);
m_via_0->write_ca1(0);
}
@@ -165,7 +165,7 @@ static GFXDECODE_START( ec65 )
GFXDECODE_ENTRY( "chargen", 0x0000, ec65_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( ec65, ec65_state )
+static MACHINE_CONFIG_START( ec65 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6502, XTAL_4MHz / 4)
@@ -200,10 +200,10 @@ static MACHINE_CONFIG_START( ec65, ec65_state )
MCFG_MOS6551_XTAL(XTAL_1_8432MHz)
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(ec65_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(ec65_state, kbd_put))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ec65k, ec65k_state )
+static MACHINE_CONFIG_START( ec65k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",G65816, XTAL_4MHz) // can use 4,2 or 1 MHz
@@ -243,6 +243,6 @@ ROM_START( ec65k )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, ec65, 0, 0, ec65, ec65, driver_device, 0, "Elektor Electronics", "EC-65", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1985, ec65k, ec65, 0, ec65k, ec65, driver_device, 0, "Elektor Electronics", "EC-65K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, ec65, 0, 0, ec65, ec65, ec65_state, 0, "Elektor Electronics", "EC-65", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1985, ec65k, ec65, 0, ec65k, ec65, ec65k_state, 0, "Elektor Electronics", "EC-65K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/ecoinf1.cpp b/src/mame/drivers/ecoinf1.cpp
index a4ba2c64e56..d390eba3df1 100644
--- a/src/mame/drivers/ecoinf1.cpp
+++ b/src/mame/drivers/ecoinf1.cpp
@@ -248,7 +248,7 @@ static INPUT_PORTS_START( ecoinf1 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ecoinf1_older, ecoinf1_state )
+static MACHINE_CONFIG_START( ecoinf1_older )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000)
MCFG_CPU_PROGRAM_MAP(older_memmap)
@@ -360,12 +360,12 @@ DRIVER_INIT_MEMBER(ecoinf1_state,ecoinf1)
// all roms might really be for the same game, just in different cabinet styles
// these ALL contain "Ver 3 BAR-X V1:84 TYPE T" strings
-GAME( 19??, ec_barxo, 0 , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 1)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 19??, ec_barxoa, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 2)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 19??, ec_barxob, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 3)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 19??, ec_barxoc, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 4)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 19??, ec_barxod, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 5)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 19??, ec_barxoe, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 6)" , MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 19??, ec_bar5, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar 5 (older PCB) (Electrocoin)" , MACHINE_IS_SKELETON_MECHANICAL) // or just another Bar X set?
-GAME( 19??, ec_casbxo, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Casino Bar X (older PCB) (Electrocoin) (set 1)" , MACHINE_IS_SKELETON_MECHANICAL) // this one actually has some code offset changes
-GAME( 19??, ec_casbxoa,ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Casino Bar X (older PCB) (Electrocoin) (set 2)" , MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_barxo, 0 , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_barxoa, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_barxob, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_barxoc, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_barxod, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_barxoe, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 19??, ec_bar5, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Bar 5 (older PCB) (Electrocoin)", MACHINE_IS_SKELETON_MECHANICAL) // or just another Bar X set?
+GAME( 19??, ec_casbxo, ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Casino Bar X (older PCB) (Electrocoin) (set 1)", MACHINE_IS_SKELETON_MECHANICAL) // this one actually has some code offset changes
+GAME( 19??, ec_casbxoa,ec_barxo , ecoinf1_older, ecoinf1, ecoinf1_state, ecoinf1, ROT0, "Electrocoin", "Casino Bar X (older PCB) (Electrocoin) (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp
index c165b87b42c..dcfcd6c3fe7 100644
--- a/src/mame/drivers/ecoinf2.cpp
+++ b/src/mame/drivers/ecoinf2.cpp
@@ -62,7 +62,7 @@ public:
DECLARE_WRITE8_MEMBER(ox_port5c_out_w);
DECLARE_DRIVER_INIT(ecoinf2);
- void update_lamps(void)
+ void update_lamps()
{
for (int i=0; i<16; i++)
{
@@ -500,7 +500,7 @@ static INPUT_PORTS_START( ecoinf2 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ecoinf2_oxo, ecoinf2_state )
+static MACHINE_CONFIG_START( ecoinf2_oxo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180,4000000) // some of these hit invalid opcodes with a plain z80, some don't?
MCFG_CPU_PROGRAM_MAP(oxo_memmap)
@@ -790,13 +790,13 @@ DRIVER_INIT_MEMBER(ecoinf2_state,ecoinf2)
}
// OXO wh type (Phoenix?) (watchdog on port 5c?)
-GAME( 19??, ec_oxocg, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Classic Gold (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_oxocl, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Club (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_oxogb, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Golden Bars (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_oxorl, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Reels (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_oxorv, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Revolution (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_suprl, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Super Reels (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_rcc, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Royal Casino Club (Electrocoin) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-
-GAME( 19??, ec_sumnd, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Concept Games Ltd", "Super Multi Nudger (Concept / Electrocoin Oxo) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_sumnc, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Concept Games Ltd", "Casino Super Multi Nudger (Concept / Electrocoin Oxo) (?)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_oxocg, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Classic Gold (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_oxocl, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Club (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_oxogb, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Golden Bars (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_oxorl, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Reels (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_oxorv, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Oxo Revolution (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_suprl, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Super Reels (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_rcc, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Electrocoin", "Royal Casino Club (Electrocoin) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+
+GAME( 19??, ec_sumnd, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Concept Games Ltd", "Super Multi Nudger (Concept / Electrocoin Oxo) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_sumnc, 0 , ecoinf2_oxo, ecoinf2, ecoinf2_state, ecoinf2, ROT0, "Concept Games Ltd", "Casino Super Multi Nudger (Concept / Electrocoin Oxo) (?)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp
index 3cb5a6b844c..65de23155e8 100644
--- a/src/mame/drivers/ecoinf3.cpp
+++ b/src/mame/drivers/ecoinf3.cpp
@@ -660,7 +660,7 @@ static INPUT_PORTS_START( ecoinf3 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ecoinf3_pyramid, ecoinf3_state )
+static MACHINE_CONFIG_START( ecoinf3_pyramid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180,8000000) // certainly not a plain z80 at least, invalid opcodes for that
@@ -853,15 +853,15 @@ DRIVER_INIT_MEMBER(ecoinf3_state,ecoinf3_swap)
// another hw type (similar to stuff in ecoinf2.c) (watchdog on port 58?)
-GAME( 19??, ec_pyram, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3_swap, ROT0, "Electrocoin", "Pyramid (v1) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_pyrama, ec_pyram , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pyramid (v6) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_sphin, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3_swap, ROT0, "Electrocoin", "Sphinx (v2) (Electrocoin) (set 1)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_sphina, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v2) (Electrocoin) (set 2)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_sphinb, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v1) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_penni, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v1) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_pennia, ec_penni , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v6) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_stair, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (v11) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_staira, ec_stair , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (v1) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_laby, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v8) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_labya, ec_laby , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v10) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
-GAME( 19??, ec_secrt, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Secret Castle (v1) (Electrocoin)" , MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_pyram, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3_swap, ROT0, "Electrocoin", "Pyramid (v1) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_pyrama, ec_pyram , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pyramid (v6) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_sphin, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3_swap, ROT0, "Electrocoin", "Sphinx (v2) (Electrocoin) (set 1)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_sphina, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v2) (Electrocoin) (set 2)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_sphinb, ec_sphin , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Sphinx (v1) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_penni, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v1) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_pennia, ec_penni , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Pennies From Heaven (v6) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_stair, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (v11) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_staira, ec_stair , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Stairway To Heaven (v1) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_laby, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v8) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_labya, ec_laby , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Labyrinth (v10) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
+GAME( 19??, ec_secrt, 0 , ecoinf3_pyramid, ecoinf3, ecoinf3_state, ecoinf3, ROT0, "Electrocoin", "Secret Castle (v1) (Electrocoin)", MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING|MACHINE_MECHANICAL)
diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp
index 20e06a39e78..a7317a3160b 100644
--- a/src/mame/drivers/ecoinfr.cpp
+++ b/src/mame/drivers/ecoinfr.cpp
@@ -769,7 +769,7 @@ void ecoinfr_state::machine_reset()
}
-static MACHINE_CONFIG_START( ecoinfr, ecoinfr_state )
+static MACHINE_CONFIG_START( ecoinfr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000)
MCFG_CPU_PROGRAM_MAP(memmap)
@@ -1683,24 +1683,24 @@ DRIVER_INIT_MEMBER(ecoinfr_state,ecoinfrbr)
}
// 3rd party sets with MAB scrambling, game names might be incorrect, should be the same basic hardware as these tho.
-GAME( 19??, ec_barxmab, ec_barx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Electrocoin", "Bar X (MAB PCB) (Electrocoin)" , GAME_FLAGS) // scrambled roms
-GAME( 19??, ec_spbg7mab,ec_big7 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Electrocoin", "Super Big 7 (MAB PCB) (Electrocoin) (?)" , GAME_FLAGS)
-GAME( 19??, ec_supbxmab,ec_sbarx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Electrocoin", "Super Bar X (MAB PCB) (Electrocoin) (?)" , GAME_FLAGS)
+GAME( 19??, ec_barxmab, ec_barx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Electrocoin", "Bar X (MAB PCB) (Electrocoin)", GAME_FLAGS ) // scrambled roms
+GAME( 19??, ec_spbg7mab,ec_big7 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Electrocoin", "Super Big 7 (MAB PCB) (Electrocoin) (?)", GAME_FLAGS )
+GAME( 19??, ec_supbxmab,ec_sbarx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Electrocoin", "Super Bar X (MAB PCB) (Electrocoin) (?)", GAME_FLAGS )
//Games using the MAB scrambling, but identified as being from Concept Games
-GAME( 19??, ec_casbxcon,ec_casbx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Casino Bar X (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_multb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Multi Bar (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_supbxcon,ec_sbarx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Super Bar X (MAB PCB) (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_casmb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Casino Multi Bar (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_supmb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Super Multi Bar (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_stkex, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Stake X (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_bar7, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Bar 7 (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_fltr, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Flutter (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_rdht7, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Red Hot 7 (MAB PCB?) (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_unkt, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "unknown 'T' (MAB PCB?) (Concept Games Ltd) (?)" , GAME_FLAGS)
+GAME( 19??, ec_casbxcon,ec_casbx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Casino Bar X (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_multb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Multi Bar (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_supbxcon,ec_sbarx , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Super Bar X (MAB PCB) (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_casmb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Casino Multi Bar (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_supmb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Super Multi Bar (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_stkex, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Stake X (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_bar7, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Bar 7 (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_fltr, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Flutter (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_rdht7, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Red Hot 7 (MAB PCB?) (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_unkt, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "unknown 'T' (MAB PCB?) (Concept Games Ltd) (?)", GAME_FLAGS )
//These look more like some variant of Astra Gaming hardware than the MAB PCB, but I can't be sure. Certainly they don't seem to be on the base hardware
-GAME( 19??, ec_gold7, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Golden 7 (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_mgbel, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Megabell (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_jackb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Jackpot Bars (MAB PCB?) (Concept Games Ltd) (?)" , GAME_FLAGS)
-GAME( 19??, ec_ndgxs, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Nudge Xcess (MAB PCB?) (Concept Games Ltd) (?)" , GAME_FLAGS)
+GAME( 19??, ec_gold7, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Golden 7 (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_mgbel, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Megabell (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_jackb, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Jackpot Bars (MAB PCB?) (Concept Games Ltd) (?)", GAME_FLAGS )
+GAME( 19??, ec_ndgxs, 0 , ecoinfr, ecoinfr_barx, ecoinfr_state, ecoinfrmab, ROT0, "Concept Games Ltd", "Nudge Xcess (MAB PCB?) (Concept Games Ltd) (?)", GAME_FLAGS )
diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp
index 56848cd393c..6988f9b9c95 100644
--- a/src/mame/drivers/egghunt.cpp
+++ b/src/mame/drivers/egghunt.cpp
@@ -417,7 +417,7 @@ void egghunt_state::machine_reset()
m_vidram_bank = 0;
}
-static MACHINE_CONFIG_START( egghunt, egghunt_state )
+static MACHINE_CONFIG_START( egghunt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz ?*/
@@ -448,7 +448,7 @@ static MACHINE_CONFIG_START( egghunt, egghunt_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -475,4 +475,4 @@ ROM_START( egghunt )
ROM_LOAD( "rom1.bin", 0x00000, 0x80000, CRC(f03589bc) SHA1(4d9c8422ac3c4c3ecba3bcf0ed47b8c7d5903f8c) )
ROM_END
-GAME( 1995, egghunt, 0, egghunt, egghunt, driver_device, 0, ROT0, "Invi Image", "Egg Hunt", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, egghunt, 0, egghunt, egghunt, egghunt_state, 0, ROT0, "Invi Image", "Egg Hunt", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index 60f1648454c..ef45136d2cb 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -108,14 +108,14 @@ MC6845_UPDATE_ROW( einstein_state::crtc_update_row )
char_code = m_crtc_ram[(ma + i) & 0x07ff];
data_byte = data[(char_code << 3) + (ra & 0x07) + ((ra & 0x08) << 8)];
- bitmap.pix32(y, x + 0) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 7)];
- bitmap.pix32(y, x + 1) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 6)];
- bitmap.pix32(y, x + 2) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 5)];
- bitmap.pix32(y, x + 3) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 4)];
- bitmap.pix32(y, x + 4) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 3)];
- bitmap.pix32(y, x + 5) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 2)];
- bitmap.pix32(y, x + 6) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 1)];
- bitmap.pix32(y, x + 7) = palette[TMS9928A_PALETTE_SIZE + BIT(data_byte, 0)];
+ bitmap.pix32(y, x + 0) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 7)];
+ bitmap.pix32(y, x + 1) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 6)];
+ bitmap.pix32(y, x + 2) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 5)];
+ bitmap.pix32(y, x + 3) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 4)];
+ bitmap.pix32(y, x + 4) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 3)];
+ bitmap.pix32(y, x + 5) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 2)];
+ bitmap.pix32(y, x + 6) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 1)];
+ bitmap.pix32(y, x + 7) = palette[tms9928a_device::PALETTE_SIZE + BIT(data_byte, 0)];
}
}
@@ -161,14 +161,14 @@ void einstein_state::einstein_scan_keyboard()
{
uint8_t data = 0xff;
- if (!BIT(m_keyboard_line, 0)) data &= m_line0->read();
- if (!BIT(m_keyboard_line, 1)) data &= m_line1->read();
- if (!BIT(m_keyboard_line, 2)) data &= m_line2->read();
- if (!BIT(m_keyboard_line, 3)) data &= m_line3->read();
- if (!BIT(m_keyboard_line, 4)) data &= m_line4->read();
- if (!BIT(m_keyboard_line, 5)) data &= m_line5->read();
- if (!BIT(m_keyboard_line, 6)) data &= m_line6->read();
- if (!BIT(m_keyboard_line, 7)) data &= m_line7->read();
+ if (!BIT(m_keyboard_line, 0)) data &= m_line[0]->read();
+ if (!BIT(m_keyboard_line, 1)) data &= m_line[1]->read();
+ if (!BIT(m_keyboard_line, 2)) data &= m_line[2]->read();
+ if (!BIT(m_keyboard_line, 3)) data &= m_line[3]->read();
+ if (!BIT(m_keyboard_line, 4)) data &= m_line[4]->read();
+ if (!BIT(m_keyboard_line, 5)) data &= m_line[5]->read();
+ if (!BIT(m_keyboard_line, 6)) data &= m_line[6]->read();
+ if (!BIT(m_keyboard_line, 7)) data &= m_line[7]->read();
m_keyboard_data = data;
}
@@ -435,8 +435,8 @@ MACHINE_RESET_MEMBER(einstein_state,einstein2)
einstein_state::machine_reset();
/* 80 column card palette */
- m_palette->set_pen_color(TMS9928A_PALETTE_SIZE, rgb_t::black());
- m_palette->set_pen_color(TMS9928A_PALETTE_SIZE + 1, rgb_t(0, 224, 0));
+ m_palette->set_pen_color(tms9928a_device::PALETTE_SIZE, rgb_t::black());
+ m_palette->set_pen_color(tms9928a_device::PALETTE_SIZE + 1, rgb_t(0, 224, 0));
}
MACHINE_START_MEMBER(einstein_state,einstein2)
@@ -490,7 +490,7 @@ static ADDRESS_MAP_START( einstein_io, AS_IO, 8, einstein_state )
AM_RANGE(0x10, 0x10) AM_MIRROR(0xff06) AM_DEVREADWRITE(IC_I060, i8251_device, data_r, data_w)
AM_RANGE(0x11, 0x11) AM_MIRROR(0xff06) AM_DEVREADWRITE(IC_I060, i8251_device, status_r, control_w)
/* block 3, wd1770 floppy controller */
- AM_RANGE(0x18, 0x1b) AM_MIRROR(0xff04) AM_DEVREADWRITE(IC_I042, wd1770_t, read, write)
+ AM_RANGE(0x18, 0x1b) AM_MIRROR(0xff04) AM_DEVREADWRITE(IC_I042, wd1770_device, read, write)
/* block 4, internal controls */
AM_RANGE(0x20, 0x20) AM_MIRROR(0xff00) AM_READWRITE(einstein_kybintmsk_r, einstein_kybintmsk_w)
AM_RANGE(0x21, 0x21) AM_MIRROR(0xff00) AM_WRITE(einstein_adcintmsk_w)
@@ -685,7 +685,7 @@ static SLOT_INTERFACE_START( einstein_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( einstein, einstein_state )
+static MACHINE_CONFIG_START( einstein )
/* basic machine hardware */
MCFG_CPU_ADD(IC_I001, Z80, XTAL_X002 / 2)
MCFG_CPU_PROGRAM_MAP(einstein_mem)
@@ -776,7 +776,7 @@ static MACHINE_CONFIG_DERIVED( einstei2, einstein )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", einstei2)
/* 2 additional colors for the 80 column screen */
- MCFG_PALETTE_ADD("palette", TMS9928A_PALETTE_SIZE + 2)
+ MCFG_PALETTE_ADD("palette", tms9928a_device::PALETTE_SIZE + 2)
MCFG_MC6845_ADD("crtc", MC6845, "80column", XTAL_X002 / 4)
MCFG_MC6845_SHOW_BORDER_AREA(false)
@@ -832,7 +832,7 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, einstein, 0, 0, einstein, einstein, driver_device, 0, "Tatung", "Einstein TC-01", 0 )
-COMP( 1984, einstei2, einstein, 0, einstei2, einstein_80col, driver_device, 0, "Tatung", "Einstein TC-01 + 80 column device", 0 )
-COMP( 1984, einst256, 0, 0, einstein, einstein, driver_device, 0, "Tatung", "Einstein 256", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, einstein, 0, 0, einstein, einstein, einstein_state, 0, "Tatung", "Einstein TC-01", 0 )
+COMP( 1984, einstei2, einstein, 0, einstei2, einstein_80col, einstein_state, 0, "Tatung", "Einstein TC-01 + 80 column device", 0 )
+COMP( 1984, einst256, 0, 0, einstein, einstein, einstein_state, 0, "Tatung", "Einstein 256", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/electra.cpp b/src/mame/drivers/electra.cpp
index 7ef23853bec..5ee0471face 100644
--- a/src/mame/drivers/electra.cpp
+++ b/src/mame/drivers/electra.cpp
@@ -51,7 +51,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -94,7 +94,7 @@ void electra_state::video_start()
{
}
-static MACHINE_CONFIG_START( electra, electra_state )
+static MACHINE_CONFIG_START( electra )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -128,4 +128,4 @@ ROM_START( avenger )
ROM_END
-GAME( 1975, avenger, 0, electra, 0, driver_device, 0, ROT0, "Electra", "Avenger [TTL]", MACHINE_IS_SKELETON )
+GAME( 1975, avenger, 0, electra, 0, electra_state, 0, ROT0, "Electra", "Avenger [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index d2e90142081..52226514a12 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -202,7 +202,7 @@ static INPUT_PORTS_START( electron )
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("BREAK") PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_CHANGED_MEMBER(DEVICE_SELF, electron_state, trigger_reset, 0)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( electron, electron_state )
+static MACHINE_CONFIG_START( electron )
MCFG_CPU_ADD( "maincpu", M6502, XTAL_16MHz/8 )
MCFG_CPU_PROGRAM_MAP( electron_mem )
@@ -284,6 +284,6 @@ ROM_END
#define rom_btm2105 rom_electron
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP ( 1983, electron, 0, 0, electron, electron, driver_device, 0, "Acorn", "Acorn Electron", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-COMP ( 1985, btm2105, electron, 0, btm2105, electron, driver_device, 0, "British Telecom Business Systems", "BT Merlin M2105", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP ( 1983, electron, 0, 0, electron, electron, electron_state, 0, "Acorn", "Acorn Electron", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+COMP ( 1985, btm2105, electron, 0, btm2105, electron, electron_state, 0, "British Telecom Business Systems", "BT Merlin M2105", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp
index 9fa5088b8ae..bf5b9882a55 100644
--- a/src/mame/drivers/elekscmp.cpp
+++ b/src/mame/drivers/elekscmp.cpp
@@ -141,7 +141,7 @@ static INPUT_PORTS_START( elekscmp )
PORT_BIT(0xfe, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( elekscmp, elekscmp_state )
+static MACHINE_CONFIG_START( elekscmp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",INS8060, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(elekscmp_mem)
@@ -161,5 +161,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, elekscmp, 0, 0, elekscmp, elekscmp, driver_device, 0, "Elektor Electronics", "Elektor SC/MP", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1977, elekscmp, 0, 0, elekscmp, elekscmp, elekscmp_state, 0, "Elektor Electronics", "Elektor SC/MP", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index c953f21a327..40979ef6ef1 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -230,7 +230,7 @@ QUICKLOAD_LOAD_MEMBER( elf2_state, elf )
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( elf2, elf2_state )
+static MACHINE_CONFIG_START( elf2 )
/* basic machine hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2)
MCFG_CPU_PROGRAM_MAP(elf2_mem)
@@ -285,5 +285,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, elf2, 0, 0, elf2, elf2, driver_device, 0, "Netronics", "Elf II", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, elf2, 0, 0, elf2, elf2, elf2_state, 0, "Netronics", "Elf II", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index f04362745ff..57eb89e1666 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -554,7 +554,7 @@ static GFXDECODE_START( elwro800 )
GFXDECODE_END
-static MACHINE_CONFIG_START( elwro800, elwro800_state )
+static MACHINE_CONFIG_START( elwro800 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, 3500000) /* 3.5 MHz */
@@ -648,5 +648,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, elwro800, 0, 0, elwro800, elwro800, driver_device, 0, "Elwro", "800 Junior", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, elwro800, 0, 0, elwro800, elwro800, elwro800_state, 0, "Elwro", "800 Junior", 0 )
diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp
index c783102994c..7252d429181 100644
--- a/src/mame/drivers/embargo.cpp
+++ b/src/mame/drivers/embargo.cpp
@@ -254,7 +254,7 @@ void embargo_state::machine_reset()
*
*************************************/
-static MACHINE_CONFIG_START( embargo, embargo_state )
+static MACHINE_CONFIG_START( embargo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 625000)
@@ -299,4 +299,4 @@ ROM_END
*
*************************************/
-GAME( 1977, embargo, 0, embargo, embargo, driver_device, 0, ROT0, "Cinematronics", "Embargo", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1977, embargo, 0, embargo, embargo, embargo_state, 0, ROT0, "Cinematronics", "Embargo", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp
index 0e9ea57593e..7d979fed997 100644
--- a/src/mame/drivers/enigma2.cpp
+++ b/src/mame/drivers/enigma2.cpp
@@ -589,7 +589,7 @@ static INPUT_PORTS_START( enigma2a )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( enigma2, enigma2_state )
+static MACHINE_CONFIG_START( enigma2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -617,7 +617,7 @@ static MACHINE_CONFIG_START( enigma2, enigma2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( enigma2a, enigma2_state )
+static MACHINE_CONFIG_START( enigma2a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK)
@@ -706,6 +706,6 @@ DRIVER_INIT_MEMBER(enigma2_state,enigma2)
-GAME( 1981, enigma2, 0, enigma2, enigma2, enigma2_state, enigma2, ROT270, "Game Plan (Zilec Electronics license)", "Enigma II", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, enigma2a, enigma2, enigma2a, enigma2a, enigma2_state, enigma2, ROT270, "Zilec Electronics", "Enigma II (Space Invaders hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, enigma2b, enigma2, enigma2a, enigma2a, enigma2_state, enigma2, ROT270, "Zilec Electronics", "Phantoms II (Space Invaders hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, enigma2, 0, enigma2, enigma2, enigma2_state, enigma2, ROT270, "Game Plan (Zilec Electronics license)", "Enigma II", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, enigma2a, enigma2, enigma2a, enigma2a, enigma2_state, enigma2, ROT270, "Zilec Electronics", "Enigma II (Space Invaders hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, enigma2b, enigma2, enigma2a, enigma2a, enigma2_state, enigma2, ROT270, "Zilec Electronics", "Phantoms II (Space Invaders hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index 01a4ca30f77..7f5d00f250b 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -54,10 +54,10 @@
#include "mirage.lh"
-class mirage_state : public driver_device
+class enmirage_state : public driver_device
{
public:
- mirage_state(const machine_config &mconfig, device_type type, const char *tag)
+ enmirage_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_fdc(*this, "wd1772"),
@@ -65,29 +65,30 @@ public:
{
}
- required_device<m6809e_device> m_maincpu;
- required_device<wd1772_t> m_fdc;
- required_device<via6522_device> m_via;
-
- virtual void machine_reset() override;
-
- int last_sndram_bank;
-
DECLARE_FLOPPY_FORMATS( floppy_formats );
DECLARE_DRIVER_INIT(mirage);
- virtual void video_start() override;
uint32_t screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE8_MEMBER(mirage_via_write_porta);
DECLARE_WRITE8_MEMBER(mirage_via_write_portb);
DECLARE_WRITE_LINE_MEMBER(mirage_doc_irq);
DECLARE_READ8_MEMBER(mirage_adc_read);
+protected:
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
+ required_device<m6809e_device> m_maincpu;
+ required_device<wd1772_device> m_fdc;
+ required_device<via6522_device> m_via;
+
+ int last_sndram_bank;
+
uint8_t m_l_segs, m_r_segs;
int m_l_hi, m_r_hi;
};
-FLOPPY_FORMATS_MEMBER( mirage_state::floppy_formats )
+FLOPPY_FORMATS_MEMBER( enmirage_state::floppy_formats )
FLOPPY_ESQ8IMG_FORMAT
FLOPPY_FORMATS_END
@@ -95,32 +96,32 @@ static SLOT_INTERFACE_START( ensoniq_floppies )
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )
SLOT_INTERFACE_END
-WRITE_LINE_MEMBER(mirage_state::mirage_doc_irq)
+WRITE_LINE_MEMBER(enmirage_state::mirage_doc_irq)
{
// m_maincpu->set_input_line(M6809_IRQ_LINE, state);
}
-READ8_MEMBER(mirage_state::mirage_adc_read)
+READ8_MEMBER(enmirage_state::mirage_adc_read)
{
return 0x00;
}
-void mirage_state::video_start()
+void enmirage_state::video_start()
{
}
-uint32_t mirage_state::screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t enmirage_state::screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
return 0;
}
-void mirage_state::machine_reset()
+void enmirage_state::machine_reset()
{
last_sndram_bank = 0;
membank("sndbank")->set_base(memregion("es5503")->base() );
}
-static ADDRESS_MAP_START( mirage_map, AS_PROGRAM, 8, mirage_state )
+static ADDRESS_MAP_START( mirage_map, AS_PROGRAM, 8, enmirage_state )
AM_RANGE(0x0000, 0x7fff) AM_RAMBANK("sndbank") // 32k window on 128k of wave RAM
AM_RANGE(0x8000, 0xbfff) AM_RAM // main RAM
AM_RANGE(0xc000, 0xdfff) AM_RAM // expansion RAM
@@ -128,7 +129,7 @@ static ADDRESS_MAP_START( mirage_map, AS_PROGRAM, 8, mirage_state )
AM_RANGE(0xe101, 0xe101) AM_DEVREADWRITE("acia6850", acia6850_device, data_r, data_w)
AM_RANGE(0xe200, 0xe2ff) AM_DEVREADWRITE("via6522", via6522_device, read, write)
AM_RANGE(0xe400, 0xe4ff) AM_NOP
- AM_RANGE(0xe800, 0xe803) AM_DEVREADWRITE("wd1772", wd1772_t, read, write)
+ AM_RANGE(0xe800, 0xe803) AM_DEVREADWRITE("wd1772", wd1772_device, read, write)
AM_RANGE(0xec00, 0xecef) AM_DEVREADWRITE("es5503", es5503_device, read, write)
AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION("osrom", 0)
ADDRESS_MAP_END
@@ -137,7 +138,7 @@ ADDRESS_MAP_END
// bits 0-2: column select from 0-7
// bits 3/4 = right and left LED enable
// bits 5/6/7 keypad rows 0/1/2 return
-WRITE8_MEMBER(mirage_state::mirage_via_write_porta)
+WRITE8_MEMBER(enmirage_state::mirage_via_write_porta)
{
uint8_t seg = data & 7;
static const int segconv[8] =
@@ -193,7 +194,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_porta)
// bit 1: OUT upper/lower bank (64k halves)
// bit 0: OUT bank 0/bank 1 (32k halves)
-WRITE8_MEMBER(mirage_state::mirage_via_write_portb)
+WRITE8_MEMBER(enmirage_state::mirage_via_write_portb)
{
int bank = 0;
@@ -207,7 +208,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_portb)
}
}
-static MACHINE_CONFIG_START( mirage, mirage_state )
+static MACHINE_CONFIG_START( mirage )
MCFG_CPU_ADD("maincpu", M6809E, 4000000)
MCFG_CPU_PROGRAM_MAP(mirage_map)
@@ -216,15 +217,15 @@ static MACHINE_CONFIG_START( mirage, mirage_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_ES5503_ADD("es5503", 7000000)
MCFG_ES5503_OUTPUT_CHANNELS(2)
- MCFG_ES5503_IRQ_FUNC(WRITELINE(mirage_state, mirage_doc_irq))
- MCFG_ES5503_ADC_FUNC(READ8(mirage_state, mirage_adc_read))
+ MCFG_ES5503_IRQ_FUNC(WRITELINE(enmirage_state, mirage_doc_irq))
+ MCFG_ES5503_ADC_FUNC(READ8(enmirage_state, mirage_adc_read))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MCFG_DEVICE_ADD("via6522", VIA6522, 1000000)
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mirage_state, mirage_via_write_porta))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mirage_state, mirage_via_write_portb))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(enmirage_state, mirage_via_write_porta))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(enmirage_state, mirage_via_write_portb))
MCFG_VIA6522_IRQ_HANDLER(INPUTLINE("maincpu", M6809_IRQ_LINE))
MCFG_DEVICE_ADD("acia6850", ACIA6850, 0)
@@ -234,7 +235,7 @@ static MACHINE_CONFIG_START( mirage, mirage_state )
MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE))
- MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", mirage_state::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", enmirage_state::floppy_formats)
MACHINE_CONFIG_END
static INPUT_PORTS_START( mirage )
@@ -247,7 +248,7 @@ ROM_START( enmirage )
ROM_REGION(0x20000, "es5503", ROMREGION_ERASE)
ROM_END
-DRIVER_INIT_MEMBER(mirage_state,mirage)
+DRIVER_INIT_MEMBER(enmirage_state,mirage)
{
floppy_connector *con = machine().device<floppy_connector>("wd1772:0");
floppy_image_device *floppy = con ? con->get_device() : nullptr;
@@ -284,4 +285,4 @@ DRIVER_INIT_MEMBER(mirage_state,mirage)
m_via->write_pb7(0);
}
-CONS( 1984, enmirage, 0, 0, mirage, mirage, mirage_state, mirage, "Ensoniq", "Ensoniq Mirage", MACHINE_NOT_WORKING )
+CONS( 1984, enmirage, 0, 0, mirage, mirage, enmirage_state, mirage, "Ensoniq", "Ensoniq Mirage", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index 7aeb33a8f28..fd2bb7e2cf2 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -544,7 +544,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( eolith45, eolith_state )
+static MACHINE_CONFIG_START( eolith45 )
MCFG_CPU_ADD("maincpu", E132N, 45000000) /* 45 MHz */
MCFG_CPU_PROGRAM_MAP(eolith_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith_state, eolith_speedup, "screen", 0, 1)
diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp
index d2f8d273ad0..4934516b59e 100644
--- a/src/mame/drivers/eolith16.cpp
+++ b/src/mame/drivers/eolith16.cpp
@@ -172,7 +172,7 @@ PALETTE_INIT_MEMBER(eolith16_state,eolith16)
-static MACHINE_CONFIG_START( eolith16, eolith16_state )
+static MACHINE_CONFIG_START( eolith16 )
MCFG_CPU_ADD("maincpu", E116T, 60000000) /* no internal multiplier */
MCFG_CPU_PROGRAM_MAP(eolith16_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", eolith16_state, eolith_speedup, "screen", 0, 1)
@@ -195,7 +195,7 @@ static MACHINE_CONFIG_START( eolith16, eolith16_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index 9f26f2642eb..ed23248dc19 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -556,7 +556,7 @@ void ep64_state::machine_reset()
// MACHINE_CONFIG( ep64 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ep64, ep64_state )
+static MACHINE_CONFIG_START( ep64 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(ep64_mem)
@@ -653,7 +653,7 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1985, ep64, 0, 0, ep64, ep64, driver_device, 0, "Enterprise Computers", "Enterprise Sixty Four", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-COMP( 1985, phc64, ep64, 0, ep64, ep64, driver_device, 0, "Hegener & Glaser", "Mephisto PHC 64 (Germany)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-COMP( 1986, ep128, ep64, 0, ep128, ep64, driver_device, 0, "Enterprise Computers", "Enterprise One Two Eight", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, ep64, 0, 0, ep64, ep64, ep64_state, 0, "Enterprise Computers", "Enterprise Sixty Four", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+COMP( 1985, phc64, ep64, 0, ep64, ep64, ep64_state, 0, "Hegener & Glaser", "Mephisto PHC 64 (Germany)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+COMP( 1986, ep128, ep64, 0, ep128, ep64, ep64_state, 0, "Enterprise Computers", "Enterprise One Two Eight", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp
index 66022e99f0a..4a9937e9d8e 100644
--- a/src/mame/drivers/epos.cpp
+++ b/src/mame/drivers/epos.cpp
@@ -436,7 +436,7 @@ MACHINE_START_MEMBER(epos_state,dealer)
MACHINE_START_CALL_MEMBER(epos);
}
-static MACHINE_CONFIG_START( epos, epos_state ) /* EPOS TRISTAR 8000 PCB */
+static MACHINE_CONFIG_START( epos ) /* EPOS TRISTAR 8000 PCB */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_11MHz/4) /* 2.75 MHz schematics confirm 11MHz XTAL (see notes) */
@@ -464,7 +464,7 @@ static MACHINE_CONFIG_START( epos, epos_state ) /* EPOS TRISTAR 8000 PCB */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dealer, epos_state ) /* EPOS TRISTAR 9000 PCB */
+static MACHINE_CONFIG_START( dealer ) /* EPOS TRISTAR 9000 PCB */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_22_1184MHz/8) /* 2.7648 MHz (measured) */
@@ -764,16 +764,16 @@ DRIVER_INIT_MEMBER(epos_state,dealer)
*************************************/
/* EPOS TRISTAR 8000 PCB based */
-GAME( 1982, megadon, 0, epos, megadon, driver_device, 0, ROT270, "Epos Corporation (Photar Industries license)", "Megadon", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, catapult, 0, epos, catapult, driver_device, 0, ROT270, "Epos Corporation", "Catapult", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* bad rom, hold f2 for test mode */
-GAME( 1983, suprglob, 0, epos, suprglob, driver_device, 0, ROT270, "Epos Corporation", "Super Glob", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, theglob, suprglob, epos, suprglob, driver_device, 0, ROT270, "Epos Corporation", "The Glob", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, theglob2, suprglob, epos, suprglob, driver_device, 0, ROT270, "Epos Corporation", "The Glob (earlier)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, theglob3, suprglob, epos, suprglob, driver_device, 0, ROT270, "Epos Corporation", "The Glob (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, igmo, 0, epos, igmo, driver_device, 0, ROT270, "Epos Corporation", "IGMO", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, megadon, 0, epos, megadon, epos_state, 0, ROT270, "Epos Corporation (Photar Industries license)", "Megadon", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, catapult, 0, epos, catapult, epos_state, 0, ROT270, "Epos Corporation", "Catapult", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* bad rom, hold f2 for test mode */
+GAME( 1983, suprglob, 0, epos, suprglob, epos_state, 0, ROT270, "Epos Corporation", "Super Glob", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, theglob, suprglob, epos, suprglob, epos_state, 0, ROT270, "Epos Corporation", "The Glob", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, theglob2, suprglob, epos, suprglob, epos_state, 0, ROT270, "Epos Corporation", "The Glob (earlier)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, theglob3, suprglob, epos, suprglob, epos_state, 0, ROT270, "Epos Corporation", "The Glob (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, igmo, 0, epos, igmo, epos_state, 0, ROT270, "Epos Corporation", "IGMO", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
/* EPOS TRISTAR 9000 PCB based */
-GAME( 1984, dealer, 0, dealer, dealer, epos_state, dealer, ROT270, "Epos Corporation", "The Dealer", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dealer, 0, dealer, dealer, epos_state, dealer, ROT270, "Epos Corporation", "The Dealer", MACHINE_SUPPORTS_SAVE )
GAME( 1984, revngr84, 0, dealer, beastf, epos_state, dealer, ROT270, "Epos Corporation", "Revenger '84 (newer)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, revenger, revngr84, dealer, beastf, epos_state, dealer, ROT270, "Epos Corporation", "Revenger '84 (older)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, beastf, suprglob, dealer, beastf, epos_state, dealer, ROT270, "Epos Corporation", "Beastie Feastie", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, beastf, suprglob, dealer, beastf, epos_state, dealer, ROT270, "Epos Corporation", "Beastie Feastie", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp
index d0e7da98a55..9e647a6e4bb 100644
--- a/src/mame/drivers/eprom.cpp
+++ b/src/mame/drivers/eprom.cpp
@@ -386,7 +386,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( eprom, eprom_state )
+static MACHINE_CONFIG_START( eprom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( eprom, eprom_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( klaxp, eprom_state )
+static MACHINE_CONFIG_START( klaxp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -478,7 +478,7 @@ static MACHINE_CONFIG_START( klaxp, eprom_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( guts, eprom_state )
+static MACHINE_CONFIG_START( guts )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -761,4 +761,4 @@ GAME( 1989, eprom, 0, eprom, eprom, eprom_state, eprom, ROT0, "Atari Games"
GAME( 1989, eprom2, eprom, eprom, eprom, eprom_state, eprom, ROT0, "Atari Games", "Escape from the Planet of the Robot Monsters (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, klaxp1, klax, klaxp, klaxp, eprom_state, klaxp, ROT0, "Atari Games", "Klax (prototype set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, klaxp2, klax, klaxp, klaxp, eprom_state, klaxp, ROT0, "Atari Games", "Klax (prototype set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, guts, 0, guts, guts, eprom_state, guts, ROT0, "Atari Games", "Guts n' Glory (prototype)", 0 )
+GAME( 1989, guts, 0, guts, guts, eprom_state, guts, ROT0, "Atari Games", "Guts n' Glory (prototype)", 0 )
diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp
index c3a010481ed..cf94437cccf 100644
--- a/src/mame/drivers/equites.cpp
+++ b/src/mame/drivers/equites.cpp
@@ -1134,7 +1134,7 @@ void equites_state::machine_reset()
}
-static MACHINE_CONFIG_START( equites, equites_state )
+static MACHINE_CONFIG_START( equites )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
@@ -1179,7 +1179,7 @@ static MACHINE_CONFIG_DERIVED( gekisou, equites )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( splndrbt, equites_state )
+static MACHINE_CONFIG_START( splndrbt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp
index d08cfda714d..14fba0cf5a3 100644
--- a/src/mame/drivers/ertictac.cpp
+++ b/src/mame/drivers/ertictac.cpp
@@ -218,7 +218,7 @@ INTERRUPT_GEN_MEMBER(ertictac_state::ertictac_podule_irq)
#define NVRAM_SIZE 256
#define NVRAM_PAGE_SIZE 0 /* max size of one write request */
-static MACHINE_CONFIG_START( ertictac, ertictac_state )
+static MACHINE_CONFIG_START( ertictac )
MCFG_CPU_ADD("maincpu", ARM, XTAL_24MHz/3) /* guess, 12MHz 8MHz or 6MHz, what's the correct divider 2, 3 or 4? */
MCFG_CPU_PROGRAM_MAP(ertictac_map)
@@ -346,7 +346,7 @@ ROM_START( poizone )
ROM_REGION(0x200000, "vram", ROMREGION_ERASE00)
ROM_END
-GAME( 1990, ertictac, 0, ertictac, ertictac, ertictac_state, ertictac, ROT0, "Sisteme", "Erotictac/Tactic" ,MACHINE_IMPERFECT_SOUND)
-GAME( 1990, ertictaca, ertictac, ertictac, ertictac, ertictac_state, ertictac, ROT0, "Sisteme", "Erotictac/Tactic (ver 01)" ,MACHINE_IMPERFECT_SOUND)
-GAME( 1990, ertictacb, ertictac, ertictac, ertictac, ertictac_state, ertictac, ROT0, "Sisteme", "Erotictac/Tactic (set 2)" ,MACHINE_IMPERFECT_SOUND)
-GAME( 1991, poizone, 0, ertictac, poizone, ertictac_state, ertictac, ROT0, "Eterna" ,"Poizone" ,MACHINE_IMPERFECT_SOUND|MACHINE_IMPERFECT_GRAPHICS)
+GAME( 1990, ertictac, 0, ertictac, ertictac, ertictac_state, ertictac, ROT0, "Sisteme", "Erotictac/Tactic", MACHINE_IMPERFECT_SOUND)
+GAME( 1990, ertictaca, ertictac, ertictac, ertictac, ertictac_state, ertictac, ROT0, "Sisteme", "Erotictac/Tactic (ver 01)", MACHINE_IMPERFECT_SOUND)
+GAME( 1990, ertictacb, ertictac, ertictac, ertictac, ertictac_state, ertictac, ROT0, "Sisteme", "Erotictac/Tactic (set 2)", MACHINE_IMPERFECT_SOUND)
+GAME( 1991, poizone, 0, ertictac, poizone, ertictac_state, ertictac, ROT0, "Eterna", "Poizone", MACHINE_IMPERFECT_SOUND|MACHINE_IMPERFECT_GRAPHICS)
diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp
index 88b3958a959..f9886edd364 100644
--- a/src/mame/drivers/esd16.cpp
+++ b/src/mame/drivers/esd16.cpp
@@ -605,7 +605,7 @@ DECOSPR_PRIORITY_CB_MEMBER(esd16_state::hedpanic_pri_callback)
return 0; // above everything
}
-static MACHINE_CONFIG_START( esd16, esd16_state )
+static MACHINE_CONFIG_START( esd16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_16MHz) /* 16MHz */
@@ -647,7 +647,7 @@ static MACHINE_CONFIG_START( esd16, esd16_state )
MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_16MHz/4) /* 4MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* 1MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* 1MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -667,7 +667,7 @@ static MACHINE_CONFIG_DERIVED( jumppop, esd16 )
MCFG_SOUND_REPLACE("ymsnd", YM3812, XTAL_14MHz/4) /* 3.5MHz - Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_REPLACE("oki", XTAL_14MHz/16, OKIM6295_PIN7_HIGH) /* 875kHz - Verified */
+ MCFG_OKIM6295_REPLACE("oki", XTAL_14MHz/16, PIN7_HIGH) /* 875kHz - Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -1618,31 +1618,31 @@ ROM_END
***************************************************************************/
/* ESD 11-09-98 */
-GAME( 1999, multchmp, 0, esd16, multchmp, driver_device, 0, ROT0, "ESD", "Multi Champ (World, ver. 2.5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, multchmpk,multchmp, esd16, multchmp, driver_device, 0, ROT0, "ESD", "Multi Champ (Korea, older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, multchmpa,multchmp, esd16, multchmp, driver_device, 0, ROT0, "ESD", "Multi Champ (World, older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, multchmp, 0, esd16, multchmp, esd16_state, 0, ROT0, "ESD", "Multi Champ (World, ver. 2.5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, multchmpk, multchmp, esd16, multchmp, esd16_state, 0, ROT0, "ESD", "Multi Champ (Korea, older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, multchmpa, multchmp, esd16, multchmp, esd16_state, 0, ROT0, "ESD", "Multi Champ (World, older)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, jumppop, 0, jumppop, jumppop, driver_device, 0, ROT0, "ESD", "Jumping Pop (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, jumppope, jumppop, jumppop, jumppop, driver_device, 0, ROT0, "Emag Soft", "Jumping Pop (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, jumppop, 0, jumppop, jumppop, esd16_state, 0, ROT0, "ESD", "Jumping Pop (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, jumppope, jumppop, jumppop, jumppop, esd16_state, 0, ROT0, "Emag Soft", "Jumping Pop (set 2)", MACHINE_SUPPORTS_SAVE )
/* ESD 05-28-99 */
-GAME( 1999, hedpanico,hedpanic, hedpanio, hedpanic, driver_device, 0, ROT0, "ESD", "Head Panic (ver. 0615, 15/06/1999)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, hedpanico, hedpanic, hedpanio, hedpanic, esd16_state, 0, ROT0, "ESD", "Head Panic (ver. 0615, 15/06/1999)", MACHINE_SUPPORTS_SAVE )
/* ESD 06-10-1999 */
-GAME( 1999, hedpanica,hedpanic, hedpanic, hedpanic, driver_device, 0, ROT0, "ESD", "Head Panic (ver. 0702, 02/07/1999)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, hedpanica, hedpanic, hedpanic, hedpanic, esd16_state, 0, ROT0, "ESD", "Head Panic (ver. 0702, 02/07/1999)", MACHINE_SUPPORTS_SAVE )
/* ESD 08-26-1999 */
-GAME( 2000, mchampdx, 0, mchampdx, hedpanic, driver_device, 0, ROT0, "ESD", "Multi Champ Deluxe (ver. 0106, 06/01/2000)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, mchampdxa,mchampdx, mchampdx, hedpanic, driver_device, 0, ROT0, "ESD", "Multi Champ Deluxe (ver. 1126, 26/11/1999)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, mchampdxb,mchampdx, mchampdx, hedpanic, driver_device, 0, ROT0, "ESD", "Multi Champ Deluxe (ver. 1114, 14/11/1999)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, hedpanic, 0, hedpanic, hedpanic, driver_device, 0, ROT0, "ESD", "Head Panic (ver. 0117, 17/01/2000)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, hedpanicf,hedpanic, hedpanic, hedpanic, driver_device, 0, ROT0, "ESD / Fuuki", "Head Panic (ver. 0315, 15/03/2000)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mchampdx, 0, mchampdx, hedpanic, esd16_state, 0, ROT0, "ESD", "Multi Champ Deluxe (ver. 0106, 06/01/2000)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, mchampdxa, mchampdx, mchampdx, hedpanic, esd16_state, 0, ROT0, "ESD", "Multi Champ Deluxe (ver. 1126, 26/11/1999)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, mchampdxb, mchampdx, mchampdx, hedpanic, esd16_state, 0, ROT0, "ESD", "Multi Champ Deluxe (ver. 1114, 14/11/1999)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, hedpanic, 0, hedpanic, hedpanic, esd16_state, 0, ROT0, "ESD", "Head Panic (ver. 0117, 17/01/2000)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, hedpanicf, hedpanic, hedpanic, hedpanic, esd16_state, 0, ROT0, "ESD / Fuuki", "Head Panic (ver. 0315, 15/03/2000)", MACHINE_SUPPORTS_SAVE )
/* ESD - This PCB looks identical to the ESD 08-26-1999 PCB */
-GAME( 2000, deluxe5, 0, tangtang, hedpanic, driver_device, 0, ROT0, "ESD", "Deluxe 5 (ver. 0107, 07/01/2000, set 1)", MACHINE_SUPPORTS_SAVE ) // all 4 sets report the same version number?
-GAME( 2000, deluxe5a, deluxe5, tangtang, hedpanic, driver_device, 0, ROT0, "ESD", "Deluxe 5 (ver. 0107, 07/01/2000, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, deluxe5b, deluxe5, tangtang, hedpanic, driver_device, 0, ROT0, "ESD", "Deluxe 5 (ver. 0107, 07/01/2000, set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, deluxe4u, deluxe5, tangtang, hedpanic, driver_device, 0, ROT0, "ESD", "Deluxe 4 U (ver. 0107, 07/01/2000)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, deluxe5, 0, tangtang, hedpanic, esd16_state, 0, ROT0, "ESD", "Deluxe 5 (ver. 0107, 07/01/2000, set 1)", MACHINE_SUPPORTS_SAVE ) // all 4 sets report the same version number?
+GAME( 2000, deluxe5a, deluxe5, tangtang, hedpanic, esd16_state, 0, ROT0, "ESD", "Deluxe 5 (ver. 0107, 07/01/2000, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, deluxe5b, deluxe5, tangtang, hedpanic, esd16_state, 0, ROT0, "ESD", "Deluxe 5 (ver. 0107, 07/01/2000, set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, deluxe4u, deluxe5, tangtang, hedpanic, esd16_state, 0, ROT0, "ESD", "Deluxe 4 U (ver. 0107, 07/01/2000)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, tangtang, 0, tangtang, hedpanic, driver_device, 0, ROT0, "ESD", "Tang Tang (ver. 0526, 26/05/2000)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, swatpolc, 0, hedpanic, swatpolc, driver_device, 0, ROT0, "ESD", "SWAT Police", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, tangtang, 0, tangtang, hedpanic, esd16_state, 0, ROT0, "ESD", "Tang Tang (ver. 0526, 26/05/2000)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, swatpolc, 0, hedpanic, swatpolc, esd16_state, 0, ROT0, "ESD", "SWAT Police", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp
index 7349ef53ad6..33ffff1355e 100644
--- a/src/mame/drivers/esh.cpp
+++ b/src/mame/drivers/esh.cpp
@@ -350,7 +350,7 @@ void esh_state::machine_start()
/* DRIVER */
-static MACHINE_CONFIG_START( esh, esh_state )
+static MACHINE_CONFIG_START( esh )
/* main cpu */
MCFG_CPU_ADD("maincpu", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
MCFG_CPU_PROGRAM_MAP(z80_0_mem)
@@ -465,7 +465,7 @@ DRIVER_INIT_MEMBER(esh_state,esh)
{
}
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS */
-GAME( 1983, esh, 0, esh, esh, esh_state, esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 1)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS)
-GAME( 1983, esha, esh, esh, esh, esh_state, esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS)
-GAME( 1983, eshb, esh, esh, esh, esh_state, esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 3)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS)
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS
+GAME( 1983, esh, 0, esh, esh, esh_state, esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 1)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS)
+GAME( 1983, esha, esh, esh, esh, esh_state, esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS)
+GAME( 1983, eshb, esh, esh, esh, esh_state, esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 3)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS)
diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp
index 8595c9d8b87..fa1cbb24027 100644
--- a/src/mame/drivers/espial.cpp
+++ b/src/mame/drivers/espial.cpp
@@ -315,7 +315,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( espial, espial_state )
+static MACHINE_CONFIG_START( espial )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
@@ -446,6 +446,6 @@ ROM_END
-GAME( 1983, espial, 0, espial, espial, driver_device, 0, ROT0, "Orca / Thunderbolt", "Espial (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, espialu, espial, espial, espial, driver_device, 0, ROT0, "Orca / Thunderbolt", "Espial (US?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, netwars, 0, netwars, netwars, driver_device, 0, ROT90, "Orca (Esco Trading Co license)", "Net Wars", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, espial, 0, espial, espial, espial_state, 0, ROT0, "Orca / Thunderbolt", "Espial (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, espialu, espial, espial, espial, espial_state, 0, ROT0, "Orca / Thunderbolt", "Espial (US?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, netwars, 0, netwars, netwars, espial_state, 0, ROT90, "Orca (Esco Trading Co license)", "Net Wars", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp
index 42820375b10..773ce100727 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -226,11 +226,11 @@ private:
void recalc_filter(filter &f);
};
-static const device_type ESQ1_FILTERS = device_creator<esq1_filters>;
+DEFINE_DEVICE_TYPE(ESQ1_FILTERS, esq1_filters, "esq1_filters", "ESQ1 Filters stage")
esq1_filters::esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1_filters", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, ESQ1_FILTERS, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
@@ -398,7 +398,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<mc68681_device> m_duart;
required_device<esq1_filters> m_filters;
- optional_device<wd1772_t> m_fdc;
+ optional_device<wd1772_device> m_fdc;
optional_device<esqpanel2x40_device> m_panel;
optional_device<midi_port_device> m_mdout;
@@ -584,7 +584,7 @@ INPUT_CHANGED_MEMBER(esq1_state::key_stroke)
}
}
-static MACHINE_CONFIG_START( esq1, esq1_state )
+static MACHINE_CONFIG_START( esq1 )
MCFG_CPU_ADD("maincpu", M6809E, 4000000) // how fast is it?
MCFG_CPU_PROGRAM_MAP(esq1_map)
@@ -595,7 +595,7 @@ static MACHINE_CONFIG_START( esq1, esq1_state )
MCFG_MC68681_B_TX_CALLBACK(WRITELINE(esq1_state, duart_tx_b))
MCFG_MC68681_OUTPORT_CALLBACK(WRITE8(esq1_state, duart_output))
- MCFG_ESQPANEL2x40_ADD("panel")
+ MCFG_ESQPANEL2X40_ADD("panel")
MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
@@ -696,6 +696,6 @@ ROM_START( esqm )
ROM_END
-CONS( 1986, esq1, 0 , 0, esq1, esq1, driver_device, 0, "Ensoniq", "ESQ-1", MACHINE_NOT_WORKING )
-CONS( 1986, esqm, esq1, 0, esq1, esq1, driver_device, 0, "Ensoniq", "ESQ-M", MACHINE_NOT_WORKING )
-CONS( 1988, sq80, 0, 0, sq80, esq1, driver_device, 0, "Ensoniq", "SQ-80", MACHINE_NOT_WORKING )
+CONS( 1986, esq1, 0 , 0, esq1, esq1, esq1_state, 0, "Ensoniq", "ESQ-1", MACHINE_NOT_WORKING )
+CONS( 1986, esqm, esq1, 0, esq1, esq1, esq1_state, 0, "Ensoniq", "ESQ-M", MACHINE_NOT_WORKING )
+CONS( 1988, sq80, 0, 0, sq80, esq1, esq1_state, 0, "Ensoniq", "SQ-80", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index 664c23c1eb0..b0463cbcd51 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -186,8 +186,8 @@ public:
required_device<mc68681_device> m_duart;
required_device<es5505_device> m_otis;
required_device<es5510_device> m_esp;
- required_device<esq_5505_5510_pump> m_pump;
- optional_device<wd1772_t> m_fdc;
+ required_device<esq_5505_5510_pump_device> m_pump;
+ optional_device<wd1772_device> m_fdc;
required_device<esqpanel_device> m_panel;
optional_device<hd63450_device> m_dmac;
required_device<midi_port_device> m_mdout;
@@ -386,7 +386,7 @@ static ADDRESS_MAP_START( vfxsd_map, AS_PROGRAM, 16, esq5505_state )
AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("otis", es5505_device, read, write)
AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0x00ff)
AM_RANGE(0x260000, 0x2601ff) AM_DEVREADWRITE8("esp", es5510_device, host_r, host_w, 0x00ff)
- AM_RANGE(0x2c0000, 0x2c0007) AM_DEVREADWRITE8("wd1772", wd1772_t, read, write, 0x00ff)
+ AM_RANGE(0x2c0000, 0x2c0007) AM_DEVREADWRITE8("wd1772", wd1772_device, read, write, 0x00ff)
AM_RANGE(0x330000, 0x3bffff) AM_RAM // sequencer memory?
AM_RANGE(0xc00000, 0xc3ffff) AM_ROM AM_REGION("osrom", 0)
AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("osram")
@@ -397,7 +397,7 @@ static ADDRESS_MAP_START( eps_map, AS_PROGRAM, 16, esq5505_state )
AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("otis", es5505_device, read, write)
AM_RANGE(0x240000, 0x2400ff) AM_DEVREADWRITE("mc68450", hd63450_device, read, write)
AM_RANGE(0x280000, 0x28001f) AM_DEVREADWRITE8("duart", mc68681_device, read, write, 0x00ff)
- AM_RANGE(0x2c0000, 0x2c0007) AM_DEVREADWRITE8("wd1772", wd1772_t, read, write, 0x00ff)
+ AM_RANGE(0x2c0000, 0x2c0007) AM_DEVREADWRITE8("wd1772", wd1772_device, read, write, 0x00ff)
AM_RANGE(0x580000, 0x7fffff) AM_RAM // sample RAM?
AM_RANGE(0xc00000, 0xc1ffff) AM_ROM AM_REGION("osrom", 0)
AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("osram")
@@ -604,7 +604,7 @@ INPUT_CHANGED_MEMBER(esq5505_state::key_stroke)
}
#endif
-static MACHINE_CONFIG_START( vfx, esq5505_state )
+static MACHINE_CONFIG_START( vfx )
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(vfx_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
@@ -612,7 +612,7 @@ static MACHINE_CONFIG_START( vfx, esq5505_state )
MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
MCFG_DEVICE_DISABLE()
- MCFG_ESQPANEL2x40_ADD("panel")
+ MCFG_ESQPANEL2X40_ADD("panel")
MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
@@ -654,8 +654,8 @@ static MACHINE_CONFIG_DERIVED(eps, vfx)
MCFG_CPU_MODIFY( "maincpu" )
MCFG_CPU_PROGRAM_MAP(eps_map)
- MCFG_ESQPANEL_2x40_REMOVE("panel")
- MCFG_ESQPANEL1x22_ADD("panel")
+ MCFG_ESQPANEL_2X40_REMOVE("panel")
+ MCFG_ESQPANEL1X22_ADD("panel")
MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
@@ -681,7 +681,7 @@ static MACHINE_CONFIG_DERIVED(vfxsd, vfx)
MACHINE_CONFIG_END
// 32-voice machines with the VFX-SD type config
-static MACHINE_CONFIG_START(vfx32, esq5505_state)
+static MACHINE_CONFIG_START(vfx32)
MCFG_CPU_ADD("maincpu", M68000, XTAL_30_4761MHz / 2)
MCFG_CPU_PROGRAM_MAP(vfxsd_map)
MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(esq5505_state,maincpu_irq_acknowledge_callback)
@@ -689,7 +689,7 @@ static MACHINE_CONFIG_START(vfx32, esq5505_state)
MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
MCFG_DEVICE_DISABLE()
- MCFG_ESQPANEL2x40_ADD("panel")
+ MCFG_ESQPANEL2X40_ADD("panel")
MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
@@ -734,8 +734,8 @@ static MACHINE_CONFIG_DERIVED(sq1, vfx)
MCFG_CPU_MODIFY( "maincpu" )
MCFG_CPU_PROGRAM_MAP(sq1_map)
- MCFG_ESQPANEL_2x40_REMOVE("panel")
- MCFG_ESQPANEL2x16_SQ1_ADD("panel")
+ MCFG_ESQPANEL_2X40_REMOVE("panel")
+ MCFG_ESQPANEL2X16_SQ1_ADD("panel")
MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w))
MACHINE_CONFIG_END
@@ -1013,12 +1013,12 @@ DRIVER_INIT_MEMBER(esq5505_state,denib)
}
}
-CONS( 1988, eps, 0, 0, eps, vfx, esq5505_state, eps, "Ensoniq", "EPS", MACHINE_NOT_WORKING ) // custom VFD: one alphanumeric 22-char row, one graphics-capable row (alpha row can also do bar graphs)
-CONS( 1989, vfx, 0, 0, vfx, vfx, esq5505_state, denib, "Ensoniq", "VFX", MACHINE_NOT_WORKING ) // 2x40 VFD
-CONS( 1989, vfxsd, 0, 0, vfxsd, vfx, esq5505_state, denib, "Ensoniq", "VFX-SD", MACHINE_NOT_WORKING ) // 2x40 VFD
-CONS( 1990, eps16p,eps, 0, eps, vfx, esq5505_state, eps, "Ensoniq", "EPS-16 Plus", MACHINE_NOT_WORKING ) // custom VFD: one alphanumeric 22-char row, one graphics-capable row (alpha row can also do bar graphs)
-CONS( 1990, sd1, 0, 0, vfxsd, vfx, esq5505_state, denib, "Ensoniq", "SD-1 (21 voice)", MACHINE_NOT_WORKING ) // 2x40 VFD
-CONS( 1990, sq1, 0, 0, sq1, sq1, esq5505_state, sq1, "Ensoniq", "SQ-1", MACHINE_NOT_WORKING ) // 2x16 LCD
-CONS( 1990, sqrack,sq1, 0, sq1, sq1, esq5505_state, sq1, "Ensoniq", "SQ-Rack", MACHINE_NOT_WORKING ) // 2x16 LCD
-CONS( 1991, sq2, 0, 0, sq1, sq1, esq5505_state, sq1, "Ensoniq", "SQ-2", MACHINE_NOT_WORKING ) // 2x16 LCD
-CONS( 1991, sd132, sd1,0, vfx32, vfx, esq5505_state, denib, "Ensoniq", "SD-1 (32 voice)", MACHINE_NOT_WORKING ) // 2x40 VFD
+CONS( 1988, eps, 0, 0, eps, vfx, esq5505_state, eps, "Ensoniq", "EPS", MACHINE_NOT_WORKING ) // custom VFD: one alphanumeric 22-char row, one graphics-capable row (alpha row can also do bar graphs)
+CONS( 1989, vfx, 0, 0, vfx, vfx, esq5505_state, denib, "Ensoniq", "VFX", MACHINE_NOT_WORKING ) // 2x40 VFD
+CONS( 1989, vfxsd, 0, 0, vfxsd, vfx, esq5505_state, denib, "Ensoniq", "VFX-SD", MACHINE_NOT_WORKING ) // 2x40 VFD
+CONS( 1990, eps16p,eps, 0, eps, vfx, esq5505_state, eps, "Ensoniq", "EPS-16 Plus", MACHINE_NOT_WORKING ) // custom VFD: one alphanumeric 22-char row, one graphics-capable row (alpha row can also do bar graphs)
+CONS( 1990, sd1, 0, 0, vfxsd, vfx, esq5505_state, denib, "Ensoniq", "SD-1 (21 voice)", MACHINE_NOT_WORKING ) // 2x40 VFD
+CONS( 1990, sq1, 0, 0, sq1, sq1, esq5505_state, sq1, "Ensoniq", "SQ-1", MACHINE_NOT_WORKING ) // 2x16 LCD
+CONS( 1990, sqrack,sq1, 0, sq1, sq1, esq5505_state, sq1, "Ensoniq", "SQ-Rack", MACHINE_NOT_WORKING ) // 2x16 LCD
+CONS( 1991, sq2, 0, 0, sq1, sq1, esq5505_state, sq1, "Ensoniq", "SQ-2", MACHINE_NOT_WORKING ) // 2x16 LCD
+CONS( 1991, sd132, sd1, 0, vfx32, vfx, esq5505_state, denib, "Ensoniq", "SD-1 (32 voice)", MACHINE_NOT_WORKING ) // 2x40 VFD
diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp
index aa70e250b48..6a7f5885136 100644
--- a/src/mame/drivers/esqasr.cpp
+++ b/src/mame/drivers/esqasr.cpp
@@ -60,7 +60,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<es5510_device> m_esp;
- required_device<esq2x40_sq1_t> m_sq1vfd;
+ required_device<esq2x40_sq1_device> m_sq1vfd;
virtual void machine_reset() override;
@@ -93,14 +93,14 @@ READ16_MEMBER(esqasr_state::esq5506_read_adc)
return 0;
}
-static MACHINE_CONFIG_START( asr, esqasr_state )
+static MACHINE_CONFIG_START( asr )
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // actually MC68302
MCFG_CPU_PROGRAM_MAP(asr_map)
MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
MCFG_DEVICE_DISABLE()
- MCFG_ESQ2x40_SQ1_ADD("sq1vfd")
+ MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
@@ -115,14 +115,14 @@ static MACHINE_CONFIG_START( asr, esqasr_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 2.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( asrx, esqasr_state )
+static MACHINE_CONFIG_START( asrx )
MCFG_CPU_ADD("maincpu", M68020, XTAL_16MHz) // unknown, possibly 68340?
MCFG_CPU_PROGRAM_MAP(asrx_map)
MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
MCFG_DEVICE_DISABLE()
- MCFG_ESQ2x40_SQ1_ADD("sq1vfd")
+ MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp
index 3eb8e014c65..a3e5d5ef931 100644
--- a/src/mame/drivers/esqkt.cpp
+++ b/src/mame/drivers/esqkt.cpp
@@ -201,14 +201,14 @@ WRITE_LINE_MEMBER(esqkt_state::duart_tx_b)
m_sq1panel->rx_w(state);
}
-static MACHINE_CONFIG_START( kt, esqkt_state )
+static MACHINE_CONFIG_START( kt )
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(kt_map)
MCFG_CPU_ADD("esp", ES5510, XTAL_10MHz)
MCFG_DEVICE_DISABLE()
- MCFG_ESQPANEL2x16_SQ1_ADD("sq1panel")
+ MCFG_ESQPANEL2X16_SQ1_ADD("sq1panel")
MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w))
MCFG_MC68681_ADD("duart", 4000000)
diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp
index c0c44843a6a..0ba06ae71f4 100644
--- a/src/mame/drivers/esqmr.cpp
+++ b/src/mame/drivers/esqmr.cpp
@@ -217,8 +217,8 @@ public:
, m_sq1vfd(*this, "sq1vfd")
{ }
- required_device<m68340cpu_device> m_maincpu;
- required_device<esq2x40_sq1_t> m_sq1vfd;
+ required_device<m68340_cpu_device> m_maincpu;
+ required_device<esq2x40_sq1_device> m_sq1vfd;
virtual void machine_reset() override;
@@ -248,11 +248,11 @@ READ16_MEMBER(esqmr_state::esq5506_read_adc)
return 0;
}
-static MACHINE_CONFIG_START( mr, esqmr_state )
+static MACHINE_CONFIG_START( mr )
MCFG_CPU_ADD("maincpu", M68340, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(mr_map)
- MCFG_ESQ2x40_SQ1_ADD("sq1vfd")
+ MCFG_ESQ2X40_SQ1_ADD("sq1vfd")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("ensoniq", ES5506, XTAL_16MHz)
diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp
index 19f56d7371f..ee36118cef8 100644
--- a/src/mame/drivers/esripsys.cpp
+++ b/src/mame/drivers/esripsys.cpp
@@ -660,7 +660,7 @@ DRIVER_INIT_MEMBER(esripsys_state,esripsys)
save_item(NAME(m_fbsel));
}
-static MACHINE_CONFIG_START( esripsys, esripsys_state )
+static MACHINE_CONFIG_START( esripsys )
MCFG_CPU_ADD("game_cpu", M6809E, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(game_cpu_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", esripsys_state, esripsys_vblank_irq)
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index c32df7506db..ba098e30954 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -177,7 +177,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( et3400, et3400_state )
+static MACHINE_CONFIG_START( et3400 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_4MHz / 4 ) // 1MHz with memory i/o accessory, or 500khz without it
MCFG_CPU_PROGRAM_MAP(et3400_mem)
@@ -213,4 +213,4 @@ ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1976, et3400, 0, 0, et3400, et3400, driver_device, 0, "Heath Inc", "Heathkit ET-3400", 0 )
+COMP( 1976, et3400, 0, 0, et3400, et3400, et3400_state, 0, "Heath Inc", "Heathkit ET-3400", 0 )
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index dad8f38b48c..62b13eed4be 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -255,8 +255,8 @@ void eti660_state::machine_reset()
m_resetcnt = 0;
m_color_on = 0;
// fix for F3 soft reboot
- m_maincpu->set_state_int(COSMAC_R0, 0); // set R0 to start of rom
- m_maincpu->set_state_int(COSMAC_P, 0); // set R0 as the PC register
+ m_maincpu->set_state_int(cosmac_device::COSMAC_R0, 0); // set R0 to start of rom
+ m_maincpu->set_state_int(cosmac_device::COSMAC_P, 0); // set R0 as the PC register
}
void eti660_state::machine_start()
@@ -302,7 +302,7 @@ QUICKLOAD_LOAD_MEMBER( eti660_state, eti660 )
/* Machine Drivers */
-static MACHINE_CONFIG_START( eti660, eti660_state )
+static MACHINE_CONFIG_START( eti660 )
/* basic machine hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_8_867238MHz/5)
MCFG_CPU_PROGRAM_MAP(eti660_map)
@@ -349,5 +349,5 @@ ROM_START( eti660 )
ROM_LOAD( "eti660.bin", 0x0000, 0x0400, CRC(811dfa62) SHA1(c0c4951e02f873f15560bdc3f35cdf3f99653922) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, eti660, 0, 0, eti660, eti660, driver_device, 0, "Electronics Today International", "ETI-660", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, eti660, 0, 0, eti660, eti660, eti660_state, 0, "Electronics Today International", "ETI-660", 0 )
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index eacb5c5f4c3..82d7aea7a61 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -39,11 +39,13 @@ class ettrivia_state : public driver_device
{
public:
ettrivia_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_fg_videoram(*this, "fg_videoram"),
- m_bg_videoram(*this, "bg_videoram"),
- m_maincpu(*this, "maincpu"),
- m_gfxdecode(*this, "gfxdecode") { }
+ : driver_device(mconfig, type, tag)
+ , m_fg_videoram(*this, "fg_videoram")
+ , m_bg_videoram(*this, "bg_videoram")
+ , m_maincpu(*this, "maincpu")
+ , m_gfxdecode(*this, "gfxdecode")
+ {
+ }
int m_palreg;
int m_gfx_bank;
@@ -285,7 +287,7 @@ INTERRUPT_GEN_MEMBER(ettrivia_state::ettrivia_interrupt)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( ettrivia, ettrivia_state )
+static MACHINE_CONFIG_START( ettrivia )
MCFG_CPU_ADD("maincpu", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
@@ -464,8 +466,8 @@ ROM_START( strvmstr )
ROM_LOAD( "entrtn.hi3", 0x38000, 0x8000, CRC(a8cf603b) SHA1(6efa5753d8d252452b3f5be8635a28364e4d8de1) )
ROM_END
-GAME( 1985, promutrv, 0, ettrivia, ettrivia, driver_device, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 1)", 0 )
-GAME( 1985, promutrva,promutrv, ettrivia, ettrivia, driver_device, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 2)", 0 )
-GAME( 1985, promutrvb,promutrv, ettrivia, ettrivia, driver_device, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 3)", 0 )
-GAME( 1985, promutrvc,promutrv, ettrivia, ettrivia, driver_device, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 4)", 0 )
-GAME( 1986, strvmstr, 0, ettrivia, ettrivia, driver_device, 0, ROT270, "Enerdyne Technologies Inc.", "Super Trivia Master", MACHINE_WRONG_COLORS )
+GAME( 1985, promutrv, 0, ettrivia, ettrivia, ettrivia_state, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 1)", 0 )
+GAME( 1985, promutrva, promutrv, ettrivia, ettrivia, ettrivia_state, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 2)", 0 )
+GAME( 1985, promutrvb, promutrv, ettrivia, ettrivia, ettrivia_state, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 3)", 0 )
+GAME( 1985, promutrvc, promutrv, ettrivia, ettrivia, ettrivia_state, 0, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 4)", 0 )
+GAME( 1986, strvmstr, 0, ettrivia, ettrivia, ettrivia_state, 0, ROT270, "Enerdyne Technologies Inc.", "Super Trivia Master", MACHINE_WRONG_COLORS )
diff --git a/src/mame/drivers/eurocom2.cpp b/src/mame/drivers/eurocom2.cpp
index 9e1afe9db8c..d7051c55b08 100644
--- a/src/mame/drivers/eurocom2.cpp
+++ b/src/mame/drivers/eurocom2.cpp
@@ -73,12 +73,8 @@ public:
, m_fdc(*this, "fdc")
, m_p_videoram(*this, "videoram")
, m_screen(*this, "screen")
- { }
-
- // driver_device overrides
- virtual void machine_reset() override;
- virtual void machine_start() override;
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+ {
+ }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -89,9 +85,7 @@ public:
DECLARE_WRITE8_MEMBER(vico_w);
DECLARE_READ8_MEMBER(kbd_get);
- DECLARE_WRITE8_MEMBER(kbd_put);
-
- emu_timer *m_sst;
+ void kbd_put(u8 data);
DECLARE_READ_LINE_MEMBER(pia1_ca1_r);
DECLARE_READ_LINE_MEMBER(pia1_ca2_r);
@@ -99,6 +93,13 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia1_cb2_w);
protected:
+ // driver_device overrides
+ virtual void machine_reset() override;
+ virtual void machine_start() override;
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+ emu_timer *m_sst;
+
floppy_image_device *m_floppy;
bool m_sst_state, m_kbd_ready;
bitmap_ind16 m_tmpbmp;
@@ -110,7 +111,7 @@ protected:
required_device<pia6821_device> m_pia1;
required_device<pia6821_device> m_pia2;
required_device<acia6850_device> m_acia;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_shared_ptr<uint8_t> m_p_videoram;
required_device<screen_device> m_screen;
};
@@ -251,7 +252,7 @@ READ8_MEMBER(eurocom2_state::kbd_get)
return m_kbd_data;
}
-WRITE8_MEMBER(eurocom2_state::kbd_put)
+void eurocom2_state::kbd_put(u8 data)
{
m_kbd_ready = true;
m_kbd_data = data;
@@ -333,7 +334,7 @@ static ADDRESS_MAP_START(eurocom2_map, AS_PROGRAM, 8, eurocom2_state)
AM_RANGE(0xfcf5, 0xfcf5) AM_DEVREADWRITE("acia", acia6850_device, data_r, data_w)
AM_RANGE(0xfcf6, 0xfcf7) AM_WRITE(vico_w)
AM_RANGE(0xfcf8, 0xfcfb) AM_DEVREADWRITE("pia2", pia6821_device, read, write)
- AM_RANGE(0xfd30, 0xfd37) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0xfd30, 0xfd37) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0xfd38, 0xfd38) AM_READWRITE(fdc_aux_r, fdc_aux_w)
AM_RANGE(0xfd40, 0xffff) AM_ROM AM_REGION("maincpu", 0xd40) AM_WRITENOP
ADDRESS_MAP_END
@@ -426,7 +427,7 @@ static SLOT_INTERFACE_START( eurocom_floppies )
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( eurocom2, eurocom2_state )
+static MACHINE_CONFIG_START( eurocom2 )
MCFG_CPU_ADD("maincpu", M6809, XTAL_5_3586MHz/4)
MCFG_CPU_PROGRAM_MAP(eurocom2_map)
@@ -438,7 +439,7 @@ static MACHINE_CONFIG_START( eurocom2, eurocom2_state )
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(eurocom2_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(eurocom2_state, kbd_put))
MCFG_DEVICE_ADD("pia1", PIA6821, 0)
MCFG_PIA_READCA1_HANDLER(READLINE(eurocom2_state, pia1_ca1_r)) // keyboard strobe
@@ -469,7 +470,7 @@ static MACHINE_CONFIG_START( eurocom2, eurocom2_state )
// MCFG_FLOPPY_DRIVE_SOUND(true)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS(waveterm, eurocom2, waveterm_state)
+static MACHINE_CONFIG_DERIVED(waveterm, eurocom2)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(waveterm_map)
@@ -517,6 +518,6 @@ ROM_START(waveterm)
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1981, eurocom2, 0, 0, eurocom2, eurocom2, driver_device, 0, "Eltec", "Eurocom II V7", MACHINE_IS_SKELETON)
-COMP( 1982, waveterm, eurocom2, 0, waveterm, waveterm, driver_device, 0, "PPG", "Waveterm A", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, eurocom2, 0, 0, eurocom2, eurocom2, eurocom2_state, 0, "Eltec", "Eurocom II V7", MACHINE_IS_SKELETON )
+COMP( 1982, waveterm, eurocom2, 0, waveterm, waveterm, waveterm_state, 0, "PPG", "Waveterm A", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/europc.cpp b/src/mame/drivers/europc.cpp
index ab9b0273690..5c84ecef038 100644
--- a/src/mame/drivers/europc.cpp
+++ b/src/mame/drivers/europc.cpp
@@ -1,11 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
#include "emu.h"
-#include "coreutil.h"
+
+#include "cpu/i86/i86.h"
+#include "bus/isa/aga.h"
#include "machine/genpc.h"
#include "machine/nvram.h"
#include "machine/pckeybrd.h"
+#include "coreutil.h"
+
+
class europc_pc_state : public driver_device
{
public:
@@ -471,7 +476,7 @@ static ADDRESS_MAP_START(europc_io, AS_IO, 8, europc_pc_state )
AM_RANGE(0x02e0, 0x02e0) AM_READ(europc_jim2_r)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( europc, europc_pc_state )
+static MACHINE_CONFIG_START( europc )
MCFG_CPU_ADD("maincpu", I8088, 4772720*2)
MCFG_CPU_PROGRAM_MAP(europc_map)
MCFG_CPU_IO_MAP(europc_io)
diff --git a/src/mame/drivers/evmbug.cpp b/src/mame/drivers/evmbug.cpp
index 3017b19ebe9..92949083e06 100644
--- a/src/mame/drivers/evmbug.cpp
+++ b/src/mame/drivers/evmbug.cpp
@@ -29,7 +29,9 @@ public:
DECLARE_READ8_MEMBER(rs232_r);
DECLARE_WRITE8_MEMBER(rs232_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
+protected:
virtual void machine_reset() override;
uint8_t m_term_data;
uint8_t m_term_out;
@@ -80,7 +82,7 @@ WRITE8_MEMBER( evmbug_state::rs232_w )
m_terminal->write(space, 0, m_term_out & 0x7f);
}
-WRITE8_MEMBER( evmbug_state::kbd_put )
+void evmbug_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -92,7 +94,7 @@ void evmbug_state::machine_reset()
static_cast<tms9995_device*>(machine().device("maincpu"))->ready_line(ASSERT_LINE);
}
-static MACHINE_CONFIG_START( evmbug, evmbug_state )
+static MACHINE_CONFIG_START( evmbug )
// basic machine hardware
// TMS9995 CPU @ 12.0 MHz
// We have no lines connected yet
@@ -100,7 +102,7 @@ static MACHINE_CONFIG_START( evmbug, evmbug_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(evmbug_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(evmbug_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -113,5 +115,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, evmbug, 0, 0, evmbug, evmbug, driver_device, 0, "Texas Instruments", "TMAM6095", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 19??, evmbug, 0, 0, evmbug, evmbug, evmbug_state, 0, "Texas Instruments", "TMAM6095", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index ae830119a7e..d43f098351e 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -112,7 +112,7 @@ private:
required_device<z80dma_device> m_dma;
required_device<ttl74123_device> m_u12;
required_device<centronics_device> m_centronics;
- required_device<wd2793_t> m_fdc;
+ required_device<wd2793_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
};
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START(excali64_io, AS_IO, 8, excali64_state)
AM_RANGE(0xe4, 0xe7) AM_WRITE(porte4_w)
AM_RANGE(0xe8, 0xeb) AM_READ(porte8_r)
AM_RANGE(0xec, 0xef) AM_WRITE(portec_w)
- AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("fdc", wd2793_t, read, write)
+ AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("fdc", wd2793_device, read, write)
ADDRESS_MAP_END
@@ -544,7 +544,7 @@ MC6845_UPDATE_ROW( excali64_state::update_row )
}
}
-static MACHINE_CONFIG_START( excali64, excali64_state )
+static MACHINE_CONFIG_START( excali64 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(excali64_mem)
@@ -647,5 +647,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, excali64, 0, 0, excali64, excali64, driver_device, 0, "BGR Computers", "Excalibur 64", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1984, excali64, 0, 0, excali64, excali64, excali64_state, 0, "BGR Computers", "Excalibur 64", 0 )
diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp
index 08078deb3d4..5770c3329ad 100644
--- a/src/mame/drivers/exedexes.cpp
+++ b/src/mame/drivers/exedexes.cpp
@@ -217,7 +217,7 @@ void exedexes_state::machine_reset()
m_sc2on = 0;
}
-static MACHINE_CONFIG_START( exedexes, exedexes_state )
+static MACHINE_CONFIG_START( exedexes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
@@ -350,5 +350,5 @@ ROM_END
-GAME( 1985, exedexes, 0, exedexes, exedexes, driver_device, 0, ROT270, "Capcom", "Exed Exes", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, savgbees, exedexes, exedexes, exedexes, driver_device, 0, ROT270, "Capcom (Memetron license)", "Savage Bees", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, exedexes, 0, exedexes, exedexes, exedexes_state, 0, ROT270, "Capcom", "Exed Exes", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, savgbees, exedexes, exedexes, exedexes, exedexes_state, 0, ROT270, "Capcom (Memetron license)", "Savage Bees", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp
index 65f98ca3915..ed136ba0385 100644
--- a/src/mame/drivers/exelv.cpp
+++ b/src/mame/drivers/exelv.cpp
@@ -484,7 +484,7 @@ MACHINE_START_MEMBER( exelv_state, exeltel)
}
-static MACHINE_CONFIG_START( exl100, exelv_state )
+static MACHINE_CONFIG_START( exl100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS7020_EXL, XTAL_4_9152MHz)
@@ -505,11 +505,11 @@ static MACHINE_CONFIG_START( exl100, exelv_state )
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_UPDATE_DEVICE("tms3556", tms3556_device, screen_update)
#if TMS3556_DOUBLE_WIDTH
- MCFG_SCREEN_SIZE(TMS3556_TOTAL_WIDTH*2, TMS3556_TOTAL_HEIGHT*2)
- MCFG_SCREEN_VISIBLE_AREA(0, TMS3556_TOTAL_WIDTH*2-1, 0, TMS3556_TOTAL_HEIGHT*2-1)
+ MCFG_SCREEN_SIZE(tms3556_device::TOTAL_WIDTH*2, tms3556_device::TOTAL_HEIGHT*2)
+ MCFG_SCREEN_VISIBLE_AREA(0, tms3556_device::TOTAL_WIDTH*2-1, 0, tms3556_device::TOTAL_HEIGHT*2-1)
#else
- MCFG_SCREEN_SIZE(TMS3556_TOTAL_WIDTH, TMS3556_TOTAL_HEIGHT*2)
- MCFG_SCREEN_VISIBLE_AREA(0, TMS3556_TOTAL_WIDTH-1, 0, TMS3556_TOTAL_HEIGHT-1)
+ MCFG_SCREEN_SIZE(tms3556_device::TOTAL_WIDTH, tms3556_device::TOTAL_HEIGHT*2)
+ MCFG_SCREEN_VISIBLE_AREA(0, tms3556_device::TOTAL_WIDTH-1, 0, tms3556_device::TOTAL_HEIGHT-1)
#endif
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
@@ -533,7 +533,7 @@ static MACHINE_CONFIG_START( exl100, exelv_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( exeltel, exelv_state )
+static MACHINE_CONFIG_START( exeltel )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS7040, XTAL_4_9152MHz)
@@ -554,11 +554,11 @@ static MACHINE_CONFIG_START( exeltel, exelv_state )
MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
MCFG_SCREEN_UPDATE_DEVICE("tms3556", tms3556_device, screen_update)
#if TMS3556_DOUBLE_WIDTH
- MCFG_SCREEN_SIZE(TMS3556_TOTAL_WIDTH*2, TMS3556_TOTAL_HEIGHT*2)
- MCFG_SCREEN_VISIBLE_AREA(0, TMS3556_TOTAL_WIDTH*2-1, 0, TMS3556_TOTAL_HEIGHT*2-1)
+ MCFG_SCREEN_SIZE(tms3556_device::TOTAL_WIDTH*2, tms3556_device::TOTAL_HEIGHT*2)
+ MCFG_SCREEN_VISIBLE_AREA(0, tms3556_device::TOTAL_WIDTH*2-1, 0, tms3556_device::TOTAL_HEIGHT*2-1)
#else
- MCFG_SCREEN_SIZE(TMS3556_TOTAL_WIDTH, TMS3556_TOTAL_HEIGHT*2)
- MCFG_SCREEN_VISIBLE_AREA(0, TMS3556_TOTAL_WIDTH-1, 0, TMS3556_TOTAL_HEIGHT-1)
+ MCFG_SCREEN_SIZE(tms3556_device::TOTAL_WIDTH, tms3556_device::TOTAL_HEIGHT*2)
+ MCFG_SCREEN_VISIBLE_AREA(0, tms3556_device::TOTAL_WIDTH-1, 0, tms3556_device::TOTAL_HEIGHT-1)
#endif
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
@@ -607,6 +607,6 @@ ROM_START(exeltel)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(1984, exl100, 0, 0, exl100, exelv, driver_device, 0, "Exelvision", "EXL 100", MACHINE_NOT_WORKING)
-COMP(1986, exeltel, exl100, 0, exeltel, exelv, driver_device, 0, "Exelvision", "Exeltel", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP(1984, exl100, 0, 0, exl100, exelv, exelv_state, 0, "Exelvision", "EXL 100", MACHINE_NOT_WORKING)
+COMP(1986, exeltel, exl100, 0, exeltel, exelv, exelv_state, 0, "Exelvision", "Exeltel", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp
index fd30847f034..1cd99655ffc 100644
--- a/src/mame/drivers/exerion.cpp
+++ b/src/mame/drivers/exerion.cpp
@@ -370,7 +370,7 @@ void exerion_state::machine_reset()
m_background_latches[i] = 0;
}
-static MACHINE_CONFIG_START( exerion, exerion_state )
+static MACHINE_CONFIG_START( exerion )
MCFG_CPU_ADD("maincpu", Z80, EXERION_CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(main_map)
diff --git a/src/mame/drivers/exidy.cpp b/src/mame/drivers/exidy.cpp
index b8285b9f436..63184ceec83 100644
--- a/src/mame/drivers/exidy.cpp
+++ b/src/mame/drivers/exidy.cpp
@@ -803,7 +803,7 @@ MACHINE_START_MEMBER(exidy_state,teetert)
*
*************************************/
-static MACHINE_CONFIG_START( base, exidy_state )
+static MACHINE_CONFIG_START( base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, EXIDY_CPU_CLOCK)
@@ -1584,33 +1584,33 @@ DRIVER_INIT_MEMBER(exidy_state,fax)
GAME( 1979, sidetrac, 0, sidetrac, sidetrac, exidy_state, sidetrac, ROT0, "Exidy", "Side Trak", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // "Side Track" on title screen, but cabinet/flyers/documentation clearly indicates otherwise, "Side Trak" it is
-GAME( 1980, targ, 0, targ, targ, exidy_state, targ, ROT0, "Exidy", "Targ", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, targc, targ, targ, targ, exidy_state, targ, ROT0, "Exidy", "Targ (cocktail?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, targ, 0, targ, targ, exidy_state, targ, ROT0, "Exidy", "Targ", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, targc, targ, targ, targ, exidy_state, targ, ROT0, "Exidy", "Targ (cocktail?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spectar, 0, spectar, spectar, exidy_state, spectar, ROT0, "Exidy", "Spectar (revision 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spectar1, spectar, spectar, spectar, exidy_state, spectar, ROT0, "Exidy", "Spectar (revision 1?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, rallys, spectar, rallys, rallys, exidy_state, rallys, ROT0, "bootleg (Novar)", "Rallys (bootleg of Spectar, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, rallysa, spectar, rallys, rallys, exidy_state, rallys, ROT0, "bootleg (Musik Box Brescia)", "Rallys (bootleg of Spectar, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, panzer, spectar, rallys, rallys, exidy_state, rallys, ROT0, "bootleg (Proel)", "Panzer (bootleg of Spectar)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spectar, 0, spectar, spectar, exidy_state, spectar, ROT0, "Exidy", "Spectar (revision 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spectar1, spectar, spectar, spectar, exidy_state, spectar, ROT0, "Exidy", "Spectar (revision 1?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, rallys, spectar, rallys, rallys, exidy_state, rallys, ROT0, "bootleg (Novar)", "Rallys (bootleg of Spectar, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, rallysa, spectar, rallys, rallys, exidy_state, rallys, ROT0, "bootleg (Musik Box Brescia)", "Rallys (bootleg of Spectar, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, panzer, spectar, rallys, rallys, exidy_state, rallys, ROT0, "bootleg (Proel)", "Panzer (bootleg of Spectar)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1980, phantoma, spectar, rallys, phantoma, exidy_state, phantoma, ROT0, "bootleg (Jeutel)", "Phantomas (bootleg of Spectar)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1980, phantom, spectar, rallys, phantoma, exidy_state, phantoma, ROT0, "bootleg (Proel)", "Phantom (bootleg of Spectar)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrap, 0, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrap2, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrap3, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrap4, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrapb, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "bootleg", "Mouse Trap (bootleg)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1981, venture, 0, venture, venture, exidy_state, venture, ROT0, "Exidy", "Venture (version 5 set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, venture2, venture, venture, venture, exidy_state, venture, ROT0, "Exidy", "Venture (version 5 set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, venture4, venture, venture, venture, exidy_state, venture, ROT0, "Exidy", "Venture (version 4)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1982, teetert, 0, teetert, teetert, exidy_state, teetert, ROT0, "Exidy", "Teeter Torture (prototype)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1982, pepper2, 0, pepper2, pepper2, exidy_state, pepper2, ROT0, "Exidy", "Pepper II (version 8)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pepper27, pepper2, pepper2, pepper2, exidy_state, pepper2, ROT0, "Exidy", "Pepper II (version 7)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1982, hardhat, 0, pepper2, pepper2, exidy_state, pepper2, ROT0, "Exidy", "Hard Hat", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1983, fax, 0, fax, fax, exidy_state, fax, ROT0, "Exidy", "FAX", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, fax2, fax, fax, fax, exidy_state, fax, ROT0, "Exidy", "FAX 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrap, 0, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrap2, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrap3, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrap4, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "Exidy", "Mouse Trap (version 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrapb, mtrap, mtrap, mtrap, exidy_state, mtrap, ROT0, "bootleg", "Mouse Trap (bootleg)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1981, venture, 0, venture, venture, exidy_state, venture, ROT0, "Exidy", "Venture (version 5 set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, venture2, venture, venture, venture, exidy_state, venture, ROT0, "Exidy", "Venture (version 5 set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, venture4, venture, venture, venture, exidy_state, venture, ROT0, "Exidy", "Venture (version 4)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1982, teetert, 0, teetert, teetert, exidy_state, teetert, ROT0, "Exidy", "Teeter Torture (prototype)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1982, pepper2, 0, pepper2, pepper2, exidy_state, pepper2, ROT0, "Exidy", "Pepper II (version 8)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pepper27, pepper2, pepper2, pepper2, exidy_state, pepper2, ROT0, "Exidy", "Pepper II (version 7)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1982, hardhat, 0, pepper2, pepper2, exidy_state, pepper2, ROT0, "Exidy", "Hard Hat", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1983, fax, 0, fax, fax, exidy_state, fax, ROT0, "Exidy", "FAX", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, fax2, fax, fax, fax, exidy_state, fax, ROT0, "Exidy", "FAX 2", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/exidy440.cpp b/src/mame/drivers/exidy440.cpp
index fd78f84ec2b..7b6ff76b66a 100644
--- a/src/mame/drivers/exidy440.cpp
+++ b/src/mame/drivers/exidy440.cpp
@@ -992,7 +992,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( exidy440, exidy440_state )
+static MACHINE_CONFIG_START( exidy440 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CPU_CLOCK)
@@ -2071,18 +2071,18 @@ DRIVER_INIT_MEMBER(exidy440_state,yukon)
*
*************************************/
-GAME( 1983, crossbow, 0, exidy440, crossbow, exidy440_state, exidy440, ROT0, "Exidy", "Crossbow (version 2.0)", 0 )
-GAME( 1984, cheyenne, 0, exidy440, cheyenne, exidy440_state, exidy440, ROT0, "Exidy", "Cheyenne (version 1.0)", 0 )
-GAME( 1985, combat, 0, exidy440, combat, exidy440_state, exidy440, ROT0, "Exidy", "Combat (version 3.0)", 0 )
-GAME( 1985, catch22, combat, exidy440, catch22, exidy440_state, exidy440, ROT0, "Exidy", "Catch-22 (version 8.0)", 0 )
-GAME( 1985, cracksht, 0, exidy440, cracksht, exidy440_state, exidy440, ROT0, "Exidy", "Crackshot (version 2.0)", 0 )
-GAME( 1986, claypign, 0, exidy440, claypign, exidy440_state, claypign, ROT0, "Exidy", "Clay Pigeon (version 2.0)", 0 )
-GAME( 1986, chiller, 0, exidy440, chiller, exidy440_state, exidy440, ROT0, "Exidy", "Chiller (version 3.0)", 0 )
+GAME( 1983, crossbow, 0, exidy440, crossbow, exidy440_state, exidy440, ROT0, "Exidy", "Crossbow (version 2.0)", 0 )
+GAME( 1984, cheyenne, 0, exidy440, cheyenne, exidy440_state, exidy440, ROT0, "Exidy", "Cheyenne (version 1.0)", 0 )
+GAME( 1985, combat, 0, exidy440, combat, exidy440_state, exidy440, ROT0, "Exidy", "Combat (version 3.0)", 0 )
+GAME( 1985, catch22, combat, exidy440, catch22, exidy440_state, exidy440, ROT0, "Exidy", "Catch-22 (version 8.0)", 0 )
+GAME( 1985, cracksht, 0, exidy440, cracksht, exidy440_state, exidy440, ROT0, "Exidy", "Crackshot (version 2.0)", 0 )
+GAME( 1986, claypign, 0, exidy440, claypign, exidy440_state, claypign, ROT0, "Exidy", "Clay Pigeon (version 2.0)", 0 )
+GAME( 1986, chiller, 0, exidy440, chiller, exidy440_state, exidy440, ROT0, "Exidy", "Chiller (version 3.0)", 0 )
GAME( 1986, topsecex, 0, topsecex, topsecex, exidy440_state, topsecex, ROT0, "Exidy", "Top Secret (Exidy) (version 1.0)", 0 )
-GAME( 1987, hitnmiss, 0, exidy440, hitnmiss, exidy440_state, exidy440, ROT0, "Exidy", "Hit 'n Miss (version 3.0)", 0 )
-GAME( 1987, hitnmiss2,hitnmiss, exidy440, hitnmiss, exidy440_state, exidy440, ROT0, "Exidy", "Hit 'n Miss (version 2.0)", 0 )
-GAME( 1988, whodunit, 0, exidy440, whodunit, exidy440_state, exidy440, ROT0, "Exidy", "Who Dunit (version 9.0)", 0 )
-GAME( 1988, whodunit8,whodunit, exidy440, whodunit, exidy440_state, exidy440, ROT0, "Exidy", "Who Dunit (version 8.0)", 0 )
-GAME( 1988, showdown, 0, exidy440, showdown, exidy440_state, showdown, ROT0, "Exidy", "Showdown (version 5.0)", 0 )
-GAME( 1989, yukon, 0, exidy440, showdown, exidy440_state, yukon, ROT0, "Exidy", "Yukon (version 2.0)", 0 )
-GAME( 1989, yukon1, yukon, exidy440, showdown, exidy440_state, yukon, ROT0, "Exidy", "Yukon (version 1.0)", 0 )
+GAME( 1987, hitnmiss, 0, exidy440, hitnmiss, exidy440_state, exidy440, ROT0, "Exidy", "Hit 'n Miss (version 3.0)", 0 )
+GAME( 1987, hitnmiss2,hitnmiss, exidy440, hitnmiss, exidy440_state, exidy440, ROT0, "Exidy", "Hit 'n Miss (version 2.0)", 0 )
+GAME( 1988, whodunit, 0, exidy440, whodunit, exidy440_state, exidy440, ROT0, "Exidy", "Who Dunit (version 9.0)", 0 )
+GAME( 1988, whodunit8,whodunit, exidy440, whodunit, exidy440_state, exidy440, ROT0, "Exidy", "Who Dunit (version 8.0)", 0 )
+GAME( 1988, showdown, 0, exidy440, showdown, exidy440_state, showdown, ROT0, "Exidy", "Showdown (version 5.0)", 0 )
+GAME( 1989, yukon, 0, exidy440, showdown, exidy440_state, yukon, ROT0, "Exidy", "Yukon (version 2.0)", 0 )
+GAME( 1989, yukon1, yukon, exidy440, showdown, exidy440_state, yukon, ROT0, "Exidy", "Yukon (version 1.0)", 0 )
diff --git a/src/mame/drivers/exidyttl.cpp b/src/mame/drivers/exidyttl.cpp
index cbaef90b02a..5b6d385ccac 100644
--- a/src/mame/drivers/exidyttl.cpp
+++ b/src/mame/drivers/exidyttl.cpp
@@ -52,7 +52,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -95,7 +95,7 @@ void exidyttl_state::video_start()
{
}
-static MACHINE_CONFIG_START( attack, exidyttl_state )
+static MACHINE_CONFIG_START( attack )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -110,7 +110,7 @@ static MACHINE_CONFIG_START( attack, exidyttl_state )
MCFG_FIXFREQ_SYNC_THRESHOLD(0.30)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( deathrac, exidyttl_state )
+static MACHINE_CONFIG_START( deathrac )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -211,6 +211,6 @@ ROM_START( deathrac )
ROM_LOAD( "6331-36.t7", 0x0000, 0x0020, CRC(15e00a2a) SHA1(cd43d227a34e5444ed9d8a4acf5497df9c789c73) )
ROM_END
-GAME( 1977, attckexd, 0, attack, 0, driver_device, 0, ROT0, "Exidy", "Attack (Set 1) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, attckexd2, attckexd, attack, 0, driver_device, 0, ROT0, "Exidy", "Attack (Set 2) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1976, deathrac, 0, deathrac, 0, driver_device, 0, ROT0, "Exidy", "Death Race [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, attckexd, 0, attack, 0, exidyttl_state, 0, ROT0, "Exidy", "Attack (Set 1) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, attckexd2, attckexd, attack, 0, exidyttl_state, 0, ROT0, "Exidy", "Attack (Set 2) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, deathrac, 0, deathrac, 0, exidyttl_state, 0, ROT0, "Exidy", "Death Race [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index 9b09545fe13..ebd436ca302 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -178,7 +178,7 @@ void exp85_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( exp85, exp85_state )
+static MACHINE_CONFIG_START( exp85 )
/* basic machine hardware */
MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL_6_144MHz)
MCFG_CPU_PROGRAM_MAP(exp85_mem)
@@ -233,5 +233,5 @@ ROM_START( exp85 )
ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, exp85, 0, 0, exp85, exp85, driver_device, 0, "Netronics", "Explorer/85", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, exp85, 0, 0, exp85, exp85, exp85_state, 0, "Netronics", "Explorer/85", 0 )
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index f18f09f308c..691fcd9b5d1 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -876,7 +876,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( expro02, expro02_state )
+static MACHINE_CONFIG_START( expro02 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -921,7 +921,7 @@ static MACHINE_CONFIG_START( expro02, expro02_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 12000000/6, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -960,7 +960,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( supmodel, comad_noview2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(supmodel_map)
- MCFG_OKIM6295_REPLACE("oki", 1584000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_REPLACE("oki", 1584000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -978,7 +978,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( galhustl, comad_noview2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(galhustl_map)
- MCFG_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -990,7 +990,7 @@ static MACHINE_CONFIG_DERIVED( zipzap, comad_noview2 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(zipzap_map)
- MCFG_OKIM6295_REPLACE("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_REPLACE("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -1822,42 +1822,42 @@ DRIVER_INIT_MEMBER(expro02_state,expro02)
*
*************************************/
-GAME( 1990, galsnew, 0, expro02, expro02, expro02_state, expro02, ROT90, "Kaneko", "Gals Panic (US, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, galsnewa, galsnew, expro02, galsnewa, expro02_state, expro02, ROT90, "Kaneko", "Gals Panic (Export, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, galsnewj, galsnew, expro02, galsnewj, expro02_state, expro02, ROT90, "Kaneko (Taito license)", "Gals Panic (Japan, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, galsnewk, galsnew, expro02, galsnewj, expro02_state, expro02, ROT90, "Kaneko (Inter license)", "Gals Panic (Korea, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galsnew, 0, expro02, expro02, expro02_state, expro02, ROT90, "Kaneko", "Gals Panic (US, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galsnewa, galsnew, expro02, galsnewa, expro02_state, expro02, ROT90, "Kaneko", "Gals Panic (Export, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galsnewj, galsnew, expro02, galsnewj, expro02_state, expro02, ROT90, "Kaneko (Taito license)", "Gals Panic (Japan, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galsnewk, galsnew, expro02, galsnewj, expro02_state, expro02, ROT90, "Kaneko (Inter license)", "Gals Panic (Korea, EXPRO-02 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
/* the first version of Fantasia clones the EXPRO02 almost exactly, including the encrypted tiles*/
-GAME( 1994, fantasia, 0, comad, fantasia, expro02_state, expro02, ROT90, "Comad & New Japan System", "Fantasia (940429 PCB, set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fantasiab, fantasia, comad, fantasia, expro02_state, expro02, ROT90, "Comad & New Japan System", "Fantasia (940429 PCB, set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, fantasiaa, fantasia, comad, fantasia, expro02_state, expro02, ROT90, "Comad & New Japan System", "Fantasia (940307 PCB)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fantasia, 0, comad, fantasia, expro02_state, expro02, ROT90, "Comad & New Japan System", "Fantasia (940429 PCB, set 1)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fantasiab, fantasia, comad, fantasia, expro02_state, expro02, ROT90, "Comad & New Japan System", "Fantasia (940429 PCB, set 2)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fantasiaa, fantasia, comad, fantasia, expro02_state, expro02, ROT90, "Comad & New Japan System", "Fantasia (940307 PCB)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
/* subsequent releases remove the encrypted tile (View2 layer) but leave the unused writes to it in the program code */
-GAME( 1994, fantasian,fantasia, fantasia, fantasiaa, driver_device, 0, ROT90, "Comad & New Japan System", "Fantasia (940803 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, fantasian,fantasia, fantasia, fantasiaa, expro02_state, 0, ROT90, "Comad & New Japan System", "Fantasia (940803 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, supmodel, 0, supmodel, fantasiaa, driver_device, 0, ROT90, "Comad & New Japan System", "Super Model",MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "C" nudity level
+GAME( 1994, supmodel, 0, supmodel, fantasiaa, expro02_state, 0, ROT90, "Comad & New Japan System", "Super Model",MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "C" nudity level
-GAME( 1995, newfant, 0, fantasia, fantasiaa, driver_device, 0, ROT90, "Comad & New Japan System", "New Fantasia (1995 copyright)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // the only difference between the two is the gfx rom containing the copyright
-GAME( 1994, newfanta, newfant, fantasia, fantasiaa, driver_device, 0, ROT90, "Comad & New Japan System", "New Fantasia (1994 copyright)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, fantsy95, newfant, fantasia, fantasiaa, driver_device, 0, ROT90, "Hi-max Technology Inc.", "Fantasy '95", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "C" nudity level
+GAME( 1995, newfant, 0, fantasia, fantasiaa, expro02_state, 0, ROT90, "Comad & New Japan System", "New Fantasia (1995 copyright)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // the only difference between the two is the gfx rom containing the copyright
+GAME( 1994, newfanta, newfant, fantasia, fantasiaa, expro02_state, 0, ROT90, "Comad & New Japan System", "New Fantasia (1994 copyright)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, fantsy95, newfant, fantasia, fantasiaa, expro02_state, 0, ROT90, "Hi-max Technology Inc.", "Fantasy '95", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "C" nudity level
// the PCB label (A/B) could be related to the 3 different levels of nudity Comad offered
-GAME( 1996, missw96, 0, fantasia, missw96, driver_device, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000A PCB, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
-GAME( 1996, missw96a, missw96, fantasia, missw96, driver_device, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000A PCB, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
-GAME( 1996, missw96b, missw96, fantasia, missw96, driver_device, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000A PCB, set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
-GAME( 1996, missw96c, missw96, fantasia, missw96, driver_device, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000B PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level
+GAME( 1996, missw96, 0, fantasia, missw96, expro02_state, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000A PCB, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
+GAME( 1996, missw96a, missw96, fantasia, missw96, expro02_state, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000A PCB, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
+GAME( 1996, missw96b, missw96, fantasia, missw96, expro02_state, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000A PCB, set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
+GAME( 1996, missw96c, missw96, fantasia, missw96, expro02_state, 0, ROT0, "Comad", "Miss World '96 (Nude) (C-3000B PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level
-GAME( 1996, missmw96, missw96, fantasia, missw96, driver_device, 0, ROT0, "Comad", "Miss Mister World '96 (Nude)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, missmw96, missw96, fantasia, missw96, expro02_state, 0, ROT0, "Comad", "Miss Mister World '96 (Nude)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, smissw, 0, smissw, missw96, driver_device, 0, ROT0, "Comad", "Super Miss World", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // 951127 PCB
+GAME( 1996, smissw, 0, smissw, missw96, expro02_state, 0, ROT0, "Comad", "Super Miss World", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // 951127 PCB
-GAME( 1997, fantsia2, 0, fantsia2, missw96, driver_device, 0, ROT0, "Comad", "Fantasia II (Explicit)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
-GAME( 1997, fantsia2a,fantsia2, fantsia2, missw96, driver_device, 0, ROT0, "Comad", "Fantasia II (Less Explicit)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level
-GAME( 1998, fantsia2n,fantsia2, fantsia2, missw96, driver_device, 0, ROT0, "Comad", "Fantasia II (1998)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
+GAME( 1997, fantsia2, 0, fantsia2, missw96, expro02_state, 0, ROT0, "Comad", "Fantasia II (Explicit)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
+GAME( 1997, fantsia2a,fantsia2, fantsia2, missw96, expro02_state, 0, ROT0, "Comad", "Fantasia II (Less Explicit)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level
+GAME( 1998, fantsia2n,fantsia2, fantsia2, missw96, expro02_state, 0, ROT0, "Comad", "Fantasia II (1998)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
-GAME( 2002, wownfant, 0, fantsia2, missw96, driver_device, 0, ROT0, "Comad", "WOW New Fantasia", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level
-GAME( 2002, missw02, 0, fantsia2, missw96, driver_device, 0, ROT0, "Daigom", "Miss World 2002", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
+GAME( 2002, wownfant, 0, fantsia2, missw96, expro02_state, 0, ROT0, "Comad", "WOW New Fantasia", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "B" nudity level
+GAME( 2002, missw02, 0, fantsia2, missw96, expro02_state, 0, ROT0, "Daigom", "Miss World 2002", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // "A" nudity level
-GAME( 1996, pgalvip, 0, galhustl, galhustl, driver_device, 0, ROT0, "ACE International / Afega","Pocket Gals V.I.P (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // roms were all AFEGA stickered, select screen seems wrong? maybe not a final version.
-GAME( 1997, pgalvipa, pgalvip, galhustl, galhustl, driver_device, 0, ROT0, "<unknown>", "Pocket Gals V.I.P (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, galhustl, pgalvip, galhustl, galhustl, driver_device, 0, ROT0, "ACE International", "Gals Hustler", MACHINE_SUPPORTS_SAVE ) // hack of the above?
+GAME( 1996, pgalvip, 0, galhustl, galhustl, expro02_state, 0, ROT0, "ACE International / Afega","Pocket Gals V.I.P (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // roms were all AFEGA stickered, select screen seems wrong? maybe not a final version.
+GAME( 1997, pgalvipa, pgalvip, galhustl, galhustl, expro02_state, 0, ROT0, "<unknown>", "Pocket Gals V.I.P (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, galhustl, pgalvip, galhustl, galhustl, expro02_state, 0, ROT0, "ACE International", "Gals Hustler", MACHINE_SUPPORTS_SAVE ) // hack of the above?
-GAME( 1995, zipzap, 0, zipzap, zipzap, driver_device, 0, ROT90, "Barko Corp", "Zip & Zap", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, zipzap, 0, zipzap, zipzap, expro02_state, 0, ROT90, "Barko Corp", "Zip & Zap", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp
index 53529696c91..b3b3e2685da 100644
--- a/src/mame/drivers/exprraid.cpp
+++ b/src/mame/drivers/exprraid.cpp
@@ -499,7 +499,7 @@ void exprraid_state::machine_reset()
}
-static MACHINE_CONFIG_START( exprraid, exprraid_state )
+static MACHINE_CONFIG_START( exprraid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", DECO16, XTAL_12MHz / 8)
diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp
index 7c072b6cd4d..5ad8d5ec2dd 100644
--- a/src/mame/drivers/exterm.cpp
+++ b/src/mame/drivers/exterm.cpp
@@ -397,7 +397,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( exterm, exterm_state )
+static MACHINE_CONFIG_START( exterm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, 40000000)
@@ -501,4 +501,4 @@ ROM_END
*
*************************************/
-GAME( 1989, exterm, 0, exterm, exterm, driver_device, 0, ROT0, "Gottlieb / Premier Technology", "Exterminator", 0 )
+GAME( 1989, exterm, 0, exterm, exterm, exterm_state, 0, ROT0, "Gottlieb / Premier Technology", "Exterminator", 0 )
diff --git a/src/mame/drivers/extrema.cpp b/src/mame/drivers/extrema.cpp
index 4412839f895..77ee3833237 100644
--- a/src/mame/drivers/extrema.cpp
+++ b/src/mame/drivers/extrema.cpp
@@ -43,7 +43,7 @@ static INPUT_PORTS_START( extrema )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( extrema, extrema_state )
+static MACHINE_CONFIG_START( extrema )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 6000000)
MCFG_CPU_PROGRAM_MAP(extrema_map)
@@ -158,13 +158,13 @@ ROM_END
-GAME( 200?, maski, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Maski Show (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, adults, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Adults Only (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, bloto, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Blits Loto (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, blpearl, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Black Pearl (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, grancan, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Grand Canyon (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, luckshel, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Lucky Shell (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, exsafar, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Safari (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, strlink, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Strong Link (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, extrmth, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Treasure Hunt (Russia) (Extrema)", MACHINE_IS_SKELETON)
-GAME( 200?, extrmti, 0, extrema, extrema, driver_device, 0, ROT0, "Extrema", "Treasure Island (Russia) (Extrema)", MACHINE_IS_SKELETON)
+GAME( 200?, maski, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Maski Show (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, adults, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Adults Only (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, bloto, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Blits Loto (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, blpearl, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Black Pearl (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, grancan, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Grand Canyon (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, luckshel, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Lucky Shell (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, exsafar, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Safari (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, strlink, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Strong Link (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, extrmth, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Treasure Hunt (Russia) (Extrema)", MACHINE_IS_SKELETON )
+GAME( 200?, extrmti, 0, extrema, extrema, extrema_state, 0, ROT0, "Extrema", "Treasure Island (Russia) (Extrema)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp
index 1ca41be0465..5f13dc2cdc4 100644
--- a/src/mame/drivers/exzisus.cpp
+++ b/src/mame/drivers/exzisus.cpp
@@ -225,7 +225,7 @@ GFXDECODE_END
/* All clocks are unconfirmed */
-static MACHINE_CONFIG_START( exzisus, exzisus_state )
+static MACHINE_CONFIG_START( exzisus )
/* basic machine hardware */
MCFG_CPU_ADD("cpua", Z80, 6000000)
@@ -390,6 +390,6 @@ ROM_START( exzisust )
ROM_LOAD( "b23-05.16l", 0x00800, 0x00400, CRC(87f0f69a) SHA1(37df6fd56245fab9beaabfd86fd8f95d7c42c2a5) )
ROM_END
-GAME( 1987, exzisus, 0, exzisus, exzisus, driver_device, 0, ROT0, "Taito Corporation", "Exzisus (Japan, dedicated)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, exzisusa, exzisus, exzisus, exzisus, driver_device, 0, ROT0, "Taito Corporation", "Exzisus (Japan, conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, exzisust, exzisus, exzisus, exzisus, driver_device, 0, ROT0, "Taito Corporation (TAD license)", "Exzisus (TAD license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, exzisus, 0, exzisus, exzisus, exzisus_state, 0, ROT0, "Taito Corporation", "Exzisus (Japan, dedicated)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, exzisusa, exzisus, exzisus, exzisus, exzisus_state, 0, ROT0, "Taito Corporation", "Exzisus (Japan, conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, exzisust, exzisus, exzisus, exzisus, exzisus_state, 0, ROT0, "Taito Corporation (TAD license)", "Exzisus (TAD license)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp
index e1d966fa8a8..cfed6a7e63c 100644
--- a/src/mame/drivers/f-32.cpp
+++ b/src/mame/drivers/f-32.cpp
@@ -156,7 +156,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state )
+static MACHINE_CONFIG_START( mosaicf2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", E132XN, XTAL_20MHz*4) /* 4x internal multiplier */
@@ -186,7 +186,7 @@ static MACHINE_CONFIG_START( mosaicf2, mosaicf2_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, OKIM6295_PIN7_HIGH) /* 1.7897725 MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, PIN7_HIGH) /* 1.7897725 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -232,7 +232,7 @@ static ADDRESS_MAP_START( royalpk2_io, AS_IO, 32, mosaicf2_state )
AM_RANGE(0x6a00, 0x6a03) AM_WRITE_PORT("EEPROMOUT")
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( royalpk2, mosaicf2_state )
+static MACHINE_CONFIG_START( royalpk2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_50MHz)
@@ -262,7 +262,7 @@ static MACHINE_CONFIG_START( royalpk2, mosaicf2_state )
// MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
// MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, OKIM6295_PIN7_HIGH) /* 1.7897725 MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, PIN7_HIGH) /* 1.7897725 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -364,5 +364,5 @@ ROM_START( royalpk2 )
ROM_END
-GAME( 1999, mosaicf2, 0, mosaicf2, mosaicf2, driver_device, 0, ROT0, "F2 System", "Mosaic (F2 System)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, royalpk2, 0, royalpk2, royalpk2, driver_device, 0, ROT0, "F2 System", "Royal Poker 2 (Network version 3.12)", MACHINE_NOT_WORKING )
+GAME( 1999, mosaicf2, 0, mosaicf2, mosaicf2, mosaicf2_state, 0, ROT0, "F2 System", "Mosaic (F2 System)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, royalpk2, 0, royalpk2, royalpk2, mosaicf2_state, 0, ROT0, "F2 System", "Royal Poker 2 (Network version 3.12)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp
index 769f9f41754..857299a4e14 100644
--- a/src/mame/drivers/f1gp.cpp
+++ b/src/mame/drivers/f1gp.cpp
@@ -392,7 +392,7 @@ MACHINE_RESET_MEMBER(f1gp_state,f1gp)
m_scroll[1] = 0;
}
-static MACHINE_CONFIG_START( f1gp, f1gp_state )
+static MACHINE_CONFIG_START( f1gp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */
@@ -458,7 +458,7 @@ static MACHINE_CONFIG_START( f1gp, f1gp_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( f1gpb, f1gp_state )
+static MACHINE_CONFIG_START( f1gpb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,10000000) /* 10 MHz ??? */
@@ -494,7 +494,7 @@ static MACHINE_CONFIG_START( f1gpb, f1gp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -672,7 +672,7 @@ ROM_START( f1gp2 )
ROM_END
-GAME( 1991, f1gp, 0, f1gp, f1gp, driver_device, 0, ROT90, "Video System Co.", "F-1 Grand Prix", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, f1gpb, f1gp, f1gpb, f1gp, driver_device, 0, ROT90, "bootleg (Playmark)", "F-1 Grand Prix (Playmark bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // PCB marked 'Super Formula II', manufactured by Playmark.
+GAME( 1991, f1gp, 0, f1gp, f1gp, f1gp_state, 0, ROT90, "Video System Co.", "F-1 Grand Prix", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, f1gpb, f1gp, f1gpb, f1gp, f1gp_state, 0, ROT90, "bootleg (Playmark)", "F-1 Grand Prix (Playmark bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // PCB marked 'Super Formula II', manufactured by Playmark.
-GAME( 1992, f1gp2, 0, f1gp2, f1gp2, driver_device, 0, ROT90, "Video System Co.", "F-1 Grand Prix Part II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, f1gp2, 0, f1gp2, f1gp2, f1gp_state, 0, ROT90, "Video System Co.", "F-1 Grand Prix Part II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp
index d9576552172..8df471a3a9f 100644
--- a/src/mame/drivers/famibox.cpp
+++ b/src/mame/drivers/famibox.cpp
@@ -544,7 +544,7 @@ void famibox_state::machine_start()
m_coins = 0;
}
-static MACHINE_CONFIG_START( famibox, famibox_state )
+static MACHINE_CONFIG_START( famibox )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
MCFG_CPU_PROGRAM_MAP(famibox_map)
@@ -607,4 +607,4 @@ ROM_START(famibox)
ROM_END
-GAME( 1986, famibox, 0, famibox, famibox, driver_device, 0, ROT0, "Nintendo", "FamicomBox", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
+GAME( 1986, famibox, 0, famibox, famibox, famibox_state, 0, ROT0, "Nintendo", "FamicomBox", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp
index bb0ceb9c5c3..e2d7ab1a668 100644
--- a/src/mame/drivers/fantland.cpp
+++ b/src/mame/drivers/fantland.cpp
@@ -839,7 +839,7 @@ INTERRUPT_GEN_MEMBER(fantland_state::fantland_sound_irq)
device.execute().set_input_line_and_vector(0, HOLD_LINE, 0x80 / 4);
}
-static MACHINE_CONFIG_START( fantland, fantland_state )
+static MACHINE_CONFIG_START( fantland )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 8000000) // ?
@@ -890,7 +890,7 @@ WRITE_LINE_MEMBER(fantland_state::galaxygn_sound_irq)
m_audiocpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0x80/4);
}
-static MACHINE_CONFIG_START( galaxygn, fantland_state )
+static MACHINE_CONFIG_START( galaxygn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 8000000) // ?
@@ -972,7 +972,7 @@ MACHINE_RESET_MEMBER(fantland_state,borntofi)
borntofi_adpcm_stop(m_msm4, 3);
}
-static MACHINE_CONFIG_START( borntofi, fantland_state )
+static MACHINE_CONFIG_START( borntofi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
@@ -1006,27 +1006,27 @@ static MACHINE_CONFIG_START( borntofi, fantland_state )
// OKI M5205 running at 384kHz [18.432/48]. Sample rate = 384000 / 48
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_0)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_1)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("msm3", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_2)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_SOUND_ADD("msm4", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fantland_state, borntofi_adpcm_int_3)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wheelrun, fantland_state )
+static MACHINE_CONFIG_START( wheelrun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20)
@@ -1416,8 +1416,8 @@ ROM_START( wheelrun )
ROM_END
-GAME( 19??, borntofi, 0, borntofi, borntofi, driver_device, 0, ROT0, "International Games", "Born To Fight", MACHINE_SUPPORTS_SAVE )
-GAME( 19??, fantland, 0, fantland, fantland, driver_device, 0, ROT0, "Electronic Devices Italy", "Fantasy Land (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 19??, fantlanda, fantland, fantland, fantland, driver_device, 0, ROT0, "Electronic Devices Italy", "Fantasy Land (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 19??, wheelrun, 0, wheelrun, wheelrun, driver_device, 0, ROT0, "International Games", "Wheels Runner", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, galaxygn, 0, galaxygn, galaxygn, driver_device, 0, ROT90, "Electronic Devices Italy", "Galaxy Gunners", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 19??, borntofi, 0, borntofi, borntofi, fantland_state, 0, ROT0, "International Games", "Born To Fight", MACHINE_SUPPORTS_SAVE )
+GAME( 19??, fantland, 0, fantland, fantland, fantland_state, 0, ROT0, "Electronic Devices Italy", "Fantasy Land (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 19??, fantlanda, fantland, fantland, fantland, fantland_state, 0, ROT0, "Electronic Devices Italy", "Fantasy Land (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 19??, wheelrun, 0, wheelrun, wheelrun, fantland_state, 0, ROT0, "International Games", "Wheels Runner", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, galaxygn, 0, galaxygn, galaxygn, fantland_state, 0, ROT90, "Electronic Devices Italy", "Galaxy Gunners", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fanucs15.cpp b/src/mame/drivers/fanucs15.cpp
index c9cb662a2f4..ea3cac1c0e1 100644
--- a/src/mame/drivers/fanucs15.cpp
+++ b/src/mame/drivers/fanucs15.cpp
@@ -359,7 +359,7 @@ void fanucs15_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( fanucs15, fanucs15_state )
+static MACHINE_CONFIG_START( fanucs15 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(maincpu_mem)
@@ -419,5 +419,5 @@ ROM_START( fanucs15 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1990, fanucs15, 0, 0, fanucs15, fanucs15, driver_device, 0, "Fanuc", "System 15", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1990, fanucs15, 0, 0, fanucs15, fanucs15, fanucs15_state, 0, "Fanuc", "System 15", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp
index 14b47870293..7e2366bb5d6 100644
--- a/src/mame/drivers/fanucspmg.cpp
+++ b/src/mame/drivers/fanucspmg.cpp
@@ -954,7 +954,7 @@ FLOPPY_FORMATS_MEMBER( fanucspmg_state::floppy_formats )
FLOPPY_IMD_FORMAT
FLOPPY_FORMATS_END
-static MACHINE_CONFIG_START( fanucspmg, fanucspmg_state )
+static MACHINE_CONFIG_START( fanucspmg )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, I8086, XTAL_15MHz/3)
MCFG_CPU_PROGRAM_MAP(maincpu_mem)
@@ -1042,6 +1042,6 @@ ROM_START( fanucspgm )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, fanucspg, 0, 0, fanucspmg, fanucspmg, fanucspmg_state, fanucspmg, "Fanuc", "System P Model G", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1983, fanucspgm, fanucspg, 0, fanucspmgm, fanucspmg, fanucspmg_state, fanucspmg, "Fanuc", "System P Model G (monochrome)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, fanucspg, 0, 0, fanucspmg, fanucspmg, fanucspmg_state, fanucspmg, "Fanuc", "System P Model G", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1983, fanucspgm, fanucspg, 0, fanucspmgm, fanucspmg, fanucspmg_state, fanucspmg, "Fanuc", "System P Model G (monochrome)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index 580e8cd5e07..07b2bf5e9ca 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -648,7 +648,7 @@ INTERRUPT_GEN_MEMBER(fastfred_state::sound_timer_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( fastfred, fastfred_state )
+static MACHINE_CONFIG_START( fastfred )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12_432MHz/4) /* 3.108 MHz; xtal from pcb pics, divider not verified */
@@ -1060,13 +1060,13 @@ DRIVER_INIT_MEMBER(fastfred_state,imago)
m_hardware_type = 3;
}
-GAME( 1982, flyboy, 0, fastfred, flyboy, fastfred_state, flyboy, ROT90, "Kaneko", "Fly-Boy", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, flyboyb, flyboy, fastfred, flyboy, fastfred_state, flyboyb, ROT90, "bootleg", "Fly-Boy (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, flyboy, 0, fastfred, flyboy, fastfred_state, flyboy, ROT90, "Kaneko", "Fly-Boy", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, flyboyb, flyboy, fastfred, flyboy, fastfred_state, flyboyb, ROT90, "bootleg", "Fly-Boy (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, fastfred, flyboy, fastfred, fastfred, fastfred_state, fastfred, ROT90, "Kaneko (Atari license)", "Fast Freddie", MACHINE_SUPPORTS_SAVE )
GAME( 1983, jumpcoas, 0, jumpcoas, jumpcoas, fastfred_state, jumpcoas, ROT90, "Kaneko", "Jump Coaster", MACHINE_SUPPORTS_SAVE )
GAME( 1983, jumpcoast,jumpcoas, jumpcoas, jumpcoas, fastfred_state, jumpcoas, ROT90, "Kaneko (Taito license)", "Jump Coaster (Taito)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, boggy84, 0, jumpcoas, boggy84, fastfred_state, boggy84, ROT90, "Kaneko", "Boggy '84", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, boggy84b, boggy84, jumpcoas, boggy84, fastfred_state, boggy84b, ROT90, "bootleg (Eddie's Games)", "Boggy '84 (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, boggy84, 0, jumpcoas, boggy84, fastfred_state, boggy84, ROT90, "Kaneko", "Boggy '84", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, boggy84b, boggy84, jumpcoas, boggy84, fastfred_state, boggy84b, ROT90, "bootleg (Eddie's Games)", "Boggy '84 (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, redrobin, 0, fastfred, redrobin, fastfred_state, flyboyb, ROT90, "Elettronolo", "Red Robin", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, imago, 0, imago, imago, fastfred_state, imago, ROT90, "Acom", "Imago (cocktail set)", 0 )
-GAME( 1983, imagoa, imago, imago, imagoa, fastfred_state, imago, ROT90, "Acom", "Imago (no cocktail set)", 0 )
+GAME( 1984, imago, 0, imago, imago, fastfred_state, imago, ROT90, "Acom", "Imago (cocktail set)", 0 )
+GAME( 1983, imagoa, imago, imago, imagoa, fastfred_state, imago, ROT90, "Acom", "Imago (no cocktail set)", 0 )
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index b08b0deaebe..76c9fc8770b 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -630,7 +630,7 @@ static GFXDECODE_START( fastinvaders )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( fastinvaders, fastinvaders_state )
+static MACHINE_CONFIG_START( fastinvaders )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, 6144100/2 ) // 6144100 Xtal /2 internaly
@@ -777,6 +777,6 @@ ROM_START( fi6845 )
ROM_LOAD( "93427.bin", 0x0000, 0x0100, CRC(f59c8573) SHA1(5aed4866abe1690fd0f088af1cfd99b3c85afe9a) )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS*/
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1979, fi6845, 0, fastinvaders_6845, fastinvaders, fastinvaders_state, fi6845, ROT270, "Fiberglass", "Fast Invaders (6845 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1979, fi8275, fi6845, fastinvaders_8275, fastinvaders, fastinvaders_state,fi6845, ROT270, "Fiberglass", "Fast Invaders (8275 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1979, fi8275, fi6845, fastinvaders_8275, fastinvaders, fastinvaders_state, fi6845, ROT270, "Fiberglass", "Fast Invaders (8275 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index f65fcd5f1ad..89ab60e33ee 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -199,7 +199,7 @@ void fastlane_state::machine_start()
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
}
-static MACHINE_CONFIG_START( fastlane, fastlane_state )
+static MACHINE_CONFIG_START( fastlane )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, XTAL_24MHz/2) // 3MHz(XTAL_24MHz/8) internally
@@ -267,4 +267,4 @@ ROM_START( fastlane )
ROM_END
-GAME( 1987, fastlane, 0, fastlane, fastlane, driver_device, 0, ROT90, "Konami", "Fast Lane", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, fastlane, 0, fastlane, fastlane, fastlane_state, 0, ROT90, "Konami", "Fast Lane", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp
index e712ac0f546..a9545ac87a9 100644
--- a/src/mame/drivers/fb01.cpp
+++ b/src/mame/drivers/fb01.cpp
@@ -172,7 +172,7 @@ PALETTE_INIT_MEMBER(fb01_state, fb01)
}
-static MACHINE_CONFIG_START( fb01, fb01_state )
+static MACHINE_CONFIG_START( fb01 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
MCFG_CPU_PROGRAM_MAP(fb01_mem)
@@ -231,5 +231,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1986, fb01, 0, 0, fb01, fb01, driver_device, 0, "Yamaha", "FB-01", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1986, fb01, 0, 0, fb01, fb01, fb01_state, 0, "Yamaha", "FB-01", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 5f4d8deedfa..6ef23b9fe4c 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -512,7 +512,7 @@ DRIVER_INIT_MEMBER( fc100_state, fc100 )
membank("bankr")->configure_entry(1, &ram[0]);
}
-static MACHINE_CONFIG_START( fc100, fc100_state )
+static MACHINE_CONFIG_START( fc100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_7_15909MHz/2)
MCFG_CPU_PROGRAM_MAP(fc100_mem)
@@ -522,7 +522,7 @@ static MACHINE_CONFIG_START( fc100, fc100_state )
MCFG_DEVICE_ADD("vdg", M5C6847P1, XTAL_7_15909MHz/3) // Clock not verified
MCFG_MC6847_INPUT_CALLBACK(READ8(fc100_state, mc6847_videoram_r))
MCFG_MC6847_CHARROM_CALLBACK(fc100_state, get_char_rom)
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_INTEXT)
+ MCFG_MC6847_FIXED_MODE(m5c6847p1_device::MODE_INTEXT)
// other lines not connected
MCFG_SCREEN_MC6847_NTSC_ADD("screen", "vdg")
@@ -577,5 +577,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-CONS( 1982, fc100, 0, 0, fc100, fc100, fc100_state, fc100, "Goldstar", "FC-100", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 1982, fc100, 0, 0, fc100, fc100, fc100_state, fc100, "Goldstar", "FC-100", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/fccpu20.cpp b/src/mame/drivers/fccpu20.cpp
index 1e5aa35b4f1..15c5bb2f918 100644
--- a/src/mame/drivers/fccpu20.cpp
+++ b/src/mame/drivers/fccpu20.cpp
@@ -140,37 +140,37 @@ static SLOT_INTERFACE_START(cpu21yb_vme_cards)
SLOT_INTERFACE_END
/* Machine configurations */
-MACHINE_CONFIG_START (cpu20, cpu20_state)
+MACHINE_CONFIG_START (cpu20)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu20_vme_cards, "fccpu20")
MACHINE_CONFIG_END
-MACHINE_CONFIG_START (cpu21s, cpu20_state)
+MACHINE_CONFIG_START (cpu21s)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu21s_vme_cards, "fccpu21s")
MACHINE_CONFIG_END
-MACHINE_CONFIG_START (cpu21, cpu20_state)
+MACHINE_CONFIG_START (cpu21)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu21_vme_cards, "fccpu21")
MACHINE_CONFIG_END
-MACHINE_CONFIG_START (cpu21a, cpu20_state)
+MACHINE_CONFIG_START (cpu21a)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu21a_vme_cards, "fccpu21a")
MACHINE_CONFIG_END
-MACHINE_CONFIG_START (cpu21ya, cpu20_state)
+MACHINE_CONFIG_START (cpu21ya)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu21ya_vme_cards, "fccpu21ya")
MACHINE_CONFIG_END
-MACHINE_CONFIG_START (cpu21b, cpu20_state)
+MACHINE_CONFIG_START (cpu21b)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu21b_vme_cards, "fccpu21b")
MACHINE_CONFIG_END
-MACHINE_CONFIG_START (cpu21yb, cpu20_state)
+MACHINE_CONFIG_START (cpu21yb)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, cpu21yb_vme_cards, "fccpu21yb")
MACHINE_CONFIG_END
@@ -188,10 +188,10 @@ ROM_START(fccpu20sbc) ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1986, fccpu20sbc, 0, 0, cpu20, cpu20, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-20", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1986, fccpu21ssbc, fccpu20sbc, 0, cpu21s, cpu20, cpu20_state, cpu21s, "Force Computers Gmbh", "SYS68K/CPU-21S", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1986, fccpu21sbc, fccpu20sbc, 0, cpu21, cpu20, cpu20_state, cpu21, "Force Computers Gmbh", "SYS68K/CPU-21", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1986, fccpu21asbc, fccpu20sbc, 0, cpu21a, cpu20, cpu20_state, cpu21a, "Force Computers Gmbh", "SYS68K/CPU-21A", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1986, fccpu21yasbc, fccpu20sbc, 0, cpu21ya, cpu20, cpu20_state, cpu21ya, "Force Computers Gmbh", "SYS68K/CPU-21YA", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1986, fccpu21bsbc, fccpu20sbc, 0, cpu21b, cpu20, cpu20_state, cpu21b, "Force Computers Gmbh", "SYS68K/CPU-21B", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1986, fccpu21ybsbc, fccpu20sbc, 0, cpu21yb, cpu20, cpu20_state, cpu21yb, "Force Computers Gmbh", "SYS68K/CPU-21YB", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu20sbc, 0, 0, cpu20, cpu20, cpu20_state, 0, "Force Computers GmbH", "SYS68K/CPU-20", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu21ssbc, fccpu20sbc, 0, cpu21s, cpu20, cpu20_state, cpu21s, "Force Computers GmbH", "SYS68K/CPU-21S", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu21sbc, fccpu20sbc, 0, cpu21, cpu20, cpu20_state, cpu21, "Force Computers GmbH", "SYS68K/CPU-21", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu21asbc, fccpu20sbc, 0, cpu21a, cpu20, cpu20_state, cpu21a, "Force Computers GmbH", "SYS68K/CPU-21A", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu21yasbc, fccpu20sbc, 0, cpu21ya, cpu20, cpu20_state, cpu21ya, "Force Computers GmbH", "SYS68K/CPU-21YA", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu21bsbc, fccpu20sbc, 0, cpu21b, cpu20, cpu20_state, cpu21b, "Force Computers GmbH", "SYS68K/CPU-21B", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1986, fccpu21ybsbc, fccpu20sbc, 0, cpu21yb, cpu20, cpu20_state, cpu21yb, "Force Computers GmbH", "SYS68K/CPU-21YB", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
diff --git a/src/mame/drivers/fccpu30.cpp b/src/mame/drivers/fccpu30.cpp
index 8f9138af502..abd99b262c0 100644
--- a/src/mame/drivers/fccpu30.cpp
+++ b/src/mame/drivers/fccpu30.cpp
@@ -643,7 +643,7 @@ SLOT_INTERFACE_END
/*
* Machine configuration
*/
-static MACHINE_CONFIG_START (cpu30, cpu30_state)
+static MACHINE_CONFIG_START (cpu30)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68030, XTAL_25MHz)
MCFG_CPU_PROGRAM_MAP (cpu30_mem)
@@ -883,7 +883,7 @@ ROM_END
/*
* System ROM information
*
- * FGA-002 Bootprom version 3.1 is released May 28, 1990, coprighted by FORCE Computers Gmbh
+ * FGA-002 Bootprom version 3.1 is released May 28, 1990, coprighted by FORCE Computers GmbH
*
* Bootprom PIT setup sequence - To start VMEPROM, the rotary switches must both be set to 'F' (PI/T #1 port A)
* --------------------------------------------------------------------------------------------------------------
@@ -1021,30 +1021,30 @@ void fga002_device::check_interrupts()()
*/
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1988, fccpu30, 0, 0, cpu30, cpu30, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-30", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1988, fccpu30x, fccpu30, 0, cpu30x, cpu30, cpu30_state, cpu30x, "Force Computers Gmbh", "SYS68K/CPU-30X", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1988, fccpu30xa, fccpu30, 0, cpu30xa, cpu30, cpu30_state, cpu30xa, "Force Computers Gmbh", "SYS68K/CPU-30XA", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1988, fccpu30za, fccpu30, 0, cpu30za, cpu30, cpu30_state, cpu30za, "Force Computers Gmbh", "SYS68K/CPU-30ZA", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1996, fccpu30zbe, fccpu30, 0, cpu30zbe, cpu30, cpu30_state, cpu30zbe, "Force Computers Gmbh", "SYS68K/CPU-30ZBE", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1996, fccpu30be8, fccpu30, 0, cpu30be8, cpu30, cpu30_state, cpu30be8, "Force Computers Gmbh", "SYS68K/CPU-30BE/8", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1996, fccpu30be16, fccpu30, 0, cpu30be16, cpu30, cpu30_state, cpu30be16, "Force Computers Gmbh", "SYS68K/CPU-30BE/16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1996, fccpu30lite4, fccpu30, 0, cpu30lite4, cpu30, cpu30_state, cpu30lite4, "Force Computers Gmbh", "SYS68K/CPU-30Lite/4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (1996, fccpu30lite8, fccpu30, 0, cpu30lite8, cpu30, cpu30_state, cpu30lite8, "Force Computers Gmbh", "SYS68K/CPU-30Lite/8", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-COMP (199?, fccpu33, fccpu30, 0, cpu33, cpu30, cpu30_state, cpu33, "Force Computers Gmbh", "SYS68K/CPU-33", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP (1988, fccpu30, 0, 0, cpu30, cpu30, cpu30_state, 0, "Force Computers GmbH", "SYS68K/CPU-30", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1988, fccpu30x, fccpu30, 0, cpu30x, cpu30, cpu30_state, cpu30x, "Force Computers GmbH", "SYS68K/CPU-30X", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1988, fccpu30xa, fccpu30, 0, cpu30xa, cpu30, cpu30_state, cpu30xa, "Force Computers GmbH", "SYS68K/CPU-30XA", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1988, fccpu30za, fccpu30, 0, cpu30za, cpu30, cpu30_state, cpu30za, "Force Computers GmbH", "SYS68K/CPU-30ZA", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1996, fccpu30zbe, fccpu30, 0, cpu30zbe, cpu30, cpu30_state, cpu30zbe, "Force Computers GmbH", "SYS68K/CPU-30ZBE", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1996, fccpu30be8, fccpu30, 0, cpu30be8, cpu30, cpu30_state, cpu30be8, "Force Computers GmbH", "SYS68K/CPU-30BE/8", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1996, fccpu30be16, fccpu30, 0, cpu30be16, cpu30, cpu30_state, cpu30be16, "Force Computers GmbH", "SYS68K/CPU-30BE/16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1996, fccpu30lite4, fccpu30, 0, cpu30lite4, cpu30, cpu30_state, cpu30lite4, "Force Computers GmbH", "SYS68K/CPU-30Lite/4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1996, fccpu30lite8, fccpu30, 0, cpu30lite8, cpu30, cpu30_state, cpu30lite8, "Force Computers GmbH", "SYS68K/CPU-30Lite/8", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (199?, fccpu33, fccpu30, 0, cpu33, cpu30, cpu30_state, cpu33, "Force Computers GmbH", "SYS68K/CPU-33", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
/* Below are not fully configured variants defaulting to generic cpu30 */
/* The following boards were manufactured for Ericsson to be used in their fixed network switches. They support hot swap and the Ericsson APNbus */
/* SYS68K/CPU-30SEN-R/32 assumed as generic until spec is found. 25 MHz 68030 based CPU board with DMAC, 32 MByte Shared RAM capacity and VMEPROM.
4 MByte System Flash memory, SCSI via on-board EAGLE Controller FC68165 with DMA, 2 serial I/O ports, APNbus interface, VMEPROM firmware */
-COMP (1997, fccpu30senr, 0, 0, cpu30, cpu30, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-30SEN-R", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1997, fccpu30senr, 0, 0, cpu30, cpu30, cpu30_state, 0, "Force Computers GmbH", "SYS68K/CPU-30SEN-R", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
/* SYS68K/CPU-30SEN-R-501/4 assumed as generic until spec is found. 25 MHz 68030 based CPU board with DMAC, 4 MByte Shared RAM capacity and VMEPROM.
48V DC/DC onboard, metric backplane connectors, BYB501 PCB formfactor (TVJ807). 4 MByte System Flash memory, SCSI via onboard EAGLEController
FC68165 with DMA, 2 serial I/O ports, APNbus interface, VMEPROM firmware*/
-COMP (1997, fccpu30senr501, 0, 0, cpu30, cpu30, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-30SEN-R-501", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+COMP (1997, fccpu30senr501, 0, 0, cpu30, cpu30, cpu30_state, 0, "Force Computers GmbH", "SYS68K/CPU-30SEN-R-501", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
/*CPU-33XB MC68030 25MHz CPU, 68882 FPC, 1MB, 2 SERIAL, RS-232, VME BOARD*/
-//COMP (1990, cpu33xb, 0, 0, cpu30, cpu30, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-33XB", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+//COMP (1990, cpu33xb, 0, 0, cpu30, cpu30, cpu30_state, 0, "Force Computers GmbH", "SYS68K/CPU-33XB", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
/*CPU-33B/4 MC68030 25MHz CPU, 68882 FPC, 1MB, 2 SERIAL, RS-232, VME BOARD*/
-//COMP (1990, cpu30b4, 0, 0, cpu30, cpu30, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-33B/4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+//COMP (1990, cpu30b4, 0, 0, cpu30, cpu30, cpu30_state, 0, "Force Computers GmbH", "SYS68K/CPU-33B/4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp
index d0b76df12cd..c39e71b8380 100644
--- a/src/mame/drivers/fcombat.cpp
+++ b/src/mame/drivers/fcombat.cpp
@@ -286,7 +286,7 @@ void fcombat_state::machine_reset()
m_ty = 0;
}
-static MACHINE_CONFIG_START( fcombat, fcombat_state )
+static MACHINE_CONFIG_START( fcombat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 10000000/3)
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 37e8f9d0410..9b6b1545431 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -1559,7 +1559,7 @@ MACHINE_RESET_MEMBER(cps_state,fcrash)
m_sample_select2 = 0;
}
-static MACHINE_CONFIG_START( fcrash, cps_state )
+static MACHINE_CONFIG_START( fcrash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -1606,12 +1606,12 @@ static MACHINE_CONFIG_START( fcrash, cps_state )
MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1623,7 +1623,7 @@ static MACHINE_CONFIG_DERIVED( cawingbl, fcrash )
MCFG_MACHINE_START_OVERRIDE(cps_state, cawingbl)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kodb, cps_state )
+static MACHINE_CONFIG_START( kodb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -1661,11 +1661,11 @@ static MACHINE_CONFIG_START( kodb, cps_state )
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sf2mdt, cps_state )
+static MACHINE_CONFIG_START( sf2mdt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1705,12 +1705,12 @@ static MACHINE_CONFIG_START( sf2mdt, cps_state )
/* has 2x MSM5205 instead of OKI6295 */
MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -1719,7 +1719,7 @@ static MACHINE_CONFIG_DERIVED( sf2b, sf2mdt)
MCFG_CPU_PROGRAM_MAP(sf2b_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( knightsb, cps_state )
+static MACHINE_CONFIG_START( knightsb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 24000000 / 2)
@@ -1759,12 +1759,12 @@ static MACHINE_CONFIG_START( knightsb, cps_state )
/* has 2x MSM5205 instead of OKI6295 */
MCFG_SOUND_ADD("msm1", MSM5205, 24000000/64) /* ? */
MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("msm2", MSM5205, 24000000/64) /* ? */
MCFG_MSM5205_VCLK_CB(WRITELINE(cps_state, m5205_int2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -2101,7 +2101,7 @@ MACHINE_START_MEMBER(cps_state, dinopic)
m_sprite_x_offset = 0;
}
-static MACHINE_CONFIG_START( dinopic, cps_state )
+static MACHINE_CONFIG_START( dinopic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -2135,7 +2135,7 @@ static MACHINE_CONFIG_START( dinopic, cps_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2261,7 +2261,7 @@ DRIVER_INIT_MEMBER(cps_state, dinopic)
// sound cpu is (239 V 249521 VC5006 KABUKI DL-030P-110V) - recycled Kabuki Z80 from genuine Capcom HW?
// 3x8 dsws
-static MACHINE_CONFIG_START( sgyxz, cps_state )
+static MACHINE_CONFIG_START( sgyxz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(sgyxz_map)
@@ -2299,7 +2299,7 @@ static MACHINE_CONFIG_START( sgyxz, cps_state )
MCFG_SOUND_ROUTE(1, "mono", 0.35)
/* CPS PPU is fed by a 16mhz clock,pin 117 outputs a 4mhz clock which is divided by 4 using 2 74ls74 */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH) // pin 7 can be changed by the game code, see f006 on z80
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2354,7 +2354,7 @@ MACHINE_START_MEMBER(cps_state, punipic)
m_sprite_x_offset = 0;
}
-static MACHINE_CONFIG_START( punipic, cps_state )
+static MACHINE_CONFIG_START( punipic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -2388,7 +2388,7 @@ static MACHINE_CONFIG_START( punipic, cps_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2549,7 +2549,7 @@ DRIVER_INIT_MEMBER(cps_state, punipic3)
// ************************************************************************* SF2M1
-static MACHINE_CONFIG_START( sf2m1, cps_state )
+static MACHINE_CONFIG_START( sf2m1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz )
@@ -2580,7 +2580,7 @@ static MACHINE_CONFIG_START( sf2m1, cps_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2882,7 +2882,7 @@ MACHINE_START_MEMBER(cps_state, slampic)
m_sprite_x_offset = 0;
}
-static MACHINE_CONFIG_START( slampic, cps_state )
+static MACHINE_CONFIG_START( slampic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -2914,7 +2914,7 @@ static MACHINE_CONFIG_START( slampic, cps_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -2983,7 +2983,7 @@ static ADDRESS_MAP_START( varthb_map, AS_PROGRAM, 16, cps_state )
AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("mainram")
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( varthb, cps_state )
+static MACHINE_CONFIG_START( varthb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -3021,7 +3021,7 @@ static MACHINE_CONFIG_START( varthb, cps_state )
MCFG_SOUND_ROUTE(0, "mono", 0.35)
MCFG_SOUND_ROUTE(1, "mono", 0.35)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp
index 7a343c7aae1..b7a98d826c8 100644
--- a/src/mame/drivers/feversoc.cpp
+++ b/src/mame/drivers/feversoc.cpp
@@ -273,7 +273,7 @@ WRITE16_MEMBER(feversoc_state::feversoc_irq_ack)
m_maincpu->set_input_line(8, CLEAR_LINE);
}
-static MACHINE_CONFIG_START( feversoc, feversoc_state )
+static MACHINE_CONFIG_START( feversoc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",SH2,MASTER_CLOCK)
@@ -296,7 +296,7 @@ static MACHINE_CONFIG_START( feversoc, feversoc_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/16, OKIM6295_PIN7_LOW) //pin 7 & frequency not verified (clock should be 28,6363 / n)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/16, PIN7_LOW) //pin 7 & frequency not verified (clock should be 28,6363 / n)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6)
MCFG_EEPROM_SERIAL_93C56_ADD("eeprom")
diff --git a/src/mame/drivers/fgoal.cpp b/src/mame/drivers/fgoal.cpp
index 282dfc6746d..6545b82484b 100644
--- a/src/mame/drivers/fgoal.cpp
+++ b/src/mame/drivers/fgoal.cpp
@@ -364,7 +364,7 @@ void fgoal_state::machine_reset()
m_prev_coin = 0;
}
-static MACHINE_CONFIG_START( fgoal, fgoal_state )
+static MACHINE_CONFIG_START( fgoal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 10065000 / 10) /* ? */
@@ -437,5 +437,5 @@ ROM_START( fgoala )
ROM_END
-GAME( 1979, fgoal, 0, fgoal, fgoal, driver_device, 0, ROT90, "Taito", "Field Goal (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, fgoala, fgoal, fgoal, fgoal, driver_device, 0, ROT90, "Taito", "Field Goal (set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, fgoal, 0, fgoal, fgoal, fgoal_state, 0, ROT90, "Taito", "Field Goal (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, fgoala, fgoal, fgoal, fgoal, fgoal_state, 0, ROT90, "Taito", "Field Goal (set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index 691e397edb6..3e6f9951685 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -1440,7 +1440,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( rsc, fidel6502_state )
+static MACHINE_CONFIG_START( rsc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1800000) // measured approx 1.81MHz
@@ -1468,7 +1468,7 @@ static MACHINE_CONFIG_START( rsc, fidel6502_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( csc, fidel6502_state )
+static MACHINE_CONFIG_START( csc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_3_9MHz/2) // from 3.9MHz resonator
@@ -1513,7 +1513,7 @@ static MACHINE_CONFIG_DERIVED( su9, csc )
MCFG_DEFAULT_LAYOUT(layout_fidel_su9)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( eas, fidel6502_state )
+static MACHINE_CONFIG_START( eas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R65C02, XTAL_3MHz)
@@ -1557,7 +1557,7 @@ static MACHINE_CONFIG_DERIVED( eag, eas )
MCFG_DEFAULT_LAYOUT(layout_fidel_eag)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sc9, fidel6502_state )
+static MACHINE_CONFIG_START( sc9 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1400000) // from ceramic resonator "681 JSA", measured
@@ -1598,7 +1598,7 @@ static MACHINE_CONFIG_DERIVED( playmatic, sc9 )
MCFG_DEFAULT_LAYOUT(layout_fidel_playmatic)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sc12, fidel6502_state )
+static MACHINE_CONFIG_START( sc12 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R65C02, XTAL_4MHz)
@@ -1623,7 +1623,7 @@ static MACHINE_CONFIG_START( sc12, fidel6502_state )
MCFG_SOFTWARE_LIST_ADD("cart_list", "fidel_scc")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fexcel, fidel6502_state )
+static MACHINE_CONFIG_START( fexcel )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65SC02, XTAL_12MHz/4) // G65SC102P-3, 12.0M ceramic resonator
@@ -1707,7 +1707,7 @@ static MACHINE_CONFIG_DERIVED( fexceld, fexcelb )
MCFG_DEFAULT_LAYOUT(layout_fidel_exd)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fdes2100d, fidel6502_state )
+static MACHINE_CONFIG_START( fdes2100d )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, XTAL_6MHz) // W65C02P-6
@@ -1733,7 +1733,7 @@ static MACHINE_CONFIG_DERIVED( fdes2000d, fdes2100d )
MCFG_CPU_PROGRAM_MAP(fdesdis_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fphantom, fidel6502_state )
+static MACHINE_CONFIG_START( fphantom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R65C02, XTAL_4_9152MHz) // R65C02P4
@@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_START( fphantom, fidel6502_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( chesster, fidel6502_state )
+static MACHINE_CONFIG_START( chesster )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R65C02, XTAL_5MHz) // RP65C02G
@@ -2203,54 +2203,54 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT, COMPANY, FULLNAME, FLAGS */
-CONS( 1981, reversic, 0, 0, rsc, rsc, driver_device, 0, "Fidelity Electronics", "Reversi Sensory Challenger (green version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1981, csc, 0, 0, csc, csc, driver_device, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1981, cscsp, csc, 0, csc, cscg, driver_device, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1981, cscg, csc, 0, csc, cscg, driver_device, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1981, cscfr, csc, 0, csc, cscg, driver_device, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1983, super9cc, 0, 0, su9, su9, driver_device, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, super9ccsp, super9cc, 0, su9, su9g, driver_device, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, super9ccg, super9cc, 0, su9, su9g, driver_device, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, super9ccfr, super9cc, 0, su9, su9g, driver_device, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1983, feasbu, 0, 0, eas, eas, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, feasbusp, feasbu, 0, eas, easg, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, feasbug, feasbu, 0, eas, easg, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, feasbufr, feasbu, 0, eas, easg, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1984, feasgla, feasbu, 0, eas, eas, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1984, feasglasp, feasbu, 0, eas, easg, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1984, feasglag, feasbu, 0, eas, easg, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1984, feasglafr, feasbu, 0, eas, easg, driver_device, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1986, feag2100, 0, 0, eag, eag, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1986, feag2100sp, feag2100, 0, eag, eagg, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1986, feag2100g, feag2100, 0, eag, eagg, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1986, feag2100fr, feag2100, 0, eag, eagg, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1982, fscc9, 0, 0, sc9, sc12, driver_device, 0, "Fidelity Electronics", "Sensory Chess Challenger 9", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1982, fscc9b, fscc9, 0, sc9b, sc12, driver_device, 0, "Fidelity Electronics", "Sensory Chess Challenger 9 (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1983, fscc9ps, fscc9, 0, playmatic, playmatic, driver_device, 0, "Fidelity Electronics", "Sensory 9 Playmatic 'S'", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // Fidelity West Germany
-
-CONS( 1984, fscc12, 0, 0, sc12, sc12, driver_device, 0, "Fidelity Electronics", "Sensory Chess Challenger 12-B", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1987, fexcel, 0, 0, fexcelb, fexcelb, driver_device, 0, "Fidelity Electronics", "The Excellence (model 6080B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, fexcelv, fexcel, 0, fexcelv, fexcelv, driver_device, 0, "Fidelity Electronics", "Voice Excellence", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, fexceld, fexcel, 0, fexceld, fexcelb, driver_device, 0, "Fidelity Electronics", "Excel Display", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1985, fexcel12, fexcel, 0, fexcel, fexcel, driver_device, 0, "Fidelity Electronics", "The Excellence (model EP12, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 1st version of The Excellence
-CONS( 1985, fexcel124, fexcel, 0, fexcel4, fexcel, driver_device, 0, "Fidelity Electronics", "The Excellence (model EP12, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1985, fexcela, fexcel, 0, fexcel, fexcel, driver_device, 0, "Fidelity Electronics", "The Excellence (model 6080)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
-CONS( 1986, fexcelp, 0, 0, fexcelp, fexcel, driver_device, 0, "Fidelity Electronics", "The Par Excellence", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1986, fexcelpb, fexcelp, 0, fexcelp, fexcel, driver_device, 0, "Fidelity Electronics", "The Par Excellence (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1986, granits, fexcelp, 0, granits, fexcel, driver_device, 0, "hack (RCS)", "Granit 'S'", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1988, fdes2000, fexcelp, 0, fdes2000, fdes, driver_device, 0, "Fidelity Electronics", "Designer 2000", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // Excellence series hardware
-CONS( 1988, fdes2100, fexcelp, 0, fdes2100, fdes, driver_device, 0, "Fidelity Electronics", "Designer 2100", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // "
-
-CONS( 1988, fdes2100d, 0, 0, fdes2100d, fdesdis, fidel6502_state, fdesdis, "Fidelity Electronics", "Designer 2100 Display (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1988, fdes2000d, fdes2100d,0, fdes2000d, fdesdis, fidel6502_state, fdesdis, "Fidelity Electronics", "Designer 2000 Display", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS */
+CONS( 1981, reversic, 0, 0, rsc, rsc, fidel6502_state, 0, "Fidelity Electronics", "Reversi Sensory Challenger (green version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1981, csc, 0, 0, csc, csc, fidel6502_state, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1981, cscsp, csc, 0, csc, cscg, fidel6502_state, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1981, cscg, csc, 0, csc, cscg, fidel6502_state, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1981, cscfr, csc, 0, csc, cscg, fidel6502_state, 0, "Fidelity Electronics", "Champion Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1983, super9cc, 0, 0, su9, su9, fidel6502_state, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, super9ccsp, super9cc, 0, su9, su9g, fidel6502_state, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, super9ccg, super9cc, 0, su9, su9g, fidel6502_state, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, super9ccfr, super9cc, 0, su9, su9g, fidel6502_state, 0, "Fidelity Electronics", "Super 9 Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1983, feasbu, 0, 0, eas, eas, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, feasbusp, feasbu, 0, eas, easg, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, feasbug, feasbu, 0, eas, easg, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, feasbufr, feasbu, 0, eas, easg, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Budapest program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1984, feasgla, feasbu, 0, eas, eas, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1984, feasglasp, feasbu, 0, eas, easg, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1984, feasglag, feasbu, 0, eas, easg, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1984, feasglafr, feasbu, 0, eas, easg, fidel6502_state, 0, "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1986, feag2100, 0, 0, eag, eag, fidel6502_state, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1986, feag2100sp, feag2100, 0, eag, eagg, fidel6502_state, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1986, feag2100g, feag2100, 0, eag, eagg, fidel6502_state, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1986, feag2100fr, feag2100, 0, eag, eagg, fidel6502_state, 0, "Fidelity Electronics", "Elite Avant Garde 2100 (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1982, fscc9, 0, 0, sc9, sc12, fidel6502_state, 0, "Fidelity Electronics", "Sensory Chess Challenger 9", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1982, fscc9b, fscc9, 0, sc9b, sc12, fidel6502_state, 0, "Fidelity Electronics", "Sensory Chess Challenger 9 (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1983, fscc9ps, fscc9, 0, playmatic, playmatic, fidel6502_state, 0, "Fidelity Electronics", "Sensory 9 Playmatic 'S'", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // Fidelity West Germany
+
+CONS( 1984, fscc12, 0, 0, sc12, sc12, fidel6502_state, 0, "Fidelity Electronics", "Sensory Chess Challenger 12-B", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1987, fexcel, 0, 0, fexcelb, fexcelb, fidel6502_state, 0, "Fidelity Electronics", "The Excellence (model 6080B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, fexcelv, fexcel, 0, fexcelv, fexcelv, fidel6502_state, 0, "Fidelity Electronics", "Voice Excellence", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, fexceld, fexcel, 0, fexceld, fexcelb, fidel6502_state, 0, "Fidelity Electronics", "Excel Display", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1985, fexcel12, fexcel, 0, fexcel, fexcel, fidel6502_state, 0, "Fidelity Electronics", "The Excellence (model EP12, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 1st version of The Excellence
+CONS( 1985, fexcel124, fexcel, 0, fexcel4, fexcel, fidel6502_state, 0, "Fidelity Electronics", "The Excellence (model EP12, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1985, fexcela, fexcel, 0, fexcel, fexcel, fidel6502_state, 0, "Fidelity Electronics", "The Excellence (model 6080)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1986, fexcelp, 0, 0, fexcelp, fexcel, fidel6502_state, 0, "Fidelity Electronics", "The Par Excellence", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1986, fexcelpb, fexcelp, 0, fexcelp, fexcel, fidel6502_state, 0, "Fidelity Electronics", "The Par Excellence (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1986, granits, fexcelp, 0, granits, fexcel, fidel6502_state, 0, "hack (RCS)", "Granit 'S'", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1988, fdes2000, fexcelp, 0, fdes2000, fdes, fidel6502_state, 0, "Fidelity Electronics", "Designer 2000", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // Excellence series hardware
+CONS( 1988, fdes2100, fexcelp, 0, fdes2100, fdes, fidel6502_state, 0, "Fidelity Electronics", "Designer 2100", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // "
+
+CONS( 1988, fdes2100d, 0, 0, fdes2100d, fdesdis, fidel6502_state, fdesdis, "Fidelity Electronics", "Designer 2100 Display (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1988, fdes2000d, fdes2100d,0, fdes2000d, fdesdis, fidel6502_state, fdesdis, "Fidelity Electronics", "Designer 2000 Display", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
CONS( 1988, fphantom, 0, 0, fphantom, fphantom, fidel6502_state, fphantom, "Fidelity Electronics", "Phantom (Fidelity)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index 552c232fa4e..1d60d35c240 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -389,7 +389,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( fexcel68k, fidel68k_state )
+static MACHINE_CONFIG_START( fexcel68k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) // HD68HC000P12
@@ -408,7 +408,7 @@ static MACHINE_CONFIG_START( fexcel68k, fidel68k_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( eag, fidel68k_state )
+static MACHINE_CONFIG_START( eag )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -526,12 +526,12 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1987, fexcel68k, 0, 0, fexcel68k, fexcel68k, driver_device, 0, "Fidelity Electronics", "Excel 68000", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME, FLAGS */
+CONS( 1987, fexcel68k, 0, 0, fexcel68k, fexcel68k, fidel68k_state, 0, "Fidelity Electronics", "Excel 68000", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1989, feagv2, 0, 0, eag, eag, fidel68k_state, eag, "Fidelity Electronics", "Elite Avant Garde (model 6114-2/3/4, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1989, feagv2a, feagv2, 0, eag, eag, fidel68k_state, eag, "Fidelity Electronics", "Elite Avant Garde (model 6114-2/3/4, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, feagv7, feagv2, 0, eagv7, eag, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde (model 6117-7)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, feagv9, feagv2, 0, eagv9, eag, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde (model 6117-9)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, feagv10, feagv2, 0, eagv10, eag, driver_device, 0, "Fidelity Electronics", "Elite Avant Garde (model 6117-10)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 2002, feagv11, feagv2, 0, eagv11, eag, driver_device, 0, "hack (Wilfried Bucke)", "Elite Avant Garde (model 6117-11)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, feagv2, 0, 0, eag, eag, fidel68k_state, eag, "Fidelity Electronics", "Elite Avant Garde (model 6114-2/3/4, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, feagv2a, feagv2, 0, eag, eag, fidel68k_state, eag, "Fidelity Electronics", "Elite Avant Garde (model 6114-2/3/4, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, feagv7, feagv2, 0, eagv7, eag, fidel68k_state, 0, "Fidelity Electronics", "Elite Avant Garde (model 6117-7)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, feagv9, feagv2, 0, eagv9, eag, fidel68k_state, 0, "Fidelity Electronics", "Elite Avant Garde (model 6117-9)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, feagv10, feagv2, 0, eagv10, eag, fidel68k_state, 0, "Fidelity Electronics", "Elite Avant Garde (model 6117-10)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 2002, feagv11, feagv2, 0, eagv11, eag, fidel68k_state, 0, "hack (Wilfried Bucke)", "Elite Avant Garde (model 6117-11)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp
index 64491ae1750..f38bec54bdf 100644
--- a/src/mame/drivers/fidelmcs48.cpp
+++ b/src/mame/drivers/fidelmcs48.cpp
@@ -144,7 +144,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( sc6, fidelmcs48_state )
+static MACHINE_CONFIG_START( sc6 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8040, XTAL_11MHz)
@@ -182,5 +182,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1982, fscc6, 0, 0, sc6, sc6, driver_device, 0, "Fidelity", "Sensory Chess Challenger 6", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1982, fscc6, 0, 0, sc6, sc6, fidelmcs48_state, 0, "Fidelity", "Sensory Chess Challenger 6", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 41d2180e40f..43e67f58071 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -1654,7 +1654,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( bcc, fidelz80_state )
+static MACHINE_CONFIG_START( bcc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
@@ -1671,7 +1671,7 @@ static MACHINE_CONFIG_START( bcc, fidelz80_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( scc, fidelz80_state )
+static MACHINE_CONFIG_START( scc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz)
@@ -1688,7 +1688,7 @@ static MACHINE_CONFIG_START( scc, fidelz80_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cc10, fidelz80_state )
+static MACHINE_CONFIG_START( cc10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
@@ -1712,7 +1712,7 @@ static MACHINE_CONFIG_START( cc10, fidelz80_state )
MCFG_TIMER_DRIVER_ADD("beeper_off", fidelz80_state, beeper_off_callback)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vcc, fidelz80_state )
+static MACHINE_CONFIG_START( vcc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
@@ -1738,7 +1738,7 @@ static MACHINE_CONFIG_START( vcc, fidelz80_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vsc, fidelz80_state )
+static MACHINE_CONFIG_START( vsc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) // 3.9MHz resonator
@@ -1766,7 +1766,7 @@ static MACHINE_CONFIG_START( vsc, fidelz80_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vbrc, fidelz80_state )
+static MACHINE_CONFIG_START( vbrc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2)
@@ -1794,7 +1794,7 @@ static MACHINE_CONFIG_START( vbrc, fidelz80_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dsc, fidelz80_state )
+static MACHINE_CONFIG_START( dsc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_9MHz) // 3.9MHz resonator
@@ -1999,28 +1999,28 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1978, cc10, 0, 0, cc10, cc10, driver_device, 0, "Fidelity Electronics", "Chess Challenger 10 (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, cc7, 0, 0, bcc, bcc, driver_device, 0, "Fidelity Electronics", "Chess Challenger 7 (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME, FLAGS */
+CONS( 1978, cc10, 0, 0, cc10, cc10, fidelz80_state, 0, "Fidelity Electronics", "Chess Challenger 10 (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, cc7, 0, 0, bcc, bcc, fidelz80_state, 0, "Fidelity Electronics", "Chess Challenger 7 (rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, fscc8, 0, 0, scc, scc, driver_device, 0, "Fidelity Electronics", "Sensory Chess Challenger 8", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, fscc8, 0, 0, scc, scc, fidelz80_state, 0, "Fidelity Electronics", "Sensory Chess Challenger 8", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, vcc, 0, 0, vcc, vcc, driver_device, 0, "Fidelity Electronics", "Voice Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, vccsp, vcc, 0, vcc, vccsp, driver_device, 0, "Fidelity Electronics", "Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, vccg, vcc, 0, vcc, vccg, driver_device, 0, "Fidelity Electronics", "Voice Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, vccfr, vcc, 0, vcc, vccfr, driver_device, 0, "Fidelity Electronics", "Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, vcc, 0, 0, vcc, vcc, fidelz80_state, 0, "Fidelity Electronics", "Voice Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, vccsp, vcc, 0, vcc, vccsp, fidelz80_state, 0, "Fidelity Electronics", "Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, vccg, vcc, 0, vcc, vccg, fidelz80_state, 0, "Fidelity Electronics", "Voice Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, vccfr, vcc, 0, vcc, vccfr, fidelz80_state, 0, "Fidelity Electronics", "Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, uvc, vcc, 0, vcc, vcc, driver_device, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, uvcsp, vcc, 0, vcc, vccsp, driver_device, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, uvcg, vcc, 0, vcc, vccg, driver_device, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, uvcfr, vcc, 0, vcc, vccfr, driver_device, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, uvc, vcc, 0, vcc, vcc, fidelz80_state, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, uvcsp, vcc, 0, vcc, vccsp, fidelz80_state, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, uvcg, vcc, 0, vcc, vccg, fidelz80_state, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, uvcfr, vcc, 0, vcc, vccfr, fidelz80_state, 0, "Fidelity Electronics", "Advanced Voice Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, vsc, 0, 0, vsc, vsc, driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, vscsp, vsc, 0, vsc, vscg, driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, vscg, vsc, 0, vsc, vscg, driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, vscfr, vsc, 0, vsc, vscg, driver_device, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, vsc, 0, 0, vsc, vsc, fidelz80_state, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, vscsp, vsc, 0, vsc, vscg, fidelz80_state, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (Spanish)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, vscg, vsc, 0, vsc, vscg, fidelz80_state, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, vscfr, vsc, 0, vsc, vscg, fidelz80_state, 0, "Fidelity Electronics", "Voice Sensory Chess Challenger (French)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, vbrc, 0, 0, vbrc, vbrc, driver_device, 0, "Fidelity Electronics", "Voice Bridge Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-CONS( 1980, bridgec3, vbrc, 0, vbrc, vbrc, driver_device, 0, "Fidelity Electronics", "Bridge Challenger III", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1979, vbrc, 0, 0, vbrc, vbrc, fidelz80_state, 0, "Fidelity Electronics", "Voice Bridge Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1980, bridgec3, vbrc, 0, vbrc, vbrc, fidelz80_state, 0, "Fidelity Electronics", "Bridge Challenger III", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-CONS( 1981, damesc, 0, 0, dsc, dsc, driver_device, 0, "Fidelity Electronics", "Dame Sensory Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1981, damesc, 0, 0, dsc, dsc, fidelz80_state, 0, "Fidelity Electronics", "Dame Sensory Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index ffb71f94274..1475eb8c3d8 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -260,7 +260,7 @@ void finalizr_state::machine_reset()
m_irq_enable = 0;
}
-static MACHINE_CONFIG_START( finalizr, finalizr_state )
+static MACHINE_CONFIG_START( finalizr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/6) /* ??? */
@@ -363,5 +363,5 @@ ROM_END
-GAME( 1985, finalizr, 0, finalizr, finalizr, driver_device, 0, ROT90, "Konami", "Finalizer - Super Transformation", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, finalizrb, finalizr, finalizr, finalizrb, driver_device, 0, ROT90, "bootleg", "Finalizer - Super Transformation (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, finalizr, 0, finalizr, finalizr, finalizr_state, 0, ROT90, "Konami", "Finalizer - Super Transformation", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, finalizrb, finalizr, finalizr, finalizrb, finalizr_state, 0, ROT90, "bootleg", "Finalizer - Super Transformation (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp
index f1c6ac2f2c6..f1333b21b5a 100644
--- a/src/mame/drivers/fireball.cpp
+++ b/src/mame/drivers/fireball.cpp
@@ -492,7 +492,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( fireball_state::int_0 )
*************************/
-static MACHINE_CONFIG_START( fireball, fireball_state )
+static MACHINE_CONFIG_START( fireball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8031, CPU_CLK) //
MCFG_CPU_PROGRAM_MAP(fireball_map)
@@ -526,5 +526,5 @@ ROM_END
/*************************
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS*/
-GAME( 1989, fireball, 0, fireball, fireball, driver_device, 0, ROT0, "Valco", "Fireball", MACHINE_MECHANICAL ) //1989 by rom name
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1989, fireball, 0, fireball, fireball, fireball_state, 0, ROT0, "Valco", "Fireball", MACHINE_MECHANICAL ) //1989 by rom name
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index 888d0bc33e6..8b8b1d4275a 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -1278,7 +1278,7 @@ static SLOT_INTERFACE_START(firebeat_ata_devices)
SLOT_INTERFACE("cdrom", ATAPI_FIXED_CDROM)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( firebeat, firebeat_state )
+static MACHINE_CONFIG_START( firebeat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL_64MHz)
@@ -1338,7 +1338,7 @@ static MACHINE_CONFIG_START( firebeat, firebeat_state )
MCFG_INS8250_OUT_INT_CB(DEVWRITELINE(DEVICE_SELF_OWNER, firebeat_state, midi_uart_ch1_irq_callback))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( firebeat2, firebeat_state )
+static MACHINE_CONFIG_START( firebeat2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GCX, XTAL_64MHz)
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index f4c337c75aa..c53c0be9c8f 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -710,7 +710,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( firefox, firefox_state )
+static MACHINE_CONFIG_START( firefox )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809E, MASTER_XTAL/2)
@@ -876,5 +876,5 @@ ROM_END
*
*************************************/
-GAME( 1984, firefox, 0, firefox, firefox, driver_device, 0, ROT0, "Atari", "Fire Fox (set 1)", 0 )
-GAME( 1984, firefoxa, firefox, firefox, firefox, driver_device, 0, ROT0, "Atari", "Fire Fox (set 2)", 0 )
+GAME( 1984, firefox, 0, firefox, firefox, firefox_state, 0, ROT0, "Atari", "Fire Fox (set 1)", 0 )
+GAME( 1984, firefoxa, firefox, firefox, firefox, firefox_state, 0, ROT0, "Atari", "Fire Fox (set 2)", 0 )
diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp
index ddcf4f0850a..a5e87c82127 100644
--- a/src/mame/drivers/firetrap.cpp
+++ b/src/mame/drivers/firetrap.cpp
@@ -626,7 +626,7 @@ void firetrap_state::machine_reset()
m_coin_command_pending = 0;
}
-static MACHINE_CONFIG_START( firetrap, firetrap_state )
+static MACHINE_CONFIG_START( firetrap )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
@@ -662,11 +662,11 @@ static MACHINE_CONFIG_START( firetrap, firetrap_state )
MCFG_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
MCFG_MSM5205_VCLK_CB(WRITELINE(firetrap_state, firetrap_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 7.8125kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 7.8125kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( firetrapbl, firetrap_state )
+static MACHINE_CONFIG_START( firetrapbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, FIRETRAP_XTAL/2) // 6 MHz
@@ -702,7 +702,7 @@ static MACHINE_CONFIG_START( firetrapbl, firetrap_state )
MCFG_SOUND_ADD("msm", MSM5205, FIRETRAP_XTAL/32) // 375 kHz
MCFG_MSM5205_VCLK_CB(WRITELINE(firetrap_state, firetrap_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 7.8125kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 7.8125kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -970,7 +970,7 @@ ROM_END
-GAME( 1986, firetrap, 0, firetrap, firetrap, driver_device, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Fire Trap (US, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapa, firetrap, firetrap, firetrap, driver_device, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Fire Trap (US, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapj, firetrap, firetrap, firetrapj, driver_device, 0, ROT90, "Wood Place Inc.", "Fire Trap (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapbl, firetrap, firetrapbl, firetrapbl, driver_device, 0, ROT90, "bootleg", "Fire Trap (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrap, 0, firetrap, firetrap, firetrap_state, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Fire Trap (US, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapa, firetrap, firetrap, firetrap, firetrap_state, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Fire Trap (US, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapj, firetrap, firetrap, firetrapj, firetrap_state, 0, ROT90, "Wood Place Inc.", "Fire Trap (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapbl, firetrap, firetrapbl, firetrapbl, firetrap_state, 0, ROT90, "bootleg", "Fire Trap (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index a9500e8919e..52936390711 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -855,7 +855,7 @@ static GFXDECODE_START( montecar )
GFXDECODE_END
-static MACHINE_CONFIG_START( firetrk, firetrk_state )
+static MACHINE_CONFIG_START( firetrk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK/12) /* 750Khz during service mode */
@@ -1012,6 +1012,6 @@ ROM_START( montecar )
ROM_END
-GAMEL(1977, superbug, 0, superbug, superbug, driver_device, 0, ROT270, "Atari (Kee Games)", "Super Bug", 0, layout_superbug )
-GAME( 1978, firetrk, 0, firetrk, firetrk, driver_device, 0, ROT270, "Atari", "Fire Truck / Smokey Joe", 0 )
-GAME( 1979, montecar, 0, montecar, montecar, driver_device, 0, ROT270, "Atari", "Monte Carlo", 0 )
+GAMEL(1977, superbug, 0, superbug, superbug, firetrk_state, 0, ROT270, "Atari (Kee Games)", "Super Bug", 0, layout_superbug )
+GAME( 1978, firetrk, 0, firetrk, firetrk, firetrk_state, 0, ROT270, "Atari", "Fire Truck / Smokey Joe", 0 )
+GAME( 1979, montecar, 0, montecar, montecar, firetrk_state, 0, ROT270, "Atari", "Monte Carlo", 0 )
diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp
index da1ddd3e295..541dc8dfb66 100644
--- a/src/mame/drivers/fitfight.cpp
+++ b/src/mame/drivers/fitfight.cpp
@@ -723,7 +723,7 @@ void fitfight_state::machine_reset()
m_fof_700000_data = 0;
}
-static MACHINE_CONFIG_START( fitfight, fitfight_state )
+static MACHINE_CONFIG_START( fitfight )
MCFG_CPU_ADD("maincpu",M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(fitfight_main_map)
@@ -755,11 +755,11 @@ static MACHINE_CONFIG_START( fitfight, fitfight_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
+ MCFG_OKIM6295_ADD("oki", 1333333, PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bbprot, fitfight_state )
+static MACHINE_CONFIG_START( bbprot )
MCFG_CPU_ADD("maincpu",M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(bbprot_main_map)
@@ -782,7 +782,7 @@ static MACHINE_CONFIG_START( bbprot, fitfight_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
+ MCFG_OKIM6295_ADD("oki", 1333333, PIN7_LOW) // ~8080Hz ??? TODO: find out the real frequency
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1021,7 +1021,7 @@ DRIVER_INIT_MEMBER(fitfight_state,hotmindff)
/* GAME */
-GAME( 199?, fitfight, 0, fitfight, fitfight, fitfight_state, fitfight, ROT0, "bootleg", "Fit of Fighting", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, histryma, 0, fitfight, histryma, fitfight_state, histryma, ROT0, "bootleg", "The History of Martial Arts", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, bbprot, 0, bbprot, bbprot, fitfight_state, bbprot, ROT0, "<unknown>", "unknown fighting game 'BB' (prototype)", MACHINE_IS_INCOMPLETE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, hotmindff, hotmind, fitfight, fitfight, fitfight_state, hotmindff, ROT0, "Playmark", "Hot Mind (Fit of Fighting hardware)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // need to fix scroll offsets + inputs
+GAME( 199?, fitfight, 0, fitfight, fitfight, fitfight_state, fitfight, ROT0, "bootleg", "Fit of Fighting", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 199?, histryma, 0, fitfight, histryma, fitfight_state, histryma, ROT0, "bootleg", "The History of Martial Arts", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 199?, bbprot, 0, bbprot, bbprot, fitfight_state, bbprot, ROT0, "<unknown>", "unknown fighting game 'BB' (prototype)", MACHINE_IS_INCOMPLETE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 199?, hotmindff, hotmind, fitfight, fitfight, fitfight_state, hotmindff, ROT0, "Playmark", "Hot Mind (Fit of Fighting hardware)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // need to fix scroll offsets + inputs
diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp
index 61ba3ffdf0f..bb36819802b 100644
--- a/src/mame/drivers/fk1.cpp
+++ b/src/mame/drivers/fk1.cpp
@@ -404,7 +404,7 @@ uint32_t fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
return 0;
}
-static MACHINE_CONFIG_START( fk1, fk1_state )
+static MACHINE_CONFIG_START( fk1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(fk1_mem)
@@ -474,5 +474,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, fk1, 0, 0, fk1, fk1, driver_device, 0, "Statni statek Klicany", "FK-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, fk1, 0, 0, fk1, fk1, fk1_state, 0, "Statni statek Klicany", "FK-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp
index 2d5747ed358..324381adfcf 100644
--- a/src/mame/drivers/flicker.cpp
+++ b/src/mame/drivers/flicker.cpp
@@ -207,7 +207,7 @@ sound to produce. We need to change this to just one pulse per actual sound. */
}
-static MACHINE_CONFIG_START( flicker, flicker_state )
+static MACHINE_CONFIG_START( flicker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I4004, XTAL_5MHz / 8)
MCFG_CPU_PROGRAM_MAP(flicker_rom)
@@ -228,5 +228,5 @@ ROM_START(flicker)
ROM_LOAD("flicker.rom", 0x0000, 0x0400, CRC(c692e586) SHA1(5cabb28a074d18b589b5b8f700c57e1610071c68))
ROM_END
-// YEAR GAME PARENT MACHINE INPUT CLASS INIT ORIENTATION COMPANY DESCRIPTION FLAGS
-GAME(1974, flicker, 0, flicker, flicker, driver_device, 0, ROT0, "Dave Nutting Associates / Bally", "Flicker (prototype)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+// YEAR GAME PARENT MACHINE INPUT CLASS INIT ORIENTATION COMPANY DESCRIPTION FLAGS
+GAME(1974, flicker, 0, flicker, flicker, flicker_state, 0, ROT0, "Dave Nutting Associates / Bally", "Flicker (prototype)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp
index 70bdc3f059f..cbd9408b1d2 100644
--- a/src/mame/drivers/flipjack.cpp
+++ b/src/mame/drivers/flipjack.cpp
@@ -435,7 +435,7 @@ void flipjack_state::machine_start()
}
-static MACHINE_CONFIG_START( flipjack, flipjack_state )
+static MACHINE_CONFIG_START( flipjack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -503,4 +503,4 @@ ROM_START( flipjack )
ROM_END
-GAME( 1983?, flipjack, 0, flipjack, flipjack, driver_device, 0, ROT90, "Jackson Co., Ltd.", "Flipper Jack", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests mid-1983
+GAME( 1983?, flipjack, 0, flipjack, flipjack, flipjack_state, 0, ROT90, "Jackson Co., Ltd.", "Flipper Jack", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests mid-1983
diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp
index 11bfa29b78d..63e527f7241 100644
--- a/src/mame/drivers/flkatck.cpp
+++ b/src/mame/drivers/flkatck.cpp
@@ -207,7 +207,7 @@ void flkatck_state::machine_reset()
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( flkatck, flkatck_state )
+static MACHINE_CONFIG_START( flkatck )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
@@ -310,6 +310,6 @@ ROM_START( flkatcka )
ROM_LOAD( "mask2m.11a", 0x000000, 0x040000, CRC(6d1ea61c) SHA1(9e6eb9ac61838df6e1f74e74bb72f3edf1274aed) )
ROM_END
-GAME( 1987, mx5000, 0, flkatck, flkatck, driver_device, 0, ROT90, "Konami", "MX5000", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, flkatck, mx5000, flkatck, flkatck, driver_device, 0, ROT90, "Konami", "Flak Attack (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, flkatcka,mx5000, flkatck, flkatck, driver_device, 0, ROT90, "Konami", "Flak Attack (Japan, PWB 450593 sub-board)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mx5000, 0, flkatck, flkatck, flkatck_state, 0, ROT90, "Konami", "MX5000", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, flkatck, mx5000, flkatck, flkatck, flkatck_state, 0, ROT90, "Konami", "Flak Attack (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, flkatcka,mx5000, flkatck, flkatck, flkatck_state, 0, ROT90, "Konami", "Flak Attack (Japan, PWB 450593 sub-board)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp
index b98aa2d321b..8e5d9de2f03 100644
--- a/src/mame/drivers/flower.cpp
+++ b/src/mame/drivers/flower.cpp
@@ -367,7 +367,7 @@ static GFXDECODE_START( flower )
GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0, 16 )
GFXDECODE_END
-static MACHINE_CONFIG_START( flower, flower_state )
+static MACHINE_CONFIG_START( flower )
MCFG_CPU_ADD("maincpu",Z80,4000000)
MCFG_CPU_PROGRAM_MAP(shared_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", flower_state, irq0_line_hold)
@@ -474,5 +474,5 @@ ROM_START( flowerj ) /* Sega/Alpha version. Sega game number 834-5998 */
ROM_END
-GAME( 1986, flower, 0, flower, flower, driver_device, 0, ROT0, "Clarue (Komax license)", "Flower (US)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NO_COCKTAIL )
-GAME( 1986, flowerj, flower, flower, flower, driver_device, 0, ROT0, "Clarue (Sega / Alpha Denshi Co. license)", "Flower (Japan)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NO_COCKTAIL )
+GAME( 1986, flower, 0, flower, flower, flower_state, 0, ROT0, "Clarue (Komax license)", "Flower (US)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NO_COCKTAIL )
+GAME( 1986, flowerj, flower, flower, flower, flower_state, 0, ROT0, "Clarue (Sega / Alpha Denshi Co. license)", "Flower (Japan)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NO_COCKTAIL )
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp
index 006bf279c6d..03f67c8eef7 100644
--- a/src/mame/drivers/flstory.cpp
+++ b/src/mame/drivers/flstory.cpp
@@ -1013,7 +1013,7 @@ MACHINE_RESET_MEMBER(flstory_state,flstory)
m_from_mcu = 0;
}
-static MACHINE_CONFIG_START( flstory, flstory_state )
+static MACHINE_CONFIG_START( flstory )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_733MHz/2) /* verified on pcb */
@@ -1075,7 +1075,7 @@ static MACHINE_CONFIG_START( flstory, flstory_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( onna34ro, flstory_state )
+static MACHINE_CONFIG_START( onna34ro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 10733000/2) /* ??? */
@@ -1138,7 +1138,7 @@ static MACHINE_CONFIG_START( onna34ro, flstory_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( victnine, flstory_state )
+static MACHINE_CONFIG_START( victnine )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 8000000/2) /* 4 MHz */
@@ -1207,7 +1207,7 @@ MACHINE_RESET_MEMBER(flstory_state,rumba)
m_mcu_cmd = 0;
}
-static MACHINE_CONFIG_START( rumba, flstory_state )
+static MACHINE_CONFIG_START( rumba )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
@@ -1559,9 +1559,9 @@ ROM_START( rumba )
ROM_END
-GAME( 1985, flstory, 0, flstory, flstory, driver_device, 0, ROT180, "Taito", "The FairyLand Story", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, flstoryj, flstory, flstory, flstory, driver_device, 0, ROT180, "Taito", "The FairyLand Story (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, onna34ro, 0, onna34ro, onna34ro, driver_device, 0, ROT0, "Taito", "Onna Sansirou - Typhoon Gal (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, onna34roa, onna34ro, onna34ro, onna34ro, driver_device, 0, ROT0, "Taito", "Onna Sansirou - Typhoon Gal (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, victnine, 0, victnine, victnine, driver_device, 0, ROT0, "Taito", "Victorious Nine", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, rumba, 0, rumba, rumba, driver_device, 0, ROT270, "Taito", "Rumba Lumber", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1985, flstory, 0, flstory, flstory, flstory_state, 0, ROT180, "Taito", "The FairyLand Story", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, flstoryj, flstory, flstory, flstory, flstory_state, 0, ROT180, "Taito", "The FairyLand Story (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, onna34ro, 0, onna34ro, onna34ro, flstory_state, 0, ROT0, "Taito", "Onna Sansirou - Typhoon Gal (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, onna34roa, onna34ro, onna34ro, onna34ro, flstory_state, 0, ROT0, "Taito", "Onna Sansirou - Typhoon Gal (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, victnine, 0, victnine, victnine, flstory_state, 0, ROT0, "Taito", "Victorious Nine", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, rumba, 0, rumba, rumba, flstory_state, 0, ROT270, "Taito", "Rumba Lumber", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index 08d11615f2d..2947cf7eee8 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -461,7 +461,7 @@ void flyball_state::machine_reset()
}
-static MACHINE_CONFIG_START( flyball, flyball_state )
+static MACHINE_CONFIG_START( flyball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16)
@@ -541,5 +541,5 @@ ROM_END
*
*************************************/
-GAME( 1976, flyball, 0, flyball, flyball, driver_device, 0, 0, "Atari", "Flyball (rev 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1976, flyball1, flyball, flyball, flyball, driver_device, 0, 0, "Atari", "Flyball (rev 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, flyball, 0, flyball, flyball, flyball_state, 0, 0, "Atari", "Flyball (rev 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, flyball1, flyball, flyball, flyball, flyball_state, 0, 0, "Atari", "Flyball (rev 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index 992f904ef03..5cd069931b0 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -2055,7 +2055,7 @@ MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(8) \
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
-static MACHINE_CONFIG_START( fm7, fm7_state )
+static MACHINE_CONFIG_START( fm7 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(fm7_mem)
@@ -2113,7 +2113,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state )
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fm8, fm7_state )
+static MACHINE_CONFIG_START( fm8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1200000) // 1.2MHz 68A09
MCFG_CPU_PROGRAM_MAP(fm8_mem)
@@ -2164,7 +2164,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state )
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fm77av, fm7_state )
+static MACHINE_CONFIG_START( fm77av )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_2MHz) // actually MB68B09E, but the 6809E core runs too slowly
MCFG_CPU_PROGRAM_MAP(fm77av_mem)
@@ -2243,7 +2243,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state )
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fm11, fm7_state )
+static MACHINE_CONFIG_START( fm11 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_2MHz) // 2MHz 68B09E
MCFG_CPU_PROGRAM_MAP(fm11_mem)
@@ -2315,7 +2315,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state )
MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fm16beta, fm7_state )
+static MACHINE_CONFIG_START( fm16beta )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_8MHz) // 8MHz i8086
MCFG_CPU_PROGRAM_MAP(fm16_mem)
@@ -2528,13 +2528,13 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, fm8, 0, 0, fm8, fm8, fm7_state, fm7, "Fujitsu", "FM-8", 0)
-COMP( 1982, fm7, 0, 0, fm7, fm7, fm7_state, fm7, "Fujitsu", "FM-7", 0)
-COMP( 1984, fmnew7, fm7, 0, fm7, fm7, fm7_state, fm7, "Fujitsu", "FM-NEW7", 0)
-COMP( 1985, fm77av, fm7, 0, fm77av, fm7, fm7_state, fm7, "Fujitsu", "FM-77AV", MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1985, fm7740sx, fm7, 0, fm77av, fm7, fm7_state, fm7, "Fujitsu", "FM-77AV40SX", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1981, fm8, 0, 0, fm8, fm8, fm7_state, fm7, "Fujitsu", "FM-8", 0)
+COMP( 1982, fm7, 0, 0, fm7, fm7, fm7_state, fm7, "Fujitsu", "FM-7", 0)
+COMP( 1984, fmnew7, fm7, 0, fm7, fm7, fm7_state, fm7, "Fujitsu", "FM-NEW7", 0)
+COMP( 1985, fm77av, fm7, 0, fm77av, fm7, fm7_state, fm7, "Fujitsu", "FM-77AV", MACHINE_IMPERFECT_GRAPHICS)
+COMP( 1985, fm7740sx, fm7, 0, fm77av, fm7, fm7_state, fm7, "Fujitsu", "FM-77AV40SX", MACHINE_NOT_WORKING)
// These may be separated into a separate driver, depending on how different they are to the FM-8/FM-7
-COMP( 1982, fm11, 0, 0, fm11, fm7, fm7_state, fm7, "Fujitsu", "FM-11 EX", MACHINE_NOT_WORKING)
-COMP( 1982, fm16beta, 0, 0, fm16beta, fm7, fm7_state, fm7, "Fujitsu", "FM-16\xCE\xB2", MACHINE_NOT_WORKING)
+COMP( 1982, fm11, 0, 0, fm11, fm7, fm7_state, fm7, "Fujitsu", "FM-11 EX", MACHINE_NOT_WORKING)
+COMP( 1982, fm16beta, 0, 0, fm16beta, fm7, fm7_state, fm7, "Fujitsu", "FM-16\xCE\xB2", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index bb2f2c7cd44..e798455731d 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -2788,12 +2788,12 @@ static MACHINE_CONFIG_FRAGMENT( towns_base )
MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,16M,32M,64M,96M")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( towns, towns_state )
+static MACHINE_CONFIG_START( towns )
MCFG_FRAGMENT_ADD(towns_base)
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( townsux, towns16_state )
+static MACHINE_CONFIG_START( townsux )
MCFG_FRAGMENT_ADD(towns_base)
MCFG_CPU_REPLACE("maincpu",I386SX, 16000000)
@@ -2846,7 +2846,7 @@ static MACHINE_CONFIG_DERIVED( townsftv, towns )
MCFG_RAM_EXTRA_OPTIONS("32M,68M")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( marty, marty_state )
+static MACHINE_CONFIG_START( marty )
MCFG_FRAGMENT_ADD(towns_base)
MCFG_CPU_REPLACE("maincpu",I386SX, 16000000)
@@ -2985,14 +2985,14 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, fmtowns, 0, 0, towns, towns, driver_device, 0, "Fujitsu", "FM-Towns", MACHINE_NOT_WORKING)
-COMP( 1989, fmtownsa, fmtowns, 0, towns, towns, driver_device, 0, "Fujitsu", "FM-Towns (alternate)", MACHINE_NOT_WORKING)
-COMP( 1991, fmtownsux,fmtowns, 0, townsux, towns, driver_device, 0, "Fujitsu", "FM-Towns II UX", MACHINE_NOT_WORKING)
-COMP( 1992, fmtownshr,fmtowns, 0, townshr, towns, driver_device, 0, "Fujitsu", "FM-Towns II HR", MACHINE_NOT_WORKING)
-COMP( 1993, fmtownsmx,fmtowns, 0, townshr, towns, driver_device, 0, "Fujitsu", "FM-Towns II MX", MACHINE_NOT_WORKING)
-COMP( 1994, fmtownsftv,fmtowns, 0, townsftv, towns, driver_device, 0, "Fujitsu", "FM-Towns II FreshTV", MACHINE_NOT_WORKING)
-COMP( 19??, fmtownssj,fmtowns, 0, townssj, towns, driver_device, 0, "Fujitsu", "FM-Towns II SJ", MACHINE_NOT_WORKING)
-CONS( 1993, fmtmarty, 0, 0, marty, marty, driver_device, 0, "Fujitsu", "FM-Towns Marty", MACHINE_NOT_WORKING)
-CONS( 1993, fmtmarty2,fmtmarty, 0, marty, marty, driver_device, 0, "Fujitsu", "FM-Towns Marty 2", MACHINE_NOT_WORKING)
-CONS( 1994, carmarty, fmtmarty, 0, marty, marty, driver_device, 0, "Fujitsu", "FM-Towns Car Marty", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1989, fmtowns, 0, 0, towns, towns, towns_state, 0, "Fujitsu", "FM-Towns", MACHINE_NOT_WORKING)
+COMP( 1989, fmtownsa, fmtowns, 0, towns, towns, towns_state, 0, "Fujitsu", "FM-Towns (alternate)", MACHINE_NOT_WORKING)
+COMP( 1991, fmtownsux,fmtowns, 0, townsux, towns, towns16_state, 0, "Fujitsu", "FM-Towns II UX", MACHINE_NOT_WORKING)
+COMP( 1992, fmtownshr,fmtowns, 0, townshr, towns, towns_state, 0, "Fujitsu", "FM-Towns II HR", MACHINE_NOT_WORKING)
+COMP( 1993, fmtownsmx,fmtowns, 0, townshr, towns, towns_state, 0, "Fujitsu", "FM-Towns II MX", MACHINE_NOT_WORKING)
+COMP( 1994, fmtownsftv,fmtowns, 0, townsftv, towns, towns_state, 0, "Fujitsu", "FM-Towns II FreshTV", MACHINE_NOT_WORKING)
+COMP( 19??, fmtownssj,fmtowns, 0, townssj, towns, towns_state, 0, "Fujitsu", "FM-Towns II SJ", MACHINE_NOT_WORKING)
+CONS( 1993, fmtmarty, 0, 0, marty, marty, marty_state, 0, "Fujitsu", "FM-Towns Marty", MACHINE_NOT_WORKING)
+CONS( 1993, fmtmarty2,fmtmarty, 0, marty, marty, marty_state, 0, "Fujitsu", "FM-Towns Marty 2", MACHINE_NOT_WORKING)
+CONS( 1994, carmarty, fmtmarty, 0, marty, marty, marty_state, 0, "Fujitsu", "FM-Towns Car Marty", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index 3ad8678a66e..ec09b5f7673 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -335,7 +335,7 @@ READ8_MEMBER(foodf_state::pot_r)
*
*************************************/
-static MACHINE_CONFIG_START( foodf, foodf_state )
+static MACHINE_CONFIG_START( foodf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
@@ -505,7 +505,7 @@ ROM_END
*
*************************************/
-GAME( 1982, foodf, 0, foodf, foodf, driver_device, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, foodf2, foodf, foodf, foodf, driver_device, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, foodf1, foodf, foodf, foodf, driver_device, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, foodfc, foodf, foodf, foodf, driver_device, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (cocktail)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, foodf, 0, foodf, foodf, foodf_state, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, foodf2, foodf, foodf, foodf, foodf_state, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, foodf1, foodf, foodf, foodf, foodf_state, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, foodfc, foodf, foodf, foodf, foodf_state, 0, ROT0, "General Computer Corporation (Atari license)", "Food Fight (cocktail)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/force68k.cpp b/src/mame/drivers/force68k.cpp
index ea32699b052..93aa110cd62 100644
--- a/src/mame/drivers/force68k.cpp
+++ b/src/mame/drivers/force68k.cpp
@@ -429,7 +429,7 @@ SLOT_INTERFACE_END
/*
* Machine configuration
*/
-static MACHINE_CONFIG_START (fccpu1, force68k_state)
+static MACHINE_CONFIG_START (fccpu1)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68000, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP (force68k_mem)
@@ -499,27 +499,27 @@ MACHINE_CONFIG_END
* CPU-6 family is device and adressmap compatible with CPU-1 but with additions
* such as an optional 68881 FPU
*/
-static MACHINE_CONFIG_START (fccpu6, force68k_state)
+static MACHINE_CONFIG_START (fccpu6)
MCFG_CPU_ADD ("maincpu", M68000, XTAL_8MHz) /* Jumper B10 Mode B */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START (fccpu6a, force68k_state)
+static MACHINE_CONFIG_START (fccpu6a)
MCFG_CPU_ADD ("maincpu", M68000, XTAL_12_5MHz) /* Jumper B10 Mode A */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START (fccpu6v, force68k_state)
+static MACHINE_CONFIG_START (fccpu6v)
MCFG_CPU_ADD ("maincpu", M68010, XTAL_8MHz) /* Jumper B10 Mode B */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START (fccpu6va, force68k_state)
+static MACHINE_CONFIG_START (fccpu6va)
MCFG_CPU_ADD ("maincpu", M68010, XTAL_12_5MHz) /* Jumper B10 Mode A */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START (fccpu6vb, force68k_state)
+static MACHINE_CONFIG_START (fccpu6vb)
MCFG_CPU_ADD ("maincpu", M68010, XTAL_12_5MHz) /* Jumper B10 Mode A */
MCFG_CPU_PROGRAM_MAP (force68k_mem)
MACHINE_CONFIG_END
@@ -608,10 +608,10 @@ ROM_END
#endif
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, fccpu1, 0, 0, fccpu1, force68k, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-1", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
-//COMP( 1989, fccpu6, 0, 0, fccpu6, force68k, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-6", MACHINE_IS_SKELETON )
-//COMP( 1989, fccpu6a, 0, 0, fccpu6a, force68k, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-6a", MACHINE_IS_SKELETON )
-//COMP( 1989, fccpu6v, 0, 0, fccpu6v, force68k, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-6v", MACHINE_IS_SKELETON )
-//COMP( 1989, fccpu6va, 0, 0, fccpu6va, force68k, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-6va", MACHINE_IS_SKELETON )
-//COMP( 1989, fccpu6vb, 0, 0, fccpu6vb, force68k, driver_device, 0, "Force Computers Gmbh", "SYS68K/CPU-6vb", MACHINE_IS_SKELETON )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, fccpu1, 0, 0, fccpu1, force68k, force68k_state, 0, "Force Computers GmbH", "SYS68K/CPU-1", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+//COMP( 1989, fccpu6, 0, 0, fccpu6, force68k, force68k_state, 0, "Force Computers GmbH", "SYS68K/CPU-6", MACHINE_IS_SKELETON )
+//COMP( 1989, fccpu6a, 0, 0, fccpu6a, force68k, force68k_state, 0, "Force Computers GmbH", "SYS68K/CPU-6a", MACHINE_IS_SKELETON )
+//COMP( 1989, fccpu6v, 0, 0, fccpu6v, force68k, force68k_state, 0, "Force Computers GmbH", "SYS68K/CPU-6v", MACHINE_IS_SKELETON )
+//COMP( 1989, fccpu6va, 0, 0, fccpu6va, force68k, force68k_state, 0, "Force Computers GmbH", "SYS68K/CPU-6va", MACHINE_IS_SKELETON )
+//COMP( 1989, fccpu6vb, 0, 0, fccpu6vb, force68k, force68k_state, 0, "Force Computers GmbH", "SYS68K/CPU-6vb", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp
index 8968e8b3307..c4292dc3a49 100644
--- a/src/mame/drivers/forte2.cpp
+++ b/src/mame/drivers/forte2.cpp
@@ -117,7 +117,7 @@ void forte2_state::machine_start()
}
-static MACHINE_CONFIG_START( pesadelo, forte2_state )
+static MACHINE_CONFIG_START( pesadelo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index b39d8ad14b7..6302322c6e5 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -672,7 +672,7 @@ void fortecar_state::machine_reset()
* Machine Drivers *
***********************************/
-static MACHINE_CONFIG_START( fortecar, fortecar_state )
+static MACHINE_CONFIG_START( fortecar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz, measured */
MCFG_CPU_PROGRAM_MAP(fortecar_map)
@@ -781,6 +781,6 @@ DRIVER_INIT_MEMBER(fortecar_state, fortecar)
* Game Drivers *
***********************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
GAMEL( 1994, fortecrd, 0, fortecar, fortecar, fortecar_state, fortecar, ROT0, "Fortex Ltd", "Forte Card (Ver 110, Spanish)", 0, layout_fortecrd )
GAMEL( 1994, fortecar, fortecrd, fortecar, fortecar, fortecar_state, fortecar, ROT0, "Fortex Ltd", "Forte Card (Ver 103, English)", MACHINE_NOT_WORKING, layout_fortecrd )
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index 536dd69b5fb..968f0cca55e 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -634,7 +634,7 @@ DRIVER_INIT_MEMBER( fp1100_state, fp1100 )
membank("bankw0")->configure_entry(0, &wram[0x0000]);
}
-static MACHINE_CONFIG_START( fp1100, fp1100_state )
+static MACHINE_CONFIG_START( fp1100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4)
MCFG_CPU_PROGRAM_MAP(fp1100_map)
@@ -699,5 +699,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
COMP( 1983, fp1100, 0, 0, fp1100, fp1100, fp1100_state, fp1100, "Casio", "FP-1100", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp
index 38f228b773f..20c85836f26 100644
--- a/src/mame/drivers/fp200.cpp
+++ b/src/mame/drivers/fp200.cpp
@@ -579,7 +579,7 @@ READ_LINE_MEMBER( fp200_state::sid_r )
return (ioport("KEYMOD")->read() >> m_keyb_mux) & 1;
}
-static MACHINE_CONFIG_START( fp200, fp200_state )
+static MACHINE_CONFIG_START( fp200 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A,MAIN_CLOCK)
@@ -625,4 +625,4 @@ ROM_START( fp200 )
ROM_REGION( 0x800, "chargen", ROMREGION_ERASE00 )
ROM_END
-COMP( 1982, fp200, 0, 0, fp200, fp200, driver_device, 0, "Casio", "FP-200 (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1982, fp200, 0, 0, fp200, fp200, fp200_state, 0, "Casio", "FP-200 (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp
index 200dd9df10f..529bf34ea79 100644
--- a/src/mame/drivers/fp6000.cpp
+++ b/src/mame/drivers/fp6000.cpp
@@ -289,7 +289,7 @@ void fp6000_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( fp6000, fp6000_state )
+static MACHINE_CONFIG_START( fp6000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 16000000/2)
MCFG_CPU_PROGRAM_MAP(fp6000_map)
@@ -327,5 +327,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, fp6000, 0, 0, fp6000, fp6000, driver_device, 0, "Casio", "FP-6000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, fp6000, 0, 0, fp6000, fp6000, fp6000_state, 0, "Casio", "FP-6000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp
index 29781d4212d..e1223c2e3f0 100644
--- a/src/mame/drivers/freekick.cpp
+++ b/src/mame/drivers/freekick.cpp
@@ -708,7 +708,7 @@ MACHINE_RESET_MEMBER(freekick_state,oigas)
m_cnt = 0;
}
-static MACHINE_CONFIG_START( omega, freekick_state )
+static MACHINE_CONFIG_START( omega )
MCFG_CPU_ADD("maincpu", MC8123, XTAL_18_432MHz/6) // unknown divisor
MCFG_CPU_PROGRAM_MAP(omega_map)
MCFG_CPU_IO_MAP(omega_io_map)
@@ -741,7 +741,7 @@ static MACHINE_CONFIG_START( omega, freekick_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( base, freekick_state )
+static MACHINE_CONFIG_START( base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4)
@@ -1391,20 +1391,20 @@ DRIVER_INIT_MEMBER(freekick_state,gigas)
* Game driver(s)
*
*************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1986, gigas, 0, gigasm, gigas, freekick_state, gigas, ROT270, "Sega", "Gigas (MC-8123, 317-5002)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, gigasb, gigas, gigas, gigas, freekick_state, gigasb, ROT270, "bootleg", "Gigas (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, oigas, gigas , oigas, gigas, freekick_state, gigasb, ROT270, "bootleg", "Oigas (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, gigasm2b, 0, gigas, gigasm2, freekick_state, gigasb, ROT270, "bootleg", "Gigas Mark II (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, omega, 0, omega, omega, freekick_state, gigas, ROT270, "Nihon System", "Omega", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, pbillrd, 0, pbillrd, pbillrd, driver_device, 0, ROT0, "Nihon System", "Perfect Billiard", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, pbillrds, pbillrd, pbillrdm, pbillrd, freekick_state, pbillrds,ROT0, "Nihon System", "Perfect Billiard (MC-8123, 317-0030)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, pbillrdsa, pbillrd, pbillrdm, pbillrd, freekick_state, pbillrds,ROT0, "Nihon System", "Perfect Billiard (MC-8123, 317-5008)", MACHINE_SUPPORTS_SAVE ) // sticker on CPU module different (wrong?) functionality the same
-GAME( 1987, freekick, 0, freekickb, freekck, driver_device, 0, ROT270, "Nihon System (Merit license)", "Free Kick (NS6201-A 1987.10)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, freekicka, freekick, freekickb, freekck, driver_device, 0, ROT270, "Nihon System", "Free Kick (NS6201-A 1987.9)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, freekickb1,freekick, freekickb, freekck, driver_device, 0, ROT270, "bootleg", "Free Kick (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, freekickb2,freekick, freekickb, freekck, driver_device, 0, ROT270, "bootleg", "Free Kick (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, freekickb3,freekick, freekickb, freekck, driver_device, 0, ROT270, "bootleg", "Free Kick (bootleg set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, countrun, 0, freekickb, countrun, driver_device, 0, ROT0, "Nihon System (Sega license)", "Counter Run (NS6201-A 1988.3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // CPU module not dumped
-GAME( 1988, countrunb, countrun, freekickb, countrun, driver_device, 0, ROT0, "bootleg", "Counter Run (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, countrunb2,countrun, freekickb, countrun, driver_device, 0, ROT0, "bootleg", "Counter Run (bootleg set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1986, gigas, 0, gigasm, gigas, freekick_state, gigas, ROT270, "Sega", "Gigas (MC-8123, 317-5002)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, gigasb, gigas, gigas, gigas, freekick_state, gigasb, ROT270, "bootleg", "Gigas (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, oigas, gigas , oigas, gigas, freekick_state, gigasb, ROT270, "bootleg", "Oigas (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, gigasm2b, 0, gigas, gigasm2, freekick_state, gigasb, ROT270, "bootleg", "Gigas Mark II (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, omega, 0, omega, omega, freekick_state, gigas, ROT270, "Nihon System", "Omega", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, pbillrd, 0, pbillrd, pbillrd, freekick_state, 0, ROT0, "Nihon System", "Perfect Billiard", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, pbillrds, pbillrd, pbillrdm, pbillrd, freekick_state, pbillrds, ROT0, "Nihon System", "Perfect Billiard (MC-8123, 317-0030)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, pbillrdsa, pbillrd, pbillrdm, pbillrd, freekick_state, pbillrds, ROT0, "Nihon System", "Perfect Billiard (MC-8123, 317-5008)", MACHINE_SUPPORTS_SAVE ) // sticker on CPU module different (wrong?) functionality the same
+GAME( 1987, freekick, 0, freekickb, freekck, freekick_state, 0, ROT270, "Nihon System (Merit license)", "Free Kick (NS6201-A 1987.10)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, freekicka, freekick, freekickb, freekck, freekick_state, 0, ROT270, "Nihon System", "Free Kick (NS6201-A 1987.9)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, freekickb1, freekick, freekickb, freekck, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, freekickb2, freekick, freekickb, freekck, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, freekickb3, freekick, freekickb, freekck, freekick_state, 0, ROT270, "bootleg", "Free Kick (bootleg set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, countrun, 0, freekickb, countrun, freekick_state, 0, ROT0, "Nihon System (Sega license)", "Counter Run (NS6201-A 1988.3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // CPU module not dumped
+GAME( 1988, countrunb, countrun, freekickb, countrun, freekick_state, 0, ROT0, "bootleg", "Counter Run (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, countrunb2, countrun, freekickb, countrun, freekick_state, 0, ROT0, "bootleg", "Counter Run (bootleg set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index 97b91b85cf7..a923cfc9e0c 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -589,7 +589,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(fresh_state::fake_scanline)
}
-static MACHINE_CONFIG_START( fresh, fresh_state )
+static MACHINE_CONFIG_START( fresh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 24000000/2 )
@@ -634,4 +634,4 @@ ROM_END
// title shows Fruit Fresh but on resetting you get text strings of 'Dream World V2.41SI 97. 1.28'
-GAME( 1996, fresh, 0, fresh, fresh, driver_device, 0, ROT0, "Chain Leisure", "Fruit Fresh (Italy)", MACHINE_NOT_WORKING )
+GAME( 1996, fresh, 0, fresh, fresh, fresh_state, 0, ROT0, "Chain Leisure", "Fruit Fresh (Italy)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp
index da1c4422fbf..87e843d972d 100644
--- a/src/mame/drivers/fromanc2.cpp
+++ b/src/mame/drivers/fromanc2.cpp
@@ -501,7 +501,7 @@ void fromanc2_state::machine_reset()
m_datalatch_2l = 0;
}
-static MACHINE_CONFIG_START( fromanc2, fromanc2_state )
+static MACHINE_CONFIG_START( fromanc2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
@@ -561,7 +561,7 @@ static MACHINE_CONFIG_START( fromanc2, fromanc2_state )
MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fromancr, fromanc2_state )
+static MACHINE_CONFIG_START( fromancr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
@@ -621,7 +621,7 @@ static MACHINE_CONFIG_START( fromancr, fromanc2_state )
MCFG_SOUND_ROUTE(2, "mono", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fromanc4, fromanc2_state )
+static MACHINE_CONFIG_START( fromanc4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */
@@ -811,5 +811,5 @@ DRIVER_INIT_MEMBER(fromanc2_state,fromanc4)
*************************************/
GAME( 1995, fromanc2, 0, fromanc2, fromanc2, fromanc2_state, fromanc2, ROT0, "Video System Co.", "Taisen Idol-Mahjong Final Romance 2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, fromancr, 0, fromancr, fromanc2, fromanc2_state, fromanc2, ROT0, "Video System Co.", "Taisen Mahjong Final Romance R (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, fromanc4, 0, fromanc4, fromanc4, fromanc2_state, fromanc4, ROT0, "Video System Co.", "Taisen Mahjong Final Romance 4 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, fromancr, 0, fromancr, fromanc2, fromanc2_state, fromanc2, ROT0, "Video System Co.", "Taisen Mahjong Final Romance R (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, fromanc4, 0, fromanc4, fromanc4, fromanc2_state, fromanc4, ROT0, "Video System Co.", "Taisen Mahjong Final Romance 4 (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp
index dce51e757d4..c4c2fc687da 100644
--- a/src/mame/drivers/fromance.cpp
+++ b/src/mame/drivers/fromance.cpp
@@ -923,7 +923,7 @@ MACHINE_RESET_MEMBER(fromance_state,fromance)
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( nekkyoku, fromance_state )
+static MACHINE_CONFIG_START( nekkyoku )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
@@ -961,12 +961,12 @@ static MACHINE_CONFIG_START( nekkyoku, fromance_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fromance_state, fromance_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( idolmj, fromance_state )
+static MACHINE_CONFIG_START( idolmj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
@@ -1004,12 +1004,12 @@ static MACHINE_CONFIG_START( idolmj, fromance_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fromance_state, fromance_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fromance, fromance_state )
+static MACHINE_CONFIG_START( fromance )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 Mhz ? */
@@ -1047,7 +1047,7 @@ static MACHINE_CONFIG_START( fromance, fromance_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(fromance_state, fromance_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -1271,11 +1271,11 @@ ROM_END
*
*************************************/
-GAME( 1988, nekkyoku, 0, nekkyoku, nekkyoku, driver_device, 0, ROT0, "Video System Co.", "Rettou Juudan Nekkyoku Janshi - Higashi Nippon Hen (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1988, idolmj, 0, idolmj, idolmj, driver_device, 0, ROT0, "System Service", "Idol-Mahjong Housoukyoku (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mjnatsu, 0, fromance, mjnatsu, driver_device, 0, ROT0, "Video System Co.", "Mahjong Natsu Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, natsuiro, mjnatsu, fromance, mjnatsu, driver_device, 0, ROT0, "Video System Co.", "Natsuiro Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mfunclub, 0, fromance, mjnatsu, driver_device, 0, ROT0, "Video System Co.", "Mahjong Fun Club - Idol Saizensen (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, daiyogen, 0, fromance, daiyogen, driver_device, 0, ROT0, "Video System Co.", "Mahjong Daiyogen (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, nmsengen, 0, fromance, nmsengen, driver_device, 0, ROT0, "Video System Co.", "Nekketsu Mahjong Sengen! AFTER 5 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, fromance, 0, fromance, fromance, driver_device, 0, ROT0, "Video System Co.", "Idol-Mahjong Final Romance (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, nekkyoku, 0, nekkyoku, nekkyoku, fromance_state, 0, ROT0, "Video System Co.", "Rettou Juudan Nekkyoku Janshi - Higashi Nippon Hen (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1988, idolmj, 0, idolmj, idolmj, fromance_state, 0, ROT0, "System Service", "Idol-Mahjong Housoukyoku (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mjnatsu, 0, fromance, mjnatsu, fromance_state, 0, ROT0, "Video System Co.", "Mahjong Natsu Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, natsuiro, mjnatsu, fromance, mjnatsu, fromance_state, 0, ROT0, "Video System Co.", "Natsuiro Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mfunclub, 0, fromance, mjnatsu, fromance_state, 0, ROT0, "Video System Co.", "Mahjong Fun Club - Idol Saizensen (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, daiyogen, 0, fromance, daiyogen, fromance_state, 0, ROT0, "Video System Co.", "Mahjong Daiyogen (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, nmsengen, 0, fromance, nmsengen, fromance_state, 0, ROT0, "Video System Co.", "Nekketsu Mahjong Sengen! AFTER 5 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, fromance, 0, fromance, fromance, fromance_state, 0, ROT0, "Video System Co.", "Idol-Mahjong Final Romance (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fruitpc.cpp b/src/mame/drivers/fruitpc.cpp
index f5c5ad4cd3a..a1ed8681b95 100644
--- a/src/mame/drivers/fruitpc.cpp
+++ b/src/mame/drivers/fruitpc.cpp
@@ -122,7 +122,7 @@ static MACHINE_CONFIG_FRAGMENT( fruitpc_sb_conf )
MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fruitpc, fruitpc_state )
+static MACHINE_CONFIG_START( fruitpc )
MCFG_CPU_ADD("maincpu", I486, 66000000) // ST STPCD0166BTC3 66 MHz 486 CPU
MCFG_CPU_PROGRAM_MAP(fruitpc_map)
MCFG_CPU_IO_MAP(fruitpc_io)
@@ -176,4 +176,4 @@ ROM_START( gogostrk )
DISK_IMAGE( "ggs-5-2-07", 0,SHA1(f214fd39ec8ac02f008823f4b179ea6c6835e1b8) )
ROM_END
-GAME( 2007, gogostrk, 0, fruitpc, fruitpc, driver_device, 0, ROT0, "American Alpha / Paokai", "Go Go Strike", MACHINE_NOT_WORKING ) // motherboard is dated 2006, if the CF card string is a date it's 2007
+GAME( 2007, gogostrk, 0, fruitpc, fruitpc, fruitpc_state, 0, ROT0, "American Alpha / Paokai", "Go Go Strike", MACHINE_NOT_WORKING ) // motherboard is dated 2006, if the CF card string is a date it's 2007
diff --git a/src/mame/drivers/ft68m.cpp b/src/mame/drivers/ft68m.cpp
index 953ba0d28d1..2cf43e58d92 100644
--- a/src/mame/drivers/ft68m.cpp
+++ b/src/mame/drivers/ft68m.cpp
@@ -30,14 +30,17 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ16_MEMBER(keyin_r);
DECLARE_READ16_MEMBER(status_r);
DECLARE_READ16_MEMBER(switches_r);
+
private:
uint8_t m_term_data;
virtual void machine_reset() override;
+
required_shared_ptr<uint16_t> m_p_base;
+
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
};
@@ -88,12 +91,12 @@ void ft68m_state::machine_reset()
m_maincpu->reset();
}
-WRITE8_MEMBER( ft68m_state::kbd_put )
+void ft68m_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( ft68m, ft68m_state )
+static MACHINE_CONFIG_START( ft68m )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_19_6608MHz / 2)
@@ -101,7 +104,7 @@ static MACHINE_CONFIG_START( ft68m, ft68m_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ft68m_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ft68m_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -124,5 +127,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, ft68m, 0, 0, ft68m, ft68m, driver_device, 0, "Forward Technology", "FT-68M", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, ft68m, 0, 0, ft68m, ft68m, ft68m_state, 0, "Forward Technology", "FT-68M", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/fungames.cpp b/src/mame/drivers/fungames.cpp
index ac526d7153c..5f9ab905536 100644
--- a/src/mame/drivers/fungames.cpp
+++ b/src/mame/drivers/fungames.cpp
@@ -47,7 +47,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -90,7 +90,7 @@ void fungames_state::video_start()
{
}
-static MACHINE_CONFIG_START( fungames, fungames_state )
+static MACHINE_CONFIG_START( fungames )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -134,5 +134,5 @@ ROM_START( take5 )
ROM_END
-GAME( 1976, biplane4, 0, fungames, 0, driver_device, 0, ROT0, "Fun Games", "Biplane 4 [TTL]", MACHINE_IS_SKELETON )
-GAME( 1975, take5, 0, fungames, 0, driver_device, 0, ROT0, "Fun Games", "Take 5 [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, biplane4, 0, fungames, 0, fungames_state, 0, ROT0, "Fun Games", "Biplane 4 [TTL]", MACHINE_IS_SKELETON )
+GAME( 1975, take5, 0, fungames, 0, fungames_state, 0, ROT0, "Fun Games", "Take 5 [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp
index c15c858e340..bd0bc704f68 100644
--- a/src/mame/drivers/funkball.cpp
+++ b/src/mame/drivers/funkball.cpp
@@ -764,7 +764,7 @@ void funkball_state::machine_reset()
m_voodoo_pci_regs.base_addr = 0xff000000;
}
-static MACHINE_CONFIG_START( funkball, funkball_state )
+static MACHINE_CONFIG_START( funkball )
MCFG_CPU_ADD("maincpu", MEDIAGX, 66666666*3.5) // 66,6 MHz x 3.5
MCFG_CPU_PROGRAM_MAP(funkball_map)
MCFG_CPU_IO_MAP(funkball_io)
@@ -822,4 +822,4 @@ ROM_START( funkball )
ROM_END
-GAME(1998, funkball, 0, funkball, funkball, driver_device, 0, ROT0, "dgPIX Entertainment Inc.", "Funky Ball", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1998, funkball, 0, funkball, funkball, funkball_state, 0, ROT0, "dgPIX Entertainment Inc.", "Funky Ball", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp
index 3f237c9c38c..b92d57baf76 100644
--- a/src/mame/drivers/funkybee.cpp
+++ b/src/mame/drivers/funkybee.cpp
@@ -282,7 +282,7 @@ void funkybee_state::machine_reset()
m_gfx_bank = 0;
}
-static MACHINE_CONFIG_START( funkybee, funkybee_state )
+static MACHINE_CONFIG_START( funkybee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */
@@ -419,7 +419,7 @@ ROM_START( skylancre )
ROM_LOAD( "18s030.1a", 0x0000, 0x0020, CRC(e645bacb) SHA1(5f4c299c4cf165fd229731c0e5799a34892bf28e) )
ROM_END
-GAME( 1982, funkybee, 0, funkybee, funkybee, driver_device, 0, ROT90, "Orca", "Funky Bee", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, funkybeeb, funkybee, funkybee, funkybeeb, driver_device,0, ROT90, "bootleg", "Funky Bee (bootleg, harder)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, skylancr, 0, funkybee, skylancr, driver_device, 0, ROT90, "Orca", "Sky Lancer", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, skylancre, skylancr, funkybee, skylancre, driver_device,0, ROT90, "Orca (Esco Trading Co license)", "Sky Lancer (Esco Trading Co license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, funkybee, 0, funkybee, funkybee, funkybee_state, 0, ROT90, "Orca", "Funky Bee", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, funkybeeb, funkybee, funkybee, funkybeeb, funkybee_state, 0, ROT90, "bootleg", "Funky Bee (bootleg, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, skylancr, 0, funkybee, skylancr, funkybee_state, 0, ROT90, "Orca", "Sky Lancer", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, skylancre, skylancr, funkybee, skylancre, funkybee_state, 0, ROT90, "Orca (Esco Trading Co license)", "Sky Lancer (Esco Trading Co license)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp
index d3e6b4476ae..c93ded46258 100644
--- a/src/mame/drivers/funkyjet.cpp
+++ b/src/mame/drivers/funkyjet.cpp
@@ -310,7 +310,7 @@ void funkyjet_state::machine_start()
{
}
-static MACHINE_CONFIG_START( funkyjet, funkyjet_state )
+static MACHINE_CONFIG_START( funkyjet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/2) /* 28 MHz crystal */
@@ -365,7 +365,7 @@ static MACHINE_CONFIG_START( funkyjet, funkyjet_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_28MHz/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp
index dcd6263c6db..1ecd23625dd 100644
--- a/src/mame/drivers/funtech.cpp
+++ b/src/mame/drivers/funtech.cpp
@@ -484,7 +484,7 @@ void fun_tech_corp_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( funtech, fun_tech_corp_state )
+static MACHINE_CONFIG_START( funtech )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
@@ -530,4 +530,4 @@ ROM_START( fts2in1 )
ROM_LOAD16_BYTE( "u30.bin", 0x00001, 0x20000, CRC(d572bddc) SHA1(06499aeb47085a02af9eb4987ed987f9a3a397f7) )
ROM_END
-GAMEL( 1993, fts2in1, 0, funtech, funtech, driver_device, 0, ROT0, "Fun Tech Corporation", "Super Two In One", 0, layout_fts2in1 )
+GAMEL( 1993, fts2in1, 0, funtech, funtech, fun_tech_corp_state, 0, ROT0, "Fun Tech Corporation", "Super Two In One", 0, layout_fts2in1 )
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index a45cded895f..9db102d1b23 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -2970,7 +2970,7 @@ MACHINE_RESET_MEMBER(funworld_state, lunapark)
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( fw1stpal, funworld_state )
+static MACHINE_CONFIG_START( fw1stpal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65SC02, CPU_CLOCK) /* 2MHz */
MCFG_CPU_PROGRAM_MAP(funworld_map)
@@ -6897,90 +6897,90 @@ DRIVER_INIT_MEMBER(funworld_state, rcdinch)
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
// Jolly Card based...
-GAMEL( 1985, jollycrd, 0, fw1stpal, funworld, driver_device, 0, ROT0, "TAB Austria", "Jolly Card (Austrian, set 1)", 0, layout_jollycrd )
-GAMEL( 1985, jollycrda, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "TAB Austria", "Jolly Card (Austrian, set 2)", 0, layout_jollycrd )
-GAMEL( 1985, jolyc3x3, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "TAB Austria", "Jolly Card (3x3 deal)", 0, layout_jollycrd )
-GAMEL( 1993, jolycmzs, jollycrd, cuoreuno, jolyc980, driver_device, 0, ROT0, "MZS Tech", "Jolly Card Professional 2.0 (MZS Tech)", 0, layout_jollycrd )
-GAMEL( 2000, jolyc980, jollycrd, cuoreuno, jolyc980, driver_device, 0, ROT0, "Spale Soft", "Jolly Card Professional 2.0 (Spale Soft)", 0, layout_jollycrd )
-GAMEL( 1998, jolycdev, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "TAB Austria / Evona Electronic", "Jolly Card (Evona Electronic)", 0, layout_jollycrd )
-GAMEL( 1985, jolyccra, jollycrd, cuoreuno, jolycdcr, driver_device, 0, ROT0, "TAB Austria", "Jolly Card (Croatian, set 1)", 0, layout_jollycrd )
-GAMEL( 1993, jolyccrb, jollycrd, cuoreuno, jolycdcr, driver_device, 0, ROT0, "Soft Design", "Jolly Card (Croatian, set 2)", 0, layout_jollycrd )
-GAMEL( 1985, sjcd2kx3, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "M.P.", "Super Joly 2000 - 3x", 0, layout_jollycrd )
-GAME( 1986, jolycdab, jollycrd, fw1stpal, funworld, driver_device, 0, ROT0, "Inter Games", "Jolly Card (Austrian, Fun World, bootleg)", MACHINE_NOT_WORKING )
+GAMEL( 1985, jollycrd, 0, fw1stpal, funworld, funworld_state, 0, ROT0, "TAB Austria", "Jolly Card (Austrian, set 1)", 0, layout_jollycrd )
+GAMEL( 1985, jollycrda, jollycrd, fw1stpal, funworld, funworld_state, 0, ROT0, "TAB Austria", "Jolly Card (Austrian, set 2)", 0, layout_jollycrd )
+GAMEL( 1985, jolyc3x3, jollycrd, fw1stpal, funworld, funworld_state, 0, ROT0, "TAB Austria", "Jolly Card (3x3 deal)", 0, layout_jollycrd )
+GAMEL( 1993, jolycmzs, jollycrd, cuoreuno, jolyc980, funworld_state, 0, ROT0, "MZS Tech", "Jolly Card Professional 2.0 (MZS Tech)", 0, layout_jollycrd )
+GAMEL( 2000, jolyc980, jollycrd, cuoreuno, jolyc980, funworld_state, 0, ROT0, "Spale Soft", "Jolly Card Professional 2.0 (Spale Soft)", 0, layout_jollycrd )
+GAMEL( 1998, jolycdev, jollycrd, fw1stpal, funworld, funworld_state, 0, ROT0, "TAB Austria / Evona Electronic", "Jolly Card (Evona Electronic)", 0, layout_jollycrd )
+GAMEL( 1985, jolyccra, jollycrd, cuoreuno, jolycdcr, funworld_state, 0, ROT0, "TAB Austria", "Jolly Card (Croatian, set 1)", 0, layout_jollycrd )
+GAMEL( 1993, jolyccrb, jollycrd, cuoreuno, jolycdcr, funworld_state, 0, ROT0, "Soft Design", "Jolly Card (Croatian, set 2)", 0, layout_jollycrd )
+GAMEL( 1985, sjcd2kx3, jollycrd, fw1stpal, funworld, funworld_state, 0, ROT0, "M.P.", "Super Joly 2000 - 3x", 0, layout_jollycrd )
+GAME( 1986, jolycdab, jollycrd, fw1stpal, funworld, funworld_state, 0, ROT0, "Inter Games", "Jolly Card (Austrian, Fun World, bootleg)", MACHINE_NOT_WORKING )
GAMEL( 1992, jolycdsp, jollycrd, cuoreuno, jolycdit, funworld_state, ctunk, ROT0, "TAB Austria", "Jolly Card (Spanish, blue TAB board, encrypted)", 0, layout_royalcrd )
-GAMEL( 1990, jolycdid, jollycrd, cuoreuno, jolycdcr, driver_device, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 1)", 0, layout_jollycrd ) // italian, CPLD, different colors.
-GAMEL( 1990, jolycdie, jollycrd, cuoreuno, jolycdib, driver_device, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 2)", 0, layout_jollycrd ) // not from TAB blue PCB
+GAMEL( 1990, jolycdid, jollycrd, cuoreuno, jolycdcr, funworld_state, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 1)", 0, layout_jollycrd ) // italian, CPLD, different colors.
+GAMEL( 1990, jolycdie, jollycrd, cuoreuno, jolycdib, funworld_state, 0, ROT0, "bootleg", "Jolly Card (Italian, different colors, set 2)", 0, layout_jollycrd ) // not from TAB blue PCB
// Bonus Card based...
-GAMEL( 1986, bonuscrd, 0, fw2ndpal, bonuscrd, driver_device, 0, ROT0, "Fun World", "Bonus Card (Austrian)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
-GAMEL( 1986, bonuscrda, bonuscrd, fw2ndpal, bonuscrd, driver_device, 0, ROT0, "Fun World", "Bonus Card (Austrian, ATG Electronic hack)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
-GAMEL( 1986, bigdeal, bonuscrd, fw2ndpal, bigdeal, driver_device, 0, ROT0, "Fun World", "Big Deal (Hungarian, set 1)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
-GAMEL( 1986, bigdealb, bonuscrd, fw2ndpal, bigdeal, driver_device, 0, ROT0, "Fun World", "Big Deal (Hungarian, set 2)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
+GAMEL( 1986, bonuscrd, 0, fw2ndpal, bonuscrd, funworld_state, 0, ROT0, "Fun World", "Bonus Card (Austrian)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
+GAMEL( 1986, bonuscrda, bonuscrd, fw2ndpal, bonuscrd, funworld_state, 0, ROT0, "Fun World", "Bonus Card (Austrian, ATG Electronic hack)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
+GAMEL( 1986, bigdeal, bonuscrd, fw2ndpal, bigdeal, funworld_state, 0, ROT0, "Fun World", "Big Deal (Hungarian, set 1)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
+GAMEL( 1986, bigdealb, bonuscrd, fw2ndpal, bigdeal, funworld_state, 0, ROT0, "Fun World", "Big Deal (Hungarian, set 2)", MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
// CMC Italian jamma PCB's...
-GAMEL( 1996, cuoreuno, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Cuore 1 (Italian)", 0, layout_jollycrd )
-GAMEL( 1997, elephfam, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Elephant Family (Italian, new)", 0, layout_jollycrd )
-GAMEL( 1996, elephfmb, elephfam, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Elephant Family (Italian, old)", 0, layout_jollycrd )
-GAMEL( 1996, pool10, 0, cuoreuno, pool10, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 1)", 0, layout_jollycrd )
-GAMEL( 1996, pool10b, pool10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 2)", 0, layout_jollycrd )
-GAMEL( 1996, pool10c, pool10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 3)", 0, layout_jollycrd )
-GAMEL( 1997, pool10d, pool10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 4)", 0, layout_jollycrd )
-GAMEL( 1997, pool10f, pool10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 5)", 0, layout_jollycrd )
-GAMEL( 1996, pool10g, pool10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 6)", 0, layout_jollycrd )
-GAMEL( 1996, pool10h, pool10, cuoreuno, pool10, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 7)", 0, layout_jollycrd )
-GAMEL( 1997, pool10i, pool10, cuoreuno, pool10, driver_device, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 8)", 0, layout_jollycrd )
-GAMEL( 2001, royal, pool10, royalcd1, royal, driver_device, 0, ROT0, "<unknown>", "Royal (Pool 10 hack)", 0, layout_jollycrd )
-GAMEL( 1997, tortufam, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Tortuga Family (Italian)", 0, layout_jollycrd )
-GAMEL( 1996, potgame, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Pot Game (Italian)", 0, layout_jollycrd )
-GAMEL( 1996, bottle10, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Bottle 10 (Italian, set 1)", 0, layout_jollycrd )
-GAMEL( 1996, bottl10b, bottle10, cuoreuno, cuoreuno, driver_device, 0, ROT0, "C.M.C.", "Bottle 10 (Italian, set 2)", 0, layout_jollycrd )
-GAMEL( 1998, lunapark, 0, lunapark, lunapark, driver_device, 0, ROT0, "<unknown>", "Luna Park (set 1, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
-GAMEL( 1998, lunaparkb, lunapark, lunapark, lunapark, driver_device, 0, ROT0, "<unknown>", "Luna Park (set 2, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
-GAMEL( 1998, lunaparkc, lunapark, cuoreuno, cuoreuno, driver_device, 0, ROT0, "<unknown>", "Luna Park (set 3)", 0, layout_jollycrd ) // regular video RAM 6000/7000.
-GAMEL( 1998, crystal, 0, cuoreuno, cuoreuno, driver_device, 0, ROT0, "J.C.D. srl", "Crystal Colours (CMC hardware)", 0, layout_jollycrd )
+GAMEL( 1996, cuoreuno, 0, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Cuore 1 (Italian)", 0, layout_jollycrd )
+GAMEL( 1997, elephfam, 0, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Elephant Family (Italian, new)", 0, layout_jollycrd )
+GAMEL( 1996, elephfmb, elephfam, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Elephant Family (Italian, old)", 0, layout_jollycrd )
+GAMEL( 1996, pool10, 0, cuoreuno, pool10, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 1)", 0, layout_jollycrd )
+GAMEL( 1996, pool10b, pool10, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 2)", 0, layout_jollycrd )
+GAMEL( 1996, pool10c, pool10, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 3)", 0, layout_jollycrd )
+GAMEL( 1997, pool10d, pool10, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 4)", 0, layout_jollycrd )
+GAMEL( 1997, pool10f, pool10, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 5)", 0, layout_jollycrd )
+GAMEL( 1996, pool10g, pool10, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 6)", 0, layout_jollycrd )
+GAMEL( 1996, pool10h, pool10, cuoreuno, pool10, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 7)", 0, layout_jollycrd )
+GAMEL( 1997, pool10i, pool10, cuoreuno, pool10, funworld_state, 0, ROT0, "C.M.C.", "Pool 10 (Italian, set 8)", 0, layout_jollycrd )
+GAMEL( 2001, royal, pool10, royalcd1, royal, funworld_state, 0, ROT0, "<unknown>", "Royal (Pool 10 hack)", 0, layout_jollycrd )
+GAMEL( 1997, tortufam, 0, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Tortuga Family (Italian)", 0, layout_jollycrd )
+GAMEL( 1996, potgame, 0, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Pot Game (Italian)", 0, layout_jollycrd )
+GAMEL( 1996, bottle10, 0, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Bottle 10 (Italian, set 1)", 0, layout_jollycrd )
+GAMEL( 1996, bottl10b, bottle10, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "C.M.C.", "Bottle 10 (Italian, set 2)", 0, layout_jollycrd )
+GAMEL( 1998, lunapark, 0, lunapark, lunapark, funworld_state, 0, ROT0, "<unknown>", "Luna Park (set 1, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
+GAMEL( 1998, lunaparkb, lunapark, lunapark, lunapark, funworld_state, 0, ROT0, "<unknown>", "Luna Park (set 2, dual program)", 0, layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
+GAMEL( 1998, lunaparkc, lunapark, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "<unknown>", "Luna Park (set 3)", 0, layout_jollycrd ) // regular video RAM 6000/7000.
+GAMEL( 1998, crystal, 0, cuoreuno, cuoreuno, funworld_state, 0, ROT0, "J.C.D. srl", "Crystal Colours (CMC hardware)", 0, layout_jollycrd )
// Royal Card based...
-GAMEL( 1991, royalcrd, 0, royalcd2, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 1)", 0, layout_jollycrd )
-GAMEL( 1991, royalcrda, royalcrd, royalcd2, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 2)", 0, layout_jollycrd )
-GAMEL( 1991, royalcrdb, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian/Polish, set 3)", 0, layout_jollycrd )
-GAMEL( 1991, royalcrdc, royalcrd, royalcd2, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 4)", MACHINE_IMPERFECT_GRAPHICS, layout_jollycrd )
-GAMEL( 1991, royalcrdd, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 5)", 0, layout_royalcrd )
-GAMEL( 1991, royalcrde, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 6)", 0, layout_jollycrd )
-GAMEL( 1991, royalcrdt, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (TAB original)", 0, layout_jollycrd )
+GAMEL( 1991, royalcrd, 0, royalcd2, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 1)", 0, layout_jollycrd )
+GAMEL( 1991, royalcrda, royalcrd, royalcd2, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 2)", 0, layout_jollycrd )
+GAMEL( 1991, royalcrdb, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian/Polish, set 3)", 0, layout_jollycrd )
+GAMEL( 1991, royalcrdc, royalcrd, royalcd2, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 4)", MACHINE_IMPERFECT_GRAPHICS, layout_jollycrd )
+GAMEL( 1991, royalcrdd, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 5)", 0, layout_royalcrd )
+GAMEL( 1991, royalcrde, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 6)", 0, layout_jollycrd )
+GAMEL( 1991, royalcrdt, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (TAB original)", 0, layout_jollycrd )
GAME( 1991, royalcrdf, royalcrd, royalcd1, royalcrd, funworld_state, royalcdc, ROT0, "Evona Electronic","Royal Card (Slovak, encrypted)", MACHINE_NOT_WORKING )
-GAMEL( 1990, royalcrdg, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "bootleg", "Royal Card (Austrian, set 7, CMC C1030 HW)", 0, layout_jollycrd ) // big CPLD
-GAMEL( 1991, royalcrdh, royalcrd, royalcd2, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 8)", 0 , layout_jollycrd )
-GAMEL( 1991, royalcdfr, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Royal Card (French)", 0, layout_jollycrd )
-GAME( 1993, royalcrdp, royalcrd, cuoreuno, royalcrd, driver_device, 0, ROT0, "Digital Dreams", "Royal Card v2.0 Professional", 0 )
-GAMEL( 199?, witchryl, 0, witchryl, witchryl, driver_device, 0, ROT0, "Video Klein", "Witch Royal (Export version 2.1)", 0, layout_jollycrd )
+GAMEL( 1990, royalcrdg, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "bootleg", "Royal Card (Austrian, set 7, CMC C1030 HW)", 0, layout_jollycrd ) // big CPLD
+GAMEL( 1991, royalcrdh, royalcrd, royalcd2, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (Austrian, set 8)", 0 , layout_jollycrd )
+GAMEL( 1991, royalcdfr, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Royal Card (French)", 0, layout_jollycrd )
+GAME( 1993, royalcrdp, royalcrd, cuoreuno, royalcrd, funworld_state, 0, ROT0, "Digital Dreams", "Royal Card v2.0 Professional", 0 )
+GAMEL( 199?, witchryl, 0, witchryl, witchryl, funworld_state, 0, ROT0, "Video Klein", "Witch Royal (Export version 2.1)", 0, layout_jollycrd )
// Lucky Lady based...
-GAMEL( 1991, lluck3x3, royalcrd, cuoreuno, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Lucky Lady (3x3 deal)", 0, layout_jollycrd )
-GAMEL( 1991, lluck4x1, royalcrd, royalcd1, royalcrd, driver_device, 0, ROT0, "TAB Austria", "Lucky Lady (4x1 aces)", 0, layout_jollycrd )
+GAMEL( 1991, lluck3x3, royalcrd, cuoreuno, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Lucky Lady (3x3 deal)", 0, layout_jollycrd )
+GAMEL( 1991, lluck4x1, royalcrd, royalcd1, royalcrd, funworld_state, 0, ROT0, "TAB Austria", "Lucky Lady (4x1 aces)", 0, layout_jollycrd )
// Magic Card 2 based...
-GAMEL( 1996, magicrd2, 0, magicrd2, magicrd2, driver_device, 0, ROT0, "Impera", "Magic Card II (Bulgarian)", 0, layout_jollycrd )
-GAMEL( 1996, magicrd2a, magicrd2, magicrd2, magicrd2, driver_device, 0, ROT0, "Impera", "Magic Card II (Nov, Yugoslavian)", 0, layout_jollycrd )
+GAMEL( 1996, magicrd2, 0, magicrd2, magicrd2, funworld_state, 0, ROT0, "Impera", "Magic Card II (Bulgarian)", 0, layout_jollycrd )
+GAMEL( 1996, magicrd2a, magicrd2, magicrd2, magicrd2, funworld_state, 0, ROT0, "Impera", "Magic Card II (Nov, Yugoslavian)", 0, layout_jollycrd )
GAME( 1996, magicrd2b, magicrd2, magicrd2, magicrd2, funworld_state, magicd2b, ROT0, "Impera", "Magic Card II (green TAB or Impera board)", 0 )
GAME( 1996, magicrd2c, magicrd2, magicrd2, magicrd2, funworld_state, magicd2c, ROT0, "Impera", "Magic Card II (blue TAB board, encrypted)", 0 )
// Joker Card based...
-GAMEL( 1993, vegasslw, 0, fw2ndpal, vegasslw, driver_device, 0, ROT0, "Fun World", "Royal Vegas Joker Card (slow deal)", 0, layout_jollycrd )
-GAMEL( 1993, vegasfst, vegasslw, fw2ndpal, vegasfst, driver_device, 0, ROT0, "Soft Design", "Royal Vegas Joker Card (fast deal)", 0, layout_jollycrd )
-GAMEL( 1993, vegasfte, vegasslw, fw2ndpal, vegasfte, driver_device, 0, ROT0, "Soft Design", "Royal Vegas Joker Card (fast deal, English gfx)", 0, layout_jollycrd )
-GAMEL( 1993, vegasmil, vegasslw, fw2ndpal, vegasmil, driver_device, 0, ROT0, "Mile", "Royal Vegas Joker Card (fast deal, Mile)", 0, layout_jollycrd )
+GAMEL( 1993, vegasslw, 0, fw2ndpal, vegasslw, funworld_state, 0, ROT0, "Fun World", "Royal Vegas Joker Card (slow deal)", 0, layout_jollycrd )
+GAMEL( 1993, vegasfst, vegasslw, fw2ndpal, vegasfst, funworld_state, 0, ROT0, "Soft Design", "Royal Vegas Joker Card (fast deal)", 0, layout_jollycrd )
+GAMEL( 1993, vegasfte, vegasslw, fw2ndpal, vegasfte, funworld_state, 0, ROT0, "Soft Design", "Royal Vegas Joker Card (fast deal, English gfx)", 0, layout_jollycrd )
+GAMEL( 1993, vegasmil, vegasslw, fw2ndpal, vegasmil, funworld_state, 0, ROT0, "Mile", "Royal Vegas Joker Card (fast deal, Mile)", 0, layout_jollycrd )
// Jolly Joker based...
-GAMEL( 198?, jolyjokr, 0, fw1stpal, funworld, driver_device, 0, ROT0, "Impera", "Jolly Joker (98bet, set 1)", 0, layout_jollycrd )
-GAMEL( 198?, jolyjokra, jolyjokr, fw1stpal, jolyjokra, driver_device, 0, ROT0, "Impera", "Jolly Joker (98bet, set 2)", 0, layout_jollycrd )
-GAMEL( 198?, jolyjokrb, jolyjokr, fw1stpal, funworld, driver_device, 0, ROT0, "Impera", "Jolly Joker (40bet, Croatian hack)", 0, layout_jollycrd )
-GAMEL( 198?, jolyjokrc, jolyjokr, fw1stpal, funworld, driver_device, 0, ROT0, "Apple Time", "Jolly Joker (Apple Time)", MACHINE_NOT_WORKING, layout_jollycrd ) // bad program ROM...
+GAMEL( 198?, jolyjokr, 0, fw1stpal, funworld, funworld_state, 0, ROT0, "Impera", "Jolly Joker (98bet, set 1)", 0, layout_jollycrd )
+GAMEL( 198?, jolyjokra, jolyjokr, fw1stpal, jolyjokra, funworld_state, 0, ROT0, "Impera", "Jolly Joker (98bet, set 2)", 0, layout_jollycrd )
+GAMEL( 198?, jolyjokrb, jolyjokr, fw1stpal, funworld, funworld_state, 0, ROT0, "Impera", "Jolly Joker (40bet, Croatian hack)", 0, layout_jollycrd )
+GAMEL( 198?, jolyjokrc, jolyjokr, fw1stpal, funworld, funworld_state, 0, ROT0, "Apple Time", "Jolly Joker (Apple Time)", MACHINE_NOT_WORKING, layout_jollycrd ) // bad program ROM...
// Encrypted games...
GAME( 1992, multiwin, 0, fw1stpal, funworld, funworld_state, multiwin, ROT0, "Fun World", "Multi Win (Ver.0167, encrypted)", MACHINE_NOT_WORKING )
-GAME( 1993, powercrd, 0, fw2ndpal, funworld, driver_device, 0, ROT0, "Fun World", "Power Card (Ver 0263, encrypted)", MACHINE_NOT_WORKING ) // clone of Bonus Card.
-GAME( 1993, megacard, 0, fw2ndpal, funworld, driver_device, 0, ROT0, "Fun World", "Mega Card (Ver.0210, encrypted)", MACHINE_NOT_WORKING )
-GAME( 1993, jokercrd, 0, fw2ndpal, funworld, driver_device, 0, ROT0, "Vesely Svet", "Joker Card (Ver.A267BC, encrypted)", MACHINE_NOT_WORKING )
+GAME( 1993, powercrd, 0, fw2ndpal, funworld, funworld_state, 0, ROT0, "Fun World", "Power Card (Ver 0263, encrypted)", MACHINE_NOT_WORKING ) // clone of Bonus Card.
+GAME( 1993, megacard, 0, fw2ndpal, funworld, funworld_state, 0, ROT0, "Fun World", "Mega Card (Ver.0210, encrypted)", MACHINE_NOT_WORKING )
+GAME( 1993, jokercrd, 0, fw2ndpal, funworld, funworld_state, 0, ROT0, "Vesely Svet", "Joker Card (Ver.A267BC, encrypted)", MACHINE_NOT_WORKING )
GAME( 198?, saloon, 0, saloon, saloon, funworld_state, saloon, ROT0, "<unknown>", "Saloon (French, encrypted)", MACHINE_NOT_WORKING )
// Encrypted TAB blue PCB...
@@ -6998,14 +6998,14 @@ GAME( 199?, mongolnw, 0, royalcd1, royalcrd, funworld_state, mongolnw,
GAME( 199?, soccernw, 0, royalcd1, royalcrd, funworld_state, soccernw, ROT0, "<unknown>", "Soccer New (Italian)", MACHINE_UNEMULATED_PROTECTION )
// Other games...
-GAME( 198?, funquiz, 0, funquiz, funquiz, driver_device, 0, ROT0, "Fun World / Oehlinger", "Fun World Quiz (Austrian)", 0 )
-GAMEL( 1986, novoplay, 0, fw2ndpal, novoplay, driver_device, 0, ROT0, "Admiral/Novomatic", "Novo Play Multi Card / Club Card", 0, layout_novoplay )
-GAME( 1991, intrgmes, 0, intrgmes, funworld, driver_device, 0, ROT0, "Inter Games", "Unknown Inter Games poker", MACHINE_NOT_WORKING )
-GAMEL( 1985, fw_a7_11, 0, fw_a7_11, funworld, driver_device, 0, ROT0, "Fun World", "Unknown Fun World A7-11 game 1", MACHINE_NOT_WORKING, layout_jollycrd )
-GAMEL( 1985, fw_a7_11a, fw_a7_11, fw_a7_11, funworld, driver_device, 0, ROT0, "Fun World", "Unknown Fun World A7-11 game 2", MACHINE_NOT_WORKING, layout_jollycrd )
-GAMEL( 1991, fw_a0_1, 0, fw_a7_11, funworld, driver_device, 0, ROT0, "Fun World", "Unknown Fun World A0-1 game", MACHINE_NOT_WORKING, layout_jollycrd )
+GAME( 198?, funquiz, 0, funquiz, funquiz, funworld_state, 0, ROT0, "Fun World / Oehlinger", "Fun World Quiz (Austrian)", 0 )
+GAMEL( 1986, novoplay, 0, fw2ndpal, novoplay, funworld_state, 0, ROT0, "Admiral/Novomatic", "Novo Play Multi Card / Club Card", 0, layout_novoplay )
+GAME( 1991, intrgmes, 0, intrgmes, funworld, funworld_state, 0, ROT0, "Inter Games", "Unknown Inter Games poker", MACHINE_NOT_WORKING )
+GAMEL( 1985, fw_a7_11, 0, fw_a7_11, funworld, funworld_state, 0, ROT0, "Fun World", "Unknown Fun World A7-11 game 1", MACHINE_NOT_WORKING, layout_jollycrd )
+GAMEL( 1985, fw_a7_11a, fw_a7_11, fw_a7_11, funworld, funworld_state, 0, ROT0, "Fun World", "Unknown Fun World A7-11 game 2", MACHINE_NOT_WORKING, layout_jollycrd )
+GAMEL( 1991, fw_a0_1, 0, fw_a7_11, funworld, funworld_state, 0, ROT0, "Fun World", "Unknown Fun World A0-1 game", MACHINE_NOT_WORKING, layout_jollycrd )
// These are 2-in-1 stealth boards, they can run the Poker game, or, using completely separate hardware on the same PCB, a NES / MSX Multigames!
-GAMEL( 1991, royalcrd_nes, royalcrd, royalcd2, royalcrd, driver_device, 0, ROT0, "bootleg", "Royal Card (stealth with NES multigame)", MACHINE_NOT_WORKING, layout_jollycrd )
-GAMEL( 1991, royalcrd_msx, royalcrd, royalcd2, royalcrd, driver_device, 0, ROT0, "bootleg", "Royal Card (stealth with MSX multigame)", MACHINE_NOT_WORKING, layout_jollycrd )
+GAMEL( 1991, royalcrd_nes, royalcrd, royalcd2, royalcrd, funworld_state, 0, ROT0, "bootleg", "Royal Card (stealth with NES multigame)", MACHINE_NOT_WORKING, layout_jollycrd )
+GAMEL( 1991, royalcrd_msx, royalcrd, royalcd2, royalcrd, funworld_state, 0, ROT0, "bootleg", "Royal Card (stealth with MSX multigame)", MACHINE_NOT_WORKING, layout_jollycrd )
diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp
index 2a353ac37b8..66e89082315 100644
--- a/src/mame/drivers/funybubl.cpp
+++ b/src/mame/drivers/funybubl.cpp
@@ -216,7 +216,7 @@ void funybubl_state::machine_start()
}
-static MACHINE_CONFIG_START( funybubl, funybubl_state )
+static MACHINE_CONFIG_START( funybubl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz?? */
@@ -247,7 +247,7 @@ static MACHINE_CONFIG_START( funybubl, funybubl_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -314,5 +314,5 @@ ROM_START( funybublc )
ROM_END
-GAME( 1999, funybubl, 0, funybubl, funybubl, driver_device, 0, ROT0, "In Chang Electronic Co", "Funny Bubble", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, funybublc,funybubl, funybubl, funybubl, driver_device, 0, ROT0, "Comad", "Funny Bubble (Comad version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, funybubl, 0, funybubl, funybubl, funybubl_state, 0, ROT0, "In Chang Electronic Co", "Funny Bubble", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, funybublc,funybubl, funybubl, funybubl, funybubl_state, 0, ROT0, "Comad", "Funny Bubble (Comad version)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp
index fd9edf74689..9a6f67a37cf 100644
--- a/src/mame/drivers/fuukifg2.cpp
+++ b/src/mame/drivers/fuukifg2.cpp
@@ -438,7 +438,7 @@ void fuuki16_state::machine_reset()
}
-static MACHINE_CONFIG_START( fuuki16, fuuki16_state )
+static MACHINE_CONFIG_START( fuuki16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2) /* 16 MHz */
@@ -478,7 +478,7 @@ static MACHINE_CONFIG_START( fuuki16, fuuki16_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz / 32, OKIM6295_PIN7_HIGH) /* 1 Mhz */
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz / 32, PIN7_HIGH) /* 1 Mhz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85)
MACHINE_CONFIG_END
@@ -665,6 +665,6 @@ ROM_END
***************************************************************************/
-GAME( 1995, gogomile, 0, fuuki16, gogomile, driver_device, 0, ROT0, "Fuuki", "Susume! Mile Smile / Go Go! Mile Smile (newer)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, gogomileo, gogomile, fuuki16, gogomileo, driver_device, 0, ROT0, "Fuuki", "Susume! Mile Smile / Go Go! Mile Smile (older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, pbancho, 0, fuuki16, pbancho, driver_device, 0, ROT0, "Fuuki", "Gyakuten!! Puzzle Bancho (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, gogomile, 0, fuuki16, gogomile, fuuki16_state, 0, ROT0, "Fuuki", "Susume! Mile Smile / Go Go! Mile Smile (newer)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, gogomileo, gogomile, fuuki16, gogomileo, fuuki16_state, 0, ROT0, "Fuuki", "Susume! Mile Smile / Go Go! Mile Smile (older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, pbancho, 0, fuuki16, pbancho, fuuki16_state, 0, ROT0, "Fuuki", "Gyakuten!! Puzzle Bancho (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp
index 8b3ba1713ca..4d524b7bbd0 100644
--- a/src/mame/drivers/fuukifg3.cpp
+++ b/src/mame/drivers/fuukifg3.cpp
@@ -546,7 +546,7 @@ void fuuki32_state::machine_reset()
}
-static MACHINE_CONFIG_START(fuuki32, fuuki32_state)
+static MACHINE_CONFIG_START(fuuki32)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, CPU_CLOCK) /* 20MHz verified */
@@ -725,7 +725,7 @@ ROM_END
***************************************************************************/
-GAME( 1998, asurabld, 0, fuuki32, asurabld, driver_device, 0, ROT0, "Fuuki", "Asura Blade - Sword of Dynasty (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, asurabld, 0, fuuki32, asurabld, fuuki32_state, 0, ROT0, "Fuuki", "Asura Blade - Sword of Dynasty (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, asurabus, 0, fuuki32, asurabus, driver_device, 0, ROT0, "Fuuki", "Asura Buster - Eternal Warriors (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, asurabusa, asurabus, fuuki32, asurabusa,driver_device, 0, ROT0, "Fuuki", "Asura Buster - Eternal Warriors (Japan) (ARCADIA review build)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // has pause function on P1 button 4
+GAME( 2000, asurabus, 0, fuuki32, asurabus, fuuki32_state, 0, ROT0, "Fuuki", "Asura Buster - Eternal Warriors (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, asurabusa, asurabus, fuuki32, asurabusa,fuuki32_state, 0, ROT0, "Fuuki", "Asura Buster - Eternal Warriors (Japan) (ARCADIA review build)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // has pause function on P1 button 4
diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp
index 66c0919f050..069c750b811 100644
--- a/src/mame/drivers/g627.cpp
+++ b/src/mame/drivers/g627.cpp
@@ -286,7 +286,7 @@ WRITE8_MEMBER( g627_state::lamp_w )
}
}
-static MACHINE_CONFIG_START( g627, g627_state )
+static MACHINE_CONFIG_START( g627 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 14138000/8)
MCFG_CPU_PROGRAM_MAP(g627_map)
diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp
index d073b99ef58..fee5dc06cc1 100644
--- a/src/mame/drivers/gaelco.cpp
+++ b/src/mame/drivers/gaelco.cpp
@@ -498,7 +498,7 @@ void gaelco_state::machine_start()
membank("okibank")->configure_entries(0, 16, memregion("oki")->base(), 0x10000);
}
-static MACHINE_CONFIG_START( bigkarnk, gaelco_state )
+static MACHINE_CONFIG_START( bigkarnk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* MC68000P10, 10 MHz */
@@ -534,11 +534,11 @@ static MACHINE_CONFIG_START( bigkarnk, gaelco_state )
MCFG_SOUND_ADD("ymsnd", YM3812, 3580000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( maniacsq, gaelco_state )
+static MACHINE_CONFIG_START( maniacsq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
@@ -564,12 +564,12 @@ static MACHINE_CONFIG_START( maniacsq, gaelco_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( squash, gaelco_state )
+static MACHINE_CONFIG_START( squash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
@@ -597,12 +597,12 @@ static MACHINE_CONFIG_START( squash, gaelco_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( thoop, gaelco_state )
+static MACHINE_CONFIG_START( thoop )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12, 12 MHz */
@@ -630,7 +630,7 @@ static MACHINE_CONFIG_START( thoop, gaelco_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -856,9 +856,9 @@ ROM_END
*
*************************************/
-GAME( 1991, bigkarnk, 0, bigkarnk, bigkarnk, driver_device, 0, ROT0, "Gaelco", "Big Karnak", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, biomtoy, 0, maniacsq, biomtoy, driver_device, 0, ROT0, "Gaelco", "Biomechanical Toy (Ver. 1.0.1885)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, biomtoya, biomtoy, maniacsq, biomtoy, driver_device, 0, ROT0, "Gaelco", "Biomechanical Toy (Ver. 1.0.1884)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, maniacsp, maniacsq, maniacsq, maniacsq, driver_device, 0, ROT0, "Gaelco", "Maniac Square (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, squash, 0, squash, squash, driver_device, 0, ROT0, "Gaelco", "Squash (Ver. 1.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, thoop, 0, thoop, thoop, driver_device, 0, ROT0, "Gaelco", "Thunder Hoop (Ver. 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bigkarnk, 0, bigkarnk, bigkarnk, gaelco_state, 0, ROT0, "Gaelco", "Big Karnak", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, biomtoy, 0, maniacsq, biomtoy, gaelco_state, 0, ROT0, "Gaelco", "Biomechanical Toy (Ver. 1.0.1885)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, biomtoya, biomtoy, maniacsq, biomtoy, gaelco_state, 0, ROT0, "Gaelco", "Biomechanical Toy (Ver. 1.0.1884)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, maniacsp, maniacsq, maniacsq, maniacsq, gaelco_state, 0, ROT0, "Gaelco", "Maniac Square (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, squash, 0, squash, squash, gaelco_state, 0, ROT0, "Gaelco", "Squash (Ver. 1.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, thoop, 0, thoop, thoop, gaelco_state, 0, ROT0, "Gaelco", "Thunder Hoop (Ver. 1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index aee69a9213c..0931650c4bb 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -159,7 +159,7 @@ static INPUT_PORTS_START( maniacsq )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( maniacsq, gaelco2_state )
+static MACHINE_CONFIG_START( maniacsq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz? */
MCFG_CPU_PROGRAM_MAP(maniacsq_map)
@@ -292,7 +292,7 @@ static INPUT_PORTS_START( bang )
PORT_BIT( 0xff, 0x80, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, -6.0 / 240, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bang, bang_state )
+static MACHINE_CONFIG_START( bang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
MCFG_CPU_PROGRAM_MAP(bang_map)
@@ -531,7 +531,7 @@ static INPUT_PORTS_START( alighunt )
PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( alighunt, gaelco2_state )
+static MACHINE_CONFIG_START( alighunt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(alighunt_map)
@@ -767,7 +767,7 @@ static INPUT_PORTS_START( touchgo )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE4 ) PORT_TOGGLE
INPUT_PORTS_END
-static MACHINE_CONFIG_START( touchgo, gaelco2_state )
+static MACHINE_CONFIG_START( touchgo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(touchgo_map)
@@ -981,7 +981,7 @@ static INPUT_PORTS_START( snowboar )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( snowboar, gaelco2_state )
+static MACHINE_CONFIG_START( snowboar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 30000000/2) /* 15 MHz */
MCFG_CPU_PROGRAM_MAP(snowboar_map)
@@ -1218,7 +1218,7 @@ static INPUT_PORTS_START( wrally2 )
PORT_BIT( 0xff, 0x8A, IPT_PADDLE_V ) PORT_MINMAX(0x00,0xff) PORT_SENSITIVITY(25) PORT_KEYDELTA(25) PORT_REVERSE PORT_NAME("P2 Wheel")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( wrally2, wrally2_state )
+static MACHINE_CONFIG_START( wrally2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz */
MCFG_CPU_PROGRAM_MAP(wrally2_map)
@@ -1529,17 +1529,17 @@ GAME( 1995, touchgon, touchgo, touchgo, touchgo, gaelco2_state, touchgop, ROT
GAME( 1995, touchgoe, touchgo, touchgo, touchgo, gaelco2_state, touchgop, ROT0, "Gaelco", "Touch & Go (earlier revision)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
GAME( 1995, touchgok, touchgo, touchgo, touchgo, gaelco2_state, touchgo, ROT0, "Gaelco", "Touch & Go (Korea, unprotected)", MACHINE_IMPERFECT_SOUND ) // doesn't say 'Korea' but was sourced there, shows 2 copyright lines like the 'earlier revision'
-GAME( 1995, wrally2, 0, wrally2, wrally2, driver_device, 0, ROT0, "Gaelco", "World Rally 2: Twin Racing", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1995, wrally2, 0, wrally2, wrally2, wrally2_state, 0, ROT0, "Gaelco", "World Rally 2: Twin Racing", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1996, maniacsq, 0, maniacsq, maniacsq, driver_device, 0, ROT0, "Gaelco", "Maniac Square (unprotected)", 0 )
+GAME( 1996, maniacsq, 0, maniacsq, maniacsq, gaelco2_state, 0, ROT0, "Gaelco", "Maniac Square (unprotected)", 0 )
GAME( 1996, maniacsqa,maniacsq, maniacsq, maniacsq, gaelco2_state, maniacsqa,ROT0, "Gaelco", "Maniac Square (protected)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1996, snowboar, 0, snowboar, snowboar, driver_device, 0, ROT0, "Gaelco", "Snow Board Championship (Version 2.1)", 0 )
+GAME( 1996, snowboar, 0, snowboar, snowboar, gaelco2_state, 0, ROT0, "Gaelco", "Snow Board Championship (Version 2.1)", 0 )
GAME( 1996, snowboara,snowboar, snowboar, snowboar, gaelco2_state, snowboar, ROT0, "Gaelco", "Snow Board Championship (Version 2.0)", 0 )
GAME( 1998, bang, 0, bang, bang, bang_state, bang, ROT0, "Gaelco", "Bang!", 0 )
GAME( 1998, bangj, bang, bang, bang, bang_state, bang, ROT0, "Gaelco", "Gun Gabacho (Japan)", 0 )
// are these ACTUALLY Gaelco hardware, or do they just use the same Dallas?
-GAME( 1999, grtesoro, 0, maniacsq, maniacsq, driver_device, 0, ROT0, "Nova Desitec", "Gran Tesoro? / Play 2000 (v5.01) (Italy)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1999, grtesoro4, grtesoro,maniacsq, maniacsq, driver_device, 0, ROT0, "Nova Desitec", "Gran Tesoro? / Play 2000 (v4.0) (Italy)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1999, grtesoro, 0, maniacsq, maniacsq, gaelco2_state, 0, ROT0, "Nova Desitec", "Gran Tesoro? / Play 2000 (v5.01) (Italy)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1999, grtesoro4, grtesoro,maniacsq, maniacsq, gaelco2_state, 0, ROT0, "Nova Desitec", "Gran Tesoro? / Play 2000 (v4.0) (Italy)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp
index 9211debd44a..da3e681a04f 100644
--- a/src/mame/drivers/gaelco3d.cpp
+++ b/src/mame/drivers/gaelco3d.cpp
@@ -279,7 +279,7 @@ READ16_MEMBER(gaelco3d_state::eeprom_data_r)
{
/* bit 0 is clock */
/* bit 1 active */
- result &= ~GAELCOSER_EXT_STATUS_MASK;
+ result &= ~uint32_t(gaelco_serial_device::EXT_STATUS_MASK);
result |= m_serial->status_r(space, 0);
}
@@ -950,7 +950,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( gaelco3d, gaelco3d_state )
+static MACHINE_CONFIG_START( gaelco3d )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 15000000)
diff --git a/src/mame/drivers/gaelcopc.cpp b/src/mame/drivers/gaelcopc.cpp
index e0adf846be7..90e5459f576 100644
--- a/src/mame/drivers/gaelcopc.cpp
+++ b/src/mame/drivers/gaelcopc.cpp
@@ -66,7 +66,7 @@ static INPUT_PORTS_START( gaelcopc )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( gaelcopc, gaelcopc_state )
+static MACHINE_CONFIG_START( gaelcopc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM, 2000000000) /* Pentium4? */
MCFG_CPU_PROGRAM_MAP(gaelcopc_map)
@@ -130,8 +130,8 @@ ROM_START(tuningrc)
ROM_END
-GAME( 2003, tokyocop, 0, gaelcopc, gaelcopc, driver_device, 0, ROT0, "Gaelco", "Tokyo Cop (US, dedicated version)", MACHINE_IS_SKELETON )
-GAME( 2003, tokyocopk, tokyocop, gaelcopc, gaelcopc, driver_device, 0, ROT0, "Gaelco", "Tokyo Cop (US, kit version)", MACHINE_IS_SKELETON )
-GAME( 2003, tokyocopi, tokyocop, gaelcopc, gaelcopc, driver_device, 0, ROT0, "Gaelco", "Tokyo Cop (Italy)", MACHINE_IS_SKELETON )
-GAME( 2004, rriders, 0, gaelcopc, gaelcopc, driver_device, 0, ROT0, "Gaelco", "Ring Riders (Software version v2.2)", MACHINE_IS_SKELETON )
-GAME( 2005, tuningrc, 0, gaelcopc, gaelcopc, driver_device, 0, ROT0, "Gaelco", "Gaelco Championship Tuning Race", MACHINE_IS_SKELETON )
+GAME( 2003, tokyocop, 0, gaelcopc, gaelcopc, gaelcopc_state, 0, ROT0, "Gaelco", "Tokyo Cop (US, dedicated version)", MACHINE_IS_SKELETON )
+GAME( 2003, tokyocopk, tokyocop, gaelcopc, gaelcopc, gaelcopc_state, 0, ROT0, "Gaelco", "Tokyo Cop (US, kit version)", MACHINE_IS_SKELETON )
+GAME( 2003, tokyocopi, tokyocop, gaelcopc, gaelcopc, gaelcopc_state, 0, ROT0, "Gaelco", "Tokyo Cop (Italy)", MACHINE_IS_SKELETON )
+GAME( 2004, rriders, 0, gaelcopc, gaelcopc, gaelcopc_state, 0, ROT0, "Gaelco", "Ring Riders (Software version v2.2)", MACHINE_IS_SKELETON )
+GAME( 2005, tuningrc, 0, gaelcopc, gaelcopc, gaelcopc_state, 0, ROT0, "Gaelco", "Gaelco Championship Tuning Race", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp
index e984e8fc034..50fbc7ac9ba 100644
--- a/src/mame/drivers/gaiden.cpp
+++ b/src/mame/drivers/gaiden.cpp
@@ -742,7 +742,7 @@ static GFXDECODE_START( drgnbowl )
GFXDECODE_END
-static MACHINE_CONFIG_START( shadoww, gaiden_state )
+static MACHINE_CONFIG_START( shadoww )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 18432000/2) /* 9.216 MHz */
@@ -801,7 +801,7 @@ static MACHINE_CONFIG_START( shadoww, gaiden_state )
MCFG_SOUND_ROUTE(2, "mono", 0.15)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
@@ -814,7 +814,7 @@ static MACHINE_CONFIG_DERIVED( raiga, shadoww )
MCFG_GFXDECODE_MODIFY("gfxdecode", raiga)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( drgnbowl, gaiden_state )
+static MACHINE_CONFIG_START( drgnbowl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 20000000/2) /* 10 MHz */
@@ -853,7 +853,7 @@ static MACHINE_CONFIG_START( drgnbowl, gaiden_state )
MCFG_YM2151_ADD("ymsnd", 4000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -936,7 +936,7 @@ static ADDRESS_MAP_START( mastninj_map, AS_PROGRAM, 16, gaiden_state )
// AM_RANGE(0x07a808, 0x07a809) AM_WRITE(gaiden_flip_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mastninj, gaiden_state )
+static MACHINE_CONFIG_START( mastninj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz? */
@@ -988,7 +988,7 @@ static MACHINE_CONFIG_START( mastninj, gaiden_state )
MCFG_SOUND_ROUTE(3, "mono", 0.60)
/* no OKI on the bootleg */
-// MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+// MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
@@ -1662,19 +1662,19 @@ DRIVER_INIT_MEMBER(gaiden_state,mastninj)
DRIVER_INIT_CALL(shadoww);
}
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1988, shadoww, 0, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Shadow Warriors (World, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, shadowwa, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Shadow Warriors (World, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gaiden, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Ninja Gaiden (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, ryukendn, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Ninja Ryukenden (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, ryukendna, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Ninja Ryukenden (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mastninj, shadoww, mastninj, common, gaiden_state, mastninj, ROT0, "bootleg", "Master Ninja (bootleg of Shadow Warriors / Ninja Gaiden)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // sprites need fixing, sound and yscroll too. - it is confirmed the curtains don't scroll on the pcb
-GAME( 1992, drgnbowl, 0, drgnbowl, drgnbowl, gaiden_state, drgnbowl, ROT0, "Nics", "Dragon Bowl (set 1, encrypted program)", MACHINE_SUPPORTS_SAVE ) // Dragon Bowl is based on Ninja Gaiden code
-GAME( 1992, drgnbowla, drgnbowl, drgnbowl, drgnbowl, gaiden_state, drgnbowla,ROT0, "Nics", "Dragon Bowl (set 2, unencrypted program)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, wildfang, 0, shadoww, wildfang, gaiden_state, wildfang, ROT0, "Tecmo", "Wild Fang / Tecmo Knight", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wildfangs, wildfang, shadoww, tknight, gaiden_state, wildfang, ROT0, "Tecmo", "Wild Fang", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tknight, wildfang, shadoww, tknight, gaiden_state, wildfang, ROT0, "Tecmo", "Tecmo Knight", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, stratof, 0, raiga, raiga, gaiden_state, raiga, ROT0, "Tecmo", "Raiga - Strato Fighter (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, raiga, stratof, raiga, raiga, gaiden_state, raiga, ROT0, "Tecmo", "Raiga - Strato Fighter (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY, FULLNAME,FLAGS
+GAME( 1988, shadoww, 0, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Shadow Warriors (World, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, shadowwa, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Shadow Warriors (World, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gaiden, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Ninja Gaiden (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, ryukendn, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Ninja Ryukenden (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, ryukendna, shadoww, shadoww, common, gaiden_state, shadoww, ROT0, "Tecmo", "Ninja Ryukenden (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mastninj, shadoww, mastninj, common, gaiden_state, mastninj, ROT0, "bootleg", "Master Ninja (bootleg of Shadow Warriors / Ninja Gaiden)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // sprites need fixing, sound and yscroll too. - it is confirmed the curtains don't scroll on the pcb
+GAME( 1992, drgnbowl, 0, drgnbowl, drgnbowl, gaiden_state, drgnbowl, ROT0, "Nics", "Dragon Bowl (set 1, encrypted program)", MACHINE_SUPPORTS_SAVE ) // Dragon Bowl is based on Ninja Gaiden code
+GAME( 1992, drgnbowla, drgnbowl, drgnbowl, drgnbowl, gaiden_state, drgnbowla,ROT0, "Nics", "Dragon Bowl (set 2, unencrypted program)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, wildfang, 0, shadoww, wildfang, gaiden_state, wildfang, ROT0, "Tecmo", "Wild Fang / Tecmo Knight", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wildfangs, wildfang, shadoww, tknight, gaiden_state, wildfang, ROT0, "Tecmo", "Wild Fang", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tknight, wildfang, shadoww, tknight, gaiden_state, wildfang, ROT0, "Tecmo", "Tecmo Knight", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, stratof, 0, raiga, raiga, gaiden_state, raiga, ROT0, "Tecmo", "Raiga - Strato Fighter (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, raiga, stratof, raiga, raiga, gaiden_state, raiga, ROT0, "Tecmo", "Raiga - Strato Fighter (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp
index 2e8ac930b6d..4dc61cc4a5c 100644
--- a/src/mame/drivers/gal3.cpp
+++ b/src/mame/drivers/gal3.cpp
@@ -128,7 +128,7 @@ better notes (complete chip lists) for each board still needed
#include "emu.h"
#include "includes/namcos2.h"
-#include "includes/namcoic.h"
+#include "machine/namcoic.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32025/tms32025.h"
@@ -593,7 +593,7 @@ static GFXDECODE_START( namcos21 )
GFXDECODE_ENTRY( "obj_board1", 0x000000, tile_layout, 0x000, 0x20 )
GFXDECODE_END
-static MACHINE_CONFIG_START( gal3, gal3_state )
+static MACHINE_CONFIG_START( gal3 )
MCFG_CPU_ADD("maincpu", M68020, 49152000/2)
MCFG_CPU_PROGRAM_MAP(cpu_mst_map)
MCFG_CPU_VBLANK_INT_DRIVER("lscreen", gal3_state, irq1_line_hold)
@@ -644,12 +644,12 @@ static MACHINE_CONFIG_START( gal3, gal3_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140_16g", 8000000/374)
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM21) //to be verified
+ MCFG_C140_BANK_TYPE(SYSTEM21) //to be verified
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MCFG_C140_ADD("c140_16a", 8000000/374)
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM21)
+ MCFG_C140_BANK_TYPE(SYSTEM21)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -866,6 +866,6 @@ ROM_START( gal3 )
DISK_IMAGE_READONLY( "gal3_ld2", 0, NO_DUMP )
ROM_END
-/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
-GAMEL( 199?, gal3, 0, gal3, gal3, driver_device, 0, ROT0, "Namco", "Galaxian 3 - Theater 6 : Project Dragoon", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_dualhsxs )
+/* YEAR, NAME PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
+GAMEL( 199?, gal3, 0, gal3, gal3, gal3_state, 0, ROT0, "Namco", "Galaxian 3 - Theater 6 : Project Dragoon", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_dualhsxs )
//GAMEL( 199?, gal3zlgr, 0, gal3, gal3, driver_device, 0, ROT0, "Namco", "Galaxian 3 - Theater 6 J2 : Attack of The Zolgear", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_dualhsxs )
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index 1e0b11a0430..c97daa9e8bd 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -1605,7 +1605,7 @@ INTERRUPT_GEN_MEMBER(galaga_state::sub_vblank_irq)
device.execute().set_input_line(0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( bosco, bosco_state )
+static MACHINE_CONFIG_START( bosco )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -1690,7 +1690,7 @@ static MACHINE_CONFIG_START( bosco, bosco_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( galaga, galaga_state )
+static MACHINE_CONFIG_START( galaga )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -1775,7 +1775,7 @@ static MACHINE_CONFIG_DERIVED( galagab, galaga )
MCFG_DEVICE_REMOVE("discrete")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( xevious, xevious_state )
+static MACHINE_CONFIG_START( xevious )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -1875,7 +1875,7 @@ static MACHINE_CONFIG_DERIVED( battles, xevious )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( digdug, digdug_state )
+static MACHINE_CONFIG_START( digdug )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -3467,40 +3467,40 @@ DRIVER_INIT_MEMBER(xevious_state,battles)
/* Original Namco hardware, with Namco Customs */
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1981, bosco, 0, bosco, bosco, driver_device, 0, ROT0, "Namco", "Bosconian (new version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, boscoo, bosco, bosco, bosco, driver_device, 0, ROT0, "Namco", "Bosconian (old version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, boscoo2, bosco, bosco, bosco, driver_device, 0, ROT0, "Namco", "Bosconian (older version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, boscomd, bosco, bosco, boscomd, driver_device, 0, ROT0, "Namco (Midway license)", "Bosconian (Midway, new version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, boscomdo, bosco, bosco, boscomd, driver_device, 0, ROT0, "Namco (Midway license)", "Bosconian (Midway, old version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
+GAME( 1981, bosco, 0, bosco, bosco, bosco_state, 0, ROT0, "Namco", "Bosconian (new version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, boscoo, bosco, bosco, bosco, bosco_state, 0, ROT0, "Namco", "Bosconian (old version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, boscoo2, bosco, bosco, bosco, bosco_state, 0, ROT0, "Namco", "Bosconian (older version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, boscomd, bosco, bosco, boscomd, bosco_state, 0, ROT0, "Namco (Midway license)", "Bosconian (Midway, new version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, boscomdo, bosco, bosco, boscomd, bosco_state, 0, ROT0, "Namco (Midway license)", "Bosconian (Midway, old version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, galaga, 0, galaga, galaga, galaga_state, galaga, ROT90, "Namco", "Galaga (Namco rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, galagao, galaga, galaga, galaga, galaga_state, galaga, ROT90, "Namco", "Galaga (Namco)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, galagamw, galaga, galaga, galagamw, galaga_state, galaga, ROT90, "Namco (Midway license)", "Galaga (Midway set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, galagamk, galaga, galaga, galaga, galaga_state, galaga, ROT90, "Namco (Midway license)", "Galaga (Midway set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1981, galagamf, galaga, galaga, galaga, galaga_state, galaga, ROT90, "Namco (Midway license)", "Galaga (Midway set 1 with fast shoot hack)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, galaga, 0, galaga, galaga, galaga_state, galaga, ROT90, "Namco", "Galaga (Namco rev. B)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, galagao, galaga, galaga, galaga, galaga_state, galaga, ROT90, "Namco", "Galaga (Namco)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, galagamw, galaga, galaga, galagamw, galaga_state, galaga, ROT90, "Namco (Midway license)", "Galaga (Midway set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, galagamk, galaga, galaga, galaga, galaga_state, galaga, ROT90, "Namco (Midway license)", "Galaga (Midway set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1981, galagamf, galaga, galaga, galaga, galaga_state, galaga, ROT90, "Namco (Midway license)", "Galaga (Midway set 1 with fast shoot hack)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1982, xevious, 0, xevious, xevious, xevious_state, xevious, ROT90, "Namco", "Xevious (Namco)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, xevious, 0, xevious, xevious, xevious_state, xevious, ROT90, "Namco", "Xevious (Namco)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, xeviousa, xevious, xevious, xeviousa, xevious_state, xevious, ROT90, "Namco (Atari license)", "Xevious (Atari, harder)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, xeviousb, xevious, xevious, xeviousb, xevious_state, xevious, ROT90, "Namco (Atari license)", "Xevious (Atari)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, xeviousc, xevious, xevious, xeviousa, xevious_state, xevious, ROT90, "Namco (Atari license)", "Xevious (Atari, Namco PCB)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, sxevious, xevious, xevious, sxevious, xevious_state, xevious, ROT90, "Namco", "Super Xevious", MACHINE_SUPPORTS_SAVE )
GAME( 1984, sxeviousj, xevious, xevious, sxevious, xevious_state, xevious, ROT90, "Namco", "Super Xevious (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, digdug, 0, digdug, digdug, driver_device, 0, ROT90, "Namco", "Dig Dug (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, digdug1, digdug, digdug, digdug, driver_device, 0, ROT90, "Namco", "Dig Dug (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, digdugat, digdug, digdug, digdug, driver_device, 0, ROT90, "Namco (Atari license)", "Dig Dug (Atari, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, digdugat1, digdug, digdug, digdug, driver_device, 0, ROT90, "Namco (Atari license)", "Dig Dug (Atari, rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, digsid, digdug, digdug, digdug, driver_device, 0, ROT90, "Namco (Sidam license)", "Dig Dug (manufactured by Sidam)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, digdug, 0, digdug, digdug, digdug_state, 0, ROT90, "Namco", "Dig Dug (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, digdug1, digdug, digdug, digdug, digdug_state, 0, ROT90, "Namco", "Dig Dug (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, digdugat, digdug, digdug, digdug, digdug_state, 0, ROT90, "Namco (Atari license)", "Dig Dug (Atari, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, digdugat1, digdug, digdug, digdug, digdug_state, 0, ROT90, "Namco (Atari license)", "Dig Dug (Atari, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, digsid, digdug, digdug, digdug, digdug_state, 0, ROT90, "Namco (Sidam license)", "Dig Dug (manufactured by Sidam)", MACHINE_SUPPORTS_SAVE )
/* Bootlegs with replacement I/O chips */
-GAME( 1982, gallag, galaga, galagab, galaga, galaga_state, galaga, ROT90, "bootleg", "Gallag", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gatsbee, galaga, galagab, gatsbee, galaga_state, gatsbee, ROT90, "hack (Uchida)", "Gatsbee", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1981, nebulbee, galaga, galagab, galaga, galaga_state, galaga, ROT90, "bootleg", "Nebulous Bee", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, gallag, galaga, galagab, galaga, galaga_state, galaga, ROT90, "bootleg", "Gallag", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gatsbee, galaga, galagab, gatsbee, galaga_state, gatsbee, ROT90, "hack (Uchida)", "Gatsbee", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1981, nebulbee, galaga, galagab, galaga, galaga_state, galaga, ROT90, "bootleg", "Nebulous Bee", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
GAME( 1982, xevios, xevious, xevious, xevious, xevious_state, xevios, ROT90, "bootleg", "Xevios", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1982, battles, xevious, battles, xevious, xevious_state, battles, ROT90, "bootleg", "Battles (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1982, battles2, xevious, xevious, xevious, xevious_state, xevios, ROT90, "bootleg", "Battles (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dzigzag, digdug, dzigzag, digdug, driver_device, 0, ROT90, "bootleg", "Zig Zag (Dig Dug hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dzigzag, digdug, dzigzag, digdug, digdug_state, 0, ROT90, "bootleg", "Zig Zag (Dig Dug hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp
index e6d7e7d8398..a82dfadee9f 100644
--- a/src/mame/drivers/galastrm.cpp
+++ b/src/mame/drivers/galastrm.cpp
@@ -285,7 +285,7 @@ GFXDECODE_END
/***************************************************************************/
-static MACHINE_CONFIG_START( galastrm, galastrm_state )
+static MACHINE_CONFIG_START( galastrm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, 16000000) /* 16 MHz */
MCFG_CPU_PROGRAM_MAP(galastrm_map)
@@ -364,4 +364,4 @@ ROM_START( galastrm )
ROM_END
-GAME( 1992, galastrm, 0, galastrm, galastrm, driver_device, 0, ROT0, "Taito Corporation", "Galactic Storm (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, galastrm, 0, galastrm, galastrm, galastrm_state, 0, ROT0, "Taito Corporation", "Galactic Storm (Japan)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index 6332928c77b..093a0c2fe65 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -445,7 +445,7 @@ void galaxi_state::machine_reset()
Machine Drivers
***************************************************************************/
-static MACHINE_CONFIG_START( galaxi, galaxi_state )
+static MACHINE_CONFIG_START( galaxi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
@@ -470,7 +470,7 @@ static MACHINE_CONFIG_START( galaxi, galaxi_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", SND_CLOCK, OKIM6295_PIN7_LOW) // ?
+ MCFG_OKIM6295_ADD("oki", SND_CLOCK, PIN7_LOW) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -576,7 +576,7 @@ ROM_END
Game Drivers
***************************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 2000, galaxi, 0, galaxi, galaxi, driver_device, 0, ROT0, "B.R.L.", "Galaxi (v2.0)", MACHINE_SUPPORTS_SAVE, layout_galaxi )
-GAMEL( 2000, magjoker, 0, magjoker, magjoker, driver_device, 0, ROT0, "B.R.L.", "Magic Joker (v1.25.10.2000)", MACHINE_SUPPORTS_SAVE, layout_galaxi )
-GAMEL( 2001, lastfour, 0, lastfour, magjoker, driver_device, 0, ROT0, "B.R.L.", "Last Four (09:12 16/01/2001)", MACHINE_SUPPORTS_SAVE, layout_galaxi )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 2000, galaxi, 0, galaxi, galaxi, galaxi_state, 0, ROT0, "B.R.L.", "Galaxi (v2.0)", MACHINE_SUPPORTS_SAVE, layout_galaxi )
+GAMEL( 2000, magjoker, 0, magjoker, magjoker, galaxi_state, 0, ROT0, "B.R.L.", "Magic Joker (v1.25.10.2000)", MACHINE_SUPPORTS_SAVE, layout_galaxi )
+GAMEL( 2001, lastfour, 0, lastfour, magjoker, galaxi_state, 0, ROT0, "B.R.L.", "Last Four (09:12 16/01/2001)", MACHINE_SUPPORTS_SAVE, layout_galaxi )
diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp
index bc775353c04..f466b79b188 100644
--- a/src/mame/drivers/galaxia.cpp
+++ b/src/mame/drivers/galaxia.cpp
@@ -283,7 +283,7 @@ static GFXDECODE_START( astrowar )
GFXDECODE_END
-static MACHINE_CONFIG_START( galaxia, galaxia_state )
+static MACHINE_CONFIG_START( galaxia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/8)
@@ -325,7 +325,7 @@ static MACHINE_CONFIG_START( galaxia, galaxia_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( astrowar, galaxia_state )
+static MACHINE_CONFIG_START( astrowar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/8)
@@ -468,8 +468,8 @@ ROM_START( astrowar )
ROM_LOAD( "astro.3d", 0x00400, 0x0400, CRC(822505aa) SHA1(f9d3465e14bb850a286f8b4f42aa0a4044413b67) )
ROM_END
-GAME( 1979, galaxia, 0, galaxia, galaxia, driver_device, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1979, galaxiaa, galaxia, galaxia, galaxia, driver_device, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1979, galaxiab, galaxia, galaxia, galaxia, driver_device, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 3)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1979, galaxiac, galaxia, galaxia, galaxia, driver_device, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 4)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1980, astrowar, 0, astrowar, galaxia, driver_device, 0, ROT90, "Zaccaria / Zelco", "Astro Wars", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1979, galaxia, 0, galaxia, galaxia, galaxia_state, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1979, galaxiaa, galaxia, galaxia, galaxia, galaxia_state, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1979, galaxiab, galaxia, galaxia, galaxia, galaxia_state, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 3)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1979, galaxiac, galaxia, galaxia, galaxia, galaxia_state, 0, ROT90, "Zaccaria / Zelco", "Galaxia (set 4)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1980, astrowar, 0, astrowar, galaxia, galaxia_state, 0, ROT90, "Zaccaria / Zelco", "Astro Wars", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 45cb83c0504..8dc5ad18386 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -5586,7 +5586,7 @@ DISCRETE_SOUND_END
*
*************************************/
-static MACHINE_CONFIG_START( galaxian_base, galaxian_state )
+static MACHINE_CONFIG_START( galaxian_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, GALAXIAN_PIXEL_CLOCK/3/2)
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index 782622ae9dc..9b5c388cdc9 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -2167,7 +2167,7 @@ static GFXDECODE_START( _4in1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( galaxold_base, galaxold_state )
+static MACHINE_CONFIG_START( galaxold_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
@@ -2385,7 +2385,7 @@ static MACHINE_CONFIG_DERIVED( ozon1, galaxold_base )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( drivfrcg, galaxold_state )
+static MACHINE_CONFIG_START( drivfrcg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/6)
@@ -2470,7 +2470,7 @@ static MACHINE_CONFIG_DERIVED( tazzmang, galaxian )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( racknrol, galaxold_state )
+static MACHINE_CONFIG_START( racknrol )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
@@ -2497,7 +2497,7 @@ static MACHINE_CONFIG_START( racknrol, galaxold_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hexpoola, galaxold_state )
+static MACHINE_CONFIG_START( hexpoola )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, PIXEL_CLOCK/2)
@@ -3434,41 +3434,41 @@ DRIVER_INIT_MEMBER(galaxold_state,guttangt)
/* Z80 games */
-// YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY, FULLNAME, FLAGS, LAYOUT
-GAME( 1981, vpool, hustler, mooncrst, vpool, driver_device, 0, ROT90, "bootleg", "Video Pool (bootleg on Moon Cresta hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, rockclim, 0, rockclim, rockclim, driver_device, 0, ROT180, "Taito", "Rock Climber", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ckongg, ckong, ckongg, ckongg, driver_device, 0, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ckongmc, ckong, ckongmc, ckongmc, driver_device, 0, ROT90, "bootleg", "Crazy Kong (bootleg on Moon Cresta hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // set was marked as 'King Kong on Galaxian'
-GAME( 1981, ckonggx, ckong, ckongg, ckonggx, galaxold_state, ckonggx, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware, encrypted, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, ckongcv, ckong, ckongg, ckonggx, galaxold_state, ckonggx, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware, encrypted, set 2)", MACHINE_NOT_WORKING )
-GAME( 1982, ckongis, ckong, ckongg, ckonggx, galaxold_state, ckonggx, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware, encrypted, set 3)", MACHINE_NOT_WORKING )
-GAME( 1981, scramblb, scramble, scramblb, scramblb, driver_device, 0, ROT90, "bootleg", "Scramble (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, scramb2, scramble, scramb2, scramb2, driver_device, 0, ROT90, "bootleg", "Scramble (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, scrambler, scramble, scrambler, scrambler, driver_device, 0, ROT90, "bootleg (Reben S.A.)", "Scramble (Reben S.A. Spanish bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, 4in1, 0, 4in1, 4in1, galaxold_state, 4in1, ROT90, "Armenia / Food and Fun", "4 Fun in 1", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bagmanmc, bagman, bagmanmc, bagmanmc, driver_device, 0, ROT90, "bootleg", "Bagman (bootleg on Moon Cresta hardware, set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, bagmanm2, bagman, bagmanmc, bagmanmc, driver_device, 0, ROT90, "bootleg (GIB)", "Bagman (bootleg on Moon Cresta hardware, set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dkongjrm, dkongjr, dkongjrm, dkongjrm, driver_device, 0, ROT90, "bootleg", "Donkey Kong Jr. (bootleg on Moon Cresta hardware)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, porter, dockman, porter, porter, driver_device, 0, ROT90, "bootleg", "Port Man (bootleg on Moon Cresta hardware)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL )
-GAME( 1982, tazzmang, tazmania, tazzmang, tazzmang, driver_device, 0, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, tazzmang2, tazmania, tazzmang, tazzmang, driver_device, 0, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware with Starfield)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, bongo, 0, bongo, bongo, driver_device, 0, ROT90, "Jetsoft", "Bongo", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ozon1, 0, ozon1, ozon1, driver_device, 0, ROT90, "Proma", "Ozon I", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, guttangt, locomotn, guttang, guttangt, galaxold_state, guttangt, ROT270, "bootleg (Recreativos Franco?)", "Guttang Gottong (bootleg on Galaxian type hardware)", MACHINE_NOT_WORKING | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // or by 'Tren' ?
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY, FULLNAME, FLAGS, LAYOUT
+GAME( 1981, vpool, hustler, mooncrst, vpool, galaxold_state, 0, ROT90, "bootleg", "Video Pool (bootleg on Moon Cresta hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, rockclim, 0, rockclim, rockclim, galaxold_state, 0, ROT180, "Taito", "Rock Climber", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongg, ckong, ckongg, ckongg, galaxold_state, 0, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ckongmc, ckong, ckongmc, ckongmc, galaxold_state, 0, ROT90, "bootleg", "Crazy Kong (bootleg on Moon Cresta hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // set was marked as 'King Kong on Galaxian'
+GAME( 1981, ckonggx, ckong, ckongg, ckonggx, galaxold_state, ckonggx, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware, encrypted, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, ckongcv, ckong, ckongg, ckonggx, galaxold_state, ckonggx, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware, encrypted, set 2)", MACHINE_NOT_WORKING )
+GAME( 1982, ckongis, ckong, ckongg, ckonggx, galaxold_state, ckonggx, ROT90, "bootleg", "Crazy Kong (bootleg on Galaxian hardware, encrypted, set 3)", MACHINE_NOT_WORKING )
+GAME( 1981, scramblb, scramble, scramblb, scramblb, galaxold_state, 0, ROT90, "bootleg", "Scramble (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scramb2, scramble, scramb2, scramb2, galaxold_state, 0, ROT90, "bootleg", "Scramble (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scrambler, scramble, scrambler, scrambler, galaxold_state, 0, ROT90, "bootleg (Reben S.A.)", "Scramble (Reben S.A. Spanish bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, 4in1, 0, 4in1, 4in1, galaxold_state, 4in1, ROT90, "Armenia / Food and Fun", "4 Fun in 1", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bagmanmc, bagman, bagmanmc, bagmanmc, galaxold_state, 0, ROT90, "bootleg", "Bagman (bootleg on Moon Cresta hardware, set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, bagmanm2, bagman, bagmanmc, bagmanmc, galaxold_state, 0, ROT90, "bootleg (GIB)", "Bagman (bootleg on Moon Cresta hardware, set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dkongjrm, dkongjr, dkongjrm, dkongjrm, galaxold_state, 0, ROT90, "bootleg", "Donkey Kong Jr. (bootleg on Moon Cresta hardware)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, porter, dockman, porter, porter, galaxold_state, 0, ROT90, "bootleg", "Port Man (bootleg on Moon Cresta hardware)", MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL )
+GAME( 1982, tazzmang, tazmania, tazzmang, tazzmang, galaxold_state, 0, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, tazzmang2, tazmania, tazzmang, tazzmang, galaxold_state, 0, ROT90, "bootleg", "Tazz-Mania (bootleg on Galaxian hardware with Starfield)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, bongo, 0, bongo, bongo, galaxold_state, 0, ROT90, "Jetsoft", "Bongo", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ozon1, 0, ozon1, ozon1, galaxold_state, 0, ROT90, "Proma", "Ozon I", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, guttangt, locomotn, guttang, guttangt, galaxold_state, guttangt, ROT270, "bootleg (Recreativos Franco?)", "Guttang Gottong (bootleg on Galaxian type hardware)", MACHINE_NOT_WORKING | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // or by 'Tren' ?
// Videotron cartridge system
GAME( 1981, hustlerb3, hustler, videotron, hustlerb3, driver_device, 0, ROT90, "bootleg (Videotron)", "Video Pool (Video Hustler bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, froggerv, frogger, videotron, froggerv, driver_device, 0, ROT90, "bootleg (Videotron / Gamepack)", "Frogger (Videotron bootleg)", MACHINE_SUPPORTS_SAVE )
/* S2650 games */
-// YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY, FULLNAME, FLAGS, LAYOUT
-GAME( 1983, hunchbkg, hunchbak, hunchbkg, hunchbkg, driver_device, 0, ROT90, "Century Electronics", "Hunchback (Galaxian hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, spcwarp, 0, spcwarp, hunchbkg, driver_device, 0, ROT90, "Century Electronics", "Space Warp? (Cosmos conversion on Galaxian hardware)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_WRONG_COLORS ) // bad dump
-GAME( 1984, drivfrcg, drivfrcp, drivfrcg, drivfrcg, driver_device, 0, ROT90, "Shinkai Inc. (Magic Electronics USA license)", "Driving Force (Galaxian conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, drivfrct, drivfrcp, drivfrcg, drivfrcg, driver_device, 0, ROT90, "bootleg (EMT Germany)", "Top Racer (bootleg of Driving Force)", MACHINE_SUPPORTS_SAVE ) // Video Klein PCB
-GAME( 1985, drivfrcb, drivfrcp, drivfrcg, drivfrcg, driver_device, 0, ROT90, "bootleg (Elsys Software)", "Driving Force (Galaxian conversion bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, racknrol, 0, racknrol, racknrol, driver_device, 0, ROT0, "Senko Industries (Status license from Shinkai Inc.)", "Rack + Roll", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, hexpool, racknrol, racknrol, racknrol, driver_device, 0, ROT90, "Senko Industries (Shinkai Inc. license)", "Hex Pool (Shinkai)", MACHINE_SUPPORTS_SAVE ) // still has Senko logo in gfx rom
-GAME( 1985, hexpoola, racknrol, hexpoola, racknrol, driver_device, 0, ROT90, "Senko Industries", "Hex Pool (Senko)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, trvchlng, 0, racknrol, trvchlng, driver_device, 0, ROT90, "Joyland (Senko license)", "Trivia Challenge", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY, FULLNAME, FLAGS, LAYOUT
+GAME( 1983, hunchbkg, hunchbak, hunchbkg, hunchbkg, galaxold_state, 0, ROT90, "Century Electronics", "Hunchback (Galaxian hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, spcwarp, 0, spcwarp, hunchbkg, galaxold_state, 0, ROT90, "Century Electronics", "Space Warp? (Cosmos conversion on Galaxian hardware)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_WRONG_COLORS ) // bad dump
+GAME( 1984, drivfrcg, drivfrcp, drivfrcg, drivfrcg, galaxold_state, 0, ROT90, "Shinkai Inc. (Magic Electronics USA license)", "Driving Force (Galaxian conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, drivfrct, drivfrcp, drivfrcg, drivfrcg, galaxold_state, 0, ROT90, "bootleg (EMT Germany)", "Top Racer (bootleg of Driving Force)", MACHINE_SUPPORTS_SAVE ) // Video Klein PCB
+GAME( 1985, drivfrcb, drivfrcp, drivfrcg, drivfrcg, galaxold_state, 0, ROT90, "bootleg (Elsys Software)", "Driving Force (Galaxian conversion bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, racknrol, 0, racknrol, racknrol, galaxold_state, 0, ROT0, "Senko Industries (Status license from Shinkai Inc.)", "Rack + Roll", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, hexpool, racknrol, racknrol, racknrol, galaxold_state, 0, ROT90, "Senko Industries (Shinkai Inc. license)", "Hex Pool (Shinkai)", MACHINE_SUPPORTS_SAVE ) // still has Senko logo in gfx rom
+GAME( 1985, hexpoola, racknrol, hexpoola, racknrol, galaxold_state, 0, ROT90, "Senko Industries", "Hex Pool (Senko)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, trvchlng, 0, racknrol, trvchlng, galaxold_state, 0, ROT90, "Joyland (Senko license)", "Trivia Challenge", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
GAME( 1985, bullsdrtg, bullsdrt, bullsdrtg, racknrol, galaxold_state, bullsdrtg, ROT90, "Senko Industries", "Bulls Eye Darts (Galaxian conversion)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS )
diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp
index d941e53809c..dc9794d77cf 100644
--- a/src/mame/drivers/galaxy.cpp
+++ b/src/mame/drivers/galaxy.cpp
@@ -172,7 +172,7 @@ static GFXDECODE_START( galaxy )
GFXDECODE_END
-static MACHINE_CONFIG_START( galaxy, galaxy_state )
+static MACHINE_CONFIG_START( galaxy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL / 2)
MCFG_CPU_PROGRAM_MAP(galaxy_mem)
@@ -214,7 +214,7 @@ static MACHINE_CONFIG_START( galaxy, galaxy_state )
MCFG_RAM_EXTRA_OPTIONS("2K,22K,38K,54K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( galaxyp, galaxy_state )
+static MACHINE_CONFIG_START( galaxyp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL / 2)
MCFG_CPU_PROGRAM_MAP(galaxyp_mem)
@@ -274,6 +274,6 @@ ROM_START (galaxyp)
ROM_LOAD ("galchr.bin", 0x0000, 0x0800, CRC(5c3b5bb5) SHA1(19429a61dc5e55ddec3242a8f695e06dd7961f88))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(1983, galaxy, 0, 0, galaxy, galaxy, galaxy_state, galaxy, "Voja Antonic / Elektronika inzenjering", "Galaksija", 0)
-COMP(1985, galaxyp, galaxy, 0, galaxyp,galaxyp, galaxy_state,galaxyp,"Nenad Dunjic", "Galaksija plus", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP(1983, galaxy, 0, 0, galaxy, galaxy, galaxy_state, galaxy, "Voja Antonic / Elektronika inzenjering", "Galaksija", 0)
+COMP(1985, galaxyp, galaxy, 0, galaxyp,galaxyp, galaxy_state, galaxyp,"Nenad Dunjic", "Galaksija plus", 0)
diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp
index 3b7c629f0d0..4c5d2350640 100644
--- a/src/mame/drivers/galeb.cpp
+++ b/src/mame/drivers/galeb.cpp
@@ -163,7 +163,7 @@ static INPUT_PORTS_START( galeb )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( galeb, galeb_state )
+static MACHINE_CONFIG_START( galeb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000)
MCFG_CPU_PROGRAM_MAP(galeb_mem)
@@ -204,5 +204,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, galeb, 0, 0, galeb, galeb, driver_device, 0, "PEL Varazdin", "Galeb", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, galeb, 0, 0, galeb, galeb, galeb_state, 0, "PEL Varazdin", "Galeb", 0 )
diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp
index 79640e233c6..8e71c8b0589 100644
--- a/src/mame/drivers/galgame.cpp
+++ b/src/mame/drivers/galgame.cpp
@@ -318,7 +318,7 @@ void galaxygame_state::machine_reset()
m_interrupt = 0;
}
-static MACHINE_CONFIG_START( galaxygame, galaxygame_state )
+static MACHINE_CONFIG_START( galaxygame )
MCFG_CPU_ADD("maincpu", T11, 3000000 )
MCFG_CPU_PROGRAM_MAP(galaxygame_map)
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index 8f1afb05da9..4e1d7b2efde 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -53,12 +53,11 @@ Notes:
***************************************************************************/
-class galgames_slot_device;
-extern const device_type GALGAMES_CART;
-extern const device_type GALGAMES_BIOS_CART;
-extern const device_type GALGAMES_STARPAK2_CART;
-extern const device_type GALGAMES_STARPAK3_CART;
-extern const device_type GALGAMES_SLOT;
+DECLARE_DEVICE_TYPE(GALGAMES_CART, galgames_cart_device)
+DECLARE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device)
+DECLARE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device)
+DECLARE_DEVICE_TYPE(GALGAMES_STARPAK3_CART, galgames_starpak3_cart_device)
+DECLARE_DEVICE_TYPE(GALGAMES_SLOT, galgames_slot_device)
// CART declaration
@@ -67,7 +66,7 @@ class galgames_cart_device : public device_t, public device_rom_interface
public:
// construction/destruction
galgames_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- galgames_cart_device(mconfig, GALGAMES_CART, "Galaxy Games StarPak Cartridge", tag, owner, clock, "starpak_cart", __FILE__)
+ galgames_cart_device(mconfig, GALGAMES_CART, tag, owner, clock)
{ }
// static configuration
@@ -96,12 +95,9 @@ protected:
galgames_cart_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source);
+ uint32_t clock);
// device-level overrides
virtual void device_start() override { }
@@ -131,7 +127,7 @@ protected:
};
// device type definition
-const device_type GALGAMES_CART = device_creator<galgames_cart_device>;
+DEFINE_DEVICE_TYPE(GALGAMES_CART, galgames_cart_device, "starpak_cart", "Galaxy Games StarPak Cartridge")
#define MCFG_GALGAMES_CART_INDEX(_cart) \
galgames_cart_device::static_set_cart(*device, _cart);
@@ -156,14 +152,14 @@ class galgames_bios_cart_device : public galgames_cart_device
public:
// construction/destruction
galgames_bios_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- galgames_cart_device(mconfig, GALGAMES_BIOS_CART, "Galaxy Games BIOS Cartridge", tag, owner, clock, "galgames_bios_cart", __FILE__)
+ galgames_cart_device(mconfig, GALGAMES_BIOS_CART, tag, owner, clock)
{ }
protected:
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(bios); }
};
-const device_type GALGAMES_BIOS_CART = device_creator<galgames_bios_cart_device>;
+DEFINE_DEVICE_TYPE(GALGAMES_BIOS_CART, galgames_bios_cart_device, "galgames_bios_cart", "Galaxy Games BIOS Cartridge")
#define MCFG_GALGAMES_BIOS_CART_ADD(_tag, _cart) \
MCFG_DEVICE_ADD(_tag, GALGAMES_BIOS_CART, 0) \
@@ -186,14 +182,14 @@ class galgames_starpak2_cart_device : public galgames_cart_device
public:
// construction/destruction
galgames_starpak2_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- galgames_cart_device(mconfig, GALGAMES_STARPAK2_CART, "Galaxy Games StarPak 2 Cartridge", tag, owner, clock, "starpak2_cart", __FILE__)
+ galgames_cart_device(mconfig, GALGAMES_STARPAK2_CART, tag, owner, clock)
{ }
protected:
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak2); }
};
-const device_type GALGAMES_STARPAK2_CART = device_creator<galgames_starpak2_cart_device>;
+DEFINE_DEVICE_TYPE(GALGAMES_STARPAK2_CART, galgames_starpak2_cart_device, "starpak2_cart", "Galaxy Games StarPak 2 Cartridge")
#define MCFG_GALGAMES_STARPAK2_CART_ADD(_tag, _cart) \
MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK2_CART, 0) \
@@ -218,14 +214,14 @@ class galgames_starpak3_cart_device : public galgames_cart_device
public:
// construction/destruction
galgames_starpak3_cart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- galgames_cart_device(mconfig, GALGAMES_STARPAK3_CART, "Galaxy Games StarPak 3 Cartridge", tag, owner, clock, "starpak3_cart", __FILE__)
+ galgames_cart_device(mconfig, GALGAMES_STARPAK3_CART, tag, owner, clock)
{ }
protected:
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak3); }
};
-const device_type GALGAMES_STARPAK3_CART = device_creator<galgames_starpak3_cart_device>;
+DEFINE_DEVICE_TYPE(GALGAMES_STARPAK3_CART, galgames_starpak3_cart_device, "starpak3_cart", "Galaxy Games StarPak 3 Cartridge")
#define MCFG_GALGAMES_STARPAK3_CART_ADD(_tag, _cart) \
MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK3_CART, 0) \
@@ -306,7 +302,7 @@ protected:
};
// device type definition
-const device_type GALGAMES_SLOT = device_creator<galgames_slot_device>;
+DEFINE_DEVICE_TYPE(GALGAMES_SLOT, galgames_slot_device, "starpak_slot", "Galaxy Games Slot")
#define MCFG_GALGAMES_SLOT_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, GALGAMES_SLOT, 0)
@@ -316,13 +312,10 @@ const device_type GALGAMES_SLOT = device_creator<galgames_slot_device>;
galgames_cart_device::galgames_cart_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source):
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+ uint32_t clock):
+ device_t(mconfig, type, tag, owner, clock),
device_rom_interface(mconfig, *this, 21, ENDIANNESS_BIG, 16),
m_mconfig_additions(nullptr),
m_cart(0),
@@ -568,7 +561,7 @@ DEVICE_ADDRESS_MAP_START( slot_map, 16, galgames_slot_device )
ADDRESS_MAP_END
galgames_slot_device::galgames_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, GALGAMES_SLOT, "Galaxy Games Slot", tag, owner, clock, "galgames_slot", __FILE__),
+ device_t(mconfig, GALGAMES_SLOT, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_space_config("slot_space", ENDIANNESS_BIG, 16,22, 0, address_map_delegate(FUNC(galgames_slot_device::slot_map), this)),
m_ram(*this, "ram"),
@@ -968,7 +961,7 @@ int galgames_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high)
return reg_low | (reg_mid << 16);
}
-static MACHINE_CONFIG_START( galgames_base, galgames_state )
+static MACHINE_CONFIG_START( galgames_base )
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
MCFG_CPU_PROGRAM_MAP(galgames_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galgames_state, scanline_interrupt, "screen", 0, 1)
@@ -996,7 +989,7 @@ static MACHINE_CONFIG_START( galgames_base, galgames_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 16, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified (voices in galgame4 seem ok)
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 16, PIN7_HIGH) // clock frequency & pin 7 not verified (voices in galgame4 seem ok)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1214,7 +1207,7 @@ ROM_START( galgame4 )
ROM_END
-GAME( 1998, galgbios, 0, galgbios, galgames, driver_device, 0, ROT0, "Creative Electronics & Software", "Galaxy Games BIOS", MACHINE_IS_BIOS_ROOT )
-GAME( 1998, galgame2, galgbios, galgame2, galgames, driver_device, 0, ROT0, "Creative Electronics & Software / Namco", "Galaxy Games StarPak 2", 0 )
-GAME( 1998, galgame3, galgbios, galgame3, galgames, driver_device, 0, ROT0, "Creative Electronics & Software / Atari", "Galaxy Games StarPak 3", 0 )
-GAME( 1998, galgame4, galgbios, galgame3, galgames, driver_device, 0, ROT0, "Creative Electronics & Software", "Galaxy Games StarPak 4 (prototype)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, galgbios, 0, galgbios, galgames, galgames_state, 0, ROT0, "Creative Electronics & Software", "Galaxy Games BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 1998, galgame2, galgbios, galgame2, galgames, galgames_state, 0, ROT0, "Creative Electronics & Software / Namco", "Galaxy Games StarPak 2", 0 )
+GAME( 1998, galgame3, galgbios, galgame3, galgames, galgames_state, 0, ROT0, "Creative Electronics & Software / Atari", "Galaxy Games StarPak 3", 0 )
+GAME( 1998, galgame4, galgbios, galgame3, galgames, galgames_state, 0, ROT0, "Creative Electronics & Software", "Galaxy Games StarPak 4 (prototype)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp
index 5d03251e3d3..0a9ce0d9447 100644
--- a/src/mame/drivers/galivan.cpp
+++ b/src/mame/drivers/galivan.cpp
@@ -418,7 +418,7 @@ MACHINE_RESET_MEMBER(galivan_state,ninjemak)
m_ninjemak_dispdisable = 0;
}
-static MACHINE_CONFIG_START( galivan, galivan_state )
+static MACHINE_CONFIG_START( galivan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */
@@ -468,7 +468,7 @@ static MACHINE_CONFIG_START( galivan, galivan_state )
MCFG_SOUND_ROUTE_EX(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac2", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ninjemak, galivan_state )
+static MACHINE_CONFIG_START( ninjemak )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz? */
@@ -1180,16 +1180,16 @@ DRIVER_INIT_MEMBER(galivan_state,youmab)
}
-GAME( 1985, galivan, 0, galivan, galivan, driver_device, 0, ROT270, "Nichibutsu", "Cosmo Police Galivan (12/26/1985)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, galivan2, galivan, galivan, galivan, driver_device, 0, ROT270, "Nichibutsu", "Cosmo Police Galivan (12/16/1985)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, galivan3, galivan, galivan, galivan, driver_device, 0, ROT270, "Nichibutsu", "Cosmo Police Galivan (12/11/1985)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dangar, 0, galivan, dangar, driver_device, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (4/07/1987)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dangara, dangar, galivan, dangar2, driver_device, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (12/1/1986)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dangarb, dangar, galivan, dangar2, driver_device, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (9/26/1986)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dangarj, dangar, galivan, dangar2, driver_device, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (9/26/1986, Japan)", MACHINE_SUPPORTS_SAVE|MACHINE_NOT_WORKING ) // no sprites visable
-GAME( 1986, dangarbt, dangar, galivan, dangarb, driver_device, 0, ROT270, "bootleg", "Ufo Robo Dangar (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ninjemak, 0, ninjemak, ninjemak, driver_device, 0, ROT270, "Nichibutsu", "Ninja Emaki (US)", MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION )
-GAME( 1986, youma, ninjemak, ninjemak, ninjemak, driver_device, 0, ROT270, "Nichibutsu", "Youma Ninpou Chou (Japan)", MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION )
-GAME( 1986, youma2, ninjemak, ninjemak, ninjemak, driver_device, 0, ROT270, "Nichibutsu", "Youma Ninpou Chou (Japan, alt)", MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION )
+GAME( 1985, galivan, 0, galivan, galivan, galivan_state, 0, ROT270, "Nichibutsu", "Cosmo Police Galivan (12/26/1985)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, galivan2, galivan, galivan, galivan, galivan_state, 0, ROT270, "Nichibutsu", "Cosmo Police Galivan (12/16/1985)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, galivan3, galivan, galivan, galivan, galivan_state, 0, ROT270, "Nichibutsu", "Cosmo Police Galivan (12/11/1985)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dangar, 0, galivan, dangar, galivan_state, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (4/07/1987)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dangara, dangar, galivan, dangar2, galivan_state, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (12/1/1986)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dangarb, dangar, galivan, dangar2, galivan_state, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (9/26/1986)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dangarj, dangar, galivan, dangar2, galivan_state, 0, ROT270, "Nichibutsu", "Ufo Robo Dangar (9/26/1986, Japan)", MACHINE_SUPPORTS_SAVE|MACHINE_NOT_WORKING ) // no sprites visable
+GAME( 1986, dangarbt, dangar, galivan, dangarb, galivan_state, 0, ROT270, "bootleg", "Ufo Robo Dangar (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ninjemak, 0, ninjemak, ninjemak, galivan_state, 0, ROT270, "Nichibutsu", "Ninja Emaki (US)", MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION )
+GAME( 1986, youma, ninjemak, ninjemak, ninjemak, galivan_state, 0, ROT270, "Nichibutsu", "Youma Ninpou Chou (Japan)", MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION )
+GAME( 1986, youma2, ninjemak, ninjemak, ninjemak, galivan_state, 0, ROT270, "Nichibutsu", "Youma Ninpou Chou (Japan, alt)", MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION )
GAME( 1986, youmab, ninjemak, youmab, ninjemak, galivan_state, youmab, ROT270, "bootleg", "Youma Ninpou Chou (Game Electronics bootleg, set 1)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION ) // player is invincible
GAME( 1986, youmab2, ninjemak, youmab, ninjemak, galivan_state, youmab, ROT270, "bootleg", "Youma Ninpou Chou (Game Electronics bootleg, set 2)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE|MACHINE_UNEMULATED_PROTECTION ) // ""
diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp
index 6d9fb7a5692..0caf5eb790f 100644
--- a/src/mame/drivers/galpani2.cpp
+++ b/src/mame/drivers/galpani2.cpp
@@ -619,7 +619,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(galpani2_state::galpani2_interrupt2)
m_subcpu->set_input_line(3, HOLD_LINE);
}
-static MACHINE_CONFIG_START( galpani2, galpani2_state )
+static MACHINE_CONFIG_START( galpani2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_27MHz/2) /* Confirmed on galpani2i PCB */
@@ -660,10 +660,10 @@ static MACHINE_CONFIG_START( galpani2, galpani2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_20MHz/10, OKIM6295_PIN7_HIGH) /* Confirmed on galpani2i PCB */
+ MCFG_OKIM6295_ADD("oki1", XTAL_20MHz/10, PIN7_HIGH) /* Confirmed on galpani2i PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_20MHz/10, OKIM6295_PIN7_HIGH) /* Confirmed on galpani2i PCB */
+ MCFG_OKIM6295_ADD("oki2", XTAL_20MHz/10, PIN7_HIGH) /* Confirmed on galpani2i PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1200,15 +1200,15 @@ ROM_START( gp2quiz )
ROM_LOAD( "gp2-101-0044.u60", 0x200000, 0x100000, CRC(3c45134f) SHA1(a5362bfcc6beb6e776c1bce4544475f8947fccea) )
ROM_END
-GAME( 1993, galpani2, 0, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (Asia)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2e, galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (English)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2e2,galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (English, 2 PCB ver.)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2g, galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (Germany, 2 PCB ver.)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2i, galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (Italy, single PCB)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2gs,galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (Germany, single PCB)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2t, galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (Taiwan)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, galpani2j, galpani2, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II (Japan)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // it is a 'quiz edition' but the title screen doesn't say, maybe all Japanese versions have the Quiz
+GAME( 1993, galpani2, 0, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (Asia)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2e, galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (English)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2e2,galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (English, 2 PCB ver.)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2g, galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (Germany, 2 PCB ver.)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2i, galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (Italy, single PCB)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2gs,galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (Germany, single PCB)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2t, galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (Taiwan)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, galpani2j, galpani2, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II (Japan)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // it is a 'quiz edition' but the title screen doesn't say, maybe all Japanese versions have the Quiz
-GAME( 1993, gp2quiz, 0, galpani2, galpani2, driver_device, 0, ROT90, "Kaneko", "Gals Panic II - Quiz Version", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // this one has 'quiz edition' on the title screen
+GAME( 1993, gp2quiz, 0, galpani2, galpani2, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II - Quiz Version", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // this one has 'quiz edition' on the title screen
-GAME( 1994, gp2se, 0, galpani2, gp2se, driver_device, 0, ROT90, "Kaneko", "Gals Panic II' - Special Edition (Japan)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gp2se, 0, galpani2, gp2se, galpani2_state, 0, ROT90, "Kaneko", "Gals Panic II' - Special Edition (Japan)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index 30f068024a9..99e238bcfe1 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -501,7 +501,7 @@ static ADDRESS_MAP_START( galpani3_map, AS_PROGRAM, 16, galpani3_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( galpani3, galpani3_state )
+static MACHINE_CONFIG_START( galpani3 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_28_63636MHz/2) // Confirmed from PCB
MCFG_CPU_PROGRAM_MAP(galpani3_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", galpani3_state, galpani3_vblank, "screen", 0, 1)
@@ -646,7 +646,7 @@ ROM_END
-GAME( 1995, galpani3, 0, galpani3, galpani3, driver_device, 0, ROT90, "Kaneko", "Gals Panic 3 (Euro)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, galpani3j, galpani3, galpani3, galpani3, driver_device, 0, ROT90, "Kaneko", "Gals Panic 3 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, galpani3k, galpani3, galpani3, galpani3, driver_device, 0, ROT90, "Kaneko", "Gals Panic 3 (Korea)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, galpani3hk,galpani3, galpani3, galpani3, driver_device, 0, ROT90, "Kaneko", "Gals Panic 3 (Hong Kong)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, galpani3, 0, galpani3, galpani3, galpani3_state, 0, ROT90, "Kaneko", "Gals Panic 3 (Euro)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, galpani3j, galpani3, galpani3, galpani3, galpani3_state, 0, ROT90, "Kaneko", "Gals Panic 3 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, galpani3k, galpani3, galpani3, galpani3, galpani3_state, 0, ROT90, "Kaneko", "Gals Panic 3 (Korea)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, galpani3hk,galpani3, galpani3, galpani3, galpani3_state, 0, ROT90, "Kaneko", "Gals Panic 3 (Hong Kong)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp
index 589e1a3b268..155a36a3cfe 100644
--- a/src/mame/drivers/galpanic.cpp
+++ b/src/mame/drivers/galpanic.cpp
@@ -230,7 +230,7 @@ static GFXDECODE_START( galpanic )
GFXDECODE_END
-static MACHINE_CONFIG_START( galpanic, galpanic_state )
+static MACHINE_CONFIG_START( galpanic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
@@ -261,7 +261,7 @@ static MACHINE_CONFIG_START( galpanic, galpanic_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, galpanic_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -349,6 +349,6 @@ ROM_START( galpanicb ) /* PAMERA-04 PCB with the CALC1 MCU used */
ROM_LOAD( "pm007e.u", 0x80000, 0x80000, CRC(c7ed7950) SHA1(133258b058d3c562208d0d00b9fac71202647c32) )
ROM_END
-GAME( 1990, galpanic, 0, galpanic, galpanic, driver_device, 0, ROT90, "Kaneko", "Gals Panic (Unprotected)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, galpanica, galpanic, galpanica, galpanica, driver_device, 0, ROT90, "Kaneko", "Gals Panic (MCU Protected, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, galpanicb, galpanic, galpanica, galpanica, driver_device, 0, ROT90, "Kaneko", "Gals Panic (MCU Protected, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galpanic, 0, galpanic, galpanic, galpanic_state, 0, ROT90, "Kaneko", "Gals Panic (Unprotected)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galpanica, galpanic, galpanica, galpanica, galpanic_state, 0, ROT90, "Kaneko", "Gals Panic (MCU Protected, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, galpanicb, galpanic, galpanica, galpanica, galpanic_state, 0, ROT90, "Kaneko", "Gals Panic (MCU Protected, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp
index 66bfb33ebab..cedc5820fe4 100644
--- a/src/mame/drivers/galspnbl.cpp
+++ b/src/mame/drivers/galspnbl.cpp
@@ -212,7 +212,7 @@ void galspnbl_state::machine_start()
{
}
-static MACHINE_CONFIG_START( galspnbl, galspnbl_state )
+static MACHINE_CONFIG_START( galspnbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* 12 MHz ??? - Use value from Tecmo's Super Pinball Action - NEEDS VERIFICATION!! */
@@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( galspnbl, galspnbl_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* Use value from Super Pinball Action - clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH) /* Use value from Super Pinball Action - clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -319,5 +319,5 @@ ROM_START( hotpinbl )
ROM_END
-GAME( 1995, hotpinbl, 0, galspnbl, hotpinbl, driver_device, 0, ROT90, "Comad & New Japan System", "Hot Pinball", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, galspnbl, 0, galspnbl, galspnbl, driver_device, 0, ROT90, "Comad", "Gals Pinball", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, hotpinbl, 0, galspnbl, hotpinbl, galspnbl_state, 0, ROT90, "Comad & New Japan System", "Hot Pinball", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, galspnbl, 0, galspnbl, galspnbl, galspnbl_state, 0, ROT90, "Comad", "Gals Pinball", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp
index edf56c3761d..132cdc1e4d0 100644
--- a/src/mame/drivers/gamate.cpp
+++ b/src/mame/drivers/gamate.cpp
@@ -14,8 +14,11 @@
******************************************************************************/
#include "emu.h"
-#include "includes/gamate.h"
+#include "audio/gamate.h"
+#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
+#include "cpu/m6502/m6502.h"
#include "rendlay.h"
#include "screen.h"
#include "softlist.h"
@@ -374,7 +377,7 @@ INTERRUPT_GEN_MEMBER(gamate_state::gamate_interrupt)
{
}
-static MACHINE_CONFIG_START( gamate, gamate_state )
+static MACHINE_CONFIG_START( gamate )
MCFG_CPU_ADD("maincpu", M6502, 4433000/2)
MCFG_CPU_PROGRAM_MAP(gamate_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gamate_state, gamate_interrupt)
@@ -430,5 +433,5 @@ ROM_START(gamate)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-CONS( 1990, gamate, 0, 0, gamate, gamate, gamate_state, gamate, "Bit Corp", "Gamate", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 1990, gamate, 0, 0, gamate, gamate, gamate_state, gamate, "Bit Corp", "Gamate", 0 )
diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp
index b9d896ea5e3..0334298b544 100644
--- a/src/mame/drivers/gambl186.cpp
+++ b/src/mame/drivers/gambl186.cpp
@@ -465,7 +465,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( gambl186, gambl186_state )
+static MACHINE_CONFIG_START( gambl186 )
MCFG_CPU_ADD("maincpu", I80186, XTAL_40MHz)
MCFG_CPU_PROGRAM_MAP(gambl186_map)
MCFG_CPU_IO_MAP(gambl186_io)
@@ -524,6 +524,6 @@ ROM_START( gambl186b )
ROM_END
// version numbering isn't clear, rom labels don't agree with test mode display.
-GAME( 1997, gambl186, 0, gambl186, gambl186, driver_device, 0, ROT0, "EGD", "Multi Game (Versione 4.0.3 - 1.5.7, 05-FEV-99(397)) (V398?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Versione 4.0.3 (1.5.7), csmb15A, CSMB_0015A (IT), - 05-FEV-99(397)
-GAME( 1997, gambl186a, gambl186, gambl186, gambl186, driver_device, 0, ROT0, "EGD", "Multi Game (Versione 4.0.3 - 1.5.7, 05-FEV-99(397)) (V399?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // same?
-GAME( 1997, gambl186b, gambl186, gambl186, gambl186, driver_device, 0, ROT0, "EGD", "Multi Game (Versione 3.8.6T - 1.5.6, 25-AUG-97) (V378?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Versione 3.8.6T (1.5.6), mult5_it, CSMB-0000F (IT), 25-AUG-97
+GAME( 1997, gambl186, 0, gambl186, gambl186, gambl186_state, 0, ROT0, "EGD", "Multi Game (Versione 4.0.3 - 1.5.7, 05-FEV-99(397)) (V398?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Versione 4.0.3 (1.5.7), csmb15A, CSMB_0015A (IT), - 05-FEV-99(397)
+GAME( 1997, gambl186a, gambl186, gambl186, gambl186, gambl186_state, 0, ROT0, "EGD", "Multi Game (Versione 4.0.3 - 1.5.7, 05-FEV-99(397)) (V399?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // same?
+GAME( 1997, gambl186b, gambl186, gambl186, gambl186, gambl186_state, 0, ROT0, "EGD", "Multi Game (Versione 3.8.6T - 1.5.6, 25-AUG-97) (V378?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Versione 3.8.6T (1.5.6), mult5_it, CSMB-0000F (IT), 25-AUG-97
diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp
index 468abc79744..5a3763bfbca 100644
--- a/src/mame/drivers/gamecom.cpp
+++ b/src/mame/drivers/gamecom.cpp
@@ -247,7 +247,7 @@ INTERRUPT_GEN_MEMBER(gamecom_state::gamecom_interrupt)
m_maincpu->set_input_line(sm8500_cpu_device::LCDC_INT, ASSERT_LINE );
}
-static MACHINE_CONFIG_START( gamecom, gamecom_state )
+static MACHINE_CONFIG_START( gamecom )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", SM8500, XTAL_11_0592MHz/2 ) /* actually it's an sm8521 microcontroller containing an sm8500 cpu */
MCFG_CPU_PROGRAM_MAP( gamecom_mem_map)
@@ -303,5 +303,5 @@ ROM_START( gamecom )
ROM_LOAD( "external.bin", 0x00000, 0x40000, CRC(e235a589) SHA1(97f782e72d738f4d7b861363266bf46b438d9b50) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-CONS( 1997, gamecom, 0, 0, gamecom, gamecom, gamecom_state, gamecom, "Tiger", "Game.com", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 1997, gamecom, 0, 0, gamecom, gamecom, gamecom_state, gamecom, "Tiger", "Game.com", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp
index 19f16bd744a..03a738d3590 100644
--- a/src/mame/drivers/gamecstl.cpp
+++ b/src/mame/drivers/gamecstl.cpp
@@ -428,7 +428,7 @@ void gamecstl_state::machine_reset()
membank("bank1")->set_base(memregion("bios")->base() + 0x30000);
}
-static MACHINE_CONFIG_START( gamecstl, gamecstl_state )
+static MACHINE_CONFIG_START( gamecstl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM3, 200000000)
MCFG_CPU_PROGRAM_MAP(gamecstl_map)
@@ -493,5 +493,5 @@ ROM_END
/*****************************************************************************/
-GAME(2002, gamecstl, 0, gamecstl, gamecstl, gamecstl_state, gamecstl, ROT0, "Cristaltec", "GameCristal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(2002, gamecstl, 0, gamecstl, gamecstl, gamecstl_state, gamecstl, ROT0, "Cristaltec", "GameCristal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
GAME(2002, gamecst2, gamecstl, gamecstl, gamecstl, gamecstl_state, gamecstl, ROT0, "Cristaltec", "GameCristal (version 2.613)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp
index 6ec2dc1d045..3ea039eaa36 100644
--- a/src/mame/drivers/gameking.cpp
+++ b/src/mame/drivers/gameking.cpp
@@ -276,7 +276,7 @@ INTERRUPT_GEN_MEMBER(gameking_state::gameking_frame_int) // guess to get over bi
}
-static MACHINE_CONFIG_START( gameking, gameking_state )
+static MACHINE_CONFIG_START( gameking )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R65C02, 6000000)
MCFG_CPU_PROGRAM_MAP(gameking_mem)
@@ -320,9 +320,9 @@ ROM_START(gamekin3)
ROM_LOAD("gm220.bin", 0x10000, 0x80000, CRC(1dc43bd5) SHA1(f9dcd3cb76bb7cb10565a1acb070ab375c082b4c) )
ROM_END
-CONS(2003, gameking, 0, 0, gameking1, gameking, gameking_state, gameking, "TimeTop", "GameKing GM-218", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 2003, gameking, 0, 0, gameking1, gameking, gameking_state, gameking, "TimeTop", "GameKing GM-218", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// the GameKing 2 (GM-219) is probably identical HW
-CONS(2003, gamekin3, 0, 0, gameking3, gameking, gameking_state, gameking, "TimeTop", "GameKing 3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 2003, gamekin3, 0, 0, gameking3, gameking, gameking_state, gameking, "TimeTop", "GameKing 3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// gameking 3: similiar cartridges, accepts gameking cartridges, gameking3 cartridges not working on gameking (illegal cartridge scroller)
// my gameking bios backup solution might work on it
diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp
index 407848b6c66..1460568edfa 100644
--- a/src/mame/drivers/gameplan.cpp
+++ b/src/mame/drivers/gameplan.cpp
@@ -956,7 +956,7 @@ MACHINE_RESET_MEMBER(gameplan_state,gameplan)
m_video_data = 0;
}
-static MACHINE_CONFIG_START( gameplan, gameplan_state )
+static MACHINE_CONFIG_START( gameplan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
@@ -1175,12 +1175,12 @@ ROM_END
*
*************************************/
-GAME( 1980, killcom, 0, gameplan, killcom, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Killer Comet", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, megatack, 0, gameplan, megatack, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Megatack (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, megatacka, megatack, gameplan, megatack, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Megatack (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, challeng, 0, gameplan, challeng, driver_device, 0, ROT0, "Game Plan (Centuri license)", "Challenger", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, kaos, 0, gameplan, kaos, driver_device, 0, ROT270, "Game Plan", "Kaos", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, leprechn, 0, leprechn, leprechn, driver_device, 0, ROT0, "Tong Electronic", "Leprechaun", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, potogold, leprechn, leprechn, potogold, driver_device, 0, ROT0, "Tong Electronic (Game Plan license)", "Pot of Gold", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, leprechp, leprechn, leprechn, potogold, driver_device, 0, ROT0, "Tong Electronic (Pacific Polytechnical license)", "Leprechaun (Pacific)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, piratetr, 0, leprechn, piratetr, driver_device, 0, ROT0, "Tong Electronic", "Pirate Treasure", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, killcom, 0, gameplan, killcom, gameplan_state, 0, ROT0, "Game Plan (Centuri license)", "Killer Comet", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, megatack, 0, gameplan, megatack, gameplan_state, 0, ROT0, "Game Plan (Centuri license)", "Megatack (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, megatacka, megatack, gameplan, megatack, gameplan_state, 0, ROT0, "Game Plan (Centuri license)", "Megatack (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, challeng, 0, gameplan, challeng, gameplan_state, 0, ROT0, "Game Plan (Centuri license)", "Challenger", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, kaos, 0, gameplan, kaos, gameplan_state, 0, ROT270, "Game Plan", "Kaos", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, leprechn, 0, leprechn, leprechn, gameplan_state, 0, ROT0, "Tong Electronic", "Leprechaun", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, potogold, leprechn, leprechn, potogold, gameplan_state, 0, ROT0, "Tong Electronic (Game Plan license)", "Pot of Gold", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, leprechp, leprechn, leprechn, potogold, gameplan_state, 0, ROT0, "Tong Electronic (Pacific Polytechnical license)", "Leprechaun (Pacific)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, piratetr, 0, leprechn, piratetr, gameplan_state, 0, ROT0, "Tong Electronic", "Pirate Treasure", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp
index 50325e3ca79..2db060cf319 100644
--- a/src/mame/drivers/gamepock.cpp
+++ b/src/mame/drivers/gamepock.cpp
@@ -41,7 +41,7 @@ static INPUT_PORTS_START( gamepock )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( gamepock, gamepock_state )
+static MACHINE_CONFIG_START( gamepock )
MCFG_CPU_ADD("maincpu", UPD78C06, XTAL_6MHz) /* uPD78C06AG */
MCFG_CPU_PROGRAM_MAP( gamepock_mem)
MCFG_UPD7810_PORTA_WRITE_CB(WRITE8(gamepock_state, port_a_w))
@@ -80,4 +80,4 @@ ROM_START( gamepock )
ROM_END
-CONS( 1984, gamepock, 0, 0, gamepock, gamepock, driver_device, 0, "Epoch", "Game Pocket Computer", 0 )
+CONS( 1984, gamepock, 0, 0, gamepock, gamepock, gamepock_state, 0, "Epoch", "Game Pocket Computer", 0 )
diff --git a/src/mame/drivers/gammagic.cpp b/src/mame/drivers/gammagic.cpp
index 33bffb291de..0bb6a173b03 100644
--- a/src/mame/drivers/gammagic.cpp
+++ b/src/mame/drivers/gammagic.cpp
@@ -122,7 +122,7 @@ void gammagic_state::machine_start()
{
}
-static MACHINE_CONFIG_START( gammagic, gammagic_state )
+static MACHINE_CONFIG_START( gammagic )
MCFG_CPU_ADD("maincpu", PENTIUM, 133000000) // Intel Pentium 133
MCFG_CPU_PROGRAM_MAP(gammagic_map)
MCFG_CPU_IO_MAP(gammagic_io)
@@ -181,6 +181,6 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1999, gammagic, 0, gammagic, gammagic, driver_device, 0, ROT0, "Bally Gaming Co.", "Game Magic", MACHINE_IS_SKELETON )
-GAME( 1999, 99bottles, gammagic, gammagic, gammagic, driver_device, 0, ROT0, "Bally Gaming Co.", "99 Bottles of Beer", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1999, gammagic, 0, gammagic, gammagic, gammagic_state, 0, ROT0, "Bally Gaming Co.", "Game Magic", MACHINE_IS_SKELETON )
+GAME( 1999, 99bottles, gammagic, gammagic, gammagic, gammagic_state, 0, ROT0, "Bally Gaming Co.", "99 Bottles of Beer", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp
index 2b7aa1ca10a..9c0b05891c4 100644
--- a/src/mame/drivers/gamtor.cpp
+++ b/src/mame/drivers/gamtor.cpp
@@ -77,7 +77,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( gaminator, gaminator_state )
+static MACHINE_CONFIG_START( gaminator )
MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) /* definitely Coldfire, model / clock uncertain */
MCFG_CPU_PROGRAM_MAP(gaminator_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaminator_state, irq6_line_hold) // irq6 seems to be needed to get past the ROM checking
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index eee69f03b61..4646a889490 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -512,7 +512,7 @@ void gaplus_state::machine_start()
}
-static MACHINE_CONFIG_START( gaplus, gaplus_state )
+static MACHINE_CONFIG_START( gaplus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */
@@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state )
MCFG_WATCHDOG_ADD("watchdog")
- MCFG_DEVICE_ADD("namcoio_1", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
@@ -539,7 +539,7 @@ static MACHINE_CONFIG_START( gaplus, gaplus_state )
MCFG_NAMCO56XX_OUT_0_CB(WRITE8(gaplus_state, out_lamps0))
MCFG_NAMCO56XX_OUT_1_CB(WRITE8(gaplus_state, out_lamps1))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("DSWA_HIGH"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("DSWB_LOW"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("DSWB_HIGH"))
@@ -583,13 +583,13 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gaplusd, gaplus )
- MCFG_DEVICE_REPLACE("namcoio_1", NAMCO58XX, 0)
+ MCFG_DEVICE_REPLACE("namcoio_1", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_REPLACE("namcoio_2", NAMCO56XX, 0)
+ MCFG_DEVICE_REPLACE("namcoio_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("DSWA_HIGH"))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("DSWB_LOW"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("DSWB_HIGH"))
@@ -602,13 +602,13 @@ static MACHINE_CONFIG_DERIVED( gapluso, gaplusd )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, gapluso_vblank_main_irq)
- MCFG_DEVICE_REPLACE("namcoio_1", NAMCO56XX, 0)
+ MCFG_DEVICE_REPLACE("namcoio_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_REPLACE("namcoio_2", NAMCO58XX, 0)
+ MCFG_DEVICE_REPLACE("namcoio_2", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("DSWA_HIGH"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("DSWB_LOW"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("DSWB_HIGH"))
diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp
index 2dcef27e1e0..659dda32ff0 100644
--- a/src/mame/drivers/gatron.cpp
+++ b/src/mame/drivers/gatron.cpp
@@ -563,7 +563,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( gat, gatron_state )
+static MACHINE_CONFIG_START( gat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/24) /* 666.66 kHz, guess */
@@ -638,7 +638,7 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1983, poker41, 0, gat, poker41, driver_device, 0, ROT0, "Game-A-Tron", "Four In One Poker", 0, layout_poker41 )
-GAMEL( 1983, pulltabs, 0, gat, pulltabs, driver_device, 0, ROT0, "Game-A-Tron", "Pull Tabs", 0, layout_pulltabs )
-GAMEL( 1983, bingo, 0, gat, bingo, driver_device, 0, ROT0, "Game-A-Tron", "Bingo", 0, layout_bingo )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+GAMEL( 1983, poker41, 0, gat, poker41, gatron_state, 0, ROT0, "Game-A-Tron", "Four In One Poker", 0, layout_poker41 )
+GAMEL( 1983, pulltabs, 0, gat, pulltabs, gatron_state, 0, ROT0, "Game-A-Tron", "Pull Tabs", 0, layout_pulltabs )
+GAMEL( 1983, bingo, 0, gat, bingo, gatron_state, 0, ROT0, "Game-A-Tron", "Bingo", 0, layout_bingo )
diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp
index a1eb2ba0c42..ad4aefc67af 100644
--- a/src/mame/drivers/gauntlet.cpp
+++ b/src/mame/drivers/gauntlet.cpp
@@ -491,7 +491,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( gauntlet_base, gauntlet_state )
+static MACHINE_CONFIG_START( gauntlet_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
@@ -1697,35 +1697,35 @@ DRIVER_INIT_MEMBER(gauntlet_state,vindctr2)
*
*************************************/
-GAME( 1985, gauntlet, 0, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 14)", 0 )
-GAME( 1985, gauntlets, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (Spanish, rev 15)", 0 )
-GAME( 1985, gauntletj, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (Japanese, rev 13)", 0 )
-GAME( 1985, gauntletg, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 10)", 0 )
-GAME( 1985, gauntletj12, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (Japanese, rev 12)", 0 )
-GAME( 1985, gauntletr9, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 9)", 0 )
-GAME( 1985, gauntletgr8, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 8)", 0 )
-GAME( 1985, gauntletr7, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 7)", 0 )
-GAME( 1985, gauntletgr6, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 6)", 0 )
-GAME( 1985, gauntletr5, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 5)", 0 )
-GAME( 1985, gauntletr4, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 4)", 0 )
-GAME( 1985, gauntletgr3, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 3)", 0 )
-GAME( 1985, gauntletr2, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 2)", 0 )
-GAME( 1985, gauntletr1, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 1)", 0 )
-
-GAME( 1985, gauntlet2p, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, rev 6)", 0 )
-GAME( 1985, gauntlet2pj, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, Japanese, rev 5)", 0 )
-GAME( 1985, gauntlet2pg, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, German, rev 4)", 0 )
-GAME( 1985, gauntlet2pr3, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, rev 3)", 0 )
-GAME( 1985, gauntlet2pj2, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, Japanese, rev 2)", 0 )
-GAME( 1985, gauntlet2pg1, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, German, rev 1)", 0 )
-
-GAME( 1986, gaunt2, 0, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II", 0 )
-GAME( 1986, gaunt2g, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (German)", 0 )
-
-GAME( 1986, gaunt22p, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (2 Players, rev 2)", 0 )
-GAME( 1986, gaunt22p1, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (2 Players, rev 1)", 0 )
-GAME( 1986, gaunt22pg, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (2 Players, German)", 0 )
-
-GAME( 1988, vindctr2, 0, vindctr2, vindctr2, gauntlet_state, vindctr2, ROT0, "Atari Games", "Vindicators Part II (rev 3)", 0 )
-GAME( 1988, vindctr2r2, vindctr2, vindctr2, vindctr2, gauntlet_state, vindctr2, ROT0, "Atari Games", "Vindicators Part II (rev 2)", 0 )
-GAME( 1988, vindctr2r1, vindctr2, vindctr2, vindctr2, gauntlet_state, vindctr2, ROT0, "Atari Games", "Vindicators Part II (rev 1)", 0 )
+GAME( 1985, gauntlet, 0, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 14)", 0 )
+GAME( 1985, gauntlets, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (Spanish, rev 15)", 0 )
+GAME( 1985, gauntletj, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (Japanese, rev 13)", 0 )
+GAME( 1985, gauntletg, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 10)", 0 )
+GAME( 1985, gauntletj12, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (Japanese, rev 12)", 0 )
+GAME( 1985, gauntletr9, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 9)", 0 )
+GAME( 1985, gauntletgr8, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 8)", 0 )
+GAME( 1985, gauntletr7, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 7)", 0 )
+GAME( 1985, gauntletgr6, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 6)", 0 )
+GAME( 1985, gauntletr5, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 5)", 0 )
+GAME( 1985, gauntletr4, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 4)", 0 )
+GAME( 1985, gauntletgr3, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (German, rev 3)", 0 )
+GAME( 1985, gauntletr2, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 2)", 0 )
+GAME( 1985, gauntletr1, gauntlet, gauntlet, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (rev 1)", 0 )
+
+GAME( 1985, gauntlet2p, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, rev 6)", 0 )
+GAME( 1985, gauntlet2pj, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, Japanese, rev 5)", 0 )
+GAME( 1985, gauntlet2pg, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, German, rev 4)", 0 )
+GAME( 1985, gauntlet2pr3, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, rev 3)", 0 )
+GAME( 1985, gauntlet2pj2, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, Japanese, rev 2)", 0 )
+GAME( 1985, gauntlet2pg1, gauntlet, gaunt2p, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet (2 Players, German, rev 1)", 0 )
+
+GAME( 1986, gaunt2, 0, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II", 0 )
+GAME( 1986, gaunt2g, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (German)", 0 )
+
+GAME( 1986, gaunt22p, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (2 Players, rev 2)", 0 )
+GAME( 1986, gaunt22p1, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (2 Players, rev 1)", 0 )
+GAME( 1986, gaunt22pg, gaunt2, gauntlet2, gauntlet, gauntlet_state, gauntlet, ROT0, "Atari Games", "Gauntlet II (2 Players, German)", 0 )
+
+GAME( 1988, vindctr2, 0, vindctr2, vindctr2, gauntlet_state, vindctr2, ROT0, "Atari Games", "Vindicators Part II (rev 3)", 0 )
+GAME( 1988, vindctr2r2, vindctr2, vindctr2, vindctr2, gauntlet_state, vindctr2, ROT0, "Atari Games", "Vindicators Part II (rev 2)", 0 )
+GAME( 1988, vindctr2r1, vindctr2, vindctr2, vindctr2, gauntlet_state, vindctr2, ROT0, "Atari Games", "Vindicators Part II (rev 1)", 0 )
diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp
index 928668dea91..311dcd8b649 100644
--- a/src/mame/drivers/gb.cpp
+++ b/src/mame/drivers/gb.cpp
@@ -625,7 +625,7 @@ PALETTE_INIT_MEMBER(megaduck_state, megaduck)
}
-static MACHINE_CONFIG_START( gameboy, gb_state )
+static MACHINE_CONFIG_START( gameboy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz)
@@ -665,7 +665,7 @@ static MACHINE_CONFIG_START( gameboy, gb_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( supergb, gb_state )
+static MACHINE_CONFIG_START( supergb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", LR35902, 4295454) /* 4.295454 MHz, derived from SNES xtal */
MCFG_CPU_PROGRAM_MAP(sgb_map)
@@ -740,7 +740,7 @@ static MACHINE_CONFIG_DERIVED( gbpocket, gameboy )
MCFG_MGB_PPU_ADD("ppu", "maincpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gbcolor, gb_state )
+static MACHINE_CONFIG_START( gbcolor )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) // todo XTAL_8_388MHz
@@ -786,7 +786,7 @@ static MACHINE_CONFIG_START( gbcolor, gb_state )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("gb_list","gameboy")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( megaduck, megaduck_state )
+static MACHINE_CONFIG_START( megaduck )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", LR35902, XTAL_4_194304Mhz) /* 4.194304 MHz */
@@ -866,12 +866,12 @@ ROM_START(megaduck)
ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS(1990, gameboy, 0, 0, gameboy, gameboy, driver_device, 0, "Nintendo", "Game Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-CONS(1994, supergb, gameboy, 0, supergb, gameboy, driver_device, 0, "Nintendo", "Super Game Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-CONS(1998, supergb2, gameboy, 0, supergb2, gameboy, driver_device, 0, "Nintendo", "Super Game Boy 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-CONS(1996, gbpocket, gameboy, 0, gbpocket, gameboy, driver_device, 0, "Nintendo", "Game Boy Pocket", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-CONS(1998, gbcolor, 0, 0, gbcolor, gameboy, driver_device, 0, "Nintendo", "Game Boy Color", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+CONS(1990, gameboy, 0, 0, gameboy, gameboy, gb_state, 0, "Nintendo", "Game Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+CONS(1994, supergb, gameboy, 0, supergb, gameboy, gb_state, 0, "Nintendo", "Super Game Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+CONS(1998, supergb2, gameboy, 0, supergb2, gameboy, gb_state, 0, "Nintendo", "Super Game Boy 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+CONS(1996, gbpocket, gameboy, 0, gbpocket, gameboy, gb_state, 0, "Nintendo", "Game Boy Pocket", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+CONS(1998, gbcolor, 0, 0, gbcolor, gameboy, gb_state, 0, "Nintendo", "Game Boy Color", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
// Sound is not 100% yet, it generates some sounds which could be ok. Since we're lacking a real system there's no way to verify.
-CONS( 1993, megaduck, 0, 0, megaduck, gameboy, driver_device, 0, "Welback Holdings (Timlex International) / Creatronic / Videojet / Cougar USA", "Mega Duck / Cougar Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1993, megaduck, 0, 0, megaduck, gameboy, megaduck_state, 0, "Welback Holdings (Timlex International) / Creatronic / Videojet / Cougar USA", "Mega Duck / Cougar Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index dbd69b29c38..0596c095117 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -1397,7 +1397,7 @@ static SLOT_INTERFACE_START(gba_cart)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( gbadv, gba_state )
+static MACHINE_CONFIG_START( gbadv )
MCFG_CPU_ADD("maincpu", ARM7, XTAL_16_777216MHz)
MCFG_CPU_PROGRAM_MAP(gba_map)
@@ -1435,5 +1435,5 @@ ROM_START( gba )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS(2001, gba, 0, 0, gbadv, gbadv, driver_device, 0, "Nintendo", "Game Boy Advance", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS(2001, gba, 0, 0, gbadv, gbadv, gba_state, 0, "Nintendo", "Game Boy Advance", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp
index 63c8e06c465..cf6b5edf565 100644
--- a/src/mame/drivers/gberet.cpp
+++ b/src/mame/drivers/gberet.cpp
@@ -405,7 +405,7 @@ MACHINE_RESET_MEMBER(gberet_state,gberet)
m_spritebank = 0;
}
-static MACHINE_CONFIG_START( gberet, gberet_state )
+static MACHINE_CONFIG_START( gberet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) // X1S (generated by a custom IC)
@@ -445,7 +445,7 @@ static MACHINE_CONFIG_DERIVED( mrgoemon, gberet )
MCFG_CPU_PROGRAM_MAP(mrgoemon_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gberetb, gberet_state )
+static MACHINE_CONFIG_START( gberetb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) // divider guessed
@@ -589,7 +589,7 @@ DRIVER_INIT_MEMBER(gberet_state,mrgoemon)
*
*************************************/
-GAME( 1985, gberet, 0, gberet, gberet, driver_device, 0, ROT0, "Konami", "Green Beret", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, rushatck, gberet, gberet, gberet, driver_device, 0, ROT0, "Konami", "Rush'n Attack (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gberetb, gberet, gberetb, gberetb, driver_device, 0, ROT0, "bootleg", "Green Beret (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gberet, 0, gberet, gberet, gberet_state, 0, ROT0, "Konami", "Green Beret", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, rushatck, gberet, gberet, gberet, gberet_state, 0, ROT0, "Konami", "Rush'n Attack (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gberetb, gberet, gberetb, gberetb, gberet_state, 0, ROT0, "bootleg", "Green Beret (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, mrgoemon, 0, mrgoemon, mrgoemon, gberet_state, mrgoemon, ROT0, "Konami", "Mr. Goemon (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp
index 4dde3173039..32229922207 100644
--- a/src/mame/drivers/gcpinbal.cpp
+++ b/src/mame/drivers/gcpinbal.cpp
@@ -447,7 +447,7 @@ void gcpinbal_state::machine_reset()
m_msm_bank = 0;
}
-static MACHINE_CONFIG_START( gcpinbal, gcpinbal_state )
+static MACHINE_CONFIG_START( gcpinbal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16 MHz */
@@ -475,7 +475,7 @@ static MACHINE_CONFIG_START( gcpinbal, gcpinbal_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_DEVICE_ADD("adpcm_select", HCT157, 0)
@@ -483,7 +483,7 @@ static MACHINE_CONFIG_START( gcpinbal, gcpinbal_state )
MCFG_SOUND_ADD("msm", MSM6585, XTAL_640kHz)
MCFG_MSM6585_VCLK_CB(WRITELINE(gcpinbal_state, gcp_adpcm_int)) /* VCK function */
- MCFG_MSM6585_PRESCALER_SELECTOR(MSM6585_S40) /* 16 kHz */
+ MCFG_MSM6585_PRESCALER_SELECTOR(S40) /* 16 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -542,5 +542,5 @@ ROM_START( gcpinbal )
ROM_END
-GAME( 1994, pwrflip, 0, gcpinbal, gcpinbal, driver_device, 0, ROT270, "Excellent System", "Power Flipper Pinball Shooting v1.33", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, gcpinbal, 0, gcpinbal, gcpinbal, driver_device, 0, ROT270, "Excellent System", "Grand Cross v1.02F", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pwrflip, 0, gcpinbal, gcpinbal, gcpinbal_state, 0, ROT270, "Excellent System", "Power Flipper Pinball Shooting v1.33", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gcpinbal, 0, gcpinbal, gcpinbal, gcpinbal_state, 0, ROT270, "Excellent System", "Grand Cross v1.02F", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp
index 532c2ca46a7..6f41c07974b 100644
--- a/src/mame/drivers/gei.cpp
+++ b/src/mame/drivers/gei.cpp
@@ -1025,7 +1025,7 @@ INTERRUPT_GEN_MEMBER(gei_state::vblank_irq)
}
-static MACHINE_CONFIG_START( getrivia, gei_state )
+static MACHINE_CONFIG_START( getrivia )
MCFG_CPU_ADD("maincpu",Z80,4000000) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(getrivia_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gei_state, vblank_irq)
@@ -1889,66 +1889,66 @@ DRIVER_INIT_MEMBER(gei_state,geimulti)
membank("bank1")->set_base(memregion("bank")->base() + 0x0000);
}
-GAME( 1982, jokpoker, 0, gselect, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1983, jokpokera,jokpoker, jokpokera,gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03BI 5-10-85, Joker Poker ICB 9-30-86)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1983, jokpokerb,jokpoker, jokpokera,gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.04BI 10-19-88, Joker Poker ICB 9-30-86)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1983, jokpokerc,jokpoker, jokpokera,gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03BI 5-10-85, Poker No Raise ICB 9-30-86)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, superbwl, 0, gselect, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Super Bowl (Version 16.03B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1982, gs4002, 0, gselect, gselect, driver_device, 0, ROT0, "Greyhound Electronics", "Selection (Version 40.02TMB, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, gs4002a, gs4002, gselect, gselect, driver_device, 0, ROT0, "Greyhound Electronics", "Selection (Version 40.02TMB, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1982, amuse, 0, amuse, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Amuse (Version 50.08 IBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, amuse1, amuse, amuse1, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Amuse (Version 30.08 IBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1983, amuse1a, amuse, amuse1, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Amuse (Version 30.08A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1984, gepoker, 0, gepoker, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gepoker1, gepoker, gepoker, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gepoker2, gepoker, gepoker, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gepoker3, gepoker, gepoker, gepoker, driver_device, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 4)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1984, gtsers1, 0, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers2, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers3, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers4, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 4)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers5, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 5)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers7, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 7)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsersa, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Alt revision questions set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsersb, gtsers1, getrivia, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Alt revision questions set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers8, 0, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers8a, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 8 Alt Question Rom)",MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers9, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 9)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers10, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers11, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 11)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers11a,gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 11 Alt Question Rom)",MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gtsers12, gtsers8, findout, gt103, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 12)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, gtsers14, gtsers8, findout, gt103, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 14)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, gtsers15, gtsers8, findout, gt103, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 15)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gt103a1, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Unsorted question roms)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gt103aa, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Version 1.03a Alt questions 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gt103ab, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Version 1.03a Alt questions 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, gt103asx, gtsers8, findout, getrivia, driver_device, 0, ROT0, "Greyhound Electronics", "Trivia (Version 1.03a Sex questions)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1985, sextriv1, 0, getrivia, sextriv1, driver_device, 0, ROT0, "Kinky Kit and Game Co.", "Sexual Trivia (Version 1.02SB, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1985, sextriv2, sextriv1, getrivia, sextriv1, driver_device, 0, ROT0, "Kinky Kit and Game Co.", "Sexual Trivia (Version 1.02SB, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1986, gt507uk, 0, findout, gt507uk, driver_device, 0, ROT0, "Grayhound Electronics", "Trivia (UK Version 5.07)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1986, quiz, 0, findout, quiz, driver_device, 0, ROT0, "Elettronolo", "Quiz (Revision 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1986, quizvid, 0, quizvid, quiz, driver_device, 0, ROT0, "bootleg", "Video Quiz", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1986, reelfun, 0, findout, reelfun, driver_device, 0, ROT0, "Grayhound Electronics", "Reel Fun (Version 7.03)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, reelfun1, reelfun, findout, reelfun, driver_device, 0, ROT0, "Grayhound Electronics", "Reel Fun (Version 7.01)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1987, findout, 0, findout, findout, driver_device, 0, ROT0, "Elettronolo", "Find Out (Version 4.04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1986, suprpokr, 0, suprpokr, suprpokr, driver_device, 0, ROT0, "Grayhound Electronics", "Super Poker (Version 10.19S)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, suprpokra,suprpokr, suprpokr, suprpokr, driver_device, 0, ROT0, "Grayhound Electronics", "Super Poker (Version 10.15S)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, suprpokrb,suprpokr, suprpokr, suprpokr, driver_device, 0, ROT0, "Grayhound Electronics", "Super Poker (Version 10.10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1991, quiz211, 0, findout, quiz, driver_device, 0, ROT0, "Elettronolo", "Quiz (Revision 2.11)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1992, sexappl, 0, findout, sexappl, driver_device, 0, ROT0, "Grayhound Electronics", "Sex Appeal (Version 6.02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1992, geimulti, 0, geimulti, geimulti, gei_state, geimulti, ROT0, "Grayhound Electronics", "GEI Multi Game", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1992, sprtauth, 0, sprtauth, sprtauth, gei_state, geimulti, ROT0, "Classic Games", "Sports Authority", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, jokpoker, 0, gselect, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, jokpokera, jokpoker, jokpokera, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03BI 5-10-85, Joker Poker ICB 9-30-86)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, jokpokerb, jokpoker, jokpokera, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.04BI 10-19-88, Joker Poker ICB 9-30-86)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, jokpokerc, jokpoker, jokpokera, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03BI 5-10-85, Poker No Raise ICB 9-30-86)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, superbwl, 0, gselect, gselect, gei_state, setbank, ROT0, "Greyhound Electronics", "Super Bowl (Version 16.03B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1982, gs4002, 0, gselect, gselect, gei_state, 0, ROT0, "Greyhound Electronics", "Selection (Version 40.02TMB, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, gs4002a, gs4002, gselect, gselect, gei_state, 0, ROT0, "Greyhound Electronics", "Selection (Version 40.02TMB, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1982, amuse, 0, amuse, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Amuse (Version 50.08 IBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, amuse1, amuse, amuse1, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Amuse (Version 30.08 IBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, amuse1a, amuse, amuse1, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Amuse (Version 30.08A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1984, gepoker, 0, gepoker, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gepoker1, gepoker, gepoker, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gepoker2, gepoker, gepoker, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gepoker3, gepoker, gepoker, gepoker, gei_state, 0, ROT0, "Greyhound Electronics", "Poker (Version 50.02 ICB, set 4)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1984, gtsers1, 0, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers2, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers3, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers4, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 4)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers5, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 5)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers7, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 7)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsersa, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Alt revision questions set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsersb, gtsers1, getrivia, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Alt revision questions set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers8, 0, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers8a, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 8 Alt Question Rom)",MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers9, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 9)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers10, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers11, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 11)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers11a, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 11 Alt Question Rom)",MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gtsers12, gtsers8, findout, gt103, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 12)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, gtsers14, gtsers8, findout, gt103, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 14)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, gtsers15, gtsers8, findout, gt103, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Questions Series 15)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gt103a1, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Unsorted question roms)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gt103aa, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Version 1.03a Alt questions 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gt103ab, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Version 1.03a Alt questions 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, gt103asx, gtsers8, findout, getrivia, gei_state, 0, ROT0, "Greyhound Electronics", "Trivia (Version 1.03a Sex questions)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1985, sextriv1, 0, getrivia, sextriv1, gei_state, 0, ROT0, "Kinky Kit and Game Co.", "Sexual Trivia (Version 1.02SB, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1985, sextriv2, sextriv1, getrivia, sextriv1, gei_state, 0, ROT0, "Kinky Kit and Game Co.", "Sexual Trivia (Version 1.02SB, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1986, gt507uk, 0, findout, gt507uk, gei_state, 0, ROT0, "Grayhound Electronics", "Trivia (UK Version 5.07)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1986, quiz, 0, findout, quiz, gei_state, 0, ROT0, "Elettronolo", "Quiz (Revision 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1986, quizvid, 0, quizvid, quiz, gei_state, 0, ROT0, "bootleg", "Video Quiz", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1986, reelfun, 0, findout, reelfun, gei_state, 0, ROT0, "Grayhound Electronics", "Reel Fun (Version 7.03)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, reelfun1, reelfun, findout, reelfun, gei_state, 0, ROT0, "Grayhound Electronics", "Reel Fun (Version 7.01)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1987, findout, 0, findout, findout, gei_state, 0, ROT0, "Elettronolo", "Find Out (Version 4.04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1986, suprpokr, 0, suprpokr, suprpokr, gei_state, 0, ROT0, "Grayhound Electronics", "Super Poker (Version 10.19S)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, suprpokra, suprpokr, suprpokr, suprpokr, gei_state, 0, ROT0, "Grayhound Electronics", "Super Poker (Version 10.15S)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, suprpokrb, suprpokr, suprpokr, suprpokr, gei_state, 0, ROT0, "Grayhound Electronics", "Super Poker (Version 10.10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1991, quiz211, 0, findout, quiz, gei_state, 0, ROT0, "Elettronolo", "Quiz (Revision 2.11)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1992, sexappl, 0, findout, sexappl, gei_state, 0, ROT0, "Grayhound Electronics", "Sex Appeal (Version 6.02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1992, geimulti, 0, geimulti, geimulti, gei_state, geimulti, ROT0, "Grayhound Electronics", "GEI Multi Game", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1992, sprtauth, 0, sprtauth, sprtauth, gei_state, geimulti, ROT0, "Classic Games", "Sports Authority", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp
index 102b4ca4d28..2eea30ac2af 100644
--- a/src/mame/drivers/geneve.cpp
+++ b/src/mame/drivers/geneve.cpp
@@ -210,10 +210,10 @@
#include "sound/sn76496.h"
#include "bus/ti99x/genboard.h"
-#include "bus/ti99x/joyport.h"
-#include "bus/ti99x/colorbus.h"
-#include "bus/ti99_peb/peribox.h"
+#include "bus/ti99/colorbus/colorbus.h"
+#include "bus/ti99/joyport/joyport.h"
+#include "bus/ti99/peb/peribox.h"
#include "speaker.h"
@@ -235,8 +235,10 @@ public:
m_keyboard(*this, GKEYBOARD_TAG),
m_mapper(*this, GMAPPER_TAG),
m_peribox(*this, PERIBOX_TAG),
- m_joyport(*this,JOYPORT_TAG),
- m_colorbus(*this, COLORBUS_TAG) { }
+ m_joyport(*this, JOYPORT_TAG),
+ m_colorbus(*this, COLORBUS_TAG)
+ {
+ }
// CRU (Communication Register Unit) handling
DECLARE_READ8_MEMBER(cruread);
@@ -264,8 +266,8 @@ public:
required_device<geneve_keyboard_device> m_keyboard;
required_device<geneve_mapper_device> m_mapper;
required_device<peribox_device> m_peribox;
- required_device<joyport_device> m_joyport;
- required_device<colorbus_device> m_colorbus;
+ required_device<ti99_joyport_device> m_joyport;
+ required_device<ti99_colorbus_device> m_colorbus;
DECLARE_WRITE_LINE_MEMBER( inta );
DECLARE_WRITE_LINE_MEMBER( intb );
@@ -452,7 +454,7 @@ READ8_MEMBER( geneve_state::read_by_9901 )
switch (offset & 0x03)
{
- case TMS9901_CB_INT7:
+ case tms9901_device::CB_INT7:
//
// Read pins INT3*-INT7* of Geneve's 9901.
// bit 1: INTA status
@@ -466,7 +468,7 @@ READ8_MEMBER( geneve_state::read_by_9901 )
answer |= m_joyport->read_port()<<3;
break;
- case TMS9901_INT8_INT15:
+ case tms9901_device::INT8_INT15:
// Read pins int8_t*-INT15* of Geneve 9901.
//
// bit 0: keyboard interrupt
@@ -485,11 +487,11 @@ READ8_MEMBER( geneve_state::read_by_9901 )
if (TRACE_LINES) logerror("INT15-8 = %02x\n", answer);
break;
- case TMS9901_P0_P7:
+ case tms9901_device::P0_P7:
// Read pins P0-P7 of TMS9901. All pins are configured as outputs, so nothing here.
break;
- case TMS9901_P8_P15:
+ case tms9901_device::P8_P15:
// Read pins P8-P15 of TMS 9901.
// bit 4: mouse left button
// video wait is an output; no input possible here
@@ -682,7 +684,7 @@ void geneve_state::machine_reset()
m_joyport->write_port(0x01); // select Joystick 1
}
-static MACHINE_CONFIG_START( geneve_60hz, geneve_state )
+static MACHINE_CONFIG_START( geneve_60hz )
// basic machine hardware
// TMS9995 CPU @ 12.0 MHz
MCFG_TMS99xx_ADD("maincpu", TMS9995, 12000000, memmap, crumap)
@@ -764,5 +766,5 @@ ROM_START(geneve)
ROM_LOAD_OPTIONAL("gnmbt100.bin", 0x8000, 0x4000, CRC(19b89479) SHA1(6ef297eda78dc705946f6494e9d7e95e5216ec47)) /* CPU ROMs GenMod */
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1987,geneve, 0, 0, geneve_60hz, geneve, geneve_state, geneve, "Myarc", "Geneve 9640" , MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, geneve, 0, 0, geneve_60hz, geneve, geneve_state, geneve, "Myarc", "Geneve 9640", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index 2817b9362c0..c1e3b2dbeab 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -792,7 +792,7 @@ DEVICE_IMAGE_UNLOAD_MEMBER(geniusiq_state,iq128_cart)
}
-static MACHINE_CONFIG_START( iq128, geniusiq_state )
+static MACHINE_CONFIG_START( iq128 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // The main crystal is at 32MHz, not sure whats the CPU freq
MCFG_CPU_PROGRAM_MAP(geniusiq_mem)
@@ -828,7 +828,7 @@ static MACHINE_CONFIG_DERIVED( iqtv512, iq128 )
MCFG_AMD_29F040_ADD("flash")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gl8008cx, gl8008cx_state )
+static MACHINE_CONFIG_START( gl8008cx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // TODO wrong CPU and frequency
MCFG_CPU_PROGRAM_MAP(gl8008cx_mem)
@@ -892,12 +892,12 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1997, iq128, 0, 0, iq128, geniusiq_de, driver_device, 0, "Video Technology", "Genius IQ 128 (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1997, iq128_fr, iq128, 0, iq128, geniusiq, driver_device, 0, "Video Technology", "Genius IQ 128 (France)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1998, iqtv512, 0, 0, iqtv512, geniusiq_de, driver_device, 0, "Video Technology", "Genius IQ TV 512 (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1999, gl8008cx, 0, 0, gl8008cx, gl8008cx, driver_device, 0, "Video Technology", "Genius Leader 8008 CX (Germany)", MACHINE_IS_SKELETON)
-COMP( 1999, bs9009cx, 0, 0, gl8008cx, gl8008cx, driver_device, 0, "Video Technology", "BrainStation 9009 CXL (Germany)", MACHINE_IS_SKELETON)
-COMP( 1998, itunlim, 0, 0, iq128, geniusiq_de, driver_device, 0, "Video Technology", "Vtech IT Unlimited (UK)", MACHINE_NO_SOUND)
-COMP( 19??, iqunlim, 0, 0, iq128, geniusiq_de, driver_device, 0, "Video Technology", "Vtech IQ Unlimited (Germany)", MACHINE_IS_SKELETON)
-COMP( 19??, glmmc, 0, 0, iq128, geniusiq_de, driver_device, 0, "Video Technology", "Genius Leader Master Mega Color (Germany)", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1997, iq128, 0, 0, iq128, geniusiq_de, geniusiq_state, 0, "Video Technology", "Genius IQ 128 (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1997, iq128_fr, iq128, 0, iq128, geniusiq, geniusiq_state, 0, "Video Technology", "Genius IQ 128 (France)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1998, iqtv512, 0, 0, iqtv512, geniusiq_de, geniusiq_state, 0, "Video Technology", "Genius IQ TV 512 (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1999, gl8008cx, 0, 0, gl8008cx, gl8008cx, gl8008cx_state, 0, "Video Technology", "Genius Leader 8008 CX (Germany)", MACHINE_IS_SKELETON)
+COMP( 1999, bs9009cx, 0, 0, gl8008cx, gl8008cx, gl8008cx_state, 0, "Video Technology", "BrainStation 9009 CXL (Germany)", MACHINE_IS_SKELETON)
+COMP( 1998, itunlim, 0, 0, iq128, geniusiq_de, geniusiq_state, 0, "Video Technology", "Vtech IT Unlimited (UK)", MACHINE_NO_SOUND)
+COMP( 19??, iqunlim, 0, 0, iq128, geniusiq_de, geniusiq_state, 0, "Video Technology", "Vtech IQ Unlimited (Germany)", MACHINE_IS_SKELETON)
+COMP( 19??, glmmc, 0, 0, iq128, geniusiq_de, geniusiq_state, 0, "Video Technology", "Genius Leader Master Mega Color (Germany)", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/genpc.cpp b/src/mame/drivers/genpc.cpp
index af1adf7be39..5d3ac1b84e2 100644
--- a/src/mame/drivers/genpc.cpp
+++ b/src/mame/drivers/genpc.cpp
@@ -43,7 +43,7 @@ static DEVICE_INPUT_DEFAULTS_START(vga)
DEVICE_INPUT_DEFAULTS("DSW0",0x30, 0x00)
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( pcmda, genpc_state )
+static MACHINE_CONFIG_START( pcmda )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 4772720)
MCFG_CPU_PROGRAM_MAP(pc8_map)
@@ -151,9 +151,9 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1987, pc, ibm5150, 0, pccga, 0, driver_device, 0, "<generic>", "PC (CGA)" , 0)
-COMP( 1987, pcega, ibm5150, 0, pcega, 0, driver_device, 0, "<generic>", "PC (EGA)" , 0)
-COMP ( 1987, pcmda, ibm5150, 0, pcmda, 0, driver_device, 0, "<generic>", "PC (MDA)" , 0)
-COMP ( 1987, pcherc, ibm5150, 0, pcherc, 0, driver_device, 0, "<generic>", "PC (Hercules)" , 0)
-COMP ( 1987, pcvga, ibm5150, 0, pcvga, 0, driver_device, 0, "<generic>", "PC (VGA)" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME
+COMP( 1987, pc, ibm5150, 0, pccga, 0, genpc_state, 0, "<generic>", "PC (CGA)", 0 )
+COMP( 1987, pcega, ibm5150, 0, pcega, 0, genpc_state, 0, "<generic>", "PC (EGA)", 0 )
+COMP ( 1987, pcmda, ibm5150, 0, pcmda, 0, genpc_state, 0, "<generic>", "PC (MDA)", 0 )
+COMP ( 1987, pcherc, ibm5150, 0, pcherc, 0, genpc_state, 0, "<generic>", "PC (Hercules)", 0 )
+COMP ( 1987, pcvga, ibm5150, 0, pcvga, 0, genpc_state, 0, "<generic>", "PC (VGA)", 0 )
diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp
index e89dd7d1748..67e7d24d83a 100644
--- a/src/mame/drivers/ggconnie.cpp
+++ b/src/mame/drivers/ggconnie.cpp
@@ -178,7 +178,7 @@ static INPUT_PORTS_START(ggconnie)
PORT_DIPSETTING(0x00, DEF_STR(On) )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ggconnie, ggconnie_state )
+static MACHINE_CONFIG_START( ggconnie )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
MCFG_CPU_PROGRAM_MAP(sgx_mem)
@@ -186,7 +186,7 @@ static MACHINE_CONFIG_START( ggconnie, ggconnie_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/3, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/3, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( ggconnie_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -223,7 +223,7 @@ static MACHINE_CONFIG_START( ggconnie, ggconnie_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
- MCFG_OKIM6295_ADD("oki", PCE_MAIN_CLOCK/12, OKIM6295_PIN7_HIGH) /* unknown clock / pin 7 */
+ MCFG_OKIM6295_ADD("oki", PCE_MAIN_CLOCK/12, PIN7_HIGH) /* unknown clock / pin 7 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
MACHINE_CONFIG_END
@@ -237,4 +237,4 @@ ROM_START(ggconnie)
ROM_LOAD( "adpcm_u31.bin", 0x00000, 0x80000, CRC(de514c2b) SHA1(da73aa825d73646f556f6d4dbb46f43acf7c3357) )
ROM_END
-GAME( 1996, ggconnie, 0, ggconnie, ggconnie, pce_common_state, pce_common, ROT0, "Eighting", "Go! Go! Connie chan Jaka Jaka Janken", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1996, ggconnie, 0, ggconnie, ggconnie, ggconnie_state, pce_common, ROT0, "Eighting", "Go! Go! Connie chan Jaka Jaka Janken", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index 9e2e070df2f..27d6c3eb1cc 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -611,7 +611,7 @@ void ghosteo_state::machine_reset()
m_maincpu->space(AS_PROGRAM).install_read_handler(0x4d000010, 0x4d000013,read32_delegate(FUNC(ghosteo_state::bballoon_speedup_r), this));
}
-static MACHINE_CONFIG_START( ghosteo, ghosteo_state )
+static MACHINE_CONFIG_START( ghosteo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM9, 200000000)
@@ -770,6 +770,6 @@ DRIVER_INIT_MEMBER(ghosteo_state,touryuu)
m_rom_pagesize = 0x210;
}
-GAME( 2003, bballoon, 0, bballoon, bballoon, ghosteo_state, bballoon, ROT0, "Eolith", "BnB Arcade", MACHINE_IMPERFECT_SOUND )
-GAME( 2005, hapytour, 0, bballoon, bballoon, ghosteo_state, bballoon, ROT0, "GAV Company", "Happy Tour", MACHINE_IMPERFECT_SOUND )
-GAME( 2005, touryuu, 0, touryuu, touryuu, ghosteo_state, touryuu, ROT0, "Yuki Enterprise", "Touryuumon (V1.1)?", MACHINE_IMPERFECT_SOUND ) // On first boot inputs won't work, TODO: hook-up default eeprom
+GAME( 2003, bballoon, 0, bballoon, bballoon, ghosteo_state, bballoon, ROT0, "Eolith", "BnB Arcade", MACHINE_IMPERFECT_SOUND )
+GAME( 2005, hapytour, 0, bballoon, bballoon, ghosteo_state, bballoon, ROT0, "GAV Company", "Happy Tour", MACHINE_IMPERFECT_SOUND )
+GAME( 2005, touryuu, 0, touryuu, touryuu, ghosteo_state, touryuu, ROT0, "Yuki Enterprise", "Touryuumon (V1.1)?", MACHINE_IMPERFECT_SOUND ) // On first boot inputs won't work, TODO: hook-up default eeprom
diff --git a/src/mame/drivers/giclassic.cpp b/src/mame/drivers/giclassic.cpp
index 8a290abd499..137c7eb5f01 100644
--- a/src/mame/drivers/giclassic.cpp
+++ b/src/mame/drivers/giclassic.cpp
@@ -61,7 +61,7 @@ public:
m_maincpu(*this, "maincpu"),
m_k056832(*this, "k056832"),
m_palette(*this, "palette")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<k056832_device> m_k056832;
@@ -178,7 +178,7 @@ public:
m_k056832(*this, "k056832"),
m_k055673(*this, "k055673"),
m_palette(*this, "palette")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<k056832_device> m_k056832;
@@ -288,7 +288,7 @@ void giclassicsvr_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( giclassic, giclassic_state )
+static MACHINE_CONFIG_START( giclassic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) // PCB is marked "68000 12 MHz", but only visible osc is 20 MHz
@@ -314,7 +314,7 @@ static MACHINE_CONFIG_START( giclassic, giclassic_state )
MCFG_K056832_PALETTE("palette")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( giclassvr, giclassicsvr_state )
+static MACHINE_CONFIG_START( giclassvr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // unknown speed
@@ -373,5 +373,5 @@ ROM_START( giclassvr )
ROM_LOAD32_WORD( "gsgu_760_ad02.34k", 0x000002, 0x080000, CRC(8057a417) SHA1(82d4a1d84729e9f0a8aff4c219a19601b89caf15) )
ROM_END
-GAME( 1998, giclasex, 0, giclassic, giclassic, driver_device, 0, 0, "Konami", "GI-Classic EX (satellite terminal)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW)
-GAME( 1998, giclassvr, 0, giclassvr, giclassvr, driver_device, 0, 0, "Konami", "GI-Classic EX (server)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW)
+GAME( 1998, giclasex, 0, giclassic, giclassic, giclassic_state, 0, 0, "Konami", "GI-Classic EX (satellite terminal)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW)
+GAME( 1998, giclassvr, 0, giclassvr, giclassvr, giclassicsvr_state, 0, 0, "Konami", "GI-Classic EX (server)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp
index 9ada3caf992..b02c9d9172c 100644
--- a/src/mame/drivers/gijoe.cpp
+++ b/src/mame/drivers/gijoe.cpp
@@ -289,7 +289,7 @@ void gijoe_state::machine_reset()
m_cur_control2 = 0;
}
-static MACHINE_CONFIG_START( gijoe, gijoe_state )
+static MACHINE_CONFIG_START( gijoe )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz Confirmed */
@@ -454,7 +454,7 @@ ROM_START( gijoej )
ROM_END
-GAME( 1992, gijoe, 0, gijoe, gijoe, driver_device, 0, ROT0, "Konami", "G.I. Joe (World, EAB, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, gijoea, gijoe, gijoe, gijoe, driver_device, 0, ROT0, "Konami", "G.I. Joe (World, EB8, prototype?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, gijoeu, gijoe, gijoe, gijoe, driver_device, 0, ROT0, "Konami", "G.I. Joe (US, UAB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, gijoej, gijoe, gijoe, gijoe, driver_device, 0, ROT0, "Konami", "G.I. Joe (Japan, JAA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, gijoe, 0, gijoe, gijoe, gijoe_state, 0, ROT0, "Konami", "G.I. Joe (World, EAB, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, gijoea, gijoe, gijoe, gijoe, gijoe_state, 0, ROT0, "Konami", "G.I. Joe (World, EB8, prototype?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, gijoeu, gijoe, gijoe, gijoe, gijoe_state, 0, ROT0, "Konami", "G.I. Joe (US, UAB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, gijoej, gijoe, gijoe, gijoe, gijoe_state, 0, ROT0, "Konami", "G.I. Joe (Japan, JAA)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index 9a00d2216f6..73ed134221f 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -141,7 +141,7 @@ private:
void refresh_memory();
required_device<cpu_device> m_maincpu;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<ram_device> m_ram;
@@ -572,7 +572,7 @@ MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) \
MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(8) \
MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000)
-static MACHINE_CONFIG_START( gimix, gimix_state )
+static MACHINE_CONFIG_START( gimix )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6809E, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(gimix_mem)
@@ -684,4 +684,4 @@ ROM_START( gimix )
ROM_LOAD( "gimixhd.h11", 0x000000, 0x001000, CRC(35c12201) SHA1(51ac9052f9757d79c7f5bd3aa5d8421e98cfcc37) )
ROM_END
-COMP( 1980, gimix, 0, 0, gimix, gimix, driver_device, 0, "Gimix", "Gimix 6809 System", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1980, gimix, 0, 0, gimix, gimix, gimix_state, 0, "Gimix", "Gimix 6809 System", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp
index ffa0acd5a46..c850edc6878 100644
--- a/src/mame/drivers/ginganin.cpp
+++ b/src/mame/drivers/ginganin.cpp
@@ -243,7 +243,7 @@ WRITE_LINE_MEMBER(ginganin_state::ptm_irq)
}
-static MACHINE_CONFIG_START( ginganin, ginganin_state )
+static MACHINE_CONFIG_START( ginganin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK)
diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp
index 33c1aefb832..f7a89a55bdc 100644
--- a/src/mame/drivers/gizmondo.cpp
+++ b/src/mame/drivers/gizmondo.cpp
@@ -183,7 +183,7 @@ DRIVER_INIT_MEMBER(gizmondo_state,gizmondo)
// do nothing
}
-static MACHINE_CONFIG_START( gizmondo, gizmondo_state )
+static MACHINE_CONFIG_START( gizmondo )
MCFG_CPU_ADD("maincpu", ARM9, 40000000)
MCFG_CPU_PROGRAM_MAP(gizmondo_map)
diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp
index 6de00680436..f663092a6bf 100644
--- a/src/mame/drivers/gkigt.cpp
+++ b/src/mame/drivers/gkigt.cpp
@@ -234,7 +234,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( igt_gameking, igt_gameking_state )
+static MACHINE_CONFIG_START( igt_gameking )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I960, XTAL_24MHz)
@@ -480,13 +480,13 @@ ROM_START( gkkey )
ROM_REGION( 0x200000, "snd", ROMREGION_ERASEFF )
ROM_END
-GAME( 1994, ms3, 0, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Multistar 3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1994, ms72c, 0, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Multistar 7 2c", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, gkigt4, 0, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (v4.x)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, gkigt4ms, gkigt4, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (v4.x, MS)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, gkigt43, gkigt4, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (v4.3)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, gkigt43n, gkigt4, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (v4.3, NJ)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, gkigtez, gkigt4, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (EZ Pay, v4.0, MS)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, gkigt5p, gkigt4, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (Triple-Five Play)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003, igtsc, 0, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Super Cherry", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // SIMM dumps are bad.
-GAME( 2003, gkkey, 0, igt_gameking, igt_gameking, driver_device, 0, ROT0, "IGT", "Game King (Set Chips)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // only 2 are good dumps
+GAME( 1994, ms3, 0, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Multistar 3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1994, ms72c, 0, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Multistar 7 2c", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, gkigt4, 0, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (v4.x)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, gkigt4ms, gkigt4, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (v4.x, MS)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, gkigt43, gkigt4, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (v4.3)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, gkigt43n, gkigt4, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (v4.3, NJ)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, gkigtez, gkigt4, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (EZ Pay, v4.0, MS)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, gkigt5p, gkigt4, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (Triple-Five Play)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003, igtsc, 0, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Super Cherry", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // SIMM dumps are bad.
+GAME( 2003, gkkey, 0, igt_gameking, igt_gameking, igt_gameking_state, 0, ROT0, "IGT", "Game King (Set Chips)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // only 2 are good dumps
diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp
index dbe6ccdff51..83707497479 100644
--- a/src/mame/drivers/gladiatr.cpp
+++ b/src/mame/drivers/gladiatr.cpp
@@ -676,7 +676,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( ppking, ppking_state )
+static MACHINE_CONFIG_START( ppking )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
@@ -725,11 +725,11 @@ static MACHINE_CONFIG_START( ppking, ppking_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MCFG_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* vclk input mode */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gladiatr, gladiatr_state )
+static MACHINE_CONFIG_START( gladiatr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
@@ -809,7 +809,7 @@ static MACHINE_CONFIG_START( gladiatr, gladiatr_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MCFG_SOUND_ADD("msm", MSM5205, XTAL_455kHz) /* verified on pcb */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* vclk input mode */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp
index 29e70448073..52a7de6d130 100644
--- a/src/mame/drivers/glasgow.cpp
+++ b/src/mame/drivers/glasgow.cpp
@@ -704,7 +704,7 @@ static INPUT_PORTS_START( old_keyboard ) //Glasgow,Dallas
INPUT_PORTS_END
-static MACHINE_CONFIG_START( glasgow, glasgow_state )
+static MACHINE_CONFIG_START( glasgow )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(glasgow_mem)
@@ -795,10 +795,10 @@ ROM_END
***************************************************************************/
/* YEAR, NAME, PARENT, COMPAT, MACHINE, INPUT, CLASS, INIT, COMPANY, FULLNAME, FLAGS */
-CONS( 1984, glasgow, 0, 0, glasgow, old_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto III S Glasgow", 0)
-CONS( 1984, amsterd, 0, 0, amsterd, new_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Amsterdam", MACHINE_NOT_WORKING)
-CONS( 1984, dallas, glasgow, 0, glasgow, old_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Dallas", MACHINE_NOT_WORKING)
-CONS( 1984, roma, amsterd, 0, glasgow, new_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Roma", MACHINE_NOT_WORKING)
-CONS( 1984, dallas32, amsterd, 0, dallas32, new_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Dallas 32 Bit", MACHINE_NOT_WORKING)
-CONS( 1984, roma32, amsterd, 0, dallas32, new_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Roma 32 Bit", MACHINE_NOT_WORKING)
-CONS( 1984, dallas16, amsterd, 0, amsterd, new_keyboard, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Dallas 16 Bit", MACHINE_NOT_WORKING)
+CONS( 1984, glasgow, 0, 0, glasgow, old_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto III S Glasgow", 0)
+CONS( 1984, amsterd, 0, 0, amsterd, new_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto Amsterdam", MACHINE_NOT_WORKING)
+CONS( 1984, dallas, glasgow, 0, glasgow, old_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto Dallas", MACHINE_NOT_WORKING)
+CONS( 1984, roma, amsterd, 0, glasgow, new_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto Roma", MACHINE_NOT_WORKING)
+CONS( 1984, dallas32, amsterd, 0, dallas32, new_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto Dallas 32 Bit", MACHINE_NOT_WORKING)
+CONS( 1984, roma32, amsterd, 0, dallas32, new_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto Roma 32 Bit", MACHINE_NOT_WORKING)
+CONS( 1984, dallas16, amsterd, 0, amsterd, new_keyboard, glasgow_state, 0, "Hegener & Glaser Muenchen", "Mephisto Dallas 16 Bit", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp
index 866056a7359..a20990f28de 100644
--- a/src/mame/drivers/glass.cpp
+++ b/src/mame/drivers/glass.cpp
@@ -199,7 +199,7 @@ void glass_state::machine_reset()
m_blitter_serial_buffer[i] = 0;
}
-static MACHINE_CONFIG_START( glass, glass_state )
+static MACHINE_CONFIG_START( glass )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz verified on PCB */
@@ -223,7 +223,7 @@ static MACHINE_CONFIG_START( glass, glass_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* 1MHz Resonator & pin 7 high verified on PCB */
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* 1MHz Resonator & pin 7 high verified on PCB */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp
index b64b666aba7..705f92e48c6 100644
--- a/src/mame/drivers/globalfr.cpp
+++ b/src/mame/drivers/globalfr.cpp
@@ -28,10 +28,10 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_vfd(*this, "vfd")
- { }
+ { }
required_device<cpu_device> m_maincpu;
- optional_device<s16lf01_t> m_vfd;
+ optional_device<s16lf01_device> m_vfd;
// serial vfd
@@ -63,7 +63,7 @@ INPUT_PORTS_END
/******************************************************************************/
-static MACHINE_CONFIG_START( globalfr, globalfr_state )
+static MACHINE_CONFIG_START( globalfr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M37702S1, 4000000)
MCFG_CPU_PROGRAM_MAP(globalfr_map)
@@ -197,32 +197,32 @@ ROM_END
/******************************************************************************/
// standalone game or topbox?
-GAME( 199?, gl_snbev, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Saturday Night Beaver (Global) (Stealth?) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_snbeva, gl_snbev, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Saturday Night Beaver (Global) (Stealth?) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_snbev, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Saturday Night Beaver (Global) (Stealth?) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_snbeva, gl_snbev, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Saturday Night Beaver (Global) (Stealth?) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
// standalone game or topbox?
-GAME( 199?, gl_grncl, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Grid Runner Club (Global) (Stealth?) (set 1)",MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_grncla, gl_grncl, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Grid Runner Club (Global) (Stealth?) (set 2)",MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_grncl, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Grid Runner Club (Global) (Stealth?) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_grncla, gl_grncl, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Grid Runner Club (Global) (Stealth?) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_dow, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Deals On Wheels (Global) (v1.4) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_dowp, gl_dow, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Deals On Wheels (Global) (v1.4 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 199?, gl_dow, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Deals On Wheels (Global) (v1.4) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_dowp, gl_dow, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Deals On Wheels (Global) (v1.4 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_dowcl,0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Deals On Wheels Club (Global) (v1.6) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_dowclp,gl_dowcl,globalfr, globalfr, driver_device, 0, ROT0, "Global", "Deals On Wheels Club (Global) (v1.6 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 199?, gl_dowcl, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Deals On Wheels Club (Global) (v1.6) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_dowclp, gl_dowcl, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Deals On Wheels Club (Global) (v1.6 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_wywh, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.9) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_wywhp, gl_wywh, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.9 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_wywh24, gl_wywh, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.4) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_wywh24p,gl_wywh, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.4 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 199?, gl_wywh, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.9) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_wywhp, gl_wywh, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.9 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_wywh24, gl_wywh, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.4) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_wywh24p, gl_wywh, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Wish You Were Here Club (Global) (v2.4 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_coc, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v3.0) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_cocp, gl_coc, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v3.0 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_coc29, gl_coc, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v2.9) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_coc29p,gl_coc, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v2.9 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 199?, gl_coc, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v3.0) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_cocp, gl_coc, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v3.0 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_coc29, gl_coc, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v2.9) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_coc29p, gl_coc, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Carry On Clubbin' (Global) (v2.9 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_uyr, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Up Yer Riggin Club (Global) (v2.8) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_uyrp, gl_uyr, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Up Yer Riggin Club (Global) (v2.8 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 199?, gl_uyr, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Up Yer Riggin Club (Global) (v2.8) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_uyrp, gl_uyr, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Up Yer Riggin Club (Global) (v2.8 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, gl_hbh, 0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Heartbreak Hotel (Global) (v1.0) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_hbhcl,0, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Heartbreak Hotel Club (Global) (v1.9) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_hbhclp,gl_hbhcl, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Heartbreak Hotel Club (Global) (v1.9 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 199?, gl_hbhcla,gl_hbhcl, globalfr, globalfr, driver_device, 0, ROT0, "Global", "Heartbreak Hotel Club (Global) (Set 2) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 199?, gl_hbh, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Heartbreak Hotel (Global) (v1.0) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_hbhcl, 0, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Heartbreak Hotel Club (Global) (v1.9) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_hbhclp, gl_hbhcl, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Heartbreak Hotel Club (Global) (v1.9 Protocol) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, gl_hbhcla, gl_hbhcl, globalfr, globalfr, globalfr_state, 0, ROT0, "Global", "Heartbreak Hotel Club (Global) (Set 2) (Stealth)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/globalvr.cpp b/src/mame/drivers/globalvr.cpp
index 72aee844101..3cb38e4eac2 100644
--- a/src/mame/drivers/globalvr.cpp
+++ b/src/mame/drivers/globalvr.cpp
@@ -84,7 +84,7 @@ static INPUT_PORTS_START( globalvr )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( globalvr, globalvr_state )
+static MACHINE_CONFIG_START( globalvr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM, 100000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(globalvr_map)
@@ -146,15 +146,15 @@ ROM_START( nfsug )
ROM_END
-/* OS/Global VR specific Setup Installers */
-GAME( 2002, hyperv2, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Hyper V2 (Global VR) Install - 06/12/02", MACHINE_IS_SKELETON )
-GAME( 2001, hyperv2a, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Hyper V2 (Global VR) Install - 09/30/01", MACHINE_IS_SKELETON )
-GAME( 2001, gvrxpsys, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Global VR XP OS Install - 09/30/01", MACHINE_IS_SKELETON )
-GAME( 2002, gvrxpsup, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Global VR XP OS Update/Install - 06/11/02", MACHINE_IS_SKELETON )
+// OS/Global VR specific Setup Installers
+GAME( 2002, hyperv2, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Hyper V2 (Global VR) Install - 06/12/02", MACHINE_IS_SKELETON )
+GAME( 2001, hyperv2a, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Hyper V2 (Global VR) Install - 09/30/01", MACHINE_IS_SKELETON )
+GAME( 2001, gvrxpsys, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Global VR XP OS Install - 09/30/01", MACHINE_IS_SKELETON )
+GAME( 2002, gvrxpsup, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Global VR XP OS Update/Install - 06/11/02", MACHINE_IS_SKELETON )
-/* Game Installer CDs */
-GAME( 2000, bhead2k, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Beach Head 2000 Install - 05/27/03", MACHINE_IS_SKELETON )
-GAME( 2000, bhead2ka, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Beach Head 2000 Install - 09/16/01", MACHINE_IS_SKELETON )
-GAME( 2002, bhead2k2, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Beach Head 2002 Install - 05/27/03", MACHINE_IS_SKELETON )
-GAME( 2003, bhead2k3, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Beach Head 2003 Desert War Install - 05/27/03", MACHINE_IS_SKELETON )
-GAME( 2005, nfsug, 0, globalvr, globalvr, driver_device, 0, ROT0, "Global VR", "Need For Speed: Underground Install (2 Discs) (v1.1)", MACHINE_IS_SKELETON )
+// Game Installer CDs
+GAME( 2000, bhead2k, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Beach Head 2000 Install - 05/27/03", MACHINE_IS_SKELETON )
+GAME( 2000, bhead2ka, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Beach Head 2000 Install - 09/16/01", MACHINE_IS_SKELETON )
+GAME( 2002, bhead2k2, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Beach Head 2002 Install - 05/27/03", MACHINE_IS_SKELETON )
+GAME( 2003, bhead2k3, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Beach Head 2003 Desert War Install - 05/27/03", MACHINE_IS_SKELETON )
+GAME( 2005, nfsug, 0, globalvr, globalvr, globalvr_state, 0, ROT0, "Global VR", "Need For Speed: Underground Install (2 Discs) (v1.1)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index cf3f3b5af6f..a0155e09fb2 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -515,7 +515,7 @@ GFXDECODE_END
* Machine Drivers *
*********************************************/
-static MACHINE_CONFIG_START( gluck2, gluck2_state )
+static MACHINE_CONFIG_START( gluck2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */
@@ -586,5 +586,5 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
-GAME( 1992, gluck2, 0, gluck2, gluck2, driver_device, 0, ROT0, "Yung Yu / CYE", "Good Luck II", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS...
+GAME( 1992, gluck2, 0, gluck2, gluck2, gluck2_state, 0, ROT0, "Yung Yu / CYE", "Good Luck II", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp
index ecc0083885b..b98decd6318 100644
--- a/src/mame/drivers/gmaster.cpp
+++ b/src/mame/drivers/gmaster.cpp
@@ -329,7 +329,7 @@ void gmaster_state::machine_start()
}
-static MACHINE_CONFIG_START( gmaster, gmaster_state )
+static MACHINE_CONFIG_START( gmaster )
MCFG_CPU_ADD("maincpu", UPD7810, XTAL_12MHz/2/*?*/) // upd78c11 in the unit
MCFG_CPU_PROGRAM_MAP(gmaster_mem)
MCFG_UPD7810_PORTA_READ_CB(IOPORT("JOY"))
diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp
index 04f2159563d..6428b72f815 100644
--- a/src/mame/drivers/gng.cpp
+++ b/src/mame/drivers/gng.cpp
@@ -342,7 +342,7 @@ void gng_state::machine_reset()
}
}
-static MACHINE_CONFIG_START( gng, gng_state )
+static MACHINE_CONFIG_START( gng )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* verified on pcb */
@@ -784,14 +784,14 @@ DRIVER_INIT_MEMBER(gng_state,diamond)
-GAME( 1985, gng, 0, gng, gng, driver_device, 0, ROT0, "Capcom", "Ghosts'n Goblins (World? set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gnga, gng, gng, gng, driver_device, 0, ROT0, "Capcom", "Ghosts'n Goblins (World? set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gngbl, gng, gng, gng, driver_device, 0, ROT0, "bootleg", "Ghosts'n Goblins (bootleg with Cross)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gngprot, gng, gng, gng, driver_device, 0, ROT0, "Capcom", "Ghosts'n Goblins (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gngblita, gng, gng, gng, driver_device, 0, ROT0, "bootleg", "Ghosts'n Goblins (Italian bootleg, harder)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gngc, gng, gng, gng, driver_device, 0, ROT0, "Capcom", "Ghosts'n Goblins (World? set 3)", MACHINE_SUPPORTS_SAVE ) // rev c?
-GAME( 1985, gngt, gng, gng, gng, driver_device, 0, ROT0, "Capcom (Taito America license)", "Ghosts'n Goblins (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, makaimur, gng, gng, makaimur, driver_device, 0, ROT0, "Capcom", "Makai-Mura (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, makaimurc, gng, gng, makaimur, driver_device, 0, ROT0, "Capcom", "Makai-Mura (Japan Revision C)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, makaimurg, gng, gng, makaimur, driver_device, 0, ROT0, "Capcom", "Makai-Mura (Japan Revision G)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, diamond, 0, gng, diamond, gng_state, diamond, ROT0, "KH Video", "Diamond Run", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gng, 0, gng, gng, gng_state, 0, ROT0, "Capcom", "Ghosts'n Goblins (World? set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gnga, gng, gng, gng, gng_state, 0, ROT0, "Capcom", "Ghosts'n Goblins (World? set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gngbl, gng, gng, gng, gng_state, 0, ROT0, "bootleg", "Ghosts'n Goblins (bootleg with Cross)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gngprot, gng, gng, gng, gng_state, 0, ROT0, "Capcom", "Ghosts'n Goblins (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gngblita, gng, gng, gng, gng_state, 0, ROT0, "bootleg", "Ghosts'n Goblins (Italian bootleg, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gngc, gng, gng, gng, gng_state, 0, ROT0, "Capcom", "Ghosts'n Goblins (World? set 3)", MACHINE_SUPPORTS_SAVE ) // rev c?
+GAME( 1985, gngt, gng, gng, gng, gng_state, 0, ROT0, "Capcom (Taito America license)", "Ghosts'n Goblins (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, makaimur, gng, gng, makaimur, gng_state, 0, ROT0, "Capcom", "Makai-Mura (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, makaimurc, gng, gng, makaimur, gng_state, 0, ROT0, "Capcom", "Makai-Mura (Japan Revision C)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, makaimurg, gng, gng, makaimur, gng_state, 0, ROT0, "Capcom", "Makai-Mura (Japan Revision G)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, diamond, 0, gng, diamond, gng_state, diamond, ROT0, "KH Video", "Diamond Run", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp
index e7bb2bf49d9..2241cd56978 100644
--- a/src/mame/drivers/go2000.cpp
+++ b/src/mame/drivers/go2000.cpp
@@ -333,7 +333,7 @@ void go2000_state::machine_start()
}
-static MACHINE_CONFIG_START( go2000, go2000_state )
+static MACHINE_CONFIG_START( go2000 )
MCFG_CPU_ADD("maincpu", M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(go2000_map)
@@ -380,4 +380,4 @@ ROM_START( go2000 )
ROM_END
-GAME( 2000, go2000, 0, go2000, go2000, driver_device, 0, ROT0, "SunA?", "Go 2000", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, go2000, 0, go2000, go2000, go2000_state, 0, ROT0, "SunA?", "Go 2000", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp
index b88d0aaa28f..dc3962d3cec 100644
--- a/src/mame/drivers/goal92.cpp
+++ b/src/mame/drivers/goal92.cpp
@@ -294,7 +294,7 @@ void goal92_state::machine_reset()
m_adpcm_toggle = 0;
}
-static MACHINE_CONFIG_START( goal92, goal92_state )
+static MACHINE_CONFIG_START( goal92 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,12000000)
@@ -334,7 +334,7 @@ static MACHINE_CONFIG_START( goal92, goal92_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(goal92_state, goal92_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -401,4 +401,4 @@ ROM_END
-GAME( 1992, goal92, cupsoc, goal92, goal92, driver_device, 0, ROT0, "bootleg", "Goal! '92", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, goal92, cupsoc, goal92, goal92, goal92_state, 0, ROT0, "bootleg", "Goal! '92", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp
index 119c76192bb..f5989b52587 100644
--- a/src/mame/drivers/goindol.cpp
+++ b/src/mame/drivers/goindol.cpp
@@ -233,7 +233,7 @@ void goindol_state::machine_reset()
m_prot_toggle = 0;
}
-static MACHINE_CONFIG_START( goindol, goindol_state )
+static MACHINE_CONFIG_START( goindol )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* XTAL confirmed, divisor is not */
@@ -410,4 +410,4 @@ DRIVER_INIT_MEMBER(goindol_state,goindol)
GAME( 1987, goindol, 0, goindol, goindol, goindol_state, goindol, ROT90, "SunA", "Goindol (World)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
GAME( 1987, goindolu, goindol, goindol, goindol, goindol_state, goindol, ROT90, "SunA", "Goindol (US)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
GAME( 1987, goindolk, goindol, goindol, goindol, goindol_state, goindol, ROT90, "SunA", "Goindol (Korea)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, homo, goindol, goindol, homo, driver_device, 0, ROT90, "bootleg", "Homo", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, homo, goindol, goindol, homo, goindol_state, 0, ROT90, "bootleg", "Homo", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp
index b1989ad8a6d..ab1a3f8df24 100644
--- a/src/mame/drivers/goldngam.cpp
+++ b/src/mame/drivers/goldngam.cpp
@@ -546,7 +546,7 @@ GFXDECODE_END
*************************/
-static MACHINE_CONFIG_START( swisspkr, goldngam_state )
+static MACHINE_CONFIG_START( swisspkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
@@ -614,6 +614,6 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1990, swisspkr, 0, swisspkr, goldngam, driver_device, 0, ROT0, "Golden Games / C+M Technics AG", "Swiss Poker ('50 SG-.10', V2.5)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1998, moviecrd, 0, moviecrd, goldngam, driver_device, 0, ROT0, "Golden Games / C+M Technics AG", "Movie Card", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1990, swisspkr, 0, swisspkr, goldngam, goldngam_state, 0, ROT0, "Golden Games / C+M Technics AG", "Swiss Poker ('50 SG-.10', V2.5)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1998, moviecrd, 0, moviecrd, goldngam, goldngam_state, 0, ROT0, "Golden Games / C+M Technics AG", "Movie Card", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 37edaa077be..99cebc26239 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -4023,7 +4023,7 @@ MACHINE_RESET_MEMBER(goldnpkr_state, mondial)
* Machine Drivers *
*********************************************/
-static MACHINE_CONFIG_START( goldnpkr_base, goldnpkr_state )
+static MACHINE_CONFIG_START( goldnpkr_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
@@ -10845,79 +10845,79 @@ DRIVER_INIT_MEMBER(goldnpkr_state, bchancep)
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1981, goldnpkr, 0, goldnpkr, goldnpkr, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Golden Poker Double Up (Big Boy)", 0, layout_goldnpkr )
-GAMEL( 1981, goldnpkb, goldnpkr, goldnpkr, goldnpkr, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Golden Poker Double Up (Mini Boy)", 0, layout_goldnpkr )
-
-GAMEL( 198?, videtron, 0, goldnpkr, videtron, driver_device, 0, ROT0, "<unknown>", "Videotron Poker (cards selector, set 1)", 0, layout_goldnpkr )
-GAMEL( 198?, videtron2, videtron, goldnpkr, videtron, driver_device, 0, ROT0, "<unknown>", "Videotron Poker (cards selector, set 2)", 0, layout_goldnpkr )
-GAMEL( 198?, videtrna, videtron, goldnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "Videotron Poker (normal controls)", 0, layout_goldnpkr )
-
-GAMEL( 198?, pottnpkr, 0, pottnpkr, pottnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 1)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkra, pottnpkr, pottnpkr, potnpkra, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 2)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkrb, pottnpkr, pottnpkr, pottnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 3)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkrc, pottnpkr, pottnpkr, potnpkrc, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 4)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkrd, pottnpkr, pottnpkr, potnpkrc, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 5)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkre, pottnpkr, pottnpkr, pottnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 6)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkrf, pottnpkr, goldnpkr, goldnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 7, Royale GFX)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkrg, pottnpkr, pottnpkr, potnpkra, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 8, Australian)", 0, layout_goldnpkr )
-GAMEL( 198?, potnpkrh, pottnpkr, pottnpkr, goldnpkr, driver_device, 0, ROT0, "bootleg", "Jack Potten's Poker (set 9, 'just 4 fun')", 0, layout_goldnpkr )
-GAMEL( 198?, ngold, pottnpkr, pottnpkr, ngold, driver_device, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 1)", 0, layout_goldnpkr )
-GAMEL( 198?, ngolda, pottnpkr, pottnpkr, ngold, driver_device, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 2)", 0, layout_goldnpkr )
-GAMEL( 198?, ngoldb, pottnpkr, pottnpkr, ngoldb, driver_device, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 3)", 0, layout_goldnpkr )
-
-GAMEL( 1990, bsuerte, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 1)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertea, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 2)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerteb, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 3)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertec, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 4)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerted, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 5)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertee, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 6)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertef, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 7)", 0, layout_goldnpkr )
-GAME( 1991, bsuerteg, bsuerte, witchcrd, bsuertew, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 8)", 0 )
-GAME( 1991, bsuerteh, bsuerte, witchcrd, bsuertew, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 9)", 0 )
-GAMEL( 1991, bsuertei, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 10)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertej, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 11)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertek, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 12)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertel, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 13)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertem, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 14)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerten, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 15, Prodel PCB)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerteo, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 16)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertep, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 17)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerteq, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 18)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerter, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 19)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertes, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 20)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertet, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 21)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuerteu, bsuerte, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 22)", 0, layout_goldnpkr )
-GAMEL( 1991, bsuertev, bsuerte, witchcrd, bsuertev, driver_device, 0, ROT0, "<unknown>", "Buena Suerte (Spanish/Portuguese, set 23)", 0, layout_goldnpkr )
-GAMEL( 1991, goodluck, bsuerte, witchcrd, goodluck, driver_device, 0, ROT0, "<unknown>", "Good Luck", 0, layout_goldnpkr )
-
-GAMEL( 1991, falcnwld, 0, wildcard, wildcard, driver_device, 0, ROT0, "TVG", "Falcons Wild - Wild Card 1991 (TVG)", 0, layout_goldnpkr )
-GAMEL( 1990, falcnwlda, falcnwld, wildcard, wildcard, driver_device, 0, ROT0, "Video Klein", "Falcons Wild - World Wide Poker (Video Klein, set 1)", 0, layout_goldnpkr )
-GAMEL( 1990, falcnwldb, falcnwld, wildcard, wildcard, driver_device, 0, ROT0, "Video Klein", "Falcons Wild - World Wide Poker (Video Klein, set 2)", 0, layout_goldnpkr )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1981, goldnpkr, 0, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "Bonanza Enterprises, Ltd", "Golden Poker Double Up (Big Boy)", 0, layout_goldnpkr )
+GAMEL( 1981, goldnpkb, goldnpkr, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "Bonanza Enterprises, Ltd", "Golden Poker Double Up (Mini Boy)", 0, layout_goldnpkr )
+
+GAMEL( 198?, videtron, 0, goldnpkr, videtron, goldnpkr_state, 0, ROT0, "<unknown>", "Videotron Poker (cards selector, set 1)", 0, layout_goldnpkr )
+GAMEL( 198?, videtron2, videtron, goldnpkr, videtron, goldnpkr_state, 0, ROT0, "<unknown>", "Videotron Poker (cards selector, set 2)", 0, layout_goldnpkr )
+GAMEL( 198?, videtrna, videtron, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "Videotron Poker (normal controls)", 0, layout_goldnpkr )
+
+GAMEL( 198?, pottnpkr, 0, pottnpkr, pottnpkr, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 1)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkra, pottnpkr, pottnpkr, potnpkra, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 2)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkrb, pottnpkr, pottnpkr, pottnpkr, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 3)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkrc, pottnpkr, pottnpkr, potnpkrc, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 4)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkrd, pottnpkr, pottnpkr, potnpkrc, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 5)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkre, pottnpkr, pottnpkr, pottnpkr, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 6)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkrf, pottnpkr, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 7, Royale GFX)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkrg, pottnpkr, pottnpkr, potnpkra, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 8, Australian)", 0, layout_goldnpkr )
+GAMEL( 198?, potnpkrh, pottnpkr, pottnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "bootleg", "Jack Potten's Poker (set 9, 'just 4 fun')", 0, layout_goldnpkr )
+GAMEL( 198?, ngold, pottnpkr, pottnpkr, ngold, goldnpkr_state, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 1)", 0, layout_goldnpkr )
+GAMEL( 198?, ngolda, pottnpkr, pottnpkr, ngold, goldnpkr_state, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 2)", 0, layout_goldnpkr )
+GAMEL( 198?, ngoldb, pottnpkr, pottnpkr, ngoldb, goldnpkr_state, 0, ROT0, "<unknown>", "Jack Potten's Poker (NGold, set 3)", 0, layout_goldnpkr )
+
+GAMEL( 1990, bsuerte, 0, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 1)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertea, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 2)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerteb, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 3)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertec, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 4)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerted, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 5)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertee, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 6)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertef, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 7)", 0, layout_goldnpkr )
+GAME( 1991, bsuerteg, bsuerte, witchcrd, bsuertew, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 8)", 0 )
+GAME( 1991, bsuerteh, bsuerte, witchcrd, bsuertew, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 9)", 0 )
+GAMEL( 1991, bsuertei, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 10)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertej, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 11)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertek, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 12)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertel, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 13)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertem, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 14)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerten, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 15, Prodel PCB)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerteo, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 16)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertep, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 17)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerteq, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 18)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerter, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 19)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertes, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 20)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertet, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 21)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuerteu, bsuerte, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish, set 22)", 0, layout_goldnpkr )
+GAMEL( 1991, bsuertev, bsuerte, witchcrd, bsuertev, goldnpkr_state, 0, ROT0, "<unknown>", "Buena Suerte (Spanish/Portuguese, set 23)", 0, layout_goldnpkr )
+GAMEL( 1991, goodluck, bsuerte, witchcrd, goodluck, goldnpkr_state, 0, ROT0, "<unknown>", "Good Luck", 0, layout_goldnpkr )
+
+GAMEL( 1991, falcnwld, 0, wildcard, wildcard, goldnpkr_state, 0, ROT0, "TVG", "Falcons Wild - Wild Card 1991 (TVG)", 0, layout_goldnpkr )
+GAMEL( 1990, falcnwlda, falcnwld, wildcard, wildcard, goldnpkr_state, 0, ROT0, "Video Klein", "Falcons Wild - World Wide Poker (Video Klein, set 1)", 0, layout_goldnpkr )
+GAMEL( 1990, falcnwldb, falcnwld, wildcard, wildcard, goldnpkr_state, 0, ROT0, "Video Klein", "Falcons Wild - World Wide Poker (Video Klein, set 2)", 0, layout_goldnpkr )
GAME( 1983, falcnwldc, falcnwld, wildcrdb, wildcard, goldnpkr_state, flcnw, ROT0, "Falcon", "Falcons Wild - World Wide Poker (Falcon original)", MACHINE_NOT_WORKING )
GAMEL( 1991, witchcrd, 0, witchcrd, witchcrd, goldnpkr_state, vkdlsc, ROT0, "Video Klein?", "Witch Card (Video Klein CPU box, set 1)", 0, layout_goldnpkr )
-GAME( 1991, witchcda, witchcrd, witchcrd, witchcda, driver_device, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 1)", 0 )
-GAME( 1991, witchcdb, witchcrd, witchcrd, witchcda, driver_device, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 2)", 0 )
-GAME( 1991, witchcdc, witchcrd, witchcrd, witchcdc, driver_device, 0, ROT0, "<unknown>", "Witch Card (English, no witch game)", 0 )
-GAMEL( 1994, witchcdd, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 1 )", 0, layout_goldnpkr )
+GAME( 1991, witchcda, witchcrd, witchcrd, witchcda, goldnpkr_state, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 1)", 0 )
+GAME( 1991, witchcdb, witchcrd, witchcrd, witchcda, goldnpkr_state, 0, ROT0, "<unknown>", "Witch Card (Spanish, witch game, set 2)", 0 )
+GAME( 1991, witchcdc, witchcrd, witchcrd, witchcdc, goldnpkr_state, 0, ROT0, "<unknown>", "Witch Card (English, no witch game)", 0 )
+GAMEL( 1994, witchcdd, witchcrd, witchcrd, witchcdd, goldnpkr_state, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 1 )", 0, layout_goldnpkr )
GAMEL( 1991, witchcde, witchcrd, witchcrd, witchcrd, goldnpkr_state, vkdlsc, ROT0, "Video Klein", "Witch Card (Video Klein CPU box, set 2)", 0, layout_goldnpkr )
-GAMEL( 1985, witchcdf, witchcrd, witchcrd, witchcdf, driver_device, 0, ROT0, "PM / Beck Elektronik", "Witch Card (English, witch game, lamps)", 0, layout_goldnpkr )
-GAMEL( 199?, witchcdg, witchcrd, wcfalcon, witchcrd, driver_device, 0, ROT0, "Falcon", "Witch Card (Falcon, enhanced sound)", 0, layout_goldnpkr )
-GAMEL( 1994, witchcdh, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 2 )", 0, layout_goldnpkr )
-GAMEL( 1994, witchcdi, witchcrd, witchcrd, witchcdd, driver_device, 0, ROT0, "Proma", "Witch Card (German, WC3050, 27-4-94)", 0, layout_goldnpkr )
+GAMEL( 1985, witchcdf, witchcrd, witchcrd, witchcdf, goldnpkr_state, 0, ROT0, "PM / Beck Elektronik", "Witch Card (English, witch game, lamps)", 0, layout_goldnpkr )
+GAMEL( 199?, witchcdg, witchcrd, wcfalcon, witchcrd, goldnpkr_state, 0, ROT0, "Falcon", "Witch Card (Falcon, enhanced sound)", 0, layout_goldnpkr )
+GAMEL( 1994, witchcdh, witchcrd, witchcrd, witchcdd, goldnpkr_state, 0, ROT0, "Proma", "Witch Card (German, WC3050, set 2 )", 0, layout_goldnpkr )
+GAMEL( 1994, witchcdi, witchcrd, witchcrd, witchcdd, goldnpkr_state, 0, ROT0, "Proma", "Witch Card (German, WC3050, 27-4-94)", 0, layout_goldnpkr )
-GAMEL( 1991, witchgme, 0, witchcrd, witchcrd, driver_device, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 1)", 0, layout_goldnpkr )
-GAMEL( 1997, witchcdk, witchgme, witchcrd, witchcrd, driver_device, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr )
+GAMEL( 1991, witchgme, 0, witchcrd, witchcrd, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 1)", 0, layout_goldnpkr )
+GAMEL( 1997, witchcdk, witchgme, witchcrd, witchcrd, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Game (Video Klein, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr )
GAMEL( 1994, witchjol, 0, wcrdxtnd, witchjol, goldnpkr_state, vkdlsa, ROT0, "Video Klein", "Jolli Witch (Export, 6T/12T ver 1.57D)", 0, layout_goldnpkr )
GAMEL( 2001, wldwitch, 0, wcrdxtnd, wldwitch, goldnpkr_state, vkdlsww, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.84A)", 0, layout_goldnpkr ) /* Ver 184A, 2001-09-12 */
GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwa, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-SP)", 0, layout_goldnpkr ) /* Ver 157-SP, 1992-12-25 */
-GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, driver_device, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-TE)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 157-TE, 1992-12-25 */
+GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.57-TE)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 157-TE, 1992-12-25 */
GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A)", 0, layout_goldnpkr ) /* Ver 162A, 1994-04-26 */
GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62B)", 0, layout_goldnpkr ) /* Ver 162B, 1994-04-26 */
-GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, driver_device, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A-F)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 162A-F, 1994-04-26 */
+GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, 0, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A-F)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 162A-F, 1994-04-26 */
GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwc, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62A alt)", 0, layout_goldnpkr ) /* Ver 162A alt, 1994-11-03 */
GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwd, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.62B alt)", 0, layout_goldnpkr ) /* Ver 162B alt, 1994-11-03 */
GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwh, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.65A)", 0, layout_goldnpkr ) /* Ver 165A, 1995-11-16 */
@@ -10936,57 +10936,57 @@ GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwt,
GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwu, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.79A)", 0, layout_goldnpkr ) /* Ver 179A, 2000-05-10 */
GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, vkdlswwv, ROT0, "Video Klein", "Wild Witch (Export, 6T/12T ver 1.83A)", 0, layout_goldnpkr ) /* Ver 183A, 2001-06-13 */
-GAMEL( 1998, wupndown, 0, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 1.02)", 0, layout_upndown ) /* Ver 1.02, 1998-10-26 */
-GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0, layout_upndown ) /* Ver 0.99, 1998-04-09 */
-GAMEL( 1998, wupndownb, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 2)", 0, layout_upndown ) /* Ver 0.99, 1998-03-23 */
-GAMEL( 1998, wupndownc, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 3)", 0, layout_upndown ) /* Ver 0.99 alt, 1998-05-11 */
-GAMEL( 1998, wupndownd, wupndown, wcrdxtnd, wupndown, driver_device, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99T)", 0, layout_upndown ) /* Ver 0.99T, 1998-03-23 */
+GAMEL( 1998, wupndown, 0, wcrdxtnd, wupndown, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 1.02)", 0, layout_upndown ) /* Ver 1.02, 1998-10-26 */
+GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0, layout_upndown ) /* Ver 0.99, 1998-04-09 */
+GAMEL( 1998, wupndownb, wupndown, wcrdxtnd, wupndown, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 2)", 0, layout_upndown ) /* Ver 0.99, 1998-03-23 */
+GAMEL( 1998, wupndownc, wupndown, wcrdxtnd, wupndown, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99, set 3)", 0, layout_upndown ) /* Ver 0.99 alt, 1998-05-11 */
+GAMEL( 1998, wupndownd, wupndown, wcrdxtnd, wupndown, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Up & Down (Export, 6T/12T ver 0.99T)", 0, layout_upndown ) /* Ver 0.99T, 1998-03-23 */
GAMEL( 1992, wstrike, 0, wcrdxtnd, wstrike, goldnpkr_state, wstrike, ROT0, "Video Klein", "Witch Strike (Export, 6T/12T ver 1.01A)", 0, layout_goldnpkr )
GAMEL( 1992, wstrikea, wstrike, wcrdxtnd, wstrike, goldnpkr_state, wstrike, ROT0, "Video Klein", "Witch Strike (Export, 6T/12T ver 1.01B)", 0, layout_goldnpkr )
-GAMEL( 1996, wtchjack, 0, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-89)", 0, layout_goldnpkr ) /* Ver 0.87-89 / 1996-10-08 GFX OK */
-GAMEL( 1996, wtchjacka, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-88)", 0, layout_goldnpkr ) /* Ver 0.87-88 / 1996-10-02, GFX OK */
-GAMEL( 1996, wtchjackb, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87)", 0, layout_goldnpkr ) /* Ver 0.87 / 1996-07-16, GFX OK */
-GAMEL( 1996, wtchjackc, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70S)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70S / 1996-03-26 */
-GAMEL( 1996, wtchjackd, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70P)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70P / 1996-03-26 */
-GAMEL( 1995, wtchjacke, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.65)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.65 / 1995-10-19 */
-GAMEL( 1995, wtchjackf, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.64)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.64 / 1995-09-13 */
-GAMEL( 1995, wtchjackg, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.62)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.62 / 1995-08-02 */
-GAMEL( 1995, wtchjackh, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40T)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 0.40T / 1995-02-27 */
-GAMEL( 1995, wtchjacki, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.40 / 1995-02-27 */
-GAMEL( 1994, wtchjackj, wtchjack, wcrdxtnd, wtchjack, driver_device, 0, ROT0, "Video Klein", "Witch Jackpot (Export, 6T/12T ver 0.25)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.25 / 1994-11-24 */
+GAMEL( 1996, wtchjack, 0, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-89)", 0, layout_goldnpkr ) /* Ver 0.87-89 / 1996-10-08 GFX OK */
+GAMEL( 1996, wtchjacka, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87-88)", 0, layout_goldnpkr ) /* Ver 0.87-88 / 1996-10-02, GFX OK */
+GAMEL( 1996, wtchjackb, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.87)", 0, layout_goldnpkr ) /* Ver 0.87 / 1996-07-16, GFX OK */
+GAMEL( 1996, wtchjackc, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70S)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70S / 1996-03-26 */
+GAMEL( 1996, wtchjackd, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.70P)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.70P / 1996-03-26 */
+GAMEL( 1995, wtchjacke, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.65)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.65 / 1995-10-19 */
+GAMEL( 1995, wtchjackf, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.64)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.64 / 1995-09-13 */
+GAMEL( 1995, wtchjackg, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.62)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.62 / 1995-08-02 */
+GAMEL( 1995, wtchjackh, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40T)", MACHINE_NOT_WORKING, layout_goldnpkr ) /* Ver 0.40T / 1995-02-27 */
+GAMEL( 1995, wtchjacki, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jack (Export, 6T/12T ver 0.40)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.40 / 1995-02-27 */
+GAMEL( 1994, wtchjackj, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, 0, ROT0, "Video Klein", "Witch Jackpot (Export, 6T/12T ver 0.25)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr ) /* Ver 0.25 / 1994-11-24 */
/*************************************** OTHER SETS ***************************************/
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1981, pmpoker, 0, goldnpkr, pmpoker, driver_device, 0, ROT0, "PM / Beck Elektronik", "PlayMan Poker (German)", 0, layout_pmpoker )
-GAMEL( 198?, royale, 0, goldnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "Royale (set 1)", 0, layout_goldnpkr )
-GAMEL( 198?, royalea, royale, goldnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "Royale (set 2)", 0, layout_goldnpkr )
-GAME( 1993, sloco93, 0, witchcrd, sloco93, driver_device, 0, ROT0, "<unknown>", "Super Loco 93 (Spanish, set 1)", 0 )
-GAME( 1993, sloco93a, sloco93, witchcrd, sloco93, driver_device, 0, ROT0, "<unknown>", "Super Loco 93 (Spanish, set 2)", 0 )
-GAME( 198?, maverik, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Maverik", 0 )
-GAMEL( 1986, brasil86, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Brasil 86", 0, layout_goldnpkr )
-GAMEL( 1987, brasil87, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Brasil 87", 0, layout_goldnpkr )
-GAMEL( 1989, brasil89, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Brasil 89 (set 1)", 0, layout_goldnpkr )
-GAMEL( 1989, brasil89a, brasil89, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Brasil 89 (set 2)", 0, layout_goldnpkr )
-GAME( 1993, brasil93, 0, witchcrd, bsuerte, driver_device, 0, ROT0, "<unknown>", "Brasil 93", 0 ) // no lamps
-GAME( 1991, poker91, 0, witchcrd, poker91, driver_device, 0, ROT0, "<unknown>", "Poker 91", 0 )
-GAME( 198?, genie, 0, genie, genie, driver_device, 0, ROT0, "Video Fun Games Ltd.", "Genie (ICP-1, set 1)", 0 )
-GAME( 198?, geniea, genie, geniea, geniea, driver_device, 0, ROT0, "<unknown>", "Genie (ICP-1, set 2)", 0 )
-GAMEL( 1983, silverga, 0, goldnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "Silver Game", 0, layout_goldnpkr )
-GAME( 1987, caspoker, 0, goldnpkr, caspoker, driver_device, 0, ROT0, "PM / Beck Elektronik", "Casino Poker (Ver PM86LO-35-5, German)", MACHINE_IMPERFECT_COLORS )
-
-GAMEL( 198?, superdbl, pottnpkr, goldnpkr, goldnpkr, driver_device, 0, ROT0, "Karateco", "Super Double (French)", 0, layout_goldnpkr )
-GAME( 198?, pokerdub, 0, pottnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "unknown French poker game", MACHINE_NOT_WORKING ) // lacks of 2nd program ROM.
+GAMEL( 1981, pmpoker, 0, goldnpkr, pmpoker, goldnpkr_state, 0, ROT0, "PM / Beck Elektronik", "PlayMan Poker (German)", 0, layout_pmpoker )
+GAMEL( 198?, royale, 0, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "Royale (set 1)", 0, layout_goldnpkr )
+GAMEL( 198?, royalea, royale, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "Royale (set 2)", 0, layout_goldnpkr )
+GAME( 1993, sloco93, 0, witchcrd, sloco93, goldnpkr_state, 0, ROT0, "<unknown>", "Super Loco 93 (Spanish, set 1)", 0 )
+GAME( 1993, sloco93a, sloco93, witchcrd, sloco93, goldnpkr_state, 0, ROT0, "<unknown>", "Super Loco 93 (Spanish, set 2)", 0 )
+GAME( 198?, maverik, 0, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Maverik", 0 )
+GAMEL( 1986, brasil86, 0, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Brasil 86", 0, layout_goldnpkr )
+GAMEL( 1987, brasil87, 0, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Brasil 87", 0, layout_goldnpkr )
+GAMEL( 1989, brasil89, 0, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Brasil 89 (set 1)", 0, layout_goldnpkr )
+GAMEL( 1989, brasil89a, brasil89, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Brasil 89 (set 2)", 0, layout_goldnpkr )
+GAME( 1993, brasil93, 0, witchcrd, bsuerte, goldnpkr_state, 0, ROT0, "<unknown>", "Brasil 93", 0 ) // no lamps
+GAME( 1991, poker91, 0, witchcrd, poker91, goldnpkr_state, 0, ROT0, "<unknown>", "Poker 91", 0 )
+GAME( 198?, genie, 0, genie, genie, goldnpkr_state, 0, ROT0, "Video Fun Games Ltd.", "Genie (ICP-1, set 1)", 0 )
+GAME( 198?, geniea, genie, geniea, geniea, goldnpkr_state, 0, ROT0, "<unknown>", "Genie (ICP-1, set 2)", 0 )
+GAMEL( 1983, silverga, 0, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "Silver Game", 0, layout_goldnpkr )
+GAME( 1987, caspoker, 0, goldnpkr, caspoker, goldnpkr_state, 0, ROT0, "PM / Beck Elektronik", "Casino Poker (Ver PM86LO-35-5, German)", MACHINE_IMPERFECT_COLORS )
+
+GAMEL( 198?, superdbl, pottnpkr, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "Karateco", "Super Double (French)", 0, layout_goldnpkr )
+GAME( 198?, pokerdub, 0, pottnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "unknown French poker game", MACHINE_NOT_WORKING ) // lacks of 2nd program ROM.
GAME( 198?, pokerduc, 0, goldnpkr, goldnpkr, goldnpkr_state, icp1db, ROT0, "<unknown>", "unknown encrypted poker game", MACHINE_NOT_WORKING ) // encrypted.
-GAME( 198?, pokersis, 0, bchancep, goldnpkr, driver_device, 0, ROT0, "Sisteme France", "unknown Sisteme France Poker", MACHINE_NOT_WORKING ) // fix banking (4 prgs?)...
+GAME( 198?, pokersis, 0, bchancep, goldnpkr, goldnpkr_state, 0, ROT0, "Sisteme France", "unknown Sisteme France Poker", MACHINE_NOT_WORKING ) // fix banking (4 prgs?)...
GAMEL( 198?, bchancep, 0, bchancep, goldnpkr, goldnpkr_state, bchancep, ROT0, "<unknown>", "Bonne Chance! (Golden Poker prequel HW, set 1)", MACHINE_NOT_WORKING, layout_goldnpkr )
-GAMEL( 198?, bchanceq, 0, goldnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "Bonne Chance! (Golden Poker prequel HW, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr )
+GAMEL( 198?, bchanceq, 0, goldnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "Bonne Chance! (Golden Poker prequel HW, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr )
-GAME( 1987, pokermon, 0, mondial, mondial, driver_device, 0, ROT0, "<unknown>", "Mundial/Mondial (Italian/French)", 0 ) // banked selectable program
-GAME( 1998, super98, bsuerte, witchcrd, super98, driver_device, 0, ROT0, "<unknown>", "Super 98 (3-hands, ICP-1)", MACHINE_NOT_WORKING ) // program checks zeropage registers for changes...
+GAME( 1987, pokermon, 0, mondial, mondial, goldnpkr_state, 0, ROT0, "<unknown>", "Mundial/Mondial (Italian/French)", 0 ) // banked selectable program
+GAME( 1998, super98, bsuerte, witchcrd, super98, goldnpkr_state, 0, ROT0, "<unknown>", "Super 98 (3-hands, ICP-1)", MACHINE_NOT_WORKING ) // program checks zeropage registers for changes...
-GAME( 198?, animpkr, 0, pottnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "unknown animal-themed game (bottom)", MACHINE_NOT_WORKING ) // banked selectable program (bottom).
-GAME( 198?, animpkra, animpkr, pottnpkr, goldnpkr, driver_device, 0, ROT0, "<unknown>", "unknown animal-themed game (top)", MACHINE_NOT_WORKING ) // banked selectable program (top).
+GAME( 198?, animpkr, 0, pottnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "unknown animal-themed game (bottom)", MACHINE_NOT_WORKING ) // banked selectable program (bottom).
+GAME( 198?, animpkra, animpkr, pottnpkr, goldnpkr, goldnpkr_state, 0, ROT0, "<unknown>", "unknown animal-themed game (top)", MACHINE_NOT_WORKING ) // banked selectable program (top).
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 4b2f2b9f231..3c6b9ef14cb 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -8059,7 +8059,7 @@ WRITE8_MEMBER(goldstar_state::ay8910_outputb_w)
}
-static MACHINE_CONFIG_START( goldstar, goldstar_state )
+static MACHINE_CONFIG_START( goldstar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8090,13 +8090,13 @@ static MACHINE_CONFIG_START( goldstar, goldstar_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( goldstbl, goldstar_state )
+static MACHINE_CONFIG_START( goldstbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8127,7 +8127,7 @@ static MACHINE_CONFIG_START( goldstbl, goldstar_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8140,7 +8140,7 @@ static MACHINE_CONFIG_DERIVED( goldfrui, goldstbl )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( star100, sanghopm_state )
+static MACHINE_CONFIG_START( star100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8173,13 +8173,13 @@ static MACHINE_CONFIG_START( star100, sanghopm_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW6"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( super9, goldstar_state )
+static MACHINE_CONFIG_START( super9 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8212,7 +8212,7 @@ static MACHINE_CONFIG_START( super9, goldstar_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8277,7 +8277,7 @@ PALETTE_INIT_MEMBER(goldstar_state, lucky8)
}
-static MACHINE_CONFIG_START( ncb3, cb3_state )
+static MACHINE_CONFIG_START( ncb3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8347,7 +8347,7 @@ static MACHINE_CONFIG_DERIVED( cm97, ncb3 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wcherry, goldstar_state )
+static MACHINE_CONFIG_START( wcherry )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8396,7 +8396,7 @@ static MACHINE_CONFIG_START( wcherry, goldstar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cm, cmaster_state )
+static MACHINE_CONFIG_START( cm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8443,7 +8443,7 @@ static MACHINE_CONFIG_DERIVED( cmasterc, cm )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cmast91, goldstar_state )
+static MACHINE_CONFIG_START( cmast91 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8493,7 +8493,7 @@ INTERRUPT_GEN_MEMBER(wingco_state::masked_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( lucky8, wingco_state )
+static MACHINE_CONFIG_START( lucky8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8548,7 +8548,7 @@ static MACHINE_CONFIG_START( lucky8, wingco_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bingowng, wingco_state )
+static MACHINE_CONFIG_START( bingowng )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8670,7 +8670,7 @@ PALETTE_INIT_MEMBER(wingco_state, magodds)
}
}
-static MACHINE_CONFIG_START( magodds, wingco_state )
+static MACHINE_CONFIG_START( magodds )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8725,7 +8725,7 @@ static MACHINE_CONFIG_START( magodds, wingco_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kkotnoli, goldstar_state )
+static MACHINE_CONFIG_START( kkotnoli )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8769,7 +8769,7 @@ static MACHINE_CONFIG_START( kkotnoli, goldstar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ladylinr, goldstar_state )
+static MACHINE_CONFIG_START( ladylinr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8812,7 +8812,7 @@ static MACHINE_CONFIG_START( ladylinr, goldstar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wcat3, wingco_state )
+static MACHINE_CONFIG_START( wcat3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8869,7 +8869,7 @@ MACHINE_CONFIG_END
/* diff with cm machine driver: gfxdecode, OKI & portmap */
-static MACHINE_CONFIG_START( amcoe1, cmaster_state )
+static MACHINE_CONFIG_START( amcoe1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8910,7 +8910,7 @@ static MACHINE_CONFIG_START( amcoe1, cmaster_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW5"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8925,7 +8925,7 @@ MACHINE_CONFIG_END
/* diff with cm machine driver: gfxdecode, AY8910 volume & portmap */
-static MACHINE_CONFIG_START( amcoe2, cmaster_state )
+static MACHINE_CONFIG_START( amcoe2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -8983,7 +8983,7 @@ INTERRUPT_GEN_MEMBER(unkch_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( unkch, unkch_state )
+static MACHINE_CONFIG_START( unkch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -9022,7 +9022,7 @@ MACHINE_CONFIG_END
// hw unknown - should be somewhat similar to cm
-static MACHINE_CONFIG_START( pkrmast, goldstar_state )
+static MACHINE_CONFIG_START( pkrmast )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -9055,7 +9055,7 @@ static MACHINE_CONFIG_START( pkrmast, goldstar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( megaline, unkch_state )
+static MACHINE_CONFIG_START( megaline )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -9105,7 +9105,7 @@ static MACHINE_CONFIG_START( megaline, unkch_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bonusch, unkch_state )
+static MACHINE_CONFIG_START( bonusch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
@@ -16008,30 +16008,30 @@ DRIVER_INIT_MEMBER(wingco_state, flam7_tw)
YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
GAMEL( 199?, goldstar, 0, goldstar, goldstar, goldstar_state, goldstar, ROT0, "IGS", "Golden Star", 0, layout_goldstar )
-GAMEL( 199?, goldstbl, goldstar, goldstbl, goldstar, driver_device, 0, ROT0, "IGS", "Golden Star (Blue version)", 0, layout_goldstar )
-GAME( 199?, moonlght, goldstar, moonlght, goldstar, driver_device, 0, ROT0, "bootleg", "Moon Light (v.0629, low program)", 0 )
-GAME( 199?, moonlghta, goldstar, moonlght, goldstar, driver_device, 0, ROT0, "bootleg", "Moon Light (v.0629, high program)", 0 )
-GAME( 199?, moonlghtb, goldstar, moonlght, goldstar, driver_device, 0, ROT0, "bootleg", "Moon Light (v.02L0A, low program)", MACHINE_IMPERFECT_COLORS ) // need to check the odd palette value at 0xc780. should be black.
-GAME( 199?, moonlghtc, goldstar, moonlght, goldstar, driver_device, 0, ROT0, "bootleg", "Moon Light (v.02L0A, high program, alt gfx)", MACHINE_IMPERFECT_COLORS ) // need to check the odd palette value at 0xc780. should be black.
+GAMEL( 199?, goldstbl, goldstar, goldstbl, goldstar, goldstar_state, 0, ROT0, "IGS", "Golden Star (Blue version)", 0, layout_goldstar )
+GAME( 199?, moonlght, goldstar, moonlght, goldstar, goldstar_state, 0, ROT0, "bootleg", "Moon Light (v.0629, low program)", 0 )
+GAME( 199?, moonlghta, goldstar, moonlght, goldstar, goldstar_state, 0, ROT0, "bootleg", "Moon Light (v.0629, high program)", 0 )
+GAME( 199?, moonlghtb, goldstar, moonlght, goldstar, goldstar_state, 0, ROT0, "bootleg", "Moon Light (v.02L0A, low program)", MACHINE_IMPERFECT_COLORS ) // need to check the odd palette value at 0xc780. should be black.
+GAME( 199?, moonlghtc, goldstar, moonlght, goldstar, goldstar_state, 0, ROT0, "bootleg", "Moon Light (v.02L0A, high program, alt gfx)", MACHINE_IMPERFECT_COLORS ) // need to check the odd palette value at 0xc780. should be black.
GAMEL( 199?, chrygld, 0, chrygld, chrygld, cb3_state, chrygld, ROT0, "bootleg", "Cherry Gold I (set 1)", 0, layout_chrygld )
GAMEL( 199?, chry10, 0, chrygld, chry10, cb3_state, chry10, ROT0, "bootleg", "Cherry 10 (bootleg with PIC16F84)", 0, layout_chrygld )
-GAME( 199?, goldfrui, goldstar, goldfrui, goldstar, driver_device, 0, ROT0, "bootleg", "Gold Fruit", 0 ) // maybe fullname should be 'Gold Fruit (main 40%)'
+GAME( 199?, goldfrui, goldstar, goldfrui, goldstar, goldstar_state, 0, ROT0, "bootleg", "Gold Fruit", 0 ) // maybe fullname should be 'Gold Fruit (main 40%)'
GAME( 2001, super9, goldstar, super9, goldstar, goldstar_state, super9, ROT0, "Playmark", "Super Nove (Playmark)", MACHINE_NOT_WORKING ) // need to decode gfx and see the program loops/reset...
GAME( 2001, wcherry, 0, wcherry, chrygld, goldstar_state, wcherry, ROT0, "bootleg", "Win Cherry (ver 0.16 - 19990219)", MACHINE_NOT_WORKING )
-GAME( 199?, star100, 0, star100, star100, driver_device, 0, ROT0, "Sang Ho", "Ming Xing 100 (Star 100)", MACHINE_IMPERFECT_COLORS )
+GAME( 199?, star100, 0, star100, star100, sanghopm_state, 0, ROT0, "Sang Ho", "Ming Xing 100 (Star 100)", MACHINE_IMPERFECT_COLORS )
// are these really dyna, or bootlegs?
-GAMEL( 199?, ncb3, 0, ncb3, ncb3, driver_device, 0, ROT0, "Dyna", "Cherry Bonus III (ver.1.40, set 1)", 0, layout_cherryb3 )
-GAMEL( 199?, cb3a, ncb3, ncb3, cb3a, driver_device, 0, ROT0, "Dyna", "Cherry Bonus III (ver.1.40, set 2)", 0, layout_cherryb3 )
+GAMEL( 199?, ncb3, 0, ncb3, ncb3, cb3_state, 0, ROT0, "Dyna", "Cherry Bonus III (ver.1.40, set 1)", 0, layout_cherryb3 )
+GAMEL( 199?, cb3a, ncb3, ncb3, cb3a, cb3_state, 0, ROT0, "Dyna", "Cherry Bonus III (ver.1.40, set 2)", 0, layout_cherryb3 )
GAMEL( 199?, cb3, ncb3, ncb3, ncb3, cb3_state, cb3, ROT0, "Dyna", "Cherry Bonus III (ver.1.40, encrypted)", 0, layout_cherryb3 )
GAMEL( 199?, cb3b, ncb3, cherrys, ncb3, cb3_state, cherrys, ROT0, "Dyna", "Cherry Bonus III (alt)", 0, layout_cherryb3 )
GAME( 199?, cb3c, ncb3, cb3c, chrygld, cb3_state, cb3, ROT0, "bootleg", "Cherry Bonus III (alt, set 2)", MACHINE_NOT_WORKING)
-GAMEL( 199?, cb3d, ncb3, ncb3, ncb3, driver_device, 0, ROT0, "bootleg", "Cherry Bonus III (set 3)", 0, layout_cherryb3 )
+GAMEL( 199?, cb3d, ncb3, ncb3, ncb3, cb3_state, 0, ROT0, "bootleg", "Cherry Bonus III (set 3)", 0, layout_cherryb3 )
GAMEL( 199?, cb3e, ncb3, cb3e, chrygld, cb3_state, cb3e, ROT0, "bootleg", "Cherry Bonus III (set 4, encrypted bootleg)", 0, layout_chrygld )
GAMEL( 199?, chryglda, ncb3, cb3e, chrygld, cb3_state, cb3e, ROT0, "bootleg", "Cherry Gold I (set 2, encrypted bootleg)", 0, layout_chrygld ) // Runs in CB3e hardware.
-GAME( 1996, cmast97, ncb3, cm97, chrygld, driver_device, 0, ROT0, "Dyna", "Cherry Master '97", MACHINE_NOT_WORKING) // fix prom decode
+GAME( 1996, cmast97, ncb3, cm97, chrygld, cb3_state, 0, ROT0, "Dyna", "Cherry Master '97", MACHINE_NOT_WORKING) // fix prom decode
// looks like a hack of Cherry Bonus 3
GAME( 199?, chryangl, ncb3, cm, chryangl, cmaster_state, cmv4, ROT0, "<unknown>", "Cherry Angel", MACHINE_NOT_WORKING )
@@ -16049,7 +16049,7 @@ GAMEL( 1992, cmv4, 0, cm, cmv4, cmaster_state, cmv4,
GAMEL( 1992, cmv4a, cmv4, cm, cmv4, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master (ver.4, set 2)", MACHINE_NOT_WORKING, layout_cmv4 ) // stealth game?
GAMEL( 199?, cmwm, cmv4, cm, cmv4, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master (Watermelon bootleg / hack)", 0, layout_cmv4 ) // CM Fruit Bonus ver.2 T bootleg/hack
GAMEL( 1995, cmfun, cmv4, cm, cmv4, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master (Fun USA v2.5 bootleg / hack)", 0, layout_cmv4 )
-GAMEL( 1991, cmaster, 0, cm, cmaster, driver_device, 0, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 1)", 0, layout_cmaster )
+GAMEL( 1991, cmaster, 0, cm, cmaster, cmaster_state, 0, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 1)", 0, layout_cmaster )
GAMEL( 1991, cmasterb, cmaster, cm, cmasterb, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 2)", 0, layout_cmasterb )
GAMEL( 1991, cmezspin, cmaster, cm, cmezspin, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master I (E-Z Spin bootleg / hack)", 0, layout_cmezspin ) // CM Fruit Bonus 55 ver.2 bootleg/hack
GAMEL( 1991, cmasterc, cmaster, cmasterc, cmasterc, cmaster_state, cmv4, ROT0, "Dyna", "Cherry Master I (ver.1.01, set 3)", 0, layout_cmasterc )
@@ -16062,9 +16062,9 @@ GAMEL( 1991, cmasterh, cmaster, cm, cmasterb, cmaster_state, cmv4,
GAMEL( 1991, tonypok, 0, cm, tonypok, cmaster_state, tonypok, ROT0, "Corsica", "Poker Master (Tony-Poker V3.A, hack?)", 0 , layout_tonypok )
-GAME( 199?, jkrmast, 0, pkrmast, pkrmast, driver_device, 0, ROT0, "<unknown>", "Joker Master", MACHINE_NOT_WORKING ) // encrypted?
-GAME( 199?, pkrmast, jkrmast, pkrmast, pkrmast, driver_device, 0, ROT0, "<unknown>", "Poker Master (ED-1993 set 1)", MACHINE_NOT_WORKING ) // incomplete dump + encrypted?
-GAME( 1993, pkrmasta, jkrmast, pkrmast, pkrmast, driver_device, 0, ROT0, "<unknown>", "Poker Master (ED-1993 set 2)", MACHINE_NOT_WORKING ) // incomplete dump + encrypted?
+GAME( 199?, jkrmast, 0, pkrmast, pkrmast, goldstar_state, 0, ROT0, "<unknown>", "Joker Master", MACHINE_NOT_WORKING ) // encrypted?
+GAME( 199?, pkrmast, jkrmast, pkrmast, pkrmast, goldstar_state, 0, ROT0, "<unknown>", "Poker Master (ED-1993 set 1)", MACHINE_NOT_WORKING ) // incomplete dump + encrypted?
+GAME( 1993, pkrmasta, jkrmast, pkrmast, pkrmast, goldstar_state, 0, ROT0, "<unknown>", "Poker Master (ED-1993 set 2)", MACHINE_NOT_WORKING ) // incomplete dump + encrypted?
GAME( 1991, cmast91, 0, cmast91, cmast91, goldstar_state, cmast91, ROT0, "Dyna", "Cherry Master '91 (ver.1.30)", 0 )
@@ -16075,33 +16075,33 @@ GAME( 1993, aplan, 0, cm, cmast99, cmaster_state, cmv4,
// --- Wing W-4 hardware ---
-GAMEL( 1989, lucky8, 0, lucky8, lucky8, driver_device, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 1, W-4)", 0, layout_lucky8 ) // 2 control sets...
+GAMEL( 1989, lucky8, 0, lucky8, lucky8, wingco_state, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 1, W-4)", 0, layout_lucky8 ) // 2 control sets...
GAMEL( 1989, lucky8a, lucky8, lucky8, lucky8a, wingco_state, lucky8a, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 2, W-4)", 0, layout_lucky8 ) // 2 control sets...
-GAMEL( 1989, lucky8b, lucky8, lucky8, lucky8b, driver_device, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 3, W-4, extended gfx)", 0, layout_lucky8p1 ) // only 1 control set...
+GAMEL( 1989, lucky8b, lucky8, lucky8, lucky8b, wingco_state, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 3, W-4, extended gfx)", 0, layout_lucky8p1 ) // only 1 control set...
GAMEL( 1989, lucky8c, lucky8, lucky8, lucky8, wingco_state, lucky8a, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 4, W-4)", 0, layout_lucky8 ) // 2 control sets...
-GAMEL( 1989, lucky8d, lucky8, lucky8, lucky8d, driver_device, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 5, W-4, main 40%, d-up 60%)", 0, layout_lucky8 ) // 2 control sets...
-GAMEL( 1989, lucky8e, lucky8, lucky8, lucky8d, driver_device, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 6, W-4, main 40%, d-up 60%)", 0, layout_lucky8 ) // 2 control sets...
-GAMEL( 198?, ns8lines, 0, lucky8, lucky8b, driver_device, 0, ROT0, "<unknown>", "New Lucky 8 Lines / New Super 8 Lines (W-4)", 0, layout_lucky8p1 ) // only 1 control set...
-GAMEL( 1985, ns8linesa, ns8lines, lucky8, lucky8b, driver_device, 0, ROT0, "Yamate (bootleg)", "New Lucky 8 Lines / New Super 8 Lines (W-4, Lucky97 HW)", 0, layout_lucky8p1 ) // only 1 control set...
-GAMEL( 198?, ns8linew, ns8lines, lucky8, ns8linew, driver_device, 0, ROT0, "<unknown>", "New Lucky 8 Lines / New Super 8 Lines (F-5, Witch Bonus)", 0, layout_lucky8 ) // 2 control sets...
-GAMEL( 198?, ns8linewa, ns8lines, lucky8, ns8linwa, driver_device, 0, ROT0, "<unknown>", "New Lucky 8 Lines / New Super 8 Lines (W-4, Witch Bonus)", 0, layout_lucky8p1 ) // only 1 control set...
-GAME( 198?, luckybar, 0, lucky8, ns8linew, driver_device, 0, ROT0, "<unknown>", "Lucky Bar (W-4 with mc68705 MCU)", MACHINE_NOT_WORKING ) // MC68705 MCU
-GAME( 198?, chryangla, ncb3, lucky8, ns8linew, driver_device, 0, ROT0, "<unknown>", "Cherry Angel (encrypted, W-4 hardware)", MACHINE_NOT_WORKING )
-GAMEL( 198?, kkotnoli, 0, kkotnoli, kkotnoli, driver_device, 0, ROT0, "hack", "Kkot No Li (Kill the Bees)", MACHINE_IMPERFECT_COLORS, layout_lucky8 )
-GAME( 198?, ladylinr, 0, ladylinr, ladylinr, driver_device, 0, ROT0, "TAB Austria", "Lady Liner", 0 )
-GAME( 198?, wcat3, 0, wcat3, lucky8, driver_device, 0, ROT0, "E.A.I.", "Wild Cat 3", MACHINE_NOT_WORKING )
+GAMEL( 1989, lucky8d, lucky8, lucky8, lucky8d, wingco_state, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 5, W-4, main 40%, d-up 60%)", 0, layout_lucky8 ) // 2 control sets...
+GAMEL( 1989, lucky8e, lucky8, lucky8, lucky8d, wingco_state, 0, ROT0, "Wing Co., Ltd.", "New Lucky 8 Lines (set 6, W-4, main 40%, d-up 60%)", 0, layout_lucky8 ) // 2 control sets...
+GAMEL( 198?, ns8lines, 0, lucky8, lucky8b, wingco_state, 0, ROT0, "<unknown>", "New Lucky 8 Lines / New Super 8 Lines (W-4)", 0, layout_lucky8p1 ) // only 1 control set...
+GAMEL( 1985, ns8linesa, ns8lines, lucky8, lucky8b, wingco_state, 0, ROT0, "Yamate (bootleg)", "New Lucky 8 Lines / New Super 8 Lines (W-4, Lucky97 HW)", 0, layout_lucky8p1 ) // only 1 control set...
+GAMEL( 198?, ns8linew, ns8lines, lucky8, ns8linew, wingco_state, 0, ROT0, "<unknown>", "New Lucky 8 Lines / New Super 8 Lines (F-5, Witch Bonus)", 0, layout_lucky8 ) // 2 control sets...
+GAMEL( 198?, ns8linewa, ns8lines, lucky8, ns8linwa, wingco_state, 0, ROT0, "<unknown>", "New Lucky 8 Lines / New Super 8 Lines (W-4, Witch Bonus)", 0, layout_lucky8p1 ) // only 1 control set...
+GAME( 198?, luckybar, 0, lucky8, ns8linew, wingco_state, 0, ROT0, "<unknown>", "Lucky Bar (W-4 with mc68705 MCU)", MACHINE_NOT_WORKING ) // MC68705 MCU
+GAME( 198?, chryangla, ncb3, lucky8, ns8linew, wingco_state, 0, ROT0, "<unknown>", "Cherry Angel (encrypted, W-4 hardware)", MACHINE_NOT_WORKING )
+GAMEL( 198?, kkotnoli, 0, kkotnoli, kkotnoli, goldstar_state, 0, ROT0, "hack", "Kkot No Li (Kill the Bees)", MACHINE_IMPERFECT_COLORS, layout_lucky8 )
+GAME( 198?, ladylinr, 0, ladylinr, ladylinr, goldstar_state, 0, ROT0, "TAB Austria", "Lady Liner", 0 )
+GAME( 198?, wcat3, 0, wcat3, lucky8, wingco_state, 0, ROT0, "E.A.I.", "Wild Cat 3", MACHINE_NOT_WORKING )
-GAME( 1985, luckylad, 0, lucky8, luckylad, driver_device, 0, ROT0, "Wing Co., Ltd.", "Lucky Lady (Wing, encrypted)", MACHINE_NOT_WORKING ) // encrypted (see notes in rom_load)...
-GAME( 1991, megaline, 0, megaline, megaline, driver_device, 0, ROT0, "Fun World", "Mega Lines", MACHINE_NOT_WORKING )
+GAME( 1985, luckylad, 0, lucky8, luckylad, wingco_state, 0, ROT0, "Wing Co., Ltd.", "Lucky Lady (Wing, encrypted)", MACHINE_NOT_WORKING ) // encrypted (see notes in rom_load)...
+GAME( 1991, megaline, 0, megaline, megaline, unkch_state, 0, ROT0, "Fun World", "Mega Lines", MACHINE_NOT_WORKING )
-GAMEL( 1993, bingowng, 0, bingowng, bingowng, driver_device, 0, ROT0, "Wing Co., Ltd.", "Bingo (set 1)", 0, layout_bingowng )
-GAMEL( 1993, bingownga, bingowng, bingownga,bingownga,driver_device, 0, ROT0, "Wing Co., Ltd.", "Bingo (set 2)", 0, layout_bingowng )
+GAMEL( 1993, bingowng, 0, bingowng, bingowng, wingco_state, 0, ROT0, "Wing Co., Ltd.", "Bingo (set 1)", 0, layout_bingowng )
+GAMEL( 1993, bingownga, bingowng, bingownga,bingownga,wingco_state, 0, ROT0, "Wing Co., Ltd.", "Bingo (set 2)", 0, layout_bingowng )
-GAME( 2002, mbs2euro, 0, mbstar, mbstar, driver_device, 0, ROT0, "Auto-Data Graz", "Mega Bonus Star II (Euro, Millennium Edition)", MACHINE_NOT_WORKING ) // need more work in memory map, inputs, and reels alignment.
+GAME( 2002, mbs2euro, 0, mbstar, mbstar, wingco_state, 0, ROT0, "Auto-Data Graz", "Mega Bonus Star II (Euro, Millennium Edition)", MACHINE_NOT_WORKING ) // need more work in memory map, inputs, and reels alignment.
// --- Flaming 7's hardware (W-4 derivative) ---
-GAME( 199?, fl7_3121, 0, flam7_w4, flam7_w4, driver_device, 0, ROT0, "Cyberdyne Systems", "Flaming 7 (W4 Hardware, Red, White & Blue 7's + Hollywood Nights)", 0 )
+GAME( 199?, fl7_3121, 0, flam7_w4, flam7_w4, wingco_state, 0, ROT0, "Cyberdyne Systems", "Flaming 7 (W4 Hardware, Red, White & Blue 7's + Hollywood Nights)", 0 )
GAME( 199?, fl7_50, 0, flaming7, flaming7, wingco_state, flaming7, ROT0, "Cyberdyne Systems", "Flaming 7 (Custom Hardware, Main, 50 Bonus)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS )
GAME( 199?, fl7_500, fl7_50, flaming7, flaming7, wingco_state, flaming7, ROT0, "Cyberdyne Systems", "Flaming 7 (Custom Hardware, Main, 500 Bonus)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS )
GAME( 199?, fl7_2000, fl7_50, flaming7, flaming7, wingco_state, flaming7, ROT0, "Cyberdyne Systems", "Flaming 7 (Custom Hardware, Main, 2000 Bonus)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS )
@@ -16110,13 +16110,13 @@ GAME( 199?, fl7_tw, fl7_50, flam7_tw, flaming7, wingco_state, flam7_tw,
// --- Wing W-8 hardware ---
-GAME( 1990, bonusch, 0, bonusch, bonusch, driver_device, 0, ROT0, "Wing Co., Ltd.", "Bonus Chance (W-8)", MACHINE_NOT_WORKING ) // M80C51F MCU
+GAME( 1990, bonusch, 0, bonusch, bonusch, unkch_state, 0, ROT0, "Wing Co., Ltd.", "Bonus Chance (W-8)", MACHINE_NOT_WORKING ) // M80C51F MCU
// --- Magical Odds hardware ---
-GAME( 1992, magodds, 0, magodds, magodds, driver_device, 0, ROT0, "Pal Company / Micro Manufacturing Inc.", "Magical Odds (set 1)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, magoddsa, magodds, magodds, magodds, driver_device, 0, ROT0, "Pal Company / Micro Manufacturing Inc.", "Magical Odds (set 2)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, magoddsb, magodds, magodds, magodds, driver_device, 0, ROT0, "Pal Company / Micro Manufacturing Inc.", "Magical Odds (set 3)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, magodds, 0, magodds, magodds, wingco_state, 0, ROT0, "Pal Company / Micro Manufacturing Inc.", "Magical Odds (set 1)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, magoddsa, magodds, magodds, magodds, wingco_state, 0, ROT0, "Pal Company / Micro Manufacturing Inc.", "Magical Odds (set 2)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, magoddsb, magodds, magodds, magodds, wingco_state, 0, ROT0, "Pal Company / Micro Manufacturing Inc.", "Magical Odds (set 3)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1991, magoddsc, magodds, magodds, magoddsc, wingco_state, magoddsc, ROT0, "Pal Company", "Magical Odds (set 4, custom encrypted CPU block)", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING |MACHINE_NO_SOUND)
GAME( 1991, magoddsd, magodds, magodds, magoddsc, wingco_state, magoddsc, ROT0, "Pal Company", "Magical Odds (set 5, custom encrypted CPU block)", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING |MACHINE_NO_SOUND)
@@ -16159,13 +16159,13 @@ GAME( 1996, roypok96c, roypok96, amcoe2, roypok96a, cmaster_state, rp96sub,
some sets are messy and appear to have mismatched graphic roms, they need to be sorted out properly
*/
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1996, nfb96se, nfb96, amcoe2, nfb96bl, driver_device, 0, ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 1, v97-3.3c Portuguese)", 0 )
+GAME( 1996, nfb96se, nfb96, amcoe2, nfb96bl, cmaster_state, 0, ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 1, v97-3.3c Portuguese)", 0 )
GAME( 1996, nfb96sea, nfb96, amcoe2, nfb96bl, cmaster_state, nfb96sea, ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 2, v97-3.3c English)", MACHINE_WRONG_COLORS ) // encrypted program
-GAME( 1996, nfb96seb, nfb96, amcoe2, nfb96bl, driver_device, 0, ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 3, v97-3.3c Portuguese)", MACHINE_WRONG_COLORS )
-GAME( 2002, carb2002, nfb96, amcoe2, nfb96bl, driver_device, 0, ROT0, "bootleg", "Carriage Bonus 2002 (bootleg)", MACHINE_WRONG_COLORS )
-GAME( 2003, carb2003, nfb96, amcoe2, nfb96bl, driver_device, 0, ROT0, "bootleg", "Carriage Bonus 2003 (bootleg)", MACHINE_WRONG_COLORS )
+GAME( 1996, nfb96seb, nfb96, amcoe2, nfb96bl, cmaster_state, 0, ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 3, v97-3.3c Portuguese)", MACHINE_WRONG_COLORS )
+GAME( 2002, carb2002, nfb96, amcoe2, nfb96bl, cmaster_state, 0, ROT0, "bootleg", "Carriage Bonus 2002 (bootleg)", MACHINE_WRONG_COLORS )
+GAME( 2003, carb2003, nfb96, amcoe2, nfb96bl, cmaster_state, 0, ROT0, "bootleg", "Carriage Bonus 2003 (bootleg)", MACHINE_WRONG_COLORS )
-GAME( 2003, nfm, 0, nfm, nfm, driver_device, 0, ROT0, "Ming-Yang Electronic", "New Fruit Machine (Ming-Yang Electronic)", MACHINE_NOT_WORKING ) // vFB02-07A "Copyright By Ms. Liu Orchis 2003/03/06"
+GAME( 2003, nfm, 0, nfm, nfm, cmaster_state, 0, ROT0, "Ming-Yang Electronic", "New Fruit Machine (Ming-Yang Electronic)", MACHINE_NOT_WORKING ) // vFB02-07A "Copyright By Ms. Liu Orchis 2003/03/06"
// super cherry master sets...
@@ -16189,7 +16189,7 @@ GAMEL( 198?, cmpacmana, cmpacman, cm, cmpacman, cmaster_state, cm, R
GAMEL( 198?, cmtetris, 0, cm, cmtetris, cmaster_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (Corsica, v8.01, set 1)", 0, layout_cmpacman ) // need to press K/L to switch between games...
GAMEL( 198?, cmtetrsa, 0, cm, cmtetris, cmaster_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (Corsica, v8.01, set 2)", MACHINE_NOT_WORKING, layout_cmpacman ) // seems banked...
GAMEL( 198?, cmtetrsb, 0, cm, cmtetris, cmaster_state, cm, ROT0, "<unknown>", "Tetris + Cherry Master (+K, Canada Version, encrypted)", MACHINE_NOT_WORKING, layout_cmpacman ) // different Tetris game. press insert to throttle and see the attract running.
-GAMEL( 1997, crazybon, 0, pkrmast, crazybon, driver_device, 0, ROT0, "bootleg (Crazy Co.)", "Crazy Bonus 2002", MACHINE_IMPERFECT_COLORS, layout_crazybon ) // Windows ME desktop... but not found the way to switch it.
+GAMEL( 1997, crazybon, 0, pkrmast, crazybon, goldstar_state, 0, ROT0, "bootleg (Crazy Co.)", "Crazy Bonus 2002", MACHINE_IMPERFECT_COLORS, layout_crazybon ) // Windows ME desktop... but not found the way to switch it.
/* other possible stealth sets:
- cmv4a ---> see the 1fxx zone. put a bp in 1f9f to see the loop.
diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp
index 32d2412485e..492e70594d0 100644
--- a/src/mame/drivers/gomoku.cpp
+++ b/src/mame/drivers/gomoku.cpp
@@ -25,6 +25,7 @@ todo:
#include "emu.h"
#include "includes/gomoku.h"
+#include "audio/gomoku.h"
#include "cpu/z80/z80.h"
#include "speaker.h"
@@ -122,7 +123,7 @@ static GFXDECODE_START( gomoku )
GFXDECODE_END
-static MACHINE_CONFIG_START( gomoku, gomoku_state )
+static MACHINE_CONFIG_START( gomoku )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/12) /* 1.536 MHz ? */
MCFG_CPU_PROGRAM_MAP(gomoku_map)
@@ -181,5 +182,5 @@ ROM_START( gomoku )
ROM_END
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME
-GAME( 1981, gomoku, 0, gomoku, gomoku, driver_device, 0, ROT90, "Nichibutsu", "Gomoku Narabe Renju", 0 )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE INIT, MONITOR, COMPANY, FULLNAME, FLAGS
+GAME( 1981, gomoku, 0, gomoku, gomoku, gomoku_state, 0, ROT90, "Nichibutsu", "Gomoku Narabe Renju", 0 )
diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp
index 3000fa23278..f5043b2005a 100644
--- a/src/mame/drivers/good.cpp
+++ b/src/mame/drivers/good.cpp
@@ -47,7 +47,9 @@ public:
m_fg_tilemapram(*this, "fg_tilemapram"),
m_bg_tilemapram(*this, "bg_tilemapram"),
m_maincpu(*this, "maincpu"),
- m_gfxdecode(*this, "gfxdecode") { }
+ m_gfxdecode(*this, "gfxdecode")
+ {
+ }
/* memory pointers */
required_shared_ptr<uint16_t> m_fg_tilemapram;
@@ -282,7 +284,7 @@ static GFXDECODE_START( good )
GFXDECODE_END
-static MACHINE_CONFIG_START( good, good_state )
+static MACHINE_CONFIG_START( good )
MCFG_CPU_ADD("maincpu", M68000, 16000000 /2)
MCFG_CPU_PROGRAM_MAP(good_map)
@@ -304,7 +306,7 @@ static MACHINE_CONFIG_START( good, good_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
@@ -325,4 +327,4 @@ ROM_START( good )
ROM_LOAD16_BYTE( "grp-04", 0x40001, 0x20000, CRC(83dbbb52) SHA1(e597f3cbb54b5cdf2230ea6318f970319061e31b) )
ROM_END
-GAME( 1998, good, 0, good, good, driver_device, 0, ROT0, "<unknown>", "Good (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, good, 0, good, good, good_state, 0, ROT0, "<unknown>", "Good (Korea)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp
index 38291ec75da..7f1567c554d 100644
--- a/src/mame/drivers/goodejan.cpp
+++ b/src/mame/drivers/goodejan.cpp
@@ -630,7 +630,7 @@ WRITE16_MEMBER( goodejan_state::layer_scroll_w )
-static MACHINE_CONFIG_START( goodejan, goodejan_state )
+static MACHINE_CONFIG_START( goodejan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, GOODEJAN_MHZ2/2)
@@ -665,7 +665,7 @@ static MACHINE_CONFIG_START( goodejan, goodejan_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", GOODEJAN_MHZ2/16, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", GOODEJAN_MHZ2/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -776,6 +776,6 @@ ROM_START( goodejana )
ROM_LOAD( "fmj08.083", 0x000, 0x100, CRC(9657b7ad) SHA1(e9b469c2b3534593f7fe0ea19cbbf93b55957e42) )
ROM_END
-GAME( 1991, totmejan, 0, totmejan, goodejan, driver_device, 0, ROT0, "Seibu Kaihatsu (Tecmo license)", "Tottemo E Jong", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, goodejan, 0, goodejan, goodejan, driver_device, 0, ROT0, "Seibu Kaihatsu (Tecmo license)", "Good E Jong -Kachinuki Mahjong Syoukin Oh!!- (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, goodejana,goodejan, goodejan, goodejan, driver_device, 0, ROT0, "Seibu Kaihatsu (Tecmo license)", "Good E Jong -Kachinuki Mahjong Syoukin Oh!!- (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, totmejan, 0, totmejan, goodejan, goodejan_state, 0, ROT0, "Seibu Kaihatsu (Tecmo license)", "Tottemo E Jong", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, goodejan, 0, goodejan, goodejan, goodejan_state, 0, ROT0, "Seibu Kaihatsu (Tecmo license)", "Good E Jong -Kachinuki Mahjong Syoukin Oh!!- (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, goodejana,goodejan, goodejan, goodejan, goodejan_state, 0, ROT0, "Seibu Kaihatsu (Tecmo license)", "Good E Jong -Kachinuki Mahjong Syoukin Oh!!- (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp
index e8c78beb988..ba423131407 100644
--- a/src/mame/drivers/gotcha.cpp
+++ b/src/mame/drivers/gotcha.cpp
@@ -262,7 +262,7 @@ void gotcha_state::machine_reset()
m_banksel = 0;
}
-static MACHINE_CONFIG_START( gotcha, gotcha_state )
+static MACHINE_CONFIG_START( gotcha )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,14318180) /* 14.31818 MHz */
@@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( gotcha, gotcha_state )
MCFG_SOUND_ROUTE(0, "mono", 0.80)
MCFG_SOUND_ROUTE(1, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -388,5 +388,5 @@ ROM_START( ppchamp )
ROM_LOAD( "uz11", 0x00000, 0x80000, CRC(3d96274c) SHA1(c7a670af86194c370bf8fb30afbe027ab78a0227) )
ROM_END
-GAMEL( 1997, gotcha, 0, gotcha, gotcha, driver_device, 0, ROT0, "Dongsung / Para", "Got-cha Mini Game Festival", MACHINE_SUPPORTS_SAVE, layout_gotcha )
-GAMEL( 1997, ppchamp, gotcha, gotcha, gotcha, driver_device, 0, ROT0, "Dongsung / Para", "Pasha Pasha Champ Mini Game Festival (Korea)", MACHINE_SUPPORTS_SAVE, layout_gotcha )
+GAMEL( 1997, gotcha, 0, gotcha, gotcha, gotcha_state, 0, ROT0, "Dongsung / Para", "Got-cha Mini Game Festival", MACHINE_SUPPORTS_SAVE, layout_gotcha )
+GAMEL( 1997, ppchamp, gotcha, gotcha, gotcha, gotcha_state, 0, ROT0, "Dongsung / Para", "Pasha Pasha Champ Mini Game Festival (Korea)", MACHINE_SUPPORTS_SAVE, layout_gotcha )
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index 038f4927883..01f8a174b66 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -1764,7 +1764,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( gottlieb_core, gottlieb_state )
+static MACHINE_CONFIG_START( gottlieb_core )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, CPU_CLOCK/3)
@@ -1806,7 +1806,7 @@ static MACHINE_CONFIG_DERIVED( g2laser, gottlieb_core )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_LASERDISC_PR8210_ADD("laserdisc")
- MCFG_LASERDISC_AUDIO(laserdisc_audio_delegate(&gottlieb_state::laserdisc_audio_process, (gottlieb_state*)owner))
+ MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, downcast<gottlieb_state*>(owner)))
MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb)
MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
@@ -1827,7 +1827,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gottlieb1_votrax, gottlieb_core )
- MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_WITH_VOTRAX, 0)
+ MCFG_SOUND_ADD("r1sound", GOTTLIEB_SOUND_REV1_VOTRAX, 0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -1864,7 +1864,7 @@ static MACHINE_CONFIG_DERIVED( cobram3, gottlieb_core )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MCFG_LASERDISC_PR8210_ADD("laserdisc")
- MCFG_LASERDISC_AUDIO(laserdisc_audio_delegate(&gottlieb_state::laserdisc_audio_process, (gottlieb_state*)owner))
+ MCFG_LASERDISC_AUDIO(laserdisc_device::audio_delegate(&gottlieb_state::laserdisc_audio_process, downcast<gottlieb_state*>(owner)))
MCFG_LASERDISC_OVERLAY_DRIVER(GOTTLIEB_VIDEO_HCOUNT, GOTTLIEB_VIDEO_VCOUNT, gottlieb_state, screen_update_gottlieb)
MCFG_LASERDISC_OVERLAY_CLIP(0, GOTTLIEB_VIDEO_HBLANK-1, 0, GOTTLIEB_VIDEO_VBLANK-8)
MCFG_LASERDISC_OVERLAY_PALETTE("palette")
diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp
index ca07e25bac6..ebd89eab829 100644
--- a/src/mame/drivers/gotya.cpp
+++ b/src/mame/drivers/gotya.cpp
@@ -185,7 +185,7 @@ void gotya_state::machine_reset()
m_theme_playing = 0;
}
-static MACHINE_CONFIG_START( gotya, gotya_state )
+static MACHINE_CONFIG_START( gotya )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
@@ -279,5 +279,5 @@ ROM_START( gotya )
ROM_LOAD( "gb-07.bin", 0x7000, 0x1000, CRC(92a9f8bf) SHA1(9231cd86f24f1e6a585c3a919add50c1f8e42a4c) )
ROM_END
-GAME( 1981, thehand, 0, gotya, gotya, driver_device, 0, ROT270, "T.I.C.", "The Hand", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, gotya, thehand, gotya, gotya, driver_device, 0, ROT270, "Game-A-Tron", "Got-Ya (12/24/1981, prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, thehand, 0, gotya, gotya, gotya_state, 0, ROT270, "T.I.C.", "The Hand", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, gotya, thehand, gotya, gotya, gotya_state, 0, ROT270, "Game-A-Tron", "Got-Ya (12/24/1981, prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index 645c9f9a913..c5a80b0eb3b 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -90,7 +90,7 @@ private:
required_device<via6522_device> m_via_video;
required_device<via6522_device> m_via_keyb;
required_device<via6522_device> m_via_modem;
- required_device<fd1791_t> m_fdc;
+ required_device<fd1791_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
floppy_image_device *m_floppy;
@@ -127,7 +127,7 @@ static ADDRESS_MAP_START(goupil_mem, AS_PROGRAM, 8, goupil_g1_state)
AM_RANGE(0xE860,0xE86F) AM_DEVREADWRITE("m_via_modem", via6522_device, read, write)
- AM_RANGE(0xe8f0,0xe8ff) AM_DEVREADWRITE("fd1791", fd1791_t, read, write)
+ AM_RANGE(0xe8f0,0xe8ff) AM_DEVREADWRITE("fd1791", fd1791_device, read, write)
//AM_RANGE(0xf08a,0xf08a) AM_READWRITE( fdc_sel0_r, fdc_sel0_w )
//AM_RANGE(0xf08b,0xf08b) AM_READWRITE( fdc_sel1_r, fdc_sel1_w )
@@ -424,7 +424,7 @@ WRITE_LINE_MEMBER( goupil_g1_state::via_video_ca2_w )
old_state_ca2 = state;
}
-static MACHINE_CONFIG_START( goupil_g1, goupil_g1_state )
+static MACHINE_CONFIG_START( goupil_g1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6808, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(goupil_mem)
@@ -507,5 +507,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, goupilg1, 0, 0, goupil_g1, goupil_g1,driver_device, 0, "SMT", "Goupil G1", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1979, goupilg1, 0, 0, goupil_g1, goupil_g1, goupil_g1_state, 0, "SMT", "Goupil G1", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp
index 3c1e9fabbcd..b2ad1c2d44f 100644
--- a/src/mame/drivers/gp2x.cpp
+++ b/src/mame/drivers/gp2x.cpp
@@ -356,7 +356,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( gp2x )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( gp2x, gp2x_state )
+static MACHINE_CONFIG_START( gp2x )
MCFG_CPU_ADD("maincpu", ARM9, 80000000)
MCFG_CPU_PROGRAM_MAP(gp2x_map)
@@ -392,4 +392,4 @@ ROM_START(gp2x)
ROMX_LOAD( "gp2xyaffs.v4", 0x300000, 0x2dfed0, CRC(e77efc53) SHA1(21477ff77aacb84005bc465a03066d71031a6098), ROM_BIOS(3))
ROM_END
-CONS(2005, gp2x, 0, 0, gp2x, gp2x, driver_device, 0, "Game Park Holdings", "GP2X", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+CONS(2005, gp2x, 0, 0, gp2x, gp2x, gp2x_state, 0, "Game Park Holdings", "GP2X", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp
index abe3966d1d6..3f54ef58e9c 100644
--- a/src/mame/drivers/gp32.cpp
+++ b/src/mame/drivers/gp32.cpp
@@ -1682,7 +1682,7 @@ void gp32_state::machine_reset()
s3c240x_machine_reset();
}
-static MACHINE_CONFIG_START( gp32, gp32_state )
+static MACHINE_CONFIG_START( gp32 )
MCFG_CPU_ADD("maincpu", ARM9, 40000000)
MCFG_CPU_PROGRAM_MAP(gp32_map)
@@ -1730,4 +1730,4 @@ ROM_START( gp32 )
#endif
ROM_END
-CONS(2001, gp32, 0, 0, gp32, gp32, driver_device, 0, "Game Park Holdings", "GP32", ROT270|MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+CONS(2001, gp32, 0, 0, gp32, gp32, gp32_state, 0, "Game Park Holdings", "GP32", ROT270|MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index d8f3a4f282f..80eeffe1a79 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -420,7 +420,7 @@ static const z80_daisy_config daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( gp_1, gp_1_state )
+static MACHINE_CONFIG_START( gp_1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2457600)
MCFG_CPU_PROGRAM_MAP(gp_1_map)
@@ -532,13 +532,13 @@ ROM_START(vegasgp)
ROM_LOAD( "140b.13", 0x0800, 0x0800, CRC(cf26d67b) SHA1(05481e880e23a7bc1d1716b52ac1effc0db437f2))
ROM_END
-GAME(1978, gp_110, 0, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Model 110", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING)
-GAME(1978, blvelvet, gp_110, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Black Velvet", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1978, camlight, gp_110, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Camel Lights", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1978, foxylady, gp_110, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Foxy Lady", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1978, real, gp_110, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Real", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1978, rio, gp_110, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Rio", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1978, chucklck, gp_110, gp_1, gp_1, driver_device, 0, ROT0, "Game Plan", "Chuck-A-Luck", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1979, famlyfun, 0, gp_1s, gp_1, driver_device, 0, ROT0, "Game Plan", "Family Fun!", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1979, startrip, 0, gp_1s, gp_1, driver_device, 0, ROT0, "Game Plan", "Star Trip", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1979, vegasgp, 0, gp_1s, gp_1, driver_device, 0, ROT0, "Game Plan", "Vegas (Game Plan)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1978, gp_110, 0, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Model 110", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING)
+GAME(1978, blvelvet, gp_110, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Black Velvet", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1978, camlight, gp_110, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Camel Lights", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1978, foxylady, gp_110, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Foxy Lady", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1978, real, gp_110, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Real", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1978, rio, gp_110, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Rio", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1978, chucklck, gp_110, gp_1, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Chuck-A-Luck", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1979, famlyfun, 0, gp_1s, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Family Fun!", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1979, startrip, 0, gp_1s, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Star Trip", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1979, vegasgp, 0, gp_1s, gp_1, gp_1_state, 0, ROT0, "Game Plan", "Vegas (Game Plan)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp
index 1636b36a47a..6f3012edc0f 100644
--- a/src/mame/drivers/gp_2.cpp
+++ b/src/mame/drivers/gp_2.cpp
@@ -570,7 +570,7 @@ static const z80_daisy_config daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( gp_2, gp_2_state )
+static MACHINE_CONFIG_START( gp_2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2457600)
MCFG_CPU_PROGRAM_MAP(gp_2_map)
@@ -808,24 +808,24 @@ ROM_START(suprnova)
ROM_END
// GP1 dips
-GAME(1979, sshootep, 0, gp_2, gp_1, driver_device, 0, ROT0, "Game Plan", "Sharpshooter", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1979, coneyis, 0, gp_2, gp_1, driver_device, 0, ROT0, "Game Plan", "Old Coney Island!", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1980, lizard, 0, gp_2, gp_1, driver_device, 0, ROT0, "Game Plan", "Pinball Lizard", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1982, suprnova, 0, gp_2, gp_1, driver_device, 0, ROT0, "Game Plan", "Super Nova", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1983, sshootr2, 0, gp_2, gp_1, driver_device, 0, ROT0, "Game Plan", "Sharp Shooter II", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1979, sshootep, 0, gp_2, gp_1, gp_2_state, 0, ROT0, "Game Plan", "Sharpshooter", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1979, coneyis, 0, gp_2, gp_1, gp_2_state, 0, ROT0, "Game Plan", "Old Coney Island!", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1980, lizard, 0, gp_2, gp_1, gp_2_state, 0, ROT0, "Game Plan", "Pinball Lizard", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1982, suprnova, 0, gp_2, gp_1, gp_2_state, 0, ROT0, "Game Plan", "Super Nova", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1983, sshootr2, 0, gp_2, gp_1, gp_2_state, 0, ROT0, "Game Plan", "Sharp Shooter II", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
// GP2 dips
-GAME(1981, gwarfare, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Global Warfare", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1982, mbossy, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Mike Bossy", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, attila, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Attila The Hun", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1981, gwarfare, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Global Warfare", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1982, mbossy, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Mike Bossy", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, attila, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Attila The Hun", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
// revolving match
-GAME(1984, agent777, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Agents 777", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1985, cpthook, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Captain Hook", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1985, ladyshot, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Lady Sharpshooter (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1985, ladyshota, ladyshot, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Lady Sharpshooter (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1984, agent777, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Agents 777", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1985, cpthook, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Captain Hook", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1985, ladyshot, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Lady Sharpshooter (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1985, ladyshota, ladyshot, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Lady Sharpshooter (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
// credit (start) button not working
-GAME(1985, andromep, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Andromeda (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, andromepa, andromep, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Andromeda (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, cyclopes, 0, gp_2, gp_2, driver_device, 0, ROT0, "Game Plan", "Cyclopes", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, andromep, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Andromeda (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, andromepa, andromep, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Andromeda (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, cyclopes, 0, gp_2, gp_2, gp_2_state, 0, ROT0, "Game Plan", "Cyclopes", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp
index 6a12ae598e2..9b8199f4432 100644
--- a/src/mame/drivers/gpworld.cpp
+++ b/src/mame/drivers/gpworld.cpp
@@ -488,7 +488,7 @@ static GFXDECODE_START( gpworld )
GFXDECODE_END
/* DRIVER */
-static MACHINE_CONFIG_START( gpworld, gpworld_state )
+static MACHINE_CONFIG_START( gpworld )
/* main cpu */
MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
@@ -561,5 +561,5 @@ DRIVER_INIT_MEMBER(gpworld_state,gpworld)
}
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS) */
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS) */
GAME( 1984, gpworld, 0, gpworld, gpworld, gpworld_state, gpworld, ROT0, "Sega", "GP World", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index 7ee8624a245..f5861caaac8 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -274,7 +274,7 @@ void gradius3_state::machine_reset()
}
-static MACHINE_CONFIG_START( gradius3, gradius3_state )
+static MACHINE_CONFIG_START( gradius3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -509,7 +509,7 @@ ROM_END
-GAME( 1989, gradius3, 0, gradius3, gradius3, driver_device, 0, ROT0, "Konami", "Gradius III (World, program code R)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, gradius3j, gradius3, gradius3, gradius3, driver_device, 0, ROT0, "Konami", "Gradius III (Japan, program code S)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, gradius3js, gradius3, gradius3, gradius3, driver_device, 0, ROT0, "Konami", "Gradius III (Japan, program code S, split)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, gradius3a, gradius3, gradius3, gradius3, driver_device, 0, ROT0, "Konami", "Gradius III (Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gradius3, 0, gradius3, gradius3, gradius3_state, 0, ROT0, "Konami", "Gradius III (World, program code R)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gradius3j, gradius3, gradius3, gradius3, gradius3_state, 0, ROT0, "Konami", "Gradius III (Japan, program code S)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gradius3js, gradius3, gradius3, gradius3, gradius3_state, 0, ROT0, "Konami", "Gradius III (Japan, program code S, split)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gradius3a, gradius3, gradius3, gradius3, gradius3_state, 0, ROT0, "Konami", "Gradius III (Asia)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp
index 9a854405c87..70b2416ac8b 100644
--- a/src/mame/drivers/grchamp.cpp
+++ b/src/mame/drivers/grchamp.cpp
@@ -644,7 +644,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( grchamp, grchamp_state )
+static MACHINE_CONFIG_START( grchamp )
/* basic machine hardware */
/* CPU BOARD */
@@ -765,4 +765,4 @@ ROM_END
*
*************************************/
-GAMEL( 1981, grchamp, 0, grchamp, grchamp, driver_device, 0, ROT270, "Taito", "Grand Champion", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_grchamp )
+GAMEL( 1981, grchamp, 0, grchamp, grchamp, grchamp_state, 0, ROT270, "Taito", "Grand Champion", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_grchamp )
diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp
index c277766e1ea..09fcb7b1f2d 100644
--- a/src/mame/drivers/grfd2301.cpp
+++ b/src/mame/drivers/grfd2301.cpp
@@ -108,7 +108,7 @@ uint32_t grfd2301_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
return 0;
}
-static MACHINE_CONFIG_START( grfd2301, grfd2301_state )
+static MACHINE_CONFIG_START( grfd2301 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(grfd2301_mem)
@@ -135,4 +135,4 @@ ROM_START( grfd2301 )
ROM_LOAD( "c10_char.bin", 0x0000, 0x2000, BAD_DUMP CRC(cb530b6f) SHA1(95590bbb433db9c4317f535723b29516b9b9fcbf))
ROM_END
-COMP( 198?, grfd2301, 0, 0, grfd2301, grfd2301, driver_device, 0, "Genrad", "Futuredata 2301 Network Processor", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 198?, grfd2301, 0, 0, grfd2301, grfd2301, grfd2301_state, 0, "Genrad", "Futuredata 2301 Network Processor", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp
index 87f60fde51f..9e72dedd806 100644
--- a/src/mame/drivers/gridlee.cpp
+++ b/src/mame/drivers/gridlee.cpp
@@ -410,7 +410,7 @@ static const char *const sample_names[] =
*
*************************************/
-static MACHINE_CONFIG_START( gridlee, gridlee_state )
+static MACHINE_CONFIG_START( gridlee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, GRIDLEE_CPU_CLOCK)
@@ -478,4 +478,4 @@ ROM_END
*
*************************************/
-GAME( 1983, gridlee, 0, gridlee, gridlee, driver_device, 0, ROT0, "Videa", "Gridlee", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, gridlee, 0, gridlee, gridlee, gridlee_state, 0, ROT0, "Videa", "Gridlee", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp
index 6b2e94ac6c1..7f131bc59bc 100644
--- a/src/mame/drivers/groundfx.cpp
+++ b/src/mame/drivers/groundfx.cpp
@@ -311,7 +311,7 @@ INTERRUPT_GEN_MEMBER(groundfx_state::interrupt)
device.execute().set_input_line(4, HOLD_LINE);
}
-static MACHINE_CONFIG_START( groundfx, groundfx_state )
+static MACHINE_CONFIG_START( groundfx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20MHz - verified */
diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp
index 70537bb2bd9..e9d4ab198e9 100644
--- a/src/mame/drivers/gstream.cpp
+++ b/src/mame/drivers/gstream.cpp
@@ -866,7 +866,7 @@ void gstream_state::machine_reset()
m_oki_bank_2 = 0;
}
-static MACHINE_CONFIG_START( gstream, gstream_state )
+static MACHINE_CONFIG_START( gstream )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
@@ -894,14 +894,14 @@ static MACHINE_CONFIG_START( gstream, gstream_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
+ MCFG_OKIM6295_ADD("oki1", 1000000, PIN7_HIGH) /* 1 Mhz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
- MCFG_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
+ MCFG_OKIM6295_ADD("oki2", 1000000, PIN7_HIGH) /* 1 Mhz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( x2222, gstream_state )
+static MACHINE_CONFIG_START( x2222 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", E132XT, 16000000*4) /* 4x internal multiplier */
@@ -927,7 +927,7 @@ static MACHINE_CONFIG_START( x2222, gstream_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
+ MCFG_OKIM6295_ADD("oki1", 1000000, PIN7_HIGH) /* 1 Mhz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -1173,6 +1173,6 @@ DRIVER_INIT_MEMBER(gstream_state,x2222)
}
-GAME( 2002, gstream, 0, gstream, gstream, gstream_state, gstream, ROT270, "Oriental Soft Japan", "G-Stream G2020", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, x2222, 0, x2222, x2222, gstream_state, x2222, ROT270, "Oriental Soft / Promat", "X2222 (final debug?)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+GAME( 2002, gstream, 0, gstream, gstream, gstream_state, gstream, ROT270, "Oriental Soft Japan", "G-Stream G2020", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, x2222, 0, x2222, x2222, gstream_state, x2222, ROT270, "Oriental Soft / Promat", "X2222 (final debug?)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
GAME( 2000, x2222o, x2222, x2222, x2222, gstream_state, x2222, ROT270, "Oriental Soft / Promat", "X2222 (5-level prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp
index f568780f454..20e2a254940 100644
--- a/src/mame/drivers/gstriker.cpp
+++ b/src/mame/drivers/gstriker.cpp
@@ -505,7 +505,7 @@ INPUT_PORTS_END
/*** MACHINE DRIVER **********************************************************/
-static MACHINE_CONFIG_START( gstriker, gstriker_state )
+static MACHINE_CONFIG_START( gstriker )
MCFG_CPU_ADD("maincpu", M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(gstriker_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", gstriker_state, irq1_line_hold)
@@ -1044,9 +1044,9 @@ DRIVER_INIT_MEMBER(gstriker_state,vgoalsoc)
/*** GAME DRIVERS ************************************************************/
-GAME( 1993, gstriker, 0, gstriker, gstriker, driver_device, 0, ROT0, "Human", "Grand Striker", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, gstrikera, gstriker, gstriker, gstriker, driver_device, 0, ROT0, "Human", "Grand Striker (Americas)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, gstrikerj, gstriker, gstriker, gstriker, driver_device, 0, ROT0, "Human", "Grand Striker (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, gstriker, 0, gstriker, gstriker, gstriker_state, 0, ROT0, "Human", "Grand Striker", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, gstrikera, gstriker, gstriker, gstriker, gstriker_state, 0, ROT0, "Human", "Grand Striker (Americas)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, gstrikerj, gstriker, gstriker, gstriker, gstriker_state, 0, ROT0, "Human", "Grand Striker (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
/* Similar, but not identical hardware, appear to be protected by an MCU :-( */
diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp
index a112878aad2..eb61afc0d3d 100644
--- a/src/mame/drivers/gsword.cpp
+++ b/src/mame/drivers/gsword.cpp
@@ -774,7 +774,7 @@ static GFXDECODE_START( gsword )
GFXDECODE_END
-static MACHINE_CONFIG_START( gsword, gsword_state )
+static MACHINE_CONFIG_START( gsword )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* verified on pcb */
@@ -828,11 +828,11 @@ static MACHINE_CONFIG_START( gsword, gsword_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* vclk input mode */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( josvolly, josvolly_state )
+static MACHINE_CONFIG_START( josvolly )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18000000/4) /* ? */
@@ -1042,6 +1042,6 @@ ROM_START( josvolly )
ROM_END
-GAME( 1983, josvolly, 0, josvolly, josvolly, driver_device, 0, ROT90, "Allumer / Taito Corporation", "Joshi Volleyball", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, josvolly, 0, josvolly, josvolly, josvolly_state, 0, ROT90, "Allumer / Taito Corporation", "Joshi Volleyball", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1984, gsword, 0, gsword, gsword, gsword_state, gsword, ROT0, "Allumer / Taito Corporation", "Great Swordsman (World?)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, gsword2, gsword, gsword, gsword, gsword_state, gsword2, ROT0, "Allumer / Taito Corporation", "Great Swordsman (Japan?)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp
index 5f392819340..957b090daf7 100644
--- a/src/mame/drivers/gticlub.cpp
+++ b/src/mame/drivers/gticlub.cpp
@@ -934,7 +934,7 @@ uint32_t gticlub_state::screen_update_hangplt(screen_device &screen, bitmap_rgb3
return 0;
}
-static MACHINE_CONFIG_START( gticlub, gticlub_state )
+static MACHINE_CONFIG_START( gticlub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
@@ -1004,7 +1004,7 @@ static MACHINE_CONFIG_START( gticlub, gticlub_state )
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_GTICLUB)
+ MCFG_KONPPC_CGBOARD_TYPE(GTICLUB)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( thunderh, gticlub )
@@ -1041,7 +1041,7 @@ MACHINE_RESET_MEMBER(gticlub_state,hangplt)
m_dsp2->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( hangplt, gticlub_state )
+static MACHINE_CONFIG_START( hangplt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
@@ -1131,7 +1131,7 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state )
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(2)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_HANGPLT)
+ MCFG_KONPPC_CGBOARD_TYPE(HANGPLT)
MACHINE_CONFIG_END
/*************************************************************************/
diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp
index 124b177be23..09b65fddff2 100644
--- a/src/mame/drivers/gts1.cpp
+++ b/src/mame/drivers/gts1.cpp
@@ -675,7 +675,7 @@ WRITE8_MEMBER(gts1_state::gts1_do_w)
}
-static MACHINE_CONFIG_START( gts1, gts1_state )
+static MACHINE_CONFIG_START( gts1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPS4_2, XTAL_3_579545MHz) // divided by 18 in the CPU
MCFG_CPU_PROGRAM_MAP(gts1_map)
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index b9a32fe3365..6a7262468e6 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -274,7 +274,7 @@ DRIVER_INIT_MEMBER( gts3_state, gts3 )
{
}
-static MACHINE_CONFIG_START( gts3, gts3_state )
+static MACHINE_CONFIG_START( gts3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz / 2)
MCFG_CPU_PROGRAM_MAP(gts3_map)
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index 7041ad77a4e..8cbf012e168 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -330,7 +330,7 @@ MC6845_UPDATE_ROW( gts3a_state::crtc_update_row )
}
}
-static MACHINE_CONFIG_START( gts3a, gts3a_state )
+static MACHINE_CONFIG_START( gts3a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, XTAL_4MHz / 2)
MCFG_CPU_PROGRAM_MAP(gts3a_map)
@@ -1266,42 +1266,42 @@ ROM_START(wcsoccerd2)
ROM_LOAD("yrom1.bin", 0x8000, 0x8000, CRC(8b2795b0) SHA1(b838d4e410c815421099c65b0d3b22227dae17c6))
ROM_END
-GAME(1992, smb, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, smb1, smb, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, smb2, smb, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, smb3, smb, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, smbmush, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers Mushroom World", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, cueball, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Cue Ball Wizard", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, cueball2, cueball, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Cue Ball Wizard (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, cueball3, cueball, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Cue Ball Wizard (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, sfight2, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Street Fighter II", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, sfight2a, sfight2, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Street Fighter II (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, sfight2b, sfight2, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Street Fighter II (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, teedoffp, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Tee'd Off", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, teedoffp1, teedoffp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Tee'd Off (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, teedoffp3, teedoffp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Tee'd Off (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, gladiatp, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Gladiators", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, wipeout, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Wipeout (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, rescu911, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Rescue 911 (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, wcsoccer, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "World Challenge Soccer (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, wcsoccerd2, wcsoccer, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "World Challenge Soccer (disp.rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, stargatp, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, stargatp1, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, stargatp2, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, stargatp3, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, stargatp4, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, stargatp5, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, shaqattq, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Shaq Attaq (rev.5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, shaqattq2, shaqattq, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Shaq Attaq (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, freddy, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Freddy: A Nightmare on Elm Street (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, freddy4, freddy, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Freddy: A Nightmare on Elm Street (rev.4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, bighurt, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Frank Thomas' Big Hurt (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, waterwld, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Waterworld (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, waterwld2, waterwld, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Waterworld (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, snspares, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Strikes n' Spares (rev.6)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, snspares2, snspares, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Strikes n' Spares (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, snspares1, snspares, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Strikes n' Spares (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, andretti, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Mario Andretti", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1995, andretti4, andretti, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Mario Andretti (rev.T4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1996, barbwire, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Barb Wire", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1996, brooks, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Brooks & Dunn (rev.T1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, smb, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, smb1, smb, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, smb2, smb, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, smb3, smb, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, smbmush, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Super Mario Brothers Mushroom World", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, cueball, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Cue Ball Wizard", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, cueball2, cueball, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Cue Ball Wizard (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, cueball3, cueball, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Cue Ball Wizard (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, sfight2, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Street Fighter II", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, sfight2a, sfight2, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Street Fighter II (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, sfight2b, sfight2, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Street Fighter II (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, teedoffp, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Tee'd Off", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, teedoffp1, teedoffp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Tee'd Off (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, teedoffp3, teedoffp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Tee'd Off (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, gladiatp, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Gladiators", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, wipeout, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Wipeout (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, rescu911, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Rescue 911 (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, wcsoccer, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "World Challenge Soccer (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, wcsoccerd2, wcsoccer, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "World Challenge Soccer (disp.rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, stargatp, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, stargatp1, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, stargatp2, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, stargatp3, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, stargatp4, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, stargatp5, stargatp, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Stargate (rev.5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, shaqattq, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Shaq Attaq (rev.5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, shaqattq2, shaqattq, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Shaq Attaq (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, freddy, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Freddy: A Nightmare on Elm Street (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, freddy4, freddy, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Freddy: A Nightmare on Elm Street (rev.4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, bighurt, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Frank Thomas' Big Hurt (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, waterwld, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Waterworld (rev.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, waterwld2, waterwld, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Waterworld (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, snspares, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Strikes n' Spares (rev.6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, snspares2, snspares, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Strikes n' Spares (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, snspares1, snspares, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Strikes n' Spares (rev.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, andretti, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Mario Andretti", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995, andretti4, andretti, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Mario Andretti (rev.T4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1996, barbwire, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Barb Wire", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1996, brooks, 0, gts3a, gts3a, gts3a_state, gts3a, ROT0, "Gottlieb", "Brooks & Dunn (rev.T1)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp
index 1bb92bf44e8..e5b3d813570 100644
--- a/src/mame/drivers/gts80.cpp
+++ b/src/mame/drivers/gts80.cpp
@@ -344,7 +344,7 @@ DRIVER_INIT_MEMBER( gts80_state, gts80 )
}
/* with Sound Board */
-static MACHINE_CONFIG_START( gts80, gts80_state )
+static MACHINE_CONFIG_START( gts80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
MCFG_CPU_PROGRAM_MAP(gts80_map)
@@ -784,28 +784,28 @@ ROM_START(s80tst)
ROM_LOAD("80tst-s2.snd", 0x7800, 0x0800, CRC(1a4b1e9d) SHA1(18e7ffbdbdaf83ab1c8daa5fa5201d9f54390758))
ROM_END
-/* disp1 */GAME(1981, s80tst, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "System 80 Test", MACHINE_IS_SKELETON_MECHANICAL)
-
-/* disp1 */GAME(1980, panthera, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Panthera", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1980, spidermn, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "The Amazing Spider-Man", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1980, circusp, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Circus", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1980, cntforce, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Counterforce", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1980, starrace, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Star Race", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1980, jamesb, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "James Bond (Timed Play)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1980, jamesb2, jamesb, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "James Bond (3/5-Ball)", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1980, timeline, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Time Line", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, forceii, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Force II", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1981, pnkpnthr, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Pink Panther", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, marsp, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Mars - God of War", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, s80tst, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "System 80 Test", MACHINE_IS_SKELETON_MECHANICAL)
+
+/* disp1 */GAME(1980, panthera, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Panthera", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1980, spidermn, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "The Amazing Spider-Man", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1980, circusp, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Circus", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1980, cntforce, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Counterforce", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1980, starrace, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Star Race", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1980, jamesb, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "James Bond (Timed Play)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1980, jamesb2, jamesb, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "James Bond (3/5-Ball)", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1980, timeline, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Time Line", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, forceii, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Force II", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1981, pnkpnthr, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Pink Panther", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, marsp, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Mars - God of War", MACHINE_IS_SKELETON_MECHANICAL)
/* disp1 */GAME(1981, marspf, marsp, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Mars - God of War (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, marspp, marsp, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Mars - God of War (Prototype)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, vlcno_ax, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, vlcno_1c, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano (Sound Only set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, vlcno_1b, vlcno_1c, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano (Sound Only set 2)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp1 */GAME(1981, vlcno_1a, vlcno_1c, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano (Sound Only set 3)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1981, blckhole, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Rev. 4)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1981, blckhole2, blckhole, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1981, blckhols, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Sound Only)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1982, hh, 0, gts80_hh, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1982, hh_1, hh, gts80_hh, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 1)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp2 */GAME(1981, eclipse, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Eclipse", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, marspp, marsp, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Mars - God of War (Prototype)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, vlcno_ax, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, vlcno_1c, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano (Sound Only set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, vlcno_1b, vlcno_1c, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano (Sound Only set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp1 */GAME(1981, vlcno_1a, vlcno_1c, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Volcano (Sound Only set 3)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1981, blckhole, 0, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Rev. 4)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1981, blckhole2, blckhole, gts80_ss, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1981, blckhols, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Black Hole (Sound Only)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1982, hh, 0, gts80_hh, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1982, hh_1, hh, gts80_hh, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Haunted House (Rev. 1)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp2 */GAME(1981, eclipse, 0, gts80_s, gts80, gts80_state, gts80, ROT0, "Gottlieb", "Eclipse", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index e1249f80893..28656075ca2 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -335,7 +335,7 @@ DRIVER_INIT_MEMBER( gts80a_state, gts80a )
}
/* with Sound Board */
-static MACHINE_CONFIG_START( gts80a, gts80a_state )
+static MACHINE_CONFIG_START( gts80a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
MCFG_CPU_PROGRAM_MAP(gts80a_map)
@@ -441,7 +441,7 @@ static ADDRESS_MAP_START( video_io_map, AS_IO, 8, caveman_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_DERIVED_CLASS( caveman, gts80a_ss, caveman_state )
+static MACHINE_CONFIG_DERIVED( caveman, gts80a_ss )
MCFG_CPU_ADD("video_cpu", I8088, 5000000)
MCFG_CPU_PROGRAM_MAP(video_map)
MCFG_CPU_IO_MAP(video_io_map)
@@ -804,29 +804,29 @@ ROM_START(touchdn)
ROM_END
-/* cust */GAME(1981, dvlsdre, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Devil's Dare", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1981, dvlsdre2, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Devil's Dare (Sound Only)", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1982, rocky, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Rocky", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1982, rockyf, rocky, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Rocky (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1982, spirit, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Spirit", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1982, punk, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Punk!", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1982, striker, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Striker", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1983, krullp, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Krull (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, qbquest, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Q*Bert's Quest", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, sorbit, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Super Orbit", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, rflshdlx, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Royal Flush Deluxe", MACHINE_IS_SKELETON_MECHANICAL)
-/* cust */GAME(1983, goinnuts, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Goin' Nuts", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, amazonh, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Amazon Hunt", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, amazonha, amazonh,gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Amazon Hunt (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, rackempp, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Rack 'em Up! (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1983, raimfire, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Ready...Aim...Fire!", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1984, jack2opn, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Jacks to Open", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1984, touchdn, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Touchdown", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1984, alienstr, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Alien Star", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1984, thegames, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "The Games", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1984, eldorado, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "El Dorado City of Gold", MACHINE_IS_SKELETON_MECHANICAL)
-/* disp3 */GAME(1985, icefever, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Ice Fever", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1981, dvlsdre, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Devil's Dare", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1981, dvlsdre2, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Devil's Dare (Sound Only)", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1982, rocky, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Rocky", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1982, rockyf, rocky, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Rocky (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1982, spirit, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Spirit", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1982, punk, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Punk!", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1982, striker, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Striker", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1983, krullp, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Krull (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, qbquest, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Q*Bert's Quest", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, sorbit, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Super Orbit", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, rflshdlx, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Royal Flush Deluxe", MACHINE_IS_SKELETON_MECHANICAL)
+/* cust */GAME(1983, goinnuts, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Goin' Nuts", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, amazonh, 0, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Amazon Hunt", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, amazonha, amazonh, gts80a_ss, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Amazon Hunt (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, rackempp, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Rack 'em Up! (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1983, raimfire, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Ready...Aim...Fire!", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1984, jack2opn, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Jacks to Open", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1984, touchdn, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Touchdown", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1984, alienstr, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Alien Star", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1984, thegames, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "The Games", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1984, eldorado, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "El Dorado City of Gold", MACHINE_IS_SKELETON_MECHANICAL)
+/* disp3 */GAME(1985, icefever, 0, gts80a_s, gts80a, gts80a_state, gts80a, ROT0, "Gottlieb", "Ice Fever", MACHINE_IS_SKELETON_MECHANICAL)
/* custom (+video) */
-GAME(1981, caveman, 0, caveman, caveman, gts80a_state, gts80a, ROT0, "Gottlieb", "Caveman (Pinball/Video Combo, set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, cavemana, caveman, caveman, caveman, gts80a_state, gts80a, ROT0, "Gottlieb", "Caveman (Pinball/Video Combo, set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, caveman, 0, caveman, caveman, caveman_state, gts80a, ROT0, "Gottlieb", "Caveman (Pinball/Video Combo, set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, cavemana, caveman, caveman, caveman, caveman_state, gts80a, ROT0, "Gottlieb", "Caveman (Pinball/Video Combo, set 2)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp
index ad9b87979e2..e6bcb349895 100644
--- a/src/mame/drivers/gts80b.cpp
+++ b/src/mame/drivers/gts80b.cpp
@@ -374,7 +374,7 @@ DRIVER_INIT_MEMBER( gts80b_state, gts80b )
}
/* with Sound Board */
-static MACHINE_CONFIG_START( gts80b, gts80b_state )
+static MACHINE_CONFIG_START( gts80b )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4)
MCFG_CPU_PROGRAM_MAP(gts80b_map)
@@ -1715,71 +1715,71 @@ ROM_START(s80btest)
ROM_LOAD("testd.snd", 0x8000, 0x2000, CRC(5d04a6d9) SHA1(f83bd8692146af7d234c1a32d0b688e76d1b2b85))
ROM_END
-GAME(1985, bountyh, 0, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bounty Hunter", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, bountyhg, bountyh, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bounty Hunter (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, triplay, 0, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Chicago Cubs' Triple Play", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, bountyh, 0, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bounty Hunter", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, bountyhg, bountyh, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bounty Hunter (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, triplay, 0, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Chicago Cubs' Triple Play", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1985, triplaya, triplay, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Chicago Cubs' Triple Play (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, rock, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, rockg, rock, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, tagteamp, 0, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Tag-Team Wrestling", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, tagteampg, tagteamp, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Tag-Team Wrestling (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, tagteamp2, tagteamp, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Tag-Team Wrestling (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, raven, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Raven", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, ravena, raven, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Raven (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, raveng, raven, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Raven (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, hlywoodh, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hollywood Heat", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, hlywoodhf, hlywoodh, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hollywood Heat (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, hlywoodhg, hlywoodh, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hollywood Heat (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, rock_enc, rock, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock Encore", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, rock_encg, rock, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock Encore (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, genesisp, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Genesis", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, genesispf, genesisp, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Genesis (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, genesispg, genesisp, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Genesis (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, amazonh2, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Amazon Hunt II (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, sprbreak, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, sprbreaka, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, sprbreakf, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, sprbreakg, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, sprbreaks, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (single ball game)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, goldwing, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Gold Wings", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, goldwingf, goldwing, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Gold Wings (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, goldwingg, goldwing, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Gold Wings (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, mntecrlo, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, mntecrloa, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, mntecrlof, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, mntecrlog, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, mntecrlo2, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, arena, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, arenaa, arena, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, arenaf, arena, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, arenag, arena, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, victoryp, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Victory (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, victorypf, victoryp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Victory (Pinball, French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, victorypg, victoryp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Victory (Pinball, German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, diamondp, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Diamond Lady", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, diamondpf, diamondp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Diamond Lady (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, diamondpg, diamondp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Diamond Lady (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, txsector, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "TX-Sector", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, txsectorf, txsector, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "TX-Sector (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, txsectorg, txsector, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "TX-Sector (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bighouse, 0, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Big House", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bighousef, bighouse, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Big House (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bighouseg, bighouse, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Big House (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, robowars, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Robo-War", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, robowarsf, robowars, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Robo-War (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, excalibr, 0, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Excalibur", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, excalibrf, excalibr, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Excalibur (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, excalibrg, excalibr, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Excalibur (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, badgirls, 0, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bad Girls", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, badgirlsf, badgirls, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bad Girls (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, badgirlsg, badgirls, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bad Girls (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, hotshots, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hot Shots", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, hotshotsf, hotshots, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hot Shots (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, hotshotsg, hotshots, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hot Shots (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bonebstr, 0, bonebstr, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bone Busters Inc.", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bonebstrf, bonebstr, bonebstr, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bone Busters Inc. (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bonebstrg, bonebstr, bonebstr, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bone Busters Inc. (German)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, nmoves, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "International Concepts", "Night Moves", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, amazonh3, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Amazon Hunt III (French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, amazonh3a, amazonh3, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Amazon Hunt III (rev. 1, French)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(198?, s80btest, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "System 80B Test", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, rock, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, rockg, rock, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, tagteamp, 0, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Tag-Team Wrestling", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, tagteampg, tagteamp, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Tag-Team Wrestling (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, tagteamp2, tagteamp, gts80b_s, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Tag-Team Wrestling (rev.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, raven, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Raven", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, ravena, raven, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Raven (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, raveng, raven, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Raven (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, hlywoodh, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hollywood Heat", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, hlywoodhf, hlywoodh, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hollywood Heat (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, hlywoodhg, hlywoodh, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hollywood Heat (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, rock_enc, rock, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock Encore", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, rock_encg, rock, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Rock Encore (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, genesisp, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Genesis", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, genesispf, genesisp, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Genesis (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, genesispg, genesisp, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Genesis (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, amazonh2, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Amazon Hunt II (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, sprbreak, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, sprbreaka, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, sprbreakf, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, sprbreakg, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, sprbreaks, sprbreak, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Spring Break (single ball game)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, goldwing, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Gold Wings", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, goldwingf, goldwing, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Gold Wings (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, goldwingg, goldwing, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Gold Wings (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mntecrlo, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mntecrloa, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mntecrlof, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mntecrlog, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mntecrlo2, mntecrlo, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Monte Carlo (Pinball, rev. 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, arena, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, arenaa, arena, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, arenaf, arena, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, arenag, arena, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Arena (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, victoryp, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Victory (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, victorypf, victoryp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Victory (Pinball, French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, victorypg, victoryp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Victory (Pinball, German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, diamondp, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Diamond Lady", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, diamondpf, diamondp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Diamond Lady (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, diamondpg, diamondp, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Diamond Lady (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, txsector, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "TX-Sector", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, txsectorf, txsector, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "TX-Sector (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, txsectorg, txsector, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "TX-Sector (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bighouse, 0, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Big House", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bighousef, bighouse, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Big House (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bighouseg, bighouse, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Big House (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, robowars, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Robo-War", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, robowarsf, robowars, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Robo-War (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, excalibr, 0, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Excalibur", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, excalibrf, excalibr, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Excalibur (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, excalibrg, excalibr, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Excalibur (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, badgirls, 0, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bad Girls", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, badgirlsf, badgirls, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bad Girls (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, badgirlsg, badgirls, gts80b_s3, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bad Girls (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, hotshots, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hot Shots", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, hotshotsf, hotshots, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hot Shots (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, hotshotsg, hotshots, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Hot Shots (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bonebstr, 0, bonebstr, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bone Busters Inc.", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bonebstrf, bonebstr, bonebstr, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bone Busters Inc. (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bonebstrg, bonebstr, bonebstr, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Bone Busters Inc. (German)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, nmoves, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "International Concepts", "Night Moves", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, amazonh3, 0, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Amazon Hunt III (French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, amazonh3a, amazonh3, gts80b_s1, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "Amazon Hunt III (rev. 1, French)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(198?, s80btest, 0, gts80b_s2, gts80b, gts80b_state, gts80b, ROT0, "Gottlieb", "System 80B Test", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index 7ef39617c86..56d18f3568c 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -101,7 +101,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<tms34061_device> m_tms34061;
required_device<sn76489_device> m_sn;
- required_device<wd1773_t> m_fdc;
+ required_device<wd1773_device> m_fdc;
required_device<floppy_connector> m_floppy;
required_device<palette_device> m_palette;
@@ -126,7 +126,7 @@ static ADDRESS_MAP_START( guab_map, AS_PROGRAM, 16, guab_state )
AM_RANGE(0x0c00a0, 0x0c00a1) AM_DEVREADWRITE8("acia6850_2", acia6850_device, status_r, control_w, 0x00ff)
AM_RANGE(0x0c00a2, 0x0c00a3) AM_DEVREADWRITE8("acia6850_2", acia6850_device, data_r, data_w, 0x00ff)
AM_RANGE(0x0c00c0, 0x0c00cf) AM_DEVREADWRITE8("6840ptm", ptm6840_device, read, write, 0x00ff)
- AM_RANGE(0x0c00e0, 0x0c00e7) AM_DEVREADWRITE8("fdc", wd1773_t, read, write, 0x00ff)
+ AM_RANGE(0x0c00e0, 0x0c00e7) AM_DEVREADWRITE8("fdc", wd1773_device, read, write, 0x00ff)
AM_RANGE(0x080000, 0x080fff) AM_RAM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE8("ef9369", ef9369_device, data_r, data_w, 0x00ff)
AM_RANGE(0x100002, 0x100003) AM_DEVWRITE8("ef9369", ef9369_device, address_w, 0x00ff)
@@ -449,7 +449,7 @@ SLOT_INTERFACE_END
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( guab, guab_state )
+static MACHINE_CONFIG_START( guab )
/* TODO: Verify clock */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
MCFG_CPU_PROGRAM_MAP(guab_map)
@@ -553,7 +553,7 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
-GAME( 1986, guab, 0, guab, guab, driver_device, 0, ROT0, "JPM", "Give us a Break", 0 )
-GAME( 1986, crisscrs, 0, guab, guab, driver_device, 0, ROT0, "JPM", "Criss Cross (Sweden)", MACHINE_NOT_WORKING )
-GAME( 1988, tenup, 0, guab, tenup, driver_device, 0, ROT0, "JPM", "Ten Up", 0 )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
+GAME( 1986, guab, 0, guab, guab, guab_state, 0, ROT0, "JPM", "Give us a Break", 0 )
+GAME( 1986, crisscrs, 0, guab, guab, guab_state, 0, ROT0, "JPM", "Criss Cross (Sweden)", MACHINE_NOT_WORKING )
+GAME( 1988, tenup, 0, guab, tenup, guab_state, 0, ROT0, "JPM", "Ten Up", 0 )
diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp
index d0f9450a544..8cff2256311 100644
--- a/src/mame/drivers/gumbo.cpp
+++ b/src/mame/drivers/gumbo.cpp
@@ -233,7 +233,7 @@ static GFXDECODE_START( gumbo )
GFXDECODE_END
-static MACHINE_CONFIG_START( gumbo, gumbo_state )
+static MACHINE_CONFIG_START( gumbo )
MCFG_CPU_ADD("maincpu", M68000, XTAL_14_31818MHz/2)
MCFG_CPU_PROGRAM_MAP(gumbo_map)
@@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( gumbo, gumbo_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/16, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
@@ -397,10 +397,10 @@ ROM_START( dblpointd )
ROM_LOAD( "d15.bin", 0x40000, 0x40000, CRC(6b899a51) SHA1(04114ec9695caaac722800ac1a4ffb563ec433c9) )
ROM_END
-GAME( 1994, gumbo, 0, gumbo, gumbo, driver_device, 0, ROT0, "Min Corp.", "Gumbo", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mspuzzleg,gumbo, gumbo, gumbo, driver_device, 0, ROT0, "Min Corp.", "Miss Puzzle (Clone of Gumbo)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, msbingo, 0, mspuzzle, msbingo, driver_device, 0, ROT0, "Min Corp.", "Miss Bingo", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mspuzzle, 0, mspuzzle, mspuzzle, driver_device, 0, ROT90, "Min Corp.", "Miss Puzzle", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mspuzzlen,mspuzzle, mspuzzle, mspuzzle, driver_device, 0, ROT90, "Min Corp.", "Miss Puzzle (Nudes)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, dblpoint, 0, dblpoint, dblpoint, driver_device, 0, ROT0, "Min Corp.", "Double Point", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, dblpointd,dblpoint, dblpoint, dblpoint, driver_device, 0, ROT0, "bootleg? (Dong Bang Electron)", "Double Point (Dong Bang Electron, bootleg?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gumbo, 0, gumbo, gumbo, gumbo_state, 0, ROT0, "Min Corp.", "Gumbo", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mspuzzleg,gumbo, gumbo, gumbo, gumbo_state, 0, ROT0, "Min Corp.", "Miss Puzzle (Clone of Gumbo)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, msbingo, 0, mspuzzle, msbingo, gumbo_state, 0, ROT0, "Min Corp.", "Miss Bingo", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mspuzzle, 0, mspuzzle, mspuzzle, gumbo_state, 0, ROT90, "Min Corp.", "Miss Puzzle", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mspuzzlen,mspuzzle, mspuzzle, mspuzzle, gumbo_state, 0, ROT90, "Min Corp.", "Miss Puzzle (Nudes)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, dblpoint, 0, dblpoint, dblpoint, gumbo_state, 0, ROT0, "Min Corp.", "Double Point", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, dblpointd,dblpoint, dblpoint, dblpoint, gumbo_state, 0, ROT0, "bootleg? (Dong Bang Electron)", "Double Point (Dong Bang Electron, bootleg?)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index e8fe44a9b02..2c6b8970702 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -276,7 +276,7 @@ GFXDECODE_END
MACHINE DRIVERS
***********************************************************/
-static MACHINE_CONFIG_START( gunbustr, gunbustr_state )
+static MACHINE_CONFIG_START( gunbustr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
@@ -440,6 +440,6 @@ DRIVER_INIT_MEMBER(gunbustr_state,gunbustrj)
m_coin_lockout = false;
}
-GAME( 1992, gunbustr, 0, gunbustr, gunbustr, gunbustr_state, gunbustr, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Gunbuster (World)", 0 )
-GAME( 1992, gunbustru, gunbustr, gunbustr, gunbustr, gunbustr_state, gunbustr, ORIENTATION_FLIP_X, "Taito America Corporation", "Gunbuster (US)", 0 )
-GAME( 1992, gunbustrj, gunbustr, gunbustr, gunbustr, gunbustr_state, gunbustrj,ORIENTATION_FLIP_X, "Taito Corporation", "Gunbuster (Japan)", 0 )
+GAME( 1992, gunbustr, 0, gunbustr, gunbustr, gunbustr_state, gunbustr, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Gunbuster (World)", 0 )
+GAME( 1992, gunbustru, gunbustr, gunbustr, gunbustr, gunbustr_state, gunbustr, ORIENTATION_FLIP_X, "Taito America Corporation", "Gunbuster (US)", 0 )
+GAME( 1992, gunbustrj, gunbustr, gunbustr, gunbustr, gunbustr_state, gunbustrj,ORIENTATION_FLIP_X, "Taito Corporation", "Gunbuster (Japan)", 0 )
diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp
index 957968f49f9..d8f8efb793d 100644
--- a/src/mame/drivers/gundealr.cpp
+++ b/src/mame/drivers/gundealr.cpp
@@ -414,7 +414,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(gundealr_state::gundealr_scanline)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0xcf); /* RST 10h */
}
-static MACHINE_CONFIG_START( gundealr, gundealr_state )
+static MACHINE_CONFIG_START( gundealr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz verified for Yam! Yam!? */
@@ -649,11 +649,11 @@ ROM_END
-GAME( 1990, gundealr, 0, gundealr, gundealr, driver_device, 0, ROT270, "Dooyong", "Gun Dealer", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, gundealra, gundealr, gundealr, gundealr, driver_device, 0, ROT270, "Dooyong", "Gun Dealer (alt card set)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, gundealrt, gundealr, gundealr, gundealt, driver_device, 0, ROT270, "Dooyong (Tecmo license)", "Gun Dealer (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, gundealrbl, gundealr, yamyam, gundealr, driver_device, 0, ROT270, "bootleg", "Gun Dealer (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gundealr, 0, gundealr, gundealr, gundealr_state, 0, ROT270, "Dooyong", "Gun Dealer", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gundealra, gundealr, gundealr, gundealr, gundealr_state, 0, ROT270, "Dooyong", "Gun Dealer (alt card set)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gundealrt, gundealr, gundealr, gundealt, gundealr_state, 0, ROT270, "Dooyong (Tecmo license)", "Gun Dealer (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gundealrbl, gundealr, yamyam, gundealr, gundealr_state, 0, ROT270, "bootleg", "Gun Dealer (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, yamyam, 0, yamyam, yamyam, driver_device, 0, ROT0, "Dooyong", "Yam! Yam!?", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, yamyamk, yamyam, yamyam, yamyam, driver_device, 0, ROT0, "Dooyong", "Yam! Yam!? (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, wiseguy, yamyam, yamyam, yamyam, driver_device, 0, ROT0, "Dooyong", "Wise Guy", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, yamyam, 0, yamyam, yamyam, gundealr_state, 0, ROT0, "Dooyong", "Yam! Yam!?", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, yamyamk, yamyam, yamyam, yamyam, gundealr_state, 0, ROT0, "Dooyong", "Yam! Yam!? (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, wiseguy, yamyam, yamyam, yamyam, gundealr_state, 0, ROT0, "Dooyong", "Wise Guy", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp
index 8b611737423..46a0d91f5db 100644
--- a/src/mame/drivers/gunpey.cpp
+++ b/src/mame/drivers/gunpey.cpp
@@ -1438,7 +1438,7 @@ GFXDECODE_END
/***************************************************************************************/
-static MACHINE_CONFIG_START( gunpey, gunpey_state )
+static MACHINE_CONFIG_START( gunpey )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, 57242400 / 4)
@@ -1457,7 +1457,7 @@ static MACHINE_CONFIG_START( gunpey, gunpey_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_16_9344MHz / 8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL_16_9344MHz / 8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
@@ -1500,4 +1500,4 @@ DRIVER_INIT_MEMBER(gunpey_state,gunpey)
// ...
}
-GAME( 2000, gunpey, 0, gunpey, gunpey, gunpey_state, gunpey, ROT0, "Banpresto", "Gunpey (Japan)",MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS)
+GAME( 2000, gunpey, 0, gunpey, gunpey, gunpey_state, gunpey, ROT0, "Banpresto", "Gunpey (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp
index fc62ca64daf..b8a18cd3377 100644
--- a/src/mame/drivers/gunsmoke.cpp
+++ b/src/mame/drivers/gunsmoke.cpp
@@ -299,7 +299,7 @@ void gunsmoke_state::machine_reset()
m_sprite3bank = 0;
}
-static MACHINE_CONFIG_START( gunsmoke, gunsmoke_state )
+static MACHINE_CONFIG_START( gunsmoke )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) // 4 MHz
@@ -649,9 +649,9 @@ ROM_END
// this information is not displayed onscreen
-GAME( 1985, gunsmoke, 0, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom", "Gun.Smoke (World, 851115)", MACHINE_SUPPORTS_SAVE ) // GSE_03
-GAME( 1985, gunsmokeb, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "bootleg", "Gun.Smoke (World, 851115) (bootleg)", MACHINE_SUPPORTS_SAVE ) // based on above version, warning message patched out
-GAME( 1985, gunsmokej, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom", "Gun.Smoke (Japan, 851115)", MACHINE_SUPPORTS_SAVE ) // GSJ_03
-GAME( 1986, gunsmokeu, gunsmoke, gunsmoke, gunsmokeu, driver_device, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 860408)", MACHINE_SUPPORTS_SAVE ) // GSA_03
-GAME( 1985, gunsmokeua, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 851115, set 1)", MACHINE_SUPPORTS_SAVE ) // GSR_03 (03A on the chip)
-GAME( 1986, gunsmokeub, gunsmoke, gunsmoke, gunsmoke, driver_device, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 851115, set 2)", MACHINE_SUPPORTS_SAVE ) // GSR_03
+GAME( 1985, gunsmoke, 0, gunsmoke, gunsmoke, gunsmoke_state, 0, ROT270, "Capcom", "Gun.Smoke (World, 851115)", MACHINE_SUPPORTS_SAVE ) // GSE_03
+GAME( 1985, gunsmokeb, gunsmoke, gunsmoke, gunsmoke, gunsmoke_state, 0, ROT270, "bootleg", "Gun.Smoke (World, 851115) (bootleg)", MACHINE_SUPPORTS_SAVE ) // based on above version, warning message patched out
+GAME( 1985, gunsmokej, gunsmoke, gunsmoke, gunsmoke, gunsmoke_state, 0, ROT270, "Capcom", "Gun.Smoke (Japan, 851115)", MACHINE_SUPPORTS_SAVE ) // GSJ_03
+GAME( 1986, gunsmokeu, gunsmoke, gunsmoke, gunsmokeu, gunsmoke_state, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 860408)", MACHINE_SUPPORTS_SAVE ) // GSA_03
+GAME( 1985, gunsmokeua, gunsmoke, gunsmoke, gunsmoke, gunsmoke_state, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 851115, set 1)", MACHINE_SUPPORTS_SAVE ) // GSR_03 (03A on the chip)
+GAME( 1986, gunsmokeub, gunsmoke, gunsmoke, gunsmoke, gunsmoke_state, 0, ROT270, "Capcom (Romstar license)", "Gun.Smoke (US, 851115, set 2)", MACHINE_SUPPORTS_SAVE ) // GSR_03
diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp
index 7ab865d409e..27af1c3f08a 100644
--- a/src/mame/drivers/gyruss.cpp
+++ b/src/mame/drivers/gyruss.cpp
@@ -461,7 +461,7 @@ INTERRUPT_GEN_MEMBER(gyruss_state::slave_vblank_irq)
device.execute().set_input_line(0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( gyruss, gyruss_state )
+static MACHINE_CONFIG_START( gyruss )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -691,7 +691,7 @@ DRIVER_INIT_MEMBER(gyruss_state,gyruss)
}
-GAME( 1983, gyruss, 0, gyruss, gyruss, gyruss_state, gyruss, ROT90, "Konami", "Gyruss", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, gyruss, 0, gyruss, gyruss, gyruss_state, gyruss, ROT90, "Konami", "Gyruss", MACHINE_SUPPORTS_SAVE )
GAME( 1983, gyrussce, gyruss, gyruss, gyrussce, gyruss_state, gyruss, ROT90, "Konami (Centuri license)", "Gyruss (Centuri)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, gyrussb, gyruss, gyruss, gyruss, gyruss_state, gyruss, ROT90, "bootleg?", "Gyruss (bootleg?)", MACHINE_SUPPORTS_SAVE ) /* Supposed Taito NZ license, but (c) Konami */
-GAME( 1983, venus, gyruss, gyruss, gyruss, gyruss_state, gyruss, ROT90, "bootleg", "Venus (bootleg of Gyruss)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, gyrussb, gyruss, gyruss, gyruss, gyruss_state, gyruss, ROT90, "bootleg?", "Gyruss (bootleg?)", MACHINE_SUPPORTS_SAVE ) /* Supposed Taito NZ license, but (c) Konami */
+GAME( 1983, venus, gyruss, gyruss, gyruss, gyruss_state, gyruss, ROT90, "bootleg", "Venus (bootleg of Gyruss)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp
index a83bb3cc55e..3f1ba78d62a 100644
--- a/src/mame/drivers/h19.cpp
+++ b/src/mame/drivers/h19.cpp
@@ -510,7 +510,7 @@ static GFXDECODE_START( h19 )
GFXDECODE_ENTRY( "chargen", 0x0000, h19_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( h19, h19_state )
+static MACHINE_CONFIG_START( h19 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, H19_CLOCK) // From schematics
MCFG_CPU_PROGRAM_MAP(h19_mem)
@@ -600,10 +600,9 @@ ROM_START( watz19 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, h19, 0, 0, h19, h19, driver_device, 0, "Heath Inc", "Heathkit H-19", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, h19, 0, 0, h19, h19, h19_state, 0, "Heath Inc", "Heathkit H-19", 0 )
//Super-19 ROM - ATG Systems, Inc - Adv in Sextant Issue 4, Winter 1983. With the magazine lead-time, likely released late 1982.
-COMP( 1982, super19, h19, 0, h19, h19, driver_device, 0, "Heath Inc", "Heathkit H-19 w/ Super-19 ROM", 0 )
+COMP( 1982, super19, h19, 0, h19, h19, h19_state, 0, "Heath Inc", "Heathkit H-19 w/ Super-19 ROM", 0 )
// Watzman ROM - HUG p/n 885-1121, announced in REMark Issue 33, Oct. 1982
-COMP( 1982, watz19, h19, 0, h19, h19, driver_device, 0, "Heath Inc", "Heathkit H-19 w/ Watzman ROM", 0 )
-
+COMP( 1982, watz19, h19, 0, h19, h19, h19_state, 0, "Heath Inc", "Heathkit H-19 w/ Watzman ROM", 0 )
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index c9efaed1d60..470b8ca8bc1 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -242,7 +242,7 @@ the data is /INTE while the clock is /M1. If the system is in Single Instruction
a int20 (output of 2nd flipflop) will occur after 4 M1 steps, to pause the running program.
But, all of this can only occur if bit 5 of port F0 is low. */
- bool state = (data & I8085_STATUS_M1) ? 0 : 1;
+ bool state = (data & i8080_cpu_device::STATUS_M1) ? 0 : 1;
bool c,a = (m_irq_ctl & 0x80) ? 1 : 0;
if (m_irq_ctl & 2)
@@ -307,7 +307,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(h8_state::h8_p)
}
}
-static MACHINE_CONFIG_START( h8, h8_state )
+static MACHINE_CONFIG_START( h8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, H8_CLOCK)
MCFG_CPU_PROGRAM_MAP(h8_mem)
@@ -366,5 +366,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS, INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, h8, 0, 0, h8, h8, driver_device, 0, "Heath, Inc.", "Heathkit H8", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS, INIT COMPANY FULLNAME FLAGS */
+COMP( 1977, h8, 0, 0, h8, h8, h8_state, 0, "Heath, Inc.", "Heathkit H8", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp
index 3a9dabd68c8..99f71df9a83 100644
--- a/src/mame/drivers/h89.cpp
+++ b/src/mame/drivers/h89.cpp
@@ -177,7 +177,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( h89, h89_state )
+static MACHINE_CONFIG_START( h89 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_12_288MHz / 6)
MCFG_CPU_PROGRAM_MAP(h89_mem)
@@ -206,5 +206,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, h89, 0, 0, h89, h89, driver_device, 0, "Heath Inc", "Heathkit H89", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1979, h89, 0, 0, h89, h89, h89_state, 0, "Heath Inc", "Heathkit H89", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp
index 392cd9d0960..9b3e8152c86 100644
--- a/src/mame/drivers/halleys.cpp
+++ b/src/mame/drivers/halleys.cpp
@@ -1919,7 +1919,7 @@ void halleys_state::machine_reset()
}
-static MACHINE_CONFIG_START( halleys, halleys_state )
+static MACHINE_CONFIG_START( halleys )
MCFG_CPU_ADD("maincpu", M6809, XTAL_19_968MHz/12) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(halleys_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", halleys_state, halleys_scanline, "screen", 0, 1)
@@ -2223,8 +2223,8 @@ DRIVER_INIT_MEMBER(halleys_state,halley87)
//**************************************************************************
// Game Definitions
-GAME( 1984, benberob, 0, benberob, benberob, halleys_state, benberob, ROT0, "Taito", "Ben Bero Beh (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL )
-GAME( 1986, halleys, 0, halleys, halleys, halleys_state, halleys, ROT90, "Taito America Corporation (Coin-It license)", "Halley's Comet (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
-GAME( 1986, halleysc, halleys, halleys, halleys, halleys_state, halleys, ROT90, "Taito Corporation", "Halley's Comet (Japan, Newer)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
-GAME( 1986, halleycj, halleys, halleys, halleys, halleys_state, halleys, ROT90, "Taito Corporation", "Halley's Comet (Japan, Older)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
-GAME( 1986, halley87, halleys, halleys, halleys, halleys_state, halley87, ROT90, "Taito Corporation", "Halley's Comet '87", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
+GAME( 1984, benberob, 0, benberob, benberob, halleys_state, benberob, ROT0, "Taito", "Ben Bero Beh (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_NO_COCKTAIL )
+GAME( 1986, halleys, 0, halleys, halleys, halleys_state, halleys, ROT90, "Taito America Corporation (Coin-It license)", "Halley's Comet (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
+GAME( 1986, halleysc, halleys, halleys, halleys, halleys_state, halleys, ROT90, "Taito Corporation", "Halley's Comet (Japan, Newer)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
+GAME( 1986, halleycj, halleys, halleys, halleys, halleys_state, halleys, ROT90, "Taito Corporation", "Halley's Comet (Japan, Older)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
+GAME( 1986, halley87, halleys, halleys, halleys, halleys_state, halley87, ROT90, "Taito Corporation", "Halley's Comet '87", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL )
diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp
index 9ca0ec9bb0e..cf0caebe318 100644
--- a/src/mame/drivers/hanaawas.cpp
+++ b/src/mame/drivers/hanaawas.cpp
@@ -213,7 +213,7 @@ void hanaawas_state::machine_reset()
m_mux = 0;
}
-static MACHINE_CONFIG_START( hanaawas, hanaawas_state )
+static MACHINE_CONFIG_START( hanaawas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz ??? */
@@ -272,4 +272,4 @@ ROM_START( hanaawas )
ROM_END
-GAME( 1982, hanaawas, 0, hanaawas, hanaawas, driver_device, 0, ROT0, "Seta Kikaku, Ltd.", "Hana Awase", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, hanaawas, 0, hanaawas, hanaawas, hanaawas_state, 0, ROT0, "Seta Kikaku, Ltd.", "Hana Awase", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index 10c46d70915..7a4d7466d87 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -490,7 +490,7 @@ WRITE_LINE_MEMBER( hankin_state::ic2_cb2_w )
m_ic2_cb2 = state;
}
-static MACHINE_CONFIG_START( hankin, hankin_state )
+static MACHINE_CONFIG_START( hankin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, 3276800)
MCFG_CPU_PROGRAM_MAP(hankin_map)
@@ -602,8 +602,8 @@ ROM_START(empsback)
ROM_END
-GAME(1978, fjholden, 0, hankin, hankin, driver_device, 0, ROT0, "Hankin", "FJ Holden", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, orbit1, 0, hankin, hankin, driver_device, 0, ROT0, "Hankin", "Orbit 1", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980, shark, 0, hankin, hankin, driver_device, 0, ROT0, "Hankin", "Shark", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980, howzat, 0, hankin, hankin, driver_device, 0, ROT0, "Hankin", "Howzat!", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1981, empsback, 0, hankin, hankin, driver_device, 0, ROT0, "Hankin", "The Empire Strike Back", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, fjholden, 0, hankin, hankin, hankin_state, 0, ROT0, "Hankin", "FJ Holden", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, orbit1, 0, hankin, hankin, hankin_state, 0, ROT0, "Hankin", "Orbit 1", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1980, shark, 0, hankin, hankin, hankin_state, 0, ROT0, "Hankin", "Shark", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1980, howzat, 0, hankin, hankin, hankin_state, 0, ROT0, "Hankin", "Howzat!", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1981, empsback, 0, hankin, hankin, hankin_state, 0, ROT0, "Hankin", "The Empire Strike Back", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp
index cd41f22da9f..d109e6154d0 100644
--- a/src/mame/drivers/hapyfish.cpp
+++ b/src/mame/drivers/hapyfish.cpp
@@ -53,7 +53,7 @@ void hapyfish_state::video_start()
-static MACHINE_CONFIG_START( hapyfish, hapyfish_state )
+static MACHINE_CONFIG_START( hapyfish )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM9, 20000000) // ?? ARM baesd CPU
@@ -82,5 +82,4 @@ ROM_START( hapyfsh2 )
ROM_LOAD( "flash.u28", 0x00000000, 0x84000000, CRC(f00a25cd) SHA1(9c33f8e26b84cea957d9c37fb83a686b948c6834) )
ROM_END
- GAME( 201?, hapyfsh2, 0, hapyfish, hapyfish, driver_device, 0, ROT0, "bootleg", "Happy Fish (V2 PCB, 302-in-1)", MACHINE_IS_SKELETON )
-
+GAME( 201?, hapyfsh2, 0, hapyfish, hapyfish, hapyfish_state, 0, ROT0, "bootleg", "Happy Fish (V2 PCB, 302-in-1)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index db8f68209b0..11b9652fc94 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -340,8 +340,8 @@ Notes:
*
*************************************/
-harddriv_state::harddriv_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+harddriv_state::harddriv_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
/* device_video_interface(mconfig, *this, false), */
m_maincpu(*this, "maincpu"),
m_gsp(*this, "gsp"),
@@ -1635,7 +1635,7 @@ static MACHINE_CONFIG_FRAGMENT( harddriv )
MCFG_FRAGMENT_ADD( driver_msp )
/* basic machine hardware */ /* original driver board with MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
- MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0) /* driver sound board */
+ MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( harddrivc )
@@ -1643,7 +1643,7 @@ static MACHINE_CONFIG_FRAGMENT( harddrivc )
/* basic machine hardware */ /* multisync board with MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
- MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0) /* driver sound board */
+ MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( racedriv )
@@ -1652,7 +1652,7 @@ static MACHINE_CONFIG_FRAGMENT( racedriv )
/* basic machine hardware */ /* original driver board without MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
- MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0) /* driver sound board */
+ MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( racedrivc )
@@ -1662,7 +1662,7 @@ static MACHINE_CONFIG_FRAGMENT( racedrivc )
/* basic machine hardware */ /* multisync board without MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
- MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD_DEVICE, 0) /* driver sound board */
+ MCFG_DEVICE_ADD("harddriv_sound", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */
MACHINE_CONFIG_END
@@ -1673,7 +1673,7 @@ static MACHINE_CONFIG_FRAGMENT( racedrivc_panorama_side )
/* basic machine hardware */ /* multisync board without MSP */
MCFG_FRAGMENT_ADD( adsp ) /* ADSP board */
// MCFG_FRAGMENT_ADD( dsk ) /* DSK board */
-// MCFG_DEVICE_ADD("sound_board", HARDDRIV_SOUND_BOARD_DEVICE, 0) /* driver sound board */
+// MCFG_DEVICE_ADD("sound_board", HARDDRIV_SOUND_BOARD, 0) /* driver sound board */
MACHINE_CONFIG_END
WRITE_LINE_MEMBER(harddriv_state::sound_int_write_line)
@@ -1749,10 +1749,10 @@ static MACHINE_CONFIG_FRAGMENT( hdrivair )
MCFG_FRAGMENT_ADD( dsk2 ) /* DSK II board */
MACHINE_CONFIG_END
-const device_type HARDDRIV_BOARD_DEVICE = device_creator<harddriv_board_device_state>;
+DEFINE_DEVICE_TYPE(HARDDRIV_BOARD, harddriv_board_device_state, "harddriv_board", "Hard Drivin' Board Device")
harddriv_board_device_state::harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, HARDDRIV_BOARD_DEVICE, "Hard Drivin' Board Device", tag, owner, clock, "harddriv_board_device", __FILE__)
+ : harddriv_state(mconfig, HARDDRIV_BOARD, tag, owner, clock)
{
}
@@ -1775,10 +1775,10 @@ void harddrivc_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type HARDDRIVC_BOARD_DEVICE = device_creator<harddrivc_board_device_state>;
+DEFINE_DEVICE_TYPE(HARDDRIVC_BOARD, harddrivc_board_device_state, "harddrivc_board", "Hard Drivin' C Board Device")
harddrivc_board_device_state::harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, HARDDRIVC_BOARD_DEVICE, "Hard Drivin' C Board Device", tag, owner, clock, "harddrivc_board_device", __FILE__)
+ : harddriv_state(mconfig, HARDDRIVC_BOARD, tag, owner, clock)
{
}
@@ -1802,21 +1802,21 @@ void racedrivb1_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type RACEDRIV_BOARD_DEVICE = device_creator<racedriv_board_device_state>;
-const device_type RACEDRIVB1_BOARD_DEVICE = device_creator<racedrivb1_board_device_state>;
+DEFINE_DEVICE_TYPE(RACEDRIV_BOARD, racedriv_board_device_state, "racedriv_board", "Race Drivin' Board Device")
+DEFINE_DEVICE_TYPE(RACEDRIVB1_BOARD, racedrivb1_board_device_state, "racedrivb1_board", "Race Drivin' B1 Board Device")
racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, RACEDRIV_BOARD_DEVICE, "Race Drivin' Board Device", tag, owner, clock, "racedriv_board_device", __FILE__)
+ : racedriv_board_device_state(mconfig, RACEDRIV_BOARD, tag, owner, clock)
{
}
-racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : harddriv_state(mconfig, type, name, tag, owner, clock, shortname, source)
+racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : harddriv_state(mconfig, type, tag, owner, clock)
{
}
racedrivb1_board_device_state::racedrivb1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : racedriv_board_device_state(mconfig, RACEDRIVB1_BOARD_DEVICE, "Race Drivin' B1 Board Device", tag, owner, clock, "racedrivb1_board_device", __FILE__)
+ : racedriv_board_device_state(mconfig, RACEDRIVB1_BOARD, tag, owner, clock)
{
}
@@ -1848,27 +1848,27 @@ void racedrivc_panorama_side_board_device_state::device_start()
-const device_type RACEDRIVC_BOARD_DEVICE = device_creator<racedrivc_board_device_state>;
-const device_type RACEDRIVC1_BOARD_DEVICE = device_creator<racedrivc1_board_device_state>;
-const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE = device_creator<racedrivc_panorama_side_board_device_state>;
+DEFINE_DEVICE_TYPE(RACEDRIVC_BOARD, racedrivc_board_device_state, "racedrivc_board", "Race Drivin' C Board Device")
+DEFINE_DEVICE_TYPE(RACEDRIVC1_BOARD, racedrivc1_board_device_state, "racedrivc1_board", "Race Drivin' C1 Board Device")
+DEFINE_DEVICE_TYPE(RACEDRIVC_PANORAMA_SIDE_BOARD, racedrivc_panorama_side_board_device_state, "racedrivc_panorama_side_board", "Race Drivin' C Panorama Board Device")
racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, RACEDRIVC_BOARD_DEVICE, "Race Drivin' C Board Device", tag, owner, clock, "racedrivc_board_device", __FILE__)
+ : racedrivc_board_device_state(mconfig, RACEDRIVC_BOARD, tag, owner, clock)
{
}
-racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : harddriv_state(mconfig, type, name, tag, owner, clock, shortname, source)
+racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : harddriv_state(mconfig, type, tag, owner, clock)
{
}
racedrivc1_board_device_state::racedrivc1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : racedrivc_board_device_state(mconfig, RACEDRIVC1_BOARD_DEVICE, "Race Drivin' C1 Board Device", tag, owner, clock, "racedrivc1_board_device", __FILE__)
+ : racedrivc_board_device_state(mconfig, RACEDRIVC1_BOARD, tag, owner, clock)
{
}
racedrivc_panorama_side_board_device_state::racedrivc_panorama_side_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : racedrivc_board_device_state(mconfig, RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE, "Race Drivin' C Panorama Board Device", tag, owner, clock, "racedrivc_panorama_side_board_device", __FILE__)
+ : racedrivc_board_device_state(mconfig, RACEDRIVC_PANORAMA_SIDE_BOARD, tag, owner, clock)
{
}
@@ -1891,10 +1891,10 @@ void stunrun_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type STUNRUN_BOARD_DEVICE = device_creator<stunrun_board_device_state>;
+DEFINE_DEVICE_TYPE(STUNRUN_BOARD, stunrun_board_device_state, "stunrun_board", "Stun Runner Board Device")
stunrun_board_device_state::stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, STUNRUN_BOARD_DEVICE, "Stun Runner Board Device", tag, owner, clock, "stunrun_board_device", __FILE__)
+ : harddriv_state(mconfig, STUNRUN_BOARD, tag, owner, clock)
{
}
@@ -1923,27 +1923,27 @@ void steeltalp_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type STEELTAL_BOARD_DEVICE = device_creator<steeltal_board_device_state>;
-const device_type STEELTAL1_BOARD_DEVICE = device_creator<steeltal1_board_device_state>;
-const device_type STEELTALP_BOARD_DEVICE = device_creator<steeltalp_board_device_state>;
+DEFINE_DEVICE_TYPE(STEELTAL_BOARD, steeltal_board_device_state, "steeltal_board", "Steel Talons Board Device")
+DEFINE_DEVICE_TYPE(STEELTAL1_BOARD, steeltal1_board_device_state, "steeltal1_board", "Steel Talons 1 Board Device")
+DEFINE_DEVICE_TYPE(STEELTALP_BOARD, steeltalp_board_device_state, "steeltalp_board", "Steel Talons P Board Device")
steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, STEELTAL_BOARD_DEVICE, "Steel Talons Board Device", tag, owner, clock, "steeltal_board_device", __FILE__)
+ : steeltal_board_device_state(mconfig, STEELTAL_BOARD, tag, owner, clock)
{
}
-steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : harddriv_state(mconfig, type, name, tag, owner, clock, shortname, source)
+steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : harddriv_state(mconfig, type, tag, owner, clock)
{
}
steeltal1_board_device_state::steeltal1_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : steeltal_board_device_state(mconfig, STEELTAL1_BOARD_DEVICE, "Steel Talons 1 Board Device", tag, owner, clock, "steeltal1_board_device", __FILE__)
+ : steeltal_board_device_state(mconfig, STEELTAL1_BOARD, tag, owner, clock)
{
}
steeltalp_board_device_state::steeltalp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : steeltal_board_device_state(mconfig, STEELTALP_BOARD_DEVICE, "Steel Talons P Board Device", tag, owner, clock, "steeltalp_board_device", __FILE__)
+ : steeltal_board_device_state(mconfig, STEELTALP_BOARD, tag, owner, clock)
{
}
@@ -1960,10 +1960,10 @@ void strtdriv_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type STRTDRIV_BOARD_DEVICE = device_creator<strtdriv_board_device_state>;
+DEFINE_DEVICE_TYPE(STRTDRIV_BOARD, strtdriv_board_device_state, "strtdriv_board", "Street Drivin' Board Device")
strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, STRTDRIV_BOARD_DEVICE, "Street Drivin' Board Device", tag, owner, clock, "strtdriv_board_device", __FILE__)
+ : harddriv_state(mconfig, STRTDRIV_BOARD, tag, owner, clock)
{
}
@@ -1986,21 +1986,21 @@ void hdrivairp_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type HDRIVAIR_BOARD_DEVICE = device_creator<hdrivair_board_device_state>;
-const device_type HDRIVAIRP_BOARD_DEVICE = device_creator<hdrivairp_board_device_state>;
+DEFINE_DEVICE_TYPE(HDRIVAIR_BOARD, hdrivair_board_device_state, "hdrivair_board", "Hard Drivin' Airborne Board Device")
+DEFINE_DEVICE_TYPE(HDRIVAIRP_BOARD, hdrivairp_board_device_state, "hdrivairp_board", "Hard Drivin' Airborne P Board Device")
hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : harddriv_state(mconfig, HDRIVAIR_BOARD_DEVICE, "Hard Drivin' Airborne Board Device", tag, owner, clock, "hdrivair_board_device", __FILE__)
+ : hdrivair_board_device_state(mconfig, HDRIVAIR_BOARD, tag, owner, clock)
{
}
-hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : harddriv_state(mconfig, type, name, tag, owner, clock, shortname, source)
+hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : harddriv_state(mconfig, type, tag, owner, clock)
{
}
hdrivairp_board_device_state::hdrivairp_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : hdrivair_board_device_state(mconfig, HDRIVAIRP_BOARD_DEVICE, "Hard Drivin' Airborne P Board Device", tag, owner, clock, "hrdrvairp_board_device", __FILE__)
+ : hdrivair_board_device_state(mconfig, HDRIVAIRP_BOARD, tag, owner, clock)
{
}
@@ -2011,56 +2011,56 @@ machine_config_constructor hdrivair_board_device_state::device_mconfig_additions
-static MACHINE_CONFIG_START( harddriv_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", HARDDRIV_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( harddriv_machine )
+ MCFG_DEVICE_ADD("mainpcb", HARDDRIV_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( harddrivc_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", HARDDRIVC_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( harddrivc_machine )
+ MCFG_DEVICE_ADD("mainpcb", HARDDRIVC_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( racedriv_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", RACEDRIV_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( racedriv_machine )
+ MCFG_DEVICE_ADD("mainpcb", RACEDRIV_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( racedrivb1_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", RACEDRIVB1_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( racedrivb1_machine )
+ MCFG_DEVICE_ADD("mainpcb", RACEDRIVB1_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( racedrivc_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", RACEDRIVC_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( racedrivc_machine )
+ MCFG_DEVICE_ADD("mainpcb", RACEDRIVC_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( racedrivc1_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", RACEDRIVC1_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( racedrivc1_machine )
+ MCFG_DEVICE_ADD("mainpcb", RACEDRIVC1_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( stunrun_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", STUNRUN_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( stunrun_machine )
+ MCFG_DEVICE_ADD("mainpcb", STUNRUN_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( strtdriv_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", STRTDRIV_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( strtdriv_machine )
+ MCFG_DEVICE_ADD("mainpcb", STRTDRIV_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hdrivair_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", HDRIVAIR_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( hdrivair_machine )
+ MCFG_DEVICE_ADD("mainpcb", HDRIVAIR_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hdrivairp_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", HDRIVAIRP_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( hdrivairp_machine )
+ MCFG_DEVICE_ADD("mainpcb", HDRIVAIRP_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( steeltal_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", STEELTAL_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( steeltal_machine )
+ MCFG_DEVICE_ADD("mainpcb", STEELTAL_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( steeltal1_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", STEELTAL1_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( steeltal1_machine )
+ MCFG_DEVICE_ADD("mainpcb", STEELTAL1_BOARD, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( steeltalp_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", STEELTALP_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( steeltalp_machine )
+ MCFG_DEVICE_ADD("mainpcb", STEELTALP_BOARD, 0)
MACHINE_CONFIG_END
WRITE_LINE_MEMBER(harddriv_new_state::tx_a)
@@ -2070,10 +2070,10 @@ WRITE_LINE_MEMBER(harddriv_new_state::tx_a)
m_rightpcb->get_duart()->rx_a_w(state);
}
-static MACHINE_CONFIG_START( racedriv_panorama_machine, harddriv_new_state )
- MCFG_DEVICE_ADD("mainpcb", RACEDRIV_BOARD_DEVICE, 0)
- MCFG_DEVICE_ADD("leftpcb", RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE, 0)
- MCFG_DEVICE_ADD("rightpcb", RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE, 0)
+static MACHINE_CONFIG_START( racedriv_panorama_machine )
+ MCFG_DEVICE_ADD("mainpcb", RACEDRIV_BOARD, 0)
+ MCFG_DEVICE_ADD("leftpcb", RACEDRIVC_PANORAMA_SIDE_BOARD, 0)
+ MCFG_DEVICE_ADD("rightpcb", RACEDRIVC_PANORAMA_SIDE_BOARD, 0)
// MCFG_QUANTUM_TIME(attotime::from_hz(100000))
MCFG_DEVICE_MODIFY("mainpcb:duartn68681")
@@ -5240,64 +5240,64 @@ void harddriv_state::init_hdrivairp(void)
*
*************************************/
-GAME( 1988, harddriv, 0, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 7)", 0 )
-GAME( 1988, harddrivb, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, British, rev 7)", 0 )
-GAME( 1988, harddrivg, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, German, rev 7)", 0 )
-GAME( 1988, harddrivj, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, Japan, rev 7)", 0 )
-GAME( 1988, harddrivb6, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, British, rev 6)", 0 )
-GAME( 1988, harddrivj6, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, Japan, rev 6)", 0 )
-GAME( 1988, harddrivb5, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, British, rev 5)", 0 )
-GAME( 1988, harddrivg4, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, German, rev 4)", 0 )
-GAME( 1988, harddriv3, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 3)", 0 )
-GAME( 1988, harddriv2, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 2)", 0 )
-GAME( 1988, harddriv1, harddriv, harddriv_machine, harddriv, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 1)", 0 )
-
-GAME( 1990, harddrivc, harddriv, harddrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (compact, rev 2)", 0 )
-GAME( 1990, harddrivcg, harddriv, harddrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (compact, German, rev 2)", 0 )
-GAME( 1990, harddrivcb, harddriv, harddrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (compact, British, rev 2)", 0 )
-GAME( 1990, harddrivc1, harddriv, harddrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Hard Drivin' (compact, rev 1)", 0 )
-
-GAME( 1989, stunrun, 0, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 6)", 0 )
-GAME( 1989, stunrunj, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 7, Japan)", 0 )
-GAME( 1989, stunrun5, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 5)", 0 )
-GAME( 1989, stunrune, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 5, Europe)", 0 )
-GAME( 1989, stunrun4, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 4)", 0 )
-GAME( 1989, stunrun3, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 3)", 0 )
-GAME( 1989, stunrun3e, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 3, Europe)", 0 )
-GAME( 1989, stunrun2, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 2)", 0 )
-GAME( 1989, stunrun2e, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 2, Europe)", 0 )
-GAME( 1989, stunrun0, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 0)", 0 )
-GAME( 1989, stunrunp, stunrun, stunrun_machine, stunrun, driver_device, 0, ROT0, "Atari Games", "S.T.U.N. Runner (upright prototype)", 0 )
-
-GAME( 1990, racedriv, 0, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 5)", 0 )
-GAME( 1990, racedrivb, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 5)", 0 )
-GAME( 1990, racedrivg, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 5)", 0 )
-GAME( 1990, racedriv4, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 4)", 0 )
-GAME( 1990, racedrivb4, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 4)", 0 )
-GAME( 1990, racedrivg4, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 4)", 0 )
-GAME( 1990, racedriv3, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 3)", 0 )
-GAME( 1990, racedriv2, racedriv, racedriv_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 2)", 0 )
-GAME( 1990, racedriv1, racedriv, racedrivb1_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 1)", 0 )
-GAME( 1990, racedrivb1, racedriv, racedrivb1_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 1)", 0 )
-GAME( 1990, racedrivg1, racedriv, racedrivb1_machine, racedriv, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 2)", 0 )
-
-GAME( 1990, racedrivc, racedriv, racedrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (compact, rev 5)", 0 )
-GAME( 1990, racedrivcb, racedriv, racedrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (compact, British, rev 5)", 0 )
-GAME( 1990, racedrivcg, racedriv, racedrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (compact, German, rev 5)", 0 )
-GAME( 1990, racedrivc4, racedriv, racedrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (compact, rev 4)", 0 )
-GAME( 1990, racedrivcb4, racedriv, racedrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (compact, British, rev 4)", 0 )
-GAME( 1990, racedrivcg4, racedriv, racedrivc_machine, racedrivc, driver_device, 0, ROT0, "Atari Games", "Race Drivin' (compact, German, rev 4)", 0 )
-GAME( 1990, racedrivc2, racedriv, racedrivc1_machine, racedrivc, driver_device, 0,ROT0, "Atari Games", "Race Drivin' (compact, rev 2)", 0 )
-GAME( 1990, racedrivc1, racedriv, racedrivc1_machine, racedrivc, driver_device, 0,ROT0, "Atari Games", "Race Drivin' (compact, rev 1)", 0 )
-
-GAMEL( 1990, racedrivpan, racedriv, racedriv_panorama_machine, racedriv_pan, driver_device, 0, ROT0, "Atari Games", "Race Drivin' Panorama (prototype, rev 2.1)", 0, layout_racedrivpan )
-
-GAME( 1991, steeltal, 0, steeltal_machine, steeltal, driver_device, 0, ROT0, "Atari Games", "Steel Talons (rev 2)", 0 )
-GAME( 1991, steeltalg, steeltal, steeltal_machine, steeltal, driver_device, 0, ROT0, "Atari Games", "Steel Talons (German, rev 2)", 0 )
-GAME( 1991, steeltal1, steeltal, steeltal1_machine, steeltal, driver_device, 0,ROT0, "Atari Games", "Steel Talons (rev 1)", 0 )
-GAME( 1991, steeltalp, steeltal, steeltalp_machine, steeltal, driver_device, 0,ROT0, "Atari Games", "Steel Talons (prototype)", MACHINE_NOT_WORKING )
-
-GAME( 1993, strtdriv, 0, strtdriv_machine, strtdriv, driver_device, 0, ROT0, "Atari Games", "Street Drivin' (prototype)", 0 )
-
-GAME( 1993, hdrivair, 0, hdrivair_machine, hdrivair, driver_device, 0, ROT0, "Atari Games", "Hard Drivin's Airborne (prototype)", MACHINE_IMPERFECT_SOUND )
-GAME( 1993, hdrivairp, hdrivair, hdrivairp_machine, hdrivair, driver_device, 0,ROT0, "Atari Games", "Hard Drivin's Airborne (prototype, early rev)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1988, harddriv, 0, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 7)", 0 )
+GAME( 1988, harddrivb, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, British, rev 7)", 0 )
+GAME( 1988, harddrivg, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, German, rev 7)", 0 )
+GAME( 1988, harddrivj, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, Japan, rev 7)", 0 )
+GAME( 1988, harddrivb6, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, British, rev 6)", 0 )
+GAME( 1988, harddrivj6, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, Japan, rev 6)", 0 )
+GAME( 1988, harddrivb5, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, British, rev 5)", 0 )
+GAME( 1988, harddrivg4, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, German, rev 4)", 0 )
+GAME( 1988, harddriv3, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 3)", 0 )
+GAME( 1988, harddriv2, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 2)", 0 )
+GAME( 1988, harddriv1, harddriv, harddriv_machine, harddriv, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (cockpit, rev 1)", 0 )
+
+GAME( 1990, harddrivc, harddriv, harddrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (compact, rev 2)", 0 )
+GAME( 1990, harddrivcg, harddriv, harddrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (compact, German, rev 2)", 0 )
+GAME( 1990, harddrivcb, harddriv, harddrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (compact, British, rev 2)", 0 )
+GAME( 1990, harddrivc1, harddriv, harddrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin' (compact, rev 1)", 0 )
+
+GAME( 1989, stunrun, 0, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 6)", 0 )
+GAME( 1989, stunrunj, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 7, Japan)", 0 )
+GAME( 1989, stunrun5, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 5)", 0 )
+GAME( 1989, stunrune, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 5, Europe)", 0 )
+GAME( 1989, stunrun4, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 4)", 0 )
+GAME( 1989, stunrun3, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 3)", 0 )
+GAME( 1989, stunrun3e, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 3, Europe)", 0 )
+GAME( 1989, stunrun2, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 2)", 0 )
+GAME( 1989, stunrun2e, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 2, Europe)", 0 )
+GAME( 1989, stunrun0, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (rev 0)", 0 )
+GAME( 1989, stunrunp, stunrun, stunrun_machine, stunrun, harddriv_new_state, 0, ROT0, "Atari Games", "S.T.U.N. Runner (upright prototype)", 0 )
+
+GAME( 1990, racedriv, 0, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 5)", 0 )
+GAME( 1990, racedrivb, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 5)", 0 )
+GAME( 1990, racedrivg, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 5)", 0 )
+GAME( 1990, racedriv4, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 4)", 0 )
+GAME( 1990, racedrivb4, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 4)", 0 )
+GAME( 1990, racedrivg4, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 4)", 0 )
+GAME( 1990, racedriv3, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 3)", 0 )
+GAME( 1990, racedriv2, racedriv, racedriv_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 2)", 0 )
+GAME( 1990, racedriv1, racedriv, racedrivb1_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, rev 1)", 0 )
+GAME( 1990, racedrivb1, racedriv, racedrivb1_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 1)", 0 )
+GAME( 1990, racedrivg1, racedriv, racedrivb1_machine, racedriv, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 2)", 0 )
+
+GAME( 1990, racedrivc, racedriv, racedrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, rev 5)", 0 )
+GAME( 1990, racedrivcb, racedriv, racedrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, British, rev 5)", 0 )
+GAME( 1990, racedrivcg, racedriv, racedrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, German, rev 5)", 0 )
+GAME( 1990, racedrivc4, racedriv, racedrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, rev 4)", 0 )
+GAME( 1990, racedrivcb4, racedriv, racedrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, British, rev 4)", 0 )
+GAME( 1990, racedrivcg4, racedriv, racedrivc_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, German, rev 4)", 0 )
+GAME( 1990, racedrivc2, racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, rev 2)", 0 )
+GAME( 1990, racedrivc1, racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' (compact, rev 1)", 0 )
+
+GAMEL( 1990, racedrivpan, racedriv, racedriv_panorama_machine, racedriv_pan, harddriv_new_state, 0, ROT0, "Atari Games", "Race Drivin' Panorama (prototype, rev 2.1)", 0, layout_racedrivpan )
+
+GAME( 1991, steeltal, 0, steeltal_machine, steeltal, harddriv_new_state, 0, ROT0, "Atari Games", "Steel Talons (rev 2)", 0 )
+GAME( 1991, steeltalg, steeltal, steeltal_machine, steeltal, harddriv_new_state, 0, ROT0, "Atari Games", "Steel Talons (German, rev 2)", 0 )
+GAME( 1991, steeltal1, steeltal, steeltal1_machine, steeltal, harddriv_new_state, 0, ROT0, "Atari Games", "Steel Talons (rev 1)", 0 )
+GAME( 1991, steeltalp, steeltal, steeltalp_machine, steeltal, harddriv_new_state, 0, ROT0, "Atari Games", "Steel Talons (prototype)", MACHINE_NOT_WORKING )
+
+GAME( 1993, strtdriv, 0, strtdriv_machine, strtdriv, harddriv_new_state, 0, ROT0, "Atari Games", "Street Drivin' (prototype)", 0 )
+
+GAME( 1993, hdrivair, 0, hdrivair_machine, hdrivair, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin's Airborne (prototype)", MACHINE_IMPERFECT_SOUND )
+GAME( 1993, hdrivairp, hdrivair, hdrivairp_machine, hdrivair, harddriv_new_state, 0, ROT0, "Atari Games", "Hard Drivin's Airborne (prototype, early rev)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp
index b3d9dec6a74..5fd82f1a3ac 100644
--- a/src/mame/drivers/harriet.cpp
+++ b/src/mame/drivers/harriet.cpp
@@ -29,29 +29,30 @@ public:
{
}
- // devices
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
-
// screen updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint8_t m_teletype_data;
- uint8_t m_teletype_status;
-
DECLARE_READ8_MEMBER(unk_r);
DECLARE_WRITE8_MEMBER(unk_w);
DECLARE_WRITE8_MEMBER(serial_w);
DECLARE_READ8_MEMBER(unk2_r);
DECLARE_READ8_MEMBER(unk3_r);
DECLARE_READ8_MEMBER(keyboard_status_r);
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
+
protected:
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
+
+ // devices
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
+
+ uint8_t m_teletype_data;
+ uint8_t m_teletype_status;
};
void harriet_state::video_start()
@@ -177,7 +178,7 @@ static INPUT_PORTS_START( harriet )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
-WRITE8_MEMBER( harriet_state::kbd_put )
+void harriet_state::kbd_put(u8 data)
{
m_teletype_data = data;
m_teletype_status |= 0x80;
@@ -192,7 +193,7 @@ void harriet_state::machine_reset()
}
-static MACHINE_CONFIG_START( harriet, harriet_state )
+static MACHINE_CONFIG_START( harriet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68010,XTAL_8MHz) // TODO: clock
@@ -200,7 +201,7 @@ static MACHINE_CONFIG_START( harriet, harriet_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(harriet_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(harriet_state, kbd_put))
MCFG_PALETTE_ADD("palette", 8)
@@ -223,4 +224,4 @@ ROM_START( harriet )
ROM_LOAD16_BYTE( "harriet 36-74c.tdb v5.01 hibyte 2a0c.bin", 0x0000, 0x4000, CRC(a61f441d) SHA1(76af6eddd5c042f1b2eef590eb822379944b9b28) )
ROM_END
-COMP( 1990, harriet, 0, 0, harriet, harriet, driver_device, 0, "Quantel", "Harriet", MACHINE_IS_SKELETON )
+COMP( 1990, harriet, 0, 0, harriet, harriet, harriet_state, 0, "Quantel", "Harriet", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/hazelgr.cpp b/src/mame/drivers/hazelgr.cpp
index b22c62381f9..cca9a43c63c 100644
--- a/src/mame/drivers/hazelgr.cpp
+++ b/src/mame/drivers/hazelgr.cpp
@@ -35,7 +35,7 @@ static INPUT_PORTS_START( haze )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( haze, haze_state )
+static MACHINE_CONFIG_START( haze )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,2000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(haze_map)
@@ -49,4 +49,4 @@ ROM_START( hg_frd )
ROM_END
-GAME( 198?, hg_frd, 0, haze, haze, driver_device, 0, ROT0, "Hazel Grove", "Fruit Deuce (Hazel Grove)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 198?, hg_frd, 0, haze, haze, haze_state, 0, ROT0, "Hazel Grove", "Fruit Deuce (Hazel Grove)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp
index 69f067f8312..d8a68012ecc 100644
--- a/src/mame/drivers/hazeltin.cpp
+++ b/src/mame/drivers/hazeltin.cpp
@@ -167,36 +167,36 @@ public:
private:
required_device<cpu_device> m_maincpu;
- required_device<netlist_mame_device_t> m_video_board;
- required_device<netlist_ram_pointer_t> m_u9;
- required_device<netlist_ram_pointer_t> m_u10;
- required_device<netlist_ram_pointer_t> m_u11;
- required_device<netlist_ram_pointer_t> m_u12;
- required_device<netlist_ram_pointer_t> m_u13;
- required_device<netlist_ram_pointer_t> m_u14;
- required_device<netlist_ram_pointer_t> m_u15;
- required_device<netlist_ram_pointer_t> m_u16;
- required_device<netlist_ram_pointer_t> m_u22;
- required_device<netlist_ram_pointer_t> m_u23;
- required_device<netlist_ram_pointer_t> m_u24;
- required_device<netlist_ram_pointer_t> m_u25;
- required_device<netlist_ram_pointer_t> m_u26;
- required_device<netlist_ram_pointer_t> m_u27;
- required_device<netlist_ram_pointer_t> m_u28;
- required_device<netlist_ram_pointer_t> m_u29;
- required_device<netlist_mame_logic_input_t> m_cpu_db0;
- required_device<netlist_mame_logic_input_t> m_cpu_db1;
- required_device<netlist_mame_logic_input_t> m_cpu_db2;
- required_device<netlist_mame_logic_input_t> m_cpu_db3;
- required_device<netlist_mame_logic_input_t> m_cpu_db4;
- required_device<netlist_mame_logic_input_t> m_cpu_db5;
- required_device<netlist_mame_logic_input_t> m_cpu_db6;
- required_device<netlist_mame_logic_input_t> m_cpu_db7;
- required_device<netlist_mame_logic_input_t> m_cpu_ba4;
- required_device<netlist_mame_logic_input_t> m_cpu_iowq;
- required_device<netlist_mame_analog_output_t> m_video_out;
- required_device<netlist_mame_analog_output_t> m_vblank_out;
- required_device<netlist_mame_analog_output_t> m_tvinterq_out;
+ required_device<netlist_mame_device> m_video_board;
+ required_device<netlist_mame_ram_pointer_device> m_u9;
+ required_device<netlist_mame_ram_pointer_device> m_u10;
+ required_device<netlist_mame_ram_pointer_device> m_u11;
+ required_device<netlist_mame_ram_pointer_device> m_u12;
+ required_device<netlist_mame_ram_pointer_device> m_u13;
+ required_device<netlist_mame_ram_pointer_device> m_u14;
+ required_device<netlist_mame_ram_pointer_device> m_u15;
+ required_device<netlist_mame_ram_pointer_device> m_u16;
+ required_device<netlist_mame_ram_pointer_device> m_u22;
+ required_device<netlist_mame_ram_pointer_device> m_u23;
+ required_device<netlist_mame_ram_pointer_device> m_u24;
+ required_device<netlist_mame_ram_pointer_device> m_u25;
+ required_device<netlist_mame_ram_pointer_device> m_u26;
+ required_device<netlist_mame_ram_pointer_device> m_u27;
+ required_device<netlist_mame_ram_pointer_device> m_u28;
+ required_device<netlist_mame_ram_pointer_device> m_u29;
+ required_device<netlist_mame_logic_input_device> m_cpu_db0;
+ required_device<netlist_mame_logic_input_device> m_cpu_db1;
+ required_device<netlist_mame_logic_input_device> m_cpu_db2;
+ required_device<netlist_mame_logic_input_device> m_cpu_db3;
+ required_device<netlist_mame_logic_input_device> m_cpu_db4;
+ required_device<netlist_mame_logic_input_device> m_cpu_db5;
+ required_device<netlist_mame_logic_input_device> m_cpu_db6;
+ required_device<netlist_mame_logic_input_device> m_cpu_db7;
+ required_device<netlist_mame_logic_input_device> m_cpu_ba4;
+ required_device<netlist_mame_logic_input_device> m_cpu_iowq;
+ required_device<netlist_mame_analog_output_device> m_video_out;
+ required_device<netlist_mame_analog_output_device> m_vblank_out;
+ required_device<netlist_mame_analog_output_device> m_tvinterq_out;
required_device<ay31015_device> m_uart;
required_device<ay3600_device> m_kbdc;
required_ioport m_baud_dips;
@@ -686,7 +686,7 @@ static GFXDECODE_START( hazl1500 )
GFXDECODE_ENTRY( CHAR_EPROM_TAG, 0x0000, hazl1500_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( hazl1500, hazl1500_state )
+static MACHINE_CONFIG_START( hazl1500 )
/* basic machine hardware */
MCFG_CPU_ADD(CPU_TAG, I8080, XTAL_18MHz/9) // 18MHz crystal on schematics, using an i8224 clock gen/driver IC
MCFG_CPU_PROGRAM_MAP(hazl1500_mem)
@@ -784,5 +784,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, hazl1500, 0, 0, hazl1500, hazl1500, driver_device, 0, "Hazeltine Corporation", "Hazeltine 1500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1977, hazl1500, 0, 0, hazl1500, hazl1500, hazl1500_state, 0, "Hazeltine Corporation", "Hazeltine 1500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp
index 7125a710ba2..55509e598f0 100644
--- a/src/mame/drivers/hcastle.cpp
+++ b/src/mame/drivers/hcastle.cpp
@@ -188,7 +188,7 @@ void hcastle_state::machine_reset()
m_old_pf2 = -1;
}
-static MACHINE_CONFIG_START( hcastle, hcastle_state )
+static MACHINE_CONFIG_START( hcastle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* Derived from 24 MHz clock */
@@ -381,8 +381,8 @@ ROM_END
-GAME( 1988, hcastle, 0, hcastle, hcastle, driver_device, 0, ROT0, "Konami", "Haunted Castle (version M)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hcastlek, hcastle, hcastle, hcastle, driver_device, 0, ROT0, "Konami", "Haunted Castle (version K)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hcastlee, hcastle, hcastle, hcastle, driver_device, 0, ROT0, "Konami", "Haunted Castle (version E)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, akumajou, hcastle, hcastle, hcastle, driver_device, 0, ROT0, "Konami", "Akuma-Jou Dracula (Japan version P)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, akumajoun, hcastle, hcastle, hcastle, driver_device, 0, ROT0, "Konami", "Akuma-Jou Dracula (Japan version N)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hcastle, 0, hcastle, hcastle, hcastle_state, 0, ROT0, "Konami", "Haunted Castle (version M)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hcastlek, hcastle, hcastle, hcastle, hcastle_state, 0, ROT0, "Konami", "Haunted Castle (version K)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hcastlee, hcastle, hcastle, hcastle, hcastle_state, 0, ROT0, "Konami", "Haunted Castle (version E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, akumajou, hcastle, hcastle, hcastle, hcastle_state, 0, ROT0, "Konami", "Akuma-Jou Dracula (Japan version P)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, akumajoun, hcastle, hcastle, hcastle, hcastle_state, 0, ROT0, "Konami", "Akuma-Jou Dracula (Japan version N)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp
index ccbb0bad2b6..aa7dda8b505 100644
--- a/src/mame/drivers/headonb.cpp
+++ b/src/mame/drivers/headonb.cpp
@@ -157,7 +157,7 @@ static GFXDECODE_START( headonb )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( headonb, headonb_state )
+static MACHINE_CONFIG_START( headonb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080A, XTAL_20MHz / 10) // divider guessed
@@ -205,4 +205,4 @@ ROM_START( headonb )
ROM_END
-GAME( 1979, headonb, headon, headonb, headonb, driver_device, 0, ROT0, "bootleg (EFG Sanremo)", "Head On (bootleg on dedicated hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headonb, headon, headonb, headonb, headonb_state, 0, ROT0, "bootleg (EFG Sanremo)", "Head On (bootleg on dedicated hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp
index 7b990ed4edd..c99902e50e3 100644
--- a/src/mame/drivers/hec2hrp.cpp
+++ b/src/mame/drivers/hec2hrp.cpp
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( hec2mdhrx_io , AS_IO, 8, hec2hrp_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// Minidisc commands and changing the rom page !*/
- AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("wd179x", fd1793_t, read, write)
+ AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("wd179x", fd1793_device, read, write)
AM_RANGE(0x08, 0x08) AM_WRITE(minidisc_control_w)
AM_RANGE(0x0f0,0x0ff) AM_READWRITE(hector_io_8255_r, hector_io_8255_w )
ADDRESS_MAP_END
@@ -401,7 +401,7 @@ SLOT_INTERFACE_END
/******************************************************************************/
-static MACHINE_CONFIG_START( hec2hr, hec2hrp_state )
+static MACHINE_CONFIG_START( hec2hr )
/******************************************************************************/
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
@@ -436,7 +436,7 @@ static MACHINE_CONFIG_START( hec2hr, hec2hrp_state )
MACHINE_CONFIG_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( hec2hrp, hec2hrp_state )
+static MACHINE_CONFIG_START( hec2hrp )
/*****************************************************************************/
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
@@ -475,7 +475,7 @@ static SLOT_INTERFACE_START( hector_floppies )
SLOT_INTERFACE_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state )
+static MACHINE_CONFIG_START( hec2mx40 )
/*****************************************************************************/
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
@@ -519,7 +519,7 @@ static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state )
MACHINE_CONFIG_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state )
+static MACHINE_CONFIG_START( hec2hrx )
/*****************************************************************************/
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
@@ -563,7 +563,7 @@ static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state )
MACHINE_CONFIG_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state )
+static MACHINE_CONFIG_START( hec2mdhrx )
/*****************************************************************************/
// minidisc
/* basic machine hardware */
@@ -605,7 +605,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state )
MACHINE_CONFIG_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( hec2mx80, hec2hrp_state )
+static MACHINE_CONFIG_START( hec2mx80 )
/*****************************************************************************/
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_5MHz)
@@ -726,11 +726,11 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP(1983, hec2hrp, 0, interact, hec2hrp, hec2hrp, driver_device,0, "Micronique", "Hector 2HR+", MACHINE_IMPERFECT_SOUND)
-COMP(1980, victor, hec2hrp, 0, hec2hrp, hec2hrp, driver_device,0, "Micronique", "Victor", MACHINE_IMPERFECT_SOUND)
-COMP(1983, hec2hr, hec2hrp, 0, hec2hr, hec2hrp, driver_device,0, "Micronique", "Hector 2HR", MACHINE_IMPERFECT_SOUND)
-COMP(1984, hec2hrx, hec2hrp, 0, hec2hrx, hec2hrp, driver_device,0, "Micronique", "Hector HRX + Disc2", MACHINE_IMPERFECT_SOUND)
-COMP(1985, hec2mdhrx, hec2hrp, 0, hec2mdhrx, hec2hrp, driver_device,0, "Micronique", "Hector HRX + mini Disc" , MACHINE_IMPERFECT_SOUND)
-COMP(1985, hec2mx80, hec2hrp, 0, hec2mx80, hec2hrp, driver_device,0, "Micronique", "Hector MX 80c + Disc2" , MACHINE_IMPERFECT_SOUND)
-COMP(1985, hec2mx40, hec2hrp, 0, hec2mx40, hec2hrp, driver_device,0, "Micronique", "Hector MX 40c + Disc2" , MACHINE_IMPERFECT_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP(1983, hec2hrp, 0, interact, hec2hrp, hec2hrp, hec2hrp_state, 0, "Micronique", "Hector 2HR+", MACHINE_IMPERFECT_SOUND)
+COMP(1980, victor, hec2hrp, 0, hec2hrp, hec2hrp, hec2hrp_state, 0, "Micronique", "Victor", MACHINE_IMPERFECT_SOUND)
+COMP(1983, hec2hr, hec2hrp, 0, hec2hr, hec2hrp, hec2hrp_state, 0, "Micronique", "Hector 2HR", MACHINE_IMPERFECT_SOUND)
+COMP(1984, hec2hrx, hec2hrp, 0, hec2hrx, hec2hrp, hec2hrp_state, 0, "Micronique", "Hector HRX + Disc2", MACHINE_IMPERFECT_SOUND)
+COMP(1985, hec2mdhrx, hec2hrp, 0, hec2mdhrx, hec2hrp, hec2hrp_state, 0, "Micronique", "Hector HRX + mini Disc", MACHINE_IMPERFECT_SOUND)
+COMP(1985, hec2mx80, hec2hrp, 0, hec2mx80, hec2hrp, hec2hrp_state, 0, "Micronique", "Hector MX 80c + Disc2", MACHINE_IMPERFECT_SOUND)
+COMP(1985, hec2mx40, hec2hrp, 0, hec2mx40, hec2hrp, hec2hrp_state, 0, "Micronique", "Hector MX 40c + Disc2", MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp
index 76c8ebf933f..6af765a64a1 100644
--- a/src/mame/drivers/hexion.cpp
+++ b/src/mame/drivers/hexion.cpp
@@ -239,7 +239,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hexion_state::scanline)
}
-static MACHINE_CONFIG_START( hexion, hexion_state )
+static MACHINE_CONFIG_START( hexion )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* Z80B 6 MHz @ 17F, xtal verified, divider not verified */
@@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( hexion, hexion_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* MSM6295GS @ 5E, clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* MSM6295GS @ 5E, clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_K051649_ADD("k051649", XTAL_24MHz/16) /* KONAMI 051649 // 2212P003 // JAPAN 8910EAJ @ 1D, xtal verified, divider not verified */
@@ -279,7 +279,7 @@ static MACHINE_CONFIG_DERIVED( hexionb, hexion )
MCFG_DEVICE_REMOVE("k051649")
- MCFG_OKIM6295_ADD("oki2", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -337,5 +337,5 @@ ROM_START( hexionb )
//PAL20L10 @U31
ROM_END
-GAME( 1992, hexion, 0, hexion, hexion, driver_device, 0, ROT0, "Konami", "Hexion (Japan ver JAB)", 0 )
-GAME( 1992, hexionb,hexion, hexionb,hexion, driver_device, 0, ROT0, "bootleg (Impeuropex Corp.)", "Hexion (Asia ver AAA, bootleg)", 0 ) // we're missing an original Asia AAA
+GAME( 1992, hexion, 0, hexion, hexion, hexion_state, 0, ROT0, "Konami", "Hexion (Japan ver JAB)", 0 )
+GAME( 1992, hexionb,hexion, hexionb,hexion, hexion_state, 0, ROT0, "bootleg (Impeuropex Corp.)", "Hexion (Asia ver AAA, bootleg)", 0 ) // we're missing an original Asia AAA
diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp
index 015d56c7ddd..f8e76bb0271 100644
--- a/src/mame/drivers/hh_amis2k.cpp
+++ b/src/mame/drivers/hh_amis2k.cpp
@@ -305,7 +305,7 @@ static const u8 wildfire_7seg_table[0x10] =
};
-static MACHINE_CONFIG_START( wildfire, wildfire_state )
+static MACHINE_CONFIG_START( wildfire )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", AMI_S2152, MASTER_CLOCK)
@@ -343,4 +343,4 @@ ROM_START( wildfire )
ROM_END
-CONS( 1979, wildfire, 0, 0, wildfire, wildfire, driver_device, 0, "Parker Brothers", "Wildfire (patent)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) // note: pretty sure that it matches the commercial release
+CONS( 1979, wildfire, 0, 0, wildfire, wildfire, wildfire_state, 0, "Parker Brothers", "Wildfire (patent)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) // note: pretty sure that it matches the commercial release
diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp
index ad3e8489e5b..cc0ac93d298 100644
--- a/src/mame/drivers/hh_cop400.cpp
+++ b/src/mame/drivers/hh_cop400.cpp
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( ctstein )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Blue Button")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ctstein, ctstein_state )
+static MACHINE_CONFIG_START( ctstein )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF
@@ -443,7 +443,7 @@ static INPUT_PORTS_START( h2hbaskb )
PORT_CONFSETTING( 0x0c, "Soccer" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( h2hbaskb, h2hbaskb_state )
+static MACHINE_CONFIG_START( h2hbaskb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP420, 850000) // approximation - RC osc. R=43K, C=101pF
@@ -555,7 +555,7 @@ static INPUT_PORTS_START( einvaderc )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( einvaderc, einvaderc_state )
+static MACHINE_CONFIG_START( einvaderc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP444L, 900000) // approximation - RC osc. R=47K, C=100pF
@@ -716,7 +716,7 @@ void lchicken_state::machine_start()
save_item(NAME(m_motor_pos));
}
-static MACHINE_CONFIG_START( lchicken, lchicken_state )
+static MACHINE_CONFIG_START( lchicken )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP421, 850000) // approximation - RC osc. R=12K, C=100pF
@@ -826,7 +826,7 @@ static INPUT_PORTS_START( funjacks )
PORT_CONFSETTING( 0x08, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( funjacks, funjacks_state )
+static MACHINE_CONFIG_START( funjacks )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=47K, C=56pF
@@ -921,7 +921,7 @@ INPUT_CHANGED_MEMBER(funrlgl_state::reset_button)
m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( funrlgl, funrlgl_state )
+static MACHINE_CONFIG_START( funrlgl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=91pF
@@ -1057,7 +1057,7 @@ static INPUT_PORTS_START( mdallas )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_CODE(KEYCODE_W) PORT_NAME("North") // N
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mdallas, mdallas_state )
+static MACHINE_CONFIG_START( mdallas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP444L, 1000000) // approximation - RC osc. R=57K, C=101pF
@@ -1141,7 +1141,7 @@ static INPUT_PORTS_START( plus1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( plus1, plus1_state )
+static MACHINE_CONFIG_START( plus1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP410, 1000000) // approximation - RC osc. R=51K, C=100pF
@@ -1269,7 +1269,7 @@ static INPUT_PORTS_START( lightfgt )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_COCKTAIL
INPUT_PORTS_END
-static MACHINE_CONFIG_START( lightfgt, lightfgt_state )
+static MACHINE_CONFIG_START( lightfgt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP421, 950000) // approximation - RC osc. R=82K, C=56pF
@@ -1423,7 +1423,7 @@ base pulled high with 4.7K resistor, connects directly to G3, 1K resistor to G2,
*/
-static MACHINE_CONFIG_START( bship82, bship82_state )
+static MACHINE_CONFIG_START( bship82 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP420, 750000) // approximation - RC osc. R=14K, C=100pF
@@ -1555,7 +1555,7 @@ static INPUT_PORTS_START( qkracer )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_CODE(KEYCODE_R) PORT_NAME("Tables")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( qkracer, qkracer_state )
+static MACHINE_CONFIG_START( qkracer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", COP420, 1000000) // approximation - RC osc. R=47K, C=100pF
@@ -1652,24 +1652,24 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1979, ctstein, 0, 0, ctstein, ctstein, driver_device, 0, "Castle Toy", "Einstein (Castle Toy)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS
+CONS( 1979, ctstein, 0, 0, ctstein, ctstein, ctstein_state, 0, "Castle Toy", "Einstein (Castle Toy)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, h2hbaskb, 0, 0, h2hbaskb, h2hbaskb, driver_device, 0, "Coleco", "Head to Head Basketball/Hockey/Soccer (COP420L version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, h2hbaskb, 0, 0, h2hbaskb, h2hbaskb, h2hbaskb_state, 0, "Coleco", "Head to Head Basketball/Hockey/Soccer (COP420L version)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, einvaderc, einvader, 0, einvaderc, einvaderc, driver_device, 0, "Entex", "Space Invader (Entex, COP444L version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, einvaderc, einvader, 0, einvaderc, einvaderc, einvaderc_state, 0, "Entex", "Space Invader (Entex, COP444L version)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, lchicken, 0, 0, lchicken, lchicken, driver_device, 0, "LJN", "I Took a Lickin' From a Chicken", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_MECHANICAL )
+CONS( 1980, lchicken, 0, 0, lchicken, lchicken, lchicken_state, 0, "LJN", "I Took a Lickin' From a Chicken", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_MECHANICAL )
-CONS( 1979, funjacks, 0, 0, funjacks, funjacks, driver_device, 0, "Mattel", "Funtronics Jacks", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, funrlgl, 0, 0, funrlgl, funrlgl, driver_device, 0, "Mattel", "Funtronics Red Light Green Light", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, mdallas, 0, 0, mdallas, mdallas, driver_device, 0, "Mattel", "Dalla$ (J.R. handheld)", MACHINE_SUPPORTS_SAVE ) // ***
+CONS( 1979, funjacks, 0, 0, funjacks, funjacks, funjacks_state, 0, "Mattel", "Funtronics Jacks", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, funrlgl, 0, 0, funrlgl, funrlgl, funrlgl_state, 0, "Mattel", "Funtronics Red Light Green Light", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, mdallas, 0, 0, mdallas, mdallas, mdallas_state, 0, "Mattel", "Dalla$ (J.R. handheld)", MACHINE_SUPPORTS_SAVE ) // ***
-CONS( 1980, plus1, 0, 0, plus1, plus1, driver_device, 0, "Milton Bradley", "Plus One", MACHINE_SUPPORTS_SAVE ) // ***
-CONS( 1981, lightfgt, 0, 0, lightfgt, lightfgt, driver_device, 0, "Milton Bradley", "Lightfight", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1982, bship82, bship, 0, bship82, bship82, driver_device, 0, "Milton Bradley", "Electronic Battleship (1982 version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
+CONS( 1980, plus1, 0, 0, plus1, plus1, plus1_state, 0, "Milton Bradley", "Plus One", MACHINE_SUPPORTS_SAVE ) // ***
+CONS( 1981, lightfgt, 0, 0, lightfgt, lightfgt, lightfgt_state, 0, "Milton Bradley", "Lightfight", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1982, bship82, bship, 0, bship82, bship82, bship82_state, 0, "Milton Bradley", "Electronic Battleship (1982 version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
-CONS( 1978, qkracer, 0, 0, qkracer, qkracer, driver_device, 0, "National Semiconductor", "QuizKid Racer (COP420 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+CONS( 1978, qkracer, 0, 0, qkracer, qkracer, qkracer_state, 0, "National Semiconductor", "QuizKid Racer (COP420 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
// ***: As far as MAME is concerned, the game is emulated fine. But for it to be playable, it requires interaction
// with other, unemulatable, things eg. game board/pieces, playing cards, pen & paper, etc.
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index eb57472b7ff..ad9e195bf36 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -385,7 +385,7 @@ public:
WRITE8_MEMBER(bambball_state::plate_w)
{
// R1x-R3x(,D0-D3): vfd matrix plate
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
// update display
@@ -405,7 +405,7 @@ WRITE16_MEMBER(bambball_state::grid_w)
m_grid = data >> 7 & 0x1ff;
// D0-D3: more plates (update display there)
- plate_w(space, 3 + HMCS40_PORT_R1X, data & 0xf);
+ plate_w(space, 3 + hmcs40_cpu_device::PORT_R1X, data & 0xf);
}
READ8_MEMBER(bambball_state::input_r)
@@ -444,7 +444,7 @@ static INPUT_PORTS_START( bambball )
PORT_CONFSETTING( 0x00, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bambball, bambball_state )
+static MACHINE_CONFIG_START( bambball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation
@@ -506,7 +506,7 @@ void bmboxing_state::prepare_display()
WRITE8_MEMBER(bmboxing_state::plate_w)
{
// R1x-R3x: vfd matrix plate
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
prepare_display();
}
@@ -580,7 +580,7 @@ static INPUT_PORTS_START( bmboxing )
PORT_BIT( 0xfff8, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bmboxing, bmboxing_state )
+static MACHINE_CONFIG_START( bmboxing )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation
@@ -705,7 +705,7 @@ INPUT_CHANGED_MEMBER(bfriskyt_state::input_changed)
update_int1();
}
-static MACHINE_CONFIG_START( bfriskyt, bfriskyt_state )
+static MACHINE_CONFIG_START( bfriskyt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -815,7 +815,7 @@ static INPUT_PORTS_START( packmon )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( packmon, packmon_state )
+static MACHINE_CONFIG_START( packmon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -950,7 +950,7 @@ INPUT_CHANGED_MEMBER(msthawk_state::input_changed)
update_int0();
}
-static MACHINE_CONFIG_START( msthawk, msthawk_state )
+static MACHINE_CONFIG_START( msthawk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -1071,7 +1071,7 @@ INPUT_CHANGED_MEMBER(bzaxxon_state::input_changed)
update_int1();
}
-static MACHINE_CONFIG_START( bzaxxon, bzaxxon_state )
+static MACHINE_CONFIG_START( bzaxxon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation
@@ -1187,7 +1187,7 @@ INPUT_CHANGED_MEMBER(zackman_state::input_changed)
update_int0();
}
-static MACHINE_CONFIG_START( zackman, zackman_state )
+static MACHINE_CONFIG_START( zackman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -1314,7 +1314,7 @@ INPUT_CHANGED_MEMBER(bpengo_state::input_changed)
update_int0();
}
-static MACHINE_CONFIG_START( bpengo, bpengo_state )
+static MACHINE_CONFIG_START( bpengo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -1439,7 +1439,7 @@ INPUT_CHANGED_MEMBER(bbtime_state::input_changed)
update_int0();
}
-static MACHINE_CONFIG_START( bbtime, bbtime_state )
+static MACHINE_CONFIG_START( bbtime )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -1539,7 +1539,7 @@ static INPUT_PORTS_START( bdoramon )
PORT_CONFSETTING( 0x08, DEF_STR( On ) )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bdoramon, bdoramon_state )
+static MACHINE_CONFIG_START( bdoramon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -1632,7 +1632,7 @@ static INPUT_PORTS_START( bultrman )
PORT_BIT( 0xff8f, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bultrman, bultrman_state )
+static MACHINE_CONFIG_START( bultrman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 350000) // approximation
@@ -1693,7 +1693,7 @@ void machiman_state::prepare_display()
WRITE8_MEMBER(machiman_state::plate_w)
{
// R0x-R3x,R6012: vfd matrix plate
- int shift = (offset == HMCS40_PORT_R6X) ? 16 : offset * 4;
+ int shift = (offset == hmcs40_cpu_device::PORT_R6X) ? 16 : offset * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
prepare_display();
}
@@ -1721,7 +1721,7 @@ static INPUT_PORTS_START( machiman )
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( machiman, machiman_state )
+static MACHINE_CONFIG_START( machiman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -1788,7 +1788,7 @@ public:
WRITE8_MEMBER(pairmtch_state::plate_w)
{
// R2x,R3x,R6x: vfd matrix plate
- int shift = (offset == HMCS40_PORT_R6X) ? 8 : (offset-2) * 4;
+ int shift = (offset == hmcs40_cpu_device::PORT_R6X) ? 8 : (offset-2) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
display_matrix(12, 6, m_plate, m_grid);
}
@@ -1871,7 +1871,7 @@ static INPUT_PORTS_START( pairmtch )
PORT_BIT( 0x86bf, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pairmtch, pairmtch_state )
+static MACHINE_CONFIG_START( pairmtch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -1993,7 +1993,7 @@ static INPUT_PORTS_START( alnattck )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Fire")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( alnattck, alnattck_state )
+static MACHINE_CONFIG_START( alnattck )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -2120,7 +2120,7 @@ void cdkong_state::machine_start()
save_item(NAME(m_speaker_volume));
}
-static MACHINE_CONFIG_START( cdkong, cdkong_state )
+static MACHINE_CONFIG_START( cdkong )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -2196,11 +2196,11 @@ void cgalaxn_state::prepare_display()
WRITE8_MEMBER(cgalaxn_state::grid_w)
{
// R10,R11: input mux
- if (offset == HMCS40_PORT_R1X)
+ if (offset == hmcs40_cpu_device::PORT_R1X)
m_inp_mux = data & 3;
// R1x-R3x: vfd matrix grid
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_grid = (m_grid & ~(0xf << shift)) | (data << shift);
prepare_display();
}
@@ -2253,7 +2253,7 @@ INPUT_CHANGED_MEMBER(cgalaxn_state::player_switch)
prepare_display();
}
-static MACHINE_CONFIG_START( cgalaxn, cgalaxn_state )
+static MACHINE_CONFIG_START( cgalaxn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -2319,7 +2319,7 @@ public:
WRITE8_MEMBER(cpacman_state::plate_w)
{
// R1x-R6x(,D1,D2): vfd matrix plate
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
// update display
@@ -2340,7 +2340,7 @@ WRITE16_MEMBER(cpacman_state::grid_w)
m_grid = data >> 5 & 0x7ff;
// D1,D2: plate 8,14 (update display there)
- plate_w(space, 6 + HMCS40_PORT_R1X, data >> 1 & 3);
+ plate_w(space, 6 + hmcs40_cpu_device::PORT_R1X, data >> 1 & 3);
}
READ8_MEMBER(cpacman_state::input_r)
@@ -2372,7 +2372,7 @@ static INPUT_PORTS_START( cpacman )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cpacman, cpacman_state )
+static MACHINE_CONFIG_START( cpacman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -2436,7 +2436,7 @@ public:
WRITE8_MEMBER(cmspacmn_state::plate_w)
{
// R1x-R6x(,D0,D1): vfd matrix plate
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
// update display
@@ -2457,7 +2457,7 @@ WRITE16_MEMBER(cmspacmn_state::grid_w)
m_grid = data >> 5 & 0x7ff;
// D0,D1: more plates (update display there)
- plate_w(space, 6 + HMCS40_PORT_R1X, data & 3);
+ plate_w(space, 6 + hmcs40_cpu_device::PORT_R1X, data & 3);
}
READ8_MEMBER(cmspacmn_state::input_r)
@@ -2489,7 +2489,7 @@ static INPUT_PORTS_START( cmspacmn )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cmspacmn, cmspacmn_state )
+static MACHINE_CONFIG_START( cmspacmn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -2636,7 +2636,7 @@ static INPUT_PORTS_START( sag )
PORT_CONFSETTING( 0x02, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sag, sag_state )
+static MACHINE_CONFIG_START( sag )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation
@@ -2707,7 +2707,7 @@ WRITE16_MEMBER(egalaxn2_state::grid_w)
WRITE8_MEMBER(egalaxn2_state::plate_w)
{
// R1x-R6x: vfd matrix plate
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
prepare_display();
}
@@ -2751,7 +2751,7 @@ static INPUT_PORTS_START( egalaxn2 )
PORT_CONFSETTING( 0x04, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( egalaxn2, egalaxn2_state )
+static MACHINE_CONFIG_START( egalaxn2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -3000,7 +3000,7 @@ void eturtles_state::machine_start()
save_item(NAME(m_cop_irq));
}
-static MACHINE_CONFIG_START( eturtles, eturtles_state )
+static MACHINE_CONFIG_START( eturtles )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -3110,7 +3110,7 @@ static INPUT_PORTS_START( estargte )
PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( estargte, estargte_state )
+static MACHINE_CONFIG_START( estargte )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -3236,7 +3236,7 @@ static INPUT_PORTS_START( ghalien )
PORT_CONFSETTING( 0x8000, "Professional" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ghalien, ghalien_state )
+static MACHINE_CONFIG_START( ghalien )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -3363,7 +3363,7 @@ INPUT_CHANGED_MEMBER(gckong_state::input_changed)
update_int1();
}
-static MACHINE_CONFIG_START( gckong, gckong_state )
+static MACHINE_CONFIG_START( gckong )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -3482,7 +3482,7 @@ INPUT_CHANGED_MEMBER(gdigdug_state::input_changed)
update_int1();
}
-static MACHINE_CONFIG_START( gdigdug, gdigdug_state )
+static MACHINE_CONFIG_START( gdigdug )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -3551,7 +3551,7 @@ void mwcbaseb_state::prepare_display()
WRITE8_MEMBER(mwcbaseb_state::plate_w)
{
// R1x-R3x,R6x: vfd matrix plate
- int shift = (offset == HMCS40_PORT_R6X) ? 12 : (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset == hmcs40_cpu_device::PORT_R6X) ? 12 : (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
prepare_display();
}
@@ -3644,7 +3644,7 @@ INPUT_PORTS_END
static const s16 mwcbaseb_speaker_levels[] = { 0, 0x3fff, -0x4000, 0, -0x4000, 0, -0x8000, -0x4000 };
-static MACHINE_CONFIG_START( mwcbaseb, mwcbaseb_state )
+static MACHINE_CONFIG_START( mwcbaseb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -3732,7 +3732,7 @@ static INPUT_PORTS_START( pbqbert )
PORT_BIT( 0xe1ff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pbqbert, pbqbert_state )
+static MACHINE_CONFIG_START( pbqbert )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38820, 400000) // approximation
@@ -3857,7 +3857,7 @@ INPUT_CHANGED_MEMBER(kingman_state::input_changed)
update_int0();
}
-static MACHINE_CONFIG_START( kingman, kingman_state )
+static MACHINE_CONFIG_START( kingman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -3978,7 +3978,7 @@ INPUT_CHANGED_MEMBER(tmtron_state::input_changed)
update_int1();
}
-static MACHINE_CONFIG_START( tmtron, tmtron_state )
+static MACHINE_CONFIG_START( tmtron )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
@@ -4035,7 +4035,7 @@ public:
WRITE8_MEMBER(vinvader_state::plate_w)
{
// R1x-R3x(,D4-D6): vfd matrix plate
- int shift = (offset - HMCS40_PORT_R1X) * 4;
+ int shift = (offset - hmcs40_cpu_device::PORT_R1X) * 4;
m_plate = (m_plate & ~(0xf << shift)) | (data << shift);
// update display
@@ -4052,7 +4052,7 @@ WRITE16_MEMBER(vinvader_state::grid_w)
m_grid = data >> 7 & 0x1ff;
// D4-D6: more plates (update display there)
- plate_w(space, 3 + HMCS40_PORT_R1X, data >> 4 & 7);
+ plate_w(space, 3 + hmcs40_cpu_device::PORT_R1X, data >> 4 & 7);
}
@@ -4072,7 +4072,7 @@ static INPUT_PORTS_START( vinvader )
PORT_BIT( 0xfff5, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( vinvader, vinvader_state )
+static MACHINE_CONFIG_START( vinvader )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD38750, 400000) // approximation
@@ -4454,47 +4454,47 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1979, bambball, 0, 0, bambball, bambball, driver_device, 0, "Bambino", "Dribble Away Basketball", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, bmboxing, 0, 0, bmboxing, bmboxing, driver_device, 0, "Bambino", "Knock-Em Out Boxing", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
+CONS( 1979, bambball, 0, 0, bambball, bambball, bambball_state, 0, "Bambino", "Dribble Away Basketball", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, bmboxing, 0, 0, bmboxing, bmboxing, bmboxing_state, 0, "Bambino", "Knock-Em Out Boxing", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, bfriskyt, 0, 0, bfriskyt, bfriskyt, driver_device, 0, "Bandai", "Frisky Tom (Bandai)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, packmon, 0, 0, packmon, packmon, driver_device, 0, "Bandai", "Packri Monster", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, msthawk, 0, 0, msthawk, msthawk, driver_device, 0, "Bandai (Mattel license)", "Star Hawk (Mattel)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, bzaxxon, 0, 0, bzaxxon, bzaxxon, driver_device, 0, "Bandai", "Zaxxon (Bandai)", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, zackman, 0, 0, zackman, zackman, driver_device, 0, "Bandai", "Zackman", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, bpengo, 0, 0, bpengo, bpengo, driver_device, 0, "Bandai", "Pengo (Bandai)", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, bbtime, 0, 0, bbtime, bbtime, driver_device, 0, "Bandai", "Burger Time (Bandai)", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, bdoramon, 0, 0, bdoramon, bdoramon, driver_device, 0, "Bandai", "Dokodemo Dorayaki Doraemon", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, bultrman, 0, 0, bultrman, bultrman, driver_device, 0, "Bandai", "Ultraman Monster Battle", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, machiman, 0, 0, machiman, machiman, driver_device, 0, "Bandai", "Machine Man", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, pairmtch, 0, 0, pairmtch, pairmtch, driver_device, 0, "Bandai", "Pair Match", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, bfriskyt, 0, 0, bfriskyt, bfriskyt, bfriskyt_state, 0, "Bandai", "Frisky Tom (Bandai)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, packmon, 0, 0, packmon, packmon, packmon_state, 0, "Bandai", "Packri Monster", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, msthawk, 0, 0, msthawk, msthawk, msthawk_state, 0, "Bandai (Mattel license)", "Star Hawk (Mattel)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, bzaxxon, 0, 0, bzaxxon, bzaxxon, bzaxxon_state, 0, "Bandai", "Zaxxon (Bandai)", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, zackman, 0, 0, zackman, zackman, zackman_state, 0, "Bandai", "Zackman", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, bpengo, 0, 0, bpengo, bpengo, bpengo_state, 0, "Bandai", "Pengo (Bandai)", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, bbtime, 0, 0, bbtime, bbtime, bbtime_state, 0, "Bandai", "Burger Time (Bandai)", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, bdoramon, 0, 0, bdoramon, bdoramon, bdoramon_state, 0, "Bandai", "Dokodemo Dorayaki Doraemon", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, bultrman, 0, 0, bultrman, bultrman, bultrman_state, 0, "Bandai", "Ultraman Monster Battle", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, machiman, 0, 0, machiman, machiman, machiman_state, 0, "Bandai", "Machine Man", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, pairmtch, 0, 0, pairmtch, pairmtch, pairmtch_state, 0, "Bandai", "Pair Match", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, alnattck, 0, 0, alnattck, alnattck, driver_device, 0, "Coleco", "Alien Attack", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, cdkong, 0, 0, cdkong, cdkong, driver_device, 0, "Coleco", "Donkey Kong (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-CONS( 1982, cgalaxn, 0, 0, cgalaxn, cgalaxn, driver_device, 0, "Coleco", "Galaxian (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-CONS( 1981, cpacman, 0, 0, cpacman, cpacman, driver_device, 0, "Coleco", "Pac-Man (Coleco, Rev. 29)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, cpacmanr1, cpacman, 0, cpacman, cpacman, driver_device, 0, "Coleco", "Pac-Man (Coleco, Rev. 28)", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, cmspacmn, 0, 0, cmspacmn, cmspacmn, driver_device, 0, "Coleco", "Ms. Pac-Man (Coleco)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, alnattck, 0, 0, alnattck, alnattck, alnattck_state, 0, "Coleco", "Alien Attack", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, cdkong, 0, 0, cdkong, cdkong, cdkong_state, 0, "Coleco", "Donkey Kong (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+CONS( 1982, cgalaxn, 0, 0, cgalaxn, cgalaxn, cgalaxn_state, 0, "Coleco", "Galaxian (Coleco)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+CONS( 1981, cpacman, 0, 0, cpacman, cpacman, cpacman_state, 0, "Coleco", "Pac-Man (Coleco, Rev. 29)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, cpacmanr1, cpacman, 0, cpacman, cpacman, cpacman_state, 0, "Coleco", "Pac-Man (Coleco, Rev. 28)", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, cmspacmn, 0, 0, cmspacmn, cmspacmn, cmspacmn_state, 0, "Coleco", "Ms. Pac-Man (Coleco)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, sag_si2, 0, 0, sag, sag, driver_device, 0, "Entex", "Select-A-Game: Space Invader 2", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING ) // suspect bad dump
-CONS( 1981, sag_bb4, 0, 0, sag, sag, driver_device, 0, "Entex", "Select-A-Game: Baseball 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, sag_pb, 0, 0, sag, sag, driver_device, 0, "Entex", "Select-A-Game: Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, egalaxn2, 0, 0, egalaxn2, egalaxn2, driver_device, 0, "Entex", "Galaxian 2 (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, epacman2, 0, 0, epacman2, epacman2, driver_device, 0, "Entex", "Pac Man 2 (Entex, cyan Pacman)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, epacman2r, epacman2, 0, epacman2, epacman2, driver_device, 0, "Entex", "Pac Man 2 (Entex, red Pacman)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, estargte, 0, 0, estargte, estargte, driver_device, 0, "Entex", "Stargate (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, eturtles, 0, 0, eturtles, eturtles, driver_device, 0, "Entex", "Turtles (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, sag_si2, 0, 0, sag, sag, sag_state, 0, "Entex", "Select-A-Game: Space Invader 2", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING ) // suspect bad dump
+CONS( 1981, sag_bb4, 0, 0, sag, sag, sag_state, 0, "Entex", "Select-A-Game: Baseball 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, sag_pb, 0, 0, sag, sag, sag_state, 0, "Entex", "Select-A-Game: Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, egalaxn2, 0, 0, egalaxn2, egalaxn2, egalaxn2_state, 0, "Entex", "Galaxian 2 (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, epacman2, 0, 0, epacman2, epacman2, egalaxn2_state, 0, "Entex", "Pac Man 2 (Entex, cyan Pacman)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, epacman2r, epacman2, 0, epacman2, epacman2, egalaxn2_state, 0, "Entex", "Pac Man 2 (Entex, red Pacman)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, estargte, 0, 0, estargte, estargte, estargte_state, 0, "Entex", "Stargate (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, eturtles, 0, 0, eturtles, eturtles, eturtles_state, 0, "Entex", "Turtles (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, ghalien, 0, 0, ghalien, ghalien, driver_device, 0, "Gakken", "Heiankyo Alien (Gakken)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, gckong, 0, 0, gckong, gckong, driver_device, 0, "Gakken", "Crazy Kong (Gakken)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-CONS( 1983, gdigdug, 0, 0, gdigdug, gdigdug, driver_device, 0, "Gakken", "Dig Dug (Gakken)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, ghalien, 0, 0, ghalien, ghalien, ghalien_state, 0, "Gakken", "Heiankyo Alien (Gakken)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, gckong, 0, 0, gckong, gckong, gckong_state, 0, "Gakken", "Crazy Kong (Gakken)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1983, gdigdug, 0, 0, gdigdug, gdigdug, gdigdug_state, 0, "Gakken", "Dig Dug (Gakken)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, mwcbaseb, 0, 0, mwcbaseb, mwcbaseb, driver_device, 0, "Mattel", "World Championship Baseball", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, mwcbaseb, 0, 0, mwcbaseb, mwcbaseb, mwcbaseb_state, 0, "Mattel", "World Championship Baseball", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, pbqbert, 0, 0, pbqbert, pbqbert, driver_device, 0, "Parker Brothers", "Q*Bert (Parker Brothers)", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, pbqbert, 0, 0, pbqbert, pbqbert, pbqbert_state, 0, "Parker Brothers", "Q*Bert (Parker Brothers)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, kingman, 0, 0, kingman, kingman, driver_device, 0, "Tomy", "Kingman", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, tmtron, 0, 0, tmtron, tmtron, driver_device, 0, "Tomy", "Tron (Tomy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, kingman, 0, 0, kingman, kingman, kingman_state, 0, "Tomy", "Kingman", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, tmtron, 0, 0, tmtron, tmtron, tmtron_state, 0, "Tomy", "Tron (Tomy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, vinvader, 0, 0, vinvader, vinvader, driver_device, 0, "VTech", "Invaders (VTech)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, vinvader, 0, 0, vinvader, vinvader, vinvader_state, 0, "VTech", "Invaders (VTech)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp
index 5e2f507835c..96208e0749b 100644
--- a/src/mame/drivers/hh_melps4.cpp
+++ b/src/mame/drivers/hh_melps4.cpp
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( cfrogger )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_melps4_state, reset_button, nullptr)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cfrogger, cfrogger_state )
+static MACHINE_CONFIG_START( cfrogger )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M58846, XTAL_600kHz)
@@ -426,7 +426,7 @@ static INPUT_PORTS_START( gjungler )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_melps4_state, reset_button, nullptr)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( gjungler, gjungler_state )
+static MACHINE_CONFIG_START( gjungler )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M58846, XTAL_600kHz)
@@ -481,7 +481,7 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1981, cfrogger, 0, 0, cfrogger, cfrogger, driver_device, 0, "Coleco", "Frogger (Coleco)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1981, cfrogger, 0, 0, cfrogger, cfrogger, cfrogger_state, 0, "Coleco", "Frogger (Coleco)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, gjungler, 0, 0, gjungler, gjungler, driver_device, 0, "Gakken / Konami", "Jungler (Gakken)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, gjungler, 0, 0, gjungler, gjungler, gjungler_state, 0, "Gakken / Konami", "Jungler (Gakken)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index d3473d5b669..5cb7b846f80 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -375,7 +375,7 @@ INPUT_PORTS_END
static const s16 touchme_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( touchme, touchme_state )
+static MACHINE_CONFIG_START( touchme )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 300000) // approximation - RC osc. R=100K, C=47pF
@@ -484,7 +484,7 @@ INPUT_CHANGED_MEMBER(pabball_state::reset_button)
m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( pabball, pabball_state )
+static MACHINE_CONFIG_START( pabball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 1200000) // approximation - RC osc. R=18K, C=27pF
@@ -599,7 +599,7 @@ static INPUT_PORTS_START( melodym )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_CODE(KEYCODE_0) PORT_NAME("Note")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( melodym, melodym_state )
+static MACHINE_CONFIG_START( melodym )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation
@@ -699,7 +699,7 @@ INPUT_PORTS_END
static const s16 maniac_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( maniac, maniac_state )
+static MACHINE_CONFIG_START( maniac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=~13.4K, C=470pF
@@ -855,7 +855,7 @@ void leboom_state::machine_start()
save_item(NAME(m_speaker_volume));
}
-static MACHINE_CONFIG_START( leboom, leboom_state )
+static MACHINE_CONFIG_START( leboom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation
@@ -965,7 +965,7 @@ static INPUT_PORTS_START( tbaskb )
PORT_CONFSETTING( 0x00, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tbaskb, tbaskb_state )
+static MACHINE_CONFIG_START( tbaskb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=18K, C=47pF
@@ -1074,7 +1074,7 @@ INPUT_PORTS_END
static const s16 rockpin_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( rockpin, rockpin_state )
+static MACHINE_CONFIG_START( rockpin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1650, 450000) // approximation - RC osc. R=47K, C=47pF
@@ -1192,7 +1192,7 @@ static INPUT_PORTS_START( hccbaskb )
PORT_CONFSETTING( 0x00, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( hccbaskb, hccbaskb_state )
+static MACHINE_CONFIG_START( hccbaskb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 950000) // approximation - RC osc. R=15K, C=47pF
@@ -1344,7 +1344,7 @@ static INPUT_PORTS_START( ttfballa )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ttfball, ttfball_state )
+static MACHINE_CONFIG_START( ttfball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1655, 1000000) // approximation - RC osc. R=27K(set 1) or 33K(set 2), C=68pF
@@ -1448,7 +1448,7 @@ static INPUT_PORTS_START( uspbball )
PORT_CONFSETTING( 0x00, "2" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( uspbball, uspbball_state )
+static MACHINE_CONFIG_START( uspbball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1650, 1000000) // approximation - RC osc. R=22K, C=47pF
@@ -1583,7 +1583,7 @@ static INPUT_PORTS_START( us2pfball )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START ) PORT_NAME("Status/Score") // S
INPUT_PORTS_END
-static MACHINE_CONFIG_START( us2pfball, us2pfball_state )
+static MACHINE_CONFIG_START( us2pfball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PIC1650, 800000) // approximation - RC osc. R=39K, C=75pF
@@ -1690,24 +1690,24 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1979, touchme, 0, 0, touchme, touchme, driver_device, 0, "Atari", "Touch Me (handheld, Rev 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS
+CONS( 1979, touchme, 0, 0, touchme, touchme, touchme_state, 0, "Atari", "Touch Me (handheld, Rev 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, pabball, 0, 0, pabball, pabball, driver_device, 0, "Caprice / Calfax", "Pro-Action Baseball", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1979, pabball, 0, 0, pabball, pabball, pabball_state, 0, "Caprice / Calfax", "Pro-Action Baseball", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-CONS( 1980, melodym, 0, 0, melodym, melodym, driver_device, 0, "GAF", "Melody Madness", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, melodym, 0, 0, melodym, melodym, melodym_state, 0, "GAF", "Melody Madness", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, maniac, 0, 0, maniac, maniac, driver_device, 0, "Ideal", "Maniac", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, maniac, 0, 0, maniac, maniac, maniac_state, 0, "Ideal", "Maniac", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, leboom, 0, 0, leboom, leboom, driver_device, 0, "Lakeside", "Le Boom", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, leboom, 0, 0, leboom, leboom, leboom_state, 0, "Lakeside", "Le Boom", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, tbaskb, 0, 0, tbaskb, tbaskb, driver_device, 0, "Tandy Radio Shack", "Electronic Basketball (Tandy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, tbaskb, 0, 0, tbaskb, tbaskb, tbaskb_state, 0, "Tandy Radio Shack", "Electronic Basketball (Tandy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, rockpin, 0, 0, rockpin, rockpin, driver_device, 0, "Tiger Electronics", "Rocket Pinball", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, hccbaskb, 0, 0, hccbaskb, hccbaskb, driver_device, 0, "Tiger Electronics", "Half Court Computer Basketball", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, rockpin, 0, 0, rockpin, rockpin, rockpin_state, 0, "Tiger Electronics", "Rocket Pinball", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, hccbaskb, 0, 0, hccbaskb, hccbaskb, hccbaskb_state, 0, "Tiger Electronics", "Half Court Computer Basketball", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, ttfball, 0, 0, ttfball, ttfball, driver_device, 0, "Toytronic", "Football (Toytronic, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-CONS( 1979, ttfballa, ttfball, 0, ttfball, ttfballa, driver_device, 0, "Toytronic", "Football (Toytronic, set 2)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, ttfball, 0, 0, ttfball, ttfball, ttfball_state, 0, "Toytronic", "Football (Toytronic, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+CONS( 1979, ttfballa, ttfball, 0, ttfball, ttfballa, ttfball_state, 0, "Toytronic", "Football (Toytronic, set 2)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, uspbball, 0, 0, uspbball, uspbball, driver_device, 0, "U.S. Games", "Programmable Baseball", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-CONS( 1981, us2pfball, 0, 0, us2pfball, us2pfball, driver_device, 0, "U.S. Games", "Electronic 2-Player Football", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, uspbball, 0, 0, uspbball, uspbball, uspbball_state, 0, "U.S. Games", "Programmable Baseball", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1981, us2pfball, 0, 0, us2pfball, us2pfball, us2pfball_state, 0, "U.S. Games", "Electronic 2-Player Football", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hh_sm500.cpp b/src/mame/drivers/hh_sm500.cpp
index a61af09878d..3389ff41b47 100644
--- a/src/mame/drivers/hh_sm500.cpp
+++ b/src/mame/drivers/hh_sm500.cpp
@@ -98,7 +98,7 @@ public:
static INPUT_PORTS_START( nupogodi )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( nupogodi, nupogodi_state )
+static MACHINE_CONFIG_START( nupogodi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KB1013VK12, XTAL_32_768kHz)
@@ -126,5 +126,5 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1984, nupogodi, 0, 0, nupogodi, nupogodi, driver_device, 0, "Elektronika", "Nu, pogodi!", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME, FLAGS */
+CONS( 1984, nupogodi, 0, 0, nupogodi, nupogodi, nupogodi_state, 0, "Elektronika", "Nu, pogodi!", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index b989fe2dbf6..0c98fe57391 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -221,7 +221,7 @@ static INPUT_PORTS_START( ktopgun )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ktopgun, ktopgun_state )
+static MACHINE_CONFIG_START( ktopgun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
@@ -290,7 +290,7 @@ static INPUT_PORTS_START( kcontra )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( kcontra, kcontra_state )
+static MACHINE_CONFIG_START( kcontra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( ktmnt )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ktmnt, ktmnt_state )
+static MACHINE_CONFIG_START( ktmnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
@@ -421,7 +421,7 @@ static INPUT_PORTS_START( kgradius )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( kgradius, kgradius_state )
+static MACHINE_CONFIG_START( kgradius )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
@@ -484,7 +484,7 @@ static INPUT_PORTS_START( kloneran )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("All Clear")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( kloneran, kloneran_state )
+static MACHINE_CONFIG_START( kloneran )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
@@ -547,7 +547,7 @@ static INPUT_PORTS_START( dm53 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( dm53, dm53_state )
+static MACHINE_CONFIG_START( dm53 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
@@ -614,7 +614,7 @@ static INPUT_PORTS_START( jr55 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( jr55, jr55_state )
+static MACHINE_CONFIG_START( jr55 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
@@ -676,7 +676,7 @@ static INPUT_PORTS_START( ml102 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ml102, ml102_state )
+static MACHINE_CONFIG_START( ml102 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
@@ -757,7 +757,7 @@ static INPUT_PORTS_START( bx301 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_sm510_state, acl_button, nullptr) PORT_NAME("ACL")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bx301, bx301_state )
+static MACHINE_CONFIG_START( bx301 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
@@ -886,14 +886,14 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1989, ktopgun, 0, 0, ktopgun, ktopgun, driver_device, 0, "Konami", "Top Gun (handheld)", MACHINE_SUPPORTS_SAVE )
-CONS( 1989, kcontra, 0, 0, kcontra, kcontra, driver_device, 0, "Konami", "Contra (handheld)", MACHINE_SUPPORTS_SAVE )
-CONS( 1989, ktmnt, 0, 0, ktmnt, ktmnt, driver_device, 0, "Konami", "Teenage Mutant Ninja Turtles (handheld)", MACHINE_SUPPORTS_SAVE )
-CONS( 1989, kgradius, 0, 0, kgradius, kgradius, driver_device, 0, "Konami", "Gradius (handheld)", MACHINE_SUPPORTS_SAVE )
-CONS( 1989, kloneran, 0, 0, kloneran, kloneran, driver_device, 0, "Konami", "Lone Ranger (handheld)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME, FLAGS
+CONS( 1989, ktopgun, 0, 0, ktopgun, ktopgun, ktopgun_state, 0, "Konami", "Top Gun (handheld)", MACHINE_SUPPORTS_SAVE )
+CONS( 1989, kcontra, 0, 0, kcontra, kcontra, kcontra_state, 0, "Konami", "Contra (handheld)", MACHINE_SUPPORTS_SAVE )
+CONS( 1989, ktmnt, 0, 0, ktmnt, ktmnt, ktmnt_state, 0, "Konami", "Teenage Mutant Ninja Turtles (handheld)", MACHINE_SUPPORTS_SAVE )
+CONS( 1989, kgradius, 0, 0, kgradius, kgradius, kgradius_state, 0, "Konami", "Gradius (handheld)", MACHINE_SUPPORTS_SAVE )
+CONS( 1989, kloneran, 0, 0, kloneran, kloneran, kloneran_state, 0, "Konami", "Lone Ranger (handheld)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, gnw_dm53, 0, 0, dm53, dm53, driver_device, 0, "Nintendo", "Game & Watch: Mickey & Donald", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, gnw_jr55, 0, 0, jr55, jr55, driver_device, 0, "Nintendo", "Game & Watch: Donkey Kong II", MACHINE_SUPPORTS_SAVE )
-CONS( 1983, gnw_ml102, 0, 0, ml102, ml102, driver_device, 0, "Nintendo", "Game & Watch: Mario's Cement Factory", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // GNW: missing svg screen
-CONS( 1984, gnw_bx301, 0, 0, bx301, bx301, driver_device, 0, "Nintendo", "Game & Watch: Boxing", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, gnw_dm53, 0, 0, dm53, dm53, dm53_state, 0, "Nintendo", "Game & Watch: Mickey & Donald", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, gnw_jr55, 0, 0, jr55, jr55, jr55_state, 0, "Nintendo", "Game & Watch: Donkey Kong II", MACHINE_SUPPORTS_SAVE )
+CONS( 1983, gnw_ml102, 0, 0, ml102, ml102, ml102_state, 0, "Nintendo", "Game & Watch: Mario's Cement Factory", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // GNW: missing svg screen
+CONS( 1984, gnw_bx301, 0, 0, bx301, bx301, bx301_state, 0, "Nintendo", "Game & Watch: Boxing", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index 873b2e3b95f..fcb93b211e3 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -528,7 +528,7 @@ INPUT_PORTS_END
static const s16 matchnum_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( matchnum, matchnum_state )
+static MACHINE_CONFIG_START( matchnum )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=47pF
@@ -708,7 +708,7 @@ static const u16 mathmagi_output_pla[0x20] =
lA+lF+lE+lD+lC // G
};
-static MACHINE_CONFIG_START( mathmagi, mathmagi_state )
+static MACHINE_CONFIG_START( mathmagi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 175000) // approximation - RC osc. R=68K, C=82pF
@@ -814,7 +814,7 @@ static INPUT_PORTS_START( bcheetah )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("4")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bcheetah, bcheetah_state )
+static MACHINE_CONFIG_START( bcheetah )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 100000) // approximation - RC osc. R=47K, C=47pF
@@ -941,7 +941,7 @@ static INPUT_PORTS_START( amaztron )
PORT_BIT( 0x1c, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( amaztron, amaztron_state )
+static MACHINE_CONFIG_START( amaztron )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=33K?, C=100pF
@@ -1118,7 +1118,7 @@ static const u16 zodiac_output_pla[0x20] =
lB+lC+lD+lE+lF // U
};
-static MACHINE_CONFIG_START( zodiac, zodiac_state )
+static MACHINE_CONFIG_START( zodiac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 500000) // approximation - RC osc. R=18K, C=100pF
@@ -1234,7 +1234,7 @@ static INPUT_PORTS_START( cqback )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cqback, cqback_state )
+static MACHINE_CONFIG_START( cqback )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=33K, C=100pF
@@ -1352,7 +1352,7 @@ static INPUT_PORTS_START( h2hfootb )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( h2hfootb, h2hfootb_state )
+static MACHINE_CONFIG_START( h2hfootb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 310000) // approximation - RC osc. R=39K, C=100pF
@@ -1491,7 +1491,7 @@ void h2hbaseb_state::machine_reset()
set_clock();
}
-static MACHINE_CONFIG_START( h2hbaseb, h2hbaseb_state )
+static MACHINE_CONFIG_START( h2hbaseb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1170, 350000) // see set_clock
@@ -1603,7 +1603,7 @@ static INPUT_PORTS_START( h2hboxing )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL PORT_NAME("P2 Block")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( h2hboxing, h2hboxing_state )
+static MACHINE_CONFIG_START( h2hboxing )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=39K, C=100pF
@@ -1774,7 +1774,7 @@ void quizwizc_state::machine_start()
save_item(NAME(m_pinout));
}
-static MACHINE_CONFIG_START( quizwizc, quizwizc_state )
+static MACHINE_CONFIG_START( quizwizc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=100pF
@@ -1950,7 +1950,7 @@ void tc4_state::machine_start()
save_item(NAME(m_pinout));
}
-static MACHINE_CONFIG_START( tc4, tc4_state )
+static MACHINE_CONFIG_START( tc4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=27.3K, C=100pF
@@ -2065,7 +2065,7 @@ static INPUT_PORTS_START( cnbaskb )
PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cnbaskb, cnbaskb_state )
+static MACHINE_CONFIG_START( cnbaskb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
@@ -2178,7 +2178,7 @@ static INPUT_PORTS_START( cmsport )
PORT_CONFSETTING( 0x08, "2" ) // professional
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cmsport, cmsport_state )
+static MACHINE_CONFIG_START( cmsport )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=47K, C=47pF
@@ -2304,7 +2304,7 @@ INPUT_PORTS_END
static const s16 cnfball_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( cnfball, cnfball_state )
+static MACHINE_CONFIG_START( cnfball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
@@ -2430,7 +2430,7 @@ static const u16 cnfball2_output_pla[0x20] =
0, 0, 0, 0, 0, 0, 0, 0
};
-static MACHINE_CONFIG_START( cnfball2, cnfball2_state )
+static MACHINE_CONFIG_START( cnfball2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
@@ -2572,7 +2572,7 @@ INPUT_CHANGED_MEMBER(eleciq_state::reset_button)
m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( eleciq, eleciq_state )
+static MACHINE_CONFIG_START( eleciq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=47K, C=50pF
@@ -2677,7 +2677,7 @@ static INPUT_PORTS_START( esoccer )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
INPUT_PORTS_END
-static MACHINE_CONFIG_START( esoccer, esoccer_state )
+static MACHINE_CONFIG_START( esoccer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=33pF
@@ -2811,7 +2811,7 @@ static INPUT_PORTS_START( ebball )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Batter")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ebball, ebball_state )
+static MACHINE_CONFIG_START( ebball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 375000) // approximation - RC osc. R=43K, C=47pF
@@ -2934,7 +2934,7 @@ static INPUT_PORTS_START( ebball2 )
PORT_BIT( 0x0a, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ebball2, ebball2_state )
+static MACHINE_CONFIG_START( ebball2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=47K, C=47pF
@@ -3114,7 +3114,7 @@ void ebball3_state::machine_reset()
set_clock();
}
-static MACHINE_CONFIG_START( ebball3, ebball3_state )
+static MACHINE_CONFIG_START( ebball3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 340000) // see set_clock
@@ -3225,7 +3225,7 @@ static INPUT_PORTS_START( esbattle )
PORT_CONFSETTING( 0x00, "2" ) // Manual
INPUT_PORTS_END
-static MACHINE_CONFIG_START( esbattle, esbattle_state )
+static MACHINE_CONFIG_START( esbattle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 425000) // approximation - RC osc. R=47K, C=33pF
@@ -3334,7 +3334,7 @@ void einvader_state::machine_reset()
set_clock();
}
-static MACHINE_CONFIG_START( einvader, einvader_state )
+static MACHINE_CONFIG_START( einvader )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 320000) // see set_clock
@@ -3454,7 +3454,7 @@ static INPUT_PORTS_START( efootb4 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( efootb4, efootb4_state )
+static MACHINE_CONFIG_START( efootb4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1670, 475000) // approximation - RC osc. R=42K, C=47pF
@@ -3575,7 +3575,7 @@ static INPUT_PORTS_START( ebaskb2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ebaskb2, ebaskb2_state )
+static MACHINE_CONFIG_START( ebaskb2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 360000) // approximation - RC osc. R=33K, C=82pF
@@ -3714,7 +3714,7 @@ void raisedvl_state::machine_reset()
set_clock();
}
-static MACHINE_CONFIG_START( raisedvl, raisedvl_state )
+static MACHINE_CONFIG_START( raisedvl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 350000) // see set_clock
@@ -3845,7 +3845,7 @@ INPUT_CHANGED_MEMBER(f2pbball_state::reset_button)
m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( f2pbball, f2pbball_state )
+static MACHINE_CONFIG_START( f2pbball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 325000) // approximation - RC osc. R=51K, C=39pF
@@ -3989,7 +3989,7 @@ void gpoker_state::machine_reset()
m_beeper->set_state(0);
}
-static MACHINE_CONFIG_START( gpoker, gpoker_state )
+static MACHINE_CONFIG_START( gpoker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1370, 350000) // approximation - RC osc. R=47K, C=47pF
@@ -4102,7 +4102,7 @@ static INPUT_PORTS_START( gjackpot )
PORT_BIT( 0x09, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( gjackpot, gjackpot_state )
+static MACHINE_CONFIG_START( gjackpot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1670, 450000) // approximation - RC osc. R=47K, C=47pF
@@ -4207,7 +4207,7 @@ static INPUT_PORTS_START( ginv1000 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ginv1000, ginv1000_state )
+static MACHINE_CONFIG_START( ginv1000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1370, 340000) // approximation
@@ -4350,7 +4350,7 @@ static INPUT_PORTS_START( fxmcr165 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_MINUS) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("Address Set")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( fxmcr165, fxmcr165_state )
+static MACHINE_CONFIG_START( fxmcr165 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, XTAL_400kHz)
@@ -4478,7 +4478,7 @@ INPUT_PORTS_END
static const s16 elecdet_speaker_levels[4] = { 0, 0x3fff, 0x3fff, 0x7fff };
-static MACHINE_CONFIG_START( elecdet, elecdet_state )
+static MACHINE_CONFIG_START( elecdet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0980, 425000) // approximation
@@ -4606,7 +4606,7 @@ static INPUT_PORTS_START( starwbc )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_RIGHT) PORT_NAME("Right")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( starwbc, starwbc_state )
+static MACHINE_CONFIG_START( starwbc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 325000) // approximation - RC osc. R=51K, C=47pF
@@ -4733,7 +4733,7 @@ static INPUT_PORTS_START( astro )
PORT_CONFSETTING( 0x08, "Astro" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( astro, astro_state )
+static MACHINE_CONFIG_START( astro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1470, 450000) // approximation - RC osc. R=4.7K, C=33pF
@@ -4898,7 +4898,7 @@ static const u16 elecbowl_output_pla[0x20] =
0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
};
-static MACHINE_CONFIG_START( elecbowl, elecbowl_state )
+static MACHINE_CONFIG_START( elecbowl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF
@@ -5052,7 +5052,7 @@ static INPUT_PORTS_START( horseran )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("7")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( horseran, horseran_state )
+static MACHINE_CONFIG_START( horseran )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 300000) // approximation - RC osc. R=56K, C=47pF
@@ -5230,7 +5230,7 @@ static INPUT_PORTS_START( mdndclab )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("Dragon Attacks / Dragon Wakes")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mdndclab, mdndclab_state )
+static MACHINE_CONFIG_START( mdndclab )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 475000) // approximation - RC osc. R=27K, C=100pF
@@ -5334,7 +5334,7 @@ static INPUT_PORTS_START( comp4 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( comp4, comp4_state )
+static MACHINE_CONFIG_START( comp4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
@@ -5484,7 +5484,7 @@ static INPUT_PORTS_START( bship )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("P2 Clear Last Entry")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bship, bship_state )
+static MACHINE_CONFIG_START( bship )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF
@@ -5587,7 +5587,7 @@ READ8_MEMBER(bshipb_state::read_k)
// buttons are same as bship set
-static MACHINE_CONFIG_START( bshipb, bshipb_state )
+static MACHINE_CONFIG_START( bshipb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=100K, C=47pF
@@ -5705,7 +5705,7 @@ static INPUT_PORTS_START( simon )
PORT_CONFSETTING( 0x01, "4" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( simon, simon_state )
+static MACHINE_CONFIG_START( simon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 350000) // approximation - RC osc. R=33K, C=100pF
@@ -5846,7 +5846,7 @@ void ssimon_state::machine_reset()
set_clock();
}
-static MACHINE_CONFIG_START( ssimon, ssimon_state )
+static MACHINE_CONFIG_START( ssimon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 275000) // see set_clock
@@ -6026,7 +6026,7 @@ void bigtrak_state::machine_start()
static const s16 bigtrak_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2, 0x7fff/3, 0x7fff/3*2, 0x7fff/3*2, 0x7fff };
-static MACHINE_CONFIG_START( bigtrak, bigtrak_state )
+static MACHINE_CONFIG_START( bigtrak )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 200000) // approximation - RC osc. R=83K, C=100pF
@@ -6259,7 +6259,7 @@ void mbdtower_state::machine_start()
save_item(NAME(m_sensor_blind));
}
-static MACHINE_CONFIG_START( mbdtower, mbdtower_state )
+static MACHINE_CONFIG_START( mbdtower )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=43K, C=56pF
@@ -6378,7 +6378,7 @@ static INPUT_PORTS_START( cnsector )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_B) PORT_NAME("Teach Mode")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cnsector, cnsector_state )
+static MACHINE_CONFIG_START( cnsector )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
@@ -6492,7 +6492,7 @@ INPUT_PORTS_END
static const s16 merlin_speaker_levels[8] = { 0, 0x7fff/3, 0x7fff/3, 0x7fff/3*2, 0x7fff/3, 0x7fff/3*2, 0x7fff/3*2, 0x7fff };
-static MACHINE_CONFIG_START( merlin, merlin_state )
+static MACHINE_CONFIG_START( merlin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 350000) // approximation - RC osc. R=33K, C=100pF
@@ -6556,7 +6556,7 @@ static INPUT_PORTS_START( mmerlin )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_S) PORT_NAME("Score") // instead of Hit Me
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mmerlin, mmerlin_state )
+static MACHINE_CONFIG_START( mmerlin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, 425000) // approximation - RC osc. R=30K, C=100pF
@@ -6671,7 +6671,7 @@ INPUT_PORTS_END
static const s16 stopthief_speaker_levels[7] = { 0, 0x7fff/6, 0x7fff/5, 0x7fff/4, 0x7fff/3, 0x7fff/2, 0x7fff };
-static MACHINE_CONFIG_START( stopthief, stopthief_state )
+static MACHINE_CONFIG_START( stopthief )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0980, 425000) // approximation
@@ -6780,7 +6780,7 @@ static INPUT_PORTS_START( bankshot )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bankshot, bankshot_state )
+static MACHINE_CONFIG_START( bankshot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF
@@ -6891,7 +6891,7 @@ static INPUT_PORTS_START( splitsec )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( splitsec, splitsec_state )
+static MACHINE_CONFIG_START( splitsec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, 475000) // approximation - RC osc. R=24K, C=100pF
@@ -7009,7 +7009,7 @@ static const s16 lostreas_speaker_levels[16] =
0x7fff/8, 0x7fff/7, 0x7fff/6, 0x7fff/5, 0x7fff/4, 0x7fff/3, 0x7fff/2, 0x7fff/1
};
-static MACHINE_CONFIG_START( lostreas, lostreas_state )
+static MACHINE_CONFIG_START( lostreas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 425000) // approximation - RC osc. R=39K, C=47pF
@@ -7119,7 +7119,7 @@ static INPUT_PORTS_START( tcfball )
PORT_CONFSETTING( 0x08, "2" ) // professional
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tcfball, tcfball_state )
+static MACHINE_CONFIG_START( tcfball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=56K, C=24pF
@@ -7183,7 +7183,7 @@ static const u16 tcfballa_output_pla[0x20] =
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-static MACHINE_CONFIG_START( tcfballa, tcfballa_state )
+static MACHINE_CONFIG_START( tcfballa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=50pF
@@ -7347,7 +7347,7 @@ static const u16 tandy12_output_pla[0x20] =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
-static MACHINE_CONFIG_START( tandy12, tandy12_state )
+static MACHINE_CONFIG_START( tandy12 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 400000) // approximation - RC osc. R=39K, C=47pF
@@ -7456,7 +7456,7 @@ static INPUT_PORTS_START( monkeysee )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_STOP) PORT_CODE(KEYCODE_DEL_PAD) PORT_NAME(".")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( monkeysee, monkeysee_state )
+static MACHINE_CONFIG_START( monkeysee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 250000) // approximation - RC osc. R=68K, C=47pF
@@ -7605,7 +7605,7 @@ static INPUT_PORTS_START( speechp )
PORT_CONFSETTING( 0x00, DEF_STR( Normal ) )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( speechp, speechp_state )
+static MACHINE_CONFIG_START( speechp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 400000) // approximation - RC osc. R=39K, C=47pF
@@ -7710,7 +7710,7 @@ INPUT_PORTS_END
static const s16 copycat_speaker_levels[4] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( copycat, copycat_state )
+static MACHINE_CONFIG_START( copycat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 320000) // approximation - RC osc. R=47K, C=47pF
@@ -7786,7 +7786,7 @@ static INPUT_PORTS_START( copycatm2 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Green Button")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( copycatm2, copycatm2_state )
+static MACHINE_CONFIG_START( copycatm2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF
@@ -7857,7 +7857,7 @@ static INPUT_PORTS_START( ditto )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Red Button")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ditto, ditto_state )
+static MACHINE_CONFIG_START( ditto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1730, 275000) // approximation - RC osc. R=100K, C=47pF
@@ -7972,7 +7972,7 @@ static INPUT_PORTS_START( ss7in1 )
PORT_BIT( 0x0c, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ss7in1, ss7in1_state )
+static MACHINE_CONFIG_START( ss7in1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, 450000) // approximation - RC osc. R=47K, C=47pF
@@ -8165,7 +8165,7 @@ void tbreakup_state::machine_start()
save_item(NAME(m_exp_port));
}
-static MACHINE_CONFIG_START( tbreakup, tbreakup_state )
+static MACHINE_CONFIG_START( tbreakup )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1040, 325000) // see set_clock
@@ -8174,13 +8174,13 @@ static MACHINE_CONFIG_START( tbreakup, tbreakup_state )
MCFG_TMS1XXX_WRITE_O_CB(WRITE16(tbreakup_state, write_o))
MCFG_DEVICE_ADD("expander", TMS1025, 0)
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT1, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT2, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT3, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT4, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT5, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT6, WRITE8(tbreakup_state, expander_w))
- MCFG_TMS1025_WRITE_PORT_CB(TMS1025_PORT7, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT1, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT2, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT3, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT4, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT5, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT6, WRITE8(tbreakup_state, expander_w))
+ MCFG_TMS1025_WRITE_PORT_CB(PORT7, WRITE8(tbreakup_state, expander_w))
MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
MCFG_DEFAULT_LAYOUT(layout_tbreakup)
@@ -8296,7 +8296,7 @@ INPUT_CHANGED_MEMBER(phpball_state::flipper_button)
output().set_lamp_value(90 + (int)(uintptr_t)param, newval);
}
-static MACHINE_CONFIG_START( phpball, phpball_state )
+static MACHINE_CONFIG_START( phpball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
@@ -8431,7 +8431,7 @@ static const u16 ssports4_output_pla[0x20] =
0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7d, 0x07, 0x7f, 0x6f, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40
};
-static MACHINE_CONFIG_START( ssports4, ssports4_state )
+static MACHINE_CONFIG_START( ssports4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, 375000) // approximation - RC osc. R=47K, C=47pF
@@ -9198,91 +9198,91 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1979, matchnum, 0, 0, matchnum, matchnum, driver_device, 0, "A-One LSI", "Match Number", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT, COMPANY, FULLNAME, FLAGS */
+CONS( 1979, matchnum, 0, 0, matchnum, matchnum, matchnum_state, 0, "A-One LSI", "Match Number", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-COMP( 1980, mathmagi, 0, 0, mathmagi, mathmagi, driver_device, 0, "APF Electronics Inc.", "Mathemagician", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, mathmagi, 0, 0, mathmagi, mathmagi, mathmagi_state, 0, "APF Electronics Inc.", "Mathemagician", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-CONS( 1979, bcheetah, 0, 0, bcheetah, bcheetah, driver_device, 0, "Bandai", "System Control Car: Cheetah", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_MECHANICAL ) // ***
+CONS( 1979, bcheetah, 0, 0, bcheetah, bcheetah, bcheetah_state, 0, "Bandai", "System Control Car: Cheetah", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_MECHANICAL ) // ***
-CONS( 1978, amaztron, 0, 0, amaztron, amaztron, driver_device, 0, "Coleco", "Amaze-A-Tron", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
-COMP( 1979, zodiac, 0, 0, zodiac, zodiac, driver_device, 0, "Coleco", "Zodiac - The Astrology Computer", MACHINE_SUPPORTS_SAVE )
-CONS( 1978, cqback, 0, 0, cqback, cqback, driver_device, 0, "Coleco", "Electronic Quarterback", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, h2hfootb, 0, 0, h2hfootb, h2hfootb, driver_device, 0, "Coleco", "Head to Head Football", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, h2hbaseb, 0, 0, h2hbaseb, h2hbaseb, driver_device, 0, "Coleco", "Head to Head Baseball", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, h2hboxing, 0, 0, h2hboxing, h2hboxing, driver_device, 0, "Coleco", "Head to Head Boxing", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, quizwizc, 0, 0, quizwizc, quizwizc, driver_device, 0, "Coleco", "Quiz Wiz Challenger", MACHINE_SUPPORTS_SAVE ) // ***
-CONS( 1981, tc4, 0, 0, tc4, tc4, driver_device, 0, "Coleco", "Total Control 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1978, amaztron, 0, 0, amaztron, amaztron, amaztron_state, 0, "Coleco", "Amaze-A-Tron", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
+COMP( 1979, zodiac, 0, 0, zodiac, zodiac, zodiac_state, 0, "Coleco", "Zodiac - The Astrology Computer", MACHINE_SUPPORTS_SAVE )
+CONS( 1978, cqback, 0, 0, cqback, cqback, cqback_state, 0, "Coleco", "Electronic Quarterback", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, h2hfootb, 0, 0, h2hfootb, h2hfootb, h2hfootb_state, 0, "Coleco", "Head to Head Football", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, h2hbaseb, 0, 0, h2hbaseb, h2hbaseb, h2hbaseb_state, 0, "Coleco", "Head to Head Baseball", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, h2hboxing, 0, 0, h2hboxing, h2hboxing, h2hboxing_state, 0, "Coleco", "Head to Head Boxing", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, quizwizc, 0, 0, quizwizc, quizwizc, quizwizc_state, 0, "Coleco", "Quiz Wiz Challenger", MACHINE_SUPPORTS_SAVE ) // ***
+CONS( 1981, tc4, 0, 0, tc4, tc4, tc4_state, 0, "Coleco", "Total Control 4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1979, cnbaskb, 0, 0, cnbaskb, cnbaskb, driver_device, 0, "Conic", "Electronic Basketball (Conic)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, cmsport, 0, 0, cmsport, cmsport, driver_device, 0, "Conic", "Electronic Multisport", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1979, cnfball, 0, 0, cnfball, cnfball, driver_device, 0, "Conic", "Electronic Football (Conic, TMS1000 version)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, cnfball2, 0, 0, cnfball2, cnfball2, driver_device, 0, "Conic", "Electronic Football II (Conic)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, eleciq, 0, 0, eleciq, eleciq, driver_device, 0, "Conic", "Electronic I.Q.", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, cnbaskb, 0, 0, cnbaskb, cnbaskb, cnbaskb_state, 0, "Conic", "Electronic Basketball (Conic)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, cmsport, 0, 0, cmsport, cmsport, cmsport_state, 0, "Conic", "Electronic Multisport", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1979, cnfball, 0, 0, cnfball, cnfball, cnfball_state, 0, "Conic", "Electronic Football (Conic, TMS1000 version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, cnfball2, 0, 0, cnfball2, cnfball2, cnfball2_state, 0, "Conic", "Electronic Football II (Conic)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, eleciq, 0, 0, eleciq, eleciq, eleciq_state, 0, "Conic", "Electronic I.Q.", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, esoccer, 0, 0, esoccer, esoccer, driver_device, 0, "Entex", "Electronic Soccer (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, ebball, 0, 0, ebball, ebball, driver_device, 0, "Entex", "Electronic Baseball (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, ebball2, 0, 0, ebball2, ebball2, driver_device, 0, "Entex", "Electronic Baseball 2 (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, ebball3, 0, 0, ebball3, ebball3, driver_device, 0, "Entex", "Electronic Baseball 3 (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, esbattle, 0, 0, esbattle, esbattle, driver_device, 0, "Entex", "Space Battle (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, einvader, 0, 0, einvader, einvader, driver_device, 0, "Entex", "Space Invader (Entex, TMS1100 version)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, efootb4 , 0, 0, efootb4, efootb4, driver_device, 0, "Entex", "Color Football 4 (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, ebaskb2 , 0, 0, ebaskb2, ebaskb2, driver_device, 0, "Entex", "Electronic Basketball 2 (Entex)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, raisedvl, 0, 0, raisedvl, raisedvl, driver_device, 0, "Entex", "Raise The Devil", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1979, esoccer, 0, 0, esoccer, esoccer, esoccer_state, 0, "Entex", "Electronic Soccer (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, ebball, 0, 0, ebball, ebball, ebball_state, 0, "Entex", "Electronic Baseball (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, ebball2, 0, 0, ebball2, ebball2, ebball2_state, 0, "Entex", "Electronic Baseball 2 (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, ebball3, 0, 0, ebball3, ebball3, ebball3_state, 0, "Entex", "Electronic Baseball 3 (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, esbattle, 0, 0, esbattle, esbattle, esbattle_state, 0, "Entex", "Space Battle (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, einvader, 0, 0, einvader, einvader, einvader_state, 0, "Entex", "Space Invader (Entex, TMS1100 version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, efootb4 , 0, 0, efootb4, efootb4, efootb4_state, 0, "Entex", "Color Football 4 (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, ebaskb2 , 0, 0, ebaskb2, ebaskb2, ebaskb2_state, 0, "Entex", "Electronic Basketball 2 (Entex)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, raisedvl, 0, 0, raisedvl, raisedvl, raisedvl_state, 0, "Entex", "Raise The Devil", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1979, f2pbball, 0, 0, f2pbball, f2pbball, driver_device, 0, "Fonas", "2 Player Baseball (Fonas)", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, f2pbball, 0, 0, f2pbball, f2pbball, f2pbball_state, 0, "Fonas", "2 Player Baseball (Fonas)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, gpoker, 0, 0, gpoker, gpoker, driver_device, 0, "Gakken", "Poker (Gakken, 1979 version)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, gjackpot, 0, 0, gjackpot, gjackpot, driver_device, 0, "Gakken", "Jackpot: Gin Rummy & Black Jack", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, ginv1000, 0, 0, ginv1000, ginv1000, driver_device, 0, "Gakken", "Galaxy Invader 1000", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, fxmcr165, 0, 0, fxmcr165, fxmcr165, driver_device, 0, "Gakken", "FX-Micom R-165", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, gpoker, 0, 0, gpoker, gpoker, gpoker_state, 0, "Gakken", "Poker (Gakken, 1979 version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, gjackpot, 0, 0, gjackpot, gjackpot, gjackpot_state, 0, "Gakken", "Jackpot: Gin Rummy & Black Jack", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, ginv1000, 0, 0, ginv1000, ginv1000, ginv1000_state, 0, "Gakken", "Galaxy Invader 1000", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, fxmcr165, 0, 0, fxmcr165, fxmcr165, fxmcr165_state, 0, "Gakken", "FX-Micom R-165", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, elecdet, 0, 0, elecdet, elecdet, driver_device, 0, "Ideal", "Electronic Detective", MACHINE_SUPPORTS_SAVE ) // ***
+CONS( 1979, elecdet, 0, 0, elecdet, elecdet, elecdet_state, 0, "Ideal", "Electronic Detective", MACHINE_SUPPORTS_SAVE ) // ***
-CONS( 1979, starwbc, 0, 0, starwbc, starwbc, driver_device, 0, "Kenner", "Star Wars - Electronic Battle Command", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, starwbcp, starwbc, 0, starwbc, starwbc, driver_device, 0, "Kenner", "Star Wars - Electronic Battle Command (patent)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, starwbc, 0, 0, starwbc, starwbc, starwbc_state, 0, "Kenner", "Star Wars - Electronic Battle Command", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, starwbcp, starwbc, 0, starwbc, starwbc, starwbc_state, 0, "Kenner", "Star Wars - Electronic Battle Command (patent)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-COMP( 1979, astro, 0, 0, astro, astro, driver_device, 0, "Kosmos", "Astro", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, astro, 0, 0, astro, astro, astro_state, 0, "Kosmos", "Astro", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-CONS( 1978, elecbowl, 0, 0, elecbowl, elecbowl, driver_device, 0, "Marx", "Electronic Bowling (Marx)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // ***
+CONS( 1978, elecbowl, 0, 0, elecbowl, elecbowl, driver_device, 0, "Marx", "Electronic Bowling (Marx)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // ***
-COMP( 1979, horseran, 0, 0, horseran, horseran, driver_device, 0, "Mattel", "Thoroughbred Horse Race Analyzer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-CONS( 1980, mdndclab, 0, 0, mdndclab, mdndclab, driver_device, 0, "Mattel", "Dungeons & Dragons - Computer Labyrinth Game", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
+COMP( 1979, horseran, 0, 0, horseran, horseran, horseran_state, 0, "Mattel", "Thoroughbred Horse Race Analyzer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+CONS( 1980, mdndclab, 0, 0, mdndclab, mdndclab, mdndclab_state, 0, "Mattel", "Dungeons & Dragons - Computer Labyrinth Game", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
-CONS( 1977, comp4, 0, 0, comp4, comp4, driver_device, 0, "Milton Bradley", "Comp IV", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW )
-CONS( 1977, bship, 0, 0, bship, bship, driver_device, 0, "Milton Bradley", "Electronic Battleship (1977 version, model 4750A)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // ***
-CONS( 1977, bshipb, bship, 0, bshipb, bship, driver_device, 0, "Milton Bradley", "Electronic Battleship (1977 version, model 4750B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // ***
-CONS( 1978, simon, 0, 0, simon, simon, driver_device, 0, "Milton Bradley", "Simon (Rev A)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, simonf, simon, 0, simon, simon, driver_device, 0, "Milton Bradley", "Simon (Rev F)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, ssimon, 0, 0, ssimon, ssimon, driver_device, 0, "Milton Bradley", "Super Simon", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, bigtrak, 0, 0, bigtrak, bigtrak, driver_device, 0, "Milton Bradley", "Big Trak", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL ) // ***
-CONS( 1981, mbdtower, 0, 0, mbdtower, mbdtower, driver_device, 0, "Milton Bradley", "Dark Tower (Milton Bradley)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_MECHANICAL ) // ***
+CONS( 1977, comp4, 0, 0, comp4, comp4, comp4_state, 0, "Milton Bradley", "Comp IV", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW )
+CONS( 1977, bship, 0, 0, bship, bship, bship_state, 0, "Milton Bradley", "Electronic Battleship (1977 version, model 4750A)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // ***
+CONS( 1977, bshipb, bship, 0, bshipb, bship, bshipb_state, 0, "Milton Bradley", "Electronic Battleship (1977 version, model 4750B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // ***
+CONS( 1978, simon, 0, 0, simon, simon, simon_state, 0, "Milton Bradley", "Simon (Rev A)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, simonf, simon, 0, simon, simon, simon_state, 0, "Milton Bradley", "Simon (Rev F)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, ssimon, 0, 0, ssimon, ssimon, ssimon_state, 0, "Milton Bradley", "Super Simon", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, bigtrak, 0, 0, bigtrak, bigtrak, bigtrak_state, 0, "Milton Bradley", "Big Trak", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL ) // ***
+CONS( 1981, mbdtower, 0, 0, mbdtower, mbdtower, mbdtower_state, 0, "Milton Bradley", "Dark Tower (Milton Bradley)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_MECHANICAL ) // ***
-CONS( 1977, cnsector, 0, 0, cnsector, cnsector, driver_device, 0, "Parker Brothers", "Code Name: Sector", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW ) // ***
-CONS( 1978, merlin, 0, 0, merlin, merlin, driver_device, 0, "Parker Brothers", "Merlin - The Electronic Wizard", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1979, stopthief, 0, 0, stopthief, stopthief, driver_device, 0, "Parker Brothers", "Stop Thief (Electronic Crime Scanner)", MACHINE_SUPPORTS_SAVE ) // ***
-CONS( 1979, stopthiefp,stopthief,0, stopthief, stopthief, driver_device, 0, "Parker Brothers", "Stop Thief (Electronic Crime Scanner) (patent)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // ***
-CONS( 1980, bankshot, 0, 0, bankshot, bankshot, driver_device, 0, "Parker Brothers", "Bank Shot - Electronic Pool", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, splitsec, 0, 0, splitsec, splitsec, driver_device, 0, "Parker Brothers", "Split Second", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, mmerlin, 0, 0, mmerlin, mmerlin, driver_device, 0, "Parker Brothers", "Master Merlin", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1982, lostreas, 0, 0, lostreas, lostreas, driver_device, 0, "Parker Brothers", "Lost Treasure - The Electronic Deep-Sea Diving Game (Electronic Dive-Control Center)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
+CONS( 1977, cnsector, 0, 0, cnsector, cnsector, cnsector_state, 0, "Parker Brothers", "Code Name: Sector", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW ) // ***
+CONS( 1978, merlin, 0, 0, merlin, merlin, merlin_state, 0, "Parker Brothers", "Merlin - The Electronic Wizard", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, stopthief, 0, 0, stopthief, stopthief, stopthief_state, 0, "Parker Brothers", "Stop Thief (Electronic Crime Scanner)", MACHINE_SUPPORTS_SAVE ) // ***
+CONS( 1979, stopthiefp, stopthief, 0, stopthief, stopthief, stopthief_state, 0, "Parker Brothers", "Stop Thief (Electronic Crime Scanner) (patent)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // ***
+CONS( 1980, bankshot, 0, 0, bankshot, bankshot, bankshot_state, 0, "Parker Brothers", "Bank Shot - Electronic Pool", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, splitsec, 0, 0, splitsec, splitsec, splitsec_state, 0, "Parker Brothers", "Split Second", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, mmerlin, 0, 0, mmerlin, mmerlin, mmerlin_state, 0, "Parker Brothers", "Master Merlin", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1982, lostreas, 0, 0, lostreas, lostreas, lostreas_state, 0, "Parker Brothers", "Lost Treasure - The Electronic Deep-Sea Diving Game (Electronic Dive-Control Center)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // ***
-CONS( 1980, tcfball, 0, 0, tcfball, tcfball, driver_device, 0, "Tandy Radio Shack", "Championship Football (model 60-2150)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, tcfballa, tcfball, 0, tcfballa, tcfballa, driver_device, 0, "Tandy Radio Shack", "Championship Football (model 60-2151)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, tandy12, 0, 0, tandy12, tandy12, driver_device, 0, "Tandy Radio Shack", "Tandy-12: Computerized Arcade", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // some of the minigames: ***
-CONS( 1982, monkeysee, 0, 0, monkeysee, monkeysee, driver_device, 0, "Tandy Radio Shack", "Monkey See (1982 version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, tcfball, 0, 0, tcfball, tcfball, tcfball_state, 0, "Tandy Radio Shack", "Championship Football (model 60-2150)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, tcfballa, tcfball, 0, tcfballa, tcfballa, tcfballa_state, 0, "Tandy Radio Shack", "Championship Football (model 60-2151)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, tandy12, 0, 0, tandy12, tandy12, tandy12_state, 0, "Tandy Radio Shack", "Tandy-12: Computerized Arcade", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // some of the minigames: ***
+CONS( 1982, monkeysee, 0, 0, monkeysee, monkeysee, monkeysee_state, 0, "Tandy Radio Shack", "Monkey See (1982 version)", MACHINE_SUPPORTS_SAVE )
-COMP( 1976, speechp, 0, 0, speechp, speechp, driver_device, 0, "Telesensory Systems, Inc.", "Speech+", MACHINE_SUPPORTS_SAVE )
+COMP( 1976, speechp, 0, 0, speechp, speechp, speechp_state, 0, "Telesensory Systems, Inc.", "Speech+", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, copycat, 0, 0, copycat, copycat, driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-520)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1989, copycatm2, copycat, 0, copycatm2, copycatm2, driver_device, 0, "Tiger Electronics", "Copy Cat (model 7-522)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1981, ditto, 0, 0, ditto, ditto, driver_device, 0, "Tiger Electronics", "Ditto", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1982, 7in1ss, 0, 0, ss7in1, ss7in1, driver_device, 0, "Tiger Electronics", "7 in 1 Sports Stadium", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1979, copycat, 0, 0, copycat, copycat, copycat_state, 0, "Tiger Electronics", "Copy Cat (model 7-520)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, copycatm2, copycat, 0, copycatm2, copycatm2, copycatm2_state, 0, "Tiger Electronics", "Copy Cat (model 7-522)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1981, ditto, 0, 0, ditto, ditto, ditto_state, 0, "Tiger Electronics", "Ditto", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1982, 7in1ss, 0, 0, ss7in1, ss7in1, ss7in1_state, 0, "Tiger Electronics", "7 in 1 Sports Stadium", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1979, tbreakup, 0, 0, tbreakup, tbreakup, driver_device, 0, "Tomy", "Break Up (Tomy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, phpball, 0, 0, phpball, phpball, driver_device, 0, "Tomy", "Power House Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1979, tbreakup, 0, 0, tbreakup, tbreakup, tbreakup_state, 0, "Tomy", "Break Up (Tomy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, phpball, 0, 0, phpball, phpball, phpball_state, 0, "Tomy", "Power House Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1980, ssports4, 0, 0, ssports4, ssports4, driver_device, 0, "U.S. Games", "Super Sports-4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1980, ssports4, 0, 0, ssports4, ssports4, ssports4_state, 0, "U.S. Games", "Super Sports-4", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
// ***: As far as MAME is concerned, the game is emulated fine. But for it to be playable, it requires interaction
// with other, unemulatable, things eg. game board/pieces, playing cards, pen & paper, etc.
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index 0595b4591ec..4d1069b552a 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -348,7 +348,7 @@ INPUT_PORTS_END
static const s16 ufombs_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( ufombs, ufombs_state )
+static MACHINE_CONFIG_START( ufombs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
@@ -494,7 +494,7 @@ INPUT_PORTS_END
static const s16 ssfball_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( ssfball, ssfball_state )
+static MACHINE_CONFIG_START( ssfball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
@@ -622,7 +622,7 @@ static INPUT_PORTS_START( bmsoccer )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Shoot")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bmsoccer, bmsoccer_state )
+static MACHINE_CONFIG_START( bmsoccer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
@@ -730,7 +730,7 @@ static INPUT_PORTS_START( bmsafari )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_16WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bmsafari, bmsafari_state )
+static MACHINE_CONFIG_START( bmsafari )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
@@ -880,7 +880,7 @@ INPUT_PORTS_END
static const s16 splasfgt_speaker_levels[] = { 0, 0x7fff, -0x8000, 0 };
-static MACHINE_CONFIG_START( splasfgt, splasfgt_state )
+static MACHINE_CONFIG_START( splasfgt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
@@ -984,7 +984,7 @@ static INPUT_PORTS_START( bcclimbr )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_RIGHT )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( bcclimbr, bcclimbr_state )
+static MACHINE_CONFIG_START( bcclimbr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -1107,7 +1107,7 @@ static INPUT_PORTS_START( tactix )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tactix, tactix_state )
+static MACHINE_CONFIG_START( tactix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D557L, 400000) // approximation
@@ -1201,7 +1201,7 @@ static INPUT_PORTS_START( invspace )
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( invspace, invspace_state )
+static MACHINE_CONFIG_START( invspace )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D552, XTAL_400kHz)
@@ -1319,7 +1319,7 @@ static INPUT_PORTS_START( efball )
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_16WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( efball, efball_state )
+static MACHINE_CONFIG_START( efball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -1418,7 +1418,7 @@ static INPUT_PORTS_START( galaxy2 )
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( galaxy2, galaxy2_state )
+static MACHINE_CONFIG_START( galaxy2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -1536,7 +1536,7 @@ static INPUT_PORTS_START( astrocmd )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( astrocmd, astrocmd_state )
+static MACHINE_CONFIG_START( astrocmd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -1632,7 +1632,7 @@ static INPUT_PORTS_START( edracula )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( edracula, edracula_state )
+static MACHINE_CONFIG_START( edracula )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -1714,7 +1714,7 @@ static INPUT_PORTS_START( mcompgin )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON8 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mcompgin, mcompgin_state )
+static MACHINE_CONFIG_START( mcompgin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D650, 400000) // approximation
@@ -1821,7 +1821,7 @@ static INPUT_PORTS_START( mvbfree )
PORT_CONFSETTING( 0x08, "3" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mvbfree, mvbfree_state )
+static MACHINE_CONFIG_START( mvbfree )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, 400000) // approximation
@@ -1940,7 +1940,7 @@ static INPUT_PORTS_START( grobot9 )
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_V) PORT_CHANGED_MEMBER(DEVICE_SELF, hh_ucom4_state, single_interrupt_line, nullptr) PORT_NAME("Start-Pitch")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( grobot9, grobot9_state )
+static MACHINE_CONFIG_START( grobot9 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D557L, 160000) // approximation
@@ -2030,7 +2030,7 @@ static INPUT_PORTS_START( tccombat )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_2WAY
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tccombat, tccombat_state )
+static MACHINE_CONFIG_START( tccombat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D552, 400000) // approximation
@@ -2187,7 +2187,7 @@ void tmtennis_state::machine_reset()
set_clock();
}
-static MACHINE_CONFIG_START( tmtennis, tmtennis_state )
+static MACHINE_CONFIG_START( tmtennis )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D552, 360000) // see set_clock
@@ -2296,7 +2296,7 @@ static INPUT_PORTS_START( tmpacman )
PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tmpacman, tmpacman_state )
+static MACHINE_CONFIG_START( tmpacman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_430kHz)
@@ -2399,7 +2399,7 @@ static INPUT_PORTS_START( tmscramb )
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tmscramb, tmscramb_state )
+static MACHINE_CONFIG_START( tmscramb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -2499,7 +2499,7 @@ static INPUT_PORTS_START( tcaveman )
PORT_CONFSETTING( 0x08, "Professional" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tcaveman, tcaveman_state )
+static MACHINE_CONFIG_START( tcaveman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -2631,7 +2631,7 @@ static INPUT_PORTS_START( alnchase )
PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( alnchase, alnchase_state )
+static MACHINE_CONFIG_START( alnchase )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D553, XTAL_400kHz)
@@ -2852,36 +2852,36 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1979, ufombs, 0, 0, ufombs, ufombs, driver_device, 0, "Bambino", "UFO Master-Blaster Station", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, ssfball, 0, 0, ssfball, ssfball, driver_device, 0, "Bambino", "Superstar Football", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, bmsoccer, 0, 0, bmsoccer, bmsoccer, driver_device, 0, "Bambino", "Kick The Goal Soccer", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, bmsafari, 0, 0, bmsafari, bmsafari, driver_device, 0, "Bambino", "Safari (Bambino)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, splasfgt, 0, 0, splasfgt, splasfgt, driver_device, 0, "Bambino", "Space Laser Fight", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS
+CONS( 1979, ufombs, 0, 0, ufombs, ufombs, ufombs_state, 0, "Bambino", "UFO Master-Blaster Station", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, ssfball, 0, 0, ssfball, ssfball, ssfball_state, 0, "Bambino", "Superstar Football", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, bmsoccer, 0, 0, bmsoccer, bmsoccer, bmsoccer_state, 0, "Bambino", "Kick The Goal Soccer", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, bmsafari, 0, 0, bmsafari, bmsafari, bmsafari_state, 0, "Bambino", "Safari (Bambino)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, splasfgt, 0, 0, splasfgt, splasfgt, splasfgt_state, 0, "Bambino", "Space Laser Fight", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, bcclimbr, 0, 0, bcclimbr, bcclimbr, driver_device, 0, "Bandai", "Crazy Climber (Bandai)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, bcclimbr, 0, 0, bcclimbr, bcclimbr, bcclimbr_state, 0, "Bandai", "Crazy Climber (Bandai)", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, tactix, 0, 0, tactix, tactix, driver_device, 0, "Castle Toy", "Tactix (Castle Toy)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1980, tactix, 0, 0, tactix, tactix, tactix_state, 0, "Castle Toy", "Tactix (Castle Toy)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1980, invspace, 0, 0, invspace, invspace, driver_device, 0, "Epoch", "Invader From Space", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, efball, 0, 0, efball, efball, driver_device, 0, "Epoch", "Electronic Football (Epoch)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, galaxy2, 0, 0, galaxy2, galaxy2, driver_device, 0, "Epoch", "Galaxy II (VFD Rev. D)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, galaxy2b, galaxy2, 0, galaxy2b, galaxy2, driver_device, 0, "Epoch", "Galaxy II (VFD Rev. B)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, astrocmd, 0, 0, astrocmd, astrocmd, driver_device, 0, "Epoch", "Astro Command", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, edracula, 0, 0, edracula, edracula, driver_device, 0, "Epoch", "Dracula (Epoch)", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, invspace, 0, 0, invspace, invspace, invspace_state, 0, "Epoch", "Invader From Space", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, efball, 0, 0, efball, efball, efball_state, 0, "Epoch", "Electronic Football (Epoch)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, galaxy2, 0, 0, galaxy2, galaxy2, galaxy2_state, 0, "Epoch", "Galaxy II (VFD Rev. D)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, galaxy2b, galaxy2, 0, galaxy2b, galaxy2, galaxy2_state, 0, "Epoch", "Galaxy II (VFD Rev. B)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, astrocmd, 0, 0, astrocmd, astrocmd, astrocmd_state, 0, "Epoch", "Astro Command", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, edracula, 0, 0, edracula, edracula, edracula_state, 0, "Epoch", "Dracula (Epoch)", MACHINE_SUPPORTS_SAVE )
-CONS( 1979, mcompgin, 0, 0, mcompgin, mcompgin, driver_device, 0, "Mattel", "Computer Gin", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+CONS( 1979, mcompgin, 0, 0, mcompgin, mcompgin, mcompgin_state, 0, "Mattel", "Computer Gin", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-CONS( 1979, mvbfree, 0, 0, mvbfree, mvbfree, driver_device, 0, "Mego", "Mini-Vid Break Free", MACHINE_SUPPORTS_SAVE )
+CONS( 1979, mvbfree, 0, 0, mvbfree, mvbfree, mvbfree_state, 0, "Mego", "Mini-Vid Break Free", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, grobot9, 0, 0, grobot9, grobot9, driver_device, 0, "Takatoku Toys", "Game Robot 9", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // some of the minigames: ***
+CONS( 1980, grobot9, 0, 0, grobot9, grobot9, grobot9_state, 0, "Takatoku Toys", "Game Robot 9", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // some of the minigames: ***
-CONS( 1980, tccombat, 0, 0, tccombat, tccombat, driver_device, 0, "Tomy", "Cosmic Combat", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, tmtennis, 0, 0, tmtennis, tmtennis, driver_device, 0, "Tomy", "Tennis (Tomy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, tmpacman, 0, 0, tmpacman, tmpacman, driver_device, 0, "Tomy", "Pac Man (Tomy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, tmscramb, 0, 0, tmscramb, tmscramb, driver_device, 0, "Tomy", "Scramble (Tomy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1982, tcaveman, 0, 0, tcaveman, tcaveman, driver_device, 0, "Tomy", "Caveman (Tomy)", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, alnchase, 0, 0, alnchase, alnchase, driver_device, 0, "Tomy", "Alien Chase", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, tccombat, 0, 0, tccombat, tccombat, tccombat_state, 0, "Tomy", "Cosmic Combat", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, tmtennis, 0, 0, tmtennis, tmtennis, tmtennis_state, 0, "Tomy", "Tennis (Tomy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, tmpacman, 0, 0, tmpacman, tmpacman, tmpacman_state, 0, "Tomy", "Pac Man (Tomy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, tmscramb, 0, 0, tmscramb, tmscramb, tmscramb_state, 0, "Tomy", "Scramble (Tomy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1982, tcaveman, 0, 0, tcaveman, tcaveman, tcaveman_state, 0, "Tomy", "Caveman (Tomy)", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, alnchase, 0, 0, alnchase, alnchase, alnchase_state, 0, "Tomy", "Alien Chase", MACHINE_SUPPORTS_SAVE )
// ***: As far as MAME is concerned, the game is emulated fine. But for it to be playable, it requires interaction
// with other, unemulatable, things eg. game board/pieces, playing cards, pen & paper, etc.
diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp
index 2d72d3c9750..cc98210c28c 100644
--- a/src/mame/drivers/hideseek.cpp
+++ b/src/mame/drivers/hideseek.cpp
@@ -96,7 +96,7 @@ PALETTE_INIT_MEMBER(hideseek_state, hideseek)
-static MACHINE_CONFIG_START( hideseek, hideseek_state )
+static MACHINE_CONFIG_START( hideseek )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, 7372800 * 4 )
diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp
index bae44989a52..0f9b8914cf9 100644
--- a/src/mame/drivers/higemaru.cpp
+++ b/src/mame/drivers/higemaru.cpp
@@ -162,7 +162,7 @@ static GFXDECODE_START( higemaru )
GFXDECODE_END
-static MACHINE_CONFIG_START( higemaru, higemaru_state )
+static MACHINE_CONFIG_START( higemaru )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz Sharp LH0080A Z80A-CPU-D */
@@ -223,4 +223,4 @@ ROM_START( higemaru )
ROM_END
-GAME( 1984, higemaru, 0, higemaru, higemaru, driver_device, 0, ROT0, "Capcom", "Pirate Ship Higemaru", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, higemaru, 0, higemaru, higemaru, higemaru_state, 0, ROT0, "Capcom", "Pirate Ship Higemaru", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index 7476e1f0cf8..6fa7329ea31 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -1124,7 +1124,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, highvdeo_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( tv_vcf, highvdeo_state )
+static MACHINE_CONFIG_START( tv_vcf )
MCFG_CPU_ADD("maincpu", V30, XTAL_12MHz/2 ) // ?
MCFG_CPU_PROGRAM_MAP(tv_vcf_map)
MCFG_CPU_IO_MAP(tv_vcf_io)
@@ -1202,7 +1202,7 @@ static MACHINE_CONFIG_DERIVED( ciclone, tv_tcf )
MCFG_CPU_VBLANK_INT_DRIVER("screen", highvdeo_state, vblank_irq_80186)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( brasil, highvdeo_state )
+static MACHINE_CONFIG_START( brasil )
MCFG_CPU_ADD("maincpu", I80186, 20000000 ) // fashion doesn't like 20/2 Mhz
MCFG_CPU_PROGRAM_MAP(brasil_map)
MCFG_CPU_IO_MAP(brasil_io)
@@ -1228,7 +1228,7 @@ static MACHINE_CONFIG_START( brasil, highvdeo_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( grancapi, highvdeo_state )
+static MACHINE_CONFIG_START( grancapi )
MCFG_CPU_ADD("maincpu", I80186, 20000000 )
MCFG_CPU_PROGRAM_MAP(brasil_map)
MCFG_CPU_IO_MAP(grancapi_io)
@@ -1254,7 +1254,7 @@ static MACHINE_CONFIG_START( grancapi, highvdeo_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( magicbom, highvdeo_state )
+static MACHINE_CONFIG_START( magicbom )
MCFG_CPU_ADD("maincpu", I80186, 20000000 )
MCFG_CPU_PROGRAM_MAP(brasil_map)
MCFG_CPU_IO_MAP(magicbom_io)
@@ -1646,20 +1646,20 @@ DRIVER_INIT_MEMBER(highvdeo_state, record)
}
-GAMEL( 2000, tour4000, 0, tv_vcf, tv_vcf, driver_device, 0, ROT0, "High Video", "Tour 4000", 0, layout_fashion )
-GAMEL( 2000, cfever40, 0, tv_vcf, tv_vcf, driver_device, 0, ROT0, "High Video", "Casino Fever 4.0", 0, layout_fashion )
-GAMEL( 2000, cfever50, 0, tv_vcf, tv_vcf, driver_device, 0, ROT0, "High Video", "Casino Fever 5.0", 0, layout_fashion )
-GAMEL( 2000, tour4010, 0, tv_ncf, tv_ncf, driver_device, 0, ROT0, "High Video", "Tour 4010", 0, layout_fashion )
-GAMEL( 2000, cfever51, 0, tv_ncf, tv_ncf, driver_device, 0, ROT0, "High Video", "Casino Fever 5.1", 0, layout_fashion )
-GAMEL( 2000, cfever61, 0, tv_ncf, tv_ncf, driver_device, 0, ROT0, "High Video", "Casino Fever 6.1", 0, layout_fashion )
-GAMEL( 2000, nyjoker, 0, nyjoker, nyjoker, driver_device, 0, ROT0, "High Video", "New York Joker", 0, layout_fashion )
-GAMEL( 2000, cfever1k, 0, tv_tcf, tv_tcf, driver_device, 0, ROT0, "High Video", "Casino Fever 1k", 0, layout_fashion )
-GAMEL( 2000, girotutt, 0, tv_tcf, tv_tcf, driver_device, 0, ROT0, "High Video", "GiroTutto", 0, layout_fashion )
-GAMEL( 2000, galeone, 0, nyjoker, nyjoker, driver_device, 0, ROT0, "San Remo Games", "Il Galeone", 0, layout_fashion )
-GAMEL( 2000, ciclone, 0, ciclone, tv_tcf, highvdeo_state, ciclone, ROT0, "High Video", "Ciclone", 0, layout_fashion )
-GAMEL( 2000, newmcard, 0, newmcard, tv_tcf, driver_device, 0, ROT0, "High Video", "New Magic Card", 0, layout_fashion )
-GAMEL( 2000, brasil, 0, brasil, brasil, driver_device, 0, ROT0, "High Video", "Bra$il (Version 3)", 0, layout_fashion )
-GAMEL( 2000, fashion, brasil, brasil, fashion, highvdeo_state, fashion, ROT0, "High Video", "Fashion (Version 2.14)", 0, layout_fashion )
-GAMEL( 2000, grancapi, 0, grancapi, brasil, driver_device, 0, ROT0, "High Video", "Gran Capitan (Version 3)", MACHINE_NOT_WORKING, layout_fashion )
-GAMEL( 2000, magicbom, 0, magicbom, fashion, highvdeo_state, fashion, ROT0, "High Video", "Magic Bomb (Version 1)", MACHINE_NOT_WORKING, layout_fashion )
-GAMEL( 2000, record, 0, newmcard, tv_tcf, highvdeo_state, record, ROT0, "High Video", "Record (Version 1)", 0, layout_fashion )
+GAMEL( 2000, tour4000, 0, tv_vcf, tv_vcf, highvdeo_state, 0, ROT0, "High Video", "Tour 4000", 0, layout_fashion )
+GAMEL( 2000, cfever40, 0, tv_vcf, tv_vcf, highvdeo_state, 0, ROT0, "High Video", "Casino Fever 4.0", 0, layout_fashion )
+GAMEL( 2000, cfever50, 0, tv_vcf, tv_vcf, highvdeo_state, 0, ROT0, "High Video", "Casino Fever 5.0", 0, layout_fashion )
+GAMEL( 2000, tour4010, 0, tv_ncf, tv_ncf, highvdeo_state, 0, ROT0, "High Video", "Tour 4010", 0, layout_fashion )
+GAMEL( 2000, cfever51, 0, tv_ncf, tv_ncf, highvdeo_state, 0, ROT0, "High Video", "Casino Fever 5.1", 0, layout_fashion )
+GAMEL( 2000, cfever61, 0, tv_ncf, tv_ncf, highvdeo_state, 0, ROT0, "High Video", "Casino Fever 6.1", 0, layout_fashion )
+GAMEL( 2000, nyjoker, 0, nyjoker, nyjoker, highvdeo_state, 0, ROT0, "High Video", "New York Joker", 0, layout_fashion )
+GAMEL( 2000, cfever1k, 0, tv_tcf, tv_tcf, highvdeo_state, 0, ROT0, "High Video", "Casino Fever 1k", 0, layout_fashion )
+GAMEL( 2000, girotutt, 0, tv_tcf, tv_tcf, highvdeo_state, 0, ROT0, "High Video", "GiroTutto", 0, layout_fashion )
+GAMEL( 2000, galeone, 0, nyjoker, nyjoker, highvdeo_state, 0, ROT0, "San Remo Games", "Il Galeone", 0, layout_fashion )
+GAMEL( 2000, ciclone, 0, ciclone, tv_tcf, highvdeo_state, ciclone, ROT0, "High Video", "Ciclone", 0, layout_fashion )
+GAMEL( 2000, newmcard, 0, newmcard, tv_tcf, highvdeo_state, 0, ROT0, "High Video", "New Magic Card", 0, layout_fashion )
+GAMEL( 2000, brasil, 0, brasil, brasil, highvdeo_state, 0, ROT0, "High Video", "Bra$il (Version 3)", 0, layout_fashion )
+GAMEL( 2000, fashion, brasil, brasil, fashion, highvdeo_state, fashion, ROT0, "High Video", "Fashion (Version 2.14)", 0, layout_fashion )
+GAMEL( 2000, grancapi, 0, grancapi, brasil, highvdeo_state, 0, ROT0, "High Video", "Gran Capitan (Version 3)", MACHINE_NOT_WORKING, layout_fashion )
+GAMEL( 2000, magicbom, 0, magicbom, fashion, highvdeo_state, fashion, ROT0, "High Video", "Magic Bomb (Version 1)", MACHINE_NOT_WORKING, layout_fashion )
+GAMEL( 2000, record, 0, newmcard, tv_tcf, highvdeo_state, record, ROT0, "High Video", "Record (Version 1)", 0, layout_fashion )
diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp
index aa18d0d14cf..d44c03e70f3 100644
--- a/src/mame/drivers/hikaru.cpp
+++ b/src/mame/drivers/hikaru.cpp
@@ -481,7 +481,7 @@ static ADDRESS_MAP_START( hikaru_map_slave, AS_PROGRAM, 64, hikaru_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( hikaru, hikaru_state )
+static MACHINE_CONFIG_START( hikaru )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK)
// MCFG_SH4_MD0(1)
@@ -806,11 +806,11 @@ ROM_START( sgnascaro )
ROM_PARAMETER( ":rom_board:key", "56dedf33" )
ROM_END
-GAME( 2000, hikaru, 0, hikaru, hikaru, driver_device, 0, ROT0, "Sega", "Hikaru Bios", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_IS_BIOS_ROOT )
-GAME( 1999, braveff, hikaru, hikaru, hikaru, driver_device, 0, ROT0, "Sega", "Brave Fire Fighters", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-GAME( 2000, airtrix, hikaru, hikaru, hikaru, driver_device, 0, ROT0, "Sega", "Air Trix (Rev A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-GAME( 2000, airtrixo, airtrix, hikaru, hikaru, driver_device, 0, ROT0, "Sega", "Air Trix (original)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-GAME( 2000, sgnascar, hikaru, hikaru, hikaru, driver_device, 0, ROT0, "Sega / Electronic Arts", "NASCAR Racing (Rev A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-GAME( 2000, sgnascaro,sgnascar, hikaru, hikaru, driver_device, 0, ROT0, "Sega / Electronic Arts", "NASCAR Racing (original)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-GAME( 2001, pharrier, hikaru, hikaru, hikaru, driver_device, 0, ROT0, "Sega", "Planet Harriers (Rev A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-GAME( 2001, podrace, hikaru, hikaru, hikaru, driver_device, 0, ROT0, "Sega", "Star Wars Pod Racer", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2000, hikaru, 0, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega", "Hikaru Bios", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_IS_BIOS_ROOT )
+GAME( 1999, braveff, hikaru, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega", "Brave Fire Fighters", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2000, airtrix, hikaru, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega", "Air Trix (Rev A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2000, airtrixo, airtrix, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega", "Air Trix (original)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2000, sgnascar, hikaru, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega / Electronic Arts", "NASCAR Racing (Rev A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2000, sgnascaro,sgnascar, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega / Electronic Arts", "NASCAR Racing (original)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2001, pharrier, hikaru, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega", "Planet Harriers (Rev A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 2001, podrace, hikaru, hikaru, hikaru, hikaru_state, 0, ROT0, "Sega", "Star Wars Pod Racer", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp
index 2646e71d392..ee067fe50e6 100644
--- a/src/mame/drivers/himesiki.cpp
+++ b/src/mame/drivers/himesiki.cpp
@@ -422,7 +422,7 @@ void himesiki_state::machine_reset()
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( himesiki, himesiki_state )
+static MACHINE_CONFIG_START( himesiki )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CLK2) /* it's a 6.000 MHz rated part, but near the 8 Mhz XTAL?? - Android skips lots of frames at 6, crashes at 4 */
@@ -563,8 +563,8 @@ ROM_START( androidp )
ROM_END
-GAME( 1989, himesiki, 0, himesiki, himesiki, driver_device, 0, ROT90, "Hi-Soft", "Himeshikibu (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, himesiki, 0, himesiki, himesiki, himesiki_state, 0, ROT90, "Hi-Soft", "Himeshikibu (Japan)", MACHINE_SUPPORTS_SAVE )
// the game changed significantly between these 2 versions
-GAME( 198?, androidp, 0, himesiki, androidp, driver_device, 0, ROT90, "Nasco", "Android (prototype, later build)", MACHINE_SUPPORTS_SAVE )
-GAME( 198?, androidpo, androidp, himesiki, androidpo, driver_device, 0, ROT90, "Nasco", "Android (prototype, early build)", MACHINE_SUPPORTS_SAVE )
+GAME( 198?, androidp, 0, himesiki, androidp, himesiki_state, 0, ROT90, "Nasco", "Android (prototype, later build)", MACHINE_SUPPORTS_SAVE )
+GAME( 198?, androidpo, androidp, himesiki, androidpo, himesiki_state, 0, ROT90, "Nasco", "Android (prototype, early build)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp
index 067ec706d89..dd0bc7f7403 100644
--- a/src/mame/drivers/hitme.cpp
+++ b/src/mame/drivers/hitme.cpp
@@ -311,7 +311,7 @@ void hitme_state::machine_reset()
m_timeout_time = attotime::zero;
}
-static MACHINE_CONFIG_START( hitme, hitme_state )
+static MACHINE_CONFIG_START( hitme )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/16)
@@ -690,9 +690,9 @@ ROM_END
*
*************************************/
-GAME( 1976, hitme, 0, hitme, hitme, driver_device, 0, ROT0, "Ramtek", "Hit Me (set 1)", MACHINE_SUPPORTS_SAVE ) // 05/1976
-GAME( 1976, hitme1, hitme, hitme, hitme, driver_device, 0, ROT0, "Ramtek", "Hit Me (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1976, m21, hitme, hitme, hitme, driver_device, 0, ROT0, "Mirco Games", "21 (Mirco)", MACHINE_SUPPORTS_SAVE ) // 08/1976, licensed?
-GAME( 1978, super21, 0, hitme, super21, driver_device, 0, ROT0, "Mirco Games", "Super Twenty One", MACHINE_SUPPORTS_SAVE )
-GAMEL(1976, barricad, 0, barricad, barricad, driver_device, 0, ROT0, "Ramtek", "Barricade", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barricad )
-GAMEL(1976, brickyrd, barricad, barricad, barricad, driver_device, 0, ROT0, "Ramtek", "Brickyard", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barricad )
+GAME( 1976, hitme, 0, hitme, hitme, hitme_state, 0, ROT0, "Ramtek", "Hit Me (set 1)", MACHINE_SUPPORTS_SAVE ) // 05/1976
+GAME( 1976, hitme1, hitme, hitme, hitme, hitme_state, 0, ROT0, "Ramtek", "Hit Me (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1976, m21, hitme, hitme, hitme, hitme_state, 0, ROT0, "Mirco Games", "21 (Mirco)", MACHINE_SUPPORTS_SAVE ) // 08/1976, licensed?
+GAME( 1978, super21, 0, hitme, super21, hitme_state, 0, ROT0, "Mirco Games", "Super Twenty One", MACHINE_SUPPORTS_SAVE )
+GAMEL(1976, barricad, 0, barricad, barricad, hitme_state, 0, ROT0, "Ramtek", "Barricade", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barricad )
+GAMEL(1976, brickyrd, barricad, barricad, barricad, hitme_state, 0, ROT0, "Ramtek", "Brickyard", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barricad )
diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp
index 44c2ca5c417..c761c9f8eb1 100644
--- a/src/mame/drivers/hitpoker.cpp
+++ b/src/mame/drivers/hitpoker.cpp
@@ -469,7 +469,7 @@ INTERRUPT_GEN_MEMBER(hitpoker_state::hitpoker_irq)
device.execute().set_input_line(MC68HC11_IRQ_LINE, HOLD_LINE);
}
-static MACHINE_CONFIG_START( hitpoker, hitpoker_state )
+static MACHINE_CONFIG_START( hitpoker )
MCFG_CPU_ADD("maincpu", MC68HC11,1000000)
MCFG_CPU_PROGRAM_MAP(hitpoker_map)
MCFG_CPU_IO_MAP(hitpoker_io)
diff --git a/src/mame/drivers/hk68v10.cpp b/src/mame/drivers/hk68v10.cpp
index e5fbeb53234..049dc5c2ed8 100644
--- a/src/mame/drivers/hk68v10.cpp
+++ b/src/mame/drivers/hk68v10.cpp
@@ -332,7 +332,7 @@ SLOT_INTERFACE_END
/*
* Machine configuration
*/
-static MACHINE_CONFIG_START (hk68v10, hk68v10_state)
+static MACHINE_CONFIG_START (hk68v10)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68010, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP (hk68v10_mem)
@@ -389,5 +389,5 @@ ROM_LOAD16_BYTE ("hk68kv10U12.bin", 0xFC0000, 0x2000, CRC (f2d688e9) SHA1 (e6869
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1985, hk68v10, 0, 0, hk68v10, hk68v10, driver_device, 0, "Heurikon Corporation", "HK68/V10", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP (1985, hk68v10, 0, 0, hk68v10, hk68v10, hk68v10_state, 0, "Heurikon Corporation", "HK68/V10", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp
index ed5612dea54..7054fa664d4 100644
--- a/src/mame/drivers/hnayayoi.cpp
+++ b/src/mame/drivers/hnayayoi.cpp
@@ -534,7 +534,7 @@ void hnayayoi_state::machine_reset()
}
-static MACHINE_CONFIG_START( hnayayoi, hnayayoi_state )
+static MACHINE_CONFIG_START( hnayayoi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 20000000/4 ) /* 5 MHz ???? */
@@ -570,7 +570,7 @@ static MACHINE_CONFIG_START( hnayayoi, hnayayoi_state )
MCFG_SOUND_ROUTE(3, "mono", 0.80)
MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -679,6 +679,6 @@ DRIVER_INIT_MEMBER(hnayayoi_state,hnfubuki)
}
-GAME( 1987, hnayayoi, 0, hnayayoi, hnayayoi, driver_device, 0, ROT0, "Dyna Electronics", "Hana Yayoi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hnayayoi, 0, hnayayoi, hnayayoi, hnayayoi_state, 0, ROT0, "Dyna Electronics", "Hana Yayoi (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, hnfubuki, hnayayoi, hnfubuki, hnfubuki, hnayayoi_state, hnfubuki, ROT0, "Dynax", "Hana Fubuki [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, untoucha, 0, untoucha, untoucha, driver_device, 0, ROT0, "Dynax", "Untouchable (Ver. 2.10)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, untoucha, 0, untoucha, untoucha, hnayayoi_state, 0, ROT0, "Dynax", "Untouchable (Ver. 2.10)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp
index 724d985bedc..241faead712 100644
--- a/src/mame/drivers/hng64.cpp
+++ b/src/mame/drivers/hng64.cpp
@@ -1530,7 +1530,7 @@ void hng64_state::machine_reset()
MACHINE_CONFIG_EXTERN(hng64_audio);
-static MACHINE_CONFIG_START(hng64, hng64_state)
+static MACHINE_CONFIG_START(hng64)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", VR4300BE, HNG64_MASTER_CLOCK) // actually R4300
MCFG_MIPS3_ICACHE_SIZE(16384)
diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp
index 3d22462253f..9f2181304a7 100644
--- a/src/mame/drivers/holeland.cpp
+++ b/src/mame/drivers/holeland.cpp
@@ -268,7 +268,7 @@ static GFXDECODE_START( crzrally )
GFXDECODE_END
-static MACHINE_CONFIG_START( holeland, holeland_state )
+static MACHINE_CONFIG_START( holeland )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3355700) /* measured 298ns on PCB */
@@ -343,7 +343,7 @@ Notes:
*/
-static MACHINE_CONFIG_START( crzrally, holeland_state )
+static MACHINE_CONFIG_START( crzrally )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5 MHz */
@@ -533,8 +533,8 @@ ROM_START( crzrallyg )
ROM_END
-GAME( 1984, holeland, 0, holeland, holeland, driver_device, 0, ROT0, "Tecfri", "Hole Land (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, holeland2, holeland, holeland, holeland2, driver_device, 0, ROT0, "Tecfri", "Hole Land (Spain)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) //attract is different
-GAME( 1985, crzrally, 0, crzrally, crzrally, driver_device, 0, ROT270, "Tecfri", "Crazy Rally (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, crzrallya, crzrally, crzrally, crzrally, driver_device, 0, ROT270, "Tecfri", "Crazy Rally (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, crzrallyg, crzrally, crzrally, crzrally, driver_device, 0, ROT270, "Tecfri (Gecas license)", "Crazy Rally (Gecas license)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, holeland, 0, holeland, holeland, holeland_state, 0, ROT0, "Tecfri", "Hole Land (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, holeland2, holeland, holeland, holeland2, holeland_state, 0, ROT0, "Tecfri", "Hole Land (Spain)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) //attract is different
+GAME( 1985, crzrally, 0, crzrally, crzrally, holeland_state, 0, ROT270, "Tecfri", "Crazy Rally (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, crzrallya, crzrally, crzrally, crzrally, holeland_state, 0, ROT270, "Tecfri", "Crazy Rally (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, crzrallyg, crzrally, crzrally, crzrally, holeland_state, 0, ROT270, "Tecfri (Gecas license)", "Crazy Rally (Gecas license)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp
index 38a68baf9d2..c1bc171ae4e 100644
--- a/src/mame/drivers/homedata.cpp
+++ b/src/mame/drivers/homedata.cpp
@@ -1211,7 +1211,7 @@ MACHINE_RESET_MEMBER(homedata_state,reikaids)
m_gfx_bank[1] = 0; // this is not used by reikaids
}
-static MACHINE_CONFIG_START( mrokumei, homedata_state )
+static MACHINE_CONFIG_START( mrokumei )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
@@ -1258,7 +1258,7 @@ MACHINE_CONFIG_END
/**************************************************************************/
-static MACHINE_CONFIG_START( reikaids, homedata_state )
+static MACHINE_CONFIG_START( reikaids )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
@@ -1314,7 +1314,7 @@ MACHINE_CONFIG_END
/**************************************************************************/
-static MACHINE_CONFIG_START( pteacher, homedata_state )
+static MACHINE_CONFIG_START( pteacher )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 16000000/4) /* 4MHz ? */
@@ -1483,7 +1483,7 @@ GFXDECODE_END
/* clocks are 16mhz and 9mhz */
-static MACHINE_CONFIG_START( mirderby, homedata_state )
+static MACHINE_CONFIG_START( mirderby )
MCFG_CPU_ADD("maincpu", M6809, 16000000/8) /* 2 Mhz */
MCFG_CPU_PROGRAM_MAP(cpu2_map)
@@ -2064,25 +2064,25 @@ DRIVER_INIT_MEMBER(homedata_state,mirderby)
}
-GAME( 1987, hourouki, 0, mrokumei, mjhokite, driver_device, 0, ROT0, "Home Data", "Mahjong Hourouki Part 1 - Seisyun Hen (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, mhgaiden, 0, mrokumei, mjhokite, driver_device, 0, ROT0, "Home Data", "Mahjong Hourouki Gaiden (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjhokite, 0, mrokumei, mjhokite, driver_device, 0, ROT0, "Home Data", "Mahjong Hourouki Okite (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjclinic, 0, mrokumei, mjhokite, driver_device, 0, ROT0, "Home Data", "Mahjong Clinic (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjclinica, mjclinic, mrokumei, mjhokite, driver_device, 0, ROT0, "Home Data", "Mahjong Clinic (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mrokumei, 0, mrokumei, mjhokite, driver_device, 0, ROT0, "Home Data", "Mahjong Rokumeikan (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hourouki, 0, mrokumei, mjhokite, homedata_state, 0, ROT0, "Home Data", "Mahjong Hourouki Part 1 - Seisyun Hen (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mhgaiden, 0, mrokumei, mjhokite, homedata_state, 0, ROT0, "Home Data", "Mahjong Hourouki Gaiden (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjhokite, 0, mrokumei, mjhokite, homedata_state, 0, ROT0, "Home Data", "Mahjong Hourouki Okite (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjclinic, 0, mrokumei, mjhokite, homedata_state, 0, ROT0, "Home Data", "Mahjong Clinic (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjclinica, mjclinic, mrokumei, mjhokite, homedata_state, 0, ROT0, "Home Data", "Mahjong Clinic (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mrokumei, 0, mrokumei, mjhokite, homedata_state, 0, ROT0, "Home Data", "Mahjong Rokumeikan (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, reikaids, 0, reikaids, reikaids, homedata_state, reikaids, ROT0, "Home Data", "Reikai Doushi (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, battlcry, 0, reikaids, battlcry, homedata_state, battlcry, ROT0, "Home Data", "Battlecry", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mjkojink, 0, pteacher, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Kojinkyouju (Private Teacher) (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjjoship, 0, pteacher, mjjoship, driver_device, 0, ROT0, "Home Data", "Mahjong Joshi Pro-wres -Give up 5 byou mae- (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, vitaminc, 0, pteacher, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Vitamin C (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mjyougo, 0, pteacher, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong-yougo no Kisotairyoku (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjkinjas, 0, mjkinjas, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Kinjirareta Asobi (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992?,jogakuen, 0, pteacher, jogakuen, homedata_state, jogakuen, ROT0, "Windom", "Mahjong Jogakuen (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, reikaids, 0, reikaids, reikaids, homedata_state, reikaids, ROT0, "Home Data", "Reikai Doushi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, battlcry, 0, reikaids, battlcry, homedata_state, battlcry, ROT0, "Home Data", "Battlecry", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mjkojink, 0, pteacher, pteacher, homedata_state, 0, ROT0, "Home Data", "Mahjong Kojinkyouju (Private Teacher) (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjjoship, 0, pteacher, mjjoship, homedata_state, 0, ROT0, "Home Data", "Mahjong Joshi Pro-wres -Give up 5 byou mae- (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, vitaminc, 0, pteacher, pteacher, homedata_state, 0, ROT0, "Home Data", "Mahjong Vitamin C (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mjyougo, 0, pteacher, pteacher, homedata_state, 0, ROT0, "Home Data", "Mahjong-yougo no Kisotairyoku (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjkinjas, 0, mjkinjas, pteacher, homedata_state, 0, ROT0, "Home Data", "Mahjong Kinjirareta Asobi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992?,jogakuen, 0, pteacher, jogakuen, homedata_state, jogakuen, ROT0, "Windom", "Mahjong Jogakuen (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, lemnangl, 0, lemnangl, pteacher, driver_device, 0, ROT0, "Home Data", "Mahjong Lemon Angel (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjprivat, 0, lemnangl, pteacher, driver_device, 0, ROT0, "Matoba", "Mahjong Private (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, lemnangl, 0, lemnangl, pteacher, homedata_state, 0, ROT0, "Home Data", "Mahjong Lemon Angel (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjprivat, 0, lemnangl, pteacher, homedata_state, 0, ROT0, "Matoba", "Mahjong Private (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991?,mjikaga, 0, lemnangl, mjikaga, homedata_state, mjikaga, ROT0, "Mitchell", "Mahjong Ikaga Desu ka (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1991?,mjikaga, 0, lemnangl, mjikaga, homedata_state, mjikaga, ROT0, "Mitchell", "Mahjong Ikaga Desu ka (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mirderby, 0, mirderby, mirderby, homedata_state, mirderby, ROT0, "Home Data?", "Miracle Derby - Ascot", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
+GAME( 1988, mirderby, 0, mirderby, mirderby, homedata_state, mirderby, ROT0, "Home Data?", "Miracle Derby - Ascot", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp
index 8393ede6b99..383a0db1cfe 100644
--- a/src/mame/drivers/homelab.cpp
+++ b/src/mame/drivers/homelab.cpp
@@ -732,7 +732,7 @@ QUICKLOAD_LOAD_MEMBER( homelab_state,homelab)
}
/* Machine driver */
-static MACHINE_CONFIG_START( homelab, homelab_state )
+static MACHINE_CONFIG_START( homelab )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(homelab2_mem)
@@ -764,7 +764,7 @@ static MACHINE_CONFIG_START( homelab, homelab_state )
MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 2)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( homelab3, homelab_state )
+static MACHINE_CONFIG_START( homelab3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4)
MCFG_CPU_PROGRAM_MAP(homelab3_mem)
@@ -797,7 +797,7 @@ static MACHINE_CONFIG_START( homelab3, homelab_state )
MCFG_QUICKLOAD_ADD("quickload", homelab_state, homelab, "htp", 2)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( brailab4, homelab_state )
+static MACHINE_CONFIG_START( brailab4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4)
MCFG_CPU_PROGRAM_MAP(brailab4_mem)
@@ -910,9 +910,9 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, homelab2, 0, 0, homelab, homelab, driver_device, 0, "Jozsef and Endre Lukacs", "Homelab 2 / Aircomp 16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1983, homelab3, homelab2, 0, homelab3, homelab3, driver_device, 0, "Jozsef and Endre Lukacs", "Homelab 3", MACHINE_NOT_WORKING )
-COMP( 1984, homelab4, homelab2, 0, homelab3, homelab3, driver_device, 0, "Jozsef and Endre Lukacs", "Homelab 4", MACHINE_NOT_WORKING )
-COMP( 1984, brailab4, homelab2, 0, brailab4, brailab4, homelab_state, brailab4, "Jozsef and Endre Lukacs", "Brailab 4", MACHINE_NOT_WORKING )
-COMP( 1988, braiplus, homelab2, 0, brailab4, brailab4, homelab_state, brailab4, "Jozsef and Endre Lukacs", "Brailab Plus", MACHINE_NOT_WORKING | MACHINE_IS_SKELETON )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, homelab2, 0, 0, homelab, homelab, homelab_state, 0, "Jozsef and Endre Lukacs", "Homelab 2 / Aircomp 16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1983, homelab3, homelab2, 0, homelab3, homelab3, homelab_state, 0, "Jozsef and Endre Lukacs", "Homelab 3", MACHINE_NOT_WORKING )
+COMP( 1984, homelab4, homelab2, 0, homelab3, homelab3, homelab_state, 0, "Jozsef and Endre Lukacs", "Homelab 4", MACHINE_NOT_WORKING )
+COMP( 1984, brailab4, homelab2, 0, brailab4, brailab4, homelab_state, brailab4, "Jozsef and Endre Lukacs", "Brailab 4", MACHINE_NOT_WORKING )
+COMP( 1988, braiplus, homelab2, 0, brailab4, brailab4, homelab_state, brailab4, "Jozsef and Endre Lukacs", "Brailab Plus", MACHINE_NOT_WORKING | MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp
index 4fc062d6d21..2176b59d42d 100644
--- a/src/mame/drivers/homerun.cpp
+++ b/src/mame/drivers/homerun.cpp
@@ -347,7 +347,7 @@ void homerun_state::machine_reset()
/**************************************************************************/
-static MACHINE_CONFIG_START( dynashot, homerun_state )
+static MACHINE_CONFIG_START( dynashot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4)
@@ -452,6 +452,6 @@ ROM_START( ganjaja )
ROM_END
-GAME( 1988, homerun, 0, homerun, homerun, driver_device, 0, ROT0, "Jaleco", "Moero!! Pro Yakyuu Homerun Kyousou", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, dynashot, 0, dynashot, dynashot, driver_device, 0, ROT0, "Jaleco", "Dynamic Shoot Kyousou", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ganjaja, 0, ganjaja, ganjaja, driver_device, 0, ROT0, "Jaleco", "Ganbare Jajamaru Saisho wa Goo / Ganbare Jajamaru Hop Step & Jump", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, homerun, 0, homerun, homerun, homerun_state, 0, ROT0, "Jaleco", "Moero!! Pro Yakyuu Homerun Kyousou", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, dynashot, 0, dynashot, dynashot, homerun_state, 0, ROT0, "Jaleco", "Dynamic Shoot Kyousou", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ganjaja, 0, ganjaja, ganjaja, homerun_state, 0, ROT0, "Jaleco", "Ganbare Jajamaru Saisho wa Goo / Ganbare Jajamaru Hop Step & Jump", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp
index 880bf285b71..0a21d013dc0 100644
--- a/src/mame/drivers/homez80.cpp
+++ b/src/mame/drivers/homez80.cpp
@@ -278,7 +278,7 @@ INTERRUPT_GEN_MEMBER(homez80_state::homez80_interrupt)
m_irq ^= 1;
}
-static MACHINE_CONFIG_START( homez80, homez80_state )
+static MACHINE_CONFIG_START( homez80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(homez80_mem)
@@ -309,5 +309,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 2008, homez80, 0, 0, homez80, homez80, driver_device, 0, "Kun-Szabo Marton", "Homebrew Z80 Computer", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 2008, homez80, 0, 0, homez80, homez80, homez80_state, 0, "Kun-Szabo Marton", "Homebrew Z80 Computer", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp
index 895b8150437..c40e693cccd 100644
--- a/src/mame/drivers/horizon.cpp
+++ b/src/mame/drivers/horizon.cpp
@@ -141,7 +141,7 @@ SLOT_INTERFACE_END
// MACHINE_CONFIG( horizon )
//-------------------------------------------------
-static MACHINE_CONFIG_START( horizon, horizon_state )
+static MACHINE_CONFIG_START( horizon )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(horizon_mem)
@@ -218,6 +218,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1976, nshrz, 0, 0, horizon, horizon, driver_device, 0, "North Star Computers", "Horizon (North Star Computers)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1979, vector1, nshrz, 0, horizon, horizon, driver_device, 0, "Vector Graphic", "Vector 1+ (DD drive)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, nshrz, 0, 0, horizon, horizon, horizon_state, 0, "North Star Computers", "Horizon (North Star Computers)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1979, vector1, nshrz, 0, horizon, horizon, horizon_state, 0, "Vector Graphic", "Vector 1+ (DD drive)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index 4f86929cf3c..e68fd5b00a8 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -1004,7 +1004,7 @@ ADC12138_IPT_CONVERT_CB(hornet_state::adc12138_input_callback)
return (double)(value) / 2047.0;
}
-static MACHINE_CONFIG_START( hornet, hornet_state )
+static MACHINE_CONFIG_START( hornet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
@@ -1063,7 +1063,7 @@ static MACHINE_CONFIG_START( hornet, hornet_state )
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_HORNET)
+ MCFG_KONPPC_CGBOARD_TYPE(HORNET)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( hornet_2board, hornet )
@@ -1120,7 +1120,7 @@ static MACHINE_CONFIG_DERIVED( hornet_2board, hornet )
MCFG_DEVICE_REMOVE("konppc")
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(2)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_HORNET)
+ MCFG_KONPPC_CGBOARD_TYPE(HORNET)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( terabrst, hornet )
diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp
index 1dd41f02888..49abf987b1a 100644
--- a/src/mame/drivers/hotblock.cpp
+++ b/src/mame/drivers/hotblock.cpp
@@ -206,7 +206,7 @@ static INPUT_PORTS_START( hotblock )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( hotblock, hotblock_state )
+static MACHINE_CONFIG_START( hotblock )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 10000000)
@@ -241,4 +241,4 @@ ROM_START( hotblock )
ROM_LOAD( "hotblk6.ic5", 0x080000, 0x080000, CRC(3176d231) SHA1(ac22fd0e9820c6714f51a3d8315eb5d43ef91eeb) )
ROM_END
-GAME( 1993, hotblock, 0, hotblock, hotblock, driver_device, 0, ROT0, "NIX?", "Hot Blocks - Tetrix II", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, hotblock, 0, hotblock, hotblock, hotblock_state, 0, ROT0, "NIX?", "Hot Blocks - Tetrix II", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp
index 4ff5e2d339e..2fae269a5be 100644
--- a/src/mame/drivers/hotstuff.cpp
+++ b/src/mame/drivers/hotstuff.cpp
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( hotstuff )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( hotstuff, hotstuff_state )
+static MACHINE_CONFIG_START( hotstuff )
MCFG_CPU_ADD("maincpu", M68000, 16000000)
MCFG_CPU_PROGRAM_MAP(hotstuff_map)
@@ -153,4 +153,4 @@ ROM_START( hotstuff )
ROM_LOAD16_WORD_SWAP( "hot stuff symbol u8 (68000).bin", 0x00000, 0x80000, CRC(f154a157) SHA1(92ae0fb977e2dcc0377487d768f95c6e447e990b) )
ROM_END
-GAME( ????, hotstuff, 0, hotstuff, hotstuff, driver_device, 0, ROT0, "Olympic Video Gaming", "Olympic Hot Stuff (TAS 5 Reel System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( ????, hotstuff, 0, hotstuff, hotstuff, hotstuff_state, 0, ROT0, "Olympic Video Gaming", "Olympic Hot Stuff (TAS 5 Reel System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp
index 4737c674b71..0a87fb13037 100644
--- a/src/mame/drivers/hp16500.cpp
+++ b/src/mame/drivers/hp16500.cpp
@@ -397,7 +397,7 @@ uint32_t hp16500_state::screen_update_hp16500(screen_device &screen, bitmap_rgb3
return 0;
}
-static MACHINE_CONFIG_START( hp1650, hp16500_state )
+static MACHINE_CONFIG_START( hp1650 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(hp1650_map)
@@ -417,7 +417,7 @@ static MACHINE_CONFIG_START( hp1650, hp16500_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp1651, hp16500_state )
+static MACHINE_CONFIG_START( hp1651 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(hp1651_map)
@@ -437,7 +437,7 @@ static MACHINE_CONFIG_START( hp1651, hp16500_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp16500a, hp16500_state )
+static MACHINE_CONFIG_START( hp16500a )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(hp16500a_map)
@@ -457,7 +457,7 @@ static MACHINE_CONFIG_START( hp16500a, hp16500_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp16500, hp16500_state )
+static MACHINE_CONFIG_START( hp16500 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68EC030, 25000000)
MCFG_CPU_PROGRAM_MAP(hp16500_map)
@@ -503,7 +503,7 @@ ROM_START( hp16500b )
ROM_LOAD32_BYTE( "16500-80017.bin", 0x000003, 0x008000, CRC(e0b1096b) SHA1(426bb9a4756d8087bded4f6b61365d733ffbb09a) )
ROM_END
-COMP( 1989, hp1650b, 0, 0, hp1650, hp16500, driver_device, 0, "Hewlett Packard", "HP 1650b", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-COMP( 1989, hp1651b, 0, 0, hp1651, hp16500, driver_device, 0, "Hewlett Packard", "HP 1651b", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-COMP( 1991, hp165ka0, 0, 0, hp16500a, hp16500, driver_device, 0, "Hewlett Packard", "HP 16500a", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-COMP( 1991, hp16500b, 0, 0, hp16500, hp16500, driver_device, 0, "Hewlett Packard", "HP 16500b", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+COMP( 1989, hp1650b, 0, 0, hp1650, hp16500, hp16500_state, 0, "Hewlett Packard", "HP 1650b", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+COMP( 1989, hp1651b, 0, 0, hp1651, hp16500, hp16500_state, 0, "Hewlett Packard", "HP 1651b", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+COMP( 1991, hp165ka0, 0, 0, hp16500a, hp16500, hp16500_state, 0, "Hewlett Packard", "HP 16500a", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+COMP( 1991, hp16500b, 0, 0, hp16500, hp16500, hp16500_state, 0, "Hewlett Packard", "HP 16500b", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/hp48.cpp b/src/mame/drivers/hp48.cpp
index 545aab99639..d703b139449 100644
--- a/src/mame/drivers/hp48.cpp
+++ b/src/mame/drivers/hp48.cpp
@@ -1257,7 +1257,7 @@ ADDRESS_MAP_END
/*************************** driver ********************************/
-static MACHINE_CONFIG_START( hp48_common, hp48_state )
+static MACHINE_CONFIG_START( hp48_common )
/* cpu */
MCFG_CPU_ADD ( "maincpu", SATURN, 3937007 ) /* almost 4 MHz */
@@ -1352,10 +1352,10 @@ MACHINE_CONFIG_END
COMP ( 1990, hp48sx, 0 , 0, hp48sx, hp48sx, hp48_state, hp48, "Hewlett Packard", "HP48SX", 0 )
-COMP ( 1991, hp48s , hp48sx, 0, hp48s, hp48sx, hp48_state, hp48, "Hewlett Packard", "HP48S", 0 )
+COMP ( 1991, hp48s , hp48sx, 0, hp48s, hp48sx, hp48_state, hp48, "Hewlett Packard", "HP48S", 0 )
COMP ( 1993, hp48gx, 0 , 0, hp48gx, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP48GX", 0 )
-COMP ( 1993, hp48g , hp48gx, 0, hp48g, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP48G", 0 )
+COMP ( 1993, hp48g , hp48gx, 0, hp48g, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP48G", 0 )
COMP ( 1998, hp48gp, hp48gx, 0, hp48gp, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP48G+", 0 )
-COMP ( 1999, hp49g , 0, 0, hp49g, hp49g, hp48_state, hp48, "Hewlett Packard", "HP49G", 0 )
-COMP ( 1995, hp38g , 0, 0, hp48g, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP38G", 0 )
-COMP ( 2000, hp39g , 0, 0, hp48g, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP39G", MACHINE_NOT_WORKING )
+COMP ( 1999, hp49g , 0, 0, hp49g, hp49g, hp48_state, hp48, "Hewlett Packard", "HP49G", 0 )
+COMP ( 1995, hp38g , 0, 0, hp48g, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP38G", 0 )
+COMP ( 2000, hp39g , 0, 0, hp48g, hp48gx, hp48_state, hp48, "Hewlett Packard", "HP39G", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp
index 23dc2dd7cf9..a1592d9fcf0 100644
--- a/src/mame/drivers/hp49gp.cpp
+++ b/src/mame/drivers/hp49gp.cpp
@@ -276,7 +276,7 @@ DRIVER_INIT_MEMBER(hp49gp_state,hp49gp)
lcd_spi_init();
}
-static MACHINE_CONFIG_START( hp49gp, hp49gp_state )
+static MACHINE_CONFIG_START( hp49gp )
MCFG_CPU_ADD("maincpu", ARM9, 400000000)
MCFG_CPU_PROGRAM_MAP(hp49gp_map)
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index 8338550fb0d..d545cf1a13a 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -171,249 +171,249 @@
class hp64k_state : public driver_device
{
public:
- hp64k_state(const machine_config &mconfig, device_type type, const char *tag);
-
- virtual void driver_start() override;
- //virtual void machine_start();
- virtual void video_start() override;
- virtual void machine_reset() override;
-
- uint8_t hp64k_crtc_filter(uint8_t data);
- DECLARE_WRITE16_MEMBER(hp64k_crtc_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_drq_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_vrtc_w);
-
- I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
-
- DECLARE_READ16_MEMBER(hp64k_rear_sw_r);
-
- IRQ_CALLBACK_MEMBER(hp64k_irq_callback);
- void hp64k_update_irl(void);
- DECLARE_WRITE16_MEMBER(hp64k_irl_mask_w);
-
- TIMER_DEVICE_CALLBACK_MEMBER(hp64k_kb_scan);
- DECLARE_READ16_MEMBER(hp64k_kb_r);
-
- TIMER_DEVICE_CALLBACK_MEMBER(hp64k_line_sync);
- DECLARE_READ16_MEMBER(hp64k_deltat_r);
- DECLARE_WRITE16_MEMBER(hp64k_deltat_w);
-
- DECLARE_READ16_MEMBER(hp64k_slot_r);
- DECLARE_WRITE16_MEMBER(hp64k_slot_w);
- DECLARE_WRITE16_MEMBER(hp64k_slot_sel_w);
-
- DECLARE_READ16_MEMBER(hp64k_flp_r);
- DECLARE_WRITE16_MEMBER(hp64k_flp_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_flp_drq_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_flp_intrq_w);
- void hp64k_update_floppy_dma(void);
- void hp64k_update_floppy_irq(void);
- void hp64k_update_drv_ctrl(void);
- DECLARE_WRITE8_MEMBER(hp64k_floppy0_rdy);
- DECLARE_WRITE8_MEMBER(hp64k_floppy1_rdy);
- void hp64k_floppy_idx_cb(floppy_image_device *floppy , int state);
- void hp64k_floppy_wpt_cb(floppy_image_device *floppy , int state);
-
- DECLARE_READ16_MEMBER(hp64k_usart_r);
- DECLARE_WRITE16_MEMBER(hp64k_usart_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_rxrdy_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_txrdy_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_txd_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_dtr_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_rts_w);
- DECLARE_WRITE16_MEMBER(hp64k_loopback_w);
- void hp64k_update_loopback(void);
- DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_rxd_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_dcd_w);
- DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_cts_w);
-
- DECLARE_WRITE16_MEMBER(hp64k_beep_w);
- TIMER_DEVICE_CALLBACK_MEMBER(hp64k_beeper_off);
-
- DECLARE_WRITE_LINE_MEMBER(hp64k_baud_clk_w);
+ hp64k_state(const machine_config &mconfig, device_type type, const char *tag);
+
+ virtual void driver_start() override;
+ //virtual void machine_start();
+ virtual void video_start() override;
+ virtual void machine_reset() override;
+
+ uint8_t hp64k_crtc_filter(uint8_t data);
+ DECLARE_WRITE16_MEMBER(hp64k_crtc_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_drq_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_crtc_vrtc_w);
+
+ I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
+
+ DECLARE_READ16_MEMBER(hp64k_rear_sw_r);
+
+ IRQ_CALLBACK_MEMBER(hp64k_irq_callback);
+ void hp64k_update_irl(void);
+ DECLARE_WRITE16_MEMBER(hp64k_irl_mask_w);
+
+ TIMER_DEVICE_CALLBACK_MEMBER(hp64k_kb_scan);
+ DECLARE_READ16_MEMBER(hp64k_kb_r);
+
+ TIMER_DEVICE_CALLBACK_MEMBER(hp64k_line_sync);
+ DECLARE_READ16_MEMBER(hp64k_deltat_r);
+ DECLARE_WRITE16_MEMBER(hp64k_deltat_w);
+
+ DECLARE_READ16_MEMBER(hp64k_slot_r);
+ DECLARE_WRITE16_MEMBER(hp64k_slot_w);
+ DECLARE_WRITE16_MEMBER(hp64k_slot_sel_w);
+
+ DECLARE_READ16_MEMBER(hp64k_flp_r);
+ DECLARE_WRITE16_MEMBER(hp64k_flp_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_flp_drq_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_flp_intrq_w);
+ void hp64k_update_floppy_dma(void);
+ void hp64k_update_floppy_irq(void);
+ void hp64k_update_drv_ctrl(void);
+ DECLARE_WRITE8_MEMBER(hp64k_floppy0_rdy);
+ DECLARE_WRITE8_MEMBER(hp64k_floppy1_rdy);
+ void hp64k_floppy_idx_cb(floppy_image_device *floppy , int state);
+ void hp64k_floppy_wpt_cb(floppy_image_device *floppy , int state);
+
+ DECLARE_READ16_MEMBER(hp64k_usart_r);
+ DECLARE_WRITE16_MEMBER(hp64k_usart_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_rxrdy_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_txrdy_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_txd_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_dtr_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_rts_w);
+ DECLARE_WRITE16_MEMBER(hp64k_loopback_w);
+ void hp64k_update_loopback(void);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_rxd_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_dcd_w);
+ DECLARE_WRITE_LINE_MEMBER(hp64k_rs232_cts_w);
+
+ DECLARE_WRITE16_MEMBER(hp64k_beep_w);
+ TIMER_DEVICE_CALLBACK_MEMBER(hp64k_beeper_off);
+
+ DECLARE_WRITE_LINE_MEMBER(hp64k_baud_clk_w);
private:
- required_device<hp_5061_3011_cpu_device> m_cpu;
- required_device<i8275_device> m_crtc;
- required_device<palette_device> m_palette;
- required_ioport m_io_key0;
- required_ioport m_io_key1;
- required_ioport m_io_key2;
- required_ioport m_io_key3;
- required_device<fd1791_t> m_fdc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<ttl74123_device> m_ss0;
- required_device<ttl74123_device> m_ss1;
- required_ioport m_rear_panel_sw;
- required_ioport m_rs232_sw;
- required_device<beep_device> m_beeper;
- required_device<timer_device> m_beep_timer;
- required_device<com8116_device> m_baud_rate;
- required_ioport m_s5_sw;
- required_device<i8251_device> m_uart;
- required_device<rs232_port_device> m_rs232;
-
- // Character generator
- const uint8_t *m_chargen;
-
- uint32_t m_crtc_ptr;
- bool m_crtc_drq;
- bool m_vrtc;
-
- // Interrupt handling
- uint8_t m_irl_mask;
- uint8_t m_irl_pending;
-
- // State of keyboard
- ioport_value m_kb_state[ 4 ];
- uint8_t m_kb_row_col;
- bool m_kb_scan_on;
- bool m_kb_pressed;
-
- // Slot selection
- std::vector<uint16_t> m_low32k_ram;
- uint8_t m_slot_select;
- uint8_t m_slot_map;
-
- // Floppy I/F
- uint8_t m_floppy_in_latch_msb; // U23
- uint8_t m_floppy_in_latch_lsb; // U38
- uint8_t m_floppy_out_latch_msb; // U22
- uint8_t m_floppy_out_latch_lsb; // U37
- uint8_t m_floppy_if_ctrl; // U24
- bool m_floppy_dmaen;
- bool m_floppy_dmai;
- bool m_floppy_mdci;
- bool m_floppy_intrq;
- bool m_floppy_drq;
- bool m_floppy0_wpt;
- bool m_floppy1_wpt;
- uint8_t m_floppy_drv_ctrl; // U39
- uint8_t m_floppy_status; // U25
-
- typedef enum {
- HP64K_FLPST_IDLE,
- HP64K_FLPST_DMAWR1,
- HP64K_FLPST_DMAWR2,
- HP64K_FLPST_DMARD1,
- HP64K_FLPST_DMARD2
- } floppy_state_t;
-
- floppy_state_t m_floppy_if_state;
- floppy_image_device *m_current_floppy;
-
- // RS232 I/F
- bool m_16x_clk;
- bool m_baud_clk;
- uint8_t m_16x_div;
- bool m_loopback;
- bool m_txd_state;
- bool m_dtr_state;
- bool m_rts_state;
+ required_device<hp_5061_3011_cpu_device> m_cpu;
+ required_device<i8275_device> m_crtc;
+ required_device<palette_device> m_palette;
+ required_ioport m_io_key0;
+ required_ioport m_io_key1;
+ required_ioport m_io_key2;
+ required_ioport m_io_key3;
+ required_device<fd1791_device> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<ttl74123_device> m_ss0;
+ required_device<ttl74123_device> m_ss1;
+ required_ioport m_rear_panel_sw;
+ required_ioport m_rs232_sw;
+ required_device<beep_device> m_beeper;
+ required_device<timer_device> m_beep_timer;
+ required_device<com8116_device> m_baud_rate;
+ required_ioport m_s5_sw;
+ required_device<i8251_device> m_uart;
+ required_device<rs232_port_device> m_rs232;
+
+ // Character generator
+ const uint8_t *m_chargen;
+
+ uint32_t m_crtc_ptr;
+ bool m_crtc_drq;
+ bool m_vrtc;
+
+ // Interrupt handling
+ uint8_t m_irl_mask;
+ uint8_t m_irl_pending;
+
+ // State of keyboard
+ ioport_value m_kb_state[ 4 ];
+ uint8_t m_kb_row_col;
+ bool m_kb_scan_on;
+ bool m_kb_pressed;
+
+ // Slot selection
+ std::vector<uint16_t> m_low32k_ram;
+ uint8_t m_slot_select;
+ uint8_t m_slot_map;
+
+ // Floppy I/F
+ uint8_t m_floppy_in_latch_msb; // U23
+ uint8_t m_floppy_in_latch_lsb; // U38
+ uint8_t m_floppy_out_latch_msb; // U22
+ uint8_t m_floppy_out_latch_lsb; // U37
+ uint8_t m_floppy_if_ctrl; // U24
+ bool m_floppy_dmaen;
+ bool m_floppy_dmai;
+ bool m_floppy_mdci;
+ bool m_floppy_intrq;
+ bool m_floppy_drq;
+ bool m_floppy0_wpt;
+ bool m_floppy1_wpt;
+ uint8_t m_floppy_drv_ctrl; // U39
+ uint8_t m_floppy_status; // U25
+
+ typedef enum {
+ HP64K_FLPST_IDLE,
+ HP64K_FLPST_DMAWR1,
+ HP64K_FLPST_DMAWR2,
+ HP64K_FLPST_DMARD1,
+ HP64K_FLPST_DMARD2
+ } floppy_state_t;
+
+ floppy_state_t m_floppy_if_state;
+ floppy_image_device *m_current_floppy;
+
+ // RS232 I/F
+ bool m_16x_clk;
+ bool m_baud_clk;
+ uint8_t m_16x_div;
+ bool m_loopback;
+ bool m_txd_state;
+ bool m_dtr_state;
+ bool m_rts_state;
};
static ADDRESS_MAP_START(cpu_mem_map , AS_PROGRAM , 16 , hp64k_state)
- AM_RANGE(0x0000 , 0x3fff) AM_ROM
- AM_RANGE(0x4000 , 0x7fff) AM_READWRITE(hp64k_slot_r , hp64k_slot_w)
- AM_RANGE(0x8000 , 0x8001) AM_WRITE(hp64k_crtc_w)
- AM_RANGE(0x8002 , 0xffff) AM_RAM
+ AM_RANGE(0x0000 , 0x3fff) AM_ROM
+ AM_RANGE(0x4000 , 0x7fff) AM_READWRITE(hp64k_slot_r , hp64k_slot_w)
+ AM_RANGE(0x8000 , 0x8001) AM_WRITE(hp64k_crtc_w)
+ AM_RANGE(0x8002 , 0xffff) AM_RAM
ADDRESS_MAP_END
static ADDRESS_MAP_START(cpu_io_map , AS_IO , 16 , hp64k_state)
- // PA = 0, IC = [0..3]
- // Keyboard input
- AM_RANGE(HP_MAKE_IOADDR(0 , 0) , HP_MAKE_IOADDR(0 , 3)) AM_READ(hp64k_kb_r)
- // PA = 2, IC = [0..3]
- // Line sync interrupt clear/watchdog reset
- AM_RANGE(HP_MAKE_IOADDR(2 , 0) , HP_MAKE_IOADDR(2 , 3)) AM_READWRITE(hp64k_deltat_r , hp64k_deltat_w)
- // PA = 4, IC = [0..3]
- // Floppy I/F
- AM_RANGE(HP_MAKE_IOADDR(4 , 0) , HP_MAKE_IOADDR(4 , 3)) AM_READWRITE(hp64k_flp_r , hp64k_flp_w)
- // PA = 5, IC = [0..3]
- // Write to USART
- AM_RANGE(HP_MAKE_IOADDR(5 , 0) , HP_MAKE_IOADDR(5 , 3)) AM_WRITE(hp64k_usart_w)
- // PA = 6, IC = [0..3]
- // Read from USART
- AM_RANGE(HP_MAKE_IOADDR(6 , 0) , HP_MAKE_IOADDR(6 , 3)) AM_READ(hp64k_usart_r)
- // PA = 7, IC = 2
- // Rear-panel switches and loopback relay control
- AM_RANGE(HP_MAKE_IOADDR(7 , 2) , HP_MAKE_IOADDR(7 , 2)) AM_READWRITE(hp64k_rear_sw_r , hp64k_loopback_w)
- // PA = 9, IC = [0..3]
- // Beeper control & interrupt status read
- AM_RANGE(HP_MAKE_IOADDR(9 , 0) , HP_MAKE_IOADDR(9 , 3)) AM_WRITE(hp64k_beep_w)
- // PA = 10, IC = [0..3]
- // Slot selection
- AM_RANGE(HP_MAKE_IOADDR(10 , 0) , HP_MAKE_IOADDR(10 , 3)) AM_WRITE(hp64k_slot_sel_w)
- // PA = 12, IC = [0..3]
- // Interrupt mask
- AM_RANGE(HP_MAKE_IOADDR(12 , 0) , HP_MAKE_IOADDR(12 , 3)) AM_WRITE(hp64k_irl_mask_w)
+ // PA = 0, IC = [0..3]
+ // Keyboard input
+ AM_RANGE(HP_MAKE_IOADDR(0 , 0) , HP_MAKE_IOADDR(0 , 3)) AM_READ(hp64k_kb_r)
+ // PA = 2, IC = [0..3]
+ // Line sync interrupt clear/watchdog reset
+ AM_RANGE(HP_MAKE_IOADDR(2 , 0) , HP_MAKE_IOADDR(2 , 3)) AM_READWRITE(hp64k_deltat_r , hp64k_deltat_w)
+ // PA = 4, IC = [0..3]
+ // Floppy I/F
+ AM_RANGE(HP_MAKE_IOADDR(4 , 0) , HP_MAKE_IOADDR(4 , 3)) AM_READWRITE(hp64k_flp_r , hp64k_flp_w)
+ // PA = 5, IC = [0..3]
+ // Write to USART
+ AM_RANGE(HP_MAKE_IOADDR(5 , 0) , HP_MAKE_IOADDR(5 , 3)) AM_WRITE(hp64k_usart_w)
+ // PA = 6, IC = [0..3]
+ // Read from USART
+ AM_RANGE(HP_MAKE_IOADDR(6 , 0) , HP_MAKE_IOADDR(6 , 3)) AM_READ(hp64k_usart_r)
+ // PA = 7, IC = 2
+ // Rear-panel switches and loopback relay control
+ AM_RANGE(HP_MAKE_IOADDR(7 , 2) , HP_MAKE_IOADDR(7 , 2)) AM_READWRITE(hp64k_rear_sw_r , hp64k_loopback_w)
+ // PA = 9, IC = [0..3]
+ // Beeper control & interrupt status read
+ AM_RANGE(HP_MAKE_IOADDR(9 , 0) , HP_MAKE_IOADDR(9 , 3)) AM_WRITE(hp64k_beep_w)
+ // PA = 10, IC = [0..3]
+ // Slot selection
+ AM_RANGE(HP_MAKE_IOADDR(10 , 0) , HP_MAKE_IOADDR(10 , 3)) AM_WRITE(hp64k_slot_sel_w)
+ // PA = 12, IC = [0..3]
+ // Interrupt mask
+ AM_RANGE(HP_MAKE_IOADDR(12 , 0) , HP_MAKE_IOADDR(12 , 3)) AM_WRITE(hp64k_irl_mask_w)
ADDRESS_MAP_END
hp64k_state::hp64k_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig , type , tag),
- m_cpu(*this , "cpu"),
- m_crtc(*this , "crtc"),
- m_palette(*this , "palette"),
- m_io_key0(*this , "KEY0"),
- m_io_key1(*this , "KEY1"),
- m_io_key2(*this , "KEY2"),
- m_io_key3(*this , "KEY3"),
- m_fdc(*this , "fdc"),
- m_floppy0(*this , "fdc:0"),
- m_floppy1(*this , "fdc:1"),
- m_ss0(*this , "fdc_rdy0"),
- m_ss1(*this , "fdc_rdy1"),
- m_rear_panel_sw(*this , "rear_sw"),
- m_rs232_sw(*this , "rs232_sw"),
- m_beeper(*this , "beeper"),
- m_beep_timer(*this , "beep_timer"),
- m_baud_rate(*this , "baud_rate"),
- m_s5_sw(*this , "s5_sw"),
- m_uart(*this , "uart"),
- m_rs232(*this , "rs232")
+ : driver_device(mconfig , type , tag),
+ m_cpu(*this , "cpu"),
+ m_crtc(*this , "crtc"),
+ m_palette(*this , "palette"),
+ m_io_key0(*this , "KEY0"),
+ m_io_key1(*this , "KEY1"),
+ m_io_key2(*this , "KEY2"),
+ m_io_key3(*this , "KEY3"),
+ m_fdc(*this , "fdc"),
+ m_floppy0(*this , "fdc:0"),
+ m_floppy1(*this , "fdc:1"),
+ m_ss0(*this , "fdc_rdy0"),
+ m_ss1(*this , "fdc_rdy1"),
+ m_rear_panel_sw(*this , "rear_sw"),
+ m_rs232_sw(*this , "rs232_sw"),
+ m_beeper(*this , "beeper"),
+ m_beep_timer(*this , "beep_timer"),
+ m_baud_rate(*this , "baud_rate"),
+ m_s5_sw(*this , "s5_sw"),
+ m_uart(*this , "uart"),
+ m_rs232(*this , "rs232")
{
}
void hp64k_state::driver_start()
{
- // 32kW for lower RAM
- m_low32k_ram.resize(0x8000);
+ // 32kW for lower RAM
+ m_low32k_ram.resize(0x8000);
}
void hp64k_state::video_start()
{
- m_chargen = memregion("chargen")->base();
+ m_chargen = memregion("chargen")->base();
}
void hp64k_state::machine_reset()
{
- m_crtc_drq = false;
- m_vrtc = false;
- m_crtc_ptr = 0;
- m_irl_mask = 0;
- m_irl_pending = 0;
- memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
- m_kb_row_col = 0;
- m_kb_scan_on = true;
- m_slot_select = 0;
- m_slot_map = 3;
- m_floppy_if_ctrl = ~0;
- m_floppy_dmaen = false;
- m_floppy_dmai = false;
- m_floppy_mdci = false;
- m_floppy_intrq = false;
- m_floppy_drv_ctrl = ~0;
- m_floppy_if_state = HP64K_FLPST_IDLE;
- m_current_floppy = nullptr;
- m_floppy0_wpt = false;
- m_floppy1_wpt = false;
- m_beeper->set_state(0);
- m_baud_rate->str_w((m_s5_sw->read() >> 1) & 0xf);
- m_16x_clk = (m_rs232_sw->read() & 0x02) != 0;
- m_loopback = false;
- m_txd_state = true;
- m_dtr_state = true;
- m_rts_state = true;
+ m_crtc_drq = false;
+ m_vrtc = false;
+ m_crtc_ptr = 0;
+ m_irl_mask = 0;
+ m_irl_pending = 0;
+ memset(&m_kb_state[ 0 ] , 0 , sizeof(m_kb_state));
+ m_kb_row_col = 0;
+ m_kb_scan_on = true;
+ m_slot_select = 0;
+ m_slot_map = 3;
+ m_floppy_if_ctrl = ~0;
+ m_floppy_dmaen = false;
+ m_floppy_dmai = false;
+ m_floppy_mdci = false;
+ m_floppy_intrq = false;
+ m_floppy_drv_ctrl = ~0;
+ m_floppy_if_state = HP64K_FLPST_IDLE;
+ m_current_floppy = nullptr;
+ m_floppy0_wpt = false;
+ m_floppy1_wpt = false;
+ m_beeper->set_state(0);
+ m_baud_rate->str_w((m_s5_sw->read() >> 1) & 0xf);
+ m_16x_clk = (m_rs232_sw->read() & 0x02) != 0;
+ m_loopback = false;
+ m_txd_state = true;
+ m_dtr_state = true;
+ m_rts_state = true;
}
@@ -1008,419 +1008,418 @@ WRITE_LINE_MEMBER(hp64k_state::hp64k_dtr_w)
WRITE_LINE_MEMBER(hp64k_state::hp64k_rts_w)
{
- if (BIT(m_s5_sw->read() , 0)) {
- // Full duplex, RTS/ = 0
- state = 0;
- }
- m_rts_state = state;
- if (m_loopback) {
- m_uart->write_cts(state);
- }
- m_rs232->write_rts(state);
+ if (BIT(m_s5_sw->read() , 0)) {
+ // Full duplex, RTS/ = 0
+ state = 0;
+ }
+ m_rts_state = state;
+ if (m_loopback) {
+ m_uart->write_cts(state);
+ }
+ m_rs232->write_rts(state);
}
WRITE16_MEMBER(hp64k_state::hp64k_loopback_w)
{
- m_loopback = BIT(data , 11);
- hp64k_update_loopback();
+ m_loopback = BIT(data , 11);
+ hp64k_update_loopback();
}
void hp64k_state::hp64k_update_loopback(void)
{
- if (m_loopback) {
- m_uart->write_rxd(m_txd_state);
- m_uart->write_dsr(m_dtr_state);
- m_uart->write_cts(m_rts_state);
- } else {
- m_uart->write_rxd(m_rs232->rxd_r());
- m_uart->write_dsr(m_rs232->dcd_r());
- m_uart->write_cts(m_rs232->cts_r());
- }
+ if (m_loopback) {
+ m_uart->write_rxd(m_txd_state);
+ m_uart->write_dsr(m_dtr_state);
+ m_uart->write_cts(m_rts_state);
+ } else {
+ m_uart->write_rxd(m_rs232->rxd_r());
+ m_uart->write_dsr(m_rs232->dcd_r());
+ m_uart->write_cts(m_rs232->cts_r());
+ }
}
WRITE_LINE_MEMBER(hp64k_state::hp64k_rs232_rxd_w)
{
- if (!m_loopback) {
- m_uart->write_rxd(state);
- }
+ if (!m_loopback) {
+ m_uart->write_rxd(state);
+ }
}
WRITE_LINE_MEMBER(hp64k_state::hp64k_rs232_dcd_w)
{
- if (!m_loopback) {
- m_uart->write_dsr(state);
- }
+ if (!m_loopback) {
+ m_uart->write_dsr(state);
+ }
}
WRITE_LINE_MEMBER(hp64k_state::hp64k_rs232_cts_w)
{
- if (!m_loopback) {
- m_uart->write_cts(state);
- }
+ if (!m_loopback) {
+ m_uart->write_cts(state);
+ }
}
WRITE16_MEMBER(hp64k_state::hp64k_beep_w)
{
- if (!BIT(offset , 0)) {
- m_beeper->set_state(1);
- // Duration is bogus: in the real hw envelope decays exponentially with RC=~136 ms
- m_beep_timer->adjust(attotime::from_msec(130));
- }
+ if (!BIT(offset , 0)) {
+ m_beeper->set_state(1);
+ // Duration is bogus: in the real hw envelope decays exponentially with RC=~136 ms
+ m_beep_timer->adjust(attotime::from_msec(130));
+ }
}
TIMER_DEVICE_CALLBACK_MEMBER(hp64k_state::hp64k_beeper_off)
{
- m_beeper->set_state(0);
+ m_beeper->set_state(0);
}
WRITE_LINE_MEMBER(hp64k_state::hp64k_baud_clk_w)
{
- if (!m_16x_clk) {
- if (state && !m_baud_clk) {
- m_16x_div++;
- }
- m_baud_clk = !!state;
- state = BIT(m_16x_div , 3);
+ if (!m_16x_clk) {
+ if (state && !m_baud_clk) {
+ m_16x_div++;
}
- m_uart->write_txc(state);
- m_uart->write_rxc(state);
+ m_baud_clk = !!state;
+ state = BIT(m_16x_div , 3);
+ }
+ m_uart->write_txc(state);
+ m_uart->write_rxc(state);
}
static INPUT_PORTS_START(hp64k)
- // Keyboard is arranged in a 8 x 16 matrix. Of the 128 possible positions, only 77 are used.
- // For key arrangement on the matrix, see [1] pg 334
- // Keys are mapped on bit b of KEYn
- // where b = (row & 1) << 4 + column, n = row >> 1
- // column = [0..15]
- // row = [0..7]
- PORT_START("KEY0")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('~')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|')
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
-
- PORT_START("KEY1")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_NAME("RECALL")
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_NAME("CLRLINE")
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_NAME("CAPS")
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_NAME("RESET")
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("SK1")
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("SK2")
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("SK3")
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("SK4")
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("SK5")
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("SK6")
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("SK7")
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_NAME("SK8")
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
-
- PORT_START("KEY2")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT) PORT_NAME("INSCHAR")
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("DELCHAR")
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('_') PORT_CHAR(UCHAR_MAMEKEY(DEL))
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("ROLLUP")
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("NEXTPG")
-
- PORT_START("KEY3")
- PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
- PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
- PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
- PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
- PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
- PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
- PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}')
- PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
- PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
- PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
- PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
- PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
- PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
- PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
- PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
- PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
- PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
- PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
- PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_END) PORT_NAME("ROLLDN")
- PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
- PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGUP) PORT_NAME("PREVPG")
-
- PORT_START("rear_sw")
- PORT_DIPNAME(0x8000 , 0x8000 , "E9-6 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x8000 , DEF_STR(No))
- PORT_DIPNAME(0x4000 , 0x4000 , "E9-5 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x4000 , DEF_STR(No))
- PORT_DIPNAME(0x2000 , 0x2000 , "E9-4 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x2000 , DEF_STR(No))
- PORT_DIPNAME(0x1000 , 0x1000 , "E9-3 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x1000 , DEF_STR(No))
- PORT_DIPNAME(0x0800 , 0x0800 , "E9-2 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x0800 , DEF_STR(No))
- PORT_DIPNAME(0x0400 , 0x0400 , "E9-1 jumper")
- PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
- PORT_DIPSETTING(0x0400 , DEF_STR(No))
- PORT_DIPNAME(0x0018 , 0x0000 , "System source")
- PORT_DIPLOCATION("S1:!7,!6")
- PORT_DIPSETTING(0x0000 , "Sys bus")
- PORT_DIPSETTING(0x0008 , "Local storage-talk only")
- PORT_DIPSETTING(0x0010 , "Local storage-addressable")
- PORT_DIPSETTING(0x0018 , "Performance verification")
- PORT_DIPNAME(0x0300 , 0x0000 , "Upper bus address (N/U)")
- PORT_DIPLOCATION("S1:!2,!1")
- PORT_DIPSETTING(0x0000 , "0")
- PORT_DIPSETTING(0x0100 , "1")
- PORT_DIPSETTING(0x0200 , "2")
- PORT_DIPSETTING(0x0300 , "3")
- PORT_DIPNAME(0x0007 , 0x0000 , "System bus address")
- PORT_DIPLOCATION("S1:!5,!4,!3")
- PORT_DIPSETTING(0x0000 , "0")
- PORT_DIPSETTING(0x0001 , "1")
- PORT_DIPSETTING(0x0002 , "2")
- PORT_DIPSETTING(0x0003 , "3")
- PORT_DIPSETTING(0x0004 , "4")
- PORT_DIPSETTING(0x0005 , "5")
- PORT_DIPSETTING(0x0006 , "6")
- PORT_DIPSETTING(0x0007 , "7")
- PORT_DIPNAME(0x0080 , 0x0000 , "RS232 mode")
- PORT_DIPLOCATION("S4 IO:!8")
- PORT_DIPSETTING(0x0000 , "Terminal")
- PORT_DIPSETTING(0x0080 , "Modem")
-
- PORT_START("rs232_sw")
- PORT_DIPNAME(0xc0 , 0x00 , "Stop bits")
- PORT_DIPLOCATION("S4 IO:!2,!1")
- PORT_DIPSETTING(0x00 , "Invalid")
- PORT_DIPSETTING(0x40 , "1")
- PORT_DIPSETTING(0x80 , "1.5")
- PORT_DIPSETTING(0xc0 , "2")
- PORT_DIPNAME(0x20 , 0x00 , "Parity")
- PORT_DIPLOCATION("S4 IO:!3")
- PORT_DIPSETTING(0x00 , "Odd")
- PORT_DIPSETTING(0x20 , "Even")
- PORT_DIPNAME(0x10 , 0x00 , "Parity enable")
- PORT_DIPLOCATION("S4 IO:!4")
- PORT_DIPSETTING(0x00 , DEF_STR(No))
- PORT_DIPSETTING(0x10 , DEF_STR(Yes))
- PORT_DIPNAME(0x0c , 0x00 , "Char length")
- PORT_DIPLOCATION("S4 IO:!6,!5")
- PORT_DIPSETTING(0x00 , "5")
- PORT_DIPSETTING(0x04 , "6")
- PORT_DIPSETTING(0x08 , "7")
- PORT_DIPSETTING(0x0c , "8")
- PORT_DIPNAME(0x02 , 0x00 , "Baud rate factor")
- PORT_DIPLOCATION("S4 IO:!7")
- PORT_DIPSETTING(0x00 , "1x")
- PORT_DIPSETTING(0x02 , "16x")
-
- PORT_START("s5_sw")
- PORT_DIPNAME(0x01 , 0x00 , "Duplex")
- PORT_DIPLOCATION("S5 IO:!1")
- PORT_DIPSETTING(0x00 , "Half duplex")
- PORT_DIPSETTING(0x01 , "Full duplex")
- PORT_DIPNAME(0x1e , 0x00 , "Baud rate")
- PORT_DIPLOCATION("S5 IO:!5,!4,!3,!2")
- PORT_DIPSETTING(0x00 , "50")
- PORT_DIPSETTING(0x02 , "75")
- PORT_DIPSETTING(0x04 , "110")
- PORT_DIPSETTING(0x06 , "134.5")
- PORT_DIPSETTING(0x08 , "150")
- PORT_DIPSETTING(0x0a , "300")
- PORT_DIPSETTING(0x0c , "600")
- PORT_DIPSETTING(0x0e , "1200")
- PORT_DIPSETTING(0x10 , "1800")
- PORT_DIPSETTING(0x12 , "2000")
- PORT_DIPSETTING(0x14 , "2400")
- PORT_DIPSETTING(0x16 , "3600")
- PORT_DIPSETTING(0x18 , "4800")
- PORT_DIPSETTING(0x1a , "7200")
- PORT_DIPSETTING(0x1c , "9600")
- PORT_DIPSETTING(0x1e , "19200")
-
+ // Keyboard is arranged in a 8 x 16 matrix. Of the 128 possible positions, only 77 are used.
+ // For key arrangement on the matrix, see [1] pg 334
+ // Keys are mapped on bit b of KEYn
+ // where b = (row & 1) << 4 + column, n = row >> 1
+ // column = [0..15]
+ // row = [0..7]
+ PORT_START("KEY0")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^') PORT_CHAR('~')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('\\') PORT_CHAR('|')
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
+
+ PORT_START("KEY1")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_NAME("RECALL")
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_NAME("CLRLINE")
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_NAME("CAPS")
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_NAME("RESET")
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_NAME("SK1")
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_NAME("SK2")
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_NAME("SK3")
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_NAME("SK4")
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_NAME("SK5")
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_NAME("SK6")
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_NAME("SK7")
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_NAME("SK8")
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_UNUSED)
+
+ PORT_START("KEY2")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_INSERT) PORT_NAME("INSCHAR")
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL) PORT_NAME("DELCHAR")
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('@') PORT_CHAR('`')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('_') PORT_CHAR(UCHAR_MAMEKEY(DEL))
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_NAME("ROLLUP")
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGDN) PORT_NAME("NEXTPG")
+
+ PORT_START("KEY3")
+ PORT_BIT(BIT_MASK(0) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(1) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(2) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(3) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(4) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(5) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
+ PORT_BIT(BIT_MASK(6) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+ PORT_BIT(BIT_MASK(7) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(8) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
+ PORT_BIT(BIT_MASK(9) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+ PORT_BIT(BIT_MASK(10) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
+ PORT_BIT(BIT_MASK(11) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
+ PORT_BIT(BIT_MASK(12) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(']') PORT_CHAR('}')
+ PORT_BIT(BIT_MASK(13) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+ PORT_BIT(BIT_MASK(14) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+ PORT_BIT(BIT_MASK(15) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+ PORT_BIT(BIT_MASK(16) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(17) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(18) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(19) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(20) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(21) , IP_ACTIVE_HIGH , IPT_UNUSED)
+ PORT_BIT(BIT_MASK(22) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+ PORT_BIT(BIT_MASK(23) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
+ PORT_BIT(BIT_MASK(24) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
+ PORT_BIT(BIT_MASK(25) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
+ PORT_BIT(BIT_MASK(26) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
+ PORT_BIT(BIT_MASK(27) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
+ PORT_BIT(BIT_MASK(28) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+ PORT_BIT(BIT_MASK(29) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_END) PORT_NAME("ROLLDN")
+ PORT_BIT(BIT_MASK(30) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+ PORT_BIT(BIT_MASK(31) , IP_ACTIVE_HIGH , IPT_KEYBOARD) PORT_CODE(KEYCODE_PGUP) PORT_NAME("PREVPG")
+
+ PORT_START("rear_sw")
+ PORT_DIPNAME(0x8000 , 0x8000 , "E9-6 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x8000 , DEF_STR(No))
+ PORT_DIPNAME(0x4000 , 0x4000 , "E9-5 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x4000 , DEF_STR(No))
+ PORT_DIPNAME(0x2000 , 0x2000 , "E9-4 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x2000 , DEF_STR(No))
+ PORT_DIPNAME(0x1000 , 0x1000 , "E9-3 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x1000 , DEF_STR(No))
+ PORT_DIPNAME(0x0800 , 0x0800 , "E9-2 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x0800 , DEF_STR(No))
+ PORT_DIPNAME(0x0400 , 0x0400 , "E9-1 jumper")
+ PORT_DIPSETTING(0x0000 , DEF_STR(Yes))
+ PORT_DIPSETTING(0x0400 , DEF_STR(No))
+ PORT_DIPNAME(0x0018 , 0x0000 , "System source")
+ PORT_DIPLOCATION("S1:!7,!6")
+ PORT_DIPSETTING(0x0000 , "Sys bus")
+ PORT_DIPSETTING(0x0008 , "Local storage-talk only")
+ PORT_DIPSETTING(0x0010 , "Local storage-addressable")
+ PORT_DIPSETTING(0x0018 , "Performance verification")
+ PORT_DIPNAME(0x0300 , 0x0000 , "Upper bus address (N/U)")
+ PORT_DIPLOCATION("S1:!2,!1")
+ PORT_DIPSETTING(0x0000 , "0")
+ PORT_DIPSETTING(0x0100 , "1")
+ PORT_DIPSETTING(0x0200 , "2")
+ PORT_DIPSETTING(0x0300 , "3")
+ PORT_DIPNAME(0x0007 , 0x0000 , "System bus address")
+ PORT_DIPLOCATION("S1:!5,!4,!3")
+ PORT_DIPSETTING(0x0000 , "0")
+ PORT_DIPSETTING(0x0001 , "1")
+ PORT_DIPSETTING(0x0002 , "2")
+ PORT_DIPSETTING(0x0003 , "3")
+ PORT_DIPSETTING(0x0004 , "4")
+ PORT_DIPSETTING(0x0005 , "5")
+ PORT_DIPSETTING(0x0006 , "6")
+ PORT_DIPSETTING(0x0007 , "7")
+ PORT_DIPNAME(0x0080 , 0x0000 , "RS232 mode")
+ PORT_DIPLOCATION("S4 IO:!8")
+ PORT_DIPSETTING(0x0000 , "Terminal")
+ PORT_DIPSETTING(0x0080 , "Modem")
+
+ PORT_START("rs232_sw")
+ PORT_DIPNAME(0xc0 , 0x00 , "Stop bits")
+ PORT_DIPLOCATION("S4 IO:!2,!1")
+ PORT_DIPSETTING(0x00 , "Invalid")
+ PORT_DIPSETTING(0x40 , "1")
+ PORT_DIPSETTING(0x80 , "1.5")
+ PORT_DIPSETTING(0xc0 , "2")
+ PORT_DIPNAME(0x20 , 0x00 , "Parity")
+ PORT_DIPLOCATION("S4 IO:!3")
+ PORT_DIPSETTING(0x00 , "Odd")
+ PORT_DIPSETTING(0x20 , "Even")
+ PORT_DIPNAME(0x10 , 0x00 , "Parity enable")
+ PORT_DIPLOCATION("S4 IO:!4")
+ PORT_DIPSETTING(0x00 , DEF_STR(No))
+ PORT_DIPSETTING(0x10 , DEF_STR(Yes))
+ PORT_DIPNAME(0x0c , 0x00 , "Char length")
+ PORT_DIPLOCATION("S4 IO:!6,!5")
+ PORT_DIPSETTING(0x00 , "5")
+ PORT_DIPSETTING(0x04 , "6")
+ PORT_DIPSETTING(0x08 , "7")
+ PORT_DIPSETTING(0x0c , "8")
+ PORT_DIPNAME(0x02 , 0x00 , "Baud rate factor")
+ PORT_DIPLOCATION("S4 IO:!7")
+ PORT_DIPSETTING(0x00 , "1x")
+ PORT_DIPSETTING(0x02 , "16x")
+
+ PORT_START("s5_sw")
+ PORT_DIPNAME(0x01 , 0x00 , "Duplex")
+ PORT_DIPLOCATION("S5 IO:!1")
+ PORT_DIPSETTING(0x00 , "Half duplex")
+ PORT_DIPSETTING(0x01 , "Full duplex")
+ PORT_DIPNAME(0x1e , 0x00 , "Baud rate")
+ PORT_DIPLOCATION("S5 IO:!5,!4,!3,!2")
+ PORT_DIPSETTING(0x00 , "50")
+ PORT_DIPSETTING(0x02 , "75")
+ PORT_DIPSETTING(0x04 , "110")
+ PORT_DIPSETTING(0x06 , "134.5")
+ PORT_DIPSETTING(0x08 , "150")
+ PORT_DIPSETTING(0x0a , "300")
+ PORT_DIPSETTING(0x0c , "600")
+ PORT_DIPSETTING(0x0e , "1200")
+ PORT_DIPSETTING(0x10 , "1800")
+ PORT_DIPSETTING(0x12 , "2000")
+ PORT_DIPSETTING(0x14 , "2400")
+ PORT_DIPSETTING(0x16 , "3600")
+ PORT_DIPSETTING(0x18 , "4800")
+ PORT_DIPSETTING(0x1a , "7200")
+ PORT_DIPSETTING(0x1c , "9600")
+ PORT_DIPSETTING(0x1e , "19200")
INPUT_PORTS_END
static SLOT_INTERFACE_START(hp64k_floppies)
- SLOT_INTERFACE("525dd" , FLOPPY_525_DD)
+ SLOT_INTERFACE("525dd" , FLOPPY_525_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START(hp64k , hp64k_state)
- MCFG_CPU_ADD("cpu" , HP_5061_3011 , 6250000)
- MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
- MCFG_CPU_IO_MAP(cpu_io_map)
- MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp64k_state , hp64k_irq_callback)
- MCFG_QUANTUM_TIME(attotime::from_hz(100))
-
- // Actual keyboard refresh rate should be between 1 and 2 kHz
- MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp64k_state , hp64k_kb_scan , attotime::from_hz(100))
-
- // Line sync timer. A line frequency of 50 Hz is assumed.
- MCFG_TIMER_DRIVER_ADD_PERIODIC("linesync_timer" , hp64k_state , hp64k_line_sync , attotime::from_hz(50))
-
- // Clock = 25 MHz / 9 * (112/114)
- MCFG_DEVICE_ADD("crtc" , I8275 , 2729045)
- MCFG_VIDEO_SET_SCREEN("screen")
- MCFG_I8275_CHARACTER_WIDTH(9)
- MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(hp64k_state , crtc_display_pixels)
- MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w))
- MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w))
-
- MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
- MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_SIZE(720 , 390)
- MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
-
- MCFG_FD1791_ADD("fdc" , XTAL_4MHz / 4)
- MCFG_WD_FDC_FORCE_READY
- MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_intrq_w))
- MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_drq_w))
- MCFG_FLOPPY_DRIVE_ADD("fdc:0" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
- MCFG_SLOT_FIXED(true)
- MCFG_FLOPPY_DRIVE_ADD("fdc:1" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
- MCFG_SLOT_FIXED(true)
-
- MCFG_DEVICE_ADD("fdc_rdy0" , TTL74123 , 0)
- MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
- MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
- // Warning! Duration formula is not correct for LS123, actual capacitor is 10 uF
- MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
- MCFG_TTL74123_B_PIN_VALUE(1)
- MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy0_rdy));
-
- MCFG_DEVICE_ADD("fdc_rdy1" , TTL74123 , 0)
- MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
- MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
- MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
- MCFG_TTL74123_B_PIN_VALUE(1)
- MCFG_TTL74123_CLEAR_PIN_VALUE(1)
- MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy1_rdy));
-
- MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("beeper" , BEEP , 2500)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
-
- MCFG_TIMER_DRIVER_ADD("beep_timer" , hp64k_state , hp64k_beeper_off);
-
- MCFG_DEVICE_ADD("baud_rate" , COM8116 , XTAL_5_0688MHz)
- MCFG_COM8116_FR_HANDLER(WRITELINE(hp64k_state , hp64k_baud_clk_w));
-
- MCFG_DEVICE_ADD("uart" , I8251 , 0)
- MCFG_I8251_RXRDY_HANDLER(WRITELINE(hp64k_state , hp64k_rxrdy_w));
- MCFG_I8251_TXRDY_HANDLER(WRITELINE(hp64k_state , hp64k_txrdy_w));
- MCFG_I8251_TXD_HANDLER(WRITELINE(hp64k_state , hp64k_txd_w));
- MCFG_I8251_DTR_HANDLER(WRITELINE(hp64k_state , hp64k_dtr_w));
- MCFG_I8251_RTS_HANDLER(WRITELINE(hp64k_state , hp64k_rts_w));
-
- MCFG_RS232_PORT_ADD("rs232" , default_rs232_devices , nullptr)
- MCFG_RS232_RXD_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_rxd_w))
- MCFG_RS232_DCD_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_dcd_w))
- MCFG_RS232_CTS_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_cts_w))
+static MACHINE_CONFIG_START(hp64k)
+ MCFG_CPU_ADD("cpu" , HP_5061_3011 , 6250000)
+ MCFG_CPU_PROGRAM_MAP(cpu_mem_map)
+ MCFG_CPU_IO_MAP(cpu_io_map)
+ MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(hp64k_state , hp64k_irq_callback)
+ MCFG_QUANTUM_TIME(attotime::from_hz(100))
+
+ // Actual keyboard refresh rate should be between 1 and 2 kHz
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("kb_timer" , hp64k_state , hp64k_kb_scan , attotime::from_hz(100))
+
+ // Line sync timer. A line frequency of 50 Hz is assumed.
+ MCFG_TIMER_DRIVER_ADD_PERIODIC("linesync_timer" , hp64k_state , hp64k_line_sync , attotime::from_hz(50))
+
+ // Clock = 25 MHz / 9 * (112/114)
+ MCFG_DEVICE_ADD("crtc" , I8275 , 2729045)
+ MCFG_VIDEO_SET_SCREEN("screen")
+ MCFG_I8275_CHARACTER_WIDTH(9)
+ MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(hp64k_state , crtc_display_pixels)
+ MCFG_I8275_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_drq_w))
+ MCFG_I8275_VRTC_CALLBACK(WRITELINE(hp64k_state , hp64k_crtc_vrtc_w))
+
+ MCFG_SCREEN_ADD_MONOCHROME("screen", RASTER, rgb_t::green())
+ MCFG_SCREEN_UPDATE_DEVICE("crtc" , i8275_device , screen_update)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_SIZE(720 , 390)
+ MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette")
+
+ MCFG_FD1791_ADD("fdc" , XTAL_4MHz / 4)
+ MCFG_WD_FDC_FORCE_READY
+ MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_intrq_w))
+ MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(hp64k_state , hp64k_flp_drq_w))
+ MCFG_FLOPPY_DRIVE_ADD("fdc:0" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
+ MCFG_SLOT_FIXED(true)
+ MCFG_FLOPPY_DRIVE_ADD("fdc:1" , hp64k_floppies , "525dd" , floppy_image_device::default_floppy_formats)
+ MCFG_SLOT_FIXED(true)
+
+ MCFG_DEVICE_ADD("fdc_rdy0" , TTL74123 , 0)
+ MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
+ MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
+ // Warning! Duration formula is not correct for LS123, actual capacitor is 10 uF
+ MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
+ MCFG_TTL74123_B_PIN_VALUE(1)
+ MCFG_TTL74123_CLEAR_PIN_VALUE(1)
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy0_rdy));
+
+ MCFG_DEVICE_ADD("fdc_rdy1" , TTL74123 , 0)
+ MCFG_TTL74123_CONNECTION_TYPE(TTL74123_NOT_GROUNDED_NO_DIODE)
+ MCFG_TTL74123_RESISTOR_VALUE(RES_K(68.1))
+ MCFG_TTL74123_CAPACITOR_VALUE(CAP_U(16))
+ MCFG_TTL74123_B_PIN_VALUE(1)
+ MCFG_TTL74123_CLEAR_PIN_VALUE(1)
+ MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITE8(hp64k_state , hp64k_floppy1_rdy));
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+ MCFG_SOUND_ADD("beeper" , BEEP , 2500)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS , "mono" , 1.00)
+
+ MCFG_TIMER_DRIVER_ADD("beep_timer" , hp64k_state , hp64k_beeper_off);
+
+ MCFG_DEVICE_ADD("baud_rate" , COM8116 , XTAL_5_0688MHz)
+ MCFG_COM8116_FR_HANDLER(WRITELINE(hp64k_state , hp64k_baud_clk_w));
+
+ MCFG_DEVICE_ADD("uart" , I8251 , 0)
+ MCFG_I8251_RXRDY_HANDLER(WRITELINE(hp64k_state , hp64k_rxrdy_w));
+ MCFG_I8251_TXRDY_HANDLER(WRITELINE(hp64k_state , hp64k_txrdy_w));
+ MCFG_I8251_TXD_HANDLER(WRITELINE(hp64k_state , hp64k_txd_w));
+ MCFG_I8251_DTR_HANDLER(WRITELINE(hp64k_state , hp64k_dtr_w));
+ MCFG_I8251_RTS_HANDLER(WRITELINE(hp64k_state , hp64k_rts_w));
+
+ MCFG_RS232_PORT_ADD("rs232" , default_rs232_devices , nullptr)
+ MCFG_RS232_RXD_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_rxd_w))
+ MCFG_RS232_DCD_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_dcd_w))
+ MCFG_RS232_CTS_HANDLER(WRITELINE(hp64k_state , hp64k_rs232_cts_w))
MACHINE_CONFIG_END
ROM_START(hp64k)
- ROM_REGION(0x8000 , "cpu" , ROMREGION_16BIT | ROMREGION_BE | ROMREGION_INVERT)
- ROM_LOAD16_BYTE("64100_80022.bin" , 0x0000 , 0x1000 , CRC(38b2aae5) SHA1(bfd0f126bfaf3724dc501979ad2d46afc41913aa))
- ROM_LOAD16_BYTE("64100_80020.bin" , 0x0001 , 0x1000 , CRC(ac01b436) SHA1(be1e827ea1393a95abb02a52ab5cc35dc2cd96e4))
- ROM_LOAD16_BYTE("64100_80023.bin" , 0x2000 , 0x1000 , CRC(6b4bc2ce) SHA1(00e6c58ccae9640dc81cb3e92db90a8c69b02a93))
- ROM_LOAD16_BYTE("64100_80021.bin" , 0x2001 , 0x1000 , CRC(74f9d33c) SHA1(543a845a992b0ceac3e0491acdfb178df0adeb1f))
- ROM_LOAD16_BYTE("64100_80026.bin" , 0x4000 , 0x1000 , CRC(a74e834b) SHA1(a2ff9765628985d9bab4cb44ba23257a9b8d0965))
- ROM_LOAD16_BYTE("64100_80024.bin" , 0x4001 , 0x1000 , CRC(2e15a1d2) SHA1(ce4330f8f8015a26c02f0965b95baf7dfd615512))
- ROM_LOAD16_BYTE("64100_80027.bin" , 0x6000 , 0x1000 , CRC(b93c0e7a) SHA1(b239446d3d6e9d3dba6c0278b2771abe1623e1ad))
- ROM_LOAD16_BYTE("64100_80025.bin" , 0x6001 , 0x1000 , CRC(e6353085) SHA1(48d78835c798f2caf6ee539057676d4f3c8a4df9))
-
- ROM_REGION(0x800 , "chargen" , 0)
- ROM_LOAD("1816_1496_82S191.bin" , 0 , 0x800 , CRC(32a52664) SHA1(8b2a49a32510103ff424e8481d5ed9887f609f2f))
+ ROM_REGION(0x8000 , "cpu" , ROMREGION_16BIT | ROMREGION_BE | ROMREGION_INVERT)
+ ROM_LOAD16_BYTE("64100_80022.bin" , 0x0000 , 0x1000 , CRC(38b2aae5) SHA1(bfd0f126bfaf3724dc501979ad2d46afc41913aa))
+ ROM_LOAD16_BYTE("64100_80020.bin" , 0x0001 , 0x1000 , CRC(ac01b436) SHA1(be1e827ea1393a95abb02a52ab5cc35dc2cd96e4))
+ ROM_LOAD16_BYTE("64100_80023.bin" , 0x2000 , 0x1000 , CRC(6b4bc2ce) SHA1(00e6c58ccae9640dc81cb3e92db90a8c69b02a93))
+ ROM_LOAD16_BYTE("64100_80021.bin" , 0x2001 , 0x1000 , CRC(74f9d33c) SHA1(543a845a992b0ceac3e0491acdfb178df0adeb1f))
+ ROM_LOAD16_BYTE("64100_80026.bin" , 0x4000 , 0x1000 , CRC(a74e834b) SHA1(a2ff9765628985d9bab4cb44ba23257a9b8d0965))
+ ROM_LOAD16_BYTE("64100_80024.bin" , 0x4001 , 0x1000 , CRC(2e15a1d2) SHA1(ce4330f8f8015a26c02f0965b95baf7dfd615512))
+ ROM_LOAD16_BYTE("64100_80027.bin" , 0x6000 , 0x1000 , CRC(b93c0e7a) SHA1(b239446d3d6e9d3dba6c0278b2771abe1623e1ad))
+ ROM_LOAD16_BYTE("64100_80025.bin" , 0x6001 , 0x1000 , CRC(e6353085) SHA1(48d78835c798f2caf6ee539057676d4f3c8a4df9))
+
+ ROM_REGION(0x800 , "chargen" , 0)
+ ROM_LOAD("1816_1496_82S191.bin" , 0 , 0x800 , CRC(32a52664) SHA1(8b2a49a32510103ff424e8481d5ed9887f609f2f))
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1979, hp64k, 0, 0, hp64k, hp64k, driver_device, 0, "HP", "HP 64000" , 0)
+COMP( 1979, hp64k, 0, 0, hp64k, hp64k, hp64k_state, 0, "HP", "HP 64000" , 0)
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index f8b3fdf59d8..90d979d6a36 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -486,7 +486,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hp9845_base_state::gv_timer)
advance_gv_fsm(false , false);
}
-attotime hp9845_base_state::time_to_gv_mem_availability(void) const
+attotime hp9845_base_state::time_to_gv_mem_availability() const
{
if (m_graphic_sel) {
int hpos = m_screen->hpos();
@@ -514,7 +514,7 @@ IRQ_CALLBACK_MEMBER(hp9845_base_state::irq_callback)
}
}
-void hp9845_base_state::update_irq(void)
+void hp9845_base_state::update_irq()
{
m_ppu->set_input_line(HPHYBRID_IRL , m_irl_pending != 0);
m_ppu->set_input_line(HPHYBRID_IRH , m_irh_pending != 0);
@@ -545,7 +545,7 @@ void hp9845_base_state::irq_w(uint8_t sc , int state)
update_irq();
}
-void hp9845_base_state::update_flg_sts(void)
+void hp9845_base_state::update_flg_sts()
{
bool sts = BIT(m_sts_status , m_pa);
bool flg = BIT(m_flg_status , m_pa);
@@ -750,7 +750,7 @@ protected:
void graphic_video_render(unsigned video_scanline);
virtual void advance_gv_fsm(bool ds , bool trigger) override;
- void update_graphic_bits(void);
+ void update_graphic_bits();
// Optional character generator
required_region_ptr<uint8_t> m_optional_chargen;
@@ -1235,7 +1235,7 @@ void hp9845b_state::advance_gv_fsm(bool ds , bool trigger)
update_graphic_bits();
}
-void hp9845b_state::update_graphic_bits(void)
+void hp9845b_state::update_graphic_bits()
{
bool gv_ready = m_gv_fsm_state == GV_STAT_WAIT_DS_0 ||
m_gv_fsm_state == GV_STAT_WAIT_DS_1 ||
@@ -1253,13 +1253,13 @@ void hp9845b_state::update_graphic_bits(void)
}
// ***************
-// hp9845ct_state
+// hp9845ct_base_state
// ***************
-class hp9845ct_state : public hp9845_base_state
+class hp9845ct_base_state : public hp9845_base_state
{
public:
- hp9845ct_state(const machine_config &mconfig, device_type type, const char *tag);
+ hp9845ct_base_state(const machine_config &mconfig, device_type type, const char *tag);
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -1280,7 +1280,7 @@ protected:
void video_fill_buff(bool buff_idx);
virtual void plot(uint16_t x, uint16_t y, bool draw_erase) = 0;
void draw_line(unsigned x0 , unsigned y0 , unsigned x1 , unsigned y1);
- void update_line_pattern(void);
+ void update_line_pattern();
void pattern_fill(uint16_t x0 , uint16_t y0 , uint16_t x1 , uint16_t y1 , unsigned fill_idx);
static uint16_t get_gv_mem_addr(unsigned x , unsigned y);
virtual void update_graphic_bits(void) = 0;
@@ -1288,10 +1288,10 @@ protected:
void render_lp_cursor(unsigned video_scanline , unsigned pen_idx);
void lp_r4_w(uint16_t data);
- uint16_t lp_r4_r(void);
+ uint16_t lp_r4_r();
void lp_r5_w(uint16_t data);
bool lp_segment_intersect(unsigned yline) const;
- void compute_lp_data(void);
+ void compute_lp_data();
void lp_scanline_update(unsigned video_scanline);
virtual void update_gcursor(void) = 0;
@@ -1351,14 +1351,14 @@ protected:
static INPUT_PORTS_START(hp9845ct)
PORT_INCLUDE(hp9845_base)
PORT_START("SOFTKEYS")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey0") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey1") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey2") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey3") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey4") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey5") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey6") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey7") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_state, softkey_changed, 0)
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey0") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey1") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey2") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey3") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey4") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey5") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey6") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Softkey7") PORT_CHANGED_MEMBER(DEVICE_SELF, hp9845ct_base_state, softkey_changed, 0)
PORT_START("LIGHTPENX")
PORT_BIT( 0x3ff, 0x000, IPT_LIGHTGUN_X ) PORT_SENSITIVITY(20) PORT_MINMAX(0, VIDEO_TOT_HPIXELS - 1) PORT_CROSSHAIR(X, 1.0, 0.0, 0)
@@ -1370,7 +1370,7 @@ static INPUT_PORTS_START(hp9845ct)
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_CODE(MOUSECODE_BUTTON1) PORT_NAME("Gkey")
INPUT_PORTS_END
-hp9845ct_state::hp9845ct_state(const machine_config &mconfig, device_type type, const char *tag)
+hp9845ct_base_state::hp9845ct_base_state(const machine_config &mconfig, device_type type, const char *tag)
: hp9845_base_state(mconfig , type , tag),
m_io_softkeys(*this, "SOFTKEYS"),
m_lightpen_x(*this, "LIGHTPENX"),
@@ -1379,13 +1379,13 @@ hp9845ct_state::hp9845ct_state(const machine_config &mconfig, device_type type,
{
}
-void hp9845ct_state::machine_start()
+void hp9845ct_base_state::machine_start()
{
// Common part first
hp9845_base_state::machine_start();
}
-void hp9845ct_state::machine_reset()
+void hp9845ct_base_state::machine_reset()
{
// Common part first
hp9845_base_state::machine_reset();
@@ -1427,14 +1427,14 @@ void hp9845ct_state::machine_reset()
update_graphic_bits();
}
-uint32_t hp9845ct_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t hp9845ct_base_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect);
return 0;
}
-WRITE_LINE_MEMBER(hp9845ct_state::vblank_w)
+WRITE_LINE_MEMBER(hp9845ct_base_state::vblank_w)
{
// VBlank signal is fed into HALT flag of PPU
m_ppu->halt_w(state);
@@ -1465,7 +1465,7 @@ WRITE_LINE_MEMBER(hp9845ct_state::vblank_w)
}
}
-INPUT_CHANGED_MEMBER(hp9845ct_state::softkey_changed)
+INPUT_CHANGED_MEMBER(hp9845ct_base_state::softkey_changed)
{
if (!m_gv_sk_status) {
uint8_t softkey_data = m_io_softkeys->read();
@@ -1486,12 +1486,12 @@ INPUT_CHANGED_MEMBER(hp9845ct_state::softkey_changed)
}
}
-void hp9845ct_state::set_video_mar(uint16_t mar)
+void hp9845ct_base_state::set_video_mar(uint16_t mar)
{
m_video_mar = (mar & 0x1fff) | VIDEO_BUFFER_BASE_LOW;
}
-void hp9845ct_state::video_fill_buff(bool buff_idx)
+void hp9845ct_base_state::video_fill_buff(bool buff_idx)
{
unsigned char_idx = 0;
unsigned iters = 0;
@@ -1549,7 +1549,7 @@ void hp9845ct_state::video_fill_buff(bool buff_idx)
}
}
-void hp9845ct_state::draw_line(unsigned x0 , unsigned y0 , unsigned x1 , unsigned y1)
+void hp9845ct_base_state::draw_line(unsigned x0 , unsigned y0 , unsigned x1 , unsigned y1)
{
int dx, dy, sx, sy, x, y, err, e2;
@@ -1580,7 +1580,7 @@ void hp9845ct_state::draw_line(unsigned x0 , unsigned y0 , unsigned x1 , unsigne
}
}
-void hp9845ct_state::update_line_pattern(void)
+void hp9845ct_base_state::update_line_pattern()
{
// update line pattern
m_gv_repeat_count++;
@@ -1592,7 +1592,7 @@ void hp9845ct_state::update_line_pattern(void)
}
}
-void hp9845ct_state::pattern_fill(uint16_t x0 , uint16_t y0 , uint16_t x1 , uint16_t y1 , unsigned fill_idx)
+void hp9845ct_base_state::pattern_fill(uint16_t x0 , uint16_t y0 , uint16_t x1 , uint16_t y1 , unsigned fill_idx)
{
uint16_t x,y,xmax,ymax;
uint16_t pixel_mask, fill_mask;
@@ -1612,12 +1612,12 @@ void hp9845ct_state::pattern_fill(uint16_t x0 , uint16_t y0 , uint16_t x1 , uint
}
}
-uint16_t hp9845ct_state::get_gv_mem_addr(unsigned x , unsigned y)
+uint16_t hp9845ct_base_state::get_gv_mem_addr(unsigned x , unsigned y)
{
return (uint16_t)((x + y * 35) & GVIDEO_ADDR_MASK);
}
-int hp9845ct_state::get_wrapped_scanline(unsigned scanline)
+int hp9845ct_base_state::get_wrapped_scanline(unsigned scanline)
{
// The 770's VTOTAL applies to 780, too.
// The 780 hw generates a line clock (GVclk in Duell's schematics) that's suppressed
@@ -1631,7 +1631,7 @@ int hp9845ct_state::get_wrapped_scanline(unsigned scanline)
return wrapped_cursor_y;
}
-void hp9845ct_state::render_lp_cursor(unsigned video_scanline , unsigned pen_idx)
+void hp9845ct_base_state::render_lp_cursor(unsigned video_scanline , unsigned pen_idx)
{
int cursor_y_top = get_wrapped_scanline(m_gv_lp_cursor_y);
@@ -1668,7 +1668,7 @@ void hp9845ct_state::render_lp_cursor(unsigned video_scanline , unsigned pen_idx
}
}
-void hp9845ct_state::lp_r4_w(uint16_t data)
+void hp9845ct_base_state::lp_r4_w(uint16_t data)
{
if (m_gv_lp_en) {
switch (m_gv_lp_reg_cnt) {
@@ -1698,7 +1698,7 @@ void hp9845ct_state::lp_r4_w(uint16_t data)
}
}
-uint16_t hp9845ct_state::lp_r4_r(void)
+uint16_t hp9845ct_base_state::lp_r4_r()
{
uint16_t res = 0;
@@ -1741,7 +1741,7 @@ uint16_t hp9845ct_state::lp_r4_r(void)
return res;
}
-void hp9845ct_state::lp_r5_w(uint16_t data)
+void hp9845ct_base_state::lp_r5_w(uint16_t data)
{
m_gv_lp_reg_cnt = data & 7;
m_gv_lp_en = (data & 0x700) == 0x400; // enables writes on R4 to set LP data (actually FB bit), also enables LP command processing and LP IRQs
@@ -1750,7 +1750,7 @@ void hp9845ct_state::lp_r5_w(uint16_t data)
update_graphic_bits();
}
-bool hp9845ct_state::lp_segment_intersect(unsigned yline) const
+bool hp9845ct_base_state::lp_segment_intersect(unsigned yline) const
{
int xp = m_gv_lp_x;
int yp = m_gv_lp_y;
@@ -1770,7 +1770,7 @@ bool hp9845ct_state::lp_segment_intersect(unsigned yline) const
return fx >= xc && ex <= (xc + 24);
}
-void hp9845ct_state::compute_lp_data(void)
+void hp9845ct_base_state::compute_lp_data()
{
// get LP hit data, returns three words for cmd=6 and one word for cmd=4
// actually simulating the 9845 lightpen is a bit more complex, since YHI, XLEFT and YLO
@@ -1889,7 +1889,7 @@ void hp9845ct_state::compute_lp_data(void)
LOG("LP data %d %d %d %d (%u;%d) (%u;%u) %u %u %u %04x %04x %04x\n" , m_gv_lp_selftest , m_gv_lp_interlace , m_gv_lp_sw , m_gv_lp_hit_lt192 , m_gv_lp_cursor_x , yc , m_gv_lp_x , m_gv_lp_y , yhi , xleft , ylo , m_gv_next_lp_data[ 0 ] , m_gv_next_lp_data[ 1 ] , m_gv_next_lp_data[ 2 ]);
}
-void hp9845ct_state::lp_scanline_update(unsigned video_scanline)
+void hp9845ct_base_state::lp_scanline_update(unsigned video_scanline)
{
if (video_scanline == 0) {
compute_lp_data();
@@ -1922,11 +1922,11 @@ void hp9845ct_state::lp_scanline_update(unsigned video_scanline)
}
}
-const uint16_t hp9845ct_state::m_line_type[] = {
+const uint16_t hp9845ct_base_state::m_line_type[] = {
0xffff, 0xaaaa, 0xff00, 0xfff0, 0xfffa, 0xfff6, 0xffb6, 0x0000
};
-const uint16_t hp9845ct_state::m_area_fill[] = {
+const uint16_t hp9845ct_base_state::m_area_fill[] = {
0xffff, 0xefff, 0xefbf, 0xefaf, 0xafaf, 0xadaf, 0xada7, 0xada5,
0xa5a5, 0xa4a5, 0xa4a1, 0xa4a0, 0xa0a0, 0x80a0, 0x8020, 0x8000
};
@@ -1934,7 +1934,7 @@ const uint16_t hp9845ct_state::m_area_fill[] = {
// ***************
// hp9845c_state
// ***************
-class hp9845c_state : public hp9845ct_state
+class hp9845c_state : public hp9845ct_base_state
{
public:
hp9845c_state(const machine_config &mconfig, device_type type, const char *tag);
@@ -1953,10 +1953,10 @@ protected:
void graphic_video_render(unsigned video_scanline);
virtual void plot(uint16_t x, uint16_t y, bool draw_erase) override;
- void check_io_counter_restore(void);
- void advance_io_counter(void);
+ void check_io_counter_restore();
+ void advance_io_counter();
virtual void advance_gv_fsm(bool ds , bool trigger) override;
- virtual void update_graphic_bits(void) override;
+ virtual void update_graphic_bits() override;
virtual void update_gcursor(void) override;
@@ -1978,7 +1978,7 @@ protected:
};
hp9845c_state::hp9845c_state(const machine_config &mconfig, device_type type, const char *tag)
- : hp9845ct_state(mconfig , type , tag),
+ : hp9845ct_base_state(mconfig , type , tag),
m_optional_chargen(*this , "optional_chargen")
{
}
@@ -1986,7 +1986,7 @@ hp9845c_state::hp9845c_state(const machine_config &mconfig, device_type type, co
void hp9845c_state::machine_start()
{
// Common part first
- hp9845ct_state::machine_start();
+ hp9845ct_base_state::machine_start();
m_graphic_mem[ 0 ].resize(GVIDEO_MEM_SIZE);
m_graphic_mem[ 1 ].resize(GVIDEO_MEM_SIZE);
@@ -2027,7 +2027,7 @@ void hp9845c_state::machine_start()
void hp9845c_state::machine_reset()
{
// Common part first
- hp9845ct_state::machine_reset();
+ hp9845ct_base_state::machine_reset();
set_video_mar(0);
@@ -2362,7 +2362,7 @@ void hp9845c_state::plot(uint16_t x, uint16_t y, bool draw_erase)
}
}
-void hp9845c_state::check_io_counter_restore(void)
+void hp9845c_state::check_io_counter_restore()
{
if (m_gv_last_cmd != m_gv_cmd) {
// restore memory counter
@@ -2377,7 +2377,7 @@ void hp9845c_state::check_io_counter_restore(void)
}
}
-void hp9845c_state::advance_io_counter(void)
+void hp9845c_state::advance_io_counter()
{
m_gv_plane++;
if (m_gv_plane > 2) {
@@ -2623,7 +2623,7 @@ void hp9845c_state::advance_gv_fsm(bool ds , bool trigger)
update_graphic_bits();
}
-void hp9845c_state::update_graphic_bits(void)
+void hp9845c_state::update_graphic_bits()
{
bool lp_int = m_gv_lp_int_en && m_gv_lp_status;
bool sk_int = m_gv_sk_status && m_gv_sk_en;
@@ -2670,7 +2670,7 @@ void hp9845c_state::update_gcursor(void)
// ***************
// hp9845t_state
// ***************
-class hp9845t_state : public hp9845ct_state
+class hp9845t_state : public hp9845ct_base_state
{
public:
hp9845t_state(const machine_config &mconfig, device_type type, const char *tag);
@@ -2692,7 +2692,7 @@ protected:
void draw_full_arc(int x0 , int y0 , int dx , int dy , int draw_counter);
virtual void advance_gv_fsm(bool ds , bool trigger) override;
- virtual void update_graphic_bits(void) override;
+ virtual void update_graphic_bits() override;
virtual void update_gcursor(void) override;
@@ -2714,14 +2714,14 @@ protected:
};
hp9845t_state::hp9845t_state(const machine_config &mconfig, device_type type, const char *tag)
- : hp9845ct_state(mconfig , type , tag)
+ : hp9845ct_base_state(mconfig , type , tag)
{
}
void hp9845t_state::machine_start()
{
// Common part first
- hp9845ct_state::machine_start();
+ hp9845ct_base_state::machine_start();
m_graphic_mem.resize(GVIDEO_MEM_SIZE);
@@ -2736,7 +2736,7 @@ void hp9845t_state::machine_start()
void hp9845t_state::machine_reset()
{
// Common part first
- hp9845ct_state::machine_reset();
+ hp9845ct_base_state::machine_reset();
m_gv_stat = false;
m_gv_increment_to_next_row = false;
@@ -3470,7 +3470,7 @@ void hp9845t_state::advance_gv_fsm(bool ds , bool trigger)
update_graphic_bits();
}
-void hp9845t_state::update_graphic_bits(void)
+void hp9845t_state::update_graphic_bits()
{
bool gv_ready = (m_gv_lp_int_en && m_gv_lp_status) || (m_gv_sk_en && m_gv_sk_status);
@@ -3515,7 +3515,7 @@ const uint8_t hp9845t_state::m_back_arrow_shape[] = {
0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00
};
-static MACHINE_CONFIG_START( hp9845a, hp9845_state )
+static MACHINE_CONFIG_START( hp9845a )
//MCFG_CPU_ADD("lpu", HP_5061_3010, XTAL_11_4MHz)
//MCFG_CPU_ADD("ppu", HP_5061_3011, XTAL_11_4MHz)
@@ -3530,7 +3530,7 @@ static MACHINE_CONFIG_START( hp9845a, hp9845_state )
MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845a_rom")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9835a, hp9845_state )
+static MACHINE_CONFIG_START( hp9835a )
//MCFG_CPU_ADD("lpu", HP_5061_3001, XTAL_11_4MHz)
//MCFG_CPU_ADD("ppu", HP_5061_3001, XTAL_11_4MHz)
@@ -3682,7 +3682,7 @@ static MACHINE_CONFIG_FRAGMENT(hp9845_base)
MCFG_RAM_EXTRA_OPTIONS("64K, 320K, 448K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START(hp9845b, hp9845b_state)
+static MACHINE_CONFIG_START(hp9845b)
MCFG_FRAGMENT_ADD(hp9845_base)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -3700,7 +3700,7 @@ static MACHINE_CONFIG_START(hp9845b, hp9845b_state)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START(hp9845c, hp9845c_state)
+static MACHINE_CONFIG_START(hp9845c)
MCFG_FRAGMENT_ADD(hp9845_base)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -3714,7 +3714,7 @@ static MACHINE_CONFIG_START(hp9845c, hp9845c_state)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START(hp9845t, hp9845t_state)
+static MACHINE_CONFIG_START(hp9845t)
MCFG_FRAGMENT_ADD(hp9845_base)
// video hardware
MCFG_SCREEN_MODIFY("screen")
@@ -3854,11 +3854,11 @@ ROM_START( hp9845t )
ROM_LOAD("9845-PPU-Color-Enhanced-Graphics.bin", 0, 0x10000, CRC(96e11edc) SHA1(3f1da50edb35dfc57ec2ecfd816a8c8230e110bd))
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1977, hp9845a, 0, 0, hp9845a, hp9845, driver_device, 0, "Hewlett-Packard", "9845A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1977, hp9845s, hp9845a, 0, hp9845a, hp9845, driver_device, 0, "Hewlett-Packard", "9845S", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1979, hp9835a, 0, 0, hp9835a, hp9845, driver_device, 0, "Hewlett-Packard", "9835A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1979, hp9835b, hp9835a, 0, hp9835a, hp9845, driver_device, 0, "Hewlett-Packard", "9835B", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1979, hp9845b, 0, 0, hp9845b, hp9845_base,driver_device, 0, "Hewlett-Packard", "9845B", 0 )
-COMP( 1982, hp9845t, 0, 0, hp9845t, hp9845ct,driver_device, 0, "Hewlett-Packard", "9845T", 0 )
-COMP( 1980, hp9845c, 0, 0, hp9845c, hp9845ct,driver_device, 0, "Hewlett-Packard", "9845C", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, hp9845a, 0, 0, hp9845a, hp9845, hp9845_state, 0, "Hewlett-Packard", "9845A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1977, hp9845s, hp9845a, 0, hp9845a, hp9845, hp9845_state, 0, "Hewlett-Packard", "9845S", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1979, hp9835a, 0, 0, hp9835a, hp9845, hp9845_state, 0, "Hewlett-Packard", "9835A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1979, hp9835b, hp9835a, 0, hp9835a, hp9845, hp9845_state, 0, "Hewlett-Packard", "9835B", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1979, hp9845b, 0, 0, hp9845b, hp9845_base, hp9845b_state, 0, "Hewlett-Packard", "9845B", 0 )
+COMP( 1982, hp9845t, 0, 0, hp9845t, hp9845ct, hp9845t_state, 0, "Hewlett-Packard", "9845T", 0 )
+COMP( 1980, hp9845c, 0, 0, hp9845c, hp9845ct, hp9845c_state, 0, "Hewlett-Packard", "9845C", 0 )
diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp
index 4334057d4d6..5326d2c905a 100644
--- a/src/mame/drivers/hp9k.cpp
+++ b/src/mame/drivers/hp9k.cpp
@@ -392,7 +392,7 @@ WRITE8_MEMBER( hp9k_state::kbd_put )
}
-static MACHINE_CONFIG_START( hp9k, hp9k_state )
+static MACHINE_CONFIG_START( hp9k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(hp9k_mem)
@@ -429,5 +429,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, hp9816, 0, 0, hp9k, hp9k, hp9k_state, hp9k, "Hewlett Packard", "HP 9816" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, hp9816, 0, 0, hp9k, hp9k, hp9k_state, hp9k, "Hewlett Packard", "HP 9816" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp
index 1f2db5192c5..742672e1f72 100644
--- a/src/mame/drivers/hp9k_3xx.cpp
+++ b/src/mame/drivers/hp9k_3xx.cpp
@@ -287,7 +287,7 @@ WRITE32_MEMBER(hp9k3xx_state::buserror_w)
}
}
-static MACHINE_CONFIG_START( hp9k310, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k310 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68010, 10000000)
MCFG_CPU_PROGRAM_MAP(hp9k310_map)
@@ -302,7 +302,7 @@ static MACHINE_CONFIG_START( hp9k310, hp9k3xx_state )
MCFG_SCREEN_REFRESH_RATE(70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9k320, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k320 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68020FPU, 16670000)
MCFG_CPU_PROGRAM_MAP(hp9k320_map)
@@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( hp9k320, hp9k3xx_state )
MCFG_SCREEN_REFRESH_RATE(70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9k330, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k330 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68020PMMU, 16670000)
MCFG_CPU_PROGRAM_MAP(hp9k330_map)
@@ -332,7 +332,7 @@ static MACHINE_CONFIG_START( hp9k330, hp9k3xx_state )
MCFG_SCREEN_REFRESH_RATE(70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9k340, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k340 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68030, 16670000)
MCFG_CPU_PROGRAM_MAP(hp9k330_map)
@@ -347,7 +347,7 @@ static MACHINE_CONFIG_START( hp9k340, hp9k3xx_state )
MCFG_SCREEN_REFRESH_RATE(70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9k370, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k370 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68030, 33000000)
MCFG_CPU_PROGRAM_MAP(hp9k370_map)
@@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( hp9k370, hp9k3xx_state )
MCFG_SCREEN_REFRESH_RATE(70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9k380, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k380 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68040, 25000000) // 25 MHz? 33?
MCFG_CPU_PROGRAM_MAP(hp9k330_map)
@@ -377,7 +377,7 @@ static MACHINE_CONFIG_START( hp9k380, hp9k3xx_state )
MCFG_SCREEN_REFRESH_RATE(70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hp9k382, hp9k3xx_state )
+static MACHINE_CONFIG_START( hp9k382 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68040, 25000000) // 25 MHz? 33?
MCFG_CPU_PROGRAM_MAP(hp9k382_map)
@@ -459,11 +459,11 @@ ROM_START( hp9k382 )
ROM_LOAD( "1818-5282_8ce61e951207_28c64.bin", 0x000000, 0x002000, CRC(740442f3) SHA1(ab65bd4eec1024afb97fc2dd3bd3f017e90f49ae) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, hp9k310, 0, 0, hp9k310, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/310", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1985, hp9k320, 0, 0, hp9k320, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/320", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1987, hp9k330, 0, 0, hp9k330, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/330", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1989, hp9k340, hp9k330,0, hp9k340, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/340", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1988, hp9k370, hp9k330,0, hp9k370, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/370", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1991, hp9k380, 0, 0, hp9k380, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/380", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1991, hp9k382, 0, 0, hp9k382, hp9k330, driver_device, 0, "Hewlett-Packard", "HP9000/382", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, hp9k310, 0, 0, hp9k310, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/310", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1985, hp9k320, 0, 0, hp9k320, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/320", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1987, hp9k330, 0, 0, hp9k330, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/330", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1989, hp9k340, hp9k330,0, hp9k340, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/340", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1988, hp9k370, hp9k330,0, hp9k370, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/370", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1991, hp9k380, 0, 0, hp9k380, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/380", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1991, hp9k382, 0, 0, hp9k382, hp9k330, hp9k3xx_state, 0, "Hewlett-Packard", "HP9000/382", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp
index 10f280fae18..9b6c4115f90 100644
--- a/src/mame/drivers/hp_ipc.cpp
+++ b/src/mame/drivers/hp_ipc.cpp
@@ -418,7 +418,7 @@ public:
private:
required_device<m68000_device> m_maincpu;
required_device<address_map_bank_device> m_bankdev;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<ram_device> m_ram;
required_device<screen_device> m_screen;
@@ -478,7 +478,7 @@ static ADDRESS_MAP_START(hp_ipc_mem_inner, AS_PROGRAM, 16, hp_ipc_state)
AM_RANGE(0x0100000, 0x04FFFFF) AM_UNMAP // External ROM modules
AM_RANGE(0x0600000, 0x060FFFF) AM_READWRITE(mmu_r, mmu_w)
AM_RANGE(0x0610000, 0x0610007) AM_READWRITE8(floppy_id_r, floppy_id_w, 0x00ff)
- AM_RANGE(0x0610008, 0x061000F) AM_DEVREADWRITE8("fdc", wd2797_t, read, write, 0x00ff)
+ AM_RANGE(0x0610008, 0x061000F) AM_DEVREADWRITE8("fdc", wd2797_device, read, write, 0x00ff)
AM_RANGE(0x0620000, 0x062000F) AM_DEVREADWRITE8("gpu", hp1ll3_device, read, write, 0x00ff)
AM_RANGE(0x0630000, 0x063FFFF) AM_NOP // AM_DEVREADWRITE8(TMS9914_TAG, tms9914_device, read, write, 0x00ff)
AM_RANGE(0x0640000, 0x064002F) AM_DEVREADWRITE8("rtc", mm58167_device, read, write, 0x00ff)
@@ -709,7 +709,7 @@ SLOT_INTERFACE_END
* 2 HP-HIL devices (keyboard, mouse)
* 1 Real-time clock
*/
-static MACHINE_CONFIG_START(hp_ipc, hp_ipc_state)
+static MACHINE_CONFIG_START(hp_ipc)
MCFG_CPU_ADD("maincpu", M68000, XTAL_15_92MHz / 2)
MCFG_CPU_PROGRAM_MAP(hp_ipc_mem_outer)
@@ -767,4 +767,4 @@ ROM_START(hp_ipc)
ROM_END
-COMP(1985, hp_ipc, 0, 0, hp_ipc, hp_ipc, driver_device, 0, "HP", "Integral Personal Computer", MACHINE_NO_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_KEYBOARD)
+COMP(1985, hp_ipc, 0, 0, hp_ipc, hp_ipc, hp_ipc_state, 0, "HP", "Integral Personal Computer", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_KEYBOARD)
diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp
index 188297ca4a5..56d9913e638 100644
--- a/src/mame/drivers/hprot1.cpp
+++ b/src/mame/drivers/hprot1.cpp
@@ -300,7 +300,7 @@ HD44780_PIXEL_UPDATE(hprot1_state::hprot1_pixel_update)
}
}
-static MACHINE_CONFIG_START( hprot1, hprot1_state )
+static MACHINE_CONFIG_START( hprot1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
@@ -380,5 +380,5 @@ COMP( 2002, hprot1, 0, 0, hprot1, hprot1, hprot1_state, hprot1
COMP( 2006, hprotr8a, hprot1, 0, hprotr8a, hprotr8a, hprot1_state, hprot1, "HENRY", "Henry Prot CARD I (REV.08A)", MACHINE_NOT_WORKING)
/* fw version: "V6.5QI I" Release date: September 18th, 2006. */
-COMP( 2003, hprot2r6, hprot1, 0, hprot2r6, hprot2r6, hprot1_state, hprot1, "HENRY", "Henry Prot CARD II (REV.6)", MACHINE_NOT_WORKING)
+COMP( 2003, hprot2r6, hprot1, 0, hprot2r6, hprot2r6, hprot1_state, hprot1, "HENRY", "Henry Prot CARD II (REV.6)", MACHINE_NOT_WORKING)
/* fw version: "V5.8CF II" Release date: June 23rd, 2003. */
diff --git a/src/mame/drivers/hpz80unk.cpp b/src/mame/drivers/hpz80unk.cpp
index c84bcaa369f..4a6f78632d5 100644
--- a/src/mame/drivers/hpz80unk.cpp
+++ b/src/mame/drivers/hpz80unk.cpp
@@ -55,7 +55,7 @@ public:
DECLARE_READ8_MEMBER(port03_r);
DECLARE_READ8_MEMBER(port04_r);
DECLARE_READ8_MEMBER(portfc_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
required_shared_ptr<uint8_t> m_p_rom;
uint8_t m_term_data;
uint8_t m_port02_data;
@@ -114,12 +114,12 @@ void hpz80unk_state::machine_reset()
// this should be rom/ram banking
}
-WRITE8_MEMBER( hpz80unk_state::kbd_put )
+void hpz80unk_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( hpz80unk, hpz80unk_state )
+static MACHINE_CONFIG_START( hpz80unk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(hpz80unk_mem)
@@ -127,7 +127,7 @@ static MACHINE_CONFIG_START( hpz80unk, hpz80unk_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(hpz80unk_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(hpz80unk_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -155,5 +155,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, hpz80unk, 0, 0, hpz80unk, hpz80unk, driver_device, 0, "Hewlett-Packard", "unknown Z80-based mainframe", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, hpz80unk, 0, 0, hpz80unk, hpz80unk, hpz80unk_state, 0, "Hewlett-Packard", "unknown Z80-based mainframe", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp
index 0a810999b29..900c70bcc2b 100644
--- a/src/mame/drivers/ht68k.cpp
+++ b/src/mame/drivers/ht68k.cpp
@@ -54,7 +54,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<mc68681_device> m_duart;
- required_device<wd1770_t> m_fdc;
+ required_device<wd1770_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
@@ -73,7 +73,7 @@ static ADDRESS_MAP_START(ht68k_mem, AS_PROGRAM, 16, ht68k_state)
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_SHARE("p_ram") // 512 KB RAM / ROM at boot
//AM_RANGE(0x00080000, 0x000fffff) // Expansion
//AM_RANGE(0x00d80000, 0x00d8ffff) // Printer
- AM_RANGE(0x00e00000, 0x00e00007) AM_MIRROR(0xfff8) AM_DEVREADWRITE8("wd1770", wd1770_t, read, write, 0x00ff) // FDC WD1770
+ AM_RANGE(0x00e00000, 0x00e00007) AM_MIRROR(0xfff8) AM_DEVREADWRITE8("wd1770", wd1770_device, read, write, 0x00ff) // FDC WD1770
AM_RANGE(0x00e80000, 0x00e800ff) AM_MIRROR(0xff00) AM_DEVREADWRITE8("duart68681", mc68681_device, read, write, 0xff )
AM_RANGE(0x00f00000, 0x00f07fff) AM_ROM AM_MIRROR(0xf8000) AM_REGION("user1",0)
ADDRESS_MAP_END
@@ -123,7 +123,7 @@ static SLOT_INTERFACE_START( ht68k_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( ht68k, ht68k_state )
+static MACHINE_CONFIG_START( ht68k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(ht68k_mem)
@@ -158,5 +158,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, ht68k, 0, 0, ht68k, ht68k, driver_device, 0, "Hawthorne Technology", "TinyGiant HT68k", MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, ht68k, 0, 0, ht68k, ht68k, ht68k_state, 0, "Hawthorne Technology", "TinyGiant HT68k", MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index 60eb7e4ad31..13e77786de1 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -309,7 +309,7 @@ static GFXDECODE_START( amu880 )
GFXDECODE_END
-static MACHINE_CONFIG_START( amu880, amu880_state )
+static MACHINE_CONFIG_START( amu880 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10MHz/4) // U880D
MCFG_CPU_PROGRAM_MAP(amu880_mem)
@@ -378,5 +378,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, amu880, 0, 0, amu880, amu880, driver_device, 0, "Militaerverlag der DDR", "Ausbaufaehiger Mikrocomputer mit dem U 880", MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, amu880, 0, 0, amu880, amu880, amu880_state, 0, "Militaerverlag der DDR", "Ausbaufaehiger Mikrocomputer mit dem U 880", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp
index fa4c0713aad..5ea770d3db2 100644
--- a/src/mame/drivers/hunter2.cpp
+++ b/src/mame/drivers/hunter2.cpp
@@ -365,7 +365,7 @@ WRITE_LINE_MEMBER(hunter2_state::rxd_w)
m_maincpu->set_input_line(NSC800_RSTB, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( hunter2, hunter2_state )
+static MACHINE_CONFIG_START( hunter2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(hunter2_mem)
@@ -442,5 +442,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1981, hunter2, 0, 0, hunter2, hunter2, hunter2_state, hunter2, "Husky", "Hunter 2", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index cd1ab6c5289..3dd8fb8f6c5 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -644,7 +644,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(hvyunit_state::scanline)
*
*************************************/
-static MACHINE_CONFIG_START( hvyunit, hvyunit_state )
+static MACHINE_CONFIG_START( hvyunit )
MCFG_CPU_ADD("master", Z80, 6000000)
MCFG_CPU_PROGRAM_MAP(master_memory)
@@ -815,7 +815,7 @@ ROM_END
*
*************************************/
-GAME( 1988, hvyunit, 0, hvyunit, hvyunit, driver_device, 0, ROT0, "Kaneko / Taito", "Heavy Unit (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hvyunitj, hvyunit, hvyunit, hvyunitj, driver_device, 0, ROT0, "Kaneko / Taito", "Heavy Unit (Japan, Newer)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hvyunitjo,hvyunit, hvyunit, hvyunitj, driver_device, 0, ROT0, "Kaneko / Taito", "Heavy Unit (Japan, Older)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hvyunitu, hvyunit, hvyunit, hvyunitj, driver_device, 0, ROT0, "Kaneko / Taito", "Heavy Unit -U.S.A. Version- (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hvyunit, 0, hvyunit, hvyunit, hvyunit_state, 0, ROT0, "Kaneko / Taito", "Heavy Unit (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hvyunitj, hvyunit, hvyunit, hvyunitj, hvyunit_state, 0, ROT0, "Kaneko / Taito", "Heavy Unit (Japan, Newer)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hvyunitjo,hvyunit, hvyunit, hvyunitj, hvyunit_state, 0, ROT0, "Kaneko / Taito", "Heavy Unit (Japan, Older)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hvyunitu, hvyunit, hvyunit, hvyunitj, hvyunit_state, 0, ROT0, "Kaneko / Taito", "Heavy Unit -U.S.A. Version- (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp
index 6243512b079..6e14fcbdccc 100644
--- a/src/mame/drivers/hx20.cpp
+++ b/src/mame/drivers/hx20.cpp
@@ -817,7 +817,7 @@ void hx20_state::machine_start()
// MACHINE_CONFIG( hx20 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( hx20, hx20_state )
+static MACHINE_CONFIG_START( hx20 )
// basic machine hardware
MCFG_CPU_ADD(HD6301V1_MAIN_TAG, HD63701, XTAL_2_4576MHz)
MCFG_CPU_PROGRAM_MAP(hx20_mem)
@@ -920,6 +920,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, ehx20, 0, 0, hx20, hx20, driver_device, 0, "Epson", "Epson HX-20", MACHINE_NOT_WORKING )
-COMP( 1983, ehx20e, ehx20, 0, hx20, hx20e, driver_device, 0, "Epson", "Epson HX-20 (Europe)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, ehx20, 0, 0, hx20, hx20, hx20_state, 0, "Epson", "Epson HX-20", MACHINE_NOT_WORKING )
+COMP( 1983, ehx20e, ehx20, 0, hx20, hx20e, hx20_state, 0, "Epson", "Epson HX-20 (Europe)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp
index 9b5770f3682..e753ba0a1f6 100644
--- a/src/mame/drivers/hyhoo.cpp
+++ b/src/mame/drivers/hyhoo.cpp
@@ -224,7 +224,7 @@ static INPUT_PORTS_START( hyhoo2 )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( hyhoo, hyhoo_state )
+static MACHINE_CONFIG_START( hyhoo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz ?? */
@@ -309,5 +309,5 @@ ROM_START( hyhoo2 )
ROM_END
-GAME( 1987, hyhoo, 0, hyhoo, hyhoo, driver_device, 0, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, hyhoo2, 0, hyhoo2, hyhoo2, driver_device, 0, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hyhoo, 0, hyhoo, hyhoo, hyhoo_state, 0, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hyhoo2, 0, hyhoo2, hyhoo2, hyhoo_state, 0, ROT90, "Nichibutsu", "Hayaoshi Taisen Quiz Hyhoo 2 (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp
index 2e25154e065..91447a27ce3 100644
--- a/src/mame/drivers/hyperscan.cpp
+++ b/src/mame/drivers/hyperscan.cpp
@@ -616,7 +616,7 @@ void hyperscan_state::machine_reset()
}
-static MACHINE_CONFIG_START( hyperscan, hyperscan_state )
+static MACHINE_CONFIG_START( hyperscan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SCORE7, XTAL_27MHz * 4) // 108MHz S+core 7
MCFG_CPU_PROGRAM_MAP(spg290_mem)
@@ -644,5 +644,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 2006, hs, 0, 0, hyperscan , hyperscan , driver_device, 0, "Mattel", "HyperScan", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 2006, hs, 0, 0, hyperscan, hyperscan, hyperscan_state, 0, "Mattel", "HyperScan", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp
index b96ef7ed5ed..ce9f7df21ae 100644
--- a/src/mame/drivers/hyperspt.cpp
+++ b/src/mame/drivers/hyperspt.cpp
@@ -283,7 +283,7 @@ INTERRUPT_GEN_MEMBER(hyperspt_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( hyperspt, hyperspt_state )
+static MACHINE_CONFIG_START( hyperspt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, XTAL_18_432MHz/12) /* verified on pcb */
@@ -569,9 +569,9 @@ ROM_START( roadf3 ) // This hack was found on an original GX330 (Hyper Sports) P
ROM_LOAD( "82s129.a9", 0x0120, 0x0100, CRC(5b3b5f2a) SHA1(e83556fba6d50ad20dff6e19bd300ba0c30cc6e2) ) // identical to a09_c29.bin
ROM_END
-GAME( 1984, hyperspt, 0, hyperspt, hyperspt, driver_device, 0, ROT0, "Konami (Centuri license)", "Hyper Sports", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, hypersptb, hyperspt, hypersptb, hyperspt, driver_device, 0, ROT0, "bootleg", "Hyper Sports (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // has ADPCM vis MSM5205 instead of VLM
-GAME( 1984, hpolym84, hyperspt, hyperspt, hyperspt, driver_device, 0, ROT0, "Konami", "Hyper Olympic '84", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, roadf, 0, roadf, roadf, driver_device, 0, ROT90, "Konami", "Road Fighter (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, roadf2, roadf, roadf, roadf, driver_device, 0, ROT90, "Konami", "Road Fighter (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, roadf3, roadf, roadf, roadf, driver_device, 0, ROT90, "hack", "Road Fighter (set 3, conversion hack on Hyper Sports PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, hyperspt, 0, hyperspt, hyperspt, hyperspt_state, 0, ROT0, "Konami (Centuri license)", "Hyper Sports", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, hypersptb, hyperspt, hypersptb, hyperspt, hyperspt_state, 0, ROT0, "bootleg", "Hyper Sports (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // has ADPCM vis MSM5205 instead of VLM
+GAME( 1984, hpolym84, hyperspt, hyperspt, hyperspt, hyperspt_state, 0, ROT0, "Konami", "Hyper Olympic '84", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, roadf, 0, roadf, roadf, hyperspt_state, 0, ROT90, "Konami", "Road Fighter (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, roadf2, roadf, roadf, roadf, hyperspt_state, 0, ROT90, "Konami", "Road Fighter (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, roadf3, roadf, roadf, roadf, hyperspt_state, 0, ROT90, "hack", "Road Fighter (set 3, conversion hack on Hyper Sports PCB)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp
index 3df2fa71b7f..e178b21a2b0 100644
--- a/src/mame/drivers/hyprduel.cpp
+++ b/src/mame/drivers/hyprduel.cpp
@@ -649,7 +649,7 @@ MACHINE_START_MEMBER(hyprduel_state,magerror)
m_magerror_irq_timer->adjust(attotime::zero, 0, attotime::from_hz(968)); /* tempo? */
}
-static MACHINE_CONFIG_START( hyprduel, hyprduel_state )
+static MACHINE_CONFIG_START( hyprduel )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
@@ -684,13 +684,13 @@ static MACHINE_CONFIG_START( hyprduel, hyprduel_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( magerror, hyprduel_state )
+static MACHINE_CONFIG_START( magerror )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10MHz */
@@ -724,7 +724,7 @@ static MACHINE_CONFIG_START( magerror, hyprduel_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00)
- MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 4000000/16/16*132, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index 0b822ebaf08..f8c38bdf255 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -44,6 +44,7 @@
#include "emu.h"
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "cpu/z80/z80.h" //CPU was actually a NSC800 (Z80 compatible)
#include "machine/i8279.h"
#include "machine/pit8253.h"
@@ -331,7 +332,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED(i7000_state::crtc_addr)
}
-static MACHINE_CONFIG_START( i7000, i7000_state )
+static MACHINE_CONFIG_START( i7000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NSC800, XTAL_4MHz)
@@ -414,5 +415,5 @@ ROM_START( i7000 )
ROM_LOAD( "i7000_telex_ci09.rom", 0x0000, 0x1000, CRC(c1c8fcc8) SHA1(cbf5fb600e587b998f190a9e3fb398a51d8a5e87) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1982, i7000, 0, 0, i7000, i7000, i7000_state, i7000, "Itautec", "I-7000", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp
index d5e0e0225b0..92d66ff8fea 100644
--- a/src/mame/drivers/ibm3153.cpp
+++ b/src/mame/drivers/ibm3153.cpp
@@ -93,7 +93,7 @@ void ibm3153_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( ibm3153, ibm3153_state )
+static MACHINE_CONFIG_START( ibm3153 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C32, XTAL_16MHz) // no idea of clock
MCFG_CPU_PROGRAM_MAP(ibm3153_mem)
@@ -123,5 +123,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1999?, ibm3153, 0, 0, ibm3153, ibm3153, driver_device, 0, "IBM", "IBM 3153 Terminal", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1999?, ibm3153, 0, 0, ibm3153, ibm3153, ibm3153_state, 0, "IBM", "IBM 3153 Terminal", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp
index 787355f84af..b88d7feb381 100644
--- a/src/mame/drivers/ibm6580.cpp
+++ b/src/mame/drivers/ibm6580.cpp
@@ -874,7 +874,7 @@ static SLOT_INTERFACE_START( dw_floppies )
SLOT_INTERFACE( "8sssd", IBM_6360 )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( ibm6580, ibm6580_state )
+static MACHINE_CONFIG_START( ibm6580 )
MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3)
MCFG_CPU_PROGRAM_MAP(ibm6580_mem)
MCFG_CPU_IO_MAP(ibm6580_io)
@@ -971,5 +971,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, ibm6580, 0, 0, ibm6580, ibm6580, driver_device, 0, "IBM", "IBM 6580 Displaywriter", MACHINE_IS_SKELETON)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1980, ibm6580, 0, 0, ibm6580, ibm6580, ibm6580_state, 0, "IBM", "IBM 6580 Displaywriter", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/ibmpc.cpp b/src/mame/drivers/ibmpc.cpp
index 0e3db41f1eb..01f9aa926b3 100644
--- a/src/mame/drivers/ibmpc.cpp
+++ b/src/mame/drivers/ibmpc.cpp
@@ -286,7 +286,7 @@ static DEVICE_INPUT_DEFAULTS_START(cga)
DEVICE_INPUT_DEFAULTS("DSW0",0x30, 0x20)
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( ibm5150, ibmpc_state )
+static MACHINE_CONFIG_START( ibm5150 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
MCFG_CPU_PROGRAM_MAP(pc8_map)
@@ -323,7 +323,7 @@ static MACHINE_CONFIG_DERIVED( ibm5140, ibm5150 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ibm5160, ibmpc_state )
+static MACHINE_CONFIG_START( ibm5160 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
MCFG_CPU_PROGRAM_MAP(pc8_map)
@@ -555,8 +555,8 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1981, ibm5150, 0, 0, ibm5150, 0, driver_device, 0, "International Business Machines", "IBM PC 5150" , 0)
-COMP( 1982, ibm5155, ibm5150, 0, ibm5150, 0, driver_device, 0, "International Business Machines", "IBM PC 5155" , 0)
-COMP( 1985, ibm5140, ibm5150, 0, ibm5140, 0, driver_device, 0, "International Business Machines", "IBM PC 5140 Convertible" , MACHINE_NOT_WORKING)
-COMP( 1982, ibm5160, ibm5150, 0, ibm5160, 0, driver_device, 0, "International Business Machines", "IBM XT 5160" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, ibm5150, 0, 0, ibm5150, 0, ibmpc_state, 0, "International Business Machines", "IBM PC 5150", 0 )
+COMP( 1982, ibm5155, ibm5150, 0, ibm5150, 0, ibmpc_state, 0, "International Business Machines", "IBM PC 5155", 0 )
+COMP( 1985, ibm5140, ibm5150, 0, ibm5140, 0, ibmpc_state, 0, "International Business Machines", "IBM PC 5140 Convertible", MACHINE_NOT_WORKING )
+COMP( 1982, ibm5160, ibm5150, 0, ibm5160, 0, ibmpc_state, 0, "International Business Machines", "IBM XT 5160", 0 )
diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp
index de7382b4a2d..5e211507869 100644
--- a/src/mame/drivers/ibmpcjr.cpp
+++ b/src/mame/drivers/ibmpcjr.cpp
@@ -575,7 +575,7 @@ static ADDRESS_MAP_START(ibmpcjx_io, AS_IO, 8, pcjr_state)
AM_IMPORT_FROM( ibmpcjr_io )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( ibmpcjr, pcjr_state)
+static MACHINE_CONFIG_START( ibmpcjr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 4900000)
MCFG_CPU_PROGRAM_MAP(ibmpcjr_map)
@@ -713,7 +713,7 @@ ROM_START( ibmpcjx )
ROM_LOAD("kanji.rom", 0x00000, 0x38000, BAD_DUMP CRC(eaa6e3c3) SHA1(35554587d02d947fae8446964b1886fff5c9d67f)) // hand-made rom
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
// pcjr
COMP( 1983, ibmpcjr, ibm5150, 0, ibmpcjr, ibmpcjr, pcjr_state, pcjr, "International Business Machines", "IBM PC Jr", MACHINE_IMPERFECT_COLORS )
COMP( 1985, ibmpcjx, ibm5150, 0, ibmpcjx, ibmpcjr, pcjr_state, pcjr, "International Business Machines", "IBM PC JX", MACHINE_IMPERFECT_COLORS | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp
index 240fce9f9fa..c172f16cb04 100644
--- a/src/mame/drivers/icatel.cpp
+++ b/src/mame/drivers/icatel.cpp
@@ -239,7 +239,7 @@ HD44780_PIXEL_UPDATE(icatel_state::icatel_pixel_update)
}
}
-static MACHINE_CONFIG_START( icatel, icatel_state )
+static MACHINE_CONFIG_START( icatel )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, XTAL_2_097152MHz)
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
@@ -270,6 +270,6 @@ ROM_START( icatel )
ROM_LOAD( "icatel_tpci_em._4_v16.05.ci14", 0x00000, 0x8000, CRC(d310586e) SHA1(21736ad5a06cf9695f8cc5ff2dc2d19b101504f5) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1995, icatel, 0, 0, icatel, 0, icatel_state, icatel, "Icatel", "TPCI (Brazilian public payphone)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1995, icatel, 0, 0, icatel, 0, icatel_state, icatel, "Icatel", "TPCI (Brazilian public payphone)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND)
/*The hardware was clearly manufactured in 1995. There's no evindence of the actual date of the firmware.*/
diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp
index 76320a23b22..fe0df02664c 100644
--- a/src/mame/drivers/ice_bozopail.cpp
+++ b/src/mame/drivers/ice_bozopail.cpp
@@ -20,10 +20,10 @@ http://www.highwaygames.com/arcade-machines/bozo-s-grand-prize-game-6751/
#include "emu.h"
#include "speaker.h"
-class ice_bozopail : public driver_device
+class ice_bozopail_state : public driver_device
{
public:
- ice_bozopail(const machine_config &mconfig, device_type type, const char *tag)
+ ice_bozopail_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
// ,m_maincpu(*this, "maincpu")
{ }
@@ -39,16 +39,16 @@ INPUT_PORTS_END
-void ice_bozopail::machine_start()
+void ice_bozopail_state::machine_start()
{
}
-void ice_bozopail::machine_reset()
+void ice_bozopail_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( ice_bozoice_bozo, ice_bozopail )
+static MACHINE_CONFIG_START( ice_bozoice_bozo )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
@@ -67,4 +67,4 @@ ROM_START( ice_bozo )
ROM_LOAD( "ICE-BOZO.U9", 0x100000, 0x100000, CRC(26fd9d60) SHA1(41fe8d42db1eb16b413bd5a0f16bf0d081c3cc97) )
ROM_END
-GAME( 1997?, ice_bozo, 0, ice_bozoice_bozo, ice_bozoice_bozo, driver_device, 0, ROT0, "Innovative Creations in Entertainment", "Bozo's Pail Toss (v2.07)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1997?, ice_bozo, 0, ice_bozoice_bozo, ice_bozoice_bozo, ice_bozopail_state, 0, ROT0, "Innovative Creations in Entertainment", "Bozo's Pail Toss (v2.07)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/ice_tbd.cpp b/src/mame/drivers/ice_tbd.cpp
index 1d5fada7d9d..6f1aa892198 100644
--- a/src/mame/drivers/ice_tbd.cpp
+++ b/src/mame/drivers/ice_tbd.cpp
@@ -25,8 +25,8 @@ class ice_tbd_state : public driver_device
public:
ice_tbd_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- ,m_maincpu(*this, "maincpu")
- { }
+ , m_maincpu(*this, "maincpu")
+ { }
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -51,7 +51,7 @@ void ice_tbd_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( ice_tbd, ice_tbd_state )
+static MACHINE_CONFIG_START( ice_tbd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
@@ -66,4 +66,4 @@ ROM_START( ice_tbd )
ROM_END
-GAME( 1988, ice_tbd, 0, ice_tbd, ice_tbd, driver_device, 0, ROT0, "Innovative Creations in Entertainment", "Turbo Drive (ICE)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1988, ice_tbd, 0, ice_tbd, ice_tbd, ice_tbd_state, 0, ROT0, "Innovative Creations in Entertainment", "Turbo Drive (ICE)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index 4071226bf82..de83b8e417e 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -329,7 +329,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(icecold_state::icecold_motors_timer)
}
}
-static MACHINE_CONFIG_START( icecold, icecold_state )
+static MACHINE_CONFIG_START( icecold )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_6MHz/4)
@@ -399,5 +399,5 @@ ROM_START(zekepeak)
ROM_END
-GAME(1983, icecold, 0, icecold, icecold, driver_device, 0, ROT0, "Taito", "Ice Cold Beer", MACHINE_NOT_WORKING | MACHINE_MECHANICAL)
-GAME(1983, zekepeak, icecold, icecold, icecold, driver_device, 0, ROT0, "Taito", "Zeke's Peak", MACHINE_NOT_WORKING | MACHINE_MECHANICAL)
+GAME(1983, icecold, 0, icecold, icecold, icecold_state, 0, ROT0, "Taito", "Ice Cold Beer", MACHINE_NOT_WORKING | MACHINE_MECHANICAL)
+GAME(1983, zekepeak, icecold, icecold, icecold, icecold_state, 0, ROT0, "Taito", "Zeke's Peak", MACHINE_NOT_WORKING | MACHINE_MECHANICAL)
diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp
index a73da32455d..43fe1b3449f 100644
--- a/src/mame/drivers/ichiban.cpp
+++ b/src/mame/drivers/ichiban.cpp
@@ -115,7 +115,7 @@ void ichibanjyan_state::machine_reset()
}
-static MACHINE_CONFIG_START( ichibanjyan, ichibanjyan_state )
+static MACHINE_CONFIG_START( ichibanjyan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/3)
@@ -167,4 +167,4 @@ ROM_START( ichiban )
ROM_LOAD( "mjb.u38", 0x400, 0x200, CRC(0ef881cb) SHA1(44b61a443d683f5cb2d1b1a4f74d8a8f41021de5) )
ROM_END
-GAME( 199?, ichiban, 0, ichibanjyan, ichibanjyan, driver_device, 0, ROT0, "Excel", "Ichi Ban Jyan", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, ichiban, 0, ichibanjyan, ichibanjyan, ichibanjyan_state, 0, ROT0, "Excel", "Ichi Ban Jyan", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp
index d297f837a2c..60e4f61e149 100644
--- a/src/mame/drivers/idsa.cpp
+++ b/src/mame/drivers/idsa.cpp
@@ -263,7 +263,7 @@ void idsa_state::machine_reset()
m_irqcnt = 0;
}
-static MACHINE_CONFIG_START( idsa, idsa_state )
+static MACHINE_CONFIG_START( idsa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
@@ -308,5 +308,5 @@ ROM_START(bsktbllp)
ROM_END
-GAME( 1985, v1, 0, idsa, idsa, driver_device, 0, ROT0, "IDSA", "V.1", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1987, bsktbllp, 0, idsa, idsa, driver_device, 0, ROT0, "IDSA", "Basket Ball", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1985, v1, 0, idsa, idsa, idsa_state, 0, ROT0, "IDSA", "V.1", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, bsktbllp, 0, idsa, idsa, idsa_state, 0, ROT0, "IDSA", "Basket Ball", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp
index 0c4902b3e88..96ced86bd46 100644
--- a/src/mame/drivers/ie15.cpp
+++ b/src/mame/drivers/ie15.cpp
@@ -29,7 +29,7 @@ public:
};
-static MACHINE_CONFIG_START( ie15, ie15_state )
+static MACHINE_CONFIG_START( ie15 )
MCFG_DEVICE_ADD("ie15", IE15, 0)
MACHINE_CONFIG_END
@@ -37,5 +37,5 @@ MACHINE_CONFIG_END
ROM_START(ie15)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, ie15, 0, 0, ie15, 0, driver_device, 0, "USSR", "15IE-00-013", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, ie15, 0, 0, ie15, 0, ie15_state, 0, "USSR", "15IE-00-013", 0)
diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp
index ddb34e7d184..cd747ad7597 100644
--- a/src/mame/drivers/if800.cpp
+++ b/src/mame/drivers/if800.cpp
@@ -80,7 +80,7 @@ static ADDRESS_MAP_START( upd7220_map, AS_0, 16, if800_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM AM_SHARE("video_ram")
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( if800, if800_state )
+static MACHINE_CONFIG_START( if800 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 8000000)
MCFG_CPU_PROGRAM_MAP(if800_map)
@@ -114,5 +114,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, if800, 0, 0, if800, if800, driver_device, 0, "Oki Electric", "if800 model 60", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, if800, 0, 0, if800, if800, if800_state, 0, "Oki Electric", "if800 model 60", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index 21709d53c71..9be65e7f25f 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -808,7 +808,7 @@ INTERRUPT_GEN_MEMBER(igs009_state::interrupt)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( jingbell, igs009_state )
+static MACHINE_CONFIG_START( jingbell )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
MCFG_CPU_PROGRAM_MAP(jingbell_map)
@@ -845,7 +845,7 @@ static MACHINE_CONFIG_START( jingbell, igs009_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1166,4 +1166,4 @@ GAME( 1997, jingbella, jingbell, jingbell, jingbell, igs009_state, jingbell,
GAME( 1997, jingbellb, jingbell, jingbell, jingbell, igs009_state, jingbell, ROT0, "IGS", "Jingle Bell (EU, V153UE)", MACHINE_SUPPORTS_SAVE )
GAME( 1995, jingbellc, jingbell, jingbell, jingbell, igs009_state, jingbelli, ROT0, "IGS", "Jingle Bell (EU, V141UE)", MACHINE_SUPPORTS_SAVE )
GAME( 1995?, jingbelli, jingbell, jingbell, jingbell, igs009_state, jingbelli, ROT0, "IGS", "Jingle Bell (Italy, V133I)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, gp98, 0, gp98, jingbell, driver_device, 0, ROT0, "Romtec Co. Ltd", "Grand Prix '98 (V100K)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, gp98, 0, gp98, jingbell, igs009_state, 0, ROT0, "Romtec Co. Ltd", "Grand Prix '98 (V100K)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp
index d3e5a79ce3f..b2736bcdfa8 100644
--- a/src/mame/drivers/igs011.cpp
+++ b/src/mame/drivers/igs011.cpp
@@ -3989,7 +3989,7 @@ static GFXDECODE_START( igs011_hi )
GFXDECODE_END
#endif
-static MACHINE_CONFIG_START( igs011_base, igs011_state )
+static MACHINE_CONFIG_START( igs011_base )
MCFG_CPU_ADD("maincpu",M68000, XTAL_22MHz/3)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -4009,7 +4009,7 @@ static MACHINE_CONFIG_START( igs011_base, igs011_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz/21, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz/21, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index a175eaa785f..6395e52441a 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -3249,7 +3249,7 @@ MACHINE_RESET_MEMBER(igs017_state,iqblocka)
m_input_select = 0;
}
-static MACHINE_CONFIG_START( iqblocka, igs017_state )
+static MACHINE_CONFIG_START( iqblocka )
MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(iqblocka_map)
MCFG_CPU_IO_MAP(iqblocka_io)
@@ -3283,7 +3283,7 @@ static MACHINE_CONFIG_START( iqblocka, igs017_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3314,7 +3314,7 @@ MACHINE_RESET_MEMBER(igs017_state,mgcs)
memset(m_igs_magic, 0, sizeof(m_igs_magic));
}
-static MACHINE_CONFIG_START( mgcs, igs017_state )
+static MACHINE_CONFIG_START( mgcs )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
MCFG_CPU_PROGRAM_MAP(mgcs)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3345,7 +3345,7 @@ static MACHINE_CONFIG_START( mgcs, igs017_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3353,7 +3353,7 @@ MACHINE_CONFIG_END
// lhzb2
-static MACHINE_CONFIG_START( lhzb2, igs017_state )
+static MACHINE_CONFIG_START( lhzb2 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
MCFG_CPU_PROGRAM_MAP(lhzb2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3391,7 +3391,7 @@ static MACHINE_CONFIG_START( lhzb2, igs017_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3405,7 +3405,7 @@ MACHINE_RESET_MEMBER(igs017_state,lhzb2a)
lhzb2a_input_addr_w(m_maincpu->space(AS_PROGRAM), 0, 0xf0);
}
-static MACHINE_CONFIG_START( lhzb2a, igs017_state )
+static MACHINE_CONFIG_START( lhzb2a )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2)
MCFG_CPU_PROGRAM_MAP(lhzb2a)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3434,7 +3434,7 @@ static MACHINE_CONFIG_START( lhzb2a, igs017_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3442,7 +3442,7 @@ MACHINE_CONFIG_END
// slqz2
-static MACHINE_CONFIG_START( slqz2, igs017_state )
+static MACHINE_CONFIG_START( slqz2 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
MCFG_CPU_PROGRAM_MAP(slqz2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3478,7 +3478,7 @@ static MACHINE_CONFIG_START( slqz2, igs017_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3486,7 +3486,7 @@ MACHINE_CONFIG_END
// sdmg2
-static MACHINE_CONFIG_START( sdmg2, igs017_state )
+static MACHINE_CONFIG_START( sdmg2 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz/2)
MCFG_CPU_PROGRAM_MAP(sdmg2)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1)
@@ -3516,7 +3516,7 @@ static MACHINE_CONFIG_START( sdmg2, igs017_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -3534,7 +3534,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::mgdh_interrupt)
m_maincpu->set_input_line(3, HOLD_LINE); // lev 3 instead of 2
}
-static MACHINE_CONFIG_START( mgdha, igs017_state )
+static MACHINE_CONFIG_START( mgdha )
MCFG_CPU_ADD("maincpu", M68000, XTAL_22MHz / 2)
MCFG_CPU_PROGRAM_MAP(mgdha_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgdh_interrupt, "screen", 0, 1)
@@ -3563,14 +3563,14 @@ static MACHINE_CONFIG_START( mgdha, igs017_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_22MHz / 22, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
// tjsb
-static MACHINE_CONFIG_START( tjsb, igs017_state )
+static MACHINE_CONFIG_START( tjsb )
MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(tjsb_map)
MCFG_CPU_IO_MAP(tjsb_io)
@@ -3606,14 +3606,14 @@ static MACHINE_CONFIG_START( tjsb, igs017_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
// spkrform
-static MACHINE_CONFIG_START( spkrform, igs017_state )
+static MACHINE_CONFIG_START( spkrform )
MCFG_CPU_ADD("maincpu", Z180, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(spkrform_map)
MCFG_CPU_IO_MAP(spkrform_io)
@@ -3647,7 +3647,7 @@ static MACHINE_CONFIG_START( spkrform, igs017_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp
index cad0ea39f1a..e864fad5fcb 100644
--- a/src/mame/drivers/igs_fear.cpp
+++ b/src/mame/drivers/igs_fear.cpp
@@ -75,7 +75,7 @@ WRITE_LINE_MEMBER(igs_fear_state::sound_irq)
}
-static MACHINE_CONFIG_START( igs_fear, igs_fear_state )
+static MACHINE_CONFIG_START( igs_fear )
MCFG_CPU_ADD("maincpu",ARM7, 50000000/2)
MCFG_CPU_PROGRAM_MAP(igs_igs_fear_map)
diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp
index 0a8d950c17f..7db33800f5c 100644
--- a/src/mame/drivers/igs_m027.cpp
+++ b/src/mame/drivers/igs_m027.cpp
@@ -333,7 +333,7 @@ INTERRUPT_GEN_MEMBER(igs_m027_state::igs_majhong_interrupt)
}
-static MACHINE_CONFIG_START( igs_majhong, igs_m027_state )
+static MACHINE_CONFIG_START( igs_majhong )
MCFG_CPU_ADD("maincpu",ARM7, 20000000)
MCFG_CPU_PROGRAM_MAP(igs_majhong_map)
@@ -367,7 +367,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( amazonia, igs_m027_state )
+static MACHINE_CONFIG_START( amazonia )
MCFG_CPU_ADD("maincpu",ARM7, 20000000)
MCFG_CPU_PROGRAM_MAP(igs_majhong_map)
diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp
index c9759711520..3bbcec427fe 100644
--- a/src/mame/drivers/igs_m036.cpp
+++ b/src/mame/drivers/igs_m036.cpp
@@ -245,7 +245,7 @@ void igs_m036_state::pgm_create_dummy_internal_arm_region(void)
#define IGS036_CPU ARM7
-static MACHINE_CONFIG_START( igs_m036, igs_m036_state )
+static MACHINE_CONFIG_START( igs_m036 )
MCFG_CPU_ADD("maincpu",IGS036_CPU, 20000000)
MCFG_CPU_PROGRAM_MAP(igs_m036_map)
@@ -264,7 +264,7 @@ static MACHINE_CONFIG_START( igs_m036, igs_m036_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( igs_m036_tt, igs_m036_state )
+static MACHINE_CONFIG_START( igs_m036_tt )
MCFG_CPU_ADD("maincpu",IGS036_CPU, 20000000)
MCFG_CPU_PROGRAM_MAP(igs_m036_map)
@@ -319,10 +319,10 @@ DRIVER_INIT_MEMBER(igs_m036_state, igsm312)
***************************************************************************/
-GAME( 200?, cjdh2, 0, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V311CN)", MACHINE_IS_SKELETON )
-GAME( 200?, cjdh2a, cjdh2, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V311CNA)", MACHINE_IS_SKELETON )
-GAME( 200?, cjdh2b, cjdh2, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V311CNB)", MACHINE_IS_SKELETON )
-GAME( 200?, cjdh2c, cjdh2, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V215CN)", MACHINE_IS_SKELETON )
+GAME( 200?, cjdh2, 0, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V311CN)", MACHINE_IS_SKELETON )
+GAME( 200?, cjdh2a, cjdh2, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V311CNA)", MACHINE_IS_SKELETON )
+GAME( 200?, cjdh2b, cjdh2, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V311CNB)", MACHINE_IS_SKELETON )
+GAME( 200?, cjdh2c, cjdh2, igs_m036, igs_m036, igs_m036_state, cjdh2, ROT0, "IGS", "Chao Ji Da Heng 2 (V215CN)", MACHINE_IS_SKELETON )
GAME( 200?, cjddzsp, 0, igs_m036_tt, igs_m036, igs_m036_state, cjddzsp, ROT0, "IGS", "Super Dou Di Zhu Special (V122CN)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/igspc.cpp b/src/mame/drivers/igspc.cpp
index 2acd3fc9b2f..8e217f8961e 100644
--- a/src/mame/drivers/igspc.cpp
+++ b/src/mame/drivers/igspc.cpp
@@ -75,7 +75,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( speeddrv, speeddrv_state )
+static MACHINE_CONFIG_START( speeddrv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I486, 40000000 ) // ?? at least a pentium
MCFG_CPU_PROGRAM_MAP(speeddrv_map)
@@ -113,5 +113,5 @@ DRIVER_INIT_MEMBER(speeddrv_state,speeddrv)
{
}
-GAME( 2004, speeddrv, 0, speeddrv, speeddrv, speeddrv_state, speeddrv, ROT0, "IGS", "Speed Driver", MACHINE_IS_SKELETON )
-GAME( 200?, eztouch, 0, speeddrv, speeddrv, speeddrv_state, speeddrv, ROT0, "IGS", "EZ Touch (v116 China)", MACHINE_IS_SKELETON )
+GAME( 2004, speeddrv, 0, speeddrv, speeddrv, speeddrv_state, speeddrv, ROT0, "IGS", "Speed Driver", MACHINE_IS_SKELETON )
+GAME( 200?, eztouch, 0, speeddrv, speeddrv, speeddrv_state, speeddrv, ROT0, "IGS", "EZ Touch (v116 China)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index bc73053b433..c7fdab10abb 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -1777,7 +1777,7 @@ static GFXDECODE_START( cpokerpk )
GFXDECODE_ENTRY( "gfx2", 0x00000, charlayout2, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( igspoker, igspoker_state )
+static MACHINE_CONFIG_START( igspoker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, 3579545)
@@ -1832,7 +1832,7 @@ static MACHINE_CONFIG_DERIVED( number10, igspoker )
MCFG_SCREEN_UPDATE_DRIVER(igspoker_state, screen_update_cpokerpk)
MCFG_VIDEO_START_OVERRIDE(igspoker_state,cpokerpk)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2706,7 +2706,7 @@ GAMEL( 199?, citalcup, cpokerpk, cpokerpk, cpokerpk, igspoker_state, cpokerpk,
GAMEL( 2000, igs_ncs2, 0, igs_ncs, igs_ncs, igspoker_state, igs_ncs2, ROT0, "IGS", "New Champion Skill (v100n 2000)", MACHINE_IMPERFECT_GRAPHICS, layout_igspoker )
-GAMEL( 1998, stellecu, 0, number10, number10, driver_device, 0, ROT0, "Sure", "Stelle e Cubi (Italy)", MACHINE_NOT_WORKING, layout_igspoker )
+GAMEL( 1998, stellecu, 0, number10, number10, igspoker_state, 0, ROT0, "Sure", "Stelle e Cubi (Italy)", MACHINE_NOT_WORKING, layout_igspoker )
GAMEL( 1993?,pktet346, 0, pktetris, pktet346, igspoker_state, pktet346, ROT0, "IGS", "PK Tetris (v346I)", 0, layout_igspoker )
diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp
index 4ed29121a72..ee138c77303 100644
--- a/src/mame/drivers/ikki.cpp
+++ b/src/mame/drivers/ikki.cpp
@@ -238,7 +238,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(ikki_state::ikki_irq)
-static MACHINE_CONFIG_START( ikki, ikki_state )
+static MACHINE_CONFIG_START( ikki )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
@@ -356,5 +356,5 @@ ROM_END
*
*************************************/
-GAME( 1985, ikki, 0, ikki, ikki, driver_device, 0, ROT0, "Sun Electronics", "Ikki (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, farmer, ikki, ikki, ikki, driver_device, 0, ROT0, "Sun Electronics", "Farmers Rebellion", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ikki, 0, ikki, ikki, ikki_state, 0, ROT0, "Sun Electronics", "Ikki (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, farmer, ikki, ikki, ikki, ikki_state, 0, ROT0, "Sun Electronics", "Farmers Rebellion", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/imds.cpp b/src/mame/drivers/imds.cpp
index 2c6df441971..0536b13d75f 100644
--- a/src/mame/drivers/imds.cpp
+++ b/src/mame/drivers/imds.cpp
@@ -37,7 +37,7 @@ public:
required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(term_r);
DECLARE_READ8_MEMBER(term_status_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
uint8_t m_term_data;
virtual void machine_reset() override;
};
@@ -69,7 +69,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( imds )
INPUT_PORTS_END
-WRITE8_MEMBER( imds_state::kbd_put )
+void imds_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -88,7 +88,7 @@ void imds_state::machine_reset()
// nullptr
//};
-static MACHINE_CONFIG_START( imds, imds_state )
+static MACHINE_CONFIG_START( imds )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_4MHz) // no idea of clock.
MCFG_CPU_PROGRAM_MAP(imds_mem)
@@ -98,7 +98,7 @@ static MACHINE_CONFIG_START( imds, imds_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(imds_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(imds_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -112,5 +112,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, imds, 0, 0, imds, imds, driver_device, 0, "Intel", "Intellec MDS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, imds, 0, 0, imds, imds, imds_state, 0, "Intel", "Intellec MDS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp
index 3955676926e..147c71eeea9 100644
--- a/src/mame/drivers/imds2.cpp
+++ b/src/mame/drivers/imds2.cpp
@@ -753,7 +753,7 @@ static SLOT_INTERFACE_START( imds2_floppies )
SLOT_INTERFACE( "8sssd", FLOPPY_8_SSSD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START(imds2 , imds2_state)
+static MACHINE_CONFIG_START(imds2)
MCFG_CPU_ADD("ipccpu" , I8085A , IPC_XTAL_Y2 / 2) // 4 MHz
MCFG_CPU_PROGRAM_MAP(ipc_mem_map)
MCFG_CPU_IO_MAP(ipc_io_map)
@@ -913,5 +913,5 @@ ROM_START(imds2)
ROM_LOAD ("ioc_a19.bin" , 0x0000 , 0x0400 , CRC(47487d0f) SHA1(0ed98f9f06622949ee3cc2ffc572fb9702db0f81))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1979, imds2, 0, 0, imds2, imds2, driver_device, 0, "Intel", "Intellec MDS-II" , 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1979, imds2, 0, 0, imds2, imds2, imds2_state, 0, "Intel", "Intellec MDS-II" , 0)
diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp
index 206390450ff..e6d07a7bcb2 100644
--- a/src/mame/drivers/imolagp.cpp
+++ b/src/mame/drivers/imolagp.cpp
@@ -484,7 +484,7 @@ void imolagp_state::machine_reset()
}
-static MACHINE_CONFIG_START( imolagp, imolagp_state )
+static MACHINE_CONFIG_START( imolagp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3000000) // ? (assume slower than slave)
@@ -572,6 +572,6 @@ ROM_START( imolagpo )
ROM_END
-/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
-GAMEL(1983?, imolagp, 0, imolagp, imolagp, driver_device, 0, ROT90, "RB Bologna", "Imola Grand Prix (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE, layout_imolagp ) // made by Alberici? year not shown, PCB labels suggests it's from 1983
-GAMEL(1983?, imolagpo, imolagp, imolagp, imolagpo, driver_device, 0, ROT90, "RB Bologna", "Imola Grand Prix (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE, layout_imolagp ) // "
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS
+GAMEL(1983?, imolagp, 0, imolagp, imolagp, imolagp_state, 0, ROT90, "RB Bologna", "Imola Grand Prix (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE, layout_imolagp ) // made by Alberici? year not shown, PCB labels suggests it's from 1983
+GAMEL(1983?, imolagpo, imolagp, imolagp, imolagpo, imolagp_state, 0, ROT90, "RB Bologna", "Imola Grand Prix (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE, layout_imolagp ) // "
diff --git a/src/mame/drivers/imsai.cpp b/src/mame/drivers/imsai.cpp
index 4c6e92f6eea..6d118bbdb2c 100644
--- a/src/mame/drivers/imsai.cpp
+++ b/src/mame/drivers/imsai.cpp
@@ -36,7 +36,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(keyin_r);
DECLARE_READ8_MEMBER(status_r);
DECLARE_WRITE8_MEMBER(control_w);
@@ -90,7 +90,7 @@ READ8_MEMBER( imsai_state::status_r )
return (m_term_data) ? 3 : 1;
}
-WRITE8_MEMBER( imsai_state::kbd_put )
+void imsai_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -110,7 +110,7 @@ void imsai_state::machine_reset()
m_term_data = 0;
}
-static MACHINE_CONFIG_START( imsai, imsai_state )
+static MACHINE_CONFIG_START( imsai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_6MHz)
MCFG_CPU_PROGRAM_MAP(imsai_mem)
@@ -118,7 +118,7 @@ static MACHINE_CONFIG_START( imsai, imsai_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(imsai_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(imsai_state, kbd_put))
/* Devices */
MCFG_DEVICE_ADD("uart", I8251, 0)
@@ -138,5 +138,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, imsai, 0, 0, imsai, imsai, driver_device, 0, "Imsai", "MPU-B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1978, imsai, 0, 0, imsai, imsai, imsai_state, 0, "Imsai", "MPU-B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index 999faa5ca1e..9f015d29bef 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -1302,7 +1302,7 @@ WRITE8_MEMBER( inder_state::ppic_w )
{
// pc4 - READY line back to cpu board, but not used
if (BIT(data, 5) != BIT(m_portc, 5))
- m_msm->set_prescaler_selector(*m_msm, BIT(data, 5) ? MSM5205_S48_4B : MSM5205_S96_4B); // S1 pin
+ m_msm->set_prescaler_selector(*m_msm, BIT(data, 5) ? msm5205_device::S48_4B : msm5205_device::S96_4B); // S1 pin
m_7a->clock_w(BIT(data, 6));
m_7a->preset_w(!BIT(data, 7));
m_9a->preset_w(!BIT(data, 7));
@@ -1346,7 +1346,7 @@ DRIVER_INIT_MEMBER( inder_state, inder1 )
m_game = 1;
}
-static MACHINE_CONFIG_START( brvteam, inder_state )
+static MACHINE_CONFIG_START( brvteam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
MCFG_CPU_PROGRAM_MAP(brvteam_map)
@@ -1364,7 +1364,7 @@ static MACHINE_CONFIG_START( brvteam, inder_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "snvol", 2.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( canasta, inder_state )
+static MACHINE_CONFIG_START( canasta )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
MCFG_CPU_PROGRAM_MAP(canasta_map)
@@ -1382,7 +1382,7 @@ static MACHINE_CONFIG_START( canasta, inder_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lapbylap, inder_state )
+static MACHINE_CONFIG_START( lapbylap )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
MCFG_CPU_PROGRAM_MAP(lapbylap_map)
@@ -1406,7 +1406,7 @@ static MACHINE_CONFIG_START( lapbylap, inder_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ayvol", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( inder, inder_state )
+static MACHINE_CONFIG_START( inder )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
MCFG_CPU_PROGRAM_MAP(inder_map)
@@ -1425,7 +1425,7 @@ static MACHINE_CONFIG_START( inder, inder_state )
MCFG_SPEAKER_STANDARD_MONO("msmvol")
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(inder_state, vck_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmvol", 1.0)
/* Devices */
@@ -1640,13 +1640,13 @@ ROM_END
// old cpu board, 6 digits, sn76489
-GAME(1985, brvteam, 0, brvteam, brvteam, driver_device, 0, ROT0, "Inder", "Brave Team", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1985, brvteam, 0, brvteam, brvteam, inder_state, 0, ROT0, "Inder", "Brave Team", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
// old cpu board, 7 digits, ay8910
-GAME(1986, canasta, 0, canasta, canasta, driver_device, 0, ROT0, "Inder", "Canasta '86'", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1986, canasta, 0, canasta, canasta, inder_state, 0, ROT0, "Inder", "Canasta '86'", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
// old cpu board, 7 digits, sound cpu with 2x ay8910
-GAME(1986, lapbylap, 0, lapbylap, lapbylap, driver_device, 0, ROT0, "Inder", "Lap By Lap", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1986, lapbylap, 0, lapbylap, lapbylap, inder_state, 0, ROT0, "Inder", "Lap By Lap", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
// new cpu board, sound board with msm5205
GAME(1987, pinmoonl, 0, inder, pinmoonl, inder_state, inder, ROT0, "Inder", "Moon Light (Inder)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp
index 140b6c103c3..9b4a7f3cff1 100644
--- a/src/mame/drivers/inderp.cpp
+++ b/src/mame/drivers/inderp.cpp
@@ -43,7 +43,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( inderp )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( inderp, inderp_state )
+static MACHINE_CONFIG_START( inderp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
@@ -78,5 +78,5 @@ ROM_START(centauri2)
ROM_END
-GAME( 1979, centauri, 0, inderp, inderp, driver_device, 0, ROT0, "Inder", "Centaur (Inder)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1979, centauri2, centauri, inderp, inderp, driver_device, 0, ROT0, "Inder", "Centaur (alternate set)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1979, centauri, 0, inderp, inderp, inderp_state, 0, ROT0, "Inder", "Centaur (Inder)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1979, centauri2, centauri, inderp, inderp, inderp_state, 0, ROT0, "Inder", "Centaur (alternate set)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp
index 944183ef999..693aa262e87 100644
--- a/src/mame/drivers/indiana.cpp
+++ b/src/mame/drivers/indiana.cpp
@@ -17,8 +17,12 @@
#include "emu.h"
#include "bus/rs232/keyboard.h"
#include "cpu/m68000/m68000.h"
+#include "bus/isa/com.h"
+#include "bus/isa/fdc.h"
+#include "bus/isa/ide.h"
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
+#include "bus/isa/vga.h"
#include "machine/mc68901.h"
#define M68K_TAG "maincpu"
@@ -82,7 +86,7 @@ static DEVICE_INPUT_DEFAULTS_START( keyboard )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( indiana, indiana_state )
+static MACHINE_CONFIG_START( indiana )
/* basic machine hardware */
MCFG_CPU_ADD(M68K_TAG, M68030, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(indiana_mem)
@@ -119,5 +123,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1993, indiana, 0, 0, indiana, indiana, indiana_state, indiana, "Indiana University", "Indiana University 68030 board", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1993, indiana, 0, 0, indiana, indiana, indiana_state, indiana, "Indiana University", "Indiana University 68030 board", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp
index cc8e0b9322e..892b85a2977 100644
--- a/src/mame/drivers/indigo.cpp
+++ b/src/mame/drivers/indigo.cpp
@@ -573,7 +573,7 @@ static MACHINE_CONFIG_FRAGMENT( cdrom_config )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "^^^^mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( indigo3k, indigo_state )
+static MACHINE_CONFIG_START( indigo3k )
MCFG_CPU_ADD("maincpu", R3041, 33000000)
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
MCFG_CPU_PROGRAM_MAP(indigo3k_map)
@@ -626,6 +626,6 @@ ROM_START( indigo4k )
ROM_LOAD( "ip20prom.070-8116-004.bin", 0x000000, 0x080000, CRC(940d960e) SHA1(596aba530b53a147985ff3f6f853471ce48c866c) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1991, indigo3k, 0, 0, indigo3k, indigo, driver_device, 0, "Silicon Graphics Inc", "IRIS Indigo (R3000, 33MHz)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1993, indigo4k, 0, 0, indigo4k, indigo, driver_device, 0, "Silicon Graphics Inc", "IRIS Indigo (R4400, 150MHz, Ver. 4.0.5D Rev A)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1991, indigo3k, 0, 0, indigo3k, indigo, indigo_state, 0, "Silicon Graphics Inc", "IRIS Indigo (R3000, 33MHz)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1993, indigo4k, 0, 0, indigo4k, indigo, indigo_state, 0, "Silicon Graphics Inc", "IRIS Indigo (R4400, 150MHz, Ver. 4.0.5D Rev A)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index e138aca954a..f5937b1d7b6 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -83,8 +83,6 @@
class ioc2_device : public device_t
{
public:
- ioc2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, uint8_t id);
-
DECLARE_WRITE32_MEMBER( write );
DECLARE_READ32_MEMBER( read );
@@ -98,6 +96,8 @@ public:
void raise_local1_irq(uint8_t source_mask);
protected:
+ ioc2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t id);
+
virtual void device_start() override;
virtual void device_reset() override;
machine_config_constructor device_mconfig_additions() const override;
@@ -141,28 +141,32 @@ class ioc2_guinness_device : public ioc2_device
{
public:
ioc2_guinness_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ioc2_guinness_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : ioc2_device(mconfig, type, name, tag, owner, clock, shortname, source, 0x01) { }
+protected:
+ ioc2_guinness_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : ioc2_device(mconfig, type, tag, owner, clock, 0x01)
+ { }
};
class ioc2_full_house_device : public ioc2_device
{
public:
ioc2_full_house_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ioc2_full_house_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : ioc2_device(mconfig, type, name, tag, owner, clock, shortname, source, 0x20) { }
+protected:
+ ioc2_full_house_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : ioc2_device(mconfig, type, tag, owner, clock, 0x20)
+ { }
};
-const device_type SGI_IOC2_GUINNESS = device_creator<ioc2_guinness_device>;
-const device_type SGI_IOC2_FULL_HOUSE = device_creator<ioc2_full_house_device>;
+DEFINE_DEVICE_TYPE(SGI_IOC2_GUINNESS, ioc2_guinness_device, "ioc2g", "SGI IOC2 (Guiness)")
+DEFINE_DEVICE_TYPE(SGI_IOC2_FULL_HOUSE, ioc2_full_house_device, "ioc2f", "SGI IOC2 (Full House)")
ioc2_guinness_device::ioc2_guinness_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ioc2_guinness_device(mconfig, SGI_IOC2_GUINNESS, "SGI IOC2 (Guinness)", tag, owner, clock, "ioc2g", __FILE__)
+ : ioc2_guinness_device(mconfig, SGI_IOC2_GUINNESS, tag, owner, clock)
{
}
ioc2_full_house_device::ioc2_full_house_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ioc2_full_house_device(mconfig, SGI_IOC2_FULL_HOUSE, "SGI IOC2 (Full House)", tag, owner, clock, "ioc2f", __FILE__)
+ : ioc2_full_house_device(mconfig, SGI_IOC2_FULL_HOUSE, tag, owner, clock)
{
}
@@ -215,8 +219,8 @@ machine_config_constructor ioc2_device::device_mconfig_additions() const
return MACHINE_CONFIG_NAME(ioc2_device);
}
-ioc2_device::ioc2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, uint8_t id)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ioc2_device::ioc2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t id)
+ : device_t(mconfig, type, tag, owner, clock)
, m_maincpu(*this, "^maincpu")
, m_scc(*this, SCC_TAG)
, m_pi1(*this, PI1_TAG)
@@ -1477,7 +1481,7 @@ static MACHINE_CONFIG_FRAGMENT( cdrom_config )
MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ip225015, ip22_state )
+static MACHINE_CONFIG_START( ip225015 )
MCFG_CPU_ADD( "maincpu", R5000BE, 50000000*3 )
//MCFG_MIPS3_ICACHE_SIZE(32768)
//MCFG_MIPS3_DCACHE_SIZE(32768)
@@ -1575,7 +1579,7 @@ ROM_START( ip244415 )
ROM_LOAD( "ip244415.bin", 0x000000, 0x080000, CRC(2f37825a) SHA1(0d48c573b53a307478820b85aacb57b868297ca3) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1993, ip225015, 0, 0, ip225015, ip225015, ip22_state, ip225015, "Silicon Graphics Inc", "Indy (R5000, 150MHz)", MACHINE_NOT_WORKING )
-COMP( 1993, ip224613, 0, 0, ip224613, ip225015, ip22_state, ip225015, "Silicon Graphics Inc", "Indy (R4600, 133MHz)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1993, ip225015, 0, 0, ip225015, ip225015, ip22_state, ip225015, "Silicon Graphics Inc", "Indy (R5000, 150MHz)", MACHINE_NOT_WORKING )
+COMP( 1993, ip224613, 0, 0, ip224613, ip225015, ip22_state, ip225015, "Silicon Graphics Inc", "Indy (R4600, 133MHz)", MACHINE_NOT_WORKING )
COMP( 1994, ip244415, 0, 0, ip244415, ip225015, ip22_state, ip225015, "Silicon Graphics Inc", "Indigo2 (R4400, 150MHz)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/instantm.cpp b/src/mame/drivers/instantm.cpp
index 78610da5423..c2fb903b228 100644
--- a/src/mame/drivers/instantm.cpp
+++ b/src/mame/drivers/instantm.cpp
@@ -57,7 +57,7 @@ void instantm_state::machine_reset()
// OSC1 = XTAL_3_579545MHz
-static MACHINE_CONFIG_START( instantm, instantm_state )
+static MACHINE_CONFIG_START( instantm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_3_579545MHz)
@@ -78,4 +78,4 @@ ROM_START( instantm )
ROM_END
-GAME( 199?, instantm, 0, instantm, instantm, driver_device, 0, ROT0, "Capcom / Polaroid", "Polaroid Instant Memories", MACHINE_IS_SKELETON )
+GAME( 199?, instantm, 0, instantm, instantm, instantm_state, 0, ROT0, "Capcom / Polaroid", "Polaroid Instant Memories", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp
index c2af4a3452a..1cbc607c521 100644
--- a/src/mame/drivers/instruct.cpp
+++ b/src/mame/drivers/instruct.cpp
@@ -405,7 +405,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct )
return result;
}
-static MACHINE_CONFIG_START( instruct, instruct_state )
+static MACHINE_CONFIG_START( instruct )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_3_579545MHz / 4)
MCFG_CPU_PROGRAM_MAP(instruct_mem)
@@ -438,5 +438,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, instruct, 0, 0, instruct, instruct, driver_device, 0, "Signetics", "Signetics Instructor 50", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, instruct, 0, 0, instruct, instruct, instruct_state, 0, "Signetics", "Signetics Instructor 50", 0 )
diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp
index 3a09bff57e0..0c2cde72d9b 100644
--- a/src/mame/drivers/interact.cpp
+++ b/src/mame/drivers/interact.cpp
@@ -120,7 +120,7 @@ uint32_t interact_state::screen_update_interact(screen_device &screen, bitmap_in
return 0;
}
-static MACHINE_CONFIG_START( interact, interact_state )
+static MACHINE_CONFIG_START( interact )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_2MHz)
@@ -157,7 +157,7 @@ static MACHINE_CONFIG_START( interact, interact_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hector1, interact_state )
+static MACHINE_CONFIG_START( hector1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_1_75MHz)
@@ -296,6 +296,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP(1979, interact, 0, 0, interact, interact, driver_device, 0, "Interact", "Interact Family Computer", MACHINE_IMPERFECT_SOUND)
-COMP(1983, hector1, interact, 0, hector1, interact, driver_device, 0, "Micronique", "Hector 1", MACHINE_IMPERFECT_SOUND)
+/* YEAR NAME PARENT COMPA MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP(1979, interact, 0, 0, interact, interact, interact_state, 0, "Interact", "Interact Family Computer", MACHINE_IMPERFECT_SOUND)
+COMP(1983, hector1, interact, 0, hector1, interact, interact_state, 0, "Micronique", "Hector 1", MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index 1732cbddae2..47e8f41c1fd 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -233,7 +233,7 @@ static ADDRESS_MAP_START(interpro_io_map, AS_1, 32, interpro_state)
// this is probably the srx arbiter ga
AM_RANGE(0x7f000200, 0x7f0002ff) AM_RAM
AM_RANGE(0x7f000300, 0x7f00030f) AM_READWRITE16(system_r, system_w, 0xffff)
- AM_RANGE(0x7f000400, 0x7f00040f) AM_DEVREADWRITE8(INTERPRO_SCC1_TAG, scc85C30_device, ba_cd_inv_r, ba_cd_inv_w, 0xff)
+ AM_RANGE(0x7f000400, 0x7f00040f) AM_DEVREADWRITE8(INTERPRO_SCC1_TAG, scc85c30_device, ba_cd_inv_r, ba_cd_inv_w, 0xff)
AM_RANGE(0x7f000410, 0x7f00041f) AM_DEVREADWRITE8(INTERPRO_SCC2_TAG, scc85230_device, ba_cd_inv_r, ba_cd_inv_w, 0xff)
AM_RANGE(0x7f000500, 0x7f0006ff) AM_READWRITE8(rtc_r, rtc_w, 0xff)
AM_RANGE(0x7f000700, 0x7f00077f) AM_READ(idprom_r)
@@ -262,7 +262,7 @@ SLOT_INTERFACE_END
static INPUT_PORTS_START(ip2800)
INPUT_PORTS_END
-static MACHINE_CONFIG_START(ip2800, interpro_state)
+static MACHINE_CONFIG_START(ip2800)
MCFG_CPU_ADD(INTERPRO_CPU_TAG, CLIPPER_C400, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(clipper_insn_map)
MCFG_CPU_DATA_MAP(clipper_data_map)
diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp
index 69d993bf9e9..497df9a1f8f 100644
--- a/src/mame/drivers/intrscti.cpp
+++ b/src/mame/drivers/intrscti.cpp
@@ -176,7 +176,7 @@ static GFXDECODE_START( intrscti )
GFXDECODE_END
-static MACHINE_CONFIG_START( intrscti, intrscti_state )
+static MACHINE_CONFIG_START( intrscti )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ? MHz */
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index 12834066b12..c22ecb51e7f 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -455,7 +455,7 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt2)
timer_set(m_keyboard->cycles_to_attotime(100), TIMER_INTV_INTERRUPT2_COMPLETE);
}
-static MACHINE_CONFIG_START( intv, intv_state )
+static MACHINE_CONFIG_START( intv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CP1610, XTAL_3_579545MHz/4) /* Colorburst/4 */
MCFG_CPU_PROGRAM_MAP(intv_mem)
@@ -469,8 +469,8 @@ static MACHINE_CONFIG_START( intv, intv_state )
MCFG_SCREEN_REFRESH_RATE(59.92)
//MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2400)) /* not accurate */
MCFG_SCREEN_UPDATE_DRIVER(intv_state, screen_update_intv)
- MCFG_SCREEN_SIZE((STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTV_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTV_Y_SCALE)
- MCFG_SCREEN_VISIBLE_AREA(0, (STIC_OVERSCAN_LEFT_WIDTH+STIC_BACKTAB_WIDTH*STIC_CARD_WIDTH-1+STIC_OVERSCAN_RIGHT_WIDTH)*STIC_X_SCALE*INTV_X_SCALE-1, 0, (STIC_OVERSCAN_TOP_HEIGHT+STIC_BACKTAB_HEIGHT*STIC_CARD_HEIGHT+STIC_OVERSCAN_BOTTOM_HEIGHT)*STIC_Y_SCALE*INTV_Y_SCALE-1)
+ MCFG_SCREEN_SIZE(stic_device::SCREEN_WIDTH*INTV_X_SCALE, stic_device::SCREEN_HEIGHT*INTV_Y_SCALE)
+ MCFG_SCREEN_VISIBLE_AREA(0, stic_device::SCREEN_WIDTH*INTV_X_SCALE-1, 0, stic_device::SCREEN_HEIGHT*INTV_Y_SCALE-1)
MCFG_SCREEN_PALETTE("palette")
MCFG_PALETTE_ADD("palette", 0x400)
@@ -547,8 +547,8 @@ static MACHINE_CONFIG_DERIVED( intvkbd, intv )
/* crt controller */
MCFG_DEVICE_ADD("crtc", TMS9927, XTAL_7_15909MHz)
MCFG_TMS9927_CHAR_WIDTH(8)
- MCFG_TMS9927_OVERSCAN(STIC_OVERSCAN_LEFT_WIDTH*STIC_X_SCALE*INTVKBD_X_SCALE, STIC_OVERSCAN_RIGHT_WIDTH*STIC_X_SCALE*INTVKBD_X_SCALE,
- STIC_OVERSCAN_TOP_HEIGHT*STIC_Y_SCALE*INTVKBD_Y_SCALE, STIC_OVERSCAN_BOTTOM_HEIGHT*STIC_Y_SCALE*INTVKBD_Y_SCALE)
+ MCFG_TMS9927_OVERSCAN(stic_device::OVERSCAN_LEFT_WIDTH*stic_device::X_SCALE*INTVKBD_X_SCALE, stic_device::OVERSCAN_RIGHT_WIDTH*stic_device::X_SCALE*INTVKBD_X_SCALE,
+ stic_device::OVERSCAN_TOP_HEIGHT*stic_device::Y_SCALE*INTVKBD_Y_SCALE, stic_device::OVERSCAN_BOTTOM_HEIGHT*stic_device::Y_SCALE*INTVKBD_Y_SCALE)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(intv_state, screen_update_intvkbd)
@@ -652,10 +652,10 @@ DRIVER_INIT_MEMBER(intv_state,intvkbd)
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
CONS( 1979, intv, 0, 0, intv, 0, intv_state, intv, "Mattel", "Intellivision", MACHINE_SUPPORTS_SAVE )
CONS( 1981, intvsrs, intv, 0, intv, 0, intv_state, intv, "Sears", "Super Video Arcade", MACHINE_SUPPORTS_SAVE )
-COMP( 1981, intvkbd, intv, 0, intvkbd, intvkbd, intv_state, intvkbd, "Mattel", "Intellivision Keyboard Component (Unreleased)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, intvkbd, intv, 0, intvkbd, intvkbd, intv_state, intvkbd, "Mattel", "Intellivision Keyboard Component (Unreleased)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
CONS( 1982, intv2, intv, 0, intv2, 0, intv_state, intv, "Mattel", "Intellivision II", MACHINE_SUPPORTS_SAVE )
// made up, user friendlier machines with pre-mounted passthu expansions
diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp
index ab9fa4070c7..32c44add03e 100644
--- a/src/mame/drivers/inufuku.cpp
+++ b/src/mame/drivers/inufuku.cpp
@@ -354,7 +354,7 @@ void inufuku_state::machine_reset()
m_tx_palettebank = 0;
}
-static MACHINE_CONFIG_START( inufuku, inufuku_state )
+static MACHINE_CONFIG_START( inufuku )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 32000000/2) /* 16.00 MHz */
@@ -479,5 +479,5 @@ ROM_END
******************************************************************************/
-GAME( 1998, inufuku, 0, inufuku, inufuku, driver_device, 0, ROT0, "Video System Co.", "Quiz & Variety Sukusuku Inufuku (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 3on3dunk, 0, _3on3dunk, inufuku, driver_device, 0, ROT0, "Video System Co.", "3 On 3 Dunk Madness (US, prototype? 1997/02/04)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) // tilemap priority is wrong in places (basketball before explosion in attract, highscores)
+GAME( 1998, inufuku, 0, inufuku, inufuku, inufuku_state, 0, ROT0, "Video System Co.", "Quiz & Variety Sukusuku Inufuku (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 3on3dunk, 0, _3on3dunk, inufuku, inufuku_state, 0, ROT0, "Video System Co.", "3 On 3 Dunk Madness (US, prototype? 1997/02/04)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS ) // tilemap priority is wrong in places (basketball before explosion in attract, highscores)
diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp
index 7bec200f66f..f03e5006da0 100644
--- a/src/mame/drivers/invqix.cpp
+++ b/src/mame/drivers/invqix.cpp
@@ -277,7 +277,7 @@ WRITE16_MEMBER(invqix_state::vctl_w)
static ADDRESS_MAP_START(invqix_prg_map, AS_PROGRAM, 16, invqix_state)
AM_RANGE(0x000000, 0x1fffff) AM_ROM AM_REGION("program", 0)
AM_RANGE(0x200000, 0x21ffff) AM_RAM
- AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8("oki", okim9810_device, write_TMP_register, 0x00ff)
+ AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8("oki", okim9810_device, write_tmp_register, 0x00ff)
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8("oki", okim9810_device, write, 0xff00)
AM_RANGE(0x400002, 0x400003) AM_DEVREAD8("oki", okim9810_device, read, 0xff00)
AM_RANGE(0x600000, 0x61ffff) AM_RAM AM_SHARE("vram")
@@ -327,7 +327,7 @@ static INPUT_PORTS_START( invqix )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( invqix, invqix_state )
+static MACHINE_CONFIG_START( invqix )
MCFG_CPU_ADD("maincpu", H8S2394, XTAL_20MHz)
MCFG_CPU_PROGRAM_MAP(invqix_prg_map)
MCFG_CPU_IO_MAP(invqix_io_map)
@@ -364,4 +364,4 @@ ROM_START( invqix )
ROM_LOAD16_WORD_SWAP( "93c46.ic6", 0x000000, 0x000080, CRC(564b744e) SHA1(4d9ea7dc253797c513258d07a936dfb63d8ed18c) )
ROM_END
-GAME( 2003, invqix, 0, invqix, invqix, driver_device, 0, ROT270, "Taito / Namco", "Space Invaders / Qix Silver Anniversary Edition (Ver. 2.03)", MACHINE_SUPPORTS_SAVE )
+GAME( 2003, invqix, 0, invqix, invqix, invqix_state, 0, ROT270, "Taito / Namco", "Space Invaders / Qix Silver Anniversary Edition (Ver. 2.03)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ipc.cpp b/src/mame/drivers/ipc.cpp
index b537510e628..0df64b30376 100644
--- a/src/mame/drivers/ipc.cpp
+++ b/src/mame/drivers/ipc.cpp
@@ -59,7 +59,7 @@ public:
required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER( ipc_f4_r );
DECLARE_READ8_MEMBER( ipc_f5_r );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
uint8_t *m_ram;
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -99,15 +99,15 @@ INPUT_PORTS_END
void ipc_state::machine_reset()
{
- m_maincpu->set_state_int(I8085_PC, 0xE800);
+ m_maincpu->set_state_int(i8085a_cpu_device::I8085_PC, 0xE800);
}
-WRITE8_MEMBER( ipc_state::kbd_put )
+void ipc_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( ipc, ipc_state )
+static MACHINE_CONFIG_START( ipc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_19_6608MHz / 4)
MCFG_CPU_PROGRAM_MAP(ipc_mem)
@@ -115,7 +115,7 @@ static MACHINE_CONFIG_START( ipc, ipc_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ipc_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ipc_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -135,6 +135,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, ipb, 0, 0, ipc, ipc, driver_device, 0, "Intel", "iPB", MACHINE_NO_SOUND)
-COMP( 19??, ipc, ipb, 0, ipc, ipc, driver_device, 0, "Intel", "iPC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 19??, ipb, 0, 0, ipc, ipc, ipc_state, 0, "Intel", "iPB", MACHINE_NO_SOUND)
+COMP( 19??, ipc, ipb, 0, ipc, ipc, ipc_state, 0, "Intel", "iPC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp
index 102050d1ddc..c92b9eecaea 100644
--- a/src/mame/drivers/ipds.cpp
+++ b/src/mame/drivers/ipds.cpp
@@ -33,7 +33,7 @@ public:
DECLARE_READ8_MEMBER(ipds_b1_r);
DECLARE_READ8_MEMBER(ipds_c0_r);
DECLARE_WRITE8_MEMBER(ipds_b1_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels );
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -121,12 +121,12 @@ static GFXDECODE_START( ipds )
GFXDECODE_END
-WRITE8_MEMBER( ipds_state::kbd_put )
+void ipds_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( ipds, ipds_state )
+static MACHINE_CONFIG_START( ipds )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_19_6608MHz / 4)
MCFG_CPU_PROGRAM_MAP(ipds_mem)
@@ -147,7 +147,7 @@ static MACHINE_CONFIG_START( ipds, ipds_state )
MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ipds_state, crtc_display_pixels)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(ipds_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(ipds_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -164,5 +164,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, ipds, 0, 0, ipds, ipds, driver_device, 0, "Intel", "iPDS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, ipds, 0, 0, ipds, ipds, ipds_state, 0, "Intel", "iPDS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp
index 2e57b3bfaf9..e1f76ff7d83 100644
--- a/src/mame/drivers/iq151.cpp
+++ b/src/mame/drivers/iq151.cpp
@@ -380,7 +380,7 @@ static SLOT_INTERFACE_START(iq151_cart)
SLOT_INTERFACE("amos3" , IQ151_AMOS3) // AMOS cart 3
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( iq151, iq151_state )
+static MACHINE_CONFIG_START( iq151 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(iq151_mem)
@@ -476,5 +476,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, iq151, 0, 0, iq151, iq151, iq151_state, iq151, "ZPA Novy Bor", "IQ-151", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, iq151, 0, 0, iq151, iq151, iq151_state, iq151, "ZPA Novy Bor", "IQ-151", 0 )
diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp
index 843c582b3ce..54fcc6acd6e 100644
--- a/src/mame/drivers/iqblock.cpp
+++ b/src/mame/drivers/iqblock.cpp
@@ -339,7 +339,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( iqblock, iqblock_state )
+static MACHINE_CONFIG_START( iqblock )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6 MHz */
diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp
index 070c1ae8460..96c5ea9f1d7 100644
--- a/src/mame/drivers/iris3130.cpp
+++ b/src/mame/drivers/iris3130.cpp
@@ -418,7 +418,7 @@ static DEVICE_INPUT_DEFAULTS_START( ip2_terminal )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( sgi_ip2, sgi_ip2_state )
+static MACHINE_CONFIG_START( sgi_ip2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68020, 16000000)
MCFG_CPU_PROGRAM_MAP(sgi_ip2_map)
@@ -507,5 +507,5 @@ ROM_START( sgi_ip2 )
ROM_LOAD( "sgi-ip2-u93.ip2.2-008.od", 0x10000, 0x8000, CRC(bf967590) SHA1(1aac48e4f5531a25c5482f64de5cd3c7a9931f11) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1985, sgi_ip2, 0, 0, sgi_ip2, sgi_ip2, sgi_ip2_state, sgi_ip2, "Silicon Graphics Inc", "IRIS 3130 (IP2)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp
index 9ba3c7cd92b..d39c175397d 100644
--- a/src/mame/drivers/irisha.cpp
+++ b/src/mame/drivers/irisha.cpp
@@ -376,7 +376,7 @@ void irisha_state::machine_reset()
}
/* Machine driver */
-static MACHINE_CONFIG_START( irisha, irisha_state )
+static MACHINE_CONFIG_START( irisha )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
MCFG_CPU_PROGRAM_MAP(irisha_mem)
@@ -429,5 +429,5 @@ ROM_START( irisha )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, irisha, 0, 0, irisha, irisha, driver_device, 0, "MGU", "Irisha", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, irisha, 0, 0, irisha, irisha, irisha_state, 0, "MGU", "Irisha", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp
index a95673ab6c2..8669ef200e7 100644
--- a/src/mame/drivers/irobot.cpp
+++ b/src/mame/drivers/irobot.cpp
@@ -298,7 +298,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( irobot, irobot_state )
+static MACHINE_CONFIG_START( irobot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/8)
diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp
index 3aa0484b5e4..53f1e5affeb 100644
--- a/src/mame/drivers/ironhors.cpp
+++ b/src/mame/drivers/ironhors.cpp
@@ -360,7 +360,7 @@ void ironhors_state::machine_reset()
m_spriterambank = 0;
}
-static MACHINE_CONFIG_START( ironhors, ironhors_state )
+static MACHINE_CONFIG_START( ironhors )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
@@ -533,6 +533,6 @@ ROM_END
*
*************************************/
-GAME( 1986, ironhors, 0, ironhors, ironhors, driver_device, 0, ROT0, "Konami", "Iron Horse", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, dairesya, ironhors, ironhors, dairesya, driver_device, 0, ROT0, "Konami (Kawakusu license)", "Dai Ressya Goutou (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, farwest, ironhors, farwest, ironhors, driver_device, 0, ROT0, "bootleg?", "Far West", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ironhors, 0, ironhors, ironhors, ironhors_state, 0, ROT0, "Konami", "Iron Horse", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, dairesya, ironhors, ironhors, dairesya, ironhors_state, 0, ROT0, "Konami (Kawakusu license)", "Dai Ressya Goutou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, farwest, ironhors, farwest, ironhors, ironhors_state, 0, ROT0, "bootleg?", "Far West", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index 535a0887fda..c1afa9151f3 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -52,7 +52,7 @@ public:
required_device<cpu_device> m_maincpu;
optional_device<i8251_device> m_uart8251;
// optional_device<i8274_device> m_uart8274;
- optional_device<i8274N_device> m_uart8274;
+ optional_device<i8274_new_device> m_uart8274;
required_device<pic8259_device> m_pic_0;
optional_device<pic8259_device> m_pic_1;
optional_device<centronics_device> m_centronics;
@@ -153,7 +153,7 @@ static ADDRESS_MAP_START(isbc286_io, AS_IO, 16, isbc_state)
AM_RANGE(0x00c8, 0x00cf) AM_DEVREADWRITE8("ppi", i8255_device, read, write, 0x00ff)
AM_RANGE(0x00c8, 0x00cf) AM_WRITE8(upperen_w, 0xff00)
AM_RANGE(0x00d0, 0x00d7) AM_DEVREADWRITE8("pit", pit8254_device, read, write, 0x00ff)
- AM_RANGE(0x00d8, 0x00df) AM_DEVREADWRITE8("uart8274", i8274N_device, cd_ba_r, cd_ba_w, 0x00ff)
+ AM_RANGE(0x00d8, 0x00df) AM_DEVREADWRITE8("uart8274", i8274_new_device, cd_ba_r, cd_ba_w, 0x00ff)
AM_RANGE(0x0100, 0x0101) AM_DEVWRITE8("isbc_215g", isbc_215g_device, write, 0x00ff)
ADDRESS_MAP_END
@@ -258,7 +258,7 @@ WRITE_LINE_MEMBER(isbc_state::isbc_uart8274_irq)
}
#endif
-static MACHINE_CONFIG_START( isbc86, isbc_state )
+static MACHINE_CONFIG_START( isbc86 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
MCFG_CPU_PROGRAM_MAP(isbc86_mem)
@@ -290,7 +290,7 @@ static MACHINE_CONFIG_START( isbc86, isbc_state )
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", isbc86_terminal)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rpc86, isbc_state )
+static MACHINE_CONFIG_START( rpc86 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_5MHz)
MCFG_CPU_PROGRAM_MAP(rpc86_mem)
@@ -347,7 +347,7 @@ static MACHINE_CONFIG_DERIVED( isbc8630, rpc86 )
MCFG_ISBC_215_IRQ(DEVWRITELINE("pic_0", pic8259_device, ir5_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( isbc286, isbc_state )
+static MACHINE_CONFIG_START( isbc286 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80286, XTAL_16MHz/2)
MCFG_CPU_PROGRAM_MAP(isbc286_mem)
@@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( isbc286, isbc_state )
MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic_0", pic8259_device, ir0_w))
MCFG_PIT8253_CLK1(XTAL_22_1184MHz/18)
// MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", z80dart_device, rxtxcb_w))
- MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", i8274N_device, rxtxcb_w))
+ MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxtxcb_w))
MCFG_PIT8253_CLK2(XTAL_22_1184MHz/18)
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(isbc_state, isbc286_tmr2_w))
@@ -406,9 +406,9 @@ static MACHINE_CONFIG_START( isbc286, isbc_state )
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, dcda_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", z80dart_device, ctsa_w))
#else
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274N_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274N_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274N_device, ctsa_w))
+ MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsa_w))
#endif
MCFG_RS232_PORT_ADD("rs232b", default_rs232_devices, "terminal")
@@ -417,9 +417,9 @@ static MACHINE_CONFIG_START( isbc286, isbc_state )
MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", z80dart_device, dcdb_w))
MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", z80dart_device, ctsb_w))
#else
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274N_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274N_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274N_device, ctsb_w))
+ MCFG_RS232_RXD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart8274", i8274_new_device, ctsb_w))
#endif
MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", isbc286_terminal)
@@ -574,11 +574,11 @@ ROM_START( rpc86 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, rpc86, 0, 0, rpc86, isbc, driver_device, 0, "Intel", "RPC 86",MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1978, isbc86, 0, 0, isbc86, isbc, driver_device, 0, "Intel", "iSBC 86/12A",MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1981, isbc8605, 0, 0, isbc8605, isbc, driver_device, 0, "Intel", "iSBC 86/05",MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1981, isbc8630, 0, 0, isbc8630, isbc, driver_device, 0, "Intel", "iSBC 86/30",MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 19??, isbc286, 0, 0, isbc286, isbc, driver_device, 0, "Intel", "iSBC 286",MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1983, isbc2861, 0, 0, isbc2861, isbc, driver_device, 0, "Intel", "iSBC 286/10", MACHINE_NO_SOUND_HW)
-COMP( 1983, isbc28612,0, 0, isbc2861, isbc, driver_device, 0, "Intel", "iSBC 286/12", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 19??, rpc86, 0, 0, rpc86, isbc, isbc_state, 0, "Intel", "RPC 86", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1978, isbc86, 0, 0, isbc86, isbc, isbc_state, 0, "Intel", "iSBC 86/12A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1981, isbc8605, 0, 0, isbc8605, isbc, isbc_state, 0, "Intel", "iSBC 86/05", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1981, isbc8630, 0, 0, isbc8630, isbc, isbc_state, 0, "Intel", "iSBC 86/30", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 19??, isbc286, 0, 0, isbc286, isbc, isbc_state, 0, "Intel", "iSBC 286", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1983, isbc2861, 0, 0, isbc2861, isbc, isbc_state, 0, "Intel", "iSBC 286/10", MACHINE_NO_SOUND_HW)
+COMP( 1983, isbc28612, 0, 0, isbc2861, isbc, isbc_state, 0, "Intel", "iSBC 286/12", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/isbc8010.cpp b/src/mame/drivers/isbc8010.cpp
index e7e0f9a60cc..a3f662c6a0c 100644
--- a/src/mame/drivers/isbc8010.cpp
+++ b/src/mame/drivers/isbc8010.cpp
@@ -159,7 +159,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( isbc8010, isbc8010_state )
+static MACHINE_CONFIG_START( isbc8010 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz/9)
MCFG_CPU_PROGRAM_MAP(isbc8010_mem)
@@ -260,7 +260,7 @@ ROM_END
#define rom_isbc8010a rom_isbc8010
#define rom_isbc8010b rom_isbc8010
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1975, isbc8010, 0, 0, isbc8010, isbc8010, driver_device, 0, "Intel", "iSBC 80/10", MACHINE_NO_SOUND_HW )
-COMP( 1977, isbc8010a, isbc8010, 0, isbc8010a, isbc8010, driver_device, 0, "Intel", "iSBC 80/10A", MACHINE_NO_SOUND_HW )
-COMP( 1979, isbc8010b, isbc8010, 0, isbc8010b, isbc8010, driver_device, 0, "Intel", "iSBC 80/10B", MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1975, isbc8010, 0, 0, isbc8010, isbc8010, isbc8010_state, 0, "Intel", "iSBC 80/10", MACHINE_NO_SOUND_HW )
+COMP( 1977, isbc8010a, isbc8010, 0, isbc8010a, isbc8010, isbc8010_state, 0, "Intel", "iSBC 80/10A", MACHINE_NO_SOUND_HW )
+COMP( 1979, isbc8010b, isbc8010, 0, isbc8010b, isbc8010, isbc8010_state, 0, "Intel", "iSBC 80/10B", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/isbc8030.cpp b/src/mame/drivers/isbc8030.cpp
index bc4b96f2877..0c4437fc8e5 100644
--- a/src/mame/drivers/isbc8030.cpp
+++ b/src/mame/drivers/isbc8030.cpp
@@ -135,7 +135,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( isbc8030, isbc8030_state )
+static MACHINE_CONFIG_START( isbc8030 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_22_1184MHz / 4)
MCFG_CPU_PROGRAM_MAP(isbc8030_mem)
@@ -173,5 +173,5 @@ ROM_START( isbc8030 )
ROM_LOAD( "mon830.bin", 0x0000, 0x0800, CRC(cda15115) SHA1(242dad14a919568178b363c3e27f22ec0a5849b3))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, isbc8030, 0, 0, isbc8030, isbc8030, driver_device, 0, "Intel", "iSBC 80/30", MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1978, isbc8030, 0, 0, isbc8030, isbc8030, isbc8030_state, 0, "Intel", "iSBC 80/30", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/iskr103x.cpp b/src/mame/drivers/iskr103x.cpp
index b829df842f7..638423fdb8d 100644
--- a/src/mame/drivers/iskr103x.cpp
+++ b/src/mame/drivers/iskr103x.cpp
@@ -60,7 +60,7 @@ static DEVICE_INPUT_DEFAULTS_START(iskr1031)
DEVICE_INPUT_DEFAULTS_END
// XXX
-static MACHINE_CONFIG_START( iskr1030m, iskr103x_state )
+static MACHINE_CONFIG_START( iskr1030m )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 4772720)
MCFG_CPU_PROGRAM_MAP(iskr1031_map)
@@ -114,6 +114,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1989, iskr1030m, ibm5150, 0, iskr1030m, 0, driver_device, 0, "Schetmash", "Iskra 1030M", MACHINE_NOT_WORKING)
-COMP ( 1989, iskr1031, ibm5150, 0, iskr1031, 0, driver_device, 0, "<unknown>", "Iskra 1031", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1989, iskr1030m, ibm5150, 0, iskr1030m, 0, iskr103x_state, 0, "Schetmash", "Iskra 1030M", MACHINE_NOT_WORKING )
+COMP ( 1989, iskr1031, ibm5150, 0, iskr1031, 0, iskr103x_state, 0, "<unknown>", "Iskra 1031", 0 )
diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp
index 4a273d6637c..3f28c9cd07b 100644
--- a/src/mame/drivers/istellar.cpp
+++ b/src/mame/drivers/istellar.cpp
@@ -339,7 +339,7 @@ INTERRUPT_GEN_MEMBER(istellar_state::vblank_callback_istellar)
/* DRIVER */
-static MACHINE_CONFIG_START( istellar, istellar_state )
+static MACHINE_CONFIG_START( istellar )
/* main cpu */
MCFG_CPU_ADD("maincpu", Z80, GUESSED_CLOCK)
MCFG_CPU_PROGRAM_MAP(z80_0_mem)
@@ -434,5 +434,5 @@ DRIVER_INIT_MEMBER(istellar_state,istellar)
#endif
}
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS) */
-GAME( 1983, istellar, 0, istellar, istellar, istellar_state, istellar, ROT0, "Funai/Gakken", "Interstellar Laser Fantasy", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS)
+GAME( 1983, istellar, 0, istellar, istellar, istellar_state, istellar, ROT0, "Funai/Gakken", "Interstellar Laser Fantasy", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp
index 3127d7fc050..8f413efc0e2 100644
--- a/src/mame/drivers/istrebiteli.cpp
+++ b/src/mame/drivers/istrebiteli.cpp
@@ -56,14 +56,14 @@ private:
uint8_t m_prev_data;
};
-extern const device_type ISTREBITELI_SOUND;
+DECLARE_DEVICE_TYPE(ISTREBITELI_SOUND, istrebiteli_sound_device)
//////////////////////////////////////////////////////////////
-const device_type ISTREBITELI_SOUND = device_creator<istrebiteli_sound_device>;
+DEFINE_DEVICE_TYPE(ISTREBITELI_SOUND, istrebiteli_sound_device, "istrebiteli_sound", "Istrebiteli Sound")
istrebiteli_sound_device::istrebiteli_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ISTREBITELI_SOUND, "Istrebiteli Sound", tag, owner, clock, "istrebiteli_sound", __FILE__),
+ : device_t(mconfig, ISTREBITELI_SOUND, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_channel(nullptr),
m_rom(nullptr),
@@ -413,7 +413,7 @@ static GFXDECODE_START( istrebiteli )
GFXDECODE_ENTRY( "sprite", 0x0200, projectile_layout, 0, 2 )
GFXDECODE_END
-static MACHINE_CONFIG_START( istreb, istrebiteli_state)
+static MACHINE_CONFIG_START( istreb )
/* basic machine hardware */
MCFG_CPU_ADD(I8080_TAG, I8080, XTAL_8MHz / 4) // KR580VM80A
MCFG_CPU_PROGRAM_MAP(mem_map)
@@ -466,4 +466,4 @@ ROM_START( istreb )
ROM_LOAD( "003-w3.bin", 0x000, 0x200, CRC(54eb4893) SHA1(c7a4724045c645ab728074ed7fef1882d9776005) )
ROM_END
-GAME( 198?, istreb, 0, istreb, istreb, driver_device, 0, ROT0, "Terminal", "Istrebiteli", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 198?, istreb, 0, istreb, istreb, istrebiteli_state, 0, ROT0, "Terminal", "Istrebiteli", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp
index b41ded09b8e..82f9c71dd9a 100644
--- a/src/mame/drivers/iteagle.cpp
+++ b/src/mame/drivers/iteagle.cpp
@@ -153,7 +153,7 @@ void iteagle_state::machine_reset()
#define PCI_ID_VIDEO ":pci:09.0"
#define PCI_ID_EEPROM ":pci:0a.0"
-static MACHINE_CONFIG_START( iteagle, iteagle_state )
+static MACHINE_CONFIG_START( iteagle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", VR4310LE, 166666666)
@@ -585,20 +585,20 @@ ROM_END
*
*************************************/
-GAME( 2000, iteagle, 0, iteagle, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Eagle BIOS", MACHINE_IS_BIOS_ROOT )
-GAME( 1998, virtpool, iteagle, virtpool, virtpool, driver_device, 0, ROT0, "Incredible Technologies", "Virtual Pool", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // random lockups on loading screens
-GAME( 2002, carnking, iteagle, carnking, bbh, driver_device, 0, ROT0, "Incredible Technologies", "Carnival King (v1.00.11)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, gtfore01, iteagle, gtfore01, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! (v1.00.25)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, gtfore02, iteagle, gtfore02, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2002 (v2.01.06)", MACHINE_SUPPORTS_SAVE )
-GAME( 2002, gtfore03, iteagle, gtfore03, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2003 (v3.00.10)", MACHINE_SUPPORTS_SAVE )
-GAME( 2002, gtfore03a, gtfore03, gtfore03, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2003 (v3.00.09)", MACHINE_SUPPORTS_SAVE )
-GAME( 2003, gtfore04, iteagle, gtfore04, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2004 Extra (v4.00.08)", MACHINE_SUPPORTS_SAVE )
-GAME( 2003, gtfore04a, gtfore04, gtfore04, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2004 (v4.00.00)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, gtfore05, iteagle, gtfore05, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.01.06)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, gtfore05a, gtfore05, gtfore05, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.01.02)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, gtfore05b, gtfore05, gtfore05, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.01.00)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, gtfore05c, gtfore05, gtfore05, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.00.00)", MACHINE_SUPPORTS_SAVE )
-GAME( 2005, gtfore06, iteagle, gtfore06, iteagle, driver_device, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2006 Complete (v6.00.01)", MACHINE_SUPPORTS_SAVE )
-GAME( 2002, bbhsc, iteagle, bbhsc, bbh, driver_device, 0, ROT0, "Incredible Technologies", "Big Buck Hunter - Shooter's Challenge (v1.50.07)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // doesn't boot
-GAME( 2002, bbh2sp, iteagle, bbh2sp, bbh, driver_device, 0, ROT0, "Incredible Technologies", "Big Buck Hunter II - Sportsman's Paradise (v2.02.11)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // SW51-2 needs to be off
-GAME( 2006, bbhcotw, iteagle, bbhcotw, bbh, driver_device, 0, ROT0, "Incredible Technologies", "Big Buck Hunter Call of the Wild (v3.02.5)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // random lockups
+GAME( 2000, iteagle, 0, iteagle, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Eagle BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 1998, virtpool, iteagle, virtpool, virtpool, iteagle_state, 0, ROT0, "Incredible Technologies", "Virtual Pool", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // random lockups on loading screens
+GAME( 2002, carnking, iteagle, carnking, bbh, iteagle_state, 0, ROT0, "Incredible Technologies", "Carnival King (v1.00.11)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, gtfore01, iteagle, gtfore01, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! (v1.00.25)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, gtfore02, iteagle, gtfore02, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2002 (v2.01.06)", MACHINE_SUPPORTS_SAVE )
+GAME( 2002, gtfore03, iteagle, gtfore03, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2003 (v3.00.10)", MACHINE_SUPPORTS_SAVE )
+GAME( 2002, gtfore03a, gtfore03, gtfore03, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2003 (v3.00.09)", MACHINE_SUPPORTS_SAVE )
+GAME( 2003, gtfore04, iteagle, gtfore04, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2004 Extra (v4.00.08)", MACHINE_SUPPORTS_SAVE )
+GAME( 2003, gtfore04a, gtfore04, gtfore04, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2004 (v4.00.00)", MACHINE_SUPPORTS_SAVE )
+GAME( 2004, gtfore05, iteagle, gtfore05, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.01.06)", MACHINE_SUPPORTS_SAVE )
+GAME( 2004, gtfore05a, gtfore05, gtfore05, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.01.02)", MACHINE_SUPPORTS_SAVE )
+GAME( 2004, gtfore05b, gtfore05, gtfore05, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.01.00)", MACHINE_SUPPORTS_SAVE )
+GAME( 2004, gtfore05c, gtfore05, gtfore05, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2005 Extra (v5.00.00)", MACHINE_SUPPORTS_SAVE )
+GAME( 2005, gtfore06, iteagle, gtfore06, iteagle, iteagle_state, 0, ROT0, "Incredible Technologies", "Golden Tee Fore! 2006 Complete (v6.00.01)", MACHINE_SUPPORTS_SAVE )
+GAME( 2002, bbhsc, iteagle, bbhsc, bbh, iteagle_state, 0, ROT0, "Incredible Technologies", "Big Buck Hunter - Shooter's Challenge (v1.50.07)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // doesn't boot
+GAME( 2002, bbh2sp, iteagle, bbh2sp, bbh, iteagle_state, 0, ROT0, "Incredible Technologies", "Big Buck Hunter II - Sportsman's Paradise (v2.02.11)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // SW51-2 needs to be off
+GAME( 2006, bbhcotw, iteagle, bbhcotw, bbh, iteagle_state, 0, ROT0, "Incredible Technologies", "Big Buck Hunter Call of the Wild (v3.02.5)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // random lockups
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 9aa1288a2f9..eaffb85ebbb 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -1672,7 +1672,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( timekill, itech32_state )
+static MACHINE_CONFIG_START( timekill )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp
index 0db825c5d95..d75b7071c19 100644
--- a/src/mame/drivers/itech8.cpp
+++ b/src/mame/drivers/itech8.cpp
@@ -1655,7 +1655,7 @@ WRITE_LINE_MEMBER(itech8_state::generate_tms34061_interrupt)
/************* core pieces ******************/
-static MACHINE_CONFIG_START( itech8_core_lo, itech8_state )
+static MACHINE_CONFIG_START( itech8_core_lo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, CLOCK_8MHz/4)
@@ -1712,7 +1712,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 )
MCFG_SOUND_ROUTE(2, "mono", 0.07)
MCFG_SOUND_ROUTE(3, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -1747,7 +1747,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -1763,7 +1763,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812_external )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MACHINE_CONFIG_END
@@ -2737,20 +2737,20 @@ DRIVER_INIT_MEMBER(itech8_state,rimrockn)
*************************************/
/* Wheel of Fortune-style PCB */
-GAME( 1989, wfortune, 0, wfortune, wfortune, driver_device, 0, ROT0, "GameTek", "Wheel Of Fortune (set 1)", 0 )
-GAME( 1989, wfortunea,wfortune, wfortune, wfortune, driver_device, 0, ROT0, "GameTek", "Wheel Of Fortune (set 2)", 0 )
+GAME( 1989, wfortune, 0, wfortune, wfortune, itech8_state, 0, ROT0, "GameTek", "Wheel Of Fortune (set 1)", 0 )
+GAME( 1989, wfortunea,wfortune, wfortune, wfortune, itech8_state, 0, ROT0, "GameTek", "Wheel Of Fortune (set 2)", 0 )
/* Grudge Match-style PCB */
-GAME( 1989, grmatch, 0, grmatch, grmatch, itech8_state, grmatch, ROT0, "Yankee Game Technology", "Grudge Match (Yankee Game Technology)", 0 )
+GAME( 1989, grmatch, 0, grmatch, grmatch, itech8_state, grmatch, ROT0, "Yankee Game Technology", "Grudge Match (Yankee Game Technology)", 0 )
/* Strata Bowling-style PCB */
-GAME( 1990, stratab, 0, stratab_hi, stratab, driver_device, 0, ROT270, "Strata/Incredible Technologies", "Strata Bowling (V3)", 0 ) // still says V1 in service mode?
-GAME( 1990, stratab1, stratab, stratab_hi, stratab, driver_device, 0, ROT270, "Strata/Incredible Technologies", "Strata Bowling (V1)", 0 )
-GAME( 1990, gtg, 0, stratab_hi, gtg, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf (Joystick, v3.1)", 0 )
-GAME( 1989, gtgt, gtg, stratab_hi, gtgt, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf (Trackball, v2.0)", 0 )
-GAME( 1989, gtgt1, gtg, stratab_hi, gtgt, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf (Trackball, v1.0)", 0 )
-GAME( 1989, gtg2t, gtg2, stratab_hi, gtg2t, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf II (Trackball, V1.1)", 0 )
-GAME( 1991, gtg2j, gtg2, stratab_lo, gtg, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf II (Joystick, V1.0)", 0 )
+GAME( 1990, stratab, 0, stratab_hi, stratab, itech8_state, 0, ROT270, "Strata/Incredible Technologies", "Strata Bowling (V3)", 0 ) // still says V1 in service mode?
+GAME( 1990, stratab1, stratab, stratab_hi, stratab, itech8_state, 0, ROT270, "Strata/Incredible Technologies", "Strata Bowling (V1)", 0 )
+GAME( 1990, gtg, 0, stratab_hi, gtg, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf (Joystick, v3.1)", 0 )
+GAME( 1989, gtgt, gtg, stratab_hi, gtgt, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf (Trackball, v2.0)", 0 )
+GAME( 1989, gtgt1, gtg, stratab_hi, gtgt, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf (Trackball, v1.0)", 0 )
+GAME( 1989, gtg2t, gtg2, stratab_hi, gtg2t, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf II (Trackball, V1.1)", 0 )
+GAME( 1991, gtg2j, gtg2, stratab_lo, gtg, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf II (Joystick, V1.0)", 0 )
/* Slick Shot-style PCB */
GAME( 1990, slikshot, 0, slikshot_hi, slikshot, itech8_state, slikshot, ROT90, "Grand Products/Incredible Technologies", "Slick Shot (V2.2)", MACHINE_MECHANICAL )
@@ -2758,26 +2758,26 @@ GAME( 1990, slikshot17,slikshot, slikshot_hi, slikshot, itech8_state, slik
GAME( 1990, slikshot16,slikshot, slikshot_hi, slikshot, itech8_state, slikshot, ROT90, "Grand Products/Incredible Technologies", "Slick Shot (V1.6)", MACHINE_MECHANICAL )
GAME( 1990, dynobop, 0, slikshot_hi, dynobop, itech8_state, slikshot, ROT90, "Grand Products/Incredible Technologies", "Dyno Bop (V1.1)", MACHINE_MECHANICAL )
GAME( 1990, sstrike, 0, sstrike, sstrike, itech8_state, sstrike, ROT270, "Strata/Incredible Technologies", "Super Strike Bowling", MACHINE_MECHANICAL )
-GAME( 1991, pokrdice, 0, slikshot_lo_noz80, pokrdice, driver_device,0, ROT90, "Strata/Incredible Technologies", "Poker Dice", 0 )
+GAME( 1991, pokrdice, 0, slikshot_lo_noz80, pokrdice, itech8_state, 0, ROT90, "Strata/Incredible Technologies", "Poker Dice", 0 )
GAME( 1990, stratabs, stratab, sstrike, stratabs, itech8_state, sstrike, ROT270, "Strata/Incredible Technologies", "Strata Bowling (V1 4T, Super Strike Bowling type PCB)", MACHINE_NOT_WORKING ) // need to figure out the control hookup for this set, service mode indicates it's still a trackball like stratab
/* Hot Shots Tennis-style PCB */
GAME( 1990, hstennis, 0, hstennis_hi, hstennis, itech8_state, hstennis, ROT90, "Strata/Incredible Technologies", "Hot Shots Tennis (V1.1)", 0 )
GAME( 1990, hstennis10,hstennis, hstennis_hi, hstennis, itech8_state, hstennis, ROT90, "Strata/Incredible Technologies", "Hot Shots Tennis (V1.0)", 0 )
GAME( 1991, arlingtn, 0, hstennis_hi, arlingtn, itech8_state, arligntn, ROT0, "Strata/Incredible Technologies", "Arlington Horse Racing (v1.21-D)", 0 )
-GAME( 1991, peggle, 0, hstennis_lo, peggle, itech8_state, peggle, ROT90, "Strata/Incredible Technologies", "Peggle (Joystick, v1.0)", 0 )
-GAME( 1991, pegglet, peggle, hstennis_lo, pegglet, itech8_state, peggle, ROT90, "Strata/Incredible Technologies", "Peggle (Trackball, v1.0)", 0 )
+GAME( 1991, peggle, 0, hstennis_lo, peggle, itech8_state, peggle, ROT90, "Strata/Incredible Technologies", "Peggle (Joystick, v1.0)", 0 )
+GAME( 1991, pegglet, peggle, hstennis_lo, pegglet, itech8_state, peggle, ROT90, "Strata/Incredible Technologies", "Peggle (Trackball, v1.0)", 0 )
GAME( 1992, neckneck, 0, hstennis_lo, neckneck, itech8_state, neckneck, ROT0, "Bundra Games/Incredible Technologies", "Neck-n-Neck (v1.2)", 0 )
/* Rim Rockin' Basketball-style PCB */
-GAME( 1991, rimrockn, 0, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V2.2)", 0 )
-GAME( 1991, rimrockn20, rimrockn, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V2.0)", 0 )
-GAME( 1991, rimrockn16, rimrockn, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V1.6)", 0 )
-GAME( 1991, rimrockn12, rimrockn, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V1.2)", 0 )
+GAME( 1991, rimrockn, 0, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V2.2)", 0 )
+GAME( 1991, rimrockn20, rimrockn, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V2.0)", 0 )
+GAME( 1991, rimrockn16, rimrockn, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V1.6)", 0 )
+GAME( 1991, rimrockn12, rimrockn, rimrockn, rimrockn, itech8_state, rimrockn, ROT0, "Strata/Incredible Technologies", "Rim Rockin' Basketball (V1.2)", 0 )
/* Ninja Clowns-style PCB */
-GAME( 1991, ninclown, 0, ninclown, ninclown, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Ninja Clowns (08/27/91)", 0 )
+GAME( 1991, ninclown, 0, ninclown, ninclown, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Ninja Clowns (08/27/91)", 0 )
/* Golden Tee Golf II-style PCB */
-GAME( 1992, gpgolf, 0, gtg2, gpgolf, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Par Golf (Joystick, V1.1)", 0 )
-GAME( 1992, gtg2, 0, gtg2, gtg2, driver_device, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf II (Trackball, V2.2)", 0 )
+GAME( 1992, gpgolf, 0, gtg2, gpgolf, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Par Golf (Joystick, V1.1)", 0 )
+GAME( 1992, gtg2, 0, gtg2, gtg2, itech8_state, 0, ROT0, "Strata/Incredible Technologies", "Golden Tee Golf II (Trackball, V2.2)", 0 )
diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp
index 698055beeff..857aad36c04 100644
--- a/src/mame/drivers/itgambl2.cpp
+++ b/src/mame/drivers/itgambl2.cpp
@@ -270,7 +270,7 @@ PALETTE_INIT_MEMBER(itgambl2_state, itgambl2)
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( itgambl2, itgambl2_state )
+static MACHINE_CONFIG_START( itgambl2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83337, MAIN_CLOCK)
@@ -1100,24 +1100,24 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1999, ntcash, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "NtCash", MACHINE_IS_SKELETON )
-GAME( 1999, wizard, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "A.A.", "Wizard (Ver 1.0)", MACHINE_IS_SKELETON )
-GAME( 200?, trstar2k, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "A.M.", "Triple Star 2000", MACHINE_IS_SKELETON )
-GAME( 2001, laser2k1, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Laser 2001 (Ver 1.2)", MACHINE_IS_SKELETON )
-GAME( 2001, mdrink, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Magic Drink (Ver 1.2)", MACHINE_IS_SKELETON )
-GAME( 2001, te0144, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Puzzle Bobble (Italian Gambling Game)", MACHINE_IS_SKELETON )
-GAME( 200?, cmagica, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Carta Magica (Ver 1.8)", MACHINE_IS_SKELETON )
-GAME( 200?, mcard_h8, cmagica, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Magic Card (H8, English)", MACHINE_IS_SKELETON )
-GAME( 200?, millsun, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Millennium Sun", MACHINE_IS_SKELETON )
-GAME( 200?, sspac2k1, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Super Space 2001", MACHINE_IS_SKELETON )
-GAME( 200?, elvis, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Elvis?", MACHINE_IS_SKELETON )
-GAME( 200?, sstar, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Super Star", MACHINE_IS_SKELETON )
-GAME( 2001, pirati, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "Cin", "Pirati", MACHINE_IS_SKELETON )
-GAME( 200?, mnumitg, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Magic Number (Italian Gambling Game, Ver 1.5)", MACHINE_IS_SKELETON )
-GAME( 200?, mclass, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Magic Class (Ver 2.2)", MACHINE_IS_SKELETON )
-GAME( 200?, europass, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Euro Pass (Ver 1.1)", MACHINE_IS_SKELETON )
-GAME( 200?, thedrink, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "The Drink", MACHINE_IS_SKELETON )
-GAME( 200?, unkh8gam, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "unknown H8 Italian Gambling game", MACHINE_IS_SKELETON )
-GAME( 200?, eurodsr, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Euro Double Star Record (ver.1.2)", MACHINE_IS_SKELETON )
-GAME( 200?, granfrat, 0, itgambl2, itgambl2, driver_device, 0, ROT0, "<unknown>", "Grande Fratello (Ver. 1.7)", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1999, ntcash, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "NtCash", MACHINE_IS_SKELETON )
+GAME( 1999, wizard, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "A.A.", "Wizard (Ver 1.0)", MACHINE_IS_SKELETON )
+GAME( 200?, trstar2k, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "A.M.", "Triple Star 2000", MACHINE_IS_SKELETON )
+GAME( 2001, laser2k1, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Laser 2001 (Ver 1.2)", MACHINE_IS_SKELETON )
+GAME( 2001, mdrink, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Magic Drink (Ver 1.2)", MACHINE_IS_SKELETON )
+GAME( 2001, te0144, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Puzzle Bobble (Italian Gambling Game)", MACHINE_IS_SKELETON )
+GAME( 200?, cmagica, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Carta Magica (Ver 1.8)", MACHINE_IS_SKELETON )
+GAME( 200?, mcard_h8, cmagica, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Magic Card (H8, English)", MACHINE_IS_SKELETON )
+GAME( 200?, millsun, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Millennium Sun", MACHINE_IS_SKELETON )
+GAME( 200?, sspac2k1, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Super Space 2001", MACHINE_IS_SKELETON )
+GAME( 200?, elvis, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Elvis?", MACHINE_IS_SKELETON )
+GAME( 200?, sstar, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Super Star", MACHINE_IS_SKELETON )
+GAME( 2001, pirati, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "Cin", "Pirati", MACHINE_IS_SKELETON )
+GAME( 200?, mnumitg, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Magic Number (Italian Gambling Game, Ver 1.5)", MACHINE_IS_SKELETON )
+GAME( 200?, mclass, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Magic Class (Ver 2.2)", MACHINE_IS_SKELETON )
+GAME( 200?, europass, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Euro Pass (Ver 1.1)", MACHINE_IS_SKELETON )
+GAME( 200?, thedrink, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "The Drink", MACHINE_IS_SKELETON )
+GAME( 200?, unkh8gam, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "unknown H8 Italian Gambling game", MACHINE_IS_SKELETON )
+GAME( 200?, eurodsr, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Euro Double Star Record (ver.1.2)", MACHINE_IS_SKELETON )
+GAME( 200?, granfrat, 0, itgambl2, itgambl2, itgambl2_state, 0, ROT0, "<unknown>", "Grande Fratello (Ver. 1.7)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp
index a7450add868..522f43567ec 100644
--- a/src/mame/drivers/itgambl3.cpp
+++ b/src/mame/drivers/itgambl3.cpp
@@ -258,7 +258,7 @@ PALETTE_INIT_MEMBER(itgambl3_state, itgambl3)
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( itgambl3, itgambl3_state )
+static MACHINE_CONFIG_START( itgambl3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
@@ -279,7 +279,7 @@ static MACHINE_CONFIG_START( itgambl3, itgambl3_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MAIN_CLOCK/16, OKIM6295_PIN7_HIGH) /* 1MHz */
+ MCFG_OKIM6295_ADD("oki", MAIN_CLOCK/16, PIN7_HIGH) /* 1MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -515,10 +515,10 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 200?, ejollyx5, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "Solar Games", "Euro Jolly X5", MACHINE_IS_SKELETON )
-GAME( 200?, grandprx, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "4fun", "Grand Prix", MACHINE_IS_SKELETON )
-GAME( 200?, supjolly, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "<unknown>", "Super Jolly", MACHINE_IS_SKELETON )
-GAME( 200?, x5jokers, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "Electronic Projects", "X Five Jokers (Version 1.12)", MACHINE_IS_SKELETON )
-GAME( 200?, queenotg, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "<unknown>", "Queen of the Games", MACHINE_IS_SKELETON )
-GAME( 200?, ejollyx9, 0, itgambl3, itgambl3, driver_device, 0, ROT0, "Solar Games", "Euro Jolly X9", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 200?, ejollyx5, 0, itgambl3, itgambl3, itgambl3_state, 0, ROT0, "Solar Games", "Euro Jolly X5", MACHINE_IS_SKELETON )
+GAME( 200?, grandprx, 0, itgambl3, itgambl3, itgambl3_state, 0, ROT0, "4fun", "Grand Prix", MACHINE_IS_SKELETON )
+GAME( 200?, supjolly, 0, itgambl3, itgambl3, itgambl3_state, 0, ROT0, "<unknown>", "Super Jolly", MACHINE_IS_SKELETON )
+GAME( 200?, x5jokers, 0, itgambl3, itgambl3, itgambl3_state, 0, ROT0, "Electronic Projects", "X Five Jokers (Version 1.12)", MACHINE_IS_SKELETON )
+GAME( 200?, queenotg, 0, itgambl3, itgambl3, itgambl3_state, 0, ROT0, "<unknown>", "Queen of the Games", MACHINE_IS_SKELETON )
+GAME( 200?, ejollyx9, 0, itgambl3, itgambl3, itgambl3_state, 0, ROT0, "Solar Games", "Euro Jolly X9", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp
index 968d49e713f..e7a8f8d9d44 100644
--- a/src/mame/drivers/itgamble.cpp
+++ b/src/mame/drivers/itgamble.cpp
@@ -208,7 +208,7 @@ void itgamble_state::machine_reset()
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( itgamble, itgamble_state )
+static MACHINE_CONFIG_START( itgamble )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83048, MAIN_CLOCK/2)
@@ -228,7 +228,7 @@ static MACHINE_CONFIG_START( itgamble, itgamble_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", SND_CLOCK, OKIM6295_PIN7_HIGH) /* 1MHz resonator */
+ MCFG_OKIM6295_ADD("oki", SND_CLOCK, PIN7_HIGH) /* 1MHz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -237,7 +237,7 @@ static MACHINE_CONFIG_DERIVED( mnumber, itgamble )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_CLOCK(MNUMBER_MAIN_CLOCK/2) /* probably the wrong CPU */
- MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -248,7 +248,7 @@ static MACHINE_CONFIG_DERIVED( ejollyx5, itgamble )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_CLOCK(EJOLLYX5_MAIN_CLOCK/2) /* up to 10MHz.*/
- MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_REPLACE("oki", MNUMBER_SND_CLOCK/16, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
#endif
@@ -703,16 +703,16 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 2000, capunc, 0, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "Capitan Uncino (Ver 1.2)", MACHINE_IS_SKELETON )
-GAME( 2001, capcor, 0, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "Capitani Coraggiosi (Ver 1.3)", MACHINE_IS_SKELETON )
-GAME( 2002, laperla, 0, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "La Perla Nera (Ver 2.0)", MACHINE_IS_SKELETON )
-GAME( 2001, laperlag, 0, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "La Perla Nera Gold (Ver 2.0)", MACHINE_IS_SKELETON )
-GAME( 2001, euro2k2, 0, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "Europa 2002 (Ver 2.0, set 1)", MACHINE_IS_SKELETON )
-GAME( 2001, euro2k2a, euro2k2, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "Europa 2002 (Ver 2.0, set 2)", MACHINE_IS_SKELETON )
-GAME( 2002, euro2k2s, euro2k2, itgamble, itgamble, driver_device, 0, ROT0, "Nazionale Elettronica", "Europa 2002 Space (Ver 3.0)", MACHINE_IS_SKELETON )
-GAME( 200?, abacus, 0, itgamble, itgamble, driver_device, 0, ROT0, "<unknown>", "Abacus (Ver 1.0)", MACHINE_IS_SKELETON )
-GAME( 200?, bookthr, 0, itgamble, itgamble, driver_device, 0, ROT0, "<unknown>", "Book Theatre (Ver 1.2)", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 2000, capunc, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "Capitan Uncino (Ver 1.2)", MACHINE_IS_SKELETON )
+GAME( 2001, capcor, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "Capitani Coraggiosi (Ver 1.3)", MACHINE_IS_SKELETON )
+GAME( 2002, laperla, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "La Perla Nera (Ver 2.0)", MACHINE_IS_SKELETON )
+GAME( 2001, laperlag, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "La Perla Nera Gold (Ver 2.0)", MACHINE_IS_SKELETON )
+GAME( 2001, euro2k2, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "Europa 2002 (Ver 2.0, set 1)", MACHINE_IS_SKELETON )
+GAME( 2001, euro2k2a, euro2k2, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "Europa 2002 (Ver 2.0, set 2)", MACHINE_IS_SKELETON )
+GAME( 2002, euro2k2s, euro2k2, itgamble, itgamble, itgamble_state, 0, ROT0, "Nazionale Elettronica", "Europa 2002 Space (Ver 3.0)", MACHINE_IS_SKELETON )
+GAME( 200?, abacus, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "<unknown>", "Abacus (Ver 1.0)", MACHINE_IS_SKELETON )
+GAME( 200?, bookthr, 0, itgamble, itgamble, itgamble_state, 0, ROT0, "<unknown>", "Book Theatre (Ver 1.2)", MACHINE_IS_SKELETON )
/* different hardware */
-GAME( 2000, mnumber, 0, mnumber, itgamble, driver_device, 0, ROT0, "MM / BRL Bologna", "Mystery Number", MACHINE_IS_SKELETON )
+GAME( 2000, mnumber, 0, mnumber, itgamble, itgamble_state, 0, ROT0, "MM / BRL Bologna", "Mystery Number", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp
index cd07cfa4dd6..070e3a943de 100644
--- a/src/mame/drivers/itt3030.cpp
+++ b/src/mame/drivers/itt3030.cpp
@@ -227,29 +227,9 @@ public:
, m_palette(*this, "palette")
{ }
- // devices
- required_device<cpu_device> m_maincpu;
- required_device<i8741_device> m_kbdmcu;
- required_device<ram_device> m_ram;
- required_device<crt5027_device> m_crtc;
- required_device<address_map_bank_device> m_48kbank;
- required_device<fd1791_t> m_fdc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<beep_device> m_beep;
-
- required_ioport_array<16> m_keyrows;
-
- // shared pointers
- required_shared_ptr<uint8_t> m_vram;
-
// screen updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-protected:
- // driver_device overrides
- virtual void machine_start() override;
- virtual void machine_reset() override;
public:
DECLARE_READ8_MEMBER(vsync_r);
@@ -270,6 +250,27 @@ public:
DECLARE_WRITE_LINE_MEMBER(fdchld_w);
DECLARE_PALETTE_INIT(itt3030);
+protected:
+ // driver_device overrides
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ // devices
+ required_device<cpu_device> m_maincpu;
+ required_device<i8741_device> m_kbdmcu;
+ required_device<ram_device> m_ram;
+ required_device<crt5027_device> m_crtc;
+ required_device<address_map_bank_device> m_48kbank;
+ required_device<fd1791_device> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<beep_device> m_beep;
+
+ required_ioport_array<16> m_keyrows;
+
+ // shared pointers
+ required_shared_ptr<uint8_t> m_vram;
+
private:
uint8_t m_kbdclk, m_kbdread, m_kbdport2;
required_device<gfxdecode_device> m_gfxdecode;
@@ -655,7 +656,7 @@ PALETTE_INIT_MEMBER(itt3030_state, itt3030)
palette.set_pen_color(2, rgb_t::black());
}
-static MACHINE_CONFIG_START( itt3030, itt3030_state )
+static MACHINE_CONFIG_START( itt3030 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,XTAL_4MHz)
@@ -732,4 +733,4 @@ ROM_START( itt3030 )
ROM_LOAD( "8741ad.bin", 0x0000, 0x0400, CRC(cabf4394) SHA1(e5d1416b568efa32b578ca295a29b7b5d20c0def))
ROM_END
-COMP( 1982, itt3030, 0, 0, itt3030, itt3030, driver_device, 0, "ITT RFA", "ITT3030", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1982, itt3030, 0, 0, itt3030, itt3030, itt3030_state, 0, "ITT RFA", "ITT3030", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp
index d941f12fd22..e17e13ab373 100644
--- a/src/mame/drivers/jack.cpp
+++ b/src/mame/drivers/jack.cpp
@@ -902,7 +902,7 @@ MACHINE_RESET_MEMBER(jack_state,joinem)
/***************************************************************/
-static MACHINE_CONFIG_START( jack, jack_state )
+static MACHINE_CONFIG_START( jack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6)
diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp
index 9a5f4fc2d25..d619c1d3c79 100644
--- a/src/mame/drivers/jackal.cpp
+++ b/src/mame/drivers/jackal.cpp
@@ -355,7 +355,7 @@ void jackal_state::machine_reset()
m_irq_enable = 0;
}
-static MACHINE_CONFIG_START( jackal, jackal_state )
+static MACHINE_CONFIG_START( jackal )
/* basic machine hardware */
MCFG_CPU_ADD("master", M6809, MASTER_CLOCK/12) // verified on pcb
@@ -571,9 +571,9 @@ ROM_END
*
*************************************/
-GAME( 1986, jackal, 0, jackal, jackal, driver_device, 0, ROT90, "Konami", "Jackal (World, 8-way Joystick)", 0 )
-GAME( 1986, jackalr, jackal, jackal, jackalr, driver_device, 0, ROT90, "Konami", "Jackal (World, Rotary Joystick)", 0 )
-GAME( 1986, topgunr, jackal, jackal, jackal, driver_device, 0, ROT90, "Konami", "Top Gunner (US, 8-way Joystick)", 0 )
-GAME( 1986, jackalj, jackal, jackal, jackal, driver_device, 0, ROT90, "Konami", "Tokushu Butai Jackal (Japan, 8-way Joystick)", 0 )
-GAME( 1986, jackalbl, jackal, jackal, jackalr, driver_device, 0, ROT90, "bootleg", "Jackal (bootleg, Rotary Joystick)", 0 )
-GAME( 1986, topgunbl, jackal, jackal, jackalr, driver_device, 0, ROT90, "bootleg", "Top Gunner (bootleg, Rotary Joystick)", 0 )
+GAME( 1986, jackal, 0, jackal, jackal, jackal_state, 0, ROT90, "Konami", "Jackal (World, 8-way Joystick)", 0 )
+GAME( 1986, jackalr, jackal, jackal, jackalr, jackal_state, 0, ROT90, "Konami", "Jackal (World, Rotary Joystick)", 0 )
+GAME( 1986, topgunr, jackal, jackal, jackal, jackal_state, 0, ROT90, "Konami", "Top Gunner (US, 8-way Joystick)", 0 )
+GAME( 1986, jackalj, jackal, jackal, jackal, jackal_state, 0, ROT90, "Konami", "Tokushu Butai Jackal (Japan, 8-way Joystick)", 0 )
+GAME( 1986, jackalbl, jackal, jackal, jackalr, jackal_state, 0, ROT90, "bootleg", "Jackal (bootleg, Rotary Joystick)", 0 )
+GAME( 1986, topgunbl, jackal, jackal, jackalr, jackal_state, 0, ROT90, "bootleg", "Top Gunner (bootleg, Rotary Joystick)", 0 )
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 4bca5ce1f9e..287301a6965 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -595,7 +595,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(jackie_state::irq)
m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( jackie, jackie_state )
+static MACHINE_CONFIG_START( jackie )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp
index 8432bea81ee..c8fb44318e3 100644
--- a/src/mame/drivers/jackpool.cpp
+++ b/src/mame/drivers/jackpool.cpp
@@ -267,7 +267,7 @@ INTERRUPT_GEN_MEMBER(jackpool_state::jackpool_interrupt)
}
-static MACHINE_CONFIG_START( jackpool, jackpool_state )
+static MACHINE_CONFIG_START( jackpool )
MCFG_CPU_ADD("maincpu", M68000, 12000000) // ?
MCFG_CPU_PROGRAM_MAP(jackpool_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", jackpool_state, jackpool_interrupt) // ?
@@ -289,7 +289,7 @@ static MACHINE_CONFIG_START( jackpool, jackpool_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/jade.cpp b/src/mame/drivers/jade.cpp
index ad281aea28b..4cf9240d770 100644
--- a/src/mame/drivers/jade.cpp
+++ b/src/mame/drivers/jade.cpp
@@ -31,7 +31,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(keyin_r);
DECLARE_READ8_MEMBER(status_r);
private:
@@ -74,7 +74,7 @@ READ8_MEMBER( jade_state::status_r )
return (m_term_data) ? 5 : 4;
}
-WRITE8_MEMBER( jade_state::kbd_put )
+void jade_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -84,7 +84,7 @@ void jade_state::machine_reset()
m_term_data = 0;
}
-static MACHINE_CONFIG_START( jade, jade_state )
+static MACHINE_CONFIG_START( jade )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(jade_mem)
@@ -92,7 +92,7 @@ static MACHINE_CONFIG_START( jade, jade_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(jade_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(jade_state, kbd_put))
/* Devices */
MCFG_DEVICE_ADD("uart", I8251, 0)
@@ -106,5 +106,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, jade, 0, 0, jade, jade, driver_device, 0, "Jade", "JGZ80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 19??, jade, 0, 0, jade, jade, jade_state, 0, "Jade", "JGZ80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index f909f68a59e..21aa7600dcf 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -334,6 +334,7 @@ Notes:
#include "emu.h"
#include "includes/jaguar.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "cpu/m68000/m68000.h"
@@ -342,6 +343,7 @@ Notes:
#include "imagedev/chd_cd.h"
#include "imagedev/snapquik.h"
#include "machine/eepromser.h"
+#include "machine/idehd.h"
#include "machine/watchdog.h"
#include "machine/vt83c461.h"
#include "sound/cdda.h"
@@ -370,15 +372,13 @@ IRQ_CALLBACK_MEMBER(jaguar_state::jaguar_irq_callback)
/// HACK: Maximum force requests data but doesn't transfer it all before issuing another command.
/// According to the ATA specification this is not allowed, more investigation is required.
-#include "machine/idehd.h"
-
-extern const device_type COJAG_HARDDISK;
+DECLARE_DEVICE_TYPE(COJAG_HARDDISK, cojag_hdd)
class cojag_hdd : public ide_hdd_device
{
public:
cojag_hdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ide_hdd_device(mconfig, COJAG_HARDDISK, "HDD CoJag", tag, owner, clock, "cojag_hdd", __FILE__)
+ : ide_hdd_device(mconfig, COJAG_HARDDISK, tag, owner, clock)
{
}
@@ -394,7 +394,7 @@ public:
}
};
-const device_type COJAG_HARDDISK = device_creator<cojag_hdd>;
+DEFINE_DEVICE_TYPE(COJAG_HARDDISK, cojag_hdd, "cojag_hdd", "HDD CoJag")
SLOT_INTERFACE_START(cojag_devices)
SLOT_INTERFACE("hdd", COJAG_HARDDISK)
@@ -1801,7 +1801,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( cojagr3k, jaguar_state )
+static MACHINE_CONFIG_START( cojagr3k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R3041, R3000_CLOCK)
@@ -1851,7 +1851,7 @@ static MACHINE_CONFIG_DERIVED( cojag68k, cojagr3k )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jaguar, jaguar_state )
+static MACHINE_CONFIG_START( jaguar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, JAGUAR_CLOCK/2)
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index 97583d59fb5..96e5171613e 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -259,7 +259,7 @@ void jailbrek_state::machine_reset()
m_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( jailbrek, jailbrek_state )
+static MACHINE_CONFIG_START( jailbrek )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/12)
@@ -421,6 +421,6 @@ ROM_START( jailbrekb )
ROM_LOAD( "k8.bin", 0x0000, 0x0001, NO_DUMP ) /* PAL16L8 */
ROM_END
-GAME( 1986, jailbrek, 0, jailbrek, jailbrek, driver_device, 0, ROT0, "Konami", "Jail Break", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, jailbrekb,jailbrek, jailbrek, jailbrek, driver_device, 0, ROT0, "bootleg","Jail Break (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, manhatan, jailbrek, jailbrek, jailbrek, driver_device, 0, ROT0, "Konami", "Manhattan 24 Bunsyo (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, jailbrek, 0, jailbrek, jailbrek, jailbrek_state, 0, ROT0, "Konami", "Jail Break", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, jailbrekb, jailbrek, jailbrek, jailbrek, jailbrek_state, 0, ROT0, "bootleg", "Jail Break (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, manhatan, jailbrek, jailbrek, jailbrek, jailbrek_state, 0, ROT0, "Konami", "Manhattan 24 Bunsyo (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index 74582939bb9..4778b53f678 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -1413,7 +1413,7 @@ void jalmah_state::machine_reset()
}
}
-static MACHINE_CONFIG_START( jalmah, jalmah_state )
+static MACHINE_CONFIG_START( jalmah )
MCFG_CPU_ADD("maincpu" , M68000, 12000000) /* 68000-8 */
MCFG_CPU_PROGRAM_MAP(jalmah)
MCFG_CPU_VBLANK_INT_DRIVER("screen", jalmah_state, irq2_line_hold)
@@ -1436,7 +1436,7 @@ static MACHINE_CONFIG_START( jalmah, jalmah_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("mcusim", jalmah_state, jalmah_mcu_sim, attotime::from_hz(10000))
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 4000000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 4000000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -2475,10 +2475,10 @@ DRIVER_INIT_MEMBER(jalmah_state,suchipi)
}
/*First version of the MCU*/
-GAME( 1989, urashima, 0, urashima, urashima, jalmah_state, urashima, ROT0, "UPL", "Otogizoushi Urashima Mahjong (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1989, daireika, 0, jalmah, daireika, jalmah_state, daireika, ROT0, "Jaleco / NMK", "Mahjong Daireikai (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1990, mjzoomin, 0, jalmah, mjzoomin, jalmah_state, mjzoomin, ROT0, "Jaleco", "Mahjong Channel Zoom In (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1989, urashima, 0, urashima, urashima, jalmah_state, urashima, ROT0, "UPL", "Otogizoushi Urashima Mahjong (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1989, daireika, 0, jalmah, daireika, jalmah_state, daireika, ROT0, "Jaleco / NMK", "Mahjong Daireikai (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1990, mjzoomin, 0, jalmah, mjzoomin, jalmah_state, mjzoomin, ROT0, "Jaleco", "Mahjong Channel Zoom In (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
/*Second version of the MCU*/
-GAME( 1990, kakumei, 0, jalmah, kakumei, jalmah_state, kakumei, ROT0, "Jaleco", "Mahjong Kakumei (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1990, kakumei, 0, jalmah, kakumei, jalmah_state, kakumei, ROT0, "Jaleco", "Mahjong Kakumei (Japan)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1992, kakumei2, 0, jalmah, kakumei2, jalmah_state, kakumei2, ROT0, "Jaleco", "Mahjong Kakumei 2 - Princess League (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1993, suchipi, 0, jalmah, suchipi, jalmah_state, suchipi, ROT0, "Jaleco", "Idol Janshi Suchie-Pai Special (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, suchipi, 0, jalmah, suchipi, jalmah_state, suchipi, ROT0, "Jaleco", "Idol Janshi Suchie-Pai Special (Japan)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index 8615d4a1e69..2ecedbc4979 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -44,15 +44,17 @@ class jangou_state : public driver_device
{
public:
jangou_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_cpu_0(*this, "cpu0"),
- m_cpu_1(*this, "cpu1"),
- m_nsc(*this, "nsc"),
- m_msm(*this, "msm"),
- m_cvsd(*this, "cvsd"),
- m_palette(*this, "palette"),
- m_blitter(*this, "blitter"),
- m_soundlatch(*this, "soundlatch") { }
+ : driver_device(mconfig, type, tag)
+ , m_cpu_0(*this, "cpu0")
+ , m_cpu_1(*this, "cpu1")
+ , m_nsc(*this, "nsc")
+ , m_msm(*this, "msm")
+ , m_cvsd(*this, "cvsd")
+ , m_palette(*this, "palette")
+ , m_blitter(*this, "blitter")
+ , m_soundlatch(*this, "soundlatch")
+ {
+ }
/* sound-related */
// Jangou CVSD Sound
@@ -168,7 +170,7 @@ uint32_t jangou_state::screen_update_jangou(screen_device &screen, bitmap_ind16
for (y = cliprect.min_y; y <= cliprect.max_y; ++y)
{
- uint8_t *src = &m_blitter->m_blit_buffer[y * 256 + cliprect.min_x];
+ const uint8_t *src = &m_blitter->blit_buffer(y, cliprect.min_x);
uint16_t *dst = &m_tmp_bitmap->pix16(y, cliprect.min_x);
for (x = cliprect.min_x; x <= cliprect.max_x; x += 2)
@@ -836,7 +838,7 @@ MACHINE_RESET_MEMBER(jangou_state,jngolady)
}
/* Note: All frequencies and dividers are unverified */
-static MACHINE_CONFIG_START( jangou, jangou_state )
+static MACHINE_CONFIG_START( jangou )
/* basic machine hardware */
MCFG_CPU_ADD("cpu0", Z80, MASTER_CLOCK / 8)
@@ -895,7 +897,7 @@ static MACHINE_CONFIG_DERIVED( jngolady, jangou )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(jangou_state, jngolady_vclk_cb))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1265,13 +1267,13 @@ DRIVER_INIT_MEMBER(jangou_state,luckygrl)
*
*************************************/
-GAME( 1983, jangou, 0, jangou, jangou, driver_device, 0, ROT0, "Nichibutsu", "Jangou [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, macha, 0, jangou, macha, driver_device, 0, ROT0, "Logitec", "Monoshiri Quiz Osyaberi Macha (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, jangou, 0, jangou, jangou, jangou_state, 0, ROT0, "Nichibutsu", "Jangou [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, macha, 0, jangou, macha, jangou_state, 0, ROT0, "Logitec", "Monoshiri Quiz Osyaberi Macha (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, jngolady, 0, jngolady, jngolady, jangou_state, jngolady, ROT0, "Nichibutsu", "Jangou Lady (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, cntrygrl, 0, cntrygrl, cntrygrl, driver_device, 0, ROT0, "Royal Denshi", "Country Girl (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, cntrygrla, cntrygrl, cntrygrl, cntrygrl, driver_device, 0, ROT0, "Nichibutsu", "Country Girl (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, fruitbun, cntrygrl, cntrygrl, cntrygrl, driver_device, 0, ROT0, "Nichibutsu", "Fruits & Bunny (World?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, roylcrdn, 0, roylcrdn, roylcrdn, driver_device, 0, ROT0, "Nichibutsu", "Royal Card (Nichibutsu)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, cntrygrl, 0, cntrygrl, cntrygrl, jangou_state, 0, ROT0, "Royal Denshi", "Country Girl (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, cntrygrla, cntrygrl, cntrygrl, cntrygrl, jangou_state, 0, ROT0, "Nichibutsu", "Country Girl (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, fruitbun, cntrygrl, cntrygrl, cntrygrl, jangou_state, 0, ROT0, "Nichibutsu", "Fruits & Bunny (World?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, roylcrdn, 0, roylcrdn, roylcrdn, jangou_state, 0, ROT0, "Nichibutsu", "Royal Card (Nichibutsu)", MACHINE_SUPPORTS_SAVE )
/* The following might not run there... */
GAME( 1984?, luckygrl, 0, cntrygrl, cntrygrl, jangou_state, luckygrl, ROT0, "Wing Co., Ltd.", "Lucky Girl? (Wing)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp
index f2c0b73089a..df5fd004b31 100644
--- a/src/mame/drivers/jankenmn.cpp
+++ b/src/mame/drivers/jankenmn.cpp
@@ -362,7 +362,7 @@ static const z80_daisy_config daisy_chain[] =
* Machine Config *
*********************************************/
-static MACHINE_CONFIG_START( jankenmn, jankenmn_state )
+static MACHINE_CONFIG_START( jankenmn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 2.5 MHz */
MCFG_Z80_DAISY_CHAIN(daisy_chain)
@@ -416,5 +416,5 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... LAYOUT */
-GAMEL( 1991, jankenmn, 0, jankenmn, jankenmn, driver_device, 0, ROT0, "Sunwise", "Janken Man Kattara Ageru", MACHINE_SUPPORTS_SAVE, layout_jankenmn )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1991, jankenmn, 0, jankenmn, jankenmn, jankenmn_state, 0, ROT0, "Sunwise", "Janken Man Kattara Ageru", MACHINE_SUPPORTS_SAVE, layout_jankenmn )
diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp
index a77895515d8..afa91d7ff59 100644
--- a/src/mame/drivers/jantotsu.cpp
+++ b/src/mame/drivers/jantotsu.cpp
@@ -494,7 +494,7 @@ void jantotsu_state::machine_reset()
m_adpcm_trigger = 0;
}
-static MACHINE_CONFIG_START( jantotsu, jantotsu_state )
+static MACHINE_CONFIG_START( jantotsu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/4)
@@ -525,7 +525,7 @@ static MACHINE_CONFIG_START( jantotsu, jantotsu_state )
MCFG_SOUND_ADD("adpcm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(jantotsu_state, jan_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) /* 6 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -562,4 +562,4 @@ ROM_END
*
*************************************/
-GAME( 1983, jantotsu, 0, jantotsu, jantotsu, driver_device, 0, ROT270, "Sanritsu", "4nin-uchi Mahjong Jantotsu", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, jantotsu, 0, jantotsu, jantotsu, jantotsu_state, 0, ROT270, "Sanritsu", "4nin-uchi Mahjong Jantotsu", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp
index 5da50b63809..490624d5e18 100644
--- a/src/mame/drivers/jchan.cpp
+++ b/src/mame/drivers/jchan.cpp
@@ -576,7 +576,7 @@ INPUT_PORTS_END
/* machine driver */
-static MACHINE_CONFIG_START( jchan, jchan_state )
+static MACHINE_CONFIG_START( jchan )
MCFG_CPU_ADD("maincpu", M68000, 16000000)
MCFG_CPU_PROGRAM_MAP(jchan_main)
@@ -713,5 +713,5 @@ DRIVER_INIT_MEMBER( jchan_state, jchan )
/* game drivers */
-GAME( 1995, jchan, 0, jchan, jchan, jchan_state, jchan, ROT0, "Kaneko", "Jackie Chan - The Kung-Fu Master", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, jchan2, 0, jchan, jchan2, jchan_state, jchan, ROT0, "Kaneko", "Jackie Chan in Fists of Fire", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, jchan, 0, jchan, jchan, jchan_state, jchan, ROT0, "Kaneko", "Jackie Chan - The Kung-Fu Master", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, jchan2, 0, jchan, jchan2, jchan_state, jchan, ROT0, "Kaneko", "Jackie Chan in Fists of Fire", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index 6f125a3d946..a1ed108ca9d 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -1109,7 +1109,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(common_state::scanline_irq)
}
// Older hardware (ST-0020 + ST-0016)
-static MACHINE_CONFIG_START( jclub2o, jclub2o_state )
+static MACHINE_CONFIG_START( jclub2o )
MCFG_CPU_ADD("gamecpu", M68EC020, 12000000)
MCFG_CPU_PROGRAM_MAP(jclub2o_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1)
@@ -1148,7 +1148,7 @@ MACHINE_CONFIG_END
// Newer hardware (ST-0032)
-static MACHINE_CONFIG_START( jclub2, jclub2_state )
+static MACHINE_CONFIG_START( jclub2 )
MCFG_CPU_ADD("gamecpu", M68EC020, 12000000)
MCFG_CPU_PROGRAM_MAP(jclub2_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1)
@@ -1183,7 +1183,7 @@ static MACHINE_CONFIG_START( jclub2, jclub2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( darkhors, darkhors_state )
+static MACHINE_CONFIG_START( darkhors )
MCFG_CPU_ADD("gamecpu", M68EC020, 12000000) // 36MHz/3 ??
MCFG_CPU_PROGRAM_MAP(darkhors_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", common_state, scanline_irq, "screen", 0, 1)
@@ -1216,7 +1216,7 @@ static MACHINE_CONFIG_START( darkhors, darkhors_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 528000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 528000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1506,16 +1506,16 @@ DRIVER_INIT_MEMBER(darkhors_state,darkhors)
// Older hardware (ST-0020 + ST-0016)
-GAME( 1994, jclub2v100, jclub2v112, jclub2o, jclub2v100, driver_device, 0, ROT0, "Seta", "Jockey Club II (v1.00, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, jclub2v101, jclub2v112, jclub2o, jclub2v100, driver_device, 0, ROT0, "Seta", "Jockey Club II (v1.01, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, jclub2v110, jclub2v112, jclub2o, jclub2v100, driver_device, 0, ROT0, "Seta", "Jockey Club II (v1.10X, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, jclub2v112, 0, jclub2o, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v1.12X, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, jclub2v203, jclub2v112, jclub2o, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v2.03X RC, older hardware, prototype)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, jclub2v100, jclub2v112, jclub2o, jclub2v100, jclub2o_state, 0, ROT0, "Seta", "Jockey Club II (v1.00, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, jclub2v101, jclub2v112, jclub2o, jclub2v100, jclub2o_state, 0, ROT0, "Seta", "Jockey Club II (v1.01, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, jclub2v110, jclub2v112, jclub2o, jclub2v100, jclub2o_state, 0, ROT0, "Seta", "Jockey Club II (v1.10X, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, jclub2v112, 0, jclub2o, jclub2v112, jclub2o_state, 0, ROT0, "Seta", "Jockey Club II (v1.12X, older hardware)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, jclub2v203, jclub2v112, jclub2o, jclub2v112, jclub2o_state, 0, ROT0, "Seta", "Jockey Club II (v2.03X RC, older hardware, prototype)", MACHINE_IMPERFECT_GRAPHICS )
// Newer hardware (ST-0032)
-GAME( 1996, jclub2v200, jclub2v112, jclub2, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v2.00, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1996, jclub2v201, jclub2v112, jclub2, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v2.01X, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1997, jclub2v204, jclub2v112, jclub2, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v2.04, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1997, jclub2v205, jclub2v112, jclub2, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v2.05, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1998, jclub2v220, jclub2v112, jclub2, jclub2v112, driver_device, 0, ROT0, "Seta", "Jockey Club II (v2.20X, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1996, jclub2v200, jclub2v112, jclub2, jclub2v112, jclub2_state, 0, ROT0, "Seta", "Jockey Club II (v2.00, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1996, jclub2v201, jclub2v112, jclub2, jclub2v112, jclub2_state, 0, ROT0, "Seta", "Jockey Club II (v2.01X, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1997, jclub2v204, jclub2v112, jclub2, jclub2v112, jclub2_state, 0, ROT0, "Seta", "Jockey Club II (v2.04, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1997, jclub2v205, jclub2v112, jclub2, jclub2v112, jclub2_state, 0, ROT0, "Seta", "Jockey Club II (v2.05, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1998, jclub2v220, jclub2v112, jclub2, jclub2v112, jclub2_state, 0, ROT0, "Seta", "Jockey Club II (v2.20X, newer hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
// Bootleg hardware
GAME( 2001, darkhors, jclub2v112, darkhors, darkhors, darkhors_state, darkhors, ROT0, "bootleg", "Dark Horse (USA v4.00, bootleg of Jockey Club II)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp
index ed22eeaf888..18acb2347f7 100644
--- a/src/mame/drivers/jedi.cpp
+++ b/src/mame/drivers/jedi.cpp
@@ -333,7 +333,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( jedi, jedi_state )
+static MACHINE_CONFIG_START( jedi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, JEDI_MAIN_CPU_CLOCK)
@@ -398,4 +398,4 @@ ROM_END
*
*************************************/
-GAME( 1984, jedi, 0, jedi, jedi, driver_device, 0, ROT0, "Atari", "Return of the Jedi", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, jedi, 0, jedi, jedi, jedi_state, 0, ROT0, "Atari", "Return of the Jedi", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp
index ed9e8efc485..ea5ce245d55 100644
--- a/src/mame/drivers/jeutel.cpp
+++ b/src/mame/drivers/jeutel.cpp
@@ -104,14 +104,13 @@ WRITE8_MEMBER( jeutel_state::porta_w )
{
if ((data & 0xf0) == 0xf0)
{
- m_tms->ctl_w(space, offset, TMS5110_CMD_RESET);
+ m_tms->ctl_w(space, offset, tms5110_device::CMD_RESET);
m_tms->pdc_w(1);
m_tms->pdc_w(0);
}
- else
- if ((data & 0xf0) == 0xd0)
+ else if ((data & 0xf0) == 0xd0)
{
- m_tms->ctl_w(space, offset, TMS5110_CMD_SPEAK);
+ m_tms->ctl_w(space, offset, tms5110_device::CMD_SPEAK);
m_tms->pdc_w(1);
m_tms->pdc_w(0);
}
@@ -184,7 +183,7 @@ DRIVER_INIT_MEMBER( jeutel_state, jeutel )
{
}
-static MACHINE_CONFIG_START( jeutel, jeutel_state )
+static MACHINE_CONFIG_START( jeutel )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3300000)
MCFG_CPU_PROGRAM_MAP(jeutel_map)
@@ -268,5 +267,5 @@ ROM_START(olympic)
ROM_END
-GAME(1983, leking, 0, jeutel, jeutel, jeutel_state, jeutel, ROT0, "Jeutel", "Le King", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, leking, 0, jeutel, jeutel, jeutel_state, jeutel, ROT0, "Jeutel", "Le King", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1984, olympic, 0, jeutel, jeutel, jeutel_state, jeutel, ROT0, "Jeutel", "Olympic Games", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp
index f31a9449c90..0c928469386 100644
--- a/src/mame/drivers/joctronic.cpp
+++ b/src/mame/drivers/joctronic.cpp
@@ -310,7 +310,7 @@ void joctronic_state::machine_reset()
static INPUT_PORTS_START( joctronic )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( joctronic, joctronic_state )
+static MACHINE_CONFIG_START( joctronic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) // 3 MHz - uses WAIT
MCFG_CPU_PROGRAM_MAP(maincpu_map) // 139
@@ -346,7 +346,7 @@ static MACHINE_CONFIG_START( joctronic, joctronic_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( slalom03, joctronic_state )
+static MACHINE_CONFIG_START( slalom03 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) // 6 MHz - uses WAIT
MCFG_CPU_PROGRAM_MAP(slalom03_maincpu_map) // 138, 368, 32
@@ -382,7 +382,7 @@ static MACHINE_CONFIG_START( slalom03, joctronic_state )
MCFG_74157_OUT_CB(DEVWRITE8("oki", msm5205_device, data_w))
MCFG_SOUND_ADD("oki", MSM5205, XTAL_12MHz/2/16) // 375 kHz
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) // frequency modifiable during operation
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) // frequency modifiable during operation
MCFG_MSM5205_VCLK_CB(WRITELINE(joctronic_state, vclk_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -441,7 +441,7 @@ ROM_START(slalom03)
ROM_END
-GAME( 1986, punkywil, 0, joctronic, joctronic, driver_device, 0, ROT0, "Joctronic", "Punky Willy", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1986, walkyria, 0, joctronic, joctronic, driver_device, 0, ROT0, "Joctronic", "Walkyria", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1987, bldyrolr, 0, bldyrolr, joctronic, driver_device, 0, ROT0, "Playbar", "Bloody Roller", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1988, slalom03, 0, slalom03, joctronic, driver_device, 0, ROT0, "Stargame", "Slalom Code 0.3", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1986, punkywil, 0, joctronic, joctronic, joctronic_state, 0, ROT0, "Joctronic", "Punky Willy", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1986, walkyria, 0, joctronic, joctronic, joctronic_state, 0, ROT0, "Joctronic", "Walkyria", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, bldyrolr, 0, bldyrolr, joctronic, joctronic_state, 0, ROT0, "Playbar", "Bloody Roller", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1988, slalom03, 0, slalom03, joctronic, joctronic_state, 0, ROT0, "Stargame", "Slalom Code 0.3", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 99113017d09..fa12026fc2f 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -402,7 +402,7 @@ WRITE8_MEMBER(jokrwild_state::testb_w)
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( jokrwild, jokrwild_state )
+static MACHINE_CONFIG_START( jokrwild )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */
@@ -505,5 +505,5 @@ DRIVER_INIT_MEMBER(jokrwild_state,jokrwild)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1988, jokrwild, 0, jokrwild, jokrwild, jokrwild_state, jokrwild, ROT0, "Sigma", "Joker's Wild (encrypted)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp
index 7cc7832d790..0d25f61d0a2 100644
--- a/src/mame/drivers/jollyjgr.cpp
+++ b/src/mame/drivers/jollyjgr.cpp
@@ -669,7 +669,7 @@ void jollyjgr_state::machine_reset()
m_tilemap_bank = 0;
}
-static MACHINE_CONFIG_START( jollyjgr, jollyjgr_state )
+static MACHINE_CONFIG_START( jollyjgr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18MHz/6) /* 3MHz verified */
MCFG_CPU_PROGRAM_MAP(jollyjgr_map)
diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp
index 7370947a73d..49783c3b31a 100644
--- a/src/mame/drivers/jongkyo.cpp
+++ b/src/mame/drivers/jongkyo.cpp
@@ -490,7 +490,7 @@ void jongkyo_state::machine_reset()
}
-static MACHINE_CONFIG_START( jongkyo, jongkyo_state )
+static MACHINE_CONFIG_START( jongkyo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SEGA_315_5084,JONGKYO_CLOCK/4)
diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp
index a3075fefd59..21fc52f2988 100644
--- a/src/mame/drivers/jonos.cpp
+++ b/src/mame/drivers/jonos.cpp
@@ -117,7 +117,7 @@ static GFXDECODE_START( jonos )
GFXDECODE_END
-static MACHINE_CONFIG_START( jonos, jonos_state )
+static MACHINE_CONFIG_START( jonos )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(jonos_mem)
@@ -153,5 +153,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, jonos, 0, 0, jonos, jonos, jonos_state, jonos, "Jonos", "Escort", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, jonos, 0, 0, jonos, jonos, jonos_state, jonos, "Jonos", "Escort", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index e92b4d032f1..d2b2303da42 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -579,7 +579,7 @@ INTERRUPT_GEN_MEMBER(joystand_state::joystand_interrupt)
m_tmp68301->external_interrupt_1();
}
-static MACHINE_CONFIG_START( joystand, joystand_state )
+static MACHINE_CONFIG_START( joystand )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // !! TMP68301 !!
@@ -610,7 +610,7 @@ static MACHINE_CONFIG_START( joystand, joystand_state )
MCFG_SOUND_ADD("ym2413", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, OKIM6295_PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz / 16, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
// cart
@@ -686,4 +686,4 @@ ROM_START( joystand )
ROM_LOAD( "jsp-xct.ic5", 0x000, 0x117, NO_DUMP )
ROM_END
-GAME( 1997, joystand, 0, joystand, joystand, driver_device, 0, ROT0, "Yuvo", "Joy Stand Private", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, joystand, 0, joystand, joystand, joystand_state, 0, ROT0, "Yuvo", "Joy Stand Private", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp
index d1322f61742..64617ccf8f7 100644
--- a/src/mame/drivers/jp.cpp
+++ b/src/mame/drivers/jp.cpp
@@ -272,7 +272,7 @@ DRIVER_INIT_MEMBER( jp_state, jp )
{
}
-static MACHINE_CONFIG_START( jp, jp_state )
+static MACHINE_CONFIG_START( jp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(jp_map)
@@ -483,17 +483,17 @@ ROM_START(petaco2)
ROM_END
// different hardware
-GAME(1984, petaco, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, petaco, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco", MACHINE_IS_SKELETON_MECHANICAL)
// mostly ok
-GAME(1985, petacon, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco (new hardware)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1985, petacona, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco (new hardware, alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME(1985, petaco2, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco 2", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1985, faeton, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Faeton", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1986, halley, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Halley Comet", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1986, halleya, halley, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Halley Comet (alternate version)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1986, aqualand, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Aqualand", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1986, america, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "America 1492", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1986, olympus, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Olympus", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1987, lortium, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Lortium", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(19??, pimbal, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Pimbal (Pinball 3000)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, petacon, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco (new hardware)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1985, petacona, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco (new hardware, alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1985, petaco2, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Petaco 2", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1985, faeton, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Faeton", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1986, halley, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Halley Comet", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1986, halleya, halley, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Halley Comet (alternate version)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1986, aqualand, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Aqualand", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1986, america, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "America 1492", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1986, olympus, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Olympus", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1987, lortium, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Lortium", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(19??, pimbal, 0, jp, jp, jp_state, jp, ROT0, "Juegos Populares", "Pimbal (Pinball 3000)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index f513aabd29c..5b07067699c 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -835,7 +835,7 @@ WRITE_LINE_MEMBER(jpmimpct_state::tms_irq)
*
*************************************/
-static MACHINE_CONFIG_START( jpmimpct, jpmimpct_state )
+static MACHINE_CONFIG_START( jpmimpct )
MCFG_CPU_ADD("maincpu", M68000, 8000000)
MCFG_CPU_PROGRAM_MAP(m68k_program_map)
@@ -1307,7 +1307,7 @@ INPUT_PORTS_END
*
*************************************/
-MACHINE_CONFIG_START( impctawp, jpmimpct_state )
+MACHINE_CONFIG_START( impctawp )
MCFG_CPU_ADD("maincpu",M68000, 8000000)
MCFG_CPU_PROGRAM_MAP(awp68k_program_map)
@@ -1745,20 +1745,20 @@ ROM_END
/* Video */
-GAME( 1995, cluedo, 0, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2D)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cluedod, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2D) (Protocol)",MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cluedo2c, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cluedo2, cluedo, jpmimpct, cluedo, driver_device, 0, ROT0, "JPM", "Cluedo (prod. 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, trivialp, 0, jpmimpct, trivialp, driver_device, 0, ROT0, "JPM", "Trivial Pursuit (New Edition) (prod. 1D)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, trivialpd,trivialp,jpmimpct, trivialp, driver_device, 0, ROT0, "JPM", "Trivial Pursuit (New Edition) (prod. 1D) (Protocol)",MACHINE_SUPPORTS_SAVE )
-GAME( 1996, trivialpo,trivialp,jpmimpct, trivialp, driver_device, 0, ROT0, "JPM", "Trivial Pursuit", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, scrabble, 0, jpmimpct, scrabble, driver_device, 0, ROT0, "JPM", "Scrabble (rev. F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, scrabbled,scrabble,jpmimpct, scrabble, driver_device, 0, ROT0, "JPM", "Scrabble (rev. F) (Protocol)",MACHINE_SUPPORTS_SAVE )
-GAME( 1998, hngmnjpm, 0, jpmimpct, hngmnjpm, driver_device, 0, ROT0, "JPM", "Hangman (JPM)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, hngmnjpmd,hngmnjpm,jpmimpct, hngmnjpm, driver_device, 0, ROT0, "JPM", "Hangman (JPM) (Protocol)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, coronatn, 0, jpmimpct, coronatn, driver_device, 0, ROT0, "JPM", "Coronation Street Quiz Game", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, coronatnd,coronatn,jpmimpct, coronatn, driver_device, 0, ROT0, "JPM", "Coronation Street Quiz Game (Protocol)", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, tqst, 0, jpmimpct, cluedo , driver_device, 0, ROT0, "JPM", "Treasure Quest" , MACHINE_NOT_WORKING) // incomplete (ACE?)
-GAME( 199?, snlad, 0, jpmimpct, cluedo , driver_device, 0, ROT0, "JPM", "Snake & Ladders" , MACHINE_NOT_WORKING) // incomplete
-GAME( 199?, buzzundr, 0, jpmimpct, cluedo , driver_device, 0, ROT0, "Ace", "Buzzundrum (Ace)", MACHINE_NOT_WORKING )
-GAME( 199?, monspdr , 0, jpmimpct, cluedo , driver_device, 0, ROT0, "Ace", "Money Spider (Ace)", MACHINE_NOT_WORKING )
+GAME( 1995, cluedo, 0, jpmimpct, cluedo, jpmimpct_state, 0, ROT0, "JPM", "Cluedo (prod. 2D)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cluedod, cluedo, jpmimpct, cluedo, jpmimpct_state, 0, ROT0, "JPM", "Cluedo (prod. 2D) (Protocol)",MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cluedo2c, cluedo, jpmimpct, cluedo, jpmimpct_state, 0, ROT0, "JPM", "Cluedo (prod. 2C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cluedo2, cluedo, jpmimpct, cluedo, jpmimpct_state, 0, ROT0, "JPM", "Cluedo (prod. 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, trivialp, 0, jpmimpct, trivialp, jpmimpct_state, 0, ROT0, "JPM", "Trivial Pursuit (New Edition) (prod. 1D)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, trivialpd,trivialp,jpmimpct, trivialp, jpmimpct_state, 0, ROT0, "JPM", "Trivial Pursuit (New Edition) (prod. 1D) (Protocol)",MACHINE_SUPPORTS_SAVE )
+GAME( 1996, trivialpo,trivialp,jpmimpct, trivialp, jpmimpct_state, 0, ROT0, "JPM", "Trivial Pursuit", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, scrabble, 0, jpmimpct, scrabble, jpmimpct_state, 0, ROT0, "JPM", "Scrabble (rev. F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, scrabbled,scrabble,jpmimpct, scrabble, jpmimpct_state, 0, ROT0, "JPM", "Scrabble (rev. F) (Protocol)",MACHINE_SUPPORTS_SAVE )
+GAME( 1998, hngmnjpm, 0, jpmimpct, hngmnjpm, jpmimpct_state, 0, ROT0, "JPM", "Hangman (JPM)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, hngmnjpmd,hngmnjpm,jpmimpct, hngmnjpm, jpmimpct_state, 0, ROT0, "JPM", "Hangman (JPM) (Protocol)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, coronatn, 0, jpmimpct, coronatn, jpmimpct_state, 0, ROT0, "JPM", "Coronation Street Quiz Game", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, coronatnd,coronatn,jpmimpct, coronatn, jpmimpct_state, 0, ROT0, "JPM", "Coronation Street Quiz Game (Protocol)", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, tqst, 0, jpmimpct, cluedo , jpmimpct_state, 0, ROT0, "JPM", "Treasure Quest" , MACHINE_NOT_WORKING) // incomplete (ACE?)
+GAME( 199?, snlad, 0, jpmimpct, cluedo , jpmimpct_state, 0, ROT0, "JPM", "Snake & Ladders" , MACHINE_NOT_WORKING) // incomplete
+GAME( 199?, buzzundr, 0, jpmimpct, cluedo , jpmimpct_state, 0, ROT0, "Ace", "Buzzundrum (Ace)", MACHINE_NOT_WORKING )
+GAME( 199?, monspdr , 0, jpmimpct, cluedo , jpmimpct_state, 0, ROT0, "Ace", "Money Spider (Ace)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp
index b4d2a2c30b5..1f4609a5223 100644
--- a/src/mame/drivers/jpmmps.cpp
+++ b/src/mame/drivers/jpmmps.cpp
@@ -244,7 +244,7 @@ void jpmmps_state::machine_reset()
static_cast<tms9995_device*>(machine().device("maincpu"))->ready_line(ASSERT_LINE);
}
-static MACHINE_CONFIG_START( jpmmps, jpmmps_state )
+static MACHINE_CONFIG_START( jpmmps )
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CLOCK, jpmmps_map, jpmmps_io_map)
@@ -2111,211 +2111,211 @@ ROM_END
-GAMEL(198?, j2adnote ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnotea,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnoteb,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnotec,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnoted,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnotee,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnotef,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnoteg,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnoteh,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2adnotei,j2adnote ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 10)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
-GAMEL(198?, j2bankch ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Bank Chase (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2bankch )
-GAME(198?, j2bankrd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Bank Raid (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2bigbnk ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Big Banker (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2bigbnk )
-GAMEL(198?, j2bigbox ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Big Box (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2bigbox )
-GAME(198?, j2bigbuk ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Big Buck$ (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2bigdl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Big Deal (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2blkchy ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Black Cherry (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2cashbn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Bonus Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashbn )
-GAME(198?, j2cashfl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Falls (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2cashrl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Reels (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashrl )
-GAMEL(198?, j2cashrv ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Reserve (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashrv )
-GAMEL(198?, j2cashro ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Rolls (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashro )
-GAMEL(198?, j2cashtk ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Track (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashtk )
-GAME(198?, j2cashtd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Track Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2coppot ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Copper Pot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2coppot )
-GAME(198?, j2coprun ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Copper Run (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2cprndx ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Copper Run Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cprndx )
-GAME(198?, j2crkbnk ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Crack The Bank (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2droplt ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Drop The Lot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2droplt )
-GAME(198?, j2dropld ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Drop The Lot Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2ewn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Each Way Nudger (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2ewn )
-GAMEL(198?, j2ews ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Each Way Shuffle (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2ews )
-GAMEL(198?, j2exec ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Executive Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2exec )
-GAMEL(198?, j2fasttk ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Fast Trak (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fasttk )
-GAMEL(198?, j2fqueen ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Find The Queen (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fqueen )
-GAMEL(198?, j2fiveal ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Five Alive (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fiveal )
-GAMEL(198?, j2fiveln ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Five Liner (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fiveln )
-GAMEL(198?, j2fws ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Five Way Shuffle (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fws )
-GAMEL(198?, j2fwsa ,j2fws ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Five Way Shuffle (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fws )
-GAME(198?, j2frmtch ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Fruit Match (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2fullhs ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Full House Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fullhs )
-GAMEL(198?, j2ghostb ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Ghostbuster (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2ghostb )
-GAME(198?, j2goldrn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Gold Run (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2goldbr ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Golden Bars (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2goldbr )
-GAMEL(198?, j2gldchy ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Golden Cherry (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2gldchy )
-GAME(198?, j2gldwin ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Golden Win (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2hinote ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Hi Note (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hinote )
-GAMEL(198?, j2hiroll ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Hi Roller (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hiroll )
-GAMEL(198?, j2hotpot ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Hot Pot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hotpot )
-GAME(198?, j2hotptd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Hot Pot Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2hotsht ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Hot Shot Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hotsht )
-GAMEL(198?, j2hypnot ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Hypernote (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hypnot )
-GAMEL(198?, j2jackbr ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Jackpot Bars (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2jackbr )
-GAME(198?, j2jackdc ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Jackpot Dice (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2jokers ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Jokers (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2kingcl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","King Of Clubs (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2kingcl )
-GAMEL(198?, j2litean ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Lite A Nudge (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2litean )
-GAMEL(198?, j2lovsht ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Loot Shoot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2lovsht )
-GAMEL(198?, j2lovshd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Loot Shoot Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2lovshd )
-GAMEL(198?, j2luckar ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Lucky Arrows (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2luckar )
-GAMEL(198?, j2lucky2 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Lucky 2s (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2lucky2 )
-GAMEL(198?, j2monblt ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Money Belt (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2monblt )
-GAMEL(198?, j2mongam ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Money Game (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2mongam )
-GAME(198?, j2mongmd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Money Game Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2multwn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Multi Win (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2notexc ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Note Exchange (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2notexca,j2notexc ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Note Exchange (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2notexcb,j2notexc ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Note Exchange (Set 3) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2notesh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Note Shoot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2notesh )
-GAMEL(198?, j2nudbnz ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Bonanza Deluxe (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudbnz )
-GAME(198?, j2nudbnza,j2nudbnz ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Bonanza Deluxe (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nuddup ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Double Up (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nuddud ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Double Up Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nudup3 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Double Up MkIII (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2nudshf ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Shuffler (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudshf )
-GAME(198?, j2plsmon ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Plus Money (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2plsmnd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Plus Money Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2plsmnd )
-GAMEL(198?, j2plsnud ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Plus Nudge (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2plsnud )
-GAME(198?, j2potlck ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Pot Luck (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2pndrsh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Pound Rush (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2pndrsh )
-GAME(198?, j2pyramd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Pyramid (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2reelbn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Bingo Club (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelbn )
-GAMEL(198?, j2reelbna,j2reelbn ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Bingo Club (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelbn )
-GAMEL(198?, j2reelbo ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Bonus (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelbo )
-GAME(198?, j2reelmg ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Magic (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2reelmgd,j2reelmg ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Magic (JPM) [Dutch] (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2reelmc ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Magic Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelmc )
-GAMEL(198?, j2reelmo ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Money (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelmo )
-GAME(198?, j2rotnot ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Rota Note (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2roulcl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Roulette Club (JPM) [Mps] (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2rdclb ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Royal Deal Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2rdclb )
-GAMEL(198?, j2slvrgh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Silver Ghost (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2slvrgh )
-GAMEL(198?, j2sldgld ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Solid Gold (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2sldgld )
-GAMEL(198?, j2spcrsv ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Special Reserve (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2spcrsv )
-GAMEL(198?, j2stahed ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Streets Ahead (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2stahed )
-GAME(198?, j2supfrt ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supa Fruit (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2supfrc ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supa Fruit Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2supfrc )
-GAMEL(1987, j2supsft ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supashifta (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2supsft )
-GAMEL(198?, j2supstp ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supa Steppa (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2supstp )
-GAMEL(198?, j2suptrk ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supa Track (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2suptrk )
-GAME(198?, j2suprft ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Super Fruit (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2supln ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Super Line (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2suppot ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Super Pots (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2suprl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Super Reel (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2suprsh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supershot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2suprsh )
-GAME(198?, j2supstr ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Superstars (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2swbank ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Switch Back (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2swbank )
-GAMEL(198?, j2take2 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Take 2 (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2take2 )
-GAME(198?, j2topsht ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Top Shot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2westrn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Western (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-
-GAMEL(198?, j2blustr ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Blue Streak (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2blustr )
-GAMEL(198?, j2cshalm ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Cash Alarm (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshalm )
-GAMEL(198?, j2cshcrd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Cash Cards (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshcrd )
-GAMEL(198?, j2cshfil ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Cash-Filla (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshfil )
-GAMEL(198?, j2cshsmh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Cash Smash (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshsmh )
-GAMEL(198?, j2criscr ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Criss Cross Jackpot (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2criscr )
-GAMEL(198?, j2frucnx ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Fruit Connexion (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2frucnx )
-GAMEL(198?, j2hitmon ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Hit Money (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hitmon )
-GAMEL(198?, j2penny ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","In For A Penny In For A Pound (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2penny )
-GAMEL(198?, j2maxima ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Maxima (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2maxima )
-GAMEL(198?, j2montrp ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Money Trapper (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2montrp )
-GAMEL(198?, j2nudmon ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Nudge Money (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudmon )
-GAMEL(198?, j2paypkt ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Pay Packet (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2paypkt )
-GAMEL(198?, j2silvcl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Silver Classic (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2silvcl )
-GAMEL(198?, j2silvsh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Silver Shot (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2silvsh )
-GAMEL(198?, j2sstrea ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Supa Streak (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2sstrea )
-GAMEL(198?, j2tstplt ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Test Pilot (Set 1) (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2tstplt )
-GAMEL(198?, j2tstplta,j2tstplt ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Test Pilot (Set 2) (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2tstplt )
-
-GAME(198?, j2bonanz ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Eurocoin","Bonanza (Eurocoin) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2supchy ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Eurocoin","Super Cherry (Eurocoin) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-GAMEL(198?, j2hilocl ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Crystal","Hi Lo Climber Club (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hilocl )
-GAMEL(198?, j2litnot ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Crystal","Lite A Note Club (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2litnot )
-GAMEL(198?, j2missis ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Crystal","Mississippi Gambler Club (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2missis )
-
-GAMEL(198?, j2always ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Always Eight (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2always )
-GAMEL(198?, j2coinsh ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Coin Shoot (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2coinsh )
-GAMEL(198?, j2nudfev ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Nudge Fever (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudfev )
-GAMEL(198?, j2trail ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Trailblazer (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2trail )
-GAME(198?, j2wag ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Win-A-Gain (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-GAMEL(198?, j2cshnud ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Mdm","Cash Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshnud )
-GAME(198?, j2fivepn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Mdm","Fivepenny Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2nolimt ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Mdm","No Limit Nudge (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nolimt )
-
-GAME(198?, j2strk10 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Ace?","Strike Ten (Ace) (MPS)", MACHINE_IS_SKELETON_MECHANICAL ) // there was another (68k based) game in this set, which makes me wonder if this one is by Ace at all
-
-
-
-
-GAME(198?, j2bkroll ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Bank Roll (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2bodym ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Body Match (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2cvault ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cash Vault (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cvault )
-GAME(198?, j2cashab ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Cashablanca (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2cashry ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Cashino Royale (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2casino ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Casino Classic (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2coinct ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Coin Count (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2loots ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","Loot Shoot (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2match ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Match It (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2monbnd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Money Bands (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2monmtx ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Money Matrix (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2tst ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","MPS 1 Test Rom (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nudnud ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Nudge (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2pinac ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Pinnacle (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2pinclb ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Pinnacle Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2reelcz ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Crazy (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelcz )
-GAME(198?, j2reeldc ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Reel Deal Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2topcd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Top Card (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2xxx ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","Triple X (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2tupnud ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Tuppenny Nudger (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2wrb ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Wild Reel Bingo (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2ncsp ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","unknown 'ncsp0pp' (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nrrp ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Bwb","unknown 'nprpopp' (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nsc15 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","unknown 'nsc15' (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nsw12 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Pcp","unknown 'nsw12' (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-GAME(198?, j2club77 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Club 77 (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2contnd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Mdm","Continuous Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL(198?, j2crown ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Crown Dealer (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2crown )
-GAME(198?, j2hirola ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Hi Roll (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2monmin ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Money Mine (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2notspn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Note Spinner (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2super7 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Super 7's (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2sex ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Super Exchanger (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2sng ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Cotswold Microsystems","Super Nudge Gambler (Cotswold Microsystems) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2tupnd ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Mdm","Tuppenny Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2008 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","unknown '008' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2chsn ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","unknown 'chsnsn05' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2lhs ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","unknown 'lhs' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nn2 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","unknown 'nn_2' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2rm941 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","unknown 'rm941' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2pharo ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Pharoah (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-GAME(198?, j2nud5p ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","5p Nudger (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2b7 ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Bar 7? (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2ss ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Supa Stepper (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2nbz ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Nudge Bonanza (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-GAME(198?, j2clbbin ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "Crystal?","Club Bingo (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-
-GAME(198?, j2sirich ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Strike It Rich (JPM) (MPS) (set 1)", MACHINE_IS_SKELETON_MECHANICAL ) // I don't think this is MayGay, it was just in a MayGay set with some actual MayGay roms
-GAME(198?, j2siricha,j2sirich ,jpmmps,jpmmps, driver_device, 0,ROT0, "JPM","Strike It Rich (JPM) (MPS) (set 2)", MACHINE_IS_SKELETON_MECHANICAL ) // I don't think this is MayGay, it was just in a MayGay set with some actual MayGay roms
-
-GAME(198?, j2hcash ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Hot Cash (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j2sset ,0 ,jpmmps,jpmmps, driver_device, 0,ROT0, "<unknown>","Sunset Strip (v2.0) (Unk) (MPS?)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2adnote ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnotea,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnoteb,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnotec,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnoted,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnotee,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnotef,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnoteg,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnoteh,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2adnotei,j2adnote ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Add A Note (JPM) (MPS, set 10)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2adnote )
+GAMEL(198?, j2bankch ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Bank Chase (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2bankch )
+GAME (198?, j2bankrd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Bank Raid (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2bigbnk ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Big Banker (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2bigbnk )
+GAMEL(198?, j2bigbox ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Big Box (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2bigbox )
+GAME (198?, j2bigbuk ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Big Buck$ (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2bigdl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Big Deal (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2blkchy ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Black Cherry (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2cashbn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Bonus Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashbn )
+GAME (198?, j2cashfl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Falls (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2cashrl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Reels (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashrl )
+GAMEL(198?, j2cashrv ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Reserve (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashrv )
+GAMEL(198?, j2cashro ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Rolls (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashro )
+GAMEL(198?, j2cashtk ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Track (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cashtk )
+GAME (198?, j2cashtd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Track Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2coppot ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Copper Pot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2coppot )
+GAME (198?, j2coprun ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Copper Run (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2cprndx ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Copper Run Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cprndx )
+GAME (198?, j2crkbnk ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Crack The Bank (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2droplt ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Drop The Lot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2droplt )
+GAME (198?, j2dropld ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Drop The Lot Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2ewn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Each Way Nudger (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2ewn )
+GAMEL(198?, j2ews ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Each Way Shuffle (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2ews )
+GAMEL(198?, j2exec ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Executive Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2exec )
+GAMEL(198?, j2fasttk ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Fast Trak (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fasttk )
+GAMEL(198?, j2fqueen ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Find The Queen (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fqueen )
+GAMEL(198?, j2fiveal ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Five Alive (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fiveal )
+GAMEL(198?, j2fiveln ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Five Liner (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fiveln )
+GAMEL(198?, j2fws ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Five Way Shuffle (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fws )
+GAMEL(198?, j2fwsa ,j2fws ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Five Way Shuffle (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fws )
+GAME (198?, j2frmtch ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Fruit Match (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2fullhs ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Full House Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2fullhs )
+GAMEL(198?, j2ghostb ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Ghostbuster (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2ghostb )
+GAME (198?, j2goldrn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Gold Run (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2goldbr ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Golden Bars (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2goldbr )
+GAMEL(198?, j2gldchy ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Golden Cherry (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2gldchy )
+GAME (198?, j2gldwin ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Golden Win (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2hinote ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Hi Note (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hinote )
+GAMEL(198?, j2hiroll ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Hi Roller (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hiroll )
+GAMEL(198?, j2hotpot ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Hot Pot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hotpot )
+GAME (198?, j2hotptd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Hot Pot Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2hotsht ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Hot Shot Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hotsht )
+GAMEL(198?, j2hypnot ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Hypernote (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hypnot )
+GAMEL(198?, j2jackbr ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Jackpot Bars (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2jackbr )
+GAME (198?, j2jackdc ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Jackpot Dice (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2jokers ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Jokers (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2kingcl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","King Of Clubs (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2kingcl )
+GAMEL(198?, j2litean ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Lite A Nudge (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2litean )
+GAMEL(198?, j2lovsht ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Loot Shoot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2lovsht )
+GAMEL(198?, j2lovshd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Loot Shoot Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2lovshd )
+GAMEL(198?, j2luckar ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Lucky Arrows (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2luckar )
+GAMEL(198?, j2lucky2 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Lucky 2s (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2lucky2 )
+GAMEL(198?, j2monblt ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Money Belt (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2monblt )
+GAMEL(198?, j2mongam ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Money Game (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2mongam )
+GAME (198?, j2mongmd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Money Game Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2multwn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Multi Win (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2notexc ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Note Exchange (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2notexca,j2notexc ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Note Exchange (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2notexcb,j2notexc ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Note Exchange (Set 3) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2notesh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Note Shoot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2notesh )
+GAMEL(198?, j2nudbnz ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Bonanza Deluxe (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudbnz )
+GAME (198?, j2nudbnza,j2nudbnz ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Bonanza Deluxe (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nuddup ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Double Up (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nuddud ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Double Up Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nudup3 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Double Up MkIII (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2nudshf ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Shuffler (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudshf )
+GAME (198?, j2plsmon ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Plus Money (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2plsmnd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Plus Money Deluxe (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2plsmnd )
+GAMEL(198?, j2plsnud ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Plus Nudge (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2plsnud )
+GAME (198?, j2potlck ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Pot Luck (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2pndrsh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Pound Rush (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2pndrsh )
+GAME (198?, j2pyramd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Pyramid (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2reelbn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Bingo Club (Set 1) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelbn )
+GAMEL(198?, j2reelbna,j2reelbn ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Bingo Club (Set 2) (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelbn )
+GAMEL(198?, j2reelbo ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Bonus (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelbo )
+GAME (198?, j2reelmg ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Magic (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2reelmgd,j2reelmg ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Magic (JPM) [Dutch] (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2reelmc ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Magic Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelmc )
+GAMEL(198?, j2reelmo ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Money (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelmo )
+GAME (198?, j2rotnot ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Rota Note (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2roulcl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Roulette Club (JPM) [Mps] (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2rdclb ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Royal Deal Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2rdclb )
+GAMEL(198?, j2slvrgh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Silver Ghost (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2slvrgh )
+GAMEL(198?, j2sldgld ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Solid Gold (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2sldgld )
+GAMEL(198?, j2spcrsv ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Special Reserve (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2spcrsv )
+GAMEL(198?, j2stahed ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Streets Ahead (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2stahed )
+GAME (198?, j2supfrt ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supa Fruit (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2supfrc ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supa Fruit Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2supfrc )
+GAMEL(1987, j2supsft ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supashifta (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2supsft )
+GAMEL(198?, j2supstp ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supa Steppa (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2supstp )
+GAMEL(198?, j2suptrk ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supa Track (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2suptrk )
+GAME (198?, j2suprft ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Super Fruit (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2supln ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Super Line (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2suppot ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Super Pots (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2suprl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Super Reel (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2suprsh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supershot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2suprsh )
+GAME (198?, j2supstr ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Superstars (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2swbank ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Switch Back (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2swbank )
+GAMEL(198?, j2take2 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Take 2 (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2take2 )
+GAME (198?, j2topsht ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Top Shot (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2westrn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Western (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+
+GAMEL(198?, j2blustr ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Blue Streak (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2blustr )
+GAMEL(198?, j2cshalm ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Cash Alarm (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshalm )
+GAMEL(198?, j2cshcrd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Cash Cards (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshcrd )
+GAMEL(198?, j2cshfil ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Cash-Filla (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshfil )
+GAMEL(198?, j2cshsmh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Cash Smash (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshsmh )
+GAMEL(198?, j2criscr ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Criss Cross Jackpot (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2criscr )
+GAMEL(198?, j2frucnx ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Fruit Connexion (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2frucnx )
+GAMEL(198?, j2hitmon ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Hit Money (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hitmon )
+GAMEL(198?, j2penny ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","In For A Penny In For A Pound (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2penny )
+GAMEL(198?, j2maxima ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Maxima (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2maxima )
+GAMEL(198?, j2montrp ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Money Trapper (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2montrp )
+GAMEL(198?, j2nudmon ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Nudge Money (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudmon )
+GAMEL(198?, j2paypkt ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Pay Packet (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2paypkt )
+GAMEL(198?, j2silvcl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Silver Classic (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2silvcl )
+GAMEL(198?, j2silvsh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Silver Shot (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2silvsh )
+GAMEL(198?, j2sstrea ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Supa Streak (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2sstrea )
+GAMEL(198?, j2tstplt ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Test Pilot (Set 1) (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2tstplt )
+GAMEL(198?, j2tstplta,j2tstplt ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Test Pilot (Set 2) (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2tstplt )
+
+GAME (198?, j2bonanz ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Eurocoin","Bonanza (Eurocoin) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2supchy ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Eurocoin","Super Cherry (Eurocoin) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+GAMEL(198?, j2hilocl ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Crystal","Hi Lo Climber Club (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2hilocl )
+GAMEL(198?, j2litnot ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Crystal","Lite A Note Club (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2litnot )
+GAMEL(198?, j2missis ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Crystal","Mississippi Gambler Club (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2missis )
+
+GAMEL(198?, j2always ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Always Eight (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2always )
+GAMEL(198?, j2coinsh ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Coin Shoot (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2coinsh )
+GAMEL(198?, j2nudfev ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Nudge Fever (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nudfev )
+GAMEL(198?, j2trail ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Trailblazer (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2trail )
+GAME (198?, j2wag ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Win-A-Gain (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+GAMEL(198?, j2cshnud ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Mdm","Cash Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cshnud )
+GAME (198?, j2fivepn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Mdm","Fivepenny Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2nolimt ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Mdm","No Limit Nudge (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2nolimt )
+
+GAME (198?, j2strk10 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Ace?","Strike Ten (Ace) (MPS)", MACHINE_IS_SKELETON_MECHANICAL ) // there was another (68k based) game in this set, which makes me wonder if this one is by Ace at all
+
+
+
+
+GAME (198?, j2bkroll ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Bank Roll (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2bodym ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Body Match (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2cvault ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cash Vault (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2cvault )
+GAME (198?, j2cashab ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Cashablanca (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2cashry ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Cashino Royale (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2casino ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Casino Classic (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2coinct ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Coin Count (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2loots ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","Loot Shoot (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2match ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Match It (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2monbnd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Money Bands (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2monmtx ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Money Matrix (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2tst ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","MPS 1 Test Rom (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nudnud ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Nudge (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2pinac ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Pinnacle (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2pinclb ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Pinnacle Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2reelcz ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Crazy (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2reelcz )
+GAME (198?, j2reeldc ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Reel Deal Club (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2topcd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Top Card (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2xxx ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","Triple X (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2tupnud ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Tuppenny Nudger (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2wrb ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Wild Reel Bingo (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2ncsp ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","unknown 'ncsp0pp' (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nrrp ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Bwb","unknown 'nprpopp' (Bwb) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nsc15 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","unknown 'nsc15' (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nsw12 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Pcp","unknown 'nsw12' (Pcp) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+GAME (198?, j2club77 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Club 77 (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2contnd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Mdm","Continuous Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAMEL(198?, j2crown ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Crown Dealer (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL, layout_j2crown )
+GAME (198?, j2hirola ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Hi Roll (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2monmin ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Money Mine (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2notspn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Note Spinner (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2super7 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Super 7's (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2sex ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Super Exchanger (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2sng ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Cotswold Microsystems","Super Nudge Gambler (Cotswold Microsystems) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2tupnd ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Mdm","Tuppenny Nudger (Mdm) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2008 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","unknown '008' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2chsn ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","unknown 'chsnsn05' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2lhs ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","unknown 'lhs' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nn2 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","unknown 'nn_2' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2rm941 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","unknown 'rm941' (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2pharo ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Pharoah (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+GAME (198?, j2nud5p ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","5p Nudger (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2b7 ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Bar 7? (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2ss ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Supa Stepper (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2nbz ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Nudge Bonanza (JPM) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+GAME (198?, j2clbbin ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "Crystal?","Club Bingo (Crystal) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+
+GAME (198?, j2sirich ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Strike It Rich (JPM) (MPS) (set 1)", MACHINE_IS_SKELETON_MECHANICAL ) // I don't think this is MayGay, it was just in a MayGay set with some actual MayGay roms
+GAME (198?, j2siricha,j2sirich ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "JPM","Strike It Rich (JPM) (MPS) (set 2)", MACHINE_IS_SKELETON_MECHANICAL ) // I don't think this is MayGay, it was just in a MayGay set with some actual MayGay roms
+
+GAME (198?, j2hcash ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Hot Cash (Unk) (MPS)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j2sset ,0 ,jpmmps,jpmmps, jpmmps_state, 0,ROT0, "<unknown>","Sunset Strip (v2.0) (Unk) (MPS?)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp
index df240e73caa..43968eccf46 100644
--- a/src/mame/drivers/jpms80.cpp
+++ b/src/mame/drivers/jpms80.cpp
@@ -95,7 +95,7 @@ void jpms80_state::machine_reset()
static_cast<tms9995_device*>(machine().device("maincpu"))->ready_line(ASSERT_LINE);
}
-static MACHINE_CONFIG_START( jpms80, jpms80_state )
+static MACHINE_CONFIG_START( jpms80 )
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CLOCK, jpms80_map, jpms80_io_map)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -306,7 +306,7 @@ ROM_END
GAMEL(198?, j80bac ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Bank A Coin (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80bac )
GAMEL(198?, j80bounc ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Bouncer (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80bounc )
GAMEL(198?, j80frogh ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Frog Hop (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80frogh )
-GAME(198?, j80fruit ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Fruit Snappa (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80fruit ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Fruit Snappa (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
GAMEL(198?, j80golds ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Golden Steppa (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80golds )
GAMEL(198?, j80hotln ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Hot Lines (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80hotln )
GAMEL(198?, j80myspn ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Mystery Spin (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80myspn )
@@ -316,16 +316,16 @@ GAMEL(198?, j80rra ,j80rr ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JP
GAMEL(198?, j80supst ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Supa Steppa (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80supst )
GAMEL(198?, j80supbk ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Superbank (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80supbk )
GAMEL(198?, j80topsp ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top Sprint (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80topsp )
-GAME(198?, j80topup ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top Up (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j80tumbl ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Tumble (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80topup ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Top Up (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80tumbl ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Tumble (JPM) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
GAMEL(198?, j80wsprt, 0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V4, 5x20p) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80wsprt2 )
GAMEL(198?, j80wsprt3, j80wsprt ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V3, 50p, 5 credits) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80wsprt2 )
GAMEL(198?, j80wsprt2,j80wsprt ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Winsprint (JPM) (V2, 10x10p) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL, layout_j80wsprt2 )
-GAME(198?, j80blbnk ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "PCP","Blankity Bank (PCP) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80blbnk ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "PCP","Blankity Bank (PCP) (SYSTEM80)", MACHINE_IS_SKELETON_MECHANICAL )
// these look like they're probably SYSTEM80, not 100% sure tho
-GAME(198?, j80alad ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Aladdin's Cave (PCP)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j80fortr ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Fortune Trail (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j80mster ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Masterspy (Pcp)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j80plsnd ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Plus Nudge (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80alad ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Aladdin's Cave (PCP)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80fortr ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Fortune Trail (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80mster ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Masterspy (Pcp)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (198?, j80plsnd ,0 ,jpms80,jpms80, jpms80_state,jpms80,ROT0, "JPM","Plus Nudge (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/jpmsru.cpp b/src/mame/drivers/jpmsru.cpp
index 98a3a895991..b64a708524a 100644
--- a/src/mame/drivers/jpmsru.cpp
+++ b/src/mame/drivers/jpmsru.cpp
@@ -63,11 +63,11 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( jpmsru )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( jpmsru, jpmsru_state )
+static MACHINE_CONFIG_START( jpmsru )
MCFG_TMS99xx_ADD("maincpu", TMS9980A, MAIN_CLOCK, jpmsru_map, jpmsru_io)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jpmsru_4, jpmsru_state )
+static MACHINE_CONFIG_START( jpmsru_4 )
MCFG_TMS99xx_ADD("maincpu", TMS9980A, MAIN_CLOCK, jpmsru_4_map, jpmsru_io)
MACHINE_CONFIG_END
@@ -164,22 +164,22 @@ ROM_START( j_unk )
ROM_LOAD( "sruunk1.p3", 0x0800, 0x000400, CRC(25138e03) SHA1(644fc6144ea74f08dc892f106ad494ba364afe86) )
ROM_END
-GAME(198?, j_ewnud ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Nudger (Barcrest?, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_ewnda ,j_ewnud ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Nudger (Barcrest?, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_ewnd20 ,j_ewnud ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Nudger (Barcrest?, set 3, version 20?)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_ews ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Shifter (Barcrest?, set 1, version 16)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_ews8a ,j_ews ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Shifter (Barcrest?, set 2, version 8a)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_ewnud ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Nudger (Barcrest?, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_ewnda ,j_ewnud ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Nudger (Barcrest?, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_ewnd20 ,j_ewnud ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Nudger (Barcrest?, set 3, version 20?)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_ews ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Shifter (Barcrest?, set 1, version 16)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_ews8a ,j_ews ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "Barcrest?","Each Way Shifter (Barcrest?, set 2, version 8a)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_luckac ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "<unknown>","Lucky Aces (Unk)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_super2 ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Super 2 (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_luckac ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "<unknown>","Lucky Aces (Unk)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_super2 ,0 ,jpmsru,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Super 2 (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_luck2 ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "<unknown>","Lucky Twos?", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_luck2 ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "<unknown>","Lucky Twos?", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_nuddup ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Nudge Double Up (JPM SRU, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_nuddup ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Nudge Double Up (JPM SRU, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_nuddup2,j_nuddup ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Nudge Double Up (JPM SRU, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_nuddup2,j_nuddup ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Nudge Double Up (JPM SRU, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(198?, j_unk ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM?","unknown SRU Game (JPM?)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_unk ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM?","unknown SRU Game (JPM?)", MACHINE_IS_SKELETON_MECHANICAL )
// this one is different again?
-GAME(198?, j_plus2 ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Plus 2 (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(198?, j_plus2 ,0 ,jpmsru_4,jpmsru, jpmsru_state,jpmsru,ROT0, "JPM","Plus 2 (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp
index fb807e877a5..07186fe79f0 100644
--- a/src/mame/drivers/jpmsys5.cpp
+++ b/src/mame/drivers/jpmsys5.cpp
@@ -619,7 +619,7 @@ MACHINE_RESET_MEMBER(jpmsys5_state,jpmsys5v)
*
*************************************/
-static MACHINE_CONFIG_START( jpmsys5v, jpmsys5_state )
+static MACHINE_CONFIG_START( jpmsys5v )
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(68000_map)
@@ -835,7 +835,7 @@ MACHINE_RESET_MEMBER(jpmsys5_state,jpmsys5)
*************************************/
// later (incompatible with earlier revision) motherboards used a YM2413
-MACHINE_CONFIG_START( jpmsys5_ym, jpmsys5_state )
+MACHINE_CONFIG_START( jpmsys5_ym )
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(68000_awp_map)
@@ -889,7 +889,7 @@ MACHINE_CONFIG_START( jpmsys5_ym, jpmsys5_state )
MACHINE_CONFIG_END
// the first rev PCB used an SAA1099
-MACHINE_CONFIG_START( jpmsys5, jpmsys5_state )
+MACHINE_CONFIG_START( jpmsys5 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(68000_awp_map_saa)
@@ -1039,8 +1039,8 @@ ROM_END
/* Video based titles */
-GAME( 1994, monopoly , 0 , jpmsys5v, monopoly, driver_device, 0, ROT0, "JPM", "Monopoly (JPM) (SYSTEM5 VIDEO, set 1)", 0 )
-GAME( 1994, monopolya , monopoly , jpmsys5v, monopoly, driver_device, 0, ROT0, "JPM", "Monopoly (JPM) (SYSTEM5 VIDEO, set 2)", 0 )
-GAME( 1995, monoplcl , monopoly , jpmsys5v, monopoly, driver_device, 0, ROT0, "JPM", "Monopoly Classic (JPM) (SYSTEM5 VIDEO)", 0 )
-GAME( 1995, monopldx , 0 , jpmsys5v, monopoly, driver_device, 0, ROT0, "JPM", "Monopoly Deluxe (JPM) (SYSTEM5 VIDEO)", 0 )
-GAME( 199?, cashcade , 0 , jpmsys5v, monopoly, driver_device, 0, ROT0, "JPM", "Cashcade (JPM) (SYSTEM5 VIDEO)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // shows a loading error.. is the set incomplete?
+GAME( 1994, monopoly , 0 , jpmsys5v, monopoly, jpmsys5_state, 0, ROT0, "JPM", "Monopoly (JPM) (SYSTEM5 VIDEO, set 1)", 0 )
+GAME( 1994, monopolya , monopoly , jpmsys5v, monopoly, jpmsys5_state, 0, ROT0, "JPM", "Monopoly (JPM) (SYSTEM5 VIDEO, set 2)", 0 )
+GAME( 1995, monoplcl , monopoly , jpmsys5v, monopoly, jpmsys5_state, 0, ROT0, "JPM", "Monopoly Classic (JPM) (SYSTEM5 VIDEO)", 0 )
+GAME( 1995, monopldx , 0 , jpmsys5v, monopoly, jpmsys5_state, 0, ROT0, "JPM", "Monopoly Deluxe (JPM) (SYSTEM5 VIDEO)", 0 )
+GAME( 199?, cashcade , 0 , jpmsys5v, monopoly, jpmsys5_state, 0, ROT0, "JPM", "Cashcade (JPM) (SYSTEM5 VIDEO)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // shows a loading error.. is the set incomplete?
diff --git a/src/mame/drivers/jpmsys5sw.cpp b/src/mame/drivers/jpmsys5sw.cpp
index 14d0f3bf66f..f1ff1c6c530 100644
--- a/src/mame/drivers/jpmsys5sw.cpp
+++ b/src/mame/drivers/jpmsys5sw.cpp
@@ -1410,228 +1410,228 @@ ROM_END
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL|MACHINE_NO_SOUND|MACHINE_CLICKABLE_ARTWORK
-GAME( 199?, j5tstal , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "JPM System 5 Alpha Display Test Utility (JPM) (SYSTEM5)", GAME_FLAGS )
-GAME( 199?, j5tst1 , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5tst2 , j5tst1 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5tstal , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "JPM System 5 Alpha Display Test Utility (JPM) (SYSTEM5)", GAME_FLAGS )
+GAME( 199?, j5tst1 , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5tst2 , j5tst1 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "JPM System 5 Test Set (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
/* SAA based board */
-GAME( 199?, j5fifth , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "5th Avenue (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5fifth , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "5th Avenue (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5clbnud , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS )
-GAME( 199?, j5clbnuda , j5clbnud , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS )
+GAME( 199?, j5clbnud , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS )
+GAME( 199?, j5clbnuda , j5clbnud , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Club Nudger (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS )
-GAMEL( 199?, j5firebl , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS, layout_j5firebl )
-GAMEL( 199?, j5firebla , j5firebl , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS, layout_j5firebl )
-GAMEL( 199?, j5fireblb , j5firebl , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 3)", GAME_FLAGS, layout_j5firebl )
+GAMEL( 199?, j5firebl , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 1)", GAME_FLAGS, layout_j5firebl )
+GAMEL( 199?, j5firebla , j5firebl , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 2)", GAME_FLAGS, layout_j5firebl )
+GAMEL( 199?, j5fireblb , j5firebl , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fireball (JPM) (SYSTEM5-SAA, set 3)", GAME_FLAGS, layout_j5firebl )
-GAME( 199?, j5frmag , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Fruit Magic (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5frmag , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fruit Magic (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5goldbr , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Golden Bars (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5goldbr , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Golden Bars (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5reelgh , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Reel Ghost (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5reelgh , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Reel Ghost (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAME( 199?, j5sup4 , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Super 4 (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5sup4 , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super 4 (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
-GAMEL( 199?, j5suphi , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Super Hi-Lo (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5suphi )
+GAMEL( 199?, j5suphi , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super Hi-Lo (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5suphi )
-GAMEL( 199?, j5swop , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Swop A Fruit Club (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5swop )
+GAMEL( 199?, j5swop , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Swop A Fruit Club (JPM) (SYSTEM5-SAA)", GAME_FLAGS, layout_j5swop )
-GAME( 199?, j5td , 0 , jpmsys5, popeye, driver_device, 0, ROT0, "JPM", "Tumbling Dice (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
+GAME( 199?, j5td , 0 , jpmsys5, popeye, jpmsys5_state, 0, ROT0, "JPM", "Tumbling Dice (JPM) (SYSTEM5-SAA)", GAME_FLAGS )
/* YM based board */
-GAME( 199?, j5ar80 , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // This was also listed as by 'Crystal'. There was Crystal ROM in the set, but it wasn't an JPM SYS5 rom...
-GAME( 199?, j5ar80a , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5ar80b , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5ar80c , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5ar80d , j5ar80 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-
-GAMEL( 199?, j5ar80cl , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ar80cla )
-GAMEL( 199?, j5ar80cla , j5ar80cl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ar80cla )
-GAMEL( 199?, j5ar80clb , j5ar80cl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ar80cla )
-GAMEL( 199?, j5ar80clc , j5ar80cl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5ar80cla )
-
-GAME( 199?, j5buc , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Buccaneer (JPM) (SYSTEM5)", GAME_FLAGS )
-
-GAMEL( 199?, j5cir , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cira , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cirb , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5circ , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cird , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5cira )
-GAMEL( 199?, j5cire , j5cir , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5cira )
-
-
-GAME( 199?, j5daytn , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5daytna , j5daytn , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-GAME( 199?, j5daycls , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5dayclsa , j5daycls , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-GAME( 199?, j5dirty , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5dirtya , j5dirty , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5dirtyb , j5dirty , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5dirtyc , j5dirty , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-
-GAME( 199?, j5fairgd , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // or just 'Fairground' ?
-GAME( 199?, j5fairgda , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5fairgdb , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5fairgdc , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5fairgdd , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5fairgde , j5fairgd , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-
-GAMEL( 199?, j5fair , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5faira , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairb , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairc , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5faird , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5faire , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairf , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairg , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairh , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairi , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairj , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 11)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairk , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 12)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairl , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 13)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairm , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 14)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairn , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 15)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairo , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 16)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairp , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 17)", GAME_FLAGS, layout_j5fairp )
-GAMEL( 199?, j5fairq , j5fair , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 18)", GAME_FLAGS, layout_j5fairp )
-
-GAME( 199?, j5filth , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5filtha , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5filthb , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5filthc , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5filthd , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5filthe , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-GAME( 199?, j5filthf , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
-GAME( 199?, j5filthg , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
-GAME( 199?, j5filthh , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
-GAME( 199?, j5filthi , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
-GAME( 199?, j5filthj , j5filth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
-
-
-GAME( 199?, j5hagar , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5hagara , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5hagarb , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5hagarc , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5hagard , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5hagare , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-GAME( 199?, j5hagarf , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
-GAME( 199?, j5hagarg , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
-GAME( 199?, j5hagarh , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
-GAME( 199?, j5hagari , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
-GAME( 199?, j5hagarj , j5hagar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
-
-GAME( 199?, j5hagsho , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5hagshoa , j5hagsho , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5hagshob , j5hagsho , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5hagshoc , j5hagsho , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5ar80 , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // This was also listed as by 'Crystal'. There was Crystal ROM in the set, but it wasn't an JPM SYS5 rom...
+GAME( 199?, j5ar80a , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5ar80b , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5ar80c , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5ar80d , j5ar80 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World In Eighty Days (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+
+GAMEL( 199?, j5ar80cl , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ar80cla )
+GAMEL( 199?, j5ar80cla , j5ar80cl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ar80cla )
+GAMEL( 199?, j5ar80clb , j5ar80cl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ar80cla )
+GAMEL( 199?, j5ar80clc , j5ar80cl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Around The World Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5ar80cla )
+
+GAME( 199?, j5buc , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Buccaneer (JPM) (SYSTEM5)", GAME_FLAGS )
+
+GAMEL( 199?, j5cir , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cira , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cirb , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5circ , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cird , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5cira )
+GAMEL( 199?, j5cire , j5cir , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Circus (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5cira )
+
+
+GAME( 199?, j5daytn , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5daytna , j5daytn , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+GAME( 199?, j5daycls , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5dayclsa , j5daycls , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Daytona Classic (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+GAME( 199?, j5dirty , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5dirtya , j5dirty , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5dirtyb , j5dirty , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5dirtyc , j5dirty , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Dirty Dozen (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+
+GAME( 199?, j5fairgd , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS ) // or just 'Fairground' ?
+GAME( 199?, j5fairgda , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5fairgdb , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5fairgdc , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5fairgdd , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5fairgde , j5fairgd , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground Attraction Club (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+
+GAMEL( 199?, j5fair , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5faira , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairb , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairc , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5faird , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5faire , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairf , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairg , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairh , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairi , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairj , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 11)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairk , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 12)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairl , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 13)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairm , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 14)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairn , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 15)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairo , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 16)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairp , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 17)", GAME_FLAGS, layout_j5fairp )
+GAMEL( 199?, j5fairq , j5fair , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Fairground (JPM) (SYSTEM5, set 18)", GAME_FLAGS, layout_j5fairp )
+
+GAME( 199?, j5filth , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5filtha , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5filthb , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5filthc , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5filthd , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5filthe , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+GAME( 199?, j5filthf , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
+GAME( 199?, j5filthg , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
+GAME( 199?, j5filthh , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
+GAME( 199?, j5filthi , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
+GAME( 199?, j5filthj , j5filth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Filthy Rich (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
+
+
+GAME( 199?, j5hagar , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5hagara , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5hagarb , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5hagarc , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5hagard , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5hagare , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+GAME( 199?, j5hagarf , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
+GAME( 199?, j5hagarg , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
+GAME( 199?, j5hagarh , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
+GAME( 199?, j5hagari , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 10)", GAME_FLAGS )
+GAME( 199?, j5hagarj , j5hagar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar (JPM) (SYSTEM5, set 11)", GAME_FLAGS )
+
+GAME( 199?, j5hagsho , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5hagshoa , j5hagsho , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5hagshob , j5hagsho , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5hagshoc , j5hagsho , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hagar Showcase (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAMEL( 199?, j5holly , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollya , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollyb , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollyc , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollyd , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hollye , j5holly , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5holly , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollya , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollyb , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollyc , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollyd , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5hollyc )
+GAMEL( 199?, j5hollye , j5holly , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hollywood Nights (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5hollyc )
-GAMEL( 199?, j5hotdog , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hotdoga )
-GAMEL( 199?, j5hotdoga , j5hotdog , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hotdoga )
+GAMEL( 199?, j5hotdog , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5hotdoga )
+GAMEL( 199?, j5hotdoga , j5hotdog , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hot Dogs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5hotdoga )
-GAMEL( 199?, j5indsum , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Indian Summer (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5indsum )
-
-
-GAMEL( 199?, j5intr , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5intr )
-GAMEL( 199?, j5intra , j5intr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5intr )
-GAMEL( 199?, j5intrb , j5intr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5intr )
-GAMEL( 199?, j5intrc , j5intr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5intr )
-
-GAME( 199?, j5jokgld , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5jokglda , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5jokgldb , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5jokgldc , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5jokgldd , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
-GAME( 199?, j5jokglde , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
-GAME( 199?, j5jokgldf , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
-GAME( 199?, j5jokgldg , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
-GAME( 199?, j5jokgldh , j5jokgld , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
-
-GAMEL( 199?, j5nite , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5nite )
-GAMEL( 199?, j5nitea , j5nite , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5nite )
-
-GAMEL( 199?, j5palm , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5palma ) // doesn't behave well
-GAMEL( 199?, j5palma , j5palm , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5palma )
-
-GAME( 199?, j5phnx , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5phnxa , j5phnx , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-GAMEL( 199?, j5popeye , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5popeye ) // (20p/8 GBP Token) ?
-GAMEL( 199?, j5popeyea , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyeb , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyec , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyed , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyee , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyef , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyeg , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyeh , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5popeye )
-GAMEL( 199?, j5popeyei , j5popeye , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5popeye )
-
-GAME( 199?, j5popth , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5poptha , j5popth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5popthb , j5popth , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-
-GAME( 199?, j5popprz , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5popprza , j5popprz , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-
-
-GAME( 199?, j5roul , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette (JPM) (SYSTEM5)", GAME_FLAGS )
+GAMEL( 199?, j5indsum , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Indian Summer (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5indsum )
+
+
+GAMEL( 199?, j5intr , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5intr )
+GAMEL( 199?, j5intra , j5intr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5intr )
+GAMEL( 199?, j5intrb , j5intr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5intr )
+GAMEL( 199?, j5intrc , j5intr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Intrigue (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5intr )
+
+GAME( 199?, j5jokgld , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5jokglda , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5jokgldb , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5jokgldc , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5jokgldd , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 5)", GAME_FLAGS )
+GAME( 199?, j5jokglde , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 6)", GAME_FLAGS )
+GAME( 199?, j5jokgldf , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 7)", GAME_FLAGS )
+GAME( 199?, j5jokgldg , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 8)", GAME_FLAGS )
+GAME( 199?, j5jokgldh , j5jokgld , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Jokers Gold (JPM) (SYSTEM5, set 9)", GAME_FLAGS )
+
+GAMEL( 199?, j5nite , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5nite )
+GAMEL( 199?, j5nitea , j5nite , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Nite Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5nite )
+
+GAMEL( 199?, j5palm , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5palma ) // doesn't behave well
+GAMEL( 199?, j5palma , j5palm , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Palm Springs (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5palma )
+
+GAME( 199?, j5phnx , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5phnxa , j5phnx , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Phoenix (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+GAMEL( 199?, j5popeye , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5popeye ) // (20p/8 GBP Token) ?
+GAMEL( 199?, j5popeyea , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyeb , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyec , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 4)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyed , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 5)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyee , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 6)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyef , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 7)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyeg , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 8)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyeh , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 9)", GAME_FLAGS, layout_j5popeye )
+GAMEL( 199?, j5popeyei , j5popeye , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye (JPM) (SYSTEM5, set 10)", GAME_FLAGS, layout_j5popeye )
+
+GAME( 199?, j5popth , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5poptha , j5popth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5popthb , j5popth , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Popeye's Treasure Hunt (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+
+GAME( 199?, j5popprz , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5popprza , j5popprz , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Prize Popeye Vending (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+
+
+GAME( 199?, j5roul , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette (JPM) (SYSTEM5)", GAME_FLAGS )
-GAME( 199?, j5roulcl , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5roulcla , j5roulcl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5roulclb , j5roulcl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5roulclc , j5roulcl , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
+GAME( 199?, j5roulcl , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5roulcla , j5roulcl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5roulclb , j5roulcl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5roulclc , j5roulcl , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Roulette Club (JPM) (SYSTEM5, set 4)", GAME_FLAGS )
-GAME( 199?, j5slvree , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5slvreea , j5slvree , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5slvree , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5slvreea , j5slvree , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Reels (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5slvstr , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5slvstra , j5slvstr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAME( 199?, j5slvstrb , j5slvstr , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
+GAME( 199?, j5slvstr , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5slvstra , j5slvstr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5slvstrb , j5slvstr , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Silver Streak (JPM) (SYSTEM5, set 3)", GAME_FLAGS )
-GAME( 199?, j5street , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Streetwise (JPM) (SYSTEM5)", GAME_FLAGS ) // doesn't behave well
+GAME( 199?, j5street , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Streetwise (JPM) (SYSTEM5)", GAME_FLAGS ) // doesn't behave well
-GAMEL( 199?, j5supbar , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5supbara )
-GAMEL( 199?, j5supbara , j5supbar , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5supbara )
+GAMEL( 199?, j5supbar , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5supbara )
+GAMEL( 199?, j5supbara , j5supbar , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Super Bars (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5supbara )
-GAMEL( 199?, j5term , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Terminator (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5term )
+GAMEL( 199?, j5term , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Terminator (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5term )
-GAMEL( 199?, j5topshp , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Top Of The Shop Club (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5topshp )
+GAMEL( 199?, j5topshp , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Top Of The Shop Club (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5topshp )
-GAMEL( 199?, j5trail , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5trail )
-GAMEL( 199?, j5traila , j5trail , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5trail )
-GAMEL( 199?, j5trailb , j5trail , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5trail )
+GAMEL( 199?, j5trail , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5trail )
+GAMEL( 199?, j5traila , j5trail , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5trail )
+GAMEL( 199?, j5trailb , j5trail , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Trailblazer Club (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5trail )
-GAMEL( 199?, j5uj , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ujb )
-GAMEL( 199?, j5uja , j5uj , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ujb )
-GAMEL( 199?, j5ujb , j5uj , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ujb )
+GAMEL( 199?, j5uj , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5ujb )
+GAMEL( 199?, j5uja , j5uj , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5ujb )
+GAMEL( 199?, j5ujb , j5uj , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Union Jackpot (JPM) (SYSTEM5, set 3)", GAME_FLAGS, layout_j5ujb )
-GAMEL( 199?, j5wsc , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5wsc )
-GAMEL( 199?, j5wsca , j5wsc , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5wsc )
+GAMEL( 199?, j5wsc , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 1)", GAME_FLAGS, layout_j5wsc )
+GAMEL( 199?, j5wsca , j5wsc , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Wall Street Club (JPM) (SYSTEM5, set 2)", GAME_FLAGS, layout_j5wsc )
-GAMEL( 199?, j5movie , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "Crystal", "Movie Magic Club (Crystal) (SYSTEM5)", GAME_FLAGS, layout_j5movie ) // apparently by Crystal
+GAMEL( 199?, j5movie , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "Crystal", "Movie Magic Club (Crystal) (SYSTEM5)", GAME_FLAGS, layout_j5movie ) // apparently by Crystal
-GAME( 199?, j5nudfic , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Nudge Fiction (JPM) (SYSTEM5)", GAME_FLAGS )
+GAME( 199?, j5nudfic , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Nudge Fiction (JPM) (SYSTEM5)", GAME_FLAGS )
-GAME( 199?, j5revo , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
-GAME( 199?, j5revoa , j5revo , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
+GAME( 199?, j5revo , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 1)", GAME_FLAGS )
+GAME( 199?, j5revoa , j5revo , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Revolver (JPM) (SYSTEM5, set 2)", GAME_FLAGS )
-GAMEL( 199?, j5sizl , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Sizzling (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5sizl )
+GAMEL( 199?, j5sizl , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Sizzling (JPM) (SYSTEM5)", GAME_FLAGS, layout_j5sizl )
-GAME( 199?, j5hilos , 0 , jpmsys5_ym, popeye, driver_device, 0, ROT0, "JPM", "Hi Lo Silver (JPM) (SYSTEM5)", GAME_FLAGS )
+GAME( 199?, j5hilos , 0 , jpmsys5_ym, popeye, jpmsys5_state, 0, ROT0, "JPM", "Hi Lo Silver (JPM) (SYSTEM5)", GAME_FLAGS )
diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp
index 87232a18117..8f7c2a323ed 100644
--- a/src/mame/drivers/jpmsys7.cpp
+++ b/src/mame/drivers/jpmsys7.cpp
@@ -52,7 +52,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( jpmsys7 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( jpmsys7, jpmsys7_state )
+static MACHINE_CONFIG_START( jpmsys7 )
MCFG_CPU_ADD("maincpu", MCF5206E, 40000000) // seems to be a Coldfire of some kind
MCFG_CPU_PROGRAM_MAP(jpmsys7_map)
MCFG_MCF5206E_PERIPHERAL_ADD("maincpu_onboard")
@@ -225,15 +225,15 @@ ROM_START( j7bullio )
ROM_END
-GAME( 200?, j7bmagic ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Black Magic (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7cexprs ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Cash Xpress (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7crztrl ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Crazy Trails (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7fantaz ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Fantaztec (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7kerchn ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Ker - Chinq (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7razzma ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Razzamataz (JPM) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7razzmaa ,j7razzma, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Razzamataz (JPM) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7r2roll ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Ready To Roll (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7tubgld ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Turbo Gold (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7wldwkd ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "JPM","Wild 'N' Wicked (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7bullio ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "Ace","Bullionaire (Ace)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 200?, j7clbmag ,0, jpmsys7, jpmsys7, driver_device, 0, ROT0, "Qps","Club Magic (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7bmagic ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Black Magic (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7cexprs ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Cash Xpress (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7crztrl ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Crazy Trails (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7fantaz ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Fantaztec (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7kerchn ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Ker - Chinq (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7razzma ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Razzamataz (JPM) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7razzmaa ,j7razzma, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Razzamataz (JPM) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7r2roll ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Ready To Roll (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7tubgld ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Turbo Gold (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7wldwkd ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "JPM","Wild 'N' Wicked (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7bullio ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "Ace","Bullionaire (Ace)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 200?, j7clbmag ,0, jpmsys7, jpmsys7, jpmsys7_state, 0, ROT0, "Qps","Club Magic (JPM)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index 9276ee528af..99c469c80a4 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -364,7 +364,7 @@ QUICKLOAD_LOAD_MEMBER( jr100_state,jr100)
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( jr100, jr100_state )
+static MACHINE_CONFIG_START( jr100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6802, XTAL_14_31818MHz / 4) // clock devided internaly by 4
@@ -420,6 +420,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, jr100, 0, 0, jr100, jr100, driver_device, 0, "National", "JR-100", 0)
-COMP( 1981, jr100u, jr100, 0, jr100, jr100, driver_device, 0, "Panasonic", "JR-100U", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, jr100, 0, 0, jr100, jr100, jr100_state, 0, "National", "JR-100", 0 )
+COMP( 1981, jr100u, jr100, 0, jr100, jr100, jr100_state, 0, "Panasonic", "JR-100U", 0 )
diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp
index 21d92e7903b..1050335963b 100644
--- a/src/mame/drivers/jr200.cpp
+++ b/src/mame/drivers/jr200.cpp
@@ -532,7 +532,7 @@ void jr200_state::machine_reset()
}
-static MACHINE_CONFIG_START( jr200, jr200_state )
+static MACHINE_CONFIG_START( jr200 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_14_31818MHz / 4) /* MN1800A, ? Mhz assumption that it is same as JR-100*/
MCFG_CPU_PROGRAM_MAP(jr200_mem)
@@ -596,6 +596,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, jr200, 0, 0, jr200, jr200, driver_device, 0, "National", "JR-200", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1982, jr200u, jr200, 0, jr200, jr200, driver_device, 0, "Panasonic", "JR-200U", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, jr200, 0, 0, jr200, jr200, jr200_state, 0, "National", "JR-200", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1982, jr200u, jr200, 0, jr200, jr200, jr200_state, 0, "Panasonic", "JR-200U", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp
index 7484ab4c550..792915d0a79 100644
--- a/src/mame/drivers/jrpacman.cpp
+++ b/src/mame/drivers/jrpacman.cpp
@@ -275,7 +275,7 @@ INTERRUPT_GEN_MEMBER(jrpacman_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( jrpacman, jrpacman_state )
+static MACHINE_CONFIG_START( jrpacman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp
index 8618b25e7db..d8fd6fc83a5 100644
--- a/src/mame/drivers/jtc.cpp
+++ b/src/mame/drivers/jtc.cpp
@@ -720,7 +720,7 @@ static GFXDECODE_START( jtces40 )
GFXDECODE_ENTRY( UB8830D_TAG, 0x1000, jtces40_charlayout, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( basic, jtc_state )
+static MACHINE_CONFIG_START( basic )
/* basic machine hardware */
MCFG_CPU_ADD(UB8830D_TAG, UB8830D, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(jtc_mem)
@@ -760,7 +760,7 @@ static MACHINE_CONFIG_DERIVED( jtc, basic )
MCFG_RAM_DEFAULT_SIZE("2K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( jtces88, jtc, jtces88_state )
+static MACHINE_CONFIG_DERIVED( jtces88, jtc )
/* basic machine hardware */
MCFG_CPU_MODIFY(UB8830D_TAG)
MCFG_CPU_PROGRAM_MAP(jtc_es1988_mem)
@@ -770,7 +770,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( jtces88, jtc, jtces88_state )
MCFG_RAM_DEFAULT_SIZE("4K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( jtces23, basic, jtces23_state )
+static MACHINE_CONFIG_DERIVED( jtces23, basic )
/* basic machine hardware */
MCFG_CPU_MODIFY(UB8830D_TAG)
MCFG_CPU_PROGRAM_MAP(jtc_es23_mem)
@@ -792,7 +792,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( jtces23, basic, jtces23_state )
MCFG_RAM_DEFAULT_SIZE("4K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( jtces40, basic, jtces40_state )
+static MACHINE_CONFIG_DERIVED( jtces40, basic )
/* basic machine hardware */
MCFG_CPU_MODIFY(UB8830D_TAG)
MCFG_CPU_PROGRAM_MAP(jtc_es40_mem)
@@ -846,8 +846,8 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, jtc, 0, 0, jtc, jtc, driver_device, 0, "Jugend+Technik", "CompJU+TEr", MACHINE_NOT_WORKING )
-COMP( 1988, jtces88, jtc, 0, jtces88,jtc, driver_device, 0, "Jugend+Technik", "CompJU+TEr (EMR-ES 1988)", MACHINE_NOT_WORKING )
-COMP( 1989, jtces23, jtc, 0, jtces23,jtces23, driver_device, 0, "Jugend+Technik", "CompJU+TEr (ES 2.3)", MACHINE_NOT_WORKING )
-COMP( 1990, jtces40, jtc, 0, jtces40,jtces40, driver_device, 0, "Jugend+Technik", "CompJU+TEr (ES 4.0)", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, jtc, 0, 0, jtc, jtc, jtc_state, 0, "Jugend+Technik", "CompJU+TEr", MACHINE_NOT_WORKING )
+COMP( 1988, jtces88, jtc, 0, jtces88,jtc, jtces88_state, 0, "Jugend+Technik", "CompJU+TEr (EMR-ES 1988)", MACHINE_NOT_WORKING )
+COMP( 1989, jtces23, jtc, 0, jtces23,jtces23, jtces23_state, 0, "Jugend+Technik", "CompJU+TEr (ES 2.3)", MACHINE_NOT_WORKING )
+COMP( 1990, jtces40, jtc, 0, jtces40,jtces40, jtces40_state, 0, "Jugend+Technik", "CompJU+TEr (ES 4.0)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index 79bd3f9383e..93bf71f8549 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -656,7 +656,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( jubileep, jubilee_state )
+static MACHINE_CONFIG_START( jubileep )
// Main CPU TMS9980A, no line connections.
MCFG_TMS99xx_ADD("maincpu", TMS9980A, CPU_CLOCK, jubileep_map, jubileep_cru_map)
@@ -706,5 +706,5 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1985, jubileep, 0, jubileep, jubileep, driver_device, 0, ROT0, "Jubilee", "Double-Up Poker (Jubilee)", MACHINE_NO_SOUND )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1985, jubileep, 0, jubileep, jubileep, jubilee_state, 0, ROT0, "Jubilee", "Double-Up Poker (Jubilee)", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp
index 34a5db71c50..0ad95457959 100644
--- a/src/mame/drivers/juicebox.cpp
+++ b/src/mame/drivers/juicebox.cpp
@@ -301,7 +301,7 @@ DRIVER_INIT_MEMBER(juicebox_state,juicebox)
// do nothing
}
-static MACHINE_CONFIG_START( juicebox, juicebox_state )
+static MACHINE_CONFIG_START( juicebox )
MCFG_CPU_ADD("maincpu", ARM7, 66000000)
MCFG_CPU_PROGRAM_MAP(juicebox_map)
diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp
index 078fc267c60..12c7a5f3de9 100644
--- a/src/mame/drivers/jungleyo.cpp
+++ b/src/mame/drivers/jungleyo.cpp
@@ -111,7 +111,7 @@ static GFXDECODE_START( jungleyo )
GFXDECODE_END
-static MACHINE_CONFIG_START( jungleyo, jungleyo_state )
+static MACHINE_CONFIG_START( jungleyo )
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(jungleyo_map)
@@ -132,7 +132,7 @@ static MACHINE_CONFIG_START( jungleyo, jungleyo_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/16, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
@@ -157,4 +157,4 @@ ROM_START( jungleyo )
ROM_END
-GAME( 1999, jungleyo, 0, jungleyo, jungleyo, driver_device, 0, ROT0, "Yonshi", "Jungle (VI3.02)", MACHINE_NOT_WORKING )
+GAME( 1999, jungleyo, 0, jungleyo, jungleyo, jungleyo_state, 0, ROT0, "Yonshi", "Jungle (VI3.02)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp
index bae6c5b28ce..b6872389740 100644
--- a/src/mame/drivers/junior.cpp
+++ b/src/mame/drivers/junior.cpp
@@ -35,12 +35,13 @@ class junior_state : public driver_device
{
public:
junior_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_riot(*this, "riot")
- ,
- m_maincpu(*this, "maincpu") { }
+ : driver_device(mconfig, type, tag)
+ , m_riot(*this, "riot")
+ , m_maincpu(*this, "maincpu")
+ {
+ }
- required_device<mos6532_t> m_riot;
+ required_device<mos6532_new_device> m_riot;
DECLARE_READ8_MEMBER(junior_riot_a_r);
DECLARE_READ8_MEMBER(junior_riot_b_r);
DECLARE_WRITE8_MEMBER(junior_riot_a_w);
@@ -62,8 +63,8 @@ static ADDRESS_MAP_START(junior_mem, AS_PROGRAM, 8, junior_state)
ADDRESS_MAP_GLOBAL_MASK(0x1FFF)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_RAM // 1K RAM
- AM_RANGE(0x1a00, 0x1a7f) AM_DEVICE("riot", mos6532_t, ram_map)
- AM_RANGE(0x1a80, 0x1a9f) AM_DEVICE("riot", mos6532_t, io_map)
+ AM_RANGE(0x1a00, 0x1a7f) AM_DEVICE("riot", mos6532_new_device, ram_map)
+ AM_RANGE(0x1a80, 0x1a9f) AM_DEVICE("riot", mos6532_new_device, io_map)
AM_RANGE(0x1c00, 0x1fff) AM_ROM // Monitor
ADDRESS_MAP_END
@@ -211,7 +212,7 @@ void junior_state::machine_reset()
}
-static MACHINE_CONFIG_START( junior, junior_state )
+static MACHINE_CONFIG_START( junior )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6502, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(junior_mem)
@@ -221,7 +222,7 @@ static MACHINE_CONFIG_START( junior, junior_state )
MCFG_DEFAULT_LAYOUT( layout_junior )
/* Devices */
- MCFG_DEVICE_ADD("riot", MOS6532n, XTAL_1MHz)
+ MCFG_DEVICE_ADD("riot", MOS6532_NEW, XTAL_1MHz)
MCFG_MOS6530n_IN_PA_CB(READ8(junior_state, junior_riot_a_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(junior_state, junior_riot_a_w))
MCFG_MOS6530n_IN_PB_CB(READ8(junior_state, junior_riot_b_r))
@@ -249,5 +250,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, junior, 0, 0, junior, junior, driver_device, 0, "Elektor Electronics", "Junior Computer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1980, junior, 0, 0, junior, junior, junior_state, 0, "Elektor Electronics", "Junior Computer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp
index c8dfd6ef8bd..019af9dce2c 100644
--- a/src/mame/drivers/junofrst.cpp
+++ b/src/mame/drivers/junofrst.cpp
@@ -245,7 +245,7 @@ WRITE8_MEMBER(junofrst_state::portB_w)
C += 220000; /* 220000pF = 0.22uF */
data >>= 2;
- filter[i]->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 200, CAP_P(C));
+ filter[i]->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 200, CAP_P(C));
}
}
@@ -410,7 +410,7 @@ INTERRUPT_GEN_MEMBER(junofrst_state::_30hz_irq)
device.execute().set_input_line(0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( junofrst, junofrst_state )
+static MACHINE_CONFIG_START( junofrst )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, 1500000) /* 1.5 MHz ??? */
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index bbb555bfd8b..1c696430197 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -745,7 +745,7 @@ void ace_state::machine_start()
// MACHINE_CONFIG( ace )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ace, ace_state )
+static MACHINE_CONFIG_START( ace )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_6_5MHz/2)
MCFG_CPU_PROGRAM_MAP(ace_mem)
@@ -835,5 +835,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1981, jupace, 0, 0, ace, ace, driver_device, 0, "Jupiter Cantab", "Jupiter Ace" , 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, jupace, 0, 0, ace, ace, ace_state, 0, "Jupiter Cantab", "Jupiter Ace", 0 )
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index fa8e63511d8..f429a35de49 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -46,7 +46,7 @@ static ADDRESS_MAP_START( jupiter_m6800_mem, AS_PROGRAM, 8, jupiter2_state )
// AM_RANGE(0xff58, 0xff5c) Cartridge Disk Controller PIA
// AM_RANGE(0xff60, 0xff76) DMA Controller
// AM_RANGE(0xff80, 0xff83) Floppy PIA
- AM_RANGE(0xff84, 0xff87) AM_DEVREADWRITE(INS1771N1_TAG, wd_fdc_t, read, write)
+ AM_RANGE(0xff84, 0xff87) AM_DEVREADWRITE(INS1771N1_TAG, wd_fdc_device_base, read, write)
// AM_RANGE(0xff90, 0xff93) Hytype Parallel Printer PIA
// AM_RANGE(0xffa0, 0xffa7) Persci Floppy Disk Controller
// AM_RANGE(0xffb0, 0xffb3) Video PIA
@@ -120,7 +120,7 @@ READ8_MEMBER( jupiter3_state::status_r )
return (m_term_data) ? 0x80 : 0x00;
}
-WRITE8_MEMBER( jupiter3_state::kbd_put )
+void jupiter3_state::kbd_put(u8 data)
{
if (data)
m_term_data = data ^ 0x80;
@@ -213,7 +213,7 @@ void jupiter3_state::machine_reset()
// MACHINE_CONFIG( jupiter )
//-------------------------------------------------
-static MACHINE_CONFIG_START( jupiter, jupiter2_state )
+static MACHINE_CONFIG_START( jupiter )
// basic machine hardware
MCFG_CPU_ADD(MCM6571AP_TAG, M6800, 2000000)
MCFG_CPU_PROGRAM_MAP(jupiter_m6800_mem)
@@ -236,7 +236,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( jupiter3 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( jupiter3, jupiter3_state )
+static MACHINE_CONFIG_START( jupiter3 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(jupiter3_mem)
@@ -259,7 +259,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state )
MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(jupiter3_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(jupiter3_state, kbd_put))
// internal ram
MCFG_RAM_ADD(RAM_TAG)
@@ -355,6 +355,6 @@ DRIVER_INIT_MEMBER(jupiter3_state,jupiter3)
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1976, jupiter2, 0, 0, jupiter, jupiter, jupiter2_state, jupiter, "Wave Mate", "Jupiter II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1976, jupiter3, 0, 0, jupiter3, jupiter, jupiter3_state, jupiter3,"Wave Mate", "Jupiter III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, jupiter2, 0, 0, jupiter, jupiter, jupiter2_state, jupiter, "Wave Mate", "Jupiter II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1976, jupiter3, 0, 0, jupiter3, jupiter, jupiter3_state, jupiter3,"Wave Mate", "Jupiter III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/jvh.cpp b/src/mame/drivers/jvh.cpp
index 68c5c44b120..ec0a0920eb9 100644
--- a/src/mame/drivers/jvh.cpp
+++ b/src/mame/drivers/jvh.cpp
@@ -106,14 +106,14 @@ DRIVER_INIT_MEMBER(jvh_state,jvh)
{
}
-static MACHINE_CONFIG_START( jvh, jvh_state )
+static MACHINE_CONFIG_START( jvh )
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, escape_io)
MCFG_CPU_ADD("cpu2", M6800, 1000000)
MCFG_CPU_PROGRAM_MAP(jvh_sub_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jvh2, jvh_state )
+static MACHINE_CONFIG_START( jvh2 )
// CPU TMS9980At; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 1000000, jvh_map, movmastr_io)
MCFG_CPU_ADD("cpu2", M6800, 1000000)
diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp
index 39843f93e97..d8dd1baabf6 100644
--- a/src/mame/drivers/k1003.cpp
+++ b/src/mame/drivers/k1003.cpp
@@ -134,7 +134,7 @@ void k1003_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( k1003, k1003_state )
+static MACHINE_CONFIG_START( k1003 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8008, 800000)
MCFG_CPU_PROGRAM_MAP(k1003_mem)
@@ -193,5 +193,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, k1003, 0, 0, k1003, k1003, driver_device, 0, "Robotron", "K1003", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, k1003, 0, 0, k1003, k1003, k1003_state, 0, "Robotron", "K1003", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index ef0b413ad47..4f9dd9a0b4b 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -465,7 +465,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( k28, k28_state )
+static MACHINE_CONFIG_START( k28 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8021, XTAL_3_579545MHz)
@@ -508,5 +508,5 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-COMP( 1981, k28, 0, 0, k28, k28, driver_device, 0, "Tiger Electronics", "K28: Talking Learning Computer (model 7-230)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, k28, 0, 0, k28, k28, k28_state, 0, "Tiger Electronics", "K28: Talking Learning Computer (model 7-230)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp
index 4e8961cf462..4ef64f931d1 100644
--- a/src/mame/drivers/k8915.cpp
+++ b/src/mame/drivers/k8915.cpp
@@ -29,7 +29,7 @@ public:
DECLARE_READ8_MEMBER(k8915_52_r);
DECLARE_READ8_MEMBER(k8915_53_r);
DECLARE_WRITE8_MEMBER(k8915_a8_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_DRIVER_INIT(k8915);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -140,12 +140,12 @@ uint32_t k8915_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
return 0;
}
-WRITE8_MEMBER( k8915_state::kbd_put )
+void k8915_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( k8915, k8915_state )
+static MACHINE_CONFIG_START( k8915 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(k8915_mem)
@@ -163,7 +163,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state )
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(k8915_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(k8915_state, kbd_put))
MACHINE_CONFIG_END
@@ -179,5 +179,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, k8915, 0, 0, k8915, k8915, k8915_state, k8915, "Robotron", "K8915", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, k8915, 0, 0, k8915, k8915, k8915_state, k8915, "Robotron", "K8915", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index 07ebbf9d49e..26804b6c377 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -1862,7 +1862,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(kaneko16_state::kaneko16_interrupt)
6-7] rte
*/
-static MACHINE_CONFIG_START( berlwall, kaneko16_berlwall_state )
+static MACHINE_CONFIG_START( berlwall )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* MC68000P12 */
@@ -1911,7 +1911,7 @@ static MACHINE_CONFIG_START( berlwall, kaneko16_berlwall_state )
MCFG_SOUND_ADD("ym2149_2", YM2149, 1000000)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 12000000/6, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1921,7 +1921,7 @@ MACHINE_CONFIG_END
Bakuretsu Breaker
***************************************************************************/
-static MACHINE_CONFIG_START( bakubrkr, kaneko16_state )
+static MACHINE_CONFIG_START( bakubrkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
@@ -1977,7 +1977,7 @@ static MACHINE_CONFIG_START( bakubrkr, kaneko16_state )
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1996,7 +1996,7 @@ MACHINE_CONFIG_END
6-7] busy loop
*/
-static MACHINE_CONFIG_START( blazeon, kaneko16_state )
+static MACHINE_CONFIG_START( blazeon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000-12 */
@@ -2050,7 +2050,7 @@ MACHINE_CONFIG_END
Wing Force
***************************************************************************/
-static MACHINE_CONFIG_START( wingforc, kaneko16_state )
+static MACHINE_CONFIG_START( wingforc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* TMP68HC000N-16 */
@@ -2097,7 +2097,7 @@ static MACHINE_CONFIG_START( wingforc, kaneko16_state )
MCFG_YM2151_ADD("ymsnd", XTAL_16MHz/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2116,7 +2116,7 @@ MACHINE_CONFIG_END
VIDEO_UPDATE_AFTER_VBLANK fixes the mangled/wrong colored sprites
*/
-static MACHINE_CONFIG_START( gtmr, kaneko16_gtmr_state )
+static MACHINE_CONFIG_START( gtmr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
@@ -2167,16 +2167,16 @@ static MACHINE_CONFIG_START( gtmr, kaneko16_gtmr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( gtmre, gtmr )
MCFG_DEVICE_MODIFY("toybox")
- MCFG_TOYBOX_TABLE_TYPE(TABLE_ALT)
+ MCFG_TOYBOX_TABLE_TYPE(ALT)
MACHINE_CONFIG_END
/***************************************************************************
@@ -2228,7 +2228,7 @@ static MACHINE_CONFIG_DERIVED( bonkadv, gtmr )
MCFG_DEVICE_MODIFY("toybox")
- MCFG_TOYBOX_GAME_TYPE(GAME_BONK)
+ MCFG_TOYBOX_GAME_TYPE(BONK)
MCFG_DEVICE_MODIFY("kan_hit")
kaneko_hit_device::set_type(*device, 0);
@@ -2239,7 +2239,7 @@ MACHINE_CONFIG_END
Magical Crystal
***************************************************************************/
-static MACHINE_CONFIG_START( mgcrystl, kaneko16_state )
+static MACHINE_CONFIG_START( mgcrystl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb, TMP68HC000N-12 @U31 and X2 is 12MHz */
@@ -2294,7 +2294,7 @@ static MACHINE_CONFIG_START( mgcrystl, kaneko16_state )
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(kaneko16_state, eeprom_w)) /* outputs B: 0,EEPROM reset */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/6, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2368,7 +2368,7 @@ static ADDRESS_MAP_START( shogwarr_oki2_map, AS_0, 8, kaneko16_shogwarr_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( shogwarr, kaneko16_shogwarr_state )
+static MACHINE_CONFIG_START( shogwarr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
@@ -2418,11 +2418,11 @@ static MACHINE_CONFIG_START( shogwarr, kaneko16_shogwarr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, shogwarr_oki1_map)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, shogwarr_oki2_map)
MACHINE_CONFIG_END
@@ -4483,7 +4483,7 @@ GAME( 1992, explbrkr, 0, bakubrkr, bakubrkr, kaneko16_state, kan
GAME( 1992, bakubrkr, explbrkr, bakubrkr, bakubrkr, kaneko16_state, kaneko16, ROT90, "Kaneko", "Bakuretsu Breaker", MACHINE_SUPPORTS_SAVE )
GAME( 1993, wingforc, 0, wingforc, wingforc, kaneko16_state, kaneko16, ROT270,"A.I (Atlus license)", "Wing Force (Japan, prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, bonkadv, 0, bonkadv , bonkadv, kaneko16_gtmr_state, gtmr, ROT0, "Kaneko", "B.C. Kid / Bonk's Adventure / Kyukyoku!! PC Genjin", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, bonkadv, 0, bonkadv, bonkadv, kaneko16_gtmr_state, gtmr, ROT0, "Kaneko", "B.C. Kid / Bonk's Adventure / Kyukyoku!! PC Genjin", MACHINE_SUPPORTS_SAVE )
GAME( 1994, bloodwar, 0, bloodwar, bloodwar, kaneko16_gtmr_state, gtmr, ROT0, "Kaneko", "Blood Warrior", MACHINE_SUPPORTS_SAVE )
GAME( 1994, oedfight, bloodwar, bloodwar, bloodwar, kaneko16_gtmr_state, gtmr, ROT0, "Kaneko", "Oedo Fight (Japan Bloodshed Ver.)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, gtmr, 0, gtmr, gtmr, kaneko16_gtmr_state, gtmr, ROT0, "Kaneko", "1000 Miglia: Great 1000 Miles Rally (94/07/18)", MACHINE_SUPPORTS_SAVE ) // this set shows 'PCB by Jinwei Co Ltd. ROC'
diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp
index e74f17150ba..01dc3ac888c 100644
--- a/src/mame/drivers/kangaroo.cpp
+++ b/src/mame/drivers/kangaroo.cpp
@@ -426,7 +426,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( nomcu, kangaroo_state )
+static MACHINE_CONFIG_START( nomcu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -572,7 +572,7 @@ ROM_END
*
*************************************/
-GAME( 1981, fnkyfish, 0, nomcu, fnkyfish, driver_device, 0, ROT90, "Sun Electronics", "Funky Fish", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kangaroo, 0, mcu, kangaroo, driver_device, 0, ROT90, "Sun Electronics", "Kangaroo", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kangarooa, kangaroo, mcu, kangaroo, driver_device, 0, ROT90, "Sun Electronics (Atari license)", "Kangaroo (Atari)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kangaroob, kangaroo, nomcu, kangaroo, driver_device, 0, ROT90, "bootleg", "Kangaroo (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, fnkyfish, 0, nomcu, fnkyfish, kangaroo_state, 0, ROT90, "Sun Electronics", "Funky Fish", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kangaroo, 0, mcu, kangaroo, kangaroo_state, 0, ROT90, "Sun Electronics", "Kangaroo", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kangarooa, kangaroo, mcu, kangaroo, kangaroo_state, 0, ROT90, "Sun Electronics (Atari license)", "Kangaroo (Atari)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kangaroob, kangaroo, nomcu, kangaroo, kangaroo_state, 0, ROT90, "bootleg", "Kangaroo (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp
index 9222799c0ae..6df531ebaee 100644
--- a/src/mame/drivers/karnov.cpp
+++ b/src/mame/drivers/karnov.cpp
@@ -803,7 +803,7 @@ void karnov_state::machine_reset()
}
-static MACHINE_CONFIG_START( karnov, karnov_state )
+static MACHINE_CONFIG_START( karnov )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
@@ -882,7 +882,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wndrplnt, karnov_state )
+static MACHINE_CONFIG_START( wndrplnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
@@ -1393,13 +1393,13 @@ DRIVER_INIT_MEMBER(karnov_state,chelnovj)
*
*************************************/
-GAME( 1987, karnov, 0, karnov, karnov, karnov_state, karnov, ROT0, "Data East USA", "Karnov (US, rev 6)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, karnova, karnov, karnov, karnov, karnov_state, karnov, ROT0, "Data East USA", "Karnov (US, rev 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, karnovj, karnov, karnov, karnov, karnov_state, karnovj, ROT0, "Data East Corporation", "Karnov (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, karnovjbl,karnov, karnovjbl,karnov, karnov_state, karnovj, ROT0, "bootleg (K. J. Corporation)", "Karnov (Japan, bootleg with NEC D8748HD)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wndrplnt, 0, wndrplnt, wndrplnt, karnov_state, wndrplnt, ROT270, "Data East Corporation", "Wonder Planet (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, chelnov, 0, karnov, chelnov, karnov_state, chelnov, ROT0, "Data East Corporation", "Chelnov - Atomic Runner (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, chelnovu, chelnov, karnov, chelnovu, karnov_state, chelnovu, ROT0, "Data East USA", "Chelnov - Atomic Runner (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, chelnovj, chelnov, karnov, chelnovj, karnov_state, chelnovj, ROT0, "Data East Corporation", "Chelnov - Atomic Runner (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, chelnovjbl,chelnov,chelnovjbl,chelnovj,karnov_state, chelnovj, ROT0, "bootleg", "Chelnov - Atomic Runner (Japan, bootleg with I8031, set 1)", MACHINE_SUPPORTS_SAVE ) // todo: hook up MCU instead of using simulation code
-GAME( 1988, chelnovjbla,chelnov,chelnovjbl,chelnovj,karnov_state,chelnovj, ROT0, "bootleg", "Chelnov - Atomic Runner (Japan, bootleg with I8031, set 2)", MACHINE_SUPPORTS_SAVE ) // ^^
+GAME( 1987, karnov, 0, karnov, karnov, karnov_state, karnov, ROT0, "Data East USA", "Karnov (US, rev 6)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, karnova, karnov, karnov, karnov, karnov_state, karnov, ROT0, "Data East USA", "Karnov (US, rev 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, karnovj, karnov, karnov, karnov, karnov_state, karnovj, ROT0, "Data East Corporation", "Karnov (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, karnovjbl, karnov, karnovjbl, karnov, karnov_state, karnovj, ROT0, "bootleg (K. J. Corporation)", "Karnov (Japan, bootleg with NEC D8748HD)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wndrplnt, 0, wndrplnt, wndrplnt, karnov_state, wndrplnt, ROT270, "Data East Corporation", "Wonder Planet (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, chelnov, 0, karnov, chelnov, karnov_state, chelnov, ROT0, "Data East Corporation", "Chelnov - Atomic Runner (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, chelnovu, chelnov, karnov, chelnovu, karnov_state, chelnovu, ROT0, "Data East USA", "Chelnov - Atomic Runner (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, chelnovj, chelnov, karnov, chelnovj, karnov_state, chelnovj, ROT0, "Data East Corporation", "Chelnov - Atomic Runner (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, chelnovjbl, chelnov, chelnovjbl, chelnovj, karnov_state, chelnovj, ROT0, "bootleg", "Chelnov - Atomic Runner (Japan, bootleg with I8031, set 1)", MACHINE_SUPPORTS_SAVE ) // todo: hook up MCU instead of using simulation code
+GAME( 1988, chelnovjbla, chelnov, chelnovjbl, chelnovj, karnov_state, chelnovj, ROT0, "bootleg", "Chelnov - Atomic Runner (Japan, bootleg with I8031, set 2)", MACHINE_SUPPORTS_SAVE ) // ^^
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index 5da34fe0055..6f012930174 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -752,7 +752,7 @@ INPUT_PORTS_END
* Machine Driver *
**************************************/
-static MACHINE_CONFIG_START( kas89, kas89_state )
+static MACHINE_CONFIG_START( kas89 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* Confirmed */
@@ -857,5 +857,5 @@ DRIVER_INIT_MEMBER(kas89_state,kas89)
* Game Driver(s) *
**************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
GAMEL( 1989, kas89, 0, kas89, kas89, kas89_state, kas89, ROT90, "SFC S.R.L.", "Kasino '89", MACHINE_IMPERFECT_SOUND, layout_kas89 )
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index a5d2039f6bf..68cf60d01b7 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -71,7 +71,7 @@ static ADDRESS_MAP_START( kayproii_io, AS_IO, 8, kaypro_state )
AM_RANGE(0x04, 0x07) AM_READWRITE(kaypro_sio_r, kaypro_sio_w)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("z80pio_g", z80pio_device, read_alt, write_alt)
AM_RANGE(0x0c, 0x0f) AM_DEVWRITE("brg", com8116_device, str_w)
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0x1c, 0x1f) AM_DEVREADWRITE("z80pio_s", z80pio_device, read_alt, write_alt)
ADDRESS_MAP_END
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( kaypro2x_io, AS_IO, 8, kaypro_state )
AM_RANGE(0x04, 0x07) AM_READWRITE(kaypro_sio_r, kaypro_sio_w)
AM_RANGE(0x08, 0x0b) AM_DEVWRITE("brg", com8116_device, stt_w)
AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("z80sio_2x", z80sio0_device, ba_cd_r, ba_cd_w)
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0x14, 0x17) AM_READWRITE(kaypro2x_system_port_r,kaypro2x_system_port_w)
AM_RANGE(0x18, 0x1b) AM_DEVWRITE("cent_data_out", output_latch_device, write)
AM_RANGE(0x1c, 0x1c) AM_READWRITE(kaypro2x_status_r,kaypro2x_index_w)
@@ -195,7 +195,7 @@ static SLOT_INTERFACE_START( kaypro_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( kayproii, kaypro_state )
+static MACHINE_CONFIG_START( kayproii )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz / 8)
MCFG_CPU_PROGRAM_MAP(kaypro_map)
@@ -265,7 +265,7 @@ static MACHINE_CONFIG_DERIVED( kaypro4, kayproii )
MCFG_Z80PIO_OUT_PA_CB(WRITE8(kaypro_state, kaypro4_pio_system_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kaypro2x, kaypro_state )
+static MACHINE_CONFIG_START( kaypro2x )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(kaypro_map)
@@ -454,13 +454,13 @@ ROM_START(robie)
ROM_LOAD("81-235.u9", 0x0000, 0x1000, CRC(5f72da5b) SHA1(8a597000cce1a7e184abfb7bebcb564c6bf24fb7) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1982, kayproii, 0, 0, kayproii, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro II - 2/83" , 0 )
-COMP( 1983, kaypro4, kayproii, 0, kaypro4, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 - 4/83" , 0 ) // model 81-004
-COMP( 1983, kaypro4p88, kayproii, 0, kaypro4, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 plus88 - 4/83" , MACHINE_NOT_WORKING ) // model 81-004 with an added 8088 daughterboard and rom
-COMP( 198?, omni2, kayproii, 0, omni2, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Omni II Logic Analyzer" , 0 )
-COMP( 1984, kaypro2x, 0, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 2x" , MACHINE_NOT_WORKING ) // model 81-025
-COMP( 1984, kaypro4a, kaypro2x, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 - 4/84" , MACHINE_NOT_WORKING ) // model 81-015
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
+COMP( 1982, kayproii, 0, 0, kayproii, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro II - 2/83" , 0 )
+COMP( 1983, kaypro4, kayproii, 0, kaypro4, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 - 4/83" , 0 ) // model 81-004
+COMP( 1983, kaypro4p88, kayproii, 0, kaypro4, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 plus88 - 4/83" , MACHINE_NOT_WORKING ) // model 81-004 with an added 8088 daughterboard and rom
+COMP( 198?, omni2, kayproii, 0, omni2, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Omni II Logic Analyzer" , 0 )
+COMP( 1984, kaypro2x, 0, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 2x" , MACHINE_NOT_WORKING ) // model 81-025
+COMP( 1984, kaypro4a, kaypro2x, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 4 - 4/84" , MACHINE_NOT_WORKING ) // model 81-015
// Kaypro 4/84 plus 88 goes here, model 81-015 with an added 8088 daughterboard and rom
-COMP( 1983, kaypro10, 0, 0, kaypro10, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 10" , MACHINE_NOT_WORKING ) // model 81-005
-COMP( 1984, robie, 0, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro Robie" , MACHINE_NOT_WORKING ) // model 81-005
+COMP( 1983, kaypro10, 0, 0, kaypro10, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro 10" , MACHINE_NOT_WORKING ) // model 81-005
+COMP( 1984, robie, 0, 0, kaypro2x, kay_kbd, kaypro_state, kaypro, "Non Linear Systems", "Kaypro Robie" , MACHINE_NOT_WORKING ) // model 81-005
diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp
index e83ba542781..72661bfbdb1 100644
--- a/src/mame/drivers/kc.cpp
+++ b/src/mame/drivers/kc.cpp
@@ -90,7 +90,7 @@ extern SLOT_INTERFACE_START(kc85_exp)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( kc85_3, kc_state )
+static MACHINE_CONFIG_START( kc85_3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, KC85_3_CLOCK)
MCFG_CPU_PROGRAM_MAP(kc85_3_mem)
@@ -174,7 +174,7 @@ static MACHINE_CONFIG_START( kc85_3, kc_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kc85_4, kc85_4_state )
+static MACHINE_CONFIG_START( kc85_4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, KC85_4_CLOCK)
MCFG_CPU_PROGRAM_MAP(kc85_4_mem)
@@ -316,8 +316,8 @@ ROM_START(kc85_5)
ROMX_LOAD( "caos43e.855", 0x2000, 0x2000, CRC(b66fc6c3) SHA1(521ac2fbded4148220f8af2d5a5ab99634364079), ROM_BIOS(2))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1987, kc85_2, 0, 0, kc85_3, kc85, driver_device, 0, "VEB Mikroelektronik", "HC900 / KC 85/2", MACHINE_NOT_WORKING)
-COMP( 1987, kc85_3, kc85_2, 0, kc85_3, kc85, driver_device, 0, "VEB Mikroelektronik", "KC 85/3", MACHINE_NOT_WORKING)
-COMP( 1989, kc85_4, kc85_2, 0, kc85_4, kc85, driver_device, 0, "VEB Mikroelektronik", "KC 85/4", MACHINE_NOT_WORKING)
-COMP( 1989, kc85_5, kc85_2, 0, kc85_5, kc85, driver_device, 0, "VEB Mikroelektronik", "KC 85/5", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, kc85_2, 0, 0, kc85_3, kc85, kc_state, 0, "VEB Mikroelektronik", "HC900 / KC 85/2", MACHINE_NOT_WORKING)
+COMP( 1987, kc85_3, kc85_2, 0, kc85_3, kc85, kc_state, 0, "VEB Mikroelektronik", "KC 85/3", MACHINE_NOT_WORKING)
+COMP( 1989, kc85_4, kc85_2, 0, kc85_4, kc85, kc85_4_state, 0, "VEB Mikroelektronik", "KC 85/4", MACHINE_NOT_WORKING)
+COMP( 1989, kc85_5, kc85_2, 0, kc85_5, kc85, kc85_4_state, 0, "VEB Mikroelektronik", "KC 85/5", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index cb925f7af52..632d54e53af 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -390,7 +390,7 @@ void kchamp_state::machine_reset()
m_sound_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( kchampvs, kchamp_state )
+static MACHINE_CONFIG_START( kchampvs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* verified on pcb */
@@ -437,7 +437,7 @@ static MACHINE_CONFIG_START( kchampvs, kchamp_state )
MCFG_SOUND_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */
MCFG_MSM5205_VCLK_CB(WRITELINE(kchamp_state, msmint)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 1 / 96 = 3906.25Hz playback */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 = 3906.25Hz playback */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
@@ -445,7 +445,7 @@ MACHINE_CONFIG_END
* 1 Player Version *
********************/
-static MACHINE_CONFIG_START( kchamp, kchamp_state )
+static MACHINE_CONFIG_START( kchamp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 12MHz / 4 = 3.0 MHz */
@@ -754,8 +754,8 @@ DRIVER_INIT_MEMBER(kchamp_state,kchampvs2)
-GAME( 1984, kchamp, 0, kchamp, kchamp, driver_device, 0, ROT90, "Data East USA", "Karate Champ (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, karatedo, kchamp, kchamp, kchamp, driver_device, 0, ROT90, "Data East Corporation", "Karate Dou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, kchamp, 0, kchamp, kchamp, kchamp_state, 0, ROT90, "Data East USA", "Karate Champ (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, karatedo, kchamp, kchamp, kchamp, kchamp_state, 0, ROT90, "Data East Corporation", "Karate Dou (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, kchampvs, kchamp, kchampvs, kchampvs, kchamp_state, kchampvs, ROT90, "Data East USA", "Karate Champ (US VS version, set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, kchampvs2, kchamp, kchampvs, kchampvs, kchamp_state, kchampvs2, ROT90, "Data East USA", "Karate Champ (US VS version, set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, karatevs, kchamp, kchampvs, kchampvs, kchamp_state, kchampvs, ROT90, "Data East Corporation", "Taisen Karate Dou (Japan VS version)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp
index 8fb73325ee5..7952391f98e 100644
--- a/src/mame/drivers/kenseim.cpp
+++ b/src/mame/drivers/kenseim.cpp
@@ -470,7 +470,7 @@ static const z80_daisy_config daisy_chain_gamecpu[] =
{ nullptr }
};
-static MACHINE_CONFIG_DERIVED_CLASS( kenseim, cps1_12MHz, kenseim_state )
+static MACHINE_CONFIG_DERIVED( kenseim, cps1_12MHz )
/* basic machine hardware */
MCFG_CPU_ADD("gamecpu", TMPZ84C011, XTAL_16MHz/2) // tmpz84c011-8
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index f653a717aba..c6da4e43fd3 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -628,7 +628,7 @@ void kickgoal_state::machine_reset()
m_m6295_key_delay = 0;
}
-static MACHINE_CONFIG_START( kickgoal, kickgoal_state )
+static MACHINE_CONFIG_START( kickgoal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -663,11 +663,11 @@ static MACHINE_CONFIG_START( kickgoal, kickgoal_state )
//MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 12000000/8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 12000000/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( actionhw, kickgoal_state )
+static MACHINE_CONFIG_START( actionhw )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* verified on pcb */
@@ -701,7 +701,7 @@ static MACHINE_CONFIG_START( actionhw, kickgoal_state )
//MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -778,5 +778,5 @@ DRIVER_INIT_MEMBER(kickgoal_state,kickgoal)
}
-GAME( 1995, kickgoal,0, kickgoal, kickgoal, kickgoal_state, kickgoal, ROT0, "TCH", "Kick Goal", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, actionhw,0, actionhw, kickgoal, kickgoal_state, kickgoal, ROT0, "TCH", "Action Hollywood", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, kickgoal, 0, kickgoal, kickgoal, kickgoal_state, kickgoal, ROT0, "TCH", "Kick Goal", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, actionhw, 0, actionhw, kickgoal, kickgoal_state, kickgoal, ROT0, "TCH", "Action Hollywood", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp
index 23fa7bdf16a..1c620f98f28 100644
--- a/src/mame/drivers/kim1.cpp
+++ b/src/mame/drivers/kim1.cpp
@@ -245,7 +245,7 @@ void kim1_state::machine_reset()
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( kim1, kim1_state )
+static MACHINE_CONFIG_START( kim1 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz */
MCFG_CPU_PROGRAM_MAP(kim1_map)
@@ -290,5 +290,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1975, kim1, 0, 0, kim1, kim1, driver_device, 0, "MOS Technologies", "KIM-1" , MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1975, kim1, 0, 0, kim1, kim1, kim1_state, 0, "MOS Technologies", "KIM-1" , MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index 087bc841830..15b9b1e4436 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -926,7 +926,7 @@ PALETTE_INIT_MEMBER(kingdrby_state,kingdrbb)
}
}
-static MACHINE_CONFIG_START( kingdrby, kingdrby_state )
+static MACHINE_CONFIG_START( kingdrby )
MCFG_CPU_ADD("master", Z80, CLK_2)
MCFG_CPU_PROGRAM_MAP(master_map)
MCFG_CPU_IO_MAP(master_io_map)
@@ -1012,7 +1012,7 @@ static MACHINE_CONFIG_DERIVED( cowrace, kingdrbb )
MCFG_GFXDECODE_MODIFY("gfxdecode", cowrace)
MCFG_PALETTE_MODIFY("palette")
MCFG_PALETTE_INIT_OWNER(kingdrby_state,kingdrby)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_SOUND_REPLACE("aysnd", YM2203, 3000000)
@@ -1192,7 +1192,7 @@ ROM_START( kingdrbb2 )
ROM_END
-GAMEL( 1981, kingdrby, 0, kingdrby, kingdrby, driver_device, 0, ROT0, "Tazmi", "King Derby (1981)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_kingdrby )
-GAME ( 1986, kingdrbb, kingdrby, kingdrbb, kingdrbb, driver_device, 0, ROT0, "bootleg (Casino Electronics)", "King Derby (Taiwan bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS )
-GAMEL( 198?, kingdrbb2, kingdrby, kingdrby, kingdrby, driver_device, 0, ROT0, "bootleg", "King Derby (bootleg set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_kingdrby )
-GAME ( 2000, cowrace, kingdrby, cowrace, kingdrbb, driver_device, 0, ROT0, "bootleg (Gate In)", "Cow Race (King Derby hack)", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS )
+GAMEL( 1981, kingdrby, 0, kingdrby, kingdrby, kingdrby_state, 0, ROT0, "Tazmi", "King Derby (1981)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_kingdrby )
+GAME ( 1986, kingdrbb, kingdrby, kingdrbb, kingdrbb, kingdrby_state, 0, ROT0, "bootleg (Casino Electronics)", "King Derby (Taiwan bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS )
+GAMEL( 198?, kingdrbb2, kingdrby, kingdrby, kingdrby, kingdrby_state, 0, ROT0, "bootleg", "King Derby (bootleg set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_kingdrby )
+GAME ( 2000, cowrace, kingdrby, cowrace, kingdrbb, kingdrby_state, 0, ROT0, "bootleg (Gate In)", "Cow Race (King Derby hack)", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS )
diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp
index c7ac7ba4957..211268f3fb5 100644
--- a/src/mame/drivers/kingobox.cpp
+++ b/src/mame/drivers/kingobox.cpp
@@ -460,7 +460,7 @@ void kingofb_state::machine_reset()
m_palette_bank = 0;
}
-static MACHINE_CONFIG_START( kingofb, kingofb_state )
+static MACHINE_CONFIG_START( kingofb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
@@ -514,7 +514,7 @@ MACHINE_CONFIG_END
/* Ring King */
-static MACHINE_CONFIG_START( ringking, kingofb_state )
+static MACHINE_CONFIG_START( ringking )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz */
@@ -859,9 +859,9 @@ DRIVER_INIT_MEMBER(kingofb_state,ringkingw)
}
-GAME( 1985, kingofb, 0, kingofb, kingofb, driver_device, 0, ROT90, "Wood Place Inc.", "King of Boxer (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, kingofbj, kingofb, kingofb, kingofb, driver_device, 0, ROT90, "Wood Place Inc.", "King of Boxer (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, kingofb, 0, kingofb, kingofb, kingofb_state, 0, ROT90, "Wood Place Inc.", "King of Boxer (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, kingofbj, kingofb, kingofb, kingofb, kingofb_state, 0, ROT90, "Wood Place Inc.", "King of Boxer (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, ringkingw, kingofb, kingofb, kingofb, kingofb_state, ringkingw, ROT90, "Wood Place Inc.", "Ring King (US, Wood Place Inc.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ringking, kingofb, ringking, ringking, driver_device, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ringking2, kingofb, ringking, ringking, driver_device, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ringking, kingofb, ringking, ringking, kingofb_state, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ringking2, kingofb, ringking, ringking, kingofb_state, 0, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, ringking3, kingofb, kingofb, kingofb, kingofb_state, ringking3, ROT90, "Wood Place Inc. (Data East USA license)", "Ring King (US set 3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp
index b581089475e..27cb6ce9abf 100644
--- a/src/mame/drivers/kingpin.cpp
+++ b/src/mame/drivers/kingpin.cpp
@@ -127,7 +127,7 @@ static INPUT_PORTS_START( kingpin )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( kingpin, kingpin_state )
+static MACHINE_CONFIG_START( kingpin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
@@ -210,5 +210,5 @@ ROM_START( maxideal )
ROM_END
-GAME( 1983, kingpin, 0, kingpin, kingpin, driver_device, 0, 0, "ACL Manufacturing", "Kingpin", 0)
-GAME( 1983, maxideal, 0, kingpin, kingpin, driver_device, 0, 0, "ACL Manufacturing", "Maxi-Dealer", 0)
+GAME( 1983, kingpin, 0, kingpin, kingpin, kingpin_state, 0, 0, "ACL Manufacturing", "Kingpin", 0 )
+GAME( 1983, maxideal, 0, kingpin, kingpin, kingpin_state, 0, 0, "ACL Manufacturing", "Maxi-Dealer", 0 )
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp
index c6f29e8958d..1f5c56702a5 100644
--- a/src/mame/drivers/kinst.cpp
+++ b/src/mame/drivers/kinst.cpp
@@ -666,7 +666,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( kinst, kinst_state )
+static MACHINE_CONFIG_START( kinst )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R4600LE, MASTER_CLOCK*2)
@@ -932,7 +932,7 @@ DRIVER_INIT_MEMBER(kinst_state,kinst2)
*
*************************************/
-GAME( 1994, kinst, 0, kinst, kinst, kinst_state, kinst, ROT0, "Rare", "Killer Instinct (v1.5d)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, kinst, 0, kinst, kinst, kinst_state, kinst, ROT0, "Rare", "Killer Instinct (v1.5d)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, kinst14, kinst, kinst, kinst2, kinst_state, kinst, ROT0, "Rare", "Killer Instinct (v1.4)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, kinst13, kinst, kinst, kinst2, kinst_state, kinst, ROT0, "Rare", "Killer Instinct (v1.3)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, kinstp, kinst, kinst, kinst2, kinst_state, kinst, ROT0, "Rare", "Killer Instinct (proto v4.7)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kissproto.cpp b/src/mame/drivers/kissproto.cpp
index d732fb116be..60a8c68dd86 100644
--- a/src/mame/drivers/kissproto.cpp
+++ b/src/mame/drivers/kissproto.cpp
@@ -46,7 +46,7 @@ DRIVER_INIT_MEMBER(kissp_state,kissp)
{
}
-static MACHINE_CONFIG_START( kissp, kissp_state )
+static MACHINE_CONFIG_START( kissp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8035, 6000000/15)
MCFG_CPU_PROGRAM_MAP(kissp_map)
@@ -72,5 +72,5 @@ ROM_START(kissp2)
ROM_RELOAD( 0x4800, 0x0800)
ROM_END
-GAME( 1979, kissp, kiss, kissp, kissp, kissp_state, kissp, ROT0, "Bally", "Kiss (prototype)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1979, kissp, kiss, kissp, kissp, kissp_state, kissp, ROT0, "Bally", "Kiss (prototype)", MACHINE_IS_SKELETON_MECHANICAL )
GAME( 1979, kissp2, kiss, kissp, kissp, kissp_state, kissp, ROT0, "Bally", "Kiss (prototype v.2)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp
index c90a405d368..7446c8b27f3 100644
--- a/src/mame/drivers/klax.cpp
+++ b/src/mame/drivers/klax.cpp
@@ -190,7 +190,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( klax, klax_state )
+static MACHINE_CONFIG_START( klax )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -226,7 +226,7 @@ static MACHINE_CONFIG_START( klax, klax_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -438,10 +438,10 @@ ROM_END
*
*************************************/
-GAME( 1989, klax, 0, klax, klax, driver_device, 0, ROT0, "Atari Games", "Klax (set 1)", 0 )
-GAME( 1989, klax2, klax, klax, klax, driver_device, 0, ROT0, "Atari Games", "Klax (set 2)", 0 )
-GAME( 1989, klax3, klax, klax, klax, driver_device, 0, ROT0, "Atari Games", "Klax (set 3)", 0 )
-GAME( 1989, klaxj, klax, klax, klax, driver_device, 0, ROT0, "Atari Games", "Klax (Japan)", 0 )
-GAME( 1989, klaxd, klax, klax, klax, driver_device, 0, ROT0, "Atari Games", "Klax (Germany)", 0 )
+GAME( 1989, klax, 0, klax, klax, klax_state, 0, ROT0, "Atari Games", "Klax (set 1)", 0 )
+GAME( 1989, klax2, klax, klax, klax, klax_state, 0, ROT0, "Atari Games", "Klax (set 2)", 0 )
+GAME( 1989, klax3, klax, klax, klax, klax_state, 0, ROT0, "Atari Games", "Klax (set 3)", 0 )
+GAME( 1989, klaxj, klax, klax, klax, klax_state, 0, ROT0, "Atari Games", "Klax (Japan)", 0 )
+GAME( 1989, klaxd, klax, klax, klax, klax_state, 0, ROT0, "Atari Games", "Klax (Germany)", 0 )
-GAME( 1989, klax2bl, klax, klax2bl, klax, driver_device, 0, ROT0, "bootleg", "Klax (set 2, bootleg)", MACHINE_NOT_WORKING )
+GAME( 1989, klax2bl, klax, klax2bl, klax, klax_state, 0, ROT0, "bootleg", "Klax (set 2, bootleg)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp
index 39e5df12cac..2f07c4a98fe 100644
--- a/src/mame/drivers/kncljoe.cpp
+++ b/src/mame/drivers/kncljoe.cpp
@@ -252,7 +252,7 @@ void kncljoe_state::machine_reset()
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( kncljoe, kncljoe_state )
+static MACHINE_CONFIG_START( kncljoe )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_6MHz) /* verified on pcb */
@@ -397,6 +397,6 @@ ROM_END
-GAME( 1985, kncljoe, 0, kncljoe, kncljoe, driver_device, 0, ROT0, "Seibu Kaihatsu (Taito license)", "Knuckle Joe (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, kncljoea, kncljoe, kncljoe, kncljoe, driver_device, 0, ROT0, "Seibu Kaihatsu (Taito license)", "Knuckle Joe (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, bcrusher, kncljoe, kncljoe, kncljoe, driver_device, 0, ROT0, "bootleg", "Bone Crusher", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, kncljoe, 0, kncljoe, kncljoe, kncljoe_state, 0, ROT0, "Seibu Kaihatsu (Taito license)", "Knuckle Joe (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, kncljoea, kncljoe, kncljoe, kncljoe, kncljoe_state, 0, ROT0, "Seibu Kaihatsu (Taito license)", "Knuckle Joe (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, bcrusher, kncljoe, kncljoe, kncljoe, kncljoe_state, 0, ROT0, "bootleg", "Bone Crusher", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index 3802e8e960b..2dcd56578bd 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -28,8 +28,6 @@ ft5_v6_c4.u58 /
*/
-#define NVRAM_HACK 1
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
@@ -39,6 +37,8 @@ ft5_v6_c4.u58 /
#include "speaker.h"
+#define NVRAM_HACK 1
+
class koftball_state : public driver_device
{
public:
@@ -228,7 +228,7 @@ static GFXDECODE_START( koftball )
GFXDECODE_END
-static MACHINE_CONFIG_START( koftball, koftball_state )
+static MACHINE_CONFIG_START( koftball )
MCFG_CPU_ADD("maincpu", M68000, XTAL_21_4772MHz / 2)
MCFG_CPU_PROGRAM_MAP(koftball_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", koftball_state, bmc_interrupt, "screen", 0, 1)
@@ -252,7 +252,7 @@ static MACHINE_CONFIG_START( koftball, koftball_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_LOW) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1122000, PIN7_LOW) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp
index 7c066b35e9c..1f8ccecccab 100644
--- a/src/mame/drivers/koikoi.cpp
+++ b/src/mame/drivers/koikoi.cpp
@@ -347,7 +347,7 @@ void koikoi_state::machine_reset()
m_ioram[i] = 0;
}
-static MACHINE_CONFIG_START( koikoi, koikoi_state )
+static MACHINE_CONFIG_START( koikoi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,KOIKOI_CRYSTAL/4) /* ?? */
@@ -432,4 +432,4 @@ ROM_END
*
*************************************/
-GAME( 1982, koikoi, 0, koikoi, koikoi, driver_device, 0, ROT270, "Kiwako", "Koi Koi Part 2", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, koikoi, 0, koikoi, koikoi, koikoi_state, 0, ROT270, "Kiwako", "Koi Koi Part 2", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp
index 522c1571306..d5fa61e8106 100644
--- a/src/mame/drivers/konamigq.cpp
+++ b/src/mame/drivers/konamigq.cpp
@@ -311,7 +311,7 @@ MACHINE_RESET_MEMBER(konamigq_state,konamigq)
{
}
-static MACHINE_CONFIG_START( konamigq, konamigq_state )
+static MACHINE_CONFIG_START( konamigq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CXD8530BQ, XTAL_67_7376MHz)
MCFG_CPU_PROGRAM_MAP(konamigq_map)
@@ -319,8 +319,8 @@ static MACHINE_CONFIG_START( konamigq, konamigq_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&konamigq_state::scsi_dma_read, (konamigq_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&konamigq_state::scsi_dma_write, (konamigq_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigq_state::scsi_dma_read, (konamigq_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigq_state::scsi_dma_write, (konamigq_state *) owner ) )
MCFG_CPU_ADD("soundcpu", M68000, XTAL_32MHz/4) /* 8MHz - measured */
MCFG_CPU_PROGRAM_MAP(konamigq_sound_map)
diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp
index c8aa17a5015..52176b87920 100644
--- a/src/mame/drivers/konamigv.cpp
+++ b/src/mame/drivers/konamigv.cpp
@@ -320,7 +320,7 @@ static MACHINE_CONFIG_FRAGMENT( cdrom_config )
MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( konamigv, konamigv_state )
+static MACHINE_CONFIG_START( konamigv )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8530BQ, XTAL_67_7376MHz )
MCFG_CPU_PROGRAM_MAP( konamigv_map )
@@ -328,8 +328,8 @@ static MACHINE_CONFIG_START( konamigv, konamigv_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("2M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&konamigv_state::scsi_dma_read, (konamigv_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&konamigv_state::scsi_dma_write, (konamigv_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&konamigv_state::scsi_dma_read, (konamigv_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&konamigv_state::scsi_dma_write, (konamigv_state *) owner ) )
MCFG_DEVICE_ADD("mb89371", MB89371, 0)
MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
@@ -848,19 +848,19 @@ ROM_START( tmoshspa )
ROM_END
/* BIOS placeholder */
-GAME( 1995, konamigv, 0, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Baby Phoenix/GV System", MACHINE_IS_BIOS_ROOT )
-
-GAME( 1996, powyak96, konamigv, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Jikkyou Powerful Pro Yakyuu '96 (GV017 Japan 1.03)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, hyperath, konamigv, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Hyper Athlete (GV021 Japan 1.00)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, lacrazyc, konamigv, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Let's Attack Crazy Cross (GV027 Asia 1.10)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, susume, lacrazyc, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Susume! Taisen Puzzle-Dama (GV027 Japan 1.20)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, btchamp, konamigv, btchamp, btchamp, driver_device, 0, ROT0, "Konami", "Beat the Champ (GV053 UAA01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, kdeadeye, konamigv, kdeadeye, kdeadeye, driver_device, 0, ROT0, "Konami", "Dead Eye (GV054 UAA01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, weddingr, konamigv, konamigv, weddingr, driver_device, 0, ROT0, "Konami", "Wedding Rhapsody (GX624 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, tmosh, konamigv, tmosh, konamigv, driver_device, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart (GQ673 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1997, tmoshs, konamigv, tmosh, konamigv, driver_device, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version (GE755 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1997, tmoshsp, konamigv, tmosh, konamigv, driver_device, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version Plus (GE756 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1997, tmoshspa, tmoshsp, tmosh, konamigv, driver_device, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version Plus (GE756 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1998, nagano98, konamigv, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Nagano Winter Olympics '98 (GX720 EAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
-GAME( 1998, naganoj, nagano98, konamigv, konamigv, driver_device, 0, ROT0, "Konami", "Hyper Olympic in Nagano (GX720 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
+GAME( 1995, konamigv, 0, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Baby Phoenix/GV System", MACHINE_IS_BIOS_ROOT )
+
+GAME( 1996, powyak96, konamigv, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Jikkyou Powerful Pro Yakyuu '96 (GV017 Japan 1.03)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, hyperath, konamigv, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Hyper Athlete (GV021 Japan 1.00)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, lacrazyc, konamigv, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Let's Attack Crazy Cross (GV027 Asia 1.10)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, susume, lacrazyc, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Susume! Taisen Puzzle-Dama (GV027 Japan 1.20)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, btchamp, konamigv, btchamp, btchamp, konamigv_state, 0, ROT0, "Konami", "Beat the Champ (GV053 UAA01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, kdeadeye, konamigv, kdeadeye, kdeadeye, konamigv_state, 0, ROT0, "Konami", "Dead Eye (GV054 UAA01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, weddingr, konamigv, konamigv, weddingr, konamigv_state, 0, ROT0, "Konami", "Wedding Rhapsody (GX624 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, tmosh, konamigv, tmosh, konamigv, konamigv_state, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart (GQ673 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1997, tmoshs, konamigv, tmosh, konamigv, konamigv_state, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version (GE755 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1997, tmoshsp, konamigv, tmosh, konamigv, konamigv_state, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version Plus (GE756 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1997, tmoshspa, tmoshsp, tmosh, konamigv, konamigv_state, 0, ROT0, "Konami", "Tokimeki Memorial Oshiete Your Heart Seal Version Plus (GE756 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1998, nagano98, konamigv, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Nagano Winter Olympics '98 (GX720 EAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
+GAME( 1998, naganoj, nagano98, konamigv, konamigv, konamigv_state, 0, ROT0, "Konami", "Hyper Olympic in Nagano (GX720 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
GAME( 2000, simpbowl, konamigv, simpbowl, simpbowl, konamigv_state, simpbowl, ROT0, "Konami", "Simpsons Bowling (GQ829 UAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index 94164f5ef83..5cde5f8072d 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -1609,7 +1609,7 @@ WRITE_LINE_MEMBER(konamigx_state::hblank_irq_ack_w)
m_gx_syncen |= 0x40;
}
-static MACHINE_CONFIG_START( konamigx, konamigx_state )
+static MACHINE_CONFIG_START( konamigx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(gx_type2_map)
diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp
index fb180a6874e..71149b07a8a 100644
--- a/src/mame/drivers/konamim2.cpp
+++ b/src/mame/drivers/konamim2.cpp
@@ -1269,7 +1269,7 @@ void konamim2_state::machine_reset()
cde_init();
}
-static MACHINE_CONFIG_START( m2, konamim2_state )
+static MACHINE_CONFIG_START( m2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC602, 66000000) /* actually PPC602, 66MHz */
@@ -1302,7 +1302,7 @@ static MACHINE_CONFIG_START( m2, konamim2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS ( 3do_m2, m2, konamim2_state )
+static MACHINE_CONFIG_DERIVED ( 3do_m2, m2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(3do_m2_main)
@@ -1458,4 +1458,4 @@ GAME( 1998, evilngt, 0, m2, m2, konamim2_state, m2, ROT0, "Konami", "Evi
GAME( 1998, evilngte, evilngt, m2, m2, konamim2_state, m2, ROT0, "Konami", "Evil Night (ver EAA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
GAME( 1998, hellngt, evilngt, m2, m2, konamim2_state, m2, ROT0, "Konami", "Hell Night (ver EAA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-CONS( 199?, 3do_m2, 0, 0, 3do_m2, m2, driver_device, 0, "3DO", "3DO M2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 199?, 3do_m2, 0, 0, 3do_m2, m2, konamim2_state, 0, "3DO", "3DO M2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp
index 4bbbfdc35ed..9e583f34f53 100644
--- a/src/mame/drivers/konendev.cpp
+++ b/src/mame/drivers/konendev.cpp
@@ -299,7 +299,7 @@ INTERRUPT_GEN_MEMBER(konendev_state::vbl_interrupt)
device.execute().set_input_line(INPUT_LINE_IRQ3, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( konendev, konendev_state )
+static MACHINE_CONFIG_START( konendev )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GCX, 32000000) // Clock unknown
MCFG_CPU_PROGRAM_MAP(konendev_map)
diff --git a/src/mame/drivers/konin.cpp b/src/mame/drivers/konin.cpp
index db194aa5e59..68c15cf24f3 100644
--- a/src/mame/drivers/konin.cpp
+++ b/src/mame/drivers/konin.cpp
@@ -102,7 +102,7 @@ WRITE_LINE_MEMBER( konin_state::clock_w )
m_uart->write_rxc(state);
}
-static MACHINE_CONFIG_START( konin, konin_state )
+static MACHINE_CONFIG_START( konin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(konin_mem)
@@ -140,5 +140,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, konin, 0, 0, konin, konin, driver_device, 0, "Mera-Elzab", "Konin", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, konin, 0, 0, konin, konin, konin_state, 0, "Mera-Elzab", "Konin", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp
index 4686ffb5434..0b6dbb22163 100644
--- a/src/mame/drivers/konmedal.cpp
+++ b/src/mame/drivers/konmedal.cpp
@@ -206,7 +206,7 @@ void konmedal_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( konmedal, konmedal_state )
+static MACHINE_CONFIG_START( konmedal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) // z84c0008pec 8mhz part, 14.31818Mhz xtal verified on PCB, divisor unknown
@@ -261,4 +261,4 @@ ROM_START( tsukande )
ROM_LOAD( "441a12.10e", 0x080000, 0x080000, CRC(dc2dd5bc) SHA1(28ef6c96c360d706a4296a686f3f2a54fce61bfb) )
ROM_END
-GAME( 1995, tsukande, 0, konmedal, konmedal, driver_device, 0, 0, "Konami", "Tsukande Toru Chicchi", MACHINE_NOT_WORKING)
+GAME( 1995, tsukande, 0, konmedal, konmedal, konmedal_state, 0, ROT0, "Konami", "Tsukande Toru Chicchi", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp
index e794a2fd9ad..22f3610345d 100644
--- a/src/mame/drivers/kontest.cpp
+++ b/src/mame/drivers/kontest.cpp
@@ -247,7 +247,7 @@ void kontest_state::machine_reset()
m_control = 0;
}
-static MACHINE_CONFIG_START( kontest, kontest_state )
+static MACHINE_CONFIG_START( kontest )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8)
@@ -291,4 +291,4 @@ ROM_START( kontest )
ROM_LOAD( "800a02.4f", 0x000000, 0x000020, CRC(6d604171) SHA1(6b1366fb53cecbde6fb651142a77917dd16daf69) )
ROM_END
-GAME( 1987?, kontest, 0, kontest, kontest, driver_device, 0, ROT0, "Konami", "Konami Test Board (GX800, Japan)", MACHINE_SUPPORTS_SAVE ) // late 1987 or early 1988
+GAME( 1987?, kontest, 0, kontest, kontest, kontest_state, 0, ROT0, "Konami", "Konami Test Board (GX800, Japan)", MACHINE_SUPPORTS_SAVE ) // late 1987 or early 1988
diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp
index 50abe9a3b3c..2ca5856dcb4 100644
--- a/src/mame/drivers/kopunch.cpp
+++ b/src/mame/drivers/kopunch.cpp
@@ -229,7 +229,7 @@ void kopunch_state::machine_start()
save_item(NAME(m_scrollx));
}
-static MACHINE_CONFIG_START( kopunch, kopunch_state )
+static MACHINE_CONFIG_START( kopunch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, 4000000) // 4 MHz?
@@ -312,4 +312,4 @@ ROM_START( kopunch )
ROM_END
-GAME( 1981, kopunch, 0, kopunch, kopunch, driver_device, 0, ROT270, "Sega", "KO Punch", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, kopunch, 0, kopunch, kopunch, kopunch_state, 0, ROT270, "Sega", "KO Punch", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp
index 03f0fd2d900..9197df36af2 100644
--- a/src/mame/drivers/kramermc.cpp
+++ b/src/mame/drivers/kramermc.cpp
@@ -109,7 +109,7 @@ static INPUT_PORTS_START( kramermc )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( kramermc, kramermc_state )
+static MACHINE_CONFIG_START( kramermc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 1500000)
MCFG_CPU_PROGRAM_MAP(kramermc_mem)
@@ -150,5 +150,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, kramermc, 0, 0, kramermc, kramermc, kramermc_state, kramermc,"Manfred Kramer", "Kramer MC", MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, kramermc, 0, 0, kramermc, kramermc, kramermc_state, kramermc,"Manfred Kramer", "Kramer MC", MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index 74e7888b7d0..6af2118dba0 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -290,7 +290,7 @@ WRITE_LINE_MEMBER(kron180_state::keyb_interrupt)
/*
* Machine configuration
*/
-static MACHINE_CONFIG_START (kron180, kron180_state)
+static MACHINE_CONFIG_START (kron180)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", Z180, XTAL_12_288MHz)
MCFG_CPU_PROGRAM_MAP (kron180_mem)
@@ -321,5 +321,5 @@ ROM_START (kron180)
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1995, kron180, 0, 0, kron180, kron180, driver_device, 0, "Kron Ltd", "Kron K-180", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP ( 1995, kron180, 0, 0, kron180, kron180, kron180_state, 0, "Kron Ltd", "Kron K-180", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp
index 3e67efdd53d..4ec6e1a2dd1 100644
--- a/src/mame/drivers/ksayakyu.cpp
+++ b/src/mame/drivers/ksayakyu.cpp
@@ -250,7 +250,7 @@ void ksayakyu_state::machine_reset()
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( ksayakyu, ksayakyu_state )
+static MACHINE_CONFIG_START( ksayakyu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MAIN_CLOCK/8) //divider is guessed
@@ -333,4 +333,4 @@ ROM_START( ksayakyu )
ROM_LOAD( "9f.bin", 0x0000, 0x0100, CRC(ff71b27f) SHA1(6aad2bd2be997595a05ddb81d24df8fe1435910b) )
ROM_END
-GAME( 1985, ksayakyu, 0, ksayakyu, ksayakyu, driver_device, 0, ORIENTATION_FLIP_Y, "Taito Corporation", "Kusayakyuu", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ksayakyu, 0, ksayakyu, ksayakyu, ksayakyu_state, 0, ORIENTATION_FLIP_Y, "Taito Corporation", "Kusayakyuu", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index d05e306822b..4d70db2351d 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -2021,7 +2021,7 @@ static MACHINE_CONFIG_FRAGMENT( cr589_config )
MCFG_SOUND_ROUTE( 1, "^^^^rspeaker", 1.0 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( konami573, ksys573_state )
+static MACHINE_CONFIG_START( konami573 )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
MCFG_CPU_PROGRAM_MAP( konami573_map )
@@ -2029,8 +2029,8 @@ static MACHINE_CONFIG_START( konami573, ksys573_state )
MCFG_RAM_MODIFY( "maincpu:ram" )
MCFG_RAM_DEFAULT_SIZE( "4M" )
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&ksys573_state::cdrom_dma_read, (ksys573_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&ksys573_state::cdrom_dma_write, (ksys573_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&ksys573_state::cdrom_dma_read, (ksys573_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&ksys573_state::cdrom_dma_write, (ksys573_state *) owner ) )
MCFG_MACHINE_RESET_OVERRIDE( ksys573_state, konami573 )
@@ -4742,117 +4742,117 @@ ROM_START( strgchmp )
ROM_LOAD( "710uaa.22h", 0x000000, 0x002000, CRC(a3e93d49) SHA1(630daa1a02320433a068eb5214f6b30acc06df76) )
ROM_END
-GAME( 1997, sys573, 0, konami573, konami573, driver_device, 0, ROT0, "Konami", "System 573 BIOS", MACHINE_IS_BIOS_ROOT )
-
-GAME( 1997, strgchmp, sys573, konami573, hndlchmp, driver_device, 0, ROT0, "Konami", "Steering Champ (GQ710 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, hndlchmp, strgchmp, konami573, hndlchmp, driver_device, 0, ROT0, "Konami", "Handle Champ (GQ710 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, darkhleg, sys573, konami573x, konami573, driver_device, 0, ROT0, "Konami", "Dark Horse Legend (GX706 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, fbaitbc, sys573, fbaitbc, fbaitbc, driver_device, 0, ROT0, "Konami", "Fisherman's Bait - A Bass Challenge (GE765 VER. UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, bassangl, fbaitbc, fbaitbc, fbaitbc, driver_device, 0, ROT0, "Konami", "Bass Angler (GE765 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, powyakex, sys573, konami573x, konami573, driver_device, 0, ROT0, "Konami", "Jikkyou Powerful Pro Yakyuu EX (GX802 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, konam80s, sys573, konami573x, konami573, driver_device, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, konam80u, konam80s, konami573x, konami573, driver_device, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, konam80j, konam80s, konami573x, konami573, driver_device, 0, ROT90, "Konami", "Konami 80's Gallery (GC826 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, konam80a, konam80s, konami573x, konami573, driver_device, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, konam80k, konam80s, konami573x, konami573, driver_device, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, dstage, sys573, dsftkd, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage - Internet Ranking Ver (GC845 VER. EBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, dstagea, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage (GN845 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddru, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GN845 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, ddrj, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution - Internet Ranking Ver (GC845 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, ddrja, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GC845 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1998, ddrjb, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GC845 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, ddra, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GN845 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, fbait2bc, sys573, fbaitbc, fbaitbc, driver_device, 0, ROT0, "Konami", "Fisherman's Bait 2 - A Bass Challenge (GE865 VER. UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, bassang2, fbait2bc, fbaitbc, fbaitbc, driver_device, 0, ROT0, "Konami", "Bass Angler 2 (GE865 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, hyperbbc, sys573, hyperbbc, hyperbbc, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ (GQ876 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, hyperbbca, hyperbbc, hyperbbc, hyperbbc, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ (GQ876 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, hyperbbck, hyperbbc, hyperbbc, hyperbbc, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ (GE876 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, gchgchmp, sys573, gchgchmp, gchgchmp, driver_device, 0, ROT0, "Konami", "Gachaga Champ (GE877 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, drmn, sys573, drmn, drmn, ksys573_state, drmn, ROT0, "Konami", "DrumMania (GQ881 VER. JAD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, gtrfrks, sys573, gtrfrks, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. EAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, gtrfrksu, gtrfrks, gtrfrks, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. UAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, gtrfrksj, gtrfrks, gtrfrks, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. JAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, gtrfrksa, gtrfrks, gtrfrks, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. AAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, fbaitmc, sys573, fbaitbc, fbaitmc, driver_device, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. EA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, fbaitmcu, fbaitmc, fbaitbc, fbaitmc, driver_device, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. UA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, fbaitmcj, fbaitmc, fbaitbc, fbaitmc, driver_device, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. JA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, fbaitmca, fbaitmc, fbaitbc, fbaitmc, driver_device, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. AA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddr2m, sys573, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix (GN895 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddr2ml, ddr2m, ddr2ml, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix - Link Ver (GE885 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddr2mla, ddr2m, ddr2ml, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix - Link Ver (GE885 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddrbocd, ddr2m, ddr2ml, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution Best of Cool Dancers (GE892 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddr2mc, ddr2m, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix with beatmaniaIIDX CLUB VERSiON (GE896 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, ddr2mc2, ddr2m, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix with beatmaniaIIDX substream CLUB VERSiON 2 (GE984 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, gtrfrk2m, sys573, gtrfrk2m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 2nd Mix Ver 1.01 (GQ883 VER. JAD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, dsftkd, sys573, dsftkd, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage featuring TRUE KiSS DESTiNATiON (G*884 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, cr589fw, sys573, konami573, konami573, driver_device, 0, ROT0, "Konami", "CD-ROM Drive Updater 2.0 (700B04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, cr589fwa, sys573, konami573, konami573, driver_device, 0, ROT0, "Konami", "CD-ROM Drive Updater (700A04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, ddr3mk, sys573, ddr3m, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix - Ver.Korea2 (GN887 VER. KBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.3 */
-GAME( 2000, ddr3mka, ddr3mk, ddr3m, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix - Ver.Korea (GN887 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.3 */
-GAME( 1999, ddr3ma, ddr3mk, ddr3m, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix (GN887 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.1 */
-GAME( 1999, ddr3mj, ddr3mk, ddr3m, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix (GN887 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.0 */
-GAME( 1999, ddrsbm, sys573, ddrsolo, ddrsolo, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution Solo Bass Mix (GQ894 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, ddrs2k, sys573, ddrs2k, ddrsolo, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution Solo 2000 (GC905 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.3 */
-GAME( 1999, ddrs2kj, ddrs2k, ddrs2k, ddrsolo, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution Solo 2000 (GC905 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.2 */
-GAME( 1999, hypbbc2p, sys573, hypbbc2p, hypbbc2p, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ - 2 Player (GX908 1999/08/24 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, hypbbc2pk, hypbbc2p, hypbbc2p, hypbbc2p, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ - 2 Player (GX908 1999/08/24 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, dsfdct, sys573, ddr3m, ddr, driver_device, 0, ROT0, "Konami", "Dancing Stage featuring Dreams Come True (GC910 VER. JCA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, dsfdcta, dsfdct, dsfdcta, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage featuring Dreams Come True (GC910 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, drmn2m, sys573, drmn2m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 2nd Mix (GE912 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.5 */
-GAME( 1999, drmn2mpu, drmn2m, drmn2m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 2nd Mix Session Power Up Kit (GE912 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.5 */
-GAME( 1999, stepchmp, sys573, salarymc, hyperbbc, ksys573_state, salarymc, ROT0, "Konami", "Step Champ (GQ930 VER. JA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 2000, dncfrks, sys573, dmx, dmx, driver_device, 0, ROT0, "Konami", "Dance Freaks (G*874 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.6 */
-GAME( 2000, dmx, dncfrks, dmx, dmx, driver_device, 0, ROT0, "Konami", "Dance Maniax (G*874 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.6 */
-GAME( 2000, gunmania, sys573, gunmania, gunmania, driver_device, 0, ROT0, "Konami", "GunMania (GL906 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 2000, fghtmn, sys573, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, fghtmna, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, pnchmn, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Punch Mania: Hokuto No Ken (GQ918 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, pnchmna, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Punch Mania: Hokuto No Ken (GQ918 VER. JAB ALT CD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, fghtmnk, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, fghtmnu, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, dsem, sys573, dsem, ddr, driver_device, 0, ROT0, "Konami", "Dancing Stage Euro Mix (G*936 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.7 */
-GAME( 2000, gtrfrk3m, sys573, gtrfrk3m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 3rd Mix (GE949 VER. JAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.4 */
-GAME( 2000, gtfrk3ma, gtrfrk3m, gtrfrk3m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 3rd Mix (GE949 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.4 */
-GAME( 2000, gtfrk3mb, gtrfrk3m, gtrfrk5m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 3rd Mix - security cassette versionup (949JAZ02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.4 */
-GAME( 2000, pnchmn2, sys573, pnchmn2, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Punch Mania 2: Hokuto No Ken (GQA09 JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
-GAME( 2000, salarymc, sys573, salarymc, hypbbc2p, ksys573_state, salarymc, ROT0, "Konami", "Salary Man Champ (GCA18 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, ddr3mp, sys573, ddr3mp, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix Plus (G*A22 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.6 */
-GAME( 2000, pcnfrk3m, sys573, drmn2m, drmn, driver_device, 0, ROT0, "Konami", "Percussion Freaks 3rd Mix (G*A23 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, drmn3m, pcnfrk3m, drmn2m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 3rd Mix (G*A23 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, gtrfrk4m, sys573, gtrfrk3m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 4th Mix (G*A24 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, ddr4m, sys573, ddr3mp, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix (G*A33 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, ddr4mj, ddr4m, ddr3mp, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix (G*A33 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, ddr4ms, sys573, ddr4ms, ddrsolo, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Solo (G*A33 VER. ABA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, ddr4msj, ddr4ms, ddr4ms, ddrsolo, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Solo (G*A33 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, dsfdr, sys573, dsfdr, ddr, driver_device, 0, ROT0, "Konami", "Dancing Stage Featuring Disney's Rave (GCA37JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, ddrusa, sys573, ddrusa, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution USA (G*A44 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2000, ddr4mp, sys573, ddr3mp, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Plus (G*A34 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2000, ddr4mps, sys573, ddr4ms, ddrsolo, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Plus Solo (G*A34 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2000, dmx2m, sys573, dmx, dmx, driver_device, 0, ROT0, "Konami", "Dance Maniax 2nd Mix (G*A39 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2000, drmn4m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 4th Mix (G*A25 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
-GAME( 2001, gtrfrk5m, sys573, gtrfrk5m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 5th Mix (G*A26 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2001, ddr5m, sys573, ddr5m, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution 5th Mix (G*A27 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2001, dmx2majp, sys573, dmx, dmx, driver_device, 0, ROT0, "Konami", "Dance Maniax 2nd Mix Append J-Paradise (G*A38 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2001, mamboagg, sys573, mamboagg, mamboagg, driver_device, 0, ROT0, "Konami", "Mambo A Go-Go (GQA40 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2001, mamboagga, mamboagg, mamboagga, mamboagg, driver_device, 0, ROT0, "Konami", "Mambo A Go-Go e-Amusement (GQA40 VER. JRB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2001, drmn5m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 5th Mix (G*B05 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2001, gtrfrk6m, sys573, gtrfrk5m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 6th Mix (G*B06 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2001, drmn6m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 6th Mix (G*B16 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2001, gtrfrk7m, sys573, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 7th Mix (G*B17 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2001, ddrmax, sys573, ddr5m, ddr, driver_device, 0, ROT0, "Konami", "DDR Max - Dance Dance Revolution 6th Mix (G*B19 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2002, ddrmax2, sys573, ddr5m, ddr, driver_device, 0, ROT0, "Konami", "DDR Max 2 - Dance Dance Revolution 7th Mix (G*B20 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2002, mrtlbeat, sys573, ddr5m, ddr, driver_device, 0, ROT0, "Konami", "Martial Beat (G*B47 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
-GAME( 2002, drmn7m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 7th Mix power-up ver. (G*C07 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2002, drmn7ma, drmn7m, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 7th Mix (G*C07 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2002, gtrfrk8m, sys573, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 8th Mix power-up ver. (G*C08 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2002, gtrfrk8ma, gtrfrk8m, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 8th Mix (G*C08 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2002, dsem2, sys573, ddr5m, ddr, driver_device, 0, ROT0, "Konami", "Dancing Stage Euro Mix 2 (G*C23 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2002, ddrextrm, sys573, ddr5m, ddr, driver_device, 0, ROT0, "Konami", "Dance Dance Revolution Extreme (G*C36 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2003, drmn8m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 8th Mix (G*C07 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2003, gtrfrk9m, sys573, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 9th Mix (G*C39 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2003, drmn9m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 9th Mix (G*D09 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2003, gtfrk10m, sys573, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 10th Mix (G*D10 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2003, gtfrk10ma, gtfrk10m, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 10th Mix (G*D10 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2003, gtfrk10mb, gtfrk10m, gtfrk10mb, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 10th Mix eAmusement (G*D10 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2004, gtfrk11m, sys573, gtrfrk7m, gtrfrks, driver_device, 0, ROT0, "Konami", "Guitar Freaks 11th Mix (G*D39 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
-GAME( 2004, drmn10m, sys573, drmn4m, drmn, driver_device, 0, ROT0, "Konami", "DrumMania 10th Mix (G*D40 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 1997, sys573, 0, konami573, konami573, ksys573_state, 0, ROT0, "Konami", "System 573 BIOS", MACHINE_IS_BIOS_ROOT )
+
+GAME( 1997, strgchmp, sys573, konami573, hndlchmp, ksys573_state, 0, ROT0, "Konami", "Steering Champ (GQ710 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, hndlchmp, strgchmp, konami573, hndlchmp, ksys573_state, 0, ROT0, "Konami", "Handle Champ (GQ710 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, darkhleg, sys573, konami573x, konami573, ksys573_state, 0, ROT0, "Konami", "Dark Horse Legend (GX706 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, fbaitbc, sys573, fbaitbc, fbaitbc, ksys573_state, 0, ROT0, "Konami", "Fisherman's Bait - A Bass Challenge (GE765 VER. UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, bassangl, fbaitbc, fbaitbc, fbaitbc, ksys573_state, 0, ROT0, "Konami", "Bass Angler (GE765 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, powyakex, sys573, konami573x, konami573, ksys573_state, 0, ROT0, "Konami", "Jikkyou Powerful Pro Yakyuu EX (GX802 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, konam80s, sys573, konami573x, konami573, ksys573_state, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, konam80u, konam80s, konami573x, konami573, ksys573_state, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, konam80j, konam80s, konami573x, konami573, ksys573_state, 0, ROT90, "Konami", "Konami 80's Gallery (GC826 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, konam80a, konam80s, konami573x, konami573, ksys573_state, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, konam80k, konam80s, konami573x, konami573, ksys573_state, 0, ROT90, "Konami", "Konami 80's AC Special (GC826 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, dstage, sys573, dsftkd, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage - Internet Ranking Ver (GC845 VER. EBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, dstagea, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage (GN845 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddru, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GN845 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, ddrj, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution - Internet Ranking Ver (GC845 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, ddrja, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GC845 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1998, ddrjb, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GC845 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, ddra, dstage, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution (GN845 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, fbait2bc, sys573, fbaitbc, fbaitbc, ksys573_state, 0, ROT0, "Konami", "Fisherman's Bait 2 - A Bass Challenge (GE865 VER. UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, bassang2, fbait2bc, fbaitbc, fbaitbc, ksys573_state, 0, ROT0, "Konami", "Bass Angler 2 (GE865 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, hyperbbc, sys573, hyperbbc, hyperbbc, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ (GQ876 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, hyperbbca, hyperbbc, hyperbbc, hyperbbc, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ (GQ876 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, hyperbbck, hyperbbc, hyperbbc, hyperbbc, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ (GE876 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, gchgchmp, sys573, gchgchmp, gchgchmp, ksys573_state, 0, ROT0, "Konami", "Gachaga Champ (GE877 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, drmn, sys573, drmn, drmn, ksys573_state, drmn, ROT0, "Konami", "DrumMania (GQ881 VER. JAD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, gtrfrks, sys573, gtrfrks, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. EAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, gtrfrksu, gtrfrks, gtrfrks, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. UAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, gtrfrksj, gtrfrks, gtrfrks, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. JAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, gtrfrksa, gtrfrks, gtrfrks, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks (GQ886 VER. AAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, fbaitmc, sys573, fbaitbc, fbaitmc, ksys573_state, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. EA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, fbaitmcu, fbaitmc, fbaitbc, fbaitmc, ksys573_state, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. UA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, fbaitmcj, fbaitmc, fbaitbc, fbaitmc, ksys573_state, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. JA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, fbaitmca, fbaitmc, fbaitbc, fbaitmc, ksys573_state, 0, ROT0, "Konami", "Fisherman's Bait - Marlin Challenge (GX889 VER. AA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddr2m, sys573, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix (GN895 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddr2ml, ddr2m, ddr2ml, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix - Link Ver (GE885 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddr2mla, ddr2m, ddr2ml, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix - Link Ver (GE885 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddrbocd, ddr2m, ddr2ml, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution Best of Cool Dancers (GE892 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddr2mc, ddr2m, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix with beatmaniaIIDX CLUB VERSiON (GE896 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, ddr2mc2, ddr2m, ddr, ddr, ksys573_state, ddr, ROT0, "Konami", "Dance Dance Revolution 2nd Mix with beatmaniaIIDX substream CLUB VERSiON 2 (GE984 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, gtrfrk2m, sys573, gtrfrk2m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 2nd Mix Ver 1.01 (GQ883 VER. JAD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, dsftkd, sys573, dsftkd, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage featuring TRUE KiSS DESTiNATiON (G*884 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, cr589fw, sys573, konami573, konami573, ksys573_state, 0, ROT0, "Konami", "CD-ROM Drive Updater 2.0 (700B04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, cr589fwa, sys573, konami573, konami573, ksys573_state, 0, ROT0, "Konami", "CD-ROM Drive Updater (700A04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, ddr3mk, sys573, ddr3m, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix - Ver.Korea2 (GN887 VER. KBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.3 */
+GAME( 2000, ddr3mka, ddr3mk, ddr3m, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix - Ver.Korea (GN887 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.3 */
+GAME( 1999, ddr3ma, ddr3mk, ddr3m, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix (GN887 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.1 */
+GAME( 1999, ddr3mj, ddr3mk, ddr3m, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix (GN887 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.0 */
+GAME( 1999, ddrsbm, sys573, ddrsolo, ddrsolo, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution Solo Bass Mix (GQ894 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, ddrs2k, sys573, ddrs2k, ddrsolo, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution Solo 2000 (GC905 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.3 */
+GAME( 1999, ddrs2kj, ddrs2k, ddrs2k, ddrsolo, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution Solo 2000 (GC905 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.2 */
+GAME( 1999, hypbbc2p, sys573, hypbbc2p, hypbbc2p, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ - 2 Player (GX908 1999/08/24 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, hypbbc2pk, hypbbc2p, hypbbc2p, hypbbc2p, ksys573_state, hyperbbc, ROT0, "Konami", "Hyper Bishi Bashi Champ - 2 Player (GX908 1999/08/24 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, dsfdct, sys573, ddr3m, ddr, ksys573_state, 0, ROT0, "Konami", "Dancing Stage featuring Dreams Come True (GC910 VER. JCA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, dsfdcta, dsfdct, dsfdcta, ddr, ksys573_state, ddr, ROT0, "Konami", "Dancing Stage featuring Dreams Come True (GC910 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, drmn2m, sys573, drmn2m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 2nd Mix (GE912 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.5 */
+GAME( 1999, drmn2mpu, drmn2m, drmn2m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 2nd Mix Session Power Up Kit (GE912 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.5 */
+GAME( 1999, stepchmp, sys573, salarymc, hyperbbc, ksys573_state, salarymc, ROT0, "Konami", "Step Champ (GQ930 VER. JA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 2000, dncfrks, sys573, dmx, dmx, ksys573_state, 0, ROT0, "Konami", "Dance Freaks (G*874 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.6 */
+GAME( 2000, dmx, dncfrks, dmx, dmx, ksys573_state, 0, ROT0, "Konami", "Dance Maniax (G*874 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.6 */
+GAME( 2000, gunmania, sys573, gunmania, gunmania, ksys573_state, 0, ROT0, "Konami", "GunMania (GL906 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 2000, fghtmn, sys573, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, fghtmna, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, pnchmn, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Punch Mania: Hokuto No Ken (GQ918 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, pnchmna, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Punch Mania: Hokuto No Ken (GQ918 VER. JAB ALT CD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, fghtmnk, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, fghtmnu, fghtmn, pnchmn, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Fighting Mania (QG918 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, dsem, sys573, dsem, ddr, ksys573_state, 0, ROT0, "Konami", "Dancing Stage Euro Mix (G*936 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.7 */
+GAME( 2000, gtrfrk3m, sys573, gtrfrk3m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 3rd Mix (GE949 VER. JAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.4 */
+GAME( 2000, gtfrk3ma, gtrfrk3m, gtrfrk3m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 3rd Mix (GE949 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.4 */
+GAME( 2000, gtfrk3mb, gtrfrk3m, gtrfrk5m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 3rd Mix - security cassette versionup (949JAZ02)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.4 */
+GAME( 2000, pnchmn2, sys573, pnchmn2, pnchmn, ksys573_state, pnchmn, ROT0, "Konami", "Punch Mania 2: Hokuto No Ken (GQA09 JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* motor/artwork/network */
+GAME( 2000, salarymc, sys573, salarymc, hypbbc2p, ksys573_state, salarymc, ROT0, "Konami", "Salary Man Champ (GCA18 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, ddr3mp, sys573, ddr3mp, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 3rd Mix Plus (G*A22 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.6 */
+GAME( 2000, pcnfrk3m, sys573, drmn2m, drmn, ksys573_state, 0, ROT0, "Konami", "Percussion Freaks 3rd Mix (G*A23 VER. KAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, drmn3m, pcnfrk3m, drmn2m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 3rd Mix (G*A23 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, gtrfrk4m, sys573, gtrfrk3m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 4th Mix (G*A24 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, ddr4m, sys573, ddr3mp, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix (G*A33 VER. AAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, ddr4mj, ddr4m, ddr3mp, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix (G*A33 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, ddr4ms, sys573, ddr4ms, ddrsolo, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Solo (G*A33 VER. ABA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, ddr4msj, ddr4ms, ddr4ms, ddrsolo, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Solo (G*A33 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, dsfdr, sys573, dsfdr, ddr, ksys573_state, 0, ROT0, "Konami", "Dancing Stage Featuring Disney's Rave (GCA37JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, ddrusa, sys573, ddrusa, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution USA (G*A44 VER. UAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2000, ddr4mp, sys573, ddr3mp, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Plus (G*A34 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2000, ddr4mps, sys573, ddr4ms, ddrsolo, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 4th Mix Plus Solo (G*A34 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2000, dmx2m, sys573, dmx, dmx, ksys573_state, 0, ROT0, "Konami", "Dance Maniax 2nd Mix (G*A39 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2000, drmn4m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 4th Mix (G*A25 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.8 */
+GAME( 2001, gtrfrk5m, sys573, gtrfrk5m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 5th Mix (G*A26 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2001, ddr5m, sys573, ddr5m, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution 5th Mix (G*A27 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2001, dmx2majp, sys573, dmx, dmx, ksys573_state, 0, ROT0, "Konami", "Dance Maniax 2nd Mix Append J-Paradise (G*A38 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2001, mamboagg, sys573, mamboagg, mamboagg, ksys573_state, 0, ROT0, "Konami", "Mambo A Go-Go (GQA40 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2001, mamboagga, mamboagg, mamboagga, mamboagg, ksys573_state, 0, ROT0, "Konami", "Mambo A Go-Go e-Amusement (GQA40 VER. JRB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2001, drmn5m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 5th Mix (G*B05 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2001, gtrfrk6m, sys573, gtrfrk5m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 6th Mix (G*B06 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2001, drmn6m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 6th Mix (G*B16 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2001, gtrfrk7m, sys573, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 7th Mix (G*B17 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2001, ddrmax, sys573, ddr5m, ddr, ksys573_state, 0, ROT0, "Konami", "DDR Max - Dance Dance Revolution 6th Mix (G*B19 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2002, ddrmax2, sys573, ddr5m, ddr, ksys573_state, 0, ROT0, "Konami", "DDR Max 2 - Dance Dance Revolution 7th Mix (G*B20 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2002, mrtlbeat, sys573, ddr5m, ddr, ksys573_state, 0, ROT0, "Konami", "Martial Beat (G*B47 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.9 */
+GAME( 2002, drmn7m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 7th Mix power-up ver. (G*C07 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2002, drmn7ma, drmn7m, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 7th Mix (G*C07 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2002, gtrfrk8m, sys573, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 8th Mix power-up ver. (G*C08 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2002, gtrfrk8ma, gtrfrk8m, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 8th Mix (G*C08 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2002, dsem2, sys573, ddr5m, ddr, ksys573_state, 0, ROT0, "Konami", "Dancing Stage Euro Mix 2 (G*C23 VER. EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2002, ddrextrm, sys573, ddr5m, ddr, ksys573_state, 0, ROT0, "Konami", "Dance Dance Revolution Extreme (G*C36 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2003, drmn8m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 8th Mix (G*C07 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2003, gtrfrk9m, sys573, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 9th Mix (G*C39 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2003, drmn9m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 9th Mix (G*D09 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2003, gtfrk10m, sys573, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 10th Mix (G*D10 VER. JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2003, gtfrk10ma, gtfrk10m, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 10th Mix (G*D10 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2003, gtfrk10mb, gtfrk10m, gtfrk10mb, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 10th Mix eAmusement (G*D10 VER. JBA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2004, gtfrk11m, sys573, gtrfrk7m, gtrfrks, ksys573_state, 0, ROT0, "Konami", "Guitar Freaks 11th Mix (G*D39 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
+GAME( 2004, drmn10m, sys573, drmn4m, drmn, ksys573_state, 0, ROT0, "Konami", "DrumMania 10th Mix (G*D40 VER. JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) /* BOOT VER 1.95 */
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index 60e8417ef1d..a2ac5aaddca 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -284,7 +284,7 @@ void kungfur_state::machine_reset()
m_control = 0;
}
-static MACHINE_CONFIG_START( kungfur, kungfur_state )
+static MACHINE_CONFIG_START( kungfur )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 8000000/2) // 4MHz?
@@ -310,12 +310,12 @@ static MACHINE_CONFIG_START( kungfur, kungfur_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("adpcm1", MSM5205, XTAL_384kHz) // clock verified with recording
MCFG_MSM5205_VCLK_CB(WRITELINE(kungfur_state, kfr_adpcm1_int))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ADD("adpcm2", MSM5205, XTAL_384kHz) // "
MCFG_MSM5205_VCLK_CB(WRITELINE(kungfur_state, kfr_adpcm2_int))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -340,4 +340,4 @@ ROM_START( kungfur )
ROM_LOAD( "kr6.bin", 0x20000, 0x10000, CRC(9ea75d4a) SHA1(57445ccb961acb11a25cdac81f2e543d92bcb7f9) )
ROM_END
-GAMEL(1987, kungfur, 0, kungfur, kungfur, driver_device, 0, ROT0, "Namco", "Kung-Fu Roushi", MACHINE_SUPPORTS_SAVE, layout_kungfur )
+GAMEL(1987, kungfur, 0, kungfur, kungfur, kungfur_state, 0, ROT0, "Namco", "Kung-Fu Roushi", MACHINE_SUPPORTS_SAVE, layout_kungfur )
diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp
index 5a2fc951ae3..e24626db159 100644
--- a/src/mame/drivers/kurukuru.cpp
+++ b/src/mame/drivers/kurukuru.cpp
@@ -848,7 +848,7 @@ void kurukuru_state::machine_reset()
* Machine Driver *
*************************************************/
-static MACHINE_CONFIG_START( kurukuru, kurukuru_state )
+static MACHINE_CONFIG_START( kurukuru )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK)
@@ -881,12 +881,12 @@ static MACHINE_CONFIG_START( kurukuru, kurukuru_state )
MCFG_SOUND_ADD("adpcm", MSM5205, M5205_CLOCK)
MCFG_MSM5205_VCLK_CB(WRITELINE(kurukuru_state, kurukuru_msm5205_vck))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* changed on the fly */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* changed on the fly */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ppj, kurukuru_state )
+static MACHINE_CONFIG_START( ppj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK)
@@ -919,7 +919,7 @@ static MACHINE_CONFIG_START( ppj, kurukuru_state )
MCFG_SOUND_ADD("adpcm", MSM5205, M5205_CLOCK)
MCFG_MSM5205_VCLK_CB(WRITELINE(kurukuru_state, kurukuru_msm5205_vck))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) // changed on the fly
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // changed on the fly
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -982,9 +982,9 @@ ROM_END
* Game Drivers *
***************************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1990, kurukuru, 0, kurukuru, kurukuru, driver_device, 0, ROT0, "Success / Taiyo Jidoki", "Kuru Kuru Pyon Pyon (Japan)", 0 )
-GAME( 199?, ppj, 0, ppj, ppj, driver_device, 0, ROT0, "Success / Taiyo Jidoki", "Pyon Pyon Jump (V1.40, Japan)", 0 )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1990, kurukuru, 0, kurukuru, kurukuru, kurukuru_state, 0, ROT0, "Success / Taiyo Jidoki", "Kuru Kuru Pyon Pyon (Japan)", 0 )
+GAME( 199?, ppj, 0, ppj, ppj, kurukuru_state, 0, ROT0, "Success / Taiyo Jidoki", "Pyon Pyon Jump (V1.40, Japan)", 0 )
// unemulated....
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index 22bfe9e15d7..8614d1bc70e 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -1339,7 +1339,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tandy200_state::tandy200_tp_tick)
m_tp = !m_tp;
}
-static MACHINE_CONFIG_START( kc85, kc85_state )
+static MACHINE_CONFIG_START( kc85 )
/* basic machine hardware */
MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
MCFG_CPU_PROGRAM_MAP(kc85_mem)
@@ -1389,7 +1389,7 @@ static MACHINE_CONFIG_START( kc85, kc85_state )
MCFG_RAM_EXTRA_OPTIONS("32K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc8201, pc8201_state )
+static MACHINE_CONFIG_START( pc8201 )
/* basic machine hardware */
MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
MCFG_CPU_PROGRAM_MAP(pc8201_mem)
@@ -1449,7 +1449,7 @@ static MACHINE_CONFIG_DERIVED( pc8300, pc8201 )
MCFG_RAM_EXTRA_OPTIONS("64K,96K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( trsm100, trsm100_state )
+static MACHINE_CONFIG_START( trsm100 )
/* basic machine hardware */
MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
MCFG_CPU_PROGRAM_MAP(kc85_mem)
@@ -1504,7 +1504,7 @@ static MACHINE_CONFIG_DERIVED( tandy102, trsm100 )
MCFG_RAM_EXTRA_OPTIONS("32K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tandy200, tandy200_state )
+static MACHINE_CONFIG_START( tandy200 )
/* basic machine hardware */
MCFG_CPU_ADD(I8085_TAG, I8085A, XTAL_4_9152MHz)
MCFG_CPU_PROGRAM_MAP(tandy200_mem)
@@ -1621,13 +1621,13 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, kc85, 0, 0, kc85, kc85, driver_device, 0, "Kyosei", "Kyotronic 85 (Japan)", 0 )
-COMP( 1983, m10, kc85, 0, kc85, olivm10, driver_device, 0, "Olivetti", "M-10", 0 )
-//COMP( 1983, m10m, kc85, 0, kc85, olivm10, driver_device, 0, "Olivetti", "M-10 Modem (US)", 0 )
-COMP( 1983, trsm100, 0, 0, trsm100, kc85, driver_device, 0, "Tandy Radio Shack", "TRS-80 Model 100", 0 )
-COMP( 1986, tandy102, trsm100,0, tandy102, kc85, driver_device, 0, "Tandy Radio Shack", "Tandy 102", 0 )
-COMP( 1983, pc8201, 0, 0, pc8201, pc8201, driver_device, 0, "NEC", "PC-8201 (Japan)", MACHINE_NOT_WORKING ) // keyboard layout wrong
-COMP( 1983, pc8201a, pc8201, 0, pc8201, pc8201a, driver_device, 0, "NEC", "PC-8201A", 0 )
-COMP( 1987, npc8300, pc8201, 0, pc8300, pc8201a, driver_device, 0, "NEC", "PC-8300", MACHINE_NOT_WORKING )
-COMP( 1984, tandy200, 0, 0, tandy200, kc85, driver_device, 0, "Tandy Radio Shack", "Tandy 200", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1983, kc85, 0, 0, kc85, kc85, kc85_state, 0, "Kyosei", "Kyotronic 85 (Japan)", 0 )
+COMP( 1983, m10, kc85, 0, kc85, olivm10, kc85_state, 0, "Olivetti", "M-10", 0 )
+//COMP( 1983, m10m, kc85, 0, kc85, olivm10, kc85_state, 0, "Olivetti", "M-10 Modem (US)", 0 )
+COMP( 1983, trsm100, 0, 0, trsm100, kc85, trsm100_state, 0, "Tandy Radio Shack", "TRS-80 Model 100", 0 )
+COMP( 1986, tandy102, trsm100,0, tandy102, kc85, trsm100_state, 0, "Tandy Radio Shack", "Tandy 102", 0 )
+COMP( 1983, pc8201, 0, 0, pc8201, pc8201, pc8201_state, 0, "NEC", "PC-8201 (Japan)", MACHINE_NOT_WORKING ) // keyboard layout wrong
+COMP( 1983, pc8201a, pc8201, 0, pc8201, pc8201a, pc8201_state, 0, "NEC", "PC-8201A", 0 )
+COMP( 1987, npc8300, pc8201, 0, pc8300, pc8201a, pc8201_state, 0, "NEC", "PC-8300", MACHINE_NOT_WORKING )
+COMP( 1984, tandy200, 0, 0, tandy200, kc85, tandy200_state, 0, "Tandy Radio Shack", "Tandy 200", 0 )
diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp
index 861a6d96cd0..51a605bfa17 100644
--- a/src/mame/drivers/kyugo.cpp
+++ b/src/mame/drivers/kyugo.cpp
@@ -518,7 +518,7 @@ INTERRUPT_GEN_MEMBER(kyugo_state::vblank_irq)
}
-static MACHINE_CONFIG_START( kyugo_base, kyugo_state )
+static MACHINE_CONFIG_START( kyugo_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
@@ -1414,23 +1414,23 @@ DRIVER_INIT_MEMBER(kyugo_state,srdmissn)
*
*************************************/
-GAME( 1984, gyrodine, 0, gyrodine, gyrodine, driver_device, 0, ROT90, "Crux", "Gyrodine", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, gyrodinet, gyrodine, gyrodine, gyrodine, driver_device, 0, ROT90, "Crux (Taito Corporation license)", "Gyrodine (Taito Corporation license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, buzzard, gyrodine, gyrodine, gyrodine, driver_device, 0, ROT90, "Crux", "Buzzard", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, repulse, 0, repulse, repulse, driver_device, 0, ROT90, "Crux / Sega", "Repulse", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, 99lstwar, repulse, repulse, repulse, driver_device, 0, ROT90, "Crux / Proma", "'99: The Last War (set 1)", MACHINE_SUPPORTS_SAVE ) // Crux went bankrupt during Repulse development,
-GAME( 1985, 99lstwara, repulse, repulse, repulse, driver_device, 0, ROT90, "Crux / Proma", "'99: The Last War (set 2)", MACHINE_SUPPORTS_SAVE ) // some of their staff later worked on the newer games on this hardware,
-GAME( 1985, 99lstwark, repulse, repulse, repulse, driver_device, 0, ROT90, "Crux / Kyugo", "'99: The Last War (Kyugo)", MACHINE_SUPPORTS_SAVE ) // directly for Kyugo? (Flashgal, Legend, SRD Mission, Airwolf, Planet Probe)
-GAME( 1985, sonofphx, repulse, repulse, repulse, driver_device, 0, ROT90, "bootleg (Associated Overseas MFR, Inc.)", "Son of Phoenix (bootleg of Repulse)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, flashgal, 0, repulse, flashgal, driver_device, 0, ROT0, "Kyugo / Sega", "Flashgal (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, flashgalk, flashgal, repulse, flashgal, driver_device, 0, ROT0, "Kyugo / Sega", "Flashgal (set 1, Kyugo logo)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, flashgala, flashgal, flashgala, flashgal, driver_device, 0, ROT0, "Kyugo / Sega", "Flashgal (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, srdmissn, 0, srdmissn, srdmissn, kyugo_state, srdmissn, ROT90, "Kyugo / Taito Corporation", "S.R.D. Mission", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, fx, srdmissn, srdmissn, srdmissn, kyugo_state, srdmissn, ROT90, "bootleg", "F-X (bootleg of S.R.D. Mission)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, legend, 0, legend, legend, kyugo_state, srdmissn, ROT0, "Kyugo / Sega", "Legend", MACHINE_SUPPORTS_SAVE ) // no copyright (maybe also a bootleg?)
-GAME( 1986, legendb, legend, legend, legend, kyugo_state, srdmissn, ROT0, "bootleg", "Legion (bootleg of Legend)", MACHINE_SUPPORTS_SAVE ) // no copyright
-GAME( 1987, airwolf, 0, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "Kyugo", "Airwolf", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, airwolfa, airwolf, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "Kyugo (United Amusements license)", "Airwolf (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, skywolf, airwolf, srdmissn, skywolf, kyugo_state, srdmissn, ROT0, "bootleg", "Sky Wolf (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, skywolf2, airwolf, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "bootleg", "Sky Wolf (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, skywolf3, airwolf, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "bootleg", "Sky Wolf (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, gyrodine, 0, gyrodine, gyrodine, kyugo_state, 0, ROT90, "Crux", "Gyrodine", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, gyrodinet, gyrodine, gyrodine, gyrodine, kyugo_state, 0, ROT90, "Crux (Taito Corporation license)", "Gyrodine (Taito Corporation license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, buzzard, gyrodine, gyrodine, gyrodine, kyugo_state, 0, ROT90, "Crux", "Buzzard", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, repulse, 0, repulse, repulse, kyugo_state, 0, ROT90, "Crux / Sega", "Repulse", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, 99lstwar, repulse, repulse, repulse, kyugo_state, 0, ROT90, "Crux / Proma", "'99: The Last War (set 1)", MACHINE_SUPPORTS_SAVE ) // Crux went bankrupt during Repulse development,
+GAME( 1985, 99lstwara, repulse, repulse, repulse, kyugo_state, 0, ROT90, "Crux / Proma", "'99: The Last War (set 2)", MACHINE_SUPPORTS_SAVE ) // some of their staff later worked on the newer games on this hardware,
+GAME( 1985, 99lstwark, repulse, repulse, repulse, kyugo_state, 0, ROT90, "Crux / Kyugo", "'99: The Last War (Kyugo)", MACHINE_SUPPORTS_SAVE ) // directly for Kyugo? (Flashgal, Legend, SRD Mission, Airwolf, Planet Probe)
+GAME( 1985, sonofphx, repulse, repulse, repulse, kyugo_state, 0, ROT90, "bootleg (Associated Overseas MFR, Inc.)", "Son of Phoenix (bootleg of Repulse)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, flashgal, 0, repulse, flashgal, kyugo_state, 0, ROT0, "Kyugo / Sega", "Flashgal (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, flashgalk, flashgal, repulse, flashgal, kyugo_state, 0, ROT0, "Kyugo / Sega", "Flashgal (set 1, Kyugo logo)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, flashgala, flashgal, flashgala, flashgal, kyugo_state, 0, ROT0, "Kyugo / Sega", "Flashgal (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, srdmissn, 0, srdmissn, srdmissn, kyugo_state, srdmissn, ROT90, "Kyugo / Taito Corporation", "S.R.D. Mission", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, fx, srdmissn, srdmissn, srdmissn, kyugo_state, srdmissn, ROT90, "bootleg", "F-X (bootleg of S.R.D. Mission)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, legend, 0, legend, legend, kyugo_state, srdmissn, ROT0, "Kyugo / Sega", "Legend", MACHINE_SUPPORTS_SAVE ) // no copyright (maybe also a bootleg?)
+GAME( 1986, legendb, legend, legend, legend, kyugo_state, srdmissn, ROT0, "bootleg", "Legion (bootleg of Legend)", MACHINE_SUPPORTS_SAVE ) // no copyright
+GAME( 1987, airwolf, 0, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "Kyugo", "Airwolf", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, airwolfa, airwolf, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "Kyugo (United Amusements license)", "Airwolf (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, skywolf, airwolf, srdmissn, skywolf, kyugo_state, srdmissn, ROT0, "bootleg", "Sky Wolf (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, skywolf2, airwolf, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "bootleg", "Sky Wolf (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, skywolf3, airwolf, srdmissn, airwolf, kyugo_state, srdmissn, ROT0, "bootleg", "Sky Wolf (set 3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp
index 636cd9aa1e3..a00f76b25ae 100644
--- a/src/mame/drivers/labyrunr.cpp
+++ b/src/mame/drivers/labyrunr.cpp
@@ -165,7 +165,7 @@ void labyrunr_state::machine_start()
membank("bank1")->configure_entries(0, 6, &ROM[0x10000], 0x4000);
}
-static MACHINE_CONFIG_START( labyrunr, labyrunr_state )
+static MACHINE_CONFIG_START( labyrunr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8? */
@@ -269,6 +269,6 @@ ROM_START( labyrunrk )
ROM_END
-GAME( 1987, tricktrp, 0, labyrunr, labyrunr, driver_device, 0, ROT90, "Konami", "Trick Trap (World?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, labyrunr, tricktrp, labyrunr, labyrunr, driver_device, 0, ROT90, "Konami", "Labyrinth Runner (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, labyrunrk,tricktrp, labyrunr, labyrunr, driver_device, 0, ROT90, "Konami", "Labyrinth Runner (World Ver. K)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tricktrp, 0, labyrunr, labyrunr, labyrunr_state, 0, ROT90, "Konami", "Trick Trap (World?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, labyrunr, tricktrp, labyrunr, labyrunr, labyrunr_state, 0, ROT90, "Konami", "Labyrinth Runner (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, labyrunrk,tricktrp, labyrunr, labyrunr, labyrunr_state, 0, ROT90, "Konami", "Labyrinth Runner (World Ver. K)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp
index 21cdf5af40e..e733d789d38 100644
--- a/src/mame/drivers/ladybug.cpp
+++ b/src/mame/drivers/ladybug.cpp
@@ -513,7 +513,7 @@ MACHINE_START_MEMBER(ladybug_state,ladybug)
{
}
-static MACHINE_CONFIG_START( ladybug, ladybug_state )
+static MACHINE_CONFIG_START( ladybug )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
@@ -736,10 +736,10 @@ DRIVER_INIT_MEMBER(ladybug_state,dorodon)
}
-GAME( 1981, cavenger, 0, ladybug, cavenger, driver_device, 0, ROT0, "Universal", "Cosmic Avenger", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ladybug, 0, ladybug, ladybug, driver_device, 0, ROT270, "Universal", "Lady Bug", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ladybugb, ladybug, ladybug, ladybug, driver_device, 0, ROT270, "bootleg", "Lady Bug (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ladybugb2, ladybug, ladybug, ladybug, driver_device, 0, ROT270, "bootleg (Model Racing)", "Coccinelle (bootleg of Lady Bug, set 2)", MACHINE_SUPPORTS_SAVE ) // title removed, but manual names it Coccinelle
-GAME( 1982, dorodon, 0, dorodon, dorodon, ladybug_state, dorodon, ROT270, "UPL (Falcon license?)", "Dorodon (set 1)", MACHINE_SUPPORTS_SAVE ) // license or bootleg?
-GAME( 1982, dorodon2, dorodon, dorodon, dorodon, ladybug_state, dorodon, ROT270, "UPL (Falcon license?)", "Dorodon (set 2)", MACHINE_SUPPORTS_SAVE ) // "
-GAME( 1982, snapjack, 0, ladybug, snapjack, driver_device, 0, ROT0, "Universal", "Snap Jack", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, cavenger, 0, ladybug, cavenger, ladybug_state, 0, ROT0, "Universal", "Cosmic Avenger", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ladybug, 0, ladybug, ladybug, ladybug_state, 0, ROT270, "Universal", "Lady Bug", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ladybugb, ladybug, ladybug, ladybug, ladybug_state, 0, ROT270, "bootleg", "Lady Bug (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ladybugb2, ladybug, ladybug, ladybug, ladybug_state, 0, ROT270, "bootleg (Model Racing)", "Coccinelle (bootleg of Lady Bug, set 2)", MACHINE_SUPPORTS_SAVE ) // title removed, but manual names it Coccinelle
+GAME( 1982, dorodon, 0, dorodon, dorodon, ladybug_state, dorodon, ROT270, "UPL (Falcon license?)", "Dorodon (set 1)", MACHINE_SUPPORTS_SAVE ) // license or bootleg?
+GAME( 1982, dorodon2, dorodon, dorodon, dorodon, ladybug_state, dorodon, ROT270, "UPL (Falcon license?)", "Dorodon (set 2)", MACHINE_SUPPORTS_SAVE ) // "
+GAME( 1982, snapjack, 0, ladybug, snapjack, ladybug_state, 0, ROT0, "Universal", "Snap Jack", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp
index 6f91ad613e3..fd79cf25778 100644
--- a/src/mame/drivers/ladyfrog.cpp
+++ b/src/mame/drivers/ladyfrog.cpp
@@ -281,7 +281,7 @@ void ladyfrog_state::machine_reset()
m_snd_data = 0;
}
-static MACHINE_CONFIG_START( ladyfrog, ladyfrog_state )
+static MACHINE_CONFIG_START( ladyfrog )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2)
@@ -386,8 +386,8 @@ ROM_START( touchemea )
ROM_LOAD( "8.ic10", 0x20000, 0x10000, CRC(fc6808bf) SHA1(f1f1b75a79dfdb500012f9b52c6364f0a13dce2d) )
ROM_END
-GAME( 1990, ladyfrog, 0, ladyfrog, ladyfrog, driver_device, 0, ORIENTATION_SWAP_XY, "Mondial Games", "Lady Frog", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ladyfrog, 0, ladyfrog, ladyfrog, ladyfrog_state, 0, ORIENTATION_SWAP_XY, "Mondial Games", "Lady Frog", MACHINE_SUPPORTS_SAVE )
// toucheme art style is similar to ladyfrog, so it's probably the same manufacturer
-GAME( 19??, toucheme, 0, toucheme, toucheme, driver_device, 0, ORIENTATION_SWAP_XY, "<unknown>", "Touche Me (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 19??, touchemea,toucheme, toucheme, toucheme, driver_device, 0, ORIENTATION_SWAP_XY, "<unknown>", "Touche Me (set 2, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 19??, toucheme, 0, toucheme, toucheme, ladyfrog_state, 0, ORIENTATION_SWAP_XY, "<unknown>", "Touche Me (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 19??, touchemea, toucheme, toucheme, toucheme, ladyfrog_state, 0, ORIENTATION_SWAP_XY, "<unknown>", "Touche Me (set 2, harder)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp
index bd73426e89b..15c81db8508 100644
--- a/src/mame/drivers/laser3k.cpp
+++ b/src/mame/drivers/laser3k.cpp
@@ -960,7 +960,7 @@ PALETTE_INIT_MEMBER(laser3k_state, laser3k)
palette.set_pen_colors(0, laser3k_palette, ARRAY_LENGTH(laser3k_palette));
}
-static MACHINE_CONFIG_START( laser3k, laser3k_state )
+static MACHINE_CONFIG_START( laser3k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1021800)
MCFG_CPU_PROGRAM_MAP(laser3k_map)
@@ -1035,5 +1035,5 @@ ROM_START(las3000)
ROM_LOAD ( "l3kdisk.rom", 0x0000, 0x0100, CRC(2d4b1584) SHA1(989780b77e100598124df7b72663e5a31a3339c0))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, las3000, 0, 0, laser3k, laser3k, driver_device, 0, "Video Technology", "Laser 3000", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, las3000, 0, 0, laser3k, laser3k, laser3k_state, 0, "Video Technology", "Laser 3000", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp
index db3f131962d..9baf4974385 100644
--- a/src/mame/drivers/laserbas.cpp
+++ b/src/mame/drivers/laserbas.cpp
@@ -404,7 +404,7 @@ INPUT_PORTS_END
#define CLOCK 16680000
#define PIT_CLOCK (CLOCK/16) // 12 divider ?
-static MACHINE_CONFIG_START( laserbas, laserbas_state )
+static MACHINE_CONFIG_START( laserbas )
MCFG_CPU_ADD("maincpu", Z80, CLOCK / 4)
MCFG_CPU_PROGRAM_MAP(laserbas_memory)
@@ -546,6 +546,6 @@ ROM_START( futflash )
ROM_LOAD( "ff.8", 0xf000, 0x0800, CRC(623f558f) SHA1(be6c6565df658555f21c43a8c2459cf399794a84) )
ROM_END
-GAME( 1980, futflash, 0, laserbas, laserbas, driver_device, 0, ROT270, "Hoei", "Future Flash", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, laserbas, futflash, laserbas, laserbas, driver_device, 0, ROT270, "Hoei (Amstar license)", "Laser Base (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, laserbasa,futflash, laserbas, laserbas, driver_device, 0, ROT270, "Hoei (Amstar license)", "Laser Base (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, futflash, 0, laserbas, laserbas, laserbas_state, 0, ROT270, "Hoei", "Future Flash", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, laserbas, futflash, laserbas, laserbas, laserbas_state, 0, ROT270, "Hoei (Amstar license)", "Laser Base (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, laserbasa, futflash, laserbas, laserbas, laserbas_state, 0, ROT270, "Hoei (Amstar license)", "Laser Base (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp
index db01721f61f..4bfe2148713 100644
--- a/src/mame/drivers/laserbat.cpp
+++ b/src/mame/drivers/laserbat.cpp
@@ -466,7 +466,7 @@ void laserbat_state_base::device_timer(emu_timer &timer, device_timer_id id, int
}
-static MACHINE_CONFIG_START( laserbat_base, laserbat_state_base )
+static MACHINE_CONFIG_START( laserbat_base )
// basic machine hardware
MCFG_CPU_ADD("maincpu", S2650, XTAL_14_31818MHz/4)
@@ -498,7 +498,7 @@ static MACHINE_CONFIG_START( laserbat_base, laserbat_state_base )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( laserbat, laserbat_base, laserbat_state )
+static MACHINE_CONFIG_DERIVED( laserbat, laserbat_base )
// video hardware
MCFG_PALETTE_ADD("palette", 256)
@@ -523,14 +523,14 @@ static MACHINE_CONFIG_DERIVED_CLASS( laserbat, laserbat_base, laserbat_state )
MCFG_SN76477_ENABLE(0) // AB SOUND
MCFG_TMS3615_ADD("synth_low", XTAL_4MHz/16/2) // from the other one's /2 clock output
- MCFG_SOUND_ROUTE(TMS3615_FOOTAGE_8, "speaker", 1.0)
+ MCFG_SOUND_ROUTE(tms3615_device::FOOTAGE_8, "speaker", 1.0)
MCFG_TMS3615_ADD("synth_high", XTAL_4MHz/16) // 4MHz divided down with a 74LS161
- MCFG_SOUND_ROUTE(TMS3615_FOOTAGE_8, "speaker", 1.0)
+ MCFG_SOUND_ROUTE(tms3615_device::FOOTAGE_8, "speaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( catnmous, laserbat_base, catnmous_state )
+static MACHINE_CONFIG_DERIVED( catnmous, laserbat_base )
// video hardware
MCFG_PALETTE_ADD("palette", 256)
@@ -728,7 +728,7 @@ ROM_START( catnmousa )
ROM_END
-GAME( 1981, laserbat, 0, laserbat, laserbat, laserbat_state_base, laserbat, ROT0, "Zaccaria", "Laser Battle", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, lazarian, laserbat, laserbat, lazarian, laserbat_state_base, laserbat, ROT0, "Zaccaria (Bally Midway license)", "Lazarian", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, catnmous, 0, catnmous, catnmous, laserbat_state_base, laserbat, ROT90, "Zaccaria", "Cat and Mouse (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, catnmousa, catnmous, catnmous, catnmous, laserbat_state_base, laserbat, ROT90, "Zaccaria", "Cat and Mouse (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, laserbat, 0, laserbat, laserbat, laserbat_state, laserbat, ROT0, "Zaccaria", "Laser Battle", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, lazarian, laserbat, laserbat, lazarian, laserbat_state, laserbat, ROT0, "Zaccaria (Bally Midway license)", "Lazarian", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, catnmous, 0, catnmous, catnmous, catnmous_state, laserbat, ROT90, "Zaccaria", "Cat and Mouse (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, catnmousa, catnmous, catnmous, catnmous, catnmous_state, laserbat, ROT90, "Zaccaria", "Cat and Mouse (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp
index 9eb4608ea68..68168d4a4b2 100644
--- a/src/mame/drivers/lasso.cpp
+++ b/src/mame/drivers/lasso.cpp
@@ -481,7 +481,7 @@ MACHINE_RESET_MEMBER(lasso_state,wwjgtin)
m_track_enable = 0;
}
-static MACHINE_CONFIG_START( base, lasso_state )
+static MACHINE_CONFIG_START( base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 11289000/16) /* guess */
@@ -870,10 +870,10 @@ ROM_END
***************************************************************************/
-GAME( 1982, lasso, 0, lasso, lasso, driver_device, 0, ROT90, "SNK", "Lasso", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, chameleo, 0, chameleo, chameleo, driver_device, 0, ROT0, "Jaleco", "Chameleon", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, wwjgtin, 0, wwjgtin, wwjgtin, driver_device, 0, ROT0, "Jaleco / Casio", "Wai Wai Jockey Gate-In!", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, photof, wwjgtin, wwjgtin, wwjgtin, driver_device, 0, ROT0, "Jaleco / Casio", "Photo Finish (bootleg?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, pinbo, 0, pinbo, pinbo, driver_device, 0, ROT90, "Jaleco", "Pinbo (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, pinboa, pinbo, pinbo, pinboa, driver_device, 0, ROT90, "Jaleco", "Pinbo (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pinbos, pinbo, pinbo, pinboa, driver_device, 0, ROT90, "bootleg (Strike)", "Pinbo (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, lasso, 0, lasso, lasso, lasso_state, 0, ROT90, "SNK", "Lasso", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, chameleo, 0, chameleo, chameleo, lasso_state, 0, ROT0, "Jaleco", "Chameleon", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, wwjgtin, 0, wwjgtin, wwjgtin, lasso_state, 0, ROT0, "Jaleco / Casio", "Wai Wai Jockey Gate-In!", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, photof, wwjgtin, wwjgtin, wwjgtin, lasso_state, 0, ROT0, "Jaleco / Casio", "Photo Finish (bootleg?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pinbo, 0, pinbo, pinbo, lasso_state, 0, ROT90, "Jaleco", "Pinbo (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pinboa, pinbo, pinbo, pinboa, lasso_state, 0, ROT90, "Jaleco", "Pinbo (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pinbos, pinbo, pinbo, pinboa, lasso_state, 0, ROT90, "bootleg (Strike)", "Pinbo (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp
index 15177093ea5..ca83256c4fb 100644
--- a/src/mame/drivers/lastbank.cpp
+++ b/src/mame/drivers/lastbank.cpp
@@ -32,7 +32,7 @@ public:
m_vdp(*this, "tc0091lvc"),
m_oki(*this, "oki"),
m_essnd(*this, "essnd")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<tc0091lvc_device> m_vdp;
@@ -527,7 +527,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(lastbank_state::lastbank_irq_scanline)
}
}
-static MACHINE_CONFIG_START( lastbank, lastbank_state )
+static MACHINE_CONFIG_START( lastbank )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/4) //!!! TC0091LVC !!!
@@ -567,7 +567,7 @@ static MACHINE_CONFIG_START( lastbank, lastbank_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_ES8712_ADD("essnd", 12000)
@@ -602,4 +602,4 @@ ROM_START( lastbank )
ROM_LOAD( "7.u60", 0x00000, 0x80000, CRC(41be7146) SHA1(00f1c0d5809efccf888e27518a2a5876c4b633d8) )
ROM_END
-GAME( 1994, lastbank, 0, lastbank, lastbank, driver_device, 0, ROT0, "Excellent System", "Last Bank (v1.16)", 0 )
+GAME( 1994, lastbank, 0, lastbank, lastbank, lastbank_state, 0, ROT0, "Excellent System", "Last Bank (v1.16)", 0 )
diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp
index 8f3a800dad5..2199a1f60ca 100644
--- a/src/mame/drivers/lastduel.cpp
+++ b/src/mame/drivers/lastduel.cpp
@@ -483,7 +483,7 @@ void lastduel_state::machine_reset()
m_scroll[i] = 0;
}
-static MACHINE_CONFIG_START( lastduel, lastduel_state )
+static MACHINE_CONFIG_START( lastduel )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) // Unconfirmed - could be 8MHz
@@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( lastduel, lastduel_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( madgear, lastduel_state )
+static MACHINE_CONFIG_START( madgear )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( madgear, lastduel_state )
MCFG_SOUND_ADD("ym2", YM2203, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_10MHz/10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_10MHz/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.98)
MACHINE_CONFIG_END
@@ -893,16 +893,16 @@ ROM_END
/******************************************************************************/
-GAME( 1988, lastduel, 0, lastduel, lastduel, driver_device, 0, ROT270, "Capcom", "Last Duel (US New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, lastduelo, lastduel, lastduel, lastduel, driver_device, 0, ROT270, "Capcom", "Last Duel (US Old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, lastduelj, lastduel, lastduel, lastduel, driver_device, 0, ROT270, "Capcom", "Last Duel (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, lastduelb, lastduel, lastduel, lastduel, driver_device, 0, ROT270, "bootleg", "Last Duel (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, lastduel, 0, lastduel, lastduel, lastduel_state, 0, ROT270, "Capcom", "Last Duel (US New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, lastduelo, lastduel, lastduel, lastduel, lastduel_state, 0, ROT270, "Capcom", "Last Duel (US Old Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, lastduelj, lastduel, lastduel, lastduel, lastduel_state, 0, ROT270, "Capcom", "Last Duel (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, lastduelb, lastduel, lastduel, lastduel, lastduel_state, 0, ROT270, "bootleg", "Last Duel (bootleg)", MACHINE_SUPPORTS_SAVE )
// are both Mad Gear and Led Storm really US sets, both have a (c) Capcom USA, but so do several World sets from Capcom during this era, including Led Storm Rally 2011. None of these display a region warning, 2011 does.
// the region warning text is however still present in the ROM (albeit unused) and does appear to indicate both are US sets, so it's possible the title was revised to avoid confusion with the older Led Storm Rally 2011.
-GAME( 1989, madgear, 0, madgear, madgear, driver_device, 0, ROT270, "Capcom", "Mad Gear (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, madgearj, madgear, madgear, madgear, driver_device, 0, ROT270, "Capcom", "Mad Gear (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, ledstorm, madgear, madgear, madgear, driver_device, 0, ROT270, "Capcom", "Led Storm (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, madgear, 0, madgear, madgear, lastduel_state, 0, ROT270, "Capcom", "Mad Gear (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, madgearj, madgear, madgear, madgear, lastduel_state, 0, ROT270, "Capcom", "Mad Gear (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, ledstorm, madgear, madgear, madgear, lastduel_state, 0, ROT270, "Capcom", "Led Storm (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, leds2011, 0, madgear, madgear, driver_device, 0, ROT270, "Capcom", "Led Storm Rally 2011 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, leds2011u, leds2011, madgear, madgear, driver_device, 0, ROT270, "Capcom", "Led Storm Rally 2011 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, leds2011, 0, madgear, madgear, lastduel_state, 0, ROT270, "Capcom", "Led Storm Rally 2011 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, leds2011u, leds2011, madgear, madgear, lastduel_state, 0, ROT270, "Capcom", "Led Storm Rally 2011 (US)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp
index 326147d30b9..760628ad48c 100644
--- a/src/mame/drivers/lastfght.cpp
+++ b/src/mame/drivers/lastfght.cpp
@@ -561,7 +561,7 @@ void lastfght_state::machine_reset()
m_c00006 = 0;
}
-static MACHINE_CONFIG_START( lastfght, lastfght_state )
+static MACHINE_CONFIG_START( lastfght )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83044, 32000000/2)
diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp
index 28bd3e4e52e..e3fcd308fea 100644
--- a/src/mame/drivers/laz_aftrshok.cpp
+++ b/src/mame/drivers/laz_aftrshok.cpp
@@ -62,7 +62,7 @@ void aftrshok_state::machine_reset()
}
-static MACHINE_CONFIG_START( aftrshok, aftrshok_state )
+static MACHINE_CONFIG_START( aftrshok )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
@@ -73,7 +73,7 @@ static MACHINE_CONFIG_START( aftrshok, aftrshok_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // maybe
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // maybe
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -100,5 +100,5 @@ ROM_START( aftrshoka )
ROM_END
-GAME( 19??, aftrshok, 0, aftrshok, aftrshok, driver_device, 0, ROT0, "Lazer-tron", "After Shock (Lazer-tron, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 19??, aftrshoka, aftrshok, aftrshok, aftrshok, driver_device, 0, ROT0, "Lazer-tron", "After Shock (Lazer-tron, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 19??, aftrshok, 0, aftrshok, aftrshok, aftrshok_state, 0, ROT0, "Lazer-tron", "After Shock (Lazer-tron, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 19??, aftrshoka, aftrshok, aftrshok, aftrshok, aftrshok_state, 0, ROT0, "Lazer-tron", "After Shock (Lazer-tron, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp
index 6e39139461b..637dcc01953 100644
--- a/src/mame/drivers/laz_awetoss.cpp
+++ b/src/mame/drivers/laz_awetoss.cpp
@@ -42,7 +42,7 @@ void awetoss_state::machine_reset()
}
-static MACHINE_CONFIG_START( awetoss, awetoss_state )
+static MACHINE_CONFIG_START( awetoss )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
@@ -53,7 +53,7 @@ static MACHINE_CONFIG_START( awetoss, awetoss_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // maybe
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // maybe
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -81,4 +81,4 @@ ROM_START( awetoss )
ROM_LOAD( "AWSMTOSS.U11", 0x30000, 0x10000, CRC(8ae9d4f0) SHA1(58d1d8972c8e4c9a7c63e9d63e267ea81515d22a) )
ROM_END
-GAME( 19??, awetoss, 0, awetoss, awetoss, driver_device, 0, ROT0, "Lazer-tron", "Awesome Toss'em (Lazer-tron)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 19??, awetoss, 0, awetoss, awetoss, awetoss_state, 0, ROT0, "Lazer-tron", "Awesome Toss'em (Lazer-tron)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp
index d8b19d7aecf..35332cc3c89 100644
--- a/src/mame/drivers/laz_ribrac.cpp
+++ b/src/mame/drivers/laz_ribrac.cpp
@@ -46,7 +46,7 @@ void laz_ribrac_state::machine_reset()
}
-static MACHINE_CONFIG_START( laz_ribrac, laz_ribrac_state )
+static MACHINE_CONFIG_START( laz_ribrac )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", ??, 8000000) // unknown
@@ -56,7 +56,7 @@ static MACHINE_CONFIG_START( laz_ribrac, laz_ribrac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // maybe
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // maybe
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -79,4 +79,4 @@ ROM_START( ribrac )
ROM_LOAD( "RIBBITR_SND.U11", 0x30000, 0x10000, NO_DUMP )
ROM_END
-GAME( 1993, ribrac, 0, laz_ribrac, laz_ribrac, driver_device, 0, ROT0, "Lazer-tron", "Ribbit Racing (Lazer-tron)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1993, ribrac, 0, laz_ribrac, laz_ribrac, laz_ribrac_state, 0, ROT0, "Lazer-tron", "Ribbit Racing (Lazer-tron)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp
index 89aa2419121..ee3cfc03341 100644
--- a/src/mame/drivers/lazercmd.cpp
+++ b/src/mame/drivers/lazercmd.cpp
@@ -622,7 +622,7 @@ void lazercmd_state::machine_reset()
}
-static MACHINE_CONFIG_START( lazercmd, lazercmd_state )
+static MACHINE_CONFIG_START( lazercmd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz? */
@@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( lazercmd, lazercmd_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( medlanes, lazercmd_state )
+static MACHINE_CONFIG_START( medlanes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */
@@ -696,7 +696,7 @@ static MACHINE_CONFIG_START( medlanes, lazercmd_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bbonk, lazercmd_state )
+static MACHINE_CONFIG_START( bbonk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/12) /* 666 kHz */
diff --git a/src/mame/drivers/lb186.cpp b/src/mame/drivers/lb186.cpp
index acd2cbfd20d..7969c061306 100644
--- a/src/mame/drivers/lb186.cpp
+++ b/src/mame/drivers/lb186.cpp
@@ -15,15 +15,16 @@
class lb186_state : public driver_device
{
public:
- lb186_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_fdc(*this, "fdc"),
- m_scsi(*this, "scsibus:7:ncr5380")
- {}
+ lb186_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_fdc(*this, "fdc")
+ , m_scsi(*this, "scsibus:7:ncr5380")
+ {
+ }
required_device<i80186_cpu_device> m_maincpu;
- required_device<wd1772_t> m_fdc;
+ required_device<wd1772_device> m_fdc;
required_device<ncr5380n_device> m_scsi;
DECLARE_WRITE8_MEMBER(sio_out_w);
@@ -93,7 +94,7 @@ static ADDRESS_MAP_START( lb186_io, AS_IO, 16, lb186_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x1000, 0x101f) AM_DEVREADWRITE8("sc2681", mc68681_device, read, write, 0x00ff)
AM_RANGE(0x1080, 0x108f) AM_DEVREADWRITE8("scsibus:7:ncr5380", ncr5380n_device, read, write, 0x00ff)
- AM_RANGE(0x1100, 0x1107) AM_DEVREADWRITE8("fdc", wd1772_t, read, write, 0x00ff)
+ AM_RANGE(0x1100, 0x1107) AM_DEVREADWRITE8("fdc", wd1772_device, read, write, 0x00ff)
AM_RANGE(0x1180, 0x1181) AM_READWRITE8(scsi_dack_r, scsi_dack_w, 0x00ff)
AM_RANGE(0x1200, 0x1201) AM_WRITE8(drive_sel_w, 0x00ff)
ADDRESS_MAP_END
@@ -118,7 +119,7 @@ FLOPPY_FORMATS_MEMBER( lb186_state::floppy_formats )
FLOPPY_NASLITE_FORMAT
FLOPPY_FORMATS_END
-static MACHINE_CONFIG_START( lb186, lb186_state )
+static MACHINE_CONFIG_START( lb186 )
MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(lb186_map)
MCFG_CPU_IO_MAP(lb186_io)
@@ -160,4 +161,4 @@ ROM_START( lb186 )
ROM_LOAD16_BYTE("a75516_v3.35.rom", 0x0001, 0x2000, CRC(9d9a5e22) SHA1(070be31c622f50508e8cbdb797c79978b6a4b8f6))
ROM_END
-COMP( 1985, lb186, 0, 0, lb186, 0, driver_device, 0, "Ampro Computers", "Little Board/186", MACHINE_NO_SOUND_HW )
+COMP( 1985, lb186, 0, 0, lb186, 0, lb186_state, 0, "Ampro Computers", "Little Board/186", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index 908a6e49284..fd9e89deb9f 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -324,7 +324,7 @@ void lbeach_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( lbeach, lbeach_state )
+static MACHINE_CONFIG_START( lbeach )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_16MHz / 32) // Motorola MC6800P, 500kHz
@@ -376,4 +376,4 @@ ROM_START( lbeach )
ROM_END
-GAMEL(1979, lbeach, 0, lbeach, lbeach, driver_device, 0, ROT0, "Olympia / Seletron", "Long Beach", MACHINE_IMPERFECT_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_lbeach )
+GAMEL(1979, lbeach, 0, lbeach, lbeach, lbeach_state, 0, ROT0, "Olympia / Seletron", "Long Beach", MACHINE_IMPERFECT_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_lbeach )
diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp
index ef866d363ac..ca64d778460 100644
--- a/src/mame/drivers/lc80.cpp
+++ b/src/mame/drivers/lc80.cpp
@@ -325,7 +325,7 @@ void lc80_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( lc80, lc80_state )
+static MACHINE_CONFIG_START( lc80 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 900000) /* UD880D */
MCFG_CPU_PROGRAM_MAP(lc80_mem)
@@ -364,7 +364,7 @@ static MACHINE_CONFIG_START( lc80, lc80_state )
MCFG_RAM_EXTRA_OPTIONS("2K,3K,4K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lc80_2, lc80_state )
+static MACHINE_CONFIG_START( lc80_2 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 1800000) /* UD880D */
MCFG_CPU_PROGRAM_MAP(lc80_mem)
@@ -437,7 +437,7 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, lc80, 0, 0, lc80, lc80, driver_device, 0, "VEB Mikroelektronik", "Lerncomputer LC 80", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, lc80_2, lc80, 0, lc80_2, lc80, driver_device, 0, "VEB Mikroelektronik", "Lerncomputer LC 80.2", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, sc80, lc80, 0, lc80_2, lc80, driver_device, 0, "VEB Mikroelektronik", "Schachcomputer SC-80", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, lc80, 0, 0, lc80, lc80, lc80_state, 0, "VEB Mikroelektronik", "Lerncomputer LC 80", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, lc80_2, lc80, 0, lc80_2, lc80, lc80_state, 0, "VEB Mikroelektronik", "Lerncomputer LC 80.2", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, sc80, lc80, 0, lc80_2, lc80, lc80_state, 0, "VEB Mikroelektronik", "Schachcomputer SC-80", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp
index 25fbc3ec82f..1164fc52101 100644
--- a/src/mame/drivers/lcmate2.cpp
+++ b/src/mame/drivers/lcmate2.cpp
@@ -223,7 +223,7 @@ static GFXDECODE_START( lcmate2 )
GFXDECODE_END
-static MACHINE_CONFIG_START( lcmate2, lcmate2_state )
+static MACHINE_CONFIG_START( lcmate2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) // confirmed
MCFG_CPU_PROGRAM_MAP(lcmate2_mem)
@@ -266,5 +266,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, lcmate2, 0, 0, lcmate2, lcmate2, driver_device, 0, "Vtech", "Laser Compumate 2", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, lcmate2, 0, 0, lcmate2, lcmate2, lcmate2_state, 0, "Vtech", "Laser Compumate 2", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp
index 9fda0081662..eac15f4d01f 100644
--- a/src/mame/drivers/ldplayer.cpp
+++ b/src/mame/drivers/ldplayer.cpp
@@ -620,13 +620,13 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( ldplayer_ntsc, ldplayer_state )
+static MACHINE_CONFIG_START( ldplayer_ntsc )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( ldv1000, ldplayer_ntsc, ldv1000_state )
+static MACHINE_CONFIG_DERIVED( ldv1000, ldplayer_ntsc )
MCFG_LASERDISC_LDV1000_ADD("laserdisc")
- MCFG_LASERDISC_GET_DISC(laserdisc_get_disc_delegate(&ldplayer_state::get_disc_static, device))
+ MCFG_LASERDISC_GET_DISC(laserdisc_device::get_disc_delegate(&ldplayer_state::get_disc_static, device))
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -636,9 +636,9 @@ static MACHINE_CONFIG_DERIVED_CLASS( ldv1000, ldplayer_ntsc, ldv1000_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( pr8210, ldplayer_ntsc, pr8210_state )
+static MACHINE_CONFIG_DERIVED( pr8210, ldplayer_ntsc )
MCFG_LASERDISC_PR8210_ADD("laserdisc")
- MCFG_LASERDISC_GET_DISC(laserdisc_get_disc_delegate(&ldplayer_state::get_disc_static, device))
+ MCFG_LASERDISC_GET_DISC(laserdisc_device::get_disc_delegate(&ldplayer_state::get_disc_static, device))
MCFG_LASERDISC_SCREEN_ADD_NTSC("screen", "laserdisc")
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
@@ -672,5 +672,5 @@ ROM_END
*
*************************************/
-GAME( 2008, simldv1000, 0, ldv1000, ldplayer, driver_device, 0, ROT0, "MAME", "Pioneer LDV-1000 Simulator", 0 )
-GAMEL(2008, simpr8210, 0, pr8210, ldplayer, driver_device, 0, ROT0, "MAME", "Pioneer PR-8210 Simulator", 0, layout_pr8210 )
+GAME( 2008, simldv1000, 0, ldv1000, ldplayer, ldv1000_state, 0, ROT0, "MAME", "Pioneer LDV-1000 Simulator", 0 )
+GAMEL(2008, simpr8210, 0, pr8210, ldplayer, pr8210_state, 0, ROT0, "MAME", "Pioneer PR-8210 Simulator", 0, layout_pr8210 )
diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp
index 33bf92a7bbe..432337c87c0 100644
--- a/src/mame/drivers/leapster.cpp
+++ b/src/mame/drivers/leapster.cpp
@@ -301,7 +301,7 @@ static ADDRESS_MAP_START( leapster_aux, AS_IO, 32, leapster_state )
AM_RANGE(0x00000012c, 0x00000012f) AM_WRITE(leapster_aux004b_w) // this address isn't used by ARC internal stuff afaik, so probably leapster specific
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( leapster, leapster_state )
+static MACHINE_CONFIG_START( leapster )
/* basic machine hardware */
// CPU is ArcTangent-A5 '5.1' (ARCompact core)
MCFG_CPU_ADD("maincpu", ARCA5, 96000000/10)
@@ -338,5 +338,5 @@ DRIVER_INIT_MEMBER(leapster_state,leapster)
{
}
-CONS(2003, leapster, 0, 0, leapster, leapster, leapster_state, leapster, "LeapFrog", "Leapster (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-CONS(2005, leapstertv, leapster, 0, leapster, leapster, leapster_state, leapster, "LeapFrog", "Leapster TV (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+CONS( 2003, leapster, 0, 0, leapster, leapster, leapster_state, leapster, "LeapFrog", "Leapster (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+CONS( 2005, leapstertv, leapster, 0, leapster, leapster, leapster_state, leapster, "LeapFrog", "Leapster TV (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp
index 3424ff2daf0..d3e45f92b57 100644
--- a/src/mame/drivers/legionna.cpp
+++ b/src/mame/drivers/legionna.cpp
@@ -1156,7 +1156,7 @@ GFXDECODE_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( legionna, legionna_state )
+static MACHINE_CONFIG_START( legionna )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
@@ -1196,7 +1196,7 @@ static MACHINE_CONFIG_START( legionna, legionna_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1207,7 +1207,7 @@ static MACHINE_CONFIG_START( legionna, legionna_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( heatbrl, legionna_state )
+static MACHINE_CONFIG_START( heatbrl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* ??? */
@@ -1249,7 +1249,7 @@ static MACHINE_CONFIG_START( heatbrl, legionna_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1259,7 +1259,7 @@ static MACHINE_CONFIG_START( heatbrl, legionna_state )
MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( godzilla, legionna_state )
+static MACHINE_CONFIG_START( godzilla )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
@@ -1303,7 +1303,7 @@ static MACHINE_CONFIG_START( godzilla, legionna_state )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1313,7 +1313,7 @@ static MACHINE_CONFIG_START( godzilla, legionna_state )
MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( denjinmk, legionna_state )
+static MACHINE_CONFIG_START( denjinmk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
@@ -1356,7 +1356,7 @@ static MACHINE_CONFIG_START( denjinmk, legionna_state )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1366,7 +1366,7 @@ static MACHINE_CONFIG_START( denjinmk, legionna_state )
MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym2151_device, write))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( grainbow, legionna_state )
+static MACHINE_CONFIG_START( grainbow )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 20000000/2)
@@ -1409,7 +1409,7 @@ static MACHINE_CONFIG_START( grainbow, legionna_state )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1420,7 +1420,7 @@ static MACHINE_CONFIG_START( grainbow, legionna_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cupsoc, legionna_state )
+static MACHINE_CONFIG_START( cupsoc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,20000000/2)
@@ -1462,7 +1462,7 @@ static MACHINE_CONFIG_START( cupsoc, legionna_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -2537,21 +2537,21 @@ GAME( 1992, legionna, 0, legionna, legionna, legionna_state, legiongfx, R
GAME( 1992, legionnau,legionna, legionna, legionna, legionna_state, legiongfx, ROT0, "TAD Corporation (Fabtek license)", "Legionnaire (US)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
GAME( 1992, legionnaj,legionna, legionna, legionna, legionna_state, legiongfx, ROT0, "TAD Corporation", "Legionnaire (Japan)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, heatbrl, 0, heatbrl, heatbrl, driver_device, 0, ROT0, "TAD Corporation", "Heated Barrel (World version 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, heatbrl2, heatbrl, heatbrl, heatbrl, driver_device, 0, ROT0, "TAD Corporation", "Heated Barrel (World version 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, heatbrlo, heatbrl, heatbrl, heatbrl, driver_device, 0, ROT0, "TAD Corporation", "Heated Barrel (World old version)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, heatbrlu, heatbrl, heatbrl, heatbrl, driver_device, 0, ROT0, "TAD Corporation", "Heated Barrel (US)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, heatbrle, heatbrl, heatbrl, heatbrl, driver_device, 0, ROT0, "TAD Corporation (Electronic Devices license)", "Heated Barrel (Electronic Devices license)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-
-GAME( 1993, godzilla, 0, godzilla, godzilla, driver_device, 0, ROT0, "Banpresto", "Godzilla (Japan)", 0 )
-GAME( 1993, grainbow, 0, grainbow, grainbow, driver_device, 0, ROT0, "Banpresto", "SD Gundam Sangokushi Rainbow Tairiku Senki", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1993, denjinmk, 0, denjinmk, denjinmk, driver_device, 0, ROT0, "Winkysoft (Banpresto license)", "Denjin Makai", MACHINE_IMPERFECT_COLORS )
-
-GAME( 1992, cupsoc, 0, cupsoc, cupsoc, legionna_state, cupsoc, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, cupsoca, cupsoc, cupsoc, cupsoc, legionna_state, cupsoc, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, cupsocb, cupsoc, cupsoc, cupsoc, legionna_state, cupsocs, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer (set 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, cupsocs, cupsoc, cupsocs, cupsoc, legionna_state, cupsocs, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer :Selection: (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, cupsocs2, cupsoc, cupsocs, cupsoc, legionna_state, cupsocs, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer :Selection: (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, olysoc92, cupsoc, cupsoc, cupsoc, legionna_state, olysoc92, ROT0, "Seibu Kaihatsu", "Olympic Soccer '92 (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, olysoc92a,cupsoc, cupsoc, cupsoc, legionna_state, olysoc92, ROT0, "Seibu Kaihatsu", "Olympic Soccer '92 (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, olysoc92b,cupsoc, cupsoc, cupsoc, legionna_state, olysoc92, ROT0, "Seibu Kaihatsu", "Olympic Soccer '92 (set 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, heatbrl, 0, heatbrl, heatbrl, legionna_state, 0, ROT0, "TAD Corporation", "Heated Barrel (World version 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, heatbrl2, heatbrl, heatbrl, heatbrl, legionna_state, 0, ROT0, "TAD Corporation", "Heated Barrel (World version 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, heatbrlo, heatbrl, heatbrl, heatbrl, legionna_state, 0, ROT0, "TAD Corporation", "Heated Barrel (World old version)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, heatbrlu, heatbrl, heatbrl, heatbrl, legionna_state, 0, ROT0, "TAD Corporation", "Heated Barrel (US)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, heatbrle, heatbrl, heatbrl, heatbrl, legionna_state, 0, ROT0, "TAD Corporation (Electronic Devices license)", "Heated Barrel (Electronic Devices license)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+
+GAME( 1993, godzilla, 0, godzilla, godzilla, legionna_state, 0, ROT0, "Banpresto", "Godzilla (Japan)", 0 )
+GAME( 1993, grainbow, 0, grainbow, grainbow, legionna_state, 0, ROT0, "Banpresto", "SD Gundam Sangokushi Rainbow Tairiku Senki", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1993, denjinmk, 0, denjinmk, denjinmk, legionna_state, 0, ROT0, "Winkysoft (Banpresto license)", "Denjin Makai", MACHINE_IMPERFECT_COLORS )
+
+GAME( 1992, cupsoc, 0, cupsoc, cupsoc, legionna_state, cupsoc, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsoca, cupsoc, cupsoc, cupsoc, legionna_state, cupsoc, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsocb, cupsoc, cupsoc, cupsoc, legionna_state, cupsocs, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer (set 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsocs, cupsoc, cupsocs, cupsoc, legionna_state, cupsocs, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer :Selection: (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsocs2, cupsoc, cupsocs, cupsoc, legionna_state, cupsocs, ROT0, "Seibu Kaihatsu", "Seibu Cup Soccer :Selection: (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, olysoc92, cupsoc, cupsoc, cupsoc, legionna_state, olysoc92, ROT0, "Seibu Kaihatsu", "Olympic Soccer '92 (set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, olysoc92a,cupsoc, cupsoc, cupsoc, legionna_state, olysoc92, ROT0, "Seibu Kaihatsu", "Olympic Soccer '92 (set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, olysoc92b,cupsoc, cupsoc, cupsoc, legionna_state, olysoc92, ROT0, "Seibu Kaihatsu", "Olympic Soccer '92 (set 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index 64e83f6bd87..c4e2a4f43d9 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -60,6 +60,8 @@
#include "emu.h"
#include "includes/leland.h"
+#include "audio/leland.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
@@ -938,7 +940,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( leland, leland_state )
+static MACHINE_CONFIG_START( leland )
/* basic machine hardware */
MCFG_CPU_ADD("master", Z80, MASTER_CLOCK/2)
@@ -1020,7 +1022,7 @@ static MACHINE_CONFIG_DERIVED( lelandi, quarterb )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ataxx, leland_state )
+static MACHINE_CONFIG_START( ataxx )
/* basic machine hardware */
MCFG_CPU_ADD("master", Z80, 6000000)
diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp
index a5ec3d42789..e3e04e32afb 100644
--- a/src/mame/drivers/lemmings.cpp
+++ b/src/mame/drivers/lemmings.cpp
@@ -233,7 +233,7 @@ void lemmings_state::machine_start()
{
}
-static MACHINE_CONFIG_START( lemmings, lemmings_state )
+static MACHINE_CONFIG_START( lemmings )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -283,7 +283,7 @@ static MACHINE_CONFIG_START( lemmings, lemmings_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -322,4 +322,4 @@ ROM_END
/******************************************************************************/
-GAME( 1991, lemmings, 0, lemmings, lemmings, driver_device, 0, ROT0, "Data East USA", "Lemmings (US prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, lemmings, 0, lemmings, lemmings, lemmings_state, 0, ROT0, "Data East USA", "Lemmings (US prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index 3dc1dc0f05a..08cbdccc65f 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -486,7 +486,7 @@ void lethal_state::machine_reset()
m_bank4000->set_bank(0);
}
-static MACHINE_CONFIG_START( lethalen, lethal_state )
+static MACHINE_CONFIG_START( lethalen )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, MAIN_CLOCK/2) /* verified on pcb */
@@ -753,14 +753,14 @@ ROM_END
// date strings are at 0x3fd00 in the main program rom
-GAME( 1992, lethalen, 0, lethalen, lethalen, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver UAE, 11/19/92 15:04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UE to eeprom
-GAME( 1992, lethalenub, lethalen, lethalen, lethalen, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver UAB, 09/01/92 11:12)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UB to eeprom
-GAME( 1992, lethalenua, lethalen, lethalen, lethalen, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver UAA, 08/17/92 21:38)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UA to eeprom
-GAME( 1992, lethalenux, lethalen, lethalen, lethalen, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver unknown, US, 08/06/92 15:11, hacked/proto?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UA to eeprom but earlier than suspected UAA set, might be a proto, might be hacked, fails rom test, definitely a good dump, another identical set was found in Italy
+GAME( 1992, lethalen, 0, lethalen, lethalen, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver UAE, 11/19/92 15:04)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UE to eeprom
+GAME( 1992, lethalenub, lethalen, lethalen, lethalen, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver UAB, 09/01/92 11:12)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UB to eeprom
+GAME( 1992, lethalenua, lethalen, lethalen, lethalen, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver UAA, 08/17/92 21:38)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UA to eeprom
+GAME( 1992, lethalenux, lethalen, lethalen, lethalen, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver unknown, US, 08/06/92 15:11, hacked/proto?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes UA to eeprom but earlier than suspected UAA set, might be a proto, might be hacked, fails rom test, definitely a good dump, another identical set was found in Italy
-GAME( 1992, lethaleneae,lethalen, lethalen, lethalene, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver EAE, 11/19/92 16:24)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes EE to eeprom
-GAME( 1992, lethaleneab,lethalen, lethalen, lethalene, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver EAB, 10/14/92 19:53)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes EC to eeprom, so might actually be EC
-GAME( 1992, lethaleneaa,lethalen, lethalen, lethalene, driver_device, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver EAA, 09/09/92 09:44)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes EA to eeprom
+GAME( 1992, lethaleneae,lethalen, lethalen, lethalene, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver EAE, 11/19/92 16:24)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes EE to eeprom
+GAME( 1992, lethaleneab,lethalen, lethalen, lethalene, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver EAB, 10/14/92 19:53)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes EC to eeprom, so might actually be EC
+GAME( 1992, lethaleneaa,lethalen, lethalen, lethalene, lethal_state, 0, ORIENTATION_FLIP_Y, "Konami", "Lethal Enforcers (ver EAA, 09/09/92 09:44)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes EA to eeprom
// different mirror / display setup
-GAME( 1992, lethalenj, lethalen, lethalej, lethalenj, driver_device, 0, ORIENTATION_FLIP_X, "Konami", "Lethal Enforcers (ver JAD, 12/04/92 17:16)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes JC to eeprom?!
+GAME( 1992, lethalenj, lethalen, lethalej, lethalenj, lethal_state, 0, ORIENTATION_FLIP_X, "Konami", "Lethal Enforcers (ver JAD, 12/04/92 17:16)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // writes JC to eeprom?!
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index d55fd3490e7..46d4f812ada 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -629,7 +629,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( gameroom, lethalj_state )
+static MACHINE_CONFIG_START( gameroom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, MASTER_CLOCK)
@@ -652,13 +652,13 @@ static MACHINE_CONFIG_START( gameroom, lethalj_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", SOUND_CLOCK, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
- MCFG_OKIM6295_ADD("oki2", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", SOUND_CLOCK, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
- MCFG_OKIM6295_ADD("oki3", SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki3", SOUND_CLOCK, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8)
MACHINE_CONFIG_END
@@ -1040,14 +1040,14 @@ DRIVER_INIT_MEMBER(lethalj_state,cclownz)
*
*************************************/
-GAME( 1996, lethalj, 0, lethalj, lethalj, driver_device, 0, ROT0, "The Game Room", "Lethal Justice (Version 2.3)", 0 )
-GAME( 1996, franticf, 0, gameroom, franticf, driver_device, 0, ROT0, "The Game Room", "Frantic Fred", MACHINE_NOT_WORKING )
-GAME( 1997, eggventr, 0, gameroom, eggventr, driver_device, 0, ROT0, "The Game Room", "Egg Venture (Release 10)", 0 )
-GAME( 1997, eggventr8, eggventr, gameroom, eggventr, driver_device, 0, ROT0, "The Game Room", "Egg Venture (Release 8)", 0 )
-GAME( 1997, eggventr7, eggventr, gameroom, eggventr, driver_device, 0, ROT0, "The Game Room", "Egg Venture (Release 7)", 0 )
-GAME( 1997, eggventr2, eggventr, gameroom, eggventr2, driver_device, 0, ROT0, "The Game Room", "Egg Venture (Release 2)", 0 )
-GAME( 1997, eggventra, eggventr, gameroom, eggventr, driver_device, 0, ROT0, "The Game Room (A.L. Australia license)", "Egg Venture (A.L. Release)", 0 )
-GAME( 1997, eggventrd, eggventr, gameroom, eggvntdx, driver_device, 0, ROT0, "The Game Room", "Egg Venture Deluxe", 0 )
+GAME( 1996, lethalj, 0, lethalj, lethalj, lethalj_state, 0, ROT0, "The Game Room", "Lethal Justice (Version 2.3)", 0 )
+GAME( 1996, franticf, 0, gameroom, franticf, lethalj_state, 0, ROT0, "The Game Room", "Frantic Fred", MACHINE_NOT_WORKING )
+GAME( 1997, eggventr, 0, gameroom, eggventr, lethalj_state, 0, ROT0, "The Game Room", "Egg Venture (Release 10)", 0 )
+GAME( 1997, eggventr8, eggventr, gameroom, eggventr, lethalj_state, 0, ROT0, "The Game Room", "Egg Venture (Release 8)", 0 )
+GAME( 1997, eggventr7, eggventr, gameroom, eggventr, lethalj_state, 0, ROT0, "The Game Room", "Egg Venture (Release 7)", 0 )
+GAME( 1997, eggventr2, eggventr, gameroom, eggventr2, lethalj_state, 0, ROT0, "The Game Room", "Egg Venture (Release 2)", 0 )
+GAME( 1997, eggventra, eggventr, gameroom, eggventr, lethalj_state, 0, ROT0, "The Game Room (A.L. Australia license)", "Egg Venture (A.L. Release)", 0 )
+GAME( 1997, eggventrd, eggventr, gameroom, eggvntdx, lethalj_state, 0, ROT0, "The Game Room", "Egg Venture Deluxe", 0 )
GAME( 1997, ripribit, 0, gameroom, ripribit, lethalj_state, ripribit, ROT0, "LAI Games", "Ripper Ribbit (Version 3.5)", 0 )
GAME( 1997, ripribita, ripribit, gameroom, ripribit, lethalj_state, ripribit, ROT0, "LAI Games", "Ripper Ribbit (Version 2.8.4)", 0 )
GAME( 1999, cfarm, 0, gameroom, cfarm, lethalj_state, cfarm, ROT90, "LAI Games", "Chicken Farm (Version 2.0)", 0 )
diff --git a/src/mame/drivers/lft.cpp b/src/mame/drivers/lft.cpp
index e067ac93994..315a6bf97e5 100644
--- a/src/mame/drivers/lft.cpp
+++ b/src/mame/drivers/lft.cpp
@@ -19,9 +19,10 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_terminal(*this, "terminal")
- {}
+ {
+ }
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE16_MEMBER(term_w);
DECLARE_READ16_MEMBER(keyin_r);
DECLARE_READ16_MEMBER(status_r);
@@ -67,7 +68,7 @@ READ16_MEMBER( lft_state::status_r )
return (m_term_data) ? 5 : 4;
}
-WRITE8_MEMBER( lft_state::kbd_put )
+void lft_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -82,7 +83,7 @@ void lft_state::machine_reset()
m_term_data = 0;
}
-static MACHINE_CONFIG_START( lft, lft_state )
+static MACHINE_CONFIG_START( lft )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80186, 4000000) // no idea
MCFG_CPU_PROGRAM_MAP(lft_mem)
@@ -90,7 +91,7 @@ static MACHINE_CONFIG_START( lft, lft_state )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(lft_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(lft_state, kbd_put))
MACHINE_CONFIG_END
@@ -112,6 +113,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( ????, lft1510, 0, 0, lft, lft, driver_device, 0, "LFT", "LFT 1510", MACHINE_IS_SKELETON)
-COMP( ????, lft1230, lft1510, 0, lft, lft, driver_device, 0, "LFT", "LFT 1230", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( ????, lft1510, 0, 0, lft, lft, lft_state, 0, "LFT", "LFT 1510", MACHINE_IS_SKELETON)
+COMP( ????, lft1230, lft1510, 0, lft, lft, lft_state, 0, "LFT", "LFT 1230", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/lg-dvd.cpp b/src/mame/drivers/lg-dvd.cpp
index 6255b4f2f1d..e3aba7d3d0b 100644
--- a/src/mame/drivers/lg-dvd.cpp
+++ b/src/mame/drivers/lg-dvd.cpp
@@ -9,13 +9,15 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
-class lg_dvd_state : public driver_device {
+class lg_dvd_state : public driver_device
+{
public:
lg_dvd_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- maincpu(*this, "maincpu")
+ : driver_device(mconfig, type, tag)
+ , maincpu(*this, "maincpu")
{ }
+protected:
required_device<i80c52_device> maincpu;
};
@@ -26,7 +28,7 @@ static ADDRESS_MAP_START( lg_dvd_map, AS_PROGRAM, 8, lg_dvd_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( lg, lg_dvd_state )
+static MACHINE_CONFIG_START( lg )
MCFG_CPU_ADD( "maincpu", I80C52, XTAL_16MHz )
MCFG_CPU_PROGRAM_MAP( lg_dvd_map )
MACHINE_CONFIG_END
@@ -39,4 +41,4 @@ ROM_START( lggp40 )
ROMX_LOAD( "firm-1.01.bin", 0x000000, 0x100000, CRC(28820e0c) SHA1(c5f2c1e14e6cff2e57c5196cabcebfaaff7284ce), ROM_BIOS(2) )
ROM_END
-SYST( 2011, lggp40, 0, 0, lg, lg, driver_device, 0, "LG", "GP40NW10 dvd writer", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW )
+SYST( 2011, lggp40, 0, 0, lg, lg, lg_dvd_state, 0, "LG", "GP40NW10 dvd writer", MACHINE_NOT_WORKING|MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp
index c9ccb9c9d93..a18a7cdf148 100644
--- a/src/mame/drivers/lgp.cpp
+++ b/src/mame/drivers/lgp.cpp
@@ -397,7 +397,7 @@ PALETTE_INIT_MEMBER(lgp_state, lgp)
}
/* DRIVER */
-static MACHINE_CONFIG_START( lgp, lgp_state )
+static MACHINE_CONFIG_START( lgp )
/* main cpu */
MCFG_CPU_ADD("maincpu", Z80, CPU_PCB_CLOCK)
MCFG_CPU_PROGRAM_MAP(main_program_map)
@@ -609,6 +609,6 @@ DRIVER_INIT_MEMBER(lgp_state,lgp)
{
}
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS) */
-GAME( 1983, lgp, 0, lgp, lgp, lgp_state, lgp, ROT0, "Taito", "Laser Grand Prix", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-GAME( 1983, lgpalt, lgp, lgp, lgp, lgp_state, lgp, ROT0, "Taito", "Laser Grand Prix (alternate)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS) */
+GAME( 1983, lgp, 0, lgp, lgp, lgp_state, lgp, ROT0, "Taito", "Laser Grand Prix", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+GAME( 1983, lgpalt, lgp, lgp, lgp, lgp_state, lgp, ROT0, "Taito", "Laser Grand Prix (alternate)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp
index d4c810d4eb6..12f62bc03c5 100644
--- a/src/mame/drivers/liberate.cpp
+++ b/src/mame/drivers/liberate.cpp
@@ -728,7 +728,7 @@ MACHINE_RESET_MEMBER(liberate_state,liberate)
m_bank = 0;
}
-static MACHINE_CONFIG_START( liberate_base, liberate_state )
+static MACHINE_CONFIG_START( liberate_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",DECO16, 2000000)
@@ -815,7 +815,7 @@ static MACHINE_CONFIG_DERIVED( prosoccr, liberate_base )
MCFG_VIDEO_START_OVERRIDE(liberate_state,prosoccr)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( prosport, liberate_state )
+static MACHINE_CONFIG_START( prosport )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", DECO16, 2000000)
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index 989b607e1fa..601fdc054a0 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -415,7 +415,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( liberatr, liberatr_state )
+static MACHINE_CONFIG_START( liberatr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* 1.25Mhz divided from 20Mhz master clock */
@@ -532,5 +532,5 @@ ROM_END
*
*************************************/
-GAME( 1982, liberatr, 0, liberatr, liberatr, driver_device, 0, ROT0, "Atari", "Liberator (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, liberatr2,liberatr, liberat2, liberatr, driver_device, 0, ROT0, "Atari", "Liberator (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, liberatr, 0, liberatr, liberatr, liberatr_state, 0, ROT0, "Atari", "Liberator (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, liberatr2,liberatr, liberat2, liberatr, liberatr_state, 0, ROT0, "Atari", "Liberator (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp
index aa249e7be94..b4157858677 100644
--- a/src/mame/drivers/limenko.cpp
+++ b/src/mame/drivers/limenko.cpp
@@ -730,7 +730,7 @@ GFXDECODE_END
*****************************************************************************************************/
-static MACHINE_CONFIG_START( limenko, limenko_state )
+static MACHINE_CONFIG_START( limenko )
MCFG_CPU_ADD("maincpu", E132XN, 20000000*4) /* 4x internal multiplier */
MCFG_CPU_PROGRAM_MAP(limenko_map)
MCFG_CPU_IO_MAP(limenko_io_map)
@@ -766,7 +766,7 @@ static MACHINE_CONFIG_START( limenko, limenko_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spotty, limenko_state )
+static MACHINE_CONFIG_START( spotty )
MCFG_CPU_ADD("maincpu", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
MCFG_CPU_PROGRAM_MAP(spotty_map)
MCFG_CPU_IO_MAP(spotty_io_map)
@@ -796,7 +796,7 @@ static MACHINE_CONFIG_START( spotty, limenko_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 4000000 / 4 , OKIM6295_PIN7_HIGH) //?
+ MCFG_OKIM6295_ADD("oki", 4000000 / 4 , PIN7_HIGH) //?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1161,10 +1161,10 @@ DRIVER_INIT_MEMBER(limenko_state,spotty)
save_item(NAME(m_spotty_sound_cmd));
}
-GAME( 2000, dynabomb, 0, limenko, sb2003, limenko_state, dynabomb, ROT0, "Limenko", "Dynamite Bomber (Korea, Rev 1.5)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, legendoh, 0, limenko, legendoh, limenko_state, legendoh, ROT0, "Limenko", "Legend of Heroes", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2003, sb2003, 0, limenko, sb2003, limenko_state, sb2003, ROT0, "Limenko", "Super Bubble 2003 (World, Ver 1.0)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2003, sb2003a, sb2003, limenko, sb2003, limenko_state, sb2003, ROT0, "Limenko", "Super Bubble 2003 (Asia, Ver 1.0)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dynabomb, 0, limenko, sb2003, limenko_state, dynabomb, ROT0, "Limenko", "Dynamite Bomber (Korea, Rev 1.5)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, legendoh, 0, limenko, legendoh, limenko_state, legendoh, ROT0, "Limenko", "Legend of Heroes", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2003, sb2003, 0, limenko, sb2003, limenko_state, sb2003, ROT0, "Limenko", "Super Bubble 2003 (World, Ver 1.0)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2003, sb2003a, sb2003, limenko, sb2003, limenko_state, sb2003, ROT0, "Limenko", "Super Bubble 2003 (Asia, Ver 1.0)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
// this game only uses the same graphics chip used in Limenko's system
-GAME( 2001, spotty, 0, spotty, spotty, limenko_state, spotty, ROT0, "Prince Co.", "Spotty (Ver. 2.0.2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, spotty, 0, spotty, spotty, limenko_state, spotty, ROT0, "Prince Co.", "Spotty (Ver. 2.0.2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lindbergh.cpp b/src/mame/drivers/lindbergh.cpp
index 6bcd5e0cfb3..2ce6da999d2 100644
--- a/src/mame/drivers/lindbergh.cpp
+++ b/src/mame/drivers/lindbergh.cpp
@@ -389,7 +389,7 @@ void lindbergh_state::machine_reset()
{
}
-static MACHINE_CONFIG_START(lindbergh, lindbergh_state)
+static MACHINE_CONFIG_START(lindbergh)
MCFG_CPU_ADD("maincpu", PENTIUM4, 28000000U*5) /* Actually Celeron D at 2,8 GHz */
MCFG_PCI_ROOT_ADD( ":pci")
@@ -609,22 +609,22 @@ ROM_START(lbvbiosu)
DISK_IMAGE_READONLY("dvp-0021b", 0, SHA1(362ac028ba19ba4762678953a033034a5ee8ad53))
ROM_END
-GAME(1999, lindbios, 0, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Sega Lindbergh Bios", MACHINE_IS_BIOS_ROOT)
-GAME(2005, hotd4, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "House of the Dead 4 (Export) (Rev B)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2005, hotd4a, hotd4, lindbergh, 0, driver_device, 0, ROT0, "Sega", "House of the Dead 4 (Export) (Rev A)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2005, vf5, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Virtua Fighter 5 (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2006, abclimax, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "After Burner Climax (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2006, letsgoju, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Let's Go Jungle (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2006, outr2sdx, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "OutRun 2 SP SDX", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2006, psmash3, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Power Smash 3 / Virtua Tennis 3 (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2006, vtennis3, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Virtua Tennis 3 (Japan)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2007, 2spicy, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "2 Spicy", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2007, ghostsev, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Ghost Squad Evolution", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2007, initiad4, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Initial D4 (Rev D)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2007, initiad4c, initiad4, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Initial D4 (Rev C)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2007, segartv, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Sega Race-TV (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2008, hotdex, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "House of the Dead EX (Japan)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2008, primevah, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Primeval Hunt", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2008, rambo, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Rambo (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(2009, hummerxt, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "Hummer Extreme", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
-GAME(200?, lbvbiosu, lindbios, lindbergh, 0, driver_device, 0, ROT0, "Sega", "VBios updater", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(1999, lindbios, 0, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Sega Lindbergh Bios", MACHINE_IS_BIOS_ROOT)
+GAME(2005, hotd4, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "House of the Dead 4 (Export) (Rev B)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2005, hotd4a, hotd4, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "House of the Dead 4 (Export) (Rev A)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2005, vf5, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Virtua Fighter 5 (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2006, abclimax, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "After Burner Climax (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2006, letsgoju, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Let's Go Jungle (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2006, outr2sdx, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "OutRun 2 SP SDX", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2006, psmash3, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Power Smash 3 / Virtua Tennis 3 (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2006, vtennis3, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Virtua Tennis 3 (Japan)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2007, 2spicy, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "2 Spicy", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2007, ghostsev, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Ghost Squad Evolution", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2007, initiad4, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Initial D4 (Rev D)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2007, initiad4c, initiad4, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Initial D4 (Rev C)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2007, segartv, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Sega Race-TV (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2008, hotdex, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "House of the Dead EX (Japan)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2008, primevah, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Primeval Hunt", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2008, rambo, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Rambo (Export)", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(2009, hummerxt, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "Hummer Extreme", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
+GAME(200?, lbvbiosu, lindbios, lindbergh, 0, lindbergh_state, 0, ROT0, "Sega", "VBios updater", MACHINE_NOT_WORKING|MACHINE_UNEMULATED_PROTECTION|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp
index fb67ddd07f8..05b196400dc 100644
--- a/src/mame/drivers/lisa.cpp
+++ b/src/mame/drivers/lisa.cpp
@@ -95,7 +95,7 @@ static const floppy_interface lisa_floppy_interface =
***************************************************************************/
/* Lisa1 and Lisa 2 machine */
-static MACHINE_CONFIG_START( lisa, lisa_state )
+static MACHINE_CONFIG_START( lisa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 5093760) /* 20.37504 MHz / 4 */
MCFG_CPU_PROGRAM_MAP(lisa_map)
@@ -479,8 +479,8 @@ ROM_END
Lisa drivers boot MacWorks, but do not boot the Lisa OS, which is why we set
the MACHINE_NOT_WORKING flag...
*/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, lisa, 0, 0, lisa, lisa, lisa_state, lisa2, "Apple Computer", "Lisa", MACHINE_NOT_WORKING )
-COMP( 1984, lisa2, 0, 0, lisa, lisa, lisa_state, lisa2, "Apple Computer", "Lisa2", MACHINE_NOT_WORKING )
-COMP( 1984, lisa210, lisa2, 0, lisa210, lisa, lisa_state, lisa210, "Apple Computer", "Lisa2/10", MACHINE_NOT_WORKING )
-COMP( 1985, macxl, lisa2, 0, macxl, lisa, lisa_state, mac_xl, "Apple Computer", "Macintosh XL", /*MACHINE_NOT_WORKING*/0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1983, lisa, 0, 0, lisa, lisa, lisa_state, lisa2, "Apple Computer", "Lisa", MACHINE_NOT_WORKING )
+COMP( 1984, lisa2, 0, 0, lisa, lisa, lisa_state, lisa2, "Apple Computer", "Lisa2", MACHINE_NOT_WORKING )
+COMP( 1984, lisa210, lisa2, 0, lisa210, lisa, lisa_state, lisa210, "Apple Computer", "Lisa2/10", MACHINE_NOT_WORKING )
+COMP( 1985, macxl, lisa2, 0, macxl, lisa, lisa_state, mac_xl, "Apple Computer", "Macintosh XL", /*MACHINE_NOT_WORKING*/0 )
diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp
index 7e17e2abc02..ceb23f816d7 100644
--- a/src/mame/drivers/littlerb.cpp
+++ b/src/mame/drivers/littlerb.cpp
@@ -248,7 +248,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::littlerb_sound_step_cb)
m_soundframe++;
}
-static MACHINE_CONFIG_START( littlerb, littlerb_state )
+static MACHINE_CONFIG_START( littlerb )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(littlerb_main)
@@ -278,4 +278,4 @@ ROM_START( littlerb )
ROM_END
-GAME( 1994, littlerb, 0, littlerb, littlerb, driver_device, 0, ROT0, "TCH", "Little Robin", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND )
+GAME( 1994, littlerb, 0, littlerb, littlerb, littlerb_state, 0, ROT0, "TCH", "Little Robin", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp
index a9d9a413903..46a9b723d3b 100644
--- a/src/mame/drivers/lkage.cpp
+++ b/src/mame/drivers/lkage.cpp
@@ -505,7 +505,7 @@ void lkage_state::machine_reset()
}
-static MACHINE_CONFIG_START( lkage, lkage_state )
+static MACHINE_CONFIG_START( lkage )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK)
@@ -554,7 +554,7 @@ static MACHINE_CONFIG_START( lkage, lkage_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lkageb, lkage_state )
+static MACHINE_CONFIG_START( lkageb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MAIN_CPU_CLOCK)
@@ -935,10 +935,10 @@ DRIVER_INIT_MEMBER(lkage_state,bygone)
m_sprite_dx=1;
}
-GAME( 1984, lkage, 0, lkage, lkage, lkage_state, lkage, ROT0, "Taito Corporation", "The Legend of Kage", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, lkageo, lkage, lkage, lkage, lkage_state, lkage, ROT0, "Taito Corporation", "The Legend of Kage (older)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, lkageoo, lkage, lkage, lkage, lkage_state, lkage, ROT0, "Taito Corporation", "The Legend of Kage (oldest)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, lkageb, lkage, lkageb, lkageb, lkage_state, lkage, ROT0, "bootleg", "The Legend of Kage (bootleg set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, lkageb2, lkage, lkageb, lkageb, lkage_state, lkage, ROT0, "bootleg", "The Legend of Kage (bootleg set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, lkageb3, lkage, lkageb, lkageb, lkage_state, lkage, ROT0, "bootleg", "The Legend of Kage (bootleg set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, bygone, 0, lkage, bygone, lkage_state, bygone, ROT0, "Taito Corporation", "Bygone (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, lkage, 0, lkage, lkage, lkage_state, lkage, ROT0, "Taito Corporation", "The Legend of Kage", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, lkageo, lkage, lkage, lkage, lkage_state, lkage, ROT0, "Taito Corporation", "The Legend of Kage (older)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, lkageoo, lkage, lkage, lkage, lkage_state, lkage, ROT0, "Taito Corporation", "The Legend of Kage (oldest)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, lkageb, lkage, lkageb, lkageb, lkage_state, lkage, ROT0, "bootleg", "The Legend of Kage (bootleg set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, lkageb2, lkage, lkageb, lkageb, lkage_state, lkage, ROT0, "bootleg", "The Legend of Kage (bootleg set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, lkageb3, lkage, lkageb, lkageb, lkage_state, lkage, ROT0, "bootleg", "The Legend of Kage (bootleg set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, bygone, 0, lkage, bygone, lkage_state, bygone, ROT0, "Taito Corporation", "Bygone (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp
index 62d593778c5..ade1d3c994c 100644
--- a/src/mame/drivers/llc.cpp
+++ b/src/mame/drivers/llc.cpp
@@ -125,24 +125,21 @@ static INPUT_PORTS_START( llc2 )
INPUT_PORTS_END
-WRITE8_MEMBER( llc_state::kbd_put )
+void llc_state::kbd_put(u8 data)
{
- static uint8_t s1[16]={0x40, 0x1e, 0x12, 0x1b, 0x19, 0x14, 0x15, 0x1d, 0x16, 0x17, 0x1c, 0x3c, 0x3f, 0x3d, 0x3e, 0x10}; // 0x20 to 0x2F
- static uint8_t s2[7] ={0x1a, 0x11, 0x7c, 0x13, 0x7b, 0x1f, 0x00}; // 0x3A to 0x40
- static uint8_t s3[6] ={0x5c, 0x00, 0x5b, 0x7e, 0x00, 0x5e}; // 0x5B to 0x60
+ static constexpr uint8_t s1[16]={0x40, 0x1e, 0x12, 0x1b, 0x19, 0x14, 0x15, 0x1d, 0x16, 0x17, 0x1c, 0x3c, 0x3f, 0x3d, 0x3e, 0x10}; // 0x20 to 0x2F
+ static constexpr uint8_t s2[7] ={0x1a, 0x11, 0x7c, 0x13, 0x7b, 0x1f, 0x00}; // 0x3A to 0x40
+ static constexpr uint8_t s3[6] ={0x5c, 0x00, 0x5b, 0x7e, 0x00, 0x5e}; // 0x5B to 0x60
m_term_data = data;
if ((data >= 0x20) && (data <= 0x2f))
m_term_data = s1[data-0x20];
- else
- if ((data >= 0x3a) && (data <= 0x40))
+ else if ((data >= 0x3a) && (data <= 0x40))
m_term_data = s2[data-0x3a];
- else
- if ((data >= 0x5b) && (data <= 0x60))
+ else if ((data >= 0x5b) && (data <= 0x60))
m_term_data = s3[data-0x5b];
- else
- if (data >= 0x7b)
+ else if (data >= 0x7b)
m_term_data = 0;
if (m_term_data)
@@ -198,7 +195,7 @@ static GFXDECODE_START( llc2 )
GFXDECODE_END
/* Machine driver */
-static MACHINE_CONFIG_START( llc1, llc_state )
+static MACHINE_CONFIG_START( llc1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz)
MCFG_Z80_DAISY_CHAIN(llc1_daisy_chain)
@@ -239,10 +236,10 @@ static MACHINE_CONFIG_START( llc1, llc_state )
MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(llc_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(llc_state, kbd_put))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( llc2, llc_state )
+static MACHINE_CONFIG_START( llc2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3MHz)
MCFG_Z80_DAISY_CHAIN(llc2_daisy_chain)
@@ -310,6 +307,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, llc1, 0, 0, llc1, llc1, llc_state, llc1, "SCCH", "LLC-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1984, llc2, llc1, 0, llc2, llc2, llc_state, llc2, "SCCH", "LLC-2", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, llc1, 0, 0, llc1, llc1, llc_state, llc1, "SCCH", "LLC-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1984, llc2, llc1, 0, llc2, llc2, llc_state, llc2, "SCCH", "LLC-2", 0 )
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index 559c1d38467..9dc1be38a12 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -480,7 +480,7 @@ void lockon_state::machine_reset()
m_main_inten = 0;
}
-static MACHINE_CONFIG_START( lockon, lockon_state )
+static MACHINE_CONFIG_START( lockon )
MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(main_v30)
@@ -778,5 +778,5 @@ ROM_END
*
*************************************/
-GAME( 1986, lockon, 0, lockon, lockon, driver_device, 0, ROT0, "Tatsumi", "Lock-On (rev. E)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lockonc, lockon, lockon, lockone, driver_device, 0, ROT0, "Tatsumi", "Lock-On (rev. C)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lockon, 0, lockon, lockon, lockon_state, 0, ROT0, "Tatsumi", "Lock-On (rev. E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lockonc, lockon, lockon, lockone, lockon_state, 0, ROT0, "Tatsumi", "Lock-On (rev. C)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp
index def2ca69321..7a22a1d7f13 100644
--- a/src/mame/drivers/lola8a.cpp
+++ b/src/mame/drivers/lola8a.cpp
@@ -248,7 +248,7 @@ WRITE_LINE_MEMBER(lola8a_state::crtc_vsync)
m_maincpu->set_input_line(I8085_RST75_LINE, state? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( lola8a, lola8a_state )
+static MACHINE_CONFIG_START( lola8a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_4_9152MHz)
MCFG_CPU_PROGRAM_MAP(lola8a_mem)
@@ -294,5 +294,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, lola8a, 0, 0, lola8a, lola8a, driver_device, 0, "Institut Ivo Lola Ribar", "Lola 8A", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1986, lola8a, 0, 0, lola8a, lola8a, lola8a_state, 0, "Institut Ivo Lola Ribar", "Lola 8A", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index 005b631a11a..d3e82a0eacb 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -621,7 +621,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( looping, looping_state )
+static MACHINE_CONFIG_START( looping )
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, MAIN_CPU_CLOCK, looping_map, looping_io_map)
diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp
index 999097f95d5..15f60657248 100644
--- a/src/mame/drivers/lordgun.cpp
+++ b/src/mame/drivers/lordgun.cpp
@@ -632,7 +632,7 @@ void lordgun_state::machine_start()
save_item(NAME(m_whitescreen));
}
-static MACHINE_CONFIG_START( lordgun, lordgun_state )
+static MACHINE_CONFIG_START( lordgun )
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
MCFG_CPU_PROGRAM_MAP(lordgun_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
@@ -679,12 +679,12 @@ static MACHINE_CONFIG_START( lordgun, lordgun_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right!
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, PIN7_HIGH) // ? 5MHz can't be right!
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aliencha, lordgun_state )
+static MACHINE_CONFIG_START( aliencha )
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2)
MCFG_CPU_PROGRAM_MAP(aliencha_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", lordgun_state, irq4_line_hold)
@@ -732,10 +732,10 @@ static MACHINE_CONFIG_START( aliencha, lordgun_state )
MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, PIN7_HIGH) // ? 5MHz can't be right
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right
+ MCFG_OKIM6295_ADD("oki2", XTAL_20MHz / 20, PIN7_HIGH) // ? 5MHz can't be right
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1080,6 +1080,6 @@ DRIVER_INIT_MEMBER(lordgun_state, aliencha)
***************************************************************************/
-GAME( 1994, lordgun, 0, lordgun, lordgun, lordgun_state, lordgun, ROT0, "IGS", "Lord of Gun (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, aliencha, 0, aliencha, aliencha, driver_device, 0, ROT0, "IGS", "Alien Challenge (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, alienchac, aliencha, aliencha, aliencha, driver_device, 0, ROT0, "IGS", "Alien Challenge (China)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, lordgun, 0, lordgun, lordgun, lordgun_state, lordgun, ROT0, "IGS", "Lord of Gun (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, aliencha, 0, aliencha, aliencha, lordgun_state, 0, ROT0, "IGS", "Alien Challenge (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, alienchac, aliencha, aliencha, aliencha, lordgun_state, 0, ROT0, "IGS", "Alien Challenge (China)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp
index 7f981732f4a..93809d7a60d 100644
--- a/src/mame/drivers/lsasquad.cpp
+++ b/src/mame/drivers/lsasquad.cpp
@@ -560,7 +560,7 @@ MACHINE_RESET_MEMBER(lsasquad_state,lsasquad)
}
/* Note: lsasquad clock values are not verified */
-static MACHINE_CONFIG_START( lsasquad, lsasquad_state )
+static MACHINE_CONFIG_START( lsasquad )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
@@ -616,7 +616,7 @@ static MACHINE_CONFIG_DERIVED( storming, lsasquad )
MCFG_DEVICE_REMOVE("bmcu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( daikaiju, lsasquad_state )
+static MACHINE_CONFIG_START( daikaiju )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK / 4)
@@ -786,6 +786,6 @@ ROM_START( daikaiju )
ROM_END
-GAME( 1986, lsasquad, 0, lsasquad, lsasquad, driver_device, 0, ROT270, "Taito", "Land Sea Air Squad / Riku Kai Kuu Saizensen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, storming, lsasquad, storming, storming, driver_device, 0, ROT270, "bootleg", "Storming Party / Riku Kai Kuu Saizensen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, daikaiju, 0, daikaiju, daikaiju, driver_device, 0, ROT270, "Taito", "Daikaiju no Gyakushu", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lsasquad, 0, lsasquad, lsasquad, lsasquad_state, 0, ROT270, "Taito", "Land Sea Air Squad / Riku Kai Kuu Saizensen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, storming, lsasquad, storming, storming, lsasquad_state, 0, ROT270, "bootleg", "Storming Party / Riku Kai Kuu Saizensen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, daikaiju, 0, daikaiju, daikaiju, lsasquad_state, 0, ROT270, "Taito", "Daikaiju no Gyakushu", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp
index 6a61524c346..05df8f26cd7 100644
--- a/src/mame/drivers/ltcasino.cpp
+++ b/src/mame/drivers/ltcasino.cpp
@@ -651,7 +651,7 @@ uint32_t ltcasino_state::screen_update_ltcasino(screen_device &screen, bitmap_in
}
-static MACHINE_CONFIG_START( ltcasino, ltcasino_state )
+static MACHINE_CONFIG_START( ltcasino )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,2000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(ltcasino_map)
@@ -728,6 +728,6 @@ DRIVER_INIT_MEMBER(ltcasino_state,mv4in1)
-GAME( 1982, ltcasino, 0, ltcasino, ltcasino, driver_device, 0, ROT0, "Digital Controls Inc.", "Little Casino (older)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1983, mv4in1, ltcasino, ltcasino, mv4in1, ltcasino_state, mv4in1, ROT0, "Entertainment Enterprises, Ltd.", "Mini Vegas 4in1", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1984, ltcasinn, 0, ltcasino, ltcasinn, driver_device, 0, ROT0, "Digital Controls Inc.", "Little Casino (newer)", MACHINE_NOT_WORKING )
+GAME( 1982, ltcasino, 0, ltcasino, ltcasino, ltcasino_state, 0, ROT0, "Digital Controls Inc.", "Little Casino (older)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, mv4in1, ltcasino, ltcasino, mv4in1, ltcasino_state, mv4in1, ROT0, "Entertainment Enterprises, Ltd.", "Mini Vegas 4in1", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, ltcasinn, 0, ltcasino, ltcasinn, ltcasino_state, 0, ROT0, "Digital Controls Inc.", "Little Casino (newer)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index fda41c21373..9d270503ab1 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -515,7 +515,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( ltd_state::timer_r )
}
}
-static MACHINE_CONFIG_START( ltd3, ltd_state )
+static MACHINE_CONFIG_START( ltd3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_3_579545MHz)
MCFG_CPU_PROGRAM_MAP(ltd3_map)
@@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( ltd3, ltd_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_r", ltd_state, timer_r, attotime::from_hz(500))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ltd4, ltd_state )
+static MACHINE_CONFIG_START( ltd4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) // guess, no details available
MCFG_CPU_PROGRAM_MAP(ltd4_map)
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index aff328f94c0..7679bc041e5 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -986,7 +986,7 @@ INTERRUPT_GEN_MEMBER(luckgrln_state::luckgrln_irq)
m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( luckgrln, luckgrln_state )
+static MACHINE_CONFIG_START( luckgrln )
MCFG_CPU_ADD("maincpu", Z180,8000000)
MCFG_CPU_PROGRAM_MAP(mainmap)
MCFG_CPU_IO_MAP(portmap)
@@ -1092,8 +1092,8 @@ ROM_END
/*********************************************
* Game Drivers *
-**********************************************
+**********************************************/
- YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULL NAME FLAGS LAYOUT
GAMEL( 1991, luckgrln, 0, luckgrln, luckgrln, luckgrln_state, luckgrln, ROT0, "Wing Co., Ltd.", "Lucky Girl (newer Z180 based hardware)", MACHINE_NO_SOUND, layout_luckgrln )
-GAMEL( 1993, 7smash, 0, _7smash, _7smash, driver_device, 0, ROT0, "Sovic", "7 Smash", MACHINE_NO_SOUND, layout_7smash )
+GAMEL( 1993, 7smash, 0, _7smash, _7smash, luckgrln_state, 0, ROT0, "Sovic", "7 Smash", MACHINE_NO_SOUND, layout_7smash )
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index dd49c52350f..e5d048f1372 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -1461,7 +1461,7 @@ WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int)
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( lucky74, lucky74_state )
+static MACHINE_CONFIG_START( lucky74 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, C_06B49P_CLKOUT_03) /* 3 MHz. */
@@ -1526,7 +1526,7 @@ static MACHINE_CONFIG_START( lucky74, lucky74_state )
MCFG_SOUND_ADD("msm", MSM5205, C_06B49P_CLKOUT_06) /* 375 kHz. */
MCFG_MSM5205_VCLK_CB(WRITELINE(lucky74_state, lucky74_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -1743,10 +1743,10 @@ ROM_END
/*********************************************
* Game Drivers *
-**********************************************
+**********************************************/
- YEAR NAME PARENT MACHINE INPUT STATS INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1988, lucky74, 0, lucky74, lucky74, driver_device, 0, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 1)", 0, layout_lucky74 )
-GAMEL( 1988, lucky74a, lucky74, lucky74, lucky74a, driver_device, 0, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 3)", 0, layout_lucky74 )
-GAMEL( 1988, lucky74b, lucky74, lucky74, lucky74, driver_device, 0, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 2)", MACHINE_NOT_WORKING, layout_lucky74 )
-GAME( 1989, excitbj, 0, lucky74, excitbj, driver_device, 0, ROT0, "Sega", "Exciting Black Jack", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATS INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1988, lucky74, 0, lucky74, lucky74, lucky74_state, 0, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 1)", 0, layout_lucky74 )
+GAMEL( 1988, lucky74a, lucky74, lucky74, lucky74a, lucky74_state, 0, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 3)", 0, layout_lucky74 )
+GAMEL( 1988, lucky74b, lucky74, lucky74, lucky74, lucky74_state, 0, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 2)", MACHINE_NOT_WORKING, layout_lucky74 )
+GAME( 1989, excitbj, 0, lucky74, excitbj, lucky74_state, 0, ROT0, "Sega", "Exciting Black Jack", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp
index 5d3b6bb70fc..e72db16f15a 100644
--- a/src/mame/drivers/lvcards.cpp
+++ b/src/mame/drivers/lvcards.cpp
@@ -451,7 +451,7 @@ GFXDECODE_END
/* Sound Interfaces */
-static MACHINE_CONFIG_START( lvcards, lvcards_state )
+static MACHINE_CONFIG_START( lvcards )
// basic machine hardware
MCFG_CPU_ADD("maincpu",Z80, 18432000/4) // unknown frequency, assume same as tehkanwc.cpp
MCFG_CPU_PROGRAM_MAP(lvcards_map)
@@ -564,6 +564,6 @@ ROM_START( ponttehk )
ROM_LOAD( "pon24s10.001", 0x0200, 0x0100, CRC(c64ecee8) SHA1(80c9ec21e135235f7f2d41ce7900cf3904123823) ) /* blue component */
ROM_END
-GAME( 1985, lvcards, 0, lvcards, lvcards, driver_device, 0, ROT0, "Tehkan", "Lovely Cards", 0 )
-GAME( 1985, lvpoker, lvcards, lvpoker, lvpoker, driver_device, 0, ROT0, "Tehkan", "Lovely Poker [BET]", 0 )
-GAME( 1985, ponttehk, 0, ponttehk, ponttehk, driver_device, 0, ROT0, "Tehkan", "Pontoon (Tehkan)", 0 )
+GAME( 1985, lvcards, 0, lvcards, lvcards, lvcards_state, 0, ROT0, "Tehkan", "Lovely Cards", 0 )
+GAME( 1985, lvpoker, lvcards, lvpoker, lvpoker, lvcards_state, 0, ROT0, "Tehkan", "Lovely Poker [BET]", 0 )
+GAME( 1985, ponttehk, 0, ponttehk, ponttehk, lvcards_state, 0, ROT0, "Tehkan", "Pontoon (Tehkan)", 0 )
diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp
index 6be2f7aa9a1..d8e589371d6 100644
--- a/src/mame/drivers/lviv.cpp
+++ b/src/mame/drivers/lviv.cpp
@@ -420,7 +420,7 @@ INPUT_PORTS_END
/* machine definition */
-static MACHINE_CONFIG_START( lviv, lviv_state )
+static MACHINE_CONFIG_START( lviv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2500000)
MCFG_CPU_PROGRAM_MAP(lviv_mem)
@@ -489,5 +489,5 @@ ROM_START(lviv)
ROMX_LOAD("lvivp.bin", 0x10000, 0x4000, CRC(f171c282) SHA1(c7dc2bdb02400e6b5cdcc50040eb06f506a7ed84), ROM_BIOS(3))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, lviv, 0, 0, lviv, lviv, driver_device, 0, "V. I. Lenin", "PK-01 Lviv" , 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1989, lviv, 0, 0, lviv, lviv, lviv_state, 0, "V. I. Lenin", "PK-01 Lviv", 0 )
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index 654030e951f..0aeb8016876 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -916,7 +916,7 @@ void lwings_state::machine_reset()
m_adpcm = 0;
}
-static MACHINE_CONFIG_START( lwings, lwings_state )
+static MACHINE_CONFIG_START( lwings )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on PCB */
@@ -972,7 +972,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fball, lwings_state )
+static MACHINE_CONFIG_START( fball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
@@ -1007,7 +1007,7 @@ static MACHINE_CONFIG_START( fball, lwings_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, fball_oki_map)
@@ -1041,7 +1041,7 @@ static MACHINE_CONFIG_DERIVED( trojan, lwings )
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
MCFG_SOUND_ADD("5205", MSM5205, XTAL_384kHz) /* verified on PCB */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* slave mode */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* slave mode */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1740,24 +1740,24 @@ DRIVER_INIT_MEMBER(lwings_state, avengersb)
*
*************************************/
-GAME( 1985, sectionz, 0, lwings, sectionz, driver_device, 0, ROT0, "Capcom", "Section Z (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, sectionza, sectionz, lwings, sectionz, driver_device, 0, ROT0, "Capcom", "Section Z (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sectionz, 0, lwings, sectionz, lwings_state, 0, ROT0, "Capcom", "Section Z (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sectionza, sectionz, lwings, sectionz, lwings_state, 0, ROT0, "Capcom", "Section Z (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lwings, 0, lwings, lwings, driver_device, 0, ROT90, "Capcom", "Legendary Wings (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lwings2, lwings, lwings, lwings, driver_device, 0, ROT90, "Capcom", "Legendary Wings (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lwingsj, lwings, lwings, lwings, driver_device, 0, ROT90, "Capcom", "Ares no Tsubasa (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lwingsb, lwings, lwings, lwingsb, driver_device, 0, ROT90, "bootleg", "Legendary Wings (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lwings, 0, lwings, lwings, lwings_state, 0, ROT90, "Capcom", "Legendary Wings (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lwings2, lwings, lwings, lwings, lwings_state, 0, ROT90, "Capcom", "Legendary Wings (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lwingsj, lwings, lwings, lwings, lwings_state, 0, ROT90, "Capcom", "Ares no Tsubasa (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lwingsb, lwings, lwings, lwingsb, lwings_state, 0, ROT90, "bootleg", "Legendary Wings (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, trojan, 0, trojan, trojanls, driver_device, 0, ROT0, "Capcom", "Trojan (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, trojana, trojan, trojan, trojanls, driver_device, 0, ROT0, "Capcom", "Trojan (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, trojanr, trojan, trojan, trojan, driver_device, 0, ROT0, "Capcom (Romstar license)", "Trojan (Romstar)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, trojanj, trojan, trojan, trojan, driver_device, 0, ROT0, "Capcom", "Tatakai no Banka (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, trojanb, trojan, trojan, trojanls, driver_device, 0, ROT0, "bootleg", "Trojan (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, trojan, 0, trojan, trojanls, lwings_state, 0, ROT0, "Capcom", "Trojan (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, trojana, trojan, trojan, trojanls, lwings_state, 0, ROT0, "Capcom", "Trojan (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, trojanr, trojan, trojan, trojan, lwings_state, 0, ROT0, "Capcom (Romstar license)", "Trojan (Romstar)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, trojanj, trojan, trojan, trojan, lwings_state, 0, ROT0, "Capcom", "Tatakai no Banka (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, trojanb, trojan, trojan, trojanls, lwings_state, 0, ROT0, "bootleg", "Trojan (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, avengers, 0, avengers, avengers, driver_device, 0, ROT90, "Capcom", "Avengers (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, avengers2, avengers, avengers, avengers, driver_device, 0, ROT90, "Capcom", "Avengers (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, buraiken, avengers, avengers, avengers, driver_device, 0, ROT90, "Capcom", "Hissatsu Buraiken (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, avengers, 0, avengers, avengers, lwings_state, 0, ROT90, "Capcom", "Avengers (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, avengers2, avengers, avengers, avengers, lwings_state, 0, ROT90, "Capcom", "Avengers (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, buraiken, avengers, avengers, avengers, lwings_state, 0, ROT90, "Capcom", "Hissatsu Buraiken (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, buraikenb, avengers, avengersb,avengers, lwings_state, avengersb, ROT90, "Capcom", "Hissatsu Buraiken (Japan, bootleg?)", MACHINE_SUPPORTS_SAVE ) // unprotected at least
// cloned lwings hardware
-GAME( 1992, fball, 0, fball, fball, driver_device, 0, ROT0, "FM Work", "Fire Ball (FM Work)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fball, 0, fball, fball, lwings_state, 0, ROT0, "FM Work", "Fire Ball (FM Work)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/lwriter.cpp b/src/mame/drivers/lwriter.cpp
index bffd21052d6..93cea41ba28 100644
--- a/src/mame/drivers/lwriter.cpp
+++ b/src/mame/drivers/lwriter.cpp
@@ -349,7 +349,7 @@ WRITE_LINE_MEMBER(lwriter_state::scc_int)
#define CPU_CLK (XTAL_22_3210MHz / 2) // Based on pictures form here: http://picclick.co.uk/Apple-Postscript-LaserWriter-IINT-Printer-640-4105-M6009-Mainboard-282160713108.html#&gid=1&pid=7
#define RXC_CLK ((CPU_CLK - (87 * 16 * 70)) / 3) // Tuned to get 9600 baud according to manual, needs rework based on real hardware
-static MACHINE_CONFIG_START( lwriter, lwriter_state )
+static MACHINE_CONFIG_START( lwriter )
MCFG_CPU_ADD("maincpu", M68000, CPU_CLK)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
MCFG_SCC8530_ADD("scc", CPU_CLK, RXC_CLK, 0, RXC_CLK, 0)
@@ -435,5 +435,5 @@ ROM_START(lwriter)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT, COMPANY, FULLNAME, FLAGS */
-CONS( 1988, lwriter, 0, 0, lwriter, lwriter, driver_device, 0, "Apple", "Apple Laser Writer II NT", MACHINE_IS_SKELETON)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1988, lwriter, 0, 0, lwriter, lwriter, lwriter_state, 0, "Apple Computer", "Apple Laser Writer II NT", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp
index 598ed06981c..6f0cd93a68a 100644
--- a/src/mame/drivers/lynx.cpp
+++ b/src/mame/drivers/lynx.cpp
@@ -75,7 +75,7 @@ void lynx_state::sound_cb()
lynx_timer_count_down(1);
}
-static MACHINE_CONFIG_START( lynx, lynx_state )
+static MACHINE_CONFIG_START( lynx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65SC02, 4000000) /* vti core, integrated in vlsi, stz, but not bbr bbs */
MCFG_CPU_PROGRAM_MAP(lynx_mem)
@@ -198,6 +198,6 @@ QUICKLOAD_LOAD_MEMBER( lynx_state, lynx )
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1989, lynx, 0, 0, lynx, lynx, driver_device, 0, "Atari", "Lynx", MACHINE_SUPPORTS_SAVE )
-// CONS( 1991, lynx2, lynx, 0, lynx2, lynx, driver_device, 0, "Atari", "Lynx II", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1989, lynx, 0, 0, lynx, lynx, lynx_state, 0, "Atari", "Lynx", MACHINE_SUPPORTS_SAVE )
+// CONS( 1991, lynx2, lynx, 0, lynx2, lynx, lynx_state, 0, "Atari", "Lynx II", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp
index e07a81cc188..1611df8ba6e 100644
--- a/src/mame/drivers/m10.cpp
+++ b/src/mame/drivers/m10.cpp
@@ -809,7 +809,7 @@ static const char *const m10_sample_names[] =
*
*************************************/
-static MACHINE_CONFIG_START( m10, m10_state )
+static MACHINE_CONFIG_START( m10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,IREMM10_CPU_CLOCK)
@@ -872,7 +872,7 @@ static MACHINE_CONFIG_DERIVED( m11, m10 )
/* sound hardware */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( m15, m10_state )
+static MACHINE_CONFIG_START( m15 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,IREMM15_CPU_CLOCK)
@@ -1045,10 +1045,10 @@ ROM_START( greenber )
ROM_LOAD( "gb9", 0x3000, 0x0400, CRC(c27b9ba3) SHA1(a2f4f0c4b61eb03bba13ae5d25dc01009a4f86ee) ) // ok ?
ROM_END
-GAME( 1979, andromed, 0, m11, skychut, m10_state, andromed, ROT270, "IPM", "Andromeda (Japan?)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, ipminvad, 0, m10, ipminvad, driver_device, 0, ROT270, "IPM", "IPM Invader", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, andromed, 0, m11, skychut, m10_state, andromed, ROT270, "IPM", "Andromeda (Japan?)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, ipminvad, 0, m10, ipminvad, m10_state, 0, ROT270, "IPM", "IPM Invader", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
GAME( 1979, ipminvad1, ipminvad, m10, ipminvad, m10_state, ipminva1, ROT270, "IPM", "IPM Invader (Incomplete Dump)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, skychut, 0, m11, skychut, driver_device, 0, ROT270, "Irem", "Sky Chuter", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, spacbeam, 0, m15, spacbeam, driver_device, 0, ROT270, "Irem", "Space Beam", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) // IPM or Irem?
-GAME( 1979, headoni, 0, headoni, headoni, driver_device, 0, ROT270, "Irem", "Head On (Irem, M-15 Hardware)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, greenber, 0, m15, spacbeam, driver_device, 0, ROT270, "Irem", "Green Beret (Irem)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, skychut, 0, m11, skychut, m10_state, 0, ROT270, "Irem", "Sky Chuter", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spacbeam, 0, m15, spacbeam, m10_state, 0, ROT270, "Irem", "Space Beam", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) // IPM or Irem?
+GAME( 1979, headoni, 0, headoni, headoni, m10_state, 0, ROT270, "Irem", "Head On (Irem, M-15 Hardware)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, greenber, 0, m15, spacbeam, m10_state, 0, ROT270, "Irem", "Green Beret (Irem)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp
index 3b5086152aa..ddb546e8a7e 100644
--- a/src/mame/drivers/m107.cpp
+++ b/src/mame/drivers/m107.cpp
@@ -772,7 +772,7 @@ GFXDECODE_END
/***************************************************************************/
-static MACHINE_CONFIG_START( firebarr, m107_state )
+static MACHINE_CONFIG_START( firebarr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V33, 28000000/2) /* NEC V33, 28MHz clock */
@@ -1060,11 +1060,11 @@ DRIVER_INIT_MEMBER(m107_state,wpksoc)
/***************************************************************************/
-GAME( 1993, airass, 0, airass, firebarr, m107_state, firebarr, ROT270, "Irem", "Air Assault (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // possible location test, but sound code is newer than Japan version
-GAME( 1993, firebarr, airass, firebarr, firebarr, m107_state, firebarr, ROT270, "Irem", "Fire Barrel (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, airass, 0, airass, firebarr, m107_state, firebarr, ROT270, "Irem", "Air Assault (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // possible location test, but sound code is newer than Japan version
+GAME( 1993, firebarr, airass, firebarr, firebarr, m107_state, firebarr, ROT270, "Irem", "Fire Barrel (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dsoccr94, 0, dsoccr94, dsoccr94, m107_state, dsoccr94, ROT0, "Irem (Data East Corporation license)", "Dream Soccer '94 (World, M107 hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dsoccr94k, dsoccr94, dsoccr94, dsoccr94, m107_state, dsoccr94, ROT0, "Irem (Data East Corporation license)", "Dream Soccer '94 (Korea, M107 hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // default team selected is Korea, so likely a Korean set
+GAME( 1994, dsoccr94, 0, dsoccr94, dsoccr94, m107_state, dsoccr94, ROT0, "Irem (Data East Corporation license)", "Dream Soccer '94 (World, M107 hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dsoccr94k, dsoccr94, dsoccr94, dsoccr94, m107_state, dsoccr94, ROT0, "Irem (Data East Corporation license)", "Dream Soccer '94 (Korea, M107 hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // default team selected is Korea, so likely a Korean set
-GAME( 1995, wpksoc, 0, wpksoc, wpksoc, m107_state, wpksoc, ROT0, "Jaleco", "World PK Soccer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, kftgoal, wpksoc, wpksoc, wpksoc, m107_state, wpksoc, ROT0, "Jaleco", "Kick for the Goal", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, wpksoc, 0, wpksoc, wpksoc, m107_state, wpksoc, ROT0, "Jaleco", "World PK Soccer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, kftgoal, wpksoc, wpksoc, wpksoc, m107_state, wpksoc, ROT0, "Jaleco", "Kick for the Goal", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp
index e8a92f1cae4..a396e6391b3 100644
--- a/src/mame/drivers/m14.cpp
+++ b/src/mame/drivers/m14.cpp
@@ -329,7 +329,7 @@ void m14_state::machine_reset()
}
-static MACHINE_CONFIG_START( m14, m14_state )
+static MACHINE_CONFIG_START( m14 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A,6000000/2) //guess: 6 Mhz internally divided by 2
@@ -383,4 +383,4 @@ ROM_START( ptrmj )
ROM_LOAD( "mgpa10.bin", 0x0400, 0x0400, CRC(e1a4ebdc) SHA1(d9df42424ede17f0634d8d0a56c0374a33c55333) )
ROM_END
-GAME( 1979, ptrmj, 0, m14, m14, driver_device, 0, ROT0, "Irem", "PT Reach Mahjong (Japan)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // IPM or Irem?
+GAME( 1979, ptrmj, 0, m14, m14, m14_state, 0, ROT0, "Irem", "PT Reach Mahjong (Japan)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // IPM or Irem?
diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp
index ac0bf307675..5c39ecb5ade 100644
--- a/src/mame/drivers/m20.cpp
+++ b/src/mame/drivers/m20.cpp
@@ -84,7 +84,7 @@ public:
required_device<i8251_device> m_ttyi8251;
required_device<i8255_device> m_i8255;
required_device<pic8259_device> m_i8259;
- required_device<fd1797_t> m_fd1797;
+ required_device<fd1797_device> m_fd1797;
required_device<floppy_image_device> m_floppy0;
required_device<floppy_image_device> m_floppy1;
optional_device<m20_8086_device> m_apb;
@@ -698,7 +698,7 @@ void m20_state::install_memory()
static ADDRESS_MAP_START(m20_io, AS_IO, 16, m20_state)
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x00, 0x07) AM_DEVREADWRITE8("fd1797", fd1797_t, read, write, 0x00ff)
+ AM_RANGE(0x00, 0x07) AM_DEVREADWRITE8("fd1797", fd1797_device, read, write, 0x00ff)
AM_RANGE(0x20, 0x21) AM_READWRITE(port21_r, port21_w);
@@ -760,8 +760,8 @@ void m20_state::machine_reset()
memcpy(RAM, ROM, 8); // we need only the reset vector
m_maincpu->reset(); // reset the CPU to ensure it picks up the new vector
m_kbdi8251->write_cts(0);
- if(m_apb)
- m_apb->m_8086->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
+ if (m_apb)
+ m_apb->halt();
}
@@ -778,7 +778,7 @@ static SLOT_INTERFACE_START(keyboard)
SLOT_INTERFACE("m20", M20_KEYBOARD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( m20, m20_state )
+static MACHINE_CONFIG_START( m20 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z8001, MAIN_CLOCK)
MCFG_CPU_PROGRAM_MAP(m20_program_mem)
@@ -867,6 +867,6 @@ ROM_START(m40)
ROM_REGION(0x4000, "apb_bios", ROMREGION_ERASEFF) // Processor board with 8086
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, m20, 0, 0, m20, 0, driver_device, 0, "Olivetti", "Olivetti L1 M20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1981, m40, m20, 0, m20, 0, driver_device, 0, "Olivetti", "Olivetti L1 M40", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, m20, 0, 0, m20, 0, m20_state, 0, "Olivetti", "Olivetti L1 M20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1981, m40, m20, 0, m20, 0, m20_state, 0, "Olivetti", "Olivetti L1 M40", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/m24.cpp b/src/mame/drivers/m24.cpp
index 21ac6bd26c9..fbacf36ffeb 100644
--- a/src/mame/drivers/m24.cpp
+++ b/src/mame/drivers/m24.cpp
@@ -5,13 +5,16 @@
#include "cpu/i86/i86.h"
#include "cpu/tms7000/tms7000.h"
+#include "imagedev/floppy.h"
#include "machine/m24_kbd.h"
#include "machine/m24_z8000.h"
#include "machine/mm58274c.h"
#include "machine/genpc.h"
+
#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
#include "formats/m20_dsk.h"
+
#include "softlist.h"
class m24_state : public driver_device
@@ -58,7 +61,7 @@ void m24_state::machine_reset()
m_i86_halt = false;
m_i86_halt_perm = false;
if(m_z8000_apb)
- m_z8000_apb->m_z8000->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
+ m_z8000_apb->halt_w(ASSERT_LINE);
}
READ8_MEMBER(m24_state::keyboard_r)
@@ -140,7 +143,7 @@ WRITE_LINE_MEMBER(m24_state::dma_hrq_w)
if(!m_i86_halt)
m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
if(m_z8000_apb && !m_z8000_apb->halted())
- m_z8000_apb->m_z8000->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE);
+ m_z8000_apb->halt_w(state ? ASSERT_LINE : CLEAR_LINE);
/* Assert HLDA */
m_mb->m_dma8237->hack_w(state);
@@ -151,7 +154,7 @@ WRITE_LINE_MEMBER(m24_state::int_w)
if(!m_i86_halt)
m_maincpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE);
if(m_z8000_apb && !m_z8000_apb->halted())
- m_z8000_apb->m_z8000->set_input_line(INPUT_LINE_IRQ1, state ? ASSERT_LINE : CLEAR_LINE);
+ m_z8000_apb->int_w(state ? ASSERT_LINE : CLEAR_LINE);
}
WRITE_LINE_MEMBER(m24_state::halt_i86_w)
@@ -243,7 +246,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_m20_format )
static_cast<floppy_connector *>(device)->set_formats(m24_state::floppy_formats);
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( olivetti, m24_state )
+static MACHINE_CONFIG_START( olivetti )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(m24_map)
@@ -308,5 +311,5 @@ ROM_START( m240 )
ROM_LOAD("pdbd.tms2516.keyboardmcureplacementdaughterboard_10u", 0x000, 0x800, BAD_DUMP CRC(b8c4c18a) SHA1(25b4c24e19ff91924c53557c66513ab242d926c6))
ROM_END
-COMP( 1983, m24, ibm5150, 0, olivetti, m24, driver_device, 0, "Olivetti", "M24", MACHINE_NOT_WORKING)
-COMP( 1987, m240, ibm5150, 0, olivetti, m24, driver_device, 0, "Olivetti", "M240", MACHINE_NOT_WORKING)
+COMP( 1983, m24, ibm5150, 0, olivetti, m24, m24_state, 0, "Olivetti", "M24", MACHINE_NOT_WORKING )
+COMP( 1987, m240, ibm5150, 0, olivetti, m24, m24_state, 0, "Olivetti", "M240", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index 2c7d99b81eb..9f98433bddf 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -1051,7 +1051,7 @@ static ADDRESS_MAP_START( brno_io, AS_IO, 8, brno_state )
AM_RANGE(0x68, 0x6b) AM_READWRITE(ramsel_r, ramsel_w) // CASEN 0=access to ramdisk enabled, 0xff=ramdisk access disabled(data protection), &80=ROM2+48k RAM, &81=ROM2+4k RAM
AM_RANGE(0x6c, 0x6f) AM_READWRITE(romsel_r, romsel_w) // RAMEN 0=rom enable; 0xff=rom+sord ram disabled (ramdisk visible)
// AM_RANGE(0x70, 0x73) AM_MIRROR(0x04) AM_DEVREADWRITE(I8255A_TAG, i8255_device, read, write) // PIO
- AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE(WD2797_TAG, wd_fdc_t, read, write) // WD2797 registers -> 78 - status/cmd, 79 - track #, 7a - sector #, 7b - data
+ AM_RANGE(0x78, 0x7b) AM_DEVREADWRITE(WD2797_TAG, wd_fdc_device_base, read, write) // WD2797 registers -> 78 - status/cmd, 79 - track #, 7a - sector #, 7b - data
AM_RANGE(0x7c, 0x7c) AM_READWRITE(fd_r, fd_w) // drive select
ADDRESS_MAP_END
@@ -1396,7 +1396,7 @@ void brno_state::machine_reset()
// MACHINE_CONFIG( m5 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( m5, m5_state )
+static MACHINE_CONFIG_START( m5 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_14_31818MHz/4)
MCFG_CPU_PROGRAM_MAP(m5_mem)
@@ -1487,7 +1487,7 @@ MACHINE_CONFIG_END
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( brno, m5, brno_state )
+static MACHINE_CONFIG_DERIVED( brno, m5 )
// basic machine hardware
MCFG_CPU_MODIFY(Z80_TAG)
@@ -1606,7 +1606,7 @@ DRIVER_INIT_MEMBER(brno_state,brno)
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, m5, 0, 0, ntsc, m5, m5_state, ntsc, "Sord", "m.5 (Japan)", 0 )
-COMP( 1983, m5p, m5, 0, pal, m5, m5_state, pal, "Sord", "m.5 (Europe)", 0 )
-COMP( 1983, m5p_brno, m5, 0, brno, m5, brno_state, brno, "Sord", "m.5 (Europe) BRNO mod", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, m5, 0, 0, ntsc, m5, m5_state, ntsc, "Sord", "m.5 (Japan)", 0 )
+COMP( 1983, m5p, m5, 0, pal, m5, m5_state, pal, "Sord", "m.5 (Europe)", 0 )
+COMP( 1983, m5p_brno, m5, 0, brno, m5, brno_state, brno, "Sord", "m.5 (Europe) BRNO mod", 0 )
diff --git a/src/mame/drivers/m52.cpp b/src/mame/drivers/m52.cpp
index 07814650a63..8b3c336f057 100644
--- a/src/mame/drivers/m52.cpp
+++ b/src/mame/drivers/m52.cpp
@@ -392,7 +392,7 @@ void m52_state::machine_reset()
m_bgcontrol = 0;
}
-static MACHINE_CONFIG_START( m52, m52_state )
+static MACHINE_CONFIG_START( m52 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
@@ -586,7 +586,7 @@ ROM_END
*
*************************************/
-GAME( 1982, mpatrol, 0, m52, mpatrol, driver_device, 0, ROT0, "Irem", "Moon Patrol", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mpatrolw, mpatrol, m52, mpatrolw, driver_device, 0, ROT0, "Irem (Williams license)", "Moon Patrol (Williams)", MACHINE_SUPPORTS_SAVE ) // USA
-GAME( 1982, mranger, mpatrol, m52, mpatrol, driver_device, 0, ROT0, "bootleg", "Moon Ranger (bootleg of Moon Patrol)", MACHINE_SUPPORTS_SAVE ) // Italy
-GAME( 1988, alpha1v, 0, alpha1v, alpha1v, driver_device, 0, ROT0, "Vision Electronics", "Alpha One (Vision Electronics)", MACHINE_NOT_WORKING| MACHINE_NO_SOUND| MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mpatrol, 0, m52, mpatrol, m52_state, 0, ROT0, "Irem", "Moon Patrol", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mpatrolw, mpatrol, m52, mpatrolw, m52_state, 0, ROT0, "Irem (Williams license)", "Moon Patrol (Williams)", MACHINE_SUPPORTS_SAVE ) // USA
+GAME( 1982, mranger, mpatrol, m52, mpatrol, m52_state, 0, ROT0, "bootleg", "Moon Ranger (bootleg of Moon Patrol)", MACHINE_SUPPORTS_SAVE ) // Italy
+GAME( 1988, alpha1v, 0, alpha1v, alpha1v, m52_state, 0, ROT0, "Vision Electronics", "Alpha One (Vision Electronics)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp
index 5a9f85c00d4..7ad550e65e6 100644
--- a/src/mame/drivers/m57.cpp
+++ b/src/mame/drivers/m57.cpp
@@ -228,7 +228,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( m57, m57_state )
+static MACHINE_CONFIG_START( m57 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
@@ -333,5 +333,5 @@ ROM_END
*
*************************************/
-GAME( 1983, troangel, 0, m57, troangel, driver_device, 0, ROT0, "Irem", "Tropical Angel", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, newtangl, troangel, m57, troangel, driver_device, 0, ROT0, "Irem", "New Tropical Angel", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, troangel, 0, m57, troangel, m57_state, 0, ROT0, "Irem", "Tropical Angel", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, newtangl, troangel, m57, troangel, m57_state, 0, ROT0, "Irem", "New Tropical Angel", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m58.cpp b/src/mame/drivers/m58.cpp
index d92775a9389..ee4e8b3876f 100644
--- a/src/mame/drivers/m58.cpp
+++ b/src/mame/drivers/m58.cpp
@@ -191,7 +191,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( yard, m58_state )
+static MACHINE_CONFIG_START( yard )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
@@ -426,10 +426,10 @@ ROM_START( 10yard85 )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR, COMPANY, FULLNAME, FLAGS */
-GAME( 1983, 10yard, 0, yard, yard, driver_device, 0, ROT0, "Irem", "10-Yard Fight (World, set 1)", MACHINE_SUPPORTS_SAVE ) // no copyright
-GAME( 1983, 10yardj, 10yard, yard, yard, driver_device, 0, ROT0, "Irem", "10-Yard Fight (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, vs10yard, 10yard, yard, vs10yard, driver_device, 0, ROT0, "Irem", "Vs 10-Yard Fight (World, 11/05/84)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, vs10yardj, 10yard, yard, vs10yarj, driver_device, 0, ROT0, "Irem", "Vs 10-Yard Fight (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, vs10yardu, 10yard, yard, vs10yard, driver_device, 0, ROT0, "Irem (Taito license)", "Vs 10-Yard Fight (US, Taito license)", MACHINE_SUPPORTS_SAVE ) // had '85 stickers, but doesn't have '85 on the title screen like the set below
-GAME( 1985, 10yard85, 10yard, yard, yard, driver_device, 0, ROT0, "Irem (Taito license)", "10-Yard Fight '85 (US, Taito license)", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME, FLAGS */
+GAME( 1983, 10yard, 0, yard, yard, m58_state, 0, ROT0, "Irem", "10-Yard Fight (World, set 1)", MACHINE_SUPPORTS_SAVE ) // no copyright
+GAME( 1983, 10yardj, 10yard, yard, yard, m58_state, 0, ROT0, "Irem", "10-Yard Fight (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vs10yard, 10yard, yard, vs10yard, m58_state, 0, ROT0, "Irem", "Vs 10-Yard Fight (World, 11/05/84)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vs10yardj, 10yard, yard, vs10yarj, m58_state, 0, ROT0, "Irem", "Vs 10-Yard Fight (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vs10yardu, 10yard, yard, vs10yard, m58_state, 0, ROT0, "Irem (Taito license)", "Vs 10-Yard Fight (US, Taito license)", MACHINE_SUPPORTS_SAVE ) // had '85 stickers, but doesn't have '85 on the title screen like the set below
+GAME( 1985, 10yard85, 10yard, yard, yard, m58_state, 0, ROT0, "Irem (Taito license)", "10-Yard Fight '85 (US, Taito license)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp
index a770110b9c0..88e85d42e6a 100644
--- a/src/mame/drivers/m62.cpp
+++ b/src/mame/drivers/m62.cpp
@@ -932,7 +932,7 @@ void m62_state::machine_reset()
m_bankcontrol[1] = 0;
}
-static MACHINE_CONFIG_START( ldrun, m62_state )
+static MACHINE_CONFIG_START( ldrun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 24000000/6)
@@ -2180,25 +2180,25 @@ DRIVER_INIT_MEMBER(m62_state,youjyudn)
membank("bank1")->configure_entries(0, 2, memregion("maincpu")->base() + 0x10000, 0x4000);
}
-GAME( 1984, kungfum, 0, kungfum, kungfum, driver_device, 0, ROT0, "Irem", "Kung-Fu Master (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, kungfumd, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "Irem (Data East USA license)", "Kung-Fu Master (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, spartanx, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "Irem", "Spartan X (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, kungfub, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, kungfub2, kungfum, kungfum, kungfum, driver_device, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, battroad, 0, battroad, battroad, m62_state, battroad, ROT90, "Irem", "The Battle-Road", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, ldrun, 0, ldrun, ldrun, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, ldruna, ldrun, ldrun, ldrun, driver_device, 0, ROT0, "Irem (licensed from Broderbund, Digital Controls Inc. license)", "Lode Runner (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, ldrun2, 0, ldrun2, ldrun2, m62_state, ldrun2, ROT0, "Irem (licensed from Broderbund)", "Lode Runner II - The Bungeling Strikes Back", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) /* Japanese version is called Bangeringu Teikoku No Gyakushuu */
-GAME( 1985, ldrun3, 0, ldrun3, ldrun3, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - The Golden Labyrinth", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1985, ldrun3j, ldrun3, ldrun3, ldrun3, driver_device, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - Majin No Fukkatsu (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, ldrun4, 0, ldrun4, ldrun4, m62_state, ldrun4, ROT0, "Irem (licensed from Broderbund)", "Lode Runner IV - Teikoku Karano Dasshutsu (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1985, lotlot, 0, lotlot, lotlot, driver_device, 0, ROT0, "Irem (licensed from Tokuma Shoten)", "Lot Lot", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, kidniki, 0, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kid Niki - Radical Ninja (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, kidnikiu, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem (Data East USA license)", "Kid Niki - Radical Ninja (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, yanchamr, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kaiketsu Yanchamaru (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1987, lithero, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "bootleg", "Little Hero", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1985, spelunkr, 0, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1985, spelunkrj,spelunkr, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, spelunk2, 0, spelunk2, spelunk2, m62_state, spelunk2, ROT0, "Irem (licensed from Broderbund)", "Spelunker II", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, youjyudn, 0, youjyudn, youjyudn, m62_state, youjyudn, ROT270, "Irem", "Youjyuden (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1985, horizon, 0, horizon, horizon, driver_device, 0, ROT0, "Irem", "Horizon (Irem)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, kungfum, 0, kungfum, kungfum, m62_state, 0, ROT0, "Irem", "Kung-Fu Master (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, kungfumd, kungfum, kungfum, kungfum, m62_state, 0, ROT0, "Irem (Data East USA license)", "Kung-Fu Master (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, spartanx, kungfum, kungfum, kungfum, m62_state, 0, ROT0, "Irem", "Spartan X (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, kungfub, kungfum, kungfum, kungfum, m62_state, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, kungfub2, kungfum, kungfum, kungfum, m62_state, 0, ROT0, "bootleg", "Kung-Fu Master (bootleg set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, battroad, 0, battroad, battroad, m62_state, battroad, ROT90, "Irem", "The Battle-Road", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, ldrun, 0, ldrun, ldrun, m62_state, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, ldruna, ldrun, ldrun, ldrun, m62_state, 0, ROT0, "Irem (licensed from Broderbund, Digital Controls Inc. license)", "Lode Runner (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, ldrun2, 0, ldrun2, ldrun2, m62_state, ldrun2, ROT0, "Irem (licensed from Broderbund)", "Lode Runner II - The Bungeling Strikes Back", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) /* Japanese version is called Bangeringu Teikoku No Gyakushuu */
+GAME( 1985, ldrun3, 0, ldrun3, ldrun3, m62_state, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - The Golden Labyrinth", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1985, ldrun3j, ldrun3, ldrun3, ldrun3, m62_state, 0, ROT0, "Irem (licensed from Broderbund)", "Lode Runner III - Majin No Fukkatsu (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, ldrun4, 0, ldrun4, ldrun4, m62_state, ldrun4, ROT0, "Irem (licensed from Broderbund)", "Lode Runner IV - Teikoku Karano Dasshutsu (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1985, lotlot, 0, lotlot, lotlot, m62_state, 0, ROT0, "Irem (licensed from Tokuma Shoten)", "Lot Lot", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, kidniki, 0, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kid Niki - Radical Ninja (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, kidnikiu, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem (Data East USA license)", "Kid Niki - Radical Ninja (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, yanchamr, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "Irem", "Kaiketsu Yanchamaru (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1987, lithero, kidniki, kidniki, kidniki, m62_state, kidniki, ROT0, "bootleg", "Little Hero", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1985, spelunkr, 0, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1985, spelunkrj,spelunkr, spelunkr, spelunkr, m62_state, spelunkr, ROT0, "Irem (licensed from Broderbund)", "Spelunker (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, spelunk2, 0, spelunk2, spelunk2, m62_state, spelunk2, ROT0, "Irem (licensed from Broderbund)", "Spelunker II", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, youjyudn, 0, youjyudn, youjyudn, m62_state, youjyudn, ROT270, "Irem", "Youjyuden (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1985, horizon, 0, horizon, horizon, m62_state, 0, ROT0, "Irem", "Horizon (Irem)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp
index 927a845bb64..126e820ff15 100644
--- a/src/mame/drivers/m63.cpp
+++ b/src/mame/drivers/m63.cpp
@@ -749,7 +749,7 @@ INTERRUPT_GEN_MEMBER(m63_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( m63, m63_state )
+static MACHINE_CONFIG_START( m63 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,XTAL_12MHz/4) /* 3 MHz */
@@ -799,7 +799,7 @@ static MACHINE_CONFIG_DERIVED( atomboy, m63 )
MCFG_CPU_PERIODIC_INT_DRIVER(m63_state, snd_irq, 60/2)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fghtbskt, m63_state )
+static MACHINE_CONFIG_START( fghtbskt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
diff --git a/src/mame/drivers/m6805evs.cpp b/src/mame/drivers/m6805evs.cpp
index f42260193ce..ca262cc0301 100644
--- a/src/mame/drivers/m6805evs.cpp
+++ b/src/mame/drivers/m6805evs.cpp
@@ -98,7 +98,7 @@ void m6805evs_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( m6805evs, m6805evs_state )
+static MACHINE_CONFIG_START( m6805evs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6805, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(m6805evs_mem)
@@ -116,5 +116,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1990, m6805evs, 0, 0, m6805evs, m6805evs, driver_device, 0, "Motorola", "M68HC05EVS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1990, m6805evs, 0, 0, m6805evs, m6805evs, m6805evs_state, 0, "Motorola", "M68HC05EVS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp
index 965fa9bb8cf..31a22791ffb 100644
--- a/src/mame/drivers/m68705prg.cpp
+++ b/src/mame/drivers/m68705prg.cpp
@@ -219,7 +219,7 @@ INPUT_PORTS_START(m68705prg)
INPUT_PORTS_END
-MACHINE_CONFIG_START(m68705prg, m68705prg_state_base)
+MACHINE_CONFIG_START(m68705prg)
MCFG_QUANTUM_PERFECT_CPU("mcu")
MCFG_GENERIC_SOCKET_ADD("eprom_image", generic_plain_slot, "eprom")
@@ -235,28 +235,28 @@ MACHINE_CONFIG_START(m68705prg, m68705prg_state_base)
MCFG_DEFAULT_LAYOUT(layout_m68705prg)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED_CLASS(m68705p3prg, m68705prg, p3prg_state)
+MACHINE_CONFIG_DERIVED(m68705p3prg, m68705prg)
MCFG_CPU_ADD("mcu", M68705P3, XTAL_1MHz)
MCFG_M68705_PORTB_W_CB(WRITE8(p3prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(p3prg_state, m68705prg)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED_CLASS(m68705p5prg, m68705prg, p5prg_state)
+MACHINE_CONFIG_DERIVED(m68705p5prg, m68705prg)
MCFG_CPU_ADD("mcu", M68705P5, XTAL_1MHz)
MCFG_M68705_PORTB_W_CB(WRITE8(p5prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(p5prg_state, m68705prg)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED_CLASS(m68705r3prg, m68705prg, r3prg_state)
+MACHINE_CONFIG_DERIVED(m68705r3prg, m68705prg)
MCFG_CPU_ADD("mcu", M68705R3, XTAL_1MHz)
MCFG_M68705_PORTB_W_CB(WRITE8(r3prg_state, pb_w))
MCFG_MACHINE_RESET_OVERRIDE(r3prg_state, m68705prg)
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED_CLASS(m68705u3prg, m68705prg, u3prg_state)
+MACHINE_CONFIG_DERIVED(m68705u3prg, m68705prg)
MCFG_CPU_ADD("mcu", M68705U3, XTAL_1MHz)
MCFG_M68705_PORTB_W_CB(WRITE8(u3prg_state, pb_w))
@@ -287,8 +287,8 @@ ROM_END
} // anonymous namespace
-// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
-COMP( 1984, 705p5prg, 0, 0, m68705p5prg, m68705prg, m68705prg_state_base, m68705prg, "Motorola", "MC68705P5 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1984, 705p3prg, 705p5prg, 0, m68705p3prg, m68705prg, m68705prg_state_base, m68705prg, "Motorola", "MC68705P3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1984, 705r3prg, 705p5prg, 0, m68705r3prg, m68705prg, m68705prg_state_base, m68705prg, "Motorola", "MC68705R3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1984, 705u3prg, 705p5prg, 0, m68705u3prg, m68705prg, m68705prg_state_base, m68705prg, "Motorola", "MC68705U3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, 705p5prg, 0, 0, m68705p5prg, m68705prg, p5prg_state, m68705prg, "Motorola", "MC68705P5 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1984, 705p3prg, 705p5prg, 0, m68705p3prg, m68705prg, p3prg_state, m68705prg, "Motorola", "MC68705P3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1984, 705r3prg, 705p5prg, 0, m68705r3prg, m68705prg, r3prg_state, m68705prg, "Motorola", "MC68705R3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1984, 705u3prg, 705p5prg, 0, m68705u3prg, m68705prg, u3prg_state, m68705prg, "Motorola", "MC68705U3 Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp
index 669ad1429a3..5c0cdbab664 100644
--- a/src/mame/drivers/m72.cpp
+++ b/src/mame/drivers/m72.cpp
@@ -1877,7 +1877,7 @@ static MACHINE_CONFIG_FRAGMENT( m72_audio_chips )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("m72", M72, 0)
+ MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
MCFG_YM2151_ADD("ymsnd", SOUND_CLOCK)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
@@ -1888,7 +1888,7 @@ static MACHINE_CONFIG_FRAGMENT( m72_audio_chips )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( m72_base, m72_state )
+static MACHINE_CONFIG_START( m72_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
@@ -2000,7 +2000,7 @@ MACHINE_CONFIG_END
/****************************************** M84 ***********************************************/
// M84
-static MACHINE_CONFIG_START( rtype2, m72_state )
+static MACHINE_CONFIG_START( rtype2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
@@ -2045,7 +2045,7 @@ MACHINE_CONFIG_END
// M84
// is the upd71059c present and unused, or has it been removed from the PCB? it isn't needed beacuse the V35 has it's own IRQ controller.
-static MACHINE_CONFIG_START( cosmccop, m72_state )
+static MACHINE_CONFIG_START( cosmccop )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V35,MASTER_CLOCK/2)
@@ -2094,7 +2094,7 @@ M82-A-A as the top board
M82-B-A and as the bottom board
*/
-static MACHINE_CONFIG_START( m82, m72_state )
+static MACHINE_CONFIG_START( m82 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
@@ -2130,7 +2130,7 @@ MACHINE_CONFIG_END
M85-A-B / M85-B
*/
-static MACHINE_CONFIG_START( poundfor, m72_state )
+static MACHINE_CONFIG_START( poundfor )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,MASTER_CLOCK/2/2) /* 16 MHz external freq (8MHz internal) */
@@ -3779,11 +3779,11 @@ ROM_END
/* M72 */
-GAME( 1987, rtype, 0, rtype, rtype, driver_device, 0, ROT0, "Irem", "R-Type (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rtypej, rtype, rtype, rtype, driver_device, 0, ROT0, "Irem", "R-Type (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rtypejp, rtype, rtype, rtypep, driver_device, 0, ROT0, "Irem", "R-Type (Japan prototype)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rtypeu, rtype, rtype, rtype, driver_device, 0, ROT0, "Irem (Nintendo of America license)", "R-Type (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rtypeb, rtype, rtype, rtype, driver_device, 0, ROT0, "bootleg", "R-Type (World bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rtype, 0, rtype, rtype, m72_state, 0, ROT0, "Irem", "R-Type (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rtypej, rtype, rtype, rtype, m72_state, 0, ROT0, "Irem", "R-Type (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rtypejp, rtype, rtype, rtypep, m72_state, 0, ROT0, "Irem", "R-Type (Japan prototype)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rtypeu, rtype, rtype, rtype, m72_state, 0, ROT0, "Irem (Nintendo of America license)", "R-Type (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rtypeb, rtype, rtype, rtype, m72_state, 0, ROT0, "bootleg", "R-Type (World bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1987, bchopper, 0, m72, bchopper, m72_state, bchopper, ROT0, "Irem", "Battle Chopper", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1987, mrheli, bchopper, m72_8751, bchopper, m72_state, m72_8751, ROT0, "Irem", "Mr. HELI no Daibouken (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
@@ -3800,7 +3800,7 @@ GAME( 1989, lohtb2, loht, m72_8751, loht, m72_state, m72_875
GAME( 1989, xmultiplm72, xmultipl, m72_xmultipl,xmultipl, m72_state, m72_8751, ROT0, "Irem", "X Multiply (Japan, M72)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dbreedm72, dbreed, m72_dbreed, dbreed, m72_state, dbreedm72, ROT0, "Irem", "Dragon Breed (M72 PCB version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // probably Japan version
+GAME( 1989, dbreedm72, dbreed, m72_dbreed, dbreed, m72_state, dbreedm72, ROT0, "Irem", "Dragon Breed (M72 PCB version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // probably Japan version
GAME( 1991, gallop, cosmccop, m72, gallop, m72_state, gallop, ROT0, "Irem", "Gallop - Armed Police Unit (Japan, M72)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
@@ -3809,40 +3809,40 @@ GAME( 1990, airduelm72, airduel, m72, airduel, m72_state, airduel
GAME( 1990, dkgensanm72, hharry, m72, hharry, m72_state, dkgenm72, ROT0, "Irem", "Daiku no Gensan (Japan, M72)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
/* M81 */
-GAME( 1989, xmultipl, 0, m81_xmultipl,m81_xmultipl,driver_device,0, ROT0, "Irem", "X Multiply (World, M81)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dbreed, 0, m81_dbreed, m81_dbreed,driver_device,0, ROT0, "Irem", "Dragon Breed (M81 PCB version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hharry, 0, m81_hharry, m81_hharry,driver_device,0, ROT0, "Irem", "Hammerin' Harry (World, M81)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, xmultipl, 0, m81_xmultipl,m81_xmultipl,m72_state,0, ROT0, "Irem", "X Multiply (World, M81)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dbreed, 0, m81_dbreed, m81_dbreed,m72_state,0, ROT0, "Irem", "Dragon Breed (M81 PCB version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hharry, 0, m81_hharry, m81_hharry,m72_state,0, ROT0, "Irem", "Hammerin' Harry (World, M81)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
/* M82 */
-GAME( 1990, majtitle, 0, m82, rtype2, driver_device, 0, ROT0, "Irem", "Major Title (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // M82-A-A + M82-B-A
-GAME( 1990, majtitlej, majtitle, m82, rtype2, driver_device, 0, ROT0, "Irem", "Major Title (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // ^
+GAME( 1990, majtitle, 0, m82, rtype2, m72_state, 0, ROT0, "Irem", "Major Title (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // M82-A-A + M82-B-A
+GAME( 1990, majtitlej, majtitle, m82, rtype2, m72_state, 0, ROT0, "Irem", "Major Title (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // ^
-GAME( 1990, airduel, 0, m82, airduel, driver_device, 0, ROT270, "Irem", "Air Duel (World, M82-A-A + M82-B-A)", MACHINE_SUPPORTS_SAVE ) // Major Title conversion
+GAME( 1990, airduel, 0, m82, airduel, m72_state, 0, ROT270, "Irem", "Air Duel (World, M82-A-A + M82-B-A)", MACHINE_SUPPORTS_SAVE ) // Major Title conversion
-GAME( 2009, rtypem82b, rtype, m82, rtype, driver_device, 0, ROT0, "bootleg", "R-Type (Japan, bootleg Major Title conversion, M82)", MACHINE_NOT_WORKING | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // unofficial conversion of Major Title, extensive wiremods, made in 2009 by Paul Swan
+GAME( 2009, rtypem82b, rtype, m82, rtype, m72_state, 0, ROT0, "bootleg", "R-Type (Japan, bootleg Major Title conversion, M82)", MACHINE_NOT_WORKING | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // unofficial conversion of Major Title, extensive wiremods, made in 2009 by Paul Swan
-GAME( 1997, rtype2m82b, rtype2, m82, rtype2, driver_device, 0, ROT0, "bootleg", "R-Type II (Japan, bootleg Major Title conversion, M82)", MACHINE_NOT_WORKING | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // made in 1997 by Chris Hardy
+GAME( 1997, rtype2m82b, rtype2, m82, rtype2, m72_state, 0, ROT0, "bootleg", "R-Type II (Japan, bootleg Major Title conversion, M82)", MACHINE_NOT_WORKING | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // made in 1997 by Chris Hardy
/* M84 */
-GAME( 1990, hharryu, hharry, hharryu, hharry, driver_device, 0, ROT0, "Irem America", "Hammerin' Harry (US, M84)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, dkgensan, hharry, hharryu, hharry, driver_device, 0, ROT0, "Irem", "Daiku no Gensan (Japan, M84)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hharryu, hharry, hharryu, hharry, m72_state, 0, ROT0, "Irem America", "Hammerin' Harry (US, M84)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, dkgensan, hharry, hharryu, hharry, m72_state, 0, ROT0, "Irem", "Daiku no Gensan (Japan, M84)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, rtype2, 0, rtype2, rtype2, driver_device, 0, ROT0, "Irem", "R-Type II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, rtype2j, rtype2, rtype2, rtype2, driver_device, 0, ROT0, "Irem", "R-Type II (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, rtype2jc, rtype2, rtype2, rtype2, driver_device, 0, ROT0, "Irem", "R-Type II (Japan, revision C)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, rtype2, 0, rtype2, rtype2, m72_state, 0, ROT0, "Irem", "R-Type II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, rtype2j, rtype2, rtype2, rtype2, m72_state, 0, ROT0, "Irem", "R-Type II (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, rtype2jc, rtype2, rtype2, rtype2, m72_state, 0, ROT0, "Irem", "R-Type II (Japan, revision C)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, cosmccop, 0, cosmccop, gallop, driver_device, 0, ROT0, "Irem", "Cosmic Cop (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, cosmccop, 0, cosmccop, gallop, m72_state, 0, ROT0, "Irem", "Cosmic Cop (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ltswords, 0, kengo, kengo, driver_device, 0, ROT0, "Irem", "Lightning Swords", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, kengo, ltswords, kengo, kengo, driver_device, 0, ROT0, "Irem", "Ken-Go (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, kengoa, ltswords, kengo, kengo, driver_device, 0, ROT0, "Irem", "Ken-Go (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // has 'for use in Japan' message, above set doesn't
+GAME( 1991, ltswords, 0, kengo, kengo, m72_state, 0, ROT0, "Irem", "Lightning Swords", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, kengo, ltswords, kengo, kengo, m72_state, 0, ROT0, "Irem", "Ken-Go (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, kengoa, ltswords, kengo, kengo, m72_state, 0, ROT0, "Irem", "Ken-Go (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // has 'for use in Japan' message, above set doesn't
/* M85 */
-GAME( 1990, poundfor, 0, poundfor, poundfor, driver_device, 0, ROT270, "Irem", "Pound for Pound (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // M85-A-B / M85-B
-GAME( 1990, poundforj, poundfor, poundfor, poundfor, driver_device, 0, ROT270, "Irem", "Pound for Pound (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // ^
-GAME( 1990, poundforu, poundfor, poundfor, poundfor, driver_device, 0, ROT270, "Irem America", "Pound for Pound (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // ^
+GAME( 1990, poundfor, 0, poundfor, poundfor, m72_state, 0, ROT270, "Irem", "Pound for Pound (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // M85-A-B / M85-B
+GAME( 1990, poundforj, poundfor, poundfor, poundfor, m72_state, 0, ROT270, "Irem", "Pound for Pound (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // ^
+GAME( 1990, poundforu, poundfor, poundfor, poundfor, m72_state, 0, ROT270, "Irem America", "Pound for Pound (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // ^
/* bootlegs, unique hw */
-GAME( 1989, lohtb, loht, m72, loht, driver_device, 0, ROT0, "bootleg", "Legend of Hero Tonma (unprotected bootleg)", MACHINE_NOT_WORKING| MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, lohtb, loht, m72, loht, m72_state, 0, ROT0, "bootleg", "Legend of Hero Tonma (unprotected bootleg)", MACHINE_NOT_WORKING| MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp
index d216e0d588d..35c976fe304 100644
--- a/src/mame/drivers/m79152pc.cpp
+++ b/src/mame/drivers/m79152pc.cpp
@@ -110,7 +110,7 @@ static GFXDECODE_START( m79152pc )
GFXDECODE_ENTRY( "chargen", 0x0000, m79152pc_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( m79152pc, m79152pc_state )
+static MACHINE_CONFIG_START( m79152pc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(m79152pc_mem)
@@ -141,5 +141,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( ????, m79152pc, 0, 0, m79152pc, m79152pc, driver_device, 0, "Mera-Elzab", "MERA 79152 PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( ????, m79152pc, 0, 0, m79152pc, m79152pc, m79152pc_state, 0, "Mera-Elzab", "MERA 79152 PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp
index 116018e518d..ab39c3f088e 100644
--- a/src/mame/drivers/m79amb.cpp
+++ b/src/mame/drivers/m79amb.cpp
@@ -189,7 +189,7 @@ INTERRUPT_GEN_MEMBER(m79amb_state::m79amb_interrupt)
device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */
}
-static MACHINE_CONFIG_START( m79amb, m79amb_state )
+static MACHINE_CONFIG_START( m79amb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_19_6608MHz / 10)
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp
index 4f601bcb9f0..bbc32655550 100644
--- a/src/mame/drivers/m90.cpp
+++ b/src/mame/drivers/m90.cpp
@@ -718,7 +718,7 @@ INTERRUPT_GEN_MEMBER(m90_state::bomblord_interrupt)
/* Basic hardware -- no decryption table is setup for CPU */
-static MACHINE_CONFIG_START( m90, m90_state )
+static MACHINE_CONFIG_START( m90 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V35, XTAL_32MHz/2)
MCFG_CPU_PROGRAM_MAP(m90_main_cpu_map)
@@ -750,7 +750,7 @@ static MACHINE_CONFIG_START( m90, m90_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("m72", M72, 0)
+ MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
MCFG_YM2151_ADD("ymsnd", XTAL_3_579545MHz) /* verified on pcb */
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
@@ -1258,20 +1258,20 @@ DRIVER_INIT_MEMBER(m90_state,bomblord)
-GAME( 1991, hasamu, 0, hasamu, hasamu, driver_device, 0, ROT0, "Irem", "Hasamu (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, dynablst, 0, bombrman, dynablst, driver_device, 0, ROT0, "Irem (licensed from Hudson Soft)", "Dynablaster / Bomber Man", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, bombrman, dynablst, bombrman, bombrman, driver_device, 0, ROT0, "Irem (licensed from Hudson Soft)", "Bomber Man (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, atompunk, dynablst, bombrman, atompunk, driver_device, 0, ROT0, "Irem America (licensed from Hudson Soft)", "Atomic Punk (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dynablstb,dynablst, dynablsb, dynablsb, driver_device, 0, ROT0, "bootleg (Seitu)", "Dynablaster / Bomber Man (bootleg, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dynablstb2,dynablst,dynablsb, dynablsb, driver_device, 0, ROT0, "bootleg (Seitu)", "Dynablaster / Bomber Man (bootleg, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dynablstb3,dynablst,dynablsb, dynablsb, driver_device, 0, ROT0, "bootleg (Seitu)", "Dynablaster / Bomber Man (bootleg, set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // PCB has Playmark labels
-GAME( 1992, bbmanw, 0, bbmanw, bbmanw, driver_device, 0, ROT0, "Irem", "Bomber Man World / New Dyna Blaster - Global Quest", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, bbmanwj, bbmanw, bbmanw, bbmanwj, driver_device, 0, ROT0, "Irem", "Bomber Man World (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, bbmanwja, bbmanw, bbmanwj, bbmanwj, driver_device, 0, ROT0, "Irem", "Bomber Man World (Japan, revised sound hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, newapunk, bbmanw, bbmanw, newapunk, driver_device, 0, ROT0, "Irem America", "New Atomic Punk - Global Quest (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, bomblord, bbmanw, bomblord, bbmanw, m90_state, bomblord, ROT0, "bootleg", "Bomber Lord (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, quizf1, 0, quizf1, quizf1, m90_state, quizf1, ROT0, "Irem", "Quiz F1 1-2 Finish (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, riskchal, 0, riskchal, riskchal, driver_device, 0, ROT0, "Irem", "Risky Challenge", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, gussun, riskchal, riskchal, riskchal, driver_device, 0, ROT0, "Irem", "Gussun Oyoyo (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, matchit2, 0, matchit2, matchit2, driver_device, 0, ROT0, "Tamtex", "Match It II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, shisen2, matchit2, matchit2, shisen2, driver_device, 0, ROT0, "Tamtex", "Shisensho II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, hasamu, 0, hasamu, hasamu, m90_state, 0, ROT0, "Irem", "Hasamu (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, dynablst, 0, bombrman, dynablst, m90_state, 0, ROT0, "Irem (licensed from Hudson Soft)", "Dynablaster / Bomber Man", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bombrman, dynablst, bombrman, bombrman, m90_state, 0, ROT0, "Irem (licensed from Hudson Soft)", "Bomber Man (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, atompunk, dynablst, bombrman, atompunk, m90_state, 0, ROT0, "Irem America (licensed from Hudson Soft)", "Atomic Punk (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dynablstb,dynablst, dynablsb, dynablsb, m90_state, 0, ROT0, "bootleg (Seitu)", "Dynablaster / Bomber Man (bootleg, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dynablstb2,dynablst,dynablsb, dynablsb, m90_state, 0, ROT0, "bootleg (Seitu)", "Dynablaster / Bomber Man (bootleg, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dynablstb3,dynablst,dynablsb, dynablsb, m90_state, 0, ROT0, "bootleg (Seitu)", "Dynablaster / Bomber Man (bootleg, set 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // PCB has Playmark labels
+GAME( 1992, bbmanw, 0, bbmanw, bbmanw, m90_state, 0, ROT0, "Irem", "Bomber Man World / New Dyna Blaster - Global Quest", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, bbmanwj, bbmanw, bbmanw, bbmanwj, m90_state, 0, ROT0, "Irem", "Bomber Man World (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, bbmanwja, bbmanw, bbmanwj, bbmanwj, m90_state, 0, ROT0, "Irem", "Bomber Man World (Japan, revised sound hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, newapunk, bbmanw, bbmanw, newapunk, m90_state, 0, ROT0, "Irem America", "New Atomic Punk - Global Quest (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, bomblord, bbmanw, bomblord, bbmanw, m90_state, bomblord, ROT0, "bootleg", "Bomber Lord (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, quizf1, 0, quizf1, quizf1, m90_state, quizf1, ROT0, "Irem", "Quiz F1 1-2 Finish (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, riskchal, 0, riskchal, riskchal, m90_state, 0, ROT0, "Irem", "Risky Challenge", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, gussun, riskchal, riskchal, riskchal, m90_state, 0, ROT0, "Irem", "Gussun Oyoyo (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, matchit2, 0, matchit2, matchit2, m90_state, 0, ROT0, "Tamtex", "Match It II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, shisen2, matchit2, matchit2, shisen2, m90_state, 0, ROT0, "Tamtex", "Shisensho II", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index cadf88db39d..2a4af7dadbf 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -965,7 +965,7 @@ void m92_state::m92_sprite_interrupt()
}
-static MACHINE_CONFIG_START( m92, m92_state )
+static MACHINE_CONFIG_START( m92 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",V33,XTAL_18MHz/2)
@@ -1068,7 +1068,7 @@ static MACHINE_CONFIG_DERIVED( ppan, m92 )
MCFG_VIDEO_START_OVERRIDE(m92_state,ppan)
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index d42f940160c..79b75997ee4 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -906,7 +906,7 @@ static const floppy_interface mac_floppy_interface =
"floppy_3_5"
};
-static MACHINE_CONFIG_START( mac512ke, mac_state )
+static MACHINE_CONFIG_START( mac512ke )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
@@ -1029,7 +1029,7 @@ static MACHINE_CONFIG_DERIVED( macclasc, macplus )
MCFG_MACKBD_REMOVE(MACKBD_TAG)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macprtb, mac_state )
+static MACHINE_CONFIG_START( macprtb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, C15M)
MCFG_CPU_PROGRAM_MAP(macprtb_map)
@@ -1053,7 +1053,7 @@ static MACHINE_CONFIG_START( macprtb, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1090,7 +1090,7 @@ static MACHINE_CONFIG_START( macprtb, mac_state )
MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macii, mac_state )
+static MACHINE_CONFIG_START( macii )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68020PMMU, C15M)
@@ -1101,7 +1101,7 @@ static MACHINE_CONFIG_START( macii, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1168,7 +1168,7 @@ static MACHINE_CONFIG_DERIVED( maciihmu, macii )
MCFG_CPU_DISASSEMBLE_OVERRIDE(mac_state, mac_dasm_override)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( maciifx, mac_state )
+static MACHINE_CONFIG_START( maciifx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68030, 40000000)
@@ -1177,7 +1177,7 @@ static MACHINE_CONFIG_START( maciifx, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1275,7 +1275,7 @@ static MACHINE_CONFIG_DERIVED( maclc, macii )
MCFG_NUBUS_OUT_IRQE_CB(WRITELINE(mac_state, nubus_irq_e_w))
MCFG_NUBUS_SLOT_ADD("pds","lcpds", mac_lcpds_cards, nullptr)
- MCFG_ASC_REPLACE("asc", C15M, ASC_TYPE_V8, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_REPLACE("asc", C15M, V8, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1329,7 +1329,7 @@ static MACHINE_CONFIG_DERIVED( maclc3, maclc )
MCFG_RAM_DEFAULT_SIZE("4M")
MCFG_RAM_EXTRA_OPTIONS("8M,16M,32M,48M,64M,80M")
- MCFG_ASC_REPLACE("asc", C15M, ASC_TYPE_SONORA, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_REPLACE("asc", C15M, SONORA, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1442,7 +1442,7 @@ static MACHINE_CONFIG_DERIVED( maciicx, maciix ) // IIcx is a IIx with only s
MCFG_NUBUS_SLOT_REMOVE("nbe")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macse30, mac_state )
+static MACHINE_CONFIG_START( macse30 )
MCFG_CPU_ADD("maincpu", M68030, C15M)
MCFG_CPU_PROGRAM_MAP(macse30_map)
@@ -1465,7 +1465,7 @@ static MACHINE_CONFIG_START( macse30, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1520,7 +1520,7 @@ static MACHINE_CONFIG_START( macse30, mac_state )
MCFG_SOFTWARE_LIST_ADD("hdd_list", "mac_hdd")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macpb140, mac_state )
+static MACHINE_CONFIG_START( macpb140 )
MCFG_CPU_ADD("maincpu", M68030, C15M)
MCFG_CPU_PROGRAM_MAP(macpb140_map)
@@ -1543,7 +1543,7 @@ static MACHINE_CONFIG_START( macpb140, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1608,7 +1608,7 @@ static MACHINE_CONFIG_DERIVED( macpb170, macpb140 )
MCFG_RAM_EXTRA_OPTIONS("6M,8M")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macpb160, mac_state )
+static MACHINE_CONFIG_START( macpb160 )
MCFG_CPU_ADD("maincpu", M68030, 25000000)
MCFG_CPU_PROGRAM_MAP(macpb160_map)
@@ -1631,7 +1631,7 @@ static MACHINE_CONFIG_START( macpb160, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_ASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, ASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1724,7 +1724,7 @@ static MACHINE_CONFIG_DERIVED( macclas2, maclc )
MCFG_SCREEN_VISIBLE_AREA(0, MAC_H_VIS-1, 0, MAC_V_VIS-1)
MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv)
- MCFG_ASC_REPLACE("asc", C15M, ASC_TYPE_EAGLE, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_REPLACE("asc", C15M, EAGLE, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -1814,7 +1814,7 @@ static MACHINE_CONFIG_DERIVED( maciisi, macii )
MCFG_QUANTUM_PERFECT_CPU("maincpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pwrmac, mac_state )
+static MACHINE_CONFIG_START( pwrmac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC601, 60000000)
@@ -1882,7 +1882,7 @@ static MACHINE_CONFIG_START( pwrmac, mac_state )
MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macqd700, mac_state )
+static MACHINE_CONFIG_START( macqd700 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68040, 25000000)
MCFG_CPU_PROGRAM_MAP(quadra700_map)
@@ -1902,7 +1902,7 @@ static MACHINE_CONFIG_START( macqd700, mac_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_ASC_ADD("asc", C15M, ASC_TYPE_EASC, WRITELINE(mac_state, mac_asc_irq))
+ MCFG_ASC_ADD("asc", C15M, EASC, WRITELINE(mac_state, mac_asc_irq))
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
@@ -2309,37 +2309,37 @@ ROM_START( maclc520 )
ROM_LOAD( "ede66cbd.rom", 0x000000, 0x100000, CRC(a893cb0f) SHA1(c54ee2f45020a4adeb7451adce04cd6e5fb69790) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-//COMP( 1983, mactw, 0, 0, mac128k, macplus, mac_state, mac128k512k, "Apple Computer", "Macintosh (4.3T Prototype)", MACHINE_NOT_WORKING )
-COMP( 1987, macse, 0, 0, macse, macadb, mac_state, macse, "Apple Computer", "Macintosh SE", 0 )
-COMP( 1987, macsefd, 0, 0, macse, macadb, mac_state, macse, "Apple Computer", "Macintosh SE (FDHD)", 0 )
-COMP( 1987, macii, 0, 0, macii, macadb, mac_state, macii, "Apple Computer", "Macintosh II", 0 )
-COMP( 1987, maciihmu, macii, 0, maciihmu, macadb, mac_state, macii, "Apple Computer", "Macintosh II (w/o 68851 MMU)", 0 )
-COMP( 1988, mac2fdhd, 0, 0, macii, macadb, mac_state, maciifdhd, "Apple Computer", "Macintosh II (FDHD)", 0 )
-COMP( 1988, maciix, mac2fdhd, 0, maciix, macadb, mac_state, maciix, "Apple Computer", "Macintosh IIx", 0 )
-COMP( 1989, macprtb, 0, 0, macprtb, macadb, mac_state, macprtb, "Apple Computer", "Macintosh Portable", MACHINE_NOT_WORKING )
-COMP( 1989, macse30, mac2fdhd, 0, macse30, macadb, mac_state, macse30, "Apple Computer", "Macintosh SE/30", 0 )
-COMP( 1989, maciicx, mac2fdhd, 0, maciicx, macadb, mac_state, maciicx, "Apple Computer", "Macintosh IIcx", 0 )
-COMP( 1989, maciici, 0, 0, maciici, maciici, mac_state, maciici, "Apple Computer", "Macintosh IIci", 0 )
-COMP( 1990, maciifx, 0, 0, maciifx, macadb, mac_state, maciifx, "Apple Computer", "Macintosh IIfx", MACHINE_NOT_WORKING )
-COMP( 1990, macclasc, 0, 0, macclasc, macadb, mac_state, macclassic, "Apple Computer", "Macintosh Classic", 0 )
-COMP( 1990, maclc, 0, 0, maclc, maciici, mac_state, maclc, "Apple Computer", "Macintosh LC", MACHINE_IMPERFECT_SOUND )
-COMP( 1990, maciisi, 0, 0, maciisi, maciici, mac_state, maciisi, "Apple Computer", "Macintosh IIsi", 0 )
-COMP( 1991, macpb100, 0, 0, macprtb, macadb, mac_state, macprtb, "Apple Computer", "Macintosh PowerBook 100", MACHINE_NOT_WORKING )
-COMP( 1991, macpb140, 0, 0, macpb140, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 140", MACHINE_NOT_WORKING )
-COMP( 1991, macpb170, macpb140, 0, macpb170, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 170", MACHINE_NOT_WORKING )
-COMP( 1991, macqd700, macpb140, 0, macqd700, macadb, mac_state, macquadra700, "Apple Computer", "Macintosh Quadra 700", MACHINE_NOT_WORKING )
-COMP( 1991, macclas2, 0, 0, macclas2, macadb, mac_state, macclassic2, "Apple Computer", "Macintosh Classic II", MACHINE_IMPERFECT_SOUND )
-COMP( 1991, maclc2, 0, 0, maclc2, maciici, mac_state, maclc2, "Apple Computer", "Macintosh LC II", MACHINE_IMPERFECT_SOUND )
-COMP( 1992, macpb145, macpb140, 0, macpb145, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 145", MACHINE_NOT_WORKING )
-COMP( 1992, macpb160, 0, 0, macpb160, macadb, mac_state, macpb160, "Apple Computer", "Macintosh PowerBook 160", MACHINE_NOT_WORKING )
-COMP( 1992, macpb180, macpb160, 0, macpb180, macadb, mac_state, macpb160, "Apple Computer", "Macintosh PowerBook 180", MACHINE_NOT_WORKING )
-COMP( 1992, macpb180c,macpb160, 0, macpb180c,macadb, mac_state, macpb160, "Apple Computer", "Macintosh PowerBook 180c", MACHINE_NOT_WORKING )
-COMP( 1992, macpd210, 0, 0, macpd210, macadb, mac_state, macpd210, "Apple Computer", "Macintosh PowerBook Duo 210", MACHINE_NOT_WORKING )
-COMP( 1993, maccclas, 0, 0, maccclas, macadb, mac_state, maclrcclassic,"Apple Computer", "Macintosh Color Classic", MACHINE_NOT_WORKING )
-COMP( 1992, macpb145b,macpb140, 0, macpb170, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 145B", MACHINE_NOT_WORKING )
-COMP( 1993, maclc3, 0, 0, maclc3, maciici, mac_state, maclc3, "Apple Computer", "Macintosh LC III", MACHINE_IMPERFECT_SOUND )
-COMP( 1993, maciivx, 0, 0, maciivx, maciici, mac_state, maciivx, "Apple Computer", "Macintosh IIvx", MACHINE_IMPERFECT_SOUND )
-COMP( 1993, maciivi, maciivx, 0, maciivi, maciici, mac_state, maciivx, "Apple Computer", "Macintosh IIvi", MACHINE_IMPERFECT_SOUND )
-COMP( 1993, maclc520, 0, 0, maclc520, maciici, mac_state, maclc520, "Apple Computer", "Macintosh LC 520", MACHINE_NOT_WORKING )
-COMP( 1994, pmac6100, 0, 0, pwrmac, macadb, mac_state, macpm6100, "Apple Computer", "Power Macintosh 6100/60", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+//COMP( 1983, mactw, 0, 0, mac128k, macplus, mac_state, mac128k512k, "Apple Computer", "Macintosh (4.3T Prototype)", MACHINE_NOT_WORKING )
+COMP( 1987, macse, 0, 0, macse, macadb, mac_state, macse, "Apple Computer", "Macintosh SE", 0 )
+COMP( 1987, macsefd, 0, 0, macse, macadb, mac_state, macse, "Apple Computer", "Macintosh SE (FDHD)", 0 )
+COMP( 1987, macii, 0, 0, macii, macadb, mac_state, macii, "Apple Computer", "Macintosh II", 0 )
+COMP( 1987, maciihmu, macii, 0, maciihmu, macadb, mac_state, macii, "Apple Computer", "Macintosh II (w/o 68851 MMU)", 0 )
+COMP( 1988, mac2fdhd, 0, 0, macii, macadb, mac_state, maciifdhd, "Apple Computer", "Macintosh II (FDHD)", 0 )
+COMP( 1988, maciix, mac2fdhd, 0, maciix, macadb, mac_state, maciix, "Apple Computer", "Macintosh IIx", 0 )
+COMP( 1989, macprtb, 0, 0, macprtb, macadb, mac_state, macprtb, "Apple Computer", "Macintosh Portable", MACHINE_NOT_WORKING )
+COMP( 1989, macse30, mac2fdhd, 0, macse30, macadb, mac_state, macse30, "Apple Computer", "Macintosh SE/30", 0 )
+COMP( 1989, maciicx, mac2fdhd, 0, maciicx, macadb, mac_state, maciicx, "Apple Computer", "Macintosh IIcx", 0 )
+COMP( 1989, maciici, 0, 0, maciici, maciici, mac_state, maciici, "Apple Computer", "Macintosh IIci", 0 )
+COMP( 1990, maciifx, 0, 0, maciifx, macadb, mac_state, maciifx, "Apple Computer", "Macintosh IIfx", MACHINE_NOT_WORKING )
+COMP( 1990, macclasc, 0, 0, macclasc, macadb, mac_state, macclassic, "Apple Computer", "Macintosh Classic", 0 )
+COMP( 1990, maclc, 0, 0, maclc, maciici, mac_state, maclc, "Apple Computer", "Macintosh LC", MACHINE_IMPERFECT_SOUND )
+COMP( 1990, maciisi, 0, 0, maciisi, maciici, mac_state, maciisi, "Apple Computer", "Macintosh IIsi", 0 )
+COMP( 1991, macpb100, 0, 0, macprtb, macadb, mac_state, macprtb, "Apple Computer", "Macintosh PowerBook 100", MACHINE_NOT_WORKING )
+COMP( 1991, macpb140, 0, 0, macpb140, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 140", MACHINE_NOT_WORKING )
+COMP( 1991, macpb170, macpb140, 0, macpb170, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 170", MACHINE_NOT_WORKING )
+COMP( 1991, macqd700, macpb140, 0, macqd700, macadb, mac_state, macquadra700, "Apple Computer", "Macintosh Quadra 700", MACHINE_NOT_WORKING )
+COMP( 1991, macclas2, 0, 0, macclas2, macadb, mac_state, macclassic2, "Apple Computer", "Macintosh Classic II", MACHINE_IMPERFECT_SOUND )
+COMP( 1991, maclc2, 0, 0, maclc2, maciici, mac_state, maclc2, "Apple Computer", "Macintosh LC II", MACHINE_IMPERFECT_SOUND )
+COMP( 1992, macpb145, macpb140, 0, macpb145, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 145", MACHINE_NOT_WORKING )
+COMP( 1992, macpb160, 0, 0, macpb160, macadb, mac_state, macpb160, "Apple Computer", "Macintosh PowerBook 160", MACHINE_NOT_WORKING )
+COMP( 1992, macpb180, macpb160, 0, macpb180, macadb, mac_state, macpb160, "Apple Computer", "Macintosh PowerBook 180", MACHINE_NOT_WORKING )
+COMP( 1992, macpb180c,macpb160, 0, macpb180c,macadb, mac_state, macpb160, "Apple Computer", "Macintosh PowerBook 180c", MACHINE_NOT_WORKING )
+COMP( 1992, macpd210, 0, 0, macpd210, macadb, mac_state, macpd210, "Apple Computer", "Macintosh PowerBook Duo 210", MACHINE_NOT_WORKING )
+COMP( 1993, maccclas, 0, 0, maccclas, macadb, mac_state, maclrcclassic,"Apple Computer", "Macintosh Color Classic", MACHINE_NOT_WORKING )
+COMP( 1992, macpb145b,macpb140, 0, macpb170, macadb, mac_state, macpb140, "Apple Computer", "Macintosh PowerBook 145B", MACHINE_NOT_WORKING )
+COMP( 1993, maclc3, 0, 0, maclc3, maciici, mac_state, maclc3, "Apple Computer", "Macintosh LC III", MACHINE_IMPERFECT_SOUND )
+COMP( 1993, maciivx, 0, 0, maciivx, maciici, mac_state, maciivx, "Apple Computer", "Macintosh IIvx", MACHINE_IMPERFECT_SOUND )
+COMP( 1993, maciivi, maciivx, 0, maciivi, maciici, mac_state, maciivx, "Apple Computer", "Macintosh IIvi", MACHINE_IMPERFECT_SOUND )
+COMP( 1993, maclc520, 0, 0, maclc520, maciici, mac_state, maclc520, "Apple Computer", "Macintosh LC 520", MACHINE_NOT_WORKING )
+COMP( 1994, pmac6100, 0, 0, pwrmac, macadb, mac_state, macpm6100, "Apple Computer", "Power Macintosh 6100/60", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index f2c202bc45e..0da4c911a62 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -1327,7 +1327,7 @@ static const floppy_interface mac_floppy_interface =
"floppy_3_5"
};
-static MACHINE_CONFIG_START( mac512ke, mac128_state )
+static MACHINE_CONFIG_START( mac512ke )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, C7M) /* 7.8336 MHz */
MCFG_CPU_PROGRAM_MAP(mac512ke_map)
diff --git a/src/mame/drivers/macp.cpp b/src/mame/drivers/macp.cpp
index 568ac10f1af..9a8e29d0e09 100644
--- a/src/mame/drivers/macp.cpp
+++ b/src/mame/drivers/macp.cpp
@@ -44,7 +44,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( cicplay )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( macp, macp_state )
+static MACHINE_CONFIG_START( macp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(macp_map)
@@ -131,14 +131,14 @@ ROM_START(glxplay2)
ROM_END
// MAC S.A. pinballs
-GAME( 1986, macgalxy, 0, macp0, macp, driver_device, 0, ROT0, "MAC S.A.", "MAC's Galaxy", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1987, spctrain, 0, macp, macp, driver_device, 0, ROT0, "MAC S.A.", "Space Train (Pinball)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1988, spcpnthr, 0, macpmsm, macp, driver_device, 0, ROT0, "MAC S.A.", "Space Panther", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 19??, mac_1808, 0, macpmsm, macp, driver_device, 0, ROT0, "MAC S.A.", "Unknown Game (MAC #1808)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1995, macjungn, 0, macpmsm, macp, driver_device, 0, ROT0, "MAC S.A.", "MAC Jungle (New version)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1996, nbamac, 0, macpmsm, macp, driver_device, 0, ROT0, "MAC S.A.", "NBA MAC", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1986, macgalxy, 0, macp0, macp, macp_state, 0, ROT0, "MAC S.A.", "MAC's Galaxy", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, spctrain, 0, macp, macp, macp_state, 0, ROT0, "MAC S.A.", "Space Train (Pinball)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1988, spcpnthr, 0, macpmsm, macp, macp_state, 0, ROT0, "MAC S.A.", "Space Panther", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 19??, mac_1808, 0, macpmsm, macp, macp_state, 0, ROT0, "MAC S.A.", "Unknown Game (MAC #1808)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1995, macjungn, 0, macpmsm, macp, macp_state, 0, ROT0, "MAC S.A.", "MAC Jungle (New version)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1996, nbamac, 0, macpmsm, macp, macp_state, 0, ROT0, "MAC S.A.", "NBA MAC", MACHINE_IS_SKELETON_MECHANICAL )
// CICPlay pinballs
-GAME( 1985, glxplay, 0, macp0, cicplay, driver_device, 0, ROT0, "CICPlay", "Galaxy Play", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1986, kidnap, 0, macp0, cicplay, driver_device, 0, ROT0, "CICPlay", "Kidnap", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1987, glxplay2, 0, macp0, cicplay, driver_device, 0, ROT0, "CICPlay", "Galaxy Play 2", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1985, glxplay, 0, macp0, cicplay, macp_state, 0, ROT0, "CICPlay", "Galaxy Play", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1986, kidnap, 0, macp0, cicplay, macp_state, 0, ROT0, "CICPlay", "Kidnap", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, glxplay2, 0, macp0, cicplay, macp_state, 0, ROT0, "CICPlay", "Galaxy Play 2", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp
index e76ed9d4dac..a2e325b925d 100644
--- a/src/mame/drivers/macpci.cpp
+++ b/src/mame/drivers/macpci.cpp
@@ -89,7 +89,7 @@ uint32_t macpci_state::screen_update_pippin(screen_device &screen, bitmap_ind16
return 0;
}
-static MACHINE_CONFIG_START( pippin, macpci_state )
+static MACHINE_CONFIG_START( pippin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC603, 66000000)
MCFG_CPU_PROGRAM_MAP(pippin_mem)
@@ -167,5 +167,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1996, pippin, 0, 0, pippin, pippin, driver_device, 0, "Apple / Bandai", "Pippin @mark", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1996, pippin, 0, 0, pippin, pippin, macpci_state, 0, "Apple / Bandai", "Pippin @mark", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp
index f1d7f4263ac..6da90c12abc 100644
--- a/src/mame/drivers/macrossp.cpp
+++ b/src/mame/drivers/macrossp.cpp
@@ -539,7 +539,7 @@ void macrossp_state::machine_reset()
m_snd_toggle = 0;
}
-static MACHINE_CONFIG_START( macrossp, macrossp_state )
+static MACHINE_CONFIG_START( macrossp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, 50000000/2) /* 25 MHz */
diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp
index 709a24aff47..dbdabaa62aa 100644
--- a/src/mame/drivers/macs.cpp
+++ b/src/mame/drivers/macs.cpp
@@ -486,7 +486,7 @@ ST0016_DMA_OFFS_CB(macs_state::dma_offset)
return m_cart_bank;
}
-static MACHINE_CONFIG_START( macs, macs_state )
+static MACHINE_CONFIG_START( macs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */
MCFG_CPU_PROGRAM_MAP(macs_mem)
@@ -767,11 +767,11 @@ DRIVER_INIT_MEMBER(macs_state,kisekaem)
}
-GAME( 1995, macsbios, 0, macs, macs_m, macs_state, macs, ROT0, "I'Max", "Multi Amenity Cassette System BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1995, mac2bios, 0, macs, macs_m, macs_state, macs2, ROT0, "I'Max", "Multi Amenity Cassette System 2 BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1995, macsbios, 0, macs, macs_m, macs_state, macs, ROT0, "I'Max", "Multi Amenity Cassette System BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1995, mac2bios, 0, macs, macs_m, macs_state, macs2, ROT0, "I'Max", "Multi Amenity Cassette System 2 BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1995, kisekaem, macsbios, macs, kisekaem, macs_state, kisekaem, ROT0, "I'Max", "Kisekae Mahjong", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND )
-GAME( 1995, kisekaeh, macsbios, macs, macs_h, macs_state, kisekaeh, ROT0, "I'Max", "Kisekae Hanafuda", MACHINE_NOT_WORKING |MACHINE_IMPERFECT_SOUND)
-GAME( 1996, cultname, macsbios, macs, macs_m, macs_state, macs, ROT0, "I'Max", "Seimei-Kantei-Meimei-Ki Cult Name", MACHINE_NOT_WORKING |MACHINE_IMPERFECT_SOUND)
-GAME( 1999, yuka, macsbios, macs, macs_h, macs_state, macs2, ROT0, "Yubis / T.System", "Yu-Ka", 0 )
-GAME( 1999, yujan, macsbios, macs, macs_m, macs_state, macs2, ROT0, "Yubis / T.System", "Yu-Jan", 0 )
+GAME( 1995, kisekaem, macsbios, macs, kisekaem, macs_state, kisekaem, ROT0, "I'Max", "Kisekae Mahjong", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, kisekaeh, macsbios, macs, macs_h, macs_state, kisekaeh, ROT0, "I'Max", "Kisekae Hanafuda", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, cultname, macsbios, macs, macs_m, macs_state, macs, ROT0, "I'Max", "Seimei-Kantei-Meimei-Ki Cult Name", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, yuka, macsbios, macs, macs_h, macs_state, macs2, ROT0, "Yubis / T.System", "Yu-Ka", 0 )
+GAME( 1999, yujan, macsbios, macs, macs_m, macs_state, macs2, ROT0, "Yubis / T.System", "Yu-Jan", 0 )
diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp
index ba4a1054aae..6586f1144e2 100644
--- a/src/mame/drivers/madalien.cpp
+++ b/src/mame/drivers/madalien.cpp
@@ -162,7 +162,7 @@ static INPUT_PORTS_START( madalien )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( madalien, madalien_state )
+static MACHINE_CONFIG_START( madalien )
/* main CPU */
MCFG_CPU_ADD("maincpu", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
@@ -464,6 +464,6 @@ ROM_START( madalienb )
ROM_END
/* set parent machine inp init */
-GAME( 1980, madalien, 0, madalien, madalien, driver_device, 0, ROT270, "Data East Corporation", "Mad Alien (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, madaliena,madalien, madalien, madalien, driver_device, 0, ROT270, "Data East Corporation", "Mad Alien (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, madalienb,madalien, madalien, madalien, driver_device, 0, ROT270, "Data East Corporation", "Mad Alien (set 2, alt gfx)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, madalien, 0, madalien, madalien, madalien_state, 0, ROT270, "Data East Corporation", "Mad Alien (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, madaliena,madalien, madalien, madalien, madalien_state, 0, ROT270, "Data East Corporation", "Mad Alien (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, madalienb,madalien, madalien, madalien, madalien_state, 0, ROT270, "Data East Corporation", "Mad Alien (set 2, alt gfx)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp
index dad6e18407b..d81b46b4b0d 100644
--- a/src/mame/drivers/madmotor.cpp
+++ b/src/mame/drivers/madmotor.cpp
@@ -232,7 +232,7 @@ void madmotor_state::machine_reset()
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( madmotor, madmotor_state )
+static MACHINE_CONFIG_START( madmotor )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
@@ -286,10 +286,10 @@ static MACHINE_CONFIG_START( madmotor, madmotor_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki1", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki2", 2047848, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 2047848, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 0057e4db9cc..477a5de51ae 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -737,7 +737,7 @@ GFXDECODE_END
* Machine Drivers *
****************************/
-static MACHINE_CONFIG_START( magic10, magic10_state )
+static MACHINE_CONFIG_START( magic10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) // 10 MHz.
MCFG_CPU_PROGRAM_MAP(magic10_map)
@@ -760,7 +760,7 @@ static MACHINE_CONFIG_START( magic10, magic10_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1492,7 +1492,7 @@ DRIVER_INIT_MEMBER(magic10_state, altaten)
* Game Drivers *
******************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
GAMEL( 1995, magic10, 0, magic10, magic10, magic10_state, magic10, ROT0, "A.W.P. Games", "Magic's 10 (ver. 16.55)", 0, layout_sgsafari )
GAMEL( 1995, magic10a, magic10, magic10, magic10, magic10_state, magic10, ROT0, "A.W.P. Games", "Magic's 10 (ver. 16.54)", 0, layout_sgsafari )
GAMEL( 1995, magic10b, magic10, magic10a, magic10, magic10_state, magic10, ROT0, "A.W.P. Games", "Magic's 10 (ver. 16.45)", 0, layout_sgsafari )
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index 2ff9031ceb1..1f481203b9d 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -751,7 +751,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, magicard_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( magicard, magicard_state )
+static MACHINE_CONFIG_START( magicard )
MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A / 2) /* SCC-68070 CCA84 datasheet */
MCFG_CPU_PROGRAM_MAP(magicard_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", magicard_state, magicard_irq) /* no interrupts? (it erases the vectors..) */
@@ -902,7 +902,7 @@ DRIVER_INIT_MEMBER(magicard_state, magicard)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 199?, magicard, 0, magicard, magicard, magicard_state, magicard, ROT0, "Impera", "Magic Card (set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
GAME( 199?, magicarda, magicard, magicard, magicard, magicard_state, magicard, ROT0, "Impera", "Magic Card (set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp
index ee116e13b3a..fec2be3368a 100644
--- a/src/mame/drivers/magicfly.cpp
+++ b/src/mame/drivers/magicfly.cpp
@@ -932,7 +932,7 @@ GFXDECODE_END
* Machine Drivers *
*********************************************/
-static MACHINE_CONFIG_START( magicfly, magicfly_state )
+static MACHINE_CONFIG_START( magicfly )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
@@ -1056,7 +1056,7 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
-GAME( 198?, magicfly, 0, magicfly, magicfly, driver_device, 0, ROT0, "P&A Games", "Magic Fly", 0 )
-GAME( 198?, 7mezzo, 0, 7mezzo, 7mezzo, driver_device, 0, ROT0, "<unknown>", "7 e Mezzo", 0 )
-GAME( 198?, bchance, 0, bchance, bchance, driver_device, 0, ROT0, "<unknown>", "Bonne Chance! (French/English)", MACHINE_IMPERFECT_GRAPHICS )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 198?, magicfly, 0, magicfly, magicfly, magicfly_state, 0, ROT0, "P&A Games", "Magic Fly", 0 )
+GAME( 198?, 7mezzo, 0, 7mezzo, 7mezzo, magicfly_state, 0, ROT0, "<unknown>", "7 e Mezzo", 0 )
+GAME( 198?, bchance, 0, bchance, bchance, magicfly_state, 0, ROT0, "<unknown>", "Bonne Chance! (French/English)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp
index feede417431..c5c8b27649a 100644
--- a/src/mame/drivers/magictg.cpp
+++ b/src/mame/drivers/magictg.cpp
@@ -897,7 +897,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( magictg, magictg_state )
+static MACHINE_CONFIG_START( magictg )
MCFG_CPU_ADD("mips", R5000BE, 150000000) /* TODO: CPU type and clock are unknown */
//MCFG_MIPS3_ICACHE_SIZE(16384) /* TODO: Unknown */
//MCFG_MIPS3_DCACHE_SIZE(16384) /* TODO: Unknown */
@@ -1013,5 +1013,5 @@ ROM_END
*
*************************************/
-GAME( 1997, magictg, 0, magictg, magictg, driver_device, 0, ROT0, "Acclaim", "Magic the Gathering: Armageddon (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1997, magictga, magictg, magictg, magictg, driver_device, 0, ROT0, "Acclaim", "Magic the Gathering: Armageddon (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1997, magictg, 0, magictg, magictg, magictg_state, 0, ROT0, "Acclaim", "Magic the Gathering: Armageddon (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1997, magictga, magictg, magictg, magictg, magictg_state, 0, ROT0, "Acclaim", "Magic the Gathering: Armageddon (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp
index fb26b84c386..56952be50bb 100644
--- a/src/mame/drivers/magmax.cpp
+++ b/src/mame/drivers/magmax.cpp
@@ -334,7 +334,7 @@ static GFXDECODE_START( magmax )
GFXDECODE_END
-static MACHINE_CONFIG_START( magmax, magmax_state )
+static MACHINE_CONFIG_START( magmax )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -426,4 +426,4 @@ ROM_START( magmax )
ROM_END
-GAME( 1985, magmax, 0, magmax, magmax, driver_device, 0, ROT0, "Nichibutsu", "Mag Max", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, magmax, 0, magmax, magmax, magmax_state, 0, ROT0, "Nichibutsu", "Mag Max", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp
index 773f44273d7..33ce723634a 100644
--- a/src/mame/drivers/magnum.cpp
+++ b/src/mame/drivers/magnum.cpp
@@ -16,20 +16,23 @@
class magnum_state : public driver_device
{
public:
- magnum_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_palette(*this, "palette"),
- m_cgrom(*this, "cgrom"),
- m_beep(*this, "beep")
- {}
+ magnum_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_palette(*this, "palette")
+ , m_cgrom(*this, "cgrom")
+ , m_beep(*this, "beep")
+ {
+ }
DECLARE_READ8_MEMBER(lcd_r);
DECLARE_WRITE8_MEMBER(lcd_w);
DECLARE_WRITE8_MEMBER(beep_w);
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
protected:
virtual void machine_reset() override;
virtual void machine_start() override;
+
private:
required_device<palette_device> m_palette;
required_memory_region m_cgrom;
@@ -140,7 +143,7 @@ static ADDRESS_MAP_START( magnum_io, AS_IO, 16, magnum_state )
AM_RANGE(0x0080, 0x008f) AM_DEVREADWRITE8("rtc", cdp1879_device, read, write, 0x00ff)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( magnum, magnum_state )
+static MACHINE_CONFIG_START( magnum )
MCFG_CPU_ADD("maincpu", I80186, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(magnum_map)
MCFG_CPU_IO_MAP(magnum_io)
@@ -181,4 +184,4 @@ ROM_START( magnum )
ROM_LOAD("hd44780_a00.bin", 0x0000, 0x1000, BAD_DUMP CRC(01d108e2) SHA1(bc0cdf0c9ba895f22e183c7bd35a3f655f2ca96f))
ROM_END
-COMP( 1983, magnum, 0, 0, magnum, 0, driver_device, 0, "Dulmont", "Magnum", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1983, magnum, 0, 0, magnum, 0, magnum_state, 0, "Dulmont", "Magnum", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp
index 5fe05796c7a..c4518a6f057 100644
--- a/src/mame/drivers/magtouch.cpp
+++ b/src/mame/drivers/magtouch.cpp
@@ -182,7 +182,7 @@ static MACHINE_CONFIG_FRAGMENT( magtouch_sb_conf )
MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( magtouch, magtouch_state )
+static MACHINE_CONFIG_START( magtouch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
MCFG_CPU_PROGRAM_MAP(magtouch_map)
@@ -243,4 +243,4 @@ ROM_START(magtouch)
ROM_FILL(0x511ba, 1, 0xeb) // skip csum
ROM_END
-GAME( 1995, magtouch, 0, magtouch, magtouch, driver_device, 0, ROT0, "Micro Manufacturing", "Magical Touch", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, magtouch, 0, magtouch, magtouch, magtouch_state, 0, ROT0, "Micro Manufacturing", "Magical Touch", MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp
index 9909d64fa3a..03feedd4207 100644
--- a/src/mame/drivers/mainevt.cpp
+++ b/src/mame/drivers/mainevt.cpp
@@ -406,7 +406,7 @@ INTERRUPT_GEN_MEMBER(mainevt_state::devstors_sound_timer_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( mainevt, mainevt_state )
+static MACHINE_CONFIG_START( mainevt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
@@ -454,7 +454,7 @@ static MACHINE_CONFIG_START( mainevt, mainevt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( devstors, mainevt_state )
+static MACHINE_CONFIG_START( devstors )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* ?? */
@@ -720,11 +720,11 @@ ROM_END
-GAME( 1988, mainevt, 0, mainevt, mainevt, driver_device, 0, ROT0, "Konami", "The Main Event (4 Players ver. Y)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mainevto, mainevt, mainevt, mainevt, driver_device, 0, ROT0, "Konami", "The Main Event (4 Players ver. F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mainevt2p,mainevt, mainevt, mainev2p, driver_device, 0, ROT0, "Konami", "The Main Event (2 Players ver. X)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, ringohja, mainevt, mainevt, mainev2p, driver_device, 0, ROT0, "Konami", "Ring no Ohja (Japan 2 Players ver. N)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, devstors, 0, devstors, devstors, driver_device, 0, ROT90, "Konami", "Devastators (ver. Z)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, devstors2,devstors, devstors, devstor2, driver_device, 0, ROT90, "Konami", "Devastators (ver. X)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, devstors3,devstors, devstors, devstors, driver_device, 0, ROT90, "Konami", "Devastators (ver. V)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, garuka, devstors, devstors, devstor2, driver_device, 0, ROT90, "Konami", "Garuka (Japan ver. W)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mainevt, 0, mainevt, mainevt, mainevt_state, 0, ROT0, "Konami", "The Main Event (4 Players ver. Y)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mainevto, mainevt, mainevt, mainevt, mainevt_state, 0, ROT0, "Konami", "The Main Event (4 Players ver. F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mainevt2p,mainevt, mainevt, mainev2p, mainevt_state, 0, ROT0, "Konami", "The Main Event (2 Players ver. X)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, ringohja, mainevt, mainevt, mainev2p, mainevt_state, 0, ROT0, "Konami", "Ring no Ohja (Japan 2 Players ver. N)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, devstors, 0, devstors, devstors, mainevt_state, 0, ROT90, "Konami", "Devastators (ver. Z)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, devstors2,devstors, devstors, devstor2, mainevt_state, 0, ROT90, "Konami", "Devastators (ver. X)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, devstors3,devstors, devstors, devstors, mainevt_state, 0, ROT90, "Konami", "Devastators (ver. V)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, garuka, devstors, devstors, devstor2, mainevt_state, 0, ROT90, "Konami", "Garuka (Japan ver. W)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp
index cdb6ebc5575..23646543f57 100644
--- a/src/mame/drivers/mainsnk.cpp
+++ b/src/mame/drivers/mainsnk.cpp
@@ -389,7 +389,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( mainsnk, mainsnk_state )
+static MACHINE_CONFIG_START( mainsnk )
MCFG_CPU_ADD("maincpu", Z80, 3360000)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -491,5 +491,5 @@ ROM_START( canvas )
ROM_END
-GAME( 1984, mainsnk, 0, mainsnk, mainsnk, driver_device, 0, ROT0, "SNK", "Main Event (1984)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, canvas, 0, mainsnk, canvas, driver_device, 0, ROT0, "SNK", "Canvas Croquis", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, mainsnk, 0, mainsnk, mainsnk, mainsnk_state, 0, ROT0, "SNK", "Main Event (1984)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, canvas, 0, mainsnk, canvas, mainsnk_state, 0, ROT0, "SNK", "Canvas Croquis", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 12b871bd641..69c8bc63c0b 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -985,7 +985,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( majorpkr, majorpkr_state )
+static MACHINE_CONFIG_START( majorpkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 6 MHz.
MCFG_CPU_PROGRAM_MAP(map)
@@ -1026,7 +1026,7 @@ static MACHINE_CONFIG_START( majorpkr, majorpkr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 verified.
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH) // clock frequency & pin 7 verified.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp
index bc92e18aacb..1b83286f986 100644
--- a/src/mame/drivers/malzak.cpp
+++ b/src/mame/drivers/malzak.cpp
@@ -299,7 +299,7 @@ void malzak_state::machine_reset()
m_malzak_y = 0;
}
-static MACHINE_CONFIG_START( malzak, malzak_state )
+static MACHINE_CONFIG_START( malzak )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 3800000/4)
@@ -413,5 +413,5 @@ ROM_START( malzak2 )
ROM_END
-GAME( 19??, malzak, 0, malzak, malzak, driver_device, 0, ROT0, "Kitronix", "Malzak", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 19??, malzak2, malzak, malzak2, malzak2, driver_device, 0, ROT0, "Kitronix", "Malzak II", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 19??, malzak, 0, malzak, malzak, malzak_state, 0, ROT0, "Kitronix", "Malzak", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 19??, malzak2, malzak, malzak2, malzak2, malzak_state, 0, ROT0, "Kitronix", "Malzak II", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp
index 08aff866efb..e0e42b5c6ff 100644
--- a/src/mame/drivers/manohman.cpp
+++ b/src/mame/drivers/manohman.cpp
@@ -140,10 +140,10 @@
#define SECONDARY_CLOCK XTAL_3_6864MHz
-class _manohman_state : public driver_device
+class manohman_state : public driver_device
{
public:
- _manohman_state(const machine_config &mconfig, device_type type, const char *tag)
+ manohman_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
@@ -155,7 +155,7 @@ public:
* Memory Map Definition *
*********************************************/
-static ADDRESS_MAP_START( manohman_map, AS_PROGRAM, 16, _manohman_state )
+static ADDRESS_MAP_START( manohman_map, AS_PROGRAM, 16, manohman_state )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP // smell to MAX696 watchdog...
AM_RANGE(0x300000, 0x300001) AM_DEVWRITE8("saa", saa1099_device, data_w, 0x00ff)
@@ -209,7 +209,7 @@ INPUT_PORTS_END
* Machine Config *
*********************************************/
-static MACHINE_CONFIG_START( manohman, _manohman_state )
+static MACHINE_CONFIG_START( manohman )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK) // 8 MHz
MCFG_CPU_PROGRAM_MAP(manohman_map)
@@ -236,5 +236,5 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
-GAME( 199?, manohman, 0, manohman, manohman, driver_device, 0, ROT0, "Merkur", "Mann, oh-Mann", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_REQUIRES_ARTWORK )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 199?, manohman, 0, manohman, manohman, manohman_state, 0, ROT0, "Merkur", "Mann, oh-Mann", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_REQUIRES_ARTWORK )
diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp
index def351c0926..0cae9597044 100644
--- a/src/mame/drivers/mappy.cpp
+++ b/src/mame/drivers/mappy.cpp
@@ -1707,17 +1707,17 @@ static MACHINE_CONFIG_FRAGMENT( superpac_common )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( superpac, mappy_state )
+static MACHINE_CONFIG_START( superpac )
MCFG_FRAGMENT_ADD(superpac_common)
- MCFG_DEVICE_ADD("namcoio_1", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux))
MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO56XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -1725,21 +1725,21 @@ static MACHINE_CONFIG_START( superpac, mappy_state )
MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_mux))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pacnpal, mappy_state )
+static MACHINE_CONFIG_START( pacnpal )
MCFG_FRAGMENT_ADD(superpac_common)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_VBLANK_INT_DRIVER("screen", mappy_state, pacnpal_main_vblank_irq) // also update the custom I/O chips
- MCFG_DEVICE_ADD("namcoio_1", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_lamps))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO59XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_59XX, 0)
MCFG_NAMCO59XX_IN_0_CB(READ8(mappy_state, dipB_mux))
MCFG_NAMCO59XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO59XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -1748,20 +1748,20 @@ static MACHINE_CONFIG_START( pacnpal, mappy_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( grobda, mappy_state )
+static MACHINE_CONFIG_START( grobda )
MCFG_FRAGMENT_ADD(superpac_common)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_VBLANK_INT_DRIVER("screen", mappy_state, grobda_main_vblank_irq) // also update the custom I/O chips
- MCFG_DEVICE_ADD("namcoio_1", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux))
MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO56XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -1775,7 +1775,7 @@ static MACHINE_CONFIG_START( grobda, mappy_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( phozon, mappy_state )
+static MACHINE_CONFIG_START( phozon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, PIXEL_CLOCK/4) /* MAIN CPU */
@@ -1797,13 +1797,13 @@ static MACHINE_CONFIG_START( phozon, mappy_state )
MCFG_MACHINE_START_OVERRIDE(mappy_state,mappy)
MCFG_MACHINE_RESET_OVERRIDE(mappy_state,phozon)
- MCFG_DEVICE_ADD("namcoio_1", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_muxi))
MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO56XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -1871,17 +1871,17 @@ static MACHINE_CONFIG_FRAGMENT( mappy_common )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mappy, mappy_state )
+static MACHINE_CONFIG_START( mappy )
MCFG_FRAGMENT_ADD(mappy_common)
- MCFG_DEVICE_ADD("namcoio_1", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(READ8(mappy_state, dipB_mux))
MCFG_NAMCO58XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO58XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -1889,7 +1889,7 @@ static MACHINE_CONFIG_START( mappy, mappy_state )
MCFG_NAMCO58XX_OUT_0_CB(WRITE8(mappy_state, out_mux))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( digdug2, mappy_state )
+static MACHINE_CONFIG_START( digdug2 )
MCFG_FRAGMENT_ADD(mappy_common)
@@ -1899,13 +1899,13 @@ static MACHINE_CONFIG_START( digdug2, mappy_state )
MCFG_WATCHDOG_MODIFY("watchdog")
MCFG_WATCHDOG_VBLANK_INIT("screen", 0)
- MCFG_DEVICE_ADD("namcoio_1", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux))
MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO56XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -1921,21 +1921,21 @@ static MACHINE_CONFIG_DERIVED( todruaga, digdug2 )
MCFG_PALETTE_ENTRIES(64*4+64*16)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( motos, mappy_state )
+static MACHINE_CONFIG_START( motos )
MCFG_FRAGMENT_ADD(mappy_common)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_VBLANK_INT_DRIVER("screen", mappy_state, motos_main_vblank_irq) // also update the custom I/O chips
- MCFG_DEVICE_ADD("namcoio_1", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("BUTTONS"))
MCFG_NAMCO56XX_OUT_0_CB(WRITE8(mappy_state, out_lamps))
- MCFG_DEVICE_ADD("namcoio_2", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("namcoio_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(READ8(mappy_state, dipB_mux))
MCFG_NAMCO56XX_IN_1_CB(READ8(mappy_state, dipA_l))
MCFG_NAMCO56XX_IN_2_CB(READ8(mappy_state, dipA_h))
@@ -2457,25 +2457,25 @@ DRIVER_INIT_MEMBER(mappy_state,motos)
/* 2x6809, static tilemap, 2bpp sprites (Super Pacman type) */
-GAME( 1982, superpac, 0, superpac, superpac, mappy_state, superpac, ROT90, "Namco", "Super Pac-Man", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, superpacm,superpac, superpac, superpac, mappy_state, superpac, ROT90, "Namco (Bally Midway license)", "Super Pac-Man (Midway)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, pacnpal, 0, pacnpal, pacnpal, mappy_state, pacnpal, ROT90, "Namco", "Pac & Pal", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, pacnpal2, pacnpal, pacnpal, pacnpal, mappy_state, pacnpal, ROT90, "Namco", "Pac & Pal (older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, pacnchmp, pacnpal, pacnpal, pacnpal, mappy_state, pacnpal, ROT90, "Namco", "Pac-Man & Chomp Chomp", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, grobda, 0, grobda, grobda, mappy_state, grobda, ROT90, "Namco", "Grobda (New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, grobda2, grobda, grobda, grobda, mappy_state, grobda, ROT90, "Namco", "Grobda (Old Ver. set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, grobda3, grobda, grobda, grobda, mappy_state, grobda, ROT90, "Namco", "Grobda (Old Ver. set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, superpac, 0, superpac, superpac, mappy_state, superpac, ROT90, "Namco", "Super Pac-Man", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, superpacm,superpac, superpac, superpac, mappy_state, superpac, ROT90, "Namco (Bally Midway license)", "Super Pac-Man (Midway)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, pacnpal, 0, pacnpal, pacnpal, mappy_state, pacnpal, ROT90, "Namco", "Pac & Pal", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, pacnpal2, pacnpal, pacnpal, pacnpal, mappy_state, pacnpal, ROT90, "Namco", "Pac & Pal (older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, pacnchmp, pacnpal, pacnpal, pacnpal, mappy_state, pacnpal, ROT90, "Namco", "Pac-Man & Chomp Chomp", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, grobda, 0, grobda, grobda, mappy_state, grobda, ROT90, "Namco", "Grobda (New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, grobda2, grobda, grobda, grobda, mappy_state, grobda, ROT90, "Namco", "Grobda (Old Ver. set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, grobda3, grobda, grobda, grobda, mappy_state, grobda, ROT90, "Namco", "Grobda (Old Ver. set 2)", MACHINE_SUPPORTS_SAVE )
/* 3x6809, static tilemap, 2bpp sprites (Gaplus type) */
-GAME( 1983, phozon, 0, phozon, phozon, mappy_state, phozon, ROT90, "Namco", "Phozon (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, phozons, phozon, phozon, phozon, mappy_state, phozon, ROT90, "Namco (Sidam license)", "Phozon (Sidam)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, phozon, 0, phozon, phozon, mappy_state, phozon, ROT90, "Namco", "Phozon (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, phozons, phozon, phozon, phozon, mappy_state, phozon, ROT90, "Namco (Sidam license)", "Phozon (Sidam)", MACHINE_SUPPORTS_SAVE )
/* 2x6809, scroling tilemap, 4bpp sprites (Super Pacman type) */
-GAME( 1983, mappy, 0, mappy, mappy, mappy_state, mappy, ROT90, "Namco", "Mappy (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, mappyj, mappy, mappy, mappy, mappy_state, mappy, ROT90, "Namco", "Mappy (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, todruaga, 0, todruaga, todruaga, mappy_state, druaga, ROT90, "Namco", "The Tower of Druaga (New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, todruagao,todruaga, todruaga, todruaga, mappy_state, druaga, ROT90, "Namco", "The Tower of Druaga (Old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, todruagas,todruaga, todruaga, todruaga, mappy_state, druaga, ROT90, "bootleg? (Sidam)", "The Tower of Druaga (Sidam)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, digdug2, 0, digdug2, digdug2, mappy_state, digdug2, ROT90, "Namco", "Dig Dug II (New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, digdug2o, digdug2, digdug2, digdug2, mappy_state, digdug2, ROT90, "Namco", "Dig Dug II (Old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, motos, 0, motos, motos, mappy_state, motos, ROT90, "Namco", "Motos", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mappy, 0, mappy, mappy, mappy_state, mappy, ROT90, "Namco", "Mappy (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mappyj, mappy, mappy, mappy, mappy_state, mappy, ROT90, "Namco", "Mappy (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, todruaga, 0, todruaga, todruaga, mappy_state, druaga, ROT90, "Namco", "The Tower of Druaga (New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, todruagao,todruaga, todruaga, todruaga, mappy_state, druaga, ROT90, "Namco", "The Tower of Druaga (Old Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, todruagas,todruaga, todruaga, todruaga, mappy_state, druaga, ROT90, "bootleg? (Sidam)", "The Tower of Druaga (Sidam)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, digdug2, 0, digdug2, digdug2, mappy_state, digdug2, ROT90, "Namco", "Dig Dug II (New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, digdug2o, digdug2, digdug2, digdug2, mappy_state, digdug2, ROT90, "Namco", "Dig Dug II (Old Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, motos, 0, motos, motos, mappy_state, motos, ROT90, "Namco", "Motos", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp
index 55661a882c5..442bda78bb2 100644
--- a/src/mame/drivers/marineb.cpp
+++ b/src/mame/drivers/marineb.cpp
@@ -537,7 +537,7 @@ INTERRUPT_GEN_MEMBER(marineb_state::wanted_vblank_irq)
}
-static MACHINE_CONFIG_START( marineb, marineb_state )
+static MACHINE_CONFIG_START( marineb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz? */
@@ -874,13 +874,13 @@ ROM_END
/* year name parent machine inputs */
-GAME( 1982, marineb, 0, marineb, marineb, driver_device, 0, ROT0, "Orca", "Marine Boy", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, changes, 0, changes, changes, driver_device, 0, ROT0, "Orca", "Changes", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, changesa, changes, changes, changes, driver_device, 0, ROT0, "Orca (Eastern Micro Electronics, Inc. license)", "Changes (EME license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, looper, changes, changes, changes, driver_device, 0, ROT0, "Orca", "Looper", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, springer, 0, springer, marineb, driver_device, 0, ROT270, "Orca", "Springer", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hoccer, 0, hoccer, hoccer, driver_device, 0, ROT90, "Eastern Micro Electronics, Inc.", "Hoccer (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hoccer2, hoccer, hoccer, hoccer, driver_device, 0, ROT90, "Eastern Micro Electronics, Inc.", "Hoccer (set 2)" , MACHINE_SUPPORTS_SAVE ) /* earlier */
-GAME( 1983, bcruzm12, 0, bcruzm12, bcruzm12, driver_device,0, ROT90, "Sigma Enterprises Inc.", "Battle Cruiser M-12", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hopprobo, 0, hopprobo, marineb, driver_device, 0, ROT90, "Sega", "Hopper Robo", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, wanted, 0, wanted, wanted, driver_device, 0, ROT90, "Sigma Enterprises Inc.", "Wanted", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, marineb, 0, marineb, marineb, marineb_state, 0, ROT0, "Orca", "Marine Boy", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, changes, 0, changes, changes, marineb_state, 0, ROT0, "Orca", "Changes", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, changesa, changes, changes, changes, marineb_state, 0, ROT0, "Orca (Eastern Micro Electronics, Inc. license)", "Changes (EME license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, looper, changes, changes, changes, marineb_state, 0, ROT0, "Orca", "Looper", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, springer, 0, springer, marineb, marineb_state, 0, ROT270, "Orca", "Springer", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hoccer, 0, hoccer, hoccer, marineb_state, 0, ROT90, "Eastern Micro Electronics, Inc.", "Hoccer (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hoccer2, hoccer, hoccer, hoccer, marineb_state, 0, ROT90, "Eastern Micro Electronics, Inc.", "Hoccer (set 2)" , MACHINE_SUPPORTS_SAVE ) /* earlier */
+GAME( 1983, bcruzm12, 0, bcruzm12, bcruzm12, marineb_state, 0, ROT90, "Sigma Enterprises Inc.", "Battle Cruiser M-12", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hopprobo, 0, hopprobo, marineb, marineb_state, 0, ROT90, "Sega", "Hopper Robo", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, wanted, 0, wanted, wanted, marineb_state, 0, ROT90, "Sigma Enterprises Inc.", "Wanted", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp
index 73139b4b655..b4b1518757c 100644
--- a/src/mame/drivers/marinedt.cpp
+++ b/src/mame/drivers/marinedt.cpp
@@ -112,7 +112,7 @@ static INPUT_PORTS_START( marinedt )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( marinedt, marinedt_state )
+static MACHINE_CONFIG_START( marinedt )
MACHINE_CONFIG_END
ROM_START( marinedt )
@@ -143,4 +143,4 @@ ROM_START( marinedt )
ROM_LOAD( "mg17.bpr", 0x0060, 0x0020, CRC(13261a02) SHA1(050edd18e4f79d19d5206f55f329340432fd4099) )
ROM_END
-GAME( 1981, marinedt, 0, marinedt, marinedt, driver_device, 0, ROT270, "Taito", "Marine Date", MACHINE_IS_SKELETON )
+GAME( 1981, marinedt, 0, marinedt, marinedt, marinedt_state, 0, ROT270, "Taito", "Marine Date", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp
index e2acb770428..7503dc23d0c 100644
--- a/src/mame/drivers/mario.cpp
+++ b/src/mame/drivers/mario.cpp
@@ -332,7 +332,7 @@ INTERRUPT_GEN_MEMBER(mario_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( mario_base, mario_state )
+static MACHINE_CONFIG_START( mario_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, Z80_CLOCK) /* verified on pcb */
@@ -546,8 +546,8 @@ ROM_END
*
*************************************/
-GAME( 1983, mario, 0, mario, mario, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, marioe, mario, mario, marioe, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, marioo, mario, mario, marioo, driver_device, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Unknown Rev)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, marioj, mario, mario, marioj, driver_device, 0, ROT0, "Nintendo", "Mario Bros. (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, masao, mario, masao, mario, driver_device, 0, ROT0, "bootleg", "Masao", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mario, 0, mario, mario, mario_state, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, marioe, mario, mario, marioe, mario_state, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Revision E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, marioo, mario, mario, marioo, mario_state, 0, ROT0, "Nintendo of America", "Mario Bros. (US, Unknown Rev)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, marioj, mario, mario, marioj, mario_state, 0, ROT0, "Nintendo", "Mario Bros. (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, masao, mario, masao, mario, mario_state, 0, ROT0, "bootleg", "Masao", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp
index 8481b4f0595..212762dd692 100644
--- a/src/mame/drivers/markham.cpp
+++ b/src/mame/drivers/markham.cpp
@@ -177,7 +177,7 @@ static GFXDECODE_START( markham )
GFXDECODE_END
-static MACHINE_CONFIG_START( markham, markham_state )
+static MACHINE_CONFIG_START( markham )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
@@ -245,4 +245,4 @@ ROM_START( markham )
ROM_END
-GAME( 1983, markham, 0, markham, markham, driver_device, 0, ROT0, "Sun Electronics", "Markham", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, markham, 0, markham, markham, markham_state, 0, ROT0, "Sun Electronics", "Markham", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp
index 11826be3965..951cfdc68fe 100644
--- a/src/mame/drivers/marywu.cpp
+++ b/src/mame/drivers/marywu.cpp
@@ -181,7 +181,7 @@ static ADDRESS_MAP_START( io_map, AS_IO, 8, marywu_state )
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READ(port_r)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( marywu , marywu_state )
+static MACHINE_CONFIG_START( marywu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, XTAL_10_738635MHz) //actual CPU is a Winbond w78c31b-24
MCFG_CPU_PROGRAM_MAP(program_map)
@@ -214,5 +214,5 @@ ROM_START( marywu )
ROM_LOAD( "marywu_sunkiss_chen.rom", 0x0000, 0x8000, CRC(11f67c7d) SHA1(9c1fd1a5cc6e2b0d675f0217aa8ff21c30609a0c) )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( ????, marywu, 0, marywu, marywu, driver_device, 0, ROT0, "<unknown>", "<unknown> Labeled 'WU- MARY-1A' Music by: SunKiss Chen", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( ????, marywu, 0, marywu, marywu, marywu_state, 0, ROT0, "<unknown>", "<unknown> Labeled 'WU- MARY-1A' Music by: SunKiss Chen", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp
index 08fa73396c2..9f7ffc4c21e 100644
--- a/src/mame/drivers/mastboy.cpp
+++ b/src/mame/drivers/mastboy.cpp
@@ -906,7 +906,7 @@ void mastboy_state::machine_reset()
-static MACHINE_CONFIG_START( mastboy, mastboy_state )
+static MACHINE_CONFIG_START( mastboy )
MCFG_CPU_ADD("maincpu", Z180, 12000000/2) /* HD647180X0CP6-1M1R */
MCFG_CPU_PROGRAM_MAP(mastboy_map)
MCFG_CPU_IO_MAP(mastboy_io_map)
@@ -935,7 +935,7 @@ static MACHINE_CONFIG_START( mastboy, mastboy_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(mastboy_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1056,6 +1056,6 @@ ROM_START( mastboyia )
/* 0x1c0000 to 0x1fffff EMPTY */
ROM_END
-GAME( 1991, mastboy, 0, mastboy, mastboy, driver_device, 0, ROT0, "Gaelco", "Master Boy (Spanish, PCB Rev A)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mastboyi, mastboy, mastboy, mastboy, driver_device, 0, ROT0, "Gaelco", "Master Boy (Italian, PCB Rev A, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mastboyia,mastboy, mastboy, mastboy, driver_device, 0, ROT0, "Gaelco", "Master Boy (Italian, PCB Rev A, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mastboy, 0, mastboy, mastboy, mastboy_state, 0, ROT0, "Gaelco", "Master Boy (Spanish, PCB Rev A)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mastboyi, mastboy, mastboy, mastboy, mastboy_state, 0, ROT0, "Gaelco", "Master Boy (Italian, PCB Rev A, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mastboyia,mastboy, mastboy, mastboy, mastboy_state, 0, ROT0, "Gaelco", "Master Boy (Italian, PCB Rev A, set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp
index 33b915f8f4c..534eb6fa618 100644
--- a/src/mame/drivers/matmania.cpp
+++ b/src/mame/drivers/matmania.cpp
@@ -295,7 +295,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( matmania, matmania_state )
+static MACHINE_CONFIG_START( matmania )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
@@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( matmania, matmania_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( maniach, matmania_state )
+static MACHINE_CONFIG_START( maniach )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1500000) /* 1.5 MHz ???? */
@@ -614,7 +614,7 @@ ROM_END
*
*************************************/
-GAME( 1985, matmania, 0, matmania, matmania, driver_device, 0, ROT270, "Technos Japan (Taito America license)", "Mat Mania", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, excthour, matmania, matmania, maniach, driver_device, 0, ROT270, "Technos Japan (Taito license)", "Exciting Hour", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, maniach, 0, maniach, maniach, driver_device, 0, ROT270, "Technos Japan (Taito America license)", "Mania Challenge (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, maniach2, maniach, maniach, maniach, driver_device, 0, ROT270, "Technos Japan (Taito America license)", "Mania Challenge (set 2)", MACHINE_SUPPORTS_SAVE ) /* earlier version? */
+GAME( 1985, matmania, 0, matmania, matmania, matmania_state, 0, ROT270, "Technos Japan (Taito America license)", "Mat Mania", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, excthour, matmania, matmania, maniach, matmania_state, 0, ROT270, "Technos Japan (Taito license)", "Exciting Hour", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, maniach, 0, maniach, maniach, matmania_state, 0, ROT270, "Technos Japan (Taito America license)", "Mania Challenge (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, maniach2, maniach, maniach, maniach, matmania_state, 0, ROT270, "Technos Japan (Taito America license)", "Mania Challenge (set 2)", MACHINE_SUPPORTS_SAVE ) // earlier version?
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index 3154c9c8caf..0f01a02f143 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -305,9 +305,9 @@ TIMER_DEVICE_CALLBACK_MEMBER( maxaflex_state::mf_interrupt )
m_antic->generic_interrupt(2);
}
-static MACHINE_CONFIG_START( maxaflex, maxaflex_state )
+static MACHINE_CONFIG_START( maxaflex )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
+ MCFG_CPU_ADD("maincpu", M6502, pokey_device::FREQ_17_EXACT)
MCFG_CPU_PROGRAM_MAP(a600xl_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", maxaflex_state, mf_interrupt, "screen", 0, 1)
@@ -332,9 +332,9 @@ static MACHINE_CONFIG_START( maxaflex, maxaflex_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MCFG_SCREEN_VISIBLE_AREA(MIN_X, MAX_X, MIN_Y, MAX_Y)
- MCFG_SCREEN_REFRESH_RATE(FRAME_RATE_60HZ)
- MCFG_SCREEN_SIZE(HWIDTH*8, TOTAL_LINES_60HZ)
+ MCFG_SCREEN_VISIBLE_AREA_ANTIC()
+ MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ()
+ MCFG_SCREEN_SIZE_ANTIC_60HZ()
MCFG_SCREEN_UPDATE_DEVICE("antic", antic_device, screen_update)
MCFG_SCREEN_PALETTE("palette")
@@ -345,7 +345,7 @@ static MACHINE_CONFIG_START( maxaflex, maxaflex_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("pokey", POKEY, FREQ_17_EXACT)
+ MCFG_SOUND_ADD("pokey", POKEY, pokey_device::FREQ_17_EXACT)
MCFG_POKEY_INTERRUPT_CB(atari_common_state, interrupt_cb)
MCFG_POKEY_OUTPUT_RC(RES_K(1), CAP_U(0.0), 5.0)
@@ -417,8 +417,8 @@ ROM_START(mf_flip)
ROM_END
-GAME( 1984, maxaflex, 0, maxaflex, a600xl, driver_device, 0, ROT0, "Exidy", "Max-A-Flex", MACHINE_IS_BIOS_ROOT )
-GAME( 1982, mf_achas, maxaflex, maxaflex, a600xl, driver_device, 0, ROT0, "Exidy / First Star Software", "Astro Chase (Max-A-Flex)", 0 )
-GAME( 1983, mf_brist, maxaflex, maxaflex, a600xl, driver_device, 0, ROT0, "Exidy / First Star Software", "Bristles (Max-A-Flex)", 0 )
-GAME( 1983, mf_flip, maxaflex, maxaflex, a600xl, driver_device, 0, ROT0, "Exidy / First Star Software", "Flip & Flop (Max-A-Flex)", 0 )
-GAME( 1984, mf_bdash, maxaflex, maxaflex, a600xl, driver_device, 0, ROT0, "Exidy / First Star Software", "Boulder Dash (Max-A-Flex)", 0 )
+GAME( 1984, maxaflex, 0, maxaflex, a600xl, maxaflex_state, 0, ROT0, "Exidy", "Max-A-Flex", MACHINE_IS_BIOS_ROOT )
+GAME( 1982, mf_achas, maxaflex, maxaflex, a600xl, maxaflex_state, 0, ROT0, "Exidy / First Star Software", "Astro Chase (Max-A-Flex)", 0 )
+GAME( 1983, mf_brist, maxaflex, maxaflex, a600xl, maxaflex_state, 0, ROT0, "Exidy / First Star Software", "Bristles (Max-A-Flex)", 0 )
+GAME( 1983, mf_flip, maxaflex, maxaflex, a600xl, maxaflex_state, 0, ROT0, "Exidy / First Star Software", "Flip & Flop (Max-A-Flex)", 0 )
+GAME( 1984, mf_bdash, maxaflex, maxaflex, a600xl, maxaflex_state, 0, ROT0, "Exidy / First Star Software", "Boulder Dash (Max-A-Flex)", 0 )
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index 3f4de5b3cb6..a236c2d786a 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -767,7 +767,7 @@ ADDRESS_MAP_END
// machine driver for maygay m1 board /////////////////////////////////
-MACHINE_CONFIG_START( maygay_m1, maygay1b_state )
+MACHINE_CONFIG_START( maygay_m1 )
MCFG_CPU_ADD("maincpu", M6809, M1_MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(m1_memmap)
diff --git a/src/mame/drivers/maygayep.cpp b/src/mame/drivers/maygayep.cpp
index 469a2a08eaa..d0579fb5a31 100644
--- a/src/mame/drivers/maygayep.cpp
+++ b/src/mame/drivers/maygayep.cpp
@@ -103,7 +103,7 @@ DRIVER_INIT_MEMBER(maygayep_state,maygayep)
}
-static MACHINE_CONFIG_START( maygayep, maygayep_state )
+static MACHINE_CONFIG_START( maygayep )
MCFG_CPU_ADD("maincpu", H83002, 16000000 )
MCFG_CPU_PROGRAM_MAP( maygayep_map )
diff --git a/src/mame/drivers/maygaysw.cpp b/src/mame/drivers/maygaysw.cpp
index e095ac2b885..d92474910c4 100644
--- a/src/mame/drivers/maygaysw.cpp
+++ b/src/mame/drivers/maygaysw.cpp
@@ -125,7 +125,7 @@ static INPUT_PORTS_START( maygayew )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( maygayew, maygayew_state )
+static MACHINE_CONFIG_START( maygayew )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,8000000) // MC68306FC16 - standard 68000 core + peripherals
@@ -430,15 +430,15 @@ ROM_START( mg_scl )
ROM_END
// complete(?) dump
-GAME( 199?, mg_gbr , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Guinness Book Of Records (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_risk , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Risk (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_bb , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Big Break (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_lug , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "London Underground (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_alad , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Aladdin's Cave (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_gbr , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Guinness Book Of Records (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_risk , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Risk (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_bb , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Big Break (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_lug , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "London Underground (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_alad , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Aladdin's Cave (Maygay M2)", MACHINE_IS_SKELETON )
// incomplete dumps
-GAME( 199?, mg_ewg , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Each Way Gambler (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_jv , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Jack & Vera (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_pbw , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Pinball Wizard (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_scl , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Super Clue (Maygay M2)", MACHINE_IS_SKELETON )
-GAME( 199?, mg_kf , 0 , maygayew, maygayew, driver_device, 0, ROT0, "Maygay", "Krypton Factor (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_ewg , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Each Way Gambler (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_jv , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Jack & Vera (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_pbw , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Pinball Wizard (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_scl , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Super Clue (Maygay M2)", MACHINE_IS_SKELETON )
+GAME( 199?, mg_kf , 0 , maygayew, maygayew, maygayew_state, 0, ROT0, "Maygay", "Krypton Factor (Maygay M2)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp
index 9af4c16b5ff..2288214dd6d 100644
--- a/src/mame/drivers/maygayv1.cpp
+++ b/src/mame/drivers/maygayv1.cpp
@@ -864,7 +864,7 @@ INTERRUPT_GEN_MEMBER(maygayv1_state::vsync_interrupt)
}
-static MACHINE_CONFIG_START( maygayv1, maygayv1_state )
+static MACHINE_CONFIG_START( maygayv1 )
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", maygayv1_state, vsync_interrupt)
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index 4cd2005b072..d6d8534491b 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -1441,7 +1441,7 @@ void mazerbla_state::machine_reset()
memset(m_lookup_ram, 0, ARRAY_LENGTH(m_lookup_ram));
}
-static MACHINE_CONFIG_START( mazerbla, mazerbla_state )
+static MACHINE_CONFIG_START( mazerbla )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
@@ -1483,7 +1483,7 @@ static MACHINE_CONFIG_START( mazerbla, mazerbla_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( greatgun, mazerbla_state )
+static MACHINE_CONFIG_START( greatgun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
@@ -1666,4 +1666,4 @@ DRIVER_INIT_MEMBER(mazerbla_state,greatgun)
GAME( 1983, mazerbla, 0, mazerbla, mazerbla, mazerbla_state, mazerbla, ROT0, "Stern Electronics", "Mazer Blazer (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
GAME( 1983, mazerblaa, mazerbla, mazerbla, mazerbla, mazerbla_state, mazerbla, ROT0, "Stern Electronics", "Mazer Blazer (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, greatgun, 0, greatgun, greatgun, mazerbla_state, greatgun, ROT0, "Stern Electronics", "Great Guns", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, greatgun, 0, greatgun, greatgun, mazerbla_state, greatgun, ROT0, "Stern Electronics", "Great Guns", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp
index 22934fbba2b..db2075b1658 100644
--- a/src/mame/drivers/mbc200.cpp
+++ b/src/mame/drivers/mbc200.cpp
@@ -78,7 +78,7 @@ public:
DECLARE_WRITE8_MEMBER(pm_porta_w);
DECLARE_WRITE8_MEMBER(pm_portb_w);
DECLARE_READ8_MEMBER(keyboard_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
MC6845_UPDATE_ROW(update_row);
required_device<palette_device> m_palette;
@@ -93,7 +93,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<beep_device> m_beep;
required_device<speaker_sound_device> m_speaker;
- required_device<mb8876_t> m_fdc;
+ required_device<mb8876_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
};
@@ -144,7 +144,7 @@ static ADDRESS_MAP_START( mbc200_io , AS_IO, 8, mbc200_state)
//AM_RANGE(0xe0, 0xe0) AM_DEVREADWRITE("uart1", i8251_device, data_r, data_w)
//AM_RANGE(0xe1, 0xe1) AM_DEVREADWRITE("uart1", i8251_device, status_r, control_w)
AM_RANGE(0xe0, 0xe1) AM_READ(keyboard_r) AM_WRITENOP
- AM_RANGE(0xe4, 0xe7) AM_DEVREADWRITE("fdc", mb8876_t, read, write)
+ AM_RANGE(0xe4, 0xe7) AM_DEVREADWRITE("fdc", mb8876_device, read, write)
AM_RANGE(0xe8, 0xeb) AM_DEVREADWRITE("ppi_m", i8255_device, read, write)
AM_RANGE(0xec, 0xec) AM_DEVREADWRITE("uart2", i8251_device, data_r, data_w)
AM_RANGE(0xed, 0xed) AM_DEVREADWRITE("uart2", i8251_device, status_r, control_w)
@@ -207,7 +207,7 @@ READ8_MEMBER( mbc200_state::keyboard_r )
}
// convert standard control keys to expected code;
-WRITE8_MEMBER( mbc200_state::kbd_put )
+void mbc200_state::kbd_put(u8 data)
{
switch (data)
{
@@ -290,7 +290,7 @@ static GFXDECODE_START( mbc200 )
GFXDECODE_END
-static MACHINE_CONFIG_START( mbc200, mbc200_state )
+static MACHINE_CONFIG_START( mbc200 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz/2) // NEC D780C-1
MCFG_CPU_PROGRAM_MAP(mbc200_mem)
@@ -344,7 +344,7 @@ static MACHINE_CONFIG_START( mbc200, mbc200_state )
/* Keyboard */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(mbc200_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(mbc200_state, kbd_put))
/* software lists */
MCFG_SOFTWARE_LIST_ADD("flop_list", "mbc200")
@@ -361,5 +361,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, mbc200, 0, 0, mbc200, mbc200, driver_device, 0, "Sanyo", "MBC-200", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, mbc200, 0, 0, mbc200, mbc200, mbc200_state, 0, "Sanyo", "MBC-200", 0 )
diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp
index 5c40ca10687..7857eb5b514 100644
--- a/src/mame/drivers/mbc55x.cpp
+++ b/src/mame/drivers/mbc55x.cpp
@@ -238,7 +238,7 @@ static SLOT_INTERFACE_START( mbc55x_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( mbc55x, mbc55x_state )
+static MACHINE_CONFIG_START( mbc55x )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, I8088, 3600000)
MCFG_CPU_PROGRAM_MAP(mbc55x_mem)
@@ -315,5 +315,5 @@ ROM_START( mbc55x )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, mbc55x, 0, 0, mbc55x, mbc55x, driver_device, 0, "Sanyo", "MBC-55x", 0 /*MACHINE_NO_SOUND*/)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, mbc55x, 0, 0, mbc55x, mbc55x, mbc55x_state, 0, "Sanyo", "MBC-55x", 0 /*MACHINE_NO_SOUND*/)
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index ec8bc737c15..23ca1f16d99 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START(mbee56_io, AS_IO, 8, mbee_state)
AM_RANGE(0x0b, 0x0b) AM_WRITE(port0b_w)
AM_RANGE(0x0c, 0x0c) AM_DEVREAD("crtc", mc6845_device, status_r) AM_WRITE(m6545_index_w)
AM_RANGE(0x0d, 0x0d) AM_DEVREAD("crtc", mc6845_device, register_r) AM_WRITE(m6545_data_w)
- AM_RANGE(0x44, 0x47) AM_DEVREADWRITE("fdc", wd2793_t, read, write)
+ AM_RANGE(0x44, 0x47) AM_DEVREADWRITE("fdc", wd2793_device, read, write)
AM_RANGE(0x48, 0x4f) AM_READWRITE(fdc_status_r, fdc_motor_w)
ADDRESS_MAP_END
@@ -299,7 +299,7 @@ static ADDRESS_MAP_START(mbee128_io, AS_IO, 8, mbee_state)
AM_RANGE(0x0c, 0x0c) AM_DEVREAD("crtc", mc6845_device, status_r) AM_WRITE(m6545_index_w)
AM_RANGE(0x0d, 0x0d) AM_DEVREAD("crtc", mc6845_device, register_r) AM_WRITE(m6545_data_w)
AM_RANGE(0x1c, 0x1f) AM_READWRITE(port1c_r, port1c_w)
- AM_RANGE(0x44, 0x47) AM_DEVREADWRITE("fdc", wd2793_t, read, write)
+ AM_RANGE(0x44, 0x47) AM_DEVREADWRITE("fdc", wd2793_device, read, write)
AM_RANGE(0x48, 0x4f) AM_READWRITE(fdc_status_r, fdc_motor_w)
AM_RANGE(0x50, 0x57) AM_WRITE(mbee128_50_w)
ADDRESS_MAP_END
@@ -320,7 +320,7 @@ static ADDRESS_MAP_START(mbee256_io, AS_IO, 8, mbee_state)
// AM_RANGE(0x0010, 0x0013) AM_MIRROR(0xff00) Optional SN76489AN audio chip
AM_RANGE(0x0018, 0x001b) AM_MIRROR(0xff00) AM_READ(port18_r)
AM_RANGE(0x001c, 0x001f) AM_MIRROR(0xff00) AM_READWRITE(port1c_r, port1c_w)
- AM_RANGE(0x0044, 0x0047) AM_MIRROR(0xff00) AM_DEVREADWRITE("fdc", wd2793_t, read, write)
+ AM_RANGE(0x0044, 0x0047) AM_MIRROR(0xff00) AM_DEVREADWRITE("fdc", wd2793_device, read, write)
AM_RANGE(0x0048, 0x004f) AM_MIRROR(0xff00) AM_READWRITE(fdc_status_r, fdc_motor_w)
AM_RANGE(0x0050, 0x0057) AM_MIRROR(0xff00) AM_WRITE(mbee256_50_w)
// AM_RANGE(0x0058, 0x005f) AM_MIRROR(0xff00) External options: floppy drive, hard drive and keyboard
@@ -631,7 +631,7 @@ static SLOT_INTERFACE_START( mbee_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( mbee, mbee_state )
+static MACHINE_CONFIG_START( mbee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 6) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(mbee_mem)
@@ -690,7 +690,7 @@ static MACHINE_CONFIG_START( mbee, mbee_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mbeeic, mbee_state )
+static MACHINE_CONFIG_START( mbeeic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_5MHz / 4) /* 3.37500 MHz */
MCFG_CPU_PROGRAM_MAP(mbeeic_mem)
@@ -1191,4 +1191,4 @@ COMP( 1986, mbee56, mbee, 0, mbee56, mbee, mbee_state, mbee56,
COMP( 1986, mbee128, mbee, 0, mbee128, mbee128, mbee_state, mbee128, "Applied Technology", "Microbee 128k Standard" , MACHINE_NOT_WORKING )
COMP( 1986, mbee128p, mbee, 0, mbee128p, mbee128, mbee_state, mbee128, "Applied Technology", "Microbee 128k Premium" , MACHINE_NOT_WORKING )
COMP( 1987, mbee256, mbee, 0, mbee256, mbee256, mbee_state, mbee256, "Applied Technology", "Microbee 256TC" , MACHINE_NOT_WORKING )
-COMP( 2012, mbeepp, mbee, 0, mbee256, mbee128, mbee_state, mbee128, "Microbee Systems", "Microbee Premium Plus" , MACHINE_NOT_WORKING )
+COMP( 2012, mbeepp, mbee, 0, mbee256, mbee128, mbee_state, mbee128, "Microbee Systems", "Microbee Premium Plus" , MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp
index d02d766b6c5..ad84fdaaf4d 100644
--- a/src/mame/drivers/mc10.cpp
+++ b/src/mame/drivers/mc10.cpp
@@ -482,7 +482,7 @@ INPUT_PORTS_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( mc10, mc10_state )
+static MACHINE_CONFIG_START( mc10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz) /* 0,894886 MHz */
@@ -518,7 +518,7 @@ static MACHINE_CONFIG_START( mc10, mc10_state )
MCFG_SOFTWARE_LIST_ADD("cass_list", "mc10")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( alice32, mc10_state )
+static MACHINE_CONFIG_START( alice32 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6803, XTAL_3_579545MHz)
@@ -609,8 +609,8 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, mc10, 0, 0, mc10, mc10, mc10_state, mc10, "Tandy Radio Shack", "MC-10", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, alice, mc10, 0, mc10, alice, mc10_state, mc10, "Matra & Hachette", "Alice", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, alice32, 0, 0, alice32, alice, mc10_state, mc10, "Matra & Hachette", "Alice 32", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1985, alice90, alice32, 0, alice90, alice, mc10_state, mc10, "Matra & Hachette", "Alice 90", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, mc10, 0, 0, mc10, mc10, mc10_state, mc10, "Tandy Radio Shack", "MC-10", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, alice, mc10, 0, mc10, alice, mc10_state, mc10, "Matra & Hachette", "Alice", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, alice32, 0, 0, alice32, alice, mc10_state, mc10, "Matra & Hachette", "Alice 32", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, alice90, alice32, 0, alice90, alice, mc10_state, mc10, "Matra & Hachette", "Alice 90", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index e3b855bbc00..43c0152a153 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -531,7 +531,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mc1000_state::ne555_tick)
m_maincpu->set_input_line(INPUT_LINE_IRQ0, param);
}
-static MACHINE_CONFIG_START( mc1000, mc1000_state )
+static MACHINE_CONFIG_START( mc1000 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 3579545)
@@ -593,5 +593,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, mc1000, 0, 0, mc1000, mc1000, driver_device, 0, "CCE", "MC-1000", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, mc1000, 0, 0, mc1000, mc1000, mc1000_state, 0, "CCE", "MC-1000", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp
index e2de01ce6e1..b2634587a62 100644
--- a/src/mame/drivers/mc1502.cpp
+++ b/src/mame/drivers/mc1502.cpp
@@ -241,7 +241,7 @@ static INPUT_PORTS_START( mc1502 )
PORT_INCLUDE( mc7007_3_keyboard )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mc1502, mc1502_state )
+static MACHINE_CONFIG_START( mc1502 )
MCFG_CPU_ADD("maincpu", I8088, XTAL_16MHz/3)
MCFG_CPU_PROGRAM_MAP(mc1502_map)
MCFG_CPU_IO_MAP(mc1502_io)
@@ -398,6 +398,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1989, mc1502, 0, 0, mc1502, mc1502, mc1502_state, mc1502, "NPO Microprocessor", "Elektronika MS 1502", 0)
-COMP ( 1988, pk88, 0, 0, mc1502, mc1502, mc1502_state, mc1502, "NPO Microprocessor", "Elektronika PK-88", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1989, mc1502, 0, 0, mc1502, mc1502, mc1502_state, mc1502, "NPO Microprocessor", "Elektronika MS 1502", 0 )
+COMP ( 1988, pk88, 0, 0, mc1502, mc1502, mc1502_state, mc1502, "NPO Microprocessor", "Elektronika PK-88", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/mc80.cpp b/src/mame/drivers/mc80.cpp
index da71367b000..47134d37dfa 100644
--- a/src/mame/drivers/mc80.cpp
+++ b/src/mame/drivers/mc80.cpp
@@ -161,7 +161,7 @@ static const z80_daisy_config mc8030_daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( mc8020, mc80_state )
+static MACHINE_CONFIG_START( mc8020 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz)
MCFG_CPU_PROGRAM_MAP(mc8020_mem)
@@ -198,7 +198,7 @@ static MACHINE_CONFIG_START( mc8020, mc80_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("mc8020_kbd", mc80_state, mc8020_kbd, attotime::from_hz(50))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mc8030, mc80_state )
+static MACHINE_CONFIG_START( mc8030 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz)
MCFG_CPU_PROGRAM_MAP(mc8030_mem)
@@ -301,6 +301,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, mc8020, 0, 0, mc8020, mc8020, driver_device, 0, "VEB Elektronik Gera", "MC-80.21/22", MACHINE_NO_SOUND)
-COMP( 198?, mc8030, mc8020, 0, mc8030, mc8030, driver_device, 0, "VEB Elektronik Gera", "MC-80.30/31", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | ORIENTATION_FLIP_X)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, mc8020, 0, 0, mc8020, mc8020, mc80_state, 0, "VEB Elektronik Gera", "MC-80.21/22", MACHINE_NO_SOUND )
+COMP( 198?, mc8030, mc8020, 0, mc8030, mc8030, mc80_state, 0, "VEB Elektronik Gera", "MC-80.30/31", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | ORIENTATION_FLIP_X )
diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp
index a1b40e02816..fbba4532907 100644
--- a/src/mame/drivers/mcatadv.cpp
+++ b/src/mame/drivers/mcatadv.cpp
@@ -428,7 +428,7 @@ void mcatadv_state::machine_start()
save_item(NAME(m_palette_bank2));
}
-static MACHINE_CONFIG_START( mcatadv, mcatadv_state )
+static MACHINE_CONFIG_START( mcatadv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
@@ -668,9 +668,9 @@ ROM_START( nostk )
ROM_END
-GAME( 1993, mcatadv, 0, mcatadv, mcatadv, driver_device, 0, ROT0, "Wintechno", "Magical Cat Adventure", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, mcatadvj, mcatadv, mcatadv, mcatadv, driver_device, 0, ROT0, "Wintechno", "Magical Cat Adventure (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, catt, mcatadv, mcatadv, mcatadv, driver_device, 0, ROT0, "Wintechno", "Catt (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, nost, 0, nost, nost, driver_device, 0, ROT270, "Face", "Nostradamus", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, nostj, nost, nost, nost, driver_device, 0, ROT270, "Face", "Nostradamus (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, nostk, nost, nost, nost, driver_device, 0, ROT270, "Face", "Nostradamus (Korea)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, mcatadv, 0, mcatadv, mcatadv, mcatadv_state, 0, ROT0, "Wintechno", "Magical Cat Adventure", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, mcatadvj, mcatadv, mcatadv, mcatadv, mcatadv_state, 0, ROT0, "Wintechno", "Magical Cat Adventure (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, catt, mcatadv, mcatadv, mcatadv, mcatadv_state, 0, ROT0, "Wintechno", "Catt (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, nost, 0, nost, nost, mcatadv_state, 0, ROT270, "Face", "Nostradamus", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, nostj, nost, nost, nost, mcatadv_state, 0, ROT270, "Face", "Nostradamus (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, nostk, nost, nost, nost, mcatadv_state, 0, ROT270, "Face", "Nostradamus (Korea)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mcb216.cpp b/src/mame/drivers/mcb216.cpp
index 86112783d16..0190e2b4100 100644
--- a/src/mame/drivers/mcb216.cpp
+++ b/src/mame/drivers/mcb216.cpp
@@ -48,7 +48,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(keyin_r);
DECLARE_READ8_MEMBER(status_r);
DECLARE_MACHINE_RESET(mcb216);
@@ -99,7 +99,7 @@ READ8_MEMBER( mcb216_state::status_r )
return (m_term_data) ? 0xc0 : 0x80;
}
-WRITE8_MEMBER( mcb216_state::kbd_put )
+void mcb216_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -115,7 +115,7 @@ MACHINE_RESET_MEMBER( mcb216_state, cb308 )
m_maincpu->set_state_int(Z80_PC, 0xe000);
}
-static MACHINE_CONFIG_START( mcb216, mcb216_state )
+static MACHINE_CONFIG_START( mcb216 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(mcb216_mem)
@@ -124,10 +124,10 @@ static MACHINE_CONFIG_START( mcb216, mcb216_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(mcb216_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(mcb216_state, kbd_put))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cb308, mcb216_state )
+static MACHINE_CONFIG_START( cb308 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(cb308_mem)
@@ -136,7 +136,7 @@ static MACHINE_CONFIG_START( cb308, mcb216_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(mcb216_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(mcb216_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -156,6 +156,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, mcb216, 0, 0, mcb216, mcb216, driver_device, 0, "Cromemco", "MCB-216", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1977, cb308, mcb216, 0, cb308, mcb216, driver_device, 0, "Cromemco", "CB-308", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1979, mcb216, 0, 0, mcb216, mcb216, mcb216_state, 0, "Cromemco", "MCB-216", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1977, cb308, mcb216, 0, cb308, mcb216, mcb216_state, 0, "Cromemco", "CB-308", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/mccpm.cpp b/src/mame/drivers/mccpm.cpp
index b008301b972..03003623456 100644
--- a/src/mame/drivers/mccpm.cpp
+++ b/src/mame/drivers/mccpm.cpp
@@ -74,7 +74,7 @@ public:
required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(mccpm_f0_r);
DECLARE_READ8_MEMBER(mccpm_f1_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
required_shared_ptr<uint8_t> m_p_ram;
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -119,12 +119,12 @@ void mccpm_state::machine_reset()
memcpy(m_p_ram, bios, 0x1000);
}
-WRITE8_MEMBER( mccpm_state::kbd_put )
+void mccpm_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( mccpm, mccpm_state )
+static MACHINE_CONFIG_START( mccpm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(mccpm_mem)
@@ -132,7 +132,7 @@ static MACHINE_CONFIG_START( mccpm, mccpm_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(mccpm_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(mccpm_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -148,5 +148,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, mccpm, 0, 0, mccpm, mccpm, driver_device, 0, "GRAF Elektronik Systeme GmbH", "mc-CP/M-Computer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, mccpm, 0, 0, mccpm, mccpm, mccpm_state, 0, "GRAF Elektronik Systeme GmbH", "mc-CP/M-Computer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index 473d593a37f..f23f8a8afad 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -1756,7 +1756,7 @@ static const char *const twotiger_sample_names[] =
*************************************/
/* 90009 CPU board plus 90908/90913/91483 sound board */
-static MACHINE_CONFIG_START( mcr_90009, mcr_state )
+static MACHINE_CONFIG_START( mcr_90009 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_OSC_MCR_I/8)
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index 966eb0c4bf6..86e679b00a8 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -1084,7 +1084,7 @@ GFXDECODE_END
*************************************/
/* Core MCR monoboard system with no sound */
-static MACHINE_CONFIG_START( mcrmono, mcr3_state )
+static MACHINE_CONFIG_START( mcrmono )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp
index d24ea59af70..dc51a33f966 100644
--- a/src/mame/drivers/mcr68.cpp
+++ b/src/mame/drivers/mcr68.cpp
@@ -889,7 +889,7 @@ GFXDECODE_END
=================================================================*/
-static MACHINE_CONFIG_START( mcr68, mcr68_state )
+static MACHINE_CONFIG_START( mcr68 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 7723800)
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp
index 4d7032e1587..32e492caa48 100644
--- a/src/mame/drivers/meadows.cpp
+++ b/src/mame/drivers/meadows.cpp
@@ -610,7 +610,7 @@ static const char *const bowl3d_sample_names[] =
*
*************************************/
-static MACHINE_CONFIG_START( meadows, meadows_state )
+static MACHINE_CONFIG_START( meadows )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
@@ -647,7 +647,7 @@ static MACHINE_CONFIG_START( meadows, meadows_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( minferno, meadows_state )
+static MACHINE_CONFIG_START( minferno )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/24) /* 5MHz / 8 / 3 = 208.33 kHz */
@@ -671,7 +671,7 @@ static MACHINE_CONFIG_START( minferno, meadows_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bowl3d, meadows_state )
+static MACHINE_CONFIG_START( bowl3d )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK/8) /* 5MHz / 8 = 625 kHz */
@@ -881,7 +881,7 @@ DRIVER_INIT_MEMBER(meadows_state,minferno)
*
*************************************/
-GAMEL( 1978, deadeye, 0, meadows, meadows, driver_device, 0, ROT0, "Meadows Games, Inc.", "Dead Eye", 0, layout_deadeye )
-GAME ( 1978, bowl3d, 0, bowl3d, bowl3d, driver_device, 0, ROT90, "Meadows Games, Inc.", "3-D Bowling", MACHINE_NO_SOUND )
-GAMEL( 1978, gypsyjug, 0, meadows, meadows, meadows_state, gypsyjug, ROT0, "Meadows Games, Inc.", "Gypsy Juggler", MACHINE_IMPERFECT_GRAPHICS, layout_gypsyjug )
+GAMEL( 1978, deadeye, 0, meadows, meadows, meadows_state, 0, ROT0, "Meadows Games, Inc.", "Dead Eye", 0, layout_deadeye )
+GAME ( 1978, bowl3d, 0, bowl3d, bowl3d, meadows_state, 0, ROT90, "Meadows Games, Inc.", "3-D Bowling", MACHINE_NO_SOUND )
+GAMEL( 1978, gypsyjug, 0, meadows, meadows, meadows_state, gypsyjug, ROT0, "Meadows Games, Inc.", "Gypsy Juggler", MACHINE_IMPERFECT_GRAPHICS, layout_gypsyjug )
GAMEL( 1978, minferno, 0, minferno, minferno, meadows_state, minferno, ROT0, "Meadows Games, Inc.", "Inferno (Meadows)", MACHINE_NO_SOUND, layout_minferno )
diff --git a/src/mame/drivers/meadwttl.cpp b/src/mame/drivers/meadwttl.cpp
index 58f51227d44..7413708041d 100644
--- a/src/mame/drivers/meadwttl.cpp
+++ b/src/mame/drivers/meadwttl.cpp
@@ -49,7 +49,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -92,7 +92,7 @@ void meadwttl_state::video_start()
{
}
-static MACHINE_CONFIG_START( meadows, meadwttl_state )
+static MACHINE_CONFIG_START( meadows )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -165,7 +165,7 @@ ROM_END
-GAME( 1976, bombaway, 0, meadows, 0, driver_device, 0, ROT0, "Meadows", "Bombs Away [TTL]", MACHINE_IS_SKELETON )
-GAME( 1976, ckidzo, 0, meadows, 0, driver_device, 0, ROT0, "Meadows", "Ckidzo [TTL]", MACHINE_IS_SKELETON )
-GAME( 1976, cgunship, 0, meadows, 0, driver_device, 0, ROT0, "Meadows", "Cobra Gunship [TTL]", MACHINE_IS_SKELETON )
-GAME( 1976, mead4in1, 0, meadows, 0, driver_device, 0, ROT0, "Meadows", "Meadows 4 in 1 [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, bombaway, 0, meadows, 0, meadwttl_state, 0, ROT0, "Meadows", "Bombs Away [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, ckidzo, 0, meadows, 0, meadwttl_state, 0, ROT0, "Meadows", "Ckidzo [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, cgunship, 0, meadows, 0, meadwttl_state, 0, ROT0, "Meadows", "Cobra Gunship [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, mead4in1, 0, meadows, 0, meadwttl_state, 0, ROT0, "Meadows", "Meadows 4 in 1 [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp
index 8afdc14d266..989c9006bc3 100644
--- a/src/mame/drivers/mediagx.cpp
+++ b/src/mame/drivers/mediagx.cpp
@@ -870,7 +870,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, mediagx_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mediagx, mediagx_state )
+static MACHINE_CONFIG_START( mediagx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000)
diff --git a/src/mame/drivers/megadriv.cpp b/src/mame/drivers/megadriv.cpp
index 5b37f4d7320..b1c29f07c1c 100644
--- a/src/mame/drivers/megadriv.cpp
+++ b/src/mame/drivers/megadriv.cpp
@@ -369,18 +369,15 @@ WRITE_LINE_MEMBER(md_cons_state::screen_vblank_console)
m_vdp->m_megadriv_scanline_timer->adjust(attotime::zero);
if (m_32x)
- {
- m_32x->m_32x_vblank_flag = 0;
- m_32x->m_32x_hcount_compare_val = -1;
- m_32x->update_total_scanlines(mode3);
- }
+ m_32x->screen_eof(mode3);
+
if (m_segacd)
m_segacd->update_total_scanlines(mode3);
}
}
}
-static MACHINE_CONFIG_START( ms_megadriv, md_cons_state )
+static MACHINE_CONFIG_START( ms_megadriv )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megadriv)
@@ -393,7 +390,7 @@ static MACHINE_CONFIG_START( ms_megadriv, md_cons_state )
MCFG_SOFTWARE_LIST_ADD("cart_list","megadriv")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ms_megadpal, md_cons_state )
+static MACHINE_CONFIG_START( ms_megadpal )
MCFG_FRAGMENT_ADD( md_pal )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megadriv)
@@ -581,7 +578,7 @@ void md_cons_state::_32x_scanline_helper_callback(int scanline)
m_32x->_32x_render_videobuffer_to_screenbuffer_helper(scanline);
}
-static MACHINE_CONFIG_START( genesis_32x, md_cons_state )
+static MACHINE_CONFIG_START( genesis_32x )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common)
@@ -622,7 +619,7 @@ static MACHINE_CONFIG_START( genesis_32x, md_cons_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mdj_32x, md_cons_state )
+static MACHINE_CONFIG_START( mdj_32x )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common)
@@ -663,7 +660,7 @@ static MACHINE_CONFIG_START( mdj_32x, md_cons_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( md_32x, md_cons_state )
+static MACHINE_CONFIG_START( md_32x )
MCFG_FRAGMENT_ADD( md_pal )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, md_common)
@@ -736,7 +733,7 @@ ROM_END
/****************************************** SegaCD emulation ****************************************/
-static MACHINE_CONFIG_START( genesis_scd, md_cons_state )
+static MACHINE_CONFIG_START( genesis_scd )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd)
@@ -754,7 +751,7 @@ static MACHINE_CONFIG_START( genesis_scd, md_cons_state )
MCFG_SOFTWARE_LIST_ADD("cd_list","segacd")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( md_scd, md_cons_state )
+static MACHINE_CONFIG_START( md_scd )
MCFG_FRAGMENT_ADD( md_pal )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd)
@@ -772,7 +769,7 @@ static MACHINE_CONFIG_START( md_scd, md_cons_state )
MCFG_SOFTWARE_LIST_ADD("cd_list","megacd")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mdj_scd, md_cons_state )
+static MACHINE_CONFIG_START( mdj_scd )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_MACHINE_START_OVERRIDE(md_cons_state, ms_megacd)
diff --git a/src/mame/drivers/megadrvb.cpp b/src/mame/drivers/megadrvb.cpp
index c474d004107..22dfbbe709d 100644
--- a/src/mame/drivers/megadrvb.cpp
+++ b/src/mame/drivers/megadrvb.cpp
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( md_bootleg_map, AS_PROGRAM, 16, md_boot_state )
AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_SHARE("megadrive_ram")
ADDRESS_MAP_END
-MACHINE_CONFIG_START( md_bootleg, md_boot_state )
+MACHINE_CONFIG_START( md_bootleg )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_CPU_MODIFY("maincpu")
@@ -678,7 +678,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( megadrvb, md_boot_state )
+static MACHINE_CONFIG_START( megadrvb )
MCFG_FRAGMENT_ADD(md_ntsc)
MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_bootleg)
MACHINE_CONFIG_END
@@ -697,7 +697,7 @@ MACHINE_START_MEMBER(md_boot_state, md_6button)
m_io_timeout[i] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(md_base_state::io_timeout_timer_callback),this), (void*)(uintptr_t)i);
}
-static MACHINE_CONFIG_START( megadrvb_6b, md_boot_state )
+static MACHINE_CONFIG_START( megadrvb_6b )
MCFG_FRAGMENT_ADD(md_ntsc)
MCFG_MACHINE_START_OVERRIDE(md_boot_state, md_6button)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/megaphx.cpp b/src/mame/drivers/megaphx.cpp
index 56581c376f4..8123e2a96ef 100644
--- a/src/mame/drivers/megaphx.cpp
+++ b/src/mame/drivers/megaphx.cpp
@@ -350,7 +350,7 @@ WRITE8_MEMBER(megaphx_state::port_c_w)
}
-static MACHINE_CONFIG_START( megaphx, megaphx_state )
+static MACHINE_CONFIG_START( megaphx )
MCFG_CPU_ADD("maincpu", M68000, 8000000) // ?? can't read xtal due to reflections, CPU is an 8Mhz part
MCFG_CPU_PROGRAM_MAP(megaphx_68k_map)
diff --git a/src/mame/drivers/megaplay.cpp b/src/mame/drivers/megaplay.cpp
index 812e2e65b08..7981be137f2 100644
--- a/src/mame/drivers/megaplay.cpp
+++ b/src/mame/drivers/megaplay.cpp
@@ -625,9 +625,9 @@ uint32_t mplay_state::screen_update_megplay(screen_device &screen, bitmap_rgb32
for (int y = 0; y < 224; y++)
{
uint32_t* lineptr = &bitmap.pix32(y);
- uint32_t* srcptr = &m_vdp1->get_bitmap().pix32(y + SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT);
+ uint32_t* srcptr = &m_vdp1->get_bitmap().pix32(y + sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT);
- for (int x = 0; x < SEGA315_5124_WIDTH; x++)
+ for (int x = 0; x < sega315_5124_device::WIDTH; x++)
{
uint32_t src = srcptr[x] & 0xffffff;
@@ -651,7 +651,7 @@ MACHINE_RESET_MEMBER(mplay_state,megaplay)
MACHINE_RESET_CALL_MEMBER(megadriv);
}
-static MACHINE_CONFIG_START( megaplay, mplay_state )
+static MACHINE_CONFIG_START( megaplay )
/* basic machine hardware */
MCFG_FRAGMENT_ADD(md_ntsc)
@@ -686,8 +686,8 @@ static MACHINE_CONFIG_START( megaplay, mplay_state )
/* New update functions to handle the extra layer */
MCFG_SCREEN_MODIFY("megadriv")
MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
- SEGA315_5124_WIDTH , SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH, SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256, \
- SEGA315_5124_HEIGHT_NTSC, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT + 224)
+ sega315_5124_device::WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
+ sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mplay_state, screen_update_megplay)
// Megaplay has an additional SMS VDP as an overlay
@@ -967,9 +967,9 @@ didn't have original Sega part numbers it's probably a converted TWC cart
/* 02 */ GAME( 1993, mp_gaxe2, megaplay, megaplay, mp_gaxe2, mplay_state, megaplay, ROT0, "Sega", "Golden Axe II (Mega Play) (Rev B)" , 0 )
/* 02 */ GAME( 1993, mp_gaxe2a,mp_gaxe2, megaplay, mp_gaxe2, mplay_state, megaplay, ROT0, "Sega", "Golden Axe II (Mega Play)" , 0 )
/* 03 */ GAME( 1993, mp_gslam, megaplay, megaplay, mp_gslam, mplay_state, megaplay, ROT0, "Sega", "Grand Slam (Mega Play)",0 )
-/* 04 */ GAME( 1993, mp_twc, megaplay, megaplay, mp_twc, mplay_state, megaplay, ROT0, "Sega", "Tecmo World Cup (Mega Play)" , 0 )
-/* 05 */ GAME( 1993, mp_sor2, megaplay, megaplay, mp_sor2, mplay_state, megaplay, ROT0, "Sega", "Streets of Rage II (Mega Play)" , 0 )
-/* 06 */ GAME( 1993, mp_bio, megaplay, megaplay, mp_bio, mplay_state, megaplay, ROT0, "Sega", "Bio-hazard Battle (Mega Play)" , 0 )
+/* 04 */ GAME( 1993, mp_twc, megaplay, megaplay, mp_twc, mplay_state, megaplay, ROT0, "Sega", "Tecmo World Cup (Mega Play)" , 0 )
+/* 05 */ GAME( 1993, mp_sor2, megaplay, megaplay, mp_sor2, mplay_state, megaplay, ROT0, "Sega", "Streets of Rage II (Mega Play)" , 0 )
+/* 06 */ GAME( 1993, mp_bio, megaplay, megaplay, mp_bio, mplay_state, megaplay, ROT0, "Sega", "Bio-hazard Battle (Mega Play)" , 0 )
/* 07 */ GAME( 1993, mp_soni2, megaplay, megaplay, mp_soni2, mplay_state, megaplay, ROT0, "Sega", "Sonic The Hedgehog 2 (Mega Play)" , 0 )
/* 08 */
/* 09 */ GAME( 1993, mp_shnb3, megaplay, megaplay, mp_shnb3, mplay_state, megaplay, ROT0, "Sega", "Shinobi III (Mega Play)" , 0 )
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index f3f05649d8a..2ffbc7f2376 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -1604,7 +1604,7 @@ GFXDECODE_END
/* Provided by Jim Hernandez: 3.5MHz for FM, 30KHz (!) for ADPCM */
-static MACHINE_CONFIG_START( system_A, megasys1_state )
+static MACHINE_CONFIG_START( system_A )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz verified */
@@ -1649,11 +1649,11 @@ static MACHINE_CONFIG_START( system_A, megasys1_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH) /* 4MHz verified */
+ MCFG_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, PIN7_HIGH) /* 4MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_OKIM6295_ADD("oki2", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH) /* 4MHz verified */
+ MCFG_OKIM6295_ADD("oki2", OKI4_SOUND_CLOCK, PIN7_HIGH) /* 4MHz verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
@@ -1693,7 +1693,7 @@ static MACHINE_CONFIG_DERIVED( system_B_monkelf, system_B )
MCFG_CPU_PROGRAM_MAP(megasys1B_monkelf_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( system_Bbl, megasys1_state )
+static MACHINE_CONFIG_START( system_Bbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, SYS_B_CPU_CLOCK)
@@ -1727,7 +1727,7 @@ static MACHINE_CONFIG_START( system_Bbl, megasys1_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
/* just the one OKI, used for sound and music */
- MCFG_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", OKI4_SOUND_CLOCK, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
@@ -1736,11 +1736,11 @@ static MACHINE_CONFIG_DERIVED( system_B_hayaosi1, system_B )
/* basic machine hardware */
- MCFG_OKIM6295_REPLACE("oki1", 2000000, OKIM6295_PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
+ MCFG_OKIM6295_REPLACE("oki1", 2000000, PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
- MCFG_OKIM6295_REPLACE("oki2", 2000000, OKIM6295_PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
+ MCFG_OKIM6295_REPLACE("oki2", 2000000, PIN7_HIGH) /* correct speed, but unknown OSC + divider combo */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30)
MACHINE_CONFIG_END
@@ -1771,7 +1771,7 @@ MACHINE_CONFIG_END
***************************************************************************/
-static MACHINE_CONFIG_START( system_D, megasys1_state )
+static MACHINE_CONFIG_START( system_D )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
@@ -1802,7 +1802,7 @@ static MACHINE_CONFIG_START( system_D, megasys1_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", SYS_D_CPU_CLOCK/4, OKIM6295_PIN7_HIGH) /* 2MHz (8MHz / 4) */
+ MCFG_OKIM6295_ADD("oki1", SYS_D_CPU_CLOCK/4, PIN7_HIGH) /* 2MHz (8MHz / 4) */
MCFG_DEVICE_ADDRESS_MAP(AS_0, megasys1D_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1821,7 +1821,7 @@ MACHINE_CONFIG_END
***************************************************************************/
-static MACHINE_CONFIG_START( system_Z, megasys1_state )
+static MACHINE_CONFIG_START( system_Z )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
@@ -4591,14 +4591,14 @@ DRIVER_INIT_MEMBER(megasys1_state,monkelf)
*************************************/
// Type Z
-GAME( 1988, lomakai, 0, system_Z, lomakai, driver_device, 0, ROT0, "Jaleco", "Legend of Makai (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, makaiden, lomakai, system_Z, lomakai, driver_device, 0, ROT0, "Jaleco", "Makai Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, lomakai, 0, system_Z, lomakai, megasys1_state, 0, ROT0, "Jaleco", "Legend of Makai (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, makaiden, lomakai, system_Z, lomakai, megasys1_state, 0, ROT0, "Jaleco", "Makai Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
// Type A
-GAME( 1988, p47, 0, system_A, p47, driver_device, 0, ROT0, "Jaleco", "P-47 - The Phantom Fighter (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, p47j, p47, system_A, p47, driver_device, 0, ROT0, "Jaleco", "P-47 - The Freedom Fighter (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, p47je, p47, system_A, p47, driver_device, 0, ROT0, "Jaleco", "P-47 - The Freedom Fighter (Japan, Export)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kickoff, 0, system_A, kickoff, driver_device, 0, ROT0, "Jaleco", "Kick Off (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, p47, 0, system_A, p47, megasys1_state, 0, ROT0, "Jaleco", "P-47 - The Phantom Fighter (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, p47j, p47, system_A, p47, megasys1_state, 0, ROT0, "Jaleco", "P-47 - The Freedom Fighter (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, p47je, p47, system_A, p47, megasys1_state, 0, ROT0, "Jaleco", "P-47 - The Freedom Fighter (Japan, Export)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kickoff, 0, system_A, kickoff, megasys1_state, 0, ROT0, "Jaleco", "Kick Off (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, tshingen, 0, system_A, tshingen, megasys1_state, phantasm, ROT0, "Jaleco", "Shingen Samurai-Fighter (Japan, English)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
GAME( 1988, tshingena,tshingen, system_A, tshingen, megasys1_state, phantasm, ROT0, "Jaleco", "Takeda Shingen (Japan, Japanese)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
GAME( 1988, kazan, 0, system_A_iganinju, kazan, megasys1_state, iganinju, ROT0, "Jaleco", "Ninja Kazan (World)", MACHINE_SUPPORTS_SAVE )
@@ -4626,7 +4626,7 @@ GAME( 1990, monkelf, avspirit, system_B_monkelf, avspirit, megasys1_state, mon
GAME( 1991, edf, 0, system_B, edf, megasys1_state, edf, ROT0, "Jaleco", "E.D.F. : Earth Defense Force (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1991, edfa, edf, system_B, edf, megasys1_state, edf, ROT0, "Jaleco", "E.D.F. : Earth Defense Force (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1991, edfu, edf, system_B, edf, megasys1_state, edf, ROT0, "Jaleco", "E.D.F. : Earth Defense Force (North America)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, edfbl, edf, system_Bbl, edf, driver_device, 0, ROT0, "bootleg","E.D.F. : Earth Defense Force (bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, edfbl, edf, system_Bbl, edf, megasys1_state, 0, ROT0, "bootleg","E.D.F. : Earth Defense Force (bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1993, hayaosi1, 0, system_B_hayaosi1, hayaosi1, megasys1_state, hayaosi1, ROT0, "Jaleco", "Hayaoshi Quiz Ouza Ketteisen - The King Of Quiz", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
// Type C
diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp
index bb69e9ffa70..a2f6dfb4c3d 100644
--- a/src/mame/drivers/megatech.cpp
+++ b/src/mame/drivers/megatech.cpp
@@ -617,9 +617,9 @@ uint32_t mtech_state::screen_update_main(screen_device &screen, bitmap_rgb32 &bi
for (int y = 0; y < 224; y++)
{
uint32_t* lineptr = &bitmap.pix32(y);
- uint32_t* srcptr = &m_vdp->get_bitmap().pix32(y + SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT);
+ uint32_t* srcptr = &m_vdp->get_bitmap().pix32(y + sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT);
- for (int x = 0; x < SEGA315_5124_WIDTH; x++)
+ for (int x = 0; x < sega315_5124_device::WIDTH; x++)
lineptr[x] = srcptr[x];
}
#endif
@@ -668,7 +668,7 @@ uint32_t mtech_state::screen_update_menu(screen_device &screen, bitmap_rgb32 &bi
}
-static MACHINE_CONFIG_START( megatech, mtech_state )
+static MACHINE_CONFIG_START( megatech )
/* basic machine hardware */
MCFG_FRAGMENT_ADD(md_ntsc)
@@ -696,8 +696,8 @@ static MACHINE_CONFIG_START( megatech, mtech_state )
MCFG_SCREEN_MODIFY("megadriv")
MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
- SEGA315_5124_WIDTH , SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH, SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256, \
- SEGA315_5124_HEIGHT_NTSC, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT + 224)
+ sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
+ sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mtech_state, screen_update_main)
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(mtech_state, screen_vblank_main))
@@ -707,8 +707,8 @@ static MACHINE_CONFIG_START( megatech, mtech_state )
MCFG_SCREEN_ADD("menu", RASTER)
// check frq
MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
- SEGA315_5124_WIDTH , SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH, SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256, \
- SEGA315_5124_HEIGHT_NTSC, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT + 224)
+ sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
+ sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
MCFG_SCREEN_UPDATE_DRIVER(mtech_state, screen_update_menu)
MCFG_DEVICE_ADD("vdp1", SEGA315_5246, 0)
diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp
index 7385f732ac6..85928fbea61 100644
--- a/src/mame/drivers/megazone.cpp
+++ b/src/mame/drivers/megazone.cpp
@@ -59,7 +59,7 @@ WRITE8_MEMBER(megazone_state::megazone_port_b_w)
C += 220000; /* 220000pF = 0.22uF */
data >>= 2;
- dynamic_cast<filter_rc_device*>(machine().device(fltname[i]))->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 2200, 200, CAP_P(C));
+ downcast<filter_rc_device*>(machine().device(fltname[i]))->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 2200, 200, CAP_P(C));
}
}
@@ -235,7 +235,7 @@ INTERRUPT_GEN_MEMBER(megazone_state::vblank_irq)
}
-static MACHINE_CONFIG_START( megazone, megazone_state )
+static MACHINE_CONFIG_START( megazone )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, 18432000/9) /* 2 MHz */
@@ -515,8 +515,8 @@ ROM_START( megazonec )
ROM_END
-GAME( 1983, megazone, 0, megazone, megazone, driver_device, 0, ROT90, "Konami", "Mega Zone (Konami set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, megazonea, megazone, megazone, megazona, driver_device, 0, ROT90, "Konami", "Mega Zone (Konami set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, megazoneb, megazone, megazone, megazone, driver_device, 0, ROT90, "Konami (Kosuka license)", "Mega Zone (Kosuka set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, megazonec, megazone, megazone, megazone, driver_device, 0, ROT90, "Konami (Kosuka license)", "Mega Zone (Kosuka set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, megazonei, megazone, megazone, megazone, driver_device, 0, ROT90, "Konami (Interlogic license)", "Mega Zone (Interlogic)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, megazone, 0, megazone, megazone, megazone_state, 0, ROT90, "Konami", "Mega Zone (Konami set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, megazonea, megazone, megazone, megazona, megazone_state, 0, ROT90, "Konami", "Mega Zone (Konami set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, megazoneb, megazone, megazone, megazone, megazone_state, 0, ROT90, "Konami (Kosuka license)", "Mega Zone (Kosuka set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, megazonec, megazone, megazone, megazone, megazone_state, 0, ROT90, "Konami (Kosuka license)", "Mega Zone (Kosuka set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, megazonei, megazone, megazone, megazone, megazone_state, 0, ROT90, "Konami (Interlogic license)", "Mega Zone (Interlogic)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp
index 116b72b6784..92e12ed11e7 100644
--- a/src/mame/drivers/meijinsn.cpp
+++ b/src/mame/drivers/meijinsn.cpp
@@ -350,7 +350,7 @@ void meijinsn_state::machine_reset()
}
-static MACHINE_CONFIG_START( meijinsn, meijinsn_state )
+static MACHINE_CONFIG_START( meijinsn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 9000000 )
@@ -414,4 +414,4 @@ ROM_START( meijinsn )
ROM_LOAD( "clr", 0x00, 0x20, CRC(7b95b5a7) SHA1(c15be28bcd6f5ffdde659f2d352ae409f04b2557) )
ROM_END
-GAME( 1986, meijinsn, 0, meijinsn, meijinsn, driver_device, 0, ROT0, "SNK", "Meijinsen", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, meijinsn, 0, meijinsn, meijinsn, meijinsn_state, 0, ROT0, "SNK", "Meijinsen", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 4bdfb6e8ef8..69b2269e7dc 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -364,7 +364,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mekd2_state::mekd2_p)
************************************************************/
-static MACHINE_CONFIG_START( mekd2, mekd2_state )
+static MACHINE_CONFIG_START( mekd2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_MEKD2 / 2) /* 614.4 kHz */
MCFG_CPU_PROGRAM_MAP(mekd2_mem)
@@ -424,5 +424,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, mekd2, 0, 0, mekd2, mekd2, driver_device, 0, "Motorola", "MEK6800D2" , 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1977, mekd2, 0, 0, mekd2, mekd2, mekd2_state, 0, "Motorola", "MEK6800D2" , 0 )
diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp
index 03f660ccf15..0649fd98a7a 100644
--- a/src/mame/drivers/mephisto.cpp
+++ b/src/mame/drivers/mephisto.cpp
@@ -354,7 +354,7 @@ void mephisto_state::machine_reset()
}
-static MACHINE_CONFIG_START( mephisto, mephisto_state )
+static MACHINE_CONFIG_START( mephisto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M65C02,4915200) /* 65C02 */
MCFG_CPU_PROGRAM_MAP(mephisto_mem)
@@ -456,7 +456,7 @@ DRIVER_INIT_MEMBER(mephisto_state,mephisto)
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
CONS( 1984, mm2, mm4, 0, mm2, mephisto, mephisto_state, mephisto, "Hegener & Glaser", "Mephisto MM2 Schachcomputer", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
CONS( 1986, rebel5, mm4, 0, rebel5, mephisto, mephisto_state, mephisto, "Hegener & Glaser", "Mephisto Rebell 5,0 Schachcomputer", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp
index 9f2c8fb6cad..103459f6e4d 100644
--- a/src/mame/drivers/mephistp.cpp
+++ b/src/mame/drivers/mephistp.cpp
@@ -162,7 +162,7 @@ void mephisto_pinball_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( mephisto, mephisto_pinball_state )
+static MACHINE_CONFIG_START( mephisto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, XTAL_18MHz/3)
MCFG_CPU_PROGRAM_MAP(mephisto_map)
@@ -247,6 +247,6 @@ ROM_START(mephistp1)
ROM_END
-GAME(1987, mephistp, 0, mephisto, mephisto, driver_device, 0, ROT0, "Stargame", "Mephisto (rev. 1.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, mephistp1, mephistp, mephisto, mephisto, driver_device, 0, ROT0, "Stargame", "Mephisto (rev. 1.1)", MACHINE_IS_SKELETON_MECHANICAL)
-//GAME(1988, sport2k, 0, sport2k, sport2k, driver_device, 0, ROT0, "Unidesa", "Cirsa Sport 2000", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mephistp, 0, mephisto, mephisto, mephisto_pinball_state, 0, ROT0, "Stargame", "Mephisto (rev. 1.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, mephistp1, mephistp, mephisto, mephisto, mephisto_pinball_state, 0, ROT0, "Stargame", "Mephisto (rev. 1.1)", MACHINE_IS_SKELETON_MECHANICAL)
+//GAME(1988, sport2k, 0, sport2k, sport2k, mephisto_pinball_state, 0, ROT0, "Unidesa", "Cirsa Sport 2000", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp
index 14351066f71..e360fc2df53 100644
--- a/src/mame/drivers/merit.cpp
+++ b/src/mame/drivers/merit.cpp
@@ -1357,7 +1357,7 @@ MACHINE_START_MEMBER(merit_state,casino5)
membank("bank2")->set_entry(0);
}
-static MACHINE_CONFIG_START( pitboss, merit_state )
+static MACHINE_CONFIG_START( pitboss )
MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(pitboss_map)
MCFG_CPU_IO_MAP(trvwhiz_io_map)
@@ -2451,34 +2451,34 @@ DRIVER_INIT_MEMBER(merit_state,dtrvwz5)
/* Gambling type games */
-GAME( 1983, pitboss, 0, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-07, U5-0A)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) /* "7" hand written over a 5 */
-GAME( 1983, pitboss04, pitboss, casino5, pitboss, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-04)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1983, pitboss03, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-0C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1983, pitboss03a, pitboss, pitboss, pitbossa1,driver_device, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-1C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1983, pitbossm4, pitboss, pitboss, pitbossb, driver_device, 0, ROT0, "Merit", "The Pit Boss (M4A1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1983, pitbossps, pitboss, pitboss, pitbossa, driver_device, 0, ROT0, "Merit", "The Pit Boss (PSB1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1983, mdchoice, pitboss, pitboss, mdchoice, driver_device, 0, ROT0, "Merit", "Dealer's Choice (E4A1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) /* Copyright year based on other Pit Boss sets */
-GAME( 1983, mpchoice, pitboss, pitboss, mpchoice, driver_device, 0, ROT0, "Merit", "Player's Choice (M4C1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, pitboss, 0, pitboss, pitbossa, merit_state, 0, ROT0, "Merit", "The Pit Boss (2214-07, U5-0A)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) /* "7" hand written over a 5 */
+GAME( 1983, pitboss04, pitboss, casino5, pitboss, merit_state, 0, ROT0, "Merit", "The Pit Boss (2214-04)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, pitboss03, pitboss, pitboss, pitbossa, merit_state, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-0C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, pitboss03a, pitboss, pitboss, pitbossa1,merit_state, 0, ROT0, "Merit", "The Pit Boss (2214-03, U5-1C)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, pitbossm4, pitboss, pitboss, pitbossb, merit_state, 0, ROT0, "Merit", "The Pit Boss (M4A1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, pitbossps, pitboss, pitboss, pitbossa, merit_state, 0, ROT0, "Merit", "The Pit Boss (PSB1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1983, mdchoice, pitboss, pitboss, mdchoice, merit_state, 0, ROT0, "Merit", "Dealer's Choice (E4A1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) /* Copyright year based on other Pit Boss sets */
+GAME( 1983, mpchoice, pitboss, pitboss, mpchoice, merit_state, 0, ROT0, "Merit", "Player's Choice (M4C1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1989, casino5, 0, casino5, casino5, driver_device, 0, ROT0, "Merit", "Casino Five (3315-02, U5-2B)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, casino5a, casino5, casino5, casino5, driver_device, 0, ROT0, "Merit", "Casino Five (3315-02, U5-0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, casino5, 0, casino5, casino5, merit_state, 0, ROT0, "Merit", "Casino Five (3315-02, U5-2B)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, casino5a, casino5, casino5, casino5, merit_state, 0, ROT0, "Merit", "Casino Five (3315-02, U5-0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, mroundup, 0, pitboss, mroundup, driver_device, 0, ROT0, "Merit", "The Round Up", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1984, mroundup, 0, pitboss, mroundup, merit_state, 0, ROT0, "Merit", "The Round Up", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1984, chkndraw, 0, pitboss, chkndraw, driver_device, 0, ROT0, "Merit", "Chicken Draw (2131-04, U5-1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1984, chkndrawa, chkndraw, pitboss, chkndraw, driver_device, 0, ROT0, "Merit", "Chicken Draw (2131-04, U5-0)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, chkndraw, 0, pitboss, chkndraw, merit_state, 0, ROT0, "Merit", "Chicken Draw (2131-04, U5-1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, chkndrawa, chkndraw, pitboss, chkndraw, merit_state, 0, ROT0, "Merit", "Chicken Draw (2131-04, U5-0)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1987, riviera, 0, dodge, riviera, driver_device, 0, ROT0, "Merit", "Riviera Hi-Score (2131-08, U5-4A)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1986, rivieraa, riviera, dodge, riviera, driver_device, 0, ROT0, "Merit", "Riviera Hi-Score (2131-08, U5-4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1986, rivierab, riviera, dodge, rivierab, driver_device, 0, ROT0, "Merit", "Riviera Hi-Score (2131-08, U5-2D)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1987, riviera, 0, dodge, riviera, merit_state, 0, ROT0, "Merit", "Riviera Hi-Score (2131-08, U5-4A)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1986, rivieraa, riviera, dodge, riviera, merit_state, 0, ROT0, "Merit", "Riviera Hi-Score (2131-08, U5-4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1986, rivierab, riviera, dodge, rivierab, merit_state, 0, ROT0, "Merit", "Riviera Hi-Score (2131-08, U5-2D)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1986, bigappg, 0, bigappg, bigappg, driver_device, 0, ROT0, "Big Apple Games / Merit", "The Big Apple (2131-13, U5-0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, misdraw, 0, misdraw, bigappg, driver_device, 0, ROT0, "Big Apple Games / Merit", "Michigan Super Draw (2131-16, U5-2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, iowapp, 0, dodge, iowapp, driver_device, 0, ROT0, "Merit", "Iowa Premium Player (2131-21, U5-1)", MACHINE_SUPPORTS_SAVE ) /* Copyright year based on rom label */
+GAME( 1986, bigappg, 0, bigappg, bigappg, merit_state, 0, ROT0, "Big Apple Games / Merit", "The Big Apple (2131-13, U5-0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, misdraw, 0, misdraw, bigappg, merit_state, 0, ROT0, "Big Apple Games / Merit", "Michigan Super Draw (2131-16, U5-2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, iowapp, 0, dodge, iowapp, merit_state, 0, ROT0, "Merit", "Iowa Premium Player (2131-21, U5-1)", MACHINE_SUPPORTS_SAVE ) /* Copyright year based on rom label */
-GAME( 1986, dodgectya,dodgecty,dodge, dodge, driver_device, 0, ROT0, "Merit", "Dodge City (2131-82, U5-0D)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1986, dodgectyb,dodgecty,dodge, dodge, driver_device, 0, ROT0, "Merit", "Dodge City (2131-82, U5-50)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1986, dodgectyc,dodgecty,dodge, dodge, driver_device, 0, ROT0, "Merit", "Dodge City (2131-82, U5-0 GT)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1986, dodgectya,dodgecty,dodge, dodge, merit_state, 0, ROT0, "Merit", "Dodge City (2131-82, U5-0D)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1986, dodgectyb,dodgecty,dodge, dodge, merit_state, 0, ROT0, "Merit", "Dodge City (2131-82, U5-50)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1986, dodgectyc,dodgecty,dodge, dodge, merit_state, 0, ROT0, "Merit", "Dodge City (2131-82, U5-0 GT)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
/* Trivia and Word games */
@@ -2508,6 +2508,6 @@ GAME( 1986, phrcrazev,phrcraze,phrcraze, phrcrazs, merit_state, key_7, ROT90, "
GAME( 1987, dtrvwz5, 0, dtrvwz5, dtrvwh5, merit_state, dtrvwz5,ROT0, "Merit", "Deluxe Trivia ? Whiz (6221-70, U5-0A Edition 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, couple, 0, couple, couple, merit_state, couple, ROT0, "Merit", "The Couples (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1988, couplep, couple, couple, couplep, merit_state, couple, ROT0, "Merit", "The Couples (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1988, couplei, couple, couple, couple, merit_state, couple, ROT0, "Merit", "The Couples (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1988, couple, 0, couple, couple, merit_state, couple, ROT0, "Merit", "The Couples (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1988, couplep, couple, couple, couplep, merit_state, couple, ROT0, "Merit", "The Couples (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1988, couplei, couple, couple, couple, merit_state, couple, ROT0, "Merit", "The Couples (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index ddaedf1cc29..f1cf7319f2b 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -1085,7 +1085,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(meritm_state::vblank_end_tick)
m_z80pio_0->port_a_write(m_vint);
}
-static MACHINE_CONFIG_START( meritm_crt250, meritm_state )
+static MACHINE_CONFIG_START( meritm_crt250 )
MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6)
MCFG_CPU_PROGRAM_MAP(meritm_crt250_map)
MCFG_CPU_IO_MAP(meritm_crt250_io_map)
@@ -2292,63 +2292,63 @@ DRIVER_INIT_MEMBER(meritm_state,megat3te)
}
/* CRT-250 */
-GAME( 1987, americna, 0, meritm_crt250, americna, driver_device, 0, ROT0, "Merit", "Americana (9131-01)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1987, americnaa, americna, meritm_crt250, americna, driver_device, 0, ROT0, "Merit", "Americana (9131-00)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1988, meritjp, 0, meritm_crt250, americna, driver_device, 0, ROT0, "Merit", "Merit Joker Poker (9131-09)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1988, dodgecty, 0, meritm_crt250, dodgecty, driver_device, 0, ROT0, "Merit", "Dodge City (9131-02)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1988, pitboss2, 0, meritm_crt250, pitboss2, driver_device, 0, ROT0, "Merit", "Pit Boss II (9221-01C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1988, spitboss, 0, meritm_crt250, spitboss, driver_device, 0, ROT0, "Merit", "Super Pit Boss (9221-02A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1990, pitbosss, 0, meritm_crt250, pitbosss, driver_device, 0, ROT0, "Merit", "Pit Boss Superstar (9221-10-00B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1990, pitbosssa, pitbosss, meritm_crt250, pitbosss, driver_device, 0, ROT0, "Merit", "Pit Boss Superstar (9221-10-00A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, pitbosssc, pitbosss, meritm_crt250, pitbosss, driver_device, 0, ROT0, "Merit", "Pit Boss Superstar (9221-12-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1987, americna, 0, meritm_crt250, americna, meritm_state, 0, ROT0, "Merit", "Americana (9131-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1987, americnaa, americna, meritm_crt250, americna, meritm_state, 0, ROT0, "Merit", "Americana (9131-00)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1988, meritjp, 0, meritm_crt250, americna, meritm_state, 0, ROT0, "Merit", "Merit Joker Poker (9131-09)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1988, dodgecty, 0, meritm_crt250, dodgecty, meritm_state, 0, ROT0, "Merit", "Dodge City (9131-02)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1988, pitboss2, 0, meritm_crt250, pitboss2, meritm_state, 0, ROT0, "Merit", "Pit Boss II (9221-01C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1988, spitboss, 0, meritm_crt250, spitboss, meritm_state, 0, ROT0, "Merit", "Super Pit Boss (9221-02A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1990, pitbosss, 0, meritm_crt250, pitbosss, meritm_state, 0, ROT0, "Merit", "Pit Boss Superstar (9221-10-00B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1990, pitbosssa, pitbosss, meritm_crt250, pitbosss, meritm_state, 0, ROT0, "Merit", "Pit Boss Superstar (9221-10-00A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, pitbosssc, pitbosss, meritm_crt250, pitbosss, meritm_state, 0, ROT0, "Merit", "Pit Boss Superstar (9221-12-01)", MACHINE_IMPERFECT_GRAPHICS )
/* CRT-250 + CRT-252 + CRT-256 + CRT-258 */
-GAME( 1994, mtjpoker, 0, meritm_crt250_crt252_crt258, mtjpoker, driver_device, 0, ROT0, "Merit", "Merit Touch Joker Poker (9132-00)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, megat, 0, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch (9234-20-01)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, pbst30, 0, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-10-01)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, pbst30a, pbst30, meritm_crt250_crt252_crt258, pbst30, driver_device, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-00-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, mtjpoker, 0, meritm_crt250_crt252_crt258, mtjpoker, meritm_state, 0, ROT0, "Merit", "Merit Touch Joker Poker (9132-00)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat, 0, meritm_crt250_crt252_crt258, pbst30, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch (9234-20-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, pbst30, 0, meritm_crt250_crt252_crt258, pbst30, meritm_state, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-10-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, pbst30a, pbst30, meritm_crt250_crt252_crt258, pbst30, meritm_state, 0, ROT0, "Merit", "Pit Boss Supertouch 30 (9234-00-01)", MACHINE_IMPERFECT_GRAPHICS )
/* CRT-250 + CRT-254 + CRT-256 */
-GAME( 1993, pbss330, 0, meritm_crt250_questions, pbss330, driver_device, 0, ROT0, "Merit", "Pit Boss Superstar III 30 (9233-00-01)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, pitbossm, 0, meritm_crt250_questions, pitbossm, driver_device, 0, ROT0, "Merit", "Pit Boss Megastar (9244-00-01)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, pitbossma, pitbossm, meritm_crt250_questions, pitbossa, driver_device, 0, ROT0, "Merit", "Pit Boss Megastar (9243-00-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, pbss330, 0, meritm_crt250_questions, pbss330, meritm_state, 0, ROT0, "Merit", "Pit Boss Superstar III 30 (9233-00-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, pitbossm, 0, meritm_crt250_questions, pitbossm, meritm_state, 0, ROT0, "Merit", "Pit Boss Megastar (9244-00-01)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, pitbossma, pitbossm, meritm_crt250_questions, pitbossa, meritm_state, 0, ROT0, "Merit", "Pit Boss Megastar (9243-00-01)", MACHINE_IMPERFECT_GRAPHICS )
/* CRT-260 NON-touchscreen based */
-GAME( 1995, realbrod, 0, meritm_crt260, realbrod, driver_device, 0, ROT0, "Merit", "The Real Broadway (9131-20-00 R0A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, realbrod, 0, meritm_crt260, realbrod, meritm_state, 0, ROT0, "Merit", "The Real Broadway (9131-20-00 R0A)", MACHINE_IMPERFECT_GRAPHICS )
/* CRT-260 */
-GAME( 1994, megat2, 0, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-01 ROG, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, megat2a , megat2, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, megat2b , megat2, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-01 ROD, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, megat2mn, megat2, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-02 ROG, Minnesota version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, megat2ca, megat2, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-06 ROG, California version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, megat2caa, megat2, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-06 ROE, California version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat3, 0, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-01 RON, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, megat3a, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROK, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, megat3b, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROF, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, megat3c, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROB, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, megat3d, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat3ca, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-06 RON, California version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, megat3caa, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-06 ROD, California version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, megat3nj, megat3, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch III (9255-20-07 ROG, New Jersey version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat3te, megat3, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch III Tournament Edition (9255-30-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4, 0, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4a, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROD, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4b, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROB, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4c, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4d, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 RO, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4s, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-01 ROG, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4sa, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4sb, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-01 ROC, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4smn, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-02 ROC, Minnesota version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4snj, megat4, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-07 ROG, New Jersey version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4te, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch IV Tournament Edition (9255-50-01 ROD, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4tea, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch IV Tournament Edition (9255-50-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4st, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Super Megatouch IV Tournament Edition (9255-51-01 ROB, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, megat4stg, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Super Megatouch IV Turnier Version (9255-51-50 ROA, Bi-Lingual GER/ENG version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, megat5, 0, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch 5 (9255-60-01 ROI, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, megat5a, megat5, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch 5 (9255-60-01 ROC, Standard version)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_NOT_WORKING )
-GAME( 1998, megat5nj, megat5, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch 5 (9255-60-07 RON, New Jersey version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, megat5t, megat5, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch 5 Tournament Edition (9255-70-01 ROC, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, megat5tg, megat5, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch 5 Turnier Version (9255-70-50 ROD, Bi-Lingual GER/ENG version)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, megat6, 0, meritm_crt260, meritm_crt260, driver_device, 0, ROT0, "Merit", "Megatouch 6 (9255-80-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat2, 0, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-01 ROG, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat2a , megat2, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat2b , megat2, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-01 ROD, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat2mn, megat2, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-02 ROG, Minnesota version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat2ca, megat2, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-06 ROG, California version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, megat2caa, megat2, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Pit Boss Megatouch II (9255-10-06 ROE, California version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat3, 0, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-01 RON, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, megat3a, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROK, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, megat3b, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROF, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, megat3c, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROB, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, megat3d, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat3ca, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-06 RON, California version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, megat3caa, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-06 ROD, California version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, megat3nj, megat3, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch III (9255-20-07 ROG, New Jersey version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat3te, megat3, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch III Tournament Edition (9255-30-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4, 0, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4a, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROD, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4b, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROB, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4c, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4d, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch IV (9255-40-01 RO, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4s, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-01 ROG, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4sa, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-01 ROE, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4sb, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-01 ROC, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4smn, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-02 ROC, Minnesota version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4snj, megat4, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Super Megatouch IV (9255-41-07 ROG, New Jersey version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4te, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch IV Tournament Edition (9255-50-01 ROD, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4tea, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch IV Tournament Edition (9255-50-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4st, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Super Megatouch IV Tournament Edition (9255-51-01 ROB, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, megat4stg, megat4, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Super Megatouch IV Turnier Version (9255-51-50 ROA, Bi-Lingual GER/ENG version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, megat5, 0, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch 5 (9255-60-01 ROI, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, megat5a, megat5, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch 5 (9255-60-01 ROC, Standard version)", MACHINE_IMPERFECT_GRAPHICS|MACHINE_NOT_WORKING )
+GAME( 1998, megat5nj, megat5, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch 5 (9255-60-07 RON, New Jersey version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, megat5t, megat5, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch 5 Tournament Edition (9255-70-01 ROC, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, megat5tg, megat5, meritm_crt260, meritm_crt260, meritm_state, megat3te, ROT0, "Merit", "Megatouch 5 Turnier Version (9255-70-50 ROD, Bi-Lingual GER/ENG version)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, megat6, 0, meritm_crt260, meritm_crt260, meritm_state, 0, ROT0, "Merit", "Megatouch 6 (9255-80-01 ROA, Standard version)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp
index 3451f363fc1..08f498f09b2 100644
--- a/src/mame/drivers/mermaid.cpp
+++ b/src/mame/drivers/mermaid.cpp
@@ -429,7 +429,7 @@ INTERRUPT_GEN_MEMBER(mermaid_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( mermaid, mermaid_state )
+static MACHINE_CONFIG_START( mermaid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) // ???
@@ -473,7 +473,7 @@ static MACHINE_CONFIG_DERIVED( rougien, mermaid )
MCFG_SOUND_ADD("adpcm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(mermaid_state, rougien_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -582,6 +582,6 @@ ROM_END
/* Game Drivers */
-GAME( 1982, mermaid, 0, mermaid, mermaid, driver_device, 0, ROT0, "Sanritsu / Rock-Ola", "Mermaid", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, yachtmn, mermaid, mermaid, yachtmn, driver_device, 0, ROT0, "Sanritsu / Esco", "Yachtsman", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, rougien, 0, rougien, rougien, driver_device, 0, ROT0, "Sanritsu", "Rougien", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1982, mermaid, 0, mermaid, mermaid, mermaid_state, 0, ROT0, "Sanritsu / Rock-Ola", "Mermaid", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, yachtmn, mermaid, mermaid, yachtmn, mermaid_state, 0, ROT0, "Sanritsu / Esco", "Yachtsman", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, rougien, 0, rougien, rougien, mermaid_state, 0, ROT0, "Sanritsu", "Rougien", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp
index d21bcae7a7a..fcbff5f8f06 100644
--- a/src/mame/drivers/mes.cpp
+++ b/src/mame/drivers/mes.cpp
@@ -21,7 +21,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_p_videoram(*this, "videoram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -102,7 +102,7 @@ uint32_t mes_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
return 0;
}
-static MACHINE_CONFIG_START( mes, mes_state )
+static MACHINE_CONFIG_START( mes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(mes_mem)
@@ -136,5 +136,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, mes, 0, 0, mes, mes, driver_device, 0, "Schleicher", "MES", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, mes, 0, 0, mes, mes, mes_state, 0, "Schleicher", "MES", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp
index bdb9d70843d..5d4f4b24870 100644
--- a/src/mame/drivers/metalmx.cpp
+++ b/src/mame/drivers/metalmx.cpp
@@ -685,7 +685,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( metalmx, metalmx_state )
+static MACHINE_CONFIG_START( metalmx )
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_14_31818MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp
index eb07074ab7f..90ce18be6fd 100644
--- a/src/mame/drivers/metlclsh.cpp
+++ b/src/mame/drivers/metlclsh.cpp
@@ -273,7 +273,7 @@ void metlclsh_state::machine_reset()
m_gfxbank = 0;
}
-static MACHINE_CONFIG_START( metlclsh, metlclsh_state )
+static MACHINE_CONFIG_START( metlclsh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1500000) // ?
@@ -416,4 +416,4 @@ ROM_START( metlclsh )
ROM_LOAD( "82s123.prm", 0x0000, 0x20, CRC(6844cc88) SHA1(89d23367aa6ff541205416e82781fe938dfeeb52) )
ROM_END
-GAME( 1985, metlclsh, 0, metlclsh, metlclsh, driver_device, 0, ROT0, "Data East", "Metal Clash (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, metlclsh, 0, metlclsh, metlclsh, metlclsh_state, 0, ROT0, "Data East", "Metal Clash (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp
index 6ae92b9fc92..6d87987e312 100644
--- a/src/mame/drivers/metlfrzr.cpp
+++ b/src/mame/drivers/metlfrzr.cpp
@@ -356,7 +356,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(metlfrzr_state::scanline)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE,0x08); /* RST 08h */
}
-static MACHINE_CONFIG_START(metlfrzr, metlfrzr_state)
+static MACHINE_CONFIG_START(metlfrzr)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 2)
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index b70e4475287..73aab2891d9 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -1703,7 +1703,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( ce_w );
DECLARE_WRITE_LINE_MEMBER( clk_w );
- template<class _Object> static devcb_base &set_data_cb(device_t &device, _Object object) { return downcast<puzzlet_io_device &>(device).data_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_data_cb(device_t &device, Object &&cb) { return downcast<puzzlet_io_device &>(device).data_cb.set_callback(std::forward<Object>(cb)); }
protected:
virtual void device_start() override;
@@ -1717,13 +1717,13 @@ private:
uint8_t value;
};
-const device_type PUZZLET_IO = device_creator<puzzlet_io_device>;
+DEFINE_DEVICE_TYPE(PUZZLET_IO, puzzlet_io_device, "puzzlet_io", "Puzzlet Coin/Start I/O")
puzzlet_io_device::puzzlet_io_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PUZZLET_IO, "Puzzlet Coin/Start I/O", tag, owner, clock, "puzzlet_io", __FILE__),
- data_cb(*this),
- port(*this, ":IN0")
+ : device_t(mconfig, PUZZLET_IO, tag, owner, clock)
+ , data_cb(*this)
+ , port(*this, ":IN0")
{
}
@@ -3663,7 +3663,7 @@ void metro_state::machine_start()
-static MACHINE_CONFIG_START( msgogo, metro_state )
+static MACHINE_CONFIG_START( msgogo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -3744,7 +3744,7 @@ static MACHINE_CONFIG_FRAGMENT( daitorid_upd7810_sound )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( daitorid, metro_state )
+static MACHINE_CONFIG_START( daitorid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -3777,12 +3777,12 @@ static MACHINE_CONFIG_START( daitorid, metro_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", UPD7810_INTF2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", 1200000, OKIM6295_PIN7_HIGH) // sample rate = M6295 clock / 132
+ MCFG_OKIM6295_ADD("oki", 1200000, PIN7_HIGH) // sample rate = M6295 clock / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dharma, metro_state )
+static MACHINE_CONFIG_START( dharma )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -3811,7 +3811,7 @@ static MACHINE_CONFIG_START( dharma, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // sample rate = M6295 clock / 132
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // sample rate = M6295 clock / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -3819,7 +3819,7 @@ static MACHINE_CONFIG_START( dharma, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( karatour, metro_state )
+static MACHINE_CONFIG_START( karatour )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -3848,7 +3848,7 @@ static MACHINE_CONFIG_START( karatour, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -3856,7 +3856,7 @@ static MACHINE_CONFIG_START( karatour, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( 3kokushi, metro_state )
+static MACHINE_CONFIG_START( 3kokushi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -3885,7 +3885,7 @@ static MACHINE_CONFIG_START( 3kokushi, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -3893,7 +3893,7 @@ static MACHINE_CONFIG_START( 3kokushi, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lastfort, metro_state )
+static MACHINE_CONFIG_START( lastfort )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -3922,14 +3922,14 @@ static MACHINE_CONFIG_START( lastfort, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_LOW) // sample rate = M6295 clock / 165
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_LOW) // sample rate = M6295 clock / 165
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lastforg, metro_state )
+static MACHINE_CONFIG_START( lastforg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -3958,14 +3958,14 @@ static MACHINE_CONFIG_START( lastforg, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dokyusei, metro_state )
+static MACHINE_CONFIG_START( dokyusei )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -3990,14 +3990,14 @@ static MACHINE_CONFIG_START( dokyusei, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dokyusp, metro_state )
+static MACHINE_CONFIG_START( dokyusp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -4026,7 +4026,7 @@ static MACHINE_CONFIG_START( dokyusp, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4034,7 +4034,7 @@ static MACHINE_CONFIG_START( dokyusp, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gakusai, metro_state )
+static MACHINE_CONFIG_START( gakusai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */
@@ -4063,7 +4063,7 @@ static MACHINE_CONFIG_START( gakusai, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4071,7 +4071,7 @@ static MACHINE_CONFIG_START( gakusai, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gakusai2, metro_state )
+static MACHINE_CONFIG_START( gakusai2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 26.6660MHz/2?, OSCs listed are 26.6660MHz & 3.579545MHz */
@@ -4100,7 +4100,7 @@ static MACHINE_CONFIG_START( gakusai2, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4108,7 +4108,7 @@ static MACHINE_CONFIG_START( gakusai2, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pangpoms, metro_state )
+static MACHINE_CONFIG_START( pangpoms )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -4137,7 +4137,7 @@ static MACHINE_CONFIG_START( pangpoms, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4145,7 +4145,7 @@ static MACHINE_CONFIG_START( pangpoms, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( poitto, metro_state )
+static MACHINE_CONFIG_START( poitto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -4174,7 +4174,7 @@ static MACHINE_CONFIG_START( poitto, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // was /128.. so pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // was /128.. so pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4182,7 +4182,7 @@ static MACHINE_CONFIG_START( poitto, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pururun, metro_state )
+static MACHINE_CONFIG_START( pururun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* Not confirmed */
@@ -4215,12 +4215,12 @@ static MACHINE_CONFIG_START( pururun, metro_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", UPD7810_INTF2))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_3_579545MHz/3, OKIM6295_PIN7_HIGH) // sample rate = M6295 clock / 132
+ MCFG_OKIM6295_ADD("oki", XTAL_3_579545MHz/3, PIN7_HIGH) // sample rate = M6295 clock / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( skyalert, metro_state )
+static MACHINE_CONFIG_START( skyalert )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -4249,7 +4249,7 @@ static MACHINE_CONFIG_START( skyalert, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_LOW) // sample rate = M6295 clock / 165
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_LOW) // sample rate = M6295 clock / 165
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4257,7 +4257,7 @@ static MACHINE_CONFIG_START( skyalert, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( toride2g, metro_state )
+static MACHINE_CONFIG_START( toride2g )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -4286,7 +4286,7 @@ static MACHINE_CONFIG_START( toride2g, metro_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/20, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
@@ -4294,7 +4294,7 @@ static MACHINE_CONFIG_START( toride2g, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mouja, metro_state )
+static MACHINE_CONFIG_START( mouja )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -4320,7 +4320,7 @@ static MACHINE_CONFIG_START( mouja, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/1024*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/1024*132, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, mouja_okimap)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
@@ -4329,7 +4329,7 @@ static MACHINE_CONFIG_START( mouja, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vmetal, metro_state )
+static MACHINE_CONFIG_START( vmetal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -4354,7 +4354,7 @@ static MACHINE_CONFIG_START( vmetal, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_ES8712_ADD("essnd", 12000)
@@ -4365,7 +4365,7 @@ static MACHINE_CONFIG_START( vmetal, metro_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( blzntrnd, metro_state )
+static MACHINE_CONFIG_START( blzntrnd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -4415,7 +4415,7 @@ static MACHINE_CONFIG_DERIVED( gstrik2, blzntrnd )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( puzzlet, metro_state )
+static MACHINE_CONFIG_START( puzzlet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
@@ -4447,7 +4447,7 @@ static MACHINE_CONFIG_START( puzzlet, metro_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_20MHz/5, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL_20MHz/5, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_20MHz/5)
diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp
index 1c63c75317b..2079685a432 100644
--- a/src/mame/drivers/mexico86.cpp
+++ b/src/mame/drivers/mexico86.cpp
@@ -423,7 +423,7 @@ void mexico86_state::machine_reset()
m_charbank = 0;
}
-static MACHINE_CONFIG_START( mexico86, mexico86_state )
+static MACHINE_CONFIG_START( mexico86 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
@@ -699,9 +699,9 @@ ROM_END
*
*************************************/
-GAME( 1986, kikikai, 0, kikikai, kikikai, driver_device, 0, ROT90, "Taito Corporation", "KiKi KaiKai", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, knightb, kikikai, knightb, kikikai, driver_device, 0, ROT90, "bootleg", "Knight Boy", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, kicknrun, 0, mexico86, mexico86, driver_device, 0, ROT0, "Taito Corporation", "Kick and Run (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, kicknrunu,kicknrun, mexico86, mexico86, driver_device, 0, ROT0, "Taito America Corp", "Kick and Run (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, mexico86, kicknrun, mexico86, mexico86, driver_device, 0, ROT0, "bootleg", "Mexico 86 (bootleg of Kick and Run) (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, mexico86a,kicknrun, mexico86, mexico86, driver_device, 0, ROT0, "bootleg", "Mexico 86 (bootleg of Kick and Run) (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, kikikai, 0, kikikai, kikikai, mexico86_state, 0, ROT90, "Taito Corporation", "KiKi KaiKai", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, knightb, kikikai, knightb, kikikai, mexico86_state, 0, ROT90, "bootleg", "Knight Boy", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, kicknrun, 0, mexico86, mexico86, mexico86_state, 0, ROT0, "Taito Corporation", "Kick and Run (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, kicknrunu,kicknrun, mexico86, mexico86, mexico86_state, 0, ROT0, "Taito America Corp", "Kick and Run (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, mexico86, kicknrun, mexico86, mexico86, mexico86_state, 0, ROT0, "bootleg", "Mexico 86 (bootleg of Kick and Run) (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, mexico86a,kicknrun, mexico86, mexico86, mexico86_state, 0, ROT0, "bootleg", "Mexico 86 (bootleg of Kick and Run) (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index e7b54bd7cd7..cd76389a247 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -579,7 +579,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( meyc8080, meyc8080_state )
+static MACHINE_CONFIG_START( meyc8080 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_20MHz / 10) // divider guessed
@@ -732,8 +732,8 @@ ROM_END
*
*************************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL(1982, wldarrow, 0, meyc8080, wldarrow, driver_device, 0, ROT0, "Meyco Games, Inc.", "Wild Arrow (color, Standard V4.8)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_wldarrow ) // B&W version not dumped yet
-GAMEL(1984, mdrawpkr, 0, meyc8080, mdrawpkr, driver_device, 0, ROT0, "Meyco Games, Inc.", "Draw Poker - Joker's Wild (Standard)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_mdrawpkr ) // year not shown, but it is in mdrawpkra
-GAMEL(1984, mdrawpkra, mdrawpkr, meyc8080, mdrawpkra, driver_device, 0, ROT0, "Meyco Games, Inc.", "Draw Poker - Joker's Wild (02-11)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_mdrawpkr )
-GAMEL(1983, casbjack, 0, meyc8080, casbjack, driver_device, 0, ROT0, "Meyco Games, Inc.", "Casino Black Jack (color, Standard 00-05)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_meybjack ) // B&W version not dumped yet
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL(1982, wldarrow, 0, meyc8080, wldarrow, meyc8080_state, 0, ROT0, "Meyco Games, Inc.", "Wild Arrow (color, Standard V4.8)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_wldarrow ) // B&W version not dumped yet
+GAMEL(1984, mdrawpkr, 0, meyc8080, mdrawpkr, meyc8080_state, 0, ROT0, "Meyco Games, Inc.", "Draw Poker - Joker's Wild (Standard)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_mdrawpkr ) // year not shown, but it is in mdrawpkra
+GAMEL(1984, mdrawpkra, mdrawpkr, meyc8080, mdrawpkra, meyc8080_state, 0, ROT0, "Meyco Games, Inc.", "Draw Poker - Joker's Wild (02-11)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_mdrawpkr )
+GAMEL(1983, casbjack, 0, meyc8080, casbjack, meyc8080_state, 0, ROT0, "Meyco Games, Inc.", "Casino Black Jack (color, Standard 00-05)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_meybjack ) // B&W version not dumped yet
diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp
index 6f00a018b00..b9c04a86964 100644
--- a/src/mame/drivers/meyc8088.cpp
+++ b/src/mame/drivers/meyc8088.cpp
@@ -345,7 +345,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( meyc8088, meyc8088_state )
+static MACHINE_CONFIG_START( meyc8088 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, (XTAL_15MHz / 3) * 0.95) // NOTE: underclocked to prevent errors on diagnostics, MAME i8088 cycle timing is probably inaccurate
@@ -399,4 +399,4 @@ ROM_START( gldarrow )
ROM_END
-GAMEL(1984, gldarrow, 0, meyc8088, gldarrow, driver_device, 0, ROT0, "Meyco Games, Inc.", "Golden Arrow (Standard G8-03)", 0, layout_gldarrow )
+GAMEL(1984, gldarrow, 0, meyc8088, gldarrow, meyc8088_state, 0, ROT0, "Meyco Games, Inc.", "Golden Arrow (Standard G8-03)", 0, layout_gldarrow )
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index 64953836fdd..7137711733f 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -632,7 +632,7 @@ static GFXDECODE_START( mgames )
GFXDECODE_END
-static MACHINE_CONFIG_START( mgames, mgames_state )
+static MACHINE_CONFIG_START( mgames )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* 3 MHz? */
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -680,5 +680,5 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... LAYOUT */
-GAMEL( 1981, mgames, 0, mgames, mgames, driver_device, 0, ROT0, "Merit", "Match Games", MACHINE_WRONG_COLORS | MACHINE_NO_SOUND, layout_mgames )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... LAYOUT */
+GAMEL( 1981, mgames, 0, mgames, mgames, mgames_state, 0, ROT0, "Merit", "Match Games", MACHINE_WRONG_COLORS | MACHINE_NO_SOUND, layout_mgames )
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index 6b48e387cfa..654620edce3 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -59,9 +59,9 @@ public:
m_ticket(*this, "hopper"),
m_filter1(*this, "filter1"),
m_filter2(*this, "filter2")
+ { }
- { }
uint8_t m_int;
//OUT1
@@ -546,8 +546,8 @@ void mgavegas_state::machine_reset()
m_mc=0;
m_mr=0;
- m_filter1->filter_rc_set_RC(FLT_RC_LOWPASS, 1000, 0, 0, CAP_N(1) ); /* RC out of MSM5205 R=1K C=1nF */
- m_filter2->filter_rc_set_RC(FLT_RC_HIGHPASS, 3846, 0, 0, CAP_N(100 )); /*ALP3B active-hybrid filter fc=2.6Khz 2poles???*/
+ m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, 1000, 0, 0, CAP_N(1) ); /* RC out of MSM5205 R=1K C=1nF */
+ m_filter2->filter_rc_set_RC(filter_rc_device::HIGHPASS, 3846, 0, 0, CAP_N(100 )); /*ALP3B active-hybrid filter fc=2.6Khz 2poles???*/
}
@@ -587,7 +587,7 @@ DRIVER_INIT_MEMBER(mgavegas_state,mgavegas133)
*************************/
-static MACHINE_CONFIG_START( mgavegas, mgavegas_state )
+static MACHINE_CONFIG_START( mgavegas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLK)
MCFG_CPU_PROGRAM_MAP(mgavegas_map)
@@ -607,7 +607,7 @@ static MACHINE_CONFIG_START( mgavegas, mgavegas_state )
MCFG_AY8910_PORT_B_READ_CB(READ8(mgavegas_state, ay8910_b_r))
MCFG_SOUND_ADD("5205", MSM5205, MSM_CLK)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter1", 2.0)
@@ -656,7 +656,7 @@ ROM_END
/*************************
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS*/
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1985, mgavegas, 0, mgavegas, mgavegas, mgavegas_state, mgavegas, ROT0, "MGA", "Vegas 1 (Ver 2.3 dual coin pulse, shorter)", MACHINE_MECHANICAL )
-GAME( 1985, mgavegas21, mgavegas, mgavegas, mgavegas, mgavegas_state, mgavegas21, ROT0, "MGA", "Vegas 1 (Ver 2.1 dual coin pulse, longer)", MACHINE_MECHANICAL )
-GAME( 1985, mgavegas133, mgavegas, mgavegas, mgavegas, mgavegas_state, mgavegas133,ROT0, "MGA", "Vegas 1 (Ver 1.33 single coin pulse)", MACHINE_MECHANICAL )
+GAME( 1985, mgavegas21, mgavegas, mgavegas, mgavegas, mgavegas_state, mgavegas21, ROT0, "MGA", "Vegas 1 (Ver 2.1 dual coin pulse, longer)", MACHINE_MECHANICAL )
+GAME( 1985, mgavegas133, mgavegas, mgavegas, mgavegas, mgavegas_state, mgavegas133,ROT0, "MGA", "Vegas 1 (Ver 1.33 single coin pulse)", MACHINE_MECHANICAL )
diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp
index 3a46e4c6c41..7b93183085f 100644
--- a/src/mame/drivers/mgolf.cpp
+++ b/src/mame/drivers/mgolf.cpp
@@ -362,7 +362,7 @@ void mgolf_state::machine_reset()
}
-static MACHINE_CONFIG_START( mgolf, mgolf_state )
+static MACHINE_CONFIG_START( mgolf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16) /* ? */
@@ -409,4 +409,4 @@ ROM_START( mgolf )
ROM_END
-GAME( 1978, mgolf, 0, mgolf, mgolf, driver_device, 0, ROT270, "Atari", "Atari Mini Golf (prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, mgolf, 0, mgolf, mgolf, mgolf_state, 0, ROT270, "Atari", "Atari Mini Golf (prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index a8dcde55d5b..122bef9afa8 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -526,7 +526,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( mhavoc, mhavoc_state )
+static MACHINE_CONFIG_START( mhavoc )
/* basic machine hardware */
MCFG_CPU_ADD("alpha", M6502, MHAVOC_CLOCK_2_5M) /* 2.5 MHz */
@@ -805,9 +805,9 @@ ROM_END
*
*************************************/
-GAME( 1983, mhavoc, 0, mhavoc, mhavoc, driver_device, 0, ROT0, "Atari", "Major Havoc (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, mhavoc2, mhavoc, mhavoc, mhavoc, driver_device, 0, ROT0, "Atari", "Major Havoc (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mhavoc, 0, mhavoc, mhavoc, mhavoc_state, 0, ROT0, "Atari", "Major Havoc (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mhavoc2, mhavoc, mhavoc, mhavoc, mhavoc_state, 0, ROT0, "Atari", "Major Havoc (rev 2)", MACHINE_SUPPORTS_SAVE )
GAME( 2006, mhavocrv, mhavoc, mhavocrv, mhavocrv, mhavoc_state, mhavocrv, ROT0, "Atari / JMA (hack/homebrew)", "Major Havoc (Return to Vax)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, mhavocp, mhavoc, mhavoc, mhavocp, driver_device, 0, ROT0, "Atari", "Major Havoc (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, alphaone, mhavoc, alphaone, alphaone, driver_device, 0, ROT0, "Atari", "Alpha One (prototype, 3 lives)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, alphaonea,mhavoc, alphaone, alphaone, driver_device, 0, ROT0, "Atari", "Alpha One (prototype, 5 lives)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mhavocp, mhavoc, mhavoc, mhavocp, mhavoc_state, 0, ROT0, "Atari", "Major Havoc (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, alphaone, mhavoc, alphaone, alphaone, mhavoc_state, 0, ROT0, "Atari", "Alpha One (prototype, 3 lives)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, alphaonea,mhavoc, alphaone, alphaone, mhavoc_state, 0, ROT0, "Atari", "Alpha One (prototype, 5 lives)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp
index f3a868c04b6..61661a6965a 100644
--- a/src/mame/drivers/mice.cpp
+++ b/src/mame/drivers/mice.cpp
@@ -32,11 +32,14 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(port50_r);
DECLARE_READ8_MEMBER(port51_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
+protected:
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
+
uint8_t m_term_data;
virtual void machine_reset() override;
};
@@ -76,12 +79,12 @@ void mice_state::machine_reset()
{
}
-WRITE8_MEMBER( mice_state::kbd_put )
+void mice_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( mice, mice_state )
+static MACHINE_CONFIG_START( mice )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz)
MCFG_CPU_PROGRAM_MAP(mice_mem)
@@ -89,7 +92,7 @@ static MACHINE_CONFIG_START( mice, mice_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(mice_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(mice_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -117,5 +120,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, mice, 0, 0, mice, mice, driver_device, 0, "Microtek International Inc", "Mice", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, mice, 0, 0, mice, mice, mice_state, 0, "Microtek International Inc", "Mice", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp
index 3130e5d0c71..c681b8b7bd4 100644
--- a/src/mame/drivers/micral.cpp
+++ b/src/mame/drivers/micral.cpp
@@ -247,7 +247,7 @@ MACHINE_RESET_MEMBER( micral_state, micral )
m_maincpu->set_state_int(Z80_PC, 0xf800);
}
-static MACHINE_CONFIG_START( micral, micral_state )
+static MACHINE_CONFIG_START( micral )
// basic machine hardware
MCFG_CPU_ADD( "maincpu", Z80, XTAL_4MHz )
MCFG_CPU_PROGRAM_MAP(micral_mem)
@@ -289,5 +289,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, micral, 0, 0, micral, micral, micral_state, micral, "Bull R2E", "Micral 80-22G", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, micral, 0, 0, micral, micral, micral_state, micral, "Bull R2E", "Micral 80-22G", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp
index 8f4f9b7f7f5..91372e586ca 100644
--- a/src/mame/drivers/micro20.cpp
+++ b/src/mame/drivers/micro20.cpp
@@ -141,16 +141,16 @@ static ADDRESS_MAP_START(micro20_map, AS_PROGRAM, 32, micro20_state )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_SHARE("mainram")
AM_RANGE(0x00200000, 0x002fffff) AM_READ(buserror_r)
AM_RANGE(0x00800000, 0x0083ffff) AM_ROM AM_REGION("bootrom", 0)
- AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, status_r, cmd_w, 0xff000000)
- AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, track_r, track_w, 0x00ff0000)
- AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, sector_r, sector_w, 0x0000ff00)
- AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_t, data_r, data_w, 0x000000ff)
+ AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_device, status_r, cmd_w, 0xff000000)
+ AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_device, track_r, track_w, 0x00ff0000)
+ AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_device, sector_r, sector_w, 0x0000ff00)
+ AM_RANGE(0xffff8000, 0xffff8003) AM_DEVREADWRITE8(FDC_TAG, wd1772_device, data_r, data_w, 0x000000ff)
AM_RANGE(0xffff8080, 0xffff808f) AM_DEVREADWRITE8(DUART_A_TAG, mc68681_device, read, write, 0xffffffff)
AM_RANGE(0xffff80a0, 0xffff80af) AM_DEVREADWRITE8(DUART_B_TAG, mc68681_device, read, write, 0xffffffff)
AM_RANGE(0xffff80c0, 0xffff80df) AM_DEVREADWRITE8(PIT_TAG, pit68230_device, read, write, 0xffffffff)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( micro20, micro20_state )
+static MACHINE_CONFIG_START( micro20 )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, M68020, XTAL_16_67MHz)
MCFG_CPU_PROGRAM_MAP(micro20_map)
@@ -200,6 +200,4 @@ ROM_START( micro20 )
ROM_LOAD32_BYTE( "d24-31_u13_d115.bin", 0x000000, 0x010000, CRC(3646d943) SHA1(97ee54063e2fe49fef2ff68d0f2e39345a75eac5) )
ROM_END
-COMP( 1984, micro20, 0, 0, micro20, micro20, driver_device, 0, "GMX", "Micro 20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-
-
+COMP( 1984, micro20, 0, 0, micro20, micro20, micro20_state, 0, "GMX", "Micro 20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp
index 150b22b84f2..b2dc7d7ba21 100644
--- a/src/mame/drivers/micro3d.cpp
+++ b/src/mame/drivers/micro3d.cpp
@@ -25,6 +25,7 @@
#include "emu.h"
#include "includes/micro3d.h"
+#include "audio/micro3d.h"
#include "cpu/am29000/am29000.h"
#include "cpu/m68000/m68000.h"
@@ -292,7 +293,7 @@ ADDRESS_MAP_END
*
*************************************/
-static MACHINE_CONFIG_START( micro3d, micro3d_state )
+static MACHINE_CONFIG_START( micro3d )
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz / 2)
MCFG_CPU_PROGRAM_MAP(hostmem)
@@ -644,8 +645,8 @@ ROM_END
*
*************************************/
-GAME( 1991, f15se, 0, micro3d, f15se, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "F-15 Strike Eagle (rev. 2.2 02/25/91)", MACHINE_IMPERFECT_SOUND )
-GAME( 1991, f15se21, f15se, micro3d, f15se, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "F-15 Strike Eagle (rev. 2.1 02/04/91)", MACHINE_IMPERFECT_SOUND )
-GAME( 1992, botss, 0, micro3d, botss, micro3d_state, botss, ROT0, "Microprose Games Inc.", "Battle of the Solar System (rev. 1.1a 7/23/92)", MACHINE_IMPERFECT_SOUND )
-GAME( 1992, botss11, botss, micro3d, botss11, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "Battle of the Solar System (rev. 1.1 3/24/92)", MACHINE_IMPERFECT_SOUND )
-GAME( 1992, tankbatl, 0, micro3d, tankbatl, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "Tank Battle (prototype rev. 4/21/92)", MACHINE_IMPERFECT_SOUND )
+GAME( 1991, f15se, 0, micro3d, f15se, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "F-15 Strike Eagle (rev. 2.2 02/25/91)", MACHINE_IMPERFECT_SOUND )
+GAME( 1991, f15se21, f15se, micro3d, f15se, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "F-15 Strike Eagle (rev. 2.1 02/04/91)", MACHINE_IMPERFECT_SOUND )
+GAME( 1992, botss, 0, micro3d, botss, micro3d_state, botss, ROT0, "Microprose Games Inc.", "Battle of the Solar System (rev. 1.1a 7/23/92)", MACHINE_IMPERFECT_SOUND )
+GAME( 1992, botss11, botss, micro3d, botss11, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "Battle of the Solar System (rev. 1.1 3/24/92)", MACHINE_IMPERFECT_SOUND )
+GAME( 1992, tankbatl, 0, micro3d, tankbatl, micro3d_state, micro3d, ROT0, "Microprose Games Inc.", "Tank Battle (prototype rev. 4/21/92)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/microdec.cpp b/src/mame/drivers/microdec.cpp
index b8a42c53e4f..d9c301d9ffd 100644
--- a/src/mame/drivers/microdec.cpp
+++ b/src/mame/drivers/microdec.cpp
@@ -48,7 +48,7 @@ public:
DECLARE_READ8_MEMBER(status_r);
DECLARE_READ8_MEMBER(keyin_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(portf5_r);
DECLARE_READ8_MEMBER(portf6_r);
DECLARE_WRITE8_MEMBER(portf6_w);
@@ -183,7 +183,7 @@ void microdec_state::machine_reset()
m_term_data = 0;
}
-WRITE8_MEMBER( microdec_state::kbd_put )
+void microdec_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -201,7 +201,7 @@ DRIVER_INIT_MEMBER( microdec_state, microdec )
membank("bankw0")->configure_entry(0, &main[0x1000]);
}
-static MACHINE_CONFIG_START( microdec, microdec_state )
+static MACHINE_CONFIG_START( microdec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(microdec_mem)
@@ -209,7 +209,7 @@ static MACHINE_CONFIG_START( microdec, microdec_state )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(microdec_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(microdec_state, kbd_put))
MCFG_UPD765A_ADD("fdc", true, true)
MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
@@ -249,6 +249,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1982, md2, 0, 0, microdec, microdec, microdec_state, microdec, "Morrow Designs", "Micro Decision MD-2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
COMP( 1982, md3, md2, 0, microdec, microdec, microdec_state, microdec, "Morrow Designs", "Micro Decision MD-3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/microkit.cpp b/src/mame/drivers/microkit.cpp
index 765c95e04db..a0fbb10e271 100644
--- a/src/mame/drivers/microkit.cpp
+++ b/src/mame/drivers/microkit.cpp
@@ -78,7 +78,7 @@ INPUT_PORTS_END
READ_LINE_MEMBER( microkit_state::clear_r )
{
if (m_resetcnt < 0x10)
- m_maincpu->set_state_int(COSMAC_R0, 0x8001); // skip IDL
+ m_maincpu->set_state_int(cosmac_device::COSMAC_R0, 0x8001); // skip IDL
if (m_resetcnt < 0x20)
m_resetcnt++;
// set reset pin to normal
@@ -113,7 +113,7 @@ static DEVICE_INPUT_DEFAULTS_START( serial_keyb )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( microkit, microkit_state )
+static MACHINE_CONFIG_START( microkit )
// basic machine hardware
MCFG_CPU_ADD("maincpu", CDP1802, 1750000)
MCFG_CPU_PROGRAM_MAP(microkit_mem)
@@ -134,4 +134,4 @@ ROM_START( microkit )
ROM_LOAD( "4.2a", 0x100, 0x100, CRC(27267bad) SHA1(838df9be2dc175584a1a6ee1770039118e49482e) )
ROM_END
-COMP( 1975, microkit, 0, 0, microkit, microkit, driver_device, 0, "RCA", "COSMAC Microkit", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1975, microkit, 0, 0, microkit, microkit, microkit_state, 0, "RCA", "COSMAC Microkit", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp
index 708f2783d35..761c69429a2 100644
--- a/src/mame/drivers/micronic.cpp
+++ b/src/mame/drivers/micronic.cpp
@@ -348,7 +348,7 @@ WRITE_LINE_MEMBER( micronic_state::mc146818_irq )
}
-static MACHINE_CONFIG_START( micronic, micronic_state )
+static MACHINE_CONFIG_START( micronic )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz)
MCFG_CPU_PROGRAM_MAP(micronic_mem)
@@ -397,5 +397,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, micronic, 0, 0, micronic, micronic, driver_device, 0, "Victor Micronic", "Micronic 1000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, micronic, 0, 0, micronic, micronic, micronic_state, 0, "Victor Micronic", "Micronic 1000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index d84eff02b73..2126c9d8784 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -283,7 +283,7 @@ DRIVER_INIT_MEMBER( micropin_state, micropin )
{
}
-static MACHINE_CONFIG_START( micropin, micropin_state )
+static MACHINE_CONFIG_START( micropin )
/* basic machine hardware */
MCFG_CPU_ADD("v1cpu", M6800, XTAL_2MHz / 2)
MCFG_CPU_PROGRAM_MAP(micropin_map)
@@ -320,7 +320,7 @@ static MACHINE_CONFIG_START( micropin, micropin_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", micropin_state, timer_a, attotime::from_hz(100))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pentacup2, micropin_state )
+static MACHINE_CONFIG_START( pentacup2 )
/* basic machine hardware */
MCFG_CPU_ADD("v2cpu", I8085A, 2000000)
MCFG_CPU_PROGRAM_MAP(pentacup2_map)
diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp
index 05e4b51f29a..6bb45857199 100644
--- a/src/mame/drivers/microtan.cpp
+++ b/src/mame/drivers/microtan.cpp
@@ -209,7 +209,7 @@ static GFXDECODE_START( microtan )
GFXDECODE_END
-static MACHINE_CONFIG_START( microtan, microtan_state )
+static MACHINE_CONFIG_START( microtan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 750000) // 750 kHz
MCFG_CPU_PROGRAM_MAP(microtan_map)
@@ -284,5 +284,5 @@ ROM_START( microtan )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME
-COMP( 1979, microtan, 0, 0, microtan, microtan, microtan_state, microtan, "Tangerine", "Microtan 65" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, microtan, 0, 0, microtan, microtan, microtan_state, microtan, "Tangerine", "Microtan 65" , 0 )
diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp
index 0c272537042..e2e650aed09 100644
--- a/src/mame/drivers/microvsn.cpp
+++ b/src/mame/drivers/microvsn.cpp
@@ -637,7 +637,7 @@ static ADDRESS_MAP_START( microvision_8021_io, AS_IO, 8, microvision_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( microvision, microvision_state )
+static MACHINE_CONFIG_START( microvision )
MCFG_CPU_ADD("maincpu1", I8021, 2000000) // approximately
MCFG_CPU_IO_MAP(microvision_8021_io)
MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(microvision_state, i8021_p1_write))
@@ -695,4 +695,4 @@ ROM_START( microvsn )
ROM_END
-CONS( 1979, microvsn, 0, 0, microvision, microvision, driver_device, 0, "Milton Bradley", "MicroVision", MACHINE_NOT_WORKING )
+CONS( 1979, microvsn, 0, 0, microvision, microvision, microvision_state, 0, "Milton Bradley", "MicroVision", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp
index 451447089d0..bb4139bb056 100644
--- a/src/mame/drivers/midas.cpp
+++ b/src/mame/drivers/midas.cpp
@@ -618,7 +618,7 @@ WRITE_LINE_MEMBER(midas_state::screen_vblank_midas)
-static MACHINE_CONFIG_START( livequiz, midas_state )
+static MACHINE_CONFIG_START( livequiz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
@@ -646,7 +646,7 @@ static MACHINE_CONFIG_START( livequiz, midas_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hammer, midas_state )
+static MACHINE_CONFIG_START( hammer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2)
@@ -888,4 +888,4 @@ ROM_START( hammer )
ROM_END
GAME( 1999, livequiz, 0, livequiz, livequiz, midas_state, livequiz, ROT0, "Andamiro", "Live Quiz Show", 0 )
-GAME( 2000, hammer, 0, hammer, hammer, driver_device, 0, ROT0, "Andamiro", "Hammer", 0 )
+GAME( 2000, hammer, 0, hammer, hammer, midas_state, 0, ROT0, "Andamiro", "Hammer", 0 )
diff --git a/src/mame/drivers/midqslvr.cpp b/src/mame/drivers/midqslvr.cpp
index eb7f3bba092..3e77183a6ae 100644
--- a/src/mame/drivers/midqslvr.cpp
+++ b/src/mame/drivers/midqslvr.cpp
@@ -407,7 +407,7 @@ void midqslvr_state::machine_reset()
membank("video_bank2")->set_base(memregion("video_bios")->base() + 0x4000);
}
-static MACHINE_CONFIG_START( midqslvr, midqslvr_state )
+static MACHINE_CONFIG_START( midqslvr )
MCFG_CPU_ADD("maincpu", PENTIUM, 333000000) // actually Celeron 333
MCFG_CPU_PROGRAM_MAP(midqslvr_map)
MCFG_CPU_IO_MAP(midqslvr_io)
@@ -498,11 +498,11 @@ ROM_START( ultarctcup )
ROM_END
// there are almost certainly multiple versions of these; updates were offered on floppy disk. The version numbers for the existing CHDs are unknown.
-GAME(1999, hydrthnd, 0, midqslvr, at_keyboard, driver_device, 0, ROT0, "Midway Games", "Hydro Thunder", MACHINE_IS_SKELETON)
+GAME(1999, hydrthnd, 0, midqslvr, at_keyboard, midqslvr_state, 0, ROT0, "Midway Games", "Hydro Thunder", MACHINE_IS_SKELETON)
-GAME(2000, offrthnd, 0, midqslvr, at_keyboard, driver_device, 0, ROT0, "Midway Games", "Offroad Thunder", MACHINE_IS_SKELETON)
+GAME(2000, offrthnd, 0, midqslvr, at_keyboard, midqslvr_state, 0, ROT0, "Midway Games", "Offroad Thunder", MACHINE_IS_SKELETON)
-GAME(2001, arctthnd, 0, midqslvr, at_keyboard, driver_device, 0, ROT0, "Midway Games", "Arctic Thunder (v1.002)", MACHINE_IS_SKELETON)
+GAME(2001, arctthnd, 0, midqslvr, at_keyboard, midqslvr_state, 0, ROT0, "Midway Games", "Arctic Thunder (v1.002)", MACHINE_IS_SKELETON)
-GAME(2001, ultarctc, 0, midqslvr, at_keyboard, driver_device, 0, ROT0, "Midway Games", "Ultimate Arctic Thunder", MACHINE_IS_SKELETON)
-GAME(2004, ultarctcup, ultarctc, midqslvr, at_keyboard, driver_device, 0, ROT0, "Midway Games", "Ultimate Arctic Thunder Update CD ver 1.950 (5/3/04)", MACHINE_IS_SKELETON)
+GAME(2001, ultarctc, 0, midqslvr, at_keyboard, midqslvr_state, 0, ROT0, "Midway Games", "Ultimate Arctic Thunder", MACHINE_IS_SKELETON)
+GAME(2004, ultarctcup, ultarctc, midqslvr, at_keyboard, midqslvr_state, 0, ROT0, "Midway Games", "Ultimate Arctic Thunder Update CD ver 1.950 (5/3/04)", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp
index 789209e22e3..b9584cca122 100644
--- a/src/mame/drivers/midtunit.cpp
+++ b/src/mame/drivers/midtunit.cpp
@@ -590,7 +590,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tunit_core, midtunit_state )
+static MACHINE_CONFIG_START( tunit_core )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, CPU_CLOCK)
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index 78d476c09e6..928002c0ab7 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -1122,7 +1122,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( midvcommon, midvunit_state )
+static MACHINE_CONFIG_START( midvcommon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS32031, CPU_CLOCK)
diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp
index 8ce72e6bcdf..8628f2ad1e5 100644
--- a/src/mame/drivers/midwunit.cpp
+++ b/src/mame/drivers/midwunit.cpp
@@ -620,7 +620,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( wunit, midwunit_state )
+static MACHINE_CONFIG_START( wunit )
MCFG_CPU_ADD("maincpu", TMS34010, 50000000)
MCFG_CPU_PROGRAM_MAP(main_map)
diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp
index 850c904eab2..f63e779554c 100644
--- a/src/mame/drivers/midxunit.cpp
+++ b/src/mame/drivers/midxunit.cpp
@@ -241,7 +241,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( midxunit, midxunit_state )
+static MACHINE_CONFIG_START( midxunit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34020, 40000000)
diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp
index 0a2be834c91..2d3c1ab7560 100644
--- a/src/mame/drivers/midyunit.cpp
+++ b/src/mame/drivers/midyunit.cpp
@@ -1101,7 +1101,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( zunit, midyunit_state )
+static MACHINE_CONFIG_START( zunit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, FAST_MASTER_CLOCK)
@@ -1143,7 +1143,7 @@ MACHINE_CONFIG_END
*
*************************************/
-static MACHINE_CONFIG_START( yunit_core, midyunit_state )
+static MACHINE_CONFIG_START( yunit_core )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, SLOW_MASTER_CLOCK)
@@ -1264,7 +1264,7 @@ static MACHINE_CONFIG_DERIVED( mkyawdim, yunit_core )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_8MHz / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index b056e6175c7..aaf7c032c7e 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -1255,7 +1255,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( midzeus, midzeus_state )
+static MACHINE_CONFIG_START( midzeus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
@@ -1297,7 +1297,7 @@ static MACHINE_CONFIG_DERIVED( invasn, midzeus )
MCFG_MIDWAY_IOASIC_UPPER(468/* or 488 */)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( midzeus2, midzeus2_state )
+static MACHINE_CONFIG_START( midzeus2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS32032, CPU_CLOCK)
@@ -1692,16 +1692,16 @@ DRIVER_INIT_MEMBER(midzeus_state,thegrid)
*
*************************************/
-GAME( 1997, mk4, 0, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 3.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mk4a, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 2.1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mk4b, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 1.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, invasnab, 0, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 5.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, invasnab4,invasnab, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 4.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, invasnab3,invasnab, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 3.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAMEL( 1999, crusnexo, 0, crusnexo, crusnexo, midzeus_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 2.4)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
-GAMEL( 1999, crusnexoa,crusnexo, crusnexo, crusnexo, midzeus_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 2.0)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
-GAMEL( 1999, crusnexob,crusnexo, crusnexo, crusnexo, midzeus_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 1.6)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
-GAMEL( 1999, crusnexoc,crusnexo, crusnexo, crusnexo, midzeus_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 1.3)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
-GAMEL( 1999, crusnexod,crusnexo, crusnexo, crusnexo, midzeus_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 1.0)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
-GAME( 2001, thegrid, 0, thegrid, thegrid, midzeus_state, thegrid, ROT0, "Midway", "The Grid (version 1.2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, thegrida, thegrid, thegrid, thegrid, midzeus_state, thegrid, ROT0, "Midway", "The Grid (version 1.1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mk4, 0, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 3.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mk4a, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 2.1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mk4b, mk4, mk4, mk4, midzeus_state, mk4, ROT0, "Midway", "Mortal Kombat 4 (version 1.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, invasnab, 0, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 5.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, invasnab4,invasnab, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 4.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, invasnab3,invasnab, invasn, invasn, midzeus_state, invasn, ROT0, "Midway", "Invasion - The Abductors (version 3.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAMEL( 1999, crusnexo, 0, crusnexo, crusnexo, midzeus2_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 2.4)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
+GAMEL( 1999, crusnexoa,crusnexo, crusnexo, crusnexo, midzeus2_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 2.0)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
+GAMEL( 1999, crusnexob,crusnexo, crusnexo, crusnexo, midzeus2_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 1.6)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
+GAMEL( 1999, crusnexoc,crusnexo, crusnexo, crusnexo, midzeus2_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 1.3)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
+GAMEL( 1999, crusnexod,crusnexo, crusnexo, crusnexo, midzeus2_state, crusnexo, ROT0, "Midway", "Cruis'n Exotica (version 1.0)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_crusnexo )
+GAME( 2001, thegrid, 0, thegrid, thegrid, midzeus2_state, thegrid, ROT0, "Midway", "The Grid (version 1.2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, thegrida, thegrid, thegrid, thegrid, midzeus2_state, thegrid, ROT0, "Midway", "The Grid (version 1.1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp
index 35ded5f2f99..0efa89c21d3 100644
--- a/src/mame/drivers/mikie.cpp
+++ b/src/mame/drivers/mikie.cpp
@@ -254,7 +254,7 @@ INTERRUPT_GEN_MEMBER(mikie_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( mikie, mikie_state )
+static MACHINE_CONFIG_START( mikie )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, OSC/12)
@@ -382,6 +382,6 @@ ROM_END
*
*************************************/
-GAME( 1984, mikie, 0, mikie, mikie, driver_device, 0, ROT270, "Konami", "Mikie", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, mikiej, mikie, mikie, mikie, driver_device, 0, ROT270, "Konami", "Shinnyuushain Tooru-kun", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, mikiehs, mikie, mikie, mikie, driver_device, 0, ROT270, "Konami", "Mikie (High School Graffiti)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, mikie, 0, mikie, mikie, mikie_state, 0, ROT270, "Konami", "Mikie", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, mikiej, mikie, mikie, mikie, mikie_state, 0, ROT270, "Konami", "Shinnyuushain Tooru-kun", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, mikiehs, mikie, mikie, mikie, mikie_state, 0, ROT270, "Konami", "Mikie (High School Graffiti)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp
index 0c1d3ff91d2..a529f0eb037 100644
--- a/src/mame/drivers/mikro80.cpp
+++ b/src/mame/drivers/mikro80.cpp
@@ -160,7 +160,7 @@ static GFXDECODE_START( mikro80 )
GFXDECODE_ENTRY( "gfx1", 0x0000, mikro80_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( mikro80, mikro80_state )
+static MACHINE_CONFIG_START( mikro80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(mikro80_mem)
@@ -237,7 +237,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, mikro80, 0, 0, mikro80, mikro80, mikro80_state, mikro80, "<unknown>", "Mikro-80", 0)
-COMP( 1993, radio99, mikro80, 0, radio99, mikro80, mikro80_state, radio99, "<unknown>", "Radio-99DM", 0)
-COMP( 1987, kristall2, mikro80, 0, kristall, mikro80, mikro80_state, mikro80, "<unknown>", "Kristall-2", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, mikro80, 0, 0, mikro80, mikro80, mikro80_state, mikro80, "<unknown>", "Mikro-80", 0)
+COMP( 1993, radio99, mikro80, 0, radio99, mikro80, mikro80_state, radio99, "<unknown>", "Radio-99DM", 0)
+COMP( 1987, kristall2, mikro80, 0, kristall, mikro80, mikro80_state, mikro80, "<unknown>", "Kristall-2", 0)
diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp
index 8cbeaed5fdf..3e54905b2a9 100644
--- a/src/mame/drivers/mikromik.cpp
+++ b/src/mame/drivers/mikromik.cpp
@@ -455,18 +455,18 @@ void mm1_state::machine_reset()
// MACHINE_CONFIG( mm1 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( mm1, mm1_state )
+static MACHINE_CONFIG_START( mm1 )
// basic system hardware
MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL_6_144MHz)
MCFG_CPU_PROGRAM_MAP(mm1_map)
MCFG_I8085A_SID(READLINE(mm1_state, dsra_r))
- MCFG_I8085A_SOD(DEVWRITELINE(KB_TAG, mm1_keyboard_t, bell_w))
+ MCFG_I8085A_SOD(DEVWRITELINE(KB_TAG, mm1_keyoard_device, bell_w))
MCFG_QUANTUM_PERFECT_CPU(I8085A_TAG)
// peripheral hardware
MCFG_DEVICE_ADD(I8212_TAG, I8212, 0)
MCFG_I8212_IRQ_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST65_LINE))
- MCFG_I8212_DI_CALLBACK(DEVREAD8(KB_TAG, mm1_keyboard_t, read))
+ MCFG_I8212_DI_CALLBACK(DEVREAD8(KB_TAG, mm1_keyoard_device, read))
MCFG_DEVICE_ADD(I8237_TAG, AM9517A, XTAL_6_144MHz/2)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(mm1_state, dma_hrq_w))
@@ -576,6 +576,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1981, mm1m6, 0, 0, mm1m6, mm1, driver_device, 0, "Nokia Data", "MikroMikko 1 M6", MACHINE_SUPPORTS_SAVE )
-COMP( 1981, mm1m7, mm1m6, 0, mm1m7, mm1, driver_device, 0, "Nokia Data", "MikroMikko 1 M7", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, mm1m6, 0, 0, mm1m6, mm1, mm1_state, 0, "Nokia Data", "MikroMikko 1 M6", MACHINE_SUPPORTS_SAVE )
+COMP( 1981, mm1m7, mm1m6, 0, mm1m7, mm1, mm1_state, 0, "Nokia Data", "MikroMikko 1 M7", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp
index 233fdbde003..cfdf4570cda 100644
--- a/src/mame/drivers/mikrosha.cpp
+++ b/src/mame/drivers/mikrosha.cpp
@@ -203,7 +203,7 @@ static GFXDECODE_START( mikrosha )
GFXDECODE_ENTRY( "gfx1", 0x0000, mikrosha_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( mikrosha, mikrosha_state )
+static MACHINE_CONFIG_START( mikrosha )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
MCFG_CPU_PROGRAM_MAP(mikrosha_mem)
@@ -283,6 +283,6 @@ ROM_START( m86rk )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, mikrosha, radio86,0, mikrosha, mikrosha, radio86_state, radio86, "Lianozovo Electromechanical Factory", "Mikrosha", 0)
-COMP( 1987, m86rk, radio86,0, mikrosha, mikrosha, radio86_state, radio86, "<unknown>", "Mikrosha-86RK", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, mikrosha, radio86, 0, mikrosha, mikrosha, mikrosha_state, radio86, "Lianozovo Electromechanical Factory", "Mikrosha", 0)
+COMP( 1987, m86rk, radio86, 0, mikrosha, mikrosha, mikrosha_state, radio86, "<unknown>", "Mikrosha-86RK", 0)
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index 52b0d120002..3b18ba1868d 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -537,7 +537,7 @@ static GFXDECODE_START( mil4000 )
GFXDECODE_END
-static MACHINE_CONFIG_START( mil4000, mil4000_state )
+static MACHINE_CONFIG_START( mil4000 )
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(mil4000_map)
// irq 2/4/5 point to the same place, others invalid
@@ -559,7 +559,7 @@ static MACHINE_CONFIG_START( mil4000, mil4000_state )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", mil4000)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // frequency from 1000 kHz resonator. pin 7 high not verified.
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // frequency from 1000 kHz resonator. pin 7 high not verified.
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -748,10 +748,10 @@ ROM_START( chewheel )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 2000, mil4000, 0, mil4000, mil4000, driver_device, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 2.0)", 0, layout_mil4000 )
-GAMEL( 2000, mil4000a, mil4000, mil4000, mil4000, driver_device, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 1.8)", 0, layout_mil4000 )
-GAMEL( 2000, mil4000b, mil4000, mil4000, mil4000, driver_device, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 1.5)", 0, layout_mil4000 )
-GAMEL( 2000, mil4000c, mil4000, mil4000, mil4000, driver_device, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 1.6)", 0, layout_mil4000 )
-GAMEL( 200?, top21, 0, mil4000, mil4000, driver_device, 0, ROT0, "Assogiochi Assago", "Top XXI (Version 1.2)", 0, layout_mil4000 )
-GAMEL( 200?, chewheel, 0, chewheel, mil4000, driver_device, 0, ROT0, "Assogiochi Assago", "Cherry Wheel (Version 1.7)", MACHINE_UNEMULATED_PROTECTION, layout_mil4000 )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 2000, mil4000, 0, mil4000, mil4000, mil4000_state, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 2.0)", 0, layout_mil4000 )
+GAMEL( 2000, mil4000a, mil4000, mil4000, mil4000, mil4000_state, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 1.8)", 0, layout_mil4000 )
+GAMEL( 2000, mil4000b, mil4000, mil4000, mil4000, mil4000_state, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 1.5)", 0, layout_mil4000 )
+GAMEL( 2000, mil4000c, mil4000, mil4000, mil4000, mil4000_state, 0, ROT0, "Sure Milano", "Millennium Nuovo 4000 (Version 1.6)", 0, layout_mil4000 )
+GAMEL( 200?, top21, 0, mil4000, mil4000, mil4000_state, 0, ROT0, "Assogiochi Assago", "Top XXI (Version 1.2)", 0, layout_mil4000 )
+GAMEL( 200?, chewheel, 0, chewheel, mil4000, mil4000_state, 0, ROT0, "Assogiochi Assago", "Cherry Wheel (Version 1.7)", MACHINE_UNEMULATED_PROTECTION, layout_mil4000 )
diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp
index 6d4ad637a96..1a5689435c6 100644
--- a/src/mame/drivers/mini2440.cpp
+++ b/src/mame/drivers/mini2440.cpp
@@ -219,7 +219,7 @@ DRIVER_INIT_MEMBER(mini2440_state,mini2440)
// do nothing
}
-static MACHINE_CONFIG_START( mini2440, mini2440_state )
+static MACHINE_CONFIG_START( mini2440 )
MCFG_CPU_ADD("maincpu", ARM920T, 400000000)
MCFG_CPU_PROGRAM_MAP(mini2440_map)
@@ -254,7 +254,7 @@ static MACHINE_CONFIG_START( mini2440, mini2440_state )
MCFG_S3C2440_NAND_DATA_W_CB(WRITE8(mini2440_state, s3c2440_nand_data_w))
MCFG_DEVICE_ADD("nand", NAND, 0)
- MCFG_NAND_TYPE(NAND_CHIP_K9F1G08U0B)
+ MCFG_NAND_TYPE(K9F1G08U0B)
MCFG_NAND_RNB_CALLBACK(DEVWRITELINE("s3c2440", s3c2440_device, frnb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp
index feac53e1b2b..bf86128018a 100644
--- a/src/mame/drivers/miniboy7.cpp
+++ b/src/mame/drivers/miniboy7.cpp
@@ -501,7 +501,7 @@ GFXDECODE_END
* Machine Drivers *
***********************************/
-static MACHINE_CONFIG_START( miniboy7, miniboy7_state )
+static MACHINE_CONFIG_START( miniboy7 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
@@ -624,6 +624,6 @@ ROM_END
* Game Drivers *
***********************************/
-// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
-GAMEL( 1983, miniboy7, 0, miniboy7, miniboy7, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini-Boy 7 (set 1)", MACHINE_NO_COCKTAIL, layout_miniboy7 )
-GAMEL( 1983, miniboy7a, miniboy7, miniboy7, miniboy7, driver_device, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini-Boy 7 (set 2)", MACHINE_NO_COCKTAIL, layout_miniboy7 )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1983, miniboy7, 0, miniboy7, miniboy7, miniboy7_state, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini-Boy 7 (set 1)", MACHINE_NO_COCKTAIL, layout_miniboy7 )
+GAMEL( 1983, miniboy7a, miniboy7, miniboy7, miniboy7, miniboy7_state, 0, ROT0, "Bonanza Enterprises, Ltd", "Mini-Boy 7 (set 2)", MACHINE_NO_COCKTAIL, layout_miniboy7 )
diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp
index a1695237b4a..e094f8dffba 100644
--- a/src/mame/drivers/minicom.cpp
+++ b/src/mame/drivers/minicom.cpp
@@ -225,7 +225,7 @@ DRIVER_INIT_MEMBER( minicom_state, minicom )
{
}
-static MACHINE_CONFIG_START( minicom, minicom_state )
+static MACHINE_CONFIG_START( minicom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I87C52, XTAL_10MHz) /*FIX-ME: verify the correct clock frequency */
MCFG_CPU_IO_MAP(i87c52_io)
@@ -249,6 +249,6 @@ ROM_START( mcom4_02 )
ROM_LOAD( "ultratec_minicom_iv_20020419.rom", 0x0000, 0x2000, CRC(99b6cc35) SHA1(32577005bf02042f893c8880f8ce5b3d8a5f55f9) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1997, minicom, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV (1997-08-11)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND) /* fw release data: 11th Aug 1997 */
-COMP( 2002, mcom4_02, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV (2002-04-19)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND) /* fw release data: 19th Apr 2002 */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1997, minicom, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV (1997-08-11)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND ) // fw release data: 11th Aug 1997
+COMP( 2002, mcom4_02, 0, 0, minicom, 0, minicom_state, minicom, "Ultratec", "Minicom IV (2002-04-19)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND ) // fw release data: 19th Apr 2002
diff --git a/src/mame/drivers/miniforce.cpp b/src/mame/drivers/miniforce.cpp
index 1c194060602..6e73d8390a4 100644
--- a/src/mame/drivers/miniforce.cpp
+++ b/src/mame/drivers/miniforce.cpp
@@ -173,7 +173,7 @@ SLOT_INTERFACE_END
/*
* Machine configuration
*/
-MACHINE_CONFIG_START (miniforce, miniforce_state)
+MACHINE_CONFIG_START (miniforce)
// MCFG_CPU_PROGRAM_MAP (miniforce_mem)
MCFG_VME_DEVICE_ADD("vme")
MCFG_VME_SLOT_ADD ("vme", 1, miniforce_vme_cards, "fccpu21")
@@ -191,5 +191,5 @@ ROM_START(miniforce)
ROM_END
/* Drivers TODO: setup distinct miniforce machine configurations */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1987, miniforce, 0, 0, miniforce, miniforce, driver_device, 0, "Force Computers", "miniFORCE", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP (1987, miniforce, 0, 0, miniforce, miniforce, miniforce_state, 0, "Force Computers", "miniFORCE", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER)
diff --git a/src/mame/drivers/minitel_2_rpic.cpp b/src/mame/drivers/minitel_2_rpic.cpp
index d0a091c3748..723fef8f52b 100644
--- a/src/mame/drivers/minitel_2_rpic.cpp
+++ b/src/mame/drivers/minitel_2_rpic.cpp
@@ -411,7 +411,7 @@ static INPUT_PORTS_START( minitel2 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( minitel2, minitel_state )
+static MACHINE_CONFIG_START( minitel2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C32, XTAL_14_31818MHz) //verified on pcb
MCFG_CPU_PROGRAM_MAP(mem_prg)
@@ -446,4 +446,4 @@ ROM_START( minitel2 )
ROM_LOAD( "charset.rom", 0x0000, 0x2000, BAD_DUMP CRC(b2f49eb3) SHA1(d0ef530be33bfc296314e7152302d95fdf9520fc) ) // from dcvg5k
ROM_END
-COMP( 1989, minitel2, 0, 0, minitel2, minitel2,driver_device, 0, "Philips", "Minitel 2", MACHINE_TYPE_COMPUTER | MACHINE_NO_SOUND)
+COMP( 1989, minitel2, 0, 0, minitel2, minitel2, minitel_state, 0, "Philips", "Minitel 2", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp
index b2e11eb42d6..c6ce4e7eca5 100644
--- a/src/mame/drivers/minivadr.cpp
+++ b/src/mame/drivers/minivadr.cpp
@@ -105,7 +105,7 @@ static INPUT_PORTS_START( minivadr )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( minivadr, minivadr_state )
+static MACHINE_CONFIG_START( minivadr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,24000000 / 6) /* 4 MHz ? */
@@ -136,4 +136,4 @@ ROM_START( minivadr )
ROM_END
-GAME( 1990, minivadr, 0, minivadr, minivadr, driver_device, 0, ROT0, "Taito Corporation", "Mini Vaders", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+GAME( 1990, minivadr, 0, minivadr, minivadr, minivadr_state, 0, ROT0, "Taito Corporation", "Mini Vaders", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp
index eaf5658bbd9..a8beb19edd7 100644
--- a/src/mame/drivers/mirage.cpp
+++ b/src/mame/drivers/mirage.cpp
@@ -284,7 +284,7 @@ void miragemj_state::machine_reset()
m_mux_data = 0;
}
-static MACHINE_CONFIG_START( mirage, miragemj_state )
+static MACHINE_CONFIG_START( mirage )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
@@ -331,10 +331,10 @@ static MACHINE_CONFIG_START( mirage, miragemj_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki_bgm", 2000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki_bgm", 2000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki_sfx", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki_sfx", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp
index ff0a166a23b..d95f34d3adb 100644
--- a/src/mame/drivers/mirax.cpp
+++ b/src/mame/drivers/mirax.cpp
@@ -474,7 +474,7 @@ INTERRUPT_GEN_MEMBER(mirax_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( mirax, mirax_state )
+static MACHINE_CONFIG_START( mirax )
MCFG_CPU_ADD("maincpu", Z80, 12000000/4) // ceramic potted module, encrypted z80
MCFG_CPU_PROGRAM_MAP(mirax_main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mirax_state, vblank_irq)
@@ -588,5 +588,5 @@ DRIVER_INIT_MEMBER(mirax_state,mirax)
m_flipscreen_y = 0;
}
-GAME( 1985, mirax, 0, mirax, mirax, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, mirax, 0, mirax, mirax, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, miraxa, mirax, mirax, miraxa, mirax_state, mirax, ROT90, "Current Technologies", "Mirax (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp
index b0dea93a3c0..63b24d5ad9d 100644
--- a/src/mame/drivers/missb2.cpp
+++ b/src/mame/drivers/missb2.cpp
@@ -31,20 +31,23 @@ class missb2_state : public bublbobl_state
{
public:
missb2_state(const machine_config &mconfig, device_type type, const char *tag)
- : bublbobl_state(mconfig, type, tag),
- m_bgvram(*this, "bgvram"),
- m_bgpalette(*this, "bgpalette")
- { }
+ : bublbobl_state(mconfig, type, tag)
+ , m_bgvram(*this, "bgvram")
+ , m_bgpalette(*this, "bgpalette")
+ { }
- required_shared_ptr<uint8_t> m_bgvram;
- required_device<palette_device> m_bgpalette;
DECLARE_WRITE8_MEMBER(missb2_bg_bank_w);
DECLARE_WRITE_LINE_MEMBER(irqhandler);
DECLARE_DRIVER_INIT(missb2);
DECLARE_MACHINE_START(missb2);
DECLARE_MACHINE_RESET(missb2);
uint32_t screen_update_missb2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+protected:
void configure_banks();
+
+ required_shared_ptr<uint8_t> m_bgvram;
+ required_device<palette_device> m_bgpalette;
};
@@ -437,7 +440,7 @@ MACHINE_RESET_MEMBER(missb2_state,missb2)
m_sound_status = 0;
}
-static MACHINE_CONFIG_START( missb2, missb2_state )
+static MACHINE_CONFIG_START( missb2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_XTAL/4) // 6 MHz
@@ -483,7 +486,7 @@ static MACHINE_CONFIG_START( missb2, missb2_state )
MCFG_YM3526_IRQ_HANDLER(WRITELINE(missb2_state, irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4)
MACHINE_CONFIG_END
@@ -581,4 +584,4 @@ DRIVER_INIT_MEMBER(missb2_state,missb2)
/* Game Drivers */
GAME( 1996, missb2, 0, missb2, missb2, missb2_state, missb2, ROT0, "Alpha Co.", "Miss Bubble II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, bublpong, missb2, bublpong, missb2, missb2_state, missb2, ROT0, "Top Ltd.", "Bubble Pong Pong", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bublpong, missb2, bublpong, missb2, missb2_state, missb2, ROT0, "Top Ltd.", "Bubble Pong Pong", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index 49196586e38..548eb3777e9 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -1134,7 +1134,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( missile, missile_state )
+static MACHINE_CONFIG_START( missile )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
@@ -1485,17 +1485,17 @@ DRIVER_INIT_MEMBER(missile_state,missilem)
*
*************************************/
-GAME( 1980, missile, 0, missile, missile, driver_device, 0, ROT0, "Atari", "Missile Command (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, missile2, missile, missile, missile, driver_device, 0, ROT0, "Atari", "Missile Command (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, missile1, missile, missile, missile, driver_device, 0, ROT0, "Atari", "Missile Command (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, missile, 0, missile, missile, missile_state, 0, ROT0, "Atari", "Missile Command (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, missile2, missile, missile, missile, missile_state, 0, ROT0, "Atari", "Missile Command (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, missile1, missile, missile, missile, missile_state, 0, ROT0, "Atari", "Missile Command (rev 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, suprmatk, missile, missile, suprmatk, missile_state, suprmatk, ROT0, "Atari / General Computer Corporation", "Super Missile Attack (for rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, suprmatkd,missile, missile, suprmatk, driver_device, 0, ROT0, "Atari / General Computer Corporation", "Super Missile Attack (not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, suprmatkd,missile, missile, suprmatk, missile_state, 0, ROT0, "Atari / General Computer Corporation", "Super Missile Attack (not encrypted)", MACHINE_SUPPORTS_SAVE )
/* the following bootleg has extremely similar program ROMs to missile1, but has different unknown sound hardware and 2 more ROMs */
-GAME( 1981, missilea, missile, missilea, missile, driver_device, 0, ROT0, "bootleg (Ugames)", "Missile Attack", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, missilea, missile, missilea, missile, driver_device, 0, ROT0, "bootleg (Ugames)", "Missile Attack", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
/* the following bootlegs are on different hardware and don't work */
-GAME( 1980, mcombat, missile, missileb, missileb, driver_device, 0, ROT0, "bootleg (Videotron)", "Missile Combat (Videotron bootleg, set 1)", MACHINE_NOT_WORKING )
-GAME( 1980, mcombata, missile, missileb, missileb, driver_device, 0, ROT0, "bootleg (Videotron)", "Missile Combat (Videotron bootleg, set 2)", MACHINE_NOT_WORKING )
-GAME( 1980, mcombats, missile, missileb, missileb, driver_device, 0, ROT0, "bootleg (Sidam)", "Missile Combat (Sidam bootleg)", MACHINE_NOT_WORKING )
-GAME( 2005, missilem, missile, missilea, missileb, missile_state, missilem, ROT0, "hack (Braze Technologies)", "Missile Command Multigame", MACHINE_NOT_WORKING )
+GAME( 1980, mcombat, missile, missileb, missileb, missile_state, 0, ROT0, "bootleg (Videotron)", "Missile Combat (Videotron bootleg, set 1)", MACHINE_NOT_WORKING )
+GAME( 1980, mcombata, missile, missileb, missileb, missile_state, 0, ROT0, "bootleg (Videotron)", "Missile Combat (Videotron bootleg, set 2)", MACHINE_NOT_WORKING )
+GAME( 1980, mcombats, missile, missileb, missileb, missile_state, 0, ROT0, "bootleg (Sidam)", "Missile Combat (Sidam bootleg)", MACHINE_NOT_WORKING )
+GAME( 2005, missilem, missile, missilea, missileb, missile_state, missilem, ROT0, "hack (Braze Technologies)", "Missile Command Multigame", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp
index 162e20c7eb5..80081c0fd9b 100644
--- a/src/mame/drivers/mitchell.cpp
+++ b/src/mame/drivers/mitchell.cpp
@@ -1163,7 +1163,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mitchell_state::mitchell_irq)
}
}
-static MACHINE_CONFIG_START( mgakuen, mitchell_state )
+static MACHINE_CONFIG_START( mgakuen )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* probably same clock as the other mitchell hardware games */
@@ -1195,7 +1195,7 @@ static MACHINE_CONFIG_START( mgakuen, mitchell_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* probably same clock as the other mitchell hardware games */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* probably same clock as the other mitchell hardware games */
@@ -1203,7 +1203,7 @@ static MACHINE_CONFIG_START( mgakuen, mitchell_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pang, mitchell_state )
+static MACHINE_CONFIG_START( pang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz/2) /* verified on pcb */
@@ -1236,7 +1236,7 @@ static MACHINE_CONFIG_START( pang, mitchell_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_ADD("ymsnd",YM2413, XTAL_16MHz/4) /* verified on pcb */
@@ -1298,7 +1298,7 @@ static MACHINE_CONFIG_DERIVED( spangbl, pangnv )
MCFG_DEVICE_REMOVE("oki")
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(mitchell_state, spangbl_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("adpcm_select", LS157, 0)
@@ -1313,7 +1313,7 @@ static MACHINE_CONFIG_DERIVED( pangba, spangbl )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mstworld, mitchell_state )
+static MACHINE_CONFIG_START( mstworld )
/* basic machine hardware */
/* it doesn't glitch with the clock speed set to 4x normal, however this is incorrect..
@@ -1352,12 +1352,12 @@ static MACHINE_CONFIG_START( mstworld, mitchell_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 990000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 990000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( marukin, mitchell_state )
+static MACHINE_CONFIG_START( marukin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* verified on pcb */
@@ -1387,7 +1387,7 @@ static MACHINE_CONFIG_START( marukin, mitchell_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_16MHz/4) /* verified on pcb */
@@ -1412,7 +1412,7 @@ Vsync is 59.09hz
*/
-static MACHINE_CONFIG_START( pkladiesbl, mitchell_state )
+static MACHINE_CONFIG_START( pkladiesbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
@@ -1442,7 +1442,7 @@ static MACHINE_CONFIG_START( pkladiesbl, mitchell_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* It should be a OKIM5205 with a 384khz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("ymsnd", YM2413, 3750000) /* verified on pcb, read the comments */
diff --git a/src/mame/drivers/mits680b.cpp b/src/mame/drivers/mits680b.cpp
index b7dac966cc9..cd3c008ab58 100644
--- a/src/mame/drivers/mits680b.cpp
+++ b/src/mame/drivers/mits680b.cpp
@@ -39,14 +39,17 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(terminal_status_r);
DECLARE_READ8_MEMBER(terminal_r);
DECLARE_READ8_MEMBER(status_check_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
- uint8_t m_term_data;
+ void kbd_put(u8 data);
+
+protected:
virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
+ uint8_t m_term_data;
};
READ8_MEMBER( mits680b_state::status_check_r )
@@ -87,19 +90,19 @@ void mits680b_state::machine_reset()
m_term_data = 0;
}
-WRITE8_MEMBER( mits680b_state::kbd_put )
+void mits680b_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( mits680b, mits680b_state )
+static MACHINE_CONFIG_START( mits680b )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6800, XTAL_1MHz / 2)
MCFG_CPU_PROGRAM_MAP(mits680b_mem)
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(mits680b_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(mits680b_state, kbd_put))
/* acia */
//MCFG_ACIA6551_ADD("acia")
@@ -113,5 +116,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1976, mits680b, 0, 0, mits680b, mits680b, driver_device, 0, "MITS", "Altair 680b", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, mits680b, 0, 0, mits680b, mits680b, mits680b_state, 0, "MITS", "Altair 680b", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp
index f964372558d..9a0f8ce44d6 100644
--- a/src/mame/drivers/mjkjidai.cpp
+++ b/src/mame/drivers/mjkjidai.cpp
@@ -300,7 +300,7 @@ void mjkjidai_state::machine_reset()
m_adpcm_pos = m_adpcm_end = 0;
}
-static MACHINE_CONFIG_START( mjkjidai, mjkjidai_state )
+static MACHINE_CONFIG_START( mjkjidai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,10000000/2) /* 5 MHz ??? */
@@ -333,7 +333,7 @@ static MACHINE_CONFIG_START( mjkjidai, mjkjidai_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(mjkjidai_state, adpcm_int))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S64_4B) /* 6kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -372,4 +372,4 @@ ROM_START( mjkjidai )
ROM_END
-GAME( 1986, mjkjidai, 0, mjkjidai, mjkjidai, driver_device, 0, ROT0, "Sanritsu", "Mahjong Kyou Jidai (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, mjkjidai, 0, mjkjidai, mjkjidai, mjkjidai_state, 0, ROT0, "Sanritsu", "Mahjong Kyou Jidai (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp
index f2f7e99987b..3e423d318cf 100644
--- a/src/mame/drivers/mjsenpu.cpp
+++ b/src/mame/drivers/mjsenpu.cpp
@@ -454,7 +454,7 @@ following clocks are on the PCB
*/
-static MACHINE_CONFIG_START( mjsenpu, mjsenpu_state )
+static MACHINE_CONFIG_START( mjsenpu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", E132XT, 27000000*2) /* ?? Mhz */
@@ -480,7 +480,7 @@ static MACHINE_CONFIG_START( mjsenpu, mjsenpu_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* 1 Mhz? */
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) /* 1 Mhz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp
index d26d6c18b89..3ef65322117 100644
--- a/src/mame/drivers/mjsister.cpp
+++ b/src/mame/drivers/mjsister.cpp
@@ -483,7 +483,7 @@ void mjsister_state::machine_reset()
}
-static MACHINE_CONFIG_START( mjsister, mjsister_state )
+static MACHINE_CONFIG_START( mjsister )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 6.000 MHz */
@@ -547,4 +547,4 @@ ROM_END
*
*************************************/
-GAME( 1986, mjsister, 0, mjsister, mjsister, driver_device, 0, ROT0, "Toaplan", "Mahjong Sisters (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, mjsister, 0, mjsister, mjsister, mjsister_state, 0, ROT0, "Toaplan", "Mahjong Sisters (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp
index b70db2cd727..f1905c2817d 100644
--- a/src/mame/drivers/mk1.cpp
+++ b/src/mame/drivers/mk1.cpp
@@ -174,7 +174,7 @@ F3853_INTERRUPT_REQ_CB(mk1_state::mk1_interrupt)
m_maincpu->set_input_line(F8_INPUT_LINE_INT_REQ, level ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( mk1, mk1_state )
+static MACHINE_CONFIG_START( mk1 )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", F8, MAIN_CLOCK ) /* MK3850 */
MCFG_CPU_PROGRAM_MAP(mk1_mem)
@@ -205,5 +205,5 @@ ROM_END
***************************************************************************/
// seams to be developed by mostek (MK)
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS( 1979, ccmk1, 0, 0, mk1, mk1, driver_device, 0, "Novag", "Chess Champion MK I", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1979, ccmk1, 0, 0, mk1, mk1, mk1_state, 0, "Novag", "Chess Champion MK I", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp
index dff0ff8119b..bf7e7692b27 100644
--- a/src/mame/drivers/mk14.cpp
+++ b/src/mame/drivers/mk14.cpp
@@ -188,7 +188,7 @@ void mk14_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( mk14, mk14_state )
+static MACHINE_CONFIG_START( mk14 )
/* basic machine hardware */
// IC1 1SP-8A/600 (8060) SC/MP Microprocessor
MCFG_CPU_ADD("maincpu", INS8060, XTAL_4_433619MHz)
@@ -225,5 +225,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, mk14, 0, 0, mk14, mk14, driver_device, 0, "Science of Cambridge", "MK-14", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1977, mk14, 0, 0, mk14, mk14, mk14_state, 0, "Science of Cambridge", "MK-14", 0 )
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp
index df887a44e7a..90d9e57c026 100644
--- a/src/mame/drivers/mk2.cpp
+++ b/src/mame/drivers/mk2.cpp
@@ -186,7 +186,7 @@ WRITE8_MEMBER( mk2_state::mk2_write_b )
}
-static MACHINE_CONFIG_START( mk2, mk2_state )
+static MACHINE_CONFIG_START( mk2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6504, 1000000)
MCFG_CPU_PROGRAM_MAP(mk2_mem)
@@ -223,6 +223,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-CONS( 1979, ccmk2, 0, 0, mk2, mk2, driver_device, 0, "Novag", "Chess Champion MK II", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 1979, ccmk2, 0, 0, mk2, mk2, mk2_state, 0, "Novag", "Chess Champion MK II", 0 )
// second design sold (same computer/program?)
diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp
index 67cb4db34b8..b8a73ef8662 100644
--- a/src/mame/drivers/mk85.cpp
+++ b/src/mame/drivers/mk85.cpp
@@ -64,7 +64,7 @@ uint32_t mk85_state::screen_update_mk85(screen_device &screen, bitmap_ind16 &bit
return 0;
}
-static MACHINE_CONFIG_START( mk85, mk85_state )
+static MACHINE_CONFIG_START( mk85 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_4MHz)
MCFG_T11_INITIAL_MODE(0)
@@ -91,5 +91,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, mk85, 0, 0, mk85, mk85, driver_device, 0, "Elektronika", "MK-85", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1986, mk85, 0, 0, mk85, mk85, mk85_state, 0, "Elektronika", "MK-85", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp
index 356be54115e..7ce2c4eabbb 100644
--- a/src/mame/drivers/mk90.cpp
+++ b/src/mame/drivers/mk90.cpp
@@ -67,7 +67,7 @@ uint32_t mk90_state::screen_update_mk90(screen_device &screen, bitmap_ind16 &bit
return 0;
}
-static MACHINE_CONFIG_START( mk90, mk90_state )
+static MACHINE_CONFIG_START( mk90 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", K1801VM2, XTAL_4MHz)
MCFG_T11_INITIAL_MODE(0x8000)
@@ -99,5 +99,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, mk90, 0, 0, mk90, mk90, driver_device, 0, "Elektronika", "MK-90", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1988, mk90, 0, 0, mk90, mk90, mk90_state, 0, "Elektronika", "MK-90", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index f7f3b626d84..b38fe364f34 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -189,7 +189,7 @@ WRITE8_MEMBER( mkit09_state::pb_w )
}
-static MACHINE_CONFIG_START( mkit09, mkit09_state )
+static MACHINE_CONFIG_START( mkit09 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809E, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(mkit09_mem)
@@ -215,7 +215,7 @@ static MACHINE_CONFIG_START( mkit09, mkit09_state )
MCFG_CASSETTE_ADD( "cassette" )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mkit09a, mkit09_state )
+static MACHINE_CONFIG_START( mkit09a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809E, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(mkit09a_mem)
@@ -254,6 +254,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, mkit09, 0, 0, mkit09, mkit09, driver_device, 0, "Multitech", "Microkit09", MACHINE_NO_SOUND_HW )
-COMP( 1983, mkit09a, mkit09, 0, mkit09a, mkit09, driver_device, 0, "Multitech", "Microkit09 (Alt version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, mkit09, 0, 0, mkit09, mkit09, mkit09_state, 0, "Multitech", "Microkit09", MACHINE_NO_SOUND_HW )
+COMP( 1983, mkit09a, mkit09, 0, mkit09a, mkit09, mkit09_state, 0, "Multitech", "Microkit09 (Alt version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp
index 9d5a51af337..2a037cba84c 100644
--- a/src/mame/drivers/mlanding.cpp
+++ b/src/mame/drivers/mlanding.cpp
@@ -922,7 +922,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( mlanding, mlanding_state )
+static MACHINE_CONFIG_START( mlanding )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) // Appears to be 68000P8 in PCB photo
@@ -977,11 +977,11 @@ static MACHINE_CONFIG_START( mlanding, mlanding_state )
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(mlanding_state, msm5205_1_vck)) // VCK function
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) // 8 kHz, 4-bit
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8 kHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) // Slave mode, 4-bit
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) // Slave mode, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -1031,4 +1031,4 @@ ROM_END
*
*************************************/
-GAME( 1987, mlanding, 0, mlanding, mlanding, driver_device, 0, ROT0, "Taito America Corporation", "Midnight Landing (Germany)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mlanding, 0, mlanding, mlanding, mlanding_state, 0, ROT0, "Taito America Corporation", "Midnight Landing (Germany)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp
index 52548495a86..ccb0d8be365 100644
--- a/src/mame/drivers/mmagic.cpp
+++ b/src/mame/drivers/mmagic.cpp
@@ -269,7 +269,7 @@ void mmagic_state::machine_start()
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( mmagic, mmagic_state )
+static MACHINE_CONFIG_START( mmagic )
// basic machine hardware
MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // NEC D8085A
MCFG_CPU_PROGRAM_MAP(mmagic_mem)
@@ -314,5 +314,5 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS
-GAME( 1979, mmagic, 0, mmagic, mmagic, driver_device, 0, ROT270, "Nintendo", "Monkey Magic", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1979, mmagic, 0, mmagic, mmagic, mmagic_state, 0, ROT270, "Nintendo", "Monkey Magic", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp
index 890b7c39c13..a566a5af8ee 100644
--- a/src/mame/drivers/mmd1.cpp
+++ b/src/mame/drivers/mmd1.cpp
@@ -413,10 +413,10 @@ READ8_MEMBER( mmd1_state::mmd2_kbd_r )
WRITE8_MEMBER( mmd1_state::mmd2_status_callback )
{
// operate the HALT LED
- output().set_value("led_halt", ~data & I8085_STATUS_HLTA);
+ output().set_value("led_halt", ~data & i8080_cpu_device::STATUS_HLTA);
// operate the HOLD LED - this should connect to the HLDA pin,
// but it isn't emulated, using WO instead (whatever that does).
- output().set_value("led_hold", data & I8085_STATUS_WO);
+ output().set_value("led_hold", data & i8080_cpu_device::STATUS_WO);
}
WRITE_LINE_MEMBER( mmd1_state::mmd2_inte_callback )
@@ -475,7 +475,7 @@ We preset all banks here, so that bankswitching will incur no speed penalty.
membank("bank8")->configure_entry(2, &p_ram[0xd800]);
}
-static MACHINE_CONFIG_START( mmd1, mmd1_state )
+static MACHINE_CONFIG_START( mmd1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 6750000 / 9)
MCFG_CPU_PROGRAM_MAP(mmd1_mem)
@@ -487,7 +487,7 @@ static MACHINE_CONFIG_START( mmd1, mmd1_state )
MCFG_DEFAULT_LAYOUT(layout_mmd1)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mmd2, mmd1_state )
+static MACHINE_CONFIG_START( mmd2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 6750000 / 9)
MCFG_CPU_PROGRAM_MAP(mmd2_mem)
@@ -526,6 +526,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1976, mmd1, 0, 0, mmd1, mmd1, driver_device, 0, "E&L Instruments Inc", "MMD-1", MACHINE_NO_SOUND_HW)
-COMP( 1976, mmd2, mmd1, 0, mmd2, mmd2, mmd1_state, mmd2, "E&L Instruments Inc", "MMD-2", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, mmd1, 0, 0, mmd1, mmd1, mmd1_state, 0, "E&L Instruments Inc", "MMD-1", MACHINE_NO_SOUND_HW )
+COMP( 1976, mmd2, mmd1, 0, mmd2, mmd2, mmd1_state, mmd2, "E&L Instruments Inc", "MMD-2", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/mmm.cpp b/src/mame/drivers/mmm.cpp
index 1f567dced93..1ebf30fab19 100644
--- a/src/mame/drivers/mmm.cpp
+++ b/src/mame/drivers/mmm.cpp
@@ -35,7 +35,7 @@ static INPUT_PORTS_START( mmm )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mmm, mmm_state )
+static MACHINE_CONFIG_START( mmm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,2000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(mmm_map)
@@ -51,4 +51,4 @@ ROM_START( mmm_ldip )
ROM_END
-GAME( 198?, mmm_ldip, 0, mmm, mmm, driver_device, 0, ROT0, "Maygay", "Lucky Dip (Maygay)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 198?, mmm_ldip, 0, mmm, mmm, mmm_state, 0, ROT0, "Maygay", "Lucky Dip (Maygay)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp
index 50c2cfda0e1..a2f4db88480 100644
--- a/src/mame/drivers/mmodular.cpp
+++ b/src/mame/drivers/mmodular.cpp
@@ -1281,7 +1281,7 @@ static MACHINE_CONFIG_FRAGMENT ( chess_common )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( polgar, polgar_state )
+static MACHINE_CONFIG_START( polgar )
MCFG_CPU_ADD("maincpu",M65C02,4915200)
MCFG_CPU_PROGRAM_MAP(polgar_mem)
MCFG_QUANTUM_TIME(attotime::from_hz(60))
@@ -1295,7 +1295,7 @@ static MACHINE_CONFIG_START( polgar, polgar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( alm32, polgar_state )
+static MACHINE_CONFIG_START( alm32 )
MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(alm32_mem)
MCFG_MACHINE_START_OVERRIDE(polgar_state,van32)
@@ -1324,7 +1324,7 @@ static MACHINE_CONFIG_DERIVED( milano, polgar )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( monteciv, polgar_state )
+static MACHINE_CONFIG_START( monteciv )
MCFG_CPU_ADD("maincpu",M65C02,8000000)
MCFG_CPU_PROGRAM_MAP( monteciv_mem )
MCFG_MACHINE_START_OVERRIDE(polgar_state, polgar )
@@ -1344,7 +1344,7 @@ static MACHINE_CONFIG_DERIVED( megaiv, monteciv )
MCFG_CPU_PROGRAM_MAP(megaiv_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( van16, polgar_state )
+static MACHINE_CONFIG_START( van16 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(van16_mem)
MCFG_MACHINE_START_OVERRIDE(polgar_state,van16)
@@ -1362,7 +1362,7 @@ static MACHINE_CONFIG_DERIVED( alm16, van16 )
MCFG_CPU_PROGRAM_MAP(alm16_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( van32, polgar_state )
+static MACHINE_CONFIG_START( van32 )
MCFG_CPU_ADD("maincpu", M68020, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(van32_mem)
MCFG_MACHINE_START_OVERRIDE(polgar_state,van32)
@@ -1375,7 +1375,7 @@ static MACHINE_CONFIG_START( van32, polgar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gen32, polgar_state )
+static MACHINE_CONFIG_START( gen32 )
MCFG_CPU_ADD("maincpu", M68030, XTAL_33_333MHz)
MCFG_CPU_PROGRAM_MAP(gen32_mem)
MCFG_MACHINE_START_OVERRIDE(polgar_state,van32)
@@ -1390,7 +1390,7 @@ static MACHINE_CONFIG_START( gen32, polgar_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bpl32, polgar_state )
+static MACHINE_CONFIG_START( bpl32 )
MCFG_CPU_ADD("maincpu", M68020, XTAL_24_576MHz)
MCFG_CPU_PROGRAM_MAP(bpl32_mem)
MCFG_MACHINE_START_OVERRIDE(polgar_state,van32)
@@ -1508,22 +1508,22 @@ DRIVER_INIT_MEMBER(polgar_state,polgar)
led_status=0;
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
- CONS( 1986, polgar, 0, 0, polgar, polgar, polgar_state, polgar, "Hegener & Glaser", "Mephisto Polgar Schachcomputer", MACHINE_NOT_WORKING | MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK)
- CONS( 1988, alm16, van16, 0, alm16, van16, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Almeria 68000", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1988, alm32, van16, 0, alm32, van32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Alimera 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1989, academy, 0, 0, academy, academy, driver_device, 0, "Hegener & Glaser", "Mephisto Academy Schachcomputer", MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1989, megaiv, 0, 0, megaiv, megaiv, driver_device, 0, "Hegener & Glaser", "Mephisto Mega IV Schachcomputer", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1989, milano, polgar, 0, milano, polgar, polgar_state, polgar, "Hegener & Glaser", "Mephisto Milano Schachcomputer", MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
-//CONS( 1989, montec4, 0, 0, monteciv, monteciv, driver_device, 0, "Hegener & Glaser", "Mephisto Monte Carlo IV", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1990, lyon16, van16, 0, alm16, van16, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Lyon 68000", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1990, lyon32, van16, 0, alm32, van32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Lyon 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1990, monteciv, 0, 0, monteciv, monteciv, driver_device, 0, "Hegener & Glaser", "Mephisto Monte Carlo IV LE Schachcomputer", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1991, van16, 0, 0, van16, van16, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Vancouver 68000", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1991, van32, van16, 0, van32, van32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Vancouver 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1993, gen32, van16, 0, gen32, gen32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Genius030 V4.00", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1993, gen32_41, van16, 0, gen32, gen32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Genius030 V4.01", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1994, berlinp, van16, 0, bpl32, bpl32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Berlin Pro 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1996, bpl32, van16, 0, bpl32, bpl32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Berlin Pro London Upgrade V5.00", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1996, lond020, van16, 0, van32, van32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto London 68020 32 Bit", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
- CONS( 1996, lond030, van16, 0, gen32, gen32, driver_device, 0, "Hegener & Glaser Muenchen", "Mephisto Genius030 London Upgrade V5.00", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+ CONS( 1986, polgar, 0, 0, polgar, polgar, polgar_state, polgar, "Hegener & Glaser", "Mephisto Polgar Schachcomputer", MACHINE_NOT_WORKING | MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK)
+ CONS( 1988, alm16, van16, 0, alm16, van16, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Almeria 68000", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1988, alm32, van16, 0, alm32, van32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Alimera 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1989, academy, 0, 0, academy, academy, polgar_state, 0, "Hegener & Glaser", "Mephisto Academy Schachcomputer", MACHINE_REQUIRES_ARTWORK|MACHINE_NOT_WORKING | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1989, megaiv, 0, 0, megaiv, megaiv, polgar_state, 0, "Hegener & Glaser", "Mephisto Mega IV Schachcomputer", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1989, milano, polgar, 0, milano, polgar, polgar_state, polgar, "Hegener & Glaser", "Mephisto Milano Schachcomputer", MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+// CONS( 1989, montec4, 0, 0, monteciv, monteciv, polgar_state, 0, "Hegener & Glaser", "Mephisto Monte Carlo IV", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1990, lyon16, van16, 0, alm16, van16, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Lyon 68000", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1990, lyon32, van16, 0, alm32, van32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Lyon 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1990, monteciv, 0, 0, monteciv, monteciv, polgar_state, 0, "Hegener & Glaser", "Mephisto Monte Carlo IV LE Schachcomputer", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1991, van16, 0, 0, van16, van16, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Vancouver 68000", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1991, van32, van16, 0, van32, van32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Vancouver 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1993, gen32, van16, 0, gen32, gen32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Genius030 V4.00", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1993, gen32_41, van16, 0, gen32, gen32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Genius030 V4.01", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1994, berlinp, van16, 0, bpl32, bpl32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Berlin Pro 68020", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1996, bpl32, van16, 0, bpl32, bpl32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Berlin Pro London Upgrade V5.00", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1996, lond020, van16, 0, van32, van32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto London 68020 32 Bit", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
+ CONS( 1996, lond030, van16, 0, gen32, gen32, polgar_state, 0, "Hegener & Glaser Muenchen", "Mephisto Genius030 London Upgrade V5.00", MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/mod8.cpp b/src/mame/drivers/mod8.cpp
index 1ddeccc7eb0..007efd6ed27 100644
--- a/src/mame/drivers/mod8.cpp
+++ b/src/mame/drivers/mod8.cpp
@@ -69,7 +69,7 @@ public:
DECLARE_WRITE8_MEMBER(out_w);
DECLARE_WRITE8_MEMBER(tty_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(tty_r);
IRQ_CALLBACK_MEMBER(mod8_irq_callback);
private:
@@ -134,13 +134,13 @@ void mod8_state::machine_reset()
{
}
-WRITE8_MEMBER( mod8_state::kbd_put )
+void mod8_state::kbd_put(u8 data)
{
m_tty_key_data = data ^ 0xff;
m_maincpu->set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( mod8, mod8_state )
+static MACHINE_CONFIG_START( mod8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8008, 800000)
MCFG_CPU_PROGRAM_MAP(mod8_mem)
@@ -149,7 +149,7 @@ static MACHINE_CONFIG_START( mod8, mod8_state )
/* video hardware */
MCFG_DEVICE_ADD(TELEPRINTER_TAG, TELEPRINTER, 0)
- MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(WRITE8(mod8_state, kbd_put))
+ MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(PUT(mod8_state, kbd_put))
MACHINE_CONFIG_END
@@ -167,5 +167,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1974, mod8, 0, 0, mod8, mod8, driver_device, 0, "Microsystems International Ltd", "MOD-8", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1974, mod8, 0, 0, mod8, mod8, mod8_state, 0, "Microsystems International Ltd", "MOD-8", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index 6dc1ee86c74..411311e8692 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -862,12 +862,12 @@ static ADDRESS_MAP_START( model1_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0x610000, 0x61ffff) AM_RAM_WRITE(md1_w) AM_SHARE("display_list1")
AM_RANGE(0x680000, 0x680003) AM_READWRITE(model1_listctl_r, model1_listctl_w)
- AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE("tile", segas24_tile, tile_r, tile_w)
+ AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE("tile", segas24_tile_device, tile_r, tile_w)
AM_RANGE(0x720000, 0x720001) AM_WRITENOP // Unknown, always 0
AM_RANGE(0x740000, 0x740001) AM_WRITENOP // Horizontal synchronization register
AM_RANGE(0x760000, 0x760001) AM_WRITENOP // Vertical synchronization register
AM_RANGE(0x770000, 0x770001) AM_WRITENOP // Video synchronization switch
- AM_RANGE(0x780000, 0x7fffff) AM_DEVREADWRITE("tile", segas24_tile, char_r, char_w)
+ AM_RANGE(0x780000, 0x7fffff) AM_DEVREADWRITE("tile", segas24_tile_device, char_r, char_w)
AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(p_w) AM_SHARE("palette")
AM_RANGE(0x910000, 0x91bfff) AM_RAM AM_SHARE("color_xlat")
@@ -914,12 +914,12 @@ static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16, model1_state )
AM_RANGE(0x610000, 0x61ffff) AM_RAM_WRITE(md1_w) AM_SHARE("display_list1")
AM_RANGE(0x680000, 0x680003) AM_READWRITE(model1_listctl_r, model1_listctl_w)
- AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE("tile", segas24_tile, tile_r, tile_w)
+ AM_RANGE(0x700000, 0x70ffff) AM_DEVREADWRITE("tile", segas24_tile_device, tile_r, tile_w)
AM_RANGE(0x720000, 0x720001) AM_WRITENOP // Unknown, always 0
AM_RANGE(0x740000, 0x740001) AM_WRITENOP // Horizontal synchronization register
AM_RANGE(0x760000, 0x760001) AM_WRITENOP // Vertical synchronization register
AM_RANGE(0x770000, 0x770001) AM_WRITENOP // Video synchronization switch
- AM_RANGE(0x780000, 0x7fffff) AM_DEVREADWRITE("tile", segas24_tile, char_r, char_w)
+ AM_RANGE(0x780000, 0x7fffff) AM_DEVREADWRITE("tile", segas24_tile_device, char_r, char_w)
AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(p_w) AM_SHARE("palette")
AM_RANGE(0x910000, 0x91bfff) AM_RAM AM_SHARE("color_xlat")
@@ -1598,7 +1598,7 @@ ROM_START( netmerc )
ROM_LOAD( "u2", 0x4000, 0x4000, CRC(c589f428) SHA1(98dc0114a5f89636b4e237ed954e19f1cfd186ab) )
ROM_END
-static MACHINE_CONFIG_START( model1, model1_state )
+static MACHINE_CONFIG_START( model1 )
MCFG_CPU_ADD("maincpu", V60, 16000000)
MCFG_CPU_PROGRAM_MAP(model1_mem)
MCFG_CPU_IO_MAP(model1_io)
@@ -1649,7 +1649,7 @@ static MACHINE_CONFIG_DERIVED(swa, model1)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE(DSBZ80_TAG, dsbz80_device, write_txd))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( model1_vr, model1_state )
+static MACHINE_CONFIG_START( model1_vr )
MCFG_CPU_ADD("maincpu", V60, 16000000)
MCFG_CPU_PROGRAM_MAP(model1_vr_mem)
MCFG_CPU_IO_MAP(model1_vr_io)
@@ -1758,12 +1758,12 @@ WRITE16_MEMBER(model1_state::r360_w)
}
}
-GAME( 1993, vf, 0, model1, vf, driver_device, 0, ROT0, "Sega", "Virtua Fighter", MACHINE_IMPERFECT_GRAPHICS )
-GAMEL(1992, vr, 0, model1_vr, vr, driver_device, 0, ROT0, "Sega", "Virtua Racing", MACHINE_IMPERFECT_GRAPHICS, layout_vr )
-GAME( 1993, vformula, vr, model1_vr, vr, driver_device, 0, ROT0, "Sega", "Virtua Formula", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, swa, 0, swa, swa, driver_device, 0, ROT0, "Sega", "Star Wars Arcade", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1994, wingwar, 0, model1, wingwar, driver_device, 0, ROT0, "Sega", "Wing War (World)", MACHINE_NOT_WORKING )
-GAME( 1994, wingwaru, wingwar, model1, wingwar, driver_device, 0, ROT0, "Sega", "Wing War (US)", MACHINE_NOT_WORKING )
-GAME( 1994, wingwarj, wingwar, model1, wingwar, driver_device, 0, ROT0, "Sega", "Wing War (Japan)", MACHINE_NOT_WORKING )
+GAME( 1993, vf, 0, model1, vf, model1_state, 0, ROT0, "Sega", "Virtua Fighter", MACHINE_IMPERFECT_GRAPHICS )
+GAMEL(1992, vr, 0, model1_vr, vr, model1_state, 0, ROT0, "Sega", "Virtua Racing", MACHINE_IMPERFECT_GRAPHICS, layout_vr )
+GAME( 1993, vformula, vr, model1_vr, vr, model1_state, 0, ROT0, "Sega", "Virtua Formula", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, swa, 0, swa, swa, model1_state, 0, ROT0, "Sega", "Star Wars Arcade", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1994, wingwar, 0, model1, wingwar, model1_state, 0, ROT0, "Sega", "Wing War (World)", MACHINE_NOT_WORKING )
+GAME( 1994, wingwaru, wingwar, model1, wingwar, model1_state, 0, ROT0, "Sega", "Wing War (US)", MACHINE_NOT_WORKING )
+GAME( 1994, wingwarj, wingwar, model1, wingwar, model1_state, 0, ROT0, "Sega", "Wing War (Japan)", MACHINE_NOT_WORKING )
GAME( 1994, wingwar360, wingwar, model1, wingwar, model1_state, wingwar360, ROT0, "Sega", "Wing War R360 (US)", MACHINE_NOT_WORKING )
-GAME( 1993, netmerc, 0, model1, vf, driver_device, 0, ROT0, "Sega", "NetMerc?", MACHINE_NOT_WORKING )
+GAME( 1993, netmerc, 0, model1, vf, model1_state, 0, ROT0, "Sega", "NetMerc?", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index 3c0eddcf62f..8111224e35a 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -1485,12 +1485,12 @@ static ADDRESS_MAP_START( model2_base_mem, AS_PROGRAM, 32, model2_state )
AM_RANGE(0x00f00000, 0x00f0000f) AM_READWRITE(timers_r, timers_w)
- AM_RANGE(0x01000000, 0x0100ffff) AM_DEVREADWRITE("tile", segas24_tile, tile32_r, tile32_w) AM_MIRROR(0x110000)
+ AM_RANGE(0x01000000, 0x0100ffff) AM_DEVREADWRITE("tile", segas24_tile_device, tile32_r, tile32_w) AM_MIRROR(0x110000)
AM_RANGE(0x01020000, 0x01020003) AM_WRITENOP AM_MIRROR(0x100000) // Unknown, always 0
AM_RANGE(0x01040000, 0x01040003) AM_WRITENOP AM_MIRROR(0x100000) // Horizontal synchronization register
AM_RANGE(0x01060000, 0x01060003) AM_WRITENOP AM_MIRROR(0x100000) // Vertical synchronization register
AM_RANGE(0x01070000, 0x01070003) AM_WRITENOP AM_MIRROR(0x100000) // Video synchronization switch
- AM_RANGE(0x01080000, 0x010fffff) AM_DEVREADWRITE("tile", segas24_tile, char32_r, char32_w) AM_MIRROR(0x100000)
+ AM_RANGE(0x01080000, 0x010fffff) AM_DEVREADWRITE("tile", segas24_tile_device, char32_r, char32_w) AM_MIRROR(0x100000)
AM_RANGE(0x01800000, 0x01803fff) AM_READWRITE16(model2_palette_r,model2_palette_w,0xffffffff)
AM_RANGE(0x01810000, 0x0181bfff) AM_RAM AM_SHARE("colorxlat")
@@ -2371,7 +2371,7 @@ ADDRESS_MAP_END
#define VIDEO_CLOCK XTAL_32MHz
/* original Model 2 */
-static MACHINE_CONFIG_START( model2o, model2_state )
+static MACHINE_CONFIG_START( model2o )
MCFG_CPU_ADD("maincpu", I960, 25000000)
MCFG_CPU_PROGRAM_MAP(model2o_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1)
@@ -2474,7 +2474,7 @@ static MACHINE_CONFIG_DERIVED( daytona, model2o )
MACHINE_CONFIG_END
/* 2A-CRX */
-static MACHINE_CONFIG_START( model2a, model2_state )
+static MACHINE_CONFIG_START( model2a )
MCFG_CPU_ADD("maincpu", I960, 25000000)
MCFG_CPU_PROGRAM_MAP(model2a_crx_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1)
@@ -2561,7 +2561,7 @@ static MACHINE_CONFIG_DERIVED( srallyc, model2a )
MACHINE_CONFIG_END
/* 2B-CRX */
-static MACHINE_CONFIG_START( model2b, model2_state )
+static MACHINE_CONFIG_START( model2b )
MCFG_CPU_ADD("maincpu", I960, 25000000)
MCFG_CPU_PROGRAM_MAP(model2b_crx_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2_interrupt, "screen", 0, 1)
@@ -2658,7 +2658,7 @@ static ADDRESS_MAP_START( copro_tgpx4_map, AS_PROGRAM, 64, model2_state )
ADDRESS_MAP_END
/* 2C-CRX */
-static MACHINE_CONFIG_START( model2c, model2_state )
+static MACHINE_CONFIG_START( model2c )
MCFG_CPU_ADD("maincpu", I960, 25000000)
MCFG_CPU_PROGRAM_MAP(model2c_crx_mem)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", model2_state, model2c_interrupt, "screen", 0, 1)
@@ -6167,71 +6167,71 @@ GAME( 1993, daytonas, daytona, daytona, daytona, model2_state, srallyc, ROT0,
GAME( 1993, daytonat, daytona, daytona, daytona, model2_state, srallyc, ROT0, "Sega", "Daytona USA (Japan, Turbo hack, set 1)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1993, daytonata, daytona, daytona, daytona, model2_state, srallyc, ROT0, "Sega", "Daytona USA (Japan, Turbo hack, set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
GAME( 1993, daytonam, daytona, daytona, daytona, model2_state, daytonam, ROT0, "Sega", "Daytona USA (Japan, To The MAXX)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, desert, 0, model2o, desert, driver_device, 0, ROT0, "Sega / Martin Marietta", "Desert Tank", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, vcop, 0, model2o, vcop, driver_device, 0, ROT0, "Sega", "Virtua Cop (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, vcopa, vcop, model2o, vcop, driver_device, 0, ROT0, "Sega", "Virtua Cop (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, desert, 0, model2o, desert, model2_state, 0, ROT0, "Sega / Martin Marietta", "Desert Tank", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, vcop, 0, model2o, vcop, model2_state, 0, ROT0, "Sega", "Virtua Cop (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, vcopa, vcop, model2o, vcop, model2_state, 0, ROT0, "Sega", "Virtua Cop (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
// Model 2A-CRX (TGPs, SCSP sound board)
-GAME( 1995, manxtt, 0, manxttdx, manxtt, driver_device, 0, ROT0, "Sega", "Manx TT Superbike - DX (Revision D)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, manxttc, 0, model2a, manxtt, driver_device, 0, ROT0, "Sega", "Manx TT Superbike - Twin (Revision C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, srallyc, 0, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - TWIN/DX (Revision C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, srallycb, srallyc, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - TWIN/DX (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, srallycdx, srallyc, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - DX (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, srallycdxa,srallyc, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - DX", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, vf2, 0, model2a, model2, driver_device, 0, ROT0, "Sega", "Virtua Fighter 2 (Version 2.1)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, vf2b, vf2, model2a, model2, driver_device, 0, ROT0, "Sega", "Virtua Fighter 2 (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, vf2a, vf2, model2a, model2, driver_device, 0, ROT0, "Sega", "Virtua Fighter 2 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, vf2o, vf2, model2a, model2, driver_device, 0, ROT0, "Sega", "Virtua Fighter 2", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, vcop2, 0, model2a, vcop2, driver_device, 0, ROT0, "Sega", "Virtua Cop 2", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, skytargt, 0, model2a, skytargt, driver_device, 0, ROT0, "Sega", "Sky Target", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, doaa, doa, model2a_0229, model2, model2_state, doa, ROT0, "Sega", "Dead or Alive (Model 2A, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, zeroguna, zerogun, model2a_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Export, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, zerogunaj, zerogun, model2a_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Japan, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, motoraid, 0, model2a, manxtt, driver_device, 0, ROT0, "Sega", "Motor Raid - Twin", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, dynamcop, 0, model2a_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (Export, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, dyndeka2, dynamcop, model2a_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Deka 2 (Japan, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, pltkidsa, pltkids, model2a_5881, model2, model2_state, pltkids, ROT0, "Psikyo", "Pilot Kids (Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, manxtt, 0, manxttdx, manxtt, model2_state, 0, ROT0, "Sega", "Manx TT Superbike - DX (Revision D)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, manxttc, 0, model2a, manxtt, model2_state, 0, ROT0, "Sega", "Manx TT Superbike - Twin (Revision C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, srallyc, 0, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - TWIN/DX (Revision C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, srallycb, srallyc, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - TWIN/DX (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, srallycdx, srallyc, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - DX (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, srallycdxa,srallyc, srallyc, srallyc, model2_state, srallyc, ROT0, "Sega", "Sega Rally Championship - DX", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, vf2, 0, model2a, model2, model2_state, 0, ROT0, "Sega", "Virtua Fighter 2 (Version 2.1)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, vf2b, vf2, model2a, model2, model2_state, 0, ROT0, "Sega", "Virtua Fighter 2 (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, vf2a, vf2, model2a, model2, model2_state, 0, ROT0, "Sega", "Virtua Fighter 2 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, vf2o, vf2, model2a, model2, model2_state, 0, ROT0, "Sega", "Virtua Fighter 2", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, vcop2, 0, model2a, vcop2, model2_state, 0, ROT0, "Sega", "Virtua Cop 2", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, skytargt, 0, model2a, skytargt, model2_state, 0, ROT0, "Sega", "Sky Target", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, doaa, doa, model2a_0229, model2, model2_state, doa, ROT0, "Sega", "Dead or Alive (Model 2A, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, zeroguna, zerogun, model2a_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Export, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, zerogunaj, zerogun, model2a_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Japan, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, motoraid, 0, model2a, manxtt, model2_state, 0, ROT0, "Sega", "Motor Raid - Twin", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, dynamcop, 0, model2a_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (Export, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, dyndeka2, dynamcop, model2a_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Deka 2 (Japan, Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, pltkidsa, pltkids, model2a_5881, model2, model2_state, pltkids, ROT0, "Psikyo", "Pilot Kids (Model 2A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
// Model 2B-CRX (SHARC, SCSP sound board)
-GAME( 1994, vstriker, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Virtua Striker (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, vstrikero,vstriker, model2b, model2, driver_device, 0, ROT0, "Sega", "Virtua Striker", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, fvipers, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Fighting Vipers (Revision D)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, gunblade, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Gunblade NY (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, indy500, 0, model2b, srallyc, driver_device, 0, ROT0, "Sega", "INDY 500 Twin (Revision A, Newer)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, indy500d, indy500, model2b, srallyc, driver_device, 0, ROT0, "Sega", "INDY 500 Deluxe (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, indy500to, indy500, model2b, srallyc, driver_device, 0, ROT0, "Sega", "INDY 500 Twin (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, schamp, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Sonic Championship (USA)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, sfight, schamp, model2b, model2, driver_device, 0, ROT0, "Sega", "Sonic the Fighters (Japan)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, lastbrnx, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Last Bronx (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, lastbrnxu,lastbrnx, model2b, model2, driver_device, 0, ROT0, "Sega", "Last Bronx (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, lastbrnxj,lastbrnx, model2b, model2, driver_device, 0, ROT0, "Sega", "Last Bronx (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, doa, 0, model2b_0229, model2, model2_state, doa, ROT0, "Sega", "Dead or Alive (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, sgt24h, 0, model2b, srallyc, model2_state, sgt24h, ROT0, "Jaleco", "Super GT 24h", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, von, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Cyber Troopers Virtual-On (USA, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, vonj, von, model2b, model2, driver_device, 0, ROT0, "Sega", "Cyber Troopers Virtual-On (Japan, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, dynabb, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Dynamite Baseball", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, dynabb97, 0, model2b, model2, driver_device, 0, ROT0, "Sega", "Dynamite Baseball 97 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, overrevb, overrev, model2b, srallyc, driver_device, 0, ROT0, "Jaleco", "Over Rev (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, zerogun, 0, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, zerogunj, zerogun, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Japan, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, dynamcopb,dynamcop, model2b_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, dyndeka2b,dynamcop, model2b_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Deka 2 (Japan, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, pltkids, 0, model2b_5881, model2, model2_state, pltkids, ROT0, "Psikyo", "Pilot Kids (Model 2B, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, rchase2, 0, rchase2, rchase2, model2_state, rchase2, ROT0, "Sega", "Rail Chase 2 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, vstriker, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Virtua Striker (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, vstrikero,vstriker, model2b, model2, model2_state, 0, ROT0, "Sega", "Virtua Striker", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, fvipers, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Fighting Vipers (Revision D)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, gunblade, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Gunblade NY (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, indy500, 0, model2b, srallyc, model2_state, 0, ROT0, "Sega", "INDY 500 Twin (Revision A, Newer)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, indy500d, indy500, model2b, srallyc, model2_state, 0, ROT0, "Sega", "INDY 500 Deluxe (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, indy500to, indy500, model2b, srallyc, model2_state, 0, ROT0, "Sega", "INDY 500 Twin (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, schamp, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Sonic Championship (USA)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, sfight, schamp, model2b, model2, model2_state, 0, ROT0, "Sega", "Sonic the Fighters (Japan)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, lastbrnx, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Last Bronx (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, lastbrnxu,lastbrnx, model2b, model2, model2_state, 0, ROT0, "Sega", "Last Bronx (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, lastbrnxj,lastbrnx, model2b, model2, model2_state, 0, ROT0, "Sega", "Last Bronx (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, doa, 0, model2b_0229, model2, model2_state, doa, ROT0, "Sega", "Dead or Alive (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, sgt24h, 0, model2b, srallyc, model2_state, sgt24h, ROT0, "Jaleco", "Super GT 24h", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, von, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Cyber Troopers Virtual-On (USA, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, vonj, von, model2b, model2, model2_state, 0, ROT0, "Sega", "Cyber Troopers Virtual-On (Japan, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, dynabb, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Dynamite Baseball", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, dynabb97, 0, model2b, model2, model2_state, 0, ROT0, "Sega", "Dynamite Baseball 97 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, overrevb, overrev, model2b, srallyc, model2_state, 0, ROT0, "Jaleco", "Over Rev (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, zerogun, 0, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, zerogunj, zerogun, model2b_5881, model2, model2_state, zerogun, ROT0, "Psikyo", "Zero Gunner (Japan, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, dynamcopb,dynamcop, model2b_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (Export, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, dyndeka2b,dynamcop, model2b_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Deka 2 (Japan, Model 2B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, pltkids, 0, model2b_5881, model2, model2_state, pltkids, ROT0, "Psikyo", "Pilot Kids (Model 2B, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, rchase2, 0, rchase2, rchase2, model2_state, rchase2, ROT0, "Sega", "Rail Chase 2 (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
// Model 2C-CRX (TGPx4, SCSP sound board)
-GAME( 1996, skisuprg, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Sega Ski Super G", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS|MACHINE_UNEMULATED_PROTECTION )
-GAME( 1996, stcc, 0, stcc, model2, driver_device, 0, ROT0, "Sega", "Sega Touring Car Championship", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, stccb, stcc, stcc, model2, driver_device, 0, ROT0, "Sega", "Sega Touring Car Championship (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, stcca, stcc, stcc, model2, driver_device, 0, ROT0, "Sega", "Sega Touring Car Championship (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, waverunr, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Wave Runner (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, hotd, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "House of the Dead", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, overrev, 0, model2c, srallyc, driver_device, 0, ROT0, "Jaleco", "Over Rev (Model 2C, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, rascot2, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Royal Ascot II", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, segawski, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Sega Water Ski (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, topskatr, 0, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, topskatru,topskatr, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, topskatruo,topskatr,model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (USA)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, topskatrj,topskatr, model2c, model2, driver_device, 0, ROT0, "Sega", "Top Skater (Japan)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, bel, 0, model2c, bel, driver_device, 0, ROT0, "Sega / EPL Productions", "Behind Enemy Lines", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, dynamcopc,dynamcop, model2c_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (USA, Model 2C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, skisuprg, 0, model2c, model2, model2_state, 0, ROT0, "Sega", "Sega Ski Super G", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS|MACHINE_UNEMULATED_PROTECTION )
+GAME( 1996, stcc, 0, stcc, model2, model2_state, 0, ROT0, "Sega", "Sega Touring Car Championship", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, stccb, stcc, stcc, model2, model2_state, 0, ROT0, "Sega", "Sega Touring Car Championship (Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, stcca, stcc, stcc, model2, model2_state, 0, ROT0, "Sega", "Sega Touring Car Championship (Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, waverunr, 0, model2c, model2, model2_state, 0, ROT0, "Sega", "Wave Runner (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, hotd, 0, model2c, model2, model2_state, 0, ROT0, "Sega", "House of the Dead", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, overrev, 0, model2c, srallyc, model2_state, 0, ROT0, "Jaleco", "Over Rev (Model 2C, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, rascot2, 0, model2c, model2, model2_state, 0, ROT0, "Sega", "Royal Ascot II", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, segawski, 0, model2c, model2, model2_state, 0, ROT0, "Sega", "Sega Water Ski (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, topskatr, 0, model2c, model2, model2_state, 0, ROT0, "Sega", "Top Skater (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, topskatru,topskatr, model2c, model2, model2_state, 0, ROT0, "Sega", "Top Skater (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, topskatruo,topskatr,model2c, model2, model2_state, 0, ROT0, "Sega", "Top Skater (USA)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, topskatrj,topskatr, model2c, model2, model2_state, 0, ROT0, "Sega", "Top Skater (Japan)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, bel, 0, model2c, bel, model2_state, 0, ROT0, "Sega / EPL Productions", "Behind Enemy Lines", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, dynamcopc,dynamcop, model2c_5881, model2, model2_state, genprot, ROT0, "Sega", "Dynamite Cop (USA, Model 2C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp
index 3113d0b8fbd..a98a8ebae7c 100644
--- a/src/mame/drivers/model3.cpp
+++ b/src/mame/drivers/model3.cpp
@@ -1073,28 +1073,28 @@ READ64_MEMBER(model3_state::scsi_r)
int reg = offset*8;
uint64_t r = 0;
if (ACCESSING_BITS_56_63) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+0) << 56;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+0) << 56;
}
if (ACCESSING_BITS_48_55) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+1) << 48;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+1) << 48;
}
if (ACCESSING_BITS_40_47) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+2) << 40;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+2) << 40;
}
if (ACCESSING_BITS_32_39) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+3) << 32;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+3) << 32;
}
if (ACCESSING_BITS_24_31) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+4) << 24;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+4) << 24;
}
if (ACCESSING_BITS_16_23) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+5) << 16;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+5) << 16;
}
if (ACCESSING_BITS_8_15) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+6) << 8;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+6) << 8;
}
if (ACCESSING_BITS_0_7) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+7) << 0;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+7) << 0;
}
return r;
@@ -1104,28 +1104,28 @@ WRITE64_MEMBER(model3_state::scsi_w)
{
int reg = offset*8;
if (ACCESSING_BITS_56_63) {
- m_lsi53c810->lsi53c810_reg_w(reg+0, data >> 56);
+ m_lsi53c810->reg_w(reg+0, data >> 56);
}
if (ACCESSING_BITS_48_55) {
- m_lsi53c810->lsi53c810_reg_w(reg+1, data >> 48);
+ m_lsi53c810->reg_w(reg+1, data >> 48);
}
if (ACCESSING_BITS_40_47) {
- m_lsi53c810->lsi53c810_reg_w(reg+2, data >> 40);
+ m_lsi53c810->reg_w(reg+2, data >> 40);
}
if (ACCESSING_BITS_32_39) {
- m_lsi53c810->lsi53c810_reg_w(reg+3, data >> 32);
+ m_lsi53c810->reg_w(reg+3, data >> 32);
}
if (ACCESSING_BITS_24_31) {
- m_lsi53c810->lsi53c810_reg_w(reg+4, data >> 24);
+ m_lsi53c810->reg_w(reg+4, data >> 24);
}
if (ACCESSING_BITS_16_23) {
- m_lsi53c810->lsi53c810_reg_w(reg+5, data >> 16);
+ m_lsi53c810->reg_w(reg+5, data >> 16);
}
if (ACCESSING_BITS_8_15) {
- m_lsi53c810->lsi53c810_reg_w(reg+6, data >> 8);
+ m_lsi53c810->reg_w(reg+6, data >> 8);
}
if (ACCESSING_BITS_0_7) {
- m_lsi53c810->lsi53c810_reg_w(reg+7, data >> 0);
+ m_lsi53c810->reg_w(reg+7, data >> 0);
}
}
@@ -5701,7 +5701,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(model3_state::model3_interrupt)
}
}
-static MACHINE_CONFIG_START( model3_10, model3_state )
+static MACHINE_CONFIG_START( model3_10 )
MCFG_CPU_ADD("maincpu", PPC603E, 66000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 1, Bus = 66MHz, Core = 66MHz */
MCFG_CPU_PROGRAM_MAP(model3_10_mem)
@@ -5749,7 +5749,7 @@ static MACHINE_CONFIG_START( model3_10, model3_state )
MCFG_LEGACY_SCSI_PORT("scsi")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( model3_15, model3_state )
+static MACHINE_CONFIG_START( model3_15 )
MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
MCFG_CPU_PROGRAM_MAP(model3_mem)
@@ -5810,7 +5810,7 @@ static MACHINE_CONFIG_DERIVED(scud, model3_15)
MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START(model3_20, model3_state)
+static MACHINE_CONFIG_START(model3_20)
MCFG_CPU_ADD("maincpu", PPC603R, 166000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 2.5, Bus = 66MHz, Core = 166MHz */
MCFG_CPU_PROGRAM_MAP(model3_mem)
@@ -5855,7 +5855,7 @@ static MACHINE_CONFIG_DERIVED(model3_20_5881, model3_20)
MCFG_SET_READ_CALLBACK(model3_state, crypt_read_callback)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START(model3_21, model3_state)
+static MACHINE_CONFIG_START(model3_21)
MCFG_CPU_ADD("maincpu", PPC603R, 166000000)
MCFG_PPC_BUS_FREQUENCY(66000000) /* Multiplier 2.5, Bus = 66MHz, Core = 166MHz */
MCFG_CPU_PROGRAM_MAP(model3_mem)
diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp
index dac0082e9a7..c7f08e01522 100644
--- a/src/mame/drivers/modellot.cpp
+++ b/src/mame/drivers/modellot.cpp
@@ -35,7 +35,7 @@ public:
DECLARE_READ8_MEMBER(port77_r);
DECLARE_READ8_MEMBER(portff_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
uint32_t screen_update_modellot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
private:
@@ -77,7 +77,7 @@ READ8_MEMBER( modellot_state::portff_r)
return data;
}
-WRITE8_MEMBER( modellot_state::kbd_put )
+void modellot_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -149,7 +149,7 @@ uint32_t modellot_state::screen_update_modellot(screen_device &screen, bitmap_in
return 0;
}
-static MACHINE_CONFIG_START( modellot, modellot_state )
+static MACHINE_CONFIG_START( modellot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(modellot_mem)
@@ -169,7 +169,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state )
/* Devices */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(modellot_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(modellot_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -187,4 +187,4 @@ ROM_START( modellot )
ROM_END
/* Driver */
-COMP( 1979, modellot, 0, 0, modellot, modellot, driver_device, 0, "General Processor", "Modello T", MACHINE_IS_SKELETON)
+COMP( 1979, modellot, 0, 0, modellot, modellot, modellot_state, 0, "General Processor", "Modello T", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp
index e52e3af829c..6f11bb8e5b9 100644
--- a/src/mame/drivers/mogura.cpp
+++ b/src/mame/drivers/mogura.cpp
@@ -202,7 +202,7 @@ void mogura_state::machine_start()
{
}
-static MACHINE_CONFIG_START( mogura, mogura_state )
+static MACHINE_CONFIG_START( mogura )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,3000000) /* 3 MHz */
@@ -241,4 +241,4 @@ ROM_START( mogura )
ROM_LOAD( "gx141.7j", 0x00, 0x20, CRC(b21c5d5f) SHA1(6913c840dd69a7d4687f4c4cbe3ff12300f62bc2) )
ROM_END
-GAME( 1991, mogura, 0, mogura, mogura, driver_device, 0, ROT0, "Konami", "Mogura Desse (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mogura, 0, mogura, mogura, mogura_state, 0, ROT0, "Konami", "Mogura Desse (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp
index 8e3e218c493..a2cbc39e50d 100644
--- a/src/mame/drivers/mole.cpp
+++ b/src/mame/drivers/mole.cpp
@@ -317,7 +317,7 @@ void mole_state::machine_reset()
m_tile_bank = 0;
}
-static MACHINE_CONFIG_START( mole, mole_state )
+static MACHINE_CONFIG_START( mole )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 4000000) // ???
@@ -372,4 +372,4 @@ ROM_END
*
*************************************/
-GAME( 1982, mole, 0, mole, mole, driver_device, 0, ROT0, "Yachiyo Electronics, Ltd.", "Mole Attack", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mole, 0, mole, mole, mole_state, 0, ROT0, "Yachiyo Electronics, Ltd.", "Mole Attack", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp
index 1439eabf44b..ed9ed2f395d 100644
--- a/src/mame/drivers/molecular.cpp
+++ b/src/mame/drivers/molecular.cpp
@@ -284,7 +284,7 @@ PALETTE_INIT_MEMBER(molecula_state, molecula)
{
}
-static MACHINE_CONFIG_START( molecula, molecula_state )
+static MACHINE_CONFIG_START( molecula )
/* basic machine hardware */
MCFG_CPU_ADD("filecpu",Z80,Z80_CLOCK/2)
@@ -355,4 +355,4 @@ ROM_START( molecula )
ROM_LOAD( "wait_16r4.jed", 0x000000, 0x00caef, CRC(3aacfeb4) SHA1(1af1a8046e5a8a0337c85b55adceaef6e45702b7) )
ROM_END
-COMP( 1982, molecula, 0, 0, molecula, molecula, driver_device, 0, "MOLECULAR", "MOLECULAR Computer", MACHINE_IS_SKELETON )
+COMP( 1982, molecula, 0, 0, molecula, molecula, molecula_state, 0, "MOLECULAR", "MOLECULAR Computer", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp
index 1fedaa73dda..462f35174a0 100644
--- a/src/mame/drivers/momoko.cpp
+++ b/src/mame/drivers/momoko.cpp
@@ -253,7 +253,7 @@ void momoko_state::machine_reset()
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( momoko, momoko_state )
+static MACHINE_CONFIG_START( momoko )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/2) /* 5.0MHz */
@@ -423,6 +423,6 @@ ROM_START( momokob ) // bootleg board, almost exact copy of an original one
ROM_LOAD( "momoko-b.bin", 0x0100, 0x0020, CRC(427b0e5c) SHA1(aa2797b899571527cc96013fd3420b841954ee67) )
ROM_END
-GAME( 1986, momoko, 0, momoko, momoko, driver_device, 0, ROT0, "Jaleco", "Momoko 120% (Japanese text)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, momokoe, momoko, momoko, momoko, driver_device, 0, ROT0, "Jaleco", "Momoko 120% (English text)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, momokob, momoko, momoko, momoko, driver_device, 0, ROT0, "bootleg", "Momoko 120% (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, momoko, 0, momoko, momoko, momoko_state, 0, ROT0, "Jaleco", "Momoko 120% (Japanese text)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, momokoe, momoko, momoko, momoko, momoko_state, 0, ROT0, "Jaleco", "Momoko 120% (English text)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, momokob, momoko, momoko, momoko, momoko_state, 0, ROT0, "bootleg", "Momoko 120% (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/monacogp.cpp b/src/mame/drivers/monacogp.cpp
index 768e9978939..16946be8c6d 100644
--- a/src/mame/drivers/monacogp.cpp
+++ b/src/mame/drivers/monacogp.cpp
@@ -142,7 +142,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -185,7 +185,7 @@ void monacogp_state::video_start()
{
}
-static MACHINE_CONFIG_START( monacogp, monacogp_state )
+static MACHINE_CONFIG_START( monacogp )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -269,5 +269,5 @@ ROM_END
-GAME( 1980, monacogp, 0, monacogp, 0, driver_device, 0, ROT0, "Sega", "Monaco GP (Set 1) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1980, monacogpa, monacogp, monacogp, 0, driver_device, 0, ROT0, "Sega", "Monaco GP (Set 2) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1980, monacogp, 0, monacogp, 0, monacogp_state, 0, ROT0, "Sega", "Monaco GP (Set 1) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1980, monacogpa, monacogp, monacogp, 0, monacogp_state, 0, ROT0, "Sega", "Monaco GP (Set 2) [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp
index f8dc3071cdc..813bb724a32 100644
--- a/src/mame/drivers/monty.cpp
+++ b/src/mame/drivers/monty.cpp
@@ -237,7 +237,7 @@ SED1520_UPDATE_CB(monty_screen_update)
// TODO: Additional machine definition - Master Monty has a different memory layout
-static MACHINE_CONFIG_START( monty, monty_state )
+static MACHINE_CONFIG_START( monty )
// Basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 3580000) // Ceramic resonator labeled 3.58MT
MCFG_CPU_PROGRAM_MAP(monty_mem)
@@ -285,6 +285,6 @@ ROM_END
// Drivers
-// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
-COMP( 1980, monty, 0, 0, monty, monty, driver_device, 0, "Ritam", "Monty Plays Scrabble", MACHINE_NOT_WORKING )
-COMP( 1982, mmonty, 0, 0, mmonty, monty, driver_device, 0, "Ritam", "Master Monty", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, monty, 0, 0, monty, monty, monty_state, 0, "Ritam", "Monty Plays Scrabble", MACHINE_NOT_WORKING )
+COMP( 1982, mmonty, 0, 0, mmonty, monty, monty_state, 0, "Ritam", "Master Monty", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp
index 286c10d735e..a01a10379ae 100644
--- a/src/mame/drivers/monzagp.cpp
+++ b/src/mame/drivers/monzagp.cpp
@@ -483,7 +483,7 @@ static GFXDECODE_START( monzagp )
GFXDECODE_ENTRY( "gfx3", 0x0000, tile_layout, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( monzagp, monzagp_state )
+static MACHINE_CONFIG_START( monzagp )
MCFG_CPU_ADD("maincpu", I8035, 12000000/4) /* 400KHz ??? - Main board Crystal is 12MHz */
MCFG_CPU_PROGRAM_MAP(monzagp_map)
MCFG_CPU_IO_MAP(monzagp_io)
@@ -585,5 +585,5 @@ ROM_START( monzagpb )
ROM_END
-GAMEL( 1981, monzagp, 0, monzagp, monzagp, driver_device, 0, ROT270, "Olympia", "Monza GP", MACHINE_NOT_WORKING|MACHINE_NO_SOUND, layout_monzagp )
-GAMEL( 1981, monzagpb, monzagp, monzagp, monzagp, driver_device, 0, ROT270, "bootleg", "Monza GP (bootleg)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND, layout_monzagp )
+GAMEL( 1981, monzagp, 0, monzagp, monzagp, monzagp_state, 0, ROT270, "Olympia", "Monza GP", MACHINE_NOT_WORKING|MACHINE_NO_SOUND, layout_monzagp )
+GAMEL( 1981, monzagpb, monzagp, monzagp, monzagp, monzagp_state, 0, ROT270, "bootleg", "Monza GP (bootleg)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND, layout_monzagp )
diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp
index 6a877cae264..d0b6f02105d 100644
--- a/src/mame/drivers/moo.cpp
+++ b/src/mame/drivers/moo.cpp
@@ -490,7 +490,7 @@ MACHINE_RESET_MEMBER(moo_state,moo)
m_sprite_colorbase = 0;
}
-static MACHINE_CONFIG_START( moo, moo_state )
+static MACHINE_CONFIG_START( moo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // 16MHz verified
@@ -552,7 +552,7 @@ static MACHINE_CONFIG_START( moo, moo_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( moobl, moo_state )
+static MACHINE_CONFIG_START( moobl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16100000)
@@ -597,7 +597,7 @@ static MACHINE_CONFIG_START( moobl, moo_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -999,13 +999,13 @@ ROM_START( moomesabl )
ROM_END
-GAME( 1992, moomesa, 0, moo, moo, driver_device, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver EAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, moomesauac, moomesa, moo, moo, driver_device, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver UAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, moomesauab, moomesa, moo, moo, driver_device, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, moomesaaab, moomesa, moo, moo, driver_device, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver AAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, moomesabl, moomesa, moobl, moo, driver_device, 0, ROT0, "bootleg", "Wild West C.O.W.-Boys of Moo Mesa (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // based on Version AA
-GAME( 1992, bucky, 0, bucky, bucky, driver_device, 0, ROT0, "Konami", "Bucky O'Hare (ver EAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, buckyea, bucky, bucky, bucky, driver_device, 0, ROT0, "Konami", "Bucky O'Hare (ver EA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, buckyjaa, bucky, bucky, bucky, driver_device, 0, ROT0, "Konami", "Bucky O'Hare (ver JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, buckyuab, bucky, bucky, bucky, driver_device, 0, ROT0, "Konami", "Bucky O'Hare (ver UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, buckyaab, bucky, bucky, bucky, driver_device, 0, ROT0, "Konami", "Bucky O'Hare (ver AAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, moomesa, 0, moo, moo, moo_state, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver EAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, moomesauac, moomesa, moo, moo, moo_state, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver UAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, moomesauab, moomesa, moo, moo, moo_state, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, moomesaaab, moomesa, moo, moo, moo_state, 0, ROT0, "Konami", "Wild West C.O.W.-Boys of Moo Mesa (ver AAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, moomesabl, moomesa, moobl, moo, moo_state, 0, ROT0, "bootleg", "Wild West C.O.W.-Boys of Moo Mesa (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // based on Version AA
+GAME( 1992, bucky, 0, bucky, bucky, moo_state, 0, ROT0, "Konami", "Bucky O'Hare (ver EAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, buckyea, bucky, bucky, bucky, moo_state, 0, ROT0, "Konami", "Bucky O'Hare (ver EA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, buckyjaa, bucky, bucky, bucky, moo_state, 0, ROT0, "Konami", "Bucky O'Hare (ver JAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, buckyuab, bucky, bucky, bucky, moo_state, 0, ROT0, "Konami", "Bucky O'Hare (ver UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, buckyaab, bucky, bucky, bucky, moo_state, 0, ROT0, "Konami", "Bucky O'Hare (ver AAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp
index fa8284734a6..d3b31481093 100644
--- a/src/mame/drivers/mosaic.cpp
+++ b/src/mame/drivers/mosaic.cpp
@@ -246,7 +246,7 @@ void mosaic_state::machine_reset()
m_prot_val = 0;
}
-static MACHINE_CONFIG_START( mosaic, mosaic_state )
+static MACHINE_CONFIG_START( mosaic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, 7000000) /* ??? */
@@ -344,6 +344,6 @@ ROM_END
-GAME( 1990, mosaic, 0, mosaic, mosaic, driver_device, 0, ROT0, "Space", "Mosaic", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mosaica, mosaic, mosaic, mosaic, driver_device, 0, ROT0, "Space (Fuuki license)", "Mosaic (Fuuki)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, gfire2, 0, gfire2, gfire2, driver_device, 0, ROT0, "Topis Corp", "Golden Fire II", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mosaic, 0, mosaic, mosaic, mosaic_state, 0, ROT0, "Space", "Mosaic", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mosaica, mosaic, mosaic, mosaic, mosaic_state, 0, ROT0, "Space (Fuuki license)", "Mosaic (Fuuki)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, gfire2, 0, gfire2, gfire2, mosaic_state, 0, ROT0, "Topis Corp", "Golden Fire II", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp
index d1a096749f5..6dfa00ac4e9 100644
--- a/src/mame/drivers/mouser.cpp
+++ b/src/mame/drivers/mouser.cpp
@@ -201,7 +201,7 @@ void mouser_state::machine_reset()
m_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( mouser, mouser_state )
+static MACHINE_CONFIG_START( mouser )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
@@ -302,5 +302,5 @@ DRIVER_INIT_MEMBER(mouser_state,mouser)
}
-GAME( 1983, mouser, 0, mouser, mouser, mouser_state, mouser, ROT90, "UPL", "Mouser", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mouser, 0, mouser, mouser, mouser_state, mouser, ROT90, "UPL", "Mouser", MACHINE_SUPPORTS_SAVE )
GAME( 1983, mouserc, mouser, mouser, mouser, mouser_state, mouser, ROT90, "UPL (Cosmos license)", "Mouser (Cosmos)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index a2d1edcd748..f850c163a6e 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -352,7 +352,7 @@ void mpf1_state::machine_reset()
/* Machine Drivers */
-static MACHINE_CONFIG_START( mpf1, mpf1_state )
+static MACHINE_CONFIG_START( mpf1 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2)
@@ -387,7 +387,7 @@ static MACHINE_CONFIG_START( mpf1, mpf1_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mpf1b, mpf1_state )
+static MACHINE_CONFIG_START( mpf1b )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_3_579545MHz/2)
MCFG_CPU_PROGRAM_MAP(mpf1b_map)
@@ -424,7 +424,7 @@ static MACHINE_CONFIG_START( mpf1b, mpf1_state )
MCFG_TIMER_DRIVER_ADD_PERIODIC("halt_timer", mpf1_state, check_halt_callback, attotime::from_hz(1))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mpf1p, mpf1_state )
+static MACHINE_CONFIG_START( mpf1p )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(mpf1p_map)
@@ -486,6 +486,6 @@ DRIVER_INIT_MEMBER(mpf1_state,mpf1)
m_program = &m_maincpu->space(AS_PROGRAM);
}
-COMP( 1979, mpf1, 0, 0, mpf1, mpf1, mpf1_state, mpf1, "Multitech", "Micro Professor 1", 0)
-COMP( 1979, mpf1b, mpf1, 0, mpf1b,mpf1b, mpf1_state, mpf1, "Multitech", "Micro Professor 1B", 0)
-COMP( 1982, mpf1p, mpf1, 0, mpf1p,mpf1b, mpf1_state, mpf1, "Multitech", "Micro Professor 1 Plus", MACHINE_NOT_WORKING)
+COMP( 1979, mpf1, 0, 0, mpf1, mpf1, mpf1_state, mpf1, "Multitech", "Micro Professor 1", 0 )
+COMP( 1979, mpf1b, mpf1, 0, mpf1b,mpf1b, mpf1_state, mpf1, "Multitech", "Micro Professor 1B", 0 )
+COMP( 1982, mpf1p, mpf1, 0, mpf1p,mpf1b, mpf1_state, mpf1, "Multitech", "Micro Professor 1 Plus", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mps1230.cpp b/src/mame/drivers/mps1230.cpp
index d12a09470cf..99cdff6ff25 100644
--- a/src/mame/drivers/mps1230.cpp
+++ b/src/mame/drivers/mps1230.cpp
@@ -132,7 +132,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mps1230 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mps1230, mps1230_state )
+static MACHINE_CONFIG_START( mps1230 )
MCFG_CPU_ADD(CPU_TAG, UPD7810, 11060000)
MCFG_CPU_PROGRAM_MAP(mps1230_map)
MACHINE_CONFIG_END
@@ -157,6 +157,6 @@ ROM_START(mps1230)
ROM_LOAD( "peek.f03ee", 0x000000, 0x010000, CRC(b5215f25) SHA1(dcfdd16942652447c472301392d9b39514547af1) ) // ver 2.1E, 09/AUG/1989
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1986, mps1000, 0, 0, mps1230, mps1230, driver_device, 0, "Commodore Business Machines", "MPS-1000 Printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_OTHER )
-COMP( 1988, mps1230, 0, 0, mps1230, mps1230, driver_device, 0, "Commodore Business Machines", "MPS-1230 NLQ Printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_OTHER )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1986, mps1000, 0, 0, mps1230, mps1230, mps1230_state, 0, "Commodore Business Machines", "MPS-1000 Printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_OTHER )
+COMP( 1988, mps1230, 0, 0, mps1230, mps1230, mps1230_state, 0, "Commodore Business Machines", "MPS-1230 NLQ Printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_OTHER )
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index dfd26114196..1addccedda6 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -483,7 +483,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( mpu12wbk, mpu12wbk_state )
+static MACHINE_CONFIG_START( mpu12wbk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/2) /* guess */
@@ -560,5 +560,5 @@ DRIVER_INIT_MEMBER(mpu12wbk_state, mpu12wbk)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1997, fruitstb, 0, mpu12wbk, mpu12wbk, mpu12wbk_state, mpu12wbk, ROT0, "Webak Elektronik", "Fruit Star Bonus (Ver 8.20PIR)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mpu2.cpp b/src/mame/drivers/mpu2.cpp
index 1ded190b0b2..9c7aa3fcdb3 100644
--- a/src/mame/drivers/mpu2.cpp
+++ b/src/mame/drivers/mpu2.cpp
@@ -67,7 +67,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( mpu2, mpu2_state )
+static MACHINE_CONFIG_START( mpu2 )
MCFG_CPU_ADD("maincpu", M6800, 2000000) // ?
MCFG_CPU_PROGRAM_MAP(mpu2_basemap)
MACHINE_CONFIG_END
@@ -98,5 +98,5 @@ ROM_START( m2svlite )
ROM_LOAD( "sl1.bin", 0x0000, 0x0800, CRC(afe04b5a) SHA1(3b3385a9b039992279fda5b87926b5089a448581) )
ROM_END
-GAME(198?, m2hilite, 0, mpu2, mpu2, driver_device, 0, ROT0, "Barcrest", "Hi-Lights (Barcrest) (MPU2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(198?, m2svlite, 0, mpu2, mpu2, driver_device, 0, ROT0, "Barcrest", "Silver Lights (Barcrest) (MPU2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(198?, m2hilite, 0, mpu2, mpu2, mpu2_state, 0, ROT0, "Barcrest", "Hi-Lights (Barcrest) (MPU2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(198?, m2svlite, 0, mpu2, mpu2, mpu2_state, 0, ROT0, "Barcrest", "Silver Lights (Barcrest) (MPU2)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index f914909b4c5..c9eb63f6c58 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -178,15 +178,15 @@ class mpu3_state : public driver_device
{
public:
mpu3_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_reel0(*this, "reel0"),
- m_reel1(*this, "reel1"),
- m_reel2(*this, "reel2"),
- m_reel3(*this, "reel3"),
- m_meters(*this, "meters"),
- m_vfd(*this, "vfd")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_reel0(*this, "reel0")
+ , m_reel1(*this, "reel1")
+ , m_reel2(*this, "reel2")
+ , m_reel3(*this, "reel3")
+ , m_meters(*this, "meters")
+ , m_vfd(*this, "vfd")
+ { }
int m_triac_ic3;
int m_triac_ic4;
@@ -265,7 +265,7 @@ public:
required_device<stepper_device> m_reel2;
required_device<stepper_device> m_reel3;
required_device<meters_device> m_meters;
- optional_device<roc10937_t> m_vfd;
+ optional_device<roc10937_device> m_vfd;
};
#define DISPLAY_PORT 0
@@ -847,7 +847,7 @@ ADDRESS_MAP_END
MCFG_STEPPER_INDEX_PATTERN(0x00)\
MCFG_STEPPER_INIT_PHASE(2)
-static MACHINE_CONFIG_START( mpu3base, mpu3_state )
+static MACHINE_CONFIG_START( mpu3base )
MCFG_CPU_ADD("maincpu", M6808, MPU3_MASTER_CLOCK)///4)
MCFG_CPU_PROGRAM_MAP(mpu3_basemap)
@@ -1617,10 +1617,10 @@ ROM_END
#define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL|MACHINE_CLICKABLE_ARTWORK
-GAME( 198?, m3tst, 0, mpu3base, mpu3, driver_device, 0, ROT0, "Barcrest","MPU3 Unit Test (Program 5) (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3tst, 0, mpu3base, mpu3, mpu3_state, 0, ROT0, "Barcrest","MPU3 Unit Test (Program 5) (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3autort, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Autoroute (Barcrest) (MPU3)", GAME_FLAGS, layout_m3autort )
-GAME( 198?, m3big20j, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Big 20 Joker (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3big20j, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Big 20 Joker (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3biggam, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","The Big Game (Barcrest) (MPU3)", GAME_FLAGS, layout_m3biggam )
GAMEL( 198?, m3bigsht, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Big Shot (Barcrest) (MPU3)", GAME_FLAGS, layout_m3bigsht )
GAMEL( 198?, m3blkhle, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Black Hole (Barcrest) (MPU3)", GAME_FLAGS, layout_m3blkhle )
@@ -1628,26 +1628,26 @@ GAMEL( 198?, m3cabret, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0,
GAMEL( 198?, m3cabreta, m3cabret, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Cabaret (Barcrest) (MPU3, set 2)", GAME_FLAGS, layout_m3cabreta )
GAMEL( 198?, m3cunlim, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Chances Unlimited (Barcrest) (MPU3)", GAME_FLAGS, layout_m3cunlim )
GAMEL( 198?, m3cskill, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Circle Skill (Barcrest) (MPU3)", GAME_FLAGS, layout_m3cskill )
-GAME( 198?, m3cjoker, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Crazy Joker (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3cjoker, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Crazy Joker (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3xchngg, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Exchanges Galore (Barcrest) (MPU3)", GAME_FLAGS, layout_m3xchngg )
-GAME( 198?, m3xchngu, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU3, set 1)",GAME_FLAGS )
-GAME( 198?, m3xchngua, m3xchngu, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU3, set 2)",GAME_FLAGS )
+GAME( 198?, m3xchngu, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU3, set 1)",GAME_FLAGS )
+GAME( 198?, m3xchngua, m3xchngu, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU3, set 2)",GAME_FLAGS )
GAMEL( 198?, m3fortun, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Fortune Numbers (Barcrest) (MPU3, set 1)", GAME_FLAGS, layout_m3fortun )
GAMEL( 198?, m3fortuna, m3fortun, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Fortune Numbers (Barcrest) (MPU3, set 2)", GAME_FLAGS, layout_m3fortun )
GAMEL( 198?, m3fortund, m3fortun, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Fortune Numbers (Barcrest) [Dutch] (MPU3)", GAME_FLAGS, layout_m3fortun )
-GAME( 198?, m3gaward, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Golden Award (Barcrest) (MPU3)",GAME_FLAGS )
-GAME( 198?, m3hprvpr, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Hyper Viper (Barcrest) (MPU3)",GAME_FLAGS )
-GAME( 198?, m3snappy, m3hprvpr, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Snappy Viper (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3gaward, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Golden Award (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3hprvpr, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Hyper Viper (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3snappy, m3hprvpr, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Snappy Viper (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3replay, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Instant Replay (Barcrest) (MPU3)", GAME_FLAGS, layout_m3replay )
GAMEL( 198?, m3lineup, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Line Up (Barcrest) (MPU3)", GAME_FLAGS, layout_m3lineup )
-GAME( 198?, m3llotto, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Lucky Lotto (Barcrest) (MPU3)",GAME_FLAGS )
-GAME( 198?, m3lstrik, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Lucky Strike Club (Barcrest) (MPU3, set 1)",GAME_FLAGS )
-GAME( 198?, m3lstrika, m3lstrik, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Lucky Strike Club (Barcrest) (MPU3, set 2)",GAME_FLAGS )
-GAME( 198?, m3magrp, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Magic Replay (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3llotto, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Lucky Lotto (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3lstrik, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Lucky Strike Club (Barcrest) (MPU3, set 1)",GAME_FLAGS )
+GAME( 198?, m3lstrika, m3lstrik, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Lucky Strike Club (Barcrest) (MPU3, set 2)",GAME_FLAGS )
+GAME( 198?, m3magrp, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Magic Replay (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3nnice, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Naughty But Nice (Barcrest) (MPU3)", GAME_FLAGS, layout_m3nnice )
-GAME( 198?, m3nudge, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Nudges Unlimited (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3nudge, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Nudges Unlimited (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3oddson, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Odds On (Barcrest) (MPU3)", GAME_FLAGS, layout_m3oddson )
-GAME( 198?, m3optunl, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Options Unlimited (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3optunl, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Options Unlimited (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3razdaz, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Razzle Dazzle (Barcrest) (MPU3, set 1)", GAME_FLAGS, layout_m3razdaza )
GAMEL( 198?, m3razdaza, m3razdaz, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Razzle Dazzle (Barcrest) (MPU3, set 2)", GAME_FLAGS, layout_m3razdaza )
GAMEL( 198?, m3razdazd, m3razdaz, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Razzle Dazzle (Barcrest) [Dutch] (MPU3)", GAME_FLAGS, layout_m3razdaza )
@@ -1657,25 +1657,25 @@ GAMEL( 198?, m3circlea, m3circle, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0,
GAMEL( 198?, m3circleb, m3circle, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Special Circle Club (Barcrest) (MPU3, set 3)", GAME_FLAGS, layout_m3circle )
GAMEL( 198?, m3slight, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Strike A Light (Barcrest) (MPU3)", GAME_FLAGS, layout_m3slight )
GAMEL( 198?, m3supadr, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Adders & Ladders (Barcrest) (MPU3)", GAME_FLAGS, layout_m3supadr )
-GAME( 198?, m3sdeal, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Deal (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3sdeal, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Deal (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3sexcu, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Exchanges Unlimited (Barcrest) (MPU3)", GAME_FLAGS, layout_m3sexcu )
-GAME( 198?, m3suplin, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Line Up (Barcrest) (MPU3, set 1)",GAME_FLAGS )
-GAME( 198?, m3suplina, m3suplin, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Line Up (Barcrest) (MPU3, set 2)",GAME_FLAGS )
+GAME( 198?, m3suplin, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Line Up (Barcrest) (MPU3, set 1)",GAME_FLAGS )
+GAME( 198?, m3suplina, m3suplin, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Line Up (Barcrest) (MPU3, set 2)",GAME_FLAGS )
GAMEL( 198?, m3supnud, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Nudges Unlimited (Barcrest) (MPU3)", GAME_FLAGS, layout_m3supnud )
-GAME( 198?, m3supser, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Series (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3supser, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Super Series (Barcrest) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3sweep, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Sweep Stake Club (Barcrest) (MPU3, set 1)", GAME_FLAGS, layout_m3sweep )
GAMEL( 198?, m3sweepa, m3sweep, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Sweep Stake Club (Barcrest) (MPU3, set 2)", GAME_FLAGS, layout_m3sweep )
-GAME( 198?, m3topsht, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Top Shot (Barcrest) (MPU3)",GAME_FLAGS )
-GAME( 198?, m3winstra, m3winstr, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Winstrike (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3topsht, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Top Shot (Barcrest) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3winstra, m3winstr, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Barcrest","Winstrike (Barcrest) (MPU3)",GAME_FLAGS )
/* Bwb */
GAMEL( 198?, m3acech, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Ace Chase (Bwb) (MPU3)", GAME_FLAGS, layout_m3acech )
-GAME( 198?, m3bankr, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Banker (Bwb) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3bankr, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Banker (Bwb) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3chase, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Chase It (Bwb) (MPU3)", GAME_FLAGS, layout_m3chase )
GAMEL( 198?, m3gmine, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Gold Mine (Bwb) (MPU3)", GAME_FLAGS, layout_m3gmine )
GAMEL( 198?, m3ratrce, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Rat Race (Bwb) (MPU3)", GAME_FLAGS, layout_m3ratrce )
-GAME( 198?, m3supasw, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Supaswop (Bwb) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3supasw, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Supaswop (Bwb) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3supwin, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Super Win (Bwb) (MPU3, set 1)", GAME_FLAGS, layout_m3supwin )
GAMEL( 198?, m3supwina, m3supwin, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Super Win (Bwb) (MPU3, set 2)", GAME_FLAGS, layout_m3supwin )
GAMEL( 198?, m3winagn, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Bwb","Win-A-Gain (Bwb) (MPU3, set 1)", GAME_FLAGS, layout_m3winagnb )
@@ -1685,7 +1685,7 @@ GAMEL( 198?, m3winstr, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0,
/* Pcp */
-GAME( 198?, m3cdash, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Cash Dash (Pcp) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3cdash, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Cash Dash (Pcp) (MPU3)",GAME_FLAGS )
GAMEL( 198?, m3loony, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Loonybin (Pcp) (MPU3)", GAME_FLAGS, layout_m3loony )
GAMEL( 198?, m3online, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","On Line (Pcp) (MPU3)", GAME_FLAGS, layout_m3online )
GAMEL( 198?, m3rockpl, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Rock Pile (Pcp) (MPU3)", GAME_FLAGS, layout_m3rockpl )
@@ -1696,20 +1696,20 @@ GAMEL( 198?, m3spoofa, m3spoof, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0,
GAMEL( 198?, m3supspo, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Super Spoof (Pcp) (MPU3, set 1)", GAME_FLAGS, layout_m3supspo )
GAMEL( 198?, m3supspoa, m3supspo, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Super Spoof (Pcp) (MPU3, set 2)", GAME_FLAGS, layout_m3supspo )
GAMEL( 198?, m3toplin, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Top Line (Pcp) (MPU3)", GAME_FLAGS, layout_m3toplin )
-GAME( 198?, m3wigwam, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Wig Wam (Pcp) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3wigwam, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Pcp","Wig Wam (Pcp) (MPU3)",GAME_FLAGS )
/* Mdm */
GAMEL( 198?, m3gcrown, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Mdm","Golden Crowns (Mdm) (MPU3)", GAME_FLAGS, layout_m3gcrown )
GAMEL( 198?, m3tfair, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Mdm","Tuppenny Fair (Mdm) (MPU3)", GAME_FLAGS, layout_m3tfair )
-GAME( 198?, m3wacky, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Mdm","Wacky Racer (Mdm) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3wacky, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Mdm","Wacky Racer (Mdm) (MPU3)",GAME_FLAGS )
/* VFS */
GAMEL( 198?, m3oxo, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "VFS","Noughts 'n' Crosses (VFS) (MPU3)", GAME_FLAGS, layout_m3oxo )
-GAME( 198?, m3mremon, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "VFS","More Money (VFS) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3mremon, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "VFS","More Money (VFS) (MPU3)",GAME_FLAGS )
/* Others */
-GAME( 198?, m3minmax, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Associated Leisure","Mini Max (Associated Leisure) (MPU3)",GAME_FLAGS )
-GAME( 198?, m3scoop, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Peter Simper","Scoop (Peter Simper, prototype?) (MPU3)",GAME_FLAGS )
-GAME( 198?, m3tlktwn, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "<unknown>","Talk of the Town (MPU3?)",GAME_FLAGS )
+GAME( 198?, m3minmax, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Associated Leisure","Mini Max (Associated Leisure) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3scoop, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "Peter Simper","Scoop (Peter Simper, prototype?) (MPU3)",GAME_FLAGS )
+GAME( 198?, m3tlktwn, 0, mpu3base, mpu3, mpu3_state, m3hprvpr, ROT0, "<unknown>","Talk of the Town (MPU3?)",GAME_FLAGS )
diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp
index f889fa3af7f..45d3829be3a 100644
--- a/src/mame/drivers/mpu4.cpp
+++ b/src/mame/drivers/mpu4.cpp
@@ -3083,7 +3083,7 @@ MACHINE_CONFIG_FRAGMENT( mpu4_common2 )
MACHINE_CONFIG_END
/* machine driver for MOD 2 board */
-MACHINE_CONFIG_START( mpu4base, mpu4_state )
+MACHINE_CONFIG_START( mpu4base )
MCFG_MACHINE_START_OVERRIDE(mpu4_state,mod2 )
MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4)
diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp
index 8327c7e983f..a1797b42da3 100644
--- a/src/mame/drivers/mpu4dealem.cpp
+++ b/src/mame/drivers/mpu4dealem.cpp
@@ -194,7 +194,7 @@ MACHINE_RESET_MEMBER(mpu4dealem_state,dealem_vid)
/* machine driver for Zenitone Deal 'Em board */
-static MACHINE_CONFIG_START( dealem, mpu4dealem_state )
+static MACHINE_CONFIG_START( dealem )
MCFG_MACHINE_START_OVERRIDE(mpu4dealem_state,mod2) /* main mpu4 board initialisation */
MCFG_MACHINE_RESET_OVERRIDE(mpu4dealem_state,dealem_vid)
@@ -380,4 +380,4 @@ and reel assembly with this kit and a supplied monitor. This explains why the ca
The original Deal 'Em ran on Summit Coin hardware, and was made by someone else.
Two further different releases were made, running on the Barcrest MPU4 Video, rather than this one. These are Deal 'Em Again and Deal 'Em 2000*/
-GAME( 1987,v4dealem, 0, dealem, dealem, driver_device, 0, ROT0, "Zenitone","Deal 'Em (MPU4 Conversion Kit, v7.0)",MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1987,v4dealem, 0, dealem, dealem, mpu4dealem_state, 0, ROT0, "Zenitone","Deal 'Em (MPU4 Conversion Kit, v7.0)",MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp
index ef2f442f5c2..dc141ff5d7d 100644
--- a/src/mame/drivers/mpu4plasma.cpp
+++ b/src/mame/drivers/mpu4plasma.cpp
@@ -87,7 +87,7 @@ uint32_t mpu4plasma_state::screen_update_mpu4plasma(screen_device &screen, bitma
}
-MACHINE_CONFIG_DERIVED_CLASS( mpu4plasma , mod2, mpu4plasma_state )
+MACHINE_CONFIG_DERIVED( mpu4plasma, mod2 )
MCFG_CPU_ADD("plasmacpu", M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(mpu4plasma_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", mpu4plasma_state, irq4_line_hold)
@@ -196,14 +196,14 @@ ROM_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
-GAMEL(199?, m4bigchf ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 1)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4bigchfa ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 2)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4bigchfb ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 3)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4bigchfc ,m4bigchf ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 4)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchf ,0 ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 1)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchfa ,m4bigchf ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 2)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchfb ,m4bigchf ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 3)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4bigchfc ,m4bigchf ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Big Chief (Barcrest) (MPU4 w/ Plasma DMD) (set 4)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
-GAMEL(199?, m4click ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Clickity Click (Barcrest) (MPU4 w/ Plasma DMD)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4click ,0 ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Clickity Click (Barcrest) (MPU4 w/ Plasma DMD)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
// not confirmed to be plasma, is this an alt version of big chief? maybe it uses the same plasma roms?
-GAMEL(199?, m4apach ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Apache (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4apach ,0 ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Apache (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
// not confirmed to be plasma, but acts like it
-GAMEL(199?, m4elite ,0 ,mpu4plasma ,mpu4 , mpu4_state,m4default ,ROT0, "Barcrest","Elite (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
+GAMEL(199?, m4elite ,0 ,mpu4plasma ,mpu4 , mpu4plasma_state,m4default ,ROT0, "Barcrest","Elite (Barcrest) (MPU4 w/ Plasma DMD?)", GAME_FLAGS|MACHINE_NO_SOUND,layout_mpu4plasma )
diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp
index 18d1e439d4e..f94e46f8183 100644
--- a/src/mame/drivers/mpu4vid.cpp
+++ b/src/mame/drivers/mpu4vid.cpp
@@ -1267,7 +1267,7 @@ ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mpu4_vid, mpu4vid_state )
+static MACHINE_CONFIG_START( mpu4_vid )
MCFG_CPU_ADD("maincpu", M6809, MPU4_MASTER_CLOCK/4 )
MCFG_CPU_PROGRAM_MAP(mpu4_6809_map)
@@ -3576,28 +3576,28 @@ ROM_END
AMLD versions do not pay out, and instead just feature highscore tables. These were mainly intended for locations unwilling to pay for gaming licenses.
The AMLD Crystal Maze versions appear to be a mixture of the original game modules and Team Challenge's scoring system. This would suggest they were all made ~1994. */
-GAME( 199?,v4bios, 0, mod2, mpu4, driver_device, 0, ROT0, "Barcrest","MPU4 Video Firmware",MACHINE_IS_BIOS_ROOT )
+GAME( 199?,v4bios, 0, mod2, mpu4, mpu4_state, 0, ROT0, "Barcrest","MPU4 Video Firmware",MACHINE_IS_BIOS_ROOT )
#define GAME_FLAGS MACHINE_NOT_WORKING
-GAMEL( 1993,v4cmaze, v4bios, crmaze, crmaze, mpu4vid_state, crmaze, ROT0, "Barcrest","The Crystal Maze (v1.3) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
-GAMEL( 1993,v4cmazedat, v4cmaze, crmaze, crmaze, mpu4vid_state, crmaze, ROT0, "Barcrest","The Crystal Maze (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9D
-GAMEL( 1993,v4cmazea, v4cmaze, crmaze, crmaze, mpu4vid_state, crmazea, ROT0, "Barcrest","The Crystal Maze (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9 (actually newer than the 1.1 set then??)
-GAMEL( 1993,v4cmazeb, v4cmaze, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze (v1.2) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
-GAMEL( 1993,v4cmazec, v4cmaze, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze (v1.3 alt) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
-GAMEL( 1993,v4cmazed, v4cmaze, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze (v1.1) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.6
-
-GAMEL( 1993,v4cmaze2, v4bios, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0
-GAMEL( 1993,v4cmaze2d, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0D
-GAMEL( 1993,v4cmaze2a, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2a, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0 /* unprotected? proto? */
-GAMEL( 1993,v4cmaze2b, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.0) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0
-GAMEL( 1993,v4cmaze2c, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v?.?) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// bad rom?
-
-GAMEL( 1994,v4cmaze3, v4bios, crmaze, crmaze, mpu4vid_state, crmaze3, ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
-GAMEL( 1994,v4cmaze3d, v4cmaze3, crmaze, crmaze, mpu4vid_state, crmaze3, ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7D
-GAMEL( 1994,v4cmaze3a, v4cmaze3, crmaze, crmaze, mpu4vid_state, crmaze3a, ROT0, "Barcrest","The Crystal Maze Team Challenge (v1.2, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
-GAMEL( 1994,v4cmaze3b, v4cmaze3, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.8) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
-GAMEL( 1994,v4cmaze3c, v4cmaze3, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze Team Challenge (v?.?) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// missing one program rom
+GAMEL( 1993,v4cmaze, v4bios, crmaze, crmaze, mpu4vid_state, crmaze, ROT0, "Barcrest","The Crystal Maze (v1.3) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
+GAMEL( 1993,v4cmazedat, v4cmaze, crmaze, crmaze, mpu4vid_state, crmaze, ROT0, "Barcrest","The Crystal Maze (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9D
+GAMEL( 1993,v4cmazea, v4cmaze, crmaze, crmaze, mpu4vid_state, crmazea, ROT0, "Barcrest","The Crystal Maze (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9 (actually newer than the 1.1 set then??)
+GAMEL( 1993,v4cmazeb, v4cmaze, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze (v1.2) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
+GAMEL( 1993,v4cmazec, v4cmaze, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze (v1.3 alt) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
+GAMEL( 1993,v4cmazed, v4cmaze, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze (v1.1) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.6
+
+GAMEL( 1993,v4cmaze2, v4bios, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0
+GAMEL( 1993,v4cmaze2d, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0D
+GAMEL( 1993,v4cmaze2a, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2a, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0 /* unprotected? proto? */
+GAMEL( 1993,v4cmaze2b, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.0) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0
+GAMEL( 1993,v4cmaze2c, v4cmaze2, crmaze, crmaze, mpu4vid_state, crmaze2, ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v?.?) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// bad rom?
+
+GAMEL( 1994,v4cmaze3, v4bios, crmaze, crmaze, mpu4vid_state, crmaze3, ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
+GAMEL( 1994,v4cmaze3d, v4cmaze3, crmaze, crmaze, mpu4vid_state, crmaze3, ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7D
+GAMEL( 1994,v4cmaze3a, v4cmaze3, crmaze, crmaze, mpu4vid_state, crmaze3a, ROT0, "Barcrest","The Crystal Maze Team Challenge (v1.2, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
+GAMEL( 1994,v4cmaze3b, v4cmaze3, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.8) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
+GAMEL( 1994,v4cmaze3c, v4cmaze3, crmaze, crmaze, mpu4vid_state, v4cmazeb, ROT0, "Barcrest","The Crystal Maze Team Challenge (v?.?) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// missing one program rom
GAME( 199?,v4turnov, v4bios, mpu4_vid, turnover, mpu4vid_state, turnover, ROT0, "Barcrest","Turnover (v2.3) (MPU4 Video)",GAME_FLAGS )
@@ -3605,14 +3605,14 @@ GAME( 1990,v4skltrk, v4bios, mpu4_vid, skiltrek, mpu4vid_state, skil
GAME( 1990,v4skltrka, v4skltrk, mpu4_vid, skiltrek, mpu4vid_state, skiltrek, ROT0, "Barcrest","Skill Trek (v1.1) (MPU4 Video, set 2)",GAME_FLAGS ) // 12 pound max
GAME( 1990,v4sklcsh, v4bios, mpu4_vid, skiltrek, mpu4vid_state, v4barqst, ROT0, "Barcrest","Skill Cash (v1.1) (MPU4 Video)",GAME_FLAGS )
-GAME( 1989,v4addlad, v4bios, mpu4_vid, adders, mpu4vid_state, adders, ROT0, "Barcrest","Adders and Ladders (v2.1) (MPU4 Video)",GAME_FLAGS )
-GAME( 1989,v4addlad20, v4addlad, mpu4_vid, adders, mpu4vid_state, adders, ROT0, "Barcrest","Adders and Ladders (v2.0) (MPU4 Video)",GAME_FLAGS )
+GAME( 1989,v4addlad, v4bios, mpu4_vid, adders, mpu4vid_state, adders, ROT0, "Barcrest","Adders and Ladders (v2.1) (MPU4 Video)",GAME_FLAGS )
+GAME( 1989,v4addlad20, v4addlad, mpu4_vid, adders, mpu4vid_state, adders, ROT0, "Barcrest","Adders and Ladders (v2.0) (MPU4 Video)",GAME_FLAGS )
GAME( 1989,v4time, v4bios, mpu4_vid, skiltrek, mpu4vid_state, timemchn, ROT0, "Barcrest","Time Machine (v2.0) (MPU4 Video)",GAME_FLAGS )
//Year is a guess, based on the use of the 'Coin Man' logo
-GAME( 1996?,v4mate, v4bios, mating, mating, mpu4vid_state, mating, ROT0, "Barcrest","The Mating Game (v0.4) (MPU4 Video)",GAME_FLAGS )//SWP 0.2 /* Using crmaze controls for now, cabinet has trackball */
-GAME( 1996?,v4mated, v4mate, mating, mating, mpu4vid_state, mating, ROT0, "Barcrest","The Mating Game (v0.4, Datapak) (MPU4 Video)",GAME_FLAGS )//SWP 0.2D
+GAME( 1996?,v4mate, v4bios, mating, mating, mpu4vid_state, mating, ROT0, "Barcrest","The Mating Game (v0.4) (MPU4 Video)",GAME_FLAGS )//SWP 0.2 /* Using crmaze controls for now, cabinet has trackball */
+GAME( 1996?,v4mated, v4mate, mating, mating, mpu4vid_state, mating, ROT0, "Barcrest","The Mating Game (v0.4, Datapak) (MPU4 Video)",GAME_FLAGS )//SWP 0.2D
/* Games below are missing question ROMs */
@@ -3643,39 +3643,39 @@ GAME( 1991,v4opt3d, v4opt3, mpu4_vid, mpu4, mpu4vid_state, v4op
/* Games below are newer BwB games and use their own BIOS ROMs and hardware setups*/
-GAME( 199?,v4vgpok, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Vegas Poker (prototype, release 2) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4vgpok, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Vegas Poker (prototype, release 2) (MPU4 Video)",GAME_FLAGS )
GAME( 199?,v4psi, 0, bwbvid, mpu4, mpu4vid_state, prizeinv, ROT0, "BwB","Prize Space Invaders (v1.1) (MPU4 Video)",GAME_FLAGS )
GAME( 199?,v4psia, 0, bwbvid, mpu4, mpu4vid_state, prizeinv, ROT0, "BwB","Prize Space Invaders (v1.2) (MPU4 Video)",GAME_FLAGS )
GAME( 199?,v4psib, 0, bwbvid, mpu4, mpu4vid_state, prizeinv, ROT0, "BwB","Prize Space Invaders (v2.0?) (MPU4 Video)",GAME_FLAGS ) // bad dump
-GAME( 199?,v4blox, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Blox (v2.0) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4bloxd, v4blox, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Blox (v2.0, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4blox, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Blox (v2.0) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4bloxd, v4blox, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Blox (v2.0, Datapak) (MPU4 Video)",GAME_FLAGS )
GAME( 1996,v4reno, 0, bwbvid5, mpu4, mpu4vid_state, prizeinv, ROT0, "BwB","Reno Reels (20p/10GBP Cash, release A) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4bigfrt, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Big Fruits (v2.0?) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4bubbnk, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Bubbly Bonk (v4.0?) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4mazbel, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Mazooma Belle (v2.5) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4mazbla, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Mazooma Belle (v1.5) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4shpwnd, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Shop Window (v2.0) (MPU4 Video)",GAME_FLAGS )
-
-GAME( 199?,v4redhtp, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Red Hot Poker (20p/10GBP Cash, release 3) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4tetrs, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","BwB Tetris v 2.2 (MPU4 Video)",GAME_FLAGS )
-
-GAME( 199?,v4big40, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Big 40 Poker (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4bulblx, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Bullion Blox (Bwb) (MPU4 Video)",GAME_FLAGS ) // is this the same game as v4blox?
-GAME( 199?,v4cshinf, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Cash Inferno (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4dbltak, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Double Take (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4gldrsh, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Gold Rush (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4mdice, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Miami Dice (Bwb) (MPU4 Video)",GAME_FLAGS ) // is this the same as the Nova game below?
-GAME( 199?,v4monte, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Monte Carlo Or Bust (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4ovrmn3, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Over Moon Pt3 (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4pztet, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Prize Tetris (Bwb) (MPU4 Video, set 1)",GAME_FLAGS ) // is this the same as v4tetrs?
-GAME( 199?,v4pzteta, v4pztet, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Prize Tetris (Bwb) (MPU4 Video, set 2)",GAME_FLAGS )
-GAME( 199?,v4rhmaz, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Red Hot Mazooma Belle (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4sunbst, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Sunburst (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4timebn, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Time Bandit (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4sixx, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","6-X (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4megbuk, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Megabucks Poker (Bwb) (MPU4 Video)",GAME_FLAGS ) // no video roms!
-GAME( 199?,v4rencas, 0, bwbvid, mpu4, driver_device, 0, ROT0, "BwB","Reno Casino (Bwb) (MPU4 Video)",GAME_FLAGS ) // no video roms!
+GAME( 199?,v4bigfrt, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Big Fruits (v2.0?) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4bubbnk, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Bubbly Bonk (v4.0?) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4mazbel, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Mazooma Belle (v2.5) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4mazbla, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Mazooma Belle (v1.5) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4shpwnd, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Shop Window (v2.0) (MPU4 Video)",GAME_FLAGS )
+
+GAME( 199?,v4redhtp, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Red Hot Poker (20p/10GBP Cash, release 3) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4tetrs, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","BwB Tetris v 2.2 (MPU4 Video)",GAME_FLAGS )
+
+GAME( 199?,v4big40, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Big 40 Poker (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4bulblx, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Bullion Blox (Bwb) (MPU4 Video)",GAME_FLAGS ) // is this the same game as v4blox?
+GAME( 199?,v4cshinf, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Cash Inferno (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4dbltak, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Double Take (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4gldrsh, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Gold Rush (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4mdice, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Miami Dice (Bwb) (MPU4 Video)",GAME_FLAGS ) // is this the same as the Nova game below?
+GAME( 199?,v4monte, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Monte Carlo Or Bust (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4ovrmn3, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Over Moon Pt3 (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4pztet, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Prize Tetris (Bwb) (MPU4 Video, set 1)",GAME_FLAGS ) // is this the same as v4tetrs?
+GAME( 199?,v4pzteta, v4pztet, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Prize Tetris (Bwb) (MPU4 Video, set 2)",GAME_FLAGS )
+GAME( 199?,v4rhmaz, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Red Hot Mazooma Belle (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4sunbst, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Sunburst (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4timebn, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Time Bandit (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4sixx, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","6-X (Bwb) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4megbuk, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Megabucks Poker (Bwb) (MPU4 Video)",GAME_FLAGS ) // no video roms!
+GAME( 199?,v4rencas, 0, bwbvid, mpu4, mpu4vid_state, 0, ROT0, "BwB","Reno Casino (Bwb) (MPU4 Video)",GAME_FLAGS ) // no video roms!
/* Uncertain BIOS */
@@ -3685,6 +3685,6 @@ GAME( 199?,v4frfact, v4bios, crmaze, crmaze, mpu4vid_state, crma
/* Nova - is this the same video board? One of the games displays 'Resetting' but the others do nothing interesting and access strange addresses */
/* All contain BwB video in the BIOS rom tho */
GAME( 199?,v4cybcas, 0, bwbvid5, mpu4, mpu4vid_state, cybcas, ROT0, "Nova","Cyber Casino (Nova) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4miami, 0, bwbvid5, mpu4, driver_device, 0, ROT0, "Nova","Miami Dice (Nova) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4missis, 0, bwbvid5, mpu4, driver_device, 0, ROT0, "Nova","Mississippi Lady (Nova) (MPU4 Video)",GAME_FLAGS )
-GAME( 199?,v4picdil, 0, bwbvid5, mpu4, driver_device, 0, ROT0, "Nova","Piccadilly Nights (Nova) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4miami, 0, bwbvid5, mpu4, mpu4vid_state, 0, ROT0, "Nova","Miami Dice (Nova) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4missis, 0, bwbvid5, mpu4, mpu4vid_state, 0, ROT0, "Nova","Mississippi Lady (Nova) (MPU4 Video)",GAME_FLAGS )
+GAME( 199?,v4picdil, 0, bwbvid5, mpu4, mpu4vid_state, 0, ROT0, "Nova","Piccadilly Nights (Nova) (MPU4 Video)",GAME_FLAGS )
diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp
index af1e49b57e4..dc67b2839a7 100644
--- a/src/mame/drivers/mpu5.cpp
+++ b/src/mame/drivers/mpu5.cpp
@@ -235,7 +235,7 @@ public:
protected:
// devices
- required_device<m68340cpu_device> m_maincpu;
+ required_device<m68340_cpu_device> m_maincpu;
virtual void machine_start() override;
};
@@ -541,7 +541,7 @@ void mpu5_state::machine_start()
}
-MACHINE_CONFIG_START( mpu5, mpu5_state )
+MACHINE_CONFIG_START( mpu5 )
MCFG_CPU_ADD("maincpu", M68340, 16000000) // ?
MCFG_CPU_PROGRAM_MAP(mpu5_map)
diff --git a/src/mame/drivers/mpu5.hxx b/src/mame/drivers/mpu5.hxx
index 74997f208f4..745c5f7907e 100644
--- a/src/mame/drivers/mpu5.hxx
+++ b/src/mame/drivers/mpu5.hxx
@@ -7189,937 +7189,937 @@ ROM_END
/* Barcrest */
-GAME( 199?, m5clr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","MPU 5 Ram & Meter Clear (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5tst ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","MPU 5 Test Rom (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","MPU 5 Ram & Meter Clear (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tst ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","MPU 5 Test Rom (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5addams ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsa ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsb ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsc ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsd ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamse ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsf ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsg ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsh ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.2, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsi ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.2, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsj ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.2, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsk ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsl ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsm ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsn ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamso ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsp ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsq ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamsr ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAMEL( 199?, m5addamss ,m5addams, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addams ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsa ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsb ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsc ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsd ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamse ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsf ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsg ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.5, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsh ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.2, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsi ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.2, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsj ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.2, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsk ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsl ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsm ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsn ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamso ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsp ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsq ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamsr ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
+GAMEL( 199?, m5addamss ,m5addams, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Addams Family (Barcrest) (MPU5) (v0.3, set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5addams )
-GAME( 199?, m5addlad ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addlada ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladb ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladc ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladd ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addlade ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladf ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 7)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladg ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 8)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladh ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 9)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladi ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 10)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladj ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladk ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladl ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladm ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladn ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addlado ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladp ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 7)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladq ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.4, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addladr ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.4, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5addlads ,m5addlad, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v?.?)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addlad ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addlada ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladb ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladc ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladd ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addlade ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladf ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 7)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladg ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 8)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladh ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 9)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladi ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.6, set 10)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladj ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladk ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladl ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladm ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladn ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addlado ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladp ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.1, set 7)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladq ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.4, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addladr ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v0.4, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5addlads ,m5addlad, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Adders & Ladders (Barcrest) (MPU5, v?.?)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5fire ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","All Fired Up (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fire )
+GAMEL( 199?, m5fire ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","All Fired Up (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fire )
-GAMEL( 199?, m5arab ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Arabian Nights (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5arab )
-GAMEL( 199?, m5arab03 ,m5arab, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Arabian Nights (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5arab )
+GAMEL( 199?, m5arab ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Arabian Nights (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5arab )
+GAMEL( 199?, m5arab03 ,m5arab, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Arabian Nights (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5arab )
-GAMEL( 199?, m5austin ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Austin Powers (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5austin11 )
-GAMEL( 199?, m5austin10 ,m5austin, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Austin Powers (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5austin11 )
-GAMEL( 199?, m5austin11 ,m5austin, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Austin Powers (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5austin11 )
+GAMEL( 199?, m5austin ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Austin Powers (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5austin11 )
+GAMEL( 199?, m5austin10 ,m5austin, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Austin Powers (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5austin11 )
+GAMEL( 199?, m5austin11 ,m5austin, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Austin Powers (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5austin11 )
-GAME( 199?, m5bankrl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Bank Roll (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bankrl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Bank Roll (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5barkng ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Barking Mad (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5barkng )
+GAMEL( 199?, m5barkng ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Barking Mad (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5barkng )
-GAMEL( 199?, m5barmy ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Barmy Army (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5barmy )
+GAMEL( 199?, m5barmy ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Barmy Army (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5barmy )
-GAMEL( 199?, m5baxe ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Battle Axe (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5baxe04 )
-GAMEL( 199?, m5baxe04 ,m5baxe, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Battle Axe (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5baxe04 )
+GAMEL( 199?, m5baxe ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Battle Axe (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5baxe04 )
+GAMEL( 199?, m5baxe04 ,m5baxe, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Battle Axe (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5baxe04 )
-GAMEL( 199?, m5bbro ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Big Brother (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bbro )
-GAMEL( 199?, m5bbro02 ,m5bbro, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Big Brother (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bbro )
+GAMEL( 199?, m5bbro ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Big Brother (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bbro )
+GAMEL( 199?, m5bbro02 ,m5bbro, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Big Brother (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bbro )
-GAMEL( 199?, m5bbrocl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Big Brother Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bbrocl )
+GAMEL( 199?, m5bbrocl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Big Brother Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bbrocl )
-GAMEL( 199?, m5bigchs ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Big Cheese (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bigchs )
-GAMEL( 199?, m5bigchs05 ,m5bigchs, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Big Cheese (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bigchs )
+GAMEL( 199?, m5bigchs ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Big Cheese (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bigchs )
+GAMEL( 199?, m5bigchs05 ,m5bigchs, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Big Cheese (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bigchs )
-GAMEL( 199?, m5biggam ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Big Game (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5biggam )
-GAMEL( 199?, m5biggam11 ,m5biggam, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Big Game (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5biggam )
+GAMEL( 199?, m5biggam ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Big Game (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5biggam )
+GAMEL( 199?, m5biggam11 ,m5biggam, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Big Game (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5biggam )
-GAMEL( 199?, m5blkwht ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Black & White (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5blkwht11 )
-GAMEL( 199?, m5blkwht11 ,m5blkwht, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Black & White (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5blkwht11 )
-GAMEL( 199?, m5blkwht01 ,m5blkwht, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Black & White (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5blkwht11 )
+GAMEL( 199?, m5blkwht ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Black & White (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5blkwht11 )
+GAMEL( 199?, m5blkwht11 ,m5blkwht, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Black & White (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5blkwht11 )
+GAMEL( 199?, m5blkwht01 ,m5blkwht, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Black & White (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5blkwht11 )
-GAMEL( 199?, m5bwaves ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Brain Waves (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bwaves )
-GAMEL( 199?, m5bwaves07 ,m5bwaves, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Brain Waves (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bwaves )
+GAMEL( 199?, m5bwaves ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Brain Waves (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bwaves )
+GAMEL( 199?, m5bwaves07 ,m5bwaves, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Brain Waves (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bwaves )
-GAMEL( 199?, m5bling ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Bling King Crazy (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bling )
+GAMEL( 199?, m5bling ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Bling King Crazy (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bling )
-GAMEL( 199?, m5cbw ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ca$h Bang Wallop (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cbw )
-GAMEL( 199?, m5cbwa ,m5cbw, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ca$h Bang Wallop (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cbw )
+GAMEL( 199?, m5cbw ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ca$h Bang Wallop (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cbw )
+GAMEL( 199?, m5cbwa ,m5cbw, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ca$h Bang Wallop (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cbw )
-GAME( 199?, m5cpcash ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Captain Cash (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cpcash ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Captain Cash (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5carclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Caribbean Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5carclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Caribbean Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cashar ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Arena (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cashar04 ,m5cashar, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Arena (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cashar ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Arena (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cashar04 ,m5cashar, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Arena (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5cashat ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Attack (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashat )
+GAMEL( 199?, m5cashat ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Attack (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashat )
-GAME( 199?, m5cashln ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Lines (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cashln ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Lines (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5cashrn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
-GAMEL( 199?, m5cashrn01 ,m5cashrn, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
-GAMEL( 199?, m5cashrn02 ,m5cashrn, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
-GAMEL( 199?, m5cashrn04 ,m5cashrn, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
+GAMEL( 199?, m5cashrn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
+GAMEL( 199?, m5cashrn01 ,m5cashrn, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
+GAMEL( 199?, m5cashrn02 ,m5cashrn, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
+GAMEL( 199?, m5cashrn04 ,m5cashrn, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Cash Run (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cashrn )
-GAMEL( 199?, m5codft ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Codfather (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5codft )
-GAMEL( 199?, m5codft02 ,m5codft, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Codfather (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5codft )
+GAMEL( 199?, m5codft ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Codfather (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5codft )
+GAMEL( 199?, m5codft02 ,m5codft, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Codfather (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5codft )
-GAME( 199?, m5cos ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Costa Del Cash Casino (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cos ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Costa Del Cash Casino (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5cosclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Costa Del Cash Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cosclb )
+GAMEL( 199?, m5cosclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Costa Del Cash Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cosclb )
-GAMEL( 199?, m5crzkni ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Crazy Crazy Knights (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5crzkni )
-GAMEL( 199?, m5crzkni03 ,m5crzkni, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Crazy Crazy Knights (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5crzkni )
+GAMEL( 199?, m5crzkni ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Crazy Crazy Knights (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5crzkni )
+GAMEL( 199?, m5crzkni03 ,m5crzkni, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Crazy Crazy Knights (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5crzkni )
-GAMEL( 199?, m5doshpk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Do$h 'n' Pecks (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5doshpk05 )
-GAMEL( 199?, m5doshpk05 ,m5doshpk, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Do$h 'n' Pecks (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5doshpk05 )
+GAMEL( 199?, m5doshpk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Do$h 'n' Pecks (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5doshpk05 )
+GAMEL( 199?, m5doshpk05 ,m5doshpk, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Do$h 'n' Pecks (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5doshpk05 )
-GAME( 199?, m5draclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5draclb07 ,m5draclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5draclb01 ,m5draclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5draclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5draclb07 ,m5draclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5draclb01 ,m5draclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ooh Aah Dracula Club (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5ewn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ewn )
-GAMEL( 199?, m5ewn08 ,m5ewn, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ewn )
+GAMEL( 199?, m5ewn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ewn )
+GAMEL( 199?, m5ewn08 ,m5ewn, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Each Way Nudge (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ewn )
-GAMEL( 199?, m5elim ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elim )
-GAMEL( 199?, m5elim03 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elim )
-GAMEL( 199?, m5elim04 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elim )
+GAMEL( 199?, m5elim ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elim )
+GAMEL( 199?, m5elim03 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elim )
+GAMEL( 199?, m5elim04 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Eliminator (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elim )
-GAMEL( 199?, m5egr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Elvis Gold Rush (Barcrest) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5egr )
-GAMEL( 199?, m5egra ,m5egr, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Elvis Gold Rush (Barcrest) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5egr )
+GAMEL( 199?, m5egr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Elvis Gold Rush (Barcrest) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5egr )
+GAMEL( 199?, m5egra ,m5egr, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Elvis Gold Rush (Barcrest) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5egr )
-GAME( 199?, m5egss ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Elvis Gold Super Streak (Barcrest) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5egssa ,m5egss, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Elvis Gold Super Streak (Barcrest) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5egss ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Elvis Gold Super Streak (Barcrest) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5egssa ,m5egss, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Elvis Gold Super Streak (Barcrest) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5evgrhr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Elvis Gold Red Hot Roll (Barcrest) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5evgrhr )
-GAMEL( 199?, m5evgrhra ,m5evgrhr, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Elvis Gold Red Hot Roll (Barcrest) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5evgrhr )
+GAMEL( 199?, m5evgrhr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Elvis Gold Red Hot Roll (Barcrest) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5evgrhr )
+GAMEL( 199?, m5evgrhra ,m5evgrhr, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Elvis Gold Red Hot Roll (Barcrest) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5evgrhr )
-GAMEL( 199?, m5xchn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xchn )
+GAMEL( 199?, m5xchn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Exchanges Unlimited (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xchn )
-GAMEL( 199?, m5firebl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Fireball (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5firebl )
+GAMEL( 199?, m5firebl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Fireball (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5firebl )
-GAMEL( 199?, m5flipcr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Flippin Crazy (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5flipcr )
+GAMEL( 199?, m5flipcr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Flippin Crazy (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5flipcr )
-GAMEL( 199?, m5fortby ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fortby )
-GAMEL( 199?, m5fortby01 ,m5fortby, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fortby )
+GAMEL( 199?, m5fortby ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fortby )
+GAMEL( 199?, m5fortby01 ,m5fortby, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Fort Boyard (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fortby )
-GAMEL( 199?, m5frnzy ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5frnzy )
-GAMEL( 199?, m5frnzya ,m5frnzy, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5frnzy )
+GAMEL( 199?, m5frnzy ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5frnzy )
+GAMEL( 199?, m5frnzya ,m5frnzy, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Frenzy (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5frnzy )
-GAMEL( 199?, m5beans ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5beansa )
-GAMEL( 199?, m5beansa ,m5beans, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5beansa )
+GAMEL( 199?, m5beans ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5beansa )
+GAMEL( 199?, m5beansa ,m5beans, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Full Of Beans (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5beansa )
-GAMEL( 199?, m5funsun ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5funsun )
-GAMEL( 199?, m5funsun03 ,m5funsun, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5funsun )
+GAMEL( 199?, m5funsun ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5funsun )
+GAMEL( 199?, m5funsun03 ,m5funsun, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Fun In The Sun (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5funsun )
-GAMEL( 199?, m5gimmie ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gimmie Gimmie Gimmie (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gimmie )
+GAMEL( 199?, m5gimmie ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gimmie Gimmie Gimmie (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gimmie )
-GAMEL( 199?, m5grush ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
-GAMEL( 199?, m5grush10 ,m5grush, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
-GAMEL( 199?, m5grush04 ,m5grush, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
-GAMEL( 199?, m5grush03 ,m5grush, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
-GAMEL( 199?, m5grush02 ,m5grush, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
-GAMEL( 199?, m5grush01 ,m5grush, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
+GAMEL( 199?, m5grush ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
+GAMEL( 199?, m5grush10 ,m5grush, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
+GAMEL( 199?, m5grush04 ,m5grush, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
+GAMEL( 199?, m5grush03 ,m5grush, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
+GAMEL( 199?, m5grush02 ,m5grush, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
+GAMEL( 199?, m5grush01 ,m5grush, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush (Barcrest) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush )
-GAMEL( 199?, m5grush5 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush5 )
-GAMEL( 199?, m5grush504 ,m5grush5, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush5 )
+GAMEL( 199?, m5grush5 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush5 )
+GAMEL( 199?, m5grush504 ,m5grush5, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush Five Liner (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5grush5 )
-GAME( 199?, m5gruss ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush Sit Down (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gruss ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush Sit Down (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5grusst ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5grusst04 ,m5grusst, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5grusst03 ,m5grusst, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grusst ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grusst04 ,m5grusst, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5grusst03 ,m5grusst, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Rush Stampede (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5gstrik ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
-GAMEL( 199?, m5gstrik11 ,m5gstrik, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
-GAMEL( 199?, m5gstrik02 ,m5gstrik, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
-GAMEL( 199?, m5gstrik01 ,m5gstrik, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
-GAMEL( 199?, m5gstrik01a ,m5gstrik, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
-GAMEL( 199?, m5gstrika ,m5gstrik, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
+GAMEL( 199?, m5gstrik ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
+GAMEL( 199?, m5gstrik11 ,m5gstrik, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
+GAMEL( 199?, m5gstrik02 ,m5gstrik, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
+GAMEL( 199?, m5gstrik01 ,m5gstrik, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
+GAMEL( 199?, m5gstrik01a ,m5gstrik, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
+GAMEL( 199?, m5gstrika ,m5gstrik, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Strike (Barcrest) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gstrik )
-GAMEL( 199?, m5gsstrk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gsstrk07 )
-GAMEL( 199?, m5gsstrk07 ,m5gsstrk, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gsstrk07 )
+GAMEL( 199?, m5gsstrk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gsstrk07 )
+GAMEL( 199?, m5gsstrk07 ,m5gsstrk, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Gold Super Streak (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gsstrk07 )
-GAMEL( 199?, m5gdrag ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Golden Dragon (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gdrag )
+GAMEL( 199?, m5gdrag ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Golden Dragon (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5gdrag )
-GAME( 199?, m5gdrgcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gdrgcl05 ,m5gdrgcl, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gdrgcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gdrgcl05 ,m5gdrgcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Golden Dragon Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gkeys ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Golden Keys (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gkeys ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Golden Keys (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5hellrz ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Hellraiser (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hellrz )
+GAMEL( 199?, m5hellrz ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Hellraiser (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hellrz )
-GAMEL( 199?, m5hlsumo ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Hi Lo Sumo (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hlsumo )
+GAMEL( 199?, m5hlsumo ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Hi Lo Sumo (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hlsumo )
-GAMEL( 199?, m5hifly ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hifly )
-GAMEL( 199?, m5hifly03 ,m5hifly, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hifly )
-GAMEL( 199?, m5hifly04 ,m5hifly, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hifly )
+GAMEL( 199?, m5hifly ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hifly )
+GAMEL( 199?, m5hifly03 ,m5hifly, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hifly )
+GAMEL( 199?, m5hifly04 ,m5hifly, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","High Flyer (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hifly )
-GAMEL( 199?, m5holy ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5holy )
-GAMEL( 199?, m5holy10 ,m5holy, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5holy )
+GAMEL( 199?, m5holy ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5holy )
+GAMEL( 199?, m5holy10 ,m5holy, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Holy Grail (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5holy )
-GAMEL( 199?, m5hotslt ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Hot Slot (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hotslt )
+GAMEL( 199?, m5hotslt ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Hot Slot (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hotslt )
-GAMEL( 199?, m5hotstf ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Hot Stuff (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hotstf )
+GAMEL( 199?, m5hotstf ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Hot Stuff (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hotstf )
-GAMEL( 199?, m5hypvip ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Hyper Viper (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hypvip )
+GAMEL( 199?, m5hypvip ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Hyper Viper (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hypvip )
-GAMEL( 199?, m5jackpt ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackpt )
-GAMEL( 199?, m5jackpt07 ,m5jackpt, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackpt )
+GAMEL( 199?, m5jackpt ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackpt )
+GAMEL( 199?, m5jackpt07 ,m5jackpt, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jackpoteers (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackpt )
-GAMEL( 199?, m5jackp2 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackp2 )
-GAMEL( 199?, m5jackp2a ,m5jackp2, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackp2 )
+GAMEL( 199?, m5jackp2 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackp2 )
+GAMEL( 199?, m5jackp2a ,m5jackp2, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jackpoteers 2 (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackp2 )
-GAMEL( 199?, m5jlyjwl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jlyjwl )
-GAMEL( 199?, m5jlyjwl01 ,m5jlyjwl, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jlyjwl )
-GAMEL( 199?, m5jlyjwl02 ,m5jlyjwl, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jlyjwl )
+GAMEL( 199?, m5jlyjwl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jlyjwl )
+GAMEL( 199?, m5jlyjwl01 ,m5jlyjwl, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jlyjwl )
+GAMEL( 199?, m5jlyjwl02 ,m5jlyjwl, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jolly Jewels (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jlyjwl )
-GAME( 199?, m5jlyrog ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jlyroga ,m5jlyrog, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jlyrog ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jlyroga ,m5jlyrog, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Jolly Roger (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5kkebab ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kkebab )
-GAMEL( 199?, m5kkebab10 ,m5kkebab, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kkebab )
-GAMEL( 199?, m5kkebaba ,m5kkebab, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kkebab )
+GAMEL( 199?, m5kkebab ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kkebab )
+GAMEL( 199?, m5kkebab10 ,m5kkebab, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kkebab )
+GAMEL( 199?, m5kkebaba ,m5kkebab, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","King Kebab (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kkebab )
-GAME( 199?, m5kingko ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5kingko04 ,m5kingko, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5kingko05 ,m5kingko, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kingko ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kingko04 ,m5kingko, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kingko05 ,m5kingko, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","King KO (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5lotta ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Lotta Luck (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5lotta )
+GAMEL( 199?, m5lotta ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Lotta Luck (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5lotta )
-GAMEL( 199?, m5mega ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Mega Zone (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mega )
+GAMEL( 199?, m5mega ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Mega Zone (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mega )
-GAMEL( 199?, m5martns ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Money Mad Martians (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5martns07 )
-GAMEL( 199?, m5martns07 ,m5martns, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Money Mad Martians (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5martns07 )
+GAMEL( 199?, m5martns ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Money Mad Martians (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5martns07 )
+GAMEL( 199?, m5martns07 ,m5martns, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Money Mad Martians (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5martns07 )
-GAMEL( 199?, m5mmak ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Money Maker (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mmak06 )
-GAMEL( 199?, m5mmak06 ,m5mmak, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Money Maker (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mmak06 )
+GAMEL( 199?, m5mmak ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Money Maker (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mmak06 )
+GAMEL( 199?, m5mmak06 ,m5mmak, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Money Maker (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mmak06 )
-GAME( 199?, m5monjok ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Monedin Joker (Spanish) (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5monjoka ,m5monjok, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Monedin Joker (Spanish) (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5monjok ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Monedin Joker (Spanish) (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5monjoka ,m5monjok, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Monedin Joker (Spanish) (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5monty ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Monty Python (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5monty ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Monty Python (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5mprio ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Monty Python Rio (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mprio )
+GAMEL( 199?, m5mprio ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Monty Python Rio (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mprio )
-GAMEL( 199?, m5mpfc ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Monty Python's Flying Circus (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mpfc )
+GAMEL( 199?, m5mpfc ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Monty Python's Flying Circus (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5mpfc )
-GAME( 199?, m5mpfccl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Monty Python's Flying Circus Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mpfccl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Monty Python's Flying Circus Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5neptun ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Neptunes Treasure (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5neptun )
+GAMEL( 199?, m5neptun ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Neptunes Treasure (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5neptun )
-GAMEL( 199?, m5nnww ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Nudge Nudge Wink Wink (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5nnww )
+GAMEL( 199?, m5nnww ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Nudge Nudge Wink Wink (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5nnww )
-GAME( 199?, m5nnwwgl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Nudge Nudge Wink Wink Gold (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5nnwwgl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Nudge Nudge Wink Wink Gold (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5fiddle ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","On The Fiddle (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fiddle )
-GAMEL( 199?, m5fiddle03 ,m5fiddle, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","On The Fiddle (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fiddle )
+GAMEL( 199?, m5fiddle ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","On The Fiddle (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fiddle )
+GAMEL( 199?, m5fiddle03 ,m5fiddle, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","On The Fiddle (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5fiddle )
-GAMEL( 199?, m5oohaah ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ooh Aah Dracula (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5oohaah )
-GAMEL( 199?, m5oohaah01 ,m5oohaah, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ooh Aah Dracula (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5oohaah )
+GAMEL( 199?, m5oohaah ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ooh Aah Dracula (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5oohaah )
+GAMEL( 199?, m5oohaah01 ,m5oohaah, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ooh Aah Dracula (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5oohaah )
-GAMEL( 199?, m5oohrio ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ooh Ahh Dracula Rio (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5oohrio )
+GAMEL( 199?, m5oohrio ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ooh Ahh Dracula Rio (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5oohrio )
-GAMEL( 199?, m5openbx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
-GAMEL( 199?, m5openbx06 ,m5openbx, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
-GAMEL( 199?, m5openbx05 ,m5openbx, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
-GAMEL( 199?, m5openbx01 ,m5openbx, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
+GAMEL( 199?, m5openbx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
+GAMEL( 199?, m5openbx06 ,m5openbx, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
+GAMEL( 199?, m5openbx05 ,m5openbx, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
+GAMEL( 199?, m5openbx01 ,m5openbx, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Open The Box (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5openbx05 )
-GAMEL( 199?, m5overld ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
-GAMEL( 199?, m5overld02 ,m5overld, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
-GAMEL( 199?, m5overld10 ,m5overld, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
-GAMEL( 199?, m5overld11 ,m5overld, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
+GAMEL( 199?, m5overld ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
+GAMEL( 199?, m5overld02 ,m5overld, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
+GAMEL( 199?, m5overld10 ,m5overld, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
+GAMEL( 199?, m5overld11 ,m5overld, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Overload (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5overld )
-GAMEL( 199?, m5ptyani ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Party Animal (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ptyani )
-GAMEL( 199?, m5ptyani01 ,m5ptyani, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Party Animal (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ptyani )
+GAMEL( 199?, m5ptyani ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Party Animal (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ptyani )
+GAMEL( 199?, m5ptyani01 ,m5ptyani, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Party Animal (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ptyani )
-GAMEL( 199?, m5peepsh ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Peep Show (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5peepsh )
+GAMEL( 199?, m5peepsh ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Peep Show (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5peepsh )
-GAME( 199?, m5psy2 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Psycho Cash Beast 2 (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5psy2 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Psycho Cash Beast 2 (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5qshot ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Quack Shot (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qshot04 )
-GAMEL( 199?, m5qshot04 ,m5qshot, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Quack Shot (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qshot04 )
+GAMEL( 199?, m5qshot ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Quack Shot (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qshot04 )
+GAMEL( 199?, m5qshot04 ,m5qshot, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Quack Shot (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qshot04 )
-GAME( 199?, m5roof ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Raise The Roof (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5roofa ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Raise The Roof (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5roof ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Raise The Roof (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5roofa ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Raise The Roof (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5razdz ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Razzle Dazzle Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5razdz10 )
-GAMEL( 199?, m5razdz10 ,m5razdz, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Razzle Dazzle Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5razdz10 )
-GAMEL( 199?, m5razdz11 ,m5razdz, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Razzle Dazzle Club (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5razdz10 )
+GAMEL( 199?, m5razdz ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Razzle Dazzle Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5razdz10 )
+GAMEL( 199?, m5razdz10 ,m5razdz, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Razzle Dazzle Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5razdz10 )
+GAMEL( 199?, m5razdz11 ,m5razdz, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Razzle Dazzle Club (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5razdz10 )
-GAMEL( 199?, m5redrck ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ready To Rock (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redrcka )
-GAMEL( 199?, m5redrck10 ,m5redrck, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ready To Rock (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redrcka )
-GAMEL( 199?, m5redrcka ,m5redrck, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ready To Rock (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redrcka )
+GAMEL( 199?, m5redrck ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ready To Rock (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redrcka )
+GAMEL( 199?, m5redrck10 ,m5redrck, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ready To Rock (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redrcka )
+GAMEL( 199?, m5redrcka ,m5redrck, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ready To Rock (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redrcka )
-GAME( 199?, m5rhkni ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red Hot Knights (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rhkni ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red Hot Knights (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rhrg ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red Hot Roll Gold (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rhrga ,m5rhrg, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red Hot Roll Gold (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rhrg ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red Hot Roll Gold (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rhrga ,m5rhrg, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red Hot Roll Gold (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5rhrgt ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red Hot Roll Triple (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rhrgt02 )
-GAMEL( 199?, m5rhrgt12 ,m5rhrgt, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red Hot Roll Triple (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rhrgt02 )
-GAMEL( 199?, m5rhrgt02 ,m5rhrgt, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red Hot Roll Triple (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rhrgt02 )
+GAMEL( 199?, m5rhrgt ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red Hot Roll Triple (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rhrgt02 )
+GAMEL( 199?, m5rhrgt12 ,m5rhrgt, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red Hot Roll Triple (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rhrgt02 )
+GAMEL( 199?, m5rhrgt02 ,m5rhrgt, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red Hot Roll Triple (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rhrgt02 )
-GAMEL( 199?, m5revo ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Revolution (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5revo13 )
-GAMEL( 199?, m5revo13 ,m5revo, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Revolution (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5revo13 )
-GAMEL( 199?, m5revoa ,m5revo, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Revolution (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5revo13 )
+GAMEL( 199?, m5revo ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Revolution (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5revo13 )
+GAMEL( 199?, m5revo13 ,m5revo, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Revolution (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5revo13 )
+GAMEL( 199?, m5revoa ,m5revo, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Revolution (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5revo13 )
-GAMEL( 199?, m5rgclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb11 ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb12 ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb20 ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb21 ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb03 ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb01 ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAMEL( 199?, m5rgclb01a ,m5rgclb, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb11 ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb12 ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb20 ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb21 ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb03 ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb01 ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
+GAMEL( 199?, m5rgclb01a ,m5rgclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rio Grande Club (Barcrest) (MPU5) (set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rgclb12 )
-GAME( 199?, m5rcx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Royal Exchange Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rcxa ,m5rcx, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Royal Exchange Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rcx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Royal Exchange Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rcxa ,m5rcx, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Royal Exchange Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5rub ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rubies & Diamonds (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rub )
+GAMEL( 199?, m5rub ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rubies & Diamonds (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rub )
-GAMEL( 199?, m5ritj ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Rumble In The Jungle (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ritj )
+GAMEL( 199?, m5ritj ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Rumble In The Jungle (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ritj )
-GAMEL( 199?, m5rfymc ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Run For Your Money Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rfymc )
-GAMEL( 199?, m5rfymc06 ,m5rfymc, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Run For Your Money Club (Barcrest) (MPU5) (Set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rfymc )
+GAMEL( 199?, m5rfymc ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Run For Your Money Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rfymc )
+GAMEL( 199?, m5rfymc06 ,m5rfymc, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Run For Your Money Club (Barcrest) (MPU5) (Set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rfymc )
-GAMEL( 199?, m5seven ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Seven Deadly Spins (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5seven )
+GAMEL( 199?, m5seven ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Seven Deadly Spins (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5seven )
-GAMEL( 199?, m5sheik ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Sheik Yer Money (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sheik )
+GAMEL( 199?, m5sheik ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Sheik Yer Money (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sheik )
-GAME( 199?, m5showtm ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Showtime (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5showtm ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Showtime (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5silver ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Silver Screen (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5silver06 ,m5silver, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Silver Screen (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5silver03 ,m5silver, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Silver Screen (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5silver ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Silver Screen (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5silver06 ,m5silver, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Silver Screen (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5silver03 ,m5silver, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Silver Screen (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5sondr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Son Of Dracula (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sondra )
-GAMEL( 199?, m5sondr05 ,m5sondr, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Son Of Dracula (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sondra )
-GAMEL( 199?, m5sondra ,m5sondr, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Son Of Dracula (Barcrest) (MPU5) (15GBP Jackpot)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sondra )
+GAMEL( 199?, m5sondr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Son Of Dracula (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sondra )
+GAMEL( 199?, m5sondr05 ,m5sondr, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Son Of Dracula (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sondra )
+GAMEL( 199?, m5sondra ,m5sondr, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Son Of Dracula (Barcrest) (MPU5) (15GBP Jackpot)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sondra )
-GAME( 199?, m5spicer ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Spice Is Right (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5spicer06 ,m5spicer, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","The Spice Is Right (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5spicer ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Spice Is Right (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5spicer06 ,m5spicer, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","The Spice Is Right (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5spiker ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Spiker The Biker (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spiker )
-GAMEL( 199?, m5spiker02 ,m5spiker, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Spiker The Biker (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spiker )
-GAMEL( 199?, m5spikera ,m5spiker, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Spiker The Biker (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spiker )
+GAMEL( 199?, m5spiker ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Spiker The Biker (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spiker )
+GAMEL( 199?, m5spiker02 ,m5spiker, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Spiker The Biker (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spiker )
+GAMEL( 199?, m5spikera ,m5spiker, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Spiker The Biker (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spiker )
-GAMEL( 199?, m5spins ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Spinsation (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spins )
+GAMEL( 199?, m5spins ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Spinsation (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5spins )
-GAMEL( 199?, m5squids ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
-GAMEL( 199?, m5squids04a ,m5squids, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
-GAMEL( 199?, m5squids05 ,m5squids, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
-GAMEL( 199?, m5squids06 ,m5squids, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
+GAMEL( 199?, m5squids ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
+GAMEL( 199?, m5squids04a ,m5squids, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
+GAMEL( 199?, m5squids05 ,m5squids, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
+GAMEL( 199?, m5squids06 ,m5squids, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Squids In (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5squids06 )
-GAMEL( 199?, m5stax ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Stax Of Cash (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stax )
+GAMEL( 199?, m5stax ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Stax Of Cash (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stax )
-GAMEL( 199?, m5scharg ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
-GAMEL( 199?, m5scharg05 ,m5scharg, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
-GAMEL( 199?, m5scharg06 ,m5scharg, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
-GAMEL( 199?, m5scharga ,m5scharg, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
+GAMEL( 199?, m5scharg ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
+GAMEL( 199?, m5scharg05 ,m5scharg, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
+GAMEL( 199?, m5scharg06 ,m5scharg, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
+GAMEL( 199?, m5scharga ,m5scharg, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Charged (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5scharg )
-GAME( 199?, m5supstr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Star (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5supstra ,m5supstr, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Star (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5supstr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Star (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5supstra ,m5supstr, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Star (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5sstrk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Streak (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sstrk )
-GAMEL( 199?, m5sstrk02a ,m5sstrk, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Super Streak (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sstrk )
+GAMEL( 199?, m5sstrk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Streak (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sstrk )
+GAMEL( 199?, m5sstrk02a ,m5sstrk, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Super Streak (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5sstrk )
-GAMEL( 199?, m5supnov ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Supernova (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supnov )
-GAMEL( 199?, m5supnova ,m5supnov, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Supernova (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supnov )
+GAMEL( 199?, m5supnov ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Supernova (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supnov )
+GAMEL( 199?, m5supnova ,m5supnov, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Supernova (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supnov )
-GAME( 199?, m5tempt ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5tempt05 ,m5tempt, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5tempta ,m5tempt, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5temptb ,m5tempt, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tempt ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tempt05 ,m5tempt, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tempta ,m5tempt, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5temptb ,m5tempt, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure (Barcrest) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5tempt2 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure 2 (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempt2 )
-GAMEL( 199?, m5tempt203 ,m5tempt2, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure 2 (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempt2 )
-GAMEL( 199?, m5tempt2a ,m5tempt2, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure 2 (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempt2 )
+GAMEL( 199?, m5tempt2 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure 2 (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempt2 )
+GAMEL( 199?, m5tempt203 ,m5tempt2, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure 2 (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempt2 )
+GAMEL( 199?, m5tempt2a ,m5tempt2, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure 2 (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempt2 )
-GAMEL( 199?, m5tempcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Temple Of Treasure Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempcl )
+GAMEL( 199?, m5tempcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Temple Of Treasure Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempcl )
-GAMEL( 199?, m5tbird ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Thunderbird (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tbird )
+GAMEL( 199?, m5tbird ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Thunderbird (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tbird )
-GAME( 199?, m5topdog ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Top Dog (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5topdog04 ,m5topdog, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Top Dog (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5topdoga ,m5topdog, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Top Dog (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5topdog ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Top Dog (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5topdog04 ,m5topdog, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Top Dog (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5topdoga ,m5topdog, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Top Dog (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5trail ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Trailblazer Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5trail )
+GAMEL( 199?, m5trail ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Trailblazer Club (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5trail )
-GAMEL( 199?, m5ultimo ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ultimo (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ultimo04 )
-GAMEL( 199?, m5ultimo03a ,m5ultimo, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ultimo (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ultimo04 )
-GAMEL( 199?, m5ultimo04 ,m5ultimo, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Ultimo (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ultimo04 )
+GAMEL( 199?, m5ultimo ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ultimo (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ultimo04 )
+GAMEL( 199?, m5ultimo03a ,m5ultimo, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ultimo (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ultimo04 )
+GAMEL( 199?, m5ultimo04 ,m5ultimo, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Ultimo (Barcrest) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ultimo04 )
-GAMEL( 199?, m5upover ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Up & Over (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5upover )
-GAMEL( 199?, m5upover15 ,m5upover, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Up & Over (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5upover )
+GAMEL( 199?, m5upover ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Up & Over (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5upover )
+GAMEL( 199?, m5upover15 ,m5upover, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Up & Over (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5upover )
-GAMEL( 199?, m5vampup ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Vamp It Up (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5vampup )
+GAMEL( 199?, m5vampup ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Vamp It Up (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5vampup )
-GAMEL( 199?, m5wking ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Wild King (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wking05 )
-GAMEL( 199?, m5wking05 ,m5wking, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Wild King (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wking05 )
+GAMEL( 199?, m5wking ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Wild King (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wking05 )
+GAMEL( 199?, m5wking05 ,m5wking, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Wild King (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wking05 )
-GAME( 199?, m5costa ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Costa Del Cash (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5costa ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Costa Del Cash (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ttwo ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Take Two (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ttwo ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Take Two (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5horn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Whitbread","Horn Of Plenty (Barcrest / Whitbread) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5horn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Whitbread","Horn Of Plenty (Barcrest / Whitbread) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotrk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Hot Rocks (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotrk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Hot Rocks (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
/* Barcrest / Red Gaming */
-GAME( 199?, m5ashock ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Aftershock (Barcrest - Red Gaming) (MPU5, v1.2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ashocka ,m5ashock, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Aftershock (Barcrest - Red Gaming) (MPU5, v1.3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ashock ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Aftershock (Barcrest - Red Gaming) (MPU5, v1.2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ashocka ,m5ashock, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Aftershock (Barcrest - Red Gaming) (MPU5, v1.3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bigsht ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bigsht04 ,m5bigsht, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bigsht11 ,m5bigsht, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bigsht13 ,m5bigsht, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bigshta ,m5bigsht, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bigsht ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bigsht04 ,m5bigsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bigsht11 ,m5bigsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bigsht13 ,m5bigsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bigshta ,m5bigsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Big Shot (Barcrest - Red Gaming) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bnkrs ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Bonkers (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bnkrs ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Bonkers (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bbank ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Break The Bank (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5bbank13 ,m5bbank, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Break The Bank (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bbank ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Break The Bank (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bbank13 ,m5bbank, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Break The Bank (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5casfev ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Casino Fever (Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5casfev12 ,m5casfev, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Casino Fever (Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5casfev ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Casino Fever (Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5casfev12 ,m5casfev, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Casino Fever (Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dmnstr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Demon Streak (Barcrest - Red Gaming) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dmnstra ,m5dmnstr, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Demon Streak (Barcrest - Red Gaming) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dmnstr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Demon Streak (Barcrest - Red Gaming) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dmnstra ,m5dmnstr, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Demon Streak (Barcrest - Red Gaming) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dbubl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Double Bubble (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dbubl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Double Bubble (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dragnd ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Dragon Drop (Barcrest - Red Gaming) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dragnda ,m5dragnd, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Dragon Drop (Barcrest - Red Gaming) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dragnd ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Dragon Drop (Barcrest - Red Gaming) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dragnda ,m5dragnd, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Dragon Drop (Barcrest - Red Gaming) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fnfair ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Funfair (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fnfaird ,m5fnfair, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Funfair (Barcrest - Red Gaming) (MPU5) (Datapak)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fnfair ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Funfair (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fnfaird ,m5fnfair, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Funfair (Barcrest - Red Gaming) (MPU5) (Datapak)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fusir ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Fruits U Sir (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fusir11 ,m5fusir, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Fruits U Sir (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fusir12 ,m5fusir, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Fruits U Sir (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fusir ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Fruits U Sir (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fusir11 ,m5fusir, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Fruits U Sir (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fusir12 ,m5fusir, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Fruits U Sir (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hypalx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Hypalinx (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hypalx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Hypalinx (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5invad ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Invaders (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5invad ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Invaders (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jcptgn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Jackpot Genie (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jcptgn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Jackpot Genie (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jlstrk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Jewel Strike (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jlstrk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Jewel Strike (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lock ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lock13 ,m5lock, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lock12 ,m5lock, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lock ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lock13 ,m5lock, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lock12 ,m5lock, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lockcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load Club (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lockcl15 ,m5lockcl, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load Club (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lockcl14 ,m5lockcl, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load Club (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lockcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load Club (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lockcl15 ,m5lockcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load Club (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lockcl14 ,m5lockcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Lock 'n' Load Club (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5nitro ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Nitro (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5nitro ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Nitro (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5paint ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Paint The Town Red (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5paint ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Paint The Town Red (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5quake ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Quake (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5quake ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Quake (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rainrn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Rainbow Runner (Barcrest - Red Gaming) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rainrna ,m5rainrn, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Rainbow Runner (Barcrest - Red Gaming) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rainrn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Rainbow Runner (Barcrest - Red Gaming) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rainrna ,m5rainrn, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Rainbow Runner (Barcrest - Red Gaming) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rampg ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Rampage (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rampg11 ,m5rampg, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Rampage (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rampg12 ,m5rampg, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Rampage (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rampg ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Rampage (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rampg11 ,m5rampg, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Rampage (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rampg12 ,m5rampg, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Rampage (Barcrest - Red Gaming) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rdwarf ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Red Dwarf (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rdwarf ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Red Dwarf (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5redx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Red X (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5redx12 ,m5redx, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Red X (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5redx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Red X (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5redx12 ,m5redx, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Red X (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5thtsmg ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","That's Magic (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5thtsmg ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","That's Magic (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5topdol ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Top Dollar (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5topdola ,m5topdol, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Top Dollar (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5topdol ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Top Dollar (Barcrest - Red Gaming) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5topdola ,m5topdol, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Top Dollar (Barcrest - Red Gaming) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5zigzag ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Zig Zag (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5zigzag ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Zig Zag (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cmass ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Critical Mass (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cmass ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Critical Mass (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sblz ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Snail Blazer (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sblz ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Snail Blazer (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5slide ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest / Red Gaming","Slider (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5slide ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest / Red Gaming","Slider (Barcrest - Red Gaming) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
/* Vivid */
-GAME( 199?, m5sixsht ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v1.1, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshta ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v1.1, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtb ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtc ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtd ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshte ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtf ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtg ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshth ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 7)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshti ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtj ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtk ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtl ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtm ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sixshtn ,m5sixsht, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixsht ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v1.1, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshta ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v1.1, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtb ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtc ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtd ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshte ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtf ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtg ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshth ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.0, set 7)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshti ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtj ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtk ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtl ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtm ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sixshtn ,m5sixsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Six Shooter (Vivid) (MPU5) (v2.1, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5all41 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41a ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41b ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41c ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41d ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41e ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41f ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41g ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41h ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41i ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 10)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41j ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 11)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41k ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 12)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41l ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 13)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAMEL( 199?, m5all41m ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 14)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41a ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41b ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41c ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41d ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41e ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41f ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41g ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41h ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41i ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 10)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41j ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 11)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41k ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 12)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41l ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 13)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
+GAMEL( 199?, m5all41m ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","All 4 One (Vivid) (MPU5, set 14)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5all41d )
-GAME( 199?, m5atlan ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Atlantic (Vivid) (MPU5, v1.4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5atlana ,m5atlan, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Atlantic (Vivid) (MPU5, v1.2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5atlan ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Atlantic (Vivid) (MPU5, v1.4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5atlana ,m5atlan, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Atlantic (Vivid) (MPU5, v1.2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5bttf ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Back To The Features (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bttf )
-GAMEL( 199?, m5bttfa ,m5bttf, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Back To The Features (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bttf )
+GAMEL( 199?, m5bttf ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Back To The Features (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bttf )
+GAMEL( 199?, m5bttfa ,m5bttf, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Back To The Features (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bttf )
-GAMEL( 199?, m5btlbnk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Bottle Bank (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5btlbnk )
+GAMEL( 199?, m5btlbnk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Bottle Bank (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5btlbnk )
-GAME( 199?, m5caesc ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Caesar's Cash (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5caesc ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Caesar's Cash (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5card ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Card Shark (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5card ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Card Shark (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5cshkcb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Card Shark Club (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshkcb )
-GAMEL( 199?, m5cshkcb12 ,m5cshkcb, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Card Shark Club (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshkcb )
-GAMEL( 199?, m5cshkcb13 ,m5cshkcb, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Card Shark Club (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshkcb )
+GAMEL( 199?, m5cshkcb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Card Shark Club (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshkcb )
+GAMEL( 199?, m5cshkcb12 ,m5cshkcb, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Card Shark Club (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshkcb )
+GAMEL( 199?, m5cshkcb13 ,m5cshkcb, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Card Shark Club (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshkcb )
-GAMEL( 199?, m5clifhn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Cliffhanger (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clifhn )
+GAMEL( 199?, m5clifhn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Cliffhanger (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clifhn )
-GAME( 199?, m5cnct4 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Connect 4 (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cnct415 ,m5cnct4, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Connect 4 (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cnct420 ,m5cnct4, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Connect 4 (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cnct4 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Connect 4 (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cnct415 ,m5cnct4, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Connect 4 (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cnct420 ,m5cnct4, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Connect 4 (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5devil ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Devil Of A Deal (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5devil )
+GAMEL( 199?, m5devil ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Devil Of A Deal (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5devil )
-GAMEL( 199?, m5elband ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","El Bandido Club (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elband )
+GAMEL( 199?, m5elband ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","El Bandido Club (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5elband )
-GAME( 199?, m5fair ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Fairground Attraction (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fair ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Fairground Attraction (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5ggems ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Giant Gems (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ggems20 )
-GAMEL( 199?, m5ggems20 ,m5ggems, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Giant Gems (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ggems20 )
+GAMEL( 199?, m5ggems ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Giant Gems (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ggems20 )
+GAMEL( 199?, m5ggems20 ,m5ggems, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Giant Gems (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ggems20 )
-GAME( 199?, m5groll ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Golden Roll (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5groll ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Golden Roll (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5hilok ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Hi Lo Karate (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hilok )
+GAMEL( 199?, m5hilok ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Hi Lo Karate (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hilok )
-GAMEL( 199?, m5hiclau ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","High Claudius (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hiclau )
+GAMEL( 199?, m5hiclau ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","High Claudius (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hiclau )
-GAME( 199?, m5honmon ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Honey Money (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5honmona ,m5honmon, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Honey Money (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5honmon ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Honey Money (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5honmona ,m5honmon, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Honey Money (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5hopidl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Hop Idol (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hopidl )
+GAMEL( 199?, m5hopidl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Hop Idol (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hopidl )
-GAME( 199?, m5hypno ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Hypnotic (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hypno ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Hypnotic (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jmpjok ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jmpjok11 ,m5jmpjok, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jmpjoka ,m5jmpjok, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jmpjokb ,m5jmpjok, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jmpjok ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jmpjok11 ,m5jmpjok, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jmpjoka ,m5jmpjok, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jmpjokb ,m5jmpjok, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Jumpin Jokers (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5loony ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Loony Juice (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5loony )
+GAMEL( 199?, m5loony ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Loony Juice (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5loony )
-GAMEL( 199?, m5loot ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Loot 'n' Khamun (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5loot ) // aka 3-in-1 ?
-GAMEL( 199?, m5loota ,m5loot, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Loot 'n' Khamun (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5loot ) // aka 3-in-1 ?
+GAMEL( 199?, m5loot ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Loot 'n' Khamun (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5loot ) // aka 3-in-1 ?
+GAMEL( 199?, m5loota ,m5loot, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Loot 'n' Khamun (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5loot ) // aka 3-in-1 ?
-GAME( 199?, m5mag7s ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5mag7sa ,m5mag7s, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5mag7sb ,m5mag7s, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5mag7sc ,m5mag7s, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5mag7sd ,m5mag7s, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5mag7se ,m5mag7s, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mag7s ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mag7sa ,m5mag7s, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mag7sb ,m5mag7s, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mag7sc ,m5mag7s, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mag7sd ,m5mag7s, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5mag7se ,m5mag7s, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Magnificent 7s (Vivid) (MPU5, set 6)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5msf ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Manic Streak Features (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5msfa ,m5msf, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Manic Streak Features (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5msf ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Manic Streak Features (Vivid) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5msfa ,m5msf, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Manic Streak Features (Vivid) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5piefac ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
-GAMEL( 199?, m5piefac23 ,m5piefac, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
-GAMEL( 199?, m5piefac12 ,m5piefac, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
-GAMEL( 199?, m5piefaca ,m5piefac, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
+GAMEL( 199?, m5piefac ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
+GAMEL( 199?, m5piefac23 ,m5piefac, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
+GAMEL( 199?, m5piefac12 ,m5piefac, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
+GAMEL( 199?, m5piefaca ,m5piefac, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefac )
-GAME( 199?, m5piefc2 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory 2 (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5piefc2a ,m5piefc2, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory 2 (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5piefc2b ,m5piefc2, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory 2 (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5piefc2 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory 2 (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5piefc2a ,m5piefc2, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory 2 (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5piefc2b ,m5piefc2, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory 2 (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5piefcr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Pie Factory Rio (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefcr )
+GAMEL( 199?, m5piefcr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Pie Factory Rio (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5piefcr )
-GAMEL( 199?, m5qdraw ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
-GAMEL( 199?, m5qdraw12 ,m5qdraw, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
-GAMEL( 199?, m5qdraw14 ,m5qdraw, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
-GAMEL( 199?, m5qdraw15 ,m5qdraw, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
-GAMEL( 199?, m5qdrawa ,m5qdraw, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
-GAMEL( 199?, m5qdrawb ,m5qdraw, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
+GAMEL( 199?, m5qdraw ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
+GAMEL( 199?, m5qdraw12 ,m5qdraw, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
+GAMEL( 199?, m5qdraw14 ,m5qdraw, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
+GAMEL( 199?, m5qdraw15 ,m5qdraw, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
+GAMEL( 199?, m5qdrawa ,m5qdraw, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
+GAMEL( 199?, m5qdrawb ,m5qdraw, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Quick On The Draw (Vivid) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5qdrawb )
-GAMEL( 199?, m5redbal ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Random Red Ball (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redbal )
+GAMEL( 199?, m5redbal ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Random Red Ball (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5redbal )
-GAMEL( 199?, m5ratpk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Rat Pack (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ratpka )
-GAMEL( 199?, m5ratpka ,m5ratpk, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Rat Pack (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ratpka )
+GAMEL( 199?, m5ratpk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Rat Pack (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ratpka )
+GAMEL( 199?, m5ratpka ,m5ratpk, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Rat Pack (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ratpka )
-GAME( 199?, m5rawin ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid / Whitbread","Reel A Win (Vivid / Whitbread) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rawin ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid / Whitbread","Reel A Win (Vivid / Whitbread) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5rollup ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Roll Up Roll Up (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rollup )
+GAMEL( 199?, m5rollup ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Roll Up Roll Up (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rollup )
-GAMEL( 199?, m5shark ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Shark Raving Mad (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5shark )
-GAMEL( 199?, m5sharka ,m5shark, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Shark Raving Mad (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5shark )
+GAMEL( 199?, m5shark ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Shark Raving Mad (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5shark )
+GAMEL( 199?, m5sharka ,m5shark, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Shark Raving Mad (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5shark )
-GAMEL( 199?, m5speccl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Spectrum Club (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5speccl )
+GAMEL( 199?, m5speccl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Spectrum Club (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5speccl )
-GAME( 199?, m5spddmn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Speed Demon (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5spddmn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Speed Demon (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5stars ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars13a ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars26 ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars25a ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars25 ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars22 ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars20 ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars10 ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5stars10a ,m5stars, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars13a ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars26 ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars25a ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars25 ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars22 ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars20 ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 7)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars10 ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 8)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
+GAMEL( 199?, m5stars10a ,m5stars, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes (Vivid) (MPU5) (set 9)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5stars26 )
-GAMEL( 199?, m5starcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes Club (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5starcl )
+GAMEL( 199?, m5starcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes Club (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5starcl )
-GAME( 199?, m5startr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Stars & Stripes Triple (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5startr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Stars & Stripes Triple (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5supro ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Super Roulette (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supro )
-GAMEL( 199?, m5suproa ,m5supro, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Super Roulette (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supro )
+GAMEL( 199?, m5supro ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Super Roulette (Vivid) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supro )
+GAMEL( 199?, m5suproa ,m5supro, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Super Roulette (Vivid) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5supro )
-GAMEL( 199?, m5tempp ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Temple Of Pleasure (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempp )
+GAMEL( 199?, m5tempp ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Temple Of Pleasure (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tempp )
-GAME( 199?, m5whdres ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Who Dares Spins (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5whdres ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Who Dares Spins (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5winway ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Winning Ways (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5winway ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Winning Ways (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
/* Empire */
-GAME( 199?, m5fewmor ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.2, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fewmora ,m5fewmor, mpu5, mpu5, driver_device, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.2, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fewmorb ,m5fewmor, mpu5, mpu5, driver_device, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.3, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fewmorc ,m5fewmor, mpu5, mpu5, driver_device, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.3, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fewmor ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.2, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fewmora ,m5fewmor, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.2, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fewmorb ,m5fewmor, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.3, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fewmorc ,m5fewmor, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","A Few Dollars More (Empire) (MPU5) (v0.3, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5wonga ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","A Fish Called Wonga (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wonga )
+GAMEL( 199?, m5wonga ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","A Fish Called Wonga (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wonga )
-GAME( 199?, m5aceclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Ace Of Clubs (Empire) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5aceclba ,m5aceclb, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Ace Of Clubs (Empire) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5aceclbb ,m5aceclb, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Ace Of Clubs (Empire) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5aceclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Ace Of Clubs (Empire) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5aceclba ,m5aceclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Ace Of Clubs (Empire) (MPU5, set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5aceclbb ,m5aceclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Ace Of Clubs (Empire) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5barxdx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Bar X Deluxe (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5barxdx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Bar X Deluxe (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5bnzclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Bonanza Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bnzclb )
-GAMEL( 199?, m5bnzclb11 ,m5bnzclb, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Bonanza Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bnzclb )
+GAMEL( 199?, m5bnzclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Bonanza Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bnzclb )
+GAMEL( 199?, m5bnzclb11 ,m5bnzclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Bonanza Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5bnzclb )
-GAME( 199?, m5bukroo ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Buckaroo (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5bukroo ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Buckaroo (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cbrun ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Cannonball Run (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cbrun ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Cannonball Run (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5carou ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Carousel (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5carou )
+GAMEL( 199?, m5carou ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Carousel (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5carou )
-GAME( 199?, m5casroc ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Casino Royale Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5casroc ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Casino Royale Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5centcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
-GAMEL( 199?, m5centcl20 ,m5centcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
-GAMEL( 199?, m5centcl21 ,m5centcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
-GAMEL( 199?, m5centcl21a ,m5centcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
-GAMEL( 199?, m5centcla ,m5centcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
+GAMEL( 199?, m5centcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
+GAMEL( 199?, m5centcl20 ,m5centcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
+GAMEL( 199?, m5centcl21 ,m5centcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
+GAMEL( 199?, m5centcl21a ,m5centcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
+GAMEL( 199?, m5centcla ,m5centcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Centurion Club (Empire) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5centcl )
-GAME( 199?, m5cworan ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Clockwork Oranges (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cworan12 ,m5cworan, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Clockwork Oranges (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cworan ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Clockwork Oranges (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cworan12 ,m5cworan, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Clockwork Oranges (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5clbtro ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Club Tropicana (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5clbtro24 ,m5clbtro, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Club Tropicana (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5clbtro25 ,m5clbtro, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Club Tropicana (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clbtro ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Club Tropicana (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clbtro24 ,m5clbtro, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Club Tropicana (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clbtro25 ,m5clbtro, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Club Tropicana (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cockdd ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Cock A Doodle Dough! (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5cockdd05 ,m5cockdd, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Cock A Doodle Dough! (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cockdd ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Cock A Doodle Dough! (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5cockdd05 ,m5cockdd, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Cock A Doodle Dough! (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5coloss ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Colossus Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5coloss ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Colossus Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5crocrk ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Crocodile Rock (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5crocrk10 ,m5crocrk, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Crocodile Rock (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5crocrk ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Crocodile Rock (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5crocrk10 ,m5crocrk, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Crocodile Rock (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5croclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Crocodile Rock Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5croclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Crocodile Rock Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5crsfir ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Crossfire (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5crsfir ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Crossfire (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dmnf ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Diamonds Are Forever (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dmnf10 ,m5dmnf, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Diamonds Are Forever (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dmnf ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Diamonds Are Forever (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dmnf10 ,m5dmnf, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Diamonds Are Forever (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dmnfcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Diamonds Are Forever Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dmnfcl04 ,m5dmnfcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Diamonds Are Forever Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dmnfcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Diamonds Are Forever Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dmnfcl04 ,m5dmnfcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Diamonds Are Forever Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5extrm ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Extreme (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5extrm )
+GAMEL( 199?, m5extrm ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Extreme (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5extrm )
-GAME( 199?, m5extrmm ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5extrmm04a ,m5extrmm, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5extrmm04b ,m5extrmm, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5extrmm10 ,m5extrmm, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5extrmm ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5extrmm04a ,m5extrmm, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5extrmm04b ,m5extrmm, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5extrmm10 ,m5extrmm, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Extreme Madness (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fatcat ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Fat Cat (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fatcat ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Fat Cat (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fishdl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Fish Full Of Dollars (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fishdl10 ,m5fishdl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Fish Full Of Dollars (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fishdl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Fish Full Of Dollars (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fishdl10 ,m5fishdl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Fish Full Of Dollars (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fishcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Fish Full Of Dollars Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fishcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Fish Full Of Dollars Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fmonty ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fmonty04a ,m5fmonty, mpu5, mpu5, driver_device, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fmonty04b ,m5fmonty, mpu5, mpu5, driver_device, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fmonty04c ,m5fmonty, mpu5, mpu5, driver_device, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fmonty ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fmonty04a ,m5fmonty, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fmonty04b ,m5fmonty, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fmonty04c ,m5fmonty, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","The Full Monty (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5fmount ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Full Mountie (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5fmount ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Full Mountie (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gophr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Gopher Gold (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gophr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Gopher Gold (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gophcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Gopher Gold Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gophcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Gopher Gold Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5hisprt ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","High Spirits (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hisprt )
+GAMEL( 199?, m5hisprt ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","High Spirits (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hisprt )
-GAME( 199?, m5hocus ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hocus Pocus (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hocus10 ,m5hocus, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hocus Pocus (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hocus ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hocus Pocus (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hocus10 ,m5hocus, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hocus Pocus (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hocscl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hocus Pocus Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hocscl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hocus Pocus Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotsht ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotsht07a ,m5hotsht, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotsht08 ,m5hotsht, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotsht08a ,m5hotsht, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotsht10 ,m5hotsht, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hotsht10a ,m5hotsht, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotsht ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotsht07a ,m5hotsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotsht08 ,m5hotsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotsht08a ,m5hotsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotsht10 ,m5hotsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hotsht10a ,m5hotsht, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hot Shots (Empire) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hula ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hula Moolah (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hula10 ,m5hula, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hula Moolah (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hula ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hula Moolah (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hula10 ,m5hula, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hula Moolah (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5hulacl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Hula Moolah Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5hulacl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Hula Moolah Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5jackbx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Jack In The Box (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackbx )
-GAMEL( 199?, m5jackbx03 ,m5jackbx, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Jack In The Box (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackbx )
+GAMEL( 199?, m5jackbx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Jack In The Box (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackbx )
+GAMEL( 199?, m5jackbx03 ,m5jackbx, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Jack In The Box (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jackbx )
-GAME( 199?, m5jcy ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Juicy Fruits (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jcy ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Juicy Fruits (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5jmpgem ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Jumping Gems (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jmpgem01 )
-GAMEL( 199?, m5jmpgem01 ,m5jmpgem, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Jumping Gems (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jmpgem01 )
-GAMEL( 199?, m5jmpgem03 ,m5jmpgem, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Jumping Gems (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jmpgem01 )
+GAMEL( 199?, m5jmpgem ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Jumping Gems (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jmpgem01 )
+GAMEL( 199?, m5jmpgem01 ,m5jmpgem, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Jumping Gems (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jmpgem01 )
+GAMEL( 199?, m5jmpgem03 ,m5jmpgem, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Jumping Gems (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5jmpgem01 )
-GAME( 199?, m5jmpgmc ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Jumping Gems Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jmpgmc ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Jumping Gems Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5kaleid ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Kaleidoscope Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kaleid ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Kaleidoscope Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5kcclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","King Cobra Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5kcclb24 ,m5kcclb, mpu5, mpu5, driver_device, 0, ROT0, "Empire","King Cobra Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kcclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","King Cobra Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kcclb24 ,m5kcclb, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","King Cobra Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5kingqc ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
-GAMEL( 199?, m5kingqc06 ,m5kingqc, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
-GAMEL( 199?, m5kingqc07 ,m5kingqc, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
-GAMEL( 199?, m5kingqc08 ,m5kingqc, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
+GAMEL( 199?, m5kingqc ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
+GAMEL( 199?, m5kingqc06 ,m5kingqc, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
+GAMEL( 199?, m5kingqc07 ,m5kingqc, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
+GAMEL( 199?, m5kingqc08 ,m5kingqc, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Kings & Queens Club (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5kingqc06 )
-GAMEL( 199?, m5korma ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Korma Chameleon (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5korma )
-GAMEL( 199?, m5korma12 ,m5korma, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Korma Chameleon (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5korma )
+GAMEL( 199?, m5korma ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Korma Chameleon (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5korma )
+GAMEL( 199?, m5korma12 ,m5korma, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Korma Chameleon (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5korma )
-GAME( 199?, m5kormcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Korma Chameleon Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5kormcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Korma Chameleon Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5monmst ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Money Monster (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5monmst )
-GAMEL( 199?, m5monmsta ,m5monmst, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Money Monster (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5monmst )
+GAMEL( 199?, m5monmst ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Money Monster (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5monmst )
+GAMEL( 199?, m5monmsta ,m5monmst, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Money Monster (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5monmst )
-GAME( 199?, m5ramrd ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Ram Raid (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ramrd ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Ram Raid (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ramrcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Ram Raid Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ramrcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Ram Raid Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ronr ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Reel Or No Reel (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ronr05 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Reel Or No Reel (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ronr07 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Reel Or No Reel (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ronr ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Reel Or No Reel (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ronr05 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Reel Or No Reel (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ronr07 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Reel Or No Reel (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5resfrg ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Reservoir Frogs (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5resfrg )
+GAMEL( 199?, m5resfrg ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Reservoir Frogs (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5resfrg )
-GAMEL( 199?, m5rthh ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Return To The Haunted House (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rthh )
+GAMEL( 199?, m5rthh ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Return To The Haunted House (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rthh )
-GAMEL( 199?, m5rollx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Roll X (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rollx )
-GAMEL( 199?, m5rollx12 ,m5rollx, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Roll X (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rollx )
+GAMEL( 199?, m5rollx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Roll X (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rollx )
+GAMEL( 199?, m5rollx12 ,m5rollx, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Roll X (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rollx )
-GAMEL( 199?, m5skulcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Skullduggery Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5skulcl20 )
-GAMEL( 199?, m5skulcl20 ,m5skulcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Skullduggery Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5skulcl20 )
-GAMEL( 199?, m5skulcl23 ,m5skulcl, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Skullduggery Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5skulcl20 )
+GAMEL( 199?, m5skulcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Skullduggery Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5skulcl20 )
+GAMEL( 199?, m5skulcl20 ,m5skulcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Skullduggery Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5skulcl20 )
+GAMEL( 199?, m5skulcl23 ,m5skulcl, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Skullduggery Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5skulcl20 )
-GAME( 199?, m5tball ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Thunderball (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tball ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Thunderball (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5tomb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Tomb Raiders (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tomb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Tomb Raiders (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5trclb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Tomb Raiders Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5trclb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Tomb Raiders Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ttop ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Treble Top (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ttop04 ,m5ttop, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Treble Top (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ttop10 ,m5ttop, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Treble Top (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ttop ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Treble Top (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ttop04 ,m5ttop, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Treble Top (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ttop10 ,m5ttop, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Treble Top (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5ttopcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Treble Top Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5ttopcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Treble Top Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5tsar ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Tsar Wars (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5tsar ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Tsar Wars (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5vertgo ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Vertigo (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5vertgo )
+GAMEL( 199?, m5vertgo ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Vertigo (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5vertgo )
-GAME( 199?, m5vertcl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Vertigo Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5vertcl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Vertigo Club (Empire) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5wthing ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Wild Thing Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wthing20 )
-GAMEL( 199?, m5wthing11 ,m5wthing, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Wild Thing Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wthing20 )
-GAMEL( 199?, m5wthing20 ,m5wthing, mpu5, mpu5, driver_device, 0, ROT0, "Empire","Wild Thing Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wthing20 )
+GAMEL( 199?, m5wthing ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Wild Thing Club (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wthing20 )
+GAMEL( 199?, m5wthing11 ,m5wthing, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Wild Thing Club (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wthing20 )
+GAMEL( 199?, m5wthing20 ,m5wthing, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","Wild Thing Club (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5wthing20 )
-GAMEL( 199?, m5xfact ,0, mpu5, mpu5, driver_device, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
-GAMEL( 199?, m5xfact02 ,m5xfact, mpu5, mpu5, driver_device, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
-GAMEL( 199?, m5xfact04 ,m5xfact, mpu5, mpu5, driver_device, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
-GAMEL( 199?, m5xfact11 ,m5xfact, mpu5, mpu5, driver_device, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
+GAMEL( 199?, m5xfact ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
+GAMEL( 199?, m5xfact02 ,m5xfact, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
+GAMEL( 199?, m5xfact04 ,m5xfact, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
+GAMEL( 199?, m5xfact11 ,m5xfact, mpu5, mpu5, mpu5_state, 0, ROT0, "Empire","X Factor (Empire) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5xfact11 )
/* Bwb */
-GAME( 199?, m5carwsh ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Car Wash (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5carwsh10 ,m5carwsh, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Car Wash (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5carwsh ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Car Wash (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5carwsh10 ,m5carwsh, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Car Wash (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5cshstx ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Cash Stax (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshstx )
+GAMEL( 199?, m5cshstx ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Cash Stax (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5cshstx )
-GAMEL( 199?, m5circus ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
-GAMEL( 199?, m5circus0a ,m5circus, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
-GAMEL( 199?, m5circus0b ,m5circus, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
-GAMEL( 199?, m5circus20 ,m5circus, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
-GAMEL( 199?, m5circus21 ,m5circus, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
-GAMEL( 199?, m5circus11 ,m5circus, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
+GAMEL( 199?, m5circus ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
+GAMEL( 199?, m5circus0a ,m5circus, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
+GAMEL( 199?, m5circus0b ,m5circus, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
+GAMEL( 199?, m5circus20 ,m5circus, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
+GAMEL( 199?, m5circus21 ,m5circus, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
+GAMEL( 199?, m5circus11 ,m5circus, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus (Bwb) (MPU5) (set 6)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circus0a )
-GAMEL( 199?, m5circlb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
-GAMEL( 199?, m5circlb00 ,m5circlb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
-GAMEL( 199?, m5circlb15 ,m5circlb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
-GAMEL( 199?, m5circlb33 ,m5circlb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
+GAMEL( 199?, m5circlb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
+GAMEL( 199?, m5circlb00 ,m5circlb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
+GAMEL( 199?, m5circlb15 ,m5circlb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
+GAMEL( 199?, m5circlb33 ,m5circlb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Circus Club (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5circlb33 )
-GAMEL( 199?, m5clown ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Clown In Around (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clown11 )
-GAMEL( 199?, m5clown11 ,m5clown, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Clown In Around (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clown11 )
-GAMEL( 199?, m5clown13 ,m5clown, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Clown In Around (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clown11 )
+GAMEL( 199?, m5clown ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Clown In Around (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clown11 )
+GAMEL( 199?, m5clown11 ,m5clown, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Clown In Around (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clown11 )
+GAMEL( 199?, m5clown13 ,m5clown, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Clown In Around (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5clown11 )
-GAME( 199?, m5clubsn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5clubsn11 ,m5clubsn, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5clubsn14 ,m5clubsn, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5clubsn16 ,m5clubsn, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clubsn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clubsn11 ,m5clubsn, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clubsn14 ,m5clubsn, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5clubsn16 ,m5clubsn, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Club Sandwich (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5dick ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Dick Turnip (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dick10 )
-GAMEL( 199?, m5dick10 ,m5dick, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Dick Turnip (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dick10 )
+GAMEL( 199?, m5dick ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Dick Turnip (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dick10 )
+GAMEL( 199?, m5dick10 ,m5dick, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Dick Turnip (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dick10 )
-GAME( 199?, m5donna ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Donna Kebab (Bwb) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5donnad ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Donna Kebab (Bwb) (MPU5, set 1, Datapak)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5donnaa ,m5donna, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Donna Kebab (Bwb) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5donna ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Donna Kebab (Bwb) (MPU5, set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5donnad ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Donna Kebab (Bwb) (MPU5, set 1, Datapak)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5donnaa ,m5donna, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Donna Kebab (Bwb) (MPU5, set 3)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5dblqts ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
-GAMEL( 199?, m5dblqtsa ,m5dblqts, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
-GAMEL( 199?, m5dblqtsb ,m5dblqts, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
-GAMEL( 199?, m5dblqts1b ,m5dblqts, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
+GAMEL( 199?, m5dblqts ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
+GAMEL( 199?, m5dblqtsa ,m5dblqts, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
+GAMEL( 199?, m5dblqtsb ,m5dblqts, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
+GAMEL( 199?, m5dblqts1b ,m5dblqts, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Double Or Quits (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5dblqtsb )
-GAME( 199?, m5eggold ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Egyptian Gold (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5eggold ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Egyptian Gold (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m55050 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Fifty Fifty (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m55050 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Fifty Fifty (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5gpclub ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Get Plastered Club (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5gpclub ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Get Plastered Club (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5goape ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Going Ape (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5goape ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Going Ape (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5hgl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Happy Go Lucky (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hgl14 )
-GAMEL( 199?, m5hgl16 ,m5hgl, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Happy Go Lucky (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hgl14 )
-GAMEL( 199?, m5hgl14 ,m5hgl, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Happy Go Lucky (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hgl14 )
+GAMEL( 199?, m5hgl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Happy Go Lucky (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hgl14 )
+GAMEL( 199?, m5hgl16 ,m5hgl, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Happy Go Lucky (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hgl14 )
+GAMEL( 199?, m5hgl14 ,m5hgl, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Happy Go Lucky (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5hgl14 )
-GAME( 199?, m5jokpak ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Joker In The Pack (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jokpak ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Joker In The Pack (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lvwire ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Live Wire (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5lvwirea ,m5lvwire, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Live Wire (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lvwire ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Live Wire (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5lvwirea ,m5lvwire, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Live Wire (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5carpet ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Magic Carpet (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5carpet12 ,m5carpet, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Magic Carpet (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5carpet ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Magic Carpet (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5carpet12 ,m5carpet, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Magic Carpet (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5minesw ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Minesweeper (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5minesw ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Minesweeper (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5psycho ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Psycho Cash Beast (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
-GAMEL( 199?, m5psycho06 ,m5psycho, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Psycho Cash Beast (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
-GAMEL( 199?, m5psychoa ,m5psycho, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Psycho Cash Beast (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
-GAMEL( 199?, m5psychoa21 ,m5psycho, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Psycho Cash Beast (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
+GAMEL( 199?, m5psycho ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Psycho Cash Beast (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
+GAMEL( 199?, m5psycho06 ,m5psycho, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Psycho Cash Beast (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
+GAMEL( 199?, m5psychoa ,m5psycho, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Psycho Cash Beast (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
+GAMEL( 199?, m5psychoa21 ,m5psycho, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Psycho Cash Beast (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psycho )
-GAMEL( 199?, m5psyccl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Psycho Cash Beast Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
-GAMEL( 199?, m5psyccl01 ,m5psyccl, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Psycho Cash Beast Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
-GAMEL( 199?, m5psyccla ,m5psyccl, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Psycho Cash Beast Club (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
-GAMEL( 199?, m5psyccla24 ,m5psyccl, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Psycho Cash Beast Club (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
-GAMEL( 199?, m5psyccla02 ,m5psyccl, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Psycho Cash Beast Club (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
+GAMEL( 199?, m5psyccl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Psycho Cash Beast Club (Barcrest) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
+GAMEL( 199?, m5psyccl01 ,m5psyccl, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Psycho Cash Beast Club (Barcrest) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
+GAMEL( 199?, m5psyccla ,m5psyccl, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Psycho Cash Beast Club (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
+GAMEL( 199?, m5psyccla24 ,m5psyccl, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Psycho Cash Beast Club (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
+GAMEL( 199?, m5psyccla02 ,m5psyccl, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Psycho Cash Beast Club (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5psyccl01 )
-GAMEL( 199?, m5rwb ,0, mpu5, mpu5, driver_device, 0, ROT0, "Barcrest","Red White & Blue (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
-GAMEL( 199?, m5rwbbwb ,m5rwb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
-GAMEL( 199?, m5rwbbwb24 ,m5rwb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
-GAMEL( 199?, m5rwbbwb25 ,m5rwb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
-GAMEL( 199?, m5rwbbwb15 ,m5rwb, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
+GAMEL( 199?, m5rwb ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Barcrest","Red White & Blue (Barcrest) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
+GAMEL( 199?, m5rwbbwb ,m5rwb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
+GAMEL( 199?, m5rwbbwb24 ,m5rwb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
+GAMEL( 199?, m5rwbbwb25 ,m5rwb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 3)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
+GAMEL( 199?, m5rwbbwb15 ,m5rwb, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Red White & Blue (Bwb) (MPU5) (set 4)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5rwb )
-GAME( 199?, m5reelwn ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Reel A Win (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5reelwn24 ,m5reelwn, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Reel A Win (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5reelwn ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Reel A Win (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5reelwn24 ,m5reelwn, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Reel A Win (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5reelth ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Reel Thunder (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5reelth ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Reel Thunder (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5rlup ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Roll Up (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5rlup ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Roll Up (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5round ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Round & Round (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5round ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Round & Round (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sec7 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Secret 7s (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sec7a ,m5sec7, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Secret 7s (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sec7 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Secret 7s (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sec7a ,m5sec7, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Secret 7s (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sil7 ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Silver 7s (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5sil7a ,m5sil7, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Silver 7s (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sil7 ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Silver 7s (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5sil7a ,m5sil7, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Silver 7s (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5smobik ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Smokey Bikin (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5smobik12 ,m5smobik, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Smokey Bikin (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5smobik ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Smokey Bikin (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5smobik12 ,m5smobik, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Smokey Bikin (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL )
-GAMEL( 199?, m5tictac ,0, mpu5, mpu5, driver_device, 0, ROT0, "Vivid","Tic Tac Tut (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tictacbwb )
-GAMEL( 199?, m5tictacbwb ,m5tictac, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Tic Tac Tut (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tictacbwb )
-GAMEL( 199?, m5tictacbwb16,m5tictac, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Tic Tac Tut (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tictacbwb )
+GAMEL( 199?, m5tictac ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Vivid","Tic Tac Tut (Vivid) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tictacbwb )
+GAMEL( 199?, m5tictacbwb ,m5tictac, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Tic Tac Tut (Bwb) (MPU5) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tictacbwb )
+GAMEL( 199?, m5tictacbwb16,m5tictac, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Tic Tac Tut (Bwb) (MPU5) (set 2)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5tictacbwb )
-GAME( 199?, m5xena ,0, mpu5, mpu5, driver_device, 0, ROT0, "Bwb","Xena Warrior Princess (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5xena ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Bwb","Xena Warrior Princess (Bwb) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
/* Lowen */
-GAME( 199?, m5all41low ,m5all41, mpu5, mpu5, driver_device, 0, ROT0, "Lowen","All 4 One (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5dblfun ,0, mpu5, mpu5, driver_device, 0, ROT0, "Lowen","Double Fun (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5jakjok ,0, mpu5, mpu5, driver_device, 0, ROT0, "Lowen","Jackpot Jokers (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5roundl ,m5round, mpu5, mpu5, driver_device, 0, ROT0, "Lowen","Round & Round (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 199?, m5scfinl ,0, mpu5, mpu5, driver_device, 0, ROT0, "Lowen","Super Cup Final (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5all41low ,m5all41, mpu5, mpu5, mpu5_state, 0, ROT0, "Lowen","All 4 One (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5dblfun ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Lowen","Double Fun (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5jakjok ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Lowen","Jackpot Jokers (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5roundl ,m5round, mpu5, mpu5, mpu5_state, 0, ROT0, "Lowen","Round & Round (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, m5scfinl ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Lowen","Super Cup Final (Lowen) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL )
/* Others / Uncertain */
-GAMEL( 199?, m5ppussy ,0, mpu5, mpu5, driver_device, 0, ROT0, "Mdm","Pink Pussy (Mdm) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ppussy )
+GAMEL( 199?, m5ppussy ,0, mpu5, mpu5, mpu5_state, 0, ROT0, "Mdm","Pink Pussy (Mdm) (MPU5)", MACHINE_IS_SKELETON_MECHANICAL, layout_m5ppussy )
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp
index cb6c4d3af98..15e64582680 100644
--- a/src/mame/drivers/mpz80.cpp
+++ b/src/mame/drivers/mpz80.cpp
@@ -709,7 +709,7 @@ void mpz80_state::machine_reset()
// MACHINE_CONFIG( mpz80 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( mpz80, mpz80_state )
+static MACHINE_CONFIG_START( mpz80 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(mpz80_mem)
@@ -778,5 +778,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1980, mpz80, 0, 0, mpz80, mpz80, driver_device, 0, "Morrow Designs", "MPZ80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, mpz80, 0, 0, mpz80, mpz80, mpz80_state, 0, "Morrow Designs", "MPZ80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp
index 47e009cd4b4..45a6f6f935f 100644
--- a/src/mame/drivers/mquake.cpp
+++ b/src/mame/drivers/mquake.cpp
@@ -302,7 +302,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( mquake, mquake_state )
+static MACHINE_CONFIG_START( mquake )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp
index 8501dde3262..8560a2fa8da 100644
--- a/src/mame/drivers/mrdo.cpp
+++ b/src/mame/drivers/mrdo.cpp
@@ -169,7 +169,7 @@ static GFXDECODE_START( mrdo )
GFXDECODE_END
-static MACHINE_CONFIG_START( mrdo, mrdo_state )
+static MACHINE_CONFIG_START( mrdo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/2) /* Verified */
@@ -389,10 +389,10 @@ ROM_END
-GAME( 1982, mrdo, 0, mrdo, mrdo, driver_device, 0, ROT270, "Universal", "Mr. Do!", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdoy, mrdo, mrdo, mrdo, driver_device, 0, ROT270, "Universal", "Mr. Do! (prototype)" , MACHINE_SUPPORTS_SAVE ) /* aka "Yukidaruma" */
-GAME( 1982, mrdot, mrdo, mrdo, mrdo, driver_device, 0, ROT270, "Universal (Taito license)", "Mr. Do! (Taito)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdofix, mrdo, mrdo, mrdo, driver_device, 0, ROT270, "Universal (Taito license)", "Mr. Do! (bugfixed)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrlo, mrdo, mrdo, mrdo, driver_device, 0, ROT270, "bootleg", "Mr. Lo!", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdu, mrdo, mrdo, mrdo, driver_device, 0, ROT270, "bootleg", "Mr. Du!", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, yankeedo, mrdo, mrdo, mrdo, driver_device, 0, ROT270, "hack", "Yankee DO!", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdo, 0, mrdo, mrdo, mrdo_state, 0, ROT270, "Universal", "Mr. Do!", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdoy, mrdo, mrdo, mrdo, mrdo_state, 0, ROT270, "Universal", "Mr. Do! (prototype)", MACHINE_SUPPORTS_SAVE ) /* aka "Yukidaruma" */
+GAME( 1982, mrdot, mrdo, mrdo, mrdo, mrdo_state, 0, ROT270, "Universal (Taito license)", "Mr. Do! (Taito)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdofix, mrdo, mrdo, mrdo, mrdo_state, 0, ROT270, "Universal (Taito license)", "Mr. Do! (bugfixed)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrlo, mrdo, mrdo, mrdo, mrdo_state, 0, ROT270, "bootleg", "Mr. Lo!", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdu, mrdo, mrdo, mrdo, mrdo_state, 0, ROT270, "bootleg", "Mr. Du!", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, yankeedo, mrdo, mrdo, mrdo, mrdo_state, 0, ROT270, "hack", "Yankee DO!", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp
index 99ba8b6109e..da2a3a3524f 100644
--- a/src/mame/drivers/mrflea.cpp
+++ b/src/mame/drivers/mrflea.cpp
@@ -325,7 +325,7 @@ void mrflea_state::machine_reset()
m_select1 = 0;
}
-static MACHINE_CONFIG_START( mrflea, mrflea_state )
+static MACHINE_CONFIG_START( mrflea )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
@@ -419,4 +419,4 @@ ROM_END
*
*************************************/
-GAME( 1982, mrflea, 0, mrflea, mrflea, driver_device, 0, ROT270, "Pacific Novelty", "The Amazing Adventures of Mr. F. Lea" , MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrflea, 0, mrflea, mrflea, mrflea_state, 0, ROT270, "Pacific Novelty", "The Amazing Adventures of Mr. F. Lea" , MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp
index ea3065cc1a1..9d332891df2 100644
--- a/src/mame/drivers/mrgame.cpp
+++ b/src/mame/drivers/mrgame.cpp
@@ -459,7 +459,7 @@ uint32_t mrgame_state::screen_update_mrgame(screen_device &screen, bitmap_ind16
return 0;
}
-static MACHINE_CONFIG_START( mrgame, mrgame_state )
+static MACHINE_CONFIG_START( mrgame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_6MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -664,8 +664,8 @@ ROM_START(wcup90)
ROM_END
-GAME(1988, dakar, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "Dakar", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1988, dakar, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "Dakar", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
GAME(1989, motrshow, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "Motor Show (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
GAME(1989, motrshowa, motrshow, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "Motor Show (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1990, macattck, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "Mac Attack", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, wcup90, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "World Cup 90", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, macattck, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "Mac Attack", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, wcup90, 0, mrgame, mrgame, mrgame_state, mrgame, ROT0, "Mr Game", "World Cup 90", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp
index 23bf9a6c0db..e417e14a2d5 100644
--- a/src/mame/drivers/mrjong.cpp
+++ b/src/mame/drivers/mrjong.cpp
@@ -183,7 +183,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( mrjong, mrjong_state )
+static MACHINE_CONFIG_START( mrjong )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,15468000/6) /* 2.578 MHz?? */
@@ -276,6 +276,6 @@ ROM_END
*
*************************************/
-GAME( 1983, mrjong, 0, mrjong, mrjong, driver_device, 0, ROT90, "Kiwako", "Mr. Jong (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, crazyblk, mrjong, mrjong, mrjong, driver_device, 0, ROT90, "Kiwako (ECI license)", "Crazy Blocks", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, blkbustr, mrjong, mrjong, mrjong, driver_device, 0, ROT90, "Kiwako (ECI license)", "BlockBuster", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mrjong, 0, mrjong, mrjong, mrjong_state, 0, ROT90, "Kiwako", "Mr. Jong (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, crazyblk, mrjong, mrjong, mrjong, mrjong_state, 0, ROT90, "Kiwako (ECI license)", "Crazy Blocks", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, blkbustr, mrjong, mrjong, mrjong, mrjong_state, 0, ROT90, "Kiwako (ECI license)", "BlockBuster", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp
index 238c733a467..af84f73a627 100644
--- a/src/mame/drivers/ms0515.cpp
+++ b/src/mame/drivers/ms0515.cpp
@@ -71,18 +71,6 @@ public:
, m_ms7004(*this, "ms7004")
{ }
- required_device<cpu_device> m_maincpu;
- required_device<ram_device> m_ram;
- required_device<kr1818vg93_t> m_fdc;
- required_device<floppy_image_device> m_floppy0;
- required_device<floppy_image_device> m_floppy1;
- required_device<i8251_device> m_i8251line;
- required_device<rs232_port_device> m_rs232;
- required_device<i8251_device> m_i8251kbd;
- required_device<ms7004_device> m_ms7004;
-
- virtual void machine_reset() override;
-
DECLARE_PALETTE_INIT(ms0515);
uint32_t screen_update_ms0515(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
@@ -101,13 +89,27 @@ public:
DECLARE_FLOPPY_FORMATS(floppy_formats);
- void irq_encoder(int irq, int state);
DECLARE_WRITE_LINE_MEMBER(irq2_w);
DECLARE_WRITE_LINE_MEMBER(irq5_w);
DECLARE_WRITE_LINE_MEMBER(irq8_w);
DECLARE_WRITE_LINE_MEMBER(irq9_w);
DECLARE_WRITE_LINE_MEMBER(irq11_w);
+protected:
+ virtual void machine_reset() override;
+
+ void irq_encoder(int irq, int state);
+
+ required_device<cpu_device> m_maincpu;
+ required_device<ram_device> m_ram;
+ required_device<kr1818vg93_device> m_fdc;
+ required_device<floppy_image_device> m_floppy0;
+ required_device<floppy_image_device> m_floppy1;
+ required_device<i8251_device> m_i8251line;
+ required_device<rs232_port_device> m_rs232;
+ required_device<i8251_device> m_i8251kbd;
+ required_device<ms7004_device> m_ms7004;
+
private:
uint8_t *m_video_ram;
uint8_t m_sysrega, m_sysregc;
@@ -147,10 +149,10 @@ static ADDRESS_MAP_START(ms0515_mem, AS_PROGRAM, 16, ms0515_state)
AM_RANGE(0177600, 0177607) AM_DEVREADWRITE8("ppi8255_1", i8255_device, read, write, 0x00ff)
- AM_RANGE(0177640, 0177641) AM_DEVREADWRITE8("vg93", kr1818vg93_t, status_r, cmd_w, 0x00ff)
- AM_RANGE(0177642, 0177643) AM_DEVREADWRITE8("vg93", kr1818vg93_t, track_r, track_w, 0x00ff)
- AM_RANGE(0177644, 0177645) AM_DEVREADWRITE8("vg93", kr1818vg93_t, sector_r, sector_w, 0x00ff)
- AM_RANGE(0177646, 0177647) AM_DEVREADWRITE8("vg93", kr1818vg93_t, data_r, data_w, 0x00ff)
+ AM_RANGE(0177640, 0177641) AM_DEVREADWRITE8("vg93", kr1818vg93_device, status_r, cmd_w, 0x00ff)
+ AM_RANGE(0177642, 0177643) AM_DEVREADWRITE8("vg93", kr1818vg93_device, track_r, track_w, 0x00ff)
+ AM_RANGE(0177644, 0177645) AM_DEVREADWRITE8("vg93", kr1818vg93_device, sector_r, sector_w, 0x00ff)
+ AM_RANGE(0177646, 0177647) AM_DEVREADWRITE8("vg93", kr1818vg93_device, data_r, data_w, 0x00ff)
AM_RANGE(0177700, 0177701) AM_DEVREAD8("i8251line", i8251_device, data_r, 0x00ff)
AM_RANGE(0177702, 0177703) AM_DEVREADWRITE8("i8251line", i8251_device, status_r, control_w, 0x00ff)
@@ -498,7 +500,7 @@ WRITE_LINE_MEMBER(ms0515_state::irq11_w)
irq_encoder(11, state);
}
-static MACHINE_CONFIG_START( ms0515, ms0515_state )
+static MACHINE_CONFIG_START( ms0515 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", T11, XTAL_4MHz) // actual CPU is T11 clone, KR1807VM1
MCFG_T11_INITIAL_MODE(0xf2ff)
@@ -580,5 +582,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1990, ms0515, 0, 0, ms0515, ms0515, driver_device, 0, "Elektronika", "MS 0515", MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1990, ms0515, 0, 0, ms0515, ms0515, ms0515_state, 0, "Elektronika", "MS 0515", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp
index e97a1f14543..3f299c6d868 100644
--- a/src/mame/drivers/ms32.cpp
+++ b/src/mame/drivers/ms32.cpp
@@ -1386,7 +1386,7 @@ void ms32_state::machine_reset()
/********** MACHINE DRIVER **********/
-static MACHINE_CONFIG_START( ms32, ms32_state )
+static MACHINE_CONFIG_START( ms32 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V70, 20000000) // 20MHz
@@ -2259,19 +2259,19 @@ DRIVER_INIT_MEMBER(ms32_state,bnstars)
GAME( 1994, hayaosi2, 0, ms32, hayaosi2, ms32_state, ss92046_01, ROT0, "Jaleco", "Hayaoshi Quiz Grand Champion Taikai", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
GAME( 1994, hayaosi3, 0, ms32, hayaosi3, ms32_state, ss92046_01, ROT0, "Jaleco", "Hayaoshi Quiz Nettou Namahousou", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1994, bbbxing, 0, ms32, bbbxing, ms32_state, ss92046_01, ROT0, "Jaleco", "Best Bout Boxing", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1994, 47pie2, 0, ms32, 47pie2, ms32_state, 47pie2, ROT0, "Jaleco", "Idol Janshi Suchie-Pai II (v1.1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, 47pie2o, 47pie2, ms32, 47pie2, ms32_state, 47pie2, ROT0, "Jaleco", "Idol Janshi Suchie-Pai II (v1.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, bbbxing, 0, ms32, bbbxing, ms32_state, ss92046_01, ROT0, "Jaleco", "Best Bout Boxing", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1994, 47pie2, 0, ms32, 47pie2, ms32_state, 47pie2, ROT0, "Jaleco", "Idol Janshi Suchie-Pai II (v1.1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, 47pie2o, 47pie2, ms32, 47pie2, ms32_state, 47pie2, ROT0, "Jaleco", "Idol Janshi Suchie-Pai II (v1.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1995, desertwr, 0, ms32, desertwr, ms32_state, ss91022_10, ROT270, "Jaleco", "Desert War / Wangan Sensou", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1995, gametngk, 0, ms32, gametngk, ms32_state, ss91022_10, ROT270, "Jaleco", "The Game Paradise - Master of Shooting! / Game Tengoku - The Game Paradise", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, tetrisp, 0, ms32, tetrisp, ms32_state, ss92046_01, ROT0, "Jaleco / BPS", "Tetris Plus", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, p47aces, 0, ms32, p47aces, ms32_state, ss92048_01, ROT0, "Jaleco", "P-47 Aces", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, akiss, 0, ms32, 47pie2, ms32_state, kirarast, ROT0, "Jaleco", "Mahjong Angel Kiss", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, gratia, 0, ms32, gratia, ms32_state, ss92047_01, ROT0, "Jaleco", "Gratia - Second Earth (92047-01 version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, gratiaa, gratia, ms32, gratia, ms32_state, ss91022_10, ROT0, "Jaleco", "Gratia - Second Earth (91022-10 version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, tetrisp, 0, ms32, tetrisp, ms32_state, ss92046_01, ROT0, "Jaleco / BPS", "Tetris Plus", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, p47aces, 0, ms32, p47aces, ms32_state, ss92048_01, ROT0, "Jaleco", "P-47 Aces", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, akiss, 0, ms32, 47pie2, ms32_state, kirarast, ROT0, "Jaleco", "Mahjong Angel Kiss", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, gratia, 0, ms32, gratia, ms32_state, ss92047_01, ROT0, "Jaleco", "Gratia - Second Earth (92047-01 version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, gratiaa, gratia, ms32, gratia, ms32_state, ss91022_10, ROT0, "Jaleco", "Gratia - Second Earth (91022-10 version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1996, kirarast, 0, ms32, kirarast, ms32_state, kirarast, ROT0, "Jaleco", "Ryuusei Janshi Kirara Star", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, tp2m32, tetrisp2, ms32, tp2m32, ms32_state, ss91022_10, ROT0, "Jaleco", "Tetris Plus 2 (MegaSystem 32 Version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, bnstars, bnstars1, ms32, 47pie2, ms32_state, bnstars, ROT0, "Jaleco", "Vs. Janshi Brandnew Stars (MegaSystem32 Version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, tp2m32, tetrisp2, ms32, tp2m32, ms32_state, ss91022_10, ROT0, "Jaleco", "Tetris Plus 2 (MegaSystem 32 Version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, bnstars, bnstars1, ms32, 47pie2, ms32_state, bnstars, ROT0, "Jaleco", "Vs. Janshi Brandnew Stars (MegaSystem32 Version)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1996, wpksocv2, 0, ms32, wpksocv2, ms32_state, ss92046_01, ROT0, "Jaleco", "World PK Soccer V2 (ver 1.1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ms9540.cpp b/src/mame/drivers/ms9540.cpp
index d159fc10bcb..1f15b290f81 100644
--- a/src/mame/drivers/ms9540.cpp
+++ b/src/mame/drivers/ms9540.cpp
@@ -40,7 +40,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
private:
uint8_t m_term_data;
@@ -72,19 +72,19 @@ void ms9540_state::machine_reset()
m_maincpu->reset();
}
-WRITE8_MEMBER( ms9540_state::kbd_put )
+void ms9540_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( ms9540, ms9540_state )
+static MACHINE_CONFIG_START( ms9540 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) // unknown clock
MCFG_CPU_PROGRAM_MAP(ms9540_mem)
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ms9540_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ms9540_state, kbd_put))
MACHINE_CONFIG_END
@@ -102,5 +102,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, ms9540, 0, 0, ms9540, ms9540, driver_device, 0, "Millennium Systems", "ms9540", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, ms9540, 0, 0, ms9540, ms9540, ms9540_state, 0, "Millennium Systems", "ms9540", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/msbc1.cpp b/src/mame/drivers/msbc1.cpp
index 25816c299d9..2b2cc5d52f4 100644
--- a/src/mame/drivers/msbc1.cpp
+++ b/src/mame/drivers/msbc1.cpp
@@ -77,7 +77,7 @@ void msbc1_state::machine_reset()
m_maincpu->reset();
}
-static MACHINE_CONFIG_START( msbc1, msbc1_state )
+static MACHINE_CONFIG_START( msbc1 )
/* basic machine hardware */
MCFG_CPU_ADD(MC68000R12_TAG, M68000, XTAL_12_5MHz)
MCFG_CPU_PROGRAM_MAP(msbc1_mem)
@@ -109,5 +109,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, msbc1, 0, 0, msbc1, msbc1, driver_device, 0, "Omnibyte", "MSBC-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, msbc1, 0, 0, msbc1, msbc1, msbc1_state, 0, "Omnibyte", "MSBC-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp
index 9c2977cce73..4e1deb276f2 100644
--- a/src/mame/drivers/msisaac.cpp
+++ b/src/mame/drivers/msisaac.cpp
@@ -463,7 +463,7 @@ void msisaac_state::machine_reset()
#endif
}
-static MACHINE_CONFIG_START( msisaac, msisaac_state )
+static MACHINE_CONFIG_START( msisaac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
@@ -558,4 +558,4 @@ ROM_START( msisaac )
ROM_END
-GAME( 1985, msisaac, 0, msisaac, msisaac, driver_device, 0, ROT270, "Taito Corporation", "Metal Soldier Isaac II", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, msisaac, 0, msisaac, msisaac, msisaac_state, 0, ROT270, "Taito Corporation", "Metal Soldier Isaac II", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index 0c2b515fee5..842e3032f98 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -435,7 +435,7 @@ PALETTE_INIT_MEMBER(mstation_state, mstation)
}
-static MACHINE_CONFIG_START( mstation, mstation_state )
+static MACHINE_CONFIG_START( mstation )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) //unknown clock
MCFG_CPU_PROGRAM_MAP(mstation_mem)
@@ -494,5 +494,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1999, mstation, 0, 0, mstation, mstation, driver_device, 0, "CIDCO", "MailStation", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1999, mstation, 0, 0, mstation, mstation, mstation_state, 0, "CIDCO", "MailStation", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index ab5ea0e9a42..ce80ed060d1 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -1341,7 +1341,7 @@ static MACHINE_CONFIG_FRAGMENT( msx2_64kb_vram )
v9938_device::static_set_vram_size(*device, 0x10000);
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( msx, msx_state )
+static MACHINE_CONFIG_START( msx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
@@ -1481,7 +1481,7 @@ static MACHINE_CONFIG_DERIVED( msx_tms9929, msx )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( msx2, msx_state )
+static MACHINE_CONFIG_START( msx2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
@@ -1539,7 +1539,7 @@ static MACHINE_CONFIG_START( msx2, msx_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( msx2p, msx_state )
+static MACHINE_CONFIG_START( msx2p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* 3.579545 MHz */
MCFG_CPU_PROGRAM_MAP(msx_memory_map)
@@ -8243,258 +8243,258 @@ static MACHINE_CONFIG_DERIVED( fsa1st, msx2 )
MACHINE_CONFIG_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
/* MSX1 */
-COMP(1986, ax150, 0, 0, ax150, msx, driver_device, 0, "Al Alamiah", "AX-150 (Arabic) (MSX1)", 0)
-COMP(1986, ax170, 0, 0, ax170, msx, driver_device, 0, "Al Alamiah", "AX-170 (Arabic) (MSX1)", 0)
-COMP(1983, canonv8, 0, 0, canonv8, msx, driver_device, 0, "Canon", "V-8 (MSX1)", 0)
-COMP(1983, canonv10, canonv20, 0, canonv10, msx, driver_device, 0, "Canon", "V-10 (MSX1)", 0)
-COMP(1983, canonv20, 0, 0, canonv20, msx, driver_device, 0, "Canon", "V-20 (MSX1)", 0)
-COMP(1983, canonv20e, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20E (MSX1)", 0) // Different Euro keyboard layout?
-COMP(1983, canonv20f, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20F (MSX1)", 0) // Different French keyboard layout?
-COMP(1983, canonv20g, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20G (MSX1)", 0) // Different German keyboard layout?
-COMP(1983, canonv20s, canonv20, 0, canonv20, msx, driver_device, 0, "Canon", "V-20S (MSX1)", 0) // Different Spanish keyboard layout?
-COMP(1984, mx10, 0, 0, mx10, msx, driver_device, 0, "Casio", "MX-10 (MSX1)", 0)
-COMP(1984, mx101, mx10, 0, mx101, msx, driver_device, 0, "Casio", "MX-101 (MSX1)", 0)
-COMP(1984, mx15, mx10, 0, mx15, msx, driver_device, 0, "Casio", "MX-15 (MSX1)", 0)
-COMP(1984, pv7, 0, 0, pv7, msx, driver_device, 0, "Casio", "PV-7 (MSX1)", 0)
-COMP(1984, pv16, 0, 0, pv16, msx, driver_device, 0, "Casio", "PV-16 (MSX1)", 0)
-COMP(198?, cpc88, 0, 0, cpc88, msxkr, driver_device, 0, "Daewoo", "CPC-88 (Korea) (MSX1)", 0)
-COMP(1984, dpc100, dpc200, 0, dpc100, msxkr, driver_device, 0, "Daewoo", "IQ-1000 DPC-100 (Korea) (MSX1)", 0)
-COMP(1984, dpc180, dpc200, 0, dpc180, msxkr, driver_device, 0, "Daewoo", "IQ-1000 DPC-180 (Korea) (MSX1)", 0)
-COMP(1984, dpc200, 0, 0, dpc200, msxkr, driver_device, 0, "Daewoo", "IQ-1000 DPC-200 (Korea) (MSX1)", 0)
-COMP(1985, dpc200e, 0, 0, dpc200e, msx, driver_device, 0, "Daewoo", "DPC-200E (MSX1)", 0)
-COMP(1983, cpc50a, cpc51, 0, cpc50a, msxkr, driver_device, 0, "Daewoo", "Zemmix CPC-50A (Korea) (MSX1)", 0)
-COMP(1983, cpc50b, cpc51, 0, cpc50b, msxkr, driver_device, 0, "Daewoo", "Zemmix CPC-50B (Korea) (MSX1)", 0)
-COMP(1986, cpc51, 0, 0, cpc51, msxkr, driver_device, 0, "Daewoo", "Zemmix CPC-51 (Korea) (MSX1)", 0)
-COMP(1983, fdpc200, 0, 0, fdpc200, msx, driver_device, 0, "Fenner", "DPC-200 (Italy) (MSX1)", 0)
-COMP(1984, fpc500, 0, 0, fpc500, msx, driver_device, 0, "Fenner", "FPC-500 (Italy) (MSX1)", 0)
-COMP(1986, fspc800, 0, 0, fspc800, msx, driver_device, 0, "Fenner", "SPC-800 (Italy) (MSX1)", 0)
-COMP(1984, bruc100, 0, 0, bruc100, msx, driver_device, 0, "Frael", "Bruc 100-1 (MSX1)", 0)
-COMP(1983, fmx, 0, 0, fmx, msxjp, driver_device, 0, "Fujitsu", "FM-X (MSX1)", 0)
-COMP(1984, gsfc80u, 0, 0, gsfc80u, msxkr, driver_device, 0, "Goldstar", "FC-80U (MSX1)", 0)
-COMP(1983, gsfc200, 0, 0, gsfc200, msx, driver_device, 0, "Goldstar", "FC-200 (MSX1)", 0)
-COMP(198?, gfc1080, 0, 0, gfc1080, msxkr, driver_device, 0, "Goldstar", "GFC-1080 (MSX1)", 0)
-COMP(198?, gfc1080a, 0, 0, gfc1080a, msxkr, driver_device, 0, "Goldstar", "GFC-1080A (MSX1)", 0)
-COMP(1983, expert10, expert13, 0, expert10, expert10, driver_device, 0, "Gradiente", "Expert 1.0 (Brazil) (MSX1)", 0)
-COMP(1984, expert11, expert13, 0, expert11, expert11, driver_device, 0, "Gradiente", "Expert 1.1 (Brazil) (MSX1)", 0)
-COMP(1984, expert13, 0, 0, expert13, expert11, driver_device, 0, "Gradiente", "Expert 1.3 (Brazil) (MSX1)", 0)
-COMP(1985, expertdp, 0, 0, expertdp, expert11, driver_device, 0, "Gradiente", "Expert DDPlus (Brazil) (MSX1)", 0)
-COMP(1984, expertpl, 0, 0, expertpl, expert11, driver_device, 0, "Gradiente", "Expert Plus (Brazil) (MSX1)", 0)
-COMP(1984, mbh2, 0, 0, mbh2, msxjp, driver_device, 0, "Hitachi", "MB-H2 (MSX1)", 0)
-COMP(1984, mbh25, 0, 0, mbh25, msxjp, driver_device, 0, "Hitachi", "MB-H25 (MSX1)", 0)
-COMP(1983, mbh50, 0, 0, mbh50, msxjp, driver_device, 0, "Hitachi", "MB-H50 (MSX1)", 0)
-COMP(1983, jvchc7gb, 0, 0, jvchc7gb, msx, driver_device, 0, "JVC", "HC-7GB (MSX1)", 0)
-COMP(198?, mlf48, 0, 0, mlf48, msx, driver_device, 0, "Mitsubishi", "ML-F48 (MSX1)", 0)
-COMP(1983, mlf80, 0, 0, mlf80, msx, driver_device, 0, "Mitsubishi", "ML-F80 (MSX1)", 0)
-COMP(1984, mlf110, 0, 0, mlf110, msxjp, driver_device, 0, "Mitsubishi", "ML-F110 (MSX1)", 0)
-COMP(1984, mlf120, 0, 0, mlf120, msxjp, driver_device, 0, "Mitsubishi", "ML-F120 (MSX1)", 0)
-COMP(1983, mlfx1, 0, 0, mlfx1, msx, driver_device, 0, "Mitsubishi", "ML-FX1 (MSX1)", 0)
-COMP(1984, cf1200, 0, 0, cf1200, msxjp, driver_device, 0, "National / Matsushita", "CF-1200 (Japan) (MSX1)", 0)
-COMP(1983, cf2000, 0, 0, cf2000, msxjp, driver_device, 0, "National / Matsushita", "CF-2000 (Japan) (MSX1)", 0)
-COMP(1984, cf2700, 0, 0, cf2700, msxjp, driver_device, 0, "National / Matsushita", "CF-2700 (Japan) (MSX1)", 0)
-COMP(1984, cf3000, 0, 0, cf3000, msxjp, driver_device, 0, "National / Matsushita", "CF-3000 (Japan) (MSX1)", 0)
-COMP(1985, cf3300, 0, 0, cf3300, msxjp, driver_device, 0, "National / Matsushita", "CF-3300 (Japan) (MSX1)", 0)
-COMP(1985, fs1300, 0, 0, fs1300, msxjp, driver_device, 0, "National / Matsushita", "FS-1300 (Japan) (MSX1)", 0)
-COMP(1985, fs4000, 0, 0, fs4000, msxjp, driver_device, 0, "National / Matsushita", "FS-4000 (Japan) (MSX1)", 0)
-COMP(1985, fs4000a, fs4000, 0, fs4000a, msxjp, driver_device, 0, "National / Matsushita", "FS-4000 (alt) (Japan) (MSX1)", 0)
-COMP(1983, phc2, 0, 0, phc2, msx, driver_device, 0, "Olympia", "PHC-2 (MSX1)" , 0)
-COMP(19??, phc28, 0, 0, phc28, msx, driver_device, 0, "Olympia", "PHC-28 (MSX1)", 0)
-COMP(1984, cf2700g, 0, 0, cf2700g, msx, driver_device, 0, "Panasonic", "CF-2700G (Germany) (MSX1)", 0)
-COMP(198?, perfect1, 0, 0, perfect1, msx, driver_device, 0, "Perfect", "Perfect1 (MSX1)", MACHINE_NOT_WORKING)
-COMP(1983, nms801, 0, 0, nms801, msx, driver_device, 0, "Philips", "NMS-801 (MSX1)", 0)
-COMP(1984, vg8000, vg8010, 0, vg8000, msx, driver_device, 0, "Philips", "VG-8000 (MSX1)", 0)
-COMP(1984, vg8010, 0, 0, vg8010, msx, driver_device, 0, "Philips", "VG-8010 (MSX1)", 0)
-COMP(1984, vg8010f, vg8010, 0, vg8010f, msx, driver_device, 0, "Philips", "VG-8010F (MSX1)" , 0)
-COMP(1985, vg802000, vg802020, 0, vg802000, msx, driver_device, 0, "Philips", "VG-8020-00 (MSX1)", 0)
-COMP(1985, vg802020, 0, 0, vg802020, msx, driver_device, 0, "Philips", "VG-8020-20 (MSX1)", 0)
-COMP(19??, vg8020f, vg802020, 0, vg8020f, msx, driver_device, 0, "Philips", "VG-8020F (MSX1)", 0)
-COMP(1985, piopx7, 0, 0, piopx7, msx, driver_device, 0, "Pioneer", "PX-07 Palcom (MSX1)", 0)
-COMP(1985, piopx7uk, piopx7, 0, piopx7uk, msx, driver_device, 0, "Pioneer", "PX-07UK Palcom (MSX1)", 0)
-COMP(1984, piopxv60, piopx7, 0, piopxv60, msxjp, driver_device, 0, "Pioneer", "PX-V60 (MSX1)", 0)
-COMP(19??, spc800, 0, 0, spc800, msx, driver_device, 0, "Samsung", "SPC-800 (MSX1)", 0)
-COMP(1985, mpc64, 0, 0, mpc64, msxjp, driver_device, 0, "Sanyo", "MPC-64 (MSX1)", 0)
-COMP(1985, mpc100, 0, 0, mpc100, msx, driver_device, 0, "Sanyo", "MPC-100 (MSX1)", 0)
-COMP(1983, mpc200, 0, 0, mpc200, msx, driver_device, 0, "Sanyo", "MPC-200 (MSX1)", 0)
-COMP(1983, mpc200sp, mpc200, 0, mpc200sp, msx, driver_device, 0, "Sanyo", "MPC-200SP (MSX1)", 0) // Spanish keyboard?
-COMP(1983, phc28l, 0, 0, phc28l, msx, driver_device, 0, "Sanyo", "PHC-28L (MSX1)", 0)
-COMP(1983, phc28s, 0, 0, phc28s, msx, driver_device, 0, "Sanyo", "PHC-28S (MSX1)", 0)
-COMP(19??, mpc10, 0, 0, mpc10, msx, driver_device, 0, "Sanyo", "Wavy MPC-10 (MSX1)", 0)
-COMP(1985, hotbit11, hotbi13p, 0, hotbit11, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.1 (MSX1)", 0)
-COMP(1985, hotbit12, hotbi13p, 0, hotbit12, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.2 (MSX1)", 0)
-COMP(1985, hotbi13b, hotbi13p, 0, hotbi13b, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3b (MSX1)", 0)
-COMP(1985, hotbi13p, 0, 0, hotbi13p, hotbit, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3p (MSX1)", 0)
-COMP(198?, hb10, hb10p, 0, hb10, msxjp, driver_device, 0, "Sony", "HB-10 (MSX1)", 0)
-COMP(1985, hb10p, 0, 0, hb10p, msx, driver_device, 0, "Sony", "HB-10P (MSX1)", 0)
-COMP(1984, hb101p, 0, 0, hb101p, msx, driver_device, 0, "Sony", "HB-101P (MSX1)", 0)
-COMP(1985, hb20p, 0, 0, hb20p, msx, driver_device, 0, "Sony", "HB-20P (Spanish) (MSX1)", 0)
-COMP(1985, hb201, hb201p, 0, hb201, msxjp, driver_device, 0, "Sony", "HB-201 (Japan) (MSX1)", 0)
-COMP(1985, hb201p, 0, 0, hb201p, msx, driver_device, 0, "Sony", "HB-201P (MSX1)", 0)
-COMP(1984, hb501p, 0, 0, hb501p, msx, driver_device, 0, "Sony", "HB-501P (MSX1)", 0)
-COMP(1983, hb55, hb55p, 0, hb55, msxjp, driver_device, 0, "Sony", "HB-55 (MSX1)", 0)
-COMP(1983, hb55d, hb55p, 0, hb55d, msx, driver_device, 0, "Sony", "HB-55D (Germany) (MSX1)", 0)
-COMP(1983, hb55p, 0, 0, hb55p, msx, driver_device, 0, "Sony", "HB-55P (MSX1)", 0)
-COMP(1984, hb701fd, 0, 0, hb701fd, msxjp, driver_device, 0, "Sony", "HB-701FD (MSX1)", 0)
-COMP(1983, hb75d, hb75p, 0, hb75d, msx, driver_device, 0, "Sony", "HB-75D (Germany) (MSX1)", 0)
-COMP(1983, hb75p, 0, 0, hb75p, msx, driver_device, 0, "Sony", "HB-75P (MSX1)", 0)
-COMP(1985, svi728, 0, 0, svi728, msx, driver_device, 0, "Spectravideo", "SVI-728 (MSX1)", 0)
-COMP(1985, svi738, 0, 0, svi738, msx, driver_device, 0, "Spectravideo", "SVI-738 (MSX1)", 0)
-COMP(1983, svi738ar, svi738, 0, svi738ar, msx, driver_device, 0, "Spectravideo", "SVI-738 (Arabic) (MSX1)", 0)
-COMP(1983, svi738dk, svi738, 0, svi738dk, msx, driver_device, 0, "Spectravideo", "SVI-738 (Denmark) (MSX1)", 0)
-COMP(1983, svi738sp, svi738, 0, svi738sp, msx, driver_device, 0, "Spectravideo", "SVI-738 (Spain) (MSX1)", 0)
-COMP(1983, svi738sw, svi738, 0, svi738sw, msx, driver_device, 0, "Spectravideo", "SVI-738 (Swedish) (MSX1)", 0)
-COMP(1983, svi738pl, svi738, 0, svi738pl, msx, driver_device, 0, "Spectravideo", "SVI-738 (Poland) (MSX1)", 0)
-COMP(1983, tadpc200, dpc200, 0, tadpc200, msx, driver_device, 0, "Talent", "DPC-200 (MSX1)", 0)
-COMP(1983, tadpc20a, dpc200, 0, tadpc20a, msx, driver_device, 0, "Talent", "DPC-200A (MSX1)", 0)
-COMP(1984, hx10, 0, 0, hx10, msx, driver_device, 0, "Toshiba", "HX-10 (MSX1)", 0)
-COMP(1984, hx10d, hx10, 0, hx10d, msxjp, driver_device, 0, "Toshiba", "HX-10D (MSX1)", 0)
-COMP(1984, hx10dp, hx10, 0, hx10dp, msxjp, driver_device, 0, "Toshiba", "HX-10DP (MSX1)", 0)
-COMP(1984, hx10e, hx10, 0, hx10e, msx, driver_device, 0, "Toshiba", "HX-10E (MSX1)", 0)
-COMP(1984, hx10f, hx10, 0, hx10f, msx, driver_device, 0, "Toshiba", "HX-10F (MSX1)", 0)
-COMP(1984, hx10s, hx10, 0, hx10s, msx, driver_device, 0, "Toshiba", "HX-10S (MSX1)", 0)
-COMP(1984, hx10sa, hx10, 0, hx10sa, msxjp, driver_device, 0, "Toshiba", "HX-10SA (MSX1)", 0)
-COMP(1984, hx20, 0, 0, hx20, msx, driver_device, 0, "Toshiba", "HX-20 (MSX1)", 0)
-COMP(1984, hx20i, hx20, 0, hx20i, msx, driver_device, 0, "Toshiba", "HX-20I (MSX1)", 0)
-COMP(1984, hx21, 0, 0, hx21, msxjp, driver_device, 0, "Toshiba", "HX-21 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
-COMP(1984, hx21i, hx21, 0, hx21i, msx, driver_device, 0, "Toshiba", "HX-21I (MSX1)", 0)
-COMP(1984, hx22, 0, 0, hx22, msxjp, driver_device, 0, "Toshiba", "HX-22 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
-COMP(1984, hx22i, hx22, 0, hx22i, msx, driver_device, 0, "Toshiba", "HX-22I (MSX1)", 0)
-COMP(198?, hc5, hc7, 0, hc5, msxjp, driver_device, 0, "Victor", "HC-5 (MSX1)", 0)
-COMP(198?, hc6, hc7, 0, hc6, msxjp, driver_device, 0, "Victor", "HC-6 (MSX1)", 0)
-COMP(198?, hc7, 0, 0, hc7, msxjp, driver_device, 0, "Victor", "HC-7 (MSX1)", 0)
-COMP(1984, cx5f1, cx5f, 0, cx5f1, msxjp, driver_device, 0, "Yamaha", "CX5F (w/SFG01) (MSX1)", 0)
-COMP(1984, cx5f, 0, 0, cx5f, msxjp, driver_device, 0, "Yamaha", "CX5F (w/SFG05) (MSX1)", 0)
-COMP(1984, cx5m, cx5m128, 0, cx5m, msx, driver_device, 0, "Yamaha", "CX5M (MSX1)", 0)
-COMP(1984, cx5m128, 0, 0, cx5m128, msx, driver_device, 0, "Yamaha", "CX5M-128 (MSX1)", 0)
-COMP(1984, cx5m2, cx5m128, 0, cx5m2, msx, driver_device, 0, "Yamaha", "CX5MII (MSX1)", 0)
-COMP(1984, yis303, 0, 0, yis303, msx, driver_device, 0, "Yamaha", "YIS303 (MSX1)", 0)
-COMP(1984, yis503, 0, 0, yis503, msx, driver_device, 0, "Yamaha", "YIS503 (MSX1)", 0)
-COMP(19??, yis503f, yis503, 0, yis503f, msx, driver_device, 0, "Yamaha", "YIS503F (MSX1)", 0)
-COMP(1984, yis503ii, yis503, 0, yis503ii, msx, driver_device, 0, "Yamaha", "YIS503II (MSX1)", 0)
-COMP(1986, y503iir, yis503, 0, y503iir, msx, driver_device, 0, "Yamaha", "YIS503IIR (Russian) (MSX1)", 0)
-COMP(1986, y503iir2, yis503, 0, y503iir2, msx, driver_device, 0, "Yamaha", "YIS503IIR (Estonian) (MSX1)", 0)
-COMP(1984, yis503m, yis503, 0, yis503m, msx, driver_device, 0, "Yamaha", "YIS503M (MSX1)", 0)
-COMP(1984, yc64, 0, 0, yc64, msx, driver_device, 0, "Yashica", "YC-64 (MSX1)", 0)
-COMP(1984, mx64, 0, 0, mx64, msxkr, driver_device, 0, "Yeno", "MX64 (MSX1)", 0)
+COMP(1986, ax150, 0, 0, ax150, msx, msx_state, 0, "Al Alamiah", "AX-150 (Arabic) (MSX1)", 0)
+COMP(1986, ax170, 0, 0, ax170, msx, msx_state, 0, "Al Alamiah", "AX-170 (Arabic) (MSX1)", 0)
+COMP(1983, canonv8, 0, 0, canonv8, msx, msx_state, 0, "Canon", "V-8 (MSX1)", 0)
+COMP(1983, canonv10, canonv20, 0, canonv10, msx, msx_state, 0, "Canon", "V-10 (MSX1)", 0)
+COMP(1983, canonv20, 0, 0, canonv20, msx, msx_state, 0, "Canon", "V-20 (MSX1)", 0)
+COMP(1983, canonv20e, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20E (MSX1)", 0) // Different Euro keyboard layout?
+COMP(1983, canonv20f, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20F (MSX1)", 0) // Different French keyboard layout?
+COMP(1983, canonv20g, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20G (MSX1)", 0) // Different German keyboard layout?
+COMP(1983, canonv20s, canonv20, 0, canonv20, msx, msx_state, 0, "Canon", "V-20S (MSX1)", 0) // Different Spanish keyboard layout?
+COMP(1984, mx10, 0, 0, mx10, msx, msx_state, 0, "Casio", "MX-10 (MSX1)", 0)
+COMP(1984, mx101, mx10, 0, mx101, msx, msx_state, 0, "Casio", "MX-101 (MSX1)", 0)
+COMP(1984, mx15, mx10, 0, mx15, msx, msx_state, 0, "Casio", "MX-15 (MSX1)", 0)
+COMP(1984, pv7, 0, 0, pv7, msx, msx_state, 0, "Casio", "PV-7 (MSX1)", 0)
+COMP(1984, pv16, 0, 0, pv16, msx, msx_state, 0, "Casio", "PV-16 (MSX1)", 0)
+COMP(198?, cpc88, 0, 0, cpc88, msxkr, msx_state, 0, "Daewoo", "CPC-88 (Korea) (MSX1)", 0)
+COMP(1984, dpc100, dpc200, 0, dpc100, msxkr, msx_state, 0, "Daewoo", "IQ-1000 DPC-100 (Korea) (MSX1)", 0)
+COMP(1984, dpc180, dpc200, 0, dpc180, msxkr, msx_state, 0, "Daewoo", "IQ-1000 DPC-180 (Korea) (MSX1)", 0)
+COMP(1984, dpc200, 0, 0, dpc200, msxkr, msx_state, 0, "Daewoo", "IQ-1000 DPC-200 (Korea) (MSX1)", 0)
+COMP(1985, dpc200e, 0, 0, dpc200e, msx, msx_state, 0, "Daewoo", "DPC-200E (MSX1)", 0)
+COMP(1983, cpc50a, cpc51, 0, cpc50a, msxkr, msx_state, 0, "Daewoo", "Zemmix CPC-50A (Korea) (MSX1)", 0)
+COMP(1983, cpc50b, cpc51, 0, cpc50b, msxkr, msx_state, 0, "Daewoo", "Zemmix CPC-50B (Korea) (MSX1)", 0)
+COMP(1986, cpc51, 0, 0, cpc51, msxkr, msx_state, 0, "Daewoo", "Zemmix CPC-51 (Korea) (MSX1)", 0)
+COMP(1983, fdpc200, 0, 0, fdpc200, msx, msx_state, 0, "Fenner", "DPC-200 (Italy) (MSX1)", 0)
+COMP(1984, fpc500, 0, 0, fpc500, msx, msx_state, 0, "Fenner", "FPC-500 (Italy) (MSX1)", 0)
+COMP(1986, fspc800, 0, 0, fspc800, msx, msx_state, 0, "Fenner", "SPC-800 (Italy) (MSX1)", 0)
+COMP(1984, bruc100, 0, 0, bruc100, msx, msx_state, 0, "Frael", "Bruc 100-1 (MSX1)", 0)
+COMP(1983, fmx, 0, 0, fmx, msxjp, msx_state, 0, "Fujitsu", "FM-X (MSX1)", 0)
+COMP(1984, gsfc80u, 0, 0, gsfc80u, msxkr, msx_state, 0, "Goldstar", "FC-80U (MSX1)", 0)
+COMP(1983, gsfc200, 0, 0, gsfc200, msx, msx_state, 0, "Goldstar", "FC-200 (MSX1)", 0)
+COMP(198?, gfc1080, 0, 0, gfc1080, msxkr, msx_state, 0, "Goldstar", "GFC-1080 (MSX1)", 0)
+COMP(198?, gfc1080a, 0, 0, gfc1080a, msxkr, msx_state, 0, "Goldstar", "GFC-1080A (MSX1)", 0)
+COMP(1983, expert10, expert13, 0, expert10, expert10, msx_state, 0, "Gradiente", "Expert 1.0 (Brazil) (MSX1)", 0)
+COMP(1984, expert11, expert13, 0, expert11, expert11, msx_state, 0, "Gradiente", "Expert 1.1 (Brazil) (MSX1)", 0)
+COMP(1984, expert13, 0, 0, expert13, expert11, msx_state, 0, "Gradiente", "Expert 1.3 (Brazil) (MSX1)", 0)
+COMP(1985, expertdp, 0, 0, expertdp, expert11, msx_state, 0, "Gradiente", "Expert DDPlus (Brazil) (MSX1)", 0)
+COMP(1984, expertpl, 0, 0, expertpl, expert11, msx_state, 0, "Gradiente", "Expert Plus (Brazil) (MSX1)", 0)
+COMP(1984, mbh2, 0, 0, mbh2, msxjp, msx_state, 0, "Hitachi", "MB-H2 (MSX1)", 0)
+COMP(1984, mbh25, 0, 0, mbh25, msxjp, msx_state, 0, "Hitachi", "MB-H25 (MSX1)", 0)
+COMP(1983, mbh50, 0, 0, mbh50, msxjp, msx_state, 0, "Hitachi", "MB-H50 (MSX1)", 0)
+COMP(1983, jvchc7gb, 0, 0, jvchc7gb, msx, msx_state, 0, "JVC", "HC-7GB (MSX1)", 0)
+COMP(198?, mlf48, 0, 0, mlf48, msx, msx_state, 0, "Mitsubishi", "ML-F48 (MSX1)", 0)
+COMP(1983, mlf80, 0, 0, mlf80, msx, msx_state, 0, "Mitsubishi", "ML-F80 (MSX1)", 0)
+COMP(1984, mlf110, 0, 0, mlf110, msxjp, msx_state, 0, "Mitsubishi", "ML-F110 (MSX1)", 0)
+COMP(1984, mlf120, 0, 0, mlf120, msxjp, msx_state, 0, "Mitsubishi", "ML-F120 (MSX1)", 0)
+COMP(1983, mlfx1, 0, 0, mlfx1, msx, msx_state, 0, "Mitsubishi", "ML-FX1 (MSX1)", 0)
+COMP(1984, cf1200, 0, 0, cf1200, msxjp, msx_state, 0, "National / Matsushita", "CF-1200 (Japan) (MSX1)", 0)
+COMP(1983, cf2000, 0, 0, cf2000, msxjp, msx_state, 0, "National / Matsushita", "CF-2000 (Japan) (MSX1)", 0)
+COMP(1984, cf2700, 0, 0, cf2700, msxjp, msx_state, 0, "National / Matsushita", "CF-2700 (Japan) (MSX1)", 0)
+COMP(1984, cf3000, 0, 0, cf3000, msxjp, msx_state, 0, "National / Matsushita", "CF-3000 (Japan) (MSX1)", 0)
+COMP(1985, cf3300, 0, 0, cf3300, msxjp, msx_state, 0, "National / Matsushita", "CF-3300 (Japan) (MSX1)", 0)
+COMP(1985, fs1300, 0, 0, fs1300, msxjp, msx_state, 0, "National / Matsushita", "FS-1300 (Japan) (MSX1)", 0)
+COMP(1985, fs4000, 0, 0, fs4000, msxjp, msx_state, 0, "National / Matsushita", "FS-4000 (Japan) (MSX1)", 0)
+COMP(1985, fs4000a, fs4000, 0, fs4000a, msxjp, msx_state, 0, "National / Matsushita", "FS-4000 (alt) (Japan) (MSX1)", 0)
+COMP(1983, phc2, 0, 0, phc2, msx, msx_state, 0, "Olympia", "PHC-2 (MSX1)" , 0)
+COMP(19??, phc28, 0, 0, phc28, msx, msx_state, 0, "Olympia", "PHC-28 (MSX1)", 0)
+COMP(1984, cf2700g, 0, 0, cf2700g, msx, msx_state, 0, "Panasonic", "CF-2700G (Germany) (MSX1)", 0)
+COMP(198?, perfect1, 0, 0, perfect1, msx, msx_state, 0, "Perfect", "Perfect1 (MSX1)", MACHINE_NOT_WORKING)
+COMP(1983, nms801, 0, 0, nms801, msx, msx_state, 0, "Philips", "NMS-801 (MSX1)", 0)
+COMP(1984, vg8000, vg8010, 0, vg8000, msx, msx_state, 0, "Philips", "VG-8000 (MSX1)", 0)
+COMP(1984, vg8010, 0, 0, vg8010, msx, msx_state, 0, "Philips", "VG-8010 (MSX1)", 0)
+COMP(1984, vg8010f, vg8010, 0, vg8010f, msx, msx_state, 0, "Philips", "VG-8010F (MSX1)" , 0)
+COMP(1985, vg802000, vg802020, 0, vg802000, msx, msx_state, 0, "Philips", "VG-8020-00 (MSX1)", 0)
+COMP(1985, vg802020, 0, 0, vg802020, msx, msx_state, 0, "Philips", "VG-8020-20 (MSX1)", 0)
+COMP(19??, vg8020f, vg802020, 0, vg8020f, msx, msx_state, 0, "Philips", "VG-8020F (MSX1)", 0)
+COMP(1985, piopx7, 0, 0, piopx7, msx, msx_state, 0, "Pioneer", "PX-07 Palcom (MSX1)", 0)
+COMP(1985, piopx7uk, piopx7, 0, piopx7uk, msx, msx_state, 0, "Pioneer", "PX-07UK Palcom (MSX1)", 0)
+COMP(1984, piopxv60, piopx7, 0, piopxv60, msxjp, msx_state, 0, "Pioneer", "PX-V60 (MSX1)", 0)
+COMP(19??, spc800, 0, 0, spc800, msx, msx_state, 0, "Samsung", "SPC-800 (MSX1)", 0)
+COMP(1985, mpc64, 0, 0, mpc64, msxjp, msx_state, 0, "Sanyo", "MPC-64 (MSX1)", 0)
+COMP(1985, mpc100, 0, 0, mpc100, msx, msx_state, 0, "Sanyo", "MPC-100 (MSX1)", 0)
+COMP(1983, mpc200, 0, 0, mpc200, msx, msx_state, 0, "Sanyo", "MPC-200 (MSX1)", 0)
+COMP(1983, mpc200sp, mpc200, 0, mpc200sp, msx, msx_state, 0, "Sanyo", "MPC-200SP (MSX1)", 0) // Spanish keyboard?
+COMP(1983, phc28l, 0, 0, phc28l, msx, msx_state, 0, "Sanyo", "PHC-28L (MSX1)", 0)
+COMP(1983, phc28s, 0, 0, phc28s, msx, msx_state, 0, "Sanyo", "PHC-28S (MSX1)", 0)
+COMP(19??, mpc10, 0, 0, mpc10, msx, msx_state, 0, "Sanyo", "Wavy MPC-10 (MSX1)", 0)
+COMP(1985, hotbit11, hotbi13p, 0, hotbit11, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.1 (MSX1)", 0)
+COMP(1985, hotbit12, hotbi13p, 0, hotbit12, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.2 (MSX1)", 0)
+COMP(1985, hotbi13b, hotbi13p, 0, hotbi13b, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3b (MSX1)", 0)
+COMP(1985, hotbi13p, 0, 0, hotbi13p, hotbit, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 1.3p (MSX1)", 0)
+COMP(198?, hb10, hb10p, 0, hb10, msxjp, msx_state, 0, "Sony", "HB-10 (MSX1)", 0)
+COMP(1985, hb10p, 0, 0, hb10p, msx, msx_state, 0, "Sony", "HB-10P (MSX1)", 0)
+COMP(1984, hb101p, 0, 0, hb101p, msx, msx_state, 0, "Sony", "HB-101P (MSX1)", 0)
+COMP(1985, hb20p, 0, 0, hb20p, msx, msx_state, 0, "Sony", "HB-20P (Spanish) (MSX1)", 0)
+COMP(1985, hb201, hb201p, 0, hb201, msxjp, msx_state, 0, "Sony", "HB-201 (Japan) (MSX1)", 0)
+COMP(1985, hb201p, 0, 0, hb201p, msx, msx_state, 0, "Sony", "HB-201P (MSX1)", 0)
+COMP(1984, hb501p, 0, 0, hb501p, msx, msx_state, 0, "Sony", "HB-501P (MSX1)", 0)
+COMP(1983, hb55, hb55p, 0, hb55, msxjp, msx_state, 0, "Sony", "HB-55 (MSX1)", 0)
+COMP(1983, hb55d, hb55p, 0, hb55d, msx, msx_state, 0, "Sony", "HB-55D (Germany) (MSX1)", 0)
+COMP(1983, hb55p, 0, 0, hb55p, msx, msx_state, 0, "Sony", "HB-55P (MSX1)", 0)
+COMP(1984, hb701fd, 0, 0, hb701fd, msxjp, msx_state, 0, "Sony", "HB-701FD (MSX1)", 0)
+COMP(1983, hb75d, hb75p, 0, hb75d, msx, msx_state, 0, "Sony", "HB-75D (Germany) (MSX1)", 0)
+COMP(1983, hb75p, 0, 0, hb75p, msx, msx_state, 0, "Sony", "HB-75P (MSX1)", 0)
+COMP(1985, svi728, 0, 0, svi728, msx, msx_state, 0, "Spectravideo", "SVI-728 (MSX1)", 0)
+COMP(1985, svi738, 0, 0, svi738, msx, msx_state, 0, "Spectravideo", "SVI-738 (MSX1)", 0)
+COMP(1983, svi738ar, svi738, 0, svi738ar, msx, msx_state, 0, "Spectravideo", "SVI-738 (Arabic) (MSX1)", 0)
+COMP(1983, svi738dk, svi738, 0, svi738dk, msx, msx_state, 0, "Spectravideo", "SVI-738 (Denmark) (MSX1)", 0)
+COMP(1983, svi738sp, svi738, 0, svi738sp, msx, msx_state, 0, "Spectravideo", "SVI-738 (Spain) (MSX1)", 0)
+COMP(1983, svi738sw, svi738, 0, svi738sw, msx, msx_state, 0, "Spectravideo", "SVI-738 (Swedish) (MSX1)", 0)
+COMP(1983, svi738pl, svi738, 0, svi738pl, msx, msx_state, 0, "Spectravideo", "SVI-738 (Poland) (MSX1)", 0)
+COMP(1983, tadpc200, dpc200, 0, tadpc200, msx, msx_state, 0, "Talent", "DPC-200 (MSX1)", 0)
+COMP(1983, tadpc20a, dpc200, 0, tadpc20a, msx, msx_state, 0, "Talent", "DPC-200A (MSX1)", 0)
+COMP(1984, hx10, 0, 0, hx10, msx, msx_state, 0, "Toshiba", "HX-10 (MSX1)", 0)
+COMP(1984, hx10d, hx10, 0, hx10d, msxjp, msx_state, 0, "Toshiba", "HX-10D (MSX1)", 0)
+COMP(1984, hx10dp, hx10, 0, hx10dp, msxjp, msx_state, 0, "Toshiba", "HX-10DP (MSX1)", 0)
+COMP(1984, hx10e, hx10, 0, hx10e, msx, msx_state, 0, "Toshiba", "HX-10E (MSX1)", 0)
+COMP(1984, hx10f, hx10, 0, hx10f, msx, msx_state, 0, "Toshiba", "HX-10F (MSX1)", 0)
+COMP(1984, hx10s, hx10, 0, hx10s, msx, msx_state, 0, "Toshiba", "HX-10S (MSX1)", 0)
+COMP(1984, hx10sa, hx10, 0, hx10sa, msxjp, msx_state, 0, "Toshiba", "HX-10SA (MSX1)", 0)
+COMP(1984, hx20, 0, 0, hx20, msx, msx_state, 0, "Toshiba", "HX-20 (MSX1)", 0)
+COMP(1984, hx20i, hx20, 0, hx20i, msx, msx_state, 0, "Toshiba", "HX-20I (MSX1)", 0)
+COMP(1984, hx21, 0, 0, hx21, msxjp, msx_state, 0, "Toshiba", "HX-21 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
+COMP(1984, hx21i, hx21, 0, hx21i, msx, msx_state, 0, "Toshiba", "HX-21I (MSX1)", 0)
+COMP(1984, hx22, 0, 0, hx22, msxjp, msx_state, 0, "Toshiba", "HX-22 (MSX1)", MACHINE_NOT_WORKING) // Does not go into firmware
+COMP(1984, hx22i, hx22, 0, hx22i, msx, msx_state, 0, "Toshiba", "HX-22I (MSX1)", 0)
+COMP(198?, hc5, hc7, 0, hc5, msxjp, msx_state, 0, "Victor", "HC-5 (MSX1)", 0)
+COMP(198?, hc6, hc7, 0, hc6, msxjp, msx_state, 0, "Victor", "HC-6 (MSX1)", 0)
+COMP(198?, hc7, 0, 0, hc7, msxjp, msx_state, 0, "Victor", "HC-7 (MSX1)", 0)
+COMP(1984, cx5f1, cx5f, 0, cx5f1, msxjp, msx_state, 0, "Yamaha", "CX5F (w/SFG01) (MSX1)", 0)
+COMP(1984, cx5f, 0, 0, cx5f, msxjp, msx_state, 0, "Yamaha", "CX5F (w/SFG05) (MSX1)", 0)
+COMP(1984, cx5m, cx5m128, 0, cx5m, msx, msx_state, 0, "Yamaha", "CX5M (MSX1)", 0)
+COMP(1984, cx5m128, 0, 0, cx5m128, msx, msx_state, 0, "Yamaha", "CX5M-128 (MSX1)", 0)
+COMP(1984, cx5m2, cx5m128, 0, cx5m2, msx, msx_state, 0, "Yamaha", "CX5MII (MSX1)", 0)
+COMP(1984, yis303, 0, 0, yis303, msx, msx_state, 0, "Yamaha", "YIS303 (MSX1)", 0)
+COMP(1984, yis503, 0, 0, yis503, msx, msx_state, 0, "Yamaha", "YIS503 (MSX1)", 0)
+COMP(19??, yis503f, yis503, 0, yis503f, msx, msx_state, 0, "Yamaha", "YIS503F (MSX1)", 0)
+COMP(1984, yis503ii, yis503, 0, yis503ii, msx, msx_state, 0, "Yamaha", "YIS503II (MSX1)", 0)
+COMP(1986, y503iir, yis503, 0, y503iir, msx, msx_state, 0, "Yamaha", "YIS503IIR (Russian) (MSX1)", 0)
+COMP(1986, y503iir2, yis503, 0, y503iir2, msx, msx_state, 0, "Yamaha", "YIS503IIR (Estonian) (MSX1)", 0)
+COMP(1984, yis503m, yis503, 0, yis503m, msx, msx_state, 0, "Yamaha", "YIS503M (MSX1)", 0)
+COMP(1984, yc64, 0, 0, yc64, msx, msx_state, 0, "Yashica", "YC-64 (MSX1)", 0)
+COMP(1984, mx64, 0, 0, mx64, msxkr, msx_state, 0, "Yeno", "MX64 (MSX1)", 0)
/* MSX2 */
-COMP(1986, ax350, 0, 0, ax350, msx2, driver_device, 0, "Al Alamiah", "AX-350 (Arabic) (MSX2)", 0)
-COMP(1986, ax370, 0, 0, ax370, msx2, driver_device, 0, "Al Alamiah", "AX-370 (Arabic) (MSX2)", 0)
-COMP(1985, canonv25, 0, 0, canonv25, msx2, driver_device, 0, "Canon", "V-25 (MSX2)", 0)
-COMP(1985, canonv30, 0, 0, canonv30, msx2, driver_device, 0, "Canon", "V-30 (MSX2)", 0)
-COMP(1985, canonv30f, canonv30, 0, canonv30f, msx2, driver_device, 0, "Canon", "V-30F (MSX2)", 0)
-COMP(1986, cpc300, 0, 0, cpc300, msx2kr, driver_device, 0, "Daewoo", "IQ-2000 CPC-300 (Korea) (MSX2)", 0)
-COMP(1986, cpc300e, 0, 0, cpc300e, msx2kr, driver_device, 0, "Daewoo", "IQ-2000 CPC-300E (Korea) (MSX2)", 0)
-COMP(1985, cpc330k, 0, 0, cpc330k, msx2kr, driver_device, 0, "Daewoo", "CPC-330K KOBO (Korea) (MSX2)", 0)
-COMP(1988, cpc400, 0, 0, cpc400, msx2kr, driver_device, 0, "Daewoo", "X-II CPC-400 (Korea) (MSX2)", 0)
-COMP(1988, cpc400s, 0, 0, cpc400s, msx2kr, driver_device, 0, "Daewoo", "X-II CPC-400S (Korea) (MSX2)", 0)
-COMP(1990, cpc61, 0, 0, cpc61, msx2kr, driver_device, 0, "Daewoo", "Zemmix CPC-61 (Korea) (MSX2)", 0)
-COMP(1991, cpg120, 0, 0, cpg120, msx2kr, driver_device, 0, "Daewoo", "Zemmix CPG-120 Normal (Korea) (MSX2)", MACHINE_NOT_WORKING) // v9958 not added
-COMP(198?, fpc900, 0, 0, fpc900, msx2, driver_device, 0, "Fenner", "FPC-900 (MSX2)", 0)
-COMP(1986, expert20, 0, 0, expert20, msx2, driver_device, 0, "Gradiente", "Expert 2.0 (Brazil) (MSX2)", 0)
-COMP(198?, mbh70, 0, 0, mbh70, msx2jp, driver_device, 0, "Hitachi", "MB-H70 (MSX2)", MACHINE_NOT_WORKING) // Firmware not working
-COMP(1987, kmc5000, 0, 0, kmc5000, msx2jp, driver_device, 0, "Kawai", "KMC-5000 (MSX2)", 0)
-COMP(1985, mlg1, 0, 0, mlg1, msx2, driver_device, 0, "Mitsubishi", "ML-G1 (MSX2)", 0)
-COMP(198?, mlg3, 0, 0, mlg3, msx2, driver_device, 0, "Mitsubishi", "ML-G3 (MSX2)", 0)
-COMP(1985, mlg10, 0, 0, mlg10, msx2jp, driver_device, 0, "Mitsubishi", "ML-G10 (MSX2)", 0)
-COMP(1983, mlg30, 0, 0, mlg30, msx2, driver_device, 0, "Mitsubishi", "ML-G30 (MSX2)", 0)
-COMP(1985, fs5500f1, fs5500f2, 0, fs5500f1, msx2jp, driver_device, 0, "National / Matsushita", "FS-5500F1 (Japan) (MSX2)", 0)
-COMP(1985, fs5500f2, 0, 0, fs5500f2, msx2jp, driver_device, 0, "National / Matsushita", "FS-5500F2 (Japan) (MSX2)", 0)
-COMP(1986, fs4500, 0, 0, fs4500, msx2jp, driver_device, 0, "National / Matsushita", "FS-4500 (Japan) (MSX2)", 0)
-COMP(1986, fs4700, 0, 0, fs4700, msx2jp, driver_device, 0, "National / Matsushita", "FS-4700 (Japan) (MSX2)", 0)
-COMP(1986, fs5000, 0, 0, fs5000, msx2jp, driver_device, 0, "National / Matsushita", "FS-5000F2 (Japan) (MSX2)", 0)
-COMP(1986, fs4600, 0, 0, fs4600, msx2jp, driver_device, 0, "National / Matsushita", "FS-4600 (Japan) (MSX2)", 0)
-COMP(1986, fsa1, fsa1a, 0, fsa1, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1 / 1st released version (Japan) (MSX2)", 0)
-COMP(1986, fsa1a, 0, 0, fsa1a, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1 / 2nd released version (Japan) (MSX2)", 0)
-COMP(1987, fsa1mk2, 0, 0, fsa1mk2, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1MK2 (Japan) (MSX2)", 0)
-COMP(1987, fsa1f, 0, 0, fsa1f, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1F (Japan) (MSX2)", 0)
-COMP(1987, fsa1fm, 0, 0, fsa1fm, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1FM (Japan) (MSX2)", 0)
-COMP(1986, nms8220, nms8220a, 0, nms8220, msx2, driver_device, 0, "Philips", "NMS-8220 (12-jun-1986) (MSX2)", 0)
-COMP(1986, nms8220a, 0, 0, nms8220a, msx2, driver_device, 0, "Philips", "NMS-8220 (13-aug-1986) (MSX2)", 0)
-COMP(1986, vg8230, 0, 0, vg8230, msx2, driver_device, 0, "Philips", "VG-8230 (MSX2)", 0)
-COMP(19??, vg8230j, vg8230, 0, vg8230j, msx2jp, driver_device, 0, "Philips", "VG-8230J (MSX2)", MACHINE_NOT_WORKING) // Screen flashes a few times before going into basic
-COMP(1986, vg8235, 0, 0, vg8235, msx2, driver_device, 0, "Philips", "VG-8235 (MSX2)", 0)
-COMP(1986, vg8235f, vg8235, 0, vg8235f, msx2, driver_device, 0, "Philips", "VG-8235F (MSX2)", 0)
-COMP(1986, vg8240, 0, 0, vg8240, msx2, driver_device, 0, "Philips", "VG-8240 (MSX2)", 0)
-COMP(1986, nms8245, 0, 0, nms8245, msx2, driver_device, 0, "Philips", "NMS-8245 (MSX2)", 0)
-COMP(1986, nms8245f, nms8245, 0, nms8245f, msx2, driver_device, 0, "Philips", "NMS-8245F (MSX2)", 0)
-COMP(1986, nms8250, nms8255, 0, nms8250, msx2, driver_device, 0, "Philips", "NMS-8250 (MSX2)", 0)
-COMP(1986, nms8250f, nms8255, 0, nms8250f, msx2, driver_device, 0, "Philips", "NMS-8250F (MSX2)", 0) // French keyboard
-COMP(19??, nms8250j, nms8255, 0, nms8250j, msx2jp, driver_device, 0, "Philips", "NMS-8250J (MSX2)", 0)
-COMP(1986, nms8255, 0, 0, nms8255, msx2, driver_device, 0, "Philips", "NMS-8255 (MSX2)", 0)
-COMP(1986, nms8255f, nms8255, 0, nms8255f, msx2, driver_device, 0, "Philips", "NMS-8255F (MSX2)", 0) // French keyboard
-COMP(1986, nms8260, 0, 0, nms8260, msx2, driver_device, 0, "Philips", "NMS-8260 (Prototype) (MSX2)", MACHINE_NOT_WORKING)
-COMP(1986, nms8280, 0, 0, nms8280, msx2, driver_device, 0, "Philips", "NMS-8280 (MSX2)", 0)
-COMP(1986, nms8280f, nms8280, 0, nms8280f, msx2, driver_device, 0, "Philips", "NMS-8280F (MSX2)", 0) // French keyboard
-COMP(1986, nms8280g, nms8280, 0, nms8280g, msx2, driver_device, 0, "Philips", "NMS-8280G (MSX2)", 0)
-COMP(19??, mpc2300, 0, 0, mpc2300, msx2, driver_device, 0, "Sanyo", "MPC-2300 (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
-COMP(198?, mpc2500f, 0, 0, mpc2500f, msx2, driver_device, 0, "Sanyo", "MPC-2500FD (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard?
-COMP(19??, mpc25fd, 0, 0, mpc25fd, msx2, driver_device, 0, "Sanyo", "Wavy MPC-25FD (MSX2)", 0)
-COMP(198?, mpc27, 0, 0, mpc27, msx2jp, driver_device, 0, "Sanyo", "Wavy MPC-27 (MSX2)", MACHINE_NOT_WORKING) // Light pen not emulated
-COMP(1988, phc23, 0, 0, phc23, msx2jp, driver_device, 0, "Sanyo", "Wavy PHC-23 (Japan) (MSX2)", 0)
-COMP(198?, phc55fd2, 0, 0, phc55fd2, msx2jp, driver_device, 0, "Sanyo", "Wavy PHC-55FD2 (MSX2)", 0)
-COMP(198?, phc77, 0, 0, phc77, msx2jp, driver_device, 0, "Sanyo", "Wavy PHC-77 (MSX2)", MACHINE_NOT_WORKING) // Firmware not emulated
-COMP(1986, hbf1, 0, 0, hbf1, msx2jp, driver_device, 0, "Sony", "HB-F1 (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
-COMP(1987, hbf12, 0, 0, hbf12, msx2jp, driver_device, 0, "Sony", "HB-F1II (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
-COMP(1987, hbf1xd, 0, 0, hbf1xd, msx2jp, driver_device, 0, "Sony", "HB-F1XD (Japan) (MSX2)", 0)
-COMP(1988, hbf1xdm2, 0, 0, hbf1xdm2, msx2jp, driver_device, 0, "Sony", "HB-F1XDMK2 (Japan) (MSX2)", 0)
-COMP(19??, hbf5, 0, 0, hbf5, msx2, driver_device, 0, "Sony", "HB-F5 (MSX2)", 0)
-COMP(1985, hbf9p, 0, 0, hbf9p, msx2, driver_device, 0, "Sony", "HB-F9P (MSX2)", 0)
-COMP(19??, hbf9pr, hbf9p, 0, hbf9pr, msx2, driver_device, 0, "Sony", "HB-F9P Russion (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
-COMP(1985, hbf9s, hbf9p, 0, hbf9s, msx2, driver_device, 0, "Sony", "HB-F9S (MSX2)", 0)
-COMP(1986, hbf500, hbf500p, 0, hbf500, msx2jp, driver_device, 0, "Sony", "HB-F500 (Japan) (MSX2)", 0)
-COMP(198?, hbf500f, hbf500p, 0, hbf500f, msx2, driver_device, 0, "Sony", "HB-F500F (MSX2)", 0) // French keyboard?
-COMP(1985, hbf500p, 0, 0, hbf500p, msx2, driver_device, 0, "Sony", "HB-F500P (MSX2)", 0)
-COMP(1985, hbf700d, hbf700p, 0, hbf700d, msx2, driver_device, 0, "Sony", "HB-F700D (Germany) (MSX2)", 0)
-COMP(1985, hbf700f, hbf700p, 0, hbf700f, msx2, driver_device, 0, "Sony", "HB-F700F (MSX2)", 0)
-COMP(1985, hbf700p, 0, 0, hbf700p, msx2, driver_device, 0, "Sony", "HB-F700P (MSX2)", 0)
-COMP(1985, hbf700s, hbf700p, 0, hbf700s, msx2, driver_device, 0, "Sony", "HB-F700S (Spain) (MSX2)", 0)
-COMP(1986, hbf900, hbf900a, 0, hbf900, msx2jp, driver_device, 0, "Sony", "HB-F900 / 1st released version (Japan) (MSX2)", 0)
-COMP(1986, hbf900a, 0, 0, hbf900a, msx2jp, driver_device, 0, "Sony", "HB-F900 / 2nd released version (Japan) (MSX2)", 0)
-COMP(1986, hbg900ap, hbg900p, 0, hbg900ap, msx2, driver_device, 0, "Sony", "HB-G900AP (MSX2)", 0 )
-COMP(1986, hbg900p, 0, 0, hbg900p, msx2, driver_device, 0, "Sony", "HB-G900P (MSX2)", 0 )
-COMP(1986, hotbit20, 0, 0, hotbit20, msx2, driver_device, 0, "Sharp / Epcom", "HB-8000 Hotbit 2.0 (MSX2)", 0) // Black screen
-COMP(1986, tpc310, 0, 0, tpc310, msx2, driver_device, 0, "Talent", "TPC-310 (MSX2)", 0)
-COMP(19??, tpp311, 0, 0, tpp311, msx2, driver_device, 0, "Talent", "TPP-311 (MSX2)", 0)
-COMP(19??, tps312, 0, 0, tps312, msx2, driver_device, 0, "Talent", "TPS-312 (MSX2)", 0)
-COMP(1986, hx23, hx23i, 0, hx23, msx2, driver_device, 0, "Toshiba", "HX-23 (MSX2)", 0)
-COMP(1986, hx23f, hx23i, 0, hx23f, msx2, driver_device, 0, "Toshiba", "HX-23F (MSX2)", 0)
-COMP(19??, hx23i, 0, 0, hx23i, msx2, driver_device, 0, "Toshiba", "HX-23I (MSX2)", 0)
-COMP(1985, hx33, 0, 0, hx33, msx2jp, driver_device, 0, "Toshiba", "HX-33 (MSX2)", 0)
-COMP(1985, hx34, hx34i, 0, hx34, msx2jp, driver_device, 0, "Toshiba", "HX-34 (MSX2)", 0)
-COMP(1985, hx34i, 0, 0, hx34i, msx, driver_device, 0, "Toshiba", "HX-34I (MSX2)", 0)
-COMP(1985, fstm1, 0, 0, fstm1, msx, driver_device, 0, "Toshiba", "FS-TM1 (MSX2)", 0)
-COMP(198?, victhc90, victhc95, 0, victhc90, msxjp, driver_device, 0, "Victor", "HC-90 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
-COMP(1986, victhc95, 0, 0, victhc95, msxjp, driver_device, 0, "Victor", "HC-95 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
-COMP(1986, victhc95a, victhc95, 0, victhc95a, msxjp, driver_device, 0, "Victor", "HC-95A (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
-COMP(1986, cx7m, cx7m128, 0, cx7m, msx2, driver_device, 0, "Yamaha", "CX7M (MSX2)", 0)
-COMP(1986, cx7m128, 0, 0, cx7m128, msx2, driver_device, 0, "Yamaha", "CX7M/128 (MSX2)", 0)
-COMP(198?, y503iiir, 0, 0, y503iiir, msx2, driver_device, 0, "Yamaha", "YIS-503 III R (Russian) (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard, floppy support broken
-COMP(198?, y503iiire, y503iiir, 0, y503iiire, msx2, driver_device, 0, "Yamaha", "YIS-503 III R (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Russian/Estonian keyboard, floppy support broken
-COMP(1985, yis60464, yis604, 0, yis60464, msx2jp, driver_device, 0, "Yamaha", "YIS604 (64KB) (MSX2)", 0)
-COMP(1985, yis604, 0, 0, yis604, msx2jp, driver_device, 0, "Yamaha", "YIS604 (128KB) (MSX2)", 0)
-COMP(198?, y805128, y805256, 0, y805128, msx2jp, driver_device, 0, "Yamaha", "YIS805/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
-COMP(198?, y805128r2, y805256, 0, y805128r2, msx2jp, driver_device, 0, "Yamaha", "YIS805R2/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
-COMP(198?, y805128r2e, y805256, 0, y805128r2e, msx2jp, driver_device, 0, "Yamaha", "YIS805R2/128 (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
-COMP(198?, y805256, 0, 0, y805256, msx2jp, driver_device, 0, "Yamaha", "YIS805/256 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(1986, ax350, 0, 0, ax350, msx2, msx_state, 0, "Al Alamiah", "AX-350 (Arabic) (MSX2)", 0)
+COMP(1986, ax370, 0, 0, ax370, msx2, msx_state, 0, "Al Alamiah", "AX-370 (Arabic) (MSX2)", 0)
+COMP(1985, canonv25, 0, 0, canonv25, msx2, msx_state, 0, "Canon", "V-25 (MSX2)", 0)
+COMP(1985, canonv30, 0, 0, canonv30, msx2, msx_state, 0, "Canon", "V-30 (MSX2)", 0)
+COMP(1985, canonv30f, canonv30, 0, canonv30f, msx2, msx_state, 0, "Canon", "V-30F (MSX2)", 0)
+COMP(1986, cpc300, 0, 0, cpc300, msx2kr, msx_state, 0, "Daewoo", "IQ-2000 CPC-300 (Korea) (MSX2)", 0)
+COMP(1986, cpc300e, 0, 0, cpc300e, msx2kr, msx_state, 0, "Daewoo", "IQ-2000 CPC-300E (Korea) (MSX2)", 0)
+COMP(1985, cpc330k, 0, 0, cpc330k, msx2kr, msx_state, 0, "Daewoo", "CPC-330K KOBO (Korea) (MSX2)", 0)
+COMP(1988, cpc400, 0, 0, cpc400, msx2kr, msx_state, 0, "Daewoo", "X-II CPC-400 (Korea) (MSX2)", 0)
+COMP(1988, cpc400s, 0, 0, cpc400s, msx2kr, msx_state, 0, "Daewoo", "X-II CPC-400S (Korea) (MSX2)", 0)
+COMP(1990, cpc61, 0, 0, cpc61, msx2kr, msx_state, 0, "Daewoo", "Zemmix CPC-61 (Korea) (MSX2)", 0)
+COMP(1991, cpg120, 0, 0, cpg120, msx2kr, msx_state, 0, "Daewoo", "Zemmix CPG-120 Normal (Korea) (MSX2)", MACHINE_NOT_WORKING) // v9958 not added
+COMP(198?, fpc900, 0, 0, fpc900, msx2, msx_state, 0, "Fenner", "FPC-900 (MSX2)", 0)
+COMP(1986, expert20, 0, 0, expert20, msx2, msx_state, 0, "Gradiente", "Expert 2.0 (Brazil) (MSX2)", 0)
+COMP(198?, mbh70, 0, 0, mbh70, msx2jp, msx_state, 0, "Hitachi", "MB-H70 (MSX2)", MACHINE_NOT_WORKING) // Firmware not working
+COMP(1987, kmc5000, 0, 0, kmc5000, msx2jp, msx_state, 0, "Kawai", "KMC-5000 (MSX2)", 0)
+COMP(1985, mlg1, 0, 0, mlg1, msx2, msx_state, 0, "Mitsubishi", "ML-G1 (MSX2)", 0)
+COMP(198?, mlg3, 0, 0, mlg3, msx2, msx_state, 0, "Mitsubishi", "ML-G3 (MSX2)", 0)
+COMP(1985, mlg10, 0, 0, mlg10, msx2jp, msx_state, 0, "Mitsubishi", "ML-G10 (MSX2)", 0)
+COMP(1983, mlg30, 0, 0, mlg30, msx2, msx_state, 0, "Mitsubishi", "ML-G30 (MSX2)", 0)
+COMP(1985, fs5500f1, fs5500f2, 0, fs5500f1, msx2jp, msx_state, 0, "National / Matsushita", "FS-5500F1 (Japan) (MSX2)", 0)
+COMP(1985, fs5500f2, 0, 0, fs5500f2, msx2jp, msx_state, 0, "National / Matsushita", "FS-5500F2 (Japan) (MSX2)", 0)
+COMP(1986, fs4500, 0, 0, fs4500, msx2jp, msx_state, 0, "National / Matsushita", "FS-4500 (Japan) (MSX2)", 0)
+COMP(1986, fs4700, 0, 0, fs4700, msx2jp, msx_state, 0, "National / Matsushita", "FS-4700 (Japan) (MSX2)", 0)
+COMP(1986, fs5000, 0, 0, fs5000, msx2jp, msx_state, 0, "National / Matsushita", "FS-5000F2 (Japan) (MSX2)", 0)
+COMP(1986, fs4600, 0, 0, fs4600, msx2jp, msx_state, 0, "National / Matsushita", "FS-4600 (Japan) (MSX2)", 0)
+COMP(1986, fsa1, fsa1a, 0, fsa1, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1 / 1st released version (Japan) (MSX2)", 0)
+COMP(1986, fsa1a, 0, 0, fsa1a, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1 / 2nd released version (Japan) (MSX2)", 0)
+COMP(1987, fsa1mk2, 0, 0, fsa1mk2, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1MK2 (Japan) (MSX2)", 0)
+COMP(1987, fsa1f, 0, 0, fsa1f, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1F (Japan) (MSX2)", 0)
+COMP(1987, fsa1fm, 0, 0, fsa1fm, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1FM (Japan) (MSX2)", 0)
+COMP(1986, nms8220, nms8220a, 0, nms8220, msx2, msx_state, 0, "Philips", "NMS-8220 (12-jun-1986) (MSX2)", 0)
+COMP(1986, nms8220a, 0, 0, nms8220a, msx2, msx_state, 0, "Philips", "NMS-8220 (13-aug-1986) (MSX2)", 0)
+COMP(1986, vg8230, 0, 0, vg8230, msx2, msx_state, 0, "Philips", "VG-8230 (MSX2)", 0)
+COMP(19??, vg8230j, vg8230, 0, vg8230j, msx2jp, msx_state, 0, "Philips", "VG-8230J (MSX2)", MACHINE_NOT_WORKING) // Screen flashes a few times before going into basic
+COMP(1986, vg8235, 0, 0, vg8235, msx2, msx_state, 0, "Philips", "VG-8235 (MSX2)", 0)
+COMP(1986, vg8235f, vg8235, 0, vg8235f, msx2, msx_state, 0, "Philips", "VG-8235F (MSX2)", 0)
+COMP(1986, vg8240, 0, 0, vg8240, msx2, msx_state, 0, "Philips", "VG-8240 (MSX2)", 0)
+COMP(1986, nms8245, 0, 0, nms8245, msx2, msx_state, 0, "Philips", "NMS-8245 (MSX2)", 0)
+COMP(1986, nms8245f, nms8245, 0, nms8245f, msx2, msx_state, 0, "Philips", "NMS-8245F (MSX2)", 0)
+COMP(1986, nms8250, nms8255, 0, nms8250, msx2, msx_state, 0, "Philips", "NMS-8250 (MSX2)", 0)
+COMP(1986, nms8250f, nms8255, 0, nms8250f, msx2, msx_state, 0, "Philips", "NMS-8250F (MSX2)", 0) // French keyboard
+COMP(19??, nms8250j, nms8255, 0, nms8250j, msx2jp, msx_state, 0, "Philips", "NMS-8250J (MSX2)", 0)
+COMP(1986, nms8255, 0, 0, nms8255, msx2, msx_state, 0, "Philips", "NMS-8255 (MSX2)", 0)
+COMP(1986, nms8255f, nms8255, 0, nms8255f, msx2, msx_state, 0, "Philips", "NMS-8255F (MSX2)", 0) // French keyboard
+COMP(1986, nms8260, 0, 0, nms8260, msx2, msx_state, 0, "Philips", "NMS-8260 (Prototype) (MSX2)", MACHINE_NOT_WORKING)
+COMP(1986, nms8280, 0, 0, nms8280, msx2, msx_state, 0, "Philips", "NMS-8280 (MSX2)", 0)
+COMP(1986, nms8280f, nms8280, 0, nms8280f, msx2, msx_state, 0, "Philips", "NMS-8280F (MSX2)", 0) // French keyboard
+COMP(1986, nms8280g, nms8280, 0, nms8280g, msx2, msx_state, 0, "Philips", "NMS-8280G (MSX2)", 0)
+COMP(19??, mpc2300, 0, 0, mpc2300, msx2, msx_state, 0, "Sanyo", "MPC-2300 (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
+COMP(198?, mpc2500f, 0, 0, mpc2500f, msx2, msx_state, 0, "Sanyo", "MPC-2500FD (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard?
+COMP(19??, mpc25fd, 0, 0, mpc25fd, msx2, msx_state, 0, "Sanyo", "Wavy MPC-25FD (MSX2)", 0)
+COMP(198?, mpc27, 0, 0, mpc27, msx2jp, msx_state, 0, "Sanyo", "Wavy MPC-27 (MSX2)", MACHINE_NOT_WORKING) // Light pen not emulated
+COMP(1988, phc23, 0, 0, phc23, msx2jp, msx_state, 0, "Sanyo", "Wavy PHC-23 (Japan) (MSX2)", 0)
+COMP(198?, phc55fd2, 0, 0, phc55fd2, msx2jp, msx_state, 0, "Sanyo", "Wavy PHC-55FD2 (MSX2)", 0)
+COMP(198?, phc77, 0, 0, phc77, msx2jp, msx_state, 0, "Sanyo", "Wavy PHC-77 (MSX2)", MACHINE_NOT_WORKING) // Firmware not emulated
+COMP(1986, hbf1, 0, 0, hbf1, msx2jp, msx_state, 0, "Sony", "HB-F1 (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
+COMP(1987, hbf12, 0, 0, hbf12, msx2jp, msx_state, 0, "Sony", "HB-F1II (Japan) (MSX2)", MACHINE_NOT_WORKING ) // Screen stays a single color after a while
+COMP(1987, hbf1xd, 0, 0, hbf1xd, msx2jp, msx_state, 0, "Sony", "HB-F1XD (Japan) (MSX2)", 0)
+COMP(1988, hbf1xdm2, 0, 0, hbf1xdm2, msx2jp, msx_state, 0, "Sony", "HB-F1XDMK2 (Japan) (MSX2)", 0)
+COMP(19??, hbf5, 0, 0, hbf5, msx2, msx_state, 0, "Sony", "HB-F5 (MSX2)", 0)
+COMP(1985, hbf9p, 0, 0, hbf9p, msx2, msx_state, 0, "Sony", "HB-F9P (MSX2)", 0)
+COMP(19??, hbf9pr, hbf9p, 0, hbf9pr, msx2, msx_state, 0, "Sony", "HB-F9P Russion (MSX2)", MACHINE_NOT_WORKING) // Keyboard responds differently
+COMP(1985, hbf9s, hbf9p, 0, hbf9s, msx2, msx_state, 0, "Sony", "HB-F9S (MSX2)", 0)
+COMP(1986, hbf500, hbf500p, 0, hbf500, msx2jp, msx_state, 0, "Sony", "HB-F500 (Japan) (MSX2)", 0)
+COMP(198?, hbf500f, hbf500p, 0, hbf500f, msx2, msx_state, 0, "Sony", "HB-F500F (MSX2)", 0) // French keyboard?
+COMP(1985, hbf500p, 0, 0, hbf500p, msx2, msx_state, 0, "Sony", "HB-F500P (MSX2)", 0)
+COMP(1985, hbf700d, hbf700p, 0, hbf700d, msx2, msx_state, 0, "Sony", "HB-F700D (Germany) (MSX2)", 0)
+COMP(1985, hbf700f, hbf700p, 0, hbf700f, msx2, msx_state, 0, "Sony", "HB-F700F (MSX2)", 0)
+COMP(1985, hbf700p, 0, 0, hbf700p, msx2, msx_state, 0, "Sony", "HB-F700P (MSX2)", 0)
+COMP(1985, hbf700s, hbf700p, 0, hbf700s, msx2, msx_state, 0, "Sony", "HB-F700S (Spain) (MSX2)", 0)
+COMP(1986, hbf900, hbf900a, 0, hbf900, msx2jp, msx_state, 0, "Sony", "HB-F900 / 1st released version (Japan) (MSX2)", 0)
+COMP(1986, hbf900a, 0, 0, hbf900a, msx2jp, msx_state, 0, "Sony", "HB-F900 / 2nd released version (Japan) (MSX2)", 0)
+COMP(1986, hbg900ap, hbg900p, 0, hbg900ap, msx2, msx_state, 0, "Sony", "HB-G900AP (MSX2)", 0 )
+COMP(1986, hbg900p, 0, 0, hbg900p, msx2, msx_state, 0, "Sony", "HB-G900P (MSX2)", 0 )
+COMP(1986, hotbit20, 0, 0, hotbit20, msx2, msx_state, 0, "Sharp / Epcom", "HB-8000 Hotbit 2.0 (MSX2)", 0) // Black screen
+COMP(1986, tpc310, 0, 0, tpc310, msx2, msx_state, 0, "Talent", "TPC-310 (MSX2)", 0)
+COMP(19??, tpp311, 0, 0, tpp311, msx2, msx_state, 0, "Talent", "TPP-311 (MSX2)", 0)
+COMP(19??, tps312, 0, 0, tps312, msx2, msx_state, 0, "Talent", "TPS-312 (MSX2)", 0)
+COMP(1986, hx23, hx23i, 0, hx23, msx2, msx_state, 0, "Toshiba", "HX-23 (MSX2)", 0)
+COMP(1986, hx23f, hx23i, 0, hx23f, msx2, msx_state, 0, "Toshiba", "HX-23F (MSX2)", 0)
+COMP(19??, hx23i, 0, 0, hx23i, msx2, msx_state, 0, "Toshiba", "HX-23I (MSX2)", 0)
+COMP(1985, hx33, 0, 0, hx33, msx2jp, msx_state, 0, "Toshiba", "HX-33 (MSX2)", 0)
+COMP(1985, hx34, hx34i, 0, hx34, msx2jp, msx_state, 0, "Toshiba", "HX-34 (MSX2)", 0)
+COMP(1985, hx34i, 0, 0, hx34i, msx, msx_state, 0, "Toshiba", "HX-34I (MSX2)", 0)
+COMP(1985, fstm1, 0, 0, fstm1, msx, msx_state, 0, "Toshiba", "FS-TM1 (MSX2)", 0)
+COMP(198?, victhc90, victhc95, 0, victhc90, msxjp, msx_state, 0, "Victor", "HC-90 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
+COMP(1986, victhc95, 0, 0, victhc95, msxjp, msx_state, 0, "Victor", "HC-95 (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
+COMP(1986, victhc95a, victhc95, 0, victhc95a, msxjp, msx_state, 0, "Victor", "HC-95A (MSX2)", MACHINE_NOT_WORKING) // 2nd cpu/turbo not emulated, firmware won't start
+COMP(1986, cx7m, cx7m128, 0, cx7m, msx2, msx_state, 0, "Yamaha", "CX7M (MSX2)", 0)
+COMP(1986, cx7m128, 0, 0, cx7m128, msx2, msx_state, 0, "Yamaha", "CX7M/128 (MSX2)", 0)
+COMP(198?, y503iiir, 0, 0, y503iiir, msx2, msx_state, 0, "Yamaha", "YIS-503 III R (Russian) (MSX2)", MACHINE_NOT_WORKING) // Russian keyboard, floppy support broken
+COMP(198?, y503iiire, y503iiir, 0, y503iiire, msx2, msx_state, 0, "Yamaha", "YIS-503 III R (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Russian/Estonian keyboard, floppy support broken
+COMP(1985, yis60464, yis604, 0, yis60464, msx2jp, msx_state, 0, "Yamaha", "YIS604 (64KB) (MSX2)", 0)
+COMP(1985, yis604, 0, 0, yis604, msx2jp, msx_state, 0, "Yamaha", "YIS604 (128KB) (MSX2)", 0)
+COMP(198?, y805128, y805256, 0, y805128, msx2jp, msx_state, 0, "Yamaha", "YIS805/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(198?, y805128r2, y805256, 0, y805128r2, msx2jp, msx_state, 0, "Yamaha", "YIS805R2/128 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(198?, y805128r2e, y805256, 0, y805128r2e, msx2jp, msx_state, 0, "Yamaha", "YIS805R2/128 (Estonian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
+COMP(198?, y805256, 0, 0, y805256, msx2jp, msx_state, 0, "Yamaha", "YIS805/256 (Russian) (MSX2)", MACHINE_NOT_WORKING) // Floppy support broken
/* MSX2+ */
-COMP(19??, expert3i, 0, 0, expert3i, msx2, driver_device, 0, "Ciel", "Expert 3 IDE (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(1996, expert3t, 0, 0, expert3t, msx2, driver_device, 0, "Ciel", "Expert 3 Turbo (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(19??, expertac, 0, 0, expertac, msx2, driver_device, 0, "Gradiente", "Expert AC88+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(19??, expertdx, 0, 0, expertdx, msx2, driver_device, 0, "Gradiente", "Expert DDX+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
-COMP(1988, fsa1fx, 0, 0, fsa1fx, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1FX (Japan) (MSX2+)", 0 )
-COMP(1988, fsa1wx, fsa1wxa, 0, fsa1wx, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1WX / 1st released version (Japan) (MSX2+)", 0 )
-COMP(1988, fsa1wxa, 0, 0, fsa1wxa, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1WX / 2nd released version (Japan) (MSX2+)", 0 )
-COMP(1989, fsa1wsx, 0, 0, fsa1wsx, msx2jp, driver_device, 0, "Panasonic / Matsushita", "FS-A1WSX (Japan) (MSX2+)", 0 )
-COMP(1988, hbf1xdj, 0, 0, hbf1xdj, msx2jp, driver_device, 0, "Sony", "HB-F1XDJ (Japan) (MSX2+)", 0 )
-COMP(1989, hbf1xv, 0, 0, hbf1xv, msx2jp, driver_device, 0, "Sony", "HB-F1XV (Japan) (MSX2+)", 0 )
-COMP(1988, phc70fd, phc70fd2, 0, phc70fd, msx2jp, driver_device, 0, "Sanyo", "WAVY PHC-70FD (Japan) (MSX2+)", 0 )
-COMP(1988, phc70fd2, 0, 0, phc70fd2, msx2jp, driver_device, 0, "Sanyo", "WAVY PHC-70FD2 (Japan) (MSX2+)", 0 )
-COMP(1989, phc35j, 0, 0, phc35j, msx2jp, driver_device, 0, "Sanyo", "WAVY PHC-35J (Japan) (MSX2+)", 0)
-COMP(19??, hbf9sp, 0, 0, hbf9sp, msx2jp, driver_device, 0, "Sony", "HB-F9S+ (MSX2+)", 0)
+COMP(19??, expert3i, 0, 0, expert3i, msx2, msx_state, 0, "Ciel", "Expert 3 IDE (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(1996, expert3t, 0, 0, expert3t, msx2, msx_state, 0, "Ciel", "Expert 3 Turbo (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(19??, expertac, 0, 0, expertac, msx2, msx_state, 0, "Gradiente", "Expert AC88+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(19??, expertdx, 0, 0, expertdx, msx2, msx_state, 0, "Gradiente", "Expert DDX+ (MSX2+)", MACHINE_NOT_WORKING ) // Some hardware not emulated
+COMP(1988, fsa1fx, 0, 0, fsa1fx, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1FX (Japan) (MSX2+)", 0 )
+COMP(1988, fsa1wx, fsa1wxa, 0, fsa1wx, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1WX / 1st released version (Japan) (MSX2+)", 0 )
+COMP(1988, fsa1wxa, 0, 0, fsa1wxa, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1WX / 2nd released version (Japan) (MSX2+)", 0 )
+COMP(1989, fsa1wsx, 0, 0, fsa1wsx, msx2jp, msx_state, 0, "Panasonic / Matsushita", "FS-A1WSX (Japan) (MSX2+)", 0 )
+COMP(1988, hbf1xdj, 0, 0, hbf1xdj, msx2jp, msx_state, 0, "Sony", "HB-F1XDJ (Japan) (MSX2+)", 0 )
+COMP(1989, hbf1xv, 0, 0, hbf1xv, msx2jp, msx_state, 0, "Sony", "HB-F1XV (Japan) (MSX2+)", 0 )
+COMP(1988, phc70fd, phc70fd2, 0, phc70fd, msx2jp, msx_state, 0, "Sanyo", "WAVY PHC-70FD (Japan) (MSX2+)", 0 )
+COMP(1988, phc70fd2, 0, 0, phc70fd2, msx2jp, msx_state, 0, "Sanyo", "WAVY PHC-70FD2 (Japan) (MSX2+)", 0 )
+COMP(1989, phc35j, 0, 0, phc35j, msx2jp, msx_state, 0, "Sanyo", "WAVY PHC-35J (Japan) (MSX2+)", 0)
+COMP(19??, hbf9sp, 0, 0, hbf9sp, msx2jp, msx_state, 0, "Sony", "HB-F9S+ (MSX2+)", 0)
/* MSX Turbo-R */
/* Temporary placeholders, Turbo-R hardware is not supported yet */
-COMP(19??, fsa1gt, 0, 0, fsa1gt, msx2jp, driver_device, 0, "Panasonic", "FS-A1GT (MSX Turbo-R)", MACHINE_NOT_WORKING)
-COMP(19??, fsa1st, 0, 0, fsa1st, msx2jp, driver_device, 0, "Panasonic", "FS-A1ST (MSX Turbo-R)", MACHINE_NOT_WORKING)
+COMP(19??, fsa1gt, 0, 0, fsa1gt, msx2jp, msx_state, 0, "Panasonic", "FS-A1GT (MSX Turbo-R)", MACHINE_NOT_WORKING)
+COMP(19??, fsa1st, 0, 0, fsa1st, msx2jp, msx_state, 0, "Panasonic", "FS-A1ST (MSX Turbo-R)", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/mt735.cpp b/src/mame/drivers/mt735.cpp
index b6bbfffa5e6..e80c4013302 100644
--- a/src/mame/drivers/mt735.cpp
+++ b/src/mame/drivers/mt735.cpp
@@ -59,7 +59,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mt735 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mt735, mt735_state )
+static MACHINE_CONFIG_START( mt735 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/6)
MCFG_CPU_PROGRAM_MAP(mt735_map)
MACHINE_CONFIG_END
@@ -70,4 +70,4 @@ ROM_START( mt735 )
ROM_LOAD16_BYTE( "spg_m_o_ic102.bin", 1, 0x20000, CRC(84d8446b) SHA1(b1cedd8b09556eb8118f79b012aeec5b61e3ff32) )
ROM_END
-COMP( ????, mt735, 0, 0, mt735, mt735, driver_device, 0, "Brother", "MT735", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+COMP( ????, mt735, 0, 0, mt735, mt735, mt735_state, 0, "Brother", "MT735", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/mtouchxl.cpp b/src/mame/drivers/mtouchxl.cpp
index 3faad8f9d93..89e831aab3b 100644
--- a/src/mame/drivers/mtouchxl.cpp
+++ b/src/mame/drivers/mtouchxl.cpp
@@ -55,7 +55,7 @@ public:
m_iocard(*this, "dbank"),
//m_ibutton(*this, "ibutton"),
m_multikey(*this, "multikey")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<at_mb_device> m_mb;
required_device<ram_device> m_ram;
@@ -177,7 +177,7 @@ static MACHINE_CONFIG_FRAGMENT(cdrom)
MCFG_SLOT_FIXED(true)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( at486, mtxl_state )
+static MACHINE_CONFIG_START( at486 )
MCFG_CPU_ADD("maincpu", I486DX4, 33000000)
MCFG_CPU_PROGRAM_MAP(at32_map)
MCFG_CPU_IO_MAP(at32_io)
@@ -369,14 +369,14 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
// Any indicates this is from a CD-R at a trade show that was claimed to be a prototype, but R1 is several versions in?
-COMP ( 1997, mtouchxl, 0, 0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL (Version R1, prototype?)", 0 )
-COMP ( 1998, mtchxl5k, 0, 0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL Super 5000 (Version R5I)", MACHINE_NOT_WORKING )
-COMP ( 1998, mtchxl5ko, mtchxl5k,0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL Super 5000 (Version R5B)", MACHINE_NOT_WORKING )
-COMP ( 1998, mtchxl5ko2, mtchxl5k,0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL Super 5000 (Version R5E)", MACHINE_NOT_WORKING )
-COMP ( 1999, mtchxl6k, 0, 0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL 6000 (Version r07)", 0 )
-COMP ( 1999, mtchxl6ko4, mtchxl6k,0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL 6000 (Version r04)", 0 )
-COMP ( 1999, mtchxl6ko, mtchxl6k,0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL 6000 (Version r02)", 0 )
-COMP ( 2000, mtchxlgld, 0, 0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL Gold (Version r01)", MACHINE_NOT_WORKING )
-COMP ( 2000, mtchxlgldo, mtchxlgld, 0, at486, mtouchxl, driver_device, 0, "Merit Industries", "MegaTouch XL Gold (Version r00)", MACHINE_NOT_WORKING )
+COMP ( 1997, mtouchxl, 0, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL (Version R1, prototype?)", 0 )
+COMP ( 1998, mtchxl5k, 0, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL Super 5000 (Version R5I)", MACHINE_NOT_WORKING )
+COMP ( 1998, mtchxl5ko, mtchxl5k, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL Super 5000 (Version R5B)", MACHINE_NOT_WORKING )
+COMP ( 1998, mtchxl5ko2, mtchxl5k, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL Super 5000 (Version R5E)", MACHINE_NOT_WORKING )
+COMP ( 1999, mtchxl6k, 0, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL 6000 (Version r07)", 0 )
+COMP ( 1999, mtchxl6ko4, mtchxl6k, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL 6000 (Version r04)", 0 )
+COMP ( 1999, mtchxl6ko, mtchxl6k, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL 6000 (Version r02)", 0 )
+COMP ( 2000, mtchxlgld, 0, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL Gold (Version r01)", MACHINE_NOT_WORKING )
+COMP ( 2000, mtchxlgldo, mtchxlgld, 0, at486, mtouchxl, mtxl_state, 0, "Merit Industries", "MegaTouch XL Gold (Version r00)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp
index 99fff4172dd..b764ba33558 100644
--- a/src/mame/drivers/mtx.cpp
+++ b/src/mame/drivers/mtx.cpp
@@ -282,10 +282,10 @@ WRITE_LINE_MEMBER(mtx_state::mtx_tms9929a_interrupt)
***************************************************************************/
/*-------------------------------------------------
- MACHINE_CONFIG_START( mtx512, mtx_state )
+ MACHINE_CONFIG_START( mtx512 )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( mtx512, mtx_state )
+static MACHINE_CONFIG_START( mtx512 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
@@ -409,10 +409,10 @@ ROM_END
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, mtx512, 0, 0, mtx512, mtx512, driver_device, 0, "Memotech Ltd", "MTX 512", 0 )
-COMP( 1983, mtx500, mtx512, 0, mtx500, mtx512, driver_device, 0, "Memotech Ltd", "MTX 500", 0 )
-COMP( 1984, rs128, mtx512, 0, rs128, mtx512, driver_device, 0, "Memotech Ltd", "RS 128", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, mtx512, 0, 0, mtx512, mtx512, mtx_state, 0, "Memotech Ltd", "MTX 512", 0 )
+COMP( 1983, mtx500, mtx512, 0, mtx500, mtx512, mtx_state, 0, "Memotech Ltd", "MTX 500", 0 )
+COMP( 1984, rs128, mtx512, 0, rs128, mtx512, mtx_state, 0, "Memotech Ltd", "RS 128", 0 )
/*
diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp
index 29d713fab2f..9a9cb0d0aba 100644
--- a/src/mame/drivers/mugsmash.cpp
+++ b/src/mame/drivers/mugsmash.cpp
@@ -397,7 +397,7 @@ void mugsmash_state::machine_start()
{
}
-static MACHINE_CONFIG_START( mugsmash, mugsmash_state )
+static MACHINE_CONFIG_START( mugsmash )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(mugsmash_map)
@@ -430,7 +430,7 @@ static MACHINE_CONFIG_START( mugsmash, mugsmash_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) /* music */
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
- MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1122000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) /* sound fx */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -462,4 +462,4 @@ ROM_START( mugsmash )
ROM_LOAD( "mugs_15.bin", 0x180000, 0x080000, CRC(82e8187c) SHA1(c7a0e1b3d90dbbe2588886a27a07a9c336447ae3) )
ROM_END
-GAME( 1990?, mugsmash, 0, mugsmash, mugsmash, driver_device, 0, ROT0, "Electronic Devices Italy / 3D Games England", "Mug Smashers", MACHINE_SUPPORTS_SAVE )
+GAME( 1990?, mugsmash, 0, mugsmash, mugsmash, mugsmash_state, 0, ROT0, "Electronic Devices Italy / 3D Games England", "Mug Smashers", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 431f6efeed2..d0087f46468 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -1037,7 +1037,7 @@ void igrosoft_gamble_state::machine_reset()
m_hopper = 0;
}
-MACHINE_CONFIG_START( igrosoft_gamble, igrosoft_gamble_state )
+MACHINE_CONFIG_START( igrosoft_gamble )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4)
MCFG_CPU_PROGRAM_MAP(igrosoft_gamble_map)
@@ -2706,117 +2706,117 @@ Most games had a revision in early 2007 to meet the standards of the "Government
-GAME( 2002, goldfish, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gold Fish (020903, prototype)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2002, mfish_3, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Multi Fish (021124)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2002, mfish_6, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Multi Fish (030124)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2002, mfish_8, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Multi Fish (030522)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2002, mfish_11, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Multi Fish (031124)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2002, mfish_12, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Multi Fish (040308)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2002, mfish_13, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Multi Fish (040316)", MACHINE_SUPPORTS_SAVE ) /* World */
-
-GAME( 2002, windjamr, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Windjammer (021216)", MACHINE_SUPPORTS_SAVE ) /* World */
-
-GAME( 2003, czmon_5, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (030421 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, czmon_7, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (031110 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, czmon_8, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (050120 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, czmon_9, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (070315 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, czmon_13, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (100311 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, czmon_15, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, crzmonent,ROT0, "Igrosoft", "Crazy Monkey (100311 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-GAME( 2003, czmon_16, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Crazy Monkey (100312 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-
-GAME( 2003, fcockt_3, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (030623 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, fcockt_5, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (031111 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, fcockt_6, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (040216 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, fcockt_7, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (050118 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, fcockt_8, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (060111 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, fcockt_9, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (070305 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, fcockt_10, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (070517 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, fcockt_11, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (070822 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, fcockt_12, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail (070911 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, fcockt_14, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, fcocktent,ROT0, "Igrosoft", "Fruit Cocktail (090708 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2003, lhaunt_2, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Lucky Haunter (030804 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, lhaunt_4, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Lucky Haunter (031111 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, lhaunt_5, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Lucky Haunter (040216 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, lhaunt_6, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Lucky Haunter (040825 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, lhaunt_7, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Lucky Haunter (070402 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, lhaunt_8, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Lucky Haunter (070604 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2003, lhaunt_10, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, lhauntent,ROT0, "Igrosoft", "Lucky Haunter (090712 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-GAME( 2003, lhaunt_11, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, lhauntent,ROT0, "Igrosoft", "Lucky Haunter (100331 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2003, rollfr_2, rollfr_4, rollfr, rollfr, driver_device, 0, ROT0, "Igrosoft", "Roll Fruit (040318)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, rollfr_3, rollfr_4, rollfr, rollfr, driver_device, 0, ROT0, "Igrosoft", "Roll Fruit (080327)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2003, rollfr_4, 0, rollfr, rollfr, driver_device, 0, ROT0, "Igrosoft", "Roll Fruit (080331)", MACHINE_SUPPORTS_SAVE ) /* World */
-
-GAME( 2004, garage_4, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Garage (040219 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, garage_5, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Garage (050311 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, garage_6, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Garage (070213 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2004, garage_7, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Garage (070329 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2004, garage_9, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, garageent,ROT0, "Igrosoft", "Garage (090715 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2004, rclimb, rclimb_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Rock Climber (040815 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, rclimb_3, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Rock Climber (040827 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, rclimb_4, rclimb_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Rock Climber (070322 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2004, rclimb_5, rclimb_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Rock Climber (070621 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2004, rclimb_7, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, rclimbent,ROT0, "Igrosoft", "Rock Climber (090716 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2004, sweetl, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Sweet Life (041220 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, sweetl_2, sweetl, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Sweet Life (070412 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-
-GAME( 2004, resdnt, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Resident (040415 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, resdnt_2, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Resident (040513 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, resdnt_3, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Resident (070222 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2004, resdnt_6, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Resident (100311 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2004, resdnt_8, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, resdntent,ROT0, "Igrosoft", "Resident (100311 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-GAME( 2004, resdnt_9, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Resident (100316 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-
-GAME( 2005, island, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Island (050713 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2005, island_2, island, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Island (070409 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-
-GAME( 2005, pirate_2, pirate_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Pirate (060210 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2005, pirate_3, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Pirate (060803 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2005, pirate_4, pirate_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Pirate (070412 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-
-GAME( 2006, island2, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Island 2 (060529 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2006, island2_3, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Island 2 (061218 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2006, island2_4, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Island 2 (070205 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2006, island2_5, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, island2l, ROT0, "Igrosoft", "Island 2 (090528 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2006, island2_6, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,island2ent,ROT0, "Igrosoft", "Island 2 (090724 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2006, pirate2, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Pirate 2 (061005 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2006, pirate2_2, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Pirate 2 (070126 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2006, pirate2_3, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, pirate2l, ROT0, "Igrosoft", "Pirate 2 (090528 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2006, pirate2_4, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,pirate2ent,ROT0, "Igrosoft", "Pirate 2 (090730 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2006, keks, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Keks (060328 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2006, keks_2, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Keks (060403 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2006, keks_3, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Keks (070119 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2006, keks_4, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, keksl, ROT0, "Igrosoft", "Keks (090604 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2006, keks_5, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, keksent, ROT0, "Igrosoft", "Keks (090727 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2007, gnome, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (070906 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2007, gnome_2, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (071115 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2007, gnome_3, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (080303 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2007, gnome_4, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (090402 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2007, gnome_5, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (090406 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2007, gnome_7, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, gnomel, ROT0, "Igrosoft", "Gnome (090708 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2007, gnome_9, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (100326 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2007, gnome_10, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, gnomel, ROT0, "Igrosoft", "Gnome (100326 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2007, gnome_11, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, gnomeent, ROT0, "Igrosoft", "Gnome (100326 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-GAME( 2007, gnome_12, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Gnome (100326 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-
-GAME( 2007, sweetl2, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Sweet Life 2 (071217 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2007, sweetl2_2, sweetl2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Sweet Life 2 (080320 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2007, sweetl2_3, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, sweetl2l, ROT0, "Igrosoft", "Sweet Life 2 (090525 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2007, sweetl2_4, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,sweetl2ent,ROT0, "Igrosoft", "Sweet Life 2 (090812 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2008, fcockt2, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (080707 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2008, fcockt2_3, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (080909 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2008, fcockt2_4, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (081105 World)", MACHINE_SUPPORTS_SAVE ) /* World */
-GAME( 2008, fcockt2_5, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (081106 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
-GAME( 2008, fcockt2_6, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, fcockt2l, ROT0, "Igrosoft", "Fruit Cocktail 2 (090528 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2008, fcockt2_7, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,fcockt2ent,ROT0, "Igrosoft", "Fruit Cocktail 2 (090813 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
-
-GAME( 2010, crzmon2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,crzmon2, ROT0, "Igrosoft", "Crazy Monkey 2 (100310)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE ) /* World */ // xored and bitswapped palette and gfx roms
-GAME( 2010, crzmon2_2, crzmon2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,crzmon2lot,ROT0, "Igrosoft", "Crazy Monkey 2 (100311 Lottery)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE ) /* Lottery */
-GAME( 2010, crzmon2_3, crzmon2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state,crzmon2ent,ROT0, "Igrosoft", "Crazy Monkey 2 (100315 Entertainment)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+GAME( 2002, goldfish, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gold Fish (020903, prototype)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2002, mfish_3, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Multi Fish (021124)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2002, mfish_6, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Multi Fish (030124)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2002, mfish_8, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Multi Fish (030522)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2002, mfish_11, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Multi Fish (031124)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2002, mfish_12, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Multi Fish (040308)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2002, mfish_13, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Multi Fish (040316)", MACHINE_SUPPORTS_SAVE ) /* World */
+
+GAME( 2002, windjamr, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Windjammer (021216)", MACHINE_SUPPORTS_SAVE ) /* World */
+
+GAME( 2003, czmon_5, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Crazy Monkey (030421 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, czmon_7, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Crazy Monkey (031110 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, czmon_8, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Crazy Monkey (050120 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, czmon_9, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Crazy Monkey (070315 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, czmon_13, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Crazy Monkey (100311 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, czmon_15, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, crzmonent, ROT0, "Igrosoft", "Crazy Monkey (100311 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+GAME( 2003, czmon_16, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Crazy Monkey (100312 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+
+GAME( 2003, fcockt_3, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (030623 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, fcockt_5, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (031111 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, fcockt_6, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (040216 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, fcockt_7, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (050118 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, fcockt_8, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (060111 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, fcockt_9, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (070305 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, fcockt_10, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (070517 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, fcockt_11, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (070822 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, fcockt_12, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail (070911 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, fcockt_14, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, fcocktent, ROT0, "Igrosoft", "Fruit Cocktail (090708 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2003, lhaunt_2, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Lucky Haunter (030804 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, lhaunt_4, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Lucky Haunter (031111 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, lhaunt_5, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Lucky Haunter (040216 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, lhaunt_6, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Lucky Haunter (040825 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, lhaunt_7, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Lucky Haunter (070402 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, lhaunt_8, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Lucky Haunter (070604 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2003, lhaunt_10, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, lhauntent, ROT0, "Igrosoft", "Lucky Haunter (090712 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+GAME( 2003, lhaunt_11, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, lhauntent, ROT0, "Igrosoft", "Lucky Haunter (100331 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2003, rollfr_2, rollfr_4, rollfr, rollfr, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Roll Fruit (040318)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, rollfr_3, rollfr_4, rollfr, rollfr, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Roll Fruit (080327)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2003, rollfr_4, 0, rollfr, rollfr, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Roll Fruit (080331)", MACHINE_SUPPORTS_SAVE ) /* World */
+
+GAME( 2004, garage_4, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Garage (040219 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, garage_5, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Garage (050311 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, garage_6, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Garage (070213 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2004, garage_7, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Garage (070329 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2004, garage_9, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, garageent, ROT0, "Igrosoft", "Garage (090715 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2004, rclimb, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Rock Climber (040815 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, rclimb_3, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Rock Climber (040827 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, rclimb_4, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Rock Climber (070322 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2004, rclimb_5, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Rock Climber (070621 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2004, rclimb_7, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, rclimbent, ROT0, "Igrosoft", "Rock Climber (090716 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2004, sweetl, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Sweet Life (041220 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, sweetl_2, sweetl, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Sweet Life (070412 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+
+GAME( 2004, resdnt, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Resident (040415 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, resdnt_2, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Resident (040513 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, resdnt_3, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Resident (070222 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2004, resdnt_6, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Resident (100311 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2004, resdnt_8, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, resdntent, ROT0, "Igrosoft", "Resident (100311 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+GAME( 2004, resdnt_9, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Resident (100316 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+
+GAME( 2005, island, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Island (050713 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2005, island_2, island, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Island (070409 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+
+GAME( 2005, pirate_2, pirate_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Pirate (060210 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2005, pirate_3, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Pirate (060803 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2005, pirate_4, pirate_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Pirate (070412 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+
+GAME( 2006, island2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Island 2 (060529 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2006, island2_3, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Island 2 (061218 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2006, island2_4, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Island 2 (070205 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2006, island2_5, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, island2l, ROT0, "Igrosoft", "Island 2 (090528 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2006, island2_6, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, island2ent, ROT0, "Igrosoft", "Island 2 (090724 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2006, pirate2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Pirate 2 (061005 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2006, pirate2_2, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Pirate 2 (070126 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2006, pirate2_3, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, pirate2l, ROT0, "Igrosoft", "Pirate 2 (090528 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2006, pirate2_4, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, pirate2ent, ROT0, "Igrosoft", "Pirate 2 (090730 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2006, keks, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Keks (060328 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2006, keks_2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Keks (060403 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2006, keks_3, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Keks (070119 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2006, keks_4, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, keksl, ROT0, "Igrosoft", "Keks (090604 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2006, keks_5, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, keksent, ROT0, "Igrosoft", "Keks (090727 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2007, gnome, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (070906 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2007, gnome_2, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (071115 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2007, gnome_3, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (080303 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2007, gnome_4, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (090402 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2007, gnome_5, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (090406 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2007, gnome_7, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, gnomel, ROT0, "Igrosoft", "Gnome (090708 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2007, gnome_9, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (100326 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2007, gnome_10, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, gnomel, ROT0, "Igrosoft", "Gnome (100326 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2007, gnome_11, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, gnomeent, ROT0, "Igrosoft", "Gnome (100326 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+GAME( 2007, gnome_12, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Gnome (100326 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+
+GAME( 2007, sweetl2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Sweet Life 2 (071217 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2007, sweetl2_2, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Sweet Life 2 (080320 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2007, sweetl2_3, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, sweetl2l, ROT0, "Igrosoft", "Sweet Life 2 (090525 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2007, sweetl2_4, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, sweetl2ent, ROT0, "Igrosoft", "Sweet Life 2 (090812 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2008, fcockt2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (080707 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2008, fcockt2_3, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (080909 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2008, fcockt2_4, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (081105 World)", MACHINE_SUPPORTS_SAVE ) /* World */
+GAME( 2008, fcockt2_5, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "Igrosoft", "Fruit Cocktail 2 (081106 Russia)", MACHINE_SUPPORTS_SAVE ) /* Russia */
+GAME( 2008, fcockt2_6, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, fcockt2l, ROT0, "Igrosoft", "Fruit Cocktail 2 (090528 Lottery)", MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2008, fcockt2_7, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, fcockt2ent, ROT0, "Igrosoft", "Fruit Cocktail 2 (090813 Entertainment)", MACHINE_SUPPORTS_SAVE ) /* Entertainment */
+
+GAME( 2010, crzmon2, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, crzmon2, ROT0, "Igrosoft", "Crazy Monkey 2 (100310)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE ) /* World */ // xored and bitswapped palette and gfx roms
+GAME( 2010, crzmon2_2, crzmon2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, crzmon2lot, ROT0, "Igrosoft", "Crazy Monkey 2 (100311 Lottery)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE ) /* Lottery */
+GAME( 2010, crzmon2_3, crzmon2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, crzmon2ent, ROT0, "Igrosoft", "Crazy Monkey 2 (100315 Entertainment)", MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE ) /* Entertainment */
diff --git a/src/mame/drivers/multfish_boot.cpp b/src/mame/drivers/multfish_boot.cpp
index 340fd09c9ca..fb2ce7a3ef9 100644
--- a/src/mame/drivers/multfish_boot.cpp
+++ b/src/mame/drivers/multfish_boot.cpp
@@ -1711,128 +1711,128 @@ ROM_START( fcockt2_4f ) // 081105 custom alteras, modified graphics, bank F9, ma
ROM_END
-GAME( 2002, mfish_3a, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Multi Fish (bootleg, 021124, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2002, mfish_12a, mfish_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Multi Fish (bootleg, 040308, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-
-GAME( 2003, czmon_7a, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 031110, backdoor set 1)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2003, czmon_7b, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 031110, backdoor set 2)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 5,5 1,7 3,2 3,3 3,4
-GAME( 2003, czmon_8a, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2003, czmon_8b, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070315
-GAME( 2003, czmon_8c, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, VIDEO GAME-1 CM01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 CM01"
-GAME( 2003, czmon_8d, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2003, czmon_8e, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, LOTO PROGRAM V-CM2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-CM2"
-GAME( 2003, czmon_8f, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, LOTOS CM01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS CM01"
-GAME( 2003, czmon_9a, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Crazy Monkey (bootleg, 070315, VIDEO GAME-1 O01 set 1)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 O01"
-GAME( 2003, czmon_9b, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 070315, VIDEO GAME-1 O01 set 2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "VIDEO GAME-1 O01" (czmon_9a, decoded gfx)
-GAME( 2003, czmon_9c, czmon_13, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 070315, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // payout percentage 70%
-
-GAME( 2003, fcockt_6a, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F8
-GAME( 2003, fcockt_6b, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2003, fcockt_6c, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, LotoRossy+)", MACHINE_SUPPORTS_SAVE ) // modified graphics, some code changes, description says "for Lat-02 terminals", older set
-GAME( 2003, fcockt_6d, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, VIDEO GAME-1 FR01)", MACHINE_SUPPORTS_SAVE ) // modified graphics, some code changes, changed version text to "VIDEO GAME-1 FR01", description says "for Lat-02 terminals", newer set
-GAME( 2003, fcockt_7a, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2003, fcockt_7b, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, VIDEO GAME-1 FR01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 FR01"
-GAME( 2003, fcockt_7c, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, payout percentage 40)", MACHINE_SUPPORTS_SAVE ) // payout percentage 40%
-GAME( 2003, fcockt_7d, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, payout percentage 60)", MACHINE_SUPPORTS_SAVE ) // payout percentage 60%
-GAME( 2003, fcockt_7e, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // payout percentage 70%
-GAME( 2003, fcockt_7f, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070305
-GAME( 2003, fcockt_7g, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, LOTO PROGRAM V-FC2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-FC2"
-GAME( 2003, fcockt_7h, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, LOTOS FR01)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTOS FR01"
-GAME( 2003, fcockt_8a, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 060111, LOTO COCKTAIL V01-0001)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO COCKTAIL V01-0001"
-GAME( 2003, fcockt_8b, fcockt_8, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 060111, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-
-GAME( 2003, lhaunt_4a, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 031111, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2003, lhaunt_5a, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040216, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2003, lhaunt_6a, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,1 1,5 3,3 3,4
-GAME( 2003, lhaunt_6b, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, VIDEO GAME-1 PB01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 PB01"
-GAME( 2003, lhaunt_6c, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070604
-GAME( 2003, lhaunt_6d, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2003, lhaunt_6e, lhaunt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, LOTO PROGRAM V-LH2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-LH2"
-GAME( 2003, lhaunt_6f, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, LOTOS PB01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS PB01"
-
-GAME( 2004, garage_4a, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Garage (bootleg, 040219, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2004, garage_4b, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Garage (bootleg, 040219, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070329
-GAME( 2004, garage_4c, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Garage (bootleg, 040219, LOTO PROGRAM V-GG2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-GG2"
-GAME( 2004, garage_5a, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Garage (bootleg, 050311, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2004, garage_5b, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Garage (bootleg, 050311, VIDEO GAME-1 GA01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 GA01"
-GAME( 2004, garage_5c, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Garage (bootleg, 050311, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // payout percentage 70%
-GAME( 2004, garage_5d, garage_5, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Garage (bootleg, 050311, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2004, garage_5e, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Garage (bootleg, 050311, LOTOS GA01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS GA01"
-
-GAME( 2004, rclimb_3a, rclimb_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Rock Climber (bootleg, 040827, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,1 1,5 3,3 3,4
-GAME( 2004, rclimb_3b, rclimb_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Rock Climber (bootleg, 040827, new service menu)", MACHINE_SUPPORTS_SAVE ) // new service menu
-GAME( 2004, rclimb_3c, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Rock Climber (bootleg, 040827, VIDEO GAME-1 SK01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 SK01"
-GAME( 2004, rclimb_3d, rclimb_3, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Rock Climber (bootleg, 040827, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2004, rclimb_3e, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Rock Climber (bootleg, 040827, LOTOS SK01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS SK01"
-
-GAME( 2004, sweetla, sweetl, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Sweet Life (bootleg, 041220, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,3 1,5 3,3 3,4
-GAME( 2004, sweetlb, sweetl, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Sweet Life (bootleg, 041220, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070412
-
-GAME( 2004, resdnt_2a, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Resident (bootleg, 040513, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,1 1,5 3,3 3,4
-GAME( 2004, resdnt_2b, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Resident (bootleg, 040513, VIDEO GAME-1 SE01 set 1)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 SE01"
-GAME( 2004, resdnt_2c, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Resident (bootleg, 040513, VIDEO GAME-1 SE01 set 2)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 SE01"
-GAME( 2004, resdnt_2d, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Resident (bootleg, 040513, VIDEO GAME-1 SE01 set 3)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 SE01"
-GAME( 2004, resdnt_2e, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Resident (bootleg, 040513, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2004, resdnt_2f, resdnt_6, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Resident (bootleg, 040513, LOTO PROGRAM V-RS2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-RS2"
-GAME( 2004, resdnt_2g, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Resident (bootleg, 040513, LOTOS SE01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS SE01"
-
-GAME( 2005, islanda, island, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Island (bootleg, 050713, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2005, islandb, island, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Island (bootleg, 050713, VIDEO GAME-1 OS01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 OS01"
-GAME( 2005, islandc, island, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Island (bootleg, 050713, LOTOS OS01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS OS01"
-
-GAME( 2006, island2a, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Island 2 (bootleg, 060529, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9 (not standart, game not work)
-GAME( 2006, island2b, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Island 2 (bootleg, 060529, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070205, skip some start tests
-GAME( 2006, island2c, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Island 2 (bootleg, 060529, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2006, island2_3a, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Island 2 (bootleg, 061218, VIDEO GAME-1 OS2-01)", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "VIDEO GAME-1 OS2-01"
-GAME( 2006, island2_4a, island2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Island 2 (bootleg, 070205, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-
-GAME( 2006, pirate2a, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2006, pirate2b, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9, skip raster beam position check
-GAME( 2006, pirate2c, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack, changed version text set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070126
-GAME( 2006, pirate2d, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack, changed version text set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070126
-GAME( 2006, pirate2e, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack, changed version text set 3)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070126, skip some start tests
-GAME( 2006, pirate2f, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Pirate 2 (bootleg, 061005, VIDEO GAME-1 PR01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 PR01"
-GAME( 2006, pirate2g, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2006, pirate2h, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Pirate 2 (bootleg, 061005, LOTOS PR01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS PR01"
-GAME( 2006, pirate2_2a, pirate2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 070126, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-
-GAME( 2006, keksa, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060328, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2006, keksb, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060328, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
-GAME( 2006, keksc, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060328, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070119
-GAME( 2006, keks_2a, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060403, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2006, keks_2b, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060403, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070119
-GAME( 2006, keks_2c, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Keks (bootleg, 060403, VIDEO GAME-1 KS01 set 1)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, changed version text to "VIDEO GAME-1 KS01"
-GAME( 2006, keks_2d, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060403, VIDEO GAME-1 KS01 set 2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, bank F9, changed version text to "VIDEO GAME-1 KS01" (keks_2c, decoded gfx)
-GAME( 2006, keks_2e, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060403, banking address hack, payout percentage 60)", MACHINE_SUPPORTS_SAVE ) // bank F9, payout percentage 60%
-GAME( 2006, keks_2f, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 060403, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2006, keks_2g, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Keks (bootleg, 060403, LOTOS KS01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "LOTOS KS01"
-GAME( 2006, keks_3a, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 070119, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2006, keks_3b, keks_2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Keks (bootleg, 070119, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9
-
-GAME( 2007, gnomea, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 070906, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2007, gnomeb, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 070906, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2007, gnomec, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 070906, banking address hack set 3)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2007, gnomed, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Gnome (bootleg, 070906, VIDEO GAME-1 GN01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 GN01"
-GAME( 2007, gnomee, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Gnome (bootleg, 070906, LOTOS GN01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "LOTOS GN01"
-GAME( 2007, gnome_2a, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 071115, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2007, gnome_3a, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 080303, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2007, gnome_3b, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 080303, banking address hack, payout percentage 45)", MACHINE_SUPPORTS_SAVE ) // bank F9 payout percentage 45%
-GAME( 2007, gnome_3c, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 080303, banking address hack, payout percentage 60)", MACHINE_SUPPORTS_SAVE ) // bank F9 payout percentage 60%
-GAME( 2007, gnome_5a, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 090406, banking address hack, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // bank F9, payout percentage 70%
-GAME( 2007, gnome_5b, gnome_9, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Gnome (bootleg, 090406, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-
-GAME( 2007, sweetl2_2a, sweetl2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2007, sweetl2_2b, sweetl2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9, some fixes
-GAME( 2007, sweetl2_2c, sweetl2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, VIDEO GAME-1 MD01)", MACHINE_SUPPORTS_SAVE ) // modified graphics, bank F9, changed version text to "VIDEO GAME-1 MD01"
-GAME( 2007, sweetl2_2d, sweetl2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-
-GAME( 2008, fcockt2a, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 080707, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2008, fcockt2_4a, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
-GAME( 2008, fcockt2_4b, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, banking address hack, no credit limit)", MACHINE_SUPPORTS_SAVE ) // bank F9, no credit limit, "MaxVin" signature
-GAME( 2008, fcockt2_4c, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, VIDEO GAME-1 FR02)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "VIDEO GAME-1 FR02"
-GAME( 2008, fcockt2_4d, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, banking address hack, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // bank F9, no credit limit, "MaxVin" signature, payout percentage 70%
-GAME( 2008, fcockt2_4e, fcockt2, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
-GAME( 2008, fcockt2_4f, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl,ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, LOTOS FR02)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "LOTOS FR02"
+GAME( 2002, mfish_3a, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Multi Fish (bootleg, 021124, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2002, mfish_12a, mfish_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Multi Fish (bootleg, 040308, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+
+GAME( 2003, czmon_7a, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 031110, backdoor set 1)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2003, czmon_7b, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 031110, backdoor set 2)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 5,5 1,7 3,2 3,3 3,4
+GAME( 2003, czmon_8a, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2003, czmon_8b, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070315
+GAME( 2003, czmon_8c, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, VIDEO GAME-1 CM01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 CM01"
+GAME( 2003, czmon_8d, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2003, czmon_8e, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, LOTO PROGRAM V-CM2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-CM2"
+GAME( 2003, czmon_8f, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Crazy Monkey (bootleg, 050120, LOTOS CM01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS CM01"
+GAME( 2003, czmon_9a, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Crazy Monkey (bootleg, 070315, VIDEO GAME-1 O01 set 1)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 O01"
+GAME( 2003, czmon_9b, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 070315, VIDEO GAME-1 O01 set 2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "VIDEO GAME-1 O01" (czmon_9a, decoded gfx)
+GAME( 2003, czmon_9c, czmon_13, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Crazy Monkey (bootleg, 070315, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // payout percentage 70%
+
+GAME( 2003, fcockt_6a, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F8
+GAME( 2003, fcockt_6b, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2003, fcockt_6c, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, LotoRossy+)", MACHINE_SUPPORTS_SAVE ) // modified graphics, some code changes, description says "for Lat-02 terminals", older set
+GAME( 2003, fcockt_6d, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 040216, VIDEO GAME-1 FR01)", MACHINE_SUPPORTS_SAVE ) // modified graphics, some code changes, changed version text to "VIDEO GAME-1 FR01", description says "for Lat-02 terminals", newer set
+GAME( 2003, fcockt_7a, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2003, fcockt_7b, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, VIDEO GAME-1 FR01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 FR01"
+GAME( 2003, fcockt_7c, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, payout percentage 40)", MACHINE_SUPPORTS_SAVE ) // payout percentage 40%
+GAME( 2003, fcockt_7d, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, payout percentage 60)", MACHINE_SUPPORTS_SAVE ) // payout percentage 60%
+GAME( 2003, fcockt_7e, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // payout percentage 70%
+GAME( 2003, fcockt_7f, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070305
+GAME( 2003, fcockt_7g, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, LOTO PROGRAM V-FC2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-FC2"
+GAME( 2003, fcockt_7h, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 050118, LOTOS FR01)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTOS FR01"
+GAME( 2003, fcockt_8a, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 060111, LOTO COCKTAIL V01-0001)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO COCKTAIL V01-0001"
+GAME( 2003, fcockt_8b, fcockt_8, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail (bootleg, 060111, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+
+GAME( 2003, lhaunt_4a, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 031111, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2003, lhaunt_5a, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040216, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2003, lhaunt_6a, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,1 1,5 3,3 3,4
+GAME( 2003, lhaunt_6b, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, VIDEO GAME-1 PB01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 PB01"
+GAME( 2003, lhaunt_6c, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070604
+GAME( 2003, lhaunt_6d, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2003, lhaunt_6e, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, LOTO PROGRAM V-LH2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-LH2"
+GAME( 2003, lhaunt_6f, lhaunt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Lucky Haunter (bootleg, 040825, LOTOS PB01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS PB01"
+
+GAME( 2004, garage_4a, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Garage (bootleg, 040219, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2004, garage_4b, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Garage (bootleg, 040219, changed version text)", MACHINE_SUPPORTS_SAVE ) // changed version text to 070329
+GAME( 2004, garage_4c, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Garage (bootleg, 040219, LOTO PROGRAM V-GG2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-GG2"
+GAME( 2004, garage_5a, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Garage (bootleg, 050311, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2004, garage_5b, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Garage (bootleg, 050311, VIDEO GAME-1 GA01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 GA01"
+GAME( 2004, garage_5c, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Garage (bootleg, 050311, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // payout percentage 70%
+GAME( 2004, garage_5d, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Garage (bootleg, 050311, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2004, garage_5e, garage_5, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Garage (bootleg, 050311, LOTOS GA01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS GA01"
+
+GAME( 2004, rclimb_3a, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Rock Climber (bootleg, 040827, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,1 1,5 3,3 3,4
+GAME( 2004, rclimb_3b, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Rock Climber (bootleg, 040827, new service menu)", MACHINE_SUPPORTS_SAVE ) // new service menu
+GAME( 2004, rclimb_3c, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Rock Climber (bootleg, 040827, VIDEO GAME-1 SK01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 SK01"
+GAME( 2004, rclimb_3d, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Rock Climber (bootleg, 040827, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2004, rclimb_3e, rclimb_3, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Rock Climber (bootleg, 040827, LOTOS SK01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS SK01"
+
+GAME( 2004, sweetla, sweetl, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Sweet Life (bootleg, 041220, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,3 1,5 3,3 3,4
+GAME( 2004, sweetlb, sweetl, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Sweet Life (bootleg, 041220, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070412
+
+GAME( 2004, resdnt_2a, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Resident (bootleg, 040513, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,5 9,1 5,1 1,5 3,3 3,4
+GAME( 2004, resdnt_2b, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Resident (bootleg, 040513, VIDEO GAME-1 SE01 set 1)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 SE01"
+GAME( 2004, resdnt_2c, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Resident (bootleg, 040513, VIDEO GAME-1 SE01 set 2)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, changed version text to "VIDEO GAME-1 SE01"
+GAME( 2004, resdnt_2d, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Resident (bootleg, 040513, VIDEO GAME-1 SE01 set 3)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 SE01"
+GAME( 2004, resdnt_2e, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Resident (bootleg, 040513, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2004, resdnt_2f, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Resident (bootleg, 040513, LOTO PROGRAM V-RS2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, many texts changed, changed version text to "LOTO PROGRAM V-RS2"
+GAME( 2004, resdnt_2g, resdnt_6, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Resident (bootleg, 040513, LOTOS SE01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS SE01"
+
+GAME( 2005, islanda, island, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Island (bootleg, 050713, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2005, islandb, island, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Island (bootleg, 050713, VIDEO GAME-1 OS01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 OS01"
+GAME( 2005, islandc, island, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Island (bootleg, 050713, LOTOS OS01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS OS01"
+
+GAME( 2006, island2a, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Island 2 (bootleg, 060529, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9 (not standart, game not work)
+GAME( 2006, island2b, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Island 2 (bootleg, 060529, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070205, skip some start tests
+GAME( 2006, island2c, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Island 2 (bootleg, 060529, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2006, island2_3a, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Island 2 (bootleg, 061218, VIDEO GAME-1 OS2-01)", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "VIDEO GAME-1 OS2-01"
+GAME( 2006, island2_4a, island2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Island 2 (bootleg, 070205, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+
+GAME( 2006, pirate2a, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2006, pirate2b, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9, skip raster beam position check
+GAME( 2006, pirate2c, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack, changed version text set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070126
+GAME( 2006, pirate2d, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack, changed version text set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070126
+GAME( 2006, pirate2e, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, banking address hack, changed version text set 3)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070126, skip some start tests
+GAME( 2006, pirate2f, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, VIDEO GAME-1 PR01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 PR01"
+GAME( 2006, pirate2g, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2006, pirate2h, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Pirate 2 (bootleg, 061005, LOTOS PR01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "LOTOS PR01"
+GAME( 2006, pirate2_2a, pirate2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Pirate 2 (bootleg, 070126, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+
+GAME( 2006, keksa, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060328, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2006, keksb, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060328, backdoor)", MACHINE_SUPPORTS_SAVE ) // backdoor 1,1 1,3 1,5 1,7 3,3 3,4
+GAME( 2006, keksc, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060328, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070119
+GAME( 2006, keks_2a, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060403, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2006, keks_2b, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060403, banking address hack, changed version text)", MACHINE_SUPPORTS_SAVE ) // bank F9, changed version text to 070119
+GAME( 2006, keks_2c, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Keks (bootleg, 060403, VIDEO GAME-1 KS01 set 1)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, changed version text to "VIDEO GAME-1 KS01"
+GAME( 2006, keks_2d, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060403, VIDEO GAME-1 KS01 set 2)", MACHINE_SUPPORTS_SAVE ) // modified graphics, bank F9, changed version text to "VIDEO GAME-1 KS01" (keks_2c, decoded gfx)
+GAME( 2006, keks_2e, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060403, banking address hack, payout percentage 60)", MACHINE_SUPPORTS_SAVE ) // bank F9, payout percentage 60%
+GAME( 2006, keks_2f, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 060403, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2006, keks_2g, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Keks (bootleg, 060403, LOTOS KS01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "LOTOS KS01"
+GAME( 2006, keks_3a, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 070119, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2006, keks_3b, keks_2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Keks (bootleg, 070119, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9
+
+GAME( 2007, gnomea, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 070906, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2007, gnomeb, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 070906, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2007, gnomec, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 070906, banking address hack set 3)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2007, gnomed, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Gnome (bootleg, 070906, VIDEO GAME-1 GN01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, many texts changed, changed version text to "VIDEO GAME-1 GN01"
+GAME( 2007, gnomee, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Gnome (bootleg, 070906, LOTOS GN01)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "LOTOS GN01"
+GAME( 2007, gnome_2a, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 071115, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2007, gnome_3a, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 080303, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2007, gnome_3b, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 080303, banking address hack, payout percentage 45)", MACHINE_SUPPORTS_SAVE ) // bank F9 payout percentage 45%
+GAME( 2007, gnome_3c, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 080303, banking address hack, payout percentage 60)", MACHINE_SUPPORTS_SAVE ) // bank F9 payout percentage 60%
+GAME( 2007, gnome_5a, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 090406, banking address hack, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // bank F9, payout percentage 70%
+GAME( 2007, gnome_5b, gnome_9, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Gnome (bootleg, 090406, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+
+GAME( 2007, sweetl2_2a, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, banking address hack set 1)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2007, sweetl2_2b, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, banking address hack set 2)", MACHINE_SUPPORTS_SAVE ) // bank F9, some fixes
+GAME( 2007, sweetl2_2c, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, VIDEO GAME-1 MD01)", MACHINE_SUPPORTS_SAVE ) // modified graphics, bank F9, changed version text to "VIDEO GAME-1 MD01"
+GAME( 2007, sweetl2_2d, sweetl2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Sweet Life 2 (bootleg, 080320, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+
+GAME( 2008, fcockt2a, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 080707, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2008, fcockt2_4a, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, banking address hack)", MACHINE_SUPPORTS_SAVE ) // bank F9
+GAME( 2008, fcockt2_4b, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, banking address hack, no credit limit)", MACHINE_SUPPORTS_SAVE ) // bank F9, no credit limit, "MaxVin" signature
+GAME( 2008, fcockt2_4c, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, VIDEO GAME-1 FR02)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "VIDEO GAME-1 FR02"
+GAME( 2008, fcockt2_4d, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, banking address hack, payout percentage 70)", MACHINE_SUPPORTS_SAVE ) // bank F9, no credit limit, "MaxVin" signature, payout percentage 70%
+GAME( 2008, fcockt2_4e, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, LOTTOGAME (I))", MACHINE_SUPPORTS_SAVE ) // bank F9, modified graphics, changed version text to "MDS_is_the_best_ LOTTOGAME (I)"
+GAME( 2008, fcockt2_4f, fcockt2, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, customl, ROT0, "bootleg", "Fruit Cocktail 2 (bootleg, 081105, LOTOS FR02)", MACHINE_SUPPORTS_SAVE ) // custom alteras, modified graphics, bank F9, many texts changed, changed version text to "LOTOS FR02"
/* 0x000000 - 0x03ffff Crazy Monkey V03-1110
@@ -1886,5 +1886,5 @@ ROM_START( igromula )
ROM_LOAD( "15games.gfx", 0x000000, 0x4000000, NO_DUMP )
ROM_END
-GAME( 2003, igromult, 0, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Igrosoft Multigame Bootleg (10 Games)", MACHINE_NOT_WORKING ) // no GFX roms
-GAME( 2003, igromula, igromult, igrosoft_gamble, igrosoft_gamble, driver_device, 0, ROT0, "bootleg", "Igrosoft Multigame Bootleg (15 Games)", MACHINE_NOT_WORKING ) // no GFX roms
+GAME( 2003, igromult, 0, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Igrosoft Multigame Bootleg (10 Games)", MACHINE_NOT_WORKING ) // no GFX roms
+GAME( 2003, igromula, igromult, igrosoft_gamble, igrosoft_gamble, igrosoft_gamble_state, 0, ROT0, "bootleg", "Igrosoft Multigame Bootleg (15 Games)", MACHINE_NOT_WORKING ) // no GFX roms
diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp
index 3193c2e9e23..9bbce125c59 100644
--- a/src/mame/drivers/multi16.cpp
+++ b/src/mame/drivers/multi16.cpp
@@ -130,7 +130,7 @@ void multi16_state::machine_reset()
}
-static MACHINE_CONFIG_START( multi16, multi16_state )
+static MACHINE_CONFIG_START( multi16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 8000000)
MCFG_CPU_PROGRAM_MAP(multi16_map)
@@ -164,5 +164,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, multi16, 0, 0, multi16, multi16, driver_device, 0, "Mitsubishi", "Multi 16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, multi16, 0, 0, multi16, multi16, multi16_state, 0, "Mitsubishi", "Multi 16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp
index 61c5291ff11..8761b6dd51f 100644
--- a/src/mame/drivers/multi8.cpp
+++ b/src/mame/drivers/multi8.cpp
@@ -617,7 +617,7 @@ void multi8_state::machine_reset()
m_mcu_init = 0;
}
-static MACHINE_CONFIG_START( multi8, multi8_state )
+static MACHINE_CONFIG_START( multi8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(multi8_mem)
@@ -680,5 +680,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, multi8, 0, 0, multi8, multi8, driver_device, 0, "Mitsubishi", "Multi 8 (Mitsubishi)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, multi8, 0, 0, multi8, multi8, multi8_state, 0, "Mitsubishi", "Multi 8 (Mitsubishi)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp
index 103e8b87b3a..b157777e246 100644
--- a/src/mame/drivers/multigam.cpp
+++ b/src/mame/drivers/multigam.cpp
@@ -583,11 +583,11 @@ WRITE8_MEMBER(multigam_state::multigam3_mmc3_rom_switch_w)
case 0x6000: /* disable irqs */
machine().device("maincpu")->execute().set_input_line(M6502_IRQ_LINE, CLEAR_LINE);
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate());
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate());
break;
case 0x6001: /* enable irqs */
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(multigam_state::multigam3_mmc3_scanline_cb),this));
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(multigam_state::multigam3_mmc3_scanline_cb),this));
break;
}
}
@@ -712,7 +712,7 @@ void multigam_state::multigam_init_mapper02(uint8_t* prg_base, int prg_size)
m_mapper02_prg_base = prg_base;
m_mapper02_prg_size = prg_size;
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate());
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate());
}
/******************************************************
@@ -869,7 +869,7 @@ void multigam_state::multigam_init_mmc1(uint8_t *prg_base, int prg_size, int chr
m_mmc1_prg_size = prg_size;
m_mmc1_chr_bank_base = chr_bank_base;
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate());
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate());
}
@@ -932,7 +932,7 @@ void multigam_state::supergm3_set_bank()
// title screen
memcpy(mem + 0x8000, mem + 0x18000, 0x8000);
membank("bank10")->set_base(mem + 0x6000);
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate());
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate());
}
else if ((m_supergm3_prg_bank & 0x40) == 0)
{
@@ -1212,7 +1212,7 @@ MACHINE_START_MEMBER(multigam_state,supergm3)
m_multigmc_mmc3_6000_ram = std::make_unique<uint8_t[]>(0x2000);
}
-static MACHINE_CONFIG_START( multigam, multigam_state )
+static MACHINE_CONFIG_START( multigam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
MCFG_CPU_PROGRAM_MAP(multigam_map)
@@ -1462,5 +1462,5 @@ GAME( 1992, multigmb, multigam, multigam, multigam, multigam_state, multigam, RO
GAME( 1992, multigm2, 0, multigm3, multigm2, multigam_state, multigm3, ROT0, "Seo Jin", "Multi Game 2", 0 )
GAME( 1992, multigm3, 0, multigm3, multigm3, multigam_state, multigm3, ROT0, "Seo Jin", "Multi Game III", 0 )
GAME( 1992, multigmt, 0, multigmt, multigmt, multigam_state, multigmt, ROT0, "Tung Sheng Electronics", "Multi Game (Tung Sheng Electronics)", 0 )
-GAME( 1994, sgmt1, 0, supergm3, sgmt1, driver_device, 0, ROT0, "<unknown>", "Super Game Mega Type 1", 0 )
-GAME( 1996, supergm3, 0, supergm3, supergm3, driver_device, 0, ROT0, "<unknown>", "Super Game III", 0 )
+GAME( 1994, sgmt1, 0, supergm3, sgmt1, multigam_state, 0, ROT0, "<unknown>", "Super Game Mega Type 1", 0 )
+GAME( 1996, supergm3, 0, supergm3, supergm3, multigam_state, 0, ROT0, "<unknown>", "Super Game III", 0 )
diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp
index d841dd8bbcc..407669ffd59 100644
--- a/src/mame/drivers/munchmo.cpp
+++ b/src/mame/drivers/munchmo.cpp
@@ -324,7 +324,7 @@ void munchmo_state::machine_reset()
m_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( mnchmobl, munchmo_state )
+static MACHINE_CONFIG_START( mnchmobl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_15MHz/4) // from pin 13 of XTAL-driven 163
@@ -435,5 +435,5 @@ ROM_END
*
*************************************/
-GAME( 1983, joyfulr, 0, mnchmobl, mnchmobl, driver_device, 0, ROT270, "SNK", "Joyful Road (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, mnchmobl, joyfulr, mnchmobl, mnchmobl, driver_device, 0, ROT270, "SNK (Centuri license)", "Munch Mobile (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, joyfulr, 0, mnchmobl, mnchmobl, munchmo_state, 0, ROT270, "SNK", "Joyful Road (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mnchmobl, joyfulr, mnchmobl, mnchmobl, munchmo_state, 0, ROT270, "SNK (Centuri license)", "Munch Mobile (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp
index fce442574e8..37adb074bc2 100644
--- a/src/mame/drivers/murogem.cpp
+++ b/src/mame/drivers/murogem.cpp
@@ -245,7 +245,7 @@ uint32_t murogem_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
}
-static MACHINE_CONFIG_START( murogem, murogem_state )
+static MACHINE_CONFIG_START( murogem )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, 8000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(murogem_map)
@@ -332,7 +332,7 @@ ROM_START( lasvegas )
ROM_LOAD( "a3.1b", 0x0000, 0x0020, CRC(abddfb6b) SHA1(ed78b93701b5a3bf2053d2584e9a354fb6cec203) ) /* 74s288 at 1B */
ROM_END
-GAME( 198?, murogem, 0, murogem, murogem, driver_device, 0, ROT0, "<unknown>", "Muroge Monaco (set 1)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 198?, murogema, murogem, murogem, murogem, driver_device, 0, ROT0, "<unknown>", "Muroge Monaco (set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 198?, murogemb, murogem, murogem, murogem, driver_device, 0, ROT0, "<unknown>", "Muroge Monaco (set 3)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 198?, lasvegas, murogem, murogem, murogem, driver_device, 0, ROT0, "hack", "Las Vegas, Nevada", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 198?, murogem, 0, murogem, murogem, murogem_state, 0, ROT0, "<unknown>", "Muroge Monaco (set 1)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 198?, murogema, murogem, murogem, murogem, murogem_state, 0, ROT0, "<unknown>", "Muroge Monaco (set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 198?, murogemb, murogem, murogem, murogem, murogem_state, 0, ROT0, "<unknown>", "Muroge Monaco (set 3)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 198?, lasvegas, murogem, murogem, murogem, murogem_state, 0, ROT0, "hack", "Las Vegas, Nevada", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp
index e8f19e19b69..931edbc6ae7 100644
--- a/src/mame/drivers/murogmbl.cpp
+++ b/src/mame/drivers/murogmbl.cpp
@@ -193,7 +193,7 @@ static GFXDECODE_START( murogmbl )
GFXDECODE_ENTRY( "gfx1", 0, layout8x8x2, 0x0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( murogmbl, murogmbl_state )
+static MACHINE_CONFIG_START( murogmbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 1000000) /* Z80? */
MCFG_CPU_PROGRAM_MAP(murogmbl_map)
@@ -234,4 +234,4 @@ ROM_START(murogmbl)
ROM_LOAD( "74s288.a8", 0x0000, 0x0020, CRC(fc35201c) SHA1(4549e228c48992e0d10957f029b89a547392e72b) )
ROM_END
-GAME( 1982, murogmbl, murogem, murogmbl, murogmbl, driver_device, 0, ROT0, "bootleg?", "Muroge Monaco (bootleg?)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, murogmbl, murogem, murogmbl, murogmbl, murogmbl_state, 0, ROT0, "bootleg?", "Muroge Monaco (bootleg?)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp
index 5110bba8a7c..c8d6a3e1782 100644
--- a/src/mame/drivers/mustache.cpp
+++ b/src/mame/drivers/mustache.cpp
@@ -177,7 +177,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mustache_state::scanline)
-static MACHINE_CONFIG_START( mustache, mustache_state )
+static MACHINE_CONFIG_START( mustache )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp
index 80764860c03..00c9c4c8b9f 100644
--- a/src/mame/drivers/mvme147.cpp
+++ b/src/mame/drivers/mvme147.cpp
@@ -219,8 +219,8 @@ protected:
private:
required_device<cpu_device> m_maincpu;
- required_device<scc85C30_device> m_sccterm;
- required_device<scc85C30_device> m_sccterm2;
+ required_device<scc85c30_device> m_sccterm;
+ required_device<scc85c30_device> m_sccterm2;
// Pointer to System ROMs needed by bootvect_r and masking RAM buffer for post reset accesses
uint32_t *m_sysrom;
@@ -249,8 +249,8 @@ static ADDRESS_MAP_START (mvme147_mem, AS_PROGRAM, 32, mvme147_state)
AM_RANGE (0xfffe1018, 0xfffe102f) AM_READWRITE8(pcc8_r, pcc8_w, 0xffffffff) /* PCC 8 bits registers */
AM_RANGE (0xfffe2000, 0xfffe201b) AM_READWRITE8(vmechip_r, vmechip_w, 0x00ff00ff) /* VMEchip 8 bits registers on odd adresses */
- AM_RANGE (0xfffe3000, 0xfffe3003) AM_DEVREADWRITE8("scc", scc85C30_device, ba_cd_inv_r, ba_cd_inv_w, 0xffffffff) /* Port 1&2 - Dual serial port Z80-SCC */
- AM_RANGE (0xfffe3800, 0xfffe3803) AM_DEVREADWRITE8("scc2", scc85C30_device, ba_cd_inv_r, ba_cd_inv_w, 0xffffffff) /* Port 3&4 - Dual serial port Z80-SCC */
+ AM_RANGE (0xfffe3000, 0xfffe3003) AM_DEVREADWRITE8("scc", scc85c30_device, ba_cd_inv_r, ba_cd_inv_w, 0xffffffff) /* Port 1&2 - Dual serial port Z80-SCC */
+ AM_RANGE (0xfffe3800, 0xfffe3803) AM_DEVREADWRITE8("scc2", scc85c30_device, ba_cd_inv_r, ba_cd_inv_w, 0xffffffff) /* Port 3&4 - Dual serial port Z80-SCC */
//AM_RANGE(0x100000, 0xfeffff) AM_READWRITE(vme_a24_r, vme_a24_w) /* VMEbus Rev B addresses (24 bits) - not verified */
//AM_RANGE(0xff0000, 0xffffff) AM_READWRITE(vme_a16_r, vme_a16_w) /* VMEbus Rev B addresses (16 bits) - not verified */
@@ -644,7 +644,7 @@ SLOT_INTERFACE_END
/*
* Machine configuration
*/
-static MACHINE_CONFIG_START (mvme147, mvme147_state)
+static MACHINE_CONFIG_START (mvme147)
/* basic machine hardware */
MCFG_CPU_ADD ("maincpu", M68030, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP (mvme147_mem)
@@ -660,8 +660,8 @@ static MACHINE_CONFIG_START (mvme147, mvme147_state)
MCFG_Z80SCC_OUT_RTSA_CB(DEVWRITELINE("rs232trm", rs232_port_device, write_rts))
MCFG_RS232_PORT_ADD ("rs232trm", default_rs232_devices, "terminal")
- MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc85C30_device, rxa_w))
- MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc85C30_device, ctsa_w))
+ MCFG_RS232_RXD_HANDLER (DEVWRITELINE ("scc", scc85c30_device, rxa_w))
+ MCFG_RS232_CTS_HANDLER (DEVWRITELINE ("scc", scc85c30_device, ctsa_w))
MCFG_SCC85C30_ADD("scc2", SCC_CLOCK, 0, 0, 0, 0 )
MACHINE_CONFIG_END
@@ -710,5 +710,5 @@ ROM_START (mvme147)
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1989, mvme147, 0, 0, mvme147, mvme147, driver_device, 0, "Motorola", "MVME-147", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP (1989, mvme147, 0, 0, mvme147, mvme147, mvme147_state, 0, "Motorola", "MVME-147", MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp
index 0e24a1b7b51..07605d7f2cb 100644
--- a/src/mame/drivers/mw18w.cpp
+++ b/src/mame/drivers/mw18w.cpp
@@ -265,7 +265,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( mw18w, mw18w_state )
+static MACHINE_CONFIG_START( mw18w )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
@@ -306,5 +306,5 @@ ROM_START( 18w2 )
ROM_END
-GAMEL( 1979, 18w, 0, mw18w, mw18w, driver_device, 0, ROT0, "Midway", "18 Wheeler (set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_18w )
-GAMEL( 1979, 18w2, 18w, mw18w, mw18w, driver_device, 0, ROT0, "Midway", "18 Wheeler (set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_18w )
+GAMEL( 1979, 18w, 0, mw18w, mw18w, mw18w_state, 0, ROT0, "Midway", "18 Wheeler (set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_18w )
+GAMEL( 1979, 18w2, 18w, mw18w, mw18w, mw18w_state, 0, ROT0, "Midway", "18 Wheeler (set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_18w )
diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp
index bbec181f62d..f74260832fd 100644
--- a/src/mame/drivers/mw8080bw.cpp
+++ b/src/mame/drivers/mw8080bw.cpp
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
*
*************************************/
-MACHINE_CONFIG_START( mw8080bw_root, mw8080bw_state )
+MACHINE_CONFIG_START( mw8080bw_root )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080,MW8080BW_CPU_CLOCK)
@@ -3224,37 +3224,37 @@ ROM_END
*
*************************************/
-/* PCB # rom parent machine inp init monitor,company,fullname,flags */
+/* PCB # year rom parent machine inp init monitor,company,fullname,flags */
-/* 596 */ GAMEL(1976, seawolf, 0, seawolf, seawolf, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Sea Wolf (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_seawolf )
-/* 596 */ GAMEL(1976, seawolfo, seawolf, seawolf, seawolf, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Sea Wolf (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_seawolf )
-/* 597 */ GAMEL(1975, gunfight, 0, gunfight, gunfight, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Gun Fight (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gunfight )
-/* 597 */ GAMEL(1975, gunfighto, gunfight, gunfight, gunfight, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Gun Fight (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gunfight )
+/* 596 */ GAMEL(1976, seawolf, 0, seawolf, seawolf, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Sea Wolf (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_seawolf )
+/* 596 */ GAMEL(1976, seawolfo, seawolf, seawolf, seawolf, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Sea Wolf (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_seawolf )
+/* 597 */ GAMEL(1975, gunfight, 0, gunfight, gunfight, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Gun Fight (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gunfight )
+/* 597 */ GAMEL(1975, gunfighto, gunfight, gunfight, gunfight, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Gun Fight (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_gunfight )
/* 604 Gun Fight (cocktail, dump does not exist) */
-/* 605 */ GAME( 1976, tornbase, 0, tornbase, tornbase, driver_device, 0, ROT0, "Dave Nutting Associates / Midway / Taito", "Tornado Baseball / Ball Park", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 610 */ GAMEL(1976, 280zzzap, 0, zzzap, zzzap, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "280-ZZZAP", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_280zzzap )
-/* 611 */ GAMEL(1976, maze, 0, maze, maze, driver_device, 0, ROT0, "Midway", "Amazing Maze", MACHINE_SUPPORTS_SAVE, layout_maze )
-/* 612 */ GAME( 1977, boothill, 0, boothill, boothill, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Boot Hill", MACHINE_SUPPORTS_SAVE )
-/* 615 */ GAME( 1977, checkmat, 0, checkmat, checkmat, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Checkmate", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 618 */ GAME( 1977, desertgu, 0, desertgu, desertgu, driver_device, 0, ROT0, "Dave Nutting Associates / Midway", "Desert Gun", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 618 */ GAME( 1977, roadrunm, desertgu, desertgu, desertgu, driver_device, 0, ROT0, "Midway", "Road Runner (Midway)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 619 */ GAME( 1977, dplay, 0, dplay, dplay, driver_device, 0, ROT0, "Midway", "Double Play", MACHINE_SUPPORTS_SAVE )
-/* 622 */ GAMEL(1977, lagunar, 0, zzzap, lagunar, driver_device, 0, ROT90, "Midway", "Laguna Racer", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_lagunar )
-/* 623 */ GAME( 1977, gmissile, 0, gmissile, gmissile, driver_device, 0, ROT0, "Midway", "Guided Missile", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 626 */ GAME( 1977, m4, 0, m4, m4, driver_device, 0, ROT0, "Midway", "M-4", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 630 */ GAMEL(1978, clowns, 0, clowns, clowns, driver_device, 0, ROT0, "Midway", "Clowns (rev. 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_clowns )
-/* 630 */ GAMEL(1978, clowns1, clowns, clowns, clowns1, driver_device, 0, ROT0, "Midway", "Clowns (rev. 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_clowns )
-/* 640 */ GAMEL(1978, spacwalk, 0, spacwalk, spacwalk, driver_device, 0, ROT0, "Midway", "Space Walk", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_spacwalk )
-/* 642 */ GAME( 1978, einning, 0, dplay, einning, driver_device, 0, ROT0, "Midway / Taito", "Extra Inning / Ball Park II", MACHINE_SUPPORTS_SAVE )
-/* 643 */ GAME( 1978, shuffle, 0, shuffle, shuffle, driver_device, 0, ROT90, "Midway", "Shuffleboard", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 644 */ GAME( 1977, dogpatch, 0, dogpatch, dogpatch, driver_device, 0, ROT0, "Midway", "Dog Patch", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 645 */ GAMEL(1980, spcenctr, 0, spcenctr, spcenctr, driver_device, 0, ROT0, "Midway", "Space Encounters", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_spcenctr )
-/* 652 */ GAMEL(1979, phantom2, 0, phantom2, phantom2, driver_device, 0, ROT0, "Midway", "Phantom II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_phantom2 )
-/* 730 */ GAME( 1978, bowler, 0, bowler, bowler, driver_device, 0, ROT90, "Midway", "Bowling Alley", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 739 */ GAMEL(1978, invaders, 0, invaders, invaders, driver_device, 0, ROT270, "Taito / Midway", "Space Invaders / Space Invaders M", MACHINE_SUPPORTS_SAVE, layout_invaders )
-/* 742 */ GAME( 1978, blueshrk, 0, blueshrk, blueshrk, driver_device, 0, ROT0, "Midway", "Blue Shark", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
- GAME( 1978, blueshrkmr, blueshrk, blueshrk, blueshrk, driver_device, 0, ROT0, "bootleg (Model Racing)", "Blue Shark (Model Racing bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 605 */ GAME( 1976, tornbase, 0, tornbase, tornbase, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway / Taito", "Tornado Baseball / Ball Park", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 610 */ GAMEL(1976, 280zzzap, 0, zzzap, zzzap, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "280-ZZZAP", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_280zzzap )
+/* 611 */ GAMEL(1976, maze, 0, maze, maze, mw8080bw_state, 0, ROT0, "Midway", "Amazing Maze", MACHINE_SUPPORTS_SAVE, layout_maze )
+/* 612 */ GAME( 1977, boothill, 0, boothill, boothill, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Boot Hill", MACHINE_SUPPORTS_SAVE )
+/* 615 */ GAME( 1977, checkmat, 0, checkmat, checkmat, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Checkmate", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 618 */ GAME( 1977, desertgu, 0, desertgu, desertgu, mw8080bw_state, 0, ROT0, "Dave Nutting Associates / Midway", "Desert Gun", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 618 */ GAME( 1977, roadrunm, desertgu, desertgu, desertgu, mw8080bw_state, 0, ROT0, "Midway", "Road Runner (Midway)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 619 */ GAME( 1977, dplay, 0, dplay, dplay, mw8080bw_state, 0, ROT0, "Midway", "Double Play", MACHINE_SUPPORTS_SAVE )
+/* 622 */ GAMEL(1977, lagunar, 0, zzzap, lagunar, mw8080bw_state, 0, ROT90, "Midway", "Laguna Racer", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_lagunar )
+/* 623 */ GAME( 1977, gmissile, 0, gmissile, gmissile, mw8080bw_state, 0, ROT0, "Midway", "Guided Missile", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 626 */ GAME( 1977, m4, 0, m4, m4, mw8080bw_state, 0, ROT0, "Midway", "M-4", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 630 */ GAMEL(1978, clowns, 0, clowns, clowns, mw8080bw_state, 0, ROT0, "Midway", "Clowns (rev. 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_clowns )
+/* 630 */ GAMEL(1978, clowns1, clowns, clowns, clowns1, mw8080bw_state, 0, ROT0, "Midway", "Clowns (rev. 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_clowns )
+/* 640 */ GAMEL(1978, spacwalk, 0, spacwalk, spacwalk, mw8080bw_state, 0, ROT0, "Midway", "Space Walk", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_spacwalk )
+/* 642 */ GAME( 1978, einning, 0, dplay, einning, mw8080bw_state, 0, ROT0, "Midway / Taito", "Extra Inning / Ball Park II", MACHINE_SUPPORTS_SAVE )
+/* 643 */ GAME( 1978, shuffle, 0, shuffle, shuffle, mw8080bw_state, 0, ROT90, "Midway", "Shuffleboard", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 644 */ GAME( 1977, dogpatch, 0, dogpatch, dogpatch, mw8080bw_state, 0, ROT0, "Midway", "Dog Patch", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 645 */ GAMEL(1980, spcenctr, 0, spcenctr, spcenctr, mw8080bw_state, 0, ROT0, "Midway", "Space Encounters", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_spcenctr )
+/* 652 */ GAMEL(1979, phantom2, 0, phantom2, phantom2, mw8080bw_state, 0, ROT0, "Midway", "Phantom II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_phantom2 )
+/* 730 */ GAME( 1978, bowler, 0, bowler, bowler, mw8080bw_state, 0, ROT90, "Midway", "Bowling Alley", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* 739 */ GAMEL(1978, invaders, 0, invaders, invaders, mw8080bw_state, 0, ROT270, "Taito / Midway", "Space Invaders / Space Invaders M", MACHINE_SUPPORTS_SAVE, layout_invaders )
+/* 742 */ GAME( 1978, blueshrk, 0, blueshrk, blueshrk, mw8080bw_state, 0, ROT0, "Midway", "Blue Shark", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+ GAME( 1978, blueshrkmr, blueshrk, blueshrk, blueshrk, mw8080bw_state, 0, ROT0, "bootleg (Model Racing)", "Blue Shark (Model Racing bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* 749 4 Player Bowling Alley (cocktail, dump does not exist) */
-/* 851 */ GAMEL(1980, invad2ct, 0, invad2ct, invad2ct, driver_device, 0, ROT90, "Midway", "Space Invaders II (Midway, cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invad2ct )
+/* 851 */ GAMEL(1980, invad2ct, 0, invad2ct, invad2ct, mw8080bw_state, 0, ROT90, "Midway", "Space Invaders II (Midway, cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_invad2ct )
/* 852 Space Invaders Deluxe (color hardware, not in this driver) */
/* 870 Space Invaders Deluxe (cocktail, dump does not exist) */
diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp
index d97533bda3b..d23703cbb10 100644
--- a/src/mame/drivers/mwarr.cpp
+++ b/src/mame/drivers/mwarr.cpp
@@ -552,7 +552,7 @@ void mwarr_state::machine_reset()
m_which = 0;
}
-static MACHINE_CONFIG_START( mwarr, mwarr_state )
+static MACHINE_CONFIG_START( mwarr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK)
@@ -576,10 +576,10 @@ static MACHINE_CONFIG_START( mwarr, mwarr_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", SOUND_CLOCK/48 , OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", SOUND_CLOCK/48 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", SOUND_CLOCK/48 , OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", SOUND_CLOCK/48 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -656,4 +656,4 @@ ROM_END
*
*************************************/
-GAME( 199?, mwarr, 0, mwarr, mwarr, driver_device, 0, ROT0, "Elettronica Video-Games S.R.L.", "Mighty Warriors", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, mwarr, 0, mwarr, mwarr, mwarr_state, 0, ROT0, "Elettronica Video-Games S.R.L.", "Mighty Warriors", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mwsub.cpp b/src/mame/drivers/mwsub.cpp
index 38672507557..81a07b44d43 100644
--- a/src/mame/drivers/mwsub.cpp
+++ b/src/mame/drivers/mwsub.cpp
@@ -196,7 +196,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( submar, submar_state )
+static MACHINE_CONFIG_START( submar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
@@ -227,4 +227,4 @@ ROM_START( submar )
ROM_END
-GAMEL( 1979, submar, 0, submar, submar, driver_device, 0, ROT0, "Midway", "Submarine (Midway)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_submar )
+GAMEL( 1979, submar, 0, submar, submar, submar_state, 0, ROT0, "Midway", "Submarine (Midway)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_submar )
diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp
index 442013d9283..9d712d2558d 100644
--- a/src/mame/drivers/mx2178.cpp
+++ b/src/mame/drivers/mx2178.cpp
@@ -43,7 +43,7 @@ public:
}
DECLARE_READ8_MEMBER(keyin_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE_LINE_MEMBER(write_acia_clock);
MC6845_UPDATE_ROW(crtc_update_row);
@@ -91,7 +91,7 @@ READ8_MEMBER( mx2178_state::keyin_r )
return (m_term_data) ? 0x83 : 0x82;
}
-WRITE8_MEMBER( mx2178_state::kbd_put )
+void mx2178_state::kbd_put(u8 data)
{
m_term_data = data;
m_maincpu->set_input_line(0, HOLD_LINE);
@@ -152,7 +152,7 @@ WRITE_LINE_MEMBER(mx2178_state::write_acia_clock)
m_acia->write_rxc(state);
}
-static MACHINE_CONFIG_START( mx2178, mx2178_state )
+static MACHINE_CONFIG_START( mx2178 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18869600/5) // guess
MCFG_CPU_PROGRAM_MAP(mx2178_mem)
@@ -179,7 +179,7 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state )
/// TODO: hook up acia to keyboard and memory map
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(mx2178_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(mx2178_state, kbd_put))
MCFG_DEVICE_ADD("acia_clock", CLOCK, 614400)
MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(mx2178_state, write_acia_clock))
@@ -197,5 +197,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, mx2178, 0, 0, mx2178, mx2178, driver_device, 0, "Memorex", "Memorex 2178", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, mx2178, 0, 0, mx2178, mx2178, mx2178_state, 0, "Memorex", "Memorex 2178", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp
index fe7446f27b1..c93d8b3c2bb 100644
--- a/src/mame/drivers/myb3k.cpp
+++ b/src/mame/drivers/myb3k.cpp
@@ -22,24 +22,28 @@ class myb3k_state : public driver_device
{
public:
myb3k_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_fdc(*this, "fdc"),
- m_crtc(*this, "crtc"),
- m_floppy0(*this, "fdc:0"),
- m_floppy1(*this, "fdc:1"),
- m_p_vram(*this, "p_vram"),
- m_palette(*this, "palette") { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_fdc(*this, "fdc")
+ , m_crtc(*this, "crtc")
+ , m_floppy0(*this, "fdc:0")
+ , m_floppy1(*this, "fdc:1")
+ , m_p_vram(*this, "p_vram")
+ , m_palette(*this, "palette")
+ { }
- required_device<cpu_device> m_maincpu;
- required_device<mb8877_t> m_fdc;
- required_device<mc6845_device> m_crtc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
DECLARE_WRITE8_MEMBER(myb3k_6845_address_w);
DECLARE_WRITE8_MEMBER(myb3k_6845_data_w);
DECLARE_WRITE8_MEMBER(myb3k_video_mode_w);
DECLARE_WRITE8_MEMBER(myb3k_fdc_output_w);
+ uint32_t screen_update_myb3k(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+protected:
+ required_device<cpu_device> m_maincpu;
+ required_device<mb8877_device> m_fdc;
+ required_device<mc6845_device> m_crtc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
required_shared_ptr<uint8_t> m_p_vram;
required_device<palette_device> m_palette;
uint8_t m_crtc_vreg[0x100],m_crtc_index;
@@ -47,7 +51,6 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- uint32_t screen_update_myb3k(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
void myb3k_state::video_start()
@@ -158,7 +161,7 @@ static ADDRESS_MAP_START(myb3k_io, AS_IO, 8, myb3k_state)
AM_RANGE(0x06, 0x06) AM_READ_PORT("DSW2")
AM_RANGE(0x1c, 0x1c) AM_WRITE(myb3k_6845_address_w)
AM_RANGE(0x1d, 0x1d) AM_WRITE(myb3k_6845_data_w)
- AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("fdc", mb8877_t, read, write) //FDC, almost likely wd17xx
+ AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("fdc", mb8877_device, read, write) //FDC, almost likely wd17xx
AM_RANGE(0x24, 0x24) AM_WRITE(myb3k_fdc_output_w)
// AM_RANGE(0x520,0x524) mirror of above
ADDRESS_MAP_END
@@ -247,7 +250,7 @@ static SLOT_INTERFACE_START( myb3k_floppies )
SLOT_INTERFACE( "8dsdd", FLOPPY_8_DSDD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( myb3k, myb3k_state )
+static MACHINE_CONFIG_START( myb3k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 4000000) /* unknown clock*/
MCFG_CPU_PROGRAM_MAP(myb3k_map)
@@ -283,5 +286,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, myb3k, 0, 0, myb3k, myb3k, driver_device, 0, "Panasonic", "MyBrain 3000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, myb3k, 0, 0, myb3k, myb3k, myb3k_state, 0, "Panasonic", "MyBrain 3000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index 600999a942e..ce3c354568b 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -114,7 +114,7 @@ private:
required_device<i8255_device> m_ppi2;
required_device<cassette_image_device> m_cass;
required_device<mc6845_device> m_crtc;
- required_device<fd1771_t> m_fdc;
+ required_device<fd1771_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<sn76489_device> m_audio;
@@ -228,7 +228,7 @@ static ADDRESS_MAP_START(mycom_io, AS_IO, 8, mycom_state)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ppi8255_0", i8255_device, read, write)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ppi8255_1", i8255_device, read, write)
AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("ppi8255_2", i8255_device, read, write)
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1771_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1771_device, read, write)
ADDRESS_MAP_END
/* Input ports */
@@ -496,7 +496,7 @@ DRIVER_INIT_MEMBER(mycom_state,mycom)
membank("boot")->configure_entries(0, 2, &RAM[0x0000], 0x10000);
}
-static MACHINE_CONFIG_START( mycom, mycom_state )
+static MACHINE_CONFIG_START( mycom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz / 4)
MCFG_CPU_PROGRAM_MAP(mycom_map)
@@ -576,5 +576,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, mycom, 0, 0, mycom, mycom, mycom_state, mycom, "Japan Electronics College", "MYCOMZ-80A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, mycom, 0, 0, mycom, mycom, mycom_state, mycom, "Japan Electronics College", "MYCOMZ-80A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/mystston.cpp b/src/mame/drivers/mystston.cpp
index 5fec3ea95cb..ac3bd274b94 100644
--- a/src/mame/drivers/mystston.cpp
+++ b/src/mame/drivers/mystston.cpp
@@ -191,7 +191,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( mystston, mystston_state )
+static MACHINE_CONFIG_START( mystston )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK)
@@ -320,6 +320,6 @@ ROM_END
*
*************************************/
-GAME( 1984, mystston, 0, mystston, mystston, driver_device, 0, ROT270, "Technos Japan", "Mysterious Stones - Dr. John's Adventure", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, myststono,mystston, mystston, mystston, driver_device, 0, ROT270, "Technos Japan", "Mysterious Stones - Dr. Kick in Adventure", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, myststonoi,mystston, mystston, mystston, driver_device, 0, ROT270, "Technos Japan", "Mysterious Stones - Dr. Kick in Adventure (Itisa PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, mystston, 0, mystston, mystston, mystston_state, 0, ROT270, "Technos Japan", "Mysterious Stones - Dr. John's Adventure", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, myststono, mystston, mystston, mystston, mystston_state, 0, ROT270, "Technos Japan", "Mysterious Stones - Dr. Kick in Adventure", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, myststonoi, mystston, mystston, mystston, mystston_state, 0, ROT270, "Technos Japan", "Mysterious Stones - Dr. Kick in Adventure (Itisa PCB)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index 0bb16f44423..737243746d3 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -898,7 +898,7 @@ MACHINE_RESET_MEMBER(mystwarr_state,gaiapols)
}
-static MACHINE_CONFIG_START( mystwarr, mystwarr_state )
+static MACHINE_CONFIG_START( mystwarr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz (confirmed) */
@@ -2229,37 +2229,37 @@ ROM_START( dadandrn )
ROM_LOAD( "dadandrn.nv", 0x0000, 0x080, CRC(346ae0cf) SHA1(1f79b2e21766f7a971c7d0f618700deb8a32f78a) )
ROM_END
-/* ROM parent machine inp init */
-GAME( 1993, mystwarr, 0, mystwarr, mystwarr, driver_device, 0, ROT0, "Konami", "Mystic Warriors (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mystwarru, mystwarr, mystwarr, mystwarr, driver_device, 0, ROT0, "Konami", "Mystic Warriors (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mystwarrj, mystwarr, mystwarr, mystwarr, driver_device, 0, ROT0, "Konami", "Mystic Warriors (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mystwarra, mystwarr, mystwarr, mystwarr, driver_device, 0, ROT0, "Konami", "Mystic Warriors (ver AAB)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mystwarraa, mystwarr, mystwarr, mystwarr, driver_device, 0, ROT0, "Konami", "Mystic Warriors (ver AAA)", MACHINE_IMPERFECT_GRAPHICS )
-
-GAME( 1993, mmaulers, 0, dadandrn, dadandrn, driver_device, 0, ROT0, "Konami", "Monster Maulers (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, dadandrn, mmaulers, dadandrn, dadandrn, driver_device, 0, ROT0, "Konami", "Kyukyoku Sentai Dadandarn (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
-
-GAME( 1993, viostorm, 0, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver EAC)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, viostormeb, viostorm, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver EAB)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, viostormu, viostorm, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver UAC)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, viostormub, viostorm, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver UAB)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, viostormj, viostorm, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver JAC)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, viostorma, viostorm, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver AAC)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, viostormab, viostorm, viostorm, viostorm, driver_device, 0, ROT0, "Konami", "Violent Storm (ver AAB)", MACHINE_IMPERFECT_GRAPHICS )
-
-GAME( 1993, metamrph, 0, metamrph, metamrph, driver_device, 0, ROT0, "Konami", "Metamorphic Force (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, metamrphe, metamrph, metamrph, metamrph, driver_device, 0, ROT0, "Konami", "Metamorphic Force (ver EAA - alternate)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, metamrphu, metamrph, metamrph, metamrph, driver_device, 0, ROT0, "Konami", "Metamorphic Force (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, metamrphj, metamrph, metamrph, metamrph, driver_device, 0, ROT0, "Konami", "Metamorphic Force (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, metamrpha, metamrph, metamrph, metamrph, driver_device, 0, ROT0, "Konami", "Metamorphic Force (ver AAA)", MACHINE_IMPERFECT_GRAPHICS )
-
-GAME( 1993, mtlchamp, 0, martchmp, martchmp, driver_device, 0, ROT0, "Konami", "Martial Champion (ver EAB)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mtlchamp1, mtlchamp, martchmp, martchmp, driver_device, 0, ROT0, "Konami", "Martial Champion (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mtlchampu, mtlchamp, martchmp, martchmp, driver_device, 0, ROT0, "Konami", "Martial Champion (ver UAE)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mtlchampu1, mtlchamp, martchmp, martchmp, driver_device, 0, ROT0, "Konami", "Martial Champion (ver UAD)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mtlchampj, mtlchamp, martchmp, martchmp, driver_device, 0, ROT0, "Konami", "Martial Champion (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, mtlchampa, mtlchamp, martchmp, martchmp, driver_device, 0, ROT0, "Konami", "Martial Champion (ver AAA)", MACHINE_IMPERFECT_GRAPHICS )
-
-GAME( 1993, gaiapols, 0, gaiapols, dadandrn, driver_device, 0, ROT90, "Konami", "Gaiapolis (ver EAF)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, gaiapolsu, gaiapols, gaiapols, dadandrn, driver_device, 0, ROT90, "Konami", "Gaiapolis (ver UAF)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1993, gaiapolsj, gaiapols, gaiapols, dadandrn, driver_device, 0, ROT90, "Konami", "Gaiapolis (ver JAF)", MACHINE_IMPERFECT_GRAPHICS )
+// YEAR NAME PARENT MACHINE INPUT STATE
+GAME( 1993, mystwarr, 0, mystwarr, mystwarr, mystwarr_state, 0, ROT0, "Konami", "Mystic Warriors (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mystwarru, mystwarr, mystwarr, mystwarr, mystwarr_state, 0, ROT0, "Konami", "Mystic Warriors (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mystwarrj, mystwarr, mystwarr, mystwarr, mystwarr_state, 0, ROT0, "Konami", "Mystic Warriors (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mystwarra, mystwarr, mystwarr, mystwarr, mystwarr_state, 0, ROT0, "Konami", "Mystic Warriors (ver AAB)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mystwarraa, mystwarr, mystwarr, mystwarr, mystwarr_state, 0, ROT0, "Konami", "Mystic Warriors (ver AAA)", MACHINE_IMPERFECT_GRAPHICS )
+
+GAME( 1993, mmaulers, 0, dadandrn, dadandrn, mystwarr_state, 0, ROT0, "Konami", "Monster Maulers (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, dadandrn, mmaulers, dadandrn, dadandrn, mystwarr_state, 0, ROT0, "Konami", "Kyukyoku Sentai Dadandarn (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
+
+GAME( 1993, viostorm, 0, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver EAC)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, viostormeb, viostorm, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver EAB)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, viostormu, viostorm, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver UAC)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, viostormub, viostorm, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver UAB)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, viostormj, viostorm, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver JAC)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, viostorma, viostorm, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver AAC)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, viostormab, viostorm, viostorm, viostorm, mystwarr_state, 0, ROT0, "Konami", "Violent Storm (ver AAB)", MACHINE_IMPERFECT_GRAPHICS )
+
+GAME( 1993, metamrph, 0, metamrph, metamrph, mystwarr_state, 0, ROT0, "Konami", "Metamorphic Force (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, metamrphe, metamrph, metamrph, metamrph, mystwarr_state, 0, ROT0, "Konami", "Metamorphic Force (ver EAA - alternate)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, metamrphu, metamrph, metamrph, metamrph, mystwarr_state, 0, ROT0, "Konami", "Metamorphic Force (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, metamrphj, metamrph, metamrph, metamrph, mystwarr_state, 0, ROT0, "Konami", "Metamorphic Force (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, metamrpha, metamrph, metamrph, metamrph, mystwarr_state, 0, ROT0, "Konami", "Metamorphic Force (ver AAA)", MACHINE_IMPERFECT_GRAPHICS )
+
+GAME( 1993, mtlchamp, 0, martchmp, martchmp, mystwarr_state, 0, ROT0, "Konami", "Martial Champion (ver EAB)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mtlchamp1, mtlchamp, martchmp, martchmp, mystwarr_state, 0, ROT0, "Konami", "Martial Champion (ver EAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mtlchampu, mtlchamp, martchmp, martchmp, mystwarr_state, 0, ROT0, "Konami", "Martial Champion (ver UAE)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mtlchampu1, mtlchamp, martchmp, martchmp, mystwarr_state, 0, ROT0, "Konami", "Martial Champion (ver UAD)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mtlchampj, mtlchamp, martchmp, martchmp, mystwarr_state, 0, ROT0, "Konami", "Martial Champion (ver JAA)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, mtlchampa, mtlchamp, martchmp, martchmp, mystwarr_state, 0, ROT0, "Konami", "Martial Champion (ver AAA)", MACHINE_IMPERFECT_GRAPHICS )
+
+GAME( 1993, gaiapols, 0, gaiapols, dadandrn, mystwarr_state, 0, ROT90, "Konami", "Gaiapolis (ver EAF)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, gaiapolsu, gaiapols, gaiapols, dadandrn, mystwarr_state, 0, ROT90, "Konami", "Gaiapolis (ver UAF)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1993, gaiapolsj, gaiapols, gaiapols, dadandrn, mystwarr_state, 0, ROT90, "Konami", "Gaiapolis (ver JAF)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp
index ea048d9eda0..37a3e5e9959 100644
--- a/src/mame/drivers/myvision.cpp
+++ b/src/mame/drivers/myvision.cpp
@@ -207,7 +207,7 @@ WRITE8_MEMBER( myvision_state::ay_port_b_w )
m_column = data;
}
-static MACHINE_CONFIG_START( myvision, myvision_state )
+static MACHINE_CONFIG_START( myvision )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_10_738635MHz/3) /* Not verified */
MCFG_CPU_PROGRAM_MAP(myvision_mem)
@@ -245,5 +245,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1983, myvision, 0, 0, myvision, myvision, driver_device, 0, "Nichibutsu", "My Vision (KH-1000)", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLN AME FLAGS
+CONS( 1983, myvision, 0, 0, myvision, myvision, myvision_state, 0, "Nichibutsu", "My Vision (KH-1000)", 0 )
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index 823ee098c44..866895c3afe 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -129,7 +129,7 @@ public:
protected:
required_device<cpu_device> m_maincpu;
- required_device<mb8877_t> m_mb8877a;
+ required_device<mb8877_device> m_mb8877a;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
@@ -861,7 +861,7 @@ static SLOT_INTERFACE_START( mz2000_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( mz2000, mz2000_state )
+static MACHINE_CONFIG_START( mz2000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(mz2000_map)
@@ -994,7 +994,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, mz80b, 0, 0, mz80b, mz80be, driver_device, 0, "Sharp", "MZ-80B", MACHINE_NOT_WORKING )
-COMP( 1982, mz2000, 0, 0, mz2000, mz80bj, driver_device, 0, "Sharp", "MZ-2000", MACHINE_NOT_WORKING )
-COMP( 1982, mz2200, mz2000, 0, mz2000, mz80bj, driver_device, 0, "Sharp", "MZ-2200", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, mz80b, 0, 0, mz80b, mz80be, mz2000_state, 0, "Sharp", "MZ-80B", MACHINE_NOT_WORKING )
+COMP( 1982, mz2000, 0, 0, mz2000, mz80bj, mz2000_state, 0, "Sharp", "MZ-2000", MACHINE_NOT_WORKING )
+COMP( 1982, mz2200, mz2000, 0, mz2000, mz80bj, mz2000_state, 0, "Sharp", "MZ-2200", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index 0b1308ca3a2..eddd2ad0a46 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -87,7 +87,7 @@ public:
required_device<pit8253_device> m_pit;
required_device<beep_device> m_beeper;
required_device<gfxdecode_device> m_gfxdecode;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
@@ -2076,7 +2076,7 @@ static SLOT_INTERFACE_START( mz2500_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( mz2500, mz2500_state )
+static MACHINE_CONFIG_START( mz2500 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 6000000)
MCFG_CPU_PROGRAM_MAP(mz2500_map)
@@ -2199,5 +2199,5 @@ ROM_END
/* Driver */
-COMP( 1985, mz2500, 0, 0, mz2500, mz2500, driver_device, 0, "Sharp", "MZ-2500", MACHINE_IMPERFECT_GRAPHICS )
-COMP( 1985, mz2520, mz2500, 0, mz2500, mz2500, driver_device, 0, "Sharp", "MZ-2520", MACHINE_IMPERFECT_GRAPHICS ) // looks a stripped down version of the regular MZ-2500, with only two floppies drives and no cassette interface
+COMP( 1985, mz2500, 0, 0, mz2500, mz2500, mz2500_state, 0, "Sharp", "MZ-2500", MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1985, mz2520, mz2500, 0, mz2500, mz2500, mz2500_state, 0, "Sharp", "MZ-2520", MACHINE_IMPERFECT_GRAPHICS ) // looks a stripped down version of the regular MZ-2500, with only two floppies drives and no cassette interface
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index badf86c6d19..fd00f0b88f4 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -800,7 +800,7 @@ static SLOT_INTERFACE_START( mz3500_floppies )
SLOT_INTERFACE_END
/* TODO: clocks */
-static MACHINE_CONFIG_START( mz3500, mz3500_state )
+static MACHINE_CONFIG_START( mz3500 )
/* basic machine hardware */
MCFG_CPU_ADD("master",Z80,MAIN_CLOCK/2)
@@ -871,4 +871,4 @@ ROM_START( mz3500 )
ROM_LOAD( "mz-3500_cg-rom_2-b_m5l2764k.bin", 0x000000, 0x002000, CRC(29f2f80a) SHA1(64b307cd9de5a3327e3ec9f3d0d6b3485706f436) )
ROM_END
-COMP( 198?, mz3500, 0, 0, mz3500, mz3500, driver_device, 0, "Sharp", "MZ-3500", MACHINE_IS_SKELETON )
+COMP( 198?, mz3500, 0, 0, mz3500, mz3500, mz3500_state, 0, "Sharp", "MZ-3500", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index c33b3943411..6c371c2ac59 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( upd7220_map, AS_0, 16, mz6500_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mz6500, mz6500_state )
+static MACHINE_CONFIG_START( mz6500 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 8000000) //unk clock
MCFG_CPU_PROGRAM_MAP(mz6500_map)
@@ -177,5 +177,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, mz6500, 0, 0, mz6500, mz6500, driver_device, 0, "Sharp", "MZ-6500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, mz6500, 0, 0, mz6500, mz6500, mz6500_state, 0, "Sharp", "MZ-6500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp
index 93125aac2df..76b52872d82 100644
--- a/src/mame/drivers/mz700.cpp
+++ b/src/mame/drivers/mz700.cpp
@@ -368,7 +368,7 @@ GFXDECODE_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( mz700, mz_state )
+static MACHINE_CONFIG_START( mz700 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_17_73447MHz/5)
MCFG_CPU_PROGRAM_MAP(mz700_mem)
@@ -518,8 +518,8 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1982, mz700, 0, 0, mz700, mz700, mz_state, mz700, "Sharp", "MZ-700", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, mz700, 0, 0, mz700, mz700, mz_state, mz700, "Sharp", "MZ-700", 0 )
COMP( 1982, mz700j, mz700, 0, mz700, mz700, mz_state, mz700, "Sharp", "MZ-700 (Japan)", 0 )
-COMP( 1984, mz800, 0, 0, mz800, mz800, mz_state, mz800, "Sharp", "MZ-800", MACHINE_NOT_WORKING )
-COMP( 1984, mz1500, 0, 0, mz800, mz800, mz_state, mz800, "Sharp", "MZ-1500", MACHINE_NOT_WORKING ) // Japanese version of the MZ-800
+COMP( 1984, mz800, 0, 0, mz800, mz800, mz_state, mz800, "Sharp", "MZ-800", MACHINE_NOT_WORKING )
+COMP( 1984, mz1500, 0, 0, mz800, mz800, mz_state, mz800, "Sharp", "MZ-1500", MACHINE_NOT_WORKING ) // Japanese version of the MZ-800
diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp
index fda11575bd4..1d40616b6c0 100644
--- a/src/mame/drivers/mz80.cpp
+++ b/src/mame/drivers/mz80.cpp
@@ -274,7 +274,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mz80_state::ne555_tempo_callback)
m_mz80k_tempo_strobe ^= 1;
}
-static MACHINE_CONFIG_START( mz80k, mz80_state )
+static MACHINE_CONFIG_START( mz80k )
/* basic machine hardware */
/* main CPU */
@@ -371,7 +371,7 @@ ROM_START( mz80a )
ROM_LOAD( "mz80acg.rom", 0x0000, 0x0800, CRC(a87c2e2b) SHA1(e8aefbdb48a63e5f96692af868c353ca7e1bfcd2) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1979, mz80kj, 0, 0, mz80kj, mz80k, mz80_state, mz80k, "Sharp", "MZ-80K (Japanese)", 0 )
-COMP( 1979, mz80k, mz80kj, 0, mz80k, mz80k, mz80_state, mz80k, "Sharp", "MZ-80K", 0 )
-COMP( 1982, mz80a, 0, 0, mz80a, mz80a, mz80_state, mz80k, "Sharp", "MZ-80A", 0 )
+COMP( 1979, mz80k, mz80kj, 0, mz80k, mz80k, mz80_state, mz80k, "Sharp", "MZ-80K", 0 )
+COMP( 1982, mz80a, 0, 0, mz80a, mz80a, mz80_state, mz80k, "Sharp", "MZ-80A", 0 )
diff --git a/src/mame/drivers/mzr8105.cpp b/src/mame/drivers/mzr8105.cpp
index 89c1d624906..3dca7921be5 100644
--- a/src/mame/drivers/mzr8105.cpp
+++ b/src/mame/drivers/mzr8105.cpp
@@ -203,7 +203,7 @@ SLOT_INTERFACE_END
/*
* Machine configuration
*/
-MACHINE_CONFIG_START (mzr8105, mzr8105_state)
+MACHINE_CONFIG_START (mzr8105)
MCFG_CPU_ADD ("maincpu", M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP (mzr8105_mem)
MCFG_VME_DEVICE_ADD("vme")
@@ -227,5 +227,5 @@ ROM_START (mzr8105)
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP (1987, mzr8105, 0, 0, mzr8105, mzr8105, driver_device, 0, "Mizar Inc", "Mizar VME8105", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP (1987, mzr8105, 0, 0, mzr8105, mzr8105, mzr8105_state, 0, "Mizar Inc", "Mizar VME8105", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_TYPE_COMPUTER )
diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp
index d7088414722..3aac0f61e71 100644
--- a/src/mame/drivers/n64.cpp
+++ b/src/mame/drivers/n64.cpp
@@ -418,7 +418,7 @@ INTERRUPT_GEN_MEMBER(n64_mess_state::n64_reset_poll)
periphs->poll_reset_button((ioport("RESET")->read() & 1) ? true : false);
}
-static MACHINE_CONFIG_START( n64, n64_mess_state )
+static MACHINE_CONFIG_START( n64 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", VR4300BE, 93750000)
@@ -527,5 +527,5 @@ ROM_START( n64dd )
ROM_LOAD( "normslp.rom", 0x00, 0x80, CRC(4f2ae525) SHA1(eab43f8cc52c8551d9cff6fced18ef80eaba6f05) )
ROM_END
-CONS(1996, n64, 0, 0, n64, n64, driver_device, 0, "Nintendo", "Nintendo 64", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-CONS(1996, n64dd, n64, 0, n64dd, n64, driver_device, 0, "Nintendo", "Nintendo 64DD", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+CONS(1996, n64, 0, 0, n64, n64, n64_mess_state, 0, "Nintendo", "Nintendo 64", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+CONS(1996, n64dd, n64, 0, n64dd, n64, n64_mess_state, 0, "Nintendo", "Nintendo 64DD", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/n8080.cpp b/src/mame/drivers/n8080.cpp
index 78bdcebeeff..b1ec73a8c5c 100644
--- a/src/mame/drivers/n8080.cpp
+++ b/src/mame/drivers/n8080.cpp
@@ -453,7 +453,7 @@ WRITE_LINE_MEMBER(n8080_state::n8080_inte_callback)
WRITE8_MEMBER(n8080_state::n8080_status_callback)
{
- if (data & I8085_STATUS_INTA)
+ if (data & i8080_cpu_device::STATUS_INTA)
{
/* interrupt acknowledge */
m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
@@ -500,7 +500,7 @@ MACHINE_RESET_MEMBER(n8080_state,helifire)
}
-static MACHINE_CONFIG_START( spacefev, n8080_state )
+static MACHINE_CONFIG_START( spacefev )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
@@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( spacefev, n8080_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sheriff, n8080_state )
+static MACHINE_CONFIG_START( sheriff )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
@@ -574,7 +574,7 @@ static MACHINE_CONFIG_DERIVED( westgun2, sheriff )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( helifire, n8080_state )
+static MACHINE_CONFIG_START( helifire )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK / 10)
@@ -932,15 +932,15 @@ ROM_START( helifirea )
ROM_END
-GAME( 1979, spacefev, 0, spacefev, spacefev, driver_device, 0, ROT270, "Nintendo", "Space Fever (New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, spacefevo, spacefev, spacefev, spacefev, driver_device, 0, ROT270, "Nintendo", "Space Fever (Old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, spacefevo2, spacefev, spacefev, spacefev, driver_device, 0, ROT270, "Nintendo", "Space Fever (Older Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, highsplt, 0, spacefev, highsplt, driver_device, 0, ROT270, "Nintendo", "Space Fever High Splitter (set 1)", MACHINE_SUPPORTS_SAVE ) // known as "SF-Hisplitter" on its flyer
-GAME( 1979, highsplta, highsplt, spacefev, highsplt, driver_device, 0, ROT270, "Nintendo", "Space Fever High Splitter (set 2)", MACHINE_SUPPORTS_SAVE ) // known as "SF-Hisplitter" on its flyer
-GAME( 1979, highspltb, highsplt, spacefev, highsplt, driver_device, 0, ROT270, "Nintendo", "Space Fever High Splitter (alt Sound)", MACHINE_SUPPORTS_SAVE ) // known as "SF-Hisplitter" on its flyer
-GAME( 1979, spacelnc, 0, spacefev, spacelnc, driver_device, 0, ROT270, "Nintendo", "Space Launcher", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sheriff, 0, sheriff, sheriff, driver_device, 0, ROT270, "Nintendo", "Sheriff", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, bandido, sheriff, sheriff, bandido, driver_device, 0, ROT270, "Nintendo (Exidy license)", "Bandido", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, westgun2, sheriff, westgun2, westgun2, driver_device, 0, ROT270, "Nintendo (Taito Corporation license)", "Western Gun Part II", MACHINE_SUPPORTS_SAVE ) // official Taito PCBs, but title/copyright not shown
-GAME( 1980, helifire, 0, helifire, helifire, driver_device, 0, ROT270, "Nintendo", "HeliFire (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, helifirea, helifire, helifire, helifire, driver_device, 0, ROT270, "Nintendo", "HeliFire (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spacefev, 0, spacefev, spacefev, n8080_state, 0, ROT270, "Nintendo", "Space Fever (New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spacefevo, spacefev, spacefev, spacefev, n8080_state, 0, ROT270, "Nintendo", "Space Fever (Old Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spacefevo2, spacefev, spacefev, spacefev, n8080_state, 0, ROT270, "Nintendo", "Space Fever (Older Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, highsplt, 0, spacefev, highsplt, n8080_state, 0, ROT270, "Nintendo", "Space Fever High Splitter (set 1)", MACHINE_SUPPORTS_SAVE ) // known as "SF-Hisplitter" on its flyer
+GAME( 1979, highsplta, highsplt, spacefev, highsplt, n8080_state, 0, ROT270, "Nintendo", "Space Fever High Splitter (set 2)", MACHINE_SUPPORTS_SAVE ) // known as "SF-Hisplitter" on its flyer
+GAME( 1979, highspltb, highsplt, spacefev, highsplt, n8080_state, 0, ROT270, "Nintendo", "Space Fever High Splitter (alt Sound)", MACHINE_SUPPORTS_SAVE ) // known as "SF-Hisplitter" on its flyer
+GAME( 1979, spacelnc, 0, spacefev, spacelnc, n8080_state, 0, ROT270, "Nintendo", "Space Launcher", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sheriff, 0, sheriff, sheriff, n8080_state, 0, ROT270, "Nintendo", "Sheriff", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, bandido, sheriff, sheriff, bandido, n8080_state, 0, ROT270, "Nintendo (Exidy license)", "Bandido", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, westgun2, sheriff, westgun2, westgun2, n8080_state, 0, ROT270, "Nintendo (Taito Corporation license)", "Western Gun Part II", MACHINE_SUPPORTS_SAVE ) // official Taito PCBs, but title/copyright not shown
+GAME( 1980, helifire, 0, helifire, helifire, n8080_state, 0, ROT270, "Nintendo", "HeliFire (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, helifirea, helifire, helifire, helifire, n8080_state, 0, ROT270, "Nintendo", "HeliFire (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp
index 14ac132d6dc..73d189125de 100644
--- a/src/mame/drivers/nakajies.cpp
+++ b/src/mame/drivers/nakajies.cpp
@@ -736,7 +736,7 @@ static GFXDECODE_START( drwrt400 )
GFXDECODE_ENTRY( "bios", 0x580b6, nakajies_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( nakajies210, nakajies_state )
+static MACHINE_CONFIG_START( nakajies210 )
MCFG_CPU_ADD( "v20hl", V20, X301 / 2 )
MCFG_CPU_PROGRAM_MAP( nakajies_map)
MCFG_CPU_IO_MAP( nakajies_io_map)
@@ -827,11 +827,11 @@ ROM_START( es210_es )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 199?, wales210, 0, 0, nakajies210, nakajies, driver_device, 0, "Walther", "ES-210", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* German, 128KB RAM */
-COMP( 199?, dator3k, wales210, 0, dator3k, nakajies, driver_device, 0, "Dator", "Dator 3000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* Spanish, 128KB RAM */
-COMP( 199?, es210_es, wales210, 0, nakajies210, nakajies, driver_device, 0, "Nakajima","ES-210 (Spain)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* Spanish, 128KB RAM */
-COMP( 199?, drwrt100, wales210, 0, nakajies220, nakajies, driver_device, 0, "NTS", "DreamWriter T100", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* English, 128KB RAM */
-COMP( 1996, drwrt400, wales210, 0, nakajies220, nakajies, driver_device, 0, "NTS", "DreamWriter T400", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* English, 256KB RAM */
-COMP( 199?, drwrt450, wales210, 0, nakajies220, nakajies, driver_device, 0, "NTS", "DreamWriter 450", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* English, 128KB RAM */
-COMP( 199?, drwrt200, wales210, 0, nakajies250, nakajies, driver_device, 0, "NTS", "DreamWriter T200", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) /* English, 256KB? RAM */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 199?, wales210, 0, 0, nakajies210, nakajies, nakajies_state, 0, "Walther", "ES-210", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // German, 128KB RAM
+COMP( 199?, dator3k, wales210, 0, dator3k, nakajies, nakajies_state, 0, "Dator", "Dator 3000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Spanish, 128KB RAM
+COMP( 199?, es210_es, wales210, 0, nakajies210, nakajies, nakajies_state, 0, "Nakajima", "ES-210 (Spain)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Spanish, 128KB RAM
+COMP( 199?, drwrt100, wales210, 0, nakajies220, nakajies, nakajies_state, 0, "NTS", "DreamWriter T100", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // English, 128KB RAM
+COMP( 1996, drwrt400, wales210, 0, nakajies220, nakajies, nakajies_state, 0, "NTS", "DreamWriter T400", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // English, 256KB RAM
+COMP( 199?, drwrt450, wales210, 0, nakajies220, nakajies, nakajies_state, 0, "NTS", "DreamWriter 450", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // English, 128KB RAM
+COMP( 199?, drwrt200, wales210, 0, nakajies250, nakajies, nakajies_state, 0, "NTS", "DreamWriter T200", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // English, 256KB? RAM
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index 4e8a0598383..38fd137d8fd 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -159,7 +159,7 @@ OSC3: 48.384MHz
#include "emu.h"
#include "includes/namcofl.h"
-#include "includes/namcoic.h"
+#include "machine/namcoic.h"
#include "cpu/i960/i960.h"
#include "sound/c352.h"
@@ -577,7 +577,7 @@ MACHINE_RESET_MEMBER(namcofl_state,namcofl)
}
-static MACHINE_CONFIG_START( namcofl, namcofl_state )
+static MACHINE_CONFIG_START( namcofl )
MCFG_CPU_ADD("maincpu", I960, 20000000) // i80960KA-20 == 20 MHz part
MCFG_CPU_PROGRAM_MAP(namcofl_mem)
diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp
index 93dd8adc6e5..87136084eff 100644
--- a/src/mame/drivers/namcona1.cpp
+++ b/src/mame/drivers/namcona1.cpp
@@ -930,7 +930,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcona1_state::interrupt)
}
/* cropped at sides */
-static MACHINE_CONFIG_START( namcona1, namcona1_state )
+static MACHINE_CONFIG_START( namcona1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
@@ -962,7 +962,7 @@ static MACHINE_CONFIG_START( namcona1, namcona1_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", 44100)
- MCFG_C140_BANK_TYPE(C140_TYPE_ASIC219)
+ MCFG_C140_BANK_TYPE(ASIC219)
MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
MCFG_SOUND_ROUTE(1, "lspeaker", 1.00)
MACHINE_CONFIG_END
@@ -1315,25 +1315,25 @@ ROM_START( xday2 )
ROM_END
// NA-1 (C69 MCU)
-GAME( 1992, bkrtmaq, 0, namcona1w, namcona1_quiz, namcona1_state,bkrtmaq, ROT0, "Namco", "Bakuretsu Quiz Ma-Q Dai Bouken (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, cgangpzl, 0, namcona1w, namcona1_joy, namcona1_state, cgangpzl, ROT0, "Namco", "Cosmo Gang the Puzzle (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, cgangpzlj, cgangpzl, namcona1w, namcona1_joy, namcona1_state, cgangpzl, ROT0, "Namco", "Cosmo Gang the Puzzle (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, exvania, 0, namcona1, namcona1_joy, namcona1_state, exbania, ROT0, "Namco", "Exvania (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, exvaniaj, exvania, namcona1, namcona1_joy, namcona1_state, exbania, ROT0, "Namco", "Exvania (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fghtatck, 0, namcona1, namcona1_joy, namcona1_state, fa, ROT90,"Namco", "Fighter & Attacker (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fa, fghtatck, namcona1, namcona1_joy, namcona1_state, fa, ROT90,"Namco", "F/A (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, swcourt, 0, namcona1w, namcona1_joy, namcona1_state, swcourt, ROT0, "Namco", "Super World Court (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, swcourtj, swcourt, namcona1w, namcona1_joy, namcona1_state, swcourt, ROT0, "Namco", "Super World Court (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, emeraldaj, emeralda, namcona1w, namcona1_joy, namcona1_state, emeraldj, ROT0, "Namco", "Emeraldia (Japan Version B)", MACHINE_SUPPORTS_SAVE ) /* Parent is below on NA-2 Hardware */
-GAME( 1993, emeraldaja, emeralda, namcona1w, namcona1_joy, namcona1_state, emeraldj, ROT0, "Namco", "Emeraldia (Japan)", MACHINE_SUPPORTS_SAVE ) /* Parent is below on NA-2 Hardware */
-GAME( 1993, tinklpit, 0, namcona1w, namcona1_joy, namcona1_state, tinklpit, ROT0, "Namco", "Tinkle Pit (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, bkrtmaq, 0, namcona1w, namcona1_quiz, namcona1_state, bkrtmaq, ROT0, "Namco", "Bakuretsu Quiz Ma-Q Dai Bouken (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, cgangpzl, 0, namcona1w, namcona1_joy, namcona1_state, cgangpzl, ROT0, "Namco", "Cosmo Gang the Puzzle (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, cgangpzlj, cgangpzl, namcona1w, namcona1_joy, namcona1_state, cgangpzl, ROT0, "Namco", "Cosmo Gang the Puzzle (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, exvania, 0, namcona1, namcona1_joy, namcona1_state, exbania, ROT0, "Namco", "Exvania (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, exvaniaj, exvania, namcona1, namcona1_joy, namcona1_state, exbania, ROT0, "Namco", "Exvania (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fghtatck, 0, namcona1, namcona1_joy, namcona1_state, fa, ROT90,"Namco", "Fighter & Attacker (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fa, fghtatck, namcona1, namcona1_joy, namcona1_state, fa, ROT90,"Namco", "F/A (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, swcourt, 0, namcona1w, namcona1_joy, namcona1_state, swcourt, ROT0, "Namco", "Super World Court (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, swcourtj, swcourt, namcona1w, namcona1_joy, namcona1_state, swcourt, ROT0, "Namco", "Super World Court (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, emeraldaj, emeralda, namcona1w, namcona1_joy, namcona1_state, emeraldj, ROT0, "Namco", "Emeraldia (Japan Version B)", MACHINE_SUPPORTS_SAVE ) /* Parent is below on NA-2 Hardware */
+GAME( 1993, emeraldaja, emeralda, namcona1w, namcona1_joy, namcona1_state, emeraldj, ROT0, "Namco", "Emeraldia (Japan)", MACHINE_SUPPORTS_SAVE ) /* Parent is below on NA-2 Hardware */
+GAME( 1993, tinklpit, 0, namcona1w, namcona1_joy, namcona1_state, tinklpit, ROT0, "Namco", "Tinkle Pit (Japan)", MACHINE_SUPPORTS_SAVE )
// NA-2 (C70 MCU)
-GAME( 1992, knckhead, 0, namcona2, namcona1_joy, namcona1_state, knckhead, ROT0, "Namco", "Knuckle Heads (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, knckheadj, knckhead, namcona2, namcona1_joy, namcona1_state, knckhead, ROT0, "Namco", "Knuckle Heads (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, knckheadjp, knckhead, namcona2, namcona1_joy, namcona1_state, knckhead, ROT0, "Namco", "Knuckle Heads (Japan, Prototype?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, emeralda, 0, namcona2w, namcona1_joy, namcona1_state, emeralda, ROT0, "Namco", "Emeraldia (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, numanath, 0, namcona2, namcona1_joy, namcona1_state, numanath, ROT0, "Namco", "Numan Athletics (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, numanathj, numanath, namcona2, namcona1_joy, namcona1_state, numanath, ROT0, "Namco", "Numan Athletics (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, quiztou, 0, namcona2, namcona1_quiz, namcona1_state,quiztou, ROT0, "Namco", "Nettou! Gekitou! Quiztou!! (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, xday2, 0, namcona2, namcona1_joy, namcona1_state, xday2, ROT0, "Namco", "X-Day 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, knckhead, 0, namcona2, namcona1_joy, namcona1_state, knckhead, ROT0, "Namco", "Knuckle Heads (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, knckheadj, knckhead, namcona2, namcona1_joy, namcona1_state, knckhead, ROT0, "Namco", "Knuckle Heads (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, knckheadjp, knckhead, namcona2, namcona1_joy, namcona1_state, knckhead, ROT0, "Namco", "Knuckle Heads (Japan, Prototype?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, emeralda, 0, namcona2w, namcona1_joy, namcona1_state, emeralda, ROT0, "Namco", "Emeraldia (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, numanath, 0, namcona2, namcona1_joy, namcona1_state, numanath, ROT0, "Namco", "Numan Athletics (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, numanathj, numanath, namcona2, namcona1_joy, namcona1_state, numanath, ROT0, "Namco", "Numan Athletics (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, quiztou, 0, namcona2, namcona1_quiz, namcona1_state, quiztou, ROT0, "Namco", "Nettou! Gekitou! Quiztou!! (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, xday2, 0, namcona2, namcona1_joy, namcona1_state, xday2, ROT0, "Namco", "X-Day 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index 1e9d6fa31d4..73fa99afb3c 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -272,7 +272,7 @@ GFX: Custom 145 ( 80 pin PQFP)
*/
#include "emu.h"
#include "includes/namconb1.h"
-#include "includes/namcoic.h"
+#include "machine/namcoic.h"
#include "cpu/m68000/m68000.h"
#include "machine/namcomcu.h"
@@ -1064,7 +1064,7 @@ MACHINE_RESET_MEMBER(namconb1_state, namconb)
/***************************************************************/
-static MACHINE_CONFIG_START( namconb1, namconb1_state )
+static MACHINE_CONFIG_START( namconb1 )
MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(namconb1_am)
@@ -1106,7 +1106,7 @@ static MACHINE_CONFIG_START( namconb1, namconb1_state )
//MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( namconb2, namconb1_state )
+static MACHINE_CONFIG_START( namconb2 )
MCFG_CPU_ADD("maincpu", M68EC020, MASTER_CLOCK/2)
MCFG_CPU_PROGRAM_MAP(namconb2_am)
diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp
index 2123d28d516..216bef55771 100644
--- a/src/mame/drivers/namcond1.cpp
+++ b/src/mame/drivers/namcond1.cpp
@@ -176,7 +176,7 @@ INTERRUPT_GEN_MEMBER(namcond1_state::mcu_interrupt)
- The level 1 interrupt to the 68k has been measured at 60Hz.
*******************************************/
-static MACHINE_CONFIG_START( namcond1, namcond1_state )
+static MACHINE_CONFIG_START( namcond1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_49_152MHz/4)
@@ -301,8 +301,8 @@ ROM_START( ncv2j )
ROM_LOAD( "ncs1voic.7c", 0x000000, 0x200000, CRC(ed05fd88) SHA1(ad88632c89a9946708fc6b4c9247e1bae9b2944b) )
ROM_END
-GAME( 1995, ncv1, 0, namcond1, namcond1, driver_device, 0, ROT90, "Namco", "Namco Classic Collection Vol.1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, ncv1j, ncv1, namcond1, namcond1, driver_device, 0, ROT90, "Namco", "Namco Classic Collection Vol.1 (Japan, v1.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, ncv1j2, ncv1, namcond1, namcond1, driver_device, 0, ROT90, "Namco", "Namco Classic Collection Vol.1 (Japan, v1.03)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ncv2, 0, namcond1, namcond1, driver_device, 0, ROT90, "Namco", "Namco Classic Collection Vol.2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ncv2j, ncv2, namcond1, namcond1, driver_device, 0, ROT90, "Namco", "Namco Classic Collection Vol.2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, ncv1, 0, namcond1, namcond1, namcond1_state, 0, ROT90, "Namco", "Namco Classic Collection Vol.1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, ncv1j, ncv1, namcond1, namcond1, namcond1_state, 0, ROT90, "Namco", "Namco Classic Collection Vol.1 (Japan, v1.00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, ncv1j2, ncv1, namcond1, namcond1, namcond1_state, 0, ROT90, "Namco", "Namco Classic Collection Vol.1 (Japan, v1.03)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ncv2, 0, namcond1, namcond1, namcond1_state, 0, ROT90, "Namco", "Namco Classic Collection Vol.2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ncv2j, ncv2, namcond1, namcond1, namcond1_state, 0, ROT90, "Namco", "Namco Classic Collection Vol.2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp
index c2088b7db6f..be08b2fd660 100644
--- a/src/mame/drivers/namcops2.cpp
+++ b/src/mame/drivers/namcops2.cpp
@@ -913,7 +913,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( system246 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( system246, namcops2_state )
+static MACHINE_CONFIG_START( system246 )
MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // actually R5900 @ 294 MHz
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
@@ -1580,59 +1580,59 @@ ROM_START( sbxc )
ROM_END
// System 246
-GAME(2001, sys246, 0, system246, system246, driver_device, 0, ROT0, "Namco", "System 246 BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
-GAME(2001, vnight, sys246, system246, system246, driver_device, 0, ROT0, "Sega / Namco", "Vampire Night (VPN3 Ver. B)", MACHINE_IS_SKELETON)
-GAME(2001, bldyr3b, sys246, system246, system246, driver_device, 0, ROT0, "bootleg", "Bloody Roar 3 (bootleg)", MACHINE_IS_SKELETON)
-GAME(2001, rrvac, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV3 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2001, rrvac2, rrvac, system246, system246, driver_device, 0, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV2 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2001, rrvac1, rrvac, system246, system246, driver_device, 0, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2001, wanganmd, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Wangan Midnight (WMN1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, dragchrn, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Dragon Chronicles (DC001 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, netchu02, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Netchuu Pro Yakyuu 2002 (NPY1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, scptour, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Smash Court Pro Tournament (SCP1)", MACHINE_IS_SKELETON)
-GAME(2002, soulclb2, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur II (SC23 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, soulcl2a, soulclb2, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur II (SC22 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, soulcl2b, soulclb2, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur II (SC21 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, soulcl2w, soulclb2, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur II (SC23 world version)", MACHINE_IS_SKELETON)
-GAME(2002, tekken4, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Tekken 4 (TEF3 Ver. C)", MACHINE_IS_SKELETON)
-GAME(2002, tekken4a, tekken4, system246, system246, driver_device, 0, ROT0, "Namco", "Tekken 4 (TEF2 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, tekken4b, tekken4, system246, system246, driver_device, 0, ROT0, "Namco", "Tekken 4 (TEF1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2002, tekken4c, tekken4, system246, system246, driver_device, 0, ROT0, "Namco", "Tekken 4 (TEF1 Ver. C)", MACHINE_IS_SKELETON)
-GAME(2002, wanganmr, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Wangan Midnight R (WMR1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2003, prdgp03, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Pride GP 2003 (PR21 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2003, timecrs3, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Time Crisis 3 (TST1)", MACHINE_IS_SKELETON)
-GAME(2003, timecrs3e,timecrs3, system246, system246, driver_device, 0, ROT0, "Namco", "Time Crisis 3 (TST2 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2003, zgundm, sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Banpresto", "Mobile Suit Z-Gundam: A.E.U.G. vs Titans (ZGA1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2004, fghtjam, sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Namco", "Capcom Fighting Jam (JAM1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2004, sukuinuf, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Quiz and Variety Suku Suku Inufuku 2 (IN2 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2004, zgundmdx, sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Banpresto", "Mobile Suit Z-Gundam: A.E.U.G. vs Titans DX (ZDX1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2004, zoidsinf, sys246, system246, system246, driver_device, 0, ROT0, "Tomy / Taito", "Zoids Infinity", MACHINE_IS_SKELETON)
-GAME(2005, cobrata, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Cobra: The Arcade (CBR1 Ver. B)", MACHINE_IS_SKELETON)
-GAME(2005, gundzaft, sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Banpresto", "Gundam Seed: Federation vs. Z.A.F.T. (SED1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2005, soulclb3, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur III (SC31001-NA-A key, NA-B disc)", MACHINE_IS_SKELETON)
-GAME(2005, soulclb3a,soulclb3, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur III (SC31002-NA-A key, NA-B disc)", MACHINE_IS_SKELETON)
-GAME(2005, soulclb3b,soulclb3, system246, system246, driver_device, 0, ROT0, "Namco", "Soul Calibur III (SC31002-NA-A key, NA-A disc)", MACHINE_IS_SKELETON)
-GAME(2005, taiko7, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 7 (TK71-NA-A)", MACHINE_IS_SKELETON)
-GAME(2006, taiko8, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 8 (TK8100-1-NA-A)", MACHINE_IS_SKELETON)
-GAME(2006, qgundam, sys246, system246, system246, driver_device, 0, ROT0, "Namco", "Quiz Mobile Suit Gundam: Monsenshi (QG1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2008, fateulc, sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Namco", "Fate: Unlimited Codes (FUD1 ver. A)", MACHINE_IS_SKELETON)
-GAME(2008, fateulcb, fateulc, system246, system246, driver_device, 0, ROT0, "bootleg", "Fate: Unlimited Codes (bootleg)", MACHINE_IS_SKELETON)
-GAME(2008, sbxc, sys246, system246, system246, driver_device, 0, ROT0, "Capcom / Arc System Works", "Sengoku Basara X Cross", MACHINE_IS_SKELETON)
+GAME(2001, sys246, 0, system246, system246, namcops2_state, 0, ROT0, "Namco", "System 246 BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
+GAME(2001, vnight, sys246, system246, system246, namcops2_state, 0, ROT0, "Sega / Namco", "Vampire Night (VPN3 Ver. B)", MACHINE_IS_SKELETON)
+GAME(2001, bldyr3b, sys246, system246, system246, namcops2_state, 0, ROT0, "bootleg", "Bloody Roar 3 (bootleg)", MACHINE_IS_SKELETON)
+GAME(2001, rrvac, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV3 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2001, rrvac2, rrvac, system246, system246, namcops2_state, 0, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV2 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2001, rrvac1, rrvac, system246, system246, namcops2_state, 0, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2001, wanganmd, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Wangan Midnight (WMN1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, dragchrn, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Dragon Chronicles (DC001 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, netchu02, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Netchuu Pro Yakyuu 2002 (NPY1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, scptour, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Smash Court Pro Tournament (SCP1)", MACHINE_IS_SKELETON)
+GAME(2002, soulclb2, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur II (SC23 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, soulcl2a, soulclb2, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur II (SC22 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, soulcl2b, soulclb2, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur II (SC21 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, soulcl2w, soulclb2, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur II (SC23 world version)", MACHINE_IS_SKELETON)
+GAME(2002, tekken4, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 4 (TEF3 Ver. C)", MACHINE_IS_SKELETON)
+GAME(2002, tekken4a, tekken4, system246, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 4 (TEF2 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, tekken4b, tekken4, system246, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 4 (TEF1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2002, tekken4c, tekken4, system246, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 4 (TEF1 Ver. C)", MACHINE_IS_SKELETON)
+GAME(2002, wanganmr, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Wangan Midnight R (WMR1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2003, prdgp03, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Pride GP 2003 (PR21 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2003, timecrs3, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Time Crisis 3 (TST1)", MACHINE_IS_SKELETON)
+GAME(2003, timecrs3e,timecrs3, system246, system246, namcops2_state, 0, ROT0, "Namco", "Time Crisis 3 (TST2 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2003, zgundm, sys246, system246, system246, namcops2_state, 0, ROT0, "Capcom / Banpresto", "Mobile Suit Z-Gundam: A.E.U.G. vs Titans (ZGA1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2004, fghtjam, sys246, system246, system246, namcops2_state, 0, ROT0, "Capcom / Namco", "Capcom Fighting Jam (JAM1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2004, sukuinuf, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Quiz and Variety Suku Suku Inufuku 2 (IN2 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2004, zgundmdx, sys246, system246, system246, namcops2_state, 0, ROT0, "Capcom / Banpresto", "Mobile Suit Z-Gundam: A.E.U.G. vs Titans DX (ZDX1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2004, zoidsinf, sys246, system246, system246, namcops2_state, 0, ROT0, "Tomy / Taito", "Zoids Infinity", MACHINE_IS_SKELETON)
+GAME(2005, cobrata, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Cobra: The Arcade (CBR1 Ver. B)", MACHINE_IS_SKELETON)
+GAME(2005, gundzaft, sys246, system246, system246, namcops2_state, 0, ROT0, "Capcom / Banpresto", "Gundam Seed: Federation vs. Z.A.F.T. (SED1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2005, soulclb3, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur III (SC31001-NA-A key, NA-B disc)", MACHINE_IS_SKELETON)
+GAME(2005, soulclb3a,soulclb3, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur III (SC31002-NA-A key, NA-B disc)", MACHINE_IS_SKELETON)
+GAME(2005, soulclb3b,soulclb3, system246, system246, namcops2_state, 0, ROT0, "Namco", "Soul Calibur III (SC31002-NA-A key, NA-A disc)", MACHINE_IS_SKELETON)
+GAME(2005, taiko7, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Taiko No Tatsujin 7 (TK71-NA-A)", MACHINE_IS_SKELETON)
+GAME(2006, taiko8, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Taiko No Tatsujin 8 (TK8100-1-NA-A)", MACHINE_IS_SKELETON)
+GAME(2006, qgundam, sys246, system246, system246, namcops2_state, 0, ROT0, "Namco", "Quiz Mobile Suit Gundam: Monsenshi (QG1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2008, fateulc, sys246, system246, system246, namcops2_state, 0, ROT0, "Capcom / Namco", "Fate: Unlimited Codes (FUD1 ver. A)", MACHINE_IS_SKELETON)
+GAME(2008, fateulcb, fateulc, system246, system246, namcops2_state, 0, ROT0, "bootleg", "Fate: Unlimited Codes (bootleg)", MACHINE_IS_SKELETON)
+GAME(2008, sbxc, sys246, system246, system246, namcops2_state, 0, ROT0, "Capcom / Arc System Works", "Sengoku Basara X Cross", MACHINE_IS_SKELETON)
// System 256
-GAME(2004, sys256, 0, system256, system246, driver_device, 0, ROT0, "Namco", "System 256 BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
-GAME(2005, tekken51, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Tekken 5.1 (TE51 Ver. B)", MACHINE_IS_SKELETON)
-GAME(2005, tekken51b,tekken51, system256, system246, driver_device, 0, ROT0, "Namco", "Tekken 5.1 (TE53 Ver. B)", MACHINE_IS_SKELETON)
-GAME(2005, tekken5d, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Tekken 5 Dark Resurrection (TED1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2005, superdbz, sys256, system256, system246, driver_device, 0, ROT0, "Banpresto / Spike", "Super Dragon Ball Z (DB1 Ver. B)", MACHINE_IS_SKELETON)
-GAME(2006, kinniku, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Kinnikuman Muscle Grand Prix (KN1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2006, taiko9, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 9 (TK91001-NA-A)", MACHINE_IS_SKELETON)
-GAME(2006, yuyuhaku, sys256, system256, system246, driver_device, 0, ROT0, "Banpresto", "The Battle of Yu Yu Hakusho: Shitou! Ankoku Bujutsukai!", MACHINE_IS_SKELETON)
-GAME(2006, zoidiexp, sys246, system246, system246, driver_device, 0, ROT0, "Tomy / Taito", "Zoids Infinity EX Plus (ver. 2.10)", MACHINE_IS_SKELETON)
-GAME(2007, kinniku2, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Kinnikuman Muscle Grand Prix 2 (KN2 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2007, taiko10, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Taiko No Tatsujin 10 (T101001-NA-A)", MACHINE_IS_SKELETON)
-GAME(2008, gdvsgd, sys256, system256, system246, driver_device, 0, ROT0, "Capcom / Bandai", "Gundam vs. Gundam (GVS1 Ver. A)", MACHINE_IS_SKELETON)
-GAME(2009, gdvsgdnx, sys256, system256, system246, driver_device, 0, ROT0, "Capcom / Bandai", "Gundam vs. Gundam Next", MACHINE_IS_SKELETON)
+GAME(2004, sys256, 0, system256, system246, namcops2_state, 0, ROT0, "Namco", "System 256 BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
+GAME(2005, tekken51, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 5.1 (TE51 Ver. B)", MACHINE_IS_SKELETON)
+GAME(2005, tekken51b,tekken51, system256, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 5.1 (TE53 Ver. B)", MACHINE_IS_SKELETON)
+GAME(2005, tekken5d, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Tekken 5 Dark Resurrection (TED1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2005, superdbz, sys256, system256, system246, namcops2_state, 0, ROT0, "Banpresto / Spike", "Super Dragon Ball Z (DB1 Ver. B)", MACHINE_IS_SKELETON)
+GAME(2006, kinniku, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Kinnikuman Muscle Grand Prix (KN1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2006, taiko9, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Taiko No Tatsujin 9 (TK91001-NA-A)", MACHINE_IS_SKELETON)
+GAME(2006, yuyuhaku, sys256, system256, system246, namcops2_state, 0, ROT0, "Banpresto", "The Battle of Yu Yu Hakusho: Shitou! Ankoku Bujutsukai!", MACHINE_IS_SKELETON)
+GAME(2006, zoidiexp, sys246, system246, system246, namcops2_state, 0, ROT0, "Tomy / Taito", "Zoids Infinity EX Plus (ver. 2.10)", MACHINE_IS_SKELETON)
+GAME(2007, kinniku2, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Kinnikuman Muscle Grand Prix 2 (KN2 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2007, taiko10, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Taiko No Tatsujin 10 (T101001-NA-A)", MACHINE_IS_SKELETON)
+GAME(2008, gdvsgd, sys256, system256, system246, namcops2_state, 0, ROT0, "Capcom / Bandai", "Gundam vs. Gundam (GVS1 Ver. A)", MACHINE_IS_SKELETON)
+GAME(2009, gdvsgdnx, sys256, system256, system246, namcops2_state, 0, ROT0, "Capcom / Bandai", "Gundam vs. Gundam Next", MACHINE_IS_SKELETON)
// System Super 256
-GAME(2006, timecrs4, sys256, system256, system246, driver_device, 0, ROT0, "Namco", "Time Crisis 4", MACHINE_IS_SKELETON)
+GAME(2006, timecrs4, sys256, system256, system246, namcops2_state, 0, ROT0, "Namco", "Time Crisis 4", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp
index e1a4d295828..d137b515132 100644
--- a/src/mame/drivers/namcos1.cpp
+++ b/src/mame/drivers/namcos1.cpp
@@ -1012,7 +1012,7 @@ GFXDECODE_END
LPF info : Fco = 3.3KHz , g = -12dB/oct
*/
-static MACHINE_CONFIG_START( ns1, namcos1_state )
+static MACHINE_CONFIG_START( ns1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809,XTAL_49_152MHz/32)
diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp
index 69c5feacae2..cc8aea3fdf0 100644
--- a/src/mame/drivers/namcos10.cpp
+++ b/src/mame/drivers/namcos10.cpp
@@ -775,7 +775,7 @@ MACHINE_RESET_MEMBER(namcos10_state,namcos10)
i2c_bit = 0;
}
-static MACHINE_CONFIG_START( namcos10_memm, namcos10_state )
+static MACHINE_CONFIG_START( namcos10_memm )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL_101_4912MHz )
MCFG_CPU_PROGRAM_MAP( namcos10_memm_map )
@@ -799,7 +799,7 @@ static MACHINE_CONFIG_START( namcos10_memm, namcos10_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( namcos10_memn, namcos10_state )
+static MACHINE_CONFIG_START( namcos10_memn )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8606BQ, XTAL_101_4912MHz )
MCFG_CPU_PROGRAM_MAP( namcos10_memn_map )
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index 3f401291653..9e752c586c6 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -576,7 +576,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos11_state::mcu_adc_cb)
m_mcu->set_input_line(M37710_LINE_ADC, HOLD_LINE);
}
-static MACHINE_CONFIG_START( coh110, namcos11_state )
+static MACHINE_CONFIG_START( coh110 )
MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
MCFG_CPU_PROGRAM_MAP( namcos11_map )
@@ -1631,29 +1631,29 @@ ROM_END
9 = Location Test
*/
-GAME( 1994, tekken, 0, tekken, tekken, driver_device, 0, ROT0, "Namco", "Tekken (World, TE2/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, tekkenac, tekken, tekken, tekken, driver_device, 0, ROT0, "Namco", "Tekken (Asia, TE4/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, tekkenb, tekken, tekken, tekken, driver_device, 0, ROT0, "Namco", "Tekken (World, TE2/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, tekkenjb, tekken, tekken, tekken, driver_device, 0, ROT0, "Namco", "Tekken (Japan, TE1/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, tekken2, 0, tekken2, tekken, driver_device, 0, ROT0, "Namco", "Tekken 2 Ver.B (US, TES3/VER.D)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, tekken2ub, tekken2, tekken2o, tekken, driver_device, 0, ROT0, "Namco", "Tekken 2 Ver.B (US, TES3/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, tekken2b, tekken2, tekken2o, tekken, driver_device, 0, ROT0, "Namco", "Tekken 2 Ver.B (World, TES2/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, tekken2jc, tekken2, tekken2o, tekken, driver_device, 0, ROT0, "Namco", "Tekken 2 Ver.B (Japan, TES1/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, tekken2jb, tekken2, tekken2o, tekken, driver_device, 0, ROT0, "Namco", "Tekken 2 Ver.B (Japan, TES1/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, tekken2a, tekken2, tekken2o, tekken, driver_device, 0, ROT0, "Namco", "Tekken 2 (World, TES2/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, souledge, 0, souledge, souledge, driver_device, 0, ROT0, "Namco", "Soul Edge Ver. II (Asia, SO4/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, souledgeuc, souledge, souledge, souledge, driver_device, 0, ROT0, "Namco", "Soul Edge Ver. II (US, SO3/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, souledgea, souledge, souledge, souledge, driver_device, 0, ROT0, "Namco", "Soul Edge (World, SO2/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, souledgeua, souledge, souledge, souledge, driver_device, 0, ROT0, "Namco", "Soul Edge (US, SO3/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, souledgeja, souledge, souledge, souledge, driver_device, 0, ROT0, "Namco", "Soul Edge (Japan, SO1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, dunkmnia, 0, dunkmnia, namcos11, driver_device, 0, ROT0, "Namco", "Dunk Mania (World, DM2/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, dunkmniajc, dunkmnia, dunkmnia, namcos11, driver_device, 0, ROT0, "Namco", "Dunk Mania (Japan, DM1/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, xevi3dg, 0, xevi3dg, namcos11, driver_device, 0, ROT0, "Namco", "Xevious 3D/G (Japan, XV31/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, primglex, 0, primglex, tekken, driver_device, 0, ROT0, "Namco", "Prime Goal EX (Japan, PG1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, danceyes, 0, danceyes, namcos11, driver_device, 0, ROT0, "Namco", "Dancing Eyes (US, DC3/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, danceyesj, danceyes, danceyes, namcos11, driver_device, 0, ROT0, "Namco", "Dancing Eyes (Japan, DC1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, pocketrc, 0, pocketrc, pocketrc, driver_device, 0, ROT0, "Namco", "Pocket Racer (Japan, PKR1/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, starswep, 0, starswep, namcos11, driver_device, 0, ROT0, "Axela / Namco", "Star Sweep (World, STP2/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, starswepj, starswep, starswep, namcos11, driver_device, 0, ROT0, "Axela / Namco", "Star Sweep (Japan, STP1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, myangel3, 0, myangel3, myangel3, driver_device, 0, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel 3 (Japan, KQT1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, ptblank2ua, ptblank2, ptblank2ua, ptblank2ua, driver_device, 0, ROT0, "Namco", "Point Blank 2 (US, GNB3/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, tekken, 0, tekken, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken (World, TE2/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, tekkenac, tekken, tekken, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken (Asia, TE4/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, tekkenb, tekken, tekken, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken (World, TE2/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, tekkenjb, tekken, tekken, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken (Japan, TE1/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, tekken2, 0, tekken2, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken 2 Ver.B (US, TES3/VER.D)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, tekken2ub, tekken2, tekken2o, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken 2 Ver.B (US, TES3/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, tekken2b, tekken2, tekken2o, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken 2 Ver.B (World, TES2/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, tekken2jc, tekken2, tekken2o, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken 2 Ver.B (Japan, TES1/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, tekken2jb, tekken2, tekken2o, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken 2 Ver.B (Japan, TES1/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, tekken2a, tekken2, tekken2o, tekken, namcos11_state, 0, ROT0, "Namco", "Tekken 2 (World, TES2/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, souledge, 0, souledge, souledge, namcos11_state, 0, ROT0, "Namco", "Soul Edge Ver. II (Asia, SO4/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, souledgeuc, souledge, souledge, souledge, namcos11_state, 0, ROT0, "Namco", "Soul Edge Ver. II (US, SO3/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, souledgea, souledge, souledge, souledge, namcos11_state, 0, ROT0, "Namco", "Soul Edge (World, SO2/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, souledgeua, souledge, souledge, souledge, namcos11_state, 0, ROT0, "Namco", "Soul Edge (US, SO3/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, souledgeja, souledge, souledge, souledge, namcos11_state, 0, ROT0, "Namco", "Soul Edge (Japan, SO1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, dunkmnia, 0, dunkmnia, namcos11, namcos11_state, 0, ROT0, "Namco", "Dunk Mania (World, DM2/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, dunkmniajc, dunkmnia, dunkmnia, namcos11, namcos11_state, 0, ROT0, "Namco", "Dunk Mania (Japan, DM1/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, xevi3dg, 0, xevi3dg, namcos11, namcos11_state, 0, ROT0, "Namco", "Xevious 3D/G (Japan, XV31/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, primglex, 0, primglex, tekken, namcos11_state, 0, ROT0, "Namco", "Prime Goal EX (Japan, PG1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, danceyes, 0, danceyes, namcos11, namcos11_state, 0, ROT0, "Namco", "Dancing Eyes (US, DC3/VER.C)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, danceyesj, danceyes, danceyes, namcos11, namcos11_state, 0, ROT0, "Namco", "Dancing Eyes (Japan, DC1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, pocketrc, 0, pocketrc, pocketrc, namcos11_state, 0, ROT0, "Namco", "Pocket Racer (Japan, PKR1/VER.B)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, starswep, 0, starswep, namcos11, namcos11_state, 0, ROT0, "Axela / Namco", "Star Sweep (World, STP2/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, starswepj, starswep, starswep, namcos11, namcos11_state, 0, ROT0, "Axela / Namco", "Star Sweep (Japan, STP1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, myangel3, 0, myangel3, myangel3, namcos11_state, 0, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel 3 (Japan, KQT1/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, ptblank2ua, ptblank2, ptblank2ua, ptblank2ua, namcos11_state, 0, ROT0, "Namco", "Point Blank 2 (US, GNB3/VER.A)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index cff6874da6f..4dfed633d91 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1672,7 +1672,7 @@ DRIVER_INIT_MEMBER(namcos12_state,technodr)
*( (uint32_t *)( memregion( "sub" )->base() + 0x14b6 ) ) = 0;
}
-static MACHINE_CONFIG_START( coh700, namcos12_state )
+static MACHINE_CONFIG_START( coh700 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CXD8661R, XTAL_100MHz)
@@ -1681,7 +1681,7 @@ static MACHINE_CONFIG_START( coh700, namcos12_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&namcos12_state::namcos12_rom_read, (namcos12_state *) owner ))
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&namcos12_state::namcos12_rom_read, (namcos12_state *) owner ))
MCFG_CPU_ADD("sub", H83002, 16934400) // frequency based on research (superctr)
MCFG_CPU_PROGRAM_MAP(s12h8rwmap)
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index 620a0c12f6b..f738cb7d8dc 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -447,7 +447,7 @@ $a00000 checks have been seen on the Final Lap boards.
#include "emu.h"
#include "includes/namcos2.h"
-#include "includes/namcoic.h"
+#include "machine/namcoic.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
@@ -1681,7 +1681,7 @@ via software as INT1
/* */
/*************************************************************/
-static MACHINE_CONFIG_START( configure_c148_standard, namcos2_state )
+static MACHINE_CONFIG_START( configure_c148_standard )
MCFG_NAMCO_C148_ADD("master_intc","maincpu",true)
namco_c148_device::link_c148_device(*device,"slave_intc");
MCFG_NAMCO_C148_EXT1_CB(WRITE8(namcos2_state, sound_reset_w))
@@ -1713,7 +1713,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos2_state::screen_scanline)
}
}
-static MACHINE_CONFIG_START( default, namcos2_state )
+static MACHINE_CONFIG_START( default )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_default_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -1754,7 +1754,7 @@ static MACHINE_CONFIG_START( default, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -1767,7 +1767,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( default2, default )
MCFG_C140_REPLACE("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1781,7 +1781,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( default3, default )
MCFG_C140_REPLACE("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
@@ -1790,7 +1790,7 @@ static MACHINE_CONFIG_DERIVED( default3, default )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gollygho, namcos2_state )
+static MACHINE_CONFIG_START( gollygho )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_default_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -1831,7 +1831,7 @@ static MACHINE_CONFIG_START( gollygho, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -1840,7 +1840,7 @@ static MACHINE_CONFIG_START( gollygho, namcos2_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( finallap, namcos2_state )
+static MACHINE_CONFIG_START( finallap )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_finallap_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -1886,7 +1886,7 @@ static MACHINE_CONFIG_START( finallap, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -1895,7 +1895,7 @@ static MACHINE_CONFIG_START( finallap, namcos2_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sgunner, namcos2_state )
+static MACHINE_CONFIG_START( sgunner )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_sgunner_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -1938,7 +1938,7 @@ static MACHINE_CONFIG_START( sgunner, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -1947,7 +1947,7 @@ static MACHINE_CONFIG_START( sgunner, namcos2_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sgunner2, namcos2_state )
+static MACHINE_CONFIG_START( sgunner2 )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_sgunner_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -1995,7 +1995,7 @@ static MACHINE_CONFIG_START( sgunner2, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -2004,7 +2004,7 @@ static MACHINE_CONFIG_START( sgunner2, namcos2_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( luckywld, namcos2_state )
+static MACHINE_CONFIG_START( luckywld )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_luckywld_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -2050,7 +2050,7 @@ static MACHINE_CONFIG_START( luckywld, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.75)
@@ -2059,7 +2059,7 @@ static MACHINE_CONFIG_START( luckywld, namcos2_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( metlhawk, namcos2_state )
+static MACHINE_CONFIG_START( metlhawk )
MCFG_CPU_ADD("maincpu", M68000, M68K_CPU_CLOCK) /* 12.288MHz (49.152MHz OSC/4) */
MCFG_CPU_PROGRAM_MAP(master_metlhawk_am)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos2_state, screen_scanline, "screen", 0, 1)
@@ -2102,7 +2102,7 @@ static MACHINE_CONFIG_START( metlhawk, namcos2_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", C140_SOUND_CLOCK) /* 21.333kHz */
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM2)
+ MCFG_C140_BANK_TYPE(SYSTEM2)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index c6c75b97772..8c0e249eb63 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -520,7 +520,7 @@ Filter Board
*/
#include "emu.h"
#include "includes/namcos21.h"
-#include "includes/namcoic.h"
+#include "machine/namcoic.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
@@ -1870,7 +1870,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(namcos21_state::screen_scanline)
}
}
-static MACHINE_CONFIG_START( configure_c148_standard, namcos21_state )
+static MACHINE_CONFIG_START( configure_c148_standard )
MCFG_NAMCO_C148_ADD("master_intc","maincpu",true)
namco_c148_device::link_c148_device(*device,"slave_intc");
MCFG_NAMCO_C148_EXT1_CB(WRITE8(namcos21_state, sound_reset_w))
@@ -1881,7 +1881,7 @@ static MACHINE_CONFIG_START( configure_c148_standard, namcos21_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( namcos21, namcos21_state )
+static MACHINE_CONFIG_START( namcos21 )
MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
MCFG_CPU_PROGRAM_MAP(master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1)
@@ -1938,7 +1938,7 @@ static MACHINE_CONFIG_START( namcos21, namcos21_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", 8000000/374)
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM21)
+ MCFG_C140_BANK_TYPE(SYSTEM21)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -1948,7 +1948,7 @@ static MACHINE_CONFIG_START( namcos21, namcos21_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( driveyes, namcos21_state )
+static MACHINE_CONFIG_START( driveyes )
MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
MCFG_CPU_PROGRAM_MAP(driveyes_master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1)
@@ -1999,7 +1999,7 @@ static MACHINE_CONFIG_START( driveyes, namcos21_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", 8000000/374)
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM21)
+ MCFG_C140_BANK_TYPE(SYSTEM21)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
@@ -2008,7 +2008,7 @@ static MACHINE_CONFIG_START( driveyes, namcos21_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( winrun, namcos21_state )
+static MACHINE_CONFIG_START( winrun )
MCFG_CPU_ADD("maincpu", M68000,12288000) /* Master */
MCFG_CPU_PROGRAM_MAP(winrun_master_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos21_state, screen_scanline, "screen", 0, 1)
@@ -2062,7 +2062,7 @@ static MACHINE_CONFIG_START( winrun, namcos21_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_C140_ADD("c140", 8000000/374)
- MCFG_C140_BANK_TYPE(C140_TYPE_SYSTEM21)
+ MCFG_C140_BANK_TYPE(SYSTEM21)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index aae96ea6c37..87cc9311bad 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -3732,7 +3732,7 @@ void namcos22_state::machine_start()
}
// System 22
-static MACHINE_CONFIG_START( namcos22, namcos22_state )
+static MACHINE_CONFIG_START( namcos22 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
@@ -3798,7 +3798,7 @@ static MACHINE_CONFIG_DERIVED( cybrcomm, namcos22 )
MACHINE_CONFIG_END
// Super System 22
-static MACHINE_CONFIG_START( namcos22s, namcos22_state )
+static MACHINE_CONFIG_START( namcos22s )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020,SS22_MASTER_CLOCK/2)
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 96f27404130..a8dbbbd5e61 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -3536,7 +3536,7 @@ static GFXDECODE_START( namcos23 )
GFXDECODE_END
-static MACHINE_CONFIG_START( gorgon, namcos23_state )
+static MACHINE_CONFIG_START( gorgon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*4)
@@ -3602,7 +3602,7 @@ static MACHINE_CONFIG_START( gorgon, namcos23_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( s23, namcos23_state )
+static MACHINE_CONFIG_START( s23 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*4)
@@ -3688,7 +3688,7 @@ static MACHINE_CONFIG_DERIVED( gmen, s23 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ss23, namcos23_state )
+static MACHINE_CONFIG_START( ss23 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R4650BE, BUSCLOCK*5)
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index 23e7c0ab90a..8fc4bb8a0c5 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -1047,7 +1047,7 @@ GFXDECODE_END
/*******************************************************************/
-static MACHINE_CONFIG_START( hopmappy, namcos86_state )
+static MACHINE_CONFIG_START( hopmappy )
/* basic machine hardware */
MCFG_CPU_ADD("cpu1", M6809, XTAL_49_152MHz/32)
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index 91f1754a7ce..674014ca34d 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -453,7 +453,7 @@ static GFXDECODE_START( nanos )
GFXDECODE_ENTRY( "chargen", 0x0000, nanos_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( nanos, nanos_state )
+static MACHINE_CONFIG_START( nanos )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(nanos_mem)
@@ -525,5 +525,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, nanos, 0, 0, nanos, nanos, driver_device, 0, "Ingenieurhochschule fur Seefahrt Warnemunde/Wustrow", "NANOS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1985, nanos, 0, 0, nanos, nanos, nanos_state, 0, "Ingenieurhochschule fur Seefahrt Warnemunde/Wustrow", "NANOS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index ffce8aa370c..a6ec8b18b71 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -2675,7 +2675,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi)
*/
// TODO: merge with Dreamcast base machine
- MACHINE_CONFIG_START( naomi_aw_base, dc_state )
+ MACHINE_CONFIG_START( naomi_aw_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, CPU_CLOCK) // SH4!!!
MCFG_SH4_MD0(1)
@@ -2716,7 +2716,7 @@ MACHINE_RESET_MEMBER(naomi_state,naomi)
MCFG_AICARTC_ADD("aicartc", XTAL_32_768kHz )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( naomi_base, naomi_state )
+static MACHINE_CONFIG_START( naomi_base )
MCFG_FRAGMENT_ADD( naomi_aw_base )
MCFG_EEPROM_SERIAL_93C46_ADD("main_eeprom")
@@ -2786,13 +2786,13 @@ MACHINE_CONFIG_END
* Naomi 2 GD-Rom
*/
-static MACHINE_CONFIG_START( naomi2_base, naomi2_state )
+static MACHINE_CONFIG_START( naomi2_base )
MCFG_POWERVR2_ADD("powervr2_slave", WRITE8(dc_state, pvr_irq))
// TODO: ELAN device
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( naomi2gd, naomi2_state )
+static MACHINE_CONFIG_START( naomi2gd )
MCFG_FRAGMENT_ADD( naomigd )
MCFG_FRAGMENT_ADD( naomi2_base )
@@ -2804,7 +2804,7 @@ MACHINE_CONFIG_END
* Naomi 2, M1 sub-board
*/
-static MACHINE_CONFIG_START( naomi2m1, naomi2_state )
+static MACHINE_CONFIG_START( naomi2m1 )
MCFG_FRAGMENT_ADD( naomim1 )
MCFG_FRAGMENT_ADD( naomi2_base )
@@ -2816,7 +2816,7 @@ MACHINE_CONFIG_END
* Naomi 2, M2/3 sub-board
*/
-static MACHINE_CONFIG_START( naomi2m2, naomi2_state )
+static MACHINE_CONFIG_START( naomi2m2 )
MCFG_FRAGMENT_ADD( naomim2 )
MCFG_FRAGMENT_ADD( naomi2_base )
@@ -2828,7 +2828,7 @@ MACHINE_CONFIG_END
* Atomiswave
*/
-static MACHINE_CONFIG_START( aw_base, atomiswave_state )
+static MACHINE_CONFIG_START( aw_base )
MCFG_FRAGMENT_ADD( naomi_aw_base )
MCFG_CPU_MODIFY("maincpu")
@@ -9877,21 +9877,21 @@ ROM_END
/* Main board and game specific BIOS */
/* Naomi */ GAME( 1998, naomi, 0, naomi, naomi, naomi_state, naomi, ROT0, "Sega", "Naomi Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
-/* game */ GAME( 1998, hod2bios, 0, naomi, naomi, driver_device, 0, ROT0, "Sega", "Naomi House of the Dead 2 Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
-/* game */ GAME( 1999, f355dlx, 0, naomi, naomi, driver_device, 0, ROT0, "Sega", "Naomi Ferrari F355 Challenge (deluxe) Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
-/* game */ GAME( 1999, f355bios, 0, naomi, naomi, driver_device, 0, ROT0, "Sega", "Naomi Ferrari F355 Challenge (twin/deluxe) Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
-/* game */ GAME( 1999, airlbios, 0, naomi, naomi, driver_device, 0, ROT0, "Sega", "Naomi Airline Pilots (deluxe) Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
-/* Naomi2*/ GAME( 2001, naomi2, 0, naomi, naomi, driver_device, 0, ROT0, "Sega", "Naomi 2 Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
+/* game */ GAME( 1998, hod2bios, 0, naomi, naomi, naomi_state, 0, ROT0, "Sega", "Naomi House of the Dead 2 Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
+/* game */ GAME( 1999, f355dlx, 0, naomi, naomi, naomi_state, 0, ROT0, "Sega", "Naomi Ferrari F355 Challenge (deluxe) Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
+/* game */ GAME( 1999, f355bios, 0, naomi, naomi, naomi_state, 0, ROT0, "Sega", "Naomi Ferrari F355 Challenge (twin/deluxe) Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
+/* game */ GAME( 1999, airlbios, 0, naomi, naomi, naomi_state, 0, ROT0, "Sega", "Naomi Airline Pilots (deluxe) Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
+/* Naomi2*/ GAME( 2001, naomi2, 0, naomi, naomi, naomi_state, 0, ROT0, "Sega", "Naomi 2 Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
/* GDROM */ GAME( 2001, naomigd, 0, naomi, naomi, naomi_state, naomi, ROT0, "Sega", "Naomi GD-ROM Bios", GAME_FLAGS|MACHINE_IS_BIOS_ROOT )
/* 834-xxxxx (Sega Naomi cart with game specific BIOS sets) */
/* 13636-01 */ GAME( 1998, hotd2, hod2bios, naomim2, hotd2, naomi_state, hotd2, ROT0, "Sega", "House of the Dead 2 (USA)", GAME_FLAGS ) /* specific BIOS "hod2bios" needed */
/* 13636 */ GAME( 1998, hotd2o, hotd2, naomim2, hotd2, naomi_state, hotd2, ROT0, "Sega", "House of the Dead 2", GAME_FLAGS ) /* specific BIOS "hod2bios" needed */
/* none */ GAME( 1998, hotd2p, hotd2, naomim2, hotd2, naomi_state, hotd2, ROT0, "Sega", "House of the Dead 2 (prototype)", GAME_FLAGS ) /* specific BIOS "hod2bios" needed */
-/* 13842 */ GAME( 1999, f355, f355dlx, naomim2, naomi, driver_device, 0, ROT0, "Sega", "Ferrari F355 Challenge (deluxe, no link)", GAME_FLAGS ) /* specific BIOS "f355dlx" needed */
-/* 13950 */ GAME( 1999, f355twin, f355bios, naomim2, naomi, driver_device, 0, ROT0, "Sega", "Ferrari F355 Challenge (twin/deluxe)", GAME_FLAGS ) /* specific BIOS "f355bios" needed */
-/* none */ GAME( 2001, f355twn2, f355bios, naomim2, naomi, driver_device, 0, ROT0, "Sega", "Ferrari F355 Challenge 2 - International Course Edition (twin/deluxe)", GAME_FLAGS ) /* specific BIOS "f355bios" needed */
-/* ????? */ GAME( 1999, alpiltdx, airlbios, naomim2, naomi, driver_device, 0, ROT0, "Sega", "Airline Pilots (deluxe) (Rev B)", GAME_FLAGS ) /* specific BIOS "airlbios" needed */
+/* 13842 */ GAME( 1999, f355, f355dlx, naomim2, naomi, naomi_state, 0, ROT0, "Sega", "Ferrari F355 Challenge (deluxe, no link)", GAME_FLAGS ) /* specific BIOS "f355dlx" needed */
+/* 13950 */ GAME( 1999, f355twin, f355bios, naomim2, naomi, naomi_state, 0, ROT0, "Sega", "Ferrari F355 Challenge (twin/deluxe)", GAME_FLAGS ) /* specific BIOS "f355bios" needed */
+/* none */ GAME( 2001, f355twn2, f355bios, naomim2, naomi, naomi_state, 0, ROT0, "Sega", "Ferrari F355 Challenge 2 - International Course Edition (twin/deluxe)", GAME_FLAGS ) /* specific BIOS "f355bios" needed */
+/* ????? */ GAME( 1999, alpiltdx, airlbios, naomim2, naomi, naomi_state, 0, ROT0, "Sega", "Airline Pilots (deluxe) (Rev B)", GAME_FLAGS ) /* specific BIOS "airlbios" needed */
/* 840-xxxxx (Sega Naomi cart games)*/
/* 0001 */ GAME( 1998, dybbnao, naomi, naomim2, dybbnao, naomi_state, naomi, ROT0, "Sega", "Dynamite Baseball NAOMI (Japan)", GAME_FLAGS )
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index 2209cb369fe..b97516ab3b7 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -644,7 +644,7 @@ INPUT_PORTS_END
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( nascom1, nascom1_state )
+static MACHINE_CONFIG_START( nascom1 )
// main cpu
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 8)
MCFG_CPU_PROGRAM_MAP(nascom1_mem)
@@ -684,7 +684,7 @@ static MACHINE_CONFIG_START( nascom1, nascom1_state )
MCFG_SNAPSHOT_ADD("snapshot", nascom_state, nascom1, "nas", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( nascom2, nascom1, nascom2_state )
+static MACHINE_CONFIG_DERIVED( nascom2, nascom1 )
MCFG_CPU_REPLACE("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(nascom2_mem)
MCFG_CPU_IO_MAP(nascom2_io)
@@ -718,7 +718,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( nascom2, nascom1, nascom2_state )
MCFG_SOFTWARE_LIST_ADD("floppy_list", "nascom_flop")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( nascom2c, nascom2, nascom2_state )
+static MACHINE_CONFIG_DERIVED( nascom2c, nascom2 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(nascom2c_mem)
@@ -777,7 +777,7 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, nascom1, 0, 0, nascom1, nascom1, nascom_state, nascom, "Nascom Microcomputers", "Nascom 1", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1977, nascom1, 0, 0, nascom1, nascom1, nascom_state, nascom, "Nascom Microcomputers", "Nascom 1", MACHINE_NO_SOUND_HW )
COMP( 1979, nascom2, 0, 0, nascom2, nascom2, nascom2_state, nascom2, "Nascom Microcomputers", "Nascom 2", MACHINE_NO_SOUND_HW )
COMP( 1980, nascom2c, nascom2, 0, nascom2c, nascom2c, nascom2_state, nascom2c, "Nascom Microcomputers", "Nascom 2 (CP/M)", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp
index 0d60bc8e915..7f2145e5f66 100644
--- a/src/mame/drivers/naughtyb.cpp
+++ b/src/mame/drivers/naughtyb.cpp
@@ -406,7 +406,7 @@ static GFXDECODE_START( naughtyb )
GFXDECODE_END
-static MACHINE_CONFIG_START( naughtyb, naughtyb_state )
+static MACHINE_CONFIG_START( naughtyb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
@@ -443,7 +443,7 @@ MACHINE_CONFIG_END
/* Exactly the same but for certain address writes */
-static MACHINE_CONFIG_START( popflame, naughtyb_state )
+static MACHINE_CONFIG_START( popflame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
@@ -871,15 +871,15 @@ DRIVER_INIT_MEMBER(naughtyb_state,trvmstr)
}
-GAME( 1982, naughtyb, 0, naughtyb, naughtyb, driver_device, 0, ROT90, "Jaleco", "Naughty Boy", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, naughtyba,naughtyb, naughtyb, naughtyb, driver_device, 0, ROT90, "bootleg", "Naughty Boy (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, naughtybc,naughtyb, naughtyb, naughtyb, driver_device, 0, ROT90, "Jaleco (Cinematronics license)", "Naughty Boy (Cinematronics)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, naughtyb, 0, naughtyb, naughtyb, naughtyb_state, 0, ROT90, "Jaleco", "Naughty Boy", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, naughtyba,naughtyb, naughtyb, naughtyb, naughtyb_state, 0, ROT90, "bootleg", "Naughty Boy (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, naughtybc,naughtyb, naughtyb, naughtyb, naughtyb_state, 0, ROT90, "Jaleco (Cinematronics license)", "Naughty Boy (Cinematronics)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, popflame, 0, popflame, naughtyb, naughtyb_state, popflame, ROT90, "Jaleco", "Pop Flamer (protected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popflamea,popflame, popflame, naughtyb, driver_device, 0, ROT90, "Jaleco", "Pop Flamer (not protected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popflameb,popflame, popflame, naughtyb, driver_device, 0, ROT90, "Jaleco", "Pop Flamer (hack?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popflamen,popflame, naughtyb, naughtyb, driver_device, 0, ROT90, "Jaleco", "Pop Flamer (bootleg on Naughty Boy PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, trvmstr, 0, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, trvmstra, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, trvmstrb, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, trvmstrc, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, trvgns, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "bootleg", "Trivia Genius", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popflamea,popflame, popflame, naughtyb, naughtyb_state, 0, ROT90, "Jaleco", "Pop Flamer (not protected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popflameb,popflame, popflame, naughtyb, naughtyb_state, 0, ROT90, "Jaleco", "Pop Flamer (hack?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popflamen,popflame, naughtyb, naughtyb, naughtyb_state, 0, ROT90, "Jaleco", "Pop Flamer (bootleg on Naughty Boy PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, trvmstr, 0, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, trvmstra, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, trvmstrb, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, trvmstrc, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "Enerdyne Technologies Inc.", "Trivia Master (set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, trvgns, trvmstr, naughtyb, trvmstr, naughtyb_state, trvmstr, ROT90, "bootleg", "Trivia Genius", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp
index 78d7ce180de..46b3a3736ed 100644
--- a/src/mame/drivers/nbmj8688.cpp
+++ b/src/mame/drivers/nbmj8688.cpp
@@ -2442,7 +2442,7 @@ READ8_MEMBER(nbmj8688_state::dipsw2_r)
return m_nb1413m3->dipsw2_r(space,offset);
}
-static MACHINE_CONFIG_START( NBMJDRV_4096, nbmj8688_state )
+static MACHINE_CONFIG_START( NBMJDRV_4096 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
@@ -2596,7 +2596,7 @@ static MACHINE_CONFIG_DERIVED( mbmj_p16bit, NBMJDRV_65536 )
MCFG_VIDEO_START_OVERRIDE(nbmj8688_state,mbmj8688_pure_16bit)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mbmj_p16bit_LCD, nbmj8688_state )
+static MACHINE_CONFIG_START( mbmj_p16bit_LCD )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.00 MHz */
@@ -3777,53 +3777,53 @@ ROM_END
/* 8-bit palette */
-GAME( 1986, crystalg, 0, crystalg, crystalg, driver_device, 0, ROT0, "Nichibutsu", "Crystal Gal (Japan 860512)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, crystal2, 0, crystal2, crystal2, driver_device, 0, ROT0, "Nichibutsu", "Crystal Gal 2 (Japan 860620)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, nightlov, 0, nightlov, nightlov, driver_device, 0, ROT0, "Central Denshi", "Night Love (Japan 860705)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, apparel, 0, apparel, apparel, driver_device, 0, ROT0, "Central Denshi", "Apparel Night (Japan 860929)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, crystalg, 0, crystalg, crystalg, nbmj8688_state, 0, ROT0, "Nichibutsu", "Crystal Gal (Japan 860512)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, crystal2, 0, crystal2, crystal2, nbmj8688_state, 0, ROT0, "Nichibutsu", "Crystal Gal 2 (Japan 860620)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, nightlov, 0, nightlov, nightlov, nbmj8688_state, 0, ROT0, "Central Denshi", "Night Love (Japan 860705)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, apparel, 0, apparel, apparel, nbmj8688_state, 0, ROT0, "Central Denshi", "Apparel Night (Japan 860929)", MACHINE_SUPPORTS_SAVE )
/* hybrid 12-bit palette */
-GAME( 1986, citylove, 0, citylove, citylove, driver_device, 0, ROT0, "Nichibutsu", "City Love (Japan 860908)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, mcitylov, citylove, mcitylov, mcitylov, driver_device, 0, ROT0, "Nichibutsu", "City Love [BET] (Japan 860904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, secolove, 0, secolove, secolove, driver_device, 0, ROT0, "Nichibutsu", "Second Love (Japan 861201)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, barline, 0, barline, barline, driver_device, 0, ROT180, "Nichibutsu", "Barline (Japan?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, citylove, 0, citylove, citylove, nbmj8688_state, 0, ROT0, "Nichibutsu", "City Love (Japan 860908)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, mcitylov, citylove, mcitylov, mcitylov, nbmj8688_state, 0, ROT0, "Nichibutsu", "City Love [BET] (Japan 860904)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, secolove, 0, secolove, secolove, nbmj8688_state, 0, ROT0, "Nichibutsu", "Second Love (Japan 861201)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, barline, 0, barline, barline, nbmj8688_state, 0, ROT180, "Nichibutsu", "Barline (Japan?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* hybrid 16-bit palette */
-GAME( 1987, seiha, 0, seiha, seiha, driver_device, 0, ROT0, "Nichibutsu", "Seiha (Japan 870725)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, seiham, seiha, seiham, seiham, driver_device, 0, ROT0, "Nichibutsu", "Seiha [BET] (Japan 870723)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, mjgaiden, 0, mjgaiden, ojousan, driver_device, 0, ROT0, "Central Denshi", "Mahjong Gaiden [BET] (Japan 870803)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, iemoto, 0, iemoto, iemoto, driver_device, 0, ROT0, "Nichibutsu", "Iemoto (Japan 871020)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, iemotom, iemoto, iemotom, iemotom, driver_device, 0, ROT0, "Nichibutsu", "Iemoto [BET] (Japan 871118)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ryuuha, iemoto, ryuuha, ryuuha, driver_device, 0, ROT0, "Central Denshi", "Ryuuha [BET] (Japan 871027)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ojousan, 0, ojousan, ojousan, driver_device, 0, ROT0, "Nichibutsu", "Ojousan (Japan 871204)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ojousanm, ojousan, ojousanm, ojousanm, driver_device, 0, ROT0, "Nichibutsu", "Ojousan [BET] (Japan 870108)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, swinggal, 0, swinggal, ryuuha, driver_device, 0, ROT0, "Digital Denshi", "Swing Gal [BET] (Japan 871221)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, korinai, 0, korinai, korinai, driver_device, 0, ROT0, "Nichibutsu", "Mahjong-zukino Korinai Menmen (Japan 880425)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, korinaim, korinai, korinaim, korinaim, driver_device, 0, ROT0, "Nichibutsu", "Mahjong-zukino Korinai Menmen [BET] (Japan 880920)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, seiha, 0, seiha, seiha, nbmj8688_state, 0, ROT0, "Nichibutsu", "Seiha (Japan 870725)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, seiham, seiha, seiham, seiham, nbmj8688_state, 0, ROT0, "Nichibutsu", "Seiha [BET] (Japan 870723)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mjgaiden, 0, mjgaiden, ojousan, nbmj8688_state, 0, ROT0, "Central Denshi", "Mahjong Gaiden [BET] (Japan 870803)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, iemoto, 0, iemoto, iemoto, nbmj8688_state, 0, ROT0, "Nichibutsu", "Iemoto (Japan 871020)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, iemotom, iemoto, iemotom, iemotom, nbmj8688_state, 0, ROT0, "Nichibutsu", "Iemoto [BET] (Japan 871118)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ryuuha, iemoto, ryuuha, ryuuha, nbmj8688_state, 0, ROT0, "Central Denshi", "Ryuuha [BET] (Japan 871027)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ojousan, 0, ojousan, ojousan, nbmj8688_state, 0, ROT0, "Nichibutsu", "Ojousan (Japan 871204)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ojousanm, ojousan, ojousanm, ojousanm, nbmj8688_state, 0, ROT0, "Nichibutsu", "Ojousan [BET] (Japan 870108)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, swinggal, 0, swinggal, ryuuha, nbmj8688_state, 0, ROT0, "Digital Denshi", "Swing Gal [BET] (Japan 871221)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, korinai, 0, korinai, korinai, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong-zukino Korinai Menmen (Japan 880425)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, korinaim, korinai, korinaim, korinaim, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong-zukino Korinai Menmen [BET] (Japan 880920)", MACHINE_SUPPORTS_SAVE )
/* pure 16-bit palette (+ LCD in some) */
-GAME( 1987, housemnq, 0, housemnq, housemnq, driver_device, 0, ROT0, "Nichibutsu", "House Mannequin (Japan 870217)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, housemn2, 0, housemn2, housemn2, driver_device, 0, ROT0, "Nichibutsu", "House Mannequin Roppongi Live hen (Japan 870418)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, livegal, 0, livegal, livegal, driver_device, 0, ROT0, "Central Denshi", "Live Gal [BET] (Japan 870530)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, bijokkoy, 0, bijokkoy, bijokkoy, driver_device, 0, ROT0, "Nichibutsu", "Bijokko Yume Monogatari (Japan 870925)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bijokkog, 0, bijokkog, bijokkog, driver_device, 0, ROT0, "Nichibutsu", "Bijokko Gakuen (Japan 880116)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, orangec, 0, orangec, orangec, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maruhi Kagai Jugyou (Japan 880213)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, orangeci, orangec, orangeci, orangeci, driver_device, 0, ROT0, "Daiichi Denshi", "Orange Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880221)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vipclub, orangec, vipclub, vipclub, driver_device, 0, ROT0, "Daiichi Denshi", "Vip Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880310)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, housemnq, 0, housemnq, housemnq, nbmj8688_state, 0, ROT0, "Nichibutsu", "House Mannequin (Japan 870217)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, housemn2, 0, housemn2, housemn2, nbmj8688_state, 0, ROT0, "Nichibutsu", "House Mannequin Roppongi Live hen (Japan 870418)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, livegal, 0, livegal, livegal, nbmj8688_state, 0, ROT0, "Central Denshi", "Live Gal [BET] (Japan 870530)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, bijokkoy, 0, bijokkoy, bijokkoy, nbmj8688_state, 0, ROT0, "Nichibutsu", "Bijokko Yume Monogatari (Japan 870925)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bijokkog, 0, bijokkog, bijokkog, nbmj8688_state, 0, ROT0, "Nichibutsu", "Bijokko Gakuen (Japan 880116)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, orangec, 0, orangec, orangec, nbmj8688_state, 0, ROT0, "Daiichi Denshi", "Orange Club - Maruhi Kagai Jugyou (Japan 880213)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, orangeci, orangec, orangeci, orangeci, nbmj8688_state, 0, ROT0, "Daiichi Denshi", "Orange Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880221)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vipclub, orangec, vipclub, vipclub, nbmj8688_state, 0, ROT0, "Daiichi Denshi", "Vip Club - Maru-hi Ippatsu Kaihou [BET] (Japan 880310)", MACHINE_SUPPORTS_SAVE )
/* pure 12-bit palette */
-GAME( 1988, kaguya, 0, kaguya, kaguya, driver_device, 0, ROT0, "Miki Syouji", "Mahjong Kaguyahime [BET] (Japan 880521)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, kaguya2, 0, kaguya2, kaguya, nbmj8688_state, kaguya2, ROT0, "Miki Syouji", "Mahjong Kaguyahime Sono2 [BET] (Japan 890829)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, kaguya2f, kaguya2, kaguya2, kaguya, nbmj8688_state, kaguya2, ROT0, "Miki Syouji", "Mahjong Kaguyahime Sono2 Fukkokuban [BET] (Japan 010808)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kanatuen, 0, kanatuen, kanatuen, nbmj8688_state, kanatuen, ROT0, "Panac", "Kanatsuen no Onna [BET] (Japan 880905)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kyuhito, kanatuen, kyuhito, kyuhito, nbmj8688_state, kyuhito, ROT0, "Roller Tron", "Kyukyoku no Hito [BET] (Japan 880824)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, idhimitu, 0, idhimitu, idhimitu, nbmj8688_state, idhimitu, ROT0, "Digital Soft", "Idol no Himitsu [BET] (Japan 890304)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kaguya, 0, kaguya, kaguya, nbmj8688_state, 0, ROT0, "Miki Syouji", "Mahjong Kaguyahime [BET] (Japan 880521)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, kaguya2, 0, kaguya2, kaguya, nbmj8688_state, kaguya2, ROT0, "Miki Syouji", "Mahjong Kaguyahime Sono2 [BET] (Japan 890829)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, kaguya2f, kaguya2, kaguya2, kaguya, nbmj8688_state, kaguya2, ROT0, "Miki Syouji", "Mahjong Kaguyahime Sono2 Fukkokuban [BET] (Japan 010808)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kanatuen, 0, kanatuen, kanatuen, nbmj8688_state, kanatuen, ROT0, "Panac", "Kanatsuen no Onna [BET] (Japan 880905)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kyuhito, kanatuen, kyuhito, kyuhito, nbmj8688_state, kyuhito, ROT0, "Roller Tron", "Kyukyoku no Hito [BET] (Japan 880824)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, idhimitu, 0, idhimitu, idhimitu, nbmj8688_state, idhimitu, ROT0, "Digital Soft", "Idol no Himitsu [BET] (Japan 890304)", MACHINE_SUPPORTS_SAVE )
/* pure 12-bit palette + YM3812 instead of AY-3-8910 */
-GAME( 1988, mjsikaku, 0, mjsikaku, mjsikaku, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880908)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjsikakb, mjsikaku, mjsikaku, mjsikaku, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880722)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjsikakc, mjsikaku, mjsikaku, mjsikaku, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880806)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjsikakd, mjsikaku, mjsikaku, mjsikaku, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880802)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mmsikaku, mjsikaku, mmsikaku, mmsikaku, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Shikaku [BET] (Japan 880929)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, otonano, 0, otonano, otonano, driver_device, 0, ROT0, "Apple", "Otona no Mahjong (Japan 880628)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, mjcamera, 0, mjcamera, mjcamera, nbmj8688_state, mjcamera, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 1) (Japan 881109)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjsikaku, 0, mjsikaku, mjsikaku, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880908)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjsikakb, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880722)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjsikakc, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880806)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjsikakd, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880802)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mmsikaku, mjsikaku, mmsikaku, mmsikaku, nbmj8688_state, 0, ROT0, "Nichibutsu", "Mahjong Shikaku [BET] (Japan 880929)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, otonano, 0, otonano, otonano, nbmj8688_state, 0, ROT0, "Apple", "Otona no Mahjong (Japan 880628)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mjcamera, 0, mjcamera, mjcamera, nbmj8688_state, mjcamera, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 1) (Japan 881109)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp
index 7860e8a66b9..504be359ba7 100644
--- a/src/mame/drivers/nbmj8891.cpp
+++ b/src/mame/drivers/nbmj8891.cpp
@@ -2198,7 +2198,7 @@ static INPUT_PORTS_START( taiwanmb )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( gionbana, nbmj8891_state )
+static MACHINE_CONFIG_START( gionbana )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
@@ -3537,38 +3537,38 @@ ROM_START( hnageman )
ROM_END
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS)
-GAME( 1988, msjiken, 0, msjiken, msjiken, driver_device, 0, ROT270, "Nichibutsu", "Mahjong Satsujin Jiken (Japan 881017)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hanamomo, 0, hanamomo, hanamomo, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Hana no Momoko gumi (Japan 881201)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hanamomb, hanamomo, hanamomo, hanamomo, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Hana no Momoko gumi (Japan 881125)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, telmahjn, 0, telmahjn, msjiken, nbmj8891_state, telmahjn, ROT270, "Nichibutsu", "Telephone Mahjong (Japan 890111)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS)
+GAME( 1988, msjiken, 0, msjiken, msjiken, nbmj8891_state, 0, ROT270, "Nichibutsu", "Mahjong Satsujin Jiken (Japan 881017)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hanamomo, 0, hanamomo, hanamomo, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong Hana no Momoko gumi (Japan 881201)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hanamomb, hanamomo, hanamomo, hanamomo, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong Hana no Momoko gumi (Japan 881125)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, telmahjn, 0, telmahjn, msjiken, nbmj8891_state, telmahjn, ROT270, "Nichibutsu", "Telephone Mahjong (Japan 890111)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, gionbana, 0, gionbana, gionbana, nbmj8891_state, gionbana, ROT0, "Nichibutsu", "Gionbana (Japan 890120)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mgion, 0, mgion, mgion, driver_device, 0, ROT0, "Nichibutsu", "Gionbana [BET] (Japan 890207)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mgion, 0, mgion, mgion, nbmj8891_state, 0, ROT0, "Nichibutsu", "Gionbana [BET] (Japan 890207)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, omotesnd, 0, omotesnd, omotesnd, nbmj8891_state, omotesnd, ROT0, "Anime Tec", "Omotesandou (Japan 890215)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, abunai, 0, abunai, abunai, driver_device, 0, ROT0, "Green Soft", "Abunai Houkago - Mou Matenai (Japan 890325)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mjfocus, 0, mjfocus, mjfocus, nbmj8891_state, mjfocus, ROT0, "Nichibutsu", "Mahjong Focus (Japan 890313)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, abunai, 0, abunai, abunai, nbmj8891_state, 0, ROT0, "Green Soft", "Abunai Houkago - Mou Matenai (Japan 890325)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mjfocus, 0, mjfocus, mjfocus, nbmj8891_state, mjfocus, ROT0, "Nichibutsu", "Mahjong Focus (Japan 890313)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, mjfocusm, mjfocus, mjfocusm, mjfocusm, nbmj8891_state, mjfocusm, ROT0, "Nichibutsu", "Mahjong Focus [BET] (Japan 890510)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, peepshow, mjfocus, mjfocus, mjfocus, nbmj8891_state, mjfocus, ROT0, "AC", "Nozokimeguri Mahjong Peep Show (Japan 890404)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mjcamerb, 0, mjcamerb, mjcamerb, driver_device, 0, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 2) (Japan 881109)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mmcamera, mjcamerb, mmcamera, mmcamera, driver_device, 0, ROT0, "Miki Syouji", "Mahjong Camera Kozou [BET] (Japan 890509)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, scandal, 0, scandal, scandal, nbmj8891_state, scandal, ROT0, "Nichibutsu", "Scandal Mahjong (Japan 890213)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, scandalm, scandal, scandalm, scandalm, driver_device, 0, ROT0, "Nichibutsu", "Scandal Mahjong [BET] (Japan 890217)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, peepshow, mjfocus, mjfocus, mjfocus, nbmj8891_state, mjfocus, ROT0, "AC", "Nozokimeguri Mahjong Peep Show (Japan 890404)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mjcamerb, 0, mjcamerb, mjcamerb, nbmj8891_state, 0, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 2) (Japan 881109)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mmcamera, mjcamerb, mmcamera, mmcamera, nbmj8891_state, 0, ROT0, "Miki Syouji", "Mahjong Camera Kozou [BET] (Japan 890509)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, scandal, 0, scandal, scandal, nbmj8891_state, scandal, ROT0, "Nichibutsu", "Scandal Mahjong (Japan 890213)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, scandalm, scandal, scandalm, scandalm, nbmj8891_state, 0, ROT0, "Nichibutsu", "Scandal Mahjong [BET] (Japan 890217)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, mgmen89, 0, mgmen89, mgmen89, nbmj8891_state, mgmen89, ROT0, "Nichibutsu", "Mahjong G-MEN'89 (Japan 890425)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, mjnanpas, 0, mjnanpas, mjnanpas, nbmj8891_state, mjnanpas, ROT0, "Brooks", "Mahjong Nanpa Story (Japan 890713)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, mjnanpaa, mjnanpas, mjnanpas, mjnanpaa, nbmj8891_state, mjnanpas, ROT0, "Brooks", "Mahjong Nanpa Story (Japan 890712)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, mjnanpau, mjnanpas, mjnanpas, mjnanpas, nbmj8891_state, mjnanpas, ROT0, "Brooks", "Mahjong Nanpa Story (Ura) (Japan 890805)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bananadr, 0, bananadr, bananadr, driver_device, 0, ROT0, "Digital Soft", "Mahjong Banana Dream [BET] (Japan 891124)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mladyhtr, 0, mladyhtr, mladyhtr, driver_device, 0, ROT0, "Nichibutsu", "Mahjong The Lady Hunter (Japan 900509)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, chinmoku, 0, chinmoku, chinmoku, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Chinmoku no Hentai (Japan 900511)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, maiko, 0, maiko, maiko, driver_device, 0, ROT0, "Nichibutsu", "Maikobana (Japan 900802)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mmaiko, 0, mmaiko, mmaiko, driver_device, 0, ROT0, "Nichibutsu", "Maikobana [BET] (Japan 900911)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hnxmasev, 0, hnxmasev, maiko, driver_device, 0, ROT180, "Nichibutsu / AV Japan", "AV Hanafuda Hana no Christmas Eve (Japan 901204)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hnageman, 0, hnageman, maiko, driver_device, 0, ROT180, "Nichibutsu / AV Japan", "AV Hanafuda Hana no Ageman (Japan 900716)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, club90s, 0, club90s, club90s, driver_device, 0, ROT0, "Nichibutsu", "Mahjong CLUB 90's (set 1) (Japan 900919)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, club90sa, club90s, club90s, club90s, driver_device, 0, ROT0, "Nichibutsu", "Mahjong CLUB 90's (set 2) (Japan 900919)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, lovehous, club90s, lovehous, lovehous, driver_device, 0, ROT0, "Nichibutsu", "Mahjong Love House [BET] (Japan 901024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, hanaoji, 0, hanaoji, hanaoji, driver_device, 0, ROT0, "Nichibutsu", "Hana to Ojisan [BET] (ver 1.01, 1991/12/09)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, hanaojia, hanaoji, hanaoji, hanaoji, driver_device, 0, ROT0, "Nichibutsu", "Hana to Ojisan [BET] (ver 1.00, 1991/08/23)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, taiwanmb, 0, taiwanmb, taiwanmb, driver_device, 0, ROT0, "Miki Syouji", "Taiwan Mahjong [BET] (Japan 881208)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, pairsnb, 0, pairsnb, pairsnb, nbmj8891_state, pairsnb, ROT0, "Nichibutsu", "Pairs (Nichibutsu) (Japan 890822)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, pairsten, pairsnb, pairsten, pairsnb, nbmj8891_state, pairsten, ROT0, "System Ten", "Pairs (System Ten) (Japan 890826)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bananadr, 0, bananadr, bananadr, nbmj8891_state, 0, ROT0, "Digital Soft", "Mahjong Banana Dream [BET] (Japan 891124)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mladyhtr, 0, mladyhtr, mladyhtr, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong The Lady Hunter (Japan 900509)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, chinmoku, 0, chinmoku, chinmoku, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong Chinmoku no Hentai (Japan 900511)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, maiko, 0, maiko, maiko, nbmj8891_state, 0, ROT0, "Nichibutsu", "Maikobana (Japan 900802)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mmaiko, 0, mmaiko, mmaiko, nbmj8891_state, 0, ROT0, "Nichibutsu", "Maikobana [BET] (Japan 900911)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hnxmasev, 0, hnxmasev, maiko, nbmj8891_state, 0, ROT180, "Nichibutsu / AV Japan", "AV Hanafuda Hana no Christmas Eve (Japan 901204)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hnageman, 0, hnageman, maiko, nbmj8891_state, 0, ROT180, "Nichibutsu / AV Japan", "AV Hanafuda Hana no Ageman (Japan 900716)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, club90s, 0, club90s, club90s, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong CLUB 90's (set 1) (Japan 900919)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, club90sa, club90s, club90s, club90s, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong CLUB 90's (set 2) (Japan 900919)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, lovehous, club90s, lovehous, lovehous, nbmj8891_state, 0, ROT0, "Nichibutsu", "Mahjong Love House [BET] (Japan 901024)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, hanaoji, 0, hanaoji, hanaoji, nbmj8891_state, 0, ROT0, "Nichibutsu", "Hana to Ojisan [BET] (ver 1.01, 1991/12/09)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, hanaojia, hanaoji, hanaoji, hanaoji, nbmj8891_state, 0, ROT0, "Nichibutsu", "Hana to Ojisan [BET] (ver 1.00, 1991/08/23)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, taiwanmb, 0, taiwanmb, taiwanmb, nbmj8891_state, 0, ROT0, "Miki Syouji", "Taiwan Mahjong [BET] (Japan 881208)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, pairsnb, 0, pairsnb, pairsnb, nbmj8891_state, pairsnb, ROT0, "Nichibutsu", "Pairs (Nichibutsu) (Japan 890822)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, pairsten, pairsnb, pairsten, pairsnb, nbmj8891_state, pairsten, ROT0, "System Ten", "Pairs (System Ten) (Japan 890826)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp
index 2447bbe193e..ae72ebbf2fb 100644
--- a/src/mame/drivers/nbmj8900.cpp
+++ b/src/mame/drivers/nbmj8900.cpp
@@ -301,7 +301,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( ohpaipee, nbmj8900_state )
+static MACHINE_CONFIG_START( ohpaipee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 20000000/4) /* 5.00 MHz ? */
diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp
index a4e60c609d5..7126341d3bf 100644
--- a/src/mame/drivers/nbmj8991.cpp
+++ b/src/mame/drivers/nbmj8991.cpp
@@ -1314,7 +1314,7 @@ static INPUT_PORTS_START( av2mj2rg )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( nbmjdrv1, nbmj8991_state ) // galkoku
+static MACHINE_CONFIG_START( nbmjdrv1 ) // galkoku
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 25000000/5) /* 5.00 MHz ? */
@@ -1346,7 +1346,7 @@ static MACHINE_CONFIG_START( nbmjdrv1, nbmj8991_state ) // galkoku
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nbmjdrv2, nbmj8991_state ) // pstadium
+static MACHINE_CONFIG_START( nbmjdrv2 ) // pstadium
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 6000000/2) /* 3.00 MHz */
@@ -2104,22 +2104,22 @@ ROM_START( av2mj2rg )
ROM_END
-GAME( 1989, galkoku, 0, galkoku, galkoku, driver_device, 0, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Gal no Kokuhaku (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, hyouban, galkoku, hyouban, hyouban, driver_device, 0, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Hyouban Musume [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, galkoku, 0, galkoku, galkoku, nbmj8991_state, 0, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Gal no Kokuhaku (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, hyouban, galkoku, hyouban, hyouban, nbmj8991_state, 0, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Hyouban Musume [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, galkaika, 0, galkaika, galkaika, nbmj8991_state, galkaika, ROT180, "Nichibutsu / T.R.Tec", "Mahjong Gal no Kaika (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, tokyogal, 0, tokyogal, tokyogal, nbmj8991_state, tokyogal, ROT180, "Nichibutsu", "Tokyo Gal Zukan (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, tokimbsj, tokyogal, tokimbsj, tokimbsj, nbmj8991_state, tokimbsj, ROT180, "Nichibutsu", "Tokimeki Bishoujo [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mcontest, 0, mcontest, mcontest, driver_device, 0, ROT180, "Nichibutsu", "Miss Mahjong Contest (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, uchuuai, 0, uchuuai, uchuuai, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Uchuu yori Ai wo komete (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, triplew1, 0, triplew1, triplew1, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Triple Wars (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pstadium, 0, pstadium, pstadium, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Panic Stadium (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, triplew2, 0, triplew2, triplew1, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Triple Wars 2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ntopstar, 0, ntopstar, ntopstar, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Nerae! Top Star (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjlstory, 0, mjlstory, mjlstory, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Jikken Love Story (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ladymakr, mjlstory, mjlstory, finalbny, driver_device, 0, ROT180, "Nichibutsu", "Lady Maker [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vanilla, 0, vanilla, vanilla, driver_device, 0, ROT180, "Nichibutsu", "Mahjong Vanilla Syndrome (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mcontest, 0, mcontest, mcontest, nbmj8991_state, 0, ROT180, "Nichibutsu", "Miss Mahjong Contest (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, uchuuai, 0, uchuuai, uchuuai, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Uchuu yori Ai wo komete (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, triplew1, 0, triplew1, triplew1, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Triple Wars (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pstadium, 0, pstadium, pstadium, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Panic Stadium (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, triplew2, 0, triplew2, triplew1, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Triple Wars 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ntopstar, 0, ntopstar, ntopstar, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Nerae! Top Star (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjlstory, 0, mjlstory, mjlstory, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Jikken Love Story (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ladymakr, mjlstory, mjlstory, finalbny, nbmj8991_state, 0, ROT180, "Nichibutsu", "Lady Maker [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vanilla, 0, vanilla, vanilla, nbmj8991_state, 0, ROT180, "Nichibutsu", "Mahjong Vanilla Syndrome (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1991, finalbny, vanilla, finalbny, finalbny, nbmj8991_state, finalbny, ROT180, "Nichibutsu", "Mahjong Final Bunny [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, qmhayaku, 0, qmhayaku, qmhayaku, driver_device, 0, ROT180, "Nichibutsu", "Quiz-Mahjong Hayaku Yatteyo! (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjgottub, 0, mjgottub, mjgottub, driver_device, 0, ROT180, "Nichibutsu", "Medal Mahjong Gottsu ee-kanji [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, av2mj1bb, 0, av2mj1bb, av2mj1bb, driver_device, 0, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.1 Bay Bridge no Seijo (Japan)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, av2mj2rg, 0, av2mj2rg, av2mj2rg, driver_device, 0, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.2 Rouge no Kaori (Japan)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, qmhayaku, 0, qmhayaku, qmhayaku, nbmj8991_state, 0, ROT180, "Nichibutsu", "Quiz-Mahjong Hayaku Yatteyo! (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjgottub, 0, mjgottub, mjgottub, nbmj8991_state, 0, ROT180, "Nichibutsu", "Medal Mahjong Gottsu ee-kanji [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, av2mj1bb, 0, av2mj1bb, av2mj1bb, nbmj8991_state, 0, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.1 Bay Bridge no Seijo (Japan)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, av2mj2rg, 0, av2mj2rg, av2mj2rg, nbmj8991_state, 0, ROT0, "Miki Syouji / AV Japan", "AV2Mahjong No.2 Rouge no Kaori (Japan)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp
index 742075e35dd..6878e59bedc 100644
--- a/src/mame/drivers/nbmj9195.cpp
+++ b/src/mame/drivers/nbmj9195.cpp
@@ -2503,7 +2503,7 @@ static const z80_daisy_config daisy_chain_sound[] =
MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(nbmj9195_state, clutsel_w)) \
MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(nbmj9195_state, outcoin_flag_w))
-static MACHINE_CONFIG_START( NBMJDRV1_base, nbmj9195_state )
+static MACHINE_CONFIG_START( NBMJDRV1_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMPZ84C011, 12000000/2) /* TMPZ84C011, 6.00 MHz */
@@ -3432,39 +3432,39 @@ ROM_START( shabdama )
DISK_IMAGE_READONLY( "shabdama", 0, NO_DUMP )
ROM_END
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS
-GAME( 1992, mjuraden, 0, mjuraden, mjuraden, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yubis", "Mahjong Uranai Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, koinomp, 0, koinomp, koinomp, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi no Magic Potion (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, patimono, 0, patimono, patimono, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Pachinko Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, janbari, 0, janbari, janbari, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yubis / AV Japan", "Mahjong Janjan Baribari (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mjanbari, janbari, janbari, pachiten, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yubis / AV Japan", "Medal Mahjong Janjan Baribari [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mmehyou, 0, mmehyou, mmehyou, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Kawakusu", "Medal Mahjong Circuit no Mehyou [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ultramhm, 0, ultramhm, ultramhm, nbmj9195_state, nbmj9195, ROT0, "Apple", "Ultra Maru-hi Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, gal10ren, 0, gal10ren, gal10ren, nbmj9195_state, nbmj9195, ROT0, "Fujic", "Mahjong Gal 10-renpatsu (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, renaiclb, 0, renaiclb, renaiclb, nbmj9195_state, nbmj9195, ROT0, "Fujic", "Mahjong Ren-ai Club (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, mjlaman, 0, mjlaman, mjlaman, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / AV Japan", "Mahjong La Man (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, mkeibaou, 0, mkeibaou, patimono, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Keibaou (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, pachiten, 0, pachiten, pachiten, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / AV Japan / Miki Syouji", "Medal Mahjong Pachi-Slot Tengoku [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, sailorws, 0, sailorws, sailorws, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Sailor Wars (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, sailorwa, sailorws, sailorws, sailorws, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Sailor Wars (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, sailorwr, sailorws, sailorwr, sailorwr, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Sailor Wars-R [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, wcatcher, 0, otatidai, wcatcher, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Wakuwaku Catcher (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, jituroku, 0, jituroku, jituroku, nbmj9195_state, nbmj9195, ROT0, "Windom", "Jitsuroku Maru-chi Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, yosimoto, 0, yosimoto, yosimoto, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yoshimoto Kougyou", "Mahjong Yoshimoto Gekijou (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, yosimotm, yosimoto, yosimotm, yosimotm, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yoshimoto Kougyou", "Mahjong Yoshimoto Gekijou [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, psailor1, 0, psailor1, psailor1, nbmj9195_state, nbmj9195, ROT0, "Sphinx", "Bishoujo Janshi Pretty Sailor 18-kin (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, psailor2, 0, psailor2, psailor2, nbmj9195_state, nbmj9195, ROT0, "Sphinx", "Bishoujo Janshi Pretty Sailor 2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, otatidai, 0, otatidai, otatidai, nbmj9195_state, nbmj9195, ROT0, "Sphinx", "Disco Mahjong Otachidai no Okite (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, ngpgal, 0, ngpgal, ngpgal, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Nekketsu Grand-Prix Gal (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, mjgottsu, 0, mjgottsu, mjgottsu, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Gottsu ee-kanji (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, bakuhatu, mjgottsu, bakuhatu, bakuhatu, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Bakuhatsu Junjouden (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, cmehyou, 0, cmehyou, cmehyou, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Kawakusu", "Mahjong Circuit no Mehyou (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mjkoiura, 0, mjkoiura, mjkoiura, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi Uranai (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkoiuraa, mjkoiura, mkoiuraa, mjkoiura, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi Uranai (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1994, mscoutm, 0, mscoutm, mscoutm, nbmj9195_state, nbmj9195, ROT0, "Sphinx / AV Japan", "Mahjong Scout Man (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, imekura, 0, imekura, imekura, nbmj9195_state, nbmj9195, ROT0, "Sphinx / AV Japan", "Imekura Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, mjegolf, 0, mjegolf, mjegolf, nbmj9195_state, nbmj9195, ROT0, "Fujic / AV Japan", "Mahjong Erotica Golf (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 199?, shabdama, 0, shabdama, mjuraden,nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "LD Mahjong #4 Shabon-Dama", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS
+GAME( 1992, mjuraden, 0, mjuraden, mjuraden, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yubis", "Mahjong Uranai Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, koinomp, 0, koinomp, koinomp, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi no Magic Potion (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, patimono, 0, patimono, patimono, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Pachinko Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, janbari, 0, janbari, janbari, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yubis / AV Japan", "Mahjong Janjan Baribari (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mjanbari, janbari, janbari, pachiten, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yubis / AV Japan", "Medal Mahjong Janjan Baribari [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mmehyou, 0, mmehyou, mmehyou, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Kawakusu", "Medal Mahjong Circuit no Mehyou [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ultramhm, 0, ultramhm, ultramhm, nbmj9195_state, nbmj9195, ROT0, "Apple", "Ultra Maru-hi Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, gal10ren, 0, gal10ren, gal10ren, nbmj9195_state, nbmj9195, ROT0, "Fujic", "Mahjong Gal 10-renpatsu (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, renaiclb, 0, renaiclb, renaiclb, nbmj9195_state, nbmj9195, ROT0, "Fujic", "Mahjong Ren-ai Club (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, mjlaman, 0, mjlaman, mjlaman, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / AV Japan", "Mahjong La Man (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, mkeibaou, 0, mkeibaou, patimono, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Keibaou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, pachiten, 0, pachiten, pachiten, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / AV Japan / Miki Syouji", "Medal Mahjong Pachi-Slot Tengoku [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sailorws, 0, sailorws, sailorws, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Sailor Wars (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sailorwa, sailorws, sailorws, sailorws, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Sailor Wars (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sailorwr, sailorws, sailorwr, sailorwr, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Sailor Wars-R [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, wcatcher, 0, otatidai, wcatcher, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Wakuwaku Catcher (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, jituroku, 0, jituroku, jituroku, nbmj9195_state, nbmj9195, ROT0, "Windom", "Jitsuroku Maru-chi Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, yosimoto, 0, yosimoto, yosimoto, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yoshimoto Kougyou", "Mahjong Yoshimoto Gekijou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, yosimotm, yosimoto, yosimotm, yosimotm, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Yoshimoto Kougyou", "Mahjong Yoshimoto Gekijou [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, psailor1, 0, psailor1, psailor1, nbmj9195_state, nbmj9195, ROT0, "Sphinx", "Bishoujo Janshi Pretty Sailor 18-kin (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, psailor2, 0, psailor2, psailor2, nbmj9195_state, nbmj9195, ROT0, "Sphinx", "Bishoujo Janshi Pretty Sailor 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, otatidai, 0, otatidai, otatidai, nbmj9195_state, nbmj9195, ROT0, "Sphinx", "Disco Mahjong Otachidai no Okite (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, ngpgal, 0, ngpgal, ngpgal, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Nekketsu Grand-Prix Gal (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, mjgottsu, 0, mjgottsu, mjgottsu, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Gottsu ee-kanji (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bakuhatu, mjgottsu, bakuhatu, bakuhatu, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Bakuhatsu Junjouden (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, cmehyou, 0, cmehyou, cmehyou, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu / Kawakusu", "Mahjong Circuit no Mehyou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mjkoiura, 0, mjkoiura, mjkoiura, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi Uranai (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkoiuraa, mjkoiura, mkoiuraa, mjkoiura, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi Uranai (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1994, mscoutm, 0, mscoutm, mscoutm, nbmj9195_state, nbmj9195, ROT0, "Sphinx / AV Japan", "Mahjong Scout Man (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, imekura, 0, imekura, imekura, nbmj9195_state, nbmj9195, ROT0, "Sphinx / AV Japan", "Imekura Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, mjegolf, 0, mjegolf, mjegolf, nbmj9195_state, nbmj9195, ROT0, "Fujic / AV Japan", "Mahjong Erotica Golf (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 199?, shabdama, 0, shabdama, mjuraden, nbmj9195_state, nbmj9195, ROT0, "Nichibutsu", "LD Mahjong #4 Shabon-Dama", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp
index f63b8650666..09b51f0b14f 100644
--- a/src/mame/drivers/nc.cpp
+++ b/src/mame/drivers/nc.cpp
@@ -1396,7 +1396,7 @@ INPUT_PORTS_END
/**********************************************************************************************************/
-static MACHINE_CONFIG_START( nc100, nc_state )
+static MACHINE_CONFIG_START( nc100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, /*6000000*/ 4606000) /* Russell Marks says this is more accurate */
MCFG_CPU_PROGRAM_MAP(nc_map)
@@ -1549,7 +1549,7 @@ ROM_START(nc200)
ROM_LOAD("nc200.rom", 0x010000, 0x080000, CRC(bb8180e7) SHA1(fb5c93b0a3e199202c6a12548d2617f7a09bae47))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
COMP( 1992, nc100, 0, 0, nc100, nc100, nc_state, nc, "Amstrad plc", "NC100", 0 )
COMP( 1992, dw225, nc100, 0, nc100, nc100, nc_state, nc, "NTS Computer Systems", "DreamWriter 225", 0 )
COMP( 1992, nc150, nc100, 0, nc100, nc100, nc_state, nc, "Amstrad plc", "NC150", 0 )
diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp
index faea4873a3a..92720ef75ce 100644
--- a/src/mame/drivers/nemesis.cpp
+++ b/src/mame/drivers/nemesis.cpp
@@ -218,10 +218,10 @@ WRITE8_MEMBER(nemesis_state::nemesis_filter_w)
{
int C1 = /* offset & 0x1000 ? 4700 : */ 0; // is this right? 4.7uF seems too large
int C2 = offset & 0x0800 ? 33 : 0; // 0.033uF = 33 nF
- m_filter1->filter_rc_set_RC(FLT_RC_LOWPASS, (AY8910_INTERNAL_RESISTANCE + 12000) / 3, 0, 0, CAP_N(C1)); // unused?
- m_filter2->filter_rc_set_RC(FLT_RC_LOWPASS, AY8910_INTERNAL_RESISTANCE + 1000, 10000, 0, CAP_N(C2));
- m_filter3->filter_rc_set_RC(FLT_RC_LOWPASS, AY8910_INTERNAL_RESISTANCE + 1000, 10000, 0, CAP_N(C2));
- m_filter4->filter_rc_set_RC(FLT_RC_LOWPASS, AY8910_INTERNAL_RESISTANCE + 1000, 10000, 0, CAP_N(C2));
+ m_filter1->filter_rc_set_RC(filter_rc_device::LOWPASS, (AY8910_INTERNAL_RESISTANCE + 12000) / 3, 0, 0, CAP_N(C1)); // unused?
+ m_filter2->filter_rc_set_RC(filter_rc_device::LOWPASS, AY8910_INTERNAL_RESISTANCE + 1000, 10000, 0, CAP_N(C2));
+ m_filter3->filter_rc_set_RC(filter_rc_device::LOWPASS, AY8910_INTERNAL_RESISTANCE + 1000, 10000, 0, CAP_N(C2));
+ m_filter4->filter_rc_set_RC(filter_rc_device::LOWPASS, AY8910_INTERNAL_RESISTANCE + 1000, 10000, 0, CAP_N(C2));
// konamigt also uses bits 0x0018, what are they for?
}
@@ -1485,7 +1485,7 @@ void nemesis_state::machine_reset()
m_irq_port_last = 0;
}
-static MACHINE_CONFIG_START( nemesis, nemesis_state )
+static MACHINE_CONFIG_START( nemesis )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
@@ -1542,7 +1542,7 @@ static MACHINE_CONFIG_START( nemesis, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gx400, nemesis_state )
+static MACHINE_CONFIG_START( gx400 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
@@ -1603,7 +1603,7 @@ static MACHINE_CONFIG_START( gx400, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( konamigt, nemesis_state )
+static MACHINE_CONFIG_START( konamigt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
@@ -1659,7 +1659,7 @@ static MACHINE_CONFIG_START( konamigt, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rf2_gx400, nemesis_state )
+static MACHINE_CONFIG_START( rf2_gx400 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
@@ -1720,7 +1720,7 @@ static MACHINE_CONFIG_START( rf2_gx400, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( salamand, nemesis_state )
+static MACHINE_CONFIG_START( salamand )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
@@ -1771,7 +1771,7 @@ static MACHINE_CONFIG_START( salamand, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( blkpnthr, nemesis_state )
+static MACHINE_CONFIG_START( blkpnthr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
@@ -1817,7 +1817,7 @@ static MACHINE_CONFIG_START( blkpnthr, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( citybomb, nemesis_state )
+static MACHINE_CONFIG_START( citybomb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
@@ -1867,7 +1867,7 @@ static MACHINE_CONFIG_START( citybomb, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nyanpani, nemesis_state )
+static MACHINE_CONFIG_START( nyanpani )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216 MHz? */
@@ -1917,7 +1917,7 @@ static MACHINE_CONFIG_START( nyanpani, nemesis_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hcrash, nemesis_state )
+static MACHINE_CONFIG_START( hcrash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/3) /* 6.144MHz */
@@ -2379,24 +2379,24 @@ ROM_END
-GAME( 1985, nemesis, 0, nemesis, nemesis, driver_device, 0, ROT0, "Konami", "Nemesis (ROM version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, nemesisuk, nemesis, nemesis, nemesuk, driver_device, 0, ROT0, "Konami", "Nemesis (World?, ROM version)", MACHINE_SUPPORTS_SAVE )
-GAMEL(1985, konamigt, 0, konamigt, konamigt, driver_device, 0, ROT0, "Konami", "Konami GT", MACHINE_SUPPORTS_SAVE, layout_konamigt )
-GAME( 1985, rf2, konamigt, rf2_gx400, rf2, driver_device, 0, ROT0, "Konami", "Konami RF2 - Red Fighter", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, twinbee, 0, gx400, twinbee, driver_device, 0, ROT90, "Konami", "TwinBee (ROM version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gradius, nemesis, gx400, gradius, driver_device, 0, ROT0, "Konami", "Gradius (Japan, ROM version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, gwarrior, 0, gx400, gwarrior, driver_device, 0, ROT0, "Konami", "Galactic Warriors", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, salamand, 0, salamand, salamand, driver_device, 0, ROT0, "Konami", "Salamander (version D)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, salamandj, salamand, salamand, salamand, driver_device, 0, ROT0, "Konami", "Salamander (version J)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, lifefrce, salamand, salamand, salamand, driver_device, 0, ROT0, "Konami", "Lifeforce (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, lifefrcej, salamand, salamand, lifefrcj, driver_device, 0, ROT0, "Konami", "Lifeforce (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blkpnthr, 0, blkpnthr, blkpnthr, driver_device, 0, ROT0, "Konami", "Black Panther", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, citybomb, 0, citybomb, citybomb, driver_device, 0, ROT270, "Konami", "City Bomber (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, citybombj, citybomb, citybomb, citybomb, driver_device, 0, ROT270, "Konami", "City Bomber (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, hcrash, 0, hcrash, hcrash, driver_device, 0, ROT0, "Konami", "Hyper Crash (version D)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, hcrashc, hcrash, hcrash, hcrash, driver_device, 0, ROT0, "Konami", "Hyper Crash (version C)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kittenk, 0, nyanpani, nyanpani, driver_device, 0, ROT0, "Konami", "Kitten Kaboodle", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, nyanpani, kittenk, nyanpani, nyanpani, driver_device, 0, ROT0, "Konami", "Nyan Nyan Panic (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, nemesis, 0, nemesis, nemesis, nemesis_state, 0, ROT0, "Konami", "Nemesis (ROM version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, nemesisuk, nemesis, nemesis, nemesuk, nemesis_state, 0, ROT0, "Konami", "Nemesis (World?, ROM version)", MACHINE_SUPPORTS_SAVE )
+GAMEL(1985, konamigt, 0, konamigt, konamigt, nemesis_state, 0, ROT0, "Konami", "Konami GT", MACHINE_SUPPORTS_SAVE, layout_konamigt )
+GAME( 1985, rf2, konamigt, rf2_gx400, rf2, nemesis_state, 0, ROT0, "Konami", "Konami RF2 - Red Fighter", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, twinbee, 0, gx400, twinbee, nemesis_state, 0, ROT90, "Konami", "TwinBee (ROM version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gradius, nemesis, gx400, gradius, nemesis_state, 0, ROT0, "Konami", "Gradius (Japan, ROM version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, gwarrior, 0, gx400, gwarrior, nemesis_state, 0, ROT0, "Konami", "Galactic Warriors", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, salamand, 0, salamand, salamand, nemesis_state, 0, ROT0, "Konami", "Salamander (version D)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, salamandj, salamand, salamand, salamand, nemesis_state, 0, ROT0, "Konami", "Salamander (version J)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, lifefrce, salamand, salamand, salamand, nemesis_state, 0, ROT0, "Konami", "Lifeforce (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, lifefrcej, salamand, salamand, lifefrcj, nemesis_state, 0, ROT0, "Konami", "Lifeforce (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blkpnthr, 0, blkpnthr, blkpnthr, nemesis_state, 0, ROT0, "Konami", "Black Panther", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, citybomb, 0, citybomb, citybomb, nemesis_state, 0, ROT270, "Konami", "City Bomber (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, citybombj, citybomb, citybomb, citybomb, nemesis_state, 0, ROT270, "Konami", "City Bomber (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hcrash, 0, hcrash, hcrash, nemesis_state, 0, ROT0, "Konami", "Hyper Crash (version D)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hcrashc, hcrash, hcrash, hcrash, nemesis_state, 0, ROT0, "Konami", "Hyper Crash (version C)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kittenk, 0, nyanpani, nyanpani, nemesis_state, 0, ROT0, "Konami", "Kitten Kaboodle", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, nyanpani, kittenk, nyanpani, nyanpani, nemesis_state, 0, ROT0, "Konami", "Nyan Nyan Panic (Japan)", MACHINE_SUPPORTS_SAVE )
/*
@@ -2665,7 +2665,7 @@ Manual says SW4, 5, 6, 7 & 8 not used, leave off
*/
-static MACHINE_CONFIG_START( bubsys, nemesis_state )
+static MACHINE_CONFIG_START( bubsys )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,18432000/2) /* 9.216MHz */
@@ -2747,4 +2747,4 @@ ROM_START( bubsys )
ROM_LOAD( "sram2.ic3", 0x2000, 0x2000, CRC(dda768be) SHA1(e98bae3ccf63eb67193346e9c40257a3ddb88e59) )
ROM_END
-GAME( 1985, bubsys, 0, bubsys, nemesis, driver_device, 0, ROT0, "Konami", "Bubble System BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
+GAME( 1985, bubsys, 0, bubsys, nemesis, nemesis_state, 0, ROT0, "Konami", "Bubble System BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index dc42437997a..d0129e8374c 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -472,6 +472,9 @@
#include "neogeo.lh"
+#define VERBOSE (0)
+
+
#define LOG_VIDEO_SYSTEM (0)
#define LOG_MAIN_CPU_BANKING (0)
#define LOG_AUDIO_CPU_BANKING (0)
@@ -1639,7 +1642,7 @@ INPUT_CHANGED_MEMBER(aes_state::aes_jp1)
*
*************************************/
-MACHINE_CONFIG_START( neogeo_base, neogeo_state )
+MACHINE_CONFIG_START( neogeo_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, NEOGEO_MAIN_CPU_CLOCK)
@@ -1773,7 +1776,7 @@ MACHINE_START_MEMBER(aes_state, aes)
}
-static MACHINE_CONFIG_DERIVED_CLASS( aes, neogeo_base, aes_state )
+static MACHINE_CONFIG_DERIVED( aes, neogeo_base )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(aes_main_map)
@@ -2038,8 +2041,8 @@ DRIVER_INIT_MEMBER(neogeo_state, neogeo)
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT */
-CONS( 1990, neogeo, 0, 0, mvs, neogeo_6slot, neogeo_state, neogeo, "SNK", "Neo-Geo", MACHINE_IS_BIOS_ROOT | MACHINE_SUPPORTS_SAVE )
-CONS( 1990, aes, 0, 0, aes, aes, driver_device, 0, "SNK", "Neo-Geo AES", MACHINE_SUPPORTS_SAVE )
+CONS( 1990, neogeo, 0, 0, mvs, neogeo_6slot, neogeo_state, neogeo, "SNK", "Neo-Geo", MACHINE_IS_BIOS_ROOT | MACHINE_SUPPORTS_SAVE )
+CONS( 1990, aes, 0, 0, aes, aes, aes_state, 0, "SNK", "Neo-Geo AES", MACHINE_SUPPORTS_SAVE )
// Include standalone drivers for the single games
diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp
index 5c109a47820..1da84ea7094 100644
--- a/src/mame/drivers/neogeocd.cpp
+++ b/src/mame/drivers/neogeocd.cpp
@@ -1036,7 +1036,7 @@ uint32_t ngcd_state::screen_update_neocd(screen_device &screen, bitmap_rgb32 &bi
}
-static MACHINE_CONFIG_DERIVED_CLASS( neocd, neogeo_base, ngcd_state )
+static MACHINE_CONFIG_DERIVED( neocd, neogeo_base )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(neocd_main_map)
@@ -1139,9 +1139,8 @@ DRIVER_INIT_MEMBER(ngcd_state,neocdzj)
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1996, neocdz, 0, 0, neocd, neocd, ngcd_state, neocdz, "SNK", "Neo-Geo CDZ (US)", 0 ) // the CDZ is the newer model
-CONS( 1996, neocdzj, neocdz, 0, neocd, neocd, ngcd_state, neocdzj, "SNK", "Neo-Geo CDZ (Japan)", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1996, neocdz, 0, 0, neocd, neocd, ngcd_state, neocdz, "SNK", "Neo-Geo CDZ (US)", 0 ) // the CDZ is the newer model
+CONS( 1996, neocdzj, neocdz, 0, neocd, neocd, ngcd_state, neocdzj, "SNK", "Neo-Geo CDZ (Japan)", 0 )
-
-CONS( 1994, neocd, neocdz, 0, neocd, neocd, driver_device, 0, "SNK", "Neo-Geo CD", MACHINE_NOT_WORKING ) // older model, ignores disc protections?
+CONS( 1994, neocd, neocdz, 0, neocd, neocd, ngcd_state, 0, "SNK", "Neo-Geo CD", MACHINE_NOT_WORKING ) // older model, ignores disc protections?
diff --git a/src/mame/drivers/neopcb.cpp b/src/mame/drivers/neopcb.cpp
index e85e33ac68a..ae05d6209f0 100644
--- a/src/mame/drivers/neopcb.cpp
+++ b/src/mame/drivers/neopcb.cpp
@@ -29,7 +29,7 @@ void neopcb_state::neopcb_postload()
set_outputs();
}
-static MACHINE_CONFIG_DERIVED_CLASS( neopcb, neogeo_arcade, neopcb_state )
+static MACHINE_CONFIG_DERIVED( neopcb, neogeo_arcade )
MCFG_CMC_PROT_ADD("cmc50")
MCFG_PCM2_PROT_ADD("pcm2")
MCFG_PVC_PROT_ADD("pvc")
diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp
index 4eb4f0bdafc..51fa4151b53 100644
--- a/src/mame/drivers/neoprint.cpp
+++ b/src/mame/drivers/neoprint.cpp
@@ -45,7 +45,8 @@ public:
m_screen(*this, "screen"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch"),
- m_generic_paletteram_16(*this, "paletteram") { }
+ m_generic_paletteram_16(*this, "paletteram")
+ { }
required_shared_ptr<uint16_t> m_npvidram;
required_shared_ptr<uint16_t> m_npvidregs;
@@ -477,7 +478,7 @@ void neoprint_state::machine_start()
m_upd4990a->c2_w(1);
}
-static MACHINE_CONFIG_START( neoprint, neoprint_state )
+static MACHINE_CONFIG_START( neoprint )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(neoprint_map)
MCFG_CPU_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */
@@ -520,7 +521,7 @@ MACHINE_RESET_MEMBER(neoprint_state,nprsp)
m_bank_val = 0;
}
-static MACHINE_CONFIG_START( nprsp, neoprint_state )
+static MACHINE_CONFIG_START( nprsp )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(nprsp_map)
MCFG_CPU_PERIODIC_INT_DRIVER(neoprint_state, irq3_line_hold, 45) /* camera / printer irq, unknown timing */
@@ -672,7 +673,7 @@ DRIVER_INIT_MEMBER(neoprint_state,unkneo)
ROM[0x12c2/2] = 0x4e71;
}
-GAME( 1996, neoprint, 0, neoprint, neoprint, neoprint_state, unkneo, ROT0, "SNK", "Neo Print (Japan) (T2d)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1996, npcartv1, 0, neoprint, neoprint, neoprint_state, npcartv1, ROT0, "SNK", "Neo Print V1 (World) (E1a)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1998, 98best44, 0, neoprint, neoprint, neoprint_state, 98best44, ROT0, "SNK", "Neo Print - '98 NeoPri Best 44 (Japan) (T4i 3.07)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1996, nprsp, 0, nprsp, neoprint, neoprint_state, nprsp, ROT0, "SNK", "NeopriSP Retro Collection (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1996, neoprint, 0, neoprint, neoprint, neoprint_state, unkneo, ROT0, "SNK", "Neo Print (Japan) (T2d)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1996, npcartv1, 0, neoprint, neoprint, neoprint_state, npcartv1, ROT0, "SNK", "Neo Print V1 (World) (E1a)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1998, 98best44, 0, neoprint, neoprint, neoprint_state, 98best44, ROT0, "SNK", "Neo Print - '98 NeoPri Best 44 (Japan) (T4i 3.07)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1996, nprsp, 0, nprsp, neoprint, neoprint_state, nprsp, ROT0, "SNK", "NeopriSP Retro Collection (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp
index 952291942ae..31d1195f6bf 100644
--- a/src/mame/drivers/neptunp2.cpp
+++ b/src/mame/drivers/neptunp2.cpp
@@ -92,7 +92,7 @@ static GFXDECODE_START( neptunp2 )
// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( neptunp2, neptunp2_state )
+static MACHINE_CONFIG_START( neptunp2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I80188,20000000) // N80C188-20 AMD
@@ -139,4 +139,4 @@ ROM_START( neptunp2 )
ROM_END
-GAME( 199?, neptunp2, 0, neptunp2, neptunp2, driver_device, 0, ROT0, "Unidesa?", "Neptune's Pearls 2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, neptunp2, 0, neptunp2, neptunp2, neptunp2_state, 0, ROT0, "Unidesa?", "Neptune's Pearls 2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp
index 3c5989f5f8e..0501fe1cc3a 100644
--- a/src/mame/drivers/nes.cpp
+++ b/src/mame/drivers/nes.cpp
@@ -54,7 +54,7 @@ void nes_state::ppu_nmi(int *ppu_regs)
}
-static MACHINE_CONFIG_START( nes, nes_state )
+static MACHINE_CONFIG_START( nes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
MCFG_CPU_PROGRAM_MAP(nes_map)
@@ -65,7 +65,7 @@ static MACHINE_CONFIG_START( nes, nes_state )
// the number of cycles in each scanline for the PPU scanline timer. Since the PPU has 20 vblank scanlines + 2
// non-rendering scanlines, we compensate. This ends up being 2500 cycles for the non-rendering portion, 2273
// cycles for the actual vblank period.
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(NTSC_APU_CLOCK/1000000)) * (PPU_VBLANK_LAST_SCANLINE_NTSC-PPU_VBLANK_FIRST_SCANLINE+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(NTSC_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_NTSC-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
MCFG_SCREEN_SIZE(32*8, 262)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MCFG_SCREEN_UPDATE_DRIVER(nes_state, screen_update_nes)
@@ -110,7 +110,7 @@ static MACHINE_CONFIG_DERIVED( nespal, nes )
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.0070)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((106.53/(PAL_APU_CLOCK/1000000)) * (PPU_VBLANK_LAST_SCANLINE_PAL-PPU_VBLANK_FIRST_SCANLINE+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((106.53/(PAL_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE+1+2)))
MCFG_SCREEN_SIZE(32*8, 312)
MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1)
MACHINE_CONFIG_END
@@ -141,7 +141,7 @@ static MACHINE_CONFIG_DERIVED( nespalc, nespal )
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_REFRESH_RATE(50.0070)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(PALC_APU_CLOCK/1000000)) * (PPU_VBLANK_LAST_SCANLINE_PAL-PPU_VBLANK_FIRST_SCANLINE_PALC+1+2)))
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(PALC_APU_CLOCK/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE_PALC+1+2)))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( famipalc, nespalc )
@@ -184,9 +184,9 @@ void nes_state::setup_disk(nes_disksys_device *slot)
slot->pcb_start(machine(), m_ciram.get(), false);
m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(device_nes_cart_interface::chr_r),(device_nes_cart_interface *)slot), write8_delegate(FUNC(device_nes_cart_interface::chr_w),(device_nes_cart_interface *)slot));
m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(device_nes_cart_interface::nt_r),(device_nes_cart_interface *)slot), write8_delegate(FUNC(device_nes_cart_interface::nt_w),(device_nes_cart_interface *)slot));
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(device_nes_cart_interface::scanline_irq),(device_nes_cart_interface *)slot));
- m_ppu->set_hblank_callback(ppu2c0x_hblank_delegate(FUNC(nes_disksys_device::hblank_irq),(nes_disksys_device *)slot));
- m_ppu->set_latch(ppu2c0x_latch_delegate(FUNC(device_nes_cart_interface::ppu_latch),(device_nes_cart_interface *)slot));
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(device_nes_cart_interface::scanline_irq),(device_nes_cart_interface *)slot));
+ m_ppu->set_hblank_callback(ppu2c0x_device::hblank_delegate(FUNC(nes_disksys_device::hblank_irq),(nes_disksys_device *)slot));
+ m_ppu->set_latch(ppu2c0x_device::latch_delegate(FUNC(device_nes_cart_interface::ppu_latch),(device_nes_cart_interface *)slot));
}
}
@@ -341,38 +341,38 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME
-/* Nintendo Entertainment System hardware */
-CONS( 1985, nes, 0, 0, nes, nes, driver_device, 0, "Nintendo", "Nintendo Entertainment System / Famicom (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 1987, nespal, nes, 0, nespal, nes, driver_device, 0, "Nintendo", "Nintendo Entertainment System (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+// Nintendo Entertainment System hardware
+CONS( 1985, nes, 0, 0, nes, nes, nes_state, 0, "Nintendo", "Nintendo Entertainment System / Famicom (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1987, nespal, nes, 0, nespal, nes, nes_state, 0, "Nintendo", "Nintendo Entertainment System (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
// M82 Display Unit
// supports up to twelve cartridge slots
-CONS( 198?, m82, nes, 0, nes, nes, driver_device, 0, "Nintendo", "M82 Display Unit (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-CONS( 198?, m82p, nes, 0, nespal, nes, driver_device, 0, "Nintendo", "M82 Display Unit (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+CONS( 198?, m82, nes, 0, nes, nes, nes_state, 0, "Nintendo", "M82 Display Unit (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+CONS( 198?, m82p, nes, 0, nespal, nes, nes_state, 0, "Nintendo", "M82 Display Unit (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-/* Famicom hardware */
-CONS( 1983, famicom, 0, 0, famicom, famicom, nes_state, famicom, "Nintendo", "Famicom", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 1983, fds, famicom, 0, fds, famicom, nes_state, famicom, "Nintendo", "Famicom (w/ Disk System add-on)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 1986, famitwin, famicom, 0, famitwin, famicom, nes_state, famicom, "Sharp", "Famicom Twin", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+// Famicom hardware
+CONS( 1983, famicom, 0, 0, famicom, famicom, nes_state, famicom, "Nintendo", "Famicom", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1983, fds, famicom, 0, fds, famicom, nes_state, famicom, "Nintendo", "Famicom (w/ Disk System add-on)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1986, famitwin, famicom, 0, famitwin, famicom, nes_state, famicom, "Sharp", "Famicom Twin", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-/* Clone hardware */
-/* Many knockoffs using derivatives of the UMC board design, later incorporated into single CMOS chips, were manufactured before and past the end of the Famicom's timeline. */
+// Clone hardware
+// Many knockoffs using derivatives of the UMC board design, later incorporated into single CMOS chips, were manufactured before and past the end of the Famicom's timeline.
-/* !! PAL clones documented here !! */
+// !! PAL clones documented here !!
// Famicom-based
-CONS( 1992, iq501, 0, 0, famipalc, nes, nes_state, famicom, "Micro Genius", "IQ-501", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 1992, iq502, 0, 0, famipalc, nes, nes_state, famicom, "Micro Genius", "IQ-502", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 1992, dendy, iq501, 0, famipalc, nes, nes_state, famicom, "Steepler", "Dendy Classic 1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 1992, dendy2, iq502, 0, famipalc, nes, nes_state, famicom, "Steepler", "Dendy Classic 2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-CONS( 198?, gchinatv, 0, 0, famipalc, nes, nes_state, famicom, "Golden China", "Golden China TV Game", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1992, iq501, 0, 0, famipalc, nes, nes_state, famicom, "Micro Genius", "IQ-501", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1992, iq502, 0, 0, famipalc, nes, nes_state, famicom, "Micro Genius", "IQ-502", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1992, dendy, iq501, 0, famipalc, nes, nes_state, famicom, "Steepler", "Dendy Classic 1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 1992, dendy2, iq502, 0, famipalc, nes, nes_state, famicom, "Steepler", "Dendy Classic 2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+CONS( 198?, gchinatv, 0, 0, famipalc, nes, nes_state, famicom, "Golden China", "Golden China TV Game", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
// Subor/Xiao Ba Wang hardware and derivatives
// These clones implement a keyboard and a parallel port for printing from a word processor. Later models have mice, PS/2 ports, serial ports and a floppy drive.
-CONS( 1993, sb486, 0, 0, suborkbd, nes, nes_state, famicom, "Subor", "SB-486", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+CONS( 1993, sb486, 0, 0, suborkbd, nes, nes_state, famicom, "Subor", "SB-486", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-/* !! NTSC clones documented here !! */
+// !! NTSC clones documented here !!
// Famicom-based
// Bung hardware
// Mice, keyboard, etc, including a floppy drive that allows you to run games with a selection of 4 internal "mappers" available on the system.
-CONS( 1996, drpcjr, 0, 0, famicom, famicom, nes_state, famicom, "Bung", "Doctor PC Jr", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+CONS( 1996, drpcjr, 0, 0, famicom, famicom, nes_state, famicom, "Bung", "Doctor PC Jr", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index 54f12085371..c4ebd73867a 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -805,7 +805,7 @@ void newbrain_state::device_timer(emu_timer &timer, device_timer_id id, int para
// MACHINE_CONFIG( newbrain )
//-------------------------------------------------
-static MACHINE_CONFIG_START( newbrain, newbrain_state )
+static MACHINE_CONFIG_START( newbrain )
// basic system hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(newbrain_mreq)
@@ -943,7 +943,7 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1981, newbrain, 0, 0, newbrain_ad, newbrain, driver_device, 0, "Grundy Business Systems Ltd", "NewBrain AD", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1981, newbraina, newbrain, 0, newbrain_a, newbrain, driver_device, 0, "Grundy Business Systems Ltd", "NewBrain A", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1981, newbrainmd, newbrain, 0, newbrain_md, newbrain, driver_device, 0, "Grundy Business Systems Ltd", "NewBrain MD", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, newbrain, 0, 0, newbrain_ad, newbrain, newbrain_state, 0, "Grundy Business Systems Ltd", "NewBrain AD", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1981, newbraina, newbrain, 0, newbrain_a, newbrain, newbrain_state, 0, "Grundy Business Systems Ltd", "NewBrain A", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1981, newbrainmd, newbrain, 0, newbrain_md, newbrain, newbrain_state, 0, "Grundy Business Systems Ltd", "NewBrain MD", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp
index 603b631dc02..464393eeec6 100644
--- a/src/mame/drivers/news.cpp
+++ b/src/mame/drivers/news.cpp
@@ -128,7 +128,7 @@ void news_state::machine_reset()
m_bgpic = 0;
}
-static MACHINE_CONFIG_START( news, news_state )
+static MACHINE_CONFIG_START( news )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */
@@ -153,7 +153,7 @@ static MACHINE_CONFIG_START( news, news_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -183,5 +183,5 @@ ROM_START( newsa )
ROM_LOAD( "virus.1", 0x00000, 0x40000, CRC(41f5935a) SHA1(1566d243f165019660cd4dd69df9f049e0130f15) )
ROM_END
-GAME( 1993, news, 0, news, news, driver_device, 0, ROT0, "Poby / Virus", "News (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, newsa, news, news, newsa, driver_device, 0, ROT0, "Poby", "News (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, news, 0, news, news, news_state, 0, ROT0, "Poby / Virus", "News (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, newsa, news, news, newsa, news_state, 0, ROT0, "Poby", "News (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index 27d3df700f5..c9ff2957252 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -1014,7 +1014,7 @@ static MACHINE_CONFIG_FRAGMENT( ncr5390 )
MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", next_state, scsi_drq))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( next_base, next_state )
+static MACHINE_CONFIG_START( next_base )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
@@ -1216,12 +1216,12 @@ DRIVER_INIT_MEMBER(next_state,nextctc)
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, next, 0, 0, next, next, next_state, next, "Next Software Inc", "NeXT Cube", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, nexts, 0, 0, nexts, next, next_state, nexts, "Next Software Inc", "NeXTstation", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, nexts2, nexts, 0, nexts2, next, next_state, nexts2, "Next Software Inc", "NeXTstation (X15 variant)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, nextsc, nexts, 0, nextsc, next, next_state, nextsc, "Next Software Inc", "NeXTstation color", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, nextst, 0, 0, nextst, next, next_state, nextst, "Next Software Inc", "NeXTstation turbo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, nextstc, nextst, 0, nextstc, next, next_state, nextstc, "Next Software Inc", "NeXTstation turbo color", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( ????, nextct, nextst, 0, nextct, next, next_state, nextct, "Next Software Inc", "NeXT Cube turbo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( ????, nextctc, nextst, 0, nextctc, next, next_state, nextctc, "Next Software Inc", "NeXT Cube turbo color", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, next, 0, 0, next, next, next_state, next, "Next Software Inc", "NeXT Cube", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, nexts, 0, 0, nexts, next, next_state, nexts, "Next Software Inc", "NeXTstation", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, nexts2, nexts, 0, nexts2, next, next_state, nexts2, "Next Software Inc", "NeXTstation (X15 variant)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, nextsc, nexts, 0, nextsc, next, next_state, nextsc, "Next Software Inc", "NeXTstation color", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, nextst, 0, 0, nextst, next, next_state, nextst, "Next Software Inc", "NeXTstation turbo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, nextstc, nextst, 0, nextstc, next, next_state, nextstc, "Next Software Inc", "NeXTstation turbo color", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( ????, nextct, nextst, 0, nextct, next, next_state, nextct, "Next Software Inc", "NeXT Cube turbo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( ????, nextctc, nextst, 0, nextctc, next, next_state, nextctc, "Next Software Inc", "NeXT Cube turbo color", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp
index e8430db92d0..ae8afc957f9 100644
--- a/src/mame/drivers/nexus3d.cpp
+++ b/src/mame/drivers/nexus3d.cpp
@@ -115,7 +115,7 @@ void nexus3d_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( nexus3d, nexus3d_state )
+static MACHINE_CONFIG_START( nexus3d )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM920T, 200000000)
@@ -173,5 +173,5 @@ DRIVER_INIT_MEMBER(nexus3d_state,nexus3d)
memcpy( m_mainram, memregion("flash")->base(), 4 * 1024);
}
-GAME( 2005, acheart, 0, nexus3d, nexus3d, nexus3d_state, nexus3d, ROT0, "Examu", "Arcana Heart",MACHINE_IS_SKELETON )
-GAME( 2006, acheartf, 0, nexus3d, nexus3d, nexus3d_state, nexus3d, ROT0, "Examu", "Arcana Heart Full",MACHINE_IS_SKELETON )
+GAME( 2005, acheart, 0, nexus3d, nexus3d, nexus3d_state, nexus3d, ROT0, "Examu", "Arcana Heart", MACHINE_IS_SKELETON )
+GAME( 2006, acheartf, 0, nexus3d, nexus3d, nexus3d_state, nexus3d, ROT0, "Examu", "Arcana Heart Full", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index e23e94b889d..53c0d522d9a 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -161,7 +161,7 @@ private:
optional_memory_region m_disk_rom;
memory_array m_vram;
memory_array m_fontram;
- optional_device<wd2797_t> m_fdc;
+ optional_device<wd2797_device> m_fdc;
optional_device<floppy_connector> m_fd0;
optional_device<pit8253_device> m_fdc_timer;
optional_device<wd2010_device> m_hdc;
@@ -911,7 +911,7 @@ static SLOT_INTERFACE_START( ngen_floppies )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( ngen, ngen_state )
+static MACHINE_CONFIG_START( ngen )
// basic machine hardware
MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(ngen_mem)
@@ -1024,7 +1024,7 @@ static MACHINE_CONFIG_START( ngen, ngen_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ngen386, ngen386_state )
+static MACHINE_CONFIG_START( ngen386 )
MCFG_CPU_ADD("i386cpu", I386, XTAL_50MHz / 2)
MCFG_CPU_PROGRAM_MAP(ngen386_mem)
MCFG_CPU_IO_MAP(ngen386_io)
@@ -1176,6 +1176,6 @@ ROM_START( 386i )
ROM_END
-COMP( 1983, ngen, 0, 0, ngen, ngen, driver_device, 0, "Convergent Technologies", "NGEN CP-001", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1991, ngenb38, ngen, 0, ngen386, ngen, driver_device, 0, "Financial Products Corp.", "B28/38", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1990, 386i, ngen, 0, 386i, ngen, driver_device, 0, "Convergent Technologies", "386i", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1983, ngen, 0, 0, ngen, ngen, ngen_state, 0, "Convergent Technologies", "NGEN CP-001", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1991, ngenb38, ngen, 0, ngen386, ngen, ngen386_state, 0, "Financial Products Corp.", "B28/38", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, 386i, ngen, 0, 386i, ngen, ngen386_state, 0, "Convergent Technologies", "386i", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp
index dcbd70a8d81..d74884ad2a2 100644
--- a/src/mame/drivers/ngp.cpp
+++ b/src/mame/drivers/ngp.cpp
@@ -816,7 +816,7 @@ void ngp_state::nvram_write(emu_file &file)
}
-static MACHINE_CONFIG_START( ngp_common, ngp_state )
+static MACHINE_CONFIG_START( ngp_common )
MCFG_CPU_ADD( "maincpu", TMP95C061, XTAL_6_144MHz )
MCFG_TLCS900H_AM8_16(1)
@@ -895,6 +895,6 @@ ROM_START( ngpc )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1998, ngp, 0, 0, ngp, ngp, driver_device, 0, "SNK", "NeoGeo Pocket", MACHINE_SUPPORTS_SAVE )
-CONS( 1999, ngpc, ngp, 0, ngpc, ngp, driver_device, 0, "SNK", "NeoGeo Pocket Color", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1998, ngp, 0, 0, ngp, ngp, ngp_state, 0, "SNK", "NeoGeo Pocket", MACHINE_SUPPORTS_SAVE )
+CONS( 1999, ngpc, ngp, 0, ngpc, ngp, ngp_state, 0, "SNK", "NeoGeo Pocket Color", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp
index 0a0ad62d7a0..41e00f71e88 100644
--- a/src/mame/drivers/nibble.cpp
+++ b/src/mame/drivers/nibble.cpp
@@ -301,7 +301,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( nibble, nibble_state )
+static MACHINE_CONFIG_START( nibble )
MCFG_TMS99xx_ADD("maincpu", TMS9900, MASTER_CLOCK/4, nibble_map, nibble_cru_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", nibble_state, nibble_interrupt)
@@ -359,5 +359,5 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
-GAME( 19??, l9nibble, 0, nibble, nibble, driver_device, 0, ROT0, "Nibble", "Lucky 9", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 19??, l9nibble, 0, nibble, nibble, nibble_state, 0, ROT0, "Nibble", "Lucky 9", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp
index c2308b13ce9..dbd8f005d43 100644
--- a/src/mame/drivers/nightgal.cpp
+++ b/src/mame/drivers/nightgal.cpp
@@ -134,7 +134,7 @@ uint32_t nightgal_state::screen_update_nightgal(screen_device &screen, bitmap_in
for (y = cliprect.min_y; y <= cliprect.max_y; ++y)
{
- uint8_t *src = &m_blitter->m_blit_buffer[y * 256 + cliprect.min_x];
+ const uint8_t *src = &m_blitter->blit_buffer(y, cliprect.min_x);
uint16_t *dst = &m_tmp_bitmap->pix16(y, cliprect.min_x);
for (x = cliprect.min_x; x <= cliprect.max_x; x += 2)
@@ -653,7 +653,7 @@ void nightgal_state::machine_reset()
memset(m_blit_raw_data, 0, ARRAY_LENGTH(m_blit_raw_data));
}
-static MACHINE_CONFIG_START( royalqn, nightgal_state )
+static MACHINE_CONFIG_START( royalqn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK / 8) /* ? MHz */
@@ -1035,12 +1035,12 @@ DRIVER_INIT_MEMBER(nightgal_state,ngalsumr)
}
/* Type 1 HW */
-GAME( 1984, nightgal, 0, royalqn, sexygal, driver_device, 0, ROT0, "Nichibutsu", "Night Gal (Japan 840920 AG 1-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, ngtbunny, 0, royalqn, sexygal, driver_device, 0, ROT0, "Nichibutsu", "Night Bunny (Japan 840601 MRN 2-10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, royalngt, ngtbunny, royalqn, sexygal, driver_device, 0, ROT0, "Royal Denshi", "Royal Night [BET] (Japan 840220 RN 2-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, royalqn, 0, royalqn, sexygal, nightgal_state, royalqn, ROT0, "Royal Denshi", "Royal Queen [BET] (Japan 841010 RQ 0-07)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, nightgal, 0, royalqn, sexygal, nightgal_state, 0, ROT0, "Nichibutsu", "Night Gal (Japan 840920 AG 1-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, ngtbunny, 0, royalqn, sexygal, nightgal_state, 0, ROT0, "Nichibutsu", "Night Bunny (Japan 840601 MRN 2-10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, royalngt, ngtbunny, royalqn, sexygal, nightgal_state, 0, ROT0, "Royal Denshi", "Royal Night [BET] (Japan 840220 RN 2-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, royalqn, 0, royalqn, sexygal, nightgal_state, royalqn, ROT0, "Royal Denshi", "Royal Queen [BET] (Japan 841010 RQ 0-07)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
/* Type 2 HW */
-GAME( 1985, sexygal, 0, sexygal, sexygal, driver_device, 0, ROT0, "Nichibutsu", "Sexy Gal (Japan 850501 SXG 1-00)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, sweetgal, sexygal, sexygal, sexygal, driver_device, 0, ROT0, "Nichibutsu", "Sweet Gal (Japan 850510 SWG 1-02)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sexygal, 0, sexygal, sexygal, nightgal_state, 0, ROT0, "Nichibutsu", "Sexy Gal (Japan 850501 SXG 1-00)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sweetgal, sexygal, sexygal, sexygal, nightgal_state, 0, ROT0, "Nichibutsu", "Sweet Gal (Japan 850510 SWG 1-02)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
/* Type 3 HW */
-GAME( 1985, ngalsumr, 0, ngalsumr,sexygal, nightgal_state, ngalsumr,ROT0, "Nichibutsu", "Night Gal Summer (Japan 850702 NGS 0-01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ngalsumr, 0, ngalsumr,sexygal, nightgal_state, ngalsumr, ROT0, "Nichibutsu", "Night Gal Summer (Japan 850702 NGS 0-01)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp
index 78972c598dc..d1685649fbc 100644
--- a/src/mame/drivers/ninjakd2.cpp
+++ b/src/mame/drivers/ninjakd2.cpp
@@ -927,7 +927,7 @@ MACHINE_RESET_MEMBER(ninjakd2_state,omegaf)
/*****************************************************************************/
-static MACHINE_CONFIG_START( ninjakd2_core, ninjakd2_state )
+static MACHINE_CONFIG_START( ninjakd2_core )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK_12/2) /* verified */
@@ -1696,7 +1696,7 @@ DRIVER_INIT_MEMBER(ninjakd2_state,robokidj)
*
*************************************/
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
GAME( 1987, ninjakd2, 0, ninjakd2, ninjakd2, ninjakd2_state, ninjakd2, ROT0, "UPL", "Ninja-Kid II / NinjaKun Ashura no Shou (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, ninjakd2a, ninjakd2, ninjakd2b, ninjakd2, ninjakd2_state, bootleg, ROT0, "UPL", "Ninja-Kid II / NinjaKun Ashura no Shou (set 2, bootleg?)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, ninjakd2b, ninjakd2, ninjakd2b, rdaction, ninjakd2_state, bootleg, ROT0, "UPL", "Ninja-Kid II / NinjaKun Ashura no Shou (set 3, bootleg?)", MACHINE_SUPPORTS_SAVE )
@@ -1712,7 +1712,7 @@ GAME( 1988, arkarea, 0, arkarea, arkarea, ninjakd2_state, mnight, R
GAME( 1988, robokid, 0, robokid, robokid, ninjakd2_state, robokid, ROT0, "UPL", "Atomic Robo-kid (World, Type-2)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // 3-digit highscore names
GAME( 1988, robokidj, robokid, robokid, robokidj, ninjakd2_state, robokidj, ROT0, "UPL", "Atomic Robo-kid (Japan, Type-2, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
GAME( 1988, robokidj2, robokid, robokid, robokidj, ninjakd2_state, robokidj, ROT0, "UPL", "Atomic Robo-kid (Japan, Type-2, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1988, robokidj3, robokid, robokid, robokidj, driver_device, 0, ROT0, "UPL", "Atomic Robo-kid (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1988, robokidj3, robokid, robokid, robokidj, ninjakd2_state, 0, ROT0, "UPL", "Atomic Robo-kid (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1989, omegaf, 0, omegaf, omegaf, driver_device, 0, ROT270, "UPL", "Omega Fighter", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, omegafs, omegaf, omegaf, omegaf, driver_device, 0, ROT270, "UPL", "Omega Fighter Special", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, omegaf, 0, omegaf, omegaf, ninjakd2_state, 0, ROT270, "UPL", "Omega Fighter", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, omegafs, omegaf, omegaf, omegaf, ninjakd2_state, 0, ROT270, "UPL", "Omega Fighter Special", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp
index 409281acad2..d6d72ad8b11 100644
--- a/src/mame/drivers/ninjaw.cpp
+++ b/src/mame/drivers/ninjaw.cpp
@@ -723,7 +723,7 @@ void ninjaw_state::machine_reset()
machine().sound().system_enable(true); /* mixer enabled */
}
-static MACHINE_CONFIG_START( ninjaw, ninjaw_state )
+static MACHINE_CONFIG_START( ninjaw )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
@@ -843,7 +843,7 @@ static MACHINE_CONFIG_START( ninjaw, ninjaw_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( darius2, ninjaw_state )
+static MACHINE_CONFIG_START( darius2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */
@@ -1177,8 +1177,8 @@ ROM_END
/* Working Games */
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT,MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1987, ninjaw, 0, ninjaw, ninjaw, driver_device, 0, ROT0, "Taito Corporation Japan", "The Ninja Warriors (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ninjawj, ninjaw, ninjaw, ninjawj, driver_device, 0, ROT0, "Taito Corporation", "The Ninja Warriors (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ninjawu, ninjaw, ninjaw, ninjawj, driver_device, 0, ROT0, "Taito Corporation America (licensed to Romstar)", "The Ninja Warriors (US)", MACHINE_SUPPORTS_SAVE ) /* Uses same coinage as World, see notes */
-GAME( 1989, darius2, 0, darius2, darius2, driver_device, 0, ROT0, "Taito Corporation", "Darius II (triple screen) (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE INIT,MONITOR,COMPANY, FULLNAME,FLAGS
+GAME( 1987, ninjaw, 0, ninjaw, ninjaw, ninjaw_state, 0, ROT0, "Taito Corporation Japan", "The Ninja Warriors (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ninjawj, ninjaw, ninjaw, ninjawj, ninjaw_state, 0, ROT0, "Taito Corporation", "The Ninja Warriors (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ninjawu, ninjaw, ninjaw, ninjawj, ninjaw_state, 0, ROT0, "Taito Corporation America (licensed to Romstar)", "The Ninja Warriors (US)", MACHINE_SUPPORTS_SAVE ) /* Uses same coinage as World, see notes */
+GAME( 1989, darius2, 0, darius2, darius2, ninjaw_state, 0, ROT0, "Taito Corporation", "Darius II (triple screen) (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp
index 1e006b023c9..3b67962236d 100644
--- a/src/mame/drivers/nitedrvr.cpp
+++ b/src/mame/drivers/nitedrvr.cpp
@@ -139,7 +139,7 @@ GFXDECODE_END
/* Machine Driver */
-static MACHINE_CONFIG_START( nitedrvr, nitedrvr_state )
+static MACHINE_CONFIG_START( nitedrvr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/12) // 1 MHz
@@ -203,4 +203,4 @@ ROM_END
/* Game Drivers */
-GAME( 1976, nitedrvr, 0, nitedrvr, nitedrvr, driver_device, 0, ROT0, "Atari", "Night Driver", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, nitedrvr, 0, nitedrvr, nitedrvr, nitedrvr_state, 0, ROT0, "Atari", "Night Driver", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp
index 03ce359a07f..1241a93039b 100644
--- a/src/mame/drivers/niyanpai.cpp
+++ b/src/mame/drivers/niyanpai.cpp
@@ -718,7 +718,7 @@ static const z80_daisy_config daisy_chain_sound[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( niyanpai, niyanpai_state )
+static MACHINE_CONFIG_START( niyanpai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12288000/2) /* TMP68301, 6.144 MHz */
diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp
index f4cb152f221..4cb894c99d4 100644
--- a/src/mame/drivers/nmg5.cpp
+++ b/src/mame/drivers/nmg5.cpp
@@ -974,7 +974,7 @@ void nmg5_state::machine_reset()
m_input_data = 0;
}
-static MACHINE_CONFIG_START( nmg5, nmg5_state )
+static MACHINE_CONFIG_START( nmg5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -1016,7 +1016,7 @@ static MACHINE_CONFIG_START( nmg5, nmg5_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index ae2c019c7c3..554b2c8d81a 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -169,14 +169,14 @@ WRITE16_MEMBER(nmk16_state::nmk16_x0016_w)
// this is part of a watchdog scheme
// generating an NMI on the NMK004 keeps a timer alive
// if that timer expires the NMK004 resets the system
- m_nmk004->m_cpu->set_input_line(INPUT_LINE_NMI, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
+ m_nmk004->nmi_w(BIT(data, 0) ? ASSERT_LINE : CLEAR_LINE);
}
WRITE16_MEMBER(nmk16_state::nmk16_bioship_x0016_w)
{
// ugly, ugly logic invert hack, but otherwise bioship doesn't hit the NMI enough to keep the game alive!
- m_nmk004->m_cpu->set_input_line(INPUT_LINE_NMI, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+ m_nmk004->nmi_w(BIT(data, 0) ? CLEAR_LINE : ASSERT_LINE);
}
/**********************************************************
@@ -3872,7 +3872,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::nmk16_scanline)
-static MACHINE_CONFIG_START( tharrier, nmk16_state )
+static MACHINE_CONFIG_START( tharrier )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
@@ -3906,16 +3906,16 @@ static MACHINE_CONFIG_START( tharrier, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mustang, nmk16_state )
+static MACHINE_CONFIG_START( mustang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
@@ -3937,6 +3937,7 @@ static MACHINE_CONFIG_START( mustang, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -3945,16 +3946,16 @@ static MACHINE_CONFIG_START( mustang, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mustangb, nmk16_state )
+static MACHINE_CONFIG_START( mustangb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
@@ -3982,7 +3983,7 @@ static MACHINE_CONFIG_START( mustangb, nmk16_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -3995,7 +3996,7 @@ MACHINE_CONFIG_END
#define BIOSHIP_CRYSTAL1 10000000
#define BIOSHIP_CRYSTAL2 12000000
-static MACHINE_CONFIG_START( bioship, nmk16_state )
+static MACHINE_CONFIG_START( bioship )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
@@ -4017,6 +4018,7 @@ static MACHINE_CONFIG_START( bioship, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, BIOSHIP_CRYSTAL2 / 8) /* 1.5 Mhz (verified) */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4025,16 +4027,16 @@ static MACHINE_CONFIG_START( bioship, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_LOW) /* 4.0 Mhz, Pin 7 High (verified) */
+ MCFG_OKIM6295_ADD("oki1", BIOSHIP_CRYSTAL2 / 3 , PIN7_LOW) /* 4.0 Mhz, Pin 7 High (verified) */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", BIOSHIP_CRYSTAL2 / 3 , OKIM6295_PIN7_LOW) /* 4.0 Mhz, Pin 7 High (verified) */
+ MCFG_OKIM6295_ADD("oki2", BIOSHIP_CRYSTAL2 / 3 , PIN7_LOW) /* 4.0 Mhz, Pin 7 High (verified) */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vandyke, nmk16_state )
+static MACHINE_CONFIG_START( vandyke )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
@@ -4056,6 +4058,7 @@ static MACHINE_CONFIG_START( vandyke, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4064,16 +4067,16 @@ static MACHINE_CONFIG_START( vandyke, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/3, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/3, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/3, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vandykeb, nmk16_state )
+static MACHINE_CONFIG_START( vandykeb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
@@ -4097,11 +4100,11 @@ static MACHINE_CONFIG_START( vandykeb, nmk16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( acrobatm, nmk16_state )
+static MACHINE_CONFIG_START( acrobatm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz (verified on pcb) */
@@ -4123,6 +4126,7 @@ static MACHINE_CONFIG_START( acrobatm, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000) /* (verified on pcb) */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4131,17 +4135,17 @@ static MACHINE_CONFIG_START( acrobatm, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW) /* (verified on pcb) on the pcb pin7 is not connected to gnd or +5v! */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tdragonb, nmk16_state ) /* bootleg using Raiden sound hardware */
+static MACHINE_CONFIG_START( tdragonb ) /* bootleg using Raiden sound hardware */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -4169,7 +4173,7 @@ static MACHINE_CONFIG_START( tdragonb, nmk16_state ) /* bootleg using Raiden
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -4179,7 +4183,7 @@ static MACHINE_CONFIG_START( tdragonb, nmk16_state ) /* bootleg using Raiden
MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tdragon, nmk16_state )
+static MACHINE_CONFIG_START( tdragon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
@@ -4201,6 +4205,7 @@ static MACHINE_CONFIG_START( tdragon, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4209,11 +4214,11 @@ static MACHINE_CONFIG_START( tdragon, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4221,7 +4226,7 @@ static MACHINE_CONFIG_DERIVED( tdragon_prot, tdragon )
MCFG_TIMER_DRIVER_ADD_PERIODIC("coinsim", nmk16_state, tdragon_mcu_sim, attotime::from_hz(10000))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ssmissin, nmk16_state )
+static MACHINE_CONFIG_START( ssmissin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 Mhz */
@@ -4247,13 +4252,13 @@ static MACHINE_CONFIG_START( ssmissin, nmk16_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki1", 8000000/8, OKIM6295_PIN7_HIGH) /* 1 Mhz, pin 7 high */
+ MCFG_OKIM6295_ADD("oki1", 8000000/8, PIN7_HIGH) /* 1 Mhz, pin 7 high */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( strahl, nmk16_state )
+static MACHINE_CONFIG_START( strahl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ? */
@@ -4274,6 +4279,7 @@ static MACHINE_CONFIG_START( strahl, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4282,16 +4288,16 @@ static MACHINE_CONFIG_START( strahl, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hachamf, nmk16_state )
+static MACHINE_CONFIG_START( hachamf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
@@ -4313,6 +4319,7 @@ static MACHINE_CONFIG_START( hachamf, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4321,11 +4328,11 @@ static MACHINE_CONFIG_START( hachamf, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -4334,7 +4341,7 @@ static MACHINE_CONFIG_DERIVED( hachamf_prot, hachamf )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macross, nmk16_state )
+static MACHINE_CONFIG_START( macross )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
@@ -4356,6 +4363,7 @@ static MACHINE_CONFIG_START( macross, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, 1500000)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4364,16 +4372,16 @@ static MACHINE_CONFIG_START( macross, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( blkheart, nmk16_state )
+static MACHINE_CONFIG_START( blkheart )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* verified on pcb */
@@ -4395,6 +4403,7 @@ static MACHINE_CONFIG_START( blkheart, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", 8000000)
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8 ) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4403,16 +4412,16 @@ static MACHINE_CONFIG_START( blkheart, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL_8MHz/2, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gunnail, nmk16_state )
+static MACHINE_CONFIG_START( gunnail )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
@@ -4433,6 +4442,7 @@ static MACHINE_CONFIG_START( gunnail, nmk16_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_NMK004_ADD("nmk004", XTAL_16MHz/2) /* verified on pcb */
+ MCFG_NMK004_RESET_CB(INPUTLINE("maincpu", INPUT_LINE_RESET))
MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_12MHz/8) /* verified on pcb */
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("nmk004", nmk004_device, ym2203_irq_handler))
@@ -4441,16 +4451,16 @@ static MACHINE_CONFIG_START( gunnail, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( macross2, nmk16_state )
+static MACHINE_CONFIG_START( macross2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz ? */
@@ -4485,10 +4495,10 @@ static MACHINE_CONFIG_START( macross2, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4496,7 +4506,7 @@ static MACHINE_CONFIG_START( macross2, nmk16_state )
MCFG_NMK112_ROM1("oki2")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tdragon2, nmk16_state )
+static MACHINE_CONFIG_START( tdragon2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
@@ -4531,10 +4541,10 @@ static MACHINE_CONFIG_START( tdragon2, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4542,7 +4552,7 @@ static MACHINE_CONFIG_START( tdragon2, nmk16_state )
MCFG_NMK112_ROM1("oki2")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( raphero, nmk16_state )
+static MACHINE_CONFIG_START( raphero )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14 MHz measured */
@@ -4576,10 +4586,10 @@ static MACHINE_CONFIG_START( raphero, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4587,7 +4597,7 @@ static MACHINE_CONFIG_START( raphero, nmk16_state )
MCFG_NMK112_ROM1("oki2")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bjtwin, nmk16_state )
+static MACHINE_CONFIG_START( bjtwin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* verified on pcb */
@@ -4608,10 +4618,10 @@ static MACHINE_CONFIG_START( bjtwin, nmk16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4621,7 +4631,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( atombjt, nmk16_state )
+static MACHINE_CONFIG_START( atombjt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* there is a 28mhz crystal and a 10mhz crystal near the 12 rated CPU */
@@ -4643,7 +4653,7 @@ static MACHINE_CONFIG_START( atombjt, nmk16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", 10000000/8, OKIM6295_PIN7_LOW) // divider and pin not verified
+ MCFG_OKIM6295_ADD("oki1", 10000000/8, PIN7_LOW) // divider and pin not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
@@ -4668,7 +4678,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(nmk16_state::manybloc_scanline)
}
// non-nmk board, different to the others, very timing sensitive
-static MACHINE_CONFIG_START( manybloc, nmk16_state )
+static MACHINE_CONFIG_START( manybloc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10? MHz - check */
@@ -4709,11 +4719,11 @@ static MACHINE_CONFIG_START( manybloc, nmk16_state )
MCFG_SOUND_ROUTE(2, "mono", 0.50)
MCFG_SOUND_ROUTE(3, "mono", 1.20)
- MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki1_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 16000000/4, PIN7_LOW)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MACHINE_CONFIG_END
@@ -5186,7 +5196,7 @@ GFXDECODE_END
***************************************************************************/
-static MACHINE_CONFIG_START( stagger1, nmk16_state )
+static MACHINE_CONFIG_START( stagger1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
@@ -5217,7 +5227,7 @@ static MACHINE_CONFIG_START( stagger1, nmk16_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.30)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.30)
- MCFG_OKIM6295_ADD("oki1", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_4MHz/4, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70)
MACHINE_CONFIG_END
@@ -5270,7 +5280,7 @@ static MACHINE_CONFIG_DERIVED( popspops, grdnstrm )
MCFG_SCREEN_UPDATE_DRIVER(nmk16_state, screen_update_bubl2000)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( firehawk, nmk16_state )
+static MACHINE_CONFIG_START( firehawk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,12000000)
@@ -5296,10 +5306,10 @@ static MACHINE_CONFIG_START( firehawk, nmk16_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -5309,7 +5319,7 @@ static MACHINE_CONFIG_DERIVED( spec2k, firehawk )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( twinactn, nmk16_state )
+static MACHINE_CONFIG_START( twinactn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,12000000)
@@ -5335,7 +5345,7 @@ static MACHINE_CONFIG_START( twinactn, nmk16_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -7928,113 +7938,113 @@ ROM_END
***************************************************************************/
-GAME( 1989, tharrier, 0, tharrier, tharrier, nmk16_state, tharrier, ROT270, "UPL", "Task Force Harrier", 0 )
-GAME( 1989, tharrieru, tharrier,tharrier, tharrier, nmk16_state, tharrier, ROT270, "UPL (American Sammy license)", "Task Force Harrier (US)", 0 ) // US version but no regional notice
+GAME( 1989, tharrier, 0, tharrier, tharrier, nmk16_state, tharrier, ROT270, "UPL", "Task Force Harrier", 0 )
+GAME( 1989, tharrieru, tharrier, tharrier, tharrier, nmk16_state, tharrier, ROT270, "UPL (American Sammy license)", "Task Force Harrier (US)", 0 ) // US version but no regional notice
-GAME( 1990, mustang, 0, mustang, mustang, driver_device, 0, ROT0, "UPL", "US AAF Mustang (25th May. 1990)", 0 )
-GAME( 1990, mustangs, mustang, mustang, mustang, driver_device, 0, ROT0, "UPL (Seoul Trading license)", "US AAF Mustang (25th May. 1990 / Seoul Trading)", 0 )
+GAME( 1990, mustang, 0, mustang, mustang, nmk16_state, 0, ROT0, "UPL", "US AAF Mustang (25th May. 1990)", 0 )
+GAME( 1990, mustangs, mustang, mustang, mustang, nmk16_state, 0, ROT0, "UPL (Seoul Trading license)", "US AAF Mustang (25th May. 1990 / Seoul Trading)", 0 )
-GAME( 1990, bioship, 0, bioship, bioship, driver_device, 0, ROT0, "UPL (American Sammy license)", "Bio-ship Paladin", 0 ) // US version but no regional notice
-GAME( 1990, sbsgomo, bioship, bioship, bioship, driver_device, 0, ROT0, "UPL", "Space Battle Ship Gomorrah", 0 )
+GAME( 1990, bioship, 0, bioship, bioship, nmk16_state, 0, ROT0, "UPL (American Sammy license)", "Bio-ship Paladin", 0 ) // US version but no regional notice
+GAME( 1990, sbsgomo, bioship, bioship, bioship, nmk16_state, 0, ROT0, "UPL", "Space Battle Ship Gomorrah", 0 )
-GAME( 1990, vandyke, 0, vandyke, vandyke, driver_device, 0, ROT270, "UPL", "Vandyke (Japan)", 0 )
-GAME( 1990, vandykejal, vandyke, vandyke, vandyke, driver_device, 0, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 1)", 0 )
-GAME( 1990, vandykejal2,vandyke, vandyke, vandyke, driver_device, 0, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 2)", 0 )
-GAME( 1990, vandykeb, vandyke, vandykeb, vandykeb, nmk16_state, vandykeb, ROT270, "bootleg", "Vandyke (bootleg with PIC16c57)", MACHINE_NO_SOUND )
+GAME( 1990, vandyke, 0, vandyke, vandyke, nmk16_state, 0, ROT270, "UPL", "Vandyke (Japan)", 0 )
+GAME( 1990, vandykejal, vandyke, vandyke, vandyke, nmk16_state, 0, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 1)", 0 )
+GAME( 1990, vandykejal2,vandyke, vandyke, vandyke, nmk16_state, 0, ROT270, "UPL (Jaleco license)", "Vandyke (Jaleco, set 2)", 0 )
+GAME( 1990, vandykeb, vandyke, vandykeb, vandykeb, nmk16_state, vandykeb, ROT270, "bootleg", "Vandyke (bootleg with PIC16c57)", MACHINE_NO_SOUND )
-GAME( 1991, blkheart, 0, blkheart, blkheart, driver_device, 0, ROT0, "UPL", "Black Heart", 0 )
-GAME( 1991, blkheartj,blkheart, blkheart, blkheart, driver_device, 0, ROT0, "UPL", "Black Heart (Japan)", 0 )
+GAME( 1991, blkheart, 0, blkheart, blkheart, nmk16_state, 0, ROT0, "UPL", "Black Heart", 0 )
+GAME( 1991, blkheartj, blkheart, blkheart, blkheart, nmk16_state, 0, ROT0, "UPL", "Black Heart (Japan)", 0 )
+
+GAME( 1991, acrobatm, 0, acrobatm, acrobatm, nmk16_state, 0, ROT270, "UPL (Taito license)", "Acrobat Mission", 0 )
+
+GAME( 1992, strahl, 0, strahl, strahl, nmk16_state, 0, ROT0, "UPL", "Koutetsu Yousai Strahl (Japan set 1)", 0 )
+GAME( 1992, strahla, strahl, strahl, strahl, nmk16_state, 0, ROT0, "UPL", "Koutetsu Yousai Strahl (Japan set 2)", 0 )
-GAME( 1991, acrobatm, 0, acrobatm, acrobatm, driver_device, 0, ROT270, "UPL (Taito license)", "Acrobat Mission", 0 )
+GAME( 1991, tdragon, 0, tdragon, tdragon, nmk16_state, 0, ROT270, "NMK (Tecmo license)", "Thunder Dragon (8th Jan. 1992, unprotected)", 0 )
+GAME( 1991, tdragon1, tdragon, tdragon_prot, tdragon_prot, nmk16_state, tdragon_prot, ROT270, "NMK (Tecmo license)", "Thunder Dragon (4th Jun. 1991, protected)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND )
-GAME( 1992, strahl, 0, strahl, strahl, driver_device, 0, ROT0, "UPL", "Koutetsu Yousai Strahl (Japan set 1)", 0 )
-GAME( 1992, strahla, strahl, strahl, strahl, driver_device, 0, ROT0, "UPL", "Koutetsu Yousai Strahl (Japan set 2)", 0 )
+GAME( 1991, hachamf, 0, hachamf_prot, hachamf_prot, nmk16_state, hachamf_prot, ROT0, "NMK", "Hacha Mecha Fighter (19th Sep. 1991, protected)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // lots of things wrong due to protection
+GAME( 1991, hachamfb, hachamf, hachamf, hachamfb, nmk16_state, 0, ROT0, "bootleg", "Hacha Mecha Fighter (19th Sep. 1991, unprotected, bootleg Thunder Dragon conversion)", 0 ) // appears to be a Thunder Dragon conversion, could be bootleg?
-GAME( 1991, tdragon, 0, tdragon, tdragon, driver_device, 0, ROT270, "NMK (Tecmo license)","Thunder Dragon (8th Jan. 1992, unprotected)", 0 )
-GAME( 1991, tdragon1, tdragon, tdragon_prot, tdragon_prot, nmk16_state, tdragon_prot, ROT270, "NMK (Tecmo license)","Thunder Dragon (4th Jun. 1991, protected)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND )
+GAME( 1992, macross, 0, macross, macross, nmk16_state, nmk, ROT270, "Banpresto", "Super Spacefortress Macross / Chou-Jikuu Yousai Macross", 0 )
-GAME( 1991, hachamf, 0, hachamf_prot, hachamf_prot, nmk16_state, hachamf_prot, ROT0, "NMK", "Hacha Mecha Fighter (19th Sep. 1991, protected)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // lots of things wrong due to protection
-GAME( 1991, hachamfb, hachamf,hachamf, hachamfb, driver_device, 0, ROT0, "bootleg", "Hacha Mecha Fighter (19th Sep. 1991, unprotected, bootleg Thunder Dragon conversion)", 0 ) // appears to be a Thunder Dragon conversion, could be bootleg?
-
-GAME( 1992, macross, 0, macross, macross, nmk16_state, nmk, ROT270, "Banpresto", "Super Spacefortress Macross / Chou-Jikuu Yousai Macross", 0 )
-
-GAME( 1993, gunnail, 0, gunnail, gunnail, nmk16_state, nmk, ROT270, "NMK / Tecmo", "GunNail (28th May. 1992)", 0 ) // Tecmo is displayed only when set to Japan
+GAME( 1993, gunnail, 0, gunnail, gunnail, nmk16_state, nmk, ROT270, "NMK / Tecmo", "GunNail (28th May. 1992)", 0 ) // Tecmo is displayed only when set to Japan
// a 1992 version of Gunnail exists, see https://www.youtube.com/watch?v=tf15Wz0zUiA 3:10
-GAME( 1993, macross2, 0, macross2, macross2, nmk16_state, banked_audiocpu, ROT0, "Banpresto", "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II", MACHINE_NO_COCKTAIL )
-GAME( 1993, macross2g, macross2,macross2, macross2, nmk16_state, banked_audiocpu, ROT0, "Banpresto", "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II (GAMEST review build)", MACHINE_NO_COCKTAIL ) // Service switch pauses game
+GAME( 1993, macross2, 0, macross2, macross2, nmk16_state, banked_audiocpu, ROT0, "Banpresto", "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II", MACHINE_NO_COCKTAIL )
+GAME( 1993, macross2g, macross2, macross2, macross2, nmk16_state, banked_audiocpu, ROT0, "Banpresto", "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II (GAMEST review build)", MACHINE_NO_COCKTAIL ) // Service switch pauses game
-GAME( 1993, tdragon2, 0, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "NMK", "Thunder Dragon 2 (9th Nov. 1993)", MACHINE_NO_COCKTAIL )
-GAME( 1993, tdragon2a,tdragon2, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "NMK", "Thunder Dragon 2 (1st Oct. 1993)", MACHINE_NO_COCKTAIL )
-GAME( 1993, bigbang, tdragon2, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "NMK", "Big Bang (9th Nov. 1993)", MACHINE_NO_COCKTAIL )
+GAME( 1993, tdragon2, 0, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "NMK", "Thunder Dragon 2 (9th Nov. 1993)", MACHINE_NO_COCKTAIL )
+GAME( 1993, tdragon2a, tdragon2, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "NMK", "Thunder Dragon 2 (1st Oct. 1993)", MACHINE_NO_COCKTAIL )
+GAME( 1993, bigbang, tdragon2, tdragon2, tdragon2, nmk16_state, banked_audiocpu, ROT270, "NMK", "Big Bang (9th Nov. 1993)", MACHINE_NO_COCKTAIL )
/* arcadia was a name conflict to the Emerson Arcadia 2001 in mess */
-GAME( 1994, arcadian, 0, raphero, raphero, nmk16_state, banked_audiocpu, ROT270, "NMK", "Arcadia (NMK)", 0 ) // 23rd July 1993 in test mode, (c)1994 on title screen
-GAME( 1994, raphero, arcadian, raphero, raphero, nmk16_state, banked_audiocpu, ROT270, "NMK (Media Trading license)", "Rapid Hero", 0 ) // ^^
+GAME( 1994, arcadian, 0, raphero, raphero, nmk16_state, banked_audiocpu, ROT270, "NMK", "Arcadia (NMK)", 0 ) // 23rd July 1993 in test mode, (c)1994 on title screen
+GAME( 1994, raphero, arcadian, raphero, raphero, nmk16_state, banked_audiocpu, ROT270, "NMK (Media Trading license)", "Rapid Hero", 0 ) // ^^
/* both sets of both these games show a date of 9th Mar 1992 in the test mode, they look like different revisions so I doubt this is accurate */
GAME( 1992, sabotenb, 0, bjtwin, sabotenb, nmk16_state, nmk, ROT0, "NMK / Tecmo", "Saboten Bombers (set 1)", MACHINE_NO_COCKTAIL )
GAME( 1992, sabotenba,sabotenb, bjtwin, sabotenb, nmk16_state, nmk, ROT0, "NMK / Tecmo", "Saboten Bombers (set 2)", MACHINE_NO_COCKTAIL )
GAME( 1992, cactus, sabotenb, bjtwin, sabotenb, nmk16_state, nmk, ROT0, "bootleg", "Cactus (bootleg of Saboten Bombers)", MACHINE_NO_COCKTAIL ) // PCB marked 'Cactus', no title screen
-GAME( 1993, bjtwin, 0, bjtwin, bjtwin, nmk16_state, bjtwin, ROT270, "NMK", "Bombjack Twin (set 1)", MACHINE_NO_COCKTAIL )
-GAME( 1993, bjtwina, bjtwin, bjtwin, bjtwin, nmk16_state, bjtwin, ROT270, "NMK", "Bombjack Twin (set 2)", MACHINE_NO_COCKTAIL )
-GAME( 1993, bjtwinp, bjtwin, bjtwin, bjtwin, driver_device, 0, ROT270, "NMK", "Bombjack Twin (prototype? with adult pictures, set 1)", MACHINE_NO_COCKTAIL ) // Cheap looking PCB, but Genuine NMK PCB, GFX aren't encrypted (maybe Korean version not proto?)
-GAME( 1993, bjtwinpa, bjtwin, bjtwin, bjtwin, nmk16_state, bjtwin, ROT270, "NMK", "Bombjack Twin (prototype? with adult pictures, set 2)", MACHINE_NO_COCKTAIL ) // same PCB as above, different program revision, GFX are encrypted
-GAME( 1993, atombjt, bjtwin, atombjt, atombjt, driver_device, 0, ROT270, "bootleg (Kyon K.)", "Atom (bootleg of Bombjack Twin)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // some non-trivial mods to the gfx and sound hw (playmark hardware?)
+GAME( 1993, bjtwin, 0, bjtwin, bjtwin, nmk16_state, bjtwin, ROT270, "NMK", "Bombjack Twin (set 1)", MACHINE_NO_COCKTAIL )
+GAME( 1993, bjtwina, bjtwin, bjtwin, bjtwin, nmk16_state, bjtwin, ROT270, "NMK", "Bombjack Twin (set 2)", MACHINE_NO_COCKTAIL )
+GAME( 1993, bjtwinp, bjtwin, bjtwin, bjtwin, nmk16_state, 0, ROT270, "NMK", "Bombjack Twin (prototype? with adult pictures, set 1)", MACHINE_NO_COCKTAIL ) // Cheap looking PCB, but Genuine NMK PCB, GFX aren't encrypted (maybe Korean version not proto?)
+GAME( 1993, bjtwinpa, bjtwin, bjtwin, bjtwin, nmk16_state, bjtwin, ROT270, "NMK", "Bombjack Twin (prototype? with adult pictures, set 2)", MACHINE_NO_COCKTAIL ) // same PCB as above, different program revision, GFX are encrypted
+GAME( 1993, atombjt, bjtwin, atombjt, atombjt, nmk16_state, 0, ROT270, "bootleg (Kyon K.)", "Atom (bootleg of Bombjack Twin)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // some non-trivial mods to the gfx and sound hw (playmark hardware?)
-GAME( 1995, nouryoku, 0, bjtwin, nouryoku, nmk16_state, nmk, ROT0, "Tecmo", "Nouryoku Koujou Iinkai", MACHINE_NO_COCKTAIL )
-GAME( 1995, nouryokup,nouryoku, bjtwin, nouryoku, driver_device, 0, ROT0, "Tecmo", "Nouryoku Koujou Iinkai (prototype)", MACHINE_NO_COCKTAIL ) // GFX aren't encrypted
+GAME( 1995, nouryoku, 0, bjtwin, nouryoku, nmk16_state, nmk, ROT0, "Tecmo", "Nouryoku Koujou Iinkai", MACHINE_NO_COCKTAIL )
+GAME( 1995, nouryokup,nouryoku, bjtwin, nouryoku, nmk16_state, 0, ROT0, "Tecmo", "Nouryoku Koujou Iinkai (prototype)", MACHINE_NO_COCKTAIL ) // GFX aren't encrypted
/* Non NMK boards */
// these use the seibu sound system (sound / music stolen from Raiden) rather than the bootleggers copying the nmk004
-GAME( 1990, mustangb, mustang, mustangb, mustang, driver_device, 0, ROT0, "bootleg", "US AAF Mustang (bootleg)", 0 )
-GAME( 1990, mustangb2,mustang, mustangb, mustang, driver_device, 0, ROT0, "bootleg (TAB Austria)", "US AAF Mustang (TAB Austria bootleg)", 0 ) // PCB and roms have TAB Austria stickers
-GAME( 1991, tdragonb, tdragon, tdragonb, tdragonb, nmk16_state, tdragonb, ROT270, "bootleg", "Thunder Dragon (bootleg)", 0 )
+GAME( 1990, mustangb, mustang, mustangb, mustang, nmk16_state, 0, ROT0, "bootleg", "US AAF Mustang (bootleg)", 0 )
+GAME( 1990, mustangb2,mustang, mustangb, mustang, nmk16_state, 0, ROT0, "bootleg (TAB Austria)", "US AAF Mustang (TAB Austria bootleg)", 0 ) // PCB and roms have TAB Austria stickers
+GAME( 1991, tdragonb, tdragon, tdragonb, tdragonb, nmk16_state, tdragonb, ROT270, "bootleg", "Thunder Dragon (bootleg)", 0 )
// these are from Comad, based on the Thunder Dragon code?
-GAME( 1992, ssmissin, 0, ssmissin, ssmissin, nmk16_state, ssmissin, ROT270, "Comad", "S.S. Mission", MACHINE_NO_COCKTAIL )
+GAME( 1992, ssmissin, 0, ssmissin, ssmissin, nmk16_state, ssmissin, ROT270, "Comad", "S.S. Mission", MACHINE_NO_COCKTAIL )
-GAME( 1996, airattck, 0, ssmissin, airattck, nmk16_state, ssmissin, ROT270, "Comad", "Air Attack (set 1)", MACHINE_NO_COCKTAIL )
-GAME( 1996, airattcka,airattck, ssmissin, airattck, nmk16_state, ssmissin, ROT270, "Comad", "Air Attack (set 2)", MACHINE_NO_COCKTAIL )
+GAME( 1996, airattck, 0, ssmissin, airattck, nmk16_state, ssmissin, ROT270, "Comad", "Air Attack (set 1)", MACHINE_NO_COCKTAIL )
+GAME( 1996, airattcka,airattck, ssmissin, airattck, nmk16_state, ssmissin, ROT270, "Comad", "Air Attack (set 2)", MACHINE_NO_COCKTAIL )
// afega & clones
-GAME( 1995, twinactn, 0, twinactn, twinactn, driver_device, 0, ROT0, "Afega", "Twin Action", 0 ) // hacked from USSAF Mustang
-
-GAME( 1995, dolmen, 0, twinactn, dolmen, driver_device, 0, ROT0, "Afega", "Dolmen", 0 )
-
-GAME( 1998, stagger1, 0, stagger1, stagger1, driver_device, 0, ROT270, "Afega", "Stagger I (Japan)", 0 )
-GAME( 1997, redhawk, stagger1, stagger1, stagger1, nmk16_state, redhawk, ROT270, "Afega (New Vision Ent. license)", "Red Hawk (US)", 0 )
-GAME( 1997, redhawki, stagger1, redhawki, stagger1, driver_device, 0, ROT0, "Afega (Hea Dong Corp license)", "Red Hawk (Italy)", 0 ) // bootleg? strange scroll regs
-GAME( 1997, redhawkg, stagger1, redhawki, stagger1, driver_device, 0, ROT0, "Afega", "Red Hawk (Greece)", 0 )
-GAME( 1997, redhawke, stagger1, stagger1, stagger1, driver_device, 0, ROT270, "Afega (Excellent Co. license)", "Red Hawk (Excellent Co., Ltd)", 0 )
-GAME( 1997, redhawkk, stagger1, stagger1, stagger1, driver_device, 0, ROT270, "Afega", "Red Hawk (Korea)", 0 )
-GAME( 1997, redhawkb, stagger1, redhawkb, redhawkb, driver_device, 0, ROT0, "bootleg", "Red Hawk (bootleg)", 0 )
-
-GAME( 1998, grdnstrm, 0, grdnstrm, grdnstrm, driver_device, 0, ORIENTATION_FLIP_Y, "Afega (Apples Industries license)", "Guardian Storm (horizontal, not encrypted)", 0 )
-GAME( 1998, grdnstrmv,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega (Apples Industries license)", "Guardian Storm (vertical)", 0 )
-GAME( 1998, grdnstrmj,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrmg, ROT270, "Afega", "Sen Jing - Guardian Storm (Japan)", 0 )
-GAME( 1998, grdnstrmk,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega", "Jeon Sin - Guardian Storm (Korea)", 0 )
-GAME( 1998, redfoxwp2,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega", "Red Fox War Planes II (China, set 1)", 0 )
-GAME( 1998, redfoxwp2a,grdnstrm,grdnstrmk,grdnstrk, nmk16_state, redfoxwp2a,ROT270, "Afega", "Red Fox War Planes II (China, set 2)", 0 )
-GAME( 1998, grdnstrmg,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrmg,ROT270, "Afega", "Guardian Storm (Germany)", 0 )
+GAME( 1995, twinactn, 0, twinactn, twinactn, nmk16_state, 0, ROT0, "Afega", "Twin Action", 0 ) // hacked from USSAF Mustang
+
+GAME( 1995, dolmen, 0, twinactn, dolmen, nmk16_state, 0, ROT0, "Afega", "Dolmen", 0 )
+
+GAME( 1998, stagger1, 0, stagger1, stagger1, nmk16_state, 0, ROT270, "Afega", "Stagger I (Japan)", 0 )
+GAME( 1997, redhawk, stagger1, stagger1, stagger1, nmk16_state, redhawk, ROT270, "Afega (New Vision Ent. license)", "Red Hawk (US)", 0 )
+GAME( 1997, redhawki, stagger1, redhawki, stagger1, nmk16_state, 0, ROT0, "Afega (Hea Dong Corp license)", "Red Hawk (Italy)", 0 ) // bootleg? strange scroll regs
+GAME( 1997, redhawkg, stagger1, redhawki, stagger1, nmk16_state, 0, ROT0, "Afega", "Red Hawk (Greece)", 0 )
+GAME( 1997, redhawke, stagger1, stagger1, stagger1, nmk16_state, 0, ROT270, "Afega (Excellent Co. license)", "Red Hawk (Excellent Co., Ltd)", 0 )
+GAME( 1997, redhawkk, stagger1, stagger1, stagger1, nmk16_state, 0, ROT270, "Afega", "Red Hawk (Korea)", 0 )
+GAME( 1997, redhawkb, stagger1, redhawkb, redhawkb, nmk16_state, 0, ROT0, "bootleg", "Red Hawk (bootleg)", 0 )
+
+GAME( 1998, grdnstrm, 0, grdnstrm, grdnstrm, nmk16_state, 0, ORIENTATION_FLIP_Y, "Afega (Apples Industries license)", "Guardian Storm (horizontal, not encrypted)", 0 )
+GAME( 1998, grdnstrmv,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega (Apples Industries license)", "Guardian Storm (vertical)", 0 )
+GAME( 1998, grdnstrmj,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrmg, ROT270, "Afega", "Sen Jing - Guardian Storm (Japan)", 0 )
+GAME( 1998, grdnstrmk,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega", "Jeon Sin - Guardian Storm (Korea)", 0 )
+GAME( 1998, redfoxwp2,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrm, ROT270, "Afega", "Red Fox War Planes II (China, set 1)", 0 )
+GAME( 1998, redfoxwp2a,grdnstrm,grdnstrmk,grdnstrk, nmk16_state, redfoxwp2a,ROT270, "Afega", "Red Fox War Planes II (China, set 2)", 0 )
+GAME( 1998, grdnstrmg,grdnstrm, grdnstrmk,grdnstrk, nmk16_state, grdnstrmg, ROT270, "Afega", "Guardian Storm (Germany)", 0 )
// is there a 'bubble 2000' / 'hot bubble' version with Afega copyright, or is the only Afega release dolmen above, this seems like a sequel, not a clone?
-GAME( 1998, bubl2000, 0, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Afega (Tuning license)", "Bubble 2000", 0 ) // on a tuning board (bootleg?)
-GAME( 1998, hotbubl, bubl2000, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Afega (Pandora license)", "Hot Bubble (Korea, with adult pictures)" , 0 ) // on an afega board ..
-GAME( 1998, hotbubla, bubl2000, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Afega (Pandora license)", "Hot Bubble (Korea)" , 0 ) // on an afega board ..
+GAME( 1998, bubl2000, 0, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Afega (Tuning license)", "Bubble 2000", 0 ) // on a tuning board (bootleg?)
+GAME( 1998, hotbubl, bubl2000, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Afega (Pandora license)", "Hot Bubble (Korea, with adult pictures)" , 0 ) // on an afega board ..
+GAME( 1998, hotbubla, bubl2000, popspops, bubl2000, nmk16_state, bubl2000, ROT0, "Afega (Pandora license)", "Hot Bubble (Korea)" , 0 ) // on an afega board ..
-GAME( 1999, popspops, 0, popspops, popspops, nmk16_state, grdnstrm, ROT0, "Afega", "Pop's Pop's", 0 )
+GAME( 1999, popspops, 0, popspops, popspops, nmk16_state, grdnstrm, ROT0, "Afega", "Pop's Pop's", 0 )
-GAME( 2000, mangchi, 0, popspops, mangchi, nmk16_state, bubl2000, ROT0, "Afega", "Mang-Chi", 0 )
+GAME( 2000, mangchi, 0, popspops, mangchi, nmk16_state, bubl2000, ROT0, "Afega", "Mang-Chi", 0 )
// these two are very similar games, but the exact parent/clone relationship is unknown
-GAME( 2000, spec2k, 0, spec2k, spec2k, nmk16_state, spec2k, ROT270, "Yona Tech", "Spectrum 2000 (vertical)", MACHINE_IMPERFECT_GRAPHICS ) // the ships sometimes scroll off the screen if you insert a coin during the attract demo? verify it doesn't happen on real hw(!)
-GAME( 2000, spec2kh, spec2k, spec2k, spec2k, nmk16_state, spec2k, ORIENTATION_FLIP_Y, "Yona Tech", "Spectrum 2000 (horizontal, buggy) (Europe)", 0 ) // this has odd bugs even on real hardware, eg glitchy 3 step destruction sequence of some larger enemies
-GAME( 2001, firehawk, spec2k, firehawk, firehawk, driver_device, 0, ORIENTATION_FLIP_Y, "ESD", "Fire Hawk (horizontal)", 0 )
-GAME( 2001, firehawkv,spec2k, firehawk, firehawkv,driver_device, 0, ORIENTATION_FLIP_Y, "ESD", "Fire Hawk (switchable orientation)", MACHINE_NOT_WORKING ) // incomplete dump, vertical mode gfx not dumped
+GAME( 2000, spec2k, 0, spec2k, spec2k, nmk16_state, spec2k, ROT270, "Yona Tech", "Spectrum 2000 (vertical)", MACHINE_IMPERFECT_GRAPHICS ) // the ships sometimes scroll off the screen if you insert a coin during the attract demo? verify it doesn't happen on real hw(!)
+GAME( 2000, spec2kh, spec2k, spec2k, spec2k, nmk16_state, spec2k, ORIENTATION_FLIP_Y, "Yona Tech", "Spectrum 2000 (horizontal, buggy) (Europe)", 0 ) // this has odd bugs even on real hardware, eg glitchy 3 step destruction sequence of some larger enemies
+GAME( 2001, firehawk, spec2k, firehawk, firehawk, nmk16_state, 0, ORIENTATION_FLIP_Y, "ESD", "Fire Hawk (horizontal)", 0 )
+GAME( 2001, firehawkv,spec2k, firehawk, firehawkv,nmk16_state, 0, ORIENTATION_FLIP_Y, "ESD", "Fire Hawk (switchable orientation)", MACHINE_NOT_WORKING ) // incomplete dump, vertical mode gfx not dumped
// bee-oh board - different display / interrupt timing to others?
GAME( 1991, manybloc, 0, manybloc, manybloc, nmk16_state, tharrier, ROT270, "Bee-Oh", "Many Block", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp
index afa83f973b2..70760ddec54 100644
--- a/src/mame/drivers/nokia_3310.cpp
+++ b/src/mame/drivers/nokia_3310.cpp
@@ -688,7 +688,7 @@ static INPUT_PORTS_START( noki3310 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( noki3310, noki3310_state )
+static MACHINE_CONFIG_START( noki3310 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7_BE, 26000000 / 2) // MAD2WD1 13 MHz, clock internally supplied to ARM core can be divided by 2, in sleep mode a 32768 Hz clock is used
@@ -873,16 +873,16 @@ ROM_START( noki8890 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-SYST( 1999, noki3210, 0, 0, noki3310, noki3310, driver_device, 0, "Nokia", "Nokia 3210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 1999, noki7110, 0, 0, noki7110, noki3310, driver_device, 0, "Nokia", "Nokia 7110", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 1999, noki8210, 0, 0, noki3310, noki3310, driver_device, 0, "Nokia", "Nokia 8210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 1999, noki8850, 0, 0, noki3310, noki3310, driver_device, 0, "Nokia", "Nokia 8850", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2000, noki3310, 0, 0, noki3310, noki3310, driver_device, 0, "Nokia", "Nokia 3310", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2000, noki6210, 0, 0, noki6210, noki3310, driver_device, 0, "Nokia", "Nokia 6210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2000, noki6250, 0, 0, noki6210, noki3310, driver_device, 0, "Nokia", "Nokia 6250", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2000, noki8250, 0, 0, noki3310, noki3310, driver_device, 0, "Nokia", "Nokia 8250", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2000, noki8890, 0, 0, noki3310, noki3310, driver_device, 0, "Nokia", "Nokia 8890", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2001, noki3330, 0, 0, noki3330, noki3310, driver_device, 0, "Nokia", "Nokia 3330", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2002, noki3410, 0, 0, noki3410, noki3310, driver_device, 0, "Nokia", "Nokia 3410", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
-SYST( 2002, noki5210, 0, 0, noki3330, noki3310, driver_device, 0, "Nokia", "Nokia 5210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+SYST( 1999, noki3210, 0, 0, noki3310, noki3310, noki3310_state, 0, "Nokia", "Nokia 3210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 1999, noki7110, 0, 0, noki7110, noki3310, noki3310_state, 0, "Nokia", "Nokia 7110", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 1999, noki8210, 0, 0, noki3310, noki3310, noki3310_state, 0, "Nokia", "Nokia 8210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 1999, noki8850, 0, 0, noki3310, noki3310, noki3310_state, 0, "Nokia", "Nokia 8850", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2000, noki3310, 0, 0, noki3310, noki3310, noki3310_state, 0, "Nokia", "Nokia 3310", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2000, noki6210, 0, 0, noki6210, noki3310, noki3310_state, 0, "Nokia", "Nokia 6210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2000, noki6250, 0, 0, noki6210, noki3310, noki3310_state, 0, "Nokia", "Nokia 6250", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2000, noki8250, 0, 0, noki3310, noki3310, noki3310_state, 0, "Nokia", "Nokia 8250", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2000, noki8890, 0, 0, noki3310, noki3310, noki3310_state, 0, "Nokia", "Nokia 8890", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2001, noki3330, 0, 0, noki3330, noki3310, noki3310_state, 0, "Nokia", "Nokia 3330", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2002, noki3410, 0, 0, noki3410, noki3310, noki3310_state, 0, "Nokia", "Nokia 3410", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+SYST( 2002, noki5210, 0, 0, noki3330, noki3310, noki3310_state, 0, "Nokia", "Nokia 5210", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index ae4b4db6c39..d0a611f3063 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -1209,7 +1209,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( noraut_base, norautp_state )
+static MACHINE_CONFIG_START( noraut_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, NORAUT_CPU_CLOCK)
@@ -3590,59 +3590,59 @@ DRIVER_INIT_MEMBER(norautp_state,ssa)
/* The following ones are 'Draw Poker HI-LO' type, running in a Z80 based hardware */
/**************************************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-
-GAMEL( 1988, norautp, 0, norautp, norautp, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Poker", 0, layout_noraut11 )
-GAMEL( 198?, norautdx, 0, norautp, norautpn, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Deluxe Poker (console)", 0, layout_noraut12 )
-GAMEL( 198?, norautpn, norautp, norautp, norautpn, driver_device, 0, ROT0, "bootleg", "Noraut Deluxe Poker (bootleg)", 0, layout_noraut12 )
-GAMEL( 198?, norautjo, 0, norautp, mainline, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (original)", 0, layout_noraut12 )
-GAMEL( 198?, norautpl, 0, norautpl, mainline, driver_device, 0, ROT0, "Video Fun Games Ltd.", "Noraut Joker Poker (Prologic HW)", 0, layout_noraut12 )
-GAMEL( 1988, norautjp, norautp, norautp, norautp, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (alt)", 0, layout_noraut11 )
-GAMEL( 1988, norautrh, 0, norautp, norautrh, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Red Hot Joker Poker", 0, layout_noraut12 )
-GAMEL( 198?, norautra, 0, norautp, norautrh, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Red Hot Joker Poker (alt HW)", 0, layout_noraut12 ) // 1-bet?? where??...
-GAME( 1988, norautu, 0, norautxp, norautp, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Poker (NTX10A)", MACHINE_NOT_WORKING )
-GAME( 2002, noraut3a, 0, norautxp, norautp, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (V3.010a)", MACHINE_NOT_WORKING )
-GAME( 2003, noraut3b, 0, norautxp, norautp, driver_device, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (V3.011a)", MACHINE_NOT_WORKING )
-GAMEL( 198?, norautua, 0, norautp, norautp, norautp_state, enc, ROT0, "Noraut Ltd.", "Noraut unknown set 1 (console)", MACHINE_NOT_WORKING, layout_noraut12 )
-GAMEL( 198?, norautub, 0, norautp, norautp, norautp_state, enc, ROT0, "Noraut Ltd.", "Noraut unknown set 2 (console)", MACHINE_NOT_WORKING, layout_noraut12 )
-GAMEL( 198?, mainline, 0, norautp, mainline, driver_device, 0, ROT0, "Mainline London", "Mainline Double Joker Poker", 0, layout_noraut12 )
-GAMEL( 199?, df_djpkr, 0, norautp, mainline, driver_device, 0, ROT0, "DellFern Ltd.", "Double Joker Poker (45%-75% payout)", 0, layout_noraut12 )
-GAMEL( 2005, ndxron10, 0, norautp, ndxron10, driver_device, 0, ROT0, "<unknown>", "Royal on Ten (Noraut Deluxe hack)", 0, layout_noraut12 )
-GAMEL( 1999, cgip30cs, 0, norautx4, norautkl, norautp_state, deb, ROT0, "CGI", "Credit Poker (ver.30c, standard)", 0, layout_noraut12 )
-GAME( 198?, kimblz80, 0, kimble, norautp, driver_device, 0, ROT0, "Kimble Ireland", "Kimble Double HI-LO (z80 version)", MACHINE_NOT_WORKING )
-GAME( 1983, pma, 0, nortest1, norautp, driver_device, 0, ROT0, "PMA", "PMA Poker", MACHINE_NOT_WORKING )
-GAMEL( 198?, bjpoker, 0, norautxp, norautrh, driver_device, 0, ROT0, "M.Kramer Manufacturing.", "Poker / Black Jack (Model 7521)", MACHINE_NOT_WORKING, layout_noraut12 )
-GAME( 19??, newhilop, 0, newhilop, norautp, driver_device, 0, ROT0, "Song Won?", "New Hi-Low Poker", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+
+GAMEL( 1988, norautp, 0, norautp, norautp, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Poker", 0, layout_noraut11 )
+GAMEL( 198?, norautdx, 0, norautp, norautpn, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Deluxe Poker (console)", 0, layout_noraut12 )
+GAMEL( 198?, norautpn, norautp, norautp, norautpn, norautp_state, 0, ROT0, "bootleg", "Noraut Deluxe Poker (bootleg)", 0, layout_noraut12 )
+GAMEL( 198?, norautjo, 0, norautp, mainline, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (original)", 0, layout_noraut12 )
+GAMEL( 198?, norautpl, 0, norautpl, mainline, norautp_state, 0, ROT0, "Video Fun Games Ltd.", "Noraut Joker Poker (Prologic HW)", 0, layout_noraut12 )
+GAMEL( 1988, norautjp, norautp, norautp, norautp, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (alt)", 0, layout_noraut11 )
+GAMEL( 1988, norautrh, 0, norautp, norautrh, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Red Hot Joker Poker", 0, layout_noraut12 )
+GAMEL( 198?, norautra, 0, norautp, norautrh, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Red Hot Joker Poker (alt HW)", 0, layout_noraut12 ) // 1-bet?? where??...
+GAME( 1988, norautu, 0, norautxp, norautp, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Poker (NTX10A)", MACHINE_NOT_WORKING )
+GAME( 2002, noraut3a, 0, norautxp, norautp, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (V3.010a)", MACHINE_NOT_WORKING )
+GAME( 2003, noraut3b, 0, norautxp, norautp, norautp_state, 0, ROT0, "Noraut Ltd.", "Noraut Joker Poker (V3.011a)", MACHINE_NOT_WORKING )
+GAMEL( 198?, norautua, 0, norautp, norautp, norautp_state, enc, ROT0, "Noraut Ltd.", "Noraut unknown set 1 (console)", MACHINE_NOT_WORKING, layout_noraut12 )
+GAMEL( 198?, norautub, 0, norautp, norautp, norautp_state, enc, ROT0, "Noraut Ltd.", "Noraut unknown set 2 (console)", MACHINE_NOT_WORKING, layout_noraut12 )
+GAMEL( 198?, mainline, 0, norautp, mainline, norautp_state, 0, ROT0, "Mainline London", "Mainline Double Joker Poker", 0, layout_noraut12 )
+GAMEL( 199?, df_djpkr, 0, norautp, mainline, norautp_state, 0, ROT0, "DellFern Ltd.", "Double Joker Poker (45%-75% payout)", 0, layout_noraut12 )
+GAMEL( 2005, ndxron10, 0, norautp, ndxron10, norautp_state, 0, ROT0, "<unknown>", "Royal on Ten (Noraut Deluxe hack)", 0, layout_noraut12 )
+GAMEL( 1999, cgip30cs, 0, norautx4, norautkl, norautp_state, deb, ROT0, "CGI", "Credit Poker (ver.30c, standard)", 0, layout_noraut12 )
+GAME( 198?, kimblz80, 0, kimble, norautp, norautp_state, 0, ROT0, "Kimble Ireland", "Kimble Double HI-LO (z80 version)", MACHINE_NOT_WORKING )
+GAME( 1983, pma, 0, nortest1, norautp, norautp_state, 0, ROT0, "PMA", "PMA Poker", MACHINE_NOT_WORKING )
+GAMEL( 198?, bjpoker, 0, norautxp, norautrh, norautp_state, 0, ROT0, "M.Kramer Manufacturing.", "Poker / Black Jack (Model 7521)", MACHINE_NOT_WORKING, layout_noraut12 )
+GAME( 19??, newhilop, 0, newhilop, norautp, norautp_state, 0, ROT0, "Song Won?", "New Hi-Low Poker", MACHINE_NOT_WORKING )
/************************************* 8080 sets **************************************/
/* The following ones are 'Draw Poker HI-LO' type, running in a 8080 based hardware */
/**************************************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-
-GAME( 1983, dphl, 0, dphl, norautp, driver_device, 0, ROT0, "M.Kramer Manufacturing.", "Draw Poker HI-LO (M.Kramer)", MACHINE_NOT_WORKING )
-GAME( 1983, dphla, 0, dphla, norautp, driver_device, 0, ROT0, "<unknown>", "Draw Poker HI-LO (Alt)", MACHINE_NOT_WORKING )
-GAME( 1983, dphljp, 0, dphl, norautp, driver_device, 0, ROT0, "<unknown>", "Draw Poker HI-LO (Japanese)", MACHINE_NOT_WORKING )
-GAME( 198?, kimbldhl, 0, kimbldhl, norautp, driver_device, 0, ROT0, "Kimble Ireland", "Kimble Double HI-LO", MACHINE_NOT_WORKING )
-GAME( 1983, gtipoker, 0, dphl, norautp, driver_device, 0, ROT0, "GTI Inc", "GTI Poker", MACHINE_NOT_WORKING )
-GAME( 1983, gtipokra, 0, dphla, norautp, driver_device, 0, ROT0, "GTI Inc", "GTI Poker? (SMS hardware)", MACHINE_NOT_WORKING )
-GAME( 1983, smshilo, 0, dphla, norautp, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "HI-LO Double Up Joker Poker", MACHINE_NOT_WORKING )
-GAME( 1986, drhl, 0, drhl, norautp, driver_device, 0, ROT0, "Drews Inc.", "Drews Revenge (v.2.89, set 1)", MACHINE_NOT_WORKING )
-GAME( 1986, drhla, 0, drhl, norautp, driver_device, 0, ROT0, "Drews Inc.", "Drews Revenge (v.2.89, set 2)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+
+GAME( 1983, dphl, 0, dphl, norautp, norautp_state, 0, ROT0, "M.Kramer Manufacturing.", "Draw Poker HI-LO (M.Kramer)", MACHINE_NOT_WORKING )
+GAME( 1983, dphla, 0, dphla, norautp, norautp_state, 0, ROT0, "<unknown>", "Draw Poker HI-LO (Alt)", MACHINE_NOT_WORKING )
+GAME( 1983, dphljp, 0, dphl, norautp, norautp_state, 0, ROT0, "<unknown>", "Draw Poker HI-LO (Japanese)", MACHINE_NOT_WORKING )
+GAME( 198?, kimbldhl, 0, kimbldhl, norautp, norautp_state, 0, ROT0, "Kimble Ireland", "Kimble Double HI-LO", MACHINE_NOT_WORKING )
+GAME( 1983, gtipoker, 0, dphl, norautp, norautp_state, 0, ROT0, "GTI Inc", "GTI Poker", MACHINE_NOT_WORKING )
+GAME( 1983, gtipokra, 0, dphla, norautp, norautp_state, 0, ROT0, "GTI Inc", "GTI Poker? (SMS hardware)", MACHINE_NOT_WORKING )
+GAME( 1983, smshilo, 0, dphla, norautp, norautp_state, 0, ROT0, "SMS Manufacturing Corp.", "HI-LO Double Up Joker Poker", MACHINE_NOT_WORKING )
+GAME( 1986, drhl, 0, drhl, norautp, norautp_state, 0, ROT0, "Drews Inc.", "Drews Revenge (v.2.89, set 1)", MACHINE_NOT_WORKING )
+GAME( 1986, drhla, 0, drhl, norautp, norautp_state, 0, ROT0, "Drews Inc.", "Drews Revenge (v.2.89, set 2)", MACHINE_NOT_WORKING )
GAME( 1982, ssjkrpkr, 0, ssjkrpkr, norautp, norautp_state, ssa, ROT0, "Southern Systems & Assembly", "Southern Systems Joker Poker", MACHINE_NOT_WORKING )
/* The following one also has a custom 68705 MCU */
-GAME( 1993, tpoker2, 0, dphltest, norautp, driver_device, 0, ROT0, "Micro Manufacturing", "Turbo Poker 2", MACHINE_NOT_WORKING )
+GAME( 1993, tpoker2, 0, dphltest, norautp, norautp_state, 0, ROT0, "Micro Manufacturing", "Turbo Poker 2", MACHINE_NOT_WORKING )
/************************************ unknown sets ************************************/
/* The following ones are still unknown. No info about name, CPU, manufacturer, or HW */
/**************************************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
-GAME( 198?, fastdrwp, 0, dphl, norautp, driver_device, 0, ROT0, "Stern Electronics?", "Fast Draw (poker conversion kit)?", MACHINE_NOT_WORKING )
-GAME( 198?, dphlunka, 0, dphl, norautp, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Draw Poker HI-LO (unknown, rev 1)", MACHINE_NOT_WORKING )
-GAME( 198?, dphlunkb, 0, dphl, norautp, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Draw Poker HI-LO (unknown, rev 2)", MACHINE_NOT_WORKING )
-GAME( 198?, pkii_dm, 0, nortest1, norautp, driver_device, 0, ROT0, "<unknown>", "Unknown Poker PKII/DM", MACHINE_NOT_WORKING )
+GAME( 198?, fastdrwp, 0, dphl, norautp, norautp_state, 0, ROT0, "Stern Electronics?", "Fast Draw (poker conversion kit)?", MACHINE_NOT_WORKING )
+GAME( 198?, dphlunka, 0, dphl, norautp, norautp_state, 0, ROT0, "SMS Manufacturing Corp.", "Draw Poker HI-LO (unknown, rev 1)", MACHINE_NOT_WORKING )
+GAME( 198?, dphlunkb, 0, dphl, norautp, norautp_state, 0, ROT0, "SMS Manufacturing Corp.", "Draw Poker HI-LO (unknown, rev 2)", MACHINE_NOT_WORKING )
+GAME( 198?, pkii_dm, 0, nortest1, norautp, norautp_state, 0, ROT0, "<unknown>", "Unknown Poker PKII/DM", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index 5a237a0df6a..4d25e7411a1 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -115,7 +115,7 @@ public:
required_device<ay31015_device> m_eiauart;
required_device<crt5027_device> m_crtc;
required_device<dac_word_interface> m_dac;
- required_device<fd1791_t> m_fdc;
+ required_device<fd1791_device> m_fdc;
required_device<floppy_connector> m_floppy0;
floppy_image_device *m_floppy;
@@ -600,7 +600,7 @@ static ADDRESS_MAP_START(notetaker_iocpu_io, AS_IO, 16, notetaker_state)
//AM_RANGE(0xa0, 0xa1) AM_MIRROR(0x7E18) AM_DEVREADWRITE("debug8255", 8255_device, read, write) // debugger board 8255
AM_RANGE(0xc0, 0xc1) AM_MIRROR(0x7E1E) AM_WRITE(FIFOBus_w) // DAC data write to FIFO
AM_RANGE(0x100, 0x101) AM_MIRROR(0x7E1E) AM_WRITE(DiskReg_w) // I/O register (adc speed, crtc pixel clock and clock enable, +5 and +12v relays for floppy, etc)
- AM_RANGE(0x120, 0x127) AM_MIRROR(0x7E18) AM_DEVREADWRITE8("wd1791", fd1791_t, read, write, 0x00FF) // floppy controller
+ AM_RANGE(0x120, 0x127) AM_MIRROR(0x7E18) AM_DEVREADWRITE8("wd1791", fd1791_device, read, write, 0x00FF) // floppy controller
AM_RANGE(0x140, 0x15f) AM_MIRROR(0x7E00) AM_DEVREADWRITE8("crt5027", crt5027_device, read, write, 0x00FF) // crt controller
AM_RANGE(0x160, 0x161) AM_MIRROR(0x7E1E) AM_WRITE(LoadDispAddr_w) // loads the start address for the display framebuffer
AM_RANGE(0x1a0, 0x1a1) AM_MIRROR(0x7E10) AM_READ(ReadEIAStatus_r) // read eia fifo state
@@ -793,7 +793,7 @@ void notetaker_state::ep_reset()
static INPUT_PORTS_START( notetakr )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( notetakr, notetaker_state )
+static MACHINE_CONFIG_START( notetakr )
/* basic machine hardware */
/* IO CPU: 8086@8MHz */
MCFG_CPU_ADD("iocpu", I8086, XTAL_24MHz/3) /* iD8086-2 @ E4A; 24Mhz crystal divided down to 8Mhz by i8284 clock generator */
@@ -925,6 +925,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, notetakr, 0, 0, notetakr, notetakr, notetaker_state, notetakr, "Xerox", "NoteTaker", MACHINE_IS_SKELETON)
-//COMP( 1978, notetakr, 0, 0, notetakr, notetakr, driver_device, notetakr, "Xerox", "NoteTaker", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, notetakr, 0, 0, notetakr, notetakr, notetaker_state, notetakr, "Xerox", "NoteTaker", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp
index 5e6e3b2d491..d46e8c59337 100644
--- a/src/mame/drivers/nova2001.cpp
+++ b/src/mame/drivers/nova2001.cpp
@@ -638,7 +638,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( nova2001, nova2001_state )
+static MACHINE_CONFIG_START( nova2001 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
@@ -676,7 +676,7 @@ static MACHINE_CONFIG_START( nova2001, nova2001_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ninjakun, nova2001_state )
+static MACHINE_CONFIG_START( ninjakun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
@@ -720,7 +720,7 @@ static MACHINE_CONFIG_START( ninjakun, nova2001_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pkunwar, nova2001_state )
+static MACHINE_CONFIG_START( pkunwar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
@@ -757,7 +757,7 @@ static MACHINE_CONFIG_START( pkunwar, nova2001_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( raiders5, nova2001_state )
+static MACHINE_CONFIG_START( raiders5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4) // 3 MHz
@@ -1026,12 +1026,12 @@ DRIVER_INIT_MEMBER(nova2001_state,raiders5)
// many of these don't explicitly state Japan, eg. Nova 2001 could easily be used anywhere.
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1983, nova2001, 0, nova2001, nova2001, driver_device, 0, ROT0, "UPL", "Nova 2001 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, nova2001h, nova2001, nova2001, nova2001, driver_device, 0, ROT0, "UPL", "Nova 2001 (Japan, hack?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, nova2001u, nova2001, nova2001, nova2001, driver_device, 0, ROT0, "UPL (Universal license)", "Nova 2001 (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, ninjakun, 0, ninjakun, ninjakun, driver_device, 0, ROT0, "UPL (Taito license)", "Ninjakun Majou no Bouken", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pkunwar, 0, pkunwar, pkunwar, nova2001_state, pkunwar, ROT0, "UPL", "Penguin-Kun Wars (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pkunwarj, pkunwar, pkunwar, pkunwar, nova2001_state, pkunwar, ROT0, "UPL", "Penguin-Kun Wars (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
+GAME( 1983, nova2001, 0, nova2001, nova2001, nova2001_state, 0, ROT0, "UPL", "Nova 2001 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, nova2001h, nova2001, nova2001, nova2001, nova2001_state, 0, ROT0, "UPL", "Nova 2001 (Japan, hack?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, nova2001u, nova2001, nova2001, nova2001, nova2001_state, 0, ROT0, "UPL (Universal license)", "Nova 2001 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, ninjakun, 0, ninjakun, ninjakun, nova2001_state, 0, ROT0, "UPL (Taito license)", "Ninjakun Majou no Bouken", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pkunwar, 0, pkunwar, pkunwar, nova2001_state, pkunwar, ROT0, "UPL", "Penguin-Kun Wars (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pkunwarj, pkunwar, pkunwar, pkunwar, nova2001_state, pkunwar, ROT0, "UPL", "Penguin-Kun Wars (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, raiders5, 0, raiders5, raiders5, nova2001_state, raiders5, ROT0, "UPL", "Raiders5", MACHINE_SUPPORTS_SAVE )
GAME( 1985, raiders5t, raiders5, raiders5, raiders5, nova2001_state, raiders5, ROT0, "UPL (Taito license)", "Raiders5 (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index 2c969c9f7df..b312bd03c71 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -871,7 +871,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( supercon, novag6502_state )
+static MACHINE_CONFIG_START( supercon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_8MHz/2)
@@ -889,7 +889,7 @@ static MACHINE_CONFIG_START( supercon, novag6502_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cforte, novag6502_state )
+static MACHINE_CONFIG_START( cforte )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, 5000000) // 5MHz
@@ -911,7 +911,7 @@ static MACHINE_CONFIG_START( cforte, novag6502_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sexpert, novag6502_state )
+static MACHINE_CONFIG_START( sexpert )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, XTAL_10MHz/2) // or XTAL_12MHz/2
@@ -1052,17 +1052,17 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1984, supercon, 0, 0, supercon, supercon, driver_device, 0, "Novag", "Super Constellation", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1984, supercon, 0, 0, supercon, supercon, novag6502_state, 0, "Novag", "Super Constellation", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1986, cforteb, 0, 0, cforte, cforte, driver_device, 0, "Novag", "Constellation Forte (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1986, cforteb, 0, 0, cforte, cforte, novag6502_state, 0, "Novag", "Constellation Forte (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, sfortea, 0, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version A, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, sfortea1, sfortea, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version A, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1988, sforteb, sfortea, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, sfortec, sfortea, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version C)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, sfortea, 0, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version A, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, sfortea1, sfortea, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version A, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1988, sforteb, sfortea, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, sfortec, sfortea, 0, sforte, sforte, novag6502_state, sexpert, "Novag", "Super Forte (version C)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, sexperta, 0, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version A)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1988, sexpertb, sexperta, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, sexpertc, sexperta, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version C, V3.6)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, sexpertc1, sexperta, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version C, V1.2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, sexperta, 0, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version A)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1988, sexpertb, sexperta, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, sexpertc, sexperta, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version C, V3.6)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, sexpertc1, sexperta, 0, sexpert, sexpert, novag6502_state, sexpert, "Novag", "Super Expert (version C, V1.2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index d0dbf41b4ab..df0f2c14a43 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -178,7 +178,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( diablo68k, novag68k_state )
+static MACHINE_CONFIG_START( diablo68k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -233,5 +233,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1991, diablo68, 0, 0, diablo68k, diablo68k, driver_device, 0, "Novag", "Diablo 68000", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1991, diablo68, 0, 0, diablo68k, diablo68k, novag68k_state, 0, "Novag", "Diablo 68000", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/novagmcs48.cpp b/src/mame/drivers/novagmcs48.cpp
index 519d3bd6682..071553489b1 100644
--- a/src/mame/drivers/novagmcs48.cpp
+++ b/src/mame/drivers/novagmcs48.cpp
@@ -142,7 +142,7 @@ INPUT_CHANGED_MEMBER(novagmcs48_state::octo_cpu_freq)
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( presto, novagmcs48_state )
+static MACHINE_CONFIG_START( presto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8049, 6000000) // LC circuit, measured
@@ -191,6 +191,6 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-CONS( 1984, npresto, 0, 0, presto, presto, driver_device, 0, "Novag", "Presto (Novag)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, nocto, npresto, 0, octo, octo, driver_device, 0, "Novag", "Octo (Novag)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT INIT COMPANY FULLNAME FLAGS
+CONS( 1984, npresto, 0, 0, presto, presto, novagmcs48_state, 0, "Novag", "Presto (Novag)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, nocto, npresto, 0, octo, octo, novagmcs48_state, 0, "Novag", "Octo (Novag)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp
index 049cd61eb53..bda6dae5913 100644
--- a/src/mame/drivers/nsm.cpp
+++ b/src/mame/drivers/nsm.cpp
@@ -119,7 +119,7 @@ void nsm_state::machine_reset()
static_cast<tms9995_device*>(machine().device("maincpu"))->ready_line(ASSERT_LINE);
}
-static MACHINE_CONFIG_START( nsm, nsm_state )
+static MACHINE_CONFIG_START( nsm )
// CPU TMS9995, standard variant; no line connection
MCFG_TMS99xx_ADD("maincpu", TMS9995, 11052000, nsm_map, nsm_io_map)
@@ -156,4 +156,4 @@ ROM_END
/ The Games (1985)
/-------------------------------------------------------------------*/
-GAME(1985, firebird, 0, nsm, nsm, driver_device, 0, ROT0, "NSM", "Hot Fire Birds", MACHINE_NOT_WORKING | MACHINE_MECHANICAL)
+GAME(1985, firebird, 0, nsm, nsm, nsm_state, 0, ROT0, "NSM", "Hot Fire Birds", MACHINE_NOT_WORKING | MACHINE_MECHANICAL)
diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp
index 6589293b7ef..0eaa0cd662f 100644
--- a/src/mame/drivers/nsmpoker.cpp
+++ b/src/mame/drivers/nsmpoker.cpp
@@ -407,7 +407,7 @@ void nsmpoker_state::machine_reset()
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( nsmpoker, nsmpoker_state )
+static MACHINE_CONFIG_START( nsmpoker )
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, MASTER_CLOCK/2, nsmpoker_map, nsmpoker_portmap)
@@ -457,5 +457,5 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 198?, nsmpoker, 0, nsmpoker, nsmpoker, driver_device, 0, ROT0, "NSM", "NSM Poker (TMS9995)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 198?, nsmpoker, 0, nsmpoker, nsmpoker, nsmpoker_state, 0, ROT0, "NSM", "NSM Poker (TMS9995)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp
index 5c6f8803b27..b96ed39cc6e 100644
--- a/src/mame/drivers/nss.cpp
+++ b/src/mame/drivers/nss.cpp
@@ -817,7 +817,7 @@ void nss_state::machine_reset()
m_joy_flag = 1;
}
-static MACHINE_CONFIG_START( nss, nss_state )
+static MACHINE_CONFIG_START( nss )
/* base snes hardware */
MCFG_CPU_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68Mhz, also 3.58Mhz */
@@ -1069,7 +1069,7 @@ DRIVER_INIT_MEMBER(nss_state,nss)
DRIVER_INIT_CALL(snes);
}
-GAME( 199?, nss, 0, nss, snes, snes_state, snes, ROT0, "Nintendo", "Nintendo Super System BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 199?, nss, 0, nss, snes, nss_state, snes, ROT0, "Nintendo", "Nintendo Super System BIOS", MACHINE_IS_BIOS_ROOT )
GAME( 1992, nss_actr, nss, nss, snes, nss_state, nss, ROT0, "Enix", "Act Raiser (Nintendo Super System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
GAME( 1992, nss_adam, nss, nss, snes, nss_state, nss, ROT0, "Ocean", "The Addams Family (Nintendo Super System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
GAME( 1992, nss_aten, nss, nss, snes, nss_state, nss, ROT0, "Absolute Entertainment Inc.", "David Crane's Amazing Tennis (Nintendo Super System)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp
index 37a603a1fcc..0fcca3191c9 100644
--- a/src/mame/drivers/nwk-tr.cpp
+++ b/src/mame/drivers/nwk-tr.cpp
@@ -765,7 +765,7 @@ void nwktr_state::machine_reset()
m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( nwktr, nwktr_state )
+static MACHINE_CONFIG_START( nwktr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
@@ -822,7 +822,7 @@ static MACHINE_CONFIG_START( nwktr, nwktr_state )
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(2)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_NWKTR)
+ MCFG_KONPPC_CGBOARD_TYPE(NWKTR)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( thrilld, nwktr )
@@ -992,9 +992,9 @@ ROM_END
/*****************************************************************************/
-GAME( 1998, racingj, 0, nwktr, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Racing Jam (JAC)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1998, racingj, 0, nwktr, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Racing Jam (JAC)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
GAME( 1999, racingj2, racingj, nwktr, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Racing Jam: Chapter 2 (EAE)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
GAME( 1999, racingj2j, racingj, nwktr, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Racing Jam: Chapter 2 (JAE)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1998, thrilld, 0, thrilld, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Thrill Drive (JAE)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, thrilldb, thrilld, thrilld, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Thrill Drive (JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, thrilldae, thrilld, thrilld, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Thrill Drive (EAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, thrilld, 0, thrilld, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Thrill Drive (JAE)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, thrilldb, thrilld, thrilld, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Thrill Drive (JAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, thrilldae, thrilld, thrilld, nwktr, nwktr_state, nwktr, ROT0, "Konami", "Thrill Drive (EAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp
index f26b3744a2d..34a721f5e63 100644
--- a/src/mame/drivers/nycaptor.cpp
+++ b/src/mame/drivers/nycaptor.cpp
@@ -778,7 +778,7 @@ void nycaptor_state::machine_reset()
memset(m_vol_ctrl, 0, sizeof(m_vol_ctrl));
}
-static MACHINE_CONFIG_START( nycaptor, nycaptor_state )
+static MACHINE_CONFIG_START( nycaptor )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* ??? */
@@ -844,7 +844,7 @@ static MACHINE_CONFIG_START( nycaptor, nycaptor_state )
// Does the DAC also exist on this board? nycaptor writes 0x80 to 0xd600
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cyclshtg, nycaptor_state )
+static MACHINE_CONFIG_START( cyclshtg )
MCFG_CPU_ADD("maincpu", Z80,8000000/2)
MCFG_CPU_PROGRAM_MAP(cyclshtg_master_map)
@@ -911,7 +911,7 @@ static MACHINE_CONFIG_START( cyclshtg, nycaptor_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bronx, nycaptor_state )
+static MACHINE_CONFIG_START( bronx )
MCFG_CPU_ADD("maincpu", Z80,8000000/2)
MCFG_CPU_PROGRAM_MAP(bronx_master_map)
@@ -1335,8 +1335,8 @@ DRIVER_INIT_MEMBER(nycaptor_state,colt)
m_gametype = 2;
}
-GAME( 1985, nycaptor, 0, nycaptor, nycaptor, nycaptor_state, nycaptor, ROT0, "Taito", "N.Y. Captor", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, nycaptor, 0, nycaptor, nycaptor, nycaptor_state, nycaptor, ROT0, "Taito", "N.Y. Captor", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1986, cyclshtg, 0, cyclshtg, cyclshtg, nycaptor_state, cyclshtg, ROT90, "Taito", "Cycle Shooting", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
/* bootlegs */
-GAME( 1986, bronx, cyclshtg, bronx, bronx, nycaptor_state, bronx, ROT90, "bootleg", "Bronx", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, colt, nycaptor, bronx, colt, nycaptor_state, colt, ROT0, "bootleg", "Colt", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bronx, cyclshtg, bronx, bronx, nycaptor_state, bronx, ROT90, "bootleg", "Bronx", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, colt, nycaptor, bronx, colt, nycaptor_state, colt, ROT0, "bootleg", "Colt", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index cc5e795deb0..11c38f09a09 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -591,7 +591,7 @@ void nyny_state::machine_reset()
*
*************************************/
-static MACHINE_CONFIG_START( nyny, nyny_state )
+static MACHINE_CONFIG_START( nyny )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */
@@ -745,6 +745,6 @@ ROM_END
*
*************************************/
-GAME( 1980, nyny, 0, nyny, nyny, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "New York! New York!", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, nynyg, nyny, nyny, nyny, driver_device, 0, ROT270, "Sigma Enterprises Inc. (Gottlieb license)", "New York! New York! (Gottlieb)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, warcadia,nyny, nyny, nyny, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "Waga Seishun no Arcadia", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, nyny, 0, nyny, nyny, nyny_state, 0, ROT270, "Sigma Enterprises Inc.", "New York! New York!", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, nynyg, nyny, nyny, nyny, nyny_state, 0, ROT270, "Sigma Enterprises Inc. (Gottlieb license)", "New York! New York! (Gottlieb)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, warcadia,nyny, nyny, nyny, nyny_state, 0, ROT270, "Sigma Enterprises Inc.", "Waga Seishun no Arcadia", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp
index 2379a3ea0ea..022dc66a5ed 100644
--- a/src/mame/drivers/ob68k1a.cpp
+++ b/src/mame/drivers/ob68k1a.cpp
@@ -217,7 +217,7 @@ void ob68k1a_state::machine_reset()
// MACHINE_CONFIG( ob68k1a )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ob68k1a, ob68k1a_state )
+static MACHINE_CONFIG_START( ob68k1a )
// basic machine hardware
MCFG_CPU_ADD(MC68000L10_TAG, M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(ob68k1a_mem)
@@ -288,5 +288,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1982, ob68k1a, 0, 0, ob68k1a, ob68k1a, driver_device, 0, "Omnibyte", "OB68K1A", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, ob68k1a, 0, 0, ob68k1a, ob68k1a, ob68k1a_state, 0, "Omnibyte", "OB68K1A", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp
index 2d1f2c9c919..74f2ec1f5ad 100644
--- a/src/mame/drivers/octopus.cpp
+++ b/src/mame/drivers/octopus.cpp
@@ -238,7 +238,7 @@ private:
required_device<pic8259_device> m_pic1;
required_device<pic8259_device> m_pic2;
required_device<mc146818_device> m_rtc;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<i8251_device> m_kb_uart;
@@ -310,7 +310,7 @@ static ADDRESS_MAP_START( octopus_io, AS_IO, 8, octopus_state )
AM_RANGE(0xc8, 0xc8) AM_READWRITE(vidcontrol_r, vidcontrol_w)
AM_RANGE(0xc9, 0xca) AM_READWRITE(video_latch_r, video_latch_w)
// 0xcf: mode control
- AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0xd0, 0xd3) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0xe0, 0xe4) AM_READWRITE(z80_vector_r, z80_vector_w)
AM_RANGE(0xf0, 0xf1) AM_READWRITE(parallel_r, parallel_w)
AM_RANGE(0xf8, 0xff) AM_DEVREADWRITE("ppi", i8255_device, read, write)
@@ -865,7 +865,7 @@ SLOT_INTERFACE_START(octopus_centronics_devices)
SLOT_INTERFACE("printer", CENTRONICS_PRINTER)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( octopus, octopus_state )
+static MACHINE_CONFIG_START( octopus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8088, XTAL_24MHz / 3) // 8MHz
MCFG_CPU_PROGRAM_MAP(octopus_mem)
@@ -897,11 +897,11 @@ static MACHINE_CONFIG_START( octopus, octopus_state )
MCFG_I8237_IN_MEMR_CB(READ8(octopus_state,dma_read))
MCFG_I8237_OUT_MEMW_CB(WRITE8(octopus_state,dma_write))
//MCFG_I8237_IN_IOR_0_CB(NOOP)
- MCFG_I8237_IN_IOR_1_CB(DEVREAD8("fdc",fd1793_t,data_r)) // FDC
+ MCFG_I8237_IN_IOR_1_CB(DEVREAD8("fdc",fd1793_device,data_r)) // FDC
//MCFG_I8237_IN_IOR_2_CB(NOOP)
//MCFG_I8237_IN_IOR_3_CB(NOOP)
//MCFG_I8237_OUT_IOW_0_CB(NOOP)
- MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8("fdc",fd1793_t,data_w)) // FDC
+ MCFG_I8237_OUT_IOW_1_CB(DEVWRITE8("fdc",fd1793_device,data_w)) // FDC
//MCFG_I8237_OUT_IOW_2_CB(NOOP)
//MCFG_I8237_OUT_IOW_3_CB(NOOP)
MCFG_I8237_OUT_DACK_0_CB(WRITELINE(octopus_state, dack4_w))
@@ -1015,5 +1015,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, octopus, 0, 0, octopus, octopus, driver_device, 0, "Digital Microsystems", "LSI Octopus", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, octopus, 0, 0, octopus, octopus, octopus_state, 0, "Digital Microsystems", "LSI Octopus", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp
index 08d266614ad..a7a35b1b95a 100644
--- a/src/mame/drivers/odyssey2.cpp
+++ b/src/mame/drivers/odyssey2.cpp
@@ -657,7 +657,7 @@ static MACHINE_CONFIG_FRAGMENT( odyssey2_cartslot )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( odyssey2, odyssey2_state )
+static MACHINE_CONFIG_START( odyssey2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8048, ( ( XTAL_7_15909MHz * 3 ) / 4 ) )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
@@ -691,7 +691,7 @@ static MACHINE_CONFIG_START( odyssey2, odyssey2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( videopac, odyssey2_state )
+static MACHINE_CONFIG_START( videopac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8048, ( XTAL_17_73447MHz / 3 ) )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
@@ -717,7 +717,7 @@ static MACHINE_CONFIG_START( videopac, odyssey2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( g7400, g7400_state )
+static MACHINE_CONFIG_START( g7400 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8048, XTAL_5_911MHz )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
@@ -758,7 +758,7 @@ static MACHINE_CONFIG_START( g7400, g7400_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( odyssey3, g7400_state )
+static MACHINE_CONFIG_START( odyssey3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8048, XTAL_5_911MHz )
MCFG_CPU_PROGRAM_MAP(odyssey2_mem)
@@ -837,9 +837,9 @@ ROM_START (odyssey3)
ROM_REGION(0x100, "gfx1", ROMREGION_ERASEFF)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, odyssey2, 0, 0, odyssey2, odyssey2, odyssey2_state, odyssey2, "Magnavox", "Odyssey 2", 0 )
-COMP( 1979, videopac, odyssey2, 0, videopac, odyssey2, odyssey2_state, odyssey2, "Philips", "Videopac G7000/C52", 0 )
-COMP( 1983, g7400, odyssey2, 0, g7400, odyssey2, odyssey2_state, odyssey2, "Philips", "Videopac Plus G7400", MACHINE_IMPERFECT_GRAPHICS )
-COMP( 1983, jopac, odyssey2, 0, g7400, odyssey2, odyssey2_state, odyssey2, "Brandt", "Jopac JO7400", MACHINE_IMPERFECT_GRAPHICS )
-COMP( 1983, odyssey3, odyssey2, 0, odyssey3, odyssey2, odyssey2_state, odyssey2, "Magnavox", "Odyssey 3 Command Center (prototype)", MACHINE_IMPERFECT_GRAPHICS )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1978, odyssey2, 0, 0, odyssey2, odyssey2, odyssey2_state, odyssey2, "Magnavox", "Odyssey 2", 0 )
+COMP( 1979, videopac, odyssey2, 0, videopac, odyssey2, odyssey2_state, odyssey2, "Philips", "Videopac G7000/C52", 0 )
+COMP( 1983, g7400, odyssey2, 0, g7400, odyssey2, g7400_state, odyssey2, "Philips", "Videopac Plus G7400", MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1983, jopac, odyssey2, 0, g7400, odyssey2, g7400_state, odyssey2, "Brandt", " Jopac JO7400", MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1983, odyssey3, odyssey2, 0, odyssey3, odyssey2, g7400_state, odyssey2, "Magnavox", "Odyssey 3 Command Center (prototype)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp
index a105469525d..b6bef7c63df 100644
--- a/src/mame/drivers/offtwall.cpp
+++ b/src/mame/drivers/offtwall.cpp
@@ -360,7 +360,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( offtwall, offtwall_state )
+static MACHINE_CONFIG_START( offtwall )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp
index a93238fcdd9..aef61a5398f 100644
--- a/src/mame/drivers/ohmygod.cpp
+++ b/src/mame/drivers/ohmygod.cpp
@@ -318,7 +318,7 @@ void ohmygod_state::machine_reset()
m_scrolly = 0;
}
-static MACHINE_CONFIG_START( ohmygod, ohmygod_state )
+static MACHINE_CONFIG_START( ohmygod )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -346,7 +346,7 @@ static MACHINE_CONFIG_START( ohmygod, ohmygod_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 14000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 14000000/8, PIN7_HIGH)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -399,5 +399,5 @@ DRIVER_INIT_MEMBER(ohmygod_state,naname)
}
-GAME( 1993, ohmygod, 0, ohmygod, ohmygod, ohmygod_state, ohmygod, ROT0, "Atlus", "Oh My God! (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, naname, 0, ohmygod, naname, ohmygod_state, naname, ROT0, "Atlus", "Naname de Magic! (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ohmygod, 0, ohmygod, ohmygod, ohmygod_state, ohmygod, ROT0, "Atlus", "Oh My God! (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, naname, 0, ohmygod, naname, ohmygod_state, naname, ROT0, "Atlus", "Naname de Magic! (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp
index db5558bb817..8b0590a2459 100644
--- a/src/mame/drivers/ojankohs.cpp
+++ b/src/mame/drivers/ojankohs.cpp
@@ -810,7 +810,7 @@ void ojankohs_state::machine_reset()
m_screen_refresh = 0;
}
-static MACHINE_CONFIG_START( ojankohs, ojankohs_state )
+static MACHINE_CONFIG_START( ojankohs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
@@ -847,11 +847,11 @@ static MACHINE_CONFIG_START( ojankohs, ojankohs_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ojankoy, ojankohs_state )
+static MACHINE_CONFIG_START( ojankoy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
@@ -887,11 +887,11 @@ static MACHINE_CONFIG_START( ojankoy, ojankohs_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ccasino, ojankohs_state )
+static MACHINE_CONFIG_START( ccasino )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */
@@ -928,11 +928,11 @@ static MACHINE_CONFIG_START( ccasino, ojankohs_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ojankoc, ojankohs_state )
+static MACHINE_CONFIG_START( ojankoc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */
@@ -966,7 +966,7 @@ static MACHINE_CONFIG_START( ojankoc, ojankohs_state )
MCFG_SOUND_ADD("msm", MSM5205, 8000000/22)
MCFG_MSM5205_VCLK_CB(WRITELINE(ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1080,9 +1080,9 @@ ROM_START( ojankoca )
ROM_END
-GAME( 1986, ojankoc, 0, ojankoc, ojankoc, driver_device, 0, ROT0, "V-System Co.", "Ojanko Club (Japan, Program Ver. 1.3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ojankoca, ojankoc, ojankoc, ojankoc, driver_device, 0, ROT0, "V-System Co.", "Ojanko Club (Japan, Program Ver. 1.2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ojankoy, 0, ojankoy, ojankoy, driver_device, 0, ROT0, "V-System Co.", "Ojanko Yakata (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ojanko2, 0, ojankoy, ojankoy, driver_device, 0, ROT0, "V-System Co.", "Ojanko Yakata 2bankan (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, ccasino, 0, ccasino, ccasino, driver_device, 0, ROT0, "V-System Co.", "Chinese Casino [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, ojankohs, 0, ojankohs, ojankohs, driver_device, 0, ROT0, "V-System Co.", "Ojanko High School (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ojankoc, 0, ojankoc, ojankoc, ojankohs_state, 0, ROT0, "V-System Co.", "Ojanko Club (Japan, Program Ver. 1.3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ojankoca, ojankoc, ojankoc, ojankoc, ojankohs_state, 0, ROT0, "V-System Co.", "Ojanko Club (Japan, Program Ver. 1.2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ojankoy, 0, ojankoy, ojankoy, ojankohs_state, 0, ROT0, "V-System Co.", "Ojanko Yakata (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ojanko2, 0, ojankoy, ojankoy, ojankohs_state, 0, ROT0, "V-System Co.", "Ojanko Yakata 2bankan (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, ccasino, 0, ccasino, ccasino, ojankohs_state, 0, ROT0, "V-System Co.", "Chinese Casino [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, ojankohs, 0, ojankohs, ojankohs, ojankohs_state, 0, ROT0, "V-System Co.", "Ojanko High School (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index 2fa47418255..1de7c0e53f2 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -82,24 +82,25 @@ public:
DECLARE_READ8_MEMBER(okean240_keyboard_r);
DECLARE_WRITE8_MEMBER(okean240_keyboard_w);
DECLARE_READ8_MEMBER(okean240a_keyboard_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE8_MEMBER(scroll_w);
- uint8_t m_term_data;
- uint8_t m_j;
- uint8_t m_scroll;
- required_shared_ptr<uint8_t> m_p_videoram;
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
DECLARE_DRIVER_INIT(okean240);
uint32_t screen_update_okean240(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+ uint8_t m_term_data;
+ uint8_t m_j;
+ uint8_t m_scroll;
+ required_shared_ptr<uint8_t> m_p_videoram;
optional_ioport m_io_modifiers;
ioport_port *m_io_port[11];
required_device<cpu_device> m_maincpu;
-
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
// okean240 requires bit 4 to change
@@ -405,7 +406,7 @@ void okean240_state::machine_reset()
m_scroll = 0;
}
-WRITE8_MEMBER( okean240_state::kbd_put )
+void okean240_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -472,7 +473,7 @@ static GFXDECODE_START( okean240a )
GFXDECODE_END
-static MACHINE_CONFIG_START( okean240t, okean240_state )
+static MACHINE_CONFIG_START( okean240t )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_12MHz / 6)
MCFG_CPU_PROGRAM_MAP(okean240_mem)
@@ -490,7 +491,7 @@ static MACHINE_CONFIG_START( okean240t, okean240_state )
MCFG_PALETTE_ADD_MONOCHROME("palette")
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(okean240_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(okean240_state, kbd_put))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( okean240a, okean240t )
@@ -499,7 +500,7 @@ static MACHINE_CONFIG_DERIVED( okean240a, okean240t )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240a)
MCFG_DEVICE_REMOVE("terminal")
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(okean240_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(okean240_state, kbd_put))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( okean240, okean240t )
@@ -508,7 +509,7 @@ static MACHINE_CONFIG_DERIVED( okean240, okean240t )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240)
MCFG_DEVICE_REMOVE("terminal")
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(okean240_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(okean240_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -531,7 +532,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, okean240, 0, 0, okean240, okean240, okean240_state, okean240, "<unknown>", "Okeah-240", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1986, okean240a, okean240,0, okean240a, okean240a, okean240_state, okean240, "<unknown>", "Ocean-240 with fdd", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1986, okean240t, okean240,0, okean240t, okean240, okean240_state, okean240, "<unknown>", "Ocean-240 Test Rom", MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
+COMP( 1986, okean240, 0, 0, okean240, okean240, okean240_state, okean240, "<unknown>", "Okeah-240", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1986, okean240a, okean240, 0, okean240a, okean240a, okean240_state, okean240, "<unknown>", "Ocean-240 with FDD", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1986, okean240t, okean240, 0, okean240t, okean240, okean240_state, okean240, "<unknown>", "Ocean-240 Test ROM", MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index 5bf02fb5dda..f6518414a62 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -456,7 +456,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(olibochu_state::olibochu_scanline)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xcf); /* RST 08h */
}
-static MACHINE_CONFIG_START( olibochu, olibochu_state )
+static MACHINE_CONFIG_START( olibochu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ?? */
@@ -537,4 +537,4 @@ ROM_END
-GAME( 1981, olibochu, 0, olibochu, olibochu, driver_device, 0, ROT270, "Irem / GDI", "Oli-Boo-Chu", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, olibochu, 0, olibochu, olibochu, olibochu_state, 0, ROT270, "Irem / GDI", "Oli-Boo-Chu", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index 4e6fc310fdd..14377dd571d 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -496,7 +496,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( omegrace, omegrace_state )
+static MACHINE_CONFIG_START( omegrace )
/* basic machine hardware */
diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp
index 40c7028d7e5..bd020405372 100644
--- a/src/mame/drivers/ondra.cpp
+++ b/src/mame/drivers/ondra.cpp
@@ -118,7 +118,7 @@ INTERRUPT_GEN_MEMBER(ondra_state::ondra_interrupt)
}
/* Machine driver */
-static MACHINE_CONFIG_START( ondra, ondra_state )
+static MACHINE_CONFIG_START( ondra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2000000)
MCFG_CPU_PROGRAM_MAP(ondra_mem)
@@ -183,6 +183,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, ondrat, 0, 0, ondra, ondra, driver_device, 0, "Tesla", "Ondra", 0)
-COMP( 1989, ondrav, ondrat, 0, ondra, ondra, driver_device, 0, "ViLi", "Ondra ViLi", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, ondrat, 0, 0, ondra, ondra, ondra_state, 0, "Tesla", "Ondra", 0 )
+COMP( 1989, ondrav, ondrat, 0, ondra, ondra, ondra_state, 0, "ViLi", "Ondra ViLi", 0 )
diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp
index ccbebdc4b76..b2a6d832b90 100644
--- a/src/mame/drivers/oneshot.cpp
+++ b/src/mame/drivers/oneshot.cpp
@@ -360,7 +360,7 @@ void oneshot_state::machine_reset()
m_p2_wobble = 0;
}
-static MACHINE_CONFIG_START( oneshot, oneshot_state )
+static MACHINE_CONFIG_START( oneshot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -392,7 +392,7 @@ static MACHINE_CONFIG_START( oneshot, oneshot_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -494,6 +494,6 @@ ROM_END
-GAME( 1995, maddonna, 0, maddonna, maddonna, driver_device, 0, ROT0, "Tuning", "Mad Donna (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, maddonnb, maddonna, maddonna, maddonna, driver_device, 0, ROT0, "Tuning", "Mad Donna (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, oneshot, 0, oneshot, oneshot , driver_device, 0, ROT0, "Promat", "One Shot One Kill", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, maddonna, 0, maddonna, maddonna, oneshot_state, 0, ROT0, "Tuning", "Mad Donna (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, maddonnb, maddonna, maddonna, maddonna, oneshot_state, 0, ROT0, "Tuning", "Mad Donna (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, oneshot, 0, oneshot, oneshot , oneshot_state, 0, ROT0, "Promat", "One Shot One Kill", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index bbd211588ac..eba79c8557a 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -355,7 +355,7 @@ void onetwo_state::machine_start()
}
-static MACHINE_CONFIG_START( onetwo, onetwo_state )
+static MACHINE_CONFIG_START( onetwo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK) /* 4 MHz */
@@ -391,7 +391,7 @@ static MACHINE_CONFIG_START( onetwo, onetwo_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000*2, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000*2, PIN7_LOW) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -439,5 +439,5 @@ ROM_END
*
*************************************/
-GAME( 1997, onetwo, 0, onetwo, onetwo, driver_device, 0, ROT0, "Barko", "One + Two", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, onetwoe, onetwo, onetwo, onetwo, driver_device, 0, ROT0, "Barko", "One + Two (earlier)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, onetwo, 0, onetwo, onetwo, onetwo_state, 0, ROT0, "Barko", "One + Two", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, onetwoe, onetwo, onetwo, onetwo, onetwo_state, 0, ROT0, "Barko", "One + Two (earlier)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/onyx.cpp b/src/mame/drivers/onyx.cpp
index d77d5f392eb..cb1bab9a754 100644
--- a/src/mame/drivers/onyx.cpp
+++ b/src/mame/drivers/onyx.cpp
@@ -46,7 +46,7 @@ public:
}
DECLARE_MACHINE_RESET(c8002);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(portff05_r);
private:
@@ -63,7 +63,7 @@ READ8_MEMBER( onyx_state::portff05_r )
return 4;
}
-WRITE8_MEMBER( onyx_state::kbd_put )
+void onyx_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -111,7 +111,7 @@ ADDRESS_MAP_END
****************************************************************************/
-static MACHINE_CONFIG_START( c8002, onyx_state )
+static MACHINE_CONFIG_START( c8002 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z8002, XTAL_4MHz )
//MCFG_Z80_DAISY_CHAIN(main_daisy_chain)
@@ -136,7 +136,7 @@ static MACHINE_CONFIG_START( c8002, onyx_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(onyx_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(onyx_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -165,5 +165,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, c8002, 0, 0, c8002, c8002, driver_device, 0, "Onyx", "C8002", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, c8002, 0, 0, c8002, c8002, onyx_state, 0, "Onyx", "C8002", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp
index c33baaebc5d..1d48b814a80 100644
--- a/src/mame/drivers/opwolf.cpp
+++ b/src/mame/drivers/opwolf.cpp
@@ -774,7 +774,7 @@ GFXDECODE_END
MACHINE DRIVERS
***********************************************************/
-static MACHINE_CONFIG_START( opwolf, opwolf_state )
+static MACHINE_CONFIG_START( opwolf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz */
@@ -820,13 +820,13 @@ static MACHINE_CONFIG_START( opwolf, opwolf_state )
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_1)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_2)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
@@ -845,7 +845,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( opwolfb, opwolf_state ) /* OSC clocks unknown for the bootleg, but changed to match original sets */
+static MACHINE_CONFIG_START( opwolfb ) /* OSC clocks unknown for the bootleg, but changed to match original sets */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK ) /* 8 MHz ??? */
@@ -894,13 +894,13 @@ static MACHINE_CONFIG_START( opwolfb, opwolf_state ) /* OSC clocks unknown for t
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_1)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(opwolf_state, opwolf_msm5205_vck_2)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
@@ -1117,10 +1117,10 @@ DRIVER_INIT_MEMBER(opwolf_state,opwolfp)
// MACHINE_IMPERFECT_SOUND is present because the credit sound appears to double trigger. All other sounds seem correct.
-/* year rom parent machine inp init */
-GAME( 1987, opwolf, 0, opwolf, opwolf, opwolf_state, opwolf, ROT0, "Taito Corporation Japan", "Operation Wolf (World, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, opwolfa, opwolf, opwolf, opwolf, opwolf_state, opwolf, ROT0, "Taito Corporation Japan", "Operation Wolf (World, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, opwolfj, opwolf, opwolf, opwolfu, opwolf_state, opwolf, ROT0, "Taito Corporation", "Operation Wolf (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, opwolfu, opwolf, opwolf, opwolfu, opwolf_state, opwolf, ROT0, "Taito America Corporation", "Operation Wolf (US)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+// year rom parent machine inp state init
+GAME( 1987, opwolf, 0, opwolf, opwolf, opwolf_state, opwolf, ROT0, "Taito Corporation Japan", "Operation Wolf (World, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, opwolfa, opwolf, opwolf, opwolf, opwolf_state, opwolf, ROT0, "Taito Corporation Japan", "Operation Wolf (World, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, opwolfj, opwolf, opwolf, opwolfu, opwolf_state, opwolf, ROT0, "Taito Corporation", "Operation Wolf (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, opwolfu, opwolf, opwolf, opwolfu, opwolf_state, opwolf, ROT0, "Taito America Corporation", "Operation Wolf (US)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1987, opwolfb, opwolf, opwolfb, opwolfb, opwolf_state, opwolfb, ROT0, "bootleg (Bear Corporation Korea)", "Operation Bear (bootleg of Operation Wolf)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, opwolfp, opwolf, opwolfp, opwolfp, opwolf_state, opwolfp, ROT0, "Taito Corporation", "Operation Wolf (Japan, prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // unprotected
+GAME( 1987, opwolfp, opwolf, opwolfp, opwolfp, opwolf_state, opwolfp, ROT0, "Taito Corporation", "Operation Wolf (Japan, prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // unprotected
diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp
index d2b27d8ab79..346c7017db2 100644
--- a/src/mame/drivers/orao.cpp
+++ b/src/mame/drivers/orao.cpp
@@ -169,7 +169,7 @@ static INPUT_PORTS_START( orao )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( orao, orao_state )
+static MACHINE_CONFIG_START( orao )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000)
MCFG_CPU_PROGRAM_MAP(orao_mem)
@@ -215,6 +215,6 @@ ROM_START( orao103 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, orao, 0, 0, orao, orao, orao_state, orao, "PEL Varazdin", "Orao 102", 0)
-COMP( 1985, orao103, orao, 0, orao, orao, orao_state, orao103, "PEL Varazdin", "Orao 103", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, orao, 0, 0, orao, orao, orao_state, orao, "PEL Varazdin", "Orao 102", 0 )
+COMP( 1985, orao103, orao, 0, orao, orao, orao_state, orao103, "PEL Varazdin", "Orao 103", 0 )
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp
index 7cbf45b2308..fe05f93004f 100644
--- a/src/mame/drivers/orbit.cpp
+++ b/src/mame/drivers/orbit.cpp
@@ -291,7 +291,7 @@ void orbit_state::machine_reset()
*
*************************************/
-static MACHINE_CONFIG_START( orbit, orbit_state )
+static MACHINE_CONFIG_START( orbit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, MASTER_CLOCK / 16)
@@ -365,4 +365,4 @@ ROM_END
*
*************************************/
-GAME( 1978, orbit, 0, orbit, orbit, driver_device, 0, 0, "Atari", "Orbit", MACHINE_SUPPORTS_SAVE )
+GAME( 1978, orbit, 0, orbit, orbit, orbit_state, 0, 0, "Atari", "Orbit", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index 409d928efdc..6808e9568b6 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -162,7 +162,7 @@ protected:
};
required_device<via6522_device> m_via2;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_memory_region m_telmatic;
required_memory_region m_teleass;
required_memory_region m_hyperbas;
@@ -197,7 +197,7 @@ The telestrat has the memory regions split into 16k blocks.
Memory region &c000-&ffff can be ram or rom. */
static ADDRESS_MAP_START(telestrat_mem, AS_PROGRAM, 8, telestrat_state )
AM_RANGE( 0x0300, 0x030f) AM_DEVREADWRITE("via6522", via6522_device, read, write)
- AM_RANGE( 0x0310, 0x0313) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE( 0x0310, 0x0313) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE( 0x0314, 0x0314) AM_READWRITE(port_314_r, port_314_w)
AM_RANGE( 0x0318, 0x0318) AM_READ(port_318_r)
AM_RANGE( 0x031c, 0x031f) AM_DEVREADWRITE("acia", mos6551_device, read, write)
@@ -766,7 +766,7 @@ static INPUT_PORTS_START(telstrat)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( oric, oric_state )
+static MACHINE_CONFIG_START( oric )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/12)
MCFG_CPU_PROGRAM_MAP(oric_mem)
@@ -828,7 +828,7 @@ static SLOT_INTERFACE_START( telestrat_floppies )
SLOT_INTERFACE( "3dsdd", FLOPPY_3_DSDD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_DERIVED_CLASS( telstrat, oric, telestrat_state )
+static MACHINE_CONFIG_DERIVED( telstrat, oric )
MCFG_CPU_MODIFY( "maincpu" )
MCFG_CPU_PROGRAM_MAP(telestrat_mem)
@@ -953,9 +953,9 @@ ROM_START(prav8dd)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, oric1, 0, 0, oric, oric, driver_device, 0, "Tangerine", "Oric 1" , 0)
-COMP( 1984, orica, oric1, 0, oric, orica, driver_device, 0, "Tangerine", "Oric Atmos" , 0)
-COMP( 1985, prav8d, oric1, 0, prav8d, prav8d, driver_device, 0, "Pravetz", "Pravetz 8D", 0)
-COMP( 1989, prav8dd, oric1, 0, prav8d, prav8d, driver_device, 0, "Pravetz", "Pravetz 8D (Disk ROM)", MACHINE_UNOFFICIAL)
-COMP( 1986, telstrat, oric1, 0, telstrat, telstrat, driver_device, 0, "Tangerine", "Oric Telestrat", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, oric1, 0, 0, oric, oric, oric_state, 0, "Tangerine", "Oric 1" , 0 )
+COMP( 1984, orica, oric1, 0, oric, orica, oric_state, 0, "Tangerine", "Oric Atmos" , 0 )
+COMP( 1985, prav8d, oric1, 0, prav8d, prav8d, oric_state, 0, "Pravetz", "Pravetz 8D", 0 )
+COMP( 1989, prav8dd, oric1, 0, prav8d, prav8d, oric_state, 0, "Pravetz", "Pravetz 8D (Disk ROM)", MACHINE_UNOFFICIAL )
+COMP( 1986, telstrat, oric1, 0, telstrat, telstrat, telestrat_state, 0, "Tangerine", "Oric Telestrat", 0 )
diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp
index 15e2e5947e9..1655b9a63e3 100644
--- a/src/mame/drivers/orion.cpp
+++ b/src/mame/drivers/orion.cpp
@@ -85,7 +85,7 @@ static SLOT_INTERFACE_START( orion_floppies )
SLOT_INTERFACE_END
/* Machine driver */
-static MACHINE_CONFIG_START( orion128, orion_state )
+static MACHINE_CONFIG_START( orion128 )
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(orion128_mem)
MCFG_CPU_IO_MAP(orion128_io)
@@ -157,7 +157,7 @@ static MACHINE_CONFIG_DERIVED( orion128ms, orion128 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( orionz80, orion_state )
+static MACHINE_CONFIG_START( orionz80 )
MCFG_CPU_ADD("maincpu", Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(orionz80_mem)
MCFG_CPU_IO_MAP(orionz80_io)
@@ -236,7 +236,7 @@ static MACHINE_CONFIG_DERIVED( orionz80ms, orionz80 )
MCFG_I8255_OUT_PORTC_CB(WRITE8(radio86_state, radio86_8255_portc_w2))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( orionpro, orion_state )
+static MACHINE_CONFIG_START( orionpro )
MCFG_CPU_ADD("maincpu", Z80, 5000000)
MCFG_CPU_PROGRAM_MAP(orionpro_mem)
MCFG_CPU_IO_MAP(orionpro_io)
@@ -368,11 +368,11 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1990, orion128, 0, 0, orion128, radio86, driver_device, 0, "<unknown>", "Orion 128", 0)
-COMP( 1990, orionms, orion128, 0, orion128ms, ms7007, driver_device, 0, "<unknown>", "Orion 128 (MS7007)", 0)
-COMP( 1990, orionz80, orion128, 0, orionz80, radio86, driver_device, 0, "<unknown>", "Orion 128 + Z80 Card II", 0)
-COMP( 1990, orionide, orion128, 0, orionz80, radio86, driver_device, 0, "<unknown>", "Orion 128 + Z80 Card II + IDE", 0)
-COMP( 1990, orionzms, orion128, 0, orionz80ms, ms7007, driver_device, 0, "<unknown>", "Orion 128 + Z80 Card II (MS7007)", 0)
-COMP( 1990, orionidm, orion128, 0, orionz80ms, ms7007, driver_device, 0, "<unknown>", "Orion 128 + Z80 Card II + IDE (MS7007)", 0)
-COMP( 1994, orionpro, orion128, 0, orionpro, radio86, driver_device, 0, "<unknown>", "Orion Pro", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1990, orion128, 0, 0, orion128, radio86, orion_state, 0, "<unknown>", "Orion 128", 0 )
+COMP( 1990, orionms, orion128, 0, orion128ms, ms7007, orion_state, 0, "<unknown>", "Orion 128 (MS7007)", 0 )
+COMP( 1990, orionz80, orion128, 0, orionz80, radio86, orion_state, 0, "<unknown>", "Orion 128 + Z80 Card II", 0 )
+COMP( 1990, orionide, orion128, 0, orionz80, radio86, orion_state, 0, "<unknown>", "Orion 128 + Z80 Card II + IDE", 0 )
+COMP( 1990, orionzms, orion128, 0, orionz80ms, ms7007, orion_state, 0, "<unknown>", "Orion 128 + Z80 Card II (MS7007)", 0 )
+COMP( 1990, orionidm, orion128, 0, orionz80ms, ms7007, orion_state, 0, "<unknown>", "Orion 128 + Z80 Card II + IDE (MS7007)", 0 )
+COMP( 1994, orionpro, orion128, 0, orionpro, radio86, orion_state, 0, "<unknown>", "Orion Pro", 0 )
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index ec1480cd7b7..fad52267053 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -47,7 +47,7 @@ public:
{ }
required_device<cpu_device> m_maincpu;
- required_device<mb8877_t> m_mb8877;
+ required_device<mb8877_device> m_mb8877;
required_device<ram_device> m_messram;
required_device<pia6821_device> m_pia_0;
required_device<pia6821_device> m_pia_1;
@@ -218,12 +218,12 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( osbexec_io, AS_IO, 8, osbexec_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE( 0x00, 0x03 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE( "pia_0", pia6821_device, read, write) /* 6821 PIA @ UD12 */
- AM_RANGE( 0x04, 0x07 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("ctc", pit8253_device, read, write) /* 8253 @UD1 */
- AM_RANGE( 0x08, 0x0B ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("mb8877", wd_fdc_t, read, write ) /* MB8877 @ UB17 input clock = 1MHz */
- AM_RANGE( 0x0C, 0x0F ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("sio", z80sio2_device, ba_cd_r, ba_cd_w ) /* SIO @ UD4 */
- AM_RANGE( 0x10, 0x13 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE( "pia_1", pia6821_device, read, write) /* 6821 PIA @ UD8 */
- AM_RANGE( 0x14, 0x17 ) AM_SELECT( 0xff00 ) AM_READ(osbexec_kbd_r ) /* KBD */
+ AM_RANGE( 0x00, 0x03 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE( "pia_0", pia6821_device, read, write) /* 6821 PIA @ UD12 */
+ AM_RANGE( 0x04, 0x07 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("ctc", pit8253_device, read, write) /* 8253 @UD1 */
+ AM_RANGE( 0x08, 0x0B ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("mb8877", wd_fdc_device_base, read, write ) /* MB8877 @ UB17 input clock = 1MHz */
+ AM_RANGE( 0x0C, 0x0F ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE("sio", z80sio2_device, ba_cd_r, ba_cd_w ) /* SIO @ UD4 */
+ AM_RANGE( 0x10, 0x13 ) AM_MIRROR( 0xff00 ) AM_DEVREADWRITE( "pia_1", pia6821_device, read, write) /* 6821 PIA @ UD8 */
+ AM_RANGE( 0x14, 0x17 ) AM_SELECT( 0xff00 ) AM_READ(osbexec_kbd_r ) /* KBD */
AM_RANGE( 0x18, 0x1b ) AM_MIRROR( 0xff00 ) AM_READ(osbexec_rtc_r ) /* "RTC" @ UE13/UF13 */
/* ?? - vid ? */
ADDRESS_MAP_END
@@ -557,7 +557,7 @@ static const z80_daisy_config osbexec_daisy_config[] =
};
-static MACHINE_CONFIG_START( osbexec, osbexec_state )
+static MACHINE_CONFIG_START( osbexec )
MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK/6 )
MCFG_CPU_PROGRAM_MAP( osbexec_mem)
MCFG_CPU_IO_MAP( osbexec_io)
@@ -638,5 +638,5 @@ ROM_START( osbexec )
ROM_LOAD( "execv12.ud18", 0x0000, 0x2000, CRC(70798c2f) SHA1(2145a72da563bed1d6d455c77e48cc011a5f1153) ) /* Checksum C6B2 */
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, osbexec, 0, 0, osbexec, osbexec, osbexec_state, osbexec, "Osborne", "Executive", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, osbexec, 0, 0, osbexec, osbexec, osbexec_state, osbexec, "Osborne", "Executive", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp
index 43e5c995e5d..ff62f099c78 100644
--- a/src/mame/drivers/osborne1.cpp
+++ b/src/mame/drivers/osborne1.cpp
@@ -279,7 +279,7 @@ static GFXDECODE_START( osborne1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( osborne1, osborne1_state )
+static MACHINE_CONFIG_START( osborne1 )
MCFG_CPU_ADD("maincpu", Z80, MAIN_CLOCK/4)
MCFG_CPU_PROGRAM_MAP(osborne1_mem)
MCFG_CPU_DECRYPTED_OPCODES_MAP(osborne1_op)
@@ -338,7 +338,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state )
MCFG_SOFTWARE_LIST_ADD("flop_list","osborne1")
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED_CLASS( osborne1nv, osborne1, osborne1nv_state )
+MACHINE_CONFIG_DERIVED( osborne1nv, osborne1 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(osborne1nv_io)
@@ -387,6 +387,6 @@ ROM_START( osborne1nv )
ROM_LOAD( "character_generator_6-29-84.14", 0x0000, 0x800, CRC(6c1eab0d) SHA1(b04459d377a70abc9155a5486003cb795342c801) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, osborne1, 0, 0, osborne1, osborne1, osborne1_state, osborne1, "Osborne", "Osborne-1", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, osborne1nv, osborne1, 0, osborne1nv, osborne1nv, osborne1_state, osborne1, "Osborne/Nuevo", "Osborne-1 (Nuevo Video)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, osborne1, 0, 0, osborne1, osborne1, osborne1_state, osborne1, "Osborne", "Osborne-1", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, osborne1nv, osborne1, 0, osborne1nv, osborne1nv, osborne1nv_state, osborne1, "Osborne/Nuevo", "Osborne-1 (Nuevo Video)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index 92d96939619..08ca2ec45db 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -711,7 +711,7 @@ GFXDECODE_END
/* Machine Drivers */
-static MACHINE_CONFIG_START( osi600, sb2m600_state )
+static MACHINE_CONFIG_START( osi600 )
/* basic machine hardware */
MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
MCFG_CPU_PROGRAM_MAP(osi600_mem)
@@ -742,7 +742,7 @@ static MACHINE_CONFIG_START( osi600, sb2m600_state )
MCFG_RAM_EXTRA_OPTIONS("8K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( uk101, uk101_state )
+static MACHINE_CONFIG_START( uk101 )
/* basic machine hardware */
MCFG_CPU_ADD(M6502_TAG, M6502, UK101_X1/8) // 1 MHz
MCFG_CPU_PROGRAM_MAP(uk101_mem)
@@ -767,7 +767,7 @@ static MACHINE_CONFIG_START( uk101, uk101_state )
MCFG_RAM_EXTRA_OPTIONS("8K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( c1p, c1p_state )
+static MACHINE_CONFIG_START( c1p )
/* basic machine hardware */
MCFG_CPU_ADD(M6502_TAG, M6502, X1/4) // .98304 MHz
MCFG_CPU_PROGRAM_MAP(c1p_mem)
@@ -804,7 +804,7 @@ static MACHINE_CONFIG_START( c1p, c1p_state )
MCFG_RAM_EXTRA_OPTIONS("20K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( c1pmf, c1p, c1pmf_state )
+static MACHINE_CONFIG_DERIVED( c1pmf, c1p )
MCFG_CPU_MODIFY(M6502_TAG)
MCFG_CPU_PROGRAM_MAP(c1pmf_mem)
@@ -893,9 +893,9 @@ DRIVER_INIT_MEMBER(c1p_state,c1p)
/* System Drivers */
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME
-COMP( 1978, sb2m600b, 0, 0, osi600, osi600, driver_device, 0, "Ohio Scientific", "Superboard II Model 600 (Rev. B)", MACHINE_NOT_WORKING)
-//COMP( 1980, sb2m600c, 0, 0, osi600c, osi600, driver_device, 0, "Ohio Scientific", "Superboard II Model 600 (Rev. C)", MACHINE_NOT_WORKING)
-COMP( 1980, c1p, sb2m600b, 0, c1p, osi600, c1p_state, c1p, "Ohio Scientific", "Challenger 1P Series 2", MACHINE_NOT_WORKING)
-COMP( 1980, c1pmf, sb2m600b, 0, c1pmf, osi600, c1p_state, c1p, "Ohio Scientific", "Challenger 1P MF Series 2", MACHINE_NOT_WORKING)
-COMP( 1979, uk101, sb2m600b, 0, uk101, uk101, driver_device, 0, "Compukit", "UK101", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, sb2m600b, 0, 0, osi600, osi600, sb2m600_state, 0, "Ohio Scientific", "Superboard II Model 600 (Rev. B)", MACHINE_NOT_WORKING)
+//COMP( 1980, sb2m600c, 0, 0, osi600c, osi600, sb2m600_state, 0, "Ohio Scientific", "Superboard II Model 600 (Rev. C)", MACHINE_NOT_WORKING)
+COMP( 1980, c1p, sb2m600b, 0, c1p, osi600, c1p_state, c1p, "Ohio Scientific", "Challenger 1P Series 2", MACHINE_NOT_WORKING)
+COMP( 1980, c1pmf, sb2m600b, 0, c1pmf, osi600, c1pmf_state, c1p, "Ohio Scientific", "Challenger 1P MF Series 2", MACHINE_NOT_WORKING)
+COMP( 1979, uk101, sb2m600b, 0, uk101, uk101, uk101_state, 0, "Compukit", "UK101", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp
index afa799bdbb3..fa289e6b08d 100644
--- a/src/mame/drivers/othello.cpp
+++ b/src/mame/drivers/othello.cpp
@@ -389,7 +389,7 @@ void othello_state::machine_reset()
m_n7751_busy = 0;
}
-static MACHINE_CONFIG_START( othello, othello_state )
+static MACHINE_CONFIG_START( othello )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2)
@@ -464,4 +464,4 @@ ROM_START( othello )
ROM_LOAD( "7.ic42", 0x4000, 0x2000, CRC(a76705f7) SHA1(b7d2a65d65d065732ddd0b3b738749369b382b48))
ROM_END
-GAME( 1984, othello, 0, othello, othello, driver_device, 0, ROT0, "Success", "Othello (version 3.0)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, othello, 0, othello, othello, othello_state, 0, ROT0, "Success", "Othello (version 3.0)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp
index 220a6cd735f..ee6c08facd2 100644
--- a/src/mame/drivers/othunder.cpp
+++ b/src/mame/drivers/othunder.cpp
@@ -675,7 +675,7 @@ void othunder_state::machine_reset()
m_ad_irq = 0;
}
-static MACHINE_CONFIG_START( othunder, othunder_state )
+static MACHINE_CONFIG_START( othunder )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", M68000, 24000000/2 ) /* 12 MHz */
@@ -946,8 +946,8 @@ ROM_END
-GAME( 1988, othunder, 0, othunder, othunder, driver_device, 0, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Operation Thunderbolt (World, rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, othundero, othunder, othunder, othunder, driver_device, 0, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Operation Thunderbolt (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, othunderu, othunder, othunder, othundu, driver_device, 0, ORIENTATION_FLIP_X, "Taito America Corporation", "Operation Thunderbolt (US, rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, othunderuo, othunder, othunder, othundu, driver_device, 0, ORIENTATION_FLIP_X, "Taito America Corporation", "Operation Thunderbolt (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, othunderj, othunder, othunder, othundrj, driver_device, 0, ORIENTATION_FLIP_X, "Taito Corporation", "Operation Thunderbolt (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, othunder, 0, othunder, othunder, othunder_state, 0, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Operation Thunderbolt (World, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, othundero, othunder, othunder, othunder, othunder_state, 0, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Operation Thunderbolt (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, othunderu, othunder, othunder, othundu, othunder_state, 0, ORIENTATION_FLIP_X, "Taito America Corporation", "Operation Thunderbolt (US, rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, othunderuo, othunder, othunder, othundu, othunder_state, 0, ORIENTATION_FLIP_X, "Taito America Corporation", "Operation Thunderbolt (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, othunderj, othunder, othunder, othundrj, othunder_state, 0, ORIENTATION_FLIP_X, "Taito Corporation", "Operation Thunderbolt (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/otomedius.cpp b/src/mame/drivers/otomedius.cpp
index 7cd694f8bca..f922f73f660 100644
--- a/src/mame/drivers/otomedius.cpp
+++ b/src/mame/drivers/otomedius.cpp
@@ -62,7 +62,7 @@ void konami_pc_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( konami_pc, konami_pc_state )
+static MACHINE_CONFIG_START( konami_pc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM3, 100000000) // not correct, but why bother?
@@ -94,4 +94,4 @@ ROM_START( otomedius )
DISK_IMAGE( "otomedius", 0, SHA1(9283f8b7cd747be7b8e7321953adbf6cbe926f25) )
ROM_END
-GAME( 2007, otomedius, 0, konami_pc, konami_pc, driver_device, 0, ROT0, "Konami", "Otomedius (ver GGG:J:A:A:2008041801)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2007, otomedius, 0, konami_pc, konami_pc, konami_pc_state, 0, ROT0, "Konami", "Otomedius (ver GGG:J:A:A:2008041801)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index baea234c0d6..7d285d56619 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -319,7 +319,7 @@ void overdriv_state::machine_reset()
}
-static MACHINE_CONFIG_START( overdriv, overdriv_state )
+static MACHINE_CONFIG_START( overdriv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -515,6 +515,6 @@ ROM_START( overdrivb )
ROM_LOAD( "789e02.f1", 0x100000, 0x100000, CRC(bdd3b5c6) SHA1(412332d64052c0a3714f4002c944b0e7d32980a4) )
ROM_END
-GAMEL( 1990, overdriv, 0, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // US version
-GAMEL( 1990, overdriva, overdriv, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // Overseas?
-GAMEL( 1990, overdrivb, overdriv, overdriv, overdriv, driver_device, 0, ROT90, "Konami", "Over Drive (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // Overseas?
+GAMEL( 1990, overdriv, 0, overdriv, overdriv, overdriv_state, 0, ROT90, "Konami", "Over Drive (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // US version
+GAMEL( 1990, overdriva, overdriv, overdriv, overdriv, overdriv_state, 0, ROT90, "Konami", "Over Drive (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // Overseas?
+GAMEL( 1990, overdrivb, overdriv, overdriv, overdriv, overdriv_state, 0, ROT90, "Konami", "Over Drive (set 3)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_overdriv ) // Overseas?
diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp
index 3707ce10c70..12d94156f32 100644
--- a/src/mame/drivers/p112.cpp
+++ b/src/mame/drivers/p112.cpp
@@ -81,7 +81,7 @@ uint32_t p112_state::screen_update_p112(screen_device &screen, bitmap_ind16 &bit
return 0;
}
-static MACHINE_CONFIG_START( p112, p112_state )
+static MACHINE_CONFIG_START( p112 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z180, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(p112_mem)
@@ -125,5 +125,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1996, p112, 0, 0, p112, p112, driver_device, 0, "Dave Brooks", "P112", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1996, p112, 0, 0, p112, p112, p112_state, 0, "Dave Brooks", "P112", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp
index 0472d3dbe44..25f960fcd95 100644
--- a/src/mame/drivers/p2000t.cpp
+++ b/src/mame/drivers/p2000t.cpp
@@ -219,7 +219,7 @@ READ8_MEMBER( p2000t_state::videoram_r )
}
/* Machine definition */
-static MACHINE_CONFIG_START( p2000t, p2000t_state )
+static MACHINE_CONFIG_START( p2000t )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(p2000t_mem)
@@ -246,7 +246,7 @@ MACHINE_CONFIG_END
/* Machine definition */
-static MACHINE_CONFIG_START( p2000m, p2000t_state )
+static MACHINE_CONFIG_START( p2000m )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(p2000m_mem)
@@ -290,6 +290,6 @@ ROM_START(p2000m)
ROM_LOAD("p2000.chr", 0x0140, 0x08c0, BAD_DUMP CRC(78c17e3e) SHA1(4e1c59dc484505de1dc0b1ba7e5f70a54b0d4ccc))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1980, p2000t, 0, 0, p2000t, p2000t, driver_device, 0, "Philips", "Philips P2000T", 0)
-COMP ( 1980, p2000m, p2000t, 0, p2000m, p2000t, driver_device, 0, "Philips", "Philips P2000M", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1980, p2000t, 0, 0, p2000t, p2000t, p2000t_state, 0, "Philips", "Philips P2000T", 0 )
+COMP ( 1980, p2000m, p2000t, 0, p2000m, p2000t, p2000t_state, 0, "Philips", "Philips P2000M", 0 )
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index 11735b65f05..ddb3cbd0588 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -79,8 +79,8 @@ public:
DECLARE_WRITE8_MEMBER(p8k_port24_w);
DECLARE_READ16_MEMBER(portff82_r);
DECLARE_WRITE16_MEMBER(portff82_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
- DECLARE_WRITE8_MEMBER(kbd_put_16);
+ void kbd_put(u8 data);
+ void kbd_put_16(u8 data);
uint8_t m_term_data;
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
@@ -189,7 +189,7 @@ WRITE8_MEMBER( p8k_state::p8k_port24_w )
m_terminal->write(space, 0, data);
}
-WRITE8_MEMBER( p8k_state::kbd_put )
+void p8k_state::kbd_put(u8 data)
{
address_space &mem = m_maincpu->space(AS_PROGRAM);
m_term_data = data;
@@ -342,7 +342,7 @@ DRIVER_INIT_MEMBER(p8k_state,p8k)
****************************************************************************/
-WRITE8_MEMBER( p8k_state::kbd_put_16 )
+void p8k_state::kbd_put_16(u8 data)
{
address_space &mem = m_maincpu->space(AS_DATA);
// keyboard int handler is at 0x0700
@@ -465,7 +465,7 @@ GFXDECODE_END
****************************************************************************/
-static MACHINE_CONFIG_START( p8k, p8k_state )
+static MACHINE_CONFIG_START( p8k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz )
MCFG_Z80_DAISY_CHAIN(p8k_daisy_chain)
@@ -522,10 +522,10 @@ static MACHINE_CONFIG_START( p8k, p8k_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(p8k_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(p8k_state, kbd_put))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( p8k_16, p8k_state )
+static MACHINE_CONFIG_START( p8k_16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z8001, XTAL_4MHz )
MCFG_Z80_DAISY_CHAIN(p8k_16_daisy_chain)
@@ -562,7 +562,7 @@ static MACHINE_CONFIG_START( p8k_16, p8k_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(p8k_state, kbd_put_16))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(p8k_state, kbd_put_16))
MACHINE_CONFIG_END
/* ROM definition */
@@ -592,6 +592,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, p8000, 0, 0, p8k, p8k, p8k_state, p8k, "EAW electronic Treptow", "P8000 (8bit Board)", MACHINE_NOT_WORKING)
-COMP( 1989, p8000_16, p8000, 0, p8k_16, p8k, driver_device, 0, "EAW electronic Treptow", "P8000 (16bit Board)", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, p8000, 0, 0, p8k, p8k, p8k_state, p8k, "EAW electronic Treptow", "P8000 (8bit Board)", MACHINE_NOT_WORKING)
+COMP( 1989, p8000_16, p8000, 0, p8k_16, p8k, p8k_state, 0, "EAW electronic Treptow", "P8000 (16bit Board)", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp
index 37999a46caf..49b244a8aa4 100644
--- a/src/mame/drivers/pachifev.cpp
+++ b/src/mame/drivers/pachifev.cpp
@@ -339,7 +339,7 @@ void pachifev_state::machine_start()
save_item(NAME(m_cnt));
}
-static MACHINE_CONFIG_START( pachifev, pachifev_state )
+static MACHINE_CONFIG_START( pachifev )
// CPU TMS9995, standard variant; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9995, XTAL_12MHz, pachifev_map, pachifev_cru)
@@ -380,4 +380,4 @@ ROM_START( pachifev )
ROM_END
-GAME( 1983, pachifev, 0, pachifev, pachifev, driver_device, 0, ROT270, "Sanki Denshi Kogyo", "Pachifever", MACHINE_IMPERFECT_SOUND )
+GAME( 1983, pachifev, 0, pachifev, pachifev, pachifev_state, 0, ROT270, "Sanki Denshi Kogyo", "Pachifever", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index 8af5fcafd5b..487ca655278 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -426,7 +426,7 @@ INTERRUPT_GEN_MEMBER(pacland_state::mcu_vblank_irq)
m_mcu->set_input_line(0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( pacland, pacland_state )
+static MACHINE_CONFIG_START( pacland )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_49_152MHz/32) /* 1.536 MHz */
@@ -640,8 +640,8 @@ ROM_END
-GAME( 1984, pacland, 0, pacland, pacland, driver_device, 0, ROT0, "Namco", "Pac-Land (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, paclandj, pacland, pacland, pacland, driver_device, 0, ROT0, "Namco", "Pac-Land (Japan new)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, paclandjo, pacland, pacland, pacland, driver_device, 0, ROT0, "Namco", "Pac-Land (Japan old)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, paclandjo2,pacland, pacland, pacland, driver_device, 0, ROT0, "Namco", "Pac-Land (Japan older)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, paclandm, pacland, pacland, pacland, driver_device, 0, ROT0, "Namco (Bally Midway license)", "Pac-Land (Midway)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pacland, 0, pacland, pacland, pacland_state, 0, ROT0, "Namco", "Pac-Land (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paclandj, pacland, pacland, pacland, pacland_state, 0, ROT0, "Namco", "Pac-Land (Japan new)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paclandjo, pacland, pacland, pacland, pacland_state, 0, ROT0, "Namco", "Pac-Land (Japan old)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paclandjo2,pacland, pacland, pacland, pacland_state, 0, ROT0, "Namco", "Pac-Land (Japan older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, paclandm, pacland, pacland, pacland, pacland_state, 0, ROT0, "Namco (Bally Midway license)", "Pac-Land (Midway)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index 292afc0e2f1..52b70e6cf27 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -3558,7 +3558,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( pacman, pacman_state )
+static MACHINE_CONFIG_START( pacman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
@@ -7275,35 +7275,35 @@ DRIVER_INIT_MEMBER(pacman_state,cannonbp)
*
*************************************/
-/* rom parent machine inp init */
-GAME( 1980, puckman, 0, pacman, pacman, driver_device, 0, ROT90, "Namco", "Puck Man (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, puckmanb, puckman, pacman, pacman, driver_device, 0, ROT90, "bootleg", "Puck Man (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, puckmanf, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Puck Man (speedup hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, puckmanh, puckman, pacman, pacman, driver_device, 0, ROT90, "bootleg (Falcom?)", "Puck Man (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, pacman, puckman, pacman, pacman, driver_device, 0, ROT90, "Namco (Midway license)", "Pac-Man (Midway)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, pacmanso, puckman, pacman, pacman, driver_device, 0, ROT90, "Namco (Sonic license)", "Pac-Man (SegaSA / Sonic)", MACHINE_SUPPORTS_SAVE ) // from SegaSA / Sonic, could be licensed, could be bootleg - it ignores the service mode credit settings despite listing them which is suspicious
-GAME( 1980, pacmanf, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Pac-Man (Midway, speedup hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, puckmod, puckman, pacman, pacman, driver_device, 0, ROT90, "Namco", "Puck Man (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pacmod, puckman, pacman, pacman, driver_device, 0, ROT90, "Namco (Midway license)", "Pac-Man (Midway, harder)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pacmanjpm,puckman, pacman, pacman, driver_device, 0, ROT90, "bootleg (JPM)", "Pac-Man (JPM bootleg)", MACHINE_SUPPORTS_SAVE ) // aka 'Muncher', UK bootleg, JPM later made fruit machines etc.
-GAME( 1980, pacmanpe, puckman, pacman, pacmanpe, driver_device, 0, ROT90, "bootleg (Petaco SA)", "Come Come (Petaco SA bootleg of Puck Man)", MACHINE_SUPPORTS_SAVE ) // might have a speed-up button, check
-GAME( 1980, newpuc2, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Newpuc2 (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, newpuc2b, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Newpuc2 (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, newpuckx, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "New Puck-X", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pacheart, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Pac-Man (Hearts)", MACHINE_SUPPORTS_SAVE )
-GAME( 198?, bucaner, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Buccaneer", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hangly, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Hangly-Man (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hangly2, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Hangly-Man (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hangly3, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Hangly-Man (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, popeyeman,puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Popeye-Man", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, pacuman, puckman, pacman, pacuman, driver_device, 0, ROT90, "bootleg (Recreativos Franco S.A.)", "Pacu-Man (Spanish bootleg of Puck Man)", MACHINE_SUPPORTS_SAVE ) // common bootleg in Spain, code is shifted a bit compared to the Puck Man sets. Title & Manufacturer info from cabinet/PCB, not displayed ingame
-GAME( 1980, crockman, puckman, pacman, pacman, driver_device, 0, ROT90, "bootleg (Rene Pierre)", "Crock-Man", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, joyman, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Joyman", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, ctrpllrp, puckman, pacman, pacman, driver_device, 0, ROT90, "hack", "Caterpillar Pacman Hack", MACHINE_SUPPORTS_SAVE )
+// rom parent machine inp state init
+GAME( 1980, puckman, 0, pacman, pacman, pacman_state, 0, ROT90, "Namco", "Puck Man (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, puckmanb, puckman, pacman, pacman, pacman_state, 0, ROT90, "bootleg", "Puck Man (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, puckmanf, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Puck Man (speedup hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, puckmanh, puckman, pacman, pacman, pacman_state, 0, ROT90, "bootleg (Falcom?)", "Puck Man (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, pacman, puckman, pacman, pacman, pacman_state, 0, ROT90, "Namco (Midway license)", "Pac-Man (Midway)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, pacmanso, puckman, pacman, pacman, pacman_state, 0, ROT90, "Namco (Sonic license)", "Pac-Man (SegaSA / Sonic)", MACHINE_SUPPORTS_SAVE ) // from SegaSA / Sonic, could be licensed, could be bootleg - it ignores the service mode credit settings despite listing them which is suspicious
+GAME( 1980, pacmanf, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Pac-Man (Midway, speedup hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, puckmod, puckman, pacman, pacman, pacman_state, 0, ROT90, "Namco", "Puck Man (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pacmod, puckman, pacman, pacman, pacman_state, 0, ROT90, "Namco (Midway license)", "Pac-Man (Midway, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pacmanjpm,puckman, pacman, pacman, pacman_state, 0, ROT90, "bootleg (JPM)", "Pac-Man (JPM bootleg)", MACHINE_SUPPORTS_SAVE ) // aka 'Muncher', UK bootleg, JPM later made fruit machines etc.
+GAME( 1980, pacmanpe, puckman, pacman, pacmanpe, pacman_state, 0, ROT90, "bootleg (Petaco SA)", "Come Come (Petaco SA bootleg of Puck Man)", MACHINE_SUPPORTS_SAVE ) // might have a speed-up button, check
+GAME( 1980, newpuc2, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Newpuc2 (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, newpuc2b, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Newpuc2 (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, newpuckx, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "New Puck-X", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pacheart, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Pac-Man (Hearts)", MACHINE_SUPPORTS_SAVE )
+GAME( 198?, bucaner, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Buccaneer", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hangly, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Hangly-Man (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hangly2, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Hangly-Man (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hangly3, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Hangly-Man (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, popeyeman,puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Popeye-Man", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, pacuman, puckman, pacman, pacuman, pacman_state, 0, ROT90, "bootleg (Recreativos Franco S.A.)", "Pacu-Man (Spanish bootleg of Puck Man)", MACHINE_SUPPORTS_SAVE ) // common bootleg in Spain, code is shifted a bit compared to the Puck Man sets. Title & Manufacturer info from cabinet/PCB, not displayed ingame
+GAME( 1980, crockman, puckman, pacman, pacman, pacman_state, 0, ROT90, "bootleg (Rene Pierre)", "Crock-Man", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, joyman, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Joyman", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, ctrpllrp, puckman, pacman, pacman, pacman_state, 0, ROT90, "hack", "Caterpillar Pacman Hack", MACHINE_SUPPORTS_SAVE )
GAME( 1981, piranha, puckman, piranha, mspacman, pacman_state, eyes, ROT90, "GL (US Billiards license)", "Piranha", MACHINE_SUPPORTS_SAVE )
GAME( 1981, piranhao, puckman, piranha, mspacman, pacman_state, eyes, ROT90, "GL (US Billiards license)", "Piranha (older)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, abscam, puckman, piranha, mspacman, pacman_state, eyes, ROT90, "GL (US Billiards license)", "Abscam", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, piranhah, puckman, pacman, mspacman, driver_device, 0, ROT90, "hack", "Piranha (hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, piranhah, puckman, pacman, mspacman, pacman_state, 0, ROT90, "hack", "Piranha (hack)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, pacplus, 0, pacman, pacman, pacman_state, pacplus, ROT90, "Namco (Midway license)", "Pac-Man Plus", MACHINE_SUPPORTS_SAVE )
@@ -7313,30 +7313,30 @@ GAME( 1981, mspacmat, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT
GAME( 1989, msheartb, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT90, "hack (Two-Bit Score)", "Ms. Pac-Man Heart Burn", MACHINE_SUPPORTS_SAVE )
GAME( 1981, pacgal2, mspacman, mspacman, mspacman, pacman_state, mspacman, ROT90, "bootleg", "Pac-Gal (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, mspacmancr,mspacman,mspacman, mspacman, pacman_state, mspacman, ROT90, "bootleg", "Ms. Pac-Man (bootleg on Crush Roller Hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mspacmab, mspacman, woodpek, mspacman, driver_device, 0, ROT90, "bootleg", "Ms. Pac-Man (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mspacmab2,mspacman, woodpek, mspacman, driver_device, 0, ROT90, "bootleg", "Ms. Pac-Man (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mspacmab, mspacman, woodpek, mspacman, pacman_state, 0, ROT90, "bootleg", "Ms. Pac-Man (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mspacmab2,mspacman, woodpek, mspacman, pacman_state, 0, ROT90, "bootleg", "Ms. Pac-Man (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, mspacmbe, mspacman, woodpek, mspacman, pacman_state, mspacmbe, ROT90, "bootleg", "Ms. Pac-Man (bootleg, encrypted)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, mspacii, mspacman, woodpek, mspacman, pacman_state, mspacii, ROT90, "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, mspacii2, mspacman, woodpek, mspacman, pacman_state, mspacii, ROT90, "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pacgal, mspacman, woodpek, mspacman, driver_device, 0, ROT90, "hack", "Pac-Gal (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mspacpls, mspacman, woodpek, mspacpls, driver_device, 0, ROT90, "hack", "Ms. Pac-Man Plus", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pacgal, mspacman, woodpek, mspacman, pacman_state, 0, ROT90, "hack", "Pac-Gal (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mspacpls, mspacman, woodpek, mspacpls, pacman_state, 0, ROT90, "hack", "Ms. Pac-Man Plus", MACHINE_SUPPORTS_SAVE )
GAME( 1992, mschamp, mspacman, mschamp, mschamp, pacman_state, mschamp, ROT90, "hack", "Ms. Pacman Champion Edition / Zola-Puc Gal", MACHINE_SUPPORTS_SAVE ) /* Rayglo version */
GAME( 1995, mschamps, mspacman, mschamp, mschamp, pacman_state, mschamp, ROT90, "hack", "Ms. Pacman Champion Edition / Super Zola-Puc Gal", MACHINE_SUPPORTS_SAVE )
// These bootlegs have MADE IN GREECE clearly visible and etched into the PCBs. They were very common in Spain with several operators having their own versions.
// Based on the PCBs and copyright dates shown they were produced late 80s / early 90s. Usually they run a version of Ms. Pacman, but were sometimes converted back to regular Pac-Man
-GAME( 198?, mspacmanbg, mspacman,woodpek, mspacman, driver_device, 0, ROT90, "bootleg", "Ms. Pac-Man ('Made in Greece' bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mspacmanbgd,mspacman,woodpek, mspacman, driver_device, 0, ROT90, "bootleg (Datamat)", "Miss Pukman ('Made in Greece' Datamat bootleg)", MACHINE_SUPPORTS_SAVE ) // shows 'Miss Pukman 1991/1992' but confirmed to be the bootleg distributed by Datamat
-GAME( 1992, mspacmanblt,mspacman,woodpek, mspacman, driver_device, 0, ROT90, "bootleg (Triunvi)", "Come-Cocos (Ms. Pac-Man) ('Made in Greece' Triunvi bootleg)", MACHINE_SUPPORTS_SAVE ) //
-GAME( 1991, mspacmanbcc,mspacman,woodpek, mspacman, driver_device, 0, ROT90, "bootleg (Tecnausa)", "Come-Cocos (Ms. Pac-Man) ('Made in Greece' Tecnausa bootleg)", MACHINE_SUPPORTS_SAVE ) // ^ same PCB, also dated 1991, distributed by Tecnausa
-GAME( 1991, mspacmanbhe,mspacman,woodpek, mspacman, driver_device, 0, ROT90, "bootleg (Herle SA)", "Come-Cocos (Ms. Pac-Man) ('Made in Greece' Herle SA bootleg)", MACHINE_SUPPORTS_SAVE ) // ^ same PCB
-GAME( 198?, pacmansp, puckman, pacman, pacmansp, driver_device, 0, ROT90, "bootleg", "Puck Man (Spanish, 'Made in Greece' bootleg)", MACHINE_SUPPORTS_SAVE ) // probably a further conversion of the mspacmanbg bootleg, still has some MS Pacman code + extra features
+GAME( 198?, mspacmanbg, mspacman,woodpek, mspacman, pacman_state, 0, ROT90, "bootleg", "Ms. Pac-Man ('Made in Greece' bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mspacmanbgd,mspacman,woodpek, mspacman, pacman_state, 0, ROT90, "bootleg (Datamat)", "Miss Pukman ('Made in Greece' Datamat bootleg)", MACHINE_SUPPORTS_SAVE ) // shows 'Miss Pukman 1991/1992' but confirmed to be the bootleg distributed by Datamat
+GAME( 1992, mspacmanblt,mspacman,woodpek, mspacman, pacman_state, 0, ROT90, "bootleg (Triunvi)", "Come-Cocos (Ms. Pac-Man) ('Made in Greece' Triunvi bootleg)", MACHINE_SUPPORTS_SAVE ) //
+GAME( 1991, mspacmanbcc,mspacman,woodpek, mspacman, pacman_state, 0, ROT90, "bootleg (Tecnausa)", "Come-Cocos (Ms. Pac-Man) ('Made in Greece' Tecnausa bootleg)", MACHINE_SUPPORTS_SAVE ) // ^ same PCB, also dated 1991, distributed by Tecnausa
+GAME( 1991, mspacmanbhe,mspacman,woodpek, mspacman, pacman_state, 0, ROT90, "bootleg (Herle SA)", "Come-Cocos (Ms. Pac-Man) ('Made in Greece' Herle SA bootleg)", MACHINE_SUPPORTS_SAVE ) // ^ same PCB
+GAME( 198?, pacmansp, puckman, pacman, pacmansp, pacman_state, 0, ROT90, "bootleg", "Puck Man (Spanish, 'Made in Greece' bootleg)", MACHINE_SUPPORTS_SAVE ) // probably a further conversion of the mspacmanbg bootleg, still has some MS Pacman code + extra features
-GAME( 1989, clubpacm, 0, woodpek, mspacman, driver_device, 0, ROT90, "Miky SRL", "Pacman Club / Club Lambada (Argentina)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1990, clubpacma, clubpacm, woodpek, mspacman, driver_device, 0, ROT90, "Miky SRL", "Pacman Club (set 1, Argentina)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1990, clubpacmb, clubpacm, woodpek, mspacman, driver_device, 0, ROT90, "Miky SRL", "Pacman Club (set 2, Argentina)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1989, clubpacm, 0, woodpek, mspacman, pacman_state, 0, ROT90, "Miky SRL", "Pacman Club / Club Lambada (Argentina)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1990, clubpacma, clubpacm, woodpek, mspacman, pacman_state, 0, ROT90, "Miky SRL", "Pacman Club (set 1, Argentina)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1990, clubpacmb, clubpacm, woodpek, mspacman, pacman_state, 0, ROT90, "Miky SRL", "Pacman Club (set 2, Argentina)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
GAME( 1985, jumpshot, 0, pacman, jumpshot, pacman_state, jumpshot, ROT90, "Bally Midway", "Jump Shot", MACHINE_SUPPORTS_SAVE )
GAME( 1985, jumpshotp,jumpshot, pacman, jumpshotp,pacman_state, jumpshot, ROT90, "Bally Midway", "Jump Shot Engineering Sample", MACHINE_SUPPORTS_SAVE )
@@ -7344,35 +7344,35 @@ GAME( 1985, jumpshotp,jumpshot, pacman, jumpshotp,pacman_state, jumpshot, ROT
GAME( 1985, shootbul, 0, pacman, shootbul, pacman_state, jumpshot, ROT90, "Bally Midway", "Shoot the Bull", MACHINE_SUPPORTS_SAVE )
GAME( 1981, crush, 0, pacmanp, maketrax, pacman_state, maketrax, ROT90, "Alpha Denshi Co. / Kural Samno Electric, Ltd.", "Crush Roller (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, crush2, crush, pacman, maketrax, driver_device, 0, ROT90, "Alpha Denshi Co. / Kural Esco Electric, Ltd.", "Crush Roller (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, crush2, crush, pacman, maketrax, pacman_state, 0, ROT90, "Alpha Denshi Co. / Kural Esco Electric, Ltd.", "Crush Roller (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, crush3, crush, pacmanp, maketrax, pacman_state, maketrax, ROT90, "Alpha Denshi Co. / Kural Electric, Ltd.", "Crush Roller (set 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, crush4, crush, pacman, maketrax, pacman_state, eyes, ROT90, "Alpha Denshi Co. / Kural Electric, Ltd.", "Crush Roller (set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, crush5, crush, crush4, crush4, driver_device, 0, ROT90, "Alpha Denshi Co. / Kural TWT", "Crush Roller (set 5)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, crush5, crush, crush4, crush4, pacman_state, 0, ROT90, "Alpha Denshi Co. / Kural TWT", "Crush Roller (set 5)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, maketrax, crush, pacmanp, maketrax, pacman_state, maketrax, ROT270, "Alpha Denshi Co. / Kural (Williams license)", "Make Trax (US set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, maketrxb, crush, pacmanp, maketrax, pacman_state, maketrax, ROT270, "Alpha Denshi Co. / Kural (Williams license)", "Make Trax (US set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, korosuke, crush, pacmanp, korosuke, pacman_state, korosuke, ROT90, "Alpha Denshi Co. / Kural Electric, Ltd.", "Korosuke Roller (Japan)", MACHINE_SUPPORTS_SAVE ) // ADK considers it a sequel?
-GAME( 1981, crushrlf, crush, pacman, maketrax, driver_device, 0, ROT90, "bootleg", "Crush Roller (Famaresa PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, crushbl, crush, pacman, maketrax, driver_device, 0, ROT90, "bootleg", "Crush Roller (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, crushrlf, crush, pacman, maketrax, pacman_state, 0, ROT90, "bootleg", "Crush Roller (Famaresa PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, crushbl, crush, pacman, maketrax, pacman_state, 0, ROT90, "bootleg", "Crush Roller (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, crushbl2, crush, pacmanp, mbrush, pacman_state, maketrax, ROT90, "bootleg", "Crush Roller (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, crushbl3, crush, pacmanp, mbrush, pacman_state, maketrax, ROT90, "bootleg", "Crush Roller (bootleg set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, crushs, crush, crushs, crushs, driver_device, 0, ROT90, "bootleg (Sidam)", "Crush Roller (bootleg set 4)", MACHINE_SUPPORTS_SAVE ) // Sidam PCB, no Sidam text
+GAME( 1981, crushs, crush, crushs, crushs, pacman_state, 0, ROT90, "bootleg (Sidam)", "Crush Roller (bootleg set 4)", MACHINE_SUPPORTS_SAVE ) // Sidam PCB, no Sidam text
GAME( 1981, mbrush, crush, pacmanp, mbrush, pacman_state, maketrax, ROT90, "bootleg (Olympia)", "Magic Brush (bootleg of Crush Roller)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, paintrlr, crush, pacman, paintrlr, driver_device, 0, ROT90, "bootleg", "Paint Roller (bootleg of Crush Roller)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, paintrlr, crush, pacman, paintrlr, pacman_state, 0, ROT90, "bootleg", "Paint Roller (bootleg of Crush Roller)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, eyes, 0, pacman, eyes, pacman_state, eyes, ROT90, "Techstar (Rock-Ola license)", "Eyes (US set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, eyes2, eyes, pacman, eyes, pacman_state, eyes, ROT90, "Techstar (Rock-Ola license)", "Eyes (US set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, eyesb, eyes, pacman, eyes, pacman_state, eyes, ROT90, "bootleg", "Eyes (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, eyeszac, eyes, pacman, eyes, pacman_state, eyes, ROT90, "Techstar (Zaccaria license)", "Eyes (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // bad dump
-GAME( 1982, eyeszacb, eyes, pacman, eyes, driver_device, 0, ROT90, "bootleg", "Eyes (bootleg set 2, decrypted)", MACHINE_SUPPORTS_SAVE ) // based on Zaccaria version
+GAME( 1982, eyeszacb, eyes, pacman, eyes, pacman_state, 0, ROT90, "bootleg", "Eyes (bootleg set 2, decrypted)", MACHINE_SUPPORTS_SAVE ) // based on Zaccaria version
GAME( 1983, mrtnt, 0, pacman, mrtnt, pacman_state, eyes, ROT90, "Techstar (Telko license)", "Mr. TNT", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, gorkans, mrtnt, pacman, mrtnt, driver_device, 0, ROT90, "Techstar", "Gorkans", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, gorkans, mrtnt, pacman, mrtnt, pacman_state, 0, ROT90, "Techstar", "Gorkans", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, lizwiz, 0, woodpek, lizwiz, driver_device, 0, ROT90, "Techstar (Sunn license)", "Lizard Wizard", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, lizwiz, 0, woodpek, lizwiz, pacman_state, 0, ROT90, "Techstar (Sunn license)", "Lizard Wizard", MACHINE_SUPPORTS_SAVE )
GAME( 1983, eggor, 0, pacman, mrtnt, pacman_state, eyes, ROT90, "Telko", "Eggor", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, birdiy, 0, birdiy, birdiy, driver_device, 0, ROT270, "Mama Top", "Birdiy", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, birdiy, 0, birdiy, birdiy, pacman_state, 0, ROT270, "Mama Top", "Birdiy", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 1981, woodpeck, 0, woodpek, woodpek, pacman_state, woodpek, ROT90, "Amenip (Palcom Queen River)", "Woodpecker (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, woodpeca, woodpeck, woodpek, woodpek, pacman_state, woodpek, ROT90, "Amenip", "Woodpecker (set 2)", MACHINE_SUPPORTS_SAVE )
@@ -7384,23 +7384,23 @@ GAME( 1982, ponpoko, 0, woodpek, ponpoko, pacman_state, ponpoko, ROT
GAME( 1982, ponpokov, ponpoko, woodpek, ponpoko, pacman_state, ponpoko, ROT0, "Sigma Enterprises Inc. (Venture Line license)", "Ponpoko (Venture Line)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, candory, ponpoko, woodpek, ponpoko, pacman_state, ponpoko, ROT0, "bootleg", "Candory (Ponpoko bootleg with Mario)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, alibaba, 0, alibaba, alibaba, driver_device, 0, ROT90, "Sega", "Ali Baba and 40 Thieves", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, alibabab, alibaba, alibaba, alibaba, driver_device, 0, ROT90, "bootleg", "Mustafa and 40 Thieves (bootleg)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, alibaba, 0, alibaba, alibaba, pacman_state, 0, ROT90, "Sega", "Ali Baba and 40 Thieves", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, alibabab, alibaba, alibaba, alibaba, pacman_state, 0, ROT90, "bootleg", "Mustafa and 40 Thieves (bootleg)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dremshpr, 0, dremshpr, dremshpr, driver_device, 0, ROT270, "Sanritsu", "Dream Shopper", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dremshpr, 0, dremshpr, dremshpr, pacman_state, 0, ROT270, "Sanritsu", "Dream Shopper", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, vanvan, 0, vanvan, vanvan, driver_device, 0, ROT270, "Sanritsu", "Van-Van Car", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, vanvank, vanvan, vanvan, vanvank, driver_device, 0, ROT270, "Sanritsu (Karateco license?)", "Van-Van Car (Karateco set 1)", MACHINE_SUPPORTS_SAVE ) // or bootleg?
-GAME( 1983, vanvanb, vanvan, vanvan, vanvank, driver_device, 0, ROT270, "Sanritsu (Karateco license?)", "Van-Van Car (Karateco set 2)", MACHINE_SUPPORTS_SAVE ) // "
+GAME( 1983, vanvan, 0, vanvan, vanvan, pacman_state, 0, ROT270, "Sanritsu", "Van-Van Car", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, vanvank, vanvan, vanvan, vanvank, pacman_state, 0, ROT270, "Sanritsu (Karateco license?)", "Van-Van Car (Karateco set 1)", MACHINE_SUPPORTS_SAVE ) // or bootleg?
+GAME( 1983, vanvanb, vanvan, vanvan, vanvank, pacman_state, 0, ROT270, "Sanritsu (Karateco license?)", "Van-Van Car (Karateco set 2)", MACHINE_SUPPORTS_SAVE ) // "
-GAME( 1983, bwcasino, 0, acitya, bwcasino, driver_device, 0, ROT90, "Epos Corporation", "Boardwalk Casino", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, acitya, bwcasino, acitya, acitya, driver_device, 0, ROT90, "Epos Corporation", "Atlantic City Action", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, bwcasino, 0, acitya, bwcasino, pacman_state, 0, ROT90, "Epos Corporation", "Boardwalk Casino", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, acitya, bwcasino, acitya, acitya, pacman_state, 0, ROT90, "Epos Corporation", "Atlantic City Action", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, theglobp, suprglob, theglobp, theglobp, driver_device, 0, ROT90, "Epos Corporation", "The Glob (Pac-Man hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, sprglobp, suprglob, theglobp, theglobp, driver_device, 0, ROT90, "Epos Corporation", "Super Glob (Pac-Man hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sprglbpg, suprglob, pacman, theglobp, driver_device, 0, ROT90, "bootleg (Software Labor)", "Super Glob (Pac-Man hardware) (German bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, beastfp, suprglob, theglobp, theglobp, driver_device, 0, ROT90, "Epos Corporation", "Beastie Feastie (conversion kit)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, eeekk, 0, eeekk, eeekk, driver_device, 0, ROT90, "Epos Corporation", "Eeekk!", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, theglobp, suprglob, theglobp, theglobp, pacman_state, 0, ROT90, "Epos Corporation", "The Glob (Pac-Man hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, sprglobp, suprglob, theglobp, theglobp, pacman_state, 0, ROT90, "Epos Corporation", "Super Glob (Pac-Man hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sprglbpg, suprglob, pacman, theglobp, pacman_state, 0, ROT90, "bootleg (Software Labor)", "Super Glob (Pac-Man hardware) (German bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, beastfp, suprglob, theglobp, theglobp, pacman_state, 0, ROT90, "Epos Corporation", "Beastie Feastie (conversion kit)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, eeekk, 0, eeekk, eeekk, pacman_state, 0, ROT90, "Epos Corporation", "Eeekk!", MACHINE_SUPPORTS_SAVE )
GAME( 1984, drivfrcp, 0, drivfrcp, drivfrcp, pacman_state, drivfrcp, ROT90, "Shinkai Inc. (Magic Electronics Inc. license)", "Driving Force (Pac-Man conversion)", MACHINE_SUPPORTS_SAVE )
@@ -7410,15 +7410,15 @@ GAME( 1985, porky, 0, porky, porky, pacman_state, porky, ROT
GAME( 1986, rocktrv2, 0, rocktrv2, rocktrv2, pacman_state, rocktrv2, ROT90, "Triumph Software Inc.", "MTV Rock-N-Roll Trivia (Part 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, bigbucks, 0, bigbucks, bigbucks, driver_device, 0, ROT90, "Dynasoft Inc.", "Big Bucks", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, bigbucks, 0, bigbucks, bigbucks, pacman_state, 0, ROT90, "Dynasoft Inc.", "Big Bucks", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, numcrash, 0, numcrash, numcrash, driver_device, 0, ROT90, "Hanshin Goraku / Peni", "Number Crash", MACHINE_SUPPORTS_SAVE ) // "Peni soft" related?
+GAME( 1983, numcrash, 0, numcrash, numcrash, pacman_state, 0, ROT90, "Hanshin Goraku / Peni", "Number Crash", MACHINE_SUPPORTS_SAVE ) // "Peni soft" related?
GAME( 1985, cannonbp, 0, pacman, cannonbp, pacman_state, cannonbp, ROT90, "Novomatic", "Cannon Ball (Pac-Man Hardware)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
GAME( 1999, superabc, 0, superabc, superabc, pacman_state, superabc, ROT90, "hack (Two-Bit Score)", "Super ABC (Pac-Man multigame kit, Sep. 03 1999)", MACHINE_SUPPORTS_SAVE )
GAME( 1999, superabco,superabc, superabc, superabc, pacman_state, superabc, ROT90, "hack (Two-Bit Score)", "Super ABC (Pac-Man multigame kit, Mar. 08 1999)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pengojpm, pengo, pengojpm, pengojpm, driver_device, 0, ROT90, "bootleg", "Pengo (bootleg on Pac-Man hardware, set 1)", MACHINE_SUPPORTS_SAVE ) // conversion of pacmanjpm board with wire mods
-GAME( 1981, pengopac, pengo, pengojpm, pengojpm, driver_device, 0, ROT90, "bootleg", "Pengo (bootleg on Pac-Man hardware, set 2)", MACHINE_SUPPORTS_SAVE ) // different conversion?
-GAME( 1982, pinguinos, pengo, pengojpm, pengojpm, driver_device, 0, ROT90, "bootleg (Aincar)", "Pinguinos (Spanish bootleg on Pac-Man hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pengojpm, pengo, pengojpm, pengojpm, pacman_state, 0, ROT90, "bootleg", "Pengo (bootleg on Pac-Man hardware, set 1)", MACHINE_SUPPORTS_SAVE ) // conversion of pacmanjpm board with wire mods
+GAME( 1981, pengopac, pengo, pengojpm, pengojpm, pacman_state, 0, ROT90, "bootleg", "Pengo (bootleg on Pac-Man hardware, set 2)", MACHINE_SUPPORTS_SAVE ) // different conversion?
+GAME( 1982, pinguinos,pengo, pengojpm, pengojpm, pacman_state, 0, ROT90, "bootleg (Aincar)", "Pinguinos (Spanish bootleg on Pac-Man hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp
index 4b8c6d795bb..544c1336468 100644
--- a/src/mame/drivers/palm.cpp
+++ b/src/mame/drivers/palm.cpp
@@ -167,7 +167,7 @@ ADDRESS_MAP_END
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( palm, palm_state )
+static MACHINE_CONFIG_START( palm )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", M68000, 32768*506 ) /* 16.580608 MHz */
MCFG_CPU_PROGRAM_MAP( palm_map)
@@ -465,22 +465,22 @@ static MACHINE_CONFIG_DERIVED( palmvx, palm )
MCFG_RAM_DEFAULT_SIZE("8M")
MACHINE_CONFIG_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1996, pilot1k, 0, 0, pilot1k, palm, driver_device, 0, "U.S. Robotics", "Pilot 1000", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1996, pilot5k, pilot1k, 0, pilot5k, palm, driver_device, 0, "U.S. Robotics", "Pilot 5000", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1997, palmpers, pilot1k, 0, pilot5k, palm, driver_device, 0, "U.S. Robotics", "Palm Pilot Personal", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1997, palmpro, pilot1k, 0, palmpro, palm, driver_device, 0, "U.S. Robotics", "Palm Pilot Pro", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1998, palmiii, pilot1k, 0, palmiii, palm, driver_device, 0, "3Com", "Palm III", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
-COMP( 1998, palmiiic, pilot1k, 0, palmiii, palm, driver_device, 0, "Palm Inc", "Palm IIIc", MACHINE_NOT_WORKING )
-COMP( 2000, palmm100, pilot1k, 0, palmiii, palm, driver_device, 0, "Palm Inc", "Palm m100", MACHINE_NOT_WORKING )
-COMP( 2000, palmm130, pilot1k, 0, palmiii, palm, driver_device, 0, "Palm Inc", "Palm m130", MACHINE_NOT_WORKING )
-COMP( 2001, palmm505, pilot1k, 0, palmiii, palm, driver_device, 0, "Palm Inc", "Palm m505", MACHINE_NOT_WORKING )
-COMP( 2001, palmm515, pilot1k, 0, palmiii, palm, driver_device, 0, "Palm Inc", "Palm m515", MACHINE_NOT_WORKING )
-COMP( 1999, palmv, pilot1k, 0, palmv, palm, driver_device, 0, "3Com", "Palm V", MACHINE_NOT_WORKING )
-COMP( 1999, palmvx, pilot1k, 0, palmvx, palm, driver_device, 0, "Palm Inc", "Palm Vx", MACHINE_NOT_WORKING )
-COMP( 2001, visor, pilot1k, 0, palmvx, palm, driver_device, 0, "Handspring", "Visor Edge", MACHINE_NOT_WORKING )
-COMP( 19??, spt1500, pilot1k, 0, palmvx, palm, driver_device, 0, "Symbol", "SPT 1500", MACHINE_NOT_WORKING )
-COMP( 19??, spt1700, pilot1k, 0, palmvx, palm, driver_device, 0, "Symbol", "SPT 1700", MACHINE_NOT_WORKING )
-COMP( 19??, spt1740, pilot1k, 0, palmvx, palm, driver_device, 0, "Symbol", "SPT 1740", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1996, pilot1k, 0, 0, pilot1k, palm, palm_state, 0, "U.S. Robotics", "Pilot 1000", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1996, pilot5k, pilot1k, 0, pilot5k, palm, palm_state, 0, "U.S. Robotics", "Pilot 5000", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1997, palmpers, pilot1k, 0, pilot5k, palm, palm_state, 0, "U.S. Robotics", "Palm Pilot Personal", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1997, palmpro, pilot1k, 0, palmpro, palm, palm_state, 0, "U.S. Robotics", "Palm Pilot Pro", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1998, palmiii, pilot1k, 0, palmiii, palm, palm_state, 0, "3Com", "Palm III", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND )
+COMP( 1998, palmiiic, pilot1k, 0, palmiii, palm, palm_state, 0, "Palm Inc", "Palm IIIc", MACHINE_NOT_WORKING )
+COMP( 2000, palmm100, pilot1k, 0, palmiii, palm, palm_state, 0, "Palm Inc", "Palm m100", MACHINE_NOT_WORKING )
+COMP( 2000, palmm130, pilot1k, 0, palmiii, palm, palm_state, 0, "Palm Inc", "Palm m130", MACHINE_NOT_WORKING )
+COMP( 2001, palmm505, pilot1k, 0, palmiii, palm, palm_state, 0, "Palm Inc", "Palm m505", MACHINE_NOT_WORKING )
+COMP( 2001, palmm515, pilot1k, 0, palmiii, palm, palm_state, 0, "Palm Inc", "Palm m515", MACHINE_NOT_WORKING )
+COMP( 1999, palmv, pilot1k, 0, palmv, palm, palm_state, 0, "3Com", "Palm V", MACHINE_NOT_WORKING )
+COMP( 1999, palmvx, pilot1k, 0, palmvx, palm, palm_state, 0, "Palm Inc", "Palm Vx", MACHINE_NOT_WORKING )
+COMP( 2001, visor, pilot1k, 0, palmvx, palm, palm_state, 0, "Handspring", "Visor Edge", MACHINE_NOT_WORKING )
+COMP( 19??, spt1500, pilot1k, 0, palmvx, palm, palm_state, 0, "Symbol", "SPT 1500", MACHINE_NOT_WORKING )
+COMP( 19??, spt1700, pilot1k, 0, palmvx, palm, palm_state, 0, "Symbol", "SPT 1700", MACHINE_NOT_WORKING )
+COMP( 19??, spt1740, pilot1k, 0, palmvx, palm, palm_state, 0, "Symbol", "SPT 1740", MACHINE_NOT_WORKING )
#include "palm_dbg.hxx"
diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp
index 3ca31438d5a..6a51dd93f49 100644
--- a/src/mame/drivers/palmz22.cpp
+++ b/src/mame/drivers/palmz22.cpp
@@ -278,7 +278,7 @@ DRIVER_INIT_MEMBER(palmz22_state,palmz22)
{
}
-static MACHINE_CONFIG_START( palmz22, palmz22_state )
+static MACHINE_CONFIG_START( palmz22 )
MCFG_CPU_ADD("maincpu", ARM920T, 266000000)
MCFG_CPU_PROGRAM_MAP(palmz22_map)
@@ -305,7 +305,7 @@ static MACHINE_CONFIG_START( palmz22, palmz22_state )
MCFG_S3C2410_NAND_DATA_W_CB(WRITE8(palmz22_state, s3c2410_nand_data_w))
MCFG_DEVICE_ADD("nand", NAND, 0)
- MCFG_NAND_TYPE(NAND_CHIP_K9F5608U0D_J)
+ MCFG_NAND_TYPE(K9F5608U0D_J)
MCFG_NAND_RNB_CALLBACK(DEVWRITELINE("s3c2410", s3c2410_device, frnb_w))
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index 4475b56a85f..00a0e1d2ddb 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -321,7 +321,7 @@ READ8_MEMBER(pandoras_state::pandoras_portB_r)
return (m_audiocpu->total_cycles() / 512) & 0x0f;
}
-static MACHINE_CONFIG_START( pandoras, pandoras_state )
+static MACHINE_CONFIG_START( pandoras )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6) /* CPU A */
@@ -414,4 +414,4 @@ ROM_START( pandoras )
ROM_END
-GAME( 1984, pandoras, 0, pandoras, pandoras, driver_device, 0, ROT90, "Konami / Interlogic", "Pandora's Palace", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pandoras, 0, pandoras, pandoras, pandoras_state, 0, ROT90, "Konami / Interlogic", "Pandora's Palace", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp
index e334f3043c4..3e46859c913 100644
--- a/src/mame/drivers/pangofun.cpp
+++ b/src/mame/drivers/pangofun.cpp
@@ -171,7 +171,7 @@ void pangofun_state::machine_start()
{
}
-static MACHINE_CONFIG_START( pangofun, pangofun_state )
+static MACHINE_CONFIG_START( pangofun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I486, 25000000 ) /* I486 ?? Mhz (25 according to POST) */
MCFG_CPU_PROGRAM_MAP(pcat_map)
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index be6dd72e7e0..79cd9f07d2f 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -605,7 +605,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(panicr_state::scanline)
m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xc8/4);
}
-static MACHINE_CONFIG_START( panicr, panicr_state )
+static MACHINE_CONFIG_START( panicr )
MCFG_CPU_ADD("maincpu", V20,MASTER_CLOCK/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
MCFG_CPU_PROGRAM_MAP(panicr_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", panicr_state, scanline, "screen", 0, 1)
diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp
index c1663bfbb11..bb826d78e42 100644
--- a/src/mame/drivers/paradise.cpp
+++ b/src/mame/drivers/paradise.cpp
@@ -723,7 +723,7 @@ INTERRUPT_GEN_MEMBER(paradise_state::irq)
m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( paradise, paradise_state )
+static MACHINE_CONFIG_START( paradise )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */
@@ -748,10 +748,10 @@ static MACHINE_CONFIG_START( paradise, paradise_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki1", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki2", XTAL_12MHz/12, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp
index 83f9659bd4e..625bf5aab00 100644
--- a/src/mame/drivers/paranoia.cpp
+++ b/src/mame/drivers/paranoia.cpp
@@ -163,7 +163,7 @@ WRITE_LINE_MEMBER(paranoia_state::i8155_timer_out)
//logerror("Timer out %d\n", state);
}
-static MACHINE_CONFIG_START( paranoia, paranoia_state )
+static MACHINE_CONFIG_START( paranoia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
MCFG_CPU_PROGRAM_MAP(pce_mem)
@@ -186,7 +186,7 @@ static MACHINE_CONFIG_START( paranoia, paranoia_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( pce_common_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -221,4 +221,4 @@ ROM_START(paranoia)
ROM_LOAD( "4.352", 0x18000, 0x8000, CRC(11297fed) SHA1(17a294e65ba1c4806307602dee4c7c627ad1fcfd) )
ROM_END
-GAME( 1990, paranoia, 0, paranoia, paranoia, pce_common_state, pce_common, ROT0, "Naxat Soft", "Paranoia", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, paranoia, 0, paranoia, paranoia, paranoia_state, pce_common, ROT0, "Naxat Soft", "Paranoia", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp
index a06b4792169..ecc6bea5fa7 100644
--- a/src/mame/drivers/parodius.cpp
+++ b/src/mame/drivers/parodius.cpp
@@ -224,7 +224,7 @@ WRITE8_MEMBER( parodius_state::banking_callback )
membank("bank1")->set_entry((data & 0x0f) ^ 0x0f);
}
-static MACHINE_CONFIG_START( parodius, parodius_state )
+static MACHINE_CONFIG_START( parodius )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* 053248 */
@@ -379,7 +379,7 @@ ROM_END
***************************************************************************/
-GAME( 1990, parodius, 0, parodius, parodius, driver_device, 0, ROT0, "Konami", "Parodius DA! (World, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, parodiuse, parodius, parodius, parodius, driver_device, 0, ROT0, "Konami", "Parodius DA! (World, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, parodiusj, parodius, parodius, parodius, driver_device, 0, ROT0, "Konami", "Parodius DA! (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, parodiusa, parodius, parodius, parodius, driver_device, 0, ROT0, "Konami", "Parodius DA! (Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, parodius, 0, parodius, parodius, parodius_state, 0, ROT0, "Konami", "Parodius DA! (World, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, parodiuse, parodius, parodius, parodius, parodius_state, 0, ROT0, "Konami", "Parodius DA! (World, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, parodiusj, parodius, parodius, parodius, parodius_state, 0, ROT0, "Konami", "Parodius DA! (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, parodiusa, parodius, parodius, parodius, parodius_state, 0, ROT0, "Konami", "Parodius DA! (Asia)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp
index e3ae867cd45..502a6aedc6e 100644
--- a/src/mame/drivers/partner.cpp
+++ b/src/mame/drivers/partner.cpp
@@ -167,7 +167,7 @@ static GFXDECODE_START( partner )
GFXDECODE_END
-static MACHINE_CONFIG_START( partner, partner_state )
+static MACHINE_CONFIG_START( partner )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_16MHz / 9)
MCFG_CPU_PROGRAM_MAP(partner_mem)
@@ -204,8 +204,8 @@ static MACHINE_CONFIG_START( partner, partner_state )
MCFG_I8257_OUT_HRQ_CB(WRITELINE(partner_state, hrq_w))
MCFG_I8257_IN_MEMR_CB(READ8(radio86_state, memory_read_byte))
MCFG_I8257_OUT_MEMW_CB(WRITE8(radio86_state, memory_write_byte))
- MCFG_I8257_IN_IOR_0_CB(DEVREAD8("wd1793", fd1793_t, data_r))
- MCFG_I8257_OUT_IOW_0_CB(DEVWRITE8("wd1793", fd1793_t, data_w))
+ MCFG_I8257_IN_IOR_0_CB(DEVREAD8("wd1793", fd1793_device, data_r))
+ MCFG_I8257_OUT_IOW_0_CB(DEVWRITE8("wd1793", fd1793_device, data_w))
MCFG_I8257_OUT_IOW_2_CB(DEVWRITE8("i8275", i8275_device, dack_w))
MCFG_I8257_REVERSE_RW_MODE(1)
@@ -242,5 +242,5 @@ ROM_START( partner )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, partner, radio86, 0, partner, partner, partner_state,partner, "SAM SKB VM", "Partner-01.01", MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, partner, radio86, 0, partner, partner, partner_state, partner, "SAM SKB VM", "Partner-01.01", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp
index c4bdaeba961..cc5004bb52c 100644
--- a/src/mame/drivers/pasha2.cpp
+++ b/src/mame/drivers/pasha2.cpp
@@ -412,7 +412,7 @@ void pasha2_state::machine_reset()
m_vbuffer = 0;
}
-static MACHINE_CONFIG_START( pasha2, pasha2_state )
+static MACHINE_CONFIG_START( pasha2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", E116XT, 20000000*4) /* 4x internal multiplier */
@@ -437,10 +437,10 @@ static MACHINE_CONFIG_START( pasha2, pasha2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
//and ATMEL DREAM SAM9773
diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp
index 5d1524b77fa..91a196ab99c 100644
--- a/src/mame/drivers/paso1600.cpp
+++ b/src/mame/drivers/paso1600.cpp
@@ -296,7 +296,7 @@ WRITE8_MEMBER(paso1600_state::pc_dma_write_byte)
space.write_byte(offset, data);
}
-static MACHINE_CONFIG_START( paso1600, paso1600_state )
+static MACHINE_CONFIG_START( paso1600 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 16000000/2)
MCFG_CPU_PROGRAM_MAP(paso1600_map)
@@ -343,5 +343,5 @@ ROM_START( paso1600 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP ( 198?,paso1600, 0, 0, paso1600, paso1600, driver_device, 0, "Toshiba", "Pasopia 1600" , MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 198?,paso1600, 0, 0, paso1600, paso1600, paso1600_state, 0, "Toshiba", "Pasopia 1600", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp
index 26de7d26cff..f2e5c469ec9 100644
--- a/src/mame/drivers/pasogo.cpp
+++ b/src/mame/drivers/pasogo.cpp
@@ -108,6 +108,7 @@ TODO:
#include "bus/generic/carts.h"
#include "machine/bankdev.h"
#include "machine/genpc.h"
+#include "screen.h"
#include "softlist.h"
/*
@@ -531,7 +532,7 @@ void pasogo_state::machine_reset()
contrast(*color->fields().first(), nullptr, 0, color->read());
}
-static MACHINE_CONFIG_START( pasogo, pasogo_state )
+static MACHINE_CONFIG_START( pasogo )
MCFG_CPU_ADD("maincpu", V30, XTAL_32_22MHz/2)
MCFG_CPU_PROGRAM_MAP(pasogo_mem)
@@ -573,5 +574,5 @@ ROM_START( pasogo )
ROM_REGION( 0x10000, "empty", ROMREGION_ERASEFF )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-CONS( 1996, pasogo, 0, 0, pasogo, pasogo, driver_device, 0, "KOEI", "PasoGo", MACHINE_NO_SOUND|MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1996, pasogo, 0, 0, pasogo, pasogo, pasogo_state, 0, "KOEI", "PasoGo", MACHINE_NO_SOUND|MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp
index 2a15b175685..15fda1c91be 100644
--- a/src/mame/drivers/pasopia.cpp
+++ b/src/mame/drivers/pasopia.cpp
@@ -277,7 +277,7 @@ We preset all banks here, so that bankswitching will incur no speed penalty.
m_pio_timer->adjust(attotime::from_hz(50), 0, attotime::from_hz(50));
}
-static MACHINE_CONFIG_START( pasopia, pasopia_state )
+static MACHINE_CONFIG_START( pasopia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(pasopia_map)
@@ -338,5 +338,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, pasopia, 0, 0, pasopia, pasopia, pasopia_state, pasopia, "Toshiba", "Pasopia", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, pasopia, 0, 0, pasopia, pasopia, pasopia_state, pasopia, "Toshiba", "Pasopia", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp
index f8b1903b563..edc4671dce5 100644
--- a/src/mame/drivers/pasopia7.cpp
+++ b/src/mame/drivers/pasopia7.cpp
@@ -908,7 +908,7 @@ static SLOT_INTERFACE_START( pasopia7_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( p7_base, pasopia7_state )
+static MACHINE_CONFIG_START( p7_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pasopia7_mem)
@@ -1064,4 +1064,4 @@ DRIVER_INIT_MEMBER(pasopia7_state,p7_lcd)
/* Driver */
COMP( 1983, pasopia7, 0, 0, p7_raster, pasopia7, pasopia7_state, p7_raster, "Toshiba", "Pasopia 7 (Raster)", MACHINE_NOT_WORKING )
-COMP( 1983, pasopia7lcd, pasopia7, 0, p7_lcd, pasopia7, pasopia7_state, p7_lcd, "Toshiba", "Pasopia 7 (LCD)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1983, pasopia7lcd, pasopia7, 0, p7_lcd, pasopia7, pasopia7_state, p7_lcd, "Toshiba", "Pasopia 7 (LCD)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp
index a7931dfab4e..5392255da57 100644
--- a/src/mame/drivers/pass.cpp
+++ b/src/mame/drivers/pass.cpp
@@ -237,7 +237,7 @@ static GFXDECODE_START( pass )
GFXDECODE_END
/* todo : is this correct? */
-static MACHINE_CONFIG_START( pass, pass_state )
+static MACHINE_CONFIG_START( pass )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14318180/2 )
@@ -271,7 +271,7 @@ static MACHINE_CONFIG_START( pass, pass_state )
MCFG_SOUND_ADD("ymsnd", YM2203, 14318180/4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", 792000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 792000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
@@ -299,4 +299,4 @@ ROM_START( pass )
ROM_END
-GAME( 1992, pass, 0, pass, pass, driver_device, 0, ROT0, "Oksan", "Pass", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, pass, 0, pass, pass, pass_state, 0, ROT0, "Oksan", "Pass", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp
index e493578bef2..ef73d5affa2 100644
--- a/src/mame/drivers/pastelg.cpp
+++ b/src/mame/drivers/pastelg.cpp
@@ -394,7 +394,7 @@ static INPUT_PORTS_START( galds )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pastelg, pastelg_state )
+static MACHINE_CONFIG_START( pastelg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
@@ -455,7 +455,7 @@ Note
*/
-static MACHINE_CONFIG_START( threeds, pastelg_state )
+static MACHINE_CONFIG_START( threeds )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 19968000/4) /* unknown divider, galds definitely relies on this for correct voice pitch */
@@ -562,6 +562,6 @@ ROM_END
-GAME( 1985, pastelg, 0, pastelg, pastelg, driver_device, 0, ROT0, "Nichibutsu", "Pastel Gal (Japan 851224)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, threeds, 0, threeds, threeds, driver_device, 0, ROT0, "Nichibutsu", "Three Ds - Three Dealers Casino House", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, galds, threeds, threeds, galds, driver_device, 0, ROT0, "Nihon System Corp.", "Gals Ds - Three Dealers Casino House (bootleg?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pastelg, 0, pastelg, pastelg, pastelg_state, 0, ROT0, "Nichibutsu", "Pastel Gal (Japan 851224)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, threeds, 0, threeds, threeds, pastelg_state, 0, ROT0, "Nichibutsu", "Three Ds - Three Dealers Casino House", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, galds, threeds, threeds, galds, pastelg_state, 0, ROT0, "Nihon System Corp.", "Gals Ds - Three Dealers Casino House (bootleg?)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index 19d04c9de00..91537c80af8 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -18,12 +18,14 @@ maybe close to jalmah.cpp?
*/
#include "emu.h"
+#include "machine/nmk112.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+
#include "screen.h"
#include "speaker.h"
-#include "machine/nmk112.h"
+
class patapata_state : public driver_device
{
@@ -277,7 +279,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(patapata_state::scanline)
if (param==128) m_maincpu->set_input_line(1, HOLD_LINE);
}
- static MACHINE_CONFIG_START( patapata, patapata_state )
+static MACHINE_CONFIG_START( patapata )
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // 16 MHz XTAL, 16 MHz CPU
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -299,10 +301,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(patapata_state::scanline)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz / 4, OKIM6295_PIN7_LOW) // not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz / 4, PIN7_LOW) // not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz / 4, OKIM6295_PIN7_LOW) // not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz / 4, PIN7_LOW) // not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("nmk112", NMK112, 0) // or 212? difficult to read (maybe 212 is 2* 112?)
@@ -338,4 +340,4 @@ ROM_START( patapata )
ROM_END
// cabinet shows Atlus logo, though there's no copyright on the title screen and PCB is NTC / NMK
-GAME( 1993, patapata, 0, patapata, patapata, driver_device, 0, ROT0, "Atlus", "Pata Pata Panic", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, patapata, 0, patapata, patapata, patapata_state, 0, ROT0, "Atlus", "Pata Pata Panic", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp
index cd22a4a1853..211fa4f95b0 100644
--- a/src/mame/drivers/patinho_feio.cpp
+++ b/src/mame/drivers/patinho_feio.cpp
@@ -27,19 +27,9 @@ DRIVER_INIT_MEMBER(patinho_feio_state, patinho_feio)
m_prev_RC = 0;
}
-READ16_MEMBER(patinho_feio_state::rc_r)
-{
- return ioport("RC")->read();
-}
-
-READ16_MEMBER(patinho_feio_state::buttons_r)
-{
- return ioport("BUTTONS")->read();
-}
-
void patinho_feio_state::update_panel(uint8_t ACC, uint8_t opcode, uint8_t mem_data, uint16_t mem_addr, uint16_t PC, uint8_t FLAGS, uint16_t RC, uint8_t mode){
char lamp_id[11];
- const char* button_names[] = {
+ static char const *const button_names[] = {
"NORMAL",
"CICLOUNICO",
"INSTRUCAOUNICA",
@@ -116,7 +106,7 @@ TIMER_CALLBACK_MEMBER(patinho_feio_state::decwriter_callback)
m_decwriter_timer->enable(0); //stop the timer
}
-WRITE8_MEMBER(patinho_feio_state::decwriter_kbd_input)
+void patinho_feio_state::decwriter_kbd_input(u8 data)
{
m_maincpu->transfer_byte_from_external_device(0xA, ~data);
}
@@ -139,7 +129,7 @@ TIMER_CALLBACK_MEMBER(patinho_feio_state::teletype_callback)
m_teletype_timer->enable(0); //stop the timer
}
-WRITE8_MEMBER(patinho_feio_state::teletype_kbd_input)
+void patinho_feio_state::teletype_kbd_input(u8 data)
{
//I figured out that the data is provided inverted (2's complement)
//based on a comment in the source code listing of the HEXAM program.
@@ -251,12 +241,12 @@ static INPUT_PORTS_START( patinho_feio )
PORT_BIT(0x800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("MEMORIA (Liberada/Protegida)") PORT_CODE(KEYCODE_M) PORT_TOGGLE
INPUT_PORTS_END
-static MACHINE_CONFIG_START( patinho_feio, patinho_feio_state )
+static MACHINE_CONFIG_START( patinho_feio )
/* basic machine hardware */
/* CPU @ approx. 500 kHz (memory cycle time is 2usec) */
MCFG_CPU_ADD("maincpu", PATO_FEIO_CPU, 500000)
- MCFG_PATINHO_RC_READ_CB(READ16(patinho_feio_state, rc_r))
- MCFG_PATINHO_BUTTONS_READ_CB(READ16(patinho_feio_state, buttons_r))
+ MCFG_PATINHO_RC_READ_CB(IOPORT("RC"))
+ MCFG_PATINHO_BUTTONS_READ_CB(IOPORT("BUTTONS"))
/* Printer */
// MCFG_PATINHO_IODEV_WRITE_CB(0x5, WRITE8(patinho_feio_state, printer_data_w))
@@ -284,11 +274,11 @@ static MACHINE_CONFIG_START( patinho_feio, patinho_feio_state )
/* DECWRITER */
MCFG_DEVICE_ADD("decwriter", TELEPRINTER, 0)
- MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(WRITE8(patinho_feio_state, decwriter_kbd_input))
+ MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(PUT(patinho_feio_state, decwriter_kbd_input))
/* Teletype */
MCFG_DEVICE_ADD("teletype", TELEPRINTER, 1)
- MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(WRITE8(patinho_feio_state, teletype_kbd_input))
+ MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(PUT(patinho_feio_state, teletype_kbd_input))
/* punched tape */
MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "patinho_tape")
@@ -318,5 +308,5 @@ ROM_START( patinho )
ROM_LOAD( "micro-pre-loader.bin", 0x000, 0x02a, CRC(1921feab) SHA1(bb063102e44e9ab963f95b45710141dc2c5046b0) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1972, patinho, 0, 0, patinho_feio, patinho_feio, patinho_feio_state, patinho_feio, "Escola Politecnica - Universidade de Sao Paulo", "Patinho Feio" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1972, patinho, 0, 0, patinho_feio, patinho_feio, patinho_feio_state, patinho_feio, "Escola Politecnica - Universidade de Sao Paulo", "Patinho Feio" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp
index cd68ade4272..3e60c1a1b0a 100644
--- a/src/mame/drivers/pb1000.cpp
+++ b/src/mame/drivers/pb1000.cpp
@@ -474,7 +474,7 @@ void pb1000_state::machine_start()
m_kb_timer->adjust(attotime::from_hz(192), 0, attotime::from_hz(192));
}
-static MACHINE_CONFIG_START( pb1000, pb1000_state )
+static MACHINE_CONFIG_START( pb1000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD61700, 910000)
MCFG_CPU_PROGRAM_MAP(pb1000_mem)
@@ -568,7 +568,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, pb1000 , 0, 0, pb1000 , pb1000 , driver_device, 0, "Casio", "PB-1000", MACHINE_NOT_WORKING)
-COMP( 1989, pb2000c, 0, 0, pb2000c, pb2000c, driver_device, 0, "Casio", "PB-2000c", MACHINE_NOT_WORKING)
-COMP( 1989, ai1000, pb2000c, 0, pb2000c, pb2000c, driver_device, 0, "Casio", "AI-1000", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, pb1000, 0, 0, pb1000, pb1000, pb1000_state, 0, "Casio", "PB-1000", MACHINE_NOT_WORKING)
+COMP( 1989, pb2000c, 0, 0, pb2000c, pb2000c, pb1000_state, 0, "Casio", "PB-2000c", MACHINE_NOT_WORKING)
+COMP( 1989, ai1000, pb2000c, 0, pb2000c, pb2000c, pb1000_state, 0, "Casio", "AI-1000", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp
index e3fe16b9265..a8054c40fc8 100644
--- a/src/mame/drivers/pbaction.cpp
+++ b/src/mame/drivers/pbaction.cpp
@@ -281,7 +281,7 @@ INTERRUPT_GEN_MEMBER(pbaction_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( pbaction, pbaction_state )
+static MACHINE_CONFIG_START( pbaction )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
@@ -504,8 +504,8 @@ DRIVER_INIT_MEMBER(pbaction_state,pbactio3)
-GAME( 1985, pbaction, 0, pbaction, pbaction, driver_device, 0, ROT90, "Tehkan", "Pinball Action (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pbaction2, pbaction, pbaction, pbaction, driver_device, 0, ROT90, "Tehkan", "Pinball Action (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pbaction, 0, pbaction, pbaction, pbaction_state, 0, ROT90, "Tehkan", "Pinball Action (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pbaction2, pbaction, pbaction, pbaction, pbaction_state, 0, ROT90, "Tehkan", "Pinball Action (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, pbaction3, pbaction, pbactionx, pbaction, pbaction_state, pbactio3, ROT90, "Tehkan", "Pinball Action (set 3, encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pbaction4, pbaction, pbactionx, pbaction, driver_device, 0, ROT90, "Tehkan", "Pinball Action (set 4, encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pbaction5, pbaction, pbactionx, pbaction, driver_device, 0, ROT90, "Tehkan", "Pinball Action (set 5, encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pbaction4, pbaction, pbactionx, pbaction, pbaction_state, 0, ROT90, "Tehkan", "Pinball Action (set 4, encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pbaction5, pbaction, pbactionx, pbaction, pbaction_state, 0, ROT90, "Tehkan", "Pinball Action (set 5, encrypted)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pc.cpp b/src/mame/drivers/pc.cpp
index 098a030929f..6945b4e914b 100644
--- a/src/mame/drivers/pc.cpp
+++ b/src/mame/drivers/pc.cpp
@@ -396,7 +396,7 @@ DEVICE_INPUT_DEFAULTS_END
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("mb:pic8259", pic8259_device, inta_cb)
-static MACHINE_CONFIG_START( pccga, pc_state )
+static MACHINE_CONFIG_START( pccga )
/* basic machine hardware */
MCFG_CPU_PC(pc8, pc8, I8088, 4772720) /* 4,77 MHz */
@@ -464,7 +464,7 @@ static DEVICE_INPUT_DEFAULTS_START( iskr3104 )
DEVICE_INPUT_DEFAULTS("DSW0", 0x30, 0x00)
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( iskr3104, pc_state )
+static MACHINE_CONFIG_START( iskr3104 )
/* basic machine hardware */
MCFG_CPU_PC(pc16, pc16, I8086, 4772720)
@@ -488,7 +488,7 @@ MACHINE_CONFIG_END
//Poisk-2
-static MACHINE_CONFIG_START( poisk2, pc_state )
+static MACHINE_CONFIG_START( poisk2 )
/* basic machine hardware */
MCFG_CPU_PC(pc16, pc16, I8086, 4772720)
@@ -517,7 +517,7 @@ MACHINE_CONFIG_END
// Zenith SuperSport
-static MACHINE_CONFIG_START( zenith, pc_state )
+static MACHINE_CONFIG_START( zenith )
/* basic machine hardware */
MCFG_CPU_PC(zenith, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
@@ -559,7 +559,7 @@ static DEVICE_INPUT_DEFAULTS_START( siemens )
DEVICE_INPUT_DEFAULTS("DSW0", 0x30, 0x30)
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( siemens, pc_state )
+static MACHINE_CONFIG_START( siemens )
/* basic machine hardware */
MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
@@ -584,7 +584,7 @@ MACHINE_CONFIG_END
// IBM 5550
-static MACHINE_CONFIG_START( ibm5550, pc_state )
+static MACHINE_CONFIG_START( ibm5550 )
/* basic machine hardware */
MCFG_CPU_PC(pc16, ibm5550, I8086, 8000000)
@@ -639,7 +639,7 @@ MACHINE_CONFIG_END
//Laser XT/3
-static MACHINE_CONFIG_START( laser_xt3, pc_state )
+static MACHINE_CONFIG_START( laser_xt3 )
MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
@@ -668,7 +668,7 @@ MACHINE_CONFIG_END
//Laser Turbo XT
-static MACHINE_CONFIG_START( laser_turbo_xt, pc_state )
+static MACHINE_CONFIG_START( laser_turbo_xt )
MCFG_CPU_PC(pc8, pc8, I8088, XTAL_14_31818MHz/3) /* 4,77 MHz */
MCFG_IBM5160_MOTHERBOARD_ADD("mb","maincpu")
@@ -888,26 +888,26 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1984, dgone, ibm5150, 0, dgone, pccga, driver_device, 0, "Data General", "Data General/One" , MACHINE_NOT_WORKING)/* CGA, 2x 3.5" disk drives */
-COMP( 1985, bw230, ibm5150, 0, bondwell, bondwell, pc_state, bondwell, "Bondwell Holding", "BW230 (PRO28 Series)", 0 )
-COMP( 1984, compc1, ibm5150, 0, pccga, pccga, driver_device, 0, "Commodore Business Machines", "Commodore PC-1" , MACHINE_NOT_WORKING)
-COMP( 1987, pc10iii, ibm5150, 0, pccga, pccga, driver_device, 0, "Commodore Business Machines", "Commodore PC-10 III" , MACHINE_NOT_WORKING)
-COMP( 1992, iskr3104, ibm5150, 0, iskr3104, pccga, driver_device, 0, "Schetmash", "Iskra 3104", MACHINE_NOT_WORKING)
-COMP( 1989, mk88, ibm5150, 0, mk88, pccga, driver_device, 0, "<unknown>", "MK-88", MACHINE_NOT_WORKING)
-COMP( 1991, poisk2, ibm5150, 0, poisk2, pccga, driver_device, 0, "<unknown>", "Poisk-2", MACHINE_NOT_WORKING)
-COMP( 1990, mc1702, ibm5150, 0, pccga, pccga, driver_device, 0, "<unknown>", "Elektronika MC-1702", MACHINE_NOT_WORKING)
-COMP( 1987, zdsupers, ibm5150, 0, zenith, pccga, driver_device, 0, "Zenith Data Systems", "SuperSport", 0)
-COMP( 1985, sicpc1605, ibm5150, 0, siemens, pccga, driver_device, 0, "Siemens", "Sicomp PC16-05", MACHINE_NOT_WORKING)
-COMP( 1985, ncrpc4i, ibm5150, 0, ncrpc4i, pccga, driver_device, 0, "NCR", "PC4i", MACHINE_NOT_WORKING)
-COMP( 198?, olivm15, ibm5150, 0, m15, pccga, driver_device, 0, "Olivetti", "M15", 0)
-COMP( 1983, ibm5550, ibm5150, 0, ibm5550, pccga, driver_device, 0, "International Business Machines", "IBM 5550", MACHINE_NOT_WORKING)
-COMP( 1985, pc7000, ibm5150, 0, pccga, pccga, driver_device, 0, "Sharp", "PC-7000", MACHINE_NOT_WORKING)
-COMP( 1988, sx16, ibm5150, 0, pccga, pccga, driver_device, 0, "Sanyo", "SX-16", MACHINE_NOT_WORKING)
-COMP( 198?, mbc16, ibm5150, 0, pccga, pccga, driver_device, 0, "Sanyo", "MBC-16" , MACHINE_NOT_WORKING)
-COMP( 1987, ataripc1, ibm5150, 0, ataripc1, pccga, driver_device, 0, "Atari", "PC1" , 0)
-COMP( 1988, ataripc3, ibm5150, 0, pccga, pccga, driver_device, 0, "Atari", "PC3" , 0)
-COMP( 1989, ssam88s, ibm5150, 0, pccga, pccga, driver_device, 0, "Samsung", "Samtron 88S" , MACHINE_NOT_WORKING)
-COMP( 1983, eagle1600, ibm5150, 0, eagle1600, pccga, driver_device, 0, "Eagle", "1600" , MACHINE_NOT_WORKING)
-COMP( 1988, laser_turbo_xt, ibm5150, 0, laser_turbo_xt, 0, driver_device, 0, "VTech", "Laser Turbo XT" , 0)
-COMP( 1989, laser_xt3, ibm5150, 0, laser_xt3, 0, driver_device, 0, "VTech", "Laser XT/3" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, dgone, ibm5150, 0, dgone, pccga, pc_state, 0, "Data General", "Data General/One" , MACHINE_NOT_WORKING ) // CGA, 2x 3.5" disk drives
+COMP( 1985, bw230, ibm5150, 0, bondwell, bondwell, pc_state, bondwell, "Bondwell Holding", "BW230 (PRO28 Series)", 0 )
+COMP( 1984, compc1, ibm5150, 0, pccga, pccga, pc_state, 0, "Commodore Business Machines", "Commodore PC-1" , MACHINE_NOT_WORKING )
+COMP( 1987, pc10iii, ibm5150, 0, pccga, pccga, pc_state, 0, "Commodore Business Machines", "Commodore PC-10 III", MACHINE_NOT_WORKING )
+COMP( 1992, iskr3104, ibm5150, 0, iskr3104, pccga, pc_state, 0, "Schetmash", "Iskra 3104", MACHINE_NOT_WORKING )
+COMP( 1989, mk88, ibm5150, 0, mk88, pccga, pc_state, 0, "<unknown>", "MK-88", MACHINE_NOT_WORKING )
+COMP( 1991, poisk2, ibm5150, 0, poisk2, pccga, pc_state, 0, "<unknown>", "Poisk-2", MACHINE_NOT_WORKING )
+COMP( 1990, mc1702, ibm5150, 0, pccga, pccga, pc_state, 0, "<unknown>", "Elektronika MC-1702", MACHINE_NOT_WORKING )
+COMP( 1987, zdsupers, ibm5150, 0, zenith, pccga, pc_state, 0, "Zenith Data Systems", "SuperSport", 0 )
+COMP( 1985, sicpc1605, ibm5150, 0, siemens, pccga, pc_state, 0, "Siemens", "Sicomp PC16-05", MACHINE_NOT_WORKING )
+COMP( 1985, ncrpc4i, ibm5150, 0, ncrpc4i, pccga, pc_state, 0, "NCR", "PC4i", MACHINE_NOT_WORKING )
+COMP( 198?, olivm15, ibm5150, 0, m15, pccga, pc_state, 0, "Olivetti", "M15", 0 )
+COMP( 1983, ibm5550, ibm5150, 0, ibm5550, pccga, pc_state, 0, "International Business Machines", "IBM 5550", MACHINE_NOT_WORKING )
+COMP( 1985, pc7000, ibm5150, 0, pccga, pccga, pc_state, 0, "Sharp", "PC-7000", MACHINE_NOT_WORKING )
+COMP( 1988, sx16, ibm5150, 0, pccga, pccga, pc_state, 0, "Sanyo", "SX-16", MACHINE_NOT_WORKING )
+COMP( 198?, mbc16, ibm5150, 0, pccga, pccga, pc_state, 0, "Sanyo", "MBC-16", MACHINE_NOT_WORKING )
+COMP( 1987, ataripc1, ibm5150, 0, ataripc1, pccga, pc_state, 0, "Atari", "PC1" , 0 )
+COMP( 1988, ataripc3, ibm5150, 0, pccga, pccga, pc_state, 0, "Atari", "PC3" , 0 )
+COMP( 1989, ssam88s, ibm5150, 0, pccga, pccga, pc_state, 0, "Samsung", "Samtron 88S" , MACHINE_NOT_WORKING )
+COMP( 1983, eagle1600, ibm5150, 0, eagle1600, pccga, pc_state, 0, "Eagle", "1600" , MACHINE_NOT_WORKING )
+COMP( 1988, laser_turbo_xt, ibm5150, 0, laser_turbo_xt, 0, pc_state, 0, "VTech", "Laser Turbo XT", 0 )
+COMP( 1989, laser_xt3, ibm5150, 0, laser_xt3, 0, pc_state, 0, "VTech", "Laser XT/3", 0 )
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index c31e5a30128..a60f9ead634 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -490,7 +490,7 @@ SLOT_INTERFACE_END
#define MASTER_CLOCK 6988800
-static MACHINE_CONFIG_START( pc100, pc100_state )
+static MACHINE_CONFIG_START( pc100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(pc100_map)
@@ -564,5 +564,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, pc100, 0, 0, pc100, pc100, driver_device, 0, "NEC", "PC-100", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, pc100, 0, 0, pc100, pc100, pc100_state, 0, "NEC", "PC-100", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp
index c359696f279..1620a6a84e8 100644
--- a/src/mame/drivers/pc1500.cpp
+++ b/src/mame/drivers/pc1500.cpp
@@ -262,7 +262,7 @@ PALETTE_INIT_MEMBER(pc1500_state, pc1500)
palette.set_pen_color(1, rgb_t(92, 83, 88));
}
-static MACHINE_CONFIG_START( pc1500, pc1500_state )
+static MACHINE_CONFIG_START( pc1500 )
MCFG_CPU_ADD("maincpu", LH5801, 1300000) //1.3 MHz
MCFG_CPU_PROGRAM_MAP( pc1500_mem )
MCFG_CPU_IO_MAP( pc1500_mem_io )
@@ -298,5 +298,5 @@ ROM_START( pc1500 )
ROM_LOAD( "ce-150.rom", 0x0000, 0x2000, CRC(8fa1df6d) SHA1(a3aa02a641a46c27c0d4c0dc025b0dbe9b5b79c8))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 198?, pc1500, 0, 0, pc1500, pc1500, driver_device, 0, "Sharp", "Pocket Computer 1500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, pc1500, 0, 0, pc1500, pc1500, pc1500_state, 0, "Sharp", "Pocket Computer 1500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp
index aad7d0d066c..6e9ac05eb9b 100644
--- a/src/mame/drivers/pc1512.cpp
+++ b/src/mame/drivers/pc1512.cpp
@@ -1181,7 +1181,7 @@ void pc1640_state::machine_reset()
// MACHINE_CONFIG( pc1512 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pc1512, pc1512_state )
+static MACHINE_CONFIG_START( pc1512 )
MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_24MHz/3)
MCFG_CPU_PROGRAM_MAP(pc1512_mem)
MCFG_CPU_IO_MAP(pc1512_io)
@@ -1203,8 +1203,8 @@ static MACHINE_CONFIG_START( pc1512, pc1512_state )
MCFG_PC1512_MOUSE_PORT_ADD(PC1512_MOUSE_PORT_TAG, pc1512_mouse_port_devices, "mouse")
MCFG_PC1512_MOUSE_PORT_X_CB(WRITE8(pc1512_state, mouse_x_w))
MCFG_PC1512_MOUSE_PORT_Y_CB(WRITE8(pc1512_state, mouse_y_w))
- MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_t, m1_w))
- MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_t, m2_w))
+ MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
+ MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL_24MHz/6)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc1512_state, hrq_w))
@@ -1314,7 +1314,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pc1640 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pc1640, pc1640_state )
+static MACHINE_CONFIG_START( pc1640 )
MCFG_CPU_ADD(I8086_TAG, I8086, XTAL_24MHz/3)
MCFG_CPU_PROGRAM_MAP(pc1640_mem)
MCFG_CPU_IO_MAP(pc1640_io)
@@ -1333,8 +1333,8 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state )
MCFG_PC1512_MOUSE_PORT_ADD(PC1512_MOUSE_PORT_TAG, pc1512_mouse_port_devices, "mouse")
MCFG_PC1512_MOUSE_PORT_X_CB(WRITE8(pc1512_state, mouse_x_w))
MCFG_PC1512_MOUSE_PORT_Y_CB(WRITE8(pc1512_state, mouse_y_w))
- MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_t, m1_w))
- MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_t, m2_w))
+ MCFG_PC1512_MOUSE_PORT_M1_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m1_w))
+ MCFG_PC1512_MOUSE_PORT_M2_CB(DEVWRITELINE(PC1512_KEYBOARD_TAG, pc1512_keyboard_device, m2_w))
MCFG_DEVICE_ADD(I8237A5_TAG, AM9517A, XTAL_24MHz/6)
MCFG_I8237_OUT_HREQ_CB(WRITELINE(pc1512_state, hrq_w))
@@ -1500,12 +1500,12 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1986, pc1512, 0, 0, pc1512, pc1512, driver_device, 0, "Amstrad plc", "PC1512 SD", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, pc1512dd, pc1512, 0, pc1512dd, pc1512, driver_device, 0, "Amstrad plc", "PC1512 DD", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, pc1512hd10, pc1512, 0, pc1512hd, pc1512, driver_device, 0, "Amstrad plc", "PC1512 HD10", MACHINE_SUPPORTS_SAVE )
-COMP( 1986, pc1512hd20, pc1512, 0, pc1512hd, pc1512, driver_device, 0, "Amstrad plc", "PC1512 HD20", MACHINE_SUPPORTS_SAVE )
-COMP( 1987, pc1640, 0, 0, pc1640, pc1640, driver_device, 0, "Amstrad plc", "PC1640 SD", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1987, pc1640dd, pc1640, 0, pc1640dd, pc1640, driver_device, 0, "Amstrad plc", "PC1640 DD", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1987, pc1640hd20, pc1640, 0, pc1640hd, pc1640, driver_device, 0, "Amstrad plc", "PC1640 HD20", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1987, pc1640hd30, pc1640, 0, pc1640hd, pc1640, driver_device, 0, "Amstrad plc", "PC1640 HD30", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, pc1512, 0, 0, pc1512, pc1512, pc1512_state, 0, "Amstrad plc", "PC1512 SD", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, pc1512dd, pc1512, 0, pc1512dd, pc1512, pc1512_state, 0, "Amstrad plc", "PC1512 DD", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, pc1512hd10, pc1512, 0, pc1512hd, pc1512, pc1512_state, 0, "Amstrad plc", "PC1512 HD10", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, pc1512hd20, pc1512, 0, pc1512hd, pc1512, pc1512_state, 0, "Amstrad plc", "PC1512 HD20", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pc1640, 0, 0, pc1640, pc1640, pc1640_state, 0, "Amstrad plc", "PC1640 SD", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pc1640dd, pc1640, 0, pc1640dd, pc1640, pc1640_state, 0, "Amstrad plc", "PC1640 DD", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pc1640hd20, pc1640, 0, pc1640hd, pc1640, pc1640_state, 0, "Amstrad plc", "PC1640 HD20", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pc1640hd30, pc1640, 0, pc1640hd, pc1640, pc1640_state, 0, "Amstrad plc", "PC1640 HD30", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp
index 85d433e195a..82c8d85f16e 100644
--- a/src/mame/drivers/pc2000.cpp
+++ b/src/mame/drivers/pc2000.cpp
@@ -829,7 +829,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pc2000_state, pc2000_cart )
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( pc2000, pc2000_state )
+static MACHINE_CONFIG_START( pc2000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) /* probably not accurate */
MCFG_CPU_PROGRAM_MAP(pc2000_mem)
@@ -886,7 +886,7 @@ HD44780_PIXEL_UPDATE(gl4004_state::gl4000_pixel_update)
}
}
-static MACHINE_CONFIG_DERIVED_CLASS( gl3000s, pc2000, gl3000s_state )
+static MACHINE_CONFIG_DERIVED( gl3000s, pc2000 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(gl3000s_io)
@@ -907,7 +907,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( gl3000s, pc2000, gl3000s_state )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( gl4000, pc2000, gl4004_state )
+static MACHINE_CONFIG_DERIVED( gl4000, pc2000 )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_SIZE(120, 36) // 4x20 chars
MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 36-1)
@@ -920,7 +920,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( gl4000, pc2000, gl4004_state )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("misterx_cart", "misterx")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( misterx, pc2000, pc1000_state )
+static MACHINE_CONFIG_DERIVED( misterx, pc2000 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(pc1000_mem)
@@ -1036,21 +1036,21 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, pc1000, 0, 0, pc1000, pc1000, driver_device, 0, "Video Technology", "PreComputer 1000", MACHINE_NOT_WORKING)
-COMP( 1988, misterx, 0, 0, misterx, pc1000, driver_device, 0, "Video Technology / Yeno", "MisterX", MACHINE_NOT_WORKING)
-COMP( 1988, ordisava, 0, 0, pc1000, pc1000, driver_device, 0, "Video Technology", "Ordisavant (France)", MACHINE_NOT_WORKING)
-COMP( 1993, pc2000, 0, 0, pc2000, pc2000, driver_device, 0, "Video Technology", "PreComputer 2000", MACHINE_NOT_WORKING)
-COMP( 1993, gl2000, 0, 0, gl2000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 2000", MACHINE_NOT_WORKING)
-COMP( 1994, gl2000c, gl2000, 0, gl2000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 2000 Compact", MACHINE_NOT_WORKING)
-COMP( 1995, gl2000p, gl2000, 0, gl2000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 2000 Plus", MACHINE_NOT_WORKING)
-COMP( 1996, gl3000s, 0, 0, gl3000s, gl3000s,driver_device, 0, "Video Technology", "Genius Leader 3000S (Germany)", MACHINE_NOT_WORKING)
-COMP( 1994, gl4000, 0, 0, gl4000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 4000 Quadro (Germany)", MACHINE_NOT_WORKING)
-COMP( 1996, gl4004, 0, 0, gl4000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 4004 Quadro L (Germany)", MACHINE_NOT_WORKING)
-COMP( 1997, gl5000, 0, 0, pc2000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 5000 (Germany)", MACHINE_IS_SKELETON)
-COMP( 1997, gl5005x, 0, 0, pc2000, pc2000, driver_device, 0, "Video Technology", "Genius Leader 5005X (Germany)", MACHINE_IS_SKELETON)
-COMP( 1997, glpn, 0, 0, gl4000, pc2000, driver_device, 0, "Video Technology", "Genius Leader Power Notebook (Germany)", MACHINE_IS_SKELETON)
-COMP( 1998, gmtt , 0, 0, gl4000, pc2000, driver_device, 0, "Video Technology", "Genius Master Table Top (Germany)", MACHINE_IS_SKELETON)
-COMP( 2001, gbs5505x, 0, 0, pc2000, pc2000, driver_device, 0, "Video Technology", "Genius BrainStation 5505X (Germany)", MACHINE_IS_SKELETON)
-COMP( 1993, gln, 0, 0, pc2000, pc2000, driver_device, 0, "Video Technology", "Genius Leader Notebook", MACHINE_IS_SKELETON)
-COMP( 1999, lexipcm, 0, 0, pc2000, pc2000, driver_device, 0, "Lexibook", "LexiPC Mega 2000 (Germany)", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1988, pc1000, 0, 0, pc1000, pc1000, pc1000_state, 0, "Video Technology", "PreComputer 1000", MACHINE_NOT_WORKING )
+COMP( 1988, misterx, 0, 0, misterx, pc1000, pc1000_state, 0, "Video Technology / Yeno", "MisterX", MACHINE_NOT_WORKING )
+COMP( 1988, ordisava, 0, 0, pc1000, pc1000, pc1000_state, 0, "Video Technology", "Ordisavant (France)", MACHINE_NOT_WORKING )
+COMP( 1993, pc2000, 0, 0, pc2000, pc2000, pc2000_state, 0, "Video Technology", "PreComputer 2000", MACHINE_NOT_WORKING )
+COMP( 1993, gl2000, 0, 0, gl2000, pc2000, pc2000_state, 0, "Video Technology", "Genius Leader 2000", MACHINE_NOT_WORKING )
+COMP( 1994, gl2000c, gl2000, 0, gl2000, pc2000, pc2000_state, 0, "Video Technology", "Genius Leader 2000 Compact", MACHINE_NOT_WORKING )
+COMP( 1995, gl2000p, gl2000, 0, gl2000, pc2000, pc2000_state, 0, "Video Technology", "Genius Leader 2000 Plus", MACHINE_NOT_WORKING )
+COMP( 1996, gl3000s, 0, 0, gl3000s, gl3000s, gl3000s_state, 0, "Video Technology", "Genius Leader 3000S (Germany)", MACHINE_NOT_WORKING )
+COMP( 1994, gl4000, 0, 0, gl4000, pc2000, gl4004_state, 0, "Video Technology", "Genius Leader 4000 Quadro (Germany)", MACHINE_NOT_WORKING )
+COMP( 1996, gl4004, 0, 0, gl4000, pc2000, gl4004_state, 0, "Video Technology", "Genius Leader 4004 Quadro L (Germany)", MACHINE_NOT_WORKING )
+COMP( 1997, gl5000, 0, 0, pc2000, pc2000, pc2000_state, 0, "Video Technology", "Genius Leader 5000 (Germany)", MACHINE_IS_SKELETON )
+COMP( 1997, gl5005x, 0, 0, pc2000, pc2000, pc2000_state, 0, "Video Technology", "Genius Leader 5005X (Germany)", MACHINE_IS_SKELETON )
+COMP( 1997, glpn, 0, 0, gl4000, pc2000, gl4004_state, 0, "Video Technology", "Genius Leader Power Notebook (Germany)", MACHINE_IS_SKELETON )
+COMP( 1998, gmtt , 0, 0, gl4000, pc2000, gl4004_state, 0, "Video Technology", "Genius Master Table Top (Germany)", MACHINE_IS_SKELETON )
+COMP( 2001, gbs5505x, 0, 0, pc2000, pc2000, pc2000_state, 0, "Video Technology", "Genius BrainStation 5505X (Germany)", MACHINE_IS_SKELETON )
+COMP( 1993, gln, 0, 0, pc2000, pc2000, pc2000_state, 0, "Video Technology", "Genius Leader Notebook", MACHINE_IS_SKELETON )
+COMP( 1999, lexipcm, 0, 0, pc2000, pc2000, pc2000_state, 0, "Lexibook", "LexiPC Mega 2000 (Germany)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp
index 1aa193eb344..fdbc5588278 100644
--- a/src/mame/drivers/pc4.cpp
+++ b/src/mame/drivers/pc4.cpp
@@ -216,7 +216,7 @@ void pc4_state::machine_start()
m_blink = 0;
}
-static MACHINE_CONFIG_START( pc4, pc4_state )
+static MACHINE_CONFIG_START( pc4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pc4_mem)
@@ -250,5 +250,5 @@ ROM_START( pc4 )
ROM_LOAD( "44780a00.bin", 0x0000, 0x0860, BAD_DUMP CRC(3a89024c) SHA1(5a87b68422a916d1b37b5be1f7ad0b3fb3af5a8d))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1990, pc4, 0, 0, pc4, pc4, driver_device, 0, "Laser Computer", "Laser PC4", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1990, pc4, 0, 0, pc4, pc4, pc4_state, 0, "Laser Computer", "Laser PC4", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index 9fd2c50a98f..0471b58f8e5 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -2270,7 +2270,7 @@ GFXDECODE_END
#define PC6001_MAIN_CLOCK 7987200
-static MACHINE_CONFIG_START( pc6001, pc6001_state )
+static MACHINE_CONFIG_START( pc6001 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, PC6001_MAIN_CLOCK / 2) // ~4 Mhz
MCFG_CPU_PROGRAM_MAP(pc6001_map)
@@ -2464,9 +2464,9 @@ ROM_START( pc6001sr )
ROM_COPY( "maincpu", 0x28000, 0x00000, 0x8000 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, pc6001, 0, 0, pc6001, pc6001, driver_device, 0, "NEC", "PC-6001 (Japan)", MACHINE_NOT_WORKING )
-COMP( 1981, pc6001a, pc6001, 0, pc6001, pc6001, driver_device, 0, "NEC", "PC-6001A (US)", MACHINE_NOT_WORKING ) // This version is also known as the NEC Trek
-COMP( 1983, pc6001mk2,pc6001, 0, pc6001m2, pc6001, driver_device, 0, "NEC", "PC-6001mkII (Japan)", MACHINE_NOT_WORKING )
-COMP( 1983, pc6601, pc6001, 0, pc6601, pc6001, driver_device, 0, "NEC", "PC-6601 (Japan)", MACHINE_NOT_WORKING )
-COMP( 1984, pc6001sr, pc6001, 0, pc6001sr, pc6001, driver_device, 0, "NEC", "PC-6001mkIISR (Japan)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, pc6001, 0, 0, pc6001, pc6001, pc6001_state, 0, "NEC", "PC-6001 (Japan)", MACHINE_NOT_WORKING )
+COMP( 1981, pc6001a, pc6001, 0, pc6001, pc6001, pc6001_state, 0, "NEC", "PC-6001A (US)", MACHINE_NOT_WORKING ) // This version is also known as the NEC Trek
+COMP( 1983, pc6001mk2,pc6001, 0, pc6001m2, pc6001, pc6001_state, 0, "NEC", "PC-6001mkII (Japan)", MACHINE_NOT_WORKING )
+COMP( 1983, pc6601, pc6001, 0, pc6601, pc6001, pc6001_state, 0, "NEC", "PC-6601 (Japan)", MACHINE_NOT_WORKING )
+COMP( 1984, pc6001sr, pc6001, 0, pc6001sr, pc6001, pc6001_state, 0, "NEC", "PC-6001mkIISR (Japan)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index eba3531fb75..dc3e7ffdd65 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -476,7 +476,7 @@ void pc8001_state::machine_start()
/* Machine Drivers */
-static MACHINE_CONFIG_START( pc8001, pc8001_state )
+static MACHINE_CONFIG_START( pc8001 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pc8001_mem)
@@ -526,7 +526,7 @@ static MACHINE_CONFIG_START( pc8001, pc8001_state )
MCFG_RAM_EXTRA_OPTIONS("32K,64K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc8001mk2, pc8001mk2_state )
+static MACHINE_CONFIG_START( pc8001mk2 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pc8001mk2_mem)
@@ -601,6 +601,6 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, pc8001, 0, 0, pc8001, pc8001, driver_device, 0, "NEC", "PC-8001", MACHINE_NOT_WORKING )
-COMP( 1983, pc8001mk2, pc8001, 0, pc8001mk2, pc8001, driver_device, 0, "NEC", "PC-8001mkII", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, pc8001, 0, 0, pc8001, pc8001, pc8001_state, 0, "NEC", "PC-8001", MACHINE_NOT_WORKING )
+COMP( 1983, pc8001mk2, pc8001, 0, pc8001mk2, pc8001, pc8001mk2_state, 0, "NEC", "PC-8001mkII", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp
index e14aa8b7c26..08a6558e6cd 100644
--- a/src/mame/drivers/pc8401a.cpp
+++ b/src/mame/drivers/pc8401a.cpp
@@ -568,7 +568,7 @@ WRITE8_MEMBER( pc8401a_state::ppi_pc_w )
/* Machine Drivers */
-static MACHINE_CONFIG_START( pc8401a, pc8401a_state )
+static MACHINE_CONFIG_START( pc8401a )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C
MCFG_CPU_PROGRAM_MAP(pc8401a_mem)
@@ -610,7 +610,7 @@ static MACHINE_CONFIG_START( pc8401a, pc8401a_state )
MCFG_RAM_EXTRA_OPTIONS("96K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc8500, pc8500_state )
+static MACHINE_CONFIG_START( pc8500 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, 4000000) // NEC uPD70008C
MCFG_CPU_PROGRAM_MAP(pc8401a_mem)
@@ -673,6 +673,6 @@ ROM_END
/* System Drivers */
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1984, pc8401a, 0, 0, pc8401a, pc8401a, driver_device, 0, "NEC", "PC-8401A-LS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-//COMP( 1984, pc8401bd, pc8401a,0, pc8401a, pc8401a, driver_device, 0, "NEC", "PC-8401BD", MACHINE_NOT_WORKING)
-COMP( 1985, pc8500, 0, 0, pc8500, pc8401a, driver_device, 0, "NEC", "PC-8500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1984, pc8401a, 0, 0, pc8401a, pc8401a, pc8401a_state, 0, "NEC", "PC-8401A-LS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+//COMP( 1984, pc8401bd, pc8401a,0, pc8401a, pc8401a, pc8401a_state, 0, "NEC", "PC-8401BD", MACHINE_NOT_WORKING)
+COMP( 1985, pc8500, 0, 0, pc8500, pc8401a, pc8500_state, 0, "NEC", "PC-8500", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index e349c9af39e..990fa861155 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -2565,7 +2565,7 @@ WRITE_LINE_MEMBER( pc8801_state::rxrdy_w )
// ...
}
-static MACHINE_CONFIG_START( pc8801, pc8801_state )
+static MACHINE_CONFIG_START( pc8801 )
/* main CPU */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(pc8801_mem)
@@ -2946,21 +2946,21 @@ ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1981, pc8801, 0, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801", MACHINE_NOT_WORKING )
-COMP( 1983, pc8801mk2, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801mkII", MACHINE_NOT_WORKING )
-COMP( 1985, pc8801mk2sr, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801mkIISR", MACHINE_NOT_WORKING )
-//COMP( 1985, pc8801mk2tr, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801mkIITR", MACHINE_NOT_WORKING )
-COMP( 1985, pc8801mk2fr, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801mkIIFR", MACHINE_NOT_WORKING )
-COMP( 1985, pc8801mk2mr, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801mkIIMR", MACHINE_NOT_WORKING )
-
-//COMP( 1986, pc8801fh, 0, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801FH", MACHINE_NOT_WORKING )
-COMP( 1986, pc8801mh, pc8801, 0, pc8801fh, pc88sr, driver_device, 0, "NEC", "PC-8801MH", MACHINE_NOT_WORKING )
-COMP( 1987, pc8801fa, pc8801, 0, pc8801fh, pc88sr, driver_device, 0, "NEC", "PC-8801FA", MACHINE_NOT_WORKING )
-COMP( 1987, pc8801ma, pc8801, 0, pc8801ma, pc88sr, driver_device, 0, "NEC", "PC-8801MA", MACHINE_NOT_WORKING )
-//COMP( 1988, pc8801fe, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801FE", MACHINE_NOT_WORKING )
-COMP( 1988, pc8801ma2, pc8801, 0, pc8801ma, pc88sr, driver_device, 0, "NEC", "PC-8801MA2", MACHINE_NOT_WORKING )
-//COMP( 1989, pc8801fe2, pc8801, 0, pc8801, pc88sr, driver_device, 0, "NEC", "PC-8801FE2", MACHINE_NOT_WORKING )
-COMP( 1989, pc8801mc, pc8801, 0, pc8801mc, pc88sr, driver_device, 0, "NEC", "PC-8801MC", MACHINE_NOT_WORKING )
-
-//COMP( 1989, pc98do, 0, 0, pc88va, pc88sr, driver_device, 0, "NEC", "PC-98DO", MACHINE_NOT_WORKING )
-//COMP( 1990, pc98dop, 0, 0, pc88va, pc88sr, driver_device, 0, "NEC", "PC-98DO+", MACHINE_NOT_WORKING )
+COMP( 1981, pc8801, 0, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801", MACHINE_NOT_WORKING )
+COMP( 1983, pc8801mk2, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801mkII", MACHINE_NOT_WORKING )
+COMP( 1985, pc8801mk2sr, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801mkIISR", MACHINE_NOT_WORKING )
+//COMP( 1985, pc8801mk2tr, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801mkIITR", MACHINE_NOT_WORKING )
+COMP( 1985, pc8801mk2fr, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801mkIIFR", MACHINE_NOT_WORKING )
+COMP( 1985, pc8801mk2mr, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801mkIIMR", MACHINE_NOT_WORKING )
+
+//COMP( 1986, pc8801fh, 0, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801FH", MACHINE_NOT_WORKING )
+COMP( 1986, pc8801mh, pc8801, 0, pc8801fh, pc88sr, pc8801_state, 0, "NEC", "PC-8801MH", MACHINE_NOT_WORKING )
+COMP( 1987, pc8801fa, pc8801, 0, pc8801fh, pc88sr, pc8801_state, 0, "NEC", "PC-8801FA", MACHINE_NOT_WORKING )
+COMP( 1987, pc8801ma, pc8801, 0, pc8801ma, pc88sr, pc8801_state, 0, "NEC", "PC-8801MA", MACHINE_NOT_WORKING )
+//COMP( 1988, pc8801fe, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801FE", MACHINE_NOT_WORKING )
+COMP( 1988, pc8801ma2, pc8801, 0, pc8801ma, pc88sr, pc8801_state, 0, "NEC", "PC-8801MA2", MACHINE_NOT_WORKING )
+//COMP( 1989, pc8801fe2, pc8801, 0, pc8801, pc88sr, pc8801_state, 0, "NEC", "PC-8801FE2", MACHINE_NOT_WORKING )
+COMP( 1989, pc8801mc, pc8801, 0, pc8801mc, pc88sr, pc8801_state, 0, "NEC", "PC-8801MC", MACHINE_NOT_WORKING )
+
+//COMP( 1989, pc98do, 0, 0, pc88va, pc88sr, pc8801_state, 0, "NEC", "PC-98DO", MACHINE_NOT_WORKING )
+//COMP( 1990, pc98dop, 0, 0, pc88va, pc88sr, pc8801_state, 0, "NEC", "PC-98DO+", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index e59c01fc642..894b6f370c9 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -1779,7 +1779,7 @@ printf("%08x %02x\n",offset,data);
}
-static MACHINE_CONFIG_START( pc88va, pc88va_state )
+static MACHINE_CONFIG_START( pc88va )
MCFG_CPU_ADD("maincpu", V30, 8000000) /* 8 MHz */
MCFG_CPU_PROGRAM_MAP(pc88va_map)
@@ -1918,6 +1918,6 @@ ROM_END
-COMP( 1987, pc88va, 0, 0, pc88va, pc88va, driver_device, 0, "NEC", "PC-88VA", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1988, pc88va2, pc88va, 0, pc88va, pc88va, driver_device, 0, "NEC", "PC-88VA2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-//COMP( 1988, pc88va3, pc88va, 0, pc88va, pc88va, driver_device, 0, "NEC", "PC-88VA3", MACHINE_NOT_WORKING )
+COMP( 1987, pc88va, 0, 0, pc88va, pc88va, pc88va_state, 0, "NEC", "PC-88VA", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1988, pc88va2, pc88va, 0, pc88va, pc88va, pc88va_state, 0, "NEC", "PC-88VA2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+//COMP( 1988, pc88va3, pc88va, 0, pc88va, pc88va, pc88va_state, 0, "NEC", "PC-88VA3", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index 21ffd872f2a..71bb1dbb3b7 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -483,7 +483,7 @@ public:
required_device<i8251_device> m_sio;
required_device<upd7220_device> m_hgdc1;
required_device<upd7220_device> m_hgdc2;
- optional_device<SCSI_PORT_DEVICE> m_sasibus;
+ optional_device<scsi_port_device> m_sasibus;
optional_device<output_latch_device> m_sasi_data_out;
optional_device<input_buffer_device> m_sasi_data_in;
optional_device<input_buffer_device> m_sasi_ctrl_in;
@@ -3365,7 +3365,7 @@ static MACHINE_CONFIG_FRAGMENT( pc9801_common )
MCFG_GFXDECODE_ADD("gfxdecode", "palette", pc9801)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc9801, pc9801_state )
+static MACHINE_CONFIG_START( pc9801 )
MCFG_CPU_ADD("maincpu", I8086, 5000000) //unknown clock
MCFG_CPU_PROGRAM_MAP(pc9801_map)
MCFG_CPU_IO_MAP(pc9801_io)
@@ -3400,7 +3400,7 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pc9801rs, pc9801_state )
+static MACHINE_CONFIG_START( pc9801rs )
MCFG_CPU_ADD("maincpu", I386SX, MAIN_CLOCK_X1*8) // unknown clock.
MCFG_CPU_PROGRAM_MAP(pc9801rs_map)
MCFG_CPU_IO_MAP(pc9801rs_io)
@@ -3944,20 +3944,20 @@ DRIVER_INIT_MEMBER(pc9801_state,pc9801_kanji)
}
/* Genuine dumps */
-COMP( 1983, pc9801f, 0, 0, pc9801, pc9801, pc9801_state, pc9801_kanji, "NEC", "PC-9801F", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1983, pc9801f, 0, 0, pc9801, pc9801, pc9801_state, pc9801_kanji, "NEC", "PC-9801F", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
/* TODO: ANYTHING below there needs REDUMPING! */
-COMP( 1989, pc9801rs, 0 ,0, pc9801rs, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801RS", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) //TODO: not sure about the exact model
-COMP( 1985, pc9801vm, pc9801ux,0, pc9801vm, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801VM", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1987, pc9801ux, 0 ,0, pc9801ux, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801UX", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1988, pc9801rx, pc9801rs,0, pc9801rs, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801RX", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1993, pc9801bx2, pc9801rs,0, pc9801bx2,pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801BX2/U2", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1994, pc9821, 0, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) //TODO: not sure about the exact model
-COMP( 1993, pc9821as, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE A)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1993, pc9821ap2, pc9821, 0, pc9821ap2,pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821AP2/U8W (98MATE A)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1994, pc9821xs, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE Xs)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1994, pc9821ce2, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MULTi Ce2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1994, pc9821ne, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98NOTE)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1994, pc486mu, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "Epson", "PC-486MU", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1998, pc9821v13, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE VALUESTAR 13)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-COMP( 1998, pc9821v20, pc9821, 0, pc9821v20,pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE VALUESTAR 20)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1989, pc9801rs, 0, 0, pc9801rs, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801RS", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) //TODO: not sure about the exact model
+COMP( 1985, pc9801vm, pc9801ux, 0, pc9801vm, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801VM", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1987, pc9801ux, 0, 0, pc9801ux, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801UX", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1988, pc9801rx, pc9801rs, 0, pc9801rs, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801RX", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1993, pc9801bx2, pc9801rs, 0, pc9801bx2, pc9801rs, pc9801_state, pc9801_kanji, "NEC", "PC-9801BX2/U2", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1994, pc9821, 0, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) //TODO: not sure about the exact model
+COMP( 1993, pc9821as, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE A)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1993, pc9821ap2, pc9821, 0, pc9821ap2, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821AP2/U8W (98MATE A)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1994, pc9821xs, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE Xs)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1994, pc9821ce2, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MULTi Ce2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1994, pc9821ne, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98NOTE)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1994, pc486mu, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "Epson", "PC-486MU", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1998, pc9821v13, pc9821, 0, pc9821, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE VALUESTAR 13)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+COMP( 1998, pc9821v20, pc9821, 0, pc9821v20, pc9821, pc9801_state, pc9801_kanji, "NEC", "PC-9821 (98MATE VALUESTAR 20)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp
index d01fb0c8a14..48aa679321b 100644
--- a/src/mame/drivers/pcat_dyn.cpp
+++ b/src/mame/drivers/pcat_dyn.cpp
@@ -152,7 +152,7 @@ static MACHINE_CONFIG_FRAGMENT( pcat_dyn_sb_conf )
MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pcat_dyn, pcat_dyn_state )
+static MACHINE_CONFIG_START( pcat_dyn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I486, 40000000) /* Am486 DX-40 */
MCFG_CPU_PROGRAM_MAP(pcat_map)
@@ -264,5 +264,5 @@ ROM_START(toursol1)
ROM_END
-GAME( 1995, toursol, 0, pcat_dyn, pcat_dyn, driver_device, 0, ROT0, "Dynamo", "Tournament Solitaire (V1.06, 08/03/95)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1995, toursol1, toursol, pcat_dyn, pcat_dyn, driver_device, 0, ROT0, "Dynamo", "Tournament Solitaire (V1.04, 06/22/95)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+GAME( 1995, toursol, 0, pcat_dyn, pcat_dyn, pcat_dyn_state, 0, ROT0, "Dynamo", "Tournament Solitaire (V1.06, 08/03/95)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1995, toursol1, toursol, pcat_dyn, pcat_dyn, pcat_dyn_state, 0, ROT0, "Dynamo", "Tournament Solitaire (V1.04, 06/22/95)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pcat_nit.cpp b/src/mame/drivers/pcat_nit.cpp
index 37948b8817b..3e1470957bd 100644
--- a/src/mame/drivers/pcat_nit.cpp
+++ b/src/mame/drivers/pcat_nit.cpp
@@ -217,7 +217,7 @@ void pcat_nit_state::machine_start()
membank("rombank")->set_entry(0);
}
-static MACHINE_CONFIG_START( pcat_nit, pcat_nit_state )
+static MACHINE_CONFIG_START( pcat_nit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
MCFG_CPU_PROGRAM_MAP(pcat_map)
@@ -236,7 +236,7 @@ static MACHINE_CONFIG_START( pcat_nit, pcat_nit_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bonanza, pcat_nit_state )
+static MACHINE_CONFIG_START( bonanza )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */
MCFG_CPU_PROGRAM_MAP(bonanza_map)
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index 6b9210ccf63..bca2415c706 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -90,9 +90,9 @@ private:
required_device<pic8259_device> m_pic1;
required_device<pic8259_device> m_pic2;
required_device<speaker_sound_device> m_speaker;
- required_device<wd2793_t> m_fdc;
+ required_device<wd2793_device> m_fdc;
required_device<mc146818_device> m_rtc;
- required_device<SCSI_PORT_DEVICE> m_scsi;
+ required_device<scsi_port_device> m_scsi;
required_device<output_latch_device> m_scsi_data_out;
required_device<input_buffer_device> m_scsi_data_in;
required_device<ram_device> m_ram;
@@ -446,7 +446,7 @@ static ADDRESS_MAP_START( pcd_io, AS_IO, 16, pcd_state )
AM_RANGE(0xf840, 0xf841) AM_READWRITE8(stat_r, stat_w, 0x00ff)
AM_RANGE(0xf840, 0xf841) AM_READWRITE8(led_r, led_w, 0xff00)
AM_RANGE(0xf880, 0xf8bf) AM_READWRITE8(rtc_r, rtc_w, 0xffff)
- AM_RANGE(0xf900, 0xf903) AM_DEVREADWRITE8("fdc", wd2793_t, read, write, 0xffff)
+ AM_RANGE(0xf900, 0xf903) AM_DEVREADWRITE8("fdc", wd2793_device, read, write, 0xffff)
AM_RANGE(0xf904, 0xf905) AM_READWRITE(dskctl_r, dskctl_w)
AM_RANGE(0xf940, 0xf943) AM_READWRITE8(scsi_r, scsi_w, 0xffff)
AM_RANGE(0xf980, 0xf9bf) AM_DEVICE("video", pcdx_video_device, map)
@@ -486,7 +486,7 @@ static INPUT_PORTS_START(pcx)
PORT_CONFSETTING(0x02, "SINIX 1.2")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pcd, pcd_state )
+static MACHINE_CONFIG_START( pcd )
MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(pcd_map)
MCFG_CPU_IO_MAP(pcd_io)
@@ -606,5 +606,5 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-COMP( 1984, pcd, 0, 0, pcd, 0, driver_device, 0, "Siemens", "PC-D", MACHINE_NOT_WORKING )
-COMP( 1984, pcx, pcd, 0, pcx, pcx, driver_device, 0, "Siemens", "PC-X", MACHINE_NOT_WORKING )
+COMP( 1984, pcd, 0, 0, pcd, 0, pcd_state, 0, "Siemens", "PC-D", MACHINE_NOT_WORKING )
+COMP( 1984, pcx, pcd, 0, pcx, pcx, pcd_state, 0, "Siemens", "PC-X", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp
index dd1d22ee450..8c76d52a286 100644
--- a/src/mame/drivers/pce.cpp
+++ b/src/mame/drivers/pce.cpp
@@ -305,7 +305,7 @@ static SLOT_INTERFACE_START(pce_cart)
SLOT_INTERFACE_INTERNAL("sf2", PCE_ROM_SF2)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( pce_common, pce_state )
+static MACHINE_CONFIG_START( pce_common )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, MAIN_CLOCK/3)
MCFG_CPU_PROGRAM_MAP(pce_mem)
@@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( pce_common, pce_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( pce_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -355,7 +355,7 @@ static MACHINE_CONFIG_DERIVED( tg16, pce_common )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sgx, pce_state )
+static MACHINE_CONFIG_START( sgx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, MAIN_CLOCK/3)
MCFG_CPU_PROGRAM_MAP(sgx_mem)
@@ -367,7 +367,7 @@ static MACHINE_CONFIG_START( sgx, pce_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( pce_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -424,6 +424,6 @@ ROM_END
#define rom_tg16 rom_pce
#define rom_sgx rom_pce
-CONS( 1987, pce, 0, 0, pce, pce, pce_state, mess_pce, "NEC / Hudson Soft", "PC Engine", MACHINE_IMPERFECT_SOUND)
-CONS( 1989, tg16, pce, 0, tg16, pce, pce_state, tg16, "NEC / Hudson Soft", "TurboGrafx 16", MACHINE_IMPERFECT_SOUND)
-CONS( 1989, sgx, pce, 0, sgx, pce, pce_state, sgx, "NEC / Hudson Soft", "SuperGrafx", MACHINE_IMPERFECT_SOUND)
+CONS( 1987, pce, 0, 0, pce, pce, pce_state, mess_pce, "NEC / Hudson Soft", "PC Engine", MACHINE_IMPERFECT_SOUND )
+CONS( 1989, tg16, pce, 0, tg16, pce, pce_state, tg16, "NEC / Hudson Soft", "TurboGrafx 16", MACHINE_IMPERFECT_SOUND )
+CONS( 1989, sgx, pce, 0, sgx, pce, pce_state, sgx, "NEC / Hudson Soft", "SuperGrafx", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp
index 7e2e457fc6c..d1a39b8a8bf 100644
--- a/src/mame/drivers/pce220.cpp
+++ b/src/mame/drivers/pce220.cpp
@@ -925,7 +925,7 @@ PALETTE_INIT_MEMBER(pce220_state,pce220)
}
-static MACHINE_CONFIG_START( pce220, pce220_state )
+static MACHINE_CONFIG_START( pce220 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, 3072000 ) // CMOS-SC7852
MCFG_CPU_PROGRAM_MAP(pce220_mem)
@@ -961,7 +961,7 @@ static MACHINE_CONFIG_START( pce220, pce220_state )
MCFG_PCE220_SERIAL_ADD(PCE220SERIAL_TAG)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pcg815, pcg850v_state )
+static MACHINE_CONFIG_START( pcg815 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz ) // 3.54MHz
MCFG_CPU_PROGRAM_MAP(pce220_mem)
@@ -997,7 +997,7 @@ static MACHINE_CONFIG_START( pcg815, pcg850v_state )
MCFG_PCE220_SERIAL_ADD(PCE220SERIAL_TAG)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pcg850v, pcg850v_state )
+static MACHINE_CONFIG_START( pcg850v )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz ) // CMOS-SC7852
MCFG_CPU_PROGRAM_MAP(pce220_mem)
@@ -1104,7 +1104,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1991, pce220, 0, 0, pce220, pce220, driver_device, 0, "Sharp", "PC-E220", MACHINE_NOT_WORKING )
-COMP( 1992, pcg815, 0, 0, pcg815, pcg850v, driver_device, 0, "Sharp", "PC-G815", MACHINE_NOT_WORKING )
-COMP( 2001, pcg850v, 0, 0, pcg850v, pcg850v, driver_device, 0, "Sharp", "PC-G850V", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1991, pce220, 0, 0, pce220, pce220, pce220_state, 0, "Sharp", "PC-E220", MACHINE_NOT_WORKING )
+COMP( 1992, pcg815, 0, 0, pcg815, pcg850v, pcg850v_state, 0, "Sharp", "PC-G815", MACHINE_NOT_WORKING )
+COMP( 2001, pcg850v, 0, 0, pcg850v, pcg850v, pcg850v_state, 0, "Sharp", "PC-G850V", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp
index 26dafc00080..a825ef4c778 100644
--- a/src/mame/drivers/pcfx.cpp
+++ b/src/mame/drivers/pcfx.cpp
@@ -408,14 +408,14 @@ uint32_t pcfx_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
}
-static MACHINE_CONFIG_START( pcfx, pcfx_state )
+static MACHINE_CONFIG_START( pcfx )
MCFG_CPU_ADD( "maincpu", V810, XTAL_21_4772MHz )
MCFG_CPU_PROGRAM_MAP( pcfx_mem)
MCFG_CPU_IO_MAP( pcfx_io)
MCFG_SCREEN_ADD( "screen", RASTER )
MCFG_SCREEN_UPDATE_DRIVER(pcfx_state, screen_update)
- MCFG_SCREEN_RAW_PARAMS(XTAL_21_4772MHz, HUC6261_WPF, 64, 64 + 1024 + 64, HUC6261_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(XTAL_21_4772MHz, huc6261_device::WPF, 64, 64 + 1024 + 64, huc6261_device::LPF, 18, 18 + 242)
MCFG_DEVICE_ADD( "huc6270_a", HUC6270, 0 )
MCFG_HUC6270_VRAM_SIZE(0x20000)
@@ -464,6 +464,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1994, pcfx, 0, 0, pcfx, pcfx, driver_device, 0, "NEC", "PC-FX", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-CONS( 199?, pcfxga, pcfx, 0, pcfx, pcfx, driver_device, 0, "NEC", "PC-FX/GA (PC ISA Card)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1994, pcfx, 0, 0, pcfx, pcfx, pcfx_state, 0, "NEC", "PC-FX", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 199?, pcfxga, pcfx, 0, pcfx, pcfx, pcfx_state, 0, "NEC", "PC-FX/GA (PC ISA Card)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pcipc.cpp b/src/mame/drivers/pcipc.cpp
index e8f4074f512..9be5128f202 100644
--- a/src/mame/drivers/pcipc.cpp
+++ b/src/mame/drivers/pcipc.cpp
@@ -276,7 +276,7 @@ WRITE8_MEMBER(pcipc_state::boot_state_award_w)
}
-static MACHINE_CONFIG_START(pcipc, pcipc_state)
+static MACHINE_CONFIG_START(pcipc)
MCFG_CPU_ADD("maincpu", PENTIUM, 90000000)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
@@ -288,7 +288,7 @@ static MACHINE_CONFIG_START(pcipc, pcipc_state)
MCFG_MGA2064W_ADD( ":pci:12.0")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START(pcipctx, pcipc_state)
+static MACHINE_CONFIG_START(pcipctx)
MCFG_CPU_ADD("maincpu", PENTIUM, 60000000)
MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pci:07.0:pic8259_master", pic8259_device, inta_cb)
@@ -326,5 +326,5 @@ ROM_END
static INPUT_PORTS_START(pcipc)
INPUT_PORTS_END
-COMP(1998, pcipc, 0, 0, pcipc, pcipc, driver_device, 0, "Hack Inc.", "Sandbox PCI PC (440HX)", MACHINE_NO_SOUND)
-COMP(1998, pcipctx, 0, 0, pcipctx, pcipc, driver_device, 0, "Hack Inc.", "Sandbox PCI PC (440TX)", MACHINE_NO_SOUND)
+COMP(1998, pcipc, 0, 0, pcipc, pcipc, pcipc_state, 0, "Hack Inc.", "Sandbox PCI PC (440HX)", MACHINE_NO_SOUND)
+COMP(1998, pcipctx, 0, 0, pcipctx, pcipc, pcipc_state, 0, "Hack Inc.", "Sandbox PCI PC (440TX)", MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp
index f09610cd8f4..da0fa64af82 100644
--- a/src/mame/drivers/pcktgal.cpp
+++ b/src/mame/drivers/pcktgal.cpp
@@ -221,7 +221,7 @@ void pcktgal_state::machine_start()
save_item(NAME(m_toggle));
}
-static MACHINE_CONFIG_START( pcktgal, pcktgal_state )
+static MACHINE_CONFIG_START( pcktgal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 2000000)
@@ -264,7 +264,7 @@ static MACHINE_CONFIG_START( pcktgal, pcktgal_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(pcktgal_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
@@ -449,7 +449,7 @@ DRIVER_INIT_MEMBER(pcktgal_state,pcktgal)
/***************************************************************************/
GAME( 1987, pcktgal, 0, pcktgal, pcktgal, pcktgal_state, pcktgal, ROT0, "Data East Corporation", "Pocket Gal (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, pcktgalb, pcktgal, bootleg, pcktgal, driver_device, 0, ROT0, "bootleg", "Pocket Gal (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, pcktgalb, pcktgal, bootleg, pcktgal, pcktgal_state, 0, ROT0, "bootleg", "Pocket Gal (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, pcktgal2, pcktgal, pcktgal2,pcktgal, pcktgal_state, pcktgal, ROT0, "Data East Corporation", "Pocket Gal 2 (English)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, pcktgal2j,pcktgal, pcktgal2,pcktgal, pcktgal_state, pcktgal, ROT0, "Data East Corporation", "Pocket Gal 2 (Japanese)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, spool3, pcktgal, pcktgal2,pcktgal, pcktgal_state, pcktgal, ROT0, "Data East Corporation", "Super Pool III (English)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index 5f954f2bf98..e0dd023bf04 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -250,7 +250,7 @@ static GFXDECODE_START( pcm )
GFXDECODE_ENTRY( "chargen", 0x0000, pcm_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pcm, pcm_state )
+static MACHINE_CONFIG_START( pcm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_10MHz /4)
MCFG_CPU_PROGRAM_MAP(pcm_mem)
@@ -326,5 +326,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, pcm, 0, 0, pcm, pcm, driver_device, 0, "Mugler/Mathes", "PC/M", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1988, pcm, 0, 0, pcm, pcm, pcm_state, 0, "Mugler/Mathes", "PC/M", 0)
diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp
index 326f636baf6..2d2a0cb6c62 100644
--- a/src/mame/drivers/pcw.cpp
+++ b/src/mame/drivers/pcw.cpp
@@ -1242,7 +1242,7 @@ static SLOT_INTERFACE_START( pcw_floppies )
SLOT_INTERFACE_END
/* PCW8256, PCW8512, PCW9256 */
-static MACHINE_CONFIG_START( pcw, pcw_state )
+static MACHINE_CONFIG_START( pcw )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* clock supplied to chip, but in reality it is 3.4 MHz */
MCFG_CPU_PROGRAM_MAP(pcw_map)
@@ -1393,9 +1393,9 @@ ROM_END
/* these are all variants on the pcw design */
/* major difference is memory configuration and drive type */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1985, pcw8256, 0, 0, pcw8256, pcw, pcw_state, pcw, "Amstrad plc", "PCW8256", MACHINE_NOT_WORKING)
-COMP( 1985, pcw8512, pcw8256, 0, pcw8512, pcw, pcw_state, pcw, "Amstrad plc", "PCW8512", MACHINE_NOT_WORKING)
-COMP( 1987, pcw9256, pcw8256, 0, pcw8256, pcw, pcw_state, pcw, "Amstrad plc", "PCW9256", MACHINE_NOT_WORKING)
-COMP( 1987, pcw9512, pcw8256, 0, pcw9512, pcw, pcw_state, pcw, "Amstrad plc", "PCW9512 (+)", MACHINE_NOT_WORKING)
-COMP( 1993, pcw10, pcw8256, 0, pcw8512, pcw, pcw_state, pcw, "Amstrad plc", "PCW10", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1985, pcw8256, 0, 0, pcw8256, pcw, pcw_state, pcw, "Amstrad plc", "PCW8256", MACHINE_NOT_WORKING)
+COMP( 1985, pcw8512, pcw8256, 0, pcw8512, pcw, pcw_state, pcw, "Amstrad plc", "PCW8512", MACHINE_NOT_WORKING)
+COMP( 1987, pcw9256, pcw8256, 0, pcw8256, pcw, pcw_state, pcw, "Amstrad plc", "PCW9256", MACHINE_NOT_WORKING)
+COMP( 1987, pcw9512, pcw8256, 0, pcw9512, pcw, pcw_state, pcw, "Amstrad plc", "PCW9512 (+)", MACHINE_NOT_WORKING)
+COMP( 1993, pcw10, pcw8256, 0, pcw8512, pcw, pcw_state, pcw, "Amstrad plc", "PCW10", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index cd1bab1f3db..c5ed761e04c 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -1006,7 +1006,7 @@ static SLOT_INTERFACE_START(pcw16_com)
SLOT_INTERFACE("msystems_mouse", MSYSTEM_SERIAL_MOUSE)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( pcw16, pcw16_state )
+static MACHINE_CONFIG_START( pcw16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 16000000)
MCFG_CPU_PROGRAM_MAP(pcw16_map)
@@ -1093,5 +1093,5 @@ ROM_START(pcw16)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1995, pcw16, 0, 0, pcw16, pcw16, driver_device, 0, "Amstrad plc", "PcW16", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1995, pcw16, 0, 0, pcw16, pcw16, pcw16_state, 0, "Amstrad plc", "PcW16", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp
index cbe24788965..09ea4794b1b 100644
--- a/src/mame/drivers/pcxt.cpp
+++ b/src/mame/drivers/pcxt.cpp
@@ -57,6 +57,7 @@ the main program is 9th October 1990.
******************************************************************************************/
#include "emu.h"
+#include "bus/isa/cga.h"
#include "cpu/i86/i86.h"
#include "sound/hc55516.h"
#include "machine/bankdev.h"
@@ -104,14 +105,14 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
};
-const device_type ISA8_CGA_FILETTO = device_creator<isa8_cga_filetto_device>;
+DEFINE_DEVICE_TYPE(ISA8_CGA_FILETTO, isa8_cga_filetto_device, "filetto_cga", "ISA8_CGA_FILETTO")
//-------------------------------------------------
// isa8_cga_filetto_device - constructor
//-------------------------------------------------
isa8_cga_filetto_device::isa8_cga_filetto_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- isa8_cga_device( mconfig, ISA8_CGA_FILETTO, "ISA8_CGA_FILETTO", tag, owner, clock, "filetto_cga", __FILE__)
+ isa8_cga_device(mconfig, ISA8_CGA_FILETTO, tag, owner, clock)
{
}
@@ -145,14 +146,14 @@ private:
/* for superimposing CGA over a different source video (i.e. tetriskr) */
-const device_type ISA8_CGA_TETRISKR = device_creator<isa8_cga_tetriskr_device>;
+DEFINE_DEVICE_TYPE(ISA8_CGA_TETRISKR, isa8_cga_tetriskr_device, "tetriskr_cga", "ISA8_CGA_TETRISKR")
//-------------------------------------------------
// isa8_cga_tetriskr_device - constructor
//-------------------------------------------------
isa8_cga_tetriskr_device::isa8_cga_tetriskr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- isa8_cga_superimpose_device( mconfig, ISA8_CGA_TETRISKR, "ISA8_CGA_TETRISKR", tag, owner, clock, "tetriskr_cga", __FILE__)
+ isa8_cga_superimpose_device(mconfig, ISA8_CGA_TETRISKR, tag, owner, clock)
{
}
@@ -479,7 +480,7 @@ static SLOT_INTERFACE_START( filetto_isa8_cards )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( filetto, pcxt_state )
+static MACHINE_CONFIG_START( filetto )
MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
MCFG_CPU_PROGRAM_MAP(filetto_map)
MCFG_CPU_IO_MAP(filetto_io)
@@ -500,7 +501,7 @@ static MACHINE_CONFIG_START( filetto, pcxt_state )
MCFG_ADDRESS_MAP_BANK_STRIDE(0x10000)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tetriskr, pcxt_state )
+static MACHINE_CONFIG_START( tetriskr )
MCFG_CPU_ADD("maincpu", I8088, XTAL_14_31818MHz/3)
MCFG_CPU_PROGRAM_MAP(tetriskr_map)
MCFG_CPU_IO_MAP(tetriskr_io)
@@ -539,5 +540,5 @@ ROM_START( tetriskr )
ROM_LOAD( "b-10.u10", 0x0000, 0x10000, CRC(efc2a0f6) SHA1(5f0f1e90237bee9b78184035a32055b059a91eb3) )
ROM_END
-GAME( 1990, filetto, 0, filetto, filetto, driver_device, 0, ROT0, "Novarmatic", "Filetto (v1.05 901009)",MACHINE_IMPERFECT_SOUND )
-GAME( 1988?,tetriskr, 0, tetriskr, tetriskr, driver_device, 0, ROT0, "bootleg", "Tetris (Korean bootleg of Mirrorsoft PC-XT Tetris)", MACHINE_IMPERFECT_SOUND )
+GAME( 1990, filetto, 0, filetto, filetto, pcxt_state, 0, ROT0, "Novarmatic", "Filetto (v1.05 901009)", MACHINE_IMPERFECT_SOUND )
+GAME( 1988?,tetriskr, 0, tetriskr, tetriskr, pcxt_state, 0, ROT0, "bootleg", "Tetris (Korean bootleg of Mirrorsoft PC-XT Tetris)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp
index 64914230cb8..dfe5ff7eee0 100644
--- a/src/mame/drivers/pda600.cpp
+++ b/src/mame/drivers/pda600.cpp
@@ -196,7 +196,7 @@ static GFXDECODE_START( pda600 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pda600, pda600_state )
+static MACHINE_CONFIG_START( pda600 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z180, XTAL_14_31818MHz)
MCFG_CPU_PROGRAM_MAP(pda600_mem)
@@ -235,5 +235,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1993, pda600, 0, 0, pda600, pda600, driver_device, 0, "Amstrad plc", "PenPad PDA 600", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1993, pda600, 0, 0, pda600, pda600, pda600_state, 0, "Amstrad plc", "PenPad PDA 600", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp
index 8233b3784a1..aa300fa7976 100644
--- a/src/mame/drivers/pdp1.cpp
+++ b/src/mame/drivers/pdp1.cpp
@@ -689,11 +689,11 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_READTAPE = device_creator<pdp1_readtape_image_device>;
+DEFINE_DEVICE_TYPE(PDP1_READTAPE, pdp1_readtape_image_device, "pdp1_readtape_image", "PDP1 Tape Reader")
pdp1_readtape_image_device::pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PDP1_READTAPE, "PDP1 Tape Reader", tag, owner, clock, "pdp1_readtape_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, PDP1_READTAPE, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -721,11 +721,11 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_PUNCHTAPE = device_creator<pdp1_punchtape_image_device>;
+DEFINE_DEVICE_TYPE(PDP1_PUNCHTAPE, pdp1_punchtape_image_device, "pdp1_punchtape_image_device", "PDP1 Tape Puncher")
pdp1_punchtape_image_device::pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PDP1_PUNCHTAPE, "PDP1 Tape Puncher", tag, owner, clock, "pdp1_punchtape_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, PDP1_PUNCHTAPE, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -754,11 +754,11 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_PRINTER = device_creator<pdp1_printer_image_device>;
+DEFINE_DEVICE_TYPE(PDP1_PRINTER, pdp1_printer_image_device, "pdp1_printer_image", "PDP1 Typewriter")
pdp1_printer_image_device::pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PDP1_PRINTER, "PDP1 Typewriter", tag, owner, clock, "pdp1_printer_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, PDP1_PRINTER, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -786,11 +786,11 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_CYLINDER = device_creator<pdp1_cylinder_image_device>;
+DEFINE_DEVICE_TYPE(PDP1_CYLINDER, pdp1_cylinder_image_device, "pdp1_cylinder_image", "PDP1 Cylinder")
pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PDP1_CYLINDER, "PDP1 Cylinder", tag, owner, clock, "pdp1_cylinder_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, PDP1_CYLINDER, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -1917,7 +1917,7 @@ INTERRUPT_GEN_MEMBER(pdp1_state::pdp1_interrupt)
}
-static MACHINE_CONFIG_START( pdp1, pdp1_state )
+static MACHINE_CONFIG_START( pdp1 )
/* basic machine hardware */
/* PDP1 CPU @ 200 kHz (no master clock, but the instruction and memory rate is 200 kHz) */
@@ -1966,5 +1966,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1961, pdp1, 0, 0, pdp1, pdp1, driver_device, 0, "Digital Equipment Corporation", "PDP-1" , MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1961, pdp1, 0, 0, pdp1, pdp1, pdp1_state, 0, "Digital Equipment Corporation", "PDP-1", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/pdp11.cpp b/src/mame/drivers/pdp11.cpp
index 16c202a1749..3934139c8db 100644
--- a/src/mame/drivers/pdp11.cpp
+++ b/src/mame/drivers/pdp11.cpp
@@ -109,7 +109,7 @@ public:
required_device<generic_terminal_device> m_terminal;
DECLARE_READ16_MEMBER( teletype_ctrl_r );
DECLARE_WRITE16_MEMBER( teletype_ctrl_w );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
uint8_t m_teletype_data;
uint16_t m_teletype_status;
virtual void machine_reset() override;
@@ -340,13 +340,13 @@ MACHINE_RESET_MEMBER(pdp11_state,pdp11qb)
}
-WRITE8_MEMBER( pdp11_state::kbd_put )
+void pdp11_state::kbd_put(u8 data)
{
m_teletype_data = data;
m_teletype_status |= 0x80;
}
-static MACHINE_CONFIG_START( pdp11, pdp11_state )
+static MACHINE_CONFIG_START( pdp11 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) // Need proper CPU here
MCFG_T11_INITIAL_MODE(6 << 13)
@@ -355,7 +355,7 @@ static MACHINE_CONFIG_START( pdp11, pdp11_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(pdp11_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(pdp11_state, kbd_put))
MCFG_RX01_ADD("rx01")
MACHINE_CONFIG_END
@@ -463,8 +463,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( ????, pdp11ub, 0, 0, pdp11, pdp11, driver_device, 0, "Digital Equipment Corporation", "PDP-11 [Unibus](M9301-YA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( ????, pdp11ub2, pdp11ub, 0, pdp11ub2, pdp11, driver_device, 0, "Digital Equipment Corporation", "PDP-11 [Unibus](M9312)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( ????, pdp11qb, pdp11ub, 0, pdp11qb, pdp11, driver_device, 0, "Digital Equipment Corporation", "PDP-11 [Q-BUS] (M7195 - MXV11)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1987, sms1000, pdp11ub, 0, pdp11qb, pdp11, driver_device, 0, "Scientific Micro Systems", "SMS-1000", MACHINE_IS_SKELETON )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( ????, pdp11ub, 0, 0, pdp11, pdp11, pdp11_state, 0, "Digital Equipment Corporation", "PDP-11 [Unibus](M9301-YA)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( ????, pdp11ub2, pdp11ub, 0, pdp11ub2, pdp11, pdp11_state, 0, "Digital Equipment Corporation", "PDP-11 [Unibus](M9312)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( ????, pdp11qb, pdp11ub, 0, pdp11qb, pdp11, pdp11_state, 0, "Digital Equipment Corporation", "PDP-11 [Q-BUS] (M7195 - MXV11)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1987, sms1000, pdp11ub, 0, pdp11qb, pdp11, pdp11_state, 0, "Scientific Micro Systems", "SMS-1000", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp
index e3a7c09abef..f9aff51cea0 100644
--- a/src/mame/drivers/pecom.cpp
+++ b/src/mame/drivers/pecom.cpp
@@ -168,9 +168,9 @@ static INPUT_PORTS_START( pecom )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( pecom64, pecom_state )
+static MACHINE_CONFIG_START( pecom64 )
/* basic machine hardware */
- MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1869_DOT_CLK_PAL/3)
+ MCFG_CPU_ADD(CDP1802_TAG, CDP1802, cdp1869_device::DOT_CLK_PAL/3)
MCFG_CPU_PROGRAM_MAP(pecom64_mem)
MCFG_CPU_IO_MAP(pecom64_io)
MCFG_COSMAC_WAIT_CALLBACK(VCC)
@@ -213,6 +213,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, pecom32, 0, 0, pecom64, pecom, driver_device, 0, "Ei Nis", "Pecom 32", 0)
-COMP( 1987, pecom64, pecom32, 0, pecom64, pecom, driver_device, 0, "Ei Nis", "Pecom 64", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1986, pecom32, 0, 0, pecom64, pecom, pecom_state, 0, "Ei Nis", "Pecom 32", 0)
+COMP( 1987, pecom64, pecom32, 0, pecom64, pecom, pecom_state, 0, "Ei Nis", "Pecom 64", 0)
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index 441f3eae6d0..fb213c8579a 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -477,7 +477,7 @@ DRIVER_INIT_MEMBER(pegasus_state, pegasus)
pegasus_decrypt_rom(base);
}
-static MACHINE_CONFIG_START( pegasus, pegasus_state )
+static MACHINE_CONFIG_START( pegasus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809E, XTAL_4MHz) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally
MCFG_CPU_PROGRAM_MAP(pegasus_mem)
@@ -574,6 +574,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, pegasus, 0, 0, pegasus, pegasus, pegasus_state, pegasus, "Technosys", "Aamber Pegasus", MACHINE_NO_SOUND_HW )
-COMP( 1981, pegasusm, pegasus, 0, pegasusm, pegasus, pegasus_state, pegasus, "Technosys", "Aamber Pegasus with RAM expansion unit", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, pegasus, 0, 0, pegasus, pegasus, pegasus_state, pegasus, "Technosys", "Aamber Pegasus", MACHINE_NO_SOUND_HW )
+COMP( 1981, pegasusm, pegasus, 0, pegasusm, pegasus, pegasus_state, pegasus, "Technosys", "Aamber Pegasus with RAM expansion unit", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index de259bedd5a..27ec9d2f41a 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -303,7 +303,7 @@ void pencil2_state::machine_start()
m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xffff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
}
-static MACHINE_CONFIG_START( pencil2, pencil2_state )
+static MACHINE_CONFIG_START( pencil2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
MCFG_CPU_PROGRAM_MAP(pencil2_mem)
@@ -348,5 +348,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, pencil2, 0, 0, pencil2, pencil2, driver_device, 0, "Hanimex", "Pencil II", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, pencil2, 0, 0, pencil2, pencil2, pencil2_state, 0, "Hanimex", "Pencil II", 0 )
diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp
index 5bf0abc267c..0722e45bd1e 100644
--- a/src/mame/drivers/pengadvb.cpp
+++ b/src/mame/drivers/pengadvb.cpp
@@ -196,7 +196,7 @@ WRITE8_MEMBER(pengadvb_state::pengadvb_ppi_port_c_w)
***************************************************************************/
-static MACHINE_CONFIG_START( pengadvb, pengadvb_state )
+static MACHINE_CONFIG_START( pengadvb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp
index bfdf991f4eb..749f3e10601 100644
--- a/src/mame/drivers/pengo.cpp
+++ b/src/mame/drivers/pengo.cpp
@@ -372,7 +372,7 @@ INTERRUPT_GEN_MEMBER(pengo_state::vblank_irq)
}
-static MACHINE_CONFIG_START( pengo, pengo_state )
+static MACHINE_CONFIG_START( pengo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6)
@@ -733,11 +733,11 @@ DRIVER_INIT_MEMBER(pengo_state,penta)
*
*************************************/
-GAME( 1982, pengo, 0, pengoe, pengo, driver_device, 0, ROT90, "Sega", "Pengo (set 1 rev c)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pengo2, pengo, pengoe, pengo, driver_device, 0, ROT90, "Sega", "Pengo (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pengo2u, pengo, pengou, pengo, driver_device, 0, ROT90, "Sega", "Pengo (set 2 not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pengo3u, pengo, pengou, pengo, driver_device, 0, ROT90, "Sega", "Pengo (set 3 not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pengo4, pengo, pengoe, pengo, driver_device, 0, ROT90, "Sega", "Pengo (set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pengob, pengo, pengo, pengo, pengo_state, penta, ROT90, "bootleg", "Pengo (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, penta, pengo, pengo, pengo, pengo_state, penta, ROT90, "bootleg (Grinbee Shouji)", "Penta", MACHINE_SUPPORTS_SAVE ) // Grinbee Shouji was a subsidiary of Orca
-GAME( 1983, jrpacmbl, jrpacman, jrpacmbl, jrpacmbl, driver_device, 0, ROT90, "bootleg", "Jr. Pac-Man (Pengo hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pengo, 0, pengoe, pengo, pengo_state, 0, ROT90, "Sega", "Pengo (set 1 rev c)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pengo2, pengo, pengoe, pengo, pengo_state, 0, ROT90, "Sega", "Pengo (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pengo2u, pengo, pengou, pengo, pengo_state, 0, ROT90, "Sega", "Pengo (set 2 not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pengo3u, pengo, pengou, pengo, pengo_state, 0, ROT90, "Sega", "Pengo (set 3 not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pengo4, pengo, pengoe, pengo, pengo_state, 0, ROT90, "Sega", "Pengo (set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pengob, pengo, pengo, pengo, pengo_state, penta, ROT90, "bootleg", "Pengo (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, penta, pengo, pengo, pengo, pengo_state, penta, ROT90, "bootleg (Grinbee Shouji)", "Penta", MACHINE_SUPPORTS_SAVE ) // Grinbee Shouji was a subsidiary of Orca
+GAME( 1983, jrpacmbl, jrpacman, jrpacmbl, jrpacmbl, pengo_state, 0, ROT90, "bootleg", "Jr. Pac-Man (Pengo hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp
index 1056a8f4a44..8cfe7c0581e 100644
--- a/src/mame/drivers/pentagon.cpp
+++ b/src/mame/drivers/pentagon.cpp
@@ -241,7 +241,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_DERIVED_CLASS( pentagon, spectrum_128, pentagon_state )
+static MACHINE_CONFIG_DERIVED( pentagon, spectrum_128 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_CLOCK(XTAL_14MHz / 4)
MCFG_CPU_IO_MAP(pentagon_io)
@@ -347,6 +347,6 @@ ROM_START(pent1024)
ROMX_LOAD( "gluk51.rom", 0x018000, 0x4000, CRC(ea8c760b) SHA1(adaab28066ca46fbcdcf084c3b53d5a1b82d94a9), ROM_BIOS(9))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1989, pentagon, spec128, 0, pentagon, spec_plus, driver_device, 0, "<unknown>", "Pentagon", 0)
-COMP( 19??, pent1024, spec128, 0, pent1024, spec_plus, driver_device, 0, "<unknown>", "Pentagon 1024", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, pentagon, spec128, 0, pentagon, spec_plus, pentagon_state, 0, "<unknown>", "Pentagon", 0 )
+COMP( 19??, pent1024, spec128, 0, pent1024, spec_plus, pentagon_state, 0, "<unknown>", "Pentagon 1024", 0 )
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp
index bf74ab4926b..bde369f0dca 100644
--- a/src/mame/drivers/peoplepc.cpp
+++ b/src/mame/drivers/peoplepc.cpp
@@ -233,7 +233,7 @@ static DEVICE_INPUT_DEFAULTS_START(keyboard)
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( olypeopl, peoplepc_state)
+static MACHINE_CONFIG_START( olypeopl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3)
MCFG_CPU_PROGRAM_MAP(peoplepc_map)
@@ -300,4 +300,4 @@ ROM_START( olypeopl )
ROMX_LOAD( "u01277g3.bin", 0x00001, 0x1000, CRC(3295691c) SHA1(7d7ade62117d11656b8dd86cf0703127616d55bc), ROM_SKIP(1)|ROM_BIOS(2))
ROM_END
-COMP( 198?, olypeopl, 0, 0, olypeopl, 0, driver_device, 0, "Olympia", "People PC", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+COMP( 198?, olypeopl, 0, 0, olypeopl, 0, peoplepc_state, 0, "Olympia", "People PC", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 44030c3c6a3..38d4a5273ee 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -1325,7 +1325,7 @@ void peplus_state::machine_reset()
* Machine Driver *
*************************/
-static MACHINE_CONFIG_START( peplus, peplus_state )
+static MACHINE_CONFIG_START( peplus )
// basic machine hardware
MCFG_CPU_ADD("maincpu", I80C32, XTAL_20MHz/2) /* 10MHz */
MCFG_CPU_PROGRAM_MAP(peplus_map)
diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp
index d5d7cb0ba32..35bfcc1c523 100644
--- a/src/mame/drivers/pes.cpp
+++ b/src/mame/drivers/pes.cpp
@@ -69,7 +69,7 @@ Address map:
/* Devices */
-WRITE8_MEMBER(pes_state::pes_kbd_input)
+void pes_state::pes_kbd_input(u8 data)
{
#ifdef DEBUG_FIFO
fprintf(stderr,"keyboard input: %c, ", data);
@@ -245,7 +245,7 @@ INPUT_PORTS_END
/******************************************************************************
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( pes, pes_state )
+static MACHINE_CONFIG_START( pes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(i80c31_mem)
@@ -259,7 +259,7 @@ static MACHINE_CONFIG_START( pes, pes_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(pes_state, pes_kbd_input))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(pes_state, pes_kbd_input))
MACHINE_CONFIG_END
/******************************************************************************
@@ -278,5 +278,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, pes, 0, 0, pes, pes, driver_device, 0, "Pacific Educational Systems", "VPU-01 Speech box", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, pes, 0, 0, pes, pes, pes_state, 0, "Pacific Educational Systems", "VPU-01 Speech box", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp
index c61110972ff..c267c7b6172 100644
--- a/src/mame/drivers/pet.cpp
+++ b/src/mame/drivers/pet.cpp
@@ -1726,7 +1726,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pet )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pet, pet_state )
+static MACHINE_CONFIG_START( pet )
MCFG_MACHINE_START_OVERRIDE(pet_state, pet2001)
MCFG_MACHINE_RESET_OVERRIDE(pet_state, pet)
@@ -1914,7 +1914,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pet2001b )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( pet2001b, pet2001n, pet2001b_state )
+static MACHINE_CONFIG_DERIVED( pet2001b, pet2001n )
MCFG_DEVICE_MODIFY(M6520_1_TAG)
MCFG_PIA_READPB_HANDLER(READ8(pet2001b_state, pia1_pb_r))
MACHINE_CONFIG_END
@@ -2150,7 +2150,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( pet80 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( pet80, pet80_state )
+static MACHINE_CONFIG_START( pet80 )
MCFG_MACHINE_START_OVERRIDE(pet80_state, pet80)
MCFG_MACHINE_RESET_OVERRIDE(pet80_state, pet80)
@@ -2257,7 +2257,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( superpet )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( superpet, pet8032, superpet_state )
+static MACHINE_CONFIG_DERIVED( superpet, pet8032 )
MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "superpet")
MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
@@ -2270,7 +2270,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( cbm8096 )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( cbm8096, pet80, cbm8096_state )
+static MACHINE_CONFIG_DERIVED( cbm8096, pet80 )
MCFG_DEVICE_REMOVE(PET_EXPANSION_SLOT_TAG)
MCFG_PET_EXPANSION_SLOT_ADD(PET_EXPANSION_SLOT_TAG, XTAL_16MHz/16, pet_expansion_cards, "64k")
MCFG_PET_EXPANSION_SLOT_DMA_CALLBACKS(READ8(pet_state, read), WRITE8(pet_state, write))
@@ -2286,7 +2286,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( cbm8296 )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( cbm8296, pet80, cbm8296_state )
+static MACHINE_CONFIG_DERIVED( cbm8296, pet80 )
MCFG_MACHINE_START_OVERRIDE(cbm8296_state, cbm8296)
MCFG_MACHINE_RESET_OVERRIDE(cbm8296_state, cbm8296)
@@ -2837,39 +2837,39 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1977, pet2001, 0, 0, pet2001, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-4", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1977, pet20018, pet2001, 0, pet20018, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-8", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, pet2001n, 0, 0, pet2001n8, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N8", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, pet2001n16, pet2001n, 0, pet2001n16, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N16", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, pet2001n32, pet2001n, 0, pet2001n32, pet, driver_device, 0, "Commodore Business Machines", "PET 2001-N32", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, cbm3008, pet2001n, 0, cbm3008, pet, driver_device, 0, "Commodore Business Machines", "CBM 3008", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, cbm3016, pet2001n, 0, cbm3016, pet, driver_device, 0, "Commodore Business Machines", "CBM 3016", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, cbm3032, pet2001n, 0, cbm3032, pet, driver_device, 0, "Commodore Business Machines", "CBM 3032", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, pet2001b, 0, 0, pet2001b8, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B8", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, pet2001b16, pet2001b, 0, pet2001b16, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B16", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, pet2001b32, pet2001b, 0, pet2001b32, petb, driver_device, 0, "Commodore Business Machines", "PET 2001-B32", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, cbm3032b, pet2001b, 0, cbm3032b, petb, driver_device, 0, "Commodore Business Machines", "CBM 3032B", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, pet4016, 0, 0, pet4016, pet, driver_device, 0, "Commodore Business Machines", "PET 4016", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, pet4032, pet4016, 0, pet4032, pet, driver_device, 0, "Commodore Business Machines", "PET 4032", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, pet4032f, pet4016, 0, pet4032f, pet, driver_device, 0, "Commodore Business Machines", "PET 4032 (Fat 40)", MACHINE_SUPPORTS_SAVE )
-COMP( 1980, cbm4016, pet4016, 0, cbm4016, pet, driver_device, 0, "Commodore Business Machines", "CBM 4016", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, cbm4032, pet4016, 0, cbm4032, pet, driver_device, 0, "Commodore Business Machines", "CBM 4032", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, cbm4032f, pet4016, 0, cbm4032f, pet, driver_device, 0, "Commodore Business Machines", "CBM 4032 (Fat 40)", MACHINE_SUPPORTS_SAVE )
-COMP( 1980, pet4032b, 0, 0, pet4032b, petb, driver_device, 0, "Commodore Business Machines", "PET 4032B", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, cbm4032b, pet4032b, 0, cbm4032b, petb, driver_device, 0, "Commodore Business Machines", "CBM 4032B", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, pet8032, 0, 0, pet8032, petb, driver_device, 0, "Commodore Business Machines", "PET 8032", MACHINE_SUPPORTS_SAVE )
-COMP( 1981, cbm8032, pet8032, 0, pet8032, petb, driver_device, 0, "Commodore Business Machines", "CBM 8032", MACHINE_SUPPORTS_SAVE )
-COMP( 1981, cbm8032_de, pet8032, 0, pet8032, petb_de, driver_device, 0, "Commodore Business Machines", "CBM 8032 (Germany)", MACHINE_SUPPORTS_SAVE )
-COMP( 1981, cbm8032_fr, pet8032, 0, pet8032, petb_fr, driver_device, 0, "Commodore Business Machines", "CBM 8032 (France)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, cbm8032_se, pet8032, 0, pet8032, petb_se, driver_device, 0, "Commodore Business Machines", "CBM 8032 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
-COMP( 1981, superpet, pet8032, 0, superpet, petb, driver_device, 0, "Commodore Business Machines", "SuperPET SP-9000", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, mmf9000, pet8032, 0, superpet, petb, driver_device, 0, "Commodore Business Machines", "MicroMainFrame 9000", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, mmf9000_se, pet8032, 0, superpet, petb_se, driver_device, 0, "Commodore Business Machines", "MicroMainFrame 9000 (Sweden/Finland)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, cbm8096, pet8032, 0, cbm8096, petb, driver_device, 0, "Commodore Business Machines", "CBM 8096", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, cbm8296, 0, 0, cbm8296, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, cbm8296ed, cbm8296, 0, cbm8296d, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296 ExecuDesk", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, cbm8296d, cbm8296, 0, cbm8296d, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296-D", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, cbm8296d_de,cbm8296, 0, cbm8296d, petb_de, driver_device, 0, "Commodore Business Machines", "CBM 8296-D (Germany)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, cbm8296gd, cbm8296, 0, cbm8296d, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296GD", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, cbm8296dgv_de,cbm8296, 0, cbm8296d, petb, driver_device, 0, "Commodore Business Machines", "CBM 8296-D GV? (Germany)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
+COMP( 1977, pet2001, 0, 0, pet2001, pet, pet_state, 0, "Commodore Business Machines", "PET 2001-4", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1977, pet20018, pet2001, 0, pet20018, pet, pet_state, 0, "Commodore Business Machines", "PET 2001-8", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, pet2001n, 0, 0, pet2001n8, pet, pet_state, 0, "Commodore Business Machines", "PET 2001-N8", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, pet2001n16, pet2001n, 0, pet2001n16, pet, pet_state, 0, "Commodore Business Machines", "PET 2001-N16", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, pet2001n32, pet2001n, 0, pet2001n32, pet, pet_state, 0, "Commodore Business Machines", "PET 2001-N32", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, cbm3008, pet2001n, 0, cbm3008, pet, pet_state, 0, "Commodore Business Machines", "CBM 3008", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, cbm3016, pet2001n, 0, cbm3016, pet, pet_state, 0, "Commodore Business Machines", "CBM 3016", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, cbm3032, pet2001n, 0, cbm3032, pet, pet_state, 0, "Commodore Business Machines", "CBM 3032", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, pet2001b, 0, 0, pet2001b8, petb, pet2001b_state, 0, "Commodore Business Machines", "PET 2001-B8", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, pet2001b16, pet2001b, 0, pet2001b16, petb, pet2001b_state, 0, "Commodore Business Machines", "PET 2001-B16", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, pet2001b32, pet2001b, 0, pet2001b32, petb, pet2001b_state, 0, "Commodore Business Machines", "PET 2001-B32", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, cbm3032b, pet2001b, 0, cbm3032b, petb, pet2001b_state, 0, "Commodore Business Machines", "CBM 3032B", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, pet4016, 0, 0, pet4016, pet, pet2001b_state, 0, "Commodore Business Machines", "PET 4016", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, pet4032, pet4016, 0, pet4032, pet, pet2001b_state, 0, "Commodore Business Machines", "PET 4032", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, pet4032f, pet4016, 0, pet4032f, pet, pet2001b_state, 0, "Commodore Business Machines", "PET 4032 (Fat 40)", MACHINE_SUPPORTS_SAVE )
+COMP( 1980, cbm4016, pet4016, 0, cbm4016, pet, pet_state, 0, "Commodore Business Machines", "CBM 4016", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, cbm4032, pet4016, 0, cbm4032, pet, pet_state, 0, "Commodore Business Machines", "CBM 4032", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, cbm4032f, pet4016, 0, cbm4032f, pet, pet_state, 0, "Commodore Business Machines", "CBM 4032 (Fat 40)", MACHINE_SUPPORTS_SAVE )
+COMP( 1980, pet4032b, 0, 0, pet4032b, petb, pet2001b_state, 0, "Commodore Business Machines", "PET 4032B", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, cbm4032b, pet4032b, 0, cbm4032b, petb, pet_state, 0, "Commodore Business Machines", "CBM 4032B", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, pet8032, 0, 0, pet8032, petb, pet80_state, 0, "Commodore Business Machines", "PET 8032", MACHINE_SUPPORTS_SAVE )
+COMP( 1981, cbm8032, pet8032, 0, pet8032, petb, pet80_state, 0, "Commodore Business Machines", "CBM 8032", MACHINE_SUPPORTS_SAVE )
+COMP( 1981, cbm8032_de, pet8032, 0, pet8032, petb_de, pet80_state, 0, "Commodore Business Machines", "CBM 8032 (Germany)", MACHINE_SUPPORTS_SAVE )
+COMP( 1981, cbm8032_fr, pet8032, 0, pet8032, petb_fr, pet80_state, 0, "Commodore Business Machines", "CBM 8032 (France)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, cbm8032_se, pet8032, 0, pet8032, petb_se, pet80_state, 0, "Commodore Business Machines", "CBM 8032 (Sweden/Finland)", MACHINE_SUPPORTS_SAVE )
+COMP( 1981, superpet, pet8032, 0, superpet, petb, superpet_state, 0, "Commodore Business Machines", "SuperPET SP-9000", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, mmf9000, pet8032, 0, superpet, petb, superpet_state, 0, "Commodore Business Machines", "MicroMainFrame 9000", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, mmf9000_se, pet8032, 0, superpet, petb_se, superpet_state, 0, "Commodore Business Machines", "MicroMainFrame 9000 (Sweden/Finland)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, cbm8096, pet8032, 0, cbm8096, petb, cbm8096_state, 0, "Commodore Business Machines", "CBM 8096", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, cbm8296, 0, 0, cbm8296, petb, cbm8296_state, 0, "Commodore Business Machines", "CBM 8296", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, cbm8296ed, cbm8296, 0, cbm8296d, petb, cbm8296_state, 0, "Commodore Business Machines", "CBM 8296 ExecuDesk", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, cbm8296d, cbm8296, 0, cbm8296d, petb, cbm8296_state, 0, "Commodore Business Machines", "CBM 8296-D", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, cbm8296d_de, cbm8296, 0, cbm8296d, petb_de, cbm8296_state, 0, "Commodore Business Machines", "CBM 8296-D (Germany)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, cbm8296gd, cbm8296, 0, cbm8296d, petb, cbm8296_state, 0, "Commodore Business Machines", "CBM 8296GD", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, cbm8296dgv_de,cbm8296, 0, cbm8296d, petb, cbm8296_state, 0, "Commodore Business Machines", "CBM 8296-D GV? (Germany)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp
index 97dc88a6624..7b74a445020 100644
--- a/src/mame/drivers/peyper.cpp
+++ b/src/mame/drivers/peyper.cpp
@@ -578,7 +578,7 @@ void peyper_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( peyper, peyper_state )
+static MACHINE_CONFIG_START( peyper )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(peyper_map)
@@ -862,16 +862,16 @@ ROM_START(lancelot)
ROM_LOAD("snd_u5.bin", 0x00000, 0x20000, CRC(bf141441) SHA1(630b852bb3bba0fcdae13ae548b1e9810bc64d7d))
ROM_END
-GAME( 1985, odin, 0, peyper, odin_dlx, peyper_state, odin, ROT0, "Peyper", "Odin", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1985, odin_dlx, 0, peyper, odin_dlx, peyper_state, odin, ROT0, "Sonic", "Odin De Luxe", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1986, solarwap, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Solar Wars (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1986, gamatros, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Gamatron (Sonic)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1987, poleposn, 0, peyper, poleposn, peyper_state, peyper, ROT0, "Sonic", "Pole Position (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1987, sonstwar, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Star Wars (Sonic, set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1987, sonstwr2, sonstwar, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Star Wars (Sonic, set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1987, wolfman, 0, peyper, wolfman, peyper_state, wolfman, ROT0, "Peyper", "Wolf Man", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1986, nemesisp, 0, peyper, wolfman, peyper_state, wolfman, ROT0, "Peyper", "Nemesis", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1987, odisea, 0, peyper, odisea, peyper_state, wolfman, ROT0, "Peyper", "Odisea Paris-Dakar", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1988, hangonp, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Hang-On (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // inputs to be checked
-GAME( 1985, ator, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Video Dens", "Ator", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // initial program ROM missing; no manual found
-GAME( 1994, lancelot, 0, peyper, sonstwar, driver_device,0, ROT0, "Peyper", "Sir Lancelot", MACHINE_IS_SKELETON_MECHANICAL) // different hardware (see top of file)
+GAME( 1985, odin, 0, peyper, odin_dlx, peyper_state, odin, ROT0, "Peyper", "Odin", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1985, odin_dlx, 0, peyper, odin_dlx, peyper_state, odin, ROT0, "Sonic", "Odin De Luxe", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1986, solarwap, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Solar Wars (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1986, gamatros, 0, peyper, solarwap, peyper_state, peyper, ROT0, "Sonic", "Gamatron (Sonic)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1987, poleposn, 0, peyper, poleposn, peyper_state, peyper, ROT0, "Sonic", "Pole Position (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1987, sonstwar, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Star Wars (Sonic, set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1987, sonstwr2, sonstwar, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Star Wars (Sonic, set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1987, wolfman, 0, peyper, wolfman, peyper_state, wolfman, ROT0, "Peyper", "Wolf Man", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1986, nemesisp, 0, peyper, wolfman, peyper_state, wolfman, ROT0, "Peyper", "Nemesis", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1987, odisea, 0, peyper, odisea, peyper_state, wolfman, ROT0, "Peyper", "Odisea Paris-Dakar", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1988, hangonp, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Sonic", "Hang-On (Sonic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // inputs to be checked
+GAME( 1985, ator, 0, peyper, sonstwar, peyper_state, peyper, ROT0, "Video Dens", "Ator", MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) // initial program ROM missing; no manual found
+GAME( 1994, lancelot, 0, peyper, sonstwar, peyper_state, 0, ROT0, "Peyper", "Sir Lancelot", MACHINE_IS_SKELETON_MECHANICAL) // different hardware (see top of file)
diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp
index 7a6cc974b42..46d3559ebb3 100644
--- a/src/mame/drivers/pg685.cpp
+++ b/src/mame/drivers/pg685.cpp
@@ -136,7 +136,7 @@ private:
optional_shared_ptr<uint8_t> m_vram;
optional_shared_ptr<uint16_t> m_vram16;
optional_shared_ptr<uint8_t> m_fontram;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
};
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START(pg675_mem, AS_PROGRAM, 8, pg685_state)
AM_RANGE(0xf9f06, 0xf9f07) AM_DEVREADWRITE("mainpic", pic8259_device, read, write)
AM_RANGE(0xf9f08, 0xf9f08) AM_DEVREADWRITE("mainuart", i8251_device, data_r, data_w)
AM_RANGE(0xf9f09, 0xf9f09) AM_DEVREADWRITE("mainuart", i8251_device, status_r, control_w)
- AM_RANGE(0xf9f20, 0xf9f23) AM_DEVREADWRITE("fdc", fd1797_t, read, write)
+ AM_RANGE(0xf9f20, 0xf9f23) AM_DEVREADWRITE("fdc", fd1797_device, read, write)
AM_RANGE(0xf9f24, 0xf9f24) AM_READWRITE(f9f24_r, f9f24_w)
AM_RANGE(0xf9f28, 0xf9f2b) AM_DEVREADWRITE("modppi1", i8255_device, read, write)
AM_RANGE(0xf9f2c, 0xf9f2f) AM_DEVREADWRITE("modppi2", i8255_device, read, write)
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START(pg685oua12_mem, AS_PROGRAM, 16, pg685_state)
AM_RANGE(0xf9f06, 0xf9f07) AM_DEVREADWRITE8("mainpic", pic8259_device, read, write, 0xffff)
AM_RANGE(0xf9f08, 0xf9f09) AM_DEVREADWRITE8("mainuart", i8251_device, data_r, data_w, 0x00ff)
AM_RANGE(0xf9f08, 0xf9f09) AM_DEVREADWRITE8("mainuart", i8251_device, status_r, control_w, 0xff00)
- AM_RANGE(0xf9f20, 0xf9f23) AM_DEVREADWRITE8("fdc", fd1797_t, read, write, 0xffff)
+ AM_RANGE(0xf9f20, 0xf9f23) AM_DEVREADWRITE8("fdc", fd1797_device, read, write, 0xffff)
AM_RANGE(0xf9f24, 0xf9f25) AM_READWRITE8(f9f24_r, f9f24_w, 0x00ff)
AM_RANGE(0xf9f28, 0xf9f2b) AM_DEVREADWRITE8("modppi1", i8255_device, read, write, 0xffff)
AM_RANGE(0xf9f2c, 0xf9f2f) AM_DEVREADWRITE8("modppi2", i8255_device, read, write, 0xffff)
@@ -401,7 +401,7 @@ static MACHINE_CONFIG_FRAGMENT(pg685_module)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pg675, pg685_state )
+static MACHINE_CONFIG_START( pg675 )
// main cpu
MCFG_CPU_ADD("maincpu", I8088, XTAL_15MHz / 3)
MCFG_CPU_PROGRAM_MAP(pg675_mem)
@@ -448,7 +448,7 @@ static MACHINE_CONFIG_START( pg675, pg685_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pg685, pg685_state )
+static MACHINE_CONFIG_START( pg685 )
// main cpu
MCFG_CPU_ADD("maincpu", V20, XTAL_15MHz / 3)
MCFG_CPU_PROGRAM_MAP(pg685_mem)
@@ -497,7 +497,7 @@ static MACHINE_CONFIG_START( pg685, pg685_state )
MCFG_WD2010_OUT_INTRQ_CB(DEVWRITELINE("mainpic", pic8259_device, ir3_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pg685oua12, pg685_state )
+static MACHINE_CONFIG_START( pg685oua12 )
// main cpu
MCFG_CPU_ADD("maincpu", I80286, XTAL_20MHz / 2)
MCFG_CPU_PROGRAM_MAP(pg685oua12_mem)
@@ -573,7 +573,7 @@ ROM_END
//**************************************************************************
// ROM DEFINITIONS
//**************************************************************************
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, pg675, 0, 0, pg675, pg685, driver_device, 0, "Siemens", "Simatic PG675", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 198?, pg685, 0, 0, pg685, pg685, driver_device, 0, "Siemens", "Simatic PG685 OUA11", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 198?, pg685oua12, pg685, 0, pg685oua12, pg685, driver_device, 0, "Siemens", "Simatic PG685 OUA12", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, pg675, 0, 0, pg675, pg685, pg685_state, 0, "Siemens", "Simatic PG675", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 198?, pg685, 0, 0, pg685, pg685, pg685_state, 0, "Siemens", "Simatic PG685 OUA11", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 198?, pg685oua12, pg685, 0, pg685oua12, pg685, pg685_state, 0, "Siemens", "Simatic PG685 OUA12", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index 41ca6c8b6af..d79d04b828a 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -549,7 +549,7 @@ MACHINE_CONFIG_FRAGMENT( pgmbase )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START( pgm, pgm_state )
+MACHINE_CONFIG_START( pgm )
MCFG_FRAGMENT_ADD(pgmbase)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 46c5034c44b..a45cf7008be 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -198,7 +198,7 @@ void pgm2_state::pgm_create_dummy_internal_arm_region()
-static MACHINE_CONFIG_START( pgm2, pgm2_state )
+static MACHINE_CONFIG_START( pgm2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM9, 20000000) // ?? ARM baesd CPU, has internal ROM.
diff --git a/src/mame/drivers/pgm3.cpp b/src/mame/drivers/pgm3.cpp
index 9f4ad96cca5..48e102594a0 100644
--- a/src/mame/drivers/pgm3.cpp
+++ b/src/mame/drivers/pgm3.cpp
@@ -97,7 +97,7 @@ void pgm3_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( pgm3, pgm3_state )
+static MACHINE_CONFIG_START( pgm3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM9, 800000000) // wrong, see notes at top of driver
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index 4bf9062497d..37881f0ede4 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -306,7 +306,7 @@ void phc25_state::video_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( phc25, phc25_state )
+static MACHINE_CONFIG_START( phc25 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(phc25_mem)
@@ -348,7 +348,7 @@ static MACHINE_CONFIG_DERIVED( pal, phc25 )
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(phc25_state, irq_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(phc25_state, video_ram_r))
MCFG_MC6847_CHARROM_CALLBACK(phc25_state, pal_char_rom_r)
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM2 | MC6847_MODE_GM1 | MC6847_MODE_INTEXT)
+ MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM2 | mc6847_pal_device::MODE_GM1 | mc6847_pal_device::MODE_INTEXT)
// other lines not connected
MACHINE_CONFIG_END
@@ -360,7 +360,7 @@ static MACHINE_CONFIG_DERIVED( ntsc, phc25 )
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(phc25_state, irq_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(phc25_state, video_ram_r))
MCFG_MC6847_CHARROM_CALLBACK(phc25_state, ntsc_char_rom_r)
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM2 | MC6847_MODE_GM1 | MC6847_MODE_INTEXT)
+ MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2 | mc6847_ntsc_device::MODE_GM1 | mc6847_ntsc_device::MODE_INTEXT)
// other lines not connected
MACHINE_CONFIG_END
@@ -389,6 +389,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, phc25, 0, 0, pal, phc25, driver_device, 0, "Sanyo", "PHC-25 (Europe)", MACHINE_NO_SOUND )
-COMP( 1983, phc25j, phc25, 0, ntsc, phc25j, driver_device, 0, "Sanyo", "PHC-25 (Japan)", MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, phc25, 0, 0, pal, phc25, phc25_state, 0, "Sanyo", "PHC-25 (Europe)", MACHINE_NO_SOUND )
+COMP( 1983, phc25j, phc25, 0, ntsc, phc25j, phc25_state, 0, "Sanyo", "PHC-25 (Japan)", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp
index 7e1f313b085..ea6793b4e3d 100644
--- a/src/mame/drivers/phoenix.cpp
+++ b/src/mame/drivers/phoenix.cpp
@@ -47,6 +47,7 @@ Pleiads:
#include "emu.h"
#include "includes/phoenix.h"
+#include "audio/phoenix.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
@@ -436,7 +437,7 @@ MACHINE_RESET_MEMBER(phoenix_state,phoenix)
}
-static MACHINE_CONFIG_START( phoenix, phoenix_state )
+static MACHINE_CONFIG_START( phoenix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 2.75 MHz */
@@ -505,7 +506,7 @@ MACHINE_CONFIG_END
/* Same as Phoenix, but uses an AY8910 and an extra visible line (column) */
-static MACHINE_CONFIG_START( survival, phoenix_state )
+static MACHINE_CONFIG_START( survival )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, CPU_CLOCK) /* 5.50 MHz */
@@ -1536,25 +1537,25 @@ DRIVER_INIT_MEMBER(phoenix_state, oneprom_coindsw)
/*** Phoenix (& clones) ***/
-GAME( 1980, phoenix, 0, phoenix, phoenix, driver_device, 0, ROT90, "Amstar", "Phoenix (Amstar, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenix2, phoenix, phoenix, phoenix, driver_device, 0, ROT90, "Amstar", "Phoenix (Amstar, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenixa, phoenix, phoenix, phoenixa, driver_device, 0, ROT90, "Amstar (Centuri license)", "Phoenix (Centuri, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenixb, phoenix, phoenix, phoenixa, driver_device, 0, ROT90, "Amstar (Centuri license)", "Phoenix (Centuri, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenixt, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "Amstar (Taito license)", "Phoenix (Taito)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenixj, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "Amstar (Taito Japan license)", "Phoenix (Taito Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenix3, phoenix, phoenix, phoenix3, driver_device, 0, ROT90, "bootleg (T.P.N.)", "Phoenix (T.P.N. bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, phoenixdal, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg (D&L)", "Phoenix (D&L bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, phoenixc, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, phoenixc2, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, phoenixc3, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, phoenixc4, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenix, 0, phoenix, phoenix, phoenix_state, 0, ROT90, "Amstar", "Phoenix (Amstar, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenix2, phoenix, phoenix, phoenix, phoenix_state, 0, ROT90, "Amstar", "Phoenix (Amstar, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenixa, phoenix, phoenix, phoenixa, phoenix_state, 0, ROT90, "Amstar (Centuri license)", "Phoenix (Centuri, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenixb, phoenix, phoenix, phoenixa, phoenix_state, 0, ROT90, "Amstar (Centuri license)", "Phoenix (Centuri, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenixt, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "Amstar (Taito license)", "Phoenix (Taito)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenixj, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "Amstar (Taito Japan license)", "Phoenix (Taito Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenix3, phoenix, phoenix, phoenix3, phoenix_state, 0, ROT90, "bootleg (T.P.N.)", "Phoenix (T.P.N. bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, phoenixdal, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg (D&L)", "Phoenix (D&L bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, phoenixc, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, phoenixc2, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, phoenixc3, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, phoenixc4, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg? (Irecsa / G.G.I Corp)", "Phoenix (Irecsa / G.G.I Corp, set 4)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, phoenixi, phoenix, condor, condor, phoenix_state, oneprom_coindsw, ROT90, "bootleg (IDI)", "Phoenix (IDI bootleg)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // Needs correct color PROM decode
GAME( 1981, condor, phoenix, condor, condor, phoenix_state, coindsw, ROT90, "bootleg (Sidam)", "Condor (Sidam bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, condorn, phoenix, condor, condor, phoenix_state, oneprom_coindsw, ROT90, "bootleg (S C Novar)", "Condor (S C Novar bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
// the following 2 were common bootlegs in England & France respectively
-GAME( 1980, falcon, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg", "Falcon (bootleg of Phoenix) (8085A CPU)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, vautour, phoenix, phoenix, phoenixt, driver_device, 0, ROT90, "bootleg (Jeutel)", "Vautour (bootleg of Phoenix) (8085A CPU)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, falconz, phoenix, condor, falconz, driver_device, 0, ROT90, "bootleg (Digimatic)", "Falcon (bootleg of Phoenix) (Z80 CPU)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, falcon, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg", "Falcon (bootleg of Phoenix) (8085A CPU)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, vautour, phoenix, phoenix, phoenixt, phoenix_state, 0, ROT90, "bootleg (Jeutel)", "Vautour (bootleg of Phoenix) (8085A CPU)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, falconz, phoenix, condor, falconz, phoenix_state, 0, ROT90, "bootleg (Digimatic)", "Falcon (bootleg of Phoenix) (Z80 CPU)", MACHINE_SUPPORTS_SAVE )
GAME( 1980, vautourz, phoenix, condor, condor, phoenix_state, coindsw, ROT90, "bootleg", "Vautour (bootleg of Phoenix) (Z80 CPU)", MACHINE_SUPPORTS_SAVE )
GAME( 1980, vautourza, phoenix, condor , phoenixt, phoenix_state, oneprom, ROT90, "bootleg (Jeutel)", "Vautour (bootleg of Phoenix) (Z80 CPU, single PROM)", MACHINE_SUPPORTS_SAVE )
@@ -1563,23 +1564,23 @@ GAME( 1980, fenix, phoenix, condor, condor, phoenix_state, oneprom_coin
GAME( 1980, griffon, phoenix, condor, condor, phoenix_state, oneprom_coindsw, ROT90, "bootleg (Videotron)", "Griffon (Videotron bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
GAME( 1980, griffono, phoenix, condor, condor, phoenix_state, oneprom_coindsw, ROT90, "bootleg (Olympia)", "Griffon (Olympia bootleg of Phoenix)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
// nextfase is a Spanish bootleg
-GAME( 1981, nextfase, phoenix, phoenix, nextfase, driver_device, 0, ROT90, "bootleg (Petaco S.A.)", "Next Fase (bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, nextfase, phoenix, phoenix, nextfase, phoenix_state, 0, ROT90, "bootleg (Petaco S.A.)", "Next Fase (bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
// as is this
-GAME( 1981, phoenixs, phoenix, phoenix, phoenix, driver_device, 0, ROT90, "bootleg (Sonic)", "Phoenix (Sonic, Spanish bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, phoenixass, phoenix, phoenix, phoenix, driver_device, 0, ROT90, "bootleg (Assa)", "Phoenix (Assa, Spanish bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, avefenix, phoenix, phoenix, phoenix, driver_device, 0, ROT90, "bootleg (Video Game)", "Ave Fenix (Electrogame, Spanish bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE ) // Electrogame (Barcelona) made the dedicated cabinet and is likely the real manufacturer, ingame shows 'Video Game'
-GAME( 1980, avefenixrf, phoenix, phoenix, phoenix, driver_device, 0, ROT90, "bootleg (Recreativos Franco S.A.)", "Ave Fenix (Recreativos Franco, Spanish bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, avefenixl, phoenix, phoenix, phoenix, driver_device, 0, ROT90, "bootleg (Laguna)", "Ave Fenix (Laguna, Spanish bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, phoenixs, phoenix, phoenix, phoenix, phoenix_state, 0, ROT90, "bootleg (Sonic)", "Phoenix (Sonic, Spanish bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, phoenixass, phoenix, phoenix, phoenix, phoenix_state, 0, ROT90, "bootleg (Assa)", "Phoenix (Assa, Spanish bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, avefenix, phoenix, phoenix, phoenix, phoenix_state, 0, ROT90, "bootleg (Video Game)", "Ave Fenix (Electrogame, Spanish bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE ) // Electrogame (Barcelona) made the dedicated cabinet and is likely the real manufacturer, ingame shows 'Video Game'
+GAME( 1980, avefenixrf, phoenix, phoenix, phoenix, phoenix_state, 0, ROT90, "bootleg (Recreativos Franco S.A.)", "Ave Fenix (Recreativos Franco, Spanish bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, avefenixl, phoenix, phoenix, phoenix, phoenix_state, 0, ROT90, "bootleg (Laguna)", "Ave Fenix (Laguna, Spanish bootleg of Phoenix)", MACHINE_SUPPORTS_SAVE )
/*** Pleiads (& clones) ***/
-GAME( 1981, pleiads, 0, pleiads, pleiads, driver_device, 0, ROT90, "Tehkan", "Pleiads (Tehkan)", MACHINE_IMPERFECT_COLORS )
-GAME( 1981, pleiadsb2, pleiads, pleiads, pleiads, driver_device, 0, ROT90, "bootleg (ESG)", "Pleiads (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pleiadbl, pleiads, pleiads, pleiadbl, driver_device, 0, ROT90, "bootleg", "Pleiads (bootleg set 1)", MACHINE_IMPERFECT_COLORS )
-GAME( 1981, pleiadce, pleiads, pleiads, pleiadce, driver_device, 0, ROT90, "Tehkan (Centuri license)", "Pleiads (Centuri)", MACHINE_IMPERFECT_COLORS )
-GAME( 1981, pleiadsi, pleiads, pleiads, pleiadce, driver_device, 0, ROT90, "bootleg? (Irecsa)", "Pleiads (Irecsa)", MACHINE_IMPERFECT_COLORS ) // possibly licensed, but some of the roms match the bootlegs
-GAME( 1981, pleiadsn, pleiads, phoenix, pleiadce, driver_device, 0, ROT90, "Niemer S.A.", "Pleiads (Niemer S.A.)", MACHINE_IMPERFECT_COLORS ) // possibly licensed, but some of the roms match the bootlegs
-GAME( 1981, pleiadss, pleiads, phoenix, pleiadce, driver_device, 0, ROT90, "bootleg", "Pleiads (Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) // colours match PCB (but are ugly)
-GAME( 1981, capitol, pleiads, phoenix, capitol, driver_device, 0, ROT90, "bootleg? (Universal Video Spiel)", "Capitol", MACHINE_IMPERFECT_COLORS )
+GAME( 1981, pleiads, 0, pleiads, pleiads, phoenix_state, 0, ROT90, "Tehkan", "Pleiads (Tehkan)", MACHINE_IMPERFECT_COLORS )
+GAME( 1981, pleiadsb2, pleiads, pleiads, pleiads, phoenix_state, 0, ROT90, "bootleg (ESG)", "Pleiads (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pleiadbl, pleiads, pleiads, pleiadbl, phoenix_state, 0, ROT90, "bootleg", "Pleiads (bootleg set 1)", MACHINE_IMPERFECT_COLORS )
+GAME( 1981, pleiadce, pleiads, pleiads, pleiadce, phoenix_state, 0, ROT90, "Tehkan (Centuri license)", "Pleiads (Centuri)", MACHINE_IMPERFECT_COLORS )
+GAME( 1981, pleiadsi, pleiads, pleiads, pleiadce, phoenix_state, 0, ROT90, "bootleg? (Irecsa)", "Pleiads (Irecsa)", MACHINE_IMPERFECT_COLORS ) // possibly licensed, but some of the roms match the bootlegs
+GAME( 1981, pleiadsn, pleiads, phoenix, pleiadce, phoenix_state, 0, ROT90, "Niemer S.A.", "Pleiads (Niemer S.A.)", MACHINE_IMPERFECT_COLORS ) // possibly licensed, but some of the roms match the bootlegs
+GAME( 1981, pleiadss, pleiads, phoenix, pleiadce, phoenix_state, 0, ROT90, "bootleg", "Pleiads (Spanish bootleg)", MACHINE_SUPPORTS_SAVE ) // colours match PCB (but are ugly)
+GAME( 1981, capitol, pleiads, phoenix, capitol, phoenix_state, 0, ROT90, "bootleg? (Universal Video Spiel)", "Capitol", MACHINE_IMPERFECT_COLORS )
/*** Others ***/
-GAME( 1982, survival, 0, survival, survival, driver_device, 0, ROT90, "Rock-Ola", "Survival", MACHINE_IMPERFECT_COLORS )
+GAME( 1982, survival, 0, survival, survival, phoenix_state, 0, ROT90, "Rock-Ola", "Survival", MACHINE_IMPERFECT_COLORS )
diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp
index ef1b28fdccf..4c3bc0fa5d6 100644
--- a/src/mame/drivers/photon.cpp
+++ b/src/mame/drivers/photon.cpp
@@ -195,7 +195,7 @@ uint32_t photon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
return video_update(screen, bitmap, cliprect, memregion("maincpu")->base());
}
-static MACHINE_CONFIG_START( photon, photon_state )
+static MACHINE_CONFIG_START( photon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 1780000)
@@ -271,6 +271,6 @@ ROM_START( phklad )
ROM_LOAD( "klad.bin", 0x10000, 0x4000, BAD_DUMP CRC(49cc7d65) SHA1(d966cfc1d973a533df8044a71fad37f7177da554) )
ROM_END
-GAME( 19??, phtetris, 0, photon, photon, driver_device, 0, ROT0, "<unknown>", "Tetris (Photon System)", 0 )
-GAME( 1989?, phpython, 0, photon, photon, driver_device, 0, ROT0, "<unknown>", "Python (Photon System)", 0 )
-GAME( 19??, phklad, 0, photon, photon, driver_device, 0, ROT0, "<unknown>", "Klad / Labyrinth (Photon System)", 0 )
+GAME( 19??, phtetris, 0, photon, photon, photon_state, 0, ROT0, "<unknown>", "Tetris (Photon System)", 0 )
+GAME( 1989?, phpython, 0, photon, photon, photon_state, 0, ROT0, "<unknown>", "Python (Photon System)", 0 )
+GAME( 19??, phklad, 0, photon, photon, photon_state, 0, ROT0, "<unknown>", "Klad / Labyrinth (Photon System)", 0 )
diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp
index efb61569604..8cb476d4d62 100644
--- a/src/mame/drivers/photon2.cpp
+++ b/src/mame/drivers/photon2.cpp
@@ -346,7 +346,7 @@ void photon2_state::machine_start()
save_item(NAME(m_nmi_enable));
}
-static MACHINE_CONFIG_START( photon2, photon2_state )
+static MACHINE_CONFIG_START( photon2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3500000) /* 3.5 MHz */
MCFG_CPU_PROGRAM_MAP(spectrum_mem)
@@ -408,6 +408,6 @@ ROM_START( brod )
ROM_LOAD( "brod13.bin", 0xa000, 0x2000, CRC(1177cd17) SHA1(58c5c09a7b857ce6311339c4d0f4d8c1a7e232a3) )
ROM_END
-GAME( 19??, kok, 0, photon2, photon2, driver_device, 0, ROT0, "bootleg", "Povar / Sobrat' Buran / Agroprom (Arcade multi-game bootleg of ZX Spectrum 'Cookie', 'Jetpac' & 'Pssst')", MACHINE_SUPPORTS_SAVE ) // originals (c)1983 ACG / Ultimate
-GAME( 19??, black, 0, photon2, black, driver_device, 0, ROT0, "bootleg", "Czernyj Korabl (Arcade bootleg of ZX Spectrum 'Blackbeard')", MACHINE_SUPPORTS_SAVE ) // original (c)1988 Toposoft
-GAME( 19??, brod, 0, photon2, black, driver_device, 0, ROT0, "bootleg", "Brodjaga (Arcade bootleg of ZX Spectrum 'Inspector Gadget and the Circus of Fear')", MACHINE_SUPPORTS_SAVE ) // original (c)1987 BEAM software
+GAME( 19??, kok, 0, photon2, photon2, photon2_state, 0, ROT0, "bootleg", "Povar / Sobrat' Buran / Agroprom (Arcade multi-game bootleg of ZX Spectrum 'Cookie', 'Jetpac' & 'Pssst')", MACHINE_SUPPORTS_SAVE ) // originals (c)1983 ACG / Ultimate
+GAME( 19??, black, 0, photon2, black, photon2_state, 0, ROT0, "bootleg", "Czernyj Korabl (Arcade bootleg of ZX Spectrum 'Blackbeard')", MACHINE_SUPPORTS_SAVE ) // original (c)1988 Toposoft
+GAME( 19??, brod, 0, photon2, black, photon2_state, 0, ROT0, "bootleg", "Brodjaga (Arcade bootleg of ZX Spectrum 'Inspector Gadget and the Circus of Fear')", MACHINE_SUPPORTS_SAVE ) // original (c)1987 BEAM software
diff --git a/src/mame/drivers/photoply.cpp b/src/mame/drivers/photoply.cpp
index 18e389e6d90..6c905d53af0 100644
--- a/src/mame/drivers/photoply.cpp
+++ b/src/mame/drivers/photoply.cpp
@@ -114,7 +114,7 @@ static GFXDECODE_START( photoply )
//there's also a 8x16 entry (just after the 8x8)
GFXDECODE_END
-static MACHINE_CONFIG_START( photoply, photoply_state )
+static MACHINE_CONFIG_START( photoply )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I486, 75000000) /* I486DX4, 75 or 100 Mhz */
MCFG_CPU_PROGRAM_MAP(photoply_map)
diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp
index 2a70fb87a1a..6bbd9db3656 100644
--- a/src/mame/drivers/phunsy.cpp
+++ b/src/mame/drivers/phunsy.cpp
@@ -56,7 +56,7 @@ public:
DECLARE_READ8_MEMBER(phunsy_data_r);
DECLARE_WRITE8_MEMBER(phunsy_ctrl_w);
DECLARE_WRITE8_MEMBER(phunsy_data_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(cass_r);
DECLARE_WRITE_LINE_MEMBER(cass_w);
DECLARE_QUICKLOAD_LOAD_MEMBER(phunsy);
@@ -180,7 +180,7 @@ static INPUT_PORTS_START( phunsy )
INPUT_PORTS_END
-WRITE8_MEMBER( phunsy_state::kbd_put )
+void phunsy_state::kbd_put(u8 data)
{
if (data)
m_keyboard_input = data;
@@ -327,7 +327,7 @@ DRIVER_INIT_MEMBER( phunsy_state, phunsy )
membank("bankq")->set_entry(0);
}
-static MACHINE_CONFIG_START( phunsy, phunsy_state )
+static MACHINE_CONFIG_START( phunsy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(phunsy_mem)
@@ -359,7 +359,7 @@ static MACHINE_CONFIG_START( phunsy, phunsy_state )
/* Devices */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(phunsy_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(phunsy_state, kbd_put))
MCFG_CASSETTE_ADD( "cassette" )
/* quickload */
@@ -389,5 +389,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
COMP( 1980, phunsy, 0, 0, phunsy, phunsy, phunsy_state, phunsy, "J.F.P. Philipse", "PHUNSY", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp
index d1eda58516d..1981f514765 100644
--- a/src/mame/drivers/piggypas.cpp
+++ b/src/mame/drivers/piggypas.cpp
@@ -126,7 +126,7 @@ HD44780_PIXEL_UPDATE(piggypas_state::piggypas_pixel_update)
bitmap.pix16(y, (line * 8 + pos) * 6 + x) = state;
}
-static MACHINE_CONFIG_START( piggypas, piggypas_state )
+static MACHINE_CONFIG_START( piggypas )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8031, 8000000) // unknown variant
@@ -152,7 +152,7 @@ static MACHINE_CONFIG_START( piggypas, piggypas_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_TICKET_DISPENSER_ADD("ticket", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
@@ -227,16 +227,16 @@ ROM_END
// COPYRIGHT (c) 1990, 1991, 1992, DOYLE & ASSOC., INC. VERSION 04.40
-GAME( 1992, piggypas, 0, piggypas, piggypas, driver_device, 0, ROT0, "Doyle & Assoc.", "Piggy Pass (version 04.40)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1992, piggypas, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Doyle & Assoc.", "Piggy Pass (version 04.40)", MACHINE_IS_SKELETON_MECHANICAL )
// COPYRIGHT (c) 1990, 1991, 1992, DOYLE & ASSOC., INC. VERSION 05.22
-GAME( 1992, hoopshot, 0, piggypas, piggypas, driver_device, 0, ROT0, "Doyle & Assoc.", "Hoop Shot (version 05.22)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1992, hoopshot, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Doyle & Assoc.", "Hoop Shot (version 05.22)", MACHINE_IS_SKELETON_MECHANICAL )
// Quick $ilver Development Co. 10/08/96 ROUND REV 6
-GAME( 1996, rndrndqs, 0, piggypas, piggypas, driver_device, 0, ROT0, "Quick $ilver Development Co.", "Round and Round (Rev 6) (Quick $ilver)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1996, rndrndqs, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Quick $ilver Development Co.", "Round and Round (Rev 6) (Quick $ilver)", MACHINE_IS_SKELETON_MECHANICAL )
// Quick$ilver Development Co. 10/02/95 -FIDDLESTIX- REV 15T
-GAME( 1995, fidlstix, 0, piggypas, piggypas, driver_device, 0, ROT0, "Quick $ilver Development Co.", "Fiddle Stix (1st Rev)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1995, fidlstix, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Quick $ilver Development Co.", "Fiddle Stix (1st Rev)", MACHINE_IS_SKELETON_MECHANICAL )
// bad dump, so version unknown
-GAME( 199?, jackbean, 0, piggypas, piggypas, driver_device, 0, ROT0, "Doyle & Assoc.", "Jack & The Beanstalk (Doyle & Assoc.?)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, jackbean, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Doyle & Assoc.", "Jack & The Beanstalk (Doyle & Assoc.?)", MACHINE_IS_SKELETON_MECHANICAL )
// bad dump, so version unknown
-GAME( 199?, dumpump, 0, piggypas, piggypas, driver_device, 0, ROT0, "Doyle & Assoc.", "Dump The Ump", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, dumpump, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Doyle & Assoc.", "Dump The Ump", MACHINE_IS_SKELETON_MECHANICAL )
// bad dump, so version unknown
-GAME( 199?, 3lilpigs, 0, piggypas, piggypas, driver_device, 0, ROT0, "Doyle & Assoc.", "3 Lil' Pigs", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, 3lilpigs, 0, piggypas, piggypas, piggypas_state, 0, ROT0, "Doyle & Assoc.", "3 Lil' Pigs", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/pimps.cpp b/src/mame/drivers/pimps.cpp
index 3f292a47949..886e45af0cd 100644
--- a/src/mame/drivers/pimps.cpp
+++ b/src/mame/drivers/pimps.cpp
@@ -40,7 +40,7 @@ public:
DECLARE_READ8_MEMBER(term_status_r);
DECLARE_READ8_MEMBER(term_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -86,12 +86,12 @@ void pimps_state::machine_reset()
m_term_data = 0;
}
-WRITE8_MEMBER( pimps_state::kbd_put )
+void pimps_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( pimps, pimps_state )
+static MACHINE_CONFIG_START( pimps )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(pimps_mem)
@@ -99,7 +99,7 @@ static MACHINE_CONFIG_START( pimps, pimps_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(pimps_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(pimps_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -110,5 +110,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 197?, pimps, 0, 0, pimps, pimps, driver_device, 0, "Henry Colford", "P.I.M.P.S.", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 197?, pimps, 0, 0, pimps, pimps, pimps_state, 0, "Henry Colford", "P.I.M.P.S.", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp
index 85c522d4df0..c9457464af1 100644
--- a/src/mame/drivers/pinball2k.cpp
+++ b/src/mame/drivers/pinball2k.cpp
@@ -591,7 +591,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, pinball2k_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mediagx, pinball2k_state )
+static MACHINE_CONFIG_START( mediagx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MEDIAGX, 166000000)
diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp
index 03a5fc68e39..d8e1ee47aea 100644
--- a/src/mame/drivers/pingpong.cpp
+++ b/src/mame/drivers/pingpong.cpp
@@ -446,7 +446,7 @@ static GFXDECODE_START( pingpong )
GFXDECODE_END
-static MACHINE_CONFIG_START( pingpong, pingpong_state )
+static MACHINE_CONFIG_START( pingpong )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,18432000/6) /* 3.072 MHz (probably) */
@@ -612,6 +612,6 @@ DRIVER_INIT_MEMBER(pingpong_state,cashquiz)
}
-GAME( 1985, pingpong, 0, pingpong, pingpong, driver_device, 0, ROT0, "Konami", "Konami's Ping-Pong", 0 )
-GAME( 1986, merlinmm, 0, merlinmm, merlinmm, pingpong_state, merlinmm, ROT90,"Zilec-Zenitone", "Merlins Money Maze", 0 )
-GAME( 1986, cashquiz, 0, merlinmm, cashquiz, pingpong_state, cashquiz, ROT0, "Zilec-Zenitone", "Cash Quiz (Type B, Version 5)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1985, pingpong, 0, pingpong, pingpong, pingpong_state, 0, ROT0, "Konami", "Konami's Ping-Pong", 0 )
+GAME( 1986, merlinmm, 0, merlinmm, merlinmm, pingpong_state, merlinmm, ROT90, "Zilec-Zenitone", "Merlins Money Maze", 0 )
+GAME( 1986, cashquiz, 0, merlinmm, cashquiz, pingpong_state, cashquiz, ROT0, "Zilec-Zenitone", "Cash Quiz (Type B, Version 5)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp
index 1416bdc446a..c50b0d06b04 100644
--- a/src/mame/drivers/pinkiri8.cpp
+++ b/src/mame/drivers/pinkiri8.cpp
@@ -132,12 +132,12 @@ DEVICE_ADDRESS_MAP_START( map, 8, janshi_vdp_device )
AM_RANGE(0xff6000, 0xff601f) AM_RAM AM_SHARE("crtc_regs")
ADDRESS_MAP_END
-const device_type JANSHIVDP = device_creator<janshi_vdp_device>;
+DEFINE_DEVICE_TYPE(JANSHIVDP, janshi_vdp_device, "janshi_vdp", "Janshi VDP")
janshi_vdp_device::janshi_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, JANSHIVDP, "Janshi VDP", tag, owner, clock, "janshi_vdp", __FILE__),
- device_memory_interface(mconfig, *this),
- m_space_config("janshi_vdp", ENDIANNESS_LITTLE, 8,24, 0, address_map_delegate(FUNC(janshi_vdp_device::map), this))
+ : device_t(mconfig, JANSHIVDP, tag, owner, clock)
+ , device_memory_interface(mconfig, *this)
+ , m_space_config("janshi_vdp", ENDIANNESS_LITTLE, 8,24, 0, address_map_delegate(FUNC(janshi_vdp_device::map), this))
{
}
@@ -1085,7 +1085,7 @@ static GFXDECODE_START( pinkiri8 )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x100 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pinkiri8, pinkiri8_state )
+static MACHINE_CONFIG_START( pinkiri8 )
MCFG_CPU_ADD("maincpu",Z180,XTAL_32MHz/2)
MCFG_CPU_PROGRAM_MAP(pinkiri8_map)
MCFG_CPU_IO_MAP(pinkiri8_io)
@@ -1108,7 +1108,7 @@ static MACHINE_CONFIG_START( pinkiri8, pinkiri8_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
@@ -1229,7 +1229,7 @@ DRIVER_INIT_MEMBER(pinkiri8_state,ronjan)
m_maincpu->space(AS_IO).install_read_handler(0x9f, 0x9f, read8_delegate(FUNC(pinkiri8_state::ronjan_patched_prot_r), this));
}
-GAME( 1992, janshi, 0, pinkiri8, janshi, driver_device, 0, ROT0, "Eagle", "Janshi", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1992, janshi, 0, pinkiri8, janshi, pinkiri8_state, 0, ROT0, "Eagle", "Janshi", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
GAME( 1991, ronjan, ronjans, pinkiri8, ronjan, pinkiri8_state, ronjan, ROT0, "Wing Co., Ltd", "Ron Jan", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
GAME( 1994, ronjans, 0, pinkiri8, ronjan, pinkiri8_state, ronjan, ROT0, "Wing Co., Ltd", "Ron Jan Super", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // 'SUPER' flashes in the middle of the screen
-GAME( 1994, pinkiri8, 0, pinkiri8, pinkiri8, driver_device, 0, ROT0, "Alta", "Pinkiri 8", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1994, pinkiri8, 0, pinkiri8, pinkiri8, pinkiri8_state, 0, ROT0, "Alta", "Pinkiri 8", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp
index 295d04ee1c9..8459ab89688 100644
--- a/src/mame/drivers/pipbug.cpp
+++ b/src/mame/drivers/pipbug.cpp
@@ -154,7 +154,7 @@ QUICKLOAD_LOAD_MEMBER( pipbug_state, pipbug )
return result;
}
-static MACHINE_CONFIG_START( pipbug, pipbug_state )
+static MACHINE_CONFIG_START( pipbug )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(pipbug_mem)
@@ -179,5 +179,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, pipbug, 0, 0, pipbug, pipbug, driver_device, 0, "Signetics", "PIPBUG", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, pipbug, 0, 0, pipbug, pipbug, pipbug_state, 0, "Signetics", "PIPBUG", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp
index f86fe865cda..c3f4eb48bf7 100644
--- a/src/mame/drivers/pipedrm.cpp
+++ b/src/mame/drivers/pipedrm.cpp
@@ -611,7 +611,7 @@ MACHINE_RESET_MEMBER(pipedrm_state,pipedrm)
m_flipscreen = 0;
}
-static MACHINE_CONFIG_START( pipedrm, pipedrm_state )
+static MACHINE_CONFIG_START( pipedrm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2)
@@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( pipedrm, pipedrm_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hatris, pipedrm_state )
+static MACHINE_CONFIG_START( hatris )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/2)
@@ -925,9 +925,9 @@ DRIVER_INIT_MEMBER(pipedrm_state,hatris)
*
*************************************/
-GAME( 1990, pipedrm, 0, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pipedrmu, pipedrm, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pipedrmj, pipedrm, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pipedrm, 0, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pipedrmu, pipedrm, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pipedrmj, pipedrm, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, pipedrmt, pipedrm, pipedrm, pipedrm, pipedrm_state, pipedrm, ROT0, "Video System Co.", "Pipe Dream (Taiwan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hatris, 0, hatris, hatris, pipedrm_state, hatris, ROT0, "Video System Co.", "Hatris (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hatrisj, hatris, hatris, hatris, pipedrm_state, hatris, ROT0, "Video System Co.", "Hatris (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hatris, 0, hatris, hatris, pipedrm_state, hatris, ROT0, "Video System Co.", "Hatris (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hatrisj, hatris, hatris, hatris, pipedrm_state, hatris, ROT0, "Video System Co.", "Hatris (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp
index 40cce978752..3d66525a7be 100644
--- a/src/mame/drivers/pipeline.cpp
+++ b/src/mame/drivers/pipeline.cpp
@@ -349,7 +349,7 @@ PALETTE_INIT_MEMBER(pipeline_state, pipeline)
}
}
-static MACHINE_CONFIG_START( pipeline, pipeline_state )
+static MACHINE_CONFIG_START( pipeline )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 7372800/2)
@@ -433,4 +433,4 @@ ROM_START( pipeline )
ROM_LOAD( "82s123.u79", 0x00200, 0x00020,CRC(6df3f972) SHA1(0096a7f7452b70cac6c0752cb62e24b643015b5c) )
ROM_END
-GAME( 1990, pipeline, 0, pipeline, pipeline, driver_device, 0, ROT0, "Daehyun Electronics", "Pipeline", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pipeline, 0, pipeline, pipeline, pipeline_state, 0, ROT0, "Daehyun Electronics", "Pipeline", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp
index e31a6f56fd1..54f83d68175 100644
--- a/src/mame/drivers/pirates.cpp
+++ b/src/mame/drivers/pirates.cpp
@@ -251,7 +251,7 @@ GFXDECODE_END
/* Machine Driver + Related bits */
-static MACHINE_CONFIG_START( pirates, pirates_state )
+static MACHINE_CONFIG_START( pirates )
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16mhz */
MCFG_CPU_PROGRAM_MAP(pirates_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pirates_state, irq1_line_hold)
@@ -275,7 +275,7 @@ static MACHINE_CONFIG_START( pirates, pirates_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1333333, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1333333, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -472,7 +472,7 @@ DRIVER_INIT_MEMBER(pirates_state,genix)
/* GAME */
-GAME( 1994, pirates, 0, pirates, pirates, pirates_state, pirates, 0, "NIX", "Pirates (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pirates, 0, pirates, pirates, pirates_state, pirates, 0, "NIX", "Pirates (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1995, piratesb, pirates, pirates, pirates, pirates_state, pirates, 0, "NIX", "Pirates (set 2)", MACHINE_SUPPORTS_SAVE ) // shows 'Copyright 1995' instead of (c)1994 Nix, but isn't unprotected, various changes to the names in the credis + a few other minor alterations
-GAME( 1994, genix, 0, pirates, pirates, pirates_state, genix, 0, "NIX", "Genix Family", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, genix, 0, pirates, pirates, pirates_state, genix, 0, "NIX", "Genix Family", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp
index 13067c57239..cb828399489 100644
--- a/src/mame/drivers/piratesh.cpp
+++ b/src/mame/drivers/piratesh.cpp
@@ -579,7 +579,7 @@ MACHINE_RESET_MEMBER(piratesh_state,piratesh)
}
-static MACHINE_CONFIG_START( piratesh, piratesh_state )
+static MACHINE_CONFIG_START( piratesh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -675,5 +675,5 @@ ROM_START( piratesh )
// ROM_LOAD( "piratesh.nv", 0x0000, 0x080, CRC(28df2269) SHA1(3f071c97662745a199f96964e2e79f795bd5a391) )
ROM_END
-/* ROM parent machine inp init */
-GAME( 1995, piratesh, 0, piratesh, piratesh, driver_device, 0, ROT90, "Konami", "Pirate Ship (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
+// year name parent machine input state init
+GAME( 1995, piratesh, 0, piratesh, piratesh, piratesh_state, 0, ROT90, "Konami", "Pirate Ship (ver UAA)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp
index db7a8dc2044..25cbfe3b7cf 100644
--- a/src/mame/drivers/pitagjr.cpp
+++ b/src/mame/drivers/pitagjr.cpp
@@ -202,7 +202,7 @@ uint32_t pitagjr_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
return 0;
}
-static MACHINE_CONFIG_START( pitajr, pitagjr_state )
+static MACHINE_CONFIG_START( pitajr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD63705, XTAL_2MHz) // probably a m6805-based MCU with internal boot ROM
MCFG_CPU_PROGRAM_MAP(pitajr_mem)
@@ -231,5 +231,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 199?, pitagjr, 0, 0, pitajr, pitajr, driver_device, 0, "VTech", "Pitagorin Junior", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 199?, pitagjr, 0, 0, pitajr, pitajr, pitagjr_state, 0, "VTech", "Pitagorin Junior", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp
index ca31ba1fd5d..e1474e0e22b 100644
--- a/src/mame/drivers/pitnrun.cpp
+++ b/src/mame/drivers/pitnrun.cpp
@@ -218,7 +218,7 @@ static GFXDECODE_START( pitnrun )
GFXDECODE_ENTRY( "gfx1", 0, spritelayout, 0, 4 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pitnrun, pitnrun_state )
+static MACHINE_CONFIG_START( pitnrun )
MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(pitnrun_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pitnrun_state, nmi_source)
@@ -339,5 +339,5 @@ ROM_START( pitnruna )
ROM_LOAD( "clr.3", 0x0040, 0x0020, CRC(25e70e5e) SHA1(fdb9c69e9568a725dd0e3ac25835270fb4f49280) )
ROM_END
-GAME( 1984, pitnrun, 0, pitnrun, pitnrun, driver_device, 0, ROT90, "Taito Corporation", "Pit & Run - F-1 Race (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, pitnruna, pitnrun, pitnrun, pitnrun, driver_device, 0, ROT90, "Taito Corporation", "Pit & Run - F-1 Race (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pitnrun, 0, pitnrun, pitnrun, pitnrun_state, 0, ROT90, "Taito Corporation", "Pit & Run - F-1 Race (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pitnruna, pitnrun, pitnrun, pitnrun, pitnrun_state, 0, ROT90, "Taito Corporation", "Pit & Run - F-1 Race (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp
index c004cc43fda..64377184e73 100644
--- a/src/mame/drivers/pk8000.cpp
+++ b/src/mame/drivers/pk8000.cpp
@@ -355,7 +355,7 @@ uint32_t pk8000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
return video_update(screen, bitmap, cliprect, m_ram->pointer());
}
-static MACHINE_CONFIG_START( pk8000, pk8000_state )
+static MACHINE_CONFIG_START( pk8000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 1780000)
MCFG_CPU_PROGRAM_MAP(pk8000_mem)
@@ -419,7 +419,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, vesta, 0, 0, pk8000, pk8000, driver_device, 0, "BP EVM", "PK8000 Vesta", 0 )
-COMP( 1987, hobby, vesta, 0, pk8000, pk8000, driver_device, 0, "BP EVM", "PK8000 Sura/Hobby", 0 )
-COMP( 1987, pk8002, vesta, 0, pk8000, pk8000, driver_device, 0, "<unknown>", "PK8002 Elf", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, vesta, 0, 0, pk8000, pk8000, pk8000_state, 0, "BP EVM", "PK8000 Vesta", 0 )
+COMP( 1987, hobby, vesta, 0, pk8000, pk8000, pk8000_state, 0, "BP EVM", "PK8000 Sura/Hobby", 0 )
+COMP( 1987, pk8002, vesta, 0, pk8000, pk8000, pk8000_state, 0, "<unknown>","PK8002 Elf", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp
index b8fc7507c18..b4539581ced 100644
--- a/src/mame/drivers/pk8020.cpp
+++ b/src/mame/drivers/pk8020.cpp
@@ -175,7 +175,7 @@ SLOT_INTERFACE_END
/* Machine driver */
-static MACHINE_CONFIG_START( pk8020, pk8020_state )
+static MACHINE_CONFIG_START( pk8020 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, XTAL_20MHz / 8)
MCFG_CPU_PROGRAM_MAP(pk8020_mem)
@@ -289,8 +289,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, korvet, 0, 0, pk8020, pk8020, driver_device, 0, "<unknown>", "PK8020 Korvet", 0)
-COMP( 1987, neiva, korvet, 0, pk8020, pk8020, driver_device, 0, "<unknown>", "PK8020 Neiva", 0)
-COMP( 1987, kontur, korvet, 0, pk8020, pk8020, driver_device, 0, "<unknown>", "PK8020 Kontur", 0)
-COMP( 1987, bk8t, korvet, 0, pk8020, pk8020, driver_device, 0, "<unknown>", "BK-8T", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, korvet, 0, 0, pk8020, pk8020, pk8020_state, 0, "<unknown>", "PK8020 Korvet", 0)
+COMP( 1987, neiva, korvet, 0, pk8020, pk8020, pk8020_state, 0, "<unknown>", "PK8020 Neiva", 0)
+COMP( 1987, kontur, korvet, 0, pk8020, pk8020, pk8020_state, 0, "<unknown>", "PK8020 Kontur", 0)
+COMP( 1987, bk8t, korvet, 0, pk8020, pk8020, pk8020_state, 0, "<unknown>", "BK-8T", 0)
diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp
index a2286f6064a..24d8e1ecb17 100644
--- a/src/mame/drivers/pkscram.cpp
+++ b/src/mame/drivers/pkscram.cpp
@@ -299,7 +299,7 @@ void pkscram_state::machine_reset()
scanline_timer->adjust(m_screen->time_until_pos(interrupt_scanline), interrupt_scanline);
}
-static MACHINE_CONFIG_START( pkscramble, pkscram_state )
+static MACHINE_CONFIG_START( pkscramble )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000 )
MCFG_CPU_PROGRAM_MAP(pkscramble_map)
diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp
index 9574d25c432..f837a93205c 100644
--- a/src/mame/drivers/pktgaldx.cpp
+++ b/src/mame/drivers/pktgaldx.cpp
@@ -324,7 +324,7 @@ void pktgaldx_state::machine_start()
{
}
-static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state )
+static MACHINE_CONFIG_START( pktgaldx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -375,17 +375,17 @@ static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pktgaldb, pktgaldx_state )
+static MACHINE_CONFIG_START( pktgaldb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000)
@@ -410,11 +410,11 @@ static MACHINE_CONFIG_START( pktgaldb, pktgaldx_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60)
MACHINE_CONFIG_END
@@ -487,4 +487,4 @@ DRIVER_INIT_MEMBER(pktgaldx_state,pktgaldx)
GAME( 1992, pktgaldx, 0, pktgaldx, pktgaldx, pktgaldx_state, pktgaldx, ROT0, "Data East Corporation", "Pocket Gal Deluxe (Euro v3.00)", MACHINE_SUPPORTS_SAVE )
GAME( 1993, pktgaldxj, pktgaldx, pktgaldx, pktgaldx, pktgaldx_state, pktgaldx, ROT0, "Data East Corporation (Nihon System license)", "Pocket Gal Deluxe (Japan v3.00)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, pktgaldxb, pktgaldx, pktgaldb, pktgaldx, driver_device, 0, ROT0, "bootleg", "Pocket Gal Deluxe (Euro v3.00, bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, pktgaldxb, pktgaldx, pktgaldb, pktgaldx, pktgaldx_state, 0, ROT0, "bootleg", "Pocket Gal Deluxe (Euro v3.00, bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp
index 59dc7f07194..932cacc12dc 100644
--- a/src/mame/drivers/plan80.cpp
+++ b/src/mame/drivers/plan80.cpp
@@ -224,7 +224,7 @@ static GFXDECODE_START( plan80 )
GFXDECODE_END
-static MACHINE_CONFIG_START( plan80, plan80_state )
+static MACHINE_CONFIG_START( plan80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 2048000)
MCFG_CPU_PROGRAM_MAP(plan80_mem)
@@ -257,5 +257,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, plan80, 0, 0, plan80, plan80, plan80_state, plan80, "Tesla Eltos", "Plan-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1988, plan80, 0, 0, plan80, plan80, plan80_state, plan80, "Tesla Eltos", "Plan-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp
index a48e8b08efa..6558297548c 100644
--- a/src/mame/drivers/play_1.cpp
+++ b/src/mame/drivers/play_1.cpp
@@ -457,7 +457,7 @@ WRITE_LINE_MEMBER( play_1_state::clock_w )
}
}
-static MACHINE_CONFIG_START( play_1, play_1_state )
+static MACHINE_CONFIG_START( play_1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CDP1802, 400000) // 2 gates, 1 cap, 1 resistor oscillating somewhere between 350 to 450 kHz
MCFG_CPU_PROGRAM_MAP(play_1_map)
@@ -538,8 +538,8 @@ ROM_END
/* Big Town, Last Lap and Party all reportedly share the same roms with different playfield/machine artworks */
-GAME(1978, bigtown, 0, play_1, play_1, driver_device, 0, ROT0, "Playmatic", "Big Town", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, lastlap, bigtown, play_1, play_1, driver_device, 0, ROT0, "Playmatic", "Last Lap", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1979, party, bigtown, play_1, play_1, driver_device, 0, ROT0, "Playmatic", "Party", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, spcgambl, 0, play_1, spcgambl, driver_device, 0, ROT0, "Playmatic", "Space Gambler", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, chance, 0, chance, chance, driver_device, 0, ROT0, "Playmatic", "Chance", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, bigtown, 0, play_1, play_1, play_1_state, 0, ROT0, "Playmatic", "Big Town", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, lastlap, bigtown, play_1, play_1, play_1_state, 0, ROT0, "Playmatic", "Last Lap", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, party, bigtown, play_1, play_1, play_1_state, 0, ROT0, "Playmatic", "Party", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, spcgambl, 0, play_1, spcgambl, play_1_state, 0, ROT0, "Playmatic", "Space Gambler", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1978, chance, 0, chance, chance, play_1_state, 0, ROT0, "Playmatic", "Chance", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp
index 4e4dd836314..e89ca5063db 100644
--- a/src/mame/drivers/play_2.cpp
+++ b/src/mame/drivers/play_2.cpp
@@ -351,7 +351,7 @@ WRITE8_MEMBER( play_2_state::psg_w )
}
// **************** Machine *****************************
-static MACHINE_CONFIG_START( play_2, play_2_state )
+static MACHINE_CONFIG_START( play_2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CDP1802, XTAL_2_95MHz)
MCFG_CPU_PROGRAM_MAP(play_2_map)
@@ -506,11 +506,11 @@ ROM_START(madrace)
ROM_END
-GAME(1979, antar, 0, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Antar (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1979, antar2, antar, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Antar (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980, evlfight, 0, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Evil Fight", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980, attack, 0, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Attack", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980, blkfever, 0, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Black Fever", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1982, cerberup, 0, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Cerberus (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1985, madrace, 0, play_2, play_2, driver_device, 0, ROT0, "Playmatic", "Mad Race", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1980, zira, 0, zira, play_2, play_2_state, zira, ROT0, "Playmatic", "Zira", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1979, antar, 0, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Antar (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, antar2, antar, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Antar (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1980, evlfight, 0, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Evil Fight", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1980, attack, 0, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Attack", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1980, blkfever, 0, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Black Fever", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1982, cerberup, 0, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Cerberus (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1985, madrace, 0, play_2, play_2, play_2_state, 0, ROT0, "Playmatic", "Mad Race", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1980, zira, 0, zira, play_2, play_2_state, zira, ROT0, "Playmatic", "Zira", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp
index 19cb7e9173b..d455e2b9700 100644
--- a/src/mame/drivers/play_3.cpp
+++ b/src/mame/drivers/play_3.cpp
@@ -455,7 +455,7 @@ WRITE_LINE_MEMBER( play_3_state::q4013a_w )
m_clockcnt = 0;
}
-static MACHINE_CONFIG_START( play_3, play_3_state )
+static MACHINE_CONFIG_START( play_3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", CDP1802, XTAL_3_579545MHz)
MCFG_CPU_PROGRAM_MAP(play_3_map)
@@ -773,27 +773,27 @@ ROM_START(comeback)
ROM_END
#endif
-GAME(1982, spain82, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Spain '82", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1983, megaaton, 0, megaaton, megaaton, driver_device, 0, ROT0, "Playmatic", "Meg-Aaton", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1983, megaatona, megaaton, megaaton, megaaton, driver_device, 0, ROT0, "Playmatic", "Meg-Aaton (alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1984, nautilus, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Nautilus", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1984, theraid, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "The Raid", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1984, ufo_x, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "UFO-X", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1984, kz26, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "KZ-26", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1985, rock2500, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Rock 2500", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1985, starfirp, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Star Fire", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1985, starfirpa, starfirp, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Star Fire (alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1985, trailer, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Trailer", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1986, fldragon, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Flash Dragon", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1986, fldragona, fldragon, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Flash Dragon (alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1987, phntmshp, 0, sklflite, play_3, driver_device, 0, ROT0, "Playmatic", "Phantom Ship", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1987, sklflite, 0, sklflite, play_3, driver_device, 0, ROT0, "Playmatic", "Skill Flight (Playmatic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1982, spain82, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Spain '82", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1983, megaaton, 0, megaaton, megaaton, play_3_state, 0, ROT0, "Playmatic", "Meg-Aaton", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1983, megaatona, megaaton, megaaton, megaaton, play_3_state, 0, ROT0, "Playmatic", "Meg-Aaton (alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1984, nautilus, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Nautilus", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1984, theraid, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "The Raid", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1984, ufo_x, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "UFO-X", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1984, kz26, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "KZ-26", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1985, rock2500, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Rock 2500", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1985, starfirp, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Star Fire", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1985, starfirpa, starfirp, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Star Fire (alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1985, trailer, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Trailer", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1986, fldragon, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Flash Dragon", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1986, fldragona, fldragon, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Flash Dragon (alternate set)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1987, phntmshp, 0, sklflite, play_3, play_3_state, 0, ROT0, "Playmatic", "Phantom Ship", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1987, sklflite, 0, sklflite, play_3, play_3_state, 0, ROT0, "Playmatic", "Skill Flight (Playmatic)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
// not by Playmatic, but same hardware
-GAME(1986, ridersrf, 0, play_3, play_3, driver_device, 0, ROT0, "JocMatic", "Rider's Surf", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME(1987, ironball, 0, play_3, play_3, driver_device, 0, ROT0, "Stargame", "Iron Balls", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1986, ridersrf, 0, play_3, play_3, play_3_state, 0, ROT0, "JocMatic", "Rider's Surf", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME(1987, ironball, 0, play_3, play_3, play_3_state, 0, ROT0, "Stargame", "Iron Balls", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
// "Z-Pinball" hardware, Z80 main and sound CPUs - to be split (?)
-GAME(1986, eballchps, eballchp, sklflite, play_3, driver_device, 0, ROT0, "Bally (Maibesa license)", "Eight Ball Champ (Spain, Z-Pinball hardware)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, cobrapb, 0, sklflite, play_3, driver_device, 0, ROT0, "Playbar", "Cobra (Playbar)", MACHINE_IS_SKELETON_MECHANICAL)
-//GAME(198?, comeback, 0, sklflite, play_3, driver_device, 0, ROT0, "Nondum", "Come Back", MACHINE_IS_SKELETON_MECHANICAL) // undumped
+GAME(1986, eballchps, eballchp, sklflite, play_3, play_3_state, 0, ROT0, "Bally (Maibesa license)", "Eight Ball Champ (Spain, Z-Pinball hardware)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, cobrapb, 0, sklflite, play_3, play_3_state, 0, ROT0, "Playbar", "Cobra (Playbar)", MACHINE_IS_SKELETON_MECHANICAL)
+//GAME(198?, comeback, 0, sklflite, play_3, play_3_state, 0, ROT0, "Nondum", "Come Back", MACHINE_IS_SKELETON_MECHANICAL) // undumped
// bingo hardware, to be split (?)
-GAME(1983, msdisco, 0, play_3, play_3, driver_device, 0, ROT0, "Playmatic", "Miss Disco (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, msdisco, 0, play_3, play_3, play_3_state, 0, ROT0, "Playmatic", "Miss Disco (Bingo)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp
index 0e42d8bb727..d95cb1697e5 100644
--- a/src/mame/drivers/playch10.cpp
+++ b/src/mame/drivers/playch10.cpp
@@ -645,7 +645,7 @@ INTERRUPT_GEN_MEMBER(playch10_state::playch10_interrupt){
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( playch10, playch10_state )
+static MACHINE_CONFIG_START( playch10 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz
MCFG_CPU_PROGRAM_MAP(bios_map)
@@ -1690,7 +1690,7 @@ DRIVER_INIT_MEMBER(playch10_state,ttoon)
DRIVER_INIT_CALL(pcgboard);
}
-/* YEAR NAME PARENT BIOS MACHINE INPUT INIT MONITOR */
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR */
/* Standard Games */
GAME( 1983, pc_tenis, playch10, playch10, playch10, playch10_state, playch10, ROT0, "Nintendo", "Tennis (PlayChoice-10)", 0 )
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index 6ec5e882504..fd0d4c4e7a5 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -1209,7 +1209,7 @@ MACHINE_RESET_MEMBER(playmark_state,playmark)
m_dispenser_latch = 0;
}
-static MACHINE_CONFIG_START( bigtwin, playmark_state )
+static MACHINE_CONFIG_START( bigtwin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -1244,12 +1244,12 @@ static MACHINE_CONFIG_START( bigtwin, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bigtwinb, playmark_state )
+static MACHINE_CONFIG_START( bigtwinb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -1284,12 +1284,12 @@ static MACHINE_CONFIG_START( bigtwinb, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wbeachvl, playmark_state )
+static MACHINE_CONFIG_START( wbeachvl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -1328,12 +1328,12 @@ static MACHINE_CONFIG_START( wbeachvl, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( excelsr, playmark_state )
+static MACHINE_CONFIG_START( excelsr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -1368,12 +1368,12 @@ static MACHINE_CONFIG_START( excelsr, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* 1MHz resonator */
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* 1MHz resonator */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hrdtimes, playmark_state )
+static MACHINE_CONFIG_START( hrdtimes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
@@ -1409,12 +1409,12 @@ static MACHINE_CONFIG_START( hrdtimes, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hotmind, playmark_state )
+static MACHINE_CONFIG_START( hotmind )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
@@ -1455,12 +1455,12 @@ static MACHINE_CONFIG_START( hotmind, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( luckboomh, playmark_state )
+static MACHINE_CONFIG_START( luckboomh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
@@ -1500,7 +1500,7 @@ static MACHINE_CONFIG_START( luckboomh, playmark_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -1985,12 +1985,12 @@ DRIVER_INIT_MEMBER(playmark_state,pic_decode)
GAME( 1995, bigtwin, 0, bigtwin, bigtwin, playmark_state, pic_decode, ROT0, "Playmark", "Big Twin", MACHINE_SUPPORTS_SAVE )
GAME( 1995, bigtwinb, bigtwin, bigtwinb, bigtwinb, playmark_state, pic_decode, ROT0, "Playmark", "Big Twin (No Girls Conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, wbeachvl, 0, wbeachvl, wbeachvl, driver_device, 0, ROT0, "Playmark", "World Beach Volley (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, wbeachvl2, wbeachvl, wbeachvl, wbeachvl, driver_device, 0, ROT0, "Playmark", "World Beach Volley (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1995, wbeachvl3, wbeachvl, wbeachvl, wbeachvl, driver_device, 0, ROT0, "Playmark", "World Beach Volley (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, wbeachvl, 0, wbeachvl, wbeachvl, playmark_state, 0, ROT0, "Playmark", "World Beach Volley (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, wbeachvl2, wbeachvl, wbeachvl, wbeachvl, playmark_state, 0, ROT0, "Playmark", "World Beach Volley (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, wbeachvl3, wbeachvl, wbeachvl, wbeachvl, playmark_state, 0, ROT0, "Playmark", "World Beach Volley (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1996, excelsr, 0, excelsr, excelsr, playmark_state, pic_decode, ROT0, "Playmark", "Excelsior (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1996, excelsra, excelsr, excelsr, excelsr, playmark_state, pic_decode, ROT0, "Playmark", "Excelsior (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, hrdtimes, 0, hrdtimes, hrdtimes, driver_device, 0, ROT0, "Playmark", "Hard Times (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1994, hrdtimesa, hrdtimes, hrdtimes, hrdtimes, driver_device, 0, ROT0, "Playmark", "Hard Times (set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, hrdtimes, 0, hrdtimes, hrdtimes, playmark_state, 0, ROT0, "Playmark", "Hard Times (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, hrdtimesa, hrdtimes, hrdtimes, hrdtimes, playmark_state, 0, ROT0, "Playmark", "Hard Times (set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 1995, hotmind, 0, hotmind, hotmind, playmark_state, pic_decode, ROT0, "Playmark", "Hot Mind (Hard Times hardware)", MACHINE_SUPPORTS_SAVE )
GAME( 1996, luckboomh, luckboom, luckboomh, luckboomh, playmark_state, pic_decode, ROT0, "Playmark", "Lucky Boom (Hard Times hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index 38dd420dfd3..229139ef426 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -16,7 +16,9 @@
#include "softlist.h"
#include "speaker.h"
#include "bus/cbmiec/cbmiec.h"
+#include "bus/pet/c2n.h"
#include "bus/pet/cass.h"
+#include "bus/pet/diag264_lb_tape.h"
#include "bus/plus4/exp.h"
#include "bus/plus4/user.h"
#include "bus/vcs_ctrl/ctrl.h"
@@ -882,7 +884,7 @@ void plus4_state::machine_reset()
// MACHINE_CONFIG( plus4 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( plus4, plus4_state )
+static MACHINE_CONFIG_START( plus4 )
// basic machine hardware
MCFG_CPU_ADD(MOS7501_TAG, M7501, 0)
MCFG_CPU_PROGRAM_MAP(plus4_mem)
@@ -966,7 +968,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( plus4p )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( plus4p, plus4, c16_state )
+static MACHINE_CONFIG_DERIVED( plus4p, plus4 )
MCFG_DEVICE_MODIFY(MOS7501_TAG)
MCFG_DEVICE_CLOCK(XTAL_17_73447MHz/20)
@@ -987,7 +989,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( plus4n )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( plus4n, plus4, c16_state )
+static MACHINE_CONFIG_DERIVED( plus4n, plus4 )
MCFG_DEVICE_MODIFY(MOS7501_TAG)
MCFG_DEVICE_CLOCK(XTAL_14_31818MHz/16)
@@ -1008,7 +1010,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( c16n )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( c16n, plus4n, c16_state )
+static MACHINE_CONFIG_DERIVED( c16n, plus4n )
MCFG_CPU_MODIFY(MOS7501_TAG)
MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w))
MCFG_M7501_PORT_PULLS(0x00, 0xc0)
@@ -1030,7 +1032,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( c16p )
//-------------------------------------------------
-static MACHINE_CONFIG_DERIVED_CLASS( c16p, plus4p, c16_state )
+static MACHINE_CONFIG_DERIVED( c16p, plus4p )
MCFG_CPU_MODIFY(MOS7501_TAG)
MCFG_M7501_PORT_CALLBACKS(READ8(c16_state, cpu_r), WRITE8(plus4_state, cpu_w))
MCFG_M7501_PORT_PULLS(0x00, 0xc0)
@@ -1267,13 +1269,13 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1984, c264, 0, 0, plus4n, plus4, driver_device, 0, "Commodore Business Machines", "Commodore 264 (Prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-COMP( 1984, c232, c264, 0, c232, plus4, driver_device, 0, "Commodore Business Machines", "Commodore 232 (Prototype)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, v364, c264, 0, v364, plus4, driver_device, 0, "Commodore Business Machines", "Commodore V364 (Prototype)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, plus4, c264, 0, plus4n, plus4, driver_device, 0, "Commodore Business Machines", "Plus/4 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, plus4p, c264, 0, plus4p, plus4, driver_device, 0, "Commodore Business Machines", "Plus/4 (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, c16, c264, 0, c16n, c16, driver_device, 0, "Commodore Business Machines", "Commodore 16 (NTSC)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, c16p, c264, 0, c16p, c16, driver_device, 0, "Commodore Business Machines", "Commodore 16 (PAL)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, c16_hu, c264, 0, c16p, c16, driver_device, 0, "Commodore Business Machines", "Commodore 16 (Hungary)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, c116, c264, 0, c16p, c16, driver_device, 0, "Commodore Business Machines", "Commodore 116", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, c264, 0, 0, plus4n, plus4, c16_state, 0, "Commodore Business Machines", "Commodore 264 (Prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+COMP( 1984, c232, c264, 0, c232, plus4, c16_state, 0, "Commodore Business Machines", "Commodore 232 (Prototype)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, v364, c264, 0, v364, plus4, c16_state, 0, "Commodore Business Machines", "Commodore V364 (Prototype)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, plus4, c264, 0, plus4n, plus4, c16_state, 0, "Commodore Business Machines", "Plus/4 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, plus4p, c264, 0, plus4p, plus4, c16_state, 0, "Commodore Business Machines", "Plus/4 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, c16, c264, 0, c16n, c16, c16_state, 0, "Commodore Business Machines", "Commodore 16 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, c16p, c264, 0, c16p, c16, c16_state, 0, "Commodore Business Machines", "Commodore 16 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, c16_hu, c264, 0, c16p, c16, c16_state, 0, "Commodore Business Machines", "Commodore 16 (Hungary)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, c116, c264, 0, c16p, c16, c16_state, 0, "Commodore Business Machines", "Commodore 116", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp
index f6e5fce2e01..80c86242567 100644
--- a/src/mame/drivers/pluto5.cpp
+++ b/src/mame/drivers/pluto5.cpp
@@ -198,7 +198,7 @@ public:
protected:
// devices
- required_device<m68340cpu_device> m_maincpu;
+ required_device<m68340_cpu_device> m_maincpu;
public:
DECLARE_DRIVER_INIT(hb);
virtual void machine_start() override;
@@ -251,7 +251,7 @@ void pluto5_state::machine_start()
}
-static MACHINE_CONFIG_START( pluto5, pluto5_state )
+static MACHINE_CONFIG_START( pluto5 )
MCFG_CPU_ADD("maincpu", M68340, 16000000)
MCFG_CPU_PROGRAM_MAP(pluto5_map)
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index d72732cdf2b..871baafe51a 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -319,7 +319,7 @@ READ16_MEMBER(polygonet_state::dsp56k_bootload_r)
static uint8_t dsp56k_bank_group(device_t* cpu)
{
- uint16_t portC = ((dsp56k_device *)cpu)->get_peripheral_memory(0xffe3);
+ uint16_t portC = downcast<dsp56k_device *>(cpu)->get_peripheral_memory(0xffe3);
/* If bank group B is on, it overrides bank group A */
if (portC & 0x0002)
@@ -332,7 +332,7 @@ static uint8_t dsp56k_bank_group(device_t* cpu)
static uint8_t dsp56k_bank_num(device_t* cpu, uint8_t bank_group)
{
- uint16_t portC = ((dsp56k_device *)cpu)->get_peripheral_memory(0xffe3);
+ uint16_t portC = downcast<dsp56k_device *>(cpu)->get_peripheral_memory(0xffe3);
if (bank_group == BANK_GROUP_A)
{
@@ -603,7 +603,7 @@ WRITE_LINE_MEMBER(polygonet_state::k054539_nmi_gen)
m_sound_intck = state;
}
-static MACHINE_CONFIG_START( plygonet, polygonet_state )
+static MACHINE_CONFIG_START( plygonet )
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -778,6 +778,6 @@ ROM_START( polynetw )
ROM_LOAD( "polynetw.nv", 0x0000, 0x0080, CRC(8f39d644) SHA1(8733e1a288ba20c4b04b3aedde52801d05cebdf9) )
ROM_END
-/* ROM parent machine inp init */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT
GAME( 1993, plygonet, 0, plygonet, polygonet, polygonet_state, polygonet, ROT90, "Konami", "Polygonet Commanders (ver UAA)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, polynetw, 0, plygonet, polynetw, polygonet_state, polygonet, ROT90, "Konami", "Poly-Net Warriors (ver JAA)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, polynetw, 0, plygonet, polynetw, polygonet_state, polygonet, ROT90, "Konami", "Poly-Net Warriors (ver JAA)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pm68k.cpp b/src/mame/drivers/pm68k.cpp
index cd4085ba6c3..fb1c6721970 100644
--- a/src/mame/drivers/pm68k.cpp
+++ b/src/mame/drivers/pm68k.cpp
@@ -27,7 +27,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ16_MEMBER(keyin_r);
DECLARE_READ16_MEMBER(status_r);
private:
@@ -73,19 +73,19 @@ void pm68k_state::machine_reset()
m_maincpu->reset();
}
-WRITE8_MEMBER( pm68k_state::kbd_put )
+void pm68k_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( pm68k, pm68k_state )
+static MACHINE_CONFIG_START( pm68k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
MCFG_CPU_PROGRAM_MAP(pm68k_mem)
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(pm68k_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(pm68k_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -100,5 +100,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, pm68k, 0, 0, pm68k, pm68k, driver_device, 0, "Callan Data Systems", "PM68K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, pm68k, 0, 0, pm68k, pm68k, pm68k_state, 0, "Callan Data Systems", "PM68K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp
index af3ca41d182..cf1ffbbbf89 100644
--- a/src/mame/drivers/pmd85.cpp
+++ b/src/mame/drivers/pmd85.cpp
@@ -572,7 +572,7 @@ static const struct CassetteOptions pmd85_cassette_options =
};
/* machine definition */
-static MACHINE_CONFIG_START( pmd85, pmd85_state )
+static MACHINE_CONFIG_START( pmd85 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000) /* 2.048MHz ??? */
MCFG_CPU_PROGRAM_MAP(pmd85_mem)
@@ -807,13 +807,13 @@ ROM_START(c2717pmd)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1985, pmd851, 0, 0, pmd851, pmd85, pmd85_state, pmd851, "Tesla", "PMD-85.1" , 0)
-COMP( 1985, pmd852, pmd851, 0, pmd851, pmd85, pmd85_state, pmd851, "Tesla", "PMD-85.2" , 0)
-COMP( 1985, pmd852a, pmd851, 0, pmd852a, pmd85, pmd85_state, pmd852a, "Tesla", "PMD-85.2A" , 0)
-COMP( 1985, pmd852b, pmd851, 0, pmd852a, pmd85, pmd85_state, pmd852a, "Tesla", "PMD-85.2B" , 0)
-COMP( 1988, pmd853, pmd851, 0, pmd853, pmd85, pmd85_state, pmd853, "Tesla", "PMD-85.3" , 0)
-COMP( 1986, alfa, pmd851, 0, alfa, alfa, pmd85_state, alfa, "Didaktik Skalica", "Didaktik Alfa" , 0)
-COMP( 1985, mato, pmd851, 0, mato, mato, pmd85_state, mato, "Statny", "Mato" , 0)
-COMP( 1989, c2717, pmd851, 0, c2717, pmd85, pmd85_state, c2717, "Zbrojovka Brno", "Consul 2717" , 0)
-COMP( 1989, c2717pmd,pmd851, 0, c2717, pmd85, pmd85_state, c2717, "Zbrojovka Brno", "Consul 2717 (with PMD-32)" , MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, pmd851, 0, 0, pmd851, pmd85, pmd85_state, pmd851, "Tesla", "PMD-85.1", 0 )
+COMP( 1985, pmd852, pmd851, 0, pmd851, pmd85, pmd85_state, pmd851, "Tesla", "PMD-85.2", 0 )
+COMP( 1985, pmd852a, pmd851, 0, pmd852a, pmd85, pmd85_state, pmd852a, "Tesla", "PMD-85.2A", 0 )
+COMP( 1985, pmd852b, pmd851, 0, pmd852a, pmd85, pmd85_state, pmd852a, "Tesla", "PMD-85.2B", 0 )
+COMP( 1988, pmd853, pmd851, 0, pmd853, pmd85, pmd85_state, pmd853, "Tesla", "PMD-85.3", 0 )
+COMP( 1986, alfa, pmd851, 0, alfa, alfa, pmd85_state, alfa, "Didaktik Skalica", "Didaktik Alfa", 0 )
+COMP( 1985, mato, pmd851, 0, mato, mato, pmd85_state, mato, "Statny", "Mato", 0 )
+COMP( 1989, c2717, pmd851, 0, c2717, pmd85, pmd85_state, c2717, "Zbrojovka Brno", "Consul 2717", 0 )
+COMP( 1989, c2717pmd,pmd851, 0, c2717, pmd85, pmd85_state, c2717, "Zbrojovka Brno", "Consul 2717 (with PMD-32)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp
index c1a0e82d503..0816086760c 100644
--- a/src/mame/drivers/pmi80.cpp
+++ b/src/mame/drivers/pmi80.cpp
@@ -152,7 +152,7 @@ void pmi80_state::machine_reset()
}
-static MACHINE_CONFIG_START( pmi80, pmi80_state )
+static MACHINE_CONFIG_START( pmi80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(pmi80_mem)
@@ -171,5 +171,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, pmi80, 0, 0, pmi80, pmi80, driver_device, 0, "Tesla", "PMI-80", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, pmi80, 0, 0, pmi80, pmi80, pmi80_state, 0, "Tesla", "PMI-80", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp
index 5b5dcba359f..0d0e3c87fab 100644
--- a/src/mame/drivers/pntnpuzl.cpp
+++ b/src/mame/drivers/pntnpuzl.cpp
@@ -346,7 +346,7 @@ static INPUT_PORTS_START( pntnpuzl )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pntnpuzl, pntnpuzl_state )
+static MACHINE_CONFIG_START( pntnpuzl )
MCFG_CPU_ADD("maincpu", M68000, 12000000)//??
MCFG_CPU_PROGRAM_MAP(pntnpuzl_map)
diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp
index facc24e60d6..40ed4c2aff2 100644
--- a/src/mame/drivers/pockchal.cpp
+++ b/src/mame/drivers/pockchal.cpp
@@ -91,7 +91,7 @@ void pockchalv1_state::machine_reset()
}
-static MACHINE_CONFIG_START( pockchalv1, pockchalv1_state )
+static MACHINE_CONFIG_START( pockchalv1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMP90845,8000000) /* ? MHz */
@@ -126,5 +126,5 @@ MACHINE_CONFIG_END
ROM_START( pockchal )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME*/
-CONS( 199?, pockchal, 0, 0, pockchalv1, pockchalv1, driver_device, 0, "Benesse Corporation", "Pocket Challenge W (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 199?, pockchal, 0, 0, pockchalv1, pockchalv1, pockchalv1_state, 0, "Benesse Corporation", "Pocket Challenge W (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp
index 1fbb9501f14..688be28d2d8 100644
--- a/src/mame/drivers/pocketc.cpp
+++ b/src/mame/drivers/pocketc.cpp
@@ -712,7 +712,7 @@ static GFXDECODE_START( pc1251 )
GFXDECODE_ENTRY( "gfx1", 0x0000, pc1251_charlayout, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pocketc, pocketc_state)
+static MACHINE_CONFIG_START( pocketc )
MCFG_QUANTUM_TIME(attotime::from_hz(60))
MCFG_NVRAM_ADD_0FILL("cpu_nvram")
@@ -739,7 +739,7 @@ static MACHINE_CONFIG_START( pocketc, pocketc_state)
MCFG_PALETTE_INIT_OWNER( pocketc_state, pocketc )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( pc1401, pocketc, pc1401_state )
+static MACHINE_CONFIG_DERIVED( pc1401, pocketc )
MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
MCFG_CPU_PROGRAM_MAP(pc1401_mem)
MCFG_SC61860_READ_RESET_HANDLER(READLINE(pc1401_state,pc1401_reset))
@@ -760,7 +760,7 @@ static MACHINE_CONFIG_DERIVED( pc1402, pc1401 )
MCFG_CPU_PROGRAM_MAP( pc1402_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( pc1250, pocketc, pc1251_state )
+static MACHINE_CONFIG_DERIVED( pc1250, pocketc )
MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
MCFG_CPU_PROGRAM_MAP( pc1250_mem)
MCFG_SC61860_READ_RESET_HANDLER(NOOP)
@@ -802,7 +802,7 @@ static MACHINE_CONFIG_DERIVED( pc1261, pc1260 )
MCFG_CPU_PROGRAM_MAP( pc1261_mem)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( pc1350, pocketc, pc1350_state )
+static MACHINE_CONFIG_DERIVED( pc1350, pocketc )
MCFG_CPU_ADD("maincpu", SC61860, 192000) /* 7.8336 MHz */
MCFG_CPU_PROGRAM_MAP( pc1350_mem)
MCFG_SC61860_READ_RESET_HANDLER(NOOP)
@@ -830,7 +830,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( pc1350, pocketc, pc1350_state )
MCFG_RAM_EXTRA_OPTIONS("12K,20K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( pc1403, pocketc, pc1403_state )
+static MACHINE_CONFIG_DERIVED( pc1403, pocketc )
MCFG_CPU_ADD( "maincpu", SC61860, 256000 )
MCFG_CPU_PROGRAM_MAP( pc1403_mem)
MCFG_SC61860_READ_RESET_HANDLER(NOOP)
@@ -964,25 +964,25 @@ ROM_END
pc1600
*/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-/* cpu sc61860 */
-COMP( 1982, pc1245, 0, 0, pc1250, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1245", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1982, pc1250, 0, 0, pc1250, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1250", MACHINE_NO_SOUND)
-COMP( 1982, pc1251, pc1250, 0, pc1251, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1251", MACHINE_NO_SOUND)
-COMP( 1982, pc1255, pc1250, 0, pc1255, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1255", MACHINE_NO_SOUND)
-COMP( 1983, trs80pc3, pc1250, 0, pc1251, pc1251, pc1251_state, pc1251, "Tandy Radio Shack", "TRS-80 Pocket Computer PC-3", MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+// cpu sc61860
+COMP( 1982, pc1245, 0, 0, pc1250, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1245", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1982, pc1250, 0, 0, pc1250, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1250", MACHINE_NO_SOUND)
+COMP( 1982, pc1251, pc1250, 0, pc1251, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1251", MACHINE_NO_SOUND)
+COMP( 1982, pc1255, pc1250, 0, pc1255, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1255", MACHINE_NO_SOUND)
+COMP( 1983, trs80pc3, pc1250, 0, pc1251, pc1251, pc1251_state, pc1251, "Tandy Radio Shack", "TRS-80 Pocket Computer PC-3", MACHINE_NO_SOUND)
-COMP( 1982, pc1260, 0, 0, pc1260, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1260", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1982, pc1261, pc1260, 0, pc1261, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1261/1262", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1982, pc1260, 0, 0, pc1260, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1260", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1982, pc1261, pc1260, 0, pc1261, pc1251, pc1251_state, pc1251, "Sharp", "Pocket Computer 1261/1262", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-/* pc1261/pc1262 */
-COMP( 1984, pc1350, 0, 0, pc1350, pc1350, driver_device, 0, "Sharp", "Pocket Computer 1350", MACHINE_NO_SOUND )
-COMP( 198?, pc1450, 0, 0, pc1350, pc1350, driver_device, 0, "Sharp", "Pocket Computer 1450", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// pc1261/pc1262
+COMP( 1984, pc1350, 0, 0, pc1350, pc1350, pc1350_state, 0, "Sharp", "Pocket Computer 1350", MACHINE_NO_SOUND )
+COMP( 198?, pc1450, 0, 0, pc1350, pc1350, pc1350_state, 0, "Sharp", "Pocket Computer 1450", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1983, pc1401, 0, 0, pc1401, pc1401, pc1401_state, pc1401, "Sharp", "Pocket Computer 1401", MACHINE_NO_SOUND)
-COMP( 1984, pc1402, pc1401, 0, pc1402, pc1401, pc1401_state, pc1401, "Sharp", "Pocket Computer 1402", MACHINE_NO_SOUND)
-COMP( 198?, pc1360, pc1401, 0, pc1401, pc1401, pc1401_state, pc1401, "Sharp", "Pocket Computer 1360", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1983, pc1401, 0, 0, pc1401, pc1401, pc1401_state, pc1401, "Sharp", "Pocket Computer 1401", MACHINE_NO_SOUND)
+COMP( 1984, pc1402, pc1401, 0, pc1402, pc1401, pc1401_state, pc1401, "Sharp", "Pocket Computer 1402", MACHINE_NO_SOUND)
+COMP( 198?, pc1360, pc1401, 0, pc1401, pc1401, pc1401_state, pc1401, "Sharp", "Pocket Computer 1360", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-/* 72kb rom, 32kb ram, cpu? pc1360 */
-COMP( 1986, pc1403, 0, 0, pc1403, pc1403, pc1403_state, pc1403, "Sharp", "Pocket Computer 1403", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 198?, pc1403h, pc1403, 0, pc1403h,pc1403, pc1403_state, pc1403, "Sharp", "Pocket Computer 1403H", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// 72kb rom, 32kb ram, cpu? pc1360
+COMP( 1986, pc1403, 0, 0, pc1403, pc1403, pc1403_state, pc1403, "Sharp", "Pocket Computer 1403", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 198?, pc1403h, pc1403, 0, pc1403h, pc1403, pc1403_state, pc1403, "Sharp", "Pocket Computer 1403H", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp
index 8c83cbc9b4e..a1edb66638f 100644
--- a/src/mame/drivers/pockstat.cpp
+++ b/src/mame/drivers/pockstat.cpp
@@ -972,7 +972,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash )
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( pockstat, pockstat_state )
+static MACHINE_CONFIG_START( pockstat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7, DEFAULT_CLOCK)
MCFG_CPU_PROGRAM_MAP(pockstat_mem)
@@ -1008,5 +1008,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1999, pockstat, 0, 0, pockstat, pockstat, driver_device, 0, "Sony Computer Entertainment Inc", "Sony PocketStation", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1999, pockstat, 0, 0, pockstat, pockstat, pockstat_state, 0, "Sony Computer Entertainment Inc", "Sony PocketStation", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index 5d9b7ac92b1..2cfbd3719f2 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -91,9 +91,9 @@ public:
required_device<cpu_device> m_maincpu;
required_device<hd61830_device> m_lcdc;
- required_device<pcd3311_t> m_dtmf;
- required_device<portfolio_memory_card_slot_t> m_ccm;
- required_device<portfolio_expansion_slot_t> m_exp;
+ required_device<pcd3311_device> m_dtmf;
+ required_device<portfolio_memory_card_slot_device> m_ccm;
+ required_device<portfolio_expansion_slot_device> m_exp;
required_device<timer_device> m_timer_tick;
required_device<nvram_device> m_nvram;
required_device<ram_device> m_ram;
@@ -1004,7 +1004,7 @@ void portfolio_state::machine_reset()
// MACHINE_CONFIG( portfolio )
//-------------------------------------------------
-static MACHINE_CONFIG_START( portfolio, portfolio_state )
+static MACHINE_CONFIG_START( portfolio )
// basic machine hardware
MCFG_CPU_ADD(M80C88A_TAG, I8088, XTAL_4_9152MHz)
MCFG_CPU_PROGRAM_MAP(portfolio_mem)
@@ -1086,5 +1086,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1989, pofo, 0, 0, portfolio, portfolio, driver_device, 0, "Atari", "Portfolio", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, pofo, 0, 0, portfolio, portfolio, portfolio_state, 0, "Atari", "Portfolio", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp
index 3d4ff3249da..57d9a25e7d2 100644
--- a/src/mame/drivers/poisk1.cpp
+++ b/src/mame/drivers/poisk1.cpp
@@ -35,6 +35,7 @@
#include "sound/spkrdev.h"
#include "video/cgapal.h"
+#include "screen.h"
#include "softlist.h"
#include "speaker.h"
@@ -630,7 +631,7 @@ static INPUT_PORTS_START( poisk1 )
PORT_INCLUDE( poisk1_keyboard_v91 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( poisk1, p1_state )
+static MACHINE_CONFIG_START( poisk1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 5000000)
MCFG_CPU_PROGRAM_MAP(poisk1_map)
@@ -736,5 +737,5 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1989, poisk1, ibm5150, 0, poisk1, poisk1, p1_state, poisk1, "Electronmash", "Poisk-1", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1989, poisk1, ibm5150, 0, poisk1, poisk1, p1_state, poisk1, "Electronmash", "Poisk-1", 0 )
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index 4885939cd14..0734450b2f6 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -216,7 +216,7 @@ OKI M6295 (an AD65 on this board, note pin 7 is low): 1.5mhz
*/
-static MACHINE_CONFIG_START( pokechmp, pokechmp_state )
+static MACHINE_CONFIG_START( pokechmp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_4MHz/4)
@@ -251,7 +251,7 @@ static MACHINE_CONFIG_START( pokechmp, pokechmp_state )
MCFG_SOUND_ADD("ym2", YM3812, XTAL_24MHz/16)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz/16, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* sound fx */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADDRESS_MAP(AS_0, pokechmp_oki_map)
diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp
index 6f75c5b1d5c..430fd220f86 100644
--- a/src/mame/drivers/pokemini.cpp
+++ b/src/mame/drivers/pokemini.cpp
@@ -1753,7 +1753,7 @@ uint32_t pokemini_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
}
-static MACHINE_CONFIG_START( pokemini, pokemini_state )
+static MACHINE_CONFIG_START( pokemini )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MINX, 4000000)
MCFG_CPU_PROGRAM_MAP(pokemini_mem_map)
@@ -1797,4 +1797,4 @@ ROM_START( pokemini )
ROM_END
-CONS( 2001, pokemini, 0, 0, pokemini, pokemini, driver_device, 0, "Nintendo", "Pokemon Mini", MACHINE_NO_SOUND )
+CONS( 2001, pokemini, 0, 0, pokemini, pokemini, pokemini_state, 0, "Nintendo", "Pokemon Mini", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp
index 903b8a322df..d0dc35d5e17 100644
--- a/src/mame/drivers/poker72.cpp
+++ b/src/mame/drivers/poker72.cpp
@@ -363,7 +363,7 @@ void poker72_state::machine_reset()
membank("bank1")->set_entry(0);
}
-static MACHINE_CONFIG_START( poker72, poker72_state )
+static MACHINE_CONFIG_START( poker72 )
/* basic machine hardware */
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index 6a7b0dc8509..8f4ad67524e 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -863,7 +863,7 @@ GFXDECODE_END
* Machine driver
*********************************************************************/
-static MACHINE_CONFIG_START( polepos, polepos_state )
+static MACHINE_CONFIG_START( polepos )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
@@ -990,7 +990,7 @@ static ADDRESS_MAP_START( sound_z80_bootleg_iomap, AS_IO, 8, polepos_state )
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("tms", tms5220_device, status_r, data_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( topracern, polepos_state )
+static MACHINE_CONFIG_START( topracern )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 3.072 MHz */
@@ -2375,17 +2375,17 @@ DRIVER_INIT_MEMBER(polepos_state,polepos2)
*********************************************************************/
/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1982, polepos, 0, polepos, poleposa, driver_device, 0, ROT0, "Namco", "Pole Position (World)", 0 )
-GAME( 1982, poleposj, polepos, polepos, polepos, driver_device, 0, ROT0, "Namco", "Pole Position (Japan)", 0 )
-GAME( 1982, poleposa1, polepos, polepos, poleposa, driver_device, 0, ROT0, "Namco (Atari license)", "Pole Position (Atari version 1)", 0 )
-GAME( 1982, poleposa2, polepos, polepos, poleposa, driver_device, 0, ROT0, "Namco (Atari license)", "Pole Position (Atari version 2)", 0 )
-GAME( 1984, topracer, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Top Racer (with MB8841 + MB8842, 1984)", 0 ) // the NAMCO customs have been cloned on these bootlegs
-GAME( 1983, topracera, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Top Racer (with MB8841 + MB8842, 1983)", 0 ) // the only difference between them is the year displayed on the title screen
-GAME( 1983, ppspeed, polepos, polepos, polepos, driver_device, 0, ROT0, "bootleg", "Speed Up (Spanish bootleg of Pole Position)", 0 ) // very close to topracer / topracera
-GAME( 1982, topracern, polepos, topracern, topracern, driver_device, 0, ROT0, "bootleg", "Top Racer (no MB8841 + MB8842)", MACHINE_IMPERFECT_SOUND ) // explosion sound generator missing
+GAME( 1982, polepos, 0, polepos, poleposa, polepos_state, 0, ROT0, "Namco", "Pole Position (World)", 0 )
+GAME( 1982, poleposj, polepos, polepos, polepos, polepos_state, 0, ROT0, "Namco", "Pole Position (Japan)", 0 )
+GAME( 1982, poleposa1, polepos, polepos, poleposa, polepos_state, 0, ROT0, "Namco (Atari license)", "Pole Position (Atari version 1)", 0 )
+GAME( 1982, poleposa2, polepos, polepos, poleposa, polepos_state, 0, ROT0, "Namco (Atari license)", "Pole Position (Atari version 2)", 0 )
+GAME( 1984, topracer, polepos, polepos, polepos, polepos_state, 0, ROT0, "bootleg", "Top Racer (with MB8841 + MB8842, 1984)", 0 ) // the NAMCO customs have been cloned on these bootlegs
+GAME( 1983, topracera, polepos, polepos, polepos, polepos_state, 0, ROT0, "bootleg", "Top Racer (with MB8841 + MB8842, 1983)", 0 ) // the only difference between them is the year displayed on the title screen
+GAME( 1983, ppspeed, polepos, polepos, polepos, polepos_state, 0, ROT0, "bootleg", "Speed Up (Spanish bootleg of Pole Position)", 0 ) // very close to topracer / topracera
+GAME( 1982, topracern, polepos, topracern, topracern, polepos_state, 0, ROT0, "bootleg", "Top Racer (no MB8841 + MB8842)", MACHINE_IMPERFECT_SOUND ) // explosion sound generator missing
GAME( 1983, polepos2, 0, polepos, polepos2j, polepos_state, polepos2, ROT0, "Namco", "Pole Position II (Japan)", 0 )
GAME( 1983, polepos2a, polepos2, polepos, polepos2, polepos_state, polepos2, ROT0, "Namco (Atari license)", "Pole Position II (Atari)", 0 )
-GAME( 1983, polepos2b, polepos2, polepos, polepos2, driver_device, 0, ROT0, "bootleg", "Pole Position II (bootleg)", 0 )
-GAME( 1984, polepos2bi, polepos2, polepos2bi, polepos2bi,driver_device, 0, ROT0, "bootleg", "Gran Premio F1 (Italian bootleg of Pole Position II)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
-GAME( 1984, polepos2bs, polepos2, polepos2bi, polepos2bi,driver_device, 0, ROT0, "bootleg (BCN Internacional S.A.)", "Gran Premio F1 (Spanish bootleg of Pole Position II)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, polepos2b, polepos2, polepos, polepos2, polepos_state, 0, ROT0, "bootleg", "Pole Position II (bootleg)", 0 )
+GAME( 1984, polepos2bi, polepos2, polepos2bi, polepos2bi,polepos_state, 0, ROT0, "bootleg", "Gran Premio F1 (Italian bootleg of Pole Position II)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1984, polepos2bs, polepos2, polepos2bi, polepos2bi,polepos_state, 0, ROT0, "bootleg (BCN Internacional S.A.)", "Gran Premio F1 (Spanish bootleg of Pole Position II)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp
index 998076fb28c..450956124f8 100644
--- a/src/mame/drivers/policetr.cpp
+++ b/src/mame/drivers/policetr.cpp
@@ -397,7 +397,7 @@ void policetr_state::machine_start()
*
*************************************/
-static MACHINE_CONFIG_START( policetr, policetr_state )
+static MACHINE_CONFIG_START( policetr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R3041, MASTER_CLOCK/2)
@@ -719,14 +719,14 @@ DRIVER_INIT_MEMBER(policetr_state,sshoot12)
*
*************************************/
-GAME( 1996, policetr, 0, policetr, policetr, policetr_state, policetr, ROT0, "P&P Marketing", "Police Trainer (Rev 1.3)", 0 )
-GAME( 1996, policetr11, policetr, policetr, polict10, policetr_state, policetr, ROT0, "P&P Marketing", "Police Trainer (Rev 1.1)", 0 )
-GAME( 1996, policetr10, policetr, policetr, polict10, policetr_state, policetr, ROT0, "P&P Marketing", "Police Trainer (Rev 1.0)", 0 )
+GAME( 1996, policetr, 0, policetr, policetr, policetr_state, policetr, ROT0, "P&P Marketing", "Police Trainer (Rev 1.3)", 0 )
+GAME( 1996, policetr11, policetr, policetr, polict10, policetr_state, policetr, ROT0, "P&P Marketing", "Police Trainer (Rev 1.1)", 0 )
+GAME( 1996, policetr10, policetr, policetr, polict10, policetr_state, policetr, ROT0, "P&P Marketing", "Police Trainer (Rev 1.0)", 0 )
GAME( 1996, policetr13a, policetr, sshooter, policetr, policetr_state, plctr13b, ROT0, "P&P Marketing", "Police Trainer (Rev 1.3B Newer)", 0 )
-GAME( 1996, policetr13b, policetr, sshooter, policetr, policetr_state, plctr13b, ROT0, "P&P Marketing", "Police Trainer (Rev 1.3B)", 0 )
+GAME( 1996, policetr13b, policetr, sshooter, policetr, policetr_state, plctr13b, ROT0, "P&P Marketing", "Police Trainer (Rev 1.3B)", 0 )
-GAME( 1998, sshooter, 0, sshooter, policetr, policetr_state, sshooter, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.9)", 0 )
-GAME( 1998, sshooter17, sshooter, sshooter, policetr, policetr_state, sshooter, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.7)", 0 )
-GAME( 1998, sshooter12, sshooter, sshooter, sshoot11, policetr_state, sshoot12, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.2)", 0 )
-GAME( 1998, sshooter11, sshooter, sshooter, sshoot11, policetr_state, sshoot12, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.1)", 0 )
+GAME( 1998, sshooter, 0, sshooter, policetr, policetr_state, sshooter, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.9)", 0 )
+GAME( 1998, sshooter17, sshooter, sshooter, policetr, policetr_state, sshooter, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.7)", 0 )
+GAME( 1998, sshooter12, sshooter, sshooter, sshoot11, policetr_state, sshoot12, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.2)", 0 )
+GAME( 1998, sshooter11, sshooter, sshooter, sshoot11, policetr_state, sshoot12, ROT0, "P&P Marketing", "Sharpshooter (Rev 1.1)", 0 )
diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp
index cc70f11556f..369e1f8f021 100644
--- a/src/mame/drivers/poly.cpp
+++ b/src/mame/drivers/poly.cpp
@@ -59,7 +59,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(pia1_b_in);
DECLARE_READ8_MEMBER(videoram_r);
DECLARE_WRITE_LINE_MEMBER(write_acia_clock);
@@ -127,7 +127,7 @@ READ8_MEMBER( poly_state::videoram_r )
return m_videoram[offset];
}
-WRITE8_MEMBER( poly_state::kbd_put )
+void poly_state::kbd_put(u8 data)
{
m_term_data = data | 0x80;
@@ -151,7 +151,7 @@ WRITE_LINE_MEMBER( poly_state::ptm_o3_callback )
m_speaker->level_w(state);
}
-static MACHINE_CONFIG_START( poly, poly_state )
+static MACHINE_CONFIG_START( poly )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809E, XTAL_12MHz / 3) // 12.0576MHz
MCFG_CPU_PROGRAM_MAP(poly_mem)
@@ -200,7 +200,7 @@ static MACHINE_CONFIG_START( poly, poly_state )
MCFG_DEVICE_ADD("adlc", MC6854, 0)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(poly_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(poly_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -225,5 +225,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, poly1, 0, 0, poly, poly, driver_device, 0, "Polycorp", "Poly-1 Educational Computer", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, poly1, 0, 0, poly, poly, poly_state, 0, "Polycorp", "Poly-1 Educational Computer", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp
index 1d991d6ab67..9a7cf7a8b8e 100644
--- a/src/mame/drivers/poly88.cpp
+++ b/src/mame/drivers/poly88.cpp
@@ -179,7 +179,7 @@ static GFXDECODE_START( poly88 )
GFXDECODE_ENTRY( "chargen", 0x0000, poly88_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( poly88, poly88_state )
+static MACHINE_CONFIG_START( poly88 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, 1853000)
MCFG_CPU_PROGRAM_MAP(poly88_mem)
@@ -247,6 +247,6 @@ ROM_START( poly8813 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1976, poly88, 0, 0, poly88, poly88, poly88_state, poly88, "PolyMorphic Systems", "Poly-88", 0)
-COMP( 1977, poly8813,poly88,0, poly8813, poly88, poly88_state, poly88, "PolyMorphic Systems", "Poly-8813",MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, poly88, 0, 0, poly88, poly88, poly88_state, poly88, "PolyMorphic Systems", "Poly-88", 0 )
+COMP( 1977, poly8813,poly88,0, poly8813, poly88, poly88_state, poly88, "PolyMorphic Systems", "Poly-8813", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp
index 2716c8f9442..d3297d0cd15 100644
--- a/src/mame/drivers/poly880.cpp
+++ b/src/mame/drivers/poly880.cpp
@@ -242,7 +242,7 @@ void poly880_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( poly880, poly880_state )
+static MACHINE_CONFIG_START( poly880 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_7_3728MHz/8)
MCFG_CPU_PROGRAM_MAP(poly880_mem)
@@ -285,5 +285,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, poly880, 0, 0, poly880, poly880, driver_device, 0, "VEB Polytechnik", "Poly-Computer 880", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, poly880, 0, 0, poly880, poly880, poly880_state, 0, "VEB Polytechnik", "Poly-Computer 880", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp
index e8422c73000..2c8e07acebb 100644
--- a/src/mame/drivers/polyplay.cpp
+++ b/src/mame/drivers/polyplay.cpp
@@ -308,7 +308,7 @@ GFXDECODE_END
/* the machine driver */
-static MACHINE_CONFIG_START( polyplay_zre, polyplay_state )
+static MACHINE_CONFIG_START( polyplay_zre )
/* basic machine hardware */
MCFG_CPU_ADD(Z80CPU_TAG, Z80, POLYPLAY_MAIN_CLOCK / 4) /* UB880D */
MCFG_Z80_DAISY_CHAIN(daisy_chain_zre)
@@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( polyplay_zre, polyplay_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( polyplay_zrepp, polyplay_state )
+static MACHINE_CONFIG_START( polyplay_zrepp )
MCFG_FRAGMENT_ADD( polyplay_zre )
/* basic machine hardware */
@@ -434,6 +434,6 @@ ROM_START( polyplay2c )
ROM_END
/* game driver */
-GAMEL( 1986, polyplay, 0, polyplay_zre, polyplay, driver_device, 0, ROT0, "VEB Polytechnik Karl-Marx-Stadt", "Poly-Play (ZRE)", 0, layout_polyplay )
-GAMEL( 1989, polyplay2, 0, polyplay_zrepp, polyplay, driver_device, 0, ROT0, "VEB Polytechnik Karl-Marx-Stadt", "Poly-Play (ZRE-PP)", 0, layout_polyplay )
-GAMEL( 1989, polyplay2c, polyplay2, polyplay_zrepp, polyplay, driver_device, 0, ROT0, "VEB Polytechnik Karl-Marx-Stadt", "Poly-Play (ZRE-PP - Czech)", 0, layout_polyplay )
+GAMEL( 1986, polyplay, 0, polyplay_zre, polyplay, polyplay_state, 0, ROT0, "VEB Polytechnik Karl-Marx-Stadt", "Poly-Play (ZRE)", 0, layout_polyplay )
+GAMEL( 1989, polyplay2, 0, polyplay_zrepp, polyplay, polyplay_state, 0, ROT0, "VEB Polytechnik Karl-Marx-Stadt", "Poly-Play (ZRE-PP)", 0, layout_polyplay )
+GAMEL( 1989, polyplay2c, polyplay2, polyplay_zrepp, polyplay, polyplay_state, 0, ROT0, "VEB Polytechnik Karl-Marx-Stadt", "Poly-Play (ZRE-PP - Czech)", 0, layout_polyplay )
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index 27eddca1a71..9834d60bfde 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -144,7 +144,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
required_device<dac_word_interface> m_dac; /* just to have a sound device */
@@ -176,8 +176,8 @@ public:
}
// sub devices
- required_device<netlist_mame_logic_input_t> m_sw1a;
- required_device<netlist_mame_logic_input_t> m_sw1b;
+ required_device<netlist_mame_logic_input_device> m_sw1a;
+ required_device<netlist_mame_logic_input_device> m_sw1b;
DECLARE_INPUT_CHANGED_MEMBER(input_changed);
@@ -207,15 +207,15 @@ public:
m_sw1_4(*this, "maincpu:sw1_4")
{
}
- required_device<netlist_mame_analog_output_t> m_led_serve;
- required_device<netlist_mame_analog_output_t> m_lamp_credit1;
- required_device<netlist_mame_analog_output_t> m_lamp_credit2;
- required_device<netlist_mame_analog_output_t> m_coin_counter;
+ required_device<netlist_mame_analog_output_device> m_led_serve;
+ required_device<netlist_mame_analog_output_device> m_lamp_credit1;
+ required_device<netlist_mame_analog_output_device> m_lamp_credit2;
+ required_device<netlist_mame_analog_output_device> m_coin_counter;
- required_device<netlist_mame_logic_input_t> m_sw1_1;
- required_device<netlist_mame_logic_input_t> m_sw1_2;
- required_device<netlist_mame_logic_input_t> m_sw1_3;
- required_device<netlist_mame_logic_input_t> m_sw1_4;
+ required_device<netlist_mame_logic_input_device> m_sw1_1;
+ required_device<netlist_mame_logic_input_device> m_sw1_2;
+ required_device<netlist_mame_logic_input_device> m_sw1_3;
+ required_device<netlist_mame_logic_input_device> m_sw1_4;
NETDEV_ANALOG_CALLBACK_MEMBER(serve_cb)
{
@@ -266,7 +266,7 @@ NETLIST_END()
INPUT_CHANGED_MEMBER(pong_state::input_changed)
{
- int numpad = (uintptr_t) (param);
+ int numpad = uintptr_t(param);
switch (numpad)
{
@@ -371,7 +371,7 @@ static INPUT_PORTS_START( breakout )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pong, pong_state )
+static MACHINE_CONFIG_START( pong )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -406,7 +406,7 @@ static MACHINE_CONFIG_START( pong, pong_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( breakout, breakout_state )
+static MACHINE_CONFIG_START( breakout )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -467,7 +467,7 @@ static MACHINE_CONFIG_DERIVED( pongf, pong )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pongd, pong_state )
+static MACHINE_CONFIG_START( pongd )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -565,10 +565,10 @@ ROM_START( consolet ) // dummy to satisfy game entry
ROM_END
*/
-GAME( 1972, pong, 0, pong, pong, driver_device, 0, ROT0, "Atari", "Pong (Rev E) external [TTL]", MACHINE_SUPPORTS_SAVE)
-GAME( 1972, pongf, 0, pongf, pong, driver_device, 0, ROT0, "Atari", "Pong (Rev E) [TTL]", MACHINE_SUPPORTS_SAVE)
-GAME( 1973, pongd, 0, pongd, pongd, driver_device, 0, ROT0, "Atari", "Pong Doubles [TTL]", MACHINE_SUPPORTS_SAVE)
-GAMEL( 1976, breakout, 0, breakout, breakout, driver_device, 0, ROT90, "Atari", "Breakout [TTL]", MACHINE_SUPPORTS_SAVE, layout_breakout)
+GAME( 1972, pong, 0, pong, pong, pong_state, 0, ROT0, "Atari", "Pong (Rev E) external [TTL]", MACHINE_SUPPORTS_SAVE)
+GAME( 1972, pongf, 0, pongf, pong, pong_state, 0, ROT0, "Atari", "Pong (Rev E) [TTL]", MACHINE_SUPPORTS_SAVE)
+GAME( 1973, pongd, 0, pongd, pongd, pong_state, 0, ROT0, "Atari", "Pong Doubles [TTL]", MACHINE_SUPPORTS_SAVE)
+GAMEL( 1976, breakout, 0, breakout, breakout, breakout_state, 0, ROT90, "Atari", "Breakout [TTL]", MACHINE_SUPPORTS_SAVE, layout_breakout)
// 100% TTL
//GAME( 1973, coupedav, pongd, pongd, pongd, driver_device, 0, ROT0, "Atari France", "Coupe Davis [TTL]", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index b9d29968640..9634ae8544f 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -215,7 +215,7 @@ PALETTE_INIT_MEMBER(poolshrk_state, poolshrk)
}
-static MACHINE_CONFIG_START( poolshrk, poolshrk_state )
+static MACHINE_CONFIG_START( poolshrk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 11055000 / 8) /* ? */
diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp
index 4988e2caf7e..82c45d20b92 100644
--- a/src/mame/drivers/pooyan.cpp
+++ b/src/mame/drivers/pooyan.cpp
@@ -188,7 +188,7 @@ void pooyan_state::machine_reset()
}
-static MACHINE_CONFIG_START( pooyan, pooyan_state )
+static MACHINE_CONFIG_START( pooyan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2)
@@ -308,6 +308,6 @@ ROM_END
*************************************/
// YEAR, NAME, PARENT, MACHINE,INPUT, INIT,MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1982, pooyan, 0, pooyan, pooyan, driver_device, 0, ROT90, "Konami", "Pooyan", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pooyans, pooyan, pooyan, pooyan, driver_device, 0, ROT90, "Konami (Stern Electronics license)", "Pooyan (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pootan, pooyan, pooyan, pooyan, driver_device, 0, ROT90, "bootleg", "Pootan", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pooyan, 0, pooyan, pooyan, pooyan_state, 0, ROT90, "Konami", "Pooyan", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pooyans, pooyan, pooyan, pooyan, pooyan_state, 0, ROT90, "Konami (Stern Electronics license)", "Pooyan (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pootan, pooyan, pooyan, pooyan, pooyan_state, 0, ROT90, "bootleg", "Pootan", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp
index 93646d51a2b..6e006797024 100644
--- a/src/mame/drivers/popeye.cpp
+++ b/src/mame/drivers/popeye.cpp
@@ -454,7 +454,7 @@ WRITE8_MEMBER(popeye_state::popeye_portB_w)
m_dswbit = (data & 0x0e) >> 1;
}
-static MACHINE_CONFIG_START( skyskipr, popeye_state )
+static MACHINE_CONFIG_START( skyskipr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4 MHz */
MCFG_CPU_PROGRAM_MAP(skyskipr_map)
@@ -762,9 +762,9 @@ DRIVER_INIT_MEMBER(popeye_state,popeye)
}
-GAME( 1981, skyskipr, 0, skyskipr, skyskipr, popeye_state, skyskipr, ROT0, "Nintendo", "Sky Skipper", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popeye, 0, popeye, popeye, popeye_state, popeye, ROT0, "Nintendo", "Popeye (revision D)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popeyeu, popeye, popeye, popeye, popeye_state, popeye, ROT0, "Nintendo", "Popeye (revision D not protected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popeyef, popeye, popeye, popeyef, popeye_state, popeye, ROT0, "Nintendo", "Popeye (revision F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, popeyebl, popeye, popeyebl, popeye, driver_device, 0, ROT0, "bootleg", "Popeye (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, popeyej, popeye, popeyej, popeye, popeye_state, skyskipr, ROT0, "Nintendo", "Popeye (Japan, Sky Skipper hardware)", MACHINE_SUPPORTS_SAVE ) // this is the original Japanese release on the same hardware as Sky Skipper
+GAME( 1981, skyskipr, 0, skyskipr, skyskipr, popeye_state, skyskipr, ROT0, "Nintendo", "Sky Skipper", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popeye, 0, popeye, popeye, popeye_state, popeye, ROT0, "Nintendo", "Popeye (revision D)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popeyeu, popeye, popeye, popeye, popeye_state, popeye, ROT0, "Nintendo", "Popeye (revision D not protected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popeyef, popeye, popeye, popeyef, popeye_state, popeye, ROT0, "Nintendo", "Popeye (revision F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, popeyebl, popeye, popeyebl, popeye, popeye_state, 0, ROT0, "bootleg", "Popeye (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, popeyej, popeye, popeyej, popeye, popeye_state, skyskipr, ROT0, "Nintendo", "Popeye (Japan, Sky Skipper hardware)", MACHINE_SUPPORTS_SAVE ) // this is the original Japanese release on the same hardware as Sky Skipper
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index 45368f8efd6..d6ef1d1fa1b 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -634,7 +634,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(popobear_state::irq)
m_maincpu->set_input_line(2, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( popobear, popobear_state )
+static MACHINE_CONFIG_START( popobear )
MCFG_CPU_ADD("maincpu", M68000, XTAL_42MHz/4) // XTAL CORRECT, DIVISOR GUESSED
MCFG_CPU_PROGRAM_MAP(popobear_mem)
// levels 2,3,5 look interesting
@@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( popobear, popobear_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_42MHz/16) // XTAL CORRECT, DIVISOR GUESSED
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_42MHz/32, OKIM6295_PIN7_LOW) // XTAL CORRECT, DIVISOR GUESSED
+ MCFG_OKIM6295_ADD("oki", XTAL_42MHz/32, PIN7_LOW) // XTAL CORRECT, DIVISOR GUESSED
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -679,4 +679,4 @@ ROM_START( popobear )
ROM_LOAD( "popobear_ta-a-901.u9", 0x00000, 0x40000, CRC(f1e94926) SHA1(f4d6f5b5811d90d0069f6efbb44d725ff0d07e1c) )
ROM_END
-GAME( 2000, popobear, 0, popobear, popobear, driver_device, 0, ROT0, "BMC", "PoPo Bear", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, popobear, 0, popobear, popobear, popobear_state, 0, ROT0, "BMC", "PoPo Bear", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp
index 3147f514854..3b129a95c25 100644
--- a/src/mame/drivers/popper.cpp
+++ b/src/mame/drivers/popper.cpp
@@ -526,7 +526,7 @@ void popper_state::machine_reset()
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( popper, popper_state )
+static MACHINE_CONFIG_START( popper )
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/3/2)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -587,5 +587,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
-GAME( 1983, popper, 0, popper, popper, driver_device, 0, ROT90, "Omori", "Popper", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
+GAME( 1983, popper, 0, popper, popper, popper_state, 0, ROT90, "Omori", "Popper", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp
index d4f78eee780..3ab82b776da 100644
--- a/src/mame/drivers/portrait.cpp
+++ b/src/mame/drivers/portrait.cpp
@@ -247,7 +247,7 @@ static GFXDECODE_START( portrait )
GFXDECODE_END
-static MACHINE_CONFIG_START( portrait, portrait_state )
+static MACHINE_CONFIG_START( portrait )
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz ? */
MCFG_CPU_PROGRAM_MAP(portrait_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", portrait_state, irq0_line_hold)
@@ -390,5 +390,5 @@ ROM_END
-GAME( 1983, portrait, 0, portrait, portrait, driver_device, 0, ROT270, "Olympia", "Portraits (set 1)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, portraita,portrait, portrait, portrait, driver_device, 0, ROT270, "Olympia", "Portraits (set 2)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, portrait, 0, portrait, portrait, portrait_state, 0, ROT270, "Olympia", "Portraits (set 1)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, portraita,portrait, portrait, portrait, portrait_state, 0, ROT270, "Olympia", "Portraits (set 2)", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp
index 06b635d30be..278165b0e56 100644
--- a/src/mame/drivers/potgoldu.cpp
+++ b/src/mame/drivers/potgoldu.cpp
@@ -71,7 +71,7 @@ static INPUT_PORTS_START( potgold )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( potgold, potgold_state )
+static MACHINE_CONFIG_START( potgold )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
@@ -119,5 +119,5 @@ ROM_START( potgoldu580 ) // TMS34010FNL-40 + MC68H705 + YMF704C + ADV476KP35 RAM
ROM_LOAD( "mc68h705", 0x0000, 0x2000, NO_DUMP ) // not sure which type of mcu this is, size is a guess
ROM_END
-GAME( 200?, potgoldu, 0, potgold, potgold, driver_device, 0, ROT0, "U.S. Games Inc.", "Pot O' Gold (U.S. Games, v400x?)", MACHINE_IS_SKELETON | MACHINE_NO_SOUND )
-GAME( 200?, potgoldu580, potgoldu, potgold, potgold, driver_device, 0, ROT0, "U.S. Games Inc.", "Pot O' Gold (U.S. Games, v580F)", MACHINE_IS_SKELETON | MACHINE_NO_SOUND )
+GAME( 200?, potgoldu, 0, potgold, potgold, potgold_state, 0, ROT0, "U.S. Games Inc.", "Pot O' Gold (U.S. Games, v400x?)", MACHINE_IS_SKELETON | MACHINE_NO_SOUND )
+GAME( 200?, potgoldu580, potgoldu, potgold, potgold, potgold_state, 0, ROT0, "U.S. Games Inc.", "Pot O' Gold (U.S. Games, v580F)", MACHINE_IS_SKELETON | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp
index b5e9a88bcaa..9e8dd59363c 100644
--- a/src/mame/drivers/powerbal.cpp
+++ b/src/mame/drivers/powerbal.cpp
@@ -491,7 +491,7 @@ MACHINE_RESET_MEMBER(powerbal_state,powerbal)
configure_oki_banks();
}
-static MACHINE_CONFIG_START( powerbal, powerbal_state )
+static MACHINE_CONFIG_START( powerbal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -519,12 +519,12 @@ static MACHINE_CONFIG_START( powerbal, powerbal_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( magicstk, powerbal_state )
+static MACHINE_CONFIG_START( magicstk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -555,7 +555,7 @@ static MACHINE_CONFIG_START( magicstk, powerbal_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -704,7 +704,7 @@ DRIVER_INIT_MEMBER(powerbal_state,magicstk)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1994, powerbal, 0, powerbal, powerbal, powerbal_state, powerbal, ROT0, "Playmark", "Power Balls", MACHINE_SUPPORTS_SAVE )
GAME( 1995, magicstk, 0, magicstk, magicstk, powerbal_state, magicstk, ROT0, "Playmark", "Magic Sticks", MACHINE_SUPPORTS_SAVE )
GAME( 1995, hotminda, hotmind, magicstk, hotminda, powerbal_state, magicstk, ROT0, "Playmark", "Hot Mind (adjustable prize)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp
index fe58539eaa1..6f4d633d39c 100644
--- a/src/mame/drivers/powerins.cpp
+++ b/src/mame/drivers/powerins.cpp
@@ -295,7 +295,7 @@ MACHINE_START_MEMBER(powerins_state, powerinsa)
membank("okibank")->configure_entries(0, 5, memregion("oki1")->base() + 0x30000, 0x10000);
}
-static MACHINE_CONFIG_START( powerins, powerins_state )
+static MACHINE_CONFIG_START( powerins )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12MHz */
@@ -326,10 +326,10 @@ static MACHINE_CONFIG_START( powerins, powerins_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki1", 4000000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki1", 4000000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MCFG_OKIM6295_ADD("oki2", 4000000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", 4000000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
MCFG_SOUND_ADD("ym2203", YM2203, 12000000 / 8)
@@ -355,7 +355,7 @@ static MACHINE_CONFIG_DERIVED( powerinsa, powerins )
MCFG_MACHINE_START_OVERRIDE(powerins_state, powerinsa)
- MCFG_OKIM6295_REPLACE("oki1", 990000, OKIM6295_PIN7_LOW) // pin7 not verified
+ MCFG_OKIM6295_REPLACE("oki1", 990000, PIN7_LOW) // pin7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, powerinsa_oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -679,7 +679,7 @@ ROM_END
/* all supported sets give a 93.10.20 date */
-GAME( 1993, powerins, 0, powerins, powerins, driver_device, 0, ROT0, "Atlus", "Power Instinct (USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, powerinsj, powerins, powerins, powerinj, driver_device, 0, ROT0, "Atlus", "Gouketsuji Ichizoku (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, powerinsa, powerins, powerinsa, powerins, driver_device, 0, ROT0, "bootleg", "Power Instinct (USA, bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, powerinsb, powerins, powerinsb, powerins, driver_device, 0, ROT0, "bootleg", "Power Instinct (USA, bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, powerins, 0, powerins, powerins, powerins_state, 0, ROT0, "Atlus", "Power Instinct (USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, powerinsj, powerins, powerins, powerinj, powerins_state, 0, ROT0, "Atlus", "Gouketsuji Ichizoku (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, powerinsa, powerins, powerinsa, powerins, powerins_state, 0, ROT0, "bootleg", "Power Instinct (USA, bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, powerinsb, powerins, powerinsb, powerins, powerins_state, 0, ROT0, "bootleg", "Power Instinct (USA, bootleg set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp
index e9ae497286d..02f20b09d15 100644
--- a/src/mame/drivers/pp01.cpp
+++ b/src/mame/drivers/pp01.cpp
@@ -198,7 +198,7 @@ static INPUT_PORTS_START( pp01 )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( pp01, pp01_state )
+static MACHINE_CONFIG_START( pp01 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(pp01_mem)
@@ -275,5 +275,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, pp01, 0, 0, pp01, pp01, driver_device, 0, "ZVT", "PP-01", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 198?, pp01, 0, 0, pp01, pp01, pp01_state, 0, "ZVT", "PP-01", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp
index 0d06ff0da02..9d6cf7b7661 100644
--- a/src/mame/drivers/ppmast93.cpp
+++ b/src/mame/drivers/ppmast93.cpp
@@ -360,7 +360,7 @@ uint32_t ppmast93_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
return 0;
}
-static MACHINE_CONFIG_START( ppmast93, ppmast93_state )
+static MACHINE_CONFIG_START( ppmast93 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,5000000) /* 5 MHz */
MCFG_CPU_PROGRAM_MAP(ppmast93_cpu1_map)
@@ -415,4 +415,4 @@ ROM_START( ppmast93 )
ROM_LOAD( "prom1.ug26", 0x200, 0x100, CRC(d979c64e) SHA1(172c9579013d58e35a5b4f732e360811ac36295e) )
ROM_END
-GAME( 1993, ppmast93, 0, ppmast93, ppmast93, driver_device, 0, ROT0, "Electronic Devices S.R.L.", "Ping Pong Masters '93", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ppmast93, 0, ppmast93, ppmast93, ppmast93_state, 0, ROT0, "Electronic Devices S.R.L.", "Ping Pong Masters '93", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp
index ac26fc73b93..835b7f1b046 100644
--- a/src/mame/drivers/prehisle.cpp
+++ b/src/mame/drivers/prehisle.cpp
@@ -196,7 +196,7 @@ GFXDECODE_END
/******************************************************************************/
-static MACHINE_CONFIG_START( prehisle, prehisle_state )
+static MACHINE_CONFIG_START( prehisle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
@@ -397,8 +397,8 @@ ROM_END
/******************************************************************************/
-GAME( 1989, prehisle, 0, prehisle, prehisle, driver_device, 0, ROT0, "SNK", "Prehistoric Isle in 1930 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, prehisleu, prehisle, prehisle, prehisle, driver_device, 0, ROT0, "SNK", "Prehistoric Isle in 1930 (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, prehislek, prehisle, prehisle, prehisle, driver_device, 0, ROT0, "SNK (Victor license)", "Prehistoric Isle in 1930 (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, gensitou, prehisle, prehisle, prehisle, driver_device, 0, ROT0, "SNK", "Genshi-Tou 1930's", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, prehisleb, prehisle, prehisle, prehisle, driver_device, 0, ROT0, "bootleg", "Prehistoric Isle in 1930 (World, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, prehisle, 0, prehisle, prehisle, prehisle_state, 0, ROT0, "SNK", "Prehistoric Isle in 1930 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, prehisleu, prehisle, prehisle, prehisle, prehisle_state, 0, ROT0, "SNK", "Prehistoric Isle in 1930 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, prehislek, prehisle, prehisle, prehisle, prehisle_state, 0, ROT0, "SNK (Victor license)", "Prehistoric Isle in 1930 (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, gensitou, prehisle, prehisle, prehisle, prehisle_state, 0, ROT0, "SNK", "Genshi-Tou 1930's", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, prehisleb, prehisle, prehisle, prehisle, prehisle_state, 0, ROT0, "bootleg", "Prehistoric Isle in 1930 (World, bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp
index 996f8ac0687..042b9264594 100644
--- a/src/mame/drivers/prestige.cpp
+++ b/src/mame/drivers/prestige.cpp
@@ -722,7 +722,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(prestige_state::irq_timer)
m_maincpu->set_input_line(0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( prestige_base, prestige_state )
+static MACHINE_CONFIG_START( prestige_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_8MHz) // Z84C008
MCFG_CPU_PROGRAM_MAP(prestige_mem)
@@ -910,34 +910,34 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1994, glcolor, 0, 0, glcolor, glcolor, driver_device, 0, "VTech", "Genius Leader Color (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1994, glscolor, glcolor, 0, glcolor, glcolor, driver_device, 0, "VTech", "Genius Leader Super Color (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1995, snotec, 0, 0, snotec, glcolor, driver_device, 0, "Bandai", "Super Note Club (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1996, snotecex, 0, 0, snotec, glcolor, driver_device, 0, "Bandai", "Super Note Club EX (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1996, glmcolor, 0, 0, glmcolor, glmcolor, driver_device, 0, "VTech", "Genius Leader Magic Color (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1997, gl6000sl, 0, 0, gl6000sl, prestige, driver_device, 0, "VTech", "Genius Leader 6000SL (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1998, snotecu, 0, 0, snotec, glcolor, driver_device, 0, "Bandai", "Super Note Club \xce\xbc (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1998, gl7007sl, 0, 0, gl7007sl, prestige, driver_device, 0, "VTech", "Genius Leader 7007SL (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1998, prestige, 0, 0, prestige, prestige, driver_device, 0, "VTech", "PreComputer Prestige Elite", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1999, gwnf, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Winner Notebook Fun (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1994, glcolor, 0, 0, glcolor, glcolor, prestige_state, 0, "VTech", "Genius Leader Color (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1994, glscolor, glcolor, 0, glcolor, glcolor, prestige_state, 0, "VTech", "Genius Leader Super Color (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1995, snotec, 0, 0, snotec, glcolor, prestige_state, 0, "Bandai", "Super Note Club (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1996, snotecex, 0, 0, snotec, glcolor, prestige_state, 0, "Bandai", "Super Note Club EX (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1996, glmcolor, 0, 0, glmcolor, glmcolor, prestige_state, 0, "VTech", "Genius Leader Magic Color (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1997, gl6000sl, 0, 0, gl6000sl, prestige, prestige_state, 0, "VTech", "Genius Leader 6000SL (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1998, snotecu, 0, 0, snotec, glcolor, prestige_state, 0, "Bandai", "Super Note Club \xce\xbc (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1998, gl7007sl, 0, 0, gl7007sl, prestige, prestige_state, 0, "VTech", "Genius Leader 7007SL (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1998, prestige, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "PreComputer Prestige Elite", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1999, gwnf, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Winner Notebook Fun (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// these systems need to be moved into a separate driver
-COMP( 1996, gj4000, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Junior 4000 (Germany)", MACHINE_IS_SKELETON)
-COMP( 1996, gkidabc, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius KID ABC Fan (Germany)", MACHINE_IS_SKELETON)
-COMP( 1993, gjmovie, 0, 0, gjmovie, prestige, driver_device, 0, "VTech", "Genius Junior Movie (Germany)", MACHINE_IS_SKELETON)
-COMP( 1996, gjrstar, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Junior Redstar(Germany)", MACHINE_IS_SKELETON)
-COMP( 1996, gjrstar2, gjrstar, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Junior Redstar 2 (Germany)", MACHINE_IS_SKELETON)
-COMP( 1998, gjrstar3, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Junior Redstar 3 (Germany)", MACHINE_IS_SKELETON)
-COMP( 1998, gj5000, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Junior 5000 (Germany)", MACHINE_IS_SKELETON)
-COMP( 2012, cars2lap, 0, 0, prestige, prestige, driver_device, 0, "VTech", "CARS 2 Laptop (Germany)", MACHINE_IS_SKELETON)
+COMP( 1996, gj4000, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Junior 4000 (Germany)", MACHINE_IS_SKELETON )
+COMP( 1996, gkidabc, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius KID ABC Fan (Germany)", MACHINE_IS_SKELETON )
+COMP( 1993, gjmovie, 0, 0, gjmovie, prestige, prestige_state, 0, "VTech", "Genius Junior Movie (Germany)", MACHINE_IS_SKELETON )
+COMP( 1996, gjrstar, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Junior Redstar(Germany)", MACHINE_IS_SKELETON )
+COMP( 1996, gjrstar2, gjrstar, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Junior Redstar 2 (Germany)", MACHINE_IS_SKELETON )
+COMP( 1998, gjrstar3, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Junior Redstar 3 (Germany)", MACHINE_IS_SKELETON )
+COMP( 1998, gj5000, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Junior 5000 (Germany)", MACHINE_IS_SKELETON )
+COMP( 2012, cars2lap, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "CARS 2 Laptop (Germany)", MACHINE_IS_SKELETON )
// gl6600cx use a NSC1028 system-on-a-chip designed by National Semiconductor specifically for VTech
// http://web.archive.org/web/19991127134657/http://www.national.com/news/item/0,1735,425,00.html
-COMP( 1999, gl6600cx, 0, 0, prestige, prestige, driver_device, 0, "VTech", "Genius Leader 6600CX (Germany)", MACHINE_IS_SKELETON)
+COMP( 1999, gl6600cx, 0, 0, prestige, prestige, prestige_state, 0, "VTech", "Genius Leader 6600CX (Germany)", MACHINE_IS_SKELETON )
// TODO: move into a separate driver
// Prin-C use a Fujitsu MB90611A MCU (F2MC-16L)
-COMP( ????, princ, 0, 0, prestige , prestige , driver_device, 0, "Tomy", "Prin-C", MACHINE_IS_SKELETON)
+COMP( ????, princ, 0, 0, prestige , prestige, prestige_state, 0, "Tomy", "Prin-C", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp
index 3b87115ed8e..56fe2044328 100644
--- a/src/mame/drivers/primo.cpp
+++ b/src/mame/drivers/primo.cpp
@@ -240,7 +240,7 @@ static const struct CassetteOptions primo_cassette_options = {
22050 /* sample frequency */
};
-static MACHINE_CONFIG_START( primoa32, primo_state )
+static MACHINE_CONFIG_START( primoa32 )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", Z80, 2500000 )
MCFG_CPU_PROGRAM_MAP( primo32_mem)
@@ -373,11 +373,11 @@ ROM_START( primoc64 )
ROM_LOAD( "c64_4.rom", 0x13000, 0x1000, CRC(3770e3e6) SHA1(792cc71d8f89eb447f94aded5afc70d626a26030) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1984, primoa32, 0, 0, primoa32, primo, primo_state, primo32, "Microkey", "Primo A-32" , 0)
-COMP ( 1984, primoa48, primoa32, 0, primoa48, primo, primo_state, primo48, "Microkey", "Primo A-48" , 0)
-COMP ( 1984, primoa64, primoa32, 0, primoa64, primo, primo_state, primo64, "Microkey", "Primo A-64" , 0)
-COMP ( 1984, primob32, primoa32, 0, primob32, primo, primo_state, primo32, "Microkey", "Primo B-32" , 0)
-COMP ( 1984, primob48, primoa32, 0, primob48, primo, primo_state, primo48, "Microkey", "Primo B-48" , 0)
-COMP ( 1984, primob64, primoa32, 0, primob64, primo, primo_state, primo64, "Microkey", "Primo B-64" , 0)
-COMP ( 1984, primoc64, primoa32, 0, primoc64, primo, primo_state, primo64, "Microkey", "Primo C-64" , MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1984, primoa32, 0, 0, primoa32, primo, primo_state, primo32, "Microkey", "Primo A-32" , 0 )
+COMP ( 1984, primoa48, primoa32, 0, primoa48, primo, primo_state, primo48, "Microkey", "Primo A-48" , 0 )
+COMP ( 1984, primoa64, primoa32, 0, primoa64, primo, primo_state, primo64, "Microkey", "Primo A-64" , 0 )
+COMP ( 1984, primob32, primoa32, 0, primob32, primo, primo_state, primo32, "Microkey", "Primo B-32" , 0 )
+COMP ( 1984, primob48, primoa32, 0, primob48, primo, primo_state, primo48, "Microkey", "Primo B-48" , 0 )
+COMP ( 1984, primob64, primoa32, 0, primob64, primo, primo_state, primo64, "Microkey", "Primo B-64" , 0 )
+COMP ( 1984, primoc64, primoa32, 0, primoc64, primo, primo_state, primo64, "Microkey", "Primo C-64" , MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index 18323aad76a..a735c12ac8d 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -164,7 +164,7 @@ void pro80_state::machine_reset()
m_cass_in = 0;
}
-static MACHINE_CONFIG_START( pro80, pro80_state )
+static MACHINE_CONFIG_START( pro80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz / 2)
MCFG_CPU_PROGRAM_MAP(pro80_mem)
@@ -193,5 +193,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, pro80, 0, 0, pro80, pro80, driver_device, 0, "Protec", "Pro-80", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, pro80, 0, 0, pro80, pro80, pro80_state, 0, "Protec", "Pro-80", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp
index 6abac672b61..2b9ee0965e5 100644
--- a/src/mame/drivers/proconn.cpp
+++ b/src/mame/drivers/proconn.cpp
@@ -182,7 +182,7 @@ public:
protected:
// devices
- optional_device<s16lf01_t> m_vfd;
+ optional_device<s16lf01_device> m_vfd;
required_device<cpu_device> m_maincpu;
required_device<z80pio_device> m_z80pio_1;
required_device<z80pio_device> m_z80pio_2;
@@ -318,7 +318,7 @@ void proconn_state::machine_reset()
m_vfd->reset(); // reset display1
}
-static MACHINE_CONFIG_START( proconn, proconn_state )
+static MACHINE_CONFIG_START( proconn )
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* ?? Mhz */
MCFG_Z80_DAISY_CHAIN(z80_daisy_chain)
MCFG_CPU_PROGRAM_MAP(proconn_map)
diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp
index 641a5b8a3f3..292c4cef699 100644
--- a/src/mame/drivers/prodigy.cpp
+++ b/src/mame/drivers/prodigy.cpp
@@ -123,9 +123,9 @@ private:
#if TTL74164DEV
required_device<ttl74164_device> m_shift;
#else
- required_device<netlist_mame_device_t> m_bcd;
- required_device<netlist_mame_logic_input_t> m_cb1;
- required_device<netlist_mame_logic_input_t> m_cb2;
+ required_device<netlist_mame_device> m_bcd;
+ required_device<netlist_mame_logic_input_device> m_cb1;
+ required_device<netlist_mame_logic_input_device> m_cb2;
#endif
uint8_t m_digit;
void update_bcd();
@@ -218,7 +218,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( prodigy )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( prodigy, prodigy_state )
+static MACHINE_CONFIG_START( prodigy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
@@ -293,5 +293,5 @@ ROM_START(prodigy)
ROM_LOAD("0x2000.bin", 0x0000, 0x02000, CRC(8d60345a) SHA1(fff18ff12e1b1be91f8eac1178605a682564eff2))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT, COMPANY, FULLNAME, FLAGS */
-CONS( 1981, prodigy, 0, 0, prodigy, prodigy, driver_device, 0, "Applied Concepts Inc", "ACI Destiny Prodigy", MACHINE_IS_SKELETON)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS
+CONS( 1981, prodigy, 0, 0, prodigy, prodigy, prodigy_state, 0, "Applied Concepts Inc", "ACI Destiny Prodigy", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index 6b4119ec559..60dd5623a5a 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -234,7 +234,7 @@ void prof180x_state::machine_reset()
}
}
-static MACHINE_CONFIG_START( prof180x, prof180x_state )
+static MACHINE_CONFIG_START( prof180x )
/* basic machine hardware */
MCFG_CPU_ADD(HD64180_TAG, Z80, XTAL_9_216MHz)
MCFG_CPU_PROGRAM_MAP(prof180x_mem)
@@ -326,6 +326,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, prof180x, 0, 0, prof180x, prof180x, driver_device, 0, "Conitec Datensysteme", "PROF-180X", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1992, prof181x, prof180x,0, prof180x, prof180x, driver_device, 0, "Conitec Datensysteme", "PROF-181X", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1986, prof180x, 0, 0, prof180x, prof180x, prof180x_state, 0, "Conitec Datensysteme", "PROF-180X", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1992, prof181x, prof180x,0, prof180x, prof180x, prof180x_state, 0, "Conitec Datensysteme", "PROF-181X", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp
index 0b94343cdcd..98441b1cbb3 100644
--- a/src/mame/drivers/prof80.cpp
+++ b/src/mame/drivers/prof80.cpp
@@ -501,7 +501,7 @@ void prof80_state::machine_reset()
// MACHINE_CONFIG( prof80 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( prof80, prof80_state )
+static MACHINE_CONFIG_START( prof80 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_6MHz)
MCFG_CPU_PROGRAM_MAP(prof80_mem)
@@ -563,5 +563,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1984, prof80, 0, 0, prof80, prof80, driver_device, 0, "Conitec Datensysteme", "PROF-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, prof80, 0, 0, prof80, prof80, prof80_state, 0, "Conitec Datensysteme", "PROF-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp
index 5534af9c152..8df11e55821 100644
--- a/src/mame/drivers/progolf.cpp
+++ b/src/mame/drivers/progolf.cpp
@@ -424,7 +424,7 @@ PALETTE_INIT_MEMBER(progolf_state, progolf)
}
}
-static MACHINE_CONFIG_START( progolf, progolf_state )
+static MACHINE_CONFIG_START( progolf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", DECO_222, 3000000/2) /* guess, 3 Mhz makes the game to behave worse? */
MCFG_CPU_PROGRAM_MAP(main_cpu)
@@ -517,6 +517,6 @@ ROM_END
// this uses DECO222 style encryption
-GAME( 1981, progolf, 0, progolf, progolf, driver_device, 0, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, progolf, 0, progolf, progolf, progolf_state, 0, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
// this uses DECO CPU-6 as custom module CPU (the same as Zoar, are we sure? our Zoar has different encryption, CPU-7 style)
-GAME( 1981, progolfa, progolf, progolfa,progolf, driver_device, 0, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, progolfa, progolf, progolfa, progolf, progolf_state, 0, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp
index 5d4d01c3bf6..a03acd14202 100644
--- a/src/mame/drivers/prophet600.cpp
+++ b/src/mame/drivers/prophet600.cpp
@@ -262,7 +262,7 @@ DRIVER_INIT_MEMBER(prophet600_state, prophet600)
}
// master crystal is 8 MHz, all clocks derived from there
-static MACHINE_CONFIG_START( prophet600, prophet600_state )
+static MACHINE_CONFIG_START( prophet600 )
MCFG_CPU_ADD(MAINCPU_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index 670700347e8..abf2bf52bdb 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -76,7 +76,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(ca2_w);
DECLARE_WRITE8_MEMBER(video_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE_LINE_MEMBER(acia1_txdata_w);
DECLARE_WRITE_LINE_MEMBER(acia1_clock_w);
DECLARE_WRITE_LINE_MEMBER(acia2_clock_w);
@@ -128,7 +128,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START(proteus3)
INPUT_PORTS_END
-WRITE8_MEMBER( proteus3_state::kbd_put )
+void proteus3_state::kbd_put(u8 data)
{
if (data == 0x08)
data = 0x0f; // take care of backspace (bios 1 and 2)
@@ -317,7 +317,7 @@ void proteus3_state::machine_reset()
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( proteus3, proteus3_state )
+static MACHINE_CONFIG_START( proteus3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_3_579545MHz) /* Divided by 4 internally */
MCFG_CPU_PROGRAM_MAP(proteus3_mem)
@@ -339,7 +339,7 @@ static MACHINE_CONFIG_START( proteus3, proteus3_state )
MCFG_PIA_CA2_HANDLER(WRITELINE(proteus3_state, ca2_w))
MCFG_PIA_IRQB_HANDLER(INPUTLINE("maincpu", M6800_IRQ_LINE))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(proteus3_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(proteus3_state, kbd_put))
/* cassette */
MCFG_DEVICE_ADD ("acia1", ACIA6850, 0)
@@ -409,5 +409,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, proteus3, 0, 0, proteus3, proteus3, driver_device, 0, "Proteus International", "Proteus III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1978, proteus3, 0, 0, proteus3, proteus3, proteus3_state, 0, "Proteus International", "Proteus III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/ps2.cpp b/src/mame/drivers/ps2.cpp
index 9f37fba46da..bdc22c86a48 100644
--- a/src/mame/drivers/ps2.cpp
+++ b/src/mame/drivers/ps2.cpp
@@ -17,7 +17,7 @@ public:
m_maincpu(*this, "maincpu"),
m_mb(*this, "mb"),
m_ram(*this, RAM_TAG)
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<at_mb_device> m_mb;
required_device<ram_device> m_ram;
@@ -66,7 +66,7 @@ void ps2_state::machine_start()
}
}
-static MACHINE_CONFIG_START( ps2m30286, ps2_state )
+static MACHINE_CONFIG_START( ps2m30286 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80286, 10000000)
MCFG_CPU_PROGRAM_MAP(ps2_16_map)
@@ -90,7 +90,7 @@ static MACHINE_CONFIG_START( ps2m30286, ps2_state )
MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ps2386, ps2_state )
+static MACHINE_CONFIG_START( ps2386 )
MCFG_CPU_ADD("maincpu", I386, 12000000)
MCFG_CPU_PROGRAM_MAP(ps2_32_map)
MCFG_CPU_IO_MAP(ps2_32_io)
@@ -245,11 +245,11 @@ ROM_START( i8580111 )
ROM_LOAD16_BYTE( "15f6639.bin", 0x00001, 0x10000, CRC(82cf0f7d) SHA1(13bb39225757b89749af70e881af0228673dbe0c))
ROM_END
-COMP ( 1990, i8530h31, ibm5170, 0, ps2m30286, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8530-H31 (Model 30/286)", MACHINE_NOT_WORKING )
-COMP ( 1988, i8530286, ibm5170, 0, ps2m30286, 0, driver_device, 0, "International Business Machines", "IBM PS/2 Model 30-286", MACHINE_NOT_WORKING )
-COMP ( 198?, i8535043, ibm5170, 0, ps2386, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8535-043 (Model 35)", MACHINE_NOT_WORKING )
-COMP ( 198?, i8550021, ibm5170, 0, ps2386, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8550-021 (Model 50)", MACHINE_NOT_WORKING )
-COMP ( 198?, i8550061, ibm5170, 0, ps2386, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8550-061 (Model 50Z)", MACHINE_NOT_WORKING )
-COMP ( 1989, i8555081, ibm5170, 0, ps2386, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8550-081 (Model 55SX)", MACHINE_NOT_WORKING )
-COMP ( 198?, i8580071, ibm5170, 0, ps2386, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8580-071 (Model 80)", MACHINE_NOT_WORKING )
-COMP ( 198?, i8580111, ibm5170, 0, ps2386, 0, driver_device, 0, "International Business Machines", "IBM PS/2 8580-111 (Model 80)", MACHINE_NOT_WORKING )
+COMP ( 1990, i8530h31, ibm5170, 0, ps2m30286, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8530-H31 (Model 30/286)", MACHINE_NOT_WORKING )
+COMP ( 1988, i8530286, ibm5170, 0, ps2m30286, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 Model 30-286", MACHINE_NOT_WORKING )
+COMP ( 198?, i8535043, ibm5170, 0, ps2386, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8535-043 (Model 35)", MACHINE_NOT_WORKING )
+COMP ( 198?, i8550021, ibm5170, 0, ps2386, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8550-021 (Model 50)", MACHINE_NOT_WORKING )
+COMP ( 198?, i8550061, ibm5170, 0, ps2386, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8550-061 (Model 50Z)", MACHINE_NOT_WORKING )
+COMP ( 1989, i8555081, ibm5170, 0, ps2386, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8550-081 (Model 55SX)", MACHINE_NOT_WORKING )
+COMP ( 198?, i8580071, ibm5170, 0, ps2386, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8580-071 (Model 80)", MACHINE_NOT_WORKING )
+COMP ( 198?, i8580111, ibm5170, 0, ps2386, 0, ps2_state, 0, "International Business Machines", "IBM PS/2 8580-111 (Model 80)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pse.cpp b/src/mame/drivers/pse.cpp
index 04fb75b79a1..e09712ffca0 100644
--- a/src/mame/drivers/pse.cpp
+++ b/src/mame/drivers/pse.cpp
@@ -55,7 +55,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -98,7 +98,7 @@ void pse_state::video_start()
{
}
-static MACHINE_CONFIG_START( pse, pse_state )
+static MACHINE_CONFIG_START( pse )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -204,9 +204,9 @@ ROM_START( gametree )
ROM_END
-GAME( 1976, bazooka, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, bazookabr, bazooka, pse, 0, driver_device, 0, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, dpatrol, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, dpatrola, dpatrol, pse, 0, driver_device, 0, ROT0, "Project Support Engineering (Telegames license)", "Desert Patrol (set 2) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1978, gametree, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", MACHINE_IS_SKELETON )
-//GAME( 1976, knightar, 0, pse, 0, driver_device, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", MACHINE_IS_SKELETON )
+GAME( 1976, bazooka, 0, pse, 0, pse_state, 0, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, bazookabr, bazooka, pse, 0, pse_state, 0, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, dpatrol, 0, pse, 0, pse_state, 0, ROT0, "Project Support Engineering", "Desert Patrol [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, dpatrola, dpatrol, pse, 0, pse_state, 0, ROT0, "Project Support Engineering (Telegames license)", "Desert Patrol (set 2) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1978, gametree, 0, pse, 0, pse_state, 0, ROT0, "Project Support Engineering", "Game Tree [TTL]", MACHINE_IS_SKELETON )
+//GAME( 1976, knightar, 0, pse, 0, pse_state, 0, ROT0, "Project Support Engineering", "Knights in Armor [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp
index 1b4a3733be7..3b514e6bd1c 100644
--- a/src/mame/drivers/psikyo.cpp
+++ b/src/mame/drivers/psikyo.cpp
@@ -1028,7 +1028,7 @@ void psikyo_state::machine_reset()
***************************************************************************/
-static MACHINE_CONFIG_START( sngkace, psikyo_state )
+static MACHINE_CONFIG_START( sngkace )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* verified on pcb */
@@ -1071,7 +1071,7 @@ MACHINE_CONFIG_END
***************************************************************************/
-static MACHINE_CONFIG_START( gunbird, psikyo_state )
+static MACHINE_CONFIG_START( gunbird )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
@@ -1107,7 +1107,7 @@ static MACHINE_CONFIG_START( gunbird, psikyo_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( s1945bl, psikyo_state ) /* Bootleg hardware based on the unprotected Japanese Strikers 1945 set */
+static MACHINE_CONFIG_START( s1945bl ) /* Bootleg hardware based on the unprotected Japanese Strikers 1945 set */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
@@ -1134,7 +1134,7 @@ static MACHINE_CONFIG_START( s1945bl, psikyo_state ) /* Bootleg hardware based o
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // ?? clock
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_LOW) // ?? clock
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, s1945bl_oki_map)
MACHINE_CONFIG_END
@@ -1146,7 +1146,7 @@ MACHINE_CONFIG_END
***************************************************************************/
-static MACHINE_CONFIG_START( s1945, psikyo_state )
+static MACHINE_CONFIG_START( s1945 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, 16000000)
@@ -2008,23 +2008,23 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945bl)
***************************************************************************/
-GAME( 1993, samuraia, 0, sngkace, samuraia, psikyo_state, sngkace, ROT270, "Psikyo", "Samurai Aces (World)", MACHINE_SUPPORTS_SAVE ) // Banpresto?
-GAME( 1993, sngkace, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan, set 1)", MACHINE_SUPPORTS_SAVE ) // Banpresto?
-GAME( 1993, sngkacea, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan, set 2)", MACHINE_SUPPORTS_SAVE ) // Banpresto?
+GAME( 1993, samuraia, 0, sngkace, samuraia, psikyo_state, sngkace, ROT270, "Psikyo", "Samurai Aces (World)", MACHINE_SUPPORTS_SAVE ) // Banpresto?
+GAME( 1993, sngkace, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan, set 1)", MACHINE_SUPPORTS_SAVE ) // Banpresto?
+GAME( 1993, sngkacea, samuraia, sngkace, sngkace, psikyo_state, sngkace, ROT270, "Psikyo", "Sengoku Ace (Japan, set 2)", MACHINE_SUPPORTS_SAVE ) // Banpresto?
-GAME( 1994, gunbird, 0, gunbird, gunbird, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, gunbirdk, gunbird, gunbird, gunbirdj, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, gunbirdj, gunbird, gunbird, gunbirdj, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gunbird, 0, gunbird, gunbird, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gunbirdk, gunbird, gunbird, gunbirdj, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, gunbirdj, gunbird, gunbird, gunbirdj, psikyo_state, gunbird, ROT270, "Psikyo", "Gunbird (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, btlkroad, 0, gunbird, btlkroad, psikyo_state, gunbird, ROT0, "Psikyo", "Battle K-Road", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, btlkroadk, btlkroad,gunbird, btlkroad, psikyo_state, gunbird, ROT0, "Psikyo", "Battle K-Road (Korean PCB)", MACHINE_SUPPORTS_SAVE ) // game code is still multi-region, but sound rom appears to be Korea specific at least
+GAME( 1994, btlkroad, 0, gunbird, btlkroad, psikyo_state, gunbird, ROT0, "Psikyo", "Battle K-Road", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, btlkroadk, btlkroad, gunbird, btlkroad, psikyo_state, gunbird, ROT0, "Psikyo", "Battle K-Road (Korean PCB)", MACHINE_SUPPORTS_SAVE ) // game code is still multi-region, but sound rom appears to be Korea specific at least
-GAME( 1995, s1945, 0, s1945, s1945, psikyo_state, s1945, ROT270, "Psikyo", "Strikers 1945 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, s1945a, s1945, s1945, s1945a, psikyo_state, s1945a, ROT270, "Psikyo", "Strikers 1945 (Japan / World)", MACHINE_SUPPORTS_SAVE ) // Region dip - 0x0f=Japan, anything else=World
-GAME( 1995, s1945j, s1945, s1945, s1945j, psikyo_state, s1945j, ROT270, "Psikyo", "Strikers 1945 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, s1945jn, s1945, gunbird, s1945j, psikyo_state, s1945jn, ROT270, "Psikyo", "Strikers 1945 (Japan, unprotected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, s1945k, s1945, s1945, s1945j, psikyo_state, s1945, ROT270, "Psikyo", "Strikers 1945 (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, s1945bl, s1945, s1945bl, s1945bl, psikyo_state, s1945bl, ROT270, "bootleg","Strikers 1945 (Hong Kong, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, s1945, 0, s1945, s1945, psikyo_state, s1945, ROT270, "Psikyo", "Strikers 1945 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, s1945a, s1945, s1945, s1945a, psikyo_state, s1945a, ROT270, "Psikyo", "Strikers 1945 (Japan / World)", MACHINE_SUPPORTS_SAVE ) // Region dip - 0x0f=Japan, anything else=World
+GAME( 1995, s1945j, s1945, s1945, s1945j, psikyo_state, s1945j, ROT270, "Psikyo", "Strikers 1945 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, s1945jn, s1945, gunbird, s1945j, psikyo_state, s1945jn, ROT270, "Psikyo", "Strikers 1945 (Japan, unprotected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, s1945k, s1945, s1945, s1945j, psikyo_state, s1945, ROT270, "Psikyo", "Strikers 1945 (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, s1945bl, s1945, s1945bl, s1945bl, psikyo_state, s1945bl, ROT270, "bootleg", "Strikers 1945 (Hong Kong, bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, tengai, 0, s1945, tengai, psikyo_state, tengai, ROT0, "Psikyo", "Tengai (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, tengaij, tengai, s1945, tengaij, psikyo_state, tengai, ROT0, "Psikyo", "Sengoku Blade: Sengoku Ace Episode II / Tengai", MACHINE_SUPPORTS_SAVE ) // Region dip - 0x0f=Japan, anything else=World
+GAME( 1996, tengai, 0, s1945, tengai, psikyo_state, tengai, ROT0, "Psikyo", "Tengai (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, tengaij, tengai, s1945, tengaij, psikyo_state, tengai, ROT0, "Psikyo", "Sengoku Blade: Sengoku Ace Episode II / Tengai", MACHINE_SUPPORTS_SAVE ) // Region dip - 0x0f=Japan, anything else=World
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index f7a4f1addfd..6d5b2987b92 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -652,7 +652,7 @@ void psikyo4_state::machine_reset()
m_oldbrt2 = -1;
}
-static MACHINE_CONFIG_START( ps4big, psikyo4_state )
+static MACHINE_CONFIG_START( ps4big )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
@@ -913,12 +913,12 @@ ROM_START( hotdebut )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS */
-GAME( 1997, hotgmck, 0, ps4big, hotgmck, driver_device, 0, ROT0, "Psikyo", "Taisen Hot Gimmick (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, hgkairak, 0, ps4big, hotgmck, driver_device, 0, ROT0, "Psikyo", "Taisen Hot Gimmick Kairakuten (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, hotgmck3, 0, ps4big, hotgmck, driver_device, 0, ROT0, "Psikyo", "Taisen Hot Gimmick 3 Digital Surfing (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, hotgm4ev, 0, ps4big, hotgmck, driver_device, 0, ROT0, "Psikyo", "Taisen Hot Gimmick 4 Ever (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, hotgmcki, 0, ps4big, hotgmck, driver_device, 0, ROT0, "Psikyo", "Mahjong Hot Gimmick Integral (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, loderndf, 0, ps4small, loderndf, driver_device, 0, ROT0, "Psikyo", "Lode Runner - The Dig Fight (ver. B)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, loderndfa,loderndf, ps4small, loderndf, driver_device, 0, ROT0, "Psikyo", "Lode Runner - The Dig Fight (ver. A)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, hotdebut, 0, ps4small, hotdebut, driver_device, 0, ROT0, "MOSS / Psikyo", "Quiz de Idol! Hot Debut (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS
+GAME( 1997, hotgmck, 0, ps4big, hotgmck, psikyo4_state, 0, ROT0, "Psikyo", "Taisen Hot Gimmick (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, hgkairak, 0, ps4big, hotgmck, psikyo4_state, 0, ROT0, "Psikyo", "Taisen Hot Gimmick Kairakuten (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, hotgmck3, 0, ps4big, hotgmck, psikyo4_state, 0, ROT0, "Psikyo", "Taisen Hot Gimmick 3 Digital Surfing (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, hotgm4ev, 0, ps4big, hotgmck, psikyo4_state, 0, ROT0, "Psikyo", "Taisen Hot Gimmick 4 Ever (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, hotgmcki, 0, ps4big, hotgmck, psikyo4_state, 0, ROT0, "Psikyo", "Mahjong Hot Gimmick Integral (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, loderndf, 0, ps4small, loderndf, psikyo4_state, 0, ROT0, "Psikyo", "Lode Runner - The Dig Fight (ver. B)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, loderndfa,loderndf, ps4small, loderndf, psikyo4_state, 0, ROT0, "Psikyo", "Lode Runner - The Dig Fight (ver. A)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, hotdebut, 0, ps4small, hotdebut, psikyo4_state, 0, ROT0, "MOSS / Psikyo", "Quiz de Idol! Hot Debut (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp
index d4c9a186a2b..ae60f086231 100644
--- a/src/mame/drivers/psikyosh.cpp
+++ b/src/mame/drivers/psikyosh.cpp
@@ -775,7 +775,7 @@ void psikyosh_state::machine_start()
}
-static MACHINE_CONFIG_START( psikyo3v1, psikyosh_state )
+static MACHINE_CONFIG_START( psikyo3v1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2)
@@ -1218,23 +1218,23 @@ DRIVER_INIT_MEMBER(psikyosh_state,mjgtaste)
}
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS */
/* ps3-v1 */
-GAME( 1997, soldivid, 0, psikyo3v1, soldivid, psikyosh_state, ps3, ROT0, "Psikyo", "Sol Divide - The Sword Of Darkness", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, soldividk, soldivid, psikyo3v1, soldividk,psikyosh_state, ps3, ROT0, "Psikyo", "Sol Divide - The Sword Of Darkness (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, s1945ii, 0, psikyo3v1, s1945ii, psikyosh_state, ps3, ROT270, "Psikyo", "Strikers 1945 II", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, daraku, 0, psikyo3v1, daraku, psikyosh_state, ps3, ROT0, "Psikyo", "Daraku Tenshi - The Fallen Angels", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sbomber, 0, psikyo3v1, sbomberb, psikyosh_state, ps3, ROT270, "Psikyo", "Space Bomber (ver. B)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sbombera, sbomber, psikyo3v1, sbomberb, psikyosh_state, ps3, ROT270, "Psikyo", "Space Bomber", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, soldivid, 0, psikyo3v1, soldivid, psikyosh_state, ps3, ROT0, "Psikyo", "Sol Divide - The Sword Of Darkness", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, soldividk, soldivid, psikyo3v1, soldividk,psikyosh_state, ps3, ROT0, "Psikyo", "Sol Divide - The Sword Of Darkness (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, s1945ii, 0, psikyo3v1, s1945ii, psikyosh_state, ps3, ROT270, "Psikyo", "Strikers 1945 II", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, daraku, 0, psikyo3v1, daraku, psikyosh_state, ps3, ROT0, "Psikyo", "Daraku Tenshi - The Fallen Angels", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sbomber, 0, psikyo3v1, sbomberb, psikyosh_state, ps3, ROT270, "Psikyo", "Space Bomber (ver. B)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sbombera, sbomber, psikyo3v1, sbomberb, psikyosh_state, ps3, ROT270, "Psikyo", "Space Bomber", MACHINE_SUPPORTS_SAVE )
/* ps5 */
-GAME( 1998, gunbird2, 0, psikyo5, gunbird2, psikyosh_state, ps5, ROT270, "Psikyo", "Gunbird 2", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, s1945iii, 0, psikyo5, s1945iii, psikyosh_state, ps5, ROT270, "Psikyo", "Strikers 1945 III (World) / Strikers 1999 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, gunbird2, 0, psikyo5, gunbird2, psikyosh_state, ps5, ROT270, "Psikyo", "Gunbird 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, s1945iii, 0, psikyo5, s1945iii, psikyosh_state, ps5, ROT270, "Psikyo", "Strikers 1945 III (World) / Strikers 1999 (Japan)", MACHINE_SUPPORTS_SAVE )
/* ps5v2 */
-GAME( 2000, dragnblz, 0, psikyo5, dragnblz, psikyosh_state, ps5, ROT270, "Psikyo", "Dragon Blaze", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, tgm2, 0, psikyo5_240, tgm2, psikyosh_state, ps5, ROT0, "Arika", "Tetris the Absolute The Grand Master 2", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, tgm2p, tgm2, psikyo5_240, tgm2, psikyosh_state, ps5, ROT0, "Arika", "Tetris the Absolute The Grand Master 2 Plus", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, gnbarich, 0, psikyo5, gnbarich, psikyosh_state, ps5, ROT270, "Psikyo", "Gunbarich", MACHINE_SUPPORTS_SAVE )
-GAME( 2002, mjgtaste, 0, psikyo5, mjgtaste, psikyosh_state, mjgtaste, ROT0, "Psikyo", "Mahjong G-Taste", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dragnblz, 0, psikyo5, dragnblz, psikyosh_state, ps5, ROT270, "Psikyo", "Dragon Blaze", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, tgm2, 0, psikyo5_240, tgm2, psikyosh_state, ps5, ROT0, "Arika", "Tetris the Absolute The Grand Master 2", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, tgm2p, tgm2, psikyo5_240, tgm2, psikyosh_state, ps5, ROT0, "Arika", "Tetris the Absolute The Grand Master 2 Plus", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, gnbarich, 0, psikyo5, gnbarich, psikyosh_state, ps5, ROT270, "Psikyo", "Gunbarich", MACHINE_SUPPORTS_SAVE )
+GAME( 2002, mjgtaste, 0, psikyo5, mjgtaste, psikyosh_state, mjgtaste, ROT0, "Psikyo", "Mahjong G-Taste", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp
index bfccf26f09e..b3a4da91915 100644
--- a/src/mame/drivers/psion.cpp
+++ b/src/mame/drivers/psion.cpp
@@ -564,7 +564,7 @@ static GFXDECODE_START( psion )
GFXDECODE_END
/* basic configuration for 2 lines display */
-static MACHINE_CONFIG_START( psion_2lines, psion_state )
+static MACHINE_CONFIG_START( psion_2lines )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD63701, 980000) // should be HD6303 at 0.98MHz
@@ -615,7 +615,7 @@ static MACHINE_CONFIG_DERIVED( psion_4lines, psion_2lines )
MCFG_HD44780_PIXEL_UPDATE_CB(psion_state,lz_pixel_update)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( psion1, psion_2lines, psion1_state )
+static MACHINE_CONFIG_DERIVED( psion1, psion_2lines )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(psion1_mem)
@@ -793,15 +793,15 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, psion1, 0, 0, psion1, psion1,driver_device, 0, "Psion", "Organiser I", MACHINE_NOT_WORKING)
-COMP( 1986, psioncm, 0, 0, psioncm, psion, driver_device, 0, "Psion", "Organiser II CM", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1986, psionla, psioncm, 0, psionla, psion, driver_device, 0, "Psion", "Organiser II LA", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1986, psionxp, psioncm, 0, psionla, psion, driver_device, 0, "Psion", "Organiser II XP", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1986, psionp200, psioncm, 0, psionp350, psion, driver_device, 0, "Psion", "Organiser II P200", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1986, psionp350, psioncm, 0, psionp350, psion, driver_device, 0, "Psion", "Organiser II P350", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1986, psionlam, psioncm, 0, psionlam, psion, driver_device, 0, "Psion", "Organiser II LAM", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1989, psionlz, 0, 0, psionlz, psion, driver_device, 0, "Psion", "Organiser II LZ", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1989, psionlz64, psionlz, 0, psionlz, psion, driver_device, 0, "Psion", "Organiser II LZ64", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1989, psionlz64s, psionlz, 0, psionlz, psion, driver_device, 0, "Psion", "Organiser II LZ64S", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-COMP( 1989, psionp464, psionlz, 0, psionlz, psion, driver_device, 0, "Psion", "Organiser II P464", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, psion1, 0, 0, psion1, psion1, psion1_state, 0, "Psion", "Organiser I", MACHINE_NOT_WORKING )
+COMP( 1986, psioncm, 0, 0, psioncm, psion, psion_state, 0, "Psion", "Organiser II CM", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1986, psionla, psioncm, 0, psionla, psion, psion_state, 0, "Psion", "Organiser II LA", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1986, psionxp, psioncm, 0, psionla, psion, psion_state, 0, "Psion", "Organiser II XP", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1986, psionp200, psioncm, 0, psionp350, psion, psion_state, 0, "Psion", "Organiser II P200", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1986, psionp350, psioncm, 0, psionp350, psion, psion_state, 0, "Psion", "Organiser II P350", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1986, psionlam, psioncm, 0, psionlam, psion, psion_state, 0, "Psion", "Organiser II LAM", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1989, psionlz, 0, 0, psionlz, psion, psion_state, 0, "Psion", "Organiser II LZ", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1989, psionlz64, psionlz, 0, psionlz, psion, psion_state, 0, "Psion", "Organiser II LZ64", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1989, psionlz64s, psionlz, 0, psionlz, psion, psion_state, 0, "Psion", "Organiser II LZ64S", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1989, psionp464, psionlz, 0, psionlz, psion, psion_state, 0, "Psion", "Organiser II P464", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp
index b4d8124b2dd..453b030ce6f 100644
--- a/src/mame/drivers/psx.cpp
+++ b/src/mame/drivers/psx.cpp
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( subcpu_map, AS_PROGRAM, 8, psx1_state )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( psj, psx1_state )
+static MACHINE_CONFIG_START( psj )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
MCFG_CPU_PROGRAM_MAP( psx_map )
@@ -129,8 +129,8 @@ static MACHINE_CONFIG_START( psj, psx1_state )
MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psu, psj )
@@ -138,7 +138,7 @@ static MACHINE_CONFIG_DERIVED( psu, psj )
MCFG_CPU_PROGRAM_MAP( subcpu_map )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pse, psx1_state )
+static MACHINE_CONFIG_START( pse )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8530AQ, XTAL_67_7376MHz )
MCFG_CPU_PROGRAM_MAP( psx_map)
@@ -175,8 +175,8 @@ static MACHINE_CONFIG_START( pse, psx1_state )
MCFG_PSXCD_ADD(PSXCD_TAG, "cdrom")
MCFG_PSXCD_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin2))
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psx_dma_read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psx_dma_write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 3, psxdma_device::read_delegate(&psx1_state::cd_dma_read, (psx1_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 3, psxdma_device::write_delegate(&psx1_state::cd_dma_write, (psx1_state *) owner ) )
MACHINE_CONFIG_END
ROM_START( psj )
@@ -306,8 +306,8 @@ Version 4.3 E
*/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1994, psj, 0, 0, psj, 0, driver_device, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 1995, pse, psj, 0, pse, 0, driver_device, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (Europe)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 1995, psu, psj, 0, psu, 0, driver_device, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (USA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 1995, psa, psj, 0, psj, 0, driver_device, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (Asia-Pacific)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1994, psj, 0, 0, psj, 0, psx1_state, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 1995, pse, psj, 0, pse, 0, psx1_state, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (Europe)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 1995, psu, psj, 0, psu, 0, psx1_state, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (USA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 1995, psa, psj, 0, psj, 0, psx1_state, 0, "Sony Computer Entertainment Inc", "Sony PlayStation (Asia-Pacific)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp
index 1c41e5ee726..10a710e9de8 100644
--- a/src/mame/drivers/psychic5.cpp
+++ b/src/mame/drivers/psychic5.cpp
@@ -712,7 +712,7 @@ static GFXDECODE_START( bombsa )
GFXDECODE_END
-static MACHINE_CONFIG_START( psychic5, psychic5_state )
+static MACHINE_CONFIG_START( psychic5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2)
@@ -766,7 +766,7 @@ static MACHINE_CONFIG_START( psychic5, psychic5_state )
MCFG_SOUND_ROUTE(3, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bombsa, psychic5_state )
+static MACHINE_CONFIG_START( bombsa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2 ) /* 6 MHz */
@@ -972,6 +972,6 @@ ROM_START( bombsa )
ROM_END
-GAME( 1987, psychic5, 0, psychic5, psychic5, driver_device, 0, ROT270, "Jaleco / NMK", "Psychic 5 (World)", MACHINE_SUPPORTS_SAVE ) // "Oversea's version V2.00 CHANGED BY TAMIO NAKASATO" text present in ROM, various modifications (English names, more complete attract demo etc.)
-GAME( 1987, psychic5j, psychic5, psychic5, psychic5, driver_device, 0, ROT270, "Jaleco / NMK", "Psychic 5 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bombsa, 0, bombsa, bombsa, driver_device, 0, ROT270, "Jaleco", "Bombs Away (prototype)", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, psychic5, 0, psychic5, psychic5, psychic5_state, 0, ROT270, "Jaleco / NMK", "Psychic 5 (World)", MACHINE_SUPPORTS_SAVE ) // "Oversea's version V2.00 CHANGED BY TAMIO NAKASATO" text present in ROM, various modifications (English names, more complete attract demo etc.)
+GAME( 1987, psychic5j, psychic5, psychic5, psychic5, psychic5_state, 0, ROT270, "Jaleco / NMK", "Psychic 5 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bombsa, 0, bombsa, bombsa, psychic5_state, 0, ROT270, "Jaleco", "Bombs Away (prototype)", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp
index a1761baaf5c..5b39076649b 100644
--- a/src/mame/drivers/pt68k4.cpp
+++ b/src/mame/drivers/pt68k4.cpp
@@ -62,8 +62,16 @@ TODO: 68230 device
#include "machine/wd_fdc.h"
#include "sound/spkrdev.h"
+#include "bus/isa/cga.h"
+#include "bus/isa/ega.h"
+#include "bus/isa/fdc.h"
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
+#include "bus/isa/lpt.h"
+#include "bus/isa/mda.h"
+#include "bus/isa/vga.h"
+#include "bus/isa/wdxt_gen.h"
+#include "bus/isa/xtide.h"
#include "bus/pc_kbd/keyboards.h"
#include "bus/pc_kbd/pc_kbdc.h"
@@ -125,7 +133,7 @@ private:
required_device<mc68681_device> m_duart2;
required_device<isa8_device> m_isa;
required_device<speaker_sound_device> m_speaker;
- optional_device<wd1772_t> m_wdfdc;
+ optional_device<wd1772_device> m_wdfdc;
void irq5_update();
@@ -248,7 +256,7 @@ static ADDRESS_MAP_START(pt68k2_mem, AS_PROGRAM, 16, pt68k4_state)
AM_RANGE(0xfe0040, 0xfe005f) AM_DEVREADWRITE8(DUART2_TAG, mc68681_device, read, write, 0x00ff)
AM_RANGE(0xfe0080, 0xfe00bf) AM_READ8(pia_stub_r, 0x00ff)
AM_RANGE(0xfe00c0, 0xfe00ff) AM_WRITE8(fdc_select_w, 0x00ff)
- AM_RANGE(0xfe0100, 0xfe013f) AM_DEVREADWRITE8(WDFDC_TAG, wd1772_t, read, write, 0x00ff)
+ AM_RANGE(0xfe0100, 0xfe013f) AM_DEVREADWRITE8(WDFDC_TAG, wd1772_device, read, write, 0x00ff)
AM_RANGE(0xfe01c0, 0xfe01c3) AM_READWRITE8(keyboard_r, keyboard_w, 0x00ff)
AM_RANGE(0xff0000, 0xff0fff) AM_READWRITE8(hiram_r, hiram_w, 0xff00)
AM_RANGE(0xff0000, 0xff0fff) AM_DEVREADWRITE8(TIMEKEEPER_TAG, timekeeper_device, read, write, 0x00ff)
@@ -386,7 +394,7 @@ SLOT_INTERFACE_START( pt68k4_isa8_cards )
SLOT_INTERFACE("xtide", ISA8_XTIDE) // Monk only
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( pt68k2, pt68k4_state )
+static MACHINE_CONFIG_START( pt68k2 )
/* basic machine hardware */
MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz/2) // 68k2 came in 8, 10, and 12 MHz versions
MCFG_CPU_PROGRAM_MAP(pt68k2_mem)
@@ -426,7 +434,7 @@ static MACHINE_CONFIG_START( pt68k2, pt68k4_state )
MCFG_SOFTWARE_LIST_ADD("flop525_list", "pt68k2")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pt68k4, pt68k4_state )
+static MACHINE_CONFIG_START( pt68k4 )
/* basic machine hardware */
MCFG_CPU_ADD(M68K_TAG, M68000, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(pt68k4_mem)
@@ -493,6 +501,6 @@ ROM_START( pt68k4 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, pt68k2, 0, 0, pt68k2, pt68k4, driver_device, 0, "Peripheral Technology", "PT68K2", MACHINE_SUPPORTS_SAVE )
-COMP( 1990, pt68k4, 0, 0, pt68k4, pt68k4, driver_device, 0, "Peripheral Technology", "PT68K4", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1988, pt68k2, 0, 0, pt68k2, pt68k4, pt68k4_state, 0, "Peripheral Technology", "PT68K2", MACHINE_SUPPORTS_SAVE )
+COMP( 1990, pt68k4, 0, 0, pt68k4, pt68k4, pt68k4_state, 0, "Peripheral Technology", "PT68K4", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp
index 163d48a16b6..7777959b7c2 100644
--- a/src/mame/drivers/ptcsol.cpp
+++ b/src/mame/drivers/ptcsol.cpp
@@ -179,7 +179,7 @@ public:
DECLARE_WRITE8_MEMBER( sol20_fb_w );
DECLARE_WRITE8_MEMBER( sol20_fd_w );
DECLARE_WRITE8_MEMBER( sol20_fe_w );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
DECLARE_DRIVER_INIT(sol20);
TIMER_CALLBACK_MEMBER(sol20_cassette_tc);
TIMER_CALLBACK_MEMBER(sol20_boot);
@@ -722,7 +722,7 @@ static GFXDECODE_START( sol20 )
GFXDECODE_ENTRY( "chargen", 0x0000, sol20_charlayout, 0, 1 )
GFXDECODE_END
-WRITE8_MEMBER( sol20_state::kbd_put )
+void sol20_state::kbd_put(u8 data)
{
if (data)
{
@@ -731,7 +731,7 @@ WRITE8_MEMBER( sol20_state::kbd_put )
}
}
-static MACHINE_CONFIG_START( sol20, sol20_state )
+static MACHINE_CONFIG_START( sol20 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_14_31818MHz/7)
MCFG_CPU_PROGRAM_MAP(sol20_mem)
@@ -777,7 +777,7 @@ static MACHINE_CONFIG_START( sol20, sol20_state )
MCFG_AY31015_TX_CLOCK(4800.0)
MCFG_AY31015_RX_CLOCK(4800.0)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(sol20_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(sol20_state, kbd_put))
MCFG_SOFTWARE_LIST_ADD("cass_list", "sol20_cass")
MACHINE_CONFIG_END
@@ -805,5 +805,5 @@ ROM_START( sol20 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1976, sol20, 0, 0, sol20, sol20, sol20_state, sol20, "Processor Technology Corporation", "SOL-20", 0 )
diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp
index e14e863d215..5dfe05c42d6 100644
--- a/src/mame/drivers/pturn.cpp
+++ b/src/mame/drivers/pturn.cpp
@@ -498,7 +498,7 @@ void pturn_state::machine_reset()
m_soundlatch->clear_w(space,0,0);
}
-static MACHINE_CONFIG_START( pturn, pturn_state )
+static MACHINE_CONFIG_START( pturn )
MCFG_CPU_ADD("maincpu", Z80, 12000000/3)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", pturn_state, main_intgen)
diff --git a/src/mame/drivers/puckpkmn.cpp b/src/mame/drivers/puckpkmn.cpp
index ab276011ddc..28d46aa27b0 100644
--- a/src/mame/drivers/puckpkmn.cpp
+++ b/src/mame/drivers/puckpkmn.cpp
@@ -275,7 +275,7 @@ static ADDRESS_MAP_START( puckpkmna_map, AS_PROGRAM, 16, md_boot_state )
AM_RANGE(0x70001c, 0x70001d) AM_READ(puckpkmna_70001c_r)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( puckpkmn, md_boot_state )
+static MACHINE_CONFIG_START( puckpkmn )
MCFG_FRAGMENT_ADD(md_ntsc)
MCFG_CPU_MODIFY("maincpu")
@@ -285,7 +285,7 @@ static MACHINE_CONFIG_START( puckpkmn, md_boot_state )
MCFG_DEVICE_REMOVE("genesis_snd_z80")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz / 4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz / 4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25)
MACHINE_CONFIG_END
@@ -488,4 +488,4 @@ ROM_END
GAME( 2000, puckpkmn, 0, puckpkmn, puckpkmn, md_boot_state, puckpkmn, ROT0, "Genie", "Puckman Pockimon (set 1)", 0 )
GAME( 2000, puckpkmna,puckpkmn, puckpkmna, puckpkmn, md_boot_state, puckpkmn, ROT0, "IBS", "Puckman Pockimon (set 2)", 0 )
GAME( 2000, puckpkmnb,puckpkmn, puckpkmna, puckpkmn, md_boot_state, puckpkmn, ROT0, "Sun Mixing", "Puckman Pockimon (set 3)", 0 )
-GAME( 2000, jzth, 0, jzth, jzth, md_boot_state, puckpkmn, ROT0, "<unknown>", "Jue Zhan Tian Huang", MACHINE_IMPERFECT_SOUND )
+GAME( 2000, jzth, 0, jzth, jzth, md_boot_state, puckpkmn, ROT0, "<unknown>", "Jue Zhan Tian Huang", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp
index 1953c805e4b..d59f42b2fdf 100644
--- a/src/mame/drivers/pulsar.cpp
+++ b/src/mame/drivers/pulsar.cpp
@@ -77,7 +77,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<z80dart_device> m_dart;
required_device<com8116_device> m_brg;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<msm5832_device> m_rtc;
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START(pulsar_io, AS_IO, 8, pulsar_state)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x0c) AM_DEVREADWRITE("z80dart", z80dart_device, ba_cd_r, ba_cd_w)
- AM_RANGE(0xd0, 0xd3) AM_MIRROR(0x0c) AM_DEVREADWRITE("fdc", fd1797_t, read, write)
+ AM_RANGE(0xd0, 0xd3) AM_MIRROR(0x0c) AM_DEVREADWRITE("fdc", fd1797_device, read, write)
AM_RANGE(0xe0, 0xe3) AM_MIRROR(0x0c) AM_DEVREADWRITE("ppi", i8255_device, read, write)
AM_RANGE(0xf0, 0xff) AM_WRITE(baud_w)
ADDRESS_MAP_END
@@ -224,7 +224,7 @@ DRIVER_INIT_MEMBER( pulsar_state, pulsar )
membank("bankw1")->configure_entry(0, &main[0xf800]);
}
-static MACHINE_CONFIG_START( pulsar, pulsar_state )
+static MACHINE_CONFIG_START( pulsar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(pulsar_mem)
@@ -274,5 +274,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, pulsarlb, 0, 0, pulsar, pulsar, pulsar_state, pulsar, "Pulsar", "Little Big Board", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, pulsarlb, 0, 0, pulsar, pulsar, pulsar_state, pulsar, "Pulsar", "Little Big Board", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index d3bc387214c..eab2aa94073 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -640,7 +640,7 @@ MACHINE_RESET_MEMBER(punchout_state, spnchout)
}
-static MACHINE_CONFIG_START( punchout, punchout_state )
+static MACHINE_CONFIG_START( punchout )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
@@ -1342,11 +1342,11 @@ ROM_END
-GAME( 1984, punchout, 0, punchout, punchout, driver_device, 0, ROT0, "Nintendo", "Punch-Out!! (Rev B)", 0 ) /* CHP1-02 boards */
-GAME( 1984, punchouta, punchout, punchout, punchout, driver_device, 0, ROT0, "Nintendo", "Punch-Out!! (Rev A)", 0 ) /* CHP1-01 boards */
-GAME( 1984, punchoutj, punchout, punchout, punchout, driver_device, 0, ROT0, "Nintendo", "Punch-Out!! (Japan)", 0 )
-GAME( 1984, punchita, punchout, punchout, punchout, driver_device, 0, ROT0, "bootleg", "Punch-Out!! (Italian bootleg)", 0 )
-GAME( 1984, spnchout, 0, spnchout, spnchout, driver_device, 0, ROT0, "Nintendo", "Super Punch-Out!! (Rev B)", 0 ) /* CHP1-02 boards */
-GAME( 1984, spnchouta, spnchout, spnchout, spnchout, driver_device, 0, ROT0, "Nintendo", "Super Punch-Out!! (Rev A)", 0 ) /* CHP1-01 boards */
-GAME( 1984, spnchoutj, spnchout, spnchout, spnchout, driver_device, 0, ROT0, "Nintendo", "Super Punch-Out!! (Japan)", 0 )
-GAME( 1985, armwrest, 0, armwrest, armwrest, driver_device, 0, ROT0, "Nintendo", "Arm Wrestling", 0 )
+GAME( 1984, punchout, 0, punchout, punchout, punchout_state, 0, ROT0, "Nintendo", "Punch-Out!! (Rev B)", 0 ) /* CHP1-02 boards */
+GAME( 1984, punchouta, punchout, punchout, punchout, punchout_state, 0, ROT0, "Nintendo", "Punch-Out!! (Rev A)", 0 ) /* CHP1-01 boards */
+GAME( 1984, punchoutj, punchout, punchout, punchout, punchout_state, 0, ROT0, "Nintendo", "Punch-Out!! (Japan)", 0 )
+GAME( 1984, punchita, punchout, punchout, punchout, punchout_state, 0, ROT0, "bootleg", "Punch-Out!! (Italian bootleg)", 0 )
+GAME( 1984, spnchout, 0, spnchout, spnchout, punchout_state, 0, ROT0, "Nintendo", "Super Punch-Out!! (Rev B)", 0 ) /* CHP1-02 boards */
+GAME( 1984, spnchouta, spnchout, spnchout, spnchout, punchout_state, 0, ROT0, "Nintendo", "Super Punch-Out!! (Rev A)", 0 ) /* CHP1-01 boards */
+GAME( 1984, spnchoutj, spnchout, spnchout, spnchout, punchout_state, 0, ROT0, "Nintendo", "Super Punch-Out!! (Japan)", 0 )
+GAME( 1985, armwrest, 0, armwrest, armwrest, punchout_state, 0, ROT0, "Nintendo", "Arm Wrestling", 0 )
diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp
index 2b6ea9a2b12..af677db56ac 100644
--- a/src/mame/drivers/pv1000.cpp
+++ b/src/mame/drivers/pv1000.cpp
@@ -45,13 +45,11 @@ private:
sound_stream *m_sh_channel;
};
-extern const device_type PV1000;
-
-const device_type PV1000 = device_creator<pv1000_sound_device>;
+DEFINE_DEVICE_TYPE(PV1000, pv1000_sound_device, "pv1000_sound", "NEC D65010G031")
pv1000_sound_device::pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PV1000, "NEC D65010G031", tag, owner, clock, "pv1000_sound", __FILE__),
- device_sound_interface(mconfig, *this)
+ : device_t(mconfig, PV1000, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
{
}
@@ -434,7 +432,7 @@ static GFXDECODE_START( pv1000 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pv1000, pv1000_state )
+static MACHINE_CONFIG_START( pv1000 )
MCFG_CPU_ADD( "maincpu", Z80, 17897725/5 )
MCFG_CPU_PROGRAM_MAP( pv1000 )
@@ -471,5 +469,5 @@ ROM_START( pv1000 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1983, pv1000, 0, 0, pv1000, pv1000, driver_device, 0, "Casio", "PV-1000", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1983, pv1000, 0, 0, pv1000, pv1000, pv1000_state, 0, "Casio", "PV-1000", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp
index c2ae369f0c7..6c88b76550d 100644
--- a/src/mame/drivers/pv2000.cpp
+++ b/src/mame/drivers/pv2000.cpp
@@ -379,7 +379,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pv2000_state, pv2000_cart )
}
/* Machine Drivers */
-static MACHINE_CONFIG_START( pv2000, pv2000_state )
+static MACHINE_CONFIG_START( pv2000 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_7_15909MHz/2) // 3.579545 MHz
@@ -426,5 +426,5 @@ ROM_END
/* System Drivers */
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-CONS( 1983, pv2000, 0, 0, pv2000, pv2000, driver_device, 0, "Casio", "PV-2000", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1983, pv2000, 0, 0, pv2000, pv2000, pv2000_state, 0, "Casio", "PV-2000", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp
index 97263c9bdc3..8924492d27d 100644
--- a/src/mame/drivers/pv9234.cpp
+++ b/src/mame/drivers/pv9234.cpp
@@ -29,17 +29,23 @@ class pv9234_state : public driver_device
{
public:
pv9234_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_p_ram(*this, "p_ram"),
- m_maincpu(*this, "maincpu") { }
+ : driver_device(mconfig, type, tag)
+ , m_p_ram(*this, "p_ram")
+ , m_maincpu(*this, "maincpu")
+ {
+ }
DECLARE_WRITE32_MEMBER(debug_w);
DECLARE_WRITE32_MEMBER(debug1_w);
DECLARE_WRITE32_MEMBER(debug2_w);
- required_shared_ptr<uint32_t> m_p_ram;
+
+ uint32_t screen_update_pv9234(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+protected:
virtual void machine_reset() override;
virtual void video_start() override;
- uint32_t screen_update_pv9234(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ required_shared_ptr<uint32_t> m_p_ram;
required_device<cpu_device> m_maincpu;
};
@@ -137,7 +143,7 @@ uint32_t pv9234_state::screen_update_pv9234(screen_device &screen, bitmap_ind16
return 0;
}
-static MACHINE_CONFIG_START( pv9234, pv9234_state )
+static MACHINE_CONFIG_START( pv9234 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7, 4915000) //probably a more powerful clone.
MCFG_CPU_PROGRAM_MAP(pv9234_map)
@@ -167,5 +173,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-SYST( 1997, pv9234, 0, 0, pv9234, pv9234, driver_device, 0, "Scientific Atlanta", "PowerVu D9234", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+SYST( 1997, pv9234, 0, 0, pv9234, pv9234, pv9234_state, 0, "Scientific Atlanta", "PowerVu D9234", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp
index 40208e508e0..00709e686a0 100644
--- a/src/mame/drivers/pve500.cpp
+++ b/src/mame/drivers/pve500.cpp
@@ -345,7 +345,7 @@ printf("io_expander_w: PORTA (io_SC=%02X)\n", data);
}
}
-static MACHINE_CONFIG_START( pve500, pve500_state )
+static MACHINE_CONFIG_START( pve500 )
/* Main CPU */
MCFG_CPU_ADD("maincpu", TMPZ84C015, XTAL_12MHz / 2) /* TMPZ84C015BF-6 */
MCFG_CPU_PROGRAM_MAP(maincpu_prg)
@@ -435,5 +435,5 @@ ROM_START( pve500 )
ROM_LOAD( "pve500.ice3", 0x0000, 0x080, NO_DUMP )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1995, pve500, 0, 0, pve500, pve500, pve500_state, pve500, "SONY", "PVE-500", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1995, pve500, 0, 0, pve500, pve500, pve500_state, pve500, "SONY", "PVE-500", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)
diff --git a/src/mame/drivers/pwrview.cpp b/src/mame/drivers/pwrview.cpp
index a0ed78c2b49..be24d194c5c 100644
--- a/src/mame/drivers/pwrview.cpp
+++ b/src/mame/drivers/pwrview.cpp
@@ -347,7 +347,7 @@ static SLOT_INTERFACE_START(pwrview_floppies)
SLOT_INTERFACE("525dd", FLOPPY_525_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( pwrview, pwrview_state )
+static MACHINE_CONFIG_START( pwrview )
MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(pwrview_map)
MCFG_CPU_DECRYPTED_OPCODES_MAP(pwrview_fetch_map)
@@ -390,4 +390,4 @@ ROM_START(pwrview)
ROMX_LOAD("215856-004.bin", 0x0001, 0x4000, CRC(4fd01e0a) SHA1(c4d1d40d4e8e529c03857f4a3c8428ccf6b8ff99), ROM_SKIP(1) | ROM_BIOS(1))
ROM_END
-COMP(1984, pwrview, 0, 0, pwrview, 0, driver_device, 0, "Compugraphic", "MCS PowerView 10", MACHINE_NOT_WORKING)
+COMP(1984, pwrview, 0, 0, pwrview, 0, pwrview_state, 0, "Compugraphic", "MCS PowerView 10", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index 0a5d764f8ba..b443ebf74d2 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -1473,7 +1473,7 @@ PALETTE_INIT_MEMBER( px4p_state, px4p )
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( px4, px4_state )
+static MACHINE_CONFIG_START( px4 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_7_3728MHz / 2) // uPD70008
MCFG_CPU_PROGRAM_MAP(px4_mem)
@@ -1539,7 +1539,7 @@ static MACHINE_CONFIG_START( px4, px4_state )
MCFG_SOFTWARE_LIST_ADD("epson_cpm_list", "epson_cpm")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( px4p, px4, px4p_state )
+static MACHINE_CONFIG_DERIVED( px4p, px4 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(px4p_io)
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index a443bb7ddfd..4d4392789bc 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -758,7 +758,7 @@ void px8_state::machine_reset()
MACHINE DRIVERS
***************************************************************************/
-static MACHINE_CONFIG_START( px8, px8_state )
+static MACHINE_CONFIG_START( px8 )
/* main cpu (uPD70008) */
MCFG_CPU_ADD(UPD70008_TAG, Z80, XTAL_CR1 / 4) /* 2.45 MHz */
MCFG_CPU_PROGRAM_MAP(px8_mem)
@@ -841,5 +841,5 @@ ROM_END
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, px8, 0, 0, px8, px8, driver_device, 0, "Epson", "PX-8", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, px8, 0, 0, px8, px8, px8_state, 0, "Epson", "PX-8", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp
index fc6cc6250db..d99b9ea2cce 100644
--- a/src/mame/drivers/pyl601.cpp
+++ b/src/mame/drivers/pyl601.cpp
@@ -529,7 +529,7 @@ static GFXDECODE_START( pyl601a )
GFXDECODE_ENTRY( "chargen", 0x0000, pyl601a_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( pyl601, pyl601_state )
+static MACHINE_CONFIG_START( pyl601 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6800, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(pyl601_mem)
@@ -623,6 +623,6 @@ ROM_START( pyl601a )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, pyl601, 0, 0, pyl601, pyl601, pyl601_state, pyl601, "Mikroelektronika", "Pyldin-601", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1989, pyl601, 0, 0, pyl601, pyl601, pyl601_state, pyl601, "Mikroelektronika", "Pyldin-601", 0 )
COMP( 1989, pyl601a, pyl601, 0, pyl601a, pyl601, pyl601_state, pyl601, "Mikroelektronika", "Pyldin-601A", 0 )
diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp
index b117c8ee69c..22ad241f134 100644
--- a/src/mame/drivers/pyson.cpp
+++ b/src/mame/drivers/pyson.cpp
@@ -193,7 +193,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( pyson )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( pyson, pyson_state )
+static MACHINE_CONFIG_START( pyson )
MCFG_CPU_ADD("maincpu", R5000LE, 294000000) // imported from namcops2.c driver
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
@@ -251,6 +251,6 @@ ROM_START( wswe2k3 )
ROM_END
-GAME(2002, pyson, 0, pyson, pyson, driver_device, 0, ROT0, "Konami", "Konami Pyson BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
-GAME(2002, wswe, pyson, pyson, pyson, driver_device, 0, ROT0, "Konami", "World Soccer Winning Eleven Arcade Game Style", MACHINE_IS_SKELETON)
-GAME(2003, wswe2k3, pyson, pyson, pyson, driver_device, 0, ROT0, "Konami", "World Soccer Winning Eleven Arcade Game 2003", MACHINE_IS_SKELETON)
+GAME(2002, pyson, 0, pyson, pyson, pyson_state, 0, ROT0, "Konami", "Konami Pyson BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT)
+GAME(2002, wswe, pyson, pyson, pyson, pyson_state, 0, ROT0, "Konami", "World Soccer Winning Eleven Arcade Game Style", MACHINE_IS_SKELETON)
+GAME(2003, wswe2k3, pyson, pyson, pyson, pyson_state, 0, ROT0, "Konami", "World Soccer Winning Eleven Arcade Game 2003", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp
index 02d1e525624..37edec843bd 100644
--- a/src/mame/drivers/pzletime.cpp
+++ b/src/mame/drivers/pzletime.cpp
@@ -328,7 +328,7 @@ void pzletime_state::machine_reset()
m_ticket = 0;
}
-static MACHINE_CONFIG_START( pzletime, pzletime_state )
+static MACHINE_CONFIG_START( pzletime )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,10000000)
@@ -355,7 +355,7 @@ static MACHINE_CONFIG_START( pzletime, pzletime_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 937500, OKIM6295_PIN7_HIGH) //freq & pin7 taken from stlforce
+ MCFG_OKIM6295_ADD("oki", 937500, PIN7_HIGH) //freq & pin7 taken from stlforce
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -402,4 +402,4 @@ ROM_START( pzletime )
ROM_LOAD( "pzletime.nv", 0x0000, 0x0080, CRC(e5ed3d40) SHA1(8c163a6e5839e5c82d52f046d3268202fdf9f4d1) )
ROM_END
-GAME( 199?, pzletime, 0, pzletime, pzletime, driver_device, 0, ROT0, "Elettronica Video-Games S.R.L.", "Puzzle Time (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, pzletime, 0, pzletime, pzletime, pzletime_state, 0, ROT0, "Elettronica Video-Games S.R.L.", "Puzzle Time (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp
index 0bcd0eb87cc..d71cdd035e0 100644
--- a/src/mame/drivers/qdrmfgp.cpp
+++ b/src/mame/drivers/qdrmfgp.cpp
@@ -574,7 +574,7 @@ void qdrmfgp_state::machine_reset()
* Machine driver
*
*************************************/
-static MACHINE_CONFIG_START( qdrmfgp, qdrmfgp_state )
+static MACHINE_CONFIG_START( qdrmfgp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.000 MHz */
@@ -618,7 +618,7 @@ static MACHINE_CONFIG_START( qdrmfgp, qdrmfgp_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( qdrmfgp2, qdrmfgp_state )
+static MACHINE_CONFIG_START( qdrmfgp2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16.000 MHz */
@@ -709,6 +709,6 @@ ROM_END
*
*************************************/
-/* year rom clone machine inputs init */
-GAME( 1994, qdrmfgp, 0, qdrmfgp, qdrmfgp, driver_device, 0, ROT0, "Konami", "Quiz Do Re Mi Fa Grand Prix (Japan)", 0 )
-GAME( 1995, qdrmfgp2, 0, qdrmfgp2, qdrmfgp2, driver_device, 0, ROT0, "Konami", "Quiz Do Re Mi Fa Grand Prix 2 - Shin-Kyoku Nyuukadayo (Japan)", 0 )
+/* year rom clone machine inputs state init */
+GAME( 1994, qdrmfgp, 0, qdrmfgp, qdrmfgp, qdrmfgp_state, 0, ROT0, "Konami", "Quiz Do Re Mi Fa Grand Prix (Japan)", 0 )
+GAME( 1995, qdrmfgp2, 0, qdrmfgp2, qdrmfgp2, qdrmfgp_state, 0, ROT0, "Konami", "Quiz Do Re Mi Fa Grand Prix 2 - Shin-Kyoku Nyuukadayo (Japan)", 0 )
diff --git a/src/mame/drivers/qix.cpp b/src/mame/drivers/qix.cpp
index 494878f171e..6e9ab4c07f2 100644
--- a/src/mame/drivers/qix.cpp
+++ b/src/mame/drivers/qix.cpp
@@ -598,7 +598,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( qix_base, qix_state )
+static MACHINE_CONFIG_START( qix_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK_OSC/4/4) /* 1.25 MHz */
@@ -1450,21 +1450,21 @@ DRIVER_INIT_MEMBER(qix_state,slither)
*
*************************************/
-GAME( 1981, qix, 0, qix, qix, driver_device, 0, ROT270, "Taito America Corporation", "Qix (Rev 2)", MACHINE_SUPPORTS_SAVE ) // newest set? closest to 'qix2'
-GAME( 1981, qixa, qix, qix, qix, driver_device, 0, ROT270, "Taito America Corporation", "Qix (set 2, smaller roms)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, qixb, qix, qix, qix, driver_device, 0, ROT270, "Taito America Corporation", "Qix (set 2, larger roms)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, qixo, qix, qix, qix, driver_device, 0, ROT270, "Taito America Corporation", "Qix (set 3, earlier)", MACHINE_SUPPORTS_SAVE ) // oldest set / prototype? has incorrect spelling 'deutch' and doesn't allow language selection to be changed
-GAME( 1981, qix2, qix, qix, qix, driver_device, 0, ROT270, "Taito America Corporation", "Qix II (Tournament)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, sdungeon, 0, mcu, sdungeon, driver_device, 0, ROT270, "Taito America Corporation", "Space Dungeon", MACHINE_SUPPORTS_SAVE ) // actually released July 1982
-GAME( 1981, sdungeona, sdungeon,mcu, sdungeon, driver_device, 0, ROT270, "Taito America Corporation", "Space Dungeon (larger roms)", MACHINE_SUPPORTS_SAVE ) // same as above but uses larger ROMs
-GAMEL(1982, elecyoyo, 0, mcu, elecyoyo, driver_device, 0, ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 1)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
-GAMEL(1982, elecyoyo2,elecyoyo, mcu, elecyoyo, driver_device, 0, ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 2)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
-GAME( 1982, kram, 0, mcu, kram, driver_device, 0, ROT0, "Taito America Corporation", "Kram (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kram2, kram, mcu, kram, driver_device, 0, ROT0, "Taito America Corporation", "Kram (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kram3, kram, kram3, kram, qix_state, kram3, ROT0, "Taito America Corporation", "Kram (encrypted)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zookeep, 0, zookeep, zookeep, qix_state, zookeep, ROT0, "Taito America Corporation", "Zoo Keeper (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zookeep2, zookeep, zookeep, zookeep, qix_state, zookeep, ROT0, "Taito America Corporation", "Zoo Keeper (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zookeep3, zookeep, zookeep, zookeep, qix_state, zookeep, ROT0, "Taito America Corporation", "Zoo Keeper (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, slither, 0, slither, slither, qix_state, slither, ROT270, "Century II", "Slither (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, slithera, slither, slither, slither, qix_state, slither, ROT270, "Century II", "Slither (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, complexx, 0, qix, complexx, driver_device, 0, ROT270, "Taito America Corporation", "Complex X", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, qix, 0, qix, qix, qix_state, 0, ROT270, "Taito America Corporation", "Qix (Rev 2)", MACHINE_SUPPORTS_SAVE ) // newest set? closest to 'qix2'
+GAME( 1981, qixa, qix, qix, qix, qix_state, 0, ROT270, "Taito America Corporation", "Qix (set 2, smaller roms)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, qixb, qix, qix, qix, qix_state, 0, ROT270, "Taito America Corporation", "Qix (set 2, larger roms)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, qixo, qix, qix, qix, qix_state, 0, ROT270, "Taito America Corporation", "Qix (set 3, earlier)", MACHINE_SUPPORTS_SAVE ) // oldest set / prototype? has incorrect spelling 'deutch' and doesn't allow language selection to be changed
+GAME( 1981, qix2, qix, qix, qix, qix_state, 0, ROT270, "Taito America Corporation", "Qix II (Tournament)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, sdungeon, 0, mcu, sdungeon, qix_state, 0, ROT270, "Taito America Corporation", "Space Dungeon", MACHINE_SUPPORTS_SAVE ) // actually released July 1982
+GAME( 1981, sdungeona, sdungeon,mcu, sdungeon, qix_state, 0, ROT270, "Taito America Corporation", "Space Dungeon (larger roms)", MACHINE_SUPPORTS_SAVE ) // same as above but uses larger ROMs
+GAMEL(1982, elecyoyo, 0, mcu, elecyoyo, qix_state, 0, ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 1)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
+GAMEL(1982, elecyoyo2,elecyoyo, mcu, elecyoyo, qix_state, 0, ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 2)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
+GAME( 1982, kram, 0, mcu, kram, qix_state, 0, ROT0, "Taito America Corporation", "Kram (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kram2, kram, mcu, kram, qix_state, 0, ROT0, "Taito America Corporation", "Kram (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kram3, kram, kram3, kram, qix_state, kram3, ROT0, "Taito America Corporation", "Kram (encrypted)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeep, 0, zookeep, zookeep, qix_state, zookeep, ROT0, "Taito America Corporation", "Zoo Keeper (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeep2, zookeep, zookeep, zookeep, qix_state, zookeep, ROT0, "Taito America Corporation", "Zoo Keeper (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeep3, zookeep, zookeep, zookeep, qix_state, zookeep, ROT0, "Taito America Corporation", "Zoo Keeper (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, slither, 0, slither, slither, qix_state, slither, ROT270, "Century II", "Slither (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, slithera, slither, slither, slither, qix_state, slither, ROT270, "Century II", "Slither (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, complexx, 0, qix, complexx, qix_state, 0, ROT270, "Taito America Corporation", "Complex X", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp
index b845607ebd7..652b93563dc 100644
--- a/src/mame/drivers/ql.cpp
+++ b/src/mame/drivers/ql.cpp
@@ -149,9 +149,9 @@ public:
required_device<rs232_port_device> m_ser1;
required_device<rs232_port_device> m_ser2;
required_device<ram_device> m_ram;
- required_device<ql_expansion_slot_t> m_exp;
- required_device<ql_rom_cartridge_slot_t> m_cart;
- optional_device<qimi_t> m_qimi;
+ required_device<ql_expansion_slot_device> m_exp;
+ required_device<ql_rom_cartridge_slot_device> m_cart;
+ optional_device<qimi_device> m_qimi;
required_memory_region m_rom;
required_ioport_array<8> m_y;
required_ioport_array<2> m_joy;
@@ -888,7 +888,7 @@ void ql_state::machine_reset()
// MACHINE_CONFIG( ql )
//-------------------------------------------------
-static MACHINE_CONFIG_START( ql, ql_state )
+static MACHINE_CONFIG_START( ql )
// basic machine hardware
MCFG_CPU_ADD(M68008_TAG, M68008, X1/2)
MCFG_CPU_PROGRAM_MAP(ql_mem)
@@ -1259,15 +1259,15 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1984, ql, 0, 0, ql, ql, driver_device, 0, "Sinclair Research Ltd", "QL (UK)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, ql_us, ql, 0, ql_ntsc, ql, driver_device, 0, "Sinclair Research Ltd", "QL (USA)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, ql_es, ql, 0, ql, ql_es, driver_device, 0, "Sinclair Research Ltd", "QL (Spain)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, ql_fr, ql, 0, ql, ql_fr, driver_device, 0, "Sinclair Research Ltd", "QL (France)", MACHINE_NOT_WORKING )
-COMP( 1985, ql_de, ql, 0, ql, ql_de, driver_device, 0, "Sinclair Research Ltd", "QL (Germany)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, ql_it, ql, 0, ql, ql_it, driver_device, 0, "Sinclair Research Ltd", "QL (Italy)", MACHINE_SUPPORTS_SAVE )
-COMP( 1985, ql_se, ql, 0, ql, ql_se, driver_device, 0, "Sinclair Research Ltd", "QL (Sweden)", MACHINE_NOT_WORKING )
-COMP( 1985, ql_dk, ql, 0, ql, ql_dk, driver_device, 0, "Sinclair Research Ltd", "QL (Denmark)", MACHINE_NOT_WORKING )
-COMP( 1985, ql_gr, ql, 0, ql, ql, driver_device, 0, "Sinclair Research Ltd", "QL (Greece)", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, tonto, 0, 0, opd, ql, driver_device, 0, "British Telecom Business Systems", "Merlin M1800 Tonto", MACHINE_NOT_WORKING )
-//COMP( 1986, megaopd,tonto, 0, megaopd, ql, driver_device, 0, "International Computer Limited", "MegaOPD (USA)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, ql, 0, 0, ql, ql, ql_state, 0, "Sinclair Research Ltd", "QL (UK)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, ql_us, ql, 0, ql_ntsc, ql, ql_state, 0, "Sinclair Research Ltd", "QL (USA)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, ql_es, ql, 0, ql, ql_es, ql_state, 0, "Sinclair Research Ltd", "QL (Spain)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, ql_fr, ql, 0, ql, ql_fr, ql_state, 0, "Sinclair Research Ltd", "QL (France)", MACHINE_NOT_WORKING )
+COMP( 1985, ql_de, ql, 0, ql, ql_de, ql_state, 0, "Sinclair Research Ltd", "QL (Germany)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, ql_it, ql, 0, ql, ql_it, ql_state, 0, "Sinclair Research Ltd", "QL (Italy)", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, ql_se, ql, 0, ql, ql_se, ql_state, 0, "Sinclair Research Ltd", "QL (Sweden)", MACHINE_NOT_WORKING )
+COMP( 1985, ql_dk, ql, 0, ql, ql_dk, ql_state, 0, "Sinclair Research Ltd", "QL (Denmark)", MACHINE_NOT_WORKING )
+COMP( 1985, ql_gr, ql, 0, ql, ql, ql_state, 0, "Sinclair Research Ltd", "QL (Greece)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, tonto, 0, 0, opd, ql, ql_state, 0, "British Telecom Business Systems", "Merlin M1800 Tonto", MACHINE_NOT_WORKING )
+//COMP( 1986, megaopd,tonto, 0, megaopd, ql, ql_state, 0, "International Computer Limited", "MegaOPD (USA)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/qtsbc.cpp b/src/mame/drivers/qtsbc.cpp
index 124baacaa47..b1e64cb99e7 100644
--- a/src/mame/drivers/qtsbc.cpp
+++ b/src/mame/drivers/qtsbc.cpp
@@ -31,7 +31,7 @@ public:
required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER( qtsbc_06_r );
DECLARE_READ8_MEMBER( qtsbc_43_r );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
required_shared_ptr<uint8_t> m_p_ram;
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -73,12 +73,12 @@ void qtsbc_state::machine_reset()
memcpy(m_p_ram, bios, 0x800);
}
-WRITE8_MEMBER( qtsbc_state::kbd_put )
+void qtsbc_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( qtsbc, qtsbc_state )
+static MACHINE_CONFIG_START( qtsbc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // Mostek MK3880
MCFG_CPU_PROGRAM_MAP(qtsbc_mem)
@@ -86,7 +86,7 @@ static MACHINE_CONFIG_START( qtsbc, qtsbc_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(qtsbc_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(qtsbc_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -97,5 +97,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, qtsbc, 0, 0, qtsbc, qtsbc, driver_device, 0, "Computer Systems Inc.", "QT SBC +2/4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 19??, qtsbc, 0, 0, qtsbc, qtsbc, qtsbc_state, 0, "Computer Systems Inc.", "QT SBC +2/4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp
index f2b9c1d734c..c9c72cc2171 100644
--- a/src/mame/drivers/quakeat.cpp
+++ b/src/mame/drivers/quakeat.cpp
@@ -116,7 +116,7 @@ void quakeat_state::machine_start()
}
/*************************************************************/
-static MACHINE_CONFIG_START( quake, quakeat_state )
+static MACHINE_CONFIG_START( quake )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM2, 233000000) /* Pentium II, 233MHz */
MCFG_CPU_PROGRAM_MAP(quake_map)
@@ -148,4 +148,4 @@ ROM_START(quake)
ROM_END
-GAME( 1998, quake, 0, quake, quake, driver_device, 0, ROT0, "Lazer-Tron / iD Software", "Quake Arcade Tournament (Release Beta 2)", MACHINE_IS_SKELETON )
+GAME( 1998, quake, 0, quake, quake, quakeat_state, 0, ROT0, "Lazer-Tron / iD Software", "Quake Arcade Tournament (Release Beta 2)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index ca30f154fd7..eba48b2e37d 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -264,7 +264,7 @@ DISCRETE_SOUND_END
*
*************************************/
-static MACHINE_CONFIG_START( quantum, quantum_state )
+static MACHINE_CONFIG_START( quantum )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK / 2)
@@ -397,6 +397,6 @@ ROM_END
*
*************************************/
-GAME( 1982, quantum, 0, quantum, quantum, driver_device, 0, ROT270, "General Computer Corporation (Atari license)", "Quantum (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, quantum1, quantum, quantum, quantum, driver_device, 0, ROT270, "General Computer Corporation (Atari license)", "Quantum (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, quantump, quantum, quantum, quantum, driver_device, 0, ROT270, "General Computer Corporation (Atari license)", "Quantum (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, quantum, 0, quantum, quantum, quantum_state, 0, ROT270, "General Computer Corporation (Atari license)", "Quantum (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, quantum1, quantum, quantum, quantum, quantum_state, 0, ROT270, "General Computer Corporation (Atari license)", "Quantum (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, quantump, quantum, quantum, quantum, quantum_state, 0, ROT270, "General Computer Corporation (Atari license)", "Quantum (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp
index 9a7a7df3469..3f431eae339 100644
--- a/src/mame/drivers/quasar.cpp
+++ b/src/mame/drivers/quasar.cpp
@@ -294,7 +294,7 @@ MACHINE_RESET_MEMBER(quasar_state,quasar)
m_io_page = 8;
}
-static MACHINE_CONFIG_START( quasar, quasar_state )
+static MACHINE_CONFIG_START( quasar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 14318000/4) /* 14 mhz crystal divide by 4 on board */
@@ -408,5 +408,5 @@ ROM_START( quasara )
ROM_END
-GAME( 1980, quasar, 0, quasar, quasar, driver_device, 0, ROT90, "Zaccaria / Zelco", "Quasar (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, quasara, quasar, quasar, quasar, driver_device, 0, ROT90, "Zaccaria / Zelco", "Quasar (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, quasar, 0, quasar, quasar, quasar_state, 0, ROT90, "Zaccaria / Zelco", "Quasar (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, quasara, quasar, quasar, quasar, quasar_state, 0, ROT90, "Zaccaria / Zelco", "Quasar (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/queen.cpp b/src/mame/drivers/queen.cpp
index 161ba40f197..2c697434347 100644
--- a/src/mame/drivers/queen.cpp
+++ b/src/mame/drivers/queen.cpp
@@ -270,7 +270,7 @@ void queen_state::machine_reset()
-static MACHINE_CONFIG_START( queen, queen_state )
+static MACHINE_CONFIG_START( queen )
MCFG_CPU_ADD("maincpu", PENTIUM3, 533000000/16) // Celeron or Pentium 3, 533 Mhz
MCFG_CPU_PROGRAM_MAP(queen_map)
MCFG_CPU_IO_MAP(queen_io)
@@ -308,4 +308,4 @@ ROM_START( queen )
ROM_END
-GAME( 2002?, queen, 0, queen, at_keyboard, driver_device, 0, ROT0, "STG", "Queen?", MACHINE_IS_SKELETON )
+GAME( 2002?, queen, 0, queen, at_keyboard, queen_state, 0, ROT0, "STG", "Queen?", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp
index c500ce37ecb..e1cacaf7621 100644
--- a/src/mame/drivers/quizdna.cpp
+++ b/src/mame/drivers/quizdna.cpp
@@ -435,7 +435,7 @@ void quizdna_state::machine_start()
}
-static MACHINE_CONFIG_START( quizdna, quizdna_state )
+static MACHINE_CONFIG_START( quizdna )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MCLK/2) /* 8.000 MHz */
@@ -467,7 +467,7 @@ static MACHINE_CONFIG_START( quizdna, quizdna_state )
MCFG_SOUND_ROUTE(2, "mono", 0.10)
MCFG_SOUND_ROUTE(3, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", (MCLK/1024)*132, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", (MCLK/1024)*132, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_CONFIG_END
@@ -568,6 +568,6 @@ ROM_START( gekiretu )
ROM_LOAD( "quiz3.148", 0x000000, 0x000020, CRC(91267e8a) SHA1(ae5bd8efea5322c4d9986d06680a781392f9a642) )
ROM_END
-GAME( 1991, gakupara, 0, gakupara, gakupara, driver_device, 0, ROT0, "NMK", "Quiz Gakuen Paradise (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, quizdna, 0, quizdna, quizdna, driver_device, 0, ROT0, "Face", "Quiz DNA no Hanran (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, gekiretu, 0, gekiretu, gekiretu, driver_device, 0, ROT0, "Face", "Quiz Gekiretsu Scramble (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, gakupara, 0, gakupara, gakupara, quizdna_state, 0, ROT0, "NMK", "Quiz Gakuen Paradise (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, quizdna, 0, quizdna, quizdna, quizdna_state, 0, ROT0, "Face", "Quiz DNA no Hanran (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, gekiretu, 0, gekiretu, gekiretu, quizdna_state, 0, ROT0, "Face", "Quiz Gekiretsu Scramble (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp
index cbcf43a90f4..da6ad3834d2 100644
--- a/src/mame/drivers/quizo.cpp
+++ b/src/mame/drivers/quizo.cpp
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( quizo )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( quizo, quizo_state )
+static MACHINE_CONFIG_START( quizo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL1/2)
MCFG_CPU_PROGRAM_MAP(memmap)
diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp
index 2ec0fe4fa5f..91cdf6ae4c6 100644
--- a/src/mame/drivers/quizpani.cpp
+++ b/src/mame/drivers/quizpani.cpp
@@ -193,7 +193,7 @@ static GFXDECODE_START( quizpani )
GFXDECODE_END
-static MACHINE_CONFIG_START( quizpani, quizpani_state )
+static MACHINE_CONFIG_START( quizpani )
MCFG_CPU_ADD("maincpu", M68000, 10000000)
MCFG_CPU_PROGRAM_MAP(quizpani_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", quizpani_state, irq4_line_hold)
@@ -214,7 +214,7 @@ static MACHINE_CONFIG_START( quizpani, quizpani_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 16000000/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 16000000/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -248,4 +248,4 @@ ROM_START( quizpani )
ROM_LOAD( "qz8.121", 0x200, 0x100, CRC(b4c19741) SHA1(a6d3686bad6ef2336463b89bc2d249003d9b4bcc) ) /* unknown */
ROM_END
-GAME( 1993, quizpani, 0, quizpani, quizpani, driver_device, 0, ROT0, "NMK", "Quiz Panicuru Fantasy", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, quizpani, 0, quizpani, quizpani, quizpani_state, 0, ROT0, "NMK", "Quiz Panicuru Fantasy", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp
index a440a716014..477466592c2 100644
--- a/src/mame/drivers/quizpun2.cpp
+++ b/src/mame/drivers/quizpun2.cpp
@@ -681,7 +681,7 @@ GFXDECODE_END
Machine Drivers
***************************************************************************/
-static MACHINE_CONFIG_START( quizpun2, quizpun2_state )
+static MACHINE_CONFIG_START( quizpun2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2) // 4 MHz
MCFG_CPU_PROGRAM_MAP(quizpun2_map)
@@ -811,5 +811,5 @@ ROM_START( quizpun )
ROM_LOAD( "93c46eeprom.bin", 0, 0x80, CRC(4d244cc8) SHA1(6593d5b7ac1ebb77fee4648ad1d3d9b59a25fdc8) BAD_DUMP ) // backup ram error
ROM_END
-GAME( 1988, quizpun, 0, quizpun, quizpun2, driver_device, 0, ROT270, "Space Computer", "Quiz Punch", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, quizpun2, 0, quizpun2, quizpun2, driver_device, 0, ROT270, "Space Computer", "Quiz Punch II", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1988, quizpun, 0, quizpun, quizpun2, quizpun2_state, 0, ROT270, "Space Computer", "Quiz Punch", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, quizpun2, 0, quizpun2, quizpun2, quizpun2_state, 0, ROT270, "Space Computer", "Quiz Punch II", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 3bc63a6bb56..3bbbdc0e8a8 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -378,7 +378,7 @@ void quizshow_state::machine_reset()
m_tape_head_pos = 0;
}
-static MACHINE_CONFIG_START( quizshow, quizshow_state )
+static MACHINE_CONFIG_START( quizshow )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, MASTER_CLOCK / 16) // divider guessed
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index 39d88731b0d..1d8db52b5ed 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -665,7 +665,7 @@ static SLOT_INTERFACE_START(keyboard)
SLOT_INTERFACE("qx10", QX10_KEYBOARD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( qx10, qx10_state )
+static MACHINE_CONFIG_START( qx10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, MAIN_CLK / 4)
MCFG_CPU_PROGRAM_MAP(qx10_mem)
@@ -788,5 +788,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, qx10, 0, 0, qx10, qx10, driver_device, 0, "Epson", "QX-10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, qx10, 0, 0, qx10, qx10, qx10_state, 0, "Epson", "QX-10", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp
index 0e74270699c..b12dd0b949a 100644
--- a/src/mame/drivers/r2dtank.cpp
+++ b/src/mame/drivers/r2dtank.cpp
@@ -441,7 +441,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( r2dtank, r2dtank_state )
+static MACHINE_CONFIG_START( r2dtank )
MCFG_CPU_ADD("maincpu", M6809,3000000) /* ?? too fast ? */
MCFG_CPU_PROGRAM_MAP(r2dtank_main_map)
@@ -532,4 +532,4 @@ ROM_END
*
*************************************/
-GAME( 1980, r2dtank, 0, r2dtank, r2dtank, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "R2D Tank", MACHINE_SUPPORTS_SAVE)
+GAME( 1980, r2dtank, 0, r2dtank, r2dtank, r2dtank_state, 0, ROT270, "Sigma Enterprises Inc.", "R2D Tank", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp
index 4e876c7a23c..6752f8bf864 100644
--- a/src/mame/drivers/r2dx_v33.cpp
+++ b/src/mame/drivers/r2dx_v33.cpp
@@ -764,7 +764,7 @@ static ADDRESS_MAP_START( r2dx_oki_map, AS_0, 8, r2dx_v33_state )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( rdx_v33, r2dx_v33_state )
+static MACHINE_CONFIG_START( rdx_v33 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V33, 32000000/2 ) // ?
@@ -796,12 +796,12 @@ static MACHINE_CONFIG_START( rdx_v33, r2dx_v33_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_28_63636MHz/28, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MCFG_DEVICE_ADDRESS_MAP(AS_0, r2dx_oki_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nzerotea, r2dx_v33_state )
+static MACHINE_CONFIG_START( nzerotea )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V33,XTAL_32MHz/2) /* verified on pcb */
@@ -838,7 +838,7 @@ static MACHINE_CONFIG_START( nzerotea, r2dx_v33_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
diff --git a/src/mame/drivers/r9751.cpp b/src/mame/drivers/r9751.cpp
index 1133dc90ca5..bfe5d8591bc 100644
--- a/src/mame/drivers/r9751.cpp
+++ b/src/mame/drivers/r9751.cpp
@@ -492,7 +492,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( r9751, r9751_state )
+static MACHINE_CONFIG_START( r9751 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68030, 20000000)
MCFG_CPU_PROGRAM_MAP(r9751_mem)
@@ -536,5 +536,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, r9751, 0, 0, r9751, r9751, r9751_state, r9751, "ROLM Systems, Inc.", "ROLM 9751 Model 10", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1988, r9751, 0, 0, r9751, r9751, r9751_state, r9751, "ROLM Systems, Inc.", "ROLM 9751 Model 10", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index c3ce3d5cc11..8fa73b9ec36 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -898,7 +898,7 @@ INTERRUPT_GEN_MEMBER(rabbit_state::vblank_interrupt)
m_maincpu->set_input_line(m_vblirqlevel, HOLD_LINE);
}
-static MACHINE_CONFIG_START( rabbit, rabbit_state )
+static MACHINE_CONFIG_START( rabbit )
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_24MHz)
MCFG_CPU_PROGRAM_MAP(rabbit_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rabbit_state, vblank_interrupt)
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index e63771694aa..873f6265f88 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -343,7 +343,7 @@ GFXDECODE_END
/* Machine driver */
-static MACHINE_CONFIG_START( radio86, radio86_state )
+static MACHINE_CONFIG_START( radio86 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_16MHz / 9)
MCFG_CPU_PROGRAM_MAP(radio86_mem)
@@ -554,15 +554,15 @@ ROM_START( impuls03 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, radio86, 0, 0, radio86, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK", 0)
-COMP( 1986, radio16, radio86, 0, radio16, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK (16K RAM)", 0)
-COMP( 1986, kr03, radio86, 0, radio86, radio86, radio86_state, radio86, "Elektronika", "KR-03", 0)
-COMP( 1986, radio4k, radio86, 0, radio86, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK (4K ROM)", 0)
-COMP( 1986, radiorom, radio86, 0, radiorom, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK (ROM-Disk)", 0)
-COMP( 1986, radioram, radio86, 0, radioram, radio86, radio86_state, radioram, "<unknown>", "Radio-86RK (ROM/RAM Disk)", 0)
-COMP( 1986, spektr01, radio86, 0, radio86, radio86, radio86_state, radio86, "<unknown>", "Spektr-001", 0)
-COMP( 1986, rk7007, radio86, 0, rk7007, ms7007, radio86_state, radio86, "<unknown>", "Radio-86RK (MS7007)", 0)
-COMP( 1986, rk700716, radio86, 0, rk700716, ms7007, radio86_state, radio86, "<unknown>", "Radio-86RK (MS7007 16K RAM)", 0)
-COMP( 1986, mikron2, radio86, 0, mikron2, radio86, radio86_state, radio86, "<unknown>", "Mikron-2", 0)
-COMP( 1986, impuls03, radio86, 0, impuls03, radio86, radio86_state, radio86, "<unknown>", "Impuls-03", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, radio86, 0, 0, radio86, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK", 0 )
+COMP( 1986, radio16, radio86, 0, radio16, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK (16K RAM)", 0 )
+COMP( 1986, kr03, radio86, 0, radio86, radio86, radio86_state, radio86, "Elektronika", "KR-03", 0 )
+COMP( 1986, radio4k, radio86, 0, radio86, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK (4K ROM)", 0 )
+COMP( 1986, radiorom, radio86, 0, radiorom, radio86, radio86_state, radio86, "<unknown>", "Radio-86RK (ROM-Disk)", 0 )
+COMP( 1986, radioram, radio86, 0, radioram, radio86, radio86_state, radioram, "<unknown>", "Radio-86RK (ROM/RAM Disk)", 0 )
+COMP( 1986, spektr01, radio86, 0, radio86, radio86, radio86_state, radio86, "<unknown>", "Spektr-001", 0 )
+COMP( 1986, rk7007, radio86, 0, rk7007, ms7007, radio86_state, radio86, "<unknown>", "Radio-86RK (MS7007)", 0 )
+COMP( 1986, rk700716, radio86, 0, rk700716, ms7007, radio86_state, radio86, "<unknown>", "Radio-86RK (MS7007 16K RAM)", 0 )
+COMP( 1986, mikron2, radio86, 0, mikron2, radio86, radio86_state, radio86, "<unknown>", "Mikron-2", 0 )
+COMP( 1986, impuls03, radio86, 0, impuls03, radio86, radio86_state, radio86, "<unknown>", "Impuls-03", 0 )
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp
index de80fe7ee40..9e5eb1b54f7 100644
--- a/src/mame/drivers/raiden.cpp
+++ b/src/mame/drivers/raiden.cpp
@@ -318,7 +318,7 @@ INTERRUPT_GEN_MEMBER(raiden_state::raiden_interrupt)
device.execute().set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); /* VBL */
}
-static MACHINE_CONFIG_START( raiden, raiden_state )
+static MACHINE_CONFIG_START( raiden )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
@@ -357,7 +357,7 @@ static MACHINE_CONFIG_START( raiden, raiden_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) // frequency and pin 7 verified
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // frequency and pin 7 verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -779,7 +779,7 @@ GAME( 1990, raidenk, raiden, raiden, raiden, raiden_state, raiden, ROT270, "
GAME( 1990, raidenkb, raiden, raiden, raiden, raiden_state, raiden, ROT270, "bootleg", "Raiden (Korea, bootleg)", MACHINE_SUPPORTS_SAVE )
/* Alternate hardware; SEI8904 + SEI9008 PCBs. Main & Sub CPU code not encrypted */
-GAME( 1990, raidenua, raiden, raidenu, raiden, driver_device, 0, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, raidenua, raiden, raidenu, raiden, raiden_state, 0, ROT270, "Seibu Kaihatsu (Fabtek license)", "Raiden (US set 2)", MACHINE_SUPPORTS_SAVE )
/* Alternate hardware. Main, Sub & Sound CPU code not encrypted. It also sports Seibu custom CRTC. */
-GAME( 1990, raidenb, raiden, raidenb, raiden, driver_device, 0, ROT270, "Seibu Kaihatsu", "Raiden (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, raidenb, raiden, raidenb, raiden, raiden_state, 0, ROT270, "Seibu Kaihatsu", "Raiden (set 3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp
index 2893c645da2..9e7b93f276c 100644
--- a/src/mame/drivers/raiden2.cpp
+++ b/src/mame/drivers/raiden2.cpp
@@ -1416,7 +1416,7 @@ GFXDECODE_END
/* MACHINE DRIVERS */
-static MACHINE_CONFIG_START( raiden2, raiden2_state )
+static MACHINE_CONFIG_START( raiden2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
@@ -1455,10 +1455,10 @@ static MACHINE_CONFIG_START( raiden2, raiden2_state )
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki1", XTAL_28_63636MHz/28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_28_63636MHz/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki2", XTAL_28_63636MHz/28, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL_28_63636MHz/28, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -1487,7 +1487,7 @@ static MACHINE_CONFIG_DERIVED( raidendx, raiden2 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( zeroteam, raiden2_state )
+static MACHINE_CONFIG_START( zeroteam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30,XTAL_32MHz/2) /* verified on pcb */
@@ -1526,7 +1526,7 @@ static MACHINE_CONFIG_START( zeroteam, raiden2_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000/* ? */, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000/* ? */, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index f80d79758d5..c254ee9c636 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -660,10 +660,10 @@ private:
required_device<cpu_device> m_i8088;
required_device<cpu_device> m_z80;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
optional_device<wd2010_device> m_hdc;
- required_device<corvus_hdc_t> m_corvus_hdc;
+ required_device<corvus_hdc_device> m_corvus_hdc;
required_device<upd7201_device> m_mpsc;
required_device<com8116_device> m_dbrg_A;
@@ -957,7 +957,7 @@ AM_RANGE(0x11, 0x11) AM_DEVREADWRITE("kbdser", i8251_device, status_r, control_w
// See boot rom @1EA6: 0x27 (<- RESET EXTENDED COMM OPTION )
// Corvus B/H harddisk controller (incompatible with EXT.COMM OPTION):
-AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("corvus", corvus_hdc_t, read, write)
+AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("corvus", corvus_hdc_device, read, write)
AM_RANGE(0x21, 0x21) AM_READ(corvus_status_r)
// ===========================================================
@@ -1032,14 +1032,14 @@ AM_RANGE(0x00, 0x00) AM_READWRITE(z80_latch_r, z80_latch_w)
AM_RANGE(0x20, 0x20) AM_READWRITE(z80_generalstat_r, z80_diskdiag_read_w) // read to port 0x20 used by MS-DOS 2.x diskette loader.
AM_RANGE(0x21, 0x21) AM_READWRITE(z80_generalstat_r, z80_diskdiag_write_w)
AM_RANGE(0x40, 0x40) AM_READWRITE(z80_diskstatus_r, z80_diskcontrol_w)
-AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(FD1793_TAG, fd1793_t, read, write)
+AM_RANGE(0x60, 0x63) AM_DEVREADWRITE(FD1793_TAG, fd1793_device, read, write)
// Z80 I/O shadow area > $80
AM_RANGE(0x80, 0x80) AM_READWRITE(z80_latch_r, z80_latch_w)
AM_RANGE(0xA0, 0xA0) AM_READWRITE(z80_generalstat_r, z80_diskdiag_read_w) // read to port 0x20 used by MS-DOS 2.x diskette loader.
AM_RANGE(0xA1, 0xA1) AM_READWRITE(z80_generalstat_r, z80_diskdiag_write_w)
AM_RANGE(0xC0, 0xC0) AM_READWRITE(z80_diskstatus_r, z80_diskcontrol_w)
-AM_RANGE(0xE0, 0xE3) AM_DEVREADWRITE(FD1793_TAG, fd1793_t, read, write)
+AM_RANGE(0xE0, 0xE3) AM_DEVREADWRITE(FD1793_TAG, fd1793_device, read, write)
ADDRESS_MAP_END
/* Input ports */
@@ -3210,7 +3210,7 @@ static ADDRESS_MAP_START( upd7220_map, AS_0, 16, rainbow_state)
AM_RANGE(0x00000, 0x3ffff) AM_READWRITE(vram_r, vram_w) AM_SHARE("vram")
ADDRESS_MAP_END
-static MACHINE_CONFIG_START(rainbow, rainbow_state)
+static MACHINE_CONFIG_START(rainbow)
MCFG_DEFAULT_LAYOUT(layout_rainbow)
/* basic machine hardware */
@@ -3458,7 +3458,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP(1982, rainbow100a, rainbow, 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 100-A", MACHINE_IS_SKELETON)
-COMP(1983, rainbow, 0, 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 100-B", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS)
-COMP(1985, rainbow190, rainbow, 0, rainbow, rainbow100b_in, driver_device, 0, "Digital Equipment Corporation", "Rainbow 190-B", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_COLORS)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP(1982, rainbow100a, rainbow, 0, rainbow, rainbow100b_in, rainbow_state, 0, "Digital Equipment Corporation", "Rainbow 100-A", MACHINE_IS_SKELETON)
+COMP(1983, rainbow, 0, 0, rainbow, rainbow100b_in, rainbow_state, 0, "Digital Equipment Corporation", "Rainbow 100-B", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS)
+COMP(1985, rainbow190, rainbow, 0, rainbow, rainbow100b_in, rainbow_state, 0, "Digital Equipment Corporation", "Rainbow 190-B", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_COLORS)
diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp
index 7ff9e2e5800..1e8b5cd881c 100644
--- a/src/mame/drivers/rallyx.cpp
+++ b/src/mame/drivers/rallyx.cpp
@@ -841,7 +841,7 @@ INTERRUPT_GEN_MEMBER(rallyx_state::jungler_vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( rallyx, rallyx_state )
+static MACHINE_CONFIG_START( rallyx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -885,7 +885,7 @@ static MACHINE_CONFIG_START( rallyx, rallyx_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jungler, rallyx_state )
+static MACHINE_CONFIG_START( jungler )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 3.072 MHz */
@@ -1409,20 +1409,20 @@ ROM_END
*
*************************************/
-GAME( 1980, rallyx, 0, rallyx, rallyx, driver_device, 0, ROT0, "Namco", "Rally X (32k Ver.?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, rallyxa, rallyx, rallyx, rallyx, driver_device, 0, ROT0, "Namco", "Rally X", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, rallyxm, rallyx, rallyx, rallyx, driver_device, 0, ROT0, "Namco (Midway license)", "Rally X (Midway)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, rallyxmr, rallyx, rallyx, rallyx, driver_device, 0, ROT0, "bootleg (Model Racing)", "Rally X (Model Racing bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, nrallyx, 0, rallyx, nrallyx, driver_device, 0, ROT0, "Namco", "New Rally X", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, nrallyxb, nrallyx, rallyx, nrallyx, driver_device, 0, ROT0, "Namco", "New Rally X (bootleg?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, jungler, 0, jungler, jungler, driver_device, 0, ROT90, "Konami", "Jungler", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, junglers, jungler, jungler, jungler, driver_device, 0, ROT90, "Konami (Stern Electronics license)", "Jungler (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, jackler, jungler, jungler, jungler, driver_device, 0, ROT90, "bootleg", "Jackler (Jungler bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, savanna, jungler, jungler, jungler, driver_device, 0, ROT90, "bootleg (Olympia)", "Savanna (Jungler bootleg)", MACHINE_SUPPORTS_SAVE ) // or licensed from Konami?
-GAME( 1982, tactcian, 0, tactcian, tactcian, driver_device, 0, ROT90, "Konami (Sega license)", "Tactician (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, tactcian2,tactcian, tactcian, tactcian, driver_device, 0, ROT90, "Konami (Sega license)", "Tactician (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, locomotn, 0, locomotn, locomotn, driver_device, 0, ROT90, "Konami (Centuri license)", "Loco-Motion", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, gutangtn, locomotn, locomotn, locomotn, driver_device, 0, ROT90, "Konami (Sega license)", "Guttang Gottong", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, cottong, locomotn, locomotn, locomotn, driver_device, 0, ROT90, "bootleg", "Cotocoto Cottong", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, locoboot, locomotn, locomotn, locomotn, driver_device, 0, ROT90, "bootleg", "Loco-Motion (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, commsega, 0, commsega, commsega, driver_device, 0, ROT90, "Sega", "Commando (Sega)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, rallyx, 0, rallyx, rallyx, rallyx_state, 0, ROT0, "Namco", "Rally X (32k Ver.?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, rallyxa, rallyx, rallyx, rallyx, rallyx_state, 0, ROT0, "Namco", "Rally X", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, rallyxm, rallyx, rallyx, rallyx, rallyx_state, 0, ROT0, "Namco (Midway license)", "Rally X (Midway)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, rallyxmr, rallyx, rallyx, rallyx, rallyx_state, 0, ROT0, "bootleg (Model Racing)", "Rally X (Model Racing bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, nrallyx, 0, rallyx, nrallyx, rallyx_state, 0, ROT0, "Namco", "New Rally X", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, nrallyxb, nrallyx, rallyx, nrallyx, rallyx_state, 0, ROT0, "Namco", "New Rally X (bootleg?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, jungler, 0, jungler, jungler, rallyx_state, 0, ROT90, "Konami", "Jungler", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, junglers, jungler, jungler, jungler, rallyx_state, 0, ROT90, "Konami (Stern Electronics license)", "Jungler (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, jackler, jungler, jungler, jungler, rallyx_state, 0, ROT90, "bootleg", "Jackler (Jungler bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, savanna, jungler, jungler, jungler, rallyx_state, 0, ROT90, "bootleg (Olympia)", "Savanna (Jungler bootleg)", MACHINE_SUPPORTS_SAVE ) // or licensed from Konami?
+GAME( 1982, tactcian, 0, tactcian, tactcian, rallyx_state, 0, ROT90, "Konami (Sega license)", "Tactician (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, tactcian2,tactcian, tactcian, tactcian, rallyx_state, 0, ROT90, "Konami (Sega license)", "Tactician (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, locomotn, 0, locomotn, locomotn, rallyx_state, 0, ROT90, "Konami (Centuri license)", "Loco-Motion", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, gutangtn, locomotn, locomotn, locomotn, rallyx_state, 0, ROT90, "Konami (Sega license)", "Guttang Gottong", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, cottong, locomotn, locomotn, locomotn, rallyx_state, 0, ROT90, "bootleg", "Cotocoto Cottong", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, locoboot, locomotn, locomotn, locomotn, rallyx_state, 0, ROT90, "bootleg", "Loco-Motion (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, commsega, 0, commsega, commsega, rallyx_state, 0, ROT90, "Sega", "Commando (Sega)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rambo.cpp b/src/mame/drivers/rambo.cpp
index 34dc5356d07..1f9c1f1d1ea 100644
--- a/src/mame/drivers/rambo.cpp
+++ b/src/mame/drivers/rambo.cpp
@@ -138,7 +138,7 @@ void rambo_state::machine_reset()
m_port_l = 0;
}
-static MACHINE_CONFIG_START( rambo, rambo_state )
+static MACHINE_CONFIG_START( rambo )
MCFG_CPU_ADD("maincpu", ATMEGA2560, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(rambo_prg_map)
@@ -223,5 +223,5 @@ ROM_START( metamaq2 )
ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP(2012, metamaq2, 0, 0, rambo, 0, rambo_state, rambo, "Metamaquina", "Metamaquina 2 desktop 3d printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP(2012, metamaq2, 0, 0, rambo, 0, rambo_state, rambo, "Metamaquina", "Metamaquina 2 desktop 3d printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp
index 7857d2ea4d3..e77fbbfb7d9 100644
--- a/src/mame/drivers/rampart.cpp
+++ b/src/mame/drivers/rampart.cpp
@@ -335,7 +335,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( rampart, rampart_state )
+static MACHINE_CONFIG_START( rampart )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
@@ -373,7 +373,7 @@ static MACHINE_CONFIG_START( rampart, rampart_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/4/3, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_SOUND_ADD("ymsnd", YM2413, MASTER_CLOCK/4)
@@ -496,6 +496,6 @@ DRIVER_INIT_MEMBER(rampart_state,rampart)
*
*************************************/
-GAME( 1990, rampart, 0, rampart, rampart, rampart_state, rampart, ROT0, "Atari Games", "Rampart (Trackball)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, rampart, 0, rampart, rampart, rampart_state, rampart, ROT0, "Atari Games", "Rampart (Trackball)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, rampart2p,rampart, rampart, ramprt2p, rampart_state, rampart, ROT0, "Atari Games", "Rampart (Joystick)", MACHINE_SUPPORTS_SAVE )
GAME( 1990, rampartj, rampart, rampart, rampartj, rampart_state, rampart, ROT0, "Atari Games", "Rampart (Japan, Joystick)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ramtek.cpp b/src/mame/drivers/ramtek.cpp
index 7fc1c8fc736..74f14a88032 100644
--- a/src/mame/drivers/ramtek.cpp
+++ b/src/mame/drivers/ramtek.cpp
@@ -69,7 +69,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -112,7 +112,7 @@ void ramtek_state::video_start()
{
}
-static MACHINE_CONFIG_START( ramtek, ramtek_state )
+static MACHINE_CONFIG_START( ramtek )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -242,10 +242,10 @@ ROM_START( trivia )
ROM_LOAD( "550548.e3", 0x0000, 0x0020, CRC(2b7c6a5e) SHA1(943cc3901c651bfe5bf11a40c27801952731b6de) )
ROM_END
-GAME( 1973, vollyrmt, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Volly (Ramtek) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1973, hockyrmt, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Hockey (Ramtek) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1973, soccrrmt, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Soccer (Ramtek) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1974, wipeormt, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Wipeout (Ramtek) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1974, cleanswp, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Clean Sweep [TTL]", MACHINE_IS_SKELETON )
-GAME( 1974, bballrmt, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Baseball (Ramtek) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1975, trivia, 0, ramtek, 0, driver_device, 0, ROT0, "Ramtek", "Trivia (Rev B) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1973, vollyrmt, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Volly (Ramtek) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1973, hockyrmt, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Hockey (Ramtek) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1973, soccrrmt, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Soccer (Ramtek) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1974, wipeormt, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Wipeout (Ramtek) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1974, cleanswp, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Clean Sweep [TTL]", MACHINE_IS_SKELETON )
+GAME( 1974, bballrmt, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Baseball (Ramtek) [TTL]", MACHINE_IS_SKELETON )
+GAME( 1975, trivia, 0, ramtek, 0, ramtek_state, 0, ROT0, "Ramtek", "Trivia (Rev B) [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp
index f5f057f6351..c584bf4ae0c 100644
--- a/src/mame/drivers/rastan.cpp
+++ b/src/mame/drivers/rastan.cpp
@@ -362,7 +362,7 @@ void rastan_state::machine_reset()
}
-static MACHINE_CONFIG_START( rastan, rastan_state )
+static MACHINE_CONFIG_START( rastan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -408,7 +408,7 @@ static MACHINE_CONFIG_START( rastan, rastan_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(rastan_state, rastan_msm5205_vck)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MCFG_DEVICE_ADD("adpcm_sel", LS157, 0)
@@ -704,14 +704,14 @@ ROM_START( rastsagab )
ROM_END
/* Newer revised code base */
-GAME( 1987, rastan, 0, rastan, rastan, driver_device, 0, ROT0, "Taito Corporation Japan", "Rastan (World Rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastana, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito Corporation Japan", "Rastan (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastanu, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito America Corporation", "Rastan (US Rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastanua, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito America Corporation", "Rastan (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastsaga, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito Corporation", "Rastan Saga (Japan Rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastan, 0, rastan, rastan, rastan_state, 0, ROT0, "Taito Corporation Japan", "Rastan (World Rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastana, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito Corporation Japan", "Rastan (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastanu, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito America Corporation", "Rastan (US Rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastanua, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito America Corporation", "Rastan (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastsaga, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito Corporation", "Rastan Saga (Japan Rev 1)", MACHINE_SUPPORTS_SAVE )
/* Based on earliest code base */
-GAME( 1987, rastanb, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito Corporation Japan", "Rastan (World, Earlier code base)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastanub, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito America Corporation", "Rastan (US, Earlier code base)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastsagaa, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito Corporation", "Rastan Saga (Japan Rev 1, Earlier code base)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, rastsagab, rastan, rastan, rastsaga, driver_device, 0, ROT0, "Taito Corporation", "Rastan Saga (Japan, Earlier code base)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastanb, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito Corporation Japan", "Rastan (World, Earlier code base)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastanub, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito America Corporation", "Rastan (US, Earlier code base)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastsagaa, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito Corporation", "Rastan Saga (Japan Rev 1, Earlier code base)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, rastsagab, rastan, rastan, rastsaga, rastan_state, 0, ROT0, "Taito Corporation", "Rastan Saga (Japan, Earlier code base)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index 51e03a03249..ffce883e214 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -847,7 +847,7 @@ SLOT_INTERFACE_END
*
*************************************/
-static MACHINE_CONFIG_START( rastersp, rastersp_state )
+static MACHINE_CONFIG_START( rastersp )
MCFG_CPU_ADD("maincpu", I486, 33330000)
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
@@ -954,5 +954,5 @@ ROM_END
*
*************************************/
-GAME( 1994, rotr, 0, rastersp, rotr, driver_device, 0, ROT0, "BFM/Mirage", "Rise of the Robots (prototype)", 0 )
-GAME( 1997, fbcrazy, 0, rastersp, rotr, driver_device, 0, ROT0, "BFM", "Football Crazy (Video Quiz)", MACHINE_NOT_WORKING )
+GAME( 1994, rotr, 0, rastersp, rotr, rastersp_state, 0, ROT0, "BFM/Mirage", "Rise of the Robots (prototype)", 0 )
+GAME( 1997, fbcrazy, 0, rastersp, rotr, rastersp_state, 0, ROT0, "BFM", "Football Crazy (Video Quiz)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp
index 69873b3c8b5..51a5213bb08 100644
--- a/src/mame/drivers/ravens.cpp
+++ b/src/mame/drivers/ravens.cpp
@@ -100,7 +100,7 @@ public:
DECLARE_WRITE8_MEMBER(port1c_w);
DECLARE_WRITE8_MEMBER(display_w);
DECLARE_WRITE8_MEMBER(leds_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_MACHINE_RESET(ravens2);
DECLARE_READ8_MEMBER(cass_r);
DECLARE_WRITE_LINE_MEMBER(cass_w);
@@ -258,7 +258,7 @@ static INPUT_PORTS_START( ravens )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("???") PORT_CODE(KEYCODE_O) PORT_CHAR('O')
INPUT_PORTS_END
-WRITE8_MEMBER( ravens_state::kbd_put )
+void ravens_state::kbd_put(u8 data)
{
if (data > 0x60) data -= 0x20; // fold to uppercase
m_term_data = data;
@@ -328,7 +328,7 @@ QUICKLOAD_LOAD_MEMBER( ravens_state, ravens )
return result;
}
-static MACHINE_CONFIG_START( ravens, ravens_state )
+static MACHINE_CONFIG_START( ravens )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) // frequency is unknown
MCFG_CPU_PROGRAM_MAP(ravens_mem)
@@ -348,7 +348,7 @@ static MACHINE_CONFIG_START( ravens, ravens_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ravens2, ravens_state )
+static MACHINE_CONFIG_START( ravens2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz) // frequency is unknown
MCFG_CPU_PROGRAM_MAP(ravens_mem)
@@ -359,7 +359,7 @@ static MACHINE_CONFIG_START( ravens2, ravens_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ravens_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ravens_state, kbd_put))
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", ravens_state, ravens, "pgm", 1)
@@ -387,6 +387,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, ravens, 0, 0, ravens, ravens, driver_device, 0, "Joseph Glagla and Dieter Feiler", "Ravensburger Selbstbaucomputer V0.9", MACHINE_NO_SOUND_HW )
-COMP( 1985, ravens2, ravens, 0, ravens2, ravens, driver_device, 0, "Joseph Glagla and Dieter Feiler", "Ravensburger Selbstbaucomputer V2.0", MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, ravens, 0, 0, ravens, ravens, ravens_state, 0, "Joseph Glagla and Dieter Feiler", "Ravensburger Selbstbaucomputer V0.9", MACHINE_NO_SOUND_HW )
+COMP( 1985, ravens2, ravens, 0, ravens2, ravens, ravens_state, 0, "Joseph Glagla and Dieter Feiler", "Ravensburger Selbstbaucomputer V2.0", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp
index 8bef6c3c775..30ee09abb39 100644
--- a/src/mame/drivers/rbisland.cpp
+++ b/src/mame/drivers/rbisland.cpp
@@ -627,7 +627,7 @@ void rbisland_state::machine_start()
{
}
-static MACHINE_CONFIG_START( rbisland, rbisland_state )
+static MACHINE_CONFIG_START( rbisland )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -677,7 +677,7 @@ MACHINE_CONFIG_END
/* Jumping: The PCB has 2 Xtals, 18.432MHz and 24MHz */
-static MACHINE_CONFIG_START( jumping, rbisland_state )
+static MACHINE_CONFIG_START( jumping )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2) /* verified on pcb */
@@ -971,7 +971,7 @@ DRIVER_INIT_MEMBER(rbisland_state,jumping)
GAME( 1987, rbisland, 0, rbisland, rbisland, rbisland_state, rbisland, ROT0, "Taito Corporation", "Rainbow Islands (new version)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, rbislando, rbisland, rbisland, rbisland, rbisland_state, rbisland, ROT0, "Taito Corporation", "Rainbow Islands (old version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, rbislande, rbisland, rbisland, rbisland, rbisland_state, rbislande, ROT0, "Taito Corporation", "Rainbow Islands (Extra)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, jumping, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg", "Jumping (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, jumpinga, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, jumpingi, rbisland, jumpingi, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 3, Imnoe PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, rbislande, rbisland, rbisland, rbisland, rbisland_state, rbislande, ROT0, "Taito Corporation", "Rainbow Islands (Extra)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, jumping, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg", "Jumping (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, jumpinga, rbisland, jumping, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, jumpingi, rbisland, jumpingi, jumping, rbisland_state, jumping, ROT0, "bootleg (Seyutu)", "Jumping (set 3, Imnoe PCB)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp
index 52b4c6214ab..b97c0d16dd8 100644
--- a/src/mame/drivers/rbmk.cpp
+++ b/src/mame/drivers/rbmk.cpp
@@ -547,7 +547,7 @@ INTERRUPT_GEN_MEMBER(rbmk_state::mcu_irq)
m_mcu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( rbmk, rbmk_state )
+static MACHINE_CONFIG_START( rbmk )
MCFG_CPU_ADD("maincpu", M68000, 22000000 /2)
MCFG_CPU_PROGRAM_MAP(rbmk_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", rbmk_state, irq1_line_hold)
@@ -576,7 +576,7 @@ static MACHINE_CONFIG_START( rbmk, rbmk_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1122000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
@@ -609,4 +609,4 @@ ROM_START( rbmk )
ROM_END
-GAME( 1998, rbmk, 0, rbmk, rbmk, driver_device,0, ROT0, "GMS", "Real Battle Mahjong King", MACHINE_NOT_WORKING )
+GAME( 1998, rbmk, 0, rbmk, rbmk, rbmk_state, 0, ROT0, "GMS", "Real Battle Mahjong King", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp
index 5b3e9d30859..b669370efab 100644
--- a/src/mame/drivers/rc702.cpp
+++ b/src/mame/drivers/rc702.cpp
@@ -75,7 +75,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(qbar_w);
DECLARE_WRITE_LINE_MEMBER(dack1_w);
I8275_DRAW_CHARACTER_MEMBER(display_pixels);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
private:
bool m_q_state;
@@ -326,9 +326,9 @@ static const z80_daisy_config daisy_chain_intf[] =
{ nullptr }
};
-WRITE8_MEMBER( rc702_state::kbd_put )
+void rc702_state::kbd_put(u8 data)
{
- m_pio->pa_w(space, 0, data);
+ m_pio->pa_w(machine().dummy_space(), 0, data);
m_pio->strobe_a(0);
m_pio->strobe_a(1);
}
@@ -337,7 +337,7 @@ static SLOT_INTERFACE_START( floppies )
SLOT_INTERFACE( "drive0", FLOPPY_525_QD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( rc702, rc702_state )
+static MACHINE_CONFIG_START( rc702 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz / 2)
MCFG_CPU_PROGRAM_MAP(rc702_mem)
@@ -380,7 +380,7 @@ static MACHINE_CONFIG_START( rc702, rc702_state )
/* Keyboard */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(rc702_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(rc702_state, kbd_put))
MCFG_DEVICE_ADD("7474", TTL7474, 0)
MCFG_7474_COMP_OUTPUT_CB(WRITELINE(rc702_state, q_w))
@@ -424,5 +424,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1979, rc702, 0, 0, rc702, rc702, rc702_state, rc702, "Regnecentralen", "RC702 Piccolo", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index 6e0b2f11b1a..7e0c06c70e2 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -38,34 +38,34 @@ class rc759_state : public driver_device
{
public:
rc759_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_pic(*this, "pic"),
- m_nvram(*this, "nvram"),
- m_ppi(*this, "ppi"),
- m_txt(*this, "txt"),
- m_cas(*this, "cas"),
- m_isbx(*this, "isbx"),
- m_speaker(*this, "speaker"),
- m_snd(*this, "snd"),
- m_rtc(*this, "rtc"),
- m_centronics(*this, "centronics"),
- m_fdc(*this, "fdc"),
- m_floppy0(*this, "fdc:0"),
- m_floppy1(*this, "fdc:1"),
- m_vram(*this, "vram"),
- m_config(*this, "config"),
- m_cas_enabled(0), m_cas_data(0),
- m_drq_source(0),
- m_nvram_bank(0),
- m_gfx_mode(0),
- m_keyboard_enable(0), m_keyboard_key(0x00),
- m_centronics_strobe(0), m_centronics_init(0), m_centronics_select_in(0), m_centronics_busy(0),
- m_centronics_ack(0), m_centronics_fault(0), m_centronics_perror(0), m_centronics_select(0),
- m_centronics_data(0xff)
+ driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_pic(*this, "pic"),
+ m_nvram(*this, "nvram"),
+ m_ppi(*this, "ppi"),
+ m_txt(*this, "txt"),
+ m_cas(*this, "cas"),
+ m_isbx(*this, "isbx"),
+ m_speaker(*this, "speaker"),
+ m_snd(*this, "snd"),
+ m_rtc(*this, "rtc"),
+ m_centronics(*this, "centronics"),
+ m_fdc(*this, "fdc"),
+ m_floppy0(*this, "fdc:0"),
+ m_floppy1(*this, "fdc:1"),
+ m_vram(*this, "vram"),
+ m_config(*this, "config"),
+ m_cas_enabled(0), m_cas_data(0),
+ m_drq_source(0),
+ m_nvram_bank(0),
+ m_gfx_mode(0),
+ m_keyboard_enable(0), m_keyboard_key(0x00),
+ m_centronics_strobe(0), m_centronics_init(0), m_centronics_select_in(0), m_centronics_busy(0),
+ m_centronics_ack(0), m_centronics_fault(0), m_centronics_perror(0), m_centronics_select(0),
+ m_centronics_data(0xff)
{ }
- DECLARE_WRITE8_MEMBER(keyb_put);
+ void keyb_put(u8 data);
DECLARE_READ8_MEMBER(keyboard_r);
DECLARE_WRITE8_MEMBER(floppy_control_w);
@@ -121,7 +121,7 @@ private:
required_device<sn76489a_device> m_snd;
required_device<mm58167_device> m_rtc;
required_device<centronics_device> m_centronics;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_shared_ptr<uint16_t> m_vram;
@@ -153,7 +153,7 @@ private:
// I/O
//**************************************************************************
-WRITE8_MEMBER( rc759_state::keyb_put )
+void rc759_state::keyb_put(u8 data)
{
m_keyboard_key = data;
m_pic->ir1_w(1);
@@ -486,7 +486,7 @@ static ADDRESS_MAP_START( rc759_io, AS_IO, 16, rc759_state )
AM_RANGE(0x240, 0x241) AM_WRITE(txt_ca_w)
AM_RANGE(0x250, 0x251) AM_READWRITE8(centronics_data_r, centronics_data_w, 0x00ff)
AM_RANGE(0x260, 0x261) AM_READWRITE8(centronics_control_r, centronics_control_w, 0x00ff)
- AM_RANGE(0x280, 0x287) AM_DEVREADWRITE8("fdc", wd2797_t, read, write, 0x00ff)
+ AM_RANGE(0x280, 0x287) AM_DEVREADWRITE8("fdc", wd2797_device, read, write, 0x00ff)
AM_RANGE(0x288, 0x289) AM_WRITE8(floppy_control_w, 0x00ff)
// AM_RANGE(0x28a, 0x28b) external printer data
// AM_RANGE(0x28d, 0x28d) external printer control
@@ -524,7 +524,7 @@ static SLOT_INTERFACE_START( rc759_floppies )
SLOT_INTERFACE("hd", FLOPPY_525_HD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( rc759, rc759_state )
+static MACHINE_CONFIG_START( rc759 )
MCFG_CPU_ADD("maincpu", I80186, 6000000)
MCFG_CPU_PROGRAM_MAP(rc759_map)
MCFG_CPU_IO_MAP(rc759_io)
@@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( rc759, rc759_state )
// keyboard
MCFG_DEVICE_ADD("keyb", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(rc759_state, keyb_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(rc759_state, keyb_put))
// cassette
MCFG_CASSETTE_ADD("cas")
@@ -619,4 +619,4 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-COMP( 1984, rc759, 0, 0, rc759, rc759, driver_device, 0, "Regnecentralen", "RC759 Piccoline", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1984, rc759, 0, 0, rc759, rc759, rc759_state, 0, "Regnecentralen", "RC759 Piccoline", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp
index 168d8d519c0..0efe84a5e38 100644
--- a/src/mame/drivers/rcorsair.cpp
+++ b/src/mame/drivers/rcorsair.cpp
@@ -136,7 +136,7 @@ uint32_t rcorsair_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
return 0;
}
-static MACHINE_CONFIG_START( rcorsair, rcorsair_state )
+static MACHINE_CONFIG_START( rcorsair )
/* Main CPU is probably inside Custom Block with
program code, unknown type */
@@ -178,4 +178,4 @@ ROM_START( rcorsair )
ROM_END
-GAME( 1984, rcorsair, 0, rcorsair, inports, driver_device, 0, ROT90, "Nakasawa", "Red Corsair", MACHINE_IS_SKELETON )
+GAME( 1984, rcorsair, 0, rcorsair, inports, rcorsair_state, 0, ROT90, "Nakasawa", "Red Corsair", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp
index 6ac7b25cc99..c59cf054f5e 100644
--- a/src/mame/drivers/rd100.cpp
+++ b/src/mame/drivers/rd100.cpp
@@ -86,7 +86,7 @@ MACHINE_RESET_MEMBER( rd100_state, rd100 )
{
}
-static MACHINE_CONFIG_START( rd100, rd100_state )
+static MACHINE_CONFIG_START( rd100 )
// basic machine hardware
MCFG_CPU_ADD("maincpu",M6809E, XTAL_4MHz) // freq unknown
MCFG_CPU_PROGRAM_MAP(rd100_mem)
@@ -112,5 +112,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, rd100, 0, 0, rd100, rd100, rd100_state, rd100, "Data", "RD100", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1989, rd100, 0, 0, rd100, rd100, rd100_state, rd100, "Data", "RD100", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp
index 8a107b20811..4056c8ce42e 100644
--- a/src/mame/drivers/rd110.cpp
+++ b/src/mame/drivers/rd110.cpp
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( d110_io, AS_IO, 16, d110_state )
AM_RANGE(i8x9x_device::P0, i8x9x_device::P0) AM_READ(port0_r)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( d110, d110_state )
+static MACHINE_CONFIG_START( d110 )
MCFG_CPU_ADD( "maincpu", P8098, XTAL_12MHz )
MCFG_CPU_PROGRAM_MAP( d110_map )
MCFG_CPU_IO_MAP( d110_io )
@@ -284,4 +284,4 @@ ROM_START( d110 )
ROM_LOAD( "r15179879.ic6.bin", 0, 0x8000, CRC(5d34174e) SHA1(17bd2887711c5c5458aba6d3be5972b2096eb450) )
ROM_END
-CONS( 1988, d110, 0, 0, d110, d110, driver_device, 0, "Roland", "D110", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+CONS( 1988, d110, 0, 0, d110, d110, d110_state, 0, "Roland", "D110", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp
index 2f07d80a0b4..897bae20c77 100644
--- a/src/mame/drivers/re900.cpp
+++ b/src/mame/drivers/re900.cpp
@@ -377,7 +377,7 @@ INPUT_PORTS_END
* Machine Driver *
***************************/
-static MACHINE_CONFIG_START( re900, re900_state )
+static MACHINE_CONFIG_START( re900 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8051, MAIN_CLOCK)
@@ -452,6 +452,6 @@ DRIVER_INIT_MEMBER(re900_state,re900)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1993, re900, 0, re900, re900, re900_state, re900, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-900", MACHINE_SUPPORTS_SAVE, layout_re900)
-GAME ( 1994, bs94 , 0, bs94, bs94 , driver_device, 0, ROT0, "Entretenimientos GEMINIS", "Buena Suerte '94", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1993, re900, 0, re900, re900, re900_state, re900, ROT90, "Entretenimientos GEMINIS", "Ruleta RE-900", MACHINE_SUPPORTS_SAVE, layout_re900 )
+GAME ( 1994, bs94 , 0, bs94, bs94 , re900_state, 0, ROT0, "Entretenimientos GEMINIS", "Buena Suerte '94", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp
index 895408a74a0..c57a82ac871 100644
--- a/src/mame/drivers/realbrk.cpp
+++ b/src/mame/drivers/realbrk.cpp
@@ -754,7 +754,7 @@ INTERRUPT_GEN_MEMBER(realbrk_state::interrupt)
m_tmp68301->external_interrupt_1();
}
-static MACHINE_CONFIG_START( realbrk, realbrk_state )
+static MACHINE_CONFIG_START( realbrk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000, XTAL_32MHz / 2) /* !! TMP68301 !! */
@@ -1277,13 +1277,13 @@ ROM_START( dai2kaku_alt_rom_size )
ROM_END
#endif
-GAME( 1998, pkgnsh, 0, pkgnsh, pkgnsh, driver_device, 0, ROT0, "Nakanihon / Dynax", "Pachinko Gindama Shoubu (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, pkgnsh, 0, pkgnsh, pkgnsh, realbrk_state, 0, ROT0, "Nakanihon / Dynax", "Pachinko Gindama Shoubu (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, pkgnshdx, 0, pkgnshdx, pkgnshdx, driver_device, 0, ROT0, "Nakanihon / Dynax", "Pachinko Gindama Shoubu DX (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, pkgnshdx, 0, pkgnshdx, pkgnshdx, realbrk_state, 0, ROT0, "Nakanihon / Dynax", "Pachinko Gindama Shoubu DX (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, realbrk, 0, realbrk, realbrk, driver_device, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Europe)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, realbrko, realbrk, realbrk, realbrk, driver_device, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Europe, older)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, realbrkj, realbrk, realbrk, realbrk, driver_device, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, realbrkk, realbrk, realbrk, realbrk, driver_device, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Korea)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, realbrk, 0, realbrk, realbrk, realbrk_state, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Europe)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, realbrko, realbrk, realbrk, realbrk, realbrk_state, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Europe, older)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, realbrkj, realbrk, realbrk, realbrk, realbrk_state, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, realbrkk, realbrk, realbrk, realbrk, realbrk_state, 0, ROT0, "Nakanihon", "Billiard Academy Real Break (Korea)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 2004, dai2kaku, 0, dai2kaku, dai2kaku, driver_device, 0, ROT0, "SystemBit", "Dai-Dai-Kakumei (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2004, dai2kaku, 0, dai2kaku, dai2kaku, realbrk_state, 0, ROT0, "SystemBit", "Dai-Dai-Kakumei (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/redalert.cpp b/src/mame/drivers/redalert.cpp
index cff4ab900da..21cef47ecfe 100644
--- a/src/mame/drivers/redalert.cpp
+++ b/src/mame/drivers/redalert.cpp
@@ -387,7 +387,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( redalert, redalert_state )
+static MACHINE_CONFIG_START( redalert )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
@@ -401,7 +401,7 @@ static MACHINE_CONFIG_START( redalert, redalert_state )
MCFG_FRAGMENT_ADD(redalert_audio)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ww3, redalert_state )
+static MACHINE_CONFIG_START( ww3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
@@ -415,7 +415,7 @@ static MACHINE_CONFIG_START( ww3, redalert_state )
MCFG_FRAGMENT_ADD(ww3_audio)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( panther, redalert_state )
+static MACHINE_CONFIG_START( panther )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
@@ -429,7 +429,7 @@ static MACHINE_CONFIG_START( panther, redalert_state )
MCFG_FRAGMENT_ADD(ww3_audio)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( demoneye, redalert_state )
+static MACHINE_CONFIG_START( demoneye )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MAIN_CPU_CLOCK)
@@ -538,7 +538,7 @@ ROM_END
*
*************************************/
-GAME( 1981, panther, 0, panther, panther, driver_device, 0, ROT270, "Irem", "Panther", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, redalert, 0, redalert, redalert, driver_device, 0, ROT270, "Irem (GDI license)", "Red Alert", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ww3, redalert, ww3, redalert, driver_device, 0, ROT270, "Irem", "WW III", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, demoneye, 0, demoneye, demoneye, driver_device, 0, ROT270, "Irem", "Demoneye-X", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, panther, 0, panther, panther, redalert_state, 0, ROT270, "Irem", "Panther", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, redalert, 0, redalert, redalert, redalert_state, 0, ROT270, "Irem (GDI license)", "Red Alert", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ww3, redalert, ww3, redalert, redalert_state, 0, ROT270, "Irem", "WW III", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, demoneye, 0, demoneye, demoneye, redalert_state, 0, ROT270, "Irem", "Demoneye-X", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp
index 5d16056ec87..4cb56a8b395 100644
--- a/src/mame/drivers/redclash.cpp
+++ b/src/mame/drivers/redclash.cpp
@@ -626,7 +626,7 @@ MACHINE_RESET_MEMBER(redclash_state,redclash)
m_stars_count = 0;
}
-static MACHINE_CONFIG_START( zerohour, redclash_state )
+static MACHINE_CONFIG_START( zerohour )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
@@ -655,7 +655,7 @@ static MACHINE_CONFIG_START( zerohour, redclash_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( redclash, redclash_state )
+static MACHINE_CONFIG_START( redclash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
@@ -683,7 +683,7 @@ static MACHINE_CONFIG_START( redclash, redclash_state )
/* sound hardware */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sraider, redclash_state )
+static MACHINE_CONFIG_START( sraider )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz */
@@ -945,10 +945,10 @@ DRIVER_INIT_MEMBER(redclash_state,redclash)
}
-GAME( 1980, zerohour, 0, zerohour, zerohour, redclash_state, redclash, ROT270, "Universal", "Zero Hour (set 1)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, zerohoura, zerohour, zerohour, zerohour, redclash_state, redclash, ROT270, "Universal", "Zero Hour (set 2)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, zerohouri, zerohour, zerohour, zerohour, redclash_state, redclash, ROT270, "bootleg (Inder SA)", "Zero Hour (Inder)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, redclash, 0, redclash, redclash, redclash_state, redclash, ROT270, "Tehkan", "Red Clash (set 1)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, redclasha, redclash, redclash, redclash, redclash_state, redclash, ROT270, "Tehkan", "Red Clash (set 2)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, zerohour, 0, zerohour, zerohour, redclash_state, redclash, ROT270, "Universal", "Zero Hour (set 1)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, zerohoura, zerohour, zerohour, zerohour, redclash_state, redclash, ROT270, "Universal", "Zero Hour (set 2)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, zerohouri, zerohour, zerohour, zerohour, redclash_state, redclash, ROT270, "bootleg (Inder SA)", "Zero Hour (Inder)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, redclash, 0, redclash, redclash, redclash_state, redclash, ROT270, "Tehkan", "Red Clash (set 1)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, redclasha, redclash, redclash, redclash, redclash_state, redclash, ROT270, "Tehkan", "Red Clash (set 2)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
GAME( 1981, redclashk, redclash, redclash, redclash, redclash_state, redclash, ROT270, "Tehkan (Kaneko license)", "Red Clash (Kaneko)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, sraider, 0, sraider, sraider, driver_device, 0, ROT270, "Universal", "Space Raider", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, sraider, 0, sraider, sraider, redclash_state, 0, ROT270, "Universal", "Space Raider", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp
index 107cbc7aa6f..ed1d2ac08e6 100644
--- a/src/mame/drivers/relief.cpp
+++ b/src/mame/drivers/relief.cpp
@@ -267,7 +267,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( relief, relief_state )
+static MACHINE_CONFIG_START( relief )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -302,7 +302,7 @@ static MACHINE_CONFIG_START( relief, relief_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/3, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/4/3, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp
index 47a5871b089..e573c386a94 100644
--- a/src/mame/drivers/renegade.cpp
+++ b/src/mame/drivers/renegade.cpp
@@ -738,7 +738,7 @@ void renegade_state::machine_reset()
}
-static MACHINE_CONFIG_START( renegade, renegade_state )
+static MACHINE_CONFIG_START( renegade )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12000000/8) /* 1.5 MHz (measured) */
@@ -774,7 +774,7 @@ static MACHINE_CONFIG_START( renegade, renegade_state )
MCFG_SOUND_ADD("msm", MSM5205, 12000000/32)
MCFG_MSM5205_VCLK_CB(WRITELINE(renegade_state, adpcm_int))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp
index 93faf5c73b7..094ffd191a4 100644
--- a/src/mame/drivers/replicator.cpp
+++ b/src/mame/drivers/replicator.cpp
@@ -599,7 +599,7 @@ static GFXDECODE_START( replicator )
GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, hd44780_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( replicator, replicator_state )
+static MACHINE_CONFIG_START( replicator )
MCFG_CPU_ADD("maincpu", ATMEGA1280, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(replicator_prg_map)
@@ -720,5 +720,5 @@ ROM_START( replica1 )
ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(2012, replica1, 0, 0, replicator, replicator, replicator_state, replicator, "Makerbot", "Replicator 1 desktop 3d printer", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP(2012, replica1, 0, 0, replicator, replicator, replicator_state, replicator, "Makerbot", "Replicator 1 desktop 3d printer", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp
index aec4c2d9d30..27e2463a60c 100644
--- a/src/mame/drivers/retofinv.cpp
+++ b/src/mame/drivers/retofinv.cpp
@@ -360,7 +360,7 @@ INTERRUPT_GEN_MEMBER(retofinv_state::sub_vblank_irq)
}
-static MACHINE_CONFIG_START( retofinv, retofinv_state )
+static MACHINE_CONFIG_START( retofinv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz? */
@@ -525,6 +525,6 @@ ROM_END
-GAME( 1985, retofinv, 0, retofinv, retofinv, driver_device, 0, ROT90, "Taito Corporation", "Return of the Invaders", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, retofinv1,retofinv, retofinb, retofinv, driver_device, 0, ROT90, "bootleg", "Return of the Invaders (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, retofinv2,retofinv, retofinb, retofin2, driver_device, 0, ROT90, "bootleg", "Return of the Invaders (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, retofinv, 0, retofinv, retofinv, retofinv_state, 0, ROT90, "Taito Corporation", "Return of the Invaders", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, retofinv1,retofinv, retofinb, retofinv, retofinv_state, 0, ROT90, "bootleg", "Return of the Invaders (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, retofinv2,retofinv, retofinb, retofin2, retofinv_state, 0, ROT90, "bootleg", "Return of the Invaders (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 893bb5860d9..bc6b01e81c2 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -870,7 +870,7 @@ static GFXDECODE_START( rex6000 )
GFXDECODE_END
-static MACHINE_CONFIG_START( rex6000, rex6000_state )
+static MACHINE_CONFIG_START( rex6000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) //Toshiba microprocessor Z80 compatible at 4.3MHz
MCFG_CPU_PROGRAM_MAP(rex6000_mem)
@@ -947,7 +947,7 @@ static MACHINE_CONFIG_START( rex6000, rex6000_state )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( oz750, oz750_state )
+static MACHINE_CONFIG_START( oz750 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz) //Toshiba microprocessor Z80 compatible at 9.8MHz
MCFG_CPU_PROGRAM_MAP(rex6000_mem)
@@ -1053,7 +1053,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 199?, oz750, 0, 0, oz750 , oz750, driver_device, 0, "Sharp", "Wizard OZ-750", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 2000, rex6000, 0, 0, rex6000, rex6000, driver_device, 0, "Xircom / Intel", "REX 6000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 2000, ds2, rex6000, 0, rex6000, rex6000, driver_device, 0, "Citizen", "DataSlim 2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 199?, oz750, 0, 0, oz750, oz750, oz750_state, 0, "Sharp", "Wizard OZ-750", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 2000, rex6000, 0, 0, rex6000, rex6000, rex6000_state, 0, "Xircom / Intel", "REX 6000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 2000, ds2, rex6000, 0, rex6000, rex6000, rex6000_state, 0, "Citizen", "DataSlim 2", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp
index d5b64dce64f..ab3649d29fe 100644
--- a/src/mame/drivers/rgum.cpp
+++ b/src/mame/drivers/rgum.cpp
@@ -238,7 +238,7 @@ static GFXDECODE_START( rgum )
GFXDECODE_END
-static MACHINE_CONFIG_START( rgum, rgum_state )
+static MACHINE_CONFIG_START( rgum )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02,24000000/16) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(rgum_map)
@@ -294,4 +294,4 @@ ROM_START( rgum )
ROM_END
-GAME( 199?, rgum, 0, rgum, rgum, driver_device, 0, ROT0, "<unknown>", "Royal Gum (Italy)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, rgum, 0, rgum, rgum, rgum_state, 0, ROT0, "<unknown>", "Royal Gum (Italy)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp
index fde81bfd102..f3bfd22fb5f 100644
--- a/src/mame/drivers/risc2500.cpp
+++ b/src/mame/drivers/risc2500.cpp
@@ -286,10 +286,10 @@ static ADDRESS_MAP_START(risc2500_mem, AS_PROGRAM, 32, risc2500_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( risc2500, risc2500_state )
+static MACHINE_CONFIG_START( risc2500 )
MCFG_CPU_ADD("maincpu", ARM, XTAL_28_322MHz / 2) // VY86C010
MCFG_CPU_PROGRAM_MAP(risc2500_mem)
- MCFG_ARM_COPRO(ARM_COPRO_TYPE_VL86C020)
+ MCFG_ARM_COPRO(VL86C020)
MCFG_CPU_PERIODIC_INT_DRIVER(risc2500_state, irq1_line_hold, 250)
MCFG_SCREEN_ADD("screen", LCD)
@@ -335,6 +335,6 @@ ROM_START( montreux )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1992, risc, 0, 0, risc2500, risc2500, driver_device, 0, "Saitek", "RISC 2500", MACHINE_CLICKABLE_ARTWORK )
-CONS( 1995, montreux, 0, 0, risc2500, risc2500, driver_device, 0, "Saitek / Hegener & Glaser", "Mephisto Montreux", MACHINE_CLICKABLE_ARTWORK )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1992, risc, 0, 0, risc2500, risc2500, risc2500_state, 0, "Saitek", "RISC 2500", MACHINE_CLICKABLE_ARTWORK )
+CONS( 1995, montreux, 0, 0, risc2500, risc2500, risc2500_state, 0, "Saitek / Hegener & Glaser", "Mephisto Montreux", MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp
index 8eba052f3c2..6a89cf73a0d 100644
--- a/src/mame/drivers/riscpc.cpp
+++ b/src/mame/drivers/riscpc.cpp
@@ -799,7 +799,7 @@ void riscpc_state::machine_reset()
m_flyback_timer->adjust( attotime::never);
}
-static MACHINE_CONFIG_START( rpc600, riscpc_state )
+static MACHINE_CONFIG_START( rpc600 )
/* Basic machine hardware */
MCFG_CPU_ADD( "maincpu", ARM7, XTAL_30MHz ) // ARM610
MCFG_CPU_PROGRAM_MAP(a7000_mem)
@@ -814,7 +814,7 @@ static MACHINE_CONFIG_START( rpc600, riscpc_state )
MCFG_PALETTE_ADD("palette", 0x200)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rpc700, riscpc_state )
+static MACHINE_CONFIG_START( rpc700 )
/* Basic machine hardware */
MCFG_CPU_ADD( "maincpu", ARM7, XTAL_40MHz ) // ARM710
MCFG_CPU_PROGRAM_MAP(a7000_mem)
@@ -829,7 +829,7 @@ static MACHINE_CONFIG_START( rpc700, riscpc_state )
MCFG_PALETTE_ADD("palette", 0x200)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( a7000, riscpc_state )
+static MACHINE_CONFIG_START( a7000 )
/* Basic machine hardware */
MCFG_CPU_ADD( "maincpu", ARM7, XTAL_32MHz ) // ARM7500
MCFG_CPU_PROGRAM_MAP(a7000_mem)
@@ -849,7 +849,7 @@ static MACHINE_CONFIG_DERIVED( a7000p, a7000 )
MCFG_CPU_CLOCK(XTAL_48MHz)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sarpc, riscpc_state )
+static MACHINE_CONFIG_START( sarpc )
/* Basic machine hardware */
MCFG_CPU_ADD( "maincpu", ARM7, 202000000 ) // StrongARM
MCFG_CPU_PROGRAM_MAP(a7000_mem)
@@ -864,7 +864,7 @@ static MACHINE_CONFIG_START( sarpc, riscpc_state )
MCFG_PALETTE_ADD("palette", 0x200)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sarpc_j233, riscpc_state )
+static MACHINE_CONFIG_START( sarpc_j233 )
/* Basic machine hardware */
MCFG_CPU_ADD( "maincpu", ARM7, 233000000 ) // StrongARM
MCFG_CPU_PROGRAM_MAP(a7000_mem)
@@ -947,10 +947,10 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1994, rpc600, 0, 0, rpc600, a7000, driver_device, 0, "Acorn", "Risc PC 600", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1994, rpc700, rpc600, 0, rpc700, a7000, driver_device, 0, "Acorn", "Risc PC 700", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1995, a7000, rpc600, 0, a7000, a7000, driver_device, 0, "Acorn", "Archimedes A7000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1997, a7000p, rpc600, 0, a7000p, a7000, driver_device, 0, "Acorn", "Archimedes A7000+", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1997, sarpc, rpc600, 0, sarpc, a7000, driver_device, 0, "Acorn", "StrongARM Risc PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1997, sarpc_j233, rpc600, 0, sarpc_j233, a7000, driver_device, 0, "Acorn", "J233 StrongARM Risc PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1994, rpc600, 0, 0, rpc600, a7000, riscpc_state, 0, "Acorn", "Risc PC 600", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1994, rpc700, rpc600, 0, rpc700, a7000, riscpc_state, 0, "Acorn", "Risc PC 700", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1995, a7000, rpc600, 0, a7000, a7000, riscpc_state, 0, "Acorn", "Archimedes A7000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1997, a7000p, rpc600, 0, a7000p, a7000, riscpc_state, 0, "Acorn", "Archimedes A7000+", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1997, sarpc, rpc600, 0, sarpc, a7000, riscpc_state, 0, "Acorn", "StrongARM Risc PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1997, sarpc_j233, rpc600, 0, sarpc_j233, a7000, riscpc_state, 0, "Acorn", "J233 StrongARM Risc PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp
index 61e39626ef7..3b827083d00 100644
--- a/src/mame/drivers/rltennis.cpp
+++ b/src/mame/drivers/rltennis.cpp
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, rltennis_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb888_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( rltennis, rltennis_state )
+static MACHINE_CONFIG_START( rltennis )
MCFG_CPU_ADD("maincpu", M68000, RLT_XTAL/2) /* 68000P8 ??? */
MCFG_CPU_PROGRAM_MAP(rltennis_main)
@@ -236,4 +236,4 @@ ROM_START( rltennis )
ROM_LOAD( "tennis_3.u52", 0x00000, 0x80000, CRC(517dcd0e) SHA1(b2703e185ee8cf7e115ea07151e7bee8be34948b) )
ROM_END
-GAME( 1993, rltennis, 0, rltennis, rltennis, driver_device, 0, ROT0, "TCH", "Reality Tennis", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, rltennis, 0, rltennis, rltennis, rltennis_state, 0, ROT0, "TCH", "Reality Tennis", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index b9651de896c..2f1b05730ac 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( rm380z_io , AS_IO, 8, rm380z_state)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READWRITE(rm380z_portlow_r, rm380z_portlow_w)
- AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE("wd1771", fd1771_t, read, write)
+ AM_RANGE(0xc0, 0xc3) AM_DEVREADWRITE("wd1771", fd1771_device, read, write)
AM_RANGE(0xc4, 0xc4) AM_WRITE(disk_0_control)
AM_RANGE(0xc5, 0xff) AM_READWRITE(rm380z_porthi_r, rm380z_porthi_w)
ADDRESS_MAP_END
@@ -228,7 +228,7 @@ uint32_t rm380z_state::screen_update_rm380z(screen_device &screen, bitmap_ind16
return 0;
}
-static MACHINE_CONFIG_START( rm380z, rm380z_state )
+static MACHINE_CONFIG_START( rm380z )
/* basic machine hardware */
MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(rm380z_mem)
@@ -265,10 +265,10 @@ static MACHINE_CONFIG_START( rm380z, rm380z_state )
/* keyboard */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(rm380z_state, keyboard_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(rm380z_state, keyboard_put))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rm480z, rm380z_state )
+static MACHINE_CONFIG_START( rm480z )
/* basic machine hardware */
MCFG_CPU_ADD(RM380Z_MAINCPU_TAG, Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(rm480z_mem)
@@ -288,7 +288,7 @@ static MACHINE_CONFIG_START( rm480z, rm380z_state )
/* keyboard */
// MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
-// MCFG_GENERIC_KEYBOARD_CB(WRITE8(rm380z_state, keyboard_put))
+// MCFG_GENERIC_KEYBOARD_CB(PUT(rm380z_state, keyboard_put))
MACHINE_CONFIG_END
@@ -345,10 +345,10 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP(1978, rm380z, 0, 0, rm380z, rm380z, rm380z_state, rm380z, "Research Machines", "RM-380Z, COS 4.0B", MACHINE_NO_SOUND_HW)
-COMP(1978, rm380z34d, rm380z, 0, rm380z, rm380z, rm380z_state, rm380z34d, "Research Machines", "RM-380Z, COS 3.4D", MACHINE_BTANB_FLAGS)
-COMP(1978, rm380z34e, rm380z, 0, rm380z, rm380z, rm380z_state, rm380z34e, "Research Machines", "RM-380Z, COS 3.4E", MACHINE_BTANB_FLAGS)
-COMP(1981, rm480z, rm380z, 0, rm480z, rm380z, rm380z_state, rm380z34e, "Research Machines", "LINK RM-480Z (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP(1981, rm480za, rm380z, 0, rm480z, rm380z, rm380z_state, rm380z34e, "Research Machines", "LINK RM-480Z (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP(1978, rm380z, 0, 0, rm380z, rm380z, rm380z_state, rm380z, "Research Machines", "RM-380Z, COS 4.0B", MACHINE_NO_SOUND_HW)
+COMP(1978, rm380z34d, rm380z, 0, rm380z, rm380z, rm380z_state, rm380z34d, "Research Machines", "RM-380Z, COS 3.4D", MACHINE_BTANB_FLAGS)
+COMP(1978, rm380z34e, rm380z, 0, rm380z, rm380z, rm380z_state, rm380z34e, "Research Machines", "RM-380Z, COS 3.4E", MACHINE_BTANB_FLAGS)
+COMP(1981, rm480z, rm380z, 0, rm480z, rm380z, rm380z_state, rm380z34e, "Research Machines", "LINK RM-480Z (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP(1981, rm480za, rm380z, 0, rm480z, rm380z, rm380z_state, rm380z34e, "Research Machines", "LINK RM-480Z (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp
index d04feda3a11..1130b570d8d 100644
--- a/src/mame/drivers/rmhaihai.cpp
+++ b/src/mame/drivers/rmhaihai.cpp
@@ -471,7 +471,7 @@ static GFXDECODE_START( themj )
GFXDECODE_END
-static MACHINE_CONFIG_START( rmhaihai, rmhaihai_state )
+static MACHINE_CONFIG_START( rmhaihai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,20000000/4) /* 5 MHz ??? */
@@ -503,7 +503,7 @@ static MACHINE_CONFIG_START( rmhaihai, rmhaihai_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MCFG_SOUND_ADD("msm", MSM5205, 500000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index b0a50622cb0..ff62011a948 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -57,7 +57,7 @@ static ADDRESS_MAP_START(nimbus_io, AS_IO, 16, rmnimbus_state )
AM_RANGE( 0x00e0, 0x00ef) AM_DEVREADWRITE8(AY8910_TAG, ay8910_device, data_r, address_data_w, 0x00FF)
AM_RANGE( 0x00f0, 0x00f7) AM_DEVREADWRITE8(Z80SIO_TAG, z80sio2_device, cd_ba_r, cd_ba_w, 0x00ff)
AM_RANGE( 0x0400, 0x0401) AM_WRITE8(fdc_ctl_w, 0x00ff)
- AM_RANGE( 0x0408, 0x040f) AM_DEVREADWRITE8(FDC_TAG, wd2793_t, read, write, 0x00ff)
+ AM_RANGE( 0x0408, 0x040f) AM_DEVREADWRITE8(FDC_TAG, wd2793_device, read, write, 0x00ff)
AM_RANGE( 0x0410, 0x041f) AM_READWRITE8(scsi_r, scsi_w, 0x00ff)
AM_RANGE( 0x0480, 0x049f) AM_DEVREADWRITE8(VIA_TAG, via6522_device, read, write, 0x00FF)
ADDRESS_MAP_END
@@ -108,7 +108,7 @@ static const uint16_t def_config[16] =
0x0000, 0x8893, 0x2025, 0xB9E6
};
-static MACHINE_CONFIG_START( nimbus, rmnimbus_state )
+static MACHINE_CONFIG_START( nimbus )
/* basic machine hardware */
MCFG_CPU_ADD(MAINCPU_TAG, I80186, 16000000) // the cpu is a 10Mhz part but the serial clocks are wrong unless it runs at 8Mhz
MCFG_CPU_PROGRAM_MAP(nimbus_mem)
@@ -155,8 +155,8 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state )
MCFG_DEVICE_ADD("scsi_data_in", INPUT_BUFFER, 0)
MCFG_DEVICE_ADD("scsi_ctrl_out", OUTPUT_LATCH, 0)
- MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE(SCSIBUS_TAG, SCSI_PORT_DEVICE, write_rst))
- MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE(SCSIBUS_TAG, SCSI_PORT_DEVICE, write_sel))
+ MCFG_OUTPUT_LATCH_BIT0_HANDLER(DEVWRITELINE(SCSIBUS_TAG, scsi_port_device, write_rst))
+ MCFG_OUTPUT_LATCH_BIT1_HANDLER(DEVWRITELINE(SCSIBUS_TAG, scsi_port_device, write_sel))
MCFG_OUTPUT_LATCH_BIT2_HANDLER(WRITELINE(rmnimbus_state, write_scsi_iena))
MCFG_RAM_ADD(RAM_TAG)
@@ -202,7 +202,7 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state )
MCFG_SOUND_ADD(MSM5205_TAG, MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(rmnimbus_state, nimbus_msm5205_vck)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, MONO_TAG, 0.75)
/* Software list */
@@ -229,5 +229,5 @@ ROM_START( nimbus )
ROM_LOAD("hexec-v1.02u-13488-1985-10-29.rom", 0x0000, 0x1000, CRC(75c6adfd) SHA1(0f11e0b7386c6368d20e1fc7a6196d670f924825))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, nimbus, 0, 0, nimbus, nimbus, driver_device, 0, "Research Machines", "Nimbus", 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, nimbus, 0, 0, nimbus, nimbus, rmnimbus_state, 0, "Research Machines", "Nimbus", 0)
diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp
index 0be194f8d94..a77fbc0ab16 100644
--- a/src/mame/drivers/rmt32.cpp
+++ b/src/mame/drivers/rmt32.cpp
@@ -348,7 +348,7 @@ static ADDRESS_MAP_START( mt32_io, AS_IO, 16, mt32_state )
AM_RANGE(i8x9x_device::P0, i8x9x_device::P0) AM_READ(port0_r)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mt32, mt32_state )
+static MACHINE_CONFIG_START( mt32 )
MCFG_CPU_ADD( "maincpu", P8098, XTAL_12MHz )
MCFG_CPU_PROGRAM_MAP( mt32_map )
MCFG_CPU_IO_MAP( mt32_io )
@@ -435,5 +435,5 @@ ROM_START( cm32l )
ROM_LOAD( "r15179917.ic19.bin", 0, 0x8000, CRC(236c87a6) SHA1(e1c03905c46e962d1deb15eeed92eb61b42bba4a) )
ROM_END
-CONS( 1987, mt32, 0, 0, mt32, mt32, driver_device, 0, "Roland", "MT32", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
-CONS( 1989, cm32l, 0, 0, mt32, mt32, driver_device, 0, "Roland", "CM32L", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+CONS( 1987, mt32, 0, 0, mt32, mt32, mt32_state, 0, "Roland", "MT32", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 1989, cm32l, 0, 0, mt32, mt32, mt32_state, 0, "Roland", "CM32L", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp
index 1fc107b2c53..b6cc2c9cef5 100644
--- a/src/mame/drivers/rockrage.cpp
+++ b/src/mame/drivers/rockrage.cpp
@@ -245,7 +245,7 @@ void rockrage_state::machine_reset()
m_vreg = 0;
}
-static MACHINE_CONFIG_START( rockrage, rockrage_state )
+static MACHINE_CONFIG_START( rockrage )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD6309, 3000000*4) /* 24MHz/8 */
@@ -391,6 +391,6 @@ ROM_END
***************************************************************************/
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT,MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1986, rockrage, 0, rockrage, rockrage, driver_device, 0, ROT0, "Konami", "Rock'n Rage (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, rockragea, rockrage, rockrage, rockrage, driver_device, 0, ROT0, "Konami", "Rock'n Rage (prototype?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, rockragej, rockrage, rockrage, rockrage, driver_device, 0, ROT0, "Konami", "Koi no Hotrock (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rockrage, 0, rockrage, rockrage, rockrage_state, 0, ROT0, "Konami", "Rock'n Rage (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rockragea, rockrage, rockrage, rockrage, rockrage_state, 0, ROT0, "Konami", "Rock'n Rage (prototype?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rockragej, rockrage, rockrage, rockrage, rockrage_state, 0, ROT0, "Konami", "Koi no Hotrock (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp
index fc532094a31..6b49896968e 100644
--- a/src/mame/drivers/rocnrope.cpp
+++ b/src/mame/drivers/rocnrope.cpp
@@ -200,7 +200,7 @@ INTERRUPT_GEN_MEMBER(rocnrope_state::vblank_irq)
}
-static MACHINE_CONFIG_START( rocnrope, rocnrope_state )
+static MACHINE_CONFIG_START( rocnrope )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK / 3 / 4) /* Verified in schematics */
@@ -377,5 +377,5 @@ DRIVER_INIT_MEMBER(rocnrope_state,rocnrope)
*************************************/
GAME( 1983, rocnrope, 0, rocnrope, rocnrope, rocnrope_state, rocnrope, ROT270, "Konami", "Roc'n Rope", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, rocnropek, rocnrope, rocnrope, rocnrope, driver_device, 0, ROT270, "Konami (Kosuka license)", "Roc'n Rope (Kosuka)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, rocnropek, rocnrope, rocnrope, rocnrope, rocnrope_state, 0, ROT270, "Konami (Kosuka license)", "Roc'n Rope (Kosuka)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, ropeman, rocnrope, rocnrope, rocnrope, rocnrope_state, rocnrope, ROT270, "bootleg", "Ropeman (bootleg of Roc'n Rope)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp
index 093f9218b14..d631342e101 100644
--- a/src/mame/drivers/rohga.cpp
+++ b/src/mame/drivers/rohga.cpp
@@ -896,7 +896,7 @@ DECOSPR_COLOUR_CB_MEMBER(rohga_state::schmeisr_col_callback)
return colour;
}
-static MACHINE_CONFIG_START( rohga, rohga_state )
+static MACHINE_CONFIG_START( rohga )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -972,16 +972,16 @@ static MACHINE_CONFIG_START( rohga, rohga_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.78)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.78)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wizdfire, rohga_state )
+static MACHINE_CONFIG_START( wizdfire )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -1062,16 +1062,16 @@ static MACHINE_CONFIG_START( wizdfire, rohga_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nitrobal, rohga_state )
+static MACHINE_CONFIG_START( nitrobal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -1154,16 +1154,16 @@ static MACHINE_CONFIG_START( nitrobal, rohga_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( schmeisr, rohga_state )
+static MACHINE_CONFIG_START( schmeisr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -1239,11 +1239,11 @@ static MACHINE_CONFIG_START( schmeisr, rohga_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki1", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
@@ -1921,12 +1921,12 @@ DRIVER_INIT_MEMBER(rohga_state,hangzo)
memcpy(dst + 0x20000, src + 0x80000, 0x20000);
}
-GAME( 1991, rohga, 0, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Asia/Europe v5.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, rohga1, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Asia/Europe v3.0 set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, rohga2, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Asia/Europe v3.0 set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, rohgah, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Hong Kong v3.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, rohgau, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (US v1.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, wolffang, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Wolf Fang -Kuhga 2001- (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rohga, 0, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Asia/Europe v5.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rohga1, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Asia/Europe v3.0 set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rohga2, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Asia/Europe v3.0 set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rohgah, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (Hong Kong v3.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rohgau, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Rohga Armor Force (US v1.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, wolffang, rohga, rohga, rohga, rohga_state, rohga, ROT0, "Data East Corporation", "Wolf Fang -Kuhga 2001- (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1992, wizdfire, 0, wizdfire, wizdfire, rohga_state, wizdfire, ROT0, "Data East Corporation", "Wizard Fire (Over Sea v2.1)", MACHINE_SUPPORTS_SAVE )
GAME( 1992, wizdfireu, wizdfire, wizdfire, wizdfire, rohga_state, wizdfire, ROT0, "Data East Corporation", "Wizard Fire (US v1.1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp
index 668d261795e..18411cb6195 100644
--- a/src/mame/drivers/rollerg.cpp
+++ b/src/mame/drivers/rollerg.cpp
@@ -242,7 +242,7 @@ WRITE8_MEMBER( rollerg_state::banking_callback )
}
-static MACHINE_CONFIG_START( rollerg, rollerg_state )
+static MACHINE_CONFIG_START( rollerg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, 3000000) /* ? */
@@ -348,5 +348,5 @@ ROM_END
***************************************************************************/
-GAME( 1991, rollerg, 0, rollerg, rollerg, driver_device, 0, ROT0, "Konami", "Rollergames (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, rollergj, rollerg, rollerg, rollerg, driver_device, 0, ROT0, "Konami", "Rollergames (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rollerg, 0, rollerg, rollerg, rollerg_state, 0, ROT0, "Konami", "Rollergames (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rollergj, rollerg, rollerg, rollerg, rollerg_state, 0, ROT0, "Konami", "Rollergames (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rollext.cpp b/src/mame/drivers/rollext.cpp
index 016b6b5adfe..d4e8753844f 100644
--- a/src/mame/drivers/rollext.cpp
+++ b/src/mame/drivers/rollext.cpp
@@ -537,7 +537,7 @@ void rollext_state::machine_start()
}
-static MACHINE_CONFIG_START(rollext, rollext_state)
+static MACHINE_CONFIG_START(rollext)
MCFG_CPU_ADD("maincpu", TMS32082_MP, 60000000)
MCFG_CPU_PROGRAM_MAP(memmap)
//MCFG_CPU_VBLANK_INT_DRIVER("screen", rollext_state, vblank_interrupt)
diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp
index c91c490d6cd..ed5dfef309d 100644
--- a/src/mame/drivers/rollrace.cpp
+++ b/src/mame/drivers/rollrace.cpp
@@ -244,7 +244,7 @@ INTERRUPT_GEN_MEMBER(rollrace_state::sound_timer_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( rollrace, rollrace_state )
+static MACHINE_CONFIG_START( rollrace )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_24MHz/8) /* verified on pcb */
@@ -441,6 +441,6 @@ ROM_START( rollace2 )
ROM_END
-GAME( 1983, fightrol, 0, rollrace, rollrace, driver_device, 0, ROT270, "Kaneko (Taito license)", "Fighting Roller", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, rollace, fightrol, rollrace, rollrace, driver_device, 0, ROT270, "Kaneko (Williams license)", "Roller Aces (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, rollace2, fightrol, rollace2, rollrace, driver_device, 0, ROT90, "Kaneko (Williams license)", "Roller Aces (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, fightrol, 0, rollrace, rollrace, rollrace_state, 0, ROT270, "Kaneko (Taito license)", "Fighting Roller", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, rollace, fightrol, rollrace, rollrace, rollrace_state, 0, ROT270, "Kaneko (Williams license)", "Roller Aces (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, rollace2, fightrol, rollace2, rollrace, rollrace_state, 0, ROT90, "Kaneko (Williams license)", "Roller Aces (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp
index 86bce2a785b..666657ded91 100644
--- a/src/mame/drivers/rotaryf.cpp
+++ b/src/mame/drivers/rotaryf.cpp
@@ -246,7 +246,7 @@ static INPUT_PORTS_START( rotaryf )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( rotaryf, rotaryf_state )
+static MACHINE_CONFIG_START( rotaryf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A,4000000) /* ?? MHz */
@@ -297,4 +297,4 @@ ROM_START( rotaryf )
ROM_END
-GAME( 1979, rotaryf, 0, rotaryf, rotaryf, driver_device, 0, ROT270, "Kasco", "Rotary Fighter", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, rotaryf, 0, rotaryf, rotaryf, rotaryf_state, 0, ROT270, "Kasco", "Rotary Fighter", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp
index bb32d609302..841684858a5 100644
--- a/src/mame/drivers/roul.cpp
+++ b/src/mame/drivers/roul.cpp
@@ -294,7 +294,7 @@ static INPUT_PORTS_START( roul )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( roul, roul_state )
+static MACHINE_CONFIG_START( roul )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(roul_map)
@@ -341,4 +341,4 @@ ROM_START(roul)
ROM_LOAD( "roul.u38", 0x0020, 0x0020, CRC(23ae22c1) SHA1(bf0383462976ec6341ffa8a173264ce820bc654a) )
ROM_END
-GAMEL( 1990, roul, 0, roul, roul, driver_device, 0, ROT0, "bootleg", "Super Lucky Roulette", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_roul )
+GAMEL( 1990, roul, 0, roul, roul, roul_state, 0, ROT0, "bootleg", "Super Lucky Roulette", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_roul )
diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp
index f0839becc48..cf174755a4f 100644
--- a/src/mame/drivers/route16.cpp
+++ b/src/mame/drivers/route16.cpp
@@ -554,7 +554,7 @@ MACHINE_START_MEMBER(route16_state, ttmahjng)
}
-static MACHINE_CONFIG_START( route16, route16_state )
+static MACHINE_CONFIG_START( route16 )
/* basic machine hardware */
MCFG_CPU_ADD("cpu1", Z80, 2500000) /* 10MHz / 4 = 2.5MHz */
@@ -1077,19 +1077,19 @@ DRIVER_INIT_MEMBER(route16_state,route16a)
*
*************************************/
-GAME( 1981, route16, 0, route16, route16, route16_state, route16, ROT270, "Tehkan / Sun Electronics (Centuri license)", "Route 16 (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, route16a, route16, route16, route16, route16_state, route16a, ROT270, "Tehkan / Sun Electronics (Centuri license)", "Route 16 (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, route16c, route16, route16, route16, route16_state, route16c, ROT270, "Tehkan / Sun Electronics (Centuri license)", "Route 16 (set 3, bootleg?)", MACHINE_SUPPORTS_SAVE ) // similar to set 1 but with some protection removed?
-GAME( 1981, route16bl,route16, route16, route16, driver_device, 0, ROT270, "bootleg (Leisure and Allied)", "Route 16 (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, routex, route16, routex, route16, driver_device, 0, ROT270, "bootleg", "Route X (bootleg)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1980, speakres, 0, speakres, speakres, driver_device, 0, ROT270, "Sun Electronics", "Speak & Rescue", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, speakresb,speakres, speakres, speakres, driver_device, 0, ROT270, "bootleg", "Speak & Rescue (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, stratvox, speakres, stratvox, stratvox, driver_device, 0, ROT270, "Sun Electronics (Taito license)", "Stratovox (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, stratvoxa,speakres, stratvox, stratvox, driver_device, 0, ROT270, "Sun Electronics (Taito license)", "Stratovox (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, stratvoxb,speakres, stratvox, stratvox, driver_device, 0, ROT270, "bootleg", "Stratovox (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacecho, speakres, spacecho, spacecho, driver_device, 0, ROT270, "bootleg (Gayton Games)", "Space Echo (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacecho2,speakres, spacecho, spacecho, driver_device, 0, ROT270, "bootleg (Gayton Games)", "Space Echo (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, speakhlp, speakres, spacecho, spacecho, driver_device, 0, ROT270, "bootleg", "Speak & Help", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-
-GAME( 1981, ttmahjng, 0, ttmahjng, ttmahjng, driver_device, 0, ROT0, "Taito", "T.T Mahjong", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, route16, 0, route16, route16, route16_state, route16, ROT270, "Tehkan / Sun Electronics (Centuri license)", "Route 16 (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, route16a, route16, route16, route16, route16_state, route16a, ROT270, "Tehkan / Sun Electronics (Centuri license)", "Route 16 (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, route16c, route16, route16, route16, route16_state, route16c, ROT270, "Tehkan / Sun Electronics (Centuri license)", "Route 16 (set 3, bootleg?)", MACHINE_SUPPORTS_SAVE ) // similar to set 1 but with some protection removed?
+GAME( 1981, route16bl,route16, route16, route16, route16_state, 0, ROT270, "bootleg (Leisure and Allied)", "Route 16 (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, routex, route16, routex, route16, route16_state, 0, ROT270, "bootleg", "Route X (bootleg)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1980, speakres, 0, speakres, speakres, route16_state, 0, ROT270, "Sun Electronics", "Speak & Rescue", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, speakresb,speakres, speakres, speakres, route16_state, 0, ROT270, "bootleg", "Speak & Rescue (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, stratvox, speakres, stratvox, stratvox, route16_state, 0, ROT270, "Sun Electronics (Taito license)", "Stratovox (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, stratvoxa,speakres, stratvox, stratvox, route16_state, 0, ROT270, "Sun Electronics (Taito license)", "Stratovox (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, stratvoxb,speakres, stratvox, stratvox, route16_state, 0, ROT270, "bootleg", "Stratovox (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacecho, speakres, spacecho, spacecho, route16_state, 0, ROT270, "bootleg (Gayton Games)", "Space Echo (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacecho2,speakres, spacecho, spacecho, route16_state, 0, ROT270, "bootleg (Gayton Games)", "Space Echo (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, speakhlp, speakres, spacecho, spacecho, route16_state, 0, ROT270, "bootleg", "Speak & Help", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+
+GAME( 1981, ttmahjng, 0, ttmahjng, ttmahjng, route16_state, 0, ROT0, "Taito", "T.T Mahjong", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp
index 0112bb652d6..83365b09c6a 100644
--- a/src/mame/drivers/rowamet.cpp
+++ b/src/mame/drivers/rowamet.cpp
@@ -209,7 +209,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( rowamet_state::timer_a )
output().set_digit_value(++digit, patterns[m_p_ram[m_out_offs++]&15]);
}
-static MACHINE_CONFIG_START( rowamet, rowamet_state )
+static MACHINE_CONFIG_START( rowamet )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 1888888)
MCFG_CPU_PROGRAM_MAP(rowamet_map)
@@ -249,4 +249,4 @@ ROM_END
/-------------------------------------------------------------------*/
-GAME(198?, heavymtl, 0, rowamet, rowamet, driver_device, 0, ROT0, "Rowamet", "Heavy Metal", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(198?, heavymtl, 0, rowamet, rowamet, rowamet_state, 0, ROT0, "Rowamet", "Heavy Metal", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index a11bbb68aa5..12f3896d85b 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -3342,7 +3342,7 @@ static INPUT_PORTS_START( mjvegasa )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( royalmah, royalmah_state )
+static MACHINE_CONFIG_START( royalmah )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
@@ -4997,43 +4997,43 @@ DRIVER_INIT_MEMBER(royalmah_state,janptr96)
// the original Janputer (Sanritsu) is not yet dumped, basically Royal Mahjong but non-BET type
-GAME( 1981, royalmj, 0, royalmah, royalmah, driver_device, 0, ROT0, "Nichibutsu", "Royal Mahjong (Japan, v1.13)", 0 )
-GAME( 1981?, openmj, royalmj, royalmah, royalmah, driver_device, 0, ROT0, "Sapporo Mechanic", "Open Mahjong [BET] (Japan)", 0 )
-GAME( 1982, royalmah, royalmj, royalmah, royalmah, driver_device, 0, ROT0, "bootleg", "Royal Mahjong (Falcon bootleg, v1.01)", 0 )
-GAME( 1983, janyoup2, royalmj, ippatsu, janyoup2, driver_device, 0, ROT0, "Cosmo Denshi", "Janyou Part II (ver 7.03, July 1 1983)",0 )
-GAME( 1985, tahjong, royalmj, tahjong, tahjong, driver_device, 0, ROT0, "Bally Pond / Nasco", "Tahjong Yakitori (ver. 2-1)", 0 ) // 1985 Jun. 17
-GAME( 1981, janputer, 0, royalmah, royalmah, driver_device, 0, ROT0, "bootleg (Paradise Denshi Ltd. / Mes)", "New Double Bet Mahjong (bootleg of Royal Mahjong) [BET]", 0 ) // MT #05392
-GAME( 1984, rkjanoh2, 0, royalmah, royalmah, driver_device, 0, ROT0, "SNK / Dyna", "Royal King Jang Oh 2 (v4.00 1984 Jun 10th)", MACHINE_NOT_WORKING )
-GAME( 1984, janoh, 0, royalmah, royalmah, driver_device, 0, ROT0, "Toaplan", "Jan Oh (set 1)", MACHINE_NOT_WORKING )
-GAME( 1984, janoha, janoh, janoh, royalmah, driver_device, 0, ROT0, "Toaplan", "Jan Oh (set 2)", MACHINE_NOT_WORKING ) // this one is complete?
-GAME( 1985, jansou, 0, jansou, jansou, driver_device, 0, ROT0, "Dyna", "Jansou (set 1)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
-GAME( 1985, jansoua, jansou, jansou, jansou, driver_device, 0, ROT0, "Dyna", "Jansou (set 2)", 0 )
-GAME( 1986, dondenmj, 0, dondenmj, majs101b, driver_device, 0, ROT0, "Dyna Electronics", "Don Den Mahjong [BET] (Japan)", 0 )
+GAME( 1981, royalmj, 0, royalmah, royalmah, royalmah_state, 0, ROT0, "Nichibutsu", "Royal Mahjong (Japan, v1.13)", 0 )
+GAME( 1981?, openmj, royalmj, royalmah, royalmah, royalmah_state, 0, ROT0, "Sapporo Mechanic", "Open Mahjong [BET] (Japan)", 0 )
+GAME( 1982, royalmah, royalmj, royalmah, royalmah, royalmah_state, 0, ROT0, "bootleg", "Royal Mahjong (Falcon bootleg, v1.01)", 0 )
+GAME( 1983, janyoup2, royalmj, ippatsu, janyoup2, royalmah_state, 0, ROT0, "Cosmo Denshi", "Janyou Part II (ver 7.03, July 1 1983)",0 )
+GAME( 1985, tahjong, royalmj, tahjong, tahjong, royalmah_state, 0, ROT0, "Bally Pond / Nasco", "Tahjong Yakitori (ver. 2-1)", 0 ) // 1985 Jun. 17
+GAME( 1981, janputer, 0, royalmah, royalmah, royalmah_state, 0, ROT0, "bootleg (Paradise Denshi Ltd. / Mes)", "New Double Bet Mahjong (bootleg of Royal Mahjong) [BET]", 0 ) // MT #05392
+GAME( 1984, rkjanoh2, 0, royalmah, royalmah, royalmah_state, 0, ROT0, "SNK / Dyna", "Royal King Jang Oh 2 (v4.00 1984 Jun 10th)", MACHINE_NOT_WORKING )
+GAME( 1984, janoh, 0, royalmah, royalmah, royalmah_state, 0, ROT0, "Toaplan", "Jan Oh (set 1)", MACHINE_NOT_WORKING )
+GAME( 1984, janoha, janoh, janoh, royalmah, royalmah_state, 0, ROT0, "Toaplan", "Jan Oh (set 2)", MACHINE_NOT_WORKING ) // this one is complete?
+GAME( 1985, jansou, 0, jansou, jansou, royalmah_state, 0, ROT0, "Dyna", "Jansou (set 1)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+GAME( 1985, jansoua, jansou, jansou, jansou, royalmah_state, 0, ROT0, "Dyna", "Jansou (set 2)", 0 )
+GAME( 1986, dondenmj, 0, dondenmj, majs101b, royalmah_state, 0, ROT0, "Dyna Electronics", "Don Den Mahjong [BET] (Japan)", 0 )
GAME( 1986, ippatsu, 0, ippatsu, ippatsu, royalmah_state, ippatsu, ROT0, "Public Software / Paradais", "Ippatsu Gyakuten [BET] (Japan)", 0 )
-GAME( 1986, suzume, 0, suzume, suzume, driver_device, 0, ROT0, "Dyna Electronics", "Watashiha Suzumechan (Japan)", 0 )
-GAME( 1986, mjsiyoub, 0, royalmah, royalmah, driver_device, 0, ROT0, "Visco", "Mahjong Shiyou (Japan)", MACHINE_NOT_WORKING )
-GAME( 1986, mjsenka, 0, royalmah, royalmah, driver_device, 0, ROT0, "Visco", "Mahjong Senka (Japan)", MACHINE_NOT_WORKING )
-GAME( 1986, mjyarou, 0, mjyarou, mjyarou, driver_device, 0, ROT0, "Visco / Video System", "Mahjong Yarou [BET] (Japan, set 1)", MACHINE_IMPERFECT_GRAPHICS ) // girls aren't shown
-GAME( 1986, mjyarou2, mjyarou, mjyarou, mjyarou, driver_device, 0, ROT0, "Visco / Video System", "Mahjong Yarou [BET] (Japan, set 2)", MACHINE_IMPERFECT_GRAPHICS ) // girls aren't shown
-GAME( 1986?, mjclub, 0, mjclub, mjclub, driver_device, 0, ROT0, "Xex", "Mahjong Club [BET] (Japan)", 0 )
-GAME( 1987, mjdiplob, 0, mjdiplob, mjdiplob, driver_device, 0, ROT0, "Dynax", "Mahjong Diplomat [BET] (Japan)", 0 )
-GAME( 1987, tontonb, 0, tontonb, tontonb, driver_device, 0, ROT0, "Dynax", "Tonton [BET] (Japan, set 1)", 0 )
-GAME( 1987, makaijan, 0, makaijan, makaijan, driver_device, 0, ROT0, "Dynax", "Makaijan [BET] (Japan)", 0 )
-GAME( 1988, majs101b, 0, majs101b, majs101b, driver_device, 0, ROT0, "Dynax", "Mahjong Studio 101 [BET] (Japan)", 0 )
-GAME( 1988, mjapinky, 0, mjapinky, mjapinky, driver_device, 0, ROT0, "Dynax", "Almond Pinky [BET] (Japan)", 0 )
-GAME( 1989, mjdejavu, 0, mjdejavu, mjdejavu, driver_device, 0, ROT0, "Dynax", "Mahjong Shinkirou Deja Vu (Japan)", MACHINE_NOT_WORKING ) // MT #00964
-GAME( 1989, mjdejav2, mjdejavu, mjdejavu, mjdejavu, driver_device, 0, ROT0, "Dynax", "Mahjong Shinkirou Deja Vu 2 (Japan)", MACHINE_NOT_WORKING )
-GAME( 1989, mjderngr, 0, mjderngr, mjderngr, driver_device, 0, ROT0, "Dynax", "Mahjong Derringer (Japan)", 0 )
-GAME( 1989, daisyari, 0, daisyari, daisyari, driver_device, 0, ROT0, "Best System", "Daisyarin [BET] (Japan)", 0 )
-GAME( 1990, mjifb, 0, mjifb, mjifb, driver_device, 0, ROT0, "Dynax", "Mahjong If...? [BET]", 0 )
-GAME( 1990, mjifb2, mjifb, mjifb, mjifb, driver_device, 0, ROT0, "Dynax", "Mahjong If...? [BET](2921)", 0 )
-GAME( 1990, mjifb3, mjifb, mjifb, mjifb, driver_device, 0, ROT0, "Dynax", "Mahjong If...? [BET](2931)", 0 )
-GAME( 1991, mjvegasa, 0, mjvegasa, mjvegasa, driver_device, 0, ROT0, "Dynax", "Mahjong Vegas (Japan, unprotected)", 0 )
-GAME( 1991, mjvegas, mjvegasa, mjvegasa, mjvegasa, driver_device, 0, ROT0, "Dynax", "Mahjong Vegas (Japan)", MACHINE_NOT_WORKING )
-GAME( 1992, cafetime, 0, cafetime, cafetime, driver_device, 0, ROT0, "Dynax", "Mahjong Cafe Time", 0 )
-GAME( 1993, cafedoll, 0, mjifb, mjifb, driver_device, 0, ROT0, "Dynax", "Mahjong Cafe Doll (Japan)", MACHINE_NOT_WORKING )
-GAME( 1995, mjtensin, 0, mjtensin, mjtensin, driver_device, 0, ROT0, "Dynax", "Mahjong Tensinhai (Japan)", MACHINE_NOT_WORKING )
+GAME( 1986, suzume, 0, suzume, suzume, royalmah_state, 0, ROT0, "Dyna Electronics", "Watashiha Suzumechan (Japan)", 0 )
+GAME( 1986, mjsiyoub, 0, royalmah, royalmah, royalmah_state, 0, ROT0, "Visco", "Mahjong Shiyou (Japan)", MACHINE_NOT_WORKING )
+GAME( 1986, mjsenka, 0, royalmah, royalmah, royalmah_state, 0, ROT0, "Visco", "Mahjong Senka (Japan)", MACHINE_NOT_WORKING )
+GAME( 1986, mjyarou, 0, mjyarou, mjyarou, royalmah_state, 0, ROT0, "Visco / Video System", "Mahjong Yarou [BET] (Japan, set 1)", MACHINE_IMPERFECT_GRAPHICS ) // girls aren't shown
+GAME( 1986, mjyarou2, mjyarou, mjyarou, mjyarou, royalmah_state, 0, ROT0, "Visco / Video System", "Mahjong Yarou [BET] (Japan, set 2)", MACHINE_IMPERFECT_GRAPHICS ) // girls aren't shown
+GAME( 1986?, mjclub, 0, mjclub, mjclub, royalmah_state, 0, ROT0, "Xex", "Mahjong Club [BET] (Japan)", 0 )
+GAME( 1987, mjdiplob, 0, mjdiplob, mjdiplob, royalmah_state, 0, ROT0, "Dynax", "Mahjong Diplomat [BET] (Japan)", 0 )
+GAME( 1987, tontonb, 0, tontonb, tontonb, royalmah_state, 0, ROT0, "Dynax", "Tonton [BET] (Japan, set 1)", 0 )
+GAME( 1987, makaijan, 0, makaijan, makaijan, royalmah_state, 0, ROT0, "Dynax", "Makaijan [BET] (Japan)", 0 )
+GAME( 1988, majs101b, 0, majs101b, majs101b, royalmah_state, 0, ROT0, "Dynax", "Mahjong Studio 101 [BET] (Japan)", 0 )
+GAME( 1988, mjapinky, 0, mjapinky, mjapinky, royalmah_state, 0, ROT0, "Dynax", "Almond Pinky [BET] (Japan)", 0 )
+GAME( 1989, mjdejavu, 0, mjdejavu, mjdejavu, royalmah_state, 0, ROT0, "Dynax", "Mahjong Shinkirou Deja Vu (Japan)", MACHINE_NOT_WORKING ) // MT #00964
+GAME( 1989, mjdejav2, mjdejavu, mjdejavu, mjdejavu, royalmah_state, 0, ROT0, "Dynax", "Mahjong Shinkirou Deja Vu 2 (Japan)", MACHINE_NOT_WORKING )
+GAME( 1989, mjderngr, 0, mjderngr, mjderngr, royalmah_state, 0, ROT0, "Dynax", "Mahjong Derringer (Japan)", 0 )
+GAME( 1989, daisyari, 0, daisyari, daisyari, royalmah_state, 0, ROT0, "Best System", "Daisyarin [BET] (Japan)", 0 )
+GAME( 1990, mjifb, 0, mjifb, mjifb, royalmah_state, 0, ROT0, "Dynax", "Mahjong If...? [BET]", 0 )
+GAME( 1990, mjifb2, mjifb, mjifb, mjifb, royalmah_state, 0, ROT0, "Dynax", "Mahjong If...? [BET](2921)", 0 )
+GAME( 1990, mjifb3, mjifb, mjifb, mjifb, royalmah_state, 0, ROT0, "Dynax", "Mahjong If...? [BET](2931)", 0 )
+GAME( 1991, mjvegasa, 0, mjvegasa, mjvegasa, royalmah_state, 0, ROT0, "Dynax", "Mahjong Vegas (Japan, unprotected)", 0 )
+GAME( 1991, mjvegas, mjvegasa, mjvegasa, mjvegasa, royalmah_state, 0, ROT0, "Dynax", "Mahjong Vegas (Japan)", MACHINE_NOT_WORKING )
+GAME( 1992, cafetime, 0, cafetime, cafetime, royalmah_state, 0, ROT0, "Dynax", "Mahjong Cafe Time", 0 )
+GAME( 1993, cafedoll, 0, mjifb, mjifb, royalmah_state, 0, ROT0, "Dynax", "Mahjong Cafe Doll (Japan)", MACHINE_NOT_WORKING )
+GAME( 1995, mjtensin, 0, mjtensin, mjtensin, royalmah_state, 0, ROT0, "Dynax", "Mahjong Tensinhai (Japan)", MACHINE_NOT_WORKING )
GAME( 1996, janptr96, 0, janptr96, janptr96, royalmah_state, janptr96, ROT0, "Dynax", "Janputer '96 (Japan)", 0 )
GAME( 1997, janptrsp, 0, janptr96, janptr96, royalmah_state, janptr96, ROT0, "Dynax", "Janputer Special (Japan)", 0 )
-GAME( 1999, cafebrk, 0, mjifb, mjifb, driver_device, 0, ROT0, "Nakanihon / Dynax", "Mahjong Cafe Break", MACHINE_NOT_WORKING )
-GAME( 1999, cafepara, 0, mjifb, mjifb, driver_device, 0, ROT0, "Techno-Top", "Mahjong Cafe Paradise", MACHINE_NOT_WORKING )
+GAME( 1999, cafebrk, 0, mjifb, mjifb, royalmah_state, 0, ROT0, "Nakanihon / Dynax", "Mahjong Cafe Break", MACHINE_NOT_WORKING )
+GAME( 1999, cafepara, 0, mjifb, mjifb, royalmah_state, 0, ROT0, "Techno-Top", "Mahjong Cafe Paradise", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp
index 81c7feeb113..2dede3b784f 100644
--- a/src/mame/drivers/rpunch.cpp
+++ b/src/mame/drivers/rpunch.cpp
@@ -492,7 +492,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( rpunch, rpunch_state )
+static MACHINE_CONFIG_START( rpunch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
@@ -537,7 +537,7 @@ MACHINE_CONFIG_END
// c+p of above for now, bootleg hw, things need verifying
-static MACHINE_CONFIG_START( svolleybl, rpunch_state )
+static MACHINE_CONFIG_START( svolleybl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
@@ -839,12 +839,12 @@ DRIVER_INIT_MEMBER(rpunch_state,svolley)
*
*************************************/
-GAME( 1987, rabiolep, 0, rpunch, rabiolep, rpunch_state, rabiolep, ROT0, "V-System Co.", "Rabio Lepus (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1987, rpunch, rabiolep, rpunch, rpunch, rpunch_state, rabiolep, ROT0, "V-System Co. (Bally/Midway/Sente license)", "Rabbit Punch (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1989, svolley, 0, svolley, svolley, rpunch_state, svolley, ROT0, "V-System Co.", "Super Volleyball (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1989, svolleyk, svolley, svolley, svolley, rpunch_state, svolley, ROT0, "V-System Co.", "Super Volleyball (Korea)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
-GAME( 1989, svolleyu, svolley, svolley, svolley, rpunch_state, svolley, ROT0, "V-System Co. (Data East license)", "Super Volleyball (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1987, rabiolep, 0, rpunch, rabiolep, rpunch_state, rabiolep, ROT0, "V-System Co.", "Rabio Lepus (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1987, rpunch, rabiolep, rpunch, rpunch, rpunch_state, rabiolep, ROT0, "V-System Co. (Bally/Midway/Sente license)", "Rabbit Punch (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1989, svolley, 0, svolley, svolley, rpunch_state, svolley, ROT0, "V-System Co.", "Super Volleyball (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1989, svolleyk, svolley, svolley, svolley, rpunch_state, svolley, ROT0, "V-System Co.", "Super Volleyball (Korea)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
+GAME( 1989, svolleyu, svolley, svolley, svolley, rpunch_state, svolley, ROT0, "V-System Co. (Data East license)", "Super Volleyball (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
// video registers are changed, and there's some kind of RAM at 090xxx, possible a different sprite scheme for the bootleg (even if the original is intact)
// the sound system seems to be ripped from the later Power Spikes (see aerofgt.c)
-GAME( 1991, svolleybl,svolley, svolleybl,svolley, rpunch_state, svolley, ROT0, "bootleg", "Super Volleyball (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL ) // aka 1991 Spikes?
+GAME( 1991, svolleybl, svolley, svolleybl, svolley, rpunch_state, svolley, ROT0, "bootleg", "Super Volleyball (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_NO_COCKTAIL ) // aka 1991 Spikes?
diff --git a/src/mame/drivers/rsc55.cpp b/src/mame/drivers/rsc55.cpp
index 1a5cd15f49d..ac8586e542f 100644
--- a/src/mame/drivers/rsc55.cpp
+++ b/src/mame/drivers/rsc55.cpp
@@ -64,7 +64,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sc55_io, AS_IO, 16, sc55_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( sc55, sc55_state )
+static MACHINE_CONFIG_START( sc55 )
MCFG_CPU_ADD( "maincpu", P8098, XTAL_20MHz ) // probably not?
MCFG_CPU_PROGRAM_MAP( sc55_map )
MCFG_CPU_IO_MAP( sc55_io )
@@ -80,4 +80,4 @@ ROM_START( sc55 )
ROM_LOAD( "roland-gss.c_r15209281.ic26", 0x200000, 0x100000, CRC(e21ebc04) SHA1(7454b817778179806f3f9d1985b3a2ef67ace76f) )
ROM_END
-CONS( 1991, sc55, 0, 0, sc55, sc55, driver_device, 0, "Roland", "Sound Canvas SC-55", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+CONS( 1991, sc55, 0, 0, sc55, sc55, sc55_state, 0, "Roland", "Sound Canvas SC-55", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp
index 241f2d5648e..4735559109a 100644
--- a/src/mame/drivers/rt1715.cpp
+++ b/src/mame/drivers/rt1715.cpp
@@ -29,22 +29,28 @@ class rt1715_state : public driver_device
{
public:
rt1715_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) ,
- m_maincpu(*this, "maincpu"),
- m_ram(*this, RAM_TAG) { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_ram(*this, RAM_TAG)
+ {
+ }
- int m_led1_val;
- int m_led2_val;
DECLARE_WRITE8_MEMBER(rt1715_floppy_enable);
DECLARE_READ8_MEMBER(k7658_led1_r);
DECLARE_READ8_MEMBER(k7658_led2_r);
DECLARE_READ8_MEMBER(k7658_data_r);
DECLARE_WRITE8_MEMBER(k7658_data_w);
DECLARE_WRITE8_MEMBER(rt1715_rom_disable);
- virtual void machine_start() override;
- virtual void machine_reset() override;
DECLARE_PALETTE_INIT(rt1715);
I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels );
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+private:
+ int m_led1_val;
+ int m_led2_val;
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
};
@@ -266,7 +272,7 @@ static const z80_daisy_config rt1715_daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( rt1715, rt1715_state )
+static MACHINE_CONFIG_START( rt1715 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_2_4576MHz)
MCFG_CPU_PROGRAM_MAP(rt1715_mem)
@@ -372,7 +378,7 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, rt1715, 0, 0, rt1715, k7658, driver_device, 0, "Robotron", "Robotron PC-1715", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1986, rt1715lc, rt1715, 0, rt1715, k7658, driver_device, 0, "Robotron", "Robotron PC-1715 (latin/cyrillic)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1986, rt1715w, rt1715, 0, rt1715w, k7658, driver_device, 0, "Robotron", "Robotron PC-1715W", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, rt1715, 0, 0, rt1715, k7658, rt1715_state, 0, "Robotron", "Robotron PC-1715", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1986, rt1715lc, rt1715, 0, rt1715, k7658, rt1715_state, 0, "Robotron", "Robotron PC-1715 (latin/cyrillic)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1986, rt1715w, rt1715, 0, rt1715w, k7658, rt1715_state, 0, "Robotron", "Robotron PC-1715W", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp
index 30080a0aabf..dad1d26bba8 100644
--- a/src/mame/drivers/runaway.cpp
+++ b/src/mame/drivers/runaway.cpp
@@ -327,7 +327,7 @@ static GFXDECODE_START( qwak )
GFXDECODE_END
-static MACHINE_CONFIG_START( runaway, runaway_state )
+static MACHINE_CONFIG_START( runaway )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12096000 / 8) /* ? */
@@ -414,5 +414,5 @@ ROM_START( qwak )
ROM_END
-GAME( 1982, qwak, 0, qwak, qwak, driver_device, 0, ROT270, "Atari", "Qwak (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, runaway, 0, runaway, runaway, driver_device, 0, ROT0, "Atari", "Runaway (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, qwak, 0, qwak, qwak, runaway_state, 0, ROT270, "Atari", "Qwak (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, runaway, 0, runaway, runaway, runaway_state, 0, ROT0, "Atari", "Runaway (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index 774cda18314..737defe7ff4 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -384,7 +384,7 @@ void rungun_state::machine_reset()
m_sound_status = 0;
}
-static MACHINE_CONFIG_START( rng, rungun_state )
+static MACHINE_CONFIG_START( rng )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000)
@@ -950,18 +950,18 @@ ROM_END
// it appears that all other regions were switchable from the first release, so use the 'A' code.
// these are running WITHOUT the demux adapter, on a single screen
-GAME( 1993, rungun, 0, rng, rng, driver_device, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
-GAME( 1993, runguna, rungun, rng, rng, driver_device, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.4)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
-GAME( 1993, rungunb, rungun, rng, rng, driver_device, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 9.10, prototype?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
-GAME( 1993, rungunua, rungun, rng, rng, driver_device, 0, ROT0, "Konami", "Run and Gun (ver UBA 1993 10.8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
-GAME( 1993, slmdunkj, rungun, rng, rng, driver_device, 0, ROT0, "Konami", "Slam Dunk (ver JAA 1993 10.8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, rungun, 0, rng, rng, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, runguna, rungun, rng, rng, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.4)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, rungunb, rungun, rng, rng, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 9.10, prototype?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, rungunua, rungun, rng, rng, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver UBA 1993 10.8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
+GAME( 1993, slmdunkj, rungun, rng, rng, rungun_state, 0, ROT0, "Konami", "Slam Dunk (ver JAA 1993 10.8)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
// these sets have the demux adapter connected, and output to 2 screens (as the adapter represents a physical hardware difference, albeit a minor one, use clone sets)
-GAMEL( 1993, rungund, rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
-GAMEL( 1993, rungunad, rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.4) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
-GAMEL( 1993, rungunbd, rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 9.10, prototype?) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
-GAMEL( 1993, rungunuad,rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Konami", "Run and Gun (ver UBA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
-GAMEL( 1993, slmdunkjd,rungun, rng_dual, rng_dual, driver_device, 0, ROT0, "Konami", "Slam Dunk (ver JAA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, rungund, rungun, rng_dual, rng_dual, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, rungunad, rungun, rng_dual, rng_dual, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 10.4) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, rungunbd, rungun, rng_dual, rng_dual, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver EAA 1993 9.10, prototype?) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, rungunuad,rungun, rng_dual, rng_dual, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver UBA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, slmdunkjd,rungun, rng_dual, rng_dual, rungun_state, 0, ROT0, "Konami", "Slam Dunk (ver JAA 1993 10.8) (dual screen with demux adapter)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
// this set has no dipswitches to select single screen mode (they're not even displayed in test menu) it's twin cabinet ONLY
-GAMEL( 1993, rungunud, rungun, rng_dual, rng_nodip, driver_device, 0, ROT0, "Konami", "Run and Gun (ver UAB 1993 10.12, dedicated twin cabinet)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
+GAMEL( 1993, rungunud, rungun, rng_dual, rng_nodip, rungun_state, 0, ROT0, "Konami", "Run and Gun (ver UAB 1993 10.12, dedicated twin cabinet)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_rungun_dual )
diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp
index 2b3b3ffb79b..62fdcfeab43 100644
--- a/src/mame/drivers/rvoice.cpp
+++ b/src/mame/drivers/rvoice.cpp
@@ -86,7 +86,7 @@ public:
DECLARE_WRITE8_MEMBER(main_hd63701_internal_registers_w);
DECLARE_DRIVER_INIT(rvoicepc);
virtual void machine_reset() override;
- DECLARE_WRITE8_MEMBER(null_kbd_put);
+ void null_kbd_put(u8 data);
required_device<cpu_device> m_maincpu;
};
@@ -354,11 +354,11 @@ INPUT_PORTS_END
/******************************************************************************
Machine Drivers
******************************************************************************/
-WRITE8_MEMBER(rvoice_state::null_kbd_put)
+void rvoice_state::null_kbd_put(u8 data)
{
}
-static MACHINE_CONFIG_START( rvoicepc, rvoice_state )
+static MACHINE_CONFIG_START( rvoicepc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", HD63701, XTAL_7_3728MHz)
MCFG_CPU_PROGRAM_MAP(hd63701_main_mem)
@@ -377,7 +377,7 @@ static MACHINE_CONFIG_START( rvoicepc, rvoice_state )
/* sound hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(rvoice_state, null_kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(rvoice_state, null_kbd_put))
MACHINE_CONFIG_END
@@ -401,5 +401,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988?, rvoicepc, 0, 0, rvoicepc, rvoicepc, rvoice_state, rvoicepc, "Adaptive Communication Systems", "Realvoice PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1988?, rvoicepc, 0, 0, rvoicepc, rvoicepc, rvoice_state, rvoicepc, "Adaptive Communication Systems", "Realvoice PC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp
index 10d428a1446..d201c1db507 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -451,7 +451,7 @@ static GFXDECODE_START( rx78 )
GFXDECODE_END
-static MACHINE_CONFIG_START( rx78, rx78_state )
+static MACHINE_CONFIG_START( rx78 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK/7) // unknown divider
MCFG_CPU_PROGRAM_MAP(rx78_mem)
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index 5a0a2df0658..f574e3b9c71 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -379,7 +379,7 @@ DRIVER_INIT_MEMBER( s11_state, s11 )
m_irq_active = false;
}
-static MACHINE_CONFIG_START( s11, s11_state )
+static MACHINE_CONFIG_START( s11 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s11_main_map)
@@ -684,15 +684,15 @@ ROM_END
GAME( 1986, grand_l4, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Grand Lizard (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
GAME( 1986, grand_l3, grand_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Grand Lizard (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, hs_l4, 0, s11, s11, s11_state, s11, ROT0, "Williams", "High Speed (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, hs_l3, hs_l4, s11, s11, s11_state, s11, ROT0, "Williams", "High Speed (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l4, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l1, rdkng_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l2, rdkng_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l3, rdkng_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, hs_l4, 0, s11, s11, s11_state, s11, ROT0, "Williams", "High Speed (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, hs_l3, hs_l4, s11, s11, s11_state, s11, ROT0, "Williams", "High Speed (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l4, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l1, rdkng_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l2, rdkng_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l3, rdkng_l4, s11, s11, s11_state, s11, ROT0, "Williams", "Road Kings (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
GAME( 1986, tts_l2, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Tic-Tac-Strike (Shuffle) (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
GAME( 1986, tts_l1, tts_l2, s11, s11, s11_state, s11, ROT0, "Williams", "Tic-Tac-Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1987, gmine_l2, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Gold Mine (Shuffle) (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1987, tdawg_l1, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Top Dawg (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1987, shfin_l1, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Shuffle Inn (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1987, gmine_l2, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Gold Mine (Shuffle) (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1987, tdawg_l1, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Top Dawg (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1987, shfin_l1, 0, s11, s11, s11_state, s11, ROT0, "Williams", "Shuffle Inn (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index 97c172ba119..48ba3c9d55b 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -171,7 +171,7 @@ DRIVER_INIT_MEMBER( s11a_state, s11a )
s11_state::init_s11();
}
-static MACHINE_CONFIG_START( s11a, s11a_state )
+static MACHINE_CONFIG_START( s11a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s11a_main_map)
@@ -456,15 +456,15 @@ ROM_START(pb_p4)
ROM_LOAD("pbot_u19.l1", 0x18000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
ROM_END
-GAME(1987, f14_l1, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, f14_p3, f14_l1, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (P-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, f14_p4, f14_l1, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, f14_p5, f14_l1, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, fire_l3, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Fire! (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, fire_l2, fire_l3,s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Fire! (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, milln_l3, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Millionaire (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l5, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l1, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l2, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l3, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_p4, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, f14_l1, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, f14_p3, f14_l1, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (P-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, f14_p4, f14_l1, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, f14_p5, f14_l1, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "F-14 Tomcat (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, fire_l3, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Fire! (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, fire_l2, fire_l3, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Fire! (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, milln_l3, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Millionaire (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l5, 0, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l1, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l2, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l3, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_p4, pb_l5, s11a, s11a, s11a_state, s11a, ROT0, "Williams", "Pin-Bot (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index 9504203e5ea..f8a278cc275 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -250,7 +250,7 @@ DRIVER_INIT_MEMBER( s11b_state, s11b_invert )
m_invert = true;
}
-static MACHINE_CONFIG_START( s11b, s11b_state )
+static MACHINE_CONFIG_START( s11b )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s11b_main_map)
@@ -1067,57 +1067,57 @@ ROM_START(whirl_l2)
ROM_LOAD("whir_u20.l1", 0x20000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
ROM_END
-GAME(1989, bcats_l5, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Bad Cats (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bcats_l2, bcats_l5, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Bad Cats (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, bnzai_l3, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, bnzai_g3, bnzai_l3, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (L-3) Germany", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, bnzai_l1, bnzai_l3, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, bnzai_pa, bnzai_l3, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (P-A)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, bguns_l8, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (L-8)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, bguns_l7, bguns_l8, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (L-7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, bguns_la, bguns_l8, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (L-A)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, bguns_p1, bguns_l8, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (P-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_lg1, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (LG-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_lg3, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (LG-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_pu1, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (PU-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_la2, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_pa7, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (PA-7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, bk2k_pa5, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (PA-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, cycln_l5, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Cyclone (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, cycln_l4, cycln_l5, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Cyclone (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, cycln_l1, cycln_l5, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Cyclone (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, esha_la3, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, esha_ma3, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (Metallica) (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, esha_pr4, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (Family version) (PR-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, esha_lg1, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (German) (LG-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, esha_lg2, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (German) (LG-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, esha_la1, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (LA-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, esha_pa1, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (Prototype) (PA-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, eatpm_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LA-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, eatpm_l1, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LA-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, eatpm_l2, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, eatpm_4g, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LG-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, eatpm_4u, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LU-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, eatpm_p7, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (PA-7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, jokrz_l6, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Jokerz! (L-6)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, jokrz_l3, jokrz_l6, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Jokerz! (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, mousn_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LA-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, mousn_l1, mousn_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LA-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, mousn_lu, mousn_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LU-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, mousn_lx, mousn_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LX-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, polic_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Police Force (LA-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, polic_l3, polic_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Police Force (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, polic_l2, polic_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Police Force (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, spstn_l5, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Space Station (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, swrds_l2, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Swords of Fury (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, swrds_l1, swrds_l2, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Swords of Fury (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, taxi_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Lola) (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, taxi_l3, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Marilyn) (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, taxi_lu1, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Marilyn) (LU-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, taxi_lg1, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Marilyn) (L-1) Germany", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, taxi_p5, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989, tsptr_l3, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Transporter the Rescue (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, whirl_l3, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Whirlwind (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, whirl_l2, whirl_l3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Whirlwind (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, whirl_lg3, whirl_l3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Whirlwind (LG-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bcats_l5, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Bad Cats (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bcats_l2, bcats_l5, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Bad Cats (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, bnzai_l3, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, bnzai_g3, bnzai_l3, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (L-3) Germany", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, bnzai_l1, bnzai_l3, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, bnzai_pa, bnzai_l3, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Banzai Run (P-A)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, bguns_l8, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (L-8)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, bguns_l7, bguns_l8, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (L-7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, bguns_la, bguns_l8, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (L-A)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, bguns_p1, bguns_l8, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Big Guns (P-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_lg1, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (LG-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_lg3, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (LG-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_pu1, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (PU-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_la2, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_pa7, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (PA-7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, bk2k_pa5, bk2k_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Black Knight 2000 (PA-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, cycln_l5, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Cyclone (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, cycln_l4, cycln_l5, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Cyclone (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, cycln_l1, cycln_l5, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Cyclone (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, esha_la3, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, esha_ma3, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (Metallica) (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, esha_pr4, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (Family version) (PR-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, esha_lg1, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (German) (LG-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, esha_lg2, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (German) (LG-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, esha_la1, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (LA-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, esha_pa1, esha_la3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Earthshaker (Prototype) (PA-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, eatpm_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LA-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, eatpm_l1, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LA-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, eatpm_l2, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, eatpm_4g, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LG-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, eatpm_4u, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (LU-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, eatpm_p7, eatpm_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Elvira and the Party Monsters (PA-7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, jokrz_l6, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Jokerz! (L-6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, jokrz_l3, jokrz_l6, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Jokerz! (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, mousn_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LA-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, mousn_l1, mousn_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LA-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, mousn_lu, mousn_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LU-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, mousn_lx, mousn_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Mousin' Around! (LX-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, polic_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Police Force (LA-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, polic_l3, polic_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Police Force (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, polic_l2, polic_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Police Force (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, spstn_l5, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Space Station (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, swrds_l2, 0, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Swords of Fury (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, swrds_l1, swrds_l2, s11b, s11b, s11b_state, s11b, ROT0, "Williams", "Swords of Fury (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, taxi_l4, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Lola) (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, taxi_l3, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Marilyn) (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, taxi_lu1, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Marilyn) (LU-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, taxi_lg1, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (Marilyn) (L-1) Germany", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, taxi_p5, taxi_l4, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Taxi (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989, tsptr_l3, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Bally", "Transporter the Rescue (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, whirl_l3, 0, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Whirlwind (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, whirl_l2, whirl_l3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Whirlwind (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, whirl_lg3, whirl_l3, s11b, s11b, s11b_state, s11b_invert, ROT0, "Williams", "Whirlwind (LG-3)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index c18fb6f74a2..099b749dd5b 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -150,7 +150,7 @@ DRIVER_INIT_MEMBER(s11c_state,s11c)
timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
}
-static MACHINE_CONFIG_START( s11c, s11c_state )
+static MACHINE_CONFIG_START( s11c )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s11c_main_map)
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index d64759c4239..700c0703c2f 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -423,7 +423,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( s3_state::irq )
m_t_c++;
}
-static MACHINE_CONFIG_START( s3, s3_state )
+static MACHINE_CONFIG_START( s3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 3580000)
MCFG_CPU_PROGRAM_MAP(s3_main_map)
@@ -582,10 +582,10 @@ ROM_START(pkrno_l1)
ROM_LOAD("sound1.716", 0x0000, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
ROM_END
-GAME( 1977, httip_l1, 0, s3, s3, driver_device, 0, ROT0, "Williams", "Hot Tip (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1977, lucky_l1, 0, s3, s3, driver_device, 0, ROT0, "Williams", "Lucky Seven (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, wldcp_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "World Cup Soccer (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, cntct_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Contact (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, disco_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Disco Fever (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, phnix_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Phoenix (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, pkrno_l1, 0, s3a, s3, driver_device, 0, ROT0, "Williams", "Pokerino (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1977, httip_l1, 0, s3, s3, s3_state, 0, ROT0, "Williams", "Hot Tip (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1977, lucky_l1, 0, s3, s3, s3_state, 0, ROT0, "Williams", "Lucky Seven (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, wldcp_l1, 0, s3a, s3, s3_state, 0, ROT0, "Williams", "World Cup Soccer (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, cntct_l1, 0, s3a, s3, s3_state, 0, ROT0, "Williams", "Contact (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, disco_l1, 0, s3a, s3, s3_state, 0, ROT0, "Williams", "Disco Fever (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, phnix_l1, 0, s3a, s3, s3_state, 0, ROT0, "Williams", "Phoenix (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, pkrno_l1, 0, s3a, s3, s3_state, 0, ROT0, "Williams", "Pokerino (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index 41c30194278..3dd088603d2 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -417,7 +417,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( s4_state::irq )
m_t_c++;
}
-static MACHINE_CONFIG_START( s4, s4_state )
+static MACHINE_CONFIG_START( s4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 3580000)
MCFG_CPU_PROGRAM_MAP(s4_main_map)
@@ -683,20 +683,20 @@ ROM_START(tstrk_l1)
ROM_END
-GAME( 1979, flash_l2, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, flash_l1, flash_l2, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, flash_t1, flash_l2, s4a, s4, driver_device, 0, ROT0, "Williams", "Flash (T-1) Ted Estes", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, trizn_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Tri Zone (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, trizn_t1, trizn_l1, s4a, s4, driver_device, 0, ROT0, "Williams", "Tri Zone (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, tmwrp_l2, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Time Warp (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, tmwrp_t2, tmwrp_l2, s4a, s4, driver_device, 0, ROT0, "Williams", "Time Warp (T-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, stlwr_l2, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Stellar Wars (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-
-GAME( 1978, pomp_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Pompeii (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1978, arist_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Aristocrat (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1978, topaz_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Topaz (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1979, taurs_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Taurus (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1979, kingt_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "King Tut (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1980, omni_l1, 0, s4a, s4, driver_device, 0, ROT0, "Williams", "Omni (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1983, bstrk_l1, 0, s4, s4, driver_device, 0, ROT0, "Williams", "Big Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1983, tstrk_l1, 0, s4, s4, driver_device, 0, ROT0, "Williams", "Triple Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1979, flash_l2, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Flash (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, flash_l1, flash_l2, s4a, s4, s4_state, 0, ROT0, "Williams", "Flash (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, flash_t1, flash_l2, s4a, s4, s4_state, 0, ROT0, "Williams", "Flash (T-1) Ted Estes", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, trizn_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Tri Zone (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, trizn_t1, trizn_l1, s4a, s4, s4_state, 0, ROT0, "Williams", "Tri Zone (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, tmwrp_l2, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Time Warp (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, tmwrp_t2, tmwrp_l2, s4a, s4, s4_state, 0, ROT0, "Williams", "Time Warp (T-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, stlwr_l2, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Stellar Wars (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+
+GAME( 1978, pomp_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Pompeii (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1978, arist_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Aristocrat (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1978, topaz_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Topaz (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1979, taurs_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Taurus (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1979, kingt_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "King Tut (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1980, omni_l1, 0, s4a, s4, s4_state, 0, ROT0, "Williams", "Omni (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1983, bstrk_l1, 0, s4, s4, s4_state, 0, ROT0, "Williams", "Big Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1983, tstrk_l1, 0, s4, s4, s4_state, 0, ROT0, "Williams", "Triple Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index 34ff6fa5924..c9f170625b3 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -396,7 +396,7 @@ DRIVER_INIT_MEMBER( s6_state, s6 )
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
}
-static MACHINE_CONFIG_START( s6, s6_state )
+static MACHINE_CONFIG_START( s6 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, 3580000) // 6802 or 6808 could be used here
MCFG_CPU_PROGRAM_MAP(s6_main_map)
@@ -639,15 +639,15 @@ ROM_START(frpwr_l2)
ROM_END
-GAME( 1979, lzbal_l2, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Laser Ball (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, lzbal_t2, lzbal_l2, s6, s6, s6_state, s6, ROT0, "Williams", "Laser Ball (T-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, scrpn_l1, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Scorpion (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, scrpn_t1, scrpn_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Scorpion (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, blkou_l1, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Blackout (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, blkou_t1, blkou_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Blackout (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, lzbal_l2, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Laser Ball (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, lzbal_t2, lzbal_l2, s6, s6, s6_state, s6, ROT0, "Williams", "Laser Ball (T-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, scrpn_l1, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Scorpion (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, scrpn_t1, scrpn_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Scorpion (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, blkou_l1, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Blackout (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, blkou_t1, blkou_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Blackout (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
GAME( 1979, blkou_f1, blkou_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Blackout (L-1, French Speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, grgar_l1, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Gorgar (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, grgar_t1, grgar_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Gorgar (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, frpwr_l6, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Firepower (L-6)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1980, frpwr_t6, frpwr_l6, s6, s6, s6_state, s6, ROT0, "Williams", "Firepower (T-6)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1980, frpwr_l2, frpwr_l6, s6, s6, s6_state, s6, ROT0, "Williams", "Firepower (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1979, grgar_l1, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Gorgar (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, grgar_t1, grgar_l1, s6, s6, s6_state, s6, ROT0, "Williams", "Gorgar (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, frpwr_l6, 0, s6, s6, s6_state, s6, ROT0, "Williams", "Firepower (L-6)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1980, frpwr_t6, frpwr_l6, s6, s6, s6_state, s6, ROT0, "Williams", "Firepower (T-6)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1980, frpwr_l2, frpwr_l6, s6, s6, s6_state, s6, ROT0, "Williams", "Firepower (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp
index d1a6eaa0e4b..6e055c6b28e 100644
--- a/src/mame/drivers/s6a.cpp
+++ b/src/mame/drivers/s6a.cpp
@@ -379,7 +379,7 @@ DRIVER_INIT_MEMBER( s6a_state, s6a )
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
}
-static MACHINE_CONFIG_START( s6a, s6a_state )
+static MACHINE_CONFIG_START( s6a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, 3580000)
MCFG_CPU_PROGRAM_MAP(s6a_main_map)
@@ -507,7 +507,7 @@ ROM_START(alpok_f6)
ROM_END
-GAME(1980,algar_l1, 0, s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Algar (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980,alpok_l6, 0, s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Alien Poker (L-6)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980,alpok_l2, alpok_l6,s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Alien Poker (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1980,alpok_f6, alpok_l6,s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Alien Poker (L-6 French speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, algar_l1, 0, s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Algar (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, alpok_l6, 0, s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Alien Poker (L-6)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, alpok_l2, alpok_l6, s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Alien Poker (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, alpok_f6, alpok_l6, s6a, s6a, s6a_state, s6a, ROT0, "Williams", "Alien Poker (L-6 French speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index dd38d479a5e..5bef3f1258e 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -422,7 +422,7 @@ DRIVER_INIT_MEMBER( s7_state, s7 )
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
}
-static MACHINE_CONFIG_START( s7, s7_state )
+static MACHINE_CONFIG_START( s7 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, 3580000)
MCFG_CPU_PROGRAM_MAP(s7_main_map)
@@ -865,29 +865,29 @@ ROM_END
-GAME( 1980, bk_l4, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Black Knight (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, bk_f4, bk_l4, s7, s7, s7_state, s7, ROT0, "Williams", "Black Knight (L-4, French speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, bk_l3, bk_l4, s7, s7, s7_state, s7, ROT0, "Williams", "Black Knight (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, csmic_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Cosmic Gunfight (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, jngld_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Jungle Lord (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, jngld_l1, jngld_l2, s7, s7, s7_state, s7, ROT0, "Williams", "Jungle Lord (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, pharo_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Pharaoh (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, solar_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Solar Fire (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1982, thund_p1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Thunderball (P-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, thund_p2, thund_p1, s7, s7, s7_state, s7, ROT0, "Williams", "Thunderball (P-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1982, thund_p3, thund_p1, s7, s7, s7_state, s7, ROT0, "Williams", "Thunderball (P-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1981, hypbl_l4, 0, s7, s7, s7_state, s7, ROT0, "Williams", "HyperBall (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, hypbl_l3, hypbl_l4, s7, s7, s7_state, s7, ROT0, "Williams", "HyperBall (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, hypbl_l2, hypbl_l4, s7, s7, s7_state, s7, ROT0, "Williams", "HyperBall (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1981, barra_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Barracora (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1982, vrkon_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Varkon (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1982, tmfnt_l5, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Time Fantasy (L-5)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1982, wrlok_l3, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Warlok (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1982, dfndr_l4, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Defender (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1983, jst_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Joust (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1983, jst_l1, jst_l2, s7, s7, s7_state, s7, ROT0, "Williams", "Joust (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1983, lsrcu_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Laser Cue (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1983, fpwr2_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Firepower II (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1984, strlt_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Star Light (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, bk_l4, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Black Knight (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, bk_f4, bk_l4, s7, s7, s7_state, s7, ROT0, "Williams", "Black Knight (L-4, French speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, bk_l3, bk_l4, s7, s7, s7_state, s7, ROT0, "Williams", "Black Knight (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, csmic_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Cosmic Gunfight (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, jngld_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Jungle Lord (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, jngld_l1, jngld_l2, s7, s7, s7_state, s7, ROT0, "Williams", "Jungle Lord (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, pharo_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Pharaoh (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, solar_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Solar Fire (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1982, thund_p1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Thunderball (P-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, thund_p2, thund_p1, s7, s7, s7_state, s7, ROT0, "Williams", "Thunderball (P-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1982, thund_p3, thund_p1, s7, s7, s7_state, s7, ROT0, "Williams", "Thunderball (P-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1981, hypbl_l4, 0, s7, s7, s7_state, s7, ROT0, "Williams", "HyperBall (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, hypbl_l3, hypbl_l4, s7, s7, s7_state, s7, ROT0, "Williams", "HyperBall (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, hypbl_l2, hypbl_l4, s7, s7, s7_state, s7, ROT0, "Williams", "HyperBall (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1981, barra_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Barracora (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1982, vrkon_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Varkon (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1982, tmfnt_l5, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Time Fantasy (L-5)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1982, wrlok_l3, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Warlok (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1982, dfndr_l4, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Defender (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1983, jst_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Joust (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1983, jst_l1, jst_l2, s7, s7, s7_state, s7, ROT0, "Williams", "Joust (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1983, lsrcu_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Laser Cue (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1983, fpwr2_l2, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Firepower II (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1984, strlt_l1, 0, s7, s7, s7_state, s7, ROT0, "Williams", "Star Light (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
// same hardware, unknown manufacturer
-GAME( 1983, wldtexas, 0, s7, s7, s7_state, s7, ROT0, "<unknown>", "Wild Texas", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1983, wldtexas, 0, s7, s7, s7_state, s7, ROT0, "<unknown>", "Wild Texas", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index afa9baa5c14..5d664d0a067 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -304,7 +304,7 @@ DRIVER_INIT_MEMBER( s8_state, s8 )
m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
}
-static MACHINE_CONFIG_START( s8, s8_state )
+static MACHINE_CONFIG_START( s8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s8_main_map)
@@ -388,5 +388,5 @@ ROM_START(pfevr_p3)
ROM_END
-GAME(1984,pfevr_l2, 0, s8, s8, s8_state, s8, ROT0, "Williams", "Pennant Fever (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1984,pfevr_p3, pfevr_l2, s8, s8, s8_state, s8, ROT0, "Williams", "Pennant Fever (P-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1984, pfevr_l2, 0, s8, s8, s8_state, s8, ROT0, "Williams", "Pennant Fever (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1984, pfevr_p3, pfevr_l2, s8, s8, s8_state, s8, ROT0, "Williams", "Pennant Fever (P-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index 2158f1a5fb2..22bd0234379 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -276,7 +276,7 @@ DRIVER_INIT_MEMBER( s8a_state, s8a )
m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
}
-static MACHINE_CONFIG_START( s8a, s8a_state )
+static MACHINE_CONFIG_START( s8a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s8a_main_map)
@@ -351,4 +351,4 @@ ROM_START(scrzy_l1)
ROM_LOAD("ic49.bin", 0x0000, 0x4000, CRC(bcc8ccc4) SHA1(2312f9cc4f5a2dadfbfa61d13c31bb5838adf152) )
ROM_END
-GAME(1984,scrzy_l1, 0, s8a, s8a, s8a_state, s8a, ROT0, "Williams", "Still Crazy", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1984, scrzy_l1, 0, s8a, s8a, s8a_state, s8a, ROT0, "Williams", "Still Crazy", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index 9ed3d272b49..946cc3604be 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -310,7 +310,7 @@ DRIVER_INIT_MEMBER( s9_state, s9 )
m_irq_timer->adjust(attotime::from_ticks(980,1e6),1);
}
-static MACHINE_CONFIG_START( s9, s9_state )
+static MACHINE_CONFIG_START( s9 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6808, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(s9_main_map)
@@ -510,13 +510,13 @@ ROM_START(alcat_l7)
ROM_END
-GAME( 1983, ratrc_l1, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Rat Race (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1985, sorcr_l1, sorcr_l2, s9, s9, s9_state, s9, ROT0, "Williams", "Sorcerer (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1985, sorcr_l2, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Sorcerer (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1984, sshtl_l7, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Space Shuttle (L-7)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1984, sshtl_l3, sshtl_l7, s9, s9, s9_state, s9, ROT0, "Williams", "Space Shuttle (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1985, comet_l4, comet_l5, s9, s9, s9_state, s9, ROT0, "Williams", "Comet (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1985, comet_l5, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Comet (L-5)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1983, ratrc_l1, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Rat Race (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1985, sorcr_l1, sorcr_l2, s9, s9, s9_state, s9, ROT0, "Williams", "Sorcerer (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1985, sorcr_l2, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Sorcerer (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1984, sshtl_l7, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Space Shuttle (L-7)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1984, sshtl_l3, sshtl_l7, s9, s9, s9_state, s9, ROT0, "Williams", "Space Shuttle (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1985, comet_l4, comet_l5, s9, s9, s9_state, s9, ROT0, "Williams", "Comet (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1985, comet_l5, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Comet (L-5)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
GAME( 1984, szone_l5, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Strike Zone (Shuffle) (L-5)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
GAME( 1984, szone_l2, szone_l5, s9, s9, s9_state, s9, ROT0, "Williams", "Strike Zone (Shuffle) (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1985, alcat_l7, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Alley Cats (Shuffle) (L-7)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1985, alcat_l7, 0, s9, s9, s9_state, s9, ROT0, "Williams", "Alley Cats (Shuffle) (L-7)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/sacstate.cpp b/src/mame/drivers/sacstate.cpp
index d10e813daca..067b2703563 100644
--- a/src/mame/drivers/sacstate.cpp
+++ b/src/mame/drivers/sacstate.cpp
@@ -56,7 +56,7 @@ public:
DECLARE_READ8_MEMBER(port01_r);
DECLARE_READ8_MEMBER(port04_r);
DECLARE_WRITE8_MEMBER(port08_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
uint8_t m_term_data;
uint8_t m_val;
virtual void machine_reset() override;
@@ -117,7 +117,7 @@ static INPUT_PORTS_START( sacstate )
PORT_CONFSETTING( 0x08, "B")
INPUT_PORTS_END
-WRITE8_MEMBER( sacstate_state::kbd_put )
+void sacstate_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -128,7 +128,7 @@ void sacstate_state::machine_reset()
m_val = ioport("CONFIG")->read();
}
-static MACHINE_CONFIG_START( sacstate, sacstate_state )
+static MACHINE_CONFIG_START( sacstate )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8008, 800000)
MCFG_CPU_PROGRAM_MAP(sacstate_mem)
@@ -136,7 +136,7 @@ static MACHINE_CONFIG_START( sacstate, sacstate_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(sacstate_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(sacstate_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -154,5 +154,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1973, sacstate, 0, 0, sacstate, sacstate, driver_device, 0, "SacState", "SacState 8008", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1973, sacstate, 0, 0, sacstate, sacstate, sacstate_state, 0, "SacState", "SacState 8008", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index 31ac6dc22df..754ec5fa16e 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -399,7 +399,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( safarir, safarir_state )
+static MACHINE_CONFIG_START( safarir )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080A, XTAL_18MHz/12) /* 1.5 MHz ? */
@@ -500,5 +500,5 @@ ROM_END
*
*************************************/
-GAME( 1979, safarir, 0, safarir, safarir, driver_device, 0, ROT90, "SNK (Taito license)", "Safari Rally (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1979, safarirj, safarir, safarir, safarir, driver_device, 0, ROT90, "SNK", "Safari Rally (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, safarir, 0, safarir, safarir, safarir_state, 0, ROT90, "SNK (Taito license)", "Safari Rally (World)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1979, safarirj, safarir, safarir, safarir, safarir_state, 0, ROT90, "SNK", "Safari Rally (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 645f624f9e3..ad6df892d7a 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -407,7 +407,7 @@ READ16_MEMBER(sage2_state::rom_r)
// MACHINE_CONFIG( sage2 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( sage2, sage2_state )
+static MACHINE_CONFIG_START( sage2 )
// basic machine hardware
MCFG_CPU_ADD(M68000_TAG, M68000, XTAL_16MHz/2)
MCFG_CPU_PROGRAM_MAP(sage2_mem)
@@ -525,5 +525,5 @@ DRIVER_INIT_MEMBER(sage2_state,sage2)
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1982, sage2, 0, 0, sage2, sage2, sage2_state, sage2, "Sage Technology", "Sage II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, sage2, 0, 0, sage2, sage2, sage2_state, sage2, "Sage Technology", "Sage II", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sam.cpp b/src/mame/drivers/sam.cpp
index 45b78cf3597..be023855e72 100644
--- a/src/mame/drivers/sam.cpp
+++ b/src/mame/drivers/sam.cpp
@@ -20,7 +20,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sam )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sam, sam_state )
+static MACHINE_CONFIG_START( sam )
MCFG_CPU_ADD("maincpu", ARM7, XTAL_40MHz) // AT91R40008
MCFG_CPU_PROGRAM_MAP(sam_map)
MACHINE_CONFIG_END
@@ -1068,213 +1068,213 @@ ROM_END
#define MACHINE_FLAGS (MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_MECHANICAL)
-GAME( 2009, 24_130 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.30", MACHINE_FLAGS)
-GAME( 2009, 24_140 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.40", MACHINE_FLAGS)
-GAME( 2009, 24_144 ,24_150, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.44", MACHINE_FLAGS)
-GAME( 2009, 24_150 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "24 v1.50", MACHINE_FLAGS)
-GAME( 2008, bdk_130 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.30", MACHINE_FLAGS)
-GAME( 2008, bdk_150 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.50", MACHINE_FLAGS)
-GAME( 2008, bdk_160 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v1.60", MACHINE_FLAGS)
-GAME( 2008, bdk_200 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.00", MACHINE_FLAGS)
-GAME( 2008, bdk_210 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.10", MACHINE_FLAGS)
-GAME( 2008, bdk_220 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.20", MACHINE_FLAGS)
-GAME( 2008, bdk_290 ,bdk_294, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.90", MACHINE_FLAGS)
-GAME( 2008, bdk_294 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Batman - The Dark Knight v2.94", MACHINE_FLAGS)
+GAME( 2009, 24_130 ,24_150, sam, sam, sam_state, 0, ROT0, "Stern", "24 v1.30", MACHINE_FLAGS)
+GAME( 2009, 24_140 ,24_150, sam, sam, sam_state, 0, ROT0, "Stern", "24 v1.40", MACHINE_FLAGS)
+GAME( 2009, 24_144 ,24_150, sam, sam, sam_state, 0, ROT0, "Stern", "24 v1.44", MACHINE_FLAGS)
+GAME( 2009, 24_150 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "24 v1.50", MACHINE_FLAGS)
+GAME( 2008, bdk_130 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v1.30", MACHINE_FLAGS)
+GAME( 2008, bdk_150 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v1.50", MACHINE_FLAGS)
+GAME( 2008, bdk_160 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v1.60", MACHINE_FLAGS)
+GAME( 2008, bdk_200 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v2.00", MACHINE_FLAGS)
+GAME( 2008, bdk_210 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v2.10", MACHINE_FLAGS)
+GAME( 2008, bdk_220 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v2.20", MACHINE_FLAGS)
+GAME( 2008, bdk_290 ,bdk_294, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v2.90", MACHINE_FLAGS)
+GAME( 2008, bdk_294 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Batman - The Dark Knight v2.94", MACHINE_FLAGS)
// Missing version 1.30 (26-Jan-2010), 1.20 (25-Jan-2010), 1.10 (21-Jan-2010), 1.00 (15-Jan-2010)
-GAME( 2010, bbh_140 ,bbh_160, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.40", MACHINE_FLAGS)
-GAME( 2010, bbh_150 ,bbh_160, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.50", MACHINE_FLAGS)
-GAME( 2010, bbh_160 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.60", MACHINE_FLAGS)
-GAME( 2008, csi_102 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.02", MACHINE_FLAGS)
-GAME( 2008, csi_103 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.03", MACHINE_FLAGS)
-GAME( 2008, csi_104 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v1.04", MACHINE_FLAGS)
-GAME( 2008, csi_200 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.00", MACHINE_FLAGS)
-GAME( 2008, csi_210 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.10", MACHINE_FLAGS)
-GAME( 2008, csi_230 ,csi_240, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.30", MACHINE_FLAGS)
-GAME( 2008, csi_240 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "C.S.I. v2.40", MACHINE_FLAGS)
-GAME( 2007, fg_1000af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,French)", MACHINE_FLAGS)
-GAME( 2007, fg_1000ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,German)", MACHINE_FLAGS)
-GAME( 2007, fg_1000ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, fg_1000al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v10.0 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, fg_110af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,French)", MACHINE_FLAGS)
-GAME( 2007, fg_110ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,German)", MACHINE_FLAGS)
-GAME( 2007, fg_110ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, fg_110al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v11.0 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, fg_120af ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,French)", MACHINE_FLAGS)
-GAME( 2007, fg_120ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,German)", MACHINE_FLAGS)
-GAME( 2007, fg_120ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, fg_120al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v12.0 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, fg_300ai ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v3.0 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, fg_400a ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v4.0 (English)", MACHINE_FLAGS)
-GAME( 2007, fg_400ag ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v4.0 (English,German)", MACHINE_FLAGS)
-GAME( 2007, fg_700af ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v7.0 (English,French)", MACHINE_FLAGS)
-GAME( 2007, fg_700al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v7.0 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, fg_800al ,fg_120af, sam, sam, driver_device, 0, ROT0, "Stern", "Family Guy v8.0 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2010, im2_100 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.00", MACHINE_FLAGS)
-GAME( 2010, im2_110 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.10", MACHINE_FLAGS)
-GAME( 2010, im2_120 ,im2_140, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.20", MACHINE_FLAGS)
-GAME( 2010, im2_140 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Iron Man 2 v1.40", MACHINE_FLAGS)
-GAME( 2008, indy_113a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13", MACHINE_FLAGS)
-GAME( 2008, indy_113f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (French)", MACHINE_FLAGS)
-GAME( 2008, indy_113g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (German)", MACHINE_FLAGS)
-GAME( 2008, indy_113i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (Italian)", MACHINE_FLAGS)
-GAME( 2008, indy_113l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.13 (Spanish)", MACHINE_FLAGS)
-GAME( 2008, indy_114a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14", MACHINE_FLAGS)
-GAME( 2008, indy_114f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (French)", MACHINE_FLAGS)
-GAME( 2008, indy_114g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (German)", MACHINE_FLAGS)
-GAME( 2008, indy_114i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (Italian)", MACHINE_FLAGS)
-GAME( 2008, indy_114l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.14 (Spanish)", MACHINE_FLAGS)
-GAME( 2008, indy_116a ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16", MACHINE_FLAGS)
-GAME( 2008, indy_116f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (French)", MACHINE_FLAGS)
-GAME( 2008, indy_116g ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (German)", MACHINE_FLAGS)
-GAME( 2008, indy_116i ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (Italian)", MACHINE_FLAGS)
-GAME( 2008, indy_116l ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v1.16 (Spanish)", MACHINE_FLAGS)
-GAME( 2008, indy_210 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v2.10", MACHINE_FLAGS)
-GAME( 2008, indy_210f ,indy_210, sam, sam, driver_device, 0, ROT0, "Stern", "Indiana Jones v2.10 (French)", MACHINE_FLAGS)
+GAME( 2010, bbh_140 ,bbh_160, sam, sam, sam_state, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.40", MACHINE_FLAGS)
+GAME( 2010, bbh_150 ,bbh_160, sam, sam, sam_state, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.50", MACHINE_FLAGS)
+GAME( 2010, bbh_160 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Big Buck Hunter Pro v1.60", MACHINE_FLAGS)
+GAME( 2008, csi_102 ,csi_240, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v1.02", MACHINE_FLAGS)
+GAME( 2008, csi_103 ,csi_240, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v1.03", MACHINE_FLAGS)
+GAME( 2008, csi_104 ,csi_240, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v1.04", MACHINE_FLAGS)
+GAME( 2008, csi_200 ,csi_240, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v2.00", MACHINE_FLAGS)
+GAME( 2008, csi_210 ,csi_240, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v2.10", MACHINE_FLAGS)
+GAME( 2008, csi_230 ,csi_240, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v2.30", MACHINE_FLAGS)
+GAME( 2008, csi_240 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "C.S.I. v2.40", MACHINE_FLAGS)
+GAME( 2007, fg_1000af ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v10.0 (English,French)", MACHINE_FLAGS)
+GAME( 2007, fg_1000ag ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v10.0 (English,German)", MACHINE_FLAGS)
+GAME( 2007, fg_1000ai ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v10.0 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, fg_1000al ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v10.0 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, fg_110af ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v11.0 (English,French)", MACHINE_FLAGS)
+GAME( 2007, fg_110ag ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v11.0 (English,German)", MACHINE_FLAGS)
+GAME( 2007, fg_110ai ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v11.0 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, fg_110al ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v11.0 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, fg_120af ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v12.0 (English,French)", MACHINE_FLAGS)
+GAME( 2007, fg_120ag ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v12.0 (English,German)", MACHINE_FLAGS)
+GAME( 2007, fg_120ai ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v12.0 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, fg_120al ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v12.0 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, fg_300ai ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v3.0 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, fg_400a ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v4.0 (English)", MACHINE_FLAGS)
+GAME( 2007, fg_400ag ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v4.0 (English,German)", MACHINE_FLAGS)
+GAME( 2007, fg_700af ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v7.0 (English,French)", MACHINE_FLAGS)
+GAME( 2007, fg_700al ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v7.0 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, fg_800al ,fg_120af, sam, sam, sam_state, 0, ROT0, "Stern", "Family Guy v8.0 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2010, im2_100 ,im2_140, sam, sam, sam_state, 0, ROT0, "Stern", "Iron Man 2 v1.00", MACHINE_FLAGS)
+GAME( 2010, im2_110 ,im2_140, sam, sam, sam_state, 0, ROT0, "Stern", "Iron Man 2 v1.10", MACHINE_FLAGS)
+GAME( 2010, im2_120 ,im2_140, sam, sam, sam_state, 0, ROT0, "Stern", "Iron Man 2 v1.20", MACHINE_FLAGS)
+GAME( 2010, im2_140 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Iron Man 2 v1.40", MACHINE_FLAGS)
+GAME( 2008, indy_113a ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.13", MACHINE_FLAGS)
+GAME( 2008, indy_113f ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.13 (French)", MACHINE_FLAGS)
+GAME( 2008, indy_113g ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.13 (German)", MACHINE_FLAGS)
+GAME( 2008, indy_113i ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.13 (Italian)", MACHINE_FLAGS)
+GAME( 2008, indy_113l ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.13 (Spanish)", MACHINE_FLAGS)
+GAME( 2008, indy_114a ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.14", MACHINE_FLAGS)
+GAME( 2008, indy_114f ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.14 (French)", MACHINE_FLAGS)
+GAME( 2008, indy_114g ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.14 (German)", MACHINE_FLAGS)
+GAME( 2008, indy_114i ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.14 (Italian)", MACHINE_FLAGS)
+GAME( 2008, indy_114l ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.14 (Spanish)", MACHINE_FLAGS)
+GAME( 2008, indy_116a ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.16", MACHINE_FLAGS)
+GAME( 2008, indy_116f ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.16 (French)", MACHINE_FLAGS)
+GAME( 2008, indy_116g ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.16 (German)", MACHINE_FLAGS)
+GAME( 2008, indy_116i ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.16 (Italian)", MACHINE_FLAGS)
+GAME( 2008, indy_116l ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v1.16 (Spanish)", MACHINE_FLAGS)
+GAME( 2008, indy_210 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v2.10", MACHINE_FLAGS)
+GAME( 2008, indy_210f ,indy_210, sam, sam, sam_state, 0, ROT0, "Stern", "Indiana Jones v2.10 (French)", MACHINE_FLAGS)
// Missing versions 4.00 (21-May-2009), 3.00 (20-May-2009), 2.00 (19-May-2009) and 1.00 (14-May-2009) of NBA
-GAME( 2009, nba_500 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v5.00", MACHINE_FLAGS)
-GAME( 2009, nba_600 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v6.00", MACHINE_FLAGS)
-GAME( 2009, nba_700 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v7.00", MACHINE_FLAGS)
-GAME( 2009, nba_801 ,nba_802, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v8.01", MACHINE_FLAGS)
-GAME( 2009, nba_802 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "NBA v8.02", MACHINE_FLAGS)
-GAME( 2006, potc_110af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,French)", MACHINE_FLAGS)
-GAME( 2006, potc_110ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,Italian)", MACHINE_FLAGS)
-GAME( 2006, potc_110gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (German,French)", MACHINE_FLAGS)
+GAME( 2009, nba_500 ,nba_802, sam, sam, sam_state, 0, ROT0, "Stern", "NBA v5.00", MACHINE_FLAGS)
+GAME( 2009, nba_600 ,nba_802, sam, sam, sam_state, 0, ROT0, "Stern", "NBA v6.00", MACHINE_FLAGS)
+GAME( 2009, nba_700 ,nba_802, sam, sam, sam_state, 0, ROT0, "Stern", "NBA v7.00", MACHINE_FLAGS)
+GAME( 2009, nba_801 ,nba_802, sam, sam, sam_state, 0, ROT0, "Stern", "NBA v8.01", MACHINE_FLAGS)
+GAME( 2009, nba_802 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "NBA v8.02", MACHINE_FLAGS)
+GAME( 2006, potc_110af ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,French)", MACHINE_FLAGS)
+GAME( 2006, potc_110ai ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (English,Italian)", MACHINE_FLAGS)
+GAME( 2006, potc_110gf ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.10 (German,French)", MACHINE_FLAGS)
// Missing version 1.11 for other languages ??? August 17, 2006
-GAME( 2006, potc_111as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.11 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2006, potc_111as ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.11 (English,Spanish)", MACHINE_FLAGS)
// Missing version 1.12 August 24, 2006
-GAME( 2006, potc_113af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,French)", MACHINE_FLAGS)
-GAME( 2006, potc_113ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Italian)", MACHINE_FLAGS)
-GAME( 2006, potc_113as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2006, potc_113gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (German,French)", MACHINE_FLAGS)
+GAME( 2006, potc_113af ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,French)", MACHINE_FLAGS)
+GAME( 2006, potc_113ai ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Italian)", MACHINE_FLAGS)
+GAME( 2006, potc_113as ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2006, potc_113gf ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.13 (German,French)", MACHINE_FLAGS)
// Missing version 1.14 October 11, 2006
-GAME( 2006, potc_115af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,French)", MACHINE_FLAGS)
-GAME( 2006, potc_115ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Italian)", MACHINE_FLAGS)
-GAME( 2006, potc_115as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2006, potc_115gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (German,French)", MACHINE_FLAGS)
+GAME( 2006, potc_115af ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,French)", MACHINE_FLAGS)
+GAME( 2006, potc_115ai ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Italian)", MACHINE_FLAGS)
+GAME( 2006, potc_115as ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2006, potc_115gf ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v1.15 (German,French)", MACHINE_FLAGS)
// Missing version 2.00 April 11, 2007
-GAME( 2007, potc_300af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,French)", MACHINE_FLAGS)
-GAME( 2007, potc_300ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, potc_300as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, potc_300gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (German,French)", MACHINE_FLAGS)
-GAME( 2007, potc_400af ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,French)", MACHINE_FLAGS)
-GAME( 2007, potc_400ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, potc_400as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, potc_400gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (German,French)", MACHINE_FLAGS)
+GAME( 2007, potc_300af ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,French)", MACHINE_FLAGS)
+GAME( 2007, potc_300ai ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, potc_300as ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, potc_300gf ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v3.00 (German,French)", MACHINE_FLAGS)
+GAME( 2007, potc_400af ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,French)", MACHINE_FLAGS)
+GAME( 2007, potc_400ai ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, potc_400as ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, potc_400gf ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v4.00 (German,French)", MACHINE_FLAGS)
// Missing version 5.00 September 27, 2007
-GAME( 2007, potc_600 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,French)", MACHINE_FLAGS)
-GAME( 2007, potc_600ai ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, potc_600as ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, potc_600gf ,potc_600, sam, sam, driver_device, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (German,French)", MACHINE_FLAGS)
-GAME( 2008, sh_141 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Shrek v1.41", MACHINE_FLAGS)
-GAME( 2006, skc_090 ,skc_105, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v0.90 New Jersey", MACHINE_FLAGS)
+GAME( 2007, potc_600 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,French)", MACHINE_FLAGS)
+GAME( 2007, potc_600ai ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, potc_600as ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, potc_600gf ,potc_600, sam, sam, sam_state, 0, ROT0, "Stern", "Pirates of the Caribbean v6.00 (German,French)", MACHINE_FLAGS)
+GAME( 2008, sh_141 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Shrek v1.41", MACHINE_FLAGS)
+GAME( 2006, skc_090 ,skc_105, sam, sam, sam_state, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v0.90 New Jersey", MACHINE_FLAGS)
// Missing version 1.00
// Missing version 1.01 April 10, 2006
// Missing version 1.02 April 12, 2006
-GAME( 2006, skc_103 ,skc_105, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.03", MACHINE_FLAGS)
+GAME( 2006, skc_103 ,skc_105, sam, sam, sam_state, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.03", MACHINE_FLAGS)
// Missing version 1.04 May 12, 2006
-GAME( 2006, skc_105 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.05", MACHINE_FLAGS)
-GAME( 2007, sman_130ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,French)", MACHINE_FLAGS)
-GAME( 2007, sman_130ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_130es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_130gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.30 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_140e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40", MACHINE_FLAGS)
-GAME( 2007, sman_140ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,French)", MACHINE_FLAGS)
-GAME( 2007, sman_140ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_140es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_140gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.40 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_142e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.42", MACHINE_FLAGS)
-GAME( 2007, sman_160e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60", MACHINE_FLAGS)
-GAME( 2007, sman_160ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,French)", MACHINE_FLAGS)
-GAME( 2007, sman_160ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_160es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_160gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.60 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_170e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70", MACHINE_FLAGS)
-GAME( 2007, sman_170ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,French)", MACHINE_FLAGS)
-GAME( 2007, sman_170ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_170es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_170gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.70 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_190e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90", MACHINE_FLAGS)
-GAME( 2007, sman_190ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,French)", MACHINE_FLAGS)
-GAME( 2007, sman_190ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_190es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_190gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.90 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_192e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92", MACHINE_FLAGS)
-GAME( 2007, sman_192ef ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,French)", MACHINE_FLAGS)
-GAME( 2007, sman_192ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_192es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_192gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v1.92 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_200e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.00", MACHINE_FLAGS)
-GAME( 2007, sman_210e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10", MACHINE_FLAGS)
-GAME( 2007, sman_210f ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (French)", MACHINE_FLAGS)
-GAME( 2007, sman_210ei ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Italian)", MACHINE_FLAGS)
-GAME( 2007, sman_210es ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2007, sman_210gf ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.10 (German,French)", MACHINE_FLAGS)
-GAME( 2007, sman_220e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.20", MACHINE_FLAGS)
-GAME( 2007, sman_230e ,sman_240, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.30", MACHINE_FLAGS)
-GAME( 2007, sman_240 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Spider-Man v2.40", MACHINE_FLAGS)
-GAME( 2007, wof_100a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v1.0", MACHINE_FLAGS)
-GAME( 2007, wof_200a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0", MACHINE_FLAGS)
-GAME( 2007, wof_200f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (French)", MACHINE_FLAGS)
-GAME( 2007, wof_200g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (German)", MACHINE_FLAGS)
-GAME( 2007, wof_200i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (Italian)", MACHINE_FLAGS)
-GAME( 2007, wof_300a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0", MACHINE_FLAGS)
-GAME( 2007, wof_300f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (French)", MACHINE_FLAGS)
-GAME( 2007, wof_300g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (German)", MACHINE_FLAGS)
-GAME( 2007, wof_300i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Italian)", MACHINE_FLAGS)
-GAME( 2007, wof_300l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Spanish)", MACHINE_FLAGS)
-GAME( 2007, wof_400a ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0", MACHINE_FLAGS)
-GAME( 2007, wof_400f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (French)", MACHINE_FLAGS)
-GAME( 2007, wof_400g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (German)", MACHINE_FLAGS)
-GAME( 2007, wof_400i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Italian)", MACHINE_FLAGS)
-GAME( 2007, wof_400l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Spanish)", MACHINE_FLAGS)
-GAME( 2007, wof_500a ,0, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0", MACHINE_FLAGS)
-GAME( 2007, wof_500f ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (French)", MACHINE_FLAGS)
-GAME( 2007, wof_500g ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (German)", MACHINE_FLAGS)
-GAME( 2007, wof_500i ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Italian)", MACHINE_FLAGS)
-GAME( 2007, wof_500l ,wof_500a, sam, sam, driver_device, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_103a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.03", MACHINE_FLAGS)
-GAME( 2006, wpt_105a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.05", MACHINE_FLAGS)
-GAME( 2006, wpt_106a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06", MACHINE_FLAGS)
-GAME( 2006, wpt_106f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (French)", MACHINE_FLAGS)
-GAME( 2006, wpt_106g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (German)", MACHINE_FLAGS)
-GAME( 2006, wpt_106i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_106l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.06 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, skc_105 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Simpsons Kooky Carnival (Redemption) v1.05", MACHINE_FLAGS)
+GAME( 2007, sman_130ef ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.30 (English,French)", MACHINE_FLAGS)
+GAME( 2007, sman_130ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_130es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.30 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_130gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.30 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_140e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.40", MACHINE_FLAGS)
+GAME( 2007, sman_140ef ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.40 (English,French)", MACHINE_FLAGS)
+GAME( 2007, sman_140ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_140es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.40 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_140gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.40 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_142e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.42", MACHINE_FLAGS)
+GAME( 2007, sman_160e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.60", MACHINE_FLAGS)
+GAME( 2007, sman_160ef ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.60 (English,French)", MACHINE_FLAGS)
+GAME( 2007, sman_160ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_160es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.60 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_160gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.60 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_170e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.70", MACHINE_FLAGS)
+GAME( 2007, sman_170ef ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.70 (English,French)", MACHINE_FLAGS)
+GAME( 2007, sman_170ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_170es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.70 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_170gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.70 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_190e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.90", MACHINE_FLAGS)
+GAME( 2007, sman_190ef ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.90 (English,French)", MACHINE_FLAGS)
+GAME( 2007, sman_190ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_190es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.90 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_190gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.90 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_192e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.92", MACHINE_FLAGS)
+GAME( 2007, sman_192ef ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.92 (English,French)", MACHINE_FLAGS)
+GAME( 2007, sman_192ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_192es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.92 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_192gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v1.92 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_200e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.00", MACHINE_FLAGS)
+GAME( 2007, sman_210e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.10", MACHINE_FLAGS)
+GAME( 2007, sman_210f ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.10 (French)", MACHINE_FLAGS)
+GAME( 2007, sman_210ei ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Italian)", MACHINE_FLAGS)
+GAME( 2007, sman_210es ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.10 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2007, sman_210gf ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.10 (German,French)", MACHINE_FLAGS)
+GAME( 2007, sman_220e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.20", MACHINE_FLAGS)
+GAME( 2007, sman_230e ,sman_240, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.30", MACHINE_FLAGS)
+GAME( 2007, sman_240 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Spider-Man v2.40", MACHINE_FLAGS)
+GAME( 2007, wof_100a ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v1.0", MACHINE_FLAGS)
+GAME( 2007, wof_200a ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v2.0", MACHINE_FLAGS)
+GAME( 2007, wof_200f ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (French)", MACHINE_FLAGS)
+GAME( 2007, wof_200g ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (German)", MACHINE_FLAGS)
+GAME( 2007, wof_200i ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v2.0 (Italian)", MACHINE_FLAGS)
+GAME( 2007, wof_300a ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v3.0", MACHINE_FLAGS)
+GAME( 2007, wof_300f ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (French)", MACHINE_FLAGS)
+GAME( 2007, wof_300g ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (German)", MACHINE_FLAGS)
+GAME( 2007, wof_300i ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Italian)", MACHINE_FLAGS)
+GAME( 2007, wof_300l ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v3.0 (Spanish)", MACHINE_FLAGS)
+GAME( 2007, wof_400a ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v4.0", MACHINE_FLAGS)
+GAME( 2007, wof_400f ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (French)", MACHINE_FLAGS)
+GAME( 2007, wof_400g ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (German)", MACHINE_FLAGS)
+GAME( 2007, wof_400i ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Italian)", MACHINE_FLAGS)
+GAME( 2007, wof_400l ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v4.0 (Spanish)", MACHINE_FLAGS)
+GAME( 2007, wof_500a ,0, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v5.0", MACHINE_FLAGS)
+GAME( 2007, wof_500f ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (French)", MACHINE_FLAGS)
+GAME( 2007, wof_500g ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (German)", MACHINE_FLAGS)
+GAME( 2007, wof_500i ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Italian)", MACHINE_FLAGS)
+GAME( 2007, wof_500l ,wof_500a, sam, sam, sam_state, 0, ROT0, "Stern", "Wheel of Fortune v5.0 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_103a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.03", MACHINE_FLAGS)
+GAME( 2006, wpt_105a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.05", MACHINE_FLAGS)
+GAME( 2006, wpt_106a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.06", MACHINE_FLAGS)
+GAME( 2006, wpt_106f ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.06 (French)", MACHINE_FLAGS)
+GAME( 2006, wpt_106g ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.06 (German)", MACHINE_FLAGS)
+GAME( 2006, wpt_106i ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.06 (Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_106l ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.06 (Spanish)", MACHINE_FLAGS)
// Missing version 1.07 should be 5 different files per language
-GAME( 2006, wpt_108a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08", MACHINE_FLAGS)
-GAME( 2006, wpt_108f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (French)", MACHINE_FLAGS)
-GAME( 2006, wpt_108g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (German)", MACHINE_FLAGS)
-GAME( 2006, wpt_108i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_108l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.08 (Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_109a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09", MACHINE_FLAGS)
-GAME( 2006, wpt_109f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)", MACHINE_FLAGS)
-GAME( 2006, wpt_109f2 ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)(alt)", MACHINE_FLAGS)
-GAME( 2006, wpt_109g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (German)", MACHINE_FLAGS)
-GAME( 2006, wpt_109i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_109l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.09 (Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_111a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11", MACHINE_FLAGS)
-GAME( 2006, wpt_111af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,French)", MACHINE_FLAGS)
-GAME( 2006, wpt_111ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_111al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_111f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (French)", MACHINE_FLAGS)
-GAME( 2006, wpt_111g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (German)", MACHINE_FLAGS)
-GAME( 2006, wpt_111gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (German,French)", MACHINE_FLAGS)
-GAME( 2006, wpt_111i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_111l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.11 (Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_112a ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12", MACHINE_FLAGS)
-GAME( 2006, wpt_112af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,French)", MACHINE_FLAGS)
-GAME( 2006, wpt_112ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_112al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_112f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (French)", MACHINE_FLAGS)
-GAME( 2006, wpt_112g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (German)", MACHINE_FLAGS)
-GAME( 2006, wpt_112gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (German,French)", MACHINE_FLAGS)
-GAME( 2006, wpt_112i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_112l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v1.12 (Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400 ,0, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00", MACHINE_FLAGS)
-GAME( 2006, wpt_1400af ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,French)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400ai ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400al ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Spanish)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400f ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (French)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400g ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (German)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400gf ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (German,French)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400i ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (Italian)", MACHINE_FLAGS)
-GAME( 2006, wpt_1400l ,wpt_1400, sam, sam, driver_device, 0, ROT0, "Stern", "World Poker Tour v14.00 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_108a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.08", MACHINE_FLAGS)
+GAME( 2006, wpt_108f ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.08 (French)", MACHINE_FLAGS)
+GAME( 2006, wpt_108g ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.08 (German)", MACHINE_FLAGS)
+GAME( 2006, wpt_108i ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.08 (Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_108l ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.08 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_109a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.09", MACHINE_FLAGS)
+GAME( 2006, wpt_109f ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)", MACHINE_FLAGS)
+GAME( 2006, wpt_109f2 ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.09 (French)(alt)", MACHINE_FLAGS)
+GAME( 2006, wpt_109g ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.09 (German)", MACHINE_FLAGS)
+GAME( 2006, wpt_109i ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.09 (Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_109l ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.09 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_111a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11", MACHINE_FLAGS)
+GAME( 2006, wpt_111af ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,French)", MACHINE_FLAGS)
+GAME( 2006, wpt_111ai ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_111al ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_111f ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (French)", MACHINE_FLAGS)
+GAME( 2006, wpt_111g ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (German)", MACHINE_FLAGS)
+GAME( 2006, wpt_111gf ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (German,French)", MACHINE_FLAGS)
+GAME( 2006, wpt_111i ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_111l ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.11 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_112a ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12", MACHINE_FLAGS)
+GAME( 2006, wpt_112af ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,French)", MACHINE_FLAGS)
+GAME( 2006, wpt_112ai ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_112al ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_112f ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (French)", MACHINE_FLAGS)
+GAME( 2006, wpt_112g ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (German)", MACHINE_FLAGS)
+GAME( 2006, wpt_112gf ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (German,French)", MACHINE_FLAGS)
+GAME( 2006, wpt_112i ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_112l ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v1.12 (Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400 ,0, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00", MACHINE_FLAGS)
+GAME( 2006, wpt_1400af ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,French)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400ai ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400al ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (English,Spanish)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400f ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (French)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400g ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (German)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400gf ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (German,French)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400i ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (Italian)", MACHINE_FLAGS)
+GAME( 2006, wpt_1400l ,wpt_1400, sam, sam, sam_state, 0, ROT0, "Stern", "World Poker Tour v14.00 (Spanish)", MACHINE_FLAGS)
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index 45e52df5119..065db524e5c 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -517,7 +517,7 @@ static SLOT_INTERFACE_START( samcoupe_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( samcoupe, samcoupe_state )
+static MACHINE_CONFIG_START( samcoupe )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SAMCOUPE_XTAL_X1 / 4) /* 6 MHz */
MCFG_CPU_PROGRAM_MAP(samcoupe_mem)
@@ -618,5 +618,5 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, samcoupe, 0, 0, samcoupe, samcoupe, driver_device, 0, "Miles Gordon Technology plc", "SAM Coupe", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, samcoupe, 0, 0, samcoupe, samcoupe, samcoupe_state, 0, "Miles Gordon Technology plc", "SAM Coupe", 0 )
diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp
index 32905de2d6a..1b2876e993d 100644
--- a/src/mame/drivers/sandscrp.cpp
+++ b/src/mame/drivers/sandscrp.cpp
@@ -470,7 +470,7 @@ GFXDECODE_END
***************************************************************************/
-static MACHINE_CONFIG_START( sandscrp, sandscrp_state )
+static MACHINE_CONFIG_START( sandscrp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,12000000) /* TMP68HC000N-12 */
@@ -515,7 +515,7 @@ static MACHINE_CONFIG_START( sandscrp, sandscrp_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_GENERIC_LATCH_8_ADD("soundlatch2")
- MCFG_OKIM6295_ADD("oki", 12000000/6, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 12000000/6, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
/* YM3014B + YM2203C */
@@ -594,6 +594,6 @@ ROM_START( sandscrpb ) /* Different rev PCB */
ROM_END
-GAME( 1992, sandscrp, 0, sandscrp, sandscrp, driver_device, 0, ROT90, "Face", "Sand Scorpion", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sandscrpa, sandscrp, sandscrp, sandscrp, driver_device, 0, ROT90, "Face", "Sand Scorpion (Earlier)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sandscrpb, sandscrp, sandscrp, sandscrp, driver_device, 0, ROT90, "Face", "Sand Scorpion (Chinese Title Screen, Revised Hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sandscrp, 0, sandscrp, sandscrp, sandscrp_state, 0, ROT90, "Face", "Sand Scorpion", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sandscrpa, sandscrp, sandscrp, sandscrp, sandscrp_state, 0, ROT90, "Face", "Sand Scorpion (Earlier)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sandscrpb, sandscrp, sandscrp, sandscrp, sandscrp_state, 0, ROT90, "Face", "Sand Scorpion (Chinese Title Screen, Revised Hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp
index 682efa2deca..afb334f4102 100644
--- a/src/mame/drivers/sangho.cpp
+++ b/src/mame/drivers/sangho.cpp
@@ -452,7 +452,7 @@ MACHINE_RESET_MEMBER(sangho_state,sexyboom)
}
-static MACHINE_CONFIG_START( pzlestar, sangho_state )
+static MACHINE_CONFIG_START( pzlestar )
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) // ?
MCFG_CPU_PROGRAM_MAP(sangho_map)
@@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( pzlestar, sangho_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sexyboom, sangho_state )
+static MACHINE_CONFIG_START( sexyboom )
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6)
MCFG_CPU_PROGRAM_MAP(sangho_map)
@@ -539,4 +539,4 @@ DRIVER_INIT_MEMBER(sangho_state,pzlestar)
}
GAME( 1991, pzlestar, 0, pzlestar, pzlestar, sangho_state, pzlestar, ROT270, "Sang Ho Soft", "Puzzle Star (Sang Ho Soft)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND )
-GAME( 1992, sexyboom, 0, sexyboom, sexyboom, driver_device, 0, ROT270, "Sang Ho Soft", "Sexy Boom", 0 )
+GAME( 1992, sexyboom, 0, sexyboom, sexyboom, sangho_state, 0, ROT270, "Sang Ho Soft", "Sexy Boom", 0 )
diff --git a/src/mame/drivers/sanremmg.cpp b/src/mame/drivers/sanremmg.cpp
index c2e18c7a287..22888bdb30c 100644
--- a/src/mame/drivers/sanremmg.cpp
+++ b/src/mame/drivers/sanremmg.cpp
@@ -50,7 +50,7 @@ static INPUT_PORTS_START( sanremmg )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sanremmg, sanremmg_state )
+static MACHINE_CONFIG_START( sanremmg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7, 50000000) // ??? doesn't seem to be ARM, but what is it?
@@ -76,4 +76,4 @@ ROM_START( sanremmg )
ROM_END
-GAME( 2003, sanremmg, 0, sanremmg, sanremmg, driver_device, 0, ROT0, "San Remo Games", "unknown San Remo / Elsy Multigame", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+GAME( 2003, sanremmg, 0, sanremmg, sanremmg, sanremmg_state, 0, ROT0, "San Remo Games", "unknown San Remo / Elsy Multigame", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index 87ac4241e53..d013c9f6977 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -342,7 +342,7 @@ GFXDECODE_END
* Machine Drivers *
*********************************************/
-static MACHINE_CONFIG_START( sanremo, sanremo_state )
+static MACHINE_CONFIG_START( sanremo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK)
@@ -409,5 +409,5 @@ ROM_END
* Game Drivers *
*********************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1996, number1, 0, sanremo, number1, driver_device, 0, ROT0, "San Remo Games", "Number One", 0, layout_sanremo )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1996, number1, 0, sanremo, number1, sanremo_state, 0, ROT0, "San Remo Games", "Number One", 0, layout_sanremo )
diff --git a/src/mame/drivers/sansa_fuze.cpp b/src/mame/drivers/sansa_fuze.cpp
index 4abf83d485c..d2058b501dc 100644
--- a/src/mame/drivers/sansa_fuze.cpp
+++ b/src/mame/drivers/sansa_fuze.cpp
@@ -38,7 +38,7 @@ static INPUT_PORTS_START( sansa_fuze )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sansa_fuze, sansa_fuze_state )
+static MACHINE_CONFIG_START( sansa_fuze )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7, 50000000) // arm based, speed unknown
@@ -68,5 +68,5 @@ ROM_START( sanfuze2 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-CONS(200?, sanfuze2, 0, 0, sansa_fuze, sansa_fuze, driver_device, 0, "Sandisk", "Sansa Fuze 2", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 200?, sanfuze2, 0, 0, sansa_fuze, sansa_fuze, sansa_fuze_state, 0, "Sandisk", "Sansa Fuze 2", MACHINE_NO_SOUND | MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index cca28a27b31..1fff3a5b994 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -65,7 +65,7 @@ public:
DECLARE_WRITE8_MEMBER(sapi3_00_w);
DECLARE_READ8_MEMBER(sapi3_25_r);
DECLARE_WRITE8_MEMBER(sapi3_25_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_DRIVER_INIT(sapizps3);
DECLARE_DRIVER_INIT(sapizps3a);
DECLARE_DRIVER_INIT(sapizps3b);
@@ -467,7 +467,7 @@ READ8_MEMBER( sapi1_state::sapi2_keyboard_data_r)
return ret;
}
-WRITE8_MEMBER( sapi1_state::kbd_put )
+void sapi1_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -532,7 +532,7 @@ DRIVER_INIT_MEMBER( sapi1_state, sapizps3b )
/* Machine driver */
-static MACHINE_CONFIG_START( sapi1, sapi1_state )
+static MACHINE_CONFIG_START( sapi1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(sapi1_mem)
@@ -559,7 +559,7 @@ static MACHINE_CONFIG_DERIVED( sapi2, sapi1 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(sapi2_mem)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(sapi1_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(sapi1_state, kbd_put))
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( sapi3, sapi2 )
@@ -590,7 +590,7 @@ static MACHINE_CONFIG_DERIVED( sapi3b, sapi3 )
MCFG_SCREEN_NO_PALETTE
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sapi3a, sapi1_state )
+static MACHINE_CONFIG_START( sapi3a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2000000)
MCFG_CPU_PROGRAM_MAP(sapi3a_mem)
@@ -599,7 +599,7 @@ static MACHINE_CONFIG_START( sapi3a, sapi1_state )
/* video hardware */
MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(sapi1_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(sapi1_state, kbd_put))
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -661,9 +661,9 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, sapi1, 0, 0, sapi1, sapi1, driver_device, 0, "Tesla", "SAPI-1 ZPS 1", MACHINE_NO_SOUND_HW)
-COMP( 1985, sapizps2, sapi1, 0, sapi2, sapi1, driver_device, 0, "Tesla", "SAPI-1 ZPS 2", MACHINE_NO_SOUND_HW)
-COMP( 1985, sapizps3, sapi1, 0, sapi3, sapi1, sapi1_state, sapizps3, "Tesla", "SAPI-1 ZPS 3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1985, sapizps3a,sapi1, 0, sapi3a, sapi1, sapi1_state, sapizps3a, "Tesla", "SAPI-1 ZPS 3 (terminal)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1985, sapizps3b,sapi1, 0, sapi3b, sapi1, sapi1_state, sapizps3b, "Tesla", "SAPI-1 ZPS 3 (6845)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1985, sapi1, 0, 0, sapi1, sapi1, sapi1_state, 0, "Tesla", "SAPI-1 ZPS 1", MACHINE_NO_SOUND_HW )
+COMP( 1985, sapizps2, sapi1, 0, sapi2, sapi1, sapi1_state, 0, "Tesla", "SAPI-1 ZPS 2", MACHINE_NO_SOUND_HW )
+COMP( 1985, sapizps3, sapi1, 0, sapi3, sapi1, sapi1_state, sapizps3, "Tesla", "SAPI-1 ZPS 3", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1985, sapizps3a, sapi1, 0, sapi3a, sapi1, sapi1_state, sapizps3a, "Tesla", "SAPI-1 ZPS 3 (terminal)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1985, sapizps3b, sapi1, 0, sapi3b, sapi1, sapi1_state, sapizps3b, "Tesla", "SAPI-1 ZPS 3 (6845)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index fb6d2c62bf4..ae130d7d837 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -789,7 +789,7 @@ MACHINE_RESET_MEMBER(sat_console_state,saturn)
}
-static MACHINE_CONFIG_START( saturn, sat_console_state )
+static MACHINE_CONFIG_START( saturn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
@@ -992,7 +992,7 @@ ROM_START(hisaturn)
ROM_COPY( "maincpu",0x000000,0,0x080000)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
CONS( 1994, saturn, 0, 0, saturnus, saturn, sat_console_state, saturnus, "Sega", "Saturn (USA)", MACHINE_NOT_WORKING )
CONS( 1994, saturnjp, saturn, 0, saturnjp, saturn, sat_console_state, saturnjp, "Sega", "Saturn (Japan)", MACHINE_NOT_WORKING )
CONS( 1994, saturneu, saturn, 0, saturneu, saturn, sat_console_state, saturneu, "Sega", "Saturn (PAL)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp
index 68afb235f4c..d4a0a64c0d0 100644
--- a/src/mame/drivers/sauro.cpp
+++ b/src/mame/drivers/sauro.cpp
@@ -442,7 +442,7 @@ static GFXDECODE_START( trckydoc )
GFXDECODE_END
-static MACHINE_CONFIG_START( tecfri, sauro_state )
+static MACHINE_CONFIG_START( tecfri )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz/4) /* verified on pcb */
@@ -725,10 +725,10 @@ DRIVER_INIT_MEMBER(sauro_state,tecfri)
RAM[0xe000] = 1;
}
-GAME( 1987, sauro, 0, sauro, tecfri, sauro_state, tecfri, ROT0, "Tecfri", "Sauro", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, saurop, sauro, sauro, tecfri, sauro_state, tecfri, ROT0, "Tecfri (Philko license)", "Sauro (Philko license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, saurorr, sauro, sauro, tecfri, sauro_state, tecfri, ROT0, "Tecfri (Recreativos Real S.A. license)","Sauro (Recreativos Real S.A. license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, saurob, sauro, saurob, saurob, sauro_state, tecfri, ROT0, "bootleg", "Sauro (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sauro, 0, sauro, tecfri, sauro_state, tecfri, ROT0, "Tecfri", "Sauro", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, saurop, sauro, sauro, tecfri, sauro_state, tecfri, ROT0, "Tecfri (Philko license)", "Sauro (Philko license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, saurorr, sauro, sauro, tecfri, sauro_state, tecfri, ROT0, "Tecfri (Recreativos Real S.A. license)","Sauro (Recreativos Real S.A. license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, saurob, sauro, saurob, saurob, sauro_state, tecfri, ROT0, "bootleg", "Sauro (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, trckydoc, 0, trckydoc, tecfri, sauro_state, tecfri, ROT0, "Tecfri", "Tricky Doc (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, trckydoc, 0, trckydoc, tecfri, sauro_state, tecfri, ROT0, "Tecfri", "Tricky Doc (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, trckydoca,trckydoc, trckydoc, trckydoca, sauro_state, tecfri, ROT0, "Tecfri", "Tricky Doc (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp
index d13777b51ec..e3128c132b4 100644
--- a/src/mame/drivers/savia84.cpp
+++ b/src/mame/drivers/savia84.cpp
@@ -168,7 +168,7 @@ READ8_MEMBER( savia84_state::savia84_8255_portc_r ) // IN FA - read keyboard
return 0xff;
}
-static MACHINE_CONFIG_START( savia84, savia84_state )
+static MACHINE_CONFIG_START( savia84 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz / 2)
MCFG_CPU_PROGRAM_MAP(savia84_mem)
@@ -197,5 +197,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, savia84, 0, 0, savia84, savia84, driver_device, 0, "JT Hyan", "Savia 84", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, savia84, 0, 0, savia84, savia84, savia84_state, 0, "JT Hyan", "Savia 84", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp
index 3d20a6ff9b2..9831faa3648 100644
--- a/src/mame/drivers/savquest.cpp
+++ b/src/mame/drivers/savquest.cpp
@@ -802,7 +802,7 @@ SLOT_INTERFACE_START( savquest_isa16_cards )
SLOT_INTERFACE("sb16", ISA16_SOUND_BLASTER_16)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( savquest, savquest_state )
+static MACHINE_CONFIG_START( savquest )
MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000) // actually Pentium II 450
MCFG_CPU_PROGRAM_MAP(savquest_map)
MCFG_CPU_IO_MAP(savquest_io)
@@ -855,4 +855,4 @@ ROM_START( savquest )
ROM_END
-GAME(1999, savquest, 0, savquest, savquest, driver_device, 0, ROT0, "Interactive Light", "Savage Quest", MACHINE_IS_SKELETON)
+GAME(1999, savquest, 0, savquest, savquest, savquest_state, 0, ROT0, "Interactive Light", "Savage Quest", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp
index 85f5f011270..c28297e2e2d 100644
--- a/src/mame/drivers/sbasketb.cpp
+++ b/src/mame/drivers/sbasketb.cpp
@@ -187,7 +187,7 @@ INTERRUPT_GEN_MEMBER(sbasketb_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( sbasketb, sbasketb_state )
+static MACHINE_CONFIG_START( sbasketb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, 1400000) /* 1.400 MHz ??? */
@@ -416,7 +416,7 @@ DRIVER_INIT_MEMBER(sbasketb_state,sbasketb)
{
}
-GAME( 1984, sbasketb, 0, sbasketb, sbasketb, sbasketb_state, sbasketb, ROT90, "Konami", "Super Basketball (version I, encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sbasketh, sbasketb, sbasketbu, sbasketb, driver_device, 0, ROT90, "Konami", "Super Basketball (version H, unprotected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sbasketg, sbasketb, sbasketb, sbasketb, sbasketb_state, sbasketb, ROT90, "Konami", "Super Basketball (version G, encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sbaskete, sbasketb, sbasketb, sbasketb, sbasketb_state, sbasketb, ROT90, "Konami", "Super Basketball (version E, encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbasketb, 0, sbasketb, sbasketb, sbasketb_state, sbasketb, ROT90, "Konami", "Super Basketball (version I, encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbasketh, sbasketb, sbasketbu, sbasketb, sbasketb_state, 0, ROT90, "Konami", "Super Basketball (version H, unprotected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbasketg, sbasketb, sbasketb, sbasketb, sbasketb_state, sbasketb, ROT90, "Konami", "Super Basketball (version G, encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sbaskete, sbasketb, sbasketb, sbasketb, sbasketb_state, sbasketb, ROT90, "Konami", "Super Basketball (version E, encrypted)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp
index 0d2db6317fa..515147f8757 100644
--- a/src/mame/drivers/sbc6510.cpp
+++ b/src/mame/drivers/sbc6510.cpp
@@ -278,7 +278,7 @@ static GFXDECODE_START( sbc6510 )
GFXDECODE_END
-static MACHINE_CONFIG_START( sbc6510, sbc6510_state )
+static MACHINE_CONFIG_START( sbc6510 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6510, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(sbc6510_mem)
@@ -323,5 +323,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 2009, sbc6510, 0, 0, sbc6510, sbc6510, driver_device, 0, "Josip Perusanec", "SBC6510", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 2009, sbc6510, 0, 0, sbc6510, sbc6510, sbc6510_state, 0, "Josip Perusanec", "SBC6510", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index d0c75f64b7a..2ca1d2759b1 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -401,7 +401,7 @@ PALETTE_INIT_MEMBER(sbowling_state, sbowling)
}
}
-static MACHINE_CONFIG_START( sbowling, sbowling_state )
+static MACHINE_CONFIG_START( sbowling )
MCFG_CPU_ADD("maincpu", I8080, XTAL_19_968MHz/10) /* ? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(port_map)
@@ -448,4 +448,4 @@ ROM_START( sbowling )
ROM_LOAD( "kb09.6m", 0x0400, 0x0400, CRC(e29191a6) SHA1(9a2c78a96ef6d118f4dacbea0b7d454b66a452ae))
ROM_END
-GAME( 1982, sbowling, 0, sbowling, sbowling, driver_device, 0, ROT90, "Taito Corporation", "Strike Bowling", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, sbowling, 0, sbowling, sbowling, sbowling_state, 0, ROT90, "Taito Corporation", "Strike Bowling", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp
index 575d01ebcf6..910ef304943 100644
--- a/src/mame/drivers/sbrain.cpp
+++ b/src/mame/drivers/sbrain.cpp
@@ -99,7 +99,7 @@ private:
required_device<i8251_device> m_u0;
required_device<i8251_device> m_u1;
required_device<i8255_device> m_ppi;
- required_device<fd1791_t> m_fdc;
+ required_device<fd1791_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_ioport m_vs;
@@ -136,7 +136,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( sbrain_subio, AS_IO, 8, sbrain_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x08) AM_READWRITE(port08_r,port08_w)
- AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1791_t, read, write)
+ AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("fdc", fd1791_device, read, write)
ADDRESS_MAP_END
// bit 0 is wrong, maybe the whole byte is wrong
@@ -317,7 +317,7 @@ uint32_t sbrain_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
return 0;
}
-static MACHINE_CONFIG_START( sbrain, sbrain_state )
+static MACHINE_CONFIG_START( sbrain )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(sbrain_mem)
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 03027619d66..588e6c000cb 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -580,7 +580,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( sbrkout, sbrkout_state )
+static MACHINE_CONFIG_START( sbrkout )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
@@ -706,7 +706,7 @@ ROM_END
*
*************************************/
-GAMEL( 1978, sbrkout, 0, sbrkout, sbrkout, driver_device, 0, ROT270, "Atari", "Super Breakout (rev 04)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
-GAMEL( 1978, sbrkout3, sbrkout, sbrkout, sbrkout, driver_device, 0, ROT270, "Atari", "Super Breakout (rev 03)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
-GAMEL( 1978, sbrkoutc, sbrkout, sbrkout, sbrkoutc, driver_device, 0, ROT270, "Atari", "Super Breakout (Canyon and Vertical Breakout, prototype)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
-GAMEL( 1978, sbrkoutct, sbrkout, sbrkoutct, sbrkoutct, driver_device, 0, ROT270, "Atari", "Super Breakout (Cocktail, prototype)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
+GAMEL( 1978, sbrkout, 0, sbrkout, sbrkout, sbrkout_state, 0, ROT270, "Atari", "Super Breakout (rev 04)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
+GAMEL( 1978, sbrkout3, sbrkout, sbrkout, sbrkout, sbrkout_state, 0, ROT270, "Atari", "Super Breakout (rev 03)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
+GAMEL( 1978, sbrkoutc, sbrkout, sbrkout, sbrkoutc, sbrkout_state, 0, ROT270, "Atari", "Super Breakout (Canyon and Vertical Breakout, prototype)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
+GAMEL( 1978, sbrkoutct, sbrkout, sbrkoutct, sbrkoutct, sbrkout_state, 0, ROT270, "Atari", "Super Breakout (Cocktail, prototype)", MACHINE_SUPPORTS_SAVE, layout_sbrkout )
diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp
index 1e0a91f9832..e164e7b34d5 100644
--- a/src/mame/drivers/sbugger.cpp
+++ b/src/mame/drivers/sbugger.cpp
@@ -212,7 +212,7 @@ INPUT_PORTS_END
/* machine driver */
-static MACHINE_CONFIG_START( sbugger, sbugger_state )
+static MACHINE_CONFIG_START( sbugger )
MCFG_CPU_ADD("maincpu", I8085A, 6000000) /* 3.00 MHz??? */
MCFG_CPU_PROGRAM_MAP(sbugger_map)
@@ -279,5 +279,5 @@ ROM_START( sbuggera )
ROM_LOAD( "spbugger.gfx", 0x0000, 0x1000, CRC(d3f345b5) SHA1(a5082ffc3043352e9b731af95770bdd62fb928bf) )
ROM_END
-GAME( 1981, sbugger, 0, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 1)", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, sbuggera, sbugger, sbugger, sbugger, driver_device, 0, ROT270, "Game-A-Tron", "Space Bugger (set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, sbugger, 0, sbugger, sbugger, sbugger_state, 0, ROT270, "Game-A-Tron", "Space Bugger (set 1)", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, sbuggera, sbugger, sbugger, sbugger, sbugger_state, 0, ROT270, "Game-A-Tron", "Space Bugger (set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp
index d2cb8ee3b8f..223c6329c18 100644
--- a/src/mame/drivers/sc1.cpp
+++ b/src/mame/drivers/sc1.cpp
@@ -170,7 +170,7 @@ static INPUT_PORTS_START( sc1 )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sc1, sc1_state )
+static MACHINE_CONFIG_START( sc1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(sc1_mem)
@@ -198,5 +198,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, sc1, 0, 0, sc1, sc1, driver_device, 0, "VEB Mikroelektronik Erfurt", "Schachcomputer SC1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, sc1, 0, 0, sc1, sc1, sc1_state, 0, "VEB Mikroelektronik Erfurt", "Schachcomputer SC1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp
index 5adc415e5c0..0dc458c6bff 100644
--- a/src/mame/drivers/sc2.cpp
+++ b/src/mame/drivers/sc2.cpp
@@ -197,7 +197,7 @@ WRITE8_MEMBER( sc2_state::pio_port_b_w )
m_kp_matrix = data;
}
-static MACHINE_CONFIG_START( sc2, sc2_state )
+static MACHINE_CONFIG_START( sc2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(sc2_mem)
@@ -236,5 +236,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, sc2, 0, 0, sc2, sc2, driver_device, 0, "VEB Mikroelektronik Erfurt", "Schachcomputer SC2", MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, sc2, 0, 0, sc2, sc2, sc2_state, 0, "VEB Mikroelektronik Erfurt", "Schachcomputer SC2", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scm_500.cpp b/src/mame/drivers/scm_500.cpp
index 1e5eac486ae..c7f9736bf48 100644
--- a/src/mame/drivers/scm_500.cpp
+++ b/src/mame/drivers/scm_500.cpp
@@ -37,7 +37,7 @@ void scm_500_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( scm_500, scm_500_state )
+static MACHINE_CONFIG_START( scm_500 )
// unknown CPU
@@ -80,5 +80,5 @@ ROM_START( scm_500 )
ROM_LOAD_BIOS( 4, "STNDXGR_307", 0x00000, 0x10000, CRC(4d0d91c6) SHA1(85ff5d43ec331bcd4cde6aaf82f6143acc7e020c) ) // USA 03.07 (could be 500E specific)
ROM_END
-GAME( 1987, scm_500, 0, scm_500, scm_500, driver_device, 0, ROT0, "Standard Change-Makers", "Standard Change-Makers System 500 / 500E", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, scm_500, 0, scm_500, scm_500, scm_500_state, 0, ROT0, "Standard Change-Makers", "Standard Change-Makers System 500 / 500E", MACHINE_IS_SKELETON_MECHANICAL )
// 1995 - 500E - same basic hw?
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp
index 00893cc6174..9dbf543a12c 100644
--- a/src/mame/drivers/scobra.cpp
+++ b/src/mame/drivers/scobra.cpp
@@ -761,7 +761,7 @@ static INPUT_PORTS_START( mimonsco )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( type1, scobra_state )
+static MACHINE_CONFIG_START( type1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
@@ -924,7 +924,7 @@ static MACHINE_CONFIG_DERIVED( darkplnt, type2 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hustler, scobra_state )
+static MACHINE_CONFIG_START( hustler )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
@@ -1598,29 +1598,29 @@ ROM_START( mimonsco )
ROM_END
-GAME( 1981, stratgyx, 0, stratgyx, stratgyx, scramble_state, stratgyx, ROT0, "Konami", "Strategy X", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, stratgys, stratgyx, stratgyx, stratgyx, scramble_state, stratgyx, ROT0, "Konami (Stern Electronics license)", "Strategy X (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, strongx, stratgyx, stratgyx, stratgyx, scramble_state, stratgyx, ROT0, "bootleg", "Strong X", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, stratgyx, 0, stratgyx, stratgyx, scobra_state, stratgyx, ROT0, "Konami", "Strategy X", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, stratgys, stratgyx, stratgyx, stratgyx, scobra_state, stratgyx, ROT0, "Konami (Stern Electronics license)", "Strategy X (Stern Electronics)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, strongx, stratgyx, stratgyx, stratgyx, scobra_state, stratgyx, ROT0, "bootleg", "Strong X", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, darkplnt, 0, darkplnt, darkplnt, scramble_state, darkplnt, ROT180, "Stern Electronics", "Dark Planet", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, darkplnt, 0, darkplnt, darkplnt, scobra_state, darkplnt, ROT180, "Stern Electronics", "Dark Planet", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, tazmani2, tazmania, type2, tazmania, scramble_state, tazmani2, ROT90, "Stern Electronics", "Tazz-Mania (set 2, alt hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, tazmani2, tazmania, type2, tazmania, scobra_state, tazmani2, ROT90, "Stern Electronics", "Tazz-Mania (set 2, alt hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, rescue, 0, rescue, rescue, scramble_state, rescue, ROT90, "Stern Electronics", "Rescue", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, rescueb, rescue, rescueb, rescue, scramble_state, rescue, ROT90, "bootleg (Videl Games)", "Tuono Blu (bootleg of Rescue)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, aponow, rescue, rescue, rescue, scramble_state, rescue, ROT90, "bootleg", "Apocaljpse Now (bootleg of Rescue)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, rescuefe, rescue, rescuefe, rescue, driver_device, 0, ROT90, "bootleg (Free Enterprise Games)", "Rescue (Free Enterprise Games, bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, rescue, 0, rescue, rescue, scobra_state, rescue, ROT90, "Stern Electronics", "Rescue", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, rescueb, rescue, rescueb, rescue, scobra_state, rescue, ROT90, "bootleg (Videl Games)", "Tuono Blu (bootleg of Rescue)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, aponow, rescue, rescue, rescue, scobra_state, rescue, ROT90, "bootleg", "Apocaljpse Now (bootleg of Rescue)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, rescuefe, rescue, rescuefe, rescue, scobra_state, 0, ROT90, "bootleg (Free Enterprise Games)", "Rescue (Free Enterprise Games, bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, minefld, 0, minefld, minefld, scramble_state, minefld, ROT90, "Stern Electronics", "Minefield", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, minefldfe, minefld, minefldfe, minefldfe, driver_device, 0, ROT90, "bootleg (The Logicshop)", "Minefield (The Logicshop, bootleg)", MACHINE_SUPPORTS_SAVE ) // The Logicshop ('licensed' from Free Enterprise Games?
+GAME( 1983, minefld, 0, minefld, minefld, scobra_state, minefld, ROT90, "Stern Electronics", "Minefield", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, minefldfe, minefld, minefldfe, minefldfe, scobra_state, 0, ROT90, "bootleg (The Logicshop)", "Minefield (The Logicshop, bootleg)", MACHINE_SUPPORTS_SAVE ) // The Logicshop ('licensed' from Free Enterprise Games?
-GAME( 1981, hustler, 0, hustler, hustler, scramble_state, hustler, ROT90, "Konami", "Video Hustler", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hustlerd, hustler, hustler, hustler, scramble_state, hustlerd, ROT90, "Konami (Dynamo Games license)", "Video Hustler (Dynamo Games)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, billiard, hustler, hustler, hustler, scramble_state, billiard, ROT90, "bootleg", "The Billiards (Video Hustler bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hustlerb, hustler, hustlerb, hustler, driver_device, 0, ROT90, "bootleg (Digimatic)", "Video Hustler (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hustlerb2, hustler, hustler, hustler, scramble_state, hustlerd, ROT90, "bootleg", "Fatsy Gambler (Video Hustler bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hustlerb4, hustler, hustlerb4, hustler, driver_device, 0, ROT90, "bootleg", "Video Hustler (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, hustlerb5, hustler, hustlerb, hustler, driver_device, 0, ROT90, "bootleg", "Video Hustler (bootleg, set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hustler, 0, hustler, hustler, scobra_state, hustler, ROT90, "Konami", "Video Hustler", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hustlerd, hustler, hustler, hustler, scobra_state, hustlerd, ROT90, "Konami (Dynamo Games license)", "Video Hustler (Dynamo Games)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, billiard, hustler, hustler, hustler, scobra_state, billiard, ROT90, "bootleg", "The Billiards (Video Hustler bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hustlerb, hustler, hustlerb, hustler, scobra_state, 0, ROT90, "bootleg (Digimatic)", "Video Hustler (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hustlerb2, hustler, hustler, hustler, scobra_state, hustlerd, ROT90, "bootleg", "Fatsy Gambler (Video Hustler bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hustlerb4, hustler, hustlerb4, hustler, scobra_state, 0, ROT90, "bootleg", "Video Hustler (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, hustlerb5, hustler, hustlerb, hustler, scobra_state, 0, ROT90, "bootleg", "Video Hustler (bootleg, set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mimonkey, 0, mimonkey, mimonkey, scramble_state, mimonkey, ROT90, "Universal Video Games", "Mighty Monkey", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mimonsco, mimonkey, mimonkey, mimonsco, scramble_state, mimonsco, ROT90, "bootleg", "Mighty Monkey (bootleg on Super Cobra hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mimonkey, 0, mimonkey, mimonkey, scobra_state, mimonkey, ROT90, "Universal Video Games", "Mighty Monkey", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mimonsco, mimonkey, mimonkey, mimonsco, scobra_state, mimonsco, ROT90, "bootleg", "Mighty Monkey (bootleg on Super Cobra hardware)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index decdd724182..edbe114dd87 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -272,7 +272,7 @@ static GFXDECODE_START( quorum )
GFXDECODE_ENTRY( "maincpu", 0x1fb00, quorum_charlayout, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_DERIVED_CLASS( scorpion, spectrum_128, scorpion_state )
+static MACHINE_CONFIG_DERIVED( scorpion, spectrum_128 )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_IO_MAP(scorpion_io)
MCFG_CPU_DECRYPTED_OPCODES_MAP(scorpion_switch)
@@ -376,9 +376,9 @@ ROM_START( kay1024 )
ROMX_LOAD( "kay1024s.rom", 0x010000, 0x10000, CRC(67351caa) SHA1(1d9c0606b380c000ca1dfa33f90a122ecf9df1f1), ROM_BIOS(3))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */
-COMP( 1994, scorpio, spec128, 0, scorpion, spec_plus, driver_device, 0, "Zonov and Co.", "Scorpion ZS-256", 0 )
-COMP( 1991, profi, spec128, 0, profi, spec_plus, driver_device, 0, "Kondor and Kramis", "Profi", MACHINE_NOT_WORKING )
-COMP( 1998, kay1024, spec128, 0, scorpion, spec_plus, driver_device, 0, "NEMO", "Kay 1024", MACHINE_NOT_WORKING )
-COMP( 19??, quorum, spec128, 0, quorum, spec_plus, driver_device, 0, "<unknown>", "Quorum", MACHINE_NOT_WORKING )
-COMP( 19??, bestzx, spec128, 0, scorpion, spec_plus, driver_device, 0, "<unknown>", "BestZX", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1994, scorpio, spec128, 0, scorpion, spec_plus, scorpion_state, 0, "Zonov and Co.", "Scorpion ZS-256", 0 )
+COMP( 1991, profi, spec128, 0, profi, spec_plus, scorpion_state, 0, "Kondor and Kramis", "Profi", MACHINE_NOT_WORKING )
+COMP( 1998, kay1024, spec128, 0, scorpion, spec_plus, scorpion_state, 0, "NEMO", "Kay 1024", MACHINE_NOT_WORKING )
+COMP( 19??, quorum, spec128, 0, quorum, spec_plus, scorpion_state, 0, "<unknown>", "Quorum", MACHINE_NOT_WORKING )
+COMP( 19??, bestzx, spec128, 0, scorpion, spec_plus, scorpion_state, 0, "<unknown>", "BestZX", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp
index 723bad4544f..51b929d20cd 100644
--- a/src/mame/drivers/scotrsht.cpp
+++ b/src/mame/drivers/scotrsht.cpp
@@ -184,7 +184,7 @@ static GFXDECODE_START( scotrsht )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 16*16*8, 16*8 ) /* sprites */
GFXDECODE_END
-static MACHINE_CONFIG_START( scotrsht, scotrsht_state )
+static MACHINE_CONFIG_START( scotrsht )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 18432000/6) /* 3.072 MHz */
@@ -251,4 +251,4 @@ ROM_START( scotrsht )
ROM_LOAD( "gx545_6301_8f.bin", 0x0400, 0x0100, CRC(c1c7cf58) SHA1(08452228bf13e43ce4a05806f79e9cd1542416f1) ) /* sprites lookup */
ROM_END
-GAME( 1985, scotrsht, 0, scotrsht, scotrsht, driver_device, 0, ROT90,"Konami", "Scooter Shooter", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, scotrsht, 0, scotrsht, scotrsht, scotrsht_state, 0, ROT90,"Konami", "Scooter Shooter", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp
index 6dfe59d3b00..f076240bc59 100644
--- a/src/mame/drivers/scramble.cpp
+++ b/src/mame/drivers/scramble.cpp
@@ -1291,7 +1291,7 @@ GFXDECODE_END
/**************************************************************************/
-static MACHINE_CONFIG_START( scramble, scramble_state )
+static MACHINE_CONFIG_START( scramble )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
@@ -1569,7 +1569,7 @@ static MACHINE_CONFIG_DERIVED( hncholms, hunchbks )
MCFG_VIDEO_START_OVERRIDE(scramble_state,scorpion)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ad2083, scramble_state )
+static MACHINE_CONFIG_START( ad2083 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz */
MCFG_CPU_PROGRAM_MAP(ad2083_map)
@@ -2257,7 +2257,7 @@ GAME( 1983, mrkougb2, mrkougar, mrkougb, mrkougar, scramble_state, mrkougb,
GAME( 1982, hotshock, 0, hotshock, hotshock, scramble_state, hotshock, ROT90, "E.G. Felaco (Domino license)", "Hot Shocker", MACHINE_SUPPORTS_SAVE )
GAME( 1982, hotshockb,hotshock, hotshock, hotshock, scramble_state, hotshock, ROT90, "E.G. Felaco", "Hot Shocker (early revision?)", MACHINE_SUPPORTS_SAVE ) // has "Dudley presents" (protagonist of the game), instead of Domino
-GAME( 198?, conquer, 0, hotshock, hotshock, driver_device, 0, ROT90, "<unknown>", "Conqueror", MACHINE_NOT_WORKING )
+GAME( 198?, conquer, 0, hotshock, hotshock, scramble_state, 0, ROT90, "<unknown>", "Conqueror", MACHINE_NOT_WORKING )
GAME( 1983, hunchbks, hunchbak, hunchbks, hunchbks, scramble_state, scramble_ppi, ROT90, "Century Electronics", "Hunchback (Scramble hardware)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, hunchbks2,hunchbak, hunchbks, hunchbks, scramble_state, scramble_ppi, ROT90, "bootleg (Sig)", "Hunchback (Scramble hardware, bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp
index 1070b75929e..06d10f5f168 100644
--- a/src/mame/drivers/scregg.cpp
+++ b/src/mame/drivers/scregg.cpp
@@ -257,7 +257,7 @@ MACHINE_RESET_MEMBER(scregg_state,scregg)
m_btime_tilemap[3] = 0;
}
-static MACHINE_CONFIG_START( dommy, scregg_state )
+static MACHINE_CONFIG_START( dommy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8)
@@ -289,7 +289,7 @@ static MACHINE_CONFIG_START( dommy, scregg_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( scregg, scregg_state )
+static MACHINE_CONFIG_START( scregg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8)
@@ -424,7 +424,7 @@ DRIVER_INIT_MEMBER(scregg_state,rockduck)
}
-GAME( 1983, dommy, 0, dommy, scregg, driver_device, 0, ROT270, "Technos Japan", "Dommy", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, scregg, 0, scregg, scregg, driver_device, 0, ROT270, "Technos Japan", "Scrambled Egg", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, eggs, scregg, scregg, scregg, driver_device, 0, ROT270, "Technos Japan (Universal USA license)", "Eggs (USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, dommy, 0, dommy, scregg, scregg_state, 0, ROT270, "Technos Japan", "Dommy", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, scregg, 0, scregg, scregg, scregg_state, 0, ROT270, "Technos Japan", "Scrambled Egg", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, eggs, scregg, scregg, scregg, scregg_state, 0, ROT270, "Technos Japan (Universal USA license)", "Eggs (USA)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, rockduck, 0, scregg, rockduck, scregg_state, rockduck, ROT270, "Datel SAS", "Rock Duck (prototype?)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp
index 821dac8425c..8d48e57dd9f 100644
--- a/src/mame/drivers/scv.cpp
+++ b/src/mame/drivers/scv.cpp
@@ -651,7 +651,7 @@ static SLOT_INTERFACE_START(scv_cart)
SLOT_INTERFACE_INTERNAL("rom128k_ram", SCV_ROM128K_RAM4K)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( scv, scv_state )
+static MACHINE_CONFIG_START( scv )
MCFG_CPU_ADD( "maincpu", UPD7801, XTAL_4MHz )
MCFG_CPU_PROGRAM_MAP( scv_mem )
@@ -712,6 +712,6 @@ ROM_START( scv_pal )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1984, scv, 0, 0, scv, scv, driver_device, 0, "Epoch", "Super Cassette Vision", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-CONS( 198?, scv_pal, scv, 0, scv_pal, scv, driver_device, 0, "Yeno", "Super Cassette Vision (PAL)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1984, scv, 0, 0, scv, scv, scv_state, 0, "Epoch", "Super Cassette Vision", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 198?, scv_pal, scv, 0, scv_pal, scv, scv_state, 0, "Yeno", "Super Cassette Vision (PAL)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp
index 260c9d44104..3a13a4f843a 100644
--- a/src/mame/drivers/scyclone.cpp
+++ b/src/mame/drivers/scyclone.cpp
@@ -41,26 +41,28 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "screen.h"
-#include "speaker.h"
+#include "machine/gen_latch.h"
#include "machine/mb14241.h"
-#include "sound/sn76477.h"
#include "sound/dac.h"
-#include "machine/gen_latch.h"
+#include "sound/sn76477.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
+
class scyclone_state : public driver_device
{
public:
- scyclone_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
+ scyclone_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
m_stars(*this, "stars"),
m_gfx1pal(*this, "gfx1pal"),
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch")
- { }
+ { }
DECLARE_WRITE8_MEMBER(vidctrl_w);
@@ -593,7 +595,7 @@ INTERRUPT_GEN_MEMBER(scyclone_state::irq)
}
-static MACHINE_CONFIG_START( scyclone, scyclone_state )
+static MACHINE_CONFIG_START( scyclone )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000/2) // MOSTEK Z80-CPU ? MHz (there's also a 9.987MHz XTAL) intermissions seem driven directly by CPU speed for reference
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp
index 06f2e1bbf90..9dfca7f7fe8 100644
--- a/src/mame/drivers/sderby.cpp
+++ b/src/mame/drivers/sderby.cpp
@@ -593,7 +593,7 @@ GFXDECODE_END
* Machine Drivers *
****************************/
-static MACHINE_CONFIG_START( sderby, sderby_state )
+static MACHINE_CONFIG_START( sderby )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(sderby_map)
@@ -614,11 +614,11 @@ static MACHINE_CONFIG_START( sderby, sderby_state )
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sderbya, sderby_state )
+static MACHINE_CONFIG_START( sderbya )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(sderbya_map)
@@ -639,11 +639,11 @@ static MACHINE_CONFIG_START( sderbya, sderby_state )
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( luckboom, sderby_state )
+static MACHINE_CONFIG_START( luckboom )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(luckboom_map)
@@ -664,11 +664,11 @@ static MACHINE_CONFIG_START( luckboom, sderby_state )
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spacewin, sderby_state )
+static MACHINE_CONFIG_START( spacewin )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(spacewin_map)
@@ -689,11 +689,11 @@ static MACHINE_CONFIG_START( spacewin, sderby_state )
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( shinygld, sderby_state )
+static MACHINE_CONFIG_START( shinygld)
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) // verified
MCFG_CPU_PROGRAM_MAP(shinygld_map)
@@ -714,11 +714,11 @@ static MACHINE_CONFIG_START( shinygld, sderby_state )
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) /* clock frequency & pin 7 verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pmroulet, sderby_state )
+static MACHINE_CONFIG_START( pmroulet )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(roulette_map)
@@ -739,7 +739,7 @@ static MACHINE_CONFIG_START( pmroulet, sderby_state )
MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) /* clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) /* clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1029,11 +1029,11 @@ ROM_END
* Game Drivers *
******************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1996, sderby, 0, sderby, sderby, driver_device, 0, ROT0, "Playmark", "Super Derby (v.07.03)", 0, layout_sderby )
-GAMEL( 1996, sderbya, sderby, sderbya, sderbya, driver_device, 0, ROT0, "Playmark", "Super Derby (v.10.04)", 0, layout_sderby )
-GAMEL( 1996, spacewin, 0, spacewin, spacewin, driver_device, 0, ROT0, "Playmark", "Scacco Matto / Space Win", 0, layout_spacewin )
-GAME ( 1996, shinygld, 0, shinygld, shinygld, driver_device, 0, ROT0, "Playmark", "Shiny Golds", 0 )
-GAMEL( 1997, croupier, 0, pmroulet, pmroulet, driver_device, 0, ROT0, "Playmark", "Croupier (Playmark Roulette v.20.05)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING, layout_pmroulet )
-GAMEL( 1997, croupiera, croupier, pmroulet, pmroulet, driver_device, 0, ROT0, "Playmark", "Croupier (Playmark Roulette v.09.04)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING, layout_pmroulet )
-GAME ( 1996, luckboom, 0, luckboom, luckboom, driver_device, 0, ROT0, "Playmark", "Lucky Boom", 0 )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1996, sderby, 0, sderby, sderby, sderby_state, 0, ROT0, "Playmark", "Super Derby (v.07.03)", 0, layout_sderby )
+GAMEL( 1996, sderbya, sderby, sderbya, sderbya, sderby_state, 0, ROT0, "Playmark", "Super Derby (v.10.04)", 0, layout_sderby )
+GAMEL( 1996, spacewin, 0, spacewin, spacewin, sderby_state, 0, ROT0, "Playmark", "Scacco Matto / Space Win", 0, layout_spacewin )
+GAME ( 1996, shinygld, 0, shinygld, shinygld, sderby_state, 0, ROT0, "Playmark", "Shiny Golds", 0 )
+GAMEL( 1997, croupier, 0, pmroulet, pmroulet, sderby_state, 0, ROT0, "Playmark", "Croupier (Playmark Roulette v.20.05)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING, layout_pmroulet )
+GAMEL( 1997, croupiera, croupier, pmroulet, pmroulet, sderby_state, 0, ROT0, "Playmark", "Croupier (Playmark Roulette v.09.04)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING, layout_pmroulet )
+GAME ( 1996, luckboom, 0, luckboom, luckboom, sderby_state, 0, ROT0, "Playmark", "Lucky Boom", 0 )
diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp
index c5d2f45dd5e..08303254f76 100644
--- a/src/mame/drivers/sdk80.cpp
+++ b/src/mame/drivers/sdk80.cpp
@@ -115,7 +115,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) // set up terminal to default to
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( sdk80, sdk80_state )
+static MACHINE_CONFIG_START( sdk80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080A, XTAL_18_432MHz/9)
MCFG_CPU_PROGRAM_MAP(sdk80_mem)
@@ -145,5 +145,5 @@ ROM_START( sdk80 )
ROM_LOAD( "mcs80.a14", 0x0000, 0x0400, BAD_DUMP CRC(3ce7bd37) SHA1(04cc67875b53d4cdfefce07041af12be3acedf4f)) // Compiled from manual listing
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1975, sdk80, 0, 0, sdk80, sdk80, driver_device, 0, "Intel", "SDK-80", MACHINE_NO_SOUND_HW )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1975, sdk80, 0, 0, sdk80, sdk80, sdk80_state, 0, "Intel", "SDK-80", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp
index 7a899e067c1..799e707db90 100644
--- a/src/mame/drivers/sdk85.cpp
+++ b/src/mame/drivers/sdk85.cpp
@@ -124,7 +124,7 @@ READ8_MEMBER( sdk85_state::kbd_r )
return data;
}
-static MACHINE_CONFIG_START( sdk85, sdk85_state )
+static MACHINE_CONFIG_START( sdk85 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(sdk85_mem)
@@ -154,5 +154,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, sdk85, 0, 0, sdk85, sdk85, driver_device, 0, "Intel", "SDK-85", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1977, sdk85, 0, 0, sdk85, sdk85, sdk85_state, 0, "Intel", "SDK-85", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp
index 435dce2d8c1..f2561185988 100644
--- a/src/mame/drivers/sdk86.cpp
+++ b/src/mame/drivers/sdk86.cpp
@@ -146,7 +146,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( sdk86, sdk86_state )
+static MACHINE_CONFIG_START( sdk86 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, XTAL_14_7456MHz/3) /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */
MCFG_CPU_PROGRAM_MAP(sdk86_mem)
@@ -218,5 +218,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1979, sdk86, 0, 0, sdk86, sdk86, driver_device, 0, "Intel", "SDK-86", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1979, sdk86, 0, 0, sdk86, sdk86, sdk86_state, 0, "Intel", "SDK-86", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index 914a8ba7c0e..828b4d181db 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -477,7 +477,7 @@ static GFXDECODE_START( seabattl )
GFXDECODE_ENTRY( "gfx3", 0, tiles8x8_layout, 24, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( seabattl, seabattl_state )
+static MACHINE_CONFIG_START( seabattl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 14318180/4/2)
@@ -568,5 +568,5 @@ ROM_START( seabattla ) // this was a very different looking PCB (bootleg called
ROM_END
-GAMEL(1980, seabattl, 0, seabattl, seabattl, driver_device, 0, ROT0, "Zaccaria", "Sea Battle (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_seabattl )
-GAMEL(1980, seabattla, seabattl, seabattl, seabattl, driver_device, 0, ROT0, "Zaccaria", "Sea Battle (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING, layout_seabattl ) // incomplete dump
+GAMEL(1980, seabattl, 0, seabattl, seabattl, seabattl_state, 0, ROT0, "Zaccaria", "Sea Battle (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_seabattl )
+GAMEL(1980, seabattla, seabattl, seabattl, seabattl, seabattl_state, 0, ROT0, "Zaccaria", "Sea Battle (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING, layout_seabattl ) // incomplete dump
diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp
index 59def9aee7f..bb5114bdeec 100644
--- a/src/mame/drivers/sealy.cpp
+++ b/src/mame/drivers/sealy.cpp
@@ -95,7 +95,7 @@ static GFXDECODE_START( sealy )
GFXDECODE_END
-static MACHINE_CONFIG_START( sealy, sealy_state )
+static MACHINE_CONFIG_START( sealy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H83044, MAIN_CLOCK) /* wrong CPU, but we have not a M16C core ATM */
@@ -115,7 +115,7 @@ static MACHINE_CONFIG_START( sealy, sealy_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MAIN_CLOCK/13, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", MAIN_CLOCK/13, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -136,4 +136,4 @@ ROM_START( crzyddz )
ROM_END
-GAME( 2004?, crzyddz, 0, sealy, sealy, driver_device, 0, ROT0, "Sealy", "Crazy Dou Di Zhu", MACHINE_IS_SKELETON )
+GAME( 2004?, crzyddz, 0, sealy, sealy, sealy_state, 0, ROT0, "Sealy", "Crazy Dou Di Zhu", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp
index 030bf9108f6..a1f94c3011e 100644
--- a/src/mame/drivers/seattle.cpp
+++ b/src/mame/drivers/seattle.cpp
@@ -1735,7 +1735,7 @@ INPUT_PORTS_END
#define PCI_ID_VIDEO ":pci:08.0"
#define PCI_ID_IDE ":pci:09.0"
-static MACHINE_CONFIG_START( seattle_common, seattle_state )
+static MACHINE_CONFIG_START( seattle_common )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*3)
diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp
index baa49c6101a..559e2d52eaa 100644
--- a/src/mame/drivers/seattlecmp.cpp
+++ b/src/mame/drivers/seattlecmp.cpp
@@ -47,7 +47,8 @@ public:
DECLARE_READ16_MEMBER(read);
DECLARE_WRITE16_MEMBER(write);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
private:
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
@@ -98,13 +99,13 @@ void seattle_comp_state::machine_reset()
m_term_data = 0;
}
-WRITE8_MEMBER( seattle_comp_state::kbd_put )
+void seattle_comp_state::kbd_put(u8 data)
{
m_term_data = data;
m_key_available = 1;
}
-static MACHINE_CONFIG_START( seattle, seattle_comp_state )
+static MACHINE_CONFIG_START( seattle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8086, 4000000) // no idea
MCFG_CPU_PROGRAM_MAP(seattle_mem)
@@ -112,7 +113,7 @@ static MACHINE_CONFIG_START( seattle, seattle_comp_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(seattle_comp_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(seattle_comp_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -123,5 +124,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1986, seattle, 0, 0, seattle, seattle, driver_device, 0, "Seattle Computer", "SCP-300F", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1986, seattle, 0, 0, seattle, seattle, seattle_comp_state, 0, "Seattle Computer", "SCP-300F", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/sega_sawatte.cpp b/src/mame/drivers/sega_sawatte.cpp
index 1caec4a2748..151bb74649b 100644
--- a/src/mame/drivers/sega_sawatte.cpp
+++ b/src/mame/drivers/sega_sawatte.cpp
@@ -43,7 +43,7 @@ static INPUT_PORTS_START( sawatte )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sawatte, sawatte_state )
+static MACHINE_CONFIG_START( sawatte )
MCFG_SOFTWARE_LIST_ADD("cart_list", "sawatte")
MACHINE_CONFIG_END
@@ -51,4 +51,4 @@ ROM_START( sawatte )
ROM_END
-CONS( 1996?, sawatte, 0, 0, sawatte, sawatte, driver_device, 0, "Sega", "Sawatte", MACHINE_IS_SKELETON )
+CONS( 1996?, sawatte, 0, 0, sawatte, sawatte, sawatte_state, 0, "Sega", "Sawatte", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp
index 5f71defa48c..6404b277a7a 100644
--- a/src/mame/drivers/segac2.cpp
+++ b/src/mame/drivers/segac2.cpp
@@ -1524,7 +1524,7 @@ WRITE_LINE_MEMBER(segac2_state::vdp_lv4irqline_callback_c2)
}
-static MACHINE_CONFIG_START( segac, segac2_state )
+static MACHINE_CONFIG_START( segac )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XL2_CLOCK/6)
diff --git a/src/mame/drivers/segacoin.cpp b/src/mame/drivers/segacoin.cpp
index aac1d5a2969..9895b038284 100644
--- a/src/mame/drivers/segacoin.cpp
+++ b/src/mame/drivers/segacoin.cpp
@@ -104,7 +104,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( westdrm, segacoin_state )
+static MACHINE_CONFIG_START( westdrm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 8000000) // clock frequency unknown
@@ -139,4 +139,4 @@ ROM_START( westdrm )
ROM_END
-GAME (1992, westdrm, 0, westdrm, westdrm, driver_device, 0, ROT0, "Sega", "Western Dream", MACHINE_IS_SKELETON_MECHANICAL )
+GAME (1992, westdrm, 0, westdrm, westdrm, segacoin_state, 0, ROT0, "Sega", "Western Dream", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index cf3b98cbd19..e7e06670405 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -1003,7 +1003,7 @@ uint32_t systeme_state::screen_update_systeme(screen_device &screen, bitmap_rgb3
return 0;
}
-static MACHINE_CONFIG_START( systeme, systeme_state )
+static MACHINE_CONFIG_START( systeme )
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/2) /* Z80B @ 5.3693Mhz */
MCFG_CPU_PROGRAM_MAP(systeme_map)
MCFG_CPU_IO_MAP(io_map)
@@ -1013,8 +1013,8 @@ static MACHINE_CONFIG_START( systeme, systeme_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
- SEGA315_5124_WIDTH , SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH, SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256, \
- SEGA315_5124_HEIGHT_NTSC, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_192_TBORDER_HEIGHT, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_192_TBORDER_HEIGHT + 192)
+ sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256, \
+ sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT + 192)
MCFG_SCREEN_UPDATE_DRIVER(systeme_state, screen_update_systeme)
MCFG_DEVICE_ADD("vdp1", SEGA315_5124, 0)
@@ -1090,12 +1090,12 @@ DRIVER_INIT_MEMBER(systeme_state, fantzn2)
}
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1985, hangonjr, 0, hangonjr, hangonjr, driver_device, 0, ROT0, "Sega", "Hang-On Jr.", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, transfrm, 0, systeme, transfrm, driver_device, 0, ROT0, "Sega", "Transformer", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, astrofl, transfrm, systemex_315_5177, transfrm, driver_device, 0, ROT0, "Sega", "Astro Flash (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, ridleofp, 0, ridleofp, ridleofp, driver_device, 0, ROT90, "Sega / Nasco", "Riddle of Pythagoras (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, opaopa, 0, systemeb, opaopa, systeme_state, opaopa, ROT0, "Sega", "Opa Opa (MC-8123, 317-0042)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, fantzn2, 0, systemex, fantzn2, systeme_state, fantzn2, ROT0, "Sega", "Fantasy Zone II - The Tears of Opa-Opa (MC-8123, 317-0057)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tetrisse, 0, systeme, tetrisse, driver_device, 0, ROT0, "Sega", "Tetris (Japan, System E)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, slapshtr, 0, systeme, slapshtr, driver_device, 0, ROT0, "Sega", "Slap Shooter", MACHINE_SUPPORTS_SAVE) // 1986 date from flyer
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE INIT, MONITOR,COMPANY,FULLNAME,FLAGS
+GAME( 1985, hangonjr, 0, hangonjr, hangonjr, systeme_state, 0, ROT0, "Sega", "Hang-On Jr.", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, transfrm, 0, systeme, transfrm, systeme_state, 0, ROT0, "Sega", "Transformer", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, astrofl, transfrm, systemex_315_5177, transfrm, systeme_state, 0, ROT0, "Sega", "Astro Flash (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, ridleofp, 0, ridleofp, ridleofp, systeme_state, 0, ROT90, "Sega / Nasco", "Riddle of Pythagoras (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, opaopa, 0, systemeb, opaopa, systeme_state, opaopa, ROT0, "Sega", "Opa Opa (MC-8123, 317-0042)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, fantzn2, 0, systemex, fantzn2, systeme_state, fantzn2, ROT0, "Sega", "Fantasy Zone II - The Tears of Opa-Opa (MC-8123, 317-0057)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tetrisse, 0, systeme, tetrisse, systeme_state, 0, ROT0, "Sega", "Tetris (Japan, System E)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, slapshtr, 0, systeme, slapshtr, systeme_state, 0, ROT0, "Sega", "Slap Shooter", MACHINE_SUPPORTS_SAVE) // 1986 date from flyer
diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp
index 83d34bef13b..edce5584cc7 100644
--- a/src/mame/drivers/segag80r.cpp
+++ b/src/mame/drivers/segag80r.cpp
@@ -809,7 +809,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( g80r_base, segag80r_state )
+static MACHINE_CONFIG_START( g80r_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
@@ -1591,21 +1591,21 @@ DRIVER_INIT_MEMBER(segag80r_state,sindbadm)
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
/* basic G-80 system with: CPU board, PROM board, Video I board, custom sound boards */
-GAME( 1981, astrob, 0, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 3)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob2, astrob, astrob, astrob2, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 2)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob2a, astrob, astrob, astrob2, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 2a)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob1, astrob, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 1)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // instant death if you start game with 1 credit, protection?, bad dump?
-GAME( 1981, astrobg, astrob, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (German)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, 005, 0, 005, 005, segag80r_state, 005, ROT270, "Sega", "005", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, astrob, 0, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 3)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, astrob2, astrob, astrob, astrob2, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 2)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, astrob2a, astrob, astrob, astrob2, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 2a)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, astrob1, astrob, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (version 1)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // instant death if you start game with 1 credit, protection?, bad dump?
+GAME( 1981, astrobg, astrob, astrob, astrob, segag80r_state, astrob, ROT270, "Sega", "Astro Blaster (German)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, 005, 0, 005, 005, segag80r_state, 005, ROT270, "Sega", "005", MACHINE_IMPERFECT_SOUND )
/* basic G-80 system with individual background boards */
-GAME( 1981, spaceod, 0, spaceod, spaceod, segag80r_state, spaceod, ROT270, "Sega", "Space Odyssey (version 2)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spaceod2, spaceod, spaceod, spaceod, segag80r_state, spaceod, ROT270, "Sega", "Space Odyssey (version 1)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, spaceod, 0, spaceod, spaceod, segag80r_state, spaceod, ROT270, "Sega", "Space Odyssey (version 2)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, spaceod2, spaceod, spaceod, spaceod, segag80r_state, spaceod, ROT270, "Sega", "Space Odyssey (version 1)", MACHINE_IMPERFECT_SOUND )
GAME( 1982, monsterb, 0, monsterb, monsterb, segag80r_state, monsterb, ROT270, "Sega", "Monster Bash", MACHINE_IMPERFECT_SOUND )
/* 2-board G-80 system */
GAME( 1982, monsterb2, monsterb, monster2, monsterb, segag80r_state, monster2, ROT270, "Sega", "Monster Bash (2 board version)", MACHINE_IMPERFECT_SOUND )
-GAME( 1983, pignewt, 0, pignewt, pignewt, segag80r_state, pignewt, ROT270, "Sega", "Pig Newton (version C)", MACHINE_IMPERFECT_SOUND )
+GAME( 1983, pignewt, 0, pignewt, pignewt, segag80r_state, pignewt, ROT270, "Sega", "Pig Newton (version C)", MACHINE_IMPERFECT_SOUND )
GAME( 1983, pignewta, pignewt, pignewt, pignewta, segag80r_state, pignewt, ROT270, "Sega", "Pig Newton (version A)", MACHINE_IMPERFECT_SOUND )
GAME( 1983, sindbadm, 0, sindbadm, sindbadm, segag80r_state, sindbadm, ROT270, "Sega", "Sindbad Mystery", 0 )
diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp
index 7cf4919bd57..58b4eb901c0 100644
--- a/src/mame/drivers/segag80v.cpp
+++ b/src/mame/drivers/segag80v.cpp
@@ -870,7 +870,7 @@ static const char *const zektor_sample_names[] =
*
*************************************/
-static MACHINE_CONFIG_START( g80v_base, segag80v_state )
+static MACHINE_CONFIG_START( g80v_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, VIDEO_CLOCK/4)
@@ -1385,15 +1385,15 @@ DRIVER_INIT_MEMBER(segag80v_state,startrek)
*
*************************************/
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY,FULLNAME,FLAGS
-GAME( 1981, elim2, 0, elim2, elim2, segag80v_state, elim2, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (2 Players, set 1)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim2a, elim2, elim2, elim2, segag80v_state, elim2, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (2 Players, set 2)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim2c, elim2, elim2, elim2c, segag80v_state, elim2, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (2 Players, cocktail)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim4, elim2, elim2, elim4, segag80v_state, elim4, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (4 Players)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim4p, elim2, elim2, elim4, segag80v_state, elim4, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (4 Players, prototype)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spacfury, 0, spacfury, spacfury, segag80v_state, spacfury, ORIENTATION_FLIP_Y, "Sega", "Space Fury (revision C)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spacfurya, spacfury, spacfury, spacfury, segag80v_state, spacfury, ORIENTATION_FLIP_Y, "Sega", "Space Fury (revision A)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spacfuryb, spacfury, spacfury, spacfury, segag80v_state, spacfury, ORIENTATION_FLIP_Y, "Sega", "Space Fury (revision B)", MACHINE_IMPERFECT_SOUND )
-GAME( 1982, zektor, 0, zektor, zektor, segag80v_state, zektor, ORIENTATION_FLIP_Y, "Sega", "Zektor (revision B)", MACHINE_IMPERFECT_SOUND )
-GAME( 1982, tacscan, 0, tacscan, tacscan, segag80v_state, tacscan, ORIENTATION_FLIP_X ^ ROT270, "Sega", "Tac/Scan", MACHINE_IMPERFECT_SOUND )
-GAME( 1982, startrek, 0, startrek, startrek, segag80v_state, startrek, ORIENTATION_FLIP_Y, "Sega", "Star Trek", MACHINE_IMPERFECT_SOUND )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE INIT, MONITOR, COMPANY, FULLNAME,FLAGS
+GAME( 1981, elim2, 0, elim2, elim2, segag80v_state, elim2, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (2 Players, set 1)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, elim2a, elim2, elim2, elim2, segag80v_state, elim2, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (2 Players, set 2)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, elim2c, elim2, elim2, elim2c, segag80v_state, elim2, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (2 Players, cocktail)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, elim4, elim2, elim2, elim4, segag80v_state, elim4, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (4 Players)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, elim4p, elim2, elim2, elim4, segag80v_state, elim4, ORIENTATION_FLIP_Y, "Gremlin", "Eliminator (4 Players, prototype)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, spacfury, 0, spacfury, spacfury, segag80v_state, spacfury, ORIENTATION_FLIP_Y, "Sega", "Space Fury (revision C)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, spacfurya, spacfury, spacfury, spacfury, segag80v_state, spacfury, ORIENTATION_FLIP_Y, "Sega", "Space Fury (revision A)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, spacfuryb, spacfury, spacfury, spacfury, segag80v_state, spacfury, ORIENTATION_FLIP_Y, "Sega", "Space Fury (revision B)", MACHINE_IMPERFECT_SOUND )
+GAME( 1982, zektor, 0, zektor, zektor, segag80v_state, zektor, ORIENTATION_FLIP_Y, "Sega", "Zektor (revision B)", MACHINE_IMPERFECT_SOUND )
+GAME( 1982, tacscan, 0, tacscan, tacscan, segag80v_state, tacscan, ORIENTATION_FLIP_X ^ ROT270, "Sega", "Tac/Scan", MACHINE_IMPERFECT_SOUND )
+GAME( 1982, startrek, 0, startrek, startrek, segag80v_state, startrek, ORIENTATION_FLIP_Y, "Sega", "Star Trek", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp
index 13e3a4ea4ea..dbf08b70271 100644
--- a/src/mame/drivers/segahang.cpp
+++ b/src/mame/drivers/segahang.cpp
@@ -746,7 +746,7 @@ GFXDECODE_END
// GENERIC MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( shared_base, segahang_state )
+static MACHINE_CONFIG_START( shared_base )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_25MHz/4)
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index 6cce002e225..f8c8f3b6a77 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -356,7 +356,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, segajw_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( segajw, segajw_state )
+static MACHINE_CONFIG_START( segajw )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,8000000) // unknown clock
MCFG_CPU_PROGRAM_MAP(segajw_map)
@@ -428,4 +428,4 @@ ROM_START( segajw )
ROM_END
-GAMEL( 1991, segajw, 0, segajw, segajw, driver_device, 0, ROT0, "Sega", "Joker's Wild (Rev. B)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_segajw )
+GAMEL( 1991, segajw, 0, segajw, segajw, segajw_state, 0, ROT0, "Sega", "Joker's Wild (Rev. B)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_segajw )
diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp
index 8a950115fda..82df5949cbc 100644
--- a/src/mame/drivers/segald.cpp
+++ b/src/mame/drivers/segald.cpp
@@ -367,7 +367,7 @@ void segald_state::machine_start()
/* DRIVER */
-static MACHINE_CONFIG_START( astron, segald_state )
+static MACHINE_CONFIG_START( astron )
/* main cpu */
MCFG_CPU_ADD("maincpu", Z80, SCHEMATIC_CLOCK/4)
@@ -605,10 +605,10 @@ DRIVER_INIT_MEMBER(segald_state,astron)
}
-// YEAR, NAME, PARENT, MACHINE,INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1983, astron, 0, astron, astron, segald_state, astron, ROT0, "Sega", "Astron Belt", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-GAME( 1983, astronp, astron, astron, astron, segald_state, astron, ROT0, "Sega", "Astron Belt (Pioneer LDV1000)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+// YEAR, NAME, PARENT, MACHINE,INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
+GAME( 1983, astron, 0, astron, astron, segald_state, astron, ROT0, "Sega", "Astron Belt", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+GAME( 1983, astronp, astron, astron, astron, segald_state, astron, ROT0, "Sega", "Astron Belt (Pioneer LDV1000)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
GAME( 1983, cobraseg, astron, astron, astron, segald_state, astron, ROT0, "Sega", "Cobra Command (Sega LaserDisc Hardware)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-GAME( 1983, galaxyr, 0, astron, astron, segald_state, astron, ROT0, "Sega", "Galaxy Ranger", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-GAME( 1983, galaxyrp, galaxyr, astron, astron, segald_state, astron, ROT0, "Sega", "Galaxy Ranger (Pioneer LDV1000)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
-GAME( 1983, sblazerp, galaxyr, astron, astron, segald_state, astron, ROT0, "Sega", "Star Blazer (Pioneer LDV1000)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+GAME( 1983, galaxyr, 0, astron, astron, segald_state, astron, ROT0, "Sega", "Galaxy Ranger", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+GAME( 1983, galaxyrp, galaxyr, astron, astron, segald_state, astron, ROT0, "Sega", "Galaxy Ranger (Pioneer LDV1000)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+GAME( 1983, sblazerp, galaxyr, astron, astron, segald_state, astron, ROT0, "Sega", "Star Blazer (Pioneer LDV1000)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp
index 2a295cf24a1..be95c899a05 100644
--- a/src/mame/drivers/segam1.cpp
+++ b/src/mame/drivers/segam1.cpp
@@ -86,7 +86,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( segam1, segam1_state )
+static MACHINE_CONFIG_START( segam1 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
MCFG_CPU_PROGRAM_MAP(segam1_map)
@@ -140,5 +140,5 @@ ROM_START( unkm1 ) // 1992.01.31 string
// dumps of the X-Board part, and the LINK PCB are missing.
ROM_END
-GAME( 199?, bingpty, 0, segam1, segam1, driver_device, 0, ROT0, "Sega", "Bingo Party Multicart (Rev B) (M1 Satellite board)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1992, unkm1, 0, segam1, segam1, driver_device, 0, ROT0, "Sega", "Unknown Sega gambling game (M1 Satellite board)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, bingpty, 0, segam1, segam1, segam1_state, 0, ROT0, "Sega", "Bingo Party Multicart (Rev B) (M1 Satellite board)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1992, unkm1, 0, segam1, segam1, segam1_state, 0, ROT0, "Sega", "Unknown Sega gambling game (M1 Satellite board)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index 6597cc255c4..6df2d4c3ffd 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -1183,7 +1183,7 @@ GFXDECODE_END
// GENERIC MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( outrun_base, segaorun_state )
+static MACHINE_CONFIG_START( outrun_base )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp
index 686a69e889f..1095dd02d0e 100644
--- a/src/mame/drivers/segapico.cpp
+++ b/src/mame/drivers/segapico.cpp
@@ -120,6 +120,7 @@ C = MB3514 / 9325 M36
#include "emu.h"
#include "includes/megadriv.h"
#include "sound/315-5641.h"
+#include "bus/megadrive/rom.h"
#include "softlist.h"
@@ -384,7 +385,7 @@ MACHINE_START_MEMBER(pico_state,pico)
m_vdp->stop_timers();
}
-static MACHINE_CONFIG_START( pico, pico_state )
+static MACHINE_CONFIG_START( pico )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_CPU_MODIFY("maincpu")
@@ -405,7 +406,7 @@ static MACHINE_CONFIG_START( pico, pico_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.16)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( picopal, pico_state )
+static MACHINE_CONFIG_START( picopal )
MCFG_FRAGMENT_ADD( md_pal )
MCFG_CPU_MODIFY("maincpu")
@@ -596,7 +597,7 @@ MACHINE_START_MEMBER(copera_state,copera)
}
-static MACHINE_CONFIG_START( copera, copera_state )
+static MACHINE_CONFIG_START( copera )
MCFG_FRAGMENT_ADD( md_ntsc )
MCFG_CPU_MODIFY("maincpu")
@@ -624,4 +625,4 @@ ROM_START( copera )
ROM_REGION( 0x10000, "soundcpu", ROMREGION_ERASEFF)
ROM_END
-CONS( 1993, copera, 0, 0, copera, pico, pico_base_state, picoj, "Yamaha / Sega", "Yamaha Mixt Book Player Copera", MACHINE_NOT_WORKING)
+CONS( 1993, copera, 0, 0, copera, pico, copera_state, picoj, "Yamaha / Sega", "Yamaha Mixt Book Player Copera", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp
index 1f70e62bda1..eeb729d257e 100644
--- a/src/mame/drivers/segapm.cpp
+++ b/src/mame/drivers/segapm.cpp
@@ -52,7 +52,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( segapm, segapm_state )
+static MACHINE_CONFIG_START( segapm )
MCFG_CPU_ADD("maincpu", M68000, 8000000) // ??
MCFG_CPU_PROGRAM_MAP(segapm_map)
@@ -80,5 +80,5 @@ ROM_START( segapm ) // was more than one cartridge available? if so softlist the
// todo, sh2 bios roms etc.
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-CONS( 1996, segapm, 0, 0, segapm, segapm, driver_device, 0, "Sega", "Picture Magic", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 1996, segapm, 0, 0, segapm, segapm, segapm_state, 0, "Sega", "Picture Magic", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index 47cd46c8d8e..6df55e060f2 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -1868,7 +1868,7 @@ GFXDECODE_END
// GENERIC MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( system16a, segas16a_state )
+static MACHINE_CONFIG_START( system16a )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, 10000000)
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index 1ae43e589c7..d875f81b30a 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -3596,7 +3596,7 @@ GFXDECODE_END
// GENERIC MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( system16b, segas16b_state )
+static MACHINE_CONFIG_START( system16b )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK_10MHz)
@@ -3748,7 +3748,7 @@ static MACHINE_CONFIG_DERIVED( fpointbl, system16b )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lockonph, segas16b_state )
+static MACHINE_CONFIG_START( lockonph )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // ?
@@ -3787,7 +3787,7 @@ static MACHINE_CONFIG_START( lockonph, segas16b_state )
MCFG_SOUND_ROUTE(0, "mono", 0.5)
MCFG_SOUND_ROUTE(1, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // clock / pin not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_LOW) // clock / pin not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2)
@@ -8665,7 +8665,7 @@ DRIVER_INIT_MEMBER(segas16b_state,dunkshot_5358_small)
{
DRIVER_INIT_CALL(generic_5358_small);
m_custom_io_r = read16_delegate(FUNC(segas16b_state::dunkshot_custom_io_r), this);
- m_tilemap_type = SEGAIC16_TILEMAP_16B_ALT;
+ m_tilemap_type = segaic16_video_device::TILEMAP_16B_ALT;
}
DRIVER_INIT_MEMBER(segas16b_state,exctleag_5358)
@@ -8740,13 +8740,13 @@ DRIVER_INIT_MEMBER(segas16b_state,sjryuko_5358_small)
DRIVER_INIT_CALL(generic_5358_small);
m_custom_io_r = read16_delegate(FUNC(segas16b_state::sjryuko_custom_io_r), this);
m_custom_io_w = write16_delegate(FUNC(segas16b_state::sjryuko_custom_io_w), this);
- m_tilemap_type = SEGAIC16_TILEMAP_16B_ALT;
+ m_tilemap_type = segaic16_video_device::TILEMAP_16B_ALT;
}
DRIVER_INIT_MEMBER(segas16b_state,timescan_5358_small)
{
DRIVER_INIT_CALL(generic_5358_small);
- m_tilemap_type = SEGAIC16_TILEMAP_16B_ALT;
+ m_tilemap_type = segaic16_video_device::TILEMAP_16B_ALT;
}
DRIVER_INIT_MEMBER(segas16b_state,tturf_5704)
@@ -9398,7 +9398,7 @@ void isgsm_state::machine_reset()
}
-static MACHINE_CONFIG_DERIVED_CLASS( isgsm, system16b, isgsm_state )
+static MACHINE_CONFIG_DERIVED( isgsm, system16b )
// basic machine hardware
MCFG_DEVICE_REMOVE("maincpu")
diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp
index c44c31e66cf..1da8c95315a 100644
--- a/src/mame/drivers/segas18.cpp
+++ b/src/mame/drivers/segas18.cpp
@@ -1356,7 +1356,7 @@ WRITE_LINE_MEMBER(segas18_state::ym3438_irq_handler)
}
-static MACHINE_CONFIG_START( system18, segas18_state )
+static MACHINE_CONFIG_START( system18 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, 10000000)
diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp
index 7a9b1b7255d..4d3c87175f3 100644
--- a/src/mame/drivers/segas24.cpp
+++ b/src/mame/drivers/segas24.cpp
@@ -1100,15 +1100,15 @@ static ADDRESS_MAP_START( system24_cpu1_map, AS_PROGRAM, 16, segas24_state )
AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x040000) AM_ROM AM_REGION("maincpu", 0)
AM_RANGE(0x080000, 0x0bffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE("share1")
AM_RANGE(0x100000, 0x13ffff) AM_MIRROR(0x0c0000) AM_ROM AM_REGION("maincpu", 0)
- AM_RANGE(0x200000, 0x20ffff) AM_MIRROR(0x110000) AM_DEVREADWRITE("tile", segas24_tile, tile_r, tile_w)
+ AM_RANGE(0x200000, 0x20ffff) AM_MIRROR(0x110000) AM_DEVREADWRITE("tile", segas24_tile_device, tile_r, tile_w)
AM_RANGE(0x220000, 0x220001) AM_MIRROR(0x11fffe) AM_WRITENOP /* Horizontal split position (ABSEL) */
AM_RANGE(0x240000, 0x240001) AM_MIRROR(0x11fffe) AM_WRITENOP /* Scanline trigger position (XHOUT) */
AM_RANGE(0x260000, 0x260001) AM_MIRROR(0x10fffe) AM_WRITENOP /* Frame trigger position (XVOUT) */
AM_RANGE(0x270000, 0x270001) AM_MIRROR(0x10fffe) AM_WRITENOP /* Synchronization mode */
- AM_RANGE(0x280000, 0x29ffff) AM_MIRROR(0x160000) AM_DEVREADWRITE("tile", segas24_tile, char_r, char_w)
+ AM_RANGE(0x280000, 0x29ffff) AM_MIRROR(0x160000) AM_DEVREADWRITE("tile", segas24_tile_device, char_r, char_w)
AM_RANGE(0x400000, 0x403fff) AM_MIRROR(0x1f8000) AM_READWRITE(sys16_paletteram_r, sys16_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_DEVREADWRITE("mixer", segas24_mixer, read, write)
- AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_DEVREADWRITE("sprite", segas24_sprite, read, write)
+ AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_DEVREADWRITE("mixer", segas24_mixer_device, read, write)
+ AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_DEVREADWRITE("sprite", segas24_sprite_device, read, write)
AM_RANGE(0x800000, 0x80003f) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("io", sega_315_5296_device, read, write, 0x00ff)
AM_RANGE(0x800040, 0x80007f) AM_MIRROR(0x1ffe00) AM_READWRITE(iod_r, iod_w)
AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ymsnd", ym2151_device, read, write, 0x00ff)
@@ -1147,15 +1147,15 @@ static ADDRESS_MAP_START( system24_cpu2_map, AS_PROGRAM, 16, segas24_state )
AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE("subcpu")
AM_RANGE(0x080000, 0x0bffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE("share1")
AM_RANGE(0x100000, 0x13ffff) AM_MIRROR(0x0c0000) AM_ROM AM_REGION("maincpu", 0)
- AM_RANGE(0x200000, 0x20ffff) AM_MIRROR(0x110000) AM_DEVREADWRITE("tile", segas24_tile, tile_r, tile_w)
+ AM_RANGE(0x200000, 0x20ffff) AM_MIRROR(0x110000) AM_DEVREADWRITE("tile", segas24_tile_device, tile_r, tile_w)
AM_RANGE(0x220000, 0x220001) AM_MIRROR(0x11fffe) AM_WRITENOP /* Horizontal split position (ABSEL) */
AM_RANGE(0x240000, 0x240001) AM_MIRROR(0x11fffe) AM_WRITENOP /* Scanline trigger position (XHOUT) */
AM_RANGE(0x260000, 0x260001) AM_MIRROR(0x10fffe) AM_WRITENOP /* Frame trigger position (XVOUT) */
AM_RANGE(0x270000, 0x270001) AM_MIRROR(0x10fffe) AM_WRITENOP /* Synchronization mode */
- AM_RANGE(0x280000, 0x29ffff) AM_MIRROR(0x160000) AM_DEVREADWRITE("tile", segas24_tile, char_r, char_w)
+ AM_RANGE(0x280000, 0x29ffff) AM_MIRROR(0x160000) AM_DEVREADWRITE("tile", segas24_tile_device, char_r, char_w)
AM_RANGE(0x400000, 0x403fff) AM_MIRROR(0x1f8000) AM_READWRITE(sys16_paletteram_r, sys16_paletteram_w) AM_SHARE("paletteram")
- AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_DEVREADWRITE("mixer", segas24_mixer, read, write)
- AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_DEVREADWRITE("sprite", segas24_sprite, read, write)
+ AM_RANGE(0x404000, 0x40401f) AM_MIRROR(0x1fbfe0) AM_DEVREADWRITE("mixer", segas24_mixer_device, read, write)
+ AM_RANGE(0x600000, 0x63ffff) AM_MIRROR(0x180000) AM_DEVREADWRITE("sprite", segas24_sprite_device, read, write)
AM_RANGE(0x800000, 0x80003f) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("io", sega_315_5296_device, read, write, 0x00ff)
AM_RANGE(0x800040, 0x80007f) AM_MIRROR(0x1ffe00) AM_READWRITE(iod_r, iod_w)
AM_RANGE(0x800100, 0x800103) AM_MIRROR(0x1ffe00) AM_DEVREADWRITE8("ymsnd", ym2151_device, read, write, 0x00ff)
@@ -1204,9 +1204,9 @@ void segas24_state::machine_start()
membank("bank2")->configure_entries(0, 16, usr1, 0x40000);
}
- vtile = machine().device<segas24_tile>("tile");
- vsprite = machine().device<segas24_sprite>("sprite");
- vmixer = machine().device<segas24_mixer>("mixer");
+ vtile = machine().device<segas24_tile_device>("tile");
+ vsprite = machine().device<segas24_sprite_device>("sprite");
+ vmixer = machine().device<segas24_mixer_device>("mixer");
}
void segas24_state::machine_reset()
@@ -1875,7 +1875,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( system24, segas24_state )
+static MACHINE_CONFIG_START( system24 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/2)
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index e343822aa11..7ac164eb43a 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -547,29 +547,29 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the
#include "radr.lh"
-const device_type SEGA_S32_PCB = device_creator<segas32_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_PCB, segas32_state, "segas32_pcb", "Sega System 32 PCB")
segas32_state::segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_PCB, "Sega System 32 PCB", tag, owner, clock, "segas32_pcb", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_PCB, tag, owner, clock)
{
}
-segas32_state::segas32_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_z80_shared_ram(*this,"z80_shared_ram"),
- m_system32_workram(*this,"workram"),
- m_system32_videoram(*this,"videoram", 0),
- m_system32_spriteram(*this,"spriteram", 0),
- m_system32_paletteram(*this,"paletteram.%u", 0, uint8_t(0)),
- m_maincpu(*this, "maincpu"),
- m_soundcpu(*this, "soundcpu"),
- m_multipcm(*this, "sega"),
- m_gfxdecode(*this, "gfxdecode"),
- m_screen(*this, "screen"),
- m_palette(*this, "palette"),
- m_irq_timer_0(*this, "v60_irq0"),
- m_irq_timer_1(*this, "v60_irq1"),
- m_s32comm(*this, "s32comm")
+segas32_state::segas32_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
+ m_z80_shared_ram(*this,"z80_shared_ram"),
+ m_system32_workram(*this,"workram"),
+ m_system32_videoram(*this,"videoram", 0),
+ m_system32_spriteram(*this,"spriteram", 0),
+ m_system32_paletteram(*this,"paletteram.%u", 0, uint8_t(0)),
+ m_maincpu(*this, "maincpu"),
+ m_soundcpu(*this, "soundcpu"),
+ m_multipcm(*this, "sega"),
+ m_gfxdecode(*this, "gfxdecode"),
+ m_screen(*this, "screen"),
+ m_palette(*this, "palette"),
+ m_irq_timer_0(*this, "v60_irq0"),
+ m_irq_timer_1(*this, "v60_irq1"),
+ m_s32comm(*this, "s32comm")
{
}
@@ -2342,10 +2342,10 @@ static MACHINE_CONFIG_FRAGMENT( system32 )
MCFG_S32COMM_ADD("s32comm")
MACHINE_CONFIG_END
-const device_type SEGA_S32_REGULAR_DEVICE = device_creator<segas32_regular_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_REGULAR_DEVICE, segas32_regular_state, "segas32_pcb_regular", "Sega System 32 regular PCB")
segas32_regular_state::segas32_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_REGULAR_DEVICE, "Sega System 32 regular PCB", tag, owner, clock, "sega32_pcb_regular", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_REGULAR_DEVICE, tag, owner, clock)
{
}
@@ -2377,10 +2377,10 @@ static MACHINE_CONFIG_FRAGMENT( system32_analog )
MCFG_MSM6253_IN3_ANALOG_PORT("ANALOG4")
MACHINE_CONFIG_END
-const device_type SEGA_S32_ANALOG_DEVICE = device_creator<segas32_analog_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_ANALOG_DEVICE, segas32_analog_state, "segas32_pcb_analog", "Sega System 32 analog PCB")
segas32_analog_state::segas32_analog_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_ANALOG_DEVICE, "Sega System 32 analog PCB", tag, owner, clock, "sega32_pcb_analog", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_ANALOG_DEVICE, tag, owner, clock)
{
}
@@ -2406,11 +2406,11 @@ static MACHINE_CONFIG_FRAGMENT( system32_trackball )
MCFG_DEVICE_PROGRAM_MAP(system32_trackball_map)
MACHINE_CONFIG_END
-const device_type SEGA_S32_TRACKBALL_DEVICE = device_creator<segas32_trackball_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_TRACKBALL_DEVICE, segas32_trackball_state, "segas32_pcb_trackball", "Sega System 32 trackball PCB")
segas32_trackball_state::segas32_trackball_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_TRACKBALL_DEVICE, "Sega System 32 trackball PCB", tag, owner, clock, "sega32_pcb_trackball", __FILE__),
- m_track_ports(*this, {"TRACKX1", "TRACKY1", "TRACKX2", "TRACKY2", "TRACKX3", "TRACKY3"})
+ : segas32_state(mconfig, SEGA_S32_TRACKBALL_DEVICE, tag, owner, clock)
+ , m_track_ports(*this, {"TRACKX1", "TRACKY1", "TRACKX2", "TRACKY2", "TRACKX3", "TRACKY3"})
{
}
@@ -2441,10 +2441,10 @@ static MACHINE_CONFIG_FRAGMENT( system32_4player )
MCFG_I8255_IN_PORTC_CB(IOPORT("EXTRA3"))
MACHINE_CONFIG_END
-const device_type SEGA_S32_4PLAYER_DEVICE = device_creator<segas32_4player_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_4PLAYER_DEVICE, segas32_4player_state, "segas32_pcb_4player", "Sega System 32 4-player/fighting PCB")
segas32_4player_state::segas32_4player_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_4PLAYER_DEVICE, "Sega System 32 4 player/fighting PCB", tag, owner, clock, "sega32_pcb_4player", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_4PLAYER_DEVICE, tag, owner, clock)
{
}
@@ -2477,10 +2477,10 @@ static MACHINE_CONFIG_FRAGMENT( system32_v25 )
MCFG_V25_CONFIG(ga2_v25_opcode_table)
MACHINE_CONFIG_END
-const device_type SEGA_S32_V25_DEVICE = device_creator<segas32_v25_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_V25_DEVICE, segas32_v25_state, "segas32_pcb_v25", "Sega System 32 V25 PCB")
segas32_v25_state::segas32_v25_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_V25_DEVICE, "Sega System 32 V25 PCB", tag, owner, clock, "sega32_pcb_v25", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_V25_DEVICE, tag, owner, clock)
{
}
@@ -2507,10 +2507,10 @@ static MACHINE_CONFIG_FRAGMENT( system32_upd7725 )
// See HLE of this dsp in /src/mame/machine/segas32.cpp : arescue_dsp_r and arescue_dsp_w
MACHINE_CONFIG_END
-const device_type SEGA_S32_UPD7725_DEVICE = device_creator<segas32_upd7725_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_UPD7725_DEVICE, segas32_upd7725_state, "segas32_pcb_upd7725", "Sega System 32 uPD7725 PCB")
segas32_upd7725_state::segas32_upd7725_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_UPD7725_DEVICE, "Sega System 32 UPD7725 PCB", tag, owner, clock, "sega32_pcb_upd7725", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_UPD7725_DEVICE, tag, owner, clock)
{
}
@@ -2555,10 +2555,10 @@ static MACHINE_CONFIG_FRAGMENT( system32_cd )
MCFG_CXD1095_IN_PORTD_CB(CONSTANT(0xff))
MACHINE_CONFIG_END
-const device_type SEGA_S32_CD_DEVICE = device_creator<segas32_cd_state>;
+DEFINE_DEVICE_TYPE(SEGA_S32_CD_DEVICE, segas32_cd_state, "segas32_pcb_cd", "Sega System 32 CD PCB")
segas32_cd_state::segas32_cd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_S32_CD_DEVICE, "Sega System 32 CD PCB", tag, owner, clock, "sega32_pcb_cd", __FILE__)
+ : segas32_state(mconfig, SEGA_S32_CD_DEVICE, tag, owner, clock)
{
}
@@ -2643,10 +2643,10 @@ static MACHINE_CONFIG_FRAGMENT( multi32 )
MACHINE_CONFIG_END
-const device_type SEGA_MULTI32_DEVICE = device_creator<sega_multi32_state>;
+DEFINE_DEVICE_TYPE(SEGA_MULTI32_DEVICE, sega_multi32_state, "segas32_pcb_multi", "Sega Multi 32")
sega_multi32_state::sega_multi32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_MULTI32_DEVICE, "Sega Multi 32 PCB", tag, owner, clock, "sega32_pcb_multi", __FILE__)
+ : segas32_state(mconfig, SEGA_MULTI32_DEVICE, tag, owner, clock)
{
}
@@ -2692,11 +2692,11 @@ WRITE8_MEMBER(sega_multi32_analog_state::analog_bank_w)
m_analog_bank = data & 1;
}
-const device_type SEGA_MULTI32_ANALOG_DEVICE = device_creator<sega_multi32_analog_state>;
+DEFINE_DEVICE_TYPE(SEGA_MULTI32_ANALOG_DEVICE, sega_multi32_analog_state, "segas32_pcb_multi_analog", "Sega Multi 32 analog PCB")
sega_multi32_analog_state::sega_multi32_analog_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_MULTI32_ANALOG_DEVICE, "Sega Multi 32 analog PCB", tag, owner, clock, "sega32_pcb_multi_analog", __FILE__),
- m_analog_ports(*this, {"ANALOG1", "ANALOG2", "ANALOG3", "ANALOG4", "ANALOG5", "ANALOG6", "ANALOG7", "ANALOG8"})
+ : segas32_state(mconfig, SEGA_MULTI32_ANALOG_DEVICE, tag, owner, clock)
+ , m_analog_ports(*this, "ANALOG%u", 1)
{
}
@@ -2725,10 +2725,10 @@ static MACHINE_CONFIG_FRAGMENT( multi32_6player )
MCFG_I8255_IN_PORTC_CB(IOPORT("EXTRA3"))
MACHINE_CONFIG_END
-const device_type SEGA_MULTI32_6PLAYER_DEVICE = device_creator<sega_multi32_6player_state>;
+DEFINE_DEVICE_TYPE(SEGA_MULTI32_6PLAYER_DEVICE, sega_multi32_6player_state, "segas32_pcb_multi_6player", "Sega Multi 32 6-player PCB")
sega_multi32_6player_state::sega_multi32_6player_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segas32_state(mconfig, SEGA_MULTI32_6PLAYER_DEVICE, "Sega Multi 32 6 player PCB", tag, owner, clock, "sega32_pcb_multi_6player", __FILE__)
+ : segas32_state(mconfig, SEGA_MULTI32_6PLAYER_DEVICE, tag, owner, clock)
{
}
@@ -2742,9 +2742,9 @@ class segas32_new_state : public driver_device
{
public:
segas32_new_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_mainpcb(*this, "mainpcb"),
- m_slavepcb(*this, "slavepcb")
+ : driver_device(mconfig, type, tag)
+ , m_mainpcb(*this, "mainpcb")
+ , m_slavepcb(*this, "slavepcb")
{ }
required_device<segas32_state> m_mainpcb;
@@ -2785,51 +2785,51 @@ public:
-static MACHINE_CONFIG_START( sega_system32, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32 )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_REGULAR_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_system32_analog, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_analog )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_ANALOG_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_system32_track, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_track )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_TRACKBALL_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_system32_4p, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_4p )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_4PLAYER_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_system32_cd, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_cd )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_CD_DEVICE, 0)
MACHINE_CONFIG_END
// for f1en where there is a sub-board containing shared ram sitting underneath the ROM board bridging 2 PCBs (not a network link)
-static MACHINE_CONFIG_START( sega_system32_dual_direct, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_dual_direct )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_ANALOG_DEVICE, 0)
MCFG_DEVICE_ADD("slavepcb", SEGA_S32_ANALOG_DEVICE, 0)
MACHINE_CONFIG_END
// air rescue is like f1en above but also has the 837-8341 DSP daughterboard on the mainpcb side only
-static MACHINE_CONFIG_START( sega_system32_dual_direct_upd7725, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_dual_direct_upd7725 )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_UPD7725_DEVICE, 0)
MCFG_DEVICE_ADD("slavepcb", SEGA_S32_ANALOG_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_system32_v25, segas32_new_state )
+static MACHINE_CONFIG_START( sega_system32_v25 )
MCFG_DEVICE_ADD("mainpcb", SEGA_S32_V25_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_multi32, segas32_new_state )
+static MACHINE_CONFIG_START( sega_multi32 )
MCFG_DEVICE_ADD("mainpcb", SEGA_MULTI32_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_multi32_analog, segas32_new_state )
+static MACHINE_CONFIG_START( sega_multi32_analog )
MCFG_DEVICE_ADD("mainpcb", SEGA_MULTI32_ANALOG_DEVICE, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_multi32_6p, segas32_new_state )
+static MACHINE_CONFIG_START( sega_multi32_6p )
MCFG_DEVICE_ADD("mainpcb", SEGA_MULTI32_6PLAYER_DEVICE, 0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/segasp.cpp b/src/mame/drivers/segasp.cpp
index 00d72f509a2..39c4e53baff 100644
--- a/src/mame/drivers/segasp.cpp
+++ b/src/mame/drivers/segasp.cpp
@@ -293,7 +293,7 @@ INPUT_PORTS_START( segasp )
INPUT_PORTS_END
-static MACHINE_CONFIG_DERIVED_CLASS( segasp, naomi_aw_base, segasp_state )
+static MACHINE_CONFIG_DERIVED( segasp, naomi_aw_base )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(segasp_map)
MCFG_CPU_IO_MAP(onchip_port)
@@ -539,24 +539,24 @@ ROM_END
#define GAME_FLAGS (MACHINE_NO_SOUND|MACHINE_NOT_WORKING)
-GAME( 2004, segasp, 0, segasp, segasp, driver_device, 0, ROT0, "Sega", "Sega System SP (Spider) BIOS", GAME_FLAGS | MACHINE_IS_BIOS_ROOT )
+GAME( 2004, segasp, 0, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Sega System SP (Spider) BIOS", GAME_FLAGS | MACHINE_IS_BIOS_ROOT )
// These use ROMs
-GAME( 2009, brickppl,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Brick People / Block PeePoo (Ver 1.002)", GAME_FLAGS )
+GAME( 2009, brickppl,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Brick People / Block PeePoo (Ver 1.002)", GAME_FLAGS )
-GAME( 2005, dinoking,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Dinosaur King (USA)", GAME_FLAGS )
+GAME( 2005, dinoking,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Dinosaur King (USA)", GAME_FLAGS )
-GAME( 2006, dinokior,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Dinosaur King - Operation: Dinosaur Rescue (USA, Export)", GAME_FLAGS )
+GAME( 2006, dinokior,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Dinosaur King - Operation: Dinosaur Rescue (USA, Export)", GAME_FLAGS )
-GAME( 2006, lovebery,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Love And Berry - 1st-2nd Collection (Export, Ver 2.000)", GAME_FLAGS )
-GAME( 2006, lovebero,lovebery, segasp, segasp, driver_device, 0, ROT0, "Sega", "Love And Berry - 1st-2nd Collection (Export, Ver 1.003)", GAME_FLAGS )
+GAME( 2006, lovebery,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Love And Berry - 1st-2nd Collection (Export, Ver 2.000)", GAME_FLAGS )
+GAME( 2006, lovebero,lovebery, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Love And Berry - 1st-2nd Collection (Export, Ver 1.003)", GAME_FLAGS )
-GAME( 2009, tetgiant,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Tetris Giant / Tetris Dekaris (Ver.2.000)", GAME_FLAGS )
+GAME( 2009, tetgiant,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Tetris Giant / Tetris Dekaris (Ver.2.000)", GAME_FLAGS )
// These use a CF card
-GAME( 2008, dinoki25,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Dinosaur King - D-Team VS. the Alpha Fortress (Export, Ver 2.500) (MDA-C0047)", GAME_FLAGS )
+GAME( 2008, dinoki25,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Dinosaur King - D-Team VS. the Alpha Fortress (Export, Ver 2.500) (MDA-C0047)", GAME_FLAGS )
-GAME( 2007, loveber3,segasp, segasp, segasp, driver_device, 0, ROT0, "Sega", "Love And Berry - 3rd-5th Collection (USA, Export, Ver 1.002) (MDA-C0042)", GAME_FLAGS )
+GAME( 2007, loveber3,segasp, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Love And Berry - 3rd-5th Collection (USA, Export, Ver 1.002) (MDA-C0042)", GAME_FLAGS )
-GAME( 2009, tetgiano,tetgiant, segasp, segasp, driver_device, 0, ROT0, "Sega", "Tetris Giant / Tetris Dekaris (MDA-C0076)", GAME_FLAGS )
+GAME( 2009, tetgiano,tetgiant, segasp, segasp, segasp_state, 0, ROT0, "Sega", "Tetris Giant / Tetris Dekaris (MDA-C0076)", GAME_FLAGS )
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index 66479d9bd54..1575fbd8878 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -747,7 +747,7 @@ void ufo_state::machine_start()
save_item(NAME(m_stepper));
}
-static MACHINE_CONFIG_START( newufo, ufo_state )
+static MACHINE_CONFIG_START( newufo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2)
@@ -899,10 +899,10 @@ ROM_START( ufo800 )
ROM_END
-GAMEL( 1991, newufo, 0, newufo, newufo, driver_device, 0, ROT0, "Sega", "New UFO Catcher (standard)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
-GAMEL( 1991, newufo_sonic, newufo, newufo, newufo, driver_device, 0, ROT0, "Sega", "New UFO Catcher (Sonic The Hedgehog)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
-GAMEL( 1991, newufo_nfl, newufo, newufo, newufo, driver_device, 0, ROT0, "Sega", "New UFO Catcher (Team NFL)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
-GAMEL( 1991, newufo_xmas, newufo, newufo, newufo, driver_device, 0, ROT0, "Sega", "New UFO Catcher (Christmas season ROM kit)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
-GAMEL( 1991, ufomini, 0, ufomini, ufomini, driver_device, 0, ROT0, "Sega", "UFO Catcher Mini", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_ufomini )
-GAMEL( 1996, ufo21, 0, ufo21, ufo21, driver_device, 0, ROT0, "Sega", "UFO Catcher 21", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_ufo21 )
-GAMEL( 1998, ufo800, 0, ufo800, ufo800, driver_device, 0, ROT0, "Sega", "UFO Catcher 800", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_ufo800 )
+GAMEL( 1991, newufo, 0, newufo, newufo, ufo_state, 0, ROT0, "Sega", "New UFO Catcher (standard)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
+GAMEL( 1991, newufo_sonic, newufo, newufo, newufo, ufo_state, 0, ROT0, "Sega", "New UFO Catcher (Sonic The Hedgehog)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
+GAMEL( 1991, newufo_nfl, newufo, newufo, newufo, ufo_state, 0, ROT0, "Sega", "New UFO Catcher (Team NFL)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
+GAMEL( 1991, newufo_xmas, newufo, newufo, newufo, ufo_state, 0, ROT0, "Sega", "New UFO Catcher (Christmas season ROM kit)", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_newufo )
+GAMEL( 1991, ufomini, 0, ufomini, ufomini, ufo_state, 0, ROT0, "Sega", "UFO Catcher Mini", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_ufomini )
+GAMEL( 1996, ufo21, 0, ufo21, ufo21, ufo_state, 0, ROT0, "Sega", "UFO Catcher 21", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_ufo21 )
+GAMEL( 1998, ufo800, 0, ufo800, ufo800, ufo_state, 0, ROT0, "Sega", "UFO Catcher 800", MACHINE_MECHANICAL | MACHINE_SUPPORTS_SAVE, layout_ufo800 )
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index 9e07415201b..9b049b8e79a 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -275,42 +275,42 @@ ROMs:
#include "speaker.h"
-const device_type SEGA_XBD_PCB = device_creator<segaxbd_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_PCB, segaxbd_state, "segaxbd_pcb", "Sega X-Board PCB")
segaxbd_state::segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_PCB, "Sega X-Board PCB", tag, owner, clock, "segaxbd_pcb", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_PCB, tag, owner, clock)
{
}
-segaxbd_state::segaxbd_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- m_maincpu(*this, "maincpu"),
- m_subcpu(*this, "subcpu"),
- m_soundcpu(*this, "soundcpu"),
- m_soundcpu2(*this, "soundcpu2"),
- m_mcu(*this, "mcu"),
- m_watchdog(*this, "watchdog"),
- m_cmptimer_1(*this, "cmptimer_main"),
- m_sprites(*this, "sprites"),
- m_segaic16vid(*this, "segaic16vid"),
- m_segaic16road(*this, "segaic16road"),
- m_soundlatch(*this, "soundlatch"),
- m_subram0(*this, "subram0"),
- m_road_priority(1),
- m_scanline_timer(nullptr),
- m_timer_irq_state(0),
- m_vblank_irq_state(0),
- m_pc_0(0),
- m_loffire_sync(nullptr),
- m_lastsurv_mux(0),
- m_paletteram(*this, "paletteram"),
- m_gprider_hack(false),
- m_palette_entries(0),
- m_screen(*this, "screen"),
- m_palette(*this, "palette"),
- m_io0_porta(*this, "IO0PORTA"),
- m_adc_ports(*this, {"ADC0", "ADC1", "ADC2", "ADC3", "ADC4", "ADC5", "ADC6", "ADC7"}),
- m_mux_ports(*this, {"MUX0", "MUX1", "MUX2", "MUX3"})
+segaxbd_state::segaxbd_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
+ m_maincpu(*this, "maincpu"),
+ m_subcpu(*this, "subcpu"),
+ m_soundcpu(*this, "soundcpu"),
+ m_soundcpu2(*this, "soundcpu2"),
+ m_mcu(*this, "mcu"),
+ m_watchdog(*this, "watchdog"),
+ m_cmptimer_1(*this, "cmptimer_main"),
+ m_sprites(*this, "sprites"),
+ m_segaic16vid(*this, "segaic16vid"),
+ m_segaic16road(*this, "segaic16road"),
+ m_soundlatch(*this, "soundlatch"),
+ m_subram0(*this, "subram0"),
+ m_road_priority(1),
+ m_scanline_timer(nullptr),
+ m_timer_irq_state(0),
+ m_vblank_irq_state(0),
+ m_pc_0(0),
+ m_loffire_sync(nullptr),
+ m_lastsurv_mux(0),
+ m_paletteram(*this, "paletteram"),
+ m_gprider_hack(false),
+ m_palette_entries(0),
+ m_screen(*this, "screen"),
+ m_palette(*this, "palette"),
+ m_io0_porta(*this, "IO0PORTA"),
+ m_adc_ports(*this, "ADC%u", 0),
+ m_mux_ports(*this, "MUX%u", 0)
{
memset(m_adc_reverse, 0, sizeof(m_adc_reverse));
palette_init();
@@ -1753,10 +1753,10 @@ static MACHINE_CONFIG_FRAGMENT( xboard )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_REGULAR_DEVICE = device_creator<segaxbd_regular_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_REGULAR, segaxbd_regular_state, "segaxbd_pcb_reg", "Sega X-Board PCB (regular)")
segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_REGULAR_DEVICE, "Sega X-Board PCB regular", tag, owner, clock, "segakbd_pcb_regular", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_REGULAR, tag, owner, clock)
{
}
@@ -1765,8 +1765,8 @@ machine_config_constructor segaxbd_regular_state::device_mconfig_additions() con
return MACHINE_CONFIG_NAME( xboard );
}
-static MACHINE_CONFIG_START( sega_xboard, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_REGULAR_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_xboard )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_REGULAR, 0)
MACHINE_CONFIG_END
@@ -1779,10 +1779,10 @@ static MACHINE_CONFIG_FRAGMENT( xboard_fd1094 )
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_FD1094_DEVICE = device_creator<segaxbd_fd1094_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_FD1094, segaxbd_fd1094_state, "segaxbd_pcb_fd1094", "Sega X-Board PCB (FD1094)")
segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_FD1094_DEVICE, "Sega X-Board PCB FD1094", tag, owner, clock, "segakbd_pcb_fd1094", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_FD1094, tag, owner, clock)
{
}
@@ -1791,13 +1791,13 @@ machine_config_constructor segaxbd_fd1094_state::device_mconfig_additions() cons
return MACHINE_CONFIG_NAME( xboard_fd1094 );
}
-static MACHINE_CONFIG_START( sega_xboard_fd1094, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_xboard_fd1094 )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094, 0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sega_xboard_fd1094_double, segaxbd_new_state_double )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094_DEVICE, 0)
- MCFG_DEVICE_ADD("subpcb", SEGA_XBD_FD1094_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_xboard_fd1094_double )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_FD1094, 0)
+ MCFG_DEVICE_ADD("subpcb", SEGA_XBD_FD1094, 0)
//MCFG_QUANTUM_PERFECT_CPU("mainpcb:maincpu") // doesn't help..
MACHINE_CONFIG_END
@@ -1816,10 +1816,10 @@ static MACHINE_CONFIG_FRAGMENT( aburner2 )
MCFG_CXD1095_OUT_PORTB_CB(WRITE8(segaxbd_state, aburner2_motor_w))
MACHINE_CONFIG_END
-const device_type SEGA_XBD_ABURNER2_DEVICE = device_creator<segaxbd_aburner2_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_ABURNER2_DEVICE, segaxbd_aburner2_state, "segaxbd_pcb_aburner2", "Sega X-Board PCB (After Burner)")
segaxbd_aburner2_state::segaxbd_aburner2_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_ABURNER2_DEVICE, "Sega X-Board After Burner PCB", tag, owner, clock, "segakbd_pcb_aburner2", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_ABURNER2_DEVICE, tag, owner, clock)
{
}
@@ -1828,7 +1828,7 @@ machine_config_constructor segaxbd_aburner2_state::device_mconfig_additions() co
return MACHINE_CONFIG_NAME( aburner2 );
}
-static MACHINE_CONFIG_START( sega_aburner2, segaxbd_new_state )
+static MACHINE_CONFIG_START( sega_aburner2 )
MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_ABURNER2_DEVICE, 0)
MACHINE_CONFIG_END
@@ -1853,10 +1853,10 @@ static MACHINE_CONFIG_FRAGMENT( lastsurv_fd1094 )
MCFG_SOUND_ROUTE(1, "lspeaker", 0.43)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_LASTSURV_FD1094_DEVICE = device_creator<segaxbd_lastsurv_fd1094_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_LASTSURV_FD1094, segaxbd_lastsurv_fd1094_state, "segaxbd_pcb_lastsurv_fd1094", "Sega X-Board PCB (Last Survivor, FD1094)")
segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_LASTSURV_FD1094_DEVICE, "Sega X-Board Last Survivor PCB FD1094", tag, owner, clock, "segakbd_pcb_lastsurv_fd1094", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_LASTSURV_FD1094, tag, owner, clock)
{
}
@@ -1865,8 +1865,8 @@ machine_config_constructor segaxbd_lastsurv_fd1094_state::device_mconfig_additio
return MACHINE_CONFIG_NAME( lastsurv_fd1094 );
}
-static MACHINE_CONFIG_START( sega_lastsurv_fd1094, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_lastsurv_fd1094 )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_FD1094, 0)
MACHINE_CONFIG_END
static MACHINE_CONFIG_FRAGMENT( lastsurv )
@@ -1889,10 +1889,10 @@ static MACHINE_CONFIG_FRAGMENT( lastsurv )
MCFG_SOUND_ROUTE(1, "lspeaker", 0.43)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_LASTSURV_DEVICE = device_creator<segaxbd_lastsurv_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_LASTSURV, segaxbd_lastsurv_state, "segaxbd_pcb_lastsurv", "Sega X-Board PCB (Last Survivor)")
segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_LASTSURV_DEVICE, "Sega X-Board Last Survivor PCB", tag, owner, clock, "segakbd_pcb_lastsurv", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_LASTSURV, tag, owner, clock)
{
}
@@ -1901,8 +1901,8 @@ machine_config_constructor segaxbd_lastsurv_state::device_mconfig_additions() co
return MACHINE_CONFIG_NAME( lastsurv );
}
-static MACHINE_CONFIG_START( sega_lastsurv, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_lastsurv )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_LASTSURV, 0)
MACHINE_CONFIG_END
@@ -1936,10 +1936,10 @@ static MACHINE_CONFIG_FRAGMENT( smgp_fd1094 )
MCFG_SOUND_ROUTE(1, "rearright", 1.0)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_SMGP_FD1094_DEVICE = device_creator<segaxbd_smgp_fd1094_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_SMGP_FD1094, segaxbd_smgp_fd1094_state, "segaxbd_pcb_smgp_fd1094", "Sega X-Board PCB (SMGP, FD1094)")
segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_SMGP_FD1094_DEVICE, "Sega X-Board SMGP PCB FD1094", tag, owner, clock, "segakbd_pcb_smgp_fd1094", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_SMGP_FD1094, tag, owner, clock)
{
}
@@ -1948,8 +1948,8 @@ machine_config_constructor segaxbd_smgp_fd1094_state::device_mconfig_additions()
return MACHINE_CONFIG_NAME( smgp_fd1094 );
}
-static MACHINE_CONFIG_START( sega_smgp_fd1094, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP_FD1094_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_smgp_fd1094 )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP_FD1094, 0)
MACHINE_CONFIG_END
@@ -1983,10 +1983,10 @@ static MACHINE_CONFIG_FRAGMENT( smgp )
MCFG_SOUND_ROUTE(1, "rearright", 1.0)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_SMGP_DEVICE = device_creator<segaxbd_smgp_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_SMGP, segaxbd_smgp_state, "segaxbd_pcb_smgp", "Sega X-Board PCB (SMGP)")
segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_SMGP_DEVICE, "Sega X-Board SMGP PCB", tag, owner, clock, "segakbd_pcb_smgp", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_SMGP, tag, owner, clock)
{
}
@@ -1995,8 +1995,8 @@ machine_config_constructor segaxbd_smgp_state::device_mconfig_additions() const
return MACHINE_CONFIG_NAME( smgp );
}
-static MACHINE_CONFIG_START( sega_smgp, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_smgp )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_SMGP, 0)
MACHINE_CONFIG_END
@@ -2009,10 +2009,10 @@ static MACHINE_CONFIG_FRAGMENT( rascot )
MCFG_CPU_IO_MAP(rascot_z80_portmap)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_RASCOT_DEVICE = device_creator<segaxbd_rascot_state>;
+DEFINE_DEVICE_TYPE(SEGA_XBD_RASCOT, segaxbd_rascot_state, "segaxbd_pcb_rascot", "Sega X-Board PCB (Royal Ascot)")
segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : segaxbd_state(mconfig, SEGA_XBD_RASCOT_DEVICE, "Sega X-Board Royal Ascot PCB", tag, owner, clock, "segakbd_pcb_rascot", __FILE__)
+ : segaxbd_state(mconfig, SEGA_XBD_RASCOT, tag, owner, clock)
{
}
@@ -2021,8 +2021,8 @@ machine_config_constructor segaxbd_rascot_state::device_mconfig_additions() cons
return MACHINE_CONFIG_NAME( rascot );
}
-static MACHINE_CONFIG_START( sega_rascot, segaxbd_new_state )
- MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_RASCOT_DEVICE, 0)
+static MACHINE_CONFIG_START( sega_rascot )
+ MCFG_DEVICE_ADD("mainpcb", SEGA_XBD_RASCOT, 0)
MACHINE_CONFIG_END
@@ -4741,22 +4741,22 @@ DRIVER_INIT_MEMBER(segaxbd_new_state_double,gprider_double)
// GAME DRIVERS
//**************************************************************************
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
GAME( 1987, aburner2, 0, sega_aburner2, aburner2, segaxbd_new_state, aburner2, ROT0, "Sega", "After Burner II", 0 )
GAME( 1987, aburner2g,aburner2, sega_aburner2, aburner2, segaxbd_new_state, aburner2, ROT0, "Sega", "After Burner II (German)", 0 )
GAME( 1987, aburner, aburner2, sega_aburner2, aburner, segaxbd_new_state, aburner2, ROT0, "Sega", "After Burner", 0 )
-GAME( 1987, thndrbld, 0, sega_xboard_fd1094, thndrbld, driver_device, 0, ROT0, "Sega", "Thunder Blade (upright) (FD1094 317-0056)", 0 )
-GAME( 1987, thndrbld1,thndrbld, sega_xboard, thndrbd1, driver_device, 0, ROT0, "Sega", "Thunder Blade (deluxe/standing) (unprotected)", 0 )
+GAME( 1987, thndrbld, 0, sega_xboard_fd1094, thndrbld, segaxbd_new_state, 0, ROT0, "Sega", "Thunder Blade (upright) (FD1094 317-0056)", 0 )
+GAME( 1987, thndrbld1,thndrbld, sega_xboard, thndrbd1, segaxbd_new_state, 0, ROT0, "Sega", "Thunder Blade (deluxe/standing) (unprotected)", 0 )
-GAME( 1989, lastsurv, 0, sega_lastsurv_fd1094,lastsurv, driver_device, 0, ROT0, "Sega", "Last Survivor (Japan) (FD1094 317-0083)", 0 )
+GAME( 1989, lastsurv, 0, sega_lastsurv_fd1094,lastsurv, driver_device, 0, ROT0, "Sega", "Last Survivor (Japan) (FD1094 317-0083)", 0 )
GAME( 1989, loffire, 0, sega_xboard_fd1094, loffire, segaxbd_new_state, loffire, ROT0, "Sega", "Line of Fire / Bakudan Yarou (World) (FD1094 317-0136)", 0 )
GAME( 1989, loffireu, loffire, sega_xboard_fd1094, loffire, segaxbd_new_state, loffire, ROT0, "Sega", "Line of Fire / Bakudan Yarou (US) (FD1094 317-0135)", 0 )
GAME( 1989, loffirej, loffire, sega_xboard_fd1094, loffire, segaxbd_new_state, loffire, ROT0, "Sega", "Line of Fire / Bakudan Yarou (Japan) (FD1094 317-0134)", 0 )
-GAME( 1989, rachero, 0, sega_xboard_fd1094, rachero, driver_device, 0, ROT0, "Sega", "Racing Hero (FD1094 317-0144)", 0 )
+GAME( 1989, rachero, 0, sega_xboard_fd1094, rachero, segaxbd_new_state, 0, ROT0, "Sega", "Racing Hero (FD1094 317-0144)", 0 )
GAME( 1989, smgp, 0, sega_smgp_fd1094, smgp, segaxbd_new_state, smgp, ROT0, "Sega", "Super Monaco GP (World, Rev B) (FD1094 317-0126a)", 0 )
GAME( 1989, smgp6, smgp, sega_smgp_fd1094, smgp, segaxbd_new_state, smgp, ROT0, "Sega", "Super Monaco GP (World, Rev A) (FD1094 317-0126a)", 0 )
@@ -4767,13 +4767,13 @@ GAME( 1989, smgpu2, smgp, sega_smgp_fd1094, smgp, segaxbd_new_state
GAME( 1989, smgpj, smgp, sega_smgp_fd1094, smgp, segaxbd_new_state, smgp, ROT0, "Sega", "Super Monaco GP (Japan, Rev B) (FD1094 317-0124a)", 0 )
GAME( 1989, smgpja, smgp, sega_smgp_fd1094, smgp, segaxbd_new_state, smgp, ROT0, "Sega", "Super Monaco GP (Japan, Rev A) (FD1094 317-0124a)", 0 )
-GAME( 1990, abcop, 0, sega_xboard_fd1094, abcop, driver_device, 0, ROT0, "Sega", "A.B. Cop (World) (FD1094 317-0169b)", 0 )
-GAME( 1990, abcopj, abcop, sega_xboard_fd1094, abcop, driver_device, 0, ROT0, "Sega", "A.B. Cop (Japan) (FD1094 317-0169b)", 0 )
+GAME( 1990, abcop, 0, sega_xboard_fd1094, abcop, segaxbd_new_state, 0, ROT0, "Sega", "A.B. Cop (World) (FD1094 317-0169b)", 0 )
+GAME( 1990, abcopj, abcop, sega_xboard_fd1094, abcop, segaxbd_new_state, 0, ROT0, "Sega", "A.B. Cop (Japan) (FD1094 317-0169b)", 0 )
// wasn't officially available as a single PCB setup, but runs anyway albeit with messages suggesting you can compete against a rival that doesn't exist?
-GAME( 1990, gpriders, gprider, sega_xboard_fd1094, gprider, segaxbd_new_state, gprider, ROT0, "Sega", "GP Rider (World, FD1094 317-0163)", 0 )
-GAME( 1990, gpriderus,gprider, sega_xboard_fd1094, gprider, segaxbd_new_state, gprider, ROT0, "Sega", "GP Rider (US, FD1094 317-0162)", 0 )
-GAME( 1990, gpriderjs,gprider, sega_xboard_fd1094, gprider, segaxbd_new_state, gprider, ROT0, "Sega", "GP Rider (Japan, FD1094 317-0161)", 0 )
+GAME( 1990, gpriders, gprider, sega_xboard_fd1094, gprider, segaxbd_new_state, gprider, ROT0, "Sega", "GP Rider (World, FD1094 317-0163)", 0 )
+GAME( 1990, gpriderus,gprider, sega_xboard_fd1094, gprider, segaxbd_new_state, gprider, ROT0, "Sega", "GP Rider (US, FD1094 317-0162)", 0 )
+GAME( 1990, gpriderjs,gprider, sega_xboard_fd1094, gprider, segaxbd_new_state, gprider, ROT0, "Sega", "GP Rider (Japan, FD1094 317-0161)", 0 )
// multi X-Board (2 stacks directly connected, shared RAM on bridge PCB - not networked)
GAME( 1990, gprider, 0, sega_xboard_fd1094_double, gprider_double, segaxbd_new_state_double, gprider_double, ROT0, "Sega", "GP Rider (World, FD1094 317-0163) (Twin setup)", 0 )
@@ -4781,13 +4781,13 @@ GAME( 1990, gprideru,gprider, sega_xboard_fd1094_double, gprider_double, segax
GAME( 1990, gpriderj,gprider, sega_xboard_fd1094_double, gprider_double, segaxbd_new_state_double, gprider_double, ROT0, "Sega", "GP Rider (Japan, FD1094 317-0161) (Twin setup)", 0 )
// X-Board + other boards?
-GAME( 1991, rascot, 0, sega_rascot, rascot, segaxbd_new_state, rascot, ROT0, "Sega", "Royal Ascot (Japan, terminal?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1991, rascot, 0, sega_rascot, rascot, segaxbd_new_state, rascot, ROT0, "Sega", "Royal Ascot (Japan, terminal?)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// decrypted bootlegs
-GAME( 1987, thndrbldd, thndrbld,sega_xboard, thndrbld, driver_device, 0, ROT0, "bootleg", "Thunder Blade (upright) (bootleg of FD1094 317-0056 set)", 0 )
+GAME( 1987, thndrbldd, thndrbld, sega_xboard, thndrbld, segaxbd_new_state, 0, ROT0, "bootleg", "Thunder Blade (upright) (bootleg of FD1094 317-0056 set)", 0 )
-GAME( 1989, racherod, rachero, sega_xboard, rachero, driver_device, 0, ROT0, "bootleg", "Racing Hero (bootleg of FD1094 317-0144 set)", 0 )
+GAME( 1989, racherod, rachero, sega_xboard, rachero, segaxbd_new_state, 0, ROT0, "bootleg", "Racing Hero (bootleg of FD1094 317-0144 set)", 0 )
GAME( 1989, smgpd, smgp, sega_smgp, smgp, segaxbd_new_state, smgp, ROT0, "bootleg", "Super Monaco GP (World, Rev B) (bootleg of FD1094 317-0126a set)", 0 )
GAME( 1989, smgp6d, smgp, sega_smgp, smgp, segaxbd_new_state, smgp, ROT0, "bootleg", "Super Monaco GP (World, Rev A) (bootleg of FD1094 317-0126a set)", 0 )
@@ -4797,10 +4797,10 @@ GAME( 1989, smgpu1d, smgp, sega_smgp, smgp, segaxbd_new_state, smgp
GAME( 1989, smgpu2d, smgp, sega_smgp, smgp, segaxbd_new_state, smgp, ROT0, "bootleg", "Super Monaco GP (US, Rev A) (bootleg of FD1094 317-0125a set)", 0 )
GAME( 1989, smgpjd, smgp, sega_smgp, smgp, segaxbd_new_state, smgp, ROT0, "bootleg", "Super Monaco GP (Japan, Rev B) (bootleg of FD1094 317-0124a set)", 0 )
-GAME( 1989, lastsurvd,lastsurv, sega_lastsurv,lastsurv, driver_device, 0, ROT0, "bootleg", "Last Survivor (Japan) (bootleg of FD1094 317-0083 set)", 0 )
+GAME( 1989, lastsurvd, lastsurv, sega_lastsurv,lastsurv, segaxbd_new_state, 0, ROT0, "bootleg", "Last Survivor (Japan) (bootleg of FD1094 317-0083 set)", 0 )
-GAME( 1990, abcopd, abcop, sega_xboard, abcop, driver_device, 0, ROT0, "bootleg", "A.B. Cop (World) (bootleg of FD1094 317-0169b set)", 0 )
-GAME( 1990, abcopjd, abcop, sega_xboard, abcop, driver_device, 0, ROT0, "bootleg", "A.B. Cop (Japan) (bootleg of FD1094 317-0169b set)", 0 )
+GAME( 1990, abcopd, abcop, sega_xboard, abcop, segaxbd_new_state, 0, ROT0, "bootleg", "A.B. Cop (World) (bootleg of FD1094 317-0169b set)", 0 )
+GAME( 1990, abcopjd, abcop, sega_xboard, abcop, segaxbd_new_state, 0, ROT0, "bootleg", "A.B. Cop (Japan) (bootleg of FD1094 317-0169b set)", 0 )
GAME( 1989, loffired, loffire, sega_xboard, loffire, segaxbd_new_state, loffire, ROT0, "bootleg", "Line of Fire / Bakudan Yarou (World) (bootleg of FD1094 317-0136 set)", 0 )
GAME( 1989, loffireud, loffire, sega_xboard, loffire, segaxbd_new_state, loffire, ROT0, "bootleg", "Line of Fire / Bakudan Yarou (US) (bootleg of FD1094 317-0135 set)", 0 )
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index bc96ea0ae07..9d7c1185d58 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -1303,7 +1303,7 @@ INPUT_PORTS_END
// GENERIC MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( yboard, segaybd_state )
+static MACHINE_CONFIG_START( yboard )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, MASTER_CLOCK/4)
@@ -1376,7 +1376,7 @@ static MACHINE_CONFIG_START( yboard, segaybd_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.43)
MCFG_SEGAPCM_ADD("pcm", SOUND_CLOCK/8)
- MCFG_SEGAPCM_BANK(BANK_12M | BANK_MASKF8)
+ MCFG_SEGAPCM_BANK_MASK(BANK_12M, BANK_MASKF8)
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2724,25 +2724,25 @@ DRIVER_INIT_MEMBER(segaybd_state,rchase)
// GAME DRIVERS
//**************************************************************************
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS, LAYOUT
-GAME( 1988, gforce2, 0, yboard, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gforce2sd, gforce2, yboard_deluxe, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2 (Super Deluxe unit)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gforce2ja, gforce2, yboard, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2 (Japan, Rev A)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gforce2j, gforce2, yboard, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY,FULLNAME,FLAGS, LAYOUT
+GAME( 1988, gforce2, 0, yboard, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gforce2sd, gforce2, yboard_deluxe, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2 (Super Deluxe unit)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gforce2ja, gforce2, yboard, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2 (Japan, Rev A)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gforce2j, gforce2, yboard, gforce2, segaybd_state, gforce2, ROT0, "Sega", "Galaxy Force 2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, gloc, 0, yboard, gloc, segaybd_state, gloc, ROT0, "Sega", "G-LOC Air Battle (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, glocu, gloc, yboard, gloc, segaybd_state, gloc, ROT0, "Sega", "G-LOC Air Battle (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, glocr360, gloc, yboard, glocr360, segaybd_state, r360, ROT0, "Sega", "G-LOC R360", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gloc, 0, yboard, gloc, segaybd_state, gloc, ROT0, "Sega", "G-LOC Air Battle (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, glocu, gloc, yboard, gloc, segaybd_state, gloc, ROT0, "Sega", "G-LOC Air Battle (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, glocr360, gloc, yboard, glocr360, segaybd_state, r360, ROT0, "Sega", "G-LOC R360", MACHINE_SUPPORTS_SAVE )
-GAMEL(1988, pdrift, 0, yboard, pdrift, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (World, Rev A)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
-GAMEL(1988, pdrifta, pdrift, yboard, pdrift, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (World)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
-GAMEL(1988, pdrifte, pdrift, yboard, pdrifte, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (World, Earlier)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
-GAMEL(1988, pdriftj, pdrift, yboard, pdriftj, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (Japan)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
+GAMEL(1988, pdrift, 0, yboard, pdrift, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (World, Rev A)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
+GAMEL(1988, pdrifta, pdrift, yboard, pdrift, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (World)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
+GAMEL(1988, pdrifte, pdrift, yboard, pdrifte, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (World, Earlier)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
+GAMEL(1988, pdriftj, pdrift, yboard, pdriftj, segaybd_state, pdrift, ROT0, "Sega", "Power Drift (Japan)", MACHINE_SUPPORTS_SAVE, layout_pdrift )
-GAMEL(1988, pdriftl, 0, yboard_link, pdriftl, segaybd_state, pdrift, ROT0, "Sega", "Power Drift - Link Version (Japan, Rev A)", MACHINE_SUPPORTS_SAVE, layout_pdrift)
+GAMEL(1988, pdriftl, 0, yboard_link, pdriftl, segaybd_state, pdrift, ROT0, "Sega", "Power Drift - Link Version (Japan, Rev A)", MACHINE_SUPPORTS_SAVE, layout_pdrift)
-GAME( 1991, rchase, 0, yboard, rchase, segaybd_state, rchase, ROT0, "Sega", "Rail Chase (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, rchasej, rchase, yboard, rchase, segaybd_state, rchase, ROT0, "Sega", "Rail Chase (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rchase, 0, yboard, rchase, segaybd_state, rchase, ROT0, "Sega", "Rail Chase (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, rchasej, rchase, yboard, rchase, segaybd_state, rchase, ROT0, "Sega", "Rail Chase (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, strkfgtr, 0, yboard, strkfgtr, segaybd_state, gloc, ROT0, "Sega", "Strike Fighter (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, strkfgtrj, strkfgtr, yboard, strkfgtr, segaybd_state, gloc, ROT0, "Sega", "Strike Fighter (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, strkfgtr, 0, yboard, strkfgtr, segaybd_state, gloc, ROT0, "Sega", "Strike Fighter (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, strkfgtrj, strkfgtr, yboard, strkfgtr, segaybd_state, gloc, ROT0, "Sega", "Strike Fighter (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index 0bbf87f9b87..7e99891c3a9 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -1863,7 +1863,7 @@ MACHINE_RESET_MEMBER(seibuspi_state,spi)
m_z80_prg_transfer_pos = 0;
}
-static MACHINE_CONFIG_START( spi, seibuspi_state )
+static MACHINE_CONFIG_START( spi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I386, XTAL_50MHz/2) // AMD or Intel 386DX, 25MHz
@@ -1992,7 +1992,7 @@ MACHINE_CONFIG_END
/* SYS386I */
-static MACHINE_CONFIG_START( sys386i, seibuspi_state )
+static MACHINE_CONFIG_START( sys386i )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I386, XTAL_40MHz) // AMD 386DX, 40MHz
@@ -2020,10 +2020,10 @@ static MACHINE_CONFIG_START( sys386i, seibuspi_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_28_63636MHz/20, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_28_63636MHz/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki2", XTAL_28_63636MHz/20, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL_28_63636MHz/20, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -2049,7 +2049,7 @@ DRIVER_INIT_MEMBER(seibuspi_state,sys386f)
}
}
-static MACHINE_CONFIG_START( sys386f, seibuspi_state )
+static MACHINE_CONFIG_START( sys386f )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I386, XTAL_50MHz/2) // Intel i386DX, 25MHz
diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp
index c82b6667fba..37ee07676fe 100644
--- a/src/mame/drivers/seicross.cpp
+++ b/src/mame/drivers/seicross.cpp
@@ -390,7 +390,7 @@ INTERRUPT_GEN_MEMBER(seicross_state::vblank_irq)
}
-static MACHINE_CONFIG_START( no_nvram, seicross_state )
+static MACHINE_CONFIG_START( no_nvram )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz / 6) /* D780C, 3.072 MHz? */
@@ -633,10 +633,10 @@ DRIVER_INIT_MEMBER(seicross_state,friskytb)
}
-GAME( 1981, friskyt, 0, nvram, friskyt, driver_device, 0, ROT0, "Nichibutsu", "Frisky Tom (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, friskyta, friskyt, nvram, friskyt, driver_device, 0, ROT0, "Nichibutsu", "Frisky Tom (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, friskytb, friskyt, friskytb, friskyt, seicross_state, friskytb, ROT0, "Nichibutsu", "Frisky Tom (set 3, encrypted)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // protection mcu runs encrypted opcodes
-GAME( 1982, radrad, 0, no_nvram, radrad, driver_device, 0, ROT0, "Nichibutsu USA", "Radical Radial (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, radradj, radrad, no_nvram, radrad, driver_device, 0, ROT0, "Logitec Corp.", "Radical Radial (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, seicross, 0, no_nvram, seicross, driver_device, 0, ROT90, "Nichibutsu / Alice", "Seicross", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sectrzon, seicross, no_nvram, seicross, driver_device, 0, ROT90, "Nichibutsu / Alice", "Sector Zone", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, friskyt, 0, nvram, friskyt, seicross_state, 0, ROT0, "Nichibutsu", "Frisky Tom (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, friskyta, friskyt, nvram, friskyt, seicross_state, 0, ROT0, "Nichibutsu", "Frisky Tom (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, friskytb, friskyt, friskytb, friskyt, seicross_state, friskytb, ROT0, "Nichibutsu", "Frisky Tom (set 3, encrypted)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // protection mcu runs encrypted opcodes
+GAME( 1982, radrad, 0, no_nvram, radrad, seicross_state, 0, ROT0, "Nichibutsu USA", "Radical Radial (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, radradj, radrad, no_nvram, radrad, seicross_state, 0, ROT0, "Logitec Corp.", "Radical Radial (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, seicross, 0, no_nvram, seicross, seicross_state, 0, ROT90, "Nichibutsu / Alice", "Seicross", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sectrzon, seicross, no_nvram, seicross, seicross_state, 0, ROT90, "Nichibutsu / Alice", "Sector Zone", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index f68cfbb815e..1545d08d758 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -539,7 +539,7 @@ static GFXDECODE_START( seicupbl_csb )
GFXDECODE_END
-static MACHINE_CONFIG_START( cupsocbl, seicupbl_state )
+static MACHINE_CONFIG_START( cupsocbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,12000000)
@@ -579,7 +579,7 @@ static MACHINE_CONFIG_START( cupsocbl, seicupbl_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -808,6 +808,6 @@ ROM_START( cupsocsb3 )
ROM_END
-GAME( 1992, cupsocsb, cupsoc, cupsocbl, cupsoc, driver_device, 0, ROT0, "bootleg", "Seibu Cup Soccer :Selection: (bootleg, set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, cupsocsb2,cupsoc, cupsocbl, cupsoc, driver_device, 0, ROT0, "bootleg", "Seibu Cup Soccer :Selection: (bootleg, set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
-GAME( 1992, cupsocsb3,cupsoc, cupsocbl, cupsoc, driver_device, 0, ROT0, "bootleg", "Seibu Cup Soccer :Selection: (bootleg, set 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsocsb, cupsoc, cupsocbl, cupsoc, seicupbl_state, 0, ROT0, "bootleg", "Seibu Cup Soccer :Selection: (bootleg, set 1)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsocsb2,cupsoc, cupsocbl, cupsoc, seicupbl_state, 0, ROT0, "bootleg", "Seibu Cup Soccer :Selection: (bootleg, set 2)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
+GAME( 1992, cupsocsb3,cupsoc, cupsocbl, cupsoc, seicupbl_state, 0, ROT0, "bootleg", "Seibu Cup Soccer :Selection: (bootleg, set 3)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp
index f4813520766..ffff71824d8 100644
--- a/src/mame/drivers/selz80.cpp
+++ b/src/mame/drivers/selz80.cpp
@@ -152,7 +152,7 @@ READ8_MEMBER( selz80_state::kbd_r )
return data;
}
-static MACHINE_CONFIG_START( selz80, selz80_state )
+static MACHINE_CONFIG_START( selz80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(selz80_mem)
@@ -196,6 +196,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS, INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, selz80, 0, 0, selz80, selz80, driver_device, 0, "SEL", "SEL Z80 Trainer", MACHINE_NO_SOUND_HW)
-COMP( 1988, dagz80, selz80, 0, dagz80, selz80, driver_device, 0, "DAG", "DAG Z80 Trainer", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1985, selz80, 0, 0, selz80, selz80, selz80_state, 0, "SEL", "SEL Z80 Trainer", MACHINE_NO_SOUND_HW)
+COMP( 1988, dagz80, selz80, 0, dagz80, selz80, selz80_state, 0, "DAG", "DAG Z80 Trainer", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index 8f5b522356f..285896d90fe 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -566,7 +566,7 @@ WRITE16_MEMBER( sengokmj_state::layer_scroll_w )
}
-static MACHINE_CONFIG_START( sengokmj, sengokmj_state )
+static MACHINE_CONFIG_START( sengokmj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, 16000000/2) /* V30-8 */
@@ -603,7 +603,7 @@ static MACHINE_CONFIG_START( sengokmj, sengokmj_state )
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1320000, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", 1320000, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -650,5 +650,5 @@ ROM_START( sengokmj )
ROM_LOAD( "rs006.89", 0x000, 0x200, CRC(96f7646e) SHA1(400a831b83d6ac4d2a46ef95b97b1ee237099e44) ) /* Priority */
ROM_END
-GAME( 1991, sengokmj, 0, sengokmj, sengokmj, driver_device, 0, ROT0, "Sigma", "Sengoku Mahjong [BET] (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, sengokmj, 0, sengokmj, sengokmj, sengokmj_state, 0, ROT0, "Sigma", "Sengoku Mahjong [BET] (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
/*Non-Bet Version?*/
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp
index 5390c5c9676..360745fbf7f 100644
--- a/src/mame/drivers/senjyo.cpp
+++ b/src/mame/drivers/senjyo.cpp
@@ -550,7 +550,7 @@ static GFXDECODE_START( senjyo )
GFXDECODE_END
-static MACHINE_CONFIG_START( senjyo, senjyo_state )
+static MACHINE_CONFIG_START( senjyo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz? */
@@ -940,10 +940,10 @@ DRIVER_INIT_MEMBER(senjyo_state,senjyo)
}
-GAME( 1983, senjyo, 0, senjyo, senjyo, senjyo_state, senjyo, ROT90, "Tehkan", "Senjyo", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, starforc, 0, senjyo, starforc, senjyo_state, starforc, ROT90, "Tehkan", "Star Force", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, starforce,starforc, senjyox_e, starforc, senjyo_state, starfore, ROT90, "Tehkan", "Star Force (encrypted, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, starforcb,starforc, starforb, starforc, senjyo_state, starfore, ROT90, "bootleg", "Star Force (encrypted, bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, starforca,starforc, senjyox_a, starforc, senjyo_state, starfora, ROT90, "Tehkan", "Star Force (encrypted, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, megaforc, starforc, senjyo, starforc, senjyo_state, starforc, ROT90, "Tehkan (Video Ware license)", "Mega Force", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, baluba, 0, senjyo, baluba, senjyo_state, starforc, ROT90, "Able Corp, Ltd.", "Baluba-louk no Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, senjyo, 0, senjyo, senjyo, senjyo_state, senjyo, ROT90, "Tehkan", "Senjyo", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, starforc, 0, senjyo, starforc, senjyo_state, starforc, ROT90, "Tehkan", "Star Force", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, starforce, starforc, senjyox_e, starforc, senjyo_state, starfore, ROT90, "Tehkan", "Star Force (encrypted, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, starforcb, starforc, starforb, starforc, senjyo_state, starfore, ROT90, "bootleg", "Star Force (encrypted, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, starforca, starforc, senjyox_a, starforc, senjyo_state, starfora, ROT90, "Tehkan", "Star Force (encrypted, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, megaforc, starforc, senjyo, starforc, senjyo_state, starforc, ROT90, "Tehkan (Video Ware license)", "Mega Force", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, baluba, 0, senjyo, baluba, senjyo_state, starforc, ROT90, "Able Corp, Ltd.", "Baluba-louk no Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index 052fbab974e..dff9c7777b7 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -7706,7 +7706,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::tndrcade_sub_interrupt)
m_subcpu->set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( tndrcade, seta_state )
+static MACHINE_CONFIG_START( tndrcade )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -7760,7 +7760,7 @@ MACHINE_CONFIG_END
/* twineagl lev 3 = lev 2 + lev 1 ! */
-static MACHINE_CONFIG_START( twineagl, seta_state )
+static MACHINE_CONFIG_START( twineagl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -7806,7 +7806,7 @@ MACHINE_CONFIG_END
/* downtown lev 3 = lev 2 + lev 1 ! */
-static MACHINE_CONFIG_START( downtown, seta_state )
+static MACHINE_CONFIG_START( downtown )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -7868,7 +7868,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::calibr50_interrupt)
}
-static MACHINE_CONFIG_START( usclssic, seta_state )
+static MACHINE_CONFIG_START( usclssic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -7923,7 +7923,7 @@ MACHINE_CONFIG_END
Test mode shows a 16ms and 4ms counters. I wonder if every game has
5 ints per frame */
-static MACHINE_CONFIG_START( calibr50, seta_state )
+static MACHINE_CONFIG_START( calibr50 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -7974,7 +7974,7 @@ MACHINE_CONFIG_END
/* metafox lev 3 = lev 2 + lev 1 ! */
-static MACHINE_CONFIG_START( metafox, seta_state )
+static MACHINE_CONFIG_START( metafox )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -8018,7 +8018,7 @@ MACHINE_CONFIG_END
Athena no Hatena?
***************************************************************************/
-static MACHINE_CONFIG_START( atehate, seta_state )
+static MACHINE_CONFIG_START( atehate )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8061,7 +8061,7 @@ MACHINE_CONFIG_END
samples are bankswitched
*/
-static MACHINE_CONFIG_START( blandia, seta_state )
+static MACHINE_CONFIG_START( blandia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8098,7 +8098,7 @@ static MACHINE_CONFIG_START( blandia, seta_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( blandiap, seta_state )
+static MACHINE_CONFIG_START( blandiap )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8140,7 +8140,7 @@ MACHINE_CONFIG_END
Block Carnival
***************************************************************************/
-static MACHINE_CONFIG_START( blockcar, seta_state )
+static MACHINE_CONFIG_START( blockcar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -8201,7 +8201,7 @@ static MACHINE_CONFIG_DERIVED( blockcarb, blockcar )
/* the sound hardware / program is ripped from Tetris (S16B) */
MCFG_DEVICE_REMOVE("x1snd")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -8211,7 +8211,7 @@ MACHINE_CONFIG_END
Daioh
***************************************************************************/
-static MACHINE_CONFIG_START( daioh, seta_state )
+static MACHINE_CONFIG_START( daioh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz, MC68000-16, Verified from PCB */
@@ -8248,7 +8248,7 @@ MACHINE_CONFIG_END
Daioh (prototype)
***************************************************************************/
-static MACHINE_CONFIG_START( daiohp, seta_state )
+static MACHINE_CONFIG_START( daiohp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16 MHz, MC68000-16, Verified from PCB */
@@ -8290,7 +8290,7 @@ MACHINE_CONFIG_END
lev 2 drives the game
*/
-static MACHINE_CONFIG_START( drgnunit, seta_state )
+static MACHINE_CONFIG_START( drgnunit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -8326,7 +8326,7 @@ MACHINE_CONFIG_END
/* Same as qzkklogy, but with a 16MHz CPU and different
layout for the layer's tiles */
-static MACHINE_CONFIG_START( qzkklgy2, seta_state )
+static MACHINE_CONFIG_START( qzkklgy2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8376,7 +8376,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::setaroul_interrupt)
}
-static MACHINE_CONFIG_START( setaroul, seta_state )
+static MACHINE_CONFIG_START( setaroul )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -8419,7 +8419,7 @@ MACHINE_CONFIG_END
Eight Force
***************************************************************************/
-static MACHINE_CONFIG_START( eightfrc, seta_state )
+static MACHINE_CONFIG_START( eightfrc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8462,7 +8462,7 @@ MACHINE_CONFIG_END
lev 1 == lev 3 (writes to $500000, bit 4 -> 1 then 0)
lev 2 drives the game
*/
-static MACHINE_CONFIG_START( extdwnhl, seta_state )
+static MACHINE_CONFIG_START( extdwnhl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8520,7 +8520,7 @@ MACHINE_START_MEMBER(seta_state,wrofaero){ uPD71054_timer_init(); }
lev 2: VBlank
lev 4: Sound (generated by a timer mapped at $d00000-6 ?)
*/
-static MACHINE_CONFIG_START( gundhara, seta_state )
+static MACHINE_CONFIG_START( gundhara )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8586,7 +8586,7 @@ MACHINE_CONFIG_END
lev 1 == lev 3 (writes to $500000, bit 4 -> 1 then 0)
lev 2 drives the game
*/
-static MACHINE_CONFIG_START( jjsquawk, seta_state )
+static MACHINE_CONFIG_START( jjsquawk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8622,7 +8622,7 @@ static MACHINE_CONFIG_START( jjsquawk, seta_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jjsquawb, seta_state )
+static MACHINE_CONFIG_START( jjsquawb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8662,7 +8662,7 @@ MACHINE_CONFIG_END
***************************************************************************/
/* kamenrid: lev 2 by vblank, lev 4 by timer */
-static MACHINE_CONFIG_START( kamenrid, seta_state )
+static MACHINE_CONFIG_START( kamenrid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8705,7 +8705,7 @@ MACHINE_CONFIG_END
/* The CPU clock has been verified/measured, PCB only has one OSC and it's 14.318180 MHz */
-static MACHINE_CONFIG_START( orbs, seta_state )
+static MACHINE_CONFIG_START( orbs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
@@ -8745,7 +8745,7 @@ MACHINE_CONFIG_END
Kero Kero Keroppi no Issyoni Asobou
***************************************************************************/
-static MACHINE_CONFIG_START( keroppij, seta_state )
+static MACHINE_CONFIG_START( keroppij )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14318180/2) /* 7.143 MHz */
@@ -8788,7 +8788,7 @@ MACHINE_CONFIG_END
Krazy Bowl
***************************************************************************/
-static MACHINE_CONFIG_START( krzybowl, seta_state )
+static MACHINE_CONFIG_START( krzybowl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8826,7 +8826,7 @@ MACHINE_CONFIG_END
***************************************************************************/
/* madshark: lev 2 by vblank, lev 4 by timer */
-static MACHINE_CONFIG_START( madshark, seta_state )
+static MACHINE_CONFIG_START( madshark )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8872,7 +8872,7 @@ MACHINE_CONFIG_END
***************************************************************************/
/* magspeed: lev 2 by vblank, lev 4 by timer */
-static MACHINE_CONFIG_START( magspeed, seta_state )
+static MACHINE_CONFIG_START( magspeed )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8917,7 +8917,7 @@ MACHINE_CONFIG_END
/* msgundam lev 2 == lev 6 ! */
-static MACHINE_CONFIG_START( msgundam, seta_state )
+static MACHINE_CONFIG_START( msgundam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -8964,7 +8964,7 @@ MACHINE_CONFIG_END
Oishii Puzzle
***************************************************************************/
-static MACHINE_CONFIG_START( oisipuzl, seta_state )
+static MACHINE_CONFIG_START( oisipuzl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9003,7 +9003,7 @@ MACHINE_CONFIG_END
/* same as oisipuzl but with different interrupts and sound */
-static MACHINE_CONFIG_START( triplfun, seta_state )
+static MACHINE_CONFIG_START( triplfun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9031,7 +9031,7 @@ static MACHINE_CONFIG_START( triplfun, seta_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 792000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 792000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -9040,7 +9040,7 @@ MACHINE_CONFIG_END
Pro Mahjong Kiwame
***************************************************************************/
-static MACHINE_CONFIG_START( kiwame, seta_state )
+static MACHINE_CONFIG_START( kiwame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9084,7 +9084,7 @@ MACHINE_CONFIG_END
/* pretty much like wrofaero, but ints are 1&2, not 2&4 */
-static MACHINE_CONFIG_START( rezon, seta_state )
+static MACHINE_CONFIG_START( rezon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9125,7 +9125,7 @@ MACHINE_CONFIG_END
/* thunderl lev 2 = lev 3 - other levels lead to an error */
-static MACHINE_CONFIG_START( thunderl, seta_state )
+static MACHINE_CONFIG_START( thunderl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -9193,7 +9193,7 @@ static MACHINE_CONFIG_DERIVED( thunderlbl, thunderl )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wiggie, seta_state )
+static MACHINE_CONFIG_START( wiggie )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -9224,7 +9224,7 @@ static MACHINE_CONFIG_START( wiggie, seta_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9233,7 +9233,7 @@ static MACHINE_CONFIG_DERIVED( superbar, wiggie )
MCFG_GFXDECODE_MODIFY("gfxdecode", superbar)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wits, seta_state )
+static MACHINE_CONFIG_START( wits )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -9270,7 +9270,7 @@ MACHINE_CONFIG_END
Ultraman Club / SD Gundam Neo Battling
***************************************************************************/
-static MACHINE_CONFIG_START( umanclub, seta_state )
+static MACHINE_CONFIG_START( umanclub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9307,7 +9307,7 @@ MACHINE_CONFIG_END
Ultra Toukond Densetsu
***************************************************************************/
-static MACHINE_CONFIG_START( utoukond, seta_state )
+static MACHINE_CONFIG_START( utoukond )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9356,7 +9356,7 @@ MACHINE_CONFIG_END
War of Aero
***************************************************************************/
-static MACHINE_CONFIG_START( wrofaero, seta_state )
+static MACHINE_CONFIG_START( wrofaero )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9410,7 +9410,7 @@ MACHINE_CONFIG_END
at int 1 is necessary: it plays the background music.
*/
-static MACHINE_CONFIG_START( zingzip, seta_state )
+static MACHINE_CONFIG_START( zingzip )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9459,7 +9459,7 @@ static MACHINE_CONFIG_DERIVED( zingzipbl, zingzip )
MCFG_DEVICE_REMOVE("x1snd")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9467,7 +9467,7 @@ MACHINE_CONFIG_END
Pairs Love
***************************************************************************/
-static MACHINE_CONFIG_START( pairlove, seta_state )
+static MACHINE_CONFIG_START( pairlove )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000/2) /* 8 MHz */
@@ -9515,7 +9515,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::crazyfgt_interrupt)
m_maincpu->set_input_line(1, HOLD_LINE);
}
-static MACHINE_CONFIG_START( crazyfgt, seta_state )
+static MACHINE_CONFIG_START( crazyfgt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -9549,7 +9549,7 @@ static MACHINE_CONFIG_START( crazyfgt, seta_state )
MCFG_SOUND_ADD("ymsnd", YM3812, 16000000/4) /* 4 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock?
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -9577,7 +9577,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(seta_state::inttoote_interrupt)
}
-static MACHINE_CONFIG_START( inttoote, seta_state )
+static MACHINE_CONFIG_START( inttoote )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000)
@@ -11675,8 +11675,8 @@ DRIVER_INIT_MEMBER(seta_state,inttootea)
***************************************************************************/
/* 68000 + 65C02 */
-GAME( 1987, tndrcade, 0, tndrcade, tndrcade, driver_device, 0, ROT270, "Seta (Taito license)", "Thundercade / Twin Formation" , 0) // Title/License: DSW
-GAME( 1987, tndrcadej,tndrcade, tndrcade, tndrcadj, driver_device, 0, ROT270, "Seta (Taito license)", "Tokusyu Butai U.A.G. (Japan)" , 0) // License: DSW
+GAME( 1987, tndrcade, 0, tndrcade, tndrcade, seta_state, 0, ROT270, "Seta (Taito license)", "Thundercade / Twin Formation" , 0) // Title/License: DSW
+GAME( 1987, tndrcadej,tndrcade, tndrcade, tndrcadj, seta_state, 0, ROT270, "Seta (Taito license)", "Tokusyu Butai U.A.G. (Japan)" , 0) // License: DSW
GAME( 1988, twineagl, 0, twineagl, twineagl, seta_state, twineagl, ROT270, "Seta (Taito license)", "Twin Eagle - Revenge Joe's Brother" , 0) // Country/License: DSW
@@ -11685,102 +11685,102 @@ GAME( 1989, downtown2,downtown, downtown, downtown, seta_state, downtown, ROT270
GAME( 1989, downtownj,downtown, downtown, downtown, seta_state, downtown, ROT270, "Seta", "DownTown / Mokugeki (joystick hack)" , 0) // Country/License: DSW
GAME( 1989, downtownp,downtown, downtown, downtown, seta_state, downtown, ROT270, "Seta", "DownTown / Mokugeki (prototype)" , 0) // Country/License: DSW
-GAME( 1989, usclssic, 0, usclssic, usclssic, driver_device, 0, ROT270, "Seta", "U.S. Classic" , 0) // Country/License: DSW
+GAME( 1989, usclssic, 0, usclssic, usclssic, seta_state, 0, ROT270, "Seta", "U.S. Classic" , 0) // Country/License: DSW
-GAME( 1989, calibr50, 0, calibr50, calibr50, driver_device, 0, ROT270, "Athena / Seta", "Caliber 50" , 0) // Country/License: DSW
+GAME( 1989, calibr50, 0, calibr50, calibr50, seta_state, 0, ROT270, "Athena / Seta", "Caliber 50" , 0) // Country/License: DSW
GAME( 1989, arbalest, 0, metafox, arbalest, seta_state, arbalest, ROT270, "Seta", "Arbalester" , 0) // Country/License: DSW
-GAME( 1989, metafox, 0, metafox, metafox, seta_state, metafox, ROT270, "Seta", "Meta Fox" , 0) // Country/License: DSW
+GAME( 1989, metafox, 0, metafox, metafox, seta_state, metafox, ROT270, "Seta", "Meta Fox" , 0) // Country/License: DSW
/* 68000 */
-GAME( 198?, setaroul, 0, setaroul, setaroul, driver_device, 0, ROT270, "Visco", "Visco Roulette", MACHINE_NOT_WORKING ) // I can't see a title in the GFX roms. Press F2 twice to boot..
+GAME( 198?, setaroul, 0, setaroul, setaroul, seta_state, 0, ROT270, "Visco", "Visco Roulette", MACHINE_NOT_WORKING ) // I can't see a title in the GFX roms. Press F2 twice to boot..
-GAME( 1989, drgnunit, 0, drgnunit, drgnunit, driver_device, 0, ROT0, "Seta", "Dragon Unit / Castle of Dragon", 0 )
+GAME( 1989, drgnunit, 0, drgnunit, drgnunit, seta_state, 0, ROT0, "Seta", "Dragon Unit / Castle of Dragon", 0 )
-GAME( 1989, wits, 0, wits, wits, driver_device, 0, ROT0, "Athena (Visco license)", "Wit's (Japan)" , 0) // Country/License: DSW
+GAME( 1989, wits, 0, wits, wits, seta_state, 0, ROT0, "Athena (Visco license)", "Wit's (Japan)" , 0) // Country/License: DSW
-GAME( 1990, thunderl, 0, thunderl, thunderl, driver_device,0, ROT270, "Seta", "Thunder & Lightning" , 0) // Country/License: DSW
-GAME( 1990, thunderlbl,thunderl,thunderlbl,thunderlbl,driver_device,0, ROT90, "bootleg", "Thunder & Lightning (bootleg with Tetris sound)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL ) // Country/License: DSW
+GAME( 1990, thunderl, 0, thunderl, thunderl, seta_state,0, ROT270, "Seta", "Thunder & Lightning" , 0) // Country/License: DSW
+GAME( 1990, thunderlbl,thunderl,thunderlbl,thunderlbl,seta_state,0, ROT90, "bootleg", "Thunder & Lightning (bootleg with Tetris sound)", MACHINE_IMPERFECT_SOUND | MACHINE_NO_COCKTAIL ) // Country/License: DSW
-GAME( 1994, wiggie, 0, wiggie, thunderl, seta_state, wiggie, ROT270, "Promat", "Wiggie Waggie", MACHINE_IMPERFECT_GRAPHICS ) // hack of Thunder & Lightning
-GAME( 1994, superbar, wiggie, superbar, thunderl, seta_state, wiggie, ROT270, "Promat", "Super Bar", MACHINE_IMPERFECT_GRAPHICS ) // hack of Thunder & Lightning
+GAME( 1994, wiggie, 0, wiggie, thunderl, seta_state, wiggie, ROT270, "Promat", "Wiggie Waggie", MACHINE_IMPERFECT_GRAPHICS ) // hack of Thunder & Lightning
+GAME( 1994, superbar, wiggie, superbar, thunderl, seta_state, wiggie, ROT270, "Promat", "Super Bar", MACHINE_IMPERFECT_GRAPHICS ) // hack of Thunder & Lightning
-GAME( 1990, jockeyc, 0, jockeyc, jockeyc, driver_device, 0, ROT0, "Seta (Visco license)", "Jockey Club", 0 )
-GAME( 1998, inttoote, jockeyc, inttoote, inttoote, seta_state, inttoote, ROT0, "Coinmaster", "International Toote (Germany)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1993, inttootea,jockeyc, inttoote, inttoote, seta_state, inttootea,ROT0, "Coinmaster", "International Toote II (World?)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1990, jockeyc, 0, jockeyc, jockeyc, seta_state, 0, ROT0, "Seta (Visco license)", "Jockey Club", 0 )
+GAME( 1998, inttoote, jockeyc, inttoote, inttoote, seta_state, inttoote, ROT0, "Coinmaster", "International Toote (Germany)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1993, inttootea,jockeyc, inttoote, inttoote, seta_state, inttootea,ROT0, "Coinmaster", "International Toote II (World?)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1991, rezon, 0, rezon, rezon, seta_state, rezon, ROT0, "Allumer", "Rezon", 0 )
-GAME( 1992, rezont, rezon, rezon, rezont, seta_state, rezon, ROT0, "Allumer (Taito license)","Rezon (Taito)", 0 )
+GAME( 1991, rezon, 0, rezon, rezon, seta_state, rezon, ROT0, "Allumer", "Rezon", 0 )
+GAME( 1992, rezont, rezon, rezon, rezont, seta_state, rezon, ROT0, "Allumer (Taito license)","Rezon (Taito)", 0 )
-GAME( 1991, stg, 0, drgnunit, stg, driver_device, 0, ROT270, "Athena / Tecmo", "Strike Gunner S.T.G", 0 )
+GAME( 1991, stg, 0, drgnunit, stg, seta_state, 0, ROT270, "Athena / Tecmo", "Strike Gunner S.T.G", 0 )
-GAME( 1991, pairlove, 0, pairlove, pairlove, driver_device, 0, ROT270, "Athena", "Pairs Love", 0 )
+GAME( 1991, pairlove, 0, pairlove, pairlove, seta_state, 0, ROT270, "Athena", "Pairs Love", 0 )
-GAME( 1992, blandia, 0, blandia, blandia, seta_state, blandia, ROT0, "Allumer", "Blandia", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, blandiap, blandia, blandiap, blandia, driver_device, 0, ROT0, "Allumer", "Blandia (prototype)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, blandia, 0, blandia, blandia, seta_state, blandia, ROT0, "Allumer", "Blandia", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, blandiap, blandia, blandiap, blandia, seta_state, 0, ROT0, "Allumer", "Blandia (prototype)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, blockcar, 0, blockcar, blockcar, driver_device, 0, ROT90, "Visco", "Block Carnival / Thunder & Lightning 2" , 0) // Title: DSW
-GAME( 1992, blockcarb,blockcar, blockcarb,blockcar, driver_device, 0, ROT90, "bootleg", "Block Carnival / Thunder & Lightning 2 (bootleg)", MACHINE_IMPERFECT_SOUND)
+GAME( 1992, blockcar, 0, blockcar, blockcar, seta_state, 0, ROT90, "Visco", "Block Carnival / Thunder & Lightning 2" , 0) // Title: DSW
+GAME( 1992, blockcarb,blockcar, blockcarb,blockcar, seta_state, 0, ROT90, "bootleg", "Block Carnival / Thunder & Lightning 2 (bootleg)", MACHINE_IMPERFECT_SOUND)
-GAME( 1992, qzkklogy, 0, drgnunit, qzkklogy, driver_device, 0, ROT0, "Tecmo", "Quiz Kokology", 0 )
+GAME( 1992, qzkklogy, 0, drgnunit, qzkklogy, seta_state, 0, ROT0, "Tecmo", "Quiz Kokology", 0 )
-GAME( 1992, neobattl, 0, umanclub, neobattl, driver_device, 0, ROT270, "Banpresto / Sotsu Agency. Sunrise", "SD Gundam Neo Battling (Japan)", 0 )
+GAME( 1992, neobattl, 0, umanclub, neobattl, seta_state, 0, ROT270, "Banpresto / Sotsu Agency. Sunrise", "SD Gundam Neo Battling (Japan)", 0 )
-GAME( 1992, umanclub, 0, umanclub, umanclub, driver_device, 0, ROT0, "Banpresto / Tsuburaya Productions", "Ultraman Club - Tatakae! Ultraman Kyoudai!!", 0 )
+GAME( 1992, umanclub, 0, umanclub, umanclub, seta_state, 0, ROT0, "Banpresto / Tsuburaya Productions", "Ultraman Club - Tatakae! Ultraman Kyoudai!!", 0 )
-GAME( 1992, zingzip, 0, zingzip, zingzip, driver_device, 0, ROT270, "Allumer / Tecmo", "Zing Zing Zip", 0 )
-GAME( 1992, zingzipbl,zingzip, zingzipbl,zingzip, driver_device, 0, ROT270, "bootleg", "Zing Zing Zip (bootleg)", MACHINE_NOT_WORKING )
+GAME( 1992, zingzip, 0, zingzip, zingzip, seta_state, 0, ROT270, "Allumer / Tecmo", "Zing Zing Zip", 0 )
+GAME( 1992, zingzipbl,zingzip, zingzipbl,zingzip, seta_state, 0, ROT270, "bootleg", "Zing Zing Zip (bootleg)", MACHINE_NOT_WORKING )
-GAME( 1993, atehate, 0, atehate, atehate, driver_device, 0, ROT0, "Athena", "Athena no Hatena ?", 0 )
+GAME( 1993, atehate, 0, atehate, atehate, seta_state, 0, ROT0, "Athena", "Athena no Hatena ?", 0 )
-GAME( 1993, daioh, 0, daioh, daioh, driver_device, 0, ROT270, "Athena", "Daioh", 0 )
-GAME( 1993, daioha, daioh, daioh, daioh, driver_device, 0, ROT270, "Athena", "Daioh (earlier)", 0 )
-GAME( 1993, daiohp, daioh, daiohp, daiohp, driver_device, 0, ROT270, "Athena", "Daioh (prototype)", 0 )
-GAME( 1993, daiohc, daioh, wrofaero, daioh, driver_device, 0, ROT270, "Athena", "Daioh (93111A PCB conversion)", 0 )
+GAME( 1993, daioh, 0, daioh, daioh, seta_state, 0, ROT270, "Athena", "Daioh", 0 )
+GAME( 1993, daioha, daioh, daioh, daioh, seta_state, 0, ROT270, "Athena", "Daioh (earlier)", 0 )
+GAME( 1993, daiohp, daioh, daiohp, daiohp, seta_state, 0, ROT270, "Athena", "Daioh (prototype)", 0 )
+GAME( 1993, daiohc, daioh, wrofaero, daioh, seta_state, 0, ROT270, "Athena", "Daioh (93111A PCB conversion)", 0 )
-GAME( 1993, jjsquawk, 0, jjsquawk, jjsquawk, driver_device, 0, ROT0, "Athena / Able", "J. J. Squawkers", MACHINE_IMPERFECT_SOUND )
-GAME( 1993, jjsquawko,jjsquawk, jjsquawk, jjsquawk, driver_device, 0, ROT0, "Athena / Able", "J. J. Squawkers (older)", MACHINE_IMPERFECT_SOUND )
-GAME( 1993, jjsquawkb,jjsquawk, jjsquawb, jjsquawk, driver_device, 0, ROT0, "bootleg", "J. J. Squawkers (bootleg)", MACHINE_IMPERFECT_SOUND )
-GAME( 1993, jjsquawkb2,jjsquawk,jjsquawk, jjsquawk, driver_device, 0, ROT0, "bootleg", "J. J. Squawkers (bootleg, Blandia Conversion)", MACHINE_IMPERFECT_SOUND )
-GAME( 2003, simpsonjr, jjsquawk,jjsquawb, jjsquawk, driver_device, 0, ROT0, "bootleg", "Simpson Junior (bootleg of J. J. Squawkers)", MACHINE_IMPERFECT_SOUND )
+GAME( 1993, jjsquawk, 0, jjsquawk, jjsquawk, seta_state, 0, ROT0, "Athena / Able", "J. J. Squawkers", MACHINE_IMPERFECT_SOUND )
+GAME( 1993, jjsquawko,jjsquawk, jjsquawk, jjsquawk, seta_state, 0, ROT0, "Athena / Able", "J. J. Squawkers (older)", MACHINE_IMPERFECT_SOUND )
+GAME( 1993, jjsquawkb,jjsquawk, jjsquawb, jjsquawk, seta_state, 0, ROT0, "bootleg", "J. J. Squawkers (bootleg)", MACHINE_IMPERFECT_SOUND )
+GAME( 1993, jjsquawkb2,jjsquawk,jjsquawk, jjsquawk, seta_state, 0, ROT0, "bootleg", "J. J. Squawkers (bootleg, Blandia Conversion)", MACHINE_IMPERFECT_SOUND )
+GAME( 2003, simpsonjr, jjsquawk,jjsquawb, jjsquawk, seta_state, 0, ROT0, "bootleg", "Simpson Junior (bootleg of J. J. Squawkers)", MACHINE_IMPERFECT_SOUND )
-GAME( 1993, kamenrid, 0, kamenrid, kamenrid, driver_device, 0, ROT0, "Banpresto / Toei", "Masked Riders Club Battle Race", 0 )
+GAME( 1993, kamenrid, 0, kamenrid, kamenrid, seta_state, 0, ROT0, "Banpresto / Toei", "Masked Riders Club Battle Race", 0 )
-GAME( 1993, madshark, 0, madshark, madshark, driver_device, 0, ROT270, "Allumer", "Mad Shark", 0 )
+GAME( 1993, madshark, 0, madshark, madshark, seta_state, 0, ROT270, "Allumer", "Mad Shark", 0 )
-GAME( 1993, msgundam, 0, msgundam, msgundam, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam", 0 )
-GAME( 1993, msgundam1,msgundam, msgundam, msgunda1, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam (Japan)", 0 )
+GAME( 1993, msgundam, 0, msgundam, msgundam, seta_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam", 0 )
+GAME( 1993, msgundam1,msgundam, msgundam, msgunda1, seta_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam (Japan)", 0 )
-GAME( 1993, oisipuzl, 0, oisipuzl, oisipuzl, driver_device, 0, ROT0, "Sunsoft / Atlus", "Oishii Puzzle Ha Irimasenka", 0 )
-GAME( 1993, triplfun, oisipuzl, triplfun, oisipuzl, driver_device, 0, ROT0, "bootleg", "Triple Fun", 0 )
+GAME( 1993, oisipuzl, 0, oisipuzl, oisipuzl, seta_state, 0, ROT0, "Sunsoft / Atlus", "Oishii Puzzle Ha Irimasenka", 0 )
+GAME( 1993, triplfun, oisipuzl, triplfun, oisipuzl, seta_state, 0, ROT0, "bootleg", "Triple Fun", 0 )
-GAME( 1993, qzkklgy2, 0, qzkklgy2, qzkklgy2, driver_device, 0, ROT0, "Tecmo", "Quiz Kokology 2", 0 )
+GAME( 1993, qzkklgy2, 0, qzkklgy2, qzkklgy2, seta_state, 0, ROT0, "Tecmo", "Quiz Kokology 2", 0 )
-GAME( 1993, utoukond, 0, utoukond, utoukond, driver_device, 0, ROT0, "Banpresto / Tsuburaya Productions", "Ultra Toukon Densetsu (Japan)", 0 )
+GAME( 1993, utoukond, 0, utoukond, utoukond, seta_state, 0, ROT0, "Banpresto / Tsuburaya Productions", "Ultra Toukon Densetsu (Japan)", 0 )
-GAME( 1993, wrofaero, 0, wrofaero, wrofaero, driver_device, 0, ROT270, "Yang Cheng", "War of Aero - Project MEIOU", 0 )
+GAME( 1993, wrofaero, 0, wrofaero, wrofaero, seta_state, 0, ROT270, "Yang Cheng", "War of Aero - Project MEIOU", 0 )
-GAME( 1994, eightfrc, 0, eightfrc, eightfrc, seta_state, eightfrc, ROT90, "Tecmo", "Eight Forces", 0 )
+GAME( 1994, eightfrc, 0, eightfrc, eightfrc, seta_state, eightfrc, ROT90, "Tecmo", "Eight Forces", 0 )
-GAME( 1994, kiwame, 0, kiwame, kiwame, seta_state, kiwame, ROT0, "Athena", "Pro Mahjong Kiwame", 0 )
+GAME( 1994, kiwame, 0, kiwame, kiwame, seta_state, kiwame, ROT0, "Athena", "Pro Mahjong Kiwame", 0 )
-GAME( 1994, krzybowl, 0, krzybowl, krzybowl, driver_device, 0, ROT270, "American Sammy", "Krazy Bowl", 0 )
+GAME( 1994, krzybowl, 0, krzybowl, krzybowl, seta_state, 0, ROT270, "American Sammy", "Krazy Bowl", 0 )
-GAME( 1994, magspeed, 0, magspeed, magspeed, driver_device, 0, ROT0, "Allumer", "Magical Speed", 0 )
+GAME( 1994, magspeed, 0, magspeed, magspeed, seta_state, 0, ROT0, "Allumer", "Magical Speed", 0 )
-GAME( 1994, orbs, 0, orbs, orbs, driver_device, 0, ROT0, "American Sammy", "Orbs (10/7/94 prototype?)", 0 )
+GAME( 1994, orbs, 0, orbs, orbs, seta_state, 0, ROT0, "American Sammy", "Orbs (10/7/94 prototype?)", 0 )
-GAME( 1995, keroppi, 0, keroppi, keroppi, driver_device, 0, ROT0, "American Sammy", "Kero Kero Keroppi's Let's Play Together (USA, Version 2.0)", 0 ) // ROM labels are all v1.0 tho.
-GAME( 1993, keroppij, keroppi, keroppij, keroppij,driver_device, 0, ROT0, "Sammy Industries", "Kero Kero Keroppi no Issyoni Asobou (Japan)", 0 )
+GAME( 1995, keroppi, 0, keroppi, keroppi, seta_state, 0, ROT0, "American Sammy", "Kero Kero Keroppi's Let's Play Together (USA, Version 2.0)", 0 ) // ROM labels are all v1.0 tho.
+GAME( 1993, keroppij, keroppi, keroppij, keroppij, seta_state, 0, ROT0, "Sammy Industries", "Kero Kero Keroppi no Issyoni Asobou (Japan)", 0 )
-GAME( 1995, extdwnhl, 0, extdwnhl, extdwnhl, driver_device, 0, ROT0, "Sammy Industries Japan", "Extreme Downhill (v1.5)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, extdwnhl, 0, extdwnhl, extdwnhl, seta_state, 0, ROT0, "Sammy Industries Japan", "Extreme Downhill (v1.5)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, gundhara, 0, gundhara, gundhara, driver_device, 0, ROT270, "Banpresto", "Gundhara", 0 )
-GAME( 1995, gundharac, gundhara,gundhara, gundhara, driver_device, 0, ROT270, "Banpresto", "Gundhara (Chinese, bootleg?)", 0 )
+GAME( 1995, gundhara, 0, gundhara, gundhara, seta_state, 0, ROT270, "Banpresto", "Gundhara", 0 )
+GAME( 1995, gundharac, gundhara,gundhara, gundhara, seta_state, 0, ROT270, "Banpresto", "Gundhara (Chinese, bootleg?)", 0 )
-GAME( 1995, sokonuke, 0, extdwnhl, sokonuke, driver_device, 0, ROT0, "Sammy Industries", "Sokonuke Taisen Game (Japan)", MACHINE_IMPERFECT_SOUND )
+GAME( 1995, sokonuke, 0, extdwnhl, sokonuke, seta_state, 0, ROT0, "Sammy Industries", "Sokonuke Taisen Game (Japan)", MACHINE_IMPERFECT_SOUND )
GAME( 1995, zombraid, 0, zombraid, zombraid, seta_state, zombraid, ROT0, "American Sammy", "Zombie Raid (9/28/95, US)", MACHINE_NO_COCKTAIL )
GAME( 1995, zombraidp,zombraid, zombraid, zombraid, seta_state, zombraid, ROT0, "American Sammy", "Zombie Raid (9/28/95, US, prototype PCB)", MACHINE_NO_COCKTAIL ) // actual code is same as the released version
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index b94d0535149..9763acc6e37 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -665,7 +665,7 @@ private:
uint8_t m_serial[4];
};
-const device_type FUNCUBE_TOUCHSCREEN = device_creator<funcube_touchscreen_device>;
+DEFINE_DEVICE_TYPE(FUNCUBE_TOUCHSCREEN, funcube_touchscreen_device, "funcube_touchscreen", "Funcube Touchscreen")
static INPUT_PORTS_START( funcube_touchscreen )
PORT_START("touch_btn")
@@ -679,7 +679,7 @@ static INPUT_PORTS_START( funcube_touchscreen )
INPUT_PORTS_END
funcube_touchscreen_device::funcube_touchscreen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, FUNCUBE_TOUCHSCREEN, "Funcube Touchscreen", tag, owner, clock, "funcube_touchscrene", __FILE__),
+ device_t(mconfig, FUNCUBE_TOUCHSCREEN, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_tx_cb(*this),
m_x(*this, "touch_x"),
@@ -800,7 +800,7 @@ WRITE32_MEMBER(seta2_state::oki_write)
if (ACCESSING_BITS_0_7)
{
const uint8_t tmp = (data & 0x000000ff);
- m_oki->write_TMP_register(tmp);
+ m_oki->write_tmp_register(tmp);
}
else if (ACCESSING_BITS_16_23)
{
@@ -2325,7 +2325,7 @@ INTERRUPT_GEN_MEMBER(seta2_state::samshoot_interrupt)
m_tmp68301->external_interrupt_2(); // to do: hook up x1-10 interrupts
}
-static MACHINE_CONFIG_START( seta2, seta2_state )
+static MACHINE_CONFIG_START( seta2 )
MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !!
MCFG_CPU_PROGRAM_MAP(mj4simai_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
@@ -2517,7 +2517,7 @@ MACHINE_RESET_MEMBER(seta2_state, funcube)
m_funcube_hopper_motor = 0;
}
-static MACHINE_CONFIG_START( funcube, seta2_state )
+static MACHINE_CONFIG_START( funcube )
MCFG_CPU_ADD("maincpu", MCF5206E, XTAL_25_447MHz)
MCFG_CPU_PROGRAM_MAP(funcube_map)
@@ -2582,7 +2582,7 @@ static MACHINE_CONFIG_DERIVED( funcube3, funcube2 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( namcostr, seta2_state )
+static MACHINE_CONFIG_START( namcostr )
MCFG_CPU_ADD("maincpu", M68301, XTAL_50MHz/3) // !! TMP68301 !!
MCFG_CPU_PROGRAM_MAP(namcostr_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", seta2_state, seta2_interrupt)
@@ -3882,31 +3882,31 @@ ROM_START( trophyh ) /* V1.0 is currently the only known version */
ROM_END
-GAME( 1994, gundamex, 0, gundamex, gundamex, driver_device, 0, ROT0, "Banpresto", "Mobile Suit Gundam EX Revue", 0 )
-GAME( 1995, grdians, 0, grdians, grdians, driver_device, 0, ROT0, "Winkysoft (Banpresto license)", "Guardians / Denjin Makai II", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, mj4simai, 0, mj4simai, mj4simai, driver_device, 0, ROT0, "Maboroshi Ware", "Wakakusamonogatari Mahjong Yonshimai (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 1996, myangel, 0, myangel, myangel, driver_device, 0, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, myangel2, 0, myangel2, myangel2, driver_device, 0, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel 2 (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, reelquak, 0, reelquak, reelquak, driver_device, 0, ROT0, "<unknown>", "Reel'N Quake! (Version 1.05)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 199?, endrichs, 0, reelquak, endrichs, driver_device, 0, ROT0, "E.N.Tiger", "Endless Riches (Ver 1.20)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, staraudi, 0, staraudi, staraudi, seta2_state, staraudi, ROT0, "Namco", "Star Audition", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, pzlbowl, 0, pzlbowl, pzlbowl, driver_device, 0, ROT0, "MOSS / Nihon System", "Puzzle De Bowling (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 2000, penbros, 0, penbros, penbros, driver_device, 0, ROT0, "Subsino", "Penguin Brothers (Japan)", MACHINE_NO_COCKTAIL )
-GAME( 2000, penbrosk, penbros, penbrosk, penbros, driver_device, 0, ROT0, "bootleg", "Penguin Brothers (Japan, bootleg)", MACHINE_NO_COCKTAIL | MACHINE_NOT_WORKING )
-GAME( 2000, namcostr, 0, namcostr, funcube, driver_device, 0, ROT0, "Namco", "Namco Stars", MACHINE_NO_COCKTAIL | MACHINE_NOT_WORKING )
-GAME( 2000, deerhunt, 0, samshoot, deerhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V4.3", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, deerhunta,deerhunt, samshoot, deerhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V4.2", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, deerhuntb,deerhunt, samshoot, deerhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V4.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, deerhuntc,deerhunt, samshoot, deerhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V3", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, deerhuntd,deerhunt, samshoot, deerhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V2", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, deerhunte,deerhunt, samshoot, deerhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V1", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2001, turkhunt, 0, samshoot, turkhunt, driver_device, 0, ROT0, "Sammy USA Corporation", "Turkey Hunting USA V1.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2001, wschamp, 0, samshoot, wschamp, driver_device, 0, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V2.00", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2001, wschampa, wschamp, samshoot, wschamp, driver_device, 0, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V1.01", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2001, wschampb, wschamp, samshoot, wschamp, driver_device, 0, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V1.00", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2002, trophyh, 0, samshoot, trophyh, driver_device, 0, ROT0, "Sammy USA Corporation", "Trophy Hunting - Bear & Moose V1.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, funcube, 0, funcube, funcube, seta2_state, funcube, ROT0, "Namco", "Funcube (v1.5)", MACHINE_NO_COCKTAIL )
-GAME( 2001, funcube2, 0, funcube2, funcube, seta2_state, funcube2, ROT0, "Namco", "Funcube 2 (v1.1)", MACHINE_NO_COCKTAIL )
-GAME( 2001, funcube3, 0, funcube3, funcube, seta2_state, funcube3, ROT0, "Namco", "Funcube 3 (v1.1)", MACHINE_NO_COCKTAIL )
-GAME( 2001, funcube4, 0, funcube2, funcube, seta2_state, funcube2, ROT0, "Namco", "Funcube 4 (v1.0)", MACHINE_NO_COCKTAIL )
-GAME( 2002, funcube5, 0, funcube2, funcube, seta2_state, funcube2, ROT0, "Namco", "Funcube 5 (v1.0)", MACHINE_NO_COCKTAIL )
+GAME( 1994, gundamex, 0, gundamex, gundamex, seta2_state, 0, ROT0, "Banpresto", "Mobile Suit Gundam EX Revue", 0 )
+GAME( 1995, grdians, 0, grdians, grdians, seta2_state, 0, ROT0, "Winkysoft (Banpresto license)", "Guardians / Denjin Makai II", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, mj4simai, 0, mj4simai, mj4simai, seta2_state, 0, ROT0, "Maboroshi Ware", "Wakakusamonogatari Mahjong Yonshimai (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 1996, myangel, 0, myangel, myangel, seta2_state, 0, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, myangel2, 0, myangel2, myangel2, seta2_state, 0, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel 2 (Japan)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, reelquak, 0, reelquak, reelquak, seta2_state, 0, ROT0, "<unknown>", "Reel'N Quake! (Version 1.05)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 199?, endrichs, 0, reelquak, endrichs, seta2_state, 0, ROT0, "E.N.Tiger", "Endless Riches (Ver 1.20)", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, staraudi, 0, staraudi, staraudi, seta2_state, staraudi, ROT0, "Namco", "Star Audition", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, pzlbowl, 0, pzlbowl, pzlbowl, seta2_state, 0, ROT0, "MOSS / Nihon System", "Puzzle De Bowling (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 2000, penbros, 0, penbros, penbros, seta2_state, 0, ROT0, "Subsino", "Penguin Brothers (Japan)", MACHINE_NO_COCKTAIL )
+GAME( 2000, penbrosk, penbros, penbrosk, penbros, seta2_state, 0, ROT0, "bootleg", "Penguin Brothers (Japan, bootleg)", MACHINE_NO_COCKTAIL | MACHINE_NOT_WORKING )
+GAME( 2000, namcostr, 0, namcostr, funcube, seta2_state, 0, ROT0, "Namco", "Namco Stars", MACHINE_NO_COCKTAIL | MACHINE_NOT_WORKING )
+GAME( 2000, deerhunt, 0, samshoot, deerhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V4.3", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, deerhunta, deerhunt, samshoot, deerhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V4.2", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, deerhuntb, deerhunt, samshoot, deerhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V4.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, deerhuntc, deerhunt, samshoot, deerhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V3", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, deerhuntd, deerhunt, samshoot, deerhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V2", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, deerhunte, deerhunt, samshoot, deerhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Deer Hunting USA V1", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2001, turkhunt, 0, samshoot, turkhunt, seta2_state, 0, ROT0, "Sammy USA Corporation", "Turkey Hunting USA V1.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2001, wschamp, 0, samshoot, wschamp, seta2_state, 0, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V2.00", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2001, wschampa, wschamp, samshoot, wschamp, seta2_state, 0, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V1.01", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2001, wschampb, wschamp, samshoot, wschamp, seta2_state, 0, ROT0, "Sammy USA Corporation", "Wing Shooting Championship V1.00", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2002, trophyh, 0, samshoot, trophyh, seta2_state, 0, ROT0, "Sammy USA Corporation", "Trophy Hunting - Bear & Moose V1.0", MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, funcube, 0, funcube, funcube, seta2_state, funcube, ROT0, "Namco", "Funcube (v1.5)", MACHINE_NO_COCKTAIL )
+GAME( 2001, funcube2, 0, funcube2, funcube, seta2_state, funcube2, ROT0, "Namco", "Funcube 2 (v1.1)", MACHINE_NO_COCKTAIL )
+GAME( 2001, funcube3, 0, funcube3, funcube, seta2_state, funcube3, ROT0, "Namco", "Funcube 3 (v1.1)", MACHINE_NO_COCKTAIL )
+GAME( 2001, funcube4, 0, funcube2, funcube, seta2_state, funcube2, ROT0, "Namco", "Funcube 4 (v1.0)", MACHINE_NO_COCKTAIL )
+GAME( 2002, funcube5, 0, funcube2, funcube, seta2_state, funcube2, ROT0, "Namco", "Funcube 5 (v1.0)", MACHINE_NO_COCKTAIL )
diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp
index a97deabca80..03386115e6f 100644
--- a/src/mame/drivers/sf.cpp
+++ b/src/mame/drivers/sf.cpp
@@ -534,7 +534,7 @@ void sf_state::machine_reset()
m_fgscroll = 0;
}
-static MACHINE_CONFIG_START( sfan, sf_state )
+static MACHINE_CONFIG_START( sfan )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
@@ -574,12 +574,12 @@ static MACHINE_CONFIG_START( sfan, sf_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* 8KHz playback ? */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 8KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* 8KHz playback ? */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 8KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1023,9 +1023,9 @@ ROM_END
-GAME( 1987, sf, 0, sfus, sfus, driver_device, 0, ROT0, "Capcom", "Street Fighter (US, set 1)", MACHINE_SUPPORTS_SAVE ) // Shows Capcom copyright
-GAME( 1987, sfua, sf, sfjp, sfjp, driver_device, 0, ROT0, "Capcom", "Street Fighter (US, set 2) (protected)", MACHINE_SUPPORTS_SAVE ) // Shows Capcom USA copyright
-GAME( 1987, sfj, sf, sfjp, sfjp, driver_device, 0, ROT0, "Capcom", "Street Fighter (Japan) (protected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sfjan,sf, sfan, sfan, driver_device, 0, ROT0, "Capcom", "Street Fighter (Japan, pneumatic buttons)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sfan, sf, sfan, sfan, driver_device, 0, ROT0, "Capcom", "Street Fighter (World, pneumatic buttons)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sfp, sf, sfp, sfan, driver_device, 0, ROT0, "Capcom", "Street Fighter (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sf, 0, sfus, sfus, sf_state, 0, ROT0, "Capcom", "Street Fighter (US, set 1)", MACHINE_SUPPORTS_SAVE ) // Shows Capcom copyright
+GAME( 1987, sfua, sf, sfjp, sfjp, sf_state, 0, ROT0, "Capcom", "Street Fighter (US, set 2) (protected)", MACHINE_SUPPORTS_SAVE ) // Shows Capcom USA copyright
+GAME( 1987, sfj, sf, sfjp, sfjp, sf_state, 0, ROT0, "Capcom", "Street Fighter (Japan) (protected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sfjan,sf, sfan, sfan, sf_state, 0, ROT0, "Capcom", "Street Fighter (Japan, pneumatic buttons)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sfan, sf, sfan, sfan, sf_state, 0, ROT0, "Capcom", "Street Fighter (World, pneumatic buttons)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sfp, sf, sfp, sfan, sf_state, 0, ROT0, "Capcom", "Street Fighter (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index bd9ee52f5dc..62cb992d089 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -1360,7 +1360,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, sfbonus_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( sfbonus, sfbonus_state )
+static MACHINE_CONFIG_START( sfbonus )
MCFG_CPU_ADD("maincpu", Z80, 6000000) // custom packaged z80 CPU ?? Mhz
MCFG_CPU_PROGRAM_MAP(sfbonus_map)
MCFG_CPU_IO_MAP(sfbonus_io)
@@ -1387,7 +1387,7 @@ static MACHINE_CONFIG_START( sfbonus, sfbonus_state )
/* Parrot 3 seems fine at 1 Mhz, but Double Challenge isn't? */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp
index 16e4b6152df..1317fa7a7bc 100644
--- a/src/mame/drivers/sfcbox.cpp
+++ b/src/mame/drivers/sfcbox.cpp
@@ -445,7 +445,7 @@ void sfcbox_state::machine_reset()
m_soundcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( sfcbox, sfcbox_state )
+static MACHINE_CONFIG_START( sfcbox )
/* base snes hardware */
MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
@@ -574,8 +574,8 @@ ROM_START( pss64 )
ROM_END
-GAME( 1994, sfcbox, 0, sfcbox, snes, snes_state, snes, ROT0, "Nintendo", "Super Famicom Box BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
-GAME( 1994, pss61, sfcbox, sfcbox, snes, snes_state, snes, ROT0, "Nintendo", "Super Mario Kart / Super Mario Collection / Star Fox (Super Famicom Box)", MACHINE_NOT_WORKING )
-GAME( 1994, pss62, sfcbox, sfcbox, snes, snes_state, snes, ROT0, "T&E Soft / I'Max", "New Super 3D Golf Simulation - Waialae No Kiseki / Super Mahjong 2 (Super Famicom Box)", MACHINE_NOT_WORKING )
-GAME( 1994, pss63, sfcbox, sfcbox, snes, snes_state, snes, ROT0, "Nintendo / BPS", "Super Donkey Kong / Super Tetris 2 + Bombliss (Super Famicom Box)", MACHINE_NOT_WORKING )
-GAME( 199?, pss64, sfcbox, sfcbox, snes, snes_state, snes, ROT0, "Nintendo / Hudson Soft", "Super Donkey Kong / Super Bomberman 2 (Super Famicom Box)", MACHINE_NOT_WORKING )
+GAME( 1994, sfcbox, 0, sfcbox, snes, sfcbox_state, snes, ROT0, "Nintendo", "Super Famicom Box BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
+GAME( 1994, pss61, sfcbox, sfcbox, snes, sfcbox_state, snes, ROT0, "Nintendo", "Super Mario Kart / Super Mario Collection / Star Fox (Super Famicom Box)", MACHINE_NOT_WORKING )
+GAME( 1994, pss62, sfcbox, sfcbox, snes, sfcbox_state, snes, ROT0, "T&E Soft / I'Max", "New Super 3D Golf Simulation - Waialae No Kiseki / Super Mahjong 2 (Super Famicom Box)", MACHINE_NOT_WORKING )
+GAME( 1994, pss63, sfcbox, sfcbox, snes, sfcbox_state, snes, ROT0, "Nintendo / BPS", "Super Donkey Kong / Super Tetris 2 + Bombliss (Super Famicom Box)", MACHINE_NOT_WORKING )
+GAME( 199?, pss64, sfcbox, sfcbox, snes, sfcbox_state, snes, ROT0, "Nintendo / Hudson Soft", "Super Donkey Kong / Super Bomberman 2 (Super Famicom Box)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp
index 315aca95721..26e12a70051 100644
--- a/src/mame/drivers/sfkick.cpp
+++ b/src/mame/drivers/sfkick.cpp
@@ -579,7 +579,7 @@ WRITE_LINE_MEMBER(sfkick_state::irqhandler)
m_soundcpu->set_input_line_and_vector(0, state ? ASSERT_LINE : CLEAR_LINE, 0xff);
}
-static MACHINE_CONFIG_START( sfkick, sfkick_state )
+static MACHINE_CONFIG_START( sfkick )
MCFG_CPU_ADD("maincpu",Z80,MASTER_CLOCK/6)
MCFG_CPU_PROGRAM_MAP(sfkick_map)
diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp
index d49ba948c5c..a4618334147 100644
--- a/src/mame/drivers/sg1000.cpp
+++ b/src/mame/drivers/sg1000.cpp
@@ -514,10 +514,10 @@ void sf7000_state::machine_reset()
***************************************************************************/
/*-------------------------------------------------
- MACHINE_CONFIG_START( sg1000, sg1000_state )
+ MACHINE_CONFIG_START( sg1000 )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( sg1000, sg1000_state )
+static MACHINE_CONFIG_START( sg1000 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3)
MCFG_CPU_PROGRAM_MAP(sg1000_map)
@@ -567,10 +567,10 @@ static MACHINE_CONFIG_DERIVED( omv, sg1000 )
MACHINE_CONFIG_END
/*-------------------------------------------------
- MACHINE_CONFIG_START( sc3000, sc3000_state )
+ MACHINE_CONFIG_START( sc3000 )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( sc3000, sc3000_state )
+static MACHINE_CONFIG_START( sc3000 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3) // LH0080A
MCFG_CPU_PROGRAM_MAP(sc3000_map)
@@ -605,10 +605,10 @@ static MACHINE_CONFIG_START( sc3000, sc3000_state )
MACHINE_CONFIG_END
/*-------------------------------------------------
- MACHINE_CONFIG_START( sf7000, sf7000_state )
+ MACHINE_CONFIG_START( sf7000 )
-------------------------------------------------*/
-static MACHINE_CONFIG_START( sf7000, sf7000_state )
+static MACHINE_CONFIG_START( sf7000 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_10_738635MHz/3)
MCFG_CPU_PROGRAM_MAP(sf7000_map)
@@ -693,11 +693,11 @@ ROM_END
SYSTEM DRIVERS
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1983, sg1000, 0, 0, sg1000, sg1000, driver_device, 0, "Sega", "SG-1000", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, sg1000m2, sg1000, 0, sc3000, sc3000, driver_device, 0, "Sega", "SG-1000 II", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, sc3000, 0, sg1000, sc3000, sc3000, driver_device, 0, "Sega", "SC-3000", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, sc3000h, sc3000, 0, sc3000, sc3000, driver_device, 0, "Sega", "SC-3000H", MACHINE_SUPPORTS_SAVE )
-COMP( 1983, sf7000, sc3000, 0, sf7000, sf7000, driver_device, 0, "Sega", "SC-3000/Super Control Station SF-7000", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, omv1000, sg1000, 0, omv, omv1000, driver_device, 0, "Tsukuda Original", "Othello Multivision FG-1000", MACHINE_SUPPORTS_SAVE )
-CONS( 1984, omv2000, sg1000, 0, omv, omv2000, driver_device, 0, "Tsukuda Original", "Othello Multivision FG-2000", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1983, sg1000, 0, 0, sg1000, sg1000, sg1000_state, 0, "Sega", "SG-1000", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, sg1000m2, sg1000, 0, sc3000, sc3000, sc3000_state, 0, "Sega", "SG-1000 II", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, sc3000, 0, sg1000, sc3000, sc3000, sc3000_state, 0, "Sega", "SC-3000", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, sc3000h, sc3000, 0, sc3000, sc3000, sc3000_state, 0, "Sega", "SC-3000H", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, sf7000, sc3000, 0, sf7000, sf7000, sf7000_state, 0, "Sega", "SC-3000/Super Control Station SF-7000", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, omv1000, sg1000, 0, omv, omv1000, sg1000_state, 0, "Tsukuda Original", "Othello Multivision FG-1000", MACHINE_SUPPORTS_SAVE )
+CONS( 1984, omv2000, sg1000, 0, omv, omv2000, sg1000_state, 0, "Tsukuda Original", "Othello Multivision FG-2000", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp
index efa29ed094d..83ef7aa6767 100644
--- a/src/mame/drivers/sg1000a.cpp
+++ b/src/mame/drivers/sg1000a.cpp
@@ -454,7 +454,7 @@ WRITE8_MEMBER(sg1000a_state::sg1000a_coin_counter_w)
*
*************************************/
-static MACHINE_CONFIG_START( sg1000a, sg1000a_state )
+static MACHINE_CONFIG_START( sg1000a )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz)
MCFG_CPU_PROGRAM_MAP(program_map)
@@ -548,7 +548,7 @@ DRIVER_INIT_MEMBER(sg1000a_state,sg1000a)
*
*************************************/
-GAME( 1984, chboxing, 0, sg1000a, chboxing, sg1000a_state, sg1000a, ROT0, "Sega", "Champion Boxing", 0 )
-GAME( 1985, chwrestl, 0, sg1000ax, chwrestl, sg1000a_state, sg1000a, ROT0, "Sega", "Champion Pro Wrestling", 0 )
-GAME( 1985, dokidoki, 0, sg1000a, dokidoki, sg1000a_state, sg1000a, ROT0, "Sega", "Doki Doki Penguin Land", 0 )
+GAME( 1984, chboxing, 0, sg1000a, chboxing, sg1000a_state, sg1000a, ROT0, "Sega", "Champion Boxing", 0 )
+GAME( 1985, chwrestl, 0, sg1000ax, chwrestl, sg1000a_state, sg1000a, ROT0, "Sega", "Champion Pro Wrestling", 0 )
+GAME( 1985, dokidoki, 0, sg1000a, dokidoki, sg1000a_state, sg1000a, ROT0, "Sega", "Doki Doki Penguin Land", 0 )
GAME( 1985, sderby2, 0, sderby2, sderby2, sg1000a_state, sg1000a, ROT0, "Sega", "Super Derby II (Satellite board)", MACHINE_NOT_WORKING ) // inputs aren't hooked up, probably needs to be connected to the main board anyway
diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp
index 5ebe20f7530..8f524ef10c7 100644
--- a/src/mame/drivers/sh4robot.cpp
+++ b/src/mame/drivers/sh4robot.cpp
@@ -57,7 +57,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sh4robot )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sh4robot, sh4robot_state )
+static MACHINE_CONFIG_START( sh4robot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH4LE, 200000000) // SH7750
MCFG_SH4_MD0(1)
@@ -89,5 +89,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT CONFIG COMPANY FULLNAME FLAGS */
-COMP( 20??, sh4robot, 0, 0, sh4robot, sh4robot, driver_device, 0, "<unknown>", "Robot", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 20??, sh4robot, 0, 0, sh4robot, sh4robot, sh4robot_state, 0, "<unknown>", "Robot", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp
index 55eb3656288..9de52d9c4bb 100644
--- a/src/mame/drivers/shadfrce.cpp
+++ b/src/mame/drivers/shadfrce.cpp
@@ -540,7 +540,7 @@ GFXDECODE_END
/* Machine Driver Bits */
-static MACHINE_CONFIG_START( shadfrce, shadfrce_state )
+static MACHINE_CONFIG_START( shadfrce )
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz / 2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(shadfrce_map)
@@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( shadfrce, shadfrce_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.50)
- MCFG_OKIM6295_ADD("oki", XTAL_13_4952MHz/8, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_13_4952MHz/8, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -667,6 +667,6 @@ ROM_START( shadfrcej )
ROM_END
-GAME( 1993, shadfrce, 0, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (World, Version 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, shadfrceu, shadfrce, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (US, Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, shadfrcej, shadfrce, shadfrce, shadfrce, driver_device, 0, ROT0, "Technos Japan", "Shadow Force (Japan, Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, shadfrce, 0, shadfrce, shadfrce, shadfrce_state, 0, ROT0, "Technos Japan", "Shadow Force (World, Version 3)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, shadfrceu, shadfrce, shadfrce, shadfrce, shadfrce_state, 0, ROT0, "Technos Japan", "Shadow Force (US, Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, shadfrcej, shadfrce, shadfrce, shadfrce, shadfrce_state, 0, ROT0, "Technos Japan", "Shadow Force (Japan, Version 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp
index 0a1fb133582..a551c1ef0cd 100644
--- a/src/mame/drivers/shangha3.cpp
+++ b/src/mame/drivers/shangha3.cpp
@@ -452,7 +452,7 @@ static GFXDECODE_START( shangha3 )
GFXDECODE_END
-static MACHINE_CONFIG_START( shangha3, shangha3_state )
+static MACHINE_CONFIG_START( shangha3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16
@@ -484,12 +484,12 @@ static MACHINE_CONFIG_START( shangha3, shangha3_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( heberpop, shangha3_state )
+static MACHINE_CONFIG_START( heberpop )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16 like the others??
@@ -527,12 +527,12 @@ static MACHINE_CONFIG_START( heberpop, shangha3_state )
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( blocken, shangha3_state )
+static MACHINE_CONFIG_START( blocken )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_48MHz/3) // TMP68HC000N-16
@@ -570,7 +570,7 @@ static MACHINE_CONFIG_START( blocken, shangha3_state )
MCFG_SOUND_ROUTE(0, "mono", 0.40)
MCFG_SOUND_ROUTE(1, "mono", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp
index 4245a0e287a..3ffa33b8033 100644
--- a/src/mame/drivers/shanghai.cpp
+++ b/src/mame/drivers/shanghai.cpp
@@ -403,7 +403,7 @@ static ADDRESS_MAP_START( hd63484_map, AS_0, 16, shanghai_state )
AM_RANGE(0x00000, 0x3ffff) AM_RAM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( shanghai, shanghai_state )
+static MACHINE_CONFIG_START( shanghai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* NEC D70116C-8 */
@@ -439,7 +439,7 @@ static MACHINE_CONFIG_START( shanghai, shanghai_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( shangha2, shanghai_state )
+static MACHINE_CONFIG_START( shangha2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* ? */
@@ -474,7 +474,7 @@ static MACHINE_CONFIG_START( shangha2, shanghai_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kothello, shanghai_state )
+static MACHINE_CONFIG_START( kothello )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz)
@@ -678,8 +678,8 @@ ROM_END
-GAME( 1988, shanghai, 0, shanghai, shanghai, driver_device, 0, ROT0, "Sunsoft", "Shanghai (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, shanghaij, shanghai, shanghai, shanghai, driver_device, 0, ROT0, "Sunsoft", "Shanghai (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, shangha2, 0, shangha2, shangha2, driver_device, 0, ROT0, "Sunsoft", "Shanghai II (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, shangha2a, shangha2, shangha2, shangha2, driver_device, 0, ROT0, "Sunsoft", "Shanghai II (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, kothello, 0, kothello, kothello, driver_device, 0, ROT0, "Success", "Kyuukyoku no Othello", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, shanghai, 0, shanghai, shanghai, shanghai_state, 0, ROT0, "Sunsoft", "Shanghai (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, shanghaij, shanghai, shanghai, shanghai, shanghai_state, 0, ROT0, "Sunsoft", "Shanghai (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, shangha2, 0, shangha2, shangha2, shanghai_state, 0, ROT0, "Sunsoft", "Shanghai II (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, shangha2a, shangha2, shangha2, shangha2, shanghai_state, 0, ROT0, "Sunsoft", "Shanghai II (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, kothello, 0, kothello, kothello, shanghai_state, 0, ROT0, "Success", "Kyuukyoku no Othello", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp
index 8386ffb9edb..6102a5e5827 100644
--- a/src/mame/drivers/shangkid.cpp
+++ b/src/mame/drivers/shangkid.cpp
@@ -349,7 +349,7 @@ ADDRESS_MAP_END
/***************************************************************************************/
-static MACHINE_CONFIG_START( chinhero, shangkid_state )
+static MACHINE_CONFIG_START( chinhero )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */
@@ -442,7 +442,7 @@ static ADDRESS_MAP_START( dynamski_portmap, AS_IO, 8, shangkid_state )
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_device, data_address_w)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( dynamski, shangkid_state )
+static MACHINE_CONFIG_START( dynamski )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3000000) /* ? */
@@ -1010,10 +1010,10 @@ ROM_START( dynamski )
ROM_END
-GAME( 1984, dynamski, 0, dynamski, dynamski, driver_device, 0, ROT90, "Taiyo", "Dynamic Ski", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, chinhero, 0, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo", "Chinese Hero", MACHINE_SUPPORTS_SAVE ) // by Nihon Game?
-GAME( 1984, chinhero2,chinhero, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo", "Chinese Hero (older, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, chinhero3,chinhero, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo", "Chinese Hero (older, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, chinherot,chinhero, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo (Taito license)", "Chinese Heroe (Taito)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, shangkid, 0, shangkid, shangkid, shangkid_state, shangkid, ROT0, "Taiyo (Data East license)", "Shanghai Kid", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, hiryuken, shangkid, shangkid, shangkid, shangkid_state, shangkid, ROT0, "Taiyo (Taito license)", "Hokuha Syourin Hiryu no Ken", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, dynamski, 0, dynamski, dynamski, shangkid_state, 0, ROT90, "Taiyo", "Dynamic Ski", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, chinhero, 0, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo", "Chinese Hero", MACHINE_SUPPORTS_SAVE ) // by Nihon Game?
+GAME( 1984, chinhero2, chinhero, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo", "Chinese Hero (older, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, chinhero3, chinhero, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo", "Chinese Hero (older, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, chinherot, chinhero, chinhero, chinhero, shangkid_state, chinhero, ROT90, "Taiyo (Taito license)", "Chinese Heroe (Taito)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, shangkid, 0, shangkid, shangkid, shangkid_state, shangkid, ROT0, "Taiyo (Data East license)", "Shanghai Kid", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, hiryuken, shangkid, shangkid, shangkid, shangkid_state, shangkid, ROT0, "Taiyo (Taito license)", "Hokuha Syourin Hiryu no Ken", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp
index cd914cb8b5e..8b4fb99dd07 100644
--- a/src/mame/drivers/shaolins.cpp
+++ b/src/mame/drivers/shaolins.cpp
@@ -192,7 +192,7 @@ static GFXDECODE_START( shaolins )
GFXDECODE_END
-static MACHINE_CONFIG_START( shaolins, shaolins_state )
+static MACHINE_CONFIG_START( shaolins )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/12) /* verified on pcb */
@@ -342,7 +342,7 @@ ROM_START( shaolinb )
ROM_END
-/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
-GAME( 1985, kicker, 0, shaolins, shaolins, driver_device, 0, ROT90, "Konami", "Kicker", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, shaolins, kicker, shaolins, shaolins, driver_device, 0, ROT90, "Konami", "Shao-lin's Road (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, shaolinb, kicker, shaolins, shaolins, driver_device, 0, ROT90, "Konami", "Shao-lin's Road (set 2)", MACHINE_SUPPORTS_SAVE )
+/* YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
+GAME( 1985, kicker, 0, shaolins, shaolins, shaolins_state, 0, ROT90, "Konami", "Kicker", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, shaolins, kicker, shaolins, shaolins, shaolins_state, 0, ROT90, "Konami", "Shao-lin's Road (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, shaolinb, kicker, shaolins, shaolins, shaolins_state, 0, ROT90, "Konami", "Shao-lin's Road (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp
index c3ce31f1181..9318b6c39f2 100644
--- a/src/mame/drivers/shisen.cpp
+++ b/src/mame/drivers/shisen.cpp
@@ -207,7 +207,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( shisen, shisen_state )
+static MACHINE_CONFIG_START( shisen )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 6000000) /* 6 MHz ? */
@@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( shisen, shisen_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("m72", M72, 0)
+ MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
MCFG_YM2151_ADD("ymsnd", 3579545)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
@@ -429,7 +429,7 @@ ROM_START( matchit )
/* no samples on this board */
ROM_END
-GAME( 1989, matchit, 0, shisen, matchit, driver_device, 0, ROT0, "Tamtex", "Match It", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, shisen, matchit, shisen, shisen, driver_device, 0, ROT0, "Tamtex", "Shisensho - Joshiryo-Hen (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, sichuan2, matchit, shisen, shisen, driver_device, 0, ROT0, "hack", "Sichuan II (hack, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, sichuan2a,matchit, shisen, shisen, driver_device, 0, ROT0, "hack", "Sichuan II (hack, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, matchit, 0, shisen, matchit, shisen_state, 0, ROT0, "Tamtex", "Match It", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, shisen, matchit, shisen, shisen, shisen_state, 0, ROT0, "Tamtex", "Shisensho - Joshiryo-Hen (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, sichuan2, matchit, shisen, shisen, shisen_state, 0, ROT0, "hack", "Sichuan II (hack, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, sichuan2a,matchit, shisen, shisen, shisen_state, 0, ROT0, "hack", "Sichuan II (hack, set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp
index c5dfaf0108f..ba40d2ad694 100644
--- a/src/mame/drivers/shootout.cpp
+++ b/src/mame/drivers/shootout.cpp
@@ -273,7 +273,7 @@ void shootout_state::machine_reset ()
m_ccnt_old_val = 0x40;
}
-static MACHINE_CONFIG_START( shootout, shootout_state )
+static MACHINE_CONFIG_START( shootout )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", DECO_222, XTAL_12MHz / 6) // 2 MHz?
@@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( shootout, shootout_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( shootouj, shootout_state )
+static MACHINE_CONFIG_START( shootouj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz / 6) // 2 MHz? (Assuming the same XTAL as DE-0219 pcb)
diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp
index 554150d2892..2fb3da8b000 100644
--- a/src/mame/drivers/shougi.cpp
+++ b/src/mame/drivers/shougi.cpp
@@ -398,7 +398,7 @@ INTERRUPT_GEN_MEMBER(shougi_state::vblank_nmi)
}
-static MACHINE_CONFIG_START( shougi, shougi_state )
+static MACHINE_CONFIG_START( shougi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4)
@@ -489,6 +489,6 @@ ROM_START( shougi2 )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR, COMPANY, FULLNAME, FLAGS */
-GAME( 1982, shougi, 0, shougi, shougi, driver_device, 0, ROT0, "Alpha Denshi Co. (Tehkan license)", "Shougi", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, shougi2, 0, shougi, shougi2, driver_device, 0, ROT0, "Alpha Denshi Co. (Tehkan license)", "Shougi Part II", MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS */
+GAME( 1982, shougi, 0, shougi, shougi, shougi_state, 0, ROT0, "Alpha Denshi Co. (Tehkan license)", "Shougi", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, shougi2, 0, shougi, shougi2, shougi_state, 0, ROT0, "Alpha Denshi Co. (Tehkan license)", "Shougi Part II", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp
index c83dc552550..c3d42179a4e 100644
--- a/src/mame/drivers/shtzone.cpp
+++ b/src/mame/drivers/shtzone.cpp
@@ -93,7 +93,7 @@ uint32_t shtzone_state::screen_update_shtzone(screen_device &screen, bitmap_ind1
}
-static MACHINE_CONFIG_START( shtzone, shtzone_state )
+static MACHINE_CONFIG_START( shtzone )
/* basic machine hardware */
MCFG_CPU_ADD("timercpu", Z80,10738000/4)
@@ -121,4 +121,4 @@ ROM_START( shtzone )
ROM_LOAD( "epr10894a.20", 0x00000, 0x04000, CRC(ea8901d9) SHA1(43fd8bfc395e3b2e3fbe9645d692a5eb04783d9c) )
ROM_END
-GAME( 1987, shtzone, 0, shtzone, shtzone, driver_device, 0, ROT0, "Sega", "Shooting Zone System BIOS", MACHINE_IS_SKELETON | MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_IS_BIOS_ROOT )
+GAME( 1987, shtzone, 0, shtzone, shtzone, shtzone_state, 0, ROT0, "Sega", "Shooting Zone System BIOS", MACHINE_IS_SKELETON | MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_IS_BIOS_ROOT )
diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp
index 1bf575d14f6..dca4dcd5c6d 100644
--- a/src/mame/drivers/shuuz.cpp
+++ b/src/mame/drivers/shuuz.cpp
@@ -230,7 +230,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( shuuz, shuuz_state )
+static MACHINE_CONFIG_START( shuuz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
@@ -260,7 +260,7 @@ static MACHINE_CONFIG_START( shuuz, shuuz_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", ATARI_CLOCK_14MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -347,5 +347,5 @@ ROM_END
*
*************************************/
-GAME( 1990, shuuz, 0, shuuz, shuuz, driver_device, 0, ROT0, "Atari Games", "Shuuz (version 8.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, shuuz2, shuuz, shuuz, shuuz2, driver_device, 0, ROT0, "Atari Games", "Shuuz (version 7.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, shuuz, 0, shuuz, shuuz, shuuz_state, 0, ROT0, "Atari Games", "Shuuz (version 8.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, shuuz2, shuuz, shuuz, shuuz2, shuuz_state, 0, ROT0, "Atari Games", "Shuuz (version 7.1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp
index 5ac932495f0..a31c6918b29 100644
--- a/src/mame/drivers/sidearms.cpp
+++ b/src/mame/drivers/sidearms.cpp
@@ -593,7 +593,7 @@ static GFXDECODE_START( turtship )
GFXDECODE_END
-static MACHINE_CONFIG_START( sidearms, sidearms_state )
+static MACHINE_CONFIG_START( sidearms )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
@@ -642,7 +642,7 @@ static MACHINE_CONFIG_START( sidearms, sidearms_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( turtship, sidearms_state )
+static MACHINE_CONFIG_START( turtship )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
@@ -690,7 +690,7 @@ static MACHINE_CONFIG_START( turtship, sidearms_state )
MCFG_SOUND_ROUTE(3, "mono", 0.25)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( whizz, sidearms_state )
+static MACHINE_CONFIG_START( whizz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp
index f69930110b5..6628de27a2a 100644
--- a/src/mame/drivers/sidepckt.cpp
+++ b/src/mame/drivers/sidepckt.cpp
@@ -372,7 +372,7 @@ void sidepckt_state::machine_reset()
m_scroll_y = 0;
}
-static MACHINE_CONFIG_START( sidepckt, sidepckt_state )
+static MACHINE_CONFIG_START( sidepckt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000) /* 2 MHz */
@@ -527,4 +527,4 @@ DRIVER_INIT_MEMBER(sidepckt_state,sidepcktj)
GAME( 1986, sidepckt, 0, sidepckt, sidepckt, sidepckt_state, sidepckt, ROT0, "Data East Corporation", "Side Pocket (World)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, sidepcktj, sidepckt, sidepckt, sidepcktj, sidepckt_state, sidepcktj, ROT0, "Data East Corporation", "Side Pocket (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sidepcktb, sidepckt, sidepcktb, sidepcktb, driver_device, 0, ROT0, "bootleg", "Side Pocket (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sidepcktb, sidepckt, sidepcktb, sidepcktb, sidepckt_state, 0, ROT0, "bootleg", "Side Pocket (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index 099cf63f603..3add7883ff7 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -575,7 +575,7 @@ void sigmab52_state::machine_reset()
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( jwildb52, sigmab52_state )
+static MACHINE_CONFIG_START( jwildb52 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MAIN_CLOCK/9) /* 2 MHz */
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 91c4b1be335..1caec9d98c5 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -1236,7 +1236,7 @@ static ADDRESS_MAP_START( animalc_io, AS_IO, 8, sigmab98_state )
AM_RANGE( 0x32, 0x32 ) AM_WRITE(sammymdl_leds_w )
AM_RANGE( 0x34, 0x34 ) AM_READ(unk_34_r )
AM_RANGE( 0x90, 0x90 ) AM_DEVWRITE("oki", okim9810_device, write )
- AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_TMP_register )
+ AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_tmp_register )
AM_RANGE( 0x92, 0x92 ) AM_DEVREAD("oki", okim9810_device, read )
AM_RANGE( 0xb0, 0xb0 ) AM_WRITE(sammymdl_hopper_w )
AM_RANGE( 0xc0, 0xc0 ) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w ) // 1
@@ -1480,7 +1480,7 @@ static ADDRESS_MAP_START( haekaka_io, AS_IO, 8, sigmab98_state )
AM_RANGE( 0x31, 0x31 ) AM_WRITE(haekaka_coin_w )
AM_RANGE( 0x32, 0x32 ) AM_WRITE(haekaka_leds_w )
AM_RANGE( 0x90, 0x90 ) AM_DEVWRITE("oki", okim9810_device, write )
- AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_TMP_register )
+ AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_tmp_register )
AM_RANGE( 0x92, 0x92 ) AM_DEVREAD("oki", okim9810_device, read )
AM_RANGE( 0xb0, 0xb0 ) AM_WRITE(sammymdl_hopper_w )
AM_RANGE( 0xc0, 0xc0 ) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w ) // 1
@@ -1727,7 +1727,7 @@ static ADDRESS_MAP_START( itazuram_io, AS_IO, 8, sigmab98_state )
AM_RANGE( 0x31, 0x31 ) AM_WRITE(sammymdl_coin_w )
AM_RANGE( 0x32, 0x32 ) AM_WRITE(sammymdl_leds_w )
AM_RANGE( 0x90, 0x90 ) AM_DEVWRITE("oki", okim9810_device, write )
- AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_TMP_register )
+ AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_tmp_register )
AM_RANGE( 0x92, 0x92 ) AM_DEVREAD("oki", okim9810_device, read )
AM_RANGE( 0xb0, 0xb0 ) AM_WRITE(sammymdl_hopper_w )
AM_RANGE( 0xc0, 0xc0 ) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w ) // 1
@@ -1956,7 +1956,7 @@ static ADDRESS_MAP_START( tdoboon_io, AS_IO, 8, sigmab98_state )
AM_RANGE( 0x31, 0x31 ) AM_WRITE(sammymdl_coin_w )
AM_RANGE( 0x32, 0x32 ) AM_WRITE(sammymdl_leds_w )
AM_RANGE( 0x90, 0x90 ) AM_DEVWRITE("oki", okim9810_device, write )
- AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_TMP_register )
+ AM_RANGE( 0x91, 0x91 ) AM_DEVWRITE("oki", okim9810_device, write_tmp_register )
AM_RANGE( 0x92, 0x92 ) AM_DEVREAD("oki", okim9810_device, read )
AM_RANGE( 0xb0, 0xb0 ) AM_WRITE(sammymdl_hopper_w )
AM_RANGE( 0xc0, 0xc0 ) AM_DEVWRITE("watchdog", watchdog_timer_device, reset_w ) // 1
@@ -2148,7 +2148,7 @@ INTERRUPT_GEN_MEMBER(sigmab98_state::sigmab98_vblank_interrupt)
device.execute().set_input_line_and_vector(0, HOLD_LINE, 0x5a);
}
-static MACHINE_CONFIG_START( sigmab98, sigmab98_state )
+static MACHINE_CONFIG_START( sigmab98 )
MCFG_CPU_ADD("maincpu", Z80, 10000000) // !! TAXAN KY-80, clock @X1? !!
MCFG_CPU_PROGRAM_MAP(gegege_mem_map)
MCFG_CPU_IO_MAP(gegege_io_map)
@@ -2229,7 +2229,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(sigmab98_state::sammymdl_irq)
m_maincpu->set_input_line_and_vector(0,HOLD_LINE, m_timer1_vector);
}
-static MACHINE_CONFIG_START( sammymdl, sigmab98_state )
+static MACHINE_CONFIG_START( sammymdl )
MCFG_CPU_ADD("maincpu", Z80, XTAL_20MHz / 2) // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !!
MCFG_CPU_PROGRAM_MAP( animalc_map )
MCFG_CPU_IO_MAP( animalc_io )
diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp
index 18c6a20e325..28cb4546739 100644
--- a/src/mame/drivers/silkroad.cpp
+++ b/src/mame/drivers/silkroad.cpp
@@ -273,7 +273,7 @@ static GFXDECODE_START( silkroad )
GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x6_layout, 0x0000, 256 )
GFXDECODE_END
-static MACHINE_CONFIG_START( silkroad, silkroad_state )
+static MACHINE_CONFIG_START( silkroad )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz */
@@ -300,11 +300,11 @@ static MACHINE_CONFIG_START( silkroad, silkroad_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki1", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", 2112000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index 38457eed1b8..d77d20c49c7 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -395,7 +395,7 @@ static ADDRESS_MAP_START( silvmil_sound_map, AS_PROGRAM, 8, silvmil_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( silvmil, silvmil_state )
+static MACHINE_CONFIG_START( silvmil )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* Verified */
@@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( silvmil, silvmil_state )
MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_OKIM6295_ADD("oki", XTAL_4_096MHz/4, OKIM6295_PIN7_HIGH) /* Verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_4_096MHz/4, PIN7_HIGH) /* Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
@@ -447,7 +447,7 @@ static MACHINE_CONFIG_DERIVED( puzzlove, silvmil )
MCFG_DECO_SPRITE_BOOTLEG_TYPE(1)
MCFG_DEVICE_REMOVE("oki")
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* Verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH) /* Verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp
index 042794d2b21..c5ebeae8d31 100644
--- a/src/mame/drivers/simpl156.cpp
+++ b/src/mame/drivers/simpl156.cpp
@@ -380,7 +380,7 @@ DECOSPR_PRIORITY_CB_MEMBER(simpl156_state::pri_callback)
}
-static MACHINE_CONFIG_START( chainrec, simpl156_state )
+static MACHINE_CONFIG_START( chainrec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM, 28000000 /* /4 */) /*DE156*/ /* 7.000 MHz */ /* measured at 7.. seems to need 28? */
@@ -426,11 +426,11 @@ static MACHINE_CONFIG_START( chainrec, simpl156_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("okisfx", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("okisfx", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
- MCFG_OKIM6295_ADD("okimusic", 32220000/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("okimusic", 32220000/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2)
MACHINE_CONFIG_END
@@ -462,7 +462,7 @@ static MACHINE_CONFIG_DERIVED( mitchell156, chainrec )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(mitchell156_map)
- MCFG_OKIM6295_REPLACE("okimusic", 32220000/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_REPLACE("okimusic", 32220000/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/simple_st0016.cpp b/src/mame/drivers/simple_st0016.cpp
index 2689a1fc592..f5cd2606a71 100644
--- a/src/mame/drivers/simple_st0016.cpp
+++ b/src/mame/drivers/simple_st0016.cpp
@@ -462,7 +462,7 @@ uint32_t st0016_state::screen_update_st0016(screen_device &screen, bitmap_ind16
}
-static MACHINE_CONFIG_START( st0016, st0016_state )
+static MACHINE_CONFIG_START( st0016 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000) /* 8 MHz ? */
MCFG_CPU_PROGRAM_MAP(st0016_mem)
@@ -720,13 +720,13 @@ DRIVER_INIT_MEMBER(st0016_state,mayjisn2)
*
*************************************/
-GAME( 1994, renju, 0, renju, renju, st0016_state, renju, ROT0, "Visco", "Renju Kizoku", MACHINE_NO_COCKTAIL)
-GAME( 1996, nratechu, 0, st0016, nratechu, st0016_state, nratechu, ROT0, "Seta", "Neratte Chu", MACHINE_NO_COCKTAIL)
-GAME( 1994, mayjisn2, 0, mayjinsn, mayjisn2, st0016_state, mayjisn2, ROT0, "Seta", "Mayjinsen 2", MACHINE_NO_COCKTAIL)
-GAME( 1995, koikois, 0, st0016, koikois, st0016_state, renju, ROT0, "Visco", "Koi Koi Shimasho", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL)
+GAME( 1994, renju, 0, renju, renju, st0016_state, renju, ROT0, "Visco", "Renju Kizoku", MACHINE_NO_COCKTAIL)
+GAME( 1996, nratechu, 0, st0016, nratechu, st0016_state, nratechu, ROT0, "Seta", "Neratte Chu", MACHINE_NO_COCKTAIL)
+GAME( 1994, mayjisn2, 0, mayjinsn, mayjisn2, st0016_state, mayjisn2, ROT0, "Seta", "Mayjinsen 2", MACHINE_NO_COCKTAIL)
+GAME( 1995, koikois, 0, st0016, koikois, st0016_state, renju, ROT0, "Visco", "Koi Koi Shimasho", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL)
GAME( 2001, gostop, 0, st0016, gostop, st0016_state, renju, ROT0, "Visco", "Kankoku Hanafuda Go-Stop", MACHINE_NO_COCKTAIL)
/* Not working */
-GAME( 1994, mayjinsn, 0, mayjinsn, st0016, st0016_state, mayjinsn, ROT0, "Seta", "Mayjinsen",MACHINE_IMPERFECT_GRAPHICS|MACHINE_NOT_WORKING|MACHINE_NO_COCKTAIL)
+GAME( 1994, mayjinsn, 0, mayjinsn, st0016, st0016_state, mayjinsn, ROT0, "Seta", "Mayjinsen", MACHINE_IMPERFECT_GRAPHICS|MACHINE_NOT_WORKING|MACHINE_NO_COCKTAIL)
GAME( 1994, dcrown, 0, st0016, renju, st0016_state, renju, ROT0, "Nippon Data Kiki", "Dream Crown (Set 1)", MACHINE_NOT_WORKING|MACHINE_NO_COCKTAIL) // (c) 1994 Nippon Data Kiki is uploaded near the Japanese Insert coin text
GAME( 1994, dcrowna, dcrown, st0016, renju, st0016_state, renju, ROT0, "Nippon Data Kiki", "Dream Crown (Set 2)", MACHINE_NOT_WORKING|MACHINE_NO_COCKTAIL) // the Insert Coin text has been translated to English and no (c) is uploaded
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index be92748a0c4..52fbcf9506b 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -317,7 +317,7 @@ INTERRUPT_GEN_MEMBER(simpsons_state::simpsons_irq)
device.execute().set_input_line(KONAMI_IRQ_LINE, HOLD_LINE);
}
-static MACHINE_CONFIG_START( simpsons, simpsons_state )
+static MACHINE_CONFIG_START( simpsons )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
@@ -605,10 +605,10 @@ ROM_END
***************************************************************************/
// the region warning, if one exists, is shown after the high-score screen in attract mode
-GAME( 1991, simpsons, 0, simpsons, simpsons, driver_device, 0, ROT0, "Konami", "The Simpsons (4 Players World, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, simpsons4pa, simpsons, simpsons, simpsons, driver_device, 0, ROT0, "Konami", "The Simpsons (4 Players World, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, simpsons2p, simpsons, simpsons, simpsn2p, driver_device, 0, ROT0, "Konami", "The Simpsons (2 Players World, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, simpsons2p2, simpsons, simpsons, simpsons, driver_device, 0, ROT0, "Konami", "The Simpsons (2 Players World, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, simpsons2p3, simpsons, simpsons, simpsn2p, driver_device, 0, ROT0, "Konami", "The Simpsons (2 Players World, set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, simpsons2pa, simpsons, simpsons, simpsn2p, driver_device, 0, ROT0, "Konami", "The Simpsons (2 Players Asia)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, simpsons2pj, simpsons, simpsons, simpsn2p, driver_device, 0, ROT0, "Konami", "The Simpsons (2 Players Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons, 0, simpsons, simpsons, simpsons_state, 0, ROT0, "Konami", "The Simpsons (4 Players World, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons4pa, simpsons, simpsons, simpsons, simpsons_state, 0, ROT0, "Konami", "The Simpsons (4 Players World, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons2p, simpsons, simpsons, simpsn2p, simpsons_state, 0, ROT0, "Konami", "The Simpsons (2 Players World, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons2p2, simpsons, simpsons, simpsons, simpsons_state, 0, ROT0, "Konami", "The Simpsons (2 Players World, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons2p3, simpsons, simpsons, simpsn2p, simpsons_state, 0, ROT0, "Konami", "The Simpsons (2 Players World, set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons2pa, simpsons, simpsons, simpsn2p, simpsons_state, 0, ROT0, "Konami", "The Simpsons (2 Players Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, simpsons2pj, simpsons, simpsons, simpsn2p, simpsons_state, 0, ROT0, "Konami", "The Simpsons (2 Players Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp
index d67c35b12bd..d71caace1a3 100644
--- a/src/mame/drivers/sitcom.cpp
+++ b/src/mame/drivers/sitcom.cpp
@@ -329,7 +329,7 @@ void sitcom_timer_state::update_dac(uint8_t value)
}
-MACHINE_CONFIG_START( sitcom, sitcom_state )
+MACHINE_CONFIG_START( sitcom )
// basic machine hardware
MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz) // 3.072MHz can be used for an old slow 8085
MCFG_CPU_PROGRAM_MAP(sitcom_mem)
@@ -367,7 +367,7 @@ MACHINE_CONFIG_START( sitcom, sitcom_state )
MACHINE_CONFIG_END
-MACHINE_CONFIG_DERIVED_CLASS( sitcomtmr, sitcom, sitcom_timer_state )
+MACHINE_CONFIG_DERIVED( sitcomtmr, sitcom )
MCFG_DEVICE_ADD("ds2", DL1414T, 0) // remote display
MCFG_DL1414_UPDATE_HANDLER(WRITE16(sitcom_state, update_ds<2>))
@@ -390,6 +390,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 2002, sitcom, 0, 0, sitcom, sitcom, driver_device, 0, "San Bergmans & Izabella Malcolm", "Sitcom", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
-COMP( 2002, sitcomtmr, sitcom, 0, sitcomtmr, sitcomtmr, driver_device, 0, "San Bergmans & Izabella Malcolm", "Sitcom Timer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 2002, sitcom, 0, 0, sitcom, sitcom, sitcom_state, 0, "San Bergmans & Izabella Malcolm", "SITCOM", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
+COMP( 2002, sitcomtmr, sitcom, 0, sitcomtmr, sitcomtmr, sitcom_timer_state, 0, "San Bergmans & Izabella Malcolm", "SITCOM Timer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp
index 70ae23c3fc4..6155b28c9c7 100644
--- a/src/mame/drivers/skeetsht.cpp
+++ b/src/mame/drivers/skeetsht.cpp
@@ -227,7 +227,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( skeetsht, skeetsht_state )
+static MACHINE_CONFIG_START( skeetsht )
MCFG_CPU_ADD("68hc11", MC68HC11, 4000000) // ?
MCFG_CPU_PROGRAM_MAP(hc11_pgm_map)
@@ -295,5 +295,5 @@ ROM_END
*
*************************************/
-GAME( 1991, skeetsht, 0, skeetsht, skeetsht, driver_device, 0, ROT0, "Dynamo", "Skeet Shot", MACHINE_NOT_WORKING )
-GAME( 1991, popshot, 0, skeetsht, skeetsht, driver_device, 0, ROT0, "Dynamo", "Pop Shot (prototype)", MACHINE_NOT_WORKING )
+GAME( 1991, skeetsht, 0, skeetsht, skeetsht, skeetsht_state, 0, ROT0, "Dynamo", "Skeet Shot", MACHINE_NOT_WORKING )
+GAME( 1991, popshot, 0, skeetsht, skeetsht, skeetsht_state, 0, ROT0, "Dynamo", "Pop Shot (prototype)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp
index 77d7b3b67c7..524ab14ba95 100644
--- a/src/mame/drivers/skimaxx.cpp
+++ b/src/mame/drivers/skimaxx.cpp
@@ -493,7 +493,7 @@ void skimaxx_state::machine_reset()
*
*************************************/
-static MACHINE_CONFIG_START( skimaxx, skimaxx_state )
+static MACHINE_CONFIG_START( skimaxx )
MCFG_CPU_ADD("maincpu", M68EC030, XTAL_40MHz)
MCFG_CPU_PROGRAM_MAP(68030_1_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", skimaxx_state, irq3_line_hold) // 1,3,7 are identical, rest is RTE
@@ -529,16 +529,16 @@ static MACHINE_CONFIG_START( skimaxx, skimaxx_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki1", XTAL_4MHz, OKIM6295_PIN7_LOW) // ?
+ MCFG_OKIM6295_ADD("oki1", XTAL_4MHz, PIN7_LOW) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_4MHz/2, OKIM6295_PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki2", XTAL_4MHz/2, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki3", XTAL_4MHz, OKIM6295_PIN7_LOW) // ?
+ MCFG_OKIM6295_ADD("oki3", XTAL_4MHz, PIN7_LOW) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki4", XTAL_4MHz/2, OKIM6295_PIN7_HIGH) // ?
+ MCFG_OKIM6295_ADD("oki4", XTAL_4MHz/2, PIN7_HIGH) // ?
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -598,4 +598,4 @@ ROM_END
*
*************************************/
-GAME( 1996, skimaxx, 0, skimaxx, skimaxx, driver_device, 0, ROT0, "Kyle Hodgetts / ICE", "Skimaxx", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, skimaxx, 0, skimaxx, skimaxx, skimaxx_state, 0, ROT0, "Kyle Hodgetts / ICE", "Skimaxx", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp
index 718fc4d14c6..227ced02bd7 100644
--- a/src/mame/drivers/skullxbo.cpp
+++ b/src/mame/drivers/skullxbo.cpp
@@ -224,7 +224,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( skullxbo, skullxbo_state )
+static MACHINE_CONFIG_START( skullxbo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp
index 84ad8c752c5..c7f8b03d4c1 100644
--- a/src/mame/drivers/skyarmy.cpp
+++ b/src/mame/drivers/skyarmy.cpp
@@ -317,7 +317,7 @@ static GFXDECODE_START( skyarmy )
GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( skyarmy, skyarmy_state )
+static MACHINE_CONFIG_START( skyarmy )
MCFG_CPU_ADD("maincpu", Z80,4000000)
MCFG_CPU_PROGRAM_MAP(skyarmy_map)
@@ -366,4 +366,4 @@ ROM_START( skyarmy )
ROM_LOAD( "a6.bin", 0x0000, 0x0020, CRC(c721220b) SHA1(61b3320fb616c0600d56840cb6438616c7e0c6eb) )
ROM_END
-GAME( 1982, skyarmy, 0, skyarmy, skyarmy, driver_device, 0, ROT90, "Shoei", "Sky Army", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, skyarmy, 0, skyarmy, skyarmy, skyarmy_state, 0, ROT90, "Shoei", "Sky Army", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp
index d394ce6ad6d..a02eb02254d 100644
--- a/src/mame/drivers/skydiver.cpp
+++ b/src/mame/drivers/skydiver.cpp
@@ -375,7 +375,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( skydiver, skydiver_state )
+static MACHINE_CONFIG_START( skydiver )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800,MASTER_CLOCK/16) /* ???? */
@@ -439,4 +439,4 @@ ROM_END
*
*************************************/
-GAMEL(1978, skydiver, 0, skydiver, skydiver, driver_device, 0, ROT0, "Atari", "Sky Diver", MACHINE_SUPPORTS_SAVE, layout_skydiver )
+GAMEL(1978, skydiver, 0, skydiver, skydiver, skydiver_state, 0, ROT0, "Atari", "Sky Diver", MACHINE_SUPPORTS_SAVE, layout_skydiver )
diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp
index 1292900c77f..332b28c89d0 100644
--- a/src/mame/drivers/skyfox.cpp
+++ b/src/mame/drivers/skyfox.cpp
@@ -220,7 +220,7 @@ void skyfox_state::machine_reset()
m_bg_ctrl = 0;
}
-static MACHINE_CONFIG_START( skyfox, skyfox_state )
+static MACHINE_CONFIG_START( skyfox )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* Verified at 4MHz */
diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp
index 3dbbd540388..fd3af38d83e 100644
--- a/src/mame/drivers/skykid.cpp
+++ b/src/mame/drivers/skykid.cpp
@@ -435,7 +435,7 @@ INTERRUPT_GEN_MEMBER(skykid_state::mcu_vblank_irq)
}
-static MACHINE_CONFIG_START( skykid, skykid_state )
+static MACHINE_CONFIG_START( skykid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809,49152000/32)
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index 275cc6d0166..ed2de02827c 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -1616,7 +1616,7 @@ INTERRUPT_GEN_MEMBER(skylncr_state::skylncr_vblank_interrupt)
* Machine Driver *
*************************************/
-static MACHINE_CONFIG_START( skylncr, skylncr_state )
+static MACHINE_CONFIG_START( skylncr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -2012,14 +2012,14 @@ DRIVER_INIT_MEMBER(skylncr_state, sonikfig)
* Game Drivers *
****************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1995, skylncr, 0, skylncr, skylncr, driver_device, 0, ROT0, "Bordun International", "Sky Lancer (Bordun, version U450C)", 0 )
-GAME( 1995, butrfly, 0, skylncr, skylncr, driver_device, 0, ROT0, "Bordun International", "Butterfly Video Game (version U350C)", 0 )
-GAME( 1999, mbutrfly, 0, mbutrfly, mbutrfly, driver_device, 0, ROT0, "Bordun International", "Magical Butterfly (version U350C, protected)", 0 )
-GAME( 1995, madzoo, 0, skylncr, skylncr, driver_device, 0, ROT0, "Bordun International", "Mad Zoo (version U450C)", 0 )
-GAME( 1995, leader, 0, skylncr, leader, driver_device, 0, ROT0, "bootleg", "Leader (version Z 2E, Greece)", 0 )
-GAME( 199?, gallag50, 0, skylncr, gallag50, driver_device, 0, ROT0, "bootleg", "Gallag Video Game / Petalouda (Butterfly, x50)", 0 )
-GAME( 199?, neraidou, 0, neraidou, neraidou, driver_device, 0, ROT0, "bootleg", "Neraidoula (Fairy Butterfly)", 0 )
-GAME( 199?, sstar97, 0, sstar97, sstar97, driver_device, 0, ROT0, "Bordun International", "Super Star 97 / Ming Xing 97 (version V153B)", 0 )
-GAME( 1995, bdream97, 0, bdream97, skylncr, driver_device, 0, ROT0, "bootleg (KKK)", "Butterfly Dream 97 / Hudie Meng 97", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1995, skylncr, 0, skylncr, skylncr, skylncr_state, 0, ROT0, "Bordun International", "Sky Lancer (Bordun, version U450C)", 0 )
+GAME( 1995, butrfly, 0, skylncr, skylncr, skylncr_state, 0, ROT0, "Bordun International", "Butterfly Video Game (version U350C)", 0 )
+GAME( 1999, mbutrfly, 0, mbutrfly, mbutrfly, skylncr_state, 0, ROT0, "Bordun International", "Magical Butterfly (version U350C, protected)", 0 )
+GAME( 1995, madzoo, 0, skylncr, skylncr, skylncr_state, 0, ROT0, "Bordun International", "Mad Zoo (version U450C)", 0 )
+GAME( 1995, leader, 0, skylncr, leader, skylncr_state, 0, ROT0, "bootleg", "Leader (version Z 2E, Greece)", 0 )
+GAME( 199?, gallag50, 0, skylncr, gallag50, skylncr_state, 0, ROT0, "bootleg", "Gallag Video Game / Petalouda (Butterfly, x50)", 0 )
+GAME( 199?, neraidou, 0, neraidou, neraidou, skylncr_state, 0, ROT0, "bootleg", "Neraidoula (Fairy Butterfly)", 0 )
+GAME( 199?, sstar97, 0, sstar97, sstar97, skylncr_state, 0, ROT0, "Bordun International", "Super Star 97 / Ming Xing 97 (version V153B)", 0 )
+GAME( 1995, bdream97, 0, bdream97, skylncr, skylncr_state, 0, ROT0, "bootleg (KKK)", "Butterfly Dream 97 / Hudie Meng 97", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
GAME( 2000, sonikfig, 0, skylncr, sonikfig, skylncr_state, sonikfig, ROT0, "Z Games", "Sonik Fighter (version 02, encrypted)", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp
index 7feae556898..1f9374c1a3d 100644
--- a/src/mame/drivers/skyraid.cpp
+++ b/src/mame/drivers/skyraid.cpp
@@ -218,7 +218,7 @@ static GFXDECODE_START( skyraid )
GFXDECODE_END
-static MACHINE_CONFIG_START( skyraid, skyraid_state )
+static MACHINE_CONFIG_START( skyraid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12096000 / 12)
@@ -281,4 +281,4 @@ ROM_START( skyraid )
ROM_END
-GAME( 1978, skyraid, 0, skyraid, skyraid, driver_device, 0, ORIENTATION_FLIP_Y, "Atari", "Sky Raider", MACHINE_IMPERFECT_COLORS )
+GAME( 1978, skyraid, 0, skyraid, skyraid, skyraid_state, 0, ORIENTATION_FLIP_Y, "Atari", "Sky Raider", MACHINE_IMPERFECT_COLORS )
diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp
index f9913ba7c3c..c5c5bb753b6 100644
--- a/src/mame/drivers/slapfght.cpp
+++ b/src/mame/drivers/slapfght.cpp
@@ -925,7 +925,7 @@ GFXDECODE_END
***************************************************************************/
-static MACHINE_CONFIG_START( perfrman, slapfght_state )
+static MACHINE_CONFIG_START( perfrman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4) // 4MHz? XTAL is known, divider is guessed
@@ -970,7 +970,7 @@ static MACHINE_CONFIG_START( perfrman, slapfght_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tigerh, slapfght_state )
+static MACHINE_CONFIG_START( tigerh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_36MHz/6) // 6MHz
@@ -1034,7 +1034,7 @@ static MACHINE_CONFIG_DERIVED( tigerhb2, tigerhb1 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( slapfigh, slapfght_state )
+static MACHINE_CONFIG_START( slapfigh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_36MHz/6) // 6MHz
@@ -2017,14 +2017,14 @@ ROM_END
/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR, COMPANY, FULLNAME, FLAGS ) */
-GAME( 1985, perfrman, 0, perfrman, perfrman, driver_device, 0, ROT270, "Toaplan / Data East Corporation", "Performan (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, perfrmanu, perfrman, perfrman, perfrman, driver_device, 0, ROT270, "Toaplan / Data East USA", "Performan (US)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1985, tigerh, 0, tigerh, tigerh, driver_device, 0, ROT270, "Toaplan / Taito America Corp.", "Tiger Heli (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tigerhj, tigerh, tigerh, tigerh, driver_device, 0, ROT270, "Toaplan / Taito", "Tiger Heli (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tigerhb1, tigerh, tigerhb1, tigerh, driver_device, 0, ROT270, "bootleg", "Tiger Heli (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tigerhb2, tigerh, tigerhb2, tigerh, driver_device, 0, ROT270, "bootleg", "Tiger Heli (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tigerhb3, tigerh, tigerhb2, tigerh, driver_device, 0, ROT270, "bootleg", "Tiger Heli (bootleg set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, perfrman, 0, perfrman, perfrman, slapfght_state, 0, ROT270, "Toaplan / Data East Corporation", "Performan (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, perfrmanu, perfrman, perfrman, perfrman, slapfght_state, 0, ROT270, "Toaplan / Data East USA", "Performan (US)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1985, tigerh, 0, tigerh, tigerh, slapfght_state, 0, ROT270, "Toaplan / Taito America Corp.", "Tiger Heli (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tigerhj, tigerh, tigerh, tigerh, slapfght_state, 0, ROT270, "Toaplan / Taito", "Tiger Heli (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tigerhb1, tigerh, tigerhb1, tigerh, slapfght_state, 0, ROT270, "bootleg", "Tiger Heli (bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tigerhb2, tigerh, tigerhb2, tigerh, slapfght_state, 0, ROT270, "bootleg", "Tiger Heli (bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tigerhb3, tigerh, tigerhb2, tigerh, slapfght_state, 0, ROT270, "bootleg", "Tiger Heli (bootleg set 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1986, alcon, 0, slapfigh, slapfigh, slapfght_state, slapfigh, ROT270, "Toaplan / Taito America Corp.", "Alcon (US)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
GAME( 1986, slapfigh, alcon, slapfigh, slapfigh, slapfght_state, slapfigh, ROT270, "Toaplan / Taito", "Slap Fight (Japan set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL )
diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp
index 450ec0de202..3df6aee37e3 100644
--- a/src/mame/drivers/slapshot.cpp
+++ b/src/mame/drivers/slapshot.cpp
@@ -461,7 +461,7 @@ void slapshot_state::machine_start()
}
-static MACHINE_CONFIG_START( slapshot, slapshot_state )
+static MACHINE_CONFIG_START( slapshot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
@@ -521,7 +521,7 @@ static MACHINE_CONFIG_START( slapshot, slapshot_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( opwolf3, slapshot_state )
+static MACHINE_CONFIG_START( opwolf3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
@@ -697,6 +697,6 @@ DRIVER_INIT_MEMBER(slapshot_state,slapshot)
}
}
-GAME( 1994, slapshot, 0, slapshot, slapshot, slapshot_state, slapshot, ROT0, "Taito Corporation", "Slap Shot (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, opwolf3, 0, opwolf3, opwolf3, slapshot_state, slapshot, ROT0, "Taito Corporation Japan", "Operation Wolf 3 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, opwolf3u, opwolf3, opwolf3, opwolf3, slapshot_state, slapshot, ROT0, "Taito America Corporation", "Operation Wolf 3 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, slapshot, 0, slapshot, slapshot, slapshot_state, slapshot, ROT0, "Taito Corporation", "Slap Shot (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, opwolf3, 0, opwolf3, opwolf3, slapshot_state, slapshot, ROT0, "Taito Corporation Japan", "Operation Wolf 3 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, opwolf3u, opwolf3, opwolf3, opwolf3, slapshot_state, slapshot, ROT0, "Taito America Corporation", "Operation Wolf 3 (US)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp
index 692d48e2779..b97e8c2ab07 100644
--- a/src/mame/drivers/slc1.cpp
+++ b/src/mame/drivers/slc1.cpp
@@ -252,7 +252,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( slc1, slc1_state )
+static MACHINE_CONFIG_START( slc1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2500000)
MCFG_CPU_PROGRAM_MAP(slc1_map)
@@ -283,5 +283,5 @@ ROM_START(slc1)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1989, slc1, 0, 0, slc1, slc1, driver_device, 0, "Dr. Dieter Scheuschner", "SLC-1" , 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP( 1989, slc1, 0, 0, slc1, slc1, slc1_state, 0, "Dr. Dieter Scheuschner", "SLC-1" , 0 )
diff --git a/src/mame/drivers/sleic.cpp b/src/mame/drivers/sleic.cpp
index c64c9ed8437..537706fd8fe 100644
--- a/src/mame/drivers/sleic.cpp
+++ b/src/mame/drivers/sleic.cpp
@@ -64,7 +64,7 @@ DRIVER_INIT_MEMBER(sleic_state,sleic)
{
}
-static MACHINE_CONFIG_START( sleic, sleic_state )
+static MACHINE_CONFIG_START( sleic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8088, 8000000)
MCFG_CPU_PROGRAM_MAP(sleic_map)
@@ -148,7 +148,7 @@ ROM_START(sleicpin)
ROM_LOAD("sp02-1_1.rom", 0x00000, 0x80000, CRC(0e4851a0) SHA1(0692ee2df0b560e2013db9c03fd27c6eb12e618d))
ROM_END
-GAME(1992, bikerace, 0, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Bike Race", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, bikerace2, bikerace, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Bike Race (2-ball play)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, sleicpin, 0, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Sleic Pin Ball", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, iomoon, 0, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Io Moon", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, bikerace, 0, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Bike Race", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, bikerace2, bikerace, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Bike Race (2-ball play)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, sleicpin, 0, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Sleic Pin Ball", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, iomoon, 0, sleic, sleic, sleic_state, sleic, ROT0, "Sleic", "Io Moon", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp
index ce294cfcea4..62a9fbaed7e 100644
--- a/src/mame/drivers/slicer.cpp
+++ b/src/mame/drivers/slicer.cpp
@@ -17,16 +17,18 @@ class slicer_state : public driver_device
{
public:
slicer_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_fdc(*this, "fdc"),
- m_sasi(*this, "sasi")
- {}
-
- required_device<fd1797_t> m_fdc;
- required_device<SCSI_PORT_DEVICE> m_sasi;
+ driver_device(mconfig, type, tag),
+ m_fdc(*this, "fdc"),
+ m_sasi(*this, "sasi")
+ {
+ }
DECLARE_WRITE8_MEMBER(sio_out_w);
DECLARE_WRITE8_MEMBER(drive_sel_w);
+
+protected:
+ required_device<fd1797_device> m_fdc;
+ required_device<scsi_port_device> m_sasi;
};
WRITE8_MEMBER(slicer_state::sio_out_w)
@@ -49,17 +51,17 @@ WRITE8_MEMBER(slicer_state::drive_sel_w)
data &= 1;
switch(offset)
{
- case 0:
- m_sasi->write_sel(data);
- break;
- case 1:
- m_sasi->write_rst(data);
- break;
- case 7:
- m_fdc->dden_w(data);
- break;
-
- default:
+ case 0:
+ m_sasi->write_sel(data);
+ break;
+ case 1:
+ m_sasi->write_rst(data);
+ break;
+ case 7:
+ m_fdc->dden_w(data);
+ break;
+
+ default:
{
floppy_image_device *floppy;
char devname[8];
@@ -82,7 +84,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( slicer_io, AS_IO, 16, slicer_state )
ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0x0000, 0x007f) AM_DEVREADWRITE8("fdc", fd1797_t, read, write, 0x00ff) //PCS0
+ AM_RANGE(0x0000, 0x007f) AM_DEVREADWRITE8("fdc", fd1797_device, read, write, 0x00ff) //PCS0
AM_RANGE(0x0080, 0x00ff) AM_DEVREADWRITE8("sc2681", mc68681_device, read, write, 0x00ff) //PCS1
AM_RANGE(0x0100, 0x017f) AM_WRITE8(drive_sel_w, 0x00ff) //PCS2
// TODO: 0x180 sets ack
@@ -97,7 +99,7 @@ static SLOT_INTERFACE_START( slicer_floppies )
SLOT_INTERFACE("8dsdd", FLOPPY_8_DSDD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( slicer, slicer_state )
+static MACHINE_CONFIG_START( slicer )
MCFG_CPU_ADD("maincpu", I80186, XTAL_16MHz / 2)
MCFG_CPU_PROGRAM_MAP(slicer_map)
MCFG_CPU_IO_MAP(slicer_io)
@@ -140,4 +142,4 @@ ROM_START( slicer )
ROM_LOAD("epbios.bin", 0x0000, 0x8001, CRC(96fe9dd4) SHA1(5fc43454fe7d51f2ae97aef822155dcd28eb7f23))
ROM_END
-COMP( 1983, slicer, 0, 0, slicer, 0, driver_device, 0, "Slicer Computers", "Slicer", MACHINE_NO_SOUND)
+COMP( 1983, slicer, 0, 0, slicer, 0, slicer_state, 0, "Slicer Computers", "Slicer", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp
index f56192b1537..2cbe6e48a5b 100644
--- a/src/mame/drivers/sliver.cpp
+++ b/src/mame/drivers/sliver.cpp
@@ -503,7 +503,7 @@ TIMER_DEVICE_CALLBACK_MEMBER ( sliver_state::obj_irq_cb )
m_maincpu->set_input_line(3, HOLD_LINE);
}
-static MACHINE_CONFIG_START( sliver, sliver_state )
+static MACHINE_CONFIG_START( sliver )
MCFG_CPU_ADD("maincpu", M68000, 12000000)
MCFG_CPU_PROGRAM_MAP(sliver_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", sliver_state, irq4_line_hold)
@@ -529,7 +529,7 @@ static MACHINE_CONFIG_START( sliver, sliver_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6)
@@ -584,5 +584,5 @@ ROM_START( slivera )
ROM_END
-GAME( 1996, sliver, 0, sliver, sliver, driver_device, 0, ROT0, "Hollow Corp", "Sliver (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, slivera, sliver, sliver, sliver, driver_device, 0, ROT0, "Hollow Corp", "Sliver (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sliver, 0, sliver, sliver, sliver_state, 0, ROT0, "Hollow Corp", "Sliver (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, slivera, sliver, sliver, sliver, sliver_state, 0, ROT0, "Hollow Corp", "Sliver (set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp
index d9552c2a898..8d3427836e8 100644
--- a/src/mame/drivers/slotcarn.cpp
+++ b/src/mame/drivers/slotcarn.cpp
@@ -535,7 +535,7 @@ void slotcarn_state::machine_start()
* Machine Driver *
***********************************/
-static MACHINE_CONFIG_START( slotcarn, slotcarn_state )
+static MACHINE_CONFIG_START( slotcarn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) // 2.5 Mhz?
@@ -699,8 +699,8 @@ ROM_END
/*********************************************
* Game Drivers *
-**********************************************
+**********************************************/
- YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1985, slotcarn, 0, slotcarn, slotcarn, driver_device, 0, ROT0, "Wing Co., Ltd.", "Slot Carnival", MACHINE_NOT_WORKING )
-GAME( 1985, spielbud, 0, slotcarn, spielbud, driver_device, 0, ROT0, "ADP", "Spiel Bude (German)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1985, slotcarn, 0, slotcarn, slotcarn, slotcarn_state, 0, ROT0, "Wing Co., Ltd.", "Slot Carnival", MACHINE_NOT_WORKING )
+GAME( 1985, spielbud, 0, slotcarn, spielbud, slotcarn_state, 0, ROT0, "ADP", "Spiel Bude (German)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp
index c753cd46f16..97af4a198d0 100644
--- a/src/mame/drivers/sm1800.cpp
+++ b/src/mame/drivers/sm1800.cpp
@@ -153,7 +153,7 @@ static GFXDECODE_START( sm1800 )
GFXDECODE_END
-static MACHINE_CONFIG_START( sm1800, sm1800_state )
+static MACHINE_CONFIG_START( sm1800 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(sm1800_mem)
@@ -198,5 +198,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( ????, sm1800, 0, 0, sm1800, sm1800, driver_device, 0, "<unknown>", "SM1800", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( ????, sm1800, 0, 0, sm1800, sm1800, sm1800_state, 0, "<unknown>", "SM1800", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp
index 26b543257ae..23f055a37a3 100644
--- a/src/mame/drivers/sm7238.cpp
+++ b/src/mame/drivers/sm7238.cpp
@@ -332,7 +332,7 @@ PALETTE_INIT_MEMBER(sm7238_state, sm7238)
palette.set_pen_color(2, 0x00, 0xff, 0x00); // highlight
}
-static MACHINE_CONFIG_START( sm7238, sm7238_state )
+static MACHINE_CONFIG_START( sm7238 )
MCFG_CPU_ADD("maincpu", I8080, XTAL_16_5888MHz/9)
MCFG_CPU_PROGRAM_MAP(sm7238_mem)
MCFG_CPU_IO_MAP(sm7238_io)
@@ -422,5 +422,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1989, sm7238, 0, 0, sm7238, 0, driver_device, 0, "USSR", "SM 7238", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_KEYBOARD)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1989, sm7238, 0, 0, sm7238, 0, sm7238_state, 0, "USSR", "SM 7238", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_KEYBOARD)
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index 1f62cd90fba..d1d4634bc46 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -54,15 +54,15 @@ class smc777_state : public driver_device
{
public:
smc777_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_crtc(*this, "crtc"),
- m_fdc(*this, "fdc"),
- m_floppy0(*this, "fdc:0"),
- m_floppy1(*this, "fdc:1"),
- m_beeper(*this, "beeper"),
- m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_crtc(*this, "crtc")
+ , m_fdc(*this, "fdc")
+ , m_floppy0(*this, "fdc:0")
+ , m_floppy1(*this, "fdc:1")
+ , m_beeper(*this, "beeper")
+ , m_gfxdecode(*this, "gfxdecode")
+ , m_palette(*this, "palette")
{ }
DECLARE_WRITE8_MEMBER(mc6845_w);
@@ -107,7 +107,7 @@ protected:
private:
required_device<cpu_device> m_maincpu;
required_device<mc6845_device> m_crtc;
- required_device<mb8876_t> m_fdc;
+ required_device<mb8876_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<beep_device> m_beeper;
@@ -963,7 +963,7 @@ static SLOT_INTERFACE_START( smc777_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( smc777, smc777_state )
+static MACHINE_CONFIG_START( smc777 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, MASTER_CLOCK)
MCFG_CPU_PROGRAM_MAP(smc777_mem)
@@ -1026,5 +1026,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, smc777, 0, 0, smc777, smc777, driver_device, 0, "Sony", "SMC-777", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, smc777, 0, 0, smc777, smc777, smc777_state, 0, "Sony", "SMC-777", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp
index 7ece8832ef7..70aae875a66 100644
--- a/src/mame/drivers/sms.cpp
+++ b/src/mame/drivers/sms.cpp
@@ -486,7 +486,7 @@ static INPUT_PORTS_START( gg )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sms_base, sms_state )
+static MACHINE_CONFIG_START( sms_base )
MCFG_MACHINE_START_OVERRIDE(sms_state,sms)
MCFG_MACHINE_RESET_OVERRIDE(sms_state,sms)
@@ -537,33 +537,33 @@ MACHINE_CONFIG_END
#define MCFG_SCREEN_SMS_PAL_RAW_PARAMS(_pixelclock) \
MCFG_SCREEN_RAW_PARAMS(_pixelclock, \
- SEGA315_5124_WIDTH, \
- SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH - 2, \
- SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256 + 10, \
- SEGA315_5124_HEIGHT_PAL, \
- SEGA315_5124_TBORDER_START + SEGA315_5124_PAL_240_TBORDER_HEIGHT, \
- SEGA315_5124_TBORDER_START + SEGA315_5124_PAL_240_TBORDER_HEIGHT + 240) \
- MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (SEGA315_5124_WIDTH * SEGA315_5124_HEIGHT_PAL))
+ sega315_5124_device::WIDTH, \
+ sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH - 2, \
+ sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256 + 10, \
+ sega315_5124_device::HEIGHT_PAL, \
+ sega315_5124_device::TBORDER_START + sega315_5124_device::PAL_240_TBORDER_HEIGHT, \
+ sega315_5124_device::TBORDER_START + sega315_5124_device::PAL_240_TBORDER_HEIGHT + 240) \
+ MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_PAL))
#define MCFG_SCREEN_SMS_NTSC_RAW_PARAMS(_pixelclock) \
MCFG_SCREEN_RAW_PARAMS(_pixelclock, \
- SEGA315_5124_WIDTH, \
- SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH - 2, \
- SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256 + 10, \
- SEGA315_5124_HEIGHT_NTSC, \
- SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT, \
- SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT + 224) \
- MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (SEGA315_5124_WIDTH * SEGA315_5124_HEIGHT_NTSC))
+ sega315_5124_device::WIDTH, \
+ sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH - 2, \
+ sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256 + 10, \
+ sega315_5124_device::HEIGHT_NTSC, \
+ sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, \
+ sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224) \
+ MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
#define MCFG_SCREEN_GG_RAW_PARAMS(_pixelclock) \
MCFG_SCREEN_RAW_PARAMS(_pixelclock, \
- SEGA315_5124_WIDTH, \
- SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 6*8, \
- SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 26*8, \
- SEGA315_5124_HEIGHT_NTSC, \
- SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_192_TBORDER_HEIGHT + 3*8, \
- SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_192_TBORDER_HEIGHT + 21*8 ) \
- MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (SEGA315_5124_WIDTH * SEGA315_5124_HEIGHT_NTSC))
+ sega315_5124_device::WIDTH, \
+ sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 6*8, \
+ sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 26*8, \
+ sega315_5124_device::HEIGHT_NTSC, \
+ sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT + 3*8, \
+ sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_192_TBORDER_HEIGHT + 21*8 ) \
+ MCFG_SCREEN_REFRESH_RATE((double) _pixelclock / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
static MACHINE_CONFIG_DERIVED( sms2_ntsc, sms_ntsc_base )
@@ -616,7 +616,7 @@ static MACHINE_CONFIG_DERIVED( sms1_ntsc, sms_ntsc_base )
MCFG_SMS_EXPANSION_ADD("smsexp", sms_expansion_devices, nullptr)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( sms_sdisp, sms1_ntsc, smssdisp_state )
+static MACHINE_CONFIG_DERIVED( sms_sdisp, sms1_ntsc )
MCFG_DEVICE_MODIFY("sms_vdp")
MCFG_SEGA315_5124_INT_CB(WRITELINE(smssdisp_state, sms_store_int_callback))
@@ -917,7 +917,7 @@ static MACHINE_CONFIG_DERIVED( sg1000m3, sms1_ntsc )
MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(NOOP)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gamegear, sms_state )
+static MACHINE_CONFIG_START( gamegear )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK_GG/9)
MCFG_CPU_PROGRAM_MAP(sms_mem)
diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp
index 7fa9a6f3412..5d83d8145d6 100644
--- a/src/mame/drivers/sms_bootleg.cpp
+++ b/src/mame/drivers/sms_bootleg.cpp
@@ -159,7 +159,7 @@ ADDRESS_MAP_END
-static MACHINE_CONFIG_START( sms_supergame, smsbootleg_state )
+static MACHINE_CONFIG_START( sms_supergame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz/3)
MCFG_CPU_PROGRAM_MAP(sms_supergame_map)
@@ -178,9 +178,9 @@ static MACHINE_CONFIG_START( sms_supergame, smsbootleg_state )
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_RAW_PARAMS(XTAL_10_738635MHz/2, \
- SEGA315_5124_WIDTH , SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH - 2, SEGA315_5124_LBORDER_START + SEGA315_5124_LBORDER_WIDTH + 256 + 10, \
- SEGA315_5124_HEIGHT_NTSC, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT, SEGA315_5124_TBORDER_START + SEGA315_5124_NTSC_224_TBORDER_HEIGHT + 224)
- MCFG_SCREEN_REFRESH_RATE((double) XTAL_10_738635MHz/2 / (SEGA315_5124_WIDTH * SEGA315_5124_HEIGHT_NTSC))
+ sega315_5124_device::WIDTH , sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH - 2, sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256 + 10, \
+ sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224)
+ MCFG_SCREEN_REFRESH_RATE((double) XTAL_10_738635MHz/2 / (sega315_5124_device::WIDTH * sega315_5124_device::HEIGHT_NTSC))
MCFG_SCREEN_UPDATE_DRIVER(sms_state, screen_update_sms)
MCFG_DEVICE_ADD("sms_vdp", SEGA315_5246, 0)
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index ffcf08257a9..7eb2ced7cb8 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -533,7 +533,7 @@ void smsmfg_state::machine_reset()
m_communication_port_status = 0;
}
-static MACHINE_CONFIG_START( sms, smsmfg_state )
+static MACHINE_CONFIG_START( sms )
MCFG_CPU_ADD("maincpu", I8088, XTAL_24MHz/8)
MCFG_CPU_PROGRAM_MAP(sms_map)
@@ -909,7 +909,7 @@ ROM_START( secondch )
ROM_RELOAD( 0x1000, 0x1000 )
ROM_END
-GAME( 1984, trvhang, 0, sms, sms, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 1)", MACHINE_SUPPORTS_SAVE ) /* Version Trivia-1-050185 */
-GAME( 1984, trvhanga, 0, sms, sms, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 2)", MACHINE_NOT_WORKING ) /* Version Trivia-2-011586 */
-GAME( 1985, sureshot, 0, sureshot, sms, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Sure Shot", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, secondch, 0, sureshot, sms, driver_device, 0, ROT0, "SMS Manufacturing Corp.", "Second Chance", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, trvhang, 0, sms, sms, smsmfg_state, 0, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 1)", MACHINE_SUPPORTS_SAVE ) /* Version Trivia-1-050185 */
+GAME( 1984, trvhanga, 0, sms, sms, smsmfg_state, 0, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 2)", MACHINE_NOT_WORKING ) /* Version Trivia-2-011586 */
+GAME( 1985, sureshot, 0, sureshot, sms, smsmfg_state, 0, ROT0, "SMS Manufacturing Corp.", "Sure Shot", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, secondch, 0, sureshot, sms, smsmfg_state, 0, ROT0, "SMS Manufacturing Corp.", "Second Chance", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp
index f4b37f7b05e..975de6f953e 100644
--- a/src/mame/drivers/snes.cpp
+++ b/src/mame/drivers/snes.cpp
@@ -1167,8 +1167,8 @@ SNESCTRL_GUNLATCH_CB(snes_console_state::gun_latch_cb)
if (y < 0)
y = 0;
- if (y > (m_ppu->m_beam.last_visible_line - 1))
- y = m_ppu->m_beam.last_visible_line - 1;
+ if (y > (m_ppu->last_visible_line() - 1))
+ y = m_ppu->last_visible_line() - 1;
// m_ppu->set_latch_hv(x, y); // it would be more accurate to write twice to WRIO register, first with bit7 = 0 and then with bit7 = 1
m_ppu->set_latch_hv(m_ppu->current_x(), m_ppu->current_y());
@@ -1178,7 +1178,7 @@ SNESCTRL_ONSCREEN_CB(snes_console_state::onscreen_cb)
{
// these are the theoretical boundaries, but we currently are always onscreen due to the
// way IPT_LIGHTGUNs work... investigate more on this!
- if (x < 0 || x >= SNES_SCR_WIDTH || y < 0 || y >= m_ppu->m_beam.last_visible_line)
+ if (x < 0 || x >= SNES_SCR_WIDTH || y < 0 || y >= m_ppu->last_visible_line())
return false;
else
return true;
@@ -1325,7 +1325,7 @@ void snes_console_state::machine_reset()
}
-static MACHINE_CONFIG_START( snes, snes_console_state )
+static MACHINE_CONFIG_START( snes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", _5A22, MCLK_NTSC) /* 2.68 MHz, also 3.58 MHz */
@@ -1395,6 +1395,6 @@ ROM_END
*
*************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1989, snes, 0, 0, snes, snes, driver_device, 0, "Nintendo", "Super Nintendo Entertainment System / Super Famicom (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-CONS( 1991, snespal, snes, 0, snespal, snes, driver_device, 0, "Nintendo", "Super Nintendo Entertainment System (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1989, snes, 0, 0, snes, snes, snes_console_state, 0, "Nintendo", "Super Nintendo Entertainment System / Super Famicom (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1991, snespal, snes, 0, snespal, snes, snes_console_state, 0, "Nintendo", "Super Nintendo Entertainment System (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index 9180ad2f9a0..8bf30ffffad 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -683,7 +683,7 @@ static INPUT_PORTS_START( endless )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( kinstb, snesb_state )
+static MACHINE_CONFIG_START( kinstb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", _5A22, 3580000*6) /* 2.68Mhz, also 3.58Mhz */
@@ -1137,10 +1137,10 @@ ROM_END
-GAME( 199?, kinstb, 0, kinstb, kinstb, snesb_state, kinstb, ROT0, "bootleg", "Killer Instinct (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 199?, mk3snes, 0, mk3snes, kinstb, snesb_state, mk3snes, ROT0, "bootleg", "Mortal Kombat 3 (SNES bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 199?, kinstb, 0, kinstb, kinstb, snesb_state, kinstb, ROT0, "bootleg", "Killer Instinct (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 199?, mk3snes, 0, mk3snes, kinstb, snesb_state, mk3snes, ROT0, "bootleg", "Mortal Kombat 3 (SNES bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1996, ffight2b, 0, ffight2b, ffight2b, snesb_state, ffight2b, ROT0, "bootleg", "Final Fight 2 (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, iron, 0, kinstb, iron, snesb_state, iron, ROT0, "bootleg", "Iron (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, denseib, 0, kinstb, denseib, snesb_state, denseib, ROT0, "bootleg", "Ghost Chaser Densei (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, iron, 0, kinstb, iron, snesb_state, iron, ROT0, "bootleg", "Iron (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, denseib, 0, kinstb, denseib, snesb_state, denseib, ROT0, "bootleg", "Ghost Chaser Densei (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, sblast2b, 0, kinstb, sblast2b, snesb_state, sblast2b, ROT0, "bootleg", "Sonic Blast Man 2 Special Turbo (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS)
-GAME( 1996, endless, 0, kinstb, endless, snesb_state, endless, ROT0, "bootleg", "Gundam Wing: Endless Duel (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, endless, 0, kinstb, endless, snesb_state, endless, ROT0, "bootleg", "Gundam Wing: Endless Duel (SNES bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp
index 1ba2d83a3e4..36e7e3d05a3 100644
--- a/src/mame/drivers/snk.cpp
+++ b/src/mame/drivers/snk.cpp
@@ -3608,7 +3608,7 @@ GFXDECODE_END
/**********************************************************************/
-static MACHINE_CONFIG_START( marvins, snk_state )
+static MACHINE_CONFIG_START( marvins )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3360000) /* 3.36 MHz */
@@ -3680,7 +3680,7 @@ static MACHINE_CONFIG_DERIVED( madcrush, marvins )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jcross, snk_state )
+static MACHINE_CONFIG_START( jcross )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3350000) /* NOT verified */
@@ -3763,7 +3763,7 @@ static MACHINE_CONFIG_DERIVED( hal21, jcross )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tnk3, snk_state )
+static MACHINE_CONFIG_START( tnk3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
@@ -3855,7 +3855,7 @@ static MACHINE_CONFIG_DERIVED( fitegolf2, fitegolf )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ikari, snk_state )
+static MACHINE_CONFIG_START( ikari )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_4MHz/4) /* verified on pcb */
@@ -3914,7 +3914,7 @@ static MACHINE_CONFIG_DERIVED( victroad, ikari )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bermudat, snk_state )
+static MACHINE_CONFIG_START( bermudat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* verified on pcb */
@@ -4012,7 +4012,7 @@ static MACHINE_CONFIG_DERIVED( choppera, chopper1 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tdfever, snk_state )
+static MACHINE_CONFIG_START( tdfever )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
@@ -6395,57 +6395,57 @@ DRIVER_INIT_MEMBER(snk_state,countryc)
-GAME( 1983, marvins, 0, marvins, marvins, driver_device, 0, ROT270, "SNK", "Marvin's Maze", 0 )
-GAME( 1984, vangrd2, 0, vangrd2, vangrd2, driver_device, 0, ROT270, "SNK", "Vanguard II", 0 )
-GAME( 1984, madcrash, 0, vangrd2, madcrash, driver_device, 0, ROT0, "SNK", "Mad Crasher", 0 )
-GAME( 1984, madcrush, madcrash, madcrush, madcrash, driver_device, 0, ROT0, "SNK", "Mad Crusher (Japan)", 0 )
-
-GAME( 1984, jcross, 0, jcross, jcross, driver_device, 0, ROT270, "SNK", "Jumping Cross (set 1)", 0 )
-GAME( 1984, jcrossa, jcross, jcross, jcross, driver_device, 0, ROT270, "SNK", "Jumping Cross (set 2)", 0 )
-GAME( 1984, sgladiat, 0, sgladiat, sgladiat, driver_device, 0, ROT0, "SNK", "Gladiator 1984", 0 )
-GAME( 1985, hal21, 0, hal21, hal21, driver_device, 0, ROT270, "SNK", "HAL21", 0 )
-GAME( 1985, hal21j, hal21, hal21, hal21, driver_device, 0, ROT270, "SNK", "HAL21 (Japan)", 0 )
-
-GAME( 1985, aso, 0, aso, aso, driver_device, 0, ROT270, "SNK", "ASO - Armored Scrum Object", 0 )
-GAME( 1985, alphamis, aso, aso, alphamis, driver_device, 0, ROT270, "SNK", "Alpha Mission", 0 )
-GAME( 1985, arian, aso, aso, alphamis, driver_device, 0, ROT270, "SNK", "Arian Mission", 0 )
-GAME( 1985, tnk3, 0, tnk3, tnk3, driver_device, 0, ROT270, "SNK", "T.N.K III (US)", 0 )
-GAME( 1985, tnk3j, tnk3, tnk3, tnk3, driver_device, 0, ROT270, "SNK", "T.A.N.K (Japan)", 0 )
-GAME( 1986, athena, 0, athena, athena, driver_device, 0, ROT0, "SNK", "Athena", 0 )
-GAME( 1988, fitegolf, 0, fitegolf, fitegolf, driver_device, 0, ROT0, "SNK", "Fighting Golf (World?)", 0 )
-GAME( 1988, fitegolfu,fitegolf, fitegolf, fitegolfu, driver_device,0, ROT0, "SNK", "Fighting Golf (US)", 0 )
-GAME( 1988, fitegolf2,fitegolf, fitegolf2,fitegolfu, driver_device,0, ROT0, "SNK", "Fighting Golf (US, Ver 2)", 0 )
-GAME( 1988, countryc, 0, fitegolf, countryc, snk_state, countryc, ROT0, "SNK", "Country Club", 0 )
-
-GAME( 1986, ikari, 0, ikari, ikari, driver_device, 0, ROT270, "SNK", "Ikari Warriors (US JAMMA)", 0 ) // distributed by Tradewest(?)
-GAME( 1986, ikaria, ikari, ikari, ikaria, driver_device, 0, ROT270, "SNK", "Ikari Warriors (US)", 0 ) // distributed by Tradewest(?)
-GAME( 1986, ikarinc, ikari, ikari, ikarinc, driver_device, 0, ROT270, "SNK", "Ikari Warriors (US No Continues)", 0 ) // distributed by Tradewest(?)
-GAME( 1986, ikarijp, ikari, ikari, ikarinc, driver_device, 0, ROT270, "SNK", "Ikari (Japan No Continues)", 0 )
-GAME( 1986, ikarijpb, ikari, ikari, ikarijpb, driver_device, 0, ROT270, "bootleg", "Ikari (Joystick hack bootleg)", 0 )
-GAME( 1986, ikariram, ikari, ikari, ikarijpb, driver_device, 0, ROT270, "bootleg", "Rambo 3 (bootleg of Ikari, Joystick hack)", 0 )
-GAME( 1986, victroad, 0, victroad, victroad, driver_device, 0, ROT270, "SNK", "Victory Road", 0 )
-GAME( 1986, dogosoke, victroad, victroad, victroad, driver_device, 0, ROT270, "SNK", "Dogou Souken", 0 )
-GAME( 1986, dogosokb, victroad, victroad, dogosokb, driver_device, 0, ROT270, "bootleg", "Dogou Souken (Joystick hack bootleg)", 0 )
-
-GAME( 1987, bermudat, 0, bermudat, bermudat, driver_device, 0, ROT270, "SNK", "Bermuda Triangle (World?)", 0 )
-GAME( 1987, bermudatj,bermudat, bermudat, bermudat, driver_device, 0, ROT270, "SNK", "Bermuda Triangle (Japan)", 0 )
-GAME( 1987, worldwar, 0, bermudat, worldwar, driver_device, 0, ROT270, "SNK", "World Wars (World?)", 0 )
-GAME( 1987, bermudata,worldwar, bermudat, bermudaa, driver_device, 0, ROT270, "SNK", "Bermuda Triangle (World Wars) (US)", 0 )
-GAME( 1987, psychos, 0, psychos, psychos, driver_device, 0, ROT0, "SNK", "Psycho Soldier (US)", 0 )
-GAME( 1987, psychosj, psychos, psychos, psychos, driver_device, 0, ROT0, "SNK", "Psycho Soldier (Japan)", 0 )
-GAME( 1987, gwar, 0, gwar, gwar, driver_device, 0, ROT270, "SNK", "Guerrilla War (US)", 0 )
-GAME( 1987, gwarj, gwar, gwar, gwar, driver_device, 0, ROT270, "SNK", "Guevara (Japan)", 0 )
-GAME( 1987, gwara, gwar, gwara, gwar, driver_device, 0, ROT270, "SNK", "Guerrilla War (Version 1)", 0 )
-GAME( 1987, gwarb, gwar, gwar, gwarb, driver_device, 0, ROT270, "bootleg", "Guerrilla War (Joystick hack bootleg)", 0 )
-GAME( 1988, chopper, 0, chopper1, chopper, driver_device, 0, ROT270, "SNK", "Chopper I (US set 1)", 0 )
-GAME( 1988, choppera, chopper, choppera, choppera, driver_device, 0, ROT270, "SNK", "Chopper I (US set 2)", 0 )
-GAME( 1988, chopperb, chopper, chopper1, chopper, driver_device, 0, ROT270, "SNK", "Chopper I (US set 3)", 0 )
-GAME( 1988, legofair, chopper, chopper1, chopper, driver_device, 0, ROT270, "SNK", "Koukuu Kihei Monogatari - The Legend of Air Cavalry (Japan)", 0 )
-
-GAME( 1987, tdfever, 0, tdfever, tdfever, driver_device, 0, ROT90, "SNK", "TouchDown Fever (US)", 0 )
-GAME( 1987, tdfeverj, tdfever, tdfever, tdfever, driver_device, 0, ROT90, "SNK", "TouchDown Fever (Japan)", 0 )
-GAME( 1988, tdfever2, tdfever, tdfever2, tdfever, driver_device, 0, ROT90, "SNK", "TouchDown Fever 2", 0 ) /* upgrade kit for Touchdown Fever */
-GAME( 1988, fsoccer, 0, tdfever2, fsoccer, driver_device, 0, ROT0, "SNK", "Fighting Soccer (version 4)", 0 )
-GAME( 1988, fsoccerj, fsoccer, tdfever2, fsoccer, driver_device, 0, ROT0, "SNK", "Fighting Soccer (Japan)", 0 )
-GAME( 1988, fsoccerb, fsoccer, tdfever2, fsoccerb, driver_device, 0, ROT0, "bootleg", "Fighting Soccer (Joystick hack bootleg)", 0 )
-GAME( 1988, fsoccerba,fsoccer, tdfever2, fsoccerb, driver_device, 0, ROT0, "bootleg", "Fighting Soccer (Joystick hack bootleg, alt)", 0 )
+GAME( 1983, marvins, 0, marvins, marvins, snk_state, 0, ROT270, "SNK", "Marvin's Maze", 0 )
+GAME( 1984, vangrd2, 0, vangrd2, vangrd2, snk_state, 0, ROT270, "SNK", "Vanguard II", 0 )
+GAME( 1984, madcrash, 0, vangrd2, madcrash, snk_state, 0, ROT0, "SNK", "Mad Crasher", 0 )
+GAME( 1984, madcrush, madcrash, madcrush, madcrash, snk_state, 0, ROT0, "SNK", "Mad Crusher (Japan)", 0 )
+
+GAME( 1984, jcross, 0, jcross, jcross, snk_state, 0, ROT270, "SNK", "Jumping Cross (set 1)", 0 )
+GAME( 1984, jcrossa, jcross, jcross, jcross, snk_state, 0, ROT270, "SNK", "Jumping Cross (set 2)", 0 )
+GAME( 1984, sgladiat, 0, sgladiat, sgladiat, snk_state, 0, ROT0, "SNK", "Gladiator 1984", 0 )
+GAME( 1985, hal21, 0, hal21, hal21, snk_state, 0, ROT270, "SNK", "HAL21", 0 )
+GAME( 1985, hal21j, hal21, hal21, hal21, snk_state, 0, ROT270, "SNK", "HAL21 (Japan)", 0 )
+
+GAME( 1985, aso, 0, aso, aso, snk_state, 0, ROT270, "SNK", "ASO - Armored Scrum Object", 0 )
+GAME( 1985, alphamis, aso, aso, alphamis, snk_state, 0, ROT270, "SNK", "Alpha Mission", 0 )
+GAME( 1985, arian, aso, aso, alphamis, snk_state, 0, ROT270, "SNK", "Arian Mission", 0 )
+GAME( 1985, tnk3, 0, tnk3, tnk3, snk_state, 0, ROT270, "SNK", "T.N.K III (US)", 0 )
+GAME( 1985, tnk3j, tnk3, tnk3, tnk3, snk_state, 0, ROT270, "SNK", "T.A.N.K (Japan)", 0 )
+GAME( 1986, athena, 0, athena, athena, snk_state, 0, ROT0, "SNK", "Athena", 0 )
+GAME( 1988, fitegolf, 0, fitegolf, fitegolf, snk_state, 0, ROT0, "SNK", "Fighting Golf (World?)", 0 )
+GAME( 1988, fitegolfu, fitegolf, fitegolf, fitegolfu, snk_state, 0, ROT0, "SNK", "Fighting Golf (US)", 0 )
+GAME( 1988, fitegolf2, fitegolf, fitegolf2, fitegolfu, snk_state, 0, ROT0, "SNK", "Fighting Golf (US, Ver 2)", 0 )
+GAME( 1988, countryc, 0, fitegolf, countryc, snk_state, countryc, ROT0, "SNK", "Country Club", 0 )
+
+GAME( 1986, ikari, 0, ikari, ikari, snk_state, 0, ROT270, "SNK", "Ikari Warriors (US JAMMA)", 0 ) // distributed by Tradewest(?)
+GAME( 1986, ikaria, ikari, ikari, ikaria, snk_state, 0, ROT270, "SNK", "Ikari Warriors (US)", 0 ) // distributed by Tradewest(?)
+GAME( 1986, ikarinc, ikari, ikari, ikarinc, snk_state, 0, ROT270, "SNK", "Ikari Warriors (US No Continues)", 0 ) // distributed by Tradewest(?)
+GAME( 1986, ikarijp, ikari, ikari, ikarinc, snk_state, 0, ROT270, "SNK", "Ikari (Japan No Continues)", 0 )
+GAME( 1986, ikarijpb, ikari, ikari, ikarijpb, snk_state, 0, ROT270, "bootleg", "Ikari (Joystick hack bootleg)", 0 )
+GAME( 1986, ikariram, ikari, ikari, ikarijpb, snk_state, 0, ROT270, "bootleg", "Rambo 3 (bootleg of Ikari, Joystick hack)", 0 )
+GAME( 1986, victroad, 0, victroad, victroad, snk_state, 0, ROT270, "SNK", "Victory Road", 0 )
+GAME( 1986, dogosoke, victroad, victroad, victroad, snk_state, 0, ROT270, "SNK", "Dogou Souken", 0 )
+GAME( 1986, dogosokb, victroad, victroad, dogosokb, snk_state, 0, ROT270, "bootleg", "Dogou Souken (Joystick hack bootleg)", 0 )
+
+GAME( 1987, bermudat, 0, bermudat, bermudat, snk_state, 0, ROT270, "SNK", "Bermuda Triangle (World?)", 0 )
+GAME( 1987, bermudatj, bermudat, bermudat, bermudat, snk_state, 0, ROT270, "SNK", "Bermuda Triangle (Japan)", 0 )
+GAME( 1987, worldwar, 0, bermudat, worldwar, snk_state, 0, ROT270, "SNK", "World Wars (World?)", 0 )
+GAME( 1987, bermudata, worldwar, bermudat, bermudaa, snk_state, 0, ROT270, "SNK", "Bermuda Triangle (World Wars) (US)", 0 )
+GAME( 1987, psychos, 0, psychos, psychos, snk_state, 0, ROT0, "SNK", "Psycho Soldier (US)", 0 )
+GAME( 1987, psychosj, psychos, psychos, psychos, snk_state, 0, ROT0, "SNK", "Psycho Soldier (Japan)", 0 )
+GAME( 1987, gwar, 0, gwar, gwar, snk_state, 0, ROT270, "SNK", "Guerrilla War (US)", 0 )
+GAME( 1987, gwarj, gwar, gwar, gwar, snk_state, 0, ROT270, "SNK", "Guevara (Japan)", 0 )
+GAME( 1987, gwara, gwar, gwara, gwar, snk_state, 0, ROT270, "SNK", "Guerrilla War (Version 1)", 0 )
+GAME( 1987, gwarb, gwar, gwar, gwarb, snk_state, 0, ROT270, "bootleg", "Guerrilla War (Joystick hack bootleg)", 0 )
+GAME( 1988, chopper, 0, chopper1, chopper, snk_state, 0, ROT270, "SNK", "Chopper I (US set 1)", 0 )
+GAME( 1988, choppera, chopper, choppera, choppera, snk_state, 0, ROT270, "SNK", "Chopper I (US set 2)", 0 )
+GAME( 1988, chopperb, chopper, chopper1, chopper, snk_state, 0, ROT270, "SNK", "Chopper I (US set 3)", 0 )
+GAME( 1988, legofair, chopper, chopper1, chopper, snk_state, 0, ROT270, "SNK", "Koukuu Kihei Monogatari - The Legend of Air Cavalry (Japan)", 0 )
+
+GAME( 1987, tdfever, 0, tdfever, tdfever, snk_state, 0, ROT90, "SNK", "TouchDown Fever (US)", 0 )
+GAME( 1987, tdfeverj, tdfever, tdfever, tdfever, snk_state, 0, ROT90, "SNK", "TouchDown Fever (Japan)", 0 )
+GAME( 1988, tdfever2, tdfever, tdfever2, tdfever, snk_state, 0, ROT90, "SNK", "TouchDown Fever 2", 0 ) /* upgrade kit for Touchdown Fever */
+GAME( 1988, fsoccer, 0, tdfever2, fsoccer, snk_state, 0, ROT0, "SNK", "Fighting Soccer (version 4)", 0 )
+GAME( 1988, fsoccerj, fsoccer, tdfever2, fsoccer, snk_state, 0, ROT0, "SNK", "Fighting Soccer (Japan)", 0 )
+GAME( 1988, fsoccerb, fsoccer, tdfever2, fsoccerb, snk_state, 0, ROT0, "bootleg", "Fighting Soccer (Joystick hack bootleg)", 0 )
+GAME( 1988, fsoccerba, fsoccer, tdfever2, fsoccerb, snk_state, 0, ROT0, "bootleg", "Fighting Soccer (Joystick hack bootleg, alt)", 0 )
diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp
index 5eeda29aa17..cbcc1addae2 100644
--- a/src/mame/drivers/snk6502.cpp
+++ b/src/mame/drivers/snk6502.cpp
@@ -281,9 +281,11 @@ Stephh's notes (based on the games M6502 code and some tests) :
#include "emu.h"
#include "includes/snk6502.h"
+#include "audio/snk6502.h"
#include "cpu/m6502/m6502.h"
#include "sound/samples.h"
+#include "sound/sn76477.h"
#include "video/mc6845.h"
#include "screen.h"
#include "speaker.h"
@@ -412,7 +414,8 @@ static ADDRESS_MAP_START( fantasy_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(charram_w) AM_SHARE("charram")
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0x2001, 0x2001) AM_DEVWRITE("crtc", mc6845_device, register_w)
- AM_RANGE(0x2100, 0x2103) AM_DEVWRITE("snk6502", snk6502_sound_device, fantasy_sound_w)
+ AM_RANGE(0x2100, 0x2102) AM_DEVWRITE("snk6502", snk6502_sound_device, fantasy_sound_w)
+ AM_RANGE(0x2103, 0x2103) AM_WRITE(fantasy_flipscreen_w) // affects both video and sound
AM_RANGE(0x2104, 0x2104) AM_READ_PORT("IN0")
AM_RANGE(0x2105, 0x2105) AM_READ_PORT("IN1")
AM_RANGE(0x2106, 0x2106) AM_READ_PORT("DSW")
@@ -433,7 +436,8 @@ static ADDRESS_MAP_START( pballoon_map, AS_PROGRAM, 8, snk6502_state )
AM_RANGE(0x3000, 0x9fff) AM_ROM
AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("crtc", mc6845_device, address_w)
AM_RANGE(0xb001, 0xb001) AM_DEVWRITE("crtc", mc6845_device, register_w)
- AM_RANGE(0xb100, 0xb103) AM_DEVWRITE("snk6502", snk6502_sound_device, fantasy_sound_w)
+ AM_RANGE(0xb100, 0xb102) AM_DEVWRITE("snk6502", snk6502_sound_device, fantasy_sound_w)
+ AM_RANGE(0xb103, 0xb103) AM_WRITE(fantasy_flipscreen_w) // affects both video and sound
AM_RANGE(0xb104, 0xb104) AM_READ_PORT("IN0")
AM_RANGE(0xb105, 0xb105) AM_READ_PORT("IN1")
AM_RANGE(0xb106, 0xb106) AM_READ_PORT("DSW")
@@ -804,7 +808,7 @@ MACHINE_RESET_MEMBER(snk6502_state,pballoon)
*
*************************************/
-static MACHINE_CONFIG_START( sasuke, snk6502_state )
+static MACHINE_CONFIG_START( sasuke )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // 700 kHz
@@ -936,7 +940,7 @@ static MACHINE_CONFIG_DERIVED( satansat, sasuke )
MCFG_DEVICE_REMOVE("sn76477.3")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vanguard, snk6502_state )
+static MACHINE_CONFIG_START( vanguard )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) // adjusted using common divisor
@@ -1641,23 +1645,23 @@ ROM_END
*
*************************************/
-GAME( 1980, sasuke, 0, sasuke, sasuke, driver_device, 0, ROT90, "SNK", "Sasuke vs. Commander", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, satansat, 0, satansat, satansat, driver_device, 0, ROT90, "SNK", "Satan of Saturn (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, satansata,satansat, satansat, satansat, driver_device, 0, ROT90, "SNK", "Satan of Saturn (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, zarzon, satansat, satansat, satansat, driver_device, 0, ROT90, "SNK (Taito America license)", "Zarzon", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, satansatind,satansat,satansat,satansat, driver_device, 0, ROT90, "bootleg (Inder S.A.)", "Satan of Saturn (Inder S.A., bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, vanguard, 0, vanguard, vanguard, driver_device, 0, ROT90, "SNK", "Vanguard (SNK)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, vanguardc,vanguard, vanguard, vanguard, driver_device, 0, ROT90, "SNK (Centuri license)", "Vanguard (Centuri)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, vanguardj,vanguard, vanguard, vanguard, driver_device, 0, ROT90, "SNK", "Vanguard (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, fantasy, 0, fantasy, fantasy, driver_device, 0, ROT90, "SNK", "Fantasy (Germany)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // bootleg?
-GAME( 1981, fantasyu, fantasy, fantasy, fantasyu, driver_device, 0, ROT90, "SNK (Rock-Ola license)", "Fantasy (US)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, fantasyj, fantasy, fantasy, fantasyu, driver_device, 0, ROT90, "SNK", "Fantasy (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pballoon, 0, pballoon, pballoon, driver_device, 0, ROT90, "SNK", "Pioneer Balloon", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, pballoonr,pballoon, pballoon, pballoon, driver_device, 0, ROT90, "SNK (Rock-Ola license)", "Pioneer Balloon (Rock-Ola license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, nibbler, 0, nibbler, nibbler, driver_device, 0, ROT90, "Rock-Ola", "Nibbler (rev 9)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, nibbler8, nibbler, nibbler, nibbler8, driver_device, 0, ROT90, "Rock-Ola", "Nibbler (rev 8)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, nibbler7, nibbler, nibbler, nibbler8, driver_device, 0, ROT90, "Rock-Ola", "Nibbler (rev 7)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, nibbler6, nibbler, nibbler, nibbler6, driver_device, 0, ROT90, "Rock-Ola", "Nibbler (rev 6)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, nibblera, nibbler, nibbler, nibbler, driver_device, 0, ROT90, "Rock-Ola", "Nibbler (rev ?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, nibblerp, nibbler, nibbler, nibbler6, driver_device, 0, ROT90, "Rock-Ola", "Nibbler (Pioneer Balloon conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, nibblero, nibbler, nibbler, nibbler8, driver_device, 0, ROT90, "Rock-Ola (Olympia license)", "Nibbler (Olympia - rev 8)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, sasuke, 0, sasuke, sasuke, snk6502_state, 0, ROT90, "SNK", "Sasuke vs. Commander", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, satansat, 0, satansat, satansat, snk6502_state, 0, ROT90, "SNK", "Satan of Saturn (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, satansata, satansat, satansat, satansat, snk6502_state, 0, ROT90, "SNK", "Satan of Saturn (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, zarzon, satansat, satansat, satansat, snk6502_state, 0, ROT90, "SNK (Taito America license)", "Zarzon", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, satansatind, satansat, satansat, satansat, snk6502_state, 0, ROT90, "bootleg (Inder S.A.)", "Satan of Saturn (Inder S.A., bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, vanguard, 0, vanguard, vanguard, snk6502_state, 0, ROT90, "SNK", "Vanguard (SNK)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, vanguardc, vanguard, vanguard, vanguard, snk6502_state, 0, ROT90, "SNK (Centuri license)", "Vanguard (Centuri)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, vanguardj, vanguard, vanguard, vanguard, snk6502_state, 0, ROT90, "SNK", "Vanguard (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, fantasy, 0, fantasy, fantasy, snk6502_state, 0, ROT90, "SNK", "Fantasy (Germany)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // bootleg?
+GAME( 1981, fantasyu, fantasy, fantasy, fantasyu, snk6502_state, 0, ROT90, "SNK (Rock-Ola license)", "Fantasy (US)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, fantasyj, fantasy, fantasy, fantasyu, snk6502_state, 0, ROT90, "SNK", "Fantasy (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pballoon, 0, pballoon, pballoon, snk6502_state, 0, ROT90, "SNK", "Pioneer Balloon", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, pballoonr, pballoon, pballoon, pballoon, snk6502_state, 0, ROT90, "SNK (Rock-Ola license)", "Pioneer Balloon (Rock-Ola license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, nibbler, 0, nibbler, nibbler, snk6502_state, 0, ROT90, "Rock-Ola", "Nibbler (rev 9)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, nibbler8, nibbler, nibbler, nibbler8, snk6502_state, 0, ROT90, "Rock-Ola", "Nibbler (rev 8)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, nibbler7, nibbler, nibbler, nibbler8, snk6502_state, 0, ROT90, "Rock-Ola", "Nibbler (rev 7)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, nibbler6, nibbler, nibbler, nibbler6, snk6502_state, 0, ROT90, "Rock-Ola", "Nibbler (rev 6)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, nibblera, nibbler, nibbler, nibbler, snk6502_state, 0, ROT90, "Rock-Ola", "Nibbler (rev ?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, nibblerp, nibbler, nibbler, nibbler6, snk6502_state, 0, ROT90, "Rock-Ola", "Nibbler (Pioneer Balloon conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, nibblero, nibbler, nibbler, nibbler8, snk6502_state, 0, ROT90, "Rock-Ola (Olympia license)", "Nibbler (Olympia - rev 8)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp
index 61302b76d23..2dc6ed055f9 100644
--- a/src/mame/drivers/snk68.cpp
+++ b/src/mame/drivers/snk68.cpp
@@ -591,7 +591,7 @@ void snk68_state::tile_callback_notpow(int &tile, int& fx, int& fy, int& region)
region = 1;
}
-static MACHINE_CONFIG_START( pow, snk68_state )
+static MACHINE_CONFIG_START( pow )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_18MHz/2) /* verified on pcb */
@@ -1104,16 +1104,16 @@ ROM_END
/******************************************************************************/
-GAME( 1988, pow, 0, pow, pow, driver_device, 0, ROT0, "SNK", "P.O.W. - Prisoners of War (US version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, powj, pow, pow, powj, driver_device, 0, ROT0, "SNK", "Datsugoku - Prisoners of War (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, streetsm, 0, streetsm, streetsm, driver_device, 0, ROT0, "SNK", "Street Smart (US version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, streetsm1, streetsm, searchar, streetsm, driver_device, 0, ROT0, "SNK", "Street Smart (US version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, streetsmw, streetsm, searchar, streetsj, driver_device, 0, ROT0, "SNK", "Street Smart (World version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, streetsmj, streetsm, searchar, streetsj, driver_device, 0, ROT0, "SNK", "Street Smart (Japan version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, ikari3, 0, searchar, ikari3, driver_device, 0, ROT0, "SNK", "Ikari III - The Rescue (World, 8-Way Joystick)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, ikari3u, ikari3, searchar, ikari3, driver_device, 0, ROT0, "SNK", "Ikari III - The Rescue (US, Rotary Joystick)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, ikari3j, ikari3, searchar, ikari3, driver_device, 0, ROT0, "SNK", "Ikari Three (Japan, Rotary Joystick)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, ikari3k, ikari3, searchar, ikari3, driver_device, 0, ROT0, "SNK", "Ikari Three (Korea, 8-Way Joystick)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, searchar, 0, searchar, searchar, driver_device, 0, ROT90, "SNK", "SAR - Search And Rescue (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, searcharu, searchar, searchar, searchar, driver_device, 0, ROT90, "SNK", "SAR - Search And Rescue (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, searcharj, searchar, searchar, searchar, driver_device, 0, ROT90, "SNK", "SAR - Search And Rescue (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, pow, 0, pow, pow, snk68_state, 0, ROT0, "SNK", "P.O.W. - Prisoners of War (US version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, powj, pow, pow, powj, snk68_state, 0, ROT0, "SNK", "Datsugoku - Prisoners of War (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, streetsm, 0, streetsm, streetsm, snk68_state, 0, ROT0, "SNK", "Street Smart (US version 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, streetsm1, streetsm, searchar, streetsm, snk68_state, 0, ROT0, "SNK", "Street Smart (US version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, streetsmw, streetsm, searchar, streetsj, snk68_state, 0, ROT0, "SNK", "Street Smart (World version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, streetsmj, streetsm, searchar, streetsj, snk68_state, 0, ROT0, "SNK", "Street Smart (Japan version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, ikari3, 0, searchar, ikari3, snk68_state, 0, ROT0, "SNK", "Ikari III - The Rescue (World, 8-Way Joystick)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, ikari3u, ikari3, searchar, ikari3, snk68_state, 0, ROT0, "SNK", "Ikari III - The Rescue (US, Rotary Joystick)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, ikari3j, ikari3, searchar, ikari3, snk68_state, 0, ROT0, "SNK", "Ikari Three (Japan, Rotary Joystick)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, ikari3k, ikari3, searchar, ikari3, snk68_state, 0, ROT0, "SNK", "Ikari Three (Korea, 8-Way Joystick)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, searchar, 0, searchar, searchar, snk68_state, 0, ROT90, "SNK", "SAR - Search And Rescue (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, searcharu, searchar, searchar, searchar, snk68_state, 0, ROT90, "SNK", "SAR - Search And Rescue (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, searcharj, searchar, searchar, searchar, snk68_state, 0, ROT90, "SNK", "SAR - Search And Rescue (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp
index 1f2088476d1..64a44c3dc01 100644
--- a/src/mame/drivers/snookr10.cpp
+++ b/src/mame/drivers/snookr10.cpp
@@ -1037,7 +1037,7 @@ GFXDECODE_END
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( snookr10, snookr10_state )
+static MACHINE_CONFIG_START( snookr10 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65SC02, MASTER_CLOCK/8) /* 2 MHz (1.999 MHz measured) */
@@ -1062,7 +1062,7 @@ static MACHINE_CONFIG_START( snookr10, snookr10_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/16, OKIM6295_PIN7_HIGH) /* 1 MHz (995.5 kHz measured); pin7 checked HIGH on PCB */
+ MCFG_OKIM6295_ADD("oki", MASTER_CLOCK/16, PIN7_HIGH) /* 1 MHz (995.5 kHz measured); pin7 checked HIGH on PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.8)
MACHINE_CONFIG_END
@@ -1220,9 +1220,9 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1998, snookr10, 0, snookr10, snookr10, driver_device, 0, ROT0, "Sandii'", "Snooker 10 (Ver 1.11)", 0, layout_snookr10 )
-GAMEL( 1998, apple10, 0, apple10, apple10, driver_device, 0, ROT0, "Sandii'", "Apple 10 (Ver 1.21)", 0, layout_snookr10 )
-GAMEL( 1997, tenballs, snookr10, tenballs, tenballs, driver_device, 0, ROT0, "<unknown>", "Ten Balls (Ver 1.05)", 0, layout_snookr10 )
-GAMEL( 1998, crystalc, 0, crystalc, crystalc, driver_device, 0, ROT0, "JCD srl", "Crystals Colours (Ver 1.02)", 0, layout_snookr10 )
-GAMEL( 1998, crystalca, crystalc, crystalc, crystalca, driver_device, 0, ROT0, "JCD srl", "Crystals Colours (Ver 1.01)", 0, layout_snookr10 )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+GAMEL( 1998, snookr10, 0, snookr10, snookr10, snookr10_state, 0, ROT0, "Sandii'", "Snooker 10 (Ver 1.11)", 0, layout_snookr10 )
+GAMEL( 1998, apple10, 0, apple10, apple10, snookr10_state, 0, ROT0, "Sandii'", "Apple 10 (Ver 1.21)", 0, layout_snookr10 )
+GAMEL( 1997, tenballs, snookr10, tenballs, tenballs, snookr10_state, 0, ROT0, "<unknown>", "Ten Balls (Ver 1.05)", 0, layout_snookr10 )
+GAMEL( 1998, crystalc, 0, crystalc, crystalc, snookr10_state, 0, ROT0, "JCD srl", "Crystals Colours (Ver 1.02)", 0, layout_snookr10 )
+GAMEL( 1998, crystalca, crystalc, crystalc, crystalca, snookr10_state, 0, ROT0, "JCD srl", "Crystals Colours (Ver 1.01)", 0, layout_snookr10 )
diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp
index b433b3127b0..4466edfa203 100644
--- a/src/mame/drivers/snowbros.cpp
+++ b/src/mame/drivers/snowbros.cpp
@@ -1763,7 +1763,7 @@ MACHINE_RESET_MEMBER(snowbros_state,finalttr)
m_hyperpac_ram[0x2000/2 + i] = PROTDATA[i];
}
-static MACHINE_CONFIG_START( snowbros, snowbros_state )
+static MACHINE_CONFIG_START( snowbros )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* 8 Mhz - confirmed */
@@ -1840,7 +1840,7 @@ static MACHINE_CONFIG_DERIVED( semicom, snowbros )
MCFG_SOUND_ROUTE(0, "mono", 0.10)
MCFG_SOUND_ROUTE(1, "mono", 0.10)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* 1MHz & pin 7 High - Confirmed */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* 1MHz & pin 7 High - Confirmed */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1860,7 +1860,7 @@ static MACHINE_CONFIG_DERIVED( semiprot, semicom )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( honeydol, snowbros_state )
+static MACHINE_CONFIG_START( honeydol )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* MC68000P12 @ 12MHz */
@@ -1894,11 +1894,11 @@ static MACHINE_CONFIG_START( honeydol, snowbros_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* freq? */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* freq? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( twinadv, snowbros_state )
+static MACHINE_CONFIG_START( twinadv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* 12MHz like Honey Dolls ? */
@@ -1930,7 +1930,7 @@ static MACHINE_CONFIG_START( twinadv, snowbros_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
/* sound hardware */
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* freq? */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* freq? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1969,7 +1969,7 @@ static MACHINE_CONFIG_DERIVED( finalttr, semicom )
MCFG_SOUND_ROUTE(0, "mono", 0.08)
MCFG_SOUND_ROUTE(1, "mono", 0.08)
- MCFG_OKIM6295_REPLACE("oki", 999900, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_REPLACE("oki", 999900, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
MACHINE_CONFIG_END
@@ -1980,7 +1980,7 @@ static MACHINE_CONFIG_DERIVED( _4in1, semicom )
MCFG_GFXDECODE_MODIFY("gfxdecode", snowbros)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( snowbro3, snowbros_state ) /* PCB has 16MHz & 12MHz OSCs */
+static MACHINE_CONFIG_START( snowbro3 ) /* PCB has 16MHz & 12MHz OSCs */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) /* MC68000P10 CPU @ 12mhz or 8MHz (16MHz/2) ? */
@@ -2004,13 +2004,13 @@ static MACHINE_CONFIG_START( snowbro3, snowbros_state ) /* PCB has 16MHz & 12MHz
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( yutnori, snowbros_state )
+static MACHINE_CONFIG_START( yutnori )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2)
@@ -2039,10 +2039,10 @@ static MACHINE_CONFIG_START( yutnori, snowbros_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2909,48 +2909,48 @@ DRIVER_INIT_MEMBER(snowbros_state, yutnori)
m_pandora->set_bg_pen(0xf0);
}
-GAME( 1990, snowbros, 0, snowbros, snowbros, driver_device, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, snowbrosa, snowbros, snowbros, snowbros, driver_device, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, snowbrosb, snowbros, snowbros, snowbros, driver_device, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, snowbrosc, snowbros, snowbros, snowbros, driver_device, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, snowbrosj, snowbros, snowbros, snowbroj, driver_device, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, snowbrosd, snowbros, snowbros, snowbroj, driver_device, 0, ROT0, "Toaplan (Dooyong license)", "Snow Bros. - Nick & Tom (Dooyong license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, wintbob, snowbros, wintbob, snowbros, driver_device, 0, ROT0, "bootleg (Sakowa Project Korea)", "The Winter Bobble (bootleg of Snow Bros.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, snowbroswb,snowbros, wintbob, snowbros, driver_device, 0, ROT0, "bootleg", "Snow Bros. - Nick & Tom (The Winter Bobble hardware bootleg)", MACHINE_SUPPORTS_SAVE ) // this was probably unhacked back from the more common Winter Bobble to make it look more original
+GAME( 1990, snowbros, 0, snowbros, snowbros, snowbros_state, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, snowbrosa, snowbros, snowbros, snowbros, snowbros_state, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, snowbrosb, snowbros, snowbros, snowbros, snowbros_state, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, snowbrosc, snowbros, snowbros, snowbros, snowbros_state, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, snowbrosj, snowbros, snowbros, snowbroj, snowbros_state, 0, ROT0, "Toaplan", "Snow Bros. - Nick & Tom (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, snowbrosd, snowbros, snowbros, snowbroj, snowbros_state, 0, ROT0, "Toaplan (Dooyong license)", "Snow Bros. - Nick & Tom (Dooyong license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, wintbob, snowbros, wintbob, snowbros, snowbros_state, 0, ROT0, "bootleg (Sakowa Project Korea)", "The Winter Bobble (bootleg of Snow Bros.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, snowbroswb, snowbros, wintbob, snowbros, snowbros_state, 0, ROT0, "bootleg", "Snow Bros. - Nick & Tom (The Winter Bobble hardware bootleg)", MACHINE_SUPPORTS_SAVE ) // this was probably unhacked back from the more common Winter Bobble to make it look more original
-GAME( 1996, toto, 0, snowbros, snowbros, snowbros_state, toto, ROT0, "SoftClub", "Come Back Toto", MACHINE_SUPPORTS_SAVE ) // modified from 'snowbros' code
+GAME( 1996, toto, 0, snowbros, snowbros, snowbros_state, toto, ROT0, "SoftClub", "Come Back Toto", MACHINE_SUPPORTS_SAVE ) // modified from 'snowbros' code
// none of the games below are on genuine SnowBros hardware, but they clone the functionality of it.
// SemiCom / Jeil titles are protected, a dumb MCU copies code into RAM at startup, some also check for a specific return value from an address on startup.
-GAME( 1993, finalttr, 0, finalttr, finalttr, driver_device, 0, ROT0, "Jeil Computer System", "Final Tetris", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, hyperpac, 0, semicom_mcu, hyperpac, snowbros_state, hyperpac, ROT0, "SemiCom", "Hyper Pacman", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, hyperpacb,hyperpac, semicom, hyperpac, driver_device, 0, ROT0, "bootleg", "Hyper Pacman (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, cookbib2, 0, semiprot, cookbib2, snowbros_state, cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, toppyrap, 0, semiprot, toppyrap, driver_device, 0, ROT0, "SemiCom", "Toppy & Rappy", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, cookbib3, 0, semiprot, cookbib3, snowbros_state, cookbib3, ROT0, "SemiCom", "Cookie & Bibi 3", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, pzlbreak, 0, semiprot, pzlbreak, snowbros_state, pzlbreak, ROT0, "SemiCom / Tirano", "Puzzle Break", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, suhosong, 0, semiprot, suhosong, driver_device, 0, ROT0, "SemiCom", "Su Ho Seong", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, twinkle, 0, semiprot, twinkle, driver_device, 0, ROT0, "SemiCom / Tirano", "Twinkle", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, 3in1semi, 0, semiprot, moremore, snowbros_state, 3in1semi, ROT0, "SemiCom / XESS", "New HyperMan (3-in-1 with Cookie & Bibi & HyperMan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, mcheonru, 0, semiprot, mcheonru, snowbros_state, 3in1semi, ROT0, "SemiCom / AceVer", "Ma Cheon Ru", MACHINE_SUPPORTS_SAVE ) // a flyer exists for an English version called Arirang, AceVer team logo is displayed on it
-GAME( 1999, moremore, 0, semiprot, moremore, snowbros_state, 3in1semi, ROT0, "SemiCom / Exit", "More More", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, moremorp, 0, semiprot, moremore, snowbros_state, 3in1semi, ROT0, "SemiCom / Exit", "More More Plus", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, finalttr, 0, finalttr, finalttr, snowbros_state, 0, ROT0, "Jeil Computer System", "Final Tetris", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, hyperpac, 0, semicom_mcu, hyperpac, snowbros_state, hyperpac, ROT0, "SemiCom", "Hyper Pacman", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, hyperpacb, hyperpac, semicom, hyperpac, snowbros_state, 0, ROT0, "bootleg", "Hyper Pacman (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, cookbib2, 0, semiprot, cookbib2, snowbros_state, cookbib2, ROT0, "SemiCom", "Cookie & Bibi 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, toppyrap, 0, semiprot, toppyrap, snowbros_state, 0, ROT0, "SemiCom", "Toppy & Rappy", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, cookbib3, 0, semiprot, cookbib3, snowbros_state, cookbib3, ROT0, "SemiCom", "Cookie & Bibi 3", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, pzlbreak, 0, semiprot, pzlbreak, snowbros_state, pzlbreak, ROT0, "SemiCom / Tirano", "Puzzle Break", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, suhosong, 0, semiprot, suhosong, snowbros_state, 0, ROT0, "SemiCom", "Su Ho Seong", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, twinkle, 0, semiprot, twinkle, snowbros_state, 0, ROT0, "SemiCom / Tirano", "Twinkle", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, 3in1semi, 0, semiprot, moremore, snowbros_state, 3in1semi, ROT0, "SemiCom / XESS", "New HyperMan (3-in-1 with Cookie & Bibi & HyperMan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, mcheonru, 0, semiprot, mcheonru, snowbros_state, 3in1semi, ROT0, "SemiCom / AceVer", "Ma Cheon Ru", MACHINE_SUPPORTS_SAVE ) // a flyer exists for an English version called Arirang, AceVer team logo is displayed on it
+GAME( 1999, moremore, 0, semiprot, moremore, snowbros_state, 3in1semi, ROT0, "SemiCom / Exit", "More More", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, moremorp, 0, semiprot, moremore, snowbros_state, 3in1semi, ROT0, "SemiCom / Exit", "More More Plus", MACHINE_SUPPORTS_SAVE )
// This is very similar to the SemiCom titles, but unprotected.
-GAME( 2002, 4in1boot, 0, _4in1, 4in1boot, snowbros_state, 4in1boot, ROT0, "K1 Soft", "Puzzle King (PacMan 2, Tetris, HyperMan 2, Snow Bros.)" , MACHINE_SUPPORTS_SAVE )
+GAME( 2002, 4in1boot, 0, _4in1, 4in1boot, snowbros_state, 4in1boot, ROT0, "K1 Soft", "Puzzle King (PacMan 2, Tetris, HyperMan 2, Snow Bros.)" , MACHINE_SUPPORTS_SAVE )
-GAME( 1995, honeydol, 0, honeydol, honeydol, driver_device, 0, ROT0, "Barko Corp.", "Honey Dolls", MACHINE_SUPPORTS_SAVE ) // based on snowbros code..
+GAME( 1995, honeydol, 0, honeydol, honeydol, snowbros_state, 0, ROT0, "Barko Corp.", "Honey Dolls", MACHINE_SUPPORTS_SAVE ) // based on snowbros code..
-GAME( 1995, twinadv, 0, twinadv, twinadv, driver_device, 0, ROT0, "Barko Corp.", "Twin Adventure (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, twinadvk, twinadv, twinadv, twinadv, driver_device, 0, ROT0, "Barko Corp.", "Twin Adventure (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, multi96, twinadv, twinadv, twinadv, driver_device, 0, ROT0, "Barko Corp.", "Multi Game '96 (Italy)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, twinadv, 0, twinadv, twinadv, snowbros_state, 0, ROT0, "Barko Corp.", "Twin Adventure (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, twinadvk, twinadv, twinadv, twinadv, snowbros_state, 0, ROT0, "Barko Corp.", "Twin Adventure (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, multi96, twinadv, twinadv, twinadv, snowbros_state, 0, ROT0, "Barko Corp.", "Multi Game '96 (Italy)", MACHINE_SUPPORTS_SAVE )
// The Korean games database shows an earlier version of this called Ball Boy with a different title screen to the version of Ball Boy we have
// http://mamedev.emulab.it/undumped/images/Ballboy.jpg
// it is possible this 'ball boy' is the original bootleg, with snwobro3 being a hack of that, and the ballboy set we have a further hack of that
// there is also a later 2004 version with 3 player support
// these use an MCU to drive the sound
-GAME( 2002, snowbro3, 0, snowbro3, snowbroj, snowbros_state, snowbro3, ROT0, "Syrmex", "Snow Brothers 3 - Magical Adventure", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // hacked from SnowBros code but released as an original game
-GAME( 2003, ballboy, snowbro3, snowbro3, snowbroj, snowbros_state, snowbro3, ROT0, "bootleg", "Ball Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, snowbro3, 0, snowbro3, snowbroj, snowbros_state, snowbro3, ROT0, "Syrmex", "Snow Brothers 3 - Magical Adventure", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // hacked from SnowBros code but released as an original game
+GAME( 2003, ballboy, snowbro3, snowbro3, snowbroj, snowbros_state, snowbro3, ROT0, "bootleg", "Ball Boy", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
// protection appears to handle the sound, should check if it's just a block of code that is conditionally executed like some of the Semicom titles.
-GAME( 1999, yutnori, 0, yutnori, yutnori, snowbros_state, yutnori, ROT0, "Nunal", "Puzzle Yutnori (Korea)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // Nunal is apparently Korean slang for Eyeball, hence the logo. Some places report 'JCC Soft' as the manufacturer
+GAME( 1999, yutnori, 0, yutnori, yutnori, snowbros_state, yutnori, ROT0, "Nunal", "Puzzle Yutnori (Korea)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) // Nunal is apparently Korean slang for Eyeball, hence the logo. Some places report 'JCC Soft' as the manufacturer
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp
index ce7218901ac..f97db1c009f 100644
--- a/src/mame/drivers/socrates.cpp
+++ b/src/mame/drivers/socrates.cpp
@@ -1367,7 +1367,7 @@ INTERRUPT_GEN_MEMBER(socrates_state::assert_irq)
m_kbmcu_rscount = 0; // clear the mcu poke count
}
-static MACHINE_CONFIG_START( socrates, socrates_state )
+static MACHINE_CONFIG_START( socrates )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_21_4772MHz/6) /* Toshiba TMPZ84C00AP @ 3.579545 MHz, verified, xtal is divided by 6 */
MCFG_CPU_PROGRAM_MAP(z80_mem)
@@ -1399,7 +1399,7 @@ static MACHINE_CONFIG_START( socrates, socrates_state )
MCFG_SOFTWARE_LIST_ADD("cart_list", "socrates")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( socrates_pal, socrates_state )
+static MACHINE_CONFIG_START( socrates_pal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_26_601712MHz/6) /* Toshiba TMPZ84C00AP @ 4.433 MHz? /6 or 7 or 8? TODO: verify divider!*/
MCFG_CPU_PROGRAM_MAP(z80_mem)
@@ -1445,7 +1445,7 @@ static MACHINE_CONFIG_DERIVED( socrates_pal, socrates )
MACHINE_CONFIG_END
*/
-static MACHINE_CONFIG_START( iqunlimz, iqunlim_state )
+static MACHINE_CONFIG_START( iqunlimz )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) /* not accurate */
MCFG_CPU_PROGRAM_MAP(iqunlim_mem)
@@ -1583,11 +1583,11 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, socrates, 0, 0, socrates, socrates, socrates_state, socrates, "Video Technology", "Socrates Educational Video System", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // English NTSC, no title copyright
-COMP( 1988, socratfc, socrates, 0, socrates, socrates, socrates_state, socrates, "Video Technology", "Socrates SAITOUT", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // French Canandian NTSC, 1988 title copyright
-COMP( 1988, profweis, socrates, 0, socrates_pal, socrates, socrates_state, socrates, "Video Technology/Yeno", "Professor Weiss-Alles", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // German PAL, 1988 title copyright
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1988, socrates, 0, 0, socrates, socrates, socrates_state, socrates, "Video Technology", "Socrates Educational Video System", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // English NTSC, no title copyright
+COMP( 1988, socratfc, socrates, 0, socrates, socrates, socrates_state, socrates, "Video Technology", "Socrates SAITOUT", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // French Canandian NTSC, 1988 title copyright
+COMP( 1988, profweis, socrates, 0, socrates_pal, socrates, socrates_state, socrates, "Video Technology/Yeno", "Professor Weiss-Alles", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // German PAL, 1988 title copyright
// Yeno Professeur Saitout goes here (french SECAM)
// ? goes here (spanish PAL)
-COMP( 1991, iqunlimz, 0, 0, iqunlimz, iqunlimz, driver_device, 0, "Video Technology", "IQ Unlimited (Z80)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1991, iqunlimz, 0, 0, iqunlimz, iqunlimz, iqunlim_state, 0, "Video Technology", "IQ Unlimited (Z80)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp
index 42c552d2050..293fc9275d4 100644
--- a/src/mame/drivers/softbox.cpp
+++ b/src/mame/drivers/softbox.cpp
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( softbox_io, AS_IO, 8, softbox_state )
AM_RANGE(0x0c, 0x0c) AM_WRITE(dbrg_w)
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(I8255_0_TAG, i8255_device, read, write)
AM_RANGE(0x14, 0x17) AM_DEVREADWRITE(I8255_1_TAG, i8255_device, read, write)
- AM_RANGE(0x18, 0x18) AM_DEVREADWRITE(CORVUS_HDC_TAG, corvus_hdc_t, read, write)
+ AM_RANGE(0x18, 0x18) AM_DEVREADWRITE(CORVUS_HDC_TAG, corvus_hdc_device, read, write)
ADDRESS_MAP_END
@@ -270,8 +270,8 @@ READ8_MEMBER( softbox_state::ppi1_pc_r )
uint8_t status = m_hdc->status_r(space, 0);
uint8_t data = 0;
- data |= (status & CONTROLLER_BUSY) ? 0 : 0x10;
- data |= (status & CONTROLLER_DIRECTION) ? 0 : 0x20;
+ data |= (status & corvus_hdc_device::CONTROLLER_BUSY) ? 0 : 0x10;
+ data |= (status & corvus_hdc_device::CONTROLLER_DIRECTION) ? 0 : 0x20;
return data;
}
@@ -368,7 +368,7 @@ void softbox_state::ieee488_ifc(int state)
// MACHINE_CONFIG( softbox )
//-------------------------------------------------
-static MACHINE_CONFIG_START( softbox, softbox_state )
+static MACHINE_CONFIG_START( softbox )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(softbox_mem)
@@ -449,5 +449,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1981, softbox, 0, 0, softbox, softbox, driver_device, 0, "Small Systems Engineering", "SoftBox", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, softbox, 0, 0, softbox, softbox, softbox_state, 0, "Small Systems Engineering", "SoftBox", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp
index 4912adeaf3d..4b197f59f5c 100644
--- a/src/mame/drivers/solomon.cpp
+++ b/src/mame/drivers/solomon.cpp
@@ -206,7 +206,7 @@ INTERRUPT_GEN_MEMBER(solomon_state::vblank_irq)
-static MACHINE_CONFIG_START( solomon, solomon_state )
+static MACHINE_CONFIG_START( solomon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4.0 MHz (?????) */
@@ -307,5 +307,5 @@ ROM_END
-GAME( 1986, solomon, 0, solomon, solomon, driver_device, 0, ROT0, "Tecmo", "Solomon's Key (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, solomonj, solomon, solomon, solomon, driver_device, 0, ROT0, "Tecmo", "Solomon no Kagi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, solomon, 0, solomon, solomon, solomon_state, 0, ROT0, "Tecmo", "Solomon's Key (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, solomonj, solomon, solomon, solomon, solomon_state, 0, ROT0, "Tecmo", "Solomon no Kagi (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp
index ee93eaec869..a5aacf161b2 100644
--- a/src/mame/drivers/sonson.cpp
+++ b/src/mame/drivers/sonson.cpp
@@ -241,7 +241,7 @@ void sonson_state::machine_reset()
m_last_irq = 0;
}
-static MACHINE_CONFIG_START( sonson, sonson_state )
+static MACHINE_CONFIG_START( sonson )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_12MHz/8) /* 1.5 MHz */
@@ -349,5 +349,5 @@ ROM_START( sonsonj )
ROM_END
-GAME( 1984, sonson, 0, sonson, sonson, driver_device, 0, ROT0, "Capcom", "Son Son", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sonsonj, sonson, sonson, sonson, driver_device, 0, ROT0, "Capcom", "Son Son (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sonson, 0, sonson, sonson, sonson_state, 0, ROT0, "Capcom", "Son Son", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sonsonj, sonson, sonson, sonson, sonson_state, 0, ROT0, "Capcom", "Son Son (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp
index 7740badf571..125c751ef8d 100644
--- a/src/mame/drivers/sorcerer.cpp
+++ b/src/mame/drivers/sorcerer.cpp
@@ -413,7 +413,7 @@ static DEVICE_INPUT_DEFAULTS_START( terminal )
DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_2 )
DEVICE_INPUT_DEFAULTS_END
-static MACHINE_CONFIG_START( sorcerer, sorcerer_state )
+static MACHINE_CONFIG_START( sorcerer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, ES_CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(sorcerer_mem)
@@ -535,7 +535,7 @@ ROM_START(sorcerer2)
ROMX_LOAD("tvc-2.2e", 0xe800, 0x0800, CRC(bc194487) SHA1(dcfd916558e3e3be22091c5558ea633c332cf6c7), ROM_BIOS(2) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(1979, sorcerer, 0, 0, sorcerer, sorcerer, sorcerer_state, sorcerer, "Exidy Inc", "Sorcerer", 0 )
-COMP(1979, sorcerer2, sorcerer, 0, sorcerer, sorcerer, sorcerer_state, sorcerer, "Exidy Inc", "Sorcerer 2", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+COMP(1979, sorcerer, 0, 0, sorcerer, sorcerer, sorcerer_state, sorcerer, "Exidy Inc", "Sorcerer", 0 )
+COMP(1979, sorcerer2, sorcerer, 0, sorcerer, sorcerer, sorcerer_state, sorcerer, "Exidy Inc", "Sorcerer 2", 0 )
COMP(1979, sorcererd, sorcerer, 0, sorcererd, sorcerer, sorcerer_state, sorcerer, "Exidy Inc", "Sorcerer (with floppy disks)", 0 )
diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp
index d99a27c75a7..244f573efb2 100644
--- a/src/mame/drivers/sothello.cpp
+++ b/src/mame/drivers/sothello.cpp
@@ -340,7 +340,7 @@ void sothello_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( sothello, sothello_state )
+static MACHINE_CONFIG_START( sothello )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, MAINCPU_CLOCK)
@@ -379,7 +379,7 @@ static MACHINE_CONFIG_START( sothello, sothello_state )
MCFG_SOUND_ADD("msm", MSM5205, MSM_CLOCK)
MCFG_MSM5205_VCLK_CB(WRITELINE(sothello_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* changed on the fly */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* changed on the fly */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -403,4 +403,4 @@ ROM_START( sothello )
ROM_LOAD( "6.7f", 0x8000, 0x8000, CRC(ee80fc78) SHA1(9a9d7925847d7a36930f0761c70f67a9affc5e7c) )
ROM_END
-GAME( 1986, sothello, 0, sothello, sothello, driver_device, 0, ROT0, "Success / Fujiwara", "Super Othello", 0 )
+GAME( 1986, sothello, 0, sothello, sothello, sothello_state, 0, ROT0, "Success / Fujiwara", "Super Othello", 0 )
diff --git a/src/mame/drivers/spacefb.cpp b/src/mame/drivers/spacefb.cpp
index 4014143779d..81eb57282c9 100644
--- a/src/mame/drivers/spacefb.cpp
+++ b/src/mame/drivers/spacefb.cpp
@@ -328,7 +328,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( spacefb, spacefb_state )
+static MACHINE_CONFIG_START( spacefb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SPACEFB_MAIN_CPU_CLOCK)
@@ -602,12 +602,12 @@ ROM_END
*
*************************************/
-GAME( 1980, spacefb, 0, spacefb, spacefb, driver_device, 0, ROT270, "Nintendo", "Space Firebird (rev. 04-u)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacefbe, spacefb, spacefb, spacefb, driver_device, 0, ROT270, "Nintendo", "Space Firebird (rev. 03-e set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacefbe2,spacefb, spacefb, spacefb, driver_device, 0, ROT270, "Nintendo", "Space Firebird (rev. 03-e set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacefba, spacefb, spacefb, spacefb, driver_device, 0, ROT270, "Nintendo", "Space Firebird (rev. 02-a)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacefbg, spacefb, spacefb, spacefb, driver_device, 0, ROT270, "Nintendo (Gremlin license)", "Space Firebird (Gremlin)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacebrd, spacefb, spacefb, spacefb, driver_device, 0, ROT270, "bootleg (Karateco)", "Space Bird (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacefbb, spacefb, spacefb, spacefb, driver_device, 0, ROT270, "bootleg", "Space Firebird (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacedem, spacefb, spacefb, spacedem, driver_device, 0, ROT270, "Nintendo (Fortrek license)", "Space Demon", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, starwarr, spacefb, spacefb, spacefb, driver_device, 0, ROT270, "bootleg (Potomac Mortgage)", "Star Warrior", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacefb, 0, spacefb, spacefb, spacefb_state, 0, ROT270, "Nintendo", "Space Firebird (rev. 04-u)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacefbe, spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "Nintendo", "Space Firebird (rev. 03-e set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacefbe2,spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "Nintendo", "Space Firebird (rev. 03-e set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacefba, spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "Nintendo", "Space Firebird (rev. 02-a)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacefbg, spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "Nintendo (Gremlin license)", "Space Firebird (Gremlin)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacebrd, spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "bootleg (Karateco)", "Space Bird (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacefbb, spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "bootleg", "Space Firebird (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacedem, spacefb, spacefb, spacedem, spacefb_state, 0, ROT270, "Nintendo (Fortrek license)", "Space Demon", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, starwarr, spacefb, spacefb, spacefb, spacefb_state, 0, ROT270, "bootleg (Potomac Mortgage)", "Star Warrior", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp
index d3635c9845d..445a5ed2e72 100644
--- a/src/mame/drivers/spaceg.cpp
+++ b/src/mame/drivers/spaceg.cpp
@@ -497,7 +497,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( spaceg, spaceg_state )
+static MACHINE_CONFIG_START( spaceg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,2500000) /* 2.5 MHz */
@@ -577,4 +577,4 @@ ROM_END
*
*************************************/
-GAME( 1979, spaceg, 0, spaceg, spaceg, driver_device, 0, ROT270, "Omori Electric Co., Ltd.", "Space Guerrilla", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, spaceg, 0, spaceg, spaceg, spaceg_state, 0, ROT270, "Omori Electric Co., Ltd.", "Space Guerrilla", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
index 1b81403ad19..ece7235298b 100644
--- a/src/mame/drivers/spartanxtec.cpp
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -356,7 +356,7 @@ PALETTE_INIT_MEMBER(spartanxtec_state, spartanxtec)
-static MACHINE_CONFIG_START( spartanxtec, spartanxtec_state )
+static MACHINE_CONFIG_START( spartanxtec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
@@ -443,4 +443,4 @@ ROM_END
-GAME( 1987, spartanxtec, kungfum, spartanxtec, spartanxtec, driver_device, 0, ROT0, "bootleg (Tecfri)", "Spartan X (Tecfri hardware bootleg)", 0 )
+GAME( 1987, spartanxtec, kungfum, spartanxtec, spartanxtec, spartanxtec_state, 0, ROT0, "bootleg (Tecfri)", "Spartan X (Tecfri hardware bootleg)", 0 )
diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp
index 3f61ac65e6d..cdee5222e70 100644
--- a/src/mame/drivers/spbactn.cpp
+++ b/src/mame/drivers/spbactn.cpp
@@ -405,7 +405,7 @@ static GFXDECODE_START( spbactnp )
GFXDECODE_END
-static MACHINE_CONFIG_START( spbactn, spbactn_state )
+static MACHINE_CONFIG_START( spbactn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
@@ -446,12 +446,12 @@ static MACHINE_CONFIG_START( spbactn, spbactn_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* Was 1.056MHz, a common clock, but no way to generate via on PCB OSCs. clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH) /* Was 1.056MHz, a common clock, but no way to generate via on PCB OSCs. clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spbactnp, spbactn_state )
+static MACHINE_CONFIG_START( spbactnp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
@@ -499,7 +499,7 @@ static MACHINE_CONFIG_START( spbactnp, spbactn_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -597,6 +597,6 @@ ROM_START( spbactnp )
ROM_LOAD( "tcm1.19g.bin", 0x00000, 0x53, CRC(2c54354a) SHA1(11d8b6cdaf052b5a9fbcf6b6fbf99c5f89575cfa) )
ROM_END
-GAME( 1991, spbactn, 0, spbactn, spbactn, driver_device, 0, ROT90, "Tecmo", "Super Pinball Action (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, spbactnj, spbactn, spbactn, spbactn, driver_device, 0, ROT90, "Tecmo", "Super Pinball Action (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, spbactnp, spbactn, spbactnp, spbactn, driver_device, 0, ROT90, "Tecmo", "Super Pinball Action (prototype)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // early proto, (c) date is 2 years earlier!
+GAME( 1991, spbactn, 0, spbactn, spbactn, spbactn_state, 0, ROT90, "Tecmo", "Super Pinball Action (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, spbactnj, spbactn, spbactn, spbactn, spbactn_state, 0, ROT90, "Tecmo", "Super Pinball Action (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, spbactnp, spbactn, spbactnp, spbactn, spbactn_state, 0, ROT90, "Tecmo", "Super Pinball Action (prototype)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // early proto, (c) date is 2 years earlier!
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index 10b26c44c55..07b0246326e 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -458,7 +458,7 @@ extern SLOT_INTERFACE_START(spc1000_exp)
SLOT_INTERFACE("vdp", SPC1000_VDP_EXP)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( spc1000, spc1000_state )
+static MACHINE_CONFIG_START( spc1000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(spc1000_mem)
@@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( spc1000, spc1000_state )
MCFG_MC6847_FSYNC_CALLBACK(WRITELINE(spc1000_state, irq_w))
MCFG_MC6847_INPUT_CALLBACK(READ8(spc1000_state, mc6847_videoram_r))
MCFG_MC6847_CHARROM_CALLBACK(spc1000_state, get_char_rom)
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM2)
+ MCFG_MC6847_FIXED_MODE(mc6847_ntsc_device::MODE_GM2)
// other lines not connected
/* sound hardware */
@@ -520,5 +520,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, spc1000, 0, 0, spc1000, spc1000, driver_device, 0, "Samsung", "SPC-1000", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, spc1000, 0, 0, spc1000, spc1000, spc1000_state, 0, "Samsung", "SPC-1000", 0 )
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index ee3fd20f9e7..5eca88df13a 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -898,7 +898,7 @@ READ8_MEMBER( spc1500_state::porta_r )
return data;
}
-static MACHINE_CONFIG_START( spc1500, spc1500_state )
+static MACHINE_CONFIG_START( spc1500 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(spc1500_mem)
@@ -974,5 +974,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, spc1500, 0, 0, spc1500, spc1500, driver_device, 0, "Samsung", "SPC-1500", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1987, spc1500, 0, 0, spc1500, spc1500, spc1500_state, 0, "Samsung", "SPC-1500", 0 )
diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp
index 35d68821683..ea8343c899d 100644
--- a/src/mame/drivers/spcforce.cpp
+++ b/src/mame/drivers/spcforce.cpp
@@ -274,7 +274,7 @@ INTERRUPT_GEN_MEMBER(spcforce_state::vblank_irq)
device.execute().set_input_line(3, HOLD_LINE);
}
-static MACHINE_CONFIG_START( spcforce, spcforce_state )
+static MACHINE_CONFIG_START( spcforce )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
@@ -425,7 +425,7 @@ ROM_START( meteors )
ROM_END
-GAME( 1980, spcforce, 0, spcforce, spcforce, driver_device, 0, ROT270, "Venture Line", "Space Force (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 19??, spcforc2, spcforce, spcforce, spcforc2, driver_device, 0, ROT270, "bootleg? (Elcon)", "Space Force (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, meteor, spcforce, spcforce, spcforc2, driver_device, 0, ROT270, "Venture Line", "Meteoroids", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 19??, meteors, spcforce, meteors, spcforc2, driver_device, 0, ROT0, "Amusement World", "Meteors", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spcforce, 0, spcforce, spcforce, spcforce_state, 0, ROT270, "Venture Line", "Space Force (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 19??, spcforc2, spcforce, spcforce, spcforc2, spcforce_state, 0, ROT270, "bootleg? (Elcon)", "Space Force (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, meteor, spcforce, spcforce, spcforc2, spcforce_state, 0, ROT270, "Venture Line", "Meteoroids", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 19??, meteors, spcforce, meteors, spcforc2, spcforce_state, 0, ROT0, "Amusement World", "Meteors", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp
index f8583a17e93..df965abe70d 100644
--- a/src/mame/drivers/spdodgeb.cpp
+++ b/src/mame/drivers/spdodgeb.cpp
@@ -409,7 +409,7 @@ void spdodgeb_state::machine_reset()
m_last_dash[0] = m_last_dash[1] = 0;
}
-static MACHINE_CONFIG_START( spdodgeb, spdodgeb_state )
+static MACHINE_CONFIG_START( spdodgeb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/6) /* 2MHz ? */
@@ -441,13 +441,13 @@ static MACHINE_CONFIG_START( spdodgeb, spdodgeb_state )
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(spdodgeb_state, spd_adpcm_int_1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz? */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(spdodgeb_state, spd_adpcm_int_2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8kHz? */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8kHz? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -576,6 +576,6 @@ ROM_END
-GAME( 1987, spdodgeb, 0, spdodgeb, spdodgeb, driver_device, 0, ROT0, "Technos Japan", "Super Dodge Ball (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, nkdodge, spdodgeb, spdodgeb, spdodgeb, driver_device, 0, ROT0, "Technos Japan", "Nekketsu Koukou Dodgeball Bu (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, nkdodgeb, spdodgeb, spdodgeb, spdodgeb, driver_device, 0, ROT0, "bootleg", "Nekketsu Koukou Dodgeball Bu (Japan, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, spdodgeb, 0, spdodgeb, spdodgeb, spdodgeb_state, 0, ROT0, "Technos Japan", "Super Dodge Ball (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, nkdodge, spdodgeb, spdodgeb, spdodgeb, spdodgeb_state, 0, ROT0, "Technos Japan", "Nekketsu Koukou Dodgeball Bu (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, nkdodgeb, spdodgeb, spdodgeb, spdodgeb, spdodgeb_state, 0, ROT0, "bootleg", "Nekketsu Koukou Dodgeball Bu (Japan, bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp
index 9e85d1ba47f..5e5b31fbc2e 100644
--- a/src/mame/drivers/spec128.cpp
+++ b/src/mame/drivers/spec128.cpp
@@ -359,8 +359,8 @@ ROM_START(hc2000)
ROMX_LOAD("hc2000.v2", 0x14000,0x4000, CRC(65d90464) SHA1(5e2096e6460ff2120c8ada97579fdf82c1199c09), ROM_BIOS(2))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1986, spec128, 0, 0, spectrum_128, spec_plus, driver_device, 0, "Sinclair Research Ltd", "ZX Spectrum 128" , 0 )
-COMP( 1986, specpls2, spec128, 0, spectrum_128, spec_plus, driver_device, 0, "Amstrad plc", "ZX Spectrum +2" , 0 )
-COMP( 1991, hc128, spec128, 0, spectrum_128, spec_plus, driver_device, 0, "ICE-Felix", "HC-128" , 0 )
-COMP( 1992, hc2000, spec128, 0, spectrum_128, spec_plus, driver_device, 0, "ICE-Felix", "HC-2000" , MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1986, spec128, 0, 0, spectrum_128, spec_plus, spectrum_state, 0, "Sinclair Research Ltd", "ZX Spectrum 128", 0 )
+COMP( 1986, specpls2, spec128, 0, spectrum_128, spec_plus, spectrum_state, 0, "Amstrad plc", "ZX Spectrum +2", 0 )
+COMP( 1991, hc128, spec128, 0, spectrum_128, spec_plus, spectrum_state, 0, "ICE-Felix", "HC-128", 0 )
+COMP( 1992, hc2000, spec128, 0, spectrum_128, spec_plus, spectrum_state, 0, "ICE-Felix", "HC-2000", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index 1530648d38c..228d2c6c002 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -49,7 +49,7 @@ static ADDRESS_MAP_START( erik_io_map, AS_IO, 8, special_state )
AM_RANGE(0xf1, 0xf1) AM_READWRITE(erik_rr_reg_r, erik_rr_reg_w)
AM_RANGE(0xf2, 0xf2) AM_READWRITE(erik_rc_reg_r, erik_rc_reg_w)
AM_RANGE(0xf3, 0xf3) AM_READWRITE(erik_disk_reg_r, erik_disk_reg_w)
- AM_RANGE(0xf4, 0xf7) AM_DEVREADWRITE("fd1793", fd1793_t, read, write)
+ AM_RANGE(0xf4, 0xf7) AM_DEVREADWRITE("fd1793", fd1793_device, read, write)
ADDRESS_MAP_END
static ADDRESS_MAP_START(specimx_mem, AS_PROGRAM, 8, special_state )
@@ -60,7 +60,7 @@ static ADDRESS_MAP_START(specimx_mem, AS_PROGRAM, 8, special_state )
AM_RANGE( 0xffc0, 0xffdf ) AM_RAMBANK("bank4")
AM_RANGE( 0xffe0, 0xffe3 ) AM_DEVREADWRITE("ppi8255", i8255_device, read, write)
AM_RANGE( 0xffe4, 0xffe7 ) AM_RAM //external 8255
- AM_RANGE( 0xffe8, 0xffeb ) AM_DEVREADWRITE("fd1793", fd1793_t, read, write)
+ AM_RANGE( 0xffe8, 0xffeb ) AM_DEVREADWRITE("fd1793", fd1793_device, read, write)
AM_RANGE( 0xffec, 0xffef ) AM_DEVREADWRITE("pit8253", pit8253_device, read, write)
AM_RANGE( 0xfff0, 0xfff3 ) AM_READWRITE(specimx_disk_ctrl_r, specimx_disk_ctrl_w)
AM_RANGE( 0xfff8, 0xfffb ) AM_READWRITE(specimx_video_color_r,specimx_video_color_w)
@@ -358,7 +358,7 @@ static SLOT_INTERFACE_START( specimx_floppies )
SLOT_INTERFACE_END
/* Machine driver */
-static MACHINE_CONFIG_START( special, special_state )
+static MACHINE_CONFIG_START( special )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(specialist_mem)
@@ -475,7 +475,7 @@ static MACHINE_CONFIG_DERIVED( specimx, special )
MCFG_RAM_DEFAULT_VALUE(0x00)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( erik, special_state )
+static MACHINE_CONFIG_START( erik )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(erik_mem)
@@ -598,11 +598,11 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, special, 0, 0, special, special, special_state, special, "<unknown>", "Specialist", 0 )
-COMP( 1985, specialm, special, 0, specialm, special, special_state, special, "<unknown>", "Specialist M", 0 )
-COMP( 1985, pioner, special, 0, special, special, special_state, special, "<unknown>", "Pioner", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1985, special, 0, 0, special, special, special_state, special, "<unknown>", "Specialist", 0 )
+COMP( 1985, specialm, special, 0, specialm, special, special_state, special, "<unknown>", "Specialist M", 0 )
+COMP( 1985, pioner, special, 0, special, special, special_state, special, "<unknown>", "Pioner", MACHINE_NOT_WORKING )
COMP( 1985, specialp, special, 0, specialp, specialp, special_state, special, "<unknown>", "Specialist + hires graph", MACHINE_NOT_WORKING )
-COMP( 1985, lik, special, 0, special, lik, special_state, special, "<unknown>", "Lik", 0 )
-COMP( 1985, specimx, special, 0, specimx, specimx, driver_device, 0, "<unknown>", "Specialist MX", 0)
-COMP( 1994, erik, special, 0, erik, special, special_state, erik, "<unknown>", "Erik", 0 )
+COMP( 1985, lik, special, 0, special, lik, special_state, special, "<unknown>", "Lik", 0 )
+COMP( 1985, specimx, special, 0, specimx, specimx, special_state, 0, "<unknown>", "Specialist MX", 0 )
+COMP( 1994, erik, special, 0, erik, special, special_state, erik, "<unknown>", "Erik", 0 )
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index 29b3b71963e..7009475ed1a 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -220,7 +220,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( spectra_state::outtimer)
}
-static MACHINE_CONFIG_START( spectra, spectra_state )
+static MACHINE_CONFIG_START( spectra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_3_579545MHz/4) // actually a M6503
MCFG_CPU_PROGRAM_MAP(spectra_map)
@@ -272,4 +272,4 @@ ROM_START(spectra)
ROM_END
-GAME(1979, spectra, 0, spectra, spectra, driver_device, 0, ROT0, "Valley", "Spectra IV", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(1979, spectra, 0, spectra, spectra, spectra_state, 0, ROT0, "Valley", "Spectra IV", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp
index 2f5e8ebc130..e8e6c6255eb 100644
--- a/src/mame/drivers/spectrum.cpp
+++ b/src/mame/drivers/spectrum.cpp
@@ -680,7 +680,7 @@ DEVICE_IMAGE_LOAD_MEMBER(spectrum_state, spectrum_cart)
return image_init_result::PASS;
}
-MACHINE_CONFIG_START( spectrum_common, spectrum_state )
+MACHINE_CONFIG_START( spectrum_common )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, X1 / 4) /* This is verified only for the ZX Spectum. Other clones are reported to have different clocks */
@@ -966,36 +966,36 @@ ROM_START(zvezda)
ROM_LOAD( "2764-far-cpu_blue.bin", 0x2000, 0x2000, CRC(ebab64bc) SHA1(8c98a8b6e927b02cf602c20a1b50838e60f7785b))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1982, spectrum, 0, 0, spectrum, spectrum, spectrum_state, spectrum, "Sinclair Research Ltd", "ZX Spectrum" , 0)
-COMP( 1987, spec80k, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "ZX Spectrum 80K" , MACHINE_UNOFFICIAL)
-COMP( 1995, specide, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "ZX Spectrum IDE" , MACHINE_UNOFFICIAL)
-COMP( 1986, inves, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Investronica", "Inves Spectrum 48K+" , 0)
-COMP( 1985, tk90x, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Micro Digital", "TK 90X Color Computer" , 0)
-COMP( 1986, tk95, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Micro Digital", "TK 95 Color Computer" , 0)
-COMP( 1985, hc85, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ICE-Felix", "HC-85" , 0)
-COMP( 1988, hc88, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ICE-Felix", "HC-88" , MACHINE_NOT_WORKING)
-COMP( 1990, hc90, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ICE-Felix", "HC-90" , 0)
-COMP( 1991, hc91, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "ICE-Felix", "HC-91" , 0)
-COMP( 1988, cobrasp, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ITCI", "Cobra (ITCI)" , MACHINE_NOT_WORKING)
-COMP( 1988, cobra80, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ITCI", "Cobra 80K (ITCI)" , MACHINE_NOT_WORKING)
-COMP( 1987, cip01, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Electronica", "CIP-01" , 0) // keyboard should be spectrum, but image was not clear
-COMP( 1988, cip03, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Electronica", "CIP-03" , 0) // keyboard should be spectrum, but image was not clear
-COMP( 1990, jet, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Electromagnetica", "JET" , 0) // keyboard should be spectrum, but image was not clear
-COMP( 1987, dgama87, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Gama 87" , 0)
-COMP( 1988, dgama88, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Gama 88" , 0)
-COMP( 1989, dgama89, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Gama 89" , 0)
-COMP( 1990, didakt90, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik 90" , 0)
-COMP( 1991, didakm91, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik M 91" , 0)
-COMP( 1992, didakm92, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik M 92" , 0)
-COMP( 1992, didaktk, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Kompakt" , 0)
-COMP( 1993, didakm93, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik M 93" , 0)
-COMP( 1988, mistrum, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Amaterske RADIO", "Mistrum" , 0) // keyboard could be spectrum in some models (since it was a build-yourself design)
-COMP( 1990, blitzs, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Blic" , 0) // no keyboard images found
-COMP( 1990, byte, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Byte" , 0) // no keyboard images found
-COMP( 199?, orizon, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Orizon-Micro" , 0) // no keyboard images found
-COMP( 1993, quorum48, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Kvorum 48K" , MACHINE_NOT_WORKING)
-COMP( 1993, magic6, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Magic 6" , MACHINE_NOT_WORKING) // keyboard should be spectrum, but image was not clear
-COMP( 1990, compani1, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Kompanion 1" , 0) // no keyboard images found
-COMP( 1990, spektrbk, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Spektr BK-001" , 0)
-COMP( 1990, zvezda, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Zvezda" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, spectrum, 0, 0, spectrum, spectrum, spectrum_state, spectrum, "Sinclair Research Ltd", "ZX Spectrum" , 0 )
+COMP( 1987, spec80k, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "ZX Spectrum 80K", MACHINE_UNOFFICIAL )
+COMP( 1995, specide, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "ZX Spectrum IDE", MACHINE_UNOFFICIAL )
+COMP( 1986, inves, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Investronica", "Inves Spectrum 48K+", 0 )
+COMP( 1985, tk90x, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Micro Digital", "TK 90X Color Computer", 0 )
+COMP( 1986, tk95, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Micro Digital", "TK 95 Color Computer", 0 )
+COMP( 1985, hc85, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ICE-Felix", "HC-85", 0 )
+COMP( 1988, hc88, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ICE-Felix", "HC-88", MACHINE_NOT_WORKING )
+COMP( 1990, hc90, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ICE-Felix", "HC-90", 0 )
+COMP( 1991, hc91, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "ICE-Felix", "HC-91", 0 )
+COMP( 1988, cobrasp, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ITCI", "Cobra (ITCI)", MACHINE_NOT_WORKING )
+COMP( 1988, cobra80, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "ITCI", "Cobra 80K (ITCI)", MACHINE_NOT_WORKING )
+COMP( 1987, cip01, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Electronica", "CIP-01", 0 ) // keyboard should be spectrum, but image was not clear
+COMP( 1988, cip03, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Electronica", "CIP-03", 0 ) // keyboard should be spectrum, but image was not clear
+COMP( 1990, jet, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Electromagnetica", "JET", 0 ) // keyboard should be spectrum, but image was not clear
+COMP( 1987, dgama87, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Gama 87", 0 )
+COMP( 1988, dgama88, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Gama 88", 0 )
+COMP( 1989, dgama89, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Gama 89", 0 )
+COMP( 1990, didakt90, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik 90", 0 )
+COMP( 1991, didakm91, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik M 91", 0 )
+COMP( 1992, didakm92, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik M 92", 0 )
+COMP( 1992, didaktk, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik Kompakt", 0 )
+COMP( 1993, didakm93, spectrum, 0, spectrum, spec_plus, spectrum_state, spectrum, "Didaktik Skalica", "Didaktik M 93", 0 )
+COMP( 1988, mistrum, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "Amaterske RADIO", "Mistrum", 0 ) // keyboard could be spectrum in some models (since it was a build-yourself design)
+COMP( 1990, blitzs, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Blic", 0 ) // no keyboard images found
+COMP( 1990, byte, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Byte", 0 ) // no keyboard images found
+COMP( 199?, orizon, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Orizon-Micro", 0 ) // no keyboard images found
+COMP( 1993, quorum48, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Kvorum 48K", MACHINE_NOT_WORKING )
+COMP( 1993, magic6, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Magic 6", MACHINE_NOT_WORKING ) // keyboard should be spectrum, but image was not clear
+COMP( 1990, compani1, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Kompanion 1", 0 ) // no keyboard images found
+COMP( 1990, spektrbk, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Spektr BK-001", 0 )
+COMP( 1990, zvezda, spectrum, 0, spectrum, spectrum, spectrum_state, spectrum, "<unknown>", "Zvezda", 0 )
diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp
index 5e2d0c021a7..a383be07d4b 100644
--- a/src/mame/drivers/speedatk.cpp
+++ b/src/mame/drivers/speedatk.cpp
@@ -304,7 +304,7 @@ WRITE8_MEMBER(speedatk_state::output_w)
logerror("%02x\n",data);
}
-static MACHINE_CONFIG_START( speedatk, speedatk_state )
+static MACHINE_CONFIG_START( speedatk )
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) //divider is unknown
MCFG_CPU_PROGRAM_MAP(speedatk_mem)
@@ -362,4 +362,4 @@ ROM_START( speedatk )
ROM_LOAD( "cb2.bpr", 0x0020, 0x0100, CRC(a604cf96) SHA1(a4ef6e77dcd3abe4c27e8e636222a5ee711a51f5) ) /* lookup table */
ROM_END
-GAME( 1984, speedatk, 0, speedatk, speedatk, driver_device, 0, ROT0, "Seta Kikaku Corp.", "Speed Attack! (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, speedatk, 0, speedatk, speedatk, speedatk_state, 0, ROT0, "Seta Kikaku Corp.", "Speed Attack! (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp
index 6617a853e1a..cc4d2c493ae 100644
--- a/src/mame/drivers/speedbal.cpp
+++ b/src/mame/drivers/speedbal.cpp
@@ -258,7 +258,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( speedbal, speedbal_state )
+static MACHINE_CONFIG_START( speedbal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz) // 4 MHz
diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp
index 99e75c8e18d..2de4f819986 100644
--- a/src/mame/drivers/speedspn.cpp
+++ b/src/mame/drivers/speedspn.cpp
@@ -277,7 +277,7 @@ void speedspn_state::machine_start()
}
-static MACHINE_CONFIG_START( speedspn, speedspn_state )
+static MACHINE_CONFIG_START( speedspn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,6000000) /* 6 MHz */
@@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( speedspn, speedspn_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1122000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1122000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -339,4 +339,4 @@ ROM_END
/*** GAME DRIVERS ************************************************************/
-GAME( 1994, speedspn, 0, speedspn, speedspn, driver_device, 0, ROT180, "TCH", "Speed Spin", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, speedspn, 0, speedspn, speedspn, speedspn_state, 0, ROT180, "TCH", "Speed Spin", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp
index a625bdefa15..2a682f6e8dd 100644
--- a/src/mame/drivers/speglsht.cpp
+++ b/src/mame/drivers/speglsht.cpp
@@ -395,7 +395,7 @@ uint32_t speglsht_state::screen_update_speglsht(screen_device &screen, bitmap_rg
return 0;
}
-static MACHINE_CONFIG_START( speglsht, speglsht_state )
+static MACHINE_CONFIG_START( speglsht )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",ST0016_CPU, 8000000) /* 8 MHz ? */
MCFG_CPU_PROGRAM_MAP(st0016_mem)
diff --git a/src/mame/drivers/spiders.cpp b/src/mame/drivers/spiders.cpp
index 715faac00b3..c25b6eac5b7 100644
--- a/src/mame/drivers/spiders.cpp
+++ b/src/mame/drivers/spiders.cpp
@@ -541,7 +541,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( spiders, spiders_state )
+static MACHINE_CONFIG_START( spiders )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2800000)
@@ -704,7 +704,7 @@ ROM_END
*************************************/
/* this is a newer version with just one bug fix */
-GAME( 1981, spiders, 0, spiders, spiders, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "Spiders (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-GAME( 1981, spiders2, spiders, spiders, spiders, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "Spiders (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-GAME( 1981, spiders3, spiders, spiders, spiders, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "Spiders (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
-GAME( 1981, spinner, spiders, spiders, spiders, driver_device, 0, ROT270, "bootleg", "Spinner", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 1981, spiders, 0, spiders, spiders, spiders_state, 0, ROT270, "Sigma Enterprises Inc.", "Spiders (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 1981, spiders2, spiders, spiders, spiders, spiders_state, 0, ROT270, "Sigma Enterprises Inc.", "Spiders (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 1981, spiders3, spiders, spiders, spiders, spiders_state, 0, ROT270, "Sigma Enterprises Inc.", "Spiders (set 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 1981, spinner, spiders, spiders, spiders, spiders_state, 0, ROT270, "bootleg", "Spinner", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp
index 70962152bea..12c0f863015 100644
--- a/src/mame/drivers/spinb.cpp
+++ b/src/mame/drivers/spinb.cpp
@@ -519,7 +519,7 @@ WRITE8_MEMBER( spinb_state::ppia_c_w )
{
// pc4 - READY line back to cpu board, but not used
if (BIT(data, 5) != BIT(m_portc_a, 5))
- m_msm_a->set_prescaler_selector(*m_msm_a, BIT(data, 5) ? MSM5205_S48_4B : MSM5205_S96_4B); // S1 pin
+ m_msm_a->set_prescaler_selector(*m_msm_a, BIT(data, 5) ? msm5205_device::S48_4B : msm5205_device::S96_4B); // S1 pin
m_msm_a->reset_w(BIT(data, 6));
m_ic5a->clear_w(!BIT(data, 6));
m_portc_a = data & 0xfe;
@@ -529,7 +529,7 @@ WRITE8_MEMBER( spinb_state::ppim_c_w )
{
// pc4 - READY line back to cpu board, but not used
if (BIT(data, 5) != BIT(m_portc_m, 5))
- m_msm_m->set_prescaler_selector(*m_msm_m, BIT(data, 5) ? MSM5205_S48_4B : MSM5205_S96_4B); // S1 pin
+ m_msm_m->set_prescaler_selector(*m_msm_m, BIT(data, 5) ? msm5205_device::S48_4B : msm5205_device::S96_4B); // S1 pin
m_msm_m->reset_w(BIT(data, 6));
m_ic5m->clear_w(!BIT(data, 6));
m_portc_m = data & 0xfe;
@@ -637,7 +637,7 @@ uint32_t spinb_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
return 0;
}
-static MACHINE_CONFIG_START( spinb, spinb_state )
+static MACHINE_CONFIG_START( spinb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz / 2)
MCFG_CPU_PROGRAM_MAP(spinb_map)
@@ -668,12 +668,12 @@ static MACHINE_CONFIG_START( spinb, spinb_state )
MCFG_SPEAKER_STANDARD_MONO("msmavol")
MCFG_SOUND_ADD("msm_a", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(spinb_state, vck_a_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmavol", 1.0)
MCFG_SPEAKER_STANDARD_MONO("msmmvol")
MCFG_SOUND_ADD("msm_m", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(spinb_state, vck_m_w))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "msmmvol", 1.0)
/* Devices */
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp
index 38bd11cecc0..ea15d95ec8d 100644
--- a/src/mame/drivers/splash.cpp
+++ b/src/mame/drivers/splash.cpp
@@ -487,7 +487,7 @@ MACHINE_RESET_MEMBER(splash_state,splash)
m_ret = 0x100;
}
-static MACHINE_CONFIG_START( splash, splash_state )
+static MACHINE_CONFIG_START( splash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz (24/2) */
@@ -524,7 +524,7 @@ static MACHINE_CONFIG_START( splash, splash_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, splash_msm5205_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */ /* Sample rate = 384kHz/48 */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */ /* Sample rate = 384kHz/48 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -542,7 +542,7 @@ INTERRUPT_GEN_MEMBER(splash_state::roldfrog_interrupt)
roldfrog_update_irq();
}
-static MACHINE_CONFIG_START( roldfrog, splash_state )
+static MACHINE_CONFIG_START( roldfrog )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz - verified */
@@ -628,7 +628,7 @@ MACHINE_START_MEMBER(splash_state, funystrp)
save_item(NAME(m_snd_interrupt_enable2));
}
-static MACHINE_CONFIG_START( funystrp, splash_state )
+static MACHINE_CONFIG_START( funystrp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz (24/2) */
@@ -662,12 +662,12 @@ static MACHINE_CONFIG_START( funystrp, splash_state )
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_400kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, adpcm_int1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 1 / 48 */ /* Sample rate = 400kHz/64 */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 1 / 48 */ /* Sample rate = 400kHz/64 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_SOUND_ADD("msm2", MSM5205, XTAL_400kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, adpcm_int2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 1 / 96 */ /* Sample rate = 400kHz/96 */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 1 / 96 */ /* Sample rate = 400kHz/96 */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -1408,13 +1408,13 @@ DRIVER_INIT_MEMBER(splash_state,funystrp)
m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x1fffff, read16_delegate(FUNC(splash_state::funystrp_protection_r),this));
}
-GAME( 1992, splash, 0, splash, splash, splash_state, splash, ROT0, "Gaelco / OMK Software", "Splash! (Ver. 1.2 World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, splash10, splash, splash, splash, splash_state, splash10, ROT0, "Gaelco / OMK Software", "Splash! (Ver. 1.0 World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, paintlad, splash, splash, splash, splash_state, splash, ROT0, "Gaelco / OMK Software", "Painted Lady (Splash) (Ver. 1.3 US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, splash, 0, splash, splash, splash_state, splash, ROT0, "Gaelco / OMK Software", "Splash! (Ver. 1.2 World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, splash10, splash, splash, splash, splash_state, splash10, ROT0, "Gaelco / OMK Software", "Splash! (Ver. 1.0 World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, paintlad, splash, splash, splash, splash_state, splash, ROT0, "Gaelco / OMK Software", "Painted Lady (Splash) (Ver. 1.3 US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, roldfrog, 0, roldfrog, splash, splash_state, roldfrog, ROT0, "Microhard", "The Return of Lady Frog (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, roldfroga,roldfrog, roldfrog, splash, splash_state, roldfrog, ROT0, "Microhard", "The Return of Lady Frog (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, rebus, 0, roldfrog, splash, splash_state, rebus, ROT0, "Microhard", "Rebus", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, roldfrog, 0, roldfrog, splash, splash_state, roldfrog, ROT0, "Microhard", "The Return of Lady Frog (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, roldfroga,roldfrog, roldfrog, splash, splash_state, roldfrog, ROT0, "Microhard", "The Return of Lady Frog (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, rebus, 0, roldfrog, splash, splash_state, rebus, ROT0, "Microhard", "Rebus", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
GAME( 199?, funystrp, 0, funystrp, funystrp, splash_state, funystrp, ROT0, "Microhard / MagicGames", "Funny Strip", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, puckpepl, funystrp, funystrp, funystrp, splash_state, funystrp, ROT0, "Microhard", "Puck People", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, ringball, funystrp, funystrp, funystrp, splash_state, funystrp, ROT0, "Microhard", "Ring & Ball (unknown title)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // Wouldn't surprise me if in-game is actually called King & Bell ...
+GAME( 199?, puckpepl, funystrp, funystrp, funystrp, splash_state, funystrp, ROT0, "Microhard", "Puck People", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 199?, ringball, funystrp, funystrp, funystrp, splash_state, funystrp, ROT0, "Microhard", "Ring & Ball (unknown title)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // Wouldn't surprise me if in-game is actually called King & Bell ...
diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp
index a449d8aca88..1191a8b4882 100644
--- a/src/mame/drivers/splus.cpp
+++ b/src/mame/drivers/splus.cpp
@@ -682,7 +682,7 @@ INPUT_PORTS_END
* Machine Driver *
*************************/
-static MACHINE_CONFIG_START( splus, splus_state ) // basic machine hardware
+static MACHINE_CONFIG_START( splus ) // basic machine hardware
MCFG_CPU_ADD("maincpu", I80C32, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(splus_map)
MCFG_CPU_IO_MAP(splus_iomap)
@@ -726,5 +726,5 @@ ROM_END
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
GAMEL( 1994, spss4240, 0, splus, splus, splus_state, splus, ROT0, "IGT - International Game Technology", "S-Plus (SS4240) Coral Reef", MACHINE_NOT_WORKING, layout_splus )
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index 2597f49176e..1f898e21734 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -589,7 +589,7 @@ void spoker_state::machine_reset()
Machine Drivers
***************************************************************************/
-static MACHINE_CONFIG_START( spoker, spoker_state )
+static MACHINE_CONFIG_START( spoker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 2) /* HD64180RP8, 8 MHz? */
@@ -627,7 +627,7 @@ static MACHINE_CONFIG_START( spoker, spoker_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz / 12, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -965,8 +965,8 @@ GAME( 1996, spk205us, spk306us, spoker, spoker, spoker_state, spkleftover,
GAME( 1996, spk203us, spk306us, spoker, spoker, spoker_state, spkleftover, ROT0, "IGS", "Super Poker (v203US)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
GAME( 1996, spk200ua, spk306us, spoker, spoker, spoker_state, spkleftover, ROT0, "IGS", "Super Poker (v200UA)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
GAME( 1993?, spk116it, spk306us, spoker, spoker, spoker_state, spk116it, ROT0, "IGS", "Super Poker (v116IT)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993?, spk116itmx, spk306us, spoker, spoker, driver_device, 0, ROT0, "IGS", "Super Poker (v116IT-MX)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
+GAME( 1993?, spk116itmx, spk306us, spoker, spoker, spoker_state, 0, ROT0, "IGS", "Super Poker (v116IT-MX)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
GAME( 1993?, spk115it, spk306us, spoker, spoker, spoker_state, spk116it, ROT0, "IGS", "Super Poker (v115IT)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993?, spk114it, spk306us, spoker, spoker, driver_device, 0, ROT0, "IGS", "Super Poker (v114IT)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
+GAME( 1993?, spk114it, spk306us, spoker, spoker, spoker_state, 0, ROT0, "IGS", "Super Poker (v114IT)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
GAME( 1996, spk102ua, spk306us, spoker, spoker, spoker_state, spkleftover, ROT0, "IGS", "Super Poker (v102UA)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // needs proper machine driver
GAME( 1993?, 3super8, 0, 3super8, 3super8, spoker_state, 3super8, ROT0, "<unknown>", "3 Super 8 (Italy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) //roms are badly dumped
diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp
index 56e59cdc589..f666619d9f8 100644
--- a/src/mame/drivers/spool99.cpp
+++ b/src/mame/drivers/spool99.cpp
@@ -355,7 +355,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( spool99, spool99_state )
+static MACHINE_CONFIG_START( spool99 )
MCFG_CPU_ADD("maincpu", Z80, 24000000/8)
MCFG_CPU_PROGRAM_MAP(spool99_map)
@@ -379,7 +379,7 @@ static MACHINE_CONFIG_START( spool99, spool99_state )
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp
index 812703941df..ee4d98adc36 100644
--- a/src/mame/drivers/sprcros2.cpp
+++ b/src/mame/drivers/sprcros2.cpp
@@ -441,7 +441,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(sprcros2_state::master_scanline)
m_master_cpu->set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( sprcros2, sprcros2_state )
+static MACHINE_CONFIG_START( sprcros2 )
/* basic machine hardware */
MCFG_CPU_ADD("master_cpu",Z80,MAIN_CLOCK/4)
@@ -566,5 +566,5 @@ ROM_START( sprcros2a )
ROM_LOAD( "sc-60.4k", 0x0320, 0x0100, CRC(d7a4e57d) SHA1(6db02ec6aa55b05422cb505e63c71e36b4b11b4a) ) //fg clut
ROM_END
-GAME( 1986, sprcros2, 0, sprcros2, sprcros2, driver_device, 0, ROT0, "GM Shoji", "Super Cross II (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, sprcros2a,sprcros2, sprcros2, sprcros2, driver_device, 0, ROT0, "GM Shoji", "Super Cross II (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sprcros2, 0, sprcros2, sprcros2, sprcros2_state, 0, ROT0, "GM Shoji", "Super Cross II (Japan, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, sprcros2a, sprcros2, sprcros2, sprcros2, sprcros2_state, 0, ROT0, "GM Shoji", "Super Cross II (Japan, set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp
index 0c1f21b6b74..1a0fcf15ad0 100644
--- a/src/mame/drivers/sprint2.cpp
+++ b/src/mame/drivers/sprint2.cpp
@@ -529,7 +529,7 @@ static GFXDECODE_START( sprint2 )
GFXDECODE_END
-static MACHINE_CONFIG_START( sprint2, sprint2_state )
+static MACHINE_CONFIG_START( sprint2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz / 16)
diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp
index 86eba1f4882..56fe8c86c7f 100644
--- a/src/mame/drivers/sprint4.cpp
+++ b/src/mame/drivers/sprint4.cpp
@@ -409,7 +409,7 @@ static GFXDECODE_START( sprint4 )
GFXDECODE_END
-static MACHINE_CONFIG_START( sprint4, sprint4_state )
+static MACHINE_CONFIG_START( sprint4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
@@ -481,5 +481,5 @@ ROM_START( sprint4a )
ROM_END
-GAME( 1977, sprint4, 0, sprint4, sprint4, driver_device, 0, ROT180, "Atari", "Sprint 4 (set 1)", MACHINE_SUPPORTS_SAVE ) /* large cars */
-GAME( 1977, sprint4a, sprint4, sprint4, sprint4, driver_device, 0, ROT180, "Atari", "Sprint 4 (set 2)", MACHINE_SUPPORTS_SAVE ) /* small cars */
+GAME( 1977, sprint4, 0, sprint4, sprint4, sprint4_state, 0, ROT180, "Atari", "Sprint 4 (set 1)", MACHINE_SUPPORTS_SAVE ) /* large cars */
+GAME( 1977, sprint4a, sprint4, sprint4, sprint4, sprint4_state, 0, ROT180, "Atari", "Sprint 4 (set 2)", MACHINE_SUPPORTS_SAVE ) /* small cars */
diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp
index dadaeb92c2a..1787e21f7cc 100644
--- a/src/mame/drivers/sprint8.cpp
+++ b/src/mame/drivers/sprint8.cpp
@@ -456,7 +456,7 @@ static GFXDECODE_START( sprint8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( sprint8, sprint8_state )
+static MACHINE_CONFIG_START( sprint8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 11055000 / 11) /* ? */
@@ -532,5 +532,5 @@ ROM_START( sprint8a )
ROM_END
-GAME( 1977, sprint8, 0, sprint8, sprint8, driver_device, 0, ROT0, "Atari", "Sprint 8", MACHINE_SUPPORTS_SAVE )
-GAME( 1977, sprint8a, sprint8, sprint8, sprint8p, driver_device, 0, ROT0, "Atari", "Sprint 8 (play tag & chase)", MACHINE_SUPPORTS_SAVE )
+GAME( 1977, sprint8, 0, sprint8, sprint8, sprint8_state, 0, ROT0, "Atari", "Sprint 8", MACHINE_SUPPORTS_SAVE )
+GAME( 1977, sprint8a, sprint8, sprint8, sprint8p, sprint8_state, 0, ROT0, "Atari", "Sprint 8 (play tag & chase)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp
index 6d0553fd57f..87e27afd992 100644
--- a/src/mame/drivers/spy.cpp
+++ b/src/mame/drivers/spy.cpp
@@ -492,7 +492,7 @@ void spy_state::machine_reset()
m_old_3f90 = -1;
}
-static MACHINE_CONFIG_START( spy, spy_state )
+static MACHINE_CONFIG_START( spy )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 3000000) /* ? */
@@ -608,5 +608,5 @@ ROM_START( spyu )
ROM_END
-GAME( 1989, spy, 0, spy, spy, driver_device, 0, ROT0, "Konami", "S.P.Y. - Special Project Y (World ver. N)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, spyu, spy, spy, spy, driver_device, 0, ROT0, "Konami", "S.P.Y. - Special Project Y (US ver. M)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, spy, 0, spy, spy, spy_state, 0, ROT0, "Konami", "S.P.Y. - Special Project Y (World ver. N)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, spyu, spy, spy, spy, spy_state, 0, ROT0, "Konami", "S.P.Y. - Special Project Y (US ver. M)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index 05c8126f29d..6894c520a2e 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -664,7 +664,7 @@ void spyhuntertec_state::machine_reset()
-static MACHINE_CONFIG_START( spyhuntertec, spyhuntertec_state )
+static MACHINE_CONFIG_START( spyhuntertec )
// note: no ctc, no nvram
// 2*z80, 3*ay8912
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index f3644c61104..5e191bdf386 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -57,6 +57,7 @@
#include "emu.h"
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
@@ -139,7 +140,7 @@ private:
required_device<pia6821_device> m_pia_u75;
required_device<ef9365_device> m_ef9365;
required_device<cpu_device> m_maincpu;
- required_device<wd1770_t> m_fdc;
+ required_device<wd1770_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
floppy_image_device *m_floppy;
@@ -624,7 +625,7 @@ static ADDRESS_MAP_START(squale_mem, AS_PROGRAM, 8, squale_state)
AM_RANGE(0xf048,0xf04b) AM_DEVREADWRITE("pia_u72", pia6821_device, read, write)
AM_RANGE(0xf050,0xf05f) AM_DEVREADWRITE("ef6850", acia6850_device, data_r, data_w)
AM_RANGE(0xf060,0xf06f) AM_DEVREADWRITE("ay8910", ay8910_device, data_r, address_data_w)
- AM_RANGE(0xf080,0xf083) AM_DEVREADWRITE("wd1770", wd1770_t, read, write)
+ AM_RANGE(0xf080,0xf083) AM_DEVREADWRITE("wd1770", wd1770_device, read, write)
AM_RANGE(0xf08a,0xf08a) AM_READWRITE( fdc_sel0_r, fdc_sel0_w )
AM_RANGE(0xf08b,0xf08b) AM_READWRITE( fdc_sel1_r, fdc_sel1_w )
AM_RANGE(0xf100,0xffff) AM_ROMBANK("rom_bank");
@@ -776,7 +777,7 @@ void squale_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( squale, squale_state )
+static MACHINE_CONFIG_START( squale )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809E, CPU_CLOCK) // 12/2015 : Should be set to M6809 but it actually have the wrong clock divisor (1 instead of 4) and working 4 times too fast...
MCFG_CPU_PROGRAM_MAP(squale_mem)
@@ -823,7 +824,7 @@ static MACHINE_CONFIG_START( squale, squale_state )
MCFG_DEVICE_ADD("ef9365", EF9365, VIDEO_CLOCK)
MCFG_EF936X_PALETTE("palette")
MCFG_EF936X_BITPLANES_CNT(4);
- MCFG_EF936X_DISPLAYMODE(EF936X_256x256_DISPLAY_MODE);
+ MCFG_EF936X_DISPLAYMODE(DISPLAY_MODE_256x256);
MCFG_TIMER_DRIVER_ADD_SCANLINE("squale_sl", squale_state, squale_scanline, "screen", 0, 10)
/* Floppy */
@@ -852,5 +853,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, squale, 0, 0, squale, squale,driver_device, 0, "Apollo 7", "Squale", MACHINE_TYPE_COMPUTER )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1984, squale, 0, 0, squale, squale, squale_state, 0, "Apollo 7", "Squale", 0 )
diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp
index 1d7c3027880..05f6230552e 100644
--- a/src/mame/drivers/srmp2.cpp
+++ b/src/mame/drivers/srmp2.cpp
@@ -1133,7 +1133,7 @@ static GFXDECODE_START( srmp3 )
GFXDECODE_END
-static MACHINE_CONFIG_START( srmp2, srmp2_state )
+static MACHINE_CONFIG_START( srmp2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
@@ -1172,12 +1172,12 @@ static MACHINE_CONFIG_START( srmp2, srmp2_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(srmp2_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( srmp3, srmp2_state )
+static MACHINE_CONFIG_START( srmp3 )
/* basic machine hardware */
@@ -1219,7 +1219,7 @@ static MACHINE_CONFIG_START( srmp3, srmp2_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(srmp2_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -1232,7 +1232,7 @@ static MACHINE_CONFIG_DERIVED( rmgoldyh, srmp3 )
MCFG_MACHINE_START_OVERRIDE(srmp2_state,rmgoldyh)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mjyuugi, srmp2_state )
+static MACHINE_CONFIG_START( mjyuugi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,16000000/2) /* 8.00 MHz */
@@ -1271,7 +1271,7 @@ static MACHINE_CONFIG_START( mjyuugi, srmp2_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(srmp2_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -1545,11 +1545,11 @@ ROM_END
-GAME( 1987, srmp1, 0, srmp2, srmp2, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 1 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, srmp2, 0, srmp2, srmp2, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, srmp3, 0, srmp3, srmp3, driver_device, 0, ROT0, "Seta", "Super Real Mahjong Part 3 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, rmgoldyh, srmp3, rmgoldyh, rmgoldyh, driver_device, 0, ROT0, "Seta (Alba license)", "Real Mahjong Gold Yumehai / Super Real Mahjong GOLD part.2 [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mjyuugi, 0, mjyuugi, mjyuugi, driver_device, 0, ROT0, "Visco", "Mahjong Yuugi (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mjyuugia, mjyuugi, mjyuugi, mjyuugi, driver_device, 0, ROT0, "Visco", "Mahjong Yuugi (Japan set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ponchin, 0, mjyuugi, ponchin, driver_device, 0, ROT0, "Visco", "Mahjong Pon Chin Kan (Japan set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ponchina, ponchin, mjyuugi, ponchin, driver_device, 0, ROT0, "Visco", "Mahjong Pon Chin Kan (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, srmp1, 0, srmp2, srmp2, srmp2_state, 0, ROT0, "Seta", "Super Real Mahjong Part 1 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, srmp2, 0, srmp2, srmp2, srmp2_state, 0, ROT0, "Seta", "Super Real Mahjong Part 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, srmp3, 0, srmp3, srmp3, srmp2_state, 0, ROT0, "Seta", "Super Real Mahjong Part 3 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, rmgoldyh, srmp3, rmgoldyh, rmgoldyh, srmp2_state, 0, ROT0, "Seta (Alba license)", "Real Mahjong Gold Yumehai / Super Real Mahjong GOLD part.2 [BET] (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mjyuugi, 0, mjyuugi, mjyuugi, srmp2_state, 0, ROT0, "Visco", "Mahjong Yuugi (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mjyuugia, mjyuugi, mjyuugi, mjyuugi, srmp2_state, 0, ROT0, "Visco", "Mahjong Yuugi (Japan set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ponchin, 0, mjyuugi, ponchin, srmp2_state, 0, ROT0, "Visco", "Mahjong Pon Chin Kan (Japan set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ponchina, ponchin, mjyuugi, ponchin, srmp2_state, 0, ROT0, "Visco", "Mahjong Pon Chin Kan (Japan set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp
index 572da2addbe..8e8c6a5361e 100644
--- a/src/mame/drivers/srmp5.cpp
+++ b/src/mame/drivers/srmp5.cpp
@@ -551,7 +551,7 @@ static GFXDECODE_START( srmp5 )
//GFXDECODE_ENTRY( "gfx1", 0, tile_16x16x8_layout, 0x0, 0x800 )
GFXDECODE_END
-static MACHINE_CONFIG_START( srmp5, srmp5_state )
+static MACHINE_CONFIG_START( srmp5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",ST0016_CPU,8000000)
diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp
index 5add9eef53d..8e4c2ff22df 100644
--- a/src/mame/drivers/srmp6.cpp
+++ b/src/mame/drivers/srmp6.cpp
@@ -676,7 +676,7 @@ INPUT_PORTS_END
Machine driver
***************************************************************************/
-static MACHINE_CONFIG_START( srmp6, srmp6_state )
+static MACHINE_CONFIG_START( srmp6 )
MCFG_CPU_ADD("maincpu", M68000, 16000000)
MCFG_CPU_PROGRAM_MAP(srmp6_map)
@@ -733,4 +733,4 @@ ROM_END
Game driver(s)
***************************************************************************/
-GAME( 1995, srmp6, 0, srmp6, srmp6, driver_device, 0, ROT0, "Seta", "Super Real Mahjong P6 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
+GAME( 1995, srmp6, 0, srmp6, srmp6, srmp6_state, 0, ROT0, "Seta", "Super Real Mahjong P6 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp
index 829f3aa2b6f..b1350b3cfa9 100644
--- a/src/mame/drivers/srumbler.cpp
+++ b/src/mame/drivers/srumbler.cpp
@@ -243,7 +243,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( srumbler, srumbler_state )
+static MACHINE_CONFIG_START( srumbler )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1500000) /* 1.5 MHz (?) */
@@ -472,7 +472,7 @@ ROM_END
-GAME( 1986, srumbler, 0, srumbler, srumbler, driver_device, 0, ROT270, "Capcom", "The Speed Rumbler (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, srumbler2, srumbler, srumbler, srumbler, driver_device, 0, ROT270, "Capcom", "The Speed Rumbler (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, srumbler3, srumbler, srumbler, srumbler, driver_device, 0, ROT270, "Capcom (Tecfri license)", "The Speed Rumbler (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, rushcrsh, srumbler, srumbler, srumbler, driver_device, 0, ROT270, "Capcom", "Rush & Crash (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, srumbler, 0, srumbler, srumbler, srumbler_state, 0, ROT270, "Capcom", "The Speed Rumbler (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, srumbler2, srumbler, srumbler, srumbler, srumbler_state, 0, ROT270, "Capcom", "The Speed Rumbler (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, srumbler3, srumbler, srumbler, srumbler, srumbler_state, 0, ROT270, "Capcom (Tecfri license)", "The Speed Rumbler (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rushcrsh, srumbler, srumbler, srumbler, srumbler_state, 0, ROT270, "Capcom", "Rush & Crash (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp
index 20e684d8493..7f6b1a85351 100644
--- a/src/mame/drivers/ssem.cpp
+++ b/src/mame/drivers/ssem.cpp
@@ -625,7 +625,7 @@ void ssem_state::machine_reset()
m_store_line = 0;
}
-static MACHINE_CONFIG_START( ssem, ssem_state )
+static MACHINE_CONFIG_START( ssem )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SSEMCPU, 700)
MCFG_CPU_PROGRAM_MAP(ssem_map)
@@ -649,5 +649,5 @@ ROM_START( ssem )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(1948, ssem, 0, 0, ssem, ssem, driver_device, 0, "Manchester University", "Small-Scale Experimental Machine (SSEM), 'Baby'", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME
+COMP(1948, ssem, 0, 0, ssem, ssem, ssem_state, 0, "Manchester University", "Small-Scale Experimental Machine (SSEM), 'Baby'", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp
index b611d16a3ad..45d118b3d02 100644
--- a/src/mame/drivers/ssfindo.cpp
+++ b/src/mame/drivers/ssfindo.cpp
@@ -783,7 +783,7 @@ static INPUT_PORTS_START( tetfight )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ssfindo, ssfindo_state )
+static MACHINE_CONFIG_START( ssfindo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7, 54000000) // guess...
@@ -924,6 +924,6 @@ DRIVER_INIT_MEMBER(ssfindo_state,tetfight)
m_iocr_hack=1;
}
-GAME( 1999, ssfindo, 0, ssfindo, ssfindo, ssfindo_state, ssfindo, ROT0, "Icarus", "See See Find Out", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, ppcar, 0, ppcar, ppcar, ssfindo_state, ppcar, ROT0, "Icarus", "Pang Pang Car", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, tetfight,0, tetfight, tetfight, ssfindo_state, tetfight,ROT0, "Sego", "Tetris Fighters", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, ssfindo, 0, ssfindo, ssfindo, ssfindo_state, ssfindo, ROT0, "Icarus", "See See Find Out", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, ppcar, 0, ppcar, ppcar, ssfindo_state, ppcar, ROT0, "Icarus", "Pang Pang Car", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, tetfight,0, tetfight, tetfight, ssfindo_state, tetfight, ROT0, "Sego", "Tetris Fighters", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp
index 012ce5bad91..f6c3c2990d0 100644
--- a/src/mame/drivers/sshangha.cpp
+++ b/src/mame/drivers/sshangha.cpp
@@ -378,7 +378,7 @@ DECO16IC_BANK_CB_MEMBER(sshangha_state::bank_callback)
return (bank >> 4) * 0x1000;
}
-static MACHINE_CONFIG_START( sshangha, sshangha_state )
+static MACHINE_CONFIG_START( sshangha )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 28000000/2)
@@ -434,7 +434,7 @@ static MACHINE_CONFIG_START( sshangha, sshangha_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
- MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.27)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.27)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index 1d8eca3b2da..68c27d8fce9 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -337,7 +337,7 @@ static GFXDECODE_START( supershot )
GFXDECODE_ENTRY( "gfx", 0, supershot_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( supershot, supershot_state )
+static MACHINE_CONFIG_START( supershot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SCMP, XTAL_11_289MHz/4)
@@ -396,5 +396,5 @@ ROM_START( gunchamps )
ROM_END
-GAME( 1979, sshot, 0, supershot, supershot, driver_device, 0, ROT0, "Model Racing", "Super Shot", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAMEL(1980, gunchamps, gunchamp, supershot, supershot, driver_device, 0, ROT0, "Model Racing", "Gun Champ (newer, Super Shot hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING, layout_gunchamps )
+GAME( 1979, sshot, 0, supershot, supershot, supershot_state, 0, ROT0, "Model Racing", "Super Shot", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAMEL(1980, gunchamps, gunchamp, supershot, supershot, supershot_state, 0, ROT0, "Model Racing", "Gun Champ (newer, Super Shot hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING, layout_gunchamps )
diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp
index badf29eccb7..d3c0f7e7e92 100644
--- a/src/mame/drivers/ssingles.cpp
+++ b/src/mame/drivers/ssingles.cpp
@@ -536,7 +536,7 @@ static GFXDECODE_START( atamanot )
GFXDECODE_ENTRY( "kanji_lc", 0, layout_8x16, 0, 8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( ssingles, ssingles_state )
+static MACHINE_CONFIG_START( ssingles )
MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
MCFG_CPU_PROGRAM_MAP(ssingles_map)
diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp
index 6bad5f3dc21..f56ca6f9dec 100644
--- a/src/mame/drivers/sslam.cpp
+++ b/src/mame/drivers/sslam.cpp
@@ -694,7 +694,7 @@ GFXDECODE_END
/* Machine Driver */
-static MACHINE_CONFIG_START( sslam, sslam_state )
+static MACHINE_CONFIG_START( sslam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -722,11 +722,11 @@ static MACHINE_CONFIG_START( sslam, sslam_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( powerbls, sslam_state )
+static MACHINE_CONFIG_START( powerbls )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -756,7 +756,7 @@ static MACHINE_CONFIG_START( powerbls, sslam_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1000000, OKIM6295_PIN7_HIGH) /* verified on original PCB */
+ MCFG_OKIM6295_ADD("oki", 1000000, PIN7_HIGH) /* verified on original PCB */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -936,7 +936,7 @@ DRIVER_INIT_MEMBER(sslam_state,powerbls)
}
-GAME( 1993, sslam, 0, sslam, sslam, sslam_state, sslam, ROT0, "Playmark", "Super Slam (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, sslama, sslam, sslam, sslam, sslam_state, sslam, ROT0, "Playmark", "Super Slam (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, sslamb, sslam, sslam, sslam, sslam_state, sslam, ROT0, "Playmark", "Super Slam (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sslam, 0, sslam, sslam, sslam_state, sslam, ROT0, "Playmark", "Super Slam (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sslama, sslam, sslam, sslam, sslam_state, sslam, ROT0, "Playmark", "Super Slam (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, sslamb, sslam, sslam, sslam, sslam_state, sslam, ROT0, "Playmark", "Super Slam (set 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, powerbals,powerbal, powerbls, powerbls, sslam_state, powerbls, ROT0, "Playmark", "Power Balls (Super Slam conversion)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp
index ce68b106b13..2c7fe9c11c0 100644
--- a/src/mame/drivers/ssozumo.cpp
+++ b/src/mame/drivers/ssozumo.cpp
@@ -197,7 +197,7 @@ INTERRUPT_GEN_MEMBER(ssozumo_state::sound_timer_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( ssozumo, ssozumo_state )
+static MACHINE_CONFIG_START( ssozumo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1200000) /* 1.2 MHz ???? */
@@ -296,4 +296,4 @@ ROM_END
-GAME( 1984, ssozumo, 0, ssozumo, ssozumo, driver_device, 0, ROT270, "Technos Japan", "Syusse Oozumou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, ssozumo, 0, ssozumo, ssozumo, ssozumo_state, 0, ROT270, "Technos Japan", "Syusse Oozumou (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp
index cbda22e932d..ea9be851d59 100644
--- a/src/mame/drivers/sspeedr.cpp
+++ b/src/mame/drivers/sspeedr.cpp
@@ -190,7 +190,7 @@ static GFXDECODE_START( sspeedr )
GFXDECODE_END
-static MACHINE_CONFIG_START( sspeedr, sspeedr_state )
+static MACHINE_CONFIG_START( sspeedr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_19_968MHz/8)
@@ -234,4 +234,4 @@ ROM_START( sspeedr )
ROM_END
-GAMEL( 1979, sspeedr, 0, sspeedr, sspeedr, driver_device, 0, ROT270, "Midway", "Super Speed Race", MACHINE_NO_SOUND, layout_sspeedr )
+GAMEL( 1979, sspeedr, 0, sspeedr, sspeedr, sspeedr_state, 0, ROT270, "Midway", "Super Speed Race", MACHINE_NO_SOUND, layout_sspeedr )
diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp
index be3621b183c..469f2aefb41 100644
--- a/src/mame/drivers/ssrj.cpp
+++ b/src/mame/drivers/ssrj.cpp
@@ -139,7 +139,7 @@ static GFXDECODE_START( ssrj )
GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 0x10 )
GFXDECODE_END
-static MACHINE_CONFIG_START( ssrj, ssrj_state )
+static MACHINE_CONFIG_START( ssrj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2)
@@ -190,4 +190,4 @@ ROM_START( ssrj )
ROM_END
-GAME( 1985, ssrj, 0, ssrj, ssrj, driver_device, 0, ROT90, "Taito Corporation", "Super Speed Race Junior (Japan)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ssrj, 0, ssrj, ssrj, ssrj_state, 0, ROT90, "Taito Corporation", "Super Speed Race Junior (Japan)", MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp
index 97da000c732..fb59e1a8c5a 100644
--- a/src/mame/drivers/sstrangr.cpp
+++ b/src/mame/drivers/sstrangr.cpp
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( sstrangr )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( sstrangr, sstrangr_state )
+static MACHINE_CONFIG_START( sstrangr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080,1996800) /* clock is a guess, taken from mw8080bw */
@@ -289,5 +289,5 @@ ROM_START( sstrangr2 )
ROM_END
-GAMEL( 1978, sstrangr, 0, sstrangr, sstrangr, driver_device, 0, ROT270, "Yachiyo Electronics, Ltd.", "Space Stranger", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_sstrangr )
-GAME( 1979, sstrangr2,sstrangr, sstrngr2, sstrngr2, driver_device, 0, ROT270, "Yachiyo Electronics, Ltd.", "Space Stranger 2", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL( 1978, sstrangr, 0, sstrangr, sstrangr, sstrangr_state, 0, ROT270, "Yachiyo Electronics, Ltd.", "Space Stranger", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_sstrangr )
+GAME( 1979, sstrangr2, sstrangr, sstrngr2, sstrngr2, sstrangr_state, 0, ROT270, "Yachiyo Electronics, Ltd.", "Space Stranger 2", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp
index a05ab4313a6..26a41dcb49f 100644
--- a/src/mame/drivers/ssv.cpp
+++ b/src/mame/drivers/ssv.cpp
@@ -2567,7 +2567,7 @@ DRIVER_INIT_MEMBER(ssv_state,jsk) { init(0); save_item(NAME(m_latche
#define SSV_VBEND 0
#define SSV_VBSTART 0xf0
-static MACHINE_CONFIG_START( ssv, ssv_state )
+static MACHINE_CONFIG_START( ssv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V60, SSV_MASTER_CLOCK) /* Based on STA-0001 & STA-0001B System boards */
diff --git a/src/mame/drivers/ssystem3.cpp b/src/mame/drivers/ssystem3.cpp
index bf793b6a82e..ad655d8bd01 100644
--- a/src/mame/drivers/ssystem3.cpp
+++ b/src/mame/drivers/ssystem3.cpp
@@ -286,7 +286,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( ssystem3, ssystem3_state )
+static MACHINE_CONFIG_START( ssystem3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000)
MCFG_CPU_PROGRAM_MAP(ssystem3_map)
@@ -327,6 +327,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
CONS( 1979, ssystem3, 0, 0, ssystem3, ssystem3, ssystem3_state, ssystem3, "SciSys / Novag", "Chess Champion Super System III", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
//chess champion MK III in germany
diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp
index 5f45b8a23fb..1358ce0ea78 100644
--- a/src/mame/drivers/st17xx.cpp
+++ b/src/mame/drivers/st17xx.cpp
@@ -85,7 +85,7 @@ void st17xx_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( st17xx, st17xx_state )
+static MACHINE_CONFIG_START( st17xx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM7, 50000000) /* speed unknown */
MCFG_CPU_PROGRAM_MAP(cpu_map)
@@ -174,14 +174,14 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-CONS( 200?, st1700h, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1700 (headphone version)", MACHINE_IS_SKELETON )
-CONS( 200?, st1701, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1701", MACHINE_IS_SKELETON )
-CONS( 200?, st1702, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1702", MACHINE_IS_SKELETON )
-CONS( 200?, st1703, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1703", MACHINE_IS_SKELETON )
-CONS( 200?, st1704, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1704", MACHINE_IS_SKELETON )
-CONS( 200?, st1705, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1705", MACHINE_IS_SKELETON )
-CONS( 200?, st1706, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1706", MACHINE_IS_SKELETON )
-CONS( 200?, st1707, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1707", MACHINE_IS_SKELETON )
-CONS( 200?, st1708, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1708", MACHINE_IS_SKELETON )
-CONS( 200?, st1714, 0, 0, st17xx, st17xx, driver_device, 0, "Saturn", "ST-1714", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 200?, st1700h, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1700 (headphone version)", MACHINE_IS_SKELETON )
+CONS( 200?, st1701, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1701", MACHINE_IS_SKELETON )
+CONS( 200?, st1702, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1702", MACHINE_IS_SKELETON )
+CONS( 200?, st1703, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1703", MACHINE_IS_SKELETON )
+CONS( 200?, st1704, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1704", MACHINE_IS_SKELETON )
+CONS( 200?, st1705, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1705", MACHINE_IS_SKELETON )
+CONS( 200?, st1706, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1706", MACHINE_IS_SKELETON )
+CONS( 200?, st1707, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1707", MACHINE_IS_SKELETON )
+CONS( 200?, st1708, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1708", MACHINE_IS_SKELETON )
+CONS( 200?, st1714, 0, 0, st17xx, st17xx, st17xx_state, 0, "Saturn", "ST-1714", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp
index e32d85abb60..751ebe438f3 100644
--- a/src/mame/drivers/st_mp100.cpp
+++ b/src/mame/drivers/st_mp100.cpp
@@ -699,7 +699,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( st_mp100_state::u11_timer )
m_pia_u11->ca1_w(m_u11_timer);
}
-static MACHINE_CONFIG_START( st_mp100, st_mp100_state )
+static MACHINE_CONFIG_START( st_mp100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator
MCFG_CPU_PROGRAM_MAP(st_mp100_map)
@@ -845,19 +845,19 @@ ROM_START(magic)
ROM_END
// chimes
-GAME(1977, pinball, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Pinball", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1977, stingray, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Stingray", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, stars, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Stars", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME(1978, memlane, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Memory Lane", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1977, pinball, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Pinball", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1977, stingray, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Stingray", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, stars, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Stars", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, memlane, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Memory Lane", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
// sound unit B-521
-GAME(1978, lectrono, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Lectronamo", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1978, wildfyre, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Wildfyre", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1978, nugent, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Nugent", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1979, dracula, 0, st_mp100, mp100, driver_device, 0, ROT0, "Stern", "Dracula (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1978, lectrono, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Lectronamo", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1978, wildfyre, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Wildfyre", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1978, nugent, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Nugent", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1979, dracula, 0, st_mp100, mp100, st_mp100_state, 0, ROT0, "Stern", "Dracula (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// different inputs
-GAME(1979, trident, 0, st_mp100, mp200, driver_device, 0, ROT0, "Stern", "Trident", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1979, hothand, 0, st_mp100, mp200, driver_device, 0, ROT0, "Stern", "Hot Hand", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1979, princess, 0, st_mp100, mp200, driver_device, 0, ROT0, "Stern", "Cosmic Princess", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1979, magic, 0, st_mp100, mp200, driver_device, 0, ROT0, "Stern", "Magic", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1979, trident, 0, st_mp100, mp200, st_mp100_state, 0, ROT0, "Stern", "Trident", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1979, hothand, 0, st_mp100, mp200, st_mp100_state, 0, ROT0, "Stern", "Hot Hand", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1979, princess, 0, st_mp100, mp200, st_mp100_state, 0, ROT0, "Stern", "Cosmic Princess", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1979, magic, 0, st_mp100, mp200, st_mp100_state, 0, ROT0, "Stern", "Magic", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index 25955cf0f87..28aa18baab6 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -566,7 +566,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( st_mp200_state::u11_timer )
m_pia_u11->ca1_w(m_u11_timer);
}
-static MACHINE_CONFIG_START( st_mp200, st_mp200_state )
+static MACHINE_CONFIG_START( st_mp200 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 1000000) // no xtal, just 2 chips forming a random oscillator
MCFG_CPU_PROGRAM_MAP(st_mp200_map)
@@ -916,31 +916,31 @@ ROM_START(st_game)
ROM_END
// 6-digit
-GAME(1979, meteorp, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Stern", "Meteor (Stern)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, galaxypi, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Stern", "Galaxy", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, ali, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Stern", "Ali", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1979, meteorp, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Stern", "Meteor (Stern)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, galaxypi, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Stern", "Galaxy", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, ali, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Stern", "Ali", MACHINE_IS_SKELETON_MECHANICAL)
// 7-digit
-GAME(1980, biggame, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Big Game", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, cheetah, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Cheetah", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, quicksil, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Quicksilver", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, seawitch, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Seawitch", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, nineball, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Nine Ball", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, lightnin, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Lightning", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, stargzr, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Stargazer", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, spltsecp, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Split Second (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, catacomp, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Catacomb (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, dragfist, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Dragonfist", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, lazrlord, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Lazer Lord", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, biggame, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Big Game", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, cheetah, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Cheetah", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, quicksil, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Quicksilver", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, seawitch, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Seawitch", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, nineball, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Nine Ball", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, lightnin, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Lightning", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, stargzr, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Stargazer", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, spltsecp, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Split Second (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, catacomp, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Catacomb (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, dragfist, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Dragonfist", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, lazrlord, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Lazer Lord", MACHINE_IS_SKELETON_MECHANICAL)
// hang after boot
-GAME(1980, flight2k, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Flight 2000", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, freefall, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Freefall", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, viperp, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Viper (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, ironmaid, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Iron Maiden", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, orbitor1, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Orbitor 1", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, flight2k, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Flight 2000", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, freefall, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Freefall", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, viperp, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Viper (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, ironmaid, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Stern", "Iron Maiden", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, orbitor1, 0, st_mp201, mp200, st_mp200_state, st_mp201, ROT0, "Stern", "Orbitor 1", MACHINE_IS_SKELETON_MECHANICAL)
// other manufacturer
-GAME(1985, gamatron, flight2k, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Pinstar", "Gamatron", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1978, blkshpsq, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Astro", "Black Sheep Squadron", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(198?, st_game, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "<unknown>", "unknown pinball game", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, gamatron, flight2k, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "Pinstar", "Gamatron", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1978, blkshpsq, 0, st_mp200, mp200, st_mp200_state, st_mp202, ROT0, "Astro", "Black Sheep Squadron", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(198?, st_game, 0, st_mp200, mp200, st_mp200_state, st_mp200, ROT0, "<unknown>", "unknown pinball game", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/stactics.cpp b/src/mame/drivers/stactics.cpp
index 3ca0d344126..3c803159bf4 100644
--- a/src/mame/drivers/stactics.cpp
+++ b/src/mame/drivers/stactics.cpp
@@ -297,7 +297,7 @@ void stactics_state::machine_start()
*
*************************************/
-static MACHINE_CONFIG_START( stactics, stactics_state )
+static MACHINE_CONFIG_START( stactics )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 1933560)
@@ -347,4 +347,4 @@ ROM_END
*
*************************************/
-GAMEL( 1981, stactics, 0, stactics, stactics, driver_device, 0, ORIENTATION_FLIP_X, "Sega", "Space Tactics", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_stactics )
+GAMEL( 1981, stactics, 0, stactics, stactics, stactics_state, 0, ORIENTATION_FLIP_X, "Sega", "Space Tactics", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_stactics )
diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp
index 1a67ea6778a..9a0ad5119e8 100644
--- a/src/mame/drivers/stadhero.cpp
+++ b/src/mame/drivers/stadhero.cpp
@@ -199,7 +199,7 @@ GFXDECODE_END
/******************************************************************************/
-static MACHINE_CONFIG_START( stadhero, stadhero_state )
+static MACHINE_CONFIG_START( stadhero )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
@@ -246,7 +246,7 @@ static MACHINE_CONFIG_START( stadhero, stadhero_state )
MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp
index ec2c9fa09c0..7948b81d008 100644
--- a/src/mame/drivers/starcrus.cpp
+++ b/src/mame/drivers/starcrus.cpp
@@ -134,7 +134,7 @@ static const char *const starcrus_sample_names[] =
};
-static MACHINE_CONFIG_START( starcrus, starcrus_state )
+static MACHINE_CONFIG_START( starcrus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080,9750000/9) /* 8224 chip is a divide by 9 */
@@ -193,4 +193,4 @@ ROM_START( starcrus )
ROM_END
-GAME( 1977, starcrus, 0, starcrus, starcrus, driver_device, 0, ROT0, "Ramtek", "Star Cruiser", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1977, starcrus, 0, starcrus, starcrus, starcrus_state, 0, ROT0, "Ramtek", "Star Cruiser", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp
index 795cf1b859e..51a4c427ddb 100644
--- a/src/mame/drivers/starfire.cpp
+++ b/src/mame/drivers/starfire.cpp
@@ -327,7 +327,7 @@ INTERRUPT_GEN_MEMBER(starfire_state::vblank_int)
}
-static MACHINE_CONFIG_START( fireone, starfire_state )
+static MACHINE_CONFIG_START( fireone )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, STARFIRE_CPU_CLOCK)
diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp
index c7a552be0ce..a377828aa46 100644
--- a/src/mame/drivers/stargame.cpp
+++ b/src/mame/drivers/stargame.cpp
@@ -35,7 +35,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( stargame )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( stargame, stargame_state )
+static MACHINE_CONFIG_START( stargame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 1000000)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
@@ -63,5 +63,5 @@ ROM_START(whtforce)
ROM_END
-GAME( 1986, spcship, 0, stargame, stargame, driver_device, 0, ROT0, "Stargame", "Space Ship (Pinball)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1987, whtforce, 0, stargame, stargame, driver_device, 0, ROT0, "Stargame", "White Force", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1986, spcship, 0, stargame, stargame, stargame_state, 0, ROT0, "Stargame", "Space Ship (Pinball)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1987, whtforce, 0, stargame, stargame, stargame_state, 0, ROT0, "Stargame", "White Force", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp
index 748d81a841d..dbd09fae4e1 100644
--- a/src/mame/drivers/starshp1.cpp
+++ b/src/mame/drivers/starshp1.cpp
@@ -294,7 +294,7 @@ static GFXDECODE_START( starshp1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( starshp1, starshp1_state )
+static MACHINE_CONFIG_START( starshp1 )
/* basic machine hardware */
@@ -394,5 +394,5 @@ ROM_START( starshpp )
ROM_END
-GAME( 1977, starshp1, 0, starshp1, starshp1, driver_device, 0, ORIENTATION_FLIP_X, "Atari", "Starship 1", MACHINE_IMPERFECT_SOUND )
-GAME( 1977, starshpp, starshp1, starshp1, starshp1, driver_device, 0, ORIENTATION_FLIP_X, "Atari", "Starship 1 (prototype?)", MACHINE_IMPERFECT_SOUND )
+GAME( 1977, starshp1, 0, starshp1, starshp1, starshp1_state, 0, ORIENTATION_FLIP_X, "Atari", "Starship 1", MACHINE_IMPERFECT_SOUND )
+GAME( 1977, starshpp, starshp1, starshp1, starshp1, starshp1_state, 0, ORIENTATION_FLIP_X, "Atari", "Starship 1 (prototype?)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index 6b9a0cb0acf..a47be5f4314 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -297,7 +297,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( starwars, starwars_state )
+static MACHINE_CONFIG_START( starwars )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK / 8)
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index 01c42e33525..3c81c9e1ed4 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -570,7 +570,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( statriv2, statriv2_state )
+static MACHINE_CONFIG_START( statriv2 )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
MCFG_CPU_ADD("maincpu", I8085A, MASTER_CLOCK)
@@ -1168,18 +1168,18 @@ DRIVER_INIT_MEMBER(statriv2_state,laserdisc)
*
*************************************/
-GAME( 1981, statusbj, 0, statriv2, statusbj, driver_device, 0, ROT0, "Status Games", "Status Black Jack (V1.0c)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, funcsino, 0, funcsino, funcsino, driver_device, 0, ROT0, "Status Games", "Status Fun Casino (V1.3s)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, tripdraw, 0, statriv2, funcsino, driver_device, 0, ROT0, "Status Games", "Tripple Draw (V3.1 s)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1984, bigcsino, 0, funcsino, funcsino, driver_device, 0, ROT0, "Status Games", "Big Casino", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) //needs correct inputs
-GAME( 1984, hangman, 0, statriv2, hangman, statriv2_state, addr_lmh, ROT0, "Status Games", "Hangman", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, trivquiz, 0, statriv2, statriv2, statriv2_state, addr_lhx, ROT0, "Status Games", "Triv Quiz", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, statriv2, 0, statriv2, statriv2, statriv2_state, addr_xlh, ROT0, "Status Games", "Triv Two", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, statriv2v,statriv2, statriv2v, statriv2, statriv2_state, addr_xlh, ROT90,"Status Games", "Triv Two (Vertical)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, statriv4, 0, statriv2, statriv4, statriv2_state, addr_xhl, ROT0, "Status Games", "Triv Four", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, sextriv, 0, statriv2, sextriv, statriv2_state, addr_lhx, ROT0, "Status Games", "Sex Triv", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, quaquiz2, 0, statriv2, quaquiz2, statriv2_state, addr_lmh, ROT0, "Status Games", "Quadro Quiz II", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1985, supertr, 0, statriv2, supertr2, statriv2_state, addr_lhx, ROT0, "Status Games", "Super Triv Quiz I", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING) // missing questions' ROMs
-GAME( 1986, supertr2, 0, statriv2, supertr2, statriv2_state, addr_lmhe, ROT0, "Status Games", "Super Triv II", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, supertr3, 0, statriv2, supertr2, statriv2_state, addr_lmh, ROT0, "Status Games", "Super Triv III", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, cstripxi, 0, statriv2, funcsino, statriv2_state, laserdisc, ROT0, "Status Games", "Casino Strip XI", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1981, statusbj, 0, statriv2, statusbj, statriv2_state, 0, ROT0, "Status Games", "Status Black Jack (V1.0c)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, funcsino, 0, funcsino, funcsino, statriv2_state, 0, ROT0, "Status Games", "Status Fun Casino (V1.3s)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, tripdraw, 0, statriv2, funcsino, statriv2_state, 0, ROT0, "Status Games", "Tripple Draw (V3.1 s)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1984, bigcsino, 0, funcsino, funcsino, statriv2_state, 0, ROT0, "Status Games", "Big Casino", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) //needs correct inputs
+GAME( 1984, hangman, 0, statriv2, hangman, statriv2_state, addr_lmh, ROT0, "Status Games", "Hangman", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, trivquiz, 0, statriv2, statriv2, statriv2_state, addr_lhx, ROT0, "Status Games", "Triv Quiz", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, statriv2, 0, statriv2, statriv2, statriv2_state, addr_xlh, ROT0, "Status Games", "Triv Two", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, statriv2v, statriv2, statriv2v, statriv2, statriv2_state, addr_xlh, ROT90, "Status Games", "Triv Two (Vertical)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, statriv4, 0, statriv2, statriv4, statriv2_state, addr_xhl, ROT0, "Status Games", "Triv Four", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sextriv, 0, statriv2, sextriv, statriv2_state, addr_lhx, ROT0, "Status Games", "Sex Triv", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, quaquiz2, 0, statriv2, quaquiz2, statriv2_state, addr_lmh, ROT0, "Status Games", "Quadro Quiz II", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1985, supertr, 0, statriv2, supertr2, statriv2_state, addr_lhx, ROT0, "Status Games", "Super Triv Quiz I", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING) // missing questions' ROMs
+GAME( 1986, supertr2, 0, statriv2, supertr2, statriv2_state, addr_lmhe, ROT0, "Status Games", "Super Triv II", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, supertr3, 0, statriv2, supertr2, statriv2_state, addr_lmh, ROT0, "Status Games", "Super Triv III", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, cstripxi, 0, statriv2, funcsino, statriv2_state, laserdisc, ROT0, "Status Games", "Casino Strip XI", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp
index af12d541c47..32c9f704c69 100644
--- a/src/mame/drivers/stellafr.cpp
+++ b/src/mame/drivers/stellafr.cpp
@@ -40,7 +40,7 @@ static INPUT_PORTS_START( stellafr )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( stellafr, stellafr_state )
+static MACHINE_CONFIG_START( stellafr )
MCFG_CPU_ADD("maincpu", M68000, 10000000 ) //?
MCFG_CPU_PROGRAM_MAP(stellafr_map)
MACHINE_CONFIG_END
@@ -60,5 +60,5 @@ ROM_START( st_vulkn )
ROM_END
-GAME(199?, st_ohla, 0, stellafr, stellafr, driver_device, 0, ROT0, "Stella", "Oh La La (Stella)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME(199?, st_vulkn, 0, stellafr, stellafr, driver_device, 0, ROT0, "Stella", "Vulkan (Stella)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(199?, st_ohla, 0, stellafr, stellafr, stellafr_state, 0, ROT0, "Stella", "Oh La La (Stella)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME(199?, st_vulkn, 0, stellafr, stellafr, stellafr_state, 0, ROT0, "Stella", "Vulkan (Stella)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp
index 7882a12f711..9cb5ffbfda8 100644
--- a/src/mame/drivers/stfight.cpp
+++ b/src/mame/drivers/stfight.cpp
@@ -447,7 +447,7 @@ INPUT_PORTS_END
-static MACHINE_CONFIG_START( stfight_base, stfight_state )
+static MACHINE_CONFIG_START( stfight_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz / 4)
@@ -487,7 +487,7 @@ static MACHINE_CONFIG_START( stfight_base, stfight_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(stfight_state, stfight_adpcm_int)) // Interrupt function
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) // 8KHz, 4-bit
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8KHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp
index b95b9627174..25aeacfec6e 100644
--- a/src/mame/drivers/stlforce.cpp
+++ b/src/mame/drivers/stlforce.cpp
@@ -188,7 +188,7 @@ static GFXDECODE_START( stlforce )
GFXDECODE_END
-static MACHINE_CONFIG_START( stlforce, stlforce_state )
+static MACHINE_CONFIG_START( stlforce )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 15000000)
@@ -213,7 +213,7 @@ static MACHINE_CONFIG_START( stlforce, stlforce_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32 , OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32 , PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp
index 89970ff4aff..40c2fcc6a0e 100644
--- a/src/mame/drivers/stratos.cpp
+++ b/src/mame/drivers/stratos.cpp
@@ -342,7 +342,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( stratos )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( stratos, stratos_state )
+static MACHINE_CONFIG_START( stratos )
MCFG_CPU_ADD("maincpu", M65C02, 5670000)
MCFG_CPU_PROGRAM_MAP(stratos_mem)
diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp
index 3e43a9345f7..363115c3c31 100644
--- a/src/mame/drivers/strnskil.cpp
+++ b/src/mame/drivers/strnskil.cpp
@@ -342,7 +342,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(strnskil_state::strnskil_irq)
}
-static MACHINE_CONFIG_START( strnskil, strnskil_state )
+static MACHINE_CONFIG_START( strnskil )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,8000000/2) /* 4.000MHz */
@@ -546,7 +546,7 @@ DRIVER_INIT_MEMBER(strnskil_state,banbam)
m_maincpu->space(AS_PROGRAM).install_write_handler(0xd80d, 0xd80d, write8_delegate(FUNC(strnskil_state::protection_w),this));
}
-GAME( 1984, strnskil, 0, strnskil, strnskil, driver_device, 0, ROT0, "Sun Electronics", "Strength & Skill", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, guiness, strnskil, strnskil, strnskil, driver_device, 0, ROT0, "Sun Electronics", "The Guiness (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, banbam, 0, banbam, banbam, strnskil_state, banbam, ROT0, "Sun Electronics", "BanBam", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, pettanp, banbam, strnskil, banbam, strnskil_state, pettanp, ROT0, "Sun Electronics", "Pettan Pyuu (Japan)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, strnskil, 0, strnskil, strnskil, strnskil_state, 0, ROT0, "Sun Electronics", "Strength & Skill", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, guiness, strnskil, strnskil, strnskil, strnskil_state, 0, ROT0, "Sun Electronics", "The Guiness (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, banbam, 0, banbam, banbam, strnskil_state, banbam, ROT0, "Sun Electronics", "BanBam", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, pettanp, banbam, strnskil, banbam, strnskil_state, pettanp, ROT0, "Sun Electronics", "Pettan Pyuu (Japan)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index 20d4d341bfd..8414b7cd9ad 100644
--- a/src/mame/drivers/studio2.cpp
+++ b/src/mame/drivers/studio2.cpp
@@ -622,7 +622,7 @@ static MACHINE_CONFIG_FRAGMENT( studio2_cartslot )
MCFG_SOFTWARE_LIST_ADD("cart_list", "studio2")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( studio2, studio2_state )
+static MACHINE_CONFIG_START( studio2 )
/* basic machine hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, 1760000) /* the real clock is derived from an oscillator circuit */
MCFG_CPU_PROGRAM_MAP(studio2_map)
@@ -649,7 +649,7 @@ static MACHINE_CONFIG_START( studio2, studio2_state )
MCFG_FRAGMENT_ADD( studio2_cartslot )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( visicom, visicom_state )
+static MACHINE_CONFIG_START( visicom )
/* basic machine hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_579545MHz/2)
MCFG_CPU_PROGRAM_MAP(visicom_map)
@@ -681,7 +681,7 @@ static MACHINE_CONFIG_START( visicom, visicom_state )
MCFG_SOFTWARE_LIST_ADD("cart_list", "visicom")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mpt02, mpt02_state )
+static MACHINE_CONFIG_START( mpt02 )
/* basic machine hardware */
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, CDP1864_CLOCK)
MCFG_CPU_PROGRAM_MAP(mpt02_map)
@@ -745,12 +745,12 @@ ROM_END
/* Game Drivers */
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-CONS( 1977, studio2, 0, 0, studio2, studio2, driver_device, 0, "RCA", "Studio II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-CONS( 1978, visicom, studio2,0, visicom, studio2, driver_device, 0, "Toshiba", "Visicom COM-100 (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-CONS( 1978, mpt02, studio2,0, mpt02, studio2, driver_device, 0, "Soundic", "Victory MPT-02 Home TV Programmer (Austria)", MACHINE_SUPPORTS_SAVE )
-CONS( 1978, mpt02h, studio2,0, mpt02, studio2, driver_device, 0, "Hanimex", "MPT-02 Jeu TV Programmable (France)", MACHINE_SUPPORTS_SAVE )
-CONS( 1978, mtc9016, studio2,0, mpt02, studio2, driver_device, 0, "Mustang", "9016 Telespiel Computer (Germany)", MACHINE_SUPPORTS_SAVE )
-CONS( 1978, shmc1200, studio2,0, mpt02, studio2, driver_device, 0, "Sheen", "M1200 Micro Computer (Australia)", MACHINE_SUPPORTS_SAVE )
-CONS( 1978, cm1200, studio2,0, mpt02, studio2, driver_device, 0, "Conic", "M-1200 (?)", MACHINE_SUPPORTS_SAVE )
-CONS( 1978, apollo80, studio2,0, mpt02, studio2, driver_device, 0, "Academy", "Apollo 80 (Germany)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS( 1977, studio2, 0, 0, studio2, studio2, studio2_state, 0, "RCA", "Studio II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1978, visicom, studio2,0, visicom, studio2, visicom_state, 0, "Toshiba", "Visicom COM-100 (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1978, mpt02, studio2,0, mpt02, studio2, mpt02_state, 0, "Soundic", "Victory MPT-02 Home TV Programmer (Austria)", MACHINE_SUPPORTS_SAVE )
+CONS( 1978, mpt02h, studio2,0, mpt02, studio2, mpt02_state, 0, "Hanimex", "MPT-02 Jeu TV Programmable (France)", MACHINE_SUPPORTS_SAVE )
+CONS( 1978, mtc9016, studio2,0, mpt02, studio2, mpt02_state, 0, "Mustang", "9016 Telespiel Computer (Germany)", MACHINE_SUPPORTS_SAVE )
+CONS( 1978, shmc1200, studio2,0, mpt02, studio2, mpt02_state, 0, "Sheen", "M1200 Micro Computer (Australia)", MACHINE_SUPPORTS_SAVE )
+CONS( 1978, cm1200, studio2,0, mpt02, studio2, mpt02_state, 0, "Conic", "M-1200 (?)", MACHINE_SUPPORTS_SAVE )
+CONS( 1978, apollo80, studio2,0, mpt02, studio2, mpt02_state, 0, "Academy", "Apollo 80 (Germany)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 92e9641004e..0fb15814eb1 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -508,7 +508,7 @@ void stuntair_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( stuntair, stuntair_state )
+static MACHINE_CONFIG_START( stuntair )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* 3 MHz? */
@@ -585,4 +585,4 @@ ROM_START( stuntair )
ROM_END
-GAME( 1983, stuntair, 0, stuntair, stuntair, driver_device, 0, ROT90, "Nuova Videotron", "Stunt Air", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1983, stuntair, 0, stuntair, stuntair, stuntair_state, 0, ROT90, "Nuova Videotron", "Stunt Air", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index 27f7da3bd64..10a036d7aa0 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -976,7 +976,7 @@ static ADDRESS_MAP_START( scudsp_data, AS_DATA, 32, stv_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( stv, stv_state )
+static MACHINE_CONFIG_START( stv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
@@ -3469,125 +3469,125 @@ ROM_END
-GAME( 1996, stvbios, 0, stv_slot, stv, stv_state, stv, ROT0, "Sega", "ST-V Bios", MACHINE_IS_BIOS_ROOT )
+GAME( 1996, stvbios, 0, stv_slot, stv, stv_state, stv, ROT0, "Sega", "ST-V Bios", MACHINE_IS_BIOS_ROOT )
-//GAME YEAR, NAME, PARENT, MACH, INP, INIT, MONITOR
+//GAME YEAR, NAME, PARENT, MACH, INP, STATE, INIT, MONITOR
/* Playable */
-GAME( 1998, astrass, stvbios, stv_5881, stv6b, stv_state, astrass, ROT0, "Sunsoft", "Astra SuperStars (J 980514 V1.002)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, bakubaku, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Baku Baku Animal (J 950407 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, batmanfr, stvbios, batmanfr, stv, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, colmns97, stvbios, stv, stv, stv_state, colmns97, ROT0, "Sega", "Columns '97 (JET 961209 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, cotton2, stvbios, stv, stv, stv_state, cotton2, ROT0, "Success", "Cotton 2 (JUET 970902 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, cottonbm, stvbios, stv, stv, stv_state, cottonbm, ROT0, "Success", "Cotton Boomerang (JUET 980709 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, astrass, stvbios, stv_5881, stv6b, stv_state, astrass, ROT0, "Sunsoft", "Astra SuperStars (J 980514 V1.002)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, bakubaku, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Baku Baku Animal (J 950407 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, batmanfr, stvbios, batmanfr, stv, stv_state, batmanfr, ROT0, "Acclaim", "Batman Forever (JUE 960507 V1.000)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, colmns97, stvbios, stv, stv, stv_state, colmns97, ROT0, "Sega", "Columns '97 (JET 961209 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, cotton2, stvbios, stv, stv, stv_state, cotton2, ROT0, "Success", "Cotton 2 (JUET 970902 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, cottonbm, stvbios, stv, stv, stv_state, cottonbm, ROT0, "Success", "Cotton Boomerang (JUET 980709 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1995, critcrsh, stvbios, stv, critcrsh, stv_state, critcrsh, ROT0, "Sega", "Critter Crusher (EA 951204 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1995, tatacot, critcrsh,stv, critcrsh, stv_state, critcrsh, ROT0, "Sega", "Tatacot (JA 951128 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, danchih, stvbios, stv, stvmp, stv_state, danchih, ROT0, "Altron (Tecmo license)", "Danchi de Hanafuda (J 990607 V1.400)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, danchiq, stvbios, stv, stv, stv_state, danchiq, ROT0, "Altron", "Danchi de Quiz: Okusan Yontaku Desuyo! (J 001128 V1.200)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, diehard, stvbios, stv, stv, stv_state, diehard, ROT0, "Sega", "Die Hard Arcade (UET 960515 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, dnmtdeka, diehard, stv, stv, stv_state, dnmtdeka, ROT0, "Sega", "Dynamite Deka (J 960515 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, ejihon, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Ejihon Tantei Jimusyo (J 950613 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, elandore, stvbios, stv_5881, stv6b, stv_state, elandore, ROT0, "Sai-Mate", "Touryuu Densetsu Elan-Doree / Elan Doree - Legend of Dragoon (JUET 980922 V1.006)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, ffrevng10, ffreveng,stv_5881, stv6b, stv_state, ffreveng, ROT0, "Capcom", "Final Fight Revenge (JUET 990714 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, ffreveng, stvbios, stv_5881, stv6b, stv_state, ffreveng, ROT0, "Capcom", "Final Fight Revenge (JUET 990930 V1.100)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, fhboxers, stvbios, stv, stv, stv_state, fhboxers, ROT0, "Sega", "Funky Head Boxers (JUETBKAL 951218 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, findlove, stvbios, stv, stv, stv_state, stv, ROT0, "Daiki / FCF", "Zenkoku Seifuku Bishoujo Grand Prix Find Love (J 971212 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1994, gaxeduel, stvbios, stv, stv6b, stv_state, gaxeduel, ROT0, "Sega", "Golden Axe - The Duel (JUETL 950117 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS)
-GAME( 1998, grdforce, stvbios, stv, stv, stv_state, grdforce, ROT0, "Success", "Guardian Force (JUET 980318 V0.105)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, groovef, stvbios, stv, stv6b, stv_state, groovef, ROT0, "Atlus", "Groove on Fight - Gouketsuji Ichizoku 3 (J 970416 V1.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, hanagumi, stvbios, stv, stv, stv_state, hanagumi, ROT0, "Sega", "Sakura Taisen - Hanagumi Taisen Columns (J 971007 V1.010)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, introdon, stvbios, stv, stv, stv_state, stv, ROT0, "Sunsoft / Success", "Karaoke Quiz Intro Don Don! (J 960213 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, kiwames, stvbios, stv, stvmp, stv_state, stvmp, ROT0, "Athena", "Pro Mahjong Kiwame S (J 951020 V1.208)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, maruchan, stvbios, stv, stv, stv_state, maruchan, ROT0, "Sega / Toyosuisan", "Maru-Chan de Goo! (J 971216 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, mausuke, stvbios, stv, stv, stv_state, mausuke, ROT0, "Data East", "Mausuke no Ojama the World (J 960314 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, danchih, stvbios, stv, stvmp, stv_state, danchih, ROT0, "Altron (Tecmo license)", "Danchi de Hanafuda (J 990607 V1.400)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, danchiq, stvbios, stv, stv, stv_state, danchiq, ROT0, "Altron", "Danchi de Quiz: Okusan Yontaku Desuyo! (J 001128 V1.200)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, diehard, stvbios, stv, stv, stv_state, diehard, ROT0, "Sega", "Die Hard Arcade (UET 960515 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, dnmtdeka, diehard, stv, stv, stv_state, dnmtdeka, ROT0, "Sega", "Dynamite Deka (J 960515 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, ejihon, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Ejihon Tantei Jimusyo (J 950613 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, elandore, stvbios, stv_5881, stv6b, stv_state, elandore, ROT0, "Sai-Mate", "Touryuu Densetsu Elan-Doree / Elan Doree - Legend of Dragoon (JUET 980922 V1.006)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, ffrevng10, ffreveng,stv_5881, stv6b, stv_state, ffreveng, ROT0, "Capcom", "Final Fight Revenge (JUET 990714 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, ffreveng, stvbios, stv_5881, stv6b, stv_state, ffreveng, ROT0, "Capcom", "Final Fight Revenge (JUET 990930 V1.100)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, fhboxers, stvbios, stv, stv, stv_state, fhboxers, ROT0, "Sega", "Funky Head Boxers (JUETBKAL 951218 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, findlove, stvbios, stv, stv, stv_state, stv, ROT0, "Daiki / FCF", "Zenkoku Seifuku Bishoujo Grand Prix Find Love (J 971212 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1994, gaxeduel, stvbios, stv, stv6b, stv_state, gaxeduel, ROT0, "Sega", "Golden Axe - The Duel (JUETL 950117 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS)
+GAME( 1998, grdforce, stvbios, stv, stv, stv_state, grdforce, ROT0, "Success", "Guardian Force (JUET 980318 V0.105)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, groovef, stvbios, stv, stv6b, stv_state, groovef, ROT0, "Atlus", "Groove on Fight - Gouketsuji Ichizoku 3 (J 970416 V1.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, hanagumi, stvbios, stv, stv, stv_state, hanagumi, ROT0, "Sega", "Sakura Taisen - Hanagumi Taisen Columns (J 971007 V1.010)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, introdon, stvbios, stv, stv, stv_state, stv, ROT0, "Sunsoft / Success", "Karaoke Quiz Intro Don Don! (J 960213 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, kiwames, stvbios, stv, stvmp, stv_state, stvmp, ROT0, "Athena", "Pro Mahjong Kiwame S (J 951020 V1.208)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, maruchan, stvbios, stv, stv, stv_state, maruchan, ROT0, "Sega / Toyosuisan", "Maru-Chan de Goo! (J 971216 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, mausuke, stvbios, stv, stv, stv_state, mausuke, ROT0, "Data East", "Mausuke no Ojama the World (J 960314 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1998, myfairld, stvbios, stv, myfairld, stv_state, stvmp, ROT0, "Micronet", "Virtual Mahjong 2 - My Fair Lady (J 980608 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, othellos, stvbios, stv, stv, stv_state, othellos, ROT0, "Success", "Othello Shiyouyo (J 980423 V1.002)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, patocar, stvbios, stv, patocar, stv_state, stv, ROT0, "Sega", "Hashire Patrol Car (J 990326 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1995, pblbeach, stvbios, stv, stv, stv_state, pblbeach, ROT0, "T&E Soft", "Pebble Beach - The Great Shot (JUE 950913 V0.990)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, prikura, stvbios, stv, stv, stv_state, prikura, ROT0, "Atlus", "Princess Clara Daisakusen (J 960910 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, puyosun, stvbios, stv, stv, stv_state, puyosun, ROT0, "Compile", "Puyo Puyo Sun (J 961115 V0.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, rsgun, stvbios, stv_5881, stv, stv_state, rsgun, ROT0, "Treasure", "Radiant Silvergun (JUET 980523 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sasissu, stvbios, stv, stv, stv_state, sasissu, ROT0, "Sega", "Taisen Tanto-R Sashissu!! (J 980216 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, sanjeon, sasissu, stv, stv, stv_state, sanjeon, ROT0, "Sega / Deniam", "DaeJeon! SanJeon SuJeon (AJTUE 990412 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, seabass, stvbios, stv, stv, stv_state, seabass, ROT0, "A wave inc. (Able license)", "Sea Bass Fishing (JUET 971110 V0.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, shanhigw, stvbios, stv, stv, stv_state, shanhigw, ROT0, "Sunsoft / Activision", "Shanghai - The Great Wall / Shanghai Triple Threat (JUE 950623 V1.005)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, shienryu, stvbios, stv, stv, stv_state, shienryu, ROT270, "Warashi", "Shienryu (JUET 961226 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sss, stvbios, stv_5881, stv, stv_state, sss, ROT0, "Capcom / Cave / Victor", "Steep Slope Sliders (JUET 981110 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, sandor, stvbios, stv, stv, stv_state, sandor, ROT0, "Sega", "Puzzle & Action: Sando-R (J 951114 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, thunt, sandor, stv, stv, stv_state, thunt, ROT0, "Sega", "Puzzle & Action: Treasure Hunt (JUET 970901 V2.00E)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, thuntk, sandor, stv, stv, stv_state, sandor, ROT0, "Sega / Deniam", "Puzzle & Action: BoMulEul Chajara (JUET 970125 V2.00K)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, smleague, stvbios, stv, stv, stv_state, smleague, ROT0, "Sega", "Super Major League (U 960108 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, finlarch, smleague,stv, stv, stv_state, finlarch, ROT0, "Sega", "Final Arch (J 950714 V1.001)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, sokyugrt, stvbios, stv, stv, stv_state, sokyugrt, ROT0, "Raizing / Eighting", "Soukyugurentai / Terra Diver (JUET 960821 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1995, suikoenb, stvbios, stv, stv6b, stv_state, suikoenb, ROT0, "Data East", "Suiko Enbu / Outlaws of the Lost Dynasty (JUETL 950314 V2.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, vfkids, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Virtua Fighter Kids (JUET 960319 V0.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, othellos, stvbios, stv, stv, stv_state, othellos, ROT0, "Success", "Othello Shiyouyo (J 980423 V1.002)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, patocar, stvbios, stv, patocar, stv_state, stv, ROT0, "Sega", "Hashire Patrol Car (J 990326 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1995, pblbeach, stvbios, stv, stv, stv_state, pblbeach, ROT0, "T&E Soft", "Pebble Beach - The Great Shot (JUE 950913 V0.990)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, prikura, stvbios, stv, stv, stv_state, prikura, ROT0, "Atlus", "Princess Clara Daisakusen (J 960910 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, puyosun, stvbios, stv, stv, stv_state, puyosun, ROT0, "Compile", "Puyo Puyo Sun (J 961115 V0.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, rsgun, stvbios, stv_5881, stv, stv_state, rsgun, ROT0, "Treasure", "Radiant Silvergun (JUET 980523 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sasissu, stvbios, stv, stv, stv_state, sasissu, ROT0, "Sega", "Taisen Tanto-R Sashissu!! (J 980216 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, sanjeon, sasissu, stv, stv, stv_state, sanjeon, ROT0, "Sega / Deniam", "DaeJeon! SanJeon SuJeon (AJTUE 990412 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, seabass, stvbios, stv, stv, stv_state, seabass, ROT0, "A wave inc. (Able license)", "Sea Bass Fishing (JUET 971110 V0.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, shanhigw, stvbios, stv, stv, stv_state, shanhigw, ROT0, "Sunsoft / Activision", "Shanghai - The Great Wall / Shanghai Triple Threat (JUE 950623 V1.005)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, shienryu, stvbios, stv, stv, stv_state, shienryu, ROT270, "Warashi", "Shienryu (JUET 961226 V1.000)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sss, stvbios, stv_5881, stv, stv_state, sss, ROT0, "Capcom / Cave / Victor", "Steep Slope Sliders (JUET 981110 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, sandor, stvbios, stv, stv, stv_state, sandor, ROT0, "Sega", "Puzzle & Action: Sando-R (J 951114 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, thunt, sandor, stv, stv, stv_state, thunt, ROT0, "Sega", "Puzzle & Action: Treasure Hunt (JUET 970901 V2.00E)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, thuntk, sandor, stv, stv, stv_state, sandor, ROT0, "Sega / Deniam", "Puzzle & Action: BoMulEul Chajara (JUET 970125 V2.00K)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, smleague, stvbios, stv, stv, stv_state, smleague, ROT0, "Sega", "Super Major League (U 960108 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, finlarch, smleague,stv, stv, stv_state, finlarch, ROT0, "Sega", "Final Arch (J 950714 V1.001)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, sokyugrt, stvbios, stv, stv, stv_state, sokyugrt, ROT0, "Raizing / Eighting", "Soukyugurentai / Terra Diver (JUET 960821 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1995, suikoenb, stvbios, stv, stv6b, stv_state, suikoenb, ROT0, "Data East", "Suiko Enbu / Outlaws of the Lost Dynasty (JUETL 950314 V2.001)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, vfkids, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Virtua Fighter Kids (JUET 960319 V0.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, vmahjong, stvbios, stv, vmahjong, stv_state, stvmp, ROT0, "Micronet", "Virtual Mahjong (J 961214 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, winterht, stvbios, stv, stv, stv_state, winterht, ROT0, "Sega", "Winter Heat (JUET 971012 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, znpwfv, stvbios, stv, stv, stv_state, znpwfv, ROT0, "Sega", "Zen Nippon Pro-Wrestling Featuring Virtua (J 971123 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, znpwfvt, znpwfv, stv, stv, stv_state, znpwfv, ROT0, "Sega", "Zen Nippon Pro-Wrestling Featuring Virtua (T 971123 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, winterht, stvbios, stv, stv, stv_state, winterht, ROT0, "Sega", "Winter Heat (JUET 971012 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, znpwfv, stvbios, stv, stv, stv_state, znpwfv, ROT0, "Sega", "Zen Nippon Pro-Wrestling Featuring Virtua (J 971123 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, znpwfvt, znpwfv, stv, stv, stv_state, znpwfv, ROT0, "Sega", "Zen Nippon Pro-Wrestling Featuring Virtua (T 971123 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
/* Unemulated printer / camera devices */
// USA sets
-GAME( 1997, pclub2, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 (U 970921 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1999, pclub2v3, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 3 (U 990310 V1.000)", MACHINE_NOT_WORKING ) // Hello Kitty themed
-GAME( 1999, pclubpok, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Pokemon B (U 991126 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1997, pclub2, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 (U 970921 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1999, pclub2v3, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 3 (U 990310 V1.000)", MACHINE_NOT_WORKING ) // Hello Kitty themed
+GAME( 1999, pclubpok, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Pokemon B (U 991126 V1.000)", MACHINE_NOT_WORKING )
// Japan sets
-GAME( 1999, pclub2fc, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Felix The Cat (Rev. A) (J 970415 V1.100)", MACHINE_NOT_WORKING )
-GAME( 1998, pclub2pf, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Puffy (Japan)", MACHINE_NOT_WORKING ) // version info is blank
-GAME( 1997, pclub2pe, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Pepsiman (J 970618 V1.100)", MACHINE_NOT_WORKING )
-GAME( 1997, pclub2wb, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Warner Bros (J 970228 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1999, pclub2fc, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Felix The Cat (Rev. A) (J 970415 V1.100)", MACHINE_NOT_WORKING )
+GAME( 1998, pclub2pf, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Puffy (Japan)", MACHINE_NOT_WORKING ) // version info is blank
+GAME( 1997, pclub2pe, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Pepsiman (J 970618 V1.100)", MACHINE_NOT_WORKING )
+GAME( 1997, pclub2wb, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Warner Bros (J 970228 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1997, pclb2elk, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Earth Limited Kobe (Print Club Custom) (J 970808 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1997, pckobe99, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Kobe Luminaire '99 (Print Club Custom 3) (J 991203 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1997, pclb2elk, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Earth Limited Kobe (Print Club Custom) (J 970808 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1997, pckobe99, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Kobe Luminaire '99 (Print Club Custom 3) (J 991203 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1997, pclub26w, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 6 Winter (J 961210 V1.000)", MACHINE_NOT_WORKING ) // internal string is 'PURIKURA2 97FUYU' (but in reality it seems to be an end of 96 Winter version)
-GAME( 1997, pclub26wa, pclub26w,stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 6 Winter (J 970121 V1.200)", MACHINE_NOT_WORKING ) // ^
-GAME( 1997, pclub27s, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 7 Spring (J 970313 V1.100)", MACHINE_NOT_WORKING )
-GAME( 1997, prc28su, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 8 Summer (J 970616 V1.100)", MACHINE_NOT_WORKING ) // internal string 97SUMMER
-GAME( 1997, prc29au, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 9 Autumn (J V1.100)", MACHINE_NOT_WORKING ) // internal string 97AUTUMN, no date code! (all 0)
-GAME( 1997, prc297wi, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '97 Winter Ver (J 971017 V1.100, set 1)", MACHINE_NOT_WORKING ) // internal string is '97WINTER'
-GAME( 1997, prc297wia, prc297wi,stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '97 Winter Ver (J 971017 V1.100, set 2)", MACHINE_NOT_WORKING ) // different program revision, same date code, clearly didn't get updated properly
-GAME( 1998, prc298sp, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Spring Ver (J 971017 V1.100)", MACHINE_NOT_WORKING ) // again, date doesn't appear to have bene updated, this should be early 98
-GAME( 1998, prc298su, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Summer Ver (J 980603 V1.100)", MACHINE_NOT_WORKING ) //
-GAME( 1998, prc298au, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Autumn Ver (J 980827 V1.000)", MACHINE_NOT_WORKING )
-GAME( 2000, prc2ksu, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 2000 Summer (J 000509 V1.000)", MACHINE_NOT_WORKING ) // internal string 2000_SUMMER
+GAME( 1997, pclub26w, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 6 Winter (J 961210 V1.000)", MACHINE_NOT_WORKING ) // internal string is 'PURIKURA2 97FUYU' (but in reality it seems to be an end of 96 Winter version)
+GAME( 1997, pclub26wa, pclub26w,stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 6 Winter (J 970121 V1.200)", MACHINE_NOT_WORKING ) // ^
+GAME( 1997, pclub27s, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 7 Spring (J 970313 V1.100)", MACHINE_NOT_WORKING )
+GAME( 1997, prc28su, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 8 Summer (J 970616 V1.100)", MACHINE_NOT_WORKING ) // internal string 97SUMMER
+GAME( 1997, prc29au, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 Vol. 9 Autumn (J V1.100)", MACHINE_NOT_WORKING ) // internal string 97AUTUMN, no date code! (all 0)
+GAME( 1997, prc297wi, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '97 Winter Ver (J 971017 V1.100, set 1)", MACHINE_NOT_WORKING ) // internal string is '97WINTER'
+GAME( 1997, prc297wia, prc297wi,stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '97 Winter Ver (J 971017 V1.100, set 2)", MACHINE_NOT_WORKING ) // different program revision, same date code, clearly didn't get updated properly
+GAME( 1998, prc298sp, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Spring Ver (J 971017 V1.100)", MACHINE_NOT_WORKING ) // again, date doesn't appear to have bene updated, this should be early 98
+GAME( 1998, prc298su, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Summer Ver (J 980603 V1.100)", MACHINE_NOT_WORKING ) //
+GAME( 1998, prc298au, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 '98 Autumn Ver (J 980827 V1.000)", MACHINE_NOT_WORKING )
+GAME( 2000, prc2ksu, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club 2 2000 Summer (J 000509 V1.000)", MACHINE_NOT_WORKING ) // internal string 2000_SUMMER
-GAME( 1999, pclubor, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Goukakenran (J 991104 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1999, pclubol, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Olive (J 980717 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1997, pclub2kc, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Kome Kome Club (J 970203 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1997, pclubyo2, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Yoshimoto V2 (J 970422 V1.100)", MACHINE_NOT_WORKING )
+GAME( 1999, pclubor, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Goukakenran (J 991104 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1999, pclubol, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Olive (J 980717 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1997, pclub2kc, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Kome Kome Club (J 970203 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1997, pclubyo2, stvbios, stv, stv, stv_state, stv, ROT0, "Atlus", "Print Club Yoshimoto V2 (J 970422 V1.100)", MACHINE_NOT_WORKING )
-GAME( 1997, pclove, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club LoveLove (J 970421 V1.000)", MACHINE_NOT_WORKING ) // uses the same type of protection as decathlete!!
-GAME( 1997, pclove2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club LoveLove Ver 2 (J 970825 V1.000)", MACHINE_NOT_WORKING ) // ^
-GAME( 1997, pcpooh2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club Winnie-the-Pooh Vol. 2 (J 971218 V1.000)", MACHINE_NOT_WORKING ) // ^
-GAME( 1998, pcpooh3, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club Winnie-the-Pooh Vol. 3 (J 980406 V1.000)", MACHINE_NOT_WORKING ) // ^
+GAME( 1997, pclove, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club LoveLove (J 970421 V1.000)", MACHINE_NOT_WORKING ) // uses the same type of protection as decathlete!!
+GAME( 1997, pclove2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club LoveLove Ver 2 (J 970825 V1.000)", MACHINE_NOT_WORKING ) // ^
+GAME( 1997, pcpooh2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club Winnie-the-Pooh Vol. 2 (J 971218 V1.000)", MACHINE_NOT_WORKING ) // ^
+GAME( 1998, pcpooh3, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Atlus", "Print Club Winnie-the-Pooh Vol. 3 (J 980406 V1.000)", MACHINE_NOT_WORKING ) // ^
-GAME( 1998, stress, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Stress Busters (J 981020 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, stress, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Stress Busters (J 981020 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, nameclub, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Name Club (J 960315 V1.000)", MACHINE_NOT_WORKING ) // uses the same type of protection as decathlete!!
-GAME( 1996, nclubv2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Name Club Ver.2 (J 960315 V1.000)", MACHINE_NOT_WORKING ) // ^ (has the same datecode as nameclub, probably incorrect unless both were released today)
-GAME( 1997, nclubv3, stvbios, stv, stv, stv_state, nameclv3, ROT0, "Sega", "Name Club Ver.3 (J 970723 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // no protection
+GAME( 1996, nameclub, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Name Club (J 960315 V1.000)", MACHINE_NOT_WORKING ) // uses the same type of protection as decathlete!!
+GAME( 1996, nclubv2, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Name Club Ver.2 (J 960315 V1.000)", MACHINE_NOT_WORKING ) // ^ (has the same datecode as nameclub, probably incorrect unless both were released today)
+GAME( 1997, nclubv3, stvbios, stv, stv, stv_state, nameclv3, ROT0, "Sega", "Name Club Ver.3 (J 970723 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING ) // no protection
/* Doing something.. but not enough yet */
-GAME( 1995, vfremix, stvbios, stv, stv, stv_state, vfremix, ROT0, "Sega", "Virtua Fighter Remix (JUETBKAL 950428 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1996, decathlt, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Decathlete (JUET 960709 V1.001)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1996, decathlto, decathlt,stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Decathlete (JUET 960424 V1.000)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1998, twcup98, stvbios, stv_5881, stv, stv_state, twcup98, ROT0, "Tecmo", "Tecmo World Cup '98 (JUET 980410 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // some situations with the GK result in the game stalling, maybe CPU core bug??
-GAME( 1998, twsoc98, twcup98, stv_5881, stv, stv_state, twcup98, ROT0, "Tecmo", "Tecmo World Soccer '98 (JUET 980410 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^^ (check)
+GAME( 1995, vfremix, stvbios, stv, stv, stv_state, vfremix, ROT0, "Sega", "Virtua Fighter Remix (JUETBKAL 950428 V1.000)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1996, decathlt, stvbios, stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Decathlete (JUET 960709 V1.001)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1996, decathlto, decathlt,stv_5838, stv, stv_state, decathlt, ROT0, "Sega", "Decathlete (JUET 960424 V1.000)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1998, twcup98, stvbios, stv_5881, stv, stv_state, twcup98, ROT0, "Tecmo", "Tecmo World Cup '98 (JUET 980410 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // some situations with the GK result in the game stalling, maybe CPU core bug??
+GAME( 1998, twsoc98, twcup98, stv_5881, stv, stv_state, twcup98, ROT0, "Tecmo", "Tecmo World Soccer '98 (JUET 980410 V1.000)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^^ (check)
/* Gives I/O errors */
-GAME( 1996, magzun, stvbios, stv, stv, stv_state, magzun, ROT0, "Sega", "Magical Zunou Power (J 961031 V1.000)", MACHINE_NOT_WORKING | MACHINE_NODEVICE_MICROPHONE )
-GAME( 1997, techbowl, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Technical Bowling (J 971212 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1999, micrombc, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Microman Battle Charge (J 990326 V1.000)", MACHINE_NOT_WORKING )
-GAME( 1998, choroqhr, stvbios, stv, stv, stv_state, stv, ROT0, "Sega / Takara", "Choro Q Hyper Racing 5 (J 981230 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1996, magzun, stvbios, stv, stv, stv_state, magzun, ROT0, "Sega", "Magical Zunou Power (J 961031 V1.000)", MACHINE_NOT_WORKING | MACHINE_NODEVICE_MICROPHONE )
+GAME( 1997, techbowl, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Technical Bowling (J 971212 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1999, micrombc, stvbios, stv, stv, stv_state, stv, ROT0, "Sega", "Microman Battle Charge (J 990326 V1.000)", MACHINE_NOT_WORKING )
+GAME( 1998, choroqhr, stvbios, stv, stv, stv_state, stv, ROT0, "Sega / Takara", "Choro Q Hyper Racing 5 (J 981230 V1.000)", MACHINE_NOT_WORKING )
/* CD games */
-GAME( 1995, sfish2, 0, stv, stv, stv_state, stv, ROT0, "Sega", "Sport Fishing 2 (UET 951106 V1.10e)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1995, sfish2j, sfish2, stv, stv, stv_state, stv, ROT0, "Sega", "Sport Fishing 2 (J 951201 V1.100)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1995, sfish2, 0, stv, stv, stv_state, stv, ROT0, "Sega", "Sport Fishing 2 (UET 951106 V1.10e)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1995, sfish2j, sfish2, stv, stv, stv_state, stv, ROT0, "Sega", "Sport Fishing 2 (J 951201 V1.100)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
/*
This is the known list of undumped ST-V games:
diff --git a/src/mame/drivers/su2000.cpp b/src/mame/drivers/su2000.cpp
index 05626c7714d..51501fe3dc7 100644
--- a/src/mame/drivers/su2000.cpp
+++ b/src/mame/drivers/su2000.cpp
@@ -119,7 +119,7 @@ static void ide_interrupt(device_t *device, int state)
*
*************************************/
-static MACHINE_CONFIG_START( su2000, su2000_state )
+static MACHINE_CONFIG_START( su2000 )
/* Basic machine hardware */
MCFG_CPU_ADD("maincpu", I486, I486_CLOCK)
MCFG_CPU_PROGRAM_MAP(pcat_map)
@@ -266,4 +266,4 @@ ROM_START( su2000 )
*
*************************************/
-GAME( 1993, su2000, 0, su2000, pc_keyboard, driver_device, 0, ROT0, "Virtuality", "SU2000", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1993, su2000, 0, su2000, pc_keyboard, su2000_state, 0, ROT0, "Virtuality", "SU2000", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp
index c860afdd287..a43d54e3354 100644
--- a/src/mame/drivers/sub.cpp
+++ b/src/mame/drivers/sub.cpp
@@ -442,7 +442,7 @@ INTERRUPT_GEN_MEMBER(sub_state::sound_irq)
m_soundcpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( sub, sub_state )
+static MACHINE_CONFIG_START( sub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/6) /* ? MHz */
@@ -516,4 +516,4 @@ ROM_START( sub )
ROM_LOAD( "prom pos c8 n82s129", 0x0600, 0x100, CRC(351e1ef8) SHA1(530c9012ff5abda1c4ba9787ca999ca1ae1a893d) )
ROM_END
-GAME( 1985, sub, 0, sub, sub, driver_device, 0, ROT270, "Sigma Enterprises Inc.", "Submarine (Sigma)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sub, 0, sub, sub, sub_state, 0, ROT270, "Sigma Enterprises Inc.", "Submarine (Sigma)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp
index 33b61913da6..b9f6fc711b5 100644
--- a/src/mame/drivers/subhuntr.cpp
+++ b/src/mame/drivers/subhuntr.cpp
@@ -130,7 +130,7 @@ static GFXDECODE_START( subhuntr )
GFXDECODE_END
-static MACHINE_CONFIG_START( subhuntr, subhuntr_state )
+static MACHINE_CONFIG_START( subhuntr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 14318180/4/2)
@@ -179,4 +179,4 @@ ROM_START( subhuntr )
ROM_LOAD( "82S115.2B", 0x0000, 0x0200, CRC(6946c9de) SHA1(956b4bebe6960a73609deb75e1493c4127fd7f77) ) // ASCII, not much else
ROM_END
-GAME(1979, subhuntr, 0, subhuntr, subhuntr, driver_device, 0, ROT0, "Model Racing", "Sub Hunter (Model Racing)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME(1979, subhuntr, 0, subhuntr, subhuntr, subhuntr_state, 0, ROT0, "Model Racing", "Sub Hunter (Model Racing)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp
index 84d1c34425b..76a30841615 100644
--- a/src/mame/drivers/subs.cpp
+++ b/src/mame/drivers/subs.cpp
@@ -180,7 +180,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( subs, subs_state )
+static MACHINE_CONFIG_START( subs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,12096000/16) /* clock input is the "4H" signal */
@@ -256,4 +256,4 @@ ROM_END
*
*************************************/
-GAME( 1977, subs, 0, subs, subs, driver_device, 0, ROT0, "Atari", "Subs", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1977, subs, 0, subs, subs, subs_state, 0, ROT0, "Atari", "Subs", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index cca15d88f5d..54ec51fd806 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -2798,7 +2798,7 @@ GFXDECODE_END
* Machine Drivers *
***************************************************************************/
-static MACHINE_CONFIG_START( victor21, subsino_state )
+static MACHINE_CONFIG_START( victor21 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP(victor21_map)
@@ -2828,7 +2828,7 @@ static MACHINE_CONFIG_START( victor21, subsino_state )
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2841,7 +2841,7 @@ static MACHINE_CONFIG_DERIVED( victor5, victor21 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( crsbingo, subsino_state )
+static MACHINE_CONFIG_START( crsbingo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
MCFG_CPU_PROGRAM_MAP(crsbingo_map)
@@ -2873,7 +2873,7 @@ static MACHINE_CONFIG_START( crsbingo, subsino_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( srider, subsino_state )
+static MACHINE_CONFIG_START( srider )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP(srider_map)
@@ -2903,7 +2903,7 @@ static MACHINE_CONFIG_START( srider, subsino_state )
MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, OKIM6295_PIN7_HIGH) /* Clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_4_433619MHz / 4, PIN7_HIGH) /* Clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2915,7 +2915,7 @@ static MACHINE_CONFIG_DERIVED( sharkpy, srider )
MCFG_CPU_PROGRAM_MAP(sharkpy_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tisub, subsino_state )
+static MACHINE_CONFIG_START( tisub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown CPU and clock */
MCFG_CPU_PROGRAM_MAP(tisub_map)
@@ -2946,7 +2946,7 @@ static MACHINE_CONFIG_START( tisub, subsino_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( stbsub, subsino_state )
+static MACHINE_CONFIG_START( stbsub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP(stbsub_map)
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index d5175798e67..03bd43f6dab 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -2352,7 +2352,7 @@ INPUT_PORTS_END
Bishou Jan
***************************************************************************/
-static MACHINE_CONFIG_START( bishjan, subsino2_state )
+static MACHINE_CONFIG_START( bishjan )
MCFG_CPU_ADD("maincpu", H83044, XTAL_44_1MHz / 3)
MCFG_CPU_PROGRAM_MAP( bishjan_map )
MCFG_CPU_VBLANK_INT_DRIVER("screen", subsino2_state, irq0_line_hold)
@@ -2399,7 +2399,7 @@ MACHINE_CONFIG_END
Magic Train
***************************************************************************/
-static MACHINE_CONFIG_START( mtrain, subsino2_state )
+static MACHINE_CONFIG_START( mtrain )
MCFG_CPU_ADD("maincpu", Z180, XTAL_12MHz / 8) /* Unknown clock */
MCFG_CPU_PROGRAM_MAP( mtrain_map )
MCFG_CPU_IO_MAP( mtrain_io )
@@ -2423,7 +2423,7 @@ static MACHINE_CONFIG_START( mtrain, subsino2_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, OKIM6295_PIN7_HIGH) // probably
+ MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, PIN7_HIGH) // probably
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2431,7 +2431,7 @@ MACHINE_CONFIG_END
Sakura Love - Ying Hua Lian
***************************************************************************/
-static MACHINE_CONFIG_START( saklove, subsino2_state )
+static MACHINE_CONFIG_START( saklove )
MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz*2 ) // !! AMD AM188-EM !!
MCFG_CPU_PROGRAM_MAP( saklove_map )
MCFG_CPU_IO_MAP( saklove_io )
@@ -2455,7 +2455,7 @@ static MACHINE_CONFIG_START( saklove, subsino2_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz / 4) // ? chip and clock unknown
@@ -2466,7 +2466,7 @@ MACHINE_CONFIG_END
X-Plan
***************************************************************************/
-static MACHINE_CONFIG_START( xplan, subsino2_state )
+static MACHINE_CONFIG_START( xplan )
MCFG_CPU_ADD("maincpu", I80188, XTAL_20MHz*2 ) // !! AMD AM188-EM !!
MCFG_CPU_PROGRAM_MAP( xplan_map )
MCFG_CPU_IO_MAP( xplan_io )
@@ -2491,7 +2491,7 @@ static MACHINE_CONFIG_START( xplan, subsino2_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, OKIM6295_PIN7_HIGH) // probably
+ MCFG_OKIM6295_ADD("oki", XTAL_8_4672MHz / 8, PIN7_HIGH) // probably
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp
index 323958899a0..a8dc78e162d 100644
--- a/src/mame/drivers/summit.cpp
+++ b/src/mame/drivers/summit.cpp
@@ -304,7 +304,7 @@ PALETTE_INIT_MEMBER(summit_state, summit)
{
}
-static MACHINE_CONFIG_START( summit, summit_state )
+static MACHINE_CONFIG_START( summit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000)
MCFG_CPU_PROGRAM_MAP(mainmap)
@@ -346,4 +346,4 @@ ROM_START( pushover )
ROM_END
-GAME( 1981, pushover, 0, summit, summit, driver_device, 0, ROT270, "Summit Coin", "Push Over (Summit Coin)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_WRONG_COLORS )
+GAME( 1981, pushover, 0, summit, summit, summit_state, 0, ROT270, "Summit Coin", "Push Over (Summit Coin)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_WRONG_COLORS )
diff --git a/src/mame/drivers/sumt8035.cpp b/src/mame/drivers/sumt8035.cpp
index 457c7dbe006..8702b86a2b5 100644
--- a/src/mame/drivers/sumt8035.cpp
+++ b/src/mame/drivers/sumt8035.cpp
@@ -233,7 +233,7 @@ static INPUT_PORTS_START( summit )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( summit, sumt8035_state )
+static MACHINE_CONFIG_START( summit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8035,5000000)
MCFG_CPU_PROGRAM_MAP(sumt_map)
@@ -255,5 +255,5 @@ ROM_START( sm_ultng )
ROM_END
-GAME( 1981, sm_ngacc, 0, summit, summit, driver_device, 0, ROT270, "Summit Coin", "Nudge Accumulator (Summit Coin)", MACHINE_IS_SKELETON_MECHANICAL )
-GAME( 1981, sm_ultng, 0, summit, summit, driver_device, 0, ROT270, "Summit Coin", "Ultimate Nudge (Summit Coin)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1981, sm_ngacc, 0, summit, summit, sumt8035_state, 0, ROT270, "Summit Coin", "Nudge Accumulator (Summit Coin)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1981, sm_ultng, 0, summit, summit, sumt8035_state, 0, ROT270, "Summit Coin", "Ultimate Nudge (Summit Coin)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/sun1.cpp b/src/mame/drivers/sun1.cpp
index be74d757311..48f89b79425 100644
--- a/src/mame/drivers/sun1.cpp
+++ b/src/mame/drivers/sun1.cpp
@@ -67,12 +67,15 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ16_MEMBER(sun1_upd7201_r);
DECLARE_WRITE16_MEMBER(sun1_upd7201_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
+protected:
virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
required_shared_ptr<uint16_t> m_p_ram;
uint8_t m_term_data;
};
@@ -124,19 +127,19 @@ void sun1_state::machine_reset()
}
-WRITE8_MEMBER( sun1_state::kbd_put )
+void sun1_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( sun1, sun1_state )
+static MACHINE_CONFIG_START( sun1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(sun1_mem)
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(sun1_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(sun1_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -166,5 +169,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, sun1, 0, 0, sun1, sun1, driver_device, 0, "Sun Microsystems", "Sun-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, sun1, 0, 0, sun1, sun1, sun1_state, 0, "Sun Microsystems", "Sun-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp
index a179a218c46..c2381f35b2a 100644
--- a/src/mame/drivers/sun2.cpp
+++ b/src/mame/drivers/sun2.cpp
@@ -582,7 +582,7 @@ void sun2_state::machine_reset()
m_maincpu->reset();
}
-static MACHINE_CONFIG_START( sun2vme, sun2_state )
+static MACHINE_CONFIG_START( sun2vme )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, 16670000)
MCFG_CPU_PROGRAM_MAP(sun2_mem)
@@ -642,7 +642,7 @@ static MACHINE_CONFIG_START( sun2vme, sun2_state )
MCFG_RS232_CTS_HANDLER(DEVWRITELINE(SCC2_TAG, z80scc_device, ctsb_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sun2mbus, sun2_state )
+static MACHINE_CONFIG_START( sun2mbus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, 16670000)
MCFG_CPU_PROGRAM_MAP(sun2_mem)
@@ -722,6 +722,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, sun2_50, 0, 0, sun2vme, sun2, driver_device, 0, "Sun Microsystems", "Sun 2/50", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1984, sun2_120, 0, 0, sun2mbus, sun2, driver_device, 0, "Sun Microsystems", "Sun 2/120", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, sun2_50, 0, 0, sun2vme, sun2, driver_device, 0, "Sun Microsystems", "Sun 2/50", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1984, sun2_120, 0, 0, sun2mbus, sun2, driver_device, 0, "Sun Microsystems", "Sun 2/120", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index 5257353a07f..ad3dd8a922a 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -950,7 +950,7 @@ void sun3_state::machine_reset()
}
// The base Sun 3004 CPU board
-static MACHINE_CONFIG_START( sun3, sun3_state )
+static MACHINE_CONFIG_START( sun3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68020, 16670000)
MCFG_CPU_PROGRAM_MAP(sun3_mem)
@@ -1053,7 +1053,7 @@ static MACHINE_CONFIG_DERIVED( sun3200, sun3 )
MCFG_RAM_EXTRA_OPTIONS("64M,96M,128M")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sun3_50, sun3_state )
+static MACHINE_CONFIG_START( sun3_50 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68020, 15700000)
MCFG_CPU_PROGRAM_MAP(sun3_mem)
@@ -1257,10 +1257,10 @@ ROM_START( sun3_e )
ROM_LOAD( "sun3-e-idprom.bin", 0x000000, 0x000020, CRC(d1a92116) SHA1(4836f3188f2c3dd5ba49ab66e0b55caa6b1b1791) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, sun3_50, 0, 0, sun3_50, sun3, driver_device, 0, "Sun Microsystems", "Sun 3/50", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Model 25
-COMP( 1988, sun3_60, 0, 0, sun3_60, sun3, driver_device, 0, "Sun Microsystems", "Sun 3/60", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Ferrari
-COMP( 198?, sun3_110, 0, 0, sun3, sun3, driver_device, 0, "Sun Microsystems", "Sun 3/110", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Prism
-COMP( 1985, sun3_150, 0, 0, sun3, sun3, driver_device, 0, "Sun Microsystems", "Sun 3/75/140/150/160/180", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // AKA Carrera
-COMP( 198?, sun3_260, 0, 0, sun3200, sun3, driver_device, 0, "Sun Microsystems", "Sun 3/260/280", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Prism
-COMP( 198?, sun3_e, 0, 0, sun3e, sun3, driver_device, 0, "Sun Microsystems", "Sun 3/E", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Polaris
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, sun3_50, 0, 0, sun3_50, sun3, sun3_state, 0, "Sun Microsystems", "Sun 3/50", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Model 25
+COMP( 1988, sun3_60, 0, 0, sun3_60, sun3, sun3_state, 0, "Sun Microsystems", "Sun 3/60", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Ferrari
+COMP( 198?, sun3_110, 0, 0, sun3, sun3, sun3_state, 0, "Sun Microsystems", "Sun 3/110", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Prism
+COMP( 1985, sun3_150, 0, 0, sun3, sun3, sun3_state, 0, "Sun Microsystems", "Sun 3/75/140/150/160/180", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // AKA Carrera
+COMP( 198?, sun3_260, 0, 0, sun3200, sun3, sun3_state, 0, "Sun Microsystems", "Sun 3/260/280", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Prism
+COMP( 198?, sun3_e, 0, 0, sun3e, sun3, sun3_state, 0, "Sun Microsystems", "Sun 3/E", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Polaris
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 79125a1fffa..74a5ff4cb8e 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -574,7 +574,7 @@ static SLOT_INTERFACE_START( sun_floppies )
SLOT_INTERFACE( "35hd", FLOPPY_35_HD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( sun3_80, sun3x_state )
+static MACHINE_CONFIG_START( sun3_80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68030, 20000000)
MCFG_CPU_PROGRAM_MAP(sun3_80_mem)
@@ -621,7 +621,7 @@ static MACHINE_CONFIG_START( sun3_80, sun3x_state )
MCFG_SCREEN_REFRESH_RATE(72)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sun3_460, sun3x_state )
+static MACHINE_CONFIG_START( sun3_460 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68030, 33000000)
MCFG_CPU_PROGRAM_MAP(sun3_460_mem)
@@ -690,6 +690,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, sun3_80, 0, 0, sun3_80, sun3x, driver_device, 0, "Sun Microsystems", "Sun 3/80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Hydra
-COMP( 198?, sun3_460, 0, 0, sun3_460, sun3x, driver_device, 0, "Sun Microsystems", "Sun 3/460/470/480", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) // Pegasus
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, sun3_80, 0, 0, sun3_80, sun3x, sun3x_state, 0, "Sun Microsystems", "Sun 3/80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Hydra
+COMP( 198?, sun3_460, 0, 0, sun3_460, sun3x, sun3x_state, 0, "Sun Microsystems", "Sun 3/460/470/480", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Pegasus
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index 2d560440fbd..d45eeabde98 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -1890,7 +1890,7 @@ static MACHINE_CONFIG_FRAGMENT( ncr5390 )
MCFG_NCR5390_DRQ_HANDLER(DEVWRITELINE(":", sun4_state, scsi_drq))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sun4, sun4_state )
+static MACHINE_CONFIG_START( sun4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MB86901, 16670000)
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4_mem)
@@ -1955,7 +1955,7 @@ static MACHINE_CONFIG_START( sun4, sun4_state )
MCFG_DEVICE_CARD_MACHINE_CONFIG("ncr5390", ncr5390)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sun4c, sun4_state )
+static MACHINE_CONFIG_START( sun4c )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MB86901, 16670000)
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4c_mem)
@@ -2296,20 +2296,20 @@ DRIVER_INIT_MEMBER(sun4_state, ss2)
/* Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
// sun4
-COMP( 198?, sun4_110, 0, 0, sun4, sun4, sun4_state, sun4, "Sun Microsystems", "Sun 4/110", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1987, sun4_300, 0, 0, sun4, sun4, sun4_state, sun4, "Sun Microsystems", "Sun 4/3x0", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 198?, sun4_400, 0, 0, sun4, sun4, sun4_state, sun4, "Sun Microsystems", "Sun 4/4x0", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 198?, sun4_110, 0, 0, sun4, sun4, sun4_state, sun4, "Sun Microsystems", "Sun 4/110", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1987, sun4_300, 0, 0, sun4, sun4, sun4_state, sun4, "Sun Microsystems", "Sun 4/3x0", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 198?, sun4_400, 0, 0, sun4, sun4, sun4_state, sun4, "Sun Microsystems", "Sun 4/4x0", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// sun4c
-COMP( 1990, sun4_40, sun4_300,0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation IPC (Sun 4/40)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1991, sun4_50, sun4_300,0, sun4c, sun4, sun4_state, ss2, "Sun Microsystems", "SPARCstation IPX (Sun 4/50)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 199?, sun4_20, sun4_300,0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation SLC (Sun 4/20)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1989, sun4_60, sun4_300,0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 1 (Sun 4/60)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, sun4_65, sun4_300,0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 1+ (Sun 4/65)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1990, sun4_75, sun4_300,0, sun4c, sun4, sun4_state, ss2, "Sun Microsystems", "SPARCstation 2 (Sun 4/75)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1990, sun4_40, sun4_300, 0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation IPC (Sun 4/40)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1991, sun4_50, sun4_300, 0, sun4c, sun4, sun4_state, ss2, "Sun Microsystems", "SPARCstation IPX (Sun 4/50)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 199?, sun4_20, sun4_300, 0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation SLC (Sun 4/20)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1989, sun4_60, sun4_300, 0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 1 (Sun 4/60)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, sun4_65, sun4_300, 0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 1+ (Sun 4/65)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1990, sun4_75, sun4_300, 0, sun4c, sun4, sun4_state, ss2, "Sun Microsystems", "SPARCstation 2 (Sun 4/75)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
// sun4m (using the SPARC "reference MMU", probably will go to a separate driver)
-COMP( 1992, sun_s10, sun4_300,0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 10 (Sun S10)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1994, sun_s20, sun4_300,0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1992, sun_s10, sun4_300, 0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 10 (Sun S10)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1994, sun_s20, sun4_300, 0, sun4c, sun4, sun4_state, sun4c, "Sun Microsystems", "SPARCstation 20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp
index b264d29e3fe..b56c1fbd24d 100644
--- a/src/mame/drivers/suna16.cpp
+++ b/src/mame/drivers/suna16.cpp
@@ -796,7 +796,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(suna16_state::bssoccer_interrupt)
m_maincpu->set_input_line(2, HOLD_LINE); // does RAM to sprite buffer copy here
}
-static MACHINE_CONFIG_START( bssoccer, suna16_state )
+static MACHINE_CONFIG_START( bssoccer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */
@@ -859,7 +859,7 @@ MACHINE_CONFIG_END
Ultra Balloon
***************************************************************************/
-static MACHINE_CONFIG_START( uballoon, suna16_state )
+static MACHINE_CONFIG_START( uballoon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/4) /* 8MHz */
@@ -914,7 +914,7 @@ MACHINE_CONFIG_END
Suna Quiz 6000 Academy
***************************************************************************/
-static MACHINE_CONFIG_START( sunaq, suna16_state )
+static MACHINE_CONFIG_START( sunaq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
@@ -975,7 +975,7 @@ WRITE8_MEMBER(suna16_state::bestbest_ay8910_port_a_w)
// ?
}
-static MACHINE_CONFIG_START( bestbest, suna16_state )
+static MACHINE_CONFIG_START( bestbest )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/4) /* 6MHz */
@@ -1366,8 +1366,8 @@ ROM_END
***************************************************************************/
-GAME( 1994, bestbest, 0, bestbest, bestbest, driver_device, 0, ROT0, "SunA", "Best Of Best", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, sunaq, 0, sunaq, sunaq, driver_device, 0, ROT0, "SunA", "SunA Quiz 6000 Academy (940620-6)", MACHINE_SUPPORTS_SAVE ) // Date/Version on-screen is 940620-6, but in the program rom it's 1994,6,30 K.H.T V6.00
-GAME( 1996, bssoccer, 0, bssoccer, bssoccer, driver_device, 0, ROT0, "SunA (Unico license)", "Back Street Soccer (KRB-0031 PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, bssoccera, bssoccer, bssoccer, bssoccer, driver_device, 0, ROT0, "SunA (Unico license)", "Back Street Soccer (KRB-0032A PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, uballoon, 0, uballoon, uballoon, driver_device, 0, ROT0, "SunA (Unico license)", "Ultra Balloon", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, bestbest, 0, bestbest, bestbest, suna16_state, 0, ROT0, "SunA", "Best Of Best", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, sunaq, 0, sunaq, sunaq, suna16_state, 0, ROT0, "SunA", "SunA Quiz 6000 Academy (940620-6)", MACHINE_SUPPORTS_SAVE ) // Date/Version on-screen is 940620-6, but in the program rom it's 1994,6,30 K.H.T V6.00
+GAME( 1996, bssoccer, 0, bssoccer, bssoccer, suna16_state, 0, ROT0, "SunA (Unico license)", "Back Street Soccer (KRB-0031 PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bssoccera, bssoccer, bssoccer, bssoccer, suna16_state, 0, ROT0, "SunA (Unico license)", "Back Street Soccer (KRB-0032A PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, uballoon, 0, uballoon, uballoon, suna16_state, 0, ROT0, "SunA (Unico license)", "Ultra Balloon", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index 0e315115ea6..ca3165638b1 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -1867,7 +1867,7 @@ GFXDECODE_END
/* 1 x 24 MHz crystal */
-static MACHINE_CONFIG_START( hardhead, suna8_state )
+static MACHINE_CONFIG_START( hardhead )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* verified on pcb */
@@ -1925,7 +1925,7 @@ MACHINE_CONFIG_END
/* 1 x 24 MHz crystal */
/* 2203 + 8910 */
-static MACHINE_CONFIG_START( rranger, suna8_state )
+static MACHINE_CONFIG_START( rranger )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
@@ -1993,7 +1993,7 @@ MACHINE_RESET_MEMBER(suna8_state,brickzn)
m_bank1d->set_entry(0);
}
-static MACHINE_CONFIG_START( brickzn11, suna8_state )
+static MACHINE_CONFIG_START( brickzn11 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* SUNA PROTECTION BLOCK */
@@ -2106,7 +2106,7 @@ MACHINE_CONFIG_END
Star Fighter
***************************************************************************/
-static MACHINE_CONFIG_START( starfigh, suna8_state )
+static MACHINE_CONFIG_START( starfigh )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
@@ -2161,7 +2161,7 @@ MACHINE_CONFIG_END
Spark Man
***************************************************************************/
-static MACHINE_CONFIG_START( sparkman, suna8_state )
+static MACHINE_CONFIG_START( sparkman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, SUNA8_MASTER_CLOCK / 4) /* ? */
@@ -3065,7 +3065,7 @@ GAME( 1989, sparkmana, sparkman, sparkman, sparkman, suna8_state, sparkman, ROT
GAME( 1990, starfigh, 0, starfigh, starfigh, suna8_state, starfigh, ROT90, "SunA", "Star Fighter (v1)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1991, hardhea2, 0, hardhea2, hardhea2, suna8_state, hardhea2, ROT0, "SunA", "Hard Head 2 (v2.0)", 0 )
-GAME( 1991, hardhea2b, hardhea2, hardhea2b,hardhea2, suna8_state, hardhea2b, ROT0, "bootleg", "Hard Head 2 (v2.0, bootleg)", MACHINE_NOT_WORKING )
+GAME( 1991, hardhea2b, hardhea2, hardhea2b,hardhea2, suna8_state, hardhea2b, ROT0, "bootleg", "Hard Head 2 (v2.0, bootleg)", MACHINE_NOT_WORKING )
GAME( 1992, brickzn, 0, brickzn, brickznv6,suna8_state, brickzn, ROT90, "SunA", "Brick Zone (v6.0, Joystick)", 0 )
GAME( 1992, brickznv5, brickzn, brickzn, brickzn, suna8_state, brickznv5, ROT90, "SunA", "Brick Zone (v5.0, Joystick)", 0 )
diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp
index 7ccf5109050..fbb6122bd89 100644
--- a/src/mame/drivers/supbtime.cpp
+++ b/src/mame/drivers/supbtime.cpp
@@ -316,7 +316,7 @@ void supbtime_state::machine_start()
{
}
-static MACHINE_CONFIG_START( supbtime, supbtime_state )
+static MACHINE_CONFIG_START( supbtime )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -368,12 +368,12 @@ static MACHINE_CONFIG_START( supbtime, supbtime_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( chinatwn, supbtime_state )
+static MACHINE_CONFIG_START( chinatwn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -424,7 +424,7 @@ static MACHINE_CONFIG_START( chinatwn, supbtime_state )
MCFG_SOUND_ROUTE(0, "mono", 0.45)
MCFG_SOUND_ROUTE(1, "mono", 0.45)
- MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -509,7 +509,7 @@ ROM_END
/******************************************************************************/
-GAME( 1990, supbtime, 0, supbtime, supbtime, driver_device, 0, ROT0, "Data East Corporation", "Super Burger Time (World, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, supbtimea,supbtime, supbtime, supbtime, driver_device, 0, ROT0, "Data East Corporation", "Super Burger Time (World, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, supbtimej,supbtime, supbtime, supbtime, driver_device, 0, ROT0, "Data East Corporation", "Super Burger Time (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, chinatwn, 0, chinatwn, chinatwn, driver_device, 0, ROT0, "Data East Corporation", "China Town (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, supbtime, 0, supbtime, supbtime, supbtime_state, 0, ROT0, "Data East Corporation", "Super Burger Time (World, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, supbtimea,supbtime, supbtime, supbtime, supbtime_state, 0, ROT0, "Data East Corporation", "Super Burger Time (World, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, supbtimej,supbtime, supbtime, supbtime, supbtime_state, 0, ROT0, "Data East Corporation", "Super Burger Time (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, chinatwn, 0, chinatwn, chinatwn, supbtime_state, 0, ROT0, "Data East Corporation", "China Town (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp
index 26e37acb32a..a1ae624f62a 100644
--- a/src/mame/drivers/supdrapo.cpp
+++ b/src/mame/drivers/supdrapo.cpp
@@ -449,7 +449,7 @@ WRITE8_MEMBER(supdrapo_state::ay8910_outputb_w)
Machine Driver
**********************************************************************/
-static MACHINE_CONFIG_START( supdrapo, supdrapo_state )
+static MACHINE_CONFIG_START( supdrapo )
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */
MCFG_CPU_PROGRAM_MAP(sdpoker_mem)
@@ -610,7 +610,7 @@ ROM_END
Games Drivers
**********************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
-GAME( 1983, supdrapo, 0, supdrapo, supdrapo, driver_device, 0, ROT90, "Valadon Automation (Stern Electronics license)", "Super Draw Poker (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, supdrapoa, supdrapo, supdrapo, supdrapo, driver_device, 0, ROT90, "Valadon Automation / Jeutel", "Super Draw Poker (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, supdrapob, supdrapo, supdrapo, supdrapo, driver_device, 0, ROT90, "bootleg", "Super Draw Poker (bootleg)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1983, supdrapo, 0, supdrapo, supdrapo, supdrapo_state, 0, ROT90, "Valadon Automation (Stern Electronics license)", "Super Draw Poker (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, supdrapoa, supdrapo, supdrapo, supdrapo, supdrapo_state, 0, ROT90, "Valadon Automation / Jeutel", "Super Draw Poker (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, supdrapob, supdrapo, supdrapo, supdrapo, supdrapo_state, 0, ROT90, "bootleg", "Super Draw Poker (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index 6dd7f5bb1fd..1a762169f40 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -433,7 +433,7 @@ void supduck_state::machine_reset()
}
-static MACHINE_CONFIG_START( supduck, supduck_state )
+static MACHINE_CONFIG_START( supduck )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz) /* Verified on PCB */
@@ -467,7 +467,7 @@ static MACHINE_CONFIG_START( supduck, supduck_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", XTAL_8MHz/8, OKIM6295_PIN7_HIGH) // 1MHz - Verified on PCB, pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_8MHz/8, PIN7_HIGH) // 1MHz - Verified on PCB, pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
@@ -517,4 +517,4 @@ ROM_START( supduck )
ROM_LOAD( "1.su13", 0x00000, 0x80000, CRC(7fb1ed42) SHA1(77ec86a6454398e329066aa060e9b6a39085ce71) ) // banked sample data
ROM_END
-GAME( 1992, supduck, 0, supduck, supduck, driver_device, 0, ROT0, "Comad", "Super Duck", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, supduck, 0, supduck, supduck, supduck_state, 0, ROT0, "Comad", "Super Duck", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp
index 9359722cb3b..d3112637a0a 100644
--- a/src/mame/drivers/super6.cpp
+++ b/src/mame/drivers/super6.cpp
@@ -289,7 +289,7 @@ static ADDRESS_MAP_START( super6_io, AS_IO, 8, super6_state )
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(Z80DART_TAG, z80dart_device, ba_cd_r, ba_cd_w)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(Z80PIO_TAG, z80pio_device, read, write)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write)
- AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(WD2793_TAG, wd2793_t, read, write)
+ AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE(WD2793_TAG, wd2793_device, read, write)
AM_RANGE(0x10, 0x10) AM_MIRROR(0x03) AM_DEVREADWRITE(Z80DMA_TAG, z80dma_device, read, write)
AM_RANGE(0x14, 0x14) AM_READWRITE(fdc_r, fdc_w)
AM_RANGE(0x15, 0x15) AM_READ_PORT("J7") AM_WRITE(s100_w)
@@ -486,7 +486,7 @@ void super6_state::machine_reset()
// MACHINE_CONFIG( super6 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( super6, super6_state )
+static MACHINE_CONFIG_START( super6 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_24MHz/4)
MCFG_CPU_PROGRAM_MAP(super6_mem)
@@ -574,5 +574,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, super6, 0, 0, super6, super6, driver_device, 0, "Advanced Digital Corporation", "Super Six", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, super6, 0, 0, super6, super6, super6_state, 0, "Advanced Digital Corporation", "Super Six", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index 6f1705aabdb..5195bf9b5a7 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -297,7 +297,7 @@ static ADDRESS_MAP_START( super80r_io, AS_IO, 8, super80_state )
AM_RANGE(0x11, 0x11) AM_DEVREAD("crtc", mc6845_device, register_r)
AM_RANGE(0x11, 0x11) AM_WRITE(super80v_11_w)
AM_RANGE(0x30, 0x30) AM_DEVREADWRITE("dma", z80dma_device, read, write)
- AM_RANGE(0x38, 0x3b) AM_DEVREADWRITE("fdc", wd2793_t, read, write)
+ AM_RANGE(0x38, 0x3b) AM_DEVREADWRITE("fdc", wd2793_device, read, write)
AM_RANGE(0x3e, 0x3e) AM_READ(port3e_r)
AM_RANGE(0x3f, 0x3f) AM_WRITE(port3f_w)
AM_RANGE(0xdc, 0xdc) AM_DEVREAD("cent_status_in", input_buffer_device, read)
@@ -692,7 +692,7 @@ static const char *const relay_sample_names[] =
};
-static MACHINE_CONFIG_START( super80, super80_state )
+static MACHINE_CONFIG_START( super80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(super80_map)
@@ -778,7 +778,7 @@ static MACHINE_CONFIG_DERIVED( super80m, super80 )
MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(super80_state, screen_vblank_super80m))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( super80v, super80_state )
+static MACHINE_CONFIG_START( super80v )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/6) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(super80v_map)
diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp
index 436646a5880..4eceea60799 100644
--- a/src/mame/drivers/superchs.cpp
+++ b/src/mame/drivers/superchs.cpp
@@ -304,7 +304,7 @@ GFXDECODE_END
MACHINE DRIVERS
***********************************************************/
-static MACHINE_CONFIG_START( superchs, superchs_state )
+static MACHINE_CONFIG_START( superchs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20MHz - verified */
@@ -589,4 +589,4 @@ DRIVER_INIT_MEMBER(superchs_state,superchs)
GAMEL( 1992, superchs, 0, superchs, superchs, superchs_state, superchs, ROT0, "Taito Corporation Japan", "Super Chase - Criminal Termination (World)", 0, layout_superchs )
GAMEL( 1992, superchsu, superchs, superchs, superchs, superchs_state, superchs, ROT0, "Taito America Corporation", "Super Chase - Criminal Termination (US)", 0, layout_superchs )
GAMEL( 1992, superchsj, superchs, superchs, superchs, superchs_state, superchs, ROT0, "Taito Corporation", "Super Chase - Criminal Termination (Japan)", 0, layout_superchs )
-GAMEL( 1992, superchsp, superchs, chase3, superchs, driver_device, 0, ORIENTATION_FLIP_X, "Taito Corporation", "Super Chase - Criminal Termination (1992/10/26 20:24:29 CHASE 3 VER 1.1, prototype)", 0, layout_superchs ) // has CHASE 3 as the internal description
+GAMEL( 1992, superchsp, superchs, chase3, superchs, superchs_state, 0, ORIENTATION_FLIP_X, "Taito Corporation", "Super Chase - Criminal Termination (1992/10/26 20:24:29 CHASE 3 VER 1.1, prototype)", 0, layout_superchs ) // has CHASE 3 as the internal description
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index 359110b6645..a292ef0af6a 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -412,7 +412,7 @@ GFXDECODE_END
* Machine Drivers *
**************************/
-static MACHINE_CONFIG_START( supercrd, supercrd_state )
+static MACHINE_CONFIG_START( supercrd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8) /* 2MHz, guess */
MCFG_CPU_PROGRAM_MAP(supercrd_map)
@@ -510,6 +510,6 @@ ROM_START( fruitstr )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 1992, supercrd, 0, supercrd, supercrd, driver_device, 0, ROT0, "Fun World", "Super Card (encrypted)", MACHINE_NOT_WORKING )
-GAME( 1992, fruitstr, 0, supercrd, supercrd, driver_device, 0, ROT0, "Fun World", "Fruit Star (encrypted)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 1992, supercrd, 0, supercrd, supercrd, supercrd_state, 0, ROT0, "Fun World", "Super Card (encrypted)", MACHINE_NOT_WORKING )
+GAME( 1992, fruitstr, 0, supercrd, supercrd, supercrd_state, 0, ROT0, "Fun World", "Fruit Star (encrypted)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp
index 7705d317aee..80e0a4d70da 100644
--- a/src/mame/drivers/superdq.cpp
+++ b/src/mame/drivers/superdq.cpp
@@ -325,7 +325,7 @@ void superdq_state::machine_start()
}
-static MACHINE_CONFIG_START( superdq, superdq_state )
+static MACHINE_CONFIG_START( superdq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/8)
@@ -414,6 +414,6 @@ ROM_END
*
*************************************/
-GAME( 1984, superdq, 0, superdq, superdq, driver_device, 0, ROT0, "Universal", "Super Don Quix-ote (Long Scenes)", MACHINE_NOT_WORKING )
-GAME( 1984, superdqs, superdq, superdq, superdq, driver_device, 0, ROT0, "Universal", "Super Don Quix-ote (Short Scenes)", MACHINE_NOT_WORKING )
-GAME( 1984, superdqa, superdq, superdq, superdq, driver_device, 0, ROT0, "Universal", "Super Don Quix-ote (Short Scenes, Alt)", MACHINE_NOT_WORKING )
+GAME( 1984, superdq, 0, superdq, superdq, superdq_state, 0, ROT0, "Universal", "Super Don Quix-ote (Long Scenes)", MACHINE_NOT_WORKING )
+GAME( 1984, superdqs, superdq, superdq, superdq, superdq_state, 0, ROT0, "Universal", "Super Don Quix-ote (Short Scenes)", MACHINE_NOT_WORKING )
+GAME( 1984, superdqa, superdq, superdq, superdq, superdq_state, 0, ROT0, "Universal", "Super Don Quix-ote (Short Scenes, Alt)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp
index 1df370144ca..384b8f82f07 100644
--- a/src/mame/drivers/superqix.cpp
+++ b/src/mame/drivers/superqix.cpp
@@ -1336,7 +1336,7 @@ INTERRUPT_GEN_MEMBER(superqix_state_base::sqix_timer_irq)
-static MACHINE_CONFIG_START( pbillian, hotsmash_state )
+static MACHINE_CONFIG_START( pbillian )
MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6 MHz, ROHM Z80B */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(pbillian_port_map)
@@ -1379,7 +1379,7 @@ static MACHINE_CONFIG_DERIVED( hotsmash, pbillian )
MCFG_M68705_PORTC_W_CB(WRITE8(hotsmash_state, hotsmash_68705_portC_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sqix, superqix_state )
+static MACHINE_CONFIG_START( sqix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* 6 MHz */
@@ -1433,7 +1433,7 @@ static MACHINE_CONFIG_DERIVED( sqix_8031, sqix )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sqix_nomcu, superqix_state )
+static MACHINE_CONFIG_START( sqix_nomcu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 12000000/2) /* 6 MHz */
@@ -1737,13 +1737,13 @@ DRIVER_INIT_MEMBER(superqix_state_base, perestro)
-GAME( 1986, pbillian, 0, pbillian, pbillian, driver_device, 0, ROT0, "Kaneko / Taito", "Prebillian", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, hotsmash, 0, hotsmash, hotsmash, driver_device, 0, ROT90, "Kaneko / Taito", "Vs. Hot Smash", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sqix, 0, sqix, superqix, superqix_state_base, sqix, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sqixr1, sqix, sqix, superqix, superqix_state_base, sqix, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sqixr0, sqix, sqix, superqix, superqix_state_base, sqixr0, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.0)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sqixu, sqix, sqix, superqix, superqix_state_base, sqix, ROT90, "Kaneko / Taito (Romstar License)", "Super Qix (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, sqixb1, sqix, sqix_8031, superqix, superqix_state_base, sqixr0, ROT90, "bootleg", "Super Qix (bootleg of V1.0, 8031 MCU)", MACHINE_SUPPORTS_SAVE ) // bootleg of World, Rev 1
-GAME( 1987, sqixb2, sqix, sqix_nomcu, superqix, superqix_state_base, sqix, ROT90, "bootleg", "Super Qix (bootleg, No MCU)", MACHINE_SUPPORTS_SAVE ) // bootleg of World, Rev 1
-GAME( 1994, perestro, 0, sqix_nomcu, superqix, superqix_state_base, perestro, ROT90, "Promat", "Perestroika Girls", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, perestrof,perestro, sqix_nomcu, superqix, superqix_state_base, perestro, ROT90, "Promat (Fuuki license)", "Perestroika Girls (Fuuki license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, pbillian, 0, pbillian, pbillian, hotsmash_state, 0, ROT0, "Kaneko / Taito", "Prebillian", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, hotsmash, 0, hotsmash, hotsmash, hotsmash_state, 0, ROT90, "Kaneko / Taito", "Vs. Hot Smash", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sqix, 0, sqix, superqix, superqix_state, sqix, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sqixr1, sqix, sqix, superqix, superqix_state, sqix, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sqixr0, sqix, sqix, superqix, superqix_state, sqixr0, ROT90, "Kaneko / Taito", "Super Qix (World/Japan, V1.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sqixu, sqix, sqix, superqix, superqix_state, sqix, ROT90, "Kaneko / Taito (Romstar License)", "Super Qix (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, sqixb1, sqix, sqix_8031, superqix, superqix_state, sqixr0, ROT90, "bootleg", "Super Qix (bootleg of V1.0, 8031 MCU)", MACHINE_SUPPORTS_SAVE ) // bootleg of World, Rev 1
+GAME( 1987, sqixb2, sqix, sqix_nomcu, superqix, superqix_state, sqix, ROT90, "bootleg", "Super Qix (bootleg, No MCU)", MACHINE_SUPPORTS_SAVE ) // bootleg of World, Rev 1
+GAME( 1994, perestro, 0, sqix_nomcu, superqix, superqix_state, perestro, ROT90, "Promat", "Perestroika Girls", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, perestrof,perestro, sqix_nomcu, superqix, superqix_state, perestro, ROT90, "Promat (Fuuki license)", "Perestroika Girls (Fuuki license)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp
index 8d2ec5de24b..0800db8f20a 100644
--- a/src/mame/drivers/superslave.cpp
+++ b/src/mame/drivers/superslave.cpp
@@ -325,7 +325,7 @@ void superslave_state::machine_reset()
// MACHINE_CONFIG( superslave )
//-------------------------------------------------
-static MACHINE_CONFIG_START( superslave, superslave_state )
+static MACHINE_CONFIG_START( superslave )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(superslave_mem)
@@ -408,5 +408,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1983, superslv, 0, 0, superslave, superslave, driver_device, 0, "Advanced Digital Corporation", "Super Slave", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, superslv, 0, 0, superslave, superslave, superslave_state, 0, "Advanced Digital Corporation", "Super Slave", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp
index 0a8e6388689..729b9d52a32 100644
--- a/src/mame/drivers/supertnk.cpp
+++ b/src/mame/drivers/supertnk.cpp
@@ -422,7 +422,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( supertnk, supertnk_state )
+static MACHINE_CONFIG_START( supertnk )
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2598750, supertnk_map, supertnk_io_map)
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index 45480e8454a..5841fbec7b6 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -470,7 +470,7 @@ void superwng_state::machine_reset()
m_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( superwng, superwng_state )
+static MACHINE_CONFIG_START( superwng )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -525,4 +525,4 @@ ROM_START( superwng )
ROM_END
-GAME( 1985, superwng, 0, superwng, superwng, driver_device, 0, ROT90, "Wing", "Super Wing", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // crashes after bonus stage, see notes, bad rom?
+GAME( 1985, superwng, 0, superwng, superwng, superwng_state, 0, ROT90, "Wing", "Super Wing", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // crashes after bonus stage, see notes, bad rom?
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index 8b3e7a11d7a..99014c2c1ab 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -1884,7 +1884,7 @@ INTERRUPT_GEN_MEMBER(supracan_state::supracan_sound_irq)
}
}
-static MACHINE_CONFIG_START( supracan, supracan_state )
+static MACHINE_CONFIG_START( supracan )
MCFG_CPU_ADD( "maincpu", M68000, XTAL_10_738635MHz ) /* Correct frequency unknown */
MCFG_CPU_PROGRAM_MAP( supracan_mem )
@@ -1923,5 +1923,5 @@ ROM_START( supracan )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1995, supracan, 0, 0, supracan, supracan, driver_device, 0, "Funtech Entertainment", "Super A'Can", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1995, supracan, 0, 0, supracan, supracan, supracan_state, 0, "Funtech Entertainment", "Super A'Can", MACHINE_NO_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index beec8b8ea15..221c2a236f7 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -486,7 +486,7 @@ void suprgolf_state::machine_reset()
#define MASTER_CLOCK XTAL_12MHz
-static MACHINE_CONFIG_START( suprgolf, suprgolf_state )
+static MACHINE_CONFIG_START( suprgolf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,MASTER_CLOCK/2) /* guess */
@@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( suprgolf, suprgolf_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz) /* guess */
MCFG_MSM5205_VCLK_CB(WRITELINE(suprgolf_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -673,6 +673,6 @@ DRIVER_INIT_MEMBER(suprgolf_state,suprgolf)
ROM[0x6d72+(0x4000*3)-0x4000] = 0x20; //patch ROM check
}
-GAME( 1989, suprgolf, 0, suprgolf, suprgolf, driver_device, 0, ROT0, "Nasco", "Super Crowns Golf (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, suprgolfj, suprgolf, suprgolf, suprgolf, suprgolf_state, suprgolf, ROT0, "Nasco", "Super Crowns Golf (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, albatross, suprgolf, suprgolf, suprgolf, driver_device, 0, ROT0, "Nasco", "Albatross (US Prototype?)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL| MACHINE_SUPPORTS_SAVE )
+GAME( 1989, suprgolf, 0, suprgolf, suprgolf, suprgolf_state, 0, ROT0, "Nasco", "Super Crowns Golf (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, suprgolfj, suprgolf, suprgolf, suprgolf, suprgolf_state, suprgolf, ROT0, "Nasco", "Super Crowns Golf (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, albatross, suprgolf, suprgolf, suprgolf, suprgolf_state, 0, ROT0, "Nasco", "Albatross (US Prototype?)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL| MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp
index 5ec6b24f543..4c6eae66f69 100644
--- a/src/mame/drivers/suprloco.cpp
+++ b/src/mame/drivers/suprloco.cpp
@@ -167,7 +167,7 @@ static GFXDECODE_START( suprloco )
GFXDECODE_END
-static MACHINE_CONFIG_START( suprloco, suprloco_state )
+static MACHINE_CONFIG_START( suprloco )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SEGA_315_5015, 4000000) /* 4 MHz (?) */
@@ -308,4 +308,4 @@ DRIVER_INIT_MEMBER(suprloco_state,suprloco)
GAME( 1982, suprloco, 0, suprloco, suprloco, suprloco_state, suprloco, ROT0, "Sega", "Super Locomotive (Rev.A)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, suprlocoo, suprloco, suprloco, suprloco, suprloco_state, suprloco, ROT0, "Sega", "Super Locomotive", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, suprlocoo, suprloco, suprloco, suprloco, suprloco_state, suprloco, ROT0, "Sega", "Super Locomotive", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp
index 7ee02a51a2d..5d134e1143d 100644
--- a/src/mame/drivers/suprnova.cpp
+++ b/src/mame/drivers/suprnova.cpp
@@ -786,7 +786,7 @@ GFXDECODE_END
/***** MACHINE DRIVER *****/
-static MACHINE_CONFIG_START( skns, skns_state )
+static MACHINE_CONFIG_START( skns )
MCFG_CPU_ADD("maincpu", SH2,28638000)
MCFG_CPU_PROGRAM_MAP(skns_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", skns_state, irq, "screen", 0, 1)
@@ -1883,31 +1883,31 @@ ROM_END
/***** GAME DRIVERS *****/
-GAME( 1996, skns, 0, skns, skns, driver_device, 0, ROT0, "Kaneko", "Super Kaneko Nova System BIOS", MACHINE_IS_BIOS_ROOT )
+GAME( 1996, skns, 0, skns, skns, skns_state, 0, ROT0, "Kaneko", "Super Kaneko Nova System BIOS", MACHINE_IS_BIOS_ROOT )
-GAME( 1996, galpani4, skns, sknsj, cyvern, skns_state, galpani4, ROT0, "Kaneko", "Gals Panic 4 (Japan)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, galpani4k, galpani4, sknsk, cyvern, skns_state, galpani4, ROT0, "Kaneko", "Gals Panic 4 (Korea)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2001, galpanidx, galpani4, sknsa, cyvern, skns_state, galpani4, ROT0, "Kaneko", "Gals Panic DX (Asia)", MACHINE_IMPERFECT_GRAPHICS ) // copyright 2001, re-release for the Asian market?
+GAME( 1996, galpani4, skns, sknsj, cyvern, skns_state, galpani4, ROT0, "Kaneko", "Gals Panic 4 (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, galpani4k, galpani4, sknsk, cyvern, skns_state, galpani4, ROT0, "Kaneko", "Gals Panic 4 (Korea)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2001, galpanidx, galpani4, sknsa, cyvern, skns_state, galpani4, ROT0, "Kaneko", "Gals Panic DX (Asia)", MACHINE_IMPERFECT_GRAPHICS ) // copyright 2001, re-release for the Asian market?
// there is a Gals Panic 4 version with 'Gals Panic SU' title as well, seen for sale in Korea (different to the Gals Panic SU clone of galpans2)
-GAME( 1996, jjparads, skns, sknsj, skns_1p, skns_state, jjparads, ROT0, "Electro Design", "Jan Jan Paradise", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, jjparads, skns, sknsj, skns_1p, skns_state, jjparads, ROT0, "Electro Design", "Jan Jan Paradise", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, galpanis, skns, sknse, galpanis, skns_state, galpanis, ROT0, "Kaneko", "Gals Panic S - Extra Edition (Europe, set 1)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, galpanise, galpanis, sknse, galpanis, skns_state, galpanis, ROT0, "Kaneko", "Gals Panic S - Extra Edition (Europe, set 2)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, galpanisj, galpanis, sknsj, galpanis, skns_state, galpanis, ROT0, "Kaneko", "Gals Panic S - Extra Edition (Japan)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, galpanisk, galpanis, sknsk, galpanis, skns_state, galpanis, ROT0, "Kaneko", "Gals Panic S - Extra Edition (Korea)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, jjparad2, skns, sknsj, skns_1p, skns_state, jjparad2, ROT0, "Electro Design", "Jan Jan Paradise 2", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, jjparad2, skns, sknsj, skns_1p, skns_state, jjparad2, ROT0, "Electro Design", "Jan Jan Paradise 2", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, sengekis, skns, sknsa, skns, skns_state, sengekis, ROT90, "Kaneko / Warashi", "Sengeki Striker (Asia)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1997, sengekisj, sengekis, sknsj, skns, skns_state, sengekij, ROT90, "Kaneko / Warashi", "Sengeki Striker (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, sengekis, skns, sknsa, skns, skns_state, sengekis, ROT90, "Kaneko / Warashi", "Sengeki Striker (Asia)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1997, sengekisj, sengekis, sknsj, skns, skns_state, sengekij, ROT90, "Kaneko / Warashi", "Sengeki Striker (Japan)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, vblokbrk, skns, sknse, vblokbrk, skns_state, sarukani, ROT0, "Kaneko / Mediaworks", "VS Block Breaker (Europe)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, vblokbrka, vblokbrk, sknsa, vblokbrk, skns_state, sarukani, ROT0, "Kaneko / Mediaworks", "VS Block Breaker (Asia)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1997, sarukani, vblokbrk, sknsj, vblokbrk, skns_state, sarukani, ROT0, "Kaneko / Mediaworks", "Saru-Kani-Hamu-Zou (Japan)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, cyvern, skns, sknsu, cyvern, skns_state, cyvern, ROT90, "Kaneko", "Cyvern (US)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, cyvernj, cyvern, sknsj, cyvern, skns_state, cyvern, ROT90, "Kaneko", "Cyvern (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, cyvern, skns, sknsu, cyvern, skns_state, cyvern, ROT90, "Kaneko", "Cyvern (US)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, cyvernj, cyvern, sknsj, cyvern, skns_state, cyvern, ROT90, "Kaneko", "Cyvern (Japan)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1998, puzzloop, skns, sknse, puzzloop, skns_state, puzzloopu, ROT0, "Mitchell", "Puzz Loop (Europe, v0.94)", MACHINE_IMPERFECT_GRAPHICS ) // Same speed up as US version
GAME( 1998, puzzloope, puzzloop, sknse, puzzloop, skns_state, puzzloope, ROT0, "Mitchell", "Puzz Loop (Europe, v0.93)", MACHINE_IMPERFECT_GRAPHICS )
@@ -1916,8 +1916,8 @@ GAME( 1998, puzzloopa, puzzloop, sknsa, puzzloop, skns_state, puzzloopa, ROT0,
GAME( 1998, puzzloopk, puzzloop, sknsk, puzzloop, skns_state, puzzloopu, ROT0, "Mitchell", "Puzz Loop (Korea)", MACHINE_IMPERFECT_GRAPHICS ) // Same speed up as US version
GAME( 1998, puzzloopu, puzzloop, sknsu, puzzloop, skns_state, puzzloopu, ROT0, "Mitchell", "Puzz Loop (USA)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, ryouran , skns, sknsj, skns_1p, skns_state, ryouran, ROT0, "Electro Design", "VS Mahjong Otome Ryouran (set 1)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1998, ryourano, ryouran, sknsj, skns_1p, skns_state, ryouran, ROT0, "Electro Design", "VS Mahjong Otome Ryouran (set 2)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, ryouran , skns, sknsj, skns_1p, skns_state, ryouran, ROT0, "Electro Design", "VS Mahjong Otome Ryouran (set 1)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1998, ryourano, ryouran, sknsj, skns_1p, skns_state, ryouran, ROT0, "Electro Design", "VS Mahjong Otome Ryouran (set 2)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1999, galpans2, skns, sknse, galpanis, skns_state, galpans2, ROT0, "Kaneko", "Gals Panic S2 (Europe)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1999, galpans2j, galpans2, sknsj, galpanis, skns_state, galpans2, ROT0, "Kaneko", "Gals Panic S2 (Japan)", MACHINE_IMPERFECT_GRAPHICS )
@@ -1926,10 +1926,10 @@ GAME( 1999, galpansu, galpans2, sknsk, galpanis, skns_state, galpans2, ROT0,
GAME( 1999, panicstr, skns, sknsj, galpanis, skns_state, panicstr, ROT0, "Kaneko", "Panic Street (Japan)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, senknow , skns, sknsj, skns, skns_state, senknow, ROT0, "Kaneko / Kouyousha", "Sen-Know (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, senknow , skns, sknsj, skns, skns_state, senknow, ROT0, "Kaneko / Kouyousha", "Sen-Know (Japan)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, teljan , skns, sknsj, skns_1p, skns_state, teljan, ROT0, "Electro Design", "Tel Jan", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, teljan , skns, sknsj, skns_1p, skns_state, teljan, ROT0, "Electro Design", "Tel Jan", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 2000, gutsn, skns, sknsj, skns, skns_state, gutsn, ROT0, "Kaneko / Kouyousha", "Guts'n (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 2000, gutsn, skns, sknsj, skns, skns_state, gutsn, ROT0, "Kaneko / Kouyousha", "Guts'n (Japan)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 2002, galpans3, skns, sknsj, galpanis, skns_state, galpans3, ROT0, "Kaneko", "Gals Panic S3 (Japan)", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp
index 2bda5fe3f9c..736cb3eed48 100644
--- a/src/mame/drivers/suprridr.cpp
+++ b/src/mame/drivers/suprridr.cpp
@@ -345,7 +345,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( suprridr, suprridr_state )
+static MACHINE_CONFIG_START( suprridr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_49_152MHz/16) /* 3 MHz */
@@ -435,4 +435,4 @@ ROM_END
*
*************************************/
-GAME( 1983, suprridr, 0, suprridr, suprridr, driver_device, 0, ROT90, "Taito Corporation (Venture Line license)", "Super Rider", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, suprridr, 0, suprridr, suprridr, suprridr_state, 0, ROT90, "Taito Corporation (Venture Line license)", "Super Rider", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp
index 0eee44335a8..290a510dc1a 100644
--- a/src/mame/drivers/suprslam.cpp
+++ b/src/mame/drivers/suprslam.cpp
@@ -289,7 +289,7 @@ void suprslam_state::machine_reset()
m_pending_command = 0;
}
-static MACHINE_CONFIG_START( suprslam, suprslam_state )
+static MACHINE_CONFIG_START( suprslam )
MCFG_CPU_ADD("maincpu", M68000, 16000000)
MCFG_CPU_PROGRAM_MAP(suprslam_map)
@@ -375,4 +375,4 @@ ROM_END
/*** GAME DRIVERS ************************************************************/
-GAME( 1995, suprslam, 0, suprslam, suprslam, driver_device, 0, ROT0, "Banpresto / Toei Animation", "From TV Animation Slam Dunk - Super Slams", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1995, suprslam, 0, suprslam, suprslam, suprslam_state, 0, ROT0, "Banpresto / Toei Animation", "From TV Animation Slam Dunk - Super Slams", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/supstarf.cpp b/src/mame/drivers/supstarf.cpp
index 1215ba8bbd5..d84a99bddde 100644
--- a/src/mame/drivers/supstarf.cpp
+++ b/src/mame/drivers/supstarf.cpp
@@ -163,7 +163,7 @@ void supstarf_state::machine_start()
save_item(NAME(m_port1_data));
}
-static MACHINE_CONFIG_START(supstarf, supstarf_state)
+static MACHINE_CONFIG_START(supstarf)
MCFG_CPU_ADD("maincpu", I8085A, XTAL_5_0688MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_IO_MAP(main_io_map)
@@ -245,4 +245,4 @@ ROM_START(supstarf)
ROM_LOAD("2532.ic4", 0x0000, 0x1000, CRC(b6ef3c7a) SHA1(aabb6f8569685fc3a917a7bb5ebfcc4b20086b15) BAD_DUMP) // D6 stuck high and probably totally garbage
ROM_END
-GAME( 1986, supstarf, 0, supstarf, supstarf, driver_device, 0, ROT0, "Recreativos Franco", "Super Star (Recreativos Franco)", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 1986, supstarf, 0, supstarf, supstarf, supstarf_state, 0, ROT0, "Recreativos Franco", "Super Star (Recreativos Franco)", MACHINE_IS_SKELETON_MECHANICAL )
diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp
index 2e226c1fa96..d9bbb1f316a 100644
--- a/src/mame/drivers/surpratk.cpp
+++ b/src/mame/drivers/surpratk.cpp
@@ -166,7 +166,7 @@ WRITE8_MEMBER( surpratk_state::banking_callback )
membank("bank1")->set_entry(data & 0x1f);
}
-static MACHINE_CONFIG_START( surpratk, surpratk_state )
+static MACHINE_CONFIG_START( surpratk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 053248, the clock input is 12MHz, and internal CPU divider of 4 */
@@ -271,6 +271,6 @@ ROM_END
***************************************************************************/
-GAME( 1990, suratk, 0, surpratk, surpratk, driver_device, 0, ROT0, "Konami", "Surprise Attack (World ver. K)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, suratka, suratk, surpratk, surpratk, driver_device, 0, ROT0, "Konami", "Surprise Attack (Asia ver. L)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, suratkj, suratk, surpratk, surpratk, driver_device, 0, ROT0, "Konami", "Surprise Attack (Japan ver. M)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, suratk, 0, surpratk, surpratk, surpratk_state, 0, ROT0, "Konami", "Surprise Attack (World ver. K)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, suratka, suratk, surpratk, surpratk, surpratk_state, 0, ROT0, "Konami", "Surprise Attack (Asia ver. L)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, suratkj, suratk, surpratk, surpratk, surpratk_state, 0, ROT0, "Konami", "Surprise Attack (Japan ver. M)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp
index e0ba58e1387..b79f28139ad 100644
--- a/src/mame/drivers/sv8000.cpp
+++ b/src/mame/drivers/sv8000.cpp
@@ -368,7 +368,7 @@ READ8_MEMBER( sv8000_state::mc6847_videoram_r )
return data;
}
-static MACHINE_CONFIG_START( sv8000, sv8000_state )
+static MACHINE_CONFIG_START( sv8000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_10_738635MHz/3) /* Not verified */
MCFG_CPU_PROGRAM_MAP(sv8000_mem)
@@ -415,5 +415,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1979, sv8000, 0, 0, sv8000, sv8000, driver_device, 0, "Bandai", "Super Vision 8000 (TV Jack 8000)", 0 )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1979, sv8000, 0, 0, sv8000, sv8000, sv8000_state, 0, "Bandai", "Super Vision 8000 (TV Jack 8000)", 0 )
diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index ddd80d54f46..bb8aec7062d 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -518,7 +518,7 @@ DEVICE_IMAGE_LOAD_MEMBER( svi3x8_state, cartridge )
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( svi318, svi3x8_state )
+static MACHINE_CONFIG_START( svi318 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_10_738635MHz / 3)
MCFG_CPU_PROGRAM_MAP(svi3x8_mem)
@@ -626,8 +626,8 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1983, svi318, 0, 0, svi318, svi318, driver_device, 0, "Spectravideo", "SVI-318 (PAL)", MACHINE_SUPPORTS_SAVE)
-COMP( 1983, svi318n, svi318, 0, svi318n, svi318, driver_device, 0, "Spectravideo", "SVI-318 (NTSC)", MACHINE_SUPPORTS_SAVE)
-COMP( 1983, svi328, 0, 0, svi328, svi328, driver_device, 0, "Spectravideo", "SVI-328 (PAL)", MACHINE_SUPPORTS_SAVE)
-COMP( 1983, svi328n, svi328, 0, svi328n, svi328, driver_device, 0, "Spectravideo", "SVI-328 (NTSC)", MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1983, svi318, 0, 0, svi318, svi318, svi3x8_state, 0, "Spectravideo", "SVI-318 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, svi318n, svi318, 0, svi318n, svi318, svi3x8_state, 0, "Spectravideo", "SVI-318 (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, svi328, 0, 0, svi328, svi328, svi3x8_state, 0, "Spectravideo", "SVI-328 (PAL)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, svi328n, svi328, 0, svi328n, svi328, svi3x8_state, 0, "Spectravideo", "SVI-328 (NTSC)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp
index bcd5649eb4a..c24cbe4c8e8 100644
--- a/src/mame/drivers/svision.cpp
+++ b/src/mame/drivers/svision.cpp
@@ -512,7 +512,7 @@ MACHINE_RESET_MEMBER(svision_state,tvlink)
m_tvlink.palette[3] = MAKE24_RGB32(svisionp_palette[(PALETTE_START+3)*3+0], svisionp_palette[(PALETTE_START+3)*3+1], svisionp_palette[(PALETTE_START+3)*3+2]);
}
-static MACHINE_CONFIG_START( svision, svision_state )
+static MACHINE_CONFIG_START( svision )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M65C02, 4000000) /* ? stz used! speed? */
MCFG_CPU_PROGRAM_MAP(svision_mem)
@@ -598,14 +598,14 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
// marketed under a ton of firms and names
-CONS(1992, svision, 0, 0, svision, svision, svision_state, svision, "Watara", "Super Vision", 0)
+CONS(1992, svision, 0, 0, svision, svision, svision_state, svision, "Watara", "Super Vision", 0 )
// svdual 2 connected via communication port
-CONS( 1992, svisions, svision, 0,svisions, svisions, svision_state, svisions, "Watara", "Super Vision (PeT Communication Simulation)", 0 )
+CONS( 1992, svisions, svision, 0, svisions, svisions, svision_state, svisions, "Watara", "Super Vision (PeT Communication Simulation)", 0 )
-CONS( 1993, svisionp, svision, 0,svisionp, svision, svision_state, svision, "Watara", "Super Vision (PAL TV Link Colored)", 0 )
-CONS( 1993, svisionn, svision, 0,svisionn, svision, svision_state, svision, "Watara", "Super Vision (NTSC TV Link Colored)", 0 )
+CONS( 1993, svisionp, svision, 0, svisionp, svision, svision_state, svision, "Watara", "Super Vision (PAL TV Link Colored)", 0 )
+CONS( 1993, svisionn, svision, 0, svisionn, svision, svision_state, svision, "Watara", "Super Vision (NTSC TV Link Colored)", 0 )
// svtvlink (2 supervisions)
// tvlink (pad supervision simulated)
-CONS( 199?, tvlinkp, svision, 0,tvlinkp, svision, svision_state, svision, "Watara", "TV Link PAL", 0 )
+CONS( 199?, tvlinkp, svision, 0, tvlinkp, svision, svision_state, svision, "Watara", "TV Link PAL", 0 )
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index f67d892c818..a39703b1fca 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -300,7 +300,7 @@ QUICKLOAD_LOAD_MEMBER( svmu_state, svmu )
}
-static MACHINE_CONFIG_START( svmu, svmu_state )
+static MACHINE_CONFIG_START( svmu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", LC8670, XTAL_32_768kHz)
MCFG_CPU_PROGRAM_MAP(svmu_mem)
@@ -359,5 +359,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1998, svmu, 0, 0, svmu , svmu , driver_device, 0, "Sega", "Visual Memory Unit", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1998, svmu, 0, 0, svmu, svmu, svmu_state, 0, "Sega", "Visual Memory Unit", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/swtpc.cpp b/src/mame/drivers/swtpc.cpp
index 43a6743ea61..aa73c8fadca 100644
--- a/src/mame/drivers/swtpc.cpp
+++ b/src/mame/drivers/swtpc.cpp
@@ -56,14 +56,17 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(swtpc_status_r);
DECLARE_READ8_MEMBER(swtpc_terminal_r);
DECLARE_READ8_MEMBER(swtpc_tricky_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
- uint8_t m_term_data;
+ void kbd_put(u8 data);
+
+protected:
virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
+ uint8_t m_term_data;
};
// bit 0 - ready to receive a character; bit 1 - ready to send a character to the terminal
@@ -103,12 +106,12 @@ void swtpc_state::machine_reset()
{
}
-WRITE8_MEMBER( swtpc_state::kbd_put )
+void swtpc_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( swtpc, swtpc_state )
+static MACHINE_CONFIG_START( swtpc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, XTAL_1MHz)
MCFG_CPU_PROGRAM_MAP(swtpc_mem)
@@ -116,7 +119,7 @@ static MACHINE_CONFIG_START( swtpc, swtpc_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(swtpc_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(swtpc_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -130,5 +133,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1975, swtpc, 0, 0, swtpc, swtpc, driver_device, 0, "Southwest Technical Products Corporation", "SWTPC 6800", MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1975, swtpc, 0, 0, swtpc, swtpc, swtpc_state, 0, "Southwest Technical Products Corporation", "SWTPC 6800", MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/swtpc09.cpp b/src/mame/drivers/swtpc09.cpp
index 96420c5d566..256535d1497 100644
--- a/src/mame/drivers/swtpc09.cpp
+++ b/src/mame/drivers/swtpc09.cpp
@@ -97,7 +97,7 @@ WRITE_LINE_MEMBER(swtpc09_state::write_acia_clock)
/* Machine driver */
/* MPU09, MPID, MPS2 DMF2 */
-static MACHINE_CONFIG_START( swtpc09, swtpc09_state )
+static MACHINE_CONFIG_START( swtpc09 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1000000)
MCFG_CPU_PROGRAM_MAP(swtpc09_mem)
@@ -137,7 +137,7 @@ static MACHINE_CONFIG_START( swtpc09, swtpc09_state )
MACHINE_CONFIG_END
/* MPU09, MPID, MPS2 DC4 PIAIDE*/
-static MACHINE_CONFIG_START( swtpc09i, swtpc09_state )
+static MACHINE_CONFIG_START( swtpc09i )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 1000000)
MCFG_CPU_PROGRAM_MAP(swtpc09_mem)
@@ -185,7 +185,7 @@ MACHINE_CONFIG_END
/* MPU09, MPID, MPS2 DMF3 */
-static MACHINE_CONFIG_START( swtpc09d3, swtpc09_state )
+static MACHINE_CONFIG_START( swtpc09d3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(swtpc09_mem)
@@ -255,8 +255,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, swtpc09, 0, 0, swtpc09, swtpc09, swtpc09_state, swtpc09, "SWTPC", "swtpc S/09 Sbug", MACHINE_NO_SOUND_HW)
-COMP( 1980, swtpc09i, swtpc09, 0, swtpc09i, swtpc09, swtpc09_state, swtpc09i, "SWTPC", "swtpc S/09 Sbug + piaide", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1980, swtpc09u, swtpc09, 0, swtpc09, swtpc09, swtpc09_state, swtpc09u, "SWTPC", "swtpc S/09 UNIBug + DMF2", MACHINE_NO_SOUND_HW)
-COMP( 1980, swtpc09d3, swtpc09, 0, swtpc09d3, swtpc09, swtpc09_state, swtpc09d3, "SWTPC", "swtpc S/09 UNIBug + DMF3", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, swtpc09, 0, 0, swtpc09, swtpc09, swtpc09_state, swtpc09, "SWTPC", "swtpc S/09 Sbug", MACHINE_NO_SOUND_HW )
+COMP( 1980, swtpc09i, swtpc09, 0, swtpc09i, swtpc09, swtpc09_state, swtpc09i, "SWTPC", "swtpc S/09 Sbug + piaide", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1980, swtpc09u, swtpc09, 0, swtpc09, swtpc09, swtpc09_state, swtpc09u, "SWTPC", "swtpc S/09 UNIBug + DMF2", MACHINE_NO_SOUND_HW )
+COMP( 1980, swtpc09d3, swtpc09, 0, swtpc09d3, swtpc09, swtpc09_state, swtpc09d3, "SWTPC", "swtpc S/09 UNIBug + DMF3", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp
index 733e921accb..385d8e98038 100644
--- a/src/mame/drivers/swyft.cpp
+++ b/src/mame/drivers/swyft.cpp
@@ -768,7 +768,7 @@ WRITE_LINE_MEMBER( swyft_state::write_acia_clock )
m_acia6850->write_rxc(state);
}
-static MACHINE_CONFIG_START( swyft, swyft_state )
+static MACHINE_CONFIG_START( swyft )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68008, XTAL_15_8976MHz/2) //MC68008P8, Y1=15.8976Mhz, clock GUESSED at Y1 / 2
@@ -892,5 +892,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, swyft,0, 0, swyft, swyft, driver_device, 0, "Information Applicance Inc", "Swyft", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, swyft, 0, 0, swyft, swyft, swyft_state, 0, "Information Applicance Inc", "Swyft", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index a6674507be4..de8f4920c43 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -293,7 +293,7 @@ static ADDRESS_MAP_START( sym1_map, AS_PROGRAM, 8, sym1_state )
AM_RANGE(0x0c00, 0x0fff) AM_RAMBANK("bank4") AM_SHARE("ram_3k")
AM_RANGE(0x8000, 0x8fff) AM_ROM AM_SHARE("monitor") // U20 Monitor ROM
AM_RANGE(0xa000, 0xa00f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) // U25 VIA #1
- AM_RANGE(0xa400, 0xa41f) AM_DEVICE("riot", mos6532_t, io_map) // U27 RIOT
+ AM_RANGE(0xa400, 0xa41f) AM_DEVICE("riot", mos6532_new_device, io_map) // U27 RIOT
AM_RANGE(0xa600, 0xa67f) AM_RAMBANK("bank5") AM_SHARE("riot_ram") // U27 RIOT RAM
AM_RANGE(0xa800, 0xa80f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) // U28 VIA #2
AM_RANGE(0xac00, 0xac0f) AM_DEVREADWRITE("via6522_2", via6522_device, read, write) // U29 VIA #3
@@ -305,7 +305,7 @@ ADDRESS_MAP_END
// MACHINE DRIVERS
//**************************************************************************
-static MACHINE_CONFIG_START( sym1, sym1_state )
+static MACHINE_CONFIG_START( sym1 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M6502, SYM1_CLOCK)
MCFG_CPU_PROGRAM_MAP(sym1_map)
@@ -318,7 +318,7 @@ static MACHINE_CONFIG_START( sym1, sym1_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
// devices
- MCFG_DEVICE_ADD("riot", MOS6532n, SYM1_CLOCK)
+ MCFG_DEVICE_ADD("riot", MOS6532_NEW, SYM1_CLOCK)
MCFG_MOS6530n_IN_PA_CB(READ8(sym1_state, sym1_riot_a_r))
MCFG_MOS6530n_OUT_PA_CB(WRITE8(sym1_state, sym1_riot_a_w))
MCFG_MOS6530n_IN_PB_CB(READ8(sym1_state, sym1_riot_b_r))
diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp
index a184fb8bc69..6a5ecadd603 100644
--- a/src/mame/drivers/symbolics.cpp
+++ b/src/mame/drivers/symbolics.cpp
@@ -314,7 +314,7 @@ void symbolics_state::machine_reset()
*/
}
-static MACHINE_CONFIG_START( symbolics, symbolics_state )
+static MACHINE_CONFIG_START( symbolics )
/* basic machine hardware */
// per page 159 of http://bitsavers.trailing-edge.com/pdf/symbolics/3600_series/Lisp_Machine_Hardware_Memos.pdf:
//XTALS: 16MHz @H11 (68k CPU clock)
@@ -391,5 +391,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1984, s3670, 0, 0, symbolics, symbolics, symbolics_state, symbolics, "Symbolics", "3670", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp
index ecfb5e89659..1f26f87244a 100644
--- a/src/mame/drivers/sys2900.cpp
+++ b/src/mame/drivers/sys2900.cpp
@@ -115,7 +115,7 @@ uint32_t sys2900_state::screen_update_sys2900(screen_device &screen, bitmap_ind1
return 0;
}
-static MACHINE_CONFIG_START( sys2900, sys2900_state )
+static MACHINE_CONFIG_START( sys2900 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(sys2900_mem)
@@ -143,5 +143,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1981, sys2900, 0, 0, sys2900, sys2900, sys2900_state, sys2900, "Systems Group", "System 2900", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/systec.cpp b/src/mame/drivers/systec.cpp
index 502ad4296e7..ce953e3c230 100644
--- a/src/mame/drivers/systec.cpp
+++ b/src/mame/drivers/systec.cpp
@@ -53,7 +53,7 @@ public:
required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(systec_c4_r);
DECLARE_READ8_MEMBER(systec_c6_r);
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
uint8_t m_term_data;
virtual void machine_reset() override;
};
@@ -70,7 +70,7 @@ READ8_MEMBER( systec_state::systec_c6_r )
return 0x04 | (m_term_data ? 1 : 0);
}
-WRITE8_MEMBER( systec_state::kbd_put )
+void systec_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -97,7 +97,7 @@ void systec_state::machine_reset()
memcpy(m_p_maincpu, m_p_roms, 0x2000);
}
-static MACHINE_CONFIG_START( systec, systec_state )
+static MACHINE_CONFIG_START( systec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(systec_mem)
@@ -106,7 +106,7 @@ static MACHINE_CONFIG_START( systec, systec_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(systec_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(systec_state, kbd_put))
MACHINE_CONFIG_END
@@ -119,5 +119,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP(19??, systec, 0, 0, systec, systec, driver_device, 0, "Systec", "Systec Z80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP(19??, systec, 0, 0, systec, systec, systec_state, 0, "Systec", "Systec Z80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index ce5237ce850..2c53f7860f8 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -2144,7 +2144,7 @@ GFXDECODE_END
*************************************/
/* original board with 64kbit ROMs and an 8255 PPI for outputs */
-static MACHINE_CONFIG_START( sys1ppi, system1_state )
+static MACHINE_CONFIG_START( sys1ppi )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK) /* not really, see notes above */
@@ -5412,69 +5412,69 @@ GAME( 1986, nob, 0, nobm, nob, system1_state, n
GAME( 1986, nobb, nob, nob, nob, system1_state, nobb, ROT270, "bootleg (Game Electronics)", "Noboranka (Japan, bootleg)", MACHINE_SUPPORTS_SAVE )
/* PIO-based System 1 */
-GAME( 1984, flicky, 0, sys1piox_315_5051, flicky, system1_state, bank00, ROT0, "Sega", "Flicky (128k Version, 315-5051)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, flickya, flicky, sys1piox_315_5051, flicky, system1_state, bank00, ROT0, "Sega", "Flicky (128k Version, 315-5051, larger roms)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, flickys2, flicky, sys1pio, flickys2, system1_state, bank00, ROT0, "Sega", "Flicky (128k Version, not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, thetogyu, bullfgt, sys1piox_315_5065, bullfgt, system1_state, bank00, ROT0, "Coreland / Sega", "The Togyu (315-5065, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, spatter, 0, sys1piosx_315_spat,spatter, system1_state, bank00, ROT0, "Sega", "Spatter (315-xxxx)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, spattera, spatter, sys1piosx_315_5099,spatter, system1_state, bank00, ROT0, "Sega", "Spatter (315-5099)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, ssanchan, spatter, sys1piosx_315_spat,spatter, system1_state, bank00, ROT0, "Sega", "Sanrin San Chan (Japan, 315-xxxx)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pitfall2, 0, sys1piox_315_5093, pitfall2, system1_state, bank00, ROT0, "Sega", "Pitfall II (315-5093)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pitfall2a, pitfall2, sys1piox_315_5093, pitfall2, system1_state, bank00, ROT0, "Sega", "Pitfall II (315-5093, Flicky Conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pitfall2u, pitfall2, sys1pio, pitfall2u, system1_state, bank00, ROT0, "Sega", "Pitfall II (not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, seganinj, 0, sys1piox_315_5102, seganinj, system1_state, bank00, ROT0, "Sega", "Sega Ninja (315-5102)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, seganinju, seganinj, sys1pio, seganinj, system1_state, bank00, ROT0, "Sega", "Sega Ninja (not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, seganinja, seganinj, sys1piox_315_5133, seganinj, system1_state, bank00, ROT0, "Sega", "Sega Ninja (315-5113)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // needs decrypting
-GAME( 1985, ninja, seganinj, sys1piox_315_5102, seganinj, system1_state, bank00, ROT0, "Sega", "Ninja (315-5102)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, nprinceso, seganinj, sys1piox_315_5098, seganinj, system1_state, bank00, ROT0, "Sega", "Ninja Princess (315-5098, 128k Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, nprincesb, seganinj, sys1piox_315_5051, seganinj, system1_state, bank00, ROT0, "bootleg?", "Ninja Princess (315-5051?, 128k Ver. bootleg?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, imsorry, 0, sys1piox_315_5110, imsorry, system1_state, bank00, ROT0, "Coreland / Sega", "I'm Sorry (315-5110, US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, imsorryj, imsorry, sys1piox_315_5110, imsorry, system1_state, bank00, ROT0, "Coreland / Sega", "Gonbee no I'm Sorry (315-5110, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, teddybb, 0, sys1piox_315_5155, teddybb, system1_state, bank00, ROT0, "Sega", "TeddyBoy Blues (315-5115, New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, teddybbo, teddybb, sys1piox_315_5155, teddybb, system1_state, bank00, ROT0, "Sega", "TeddyBoy Blues (315-5115, Old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, teddybbobl, teddybb, sys1piox_315_5155, teddybb, system1_state, bank00, ROT0, "bootleg", "TeddyBoy Blues (Old Ver. bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, myhero, 0, sys1pio, myhero, system1_state, bank00, ROT0, "Coreland / Sega", "My Hero (US, not encrypted)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, sscandal, myhero, sys1piox_315_5132, myhero, system1_state, bank00, ROT0, "Coreland / Sega", "Seishun Scandal (315-5132, Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, myherobl, myhero, sys1piox_315_5132, myhero, system1_state, bank00, ROT0, "bootleg", "My Hero (bootleg, 315-5132 encryption)", MACHINE_SUPPORTS_SAVE ) // cloned 315-5132 encryption? might be a direct copy of an undumped original set
-GAME( 1985, myherok, myhero, sys1piox_315_5132, myhero, system1_state, myherok, ROT0, "Coreland / Sega", "My Hero (Korea)", MACHINE_SUPPORTS_SAVE ) // possible bootleg, has extra encryption
-GAME( 1985, 4dwarrio, 0, sys1piox_315_5162, 4dwarrio, system1_state, bank00, ROT0, "Coreland / Sega", "4-D Warriors (315-5162)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, raflesia, 0, sys1piox_315_5162, raflesia, system1_state, bank00, ROT270, "Coreland / Sega", "Rafflesia (315-5162)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboy, 0, sys1piox_315_5177, wboy, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (set 1, 315-5177)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboyo, wboy, sys1piox_315_5135, wboy, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (set 2, 315-5135)", MACHINE_SUPPORTS_SAVE ) // aka 317-0003
-GAME( 1986, wboy3, wboy, sys1piox_315_5135, wboy3, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (set 3, 315-5135)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboy4, wboy, sys1piox_315_5162, wboy, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (315-5162, 4-D Warriors Conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboyu, wboy, sys1pio, wboyu, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (prototype?)", MACHINE_SUPPORTS_SAVE ) // appears to be a very early / unfinished version.
-GAME( 1986, wboy5, wboy, sys1piox_315_5135, wboy3, system1_state, bank00, ROT0, "bootleg", "Wonder Boy (set 5, bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboyub, wboy, sys1piox_315_5177, wboy, system1_state, bank00, ROT0, "bootleg", "Wonder Boy (US bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blockgal, 0, sys1pioxb, blockgal, system1_state, blockgal, ROT90, "Sega / Vic Tokai","Block Gal (MC-8123B, 317-0029)", MACHINE_SUPPORTS_SAVE)
+GAME( 1984, flicky, 0, sys1piox_315_5051, flicky, system1_state, bank00, ROT0, "Sega", "Flicky (128k Version, 315-5051)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, flickya, flicky, sys1piox_315_5051, flicky, system1_state, bank00, ROT0, "Sega", "Flicky (128k Version, 315-5051, larger roms)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, flickys2, flicky, sys1pio, flickys2, system1_state, bank00, ROT0, "Sega", "Flicky (128k Version, not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, thetogyu, bullfgt, sys1piox_315_5065, bullfgt, system1_state, bank00, ROT0, "Coreland / Sega", "The Togyu (315-5065, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, spatter, 0, sys1piosx_315_spat,spatter, system1_state, bank00, ROT0, "Sega", "Spatter (315-xxxx)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, spattera, spatter, sys1piosx_315_5099,spatter, system1_state, bank00, ROT0, "Sega", "Spatter (315-5099)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, ssanchan, spatter, sys1piosx_315_spat,spatter, system1_state, bank00, ROT0, "Sega", "Sanrin San Chan (Japan, 315-xxxx)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pitfall2, 0, sys1piox_315_5093, pitfall2, system1_state, bank00, ROT0, "Sega", "Pitfall II (315-5093)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pitfall2a, pitfall2, sys1piox_315_5093, pitfall2, system1_state, bank00, ROT0, "Sega", "Pitfall II (315-5093, Flicky Conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pitfall2u, pitfall2, sys1pio, pitfall2u, system1_state, bank00, ROT0, "Sega", "Pitfall II (not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, seganinj, 0, sys1piox_315_5102, seganinj, system1_state, bank00, ROT0, "Sega", "Sega Ninja (315-5102)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, seganinju, seganinj, sys1pio, seganinj, system1_state, bank00, ROT0, "Sega", "Sega Ninja (not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, seganinja, seganinj, sys1piox_315_5133, seganinj, system1_state, bank00, ROT0, "Sega", "Sega Ninja (315-5113)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // needs decrypting
+GAME( 1985, ninja, seganinj, sys1piox_315_5102, seganinj, system1_state, bank00, ROT0, "Sega", "Ninja (315-5102)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, nprinceso, seganinj, sys1piox_315_5098, seganinj, system1_state, bank00, ROT0, "Sega", "Ninja Princess (315-5098, 128k Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, nprincesb, seganinj, sys1piox_315_5051, seganinj, system1_state, bank00, ROT0, "bootleg?", "Ninja Princess (315-5051?, 128k Ver. bootleg?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, imsorry, 0, sys1piox_315_5110, imsorry, system1_state, bank00, ROT0, "Coreland / Sega", "I'm Sorry (315-5110, US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, imsorryj, imsorry, sys1piox_315_5110, imsorry, system1_state, bank00, ROT0, "Coreland / Sega", "Gonbee no I'm Sorry (315-5110, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, teddybb, 0, sys1piox_315_5155, teddybb, system1_state, bank00, ROT0, "Sega", "TeddyBoy Blues (315-5115, New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, teddybbo, teddybb, sys1piox_315_5155, teddybb, system1_state, bank00, ROT0, "Sega", "TeddyBoy Blues (315-5115, Old Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, teddybbobl, teddybb, sys1piox_315_5155, teddybb, system1_state, bank00, ROT0, "bootleg", "TeddyBoy Blues (Old Ver. bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, myhero, 0, sys1pio, myhero, system1_state, bank00, ROT0, "Coreland / Sega", "My Hero (US, not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sscandal, myhero, sys1piox_315_5132, myhero, system1_state, bank00, ROT0, "Coreland / Sega", "Seishun Scandal (315-5132, Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, myherobl, myhero, sys1piox_315_5132, myhero, system1_state, bank00, ROT0, "bootleg", "My Hero (bootleg, 315-5132 encryption)", MACHINE_SUPPORTS_SAVE ) // cloned 315-5132 encryption? might be a direct copy of an undumped original set
+GAME( 1985, myherok, myhero, sys1piox_315_5132, myhero, system1_state, myherok, ROT0, "Coreland / Sega", "My Hero (Korea)", MACHINE_SUPPORTS_SAVE ) // possible bootleg, has extra encryption
+GAME( 1985, 4dwarrio, 0, sys1piox_315_5162, 4dwarrio, system1_state, bank00, ROT0, "Coreland / Sega", "4-D Warriors (315-5162)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, raflesia, 0, sys1piox_315_5162, raflesia, system1_state, bank00, ROT270, "Coreland / Sega", "Rafflesia (315-5162)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboy, 0, sys1piox_315_5177, wboy, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (set 1, 315-5177)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboyo, wboy, sys1piox_315_5135, wboy, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (set 2, 315-5135)", MACHINE_SUPPORTS_SAVE ) // aka 317-0003
+GAME( 1986, wboy3, wboy, sys1piox_315_5135, wboy3, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (set 3, 315-5135)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboy4, wboy, sys1piox_315_5162, wboy, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (315-5162, 4-D Warriors Conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboyu, wboy, sys1pio, wboyu, system1_state, bank00, ROT0, "Escape (Sega license)", "Wonder Boy (prototype?)", MACHINE_SUPPORTS_SAVE ) // appears to be a very early / unfinished version.
+GAME( 1986, wboy5, wboy, sys1piox_315_5135, wboy3, system1_state, bank00, ROT0, "bootleg", "Wonder Boy (set 5, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboyub, wboy, sys1piox_315_5177, wboy, system1_state, bank00, ROT0, "bootleg", "Wonder Boy (US bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blockgal, 0, sys1pioxb, blockgal, system1_state, blockgal, ROT90, "Sega / Vic Tokai","Block Gal (MC-8123B, 317-0029)", MACHINE_SUPPORTS_SAVE)
/* PIO-based System 1 with ROM banking */
-GAME( 1985, hvymetal, 0, sys1piox_315_5135, hvymetal, system1_state, bank44, ROT0, "Sega", "Heavy Metal (315-5135)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, gardia, 0, sys1piox_317_0006, gardia, system1_state, bank44, ROT270, "Coreland / Sega", "Gardia (317-0006)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE)
-GAME( 1986, brain, 0, sys1pio, brain, system1_state, bank44, ROT0, "Coreland / Sega", "Brain", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, hvymetal, 0, sys1piox_315_5135, hvymetal, system1_state, bank44, ROT0, "Sega", "Heavy Metal (315-5135)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, gardia, 0, sys1piox_317_0006, gardia, system1_state, bank44, ROT270, "Coreland / Sega", "Gardia (317-0006)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE)
+GAME( 1986, brain, 0, sys1pio, brain, system1_state, bank44, ROT0, "Coreland / Sega", "Brain", MACHINE_SUPPORTS_SAVE )
/* System 2 */
-GAME( 1985, choplift, 0, sys2rowm, choplift, system1_state, choplift, ROT0, "Sega (licensed from Dan Gorlin)", "Choplifter (8751 315-5151)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, chopliftu, choplift, sys2row, choplift, system1_state, bank0c, ROT0, "Sega (licensed from Dan Gorlin)", "Choplifter (unprotected)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, chopliftbl, choplift, sys2row, choplift, system1_state, bank0c, ROT0, "bootleg", "Choplifter (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, shtngmst, 0, sys2m, shtngmst, system1_state, shtngmst, ROT0, "Sega", "Shooting Master (8751 315-5159)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1985, shtngmste, shtngmst, sys2m, shtngmst, system1_state, shtngmst, ROT0, "Sega / EVG", "Shooting Master (EVG, 8751 315-5159a)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, gardiab, gardia, sys2_317_0007, gardia, system1_state, bank44, ROT270, "bootleg", "Gardia (317-0007?, bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, gardiaj, gardia, sys2_317_0006, gardia, system1_state, bank44, ROT270, "Coreland / Sega", "Gardia (Japan, 317-0006)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboysys2, wboy, sys2_315_5177, wboysys2, system1_state, bank0c, ROT0, "Escape (Sega license)", "Wonder Boy (system 2, set 1, 315-5177)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, wboysys2a, wboy, sys2_315_5176, wboysys2, system1_state, bank0c, ROT0, "Escape (Sega license)", "Wonder Boy (system 2, set 2, 315-5176)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1987, tokisens, 0, sys2, tokisens, system1_state, bank0c, ROT90, "Sega", "Toki no Senshi - Chrono Soldier", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wbml, 0, sys2xb, wbml, system1_state, wbml, ROT0, "Sega / Westone", "Wonder Boy in Monster Land (Japan New Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wbmljo, wbml, sys2xb, wbml, system1_state, wbml, ROT0, "Sega / Westone", "Wonder Boy in Monster Land (Japan Old Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wbmljb, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg", "Wonder Boy in Monster Land (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wbmlb, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg", "Wonder Boy in Monster Land (English bootleg set 1)", MACHINE_SUPPORTS_SAVE)
-GAME( 1987, wbmlbg, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg (Galaxy Electronics)", "Wonder Boy in Monster Land (English bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wbmlbge, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg (Gecas)", "Wonder Boy in Monster Land (English bootleg set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 2009, wbmlvc, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "Sega", "Wonder Boy in Monster Land (English, Virtual Console)", MACHINE_SUPPORTS_SAVE )
-GAME( 2009, wbmlvcd, wbml, sys2xboot, wbml, system1_state, bootsys2d, ROT0, "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of English, Virtual Console release)", MACHINE_SUPPORTS_SAVE ) // fully decrypted version
-GAME( 1987, wbmld, wbml, sys2xboot, wbml, system1_state, bootsys2d, ROT0, "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of Japan New Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wbmljod, wbml, sys2xboot, wbml, system1_state, bootsys2d, ROT0, "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of Japan Old Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, dakkochn, 0, sys2xb, dakkochn, system1_state, dakkochn, ROT0, "White Board", "DakkoChan House (MC-8123B, 317-5014)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blockgalb, blockgal, sys2x, blockgal, system1_state, bootleg, ROT90, "bootleg", "Block Gal (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, ufosensi, 0, sys2rowxb, ufosensi, system1_state, ufosensi, ROT0, "Sega", "Ufo Senshi Yohko Chan (MC-8123, 317-0064)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, ufosensib, ufosensi, sys2rowxboot, ufosensi, system1_state, bootsys2, ROT0, "bootleg", "Ufo Senshi Yohko Chan (bootleg, not encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, choplift, 0, sys2rowm, choplift, system1_state, choplift, ROT0, "Sega (licensed from Dan Gorlin)", "Choplifter (8751 315-5151)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, chopliftu, choplift, sys2row, choplift, system1_state, bank0c, ROT0, "Sega (licensed from Dan Gorlin)", "Choplifter (unprotected)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, chopliftbl, choplift, sys2row, choplift, system1_state, bank0c, ROT0, "bootleg", "Choplifter (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, shtngmst, 0, sys2m, shtngmst, system1_state, shtngmst, ROT0, "Sega", "Shooting Master (8751 315-5159)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1985, shtngmste, shtngmst, sys2m, shtngmst, system1_state, shtngmst, ROT0, "Sega / EVG", "Shooting Master (EVG, 8751 315-5159a)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, gardiab, gardia, sys2_317_0007, gardia, system1_state, bank44, ROT270, "bootleg", "Gardia (317-0007?, bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, gardiaj, gardia, sys2_317_0006, gardia, system1_state, bank44, ROT270, "Coreland / Sega", "Gardia (Japan, 317-0006)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboysys2, wboy, sys2_315_5177, wboysys2, system1_state, bank0c, ROT0, "Escape (Sega license)", "Wonder Boy (system 2, set 1, 315-5177)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, wboysys2a, wboy, sys2_315_5176, wboysys2, system1_state, bank0c, ROT0, "Escape (Sega license)", "Wonder Boy (system 2, set 2, 315-5176)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tokisens, 0, sys2, tokisens, system1_state, bank0c, ROT90, "Sega", "Toki no Senshi - Chrono Soldier", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wbml, 0, sys2xb, wbml, system1_state, wbml, ROT0, "Sega / Westone", "Wonder Boy in Monster Land (Japan New Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wbmljo, wbml, sys2xb, wbml, system1_state, wbml, ROT0, "Sega / Westone", "Wonder Boy in Monster Land (Japan Old Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wbmljb, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg", "Wonder Boy in Monster Land (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wbmlb, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg", "Wonder Boy in Monster Land (English bootleg set 1)", MACHINE_SUPPORTS_SAVE)
+GAME( 1987, wbmlbg, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg (Galaxy Electronics)", "Wonder Boy in Monster Land (English bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wbmlbge, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "bootleg (Gecas)", "Wonder Boy in Monster Land (English bootleg set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 2009, wbmlvc, wbml, sys2xboot, wbml, system1_state, bootsys2, ROT0, "Sega", "Wonder Boy in Monster Land (English, Virtual Console)", MACHINE_SUPPORTS_SAVE )
+GAME( 2009, wbmlvcd, wbml, sys2xboot, wbml, system1_state, bootsys2d, ROT0, "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of English, Virtual Console release)", MACHINE_SUPPORTS_SAVE ) // fully decrypted version
+GAME( 1987, wbmld, wbml, sys2xboot, wbml, system1_state, bootsys2d, ROT0, "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of Japan New Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wbmljod, wbml, sys2xboot, wbml, system1_state, bootsys2d, ROT0, "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of Japan Old Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, dakkochn, 0, sys2xb, dakkochn, system1_state, dakkochn, ROT0, "White Board", "DakkoChan House (MC-8123B, 317-5014)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blockgalb, blockgal, sys2x, blockgal, system1_state, bootleg, ROT90, "bootleg", "Block Gal (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, ufosensi, 0, sys2rowxb, ufosensi, system1_state, ufosensi, ROT0, "Sega", "Ufo Senshi Yohko Chan (MC-8123, 317-0064)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, ufosensib, ufosensi, sys2rowxboot, ufosensi, system1_state, bootsys2, ROT0, "bootleg", "Ufo Senshi Yohko Chan (bootleg, not encrypted)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 79d7e6376fc..96c85244d8e 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -2077,7 +2077,7 @@ static MACHINE_CONFIG_FRAGMENT( datsu_ym2151_msm5205 )
MCFG_SOUND_ADD("5205", MSM5205, 220000)
MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, tturfbl_msm5205_callback))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -2107,7 +2107,7 @@ static MACHINE_CONFIG_FRAGMENT( datsu_2x_ym2203_msm5205 )
MCFG_SOUND_ADD("5205", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, datsu_msm5205_callback))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
@@ -2118,7 +2118,7 @@ MACHINE_CONFIG_END
*************************************/
/* System 16A/B Bootlegs */
-static MACHINE_CONFIG_START( system16_base, segas1x_bootleg_state )
+static MACHINE_CONFIG_START( system16_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -2193,7 +2193,7 @@ static MACHINE_CONFIG_DERIVED( passsht4b, system16_base )
MCFG_FRAGMENT_ADD(datsu_2x_ym2203_msm5205)
MCFG_DEVICE_MODIFY("5205")
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( wb3bb, system16_base )
@@ -2215,7 +2215,7 @@ static MACHINE_CONFIG_DERIVED( wb3bb, system16_base )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( goldnaxeb_base, segas1x_bootleg_state )
+static MACHINE_CONFIG_START( goldnaxeb_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -2342,7 +2342,7 @@ static MACHINE_CONFIG_DERIVED( altbeastbl, system16_base )
MCFG_FRAGMENT_ADD(datsu_2x_ym2203_msm5205)
MCFG_DEVICE_MODIFY("5205")
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B)
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( beautyb, system16_base )
@@ -2359,7 +2359,7 @@ MACHINE_CONFIG_END
/* System 18 Bootlegs */
-static MACHINE_CONFIG_START( system18, segas1x_bootleg_state )
+static MACHINE_CONFIG_START( system18 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -2438,7 +2438,7 @@ static MACHINE_CONFIG_DERIVED( shdancbl, system18 )
MCFG_SOUND_ADD("5205", MSM5205, 200000)
MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, shdancbl_msm5205_callback))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -2456,7 +2456,7 @@ static MACHINE_CONFIG_DERIVED( shdancbla, system18 )
MCFG_SOUND_ADD("5205", MSM5205, 200000)
MCFG_MSM5205_VCLK_CB(WRITELINE(segas1x_bootleg_state, shdancbl_msm5205_callback))
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B)
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -2474,7 +2474,7 @@ MACHINE_RESET_MEMBER(segas1x_bootleg_state,ddcrewbl)
}
-static MACHINE_CONFIG_START( ddcrewbl, segas1x_bootleg_state )
+static MACHINE_CONFIG_START( ddcrewbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000)
@@ -2502,7 +2502,7 @@ static MACHINE_CONFIG_START( ddcrewbl, segas1x_bootleg_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 10000000/10, OKIM6295_PIN7_HIGH) // clock and pin not verified
+ MCFG_OKIM6295_ADD("oki", 10000000/10, PIN7_HIGH) // clock and pin not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -3881,33 +3881,33 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,astormbl)
*************************************/
/* System 16A based bootlegs (less complex tilemap system) */
-GAME( 1987, shinobld, shinobi, shinobi_datsu, shinobi, segas1x_bootleg_state, shinobl, ROT0, "bootleg (Datsu)", "Shinobi (Datsu bootleg, set 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1987, shinoblda, shinobi, shinobi_datsu, shinobi, segas1x_bootleg_state, shinobl, ROT0, "bootleg (Datsu)", "Shinobi (Datsu bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1988, passshtb, passsht, passshtb, passsht, segas1x_bootleg_state, passsht, ROT270, "bootleg", "Passing Shot (2 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1988, passht4b, passsht, passsht4b, passht4b, segas1x_bootleg_state, shinobl, ROT270, "bootleg", "Passing Shot (4 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1988, wb3bbl, wb3, wb3bb, wb3b, segas1x_bootleg_state, wb3bbl, ROT0, "bootleg", "Wonder Boy III - Monster Lair (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)
-GAME( 1988, wb3bble, wb3, wb3bb, wb3b, segas1x_bootleg_state, wb3bbl, ROT0, "bootleg", "Wonder Boy III - Monster Lair (encrypted bootleg)", MACHINE_NOT_WORKING )
+GAME( 1987, shinobld, shinobi, shinobi_datsu, shinobi, segas1x_bootleg_state, shinobl, ROT0, "bootleg (Datsu)", "Shinobi (Datsu bootleg, set 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1987, shinoblda, shinobi, shinobi_datsu, shinobi, segas1x_bootleg_state, shinobl, ROT0, "bootleg (Datsu)", "Shinobi (Datsu bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, passshtb, passsht, passshtb, passsht, segas1x_bootleg_state, passsht, ROT270, "bootleg", "Passing Shot (2 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, passht4b, passsht, passsht4b, passht4b, segas1x_bootleg_state, shinobl, ROT270, "bootleg", "Passing Shot (4 Players) (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, wb3bbl, wb3, wb3bb, wb3b, segas1x_bootleg_state, wb3bbl, ROT0, "bootleg", "Wonder Boy III - Monster Lair (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS)
+GAME( 1988, wb3bble, wb3, wb3bb, wb3b, segas1x_bootleg_state, wb3bbl, ROT0, "bootleg", "Wonder Boy III - Monster Lair (encrypted bootleg)", MACHINE_NOT_WORKING )
/* System 16B based bootlegs */
-GAME( 1989, bayrouteb1, bayroute, bayrouteb1, bayroute, segas1x_bootleg_state, bayrouteb1, ROT0, "bootleg (Datsu)", "Bay Route (encrypted, protected bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // broken sprites (due to missing/wrong irq code?)
-GAME( 1989, bayrouteb2, bayroute, bayrouteb2, bayroute, segas1x_bootleg_state, bayrouteb2, ROT0, "bootleg (Datsu)", "Bay Route (Datsu bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1989, goldnaxeb1, goldnaxe, goldnaxeb1, goldnaxe, segas1x_bootleg_state, goldnaxeb1, ROT0, "bootleg", "Golden Axe (encrypted bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, goldnaxeb2, goldnaxe, goldnaxeb2, goldnaxe, segas1x_bootleg_state, goldnaxeb2, ROT0, "bootleg", "Golden Axe (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, tturfbl, tturf, tturfbl, tturf, segas1x_bootleg_state, tturfbl, ROT0, "bootleg (Datsu)", "Tough Turf (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, dduxbl, ddux, dduxbl, ddux, segas1x_bootleg_state, dduxbl, ROT0, "bootleg (Datsu)", "Dynamite Dux (Datsu bootleg)", MACHINE_NOT_WORKING )
-GAME( 1988, altbeastbl, altbeast, altbeastbl, tetris, segas1x_bootleg_state, altbeastbl, ROT0, "bootleg (Datsu)", "Altered Beast (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1988, mutantwarr, altbeast, altbeastbl, tetris, segas1x_bootleg_state, altbeastbl, ROT0, "bootleg (Datsu)", "Mutant Warrior (Altered Beast - Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, eswatbl, eswat, eswatbl, eswat, segas1x_bootleg_state, eswatbl, ROT0, "bootleg", "E-Swat - Cyber Police (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1988, tetrisbl, tetris, tetrisbl, tetris, segas1x_bootleg_state, dduxbl, ROT0, "bootleg", "Tetris (bootleg)", 0 )
+GAME( 1989, bayrouteb1, bayroute, bayrouteb1, bayroute, segas1x_bootleg_state, bayrouteb1, ROT0, "bootleg (Datsu)", "Bay Route (encrypted, protected bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // broken sprites (due to missing/wrong irq code?)
+GAME( 1989, bayrouteb2, bayroute, bayrouteb2, bayroute, segas1x_bootleg_state, bayrouteb2, ROT0, "bootleg (Datsu)", "Bay Route (Datsu bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1989, goldnaxeb1, goldnaxe, goldnaxeb1, goldnaxe, segas1x_bootleg_state, goldnaxeb1, ROT0, "bootleg", "Golden Axe (encrypted bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, goldnaxeb2, goldnaxe, goldnaxeb2, goldnaxe, segas1x_bootleg_state, goldnaxeb2, ROT0, "bootleg", "Golden Axe (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, tturfbl, tturf, tturfbl, tturf, segas1x_bootleg_state, tturfbl, ROT0, "bootleg (Datsu)", "Tough Turf (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, dduxbl, ddux, dduxbl, ddux, segas1x_bootleg_state, dduxbl, ROT0, "bootleg (Datsu)", "Dynamite Dux (Datsu bootleg)", MACHINE_NOT_WORKING )
+GAME( 1988, altbeastbl, altbeast, altbeastbl, tetris, segas1x_bootleg_state, altbeastbl, ROT0, "bootleg (Datsu)", "Altered Beast (Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, mutantwarr, altbeast, altbeastbl, tetris, segas1x_bootleg_state, altbeastbl, ROT0, "bootleg (Datsu)", "Mutant Warrior (Altered Beast - Datsu bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, eswatbl, eswat, eswatbl, eswat, segas1x_bootleg_state, eswatbl, ROT0, "bootleg", "E-Swat - Cyber Police (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1988, tetrisbl, tetris, tetrisbl, tetris, segas1x_bootleg_state, dduxbl, ROT0, "bootleg", "Tetris (bootleg)", 0 )
/* Tetris-based hardware */
-GAME( 1991, beautyb, 0, beautyb, tetris, segas1x_bootleg_state, beautyb, ROT0, "AMT", "Beauty Block", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1991, iqpipe, 0, beautyb, tetris, segas1x_bootleg_state, beautyb, ROT0, "AMT", "IQ Pipe", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1991, beautyb, 0, beautyb, tetris, segas1x_bootleg_state, beautyb, ROT0, "AMT", "Beauty Block", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1991, iqpipe, 0, beautyb, tetris, segas1x_bootleg_state, beautyb, ROT0, "AMT", "IQ Pipe", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
/* System 18 bootlegs */
-GAME( 1990, astormbl, astorm, astormbl, astormbl, segas1x_bootleg_state, astormbl, ROT0, "bootleg", "Alien Storm (bootleg, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1990, astormb2, astorm, astormbl, astormbl, segas1x_bootleg_state, astormbl, ROT0, "bootleg", "Alien Storm (bootleg, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
-GAME( 1990, mwalkbl, mwalk, mwalkbl, mwalkbl, segas1x_bootleg_state, mwalkbl, ROT0, "bootleg", "Michael Jackson's Moonwalker (bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, shdancbl, shdancer, shdancbl, shdancbl, segas1x_bootleg_state, shdancbl, ROT0, "bootleg", "Shadow Dancer (bootleg, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1989, shdancbla, shdancer, shdancbla, shdancbl, segas1x_bootleg_state, shdancbl, ROT0, "bootleg", "Shadow Dancer (bootleg, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1990, ddcrewbl, ddcrew, ddcrewbl, ddcrewbl, segas1x_bootleg_state, ddcrewbl, ROT0, "bootleg", "D. D. Crew (bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1990, astormbl, astorm, astormbl, astormbl, segas1x_bootleg_state, astormbl, ROT0, "bootleg", "Alien Storm (bootleg, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1990, astormb2, astorm, astormbl, astormbl, segas1x_bootleg_state, astormbl, ROT0, "bootleg", "Alien Storm (bootleg, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
+GAME( 1990, mwalkbl, mwalk, mwalkbl, mwalkbl, segas1x_bootleg_state, mwalkbl, ROT0, "bootleg", "Michael Jackson's Moonwalker (bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, shdancbl, shdancer, shdancbl, shdancbl, segas1x_bootleg_state, shdancbl, ROT0, "bootleg", "Shadow Dancer (bootleg, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1989, shdancbla, shdancer, shdancbla, shdancbl, segas1x_bootleg_state, shdancbl, ROT0, "bootleg", "Shadow Dancer (bootleg, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1990, ddcrewbl, ddcrew, ddcrewbl, ddcrewbl, segas1x_bootleg_state, ddcrewbl, ROT0, "bootleg", "D. D. Crew (bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp
index a8878e6c30c..f6aca28320b 100644
--- a/src/mame/drivers/tagteam.cpp
+++ b/src/mame/drivers/tagteam.cpp
@@ -213,7 +213,7 @@ INTERRUPT_GEN_MEMBER(tagteam_state::sound_timer_irq)
}
-static MACHINE_CONFIG_START( tagteam, tagteam_state )
+static MACHINE_CONFIG_START( tagteam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12MHz/8)
@@ -319,5 +319,5 @@ ROM_END
-GAME( 1983, bigprowr, 0, tagteam, bigprowr, driver_device, 0, ROT270, "Technos Japan", "The Big Pro Wrestling!", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, tagteam, bigprowr, tagteam, tagteam, driver_device, 0, ROT270, "Technos Japan (Data East license)", "Tag Team Wrestling", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, bigprowr, 0, tagteam, bigprowr, tagteam_state, 0, ROT270, "Technos Japan", "The Big Pro Wrestling!", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, tagteam, bigprowr, tagteam, tagteam, tagteam_state, 0, ROT270, "Technos Japan (Data East license)", "Tag Team Wrestling", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp
index 5f43c53a461..30ed318b936 100644
--- a/src/mame/drivers/tail2nos.cpp
+++ b/src/mame/drivers/tail2nos.cpp
@@ -232,7 +232,7 @@ void tail2nos_state::machine_reset()
m_video_enable = 0;
}
-static MACHINE_CONFIG_START( tail2nos, tail2nos_state )
+static MACHINE_CONFIG_START( tail2nos )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz/2) /* verified on pcb */
@@ -351,8 +351,8 @@ ROM_START( sformulaa )
ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */
ROM_LOAD16_BYTE( "04.bin", 0x00000, 0x10000, CRC(f40e9c3c) SHA1(2ab45f46f92bce42748692cafe601c5893de127b) )
ROM_LOAD16_BYTE( "07.bin", 0x00001, 0x10000, CRC(d1cf6dca) SHA1(18228cc98722eb5907850e2d0317d1f4bf04fb8f) )
- ROM_LOAD16_BYTE( "v3", 0x20000, 0x10000, CRC(e2e0abad) SHA1(1a1054bada9654484fe81fe4b4b32af5ab7b53f0) )
- ROM_LOAD16_BYTE( "v6", 0x20001, 0x10000, CRC(069817a7) SHA1(cca382fe2a49c8c3c84b879a1c30dffff84ef406) )
+ ROM_LOAD16_BYTE( "v3", 0x20000, 0x10000, CRC(e2e0abad) SHA1(1a1054bada9654484fe81fe4b4b32af5ab7b53f0) )
+ ROM_LOAD16_BYTE( "v6", 0x20001, 0x10000, CRC(069817a7) SHA1(cca382fe2a49c8c3c84b879a1c30dffff84ef406) )
ROM_REGION16_BE( 0x80000, "user1", 0 )
/* extra ROM mapped at 200000 */
@@ -370,7 +370,7 @@ ROM_START( sformulaa )
ROM_REGION( 0x100000, "gfx1", ROMREGION_ERASE00 )
ROM_LOAD( "a24", 0x00000, 0x80000, CRC(b1e9de43) SHA1(0144252dd9ed561fbebd4994cccf11f6c87e1825) )
ROM_LOAD( "o1s", 0x80000, 0x40000, CRC(e27a8eb4) SHA1(4fcadabf42a1c3deeb6d74d75cdbee802cf16db5) )
- ROM_LOAD( "9.bin", 0xc0000, 0x08000, CRC(c76edc0a) SHA1(2c6c21f8d1f3bcb0f65ba5a779fe479783271e0b) ) // present on this PCB, contains Japanese text + same font as in above roms, where does it map? is there another layer?
+ ROM_LOAD( "9.bin", 0xc0000, 0x08000, CRC(c76edc0a) SHA1(2c6c21f8d1f3bcb0f65ba5a779fe479783271e0b) ) // present on this PCB, contains Japanese text + same font as in above roms, where does it map? is there another layer?
ROM_REGION( 0x80000, "gfx2", 0 )
ROM_LOAD( "oj1", 0x000000, 0x40000, CRC(39c36b35) SHA1(a97480696bf6d81bf415737e03cc5324d439ab84) )
@@ -380,6 +380,6 @@ ROM_START( sformulaa )
ROM_LOAD( "osb", 0x00000, 0x20000, CRC(d49ab2f5) SHA1(92f7f6c8f35ac39910879dd88d2cfb6db7c848c9) )
ROM_END
-GAME( 1989, tail2nos, 0, tail2nos, tail2nos, driver_device, 0, ROT90, "V-System Co.", "Tail to Nose - Great Championship", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, sformula, tail2nos, tail2nos, tail2nos, driver_device, 0, ROT90, "V-System Co.", "Super Formula (Japan, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, sformulaa,tail2nos, tail2nos, tail2nos, driver_device, 0, ROT90, "V-System Co.", "Super Formula (Japan, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // No Japan warning, but Japanese version
+GAME( 1989, tail2nos, 0, tail2nos, tail2nos, tail2nos_state, 0, ROT90, "V-System Co.", "Tail to Nose - Great Championship", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, sformula, tail2nos, tail2nos, tail2nos, tail2nos_state, 0, ROT90, "V-System Co.", "Super Formula (Japan, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, sformulaa, tail2nos, tail2nos, tail2nos, tail2nos_state, 0, ROT90, "V-System Co.", "Super Formula (Japan, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // No Japan warning, but Japanese version
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 2bf1bb1e425..11982c96ccf 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -324,7 +324,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( taito_state::timer_a )
output().set_digit_value(++digit, patterns[m_p_ram[m_out_offs++]&15]);
}
-static MACHINE_CONFIG_START( taito, taito_state )
+static MACHINE_CONFIG_START( taito )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 19000000/9)
MCFG_CPU_PROGRAM_MAP(taito_map)
@@ -965,50 +965,50 @@ ROM_START(mrblkz80)
ROM_END
// no sound
-GAME(198?, taitest, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Taito Test Fixture", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME(198?, taitest, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Taito Test Fixture", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
// dac (sintetizador)
-GAME(1979, shock, 0, shock, taito, taito_state, taito, ROT0, "Taito do Brasil", "Shock", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1980, obaoba, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Oba-Oba (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1980, obaoba1, obaoba, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Oba-Oba (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1980, drakor, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Drakor", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1980, meteort, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Meteor (Taito)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1981, sureshop, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Sure Shot (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1981, cosmic, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cosmic", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1982, gemini2k, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Gemini 2000 (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, gemini2k1, gemini2k, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Gemini 2000 (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, vortexp, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Vortex (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1982, zarza, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Zarza (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, zarza1, zarza, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Zarza (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, sharkt, 0, taito2, taito, taito_state, taito, ROT0, "Taito do Brasil", "Shark (Taito)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, stest, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Speed Test", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1982, lunelle, 0, taito2, taito, taito_state, taito, ROT0, "Taito do Brasil", "Lunelle", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1980, rally, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Rally", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1979, shock, 0, shock, taito, taito_state, taito, ROT0, "Taito do Brasil", "Shock", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1980, obaoba, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Oba-Oba (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1980, obaoba1, obaoba, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Oba-Oba (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1980, drakor, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Drakor", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1980, meteort, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Meteor (Taito)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1981, sureshop, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Sure Shot (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1981, cosmic, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cosmic", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1982, gemini2k, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Gemini 2000 (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, gemini2k1, gemini2k, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Gemini 2000 (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, vortexp, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Vortex (Pinball)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1982, zarza, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Zarza (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, zarza1, zarza, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Zarza (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, sharkt, 0, taito2, taito, taito_state, taito, ROT0, "Taito do Brasil", "Shark (Taito)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, stest, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Speed Test", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1982, lunelle, 0, taito2, taito, taito_state, taito, ROT0, "Taito do Brasil", "Lunelle", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1980, rally, 0, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Rally", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
// dac and vox (sintevox)
-GAME(1981, fireact, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Fire Action", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, cavnegro, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cavaleiro Negro (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, cavnegro1, cavnegro, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cavaleiro Negro (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, cavnegro2, cavnegro, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cavaleiro Negro (set 3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1981, ladylukt, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Lady Luck (Taito)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(198?, vegast, ladylukt, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Vegas (Taito)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1982, titan, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Titan (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1982, titan1, titan, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Titan (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(1982, hawkman, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Hawkman (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, hawkman1, hawkman, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Hawkman (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, fireact, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Fire Action", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, cavnegro, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cavaleiro Negro (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, cavnegro1, cavnegro, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cavaleiro Negro (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, cavnegro2, cavnegro, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Cavaleiro Negro (set 3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1981, ladylukt, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Lady Luck (Taito)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME(198?, vegast, ladylukt, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Vegas (Taito)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME(1982, titan, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Titan (set 1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME(1982, titan1, titan, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Titan (set 2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME(1982, hawkman, 0, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Hawkman (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, hawkman1, hawkman, taito4, taito, taito_state, taito, ROT0, "Taito do Brasil", "Hawkman (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
// dac and ay
-GAME(1982, snake, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Snake Machine", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(198?, voleybal, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Volley", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, mrblack, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Mr. Black (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, mrblack1, mrblack, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Mr. Black (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, snake, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Snake Machine", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(198?, voleybal, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Volley", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, mrblack, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Mr. Black (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, mrblack1, mrblack, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Mr. Black (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1985, sshuttle, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Space Shuttle (Taito) (set 1)", MACHINE_IS_SKELETON_MECHANICAL)
GAME(1985, sshuttle1, sshuttle, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Space Shuttle (Taito) (set 2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(198?, polar, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Polar Explorer", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(198?, polar, 0, taito5, taito, taito_state, taito, ROT0, "Taito do Brasil", "Polar Explorer", MACHINE_IS_SKELETON_MECHANICAL)
// dac, vox and ay
-GAME(1982, gork, 0, taito6, taito, taito_state, taito, ROT0, "Taito do Brasil", "Gork", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME(198?, fireactd, 0, taito6, taito, taito_state, taito, ROT0, "Taito do Brasil", "Fire Action Deluxe", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, gork, 0, taito6, taito, taito_state, taito, ROT0, "Taito do Brasil", "Gork", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME(198?, fireactd, 0, taito6, taito, taito_state, taito, ROT0, "Taito do Brasil", "Fire Action Deluxe", MACHINE_IS_SKELETON_MECHANICAL)
// different hardware
-GAME(198?, mrblkz80, mrblack, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Mr. Black (Z-80 CPU)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(198?, mrblkz80, mrblack, taito, taito, taito_state, taito, ROT0, "Taito do Brasil", "Mr. Black (Z-80 CPU)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp
index 283735451c7..c2465b2504f 100644
--- a/src/mame/drivers/taito_b.cpp
+++ b/src/mame/drivers/taito_b.cpp
@@ -1914,7 +1914,7 @@ void taitob_state::machine_reset()
}
-static MACHINE_CONFIG_START( rastsag2, taitob_state )
+static MACHINE_CONFIG_START( rastsag2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -1970,7 +1970,7 @@ static MACHINE_CONFIG_START( rastsag2, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( masterw, taitob_state )
+static MACHINE_CONFIG_START( masterw )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2045,7 +2045,7 @@ static MACHINE_CONFIG_DERIVED( tetrista, masterw ) /* Master of Weapon conversio
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ashura, taitob_state )
+static MACHINE_CONFIG_START( ashura )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2101,7 +2101,7 @@ static MACHINE_CONFIG_START( ashura, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( crimec, taitob_state )
+static MACHINE_CONFIG_START( crimec )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2158,7 +2158,7 @@ static MACHINE_CONFIG_START( crimec, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hitice, taitob_state )
+static MACHINE_CONFIG_START( hitice )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2211,7 +2211,7 @@ static MACHINE_CONFIG_START( hitice, taitob_state )
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
@@ -2220,7 +2220,7 @@ static MACHINE_CONFIG_START( hitice, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rambo3p, taitob_state )
+static MACHINE_CONFIG_START( rambo3p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* verified on pcb */
@@ -2277,7 +2277,7 @@ static MACHINE_CONFIG_START( rambo3p, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rambo3, taitob_state )
+static MACHINE_CONFIG_START( rambo3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12MHz verified on pcb */
@@ -2333,7 +2333,7 @@ static MACHINE_CONFIG_START( rambo3, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pbobble, taitob_state )
+static MACHINE_CONFIG_START( pbobble )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2395,7 +2395,7 @@ static MACHINE_CONFIG_START( pbobble, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spacedx, taitob_state )
+static MACHINE_CONFIG_START( spacedx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2457,7 +2457,7 @@ static MACHINE_CONFIG_START( spacedx, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spacedxo, taitob_state )
+static MACHINE_CONFIG_START( spacedxo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2513,7 +2513,7 @@ static MACHINE_CONFIG_START( spacedxo, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( qzshowby, taitob_state )
+static MACHINE_CONFIG_START( qzshowby )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz according to the readme*/
@@ -2575,7 +2575,7 @@ static MACHINE_CONFIG_START( qzshowby, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( viofight, taitob_state )
+static MACHINE_CONFIG_START( viofight )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2627,7 +2627,7 @@ static MACHINE_CONFIG_START( viofight, taitob_state )
MCFG_SOUND_ROUTE(2, "mono", 0.25)
MCFG_SOUND_ROUTE(3, "mono", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, OKIM6295_PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, PIN7_HIGH) // 1.056MHz clock frequency, but pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
@@ -2636,7 +2636,7 @@ static MACHINE_CONFIG_START( viofight, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( silentd, taitob_state )
+static MACHINE_CONFIG_START( silentd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2692,7 +2692,7 @@ static MACHINE_CONFIG_START( silentd, taitob_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( selfeena, taitob_state )
+static MACHINE_CONFIG_START( selfeena )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2757,7 +2757,7 @@ void taitob_state::ryujin_patch(void)
}
#endif
-static MACHINE_CONFIG_START( ryujin, taitob_state )
+static MACHINE_CONFIG_START( ryujin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2) /* 12 MHz */
@@ -2820,7 +2820,7 @@ void taitob_state::sbm_patch(void)
}
#endif
-static MACHINE_CONFIG_START( sbm, taitob_state )
+static MACHINE_CONFIG_START( sbm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -2875,7 +2875,7 @@ static MACHINE_CONFIG_START( sbm, taitob_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( realpunc, taitob_state )
+static MACHINE_CONFIG_START( realpunc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -3745,43 +3745,43 @@ DRIVER_INIT_MEMBER(taitob_state,taito_b)
membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x4000);
}
-GAME( 1989, masterw, 0, masterw, masterw, taitob_state, taito_b, ROT270, "Taito Corporation Japan", "Master of Weapon (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, masterwu, masterw, masterw, masterwu, taitob_state, taito_b, ROT270, "Taito America Corporation", "Master of Weapon (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, masterwj, masterw, masterw, masterwj, taitob_state, taito_b, ROT270, "Taito Corporation", "Master of Weapon (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, yukiwo, masterw, masterw, yukiwo, taitob_state, taito_b, ROT270, "Taito Corporation Japan", "Yukiwo (World, prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, masterw, 0, masterw, masterw, taitob_state, taito_b, ROT270, "Taito Corporation Japan", "Master of Weapon (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, masterwu, masterw, masterw, masterwu, taitob_state, taito_b, ROT270, "Taito America Corporation", "Master of Weapon (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, masterwj, masterw, masterw, masterwj, taitob_state, taito_b, ROT270, "Taito Corporation", "Master of Weapon (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, yukiwo, masterw, masterw, yukiwo, taitob_state, taito_b, ROT270, "Taito Corporation Japan", "Yukiwo (World, prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, nastar, 0, rastsag2, nastar, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Nastar (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, nastarw, nastar, rastsag2, nastarw, taitob_state, taito_b, ROT0, "Taito America Corporation", "Nastar Warrior (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, rastsag2, nastar, rastsag2, rastsag2, taitob_state, taito_b, ROT0, "Taito Corporation", "Rastan Saga 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, nastar, 0, rastsag2, nastar, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Nastar (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, nastarw, nastar, rastsag2, nastarw, taitob_state, taito_b, ROT0, "Taito America Corporation", "Nastar Warrior (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, rastsag2, nastar, rastsag2, rastsag2, taitob_state, taito_b, ROT0, "Taito Corporation", "Rastan Saga 2 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, rambo3, 0, rambo3, rambo3, taitob_state, taito_b, ROT0, "Taito Europe Corporation", "Rambo III (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, rambo3u, rambo3, rambo3, rambo3u, taitob_state, taito_b, ROT0, "Taito America Corporation", "Rambo III (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, rambo3p, rambo3, rambo3p, rambo3p, taitob_state, taito_b, ROT0, "Taito Europe Corporation", "Rambo III (Europe, Proto?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, rambo3, 0, rambo3, rambo3, taitob_state, taito_b, ROT0, "Taito Europe Corporation", "Rambo III (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, rambo3u, rambo3, rambo3, rambo3u, taitob_state, taito_b, ROT0, "Taito America Corporation", "Rambo III (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, rambo3p, rambo3, rambo3p, rambo3p, taitob_state, taito_b, ROT0, "Taito Europe Corporation", "Rambo III (Europe, Proto?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimec, 0, crimec, crimec, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Crime City (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimecu, crimec, crimec, crimecu, taitob_state, taito_b, ROT0, "Taito America Corporation", "Crime City (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimecj, crimec, crimec, crimecj, taitob_state, taito_b, ROT0, "Taito Corporation", "Crime City (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimec, 0, crimec, crimec, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Crime City (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimecu, crimec, crimec, crimecu, taitob_state, taito_b, ROT0, "Taito America Corporation", "Crime City (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimecj, crimec, crimec, crimecj, taitob_state, taito_b, ROT0, "Taito Corporation", "Crime City (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tetrist, tetris, tetrist, tetrist, taitob_state, taito_b, ROT0, "Sega", "Tetris (Japan, Taito B-System, Nastar Conversion Kit)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tetrist, tetris, tetrist, tetrist, taitob_state, taito_b, ROT0, "Sega", "Tetris (Japan, Taito B-System, Nastar Conversion Kit)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, tetrista, tetris, tetrista, tetrist, taitob_state, taito_b, ROT0, "Sega", "Tetris (Japan, Taito B-System, Master of Weapon Conversion Kit)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, viofight, 0, viofight, viofight, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Violence Fight (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, viofightu,viofight,viofight, viofightu, taitob_state, taito_b, ROT0, "Taito America Corporation", "Violence Fight (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, viofightj,viofight,viofight, viofightj, taitob_state, taito_b, ROT0, "Taito Corporation", "Violence Fight (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, viofight, 0, viofight, viofight, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Violence Fight (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, viofightu,viofight,viofight, viofightu, taitob_state, taito_b, ROT0, "Taito America Corporation", "Violence Fight (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, viofightj,viofight,viofight, viofightj, taitob_state, taito_b, ROT0, "Taito Corporation", "Violence Fight (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ashura, 0, ashura, ashura, taitob_state, taito_b, ROT270, "Taito Corporation Japan", "Ashura Blaster (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ashuraj, ashura, ashura, ashuraj, taitob_state, taito_b, ROT270, "Taito Corporation", "Ashura Blaster (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ashurau, ashura, ashura, ashurau, taitob_state, taito_b, ROT270, "Taito America Corporation", "Ashura Blaster (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ashura, 0, ashura, ashura, taitob_state, taito_b, ROT270, "Taito Corporation Japan", "Ashura Blaster (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ashuraj, ashura, ashura, ashuraj, taitob_state, taito_b, ROT270, "Taito Corporation", "Ashura Blaster (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ashurau, ashura, ashura, ashurau, taitob_state, taito_b, ROT270, "Taito America Corporation", "Ashura Blaster (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hitice, 0, hitice, hitice, taitob_state, taito_b, ROT0, "Taito Corporation (Williams license)", "Hit the Ice (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hiticerb, hitice, hitice, hitice, taitob_state, taito_b, ROT0, "Taito Corporation (Williams license)", "Hit the Ice (US, with riser board)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hiticej, hitice, hitice, hiticej, taitob_state, taito_b, ROT0, "Taito Corporation (licensed from Midway)", "Hit the Ice (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hitice, 0, hitice, hitice, taitob_state, taito_b, ROT0, "Taito Corporation (Williams license)", "Hit the Ice (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hiticerb, hitice, hitice, hitice, taitob_state, taito_b, ROT0, "Taito Corporation (Williams license)", "Hit the Ice (US, with riser board)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hiticej, hitice, hitice, hiticej, taitob_state, taito_b, ROT0, "Taito Corporation (licensed from Midway)", "Hit the Ice (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
GAME( 1991, selfeena, 0, selfeena, selfeena, taitob_state, taito_b, ROT0, "East Technology", "Sel Feena", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, silentd, 0, silentd, silentd, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Silent Dragon (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, silentdj, silentd, silentd, silentdj, taitob_state, taito_b, ROT0, "Taito Corporation", "Silent Dragon (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, silentdu, silentd, silentd, silentdu, taitob_state, taito_b, ROT0, "Taito America Corporation", "Silent Dragon (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, silentd, 0, silentd, silentd, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Silent Dragon (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, silentdj, silentd, silentd, silentdj, taitob_state, taito_b, ROT0, "Taito Corporation", "Silent Dragon (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, silentdu, silentd, silentd, silentdu, taitob_state, taito_b, ROT0, "Taito America Corporation", "Silent Dragon (US)", MACHINE_SUPPORTS_SAVE )
GAME( 1993, ryujin, 0, ryujin, ryujin, taitob_state, taito_b, ROT270, "Taito Corporation", "Ryu Jin (Japan)", MACHINE_SUPPORTS_SAVE )
@@ -3789,7 +3789,7 @@ GAME( 1993, qzshowby, 0, qzshowby, qzshowby, taitob_state, taito_b, ROT0,
GAME( 1994, pbobble, 0, pbobble, pbobble, taitob_state, taito_b, ROT0, "Taito Corporation", "Puzzle Bobble (Japan, B-System)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, spacedx, 0, spacedx, pbobble, taitob_state, taito_b, ROT0, "Taito Corporation", "Space Invaders DX (US, v2.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, spacedx, 0, spacedx, pbobble, taitob_state, taito_b, ROT0, "Taito Corporation", "Space Invaders DX (US, v2.1)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, spacedxj, spacedx, spacedx, pbobble, taitob_state, taito_b, ROT0, "Taito Corporation", "Space Invaders DX (Japan, v2.1)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, spacedxo, spacedx, spacedxo, spacedxo, taitob_state, taito_b, ROT0, "Taito Corporation", "Space Invaders DX (Japan, v2.0)", MACHINE_SUPPORTS_SAVE )
/*
@@ -3799,6 +3799,6 @@ GAME( 1994, spacedxo, spacedx, spacedxo, spacedxo, taitob_state, taito_b, ROT0,
in that it has a punching pad that player needs to punch to hit
the enemy.
*/
-GAME( 1990, sbm, 0, sbm, sbm, taitob_state, taito_b, ROT0, "Taito Corporation", "Sonic Blast Man (US)", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL )
-GAME( 1990, sbmj, sbm, sbm, sbm, taitob_state, taito_b, ROT0, "Taito Corporation", "Sonic Blast Man (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL )
-GAME( 1994, realpunc, 0, realpunc, realpunc, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Real Puncher", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL )
+GAME( 1990, sbm, 0, sbm, sbm, taitob_state, taito_b, ROT0, "Taito Corporation", "Sonic Blast Man (US)", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL )
+GAME( 1990, sbmj, sbm, sbm, sbm, taitob_state, taito_b, ROT0, "Taito Corporation", "Sonic Blast Man (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL )
+GAME( 1994, realpunc, 0, realpunc, realpunc, taitob_state, taito_b, ROT0, "Taito Corporation Japan", "Real Puncher", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL )
diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp
index 7bda5a51d3d..a7bfe911033 100644
--- a/src/mame/drivers/taito_f2.cpp
+++ b/src/mame/drivers/taito_f2.cpp
@@ -2850,7 +2850,7 @@ MACHINE_START_MEMBER(taitof2_state,f2)
membank("bank2")->configure_entries(0, 8, memregion("audiocpu")->base() + 0x10000, 0x4000);
}
-static MACHINE_CONFIG_START( taito_f2, taitof2_state )
+static MACHINE_CONFIG_START( taito_f2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 24000000/2) /* 12 MHz */
@@ -3023,7 +3023,7 @@ static MACHINE_CONFIG_DERIVED( thundfox, taito_f2_tc0220ioc )
MCFG_TC0100SCN_OFFSETS(3, 0)
MCFG_TC0100SCN_OFFSETS_FLIP(5, 0)
MCFG_TC0100SCN_OFFSETS_FLIPTX(4, 1)
- MCFG_TC0100SCN_MULTISCR_XOFFS(TC0100SCN_SINGLE_VDU)
+ MCFG_TC0100SCN_MULTISCR_XOFFS(tc0100scn_device::SINGLE_VDU)
MCFG_TC0100SCN_MULTISCR_HACK(1)
MCFG_TC0100SCN_GFXDECODE("gfxdecode")
MCFG_TC0100SCN_PALETTE("palette")
@@ -3660,7 +3660,7 @@ static MACHINE_CONFIG_DERIVED( driftout, taito_f2_tc0510nio )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cameltrya, taitof2_state )
+static MACHINE_CONFIG_START( cameltrya )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* verified on pcb */
@@ -3719,7 +3719,7 @@ static MACHINE_CONFIG_START( cameltrya, taitof2_state )
MCFG_SOUND_ROUTE(2, "mono", 0.20)
MCFG_SOUND_ROUTE(3, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_4_224MHz/4, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
@@ -3728,7 +3728,7 @@ static MACHINE_CONFIG_START( cameltrya, taitof2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( driveout, taitof2_state )
+static MACHINE_CONFIG_START( driveout )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
@@ -3779,7 +3779,7 @@ static MACHINE_CONFIG_START( driveout, taitof2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* does it ? */
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
@@ -5574,93 +5574,93 @@ DRIVER_INIT_MEMBER(taitof2_state,driveout)
}
-GAME( 1988, finalb, 0, finalb, finalb, taitof2_state, finalb, ROT0, "Taito Corporation Japan", "Final Blow (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, finalbu, finalb, finalb, finalbu, taitof2_state, finalb, ROT0, "Taito America Corporation", "Final Blow (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, finalbj, finalb, finalb, finalbj, taitof2_state, finalb, ROT0, "Taito Corporation", "Final Blow (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, finalb, 0, finalb, finalb, taitof2_state, finalb, ROT0, "Taito Corporation Japan", "Final Blow (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, finalbu, finalb, finalb, finalbu, taitof2_state, finalb, ROT0, "Taito America Corporation", "Final Blow (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, finalbj, finalb, finalb, finalbj, taitof2_state, finalb, ROT0, "Taito Corporation", "Final Blow (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dondokod, 0, dondokod, dondokod, driver_device, 0, ROT0, "Taito Corporation Japan", "Don Doko Don (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dondokodu, dondokod, dondokod, dondokodu, driver_device, 0, ROT0, "Taito America Corporation", "Don Doko Don (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, dondokodj, dondokod, dondokod, dondokodj, driver_device, 0, ROT0, "Taito Corporation", "Don Doko Don (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dondokod, 0, dondokod, dondokod, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Don Doko Don (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dondokodu, dondokod, dondokod, dondokodu, taitof2_state, 0, ROT0, "Taito America Corporation", "Don Doko Don (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, dondokodj, dondokod, dondokod, dondokodj, taitof2_state, 0, ROT0, "Taito Corporation", "Don Doko Don (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, megablst, 0, megab, megab, driver_device, 0, ROT0, "Taito Corporation Japan", "Mega Blast (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, megablstu, megablst, megab, megabu, driver_device, 0, ROT0, "Taito America Corporation", "Mega Blast (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, megablstj, megablst, megab, megabj, driver_device, 0, ROT0, "Taito Corporation", "Mega Blast (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, megablst, 0, megab, megab, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Mega Blast (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, megablstu, megablst, megab, megabu, taitof2_state, 0, ROT0, "Taito America Corporation", "Mega Blast (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, megablstj, megablst, megab, megabj, taitof2_state, 0, ROT0, "Taito Corporation", "Mega Blast (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, thundfox, 0, thundfox, thundfox, driver_device, 0, ROT0, "Taito Corporation Japan", "Thunder Fox (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, thundfoxu, thundfox, thundfox, thundfoxu, driver_device, 0, ROT0, "Taito America Corporation", "Thunder Fox (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, thundfoxj, thundfox, thundfox, thundfoxj, driver_device, 0, ROT0, "Taito Corporation", "Thunder Fox (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, thundfox, 0, thundfox, thundfox, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Thunder Fox (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, thundfoxu, thundfox, thundfox, thundfoxu, taitof2_state, 0, ROT0, "Taito America Corporation", "Thunder Fox (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, thundfoxj, thundfox, thundfox, thundfoxj, taitof2_state, 0, ROT0, "Taito Corporation", "Thunder Fox (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cameltry, 0, cameltry, cameltry, taitof2_state, cameltry, ROT0, "Taito America Corporation", "Cameltry (US, YM2610)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cameltryj, cameltry, cameltry, cameltryj, taitof2_state, cameltry, ROT0, "Taito Corporation", "Cameltry (Japan, YM2610)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cameltrya, cameltry, cameltrya, cameltry, taitof2_state, cameltry, ROT0, "Taito America Corporation", "Cameltry (World, YM2203 + M6295)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cameltryau, cameltry, cameltrya, cameltry, taitof2_state, cameltry, ROT0, "Taito America Corporation", "Cameltry (US, YM2203 + M6295)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cameltry, 0, cameltry, cameltry, taitof2_state, cameltry, ROT0, "Taito America Corporation", "Cameltry (US, YM2610)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cameltryj, cameltry, cameltry, cameltryj, taitof2_state, cameltry, ROT0, "Taito Corporation", "Cameltry (Japan, YM2610)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cameltrya, cameltry, cameltrya, cameltry, taitof2_state, cameltry, ROT0, "Taito America Corporation", "Cameltry (World, YM2203 + M6295)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cameltryau, cameltry, cameltrya, cameltry, taitof2_state, cameltry, ROT0, "Taito America Corporation", "Cameltry (US, YM2203 + M6295)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, qtorimon, 0, qtorimon, qtorimon, driver_device, 0, ROT0, "Taito Corporation", "Quiz Torimonochou (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, qtorimon, 0, qtorimon, qtorimon, taitof2_state, 0, ROT0, "Taito Corporation", "Quiz Torimonochou (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, liquidk, 0, liquidk, liquidk, driver_device, 0, ROT0, "Taito Corporation Japan", "Liquid Kids (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, liquidku, liquidk, liquidk, liquidku, driver_device, 0, ROT0, "Taito America Corporation", "Liquid Kids (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mizubaku, liquidk, liquidk, mizubaku, driver_device, 0, ROT0, "Taito Corporation", "Mizubaku Daibouken (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, liquidk, 0, liquidk, liquidk, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Liquid Kids (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, liquidku, liquidk, liquidk, liquidku, taitof2_state, 0, ROT0, "Taito America Corporation", "Liquid Kids (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mizubaku, liquidk, liquidk, mizubaku, taitof2_state, 0, ROT0, "Taito Corporation", "Mizubaku Daibouken (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, quizhq, 0, quizhq, quizhq, driver_device, 0, ROT0, "Taito Corporation", "Quiz H.Q. (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, quizhq, 0, quizhq, quizhq, taitof2_state, 0, ROT0, "Taito Corporation", "Quiz H.Q. (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ssi, 0, ssi, ssi, driver_device, 0, ROT270, "Taito Corporation Japan", "Super Space Invaders '91 (World, Rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ssia, ssi, ssi, ssi, driver_device, 0, ROT270, "Taito Corporation Japan", "Super Space Invaders '91 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, majest12u, ssi, ssi, majest12u, driver_device, 0, ROT270, "Taito America Corporation", "Majestic Twelve - The Space Invaders Part IV (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, majest12j, ssi, ssi, majest12j, driver_device, 0, ROT270, "Taito Corporation", "Majestic Twelve - The Space Invaders Part IV (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ssi, 0, ssi, ssi, taitof2_state, 0, ROT270, "Taito Corporation Japan", "Super Space Invaders '91 (World, Rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ssia, ssi, ssi, ssi, taitof2_state, 0, ROT270, "Taito Corporation Japan", "Super Space Invaders '91 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, majest12u, ssi, ssi, majest12u, taitof2_state, 0, ROT270, "Taito America Corporation", "Majestic Twelve - The Space Invaders Part IV (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, majest12j, ssi, ssi, majest12j, taitof2_state, 0, ROT270, "Taito Corporation", "Majestic Twelve - The Space Invaders Part IV (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, gunfront, 0, gunfront, gunfront, driver_device, 0, ROT270, "Taito Corporation Japan", "Gun & Frontier (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, gunfrontj, gunfront, gunfront, gunfrontj, driver_device, 0, ROT270, "Taito Corporation", "Gun Frontier (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gunfront, 0, gunfront, gunfront, taitof2_state, 0, ROT270, "Taito Corporation Japan", "Gun & Frontier (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, gunfrontj, gunfront, gunfront, gunfrontj, taitof2_state, 0, ROT270, "Taito Corporation", "Gun Frontier (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, growl, 0, growl, growl, driver_device, 0, ROT0, "Taito Corporation Japan", "Growl (World, Rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, growla, growl, growl, growl, driver_device, 0, ROT0, "Taito Corporation Japan", "Growl (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, growlu, growl, growl, growlu, driver_device, 0, ROT0, "Taito America Corporation", "Growl (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, runark, growl, growl, runark, driver_device, 0, ROT0, "Taito Corporation", "Runark (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, growlp, growl, growl, growl, driver_device, 0, ROT0, "Taito Corporation Japan", "Growl (World, prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, growl, 0, growl, growl, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Growl (World, Rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, growla, growl, growl, growl, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Growl (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, growlu, growl, growl, growlu, taitof2_state, 0, ROT0, "Taito America Corporation", "Growl (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, runark, growl, growl, runark, taitof2_state, 0, ROT0, "Taito Corporation", "Runark (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, growlp, growl, growl, growl, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Growl (World, prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mjnquest, 0, mjnquest, mjnquest, taitof2_state, mjnquest, ROT0, "Taito Corporation", "Mahjong Quest (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, mjnquestb, mjnquest, mjnquest, mjnquest, taitof2_state, mjnquest, ROT0, "Taito Corporation", "Mahjong Quest (No Nudity)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mjnquest, 0, mjnquest, mjnquest, taitof2_state, mjnquest, ROT0, "Taito Corporation", "Mahjong Quest (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, mjnquestb, mjnquest, mjnquest, mjnquest, taitof2_state, mjnquest, ROT0, "Taito Corporation", "Mahjong Quest (No Nudity)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, footchmp, 0, footchmp, footchmp, driver_device, 0, ROT0, "Taito Corporation Japan", "Football Champ (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, hthero, footchmp, hthero, hthero, driver_device, 0, ROT0, "Taito Corporation", "Hat Trick Hero (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, euroch92, footchmp, footchmp, footchmp, driver_device, 0, ROT0, "Taito Corporation Japan", "Euro Champ '92 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, footchmpbl, footchmp, footchmpbl,footchmpbl, driver_device,0, ROT0, "bootleg", "Football Champ (World) (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // very different hw register etc.
+GAME( 1990, footchmp, 0, footchmp, footchmp, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Football Champ (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hthero, footchmp, hthero, hthero, taitof2_state, 0, ROT0, "Taito Corporation", "Hat Trick Hero (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, euroch92, footchmp, footchmp, footchmp, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Euro Champ '92 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, footchmpbl, footchmp, footchmpbl,footchmpbl, taitof2_state, 0, ROT0, "bootleg", "Football Champ (World) (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // very different hw register etc.
-GAME( 1990, koshien, 0, koshien, koshien, driver_device, 0, ROT0, "Taito Corporation", "Ah Eikou no Koshien (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, koshien, 0, koshien, koshien, taitof2_state, 0, ROT0, "Taito Corporation", "Ah Eikou no Koshien (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, yuyugogo, 0, yuyugogo, yuyugogo, driver_device, 0, ROT0, "Taito Corporation", "Yuuyu no Quiz de GO!GO! (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, yuyugogo, 0, yuyugogo, yuyugogo, taitof2_state, 0, ROT0, "Taito Corporation", "Yuuyu no Quiz de GO!GO! (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ninjak, 0, ninjak, ninjak, driver_device, 0, ROT0, "Taito Corporation Japan", "The Ninja Kids (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ninjaku, ninjak, ninjak, ninjaku, driver_device, 0, ROT0, "Taito America Corporation", "The Ninja Kids (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, ninjakj, ninjak, ninjak, ninjakj, driver_device, 0, ROT0, "Taito Corporation", "The Ninja Kids (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ninjak, 0, ninjak, ninjak, taitof2_state, 0, ROT0, "Taito Corporation Japan", "The Ninja Kids (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ninjaku, ninjak, ninjak, ninjaku, taitof2_state, 0, ROT0, "Taito America Corporation", "The Ninja Kids (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, ninjakj, ninjak, ninjak, ninjakj, taitof2_state, 0, ROT0, "Taito Corporation", "The Ninja Kids (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, solfigtr, 0, solfigtr, solfigtr, driver_device, 0, ROT0, "Taito Corporation Japan", "Solitary Fighter (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, solfigtr, 0, solfigtr, solfigtr, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Solitary Fighter (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, qzquest, 0, qzquest , qzquest, driver_device, 0, ROT0, "Taito Corporation", "Quiz Quest - Hime to Yuusha no Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, qzquest, 0, qzquest , qzquest, taitof2_state, 0, ROT0, "Taito Corporation", "Quiz Quest - Hime to Yuusha no Monogatari (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pulirula, 0, pulirula, pulirula, driver_device, 0, ROT0, "Taito Corporation Japan", "PuLiRuLa (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pulirulaj, pulirula, pulirula, pulirulaj, driver_device, 0, ROT0, "Taito Corporation", "PuLiRuLa (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pulirula, 0, pulirula, pulirula, taitof2_state, 0, ROT0, "Taito Corporation Japan", "PuLiRuLa (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pulirulaj, pulirula, pulirula, pulirulaj, taitof2_state, 0, ROT0, "Taito Corporation", "PuLiRuLa (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, metalb, 0, metalb, metalb, driver_device, 0, ROT0, "Taito Corporation Japan", "Metal Black (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, metalbj, metalb, metalb, metalbj, driver_device, 0, ROT0, "Taito Corporation", "Metal Black (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, metalb, 0, metalb, metalb, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Metal Black (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, metalbj, metalb, metalb, metalbj, taitof2_state, 0, ROT0, "Taito Corporation", "Metal Black (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, qzchikyu, 0, qzchikyu, qzchikyu, driver_device, 0, ROT0, "Taito Corporation", "Quiz Chikyu Bouei Gun (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, qzchikyu, 0, qzchikyu, qzchikyu, taitof2_state, 0, ROT0, "Taito Corporation", "Quiz Chikyu Bouei Gun (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, yesnoj, 0, yesnoj, yesnoj, driver_device, 0, ROT0, "Taito Corporation", "Yes/No Sinri Tokimeki Chart", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, yesnoj, 0, yesnoj, yesnoj, taitof2_state, 0, ROT0, "Taito Corporation", "Yes/No Sinri Tokimeki Chart", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, deadconx, 0, deadconx, deadconx, driver_device, 0, ROT0, "Taito Corporation Japan", "Dead Connection (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, deadconxj, deadconx, deadconxj, deadconxj, driver_device, 0, ROT0, "Taito Corporation", "Dead Connection (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, deadconx, 0, deadconx, deadconx, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Dead Connection (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, deadconxj, deadconx, deadconxj, deadconxj, taitof2_state, 0, ROT0, "Taito Corporation", "Dead Connection (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dinorex, 0, dinorex, dinorex, driver_device, 0, ROT0, "Taito Corporation Japan", "Dino Rex (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dinorexu, dinorex, dinorex, dinorexu, driver_device, 0, ROT0, "Taito America Corporation", "Dino Rex (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dinorexj, dinorex, dinorex, dinorexj, driver_device, 0, ROT0, "Taito Corporation", "Dino Rex (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dinorex, 0, dinorex, dinorex, taitof2_state, 0, ROT0, "Taito Corporation Japan", "Dino Rex (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dinorexu, dinorex, dinorex, dinorexu, taitof2_state, 0, ROT0, "Taito America Corporation", "Dino Rex (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dinorexj, dinorex, dinorex, dinorexj, taitof2_state, 0, ROT0, "Taito Corporation", "Dino Rex (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, qjinsei, 0, qjinsei, qjinsei, driver_device, 0, ROT0, "Taito Corporation", "Quiz Jinsei Gekijoh (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, qjinsei, 0, qjinsei, qjinsei, taitof2_state, 0, ROT0, "Taito Corporation", "Quiz Jinsei Gekijoh (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, qcrayon, 0, qcrayon, qcrayon, driver_device, 0, ROT0, "Taito Corporation", "Quiz Crayon Shinchan (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, qcrayon, 0, qcrayon, qcrayon, taitof2_state, 0, ROT0, "Taito Corporation", "Quiz Crayon Shinchan (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, qcrayon2, 0, qcrayon2, qcrayon2, driver_device, 0, ROT0, "Taito Corporation", "Crayon Shinchan Orato Asobo (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, qcrayon2, 0, qcrayon2, qcrayon2, taitof2_state, 0, ROT0, "Taito Corporation", "Crayon Shinchan Orato Asobo (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, driftout, 0, driftout, driftout, driver_device, 0, ROT270, "Visco", "Drift Out (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, driftoutj, driftout, driftout, driftout, driver_device, 0, ROT270, "Visco", "Drift Out (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, driveout, driftout, driveout, driftout, taitof2_state, driveout, ROT270, "bootleg", "Drive Out (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, driftout, 0, driftout, driftout, taitof2_state, 0, ROT270, "Visco", "Drift Out (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, driftoutj, driftout, driftout, driftout, taitof2_state, 0, ROT270, "Visco", "Drift Out (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, driveout, driftout, driveout, driftout, taitof2_state, driveout, ROT270, "bootleg", "Drive Out (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp
index 2deb9426c9b..4b5a8c1d904 100644
--- a/src/mame/drivers/taito_f3.cpp
+++ b/src/mame/drivers/taito_f3.cpp
@@ -438,7 +438,7 @@ MACHINE_RESET_MEMBER(taito_f3_state,f3)
m_audiocpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( f3, taito_f3_state )
+static MACHINE_CONFIG_START( f3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
@@ -534,7 +534,7 @@ static GFXDECODE_START( bubsympb )
GFXDECODE_ENTRY( nullptr, 0x000000, pivotlayout, 0, 64 ) /* Dynamically modified */
GFXDECODE_END
-static MACHINE_CONFIG_START( bubsympb, taito_f3_state )
+static MACHINE_CONFIG_START( bubsympb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(f3_map)
@@ -561,7 +561,7 @@ static MACHINE_CONFIG_START( bubsympb, taito_f3_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH) // not verified
+ MCFG_OKIM6295_ADD("oki", 1000000 , PIN7_HIGH) // not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp
index ad53e20112c..422705d7e47 100644
--- a/src/mame/drivers/taito_h.cpp
+++ b/src/mame/drivers/taito_h.cpp
@@ -628,7 +628,7 @@ void taitoh_state::machine_start()
}
-static MACHINE_CONFIG_START( syvalion, taitoh_state )
+static MACHINE_CONFIG_START( syvalion )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
@@ -683,7 +683,7 @@ static MACHINE_CONFIG_START( syvalion, taitoh_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( recordbr, taitoh_state )
+static MACHINE_CONFIG_START( recordbr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
@@ -746,7 +746,7 @@ static MACHINE_CONFIG_DERIVED( tetristh, recordbr )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dleague, taitoh_state )
+static MACHINE_CONFIG_START( dleague )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12 MHz */
@@ -1043,11 +1043,11 @@ ROM_START( dleaguej )
ROM_END
-/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME */
-GAME( 1988, syvalion, 0, syvalion, syvalion, driver_device, 0, ROT0, "Taito Corporation", "Syvalion (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, syvalionp, syvalion,syvalion, syvalionp,driver_device, 0, ROT0, "Taito Corporation", "Syvalion (World, prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, recordbr, 0, recordbr, recordbr, driver_device, 0, ROT0, "Taito Corporation Japan", "Recordbreaker (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gogold, recordbr, recordbr, gogold, driver_device, 0, ROT0, "Taito Corporation", "Go For The Gold (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tetristh, tetris, tetristh, tetristh, driver_device, 0, ROT0, "Sega", "Tetris (Japan, Taito H-System)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, dleague, 0, dleague, dleague, driver_device, 0, ROT0, "Taito America Corporation", "Dynamite League (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, dleaguej, dleague, dleague, dleaguej, driver_device, 0, ROT0, "Taito Corporation", "Dynamite League (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS
+GAME( 1988, syvalion, 0, syvalion, syvalion, taitoh_state, 0, ROT0, "Taito Corporation", "Syvalion (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, syvalionp, syvalion, syvalion, syvalionp, taitoh_state, 0, ROT0, "Taito Corporation", "Syvalion (World, prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, recordbr, 0, recordbr, recordbr, taitoh_state, 0, ROT0, "Taito Corporation Japan", "Recordbreaker (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gogold, recordbr, recordbr, gogold, taitoh_state, 0, ROT0, "Taito Corporation", "Go For The Gold (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tetristh, tetris, tetristh, tetristh, taitoh_state, 0, ROT0, "Sega", "Tetris (Japan, Taito H-System)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, dleague, 0, dleague, dleague, taitoh_state, 0, ROT0, "Taito America Corporation", "Dynamite League (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, dleaguej, dleague, dleague, dleaguej, taitoh_state, 0, ROT0, "Taito Corporation", "Dynamite League (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp
index 7eaded24948..8b369f0d726 100644
--- a/src/mame/drivers/taito_l.cpp
+++ b/src/mame/drivers/taito_l.cpp
@@ -1695,7 +1695,7 @@ WRITE8_MEMBER(fhawk_state::portA_w)
}
-static MACHINE_CONFIG_START( fhawk, fhawk_state )
+static MACHINE_CONFIG_START( fhawk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
@@ -1748,7 +1748,7 @@ static MACHINE_CONFIG_START( fhawk, fhawk_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( champwr, fhawk, champwr_state )
+static MACHINE_CONFIG_DERIVED( champwr, fhawk )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1768,13 +1768,13 @@ static MACHINE_CONFIG_DERIVED_CLASS( champwr, fhawk, champwr_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(champwr_state, msm5205_vck)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 kHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( raimais, fhawk, taitol_2cpu_state )
+static MACHINE_CONFIG_DERIVED( raimais, fhawk )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1795,7 +1795,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( raimais, fhawk, taitol_2cpu_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kurikint, taitol_2cpu_state )
+static MACHINE_CONFIG_START( kurikint )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
@@ -1839,7 +1839,7 @@ static MACHINE_CONFIG_START( kurikint, taitol_2cpu_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( plotting, taitol_1cpu_state )
+static MACHINE_CONFIG_START( plotting )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* verified freq on pin122 of TC0090LVC cpu */
@@ -1899,7 +1899,7 @@ static MACHINE_CONFIG_DERIVED( puzznici, plotting )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( horshoes, plotting, horshoes_state )
+static MACHINE_CONFIG_DERIVED( horshoes, plotting )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1928,7 +1928,7 @@ static MACHINE_CONFIG_DERIVED( cachat, plotting )
MCFG_MACHINE_RESET_OVERRIDE(taitol_1cpu_state, cachat)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( evilston, taitol_2cpu_state )
+static MACHINE_CONFIG_START( evilston )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_13_33056MHz/2) /* not verified */
@@ -2550,48 +2550,48 @@ DRIVER_INIT_MEMBER(taitol_1cpu_state, plottinga)
}
-GAME( 1988, raimais, 0, raimais, raimais, driver_device, 0, ROT0, "Taito Corporation Japan", "Raimais (World)", 0 )
-GAME( 1988, raimaisj, raimais, raimais, raimaisj, driver_device, 0, ROT0, "Taito Corporation", "Raimais (Japan)", 0 )
-GAME( 1988, raimaisjo, raimais, raimais, raimaisj, driver_device, 0, ROT0, "Taito Corporation", "Raimais (Japan, first revision)", 0 )
+GAME( 1988, raimais, 0, raimais, raimais, taitol_2cpu_state, 0, ROT0, "Taito Corporation Japan", "Raimais (World)", 0 )
+GAME( 1988, raimaisj, raimais, raimais, raimaisj, taitol_2cpu_state, 0, ROT0, "Taito Corporation", "Raimais (Japan)", 0 )
+GAME( 1988, raimaisjo, raimais, raimais, raimaisj, taitol_2cpu_state, 0, ROT0, "Taito Corporation", "Raimais (Japan, first revision)", 0 )
-GAME( 1988, fhawk, 0, fhawk, fhawk, driver_device, 0, ROT270, "Taito Corporation Japan", "Fighting Hawk (World)", 0 )
-GAME( 1988, fhawkj, fhawk, fhawk, fhawkj, driver_device, 0, ROT270, "Taito Corporation", "Fighting Hawk (Japan)", 0 )
+GAME( 1988, fhawk, 0, fhawk, fhawk, fhawk_state, 0, ROT270, "Taito Corporation Japan", "Fighting Hawk (World)", 0 )
+GAME( 1988, fhawkj, fhawk, fhawk, fhawkj, fhawk_state, 0, ROT270, "Taito Corporation", "Fighting Hawk (Japan)", 0 )
-GAME( 1989, champwr, 0, champwr, champwr, driver_device, 0, ROT0, "Taito Corporation Japan", "Champion Wrestler (World)", MACHINE_IMPERFECT_SOUND )
-GAME( 1989, champwru, champwr, champwr, champwru, driver_device, 0, ROT0, "Taito America Corporation", "Champion Wrestler (US)", MACHINE_IMPERFECT_SOUND )
-GAME( 1989, champwrj, champwr, champwr, champwrj, driver_device, 0, ROT0, "Taito Corporation", "Champion Wrestler (Japan)", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, champwr, 0, champwr, champwr, champwr_state, 0, ROT0, "Taito Corporation Japan", "Champion Wrestler (World)", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, champwru, champwr, champwr, champwru, champwr_state, 0, ROT0, "Taito America Corporation", "Champion Wrestler (US)", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, champwrj, champwr, champwr, champwrj, champwr_state, 0, ROT0, "Taito Corporation", "Champion Wrestler (Japan)", MACHINE_IMPERFECT_SOUND )
-GAME( 1988, kurikint, 0, kurikint, kurikint, driver_device, 0, ROT0, "Taito Corporation Japan", "Kuri Kinton (World)", 0 )
-GAME( 1988, kurikintu, kurikint, kurikint, kurikintj, driver_device, 0, ROT0, "Taito America Corporation", "Kuri Kinton (US)", 0 )
-GAME( 1988, kurikintj, kurikint, kurikint, kurikintj, driver_device, 0, ROT0, "Taito Corporation", "Kuri Kinton (Japan)", 0 )
-GAME( 1988, kurikinta, kurikint, kurikint, kurikinta, driver_device, 0, ROT0, "Taito Corporation Japan", "Kuri Kinton (World, prototype?)", 0 )
+GAME( 1988, kurikint, 0, kurikint, kurikint, taitol_2cpu_state, 0, ROT0, "Taito Corporation Japan", "Kuri Kinton (World)", 0 )
+GAME( 1988, kurikintu, kurikint, kurikint, kurikintj, taitol_2cpu_state, 0, ROT0, "Taito America Corporation", "Kuri Kinton (US)", 0 )
+GAME( 1988, kurikintj, kurikint, kurikint, kurikintj, taitol_2cpu_state, 0, ROT0, "Taito Corporation", "Kuri Kinton (Japan)", 0 )
+GAME( 1988, kurikinta, kurikint, kurikint, kurikinta, taitol_2cpu_state, 0, ROT0, "Taito Corporation Japan", "Kuri Kinton (World, prototype?)", 0 )
-GAME( 1989, plotting, 0, plotting, plotting, driver_device, 0, ROT0, "Taito Corporation Japan", "Plotting (World set 1)", 0 )
+GAME( 1989, plotting, 0, plotting, plotting, taitol_1cpu_state, 0, ROT0, "Taito Corporation Japan", "Plotting (World set 1)", 0 )
GAME( 1989, plottinga, plotting, plotting, plotting, taitol_1cpu_state, plottinga, ROT0, "Taito Corporation Japan", "Plotting (World set 2, protected)", 0 )
-GAME( 1989, plottingb, plotting, plotting, plotting, driver_device, 0, ROT0, "Taito Corporation Japan", "Plotting (World set 3, earliest version)", 0 )
-GAME( 1989, plottingu, plotting, plotting, plottingu, driver_device, 0, ROT0, "Taito America Corporation", "Plotting (US)", 0 )
-GAME( 1989, flipull, plotting, plotting, plotting, driver_device, 0, ROT0, "Taito Corporation", "Flipull (Japan)", 0 )
+GAME( 1989, plottingb, plotting, plotting, plotting, taitol_1cpu_state, 0, ROT0, "Taito Corporation Japan", "Plotting (World set 3, earliest version)", 0 )
+GAME( 1989, plottingu, plotting, plotting, plottingu, taitol_1cpu_state, 0, ROT0, "Taito America Corporation", "Plotting (US)", 0 )
+GAME( 1989, flipull, plotting, plotting, plotting, taitol_1cpu_state, 0, ROT0, "Taito Corporation", "Flipull (Japan)", 0 )
-GAME( 1989, puzznic, 0, puzznic, puzznic, driver_device, 0, ROT0, "Taito Corporation Japan", "Puzznic (World)", 0 )
-GAME( 1989, puzznicu, puzznic, puzznic, puzznic, driver_device, 0, ROT0, "Taito America Corporation", "Puzznic (US)", 0 )
-GAME( 1989, puzznicj, puzznic, puzznic, puzznic, driver_device, 0, ROT0, "Taito Corporation", "Puzznic (Japan)", 0 )
-GAME( 1989, puzznici, puzznic, puzznici, puzznic, driver_device, 0, ROT0, "bootleg", "Puzznic (Italian bootleg)", 0 )
-GAME( 1989, puzznicb, puzznic, puzznici, puzznic, driver_device, 0, ROT0, "bootleg", "Puzznic (bootleg, set 1)", 0 )
-GAME( 1989, puzznicba, puzznic, puzznici, puzznic, driver_device, 0, ROT0, "bootleg", "Puzznic (bootleg, set 2)", 0 )
+GAME( 1989, puzznic, 0, puzznic, puzznic, taitol_1cpu_state, 0, ROT0, "Taito Corporation Japan", "Puzznic (World)", 0 )
+GAME( 1989, puzznicu, puzznic, puzznic, puzznic, taitol_1cpu_state, 0, ROT0, "Taito America Corporation", "Puzznic (US)", 0 )
+GAME( 1989, puzznicj, puzznic, puzznic, puzznic, taitol_1cpu_state, 0, ROT0, "Taito Corporation", "Puzznic (Japan)", 0 )
+GAME( 1989, puzznici, puzznic, puzznici, puzznic, taitol_1cpu_state, 0, ROT0, "bootleg", "Puzznic (Italian bootleg)", 0 )
+GAME( 1989, puzznicb, puzznic, puzznici, puzznic, taitol_1cpu_state, 0, ROT0, "bootleg", "Puzznic (bootleg, set 1)", 0 )
+GAME( 1989, puzznicba, puzznic, puzznici, puzznic, taitol_1cpu_state, 0, ROT0, "bootleg", "Puzznic (bootleg, set 2)", 0 )
-GAME( 1990, horshoes, 0, horshoes, horshoes, driver_device, 0, ROT270, "Taito America Corporation", "American Horseshoes (US)", 0 )
+GAME( 1990, horshoes, 0, horshoes, horshoes, horshoes_state, 0, ROT270, "Taito America Corporation", "American Horseshoes (US)", 0 )
-GAME( 1990, palamed, 0, palamed, palamed, driver_device, 0, ROT0, "Taito Corporation", "Palamedes (Japan)", 0 )
+GAME( 1990, palamed, 0, palamed, palamed, taitol_1cpu_state, 0, ROT0, "Taito Corporation", "Palamedes (Japan)", 0 )
-GAME( 1993, cachat, 0, cachat, cachat, driver_device, 0, ROT0, "Taito Corporation", "Cachat (Japan)", 0 )
-GAME( 1993, tubeit, cachat, cachat, tubeit, driver_device, 0, ROT0, "bootleg", "Tube-It", 0 ) // No (c) message
+GAME( 1993, cachat, 0, cachat, cachat, taitol_1cpu_state, 0, ROT0, "Taito Corporation", "Cachat (Japan)", 0 )
+GAME( 1993, tubeit, cachat, cachat, tubeit, taitol_1cpu_state, 0, ROT0, "bootleg", "Tube-It", 0 ) // No (c) message
-GAME( 199?, cubybop, 0, cachat, cubybop, driver_device, 0, ROT0, "Hot-B", "Cuby Bop (location test)", 0 ) // No (c) message, but Hot-B company logo in tile gfx
+GAME( 199?, cubybop, 0, cachat, cubybop, taitol_1cpu_state, 0, ROT0, "Hot-B", "Cuby Bop (location test)", 0 ) // No (c) message, but Hot-B company logo in tile gfx
-GAME( 1992, plgirls, 0, cachat, plgirls, driver_device, 0, ROT270, "Hot-B", "Play Girls", 0 )
-GAME( 1992, lagirl, plgirls, cachat, plgirls, driver_device, 0, ROT270, "bootleg", "LA Girl", 0 ) // bootleg hardware with changed title & backgrounds
+GAME( 1992, plgirls, 0, cachat, plgirls, taitol_1cpu_state, 0, ROT270, "Hot-B", "Play Girls", 0 )
+GAME( 1992, lagirl, plgirls, cachat, plgirls, taitol_1cpu_state, 0, ROT270, "bootleg", "LA Girl", 0 ) // bootleg hardware with changed title & backgrounds
-GAME( 1993, plgirls2, 0, cachat, plgirls2, driver_device, 0, ROT270, "Hot-B", "Play Girls 2", 0 )
-GAME( 1993, plgirls2b, plgirls2, cachat, plgirls2, driver_device, 0, ROT270, "bootleg", "Play Girls 2 (bootleg)", MACHINE_IMPERFECT_GRAPHICS ) // bootleg hardware (regular Z80 etc. instead of TC0090LVC, but acts almost the same - scroll offset problems)
+GAME( 1993, plgirls2, 0, cachat, plgirls2, taitol_1cpu_state, 0, ROT270, "Hot-B", "Play Girls 2", 0 )
+GAME( 1993, plgirls2b, plgirls2, cachat, plgirls2, taitol_1cpu_state, 0, ROT270, "bootleg", "Play Girls 2 (bootleg)", MACHINE_IMPERFECT_GRAPHICS ) // bootleg hardware (regular Z80 etc. instead of TC0090LVC, but acts almost the same - scroll offset problems)
-GAME( 1990, evilston, 0, evilston, evilston, driver_device, 0, ROT270, "Spacy Industrial, Ltd.", "Evil Stone", MACHINE_IMPERFECT_SOUND ) // not Taito PCB, just uses TC0090LVC
+GAME( 1990, evilston, 0, evilston, evilston, taitol_2cpu_state, 0, ROT270, "Spacy Industrial, Ltd.", "Evil Stone", MACHINE_IMPERFECT_SOUND ) // not Taito PCB, just uses TC0090LVC
diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp
index 4ad121ed8ef..08c9b852ba7 100644
--- a/src/mame/drivers/taito_o.cpp
+++ b/src/mame/drivers/taito_o.cpp
@@ -232,7 +232,7 @@ void taitoo_state::machine_start()
{
}
-static MACHINE_CONFIG_START( parentj, taitoo_state )
+static MACHINE_CONFIG_START( parentj )
MCFG_CPU_ADD("maincpu", M68000,12000000 ) /*?? MHz */
MCFG_CPU_PROGRAM_MAP(parentj_map)
@@ -289,4 +289,4 @@ ROM_START( parentj )
ROM_LOAD( "ampal22v10a-0233.c42", 0x000, 0x2dd, CRC(0c030a81) SHA1(0f8198df2cb046683d2db9ac8e609cdff53083ed) )
ROM_END
-GAME( 1989, parentj, 0, parentj, parentj, driver_device, 0, ROT0, "Taito", "Parent Jack", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, parentj, 0, parentj, parentj, taitoo_state, 0, ROT0, "Taito", "Parent Jack", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp
index 0ebaead9075..6f930806874 100644
--- a/src/mame/drivers/taito_x.cpp
+++ b/src/mame/drivers/taito_x.cpp
@@ -793,7 +793,7 @@ MACHINE_START_MEMBER(taitox_state,superman)
/**************************************************************************/
-static MACHINE_CONFIG_START( superman, taitox_state )
+static MACHINE_CONFIG_START( superman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -840,7 +840,7 @@ static MACHINE_CONFIG_START( superman, taitox_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( daisenpu, taitox_state )
+static MACHINE_CONFIG_START( daisenpu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) /* verified on pcb */
@@ -885,7 +885,7 @@ static MACHINE_CONFIG_START( daisenpu, taitox_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( gigandes, taitox_state )
+static MACHINE_CONFIG_START( gigandes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
@@ -932,7 +932,7 @@ static MACHINE_CONFIG_START( gigandes, taitox_state )
MCFG_TC0140SYT_SLAVE_CPU("audiocpu")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ballbros, taitox_state )
+static MACHINE_CONFIG_START( ballbros )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz? */
@@ -1251,13 +1251,13 @@ DRIVER_INIT_MEMBER(taitox_state,kyustrkr)
}
-GAME( 1988, superman, 0, superman, superman, driver_device, 0, ROT0, "Taito Corporation", "Superman (World)", 0 )
-GAME( 1988, supermanu, superman, superman, supermanu, driver_device, 0, ROT0, "Taito Corporation", "Superman (US)", 0 )
-GAME( 1988, supermanj, superman, superman, supermanj, driver_device, 0, ROT0, "Taito Corporation", "Superman (Japan)", 0 )
-GAME( 1989, twinhawk, 0, daisenpu, twinhawk, driver_device, 0, ROT270, "Taito Corporation Japan", "Twin Hawk (World)", 0 )
-GAME( 1989, twinhawku, twinhawk, daisenpu, twinhawku, driver_device, 0, ROT270, "Taito America Corporation", "Twin Hawk (US)", 0 )
-GAME( 1989, daisenpu, twinhawk, daisenpu, daisenpu, driver_device, 0, ROT270, "Taito Corporation", "Daisenpu (Japan)", 0 )
-GAME( 1989, gigandes, 0, gigandes, gigandes, driver_device, 0, ROT0, "East Technology", "Gigandes", 0 )
-GAME( 1989, gigandesa, gigandes, gigandes, gigandes, driver_device, 0, ROT0, "East Technology", "Gigandes (earlier)", 0 )
-GAME( 1989, kyustrkr, 0, ballbros, kyustrkr, taitox_state, kyustrkr, ROT180, "East Technology", "Last Striker / Kyuukyoku no Striker", 0 )
-GAME( 1992, ballbros, 0, ballbros, ballbros, driver_device, 0, ROT0, "East Technology", "Balloon Brothers", 0 )
+GAME( 1988, superman, 0, superman, superman, taitox_state, 0, ROT0, "Taito Corporation", "Superman (World)", 0 )
+GAME( 1988, supermanu, superman, superman, supermanu, taitox_state, 0, ROT0, "Taito Corporation", "Superman (US)", 0 )
+GAME( 1988, supermanj, superman, superman, supermanj, taitox_state, 0, ROT0, "Taito Corporation", "Superman (Japan)", 0 )
+GAME( 1989, twinhawk, 0, daisenpu, twinhawk, taitox_state, 0, ROT270, "Taito Corporation Japan", "Twin Hawk (World)", 0 )
+GAME( 1989, twinhawku, twinhawk, daisenpu, twinhawku, taitox_state, 0, ROT270, "Taito America Corporation", "Twin Hawk (US)", 0 )
+GAME( 1989, daisenpu, twinhawk, daisenpu, daisenpu, taitox_state, 0, ROT270, "Taito Corporation", "Daisenpu (Japan)", 0 )
+GAME( 1989, gigandes, 0, gigandes, gigandes, taitox_state, 0, ROT0, "East Technology", "Gigandes", 0 )
+GAME( 1989, gigandesa, gigandes, gigandes, gigandes, taitox_state, 0, ROT0, "East Technology", "Gigandes (earlier)", 0 )
+GAME( 1989, kyustrkr, 0, ballbros, kyustrkr, taitox_state, kyustrkr, ROT180, "East Technology", "Last Striker / Kyuukyoku no Striker", 0 )
+GAME( 1992, ballbros, 0, ballbros, ballbros, taitox_state, 0, ROT0, "East Technology", "Balloon Brothers", 0 )
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index 3b60793109f..0119eff21d3 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -2959,7 +2959,7 @@ MACHINE_RESET_MEMBER(taitoz_state,taitoz)
/* Contcirc vis area seems narrower than the other games... */
-static MACHINE_CONFIG_START( contcirc, taitoz_state )
+static MACHINE_CONFIG_START( contcirc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3037,7 +3037,7 @@ static MACHINE_CONFIG_START( contcirc, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( chasehq, taitoz_state )
+static MACHINE_CONFIG_START( chasehq )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3115,7 +3115,7 @@ static MACHINE_CONFIG_START( chasehq, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( enforce, taitoz_state )
+static MACHINE_CONFIG_START( enforce )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3194,7 +3194,7 @@ static MACHINE_CONFIG_START( enforce, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bshark, taitoz_state )
+static MACHINE_CONFIG_START( bshark )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3272,7 +3272,7 @@ static MACHINE_CONFIG_DERIVED( bsharkjjs, bshark )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sci, taitoz_state )
+static MACHINE_CONFIG_START( sci )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3348,7 +3348,7 @@ static MACHINE_CONFIG_START( sci, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nightstr, taitoz_state )
+static MACHINE_CONFIG_START( nightstr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3428,7 +3428,7 @@ static MACHINE_CONFIG_START( nightstr, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aquajack, taitoz_state )
+static MACHINE_CONFIG_START( aquajack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -3507,7 +3507,7 @@ static MACHINE_CONFIG_START( aquajack, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( spacegun, taitoz_state )
+static MACHINE_CONFIG_START( spacegun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ??? */
@@ -3577,7 +3577,7 @@ static MACHINE_CONFIG_START( spacegun, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( dblaxle, taitoz_state )
+static MACHINE_CONFIG_START( dblaxle )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -3653,7 +3653,7 @@ static MACHINE_CONFIG_START( dblaxle, taitoz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( racingb, taitoz_state )
+static MACHINE_CONFIG_START( racingb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -5373,46 +5373,46 @@ DRIVER_INIT_MEMBER(taitoz_state,bshark)
-GAMEL(1987, contcirc, 0, contcirc, contcirc, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Continental Circus (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1987, contcircu, contcirc, contcirc, contcrcu, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Continental Circus (US set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1987, contcircua, contcirc, contcirc, contcrcj, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Continental Circus (US set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1987, contcircj , contcirc, contcirc, contcrcj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Continental Circus (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1987, contcirc, 0, contcirc, contcirc, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Continental Circus (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1987, contcircu, contcirc, contcirc, contcrcu, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Continental Circus (US set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1987, contcircua, contcirc, contcirc, contcrcj, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Continental Circus (US set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1987, contcircj , contcirc, contcirc, contcrcj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Continental Circus (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1988, chasehq, 0, chasehq, chasehq, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Chase H.Q. (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1988, chasehqj, chasehq, chasehq, chasehqj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Chase H.Q. (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1988, chasehqju, chasehq, chasehq, chasehq, taitoz_state, taitoz, ROT0, "Taito Corporation", "Chase H.Q. (Japan, upright?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc ) // same code rev as Chase H.Q. (World)
-GAMEL(1988, chasehqu, chasehq, chasehq, chasehq, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Chase H.Q. (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1988, chasehq, 0, chasehq, chasehq, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Chase H.Q. (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1988, chasehqj, chasehq, chasehq, chasehqj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Chase H.Q. (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1988, chasehqju, chasehq, chasehq, chasehq, taitoz_state, taitoz, ROT0, "Taito Corporation", "Chase H.Q. (Japan, upright?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc ) // same code rev as Chase H.Q. (World)
+GAMEL(1988, chasehqu, chasehq, chasehq, chasehq, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Chase H.Q. (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAME( 1988, enforce, 0, enforce, enforce, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Enforce (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, enforcej, enforce, enforce, enforcej, taitoz_state, taitoz, ROT0, "Taito Corporation", "Enforce (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, enforceja, enforce, enforce, enforceja,taitoz_state, taitoz, ROT0, "Taito Corporation", "Enforce (Japan, Analog Controls)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, enforce, 0, enforce, enforce, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Enforce (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, enforcej, enforce, enforce, enforcej, taitoz_state, taitoz, ROT0, "Taito Corporation", "Enforce (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, enforceja, enforce, enforce, enforceja, taitoz_state, taitoz, ROT0, "Taito Corporation", "Enforce (Japan, Analog Controls)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bshark, 0, bshark, bshark, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Battle Shark (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bsharku, bshark, bshark, bsharku, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito America Corporation", "Battle Shark (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bsharkj, bshark, bshark, bsharkj, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation", "Battle Shark (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, bsharkjjs, bshark, bsharkjjs,bsharkjjs, taitoz_state,bshark, ORIENTATION_FLIP_X, "Taito Corporation", "Battle Shark (Japan, Joystick)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bshark, 0, bshark, bshark, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Battle Shark (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bsharku, bshark, bshark, bsharku, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito America Corporation", "Battle Shark (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bsharkj, bshark, bshark, bsharkj, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation", "Battle Shark (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, bsharkjjs, bshark, bsharkjjs, bsharkjjs, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation", "Battle Shark (Japan, Joystick)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAMEL(1989, sci, 0, sci, sci, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Special Criminal Investigation (World set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1989, scia, sci, sci, sci, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Special Criminal Investigation (World set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1989, scij, sci, sci, scij, taitoz_state, taitoz, ROT0, "Taito Corporation", "Special Criminal Investigation (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1989, sciu, sci, sci, sciu, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Special Criminal Investigation (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAMEL(1991, scin, sci, sci, sci, taitoz_state, taitoz, ROT0, "hack (Negro Torino)", "Super Special Criminal Investigation (Negro Torino hack)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1989, sci, 0, sci, sci, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Special Criminal Investigation (World set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1989, scia, sci, sci, sci, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Special Criminal Investigation (World set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1989, scij, sci, sci, scij, taitoz_state, taitoz, ROT0, "Taito Corporation", "Special Criminal Investigation (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1989, sciu, sci, sci, sciu, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Special Criminal Investigation (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
+GAMEL(1991, scin, sci, sci, sci, taitoz_state, taitoz, ROT0, "hack (Negro Torino)", "Super Special Criminal Investigation (Negro Torino hack)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_contcirc )
-GAME( 1989, nightstr, 0, nightstr, nightstr, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Night Striker (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, nightstrj, nightstr, nightstr, nghtstrj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Night Striker (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, nightstru, nightstr, nightstr, nghtstru, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Night Striker (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, nightstr, 0, nightstr, nightstr, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Night Striker (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, nightstrj, nightstr, nightstr, nghtstrj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Night Striker (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, nightstru, nightstr, nightstr, nghtstru, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Night Striker (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aquajack, 0, aquajack, aquajack, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Aqua Jack (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aquajacku, aquajack, aquajack, aquajack, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Aqua Jack (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, aquajackj, aquajack, aquajack, aquajckj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Aqua Jack (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aquajack, 0, aquajack, aquajack, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Aqua Jack (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aquajacku, aquajack, aquajack, aquajack, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Aqua Jack (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, aquajackj, aquajack, aquajack, aquajckj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Aqua Jack (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1990, spacegun, 0, spacegun, spacegun, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Space Gun (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, spacegunj, spacegun, spacegun, spacegnj, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation", "Space Gun (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, spacegunu, spacegun, spacegun, spacegnu, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito America Corporation", "Space Gun (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, spacegun, 0, spacegun, spacegun, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation Japan", "Space Gun (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, spacegunj, spacegun, spacegun, spacegnj, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito Corporation", "Space Gun (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, spacegunu, spacegun, spacegun, spacegnu, taitoz_state, bshark, ORIENTATION_FLIP_X, "Taito America Corporation", "Space Gun (US)", MACHINE_SUPPORTS_SAVE )
-GAMEL(1991, dblaxle, 0, dblaxle, dblaxle, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Double Axle (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
-GAMEL(1991, dblaxleu, dblaxle, dblaxle, dblaxle, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Double Axle (US, earlier)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
-GAMEL(1991, pwheelsj, dblaxle, dblaxle, pwheelsj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Power Wheels (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
+GAMEL(1991, dblaxle, 0, dblaxle, dblaxle, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Double Axle (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
+GAMEL(1991, dblaxleu, dblaxle, dblaxle, dblaxle, taitoz_state, taitoz, ROT0, "Taito America Corporation", "Double Axle (US, earlier)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
+GAMEL(1991, pwheelsj, dblaxle, dblaxle, pwheelsj, taitoz_state, taitoz, ROT0, "Taito Corporation", "Power Wheels (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
-GAMEL(1991, racingb, 0, racingb, racingb, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Racing Beat (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
-GAMEL(1991, racingbj, racingb, racingb, racingb, taitoz_state, taitoz, ROT0, "Taito Corporation", "Racing Beat (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
+GAMEL(1991, racingb, 0, racingb, racingb, taitoz_state, taitoz, ROT0, "Taito Corporation Japan", "Racing Beat (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
+GAMEL(1991, racingbj, racingb, racingb, racingb, taitoz_state, taitoz, ROT0, "Taito Corporation", "Racing Beat (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_dblaxle )
diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp
index 708b08ecf81..60f0ffcf0aa 100644
--- a/src/mame/drivers/taitoair.cpp
+++ b/src/mame/drivers/taitoair.cpp
@@ -711,7 +711,7 @@ void taitoair_state::machine_reset()
}
}
-static MACHINE_CONFIG_START( airsys, taitoair_state )
+static MACHINE_CONFIG_START( airsys )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz) // MC68000P12
@@ -992,8 +992,8 @@ ROM_START( ainfernoj )
ROM_END
-/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME */
-GAME( 1988, topland, 0, airsys, topland, driver_device, 0, ROT0, "Taito Corporation Japan", "Top Landing (World)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1988, toplandj, topland, airsys, topland, driver_device, 0, ROT0, "Taito Corporation", "Top Landing (Japan)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1990, ainferno, 0, airsys, ainferno, driver_device, 0, ROT0, "Taito America Corporation", "Air Inferno (US)", MACHINE_NOT_WORKING )
-GAME( 1990, ainfernoj,ainferno, airsys, ainferno, driver_device, 0, ROT0, "Taito Corporation Japan", "Air Inferno (Japan)", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS
+GAME( 1988, topland, 0, airsys, topland, taitoair_state, 0, ROT0, "Taito Corporation Japan", "Top Landing (World)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1988, toplandj, topland, airsys, topland, taitoair_state, 0, ROT0, "Taito Corporation", "Top Landing (Japan)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1990, ainferno, 0, airsys, ainferno, taitoair_state, 0, ROT0, "Taito America Corporation", "Air Inferno (US)", MACHINE_NOT_WORKING )
+GAME( 1990, ainfernoj, ainferno, airsys, ainferno, taitoair_state, 0, ROT0, "Taito Corporation Japan", "Air Inferno (Japan)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp
index 12d18960d51..077264dbd7e 100644
--- a/src/mame/drivers/taitogn.cpp
+++ b/src/mame/drivers/taitogn.cpp
@@ -686,7 +686,7 @@ SLOT_INTERFACE_START(slot_ataflash)
SLOT_INTERFACE("ataflash", ATA_FLASH_PCCARD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( coh3002t, taitogn_state )
+static MACHINE_CONFIG_START( coh3002t )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz )
@@ -1170,41 +1170,41 @@ ROM_END
/* A dummy driver, so that the bios can be debugged, and to serve as */
/* parent for the coh-3002t.353 file, so that we do not have to include */
/* it in every zip file */
-GAME( 1997, coh3002t, 0, coh3002t, coh3002t, driver_device, 0, ROT0, "Taito", "Taito GNET", MACHINE_IS_BIOS_ROOT )
+GAME( 1997, coh3002t, 0, coh3002t, coh3002t, taitogn_state, 0, ROT0, "Taito", "Taito GNET", MACHINE_IS_BIOS_ROOT )
/* Taito */
-GAME( 1998, chaoshea, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Taito", "Chaos Heat (V2.09O 1998/10/02 17:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 1998, chaosheaj,chaoshea, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Taito", "Chaos Heat (V2.08J 1998/09/25 17:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 1998, raycris, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Taito", "Ray Crisis (V2.03J 1998/11/15 15:43)", MACHINE_IMPERFECT_SOUND )
-GAME( 1999, spuzbobl, coh3002t, coh3002t_t2, coh3002t, driver_device, 0, ROT0, "Taito", "Super Puzzle Bobble (V2.05O 1999/2/24 18:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 1999, spuzboblj,spuzbobl, coh3002t_t2, coh3002t, driver_device, 0, ROT0, "Taito", "Super Puzzle Bobble (V2.04J 1999/2/27 02:10)", MACHINE_IMPERFECT_SOUND )
-GAME( 1999, gobyrc, coh3002t, coh3002t_t2, gobyrc, driver_device, 0, ROT0, "Taito", "Go By RC (V2.03O 1999/05/25 13:31)", MACHINE_IMPERFECT_SOUND )
-GAME( 1999, rcdego, gobyrc, coh3002t_t1, gobyrc, driver_device, 0, ROT0, "Taito", "RC De Go (V2.03J 1999/05/22 19:29)", MACHINE_IMPERFECT_SOUND )
-GAME( 1999, flipmaze, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "MOSS / Taito", "Flip Maze (V2.04J 1999/09/02 20:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2001, shikigam, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT270, "Alfa System / Taito", "Shikigami no Shiro (V2.03J 2001/08/07 18:11)", MACHINE_IMPERFECT_SOUND )
-GAME( 2001, shikigama,coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT270, "Alfa System / Taito", "Shikigami no Shiro - internal build (V1.02J 2001/09/27 18:45)", MACHINE_IMPERFECT_SOUND )
-GAME( 2003, sianniv, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT270, "Taito", "Space Invaders Anniversary (V2.02J)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // IRQ at the wrong time
-GAME( 2003, kollon, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Taito", "Kollon (V2.04JA 2003/11/01 12:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2003, kollonc, kollon, coh3002t_cf, coh3002t_jp1,driver_device, 0, ROT0, "Taito", "Kollon (V2.04JC 2003/11/01 12:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 1998, chaoshea, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Taito", "Chaos Heat (V2.09O 1998/10/02 17:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 1998, chaosheaj, chaoshea, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Taito", "Chaos Heat (V2.08J 1998/09/25 17:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 1998, raycris, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Taito", "Ray Crisis (V2.03J 1998/11/15 15:43)", MACHINE_IMPERFECT_SOUND )
+GAME( 1999, spuzbobl, coh3002t, coh3002t_t2, coh3002t, taitogn_state, 0, ROT0, "Taito", "Super Puzzle Bobble (V2.05O 1999/2/24 18:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 1999, spuzboblj, spuzbobl, coh3002t_t2, coh3002t, taitogn_state, 0, ROT0, "Taito", "Super Puzzle Bobble (V2.04J 1999/2/27 02:10)", MACHINE_IMPERFECT_SOUND )
+GAME( 1999, gobyrc, coh3002t, coh3002t_t2, gobyrc, taitogn_state, 0, ROT0, "Taito", "Go By RC (V2.03O 1999/05/25 13:31)", MACHINE_IMPERFECT_SOUND )
+GAME( 1999, rcdego, gobyrc, coh3002t_t1, gobyrc, taitogn_state, 0, ROT0, "Taito", "RC De Go (V2.03J 1999/05/22 19:29)", MACHINE_IMPERFECT_SOUND )
+GAME( 1999, flipmaze, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "MOSS / Taito", "Flip Maze (V2.04J 1999/09/02 20:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, shikigam, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT270, "Alfa System / Taito", "Shikigami no Shiro (V2.03J 2001/08/07 18:11)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, shikigama, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT270, "Alfa System / Taito", "Shikigami no Shiro - internal build (V1.02J 2001/09/27 18:45)", MACHINE_IMPERFECT_SOUND )
+GAME( 2003, sianniv, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT270, "Taito", "Space Invaders Anniversary (V2.02J)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // IRQ at the wrong time
+GAME( 2003, kollon, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Taito", "Kollon (V2.04JA 2003/11/01 12:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2003, kollonc, kollon, coh3002t_cf, coh3002t_jp1, taitogn_state, 0, ROT0, "Taito", "Kollon (V2.04JC 2003/11/01 12:00)", MACHINE_IMPERFECT_SOUND )
/* Success */
-GAME( 1999, otenamih, coh3002t, coh3002t_t1, coh3002t, taitogn_state, coh3002t_nz, ROT0, "Success", "Otenami Haiken (V2.04J 1999/02/01 18:00:00)", 0 )
-GAME( 2000, psyvaria, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT270, "Success", "Psyvariar -Medium Unit- (V2.04J 2000/02/15 11:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2000, psyvarrv, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT270, "Success", "Psyvariar -Revision- (V2.04J 2000/08/11 22:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2001, zokuoten, coh3002t, coh3002t_t1, coh3002t, taitogn_state, coh3002t_nz, ROT0, "Success", "Zoku Otenamihaiken (V2.03J 2001/02/16 16:00)", 0 ) // boots the soundcpu without any valid code, causing an infinite NMI loop (currently circumvented)
-GAME( 2004, zooo, coh3002t, coh3002t_t1, coh3002t, taitogn_state, coh3002t_nz, ROT0, "Success", "Zooo (V2.01JA 2004/04/13 12:00)", 0 )
-GAME( 2005, otenamhf, coh3002t, coh3002t_cf, coh3002t_jp1,taitogn_state, coh3002t_nz, ROT0, "Success / Warashi", "Otenami Haiken Final (V2.07JC 2005/04/20 15:36)", 0 )
+GAME( 1999, otenamih, coh3002t, coh3002t_t1, coh3002t, taitogn_state, coh3002t_nz, ROT0, "Success", "Otenami Haiken (V2.04J 1999/02/01 18:00:00)", 0 )
+GAME( 2000, psyvaria, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT270, "Success", "Psyvariar -Medium Unit- (V2.04J 2000/02/15 11:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2000, psyvarrv, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT270, "Success", "Psyvariar -Revision- (V2.04J 2000/08/11 22:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, zokuoten, coh3002t, coh3002t_t1, coh3002t, taitogn_state, coh3002t_nz, ROT0, "Success", "Zoku Otenamihaiken (V2.03J 2001/02/16 16:00)", 0 ) // boots the soundcpu without any valid code, causing an infinite NMI loop (currently circumvented)
+GAME( 2004, zooo, coh3002t, coh3002t_t1, coh3002t, taitogn_state, coh3002t_nz, ROT0, "Success", "Zooo (V2.01JA 2004/04/13 12:00)", 0 )
+GAME( 2005, otenamhf, coh3002t, coh3002t_cf, coh3002t_jp1, taitogn_state, coh3002t_nz, ROT0, "Success / Warashi", "Otenami Haiken Final (V2.07JC 2005/04/20 15:36)", 0 )
/* Takumi */
-GAME( 2001, nightrai, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Takumi", "Night Raid (V2.03J 2001/02/26 17:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2001, otenki, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Takumi", "Otenki Kororin (V2.01J 2001/07/02 10:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, nightrai, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Takumi", "Night Raid (V2.03J 2001/02/26 17:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, otenki, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Takumi", "Otenki Kororin (V2.01J 2001/07/02 10:00)", MACHINE_IMPERFECT_SOUND )
/* Warashi */
-GAME( 1999, mahjngoh, coh3002t, coh3002t_t1_mp,coh3002t_mp,driver_device,0, ROT0, "Warashi / Mahjong Kobo / Taito", "Mahjong Oh (V2.06J 1999/11/23 08:52:22)", MACHINE_IMPERFECT_SOUND )
-GAME( 2000, shanghss, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Warashi", "Shanghai Shoryu Sairin (V2.03J 2000/05/26 12:45:28)", MACHINE_IMPERFECT_SOUND )
-GAME( 2000, soutenry, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Warashi", "Soutenryu (V2.07J 2000/12/14 11:13:02)", MACHINE_IMPERFECT_SOUND )
-GAME( 2001, usagi, coh3002t, coh3002t_t2_mp,coh3002t_mp,driver_device,0, ROT0, "Warashi / Mahjong Kobo / Taito", "Usagi (V2.02J 2001/10/02 12:41:19)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // missing transparencies, see MT #06258
-GAME( 2002, shangtou, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT0, "Warashi / Sunsoft / Taito", "Shanghai Sangokuhai Tougi (Ver 2.01J 2002/01/18 18:26:58)", MACHINE_IMPERFECT_SOUND )
+GAME( 1999, mahjngoh, coh3002t, coh3002t_t1_mp, coh3002t_mp, taitogn_state, 0, ROT0, "Warashi / Mahjong Kobo / Taito", "Mahjong Oh (V2.06J 1999/11/23 08:52:22)", MACHINE_IMPERFECT_SOUND )
+GAME( 2000, shanghss, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Warashi", "Shanghai Shoryu Sairin (V2.03J 2000/05/26 12:45:28)", MACHINE_IMPERFECT_SOUND )
+GAME( 2000, soutenry, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Warashi", "Soutenryu (V2.07J 2000/12/14 11:13:02)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, usagi, coh3002t, coh3002t_t2_mp, coh3002t_mp, taitogn_state, 0, ROT0, "Warashi / Mahjong Kobo / Taito", "Usagi (V2.02J 2001/10/02 12:41:19)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // missing transparencies, see MT #06258
+GAME( 2002, shangtou, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT0, "Warashi / Sunsoft / Taito", "Shanghai Sangokuhai Tougi (Ver 2.01J 2002/01/18 18:26:58)", MACHINE_IMPERFECT_SOUND )
/* Triangle Service */
-GAME( 2002, xiistag, coh3002t, coh3002t_t1, coh3002t, driver_device, 0, ROT270, "Triangle Service", "XII Stag (V2.01J 2002/6/26 22:27)", MACHINE_IMPERFECT_SOUND )
+GAME( 2002, xiistag, coh3002t, coh3002t_t1, coh3002t, taitogn_state, 0, ROT270, "Triangle Service", "XII Stag (V2.01J 2002/6/26 22:27)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp
index 6a21eacf9dd..5075ad3f8f9 100644
--- a/src/mame/drivers/taitojc.cpp
+++ b/src/mame/drivers/taitojc.cpp
@@ -1086,7 +1086,7 @@ void taitojc_state::machine_start()
}
-static MACHINE_CONFIG_START( taitojc, taitojc_state )
+static MACHINE_CONFIG_START( taitojc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68040, XTAL_10MHz*2) // 20MHz, clock source = CY7C991
@@ -1141,7 +1141,7 @@ static MACHINE_CONFIG_DERIVED( dendego, taitojc )
/* sound hardware */
MCFG_SPEAKER_ADD("subwoofer", 0.0, 0.0, 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "subwoofer", 0.20)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index fc14d9ddf29..2866515694d 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -752,7 +752,7 @@ INTERRUPT_GEN_MEMBER(taitopjc_state::taitopjc_vbi)
}
-static MACHINE_CONFIG_START( taitopjc, taitopjc_state )
+static MACHINE_CONFIG_START( taitopjc )
MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
MCFG_CPU_PROGRAM_MAP(ppc603e_mem)
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index 1f5e1fcf184..a826c7a9db8 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -1738,7 +1738,7 @@ WRITE8_MEMBER(taitosj_state::taitosj_dacvol_w)
m_dacvol->write(space, NODE_01, data ^ 0xff); // 7416 hex inverter
}
-static MACHINE_CONFIG_START( nomcu, taitosj_state )
+static MACHINE_CONFIG_START( nomcu )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,XTAL_8MHz/2) /* 8 MHz / 2, on CPU board */
@@ -2824,16 +2824,16 @@ DRIVER_INIT_MEMBER(taitosj_state,junglhbr)
}
GAME( 1981, spaceskr, 0, nomcu, spaceskr, taitosj_state, taitosj, ROT0, "Taito Corporation", "Space Seeker", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, spacecr, 0, nomcu, spacecr, taitosj_state, spacecr, ROT90, "Taito Corporation", "Space Cruiser", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, junglek, 0, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito Corporation", "Jungle King (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, junglekas,junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito Corporation", "Jungle King (alternate sound)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, junglekj2,junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito Corporation", "Jungle King (Japan, earlier)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, jungleh, junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito America Corporation", "Jungle Hunt (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, junglehbr,junglek, nomcu, junglek, taitosj_state, junglhbr,ROT180, "Taito do Brasil", "Jungle Hunt (Brazil)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, spacecr, 0, nomcu, spacecr, taitosj_state, spacecr, ROT90, "Taito Corporation", "Space Cruiser", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, junglek, 0, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito Corporation", "Jungle King (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, junglekas,junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito Corporation", "Jungle King (alternate sound)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, junglekj2,junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito Corporation", "Jungle King (Japan, earlier)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, jungleh, junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "Taito America Corporation", "Jungle Hunt (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, junglehbr,junglek, nomcu, junglek, taitosj_state, junglhbr,ROT180, "Taito do Brasil", "Jungle Hunt (Brazil)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, piratpet, junglek, nomcu, piratpet, taitosj_state, taitosj, ROT180, "Taito America Corporation", "Pirate Pete", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, jungleby, junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "bootleg", "Jungle Boy (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, alpine, 0, nomcu, alpine, taitosj_state, alpine, ROT270, "Taito Corporation", "Alpine Ski (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, alpinea, alpine, nomcu, alpinea, taitosj_state, alpinea, ROT270, "Taito Corporation", "Alpine Ski (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, jungleby, junglek, nomcu, junglek, taitosj_state, taitosj, ROT180, "bootleg", "Jungle Boy (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, alpine, 0, nomcu, alpine, taitosj_state, alpine, ROT270, "Taito Corporation", "Alpine Ski (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, alpinea, alpine, nomcu, alpinea, taitosj_state, alpinea, ROT270, "Taito Corporation", "Alpine Ski (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, timetunl, 0, nomcu, timetunl, taitosj_state, taitosj, ROT0, "Taito Corporation", "Time Tunnel", MACHINE_SUPPORTS_SAVE )
GAME( 1982, wwestern, 0, nomcu, wwestern, taitosj_state, taitosj, ROT270, "Taito Corporation", "Wild Western (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, wwestern1,wwestern, nomcu, wwestern, taitosj_state, taitosj, ROT270, "Taito Corporation", "Wild Western (set 2)", MACHINE_SUPPORTS_SAVE )
@@ -2841,10 +2841,10 @@ GAME( 1982, frontlin, 0, mcu, frontlin, taitosj_state, taitosj, RO
GAME( 1983, elevator, 0, mcu, elevator, taitosj_state, taitosj, ROT0, "Taito Corporation", "Elevator Action (5 pcb version, 1.1)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, elevatorb,elevator, nomcu, elevator, taitosj_state, taitosj, ROT0, "bootleg", "Elevator Action (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, elevator4,elevator, mcu, elevator, taitosj_state, taitosj, ROT0, "Taito Corporation", "Elevator Action (4 pcb version, 1.1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, tinstar, 0, mcu, tinstar, taitosj_state, taitosj, ROT0, "Taito Corporation", "The Tin Star (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, tinstar2, tinstar, mcu, tinstar, taitosj_state, taitosj, ROT0, "Taito Corporation", "The Tin Star (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, tinstar, 0, mcu, tinstar, taitosj_state, taitosj, ROT0, "Taito Corporation", "The Tin Star (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, tinstar2, tinstar, mcu, tinstar, taitosj_state, taitosj, ROT0, "Taito Corporation", "The Tin Star (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, waterski, 0, nomcu, waterski, taitosj_state, taitosj, ROT270, "Taito Corporation", "Water Ski", MACHINE_SUPPORTS_SAVE )
GAME( 1983, bioatack, 0, nomcu, bioatack, taitosj_state, taitosj, ROT270, "Taito Corporation (Fox Video Games license)", "Bio Attack", MACHINE_SUPPORTS_SAVE )
GAME( 1984, sfposeid, 0, mcu, sfposeid, taitosj_state, taitosj, ROT0, "Taito Corporation", "Sea Fighter Poseidon", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hwrace, 0, nomcu, hwrace, taitosj_state, taitosj, ROT270, "Taito Corporation", "High Way Race", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hwrace, 0, nomcu, hwrace, taitosj_state, taitosj, ROT270, "Taito Corporation", "High Way Race", MACHINE_SUPPORTS_SAVE )
GAME( 1984, kikstart, 0, kikstart, kikstart, taitosj_state, taitosj, ROT0, "Taito Corporation", "Kick Start - Wheelie King", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp
index c8dda24ca9f..daad9885448 100644
--- a/src/mame/drivers/taitottl.cpp
+++ b/src/mame/drivers/taitottl.cpp
@@ -96,7 +96,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -139,7 +139,7 @@ void taitottl_state::video_start()
{
}
-static MACHINE_CONFIG_START( taitottl, taitottl_state )
+static MACHINE_CONFIG_START( taitottl )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -251,7 +251,7 @@ ROM_START( zzblock )
ROM_END
-GAME( 1977, gunman, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "Gunman [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, missilex, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "Missile-X [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, ttblock, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "T.T. Block [TTL]", MACHINE_IS_SKELETON )
-GAME( 1979, zzblock, 0, taitottl, 0, driver_device, 0, ROT0, "Taito", "Zun Zun Block [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, gunman, 0, taitottl, 0, taitottl_state, 0, ROT0, "Taito", "Gunman [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, missilex, 0, taitottl, 0, taitottl_state, 0, ROT0, "Taito", "Missile-X [TTL]", MACHINE_IS_SKELETON )
+GAME( 1977, ttblock, 0, taitottl, 0, taitottl_state, 0, ROT0, "Taito", "T.T. Block [TTL]", MACHINE_IS_SKELETON )
+GAME( 1979, zzblock, 0, taitottl, 0, taitottl_state, 0, ROT0, "Taito", "Zun Zun Block [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp
index 1aff70a3115..adf516c1134 100644
--- a/src/mame/drivers/taitotx.cpp
+++ b/src/mame/drivers/taitotx.cpp
@@ -166,7 +166,7 @@ void taito_type_x_state::machine_reset()
}
// todo: different configs for the different machine types.
-static MACHINE_CONFIG_START( taito_type_x, taito_type_x_state )
+static MACHINE_CONFIG_START( taito_type_x )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333) /* Wrong, much newer processors, much faster. */
@@ -389,6 +389,6 @@ ROM_START( kofxii )
ROM_END
-GAME( 2006, chasehq2, 0, taito_type_x, taito_type_x, driver_device, 0, ROT0, "Taito Corporation", "Chase H.Q. 2 (v2.0.6.JP)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2008, samspsen, 0, taito_type_x, taito_type_x, driver_device, 0, ROT0, "SNK Playmore", "Samurai Spirits Sen (v1.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2009, kofxii, 0, taito_type_x, taito_type_x, driver_device, 0, ROT0, "SNK Playmore", "The King of Fighters XII (v1.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2006, chasehq2, 0, taito_type_x, taito_type_x, taito_type_x_state, 0, ROT0, "Taito Corporation", "Chase H.Q. 2 (v2.0.6.JP)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2008, samspsen, 0, taito_type_x, taito_type_x, taito_type_x_state, 0, ROT0, "SNK Playmore", "Samurai Spirits Sen (v1.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2009, kofxii, 0, taito_type_x, taito_type_x, taito_type_x_state, 0, ROT0, "SNK Playmore", "The King of Fighters XII (v1.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 9642e856622..1b9a05fe395 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -2556,7 +2556,7 @@ WRITE_LINE_MEMBER(taitotz_state::ide_interrupt)
m_iocpu->set_input_line(TLCS900_INT2, state);
}
-static MACHINE_CONFIG_START( taitotz, taitotz_state )
+static MACHINE_CONFIG_START( taitotz )
/* IBM EMPPC603eBG-100 */
MCFG_CPU_ADD("maincpu", PPC603E, 100000000)
MCFG_PPC_BUS_FREQUENCY(XTAL_66_6667MHz) /* Multiplier 1.5, Bus = 66MHz, Core = 100MHz */
@@ -2915,13 +2915,13 @@ ROM_START( styphp )
DISK_IMAGE( "styphp", 0, SHA1(c232d3460e37523346132544b8e23a5f9b447150) )
ROM_END
-GAME( 1999, taitotz, 0, taitotz, taitotz, driver_device, 0, ROT0, "Taito", "Type Zero BIOS", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_IS_BIOS_ROOT)
-GAME( 1999, landhigh, taitotz, landhigh, landhigh, taitotz_state, landhigh, ROT0, "Taito", "Landing High Japan (Ver 2.01 OK)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1999, batlgear, taitotz, taitotz, batlgr2, taitotz_state, batlgear, ROT0, "Taito", "Battle Gear (Ver 2.40 A)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 1999, pwrshovl, taitotz, taitotz, pwrshovl, taitotz_state, pwrshovl, ROT0, "Taito", "Power Shovel ni Norou!! - Power Shovel Simulator (v2.07J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 1999/8/5 19:13:35
-GAME( 1999, pwrshovla,pwrshovl,taitotz, pwrshovl, taitotz_state, pwrshovl, ROT0, "Taito", "Power Shovel ni Norou!! - Power Shovel Simulator (v2.07J, alt)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // seem to be some differences in drive content, but identifies as the same revision, is it just user data changes??
-GAME( 2000, batlgr2, taitotz, taitotz, batlgr2, taitotz_state, batlgr2, ROT0, "Taito", "Battle Gear 2 (v2.04J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2000, batlgr2a, batlgr2, taitotz, batlgr2, taitotz_state, batlgr2a, ROT0, "Taito", "Battle Gear 2 (v2.01J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2000, styphp, taitotz, taitotz, styphp, taitotz_state, styphp, ROT0, "Taito", "Stunt Typhoon Plus (Ver 2.04 J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, raizpin, taitotz, taitotz, taitotz, taitotz_state, raizpin, ROT0, "Taito", "Raizin Ping Pong (V2.01O)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, raizpinj, raizpin, taitotz, taitotz, taitotz_state, raizpinj, ROT0, "Taito", "Raizin Ping Pong (V2.01J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1999, taitotz, 0, taitotz, taitotz, taitotz_state, 0, ROT0, "Taito", "Type Zero BIOS", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_IS_BIOS_ROOT)
+GAME( 1999, landhigh, taitotz, landhigh, landhigh, taitotz_state, landhigh, ROT0, "Taito", "Landing High Japan (Ver 2.01 OK)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1999, batlgear, taitotz, taitotz, batlgr2, taitotz_state, batlgear, ROT0, "Taito", "Battle Gear (Ver 2.40 A)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1999, pwrshovl, taitotz, taitotz, pwrshovl, taitotz_state, pwrshovl, ROT0, "Taito", "Power Shovel ni Norou!! - Power Shovel Simulator (v2.07J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // 1999/8/5 19:13:35
+GAME( 1999, pwrshovla, pwrshovl, taitotz, pwrshovl, taitotz_state, pwrshovl, ROT0, "Taito", "Power Shovel ni Norou!! - Power Shovel Simulator (v2.07J, alt)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // seem to be some differences in drive content, but identifies as the same revision, is it just user data changes??
+GAME( 2000, batlgr2, taitotz, taitotz, batlgr2, taitotz_state, batlgr2, ROT0, "Taito", "Battle Gear 2 (v2.04J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2000, batlgr2a, batlgr2, taitotz, batlgr2, taitotz_state, batlgr2a, ROT0, "Taito", "Battle Gear 2 (v2.01J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2000, styphp, taitotz, taitotz, styphp, taitotz_state, styphp, ROT0, "Taito", "Stunt Typhoon Plus (Ver 2.04 J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, raizpin, taitotz, taitotz, taitotz, taitotz_state, raizpin, ROT0, "Taito", "Raizin Ping Pong (V2.01O)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, raizpinj, raizpin, taitotz, taitotz, taitotz_state, raizpinj, ROT0, "Taito", "Raizin Ping Pong (V2.01J)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp
index d04f99726c3..4110306b98c 100644
--- a/src/mame/drivers/taitowlf.cpp
+++ b/src/mame/drivers/taitowlf.cpp
@@ -365,7 +365,7 @@ PALETTE_INIT_MEMBER(taitowlf_state, taitowlf)
}
#endif
-static MACHINE_CONFIG_START( taitowlf, taitowlf_state )
+static MACHINE_CONFIG_START( taitowlf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM, 200000000)
diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp
index ec608337a5d..14ad1cb2a1d 100644
--- a/src/mame/drivers/tamag1.cpp
+++ b/src/mame/drivers/tamag1.cpp
@@ -128,7 +128,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( tama, tamag1_state )
+static MACHINE_CONFIG_START( tama )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", E0C6S46, XTAL_32_768kHz)
@@ -171,4 +171,4 @@ ROM_START( tama )
ROM_END
-CONS( 1997, tama, 0, 0, tama, tama, driver_device, 0, "Bandai", "Tamagotchi (USA)", MACHINE_SUPPORTS_SAVE )
+CONS( 1997, tama, 0, 0, tama, tama, tamag1_state, 0, "Bandai", "Tamagotchi (USA)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 737214b4e01..3fd4c678e09 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -46,16 +46,19 @@ Tandy 1000 (80386) variations:
#include "sound/sn76496.h"
#include "cpu/i86/i86.h"
#include "cpu/i86/i286.h"
+#include "bus/pc_joy/pc_joy.h"
+#include "screen.h"
#include "softlist.h"
-extern const device_type T1000_MOTHERBOARD;
+DECLARE_DEVICE_TYPE(T1000_MOTHERBOARD, t1000_mb_device)
class t1000_mb_device : public pc_noppi_mb_device
{
public:
// construction/destruction
t1000_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pc_noppi_mb_device(mconfig, T1000_MOTHERBOARD, "T1000_MOTHERBOARD", tag, owner, clock, "t1000_mb", __FILE__) { }
+ : pc_noppi_mb_device(mconfig, T1000_MOTHERBOARD, tag, owner, clock)
+ { }
protected:
virtual void device_start() override;
};
@@ -64,7 +67,7 @@ void t1000_mb_device::device_start()
{
}
-const device_type T1000_MOTHERBOARD = device_creator<t1000_mb_device>;
+DEFINE_DEVICE_TYPE(T1000_MOTHERBOARD, t1000_mb_device, "t1000_mb", "Tandy 1000 Motherboard")
class tandy1000_state : public driver_device
{
@@ -656,7 +659,7 @@ static MACHINE_CONFIG_FRAGMENT(tandy1000_101key)
MCFG_AT_KEYB_ADD("pc_keyboard", 1, DEVWRITELINE("mb:pic8259", pic8259_device, ir1_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( t1000hx, tandy1000_state )
+static MACHINE_CONFIG_START( t1000hx )
MCFG_CPU_ADD("maincpu", I8088, 8000000)
MCFG_CPU_PROGRAM_MAP(tandy1000_map)
MCFG_CPU_IO_MAP(tandy1000_io)
@@ -686,7 +689,7 @@ static MACHINE_CONFIG_DERIVED( t1000sx, t1000hx )
MCFG_RAM_EXTRA_OPTIONS("384K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( t1000rl, tandy1000_state )
+static MACHINE_CONFIG_START( t1000rl )
MCFG_CPU_ADD("maincpu", I8086, XTAL_28_63636MHz / 3)
MCFG_CPU_PROGRAM_MAP(tandy1000_bank_map)
MCFG_CPU_IO_MAP(tandy1000_bank_io)
@@ -718,7 +721,7 @@ static MACHINE_CONFIG_DERIVED( t1000sl2, t1000rl )
MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, nullptr, false)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( t1000tl, tandy1000_state )
+static MACHINE_CONFIG_START( t1000tl )
MCFG_CPU_ADD("maincpu", I80286, XTAL_28_63636MHz / 2)
MCFG_CPU_PROGRAM_MAP(tandy1000_286_map)
MCFG_CPU_IO_MAP(tandy1000_16_io)
@@ -907,11 +910,11 @@ ROM_START( t1000tl2 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
// tandy 1000
-COMP( 1987, t1000hx, ibm5150, 0, t1000hx, t1000_90key, driver_device, 0, "Tandy Radio Shack", "Tandy 1000 HX", 0)
-COMP( 1987, t1000sx, ibm5150, 0, t1000sx, t1000_90key, driver_device, 0, "Tandy Radio Shack", "Tandy 1000 SX", 0)
-COMP( 1987, t1000tx, ibm5150, 0, t1000tx, t1000_90key, driver_device, 0, "Tandy Radio Shack", "Tandy 1000 TX", 0)
-COMP( 1989, t1000rl, ibm5150, 0, t1000rl, t1000_101key, driver_device, 0, "Tandy Radio Shack", "Tandy 1000 RL", 0)
-COMP( 1989, t1000tl2, ibm5150, 0, t1000tl, t1000_101key, driver_device, 0, "Tandy Radio Shack", "Tandy 1000 TL/2", 0)
-COMP( 1988, t1000sl2, ibm5150, 0, t1000sl2, t1000_101key, driver_device, 0, "Tandy Radio Shack", "Tandy 1000 SL/2", 0)
+COMP( 1987, t1000hx, ibm5150, 0, t1000hx, t1000_90key, tandy1000_state, 0, "Tandy Radio Shack", "Tandy 1000 HX", 0 )
+COMP( 1987, t1000sx, ibm5150, 0, t1000sx, t1000_90key, tandy1000_state, 0, "Tandy Radio Shack", "Tandy 1000 SX", 0 )
+COMP( 1987, t1000tx, ibm5150, 0, t1000tx, t1000_90key, tandy1000_state, 0, "Tandy Radio Shack", "Tandy 1000 TX", 0 )
+COMP( 1989, t1000rl, ibm5150, 0, t1000rl, t1000_101key, tandy1000_state, 0, "Tandy Radio Shack", "Tandy 1000 RL", 0 )
+COMP( 1989, t1000tl2, ibm5150, 0, t1000tl, t1000_101key, tandy1000_state, 0, "Tandy Radio Shack", "Tandy 1000 TL/2", 0 )
+COMP( 1988, t1000sl2, ibm5150, 0, t1000sl2, t1000_101key, tandy1000_state, 0, "Tandy Radio Shack", "Tandy 1000 SL/2", 0 )
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index 5220fb7e5a9..486be20b896 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -764,7 +764,7 @@ void tandy2k_state::device_reset_after_children()
// Machine Driver
-static MACHINE_CONFIG_START( tandy2k, tandy2k_state )
+static MACHINE_CONFIG_START( tandy2k )
// basic machine hardware
MCFG_CPU_ADD(I80186_TAG, I80186, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(tandy2k_mem)
@@ -777,7 +777,7 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) // not accurate
MCFG_SCREEN_SIZE(640, 400)
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 400-1)
- //MCFG_SCREEN_UPDATE_DEVICE(CRT9021B_TAG, crt9021_t, screen_update)
+ //MCFG_SCREEN_UPDATE_DEVICE(CRT9021B_TAG, crt9021_device, screen_update)
MCFG_SCREEN_UPDATE_DRIVER(tandy2k_state, screen_update)
MCFG_PALETTE_ADD_MONOCHROME("palette")
@@ -786,9 +786,9 @@ static MACHINE_CONFIG_START( tandy2k, tandy2k_state )
MCFG_DEVICE_ADDRESS_MAP(AS_0, vpac_mem)
MCFG_CRT9007_CHARACTER_WIDTH(8)
MCFG_CRT9007_INT_CALLBACK(DEVWRITELINE(I8259A_1_TAG, pic8259_device, ir1_w))
- MCFG_CRT9007_VS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_t, vsync_w))
+ MCFG_CRT9007_VS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_device, vsync_w))
MCFG_CRT9007_VLT_CALLBACK(WRITELINE(tandy2k_state, vpac_vlt_w))
- MCFG_CRT9007_CURS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_t, cursor_w))
+ MCFG_CRT9007_CURS_CALLBACK(DEVWRITELINE(CRT9021B_TAG, crt9021_device, cursor_w))
MCFG_CRT9007_DRB_CALLBACK(WRITELINE(tandy2k_state, vpac_drb_w))
MCFG_CRT9007_WBEN_CALLBACK(WRITELINE(tandy2k_state, vpac_wben_w))
MCFG_CRT9007_CBLANK_CALLBACK(WRITELINE(tandy2k_state, vpac_cblank_w))
@@ -912,6 +912,6 @@ ROM_END
// System Drivers
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, tandy2k, 0, 0, tandy2k, tandy2k, driver_device, 0, "Tandy Radio Shack", "Tandy 2000", MACHINE_NOT_WORKING )
-COMP( 1983, tandy2khd, tandy2k, 0, tandy2k_hd, tandy2k, driver_device, 0, "Tandy Radio Shack", "Tandy 2000HD", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, tandy2k, 0, 0, tandy2k, tandy2k, tandy2k_state, 0, "Tandy Radio Shack", "Tandy 2000", MACHINE_NOT_WORKING )
+COMP( 1983, tandy2khd, tandy2k, 0, tandy2k_hd, tandy2k, tandy2k_state, 0, "Tandy Radio Shack", "Tandy 2000HD", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp
index 2b9a63a9b14..ca612beadeb 100644
--- a/src/mame/drivers/tank8.cpp
+++ b/src/mame/drivers/tank8.cpp
@@ -326,7 +326,7 @@ static GFXDECODE_START( tank8 )
GFXDECODE_END
-static MACHINE_CONFIG_START( tank8, tank8_state )
+static MACHINE_CONFIG_START( tank8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 11055000 / 10) /* ? */
@@ -481,8 +481,8 @@ DRIVER_INIT_MEMBER(tank8_state,decode)
}
-GAME( 1976, tank8, 0, tank8, tank8, driver_device, 0, ROT0, "Atari (Kee Games)", "Tank 8 (set 1)", MACHINE_SUPPORTS_SAVE)
+GAME( 1976, tank8, 0, tank8, tank8, tank8_state, 0, ROT0, "Atari (Kee Games)", "Tank 8 (set 1)", MACHINE_SUPPORTS_SAVE)
GAME( 1976, tank8a, tank8, tank8, tank8, tank8_state, decode, ROT0, "Atari (Kee Games)", "Tank 8 (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
GAME( 1976, tank8b, tank8, tank8, tank8, tank8_state, decode, ROT0, "Atari (Kee Games)", "Tank 8 (set 3)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1976, tank8c, tank8, tank8, tank8, driver_device, 0, ROT0, "Atari (Kee Games)", "Tank 8 (set 4)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1976, tank8d, tank8, tank8, tank8, driver_device, 0, ROT0, "Atari (Kee Games)", "Tank 8 (set 5)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, tank8c, tank8, tank8, tank8, tank8_state, 0, ROT0, "Atari (Kee Games)", "Tank 8 (set 4)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, tank8d, tank8, tank8, tank8, tank8_state, 0, ROT0, "Atari (Kee Games)", "Tank 8 (set 5)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp
index fd53ec06a7e..ba260df01cf 100644
--- a/src/mame/drivers/tankbatt.cpp
+++ b/src/mame/drivers/tankbatt.cpp
@@ -282,7 +282,7 @@ static const char *const tankbatt_sample_names[] =
};
-static MACHINE_CONFIG_START( tankbatt, tankbatt_state )
+static MACHINE_CONFIG_START( tankbatt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 1000000) /* 1 MHz ???? */
@@ -348,5 +348,5 @@ ROM_START( tankbattb ) /* board with "NAMCO" removed from gfx1 rom, otherwise id
ROM_LOAD( "bct1-1.l3", 0x0000, 0x0100, CRC(d17518bc) SHA1(f3b0deffa586808bc59e9a24ec1699c54ebe84cc) ) // dm74s287n.3l
ROM_END
-GAME( 1980, tankbatt, 0, tankbatt, tankbatt, driver_device, 0, ROT90, "Namco", "Tank Battalion", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tankbattb, tankbatt, tankbatt, tankbatt, driver_device, 0, ROT90, "bootleg", "Tank Battalion (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tankbatt, 0, tankbatt, tankbatt, tankbatt_state, 0, ROT90, "Namco", "Tank Battalion", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tankbattb, tankbatt, tankbatt, tankbatt, tankbatt_state, 0, ROT90, "bootleg", "Tank Battalion (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp
index cefbaf8934a..f6159d67440 100644
--- a/src/mame/drivers/tankbust.cpp
+++ b/src/mame/drivers/tankbust.cpp
@@ -330,7 +330,7 @@ INTERRUPT_GEN_MEMBER(tankbust_state::vblank_irq)
device.execute().set_input_line(0, HOLD_LINE);
}
-static MACHINE_CONFIG_START( tankbust, tankbust_state )
+static MACHINE_CONFIG_START( tankbust )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_14_31818MHz/2) /* Verified on PCB */
@@ -420,4 +420,4 @@ ROM_START( tankbust )
ROM_END
-GAME( 1985, tankbust, 0, tankbust, tankbust, driver_device, 0, ROT90, "Valadon Automation", "Tank Busters", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tankbust, 0, tankbust, tankbust, tankbust_state, 0, ROT90, "Valadon Automation", "Tank Busters", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp
index d50c86d882b..25fd91b47f9 100644
--- a/src/mame/drivers/taotaido.cpp
+++ b/src/mame/drivers/taotaido.cpp
@@ -356,7 +356,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( taotaido, taotaido_state )
+static MACHINE_CONFIG_START( taotaido )
MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", taotaido_state, irq1_line_hold)
@@ -482,6 +482,6 @@ ROM_START( taotaido3 )
ROM_LOAD( "u15.bin", 0x000000, 0x200000, CRC(e95823e9) SHA1(362583944ad4fdde4f9e29928cf34376c7ad931f) )
ROM_END
-GAME( 1993, taotaido, 0, taotaido, taotaido, driver_device, 0, ROT0, "Video System Co.", "Tao Taido (2 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1993, taotaidoa,taotaido, taotaido, taotaido6,driver_device, 0, ROT0, "Video System Co.", "Tao Taido (6 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // maybe a prototype? has various debug features
-GAME( 1993, taotaido3,taotaido, taotaido, taotaido3,driver_device, 0, ROT0, "Video System Co.", "Tao Taido (2/3 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, taotaido, 0, taotaido, taotaido, taotaido_state, 0, ROT0, "Video System Co.", "Tao Taido (2 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1993, taotaidoa, taotaido, taotaido, taotaido6, taotaido_state, 0, ROT0, "Video System Co.", "Tao Taido (6 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // maybe a prototype? has various debug features
+GAME( 1993, taotaido3, taotaido, taotaido, taotaido3, taotaido_state, 0, ROT0, "Video System Co.", "Tao Taido (2/3 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp
index 2ded0fe499c..17038a80aa3 100644
--- a/src/mame/drivers/tapatune.cpp
+++ b/src/mame/drivers/tapatune.cpp
@@ -509,7 +509,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tapatune_base, tapatune_state )
+static MACHINE_CONFIG_START( tapatune_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 4)
MCFG_CPU_PROGRAM_MAP(maincpu_map)
@@ -628,8 +628,8 @@ ROM_END
*
*************************************/
-GAME(1994, tapatune, 0, tapatune, tapatune, driver_device, 0, ROT0, "Moloney Manufacturing Inc. / Creative Electronics and Software", "Tap a Tune", MACHINE_SUPPORTS_SAVE )
+GAME(1994, tapatune, 0, tapatune, tapatune, tapatune_state, 0, ROT0, "Moloney Manufacturing Inc. / Creative Electronics and Software", "Tap a Tune", MACHINE_SUPPORTS_SAVE )
// below appear to be mechanical games with the same Z80 board as the above
-GAME(1994, srockbwl, 0, tapatune_base, tapatune, driver_device, 0, ROT0, "Bromley", "Super Rock and Bowl (V1.1)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE )
-GAME(199?, smartoss, 0, tapatune_base, tapatune, driver_device, 0, ROT0, "Smart Industries / Creative Electronics and Software", "Smart Toss 'em / Smartball (Ver 2.0)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE )
+GAME(1994, srockbwl, 0, tapatune_base, tapatune, tapatune_state, 0, ROT0, "Bromley", "Super Rock and Bowl (V1.1)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE )
+GAME(199?, smartoss, 0, tapatune_base, tapatune, tapatune_state, 0, ROT0, "Smart Industries / Creative Electronics and Software", "Smart Toss 'em / Smartball (Ver 2.0)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp
index 6a82c2b6c5f..85b0289eeaf 100644
--- a/src/mame/drivers/targeth.cpp
+++ b/src/mame/drivers/targeth.cpp
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( targeth )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( targeth, targeth_state )
+static MACHINE_CONFIG_START( targeth )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
@@ -204,7 +204,7 @@ static MACHINE_CONFIG_START( targeth, targeth_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -249,5 +249,5 @@ ROM_START( targetha )
ROM_LOAD( "targeth.c3", 0x080000, 0x080000, CRC(d4c771df) SHA1(7cc0a86ef6aa3d26ab8f19d198f62112bf012870) )
ROM_END
-GAME( 1994, targeth, 0, targeth, targeth, driver_device, 0, ROT0, "Gaelco", "Target Hits (ver 1.1)", MACHINE_UNEMULATED_PROTECTION )
-GAME( 1994, targetha, targeth, targeth, targeth, driver_device, 0, ROT0, "Gaelco", "Target Hits (ver 1.0)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, targeth, 0, targeth, targeth, targeth_state, 0, ROT0, "Gaelco", "Target Hits (ver 1.1)", MACHINE_UNEMULATED_PROTECTION )
+GAME( 1994, targetha, targeth, targeth, targeth, targeth_state, 0, ROT0, "Gaelco", "Target Hits (ver 1.0)", MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index c2a0e534600..4f1dc486140 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -633,7 +633,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(kongambl_state::kongambl_vblank)
}
-static MACHINE_CONFIG_START( kongambl, kongambl_state )
+static MACHINE_CONFIG_START( kongambl )
MCFG_CPU_ADD("maincpu", M68EC020, 25000000)
MCFG_CPU_PROGRAM_MAP(kongambl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", kongambl_state, kongambl_vblank, "screen", 0, 1)
@@ -816,8 +816,8 @@ DRIVER_INIT_MEMBER(kongambl_state,kingtut)
//rom[0x55e40/4] = (rom[0x55e40/4] & 0xffff0000) | 0x4e71; // goes away from the POST
}
-GAME( 199?, kingtut, 0, kongambl, kongambl, kongambl_state, kingtut, ROT0, "Konami", "King Tut (NSW, Australia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 199?, moneybnk, 0, kongambl, kongambl, driver_device, 0, ROT0, "Konami", "Money In The Bank (NSW, Australia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 199?, dragsphr, 0, kongambl, kongambl, driver_device, 0, ROT0, "Konami", "Dragon Sphere", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 199?, ivorytsk, 0, kongambl, kongambl, driver_device, 0, ROT0, "Konami", "Ivory Tusk", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 199?, vikingt, 0, kongambl, kongambl, driver_device, 0, ROT0, "Konami", "Viking Treasure", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, kingtut, 0, kongambl, kongambl, kongambl_state, kingtut, ROT0, "Konami", "King Tut (NSW, Australia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, moneybnk, 0, kongambl, kongambl, kongambl_state, 0, ROT0, "Konami", "Money In The Bank (NSW, Australia)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, dragsphr, 0, kongambl, kongambl, kongambl_state, 0, ROT0, "Konami", "Dragon Sphere", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, ivorytsk, 0, kongambl, kongambl, kongambl_state, 0, ROT0, "Konami", "Ivory Tusk", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 199?, vikingt, 0, kongambl, kongambl, kongambl_state, 0, ROT0, "Konami", "Viking Treasure", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp
index 7a27cad1231..bcc9d4aad5b 100644
--- a/src/mame/drivers/tatsumi.cpp
+++ b/src/mame/drivers/tatsumi.cpp
@@ -842,7 +842,7 @@ MACHINE_RESET_MEMBER(tatsumi_state,apache3)
}
-static MACHINE_CONFIG_START( apache3, tatsumi_state )
+static MACHINE_CONFIG_START( apache3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
@@ -893,12 +893,12 @@ static MACHINE_CONFIG_START( apache3, tatsumi_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( roundup5, tatsumi_state )
+static MACHINE_CONFIG_START( roundup5 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, CLOCK_1 / 2)
@@ -941,12 +941,12 @@ static MACHINE_CONFIG_START( roundup5, tatsumi_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 4 / 2, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cyclwarr, tatsumi_state )
+static MACHINE_CONFIG_START( cyclwarr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
@@ -999,12 +999,12 @@ static MACHINE_CONFIG_START( cyclwarr, tatsumi_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", CLOCK_1 / 8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bigfight, tatsumi_state )
+static MACHINE_CONFIG_START( bigfight )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CLOCK_2 / 4)
@@ -1057,7 +1057,7 @@ static MACHINE_CONFIG_START( bigfight, tatsumi_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", CLOCK_1 / 8 / 2, OKIM6295_PIN7_HIGH) /* 2MHz was too fast. Can the clock be software controlled? */
+ MCFG_OKIM6295_ADD("oki", CLOCK_1 / 8 / 2, PIN7_HIGH) /* 2MHz was too fast. Can the clock be software controlled? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp
index cf981a9cdff..91d59a71f9a 100644
--- a/src/mame/drivers/tattack.cpp
+++ b/src/mame/drivers/tattack.cpp
@@ -226,7 +226,7 @@ PALETTE_INIT_MEMBER(tattack_state, tattack)
}
-static MACHINE_CONFIG_START( tattack, tattack_state )
+static MACHINE_CONFIG_START( tattack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 8000000 / 2) /* 4 MHz ? */
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index 2de47b6e89c..703b31c9226 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -92,7 +92,7 @@ public:
DECLARE_WRITE8_MEMBER(pb_w);
DECLARE_WRITE8_MEMBER(pa_ivg_w);
DECLARE_READ8_MEMBER(pb_ivg_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE8_MEMBER(ds_w);
DECLARE_MACHINE_RESET(cpu09);
DECLARE_MACHINE_RESET(ivg09);
@@ -105,7 +105,7 @@ private:
optional_shared_ptr<uint8_t> m_p_videoram;
required_device<cassette_image_device> m_cass;
optional_device<pia6821_device> m_pia_ivg;
- optional_device<fd1795_t> m_fdc;
+ optional_device<fd1795_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<beep_device> m_beep;
required_device<cpu_device> m_maincpu;
@@ -132,7 +132,7 @@ static ADDRESS_MAP_START(ivg09_mem, AS_PROGRAM, 8, tavernie_state)
AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE("pia_ivg", pia6821_device, read, write)
AM_RANGE(0x2080, 0x2080) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w)
AM_RANGE(0x2081, 0x2081) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
- AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("fdc", fd1795_t, read, write)
+ AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("fdc", fd1795_device, read, write)
AM_RANGE(0xe080, 0xe080) AM_WRITE(ds_w)
AM_RANGE(0xeb00, 0xeb03) AM_DEVREADWRITE("pia", pia6821_device, read, write)
AM_RANGE(0xeb04, 0xeb04) AM_DEVREADWRITE("acia", acia6850_device, status_r, control_w)
@@ -284,7 +284,7 @@ WRITE8_MEMBER( tavernie_state::pa_ivg_w )
// bits 0-3 are attribute bits
}
-WRITE8_MEMBER( tavernie_state::kbd_put )
+void tavernie_state::kbd_put(u8 data)
{
m_term_data = data;
m_pia_ivg->cb1_w(0);
@@ -297,7 +297,7 @@ WRITE_LINE_MEMBER( tavernie_state::write_acia_clock )
m_acia->write_rxc(state);
}
-static MACHINE_CONFIG_START( cpu09, tavernie_state )
+static MACHINE_CONFIG_START( cpu09 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809E, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(cpu09_mem)
@@ -359,7 +359,7 @@ static MACHINE_CONFIG_DERIVED( ivg09, cpu09 )
/* Devices */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(tavernie_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(tavernie_state, kbd_put))
MCFG_MC6845_ADD("crtc", MC6845, "screen", 1008000) // unknown clock
MCFG_MC6845_SHOW_BORDER_AREA(false)
@@ -396,6 +396,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, cpu09, 0, 0, cpu09, cpu09, driver_device, 0, "C. Tavernier", "CPU09", MACHINE_NOT_WORKING )
-COMP( 1983, ivg09, cpu09, 0, ivg09, ivg09, driver_device, 0, "C. Tavernier", "CPU09 with IVG09 and IFD09", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, cpu09, 0, 0, cpu09, cpu09, tavernie_state, 0, "C. Tavernier", "CPU09", MACHINE_NOT_WORKING )
+COMP( 1983, ivg09, cpu09, 0, ivg09, ivg09, tavernie_state, 0, "C. Tavernier", "CPU09 with IVG09 and IFD09", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp
index b36d5dcfae8..eefc733634c 100644
--- a/src/mame/drivers/taxidriv.cpp
+++ b/src/mame/drivers/taxidriv.cpp
@@ -330,7 +330,7 @@ PALETTE_INIT_MEMBER(taxidriv_state, taxidriv)
}
}
-static MACHINE_CONFIG_START( taxidriv, taxidriv_state )
+static MACHINE_CONFIG_START( taxidriv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,4000000) /* 4 MHz ??? */
@@ -448,4 +448,4 @@ ROM_START( taxidriv )
ROM_END
-GAME( 1984, taxidriv, 0, taxidriv, taxidriv, driver_device, 0, ROT90, "Graphic Techno", "Taxi Driver", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, taxidriv, 0, taxidriv, taxidriv, taxidriv_state, 0, ROT90, "Graphic Techno", "Taxi Driver", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp
index ceafffa8c73..27826b6288d 100644
--- a/src/mame/drivers/tb303.cpp
+++ b/src/mame/drivers/tb303.cpp
@@ -246,7 +246,7 @@ void tb303_state::machine_start()
save_item(NAME(m_ram_we));
}
-static MACHINE_CONFIG_START( tb303, tb303_state )
+static MACHINE_CONFIG_START( tb303 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D650, TP2_HZ)
@@ -286,4 +286,4 @@ ROM_START( tb303 )
ROM_END
-CONS( 1982, tb303, 0, 0, tb303, tb303, driver_device, 0, "Roland", "TB-303 Bass Line", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1982, tb303, 0, 0, tb303, tb303, tb303_state, 0, "Roland", "TB-303 Bass Line", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp
index f7ff8bbbb5c..5108bf8c9ff 100644
--- a/src/mame/drivers/tbowl.cpp
+++ b/src/mame/drivers/tbowl.cpp
@@ -437,7 +437,7 @@ void tbowl_state::machine_reset()
m_adpcm_data[0] = m_adpcm_data[1] = -1;
}
-static MACHINE_CONFIG_START( tbowl, tbowl_state )
+static MACHINE_CONFIG_START( tbowl )
/* CPU on Board '6206B' */
MCFG_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
@@ -496,12 +496,12 @@ static MACHINE_CONFIG_START( tbowl, tbowl_state )
/* something for the samples? */
MCFG_SOUND_ADD("msm1", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(tbowl_state, adpcm_int_1)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MCFG_SOUND_ADD("msm2", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(tbowl_state, adpcm_int_2)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -709,6 +709,6 @@ ROM_START( tbowlj )
ROM_LOAD( "6206a.2", 0x10000, 0x10000, CRC(1e9e5936) SHA1(60370d1de28b1c5ffeff7843702aaddb19ff1f58) )
ROM_END
-GAME( 1987, tbowl, 0, tbowl, tbowl, driver_device, 0, ROT0, "Tecmo", "Tecmo Bowl (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, tbowlp, tbowl, tbowl, tbowl, driver_device, 0, ROT0, "Tecmo", "Tecmo Bowl (World, prototype?)", MACHINE_SUPPORTS_SAVE ) // or early version, handwritten labels
-GAME( 1987, tbowlj, tbowl, tbowl, tbowlj, driver_device, 0, ROT0, "Tecmo", "Tecmo Bowl (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tbowl, 0, tbowl, tbowl, tbowl_state, 0, ROT0, "Tecmo", "Tecmo Bowl (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tbowlp, tbowl, tbowl, tbowl, tbowl_state, 0, ROT0, "Tecmo", "Tecmo Bowl (World, prototype?)", MACHINE_SUPPORTS_SAVE ) // or early version, handwritten labels
+GAME( 1987, tbowlj, tbowl, tbowl, tbowlj, tbowl_state, 0, ROT0, "Tecmo", "Tecmo Bowl (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp
index 085276498a8..946378cdabe 100644
--- a/src/mame/drivers/tceptor.cpp
+++ b/src/mame/drivers/tceptor.cpp
@@ -344,7 +344,7 @@ void tceptor_state::machine_reset()
/*******************************************************************/
-static MACHINE_CONFIG_START( tceptor, tceptor_state )
+static MACHINE_CONFIG_START( tceptor )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 49152000/32)
@@ -542,6 +542,6 @@ ROM_START( tceptor2 )
ROM_END
-/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME ) */
-GAME ( 1986, tceptor, 0, tceptor, tceptor, driver_device, 0, ROT0, "Namco", "Thunder Ceptor", 0)
-GAMEL( 1986, tceptor2, tceptor, tceptor, tceptor2, driver_device, 0, ROT0, "Namco", "Thunder Ceptor II", 0, layout_tceptor2)
+// ( YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS )
+GAME ( 1986, tceptor, 0, tceptor, tceptor, tceptor_state, 0, ROT0, "Namco", "Thunder Ceptor", 0)
+GAMEL( 1986, tceptor2, tceptor, tceptor, tceptor2, tceptor_state, 0, ROT0, "Namco", "Thunder Ceptor II", 0, layout_tceptor2)
diff --git a/src/mame/drivers/tcl.cpp b/src/mame/drivers/tcl.cpp
index 2f359f5d09d..e97a409d942 100644
--- a/src/mame/drivers/tcl.cpp
+++ b/src/mame/drivers/tcl.cpp
@@ -111,7 +111,7 @@ static GFXDECODE_START( tcl )
GFXDECODE_ENTRY( "gfx2", 0, charlayout2, 128, 4 )
GFXDECODE_END
-static MACHINE_CONFIG_START( tcl, tcl_state )
+static MACHINE_CONFIG_START( tcl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/4)
diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp
index 1e7d5c4f792..36be7f125da 100644
--- a/src/mame/drivers/tdv2324.cpp
+++ b/src/mame/drivers/tdv2324.cpp
@@ -257,7 +257,7 @@ SLOT_INTERFACE_END
// MACHINE_CONFIG( tdv2324 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( tdv2324, tdv2324_state )
+static MACHINE_CONFIG_START( tdv2324 )
// basic system hardware
MCFG_CPU_ADD(P8085AH_0_TAG, I8085A, 8700000/2) // ???
MCFG_CPU_PROGRAM_MAP(tdv2324_mem)
@@ -349,5 +349,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, tdv2324, 0, 0, tdv2324, tdv2324, driver_device, 0, "Tandberg", "TDV 2324", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, tdv2324, 0, 0, tdv2324, tdv2324, tdv2324_state, 0, "Tandberg", "TDV 2324", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp
index c305b936050..1425c2b85db 100644
--- a/src/mame/drivers/tec1.cpp
+++ b/src/mame/drivers/tec1.cpp
@@ -402,7 +402,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( tec1, tec1_state )
+static MACHINE_CONFIG_START( tec1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 1000000) /* speed can be varied between 250kHz and 2MHz */
MCFG_CPU_PROGRAM_MAP(tec1_map)
@@ -417,7 +417,7 @@ static MACHINE_CONFIG_START( tec1, tec1_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tecjmon, tec1_state )
+static MACHINE_CONFIG_START( tecjmon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz / 2)
MCFG_CPU_PROGRAM_MAP(tecjmon_map)
@@ -460,6 +460,6 @@ ROM_START(tecjmon)
ROM_LOAD("util.rom", 0x3800, 0x0800, CRC(7c19700d) SHA1(dc5b3ade66bb11c54430056966ed99cdd299d82b) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1984, tec1, 0, 0, tec1, tec1, driver_device, 0, "Talking Electronics magazine", "TEC-1" , 0 )
-COMP( 1984, tecjmon, tec1, 0, tecjmon, tec1, driver_device, 0, "Talking Electronics magazine", "TEC-1A with JMON" , 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, tec1, 0, 0, tec1, tec1, tec1_state, 0, "Talking Electronics magazine", "TEC-1", 0 )
+COMP( 1984, tecjmon, tec1, 0, tecjmon, tec1, tec1_state, 0, "Talking Electronics magazine", "TEC-1A with JMON", 0 )
diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp
index bff00d4321d..9bc7018fe1f 100644
--- a/src/mame/drivers/techno.cpp
+++ b/src/mame/drivers/techno.cpp
@@ -244,7 +244,7 @@ void techno_state::machine_reset()
m_digit = 0;
}
-static MACHINE_CONFIG_START( techno, techno_state )
+static MACHINE_CONFIG_START( techno )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(techno_map)
@@ -276,5 +276,5 @@ ROM_START(spcteam)
ROM_RELOAD(0, 0x8000)
ROM_END
-GAME(1987, xforce, 0, techno, techno, driver_device, 0, ROT0, "Tecnoplay", "X Force", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1988, spcteam, 0, techno, techno, driver_device, 0, ROT0, "Tecnoplay", "Space Team", MACHINE_IS_SKELETON_MECHANICAL) // needs correct layout
+GAME(1987, xforce, 0, techno, techno, techno_state, 0, ROT0, "Tecnoplay", "X Force", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1988, spcteam, 0, techno, techno, techno_state, 0, ROT0, "Tecnoplay", "Space Team", MACHINE_IS_SKELETON_MECHANICAL) // needs correct layout
diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp
index f06f31e2d96..6c34ab57213 100644
--- a/src/mame/drivers/tecmo.cpp
+++ b/src/mame/drivers/tecmo.cpp
@@ -632,7 +632,7 @@ void tecmo_state::machine_reset()
m_adpcm_data = -1;
}
-static MACHINE_CONFIG_START( rygar, tecmo_state )
+static MACHINE_CONFIG_START( rygar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* verified on pcb */
@@ -668,7 +668,7 @@ static MACHINE_CONFIG_START( rygar, tecmo_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */
MCFG_MSM5205_VCLK_CB(WRITELINE(tecmo_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
@@ -1173,12 +1173,12 @@ DRIVER_INIT_MEMBER(tecmo_state,backfirt)
-GAME( 1986, rygar, 0, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Rygar (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, rygar2, rygar, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Rygar (US set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, rygar3, rygar, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Rygar (US set 3 Old Version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, rygarj, rygar, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Argus no Senshi (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, gemini, 0, gemini, gemini, tecmo_state, gemini, ROT90, "Tecmo", "Gemini Wing (Japan)", MACHINE_SUPPORTS_SAVE ) /* Japan regional warning screen */
-GAME( 1987, geminib, gemini, geminib, gemini, tecmo_state, gemini, ROT90, "bootleg", "Gemini Wing (bootleg)", MACHINE_SUPPORTS_SAVE ) /* Japan regional warning screen */
-GAME( 1988, silkworm, 0, silkworm, silkworm, tecmo_state, silkworm, ROT0, "Tecmo", "Silk Worm (World)", MACHINE_SUPPORTS_SAVE ) /* No regional "Warning, if you are playing ..." screen */
-GAME( 1988, silkwormj, silkworm, silkworm, silkworm, tecmo_state, silkworm, ROT0, "Tecmo", "Silk Worm (Japan)", MACHINE_SUPPORTS_SAVE ) /* Japan regional warning screen */
-GAME( 1988, backfirt, 0, backfirt, backfirt, tecmo_state, backfirt, ROT0, "Tecmo", "Back Fire (Tecmo, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rygar, 0, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Rygar (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rygar2, rygar, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Rygar (US set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rygar3, rygar, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Rygar (US set 3 Old Version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, rygarj, rygar, rygar, rygar, tecmo_state, rygar, ROT0, "Tecmo", "Argus no Senshi (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, gemini, 0, gemini, gemini, tecmo_state, gemini, ROT90, "Tecmo", "Gemini Wing (Japan)", MACHINE_SUPPORTS_SAVE ) // Japan regional warning screen
+GAME( 1987, geminib, gemini, geminib, gemini, tecmo_state, gemini, ROT90, "bootleg", "Gemini Wing (bootleg)", MACHINE_SUPPORTS_SAVE ) // Japan regional warning screen
+GAME( 1988, silkworm, 0, silkworm, silkworm, tecmo_state, silkworm, ROT0, "Tecmo", "Silk Worm (World)", MACHINE_SUPPORTS_SAVE ) // No regional "Warning, if you are playing ..." screen
+GAME( 1988, silkwormj, silkworm, silkworm, silkworm, tecmo_state, silkworm, ROT0, "Tecmo", "Silk Worm (Japan)", MACHINE_SUPPORTS_SAVE ) // Japan regional warning screen
+GAME( 1988, backfirt, 0, backfirt, backfirt, tecmo_state, backfirt, ROT0, "Tecmo", "Back Fire (Tecmo, bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp
index 86b2cb1ba9c..3899058c3cc 100644
--- a/src/mame/drivers/tecmo16.cpp
+++ b/src/mame/drivers/tecmo16.cpp
@@ -369,7 +369,7 @@ GFXDECODE_END
#define MASTER_CLOCK XTAL_24MHz
#define OKI_CLOCK XTAL_8MHz
-static MACHINE_CONFIG_START( fstarfrc, tecmo16_state )
+static MACHINE_CONFIG_START( fstarfrc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,MASTER_CLOCK/2) /* 12MHz */
@@ -414,7 +414,7 @@ static MACHINE_CONFIG_START( fstarfrc, tecmo16_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK/8, OKIM6295_PIN7_HIGH) // sample rate 1 MHz / 132
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK/8, PIN7_HIGH) // sample rate 1 MHz / 132
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
MACHINE_CONFIG_END
@@ -636,7 +636,7 @@ ROM_END
/******************************************************************************/
-GAME( 1992, fstarfrc, 0, fstarfrc, fstarfrc, driver_device, 0, ROT90, "Tecmo", "Final Star Force (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fstarfrcj, fstarfrc, fstarfrc, fstarfrc, driver_device, 0, ROT90, "Tecmo", "Final Star Force (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, riot, 0, riot, riot, driver_device, 0, ROT0, "NMK", "Riot", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, ginkun, 0, ginkun, ginkun, driver_device, 0, ROT0, "Tecmo", "Ganbare Ginkun", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fstarfrc, 0, fstarfrc, fstarfrc, tecmo16_state, 0, ROT90, "Tecmo", "Final Star Force (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fstarfrcj, fstarfrc, fstarfrc, fstarfrc, tecmo16_state, 0, ROT90, "Tecmo", "Final Star Force (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, riot, 0, riot, riot, tecmo16_state, 0, ROT0, "NMK", "Riot", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, ginkun, 0, ginkun, ginkun, tecmo16_state, 0, ROT0, "Tecmo", "Ganbare Ginkun", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp
index 6c9e5a7c88d..4495702ce73 100644
--- a/src/mame/drivers/tecmosys.cpp
+++ b/src/mame/drivers/tecmosys.cpp
@@ -443,7 +443,7 @@ void tecmosys_state::machine_start()
save_item(NAME(m_device_value));
}
-static MACHINE_CONFIG_START( deroon, tecmosys_state )
+static MACHINE_CONFIG_START( deroon )
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tecmosys_state, irq1_line_hold)
@@ -486,7 +486,7 @@ static MACHINE_CONFIG_START( deroon, tecmosys_state )
MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
@@ -665,6 +665,6 @@ DRIVER_INIT_MEMBER(tecmosys_state,tkdensha)
prot_init(2);
}
-GAME( 1995, deroon, 0, deroon, deroon, tecmosys_state, deroon, ROT0, "Tecmo", "Deroon DeroDero", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, deroon, 0, deroon, deroon, tecmosys_state, deroon, ROT0, "Tecmo", "Deroon DeroDero", MACHINE_SUPPORTS_SAVE )
GAME( 1996, tkdensho, 0, deroon, deroon, tecmosys_state, tkdensho, ROT0, "Tecmo", "Toukidenshou - Angel Eyes (VER. 960614)", MACHINE_SUPPORTS_SAVE )
GAME( 1996, tkdenshoa, tkdensho, deroon, deroon, tecmosys_state, tkdensha, ROT0, "Tecmo", "Toukidenshou - Angel Eyes (VER. 960427)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp
index 0d566901141..9a4a2f10b05 100644
--- a/src/mame/drivers/tecnbras.cpp
+++ b/src/mame/drivers/tecnbras.cpp
@@ -99,7 +99,7 @@ void tecnbras_state::machine_reset()
{
}
-static MACHINE_CONFIG_START( tecnbras, tecnbras_state )
+static MACHINE_CONFIG_START( tecnbras )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, XTAL_12MHz) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
@@ -129,5 +129,5 @@ ROM_START( tecnbras )
ROM_LOAD( "tecnbras.u2", 0x0000, 0x8000, CRC(1a1e18fc) SHA1(8907e72f0356a2e2e1097dabac6d6b0b3d717f85) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 200?, tecnbras, 0, 0, tecnbras, 0, tecnbras_state, tecnbras, "Tecnbras", "Dot Matrix Display (70x7 pixels)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 200?, tecnbras, 0, 0, tecnbras, 0, tecnbras_state, tecnbras, "Tecnbras", "Dot Matrix Display (70x7 pixels)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp
index d6a168d509c..d2520dfa171 100644
--- a/src/mame/drivers/tehkanwc.cpp
+++ b/src/mame/drivers/tehkanwc.cpp
@@ -629,7 +629,7 @@ static GFXDECODE_START( tehkanwc )
GFXDECODE_END
-static MACHINE_CONFIG_START( tehkanwc, tehkanwc_state )
+static MACHINE_CONFIG_START( tehkanwc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/4) /* 18.432000 / 4 */
@@ -681,7 +681,7 @@ static MACHINE_CONFIG_START( tehkanwc, tehkanwc_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(tehkanwc_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -902,8 +902,8 @@ ROM_END
-GAME( 1985, tehkanwc, 0, tehkanwc, tehkanwc, driver_device, 0, ROT0, "Tehkan", "Tehkan World Cup (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tehkanwcb, tehkanwc, tehkanwc, tehkanwc, driver_device, 0, ROT0, "Tehkan", "Tehkan World Cup (set 2, bootleg?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tehkanwcc, tehkanwc, tehkanwc, tehkanwc, driver_device, 0, ROT0, "bootleg", "Tehkan World Cup (set 3, bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // aka 'World Cup 85', different inputs?
-GAMEL(1985, gridiron, 0, tehkanwc, gridiron, driver_device, 0, ROT0, "Tehkan", "Gridiron Fight", MACHINE_SUPPORTS_SAVE, layout_gridiron )
-GAME( 1986, teedoff, 0, tehkanwc, teedoff, tehkanwc_state, teedoff, ROT90, "Tecmo", "Tee'd Off (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tehkanwc, 0, tehkanwc, tehkanwc, tehkanwc_state, 0, ROT0, "Tehkan", "Tehkan World Cup (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tehkanwcb, tehkanwc, tehkanwc, tehkanwc, tehkanwc_state, 0, ROT0, "Tehkan", "Tehkan World Cup (set 2, bootleg?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tehkanwcc, tehkanwc, tehkanwc, tehkanwc, tehkanwc_state, 0, ROT0, "bootleg", "Tehkan World Cup (set 3, bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // aka 'World Cup 85', different inputs?
+GAMEL(1985, gridiron, 0, tehkanwc, gridiron, tehkanwc_state, 0, ROT0, "Tehkan", "Gridiron Fight", MACHINE_SUPPORTS_SAVE, layout_gridiron )
+GAME( 1986, teedoff, 0, tehkanwc, teedoff, tehkanwc_state, teedoff, ROT90, "Tecmo", "Tee'd Off (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp
index b15cb5f7d13..f0b7cd15401 100644
--- a/src/mame/drivers/tek405x.cpp
+++ b/src/mame/drivers/tek405x.cpp
@@ -997,7 +997,7 @@ void tek4052_state::machine_start()
// MACHINE_CONFIG( tek4051 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( tek4051, tek4051_state )
+static MACHINE_CONFIG_START( tek4051 )
// basic machine hardware
MCFG_CPU_ADD(MC6800_TAG, M6800, XTAL_12_5MHz/15)
MCFG_CPU_PROGRAM_MAP(tek4051_mem)
@@ -1104,7 +1104,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( tek4052 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( tek4052, tek4052_state )
+static MACHINE_CONFIG_START( tek4052 )
// basic machine hardware
MCFG_CPU_ADD(AM2901A_TAG, M6800, 1000000) // should be 4x AM2901A + AM2911
MCFG_CPU_PROGRAM_MAP(tek4052_mem)
@@ -1143,7 +1143,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( tek4054 )
//-------------------------------------------------
/*
-static MACHINE_CONFIG_START( tek4054, tek4052_state )
+static MACHINE_CONFIG_START( tek4054 )
MCFG_SCREEN_SIZE(4096, 3125)
MCFG_SCREEN_VISIBLE_AREA(0, 4096-1, 0, 3125-1)
MACHINE_CONFIG_END
@@ -1250,7 +1250,7 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1975, tek4051, 0, 0, tek4051, tek4051, driver_device, 0, "Tektronix", "Tektronix 4051", MACHINE_NOT_WORKING )
-COMP( 1978, tek4052a, tek4051, 0, tek4052, tek4051, driver_device, 0, "Tektronix", "Tektronix 4052A", MACHINE_NOT_WORKING )
-//COMP( 1979, tek4054, tek4051, 0, tek4054, tek4054, driver_device, 0, "Tektronix", "Tektronix 4054", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1975, tek4051, 0, 0, tek4051, tek4051, tek4051_state, 0, "Tektronix", "Tektronix 4051", MACHINE_NOT_WORKING )
+COMP( 1978, tek4052a, tek4051, 0, tek4052, tek4051, tek4052_state, 0, "Tektronix", "Tektronix 4052A", MACHINE_NOT_WORKING )
+//COMP( 1979, tek4054, tek4051, 0, tek4054, tek4054, tek4052_state, 0, "Tektronix", "Tektronix 4054", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp
index 4aa5f7239c8..ce7e68ae312 100644
--- a/src/mame/drivers/tek410x.cpp
+++ b/src/mame/drivers/tek410x.cpp
@@ -86,7 +86,7 @@ void tek4107a_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( tek4107a, tek4107a_state )
+static MACHINE_CONFIG_START( tek4107a )
/* basic machine hardware */
MCFG_CPU_ADD(I80188_TAG, I80188, 21000000)
MCFG_CPU_PROGRAM_MAP(tek4107a_mem)
@@ -145,6 +145,6 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, tek4107a, 0, 0, tek4107a, tek4107a, driver_device, 0, "Tektronix", "Tektronix 4107A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1983, tek4109a, tek4107a, 0, tek4109a, tek4107a, driver_device, 0, "Tektronix", "Tektronix 4109A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, tek4107a, 0, 0, tek4107a, tek4107a, tek4107a_state, 0, "Tektronix", "Tektronix 4107A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1983, tek4109a, tek4107a, 0, tek4109a, tek4107a, tek4107a_state, 0, "Tektronix", "Tektronix 4109A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp
index f1bb716e35e..7cbf75a87c0 100644
--- a/src/mame/drivers/tek440x.cpp
+++ b/src/mame/drivers/tek440x.cpp
@@ -180,7 +180,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tek4404, tek440x_state )
+static MACHINE_CONFIG_START( tek4404 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, 166666666)
@@ -236,5 +236,5 @@ ROM_END
* Game driver(s)
*
*************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS*/
-COMP( 1984, tek4404, 0, 0, tek4404, tek4404, driver_device, 0, "Tektronix", "4404", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT DEVICE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, tek4404, 0, 0, tek4404, tek4404, tek440x_state, 0, "Tektronix", "4404", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp
index facbf3e3fb7..1ee06d723c3 100644
--- a/src/mame/drivers/tekxp33x.cpp
+++ b/src/mame/drivers/tekxp33x.cpp
@@ -89,7 +89,7 @@ void tekxp330_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( tekxp330, tekxp330_state )
+static MACHINE_CONFIG_START( tekxp330 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R3052, XTAL_20MHz) /* IDT 79R3052E, clock unknown */
MCFG_R3000_ENDIANNESS(ENDIANNESS_BIG)
@@ -119,5 +119,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1992, tekxp330, 0, 0, tekxp330, tekxp330, driver_device, 0, "Tektronix", "TekXpress XP330", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1992, tekxp330, 0, 0, tekxp330, tekxp330, tekxp330_state, 0, "Tektronix", "TekXpress XP330", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index 23b38702f8d..2e976721b74 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -589,7 +589,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tempest, tempest_state )
+static MACHINE_CONFIG_START( tempest )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 8)
@@ -863,9 +863,9 @@ ROM_END
*
*************************************/
-GAME( 1980, tempest, 0, tempest, tempest, driver_device, 0, ROT270, "Atari", "Tempest (rev 3, Revised Hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tempest3, tempest, tempest, tempest, driver_device, 0, ROT270, "Atari", "Tempest (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tempest2, tempest, tempest, tempest, driver_device, 0, ROT270, "Atari", "Tempest (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tempest1, tempest, tempest, tempest, driver_device, 0, ROT270, "Atari", "Tempest (rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tempest1r, tempest, tempest, tempest, driver_device, 0, ROT270, "Atari", "Tempest (rev 1, Revised Hardware)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, temptube, tempest, tempest, tempest, driver_device, 0, ROT270, "hack (Duncan Brown)", "Tempest Tubes", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tempest, 0, tempest, tempest, tempest_state, 0, ROT270, "Atari", "Tempest (rev 3, Revised Hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tempest3, tempest, tempest, tempest, tempest_state, 0, ROT270, "Atari", "Tempest (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tempest2, tempest, tempest, tempest, tempest_state, 0, ROT270, "Atari", "Tempest (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tempest1, tempest, tempest, tempest, tempest_state, 0, ROT270, "Atari", "Tempest (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tempest1r, tempest, tempest, tempest, tempest_state, 0, ROT270, "Atari", "Tempest (rev 1, Revised Hardware)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980, temptube, tempest, tempest, tempest, tempest_state, 0, ROT270, "hack (Duncan Brown)", "Tempest Tubes", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp
index b97a4e95311..be2216212ef 100644
--- a/src/mame/drivers/terak.cpp
+++ b/src/mame/drivers/terak.cpp
@@ -90,7 +90,7 @@ uint32_t terak_state::screen_update_terak(screen_device &screen, bitmap_ind16 &b
}
-static MACHINE_CONFIG_START( terak, terak_state )
+static MACHINE_CONFIG_START( terak )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz)
MCFG_T11_INITIAL_MODE(6 << 13)
@@ -118,5 +118,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( ????, terak, 0, 0, terak, terak, driver_device, 0, "Terak", "Terak 8510A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( ????, terak, 0, 0, terak, terak, terak_state, 0, "Terak", "Terak 8510A", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp
index 154a4db7dd3..259c0e1f49a 100644
--- a/src/mame/drivers/terracre.cpp
+++ b/src/mame/drivers/terracre.cpp
@@ -517,7 +517,7 @@ static GFXDECODE_START( terracre )
GFXDECODE_END
-static MACHINE_CONFIG_START( ym3526, terracre_state )
+static MACHINE_CONFIG_START( ym3526 )
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz/2) // 8mhz
MCFG_CPU_PROGRAM_MAP(terracre_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", terracre_state, irq1_line_hold)
@@ -958,13 +958,13 @@ DRIVER_INIT_MEMBER(terracre_state,horekid)
m_mpProtData = mHoreKidProtData;
}
-/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
+/* YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
GAME( 1985, terracre, 0, ym3526, terracre, driver_device, 0, ROT270, "Nichibutsu", "Terra Cresta (YM3526 set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, terracreo,terracre, ym3526, terracre, driver_device, 0, ROT270, "Nichibutsu", "Terra Cresta (YM3526 set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, terracrea,terracre, ym3526, terracre, driver_device, 0, ROT270, "Nichibutsu", "Terra Cresta (YM3526 set 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, terracren,terracre, ym2203, terracre, driver_device, 0, ROT270, "Nichibutsu", "Terra Cresta (YM2203)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, amazon, 0, amazon, amazon, terracre_state, amazon, ROT270, "Nichibutsu", "Soldier Girl Amazon", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, amatelas, amazon, amazon, amazon, terracre_state, amatelas, ROT270, "Nichibutsu", "Sei Senshi Amatelass", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, horekid, 0, amazon, horekid, terracre_state, horekid, ROT270, "Nichibutsu", "Kid no Hore Hore Daisakusen", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, horekidb, horekid, amazon, horekid, terracre_state, horekid, ROT270, "bootleg", "Kid no Hore Hore Daisakusen (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, boobhack, horekid, amazon, horekid, terracre_state, horekid, ROT270, "bootleg", "Booby Kids (Italian manufactured graphic hack / bootleg of Kid no Hore Hore Daisakusen (bootleg))", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, amazon, 0, amazon, amazon, terracre_state, amazon, ROT270, "Nichibutsu", "Soldier Girl Amazon", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, amatelas, amazon, amazon, amazon, terracre_state, amatelas, ROT270, "Nichibutsu", "Sei Senshi Amatelass", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, horekid, 0, amazon, horekid, terracre_state, horekid, ROT270, "Nichibutsu", "Kid no Hore Hore Daisakusen", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, horekidb, horekid, amazon, horekid, terracre_state, horekid, ROT270, "bootleg", "Kid no Hore Hore Daisakusen (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, boobhack, horekid, amazon, horekid, terracre_state, horekid, ROT270, "bootleg", "Booby Kids (Italian manufactured graphic hack / bootleg of Kid no Hore Hore Daisakusen (bootleg))", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/test_t400.cpp b/src/mame/drivers/test_t400.cpp
index 4f1a755ae16..b483bb9d779 100644
--- a/src/mame/drivers/test_t400.cpp
+++ b/src/mame/drivers/test_t400.cpp
@@ -27,13 +27,13 @@ WRITE8_MEMBER( t400_test_suite_state::port_l_w )
// printf("L: %u\n", data);
}
-static MACHINE_CONFIG_START( test_t410, t400_test_suite_state )
+static MACHINE_CONFIG_START( test_t410 )
MCFG_CPU_ADD("maincpu", COP410, 1000000)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false )
MCFG_COP400_WRITE_L_CB(WRITE8(t400_test_suite_state, port_l_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( test_t420, t400_test_suite_state )
+static MACHINE_CONFIG_START( test_t420 )
MCFG_CPU_ADD("maincpu", COP420, 1000000)
MCFG_COP400_CONFIG( COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, true )
MCFG_COP400_WRITE_L_CB(WRITE8(t400_test_suite_state, port_l_w))
@@ -49,5 +49,5 @@ ROM_START( test420 )
ROM_LOAD( "rom_42x.bin", 0x000, 0x400, BAD_DUMP CRC(e4e80001) SHA1(8fdca9d08de1cc83387a7d141f6b254117902442) )
ROM_END
-COMP( 2008, test410, 0, 0, test_t410, 0, driver_device, 0, "T400 uController project", "T410 test suite", MACHINE_NO_SOUND_HW )
-COMP( 2008, test420, test410, 0, test_t420, 0, driver_device, 0, "T400 uController project", "T420 test suite", MACHINE_NO_SOUND_HW )
+COMP( 2008, test410, 0, 0, test_t410, 0, t400_test_suite_state, 0, "T400 uController project", "T410 test suite", MACHINE_NO_SOUND_HW )
+COMP( 2008, test420, test410, 0, test_t420, 0, t400_test_suite_state, 0, "T400 uController project", "T420 test suite", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp
index 29bcc9450ad..a9aede76b62 100644
--- a/src/mame/drivers/testconsole.cpp
+++ b/src/mame/drivers/testconsole.cpp
@@ -165,7 +165,7 @@ INPUT_PORTS_START(whousetc)
INPUT_PORTS_END
-MACHINE_CONFIG_START(whousetc, whouse_testcons_state)
+MACHINE_CONFIG_START(whousetc)
MCFG_CPU_ADD("maincpu", I8085A, XTAL_6_144MHz)
MCFG_CPU_PROGRAM_MAP(program_map)
MCFG_CPU_IO_MAP(io_map)
@@ -199,4 +199,4 @@ ROM_END
} // anonymous namespace
// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
-COMP( 1980?, whousetc, 0, 0, whousetc, whousetc, whouse_testcons_state, whousetc, "Westinghouse", "Test Console Serial #5", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980?, whousetc, 0, 0, whousetc, whousetc, whouse_testcons_state, whousetc, "Westinghouse", "Test Console Serial #5", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index 6be898f5609..2c7d5f3e112 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -1329,7 +1329,7 @@ DRIVER_INIT_MEMBER(stepstag_state,stepstag)
}
-static MACHINE_CONFIG_START( tetrisp2, tetrisp2_state )
+static MACHINE_CONFIG_START( tetrisp2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1364,7 +1364,7 @@ static MACHINE_CONFIG_START( tetrisp2, tetrisp2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nndmseal, tetrisp2_state )
+static MACHINE_CONFIG_START( nndmseal )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
@@ -1392,12 +1392,12 @@ static MACHINE_CONFIG_START( nndmseal, tetrisp2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_2MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_2MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rockn, tetrisp2_state )
+static MACHINE_CONFIG_START( rockn )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1431,7 +1431,7 @@ static MACHINE_CONFIG_START( rockn, tetrisp2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rockn2, tetrisp2_state )
+static MACHINE_CONFIG_START( rockn2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1465,7 +1465,7 @@ static MACHINE_CONFIG_START( rockn2, tetrisp2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rocknms, tetrisp2_state )
+static MACHINE_CONFIG_START( rocknms )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -1515,7 +1515,7 @@ static MACHINE_CONFIG_START( rocknms, tetrisp2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( stepstag, stepstag_state )
+static MACHINE_CONFIG_START( stepstag )
MCFG_CPU_ADD("maincpu", M68000, 16000000 ) //??
MCFG_CPU_PROGRAM_MAP(stepstag_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tetrisp2_state, irq2_line_hold) // lev 4 triggered by system timer
@@ -2291,19 +2291,19 @@ ROM_END
***************************************************************************/
-GAME( 1997, tetrisp2, 0, tetrisp2, tetrisp2, driver_device, 0, ROT0, "Jaleco / The Tetris Company", "Tetris Plus 2 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, tetrisp2j, tetrisp2, tetrisp2, tetrisp2j, driver_device,0, ROT0, "Jaleco / The Tetris Company", "Tetris Plus 2 (Japan, V2.2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, tetrisp2ja,tetrisp2, tetrisp2, tetrisp2j, driver_device,0, ROT0, "Jaleco / The Tetris Company", "Tetris Plus 2 (Japan, V2.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, tetrisp2, 0, tetrisp2, tetrisp2, tetrisp2_state, 0, ROT0, "Jaleco / The Tetris Company", "Tetris Plus 2 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, tetrisp2j, tetrisp2, tetrisp2, tetrisp2j, tetrisp2_state, 0, ROT0, "Jaleco / The Tetris Company", "Tetris Plus 2 (Japan, V2.2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1997, tetrisp2ja,tetrisp2, tetrisp2, tetrisp2j, tetrisp2_state, 0, ROT0, "Jaleco / The Tetris Company", "Tetris Plus 2 (Japan, V2.1)", MACHINE_SUPPORTS_SAVE )
GAME( 1997, nndmseal, 0, nndmseal, nndmseal, tetrisp2_state, rockn, ROT0 | ORIENTATION_FLIP_X, "I'Max / Jaleco", "Nandemo Seal Iinkai", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
GAME( 1997, nndmseala,nndmseal, nndmseal, nndmseal, tetrisp2_state, rockn, ROT0 | ORIENTATION_FLIP_X, "I'Max / Jaleco", "Nandemo Seal Iinkai (Astro Boy ver.)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1999, rockn, 0, rockn, rockn, tetrisp2_state, rockn, ROT270, "Jaleco", "Rock'n Tread (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, rockna, rockn, rockn, rockn, tetrisp2_state, rockn1, ROT270, "Jaleco", "Rock'n Tread (Japan, alternate)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, rockn2, 0, rockn2, rockn, tetrisp2_state, rockn2, ROT270, "Jaleco", "Rock'n Tread 2 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, rockn, 0, rockn, rockn, tetrisp2_state, rockn, ROT270, "Jaleco", "Rock'n Tread (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, rockna, rockn, rockn, rockn, tetrisp2_state, rockn1, ROT270, "Jaleco", "Rock'n Tread (Japan, alternate)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, rockn2, 0, rockn2, rockn, tetrisp2_state, rockn2, ROT270, "Jaleco", "Rock'n Tread 2 (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1999, rocknms, 0, rocknms, rocknms, tetrisp2_state, rocknms, ROT0, "Jaleco", "Rock'n MegaSession (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, rockn3, 0, rockn2, rockn, tetrisp2_state, rockn3, ROT270, "Jaleco", "Rock'n 3 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, rockn4, 0, rockn2, rockn, tetrisp2_state, rockn3, ROT270, "Jaleco / PCCWJ", "Rock'n 4 (Japan, prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, rockn3, 0, rockn2, rockn, tetrisp2_state, rockn3, ROT270, "Jaleco", "Rock'n 3 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, rockn4, 0, rockn2, rockn, tetrisp2_state, rockn3, ROT270, "Jaleco / PCCWJ", "Rock'n 4 (Japan, prototype)", MACHINE_SUPPORTS_SAVE )
// Undumped:
// - Stepping Stage <- the original Game
diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp
index fcc5d569b8c..d019ab9418f 100644
--- a/src/mame/drivers/tgtpanic.cpp
+++ b/src/mame/drivers/tgtpanic.cpp
@@ -146,7 +146,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tgtpanic, tgtpanic_state )
+static MACHINE_CONFIG_START( tgtpanic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
@@ -182,4 +182,4 @@ ROM_END
*
*************************************/
-GAME( 1996, tgtpanic, 0, tgtpanic, tgtpanic, driver_device, 0, ROT0, "Konami", "Target Panic", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, tgtpanic, 0, tgtpanic, tgtpanic, tgtpanic_state, 0, ROT0, "Konami", "Target Panic", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp
index 1ce7ade58b6..01e92543351 100644
--- a/src/mame/drivers/thayers.cpp
+++ b/src/mame/drivers/thayers.cpp
@@ -786,7 +786,7 @@ void thayers_state::machine_reset()
/* Machine Driver */
-static MACHINE_CONFIG_START( thayers, thayers_state )
+static MACHINE_CONFIG_START( thayers )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
@@ -847,6 +847,6 @@ ROM_END
/* Game Drivers */
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1984, thayers, 0, thayers, thayers, driver_device, 0, ROT0, "RDI Video Systems", "Thayer's Quest (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_thayers)
-GAMEL( 1984, thayersa, thayers, thayers, thayers, driver_device, 0, ROT0, "RDI Video Systems", "Thayer's Quest (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_thayers)
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1984, thayers, 0, thayers, thayers, thayers_state, 0, ROT0, "RDI Video Systems", "Thayer's Quest (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_thayers)
+GAMEL( 1984, thayersa, thayers, thayers, thayers, thayers_state, 0, ROT0, "RDI Video Systems", "Thayer's Quest (set 2)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_thayers)
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index ae24182814b..3010b8bf23b 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -523,7 +523,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(thedealr_state::thedealr_interrupt)
m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( thedealr, thedealr_state )
+static MACHINE_CONFIG_START( thedealr )
// basic machine hardware
MCFG_CPU_ADD("maincpu", R65C02, XTAL_16MHz/8) // 2 MHz?
@@ -592,4 +592,4 @@ ROM_START( thedealr )
ROM_LOAD( "xb0-u68.u68", 0x200, 0x200, CRC(c0c54d43) SHA1(5ce352fb888c8e683014c73e6da00ec95f2ae572) )
ROM_END
-GAME( 1988?, thedealr, 0, thedealr, thedealr, driver_device, 0, ROT0, "Visco Games", "The Dealer (Visco)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988?, thedealr, 0, thedealr, thedealr, thedealr_state, 0, ROT0, "Visco Games", "The Dealer (Visco)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp
index 512d4c902b8..544f70eccfb 100644
--- a/src/mame/drivers/thedeep.cpp
+++ b/src/mame/drivers/thedeep.cpp
@@ -411,7 +411,7 @@ INTERRUPT_GEN_MEMBER(thedeep_state::mcu_irq)
m_mcu->set_input_line(MCS51_INT1_LINE, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( thedeep, thedeep_state )
+static MACHINE_CONFIG_START( thedeep )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/2) /* verified on pcb */
@@ -548,5 +548,5 @@ ROM_START( rundeep )
ROM_LOAD( "fi-3", 0x400, 0x200, CRC(f61a9686) SHA1(24082f60b72268d240ceca6999bdf18872625cd2) )
ROM_END
-GAME( 1987, thedeep, 0, thedeep, thedeep, driver_device, 0, ROT270, "Wood Place Inc.", "The Deep (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, rundeep, thedeep,thedeep, thedeep, driver_device, 0, ROT270, "bootleg (Cream)", "Run Deep", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, thedeep, 0, thedeep, thedeep, thedeep_state, 0, ROT270, "Wood Place Inc.", "The Deep (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, rundeep, thedeep, thedeep, thedeep, thedeep_state, 0, ROT270, "bootleg (Cream)", "Run Deep", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp
index bd8fe558636..85c6f9cc543 100644
--- a/src/mame/drivers/thepit.cpp
+++ b/src/mame/drivers/thepit.cpp
@@ -709,7 +709,7 @@ INTERRUPT_GEN_MEMBER(thepit_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( thepit, thepit_state )
+static MACHINE_CONFIG_START( thepit )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, PIXEL_CLOCK/2) /* 3.072 MHz */
@@ -1268,32 +1268,32 @@ DRIVER_INIT_MEMBER(thepit_state,rtriv)
}
-GAME( 1981, roundup, 0, thepit, roundup, driver_device, 0, ROT90, "Taito Corporation (Amenip/Centuri license)", "Round-Up", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, fitter, roundup, thepit, fitter, driver_device, 0, ROT90, "Taito Corporation", "Fitter", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, fitterbl, roundup, thepit, fitter, driver_device, 0, ROT90, "bootleg", "Fitter (bootleg of Round-Up)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ttfitter, roundup, thepit, fitter, driver_device, 0, ROT90, "Taito Corporation", "T.T. Fitter (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, roundup, 0, thepit, roundup, thepit_state, 0, ROT90, "Taito Corporation (Amenip/Centuri license)", "Round-Up", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, fitter, roundup, thepit, fitter, thepit_state, 0, ROT90, "Taito Corporation", "Fitter", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, fitterbl, roundup, thepit, fitter, thepit_state, 0, ROT90, "bootleg", "Fitter (bootleg of Round-Up)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ttfitter, roundup, thepit, fitter, thepit_state, 0, ROT90, "Taito Corporation", "T.T. Fitter (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, thepit, 0, thepit, thepit, driver_device, 0, ROT90, "Zilec Electronics", "The Pit", MACHINE_SUPPORTS_SAVE ) // AW == Andy Walker
-GAME( 1982, thepitu1, thepit, thepit, thepit, driver_device, 0, ROT90, "Zilec Electronics (Centuri license)", "The Pit (US set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, thepitu2, thepit, thepit, thepit, driver_device, 0, ROT90, "Zilec Electronics (Centuri license)", "The Pit (US set 2)", MACHINE_SUPPORTS_SAVE ) // Bally PCB
-GAME( 1982, thepitj, thepit, thepit, thepit, driver_device, 0, ROT90, "Zilec Electronics (Taito license)", "The Pit (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, thepit, 0, thepit, thepit, thepit_state, 0, ROT90, "Zilec Electronics", "The Pit", MACHINE_SUPPORTS_SAVE ) // AW == Andy Walker
+GAME( 1982, thepitu1, thepit, thepit, thepit, thepit_state, 0, ROT90, "Zilec Electronics (Centuri license)", "The Pit (US set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, thepitu2, thepit, thepit, thepit, thepit_state, 0, ROT90, "Zilec Electronics (Centuri license)", "The Pit (US set 2)", MACHINE_SUPPORTS_SAVE ) // Bally PCB
+GAME( 1982, thepitj, thepit, thepit, thepit, thepit_state, 0, ROT90, "Zilec Electronics (Taito license)", "The Pit (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, dockman, 0, intrepid, dockman, driver_device, 0, ROT90, "Taito Corporation", "Dock Man", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, portman, dockman, intrepid, dockman, driver_device, 0, ROT90, "Taito Corporation (Nova Games Ltd. license)", "Port Man", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, dockman, 0, intrepid, dockman, thepit_state, 0, ROT90, "Taito Corporation", "Dock Man", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, portman, dockman, intrepid, dockman, thepit_state, 0, ROT90, "Taito Corporation (Nova Games Ltd. license)", "Port Man", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, suprmous, 0, suprmous, suprmous, driver_device, 0, ROT90, "Taito Corporation", "Super Mouse", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, funnymou, suprmous, suprmous, suprmous, driver_device, 0, ROT90, "Taito Corporation (Chuo Co. Ltd license)", "Funny Mouse (Japan)", MACHINE_SUPPORTS_SAVE ) // Taito PCB
+GAME( 1982, suprmous, 0, suprmous, suprmous, thepit_state, 0, ROT90, "Taito Corporation", "Super Mouse", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, funnymou, suprmous, suprmous, suprmous, thepit_state, 0, ROT90, "Taito Corporation (Chuo Co. Ltd license)", "Funny Mouse (Japan)", MACHINE_SUPPORTS_SAVE ) // Taito PCB
-GAME( 1982, machomou, 0, suprmous, suprmous, driver_device, 0, ROT90, "Techstar", "Macho Mouse", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, machomou, 0, suprmous, suprmous, thepit_state, 0, ROT90, "Techstar", "Macho Mouse", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, desertdn, 0, desertdn, desertdn, driver_device, 0, ROT0, "Video Optics", "Desert Dan", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, desertdn, 0, desertdn, desertdn, thepit_state, 0, ROT0, "Video Optics", "Desert Dan", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, intrepid, 0, intrepid, intrepid, driver_device, 0, ROT90, "Nova Games Ltd.", "Intrepid (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, intrepid2,intrepid, intrepid, intrepid, driver_device, 0, ROT90, "Nova Games Ltd.", "Intrepid (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, intrepidb,intrepid, intrepid, intrepid, driver_device, 0, ROT90, "bootleg (Elsys)", "Intrepid (Elsys bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, intrepidb3,intrepid,intrepid, intrepid, driver_device, 0, ROT90, "bootleg (Elsys)", "Intrepid (Elsys bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, intrepidb2,intrepid,intrepid, intrepid, driver_device, 0, ROT90, "bootleg (Loris)", "Intrepid (Loris bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, intrepid, 0, intrepid, intrepid, thepit_state, 0, ROT90, "Nova Games Ltd.", "Intrepid (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, intrepid2, intrepid, intrepid, intrepid, thepit_state, 0, ROT90, "Nova Games Ltd.", "Intrepid (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, intrepidb, intrepid, intrepid, intrepid, thepit_state, 0, ROT90, "bootleg (Elsys)", "Intrepid (Elsys bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, intrepidb3, intrepid, intrepid, intrepid, thepit_state, 0, ROT90, "bootleg (Elsys)", "Intrepid (Elsys bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, intrepidb2, intrepid, intrepid, intrepid, thepit_state, 0, ROT90, "bootleg (Loris)", "Intrepid (Loris bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, zaryavos, 0, intrepid, intrepid, driver_device, 0, ROT90, "Nova Games of Canada", "Zarya Vostoka", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, zaryavos, 0, intrepid, intrepid, thepit_state, 0, ROT90, "Nova Games of Canada", "Zarya Vostoka", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 198?, rtriv, 0, intrepid, rtriv, thepit_state, rtriv, ROT90, "Romar", "Romar Triv", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 198?, rtriv, 0, intrepid, rtriv, thepit_state, rtriv, ROT90, "Romar", "Romar Triv", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp
index 7e00ffa668c..633257fe6f1 100644
--- a/src/mame/drivers/thief.cpp
+++ b/src/mame/drivers/thief.cpp
@@ -387,7 +387,7 @@ static const char *const natodef_sample_names[] =
};
-static MACHINE_CONFIG_START( thief, thief_state )
+static MACHINE_CONFIG_START( thief )
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(thief_main_map)
MCFG_CPU_IO_MAP(io_map)
@@ -549,7 +549,7 @@ DRIVER_INIT_MEMBER(thief_state,thief)
}
-GAME( 1980, sharkatt, 0, sharkatt, sharkatt, driver_device, 0, ROT0, "Pacific Novelty", "Shark Attack", 0 )
-GAME( 1981, thief, 0, thief, thief, thief_state, thief, ROT0, "Pacific Novelty", "Thief", 0 )
-GAME( 1982, natodef, 0, natodef, natodef, thief_state, thief, ROT0, "Pacific Novelty", "NATO Defense" , 0 )
-GAME( 1982, natodefa, natodef, natodef, natodef, thief_state, thief, ROT0, "Pacific Novelty", "NATO Defense (alternate mazes)" , 0 )
+GAME( 1980, sharkatt, 0, sharkatt, sharkatt, thief_state, 0, ROT0, "Pacific Novelty", "Shark Attack", 0 )
+GAME( 1981, thief, 0, thief, thief, thief_state, thief, ROT0, "Pacific Novelty", "Thief", 0 )
+GAME( 1982, natodef, 0, natodef, natodef, thief_state, thief, ROT0, "Pacific Novelty", "NATO Defense" , 0 )
+GAME( 1982, natodefa, natodef, natodef, natodef, thief_state, thief, ROT0, "Pacific Novelty", "NATO Defense (alternate mazes)" , 0 )
diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp
index ca513e95a57..7864b3a1d8c 100644
--- a/src/mame/drivers/thomson.cpp
+++ b/src/mame/drivers/thomson.cpp
@@ -617,7 +617,7 @@ SLOT_INTERFACE_END
/* ------------ driver ------------ */
-static MACHINE_CONFIG_START( to7, thomson_state )
+static MACHINE_CONFIG_START( to7 )
MCFG_MACHINE_START_OVERRIDE( thomson_state, to7 )
MCFG_MACHINE_RESET_OVERRIDE( thomson_state, to7 )
@@ -759,9 +759,9 @@ static MACHINE_CONFIG_DERIVED( t9000, to7 )
MACHINE_CONFIG_END
-COMP ( 1982, to7, 0, 0, to7, to7, driver_device, 0, "Thomson", "TO7", 0 )
+COMP ( 1982, to7, 0, 0, to7, to7, thomson_state, 0, "Thomson", "TO7", 0 )
-COMP ( 1980, t9000, to7, 0, t9000, t9000, driver_device, 0, "Thomson", "T9000", 0 )
+COMP ( 1980, t9000, to7, 0, t9000, t9000, thomson_state, 0, "Thomson", "T9000", 0 )
/***************************** TO7/70 *********************************
@@ -948,9 +948,9 @@ static MACHINE_CONFIG_DERIVED( to770a, to770 )
MCFG_SOFTWARE_LIST_ADD("t770a_cart_list","to770a_cart")
MACHINE_CONFIG_END
-COMP ( 1984, to770, 0, 0, to770, to770, driver_device, 0, "Thomson", "TO7/70", 0 )
+COMP ( 1984, to770, 0, 0, to770, to770, thomson_state, 0, "Thomson", "TO7/70", 0 )
-COMP ( 1984, to770a, to770, 0, to770a, to770a, driver_device, 0, "Thomson", "TO7/70 (Arabic)", 0 )
+COMP ( 1984, to770a, to770, 0, to770a, to770a, thomson_state, 0, "Thomson", "TO7/70 (Arabic)", 0 )
/************************* MO5 / MO5E *********************************
@@ -1156,9 +1156,9 @@ static MACHINE_CONFIG_DERIVED( mo5e, mo5 )
MACHINE_CONFIG_END
-COMP ( 1984, mo5, 0, 0, mo5, mo5, driver_device, 0, "Thomson", "MO5", 0 )
+COMP ( 1984, mo5, 0, 0, mo5, mo5, thomson_state, 0, "Thomson", "MO5", 0 )
-COMP ( 1986, mo5e, mo5, 0, mo5e, mo5e, driver_device, 0, "Thomson", "MO5E", 0 )
+COMP ( 1986, mo5e, mo5, 0, mo5e, mo5e, thomson_state, 0, "Thomson", "MO5E", 0 )
/********************************* TO9 *******************************
@@ -1495,7 +1495,7 @@ static MACHINE_CONFIG_DERIVED( to9, to7 )
MACHINE_CONFIG_END
-COMP ( 1985, to9, 0, 0, to9, to9, driver_device, 0, "Thomson", "TO9", MACHINE_IMPERFECT_COLORS )
+COMP ( 1985, to9, 0, 0, to9, to9, thomson_state, 0, "Thomson", "TO9", MACHINE_IMPERFECT_COLORS )
/******************************** TO8 ********************************
@@ -1730,9 +1730,9 @@ static MACHINE_CONFIG_DERIVED( to8d, to8 )
MACHINE_CONFIG_END
-COMP ( 1986, to8, 0, 0, to8, to8, driver_device, 0, "Thomson", "TO8", 0 )
+COMP ( 1986, to8, 0, 0, to8, to8, thomson_state, 0, "Thomson", "TO8", 0 )
-COMP ( 1987, to8d, to8, 0, to8d, to8d, driver_device, 0, "Thomson", "TO8D", 0 )
+COMP ( 1987, to8d, to8, 0, to8d, to8d, thomson_state, 0, "Thomson", "TO8D", 0 )
/******************************** TO9+ *******************************
@@ -1889,7 +1889,7 @@ static MACHINE_CONFIG_DERIVED( to9p, to7 )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("to7_qd_list", "to7_qd")
MACHINE_CONFIG_END
-COMP ( 1986, to9p, 0, 0, to9p, to9p, driver_device, 0, "Thomson", "TO9+", 0 )
+COMP ( 1986, to9p, 0, 0, to9p, to9p, thomson_state, 0, "Thomson", "TO9+", 0 )
@@ -2269,9 +2269,9 @@ static MACHINE_CONFIG_DERIVED( pro128, mo6 )
MCFG_SOFTWARE_LIST_ADD("p128_flop_list","pro128_flop")
MACHINE_CONFIG_END
-COMP ( 1986, mo6, 0, 0, mo6, mo6, driver_device, 0, "Thomson", "MO6", 0 )
+COMP ( 1986, mo6, 0, 0, mo6, mo6, thomson_state, 0, "Thomson", "MO6", 0 )
-COMP ( 1986, pro128, mo6, 0, pro128, pro128, driver_device, 0, "Olivetti / Thomson", "Prodest PC 128", 0 )
+COMP ( 1986, pro128, mo6, 0, pro128, pro128, thomson_state, 0, "Olivetti / Thomson", "Prodest PC 128", 0 )
@@ -2525,4 +2525,4 @@ static MACHINE_CONFIG_DERIVED( mo5nr, to7 )
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("mo5_qd_list","mo5_qd")
MACHINE_CONFIG_END
-COMP ( 1986, mo5nr, 0, 0, mo5nr, mo5nr, driver_device, 0, "Thomson", "MO5 NR", 0 )
+COMP ( 1986, mo5nr, 0, 0, mo5nr, mo5nr, thomson_state, 0, "Thomson", "MO5 NR", 0 )
diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp
index a231bc3ce3e..2bafc649745 100644
--- a/src/mame/drivers/thoop2.cpp
+++ b/src/mame/drivers/thoop2.cpp
@@ -202,7 +202,7 @@ static GFXDECODE_START( thoop2 )
GFXDECODE_END
-static MACHINE_CONFIG_START( thoop2, thoop2_state )
+static MACHINE_CONFIG_START( thoop2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz */
@@ -227,7 +227,7 @@ static MACHINE_CONFIG_START( thoop2, thoop2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -250,4 +250,4 @@ ROM_START( thoop2 )
/* 0x00000-0x2ffff is fixed, 0x30000-0x3ffff is bank switched */
ROM_END
-GAME( 1994, thoop2, 0, thoop2, thoop2, driver_device, 0, ROT0, "Gaelco", "TH Strikes Back", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, thoop2, 0, thoop2, thoop2, thoop2_state, 0, ROT0, "Gaelco", "TH Strikes Back", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp
index da56a785aa1..6e65c10fa94 100644
--- a/src/mame/drivers/thunderj.cpp
+++ b/src/mame/drivers/thunderj.cpp
@@ -247,7 +247,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( thunderj, thunderj_state )
+static MACHINE_CONFIG_START( thunderj )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp
index f7f4549e148..a24fafb78b0 100644
--- a/src/mame/drivers/thunderx.cpp
+++ b/src/mame/drivers/thunderx.cpp
@@ -630,7 +630,7 @@ void thunderx_state::machine_reset()
m_priority = 0;
}
-static MACHINE_CONFIG_START( scontra, thunderx_state )
+static MACHINE_CONFIG_START( scontra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/2/4) /* 052001 (verified on pcb) */
@@ -1041,12 +1041,12 @@ DRIVER_INIT_MEMBER(thunderx_state, thunderx)
/***************************************************************************/
-GAME( 1988, scontra, 0, scontra, scontra, driver_device, 0, ROT90, "Konami", "Super Contra", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, scontraj, scontra, scontra, scontra, driver_device, 0, ROT90, "Konami", "Super Contra (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, scontra, 0, scontra, scontra, thunderx_state, 0, ROT90, "Konami", "Super Contra", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, scontraj, scontra, scontra, scontra, thunderx_state, 0, ROT90, "Konami", "Super Contra (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, thunderx, 0, thunderx, thunderx, thunderx_state, thunderx, ROT0, "Konami", "Thunder Cross (set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, thunderxa, thunderx, thunderx, thunderx, thunderx_state, thunderx, ROT0, "Konami", "Thunder Cross (set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, thunderxb, thunderx, thunderx, thunderx, thunderx_state, thunderx, ROT0, "Konami", "Thunder Cross (set 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1988, thunderxj, thunderx, thunderx, thnderxj, thunderx_state, thunderx, ROT0, "Konami", "Thunder Cross (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gbusters, 0, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Gang Busters (set 1)", MACHINE_SUPPORTS_SAVE ) /* N02 & J03 program roms */
-GAME( 1988, gbustersa, gbusters, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Gang Busters (set 2)", MACHINE_SUPPORTS_SAVE ) /* unknown region program roms */
-GAME( 1988, crazycop, gbusters, gbusters, gbusters, driver_device, 0, ROT90, "Konami", "Crazy Cop (Japan)", MACHINE_SUPPORTS_SAVE ) /* M02 & J03 program roms */
+GAME( 1988, gbusters, 0, gbusters, gbusters, thunderx_state, 0, ROT90, "Konami", "Gang Busters (set 1)", MACHINE_SUPPORTS_SAVE ) // N02 & J03 program ROMs
+GAME( 1988, gbustersa, gbusters, gbusters, gbusters, thunderx_state, 0, ROT90, "Konami", "Gang Busters (set 2)", MACHINE_SUPPORTS_SAVE ) // unknown region program ROMs
+GAME( 1988, crazycop, gbusters, gbusters, gbusters, thunderx_state, 0, ROT90, "Konami", "Crazy Cop (Japan)", MACHINE_SUPPORTS_SAVE ) // M02 & J03 program ROMs
diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp
index 5ebfadb696f..38b62ce822f 100644
--- a/src/mame/drivers/ti630.cpp
+++ b/src/mame/drivers/ti630.cpp
@@ -181,7 +181,7 @@ static GFXDECODE_START( ti630 )
GFXDECODE_ENTRY( "hd44780:cgrom", 0x0000, ti630_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( ti630, ti630_state )
+static MACHINE_CONFIG_START( ti630 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80C31, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(i80c31_prg)
@@ -210,5 +210,5 @@ ROM_START( ti630 )
ROM_LOAD( "ti630.ci11", 0x00000, 0x10000, CRC(2602cbdc) SHA1(98266bea52a5893e0af0b5872eca0a0a1e0c5f9c) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1999, ti630, 0, 0, ti630, 0, ti630_state, ti630, "Intelbras", "TI630 telephone", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1999, ti630, 0, 0, ti630, 0, ti630_state, ti630, "Intelbras", "TI630 telephone", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp
index 1c0f4ae2f41..7ed036376d9 100644
--- a/src/mame/drivers/ti74.cpp
+++ b/src/mame/drivers/ti74.cpp
@@ -509,7 +509,7 @@ void ti74_state::machine_start()
save_item(NAME(m_power));
}
-static MACHINE_CONFIG_START( ti74, ti74_state )
+static MACHINE_CONFIG_START( ti74 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS70C46, XTAL_4MHz)
@@ -543,7 +543,7 @@ static MACHINE_CONFIG_START( ti74, ti74_state )
MCFG_SOFTWARE_LIST_ADD("cart_list", "ti74_cart")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ti95, ti74_state )
+static MACHINE_CONFIG_START( ti95 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS70C46, XTAL_4MHz)
@@ -603,5 +603,5 @@ ROM_START( ti95 )
ROM_END
-COMP( 1985, ti74, 0, 0, ti74, ti74, driver_device, 0, "Texas Instruments", "TI-74 BASICALC", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1986, ti95, 0, 0, ti95, ti95, driver_device, 0, "Texas Instruments", "TI-95 PROCALC", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1985, ti74, 0, 0, ti74, ti74, ti74_state, 0, "Texas Instruments", "TI-74 BASICALC", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1986, ti95, 0, 0, ti95, ti95, ti74_state, 0, "Texas Instruments", "TI-95 PROCALC", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp
index 1cadc0ca12c..840c65baab6 100644
--- a/src/mame/drivers/ti85.cpp
+++ b/src/mame/drivers/ti85.cpp
@@ -564,7 +564,7 @@ static INPUT_PORTS_START (ti83)
INPUT_PORTS_END
/* machine definition */
-static MACHINE_CONFIG_START( ti81, ti85_state )
+static MACHINE_CONFIG_START( ti81 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 2000000) /* 2 MHz */
MCFG_CPU_PROGRAM_MAP(ti81_mem)
@@ -906,15 +906,15 @@ ROM_START (ti84p)
ROMX_LOAD( "ti84pb100v255mp.bin", 0x00000, 0x100000, CRC(4af31251) SHA1(8f67269346644b87e7cd0f353f5f4030e787cf57), ROM_BIOS(1) )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1990, ti81, 0, 0, ti81, ti81, driver_device, 0, "Texas Instruments", "TI-81", MACHINE_NO_SOUND_HW )
-COMP( 1992, ti85, 0, 0, ti85d, ti85, driver_device, 0, "Texas Instruments", "TI-85", MACHINE_NO_SOUND_HW )
-COMP( 1993, ti82, 0, 0, ti82, ti82, driver_device, 0, "Texas Instruments", "TI-82", MACHINE_NO_SOUND_HW )
-COMP( 1994, ti81v2, ti81, 0, ti81v2, ti81, driver_device, 0, "Texas Instruments", "TI-81 v2.0", MACHINE_NO_SOUND_HW )
-COMP( 1996, ti83, 0, 0, ti83, ti83, driver_device, 0, "Texas Instruments", "TI-83", MACHINE_NO_SOUND_HW )
-COMP( 1997, ti86, 0, 0, ti86, ti85, driver_device, 0, "Texas Instruments", "TI-86", MACHINE_NO_SOUND_HW )
-COMP( 1998, ti73, 0, 0, ti73, ti82, driver_device, 0, "Texas Instruments", "TI-73", MACHINE_NO_SOUND_HW )
-COMP( 1999, ti83p, 0, 0, ti83p, ti82, driver_device, 0, "Texas Instruments", "TI-83 Plus", MACHINE_NO_SOUND_HW )
-COMP( 2001, ti83pse, 0, 0, ti83pse, ti82, driver_device, 0, "Texas Instruments", "TI-83 Plus Silver Edition", MACHINE_NO_SOUND_HW )
-COMP( 2004, ti84p, 0, 0, ti84p, ti82, driver_device, 0, "Texas Instruments", "TI-84 Plus", MACHINE_NO_SOUND_HW )
-COMP( 2004, ti84pse, 0, 0, ti84pse, ti82, driver_device, 0, "Texas Instruments", "TI-84 Plus Silver Edition", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1990, ti81, 0, 0, ti81, ti81, ti85_state, 0, "Texas Instruments", "TI-81", MACHINE_NO_SOUND_HW )
+COMP( 1992, ti85, 0, 0, ti85d, ti85, ti85_state, 0, "Texas Instruments", "TI-85", MACHINE_NO_SOUND_HW )
+COMP( 1993, ti82, 0, 0, ti82, ti82, ti85_state, 0, "Texas Instruments", "TI-82", MACHINE_NO_SOUND_HW )
+COMP( 1994, ti81v2, ti81, 0, ti81v2, ti81, ti85_state, 0, "Texas Instruments", "TI-81 v2.0", MACHINE_NO_SOUND_HW )
+COMP( 1996, ti83, 0, 0, ti83, ti83, ti85_state, 0, "Texas Instruments", "TI-83", MACHINE_NO_SOUND_HW )
+COMP( 1997, ti86, 0, 0, ti86, ti85, ti85_state, 0, "Texas Instruments", "TI-86", MACHINE_NO_SOUND_HW )
+COMP( 1998, ti73, 0, 0, ti73, ti82, ti85_state, 0, "Texas Instruments", "TI-73", MACHINE_NO_SOUND_HW )
+COMP( 1999, ti83p, 0, 0, ti83p, ti82, ti85_state, 0, "Texas Instruments", "TI-83 Plus", MACHINE_NO_SOUND_HW )
+COMP( 2001, ti83pse, 0, 0, ti83pse, ti82, ti85_state, 0, "Texas Instruments", "TI-83 Plus Silver Edition", MACHINE_NO_SOUND_HW )
+COMP( 2004, ti84p, 0, 0, ti84p, ti82, ti85_state, 0, "Texas Instruments", "TI-84 Plus", MACHINE_NO_SOUND_HW )
+COMP( 2004, ti84pse, 0, 0, ti84pse, ti82, ti85_state, 0, "Texas Instruments", "TI-84 Plus Silver Edition", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp
index 9d79267f0bc..eefc6ed205a 100644
--- a/src/mame/drivers/ti89.cpp
+++ b/src/mame/drivers/ti89.cpp
@@ -515,7 +515,7 @@ PALETTE_INIT_MEMBER(ti68k_state, ti68k)
palette.set_pen_color(1, rgb_t(92, 83, 88));
}
-static MACHINE_CONFIG_START( ti89, ti68k_state )
+static MACHINE_CONFIG_START( ti89 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(ti89_mem)
@@ -669,9 +669,9 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1998, ti89, 0, 0, ti89, ti8x, driver_device, 0, "Texas Instruments", "TI-89", MACHINE_NO_SOUND)
-COMP( 1995, ti92, 0, 0, ti92, ti9x, driver_device, 0, "Texas Instruments", "TI-92", MACHINE_NO_SOUND)
-COMP( 1999, ti92p, 0, 0, ti92p, ti9x, driver_device, 0, "Texas Instruments", "TI-92 Plus", MACHINE_NO_SOUND)
-COMP( 2002, v200, 0, 0, v200, ti9x, driver_device, 0, "Texas Instruments", "Voyage 200 PLT",MACHINE_NO_SOUND)
-COMP( 2004, ti89t, 0, 0, ti89t, ti8x, driver_device, 0, "Texas Instruments", "TI-89 Titanium",MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1998, ti89, 0, 0, ti89, ti8x, ti68k_state, 0, "Texas Instruments", "TI-89", MACHINE_NO_SOUND )
+COMP( 1995, ti92, 0, 0, ti92, ti9x, ti68k_state, 0, "Texas Instruments", "TI-92", MACHINE_NO_SOUND )
+COMP( 1999, ti92p, 0, 0, ti92p, ti9x, ti68k_state, 0, "Texas Instruments", "TI-92 Plus", MACHINE_NO_SOUND )
+COMP( 2002, v200, 0, 0, v200, ti9x, ti68k_state, 0, "Texas Instruments", "Voyage 200 PLT", MACHINE_NO_SOUND )
+COMP( 2004, ti89t, 0, 0, ti89t, ti8x, ti68k_state, 0, "Texas Instruments", "TI-89 Titanium", MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ti990_10.cpp b/src/mame/drivers/ti990_10.cpp
index cdf3422e71e..4cd15ee8990 100644
--- a/src/mame/drivers/ti990_10.cpp
+++ b/src/mame/drivers/ti990_10.cpp
@@ -311,7 +311,7 @@ WRITE_LINE_MEMBER(ti990_10_state::tape_interrupt)
// set_int9(state);
}
-static MACHINE_CONFIG_START( ti990_10, ti990_10_state )
+static MACHINE_CONFIG_START( ti990_10 )
/* basic machine hardware */
/* TI990/10 CPU @ 4.0(???) MHz */
MCFG_TMS99xx_ADD("maincpu", TI990_10, 4000000, ti990_10_memmap, ti990_10_io )
@@ -371,7 +371,7 @@ ROM_START(ti990_10)
/* VDT911 character definitions */
- ROM_REGION(vdt911_chr_region_len, vdt911_chr_region, ROMREGION_ERASEFF)
+ ROM_REGION(vdt911_device::chr_region_len, vdt911_chr_region, ROMREGION_ERASEFF)
ROM_END
@@ -385,5 +385,5 @@ DRIVER_INIT_MEMBER(ti990_10_state,ti990_10)
#endif
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1975, ti990_10, 0, 0, ti990_10, 0, ti990_10_state, ti990_10, "Texas Instruments", "TI Model 990/10 Minicomputer System" , MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1975, ti990_10, 0, 0, ti990_10, 0, ti990_10_state, ti990_10, "Texas Instruments", "TI Model 990/10 Minicomputer System", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp
index 2e60a11f674..d141795ef4f 100644
--- a/src/mame/drivers/ti990_4.cpp
+++ b/src/mame/drivers/ti990_4.cpp
@@ -281,7 +281,7 @@ DRIVER_INIT_MEMBER(ti990_4_state, ti990_4)
m_nmi_timer = timer_alloc(NMI_TIMER_ID);
}
-static MACHINE_CONFIG_START( ti990_4, ti990_4_state )
+static MACHINE_CONFIG_START( ti990_4 )
/* basic machine hardware */
/* TMS9900 CPU @ 3.0(???) MHz */
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
@@ -296,13 +296,13 @@ static MACHINE_CONFIG_START( ti990_4, ti990_4_state )
MCFG_ASR733_LINEINT_HANDLER(WRITELINE(ti990_4_state, line_interrupt))
// Floppy controller
- MCFG_DEVICE_ADD("fd800", FD800, 0)
+ MCFG_DEVICE_ADD("fd800", TI99X_FD800, 0)
MCFG_FD800_INT_HANDLER(WRITELINE(ti990_4_state, fd_interrupt))
// MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ti990_4v, ti990_4_state )
+static MACHINE_CONFIG_START( ti990_4v )
/* basic machine hardware */
/* TMS9900 CPU @ 3.0(???) MHz */
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map_v)
@@ -316,7 +316,7 @@ static MACHINE_CONFIG_START( ti990_4v, ti990_4_state )
MCFG_VDT911_LINEINT_HANDLER(WRITELINE(ti990_4_state, line_interrupt))
// Floppy controller
- MCFG_DEVICE_ADD("fd800", FD800, 0)
+ MCFG_DEVICE_ADD("fd800", TI99X_FD800, 0)
MCFG_FD800_INT_HANDLER(WRITELINE(ti990_4_state, fd_interrupt))
// MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)
@@ -350,7 +350,7 @@ ROM_START(ti990_4)
ROM_LOAD16_WORD("ti9904.rom", 0xFC00, 0x400, CRC(691e7d19) SHA1(58d9bed80490fdf71c743bfd3077c70840b7df8c))
#endif
- ROM_REGION(asr733_chr_region_len, asr733_chr_region, ROMREGION_ERASEFF)
+ ROM_REGION(asr733_device::chr_region_len, asr733_chr_region, ROMREGION_ERASEFF)
ROM_END
ROM_START(ti990_4v)
@@ -359,9 +359,9 @@ ROM_START(ti990_4v)
ROM_LOAD16_WORD("ti9904.rom", 0xFC00, 0x400, CRC(691e7d19) SHA1(58d9bed80490fdf71c743bfd3077c70840b7df8c))
/* VDT911 character definitions */
- ROM_REGION(vdt911_chr_region_len, vdt911_chr_region, ROMREGION_ERASEFF)
+ ROM_REGION(vdt911_device::chr_region_len, vdt911_chr_region, ROMREGION_ERASEFF)
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1976, ti990_4, 0, 0, ti990_4, 0, ti990_4_state, ti990_4, "Texas Instruments", "TI Model 990/4 Microcomputer System" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1976, ti990_4v, ti990_4, 0, ti990_4v, 0, ti990_4_state, ti990_4, "Texas Instruments", "TI Model 990/4 Microcomputer System with Video Display Terminal" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1976, ti990_4, 0, 0, ti990_4, 0, ti990_4_state, ti990_4, "Texas Instruments", "TI Model 990/4 Microcomputer System", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1976, ti990_4v, ti990_4, 0, ti990_4v, 0, ti990_4_state, ti990_4, "Texas Instruments", "TI Model 990/4 Microcomputer System with Video Display Terminal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp
index b38df29fea5..ba6dea90229 100644
--- a/src/mame/drivers/ti99_2.cpp
+++ b/src/mame/drivers/ti99_2.cpp
@@ -367,7 +367,7 @@ static INPUT_PORTS_START(ti99_2)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ti99_2, ti99_2_state )
+static MACHINE_CONFIG_START( ti99_2 )
// basic machine hardware
// TMS9995, standard variant
// We have no lines connected yet
@@ -412,6 +412,6 @@ ROM_END
/* Hex-bus disk controller: supports up to 4 floppy disk drives */
/* None of these is supported (tape should be easy to emulate) */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, ti99_224, 0, 0, ti99_2, ti99_2, ti99_2_state, ti99_2_24, "Texas Instruments", "TI-99/2 BASIC Computer (24kb ROMs)" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1983, ti99_232, ti99_224, 0, ti99_2, ti99_2, ti99_2_state, ti99_2_32, "Texas Instruments", "TI-99/2 BASIC Computer (32kb ROMs)" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, ti99_224, 0, 0, ti99_2, ti99_2, ti99_2_state, ti99_2_24, "Texas Instruments", "TI-99/2 BASIC Computer (24kb ROMs)" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1983, ti99_232, ti99_224, 0, ti99_2, ti99_2, ti99_2_state, ti99_2_32, "Texas Instruments", "TI-99/2 BASIC Computer (32kb ROMs)" , MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp
index 0df5bad73e4..efa0632b5ef 100644
--- a/src/mame/drivers/ti99_4p.cpp
+++ b/src/mame/drivers/ti99_4p.cpp
@@ -116,8 +116,8 @@
*****************************************************************************/
#include "emu.h"
-#include "bus/ti99_peb/peribox.h"
-#include "bus/ti99x/joyport.h"
+#include "bus/ti99/joyport/joyport.h"
+#include "bus/ti99/peb/peribox.h"
#include "cpu/tms9900/tms9900.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
@@ -148,7 +148,7 @@ public:
m_joyport(*this, JOYPORT_TAG),
m_scratchpad(*this, PADRAM_TAG),
m_amsram(*this, AMSRAM_TAG)
- { }
+ { }
DECLARE_WRITE_LINE_MEMBER( ready_line );
DECLARE_WRITE_LINE_MEMBER( extint );
@@ -192,7 +192,7 @@ private:
required_device<tms9901_device> m_tms9901;
required_device<cassette_image_device> m_cassette;
required_device<peribox_device> m_peribox;
- required_device<joyport_device> m_joyport;
+ required_device<ti99_joyport_device> m_joyport;
required_device<ram_device> m_scratchpad;
required_device<ram_device> m_amsram;
@@ -728,7 +728,7 @@ READ8_MEMBER( ti99_4p_state::read_by_9901 )
switch (offset & 0x03)
{
- case TMS9901_CB_INT7:
+ case tms9901_device::CB_INT7:
// Read pins INT3*-INT7* of TI99's 9901.
// bit 1: INT1 status
// bit 2: INT2 status
@@ -751,7 +751,7 @@ READ8_MEMBER( ti99_4p_state::read_by_9901 )
answer = (answer << 3) | m_9901_int;
break;
- case TMS9901_INT8_INT15:
+ case tms9901_device::INT8_INT15:
// Read pins int8_t*-INT15* of TI99's 9901.
// bit 0-2: keyboard status bits 5 to 7
// bit 3: tape input mirror
@@ -763,10 +763,10 @@ READ8_MEMBER( ti99_4p_state::read_by_9901 )
answer |= 0xf0;
break;
- case TMS9901_P0_P7:
+ case tms9901_device::P0_P7:
break;
- case TMS9901_P8_P15:
+ case tms9901_device::P8_P15:
// Read pins P8-P15 of TI99's 9901.
// bit 26: high
// bit 27: tape input
@@ -989,7 +989,7 @@ MACHINE_RESET_MEMBER(ti99_4p_state,ti99_4p)
/*
Machine description.
*/
-static MACHINE_CONFIG_START( ti99_4p_60hz, ti99_4p_state )
+static MACHINE_CONFIG_START( ti99_4p_60hz )
/* basic machine hardware */
/* TMS9900 CPU @ 3.0 MHz */
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
@@ -1049,5 +1049,5 @@ ROM_START(ti99_4p)
ROM_LOAD16_BYTE("sgcpu_lb.bin", 0x0001, 0x8000, CRC(2a5dc818) SHA1(dec141fe2eea0b930859cbe1ebd715ac29fa8ecb) ) /* system ROMs */
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1996, ti99_4p, 0, 0, ti99_4p_60hz, ti99_4p, driver_device, 0, "System-99 User Group", "SGCPU (aka TI-99/4P)" , MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1996, ti99_4p, 0, 0, ti99_4p_60hz, ti99_4p, ti99_4p_state, 0, "System-99 User Group", "SGCPU (aka TI-99/4P)" , MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index d42e0a4261f..67a4ffd6cf3 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -49,9 +49,9 @@
#include "bus/ti99x/ti99defs.h"
#include "bus/ti99x/datamux.h"
#include "bus/ti99x/gromport.h"
-#include "bus/ti99x/joyport.h"
-#include "bus/ti99_peb/peribox.h"
+#include "bus/ti99/joyport/joyport.h"
+#include "bus/ti99/peb/peribox.h"
#include "machine/ram.h"
#include "softlist.h"
@@ -87,7 +87,7 @@ public:
m_video(*this, VDP_TAG),
m_cassette1(*this, "cassette"),
m_cassette2(*this, "cassette2")
- { }
+ { }
// Machine management
DECLARE_MACHINE_START(ti99_4);
@@ -165,9 +165,9 @@ private:
// Connected devices
required_device<tms9900_device> m_cpu;
required_device<tms9901_device> m_tms9901;
- required_device<gromport_device> m_gromport;
+ required_device<ti99_gromport_device> m_gromport;
required_device<peribox_device> m_peribox;
- required_device<joyport_device> m_joyport;
+ required_device<ti99_joyport_device> m_joyport;
required_device<ti99_datamux_device> m_datamux;
optional_device<tms9928a_device> m_video;
required_device<cassette_image_device> m_cassette1;
@@ -454,7 +454,7 @@ READ8_MEMBER( ti99_4x_state::read_by_9901 )
switch (offset & 0x03)
{
- case TMS9901_CB_INT7:
+ case tms9901_device::CB_INT7:
//
// Read pins INT3*-INT7* of TI99's 9901.
// bit 1: INT1 status
@@ -490,7 +490,7 @@ READ8_MEMBER( ti99_4x_state::read_by_9901 )
break;
- case TMS9901_INT8_INT15:
+ case tms9901_device::INT8_INT15:
// |1|1|1|INT12|0|K|K|K|
if (m_keyboard_column >= (m_model==MODEL_4? 5:6)) answer = 0x07;
else answer = ((ioport(column[m_keyboard_column])->read())>>5) & 0x07;
@@ -498,12 +498,12 @@ READ8_MEMBER( ti99_4x_state::read_by_9901 )
if (m_model != MODEL_4 || m_int12==CLEAR_LINE) answer |= 0x10;
break;
- case TMS9901_P0_P7:
+ case tms9901_device::P0_P7:
// Required for the handset (only on TI-99/4)
if ((m_joyport->read_port() & 0x20)!=0) answer |= 2;
break;
- case TMS9901_P8_P15:
+ case tms9901_device::P8_P15:
// Preset to 1
answer = 4;
@@ -830,7 +830,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4)
TI-99/4 - predecessor of the more popular TI-99/4A
***********************************************************************/
-static MACHINE_CONFIG_START( ti99_4, ti99_4x_state )
+static MACHINE_CONFIG_START( ti99_4 )
// CPU
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) )
@@ -854,7 +854,7 @@ static MACHINE_CONFIG_START( ti99_4, ti99_4x_state )
MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4x_state, cassette_output) )
MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4x_state, tms9901_interrupt) )
- MCFG_DEVICE_ADD( DATAMUX_TAG, DATAMUX, 0)
+ MCFG_DEVICE_ADD( DATAMUX_TAG, TI99_DATAMUX, 0)
MCFG_DMUX_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_dmux) )
MCFG_GROMPORT4_ADD( GROMPORT_TAG )
@@ -950,7 +950,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state,ti99_4a)
m_int12 = CLEAR_LINE;
}
-static MACHINE_CONFIG_START( ti99_4a, ti99_4x_state )
+static MACHINE_CONFIG_START( ti99_4a )
// CPU
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) )
@@ -974,7 +974,7 @@ static MACHINE_CONFIG_START( ti99_4a, ti99_4x_state )
MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4x_state, cassette_output) )
MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4x_state, tms9901_interrupt) )
- MCFG_DEVICE_ADD( DATAMUX_TAG, DATAMUX, 0)
+ MCFG_DEVICE_ADD( DATAMUX_TAG, TI99_DATAMUX, 0)
MCFG_DMUX_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_dmux) )
MCFG_GROMPORT4_ADD( GROMPORT_TAG )
@@ -1112,7 +1112,7 @@ MACHINE_RESET_MEMBER(ti99_4x_state, ti99_4ev)
m_gromclk_timer->adjust(attotime::zero, 0, attotime::from_hz(XTAL_10_738635MHz/24));
}
-static MACHINE_CONFIG_START( ti99_4ev_60hz, ti99_4x_state )
+static MACHINE_CONFIG_START( ti99_4ev_60hz )
// CPU
MCFG_TMS99xx_ADD("maincpu", TMS9900, 3000000, memmap, cru_map)
MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(ti99_4x_state, external_operation) )
@@ -1136,7 +1136,7 @@ static MACHINE_CONFIG_START( ti99_4ev_60hz, ti99_4x_state )
MCFG_TMS9901_P9_HANDLER( WRITELINE( ti99_4x_state, cassette_output) )
MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_4x_state, tms9901_interrupt) )
- MCFG_DEVICE_ADD( DATAMUX_TAG, DATAMUX, 0)
+ MCFG_DEVICE_ADD( DATAMUX_TAG, TI99_DATAMUX, 0)
MCFG_DMUX_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_dmux) )
MCFG_GROMPORT4_ADD( GROMPORT_TAG )
MCFG_GROMPORT_READY_HANDLER( WRITELINE(ti99_4x_state, console_ready_cart) )
@@ -1253,10 +1253,10 @@ ROM_START(ti99_4ev)
ROM_LOAD("994a_grom2.u502", 0x4000, 0x1800, CRC(e0bb5341) SHA1(e255f0d65d69b927cecb8fcfac7a4c17d585ea96)) /* system GROM 2 */
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1979, ti99_4, 0, 0, ti99_4_60hz, ti99_4, driver_device, 0, "Texas Instruments", "TI-99/4 Home Computer (US)", MACHINE_SUPPORTS_SAVE)
-COMP( 1980, ti99_4e, ti99_4, 0, ti99_4_50hz, ti99_4, driver_device, 0, "Texas Instruments", "TI-99/4 Home Computer (Europe)", MACHINE_SUPPORTS_SAVE)
-COMP( 1981, ti99_4a, 0, 0, ti99_4a_60hz, ti99_4a, driver_device, 0, "Texas Instruments", "TI-99/4A Home Computer (US)", MACHINE_SUPPORTS_SAVE)
-COMP( 1981, ti99_4ae, ti99_4a, 0, ti99_4a_50hz, ti99_4a, driver_device, 0, "Texas Instruments", "TI-99/4A Home Computer (Europe)", MACHINE_SUPPORTS_SAVE)
-COMP( 1983, ti99_4qi, ti99_4a, 0, ti99_4qi_60hz, ti99_4a, driver_device, 0, "Texas Instruments", "TI-99/4QI Home Computer (US)", MACHINE_SUPPORTS_SAVE)
-COMP( 1994, ti99_4ev, ti99_4a, 0, ti99_4ev_60hz, ti99_4a, driver_device, 0, "Texas Instruments", "TI-99/4A Home Computer with EVPC", MACHINE_SUPPORTS_SAVE)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1979, ti99_4, 0, 0, ti99_4_60hz, ti99_4, ti99_4x_state, 0, "Texas Instruments", "TI-99/4 Home Computer (US)", MACHINE_SUPPORTS_SAVE)
+COMP( 1980, ti99_4e, ti99_4, 0, ti99_4_50hz, ti99_4, ti99_4x_state, 0, "Texas Instruments", "TI-99/4 Home Computer (Europe)", MACHINE_SUPPORTS_SAVE)
+COMP( 1981, ti99_4a, 0, 0, ti99_4a_60hz, ti99_4a, ti99_4x_state, 0, "Texas Instruments", "TI-99/4A Home Computer (US)", MACHINE_SUPPORTS_SAVE)
+COMP( 1981, ti99_4ae, ti99_4a, 0, ti99_4a_50hz, ti99_4a, ti99_4x_state, 0, "Texas Instruments", "TI-99/4A Home Computer (Europe)", MACHINE_SUPPORTS_SAVE)
+COMP( 1983, ti99_4qi, ti99_4a, 0, ti99_4qi_60hz, ti99_4a, ti99_4x_state, 0, "Texas Instruments", "TI-99/4QI Home Computer (US)", MACHINE_SUPPORTS_SAVE)
+COMP( 1994, ti99_4ev, ti99_4a, 0, ti99_4ev_60hz, ti99_4a, ti99_4x_state, 0, "Texas Instruments", "TI-99/4A Home Computer with EVPC", MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 5d5c52888ca..a2556b4c137 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -183,9 +183,9 @@ Known Issues (MZ, 2010-11-07)
#include "bus/ti99x/998board.h"
#include "bus/ti99x/gromport.h"
-#include "bus/ti99x/joyport.h"
-#include "bus/ti99_peb/peribox.h"
+#include "bus/ti99/joyport/joyport.h"
+#include "bus/ti99/peb/peribox.h"
#include "softlist.h"
#include "speaker.h"
@@ -221,7 +221,9 @@ public:
m_peribox(*this, PERIBOX_TAG),
m_mainboard(*this, MAINBOARD8_TAG),
m_joyport(*this, JOYPORT_TAG),
- m_cassette(*this, "cassette") { };
+ m_cassette(*this, "cassette")
+ {
+ }
// Machine management
DECLARE_MACHINE_START(ti99_8);
@@ -273,10 +275,10 @@ private:
// Connected devices
required_device<tms9995_device> m_cpu;
required_device<tms9901_device> m_tms9901;
- required_device<gromport_device> m_gromport;
+ required_device<ti99_gromport_device> m_gromport;
required_device<peribox_device> m_peribox;
required_device<mainboard8_device> m_mainboard;
- required_device<joyport_device> m_joyport;
+ required_device<ti99_joyport_device> m_joyport;
required_device<cassette_image_device> m_cassette;
};
@@ -449,7 +451,7 @@ READ8_MEMBER( ti99_8_state::read_by_9901 )
uint8_t joyst;
switch (offset & 0x03)
{
- case TMS9901_CB_INT7:
+ case tms9901_device::CB_INT7:
// Read pins INT3*-INT7* of TI99's 9901.
//
// bit 1: INT1 status
@@ -475,7 +477,7 @@ READ8_MEMBER( ti99_8_state::read_by_9901 )
break;
- case TMS9901_INT8_INT15:
+ case tms9901_device::INT8_INT15:
// Read pins int8_t*-INT15* of TI99's 9901.
//
// bit 0-2: keyboard status bits 2 to 4
@@ -497,11 +499,11 @@ READ8_MEMBER( ti99_8_state::read_by_9901 )
answer = (answer >> 2) & 0x07;
break;
- case TMS9901_P0_P7:
+ case tms9901_device::P0_P7:
// Read pins P0-P7 of TI99's 9901. None here.
break;
- case TMS9901_P8_P15:
+ case tms9901_device::P8_P15:
// Read pins P8-P15 of TI99's 9901. (TI-99/8)
//
// bit 26: high
@@ -712,7 +714,7 @@ MACHINE_RESET_MEMBER(ti99_8_state, ti99_8)
m_int2 = CLEAR_LINE;
}
-static MACHINE_CONFIG_START( ti99_8, ti99_8_state )
+static MACHINE_CONFIG_START( ti99_8 )
// basic machine hardware */
// TMS9995-MP9537 CPU @ 10.7 MHz
// MP9537 mask: This variant of the TMS9995 does not contain on-chip RAM
@@ -740,7 +742,7 @@ static MACHINE_CONFIG_START( ti99_8, ti99_8_state )
MCFG_TMS9901_INTLEVEL_HANDLER( WRITE8( ti99_8_state, tms9901_interrupt) )
// Mainboard with custom chips
- MCFG_DEVICE_ADD(MAINBOARD8_TAG, MAINBOARD8, 0)
+ MCFG_DEVICE_ADD(MAINBOARD8_TAG, TI99_MAINBOARD8, 0)
MCFG_MAINBOARD8_READY_CALLBACK(WRITELINE(ti99_8_state, console_ready))
MCFG_MAINBOARD8_RESET_CALLBACK(WRITELINE(ti99_8_state, console_reset))
MCFG_MAINBOARD8_HOLD_CALLBACK(WRITELINE(ti99_8_state, cpu_hold))
@@ -912,6 +914,6 @@ ROM_END
#define rom_ti99_8e rom_ti99_8
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1983, ti99_8, 0, 0, ti99_8_60hz,ti99_8, driver_device, 0, "Texas Instruments", "TI-99/8 Computer (US)" , MACHINE_SUPPORTS_SAVE )
-COMP( 1983, ti99_8e, ti99_8, 0, ti99_8_50hz,ti99_8, driver_device, 0, "Texas Instruments", "TI-99/8 Computer (Europe)" , MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, ti99_8, 0, 0, ti99_8_60hz, ti99_8, ti99_8_state, 0, "Texas Instruments", "TI-99/8 Computer (US)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, ti99_8e, ti99_8, 0, ti99_8_50hz, ti99_8, ti99_8_state, 0, "Texas Instruments", "TI-99/8 Computer (Europe)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp
index 69ee80cead6..b74d57f9398 100644
--- a/src/mame/drivers/tiamc1.cpp
+++ b/src/mame/drivers/tiamc1.cpp
@@ -119,6 +119,7 @@
#include "emu.h"
#include "includes/tiamc1.h"
+#include "audio/tiamc1.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
@@ -322,7 +323,7 @@ static GFXDECODE_START( kot )
GFXDECODE_END
-static MACHINE_CONFIG_START( tiamc1, tiamc1_state )
+static MACHINE_CONFIG_START( tiamc1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(tiamc1_map)
@@ -543,9 +544,9 @@ ROM_START( kot )
ROM_END
-GAME( 1988, konek, 0, tiamc1, tiamc1, driver_device, 0, ROT0, "Terminal", "Konek-Gorbunok", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, sosterm, 0, tiamc1, tiamc1, driver_device, 0, ROT0, "Terminal", "S.O.S.", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, koroleva, 0, tiamc1, tiamc1, driver_device, 0, ROT0, "Terminal", "Snezhnaja Koroleva", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, bilyard, 0, tiamc1, tiamc1, driver_device, 0, ROT0, "Terminal", "Billiard", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gorodki, 0, tiamc1, gorodki, driver_device, 0, ROT0, "Terminal", "Gorodki", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kot, 0, kot, kot, driver_device, 0, ROT0, "Terminal", "Kot-Rybolov", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 1988, konek, 0, tiamc1, tiamc1, tiamc1_state, 0, ROT0, "Terminal", "Konek-Gorbunok", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, sosterm, 0, tiamc1, tiamc1, tiamc1_state, 0, ROT0, "Terminal", "S.O.S.", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, koroleva, 0, tiamc1, tiamc1, tiamc1_state, 0, ROT0, "Terminal", "Snezhnaja Koroleva", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, bilyard, 0, tiamc1, tiamc1, tiamc1_state, 0, ROT0, "Terminal", "Billiard", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gorodki, 0, tiamc1, gorodki, tiamc1_state, 0, ROT0, "Terminal", "Gorodki", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kot, 0, kot, kot, tiamc1_state, 0, ROT0, "Terminal", "Kot-Rybolov", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp
index 1eba0fbc10b..18b27b1b9d8 100644
--- a/src/mame/drivers/ticalc1x.cpp
+++ b/src/mame/drivers/ticalc1x.cpp
@@ -184,7 +184,7 @@ static INPUT_PORTS_START( cmulti8 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( cmulti8, cmulti8_state )
+static MACHINE_CONFIG_START( cmulti8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1070, 250000) // approximation - RC osc. R=56K, C=68pf
@@ -400,7 +400,7 @@ static INPUT_PORTS_START( tisr16ii )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tisr16, tisr16_state )
+static MACHINE_CONFIG_START( tisr16 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 300000) // approximation - RC osc. R=43K, C=68pf (note: tisr16ii MCU RC osc. is different: R=30K, C=100pf, same freq)
@@ -538,7 +538,7 @@ static INPUT_PORTS_START( ti1270 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_NAME("+/-")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ti1250, ti1250_state )
+static MACHINE_CONFIG_START( ti1250 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0950, 200000) // approximation - RC osc. R=68K, C=68pf
@@ -664,7 +664,7 @@ static INPUT_PORTS_START( ti25503 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_X) PORT_NAME("1/x")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ti25503, ti25503_state )
+static MACHINE_CONFIG_START( ti25503 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1000, 250000) // approximation
@@ -764,7 +764,7 @@ static INPUT_PORTS_START( ti1000 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("=")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ti1000, ti1000_state )
+static MACHINE_CONFIG_START( ti1000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1990, 250000) // approximation
@@ -864,7 +864,7 @@ static INPUT_PORTS_START( wizatron )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( wizatron, wizatron_state )
+static MACHINE_CONFIG_START( wizatron )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
@@ -938,7 +938,7 @@ static INPUT_PORTS_START( lilprof )
PORT_CONFSETTING( 0x08, "4" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( lilprof, lilprof_state )
+static MACHINE_CONFIG_START( lilprof )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0970, 250000) // approximation
@@ -1048,7 +1048,7 @@ static INPUT_PORTS_START( lilprof78 )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( lilprof78, lilprof78_state )
+static MACHINE_CONFIG_START( lilprof78 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1990, 250000) // approximation
@@ -1160,7 +1160,7 @@ static INPUT_PORTS_START( dataman )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_E) PORT_NAME("Electro Flash")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( dataman, dataman_state )
+static MACHINE_CONFIG_START( dataman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1980, 300000) // patent says 300kHz
@@ -1227,7 +1227,7 @@ static INPUT_PORTS_START( mathmarv )
PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_F) PORT_NAME("Flash")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( mathmarv, mathmarv_state )
+static MACHINE_CONFIG_START( mathmarv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1980, 300000) // assume same as dataman
@@ -1487,7 +1487,7 @@ static INPUT_PORTS_START( tibusan )
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Off") PORT_CHANGED_MEMBER(DEVICE_SELF, hh_tms1k_state, power_button, (void *)false)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( ti30, ti30_state )
+static MACHINE_CONFIG_START( ti30 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0980, 400000) // guessed
@@ -1729,27 +1729,27 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-COMP( 1977, cmulti8, 0, 0, cmulti8, cmulti8, driver_device, 0, "Canon", "Multi 8 (Canon)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, cmulti8, 0, 0, cmulti8, cmulti8, cmulti8_state, 0, "Canon", "Multi 8 (Canon)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1974, tisr16, 0, 0, tisr16, tisr16, driver_device, 0, "Texas Instruments", "SR-16", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1975, tisr16ii, 0, 0, tisr16, tisr16ii, driver_device, 0, "Texas Instruments", "SR-16 II", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1974, tisr16, 0, 0, tisr16, tisr16, tisr16_state, 0, "Texas Instruments", "SR-16", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1975, tisr16ii, 0, 0, tisr16, tisr16ii, tisr16_state, 0, "Texas Instruments", "SR-16 II", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1975, ti1250, 0, 0, ti1250, ti1250, driver_device, 0, "Texas Instruments", "TI-1250 (1975 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1976, ti125076, ti1250, 0, ti1270, ti1250, driver_device, 0, "Texas Instruments", "TI-1250 (1976 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1976, ti1270, 0, 0, ti1270, ti1270, driver_device, 0, "Texas Instruments", "TI-1270", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1975, ti1250, 0, 0, ti1250, ti1250, ti1250_state, 0, "Texas Instruments", "TI-1250 (1975 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1976, ti125076, ti1250, 0, ti1270, ti1250, ti1250_state, 0, "Texas Instruments", "TI-1250 (1976 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1976, ti1270, 0, 0, ti1270, ti1270, ti1250_state, 0, "Texas Instruments", "TI-1270", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1976, ti25503, 0, 0, ti25503, ti25503, driver_device, 0, "Texas Instruments", "TI-2550 III", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1976, ti25503, 0, 0, ti25503, ti25503, ti25503_state, 0, "Texas Instruments", "TI-2550 III", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1977, ti1000, 0, 0, ti1000, ti1000, driver_device, 0, "Texas Instruments", "TI-1000 (1977 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1977, ti1000, 0, 0, ti1000, ti1000, ti1000_state, 0, "Texas Instruments", "TI-1000 (1977 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1977, wizatron, 0, 0, wizatron, wizatron, driver_device, 0, "Texas Instruments", "Wiz-A-Tron", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1976, lilprof, 0, 0, lilprof, lilprof, driver_device, 0, "Texas Instruments", "Little Professor (1976 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1978, lilprof78, lilprof, 0, lilprof78, lilprof78, driver_device, 0, "Texas Instruments", "Little Professor (1978 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1977, wizatron, 0, 0, wizatron, wizatron, wizatron_state, 0, "Texas Instruments", "Wiz-A-Tron", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1976, lilprof, 0, 0, lilprof, lilprof, lilprof_state, 0, "Texas Instruments", "Little Professor (1976 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1978, lilprof78, lilprof, 0, lilprof78, lilprof78, lilprof78_state, 0, "Texas Instruments", "Little Professor (1978 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1977, dataman, 0, 0, dataman, dataman, driver_device, 0, "Texas Instruments", "DataMan", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1980, mathmarv, 0, 0, mathmarv, mathmarv, driver_device, 0, "Texas Instruments", "Math Marvel", MACHINE_SUPPORTS_SAVE )
+COMP( 1977, dataman, 0, 0, dataman, dataman, dataman_state, 0, "Texas Instruments", "DataMan", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1980, mathmarv, 0, 0, mathmarv, mathmarv, mathmarv_state, 0, "Texas Instruments", "Math Marvel", MACHINE_SUPPORTS_SAVE )
-COMP( 1976, ti30, 0, 0, ti30, ti30, driver_device, 0, "Texas Instruments", "TI-30", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1976, tibusan, 0, 0, ti30, tibusan, driver_device, 0, "Texas Instruments", "TI Business Analyst", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1977, tiprog, 0, 0, ti30, tiprog, driver_device, 0, "Texas Instruments", "TI Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1976, ti30, 0, 0, ti30, ti30, ti30_state, 0, "Texas Instruments", "TI-30", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1976, tibusan, 0, 0, ti30, tibusan, ti30_state, 0, "Texas Instruments", "TI Business Analyst", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1977, tiprog, 0, 0, ti30, tiprog, ti30_state, 0, "Texas Instruments", "TI Programmer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index 9cc0f2afb4a..6686a4c1457 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -742,7 +742,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tickee, tickee_state )
+static MACHINE_CONFIG_START( tickee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
@@ -790,7 +790,7 @@ static MACHINE_CONFIG_DERIVED( ghoshunt, tickee )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rapidfir, tickee_state )
+static MACHINE_CONFIG_START( rapidfir )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, XTAL_50MHz)
@@ -819,12 +819,12 @@ static MACHINE_CONFIG_START( rapidfir, tickee_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mouseatk, tickee_state )
+static MACHINE_CONFIG_START( mouseatk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS34010, XTAL_40MHz)
@@ -855,7 +855,7 @@ static MACHINE_CONFIG_START( mouseatk, tickee_state )
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MCFG_OKIM6295_ADD("oki", OKI_CLOCK, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", OKI_CLOCK, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@@ -1151,11 +1151,11 @@ ROM_END
*
*************************************/
-GAME( 1994, tickee, 0, tickee, tickee, driver_device, 0, ROT0, "Raster Elite", "Tickee Tickats", 0 )
-GAME( 1996, ghoshunt, 0, ghoshunt, ghoshunt, driver_device, 0, ROT0, "Hanaho Games", "Ghost Hunter", 0 )
-GAME( 1996, tutstomb, 0, ghoshunt, ghoshunt, driver_device, 0, ROT0, "Island Design", "Tut's Tomb", 0 )
-GAME( 1996, mouseatk, 0, mouseatk, mouseatk, driver_device, 0, ROT0, "ICE", "Mouse Attack", 0 )
-GAME( 1998, rapidfir, 0, rapidfir, rapidfir, driver_device, 0, ROT0, "Hanaho Games", "Rapid Fire v1.1 (Build 239)", 0 )
-GAME( 1998, rapidfira, rapidfir, rapidfir, rapidfir, driver_device, 0, ROT0, "Hanaho Games", "Rapid Fire v1.1 (Build 238)", 0 )
-GAME( 1998, rapidfire, rapidfir, rapidfir, rapidfir, driver_device, 0, ROT0, "Hanaho Games", "Rapid Fire v1.0 (Build 236)", 0 )
-GAME( 1999, maletmad, 0, rapidfir, rapidfir, driver_device, 0, ROT0, "Hanaho Games", "Mallet Madness v2.1", 0 )
+GAME( 1994, tickee, 0, tickee, tickee, tickee_state, 0, ROT0, "Raster Elite", "Tickee Tickats", 0 )
+GAME( 1996, ghoshunt, 0, ghoshunt, ghoshunt, tickee_state, 0, ROT0, "Hanaho Games", "Ghost Hunter", 0 )
+GAME( 1996, tutstomb, 0, ghoshunt, ghoshunt, tickee_state, 0, ROT0, "Island Design", "Tut's Tomb", 0 )
+GAME( 1996, mouseatk, 0, mouseatk, mouseatk, tickee_state, 0, ROT0, "ICE", "Mouse Attack", 0 )
+GAME( 1998, rapidfir, 0, rapidfir, rapidfir, tickee_state, 0, ROT0, "Hanaho Games", "Rapid Fire v1.1 (Build 239)", 0 )
+GAME( 1998, rapidfira, rapidfir, rapidfir, rapidfir, tickee_state, 0, ROT0, "Hanaho Games", "Rapid Fire v1.1 (Build 238)", 0 )
+GAME( 1998, rapidfire, rapidfir, rapidfir, rapidfir, tickee_state, 0, ROT0, "Hanaho Games", "Rapid Fire v1.0 (Build 236)", 0 )
+GAME( 1999, maletmad, 0, rapidfir, rapidfir, tickee_state, 0, ROT0, "Hanaho Games", "Mallet Madness v2.1", 0 )
diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp
index 2d1eacb70ce..8fad27fe349 100644
--- a/src/mame/drivers/tigeroad.cpp
+++ b/src/mame/drivers/tigeroad.cpp
@@ -574,7 +574,7 @@ static GFXDECODE_START( tigeroad )
GFXDECODE_ENTRY( "sprites", 0, sprite_layout, 0x200, 16 )
GFXDECODE_END
-static MACHINE_CONFIG_START( tigeroad, tigeroad_state )
+static MACHINE_CONFIG_START( tigeroad )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
@@ -633,12 +633,12 @@ static MACHINE_CONFIG_DERIVED( toramich, tigeroad )
/* sound hardware */
MCFG_SOUND_ADD("msm", MSM5205, 384000)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) /* 4KHz playback ? */
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* 4KHz playback ? */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( f1dream_comad, tigeroad_state )
+static MACHINE_CONFIG_START( f1dream_comad )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
@@ -695,7 +695,7 @@ void pushman_state::machine_start()
save_item(NAME(m_mcu_latch_ctl));
}
-static MACHINE_CONFIG_DERIVED_CLASS(pushman, f1dream_comad, pushman_state)
+static MACHINE_CONFIG_DERIVED(pushman, f1dream_comad)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(pushman_map)
@@ -1178,21 +1178,21 @@ DRIVER_INIT_MEMBER(tigeroad_state, f1dream)
/***************************************************************************/
-GAME( 1987, tigeroad, 0, tigeroad, tigeroad, driver_device, 0, ROT0, "Capcom", "Tiger Road (US)", 0 )
-GAME( 1987, tigeroadu,tigeroad, tigeroad, tigeroad, driver_device, 0, ROT0, "Capcom (Romstar license)", "Tiger Road (US, Romstar license)", 0 )
-GAME( 1987, toramich, tigeroad, toramich, toramich, driver_device, 0, ROT0, "Capcom", "Tora e no Michi (Japan)", 0 )
-GAME( 1987, tigeroadb,tigeroad, tigeroad, tigeroad, driver_device, 0, ROT0, "bootleg", "Tiger Road (US bootleg)", 0 )
+GAME( 1987, tigeroad, 0, tigeroad, tigeroad, tigeroad_state, 0, ROT0, "Capcom", "Tiger Road (US)", 0 )
+GAME( 1987, tigeroadu,tigeroad, tigeroad, tigeroad, tigeroad_state, 0, ROT0, "Capcom (Romstar license)", "Tiger Road (US, Romstar license)", 0 )
+GAME( 1987, toramich, tigeroad, toramich, toramich, tigeroad_state, 0, ROT0, "Capcom", "Tora e no Michi (Japan)", 0 )
+GAME( 1987, tigeroadb,tigeroad, tigeroad, tigeroad, tigeroad_state, 0, ROT0, "bootleg", "Tiger Road (US bootleg)", 0 )
/* F1 Dream has an Intel 8751 microcontroller for protection */
GAME( 1988, f1dream, 0, tigeroad, f1dream, tigeroad_state, f1dream, ROT0, "Capcom (Romstar license)", "F-1 Dream", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION ) // collisions are wrong
-GAME( 1988, f1dreamb, f1dream, tigeroad, f1dream, driver_device, 0, ROT0, "bootleg", "F-1 Dream (bootleg, set 1)", 0 )
-GAME( 1988, f1dreamba,f1dream, tigeroad, f1dream, driver_device, 0, ROT0, "bootleg", "F-1 Dream (bootleg, set 2)", 0 )
+GAME( 1988, f1dreamb, f1dream, tigeroad, f1dream, tigeroad_state, 0, ROT0, "bootleg", "F-1 Dream (bootleg, set 1)", 0 )
+GAME( 1988, f1dreamba,f1dream, tigeroad, f1dream, tigeroad_state, 0, ROT0, "bootleg", "F-1 Dream (bootleg, set 2)", 0 )
/* This Comad hardware is based around the F1 Dream design */
-GAME( 1990, pushman, 0, pushman, pushman, driver_device, 0, ROT0, "Comad", "Pushman (Korea, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pushmana, pushman, pushman, pushman, driver_device, 0, ROT0, "Comad", "Pushman (Korea, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pushmans, pushman, pushman, pushman, driver_device, 0, ROT0, "Comad (American Sammy license)", "Pushman (American Sammy license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pushmant, pushman, pushman, pushman, driver_device, 0, ROT0, "Comad (Top Tronic license)", "Pushman (Top Tronic license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushman, 0, pushman, pushman, pushman_state, 0, ROT0, "Comad", "Pushman (Korea, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushmana, pushman, pushman, pushman, pushman_state, 0, ROT0, "Comad", "Pushman (Korea, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushmans, pushman, pushman, pushman, pushman_state, 0, ROT0, "Comad (American Sammy license)", "Pushman (American Sammy license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushmant, pushman, pushman, pushman, pushman_state, 0, ROT0, "Comad (Top Tronic license)", "Pushman (Top Tronic license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, bballs, 0, bballs, bballs, driver_device, 0, ROT0, "Comad", "Bouncing Balls", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, bballsa, bballs, bballs, bballs, driver_device, 0, ROT0, "Comad", "Bouncing Balls (Adult)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bballs, 0, bballs, bballs, pushman_state, 0, ROT0, "Comad", "Bouncing Balls", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bballsa, bballs, bballs, bballs, pushman_state, 0, ROT0, "Comad", "Bouncing Balls (Adult)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index 91149a0d020..0388d0e9aa5 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -695,7 +695,7 @@ void tiki100_state::machine_reset()
/* Machine Driver */
-static MACHINE_CONFIG_START( tiki100, tiki100_state )
+static MACHINE_CONFIG_START( tiki100 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(tiki100_mem)
@@ -807,6 +807,6 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, kontiki, 0, 0, tiki100, tiki100, driver_device, 0, "Kontiki Data A/S", "KONTIKI 100", MACHINE_SUPPORTS_SAVE )
-COMP( 1984, tiki100, kontiki, 0, tiki100, tiki100, driver_device, 0, "Tiki Data A/S", "TIKI 100", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, kontiki, 0, 0, tiki100, tiki100, tiki100_state, 0, "Kontiki Data A/S", "KONTIKI 100", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, tiki100, kontiki, 0, tiki100, tiki100, tiki100_state, 0, "Tiki Data A/S", "TIKI 100", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp
index 2e95c9de071..2d4641cc948 100644
--- a/src/mame/drivers/tim011.cpp
+++ b/src/mame/drivers/tim011.cpp
@@ -121,7 +121,7 @@ static const floppy_format_type tim011_floppy_formats[] = {
nullptr
};
-static MACHINE_CONFIG_START( tim011,tim011_state )
+static MACHINE_CONFIG_START( tim011 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z180, XTAL_12_288MHz / 2) // location U17 HD64180
MCFG_CPU_PROGRAM_MAP(tim011_mem)
@@ -162,5 +162,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, tim011, 0, 0, tim011, tim011, driver_device, 0, "Mihajlo Pupin Institute", "TIM-011", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, tim011, 0, 0, tim011, tim011, tim011_state, 0, "Mihajlo Pupin Institute", "TIM-011", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp
index 5e80ae8c2f5..c885a3a66c9 100644
--- a/src/mame/drivers/tim100.cpp
+++ b/src/mame/drivers/tim100.cpp
@@ -168,7 +168,7 @@ WRITE_LINE_MEMBER( tim100_state::clock_w )
}
-static MACHINE_CONFIG_START( tim100, tim100_state )
+static MACHINE_CONFIG_START( tim100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_4_9152MHz) // divider unknown
MCFG_CPU_PROGRAM_MAP(tim100_mem)
@@ -239,4 +239,4 @@ ROM_START( tim100 )
ROM_END
/* Driver */
-COMP( 1985, tim100, 0, 0, tim100, tim100, driver_device, 0, "Mihajlo Pupin Institute", "TIM-100", MACHINE_IS_SKELETON)
+COMP( 1985, tim100, 0, 0, tim100, tim100, tim100_state, 0, "Mihajlo Pupin Institute", "TIM-100", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp
index 06147a0c131..782f4daba1f 100644
--- a/src/mame/drivers/timelimt.cpp
+++ b/src/mame/drivers/timelimt.cpp
@@ -221,7 +221,7 @@ INTERRUPT_GEN_MEMBER(timelimt_state::irq)
/***************************************************************************/
-static MACHINE_CONFIG_START( timelimt, timelimt_state )
+static MACHINE_CONFIG_START( timelimt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5000000) /* 5.000 MHz */
@@ -329,5 +329,5 @@ ROM_START( progress )
ROM_LOAD( "57.bin", 0x0040, 0x0020, CRC(18455a79) SHA1(e4d64368560e3116a922588129f5f91a4c520f7d) )
ROM_END
-GAME( 1983, timelimt, 0, timelimt, timelimt, driver_device, 0, ROT90, "Chuo Co. Ltd", "Time Limit", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, progress, 0, timelimt, progress, driver_device, 0, ROT90, "Chuo Co. Ltd", "Progress", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, timelimt, 0, timelimt, timelimt, timelimt_state, 0, ROT90, "Chuo Co. Ltd", "Time Limit", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, progress, 0, timelimt, progress, timelimt_state, 0, ROT90, "Chuo Co. Ltd", "Progress", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp
index 5c782878f65..39a502f1af3 100644
--- a/src/mame/drivers/timeplt.cpp
+++ b/src/mame/drivers/timeplt.cpp
@@ -424,7 +424,7 @@ void timeplt_state::machine_reset()
m_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( timeplt, timeplt_state )
+static MACHINE_CONFIG_START( timeplt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/3/2) /* not confirmed, but common for Konami games of the era */
@@ -674,12 +674,12 @@ ROM_END
*
*************************************/
-GAME( 1982, timeplt, 0, timeplt, timeplt, driver_device, 0, ROT90, "Konami", "Time Pilot", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, timepltc, timeplt, timeplt, timeplt, driver_device, 0, ROT90, "Konami (Centuri license)", "Time Pilot (Centuri)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, timeplta, timeplt, timeplt, timeplt, driver_device, 0, ROT90, "Konami (Atari license)", "Time Pilot (Atari)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, spaceplt, timeplt, timeplt, timeplt, driver_device, 0, ROT90, "bootleg", "Space Pilot", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, timeplt, 0, timeplt, timeplt, timeplt_state, 0, ROT90, "Konami", "Time Pilot", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, timepltc, timeplt, timeplt, timeplt, timeplt_state, 0, ROT90, "Konami (Centuri license)", "Time Pilot (Centuri)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, timeplta, timeplt, timeplt, timeplt, timeplt_state, 0, ROT90, "Konami (Atari license)", "Time Pilot (Atari)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, spaceplt, timeplt, timeplt, timeplt, timeplt_state, 0, ROT90, "bootleg", "Space Pilot", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, psurge, 0, psurge, psurge, driver_device, 0, ROT270, "Vision Electronics", "Power Surge", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, psurge, 0, psurge, psurge, timeplt_state, 0, ROT270, "Vision Electronics", "Power Surge", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, chkun, 0, chkun, chkun, driver_device, 0, ROT90, "Peni", "Chance Kun (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1987, bikkuric, 0, bikkuric,bikkuric, driver_device,0, ROT90, "Peni", "Bikkuri Card (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, chkun, 0, chkun, chkun, timeplt_state, 0, ROT90, "Peni", "Chance Kun (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1987, bikkuric, 0, bikkuric, bikkuric, timeplt_state, 0, ROT90, "Peni", "Bikkuri Card (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp
index de68294d241..dfec6fecc3d 100644
--- a/src/mame/drivers/timetrv.cpp
+++ b/src/mame/drivers/timetrv.cpp
@@ -150,7 +150,7 @@ INTERRUPT_GEN_MEMBER(timetrv_state::ld_irq)
device.execute().set_input_line_and_vector(0,HOLD_LINE,0x48/4); //ld irq
}
-static MACHINE_CONFIG_START( timetrv, timetrv_state )
+static MACHINE_CONFIG_START( timetrv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I80188,20000000) //???
@@ -194,5 +194,5 @@ ROM_START( timetrv2 )
DISK_IMAGE_READONLY( "timetrv", 0, NO_DUMP )
ROM_END
-GAME( 1991, timetrv, 0, timetrv, timetrv, driver_device, 0, ROT0, "Virtual Image Productions (Sega license)", "Time Traveler (set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1991, timetrv2, timetrv, timetrv, timetrv, driver_device, 0, ROT0, "Virtual Image Productions (Sega license)", "Time Traveler (set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // Europe?
+GAME( 1991, timetrv, 0, timetrv, timetrv, timetrv_state, 0, ROT0, "Virtual Image Productions (Sega license)", "Time Traveler (set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1991, timetrv2, timetrv, timetrv, timetrv, timetrv_state, 0, ROT0, "Virtual Image Productions (Sega license)", "Time Traveler (set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // Europe?
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index 5209008003c..e3b905f193c 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -1195,7 +1195,7 @@ static MACHINE_CONFIG_FRAGMENT( tms5110_route )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( snmath, tispeak_state )
+static MACHINE_CONFIG_START( snmath )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0270, MASTER_CLOCK/2)
@@ -1292,7 +1292,7 @@ static MACHINE_CONFIG_DERIVED( lantutor, snmath )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( snspellc, tispeak_state )
+static MACHINE_CONFIG_START( snspellc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, MASTER_CLOCK/2)
@@ -1325,7 +1325,7 @@ static MACHINE_CONFIG_DERIVED( snspellcuk, snspellc )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vocaid, tispeak_state )
+static MACHINE_CONFIG_START( vocaid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1100, MASTER_CLOCK/2)
@@ -1356,7 +1356,7 @@ static MACHINE_CONFIG_DERIVED( tntell, vocaid )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( k28m2, tispeak_state )
+static MACHINE_CONFIG_START( k28m2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS1400, MASTER_CLOCK/2)
@@ -1739,34 +1739,34 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME, FLAGS
COMP( 1979, snspell, 0, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (US, 1979 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1978, snspellp, snspell, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (US, patent)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1978, snspellp, snspell, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (US, patent)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
COMP( 1980, snspellub, snspell, 0, sns_tmc0281d, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (US, 1980 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
COMP( 1978, snspellua, snspell, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (US, 1978 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // incomplete dump, using 1979 MCU ROM instead
COMP( 1978, snspelluk, snspell, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (UK, 1978 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) // "
COMP( 1981, snspelluka, snspell, 0, sns_cd2801, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (UK, 1981 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1979, snspelljp, snspell, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1980, snspellfr, snspell, 0, sns_cd2801, snspellfr, tispeak_state, snspell, "Texas Instruments", "La Dictee Magique (France)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1982, snspellit, snspell, 0, sns_cd2801_m, snspellit, tispeak_state, snspell, "Texas Instruments", "Grillo Parlante (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1979, snspelljp, snspell, 0, sns_tmc0281, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1980, snspellfr, snspell, 0, sns_cd2801, snspellfr, tispeak_state, snspell, "Texas Instruments", "La Dictee Magique (France)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1982, snspellit, snspell, 0, sns_cd2801_m, snspellit, tispeak_state, snspell, "Texas Instruments", "Grillo Parlante (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
COMP( 1981, snspellc, 0, 0, snspellc, snspellc, tispeak_state, snspell, "Texas Instruments", "Speak & Spell Compact (US, 1981 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
COMP( 1982, snspellca, snspellc, 0, snspellc, snspellc, tispeak_state, snspell, "Texas Instruments", "Speak & Spell Compact (US, 1982 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1982, snspellcuk, snspellc, 0, snspellcuk, snspellcuk, tispeak_state, snspell, "Texas Instruments", "Speak & Write (UK)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1982, snspellcuk, snspellc, 0, snspellcuk, snspellcuk, tispeak_state, snspell, "Texas Instruments", "Speak & Write (UK)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1980, snmath, 0, 0, snmath, snmath, driver_device, 0, "Texas Instruments", "Speak & Math (US, 1980 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1986, snmatha, snmath, 0, snmath, snmath, driver_device, 0, "Texas Instruments", "Speak & Math (US, 1986 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1980, snmathp, snmath, 0, snmath, snmath, driver_device, 0, "Texas Instruments", "Speak & Math (US, patent)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IS_INCOMPLETE )
+COMP( 1980, snmath, 0, 0, snmath, snmath, tispeak_state, 0, "Texas Instruments", "Speak & Math (US, 1980 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1986, snmatha, snmath, 0, snmath, snmath, tispeak_state, 0, "Texas Instruments", "Speak & Math (US, 1986 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1980, snmathp, snmath, 0, snmath, snmath, tispeak_state, 0, "Texas Instruments", "Speak & Math (US, patent)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IS_INCOMPLETE )
COMP( 1980, snread, 0, 0, snread, snread, tispeak_state, snspell, "Texas Instruments", "Speak & Read (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
COMP( 1979, lantutor, 0, 0, lantutor, lantutor, tispeak_state, lantutor, "Texas Instruments", "Language Tutor (patent)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-COMP( 1981, tntell, 0, 0, tntell, tntell, tispeak_state, tntell, "Texas Instruments", "Touch & Tell (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK | MACHINE_REQUIRES_ARTWORK )
+COMP( 1981, tntell, 0, 0, tntell, tntell, tispeak_state, tntell, "Texas Instruments", "Touch & Tell (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK | MACHINE_REQUIRES_ARTWORK )
COMP( 1980, tntellp, tntell, 0, tntell, tntell, tispeak_state, tntell, "Texas Instruments", "Touch & Tell (US, patent)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING )
-COMP( 1981, tntelluk, tntell, 0, tntell, tntell, tispeak_state, tntell, "Texas Instruments", "Touch & Tell (UK)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK | MACHINE_REQUIRES_ARTWORK )
+COMP( 1981, tntelluk, tntell, 0, tntell, tntell, tispeak_state, tntell, "Texas Instruments", "Touch & Tell (UK)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK | MACHINE_REQUIRES_ARTWORK )
COMP( 1981, tntellfr, tntell, 0, tntell, tntell, tispeak_state, tntell, "Texas Instruments", "Le Livre Magique (France)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_CLICKABLE_ARTWORK | MACHINE_REQUIRES_ARTWORK )
-COMP( 1982, vocaid, 0, 0, vocaid, tntell, driver_device, 0, "Texas Instruments", "Vocaid", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_REQUIRES_ARTWORK )
+COMP( 1982, vocaid, 0, 0, vocaid, tntell, tispeak_state, 0, "Texas Instruments", "Vocaid", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_REQUIRES_ARTWORK )
COMP( 1985, k28m2, 0, 0, k28m2, k28m2, tispeak_state, snspell, "Tiger Electronics", "K28: Talking Learning Computer (model 7-232)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp
index f4c212e1d2e..851af4b561b 100644
--- a/src/mame/drivers/tispellb.cpp
+++ b/src/mame/drivers/tispellb.cpp
@@ -342,7 +342,7 @@ INPUT_PORTS_END
***************************************************************************/
-static MACHINE_CONFIG_START( rev1, tispellb_state )
+static MACHINE_CONFIG_START( rev1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0270, 350000) // approximation
@@ -366,7 +366,7 @@ static MACHINE_CONFIG_START( rev1, tispellb_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rev2, tispellb_state )
+static MACHINE_CONFIG_START( rev2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", TMS0270, 350000) // approximation
@@ -451,8 +451,8 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY, FULLNAME, FLAGS */
-COMP( 1978, spellb, 0, 0, rev1, spellb, driver_device, 0, "Texas Instruments", "Spelling B (1978 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
-COMP( 1979, spellb79, spellb, 0, rev2, spellb, driver_device, 0, "Texas Instruments", "Spelling B (1979 version)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, spellb, 0, 0, rev1, spellb, tispellb_state, 0, "Texas Instruments", "Spelling B (1978 version)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+COMP( 1979, spellb79, spellb, 0, rev2, spellb, tispellb_state, 0, "Texas Instruments", "Spelling B (1979 version)", MACHINE_SUPPORTS_SAVE )
-COMP( 1979, mrchalgr, 0, 0, rev2, mrchalgr, driver_device, 0, "Texas Instruments", "Mr. Challenger", MACHINE_SUPPORTS_SAVE )
+COMP( 1979, mrchalgr, 0, 0, rev2, mrchalgr, tispellb_state, 0, "Texas Instruments", "Mr. Challenger", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index 1f8b60f8853..cdec166af41 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -561,7 +561,7 @@ static INPUT_PORTS_START( tk2000 )
PORT_CONFSETTING(0x03, "Amber")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tk2000, tk2000_state )
+static MACHINE_CONFIG_START( tk2000 )
/* basic machine hardware */
MCFG_CPU_ADD(A2_CPU_TAG, M6502, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
MCFG_CPU_PROGRAM_MAP(apple2_map)
@@ -610,5 +610,5 @@ ROM_START(tk2000)
ROM_LOAD( "tk2000.rom", 0x000000, 0x004000, CRC(dfdbacc3) SHA1(bb37844c31616046630868a4399ee3d55d6df277) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1984, tk2000, 0, 0, tk2000, tk2000, driver_device, 0, "Microdigital", "TK2000", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT INIT COMPANY FULLNAME */
+COMP( 1984, tk2000, 0, 0, tk2000, tk2000, tk2000_state, 0, "Microdigital", "TK2000", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp
index ddb0ee2121e..0e9424e0c88 100644
--- a/src/mame/drivers/tk80.cpp
+++ b/src/mame/drivers/tk80.cpp
@@ -248,7 +248,7 @@ WRITE8_MEMBER( tk80_state::mikrolab_serial_w )
m_ppi_portc = data;
}
-static MACHINE_CONFIG_START( tk80, tk80_state )
+static MACHINE_CONFIG_START( tk80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz) // 18.432 / 9
MCFG_CPU_PROGRAM_MAP(tk80_mem)
@@ -277,7 +277,7 @@ static MACHINE_CONFIG_DERIVED( mikrolab, tk80 )
MCFG_I8255_OUT_PORTC_CB(WRITE8(tk80_state, mikrolab_serial_w))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nd80z, tk80_state )
+static MACHINE_CONFIG_START( nd80z )
MCFG_CPU_ADD("maincpu", Z80, XTAL_1MHz) // Sharp LH0080A, can't see writing on xtal
MCFG_CPU_PROGRAM_MAP(tk85_mem)
MCFG_CPU_IO_MAP(nd80z_io)
@@ -339,9 +339,9 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1976, tk80, 0, 0, tk80, tk80, driver_device, 0, "NEC", "TK-80", MACHINE_NO_SOUND_HW)
-COMP( 1980, nectk85, tk80, 0, tk85, tk80, driver_device, 0, "NEC", "TK-85", MACHINE_NO_SOUND_HW)
-COMP( 19??, nd80z, tk80, 0, nd80z, tk80, driver_device, 0, "Chunichi", "ND-80Z", MACHINE_NO_SOUND_HW)
-COMP( 19??, mikrolab, tk80, 0, mikrolab, mikrolab, driver_device, 0, "<unknown>", "Mikrolab KR580IK80", MACHINE_NO_SOUND_HW)
-COMP( 19??, ics8080, tk80, 0, ics8080, ics8080, driver_device, 0, "<unknown>", "ICS8080", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1976, tk80, 0, 0, tk80, tk80, tk80_state, 0, "NEC", "TK-80", MACHINE_NO_SOUND_HW )
+COMP( 1980, nectk85, tk80, 0, tk85, tk80, tk80_state, 0, "NEC", "TK-85", MACHINE_NO_SOUND_HW )
+COMP( 19??, nd80z, tk80, 0, nd80z, tk80, tk80_state, 0, "Chunichi", "ND-80Z", MACHINE_NO_SOUND_HW )
+COMP( 19??, mikrolab, tk80, 0, mikrolab, mikrolab, tk80_state, 0, "<unknown>", "Mikrolab KR580IK80", MACHINE_NO_SOUND_HW )
+COMP( 19??, ics8080, tk80, 0, ics8080, ics8080, tk80_state, 0, "<unknown>", "ICS8080", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp
index 0677dc63199..7176dd2f059 100644
--- a/src/mame/drivers/tk80bs.cpp
+++ b/src/mame/drivers/tk80bs.cpp
@@ -43,7 +43,7 @@ public:
DECLARE_READ8_MEMBER(ppi_custom_r);
DECLARE_WRITE8_MEMBER(ppi_custom_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(port_a_r);
DECLARE_READ8_MEMBER(port_b_r);
uint32_t screen_update_tk80bs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -142,7 +142,7 @@ READ8_MEMBER( tk80bs_state::port_b_r )
return 0;
}
-WRITE8_MEMBER( tk80bs_state::kbd_put )
+void tk80bs_state::kbd_put(u8 data)
{
data &= 0x7f;
if (data > 0x5f) data-=0x20;
@@ -166,7 +166,7 @@ static GFXDECODE_START( tk80bs )
GFXDECODE_END
-static MACHINE_CONFIG_START( tk80bs, tk80bs_state )
+static MACHINE_CONFIG_START( tk80bs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_1MHz) //unknown clock
MCFG_CPU_PROGRAM_MAP(tk80bs_mem)
@@ -189,7 +189,7 @@ static MACHINE_CONFIG_START( tk80bs, tk80bs_state )
MCFG_I8255_IN_PORTB_CB(READ8(tk80bs_state, port_b_r))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(tk80bs_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(tk80bs_state, kbd_put))
MACHINE_CONFIG_END
@@ -220,5 +220,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, tk80bs, tk80, 0, tk80bs, tk80bs, driver_device, 0, "NEC", "TK-80BS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, tk80bs, tk80, 0, tk80bs, tk80bs, tk80bs_state, 0, "NEC", "TK-80BS", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp
index 574070862e0..f78c0cc26c4 100644
--- a/src/mame/drivers/tm990189.cpp
+++ b/src/mame/drivers/tm990189.cpp
@@ -316,7 +316,7 @@ WRITE8_MEMBER( tm990189_state::sys9901_interrupt_callback )
READ8_MEMBER( tm990189_state::sys9901_r )
{
uint8_t data = 0;
- if (offset == TMS9901_CB_INT7)
+ if (offset == tms9901_device::CB_INT7)
{
static const char *const keynames[] = { "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8" };
@@ -456,11 +456,11 @@ protected:
virtual void device_start() override;
};
-const device_type TM990_189_RS232 = device_creator<tm990_189_rs232_image_device>;
+DEFINE_DEVICE_TYPE(TM990_189_RS232, tm990_189_rs232_image_device, "tm990_189_rs232_image", "TM990/189 RS232 port")
tm990_189_rs232_image_device::tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TM990_189_RS232, "TM990/189 RS232 port", tag, owner, clock, "tm990_189_rs232_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, TM990_189_RS232, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -626,7 +626,7 @@ WRITE8_MEMBER( tm990189_state::video_joy_w )
// user tms9901 setup
static const tms9901_interface usr9901reset_param =
{
- TMS9901_INT1 | TMS9901_INT2 | TMS9901_INT3 | TMS9901_INT4 | TMS9901_INT5 | TMS9901_INT6, // only input pins whose state is always known
+ tms9901_device::INT1 | tms9901_device::INT2 | tms9901_device::INT3 | tms9901_device::INT4 | tms9901_device::INT5 | tms9901_device::INT6, // only input pins whose state is always known
// Read handler. Covers all input lines (see tms9901.h)
DEVCB_NOOP,
@@ -803,7 +803,7 @@ static ADDRESS_MAP_START( tm990_189_cru_map, AS_IO, 8, tm990189_state )
AM_RANGE(0x0400, 0x05ff) AM_DEVWRITE("tms9902", tms9902_device, cruwrite) /* optional tms9902 */
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( tm990_189, tm990189_state )
+static MACHINE_CONFIG_START( tm990_189 )
/* basic machine hardware */
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_memmap, tm990_189_cru_map)
MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(tm990189_state, external_operation) )
@@ -860,7 +860,7 @@ static MACHINE_CONFIG_START( tm990_189, tm990189_state )
MCFG_TIMER_START_DELAY(attotime::from_msec(150))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tm990_189_v, tm990189_state )
+static MACHINE_CONFIG_START( tm990_189_v )
/* basic machine hardware */
MCFG_TMS99xx_ADD("maincpu", TMS9980A, 2000000, tm990_189_v_memmap, tm990_189_cru_map)
MCFG_TMS99xx_EXTOP_HANDLER( WRITE8(tm990189_state, external_operation) )
@@ -1042,6 +1042,6 @@ static INPUT_PORTS_START(tm990_189)
PORT_BIT( 0x3ff, 0x1aa, IPT_AD_STICK_Y) PORT_SENSITIVITY(JOYSTICK_SENSITIVITY) PORT_KEYDELTA(JOYSTICK_DELTA) PORT_MINMAX(0xd2,0x282 ) PORT_PLAYER(2) PORT_REVERSE
INPUT_PORTS_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1978, 990189, 0, 0, tm990_189, tm990_189, driver_device, 0, "Texas Instruments", "TM 990/189 University Board microcomputer" , 0)
-COMP( 1980, 990189v, 990189, 0, tm990_189_v, tm990_189, driver_device, 0, "Texas Instruments", "TM 990/189 University Board microcomputer with Video Board Interface" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1978, 990189, 0, 0, tm990_189, tm990_189, tm990189_state, 0, "Texas Instruments", "TM 990/189 University Board microcomputer", 0 )
+COMP( 1980, 990189v, 990189, 0, tm990_189_v, tm990_189, tm990189_state, 0, "Texas Instruments", "TM 990/189 University Board microcomputer with Video Board Interface", 0 )
diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp
index d14f3ab8881..ec1fa4f6512 100644
--- a/src/mame/drivers/tmaster.cpp
+++ b/src/mame/drivers/tmaster.cpp
@@ -358,7 +358,7 @@ int tmaster_compute_addr(uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high)
return (reg_low & 0xff) | ((reg_mid & 0x1ff) << 8) | (reg_high << 17);
}
-static MACHINE_CONFIG_START( tm, tmaster_state )
+static MACHINE_CONFIG_START( tm )
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2) /* 12MHz */
MCFG_CPU_PROGRAM_MAP(tmaster_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmaster_state, scanline_interrupt, "screen", 0, 1)
@@ -390,7 +390,7 @@ static MACHINE_CONFIG_START( tm, tmaster_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 16, OKIM6295_PIN7_HIGH) /* 1.5Mhz? clock frequency & pin 7 not verified */
+ MCFG_OKIM6295_ADD("oki", XTAL_24MHz / 16, PIN7_HIGH) /* 1.5Mhz? clock frequency & pin 7 not verified */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1135,31 +1135,31 @@ ROM_START( tm8k902 )
ROM_LOAD( "tm8k_sound.u8", 0x00000, 0x100000, CRC(c6070a60) SHA1(2dc20bf2217a36374b5a691133ad43f53dbe29ca) ) /* Mask rom labeled 5341-16513-03 U8 SOUND */
ROM_END
-GAME( 1996, tm, 0, tm, tm, driver_device, 0, ROT0, "Midway Games Inc. / CES Inc.", "Touchmaster (v3.00 Euro)", 0 )
-GAME( 1996, tmdo, tm, tm, tm, driver_device, 0, ROT0, "Midway Games Inc. / CES Inc.", "Touchmaster (v2.2-01 Standard)", 0 )
-GAME( 1996, tm2k, 0, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 Plus (v4.63 Standard)", 0 )
-GAME( 1996, tm2ka, tm2k, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 (v4.02 Standard)", 0 )
-GAME( 1996, tm2kb, tm2k, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 (v4.00 Standard)", 0 )
-GAME( 1996, tm2kspeval, tm2k, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 (v4.XX3 Spanish Evaluation)", 0 )
-GAME( 1997, tm3k, 0, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.02 Standard)", 0 )
-GAME( 1997, tm3ksp, tm3k, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.02 Spanish)", 0 )
-GAME( 1997, tm3ka, tm3k, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.01 Standard)", 0 )
-GAME( 1997, tm3keval, tm3k, tm, tm2k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.XX Standard AMOA Evaluation)", 0 )
-GAME( 1998, tm4k, 0, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.03 Standard)", 0 )
-GAME( 1998, tm4knj, tm4k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.03 New Jersey)", 0 )
-GAME( 1998, tm4ka, tm4k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.02 Standard)", 0 )
-GAME( 1998, tm4kca, tm4k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.02 California)", 0 )
-GAME( 1998, tm4kb, tm4k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.01 Standard)", 0 )
-GAME( 1998, tm4kmn, tm4k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.01 Minnesota)", 0 )
-GAME( 1998, tm5k, 0, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.10 Standard)", 0 )
-GAME( 1998, tm5kca, tm5k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.10 California)", 0 )
-GAME( 1998, tm5kmn, tm5k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.10 Minnesota)", 0 )
-GAME( 1998, tm5ka, tm5k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.01 Standard)", 0 )
-GAME( 1999, tm7k, 0, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.04 Standard)", 0 )
-GAME( 1999, tm7knj, tm7k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.05 New Jersey)", 0 )
-GAME( 1999, tm7kmn, tm7k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.04 Minnesota)", 0 )
-GAME( 1999, tm7ka, tm7k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.00 Standard)", 0 )
-GAME( 1999, tm7kmna, tm7k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.00 Minnesota)", 0 )
-GAME( 1999, tm7keval, tm7k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.1X ASI Standard Evaluation)", 0 )
-GAME( 2000, tm8k, 0, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 8000 (v9.04 Standard)", 0 )
-GAME( 2000, tm8k902, tm8k, tmds1204, tm4k, driver_device, 0, ROT0, "Midway Games Inc.", "Touchmaster 8000 (v9.02 Standard)", 0 )
+GAME( 1996, tm, 0, tm, tm, tmaster_state, 0, ROT0, "Midway Games Inc. / CES Inc.", "Touchmaster (v3.00 Euro)", 0 )
+GAME( 1996, tmdo, tm, tm, tm, tmaster_state, 0, ROT0, "Midway Games Inc. / CES Inc.", "Touchmaster (v2.2-01 Standard)", 0 )
+GAME( 1996, tm2k, 0, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 Plus (v4.63 Standard)", 0 )
+GAME( 1996, tm2ka, tm2k, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 (v4.02 Standard)", 0 )
+GAME( 1996, tm2kb, tm2k, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 (v4.00 Standard)", 0 )
+GAME( 1996, tm2kspeval, tm2k, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 2000 (v4.XX3 Spanish Evaluation)", 0 )
+GAME( 1997, tm3k, 0, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.02 Standard)", 0 )
+GAME( 1997, tm3ksp, tm3k, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.02 Spanish)", 0 )
+GAME( 1997, tm3ka, tm3k, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.01 Standard)", 0 )
+GAME( 1997, tm3keval, tm3k, tm, tm2k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 3000 (v5.XX Standard AMOA Evaluation)", 0 )
+GAME( 1998, tm4k, 0, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.03 Standard)", 0 )
+GAME( 1998, tm4knj, tm4k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.03 New Jersey)", 0 )
+GAME( 1998, tm4ka, tm4k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.02 Standard)", 0 )
+GAME( 1998, tm4kca, tm4k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.02 California)", 0 )
+GAME( 1998, tm4kb, tm4k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.01 Standard)", 0 )
+GAME( 1998, tm4kmn, tm4k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 4000 (v6.01 Minnesota)", 0 )
+GAME( 1998, tm5k, 0, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.10 Standard)", 0 )
+GAME( 1998, tm5kca, tm5k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.10 California)", 0 )
+GAME( 1998, tm5kmn, tm5k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.10 Minnesota)", 0 )
+GAME( 1998, tm5ka, tm5k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 5000 (v7.01 Standard)", 0 )
+GAME( 1999, tm7k, 0, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.04 Standard)", 0 )
+GAME( 1999, tm7knj, tm7k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.05 New Jersey)", 0 )
+GAME( 1999, tm7kmn, tm7k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.04 Minnesota)", 0 )
+GAME( 1999, tm7ka, tm7k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.00 Standard)", 0 )
+GAME( 1999, tm7kmna, tm7k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.00 Minnesota)", 0 )
+GAME( 1999, tm7keval, tm7k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 7000 (v8.1X ASI Standard Evaluation)", 0 )
+GAME( 2000, tm8k, 0, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 8000 (v9.04 Standard)", 0 )
+GAME( 2000, tm8k902, tm8k, tmds1204, tm4k, tmaster_state, 0, ROT0, "Midway Games Inc.", "Touchmaster 8000 (v9.02 Standard)", 0 )
diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp
index ccb0e237740..98055afd399 100644
--- a/src/mame/drivers/tmc1800.cpp
+++ b/src/mame/drivers/tmc1800.cpp
@@ -704,7 +704,7 @@ QUICKLOAD_LOAD_MEMBER( tmc1800_base_state, tmc1800 )
return image_init_result::PASS;
}
-static MACHINE_CONFIG_START( tmc1800, tmc1800_state )
+static MACHINE_CONFIG_START( tmc1800 )
// basic system hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
MCFG_CPU_PROGRAM_MAP(tmc1800_map)
@@ -736,7 +736,7 @@ static MACHINE_CONFIG_START( tmc1800, tmc1800_state )
MCFG_RAM_EXTRA_OPTIONS("4K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( osc1000b, osc1000b_state )
+static MACHINE_CONFIG_START( osc1000b )
// basic system hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
MCFG_CPU_PROGRAM_MAP(osc1000b_map)
@@ -767,7 +767,7 @@ static MACHINE_CONFIG_START( osc1000b, osc1000b_state )
MCFG_RAM_EXTRA_OPTIONS("4K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tmc2000, tmc2000_state )
+static MACHINE_CONFIG_START( tmc2000 )
// basic system hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
MCFG_CPU_PROGRAM_MAP(tmc2000_map)
@@ -793,7 +793,7 @@ static MACHINE_CONFIG_START( tmc2000, tmc2000_state )
MCFG_RAM_EXTRA_OPTIONS("16K,32K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( nano, nano_state )
+static MACHINE_CONFIG_START( nano )
// basic system hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
MCFG_CPU_PROGRAM_MAP(nano_map)
@@ -871,8 +871,8 @@ DRIVER_INIT_MEMBER(tmc1800_state,tmc1800)
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1977, tmc1800, 0, 0, tmc1800, tmc1800, tmc1800_state, tmc1800, "Telercas Oy", "Telmac 1800", MACHINE_NOT_WORKING )
-COMP( 1977, osc1000b, tmc1800,0, osc1000b, tmc1800, driver_device, 0, "OSCOM Oy", "OSCOM 1000B", MACHINE_NOT_WORKING )
-COMP( 1980, tmc2000, 0, 0, tmc2000, tmc2000, driver_device, 0, "Telercas Oy", "Telmac 2000", MACHINE_SUPPORTS_SAVE )
-COMP( 1980, nano, tmc2000,0, nano, nano, driver_device, 0, "OSCOM Oy", "OSCOM Nano", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, tmc1800, 0, 0, tmc1800, tmc1800, tmc1800_state, tmc1800, "Telercas Oy", "Telmac 1800", MACHINE_NOT_WORKING )
+COMP( 1977, osc1000b, tmc1800, 0, osc1000b, tmc1800, osc1000b_state, 0, "OSCOM Oy", "OSCOM 1000B", MACHINE_NOT_WORKING )
+COMP( 1980, tmc2000, 0, 0, tmc2000, tmc2000, tmc2000_state, 0, "Telercas Oy", "Telmac 2000", MACHINE_SUPPORTS_SAVE )
+COMP( 1980, nano, tmc2000, 0, nano, nano, nano_state, 0, "OSCOM Oy", "OSCOM Nano", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp
index d59a58bb42a..9ae0dd5b707 100644
--- a/src/mame/drivers/tmc2000e.cpp
+++ b/src/mame/drivers/tmc2000e.cpp
@@ -276,7 +276,7 @@ void tmc2000e_state::machine_reset()
/* Machine Drivers */
-static MACHINE_CONFIG_START( tmc2000e, tmc2000e_state )
+static MACHINE_CONFIG_START( tmc2000e )
// basic system hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_1_75MHz)
MCFG_CPU_PROGRAM_MAP(tmc2000e_map)
@@ -318,5 +318,5 @@ ROM_START( tmc2000e )
ROM_LOAD( "4", 0xd800, 0x0800, NO_DUMP )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME
-COMP( 1980, tmc2000e, 0, 0, tmc2000e, tmc2000e, driver_device, 0, "Telercas Oy", "Telmac 2000E", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME STATE
+COMP( 1980, tmc2000e, 0, 0, tmc2000e, tmc2000e, tmc2000e_state, 0, "Telercas Oy", "Telmac 2000E", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp
index a0f940a1006..85d59466181 100644
--- a/src/mame/drivers/tmc600.cpp
+++ b/src/mame/drivers/tmc600.cpp
@@ -243,7 +243,7 @@ void tmc600_state::machine_start()
/* Machine Drivers */
-static MACHINE_CONFIG_START( tmc600, tmc600_state )
+static MACHINE_CONFIG_START( tmc600 )
// basic system hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, 3579545) // ???
MCFG_CPU_PROGRAM_MAP(tmc600_map)
@@ -300,6 +300,6 @@ ROM_START( tmc600s2 )
ROM_END
/* System Drivers */
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME
-//COMP( 1982, tmc600s1, 0, 0, tmc600, tmc600, driver_device, 0, "Telercas Oy", "Telmac TMC-600 (Sarja I)", MACHINE_NOT_WORKING )
-COMP( 1982, tmc600s2, 0, 0, tmc600, tmc600, driver_device, 0, "Telercas Oy", "Telmac TMC-600 (Sarja II)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+//COMP( 1982, tmc600s1, 0, 0, tmc600, tmc600, tmc600_state, 0, "Telercas Oy", "Telmac TMC-600 (Sarja I)", MACHINE_NOT_WORKING )
+COMP( 1982, tmc600s2, 0, 0, tmc600, tmc600, tmc600_state, 0, "Telercas Oy", "Telmac TMC-600 (Sarja II)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp
index 76f82812c5a..103a92a22ba 100644
--- a/src/mame/drivers/tmmjprd.cpp
+++ b/src/mame/drivers/tmmjprd.cpp
@@ -763,7 +763,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(tmmjprd_state::scanline)
}
-static MACHINE_CONFIG_START( tmmjprd, tmmjprd_state )
+static MACHINE_CONFIG_START( tmmjprd )
MCFG_CPU_ADD("maincpu",M68EC020,24000000) /* 24 MHz */
MCFG_CPU_PROGRAM_MAP(tmmjprd_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", tmmjprd_state, scanline, "lscreen", 0, 1)
@@ -886,5 +886,5 @@ ROM_START( tmpdoki )
ROM_END
-GAME( 1997, tmmjprd, 0, tmmjprd, tmmjprd, driver_device, 0, ROT0, "Media / Sonnet", "Tokimeki Mahjong Paradise - Dear My Love", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, tmpdoki, tmmjprd, tmpdoki, tmmjprd, driver_device, 0, ROT0, "Media / Sonnet", "Tokimeki Mahjong Paradise - Doki Doki Hen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // missing gfx due to wrong roms?
+GAME( 1997, tmmjprd, 0, tmmjprd, tmmjprd, tmmjprd_state, 0, ROT0, "Media / Sonnet", "Tokimeki Mahjong Paradise - Dear My Love", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, tmpdoki, tmmjprd, tmpdoki, tmmjprd, tmmjprd_state, 0, ROT0, "Media / Sonnet", "Tokimeki Mahjong Paradise - Doki Doki Hen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // missing gfx due to wrong roms?
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index 48388318d2b..e351f646682 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -1892,7 +1892,7 @@ MACHINE_RESET_MEMBER(tmnt_state,common)
}
-static MACHINE_CONFIG_START( cuebrick, tmnt_state )
+static MACHINE_CONFIG_START( cuebrick )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000) /* 8 MHz */
@@ -1944,7 +1944,7 @@ static MACHINE_CONFIG_START( cuebrick, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mia, tmnt_state )
+static MACHINE_CONFIG_START( mia )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
@@ -2009,7 +2009,7 @@ MACHINE_RESET_MEMBER(tmnt_state,tmnt)
m_upd7759->reset_w(1);
}
-static MACHINE_CONFIG_START( tmnt, tmnt_state )
+static MACHINE_CONFIG_START( tmnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/3)
@@ -2076,7 +2076,7 @@ static MACHINE_CONFIG_START( tmnt, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( punkshot, tmnt_state )
+static MACHINE_CONFIG_START( punkshot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -2130,7 +2130,7 @@ static MACHINE_CONFIG_START( punkshot, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( lgtnfght, tmnt_state )
+static MACHINE_CONFIG_START( lgtnfght )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz/2)
@@ -2186,7 +2186,7 @@ static MACHINE_CONFIG_START( lgtnfght, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( blswhstl, tmnt_state )
+static MACHINE_CONFIG_START( blswhstl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
@@ -2264,7 +2264,7 @@ static GFXDECODE_START( glfgreat )
GFXDECODE_ENTRY( "zoom", 0, zoomlayout, 0x400, 16 )
GFXDECODE_END
-static MACHINE_CONFIG_START( glfgreat, tmnt_state )
+static MACHINE_CONFIG_START( glfgreat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
@@ -2330,7 +2330,7 @@ MACHINE_START_MEMBER(tmnt_state,prmrsocr)
membank("bank1")->configure_entries(0, 8, &ROM[0x10000], 0x4000);
}
-static MACHINE_CONFIG_START( prmrsocr, tmnt_state )
+static MACHINE_CONFIG_START( prmrsocr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* Confirmed */
@@ -2395,7 +2395,7 @@ static MACHINE_CONFIG_START( prmrsocr, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tmnt2, tmnt_state )
+static MACHINE_CONFIG_START( tmnt2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -2458,7 +2458,7 @@ static MACHINE_CONFIG_START( tmnt2, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ssriders, tmnt_state )
+static MACHINE_CONFIG_START( ssriders )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2)
@@ -2517,7 +2517,7 @@ static MACHINE_CONFIG_START( ssriders, tmnt_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( sunsetbl, tmnt_state )
+static MACHINE_CONFIG_START( sunsetbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz */
@@ -2558,12 +2558,12 @@ static MACHINE_CONFIG_START( sunsetbl, tmnt_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( thndrx2, tmnt_state )
+static MACHINE_CONFIG_START( thndrx2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz */
@@ -4200,69 +4200,69 @@ DRIVER_INIT_MEMBER(tmnt_state,cuebrick)
save_item(NAME(m_cuebrick_nvram));
}
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1989, cuebrick, 0, cuebrick, cuebrick, tmnt_state, cuebrick, ROT0, "Konami", "Cue Brick (World, version D)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, mia, 0, mia, mia, tmnt_state, mia, ROT0, "Konami", "M.I.A. - Missing in Action (version T)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, mia2, mia, mia, mia, tmnt_state, mia, ROT0, "Konami", "M.I.A. - Missing in Action (version S)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, tmnt, 0, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (World 4 Players, version X)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmntu, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (US 4 Players, version R)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmntua, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (US 4 Players, version J)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmntub, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (US 4 Players, version H)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmht, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 4 Players, version F)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmhta, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 4 Players, version S)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmhtb, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 4 Players, version ?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, tmntj, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Japan 4 Players, version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmnta, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Asia 4 Players, version ?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmht2p, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 2 Players, version U)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmht2pa, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 2 Players, version ?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, tmnt2pj, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Japan 2 Players, version 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, tmnt2po, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Oceania 2 Players, version ?)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1990, punkshot, 0, punkshot, punkshot, driver_device, 0, ROT0, "Konami", "Punk Shot (US 4 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, punkshot2, punkshot, punkshot, punksht2, driver_device, 0, ROT0, "Konami", "Punk Shot (US 2 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, punkshotj, punkshot, punkshot, punkshtj, driver_device, 0, ROT0, "Konami", "Punk Shot (Japan 2 Players)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1990, lgtnfght, 0, lgtnfght, lgtnfght, driver_device, 0, ROT90, "Konami", "Lightning Fighters (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, lgtnfghta, lgtnfght, lgtnfght, lgtnfght, driver_device, 0, ROT90, "Konami", "Lightning Fighters (Asia)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, lgtnfghtu, lgtnfght, lgtnfght, lgtnfght, driver_device, 0, ROT90, "Konami", "Lightning Fighters (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, trigon, lgtnfght, lgtnfght, trigon, driver_device, 0, ROT90, "Konami", "Trigon (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, blswhstl, 0, blswhstl, blswhstl, driver_device, 0, ROT90, "Konami", "Bells & Whistles (World, version L)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, blswhstla, blswhstl, blswhstl, blswhstl, driver_device, 0, ROT90, "Konami", "Bells & Whistles (Asia, version M)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, detatwin, blswhstl, blswhstl, blswhstl, driver_device, 0, ROT90, "Konami", "Detana!! Twin Bee (Japan, version J)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, glfgreat, 0, glfgreat, glfgreat, driver_device, 0, ROT0, "Konami", "Golfing Greats", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, glfgreatj, glfgreat, glfgreat, glfgreatj, driver_device, 0, ROT0, "Konami", "Golfing Greats (Japan)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, tmnt2, 0, tmnt2, ssridr4p, driver_device, 0, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver UAA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tmnt2a, tmnt2, tmnt2, ssrid4ps, driver_device, 0, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver ADA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tmht22pe, tmnt2, tmnt2, ssriders, driver_device, 0, ROT0, "Konami", "Teenage Mutant Hero Turtles - Turtles in Time (2 Players ver EBA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tmht24pe, tmnt2, tmnt2, ssridr4p, driver_device, 0, ROT0, "Konami", "Teenage Mutant Hero Turtles - Turtles in Time (4 Players ver EAA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, tmnt22pu, tmnt2, tmnt2, ssriders, driver_device, 0, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (2 Players ver UDA)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1993, qgakumon, 0, tmnt2, qgakumon, driver_device, 0, ROT0, "Konami", "Quiz Gakumon no Susume (Japan ver. JA2 Type L)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, ssriders, 0, ssriders, ssridr4p, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver EAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssriderseaa, ssriders, ssriders, ssridr4p, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersebd, ssriders, ssriders, ssriders, driver_device, 0, ROT0, "Konami", "Sunset Riders (2 Players ver EBD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersebc, ssriders, ssriders, ssriders, driver_device, 0, ROT0, "Konami", "Sunset Riders (2 Players ver EBC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersuda, ssriders, ssriders, ssrid4ps, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver UDA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersuac, ssriders, ssriders, ssridr4p, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver UAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersuab, ssriders, ssriders, ssridr4p, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersubc, ssriders, ssriders, ssriders, driver_device, 0, ROT0, "Konami", "Sunset Riders (2 Players ver UBC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersadd, ssriders, ssriders, ssrid4ps, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver ADD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersabd, ssriders, ssriders, ssriders, driver_device, 0, ROT0, "Konami", "Sunset Riders (2 Players ver ABD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersjad, ssriders, ssriders, ssridr4p, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver JAD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersjac, ssriders, ssriders, ssridr4p, driver_device, 0, ROT0, "Konami", "Sunset Riders (4 Players ver JAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersjbd, ssriders, ssriders, ssriders, driver_device, 0, ROT0, "Konami", "Sunset Riders (2 Players ver JBD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssridersb, ssriders, sunsetbl, sunsetbl, driver_device, 0, ROT0, "bootleg","Sunset Riders (bootleg 4 Players ver ADD)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ssriders2, ssriders, sunsetbl, sunsetbl, driver_device, 0, ROT0, "bootleg","Sunset Riders 2 (bootleg 4 Players ver ADD)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, thndrx2, 0, thndrx2, thndrx2, driver_device, 0, ROT0, "Konami", "Thunder Cross II (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, thndrx2a, thndrx2, thndrx2, thndrx2, driver_device, 0, ROT0, "Konami", "Thunder Cross II (Asia)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, thndrx2j, thndrx2, thndrx2, thndrx2, driver_device, 0, ROT0, "Konami", "Thunder Cross II (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1993, prmrsocr, 0, prmrsocr, prmrsocr, driver_device, 0, ROT0, "Konami", "Premier Soccer (ver EAB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, prmrsocrj, prmrsocr, prmrsocr, prmrsocr, driver_device, 0, ROT0, "Konami", "Premier Soccer (ver JAB)", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME,FLAGS
+GAME( 1989, cuebrick, 0, cuebrick, cuebrick, tmnt_state, cuebrick, ROT0, "Konami", "Cue Brick (World, version D)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, mia, 0, mia, mia, tmnt_state, mia, ROT0, "Konami", "M.I.A. - Missing in Action (version T)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, mia2, mia, mia, mia, tmnt_state, mia, ROT0, "Konami", "M.I.A. - Missing in Action (version S)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, tmnt, 0, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (World 4 Players, version X)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmntu, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (US 4 Players, version R)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmntua, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (US 4 Players, version J)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmntub, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (US 4 Players, version H)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmht, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 4 Players, version F)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmhta, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 4 Players, version S)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmhtb, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 4 Players, version ?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, tmntj, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Japan 4 Players, version 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmnta, tmnt, tmnt, tmnt, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Asia 4 Players, version ?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmht2p, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 2 Players, version U)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmht2pa, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Hero Turtles (UK 2 Players, version ?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, tmnt2pj, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Japan 2 Players, version 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tmnt2po, tmnt, tmnt, tmnt2p, tmnt_state, tmnt, ROT0, "Konami", "Teenage Mutant Ninja Turtles (Oceania 2 Players, version ?)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1990, punkshot, 0, punkshot, punkshot, tmnt_state, 0, ROT0, "Konami", "Punk Shot (US 4 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, punkshot2, punkshot, punkshot, punksht2, tmnt_state, 0, ROT0, "Konami", "Punk Shot (US 2 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, punkshotj, punkshot, punkshot, punkshtj, tmnt_state, 0, ROT0, "Konami", "Punk Shot (Japan 2 Players)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1990, lgtnfght, 0, lgtnfght, lgtnfght, tmnt_state, 0, ROT90, "Konami", "Lightning Fighters (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, lgtnfghta, lgtnfght, lgtnfght, lgtnfght, tmnt_state, 0, ROT90, "Konami", "Lightning Fighters (Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, lgtnfghtu, lgtnfght, lgtnfght, lgtnfght, tmnt_state, 0, ROT90, "Konami", "Lightning Fighters (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, trigon, lgtnfght, lgtnfght, trigon, tmnt_state, 0, ROT90, "Konami", "Trigon (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, blswhstl, 0, blswhstl, blswhstl, tmnt_state, 0, ROT90, "Konami", "Bells & Whistles (World, version L)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, blswhstla, blswhstl, blswhstl, blswhstl, tmnt_state, 0, ROT90, "Konami", "Bells & Whistles (Asia, version M)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, detatwin, blswhstl, blswhstl, blswhstl, tmnt_state, 0, ROT90, "Konami", "Detana!! Twin Bee (Japan, version J)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, glfgreat, 0, glfgreat, glfgreat, tmnt_state, 0, ROT0, "Konami", "Golfing Greats", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, glfgreatj, glfgreat, glfgreat, glfgreatj, tmnt_state, 0, ROT0, "Konami", "Golfing Greats (Japan)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, tmnt2, 0, tmnt2, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver UAA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tmnt2a, tmnt2, tmnt2, ssrid4ps, tmnt_state, 0, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (4 Players ver ADA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tmht22pe, tmnt2, tmnt2, ssriders, tmnt_state, 0, ROT0, "Konami", "Teenage Mutant Hero Turtles - Turtles in Time (2 Players ver EBA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tmht24pe, tmnt2, tmnt2, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Teenage Mutant Hero Turtles - Turtles in Time (4 Players ver EAA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, tmnt22pu, tmnt2, tmnt2, ssriders, tmnt_state, 0, ROT0, "Konami", "Teenage Mutant Ninja Turtles - Turtles in Time (2 Players ver UDA)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1993, qgakumon, 0, tmnt2, qgakumon, tmnt_state, 0, ROT0, "Konami", "Quiz Gakumon no Susume (Japan ver. JA2 Type L)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, ssriders, 0, ssriders, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver EAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssriderseaa, ssriders, ssriders, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver EAA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersebd, ssriders, ssriders, ssriders, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (2 Players ver EBD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersebc, ssriders, ssriders, ssriders, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (2 Players ver EBC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersuda, ssriders, ssriders, ssrid4ps, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver UDA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersuac, ssriders, ssriders, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver UAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersuab, ssriders, ssriders, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver UAB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersubc, ssriders, ssriders, ssriders, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (2 Players ver UBC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersadd, ssriders, ssriders, ssrid4ps, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver ADD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersabd, ssriders, ssriders, ssriders, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (2 Players ver ABD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersjad, ssriders, ssriders, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver JAD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersjac, ssriders, ssriders, ssridr4p, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (4 Players ver JAC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersjbd, ssriders, ssriders, ssriders, tmnt_state, 0, ROT0, "Konami", "Sunset Riders (2 Players ver JBD)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssridersb, ssriders, sunsetbl, sunsetbl, tmnt_state, 0, ROT0, "bootleg", "Sunset Riders (bootleg 4 Players ver ADD)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ssriders2, ssriders, sunsetbl, sunsetbl, tmnt_state, 0, ROT0, "bootleg", "Sunset Riders 2 (bootleg 4 Players ver ADD)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1991, thndrx2, 0, thndrx2, thndrx2, tmnt_state, 0, ROT0, "Konami", "Thunder Cross II (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, thndrx2a, thndrx2, thndrx2, thndrx2, tmnt_state, 0, ROT0, "Konami", "Thunder Cross II (Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, thndrx2j, thndrx2, thndrx2, thndrx2, tmnt_state, 0, ROT0, "Konami", "Thunder Cross II (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1993, prmrsocr, 0, prmrsocr, prmrsocr, tmnt_state, 0, ROT0, "Konami", "Premier Soccer (ver EAB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, prmrsocrj, prmrsocr, prmrsocr, prmrsocr, tmnt_state, 0, ROT0, "Konami", "Premier Soccer (ver JAB)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index 13beb6fadc4..e0ed52e640f 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -552,7 +552,7 @@ GFXDECODE_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( tmspoker, tmspoker_state )
+static MACHINE_CONFIG_START( tmspoker )
// CPU TMS9980A; no line connections
MCFG_TMS99xx_ADD("maincpu", TMS9980A, MASTER_CLOCK/4, tmspoker_map, tmspoker_cru_map)
@@ -642,5 +642,5 @@ DRIVER_INIT_MEMBER(tmspoker_state,bus)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 198?, tmspoker, 0, tmspoker, tmspoker, tmspoker_state, bus, ROT0, "<unknown>", "unknown TMS9980 Poker Game", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp
index ba141dc8b6a..cdfab3f772f 100644
--- a/src/mame/drivers/tnzs.cpp
+++ b/src/mame/drivers/tnzs.cpp
@@ -1506,7 +1506,7 @@ static GFXDECODE_START( insectx )
GFXDECODE_ENTRY( "gfx1", 0, insectx_charlayout, 0, 32 )
GFXDECODE_END
-static MACHINE_CONFIG_START( tnzs_base, tnzs_base_state )
+static MACHINE_CONFIG_START( tnzs_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz, verified on insectx, kageki, tnzsb */
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -1541,7 +1541,7 @@ static MACHINE_CONFIG_START( tnzs_base, tnzs_base_state )
MCFG_SPEAKER_STANDARD_MONO("speaker")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( tnzs, tnzs_base, tnzs_state )
+static MACHINE_CONFIG_DERIVED( tnzs, tnzs_base )
MCFG_CPU_ADD("mcu", I8742, 12000000/2) /* 400KHz ??? - Main board Crystal is 12MHz */
MCFG_MCS48_PORT_P1_IN_CB(READ8(tnzs_mcu_state, mcu_port1_r))
MCFG_MCS48_PORT_P2_IN_CB(READ8(tnzs_mcu_state, mcu_port2_r))
@@ -1564,7 +1564,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( tnzs, tnzs_base, tnzs_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.3)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( extrmatn, tnzs, extrmatn_state )
+static MACHINE_CONFIG_DERIVED( extrmatn, tnzs )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(prompal_main_map)
@@ -1578,7 +1578,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( extrmatn, tnzs, extrmatn_state )
MCFG_PALETTE_INIT_OWNER(tnzs_base_state, prompalette)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( arknoid2, extrmatn, arknoid2_state )
+static MACHINE_CONFIG_DERIVED( arknoid2, extrmatn )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_VBLANK_INT_DRIVER("screen", arknoid2_state, mcu_interrupt)
@@ -1590,7 +1590,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( arknoid2, extrmatn, arknoid2_state )
MCFG_DEVICE_DISABLE()
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( insectx, tnzs_base, insectx_state )
+static MACHINE_CONFIG_DERIVED( insectx, tnzs_base )
/* basic machine hardware */
MCFG_CPU_MODIFY("sub")
MCFG_CPU_PROGRAM_MAP(insectx_sub_map)
@@ -1606,7 +1606,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( insectx, tnzs_base, insectx_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( kageki, tnzs_base, kageki_state )
+static MACHINE_CONFIG_DERIVED( kageki, tnzs_base )
/* basic machine hardware */
MCFG_CPU_MODIFY("sub")
MCFG_CPU_PROGRAM_MAP(kageki_sub_map)
@@ -1626,7 +1626,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( kageki, tnzs_base, kageki_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( tnzsb, tnzs_base, tnzsb_state )
+static MACHINE_CONFIG_DERIVED( tnzsb, tnzs_base )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(tnzsb_main_map)
@@ -1654,7 +1654,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( tnzsb, tnzs_base, tnzsb_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( kabukiz, tnzsb, kabukiz_state )
+static MACHINE_CONFIG_DERIVED( kabukiz, tnzsb )
/* basic machine hardware */
MCFG_CPU_MODIFY("sub")
@@ -1674,7 +1674,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( kabukiz, tnzsb, kabukiz_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( jpopnics, tnzs_base, jpopnics_state )
+static MACHINE_CONFIG_DERIVED( jpopnics, tnzs_base )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(jpopnics_main_map)
@@ -2774,41 +2774,41 @@ ROM_END
// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1987, plumppop, 0, extrmatn, plumppop, driver_device, 0, ROT0, "Taito Corporation", "Plump Pop (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, jpopnics, 0, jpopnics, jpopnics, driver_device, 0, ROT0, "Nics", "Jumping Pop (Nics, Korean hack of Plump Pop)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1987, extrmatn, 0, extrmatn, extrmatn, driver_device, 0, ROT270, "Taito Corporation Japan", "Extermination (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, extrmatnu, extrmatn, extrmatn, extrmatn, driver_device, 0, ROT270, "Taito (World Games license)", "Extermination (US, World Games)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, extrmatnur,extrmatn, extrmatn, extrmatn, driver_device, 0, ROT270, "Taito America Corporation (Romstar license)", "Extermination (US, Romstar)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, extrmatnj, extrmatn, extrmatn, extrmatn, driver_device, 0, ROT270, "Taito Corporation", "Extermination (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1987, arknoid2, 0, arknoid2, arknoid2, driver_device, 0, ROT270, "Taito Corporation Japan", "Arkanoid - Revenge of DOH (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, arknoid2u, arknoid2, arknoid2, arknid2u, driver_device, 0, ROT270, "Taito America Corporation (Romstar license)", "Arkanoid - Revenge of DOH (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, arknoid2j, arknoid2, arknoid2, arknid2u, driver_device, 0, ROT270, "Taito Corporation", "Arkanoid - Revenge of DOH (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, arknoid2b, arknoid2, arknoid2, arknid2u, driver_device, 0, ROT270, "bootleg", "Arkanoid - Revenge of DOH (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1987, drtoppel, 0, extrmatn, drtoppel, driver_device, 0, ROT90, "Kaneko / Taito Corporation Japan", "Dr. Toppel's Adventure (World)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
-GAME( 1987, drtoppelu, drtoppel, extrmatn, drtopplu, driver_device, 0, ROT90, "Kaneko / Taito America Corporation", "Dr. Toppel's Adventure (US)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
-GAME( 1987, drtoppelj, drtoppel, extrmatn, drtopplu, driver_device, 0, ROT90, "Kaneko / Taito Corporation", "Dr. Toppel's Tankentai (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1988, kageki, 0, kageki, kageki, driver_device, 0, ROT90, "Kaneko / Taito America Corporation (Romstar license)", "Kageki (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kagekij, kageki, kageki, kagekij, driver_device, 0, ROT90, "Kaneko / Taito Corporation", "Kageki (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, kagekih, kageki, kageki, kageki, driver_device, 0, ROT90, "hack", "Kageki (hack)", MACHINE_SUPPORTS_SAVE ) // date is hacked at least, might also be a Japan set hacked to show english
-
-GAME( 1988, chukatai, 0, tnzs, chukatai, driver_device, 0, ROT0, "Taito Corporation Japan", "Chuka Taisen (World)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
-GAME( 1988, chukataiu, chukatai, tnzs, chukatau, driver_device, 0, ROT0, "Taito America Corporation", "Chuka Taisen (US)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
-GAME( 1988, chukataij, chukatai, tnzs, chukatau, driver_device, 0, ROT0, "Taito Corporation", "Chuka Taisen (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1988, tnzs, 0, tnzsb, tnzs, driver_device, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, new version) (newer PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tnzsj, tnzs, tnzsb, tnzsj, driver_device, 0, ROT0, "Taito Corporation", "The NewZealand Story (Japan, new version) (newer PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tnzso, tnzs, tnzs, tnzsop, driver_device, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, old version) (older PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tnzsjo, tnzs, tnzs, tnzsjo, driver_device, 0, ROT0, "Taito Corporation", "The NewZealand Story (Japan, old version) (older PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tnzsuo, tnzs, tnzs, tnzsjo, driver_device, 0, ROT0, "Taito America Corporation", "The NewZealand Story (US, old version) (older PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tnzsoa, tnzs, tnzs, tnzsop, driver_device, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, unknown version) (older PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, tnzsop, tnzs, tnzs, tnzsop, driver_device, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, prototype) (older PCB)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1988, kabukiz, 0, kabukiz, kabukiz, driver_device, 0, ROT0, "Kaneko / Taito Corporation Japan", "Kabuki-Z (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, kabukizj, kabukiz, kabukiz, kabukizj, driver_device, 0, ROT0, "Kaneko / Taito Corporation", "Kabuki-Z (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, insectx, 0, insectx, insectx, driver_device, 0, ROT0, "Taito Corporation Japan", "Insector X (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, insectxj, insectx, insectx, insectxj, driver_device, 0, ROT0, "Taito Corporation", "Insector X (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, plumppop, 0, extrmatn, plumppop, extrmatn_state, 0, ROT0, "Taito Corporation", "Plump Pop (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, jpopnics, 0, jpopnics, jpopnics, jpopnics_state, 0, ROT0, "Nics", "Jumping Pop (Nics, Korean hack of Plump Pop)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1987, extrmatn, 0, extrmatn, extrmatn, extrmatn_state, 0, ROT270, "Taito Corporation Japan", "Extermination (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, extrmatnu, extrmatn, extrmatn, extrmatn, extrmatn_state, 0, ROT270, "Taito (World Games license)", "Extermination (US, World Games)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, extrmatnur,extrmatn, extrmatn, extrmatn, extrmatn_state, 0, ROT270, "Taito America Corporation (Romstar license)", "Extermination (US, Romstar)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, extrmatnj, extrmatn, extrmatn, extrmatn, extrmatn_state, 0, ROT270, "Taito Corporation", "Extermination (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1987, arknoid2, 0, arknoid2, arknoid2, arknoid2_state, 0, ROT270, "Taito Corporation Japan", "Arkanoid - Revenge of DOH (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, arknoid2u, arknoid2, arknoid2, arknid2u, arknoid2_state, 0, ROT270, "Taito America Corporation (Romstar license)", "Arkanoid - Revenge of DOH (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, arknoid2j, arknoid2, arknoid2, arknid2u, arknoid2_state, 0, ROT270, "Taito Corporation", "Arkanoid - Revenge of DOH (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, arknoid2b, arknoid2, arknoid2, arknid2u, arknoid2_state, 0, ROT270, "bootleg", "Arkanoid - Revenge of DOH (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1987, drtoppel, 0, extrmatn, drtoppel, extrmatn_state, 0, ROT90, "Kaneko / Taito Corporation Japan", "Dr. Toppel's Adventure (World)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
+GAME( 1987, drtoppelu, drtoppel, extrmatn, drtopplu, extrmatn_state, 0, ROT90, "Kaneko / Taito America Corporation", "Dr. Toppel's Adventure (US)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
+GAME( 1987, drtoppelj, drtoppel, extrmatn, drtopplu, extrmatn_state, 0, ROT90, "Kaneko / Taito Corporation", "Dr. Toppel's Tankentai (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1988, kageki, 0, kageki, kageki, kageki_state, 0, ROT90, "Kaneko / Taito America Corporation (Romstar license)", "Kageki (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kagekij, kageki, kageki, kagekij, kageki_state, 0, ROT90, "Kaneko / Taito Corporation", "Kageki (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, kagekih, kageki, kageki, kageki, kageki_state, 0, ROT90, "hack", "Kageki (hack)", MACHINE_SUPPORTS_SAVE ) // date is hacked at least, might also be a Japan set hacked to show english
+
+GAME( 1988, chukatai, 0, tnzs, chukatai, tnzs_state, 0, ROT0, "Taito Corporation Japan", "Chuka Taisen (World)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
+GAME( 1988, chukataiu, chukatai, tnzs, chukatau, tnzs_state, 0, ROT0, "Taito America Corporation", "Chuka Taisen (US)", MACHINE_SUPPORTS_SAVE ) /* Possible region hack */
+GAME( 1988, chukataij, chukatai, tnzs, chukatau, tnzs_state, 0, ROT0, "Taito Corporation", "Chuka Taisen (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1988, tnzs, 0, tnzsb, tnzs, tnzsb_state, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, new version) (newer PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tnzsj, tnzs, tnzsb, tnzsj, tnzsb_state, 0, ROT0, "Taito Corporation", "The NewZealand Story (Japan, new version) (newer PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tnzso, tnzs, tnzs, tnzsop, tnzs_state, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, old version) (older PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tnzsjo, tnzs, tnzs, tnzsjo, tnzs_state, 0, ROT0, "Taito Corporation", "The NewZealand Story (Japan, old version) (older PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tnzsuo, tnzs, tnzs, tnzsjo, tnzs_state, 0, ROT0, "Taito America Corporation", "The NewZealand Story (US, old version) (older PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tnzsoa, tnzs, tnzs, tnzsop, tnzs_state, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, unknown version) (older PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, tnzsop, tnzs, tnzs, tnzsop, tnzs_state, 0, ROT0, "Taito Corporation Japan", "The NewZealand Story (World, prototype) (older PCB)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1988, kabukiz, 0, kabukiz, kabukiz, kabukiz_state, 0, ROT0, "Kaneko / Taito Corporation Japan", "Kabuki-Z (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, kabukizj, kabukiz, kabukiz, kabukizj, kabukiz_state, 0, ROT0, "Kaneko / Taito Corporation", "Kabuki-Z (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, insectx, 0, insectx, insectx, insectx_state, 0, ROT0, "Taito Corporation Japan", "Insector X (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, insectxj, insectx, insectx, insectxj, insectx_state, 0, ROT0, "Taito Corporation", "Insector X (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp
index 81d8ee8ff8c..bf27b7a3764 100644
--- a/src/mame/drivers/toaplan1.cpp
+++ b/src/mame/drivers/toaplan1.cpp
@@ -1886,7 +1886,7 @@ GFXDECODE_END
#define VBSTART (240)
-static MACHINE_CONFIG_START( rallybik, toaplan1_rallybik_state )
+static MACHINE_CONFIG_START( rallybik )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -1926,7 +1926,7 @@ static MACHINE_CONFIG_START( rallybik, toaplan1_rallybik_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( truxton, toaplan1_state )
+static MACHINE_CONFIG_START( truxton )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -1964,7 +1964,7 @@ static MACHINE_CONFIG_START( truxton, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( hellfire, toaplan1_state )
+static MACHINE_CONFIG_START( hellfire )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -2002,7 +2002,7 @@ static MACHINE_CONFIG_START( hellfire, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( zerowing, toaplan1_state )
+static MACHINE_CONFIG_START( zerowing )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -2040,7 +2040,7 @@ static MACHINE_CONFIG_START( zerowing, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( demonwld, toaplan1_state )
+static MACHINE_CONFIG_START( demonwld )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -2083,7 +2083,7 @@ static MACHINE_CONFIG_START( demonwld, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( samesame, toaplan1_state )
+static MACHINE_CONFIG_START( samesame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -2121,7 +2121,7 @@ static MACHINE_CONFIG_START( samesame, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( outzone, toaplan1_state )
+static MACHINE_CONFIG_START( outzone )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -2159,7 +2159,7 @@ static MACHINE_CONFIG_START( outzone, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( outzonecv, toaplan1_state )
+static MACHINE_CONFIG_START( outzonecv )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz)
@@ -2197,7 +2197,7 @@ static MACHINE_CONFIG_START( outzonecv, toaplan1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vimana, toaplan1_state )
+static MACHINE_CONFIG_START( vimana )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
@@ -3112,41 +3112,41 @@ DRIVER_INIT_MEMBER(toaplan1_state,demonwld)
-GAME( 1988, rallybik, 0, rallybik, rallybik, toaplan1_state, toaplan1, ROT270, "Toaplan / Taito Corporation", "Rally Bike / Dash Yarou", 0 )
+GAME( 1988, rallybik, 0, rallybik, rallybik, toaplan1_rallybik_state, toaplan1, ROT270, "Toaplan / Taito Corporation", "Rally Bike / Dash Yarou", 0 )
-GAME( 1988, truxton, 0, truxton, truxton, toaplan1_state, toaplan1, ROT270, "Toaplan / Taito Corporation", "Truxton / Tatsujin", 0 )
+GAME( 1988, truxton, 0, truxton, truxton, toaplan1_state, toaplan1, ROT270, "Toaplan / Taito Corporation", "Truxton / Tatsujin", 0 )
-GAME( 1989, hellfire, 0, hellfire, hellfire, toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (2P set)", 0 )
-GAME( 1989, hellfire1, hellfire, hellfire, hellfire1, toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (1P set)", 0 )
-GAME( 1989, hellfire2a, hellfire, hellfire, hellfire2a,toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (2P set, older)", 0 )
-GAME( 1989, hellfire1a, hellfire, hellfire, hellfire1a,toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (1P set, older)", 0 )
+GAME( 1989, hellfire, 0, hellfire, hellfire, toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (2P set)", 0 )
+GAME( 1989, hellfire1, hellfire, hellfire, hellfire1, toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (1P set)", 0 )
+GAME( 1989, hellfire2a, hellfire, hellfire, hellfire2a,toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (2P set, older)", 0 )
+GAME( 1989, hellfire1a, hellfire, hellfire, hellfire1a,toaplan1_state, toaplan1, ROT0, "Toaplan (Taito license)", "Hellfire (1P set, older)", 0 )
-GAME( 1989, zerowing, 0, zerowing, zerowing2, toaplan1_state, toaplan1, ROT0, "Toaplan", "Zero Wing (2P set)", 0 )
-GAME( 1989, zerowing1, zerowing, zerowing, zerowing, toaplan1_state, toaplan1, ROT0, "Toaplan", "Zero Wing (1P set)", 0 )
-GAME( 1989, zerowingw, zerowing, zerowing, zerowing2, toaplan1_state, toaplan1, ROT0, "Toaplan (Williams license)", "Zero Wing (2P set, Williams license)", 0 )
+GAME( 1989, zerowing, 0, zerowing, zerowing2, toaplan1_state, toaplan1, ROT0, "Toaplan", "Zero Wing (2P set)", 0 )
+GAME( 1989, zerowing1, zerowing, zerowing, zerowing, toaplan1_state, toaplan1, ROT0, "Toaplan", "Zero Wing (1P set)", 0 )
+GAME( 1989, zerowingw, zerowing, zerowing, zerowing2, toaplan1_state, toaplan1, ROT0, "Toaplan (Williams license)", "Zero Wing (2P set, Williams license)", 0 )
-GAME( 1990, demonwld, 0, demonwld, demonwld, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 1)", 0 )
-GAME( 1989, demonwld1, demonwld, demonwld, demonwld, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 2)", 0 )
-GAME( 1989, demonwld2, demonwld, demonwld, demonwld1, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 3)", 0 )
-GAME( 1989, demonwld3, demonwld, demonwld, demonwld1, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 4)", 0 )
-GAME( 1989, demonwld4, demonwld, demonwld, demonwld1, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 5)", 0 )
+GAME( 1990, demonwld, 0, demonwld, demonwld, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 1)", 0 )
+GAME( 1989, demonwld1, demonwld, demonwld, demonwld, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 2)", 0 )
+GAME( 1989, demonwld2, demonwld, demonwld, demonwld1, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 3)", 0 )
+GAME( 1989, demonwld3, demonwld, demonwld, demonwld1, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 4)", 0 )
+GAME( 1989, demonwld4, demonwld, demonwld, demonwld1, toaplan1_state, demonwld, ROT0, "Toaplan", "Demon's World / Horror Story (set 5)", 0 )
-GAME( 1990, fireshrk, 0, samesame, fireshrk, toaplan1_state, toaplan1, ROT270, "Toaplan", "Fire Shark", 0 )
-GAME( 1989, fireshrka, fireshrk, samesame, fireshrka, toaplan1_state, toaplan1, ROT270, "Toaplan", "Fire Shark (earlier)", 0 )
-GAME( 1990, fireshrkd, fireshrk, samesame, samesame2, toaplan1_state, toaplan1, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 1, easier)", 0 )
-GAME( 1990, fireshrkdh, fireshrk, samesame, samesame2, toaplan1_state, toaplan1, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 2, harder)", 0 )
-GAME( 1989, samesame, fireshrk, samesame, samesame, toaplan1_state, toaplan1, ROT270, "Toaplan", "Same! Same! Same! (1P set)", 0 )
-GAME( 1989, samesame2, fireshrk, samesame, samesame2, toaplan1_state, toaplan1, ROT270, "Toaplan", "Same! Same! Same! (2P set)", 0 )
-GAME( 2015, samesamenh, fireshrk, samesame, samesame, toaplan1_state, toaplan1, ROT270, "hack (trap15)", "Same! Same! Same! (1P set, NEW VER! hack)", 0 )
+GAME( 1990, fireshrk, 0, samesame, fireshrk, toaplan1_state, toaplan1, ROT270, "Toaplan", "Fire Shark", 0 )
+GAME( 1989, fireshrka, fireshrk, samesame, fireshrka, toaplan1_state, toaplan1, ROT270, "Toaplan", "Fire Shark (earlier)", 0 )
+GAME( 1990, fireshrkd, fireshrk, samesame, samesame2, toaplan1_state, toaplan1, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 1, easier)", 0 )
+GAME( 1990, fireshrkdh, fireshrk, samesame, samesame2, toaplan1_state, toaplan1, ROT270, "Toaplan (Dooyong license)", "Fire Shark (Korea, set 2, harder)", 0 )
+GAME( 1989, samesame, fireshrk, samesame, samesame, toaplan1_state, toaplan1, ROT270, "Toaplan", "Same! Same! Same! (1P set)", 0 )
+GAME( 1989, samesame2, fireshrk, samesame, samesame2, toaplan1_state, toaplan1, ROT270, "Toaplan", "Same! Same! Same! (2P set)", 0 )
+GAME( 2015, samesamenh, fireshrk, samesame, samesame, toaplan1_state, toaplan1, ROT270, "hack (trap15)", "Same! Same! Same! (1P set, NEW VER! hack)", 0 )
-GAME( 1990, outzone, 0, outzone, outzone, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone", 0 )
-GAME( 1990, outzoneh, outzone, outzone, outzone, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (harder)", 0 )
-GAME( 1990, outzonea, outzone, outzone, outzonea, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (old set)", 0 )
-GAME( 1990, outzoneb, outzone, outzone, outzonea, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (older set)", 0 )
-GAME( 1990, outzonec, outzone, outzone, outzonec, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (oldest set)", MACHINE_IMPERFECT_SOUND ) // prototype?
-GAME( 1990, outzonecv, outzone, outzonecv,outzone, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (Zero Wing TP-015 PCB conversion)", 0 )
+GAME( 1990, outzone, 0, outzone, outzone, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone", 0 )
+GAME( 1990, outzoneh, outzone, outzone, outzone, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (harder)", 0 )
+GAME( 1990, outzonea, outzone, outzone, outzonea, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (old set)", 0 )
+GAME( 1990, outzoneb, outzone, outzone, outzonea, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (older set)", 0 )
+GAME( 1990, outzonec, outzone, outzone, outzonec, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (oldest set)", MACHINE_IMPERFECT_SOUND ) // prototype?
+GAME( 1990, outzonecv, outzone, outzonecv,outzone, toaplan1_state, toaplan1, ROT270, "Toaplan", "Out Zone (Zero Wing TP-015 PCB conversion)", 0 )
// has various licenses / regions depending on jumpers, including Tecmo
-GAME( 1991, vimana, 0, vimana, vimana, toaplan1_state, toaplan1, ROT270, "Toaplan", "Vimana (World, set 1)", 0 )
-GAME( 1991, vimanan, vimana, vimana, vimanan, toaplan1_state, toaplan1, ROT270, "Toaplan", "Vimana (World, set 2)", 0 )
-GAME( 1991, vimanaj, vimana, vimana, vimanaj, toaplan1_state, toaplan1, ROT270, "Toaplan", "Vimana (Japan)", 0 )
+GAME( 1991, vimana, 0, vimana, vimana, toaplan1_state, toaplan1, ROT270, "Toaplan", "Vimana (World, set 1)", 0 )
+GAME( 1991, vimanan, vimana, vimana, vimanan, toaplan1_state, toaplan1, ROT270, "Toaplan", "Vimana (World, set 2)", 0 )
+GAME( 1991, vimanaj, vimana, vimana, vimanaj, toaplan1_state, toaplan1, ROT270, "Toaplan", "Vimana (Japan)", 0 )
diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp
index a0f49c60d44..ea3387c8da0 100644
--- a/src/mame/drivers/toaplan2.cpp
+++ b/src/mame/drivers/toaplan2.cpp
@@ -3317,7 +3317,7 @@ static GFXDECODE_START( fixeightbl )
GFXDECODE_END
-static MACHINE_CONFIG_START( tekipaki, toaplan2_state )
+static MACHINE_CONFIG_START( tekipaki )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
@@ -3369,7 +3369,7 @@ static MACHINE_CONFIG_DERIVED( tekipaki_mcu, tekipaki )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ghox, toaplan2_state )
+static MACHINE_CONFIG_START( ghox )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
@@ -3459,7 +3459,7 @@ a4849 cd
*/
-static MACHINE_CONFIG_START( dogyuun, toaplan2_state )
+static MACHINE_CONFIG_START( dogyuun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_25MHz/2) /* verified on pcb */
@@ -3499,12 +3499,12 @@ static MACHINE_CONFIG_START( dogyuun, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kbash, toaplan2_state )
+static MACHINE_CONFIG_START( kbash )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
@@ -3545,12 +3545,12 @@ static MACHINE_CONFIG_START( kbash, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kbash2, toaplan2_state )
+static MACHINE_CONFIG_START( kbash2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* 16MHz Oscillator */
@@ -3579,15 +3579,15 @@ static MACHINE_CONFIG_START( kbash2, toaplan2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( truxton2, toaplan2_state )
+static MACHINE_CONFIG_START( truxton2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
@@ -3619,7 +3619,7 @@ static MACHINE_CONFIG_START( truxton2, toaplan2_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
#else // ...but the hardware is mono
@@ -3628,13 +3628,13 @@ static MACHINE_CONFIG_START( truxton2, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, OKIM6295_PIN7_LOW) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
#endif
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pipibibs, toaplan2_state )
+static MACHINE_CONFIG_START( pipibibs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* verified on pcb */
@@ -3676,7 +3676,7 @@ static MACHINE_CONFIG_START( pipibibs, toaplan2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pipibibsbl, toaplan2_state )
+static MACHINE_CONFIG_START( pipibibsbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
@@ -3755,7 +3755,7 @@ static const uint8_t ts001turbo_decryption_table[256] = {
};
-static MACHINE_CONFIG_START( fixeight, toaplan2_state )
+static MACHINE_CONFIG_START( fixeight )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
@@ -3793,12 +3793,12 @@ static MACHINE_CONFIG_START( fixeight, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH) /* verified on pcb */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fixeightbl, toaplan2_state )
+static MACHINE_CONFIG_START( fixeightbl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_10MHz) /* 10MHz Oscillator */
@@ -3828,13 +3828,13 @@ static MACHINE_CONFIG_START( fixeightbl, toaplan2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_14MHz/16, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL_14MHz/16, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, fixeightbl_oki)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vfive, toaplan2_state )
+static MACHINE_CONFIG_START( vfive )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2) /* verified on pcb */
@@ -3873,7 +3873,7 @@ static MACHINE_CONFIG_START( vfive, toaplan2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( batsugun, toaplan2_state )
+static MACHINE_CONFIG_START( batsugun )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
@@ -3915,11 +3915,11 @@ static MACHINE_CONFIG_START( batsugun, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/8, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/8, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pwrkick, toaplan2_state )
+static MACHINE_CONFIG_START( pwrkick )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -3951,11 +3951,11 @@ static MACHINE_CONFIG_START( pwrkick, toaplan2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
/* empty YM2151 socket*/
- MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, OKIM6295_PIN7_HIGH) // not confirmed
+ MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, PIN7_HIGH) // not confirmed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( othldrby, toaplan2_state )
+static MACHINE_CONFIG_START( othldrby )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(othldrby_68k_mem)
@@ -3984,12 +3984,12 @@ static MACHINE_CONFIG_START( othldrby, toaplan2_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, OKIM6295_PIN7_HIGH) // not confirmed
+ MCFG_OKIM6295_ADD("oki", XTAL_27MHz/8, PIN7_HIGH) // not confirmed
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( enmadaio, toaplan2_state )
+static MACHINE_CONFIG_START( enmadaio )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz/2)
MCFG_CPU_PROGRAM_MAP(enmadaio_68k_mem)
@@ -4017,12 +4017,12 @@ static MACHINE_CONFIG_START( enmadaio, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, OKIM6295_PIN7_LOW) // pin7 not confirmed
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/4, PIN7_LOW) // pin7 not confirmed
MCFG_DEVICE_ADDRESS_MAP(AS_0, enmadaio_oki)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( snowbro2, toaplan2_state )
+static MACHINE_CONFIG_START( snowbro2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -4054,12 +4054,12 @@ static MACHINE_CONFIG_START( snowbro2, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_27MHz/10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_27MHz/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( mahoudai, toaplan2_state )
+static MACHINE_CONFIG_START( mahoudai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
@@ -4099,12 +4099,12 @@ static MACHINE_CONFIG_START( mahoudai, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( shippumd, toaplan2_state )
+static MACHINE_CONFIG_START( shippumd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
@@ -4144,11 +4144,11 @@ static MACHINE_CONFIG_START( shippumd, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_27MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bgaregga, toaplan2_state )
+static MACHINE_CONFIG_START( bgaregga )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
@@ -4190,7 +4190,7 @@ static MACHINE_CONFIG_START( bgaregga, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4205,7 +4205,7 @@ static MACHINE_CONFIG_DERIVED( bgareggabl, bgaregga )
MCFG_SCREEN_UPDATE_DRIVER(toaplan2_state, screen_update_bootleg)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( batrider, toaplan2_state )
+static MACHINE_CONFIG_START( batrider )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
@@ -4250,10 +4250,10 @@ static MACHINE_CONFIG_START( batrider, toaplan2_state )
MCFG_YM2151_ADD("ymsnd", XTAL_32MHz/8)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/10, OKIM6295_PIN7_LOW)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32MHz/10, PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("nmk112", NMK112, 0)
@@ -4262,7 +4262,7 @@ static MACHINE_CONFIG_START( batrider, toaplan2_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bbakraid, toaplan2_state )
+static MACHINE_CONFIG_START( bbakraid )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz , 32MHz Oscillator */
@@ -5709,95 +5709,95 @@ ROM_END
// The following is in order of Toaplan Board/game numbers
// See list at top of file
-// ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS )
-GAME( 1991, tekipaki, 0, tekipaki_mcu, tekipaki, driver_device, 0, ROT0, "Toaplan", "Teki Paki", MACHINE_SUPPORTS_SAVE )
+// ( YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS )
+GAME( 1991, tekipaki, 0, tekipaki_mcu, tekipaki, toaplan2_state, 0, ROT0, "Toaplan", "Teki Paki", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ghox, 0, ghox, ghox, driver_device, 0, ROT270, "Toaplan", "Ghox (spinner)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, ghoxj, ghox, ghox, ghox, driver_device, 0, ROT270, "Toaplan", "Ghox (joystick)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ghox, 0, ghox, ghox, toaplan2_state, 0, ROT270, "Toaplan", "Ghox (spinner)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ghoxj, ghox, ghox, ghox, toaplan2_state, 0, ROT270, "Toaplan", "Ghox (joystick)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dogyuun, 0, dogyuun, dogyuun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Dogyuun", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dogyuuna, dogyuun, dogyuun, dogyuuna, toaplan2_state, dogyuun, ROT270, "Toaplan", "Dogyuun (older set)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, dogyuunt, dogyuun, dogyuun, dogyuunt, toaplan2_state, dogyuun, ROT270, "Toaplan", "Dogyuun (location test)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dogyuun, 0, dogyuun, dogyuun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Dogyuun", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dogyuuna, dogyuun, dogyuun, dogyuuna, toaplan2_state, dogyuun, ROT270, "Toaplan", "Dogyuun (older set)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, dogyuunt, dogyuun, dogyuun, dogyuunt, toaplan2_state, dogyuun, ROT270, "Toaplan", "Dogyuun (location test)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, kbash, 0, kbash, kbash, driver_device, 0, ROT0, "Toaplan / Atari", "Knuckle Bash", MACHINE_SUPPORTS_SAVE ) // Atari license shown for some regions.
-GAME( 1993, kbashk, kbash, kbash, kbashk,driver_device, 0, ROT0, "Toaplan / Taito", "Knuckle Bash (Korean PCB)", MACHINE_SUPPORTS_SAVE ) // Japan region has optional Taito license, maybe the original Japan release?
+GAME( 1993, kbash, 0, kbash, kbash, toaplan2_state, 0, ROT0, "Toaplan / Atari", "Knuckle Bash", MACHINE_SUPPORTS_SAVE ) // Atari license shown for some regions.
+GAME( 1993, kbashk, kbash, kbash, kbashk, toaplan2_state, 0, ROT0, "Toaplan / Taito", "Knuckle Bash (Korean PCB)", MACHINE_SUPPORTS_SAVE ) // Japan region has optional Taito license, maybe the original Japan release?
-GAME( 1999, kbash2, 0, kbash2, kbash2, driver_device, 0, ROT0, "bootleg", "Knuckle Bash 2 (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, kbash2, 0, kbash2, kbash2, toaplan2_state, 0, ROT0, "bootleg", "Knuckle Bash 2 (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, truxton2, 0, truxton2, truxton2, driver_device, 0, ROT270, "Toaplan", "Truxton II / Tatsujin Oh", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, truxton2, 0, truxton2, truxton2, toaplan2_state, 0, ROT270, "Toaplan", "Truxton II / Tatsujin Oh", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pipibibs, 0, pipibibs, pipibibs, driver_device, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Z80 sound cpu, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pipibibsa, pipibibs, pipibibs, pipibibs, driver_device, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Z80 sound cpu, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pipibibsp, pipibibs, pipibibs, pipibibsp, driver_device,0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, whoopee, pipibibs, tekipaki, whoopee, driver_device, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Teki Paki hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // original Whoopee!! boards have a HD647180 instead of Z80
+GAME( 1991, pipibibs, 0, pipibibs, pipibibs, toaplan2_state, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Z80 sound cpu, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pipibibsa, pipibibs, pipibibs, pipibibs, toaplan2_state, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Z80 sound cpu, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pipibibsp, pipibibs, pipibibs, pipibibsp, toaplan2_state, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, whoopee, pipibibs, tekipaki, whoopee, toaplan2_state, 0, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Teki Paki hardware)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // original Whoopee!! boards have a HD647180 instead of Z80
-GAME( 1991, pipibibsbl, pipibibs, pipibibsbl, pipibibsbl, toaplan2_state, pipibibsbl, ROT0, "bootleg (Ryouta Kikaku)", "Pipi & Bibis / Whoopee!! (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pipibibsbl, pipibibs, pipibibsbl, pipibibsbl, toaplan2_state, pipibibsbl, ROT0, "bootleg (Ryouta Kikaku)", "Pipi & Bibis / Whoopee!! (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, enmadaio, 0, enmadaio, enmadaio,toaplan2_state, enmadaio, ROT0, "Toaplan / Taito", "Enma Daio (Japan)", 0 ) // TP-031
+GAME( 1993, enmadaio, 0, enmadaio, enmadaio, toaplan2_state, enmadaio, ROT0, "Toaplan / Taito", "Enma Daio (Japan)", 0 ) // TP-031
// region is in eeprom (and also requires correct return value from a v25 mapped address??)
-GAME( 1992, fixeight, 0, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightk, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeighth, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Hong Kong)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeighttw, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Taiwan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeighta, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Southeast Asia)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightu, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (USA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightj, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Europe, Taito license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightkt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Korea, Taito license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightht, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Hong Kong, Taito license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeighttwt,fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Taiwan, Taito license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightat, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Southeast Asia, Taito license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightut, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (USA, Taito license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, fixeightjt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Japan, Taito license)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1992, fixeightbl, fixeight, fixeightbl, fixeightbl, toaplan2_state, fixeightbl, ROT270, "bootleg", "FixEight (Korea, bootleg)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1992, grindstm, 0, vfive, grindstm, toaplan2_state, vfive, ROT270, "Toaplan", "Grind Stormer", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, grindstma, grindstm, vfive, grindstma, toaplan2_state, vfive, ROT270, "Toaplan", "Grind Stormer (older set)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, vfive, grindstm, vfive, vfive, toaplan2_state, vfive, ROT270, "Toaplan", "V-Five (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1993, batsugun, 0, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, batsuguna, batsugun, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun (older set)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, batsugunb, batsugun, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun (Korean PCB)", MACHINE_SUPPORTS_SAVE ) // cheap looking PCB (same 'TP-030' numbering as original) but without Mask ROMs. Still has original customs etc. Jumpers were set to the Korea Unite Trading license, so likely made in Korea, not a bootleg tho.
-GAME( 1993, batsugunsp, batsugun, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun - Special Version", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1994, pwrkick, 0, pwrkick, pwrkick, driver_device, 0, ROT0, "Sunwise", "Power Kick (Japan)", 0 )
-GAME( 1995, othldrby, 0, othldrby, othldrby,driver_device, 0, ROT0, "Sunwise", "Othello Derby (Japan)", 0 )
-
-GAME( 1994, snowbro2, 0, snowbro2, snowbro2, driver_device, 0, ROT0, "Hanafram", "Snow Bros. 2 - With New Elves / Otenki Paradise", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, snowbro2b, snowbro2, snowbro2, snowbro2, driver_device, 0, ROT0, "bootleg", "Snow Bros. 2 - With New Elves / Otenki Paradise (bootleg)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1993, sstriker, 0, mahoudai, sstriker, driver_device, 0, ROT270, "Raizing", "Sorcer Striker (set 1)" , MACHINE_SUPPORTS_SAVE ) // verified on two different PCBs
-GAME( 1993, sstrikera, sstriker, mahoudai, sstrikera, driver_device, 0, ROT270, "Raizing", "Sorcer Striker (set 2)" , MACHINE_SUPPORTS_SAVE ) // from Korean board
-GAME( 1993, mahoudai, sstriker, mahoudai, mahoudai, driver_device, 0, ROT270, "Raizing (Able license)", "Mahou Daisakusen (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1994, kingdmgp, 0, shippumd, kingdmgp, driver_device, 0, ROT270, "Raizing / Eighting", "Kingdom Grandprix", MACHINE_SUPPORTS_SAVE ) // from Korean board, missing letters on credits screen but this is correct
-GAME( 1994, shippumd, kingdmgp, shippumd, shippumd, driver_device, 0, ROT270, "Raizing / Eighting", "Shippu Mahou Daisakusen (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1996, bgaregga, 0, bgaregga, bgaregga, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga (Europe / USA / Japan / Asia) (Sat Feb 3 1996)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, bgareggahk, bgaregga, bgaregga, bgareggahk, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga (Austria / Hong Kong) (Sat Feb 3 1996)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, bgareggatw, bgaregga, bgaregga, bgareggatw, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga (Taiwan / Germany) (Thu Feb 1 1996)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, bgaregganv, bgaregga, bgaregga, bgareggahk, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga - New Version (Austria / Hong Kong) (Sat Mar 2 1996)" , MACHINE_SUPPORTS_SAVE ) // displays New Version only when set to HK
-GAME( 1996, bgareggat2, bgaregga, bgaregga, bgaregga, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga - Type 2 (Europe / USA / Japan / Asia) (Sat Mar 2 1996)" , MACHINE_SUPPORTS_SAVE ) // displays Type 2 only when set to Europe
-GAME( 1996, bgareggacn, bgaregga, bgaregga, bgareggacn, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga - Type 2 (Denmark / China) (Tue Apr 2 1996)", MACHINE_SUPPORTS_SAVE ) // displays Type 2 only when set to Denmark
-GAME( 1996, bgareggabl, bgaregga, bgareggabl,bgareggacn, toaplan2_state,bgaregga, ROT270, "bootleg", "1945 Part-2 (Chinese hack of Battle Garegga)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, bgareggabla,bgaregga, bgareggabl,bgareggacn, toaplan2_state,bgaregga, ROT270, "bootleg", "Lei Shen Zhuan Thunder Deity Biography (Chinese hack of Battle Garegga)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeight, 0, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightk, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeighth, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Hong Kong)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeighttw, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Taiwan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeighta, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Southeast Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightu, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (USA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightj, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan", "FixEight (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Europe, Taito license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightkt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Korea, Taito license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightht, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Hong Kong, Taito license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeighttwt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Taiwan, Taito license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightat, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Southeast Asia, Taito license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightut, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (USA, Taito license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, fixeightjt, fixeight, fixeight, fixeight, toaplan2_state, fixeight, ROT270, "Toaplan (Taito license)", "FixEight (Japan, Taito license)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1992, fixeightbl, fixeight, fixeightbl, fixeightbl, toaplan2_state, fixeightbl, ROT270, "bootleg", "FixEight (Korea, bootleg)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1992, grindstm, 0, vfive, grindstm, toaplan2_state, vfive, ROT270, "Toaplan", "Grind Stormer", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, grindstma, grindstm, vfive, grindstma, toaplan2_state, vfive, ROT270, "Toaplan", "Grind Stormer (older set)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, vfive, grindstm, vfive, vfive, toaplan2_state, vfive, ROT270, "Toaplan", "V-Five (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1993, batsugun, 0, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, batsuguna, batsugun, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun (older set)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, batsugunb, batsugun, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun (Korean PCB)", MACHINE_SUPPORTS_SAVE ) // cheap looking PCB (same 'TP-030' numbering as original) but without Mask ROMs. Still has original customs etc. Jumpers were set to the Korea Unite Trading license, so likely made in Korea, not a bootleg tho.
+GAME( 1993, batsugunsp, batsugun, batsugun, batsugun, toaplan2_state, dogyuun, ROT270, "Toaplan", "Batsugun - Special Version", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1994, pwrkick, 0, pwrkick, pwrkick, toaplan2_state, 0, ROT0, "Sunwise", "Power Kick (Japan)", 0 )
+GAME( 1995, othldrby, 0, othldrby, othldrby, toaplan2_state, 0, ROT0, "Sunwise", "Othello Derby (Japan)", 0 )
+
+GAME( 1994, snowbro2, 0, snowbro2, snowbro2, toaplan2_state, 0, ROT0, "Hanafram", "Snow Bros. 2 - With New Elves / Otenki Paradise", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, snowbro2b, snowbro2, snowbro2, snowbro2, toaplan2_state, 0, ROT0, "bootleg", "Snow Bros. 2 - With New Elves / Otenki Paradise (bootleg)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1993, sstriker, 0, mahoudai, sstriker, toaplan2_state, 0, ROT270, "Raizing", "Sorcer Striker (set 1)" , MACHINE_SUPPORTS_SAVE ) // verified on two different PCBs
+GAME( 1993, sstrikera, sstriker, mahoudai, sstrikera, toaplan2_state, 0, ROT270, "Raizing", "Sorcer Striker (set 2)" , MACHINE_SUPPORTS_SAVE ) // from Korean board
+GAME( 1993, mahoudai, sstriker, mahoudai, mahoudai, toaplan2_state, 0, ROT270, "Raizing (Able license)", "Mahou Daisakusen (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1994, kingdmgp, 0, shippumd, kingdmgp, toaplan2_state, 0, ROT270, "Raizing / Eighting", "Kingdom Grandprix", MACHINE_SUPPORTS_SAVE ) // from Korean board, missing letters on credits screen but this is correct
+GAME( 1994, shippumd, kingdmgp, shippumd, shippumd, toaplan2_state, 0, ROT270, "Raizing / Eighting", "Shippu Mahou Daisakusen (Japan)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1996, bgaregga, 0, bgaregga, bgaregga, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga (Europe / USA / Japan / Asia) (Sat Feb 3 1996)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bgareggahk, bgaregga, bgaregga, bgareggahk, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga (Austria / Hong Kong) (Sat Feb 3 1996)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bgareggatw, bgaregga, bgaregga, bgareggatw, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga (Taiwan / Germany) (Thu Feb 1 1996)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bgaregganv, bgaregga, bgaregga, bgareggahk, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga - New Version (Austria / Hong Kong) (Sat Mar 2 1996)" , MACHINE_SUPPORTS_SAVE ) // displays New Version only when set to HK
+GAME( 1996, bgareggat2, bgaregga, bgaregga, bgaregga, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga - Type 2 (Europe / USA / Japan / Asia) (Sat Mar 2 1996)" , MACHINE_SUPPORTS_SAVE ) // displays Type 2 only when set to Europe
+GAME( 1996, bgareggacn, bgaregga, bgaregga, bgareggacn, toaplan2_state, bgaregga, ROT270, "Raizing / Eighting", "Battle Garegga - Type 2 (Denmark / China) (Tue Apr 2 1996)", MACHINE_SUPPORTS_SAVE ) // displays Type 2 only when set to Denmark
+GAME( 1996, bgareggabl, bgaregga, bgareggabl, bgareggacn, toaplan2_state, bgaregga, ROT270, "bootleg", "1945 Part-2 (Chinese hack of Battle Garegga)", MACHINE_SUPPORTS_SAVE )
+GAME( 1996, bgareggabla, bgaregga, bgareggabl, bgareggacn, toaplan2_state, bgaregga, ROT270, "bootleg", "Lei Shen Zhuan Thunder Deity Biography (Chinese hack of Battle Garegga)", MACHINE_SUPPORTS_SAVE )
// these are all based on Version B, even if only the Japan version states 'version B'
-GAME( 1998, batrider, 0, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Europe) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, batrideru, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (USA) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, batriderc, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (China) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, batrider, 0, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Europe) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, batrideru, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (USA) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, batriderc, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (China) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
GAME( 1998, batriderj, batrider, batrider, batriderj, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Japan, B version) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, batriderk, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Korea) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, batriderk, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Korea) (Fri Feb 13 1998)", MACHINE_SUPPORTS_SAVE )
// older revision of the code
GAME( 1998, batriderja, batrider, batrider, batriderj, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Japan, older version) (Mon Dec 22 1997)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, batriderhk, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Hong Kong) (Mon Dec 22 1997)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, batridert, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Taiwan) (Mon Dec 22 1997)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, batriderhk, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Hong Kong) (Mon Dec 22 1997)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, batridert, batrider, batrider, batrider, toaplan2_state, batrider, ROT270, "Raizing / Eighting", "Armed Police Batrider (Taiwan) (Mon Dec 22 1997)", MACHINE_SUPPORTS_SAVE )
// Battle Bakraid
// the 'unlimited' version is a newer revision of the code
-GAME( 1999, bbakraid, 0, bbakraid, bbakraid, toaplan2_state, bbakraid, ROT270, "Eighting", "Battle Bakraid - Unlimited Version (USA) (Tue Jun 8 1999)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, bbakraid, 0, bbakraid, bbakraid, toaplan2_state, bbakraid, ROT270, "Eighting", "Battle Bakraid - Unlimited Version (USA) (Tue Jun 8 1999)", MACHINE_SUPPORTS_SAVE )
GAME( 1999, bbakraidc, bbakraid, bbakraid, bbakraid, toaplan2_state, bbakraid, ROT270, "Eighting", "Battle Bakraid - Unlimited Version (China) (Tue Jun 8 1999)", MACHINE_SUPPORTS_SAVE )
GAME( 1999, bbakraidj, bbakraid, bbakraid, bbakraid, toaplan2_state, bbakraid, ROT270, "Eighting", "Battle Bakraid - Unlimited Version (Japan) (Tue Jun 8 1999)", MACHINE_SUPPORTS_SAVE )
// older revision of the code
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index f2b96ce9cbb..a217d9b759a 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -485,7 +485,7 @@ GFXDECODE_END
/*****************************************************************************/
-static MACHINE_CONFIG_START( toki, toki_state ) /* KOYO 20.000MHz near the cpu */
+static MACHINE_CONFIG_START( toki ) /* KOYO 20.000MHz near the cpu */
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_20MHz /2) /* verified on pcb */
@@ -521,7 +521,7 @@ static MACHINE_CONFIG_START( toki, toki_state ) /* KOYO 20.000MHz near the cpu *
MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) // verified on pcb
+ MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, PIN7_HIGH) // verified on pcb
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0)
@@ -539,7 +539,7 @@ static MACHINE_CONFIG_DERIVED( jujuba, toki )
MCFG_CPU_DECRYPTED_OPCODES_MAP(jujuba_audio_opcodes_map)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tokib, toki_state )
+static MACHINE_CONFIG_START( tokib )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10MHz causes bad slowdowns with monkey machine rd1, but is correct, 20Mhz XTAL */
@@ -576,7 +576,7 @@ static MACHINE_CONFIG_START( tokib, toki_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(toki_state, tokib_adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index dfd9ebf8ee5..34455a5593d 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -370,7 +370,7 @@ void tomcat_state::machine_start()
m_dsp_BIO = 0;
}
-static MACHINE_CONFIG_START( tomcat, tomcat_state )
+static MACHINE_CONFIG_START( tomcat )
MCFG_CPU_ADD("maincpu", M68010, XTAL_12MHz / 2)
MCFG_CPU_PROGRAM_MAP(tomcat_map)
MCFG_CPU_PERIODIC_INT_DRIVER(tomcat_state, irq1_line_assert, 5*60)
@@ -444,4 +444,4 @@ ROM_START( tomcat )
ROM_LOAD( "136021-105.1l", 0x0000, 0x0100, CRC(82fc3eb2) SHA1(184231c7baef598294860a7d2b8a23798c5c7da6) ) /* AVG PROM */
ROM_END
-GAME( 1985, tomcat, 0, tomcat, tomcat, driver_device, 0, ROT0, "Atari", "TomCat (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tomcat, 0, tomcat, tomcat, tomcat_state, 0, ROT0, "Atari", "TomCat (prototype)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp
index efef89e5df8..d88b8ccbc1c 100644
--- a/src/mame/drivers/tonton.cpp
+++ b/src/mame/drivers/tonton.cpp
@@ -210,7 +210,7 @@ WRITE8_MEMBER(tonton_state::ay_bout_w)
* Machine Driver *
*************************************************/
-static MACHINE_CONFIG_START( tonton, tonton_state )
+static MACHINE_CONFIG_START( tonton )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, CPU_CLOCK) /* Guess. According to other MSX2 based gambling games */
diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp
index e039a1d0434..cca681eaa97 100644
--- a/src/mame/drivers/toobin.cpp
+++ b/src/mame/drivers/toobin.cpp
@@ -195,7 +195,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( toobin, toobin_state )
+static MACHINE_CONFIG_START( toobin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, MASTER_CLOCK/4)
@@ -578,9 +578,9 @@ ROM_END
*
*************************************/
-GAME( 1988, toobin, 0, toobin, toobin, driver_device, 0, ROT270, "Atari Games", "Toobin' (rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, toobine, toobin, toobin, toobin, driver_device, 0, ROT270, "Atari Games", "Toobin' (Europe, rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, toobing, toobin, toobin, toobin, driver_device, 0, ROT270, "Atari Games", "Toobin' (German, rev 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, toobin2, toobin, toobin, toobin, driver_device, 0, ROT270, "Atari Games", "Toobin' (rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, toobin2e, toobin, toobin, toobin, driver_device, 0, ROT270, "Atari Games", "Toobin' (Europe, rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, toobin1, toobin, toobin, toobin, driver_device, 0, ROT270, "Atari Games", "Toobin' (rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, toobin, 0, toobin, toobin, toobin_state, 0, ROT270, "Atari Games", "Toobin' (rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, toobine, toobin, toobin, toobin, toobin_state, 0, ROT270, "Atari Games", "Toobin' (Europe, rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, toobing, toobin, toobin, toobin, toobin_state, 0, ROT270, "Atari Games", "Toobin' (German, rev 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, toobin2, toobin, toobin, toobin, toobin_state, 0, ROT270, "Atari Games", "Toobin' (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, toobin2e, toobin, toobin, toobin, toobin_state, 0, ROT270, "Atari Games", "Toobin' (Europe, rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, toobin1, toobin, toobin, toobin, toobin_state, 0, ROT270, "Atari Games", "Toobin' (rev 1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp
index a7c1abdd37f..8da45569ca7 100644
--- a/src/mame/drivers/topspeed.cpp
+++ b/src/mame/drivers/topspeed.cpp
@@ -562,7 +562,7 @@ void topspeed_state::machine_reset()
}
-static MACHINE_CONFIG_START( topspeed, topspeed_state )
+static MACHINE_CONFIG_START( topspeed )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz / 2)
@@ -625,11 +625,11 @@ static MACHINE_CONFIG_START( topspeed, topspeed_state )
MCFG_SOUND_ADD("msm1", MSM5205, XTAL_384kHz)
MCFG_MSM5205_VCLK_CB(WRITELINE(topspeed_state, msm5205_1_vck)) // VCK function
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) // 8 kHz, 4-bit
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) // 8 kHz, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter2", 1.0)
MCFG_SOUND_ADD("msm2", MSM5205, XTAL_384kHz)
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_SEX_4B) // Slave mode, 4-bit
+ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) // Slave mode, 4-bit
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter3", 1.0)
MCFG_FILTER_VOLUME_ADD("filter1l", 0)
@@ -778,6 +778,6 @@ ROM_START( fullthrl )
ROM_END
-GAMEL( 1987, topspeed, 0, topspeed, topspeed, driver_device, 0, ROT0, "Taito Corporation Japan", "Top Speed (World)", MACHINE_SUPPORTS_SAVE, layout_topspeed )
-GAMEL( 1987, topspeedu,topspeed, topspeed, fullthrl, driver_device, 0, ROT0, "Taito America Corporation (Romstar license)", "Top Speed (US)", MACHINE_SUPPORTS_SAVE, layout_topspeed )
-GAMEL( 1987, fullthrl, topspeed, topspeed, fullthrl, driver_device, 0, ROT0, "Taito Corporation", "Full Throttle (Japan)", MACHINE_SUPPORTS_SAVE, layout_topspeed )
+GAMEL( 1987, topspeed, 0, topspeed, topspeed, topspeed_state, 0, ROT0, "Taito Corporation Japan", "Top Speed (World)", MACHINE_SUPPORTS_SAVE, layout_topspeed )
+GAMEL( 1987, topspeedu,topspeed, topspeed, fullthrl, topspeed_state, 0, ROT0, "Taito America Corporation (Romstar license)", "Top Speed (US)", MACHINE_SUPPORTS_SAVE, layout_topspeed )
+GAMEL( 1987, fullthrl, topspeed, topspeed, fullthrl, topspeed_state, 0, ROT0, "Taito Corporation", "Full Throttle (Japan)", MACHINE_SUPPORTS_SAVE, layout_topspeed )
diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp
index a60cb5ede94..893c89c82dc 100644
--- a/src/mame/drivers/toratora.cpp
+++ b/src/mame/drivers/toratora.cpp
@@ -256,7 +256,7 @@ WRITE8_MEMBER(toratora_state::sn1_port_b_u3_w)
* However, shot audio is muted if V < 1.0, as mixer state
* is set to SLF & VCO. Should SLF FF state be inverted?
*/
- m_sn1->slf_cap_voltage_w((data >> 5) == 0x7 ? 2.5 : SN76477_EXTERNAL_VOLTAGE_DISCONNECT);
+ m_sn1->slf_cap_voltage_w((data >> 5) == 0x7 ? 2.5 : sn76477_device::EXTERNAL_VOLTAGE_DISCONNECT);
}
@@ -292,7 +292,7 @@ WRITE8_MEMBER(toratora_state::sn2_port_b_u2_w)
m_sn2->envelope_1_w ((data >> 3) & 0x01);
m_sn2->envelope_2_w ((data >> 4) & 0x01);
m_sn2->slf_res_w(resistances[(data >> 5)]);
- m_sn2->slf_cap_voltage_w((data >> 5) == 0x7 ? 2.5 : SN76477_EXTERNAL_VOLTAGE_DISCONNECT);
+ m_sn2->slf_cap_voltage_w((data >> 5) == 0x7 ? 2.5 : sn76477_device::EXTERNAL_VOLTAGE_DISCONNECT);
/* Seems like the output should be muted in this case, but unsure of exact mechanism */
m_sn2->amplitude_res_w((data >> 5) == 0x0 ? RES_INF : RES_K(47));
@@ -390,7 +390,7 @@ void toratora_state::machine_reset()
m_clear_tv = 0;
}
-static MACHINE_CONFIG_START( toratora, toratora_state )
+static MACHINE_CONFIG_START( toratora )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 5185000 / 8) /* 5.185 MHz XTAL divided by 8 (@ U94.12) */
@@ -522,5 +522,5 @@ ROM_END
*
*************************************/
-GAME( 1980, toratora, 0, toratora, toratora, driver_device, 0, ROT90, "Game Plan", "Tora Tora (prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, toratorab,toratora, toratora, toratora, driver_device, 0, ROT90, "Game Plan", "Tora Tora (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, toratora, 0, toratora, toratora, toratora_state, 0, ROT90, "Game Plan", "Tora Tora (prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, toratorab,toratora, toratora, toratora, toratora_state, 0, ROT90, "Game Plan", "Tora Tora (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp
index 6e58876ea4f..c322cc203fd 100644
--- a/src/mame/drivers/tosh1000.cpp
+++ b/src/mame/drivers/tosh1000.cpp
@@ -139,7 +139,7 @@ static MACHINE_CONFIG_FRAGMENT( cfg_fdc_35 )
MCFG_DEVICE_REMOVE("fdc:1")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tosh1000, tosh1000_state )
+static MACHINE_CONFIG_START( tosh1000 )
MCFG_CPU_ADD("maincpu", I8088, XTAL_5MHz)
MCFG_CPU_PROGRAM_MAP(tosh1000_map)
MCFG_CPU_IO_MAP(tosh1000_io)
@@ -190,5 +190,5 @@ ROM_START( tosh1000 )
ROM_END
-/* YEAR ROM NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP ( 1987, tosh1000, ibm5150, 0, tosh1000, 0, tosh1000_state, tosh1000, "Toshiba", "Toshiba T1000", MACHINE_IS_SKELETON)
+// YEAR ROM NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP ( 1987, tosh1000, ibm5150, 0, tosh1000, 0, tosh1000_state, tosh1000, "Toshiba", "Toshiba T1000", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index 2c7d91f6c7d..f87eceb031c 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -146,7 +146,7 @@ static INPUT_PORTS_START( tourtabl )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tourtabl, tourtabl_state )
+static MACHINE_CONFIG_START( tourtabl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 3) /* actually M6507 */
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -203,5 +203,5 @@ ROM_START( tourtab2 )
ROM_END
-GAME( 1978, tourtabl, 0, tourtabl, tourtabl, driver_device, 0, ROT0, "Atari", "Tournament Table (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1978, tourtab2, tourtabl, tourtabl, tourtabl, driver_device, 0, ROT0, "Atari", "Tournament Table (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1978, tourtabl, 0, tourtabl, tourtabl, tourtabl_state, 0, ROT0, "Atari", "Tournament Table (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1978, tourtab2, tourtabl, tourtabl, tourtabl, tourtabl_state, 0, ROT0, "Atari", "Tournament Table (set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp
index 7151e8de4bf..4c596cd4e75 100644
--- a/src/mame/drivers/tourvis.cpp
+++ b/src/mame/drivers/tourvis.cpp
@@ -498,7 +498,7 @@ WRITE_LINE_MEMBER(tourvision_state::tourvision_timer_out)
}
-static MACHINE_CONFIG_START( tourvision, tourvision_state )
+static MACHINE_CONFIG_START( tourvision )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
MCFG_CPU_PROGRAM_MAP(pce_mem)
@@ -510,7 +510,7 @@ static MACHINE_CONFIG_START( tourvision, tourvision_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( pce_common_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -568,4 +568,4 @@ ROM_START(tourvis)
ROM_END
-GAME( 19??, tourvis, 0, tourvision, tourvision, pce_common_state, pce_common, ROT0, "bootleg (Tourvision)", "Tourvision PCE bootleg", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
+GAME( 19??, tourvis, 0, tourvision, tourvision, tourvision_state, pce_common, ROT0, "bootleg (Tourvision)", "Tourvision PCE bootleg", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index c9907dc4e3f..fe81bfec9d9 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -651,7 +651,7 @@ INTERRUPT_GEN_MEMBER(namcos16_state::slave_vblank_irq)
device.execute().set_input_line(6,HOLD_LINE);
}
-static MACHINE_CONFIG_START( liblrabl, namcos16_state )
+static MACHINE_CONFIG_START( liblrabl )
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/4)
MCFG_CPU_PROGRAM_MAP(master_liblrabl_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", namcos16_state, master_scanline, "screen", 0, 1)
@@ -665,20 +665,20 @@ static MACHINE_CONFIG_START( liblrabl, namcos16_state )
MCFG_CPU_PERIODIC_INT_DRIVER(namcos16_state, irq0_line_hold, 60)
- MCFG_DEVICE_ADD("58xx", NAMCO58XX, 0)
+ MCFG_DEVICE_ADD("58xx", NAMCO_58XX, 0)
MCFG_NAMCO58XX_IN_0_CB(IOPORT("COINS"))
MCFG_NAMCO58XX_IN_1_CB(IOPORT("P1_RIGHT"))
MCFG_NAMCO58XX_IN_2_CB(IOPORT("P2_RIGHT"))
MCFG_NAMCO58XX_IN_3_CB(IOPORT("BUTTONS"))
- MCFG_DEVICE_ADD("56xx_1", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("56xx_1", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_0_CB(READ8(namcos16_state, dipA_h))
MCFG_NAMCO56XX_IN_1_CB(READ8(namcos16_state, dipB_l))
MCFG_NAMCO56XX_IN_2_CB(READ8(namcos16_state, dipB_h))
MCFG_NAMCO56XX_IN_3_CB(READ8(namcos16_state, dipA_l))
MCFG_NAMCO56XX_OUT_0_CB(WRITE8(namcos16_state, flip))
- MCFG_DEVICE_ADD("56xx_2", NAMCO56XX, 0)
+ MCFG_DEVICE_ADD("56xx_2", NAMCO_56XX, 0)
MCFG_NAMCO56XX_IN_1_CB(IOPORT("P1_LEFT"))
MCFG_NAMCO56XX_IN_2_CB(IOPORT("P2_LEFT"))
MCFG_NAMCO56XX_IN_3_CB(IOPORT("SERVICE"))
@@ -764,5 +764,5 @@ ROM_START( toypop )
ROM_LOAD( "tp1-6.3d", 0x0000, 0x0100, CRC(16a9166a) SHA1(847cbaf7c88616576c410177e066ae1d792ac0ba) )
ROM_END
-GAME( 1983, liblrabl, 0, liblrabl, liblrabl, driver_device, 0, ROT0, "Namco", "Libble Rabble", MACHINE_NO_COCKTAIL )
-GAME( 1986, toypop, 0, toypop, toypop, driver_device, 0, ROT0, "Namco", "Toypop", MACHINE_NO_COCKTAIL )
+GAME( 1983, liblrabl, 0, liblrabl, liblrabl, namcos16_state, 0, ROT0, "Namco", "Libble Rabble", MACHINE_NO_COCKTAIL )
+GAME( 1986, toypop, 0, toypop, toypop, namcos16_state, 0, ROT0, "Namco", "Toypop", MACHINE_NO_COCKTAIL )
diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp
index 3cf5ee6bd08..e4d8546dbd5 100644
--- a/src/mame/drivers/tp84.cpp
+++ b/src/mame/drivers/tp84.cpp
@@ -100,7 +100,7 @@ WRITE8_MEMBER(tp84_state::tp84_filter_w)
C = 0;
if (offset & 0x008) C += 47000; /* 47000pF = 0.047uF */
if (offset & 0x010) C += 470000; /* 470000pF = 0.47uF */
- dynamic_cast<filter_rc_device*>(machine().device("filter1"))->filter_rc_set_RC(FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C));
+ downcast<filter_rc_device*>(machine().device("filter1"))->filter_rc_set_RC(filter_rc_device::LOWPASS,1000,2200,1000,CAP_P(C));
/* 76489 #1 (optional) */
C = 0;
@@ -111,12 +111,12 @@ WRITE8_MEMBER(tp84_state::tp84_filter_w)
/* 76489 #2 */
C = 0;
if (offset & 0x080) C += 470000; /* 470000pF = 0.47uF */
- dynamic_cast<filter_rc_device*>(machine().device("filter2"))->filter_rc_set_RC(FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C));
+ downcast<filter_rc_device*>(machine().device("filter2"))->filter_rc_set_RC(filter_rc_device::LOWPASS,1000,2200,1000,CAP_P(C));
/* 76489 #3 */
C = 0;
if (offset & 0x100) C += 470000; /* 470000pF = 0.47uF */
- dynamic_cast<filter_rc_device*>(machine().device("filter3"))->filter_rc_set_RC(FLT_RC_LOWPASS,1000,2200,1000,CAP_P(C));
+ downcast<filter_rc_device*>(machine().device("filter3"))->filter_rc_set_RC(filter_rc_device::LOWPASS,1000,2200,1000,CAP_P(C));
}
WRITE8_MEMBER(tp84_state::tp84_sh_irqtrigger_w)
@@ -286,7 +286,7 @@ INTERRUPT_GEN_MEMBER(tp84_state::sub_vblank_irq)
}
-static MACHINE_CONFIG_START( tp84, tp84_state )
+static MACHINE_CONFIG_START( tp84 )
/* basic machine hardware */
MCFG_CPU_ADD("cpu1",M6809, XTAL_18_432MHz/12) /* verified on pcb */
@@ -442,6 +442,6 @@ ROM_START( tp84b )
ROM_END
-GAME( 1984, tp84, 0, tp84, tp84, driver_device, 0, ROT90, "Konami", "Time Pilot '84 (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, tp84a, tp84, tp84, tp84a, driver_device,0, ROT90, "Konami", "Time Pilot '84 (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, tp84b, tp84, tp84b, tp84, driver_device, 0, ROT90, "Konami", "Time Pilot '84 (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, tp84, 0, tp84, tp84, tp84_state, 0, ROT90, "Konami", "Time Pilot '84 (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, tp84a, tp84, tp84, tp84a, tp84_state, 0, ROT90, "Konami", "Time Pilot '84 (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, tp84b, tp84, tp84b, tp84, tp84_state, 0, ROT90, "Konami", "Time Pilot '84 (set 3)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp
index 0b99d9992a3..95a18f94525 100644
--- a/src/mame/drivers/tr606.cpp
+++ b/src/mame/drivers/tr606.cpp
@@ -77,7 +77,7 @@ void tr606_state::machine_start()
// register for savestates
}
-static MACHINE_CONFIG_START( tr606, tr606_state )
+static MACHINE_CONFIG_START( tr606 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NEC_D650, TP2_HZ)
@@ -107,4 +107,4 @@ ROM_START( tr606 )
ROM_END
-CONS( 1982, tr606, 0, 0, tr606, tr606, driver_device, 0, "Roland", "TR-606 Drumatix", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1982, tr606, 0, 0, tr606, tr606, tr606_state, 0, "Roland", "TR-606 Drumatix", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index b749b17c225..99727a96d1a 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -900,7 +900,7 @@ INTERRUPT_GEN_MEMBER(trackfld_state::vblank_nmi)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( trackfld, trackfld_state )
+static MACHINE_CONFIG_START( trackfld )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI1, MASTER_CLOCK/6/2) /* a guess for now */
@@ -957,7 +957,7 @@ INTERRUPT_GEN_MEMBER(trackfld_state::yieartf_timer_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( yieartf, trackfld_state )
+static MACHINE_CONFIG_START( yieartf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/6/2) /* a guess for now */
@@ -1620,20 +1620,20 @@ DRIVER_INIT_MEMBER(trackfld_state,wizzquiz)
}
-GAME( 1983, trackfld, 0, trackfld, trackfld, trackfld_state, trackfld, ROT0, "Konami", "Track & Field", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, trackfldc, trackfld, trackfld, trackfld, trackfld_state, trackfld, ROT0, "Konami (Centuri license)", "Track & Field (Centuri)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hyprolym, trackfld, trackfld, trackfld, trackfld_state, trackfld, ROT0, "Konami", "Hyper Olympic", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hyprolymb, trackfld, hyprolyb, trackfld, trackfld_state, trackfld, ROT0, "bootleg", "Hyper Olympic (bootleg, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hyprolymba,trackfld, hyprolyb, trackfld, trackfld_state, trackfld, ROT0, "bootleg", "Hyper Olympic (bootleg, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, hipoly, trackfld, hyprolyb, trackfld, trackfld_state, trackfld, ROT0, "bootleg", "Hipoly (bootleg of Hyper Olympic)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, atlantol, trackfld, atlantol, atlantol, trackfld_state, atlantol, ROT0, "bootleg", "Atlant Olimpic", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, trackfldnz,trackfld, trackfld, trackfld, trackfld_state, trackfldnz,ROT0, "bootleg? (Goldberg Enterprizes Inc.)", "Track & Field (NZ bootleg?)", MACHINE_SUPPORTS_SAVE) // bootleg of the Centuri version
+GAME( 1983, trackfld, 0, trackfld, trackfld, trackfld_state, trackfld, ROT0, "Konami", "Track & Field", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, trackfldc, trackfld, trackfld, trackfld, trackfld_state, trackfld, ROT0, "Konami (Centuri license)", "Track & Field (Centuri)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hyprolym, trackfld, trackfld, trackfld, trackfld_state, trackfld, ROT0, "Konami", "Hyper Olympic", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hyprolymb, trackfld, hyprolyb, trackfld, trackfld_state, trackfld, ROT0, "bootleg", "Hyper Olympic (bootleg, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hyprolymba,trackfld, hyprolyb, trackfld, trackfld_state, trackfld, ROT0, "bootleg", "Hyper Olympic (bootleg, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, hipoly, trackfld, hyprolyb, trackfld, trackfld_state, trackfld, ROT0, "bootleg", "Hipoly (bootleg of Hyper Olympic)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, atlantol, trackfld, atlantol, atlantol, trackfld_state, atlantol, ROT0, "bootleg", "Atlant Olimpic", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, trackfldnz,trackfld, trackfld, trackfld, trackfld_state, trackfldnz,ROT0, "bootleg? (Goldberg Enterprizes Inc.)", "Track & Field (NZ bootleg?)", MACHINE_SUPPORTS_SAVE) // bootleg of the Centuri version
-GAME( 1988, mastkin, 0, mastkin, mastkin, trackfld_state, mastkin, ROT0, "Du Tech", "The Masters of Kin", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, mastkin, 0, mastkin, mastkin, trackfld_state, mastkin, ROT0, "Du Tech", "The Masters of Kin", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, wizzquiz, 0, wizzquiz, wizzquiz, trackfld_state, wizzquiz, ROT0, "Zilec-Zenitone (Konami license)", "Wizz Quiz (Konami version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, wizzquiza, wizzquiz, wizzquiz, wizzquiz, trackfld_state, wizzquiz, ROT0, "Zilec-Zenitone", "Wizz Quiz (version 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, wizzquiz, 0, wizzquiz, wizzquiz, trackfld_state, wizzquiz, ROT0, "Zilec-Zenitone (Konami license)", "Wizz Quiz (Konami version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, wizzquiza, wizzquiz, wizzquiz, wizzquiz, trackfld_state, wizzquiz, ROT0, "Zilec-Zenitone", "Wizz Quiz (version 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, reaktor, 0, reaktor, reaktor, driver_device, 0, ROT90, "Zilec", "Reaktor (Track & Field conversion)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, reaktor, 0, reaktor, reaktor, driver_device, 0, ROT90, "Zilec", "Reaktor (Track & Field conversion)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, yieartf, yiear, yieartf, yieartf, driver_device, 0, ROT0, "Konami", "Yie Ar Kung-Fu (GX361 conversion)", MACHINE_SUPPORTS_SAVE ) // the conversion looks of bootleg quality, but the code is clearly a very different revision to either original hardware set...
+GAME( 1985, yieartf, yiear, yieartf, yieartf, driver_device, 0, ROT0, "Konami", "Yie Ar Kung-Fu (GX361 conversion)", MACHINE_SUPPORTS_SAVE ) // the conversion looks of bootleg quality, but the code is clearly a very different revision to either original hardware set...
diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp
index 97874e0b349..5ce58c01ac2 100644
--- a/src/mame/drivers/tranz330.cpp
+++ b/src/mame/drivers/tranz330.cpp
@@ -150,7 +150,7 @@ static const z80_daisy_config tranz330_daisy_chain[] =
// * - check clocks
// ? - check purported RS232 hookup, inconsistent information found at the relevant webpage vs. user-submitted errata
-static MACHINE_CONFIG_START( tranz330, tranz330_state )
+static MACHINE_CONFIG_START( tranz330 )
MCFG_CPU_ADD(CPU_TAG, Z80, XTAL_7_15909MHz/2) //*
MCFG_CPU_PROGRAM_MAP(tranz330_mem)
MCFG_CPU_IO_MAP(tranz330_io)
@@ -200,5 +200,5 @@ ROM_START( tranz330 )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1985, tranz330, 0, 0, tranz330, tranz330, driver_device, 0, "VeriFone", "Tranz 330", MACHINE_CLICKABLE_ARTWORK )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1985, tranz330, 0, 0, tranz330, tranz330, tranz330_state, 0, "VeriFone", "Tranz 330", MACHINE_CLICKABLE_ARTWORK )
diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp
index 9eb1c058c42..19f2bd3e96b 100644
--- a/src/mame/drivers/travrusa.cpp
+++ b/src/mame/drivers/travrusa.cpp
@@ -303,7 +303,7 @@ void travrusa_state::machine_reset()
m_scrollx[1] = 0;
}
-static MACHINE_CONFIG_START( travrusa, travrusa_state )
+static MACHINE_CONFIG_START( travrusa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000) /* 4 MHz (?) */
@@ -616,11 +616,11 @@ DRIVER_INIT_MEMBER(travrusa_state, shtridrb)
}
-GAME( 1983, travrusa, 0, travrusa, travrusa, driver_device, 0, ROT270, "Irem", "Traverse USA / Zippy Race", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, travrusab,travrusa, travrusa, travrusa, driver_device, 0, ROT270, "bootleg (I.P.)", "Traverse USA (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, mototour, travrusa, travrusa, travrusa, driver_device, 0, ROT270, "Irem (Tecfri license)", "MotoTour / Zippy Race (Tecfri license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, motorace, travrusa, travrusa, motorace, travrusa_state, motorace, ROT270, "Irem (Williams license)", "MotoRace USA", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, travrusa, 0, travrusa, travrusa, travrusa_state, 0, ROT270, "Irem", "Traverse USA / Zippy Race", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, travrusab,travrusa, travrusa, travrusa, travrusa_state, 0, ROT270, "bootleg (I.P.)", "Traverse USA (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, mototour, travrusa, travrusa, travrusa, travrusa_state, 0, ROT270, "Irem (Tecfri license)", "MotoTour / Zippy Race (Tecfri license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, motorace, travrusa, travrusa, motorace, travrusa_state, motorace, ROT270, "Irem (Williams license)", "MotoRace USA", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, shtrider, 0, shtrider, shtrider, driver_device, 0, ROT270|ORIENTATION_FLIP_X, "Seibu Kaihatsu", "Shot Rider", MACHINE_SUPPORTS_SAVE ) // possible bootleg
+GAME( 1985, shtrider, 0, shtrider, shtrider, travrusa_state, 0, ROT270|ORIENTATION_FLIP_X, "Seibu Kaihatsu", "Shot Rider", MACHINE_SUPPORTS_SAVE ) // possible bootleg
GAME( 1984, shtridera,shtrider, shtrider, shtrider, travrusa_state, shtridra, ROT270|ORIENTATION_FLIP_X, "Seibu Kaihatsu (Sigma license)", "Shot Rider (Sigma license)", MACHINE_SUPPORTS_SAVE )
GAME( 1985, shtriderb,shtrider, shtriderb,shtrider, travrusa_state, shtridrb, ROT270|ORIENTATION_FLIP_X, "bootleg", "Shot Rider (bootleg)", MACHINE_SUPPORTS_SAVE ) // resets when you attempt to start a game?
diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp
index a3447f5eb02..7110250a508 100644
--- a/src/mame/drivers/tricep.cpp
+++ b/src/mame/drivers/tricep.cpp
@@ -18,19 +18,23 @@ class tricep_state : public driver_device
{
public:
tricep_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_terminal(*this, TERMINAL_TAG)
- ,
- m_p_ram(*this, "p_ram"){ }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_terminal(*this, TERMINAL_TAG)
+ , m_p_ram(*this, "p_ram")
+ {
+ }
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ16_MEMBER(tricep_terminal_r);
DECLARE_WRITE16_MEMBER(tricep_terminal_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
- required_shared_ptr<uint16_t> m_p_ram;
+ void kbd_put(u8 data);
+
+protected:
virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
+ required_shared_ptr<uint16_t> m_p_ram;
};
@@ -66,19 +70,18 @@ void tricep_state::machine_reset()
m_maincpu->reset();
}
-WRITE8_MEMBER( tricep_state::kbd_put )
+void tricep_state::kbd_put(u8 data)
{
}
-static MACHINE_CONFIG_START( tricep, tricep_state )
+static MACHINE_CONFIG_START( tricep )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu",M68000, XTAL_8MHz)
+ MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(tricep_mem)
-
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(tricep_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(tricep_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -90,5 +93,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, tricep, 0, 0, tricep, tricep, driver_device, 0, "Morrow Designs", "Tricep", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, tricep, 0, 0, tricep, tricep, tricep_state, 0, "Morrow Designs", "Tricep", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp
index e395709bdeb..503ed3c2310 100644
--- a/src/mame/drivers/triforce.cpp
+++ b/src/mame/drivers/triforce.cpp
@@ -566,7 +566,7 @@ void triforce_state::machine_start()
descrambler(&rom[0x100], 0x1afe00);
}
-static MACHINE_CONFIG_START( triforce_base, triforce_state )
+static MACHINE_CONFIG_START( triforce_base )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC603, 64000000) /* Correct CPU is a PowerPC 750 (what Apple called "G3") with paired-single vector instructions added */
@@ -1061,77 +1061,77 @@ ROM_START( mkartag2a )
ROM_END
/* Main board */
-/*Triforce*/GAME( 2002, triforce, 0, triforce_base, triforce, driver_device, 0, ROT0, "Sega", "Triforce Bios", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT )
+/*Triforce*/GAME( 2002, triforce, 0, triforce_base, triforce, triforce_state, 0, ROT0, "Sega", "Triforce Bios", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT )
/* GDT-xxxx (Sega GD-ROM games) */
-/* 0001 */ GAME( 2002, vs2002j, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision", "Virtua Striker 2002 (GDT-0001)", MACHINE_IS_SKELETON )
-/* 0002 */ GAME( 2002, vs2002ex, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision", "Virtua Striker 2002 (GDT-0002)", MACHINE_IS_SKELETON )
+/* 0001 */ GAME( 2002, vs2002j, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision", "Virtua Striker 2002 (GDT-0001)", MACHINE_IS_SKELETON )
+/* 0002 */ GAME( 2002, vs2002ex, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision", "Virtua Striker 2002 (GDT-0002)", MACHINE_IS_SKELETON )
// 0003
-// 0004 GAME( 2003, fzeroaxo, fzeroax, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (GDT-0004)", MACHINE_IS_SKELETON )
-// 0004A GAME( 2003, fzeroaxa, fzeroax, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev A) (GDT-0004A)", MACHINE_IS_SKELETON )
-// 0004B GAME( 2003, fzeroaxb, fzeroax, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev B) (GDT-0004B)", MACHINE_IS_SKELETON )
-/* 0004C */ GAME( 2003, fzeroaxc, fzeroax, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev C) (GDT-0004C)", MACHINE_IS_SKELETON )
-// 0004D GAME( 2003, fzeroaxd, fzeroax, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev D) (GDT-0004D)", MACHINE_IS_SKELETON )
-/* 0004E */ GAME( 2003, fzeroax, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev E) (GDT-0004E)", MACHINE_IS_SKELETON )
-// 0005 GAME( 2003, avalonso, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (GDT-0005)", MACHINE_IS_SKELETON )
-// 0005A GAME( 2003, avalonsa, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev A) (GDT-0005A)", MACHINE_IS_SKELETON )
-// 0005B GAME( 2003, avalonsb, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev B) (GDT-0005B)", MACHINE_IS_SKELETON )
-/* 0005C */ GAME( 2003, avalonsc, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev C) (GDT-0005C)", MACHINE_IS_SKELETON )
-// 0005D GAME( 2003, avalonsd, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev D) (GDT-0005D)", MACHINE_IS_SKELETON )
-/* 0005E */ GAME( 2003, avalonse, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev E) (GDT-0005E)", MACHINE_IS_SKELETON )
-/* 0005F */ GAME( 2003, avalonsf, avalons, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev F) (GDT-0005F)", MACHINE_IS_SKELETON )
-/* 0005G */ GAME( 2003, avalons, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev G) (GDT-0005G)", MACHINE_IS_SKELETON )
-// 0006 GAME( 2003, avalonco, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (GDT-0006)", MACHINE_IS_SKELETON )
-// 0006A GAME( 2003, avalonca, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev A) (GDT-0006A)", MACHINE_IS_SKELETON )
-// 0006B GAME( 2003, avaloncb, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev B) (GDT-0006B)", MACHINE_IS_SKELETON )
-// 0006C GAME( 2003, avaloncc, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev C) (GDT-0006C)", MACHINE_IS_SKELETON )
-// 0006D GAME( 2003, avaloncd, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev D) (GDT-0006D)", MACHINE_IS_SKELETON )
-/* 0006E */ GAME( 2003, avalonce, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev E) (GDT-0006E)", MACHINE_IS_SKELETON )
-/* 0006F */ GAME( 2003, avaloncf, avalonc, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev F) (GDT-0006F)", MACHINE_IS_SKELETON )
-/* 0006G */ GAME( 2003, avalonc, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev G) (GDT-0006G)", MACHINE_IS_SKELETON )
+// 0004 GAME( 2003, fzeroaxo, fzeroax, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (GDT-0004)", MACHINE_IS_SKELETON )
+// 0004A GAME( 2003, fzeroaxa, fzeroax, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev A) (GDT-0004A)", MACHINE_IS_SKELETON )
+// 0004B GAME( 2003, fzeroaxb, fzeroax, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev B) (GDT-0004B)", MACHINE_IS_SKELETON )
+/* 0004C */ GAME( 2003, fzeroaxc, fzeroax, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev C) (GDT-0004C)", MACHINE_IS_SKELETON )
+// 0004D GAME( 2003, fzeroaxd, fzeroax, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev D) (GDT-0004D)", MACHINE_IS_SKELETON )
+/* 0004E */ GAME( 2003, fzeroax, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Amusement Vision / Nintendo", "F-Zero AX (Rev E) (GDT-0004E)", MACHINE_IS_SKELETON )
+// 0005 GAME( 2003, avalonso, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (GDT-0005)", MACHINE_IS_SKELETON )
+// 0005A GAME( 2003, avalonsa, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev A) (GDT-0005A)", MACHINE_IS_SKELETON )
+// 0005B GAME( 2003, avalonsb, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev B) (GDT-0005B)", MACHINE_IS_SKELETON )
+/* 0005C */ GAME( 2003, avalonsc, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev C) (GDT-0005C)", MACHINE_IS_SKELETON )
+// 0005D GAME( 2003, avalonsd, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev D) (GDT-0005D)", MACHINE_IS_SKELETON )
+/* 0005E */ GAME( 2003, avalonse, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev E) (GDT-0005E)", MACHINE_IS_SKELETON )
+/* 0005F */ GAME( 2003, avalonsf, avalons, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev F) (GDT-0005F)", MACHINE_IS_SKELETON )
+/* 0005G */ GAME( 2003, avalons, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (server) (Rev G) (GDT-0005G)", MACHINE_IS_SKELETON )
+// 0006 GAME( 2003, avalonco, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (GDT-0006)", MACHINE_IS_SKELETON )
+// 0006A GAME( 2003, avalonca, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev A) (GDT-0006A)", MACHINE_IS_SKELETON )
+// 0006B GAME( 2003, avaloncb, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev B) (GDT-0006B)", MACHINE_IS_SKELETON )
+// 0006C GAME( 2003, avaloncc, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev C) (GDT-0006C)", MACHINE_IS_SKELETON )
+// 0006D GAME( 2003, avaloncd, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev D) (GDT-0006D)", MACHINE_IS_SKELETON )
+/* 0006E */ GAME( 2003, avalonce, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev E) (GDT-0006E)", MACHINE_IS_SKELETON )
+/* 0006F */ GAME( 2003, avaloncf, avalonc, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev F) (GDT-0006F)", MACHINE_IS_SKELETON )
+/* 0006G */ GAME( 2003, avalonc, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon - The Wizard Master (client) (Rev G) (GDT-0006G)", MACHINE_IS_SKELETON )
// 0007
-// 0008 GAME( 2003, gekpuryao,gekpurya, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (GDT-0008)", MACHINE_IS_SKELETON )
-// 0008A GAME( 2003, gekpuryaa,gekpurya, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (Rev A) (GDT-0008A)", MACHINE_IS_SKELETON )
-/* 0008B */ GAME( 2003, gekpuryb, gekpurya, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (Rev B) (GDT-0008B)", MACHINE_IS_SKELETON )
-/* 0008C */ GAME( 2003, gekpurya, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (Rev C) (GDT-0008C)", MACHINE_IS_SKELETON )
-// 0009 GAME( 2004, avalns11, avalns13, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (server) (GDT-0009)", MACHINE_IS_SKELETON )
-/* 0009A */ GAME( 2004, avalns12, avalns13, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.2 - Summon The New Monsters (server) (Rev A) (GDT-0009A)", MACHINE_IS_SKELETON )
-// 0009B GAME( 2004, avals13b, avalns13, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (server) (Rev B) (GDT-0009B)", MACHINE_IS_SKELETON )
-/* 0009C */ GAME( 2004, avalns13, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.3 - Chaotic Sabbat (server) (Rev C) (GDT-0009C)", MACHINE_IS_SKELETON )
-// 0010 GAME( 2004, avalnc11, avalnc13, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (client) (GDT-0010)", MACHINE_IS_SKELETON )
-/* 0010A */ GAME( 2004, avalnc12, avalnc13, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.2 - Summon The New Monsters (client) (Rev A) (GDT-0010A)", MACHINE_IS_SKELETON )
-// 0010B GAME( 2004, avalc13b, avalnc13, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (client) (Rev B) (GDT-0010B)", MACHINE_IS_SKELETON )
-/* 0010C */ GAME( 2004, avalnc13, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.3 - Chaotic Sabbat (client) (Rev C) (GDT-0010C)", MACHINE_IS_SKELETON )
-/* 0011 */ GAME( 2004, tfupdate, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Triforce DIMM Updater (3.17) (GDT-0011)", MACHINE_IS_SKELETON )
+// 0008 GAME( 2003, gekpuryao,gekpurya, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (GDT-0008)", MACHINE_IS_SKELETON )
+// 0008A GAME( 2003, gekpuryaa,gekpurya, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (Rev A) (GDT-0008A)", MACHINE_IS_SKELETON )
+/* 0008B */ GAME( 2003, gekpuryb, gekpurya, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (Rev B) (GDT-0008B)", MACHINE_IS_SKELETON )
+/* 0008C */ GAME( 2003, gekpurya, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Wow Entertainment", "Gekitou Pro Yakyuu Mizushima Shinji All Stars vs. Pro Yakyuu (Rev C) (GDT-0008C)", MACHINE_IS_SKELETON )
+// 0009 GAME( 2004, avalns11, avalns13, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (server) (GDT-0009)", MACHINE_IS_SKELETON )
+/* 0009A */ GAME( 2004, avalns12, avalns13, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.2 - Summon The New Monsters (server) (Rev A) (GDT-0009A)", MACHINE_IS_SKELETON )
+// 0009B GAME( 2004, avals13b, avalns13, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (server) (Rev B) (GDT-0009B)", MACHINE_IS_SKELETON )
+/* 0009C */ GAME( 2004, avalns13, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.3 - Chaotic Sabbat (server) (Rev C) (GDT-0009C)", MACHINE_IS_SKELETON )
+// 0010 GAME( 2004, avalnc11, avalnc13, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (client) (GDT-0010)", MACHINE_IS_SKELETON )
+/* 0010A */ GAME( 2004, avalnc12, avalnc13, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.2 - Summon The New Monsters (client) (Rev A) (GDT-0010A)", MACHINE_IS_SKELETON )
+// 0010B GAME( 2004, avalc13b, avalnc13, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.? - ??? (client) (Rev B) (GDT-0010B)", MACHINE_IS_SKELETON )
+/* 0010C */ GAME( 2004, avalnc13, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 1.3 - Chaotic Sabbat (client) (Rev C) (GDT-0010C)", MACHINE_IS_SKELETON )
+/* 0011 */ GAME( 2004, tfupdate, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Triforce DIMM Updater (3.17) (GDT-0011)", MACHINE_IS_SKELETON )
// 0012
-// 0013 GAME( 2005, vs4jo, vs4j, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (GDT-0013)", MACHINE_IS_SKELETON )
-// 0013A GAME( 2005, vs4ja, vs4j, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev A) (GDT-0013A)", MACHINE_IS_SKELETON )
-// 0013B GAME( 2005, vs4jb, vs4j, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev B) (GDT-0013B)", MACHINE_IS_SKELETON )
-// 0013C GAME( 2005, vs4jc, vs4j, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev C) (GDT-0013C)", MACHINE_IS_SKELETON )
-// 0013D GAME( 2005, vs4jd, vs4j, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev D) (GDT-0013D)", MACHINE_IS_SKELETON )
-/* 0013E */ GAME( 2005, vs4j, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev E) (GDT-0013E)", MACHINE_IS_SKELETON )
+// 0013 GAME( 2005, vs4jo, vs4j, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (GDT-0013)", MACHINE_IS_SKELETON )
+// 0013A GAME( 2005, vs4ja, vs4j, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev A) (GDT-0013A)", MACHINE_IS_SKELETON )
+// 0013B GAME( 2005, vs4jb, vs4j, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev B) (GDT-0013B)", MACHINE_IS_SKELETON )
+// 0013C GAME( 2005, vs4jc, vs4j, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev C) (GDT-0013C)", MACHINE_IS_SKELETON )
+// 0013D GAME( 2005, vs4jd, vs4j, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev D) (GDT-0013D)", MACHINE_IS_SKELETON )
+/* 0013E */ GAME( 2005, vs4j, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Japan) (Rev E) (GDT-0013E)", MACHINE_IS_SKELETON )
// 0014
-/* 0015 */ GAME( 2004, vs4, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 (Export) (GDT-0015)", MACHINE_IS_SKELETON )
-// 0016 GAME( 2004, avalons20,triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (server) (GDT-0016)", MACHINE_IS_SKELETON )
-// 0017 GAME( 2004, avalon20o,avalon20, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (client) (GDT-0017)", MACHINE_IS_SKELETON )
-// 0017A GAME( 2004, avalon20a,avalon20, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (client) (Rev A) (GDT-0017A)", MACHINE_IS_SKELETON )
-/* 0017B */ GAME( 2004, avalon20, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (client) (Rev B) (GDT-0017B)", MACHINE_IS_SKELETON )
-// 0018 GAME( 2005, avalns25o,avalns25, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (server) (GDT-0018)", MACHINE_IS_SKELETON )
-// 0018A GAME( 2005, avalns25a,avalns25, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (server) (Rev A) (GDT-0018A)", MACHINE_IS_SKELETON )
-/* 0018B */ GAME( 2005, avalns25, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (server) (Rev B) (GDT-0018B)", MACHINE_IS_SKELETON )
-// 0019 GAME( 2005, avalnc25o,avalnc25, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (client) (GDT-0019)", MACHINE_IS_SKELETON )
-// 0019A GAME( 2005, avalnc25a,avalnc25, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (client) (Rev A) (GDT-0019A)", MACHINE_IS_SKELETON )
-/* 0019B */ GAME( 2005, avalnc25, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (client) (Rev B) (GDT-0019B)", MACHINE_IS_SKELETON )
-// 0020 GAME( 2006, vs42006o, vs42006, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (GDT-0020)", MACHINE_IS_SKELETON )
-// 0020A GAME( 2006, vs42006a, vs42006, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev A) (GDT-0020A)", MACHINE_IS_SKELETON )
-// 0020B GAME( 2006, vs42006b, vs42006, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev B) (GDT-0020B)", MACHINE_IS_SKELETON )
-// 0020C GAME( 2006, vs42006c, vs42006, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev C) (GDT-0020C)", MACHINE_IS_SKELETON )
-/* 0020D */ GAME( 2006, vs42006, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev D) (GDT-0020D)", MACHINE_IS_SKELETON )
-/* 0021 */ GAME( 2006, vs42k6ex, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Export) (GDT-0021)", MACHINE_IS_SKELETON )
-// 0022 GAME( 2006, tcfboxo, tcfboxa, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Triforce Firmware Update For Compact Flash Box (GDT-0022)", MACHINE_IS_SKELETON )
-/* 0022A */ GAME( 2006, tcfboxa, triforce, triforcegd, triforce, driver_device, 0, ROT0, "Sega", "Triforce Firmware Update For Compact Flash Box (4.01) (GDT-0022A)", MACHINE_IS_SKELETON )
+/* 0015 */ GAME( 2004, vs4, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 (Export) (GDT-0015)", MACHINE_IS_SKELETON )
+// 0016 GAME( 2004, avalons20,triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (server) (GDT-0016)", MACHINE_IS_SKELETON )
+// 0017 GAME( 2004, avalon20o,avalon20, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (client) (GDT-0017)", MACHINE_IS_SKELETON )
+// 0017A GAME( 2004, avalon20a,avalon20, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (client) (Rev A) (GDT-0017A)", MACHINE_IS_SKELETON )
+/* 0017B */ GAME( 2004, avalon20, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.0 - Eutaxy and Commandment (client) (Rev B) (GDT-0017B)", MACHINE_IS_SKELETON )
+// 0018 GAME( 2005, avalns25o,avalns25, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (server) (GDT-0018)", MACHINE_IS_SKELETON )
+// 0018A GAME( 2005, avalns25a,avalns25, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (server) (Rev A) (GDT-0018A)", MACHINE_IS_SKELETON )
+/* 0018B */ GAME( 2005, avalns25, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (server) (Rev B) (GDT-0018B)", MACHINE_IS_SKELETON )
+// 0019 GAME( 2005, avalnc25o,avalnc25, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (client) (GDT-0019)", MACHINE_IS_SKELETON )
+// 0019A GAME( 2005, avalnc25a,avalnc25, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (client) (Rev A) (GDT-0019A)", MACHINE_IS_SKELETON )
+/* 0019B */ GAME( 2005, avalnc25, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega / Hitmaker", "The Key Of Avalon 2.5 - War of the Key (client) (Rev B) (GDT-0019B)", MACHINE_IS_SKELETON )
+// 0020 GAME( 2006, vs42006o, vs42006, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (GDT-0020)", MACHINE_IS_SKELETON )
+// 0020A GAME( 2006, vs42006a, vs42006, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev A) (GDT-0020A)", MACHINE_IS_SKELETON )
+// 0020B GAME( 2006, vs42006b, vs42006, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev B) (GDT-0020B)", MACHINE_IS_SKELETON )
+// 0020C GAME( 2006, vs42006c, vs42006, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev C) (GDT-0020C)", MACHINE_IS_SKELETON )
+/* 0020D */ GAME( 2006, vs42006, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Japan) (Rev D) (GDT-0020D)", MACHINE_IS_SKELETON )
+/* 0021 */ GAME( 2006, vs42k6ex, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Virtua Striker 4 Ver.2006 (Export) (GDT-0021)", MACHINE_IS_SKELETON )
+// 0022 GAME( 2006, tcfboxo, tcfboxa, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Triforce Firmware Update For Compact Flash Box (GDT-0022)", MACHINE_IS_SKELETON )
+/* 0022A */ GAME( 2006, tcfboxa, triforce, triforcegd, triforce, triforce_state, 0, ROT0, "Sega", "Triforce Firmware Update For Compact Flash Box (4.01) (GDT-0022A)", MACHINE_IS_SKELETON )
// 837-xxxxx (Sega cart games)
-/* 14343-4T1 */ GAME( 2005, mkartagp, triforce, triforce_base, triforce, driver_device, 0, ROT0, "Namco / Nintendo", "Mario Kart Arcade GP (Japan, MKA1 Ver.A1)", MACHINE_IS_SKELETON )
-/* 14343-R4S0 */ GAME( 2007, mkartag2, triforce, triforce_base, triforce, driver_device, 0, ROT0, "Namco / Nintendo", "Mario Kart Arcade GP 2 (Japan, MK21 Ver.A)", MACHINE_IS_SKELETON )
-/* 14343-R4S0 */ GAME( 2007, mkartag2a,mkartag2, triforce_base, triforce, driver_device, 0, ROT0, "Namco / Nintendo", "Mario Kart Arcade GP 2 (Japan, MK21 Ver.A, alt dump)", MACHINE_IS_SKELETON )
+/* 14343-4T1 */ GAME( 2005, mkartagp, triforce, triforce_base, triforce, triforce_state, 0, ROT0, "Namco / Nintendo", "Mario Kart Arcade GP (Japan, MKA1 Ver.A1)", MACHINE_IS_SKELETON )
+/* 14343-R4S0 */ GAME( 2007, mkartag2, triforce, triforce_base, triforce, triforce_state, 0, ROT0, "Namco / Nintendo", "Mario Kart Arcade GP 2 (Japan, MK21 Ver.A)", MACHINE_IS_SKELETON )
+/* 14343-R4S0 */ GAME( 2007, mkartag2a,mkartag2, triforce_base, triforce, triforce_state, 0, ROT0, "Namco / Nintendo", "Mario Kart Arcade GP 2 (Japan, MK21 Ver.A, alt dump)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp
index e0d6e74e39d..fe020337307 100644
--- a/src/mame/drivers/triplhnt.cpp
+++ b/src/mame/drivers/triplhnt.cpp
@@ -301,7 +301,7 @@ PALETTE_INIT_MEMBER(triplhnt_state, triplhnt)
}
-static MACHINE_CONFIG_START( triplhnt, triplhnt_state )
+static MACHINE_CONFIG_START( triplhnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6800, 800000)
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index f3c3e3aa306..3e595bd4d78 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -166,10 +166,10 @@ static ADDRESS_MAP_START( model1_map, AS_PROGRAM, 8, trs80_state )
AM_RANGE(0x37e4, 0x37e7) AM_WRITE(trs80_cassunit_w)
AM_RANGE(0x37e8, 0x37eb) AM_READWRITE(trs80_printer_r, trs80_printer_w)
AM_RANGE(0x37ec, 0x37ec) AM_READ(trs80_wd179x_r)
- AM_RANGE(0x37ec, 0x37ec) AM_DEVWRITE("fdc", fd1793_t, cmd_w)
- AM_RANGE(0x37ed, 0x37ed) AM_DEVREADWRITE("fdc", fd1793_t, track_r, track_w)
- AM_RANGE(0x37ee, 0x37ee) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w)
- AM_RANGE(0x37ef, 0x37ef) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w)
+ AM_RANGE(0x37ec, 0x37ec) AM_DEVWRITE("fdc", fd1793_device, cmd_w)
+ AM_RANGE(0x37ed, 0x37ed) AM_DEVREADWRITE("fdc", fd1793_device, track_r, track_w)
+ AM_RANGE(0x37ee, 0x37ee) AM_DEVREADWRITE("fdc", fd1793_device, sector_r, sector_w)
+ AM_RANGE(0x37ef, 0x37ef) AM_DEVREADWRITE("fdc", fd1793_device, data_r, data_w)
AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x300) AM_READ(trs80_keyboard_r)
AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram")
AM_RANGE(0x4000, 0xffff) AM_RAM
@@ -220,10 +220,10 @@ static ADDRESS_MAP_START( model3_io, AS_IO, 8, trs80_state )
AM_RANGE(0xeb, 0xeb) AM_READWRITE(trs80m4_eb_r, trs80m4_eb_w)
AM_RANGE(0xec, 0xef) AM_READWRITE(trs80m4_ec_r, trs80m4_ec_w)
AM_RANGE(0xf0, 0xf0) AM_READ(trs80_wd179x_r)
- AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_t, cmd_w)
- AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_t, track_r, track_w)
- AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w)
- AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w)
+ AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_device, cmd_w)
+ AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_device, track_r, track_w)
+ AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_device, sector_r, sector_w)
+ AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_device, data_r, data_w)
AM_RANGE(0xf4, 0xf4) AM_WRITE(trs80m4_f4_w)
AM_RANGE(0xf8, 0xfb) AM_READWRITE(trs80_printer_r, trs80_printer_w)
AM_RANGE(0xfc, 0xff) AM_READWRITE(trs80m4_ff_r, trs80m4_ff_w)
@@ -243,10 +243,10 @@ static ADDRESS_MAP_START( model4_io, AS_IO, 8, trs80_state )
AM_RANGE(0xeb, 0xeb) AM_READWRITE(trs80m4_eb_r, trs80m4_eb_w)
AM_RANGE(0xec, 0xef) AM_READWRITE(trs80m4_ec_r, trs80m4_ec_w)
AM_RANGE(0xf0, 0xf0) AM_READ(trs80_wd179x_r)
- AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_t, cmd_w)
- AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_t, track_r, track_w)
- AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w)
- AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w)
+ AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_device, cmd_w)
+ AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_device, track_r, track_w)
+ AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_device, sector_r, sector_w)
+ AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_device, data_r, data_w)
AM_RANGE(0xf4, 0xf4) AM_WRITE(trs80m4_f4_w)
AM_RANGE(0xf8, 0xfb) AM_READWRITE(trs80_printer_r, trs80_printer_w)
AM_RANGE(0xfc, 0xff) AM_READWRITE(trs80m4_ff_r, trs80m4_ff_w)
@@ -267,10 +267,10 @@ static ADDRESS_MAP_START( model4p_io, AS_IO, 8, trs80_state )
AM_RANGE(0xeb, 0xeb) AM_READWRITE(trs80m4_eb_r, trs80m4_eb_w)
AM_RANGE(0xec, 0xef) AM_READWRITE(trs80m4_ec_r, trs80m4_ec_w)
AM_RANGE(0xf0, 0xf0) AM_READ(trs80_wd179x_r)
- AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_t, cmd_w)
- AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_t, track_r, track_w)
- AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w)
- AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w)
+ AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_device, cmd_w)
+ AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_device, track_r, track_w)
+ AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_device, sector_r, sector_w)
+ AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_device, data_r, data_w)
AM_RANGE(0xf4, 0xf4) AM_WRITE(trs80m4_f4_w)
AM_RANGE(0xf8, 0xfb) AM_READWRITE(trs80_printer_r, trs80_printer_w)
AM_RANGE(0xfc, 0xff) AM_READWRITE(trs80m4_ff_r, trs80m4_ff_w)
@@ -292,10 +292,10 @@ static ADDRESS_MAP_START( meritum_io, AS_IO, 8, trs80_state )
// eg. port F0 should be 5, port F2 should have bit 3 set.
//AM_RANGE(0x03, 0x03) unknown
AM_RANGE(0xf0, 0xf0) AM_READ(trs80_wd179x_r)
- AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_t, cmd_w)
- AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_t, track_r, track_w)
- AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w)
- AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w)
+ AM_RANGE(0xf0, 0xf0) AM_DEVWRITE("fdc", fd1793_device, cmd_w)
+ AM_RANGE(0xf1, 0xf1) AM_DEVREADWRITE("fdc", fd1793_device, track_r, track_w)
+ AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("fdc", fd1793_device, sector_r, sector_w)
+ AM_RANGE(0xf3, 0xf3) AM_DEVREADWRITE("fdc", fd1793_device, data_r, data_w)
AM_RANGE(0xf4, 0xf4) AM_WRITE(trs80m4_f4_w)
AM_RANGE(0xf8, 0xfb) AM_READWRITE(trs80_printer_r, trs80_printer_w)
//AM_RANGE(0xfc, 0xfd) unknown
@@ -570,7 +570,7 @@ static SLOT_INTERFACE_START( trs80_floppies )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( trs80, trs80_state ) // the original model I, level I, with no extras
+static MACHINE_CONFIG_START( trs80 ) // the original model I, level I, with no extras
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 1796000) /* 1.796 MHz */
MCFG_CPU_PROGRAM_MAP(trs80_map)
@@ -924,17 +924,17 @@ DRIVER_INIT_MEMBER(trs80_state,lnw80)
m_p_videoram.set_target(memregion("maincpu")->base()+0x4000,m_p_videoram.bytes());
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1977, trs80, 0, 0, trs80, trs80, trs80_state, trs80, "Tandy Radio Shack", "TRS-80 Model I (Level I Basic)", 0 )
-COMP( 1978, trs80l2, trs80, 0, model1, trs80, trs80_state, trs80l2, "Tandy Radio Shack", "TRS-80 Model I (Level II Basic)", 0 )
-COMP( 1983, radionic, trs80, 0, radionic, trs80, trs80_state, trs80, "Komtek", "Radionic", 0 )
-COMP( 1980, sys80, trs80, 0, sys80, trs80, trs80_state, trs80l2, "EACA Computers Ltd", "System-80", 0 )
-COMP( 1981, lnw80, trs80, 0, lnw80, trs80m3, trs80_state, lnw80, "LNW Research", "LNW-80", 0 )
-COMP( 1980, trs80m3, trs80, 0, model3, trs80m3, trs80_state, trs80m4, "Tandy Radio Shack", "TRS-80 Model III", 0 )
-COMP( 1980, trs80m4, trs80, 0, model4, trs80m3, trs80_state, trs80m4, "Tandy Radio Shack", "TRS-80 Model 4", 0 )
-COMP( 1983, trs80m4p, trs80, 0, model4p, trs80m3, trs80_state, trs80m4p, "Tandy Radio Shack", "TRS-80 Model 4P", 0 )
-COMP( 1983, ht1080z, trs80, 0, ht1080z, trs80, trs80_state, trs80l2, "Hiradastechnika Szovetkezet", "HT-1080Z Series I", 0 )
-COMP( 1984, ht1080z2, trs80, 0, ht1080z, trs80, trs80_state, trs80l2, "Hiradastechnika Szovetkezet", "HT-1080Z Series II", 0 )
-COMP( 1985, ht108064, trs80, 0, ht1080z, trs80, trs80_state, trs80, "Hiradastechnika Szovetkezet", "HT-1080Z/64", 0 )
-COMP( 1985, meritum, trs80, 0, meritum, trs80, trs80_state, trs80l2, "Mera-Elzab", "Meritum I (Model 2)", 0 )
-COMP( 1985, meritum_net, trs80, 0, meritum, trs80, trs80_state, trs80l2, "Mera-Elzab", "Meritum I (Model 2) (network)", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, trs80, 0, 0, trs80, trs80, trs80_state, trs80, "Tandy Radio Shack", "TRS-80 Model I (Level I Basic)", 0 )
+COMP( 1978, trs80l2, trs80, 0, model1, trs80, trs80_state, trs80l2, "Tandy Radio Shack", "TRS-80 Model I (Level II Basic)", 0 )
+COMP( 1983, radionic, trs80, 0, radionic, trs80, trs80_state, trs80, "Komtek", "Radionic", 0 )
+COMP( 1980, sys80, trs80, 0, sys80, trs80, trs80_state, trs80l2, "EACA Computers Ltd", "System-80", 0 )
+COMP( 1981, lnw80, trs80, 0, lnw80, trs80m3, trs80_state, lnw80, "LNW Research", "LNW-80", 0 )
+COMP( 1980, trs80m3, trs80, 0, model3, trs80m3, trs80_state, trs80m4, "Tandy Radio Shack", "TRS-80 Model III", 0 )
+COMP( 1980, trs80m4, trs80, 0, model4, trs80m3, trs80_state, trs80m4, "Tandy Radio Shack", "TRS-80 Model 4", 0 )
+COMP( 1983, trs80m4p, trs80, 0, model4p, trs80m3, trs80_state, trs80m4p, "Tandy Radio Shack", "TRS-80 Model 4P", 0 )
+COMP( 1983, ht1080z, trs80, 0, ht1080z, trs80, trs80_state, trs80l2, "Hiradastechnika Szovetkezet", "HT-1080Z Series I", 0 )
+COMP( 1984, ht1080z2, trs80, 0, ht1080z, trs80, trs80_state, trs80l2, "Hiradastechnika Szovetkezet", "HT-1080Z Series II", 0 )
+COMP( 1985, ht108064, trs80, 0, ht1080z, trs80, trs80_state, trs80, "Hiradastechnika Szovetkezet", "HT-1080Z/64", 0 )
+COMP( 1985, meritum, trs80, 0, meritum, trs80, trs80_state, trs80l2, "Mera-Elzab", "Meritum I (Model 2)", 0 )
+COMP( 1985, meritum_net, trs80, 0, meritum, trs80, trs80_state, trs80l2, "Mera-Elzab", "Meritum I (Model 2) (network)", 0 )
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index 2231afb6e36..3ee4da460dd 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -490,7 +490,7 @@ WRITE_LINE_MEMBER( trs80m2_state::kb_clock_w )
m_kbclk = state;
}
-WRITE8_MEMBER( trs80m2_state::kbd_w )
+void trs80m2_state::kbd_w(u8 data)
{
// latch key data
m_key_data = data;
@@ -702,7 +702,7 @@ void trs80m2_state::machine_reset()
// MACHINE_CONFIG( trs80m2 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( trs80m2, trs80m2_state )
+static MACHINE_CONFIG_START( trs80m2 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
@@ -771,7 +771,7 @@ static MACHINE_CONFIG_START( trs80m2, trs80m2_state )
MCFG_DEVICE_ADD(TRS80M2_KEYBOARD_TAG, TRS80M2_KEYBOARD, 0)
MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(WRITELINE(trs80m2_state, kb_clock_w))
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(trs80m2_state, kbd_w))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(trs80m2_state, kbd_w))
// internal RAM
MCFG_RAM_ADD(RAM_TAG)
@@ -787,7 +787,7 @@ MACHINE_CONFIG_END
// MACHINE_CONFIG( trs80m16 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( trs80m16, trs80m16_state )
+static MACHINE_CONFIG_START( trs80m16 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_Z80_DAISY_CHAIN(trs80m2_daisy_chain)
@@ -863,7 +863,7 @@ static MACHINE_CONFIG_START( trs80m16, trs80m16_state )
MCFG_DEVICE_ADD(TRS80M2_KEYBOARD_TAG, TRS80M2_KEYBOARD, 0)
MCFG_TRS80M2_KEYBOARD_CLOCK_CALLBACK(WRITELINE(trs80m2_state, kb_clock_w))
MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(trs80m2_state, kbd_w))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(trs80m2_state, kbd_w))
// internal RAM
MCFG_RAM_ADD(RAM_TAG)
@@ -950,9 +950,9 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1979, trs80m2, 0, 0, trs80m2, trs80m2, driver_device, 0, "Tandy Radio Shack", "TRS-80 Model II", MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
-COMP( 1982, trs80m16, trs80m2, 0, trs80m16, trs80m2, driver_device, 0, "Tandy Radio Shack", "TRS-80 Model 16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
-//COMP( 1983, trs80m12, trs80m2, 0, trs80m16, trs80m2, driver_device, 0, "Tandy Radio Shack", "TRS-80 Model 12", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
-//COMP( 1984, trs80m16b,trs80m2, 0, trs80m16, trs80m2, driver_device, 0, "Tandy Radio Shack", "TRS-80 Model 16B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
-//COMP( 1985, tandy6k, trs80m2, 0, tandy6k, trs80m2, driver_device, 0, "Tandy Radio Shack", "Tandy 6000 HD", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1979, trs80m2, 0, 0, trs80m2, trs80m2, trs80m2_state, 0, "Tandy Radio Shack", "TRS-80 Model II", MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
+COMP( 1982, trs80m16, trs80m2, 0, trs80m16, trs80m2, trs80m16_state, 0, "Tandy Radio Shack", "TRS-80 Model 16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
+//COMP( 1983, trs80m12, trs80m2, 0, trs80m16, trs80m2, trs80m16_state, 0, "Tandy Radio Shack", "TRS-80 Model 12", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
+//COMP( 1984, trs80m16b,trs80m2, 0, trs80m16, trs80m2, trs80m16_state, 0, "Tandy Radio Shack", "TRS-80 Model 16B", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
+//COMP( 1985, tandy6k, trs80m2, 0, tandy6k, trs80m2, tandy6k_state, 0, "Tandy Radio Shack", "Tandy 6000 HD", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_IMPERFECT_KEYBOARD )
diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp
index 24dee6ebd60..cf2bb59b5b6 100644
--- a/src/mame/drivers/truco.cpp
+++ b/src/mame/drivers/truco.cpp
@@ -416,7 +416,7 @@ INTERRUPT_GEN_MEMBER(truco_state::interrupt)
* Machine Driver *
*******************************************/
-static MACHINE_CONFIG_START( truco, truco_state )
+static MACHINE_CONFIG_START( truco )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, CPU_CLOCK)
@@ -471,5 +471,5 @@ ROM_START( truco )
ROM_LOAD( "truco.u2", 0x0c000, 0x4000, CRC(ff355750) SHA1(1538f20b1919928ffca439e4046a104ddfbc756c) )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS */
-GAME( 198?, truco, 0, truco, truco, driver_device, 0, ROT0, "Playtronic SRL", "Truco-Tron", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 198?, truco, 0, truco, truco, truco_state, 0, ROT0, "Playtronic SRL", "Truco-Tron", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp
index 7c61b84aaf5..62eb1cd3377 100644
--- a/src/mame/drivers/trucocl.cpp
+++ b/src/mame/drivers/trucocl.cpp
@@ -142,7 +142,7 @@ INTERRUPT_GEN_MEMBER(trucocl_state::trucocl_interrupt)
}
-static MACHINE_CONFIG_START( trucocl, trucocl_state )
+static MACHINE_CONFIG_START( trucocl )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -207,6 +207,5 @@ DRIVER_INIT_MEMBER(trucocl_state,trucocl)
/******************************************************************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR */
-
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR
GAME( 1991, trucocl, 0, trucocl, trucocl, trucocl_state, trucocl, ROT0, "Miky SRL", "Truco Clemente", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index ea31e27cf16..46461a1de1e 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -379,7 +379,7 @@ void trvmadns_state::machine_reset()
m_old_data = -1;
}
-static MACHINE_CONFIG_START( trvmadns, trvmadns_state )
+static MACHINE_CONFIG_START( trvmadns )
MCFG_CPU_ADD("maincpu", Z80, XTAL_10MHz/4) // Most likely 2.5MHz (less likely 5MHz (10MHz/2))
MCFG_CPU_PROGRAM_MAP(cpu_map)
MCFG_CPU_IO_MAP(io_map)
@@ -463,5 +463,5 @@ ROM_START( trvmadnsa )
// empty space, for 3 roms (each one max 0x8000 bytes long)
ROM_END
-GAME( 1985, trvmadns, 0, trvmadns, trvmadns, driver_device, 0, ROT0, "Thunderhead Inc.", "Trivia Madness - Series A Question set", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING )
-GAME( 1985, trvmadnsa, trvmadns, trvmadns, trvmadns, driver_device, 0, ROT0, "Thunderhead Inc.", "Trivia Madness - Series B Question set", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING )
+GAME( 1985, trvmadns, 0, trvmadns, trvmadns, trvmadns_state, 0, ROT0, "Thunderhead Inc.", "Trivia Madness - Series A Question set", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING )
+GAME( 1985, trvmadnsa, trvmadns, trvmadns, trvmadns, trvmadns_state, 0, ROT0, "Thunderhead Inc.", "Trivia Madness - Series B Question set", MACHINE_WRONG_COLORS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp
index 0c5eb0f4544..49c05ddde00 100644
--- a/src/mame/drivers/trvquest.cpp
+++ b/src/mame/drivers/trvquest.cpp
@@ -177,7 +177,7 @@ INTERRUPT_GEN_MEMBER(gameplan_state::trvquest_interrupt)
m_via_2->write_ca1(0);
}
-static MACHINE_CONFIG_START( trvquest, gameplan_state )
+static MACHINE_CONFIG_START( trvquest )
MCFG_CPU_ADD("maincpu", M6809,XTAL_6MHz/4)
MCFG_CPU_PROGRAM_MAP(cpu_map)
@@ -238,4 +238,4 @@ ROM_START( trvquest )
ROM_LOAD( "roma", 0x16000, 0x2000, CRC(b4bcaf33) SHA1(c6b08fb8d55b2834d0c6c5baff9f544c795e4c15) )
ROM_END
-GAME( 1984, trvquest, 0, trvquest, trvquest, driver_device, 0, ROT90, "Sunn / Techstar", "Trivia Quest", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, trvquest, 0, trvquest, trvquest, gameplan_state, 0, ROT90, "Sunn / Techstar", "Trivia Quest", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp
index 24887efe4cb..274154a2413 100644
--- a/src/mame/drivers/tryout.cpp
+++ b/src/mame/drivers/tryout.cpp
@@ -189,7 +189,7 @@ static GFXDECODE_START( tryout )
GFXDECODE_ENTRY( nullptr, 0, vramlayout, 0, 4 )
GFXDECODE_END
-static MACHINE_CONFIG_START( tryout, tryout_state )
+static MACHINE_CONFIG_START( tryout )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 2000000) /* ? */
MCFG_CPU_PROGRAM_MAP(main_cpu)
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index dd8efa0aec2..bb7ea828b83 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -56,7 +56,7 @@ public:
DECLARE_WRITE8_MEMBER(memory_write_byte);
DECLARE_READ8_MEMBER(io_read_byte);
DECLARE_WRITE8_MEMBER(io_write_byte);
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
private:
uint8_t m_term_data;
address_space *m_mem;
@@ -88,7 +88,7 @@ static ADDRESS_MAP_START(ts802_io, AS_IO, 8, ts802_state)
// 10: Z80 DMA
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("z80dma", z80dma_device, read, write)
// 14-17: WD 1793
- AM_RANGE(0x14, 0x17) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0x14, 0x17) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
// 18: floppy misc.
AM_RANGE(0x18, 0x1c) AM_WRITE(port18_w)
// 20-23: Z80 SIO #2
@@ -153,7 +153,7 @@ READ8_MEMBER( ts802_state::port0d_r )
return ret;
}
-WRITE8_MEMBER( ts802_state::kbd_put )
+void ts802_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -182,7 +182,7 @@ DRIVER_INIT_MEMBER( ts802_state, ts802 )
membank("bankw0")->configure_entry(0, &main[0x0000]);
}
-static MACHINE_CONFIG_START( ts802, ts802_state )
+static MACHINE_CONFIG_START( ts802 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(ts802_mem)
@@ -192,7 +192,7 @@ static MACHINE_CONFIG_START( ts802, ts802_state )
/* Devices */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ts802_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ts802_state, kbd_put))
MCFG_DEVICE_ADD("z80dma", Z80DMA, XTAL_16MHz / 4)
MCFG_Z80DMA_OUT_BUSREQ_CB(INPUTLINE("maincpu", INPUT_LINE_HALT))
@@ -237,6 +237,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1982, ts802, 0, 0, ts802, ts802, ts802_state, ts802, "Televideo", "TS802", MACHINE_IS_SKELETON )
COMP( 1982, ts802h, ts802, 0, ts802, ts802, ts802_state, ts802, "Televideo", "TS802H", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 253f9f0c9dd..263fb10adb9 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -107,7 +107,7 @@ private:
required_device<palette_device> m_palette;
required_device<cpu_device> m_maincpu;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
//required_device<z80sti_device> m_sti;
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START(ts803_io, AS_IO, 8, ts803_state)
//AM_RANGE(0x20, 0x2f) AM_DEVREADWRITE("sti", z80sti_device, read, write)
AM_RANGE(0x30, 0x33) AM_DEVREADWRITE("dart", z80dart_device, cd_ba_r, cd_ba_w)
- AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0x90, 0x90) AM_READWRITE(disk_0_control_r,disk_0_control_w)
//AM_RANGE(0x91, 0xff) AM_READWRITE(ts803_porthi_r, ts803_porthi_w)
@@ -491,7 +491,7 @@ static const z80_daisy_config daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( ts803, ts803_state )
+static MACHINE_CONFIG_START( ts803 )
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(ts803_mem)
MCFG_CPU_IO_MAP(ts803_io)
@@ -553,5 +553,5 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP(1983, ts803h, 0, 0, ts803, ts803, ts803_state, ts803, "Televideo", "TS803H", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp
index 59ccce42735..12e7aa78b38 100644
--- a/src/mame/drivers/ts816.cpp
+++ b/src/mame/drivers/ts816.cpp
@@ -26,7 +26,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(keyin_r);
DECLARE_READ8_MEMBER(status_r);
@@ -74,7 +74,7 @@ READ8_MEMBER( ts816_state::status_r )
return 4;
}
-WRITE8_MEMBER( ts816_state::kbd_put )
+void ts816_state::kbd_put(u8 data)
{
m_term_data = data;
m_status = 3;
@@ -86,7 +86,7 @@ void ts816_state::machine_reset()
m_status = 1;
}
-static MACHINE_CONFIG_START( ts816, ts816_state )
+static MACHINE_CONFIG_START( ts816 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(ts816_mem)
@@ -94,7 +94,7 @@ static MACHINE_CONFIG_START( ts816, ts816_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ts816_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(ts816_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -105,5 +105,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, ts816, 0, 0, ts816, ts816, driver_device, 0, "Televideo", "TS816", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, ts816, 0, 0, ts816, ts816, ts816_state, 0, "Televideo", "TS816", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp
index 391f10a70c6..757ef186d49 100644
--- a/src/mame/drivers/tsamurai.cpp
+++ b/src/mame/drivers/tsamurai.cpp
@@ -706,7 +706,7 @@ GFXDECODE_END
/*******************************************************************************/
-static MACHINE_CONFIG_START( tsamurai, tsamurai_state )
+static MACHINE_CONFIG_START( tsamurai )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8)
@@ -749,7 +749,7 @@ static MACHINE_CONFIG_START( tsamurai, tsamurai_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vsgongf, tsamurai_state )
+static MACHINE_CONFIG_START( vsgongf )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8)
@@ -790,7 +790,7 @@ static MACHINE_CONFIG_START( vsgongf, tsamurai_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( m660, tsamurai_state )
+static MACHINE_CONFIG_START( m660 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/8)
@@ -1273,20 +1273,20 @@ ROM_START( ringfgt2 )
ROM_LOAD( "clr.6p", 0x200, 0x0100, CRC(0e4fd17a) SHA1(d4e32bd9dd903177af61f77976a25c5db1467bba) )
ROM_END
-GAME( 1984, vsgongf, 0, vsgongf, vsgongf, driver_device, 0, ROT90, "Kaneko", "VS Gong Fight", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1984, ringfgt, vsgongf, vsgongf, vsgongf, driver_device, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, ringfgt2, vsgongf, vsgongf, vsgongf, driver_device, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vsgongf, 0, vsgongf, vsgongf, tsamurai_state, 0, ROT90, "Kaneko", "VS Gong Fight", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1984, ringfgt, vsgongf, vsgongf, vsgongf, tsamurai_state, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 1)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, ringfgt2, vsgongf, vsgongf, vsgongf, tsamurai_state, 0, ROT90, "Kaneko (Taito license)", "Ring Fighter (set 2)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tsamurai, 0, tsamurai, tsamurai, driver_device, 0, ROT90, "Kaneko / Taito", "Samurai Nihon-Ichi (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tsamurai2,tsamurai, tsamurai, tsamurai, driver_device, 0, ROT90, "Kaneko / Taito", "Samurai Nihon-Ichi (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, tsamuraih,tsamurai, tsamurai, tsamurai, driver_device, 0, ROT90, "bootleg", "Samurai Nihon-Ichi (bootleg, harder)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tsamurai, 0, tsamurai, tsamurai, tsamurai_state, 0, ROT90, "Kaneko / Taito", "Samurai Nihon-Ichi (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tsamurai2, tsamurai, tsamurai, tsamurai, tsamurai_state, 0, ROT90, "Kaneko / Taito", "Samurai Nihon-Ichi (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, tsamuraih, tsamurai, tsamurai, tsamurai, tsamurai_state, 0, ROT90, "bootleg", "Samurai Nihon-Ichi (bootleg, harder)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, ladymstr, 0, tsamurai, ladymstr, driver_device, 0, ROT90, "Kaneko / Taito", "Lady Master of Kung Fu", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, nunchaku, ladymstr, tsamurai, nunchaku, driver_device, 0, ROT90, "Kaneko / Taito", "Nunchackun", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, ladymstr, 0, tsamurai, ladymstr, tsamurai_state, 0, ROT90, "Kaneko / Taito", "Lady Master of Kung Fu", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, nunchaku, ladymstr, tsamurai, nunchaku, tsamurai_state, 0, ROT90, "Kaneko / Taito", "Nunchackun", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1985, yamagchi, 0, tsamurai, yamagchi, driver_device, 0, ROT90, "Kaneko / Taito", "Go Go Mr. Yamaguchi / Yuke Yuke Yamaguchi-kun", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1985, yamagchi, 0, tsamurai, yamagchi, tsamurai_state, 0, ROT90, "Kaneko / Taito", "Go Go Mr. Yamaguchi / Yuke Yuke Yamaguchi-kun", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1986, m660, 0, m660, m660, driver_device, 0, ROT90, "Wood Place Inc. (Taito America Corporation license)", "Mission 660 (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, m660j, m660, m660, m660, driver_device, 0, ROT90, "Wood Place Inc. (Taito Corporation license)", "Mission 660 (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, m660b, m660, m660, m660, driver_device, 0, ROT90, "bootleg", "Mission 660 (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, alphaxz, m660, m660, m660, driver_device, 0, ROT90, "Ed Co. Ltd. (Wood Place Inc. license)", "The Alphax Z (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, m660, 0, m660, m660, tsamurai_state, 0, ROT90, "Wood Place Inc. (Taito America Corporation license)", "Mission 660 (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, m660j, m660, m660, m660, tsamurai_state, 0, ROT90, "Wood Place Inc. (Taito Corporation license)", "Mission 660 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, m660b, m660, m660, m660, tsamurai_state, 0, ROT90, "bootleg", "Mission 660 (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, alphaxz, m660, m660, m660, tsamurai_state, 0, ROT90, "Ed Co. Ltd. (Wood Place Inc. license)", "The Alphax Z (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp
index 5478f1f124b..850f6f35297 100644
--- a/src/mame/drivers/tsispch.cpp
+++ b/src/mame/drivers/tsispch.cpp
@@ -116,8 +116,6 @@
#include "cpu/i86/i86.h"
#include "cpu/upd7725/upd7725.h"
#include "machine/i8251.h"
-#include "machine/pic8259.h"
-#include "machine/terminal.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
@@ -150,11 +148,6 @@ WRITE_LINE_MEMBER(tsispch_state::i8251_txrdy_int)
m_pic->ir3_w(state);
}
-WRITE8_MEMBER( tsispch_state::i8251_rxd )
-{
- m_uart->receive_character(data);
-}
-
/*****************************************************************************
LED/dipswitch stuff
*****************************************************************************/
@@ -379,7 +372,7 @@ INPUT_PORTS_END
/******************************************************************************
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( prose2k, tsispch_state )
+static MACHINE_CONFIG_START( prose2k )
/* basic machine hardware */
/* There are two crystals on the board: a 24MHz xtal at Y2 and a 16MHz xtal at Y1 */
MCFG_CPU_ADD("maincpu", I8086, 8000000) /* VERIFIED clock, unknown divider */
@@ -413,7 +406,7 @@ static MACHINE_CONFIG_START( prose2k, tsispch_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(tsispch_state, i8251_rxd))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(DEVPUT("i8251a_u15", i8251_device, receive_character))
MACHINE_CONFIG_END
/******************************************************************************
@@ -548,6 +541,6 @@ ROM_START( prose2ko )
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, prose2k, 0, 0, prose2k, prose2k, tsispch_state, prose2k, "Telesensory Systems Inc/Speech Plus", "Prose 2000/2020 v3.4.1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1982, prose2ko, prose2k, 0, prose2k, prose2k, tsispch_state, prose2k, "Telesensory Systems Inc/Speech Plus", "Prose 2000/2020 v1.1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, prose2k, 0, 0, prose2k, prose2k, tsispch_state, prose2k, "Telesensory Systems Inc/Speech Plus", "Prose 2000/2020 v3.4.1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1982, prose2ko, prose2k, 0, prose2k, prose2k, tsispch_state, prose2k, "Telesensory Systems Inc/Speech Plus", "Prose 2000/2020 v1.1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp
index 0581ac6ddb9..00bab4887ea 100644
--- a/src/mame/drivers/ttchamp.cpp
+++ b/src/mame/drivers/ttchamp.cpp
@@ -638,7 +638,7 @@ INTERRUPT_GEN_MEMBER(ttchamp_state::irq)/* right? */
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( ttchamp, ttchamp_state )
+static MACHINE_CONFIG_START( ttchamp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, 8000000)
MCFG_CPU_PROGRAM_MAP(ttchamp_map)
@@ -660,7 +660,7 @@ static MACHINE_CONFIG_START( ttchamp, ttchamp_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 8000000/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -695,5 +695,5 @@ ROM_END
// only the graphics differ between the two sets, code section is the same
-GAME( 1995, ttchamp, 0, ttchamp, ttchamp, driver_device, 0, ROT0, "Gamart", "Table Tennis Champions", MACHINE_SUPPORTS_SAVE ) // this has various advertising boards, including 'Electronic Devices' and 'Deniam'
-GAME( 1995, ttchampa,ttchamp, ttchamp, ttchamp, driver_device, 0, ROT0, "Gamart (Palencia Elektronik license)", "Table Tennis Champions (Palencia Elektronik license)", MACHINE_SUPPORTS_SAVE ) // this only has Palencia Elektronik advertising boards
+GAME( 1995, ttchamp, 0, ttchamp, ttchamp, ttchamp_state, 0, ROT0, "Gamart", "Table Tennis Champions", MACHINE_SUPPORTS_SAVE ) // this has various advertising boards, including 'Electronic Devices' and 'Deniam'
+GAME( 1995, ttchampa,ttchamp, ttchamp, ttchamp, ttchamp_state, 0, ROT0, "Gamart (Palencia Elektronik license)", "Table Tennis Champions (Palencia Elektronik license)", MACHINE_SUPPORTS_SAVE ) // this only has Palencia Elektronik advertising boards
diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp
index 610717c3d81..dd179f0fe1f 100644
--- a/src/mame/drivers/tubep.cpp
+++ b/src/mame/drivers/tubep.cpp
@@ -562,11 +562,9 @@ WRITE8_MEMBER(tubep_state::rjammer_voice_frequency_select_w)
/* bit 0 of data selects voice frequency on MSM5205 */
// 0 -4 KHz; 1- 8KHz
if (data & 1)
- m_msm->playmode_w(MSM5205_S48_4B); /* 8 KHz */
+ m_msm->playmode_w(msm5205_device::S48_4B); /* 8 KHz */
else
- m_msm->playmode_w(MSM5205_S96_4B); /* 4 KHz */
-
- return;
+ m_msm->playmode_w(msm5205_device::S96_4B); /* 4 KHz */
}
@@ -857,7 +855,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( tubep, tubep_state )
+static MACHINE_CONFIG_START( tubep )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
@@ -920,7 +918,7 @@ static MACHINE_CONFIG_DERIVED( tubepb, tubep )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( rjammer, tubep_state )
+static MACHINE_CONFIG_START( rjammer )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,16000000 / 4) /* 4 MHz */
@@ -974,7 +972,7 @@ static MACHINE_CONFIG_START( rjammer, tubep_state )
MCFG_SOUND_ADD("msm", MSM5205, 384000)
MCFG_MSM5205_VCLK_CB(WRITELINE(tubep_state, rjammer_adpcm_vck)) /* VCK function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz (changes at run time) */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz (changes at run time) */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -1174,7 +1172,7 @@ ROM_END
*
*************************************/
-/* year rom parent machine inp init */
-GAME( 1984, tubep, 0, tubep, tubep, driver_device, 0, ROT0, "Nichibutsu / Fujitek", "Tube Panic", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, tubepb, tubep, tubepb, tubepb, driver_device, 0, ROT0, "bootleg", "Tube Panic (bootleg)", MACHINE_SUPPORTS_SAVE )
+/* year rom parent machine inp state init */
+GAME( 1984, tubep, 0, tubep, tubep, tubep_state, 0, ROT0, "Nichibutsu / Fujitek", "Tube Panic", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, tubepb, tubep, tubepb, tubepb, tubep_state, 0, ROT0, "bootleg", "Tube Panic (bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, rjammer, 0, rjammer, rjammer, driver_device, 0, ROT0, "Nichibutsu / Alice", "Roller Jammer", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp
index b8d88f8cc84..4ef5c6de3bd 100644
--- a/src/mame/drivers/tugboat.cpp
+++ b/src/mame/drivers/tugboat.cpp
@@ -358,7 +358,7 @@ static GFXDECODE_START( tugboat )
GFXDECODE_END
-static MACHINE_CONFIG_START( tugboat, tugboat_state )
+static MACHINE_CONFIG_START( tugboat )
MCFG_CPU_ADD("maincpu", M6502, 2000000) /* 2 MHz ???? */
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", tugboat_state, nmi_line_pulse)
@@ -472,6 +472,6 @@ ROM_START( berenstn )
ROM_END
-GAME( 1982, tugboat, 0, tugboat, tugboat, driver_device, 0, ROT90, "Enter-Tech, Ltd.", "Tugboat", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, noahsark, 0, tugboat, noahsark, driver_device, 0, ROT90, "Enter-Tech, Ltd.", "Noah's Ark", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, berenstn, 0, tugboat, noahsark, driver_device, 0, ROT90, "Enter-Tech, Ltd.", "The Berenstain Bears in Big Paw's Cave", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, tugboat, 0, tugboat, tugboat, tugboat_state, 0, ROT90, "Enter-Tech, Ltd.", "Tugboat", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, noahsark, 0, tugboat, noahsark, tugboat_state, 0, ROT90, "Enter-Tech, Ltd.", "Noah's Ark", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, berenstn, 0, tugboat, noahsark, tugboat_state, 0, ROT90, "Enter-Tech, Ltd.", "The Berenstain Bears in Big Paw's Cave", MACHINE_IMPERFECT_GRAPHICS | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp
index c800a3e1f25..a0357b522f6 100644
--- a/src/mame/drivers/tumbleb.cpp
+++ b/src/mame/drivers/tumbleb.cpp
@@ -2041,7 +2041,7 @@ MACHINE_RESET_MEMBER(tumbleb_state,tumbleb)
memset(m_control_0, 0, sizeof(m_control_0));
}
-static MACHINE_CONFIG_START( tumblepb, tumbleb_state )
+static MACHINE_CONFIG_START( tumblepb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -2074,12 +2074,12 @@ static MACHINE_CONFIG_START( tumblepb, tumbleb_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 8000000/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tumbleb2, tumbleb_state )
+static MACHINE_CONFIG_START( tumbleb2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -2112,11 +2112,11 @@ static MACHINE_CONFIG_START( tumbleb2, tumbleb_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 8000000/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jumpkids, tumbleb_state )
+static MACHINE_CONFIG_START( jumpkids )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -2155,11 +2155,11 @@ static MACHINE_CONFIG_START( jumpkids, tumbleb_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 8000000/8, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 8000000/8, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fncywld, tumbleb_state )
+static MACHINE_CONFIG_START( fncywld )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000)
@@ -2196,7 +2196,7 @@ static MACHINE_CONFIG_START( fncywld, tumbleb_state )
MCFG_YM2151_ADD("ymsnd", 32220000/9)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2217,7 +2217,7 @@ MACHINE_RESET_MEMBER(tumbleb_state,htchctch)
MACHINE_RESET_CALL_MEMBER(tumbleb);
}
-static MACHINE_CONFIG_START( htchctch, tumbleb_state )
+static MACHINE_CONFIG_START( htchctch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 15000000) /* verified */
@@ -2261,7 +2261,7 @@ static MACHINE_CONFIG_START( htchctch, tumbleb_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
/* correct for cookie & bibi and hatch catch, (4096000/4) */
- MCFG_OKIM6295_ADD("oki", 1024000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1024000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2276,7 +2276,7 @@ static MACHINE_CONFIG_DERIVED( chokchok, htchctch )
// some PCBs have left factory with a 3.57mhz while some have a 4.096 which matches other games, assuming the former are factory errors
// TODO: MAME sound cores doesn't handle on-the-fly sound frequency changes, I guess best action here is to make the sound chip a slot option,
// assuming it's worth emulating a factory error in the first place.
- MCFG_OKIM6295_REPLACE("oki", 4096000/4, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_REPLACE("oki", 4096000/4, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -2325,7 +2325,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( suprtrio, tumbleb_state )
+static MACHINE_CONFIG_START( suprtrio )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
@@ -2363,11 +2363,11 @@ static MACHINE_CONFIG_START( suprtrio, tumbleb_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 875000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 875000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( pangpang, tumbleb_state )
+static MACHINE_CONFIG_START( pangpang )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -2400,7 +2400,7 @@ static MACHINE_CONFIG_START( pangpang, tumbleb_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", 8000000/10, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 8000000/10, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tumblep.cpp b/src/mame/drivers/tumblep.cpp
index f0d237ede43..918d5522ebb 100644
--- a/src/mame/drivers/tumblep.cpp
+++ b/src/mame/drivers/tumblep.cpp
@@ -280,7 +280,7 @@ void tumblep_state::machine_start()
{
}
-static MACHINE_CONFIG_START( tumblep, tumblep_state )
+static MACHINE_CONFIG_START( tumblep )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14000000)
@@ -331,7 +331,7 @@ static MACHINE_CONFIG_START( tumblep, tumblep_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", 1023924, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1023924, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp
index 38430300be4..329b9661578 100644
--- a/src/mame/drivers/tunhunt.cpp
+++ b/src/mame/drivers/tunhunt.cpp
@@ -268,7 +268,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( tunhunt, tunhunt_state )
+static MACHINE_CONFIG_START( tunhunt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, XTAL_12_096MHz/6) /* ??? */
@@ -393,6 +393,6 @@ ROM_END
*
*************************************/
-/* rom parent machine inp init */
-GAME( 1979,tunhunt, 0, tunhunt, tunhunt, driver_device, 0, ORIENTATION_SWAP_XY, "Atari", "Tunnel Hunt", MACHINE_SUPPORTS_SAVE )
-GAME( 1981,tunhuntc, tunhunt, tunhunt, tunhunt, driver_device, 0, ORIENTATION_SWAP_XY, "Atari (Centuri license)", "Tunnel Hunt (Centuri)", MACHINE_SUPPORTS_SAVE )
+/* rom parent machine inp state init */
+GAME( 1979,tunhunt, 0, tunhunt, tunhunt, tunhunt_state, 0, ORIENTATION_SWAP_XY, "Atari", "Tunnel Hunt", MACHINE_SUPPORTS_SAVE )
+GAME( 1981,tunhuntc, tunhunt, tunhunt, tunhunt, tunhunt_state, 0, ORIENTATION_SWAP_XY, "Atari (Centuri license)", "Tunnel Hunt (Centuri)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp
index 567af1825b6..ff9236da7c5 100644
--- a/src/mame/drivers/turbo.cpp
+++ b/src/mame/drivers/turbo.cpp
@@ -835,7 +835,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( turbo, turbo_state )
+static MACHINE_CONFIG_START( turbo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -885,7 +885,7 @@ static MACHINE_CONFIG_START( turbo, turbo_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( subroc3d, turbo_state )
+static MACHINE_CONFIG_START( subroc3d )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -925,7 +925,7 @@ static MACHINE_CONFIG_START( subroc3d, turbo_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( buckrog, turbo_state )
+static MACHINE_CONFIG_START( buckrog )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
@@ -1785,16 +1785,16 @@ DRIVER_INIT_MEMBER(turbo_state,turbo_noenc)
*
*************************************/
-GAMEL( 1981, turbo, 0, turbo, turbo, turbo_state, turbo_noenc, ROT270, "Sega", "Turbo (program 1513-1515)", MACHINE_IMPERFECT_SOUND , layout_turbo )
-GAMEL( 1981, turboa, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1262-1264)", MACHINE_IMPERFECT_SOUND , layout_turbo )
-GAMEL( 1981, turbob, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1363-1365 rev B)", MACHINE_IMPERFECT_SOUND , layout_turbo )
-GAMEL( 1981, turboc, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1363-1365 rev A)", MACHINE_IMPERFECT_SOUND , layout_turbo )
-GAMEL( 1981, turbod, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1363-1365)", MACHINE_IMPERFECT_SOUND , layout_turbo ) // but still reports 1262-1264 in the test mode?
-GAMEL( 1981, turbobl, turbo, turbo, turbo, turbo_state, turbo_noenc, ROT270, "bootleg", "Indianapolis (bootleg of Turbo)", MACHINE_IMPERFECT_SOUND , layout_turbo ) // decrypted bootleg of a 1262-1264 set
+GAMEL( 1981, turbo, 0, turbo, turbo, turbo_state, turbo_noenc, ROT270, "Sega", "Turbo (program 1513-1515)", MACHINE_IMPERFECT_SOUND , layout_turbo )
+GAMEL( 1981, turboa, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1262-1264)", MACHINE_IMPERFECT_SOUND , layout_turbo )
+GAMEL( 1981, turbob, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1363-1365 rev B)", MACHINE_IMPERFECT_SOUND , layout_turbo )
+GAMEL( 1981, turboc, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1363-1365 rev A)", MACHINE_IMPERFECT_SOUND , layout_turbo )
+GAMEL( 1981, turbod, turbo, turbo, turbo, turbo_state, turbo_enc, ROT270, "Sega", "Turbo (encrypted, program 1363-1365)", MACHINE_IMPERFECT_SOUND , layout_turbo ) // but still reports 1262-1264 in the test mode?
+GAMEL( 1981, turbobl, turbo, turbo, turbo, turbo_state, turbo_noenc, ROT270, "bootleg", "Indianapolis (bootleg of Turbo)", MACHINE_IMPERFECT_SOUND , layout_turbo ) // decrypted bootleg of a 1262-1264 set
-GAMEL( 1982, subroc3d, 0, subroc3d, subroc3d, driver_device, 0, ORIENTATION_FLIP_X, "Sega", "Subroc-3D", MACHINE_IMPERFECT_SOUND , layout_subroc3d )
+GAMEL( 1982, subroc3d, 0, subroc3d, subroc3d, turbo_state, 0, ORIENTATION_FLIP_X, "Sega", "Subroc-3D", MACHINE_IMPERFECT_SOUND , layout_subroc3d )
-GAMEL( 1982, buckrog, 0, buckroge, buckrog, driver_device, 0, ROT0, "Sega", "Buck Rogers: Planet of Zoom", MACHINE_IMPERFECT_SOUND , layout_buckrog )
-GAMEL( 1982, buckrogn, buckrog, buckrogu, buckrog, driver_device, 0, ROT0, "Sega", "Buck Rogers: Planet of Zoom (not encrypted, set 1)", MACHINE_IMPERFECT_SOUND , layout_buckrog )
-GAMEL( 1982, buckrogn2,buckrog, buckrogu, buckrog, driver_device, 0, ROT0, "Sega", "Buck Rogers: Planet of Zoom (not encrypted, set 2)", MACHINE_IMPERFECT_SOUND , layout_buckrog )
-GAMEL( 1982, zoom909, buckrog, buckroge, buckrog, driver_device, 0, ROT0, "Sega", "Zoom 909", MACHINE_IMPERFECT_SOUND, layout_buckrog )
+GAMEL( 1982, buckrog, 0, buckroge, buckrog, turbo_state, 0, ROT0, "Sega", "Buck Rogers: Planet of Zoom", MACHINE_IMPERFECT_SOUND , layout_buckrog )
+GAMEL( 1982, buckrogn, buckrog, buckrogu, buckrog, turbo_state, 0, ROT0, "Sega", "Buck Rogers: Planet of Zoom (not encrypted, set 1)", MACHINE_IMPERFECT_SOUND , layout_buckrog )
+GAMEL( 1982, buckrogn2,buckrog, buckrogu, buckrog, turbo_state, 0, ROT0, "Sega", "Buck Rogers: Planet of Zoom (not encrypted, set 2)", MACHINE_IMPERFECT_SOUND , layout_buckrog )
+GAMEL( 1982, zoom909, buckrog, buckroge, buckrog, turbo_state, 0, ROT0, "Sega", "Zoom 909", MACHINE_IMPERFECT_SOUND, layout_buckrog )
diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp
index fa8aa2e6f49..f085dcdd5c2 100644
--- a/src/mame/drivers/turrett.cpp
+++ b/src/mame/drivers/turrett.cpp
@@ -13,6 +13,7 @@
#include "cpu/mips/r3000.h"
#include "machine/ataintf.h"
+#include "machine/idehd.h"
#include "speaker.h"
@@ -317,15 +318,13 @@ INTERRUPT_GEN_MEMBER( turrett_state::adc )
/// HACK: The game expects a different LBA mapping to the standard HDD.
/// The reason for this is unknown.
-#include "machine/idehd.h"
-
-extern const device_type TURRETT_HARDDISK;
+DECLARE_DEVICE_TYPE(TURRETT_HARDDISK, turrett_hdd)
class turrett_hdd : public ide_hdd_device
{
public:
turrett_hdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ide_hdd_device(mconfig, TURRETT_HARDDISK, "HDD Turrett Tower", tag, owner, clock, "turrett_hdd", __FILE__)
+ : ide_hdd_device(mconfig, TURRETT_HARDDISK, tag, owner, clock)
{
}
@@ -338,7 +337,7 @@ public:
}
};
-const device_type TURRETT_HARDDISK = device_creator<turrett_hdd>;
+DEFINE_DEVICE_TYPE(TURRETT_HARDDISK, turrett_hdd, "turrett_hdd", "Turret Tower HDD")
SLOT_INTERFACE_START(turrett_devices)
SLOT_INTERFACE("hdd", TURRETT_HARDDISK)
@@ -350,7 +349,7 @@ SLOT_INTERFACE_END
*
*************************************/
-static MACHINE_CONFIG_START( turrett, turrett_state )
+static MACHINE_CONFIG_START( turrett )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", R3041, R3041_CLOCK)
@@ -413,4 +412,4 @@ ROM_END
*
*************************************/
-GAME( 2001, turrett, 0, turrett, turrett, driver_device, 0, ROT0, "Dell Electronics (Namco license)", "Turret Tower", 0 )
+GAME( 2001, turrett, 0, turrett, turrett, turrett_state, 0, ROT0, "Dell Electronics (Namco license)", "Turret Tower", 0 )
diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp
index b32ccde28e3..f674fce3246 100644
--- a/src/mame/drivers/tutankhm.cpp
+++ b/src/mame/drivers/tutankhm.cpp
@@ -223,7 +223,7 @@ MACHINE_RESET_MEMBER(tutankhm_state,tutankhm)
m_flip_y = 0;
}
-static MACHINE_CONFIG_START( tutankhm, tutankhm_state )
+static MACHINE_CONFIG_START( tutankhm )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_18_432MHz/12) /* 1.5 MHz ??? */
@@ -328,5 +328,5 @@ ROM_END
*
*************************************/
-GAME( 1982, tutankhm, 0, tutankhm, tutankhm, driver_device, 0, ROT90, "Konami", "Tutankham", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
-GAME( 1982, tutankhms,tutankhm, tutankhm, tutankhm, driver_device, 0, ROT90, "Konami (Stern Electronics license)", "Tutankham (Stern Electronics)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
+GAME( 1982, tutankhm, 0, tutankhm, tutankhm, tutankhm_state, 0, ROT90, "Konami", "Tutankham", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
+GAME( 1982, tutankhms,tutankhm, tutankhm, tutankhm, tutankhm_state, 0, ROT90, "Konami (Stern Electronics license)", "Tutankham (Stern Electronics)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_GRAPHICS)
diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp
index 838a904207d..4f3221ce142 100644
--- a/src/mame/drivers/tutor.cpp
+++ b/src/mame/drivers/tutor.cpp
@@ -732,7 +732,7 @@ static INPUT_PORTS_START(pyuutajr)
PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tutor, tutor_state )
+static MACHINE_CONFIG_START( tutor )
// basic machine hardware
// TMS9995 CPU @ 10.7 MHz
// No lines connected yet
@@ -795,7 +795,7 @@ ROM_START(pyuutajr)
ROM_LOAD( "ipl.rom", 0x0000, 0x4000, CRC(2ca37e62) SHA1(eebdc5c37d3b532edd5e5ca65eb785269ebd1ac0)) /* system ROM */
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP(1983?, tutor, 0, 0, tutor, tutor, driver_device, 0, "Tomy", "Tomy Tutor" , 0)
-COMP(1982, pyuuta, tutor, 0, tutor, tutor, driver_device, 0, "Tomy", "Tomy Pyuuta" , 0)
-COMP(1983, pyuutajr, tutor, 0, pyuutajr, pyuutajr, driver_device, 0, "Tomy", "Tomy Pyuuta Jr." , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP(1983?, tutor, 0, 0, tutor, tutor, tutor_state, 0, "Tomy", "Tomy Tutor" , 0)
+COMP(1982, pyuuta, tutor, 0, tutor, tutor, tutor_state, 0, "Tomy", "Tomy Pyuuta" , 0)
+COMP(1983, pyuutajr, tutor, 0, pyuutajr, pyuutajr, tutor_state, 0, "Tomy", "Tomy Pyuuta Jr.", 0)
diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp
index adc6615e63c..4d2b83249af 100644
--- a/src/mame/drivers/tv910.cpp
+++ b/src/mame/drivers/tv910.cpp
@@ -490,7 +490,7 @@ MC6845_UPDATE_ROW( tv910_state::crtc_update_row )
}
}
-static MACHINE_CONFIG_START( tv910, tv910_state )
+static MACHINE_CONFIG_START( tv910 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/8)
MCFG_CPU_PROGRAM_MAP(tv910_mem)
@@ -549,5 +549,5 @@ ROM_START( tv910 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, tv910, 0, 0, tv910, tv910, driver_device, 0, "TeleVideo", "TV910", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, tv910, 0, 0, tv910, tv910, tv910_state, 0, "TeleVideo", "TV910", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp
index cec50bc958c..6922e37c3c9 100644
--- a/src/mame/drivers/tv950.cpp
+++ b/src/mame/drivers/tv950.cpp
@@ -266,7 +266,7 @@ MC6845_UPDATE_ROW( tv950_state::crtc_update_row )
m_row = (m_row + 1) % 250;
}
-static MACHINE_CONFIG_START( tv950, tv950_state )
+static MACHINE_CONFIG_START( tv950 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/14)
MCFG_CPU_PROGRAM_MAP(tv950_mem)
@@ -318,5 +318,5 @@ ROM_START( tv950 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
-COMP( 1981, tv950, 0, 0, tv950, tv950, driver_device, 0, "TeleVideo", "TV950", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1981, tv950, 0, 0, tv950, tv950, tv950_state, 0, "TeleVideo", "TV950", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp
index 35a221e2689..17887a09148 100644
--- a/src/mame/drivers/tv990.cpp
+++ b/src/mame/drivers/tv990.cpp
@@ -367,7 +367,7 @@ void tv990_state::device_post_load()
m_screen->set_visible_area(0, m_width * 16 - 1, 0, m_height * m_rowh - 1);
}
-static MACHINE_CONFIG_START( tv990, tv990_state )
+static MACHINE_CONFIG_START( tv990 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 14967500) // verified (59.86992/4)
MCFG_CPU_PROGRAM_MAP(tv990_mem)
@@ -430,5 +430,5 @@ ROM_START( tv995 )
ROM_END
/* Driver */
-COMP( 1992, tv990, 0, 0, tv990, tv990, driver_device, 0, "TeleVideo", "TeleVideo 990", MACHINE_SUPPORTS_SAVE)
-COMP( 1994, tv995, 0, 0, tv990, tv990, driver_device, 0, "TeleVideo", "TeleVideo 995-65", MACHINE_SUPPORTS_SAVE)
+COMP( 1992, tv990, 0, 0, tv990, tv990, tv990_state, 0, "TeleVideo", "TeleVideo 990", MACHINE_SUPPORTS_SAVE )
+COMP( 1994, tv995, 0, 0, tv990, tv990, tv990_state, 0, "TeleVideo", "TeleVideo 995-65", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp
index 1804e78dd04..8d52b8e5500 100644
--- a/src/mame/drivers/tvc.cpp
+++ b/src/mame/drivers/tvc.cpp
@@ -760,7 +760,7 @@ extern SLOT_INTERFACE_START(tvc_exp)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( tvc, tvc_state )
+static MACHINE_CONFIG_START( tvc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, 3125000)
MCFG_CPU_PROGRAM_MAP(tvc_mem)
@@ -876,7 +876,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, tvc64, 0, 0, tvc, tvc, driver_device, 0, "Videoton", "TVC 64", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1985, tvc64p, tvc64, 0, tvc, tvc, driver_device, 0, "Videoton", "TVC 64+", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-COMP( 1985, tvc64pru, tvc64, 0, tvc, tvc64pru, driver_device, 0, "Videoton", "TVC 64+ (Russian)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, tvc64, 0, 0, tvc, tvc, tvc_state, 0, "Videoton", "TVC 64", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1985, tvc64p, tvc64, 0, tvc, tvc, tvc_state, 0, "Videoton", "TVC 64+", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1985, tvc64pru, tvc64, 0, tvc, tvc64pru, tvc_state, 0, "Videoton", "TVC 64+ (Russian)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp
index 293d3638621..c2d9e2278da 100644
--- a/src/mame/drivers/tvcapcom.cpp
+++ b/src/mame/drivers/tvcapcom.cpp
@@ -48,7 +48,7 @@ uint32_t tvcapcom_state::screen_update_tvcapcom(screen_device &screen, bitmap_rg
static INPUT_PORTS_START( tvcapcom )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( tvcapcom, tvcapcom_state )
+static MACHINE_CONFIG_START( tvcapcom )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC603, 72900000) // IBM PowerPC Broadway CPU @ 729 MHz ?
@@ -82,4 +82,4 @@ ROM_START( tvcapcom )
ROM_END
-GAME( 2008, tvcapcom, 0, tvcapcom, tvcapcom, driver_device, 0, ROT0, "Capcom", "Tatsunoko Vs Capcom : Cross Generation of Heroes", MACHINE_IS_SKELETON )
+GAME( 2008, tvcapcom, 0, tvcapcom, tvcapcom, tvcapcom_state, 0, ROT0, "Capcom", "Tatsunoko Vs Capcom : Cross Generation of Heroes", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp
index 4fee6adf61a..1ad716e471d 100644
--- a/src/mame/drivers/tvgame.cpp
+++ b/src/mame/drivers/tvgame.cpp
@@ -93,7 +93,7 @@ uint32_t tvgame_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
return 0;
}
-static MACHINE_CONFIG_START( tvgame, tvgame_state )
+static MACHINE_CONFIG_START( tvgame )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(tvgame_mem)
@@ -131,5 +131,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-CONS( 2011, tvgame, 0, 0, tvgame, tvgame, driver_device, 0, "Mr. Isizu", "Z80 TV Game System", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+CONS( 2011, tvgame, 0, 0, tvgame, tvgame, tvgame_state, 0, "Mr. Isizu", "Z80 TV Game System", 0 )
diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp
index eadd0792c94..7b662c3a9c1 100644
--- a/src/mame/drivers/twin16.cpp
+++ b/src/mame/drivers/twin16.cpp
@@ -661,7 +661,7 @@ void twin16_state::machine_start()
save_item(NAME(m_CPUB_register));
}
-static MACHINE_CONFIG_START( twin16, twin16_state )
+static MACHINE_CONFIG_START( twin16 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -719,7 +719,7 @@ static MACHINE_CONFIG_DERIVED( devilw, twin16 )
MCFG_QUANTUM_TIME(attotime::from_hz(60000)) // watchdog reset otherwise
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( fround, fround_state )
+static MACHINE_CONFIG_START( fround )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_18_432MHz/2)
MCFG_CPU_PROGRAM_MAP(fround_map)
@@ -774,7 +774,7 @@ static MACHINE_CONFIG_DERIVED( miaj, twin16 )
MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 1*8, 39*8, 264, 2*8, 30*8)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( cuebrickj, twin16, cuebrickj_state )
+static MACHINE_CONFIG_DERIVED( cuebrickj, twin16 )
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_RAW_PARAMS(XTAL_18_432MHz/2, 576, 1*8, 39*8, 264, 2*8, 30*8)
MCFG_NVRAM_ADD_0FILL("nvram")
@@ -1279,19 +1279,19 @@ DRIVER_INIT_MEMBER(cuebrickj_state,cuebrickj)
/* Game Drivers */
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1987, devilw, 0, devilw, devilw, twin16_state, twin16, ROT0, "Konami", "Devil World", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, majuu, devilw, devilw, devilw, twin16_state, twin16, ROT0, "Konami", "Majuu no Ohkoku", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, darkadv, devilw, devilw, darkadv, twin16_state, twin16, ROT0, "Konami", "Dark Adventure", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vulcan, 0, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Vulcan Venture (New)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vulcana, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Vulcan Venture (Old)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vulcanb, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Vulcan Venture (Oldest)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gradius2, vulcan, twin16, gradius2, twin16_state, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan New Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gradius2a, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Old Ver.)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, gradius2b, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Older Ver.)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1988, fround, 0, fround, fround, fround_state, fround, ROT0, "Konami", "The Final Round (version M)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, froundl, fround, fround, fround, fround_state, fround, ROT0, "Konami", "The Final Round (version L)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, hpuncher, fround, twin16, fround, twin16_state, twin16, ROT0, "Konami", "Hard Puncher (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, miaj, mia, miaj, miaj, twin16_state, twin16, ROT0, "Konami", "M.I.A. - Missing in Action (version R) (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, cuebrickj, cuebrick, cuebrickj, cuebrickj, cuebrickj_state, cuebrickj, ROT0, "Konami", "Cue Brick (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR,COMPANY, FULLNAME,FLAGS
+GAME( 1987, devilw, 0, devilw, devilw, twin16_state, twin16, ROT0, "Konami", "Devil World", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, majuu, devilw, devilw, devilw, twin16_state, twin16, ROT0, "Konami", "Majuu no Ohkoku", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, darkadv, devilw, devilw, darkadv, twin16_state, twin16, ROT0, "Konami", "Dark Adventure", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vulcan, 0, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Vulcan Venture (New)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vulcana, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Vulcan Venture (Old)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vulcanb, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Vulcan Venture (Oldest)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gradius2, vulcan, twin16, gradius2, twin16_state, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan New Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gradius2a, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Old Ver.)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, gradius2b, vulcan, twin16, vulcan, twin16_state, twin16, ROT0, "Konami", "Gradius II - GOFER no Yabou (Japan Older Ver.)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1988, fround, 0, fround, fround, fround_state, fround, ROT0, "Konami", "The Final Round (version M)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, froundl, fround, fround, fround, fround_state, fround, ROT0, "Konami", "The Final Round (version L)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, hpuncher, fround, twin16, fround, twin16_state, twin16, ROT0, "Konami", "Hard Puncher (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, miaj, mia, miaj, miaj, twin16_state, twin16, ROT0, "Konami", "M.I.A. - Missing in Action (version R) (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, cuebrickj, cuebrick, cuebrickj, cuebrickj, cuebrickj_state, cuebrickj, ROT0, "Konami", "Cue Brick (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp
index ecec5de3c76..8f684a4da56 100644
--- a/src/mame/drivers/twincobr.cpp
+++ b/src/mame/drivers/twincobr.cpp
@@ -654,7 +654,7 @@ static GFXDECODE_START( twincobr )
GFXDECODE_END
-static MACHINE_CONFIG_START( twincobr, twincobr_state )
+static MACHINE_CONFIG_START( twincobr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_28MHz/4) /* 7MHz - Main board Crystal is 28MHz */
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index f15375168ea..60e32339fb0 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -933,7 +933,7 @@ static MACHINE_CONFIG_FRAGMENT( cdrom_config )
MCFG_SOUND_ROUTE( 1, "^^^^speakerright", 1.0 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( twinkle, twinkle_state )
+static MACHINE_CONFIG_START( twinkle )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
MCFG_CPU_PROGRAM_MAP( main_map )
@@ -941,8 +941,8 @@ static MACHINE_CONFIG_START( twinkle, twinkle_state )
MCFG_RAM_MODIFY("maincpu:ram")
MCFG_RAM_DEFAULT_SIZE("4M")
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&scsi_dma_read, (twinkle_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&scsi_dma_write, (twinkle_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&scsi_dma_read, (twinkle_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&scsi_dma_write, (twinkle_state *) owner ) )
MCFG_CPU_ADD("audiocpu", M68000, 32000000/2) /* 16.000 MHz */
MCFG_CPU_PROGRAM_MAP( sound_map )
@@ -1333,20 +1333,20 @@ ROM_START( bmiidxc2 )
DISK_IMAGE_READONLY( "983hdda01", 0, SHA1(bcbbf55acf8bebc5773ffc5769420a0129f4da57) )
ROM_END
-GAME( 1999, gq863, 0, twinkle, twinkle, driver_device, 0, ROT0, "Konami", "Twinkle System", MACHINE_IS_BIOS_ROOT )
-
-GAME( 1999, bmiidx, gq863, twinklex, twinklex, driver_device, 0, ROT0, "Konami", "beatmania IIDX (863 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1999, bmiidxa, bmiidx, twinklex, twinklex, driver_device, 0, ROT0, "Konami", "beatmania IIDX (863 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1999, bmiidxc, gq863, twinklex, twinklex, driver_device, 0, ROT0, "Konami", "beatmania IIDX with DDR 2nd Club Version (896 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1999, bmiidxca, bmiidxc, twinklex, twinklex, driver_device, 0, ROT0, "Konami", "beatmania IIDX with DDR 2nd Club Version (896 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1999, bmiidxs, gq863, twinklex, twinklex, driver_device, 0, ROT0, "Konami", "beatmania IIDX Substream (983 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1999, bmiidxc2, gq863, twinklex, twinklex, driver_device, 0, ROT0, "Konami", "beatmania IIDX Substream with DDR 2nd Club Version 2 (984 A01 BM)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1999, bmiidx2, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 2nd style (GC985 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2000, bmiidx3, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 3rd style (GC992 JAC)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2000, bmiidx3a, bmiidx3, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 3rd style (GC992 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2000, bmiidx4, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 4th style (GCA03 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2001, bmiidx5, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 5th style (GCA17 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2001, bmiidx6, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 6th style (GCB4U JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2001, bmiidx6a, bmiidx6, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 6th style (GCB4U JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2002, bmiidx7, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 7th style (GCB44 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 2002, bmiidx8, gq863, twinklei, twinklei, driver_device, 0, ROT0, "Konami", "beatmania IIDX 8th style (GCC44 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, gq863, 0, twinkle, twinkle, twinkle_state, 0, ROT0, "Konami", "Twinkle System", MACHINE_IS_BIOS_ROOT )
+
+GAME( 1999, bmiidx, gq863, twinklex, twinklex, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX (863 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, bmiidxa, bmiidx, twinklex, twinklex, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX (863 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, bmiidxc, gq863, twinklex, twinklex, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX with DDR 2nd Club Version (896 JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, bmiidxca, bmiidxc, twinklex, twinklex, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX with DDR 2nd Club Version (896 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, bmiidxs, gq863, twinklex, twinklex, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX Substream (983 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, bmiidxc2, gq863, twinklex, twinklex, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX Substream with DDR 2nd Club Version 2 (984 A01 BM)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1999, bmiidx2, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 2nd style (GC985 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2000, bmiidx3, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 3rd style (GC992 JAC)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2000, bmiidx3a, bmiidx3, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 3rd style (GC992 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2000, bmiidx4, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 4th style (GCA03 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2001, bmiidx5, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 5th style (GCA17 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2001, bmiidx6, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 6th style (GCB4U JAB)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2001, bmiidx6a, bmiidx6, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 6th style (GCB4U JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2002, bmiidx7, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 7th style (GCB44 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 2002, bmiidx8, gq863, twinklei, twinklei, twinkle_state, 0, ROT0, "Konami", "beatmania IIDX 8th style (GCC44 JAA)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp
index fcfa4544a1a..a5be8a0b686 100644
--- a/src/mame/drivers/twins.cpp
+++ b/src/mame/drivers/twins.cpp
@@ -379,7 +379,7 @@ static INPUT_PORTS_START(twins)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( twins, twins_state )
+static MACHINE_CONFIG_START( twins )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, 8000000)
MCFG_CPU_PROGRAM_MAP(twins_map)
@@ -427,7 +427,7 @@ static ADDRESS_MAP_START( ramdac_map, AS_0, 8, twins_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( twinsa, twins_state )
+static MACHINE_CONFIG_START( twinsa )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, XTAL_16MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(twins_map)
@@ -556,7 +556,7 @@ ADDRESS_MAP_END
-static MACHINE_CONFIG_START( spider, twins_state )
+static MACHINE_CONFIG_START( spider )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", V30, 8000000)
MCFG_CPU_PROGRAM_MAP(twins_map)
@@ -623,7 +623,7 @@ ROM_START( spider )
ROM_LOAD16_BYTE( "21.bin", 0x000000, 0x080000, CRC(ff224206) SHA1(d8d45850983542e811facc917d016841fc56a97f) )
ROM_END
-GAME( 1994, twins, 0, twins, twins, driver_device, 0, ROT0, "Electronic Devices", "Twins (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, twinsa, twins, twinsa, twins, driver_device, 0, ROT0, "Electronic Devices", "Twins (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, twins, 0, twins, twins, twins_state, 0, ROT0, "Electronic Devices", "Twins (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, twinsa, twins, twinsa, twins, twins_state, 0, ROT0, "Electronic Devices", "Twins (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, spider, 0, spider, twins, driver_device, 0, ROT0, "Buena Vision", "Spider", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1994, spider, 0, spider, twins, twins_state, 0, ROT0, "Buena Vision", "Spider", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp
index 76365bb1cd0..16e9b60fc12 100644
--- a/src/mame/drivers/tx0.cpp
+++ b/src/mame/drivers/tx0.cpp
@@ -378,11 +378,11 @@ protected:
virtual void device_start() override { }
};
-const device_type TX0_READTAPE = device_creator<tx0_readtape_image_device>;
+DEFINE_DEVICE_TYPE(TX0_READTAPE, tx0_readtape_image_device, "tx0_readtape_image", "TX0 Tape Reader")
tx0_readtape_image_device::tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TX0_READTAPE, "TX0 Tape Reader", tag, owner, clock, "tx0_readtape_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, TX0_READTAPE, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -410,11 +410,11 @@ protected:
virtual void device_start() override { }
};
-const device_type TX0_PUNCHTAPE = device_creator<tx0_punchtape_image_device>;
+DEFINE_DEVICE_TYPE(TX0_PUNCHTAPE, tx0_punchtape_image_device, "tx0_punchtape_image", "TX0 Tape Puncher")
tx0_punchtape_image_device::tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TX0_PUNCHTAPE, "TX0 Tape Puncher", tag, owner, clock, "tx0_punchtape_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, TX0_PUNCHTAPE, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -443,11 +443,11 @@ protected:
virtual void device_start() override { }
};
-const device_type TX0_PRINTER = device_creator<tx0_printer_image_device>;
+DEFINE_DEVICE_TYPE(TX0_PRINTER, tx0_printer_image_device, "tx0_printer_image", "TX0 Typewriter")
tx0_printer_image_device::tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TX0_PRINTER, "TX0 Typewriter", tag, owner, clock, "tx0_printer_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, TX0_PRINTER, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -475,11 +475,11 @@ protected:
virtual void device_start() override;
};
-const device_type TX0_MAGTAPE = device_creator<tx0_magtape_image_device>;
+DEFINE_DEVICE_TYPE(TX0_MAGTAPE, tx0_magtape_image_device, "tx0_magtape_image", "TX0 Magnetic Tape")
tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TX0_MAGTAPE, "TX0 Magnetic Tape", tag, owner, clock, "tx0_magtape_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, TX0_MAGTAPE, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
@@ -1530,7 +1530,7 @@ INTERRUPT_GEN_MEMBER(tx0_state::tx0_interrupt)
}
}
-static MACHINE_CONFIG_START( tx0_64kw, tx0_state )
+static MACHINE_CONFIG_START( tx0_64kw )
/* basic machine hardware */
/* TX0 CPU @ approx. 167 kHz (no master clock, but the memory cycle time is approximately 6usec) */
MCFG_CPU_ADD("maincpu", TX0_64KW, 166667)
@@ -1610,6 +1610,6 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1956, tx0_64kw, 0, 0, tx0_64kw, tx0, tx0_state, tx0, "MIT", "TX-0 original demonstrator (64 kWords of RAM)" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
-COMP( 1962, tx0_8kw, tx0_64kw, 0, tx0_8kw, tx0, tx0_state, tx0, "MIT", "TX-0 upgraded system (8 kWords of RAM)" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1956, tx0_64kw, 0, 0, tx0_64kw, tx0, tx0_state, tx0, "MIT", "TX-0 original demonstrator (64 kWords of RAM)" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
+COMP( 1962, tx0_8kw, tx0_64kw, 0, tx0_8kw, tx0, tx0_state, tx0, "MIT", "TX-0 upgraded system (8 kWords of RAM)" , MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp
index 9d25599a229..e0c716ecac2 100644
--- a/src/mame/drivers/tx1.cpp
+++ b/src/mame/drivers/tx1.cpp
@@ -606,7 +606,7 @@ ADDRESS_MAP_END
*
*************************************/
-static MACHINE_CONFIG_START( tx1, tx1_state )
+static MACHINE_CONFIG_START( tx1 )
MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
MCFG_CPU_PROGRAM_MAP(tx1_main)
@@ -669,7 +669,7 @@ static MACHINE_CONFIG_START( tx1, tx1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( buggyboy, tx1_state )
+static MACHINE_CONFIG_START( buggyboy )
MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
MCFG_CPU_PROGRAM_MAP(buggyboy_main)
@@ -733,7 +733,7 @@ static MACHINE_CONFIG_START( buggyboy, tx1_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( buggybjr, tx1_state )
+static MACHINE_CONFIG_START( buggybjr )
MCFG_CPU_ADD("main_cpu", I8086, CPU_MASTER_CLOCK / 3)
MCFG_CPU_PROGRAM_MAP(buggybjr_main)
@@ -1243,8 +1243,8 @@ ROM_END
*
*************************************/
-GAMEL( 1983, tx1, 0, tx1, tx1, driver_device, 0, ROT0, "Tatsumi (Atari/Namco/Taito license)", "TX-1 (World)", MACHINE_IMPERFECT_SOUND, layout_tx1 )
-GAMEL( 1983, tx1jb, tx1, tx1, tx1j, driver_device, 0, ROT0, "Tatsumi", "TX-1 (Japan rev. B)", MACHINE_IMPERFECT_SOUND, layout_tx1 )
-GAMEL( 1983, tx1jc, tx1, tx1, tx1j, driver_device, 0, ROT0, "Tatsumi", "TX-1 (Japan rev. C)", MACHINE_IMPERFECT_SOUND, layout_tx1 )
-GAMEL( 1985, buggyboy, 0, buggyboy, buggyboy, driver_device, 0, ROT0, "Tatsumi", "Buggy Boy/Speed Buggy (cockpit)", 0, layout_buggyboy )
-GAMEL( 1986, buggyboyjr, buggyboy, buggybjr, buggybjr, driver_device, 0, ROT0, "Tatsumi", "Buggy Boy Junior/Speed Buggy (upright)", 0, layout_buggybjr )
+GAMEL( 1983, tx1, 0, tx1, tx1, tx1_state, 0, ROT0, "Tatsumi (Atari/Namco/Taito license)", "TX-1 (World)", MACHINE_IMPERFECT_SOUND, layout_tx1 )
+GAMEL( 1983, tx1jb, tx1, tx1, tx1j, tx1_state, 0, ROT0, "Tatsumi", "TX-1 (Japan rev. B)", MACHINE_IMPERFECT_SOUND, layout_tx1 )
+GAMEL( 1983, tx1jc, tx1, tx1, tx1j, tx1_state, 0, ROT0, "Tatsumi", "TX-1 (Japan rev. C)", MACHINE_IMPERFECT_SOUND, layout_tx1 )
+GAMEL( 1985, buggyboy, 0, buggyboy, buggyboy, tx1_state, 0, ROT0, "Tatsumi", "Buggy Boy/Speed Buggy (cockpit)", 0, layout_buggyboy )
+GAMEL( 1986, buggyboyjr, buggyboy, buggybjr, buggybjr, tx1_state, 0, ROT0, "Tatsumi", "Buggy Boy Junior/Speed Buggy (upright)", 0, layout_buggybjr )
diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp
index 9a205c149b2..9d4b16d8e83 100644
--- a/src/mame/drivers/uapce.cpp
+++ b/src/mame/drivers/uapce.cpp
@@ -306,7 +306,7 @@ static ADDRESS_MAP_START( pce_io , AS_IO, 8, uapce_state )
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( uapce, uapce_state )
+static MACHINE_CONFIG_START( uapce )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", H6280, PCE_MAIN_CLOCK/3)
MCFG_CPU_PROGRAM_MAP(pce_mem)
@@ -319,7 +319,7 @@ static MACHINE_CONFIG_START( uapce, uapce_state )
/* video hardware */
MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, HUC6260_WPF, 64, 64 + 1024 + 64, HUC6260_LPF, 18, 18 + 242)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK, huc6260_device::WPF, 64, 64 + 1024 + 64, huc6260_device::LPF, 18, 18 + 242)
MCFG_SCREEN_UPDATE_DRIVER( pce_common_state, screen_update )
MCFG_SCREEN_PALETTE("huc6260:palette")
@@ -378,7 +378,7 @@ ROM_START(paclandp)
ROM_LOAD( "u1.bin", 0x0000, 0x800, CRC(f5e538a9) SHA1(19ac9525c9ad6bea1789cc9e63cdb7fe949867d9) )
ROM_END
-GAME( 1989, blazlaz, 0, uapce, uapce, pce_common_state, pce_common, ROT0, "Hudson Soft", "Blazing Lazers", MACHINE_IMPERFECT_SOUND )
-GAME( 1989, keith, 0, uapce, uapce, pce_common_state, pce_common, ROT0, "Hudson Soft", "Keith Courage In Alpha Zones", MACHINE_IMPERFECT_SOUND )
-GAME( 1989, aliencr, 0, uapce, uapce, pce_common_state, pce_common, ROT0, "Hudson Soft", "Alien Crush", MACHINE_IMPERFECT_SOUND )
-GAME( 1989, paclandp,0, uapce, uapce, pce_common_state, pce_common, ROT0, "Namco", "Pac-Land (United Amusements PC Engine)", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, blazlaz, 0, uapce, uapce, uapce_state, pce_common, ROT0, "Hudson Soft", "Blazing Lazers", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, keith, 0, uapce, uapce, uapce_state, pce_common, ROT0, "Hudson Soft", "Keith Courage In Alpha Zones", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, aliencr, 0, uapce, uapce, uapce_state, pce_common, ROT0, "Hudson Soft", "Alien Crush", MACHINE_IMPERFECT_SOUND )
+GAME( 1989, paclandp,0, uapce, uapce, uapce_state, pce_common, ROT0, "Namco", "Pac-Land (United Amusements PC Engine)", MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp
index 8154368c50e..9bdd1be0489 100644
--- a/src/mame/drivers/uknc.cpp
+++ b/src/mame/drivers/uknc.cpp
@@ -57,7 +57,7 @@ uint32_t uknc_state::screen_update_uknc(screen_device &screen, bitmap_ind16 &bit
return 0;
}
-static MACHINE_CONFIG_START( uknc, uknc_state )
+static MACHINE_CONFIG_START( uknc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", K1801VM2, 8000000)
MCFG_T11_INITIAL_MODE(0x8000)
@@ -90,5 +90,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, uknc, 0, 0, uknc, uknc, driver_device, 0, "<unknown>", "UKNC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, uknc, 0, 0, uknc, uknc, uknc_state, 0, "<unknown>", "UKNC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp
index c39b3815374..9dd01670230 100644
--- a/src/mame/drivers/ultraman.cpp
+++ b/src/mame/drivers/ultraman.cpp
@@ -176,7 +176,7 @@ void ultraman_state::machine_reset()
m_bank2 = -1;
}
-static MACHINE_CONFIG_START( ultraman, ultraman_state )
+static MACHINE_CONFIG_START( ultraman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,24000000/2) /* 12 MHz? */
@@ -233,7 +233,7 @@ static MACHINE_CONFIG_START( ultraman, ultraman_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MACHINE_CONFIG_END
@@ -278,4 +278,4 @@ ROM_START( ultraman )
ROM_END
-GAME( 1991, ultraman, 0, ultraman, ultraman, driver_device, 0, ROT0, "Banpresto / Bandai", "Ultraman (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ultraman, 0, ultraman, ultraman, ultraman_state, 0, ROT0, "Banpresto / Bandai", "Ultraman (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp
index 62cc6275b88..6ab14d4c161 100644
--- a/src/mame/drivers/ultratnk.cpp
+++ b/src/mame/drivers/ultratnk.cpp
@@ -309,7 +309,7 @@ static GFXDECODE_START( ultratnk )
GFXDECODE_END
-static MACHINE_CONFIG_START( ultratnk, ultratnk_state )
+static MACHINE_CONFIG_START( ultratnk )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, PIXEL_CLOCK / 8)
@@ -365,4 +365,4 @@ ROM_START( ultratnk )
ROM_END
-GAME( 1978, ultratnk, 0, ultratnk, ultratnk, driver_device, 0, 0, "Atari (Kee Games)", "Ultra Tank", MACHINE_SUPPORTS_SAVE )
+GAME( 1978, ultratnk, 0, ultratnk, ultratnk, ultratnk_state, 0, 0, "Atari (Kee Games)", "Ultra Tank", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp
index b60b1f91378..f0580d34fd6 100644
--- a/src/mame/drivers/ultrsprt.cpp
+++ b/src/mame/drivers/ultrsprt.cpp
@@ -210,7 +210,7 @@ void ultrsprt_state::machine_reset()
/*****************************************************************************/
-static MACHINE_CONFIG_START( ultrsprt, ultrsprt_state )
+static MACHINE_CONFIG_START( ultrsprt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, 25000000)
MCFG_CPU_PROGRAM_MAP(ultrsprt_map)
@@ -266,4 +266,4 @@ ROM_START( fiveside )
ROM_END
// Undumped: Ultra Hockey
-GAME(1995, fiveside, 0, ultrsprt, ultrsprt, driver_device, 0, ROT90, "Konami", "Five a Side Soccer (ver UAA)", 0)
+GAME(1995, fiveside, 0, ultrsprt, ultrsprt, ultrsprt_state, 0, ROT90, "Konami", "Five a Side Soccer (ver UAA)", 0)
diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp
index 772dee4513c..63863c875f6 100644
--- a/src/mame/drivers/umipoker.cpp
+++ b/src/mame/drivers/umipoker.cpp
@@ -657,7 +657,7 @@ void umipoker_state::machine_reset()
}
// TODO: clocks
-static MACHINE_CONFIG_START( umipoker, umipoker_state )
+static MACHINE_CONFIG_START( umipoker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M68000,16000000) // TMP68HC000-16
@@ -693,7 +693,7 @@ static MACHINE_CONFIG_START( umipoker, umipoker_state )
MCFG_SOUND_ADD("ym", YM3812, 4000000 / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_OKIM6295_ADD("oki", 4000000 / 2, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 4000000 / 2, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -763,6 +763,6 @@ DRIVER_INIT_MEMBER(umipoker_state,saiyukip)
* Game Drivers *
******************************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
GAME( 1997, umipoker, 0, umipoker, umipoker, umipoker_state, umipoker, ROT0, "World Station Co.,LTD", "Umi de Poker / Marine Paradise (Japan)", 0 ) // title screen is toggleable thru a dsw
GAMEL( 1998, saiyukip, 0, umipoker, saiyukip, umipoker_state, saiyukip, ROT0, "World Station Co.,LTD", "Slot Poker Saiyuki (Japan)", 0, layout_saiyukip )
diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp
index 21ba3b7481d..fa109834b19 100644
--- a/src/mame/drivers/undrfire.cpp
+++ b/src/mame/drivers/undrfire.cpp
@@ -676,7 +676,7 @@ INTERRUPT_GEN_MEMBER(undrfire_state::undrfire_interrupt)
device.execute().set_input_line(4, HOLD_LINE);
}
-static MACHINE_CONFIG_START( undrfire, undrfire_state )
+static MACHINE_CONFIG_START( undrfire )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20 MHz - NOT verified */
@@ -719,7 +719,7 @@ static MACHINE_CONFIG_START( undrfire, undrfire_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( cbombers, undrfire_state )
+static MACHINE_CONFIG_START( cbombers )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_40MHz/2) /* 20 MHz - NOT verified */
@@ -1158,9 +1158,9 @@ DRIVER_INIT_MEMBER(undrfire_state,cbombers)
-GAME( 1993, undrfire, 0, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito Corporation Japan", "Under Fire (World)", 0 )
-GAME( 1993, undrfireu, undrfire, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito America Corporation", "Under Fire (US)", 0 )
-GAME( 1993, undrfirej, undrfire, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito Corporation", "Under Fire (Japan)", 0 )
-GAMEL(1994, cbombers, 0, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation Japan", "Chase Bombers (World)", MACHINE_IMPERFECT_GRAPHICS, layout_cbombers )
-GAMEL(1994, cbombersj, cbombers, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan)", MACHINE_IMPERFECT_GRAPHICS, layout_cbombers )
+GAME( 1993, undrfire, 0, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito Corporation Japan", "Under Fire (World)", 0 )
+GAME( 1993, undrfireu, undrfire, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito America Corporation", "Under Fire (US)", 0 )
+GAME( 1993, undrfirej, undrfire, undrfire, undrfire, undrfire_state, undrfire, ROT0, "Taito Corporation", "Under Fire (Japan)", 0 )
+GAMEL(1994, cbombers, 0, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation Japan", "Chase Bombers (World)", MACHINE_IMPERFECT_GRAPHICS, layout_cbombers )
+GAMEL(1994, cbombersj, cbombers, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan)", MACHINE_IMPERFECT_GRAPHICS, layout_cbombers )
GAMEL(1994, cbombersp, cbombers, cbombers, cbombers, undrfire_state, cbombers, ROT0, "Taito Corporation", "Chase Bombers (Japan Prototype)", MACHINE_IMPERFECT_GRAPHICS, layout_cbombers )
diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp
index abb021d6cf3..c6f23d02f62 100644
--- a/src/mame/drivers/unichamp.cpp
+++ b/src/mame/drivers/unichamp.cpp
@@ -71,8 +71,8 @@ public:
DECLARE_READ8_MEMBER(bext_r);
- DECLARE_READ16_MEMBER(unichamp_gicram_r);
- DECLARE_WRITE16_MEMBER(unichamp_gicram_w);
+ DECLARE_READ8_MEMBER(unichamp_gicram_r);
+ DECLARE_WRITE8_MEMBER(unichamp_gicram_w);
DECLARE_READ16_MEMBER(unichamp_trapl_r);
DECLARE_WRITE16_MEMBER(unichamp_trapl_w);
@@ -104,7 +104,7 @@ PALETTE_INIT_MEMBER(unichamp_state, unichamp)
static ADDRESS_MAP_START( unichamp_mem, AS_PROGRAM, 16, unichamp_state )
ADDRESS_MAP_GLOBAL_MASK(0x1FFF) //B13/B14/B15 are grounded!
- AM_RANGE(0x0000, 0x00FF) AM_READWRITE(unichamp_gicram_r, unichamp_gicram_w)
+ AM_RANGE(0x0000, 0x00FF) AM_READWRITE8(unichamp_gicram_r, unichamp_gicram_w, 0x00ff)
AM_RANGE(0x0100, 0x07FF) AM_READWRITE(unichamp_trapl_r, unichamp_trapl_w)
AM_RANGE(0x0800, 0x17FF) AM_ROM AM_REGION("maincpu", 0x0800 << 1) // Carts and EXE ROM, 10-bits wide
ADDRESS_MAP_END
@@ -152,13 +152,10 @@ READ8_MEMBER(unichamp_state::bext_r)
DRIVER_INIT_MEMBER(unichamp_state,unichamp)
{
- m_gic->set_shared_memory(m_ram);
}
void unichamp_state::machine_start()
{
- m_gic->set_shared_memory(m_ram);
-
if (m_cart->exists()){
//flip endians in more "this surely exists in MAME" way?
//NOTE The unichamp roms have the same endianness as intv on disk and in memory
@@ -195,7 +192,7 @@ void unichamp_state::machine_reset()
m_maincpu->set_input_line_vector(CP1610_INT_INTR, 0x0804);//not used anyway
/* Set initial PC */
- m_maincpu->set_state_int(CP1610_R7, 0x0800);
+ m_maincpu->set_state_int(cp1610_cpu_device::CP1610_R7, 0x0800);
}
@@ -204,14 +201,14 @@ uint32_t unichamp_state::screen_update_unichamp(screen_device &screen, bitmap_in
return m_gic->screen_update(screen, bitmap, cliprect);
}
-READ16_MEMBER( unichamp_state::unichamp_gicram_r )
+READ8_MEMBER( unichamp_state::unichamp_gicram_r )
{
- return (int)m_ram[offset];
+ return m_ram[offset];
}
-WRITE16_MEMBER( unichamp_state::unichamp_gicram_w )
+WRITE8_MEMBER( unichamp_state::unichamp_gicram_w )
{
- m_ram[offset] = data&0xff;
+ m_ram[offset] = data;
}
READ16_MEMBER( unichamp_state::unichamp_trapl_r )
@@ -225,7 +222,7 @@ WRITE16_MEMBER( unichamp_state::unichamp_trapl_w )
logerror("trapl_w(%x) = %x\n",offset,data);
}
-static MACHINE_CONFIG_START( unichamp, unichamp_state )
+static MACHINE_CONFIG_START( unichamp )
/* basic machine hardware */
//The CPU is really clocked this way:
@@ -256,7 +253,7 @@ static MACHINE_CONFIG_START( unichamp, unichamp_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_GIC_ADD( "gic", XTAL_3_579545MHz, "screen" )
+ MCFG_GIC_ADD( "gic", XTAL_3_579545MHz, "screen", READ8(unichamp_state, unichamp_gicram_r) )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
/* cartridge */
@@ -280,4 +277,4 @@ ROM_START(unichamp)
ROM_END
-CONS( 1977, unichamp, 0, 0, unichamp, unichamp, unichamp_state, unichamp, "Unisonic", "Champion 2711", 0/*MACHINE_IMPERFECT_GRAPHICS*/)
+CONS( 1977, unichamp, 0, 0, unichamp, unichamp, unichamp_state, unichamp, "Unisonic", "Champion 2711", 0/*MACHINE_IMPERFECT_GRAPHICS*/ )
diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp
index 0cd5aa02ebd..9bf32b2bf31 100644
--- a/src/mame/drivers/unico.cpp
+++ b/src/mame/drivers/unico.cpp
@@ -570,7 +570,7 @@ MACHINE_RESET_MEMBER(unico_state,unico)
Burglar X
***************************************************************************/
-static MACHINE_CONFIG_START( burglarx, unico_state )
+static MACHINE_CONFIG_START( burglarx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz */
@@ -600,7 +600,7 @@ static MACHINE_CONFIG_START( burglarx, unico_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -616,7 +616,7 @@ MACHINE_RESET_MEMBER(unico_state,zeropt)
MACHINE_RESET_CALL_MEMBER(unico);
}
-static MACHINE_CONFIG_START( zeropnt, unico_state )
+static MACHINE_CONFIG_START( zeropnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) /* 16MHz */
@@ -646,7 +646,7 @@ static MACHINE_CONFIG_START( zeropnt, unico_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -657,7 +657,7 @@ MACHINE_CONFIG_END
Zero Point 2
***************************************************************************/
-static MACHINE_CONFIG_START( zeropnt2, unico_state )
+static MACHINE_CONFIG_START( zeropnt2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68EC020, XTAL_32MHz/2) /* 16MHz */
@@ -689,11 +689,11 @@ static MACHINE_CONFIG_START( zeropnt2, unico_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.70)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.70)
- MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki1", XTAL_32MHz/32, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40)
- MCFG_OKIM6295_ADD("oki2", XTAL_14_31818MHz/4, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki2", XTAL_14_31818MHz/4, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20)
MACHINE_CONFIG_END
@@ -1050,8 +1050,8 @@ ROM_END
***************************************************************************/
-GAME( 1997, burglarx, 0, burglarx, burglarx, driver_device, 0, ROT0, "Unico", "Burglar X" , 0 )
-GAME( 1998, zeropnt, 0, zeropnt, zeropnt, driver_device, 0, ROT0, "Unico", "Zero Point (set 1)", 0 )
-GAME( 1998, zeropnta, zeropnt, zeropnt, zeropnt, driver_device, 0, ROT0, "Unico", "Zero Point (set 2)", 0 )
-GAME( 1998, zeropntj, zeropnt, zeropnt, zeropnt, driver_device, 0, ROT0, "Unico", "Zero Point (Japan)", 0 )
-GAME( 1999, zeropnt2, 0, zeropnt2, zeropnt2, driver_device, 0, ROT0, "Unico", "Zero Point 2", 0 )
+GAME( 1997, burglarx, 0, burglarx, burglarx, unico_state, 0, ROT0, "Unico", "Burglar X" , 0 )
+GAME( 1998, zeropnt, 0, zeropnt, zeropnt, unico_state, 0, ROT0, "Unico", "Zero Point (set 1)", 0 )
+GAME( 1998, zeropnta, zeropnt, zeropnt, zeropnt, unico_state, 0, ROT0, "Unico", "Zero Point (set 2)", 0 )
+GAME( 1998, zeropntj, zeropnt, zeropnt, zeropnt, unico_state, 0, ROT0, "Unico", "Zero Point (Japan)", 0 )
+GAME( 1999, zeropnt2, 0, zeropnt2, zeropnt2, unico_state, 0, ROT0, "Unico", "Zero Point 2", 0 )
diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp
index cc32d924c4a..cbeb12284ca 100644
--- a/src/mame/drivers/unior.cpp
+++ b/src/mame/drivers/unior.cpp
@@ -380,10 +380,10 @@ WRITE_LINE_MEMBER( unior_state::hrq_w )
void unior_state::machine_reset()
{
- m_maincpu->set_state_int(I8085_PC, 0xF800);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_PC, 0xF800);
}
-static MACHINE_CONFIG_START( unior, unior_state )
+static MACHINE_CONFIG_START( unior )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_20MHz / 9)
MCFG_CPU_PROGRAM_MAP(unior_mem)
@@ -455,5 +455,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, unior, radio86, 0, unior, unior, driver_device, 0, "<unknown>", "Unior", MACHINE_NOT_WORKING )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 19??, unior, radio86, 0, unior, unior, unior_state, 0, "<unknown>", "Unior", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp
index fc141caecb6..ffc6434301a 100644
--- a/src/mame/drivers/unistar.cpp
+++ b/src/mame/drivers/unistar.cpp
@@ -86,7 +86,7 @@ static GFXDECODE_START( unistar )
GFXDECODE_ENTRY( "chargen", 0x0000, unistar_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( unistar, unistar_state )
+static MACHINE_CONFIG_START( unistar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8085A, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(unistar_mem)
@@ -119,5 +119,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, unistar, 0, 0, unistar, unistar, driver_device, 0, "Callan Data Systems", "Unistar 200 Terminal", MACHINE_IS_SKELETON )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 198?, unistar, 0, 0, unistar, unistar, unistar_state, 0, "Callan Data Systems", "Unistar 200 Terminal", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index 88a78da0e6c..5cd68b651d0 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -167,7 +167,7 @@ static const z80_daisy_config daisy_chain[] =
{ nullptr }
};
-static MACHINE_CONFIG_START( uts20, univac_state )
+static MACHINE_CONFIG_START( uts20 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) // unknown clock
MCFG_CPU_PROGRAM_MAP(uts20_mem)
@@ -211,5 +211,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, uts20, 0, 0, uts20, uts20, driver_device, 0, "Sperry Univac", "UTS-20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, uts20, 0, 0, uts20, uts20, univac_state, 0, "Sperry Univac", "UTS-20", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index 2eb0c34cca2..4f5102e862e 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -45,7 +45,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
- required_device<wd2797_t> m_wd2797;
+ required_device<wd2797_device> m_wd2797;
required_device<floppy_image_device> m_floppy;
required_device<address_map_bank_device> m_ramrombank;
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( unixpc_mem, AS_PROGRAM, 16, unixpc_state )
AM_RANGE(0x4d0000, 0x4d7fff) AM_WRITE(diskdma_ptr_w)
AM_RANGE(0x4e0000, 0x4e0001) AM_WRITE(disk_control_w)
AM_RANGE(0x800000, 0x803fff) AM_MIRROR(0x7fc000) AM_ROM AM_REGION("bootrom", 0)
- AM_RANGE(0xe10000, 0xe10007) AM_DEVREADWRITE8("wd2797", wd_fdc_t, read, write, 0x00ff)
+ AM_RANGE(0xe10000, 0xe10007) AM_DEVREADWRITE8("wd2797", wd_fdc_device_base, read, write, 0x00ff)
AM_RANGE(0xe30000, 0xe30001) AM_READ(rtc_r)
AM_RANGE(0xe40000, 0xe40001) AM_WRITE(error_enable_w)
AM_RANGE(0xe41000, 0xe41001) AM_WRITE(parity_enable_w)
@@ -313,7 +313,7 @@ static SLOT_INTERFACE_START( unixpc_floppies )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( unixpc, unixpc_state )
+static MACHINE_CONFIG_START( unixpc )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68010, XTAL_10MHz)
MCFG_CPU_PROGRAM_MAP(unixpc_mem)
@@ -365,5 +365,5 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1985, 3b1, 0, 0, unixpc, unixpc, driver_device, 0, "AT&T", "3B1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, 3b1, 0, 0, unixpc, unixpc, unixpc_state, 0, "AT&T", "3B1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp
index 67460abb150..596f86f2418 100644
--- a/src/mame/drivers/unkhorse.cpp
+++ b/src/mame/drivers/unkhorse.cpp
@@ -191,7 +191,7 @@ INTERRUPT_GEN_MEMBER(horse_state::interrupt)
device.execute().set_input_line(I8085_RST75_LINE, CLEAR_LINE);
}
-static MACHINE_CONFIG_START( horse, horse_state )
+static MACHINE_CONFIG_START( horse )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_12MHz / 2)
@@ -240,4 +240,4 @@ ROM_START( unkhorse )
ROM_END
-GAME( 1981?, unkhorse, 0, horse, horse, driver_device, 0, ROT270, "<unknown>", "unknown Japanese horse gambling game", MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests early-1981
+GAME( 1981?, unkhorse, 0, horse, horse, horse_state, 0, ROT270, "<unknown>", "unknown Japanese horse gambling game", MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests early-1981
diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp
index b59625b5eac..ac732c80370 100644
--- a/src/mame/drivers/upscope.cpp
+++ b/src/mame/drivers/upscope.cpp
@@ -256,7 +256,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( upscope, upscope_state )
+static MACHINE_CONFIG_START( upscope )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
diff --git a/src/mame/drivers/usbilliards.cpp b/src/mame/drivers/usbilliards.cpp
index 756270fcd18..535b22d4852 100644
--- a/src/mame/drivers/usbilliards.cpp
+++ b/src/mame/drivers/usbilliards.cpp
@@ -48,7 +48,7 @@ public:
}
// devices
- required_device<netlist_mame_device_t> m_maincpu;
+ required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
protected:
@@ -91,7 +91,7 @@ void usbilliards_state::video_start()
{
}
-static MACHINE_CONFIG_START( usbilliards, usbilliards_state )
+static MACHINE_CONFIG_START( usbilliards )
/* basic machine hardware */
MCFG_DEVICE_ADD("maincpu", NETLIST_CPU, NETLIST_CLOCK)
@@ -135,4 +135,4 @@ ROM_START( sharkusb )
ROM_LOAD( "82s123_a.6n", 0x0100, 0x0100, CRC(63f621cb) SHA1(6c6e6f22313db33afd069dae1b0180b5ccddfa56) ) // 82s123 - handwritten A - A also etched in copper next to socket
ROM_END
-GAME( 1975, sharkusb, 0, usbilliards, 0, driver_device, 0, ROT0, "US Billiards Inc.", "Shark [TTL]", MACHINE_IS_SKELETON )
+GAME( 1975, sharkusb, 0, usbilliards, 0, usbilliards_state, 0, ROT0, "US Billiards Inc.", "Shark [TTL]", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp
index 055c580a33e..3724fd62b56 100644
--- a/src/mame/drivers/usgames.cpp
+++ b/src/mame/drivers/usgames.cpp
@@ -217,7 +217,7 @@ static GFXDECODE_START( usgames )
GFXDECODE_END
-static MACHINE_CONFIG_START( usg32, usgames_state )
+static MACHINE_CONFIG_START( usg32 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000) /* ?? */
@@ -405,11 +405,11 @@ ROM_START( usg182 ) /* Version 18.2 */
ROM_END
-GAME( 1987, usg32, 0, usg32, usg32, driver_device, 0, ROT0, "U.S. Games", "Super Duper Casino (California V3.2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, superten, 0, usg32, usg83, driver_device, 0, ROT0, "U.S. Games", "Super Ten V8.3", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, usg83x, superten, usg32, usg83, driver_device, 0, ROT0, "U.S. Games", "Super Ten V8.3X", MACHINE_SUPPORTS_SAVE ) /* "Experimental" version?? */
-GAME( 1988, usg82, superten, usg32, usg83, driver_device, 0, ROT0, "U.S. Games", "Super Ten V8.2" , MACHINE_SUPPORTS_SAVE )
-GAME( 1992, usgames, 0, usg185, usg83, driver_device, 0, ROT0, "U.S. Games", "Games V25.4X", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, usg187c, usgames, usg185, usg83, driver_device, 0, ROT0, "U.S. Games", "Games V18.7C", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, usg185, usgames, usg185, usg83, driver_device, 0, ROT0, "U.S. Games", "Games V18.5", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, usg182, usgames, usg185, usg83, driver_device, 0, ROT0, "U.S. Games", "Games V18.2", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, usg32, 0, usg32, usg32, usgames_state, 0, ROT0, "U.S. Games", "Super Duper Casino (California V3.2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, superten, 0, usg32, usg83, usgames_state, 0, ROT0, "U.S. Games", "Super Ten V8.3", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, usg83x, superten, usg32, usg83, usgames_state, 0, ROT0, "U.S. Games", "Super Ten V8.3X", MACHINE_SUPPORTS_SAVE ) /* "Experimental" version?? */
+GAME( 1988, usg82, superten, usg32, usg83, usgames_state, 0, ROT0, "U.S. Games", "Super Ten V8.2" , MACHINE_SUPPORTS_SAVE )
+GAME( 1992, usgames, 0, usg185, usg83, usgames_state, 0, ROT0, "U.S. Games", "Games V25.4X", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, usg187c, usgames, usg185, usg83, usgames_state, 0, ROT0, "U.S. Games", "Games V18.7C", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, usg185, usgames, usg185, usg83, usgames_state, 0, ROT0, "U.S. Games", "Games V18.5", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, usg182, usgames, usg185, usg83, usgames_state, 0, ROT0, "U.S. Games", "Games V18.2", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp
index 2a1ea0fbec1..ad8ef9be646 100644
--- a/src/mame/drivers/ut88.cpp
+++ b/src/mame/drivers/ut88.cpp
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( ut88mini )
INPUT_PORTS_END
/* Machine driver */
-static MACHINE_CONFIG_START( ut88, ut88_state )
+static MACHINE_CONFIG_START( ut88 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(ut88_mem)
@@ -226,7 +226,7 @@ static MACHINE_CONFIG_START( ut88, ut88_state )
MCFG_SOFTWARE_LIST_ADD("cass_list","ut88")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( ut88mini, ut88_state )
+static MACHINE_CONFIG_START( ut88mini )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 2000000)
MCFG_CPU_PROGRAM_MAP(ut88mini_mem)
@@ -268,6 +268,6 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
COMP( 1989, ut88mini, 0, 0, ut88mini, ut88mini, ut88_state, ut88mini, "<unknown>", "UT-88 mini", 0)
-COMP( 1989, ut88, ut88mini, 0, ut88, ut88, ut88_state, ut88, "<unknown>", "UT-88", 0)
+COMP( 1989, ut88, ut88mini, 0, ut88, ut88, ut88_state, ut88, "<unknown>", "UT-88", 0)
diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp
index 1f07f7a1372..394630ed8de 100644
--- a/src/mame/drivers/uzebox.cpp
+++ b/src/mame/drivers/uzebox.cpp
@@ -273,7 +273,7 @@ DEVICE_IMAGE_LOAD_MEMBER(uzebox_state, uzebox_cart)
* Machine definition *
\****************************************************/
-static MACHINE_CONFIG_START( uzebox, uzebox_state )
+static MACHINE_CONFIG_START( uzebox )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ATMEGA644, MASTER_CLOCK)
@@ -312,5 +312,5 @@ ROM_START( uzebox )
ROM_REGION( 0x800, "eeprom", ROMREGION_ERASE00 ) /* on-die eeprom */
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS(2010, uzebox, 0, 0, uzebox, uzebox, driver_device, 0, "Belogic", "Uzebox", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME */
+CONS(2010, uzebox, 0, 0, uzebox, uzebox, uzebox_state, 0, "Belogic", "Uzebox", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp
index 899640d33d1..ce065995414 100644
--- a/src/mame/drivers/v1050.cpp
+++ b/src/mame/drivers/v1050.cpp
@@ -486,7 +486,7 @@ static ADDRESS_MAP_START( v1050_io, AS_IO, 8, v1050_state )
AM_RANGE(0x8c, 0x8c) AM_DEVREADWRITE(I8251A_SIO_TAG, i8251_device, data_r, data_w)
AM_RANGE(0x8d, 0x8d) AM_DEVREADWRITE(I8251A_SIO_TAG, i8251_device, status_r, control_w)
AM_RANGE(0x90, 0x93) AM_DEVREADWRITE(I8255A_MISC_TAG, i8255_device, read, write)
- AM_RANGE(0x94, 0x97) AM_DEVREADWRITE(MB8877_TAG, mb8877_t, read, write)
+ AM_RANGE(0x94, 0x97) AM_DEVREADWRITE(MB8877_TAG, mb8877_device, read, write)
AM_RANGE(0x9c, 0x9f) AM_DEVREADWRITE(I8255A_RTC_TAG, i8255_device, read, write)
AM_RANGE(0xa0, 0xa0) AM_READWRITE(vint_clr_r, vint_clr_w)
AM_RANGE(0xb0, 0xb0) AM_READWRITE(dint_clr_r, dint_clr_w)
@@ -1020,7 +1020,7 @@ void v1050_state::machine_reset()
// Machine Driver
-static MACHINE_CONFIG_START( v1050, v1050_state )
+static MACHINE_CONFIG_START( v1050 )
// basic machine hardware
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(v1050_mem)
@@ -1149,5 +1149,5 @@ ROM_END
// System Drivers
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1983, v1050, 0, 0, v1050, v1050, driver_device, 0, "Visual Technology Inc", "Visual 1050", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_IMPERFECT_KEYBOARD )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1983, v1050, 0, 0, v1050, v1050, v1050_state, 0, "Visual Technology Inc", "Visual 1050", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND | MACHINE_IMPERFECT_KEYBOARD )
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index 66540576ac6..47b8037c64e 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -90,7 +90,7 @@ public:
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(v6809_address_w);
DECLARE_WRITE8_MEMBER(v6809_register_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE_LINE_MEMBER(write_acia_clock);
DECLARE_MACHINE_RESET(v6809);
MC6845_UPDATE_ROW(crtc_update_row);
@@ -105,7 +105,7 @@ private:
required_device<pia6821_device> m_pia0;
required_device<cpu_device> m_maincpu;
required_device<mc6845_device> m_crtc;
- required_device<mb8876_t> m_fdc;
+ required_device<mb8876_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<speaker_sound_device> m_speaker;
required_device<acia6850_device> m_acia0;
@@ -126,7 +126,7 @@ static ADDRESS_MAP_START(v6809_mem, AS_PROGRAM, 8, v6809_state)
AM_RANGE(0xf501, 0xf501) AM_MIRROR(0x36) AM_DEVREADWRITE("acia0", acia6850_device, data_r, data_w)
AM_RANGE(0xf508, 0xf508) AM_MIRROR(0x36) AM_DEVREADWRITE("acia1", acia6850_device, status_r, control_w) // printer
AM_RANGE(0xf509, 0xf509) AM_MIRROR(0x36) AM_DEVREADWRITE("acia1", acia6850_device, data_r, data_w)
- AM_RANGE(0xf600, 0xf603) AM_MIRROR(0x3c) AM_DEVREADWRITE("fdc", mb8876_t, read, write)
+ AM_RANGE(0xf600, 0xf603) AM_MIRROR(0x3c) AM_DEVREADWRITE("fdc", mb8876_device, read, write)
AM_RANGE(0xf640, 0xf64f) AM_MIRROR(0x30) AM_DEVREADWRITE("rtc", mm58274c_device, read, write)
AM_RANGE(0xf680, 0xf683) AM_MIRROR(0x3c) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
AM_RANGE(0xf6c0, 0xf6c7) AM_MIRROR(0x08) AM_DEVREADWRITE("ptm", ptm6840_device, read, write)
@@ -231,7 +231,7 @@ WRITE8_MEMBER( v6809_state::v6809_register_w )
// **** Keyboard ****
-WRITE8_MEMBER( v6809_state::kbd_put )
+void v6809_state::kbd_put(u8 data)
{
m_term_data = data;
m_pia0->cb1_w(0);
@@ -293,7 +293,7 @@ SLOT_INTERFACE_END
// *** Machine ****
-static MACHINE_CONFIG_START( v6809, v6809_state )
+static MACHINE_CONFIG_START( v6809 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_16MHz / 4)
MCFG_CPU_PROGRAM_MAP(v6809_mem)
@@ -323,7 +323,7 @@ static MACHINE_CONFIG_START( v6809, v6809_state )
MCFG_MC6845_ADDR_CHANGED_CB(v6809_state, crtc_update_addr)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(v6809_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(v6809_state, kbd_put))
// port A = drive select and 2 control lines ; port B = keyboard
// CB2 connects to the interrupt pin of the RTC (the rtc code doesn't support it)
@@ -376,5 +376,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, v6809, 0, 0, v6809, v6809, driver_device, 0, "Microkit", "Vegas 6809", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, v6809, 0, 0, v6809, v6809, v6809_state, 0, "Microkit", "Vegas 6809", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp
index 06a5b2abfde..9e83dade2a0 100644
--- a/src/mame/drivers/vamphalf.cpp
+++ b/src/mame/drivers/vamphalf.cpp
@@ -983,7 +983,7 @@ static GFXDECODE_START( vamphalf )
GFXDECODE_END
-static MACHINE_CONFIG_START( common, vamphalf_state )
+static MACHINE_CONFIG_START( common )
MCFG_CPU_ADD("maincpu", E116T, 50000000) /* 50 MHz */
MCFG_CPU_PROGRAM_MAP(common_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vamphalf_state, irq1_line_hold)
@@ -1014,7 +1014,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_ym_oki )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_28MHz/16 , OKIM6295_PIN7_HIGH) /* 1.75MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL_28MHz/16 , PIN7_HIGH) /* 1.75MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1026,7 +1026,7 @@ static MACHINE_CONFIG_FRAGMENT( sound_suplup )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, OKIM6295_PIN7_HIGH) /* 1.7897725 MHz */
+ MCFG_OKIM6295_ADD("oki", XTAL_14_31818MHz/8, PIN7_HIGH) /* 1.7897725 MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -1123,7 +1123,7 @@ MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( aoh, vamphalf_state )
+static MACHINE_CONFIG_START( aoh )
MCFG_CPU_ADD("maincpu", E132XN, XTAL_20MHz*4) /* 4x internal multiplier */
MCFG_CPU_PROGRAM_MAP(aoh_map)
MCFG_CPU_IO_MAP(aoh_io)
@@ -1151,11 +1151,11 @@ static MACHINE_CONFIG_START( aoh, vamphalf_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki_1", XTAL_32MHz/8, OKIM6295_PIN7_HIGH) /* 4MHz */
+ MCFG_OKIM6295_ADD("oki_1", XTAL_32MHz/8, PIN7_HIGH) /* 4MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_OKIM6295_ADD("oki_2", XTAL_32MHz/32, OKIM6295_PIN7_HIGH) /* 1MHz */
+ MCFG_OKIM6295_ADD("oki_2", XTAL_32MHz/32, PIN7_HIGH) /* 1MHz */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -2990,27 +2990,27 @@ DRIVER_INIT_MEMBER(vamphalf_state,boonggab)
m_flip_bit = 1;
}
-GAME( 1999, coolmini, 0, coolmini, common, vamphalf_state, coolmini, ROT0, "SemiCom", "Cool Minigame Collection", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, jmpbreak, 0, jmpbreak, common, vamphalf_state, jmpbreak, ROT0, "F2 System", "Jumping Break" , MACHINE_SUPPORTS_SAVE )
-GAME( 1999, suplup, 0, suplup, common, vamphalf_state, suplup, ROT0, "Omega System", "Super Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 4.0 / 990518)" , MACHINE_SUPPORTS_SAVE )
-GAME( 1999, luplup, suplup, suplup, common, vamphalf_state, luplup, ROT0, "Omega System", "Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 3.0 / 990128)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, luplup29, suplup, suplup, common, vamphalf_state, luplup29, ROT0, "Omega System", "Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 2.9 / 990108)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, puzlbang, suplup, suplup, common, vamphalf_state, puzlbang, ROT0, "Omega System", "Puzzle Bang Bang (Korea, version 2.9 / 990108)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, puzlbanga, suplup, suplup, common, vamphalf_state, puzlbang, ROT0, "Omega System", "Puzzle Bang Bang (Korea, version 2.8 / 990106)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, vamphalf, 0, vamphalf, common, vamphalf_state, vamphalf, ROT0, "Danbi / F2 System", "Vamf x1/2 (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, vamphalfk, vamphalf, vamphalf, common, vamphalf_state, vamphafk, ROT0, "Danbi / F2 System", "Vamp x1/2 (Korea)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, dquizgo2, 0, coolmini, common, vamphalf_state, dquizgo2, ROT0, "SemiCom", "Date Quiz Go Go Episode 2" , MACHINE_SUPPORTS_SAVE )
-GAME( 2000, misncrft, 0, misncrft, common, vamphalf_state, misncrft, ROT90, "Sun", "Mission Craft (version 2.7)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, misncrfta, misncrft, misncrft, common, vamphalf_state, misncrft, ROT90, "Sun", "Mission Craft (version 2.4)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mrdig, 0, mrdig, common, vamphalf_state, mrdig, ROT0, "Sun", "Mr. Dig", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, dtfamily, 0, coolmini, common, vamphalf_state, dtfamily, ROT0, "SemiCom", "Diet Family", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, finalgdr, 0, finalgdr, finalgdr, vamphalf_state, finalgdr, ROT0, "SemiCom", "Final Godori (Korea, version 2.20.5915)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, mrkicker, 0, coolmini, common, vamphalf_state, mrkicker,ROT0, "SemiCom", "Mr. Kicker (F-E1-16-010 PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, mrkickera, mrkicker, mrkickera,finalgdr, vamphalf_state, mrkickera, ROT0, "SemiCom", "Mr. Kicker (SEMICOM-003b PCB)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // if you allow eeprom saving works then this set corrupts the eeprom and then won't boot
-GAME( 2001, toyland, 0, coolmini, common, vamphalf_state, toyland, ROT0, "SemiCom", "Toy Land Adventure", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, wivernwg, 0, wyvernwg, common, vamphalf_state, wyvernwg, ROT270, "SemiCom", "Wivern Wings", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, wyvernwg, wivernwg, wyvernwg, common, vamphalf_state, wyvernwg, ROT270, "SemiCom (Game Vision license)", "Wyvern Wings (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, wyvernwga, wivernwg, wyvernwg, common, vamphalf_state, wyvernwg, ROT270, "SemiCom (Game Vision license)", "Wyvern Wings (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2001, aoh, 0, aoh, aoh, vamphalf_state, aoh, ROT0, "Unico", "Age Of Heroes - Silkroad 2 (v0.63 - 2001/02/07)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, boonggab, 0, boonggab, boonggab, vamphalf_state, boonggab, ROT270, "Taff System", "Boong-Ga Boong-Ga (Spank'em!)", MACHINE_SUPPORTS_SAVE )
-GAME( 199?, yorijori, 0, yorijori, common, vamphalf_state, yorijori, ROT0, "Golden Bell Entertainment", "Yori Jori Kuk Kuk", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, coolmini, 0, coolmini, common, vamphalf_state, coolmini, ROT0, "SemiCom", "Cool Minigame Collection", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, jmpbreak, 0, jmpbreak, common, vamphalf_state, jmpbreak, ROT0, "F2 System", "Jumping Break" , MACHINE_SUPPORTS_SAVE )
+GAME( 1999, suplup, 0, suplup, common, vamphalf_state, suplup, ROT0, "Omega System", "Super Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 4.0 / 990518)" , MACHINE_SUPPORTS_SAVE )
+GAME( 1999, luplup, suplup, suplup, common, vamphalf_state, luplup, ROT0, "Omega System", "Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 3.0 / 990128)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, luplup29, suplup, suplup, common, vamphalf_state, luplup29, ROT0, "Omega System", "Lup Lup Puzzle / Zhuan Zhuan Puzzle (version 2.9 / 990108)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, puzlbang, suplup, suplup, common, vamphalf_state, puzlbang, ROT0, "Omega System", "Puzzle Bang Bang (Korea, version 2.9 / 990108)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, puzlbanga, suplup, suplup, common, vamphalf_state, puzlbang, ROT0, "Omega System", "Puzzle Bang Bang (Korea, version 2.8 / 990106)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, vamphalf, 0, vamphalf, common, vamphalf_state, vamphalf, ROT0, "Danbi / F2 System", "Vamf x1/2 (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, vamphalfk, vamphalf, vamphalf, common, vamphalf_state, vamphafk, ROT0, "Danbi / F2 System", "Vamp x1/2 (Korea)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dquizgo2, 0, coolmini, common, vamphalf_state, dquizgo2, ROT0, "SemiCom", "Date Quiz Go Go Episode 2" , MACHINE_SUPPORTS_SAVE )
+GAME( 2000, misncrft, 0, misncrft, common, vamphalf_state, misncrft, ROT90, "Sun", "Mission Craft (version 2.7)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, misncrfta, misncrft, misncrft, common, vamphalf_state, misncrft, ROT90, "Sun", "Mission Craft (version 2.4)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mrdig, 0, mrdig, common, vamphalf_state, mrdig, ROT0, "Sun", "Mr. Dig", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, dtfamily, 0, coolmini, common, vamphalf_state, dtfamily, ROT0, "SemiCom", "Diet Family", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, finalgdr, 0, finalgdr, finalgdr, vamphalf_state, finalgdr, ROT0, "SemiCom", "Final Godori (Korea, version 2.20.5915)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, mrkicker, 0, coolmini, common, vamphalf_state, mrkicker, ROT0, "SemiCom", "Mr. Kicker (F-E1-16-010 PCB)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, mrkickera, mrkicker, mrkickera, finalgdr, vamphalf_state, mrkickera, ROT0, "SemiCom", "Mr. Kicker (SEMICOM-003b PCB)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // if you allow eeprom saving works then this set corrupts the eeprom and then won't boot
+GAME( 2001, toyland, 0, coolmini, common, vamphalf_state, toyland, ROT0, "SemiCom", "Toy Land Adventure", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, wivernwg, 0, wyvernwg, common, vamphalf_state, wyvernwg, ROT270, "SemiCom", "Wivern Wings", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, wyvernwg, wivernwg, wyvernwg, common, vamphalf_state, wyvernwg, ROT270, "SemiCom (Game Vision license)", "Wyvern Wings (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, wyvernwga, wivernwg, wyvernwg, common, vamphalf_state, wyvernwg, ROT270, "SemiCom (Game Vision license)", "Wyvern Wings (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2001, aoh, 0, aoh, aoh, vamphalf_state, aoh, ROT0, "Unico", "Age Of Heroes - Silkroad 2 (v0.63 - 2001/02/07)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, boonggab, 0, boonggab, boonggab, vamphalf_state, boonggab, ROT270, "Taff System", "Boong-Ga Boong-Ga (Spank'em!)", MACHINE_SUPPORTS_SAVE )
+GAME( 199?, yorijori, 0, yorijori, common, vamphalf_state, yorijori, ROT0, "Golden Bell Entertainment", "Yori Jori Kuk Kuk", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp
index ef99c3874ee..97b54521db3 100644
--- a/src/mame/drivers/vaportra.cpp
+++ b/src/mame/drivers/vaportra.cpp
@@ -238,7 +238,7 @@ void vaportra_state::machine_reset()
m_priority[1] = 0;
}
-static MACHINE_CONFIG_START( vaportra, vaportra_state )
+static MACHINE_CONFIG_START( vaportra )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* Custom chip 59 */
@@ -311,10 +311,10 @@ static MACHINE_CONFIG_START( vaportra, vaportra_state )
MCFG_SOUND_ROUTE(0, "mono", 0.60)
MCFG_SOUND_ROUTE(1, "mono", 0.60)
- MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki1", XTAL_32_22MHz/32, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
- MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki2", XTAL_32_22MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp
index bc3f7c329ec..db3d13b8d97 100644
--- a/src/mame/drivers/vastar.cpp
+++ b/src/mame/drivers/vastar.cpp
@@ -423,7 +423,7 @@ INTERRUPT_GEN_MEMBER(vastar_state::vblank_irq)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( vastar, vastar_state )
+static MACHINE_CONFIG_START( vastar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
@@ -657,8 +657,8 @@ ROM_START( pprobe )
ROM_END
-GAME( 1983, vastar, 0, vastar, vastar, driver_device, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 1)", MACHINE_SUPPORTS_SAVE ) // Sesame Japan was a brand of Fujikousan
-GAME( 1983, vastar2, vastar, vastar, vastar, driver_device, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, vastar3, vastar, vastar, vastar, driver_device, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, vastar4, vastar, vastar, vastar4,driver_device, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, pprobe, 0, vastar, pprobe, driver_device, 0, ROT90, "Crux / Kyugo?", "Planet Probe (prototype?)", MACHINE_SUPPORTS_SAVE ) // has no Copyright, probably because Crux didn't have a trading name at this point?
+GAME( 1983, vastar, 0, vastar, vastar, vastar_state, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 1)", MACHINE_SUPPORTS_SAVE ) // Sesame Japan was a brand of Fujikousan
+GAME( 1983, vastar2, vastar, vastar, vastar, vastar_state, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, vastar3, vastar, vastar, vastar, vastar_state, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, vastar4, vastar, vastar, vastar4, vastar_state, 0, ROT90, "Orca (Sesame Japan license)", "Vastar (set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, pprobe, 0, vastar, pprobe, vastar_state, 0, ROT90, "Crux / Kyugo?", "Planet Probe (prototype?)", MACHINE_SUPPORTS_SAVE ) // has no Copyright, probably because Crux didn't have a trading name at this point?
diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp
index 6ef07148c04..99fa220c047 100644
--- a/src/mame/drivers/vax11.cpp
+++ b/src/mame/drivers/vax11.cpp
@@ -88,7 +88,7 @@ public:
DECLARE_READ16_MEMBER( term_tx_status_r );
DECLARE_READ16_MEMBER( term_rx_status_r );
DECLARE_WRITE16_MEMBER( term_w );
- DECLARE_WRITE8_MEMBER( kbd_put );
+ void kbd_put(u8 data);
uint8_t m_term_data;
uint16_t m_term_status;
};
@@ -131,13 +131,13 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vax11 )
INPUT_PORTS_END
-WRITE8_MEMBER( vax11_state::kbd_put )
+void vax11_state::kbd_put(u8 data)
{
m_term_data = data;
m_term_status = 0xffff;
}
-static MACHINE_CONFIG_START( vax11, vax11_state )
+static MACHINE_CONFIG_START( vax11 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",T11, XTAL_4MHz) // Need proper CPU here
MCFG_T11_INITIAL_MODE(0 << 13)
@@ -145,7 +145,7 @@ static MACHINE_CONFIG_START( vax11, vax11_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(vax11_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(vax11_state, kbd_put))
MCFG_RX01_ADD("rx01")
MACHINE_CONFIG_END
@@ -170,5 +170,5 @@ ROM_START( vax785 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, vax785, 0, 0, vax11, vax11, driver_device, 0, "Digital Equipment Corporation", "VAX-11/785", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1984, vax785, 0, 0, vax11, vax11, vax11_state, 0, "Digital Equipment Corporation", "VAX-11/785", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp
index aa933868d46..14f52abeb28 100644
--- a/src/mame/drivers/vball.cpp
+++ b/src/mame/drivers/vball.cpp
@@ -401,7 +401,7 @@ static GFXDECODE_START( vb )
GFXDECODE_END
-static MACHINE_CONFIG_START( vball, vball_state )
+static MACHINE_CONFIG_START( vball )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, CPU_CLOCK) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
@@ -432,7 +432,7 @@ static MACHINE_CONFIG_START( vball, vball_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.60)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.60)
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MACHINE_CONFIG_END
@@ -563,7 +563,7 @@ ROM_START( vball2pjb ) /* bootleg of the Japan set with unmoddified program rom
ROM_END
-GAME( 1988, vball, 0, vball, vball, driver_device, 0, ROT0, "Technos Japan", "U.S. Championship V'ball (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vball2pj, vball, vball, vball2pj, driver_device, 0, ROT0, "Technos Japan", "U.S. Championship V'ball (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vballb, vball, vball, vball, driver_device, 0, ROT0, "bootleg", "U.S. Championship V'ball (bootleg of US set)", MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vball2pjb,vball, vball, vball, driver_device, 0, ROT0, "bootleg", "U.S. Championship V'ball (bootleg of Japan set)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vball, 0, vball, vball, vball_state, 0, ROT0, "Technos Japan", "U.S. Championship V'ball (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vball2pj, vball, vball, vball2pj, vball_state, 0, ROT0, "Technos Japan", "U.S. Championship V'ball (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vballb, vball, vball, vball, vball_state, 0, ROT0, "bootleg", "U.S. Championship V'ball (bootleg of US set)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vball2pjb,vball, vball, vball, vball_state, 0, ROT0, "bootleg", "U.S. Championship V'ball (bootleg of Japan set)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index 18d5cc65ecb..c5b57d34e27 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -1345,7 +1345,7 @@ static SLOT_INTERFACE_START(vboy_cart)
SLOT_INTERFACE_INTERNAL("vb_eeprom", VBOY_ROM_EEPROM)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( vboy, vboy_state )
+static MACHINE_CONFIG_START( vboy )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", V810, XTAL_20MHz )
@@ -1397,5 +1397,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-CONS( 1995, vboy, 0, 0, vboy, vboy, driver_device, 0, "Nintendo", "Virtual Boy", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+CONS( 1995, vboy, 0, 0, vboy, vboy, vboy_state, 0, "Nintendo", "Virtual Boy", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp
index ab4b2c560f0..bbdf29ea99c 100644
--- a/src/mame/drivers/vc4000.cpp
+++ b/src/mame/drivers/vc4000.cpp
@@ -527,7 +527,7 @@ static SLOT_INTERFACE_START(vc4000_cart)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( vc4000, vc4000_state )
+static MACHINE_CONFIG_START( vc4000 )
/* basic machine hardware */
// MCFG_CPU_ADD("maincpu", S2650, 865000) /* 3550000/4, 3580000/3, 4430000/3 */
MCFG_CPU_ADD("maincpu", S2650, 3546875/4)
@@ -701,29 +701,29 @@ ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS(1978, vc4000, 0, 0, vc4000, vc4000, driver_device, 0, "Interton", "Interton Electronic VC 4000", MACHINE_IMPERFECT_GRAPHICS ) /* Germany, Austria, UK, Australia */
-CONS(1979, spc4000, vc4000, 0, vc4000, vc4000, driver_device, 0, "Grundig", "Super Play Computer 4000", MACHINE_IMPERFECT_GRAPHICS ) /* Germany, Austria */
-CONS(1979, cx3000tc, vc4000, 0, cx3000tc, vc4000, driver_device, 0, "Palson", "CX 3000 Tele Computer", MACHINE_IMPERFECT_GRAPHICS ) /* Spain */
-CONS(1979, tvc4000, vc4000, 0, vc4000, vc4000, driver_device, 0, "Koerting", "TVC-4000", MACHINE_IMPERFECT_GRAPHICS ) /* Argentina */
-CONS(1976, 1292apvs, 0, vc4000, vc4000, vc4000, driver_device, 0, "Radofin", "1292 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS )/* Europe */
-CONS(1976, 1392apvs, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Radofin", "1392 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS )/* Europe */
-CONS(1979, mpu1000, 1292apvs, 0, mpu1000, vc4000, driver_device, 0, "Acetronic", "MPU-1000", MACHINE_IMPERFECT_GRAPHICS ) /* Europe */
-CONS(1979, mpu2000, 1292apvs, 0, mpu1000, vc4000, driver_device, 0, "Acetronic", "MPU-2000", MACHINE_IMPERFECT_GRAPHICS ) /* Europe */
-CONS(1978, pp1292, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Audio Sonic", "PP-1292 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS )/* Europe */
-CONS(1978, pp1392, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Audio Sonic", "PP-1392 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS )/* Europe */
-CONS(1979, f1392, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Fountain", "Fountain 1392", MACHINE_IMPERFECT_GRAPHICS ) /* New Zealand */
-CONS(1979, fforce2, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Fountain", "Fountain Force 2", MACHINE_IMPERFECT_GRAPHICS ) /* New Zealand, Australia */
-CONS(1979, hmg1292, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Hanimex", "HMG 1292", MACHINE_IMPERFECT_GRAPHICS ) /* Europe */
-CONS(1979, hmg1392, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Hanimex", "HMG 1392", MACHINE_IMPERFECT_GRAPHICS ) /* Europe */
-CONS(1979, lnsy1392, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Lansay", "Lansay 1392", MACHINE_IMPERFECT_GRAPHICS ) /* Europe */
-CONS(1979, vc6000, 1292apvs, 0, vc4000, vc4000, driver_device, 0, "Prinztronic", "VC 6000", MACHINE_IMPERFECT_GRAPHICS ) /* UK */
-CONS(1979, database, 0, vc4000, database, vc4000, driver_device, 0, "Voltmace", "Voltmace Database", MACHINE_IMPERFECT_GRAPHICS ) /* UK */
-CONS(1979, vmdtbase, database, 0, database, vc4000, driver_device, 0, "Videomaster", "Videomaster Database Games-Computer", MACHINE_IMPERFECT_GRAPHICS )/* UK */
-CONS(1979, rwtrntcs, 0, vc4000, rwtrntcs, vc4000, driver_device, 0, "Rowtron", "Rowtron Television Computer System", MACHINE_IMPERFECT_GRAPHICS )/* UK */
-CONS(1979, telngtcs, rwtrntcs, 0, rwtrntcs, vc4000, driver_device, 0, "Teleng", "Teleng Television Computer System", MACHINE_IMPERFECT_GRAPHICS )/* UK */
-CONS(1979, krvnjvtv, 0, vc4000, vc4000, vc4000, driver_device, 0, "SOE", "OC Jeu Video TV Karvan", MACHINE_IMPERFECT_GRAPHICS ) /* France */
-CONS(1979, oc2000, krvnjvtv, 0, vc4000, vc4000, driver_device, 0, "SOE", "OC-2000", MACHINE_IMPERFECT_GRAPHICS ) /* France */
-CONS(1980, mpt05, 0, vc4000, vc4000, vc4000, driver_device, 0, "ITMC", "MPT-05", MACHINE_IMPERFECT_GRAPHICS ) /* France */
-CONS(1982, h21, 0, vc4000, h21, vc4000, driver_device, 0, "TRQ", "Video Computer H-21", MACHINE_IMPERFECT_GRAPHICS) // Spain
-CONS(1979, elektor, 0, 0, elektor, elektor, driver_device, 0, "Elektor", "Elektor TV Games Computer", MACHINE_IMPERFECT_GRAPHICS )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+CONS(1978, vc4000, 0, 0, vc4000, vc4000, vc4000_state, 0, "Interton", "Interton Electronic VC 4000", MACHINE_IMPERFECT_GRAPHICS) // Germany, Austria, UK, Australia
+CONS(1979, spc4000, vc4000, 0, vc4000, vc4000, vc4000_state, 0, "Grundig", "Super Play Computer 4000", MACHINE_IMPERFECT_GRAPHICS) // Germany, Austria
+CONS(1979, cx3000tc, vc4000, 0, cx3000tc, vc4000, vc4000_state, 0, "Palson", "CX 3000 Tele Computer", MACHINE_IMPERFECT_GRAPHICS) // Spain
+CONS(1979, tvc4000, vc4000, 0, vc4000, vc4000, vc4000_state, 0, "Koerting", "TVC-4000", MACHINE_IMPERFECT_GRAPHICS) // Argentina
+CONS(1976, 1292apvs, 0, vc4000, vc4000, vc4000, vc4000_state, 0, "Radofin", "1292 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1976, 1392apvs, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Radofin", "1392 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1979, mpu1000, 1292apvs, 0, mpu1000, vc4000, vc4000_state, 0, "Acetronic", "MPU-1000", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1979, mpu2000, 1292apvs, 0, mpu1000, vc4000, vc4000_state, 0, "Acetronic", "MPU-2000", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1978, pp1292, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Audio Sonic", "PP-1292 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1978, pp1392, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Audio Sonic", "PP-1392 Advanced Programmable Video System", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1979, f1392, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Fountain", "Fountain 1392", MACHINE_IMPERFECT_GRAPHICS) // New Zealand
+CONS(1979, fforce2, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Fountain", "Fountain Force 2", MACHINE_IMPERFECT_GRAPHICS) // New Zealand, Australia
+CONS(1979, hmg1292, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Hanimex", "HMG 1292", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1979, hmg1392, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Hanimex", "HMG 1392", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1979, lnsy1392, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Lansay", "Lansay 1392", MACHINE_IMPERFECT_GRAPHICS) // Europe
+CONS(1979, vc6000, 1292apvs, 0, vc4000, vc4000, vc4000_state, 0, "Prinztronic", "VC 6000", MACHINE_IMPERFECT_GRAPHICS) // UK
+CONS(1979, database, 0, vc4000, database, vc4000, vc4000_state, 0, "Voltmace", "Voltmace Database", MACHINE_IMPERFECT_GRAPHICS) // UK
+CONS(1979, vmdtbase, database, 0, database, vc4000, vc4000_state, 0, "Videomaster", "Videomaster Database Games-Computer", MACHINE_IMPERFECT_GRAPHICS) // UK
+CONS(1979, rwtrntcs, 0, vc4000, rwtrntcs, vc4000, vc4000_state, 0, "Rowtron", "Rowtron Television Computer System", MACHINE_IMPERFECT_GRAPHICS) // UK
+CONS(1979, telngtcs, rwtrntcs, 0, rwtrntcs, vc4000, vc4000_state, 0, "Teleng", "Teleng Television Computer System", MACHINE_IMPERFECT_GRAPHICS) // UK
+CONS(1979, krvnjvtv, 0, vc4000, vc4000, vc4000, vc4000_state, 0, "SOE", "OC Jeu Video TV Karvan", MACHINE_IMPERFECT_GRAPHICS) // France
+CONS(1979, oc2000, krvnjvtv, 0, vc4000, vc4000, vc4000_state, 0, "SOE", "OC-2000", MACHINE_IMPERFECT_GRAPHICS) // France
+CONS(1980, mpt05, 0, vc4000, vc4000, vc4000, vc4000_state, 0, "ITMC", "MPT-05", MACHINE_IMPERFECT_GRAPHICS) // France
+CONS(1982, h21, 0, vc4000, h21, vc4000, vc4000_state, 0, "TRQ", "Video Computer H-21", MACHINE_IMPERFECT_GRAPHICS) // Spain
+CONS(1979, elektor, 0, 0, elektor, elektor, vc4000_state, 0, "Elektor", "Elektor TV Games Computer", MACHINE_IMPERFECT_GRAPHICS)
diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp
index b16c1aec187..d92457c6ad8 100644
--- a/src/mame/drivers/vcombat.cpp
+++ b/src/mame/drivers/vcombat.cpp
@@ -543,7 +543,7 @@ WRITE_LINE_MEMBER(vcombat_state::sound_update)
m_soundcpu->set_input_line(M68K_IRQ_1, state ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( vcombat, vcombat_state )
+static MACHINE_CONFIG_START( vcombat )
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
@@ -591,7 +591,7 @@ static MACHINE_CONFIG_START( vcombat, vcombat_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( shadfgtr, vcombat_state )
+static MACHINE_CONFIG_START( shadfgtr )
MCFG_CPU_ADD("maincpu", M68000, XTAL_12MHz)
MCFG_CPU_PROGRAM_MAP(main_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", vcombat_state, irq1_line_assert)
@@ -682,6 +682,6 @@ ROM_START( shadfgtr )
/* The second upper-board PAL couldn't be read */
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS */
-GAME( 1993, vcombat, 0, vcombat, vcombat, vcombat_state, vcombat, ORIENTATION_FLIP_X, "VR8 Inc.", "Virtual Combat", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS
+GAME( 1993, vcombat, 0, vcombat, vcombat, vcombat_state, vcombat, ORIENTATION_FLIP_X, "VR8 Inc.", "Virtual Combat", MACHINE_NOT_WORKING )
GAME( 1993, shadfgtr, 0, shadfgtr, shadfgtr, vcombat_state, shadfgtr, ROT0, "Dutech Inc.", "Shadow Fighters", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp
index eea5014f8bc..7cc93cef46e 100644
--- a/src/mame/drivers/vcs80.cpp
+++ b/src/mame/drivers/vcs80.cpp
@@ -209,7 +209,7 @@ void vcs80_state::machine_start()
/* Machine Driver */
-static MACHINE_CONFIG_START( vcs80, vcs80_state )
+static MACHINE_CONFIG_START( vcs80 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_5MHz/2) /* U880D */
MCFG_CPU_PROGRAM_MAP(vcs80_mem)
@@ -249,5 +249,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, vcs80, 0, 0, vcs80, vcs80, driver_device, 0, "Eckhard Schiller", "VCS-80", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, vcs80, 0, 0, vcs80, vcs80, vcs80_state, 0, "Eckhard Schiller", "VCS-80", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp
index fd253aa90b6..bfb8022b92f 100644
--- a/src/mame/drivers/vd.cpp
+++ b/src/mame/drivers/vd.cpp
@@ -180,7 +180,7 @@ void vd_state::machine_reset()
m_t_c = 0;
}
-static MACHINE_CONFIG_START( vd, vd_state )
+static MACHINE_CONFIG_START( vd )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 4000000)
MCFG_CPU_PROGRAM_MAP(vd_map)
@@ -227,5 +227,5 @@ ROM_START(papillon)
ROM_END
-GAME(1986, break86, 0, vd, break86, driver_device, 0, ROT0, "Video Dens", "Break '86", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, papillon, 0, vd, papillon, driver_device, 0, ROT0, "Video Dens", "Papillon", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, break86, 0, vd, break86, vd_state, 0, ROT0, "Video Dens", "Break '86", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, papillon, 0, vd, papillon, vd_state, 0, ROT0, "Video Dens", "Papillon", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp
index 88bbe937128..7c4dab9ff6a 100644
--- a/src/mame/drivers/vector06.cpp
+++ b/src/mame/drivers/vector06.cpp
@@ -46,10 +46,10 @@ static ADDRESS_MAP_START(vector06_io, AS_IO, 8, vector06_state)
AM_RANGE( 0x0C, 0x0C) AM_WRITE(vector06_color_set)
AM_RANGE( 0x10, 0x10) AM_WRITE(vector06_ramdisk_w)
AM_RANGE( 0x14, 0x15) AM_DEVREADWRITE("aysnd", ay8910_device, data_r, data_address_w)
- AM_RANGE( 0x18, 0x18) AM_DEVREADWRITE("wd1793", kr1818vg93_t, data_r, data_w)
- AM_RANGE( 0x19, 0x19) AM_DEVREADWRITE("wd1793", kr1818vg93_t, sector_r, sector_w)
- AM_RANGE( 0x1a, 0x1a) AM_DEVREADWRITE("wd1793", kr1818vg93_t, track_r, track_w)
- AM_RANGE( 0x1b, 0x1b) AM_DEVREADWRITE("wd1793", kr1818vg93_t, status_r, cmd_w)
+ AM_RANGE( 0x18, 0x18) AM_DEVREADWRITE("wd1793", kr1818vg93_device, data_r, data_w)
+ AM_RANGE( 0x19, 0x19) AM_DEVREADWRITE("wd1793", kr1818vg93_device, sector_r, sector_w)
+ AM_RANGE( 0x1a, 0x1a) AM_DEVREADWRITE("wd1793", kr1818vg93_device, track_r, track_w)
+ AM_RANGE( 0x1b, 0x1b) AM_DEVREADWRITE("wd1793", kr1818vg93_device, status_r, cmd_w)
AM_RANGE( 0x1C, 0x1C) AM_WRITE(vector06_disc_w)
ADDRESS_MAP_END
@@ -153,7 +153,7 @@ SLOT_INTERFACE_END
/* Machine driver */
-static MACHINE_CONFIG_START( vector06, vector06_state )
+static MACHINE_CONFIG_START( vector06 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, 3000000) // actual speed is wrong due to unemulated latency
// MCFG_CPU_ADD("maincpu", Z80, 3000000)
@@ -266,8 +266,8 @@ ROM_START( krista2 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, vector06, 0, 0, vector06, vector06, driver_device, 0, "<unknown>", "Vector 06c", 0)
-COMP( 1987, vec1200, vector06, 0, vector06, vector06, driver_device, 0, "<unknown>", "Vector 1200", MACHINE_NOT_WORKING)
-COMP( 1987, pk6128c, vector06, 0, vector06, vector06, driver_device, 0, "<unknown>", "PK-6128c", MACHINE_NOT_WORKING)
-COMP( 1987, krista2, vector06, 0, vector06, vector06, driver_device, 0, "<unknown>", "Krista-2", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, vector06, 0, 0, vector06, vector06, vector06_state, 0, "<unknown>", "Vector 06c", 0)
+COMP( 1987, vec1200, vector06, 0, vector06, vector06, vector06_state, 0, "<unknown>", "Vector 1200", MACHINE_NOT_WORKING)
+COMP( 1987, pk6128c, vector06, 0, vector06, vector06, vector06_state, 0, "<unknown>", "PK-6128c", MACHINE_NOT_WORKING)
+COMP( 1987, krista2, vector06, 0, vector06, vector06, vector06_state, 0, "<unknown>", "Krista-2", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/vector4.cpp b/src/mame/drivers/vector4.cpp
index 74b7dc3d9d7..3facf73a53c 100644
--- a/src/mame/drivers/vector4.cpp
+++ b/src/mame/drivers/vector4.cpp
@@ -24,14 +24,17 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<generic_terminal_device> m_terminal;
DECLARE_READ8_MEMBER(vector4_02_r);
DECLARE_READ8_MEMBER(vector4_03_r);
DECLARE_WRITE8_MEMBER(vector4_02_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
- uint8_t m_term_data;
+ void kbd_put(u8 data);
+
+protected:
virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<generic_terminal_device> m_terminal;
+ uint8_t m_term_data;
};
@@ -81,12 +84,12 @@ void vector4_state::machine_reset()
m_maincpu->set_state_int(Z80_PC, 0xe000);
}
-WRITE8_MEMBER( vector4_state::kbd_put )
+void vector4_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( vector4, vector4_state )
+static MACHINE_CONFIG_START( vector4 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(vector4_mem)
@@ -95,7 +98,7 @@ static MACHINE_CONFIG_START( vector4, vector4_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(vector4_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(vector4_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -116,5 +119,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, vector4, 0, 0, vector4, vector4, driver_device, 0, "Vector Graphics", "Vector 4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 19??, vector4, 0, 0, vector4, vector4, vector4_state, 0, "Vector Graphics", "Vector 4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp
index 5759a3a6c9f..7b8adbec7a7 100644
--- a/src/mame/drivers/vectrex.cpp
+++ b/src/mame/drivers/vectrex.cpp
@@ -95,7 +95,7 @@ static SLOT_INTERFACE_START(vectrex_cart)
SLOT_INTERFACE_INTERNAL("vec_sram", VECTREX_ROM_SRAM)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( vectrex, vectrex_state )
+static MACHINE_CONFIG_START( vectrex )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_6MHz / 4)
MCFG_CPU_PROGRAM_MAP(vectrex_map)
@@ -241,7 +241,7 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-CONS(1982, vectrex, 0, 0, vectrex, vectrex, vectrex_state, vectrex, "General Consumer Electronics", "Vectrex" , ROT270)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME
+CONS(1982, vectrex, 0, 0, vectrex, vectrex, vectrex_state, vectrex, "General Consumer Electronics", "Vectrex" , ROT270)
-GAME(1984, raaspec, 0, raaspec, raaspec, vectrex_state, vectrex, ROT270, "Roy Abel & Associates", "Spectrum I+", MACHINE_NOT_WORKING ) //TODO: button labels & timings, a mandatory artwork too?
+GAME(1984, raaspec, 0, raaspec, raaspec, vectrex_state, vectrex, ROT270, "Roy Abel & Associates", "Spectrum I+", MACHINE_NOT_WORKING ) //TODO: button labels & timings, a mandatory artwork too?
diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp
index 446d01b5bd8..5f0b3bd8991 100644
--- a/src/mame/drivers/vega.cpp
+++ b/src/mame/drivers/vega.cpp
@@ -789,7 +789,7 @@ void vega_state::machine_start()
}
-static MACHINE_CONFIG_START( vega, vega_state )
+static MACHINE_CONFIG_START( vega )
MCFG_CPU_ADD("maincpu", I8035, 4000000)
MCFG_CPU_PROGRAM_MAP(vega_map)
MCFG_CPU_IO_MAP(vega_io_map)
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index efc1b61154d..abe5e9cafc7 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -217,7 +217,7 @@ uint32_t vegaeo_state::screen_update_vega(screen_device &screen, bitmap_ind16 &b
}
-static MACHINE_CONFIG_START( vega, vegaeo_state )
+static MACHINE_CONFIG_START( vega )
MCFG_CPU_ADD("maincpu", GMS30C2132, XTAL_55MHz)
MCFG_CPU_PROGRAM_MAP(vega_map)
MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", vegaeo_state, eolith_speedup, "screen", 0, 1)
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index a79f8d26581..3020a8ac8fa 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -1278,13 +1278,13 @@ ADDRESS_MAP_END
*
*************************************/
-static MACHINE_CONFIG_START( vegascore, vegas_state )
+static MACHINE_CONFIG_START( vegascore )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", R5000LE, SYSTEM_CLOCK*2)
+ MCFG_CPU_ADD("maincpu", R5000LE, vrc5074_device::SYSTEM_CLOCK*2)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
+ MCFG_MIPS3_SYSTEM_CLOCK(vrc5074_device::SYSTEM_CLOCK)
// PCI Bus Devices
MCFG_PCI_ROOT_ADD(":pci")
@@ -1329,7 +1329,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegas250, vegascore )
MCFG_CPU_MODIFY("maincpu")
- MCFG_CPU_CLOCK(SYSTEM_CLOCK*2.5)
+ MCFG_CPU_CLOCK(vrc5074_device::SYSTEM_CLOCK*2.5)
MACHINE_CONFIG_END
@@ -1352,10 +1352,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( vegasv3, vegascore)
- MCFG_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
+ MCFG_CPU_REPLACE("maincpu", RM7000LE, vrc5074_device::SYSTEM_CLOCK*2.5)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
+ MCFG_MIPS3_SYSTEM_CLOCK(vrc5074_device::SYSTEM_CLOCK)
MCFG_DEVICE_REMOVE(PCI_ID_VIDEO)
MCFG_VOODOO_PCI_ADD(PCI_ID_VIDEO, TYPE_VOODOO_3, ":maincpu")
@@ -1366,10 +1366,10 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( denver, vegascore )
- MCFG_CPU_REPLACE("maincpu", RM7000LE, SYSTEM_CLOCK*2.5)
+ MCFG_CPU_REPLACE("maincpu", RM7000LE, vrc5074_device::SYSTEM_CLOCK*2.5)
MCFG_MIPS3_ICACHE_SIZE(16384)
MCFG_MIPS3_DCACHE_SIZE(16384)
- MCFG_MIPS3_SYSTEM_CLOCK(SYSTEM_CLOCK)
+ MCFG_MIPS3_SYSTEM_CLOCK(vrc5074_device::SYSTEM_CLOCK)
MCFG_DEVICE_MODIFY(PCI_ID_NILE)
MCFG_VRC5074_SET_SDRAM(0, 0x02000000)
@@ -1884,32 +1884,32 @@ DRIVER_INIT_MEMBER(vegas_state,cartfury)
*************************************/
/* Vegas + Vegas SIO + Voodoo 2 */
-GAME( 1998, gauntleg, 0, gauntleg, gauntleg, vegas_state, gauntleg, ROT0, "Atari Games", "Gauntlet Legends (version 1.6)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, gauntleg12, gauntleg, gauntleg, gauntleg, vegas_state, gauntleg, ROT0, "Atari Games", "Gauntlet Legends (version 1.2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, tenthdeg, 0, tenthdeg, tenthdeg, vegas_state, tenthdeg, ROT0, "Atari Games", "Tenth Degree (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, gauntleg, 0, gauntleg, gauntleg, vegas_state, gauntleg, ROT0, "Atari Games", "Gauntlet Legends (version 1.6)", MACHINE_SUPPORTS_SAVE )
+GAME( 1998, gauntleg12, gauntleg, gauntleg, gauntleg, vegas_state, gauntleg, ROT0, "Atari Games", "Gauntlet Legends (version 1.2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, tenthdeg, 0, tenthdeg, tenthdeg, vegas_state, tenthdeg, ROT0, "Atari Games", "Tenth Degree (prototype)", MACHINE_SUPPORTS_SAVE )
/* Durango + Vegas SIO + Voodoo 2 */
-GAME( 1999, gauntdl, 0, gauntdl, gauntdl, vegas_state, gauntdl, ROT0, "Midway Games", "Gauntlet Dark Legacy (version DL 2.52)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gauntdl24,gauntdl, gauntdl, gauntdl, vegas_state, gauntdl, ROT0, "Midway Games", "Gauntlet Dark Legacy (version DL 2.4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, warfa, 0, warfa, warfa, vegas_state, warfa, ROT0, "Atari Games", "War: The Final Assault (EPROM 1.9 Mar 25 1999, GUTS 1.3 Apr 20 1999, GAME Apr 20 1999)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, warfaa, warfa, warfa, warfa, vegas_state, warfa, ROT0, "Atari Games", "War: The Final Assault (EPROM 1.6 Jan 14 1999, GUTS 1.1 Mar 16 1999, GAME Mar 16 1999)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, warfab, warfa, warfa, warfa, vegas_state, warfa, ROT0, "Atari Games", "War: The Final Assault (EPROM 1.3 Apr 7 1999, GUTS 1.3 Apr 7 1999, GAME Apr 7 1999)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // version numbers comes from test mode, can be unreliable
+GAME( 1999, gauntdl, 0, gauntdl, gauntdl, vegas_state, gauntdl, ROT0, "Midway Games", "Gauntlet Dark Legacy (version DL 2.52)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gauntdl24, gauntdl, gauntdl, gauntdl, vegas_state, gauntdl, ROT0, "Midway Games", "Gauntlet Dark Legacy (version DL 2.4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, warfa, 0, warfa, warfa, vegas_state, warfa, ROT0, "Atari Games", "War: The Final Assault (EPROM 1.9 Mar 25 1999, GUTS 1.3 Apr 20 1999, GAME Apr 20 1999)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, warfaa, warfa, warfa, warfa, vegas_state, warfa, ROT0, "Atari Games", "War: The Final Assault (EPROM 1.6 Jan 14 1999, GUTS 1.1 Mar 16 1999, GAME Mar 16 1999)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, warfab, warfa, warfa, warfa, vegas_state, warfa, ROT0, "Atari Games", "War: The Final Assault (EPROM 1.3 Apr 7 1999, GUTS 1.3 Apr 7 1999, GAME Apr 7 1999)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // version numbers comes from test mode, can be unreliable
/* Durango + DSIO + Voodoo 2 */
-GAME( 1999, roadburn, 0, roadburn, roadburn, vegas_state, roadburn, ROT0, "Atari Games", "Road Burners (ver 1.04)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, roadburn1,roadburn, roadburn, roadburn, vegas_state, roadburn, ROT0, "Atari Games", "Road Burners (ver 1.0)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, roadburn, 0, roadburn, roadburn, vegas_state, roadburn, ROT0, "Atari Games", "Road Burners (ver 1.04)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, roadburn1, roadburn, roadburn, roadburn, vegas_state, roadburn, ROT0, "Atari Games", "Road Burners (ver 1.0)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
/* Durango + DSIO? + Voodoo banshee */
-GAME( 1998, nbashowt, 0, nbashowt, nbashowt, vegas_state, nbashowt, ROT0, "Midway Games", "NBA Showtime: NBA on NBC (ver 2.0)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, nbanfl, 0, nbanfl, nbashowt, vegas_state, nbanfl, ROT0, "Midway Games", "NBA Showtime / NFL Blitz 2000 (ver 2.1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, nbagold , 0, nbanfl, nbashowt, vegas_state, nbanfl, ROT0, "Midway Games", "NBA Showtime Gold / NFL Blitz 2000 (ver 3.0) (Sports Station?)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, nbashowt, 0, nbashowt, nbashowt, vegas_state, nbashowt, ROT0, "Midway Games", "NBA Showtime: NBA on NBC (ver 2.0)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1999, nbanfl, 0, nbanfl, nbashowt, vegas_state, nbanfl, ROT0, "Midway Games", "NBA Showtime / NFL Blitz 2000 (ver 2.1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, nbagold , 0, nbanfl, nbashowt, vegas_state, nbanfl, ROT0, "Midway Games", "NBA Showtime Gold / NFL Blitz 2000 (ver 3.0) (Sports Station?)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
/* Durango + Denver SIO + Voodoo 3 */
-GAME( 1998, sf2049, 0, sf2049, sf2049, vegas_state, sf2049, ROT0, "Atari Games", "San Francisco Rush 2049", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sf2049se, sf2049, sf2049se, sf2049se, vegas_state, sf2049se, ROT0, "Atari Games", "San Francisco Rush 2049: Special Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sf2049te, sf2049, sf2049te, sf2049te, vegas_state, sf2049te, ROT0, "Atari Games", "San Francisco Rush 2049: Tournament Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE)
+GAME( 1998, sf2049, 0, sf2049, sf2049, vegas_state, sf2049, ROT0, "Atari Games", "San Francisco Rush 2049", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sf2049se, sf2049, sf2049se, sf2049se, vegas_state, sf2049se, ROT0, "Atari Games", "San Francisco Rush 2049: Special Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sf2049te, sf2049, sf2049te, sf2049te, vegas_state, sf2049te, ROT0, "Atari Games", "San Francisco Rush 2049: Tournament Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE)
/* Durango + Vegas SIO + Voodoo 3 */
-GAME( 2000, cartfury, 0, cartfury, cartfury, vegas_state, cartfury, ROT0, "Midway Games", "Cart Fury", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 2000, cartfury, 0, cartfury, cartfury, vegas_state, cartfury, ROT0, "Midway Games", "Cart Fury", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index 694faee3bf3..f8e05ee86f9 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -418,7 +418,7 @@ WRITE8_MEMBER( vendetta_state::banking_callback )
membank("bank1")->set_entry(data);
}
-static MACHINE_CONFIG_START( vendetta, vendetta_state )
+static MACHINE_CONFIG_START( vendetta )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", KONAMI, XTAL_24MHz/8) /* 052001 (verified on pcb) */
@@ -793,14 +793,14 @@ ROM_END
***************************************************************************/
-GAME( 1991, vendetta, 0, vendetta, vendet4p, driver_device, 0, ROT0, "Konami", "Vendetta (World, 4 Players, ver. T)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendettar, vendetta, vendetta, vendet4p, driver_device, 0, ROT0, "Konami", "Vendetta (US, 4 Players, ver. R)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendettaz, vendetta, vendetta, vendet4p, driver_device, 0, ROT0, "Konami", "Vendetta (Asia, 4 Players, ver. Z)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendetta2p, vendetta, vendetta, vendetta, driver_device, 0, ROT0, "Konami", "Vendetta (World, 2 Players, ver. W)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendetta2peba,vendetta,vendetta, vendetta, driver_device, 0, ROT0, "Konami", "Vendetta (World, 2 Players, ver. EB-A?)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendetta2pun,vendetta, vendetta, vendetta, driver_device, 0, ROT0, "Konami", "Vendetta (World, 2 Players, ver. ?)", MACHINE_SUPPORTS_SAVE ) /* program rom labeled as 1 */
-GAME( 1991, vendetta2pu, vendetta, vendetta, vendetta, driver_device, 0, ROT0, "Konami", "Vendetta (Asia, 2 Players, ver. U)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendetta2pd, vendetta, vendetta, vendetta, driver_device, 0, ROT0, "Konami", "Vendetta (Asia, 2 Players, ver. D)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, vendettaj, vendetta, vendetta, vendetta, driver_device, 0, ROT0, "Konami", "Crime Fighters 2 (Japan, 2 Players, ver. P)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, esckids, 0, esckids, esckids, driver_device, 0, ROT0, "Konami", "Escape Kids (Asia, 4 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, esckidsj, esckids, esckids, esckidsj, driver_device, 0, ROT0, "Konami", "Escape Kids (Japan, 2 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendetta, 0, vendetta, vendet4p, vendetta_state, 0, ROT0, "Konami", "Vendetta (World, 4 Players, ver. T)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendettar, vendetta, vendetta, vendet4p, vendetta_state, 0, ROT0, "Konami", "Vendetta (US, 4 Players, ver. R)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendettaz, vendetta, vendetta, vendet4p, vendetta_state, 0, ROT0, "Konami", "Vendetta (Asia, 4 Players, ver. Z)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendetta2p, vendetta, vendetta, vendetta, vendetta_state, 0, ROT0, "Konami", "Vendetta (World, 2 Players, ver. W)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendetta2peba,vendetta,vendetta, vendetta, vendetta_state, 0, ROT0, "Konami", "Vendetta (World, 2 Players, ver. EB-A?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendetta2pun,vendetta, vendetta, vendetta, vendetta_state, 0, ROT0, "Konami", "Vendetta (World, 2 Players, ver. ?)", MACHINE_SUPPORTS_SAVE ) /* program rom labeled as 1 */
+GAME( 1991, vendetta2pu, vendetta, vendetta, vendetta, vendetta_state, 0, ROT0, "Konami", "Vendetta (Asia, 2 Players, ver. U)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendetta2pd, vendetta, vendetta, vendetta, vendetta_state, 0, ROT0, "Konami", "Vendetta (Asia, 2 Players, ver. D)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, vendettaj, vendetta, vendetta, vendetta, vendetta_state, 0, ROT0, "Konami", "Crime Fighters 2 (Japan, 2 Players, ver. P)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, esckids, 0, esckids, esckids, vendetta_state, 0, ROT0, "Konami", "Escape Kids (Asia, 4 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, esckidsj, esckids, esckids, esckidsj, vendetta_state, 0, ROT0, "Konami", "Escape Kids (Japan, 2 Players)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp
index 7070aff0c52..86cd694381f 100644
--- a/src/mame/drivers/vertigo.cpp
+++ b/src/mame/drivers/vertigo.cpp
@@ -113,7 +113,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( vertigo, vertigo_state )
+static MACHINE_CONFIG_START( vertigo )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 8000000)
@@ -223,4 +223,4 @@ ROM_END
*
*************************************/
-GAME( 1986, topgunnr, 0, vertigo, vertigo, driver_device, 0, ROT0, "Exidy", "Top Gunner (Exidy)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, topgunnr, 0, vertigo, vertigo, vertigo_state, 0, ROT0, "Exidy", "Top Gunner (Exidy)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index cfb9227a5d9..c460768f086 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -358,7 +358,7 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k)
}
-static MACHINE_CONFIG_START( vg5k, vg5k_state )
+static MACHINE_CONFIG_START( vg5k )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
@@ -425,5 +425,5 @@ ROM_START( vg5k )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, vg5k, 0, 0, vg5k, vg5k, vg5k_state, vg5k, "Philips", "VG-5000", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984, vg5k, 0, 0, vg5k, vg5k, vg5k_state, vg5k, "Philips", "VG-5000", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index 7e540c62ec1..1401cda9294 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -128,7 +128,7 @@ private:
void blocks_clear();
};
-const device_type VGMPLAY = device_creator<vgmplay_device>;
+DEFINE_DEVICE_TYPE(VGMPLAY, vgmplay_device, "vgmplay_core", "VGM Player engine")
class vgmplay_state : public driver_device
{
@@ -182,7 +182,7 @@ private:
};
vgmplay_device::vgmplay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- cpu_device(mconfig, VGMPLAY, "VGM Player engine", tag, owner, clock, "vgmplay_core", __FILE__),
+ cpu_device(mconfig, VGMPLAY, tag, owner, clock),
m_file_config("file", ENDIANNESS_LITTLE, 8, 32),
m_io_config("io", ENDIANNESS_LITTLE, 8, 32),
m_io16_config("io16", ENDIANNESS_LITTLE, 16, 32)
@@ -1289,7 +1289,7 @@ static ADDRESS_MAP_START( h6280_io_map, AS_IO, 8, vgmplay_state )
AM_RANGE(0, 3) AM_NOP
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( vgmplay, vgmplay_state )
+static MACHINE_CONFIG_START( vgmplay )
MCFG_CPU_ADD("vgmplay", VGMPLAY, 44100)
MCFG_CPU_PROGRAM_MAP( file_map )
MCFG_CPU_IO_MAP( soundchips_map )
@@ -1396,7 +1396,7 @@ static MACHINE_CONFIG_START( vgmplay, vgmplay_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1)
MCFG_SOUND_ROUTE(1, "rspeaker", 1)
- MCFG_OKIM6295_ADD("okim6295", 1000000, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("okim6295", 1000000, PIN7_HIGH)
MCFG_DEVICE_ADDRESS_MAP(AS_0, okim6295_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25)
@@ -1405,5 +1405,4 @@ MACHINE_CONFIG_END
ROM_START( vgmplay )
ROM_END
-CONS( 2016, vgmplay, 0, 0, vgmplay, vgmplay, driver_device, 0, "MAME", "VGM player", 0)
-
+CONS( 2016, vgmplay, 0, 0, vgmplay, vgmplay, vgmplay_state, 0, "MAME", "VGM player", 0 )
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index b6a207cf2b7..a51946e10a7 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -688,7 +688,7 @@ void vic10_state::machine_reset()
// MACHINE_CONFIG( vic10 )
//-------------------------------------------------
-static MACHINE_CONFIG_START( vic10, vic10_state )
+static MACHINE_CONFIG_START( vic10 )
// basic hardware
MCFG_CPU_ADD(M6510_TAG, M6510, XTAL_8MHz/8)
MCFG_CPU_PROGRAM_MAP(vic10_mem)
@@ -761,4 +761,4 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-COMP( 1982, vic10, 0, 0, vic10, vic10, driver_device, 0, "Commodore Business Machines", "VIC-10 / Max Machine / UltiMax (NTSC)", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, vic10, 0, 0, vic10, vic10, vic10_state, 0, "Commodore Business Machines", "VIC-10 / Max Machine / UltiMax (NTSC)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 67a3547188a..024015cdf9e 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -787,7 +787,7 @@ WRITE_LINE_MEMBER(vic20_state::write_user_cassette_switch)
// MACHINE_CONFIG( vic20_common )
//-------------------------------------------------
-static MACHINE_CONFIG_START( vic20, vic20_state )
+static MACHINE_CONFIG_START( vic20 )
// devices
MCFG_DEVICE_ADD(M6522_1_TAG, VIA6522, 0)
MCFG_VIA6522_READPA_HANDLER(READ8(vic20_state, via1_pa_r))
@@ -984,8 +984,8 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1980, vic1001, 0, 0, ntsc, vic1001, driver_device, 0, "Commodore Business Machines", "VIC-1001 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, vic20, vic1001, 0, ntsc, vic20, driver_device, 0, "Commodore Business Machines", "VIC-20 (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, vic20p, vic1001, 0, pal, vic20, driver_device, 0, "Commodore Business Machines", "VIC-20 / VC-20 (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-COMP( 1981, vic20_se, vic1001, 0, pal, vic20s, driver_device, 0, "Commodore Business Machines", "VIC-20 (Sweden/Finland)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, vic1001, 0, 0, ntsc, vic1001, vic20_state, 0, "Commodore Business Machines", "VIC-1001 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, vic20, vic1001, 0, ntsc, vic20, vic20_state, 0, "Commodore Business Machines", "VIC-20 (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, vic20p, vic1001, 0, pal, vic20, vic20_state, 0, "Commodore Business Machines", "VIC-20 / VC-20 (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+COMP( 1981, vic20_se, vic1001, 0, pal, vic20s, vic20_state, 0, "Commodore Business Machines", "VIC-20 (Sweden/Finland)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index 7b9a9f128cc..176b0f04fc5 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -255,7 +255,7 @@ void vicdual_state::machine_start()
}
-static MACHINE_CONFIG_START( vicdual_root, vicdual_state )
+static MACHINE_CONFIG_START( vicdual_root )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
@@ -2397,7 +2397,7 @@ MACHINE_RESET_MEMBER(nsub_state, nsub)
machine_reset();
}
-static MACHINE_CONFIG_START( nsub, nsub_state )
+static MACHINE_CONFIG_START( nsub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, VICDUAL_MAIN_CPU_CLOCK)
MCFG_CPU_PROGRAM_MAP(nsub_map)
@@ -3631,47 +3631,47 @@ ROM_END
*
*************************************/
-GAMEL(1977, depthch, 0, depthch, depthch, driver_device, 0, ROT0, "Gremlin", "Depthcharge", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_depthch )
-GAMEL(1977, depthcho, depthch, depthch, depthch, driver_device, 0, ROT0, "Gremlin", "Depthcharge (older)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_depthch )
-GAMEL(1977, subhunt, depthch, depthch, depthch, driver_device, 0, ROT0, "Gremlin (Taito license)", "Sub Hunter (Gremlin / Taito)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_depthch )
-GAME( 1977, safari, 0, safari, safari, driver_device, 0, ROT0, "Gremlin", "Safari (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1977, safaria, safari, safari, safari, driver_device, 0, ROT0, "Gremlin", "Safari (set 2, bootleg?)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // on a bootleg board, but seems a different code revision too
-GAME( 1978, frogs, 0, frogs, frogs, driver_device, 0, ROT0, "Gremlin", "Frogs", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sspaceat, 0, sspaceat, sspaceat, driver_device, 0, ROT270, "Sega", "Space Attack (upright set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sspaceat2, sspaceat, sspaceat, sspaceat, driver_device, 0, ROT270, "Sega", "Space Attack (upright set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sspaceat3, sspaceat, sspaceat, sspaceat, driver_device, 0, ROT270, "Sega", "Space Attack (upright set 3)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sspaceatc, sspaceat, sspaceat, sspaceat, driver_device, 0, ROT270, "Sega", "Space Attack (cocktail)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, sspacaho, 0, sspacaho, sspacaho, driver_device, 0, ROT270, "Sega", "Space Attack / Head On", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, headon, 0, headon, headon, driver_device, 0, ROT0, "Gremlin", "Head On (2 players)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, headon1, headon, headon, headon, driver_device, 0, ROT0, "Gremlin", "Head On (1 player)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, headons, headon, headons, headons, driver_device, 0, ROT0, "bootleg (Sidam)", "Head On (Sidam bootleg, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, headonsa, headon, headons, headons, driver_device, 0, ROT0, "bootleg (Sidam)", "Head On (Sidam bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // won't coin up?
-GAME( 1979, headonmz, headon, headon, headonmz, driver_device, 0, ROT0, "bootleg", "Head On (bootleg, alt maze)", MACHINE_SUPPORTS_SAVE )
-GAME( 1979, supcrash, headon, headons, supcrash, driver_device, 0, ROT0, "bootleg", "Super Crash (bootleg of Head On)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, hocrash, headon, headons, headons, driver_device, 0, ROT0, "bootleg (Fraber)", "Crash (bootleg of Head On)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, headon2, 0, headon2, headon2, driver_device, 0, ROT0, "Sega", "Head On 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, headon2s, headon2, headon2bw, car2, driver_device, 0, ROT0, "bootleg (Sidam)", "Head On 2 (Sidam bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // won't coin up?
-GAME( 1979, car2, headon2, headon2bw, car2, driver_device, 0, ROT0, "bootleg (RZ Bologna)", "Car 2 (bootleg of Head On 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // title still says 'HeadOn 2'
-GAME( 1979, invho2, 0, invho2, invho2, driver_device, 0, ROT270, "Sega", "Invinco / Head On 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, nsub, 0, nsub, nsub, driver_device, 0, ROT270, "Sega", "N-Sub (upright)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // this is the upright set. cocktail set still needs to be dumped
-GAME( 1980, samurai, 0, samurai, samurai, driver_device, 0, ROT270, "Sega", "Samurai", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, invinco, 0, invinco, invinco, driver_device, 0, ROT270, "Sega", "Invinco", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, invds, 0, invds, invds, driver_device, 0, ROT270, "Sega", "Invinco / Deep Scan", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, carhntds, 0, carhntds, carhntds, driver_device, 0, ROT270, "Sega", "Car Hunt / Deep Scan (France)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tranqgun, 0, tranqgun, tranqgun, driver_device, 0, ROT270, "Sega", "Tranquillizer Gun", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacetrk, 0, spacetrk, spacetrk, driver_device, 0, ROT270, "Sega", "Space Trek (upright)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, spacetrkc, spacetrk, spacetrk, spacetrkc, driver_device, 0, ROT270, "Sega", "Space Trek (cocktail)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, carnival, 0, carnival, carnival, driver_device, 0, ROT270, "Sega", "Carnival (upright)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, carnivalc, carnival, carnival, carnivalc, driver_device, 0, ROT270, "Sega", "Carnival (cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, carnivalh, carnival, carnivalh, carnivalh, driver_device, 0, ROT270, "Sega", "Carnival (Head On hardware, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, carnivalha, carnival, carnivalh, carnivalh, driver_device, 0, ROT270, "Sega", "Carnival (Head On hardware, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, brdrline, 0, brdrline, brdrline, driver_device, 0, ROT270, "Sega", "Borderline", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, starrkr, brdrline, brdrline, starrkr, driver_device, 0, ROT270, "Sega", "Star Raker", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, brdrlins, brdrline, brdrline, brdrline, driver_device, 0, ROT270, "bootleg (Sidam)", "Borderline (Sidam bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, brdrlinb, brdrline, brdrline, brdrline, driver_device, 0, ROT270, "bootleg (Karateco)", "Borderline (Karateco bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, brdrlinet, brdrline, tranqgun, tranqgun, driver_device, 0, ROT270, "Sega", "Borderline (Tranquillizer Gun conversion)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // official factory conversion
-GAME( 198?, startrks, 0, headons, headons, driver_device, 0, ROT0, "bootleg (Sidam)", "Star Trek (Head On hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, digger, 0, digger, digger, driver_device, 0, ROT270, "Sega", "Digger", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, pulsar, 0, pulsar, pulsar, driver_device, 0, ROT270, "Sega", "Pulsar", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, heiankyo, 0, heiankyo, heiankyo, driver_device, 0, ROT270, "Denki Onkyo", "Heiankyo Alien", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 19??, alphaho, 0, alphaho, alphaho, driver_device, 0, ROT270, "Data East Corporation", "Alpha Fighter / Head On", MACHINE_WRONG_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1977, depthch, 0, depthch, depthch, vicdual_state, 0, ROT0, "Gremlin", "Depthcharge", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_depthch )
+GAMEL(1977, depthcho, depthch, depthch, depthch, vicdual_state, 0, ROT0, "Gremlin", "Depthcharge (older)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_depthch )
+GAMEL(1977, subhunt, depthch, depthch, depthch, vicdual_state, 0, ROT0, "Gremlin (Taito license)", "Sub Hunter (Gremlin / Taito)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_depthch )
+GAME( 1977, safari, 0, safari, safari, vicdual_state, 0, ROT0, "Gremlin", "Safari (set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1977, safaria, safari, safari, safari, vicdual_state, 0, ROT0, "Gremlin", "Safari (set 2, bootleg?)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // on a bootleg board, but seems a different code revision too
+GAME( 1978, frogs, 0, frogs, frogs, vicdual_state, 0, ROT0, "Gremlin", "Frogs", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sspaceat, 0, sspaceat, sspaceat, vicdual_state, 0, ROT270, "Sega", "Space Attack (upright set 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sspaceat2, sspaceat, sspaceat, sspaceat, vicdual_state, 0, ROT270, "Sega", "Space Attack (upright set 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sspaceat3, sspaceat, sspaceat, sspaceat, vicdual_state, 0, ROT270, "Sega", "Space Attack (upright set 3)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sspaceatc, sspaceat, sspaceat, sspaceat, vicdual_state, 0, ROT270, "Sega", "Space Attack (cocktail)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, sspacaho, 0, sspacaho, sspacaho, vicdual_state, 0, ROT270, "Sega", "Space Attack / Head On", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headon, 0, headon, headon, vicdual_state, 0, ROT0, "Gremlin", "Head On (2 players)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headon1, headon, headon, headon, vicdual_state, 0, ROT0, "Gremlin", "Head On (1 player)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headons, headon, headons, headons, vicdual_state, 0, ROT0, "bootleg (Sidam)", "Head On (Sidam bootleg, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headonsa, headon, headons, headons, vicdual_state, 0, ROT0, "bootleg (Sidam)", "Head On (Sidam bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // won't coin up?
+GAME( 1979, headonmz, headon, headon, headonmz, vicdual_state, 0, ROT0, "bootleg", "Head On (bootleg, alt maze)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, supcrash, headon, headons, supcrash, vicdual_state, 0, ROT0, "bootleg", "Super Crash (bootleg of Head On)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, hocrash, headon, headons, headons, vicdual_state, 0, ROT0, "bootleg (Fraber)", "Crash (bootleg of Head On)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headon2, 0, headon2, headon2, vicdual_state, 0, ROT0, "Sega", "Head On 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, headon2s, headon2, headon2bw, car2, vicdual_state, 0, ROT0, "bootleg (Sidam)", "Head On 2 (Sidam bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // won't coin up?
+GAME( 1979, car2, headon2, headon2bw, car2, vicdual_state, 0, ROT0, "bootleg (RZ Bologna)", "Car 2 (bootleg of Head On 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // title still says 'HeadOn 2'
+GAME( 1979, invho2, 0, invho2, invho2, vicdual_state, 0, ROT270, "Sega", "Invinco / Head On 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, nsub, 0, nsub, nsub, nsub_state, 0, ROT270, "Sega", "N-Sub (upright)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // this is the upright set. cocktail set still needs to be dumped
+GAME( 1980, samurai, 0, samurai, samurai, vicdual_state, 0, ROT270, "Sega", "Samurai", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, invinco, 0, invinco, invinco, vicdual_state, 0, ROT270, "Sega", "Invinco", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, invds, 0, invds, invds, vicdual_state, 0, ROT270, "Sega", "Invinco / Deep Scan", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, carhntds, 0, carhntds, carhntds, vicdual_state, 0, ROT270, "Sega", "Car Hunt / Deep Scan (France)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tranqgun, 0, tranqgun, tranqgun, vicdual_state, 0, ROT270, "Sega", "Tranquillizer Gun", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacetrk, 0, spacetrk, spacetrk, vicdual_state, 0, ROT270, "Sega", "Space Trek (upright)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, spacetrkc, spacetrk, spacetrk, spacetrkc, vicdual_state, 0, ROT270, "Sega", "Space Trek (cocktail)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, carnival, 0, carnival, carnival, vicdual_state, 0, ROT270, "Sega", "Carnival (upright)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, carnivalc, carnival, carnival, carnivalc, vicdual_state, 0, ROT270, "Sega", "Carnival (cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, carnivalh, carnival, carnivalh, carnivalh, vicdual_state, 0, ROT270, "Sega", "Carnival (Head On hardware, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, carnivalha, carnival, carnivalh, carnivalh, vicdual_state, 0, ROT270, "Sega", "Carnival (Head On hardware, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, brdrline, 0, brdrline, brdrline, vicdual_state, 0, ROT270, "Sega", "Borderline", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, starrkr, brdrline, brdrline, starrkr, vicdual_state, 0, ROT270, "Sega", "Star Raker", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, brdrlins, brdrline, brdrline, brdrline, vicdual_state, 0, ROT270, "bootleg (Sidam)", "Borderline (Sidam bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, brdrlinb, brdrline, brdrline, brdrline, vicdual_state, 0, ROT270, "bootleg (Karateco)", "Borderline (Karateco bootleg)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, brdrlinet, brdrline, tranqgun, tranqgun, vicdual_state, 0, ROT270, "Sega", "Borderline (Tranquillizer Gun conversion)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // official factory conversion
+GAME( 198?, startrks, 0, headons, headons, vicdual_state, 0, ROT0, "bootleg (Sidam)", "Star Trek (Head On hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, digger, 0, digger, digger, vicdual_state, 0, ROT270, "Sega", "Digger", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, pulsar, 0, pulsar, pulsar, vicdual_state, 0, ROT270, "Sega", "Pulsar", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, heiankyo, 0, heiankyo, heiankyo, vicdual_state, 0, ROT270, "Denki Onkyo", "Heiankyo Alien", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 19??, alphaho, 0, alphaho, alphaho, vicdual_state, 0, ROT270, "Data East Corporation", "Alpha Fighter / Head On", MACHINE_WRONG_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index 5b59ebbff2c..616a8129095 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -34,7 +34,7 @@
#include "machine/pit8253.h"
#include "machine/pic8259.h"
#include "machine/ram.h"
-#include "machine/victor9kb.h"
+#include "machine/victor9k_kb.h"
#include "machine/victor9k_fdc.h"
#include "machine/z80dart.h"
#include "sound/hc55516.h"
@@ -108,8 +108,8 @@ public:
required_device<hc55516_device> m_cvsd;
required_device<mc6845_device> m_crtc;
required_device<ram_device> m_ram;
- required_device<victor_9000_keyboard_t> m_kb;
- required_device<victor_9000_fdc_t> m_fdc;
+ required_device<victor_9000_keyboard_device> m_kb;
+ required_device<victor_9000_fdc_device> m_fdc;
required_device<centronics_device> m_centronics;
required_device<rs232_port_device> m_rs232a;
required_device<rs232_port_device> m_rs232b;
@@ -201,9 +201,9 @@ static ADDRESS_MAP_START( victor9k_mem, AS_PROGRAM, 8, victor9k_state )
AM_RANGE(0xe8040, 0xe804f) AM_MIRROR(0x7f00) AM_DEVREADWRITE(M6522_2_TAG, via6522_device, read, write)
AM_RANGE(0xe8060, 0xe8061) AM_MIRROR(0x7f00) AM_DEVREADWRITE(MC6852_TAG, mc6852_device, read, write)
AM_RANGE(0xe8080, 0xe808f) AM_MIRROR(0x7f00) AM_DEVREADWRITE(M6522_3_TAG, via6522_device, read, write)
- AM_RANGE(0xe80a0, 0xe80af) AM_MIRROR(0x7f00) AM_DEVREADWRITE(FDC_TAG, victor_9000_fdc_t, cs5_r, cs5_w)
- AM_RANGE(0xe80c0, 0xe80cf) AM_MIRROR(0x7f00) AM_DEVREADWRITE(FDC_TAG, victor_9000_fdc_t, cs6_r, cs6_w)
- AM_RANGE(0xe80e0, 0xe80ef) AM_MIRROR(0x7f00) AM_DEVREADWRITE(FDC_TAG, victor_9000_fdc_t, cs7_r, cs7_w)
+ AM_RANGE(0xe80a0, 0xe80af) AM_MIRROR(0x7f00) AM_DEVREADWRITE(FDC_TAG, victor_9000_fdc_device, cs5_r, cs5_w)
+ AM_RANGE(0xe80c0, 0xe80cf) AM_MIRROR(0x7f00) AM_DEVREADWRITE(FDC_TAG, victor_9000_fdc_device, cs6_r, cs6_w)
+ AM_RANGE(0xe80e0, 0xe80ef) AM_MIRROR(0x7f00) AM_DEVREADWRITE(FDC_TAG, victor_9000_fdc_device, cs7_r, cs7_w)
AM_RANGE(0xf0000, 0xf0fff) AM_MIRROR(0x1000) AM_RAM AM_SHARE("video_ram")
AM_RANGE(0xf8000, 0xf9fff) AM_MIRROR(0x6000) AM_ROM AM_REGION(I8088_TAG, 0)
ADDRESS_MAP_END
@@ -674,7 +674,7 @@ void victor9k_state::machine_reset()
// MACHINE_CONFIG( victor9k )
//-------------------------------------------------
-static MACHINE_CONFIG_START( victor9k, victor9k_state )
+static MACHINE_CONFIG_START( victor9k )
// basic machine hardware
MCFG_CPU_ADD(I8088_TAG, I8088, XTAL_30MHz/6)
MCFG_CPU_PROGRAM_MAP(victor9k_mem)
@@ -816,5 +816,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1982, victor9k, 0, 0, victor9k, victor9k, driver_device, 0, "Victor Business Products", "Victor 9000", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, victor9k, 0, 0, victor9k, victor9k, victor9k_state, 0, "Victor Business Products", "Victor 9000", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/victory.cpp b/src/mame/drivers/victory.cpp
index 439aaf32701..8480d91c62f 100644
--- a/src/mame/drivers/victory.cpp
+++ b/src/mame/drivers/victory.cpp
@@ -210,7 +210,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( victory, victory_state )
+static MACHINE_CONFIG_START( victory )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, VICTORY_MAIN_CPU_CLOCK)
@@ -317,5 +317,5 @@ ROM_END
*
*************************************/
-GAME( 1982, victory, 0, victory, victory, driver_device, 0, ROT0, "Exidy", "Victory", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, victorba, victory, victory, victory, driver_device, 0, ROT0, "Exidy", "Victor Banana", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, victory, 0, victory, victory, victory_state, 0, ROT0, "Exidy", "Victory", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, victorba, victory, victory, victory, victory_state, 0, ROT0, "Exidy", "Victor Banana", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp
index f5a134439c1..8581750e536 100644
--- a/src/mame/drivers/vidbrain.cpp
+++ b/src/mame/drivers/vidbrain.cpp
@@ -500,7 +500,7 @@ void vidbrain_state::machine_reset()
// MACHINE_CONFIG( vidbrain )
//-------------------------------------------------
-static MACHINE_CONFIG_START( vidbrain, vidbrain_state )
+static MACHINE_CONFIG_START( vidbrain )
// basic machine hardware
MCFG_CPU_ADD(F3850_TAG, F8, XTAL_4MHz/2)
MCFG_CPU_PROGRAM_MAP(vidbrain_mem)
@@ -563,5 +563,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1977, vidbrain, 0, 0, vidbrain, vidbrain, driver_device, 0, "VideoBrain Computer Company", "VideoBrain FamilyComputer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, vidbrain, 0, 0, vidbrain, vidbrain, vidbrain_state, 0, "VideoBrain Computer Company", "VideoBrain FamilyComputer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp
index ed83948190a..1aad6842543 100644
--- a/src/mame/drivers/videopin.cpp
+++ b/src/mame/drivers/videopin.cpp
@@ -358,7 +358,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( videopin, videopin_state )
+static MACHINE_CONFIG_START( videopin )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
@@ -465,5 +465,5 @@ ROM_END
*
*************************************/
-GAMEL( 1979, videopin, 0, videopin, videopin, driver_device, 0, ROT270, "Atari", "Video Pinball", MACHINE_SUPPORTS_SAVE, layout_videopin )
-GAMEL( 1979, solarwar, 0, videopin, solarwar, driver_device, 0, ROT270, "Atari", "Solar War", MACHINE_SUPPORTS_SAVE, layout_videopin )
+GAMEL( 1979, videopin, 0, videopin, videopin, videopin_state, 0, ROT270, "Atari", "Video Pinball", MACHINE_SUPPORTS_SAVE, layout_videopin )
+GAMEL( 1979, solarwar, 0, videopin, solarwar, videopin_state, 0, ROT270, "Atari", "Solar War", MACHINE_SUPPORTS_SAVE, layout_videopin )
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index caead2e048d..3fcb610ab73 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -1223,7 +1223,7 @@ void videopkr_state::machine_start()
* Machine Drivers *
************************/
-static MACHINE_CONFIG_START( videopkr, videopkr_state )
+static MACHINE_CONFIG_START( videopkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8039, CPU_CLOCK)
@@ -1553,12 +1553,12 @@ ROM_END
/*************************
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
-GAMEL( 1984, videopkr, 0, videopkr, videopkr, driver_device, 0, ROT0, "InterFlip", "Video Poker", 0, layout_videopkr )
-GAMEL( 1984, fortune1, videopkr, fortune1, videopkr, driver_device, 0, ROT0, "IGT - International Game Technology", "Fortune I (PK485-S) Draw Poker", 0, layout_videopkr )
-GAMEL( 1984, blckjack, videopkr, blckjack, blckjack, driver_device, 0, ROT0, "InterFlip", "Black Jack", 0, layout_blckjack )
-GAMEL( 1987, videodad, videopkr, videodad, videodad, driver_device, 0, ROT0, "InterFlip", "Video Dado", 0, layout_videodad )
-GAMEL( 1987, videocba, videopkr, videodad, videocba, driver_device, 0, ROT0, "InterFlip", "Video Cordoba", 0, layout_videocba )
-GAMEL( 1987, babypkr , videopkr, babypkr, babypkr, driver_device, 0, ROT0, "Recreativos Franco", "Baby Poker", 0, layout_babypkr )
-GAMEL( 1987, babydad , videopkr, babypkr, babydad, driver_device, 0, ROT0, "Recreativos Franco", "Baby Dado", 0, layout_babydad )
-GAMEL( 198?, bpoker , videopkr, babypkr, babypkr, driver_device, 0, ROT0, "Recreativos Franco", "Video Poker (v1403)", MACHINE_NOT_WORKING, layout_babypkr )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT
+GAMEL( 1984, videopkr, 0, videopkr, videopkr, videopkr_state, 0, ROT0, "InterFlip", "Video Poker", 0, layout_videopkr )
+GAMEL( 1984, fortune1, videopkr, fortune1, videopkr, videopkr_state, 0, ROT0, "IGT - International Game Technology", "Fortune I (PK485-S) Draw Poker", 0, layout_videopkr )
+GAMEL( 1984, blckjack, videopkr, blckjack, blckjack, videopkr_state, 0, ROT0, "InterFlip", "Black Jack", 0, layout_blckjack )
+GAMEL( 1987, videodad, videopkr, videodad, videodad, videopkr_state, 0, ROT0, "InterFlip", "Video Dado", 0, layout_videodad )
+GAMEL( 1987, videocba, videopkr, videodad, videocba, videopkr_state, 0, ROT0, "InterFlip", "Video Cordoba", 0, layout_videocba )
+GAMEL( 1987, babypkr, videopkr, babypkr, babypkr, videopkr_state, 0, ROT0, "Recreativos Franco", "Baby Poker", 0, layout_babypkr )
+GAMEL( 1987, babydad, videopkr, babypkr, babydad, videopkr_state, 0, ROT0, "Recreativos Franco", "Baby Dado", 0, layout_babydad )
+GAMEL( 198?, bpoker, videopkr, babypkr, babypkr, videopkr_state, 0, ROT0, "Recreativos Franco", "Video Poker (v1403)", MACHINE_NOT_WORKING, layout_babypkr )
diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp
index cebf0c1a97a..0982882747f 100644
--- a/src/mame/drivers/vigilant.cpp
+++ b/src/mame/drivers/vigilant.cpp
@@ -471,7 +471,7 @@ static GFXDECODE_START( kikcubic )
GFXDECODE_END
-static MACHINE_CONFIG_START( vigilant, vigilant_state )
+static MACHINE_CONFIG_START( vigilant )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
@@ -502,7 +502,7 @@ static MACHINE_CONFIG_START( vigilant, vigilant_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("m72", M72, 0)
+ MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
MCFG_YM2151_ADD("ymsnd", 3579645)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
@@ -514,7 +514,7 @@ static MACHINE_CONFIG_START( vigilant, vigilant_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( buccanrs, vigilant_state )
+static MACHINE_CONFIG_START( buccanrs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 5688800) /* 5.688800 MHz */
@@ -545,7 +545,7 @@ static MACHINE_CONFIG_START( buccanrs, vigilant_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("m72", M72, 0)
+ MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
MCFG_SOUND_ADD("ym1", YM2203, 18432000/6)
MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
@@ -573,7 +573,7 @@ static MACHINE_CONFIG_START( buccanrs, vigilant_state )
MCFG_SOUND_ROUTE_EX(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE_EX(0, "dac", -1.0, DAC_VREF_NEG_INPUT)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( kikcubic, vigilant_state )
+static MACHINE_CONFIG_START( kikcubic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3579645) /* 3.579645 MHz */
@@ -604,7 +604,7 @@ static MACHINE_CONFIG_START( kikcubic, vigilant_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_SOUND_ADD("m72", M72, 0)
+ MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0)
MCFG_YM2151_ADD("ymsnd", 3579645)
MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("m72", m72_audio_device, ym2151_irq_handler))
@@ -1121,18 +1121,18 @@ ROM_START( buccanrsb )
ROM_LOAD( "prom2.u99", 0x0300, 0x0100, CRC(e0aa8869) SHA1(ac8bdfeba69420ba56ec561bf3d0f1229d02cea2) )
ROM_END
-GAME( 1988, vigilant, 0, vigilant, vigilant, driver_device, 0, ROT0, "Irem", "Vigilante (World, Rev E)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilantg, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "Irem (Data East license)", "Vigilante (US, Rev G)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilanto, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "Irem (Data East license)", "Vigilante (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilanta, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "Irem", "Vigilante (World, Rev A)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilantb, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "Irem (Data East license)", "Vigilante (US, Rev B)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilantc, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "Irem", "Vigilante (World, Rev C)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilantd, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "Irem", "Vigilante (Japan, Rev D)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1988, vigilantbl, vigilant, vigilant, vigilant, driver_device, 0, ROT0, "bootleg", "Vigilante (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1988, kikcubic, 0, kikcubic, kikcubic, driver_device, 0, ROT0, "Irem", "Meikyu Jima (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) /* English title is Kickle Cubicle */
-GAME( 1988, kikcubicb, kikcubic, kikcubic, kikcubic, driver_device, 0, ROT0, "bootleg", "Kickle Cubele", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1989, buccanrs, 0, buccanrs, buccanrs, driver_device, 0, ROT0, "Duintronic", "Buccaneers (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, buccanrsa, buccanrs, buccanrs, buccanra, driver_device, 0, ROT0, "Duintronic", "Buccaneers (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, buccanrsb, buccanrs, buccanrs, buccanrs, driver_device, 0, ROT0, "Duintronic", "Buccaneers (set 3, harder)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilant, 0, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem", "Vigilante (World, Rev E)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilantg, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem (Data East license)", "Vigilante (US, Rev G)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilanto, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem (Data East license)", "Vigilante (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilanta, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem", "Vigilante (World, Rev A)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilantb, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem (Data East license)", "Vigilante (US, Rev B)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilantc, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem", "Vigilante (World, Rev C)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilantd, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "Irem", "Vigilante (Japan, Rev D)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1988, vigilantbl, vigilant, vigilant, vigilant, vigilant_state, 0, ROT0, "bootleg", "Vigilante (bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1988, kikcubic, 0, kikcubic, kikcubic, vigilant_state, 0, ROT0, "Irem", "Meikyu Jima (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) /* English title is Kickle Cubicle */
+GAME( 1988, kikcubicb, kikcubic, kikcubic, kikcubic, vigilant_state, 0, ROT0, "bootleg", "Kickle Cubele", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+
+GAME( 1989, buccanrs, 0, buccanrs, buccanrs, vigilant_state, 0, ROT0, "Duintronic", "Buccaneers (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, buccanrsa, buccanrs, buccanrs, buccanra, vigilant_state, 0, ROT0, "Duintronic", "Buccaneers (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, buccanrsb, buccanrs, buccanrs, buccanrs, vigilant_state, 0, ROT0, "Duintronic", "Buccaneers (set 3, harder)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp
index 2998469d837..29192f6d8f4 100644
--- a/src/mame/drivers/vii.cpp
+++ b/src/mame/drivers/vii.cpp
@@ -1179,7 +1179,7 @@ INTERRUPT_GEN_MEMBER(vii_state::vii_vblank)
}
-static MACHINE_CONFIG_START( vii, vii_state )
+static MACHINE_CONFIG_START( vii )
MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
MCFG_CPU_PROGRAM_MAP( vii_mem )
@@ -1200,7 +1200,7 @@ static MACHINE_CONFIG_START( vii, vii_state )
MCFG_SOFTWARE_LIST_ADD("vii_cart","vii")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vsmile, vii_state )
+static MACHINE_CONFIG_START( vsmile )
MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
MCFG_CPU_PROGRAM_MAP( vii_mem )
@@ -1221,7 +1221,7 @@ static MACHINE_CONFIG_START( vsmile, vii_state )
MCFG_SOFTWARE_LIST_ADD("cart_list","vsmile_cart")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( batman, vii_state )
+static MACHINE_CONFIG_START( batman )
MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
MCFG_CPU_PROGRAM_MAP( vii_mem )
@@ -1239,7 +1239,7 @@ static MACHINE_CONFIG_START( batman, vii_state )
MCFG_PALETTE_ADD("palette", 32768)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wirels60, vii_state )
+static MACHINE_CONFIG_START( wirels60 )
MCFG_CPU_ADD( "maincpu", UNSP, XTAL_27MHz)
MCFG_CPU_PROGRAM_MAP( vii_mem )
@@ -1327,7 +1327,7 @@ ROM_START( wirels60 )
ROM_LOAD( "wirels60.bin", 0x0000, 0x4000000, CRC(b4df8b28) SHA1(00e3da542e4bc14baf4724ad436f66d4c0f65c84))
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
CONS( 2004, batmantv, vii, 0, batman, batman, vii_state, batman, "JAKKS Pacific Inc / HotGen Ltd", "The Batman", MACHINE_NO_SOUND )
CONS( 2005, vsmile, 0, 0, vsmile, vsmile, vii_state, vsmile, "V-Tech", "V-Smile (Germany)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
CONS( 2005, vsmilef, vsmile, 0, vsmile, vsmile, vii_state, vsmile, "V-Tech", "V-Smile (France)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp
index 93dbb21c466..b757fe65406 100644
--- a/src/mame/drivers/vindictr.cpp
+++ b/src/mame/drivers/vindictr.cpp
@@ -181,7 +181,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( vindictr, vindictr_state )
+static MACHINE_CONFIG_START( vindictr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68010, ATARI_CLOCK_14MHz/2)
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp
index a70675f905a..24efd928e23 100644
--- a/src/mame/drivers/vip.cpp
+++ b/src/mame/drivers/vip.cpp
@@ -710,7 +710,7 @@ QUICKLOAD_LOAD_MEMBER( vip_state, vip )
// MACHINE_CONFIG( vip )
//-------------------------------------------------
-static MACHINE_CONFIG_START( vip, vip_state )
+static MACHINE_CONFIG_START( vip )
// basic machine hardware
MCFG_CPU_ADD(CDP1802_TAG, CDP1802, XTAL_3_52128MHz/2)
MCFG_CPU_PROGRAM_MAP(vip_mem)
@@ -808,6 +808,6 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
-COMP( 1977, vip, 0, 0, vip, vip, driver_device, 0, "RCA", "Cosmac VIP (VP-711)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS )
-COMP( 1977, vp111, vip, 0, vp111, vip, driver_device, 0, "RCA", "Cosmac VIP (VP-111)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1977, vip, 0, 0, vip, vip, vip_state, 0, "RCA", "Cosmac VIP (VP-711)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS )
+COMP( 1977, vp111, vip, 0, vp111, vip, vip_state, 0, "RCA", "Cosmac VIP (VP-111)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS )
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index b1286c9a82a..87c76d3edfe 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -2302,7 +2302,7 @@ void viper_state::machine_reset()
m_ds2430_unk_status = 1;
}
-static MACHINE_CONFIG_START( viper, viper_state )
+static MACHINE_CONFIG_START( viper )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", MPC8240, 200000000)
diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp
index 71a8d2912b2..3b8d1f51d48 100644
--- a/src/mame/drivers/vis.cpp
+++ b/src/mame/drivers/vis.cpp
@@ -41,10 +41,10 @@ private:
emu_timer *m_pcm;
};
-const device_type VIS_AUDIO = device_creator<vis_audio_device>;
+DEFINE_DEVICE_TYPE(VIS_AUDIO, vis_audio_device, "vis_pcm", "vis_pcm")
vis_audio_device::vis_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VIS_AUDIO, "vis_pcm", tag, owner, clock, "vis_pcm", __FILE__),
+ : device_t(mconfig, VIS_AUDIO, tag, owner, clock),
device_isa16_card_interface(mconfig, *this),
m_rdac(*this, "rdac"),
m_ldac(*this, "ldac")
@@ -252,10 +252,10 @@ private:
uint8_t m_crtc_regs[0x31];
};
-const device_type VIS_VGA = device_creator<vis_vga_device>;
+DEFINE_DEVICE_TYPE(VIS_VGA, vis_vga_device, "vis_vga", "vis_vga")
vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : svga_device(mconfig, VIS_VGA, "vis_vga", tag, owner, clock, "vis_vga", __FILE__),
+ : svga_device(mconfig, VIS_VGA, tag, owner, clock),
device_isa16_card_interface(mconfig, *this)
{
m_palette.set_tag("palette");
@@ -890,7 +890,7 @@ static INPUT_PORTS_START(vis)
PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) PORT_CHANGED_MEMBER(DEVICE_SELF, vis_state, update, 0)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( vis, vis_state )
+static MACHINE_CONFIG_START( vis )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz )
MCFG_CPU_PROGRAM_MAP(at16_map)
@@ -920,5 +920,4 @@ ROM_START(vis)
ROM_LOAD( "p513bk1b.bin", 0x80000, 0x80000, CRC(e18239c4) SHA1(a0262109e10a07a11eca43371be9978fff060bc5))
ROM_END
-COMP ( 1992, vis, 0, 0, vis, vis, driver_device, 0, "Tandy/Memorex", "Video Information System MD-2500", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
+COMP ( 1992, vis, 0, 0, vis, vis, vis_state, 0, "Tandy/Memorex", "Video Information System MD-2500", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp
index 1249beae019..19d7037288f 100644
--- a/src/mame/drivers/vixen.cpp
+++ b/src/mame/drivers/vixen.cpp
@@ -281,7 +281,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( vixen_io, AS_IO, 8, vixen_state )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(FDC1797_TAG, fd1797_t, read, write)
+ AM_RANGE(0x00, 0x03) AM_DEVREADWRITE(FDC1797_TAG, fd1797_device, read, write)
AM_RANGE(0x04, 0x04) AM_MIRROR(0x03) AM_READWRITE(status_r, cmd_w)
AM_RANGE(0x08, 0x08) AM_MIRROR(0x01) AM_DEVREADWRITE(P8155H_TAG, i8155_device, read, write)
AM_RANGE(0x0c, 0x0d) AM_DEVWRITE(P8155H_TAG, i8155_device, ale_w)
@@ -737,7 +737,7 @@ void vixen_state::machine_reset()
// MACHINE_CONFIG( vixen )
//-------------------------------------------------
-static MACHINE_CONFIG_START( vixen, vixen_state )
+static MACHINE_CONFIG_START( vixen )
// basic machine hardware
MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_23_9616MHz/6)
MCFG_CPU_PROGRAM_MAP(vixen_mem)
@@ -844,5 +844,5 @@ DRIVER_INIT_MEMBER(vixen_state,vixen)
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1984, vixen, 0, 0, vixen, vixen, vixen_state, vixen, "Osborne", "Vixen", 0 )
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index df9b4873af7..6d53403aec5 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -1032,7 +1032,7 @@ MC6845_UPDATE_ROW( vk100_state::crtc_update_row )
}
-static MACHINE_CONFIG_START( vk100, vk100_state )
+static MACHINE_CONFIG_START( vk100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8085A, XTAL_5_0688MHz)
MCFG_CPU_PROGRAM_MAP(vk100_mem)
@@ -1266,5 +1266,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
COMP( 1980, vk100, 0, 0, vk100, vk100, vk100_state, vk100, "Digital Equipment Corporation", "VK100 'GIGI'", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index 3b5a0a9bd87..5574256c365 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -589,7 +589,7 @@ MACHINE_START_MEMBER(nevada_state, nevada)
* Machine Driver *
*************************/
-static MACHINE_CONFIG_START( nevada, nevada_state )
+static MACHINE_CONFIG_START( nevada )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, MASTER_CPU)
MCFG_CPU_PROGRAM_MAP(nevada_map)
@@ -698,6 +698,5 @@ DRIVER_INIT_MEMBER(nevada_state,nevada)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS... */
-
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 1995, nevada, 0, nevada, nevada, nevada_state, nevada, ROT0, "VLC Inc.", "VLC Nevada", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp
index 0f5c67c481b..7827b211ac7 100644
--- a/src/mame/drivers/volfied.cpp
+++ b/src/mame/drivers/volfied.cpp
@@ -219,7 +219,7 @@ void volfied_state::machine_reset()
cchip_reset();
}
-static MACHINE_CONFIG_START( volfied, volfied_state )
+static MACHINE_CONFIG_START( volfied )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK) /* 8MHz */
@@ -446,9 +446,9 @@ ROM_START( volfiedjo )
ROM_END
-GAME( 1989, volfied, 0, volfied, volfied, driver_device, 0, ROT270, "Taito Corporation Japan", "Volfied (World, revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, volfiedu, volfied, volfied, volfiedu, driver_device, 0, ROT270, "Taito America Corporation", "Volfied (US, revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, volfiedj, volfied, volfied, volfiedj, driver_device, 0, ROT270, "Taito Corporation", "Volfied (Japan, revision 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, volfiedo, volfied, volfied, volfiedj, driver_device, 0, ROT270, "Taito Corporation Japan", "Volfied (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, volfieduo, volfied, volfied, volfiedj, driver_device, 0, ROT270, "Taito America Corporation", "Volfied (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, volfiedjo, volfied, volfied, volfiedj, driver_device, 0, ROT270, "Taito Corporation", "Volfied (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, volfied, 0, volfied, volfied, volfied_state, 0, ROT270, "Taito Corporation Japan", "Volfied (World, revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, volfiedu, volfied, volfied, volfiedu, volfied_state, 0, ROT270, "Taito America Corporation", "Volfied (US, revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, volfiedj, volfied, volfied, volfiedj, volfied_state, 0, ROT270, "Taito Corporation", "Volfied (Japan, revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, volfiedo, volfied, volfied, volfiedj, volfied_state, 0, ROT270, "Taito Corporation Japan", "Volfied (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, volfieduo, volfied, volfied, volfiedj, volfied_state, 0, ROT270, "Taito America Corporation", "Volfied (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, volfiedjo, volfied, volfied, volfiedj, volfied_state, 0, ROT270, "Taito Corporation", "Volfied (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index fc70577202a..d6f5ce0f253 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -101,7 +101,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(ppi_pa_r);
DECLARE_READ8_MEMBER(ppi_pb_r);
DECLARE_READ8_MEMBER(ppi_pc_r);
@@ -111,6 +111,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(irq_timer);
DECLARE_WRITE_LINE_MEMBER(write_uart_clock);
IRQ_CALLBACK_MEMBER(irq_ack);
+
private:
uint8_t m_term_data;
uint8_t m_porta;
@@ -239,7 +240,7 @@ WRITE8_MEMBER( votrpss_state::ppi_pc_w )
m_portc = data;
}
-WRITE8_MEMBER( votrpss_state::kbd_put )
+void votrpss_state::kbd_put(u8 data)
{
m_term_data = data;
}
@@ -254,7 +255,7 @@ DECLARE_WRITE_LINE_MEMBER( votrpss_state::write_uart_clock )
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( votrpss, votrpss_state )
+static MACHINE_CONFIG_START( votrpss )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz/2) /* 4.000 MHz, verified */
MCFG_CPU_PROGRAM_MAP(votrpss_mem)
@@ -275,7 +276,7 @@ static MACHINE_CONFIG_START( votrpss, votrpss_state )
/* Devices */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(votrpss_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(votrpss_state, kbd_put))
MCFG_DEVICE_ADD("uart", I8251, 0)
MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd))
@@ -334,5 +335,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, votrpss, 0, 0, votrpss, votrpss, driver_device, 0, "Votrax", "Personal Speech System", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, votrpss, 0, 0, votrpss, votrpss, votrpss_state, 0, "Votrax", "Personal Speech System", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp
index fb4bf03efb8..97d93c0f20f 100644
--- a/src/mame/drivers/votrtnt.cpp
+++ b/src/mame/drivers/votrtnt.cpp
@@ -125,7 +125,7 @@ WRITE_LINE_MEMBER(votrtnt_state::write_acia_clock)
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( votrtnt, votrtnt_state )
+static MACHINE_CONFIG_START( votrtnt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6802, XTAL_2_4576MHz) /* 2.4576MHz XTAL, verified; divided by 4 inside the m6802*/
MCFG_CPU_PROGRAM_MAP(6802_mem)
@@ -168,5 +168,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, votrtnt, 0, 0, votrtnt, votrtnt, driver_device, 0, "Votrax", "Type 'N Talk", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1980, votrtnt, 0, 0, votrtnt, votrtnt, votrtnt_state, 0, "Votrax", "Type 'N Talk", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp
index b4edc552795..74459d06189 100644
--- a/src/mame/drivers/voyager.cpp
+++ b/src/mame/drivers/voyager.cpp
@@ -484,7 +484,7 @@ void voyager_state::machine_reset()
membank("bank1")->set_base(memregion("bios")->base());
}
-static MACHINE_CONFIG_START( voyager, voyager_state )
+static MACHINE_CONFIG_START( voyager )
MCFG_CPU_ADD("maincpu", PENTIUM3, 133000000) // actually AMD Duron CPU of unknown clock
MCFG_CPU_PROGRAM_MAP(voyager_map)
MCFG_CPU_IO_MAP(voyager_io)
diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp
index df8151ca0a2..eed2691184f 100644
--- a/src/mame/drivers/vp101.cpp
+++ b/src/mame/drivers/vp101.cpp
@@ -361,7 +361,7 @@ static INPUT_PORTS_START( vp50 )
PORT_BIT( 0xfffffff0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( vp101, vp10x_state )
+static MACHINE_CONFIG_START( vp101 )
MCFG_CPU_ADD("maincpu", VR5500LE, 400000000)
MCFG_MIPS3_DCACHE_SIZE(32768)
MCFG_MIPS3_SYSTEM_CLOCK(100000000)
@@ -380,7 +380,7 @@ static MACHINE_CONFIG_START( vp101, vp10x_state )
MCFG_NVRAM_ADD_0FILL("nvram")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vp50, vp10x_state )
+static MACHINE_CONFIG_START( vp50 )
MCFG_CPU_ADD("maincpu", TX4925LE, 200000000)
MCFG_MIPS3_DCACHE_SIZE(32768)
MCFG_MIPS3_SYSTEM_CLOCK(100000000)
@@ -453,7 +453,7 @@ ROM_START(zoofari)
DISK_IMAGE_READONLY("zoofari", 0, SHA1(8fb9cfb1ab2660f40b643fcd772243903bd69a6c) )
ROM_END
-GAME( 2002, specfrce, 0, vp101, vp101, driver_device, 0, ROT0, "ICE/Play Mechanix", "Special Forces Elite Training (v01.02.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, specfrceo, specfrce, vp101, vp101, driver_device, 0, ROT0, "ICE/Play Mechanix", "Special Forces Elite Training (v01.01.01)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2004, jnero, 0, vp101, vp101, driver_device, 0, ROT0, "ICE/Play Mechanix", "Johnny Nero Action Hero (v01.01.08)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2006, zoofari, 0, vp50, vp50, driver_device, 0, ROT0, "ICE/Play Mechanix", "Zoofari", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 2002, specfrce, 0, vp101, vp101, vp10x_state, 0, ROT0, "ICE/Play Mechanix", "Special Forces Elite Training (v01.02.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, specfrceo, specfrce, vp101, vp101, vp10x_state, 0, ROT0, "ICE/Play Mechanix", "Special Forces Elite Training (v01.01.01)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2004, jnero, 0, vp101, vp101, vp10x_state, 0, ROT0, "ICE/Play Mechanix", "Johnny Nero Action Hero (v01.01.08)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2006, zoofari, 0, vp50, vp50, vp10x_state, 0, ROT0, "ICE/Play Mechanix", "Zoofari", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp
index 5d72ebd56f9..9cfde154c45 100644
--- a/src/mame/drivers/vpoker.cpp
+++ b/src/mame/drivers/vpoker.cpp
@@ -627,7 +627,7 @@ WRITE_LINE_MEMBER(vpoker_state::ptm_irq)
m_maincpu->set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE);
}
-static MACHINE_CONFIG_START( vpoker, vpoker_state )
+static MACHINE_CONFIG_START( vpoker )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",M6809,XTAL_4MHz)
@@ -702,6 +702,6 @@ ROM_START( 5acespkr )
ROM_END
-/* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
-GAME( 198?, vpoker, 0, vpoker, vpoker, driver_device, 0, ROT0, "Videotronics, Inc.", "Videotronics Draw Poker", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 198?, 5acespkr, 0, vpoker, 5acespkr, driver_device, 0, ROT0, "<unknown>", "5-Aces Poker", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
+GAME( 198?, vpoker, 0, vpoker, vpoker, vpoker_state, 0, ROT0, "Videotronics, Inc.", "Videotronics Draw Poker", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 198?, 5acespkr, 0, vpoker, 5acespkr, vpoker_state, 0, ROT0, "<unknown>", "5-Aces Poker", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp
index 43b2449fbe2..d01f069e83a 100644
--- a/src/mame/drivers/vroulet.cpp
+++ b/src/mame/drivers/vroulet.cpp
@@ -271,7 +271,7 @@ WRITE8_MEMBER(vroulet_state::ppi8255_c_w){}
/* Machine Driver */
-static MACHINE_CONFIG_START( vroulet, vroulet_state )
+static MACHINE_CONFIG_START( vroulet )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 4000000) //???
MCFG_CPU_PROGRAM_MAP(vroulet_map)
@@ -326,4 +326,4 @@ ROM_END
/* Game Driver */
-GAME( 1989, vroulet, 0, vroulet, vroulet, driver_device, 0, ROT90, "World Game", "Vegas Roulette", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, vroulet, 0, vroulet, vroulet, vroulet_state, 0, ROT90, "World Game", "Vegas Roulette", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/vsmilepro.cpp b/src/mame/drivers/vsmilepro.cpp
index a5110e4891f..c1c807de2bf 100644
--- a/src/mame/drivers/vsmilepro.cpp
+++ b/src/mame/drivers/vsmilepro.cpp
@@ -47,7 +47,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( vsmilpro )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( vsmilpro, vsmilpro_state )
+static MACHINE_CONFIG_START( vsmilpro )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", ARM9, 150000000)
MCFG_CPU_PROGRAM_MAP(vsmilpro_map)
@@ -66,5 +66,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 2007, vsmilpro, 0, 0, vsmilpro, vsmilpro, driver_device, 0, "V-Tech", "V-Smile Pro", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 2007, vsmilpro, 0, 0, vsmilpro, vsmilpro, vsmilpro_state, 0, "V-Tech", "V-Smile Pro", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp
index d64b6989a2f..77062881873 100644
--- a/src/mame/drivers/vsnes.cpp
+++ b/src/mame/drivers/vsnes.cpp
@@ -1699,7 +1699,7 @@ static INPUT_PORTS_START( supxevs )
PORT_DIPSETTING( 0xc0, "RP2C04-0004" )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( vsnes, vsnes_state )
+static MACHINE_CONFIG_START( vsnes )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
@@ -1766,7 +1766,7 @@ static MACHINE_CONFIG_DERIVED( topgun, vsnes )
MCFG_PPU2C0X_SET_NMI(vsnes_state, ppu_irq_1)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vsdual, vsnes_state )
+static MACHINE_CONFIG_START( vsdual )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", N2A03, NTSC_APU_CLOCK)
@@ -1824,7 +1824,7 @@ static MACHINE_CONFIG_DERIVED( vsdual_pi, vsdual )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( vsnes_bootleg, vsnes_state )
+static MACHINE_CONFIG_START( vsnes_bootleg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502,XTAL_16MHz/4) // 4mhz? seems too high but flickers badly otherwise, issue elsewhere?
@@ -2800,63 +2800,63 @@ ROM_END
Japan (C) Nintendo Co., Ltd.
*/
-/* YEAR NAME PARENT MACHINE INPUT INIT MONITOR */
-GAME( 1985, btlecity, 0, vsnes, btlecity, vsnes_state, vsnormal, ROT0, "Namco", "Vs. Battle City", 0 )
-GAME( 1985, starlstr, 0, vsnes, starlstr, vsnes_state, vsnormal, ROT0, "Namco", "Vs. Star Luster", 0 )
-GAME( 1987, cstlevna, 0, vsnes, cstlevna, vsnes_state, vsvram, ROT0, "Konami", "Vs. Castlevania", 0 )
-GAME( 1984, cluclu, 0, vsnes, cluclu, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Clu Clu Land", 0 )
-GAME( 1990, drmario, 0, vsnes, drmario, vsnes_state, drmario, ROT0, "Nintendo", "Vs. Dr. Mario", 0 )
-GAME( 1984, excitebk, 0, vsnes, excitebk, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Excitebike (set EB4-3 E)", 0 )
-GAME( 1984, excitebko,excitebk, vsnes, excitebk, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Excitebike (set EB4-3 ?)", 0 ) // older
-GAME( 1984, excitebkj,excitebk, vsnes, excitebk, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Excitebike (set EB4-4 A)", 0 ) // likely Japan
-GAME( 1986, goonies, 0, vsnes, goonies, vsnes_state, vskonami, ROT0, "Konami", "Vs. The Goonies (set E)", 0 )
-GAME( 1984, iceclimb, 0, vsnes, iceclmbj, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Ice Climber (set IC4-4 B-1)", 0 )
-GAME( 1984, iceclimba,iceclimb, vsnes, iceclimb, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Ice Climber (set IC4-4 ?)", 0 )
-GAME( 1985, nvs_machrider, 0, vsnes, machridr, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Mach Rider (Endurance Course Version)", MACHINE_IMPERFECT_GRAPHICS )
+/* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR */
+GAME( 1985, btlecity, 0, vsnes, btlecity, vsnes_state, vsnormal, ROT0, "Namco", "Vs. Battle City", 0 )
+GAME( 1985, starlstr, 0, vsnes, starlstr, vsnes_state, vsnormal, ROT0, "Namco", "Vs. Star Luster", 0 )
+GAME( 1987, cstlevna, 0, vsnes, cstlevna, vsnes_state, vsvram, ROT0, "Konami", "Vs. Castlevania", 0 )
+GAME( 1984, cluclu, 0, vsnes, cluclu, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Clu Clu Land", 0 )
+GAME( 1990, drmario, 0, vsnes, drmario, vsnes_state, drmario, ROT0, "Nintendo", "Vs. Dr. Mario", 0 )
+GAME( 1984, excitebk, 0, vsnes, excitebk, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Excitebike (set EB4-3 E)", 0 )
+GAME( 1984, excitebko,excitebk, vsnes, excitebk, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Excitebike (set EB4-3 ?)", 0 ) // older
+GAME( 1984, excitebkj,excitebk, vsnes, excitebk, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Excitebike (set EB4-4 A)", 0 ) // likely Japan
+GAME( 1986, goonies, 0, vsnes, goonies, vsnes_state, vskonami, ROT0, "Konami", "Vs. The Goonies (set E)", 0 )
+GAME( 1984, iceclimb, 0, vsnes, iceclmbj, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Ice Climber (set IC4-4 B-1)", 0 )
+GAME( 1984, iceclimba,iceclimb, vsnes, iceclimb, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Ice Climber (set IC4-4 ?)", 0 )
+GAME( 1985, nvs_machrider, 0, vsnes, machridr, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Mach Rider (Endurance Course Version)", MACHINE_IMPERFECT_GRAPHICS )
GAME( 1985, nvs_machridera,nvs_machrider, vsnes, machridj, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Mach Rider (Fighting Course Version, set MR4-1 A)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1986, rbibb, 0, vsnes, rbibb, vsnes_state, rbibb, ROT0, "Namco", "Vs. Atari R.B.I. Baseball (set 1)", 0 )
-GAME( 1986, rbibba, rbibb, vsnes, rbibb, vsnes_state, rbibb, ROT0, "Namco", "Vs. Atari R.B.I. Baseball (set 2)", 0 )
-GAME( 1986, suprmrio, 0, vsnes, suprmrio, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Super Mario Bros. (set SM4-4 E)", 0 )
-GAME( 1986, suprmrioa,suprmrio, vsnes, suprmrio, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Super Mario Bros. (set ?, harder)", 0 )
-GAME( 1986, suprmriobl,suprmrio,vsnes_bootleg,suprmrio,vsnes_state,vsnormal, ROT0, "bootleg", "Vs. Super Mario Bros. (bootleg with Z80, set 1)", MACHINE_NOT_WORKING ) // timer starts at 200(!)
-GAME( 1986, suprmriobl2,suprmrio,vsnes_bootleg,suprmrio,vsnes_state,vsnormal, ROT0, "bootleg", "Vs. Super Mario Bros. (bootleg with Z80, set 2)", MACHINE_NOT_WORKING ) // timer starts at 300
-GAME( 1988, skatekds, suprmrio, vsnes, suprmrio, vsnes_state, vsnormal, ROT0, "hack (Two-Bit Score)", "Vs. Skate Kids. (Graphic hack of Super Mario Bros.)", 0 )
-GAME( 1985, vsskykid, 0, vsnes, vsskykid, vsnes_state, MMC3, ROT0, "Namco", "Vs. Super SkyKid" , 0 )
-GAME( 1987, tkoboxng, 0, vsnes, tkoboxng, vsnes_state, tkoboxng, ROT0, "Namco / Data East USA", "Vs. T.K.O. Boxing", 0 )
-GAME( 1984, smgolf, 0, vsnes, golf4s, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Men Version, set GF4-2 F)", 0 )
-GAME( 1984, smgolfb, smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Men Version, set GF4-2 ?)", 0 )
-GAME( 1984, smgolfj, smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo Co., Ltd.", "Vs. Stroke & Match Golf (Men Version) (Japan, set GF3 B)", 0 )
-GAME( 1984, ladygolfe,smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Ladies Version, set LG4 E)", 0 )
-GAME( 1984, ladygolf, smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Ladies Version, set LG4 ?)", 0 )
-GAME( 1984, vspinbal, 0, vsnes, vspinbal, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Pinball (US, set PN4 E-1)", 0 )
-GAME( 1984, vspinbalj,vspinbal, vsnes, vspinblj, vsnes_state, vsnormal, ROT0, "Nintendo Co., Ltd.", "Vs. Pinball (Japan, set PN3 B)", 0 )
-GAME( 1986, vsslalom, 0, vsnes, vsslalom, vsnes_state, vsnormal, ROT0, "Rare Coin-It Inc.", "Vs. Slalom", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1985, vssoccer, 0, vsnes, vssoccer, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Soccer (set SC4-2 A)", 0 )
-GAME( 1985, vssoccera,vssoccer, vsnes, vssoccer, vsnes_state, bnglngby, ROT0, "Nintendo", "Vs. Soccer (set SC4-3 ?)", 0 )
-GAME( 1986, vsgradus, 0, vsnes, vsgradus, vsnes_state, vskonami, ROT0, "Konami", "Vs. Gradius (US, set GR E)", 0 )
-GAME( 1987, nvs_platoon, 0, vsnes, platoon, vsnes_state, platoon, ROT0, "Ocean Software Limited", "Vs. Platoon", 0 )
-GAME( 1987, vstetris, 0, vsnes, vstetris, vsnes_state, vsnormal, ROT0, "Academysoft-Elorg", "Vs. Tetris" , 0 )
-GAME( 1986, nvs_mightybj, 0, mightybj,mightybj, vsnes_state, vsnormal, ROT0, "Tecmo", "Vs. Mighty Bomb Jack (Japan)", 0 )
-GAME( 1985, jajamaru, 0, jajamaru,jajamaru, vsnes_state, vsnormal, ROT0, "Jaleco", "Vs. Ninja Jajamaru Kun (Japan)", 0 )
-GAME( 1987, topgun, 0, topgun, topgun, vsnes_state, vsvram, ROT0, "Konami", "Vs. Top Gun", 0)
-GAME( 1985, bnglngby, 0, vsnes, bnglngby, vsnes_state, bnglngby, ROT0, "Nintendo / Broderbund Software Inc.", "Vs. Raid on Bungeling Bay (RD4-2 B)", 0 )
-GAME( 1986, supxevs, 0, vsnes, supxevs, vsnes_state, supxevs, ROT0, "Namco", "Vs. Super Xevious", 0 )
+GAME( 1986, rbibb, 0, vsnes, rbibb, vsnes_state, rbibb, ROT0, "Namco", "Vs. Atari R.B.I. Baseball (set 1)", 0 )
+GAME( 1986, rbibba, rbibb, vsnes, rbibb, vsnes_state, rbibb, ROT0, "Namco", "Vs. Atari R.B.I. Baseball (set 2)", 0 )
+GAME( 1986, suprmrio, 0, vsnes, suprmrio, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Super Mario Bros. (set SM4-4 E)", 0 )
+GAME( 1986, suprmrioa,suprmrio, vsnes, suprmrio, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Super Mario Bros. (set ?, harder)", 0 )
+GAME( 1986, suprmriobl,suprmrio, vsnes_bootleg, suprmrio, vsnes_state, vsnormal, ROT0, "bootleg", "Vs. Super Mario Bros. (bootleg with Z80, set 1)", MACHINE_NOT_WORKING ) // timer starts at 200(!)
+GAME( 1986, suprmriobl2,suprmrio,vsnes_bootleg, suprmrio, vsnes_state, vsnormal, ROT0, "bootleg", "Vs. Super Mario Bros. (bootleg with Z80, set 2)", MACHINE_NOT_WORKING ) // timer starts at 300
+GAME( 1988, skatekds, suprmrio, vsnes, suprmrio, vsnes_state, vsnormal, ROT0, "hack (Two-Bit Score)", "Vs. Skate Kids. (Graphic hack of Super Mario Bros.)", 0 )
+GAME( 1985, vsskykid, 0, vsnes, vsskykid, vsnes_state, MMC3, ROT0, "Namco", "Vs. Super SkyKid", 0 )
+GAME( 1987, tkoboxng, 0, vsnes, tkoboxng, vsnes_state, tkoboxng, ROT0, "Namco / Data East USA", "Vs. T.K.O. Boxing", 0 )
+GAME( 1984, smgolf, 0, vsnes, golf4s, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Men Version, set GF4-2 F)", 0 )
+GAME( 1984, smgolfb, smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Men Version, set GF4-2 ?)", 0 )
+GAME( 1984, smgolfj, smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo Co., Ltd.", "Vs. Stroke & Match Golf (Men Version) (Japan, set GF3 B)", 0 )
+GAME( 1984, ladygolfe,smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Ladies Version, set LG4 E)", 0 )
+GAME( 1984, ladygolf, smgolf, vsnes, golf, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Stroke & Match Golf (Ladies Version, set LG4 ?)", 0 )
+GAME( 1984, vspinbal, 0, vsnes, vspinbal, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Pinball (US, set PN4 E-1)", 0 )
+GAME( 1984, vspinbalj,vspinbal, vsnes, vspinblj, vsnes_state, vsnormal, ROT0, "Nintendo Co., Ltd.", "Vs. Pinball (Japan, set PN3 B)", 0 )
+GAME( 1986, vsslalom, 0, vsnes, vsslalom, vsnes_state, vsnormal, ROT0, "Rare Coin-It Inc.", "Vs. Slalom", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1985, vssoccer, 0, vsnes, vssoccer, vsnes_state, vsnormal, ROT0, "Nintendo", "Vs. Soccer (set SC4-2 A)", 0 )
+GAME( 1985, vssoccera,vssoccer, vsnes, vssoccer, vsnes_state, bnglngby, ROT0, "Nintendo", "Vs. Soccer (set SC4-3 ?)", 0 )
+GAME( 1986, vsgradus, 0, vsnes, vsgradus, vsnes_state, vskonami, ROT0, "Konami", "Vs. Gradius (US, set GR E)", 0 )
+GAME( 1987, nvs_platoon, 0, vsnes, platoon, vsnes_state, platoon, ROT0, "Ocean Software Limited", "Vs. Platoon", 0 )
+GAME( 1987, vstetris, 0, vsnes, vstetris, vsnes_state, vsnormal, ROT0, "Academysoft-Elorg", "Vs. Tetris" , 0 )
+GAME( 1986, nvs_mightybj, 0, mightybj, mightybj, vsnes_state, vsnormal, ROT0, "Tecmo", "Vs. Mighty Bomb Jack (Japan)", 0 )
+GAME( 1985, jajamaru, 0, jajamaru, jajamaru, vsnes_state, vsnormal, ROT0, "Jaleco", "Vs. Ninja Jajamaru Kun (Japan)", 0 )
+GAME( 1987, topgun, 0, topgun, topgun, vsnes_state, vsvram, ROT0, "Konami", "Vs. Top Gun", 0)
+GAME( 1985, bnglngby, 0, vsnes, bnglngby, vsnes_state, bnglngby, ROT0, "Nintendo / Broderbund Software Inc.", "Vs. Raid on Bungeling Bay (RD4-2 B)", 0 )
+GAME( 1986, supxevs, 0, vsnes, supxevs, vsnes_state, supxevs, ROT0, "Namco", "Vs. Super Xevious", 0 )
/* Light Gun games */
-GAME( 1985, duckhunt, 0, vsnes, duckhunt, vsnes_state, vsgun, ROT0, "Nintendo", "Vs. Duck Hunt (set DH3 E)", 0 )
-GAME( 1985, hogalley, 0, vsnes, hogalley, vsnes_state, vsgun, ROT0, "Nintendo", "Vs. Hogan's Alley (set HA4-1 E-1)", 0 )
-GAME( 1986, vsgshoe, 0, vsgshoe, vsgshoe, vsnes_state, vsgshoe, ROT0, "Nintendo", "Vs. Gumshoe (set GM5)", 0 )
-GAME( 1988, vsfdf, 0, vsnes, vsfdf, vsnes_state, vsfdf, ROT0, "Sunsoft", "Vs. Freedom Force", 0 )
+GAME( 1985, duckhunt, 0, vsnes, duckhunt, vsnes_state, vsgun, ROT0, "Nintendo", "Vs. Duck Hunt (set DH3 E)", 0 )
+GAME( 1985, hogalley, 0, vsnes, hogalley, vsnes_state, vsgun, ROT0, "Nintendo", "Vs. Hogan's Alley (set HA4-1 E-1)", 0 )
+GAME( 1986, vsgshoe, 0, vsgshoe, vsgshoe, vsnes_state, vsgshoe, ROT0, "Nintendo", "Vs. Gumshoe (set GM5)", 0 )
+GAME( 1988, vsfdf, 0, vsnes, vsfdf, vsnes_state, vsfdf, ROT0, "Sunsoft", "Vs. Freedom Force", 0 )
/* Dual games */
-GAME( 1984, vstennis, 0, vsdual_pi, vstennis, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Tennis (Japan/USA, set TE A-3)" , 0 )
-GAME( 1984, vstennisa,vstennis, vsdual_pi, vstennis, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Tennis (Japan/USA, set 2)" , 0 )
-GAME( 1984, vstennisb,vstennis, vsdual_pi, vstennis, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Tennis (Japan/USA, set 3)" , MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1984, wrecking, 0, vsdual_pi, wrecking, vsnes_state, vsdual, ROT0, "Nintendo", "Vs. Wrecking Crew", 0 )
-GAME( 1984, balonfgt, 0, vsdual_pi, balonfgt, vsnes_state, vsdual, ROT0, "Nintendo", "Vs. Balloon Fight (set BF4 A-3)", 0 )
-GAME( 1984, vsmahjng, 0, vsdual, vsmahjng, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Mahjong (Japan)" , 0 )
-GAME( 1984, vsbball, 0, vsdual_pi, vsbball, vsnes_state, vsdual, ROT0, "Nintendo of America", "Vs. BaseBall (US, set BA E-1)", 0 )
-GAME( 1984, vsbballj, vsbball, vsdual_pi, vsbballj, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. BaseBall (Japan, set BA A-3)", 0 )
-GAME( 1984, vsbballja,vsbball, vsdual_pi, vsbballj, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. BaseBall (Japan, set BA A-2)", 0 )
-GAME( 1984, vsbballjb,vsbball, vsdual_pi, vsbballj, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. BaseBall (Japan, set BA A-1)", 0 )
-GAME( 1984, iceclmrd, 0, vsdual_pi, iceclmrj, vsnes_state, vsdual, ROT0, "Nintendo", "Vs. Ice Climber Dual (set IC4-4 A-1)" , 0 )
+GAME( 1984, vstennis, 0, vsdual_pi, vstennis, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Tennis (Japan/USA, set TE A-3)" , 0 )
+GAME( 1984, vstennisa,vstennis, vsdual_pi, vstennis, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Tennis (Japan/USA, set 2)", 0 )
+GAME( 1984, vstennisb,vstennis, vsdual_pi, vstennis, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Tennis (Japan/USA, set 3)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1984, wrecking, 0, vsdual_pi, wrecking, vsnes_state, vsdual, ROT0, "Nintendo", "Vs. Wrecking Crew", 0 )
+GAME( 1984, balonfgt, 0, vsdual_pi, balonfgt, vsnes_state, vsdual, ROT0, "Nintendo", "Vs. Balloon Fight (set BF4 A-3)", 0 )
+GAME( 1984, vsmahjng, 0, vsdual, vsmahjng, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. Mahjong (Japan)", 0 )
+GAME( 1984, vsbball, 0, vsdual_pi, vsbball, vsnes_state, vsdual, ROT0, "Nintendo of America", "Vs. BaseBall (US, set BA E-1)", 0 )
+GAME( 1984, vsbballj, vsbball, vsdual_pi, vsbballj, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. BaseBall (Japan, set BA A-3)", 0 )
+GAME( 1984, vsbballja,vsbball, vsdual_pi, vsbballj, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. BaseBall (Japan, set BA A-2)", 0 )
+GAME( 1984, vsbballjb,vsbball, vsdual_pi, vsbballj, vsnes_state, vsdual, ROT0, "Nintendo Co., Ltd.", "Vs. BaseBall (Japan, set BA A-1)", 0 )
+GAME( 1984, iceclmrd, 0, vsdual_pi, iceclmrj, vsnes_state, vsdual, ROT0, "Nintendo", "Vs. Ice Climber Dual (set IC4-4 A-1)", 0 )
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index bf2a2a09463..bc12952d55b 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -402,7 +402,7 @@ static GFXDECODE_START( vt100 )
GFXDECODE_ENTRY( "chargen", 0x0000, vt100_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( vt100, vt100_state )
+static MACHINE_CONFIG_START( vt100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_24_8832MHz / 9)
MCFG_CPU_PROGRAM_MAP(vt100_mem)
@@ -880,15 +880,15 @@ ROM_END
/* Driver */
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1978, vt100, 0, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT100",MACHINE_NOT_WORKING)
-//COMP( 1978, vt100wp, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT100-Wx", MACHINE_NOT_WORKING)
-COMP( 1979, vt100ac, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT100 w/VT1xx-AC STP", MACHINE_NOT_WORKING)
-COMP( 1981, vt101, vt102, 0, vt102, vt100, driver_device, 0, "Digital Equipment Corporation", "VT101", MACHINE_NOT_WORKING)
-COMP( 1981, vt102, 0, 0, vt102, vt100, driver_device, 0, "Digital Equipment Corporation", "VT102", MACHINE_NOT_WORKING)
-//COMP( 1979, vt103, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT103", MACHINE_NOT_WORKING)
-COMP( 1978, vt105, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT105", MACHINE_NOT_WORKING)
-//COMP( 1978, vt110, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT110", MACHINE_NOT_WORKING)
-//COMP( 1981, vt125, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT125", MACHINE_NOT_WORKING)
-COMP( 1981, vt131, vt102, 0, vt102, vt100, driver_device, 0, "Digital Equipment Corporation", "VT131", MACHINE_NOT_WORKING)
-//COMP( 1979, vt132, vt100, 0, vt100, vt100, driver_device, 0, "Digital Equipment Corporation", "VT132", MACHINE_NOT_WORKING)
-COMP( 1983, vt180, vt100, 0, vt180, vt100, driver_device, 0, "Digital Equipment Corporation", "VT180", MACHINE_NOT_WORKING)
+COMP( 1978, vt100, 0, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT100",MACHINE_NOT_WORKING)
+//COMP( 1978, vt100wp, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT100-Wx", MACHINE_NOT_WORKING)
+COMP( 1979, vt100ac, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT100 w/VT1xx-AC STP", MACHINE_NOT_WORKING)
+COMP( 1981, vt101, vt102, 0, vt102, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT101", MACHINE_NOT_WORKING)
+COMP( 1981, vt102, 0, 0, vt102, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT102", MACHINE_NOT_WORKING)
+//COMP( 1979, vt103, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT103", MACHINE_NOT_WORKING)
+COMP( 1978, vt105, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT105", MACHINE_NOT_WORKING)
+//COMP( 1978, vt110, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT110", MACHINE_NOT_WORKING)
+//COMP( 1981, vt125, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT125", MACHINE_NOT_WORKING)
+COMP( 1981, vt131, vt102, 0, vt102, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT131", MACHINE_NOT_WORKING)
+//COMP( 1979, vt132, vt100, 0, vt100, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT132", MACHINE_NOT_WORKING)
+COMP( 1983, vt180, vt100, 0, vt180, vt100, vt100_state, 0, "Digital Equipment Corporation", "VT180", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp
index 266d9115166..abb63cfab67 100644
--- a/src/mame/drivers/vt220.cpp
+++ b/src/mame/drivers/vt220.cpp
@@ -59,7 +59,7 @@ uint32_t vt220_state::screen_update_vt220(screen_device &screen, bitmap_ind16 &b
}
-static MACHINE_CONFIG_START( vt220, vt220_state )
+static MACHINE_CONFIG_START( vt220 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8051, XTAL_11_0592MHz) // from schematic
MCFG_CPU_PROGRAM_MAP(vt220_mem)
@@ -110,5 +110,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, vt220, 0, 0, vt220, vt220, driver_device, 0, "Digital Equipment Corporation", "VT220", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1983, vt220, 0, 0, vt220, vt220, vt220_state, 0, "Digital Equipment Corporation", "VT220", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp
index 050a9b2e77c..0ecce7b128f 100644
--- a/src/mame/drivers/vt240.cpp
+++ b/src/mame/drivers/vt240.cpp
@@ -638,7 +638,7 @@ static INPUT_PORTS_START( vt240 )
PORT_CONFSETTING(0x01, "Color")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( vt240, vt240_state )
+static MACHINE_CONFIG_START( vt240 )
MCFG_CPU_ADD("maincpu", T11, XTAL_7_3728MHz) // confirm
MCFG_CPU_PROGRAM_MAP(vt240_mem)
MCFG_T11_INITIAL_MODE(5 << 13)
@@ -774,7 +774,7 @@ ROM_START( vt240 )
ROM_END
/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1983, vt240, 0, 0, vt240, vt240, driver_device, 0, "Digital Equipment Corporation", "VT240", MACHINE_IMPERFECT_GRAPHICS )
-//COMP( 1983, vt241, 0, 0, vt220, vt220, driver_device, 0, "Digital Equipment Corporation", "VT241", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1983, vt240, 0, 0, vt240, vt240, vt240_state, 0, "Digital Equipment Corporation", "VT240", MACHINE_IMPERFECT_GRAPHICS )
+//COMP( 1983, vt241, 0, 0, vt220, vt220, vt240_state, 0, "Digital Equipment Corporation", "VT241", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
// NOTE: the only difference between VT240 and VT241 is the latter comes with a VR241 Color monitor, while the former comes with a mono display; the ROMs and operation are identical.
-COMP( 1983, mc7105, 0, 0, mc7105, vt240, driver_device, 0, "Elektronika", "MC7105", MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1983, mc7105, 0, 0, mc7105, vt240, vt240_state, 0, "Elektronika", "MC7105", MACHINE_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp
index 0bb658bcd1f..153080bcb44 100644
--- a/src/mame/drivers/vt320.cpp
+++ b/src/mame/drivers/vt320.cpp
@@ -84,7 +84,7 @@ uint32_t vt320_state::screen_update_vt320(screen_device &screen, bitmap_ind16 &b
}
-static MACHINE_CONFIG_START( vt320, vt320_state )
+static MACHINE_CONFIG_START( vt320 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8051, XTAL_16MHz)
MCFG_CPU_PROGRAM_MAP(vt320_mem)
@@ -121,8 +121,8 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, vt320, 0, 0, vt320, vt320, driver_device, 0, "Digital Equipment Corporation", "VT320", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-//COMP( 1989?, vt330, 0, 0, vt320, vt320, driver_device, 0, "Digital Equipment Corporation", "VT330", MACHINE_NOT_WORKING)
-//COMP( 1989?, vt340, 0, 0, vt320, vt320, driver_device, 0, "Digital Equipment Corporation", "VT340", MACHINE_NOT_WORKING)
-//COMP( 1990?, vt340p, 0, 0, vt320, vt320, driver_device, 0, "Digital Equipment Corporation", "VT340+", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1987, vt320, 0, 0, vt320, vt320, vt320_state, 0, "Digital Equipment Corporation", "VT320", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+//COMP( 1989?, vt330, 0, 0, vt320, vt320, vt320_state, 0, "Digital Equipment Corporation", "VT330", MACHINE_NOT_WORKING)
+//COMP( 1989?, vt340, 0, 0, vt320, vt320, vt320_state, 0, "Digital Equipment Corporation", "VT340", MACHINE_NOT_WORKING)
+//COMP( 1990?, vt340p, 0, 0, vt320, vt320, vt320_state, 0, "Digital Equipment Corporation", "VT340+", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp
index ccb9d33fe23..ea306fc52e9 100644
--- a/src/mame/drivers/vt520.cpp
+++ b/src/mame/drivers/vt520.cpp
@@ -73,7 +73,7 @@ uint32_t vt520_state::screen_update_vt520(screen_device &screen, bitmap_ind16 &b
return 0;
}
-static MACHINE_CONFIG_START( vt520, vt520_state )
+static MACHINE_CONFIG_START( vt520 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8032, XTAL_20MHz)
MCFG_CPU_PROGRAM_MAP(vt520_mem)
@@ -106,7 +106,7 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-//COMP( 1993, vt510, 0, 0, vt520, vt520, driver_device, 0, "Digital Equipment Corporation", "VT510", MACHINE_NOT_WORKING)
-COMP( 1994, vt520, 0, 0, vt520, vt520, driver_device, 0, "Digital Equipment Corporation", "VT520", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-//COMP( 1994, vt525, 0, 0, vt520, vt520, driver_device, 0, "Digital Equipment Corporation", "VT525", MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+//COMP( 1993, vt510, 0, 0, vt520, vt520, vt520_state, 0, "Digital Equipment Corporation", "VT510", MACHINE_NOT_WORKING)
+COMP( 1994, vt520, 0, 0, vt520, vt520, vt520_state, 0, "Digital Equipment Corporation", "VT520", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+//COMP( 1994, vt525, 0, 0, vt520, vt520, vt520_state, 0, "Digital Equipment Corporation", "VT525", MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp
index acc2064ad6a..2655f2e0ee8 100644
--- a/src/mame/drivers/vta2000.cpp
+++ b/src/mame/drivers/vta2000.cpp
@@ -154,7 +154,7 @@ PALETTE_INIT_MEMBER(vta2000_state, vta2000)
palette.set_pen_color(2, 0x00, 0xff, 0x00); // highlight
}
-static MACHINE_CONFIG_START( vta2000, vta2000_state )
+static MACHINE_CONFIG_START( vta2000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8080, XTAL_4MHz / 4)
MCFG_CPU_PROGRAM_MAP(vta2000_mem)
@@ -188,5 +188,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 19??, vta2000, 0, 0, vta2000, vta2000, driver_device, 0, "<unknown>", "VTA-2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 19??, vta2000, 0, 0, vta2000, vta2000, vta2000_state, 0, "<unknown>", "VTA-2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp
index d24cb5ce684..f1d23a777e8 100644
--- a/src/mame/drivers/vtech1.cpp
+++ b/src/mame/drivers/vtech1.cpp
@@ -99,8 +99,8 @@ private:
required_device<mc6847_base_device> m_mc6847;
required_device<speaker_sound_device> m_speaker;
required_device<cassette_image_device> m_cassette;
- required_device<ioexp_slot_device> m_ioexp;
- required_device<memexp_slot_device> m_memexp;
+ required_device<vtech_ioexp_slot_device> m_ioexp;
+ required_device<vtech_memexp_slot_device> m_memexp;
};
@@ -419,7 +419,7 @@ INPUT_PORTS_END
static const int16_t speaker_levels[] = {-32768, 0, 32767, 0};
-static MACHINE_CONFIG_START( laser110, vtech1_state )
+static MACHINE_CONFIG_START( laser110 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, VTECH1_CLK) /* 3.57950 MHz */
@@ -433,7 +433,7 @@ static MACHINE_CONFIG_START( laser110, vtech1_state )
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
MCFG_MC6847_BW(true)
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM1)
+ MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
// GM2 = GND, GM0 = GND, INTEXT = GND
// other lines not connected
@@ -465,7 +465,7 @@ static MACHINE_CONFIG_DERIVED( laser200, laser110 )
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM1)
+ MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
// GM2 = GND, GM0 = GND, INTEXT = GND
// other lines not connected
MACHINE_CONFIG_END
@@ -489,7 +489,7 @@ static MACHINE_CONFIG_DERIVED( laser310h, laser310 )
MCFG_DEVICE_ADD("mc6847", MC6847_PAL, XTAL_4_433619MHz)
MCFG_MC6847_FSYNC_CALLBACK(INPUTLINE("maincpu", 0)) MCFG_DEVCB_INVERT
MCFG_MC6847_INPUT_CALLBACK(READ8(vtech1_state, mc6847_videoram_r))
- MCFG_MC6847_FIXED_MODE(MC6847_MODE_GM1)
+ MCFG_MC6847_FIXED_MODE(mc6847_pal_device::MODE_GM1)
// INTEXT = GND
// other lines not connected
MACHINE_CONFIG_END
@@ -550,7 +550,7 @@ ROM_END
GAME DRIVERS
***************************************************************************/
-// YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
COMP( 1983, laser110, 0, 0, laser110, vtech1, vtech1_state, vtech1, "Video Technology", "Laser 110", 0 )
COMP( 1983, laser200, 0, 0, laser200, vtech1, vtech1_state, vtech1, "Video Technology", "Laser 200", 0 )
COMP( 1983, vz200de, laser200, 0, laser200, vtech1, vtech1_state, vtech1, "Video Technology", "VZ-200 (Germany & Netherlands)", MACHINE_NOT_WORKING )
@@ -560,4 +560,4 @@ COMP( 1984, laser210, 0, 0, laser210, vtech1, vtech1_state, vtech1
COMP( 1984, vz200, laser210, 0, laser210, vtech1, vtech1_state, vtech1, "Dick Smith Electronics", "VZ-200 (Oceania)", 0 )
COMP( 1984, laser310, 0, 0, laser310, vtech1, vtech1_state, vtech1, "Video Technology", "Laser 310", 0 )
COMP( 1984, vz300, laser310, 0, laser310, vtech1, vtech1_state, vtech1, "Dick Smith Electronics", "VZ-300 (Oceania)", 0 )
-COMP( 1984, laser310h, laser310, 0, laser310h, vtech1, vtech1_state, vtech1h, "Video Technology", "Laser 310 (SHRG)", MACHINE_UNOFFICIAL)
+COMP( 1984, laser310h, laser310, 0, laser310h, vtech1, vtech1_state, vtech1h, "Video Technology", "Laser 310 (SHRG)", MACHINE_UNOFFICIAL )
diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp
index d87b59474ae..968bd2d2f20 100644
--- a/src/mame/drivers/vtech2.cpp
+++ b/src/mame/drivers/vtech2.cpp
@@ -413,7 +413,7 @@ static const floppy_interface vtech2_floppy_interface =
nullptr
};
-static MACHINE_CONFIG_START( laser350, vtech2_state )
+static MACHINE_CONFIG_START( laser350 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 3694700) /* 3.694700 MHz */
MCFG_CPU_PROGRAM_MAP(vtech2_mem)
@@ -504,7 +504,7 @@ ROM_END
***************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
-COMP( 1984?, laser350, 0, 0, laser350, laser350, vtech2_state, laser, "Video Technology", "Laser 350" , 0)
-COMP( 1984?, laser500, laser350, 0, laser500, laser500, vtech2_state, laser, "Video Technology", "Laser 500" , 0)
-COMP( 1984?, laser700, laser350, 0, laser700, laser500, vtech2_state, laser, "Video Technology", "Laser 700" , 0)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1984?, laser350, 0, 0, laser350, laser350, vtech2_state, laser, "Video Technology", "Laser 350" , 0)
+COMP( 1984?, laser500, laser350, 0, laser500, laser500, vtech2_state, laser, "Video Technology", "Laser 500" , 0)
+COMP( 1984?, laser700, laser350, 0, laser700, laser500, vtech2_state, laser, "Video Technology", "Laser 700" , 0)
diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp
index 358dff49947..1c477546ad7 100644
--- a/src/mame/drivers/vulgus.cpp
+++ b/src/mame/drivers/vulgus.cpp
@@ -214,7 +214,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( vulgus, vulgus_state )
+static MACHINE_CONFIG_START( vulgus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* 3 MHz */
@@ -379,6 +379,6 @@ ROM_END
-GAME( 1984, vulgus, 0, vulgus, vulgus, driver_device, 0, ROT270, "Capcom", "Vulgus (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, vulgusa, vulgus, vulgus, vulgus, driver_device, 0, ROT90, "Capcom", "Vulgus (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, vulgusj, vulgus, vulgus, vulgus, driver_device, 0, ROT270, "Capcom", "Vulgus (Japan?)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vulgus, 0, vulgus, vulgus, vulgus_state, 0, ROT270, "Capcom", "Vulgus (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vulgusa, vulgus, vulgus, vulgus, vulgus_state, 0, ROT90, "Capcom", "Vulgus (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, vulgusj, vulgus, vulgus, vulgus, vulgus_state, 0, ROT270, "Capcom", "Vulgus (Japan?)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp
index 524e529d0df..ae6a9ca04cc 100644
--- a/src/mame/drivers/wacky_gator.cpp
+++ b/src/mame/drivers/wacky_gator.cpp
@@ -270,7 +270,7 @@ static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8, wackygtr_state )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( wackygtr, wackygtr_state )
+static MACHINE_CONFIG_START( wackygtr )
MCFG_CPU_ADD("maincpu", M6809E, XTAL_3_579545MHz) // HD68B09P
MCFG_CPU_PROGRAM_MAP(program_map)
@@ -285,7 +285,7 @@ static MACHINE_CONFIG_START( wackygtr, wackygtr_state )
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("msm", MSM5205, XTAL_384kHz )
MCFG_MSM5205_VCLK_CB(WRITELINE(wackygtr_state, adpcm_int)) /* IRQ handler */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 8 KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MCFG_SOUND_ADD("ymsnd", YM2413, XTAL_3_579545MHz )
diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp
index 1afee902a0e..1200bde3e6e 100644
--- a/src/mame/drivers/wallc.cpp
+++ b/src/mame/drivers/wallc.cpp
@@ -308,7 +308,7 @@ DRIVER_INIT_MEMBER(wallc_state,wallca)
-static MACHINE_CONFIG_START( wallc, wallc_state )
+static MACHINE_CONFIG_START( wallc )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 12288000 / 4) /* 3.072 MHz ? */
MCFG_CPU_PROGRAM_MAP(wallc_map)
@@ -492,8 +492,8 @@ DRIVER_INIT_MEMBER(wallc_state,sidam)
}
-GAME( 1984, wallc, 0, wallc, wallc, wallc_state, wallc, ROT0, "Midcoin", "Wall Crash (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, wallca, wallc, wallc, wallc, wallc_state, wallca, ROT0, "Midcoin", "Wall Crash (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, brkblast,wallc, wallc, wallc, wallc_state, wallca, ROT0, "bootleg (Fadesa)", "Brick Blast (bootleg of Wall Crash)", MACHINE_SUPPORTS_SAVE ) // Spanish bootleg board, Fadesa stickers / text on various components
+GAME( 1984, wallc, 0, wallc, wallc, wallc_state, wallc, ROT0, "Midcoin", "Wall Crash (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, wallca, wallc, wallc, wallc, wallc_state, wallca, ROT0, "Midcoin", "Wall Crash (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, brkblast, wallc, wallc, wallc, wallc_state, wallca, ROT0, "bootleg (Fadesa)", "Brick Blast (bootleg of Wall Crash)", MACHINE_SUPPORTS_SAVE ) // Spanish bootleg board, Fadesa stickers / text on various components
-GAME( 1984, sidampkr,0, wallc, wallc, wallc_state, sidam, ROT270, "Sidam", "unknown Sidam Poker", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sidampkr, 0, wallc, wallc, wallc_state, sidam, ROT270, "Sidam", "unknown Sidam Poker", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp
index c6e70b61ac4..200cb8cba00 100644
--- a/src/mame/drivers/wangpc.cpp
+++ b/src/mame/drivers/wangpc.cpp
@@ -1265,7 +1265,7 @@ void wangpc_state::on_disk1_unload(floppy_image_device *image)
// MACHINE_CONFIG( wangpc )
//-------------------------------------------------
-static MACHINE_CONFIG_START( wangpc, wangpc_state )
+static MACHINE_CONFIG_START( wangpc )
MCFG_CPU_ADD(I8086_TAG, I8086, 8000000)
MCFG_CPU_PROGRAM_MAP(wangpc_mem)
MCFG_CPU_IO_MAP(wangpc_io)
@@ -1305,7 +1305,7 @@ static MACHINE_CONFIG_START( wangpc, wangpc_state )
MCFG_PIT8253_OUT2_HANDLER(WRITELINE(wangpc_state, pit2_w))
MCFG_IM6402_ADD(IM6402_TAG, 62500*16, 62500*16)
- MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(WANGPC_KEYBOARD_TAG, wangpc_keyboard_t, write_rxd))
+ MCFG_IM6402_TRO_CALLBACK(DEVWRITELINE(WANGPC_KEYBOARD_TAG, wangpc_keyboard_device, write_rxd))
MCFG_IM6402_DR_CALLBACK(WRITELINE(wangpc_state, uart_dr_w))
MCFG_IM6402_TBRE_CALLBACK(WRITELINE(wangpc_state, uart_tbre_w))
@@ -1386,4 +1386,4 @@ ROM_END
// GAME DRIVERS
//**************************************************************************
-COMP( 1985, wangpc, 0, 0, wangpc, wangpc, driver_device, 0, "Wang Laboratories", "Wang Professional Computer", MACHINE_SUPPORTS_SAVE )
+COMP( 1985, wangpc, 0, 0, wangpc, wangpc, wangpc_state, 0, "Wang Laboratories", "Wang Professional Computer", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp
index 9a281287722..0de5a882755 100644
--- a/src/mame/drivers/wardner.cpp
+++ b/src/mame/drivers/wardner.cpp
@@ -362,7 +362,7 @@ void wardner_state::machine_reset()
m_membank->set_bank(0);
}
-static MACHINE_CONFIG_START( wardner, wardner_state )
+static MACHINE_CONFIG_START( wardner )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz/4) /* 6MHz */
@@ -581,6 +581,6 @@ ROM_START( wardnerj )
ROM_END
-GAME( 1987, wardner, 0, wardner, wardner, driver_device, 0, ROT0, "Toaplan / Taito Corporation Japan", "Wardner (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, pyros, wardner, wardner, pyros, driver_device, 0, ROT0, "Toaplan / Taito America Corporation", "Pyros (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, wardnerj, wardner, wardner, wardnerj, driver_device, 0, ROT0, "Toaplan / Taito Corporation", "Wardner no Mori (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wardner, 0, wardner, wardner, wardner_state, 0, ROT0, "Toaplan / Taito Corporation Japan", "Wardner (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, pyros, wardner, wardner, pyros, wardner_state, 0, ROT0, "Toaplan / Taito America Corporation", "Pyros (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, wardnerj, wardner, wardner, wardnerj, wardner_state, 0, ROT0, "Toaplan / Taito Corporation", "Wardner no Mori (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp
index 1bedf832669..3e594948206 100644
--- a/src/mame/drivers/warpsped.cpp
+++ b/src/mame/drivers/warpsped.cpp
@@ -315,7 +315,7 @@ PALETTE_INIT_MEMBER(warpspeed_state, warpspeed)
}
}
-static MACHINE_CONFIG_START( warpspeed, warpspeed_state )
+static MACHINE_CONFIG_START( warpspeed )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_5MHz/2)
@@ -373,4 +373,4 @@ ROM_START( warpsped )
ROM_END
-GAME( 1979?, warpsped, 0, warpspeed, warpspeed, driver_device, 0, ROT0, "Meadows Games, Inc.", "Warp Speed (prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // year not shown, 1979 is according to date stamps on PCB chips.
+GAME( 1979?, warpsped, 0, warpspeed, warpspeed, warpspeed_state, 0, ROT0, "Meadows Games, Inc.", "Warp Speed (prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // year not shown, 1979 is according to date stamps on PCB chips.
diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp
index 5d2bfdff051..39e819805a1 100644
--- a/src/mame/drivers/warpwarp.cpp
+++ b/src/mame/drivers/warpwarp.cpp
@@ -730,7 +730,7 @@ GFXDECODE_END
-static MACHINE_CONFIG_START( geebee, warpwarp_state )
+static MACHINE_CONFIG_START( geebee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9) /* verified on pcb */
@@ -768,7 +768,7 @@ static MACHINE_CONFIG_DERIVED( navarone, geebee )
MCFG_VIDEO_START_OVERRIDE(warpwarp_state,navarone)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( bombbee, warpwarp_state )
+static MACHINE_CONFIG_START( bombbee )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I8080, MASTER_CLOCK/9)
diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp
index 6ae23e97825..7569b3504b0 100644
--- a/src/mame/drivers/warriorb.cpp
+++ b/src/mame/drivers/warriorb.cpp
@@ -424,7 +424,7 @@ void warriorb_state::machine_reset()
machine().sound().system_enable(true); /* mixer enabled */
}
-static MACHINE_CONFIG_START( darius2d, warriorb_state )
+static MACHINE_CONFIG_START( darius2d )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
@@ -512,7 +512,7 @@ static MACHINE_CONFIG_START( darius2d, warriorb_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( warriorb, warriorb_state )
+static MACHINE_CONFIG_START( warriorb )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */
@@ -780,8 +780,8 @@ ROM_END
/* Working Games */
-// YEAR, NAME, PARENT, MACHINE, INPUT, INIT,MONITOR,COMPANY,FULLNAME,FLAGS
-GAME( 1989, sagaia, darius2, darius2d, sagaia, driver_device, 0, ROT0, "Taito Corporation Japan", "Sagaia (dual screen) (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, darius2d, darius2, darius2d, darius2d, driver_device, 0, ROT0, "Taito Corporation", "Darius II (dual screen) (Japan, Rev 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, darius2do, darius2, darius2d, darius2d, driver_device, 0, ROT0, "Taito Corporation", "Darius II (dual screen) (Japan, Rev 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, warriorb, 0, warriorb, warriorb, driver_device, 0, ROT0, "Taito Corporation", "Warrior Blade - Rastan Saga Episode III (Japan)", MACHINE_SUPPORTS_SAVE )
+// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT,MONITOR,COMPANY,FULLNAME, FLAGS
+GAME( 1989, sagaia, darius2, darius2d, sagaia, warriorb_state, 0, ROT0, "Taito Corporation Japan", "Sagaia (dual screen) (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, darius2d, darius2, darius2d, darius2d, warriorb_state, 0, ROT0, "Taito Corporation", "Darius II (dual screen) (Japan, Rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, darius2do, darius2, darius2d, darius2d, warriorb_state, 0, ROT0, "Taito Corporation", "Darius II (dual screen) (Japan, Rev 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, warriorb, 0, warriorb, warriorb, warriorb_state, 0, ROT0, "Taito Corporation", "Warrior Blade - Rastan Saga Episode III (Japan)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp
index 29efcaebcff..8d40cdeb587 100644
--- a/src/mame/drivers/wc90.cpp
+++ b/src/mame/drivers/wc90.cpp
@@ -349,7 +349,7 @@ void wc90_state::machine_start()
}
-static MACHINE_CONFIG_START( wc90, wc90_state )
+static MACHINE_CONFIG_START( wc90 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_8MHz) /* verified on pcb */
@@ -568,9 +568,9 @@ ROM_START( pac90 )
ROM_END
-GAME( 1989, wc90, 0, wc90, wc90, driver_device, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (World)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wc90a, wc90, wc90, wc90, driver_device, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (Euro set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wc90b, wc90, wc90, wc90, driver_device, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (Euro set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wc90t, wc90, wc90t,wc90, driver_device, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (trackball set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90, 0, wc90, wc90, wc90_state, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (World)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90a, wc90, wc90, wc90, wc90_state, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (Euro set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90b, wc90, wc90, wc90, wc90_state, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (Euro set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90t, wc90, wc90t, wc90, wc90_state, 0, ROT0, "Tecmo", "Tecmo World Cup '90 (trackball set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, pac90, puckman, pac90,pac90,driver_device, 0, ROT90, "bootleg (Macro)", "Pac-Man (bootleg on World Cup '90 hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // made by Mike Coates etc.
+GAME( 199?, pac90, puckman, pac90, pac90, wc90_state, 0, ROT90, "bootleg (Macro)", "Pac-Man (bootleg on World Cup '90 hardware)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // made by Mike Coates etc.
diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp
index f7bec2930b5..0b8da2877bc 100644
--- a/src/mame/drivers/wc90b.cpp
+++ b/src/mame/drivers/wc90b.cpp
@@ -350,7 +350,7 @@ void wc90b_state::machine_start()
}
-static MACHINE_CONFIG_START( wc90b, wc90b_state )
+static MACHINE_CONFIG_START( wc90b )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK)
@@ -392,7 +392,7 @@ static MACHINE_CONFIG_START( wc90b, wc90b_state )
MCFG_SOUND_ADD("msm", MSM5205, MSM5205_CLOCK)
MCFG_MSM5205_VCLK_CB(WRITELINE(wc90b_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz 4-bit */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz 4-bit */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_CONFIG_END
@@ -534,6 +534,6 @@ ROM_START( wc90ba )
ROM_END
-GAME( 1989, wc90b1, wc90, wc90b, wc90b, driver_device, 0, ROT0, "bootleg", "Euro League (Italian hack of Tecmo World Cup '90)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wc90b2, wc90, wc90b, wc90b, driver_device, 0, ROT0, "bootleg", "Worldcup '90", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wc90ba, wc90, wc90b, wc90b, driver_device, 0, ROT0, "bootleg", "Euro League (Italian hack of Tecmo World Cup '90 - alt version)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90b1, wc90, wc90b, wc90b, wc90b_state, 0, ROT0, "bootleg", "Euro League (Italian hack of Tecmo World Cup '90)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90b2, wc90, wc90b, wc90b, wc90b_state, 0, ROT0, "bootleg", "Worldcup '90", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wc90ba, wc90, wc90b, wc90b, wc90b_state, 0, ROT0, "bootleg", "Euro League (Italian hack of Tecmo World Cup '90 - alt version)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp
index b2fcacb7b70..e489f9beaae 100644
--- a/src/mame/drivers/wecleman.cpp
+++ b/src/mame/drivers/wecleman.cpp
@@ -1069,7 +1069,7 @@ MACHINE_RESET_MEMBER(wecleman_state,wecleman)
m_k007232->set_bank( 0, 1 );
}
-static MACHINE_CONFIG_START( wecleman, wecleman_state )
+static MACHINE_CONFIG_START( wecleman )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* Schems show 10MHz */
@@ -1140,7 +1140,7 @@ MACHINE_RESET_MEMBER(wecleman_state,hotchase)
}
-static MACHINE_CONFIG_START( hotchase, wecleman_state )
+static MACHINE_CONFIG_START( hotchase )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp
index 558edf1dd87..80bd94bc98f 100644
--- a/src/mame/drivers/welltris.cpp
+++ b/src/mame/drivers/welltris.cpp
@@ -690,7 +690,7 @@ void welltris_state::machine_start()
save_item(NAME(m_pending_command));
}
-static MACHINE_CONFIG_START( welltris, welltris_state )
+static MACHINE_CONFIG_START( welltris )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,20000000/2) /* 10 MHz */
@@ -828,6 +828,6 @@ ROM_END
-GAME( 1991, welltris, 0, welltris, welltris, welltris_state, welltris, ROT0, "Video System Co.", "Welltris (World?, 2 players)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1991, welltrisj,welltris, welltris, welltris, welltris_state, welltris, ROT0, "Video System Co.", "Welltris (Japan, 2 players)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, quiz18k, 0, quiz18k, quiz18k, driver_device, 0, ROT0, "EIM", "Miyasu Nonki no Quiz 18-Kin", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, welltris, 0, welltris, welltris, welltris_state, welltris, ROT0, "Video System Co.", "Welltris (World?, 2 players)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1991, welltrisj, welltris, welltris, welltris, welltris_state, welltris, ROT0, "Video System Co.", "Welltris (Japan, 2 players)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, quiz18k, 0, quiz18k, quiz18k, welltris_state, 0, ROT0, "EIM", "Miyasu Nonki no Quiz 18-Kin", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp
index dbaa2a12778..ffc4400fa7a 100644
--- a/src/mame/drivers/wgp.cpp
+++ b/src/mame/drivers/wgp.cpp
@@ -910,7 +910,7 @@ void wgp_state::machine_start()
machine().save().register_postload(save_prepost_delegate(FUNC(wgp_state::wgp_postload), this));
}
-static MACHINE_CONFIG_START( wgp, wgp_state )
+static MACHINE_CONFIG_START( wgp )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? */
@@ -1202,8 +1202,8 @@ DRIVER_INIT_MEMBER(wgp_state,wgp2)
/* Working Games with some graphics problems - e.g. missing rotation */
-GAME( 1989, wgp, 0, wgp, wgp, wgp_state, wgp, ROT0, "Taito America Corporation", "World Grand Prix (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1989, wgpj, wgp, wgp, wgpj, wgp_state, wgp, ROT0, "Taito Corporation", "World Grand Prix (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1989, wgpjoy, wgp, wgp, wgpjoy, wgp_state, wgp, ROT0, "Taito Corporation", "World Grand Prix (joystick version) (Japan, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1989, wgpjoya, wgp, wgp, wgpjoy, wgp_state, wgp, ROT0, "Taito Corporation", "World Grand Prix (joystick version) (Japan, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-GAME( 1990, wgp2, wgp, wgp2, wgp2, wgp_state, wgp2, ROT0, "Taito Corporation", "World Grand Prix 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1989, wgp, 0, wgp, wgp, wgp_state, wgp, ROT0, "Taito America Corporation", "World Grand Prix (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1989, wgpj, wgp, wgp, wgpj, wgp_state, wgp, ROT0, "Taito Corporation", "World Grand Prix (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1989, wgpjoy, wgp, wgp, wgpjoy, wgp_state, wgp, ROT0, "Taito Corporation", "World Grand Prix (joystick version) (Japan, set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1989, wgpjoya, wgp, wgp, wgpjoy, wgp_state, wgp, ROT0, "Taito Corporation", "World Grand Prix (joystick version) (Japan, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+GAME( 1990, wgp2, wgp, wgp2, wgp2, wgp_state, wgp2, ROT0, "Taito Corporation", "World Grand Prix 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp
index ae5ccf73650..b7a24880081 100644
--- a/src/mame/drivers/wheelfir.cpp
+++ b/src/mame/drivers/wheelfir.cpp
@@ -770,7 +770,7 @@ void wheelfir_state::machine_start()
}
-static MACHINE_CONFIG_START( wheelfir, wheelfir_state )
+static MACHINE_CONFIG_START( wheelfir )
MCFG_CPU_ADD("maincpu", M68000, 32000000/2)
MCFG_CPU_PROGRAM_MAP(wheelfir_main)
@@ -830,4 +830,4 @@ ROM_START( wheelfir )
ROM_LOAD16_WORD_SWAP( "eeprom", 0x000000, 0x000080, CRC(961e4bc9) SHA1(8944504bf56a272e9aa08185e73c6b4212d52383) )
ROM_END
-GAME( 199?, wheelfir, 0, wheelfir, wheelfir, driver_device, 0, ROT0, "TCH", "Wheels & Fire", MACHINE_IMPERFECT_GRAPHICS)
+GAME( 199?, wheelfir, 0, wheelfir, wheelfir, wheelfir_state, 0, ROT0, "TCH", "Wheels & Fire", MACHINE_IMPERFECT_GRAPHICS)
diff --git a/src/mame/drivers/white_mod.cpp b/src/mame/drivers/white_mod.cpp
index 4f2c340b416..e39d9801121 100644
--- a/src/mame/drivers/white_mod.cpp
+++ b/src/mame/drivers/white_mod.cpp
@@ -43,7 +43,7 @@ DRIVER_INIT_MEMBER(whitestar_mod_state,whitestar_mod)
{
}
-static MACHINE_CONFIG_START( whitestar_mod, whitestar_mod_state )
+static MACHINE_CONFIG_START( whitestar_mod )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(whitestar_mod_map)
@@ -3590,156 +3590,156 @@ ROM_START(sopranoi_107)
ROM_LOAD("sopsndi.u37", 0x300000, 0x100000, CRC(b34c0a5f) SHA1(b84979d6eef7d23e6dd5410993d83fba2121bc6a))
ROM_END
-GAME(2004, elvisp, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisp4, elvisp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisp303, elvisp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisp302, elvisp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisl4, elvisl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisl303, elvisl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisl302, elvisl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisg, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisg4, elvisg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisg303, elvisg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisg302, elvisg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisf, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisf4, elvisf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisf303, elvisf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisf302, elvisf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisi4, elvisi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisi303, elvisi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, elvisi302, elvisi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprix, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprix_400, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprix_352, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprix_350, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprix_340, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprix_301, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixg, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixg_400, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixg_352, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixg_350, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixg_340, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixg_301, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixl_400, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixl_352, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixl_350, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixl_340, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixl_301, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixf, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixf_400, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixf_352, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixf_350, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixf_340, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixf_301, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixi_400, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixi_352, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixi_350, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixi_340, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, gprixi_301, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascar, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.50)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascar_400, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascar_352, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.52)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascar_350, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.50)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascar_340, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.40)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascar_301, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, dalejr, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Dale Jr. (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascarl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascarl_400,nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascarl_352,nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.52 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascarl_350,nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascarl_340,nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.40 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, nascarl_301,nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripleys, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, rip310, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, rip302, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, rip301, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, rip300, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripleysf, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripf310, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripf302, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripf301, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripf300, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripleysg, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 Germany)",MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripg310, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 Germany)",MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripg302, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 Germany)",MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripg301, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 Germany)",MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripg300, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 Germany)",MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripleysi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripi310, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripi302, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripi301, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripi300, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripleysl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripl310, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripl302, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripl301, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2004, ripl300, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_le, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.02 Limited Edition)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr9, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr8, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr7, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr6, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr501, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr5, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr410, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr401, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp9, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp8, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp7, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp6, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp501, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp5, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_sp401, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr9, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr8, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr7, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr6, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr501, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr5, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr410, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_gr401, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr9, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr8, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr7, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr6, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr501, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr5, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr410, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_fr401, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it9, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it8, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it7, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it6, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it501, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it5, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it410, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2003, lotr_it401, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranos, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranos_400,sopranos, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranos_300,sopranos, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranos_204,sopranos, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (2.04)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranog, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranog_400,sopranog, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranog_300,sopranog, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranog_107,sopranog, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranof, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranof_400,sopranof, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranof_300,sopranof, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranof_107,sopranof, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 France)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranol, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranol_400,sopranol, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranol_300,sopranol, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranol_107,sopranol, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranoi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranoi_400,sopranoi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranoi_300,sopranoi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2005, sopranoi_107,sopranoi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisp, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisp4, elvisp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisp303, elvisp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisp302, elvisp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisl4, elvisl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisl303, elvisl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisl302, elvisl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisg, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisg4, elvisg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisg303, elvisg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisg302, elvisg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisf, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisf4, elvisf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisf303, elvisf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisf302, elvisf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (5.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisi4, elvisi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (4.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisi303, elvisi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.03 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, elvisi302, elvisi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Elvis (3.02 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprix, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprix_400, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprix_352, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprix_350, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprix_340, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprix_301, gprix, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixg, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixg_400, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixg_352, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixg_350, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixg_340, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixg_301, gprixg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixl_400, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixl_352, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixl_350, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixl_340, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixl_301, gprixl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixf, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixf_400, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixf_352, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixf_350, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixf_340, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixf_301, gprixf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.50 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixi_400, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (4.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixi_352, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.52 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixi_350, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.50 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixi_340, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.40 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, gprixi_301, gprixi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Grand Prix (3.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascar, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.50)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascar_400, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascar_352, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.52)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascar_350, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.50)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascar_340, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.40)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascar_301, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, dalejr, nascar, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Dale Jr. (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascarl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascarl_400, nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascarl_352, nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.52 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascarl_350, nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.50 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascarl_340, nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.40 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, nascarl_301, nascarl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Nascar (3.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripleys, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, rip310, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, rip302, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, rip301, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, rip300, ripleys, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripleysf, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripf310, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripf302, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripf301, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripf300, ripleysf, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripleysg, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripg310, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripg302, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripg301, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripg300, ripleysg, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripleysi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripi310, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripi302, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripi301, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripi300, ripleysi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripleysl, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.20 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripl310, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.10 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripl302, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.02 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripl301, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2004, ripl300, ripleysl, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "Ripley's Believe It or Not! (3.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_le, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.02 Limited Edition)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr9, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr8, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr7, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr6, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr501, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr5, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr410, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr401, lotr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp9, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp8, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp7, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp6, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp501, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp5, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_sp401, lotr_sp, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr9, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr8, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr7, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr6, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr501, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr5, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr410, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_gr401, lotr_gr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr9, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr8, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr7, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr6, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr501, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr5, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr410, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_fr401, lotr_fr, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (10.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it9, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (9.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it8, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (8.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it7, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (7.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it6, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (6.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it501, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it5, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (5.0 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it410, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.10 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2003, lotr_it401, lotr_it, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Lord Of The Rings (4.01 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranos, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranos_400, sopranos, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranos_300, sopranos, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranos_204, sopranos, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (2.04)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranog, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranog_400, sopranog, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranog_300, sopranog, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranog_107, sopranog, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 Germany)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranof, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranof_400, sopranof, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranof_300, sopranof, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranof_107, sopranof, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 France)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranol, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranol_400, sopranol, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranol_300, sopranol, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranol_107, sopranol, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 Spain)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranoi, 0, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (5.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranoi_400, sopranoi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (4.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranoi_300, sopranoi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (3.00 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2005, sopranoi_107, sopranoi, whitestar_mod, whitestar_mod, whitestar_mod_state, whitestar_mod, ROT0, "Stern", "The Sopranos (1.07 Italy)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/whitestar.cpp b/src/mame/drivers/whitestar.cpp
index 3580b605f57..c2ed791b947 100644
--- a/src/mame/drivers/whitestar.cpp
+++ b/src/mame/drivers/whitestar.cpp
@@ -113,7 +113,7 @@ INTERRUPT_GEN_MEMBER(whitestar_state::whitestar_firq_interrupt)
device.execute().set_input_line(M6809_FIRQ_LINE, HOLD_LINE);
}
-static MACHINE_CONFIG_START( whitestar, whitestar_state )
+static MACHINE_CONFIG_START( whitestar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(whitestar_map)
@@ -3385,197 +3385,197 @@ ROM_END
#define MACHINE_IS_PINBALL MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_MECHANICAL
-GAME(1995, apollo13, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Apollo 13 (5.01)", MACHINE_IS_PINBALL)
-GAME(1995, apollo13_d4,apollo13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Apollo 13 (5.01, Display 4.01)", MACHINE_IS_PINBALL)
-GAME(1995, apollo13_20,apollo13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Apollo 13 (2.03)", MACHINE_IS_PINBALL)
-GAME(1995, apollo13_10,apollo13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Apollo 13 (1.00)", MACHINE_IS_PINBALL)
-GAME(2001, austin, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (3.02)", MACHINE_IS_PINBALL)
-GAME(2001, aust301, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (3.01)", MACHINE_IS_PINBALL)
-GAME(2001, aust300, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (3.00)", MACHINE_IS_PINBALL)
-GAME(2001, aust201, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (2.01)", MACHINE_IS_PINBALL)
-GAME(2001, austnew, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2001, austinf, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (France)", MACHINE_IS_PINBALL)
-GAME(2001, austing, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (Germany)", MACHINE_IS_PINBALL)
-GAME(2001, austini, austin, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Austin Powers (Italy)", MACHINE_IS_PINBALL)
-GAME(1998, godzillp, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Godzilla (Pinball, 2.05)", MACHINE_IS_PINBALL)
-GAME(1998, godzillp_100,godzillp, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Godzilla (Pinball, 1.00)", MACHINE_IS_PINBALL)
-GAME(1998, godzillp_090,godzillp, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Godzilla (Pinball, 0.90)", MACHINE_IS_PINBALL)
-GAME(1996, gldneye, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Goldeneye", MACHINE_IS_PINBALL)
-GAME(1998, goldcue, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Golden Cue", MACHINE_IS_PINBALL)
-GAME(1999, harl_a13, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03)", MACHINE_IS_PINBALL)
-GAME(1999, harl_u13, harl_a13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03 UK)", MACHINE_IS_PINBALL)
-GAME(1999, harl_a10, harl_a13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03 Display rev. 1.00)", MACHINE_IS_PINBALL)
-GAME(1999, harl_f13, harl_a13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03 France)", MACHINE_IS_PINBALL)
-GAME(1999, harl_g13, harl_a13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03 Germany)", MACHINE_IS_PINBALL)
-GAME(1999, harl_i13, harl_a13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03 Italy)", MACHINE_IS_PINBALL)
-GAME(1999, harl_l13, harl_a13, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Harley Davidson (1.03 Spain)", MACHINE_IS_PINBALL)
-GAME(2004, harl_a40, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (4.00)", MACHINE_IS_PINBALL)
-GAME(2004, harl_f40, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (4.00 France)", MACHINE_IS_PINBALL)
-GAME(2004, harl_g40, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (4.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2004, harl_i40, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (4.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2004, harl_l40, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (4.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2004, harl_a30, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (3.00)", MACHINE_IS_PINBALL)
-GAME(2004, harl_f30, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (3.00 France)", MACHINE_IS_PINBALL)
-GAME(2004, harl_g30, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (3.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2004, harl_i30, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (3.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2004, harl_l30, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (3.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, harl_a18, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (1.08)", MACHINE_IS_PINBALL)
-GAME(2003, harl_f18, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (1.08 France)", MACHINE_IS_PINBALL)
-GAME(2003, harl_g18, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (1.08 Germany)", MACHINE_IS_PINBALL)
-GAME(2003, harl_i18, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (1.08 Italy)", MACHINE_IS_PINBALL)
-GAME(2003, harl_l18, harl_a40, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Harley Davidson (1.08 Spain)", MACHINE_IS_PINBALL)
-GAME(2001, hirolcas, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (3.00)", MACHINE_IS_PINBALL)
-GAME(2001, hironew, hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2001, hirolcat, hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (3.00) TEST", MACHINE_IS_PINBALL)
-GAME(2001, hirolcas_210,hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (2.10)", MACHINE_IS_PINBALL)
-GAME(2001, hirol_fr, hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (3.00 France)", MACHINE_IS_PINBALL)
-GAME(2001, hirol_gr, hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (3.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2001, hirol_gr_210,hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (2.10 Germany)", MACHINE_IS_PINBALL)
-GAME(2001, hirol_it, hirolcas, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "High Roller Casino (3.00 Italy)", MACHINE_IS_PINBALL)
-GAME(1996, id4, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Independence Day (v2.02)", MACHINE_IS_PINBALL)
-GAME(1996, id4f, id4, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Independence Day (v2.02 France)", MACHINE_IS_PINBALL)
-GAME(1996, id4_201, id4, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Independence Day (v2.01)", MACHINE_IS_PINBALL)
-GAME(1996, id4f_201, id4, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Independence Day (v2.01 France)", MACHINE_IS_PINBALL)
-GAME(1998, lostspc, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Lost in Space (1.01)", MACHINE_IS_PINBALL)
-GAME(1998, lostspcf, lostspc, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Lost in Space (1.01 France)", MACHINE_IS_PINBALL)
-GAME(1998, lostspcg, lostspc, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Lost in Space (1.01 Germany)", MACHINE_IS_PINBALL)
-GAME(1998, lostspc_d1, lostspc, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Lost in Space (1.01, Display 1.01)", MACHINE_IS_PINBALL)
-GAME(2001, monopolp, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (3.20)", MACHINE_IS_PINBALL)
-GAME(2002, monop303, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (3.03)", MACHINE_IS_PINBALL)
-GAME(2002, monop301, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (3.01)", MACHINE_IS_PINBALL)
-GAME(2002, monop251, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (2.51)", MACHINE_IS_PINBALL)
-GAME(2002, monop233, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (2.33)", MACHINE_IS_PINBALL)
-GAME(2002, monopolf, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (France)", MACHINE_IS_PINBALL)
-GAME(2002, monopolg, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (Germany)", MACHINE_IS_PINBALL)
-GAME(2002, monopoli, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (Italy)", MACHINE_IS_PINBALL)
-GAME(2002, monopoll, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (Spain)", MACHINE_IS_PINBALL)
-GAME(2002, mononew, monopolp, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2001, nfl, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "NFL", MACHINE_IS_PINBALL)
-GAME(2002, playboys, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (5.00)", MACHINE_IS_PINBALL)
-GAME(2002, playboys_401,playboys, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (4.01)", MACHINE_IS_PINBALL)
-GAME(2002, playboys_303,playboys, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.03)", MACHINE_IS_PINBALL)
-GAME(2002, playboys_302,playboys, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.02)", MACHINE_IS_PINBALL)
-GAME(2002, playboys_300,playboys, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.00)", MACHINE_IS_PINBALL)
-GAME(2002, playboys_203,playboys, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (2.03)", MACHINE_IS_PINBALL)
-GAME(2002, playnew, playboys, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2002, playboyf, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (5.00 France)", MACHINE_IS_PINBALL)
-GAME(2002, playboyf_401,playboyf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (4.01 France)", MACHINE_IS_PINBALL)
-GAME(2002, playboyf_303,playboyf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.03 France)", MACHINE_IS_PINBALL)
-GAME(2002, playboyf_302,playboyf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.02 France)", MACHINE_IS_PINBALL)
-GAME(2002, playboyf_300,playboyf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.00 France)", MACHINE_IS_PINBALL)
-GAME(2002, playboyf_203,playboyf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (2.03 France)", MACHINE_IS_PINBALL)
-GAME(2002, playboyg, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (5.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, playboyg_401,playboyg, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (4.01 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, playboyg_303,playboyg, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.03 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, playboyg_302,playboyg, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.02 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, playboyg_300,playboyg, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, playboyg_203,playboyg, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (2.03 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, playboyi, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (5.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, playboyi_401,playboyi, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (4.01 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, playboyi_303,playboyi, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.03 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, playboyi_302,playboyi, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.02 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, playboyi_300,playboyi, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, playboyi_203,playboyi, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (2.03 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, playboyl, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (5.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, playboyl_401,playboyl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (4.01 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, playboyl_303,playboyl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.03 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, playboyl_302,playboyl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.02 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, playboyl_300,playboyl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (3.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, playboyl_203,playboyl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Playboy (2.03 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, rctycn, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02)", MACHINE_IS_PINBALL)
-GAME(2002, rctycn_701, rctycn, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01)", MACHINE_IS_PINBALL)
-GAME(2002, rctycn_600, rctycn, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00)", MACHINE_IS_PINBALL)
-GAME(2002, rctycn_400, rctycn, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00)", MACHINE_IS_PINBALL)
-GAME(2002, rctnew, rctycn, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2002, rctycng, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, rctycng_701,rctycng, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, rctycng_400,rctycng, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnf, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 France)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnf_701,rctycnf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 France)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnf_600,rctycnf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00 France)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnf_400,rctycnf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 France)", MACHINE_IS_PINBALL)
-GAME(2002, rctycni, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, rctycni_701,rctycni, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, rctycni_600,rctycni, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, rctycni_400,rctycni, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnl, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnl_701,rctycnl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnl_600,rctycnl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2002, rctycnl_400,rctycnl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2000, shrkysht, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.11)", MACHINE_IS_PINBALL)
-GAME(2000, shrky_207, shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.07)", MACHINE_IS_PINBALL)
-GAME(2001, shrknew, shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2001, shrkygr, shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.11 Germany)", MACHINE_IS_PINBALL)
-GAME(2001, shrkygr_207,shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.07 Germany)", MACHINE_IS_PINBALL)
-GAME(2001, shrkyfr, shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.11 France)", MACHINE_IS_PINBALL)
-GAME(2001, shrkyfr_207,shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.07 France)", MACHINE_IS_PINBALL)
-GAME(2001, shrkyit, shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.11 Italy)", MACHINE_IS_PINBALL)
-GAME(2001, shrkyit_207,shrkysht, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Sharkey's Shootout (2.07 Italy)", MACHINE_IS_PINBALL)
-GAME(1999, sprk_103, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "South Park (1.03)", MACHINE_IS_PINBALL)
-GAME(1999, sprk_096, sprk_103, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "South Park (0.96)", MACHINE_IS_PINBALL)
-GAME(1999, sprk_090, sprk_103, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "South Park (0.90)", MACHINE_IS_PINBALL)
-GAME(1997, spacejam, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Space Jam (3.00)", MACHINE_IS_PINBALL)
-GAME(1997, spacejam_200,spacejam, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Space Jam (2.00)", MACHINE_IS_PINBALL)
-GAME(1997, spacejmg, spacejam, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Space Jam (3.00 Germany)", MACHINE_IS_PINBALL)
-GAME(1997, spacejmf, spacejam, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Space Jam (3.00 France)", MACHINE_IS_PINBALL)
-GAME(1997, spacejmi, spacejam, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Space Jam (3.00 Italy)", MACHINE_IS_PINBALL)
-GAME(1997, swtril43, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Star Wars Trilogy (4.03)", MACHINE_IS_PINBALL)
-GAME(1997, swtril41, swtril43, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Star Wars Trilogy (4.01)", MACHINE_IS_PINBALL)
-GAME(1997, startrp, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Starship Troopers (2.01)", MACHINE_IS_PINBALL)
-GAME(1997, startrp2, startrp, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Starship Troopers (2.00)", MACHINE_IS_PINBALL)
-GAME(1999, strikext, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (1.02)", MACHINE_IS_PINBALL)
-GAME(1999, strknew, strikext, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(1999, strxt_uk, strikext, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (UK)", MACHINE_IS_PINBALL)
-GAME(1999, strxt_gr, strikext, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (Germany)", MACHINE_IS_PINBALL)
-GAME(1999, strxt_fr, strikext, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (France)", MACHINE_IS_PINBALL)
-GAME(1999, strxt_it, strikext, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (Italy)", MACHINE_IS_PINBALL)
-GAME(1999, strxt_sp, strikext, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Striker Xtreme (Spain)", MACHINE_IS_PINBALL)
-GAME(2003, term3, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00)", MACHINE_IS_PINBALL)
-GAME(2003, term3_301, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01)", MACHINE_IS_PINBALL)
-GAME(2003, term3_205, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05)", MACHINE_IS_PINBALL)
-GAME(2003, t3new, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2003, term3g, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2003, term3g_301, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 Germany)", MACHINE_IS_PINBALL)
-GAME(2003, term3l, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, term3l_301, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, term3l_205, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, term3f, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 France)", MACHINE_IS_PINBALL)
-GAME(2003, term3f_301, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 France)", MACHINE_IS_PINBALL)
-GAME(2003, term3f_205, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05 France)", MACHINE_IS_PINBALL)
-GAME(2003, term3i, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2003, term3i_301, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 Italy)", MACHINE_IS_PINBALL)
-GAME(2003, term3i_205, term3, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05 Italy)", MACHINE_IS_PINBALL)
-GAME(1997, jplstw22, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "The Lost World: Jurassic Park (2.02)", MACHINE_IS_PINBALL)
-GAME(1997, jplstw20, jplstw22, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "The Lost World: Jurassic Park (2.00)", MACHINE_IS_PINBALL)
-GAME(2003, simpprty, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00)", MACHINE_IS_PINBALL)
-GAME(2003, simpprty_400,simpprty, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00)", MACHINE_IS_PINBALL)
-GAME(2003, simpprty_300,simpprty, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00)", MACHINE_IS_PINBALL)
-GAME(2003, simpprty_204,simpprty, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04)", MACHINE_IS_PINBALL)
-GAME(2003, simpnew, simpprty, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (ARM7 Sound Board)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtg, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtg_400,simpprtg, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 Germany)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtl, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtl_400,simpprtl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtl_300,simpprtl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtl_204,simpprtl, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04 Spain)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtf, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 France)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtf_400,simpprtf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 France)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtf_300,simpprtf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00 France)", MACHINE_IS_PINBALL)
-GAME(2003, simpprtf_204,simpprtf, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04 France)", MACHINE_IS_PINBALL)
-GAME(2003, simpprti, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2003, simpprti_400,simpprti, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2003, simpprti_300,simpprti, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00 Italy)", MACHINE_IS_PINBALL)
-GAME(2003, simpprti_204,simpprti, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04 Italy)", MACHINE_IS_PINBALL)
-GAME(1997, xfilesp, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "X-Files (3.03)", MACHINE_IS_PINBALL)
-GAME(1997, xfilespf, xfilesp, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "X-Files (3.03 France)", MACHINE_IS_PINBALL)
-GAME(1997, xfiles2, xfilesp, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "X-Files (2.04)", MACHINE_IS_PINBALL)
-GAME(1997, xfiles20, xfilesp, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "X-Files (2.00)", MACHINE_IS_PINBALL)
-GAME(1996, twst_405, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Twister (4.05)", MACHINE_IS_PINBALL)
-GAME(1996, twst_404, twst_405, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Twister (4.04)", MACHINE_IS_PINBALL)
-GAME(1996, twst_300, twst_405, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Twister (3.00)", MACHINE_IS_PINBALL)
-GAME(1998, viprsega, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Viper Night Drivin' (2.01)", MACHINE_IS_PINBALL)
-GAME(1998, viprsega_102,viprsega, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Viper Night Drivin' (1.02)", MACHINE_IS_PINBALL)
-GAME(1998, ctchzdlx, ctcheese, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Cut The Cheese Deluxe (Redemption)", MACHINE_IS_PINBALL)
-GAME(1998, titanic, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Titanic (Coin dropper)", MACHINE_IS_PINBALL)
-GAME(2002, monopred, 0, whitestar, whitestar, driver_device, 0, ROT0, "Stern", "Monopoly (Coin dropper)", MACHINE_IS_PINBALL)
-GAME(1998, wackadoo, 0, whitestar, whitestar, driver_device, 0, ROT0, "Sega", "Wack-A-Doodle-Doo (Redemption)", MACHINE_IS_PINBALL)
+GAME(1995, apollo13, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Apollo 13 (5.01)", MACHINE_IS_PINBALL)
+GAME(1995, apollo13_d4, apollo13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Apollo 13 (5.01, Display 4.01)", MACHINE_IS_PINBALL)
+GAME(1995, apollo13_20, apollo13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Apollo 13 (2.03)", MACHINE_IS_PINBALL)
+GAME(1995, apollo13_10, apollo13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Apollo 13 (1.00)", MACHINE_IS_PINBALL)
+GAME(2001, austin, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (3.02)", MACHINE_IS_PINBALL)
+GAME(2001, aust301, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (3.01)", MACHINE_IS_PINBALL)
+GAME(2001, aust300, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (3.00)", MACHINE_IS_PINBALL)
+GAME(2001, aust201, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (2.01)", MACHINE_IS_PINBALL)
+GAME(2001, austnew, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2001, austinf, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (France)", MACHINE_IS_PINBALL)
+GAME(2001, austing, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (Germany)", MACHINE_IS_PINBALL)
+GAME(2001, austini, austin, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Austin Powers (Italy)", MACHINE_IS_PINBALL)
+GAME(1998, godzillp, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Godzilla (Pinball, 2.05)", MACHINE_IS_PINBALL)
+GAME(1998, godzillp_100, godzillp, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Godzilla (Pinball, 1.00)", MACHINE_IS_PINBALL)
+GAME(1998, godzillp_090, godzillp, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Godzilla (Pinball, 0.90)", MACHINE_IS_PINBALL)
+GAME(1996, gldneye, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Goldeneye", MACHINE_IS_PINBALL)
+GAME(1998, goldcue, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Golden Cue", MACHINE_IS_PINBALL)
+GAME(1999, harl_a13, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03)", MACHINE_IS_PINBALL)
+GAME(1999, harl_u13, harl_a13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03 UK)", MACHINE_IS_PINBALL)
+GAME(1999, harl_a10, harl_a13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03 Display rev. 1.00)", MACHINE_IS_PINBALL)
+GAME(1999, harl_f13, harl_a13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03 France)", MACHINE_IS_PINBALL)
+GAME(1999, harl_g13, harl_a13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03 Germany)", MACHINE_IS_PINBALL)
+GAME(1999, harl_i13, harl_a13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03 Italy)", MACHINE_IS_PINBALL)
+GAME(1999, harl_l13, harl_a13, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Harley Davidson (1.03 Spain)", MACHINE_IS_PINBALL)
+GAME(2004, harl_a40, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (4.00)", MACHINE_IS_PINBALL)
+GAME(2004, harl_f40, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (4.00 France)", MACHINE_IS_PINBALL)
+GAME(2004, harl_g40, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (4.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2004, harl_i40, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (4.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2004, harl_l40, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (4.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2004, harl_a30, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (3.00)", MACHINE_IS_PINBALL)
+GAME(2004, harl_f30, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (3.00 France)", MACHINE_IS_PINBALL)
+GAME(2004, harl_g30, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (3.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2004, harl_i30, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (3.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2004, harl_l30, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (3.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, harl_a18, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (1.08)", MACHINE_IS_PINBALL)
+GAME(2003, harl_f18, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (1.08 France)", MACHINE_IS_PINBALL)
+GAME(2003, harl_g18, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (1.08 Germany)", MACHINE_IS_PINBALL)
+GAME(2003, harl_i18, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (1.08 Italy)", MACHINE_IS_PINBALL)
+GAME(2003, harl_l18, harl_a40, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Harley Davidson (1.08 Spain)", MACHINE_IS_PINBALL)
+GAME(2001, hirolcas, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (3.00)", MACHINE_IS_PINBALL)
+GAME(2001, hironew, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2001, hirolcat, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (3.00) TEST", MACHINE_IS_PINBALL)
+GAME(2001, hirolcas_210, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (2.10)", MACHINE_IS_PINBALL)
+GAME(2001, hirol_fr, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (3.00 France)", MACHINE_IS_PINBALL)
+GAME(2001, hirol_gr, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (3.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2001, hirol_gr_210, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (2.10 Germany)", MACHINE_IS_PINBALL)
+GAME(2001, hirol_it, hirolcas, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "High Roller Casino (3.00 Italy)", MACHINE_IS_PINBALL)
+GAME(1996, id4, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Independence Day (v2.02)", MACHINE_IS_PINBALL)
+GAME(1996, id4f, id4, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Independence Day (v2.02 France)", MACHINE_IS_PINBALL)
+GAME(1996, id4_201, id4, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Independence Day (v2.01)", MACHINE_IS_PINBALL)
+GAME(1996, id4f_201, id4, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Independence Day (v2.01 France)", MACHINE_IS_PINBALL)
+GAME(1998, lostspc, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Lost in Space (1.01)", MACHINE_IS_PINBALL)
+GAME(1998, lostspcf, lostspc, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Lost in Space (1.01 France)", MACHINE_IS_PINBALL)
+GAME(1998, lostspcg, lostspc, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Lost in Space (1.01 Germany)", MACHINE_IS_PINBALL)
+GAME(1998, lostspc_d1, lostspc, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Lost in Space (1.01, Display 1.01)", MACHINE_IS_PINBALL)
+GAME(2001, monopolp, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (3.20)", MACHINE_IS_PINBALL)
+GAME(2002, monop303, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (3.03)", MACHINE_IS_PINBALL)
+GAME(2002, monop301, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (3.01)", MACHINE_IS_PINBALL)
+GAME(2002, monop251, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (2.51)", MACHINE_IS_PINBALL)
+GAME(2002, monop233, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (2.33)", MACHINE_IS_PINBALL)
+GAME(2002, monopolf, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (France)", MACHINE_IS_PINBALL)
+GAME(2002, monopolg, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (Germany)", MACHINE_IS_PINBALL)
+GAME(2002, monopoli, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (Italy)", MACHINE_IS_PINBALL)
+GAME(2002, monopoll, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (Spain)", MACHINE_IS_PINBALL)
+GAME(2002, mononew, monopolp, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2001, nfl, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "NFL", MACHINE_IS_PINBALL)
+GAME(2002, playboys, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (5.00)", MACHINE_IS_PINBALL)
+GAME(2002, playboys_401, playboys, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (4.01)", MACHINE_IS_PINBALL)
+GAME(2002, playboys_303, playboys, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.03)", MACHINE_IS_PINBALL)
+GAME(2002, playboys_302, playboys, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.02)", MACHINE_IS_PINBALL)
+GAME(2002, playboys_300, playboys, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.00)", MACHINE_IS_PINBALL)
+GAME(2002, playboys_203, playboys, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (2.03)", MACHINE_IS_PINBALL)
+GAME(2002, playnew, playboys, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2002, playboyf, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (5.00 France)", MACHINE_IS_PINBALL)
+GAME(2002, playboyf_401, playboyf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (4.01 France)", MACHINE_IS_PINBALL)
+GAME(2002, playboyf_303, playboyf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.03 France)", MACHINE_IS_PINBALL)
+GAME(2002, playboyf_302, playboyf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.02 France)", MACHINE_IS_PINBALL)
+GAME(2002, playboyf_300, playboyf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.00 France)", MACHINE_IS_PINBALL)
+GAME(2002, playboyf_203, playboyf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (2.03 France)", MACHINE_IS_PINBALL)
+GAME(2002, playboyg, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (5.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, playboyg_401, playboyg, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (4.01 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, playboyg_303, playboyg, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.03 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, playboyg_302, playboyg, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.02 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, playboyg_300, playboyg, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, playboyg_203, playboyg, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (2.03 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, playboyi, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (5.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, playboyi_401, playboyi, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (4.01 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, playboyi_303, playboyi, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.03 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, playboyi_302, playboyi, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.02 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, playboyi_300, playboyi, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, playboyi_203, playboyi, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (2.03 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, playboyl, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (5.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, playboyl_401, playboyl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (4.01 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, playboyl_303, playboyl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.03 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, playboyl_302, playboyl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.02 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, playboyl_300, playboyl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (3.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, playboyl_203, playboyl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Playboy (2.03 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, rctycn, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02)", MACHINE_IS_PINBALL)
+GAME(2002, rctycn_701, rctycn, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01)", MACHINE_IS_PINBALL)
+GAME(2002, rctycn_600, rctycn, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00)", MACHINE_IS_PINBALL)
+GAME(2002, rctycn_400, rctycn, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00)", MACHINE_IS_PINBALL)
+GAME(2002, rctnew, rctycn, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2002, rctycng, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, rctycng_701, rctycng, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, rctycng_400, rctycng, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnf, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 France)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnf_701, rctycnf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 France)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnf_600, rctycnf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00 France)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnf_400, rctycnf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 France)", MACHINE_IS_PINBALL)
+GAME(2002, rctycni, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, rctycni_701, rctycni, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, rctycni_600, rctycni, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, rctycni_400, rctycni, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnl, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.02 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnl_701, rctycnl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (7.01 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnl_600, rctycnl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (6.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2002, rctycnl_400, rctycnl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Roller Coaster Tycoon (4.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2000, shrkysht, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.11)", MACHINE_IS_PINBALL)
+GAME(2000, shrky_207, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.07)", MACHINE_IS_PINBALL)
+GAME(2001, shrknew, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2001, shrkygr, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.11 Germany)", MACHINE_IS_PINBALL)
+GAME(2001, shrkygr_207, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.07 Germany)", MACHINE_IS_PINBALL)
+GAME(2001, shrkyfr, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.11 France)", MACHINE_IS_PINBALL)
+GAME(2001, shrkyfr_207, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.07 France)", MACHINE_IS_PINBALL)
+GAME(2001, shrkyit, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.11 Italy)", MACHINE_IS_PINBALL)
+GAME(2001, shrkyit_207, shrkysht, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Sharkey's Shootout (2.07 Italy)", MACHINE_IS_PINBALL)
+GAME(1999, sprk_103, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "South Park (1.03)", MACHINE_IS_PINBALL)
+GAME(1999, sprk_096, sprk_103, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "South Park (0.96)", MACHINE_IS_PINBALL)
+GAME(1999, sprk_090, sprk_103, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "South Park (0.90)", MACHINE_IS_PINBALL)
+GAME(1997, spacejam, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Space Jam (3.00)", MACHINE_IS_PINBALL)
+GAME(1997, spacejam_200 ,spacejam, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Space Jam (2.00)", MACHINE_IS_PINBALL)
+GAME(1997, spacejmg, spacejam, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Space Jam (3.00 Germany)", MACHINE_IS_PINBALL)
+GAME(1997, spacejmf, spacejam, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Space Jam (3.00 France)", MACHINE_IS_PINBALL)
+GAME(1997, spacejmi, spacejam, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Space Jam (3.00 Italy)", MACHINE_IS_PINBALL)
+GAME(1997, swtril43, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Star Wars Trilogy (4.03)", MACHINE_IS_PINBALL)
+GAME(1997, swtril41, swtril43, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Star Wars Trilogy (4.01)", MACHINE_IS_PINBALL)
+GAME(1997, startrp, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Starship Troopers (2.01)", MACHINE_IS_PINBALL)
+GAME(1997, startrp2, startrp, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Starship Troopers (2.00)", MACHINE_IS_PINBALL)
+GAME(1999, strikext, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (1.02)", MACHINE_IS_PINBALL)
+GAME(1999, strknew, strikext, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(1999, strxt_uk, strikext, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (UK)", MACHINE_IS_PINBALL)
+GAME(1999, strxt_gr, strikext, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (Germany)", MACHINE_IS_PINBALL)
+GAME(1999, strxt_fr, strikext, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (France)", MACHINE_IS_PINBALL)
+GAME(1999, strxt_it, strikext, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (Italy)", MACHINE_IS_PINBALL)
+GAME(1999, strxt_sp, strikext, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Striker Xtreme (Spain)", MACHINE_IS_PINBALL)
+GAME(2003, term3, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00)", MACHINE_IS_PINBALL)
+GAME(2003, term3_301, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01)", MACHINE_IS_PINBALL)
+GAME(2003, term3_205, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05)", MACHINE_IS_PINBALL)
+GAME(2003, t3new, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2003, term3g, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2003, term3g_301, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 Germany)", MACHINE_IS_PINBALL)
+GAME(2003, term3l, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, term3l_301, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, term3l_205, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, term3f, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 France)", MACHINE_IS_PINBALL)
+GAME(2003, term3f_301, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 France)", MACHINE_IS_PINBALL)
+GAME(2003, term3f_205, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05 France)", MACHINE_IS_PINBALL)
+GAME(2003, term3i, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (4.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2003, term3i_301, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (3.01 Italy)", MACHINE_IS_PINBALL)
+GAME(2003, term3i_205, term3, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Terminator 3: Rise of the Machines (2.05 Italy)", MACHINE_IS_PINBALL)
+GAME(1997, jplstw22, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "The Lost World: Jurassic Park (2.02)", MACHINE_IS_PINBALL)
+GAME(1997, jplstw20, jplstw22, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "The Lost World: Jurassic Park (2.00)", MACHINE_IS_PINBALL)
+GAME(2003, simpprty, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00)", MACHINE_IS_PINBALL)
+GAME(2003, simpprty_400, simpprty, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00)", MACHINE_IS_PINBALL)
+GAME(2003, simpprty_300, simpprty, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00)", MACHINE_IS_PINBALL)
+GAME(2003, simpprty_204, simpprty, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04)", MACHINE_IS_PINBALL)
+GAME(2003, simpnew, simpprty, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (ARM7 Sound Board)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtg, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtg_400, simpprtg, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 Germany)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtl, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtl_400, simpprtl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtl_300, simpprtl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtl_204, simpprtl, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04 Spain)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtf, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 France)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtf_400, simpprtf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 France)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtf_300, simpprtf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00 France)", MACHINE_IS_PINBALL)
+GAME(2003, simpprtf_204, simpprtf, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04 France)", MACHINE_IS_PINBALL)
+GAME(2003, simpprti, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (5.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2003, simpprti_400, simpprti, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (4.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2003, simpprti_300, simpprti, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (3.00 Italy)", MACHINE_IS_PINBALL)
+GAME(2003, simpprti_204, simpprti, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "The Simpsons Pinball Party (2.04 Italy)", MACHINE_IS_PINBALL)
+GAME(1997, xfilesp, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "X-Files (3.03)", MACHINE_IS_PINBALL)
+GAME(1997, xfilespf, xfilesp, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "X-Files (3.03 France)", MACHINE_IS_PINBALL)
+GAME(1997, xfiles2, xfilesp, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "X-Files (2.04)", MACHINE_IS_PINBALL)
+GAME(1997, xfiles20, xfilesp, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "X-Files (2.00)", MACHINE_IS_PINBALL)
+GAME(1996, twst_405, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Twister (4.05)", MACHINE_IS_PINBALL)
+GAME(1996, twst_404, twst_405, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Twister (4.04)", MACHINE_IS_PINBALL)
+GAME(1996, twst_300, twst_405, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Twister (3.00)", MACHINE_IS_PINBALL)
+GAME(1998, viprsega, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Viper Night Drivin' (2.01)", MACHINE_IS_PINBALL)
+GAME(1998, viprsega_102, viprsega, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Viper Night Drivin' (1.02)", MACHINE_IS_PINBALL)
+GAME(1998, ctchzdlx, ctcheese, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Cut The Cheese Deluxe (Redemption)", MACHINE_IS_PINBALL)
+GAME(1998, titanic, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Titanic (Coin dropper)", MACHINE_IS_PINBALL)
+GAME(2002, monopred, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Stern", "Monopoly (Coin dropper)", MACHINE_IS_PINBALL)
+GAME(1998, wackadoo, 0, whitestar, whitestar, whitestar_state, 0, ROT0, "Sega", "Wack-A-Doodle-Doo (Redemption)", MACHINE_IS_PINBALL)
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index fbcc8a97a01..0eabbc0756e 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -121,7 +121,7 @@ public:
required_device<x2210_device> m_videosram;
required_device<palette_device> m_palette;
required_memory_region m_chargen;
- required_device<fd1795_t> m_fdc;
+ required_device<fd1795_device> m_fdc;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -763,7 +763,7 @@ I8275_DRAW_CHARACTER_MEMBER(wicat_state::wicat_display_pixels)
}
}
-static MACHINE_CONFIG_START( wicat, wicat_state )
+static MACHINE_CONFIG_START( wicat )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_8MHz)
MCFG_CPU_PROGRAM_MAP(wicat_mem)
@@ -1001,5 +1001,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, wicat, 0, 0, wicat, wicat, driver_device, 0, "Millennium Systems", "Wicat System 150", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1982, wicat, 0, 0, wicat, wicat, wicat_state, 0, "Millennium Systems", "Wicat System 150", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp
index dfb546fe6ba..ad15cdbf6bf 100644
--- a/src/mame/drivers/wico.cpp
+++ b/src/mame/drivers/wico.cpp
@@ -427,7 +427,7 @@ void wico_state::machine_reset()
}
-static MACHINE_CONFIG_START( wico, wico_state )
+static MACHINE_CONFIG_START( wico )
/* basic machine hardware */
MCFG_CPU_ADD("ccpu", M6809, 10000000 / 8)
MCFG_CPU_PROGRAM_MAP(ccpu_map)
@@ -463,4 +463,4 @@ ROM_END
/ Big Top (1977)
/-------------------------------------------------------------------*/
-GAME(1984, aftor, 0, wico, wico, driver_device, 0, ROT0, "Wico", "Af-Tor", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME(1984, aftor, 0, wico, wico, wico_state, 0, ROT0, "Wico", "Af-Tor", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp
index 5218248e5e2..8b5d2e4073a 100644
--- a/src/mame/drivers/wildpkr.cpp
+++ b/src/mame/drivers/wildpkr.cpp
@@ -440,7 +440,7 @@ ADDRESS_MAP_END
* Machine Drivers *
*************************/
-static MACHINE_CONFIG_START( wildpkr, wildpkr_state )
+static MACHINE_CONFIG_START( wildpkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, MAIN_CLOCK)
@@ -471,7 +471,7 @@ static MACHINE_CONFIG_START( wildpkr, wildpkr_state )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( tabpkr, wildpkr_state )
+static MACHINE_CONFIG_START( tabpkr )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_24MHz / 2)
@@ -579,6 +579,6 @@ DRIVER_INIT_MEMBER(wildpkr_state,wildpkr)
* Game Drivers *
*************************/
-/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS
GAME( 199?, wildpkr, 0, wildpkr, wildpkr, wildpkr_state, wildpkr, ROT0, "TAB Austria", "Wild Poker (ver. D 1.01)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
-GAME( 1996, tabpkr, 0, tabpkr, tabpkr, wildpkr_state, wildpkr, ROT0, "TAB Austria", "Royal Poker V 1.85", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
+GAME( 1996, tabpkr, 0, tabpkr, tabpkr, wildpkr_state, wildpkr, ROT0, "TAB Austria", "Royal Poker V 1.85", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION )
diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp
index 894a5e52447..d2c34b85034 100644
--- a/src/mame/drivers/williams.cpp
+++ b/src/mame/drivers/williams.cpp
@@ -1436,7 +1436,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( williams, williams_state )
+static MACHINE_CONFIG_START( williams )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
@@ -1594,7 +1594,7 @@ static MACHINE_CONFIG_DERIVED( playball, williams )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( blastkit, williams, blaster_state )
+static MACHINE_CONFIG_DERIVED( blastkit, williams )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -1650,7 +1650,7 @@ static MACHINE_CONFIG_DERIVED( blaster, blastkit )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( williams2, williams2_state )
+static MACHINE_CONFIG_START( williams2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
@@ -1752,7 +1752,7 @@ static MACHINE_CONFIG_DERIVED( tshoot, williams2 )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( joust2, williams2, joust2_state )
+static MACHINE_CONFIG_DERIVED( joust2, williams2 )
/* basic machine hardware */
MCFG_CPU_MODIFY("maincpu")
@@ -3188,15 +3188,15 @@ GAME( 1980, defcmnd, defender, defender, defender, williams_state, defe
GAME( 1981, defence, defender, defender, defender, williams_state, defender, ROT0, "bootleg (Outer Limits)", "Defence Command (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
GAME( 1981, startrkd, defender, defender, defender, williams_state, defender, ROT0, "bootleg", "Star Trek (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, mayday, 0, defender, mayday, williams_state, mayday, ROT0, "Hoei", "Mayday (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // \ original by Hoei, which one of these 3 sets is bootleg/licensed/original is unknown
-GAME( 1980, maydaya, mayday, defender, mayday, williams_state, mayday, ROT0, "Hoei", "Mayday (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // > these games have an unemulated protection chip of some sort which is hacked around in /machine/williams.cpp "mayday_protection_r" function
-GAME( 1980, maydayb, mayday, defender, mayday, williams_state, mayday, ROT0, "Hoei", "Mayday (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // /
-GAME( 1980, batlzone, mayday, defender, mayday, williams_state, mayday, ROT0, "bootleg (Video Game)", "Battle Zone (bootleg of Mayday)", MACHINE_SUPPORTS_SAVE )// the bootleg may or may not use the same protection chip, or some hack around it.
+GAME( 1980, mayday, 0, defender, mayday, williams_state, mayday, ROT0, "Hoei", "Mayday (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // \ original by Hoei, which one of these 3 sets is bootleg/licensed/original is unknown
+GAME( 1980, maydaya, mayday, defender, mayday, williams_state, mayday, ROT0, "Hoei", "Mayday (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // > these games have an unemulated protection chip of some sort which is hacked around in /machine/williams.cpp "mayday_protection_r" function
+GAME( 1980, maydayb, mayday, defender, mayday, williams_state, mayday, ROT0, "Hoei", "Mayday (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // /
+GAME( 1980, batlzone, mayday, defender, mayday, williams_state, mayday, ROT0, "bootleg (Video Game)", "Battle Zone (bootleg of Mayday)", MACHINE_SUPPORTS_SAVE )// the bootleg may or may not use the same protection chip, or some hack around it.
-GAME( 1981, colony7, 0, defender, colony7, williams_state, defender, ROT270, "Taito", "Colony 7 (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, colony7a, colony7, defender, colony7, williams_state, defender, ROT270, "Taito", "Colony 7 (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, colony7, 0, defender, colony7, williams_state, defender, ROT270, "Taito", "Colony 7 (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, colony7a, colony7, defender, colony7, williams_state, defender, ROT270, "Taito", "Colony 7 (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, jin, 0, jin, jin, williams_state, defender, ROT90, "Falcon", "Jin", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, jin, 0, jin, jin, williams_state, defender, ROT90, "Falcon", "Jin", MACHINE_SUPPORTS_SAVE )
@@ -3210,15 +3210,15 @@ GAME( 1987, robotron87, robotron, williams, robotron, williams_state, robo
GAME( 2012, robotron12, robotron, williams, robotron, williams_state, robotron, ROT0, "hack", "Robotron: 2084 (2012 'wave 201 start' hack)", MACHINE_SUPPORTS_SAVE ) // includes sitc bug fix, used for competitive play.
GAME( 2015, robotrontd, robotron, williams, robotron, williams_state, robotron, ROT0, "hack", "Robotron: 2084 (2015 'tie-die V2' hack)", MACHINE_SUPPORTS_SAVE ) // inc. sitc fix, mods by some of the original developers, see backstory here http://www.robotron2084guidebook.com/gameplay/raceto100million/robo2k14_tie-die-romset/ (I guess there's a tie-die V1 before it was released to the public?)
-GAME( 1982, joust, 0, williams_muxed, joust, williams_state, joust, ROT0, "Williams", "Joust (White/Green label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, joustr, joust, williams_muxed, joust, williams_state, joust, ROT0, "Williams", "Joust (Solid Red label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, joustwr, joust, williams_muxed, joust, williams_state, joust, ROT0, "Williams", "Joust (White/Red label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, joust, 0, williams_muxed, joust, williams_state, joust, ROT0, "Williams", "Joust (White/Green label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, joustr, joust, williams_muxed, joust, williams_state, joust, ROT0, "Williams", "Joust (Solid Red label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, joustwr, joust, williams_muxed, joust, williams_state, joust, ROT0, "Williams", "Joust (White/Red label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bubbles, 0, williams, bubbles, williams_state, bubbles, ROT0, "Williams", "Bubbles", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bubblesr, bubbles, williams, bubbles, williams_state, bubbles, ROT0, "Williams", "Bubbles (Solid Red label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bubblesp, bubbles, williams, bubbles, williams_state, bubbles, ROT0, "Williams", "Bubbles (prototype version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bubbles, 0, williams, bubbles, williams_state, bubbles, ROT0, "Williams", "Bubbles", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bubblesr, bubbles, williams, bubbles, williams_state, bubbles, ROT0, "Williams", "Bubbles (Solid Red label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bubblesp, bubbles, williams, bubbles, williams_state, bubbles, ROT0, "Williams", "Bubbles (prototype version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, splat, 0, williams_muxed, splat, williams_state, splat, ROT0, "Williams", "Splat!", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, splat, 0, williams_muxed, splat, williams_state, splat, ROT0, "Williams", "Splat!", MACHINE_SUPPORTS_SAVE )
GAME( 1982, sinistar, 0, sinistar, sinistar, williams_state, sinistar, ROT270, "Williams", "Sinistar (revision 3)", MACHINE_SUPPORTS_SAVE )
GAME( 1982, sinistar1, sinistar, sinistar, sinistar, williams_state, sinistar, ROT270, "Williams", "Sinistar (prototype version)", MACHINE_SUPPORTS_SAVE )
@@ -3226,14 +3226,14 @@ GAME( 1982, sinistar2, sinistar, sinistar, sinistar, williams_state, sini
GAME( 1983, playball, 0, playball, playball, williams_state, playball, ROT270, "Williams", "PlayBall! (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, blaster, 0, blaster, blaster, blaster_state, blaster, ROT0, "Williams / Vid Kidz", "Blaster", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, blastero, blaster, blaster, blaster, blaster_state, blaster, ROT0, "Williams / Vid Kidz", "Blaster (location test)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, blaster, 0, blaster, blaster, blaster_state, blaster, ROT0, "Williams / Vid Kidz", "Blaster", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, blastero, blaster, blaster, blaster, blaster_state, blaster, ROT0, "Williams / Vid Kidz", "Blaster (location test)", MACHINE_SUPPORTS_SAVE )
GAME( 1983, blasterkit, blaster, blastkit, blastkit, blaster_state, blaster, ROT0, "Williams / Vid Kidz", "Blaster (conversion kit)", MACHINE_SUPPORTS_SAVE ) // mono sound
-GAME( 1985, spdball, 0, spdball, spdball, williams_state, spdball, ROT0, "Williams", "Speed Ball - Contest at Neonworld (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, spdball, 0, spdball, spdball, williams_state, spdball, ROT0, "Williams", "Speed Ball - Contest at Neonworld (prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, alienar, 0, williams_muxed, alienar, williams_state, alienar, ROT0, "Duncan Brown", "Alien Arena", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, alienaru, alienar, williams_muxed, alienar, williams_state, alienaru, ROT0, "Duncan Brown", "Alien Arena (Stargate upgrade)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, alienar, 0, williams_muxed, alienar, williams_state, alienar, ROT0, "Duncan Brown", "Alien Arena", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, alienaru, alienar, williams_muxed, alienar, williams_state, alienaru, ROT0, "Duncan Brown", "Alien Arena (Stargate upgrade)", MACHINE_SUPPORTS_SAVE )
GAME( 1987, lottofun, 0, lottofun, lottofun, williams_state, lottofun, ROT0, "H.A.R. Management", "Lotto Fun", MACHINE_SUPPORTS_SAVE )
@@ -3243,9 +3243,9 @@ GAME( 1987, lottofun, 0, lottofun, lottofun, williams_state, lott
GAME( 1983, mysticm, 0, mysticm, mysticm, williams2_state, mysticm, ROT0, "Williams", "Mystic Marathon", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE)
GAME( 1983, mysticmp, mysticm, mysticm, mysticm, williams2_state, mysticm, ROT0, "Williams", "Mystic Marathon (prototype)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // newest roms are 'proto 6' ?
-GAME( 1984, tshoot, 0, tshoot, tshoot, williams2_state, tshoot, ROT0, "Williams", "Turkey Shoot (prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, tshoot, 0, tshoot, tshoot, williams2_state, tshoot, ROT0, "Williams", "Turkey Shoot (prototype)", MACHINE_SUPPORTS_SAVE )
GAME( 1984, inferno, 0, williams2, inferno, williams2_state, inferno, ROT0, "Williams", "Inferno (Williams)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, joust2, 0, joust2, joust2, joust2_state, joust2, ROT270, "Williams", "Joust 2 - Survival of the Fittest (revision 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, joust2r1, joust2, joust2, joust2, joust2_state, joust2, ROT270, "Williams", "Joust 2 - Survival of the Fittest (revision 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, joust2, 0, joust2, joust2, joust2_state, joust2, ROT270, "Williams", "Joust 2 - Survival of the Fittest (revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, joust2r1, joust2, joust2, joust2, joust2_state, joust2, ROT270, "Williams", "Joust 2 - Survival of the Fittest (revision 1)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp
index 3a9340da411..6ea8c59db63 100644
--- a/src/mame/drivers/wink.cpp
+++ b/src/mame/drivers/wink.cpp
@@ -354,7 +354,7 @@ void wink_state::machine_reset()
m_sound_flag = 0;
}
-static MACHINE_CONFIG_START( wink, wink_state )
+static MACHINE_CONFIG_START( wink )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 12000000 / 4)
MCFG_CPU_PROGRAM_MAP(wink_map)
diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp
index 3ea4b14ff93..5f79e91e739 100644
--- a/src/mame/drivers/wiping.cpp
+++ b/src/mame/drivers/wiping.cpp
@@ -289,7 +289,7 @@ INTERRUPT_GEN_MEMBER(wiping_state::sound_timer_irq)
-static MACHINE_CONFIG_START( wiping, wiping_state )
+static MACHINE_CONFIG_START( wiping )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,18432000/6) /* 3.072 MHz */
@@ -391,5 +391,5 @@ ROM_END
-GAME( 1982, wiping, 0, wiping, wiping, driver_device, 0, ROT90, "Nichibutsu", "Wiping", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, rugrats, wiping, wiping, rugrats, driver_device, 0, ROT90, "Nichibutsu", "Rug Rats", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, wiping, 0, wiping, wiping, wiping_state, 0, ROT90, "Nichibutsu", "Wiping", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, rugrats, wiping, wiping, rugrats, wiping_state, 0, ROT90, "Nichibutsu", "Rug Rats", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp
index 4adc5f27bb4..c220eed5371 100644
--- a/src/mame/drivers/witch.cpp
+++ b/src/mame/drivers/witch.cpp
@@ -761,7 +761,7 @@ void witch_state::machine_reset()
m_motor_active = (ioport("YM_PortB")->read() & 0x08) ? 0 : 1;
}
-static MACHINE_CONFIG_START( witch, witch_state )
+static MACHINE_CONFIG_START( witch )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* 3 MHz */
MCFG_CPU_PROGRAM_MAP(map_main)
diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp
index e2892d43d29..3bfe462151d 100644
--- a/src/mame/drivers/wiz.cpp
+++ b/src/mame/drivers/wiz.cpp
@@ -784,7 +784,7 @@ INTERRUPT_GEN_MEMBER(wiz_state::wiz_sound_interrupt)
device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
-static MACHINE_CONFIG_START( kungfut, wiz_state )
+static MACHINE_CONFIG_START( kungfut )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, 18432000/6) /* 3.072 MHz ??? */
@@ -1161,12 +1161,12 @@ DRIVER_INIT_MEMBER(wiz_state,stinger)
}
-GAME( 1983, stinger, 0, stinger, stinger, wiz_state, stinger, ROT90, "Seibu Denshi", "Stinger", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, stinger2, stinger, stinger, stinger2, wiz_state, stinger, ROT90, "Seibu Denshi", "Stinger (prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, scion, 0, scion, scion, driver_device, 0, ROT0, "Seibu Denshi", "Scion", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, scionc, scion, scion, scion, driver_device, 0, ROT0, "Seibu Denshi (Cinematronics license)", "Scion (Cinematronics)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, kungfut, 0, kungfut, kungfut, driver_device, 0, ROT0, "Seibu Kaihatsu", "Kung-Fu Taikun (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_MICROPHONE )
-GAME( 1984, kungfuta, kungfut, kungfut, kungfut, driver_device, 0, ROT0, "Seibu Kaihatsu", "Kung-Fu Taikun (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_MICROPHONE ) /* board was a bootleg but set might still be original */
-GAME( 1985, wiz, 0, wiz, wiz, driver_device, 0, ROT270, "Seibu Kaihatsu", "Wiz", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, wizt, wiz, wiz, wiz, driver_device, 0, ROT270, "Seibu Kaihatsu (Taito license)", "Wiz (Taito, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, wizta, wiz, wiz, wiz, driver_device, 0, ROT270, "Seibu Kaihatsu (Taito license)", "Wiz (Taito, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, stinger, 0, stinger, stinger, wiz_state, stinger, ROT90, "Seibu Denshi", "Stinger", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, stinger2, stinger, stinger, stinger2, wiz_state, stinger, ROT90, "Seibu Denshi", "Stinger (prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, scion, 0, scion, scion, wiz_state, 0, ROT0, "Seibu Denshi", "Scion", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, scionc, scion, scion, scion, wiz_state, 0, ROT0, "Seibu Denshi (Cinematronics license)", "Scion (Cinematronics)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, kungfut, 0, kungfut, kungfut, wiz_state, 0, ROT0, "Seibu Kaihatsu", "Kung-Fu Taikun (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_MICROPHONE )
+GAME( 1984, kungfuta, kungfut, kungfut, kungfut, wiz_state, 0, ROT0, "Seibu Kaihatsu", "Kung-Fu Taikun (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_MICROPHONE ) /* board was a bootleg but set might still be original */
+GAME( 1985, wiz, 0, wiz, wiz, wiz_state, 0, ROT270, "Seibu Kaihatsu", "Wiz", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, wizt, wiz, wiz, wiz, wiz_state, 0, ROT270, "Seibu Kaihatsu (Taito license)", "Wiz (Taito, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, wizta, wiz, wiz, wiz, wiz_state, 0, ROT270, "Seibu Kaihatsu (Taito license)", "Wiz (Taito, set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp
index 48bc22c9521..b7ca9caa796 100644
--- a/src/mame/drivers/wmg.cpp
+++ b/src/mame/drivers/wmg.cpp
@@ -489,7 +489,7 @@ DRIVER_INIT_MEMBER( wmg_state, wmg )
* Machine Driver
*
*************************************/
-static MACHINE_CONFIG_START( wmg, wmg_state )
+static MACHINE_CONFIG_START( wmg )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp
index 01d9d085ce3..196d8b9f392 100644
--- a/src/mame/drivers/wms.cpp
+++ b/src/mame/drivers/wms.cpp
@@ -165,7 +165,7 @@ static GFXDECODE_START( wms )
GFXDECODE_END
-static MACHINE_CONFIG_START( wms, wms_state )
+static MACHINE_CONFIG_START( wms )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", I80188, MAIN_CLOCK ) // AMD N80C188-20, ( 40 MHz. internally divided by 2)
MCFG_CPU_PROGRAM_MAP(wms_map)
diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp
index 12e9b1afb54..d158671c222 100644
--- a/src/mame/drivers/wolfpack.cpp
+++ b/src/mame/drivers/wolfpack.cpp
@@ -304,7 +304,7 @@ static GFXDECODE_START( wolfpack )
GFXDECODE_END
-static MACHINE_CONFIG_START( wolfpack, wolfpack_state )
+static MACHINE_CONFIG_START( wolfpack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, 12096000 / 16)
@@ -363,4 +363,4 @@ ROM_START( wolfpack )
ROM_END
-GAME( 1978, wolfpack, 0, wolfpack, wolfpack, driver_device, 0, ORIENTATION_FLIP_Y, "Atari", "Wolf Pack (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1978, wolfpack, 0, wolfpack, wolfpack, wolfpack_state, 0, ORIENTATION_FLIP_Y, "Atari", "Wolf Pack (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp
index 6bc85f01c6d..8a64afddbbb 100644
--- a/src/mame/drivers/wpc_95.cpp
+++ b/src/mame/drivers/wpc_95.cpp
@@ -2243,7 +2243,7 @@ static INPUT_PORTS_START( ttt )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( wpc_95, wpc_95_state )
+static MACHINE_CONFIG_START( wpc_95 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_8MHz/4)
MCFG_CPU_PROGRAM_MAP(wpc_95_map)
diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp
index b0cdccad78b..226f887a25e 100644
--- a/src/mame/drivers/wpc_an.cpp
+++ b/src/mame/drivers/wpc_an.cpp
@@ -331,7 +331,7 @@ static MACHINE_CONFIG_FRAGMENT( wpc_an_base )
MCFG_DEFAULT_LAYOUT(layout_wpc_an)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wpc_an, wpc_an_state )
+static MACHINE_CONFIG_START( wpc_an )
MCFG_FRAGMENT_ADD(wpc_an_base)
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -341,7 +341,7 @@ static MACHINE_CONFIG_START( wpc_an, wpc_an_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( wpc_an_dd, wpc_an_state )
+static MACHINE_CONFIG_START( wpc_an_dd )
MCFG_FRAGMENT_ADD(wpc_an_base)
MCFG_SPEAKER_STANDARD_MONO("speaker")
@@ -685,21 +685,21 @@ ROM_START(tfa_13)
ROM_FILL(0x0000,0x8000,0x00)
ROM_END
-GAME(1990, tfa_13, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "WPC Test Fixture: Alphanumeric (1.3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, dd_p7, dd_l2, wpc_an_dd, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Dr. Dude (PA-7 WPC)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, dd_p06, dd_l2, wpc_an_dd, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Dr. Dude (PA-6 WPC)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, fh_l9, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-9 (SL-2m)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, fh_l9b, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-9 (SL-2m) Bootleg Improved German translation", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1996, fh_905h, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse 9.05H", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, fh_l3, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-3", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, fh_l4, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-4", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990, fh_l5, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-5", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, hd_l3, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Harley Davidson (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, hd_l2, hd_l3, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Harley Davidson (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, hd_l1, hd_l3, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Harley Davidson (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, bop_l7, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, bop_l6, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-6)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, bop_l5, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, bop_l4, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, bop_l3, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991, bop_l2, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, tfa_13, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "WPC Test Fixture: Alphanumeric (1.3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, dd_p7, dd_l2, wpc_an_dd, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Dr. Dude (PA-7 WPC)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, dd_p06, dd_l2, wpc_an_dd, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Dr. Dude (PA-6 WPC)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, fh_l9, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-9 (SL-2m)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, fh_l9b, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-9 (SL-2m) Bootleg Improved German translation", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1996, fh_905h, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse 9.05H", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, fh_l3, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-3", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, fh_l4, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-4", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990, fh_l5, fh_l9, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "Funhouse L-5", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, hd_l3, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Harley Davidson (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, hd_l2, hd_l3, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Harley Davidson (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, hd_l1, hd_l3, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Bally", "Harley Davidson (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, bop_l7, 0, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, bop_l6, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, bop_l5, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, bop_l4, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, bop_l3, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991, bop_l2, bop_l7, wpc_an, wpc_an, wpc_an_state, wpc_an, ROT0, "Williams", "The Machine: Bride of Pinbot (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp
index 46956e32f69..6249a9ea5ce 100644
--- a/src/mame/drivers/wpc_dcs.cpp
+++ b/src/mame/drivers/wpc_dcs.cpp
@@ -420,7 +420,7 @@ static INPUT_PORTS_START( wpc_dcs )
INPUT_PORTS_END
-static MACHINE_CONFIG_START( wpc_dcs, wpc_dcs_state )
+static MACHINE_CONFIG_START( wpc_dcs )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_8MHz/4)
MCFG_CPU_PROGRAM_MAP(wpc_dcs_map)
diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp
index 4a72919ffcf..f3c57bc10ab 100644
--- a/src/mame/drivers/wpc_dot.cpp
+++ b/src/mame/drivers/wpc_dot.cpp
@@ -301,7 +301,7 @@ uint32_t wpc_dot_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
return 0;
}
-static MACHINE_CONFIG_START( wpc_dot, wpc_dot_state )
+static MACHINE_CONFIG_START( wpc_dot )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(wpc_dot_map)
diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp
index 55498d58334..143f3732ba6 100644
--- a/src/mame/drivers/wpc_flip1.cpp
+++ b/src/mame/drivers/wpc_flip1.cpp
@@ -157,7 +157,7 @@ DRIVER_INIT_MEMBER(wpc_flip1_state,wpc_flip1)
wpc_dot_state::init_wpc_dot();
}
-static MACHINE_CONFIG_START( wpc_flip1, wpc_flip1_state )
+static MACHINE_CONFIG_START( wpc_flip1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(wpc_flip1_map)
diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp
index 8cbdd80b8d9..73b94996e1e 100644
--- a/src/mame/drivers/wpc_flip2.cpp
+++ b/src/mame/drivers/wpc_flip2.cpp
@@ -186,7 +186,7 @@ DRIVER_INIT_MEMBER(wpc_flip2_state,wpc_flip2)
wpc_flip1_state::init_wpc_flip1();
}
-static MACHINE_CONFIG_START( wpc_flip2, wpc_flip2_state )
+static MACHINE_CONFIG_START( wpc_flip2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, 2000000)
MCFG_CPU_PROGRAM_MAP(wpc_flip2_map)
@@ -837,52 +837,52 @@ ROM_START(lc_11)
ROM_END
-GAME(1993, br_l4, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, br_p17, br_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (SP-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, br_l1, br_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, br_l3, br_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, drac_l1, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Bram Stoker's Dracula (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, drac_p11, drac_l1, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Bram Stoker's Dracula (P-11)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, cftbl_l4, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Creature from the Black Lagoon (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, cftbl_l3, cftbl_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Creature from the Black Lagoon (L-3,SP-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, dw_l2, 0, wpc_flip2, wpc_dw, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Doctor Who (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, dw_l1, dw_l2, wpc_flip2, wpc_dw, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Doctor Who (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, dw_p5, dw_l2, wpc_flip2, wpc_dw, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Doctor Who (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ft_l5, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ft_l3, ft_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ft_l4, ft_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ft_p4, ft_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, tafg_lx3, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition Gold (LX-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, tafg_h3, tafg_lx3, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition (H-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, tafg_la2, tafg_lx3, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, tafg_la3, tafg_lx3, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_l5, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_pb, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (P-B)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_pc, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (P-C)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_l1, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_l2, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_l3, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, gw_p7, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (P-7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1998, tz_92, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (9.2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1998, tz_94h, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (9.4H)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1998, tz_94ch, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (9.4CH)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_pa1, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (PA-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_p3, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (P-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_p4, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_l1, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_l2, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_ifpa, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (IFPA rules)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_l3, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, tz_l4, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, tz_h7, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (H-7)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1994, tz_h8, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (H-8)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2000, ww_l5, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2000, ww_lh6, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (LH-6)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(2000, ww_lh5, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (LH-5)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, ww_l4, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1993, ww_l3, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ww_l2, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ww_p8, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (P-8 P-2 sound)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, ww_p1, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (P-8 P-1 sound)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992, strik_l4, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Strike Master (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1996, lc_11, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "League Champ (1.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, br_l4, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, br_p17, br_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (SP-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, br_l1, br_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, br_l3, br_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Black Rose (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, drac_l1, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Bram Stoker's Dracula (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, drac_p11, drac_l1, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Bram Stoker's Dracula (P-11)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, cftbl_l4, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Creature from the Black Lagoon (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, cftbl_l3, cftbl_l4, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Creature from the Black Lagoon (L-3,SP-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, dw_l2, 0, wpc_flip2, wpc_dw, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Doctor Who (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, dw_l1, dw_l2, wpc_flip2, wpc_dw, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Doctor Who (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, dw_p5, dw_l2, wpc_flip2, wpc_dw, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Doctor Who (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ft_l5, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ft_l3, ft_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ft_l4, ft_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ft_p4, ft_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Fish Tales (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, tafg_lx3, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition Gold (LX-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, tafg_h3, tafg_lx3, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition (H-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, tafg_la2, tafg_lx3, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition (LA-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, tafg_la3, tafg_lx3, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "The Addams Family Special Collectors Edition (LA-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_l5, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_pb, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (P-B)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_pc, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (P-C)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_l1, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_l2, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_l3, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, gw_p7, gw_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "The Getaway: High Speed II (P-7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1998, tz_92, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (9.2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1998, tz_94h, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (9.4H)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1998, tz_94ch, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (9.4CH)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_pa1, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (PA-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_p3, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (P-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_p4, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (P-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_l1, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_l2, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_ifpa, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (IFPA rules)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_l3, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, tz_l4, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, tz_h7, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (H-7)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, tz_h8, tz_92, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "Twilight Zone (H-8)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2000, ww_l5, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2000, ww_lh6, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (LH-6)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(2000, ww_lh5, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (LH-5)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, ww_l4, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993, ww_l3, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ww_l2, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (L-2)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ww_p8, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (P-8 P-2 sound)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, ww_p1, ww_l5, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "White Water (P-8 P-1 sound)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992, strik_l4, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Williams", "Strike Master (L-4)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1996, lc_11, 0, wpc_flip2, wpc_flip2, wpc_flip2_state, wpc_flip2, ROT0, "Bally", "League Champ (1.1)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp
index 40a2c9604ce..ac70e8469db 100644
--- a/src/mame/drivers/wpc_s.cpp
+++ b/src/mame/drivers/wpc_s.cpp
@@ -1967,7 +1967,7 @@ static INPUT_PORTS_START( tfs )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("UL Flipper Button")
INPUT_PORTS_END
-static MACHINE_CONFIG_START( wpc_s, wpc_s_state )
+static MACHINE_CONFIG_START( wpc_s )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, XTAL_8MHz/4)
MCFG_CPU_PROGRAM_MAP(wpc_s_map)
diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp
index ee94f3a410e..93691026d7b 100644
--- a/src/mame/drivers/wrally.cpp
+++ b/src/mame/drivers/wrally.cpp
@@ -253,7 +253,7 @@ static GFXDECODE_START( wrally )
GFXDECODE_END
-static MACHINE_CONFIG_START( wrally, wrally_state )
+static MACHINE_CONFIG_START( wrally )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000,XTAL_24MHz/2) /* verified on pcb */
MCFG_CPU_PROGRAM_MAP(wrally_map)
@@ -283,7 +283,7 @@ static MACHINE_CONFIG_START( wrally, wrally_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_OKIM6295_ADD("oki", XTAL_1MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */
+ MCFG_OKIM6295_ADD("oki", XTAL_1MHz, PIN7_HIGH) /* verified on pcb */
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -390,7 +390,7 @@ ROM_START( wrallyat ) /* Board Marked 930217, Atari License */
ROM_END
-GAME( 1993, wrally, 0, wrally, wrally, driver_device, 0, ROT0, "Gaelco", "World Rally (Version 1.0, Checksum 0E56)", MACHINE_SUPPORTS_SAVE ) /* Dallas DS5002FP power failure shows as: "Tension baja " */
-GAME( 1993, wrallya, wrally, wrally, wrally, driver_device, 0, ROT0, "Gaelco", "World Rally (Version 1.0, Checksum 3873)", MACHINE_SUPPORTS_SAVE ) /* Dallas DS5002FP power failure shows as: "Power Failure" */
-GAME( 1993, wrallyb, wrally, wrally, wrally, driver_device, 0, ROT0, "Gaelco", "World Rally (Version 1.0, Checksum 8AA2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, wrallyat, wrally, wrally, wrally, driver_device, 0, ROT0, "Gaelco (Atari license)", "World Rally (US, 930217)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, wrally, 0, wrally, wrally, wrally_state, 0, ROT0, "Gaelco", "World Rally (Version 1.0, Checksum 0E56)", MACHINE_SUPPORTS_SAVE ) /* Dallas DS5002FP power failure shows as: "Tension baja " */
+GAME( 1993, wrallya, wrally, wrally, wrally, wrally_state, 0, ROT0, "Gaelco", "World Rally (Version 1.0, Checksum 3873)", MACHINE_SUPPORTS_SAVE ) /* Dallas DS5002FP power failure shows as: "Power Failure" */
+GAME( 1993, wrallyb, wrally, wrally, wrally, wrally_state, 0, ROT0, "Gaelco", "World Rally (Version 1.0, Checksum 8AA2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, wrallyat, wrally, wrally, wrally, wrally_state, 0, ROT0, "Gaelco (Atari license)", "World Rally (US, 930217)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp
index 5790c1de45d..40658dfeaa5 100644
--- a/src/mame/drivers/wswan.cpp
+++ b/src/mame/drivers/wswan.cpp
@@ -108,7 +108,7 @@ static SLOT_INTERFACE_START(wswan_cart)
SLOT_INTERFACE_INTERNAL("ws_eeprom", WS_ROM_EEPROM)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( wswan, wswan_state )
+static MACHINE_CONFIG_START( wswan )
/* Basic machine hardware */
MCFG_CPU_ADD("maincpu", V30MZ, 3072000)
MCFG_CPU_PROGRAM_MAP(wswan_mem)
@@ -191,6 +191,6 @@ ROM_START( wscolor )
// ROM_LOAD_OPTIONAL( "wsc_bios.bin", 0x0000, 0x0001, NO_DUMP )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME*/
-CONS( 1999, wswan, 0, 0, wswan, wswan, driver_device, 0, "Bandai", "WonderSwan", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-CONS( 2000, wscolor, wswan, 0, wscolor, wswan, driver_device, 0, "Bandai", "WonderSwan Color", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME*/
+CONS( 1999, wswan, 0, 0, wswan, wswan, wswan_state, 0, "Bandai", "WonderSwan", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 2000, wscolor, wswan, 0, wscolor, wswan, wswan_state, 0, "Bandai", "WonderSwan Color", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp
index d54104fdbf1..0bab6f60f4d 100644
--- a/src/mame/drivers/wwfsstar.cpp
+++ b/src/mame/drivers/wwfsstar.cpp
@@ -417,7 +417,7 @@ GFXDECODE_END
Machine Driver(s)
*******************************************************************************/
-static MACHINE_CONFIG_START( wwfsstar, wwfsstar_state )
+static MACHINE_CONFIG_START( wwfsstar )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, CPU_CLOCK)
@@ -447,7 +447,7 @@ static MACHINE_CONFIG_START( wwfsstar, wwfsstar_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 0.45)
MCFG_SOUND_ROUTE(1, "rspeaker", 0.45)
- MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47)
MACHINE_CONFIG_END
@@ -635,8 +635,8 @@ ROM_END
-GAME( 1989, wwfsstar, 0, wwfsstar, wwfsstar, driver_device, 0, ROT0, "Technos Japan", "WWF Superstars (Europe)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wwfsstaru, wwfsstar, wwfsstar, wwfsstar, driver_device, 0, ROT0, "Technos Japan", "WWF Superstars (US, Newer)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wwfsstarua, wwfsstar, wwfsstar, wwfsstar, driver_device, 0, ROT0, "Technos Japan", "WWF Superstars (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wwfsstarj, wwfsstar, wwfsstar, wwfsstar, driver_device, 0, ROT0, "Technos Japan", "WWF Superstars (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, wwfsstarb, wwfsstar, wwfsstar, wwfsstar, driver_device, 0, ROT0, "bootleg", "WWF Superstars (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wwfsstar, 0, wwfsstar, wwfsstar, wwfsstar_state, 0, ROT0, "Technos Japan", "WWF Superstars (Europe)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wwfsstaru, wwfsstar, wwfsstar, wwfsstar, wwfsstar_state, 0, ROT0, "Technos Japan", "WWF Superstars (US, Newer)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wwfsstarua, wwfsstar, wwfsstar, wwfsstar, wwfsstar_state, 0, ROT0, "Technos Japan", "WWF Superstars (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wwfsstarj, wwfsstar, wwfsstar, wwfsstar, wwfsstar_state, 0, ROT0, "Technos Japan", "WWF Superstars (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, wwfsstarb, wwfsstar, wwfsstar, wwfsstar, wwfsstar_state, 0, ROT0, "bootleg", "WWF Superstars (bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp
index 7ff061a75f3..d91747569fa 100644
--- a/src/mame/drivers/wyvernf0.cpp
+++ b/src/mame/drivers/wyvernf0.cpp
@@ -631,7 +631,7 @@ MACHINE_RESET_MEMBER(wyvernf0_state,wyvernf0)
m_mcu_ready = 0;
}
-static MACHINE_CONFIG_START( wyvernf0, wyvernf0_state )
+static MACHINE_CONFIG_START( wyvernf0 )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, 6000000) // ?
@@ -731,4 +731,4 @@ ROM_START( wyvernf0 )
ROM_LOAD( "a39_12.ic74", 0x6000, 0x2000, CRC(1cc389de) SHA1(4213484d3a82688f312811e7a5c4d128e40584c3) )
ROM_END
-GAME( 1985, wyvernf0, 0, wyvernf0, wyvernf0, driver_device, 0, ROT270, "Taito", "Wyvern F-0", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND)
+GAME( 1985, wyvernf0, 0, wyvernf0, wyvernf0, wyvernf0_state, 0, ROT270, "Taito", "Wyvern F-0", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND)
diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp
index 598390b32af..d8e7abcb6fc 100644
--- a/src/mame/drivers/x07.cpp
+++ b/src/mame/drivers/x07.cpp
@@ -1477,7 +1477,7 @@ void x07_state::machine_reset()
m_maincpu->set_state_int(Z80_PC, 0xc3c3);
}
-static MACHINE_CONFIG_START( x07, x07_state )
+static MACHINE_CONFIG_START( x07 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", NSC800, XTAL_15_36MHz / 4)
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index ef10422cf31..995fe38bc0e 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -2526,7 +2526,7 @@ static SLOT_INTERFACE_START( x1_floppies )
SLOT_INTERFACE("dd", FLOPPY_525_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( x1, x1_state )
+static MACHINE_CONFIG_START( x1 )
/* basic machine hardware */
MCFG_CPU_ADD("x1_cpu", Z80, MAIN_CLOCK/4)
MCFG_CPU_PROGRAM_MAP(x1_mem)
@@ -2730,9 +2730,9 @@ DRIVER_INIT_MEMBER(x1_state,x1_kanji)
}
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, x1, 0, 0, x1, x1, driver_device, 0, "Sharp", "X1 (CZ-800C)", 0 )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, x1, 0, 0, x1, x1, x1_state, 0, "Sharp", "X1 (CZ-800C)", 0 )
// x1twin in x1twin.c
COMP( 1984, x1turbo, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 Turbo (CZ-850C)", MACHINE_NOT_WORKING ) //model 10
COMP( 1985, x1turbo40, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 Turbo (CZ-862C)", 0 ) //model 40
-//COMP( 1986, x1turboz, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 TurboZ", MACHINE_NOT_WORKING )
+//COMP( 1986, x1turboz, x1, 0, x1turbo, x1turbo, x1_state, x1_kanji, "Sharp", "X1 TurboZ", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp
index 6d16b959d83..231c96afece 100644
--- a/src/mame/drivers/x1twin.cpp
+++ b/src/mame/drivers/x1twin.cpp
@@ -401,7 +401,7 @@ static SLOT_INTERFACE_START( x1_floppies )
SLOT_INTERFACE("dd", FLOPPY_525_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( x1twin, x1twin_state )
+static MACHINE_CONFIG_START( x1twin )
/* basic machine hardware */
MCFG_CPU_ADD("x1_cpu", Z80, X1_MAIN_CLOCK/4)
MCFG_CPU_PROGRAM_MAP(x1_mem)
@@ -446,7 +446,7 @@ static MACHINE_CONFIG_START( x1twin, x1twin_state )
MCFG_SCREEN_ADD("pce_screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, HUC6260_WPF, 70, 70 + 512 + 32, HUC6260_LPF, 14, 14+242)
+ MCFG_SCREEN_RAW_PARAMS(PCE_MAIN_CLOCK/2, huc6260_device::WPF, 70, 70 + 512 + 32, huc6260_device::LPF, 14, 14+242)
MCFG_SCREEN_UPDATE_DRIVER(x1twin_state, screen_update_x1pce)
MCFG_MC6845_ADD("crtc", H46505, "x1_screen", (VDP_CLOCK/48)) //unknown divider
@@ -540,4 +540,4 @@ ROM_START( x1twin )
ROM_LOAD("kanji1.rom", 0x18000, 0x8000, BAD_DUMP CRC(5874f70b) SHA1(dad7ada1b70c45f1e9db11db273ef7b385ef4f17) )
ROM_END
-COMP( 1986, x1twin, x1, 0, x1twin, x1twin, x1_state, x1_kanji,"Sharp", "X1 Twin (CZ-830C)", MACHINE_NOT_WORKING )
+COMP( 1986, x1twin, x1, 0, x1twin, x1twin, x1twin_state, x1_kanji,"Sharp", "X1 Twin (CZ-830C)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index d382ee418f5..d22d206b9a5 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -1071,10 +1071,10 @@ WRITE8_MEMBER(x68k_state::x68030_adpcm_w)
switch(offset)
{
case 0x00:
- m_okim6258->okim6258_ctrl_w(space,0,data);
+ m_okim6258->ctrl_w(space,0,data);
break;
case 0x01:
- m_okim6258->okim6258_data_w(space,0,data);
+ m_okim6258->data_w(space,0,data);
break;
}
}
@@ -1150,8 +1150,8 @@ static ADDRESS_MAP_START(x68k_map, AS_PROGRAM, 16, x68k_state )
// AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w)
AM_RANGE(0xe8e000, 0xe8ffff) AM_READWRITE(x68k_sysport_r, x68k_sysport_w)
AM_RANGE(0xe90000, 0xe91fff) AM_DEVREADWRITE8("ym2151", ym2151_device, read, write, 0x00ff)
- AM_RANGE(0xe92000, 0xe92001) AM_DEVREADWRITE8("okim6258", okim6258_device, okim6258_status_r, okim6258_ctrl_w, 0x00ff)
- AM_RANGE(0xe92002, 0xe92003) AM_DEVREADWRITE8("okim6258", okim6258_device, okim6258_status_r, okim6258_data_w, 0x00ff)
+ AM_RANGE(0xe92000, 0xe92001) AM_DEVREADWRITE8("okim6258", okim6258_device, status_r, ctrl_w, 0x00ff)
+ AM_RANGE(0xe92002, 0xe92003) AM_DEVREADWRITE8("okim6258", okim6258_device, status_r, data_w, 0x00ff)
AM_RANGE(0xe94000, 0xe94003) AM_DEVICE8("upd72065", upd72065_device, map, 0x00ff)
AM_RANGE(0xe94004, 0xe94007) AM_READWRITE(x68k_fdc_r, x68k_fdc_w)
AM_RANGE(0xe96000, 0xe9601f) AM_DEVREADWRITE("x68k_hdc", x68k_hdc_image_device, hdc_r, hdc_w)
@@ -1188,8 +1188,8 @@ static ADDRESS_MAP_START(x68kxvi_map, AS_PROGRAM, 16, x68k_state )
// AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w)
AM_RANGE(0xe8e000, 0xe8ffff) AM_READWRITE(x68k_sysport_r, x68k_sysport_w)
AM_RANGE(0xe90000, 0xe91fff) AM_DEVREADWRITE8("ym2151", ym2151_device, read, write, 0x00ff)
- AM_RANGE(0xe92000, 0xe92001) AM_DEVREADWRITE8("okim6258", okim6258_device, okim6258_status_r, okim6258_ctrl_w, 0x00ff)
- AM_RANGE(0xe92002, 0xe92003) AM_DEVREADWRITE8("okim6258", okim6258_device, okim6258_status_r, okim6258_data_w, 0x00ff)
+ AM_RANGE(0xe92000, 0xe92001) AM_DEVREADWRITE8("okim6258", okim6258_device, status_r, ctrl_w, 0x00ff)
+ AM_RANGE(0xe92002, 0xe92003) AM_DEVREADWRITE8("okim6258", okim6258_device, status_r, data_w, 0x00ff)
AM_RANGE(0xe94000, 0xe94003) AM_DEVICE8("upd72065", upd72065_device, map, 0x00ff)
AM_RANGE(0xe94004, 0xe94007) AM_READWRITE(x68k_fdc_r, x68k_fdc_w)
// AM_RANGE(0xe96000, 0xe9601f) AM_DEVREADWRITE("x68k_hdc", x68k_hdc_image_device, hdc_r, hdc_w)
@@ -1228,7 +1228,7 @@ static ADDRESS_MAP_START(x68030_map, AS_PROGRAM, 32, x68k_state )
// AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w)
AM_RANGE(0xe8e000, 0xe8ffff) AM_READWRITE16(x68k_sysport_r, x68k_sysport_w,0xffffffff)
AM_RANGE(0xe90000, 0xe91fff) AM_DEVREADWRITE8("ym2151", ym2151_device, read, write, 0x00ff00ff)
- AM_RANGE(0xe92000, 0xe92003) AM_DEVREAD8("okim6258", okim6258_device, okim6258_status_r, 0x00ff00ff) AM_WRITE8(x68030_adpcm_w, 0x00ff00ff)
+ AM_RANGE(0xe92000, 0xe92003) AM_DEVREAD8("okim6258", okim6258_device, status_r, 0x00ff00ff) AM_WRITE8(x68030_adpcm_w, 0x00ff00ff)
AM_RANGE(0xe94000, 0xe94003) AM_DEVICE8("upd72065", upd72065_device, map, 0x00ff00ff)
AM_RANGE(0xe94004, 0xe94007) AM_READWRITE16(x68k_fdc_r, x68k_fdc_w,0xffffffff)
// AM_RANGE(0xe96000, 0xe9601f) AM_DEVREADWRITE16("x68k_hdc", x68k_hdc_image_device, hdc_r, hdc_w, 0xffffffff)
@@ -1636,7 +1636,7 @@ static SLOT_INTERFACE_START(keyboard)
SLOT_INTERFACE("x68k", X68K_KEYBOARD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( x68000, x68k_state )
+static MACHINE_CONFIG_START( x68000 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
MCFG_CPU_PROGRAM_MAP(x68k_map)
@@ -1861,8 +1861,8 @@ ROM_START( x68030 )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1987, x68000, 0, 0, x68000, x68000, x68k_state, x68000, "Sharp", "X68000", MACHINE_IMPERFECT_GRAPHICS )
-COMP( 1990, x68ksupr,x68000, 0, x68ksupr,x68000, x68k_state,x68000, "Sharp", "X68000 Super", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-COMP( 1991, x68kxvi,x68000, 0, x68kxvi,x68000, x68k_state, x68kxvi,"Sharp", "X68000 XVI", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
-COMP( 1993, x68030, x68000, 0, x68030, x68000, x68k_state, x68030, "Sharp", "X68030", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1987, x68000, 0, 0, x68000, x68000, x68k_state, x68000, "Sharp", "X68000", MACHINE_IMPERFECT_GRAPHICS )
+COMP( 1990, x68ksupr, x68000, 0, x68ksupr, x68000, x68k_state, x68000, "Sharp", "X68000 Super", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+COMP( 1991, x68kxvi, x68000, 0, x68kxvi, x68000, x68k_state, x68kxvi,"Sharp", "X68000 XVI", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
+COMP( 1993, x68030, x68000, 0, x68030, x68000, x68k_state, x68030, "Sharp", "X68030", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp
index 79ef95e19b1..2b63065723d 100644
--- a/src/mame/drivers/xain.cpp
+++ b/src/mame/drivers/xain.cpp
@@ -454,7 +454,7 @@ void xain_state::machine_start()
save_item(NAME(m_vblank));
}
-static MACHINE_CONFIG_START( xsleena, xain_state )
+static MACHINE_CONFIG_START( xsleena )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809, CPU_CLOCK)
@@ -780,8 +780,8 @@ ROM_START( xsleenaba )
ROM_END
-GAME( 1986, xsleena, 0, xsleena, xsleena, driver_device, 0, ROT0, "Technos Japan (Taito license)", "Xain'd Sleena (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, xsleenaj, xsleena, xsleena, xsleena, driver_device, 0, ROT0, "Technos Japan", "Xain'd Sleena (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, solrwarr, xsleena, xsleena, xsleena, driver_device, 0, ROT0, "Technos Japan (Taito / Memetron license)", "Solar-Warrior (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, xsleenab, xsleena, xsleenab, xsleena, driver_device, 0, ROT0, "bootleg", "Xain'd Sleena (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, xsleenaba,xsleena, xsleenab, xsleena, driver_device, 0, ROT0, "bootleg", "Xain'd Sleena (bootleg, bugfixed)", MACHINE_SUPPORTS_SAVE ) // newer bootleg, fixes some of the issues with the other one
+GAME( 1986, xsleena, 0, xsleena, xsleena, xain_state, 0, ROT0, "Technos Japan (Taito license)", "Xain'd Sleena (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, xsleenaj, xsleena, xsleena, xsleena, xain_state, 0, ROT0, "Technos Japan", "Xain'd Sleena (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, solrwarr, xsleena, xsleena, xsleena, xain_state, 0, ROT0, "Technos Japan (Taito / Memetron license)", "Solar-Warrior (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, xsleenab, xsleena, xsleenab, xsleena, xain_state, 0, ROT0, "bootleg", "Xain'd Sleena (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, xsleenaba, xsleena, xsleenab, xsleena, xain_state, 0, ROT0, "bootleg", "Xain'd Sleena (bootleg, bugfixed)", MACHINE_SUPPORTS_SAVE ) // newer bootleg, fixes some of the issues with the other one
diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp
index c08f46819a0..1f04500145d 100644
--- a/src/mame/drivers/xavix.cpp
+++ b/src/mame/drivers/xavix.cpp
@@ -142,7 +142,7 @@ void xavix_state::machine_reset()
}
-static MACHINE_CONFIG_START( xavix, xavix_state )
+static MACHINE_CONFIG_START( xavix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",G65816,MAIN_CLOCK/4)
@@ -179,4 +179,4 @@ ROM_START( taitons1 )
ROM_LOAD( "taitonostalgia1.u3", 0x000000, 0x200000, CRC(25bd8c67) SHA1(a109cd2da6aa4596e3ca3abd1afce2d0001a473f) )
ROM_END
-CONS( 2006, taitons1, 0, 0, xavix, xavix, driver_device, 0, "Bandai / SSD Company LTD / Taito", "Let's! TV Play Classic - Taito Nostalgia 1", MACHINE_IS_SKELETON )
+CONS( 2006, taitons1, 0, 0, xavix, xavix, xavix_state, 0, "Bandai / SSD Company LTD / Taito", "Let's! TV Play Classic - Taito Nostalgia 1", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp
index d6de4b2d6e5..095684f6193 100644
--- a/src/mame/drivers/xbox.cpp
+++ b/src/mame/drivers/xbox.cpp
@@ -130,11 +130,11 @@ void xbox_state::hack_eeprom()
void xbox_state::machine_start()
{
- ohci_game_controller *usb_device;
+ ohci_game_controller_device *usb_device;
xbox_base_state::machine_start();
xbox_devs.ide = machine().device<bus_master_ide_controller_device>("ide");
- usb_device = machine().device<ohci_game_controller>("ohci_gamepad");
+ usb_device = machine().device<ohci_game_controller_device>("ohci_gamepad");
if (usb_device != nullptr) {
usb_device->initialize(machine());
machine().device<mcpx_ohci_device>(":pci:02.0")->plug_usb_device(3, usb_device); // connect to root hub port 3, chihiro needs to use 1 and 2
@@ -165,7 +165,7 @@ SLOT_INTERFACE_START(xbox_ata_devices)
SLOT_INTERFACE("cdrom", ATAPI_CDROM)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_DERIVED_CLASS(xbox, xbox_base, xbox_state)
+static MACHINE_CONFIG_DERIVED(xbox, xbox_base)
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_PROGRAM_MAP(xbox_map)
MCFG_CPU_IO_MAP(xbox_map_io)
@@ -231,4 +231,4 @@ ROM_END
// For a generic system:
// SYST(YEAR,NAME,PARENT,COMPAT,MACHINE,INPUT,CLASS,INIT,COMPANY,FULLNAME,FLAGS)
-CONS( 2001, xbox, 0, 0, xbox, xbox, driver_device, 0, "Microsoft", "XBOX", MACHINE_IS_SKELETON )
+CONS( 2001, xbox, 0, 0, xbox, xbox, xbox_state, 0, "Microsoft", "XBOX", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp
index ba78325ab91..6f7debdd24f 100644
--- a/src/mame/drivers/xerox820.cpp
+++ b/src/mame/drivers/xerox820.cpp
@@ -545,7 +545,7 @@ GFXDECODE_END
/* Machine Drivers */
-static MACHINE_CONFIG_START( xerox820, xerox820_state )
+static MACHINE_CONFIG_START( xerox820 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_20MHz/8)
MCFG_CPU_PROGRAM_MAP(xerox820_mem)
@@ -612,14 +612,14 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state )
MCFG_SOFTWARE_LIST_ADD("flop_list", "xerox820")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( bigboard, xerox820, bigboard_state )
+static MACHINE_CONFIG_DERIVED( bigboard, xerox820 )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("beeper", BEEP, 950)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* bigboard only */
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state )
+static MACHINE_CONFIG_START( xerox820ii )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_16MHz/4)
MCFG_CPU_PROGRAM_MAP(xerox820ii_mem)
@@ -829,10 +829,10 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, bigboard, 0, 0, bigboard, xerox820, driver_device, 0, "Digital Research Computers", "Big Board", 0 )
-COMP( 1981, x820, bigboard, 0, xerox820, xerox820, driver_device, 0, "Xerox", "Xerox 820", MACHINE_NO_SOUND_HW )
-COMP( 1982, mk82, bigboard, 0, bigboard, xerox820, driver_device, 0, "Scomar", "MK-82", 0 )
-COMP( 1983, x820ii, 0, 0, xerox820ii, xerox820, driver_device, 0, "Xerox", "Xerox 820-II", MACHINE_NOT_WORKING )
-COMP( 1983, x168, x820ii, 0, xerox168, xerox820, driver_device, 0, "Xerox", "Xerox 16/8", MACHINE_NOT_WORKING )
-COMP( 1983, mk83, x820ii, 0, mk83, xerox820, driver_device, 0, "Scomar", "MK-83", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, bigboard, 0, 0, bigboard, xerox820, bigboard_state, 0, "Digital Research Computers", "Big Board", 0 )
+COMP( 1981, x820, bigboard, 0, xerox820, xerox820, xerox820_state, 0, "Xerox", "Xerox 820", MACHINE_NO_SOUND_HW )
+COMP( 1982, mk82, bigboard, 0, bigboard, xerox820, bigboard_state, 0, "Scomar", "MK-82", 0 )
+COMP( 1983, x820ii, 0, 0, xerox820ii, xerox820, xerox820ii_state, 0, "Xerox", "Xerox 820-II", MACHINE_NOT_WORKING )
+COMP( 1983, x168, x820ii, 0, xerox168, xerox820, xerox820ii_state, 0, "Xerox", "Xerox 16/8", MACHINE_NOT_WORKING )
+COMP( 1983, mk83, x820ii, 0, mk83, xerox820, xerox820_state, 0, "Scomar", "MK-83", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp
index 4b6464035af..0f6284e01ca 100644
--- a/src/mame/drivers/xexex.cpp
+++ b/src/mame/drivers/xexex.cpp
@@ -465,7 +465,7 @@ void xexex_state::machine_reset()
m_k054539->init_flags(k054539_device::REVERSE_STEREO);
}
-static MACHINE_CONFIG_START( xexex, xexex_state )
+static MACHINE_CONFIG_START( xexex )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_32MHz/2) // 16MHz
diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp
index e9e30cb13da..212c25e53cb 100644
--- a/src/mame/drivers/xmen.cpp
+++ b/src/mame/drivers/xmen.cpp
@@ -294,7 +294,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(xmen_state::xmen_scanline)
}
-static MACHINE_CONFIG_START( xmen, xmen_state )
+static MACHINE_CONFIG_START( xmen )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) /* verified on pcb */
@@ -346,7 +346,7 @@ static MACHINE_CONFIG_START( xmen, xmen_state )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( xmen6p, xmen_state )
+static MACHINE_CONFIG_START( xmen6p )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -821,15 +821,15 @@ ROM_END
/* Second "version" letter denotes players, A=2 players, B=4 players, C=6 players ??? - For the Asia versions both D & E are 4 players */
-GAME( 1992, xmen, 0, xmen, xmen, driver_device, 0, ROT0, "Konami", "X-Men (4 Players ver UBB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmenj, xmen, xmen, xmen, driver_device, 0, ROT0, "Konami", "X-Men (4 Players ver JBA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmene, xmen, xmen, xmen, driver_device, 0, ROT0, "Konami", "X-Men (4 Players ver EBA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmena, xmen, xmen, xmen, driver_device, 0, ROT0, "Konami", "X-Men (4 Players ver AEA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmenaa, xmen, xmen, xmen, driver_device, 0, ROT0, "Konami", "X-Men (4 Players ver ADA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmen2pe, xmen, xmen, xmen2p, driver_device, 0, ROT0, "Konami", "X-Men (2 Players ver EAA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmen2pu, xmen, xmen, xmen2p, driver_device, 0, ROT0, "Konami", "X-Men (2 Players ver UAB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmen2pa, xmen, xmen, xmen2p, driver_device, 0, ROT0, "Konami", "X-Men (2 Players ver AAA)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmen2pj, xmen, xmen, xmen2p, driver_device, 0, ROT0, "Konami", "X-Men (2 Players ver JAA)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1992, xmen6p, xmen, xmen6p, xmen6p, driver_device, 0, ROT0, "Konami", "X-Men (6 Players ver ECB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1992, xmen6pu, xmen, xmen6p, xmen6p, driver_device, 0, ROT0, "Konami", "X-Men (6 Players ver UCB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmen, 0, xmen, xmen, xmen_state, 0, ROT0, "Konami", "X-Men (4 Players ver UBB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmenj, xmen, xmen, xmen, xmen_state, 0, ROT0, "Konami", "X-Men (4 Players ver JBA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmene, xmen, xmen, xmen, xmen_state, 0, ROT0, "Konami", "X-Men (4 Players ver EBA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmena, xmen, xmen, xmen, xmen_state, 0, ROT0, "Konami", "X-Men (4 Players ver AEA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmenaa, xmen, xmen, xmen, xmen_state, 0, ROT0, "Konami", "X-Men (4 Players ver ADA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmen2pe, xmen, xmen, xmen2p, xmen_state, 0, ROT0, "Konami", "X-Men (2 Players ver EAA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmen2pu, xmen, xmen, xmen2p, xmen_state, 0, ROT0, "Konami", "X-Men (2 Players ver UAB)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmen2pa, xmen, xmen, xmen2p, xmen_state, 0, ROT0, "Konami", "X-Men (2 Players ver AAA)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmen2pj, xmen, xmen, xmen2p, xmen_state, 0, ROT0, "Konami", "X-Men (2 Players ver JAA)", MACHINE_SUPPORTS_SAVE )
+
+GAME( 1992, xmen6p, xmen, xmen6p, xmen6p, xmen_state, 0, ROT0, "Konami", "X-Men (6 Players ver ECB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
+GAME( 1992, xmen6pu, xmen, xmen6p, xmen6p, xmen_state, 0, ROT0, "Konami", "X-Men (6 Players ver UCB)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp
index 9da4cd3ca6b..1b7cc7dbb03 100644
--- a/src/mame/drivers/xor100.cpp
+++ b/src/mame/drivers/xor100.cpp
@@ -512,7 +512,7 @@ void xor100_state::post_load()
/* Machine Driver */
-static MACHINE_CONFIG_START( xor100, xor100_state )
+static MACHINE_CONFIG_START( xor100 )
/* basic machine hardware */
MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
MCFG_CPU_PROGRAM_MAP(xor100_mem)
@@ -597,5 +597,5 @@ ROM_END
/* System Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, xor100, 0, 0, xor100, xor100, driver_device, 0, "Xor Data Science", "XOR S-100-12", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, xor100, 0, 0, xor100, xor100, xor100_state, 0, "Xor Data Science", "XOR S-100-12", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp
index 332cf52e6d1..9e436c2aaab 100644
--- a/src/mame/drivers/xorworld.cpp
+++ b/src/mame/drivers/xorworld.cpp
@@ -171,7 +171,7 @@ static GFXDECODE_START( xorworld )
GFXDECODE_END
-static MACHINE_CONFIG_START( xorworld, xorworld_state )
+static MACHINE_CONFIG_START( xorworld )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz
MCFG_CPU_PROGRAM_MAP(xorworld_map)
diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp
index 22638d9ebed..4f2044f4461 100644
--- a/src/mame/drivers/xtheball.cpp
+++ b/src/mame/drivers/xtheball.cpp
@@ -337,7 +337,7 @@ INPUT_PORTS_END
*
*************************************/
-static MACHINE_CONFIG_START( xtheball, xtheball_state )
+static MACHINE_CONFIG_START( xtheball )
MCFG_CPU_ADD("maincpu", TMS34010, 40000000)
MCFG_CPU_PROGRAM_MAP(main_map)
@@ -400,4 +400,4 @@ ROM_END
*
*************************************/
-GAME( 1991, xtheball, 0, xtheball, xtheball, driver_device, 0, ROT0, "Rare", "X the Ball", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, xtheball, 0, xtheball, xtheball, xtheball_state, 0, ROT0, "Rare", "X the Ball", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/xtom3d.cpp b/src/mame/drivers/xtom3d.cpp
index 5e725ea928f..69d3bd02433 100644
--- a/src/mame/drivers/xtom3d.cpp
+++ b/src/mame/drivers/xtom3d.cpp
@@ -394,7 +394,7 @@ void xtom3d_state::machine_reset()
membank("video_bank2")->set_base(memregion("video_bios")->base() + 0x4000);
}
-static MACHINE_CONFIG_START( xtom3d, xtom3d_state )
+static MACHINE_CONFIG_START( xtom3d )
MCFG_CPU_ADD("maincpu", PENTIUM2, 450000000/16) // actually Pentium II 450
MCFG_CPU_PROGRAM_MAP(xtom3d_map)
MCFG_CPU_IO_MAP(xtom3d_io)
@@ -431,4 +431,4 @@ ROM_START( xtom3d )
ROM_END
-GAME(1999, xtom3d, 0, xtom3d, at_keyboard, driver_device, 0, ROT0, "Jamie System Development", "X Tom 3D", MACHINE_IS_SKELETON)
+GAME(1999, xtom3d, 0, xtom3d, at_keyboard, xtom3d_state, 0, ROT0, "Jamie System Development", "X Tom 3D", MACHINE_IS_SKELETON)
diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp
index 79d22d91cbb..09fcf163042 100644
--- a/src/mame/drivers/xxmissio.cpp
+++ b/src/mame/drivers/xxmissio.cpp
@@ -260,7 +260,7 @@ GFXDECODE_END
/****************************************************************************/
-static MACHINE_CONFIG_START( xxmissio, xxmissio_state )
+static MACHINE_CONFIG_START( xxmissio )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,12000000/4) /* 3.0MHz */
@@ -331,4 +331,4 @@ ROM_START( xxmissio )
ROM_LOAD16_BYTE( "xx11.4b", 0x0001, 0x8000, CRC(d9dd827c) SHA1(aea3a5abd871adf7f75ad4d6cc57eff0833135c7) )
ROM_END
-GAME( 1986, xxmissio, 0, xxmissio, xxmissio, driver_device, 0, ROT90, "UPL", "XX Mission", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, xxmissio, 0, xxmissio, xxmissio, xxmissio_state, 0, ROT90, "UPL", "XX Mission", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp
index b564c0cedb8..70b3ce57cf4 100644
--- a/src/mame/drivers/xybots.cpp
+++ b/src/mame/drivers/xybots.cpp
@@ -180,7 +180,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( xybots, xybots_state )
+static MACHINE_CONFIG_START( xybots )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, ATARI_CLOCK_14MHz/2)
diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp
index bc72efd1d1c..6b674a975af 100644
--- a/src/mame/drivers/xyonix.cpp
+++ b/src/mame/drivers/xyonix.cpp
@@ -224,7 +224,7 @@ GFXDECODE_END
/* MACHINE driver *************************************************************/
-static MACHINE_CONFIG_START( xyonix, xyonix_state )
+static MACHINE_CONFIG_START( xyonix )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,16000000 / 4) /* 4 MHz ? */
@@ -275,4 +275,4 @@ ROM_END
/* GAME drivers **************************************************************/
-GAME( 1989, xyonix, 0, xyonix, xyonix, driver_device, 0, ROT0, "Philko", "Xyonix", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, xyonix, 0, xyonix, xyonix, xyonix_state, 0, ROT0, "Philko", "Xyonix", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index 1ef1d9a0e5b..bdd7f3053b0 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -278,7 +278,7 @@ void yiear_state::machine_reset()
m_yiear_nmi_enable = 0;
}
-static MACHINE_CONFIG_START( yiear, yiear_state )
+static MACHINE_CONFIG_START( yiear )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6809,XTAL_18_432MHz/12) /* verified on pcb */
@@ -367,5 +367,5 @@ ROM_END
-GAME( 1985, yiear, 0, yiear, yiear, driver_device, 0, ROT0, "Konami", "Yie Ar Kung-Fu (program code I)", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, yiear2, yiear, yiear, yiear, driver_device, 0, ROT0, "Konami", "Yie Ar Kung-Fu (program code G)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, yiear, 0, yiear, yiear, yiear_state, 0, ROT0, "Konami", "Yie Ar Kung-Fu (program code I)", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, yiear2, yiear, yiear, yiear, yiear_state, 0, ROT0, "Konami", "Yie Ar Kung-Fu (program code G)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp
index da11e35f9ee..389c56869ff 100644
--- a/src/mame/drivers/ymmu100.cpp
+++ b/src/mame/drivers/ymmu100.cpp
@@ -431,7 +431,7 @@ static ADDRESS_MAP_START( mu100_iomap, AS_IO, 16, mu100_state )
AM_RANGE(h8_device::ADC_7, h8_device::ADC_7) AM_READ(adc7_r)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( mu100, mu100_state )
+static MACHINE_CONFIG_START( mu100 )
MCFG_CPU_ADD( "maincpu", H8S2655, XTAL_16MHz )
MCFG_CPU_PROGRAM_MAP( mu100_map )
MCFG_CPU_IO_MAP( mu100_iomap )
@@ -457,9 +457,6 @@ static MACHINE_CONFIG_START( mu100, mu100_state )
MCFG_H8_SCI_TX_CALLBACK(DEVWRITELINE(":mdout", midi_port_device, write_txd))
MACHINE_CONFIG_END
-static MACHINE_CONFIG_DERIVED_CLASS( mu100r, mu100, mu100r_state )
-MACHINE_CONFIG_END
-
#define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \
ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(bios+1)) /* Note '+1' */
@@ -500,5 +497,5 @@ ROM_START( mu100r )
ROM_LOAD( "mu100-font.bin", 0x0000, 0x1000, BAD_DUMP CRC(a7d6c1d6) SHA1(9f0398d678bdf607cb34d83ee535f3b7fcc97c41) )
ROM_END
-CONS( 1997, mu100, 0, 0, mu100, mu100, driver_device, 0, "Yamaha", "MU100", MACHINE_NOT_WORKING )
-CONS( 1997, mu100r, mu100, 0, mu100r, mu100, driver_device, 0, "Yamaha", "MU100 Rackable version", MACHINE_NOT_WORKING )
+CONS( 1997, mu100, 0, 0, mu100, mu100, mu100_state, 0, "Yamaha", "MU100", MACHINE_NOT_WORKING )
+CONS( 1997, mu100r, mu100, 0, mu100, mu100, mu100r_state, 0, "Yamaha", "MU100 Rackable version", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp
index ceb08fa8665..cd605dcf3dd 100644
--- a/src/mame/drivers/yunsun16.cpp
+++ b/src/mame/drivers/yunsun16.cpp
@@ -586,7 +586,7 @@ MACHINE_RESET_MEMBER(yunsun16_state, shocking)
Magic Bubble
***************************************************************************/
-static MACHINE_CONFIG_START( magicbub, yunsun16_state )
+static MACHINE_CONFIG_START( magicbub )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -619,7 +619,7 @@ static MACHINE_CONFIG_START( magicbub, yunsun16_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -629,7 +629,7 @@ MACHINE_CONFIG_END
Shocking
***************************************************************************/
-static MACHINE_CONFIG_START( shocking, yunsun16_state )
+static MACHINE_CONFIG_START( shocking )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz)
@@ -652,7 +652,7 @@ static MACHINE_CONFIG_START( shocking, yunsun16_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
- MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_HIGH)
+ MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
@@ -1020,10 +1020,10 @@ ROM_END
GAME( 199?, magicbub, 0, magicbub, magicbub, yunsun16_state, magicbub, ROT0, "Yun Sung", "Magic Bubble", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
GAME( 199?, magicbuba, magicbub, magicbub, magicbua, yunsun16_state, magicbub, ROT0, "Yun Sung", "Magic Bubble (Adult version, YS-1302 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, magicbubb, magicbub, shocking, magicbua, driver_device, 0, ROT0, "Yun Sung", "Magic Bubble (Adult version, YS-0211 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, paprazzi, 0, shocking, paprazzi, driver_device, 0, ROT270, "Yun Sung", "Paparazzi", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, shocking, 0, shocking, shocking, driver_device, 0, ROT0, "Yun Sung", "Shocking", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, shockingk, shocking, shocking, shocking, driver_device, 0, ROT0, "Yun Sung", "Shocking (Korea, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, shockingko, shocking, shocking, shocking, driver_device, 0, ROT0, "Yun Sung", "Shocking (Korea, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, bombkick, 0, shocking, bombkick, driver_device, 0, ROT0, "Yun Sung", "Bomb Kick (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1998, bombkicka, bombkick, shocking, bombkick, driver_device, 0, ROT0, "Yun Sung", "Bomb Kick (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 199?, magicbubb, magicbub, shocking, magicbua, yunsun16_state, 0, ROT0, "Yun Sung", "Magic Bubble (Adult version, YS-0211 PCB)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1996, paprazzi, 0, shocking, paprazzi, yunsun16_state, 0, ROT270, "Yun Sung", "Paparazzi", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, shocking, 0, shocking, shocking, yunsun16_state, 0, ROT0, "Yun Sung", "Shocking", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, shockingk, shocking, shocking, shocking, yunsun16_state, 0, ROT0, "Yun Sung", "Shocking (Korea, set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, shockingko, shocking, shocking, shocking, yunsun16_state, 0, ROT0, "Yun Sung", "Shocking (Korea, set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, bombkick, 0, shocking, bombkick, yunsun16_state, 0, ROT0, "Yun Sung", "Bomb Kick (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, bombkicka, bombkick, shocking, bombkick, yunsun16_state, 0, ROT0, "Yun Sung", "Bomb Kick (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp
index e198e9d649d..30837a49e7e 100644
--- a/src/mame/drivers/yunsung8.cpp
+++ b/src/mame/drivers/yunsung8.cpp
@@ -350,7 +350,7 @@ void yunsung8_state::machine_reset()
}
-static MACHINE_CONFIG_START( yunsung8, yunsung8_state )
+static MACHINE_CONFIG_START( yunsung8 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_16MHz/2) /* Z80B @ 8MHz? */
@@ -385,7 +385,7 @@ static MACHINE_CONFIG_START( yunsung8, yunsung8_state )
MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
MCFG_MSM5205_VCLK_CB(WRITELINE(yunsung8_state, adpcm_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S96_4B) /* 4KHz, 4 Bits */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* 4KHz, 4 Bits */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80)
MACHINE_CONFIG_END
@@ -608,8 +608,8 @@ ROM_END
***************************************************************************/
-GAME( 1995, cannball, 0, yunsung8, cannball, driver_device, 0, ROT0, "Yun Sung / Soft Vision", "Cannon Ball (Yun Sung, horizontal)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cannballv, cannball, yunsung8, cannbalv, driver_device, 0, ROT270, "Yun Sung / J&K Production", "Cannon Ball (Yun Sung, vertical)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, magix, 0, yunsung8, magix, driver_device, 0, ROT0, "Yun Sung", "Magix / Rock", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, magixb, magix, yunsung8, magix, driver_device, 0, ROT0, "Yun Sung", "Magix / Rock (no copyright message)", MACHINE_SUPPORTS_SAVE ) // was marked as bootleg, but has been seen on original PCBs
-GAME( 1994?, rocktris, 0, yunsung8, rocktris, driver_device, 0, ROT0, "Yun Sung", "Rock Tris", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cannball, 0, yunsung8, cannball, yunsung8_state, 0, ROT0, "Yun Sung / Soft Vision", "Cannon Ball (Yun Sung, horizontal)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cannballv, cannball, yunsung8, cannbalv, yunsung8_state, 0, ROT270, "Yun Sung / J&K Production", "Cannon Ball (Yun Sung, vertical)", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, magix, 0, yunsung8, magix, yunsung8_state, 0, ROT0, "Yun Sung", "Magix / Rock", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, magixb, magix, yunsung8, magix, yunsung8_state, 0, ROT0, "Yun Sung", "Magix / Rock (no copyright message)", MACHINE_SUPPORTS_SAVE ) // was marked as bootleg, but has been seen on original PCBs
+GAME( 1994?, rocktris, 0, yunsung8, rocktris, yunsung8_state, 0, ROT0, "Yun Sung", "Rock Tris", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp
index 70c3f9fec9f..bdcf92bdbfe 100644
--- a/src/mame/drivers/z100.cpp
+++ b/src/mame/drivers/z100.cpp
@@ -177,7 +177,7 @@ public:
required_device<pia6821_device> m_pia1;
required_device<pic8259_device> m_picm;
required_device<pic8259_device> m_pics;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START(z100_io, AS_IO, 8, z100_state)
// AM_RANGE (0xa4, 0xa7) gateway (reserved)
// AM_RANGE (0xac, 0xad) Z-217 secondary disk controller (winchester)
// AM_RANGE (0xae, 0xaf) Z-217 primary disk controller (winchester)
- AM_RANGE (0xb0, 0xb3) AM_DEVREADWRITE("z207_fdc", fd1797_t, read, write)
+ AM_RANGE (0xb0, 0xb3) AM_DEVREADWRITE("z207_fdc", fd1797_device, read, write)
AM_RANGE (0xb4, 0xb4) AM_WRITE(floppy_select_w)
AM_RANGE (0xb5, 0xb5) AM_WRITE(floppy_motor_w)
// z-207 secondary disk controller (wd1797)
@@ -664,7 +664,7 @@ static SLOT_INTERFACE_START( z100_floppies )
SLOT_INTERFACE("dd", FLOPPY_525_DD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( z100, z100_state )
+static MACHINE_CONFIG_START( z100 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",I8088, XTAL_14_31818MHz/3)
MCFG_CPU_PROGRAM_MAP(z100_mem)
@@ -728,5 +728,5 @@ DRIVER_INIT_MEMBER(z100_state,z100)
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, z100, 0, 0, z100, z100, z100_state, z100, "Zenith", "Z-100", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1982, z100, 0, 0, z100, z100, z100_state, z100, "Zenith", "Z-100", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp
index ce59dec2464..cb081f103bf 100644
--- a/src/mame/drivers/z1013.cpp
+++ b/src/mame/drivers/z1013.cpp
@@ -362,7 +362,7 @@ static GFXDECODE_START( z1013 )
GFXDECODE_END
/* Machine driver */
-static MACHINE_CONFIG_START( z1013, z1013_state )
+static MACHINE_CONFIG_START( z1013 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_1MHz )
MCFG_CPU_PROGRAM_MAP(z1013_mem)
@@ -460,9 +460,9 @@ ROM_START( z1013k69 )
ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1985, z1013, 0, 0, z1013, z1013_8x4, driver_device, 0, "VEB Robotron Electronics Riesa", "Z1013 (matrix 8x4)", 0 )
-COMP( 1985, z1013a2, z1013, 0, z1013, z1013_8x8, driver_device, 0, "VEB Robotron Electronics Riesa", "Z1013 (matrix 8x8)", 0 )
-COMP( 1985, z1013k76, z1013, 0, z1013k76, z1013, driver_device, 0, "VEB Robotron Electronics Riesa", "Z1013 (K7659)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1985, z1013s60, z1013, 0, z1013k76, z1013_8x8, driver_device, 0, "VEB Robotron Electronics Riesa", "Z1013 (K7652/S6009)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
-COMP( 1985, z1013k69, z1013, 0, z1013k76, z1013, driver_device, 0, "VEB Robotron Electronics Riesa", "Z1013 (K7669)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1985, z1013, 0, 0, z1013, z1013_8x4, z1013_state, 0, "VEB Robotron Electronics Riesa", "Z1013 (matrix 8x4)", 0 )
+COMP( 1985, z1013a2, z1013, 0, z1013, z1013_8x8, z1013_state, 0, "VEB Robotron Electronics Riesa", "Z1013 (matrix 8x8)", 0 )
+COMP( 1985, z1013k76, z1013, 0, z1013k76, z1013, z1013_state, 0, "VEB Robotron Electronics Riesa", "Z1013 (K7659)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1985, z1013s60, z1013, 0, z1013k76, z1013_8x8, z1013_state, 0, "VEB Robotron Electronics Riesa", "Z1013 (K7652/S6009)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
+COMP( 1985, z1013k69, z1013, 0, z1013k76, z1013, z1013_state, 0, "VEB Robotron Electronics Riesa", "Z1013 (K7669)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp
index ac72881f1d7..a88275e75ed 100644
--- a/src/mame/drivers/z80dev.cpp
+++ b/src/mame/drivers/z80dev.cpp
@@ -105,7 +105,7 @@ INPUT_PORTS_START( z80dev )
PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("LD") PORT_CODE(KEYCODE_L)
INPUT_PORTS_END
-static MACHINE_CONFIG_START( z80dev, z80dev_state )
+static MACHINE_CONFIG_START( z80dev )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz)
MCFG_CPU_PROGRAM_MAP(z80dev_mem)
@@ -123,5 +123,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 198?, z80dev, 0, 0, z80dev, z80dev, driver_device, 0, "<unknown>", "Z80 dev board", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 198?, z80dev, 0, 0, z80dev, z80dev, z80dev_state, 0, "<unknown>", "Z80 dev board", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp
index 1bb5233afd3..d7c326a7cbf 100644
--- a/src/mame/drivers/z80ne.cpp
+++ b/src/mame/drivers/z80ne.cpp
@@ -409,7 +409,7 @@ static SLOT_INTERFACE_START( z80ne_floppies )
SLOT_INTERFACE("sssd", FLOPPY_525_SSSD)
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( z80ne, z80ne_state )
+static MACHINE_CONFIG_START( z80ne )
/* basic machine hardware */
MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
MCFG_CPU_PROGRAM_MAP(z80ne_mem)
@@ -462,7 +462,7 @@ static MACHINE_CONFIG_DERIVED( z80net, z80ne )
MCFG_RAM_EXTRA_OPTIONS("1K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( z80netb, z80ne_state )
+static MACHINE_CONFIG_START( z80netb )
/* basic machine hardware */
MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
MCFG_CPU_PROGRAM_MAP(z80netb_mem)
@@ -499,7 +499,7 @@ static MACHINE_CONFIG_START( z80netb, z80ne_state )
MCFG_RAM_EXTRA_OPTIONS("1K")
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( z80netf, z80ne_state )
+static MACHINE_CONFIG_START( z80netf )
/* basic machine hardware */
MCFG_CPU_ADD("z80ne", Z80, Z80NE_CPU_SPEED_HZ)
MCFG_CPU_PROGRAM_MAP(z80netf_mem)
@@ -594,8 +594,8 @@ ROM_START( z80netf )
ROM_LOAD( "ep2390.ic6", 0x14C00, 0x0400, CRC(28d28eee) SHA1(b80f75c1ac4905ae369ecbc9b9ce120cc85502ed) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, z80ne, 0, 0, z80ne, z80ne, z80ne_state, z80ne, "Nuova Elettronica", "Z80NE", MACHINE_NO_SOUND_HW)
-COMP( 1980, z80net, z80ne, 0, z80net, z80net, z80ne_state, z80net, "Nuova Elettronica", "Z80NE + LX.388", MACHINE_NO_SOUND_HW)
-COMP( 1980, z80netb, z80ne, 0, z80netb, z80net, z80ne_state, z80netb, "Nuova Elettronica", "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW)
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 1980, z80ne, 0, 0, z80ne, z80ne, z80ne_state, z80ne, "Nuova Elettronica", "Z80NE", MACHINE_NO_SOUND_HW)
+COMP( 1980, z80net, z80ne, 0, z80net, z80net, z80ne_state, z80net, "Nuova Elettronica", "Z80NE + LX.388", MACHINE_NO_SOUND_HW)
+COMP( 1980, z80netb, z80ne, 0, z80netb, z80net, z80ne_state, z80netb, "Nuova Elettronica", "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW)
COMP( 1980, z80netf, z80ne, 0, z80netf, z80netf, z80ne_state, z80netf, "Nuova Elettronica", "Z80NE + LX.388 + LX.390", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 87ec399d8a0..07f616d8847 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -20,6 +20,7 @@
#include "emu.h"
#include "includes/z88.h"
+
#include "screen.h"
#include "speaker.h"
@@ -620,7 +621,7 @@ static SLOT_INTERFACE_START(z88_cart)
SLOT_INTERFACE("1024kflash", Z88_1024K_FLASH) // 1024KB Flash cart
SLOT_INTERFACE_END
-static MACHINE_CONFIG_START( z88, z88_state )
+static MACHINE_CONFIG_START( z88 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_9_8304MHz/3) // divided by 3 through the uPD65031
MCFG_CPU_PROGRAM_MAP(z88_mem)
@@ -751,15 +752,15 @@ ROM_START(z88tr)
ROMX_LOAD("z88v317tk.rom", 0x00000, 0x20000, CRC(9468d677) SHA1(8d76e94f43846c736bf257d15d531c2df1e20fae), ROM_BIOS(1) )
ROM_END
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1988, z88 , 0, 0, z88, z88 , driver_device, 0, "Cambridge Computers", "Z88" , MACHINE_NOT_WORKING)
-COMP( 1988, z88de, z88, 0, z88, z88de, driver_device, 0, "Cambridge Computers", "Z88 (German)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88es, z88, 0, z88, z88es, driver_device, 0, "Cambridge Computers", "Z88 (Spanish)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88fr, z88, 0, z88, z88fr, driver_device, 0, "Cambridge Computers", "Z88 (French)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88it, z88, 0, z88, z88it, driver_device, 0, "Cambridge Computers", "Z88 (Italian)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88se, z88, 0, z88, z88se, driver_device, 0, "Cambridge Computers", "Z88 (Swedish)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88fi, z88, 0, z88, z88se, driver_device, 0, "Cambridge Computers", "Z88 (Finnish)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88no, z88, 0, z88, z88no, driver_device, 0, "Cambridge Computers", "Z88 (Norwegian)", MACHINE_NOT_WORKING)
-COMP( 1988, z88dk, z88, 0, z88, z88no, driver_device, 0, "Cambridge Computers", "Z88 (Danish)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88ch, z88, 0, z88, z88ch, driver_device, 0, "Cambridge Computers", "Z88 (Swiss)" , MACHINE_NOT_WORKING)
-COMP( 1988, z88tr, z88, 0, z88, z88tr, driver_device, 0, "Cambridge Computers", "Z88 (Turkish)" , MACHINE_NOT_WORKING)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1988, z88 , 0, 0, z88, z88 , z88_state, 0, "Cambridge Computers", "Z88" , MACHINE_NOT_WORKING)
+COMP( 1988, z88de, z88, 0, z88, z88de, z88_state, 0, "Cambridge Computers", "Z88 (German)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88es, z88, 0, z88, z88es, z88_state, 0, "Cambridge Computers", "Z88 (Spanish)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88fr, z88, 0, z88, z88fr, z88_state, 0, "Cambridge Computers", "Z88 (French)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88it, z88, 0, z88, z88it, z88_state, 0, "Cambridge Computers", "Z88 (Italian)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88se, z88, 0, z88, z88se, z88_state, 0, "Cambridge Computers", "Z88 (Swedish)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88fi, z88, 0, z88, z88se, z88_state, 0, "Cambridge Computers", "Z88 (Finnish)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88no, z88, 0, z88, z88no, z88_state, 0, "Cambridge Computers", "Z88 (Norwegian)", MACHINE_NOT_WORKING)
+COMP( 1988, z88dk, z88, 0, z88, z88no, z88_state, 0, "Cambridge Computers", "Z88 (Danish)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88ch, z88, 0, z88, z88ch, z88_state, 0, "Cambridge Computers", "Z88 (Swiss)" , MACHINE_NOT_WORKING)
+COMP( 1988, z88tr, z88, 0, z88, z88tr, z88_state, 0, "Cambridge Computers", "Z88 (Turkish)" , MACHINE_NOT_WORKING)
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index e842e268ebc..725a5b6d748 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -56,7 +56,7 @@ public:
{
}
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_WRITE8_MEMBER(port88_w);
DECLARE_WRITE_LINE_MEMBER(cass_w);
TIMER_DEVICE_CALLBACK_MEMBER(timer_callback);
@@ -187,7 +187,7 @@ static const gfx_layout z9001_charlayout =
8*8 /* every char takes 8 bytes */
};
-WRITE8_MEMBER( z9001_state::kbd_put )
+void z9001_state::kbd_put(u8 data)
{
m_maincpu->space(AS_PROGRAM).write_byte(0x0025, data);
}
@@ -197,7 +197,7 @@ static GFXDECODE_START( z9001 )
GFXDECODE_END
-static MACHINE_CONFIG_START( z9001, z9001_state )
+static MACHINE_CONFIG_START( z9001 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_9_8304MHz / 4)
MCFG_CPU_PROGRAM_MAP(z9001_mem)
@@ -225,7 +225,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state )
/* Devices */
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(z9001_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(z9001_state, kbd_put))
MCFG_TIMER_DRIVER_ADD_PERIODIC("z9001_timer", z9001_state, timer_callback, attotime::from_msec(10))
MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL_9_8304MHz / 4)
@@ -304,10 +304,10 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1984, z9001, 0, 0, z9001, z9001, driver_device, 0, "Robotron", "Z9001 (KC 85/1.10)", MACHINE_NOT_WORKING )
-COMP( 1986, kc85_111, z9001, 0, z9001, z9001, driver_device, 0, "Robotron", "KC 85/1.11", MACHINE_NOT_WORKING )
-COMP( 1987, kc87_10, z9001, 0, z9001, z9001, driver_device, 0, "Robotron", "KC 87.10", MACHINE_NOT_WORKING )
-COMP( 1987, kc87_11, z9001, 0, z9001, z9001, driver_device, 0, "Robotron", "KC 87.11", MACHINE_NOT_WORKING )
-COMP( 1987, kc87_20, z9001, 0, z9001, z9001, driver_device, 0, "Robotron", "KC 87.20", MACHINE_NOT_WORKING )
-COMP( 1987, kc87_21, z9001, 0, z9001, z9001, driver_device, 0, "Robotron", "KC 87.21", MACHINE_NOT_WORKING )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1984, z9001, 0, 0, z9001, z9001, z9001_state, 0, "Robotron", "Z9001 (KC 85/1.10)", MACHINE_NOT_WORKING )
+COMP( 1986, kc85_111, z9001, 0, z9001, z9001, z9001_state, 0, "Robotron", "KC 85/1.11", MACHINE_NOT_WORKING )
+COMP( 1987, kc87_10, z9001, 0, z9001, z9001, z9001_state, 0, "Robotron", "KC 87.10", MACHINE_NOT_WORKING )
+COMP( 1987, kc87_11, z9001, 0, z9001, z9001, z9001_state, 0, "Robotron", "KC 87.11", MACHINE_NOT_WORKING )
+COMP( 1987, kc87_20, z9001, 0, z9001, z9001, z9001_state, 0, "Robotron", "KC 87.20", MACHINE_NOT_WORKING )
+COMP( 1987, kc87_21, z9001, 0, z9001, z9001, z9001_state, 0, "Robotron", "KC 87.21", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp
index 1bc2e0f61f5..8a401fe20cb 100644
--- a/src/mame/drivers/zac2650.cpp
+++ b/src/mame/drivers/zac2650.cpp
@@ -239,7 +239,7 @@ static GFXDECODE_START( tinvader )
GFXDECODE_SCALE( nullptr, 0x1F00, s2636_character, 0, 2, 8, 6 ) /* dynamic */
GFXDECODE_END
-static MACHINE_CONFIG_START( tinvader, zac2650_state )
+static MACHINE_CONFIG_START( tinvader )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 3800000/4)
@@ -318,6 +318,6 @@ ROM_START( dodgem )
ROM_END
-GAMEL(1979?,tinv2650, 0, tinvader, tinvader, driver_device, 0, ROT270, "Zaccaria / Zelco", "The Invaders", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_tinv2650 )
-GAME( 1979?,sia2650, tinv2650, tinvader, sinvader, driver_device, 0, ROT270, "bootleg (Sidam)", "Super Invader Attack (bootleg of The Invaders)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 1980?
-GAME( 1979, dodgem, 0, tinvader, dodgem, driver_device, 0, ROT0, "Zaccaria", "Dodgem", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAMEL(1979?,tinv2650, 0, tinvader, tinvader, zac2650_state, 0, ROT270, "Zaccaria / Zelco", "The Invaders", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_tinv2650 )
+GAME( 1979?,sia2650, tinv2650, tinvader, sinvader, zac2650_state, 0, ROT270, "bootleg (Sidam)", "Super Invader Attack (bootleg of The Invaders)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 1980?
+GAME( 1979, dodgem, 0, tinvader, dodgem, zac2650_state, 0, ROT0, "Zaccaria", "Dodgem", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp
index d0e9146b2ad..b8adb03a90f 100644
--- a/src/mame/drivers/zac_1.cpp
+++ b/src/mame/drivers/zac_1.cpp
@@ -243,7 +243,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(zac_1_state::zac_1_outtimer)
}
}
-static MACHINE_CONFIG_START( zac_1, zac_1_state )
+static MACHINE_CONFIG_START( zac_1 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 6000000/2) // no xtal, just 2 chips forming a random oscillator
MCFG_CPU_PROGRAM_MAP(zac_1_map)
@@ -448,15 +448,15 @@ ROM_START(wsports)
ROM_LOAD ( "ws5.bin", 0x1000, 0x0400, CRC(5ef51ced) SHA1(390579d0482ceabf87924f7718ef33e336726d92))
ROM_END
-GAME(1981, ewf, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Earth Wind Fire", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1980, firemntn, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Fire Mountain", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1978, futurwld, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Future World", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1979, hotwheel, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Hot Wheels", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1978, hod, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "House of Diamonds", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1981, locomotp, 0, locomotp, zac_1, driver_device, 0, ROT0, "Zaccaria", "Locomotion", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1979, strapids, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Shooting the Rapids", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1980, sshtlzac, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Space Shuttle (Zaccaria)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1980, stargod, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Star God", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1980, stargoda, stargod, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Star God (alternate sound)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1980, stargodb, stargod, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Star God (variable replay score)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME(1978, wsports, 0, zac_1, zac_1, driver_device, 0, ROT0, "Zaccaria", "Winter Sports", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1981, ewf, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Earth Wind Fire", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1980, firemntn, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Fire Mountain", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1978, futurwld, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Future World", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1979, hotwheel, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Hot Wheels", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1978, hod, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "House of Diamonds", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1981, locomotp, 0, locomotp, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Locomotion", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1979, strapids, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Shooting the Rapids", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1980, sshtlzac, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Space Shuttle (Zaccaria)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1980, stargod, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Star God", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1980, stargoda, stargod, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Star God (alternate sound)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1980, stargodb, stargod, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Star God (variable replay score)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME(1978, wsports, 0, zac_1, zac_1, zac_1_state, 0, ROT0, "Zaccaria", "Winter Sports", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp
index b8843aafc83..b0499522c15 100644
--- a/src/mame/drivers/zac_2.cpp
+++ b/src/mame/drivers/zac_2.cpp
@@ -201,7 +201,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(zac_2_state::zac_2_outtimer)
}
}
-static MACHINE_CONFIG_START( zac_2, zac_2_state )
+static MACHINE_CONFIG_START( zac_2 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", S2650, 6000000/2)
MCFG_CPU_PROGRAM_MAP(zac_2_map)
@@ -966,44 +966,44 @@ ROM_START(zankor)
ROM_LOAD("zan_ic6.128", 0x8000, 0x4000, CRC(13a5b8d4) SHA1(d8c976b3f5e9c7cded0922feefa1531c59432515))
ROM_END
-GAME(1986, bbeltzac, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Black Belt (Zaccaria)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, clown, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Clown", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, dvlrider, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Devil Riders", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, dvlrideri, dvlrider, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Devil Riders (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, dvlriderg, dvlrider, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Devil Riders (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, dvlriderf, dvlrider, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Devil Riders (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, farfalla, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Farfalla", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, farfallai, farfalla, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Farfalla (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, farfallag, farfalla, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Farfalla (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, mcastle, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Magic Castle", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, mcastlei, mcastle, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Magic Castle (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, mcastleg, mcastle, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Magic Castle (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1984, mcastlef, mcastle, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Magic Castle (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, mexico, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Mexico 86 (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, nstrphnx, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "New Star's Phoenix (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, pinchamp, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pinball Champ", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, pinchampg, pinchamp, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pinball Champ (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, pinchampi, pinchamp, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pinball Champ (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, pinchamp7, pinchamp, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pinball Champ (7 digits)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, pinchamp7g, pinchamp, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pinball Champ (7 digits German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, pinchamp7i, pinchamp, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pinball Champ (7 digits Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, poolcham, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pool Champion", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, poolchami, poolcham, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pool Champion (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, poolchama, poolcham, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Pool Champion (alternate sound)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, robot, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Robot (Zaccaria)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, roboti, robot, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Robot (Zaccaria, Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, robotg, robot, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Robot (Zaccaria, German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1985, robotf, robot, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Robot (Zaccaria, French speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, scram_tp, 0, zac_2, zac_2, driver_device, 0, ROT0, "Tecnoplay", "Scramble (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, socrking, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Soccer Kings", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, socrkinga, socrking, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Soccer Kings (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, socrkingi, socrking, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Soccer Kings (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1982, socrkingg, socrking, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Soccer Kings (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, spookyp, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Spooky", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, spookyi, spookyp, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Spooky (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, strsphnx, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Star's Phoenix (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, thndrman, 0, zac_2, zac_2, driver_device, 0, ROT0, "Apple Time", "Thunder Man", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, tmachzac, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Time Machine (Zaccaria)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, tmachzacg, tmachzac, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Time Machine (Zaccaria, German speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1983, tmachzacf, tmachzac, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Time Machine (Zaccaria, French speech)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, zankor, 0, zac_2, zac_2, driver_device, 0, ROT0, "Zaccaria", "Zankor (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, bbeltzac, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Black Belt (Zaccaria)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, clown, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Clown", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, dvlrider, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Devil Riders", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, dvlrideri, dvlrider, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Devil Riders (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, dvlriderg, dvlrider, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Devil Riders (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, dvlriderf, dvlrider, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Devil Riders (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, farfalla, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Farfalla", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, farfallai, farfalla, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Farfalla (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, farfallag, farfalla, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Farfalla (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, mcastle, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Magic Castle", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, mcastlei, mcastle, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Magic Castle (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, mcastleg, mcastle, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Magic Castle (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1984, mcastlef, mcastle, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Magic Castle (French speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, mexico, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Mexico 86 (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, nstrphnx, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "New Star's Phoenix (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, pinchamp, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pinball Champ", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, pinchampg, pinchamp, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pinball Champ (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, pinchampi, pinchamp, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pinball Champ (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, pinchamp7, pinchamp, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pinball Champ (7 digits)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, pinchamp7g, pinchamp, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pinball Champ (7 digits German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, pinchamp7i, pinchamp, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pinball Champ (7 digits Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, poolcham, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pool Champion", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, poolchami, poolcham, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pool Champion (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, poolchama, poolcham, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Pool Champion (alternate sound)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, robot, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Robot (Zaccaria)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, roboti, robot, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Robot (Zaccaria, Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, robotg, robot, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Robot (Zaccaria, German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1985, robotf, robot, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Robot (Zaccaria, French speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, scram_tp, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Tecnoplay", "Scramble (Pinball)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, socrking, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Soccer Kings", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, socrkinga, socrking, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Soccer Kings (alternate set)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, socrkingi, socrking, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Soccer Kings (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1982, socrkingg, socrking, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Soccer Kings (German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, spookyp, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Spooky", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, spookyi, spookyp, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Spooky (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, strsphnx, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Star's Phoenix (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, thndrman, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Apple Time", "Thunder Man", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, tmachzac, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Time Machine (Zaccaria)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, tmachzacg, tmachzac, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Time Machine (Zaccaria, German speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1983, tmachzacf, tmachzac, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Time Machine (Zaccaria, French speech)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, zankor, 0, zac_2, zac_2, zac_2_state, 0, ROT0, "Zaccaria", "Zankor (Italian speech)", MACHINE_IS_SKELETON_MECHANICAL)
diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp
index 2a34b478a14..aa2faf52ab6 100644
--- a/src/mame/drivers/zac_proto.cpp
+++ b/src/mame/drivers/zac_proto.cpp
@@ -233,7 +233,7 @@ void zac_proto_state::machine_reset()
output().set_digit_value(10, 0x3f); // units shows zero all the time
}
-static MACHINE_CONFIG_START( zac_proto, zac_proto_state )
+static MACHINE_CONFIG_START( zac_proto )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", INS8060, XTAL_4MHz / 2) // Using SC/MP II chip which has an internal /2 circuit.
MCFG_CPU_PROGRAM_MAP(zac_proto_map)
@@ -279,6 +279,6 @@ ROM_START(spacecty)
ROM_LOAD("zsc4.dat", 0x1400, 0x0400, CRC(69e0bb95) SHA1(d9a1d0159bf49445b0ece0f9d7806ed80657c2b2))
ROM_END
-GAME(1978, skijump, 0, zac_proto, zac_proto, driver_device, 0, ROT0, "Zaccaria", "Ski Jump", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1979, spacecty, 0, zac_proto, zac_proto, driver_device, 0, ROT0, "Zaccaria", "Space City", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-GAME(1978, strike, 0, zac_proto, zac_proto, driver_device, 0, ROT0, "Zaccaria", "Strike", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1978, skijump, 0, zac_proto, zac_proto, zac_proto_state, 0, ROT0, "Zaccaria", "Ski Jump", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1979, spacecty, 0, zac_proto, zac_proto, zac_proto_state, 0, ROT0, "Zaccaria", "Space City", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1978, strike, 0, zac_proto, zac_proto, zac_proto_state, 0, ROT0, "Zaccaria", "Strike", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp
index 6332f15e54c..c45538846b3 100644
--- a/src/mame/drivers/zaccaria.cpp
+++ b/src/mame/drivers/zaccaria.cpp
@@ -338,7 +338,7 @@ INTERRUPT_GEN_MEMBER(zaccaria_state::vblank_irq)
}
-static MACHINE_CONFIG_START( zaccaria, zaccaria_state )
+static MACHINE_CONFIG_START( zaccaria )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80,XTAL_18_432MHz/6) /* verified on pcb */
@@ -534,7 +534,7 @@ ROM_END
-GAME( 1983, monymony, 0, zaccaria, monymony, driver_device, 0, ROT90, "Zaccaria", "Money Money", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, jackrabt, 0, zaccaria, jackrabt, driver_device, 0, ROT90, "Zaccaria", "Jack Rabbit (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, jackrabt2, jackrabt, zaccaria, jackrabt, driver_device, 0, ROT90, "Zaccaria", "Jack Rabbit (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, jackrabts, jackrabt, zaccaria, jackrabt, driver_device, 0, ROT90, "Zaccaria", "Jack Rabbit (special)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, monymony, 0, zaccaria, monymony, zaccaria_state, 0, ROT90, "Zaccaria", "Money Money", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, jackrabt, 0, zaccaria, jackrabt, zaccaria_state, 0, ROT90, "Zaccaria", "Jack Rabbit (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, jackrabt2, jackrabt, zaccaria, jackrabt, zaccaria_state, 0, ROT90, "Zaccaria", "Jack Rabbit (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, jackrabts, jackrabt, zaccaria, jackrabt, zaccaria_state, 0, ROT90, "Zaccaria", "Jack Rabbit (special)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp
index 4819ae7242a..455531b56e9 100644
--- a/src/mame/drivers/zapcomputer.cpp
+++ b/src/mame/drivers/zapcomputer.cpp
@@ -156,7 +156,7 @@ void zapcomp_state::machine_start()
{
}
-static MACHINE_CONFIG_START( zapcomp, zapcomp_state )
+static MACHINE_CONFIG_START( zapcomp )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_2MHz)
MCFG_CPU_PROGRAM_MAP(zapcomp_mem)
@@ -171,5 +171,5 @@ ROM_START( zapcomp )
ROM_LOAD("zap.rom", 0x0000, 0x0400, CRC(3f4416e9) SHA1(d6493707bfba1a1e1e551f8144194afa5bda3316) )
ROM_END
-// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1981, zapcomp, 0, 0, zapcomp, zapcomp, driver_device, 0, "Steve Ciarcia / BYTE / McGRAW-HILL", "ZAP - Z80 Applications Processor", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
+COMP( 1981, zapcomp, 0, 0, zapcomp, zapcomp, zapcomp_state, 0, "Steve Ciarcia / BYTE / McGRAW-HILL", "ZAP - Z80 Applications Processor", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index fe86bec9ec1..15920f5eddd 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1747,7 +1747,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(zaurus_state::rtc_irq_callback)
}
// TODO: main CPU differs greatly between versions!
-static MACHINE_CONFIG_START( zaurus, zaurus_state )
+static MACHINE_CONFIG_START( zaurus )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",PXA255,MAIN_CLOCK)
@@ -1809,9 +1809,9 @@ ROM_START( zslc1000 )
ROM_LOAD( "openzaurus 3.5.3 - zimage-sharp sl-c1000-20050427214434.bin", 0x000000, 0x128980, BAD_DUMP CRC(1e1a9279) SHA1(909ac3f00385eced55822d6a155b79d9d25f43b3) )
ROM_END
-COMP( 2002, zsl5500, 0, 0, zaurus, zaurus, driver_device, 0, "Sharp", "Zaurus SL-5500 \"Collie\"", MACHINE_IS_SKELETON )
-COMP( 2002, zsl5600, 0, 0, zaurus, zaurus, driver_device, 0, "Sharp", "Zaurus SL-5600 / SL-B500 \"Poodle\"", MACHINE_IS_SKELETON )
-COMP( 2003, zslc750, 0, 0, zaurus, zaurus, driver_device, 0, "Sharp", "Zaurus SL-C750 \"Shepherd\" (Japan)", MACHINE_IS_SKELETON )
-COMP( 2004, zslc760, 0, 0, zaurus, zaurus, driver_device, 0, "Sharp", "Zaurus SL-C760 \"Husky\" (Japan)", MACHINE_IS_SKELETON )
-COMP( 200?, zslc3000, 0, 0, zaurus, zaurus, driver_device, 0, "Sharp", "Zaurus SL-C3000 \"Spitz\" (Japan)", MACHINE_IS_SKELETON )
-COMP( 200?, zslc1000, 0, 0, zaurus, zaurus, driver_device, 0, "Sharp", "Zaurus SL-C3000 \"Akita\" (Japan)", MACHINE_IS_SKELETON )
+COMP( 2002, zsl5500, 0, 0, zaurus, zaurus, zaurus_state, 0, "Sharp", "Zaurus SL-5500 \"Collie\"", MACHINE_IS_SKELETON )
+COMP( 2002, zsl5600, 0, 0, zaurus, zaurus, zaurus_state, 0, "Sharp", "Zaurus SL-5600 / SL-B500 \"Poodle\"", MACHINE_IS_SKELETON )
+COMP( 2003, zslc750, 0, 0, zaurus, zaurus, zaurus_state, 0, "Sharp", "Zaurus SL-C750 \"Shepherd\" (Japan)", MACHINE_IS_SKELETON )
+COMP( 2004, zslc760, 0, 0, zaurus, zaurus, zaurus_state, 0, "Sharp", "Zaurus SL-C760 \"Husky\" (Japan)", MACHINE_IS_SKELETON )
+COMP( 200?, zslc3000, 0, 0, zaurus, zaurus, zaurus_state, 0, "Sharp", "Zaurus SL-C3000 \"Spitz\" (Japan)", MACHINE_IS_SKELETON )
+COMP( 200?, zslc1000, 0, 0, zaurus, zaurus, zaurus_state, 0, "Sharp", "Zaurus SL-C3000 \"Akita\" (Japan)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp
index 9c3cd3f05c8..19bc5e26523 100644
--- a/src/mame/drivers/zaxxon.cpp
+++ b/src/mame/drivers/zaxxon.cpp
@@ -914,7 +914,7 @@ GFXDECODE_END
*
*************************************/
-static MACHINE_CONFIG_START( root, zaxxon_state )
+static MACHINE_CONFIG_START( root )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/16)
@@ -1581,25 +1581,25 @@ DRIVER_INIT_MEMBER(zaxxon_state,razmataz)
*************************************/
/* these games run on standard Zaxxon hardware */
-GAME( 1982, zaxxon, 0, zaxxon, zaxxon, driver_device, 0, ROT90, "Sega", "Zaxxon (set 1, rev D)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zaxxon2, zaxxon, zaxxon, zaxxon, driver_device, 0, ROT90, "Sega", "Zaxxon (set 2, unknown rev)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zaxxon3, zaxxon, zaxxon, zaxxon, driver_device, 0, ROT90, "Sega", "Zaxxon (set 3, unknown rev)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zaxxonj, zaxxon, szaxxon, zaxxon, zaxxon_state, zaxxonj, ROT90, "Sega", "Zaxxon (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zaxxonb, zaxxon, szaxxon, zaxxon, zaxxon_state, zaxxonj, ROT90, "bootleg", "Jackson", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zaxxon, 0, zaxxon, zaxxon, zaxxon_state, 0, ROT90, "Sega", "Zaxxon (set 1, rev D)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zaxxon2, zaxxon, zaxxon, zaxxon, zaxxon_state, 0, ROT90, "Sega", "Zaxxon (set 2, unknown rev)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zaxxon3, zaxxon, zaxxon, zaxxon, zaxxon_state, 0, ROT90, "Sega", "Zaxxon (set 3, unknown rev)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zaxxonj, zaxxon, szaxxon, zaxxon, zaxxon_state, zaxxonj, ROT90, "Sega", "Zaxxon (Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zaxxonb, zaxxon, szaxxon, zaxxon, zaxxon_state, zaxxonj, ROT90, "bootleg", "Jackson", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* standard Zaxxon hardware but extra sound board plugged into 8255 PPI socket and encrypted cpu */
-GAME( 1982, szaxxon, 0, szaxxone, szaxxon, driver_device, 0, ROT90, "Sega", "Super Zaxxon (315-5013)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, szaxxon, 0, szaxxone, szaxxon, zaxxon_state, 0, ROT90, "Sega", "Super Zaxxon (315-5013)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* standard Zaxxon hardware? but encrypted cpu */
-GAME( 1984, futspy, 0, futspye, futspy, driver_device, 0, ROT90, "Sega", "Future Spy (315-5061)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, futspy, 0, futspye, futspy, zaxxon_state, 0, ROT90, "Sega", "Future Spy (315-5061)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
/* these games run on modified Zaxxon hardware with no skewing, extra inputs, and a */
/* G-80 Universal Sound Board */
-GAME( 1983, razmataz, 0, razmataze, razmataz, zaxxon_state, razmataz, ROT90, "Sega", "Razzmatazz", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, ixion, 0, ixion, ixion, driver_device, 0, ROT270, "Sega", "Ixion (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
+GAME( 1983, razmataz, 0, razmataze, razmataz, zaxxon_state, razmataz, ROT90, "Sega", "Razzmatazz", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, ixion, 0, ixion, ixion, zaxxon_state, 0, ROT270, "Sega", "Ixion (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE)
/* these games run on a slightly newer Zaxxon hardware with more ROM space and a */
/* custom sprite DMA chip */
-GAME( 1983, congo, 0, congo, congo, driver_device, 0, ROT90, "Sega", "Congo Bongo (Rev C, 2 board stack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, congoa, congo, congo, congo, driver_device, 0, ROT90, "Sega", "Congo Bongo (Rev C, 3 board stack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, tiptop, congo, congo, congo, driver_device, 0, ROT90, "Sega", "Tip Top (3 board stack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, congo, 0, congo, congo, zaxxon_state, 0, ROT90, "Sega", "Congo Bongo (Rev C, 2 board stack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, congoa, congo, congo, congo, zaxxon_state, 0, ROT90, "Sega", "Congo Bongo (Rev C, 3 board stack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, tiptop, congo, congo, congo, zaxxon_state, 0, ROT90, "Sega", "Tip Top (3 board stack)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp
index 1c654bd43da..5670cc958aa 100644
--- a/src/mame/drivers/zerozone.cpp
+++ b/src/mame/drivers/zerozone.cpp
@@ -168,7 +168,7 @@ void zerozone_state::machine_reset()
m_tilebank = 0;
}
-static MACHINE_CONFIG_START( zerozone, zerozone_state )
+static MACHINE_CONFIG_START( zerozone )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", M68000, 10000000) /* 10 MHz */
@@ -199,7 +199,7 @@ static MACHINE_CONFIG_START( zerozone, zerozone_state )
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
- MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
+ MCFG_OKIM6295_ADD("oki", 1056000, PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
@@ -245,5 +245,5 @@ ROM_START( lvgirl94 )
ROM_END
-GAME( 1993, zerozone, 0, zerozone, zerozone, driver_device, 0, ROT0, "Comad", "Zero Zone", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, lvgirl94, 0, zerozone, zerozone, driver_device, 0, ROT0, "Comad", "Las Vegas Girl (Girl '94)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, zerozone, 0, zerozone, zerozone, zerozone_state, 0, ROT0, "Comad", "Zero Zone", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, lvgirl94, 0, zerozone, zerozone, zerozone_state, 0, ROT0, "Comad", "Las Vegas Girl (Girl '94)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/zexall.cpp b/src/mame/drivers/zexall.cpp
index 9c25629d73a..8823cc55db8 100644
--- a/src/mame/drivers/zexall.cpp
+++ b/src/mame/drivers/zexall.cpp
@@ -139,7 +139,7 @@ INPUT_PORTS_END
Machine Drivers
******************************************************************************/
-static MACHINE_CONFIG_START( zexall, zexall_state )
+static MACHINE_CONFIG_START( zexall )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz*10)
MCFG_CPU_PROGRAM_MAP(z80_mem)
@@ -167,5 +167,5 @@ ROM_END
Drivers
******************************************************************************/
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 2009, zexall, 0, 0, zexall, zexall, zexall_state, zexall, "Frank Cringle & MESSDEV", "ZEXALL Z80 instruction set exerciser (modified for MESS)", MACHINE_NO_SOUND_HW )
+// YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS
+COMP( 2009, zexall, 0, 0, zexall, zexall, zexall_state, zexall, "Frank Cringle & MESSDEV", "ZEXALL Z80 instruction set exerciser (modified for MESS)", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp
index 676a2082723..ea4fae00fbb 100644
--- a/src/mame/drivers/zn.cpp
+++ b/src/mame/drivers/zn.cpp
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( zn_map, AS_PROGRAM, 32, zn_state )
AM_RANGE(0x1fb20000, 0x1fb20007) AM_READ16(unknown_r, 0xffffffff)
ADDRESS_MAP_END
-static MACHINE_CONFIG_START( zn1_1mb_vram, zn_state )
+static MACHINE_CONFIG_START( zn1_1mb_vram )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8530CQ, XTAL_67_7376MHz )
@@ -357,7 +357,7 @@ static MACHINE_CONFIG_DERIVED( zn1_2mb_vram, zn1_1mb_vram )
MCFG_PSXGPU_REPLACE( "maincpu", "gpu", CXD8561Q, 0x200000, XTAL_53_693175MHz )
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( zn2, zn_state )
+static MACHINE_CONFIG_START( zn2 )
/* basic machine hardware */
MCFG_CPU_ADD( "maincpu", CXD8661R, XTAL_100MHz )
@@ -1358,8 +1358,8 @@ static MACHINE_CONFIG_DERIVED( coh1000w, zn1_2mb_vram )
MCFG_VT83C461_ADD("ide", ata_devices, "hdd", nullptr, true)
MCFG_ATA_INTERFACE_IRQ_HANDLER(DEVWRITELINE("maincpu:irq", psxirq_device, intin10))
- MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psx_dma_read_delegate(&zn_state::atpsx_dma_read, (zn_state *) owner ) )
- MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psx_dma_write_delegate(&zn_state::atpsx_dma_write, (zn_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_READ( "maincpu", 5, psxdma_device::read_delegate(&zn_state::atpsx_dma_read, (zn_state *) owner ) )
+ MCFG_PSX_DMA_CHANNEL_WRITE( "maincpu", 5, psxdma_device::write_delegate(&zn_state::atpsx_dma_write, (zn_state *) owner ) )
MACHINE_CONFIG_END
/*
@@ -5140,131 +5140,131 @@ ROM_START( hvnsgate )
ROM_END
/* Capcom ZN1 */
-GAME( 1995, coh1000c, 0, coh1000c, zn, driver_device, 0, ROT0, "Capcom", "ZN1", MACHINE_IS_BIOS_ROOT )
-GAME( 1995, ts2, coh1000c, coh1000c, zn6b, driver_device, 0, ROT0, "Capcom / Takara", "Battle Arena Toshinden 2 (USA 951124)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, ts2a, ts2, coh1000c, zn6b, driver_device, 0, ROT0, "Capcom / Takara", "Battle Arena Toshinden 2 (USA 951124) Older", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, ts2j, ts2, coh1000c, zn6b, driver_device, 0, ROT0, "Capcom / Takara", "Battle Arena Toshinden 2 (Japan 951124)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, starglad, coh1000c, coh1000c, zn6b, driver_device, 0, ROT0, "Capcom", "Star Gladiator Episode I: Final Crusade (USA 960627)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, stargladj, starglad, coh1000c, zn6b, driver_device, 0, ROT0, "Capcom", "Star Gladiator Episode I: Final Crusade (Japan 960627)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, glpracr, coh1000c, glpracr, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer (English Ver 10.17.K)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, glpracrj, glpracr, glpracr, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer (Japanese Ver 9.01.12)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, sfex, coh1000c, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX (Euro 961219)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, sfexu, sfex, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX (USA 961219)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, sfexa, sfex, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX (Asia 961219)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, sfexj, sfex, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX (Japan 961130)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, sfexp, coh1000c, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (USA 970407)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, sfexpu1, sfexp, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (USA 970311)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, sfexpj, sfexp, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (Japan 970407)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, sfexpj1, sfexp, coh1002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (Japan 970311)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, coh1000c, 0, coh1000c, zn, zn_state, 0, ROT0, "Capcom", "ZN1", MACHINE_IS_BIOS_ROOT )
+GAME( 1995, ts2, coh1000c, coh1000c, zn6b, zn_state, 0, ROT0, "Capcom / Takara", "Battle Arena Toshinden 2 (USA 951124)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, ts2a, ts2, coh1000c, zn6b, zn_state, 0, ROT0, "Capcom / Takara", "Battle Arena Toshinden 2 (USA 951124) Older", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, ts2j, ts2, coh1000c, zn6b, zn_state, 0, ROT0, "Capcom / Takara", "Battle Arena Toshinden 2 (Japan 951124)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, starglad, coh1000c, coh1000c, zn6b, zn_state, 0, ROT0, "Capcom", "Star Gladiator Episode I: Final Crusade (USA 960627)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, stargladj, starglad, coh1000c, zn6b, zn_state, 0, ROT0, "Capcom", "Star Gladiator Episode I: Final Crusade (Japan 960627)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, glpracr, coh1000c, glpracr, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer (English Ver 10.17.K)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, glpracrj, glpracr, glpracr, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer (Japanese Ver 9.01.12)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, sfex, coh1000c, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX (Euro 961219)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, sfexu, sfex, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX (USA 961219)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, sfexa, sfex, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX (Asia 961219)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, sfexj, sfex, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX (Japan 961130)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, sfexp, coh1000c, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (USA 970407)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, sfexpu1, sfexp, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (USA 970311)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, sfexpj, sfexp, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (Japan 970407)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, sfexpj1, sfexp, coh1002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX Plus (Japan 970311)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Capcom ZN2 */
-GAME( 1997, coh3002c, 0, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "ZN2", MACHINE_IS_BIOS_ROOT )
-GAME( 1997, rvschool, coh3002c, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Rival Schools: United By Fate (Euro 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, rvschoolu, rvschool, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Rival Schools: United By Fate (USA 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, rvschoola, rvschool, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Rival Schools: United By Fate (Asia 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, jgakuen, rvschool, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Shiritsu Justice Gakuen: Legion of Heroes (Japan 971216)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, jgakuen1, rvschool, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Shiritsu Justice Gakuen: Legion of Heroes (Japan 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sfex2, coh3002c, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (USA 980526)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sfex2u1, sfex2, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (USA 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sfex2a, sfex2, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (Asia 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sfex2h, sfex2, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (Hispanic 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, sfex2j, sfex2, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (Japan 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, plsmaswd, coh3002c, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Plasma Sword: Nightmare of Bilstein (USA 980316)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, plsmaswda, plsmaswd, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Plasma Sword: Nightmare of Bilstein (Asia 980316)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, stargld2, plsmaswd, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Star Gladiator 2: Nightmare of Bilstein (Japan 980316)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, tgmj, coh3002c, coh3002c, zn4w, driver_device, 0, ROT0, "Arika / Capcom", "Tetris The Grand Master (Japan 980710)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, techromn, coh3002c, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Tech Romancer (Euro 980914)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, techromnu, techromn, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Tech Romancer (USA 980914)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, kikaioh, techromn, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom", "Choukou Senki Kikaioh (Japan 980914)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, sfex2p, coh3002c, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (USA 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, sfex2pa, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Asia 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, sfex2ph, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Hispanic 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, sfex2pj, sfex2p, coh3002c, zn6b, driver_device, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Japan 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, strider2, coh3002c, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (USA 991213)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // random hangs / crashes
-GAME( 1999, strider2a, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider 2 (Asia 991213)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, shiryu2, strider2, coh3002c, zn, driver_device, 0, ROT0, "Capcom", "Strider Hiryu 2 (Japan 991213)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1997, coh3002c, 0, coh3002c, zn, zn_state, 0, ROT0, "Capcom", "ZN2", MACHINE_IS_BIOS_ROOT )
+GAME( 1997, rvschool, coh3002c, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Rival Schools: United By Fate (Euro 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, rvschoolu, rvschool, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Rival Schools: United By Fate (USA 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, rvschoola, rvschool, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Rival Schools: United By Fate (Asia 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, jgakuen, rvschool, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Shiritsu Justice Gakuen: Legion of Heroes (Japan 971216)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, jgakuen1, rvschool, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Shiritsu Justice Gakuen: Legion of Heroes (Japan 971117)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sfex2, coh3002c, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (USA 980526)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sfex2u1, sfex2, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (USA 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sfex2a, sfex2, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (Asia 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sfex2h, sfex2, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (Hispanic 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, sfex2j, sfex2, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 (Japan 980312)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, plsmaswd, coh3002c, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Plasma Sword: Nightmare of Bilstein (USA 980316)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, plsmaswda, plsmaswd, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Plasma Sword: Nightmare of Bilstein (Asia 980316)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, stargld2, plsmaswd, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Star Gladiator 2: Nightmare of Bilstein (Japan 980316)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, tgmj, coh3002c, coh3002c, zn4w, zn_state, 0, ROT0, "Arika / Capcom", "Tetris The Grand Master (Japan 980710)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, techromn, coh3002c, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Tech Romancer (Euro 980914)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, techromnu, techromn, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Tech Romancer (USA 980914)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, kikaioh, techromn, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom", "Choukou Senki Kikaioh (Japan 980914)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, sfex2p, coh3002c, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (USA 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, sfex2pa, sfex2p, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Asia 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, sfex2ph, sfex2p, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Hispanic 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, sfex2pj, sfex2p, coh3002c, zn6b, zn_state, 0, ROT0, "Capcom / Arika", "Street Fighter EX2 Plus (Japan 990611)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, strider2, coh3002c, coh3002c, zn, zn_state, 0, ROT0, "Capcom", "Strider 2 (USA 991213)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // random hangs / crashes
+GAME( 1999, strider2a, strider2, coh3002c, zn, zn_state, 0, ROT0, "Capcom", "Strider 2 (Asia 991213)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, shiryu2, strider2, coh3002c, zn, zn_state, 0, ROT0, "Capcom", "Strider Hiryu 2 (Japan 991213)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
/* Atari */
-GAME( 1996, coh1000w, 0, coh1000w, zn, driver_device, 0, ROT0, "Atari", "Atari PSX", MACHINE_IS_BIOS_ROOT )
-GAME( 1996, primrag2, coh1000w, coh1000w, primrag2, driver_device, 0, ROT0, "Atari", "Primal Rage 2 (Ver 0.36a)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // watchdog reset at startup
+GAME( 1996, coh1000w, 0, coh1000w, zn, zn_state, 0, ROT0, "Atari", "Atari PSX", MACHINE_IS_BIOS_ROOT )
+GAME( 1996, primrag2, coh1000w, coh1000w, primrag2, zn_state, 0, ROT0, "Atari", "Primal Rage 2 (Ver 0.36a)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // watchdog reset at startup
/* Acclaim */
-GAME( 1995, coh1000a, 0, coh1000a, zn, driver_device, 0, ROT0, "Acclaim", "Acclaim PSX", MACHINE_IS_BIOS_ROOT )
-GAME( 1996, nbajamex, coh1000a, nbajamex, nbajamex, zn_state, nbajamex, ROT0, "Acclaim", "NBA Jam Extreme (ver. 1.10I)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, nbajamexa, nbajamex, nbajamex, nbajamex, zn_state, nbajamex, ROT0, "Acclaim", "NBA Jam Extreme (ver. 1.04)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, jdredd, coh1000a, jdredd, jdredd, driver_device, 0, ROT0, "Acclaim", "Judge Dredd (Rev C Dec. 17 1997)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, jdreddb, jdredd, jdredd, jdredd, driver_device, 0, ROT0, "Acclaim", "Judge Dredd (Rev B Nov. 26 1997)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, coh1000a, 0, coh1000a, zn, zn_state, 0, ROT0, "Acclaim", "Acclaim PSX", MACHINE_IS_BIOS_ROOT )
+GAME( 1996, nbajamex, coh1000a, nbajamex, nbajamex, zn_state, nbajamex, ROT0, "Acclaim", "NBA Jam Extreme (ver. 1.10I)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, nbajamexa, nbajamex, nbajamex, nbajamex, zn_state, nbajamex, ROT0, "Acclaim", "NBA Jam Extreme (ver. 1.04)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, jdredd, coh1000a, jdredd, jdredd, zn_state, 0, ROT0, "Acclaim", "Judge Dredd (Rev C Dec. 17 1997)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, jdreddb, jdredd, jdredd, jdredd, zn_state, 0, ROT0, "Acclaim", "Judge Dredd (Rev B Nov. 26 1997)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Tecmo */
-GAME( 1997, coh1002m, 0, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "TPS", MACHINE_IS_BIOS_ROOT )
-GAME( 1997, glpracr2, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer 2 (Export)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, glpracr2j, glpracr2, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, glpracr2l, glpracr2, coh1002ml, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer 2 Link HW (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, doapp, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Dead Or Alive ++ (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, cbaj, coh1002m, coh1002msnd, zn, driver_device, 0, ROT0, "UEP Systems", "Cool Boarders Arcade Jam", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, shngmtkb, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Sunsoft / Activision", "Shanghai Matekibuyuu", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, tondemo, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Tondemo Crisis (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, glpracr3, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer 3 (Export)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, glpracr3j, glpracr3, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Gallop Racer 3 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, flamegun, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Gaps Inc.", "Flame Gunner", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, flamegunj, flamegun, coh1002m, zn, driver_device, 0, ROT0, "Gaps Inc.", "Flame Gunner (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1999, lpadv, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Amuse World", "Logic Pro Adventure (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, tblkkuzu, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tamsoft / D3 Publisher", "The Block Kuzushi (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, 1on1gov, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "1 on 1 Government (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, tecmowcm, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Tecmo World Cup Millennium (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2001, mfjump, coh1002m, coh1002m, zn, driver_device, 0, ROT0, "Tecmo", "Monster Farm Jump (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, coh1002m, 0, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "TPS", MACHINE_IS_BIOS_ROOT )
+GAME( 1997, glpracr2, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer 2 (Export)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, glpracr2j, glpracr2, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, glpracr2l, glpracr2, coh1002ml, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer 2 Link HW (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, doapp, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Dead Or Alive ++ (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, cbaj, coh1002m, coh1002msnd, zn, zn_state, 0, ROT0, "UEP Systems", "Cool Boarders Arcade Jam", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, shngmtkb, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Sunsoft / Activision", "Shanghai Matekibuyuu", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, tondemo, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Tondemo Crisis (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, glpracr3, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer 3 (Export)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, glpracr3j, glpracr3, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Gallop Racer 3 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, flamegun, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Gaps Inc.", "Flame Gunner", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, flamegunj, flamegun, coh1002m, zn, zn_state, 0, ROT0, "Gaps Inc.", "Flame Gunner (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1999, lpadv, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Amuse World", "Logic Pro Adventure (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, tblkkuzu, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tamsoft / D3 Publisher", "The Block Kuzushi (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, 1on1gov, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "1 on 1 Government (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, tecmowcm, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Tecmo World Cup Millennium (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2001, mfjump, coh1002m, coh1002m, zn, zn_state, 0, ROT0, "Tecmo", "Monster Farm Jump (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Video System */
-GAME( 1996, coh1002v, 0, coh1002v, zn, driver_device, 0, ROT0, "Video System Co.", "Video System PSX", MACHINE_IS_BIOS_ROOT )
-GAME( 1996, aerofgts, coh1002v, coh1002v, aerofgts, driver_device, 0, ROT270, "Video System Co.", "Aero Fighters Special (Taiwan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, sncwgltd, aerofgts, coh1002v, aerofgts, driver_device, 0, ROT270, "Video System Co.", "Sonic Wings Limited (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, coh1002v, 0, coh1002v, zn, zn_state, 0, ROT0, "Video System Co.", "Video System PSX", MACHINE_IS_BIOS_ROOT )
+GAME( 1996, aerofgts, coh1002v, coh1002v, aerofgts, zn_state, 0, ROT270, "Video System Co.", "Aero Fighters Special (Taiwan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, sncwgltd, aerofgts, coh1002v, aerofgts, zn_state, 0, ROT270, "Video System Co.", "Sonic Wings Limited (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Taito FX-1A */
-GAME( 1995, coh1000t, 0, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Taito FX1", MACHINE_IS_BIOS_ROOT )
-GAME( 1995, sfchamp, coh1000t, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Super Football Champ (Ver 2.5O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, sfchampo, sfchamp, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Super Football Champ (Ver 2.4O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, sfchampu, sfchamp, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Super Football Champ (Ver 2.4A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, sfchampj, sfchamp, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Super Football Champ (Ver 2.4J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, psyforce, coh1000t, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Psychic Force (Ver 2.4O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, psyforcej, psyforce, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Psychic Force (Ver 2.4J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1995, psyforcex, psyforce, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Psychic Force EX (Ver 2.0J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // exception in attract after reading 0xbbbbbbbb from 0x8025ed18 leads to watchdog reset
-GAME( 1996, mgcldate, mgcldtex, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Magical Date / Magical Date - dokidoki kokuhaku daisakusen (Ver 2.02J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, mgcldtex, coh1000t, coh1000ta, znt, driver_device, 0, ROT0, "Taito", "Magical Date EX / Magical Date - sotsugyou kokuhaku daisakusen (Ver 2.01J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, coh1000t, 0, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Taito FX1", MACHINE_IS_BIOS_ROOT )
+GAME( 1995, sfchamp, coh1000t, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Super Football Champ (Ver 2.5O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, sfchampo, sfchamp, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Super Football Champ (Ver 2.4O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, sfchampu, sfchamp, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Super Football Champ (Ver 2.4A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, sfchampj, sfchamp, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Super Football Champ (Ver 2.4J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, psyforce, coh1000t, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Psychic Force (Ver 2.4O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, psyforcej, psyforce, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Psychic Force (Ver 2.4J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1995, psyforcex, psyforce, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Psychic Force EX (Ver 2.0J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // exception in attract after reading 0xbbbbbbbb from 0x8025ed18 leads to watchdog reset
+GAME( 1996, mgcldate, mgcldtex, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Magical Date / Magical Date - dokidoki kokuhaku daisakusen (Ver 2.02J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, mgcldtex, coh1000t, coh1000ta, znt, zn_state, 0, ROT0, "Taito", "Magical Date EX / Magical Date - sotsugyou kokuhaku daisakusen (Ver 2.01J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Taito FX-1B */
-GAME( 1996, raystorm, coh1000t, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.06A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, raystormo, raystorm, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.05O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, raystormu, raystorm, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.05A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, raystormj, raystorm, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.05J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, ftimpact, ftimpcta, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, ftimpactu, ftimpcta, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1996, ftimpactj, ftimpcta, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, raystorm, coh1000t, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.06A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, raystormo, raystorm, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.05O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, raystormu, raystorm, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.05A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, raystormj, raystorm, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Ray Storm (Ver 2.05J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, ftimpact, ftimpcta, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, ftimpactu, ftimpcta, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, ftimpactj, ftimpcta, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact (Ver 2.02J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
GAME( 1997, ftimpcta, coh1000t, coh1000tb, znt, zn_state, coh1000tb, ROT0, "Taito", "Fighters' Impact A (Ver 2.00J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, gdarius, gdarius2, coh1002tb, znt, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.01J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, gdariusb, gdarius2, coh1002tb, znt, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.02A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, gdarius2, coh1000t, coh1002tb, znt, zn_state, coh1000tb, ROT0, "Taito", "G-Darius Ver.2 (Ver 2.03J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, gdarius, gdarius2, coh1002tb, znt, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.01J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, gdariusb, gdarius2, coh1002tb, znt, zn_state, coh1000tb, ROT0, "Taito", "G-Darius (Ver 2.02A)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, gdarius2, coh1000t, coh1002tb, znt, zn_state, coh1000tb, ROT0, "Taito", "G-Darius Ver.2 (Ver 2.03J)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Eighting / Raizing */
-GAME( 1997, coh1002e, 0, coh1002e, znt, driver_device, 0, ROT0, "Eighting / Raizing", "PS Arcade 95", MACHINE_IS_BIOS_ROOT )
-GAME( 1997, beastrzr, coh1002e, coh1002e, znt, driver_device, 0, ROT0, "Eighting / Raizing", "Beastorizer (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, bldyroar, beastrzr, coh1002e, znt, driver_device, 0, ROT0, "Eighting / Raizing", "Bloody Roar (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, beastrzrb, beastrzr, coh1002e, znt, driver_device, 0, ROT0, "bootleg", "Beastorizer (USA bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1997, coh1002e, 0, coh1002e, znt, zn_state, 0, ROT0, "Eighting / Raizing", "PS Arcade 95", MACHINE_IS_BIOS_ROOT )
+GAME( 1997, beastrzr, coh1002e, coh1002e, znt, zn_state, 0, ROT0, "Eighting / Raizing", "Beastorizer (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, bldyroar, beastrzr, coh1002e, znt, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, beastrzrb, beastrzr, coh1002e, znt, zn_state, 0, ROT0, "bootleg", "Beastorizer (USA bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
/* The region on these is determined from the NVRAM, it can't be changed from the test menu, it's pre-programmed */
-GAME( 1998, bldyror2, coh1002e, coh1002e, bldyror2, driver_device, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // locks up if you coin up during the fmw with interlace enabled
-GAME( 1998, bldyror2u, bldyror2, coh1002e, bldyror2, driver_device, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, bldyror2a, bldyror2, coh1002e, bldyror2, driver_device, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (Asia)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1998, bldyror2j, bldyror2, coh1002e, bldyror2, driver_device, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, bldyror2, coh1002e, coh1002e, bldyror2, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // locks up if you coin up during the fmw with interlace enabled
+GAME( 1998, bldyror2u, bldyror2, coh1002e, bldyror2, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, bldyror2a, bldyror2, coh1002e, bldyror2, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (Asia)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1998, bldyror2j, bldyror2, coh1002e, bldyror2, zn_state, 0, ROT0, "Eighting / Raizing", "Bloody Roar 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* The region on these is determined from the NVRAM, it can't be changed from the test menu, it's pre-programmed */
-GAME( 2000, brvblade, coh1002m, coh1002e, znt, driver_device, 0, ROT270, "Eighting / Raizing", "Brave Blade (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, brvbladeu, brvblade, coh1002e, znt, driver_device, 0, ROT270, "Eighting / Raizing", "Brave Blade (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, brvbladea, brvblade, coh1002e, znt, driver_device, 0, ROT270, "Eighting / Raizing", "Brave Blade (Asia)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 2000, brvbladej, brvblade, coh1002e, znt, driver_device, 0, ROT270, "Eighting / Raizing", "Brave Blade (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, brvblade, coh1002m, coh1002e, znt, zn_state, 0, ROT270, "Eighting / Raizing", "Brave Blade (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, brvbladeu, brvblade, coh1002e, znt, zn_state, 0, ROT270, "Eighting / Raizing", "Brave Blade (USA)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, brvbladea, brvblade, coh1002e, znt, zn_state, 0, ROT270, "Eighting / Raizing", "Brave Blade (Asia)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 2000, brvbladej, brvblade, coh1002e, znt, zn_state, 0, ROT270, "Eighting / Raizing", "Brave Blade (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
/* Bust a Move 2 uses the PSARC95 bios and ET series security but the top board is completely different */
-GAME( 1999, bam2, coh1002e, bam2, zn, driver_device, 0, ROT0, "Metro / Enix / Namco", "Bust a Move 2 - Dance Tengoku Mix (Japanese ROM ver. 1999/07/17 10:00:00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, bam2, coh1002e, bam2, zn, zn_state, 0, ROT0, "Metro / Enix / Namco", "Bust a Move 2 - Dance Tengoku Mix (Japanese ROM ver. 1999/07/17 10:00:00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING )
/* Atlus */
-GAME( 1996, coh1001l, 0, coh1001l, zn, driver_device, 0, ROT0, "Atlus", "Atlus PSX", MACHINE_IS_BIOS_ROOT )
-GAME( 1996, hvnsgate, coh1001l, coh1001l, zn, driver_device, 0, ROT0, "Racdym / Atlus", "Heaven's Gate", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1996, coh1001l, 0, coh1001l, zn, zn_state, 0, ROT0, "Atlus", "Atlus PSX", MACHINE_IS_BIOS_ROOT )
+GAME( 1996, hvnsgate, coh1001l, coh1001l, zn, zn_state, 0, ROT0, "Racdym / Atlus", "Heaven's Gate", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp
index 63d26577a6d..e67f66d980f 100644
--- a/src/mame/drivers/zodiack.cpp
+++ b/src/mame/drivers/zodiack.cpp
@@ -563,7 +563,7 @@ void zodiack_state::machine_reset()
}
-static MACHINE_CONFIG_START( zodiack, zodiack_state )
+static MACHINE_CONFIG_START( zodiack )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6)
@@ -716,8 +716,8 @@ DRIVER_INIT_MEMBER(zodiack_state,percuss)
m_percuss_hardware = true;
}
-GAME( 1983, zodiack, 0, zodiack, zodiack, zodiack_state, zodiack, ROT270, "Orca (Esco Trading Co., Inc. license)", "Zodiack", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) /* bullet color needs to be verified */
-GAME( 1983, dogfight, 0, zodiack, dogfight, zodiack_state, zodiack, ROT270, "Orca / Thunderbolt", "Dog Fight (Thunderbolt)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) /* bullet color needs to be verified */
-GAME( 1982, moguchan, 0, zodiack, moguchan, zodiack_state, percuss, ROT270, "Orca (Eastern Commerce Inc. license)", "Mogu Chan (bootleg?)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) /* license copyright taken from ROM string at $0b5c */
-GAME( 1981, percuss, 0, zodiack, percuss, zodiack_state, percuss, ROT270, "Orca", "The Percussor", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bounty, 0, zodiack, bounty, zodiack_state, percuss, ROT180, "Orca", "The Bounty", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, zodiack, 0, zodiack, zodiack, zodiack_state, zodiack, ROT270, "Orca (Esco Trading Co., Inc. license)", "Zodiack", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) /* bullet color needs to be verified */
+GAME( 1983, dogfight, 0, zodiack, dogfight, zodiack_state, zodiack, ROT270, "Orca / Thunderbolt", "Dog Fight (Thunderbolt)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) /* bullet color needs to be verified */
+GAME( 1982, moguchan, 0, zodiack, moguchan, zodiack_state, percuss, ROT270, "Orca (Eastern Commerce Inc. license)", "Mogu Chan (bootleg?)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) /* license copyright taken from ROM string at $0b5c */
+GAME( 1981, percuss, 0, zodiack, percuss, zodiack_state, percuss, ROT270, "Orca", "The Percussor", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bounty, 0, zodiack, bounty, zodiack_state, percuss, ROT180, "Orca", "The Bounty", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp
index 8d2e129bbd4..3a24178746c 100644
--- a/src/mame/drivers/zorba.cpp
+++ b/src/mame/drivers/zorba.cpp
@@ -93,7 +93,7 @@ ADDRESS_MAP_START( zorba_io, AS_IO, 8, zorba_state )
AM_RANGE(0x25, 0x25) AM_DEVREADWRITE("uart2", i8251_device, status_r, control_w)
AM_RANGE(0x26, 0x26) AM_WRITE(intmask_w)
AM_RANGE(0x30, 0x30) AM_DEVREADWRITE("dma", z80dma_device, read, write)
- AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("fdc", fd1793_t, read, write)
+ AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("fdc", fd1793_device, read, write)
AM_RANGE(0x50, 0x53) AM_DEVREADWRITE("pia0", pia6821_device, read, write)
AM_RANGE(0x60, 0x63) AM_DEVREADWRITE("pia1", pia6821_device, read, write)
ADDRESS_MAP_END
@@ -131,7 +131,7 @@ GFXDECODE_START( zorba )
GFXDECODE_END
-MACHINE_CONFIG_START( zorba, zorba_state )
+MACHINE_CONFIG_START( zorba )
// basic machine hardware
MCFG_CPU_ADD("maincpu", Z80, XTAL_24MHz / 6)
MCFG_CPU_PROGRAM_MAP(zorba_mem)
@@ -564,5 +564,5 @@ ROM_END
COMP( 1984?, zorba, 0, 0, zorba, zorba, zorba_state, zorba, "Modular Micros", "Zorba (Modular Micros)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
// Undumped versions (see startup screen notes at top of file)
-// COMP( 1983, zorbat, zorba, 0, zorba, zorba, zorba_state, zorba, "Telcon Industries", "Zorba (Telcon Industries)", MACHINE_NOT_WORKING )
+// COMP( 1983, zorbat, zorba, 0, zorba, zorba, zorba_state, zorba, "Telcon Industries", "Zorba (Telcon Industries)", MACHINE_NOT_WORKING )
// COMP( 1984, zorbag, zorba, 0, zorba, zorba, zorba_state, zorba, "Gemini Electronics", "Zorba (Gemini Electronics)", MACHINE_NOT_WORKING )
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp
index 2138b499618..932fcfa7a7d 100644
--- a/src/mame/drivers/zr107.cpp
+++ b/src/mame/drivers/zr107.cpp
@@ -756,7 +756,7 @@ void zr107_state::machine_reset()
m_dsp->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
-static MACHINE_CONFIG_START( zr107, zr107_state )
+static MACHINE_CONFIG_START( zr107 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
@@ -823,11 +823,11 @@ static MACHINE_CONFIG_START( zr107, zr107_state )
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_ZR107)
+ MCFG_KONPPC_CGBOARD_TYPE(ZR107)
MACHINE_CONFIG_END
-static MACHINE_CONFIG_START( jetwave, zr107_state )
+static MACHINE_CONFIG_START( jetwave )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */
@@ -902,7 +902,7 @@ static MACHINE_CONFIG_START( jetwave, zr107_state )
MCFG_DEVICE_ADD("konppc", KONPPC, 0)
MCFG_KONPPC_CGBOARD_NUMBER(1)
- MCFG_KONPPC_CGBOARD_TYPE(CGBOARD_TYPE_GTICLUB)
+ MCFG_KONPPC_CGBOARD_TYPE(GTICLUB)
MACHINE_CONFIG_END
/*****************************************************************************/
diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp
index cf1b0a0fa85..2b980acc2ce 100644
--- a/src/mame/drivers/zrt80.cpp
+++ b/src/mame/drivers/zrt80.cpp
@@ -48,7 +48,7 @@ public:
DECLARE_READ8_MEMBER(zrt80_10_r);
DECLARE_WRITE8_MEMBER(zrt80_30_w);
DECLARE_WRITE8_MEMBER(zrt80_38_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
MC6845_UPDATE_ROW(crtc_update_row);
private:
@@ -243,7 +243,7 @@ MC6845_UPDATE_ROW( zrt80_state::crtc_update_row )
}
}
-WRITE8_MEMBER( zrt80_state::kbd_put )
+void zrt80_state::kbd_put(u8 data)
{
m_term_data = data;
m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
@@ -267,7 +267,7 @@ static GFXDECODE_START( zrt80 )
GFXDECODE_ENTRY( "chargen", 0x0000, zrt80_charlayout, 0, 1 )
GFXDECODE_END
-static MACHINE_CONFIG_START( zrt80, zrt80_state )
+static MACHINE_CONFIG_START( zrt80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_2_4576MHz)
MCFG_CPU_PROGRAM_MAP(zrt80_mem)
@@ -297,7 +297,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state )
MCFG_DEVICE_ADD( "ins8250", INS8250, 2457600 )
MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(zrt80_state, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(zrt80_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -312,5 +312,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
-COMP( 1982, zrt80, 0, 0, zrt80, zrt80, driver_device, 0, "Digital Research Computers", "ZRT-80", 0)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+COMP( 1982, zrt80, 0, 0, zrt80, zrt80, zrt80_state, 0, "Digital Research Computers", "ZRT-80", 0)
diff --git a/src/mame/drivers/zsbc3.cpp b/src/mame/drivers/zsbc3.cpp
index caf00a0e7bb..4f2ad18238b 100644
--- a/src/mame/drivers/zsbc3.cpp
+++ b/src/mame/drivers/zsbc3.cpp
@@ -52,7 +52,8 @@ public:
DECLARE_READ8_MEMBER(zsbc3_28_r);
DECLARE_READ8_MEMBER(zsbc3_2a_r);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
+
private:
uint8_t m_term_data;
virtual void machine_reset() override;
@@ -95,13 +96,13 @@ void zsbc3_state::machine_reset()
{
}
-WRITE8_MEMBER( zsbc3_state::kbd_put )
+void zsbc3_state::kbd_put(u8 data)
{
m_term_data = data;
}
-static MACHINE_CONFIG_START( zsbc3, zsbc3_state )
+static MACHINE_CONFIG_START( zsbc3 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80, XTAL_16MHz /4)
MCFG_CPU_PROGRAM_MAP(zsbc3_mem)
@@ -109,7 +110,7 @@ static MACHINE_CONFIG_START( zsbc3, zsbc3_state )
/* video hardware */
MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
- MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(zsbc3_state, kbd_put))
+ MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(zsbc3_state, kbd_put))
MACHINE_CONFIG_END
/* ROM definition */
@@ -123,5 +124,5 @@ ROM_END
/* Driver */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
-COMP( 1980, zsbc3, 0, 0, zsbc3, zsbc3, driver_device, 0, "Digital Microsystems", "ZSBC-3", MACHINE_NO_SOUND_HW)
+/* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */
+COMP( 1980, zsbc3, 0, 0, zsbc3, zsbc3, zsbc3_state, 0, "Digital Microsystems", "ZSBC-3", MACHINE_NO_SOUND_HW)
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index 01591f36d27..327b9d69277 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -488,7 +488,7 @@ void zwackery_state::machine_start()
// MACHINE DEFINTIONS
//**************************************************************************
-static MACHINE_CONFIG_START( zwackery, zwackery_state )
+static MACHINE_CONFIG_START( zwackery )
// basic machine hardware
MCFG_CPU_ADD("maincpu", M68000, 7652400) // based on counter usage, should be XTAL_16MHz/2
MCFG_CPU_PROGRAM_MAP(zwackery_map)
@@ -606,5 +606,5 @@ ROM_END
// SYSTEM DRIVERS
//**************************************************************************
-// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
-GAME( 1984, zwackery, 0, zwackery, zwackery, driver_device, 0, ROT0, "Bally Midway", "Zwackery", MACHINE_SUPPORTS_SAVE )
+// YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS
+GAME( 1984, zwackery, 0, zwackery, zwackery, zwackery_state, 0, ROT0, "Bally Midway", "Zwackery", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp
index aa853f8c0f8..8d8063b374c 100644
--- a/src/mame/drivers/zx.cpp
+++ b/src/mame/drivers/zx.cpp
@@ -320,7 +320,7 @@ PALETTE_INIT_MEMBER(zx_state,ts1000)
palette.set_pen_color(1, rgb_t::black());
}
-static MACHINE_CONFIG_START( zx80, zx_state )
+static MACHINE_CONFIG_START( zx80 )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", Z80, XTAL_6_5MHz/2)
MCFG_CPU_PROGRAM_MAP(zx80_map)
@@ -494,7 +494,7 @@ ROM_END
/* Game Drivers */
-/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */
+// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
COMP( 1980, zx80, 0, 0, zx80, zx80, zx_state, zx, "Sinclair Research Ltd", "ZX-80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
COMP( 1981, zx81, 0, 0, zx81, zx81, zx_state, zx, "Sinclair Research Ltd", "ZX-81", MACHINE_NO_SOUND_HW )
COMP( 1982, ts1000, zx81, 0, ts1000, zx81, zx_state, zx, "Timex Sinclair", "Timex Sinclair 1000", MACHINE_NO_SOUND_HW )
diff --git a/src/mame/etc/template_cpu.cpp b/src/mame/etc/template_cpu.cpp
index 2989b384b2a..626e02171fb 100644
--- a/src/mame/etc/template_cpu.cpp
+++ b/src/mame/etc/template_cpu.cpp
@@ -7,11 +7,11 @@
*****************************************************************************/
#include "emu.h"
-#include "debugger.h"
#include "xxx.h"
+#include "debugger.h"
-const device_type XXX = &device_creator<xxx_cpu_device>;
+DEFINE_DEVICE_TYPE(XXX, xxx_cpu_device, "xxx", "XXX")
/* FLAGS */
@@ -82,26 +82,26 @@ void xxx_cpu_device::execute_set_input(int irqline, int state)
{
switch(irqline)
{
- case XXX_INT_INTRM:
- m_intrm_pending = (state == ASSERT_LINE);
- m_intrm_state = state;
+ case XXX_INT_INTRM: // level-sensitive
+ m_intrm_pending = ((ASSERT_LINE == state) || (HOLD_LINE == state));
+ m_intrm_state = (ASSERT_LINE == state);
break;
- case XXX_RESET:
- if (state == ASSERT_LINE)
+ case XXX_RESET: // edge-sensitive
+ if (CLEAR_LINE != state)
m_reset_pending = 1;
- m_reset_state = state;
+ m_reset_state = (ASSERT_LINE == state);
break;
- case XXX_INT_INTR:
- if (state == ASSERT_LINE)
+ case XXX_INT_INTR: // edge-sensitive
+ if (CLEAR_LINE != state)
m_intr_pending = 1;
- m_intr_state = state;
+ m_intr_state = (ASSERT_LINE == state);
break;
}
}
#endif
xxx_cpu_device::xxx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cpu_device(mconfig, XXX, "XXX", tag, owner, clock, "xxx", __FILE__)
+ : cpu_device(mconfig, XXX, tag, owner, clock)
, m_program_config("program", ENDIANNESS_BIG, 8, 32, -1)
, m_data_config("data", ENDIANNESS_BIG, 8, 32, 0)
{
@@ -113,11 +113,11 @@ void xxx_cpu_device::state_string_export(const device_state_entry &entry, std::s
switch (entry.index())
{
case STATE_GENFLAGS:
- strprintf(str, "%c%c%c%c",
- m_flags & 0x80 ? 'S':'.',
- m_flags & 0x40 ? 'Z':'.',
- m_flags & 0x20 ? 'V':'.',
- m_flags & 0x10 ? 'C':'.');
+ str = util::string_format("%c%c%c%c",
+ m_flags & 0x80 ? 'S':'.',
+ m_flags & 0x40 ? 'Z':'.',
+ m_flags & 0x20 ? 'V':'.',
+ m_flags & 0x10 ? 'C':'.');
break;
}
}
@@ -125,6 +125,5 @@ void xxx_cpu_device::state_string_export(const device_state_entry &entry, std::s
offs_t xxx_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const uint32_t *oprom, const uint32_t *opram, uint32_t options)
{
- extern CPU_DISASSEMBLE( xxx );
return CPU_DISASSEMBLE_NAME(xxx)(this, buffer, pc, oprom, opram, options);
}
diff --git a/src/mame/etc/template_cpu.h b/src/mame/etc/template_cpu.h
index 62af4185199..97467026087 100644
--- a/src/mame/etc/template_cpu.h
+++ b/src/mame/etc/template_cpu.h
@@ -6,10 +6,10 @@
*
*****************************************************************************/
-#pragma once
+#ifndef MAME_CPU_XXX_H
+#define MAME_CPU_XXX_H
-#ifndef __XXX_H__
-#define __XXX_H__
+#pragma once
enum
{
@@ -24,7 +24,7 @@ class xxx_cpu_device : public cpu_device
{
public:
// construction/destruction
- xxx_cpu_device(const machine_config &mconfig, const char *_tag, device_t *_owner, uint32_t _clock);
+ xxx_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device-level overrides
@@ -39,7 +39,7 @@ protected:
virtual void execute_set_input(int inputnum, int state) override;
// device_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ); }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : (spacenum == AS_DATA) ? &m_data_config : nullptr; }
// device_state_interface overrides
virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
@@ -63,9 +63,9 @@ private:
};
-extern const device_type XXX;
+DECLARE_DEVICE_TYPE(XXX, xxx_cpu_device)
CPU_DISASSEMBLE( xxx );
-#endif /* __XXX_H__ */
+#endif // MAME_CPU_XXX_H
diff --git a/src/mame/etc/template_device.cpp b/src/mame/etc/template_device.cpp
index 358938a5ee0..f29b85215eb 100644
--- a/src/mame/etc/template_device.cpp
+++ b/src/mame/etc/template_device.cpp
@@ -2,7 +2,7 @@
// copyright-holders:<author_name>
/***************************************************************************
-Template for skeleton device
+Template for squeleton device
***************************************************************************/
@@ -16,7 +16,7 @@ Template for skeleton device
//**************************************************************************
// device type definition
-const device_type XXX = &device_creator<xxx_device>;
+DEFINE_DEVICE_TYPE(XXX, xxx_device, "xxx", "XXX Device")
//**************************************************************************
@@ -28,7 +28,7 @@ const device_type XXX = &device_creator<xxx_device>;
//-------------------------------------------------
xxx_device::xxx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, XXX, "xxx_longname", tag, owner, clock, "xxx", __FILE__)
+ : device_t(mconfig, XXX, tag, owner, clock)
{
}
diff --git a/src/mame/etc/template_device.h b/src/mame/etc/template_device.h
index b553f3058c6..8499fc44c39 100644
--- a/src/mame/etc/template_device.h
+++ b/src/mame/etc/template_device.h
@@ -2,14 +2,14 @@
// copyright-holders:<author_name>
/***************************************************************************
-Template for skeleton device
+Template for squeleton device
***************************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_XXX_H
+#define MAME_MACHINE_XXX_H
-#ifndef __XXXDEV_H__
-#define __XXXDEV_H__
+#pragma once
@@ -17,8 +17,9 @@ Template for skeleton device
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_XXX_ADD(_tag,_freq) \
- MCFG_DEVICE_ADD(_tag, XXX, _freq)
+#define MCFG_XXX_ADD(tag, freq) \
+ MCFG_DEVICE_ADD((tag), XXX, (freq))
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -45,7 +46,7 @@ protected:
// device type definition
-extern const device_type XXX;
+DECLARE_DEVICE_TYPE(XXX, xxx_device)
@@ -54,5 +55,4 @@ extern const device_type XXX;
//**************************************************************************
-
-#endif
+#endif // MAME_MACHINE_XXX_H
diff --git a/src/mame/etc/template_driver.cpp b/src/mame/etc/template_driver.cpp
index 84ad22ddf2d..56fe6ae5c29 100644
--- a/src/mame/etc/template_driver.cpp
+++ b/src/mame/etc/template_driver.cpp
@@ -2,7 +2,7 @@
// copyright-holders:<author_name>
/***************************************************************************
-Template for skeleton drivers
+Template for squeleton drivers
***************************************************************************/
@@ -17,22 +17,24 @@ class xxx_state : public driver_device
{
public:
xxx_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
- { }
-
- // devices
- required_device<cpu_device> m_maincpu;
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ {
+ }
// screen updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_PALETTE_INIT(xxx);
+
protected:
// driver_device overrides
virtual void machine_start();
virtual void machine_reset();
virtual void video_start();
+
+ // devices
+ required_device<cpu_device> m_maincpu;
};
void xxx_state::video_start()
@@ -137,7 +139,7 @@ PALETTE_INIT_MEMBER(xxx_state, xxx)
{
}
-static MACHINE_CONFIG_START( xxx, xxx_state )
+static MACHINE_CONFIG_START( xxx )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu",Z80,MAIN_CLOCK/2)
@@ -191,4 +193,4 @@ ROM_END
// For a generic system:
// SYST(YEAR,NAME,PARENT,COMPAT,MACHINE,INPUT,CLASS,INIT,COMPANY,FULLNAME,FLAGS)
-GAME( 198?, xxx, 0, xxx, xxx, driver_device, 0, ROT0, "<template_manufacturer>", "<template_machinename>", MACHINE_IS_SKELETON )
+GAME( 198?, xxx, 0, xxx, xxx, xxxx_state, 0, ROT0, "<template_manufacturer>", "<template_machinename>", MACHINE_IS_SKELETON )
diff --git a/src/mame/includes/abc1600.h b/src/mame/includes/abc1600.h
index de87b7dc048..2e24b965dd9 100644
--- a/src/mame/includes/abc1600.h
+++ b/src/mame/includes/abc1600.h
@@ -86,17 +86,17 @@ public:
required_device<z80dart_device> m_dart;
required_device<scc8530_t> m_scc;
required_device<z8536_device> m_cio;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<e0516_device> m_rtc;
required_device<nmc9306_device> m_nvram;
required_device<ram_device> m_ram;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
- required_device<abcbus_slot_t> m_bus0i;
- required_device<abcbus_slot_t> m_bus0x;
- required_device<abcbus_slot_t> m_bus1;
- required_device<abcbus_slot_t> m_bus2;
+ required_device<abcbus_slot_device> m_bus0i;
+ required_device<abcbus_slot_device> m_bus0x;
+ required_device<abcbus_slot_device> m_bus1;
+ required_device<abcbus_slot_device> m_bus2;
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h
index c389254e5df..0c17f01bddc 100644
--- a/src/mame/includes/abc80.h
+++ b/src/mame/includes/abc80.h
@@ -6,8 +6,10 @@
*
****************************************************************************/
-#ifndef __ABC80__
-#define __ABC80__
+#ifndef MAME_INCLUDES_ABC80_H
+#define MAME_INCLUDES_ABC80_H
+
+#pragma once
#include "bus/abcbus/abcbus.h"
#include "bus/rs232/rs232.h"
@@ -94,7 +96,7 @@ public:
required_device<z80pio_device> m_pio;
required_device<sn76477_device> m_csg;
required_device<cassette_image_device> m_cassette;
- required_device<abcbus_slot_t> m_bus;
+ required_device<abcbus_slot_device> m_bus;
required_device<abc80_keyboard_device> m_kb;
required_device<ram_device> m_ram;
required_device<rs232_port_device> m_rs232;
@@ -145,7 +147,7 @@ public:
DECLARE_WRITE8_MEMBER( pio_pb_w );
DECLARE_WRITE_LINE_MEMBER( keydown_w );
- DECLARE_WRITE8_MEMBER( kbd_w );
+ void kbd_w(u8 data);
DECLARE_WRITE8_MEMBER( csg_w );
DECLARE_QUICKLOAD_LOAD_MEMBER( bac );
@@ -188,4 +190,4 @@ public:
MACHINE_CONFIG_EXTERN( abc80_video );
-#endif
+#endif // MAME_INCLUDES_ABC80_H
diff --git a/src/mame/includes/alesis.h b/src/mame/includes/alesis.h
index 47076f5cb0b..cdcf4723b56 100644
--- a/src/mame/includes/alesis.h
+++ b/src/mame/includes/alesis.h
@@ -6,10 +6,10 @@
****************************************************************************/
-#pragma once
+#ifndef MAME_INCLUDES_ALESIS_H
+#define MAME_INCLUDES_ALESIS_H
-#ifndef _ALESIS_H_
-#define _ALESIS_H_
+#pragma once
#include "cpu/mcs51/mcs51.h"
#include "machine/nvram.h"
@@ -111,6 +111,6 @@ private:
};
// device type definition
-extern const device_type ALESIS_DM3AG;
+DECLARE_DEVICE_TYPE(ALESIS_DM3AG, alesis_dm3ag_device)
-#endif // _ALESIS_H_
+#endif // MAME_INCLUDES_ALESIS_H
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index a5de8bf3224..532bbe6341d 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -9,8 +9,10 @@ Ernesto Corvi & Mariusz Wojcieszek
***************************************************************************/
-#ifndef __AMIGA_H__
-#define __AMIGA_H__
+#ifndef MAME_INCLUDES_AMIGA_H
+#define MAME_INCLUDES_AMIGA_H
+
+#pragma once
#include "cpu/m68000/m68000.h"
#include "machine/bankdev.h"
@@ -579,7 +581,7 @@ protected:
optional_device<rs232_port_device> m_rs232;
optional_device<centronics_device> m_centronics;
required_device<paula_8364_device> m_paula;
- optional_device<amiga_fdc> m_fdc;
+ optional_device<amiga_fdc_device> m_fdc;
required_device<screen_device> m_screen;
optional_device<palette_device> m_palette;
required_device<address_map_bank_device> m_overlay;
@@ -703,4 +705,4 @@ void amiga_sprite_enable_comparitor(running_machine &machine, int which, int ena
MACHINE_CONFIG_EXTERN( pal_video );
MACHINE_CONFIG_EXTERN( ntsc_video );
-#endif /* __AMIGA_H__ */
+#endif // MAME_INCLUDES_AMIGA_H
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 64072444a6b..e1006db7bee 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -8,28 +8,33 @@
*
*/
+#ifndef MAME_INCLUDES_APOLLO_H
+#define MAME_INCLUDES_APOLLO_H
+
#pragma once
-#ifndef APOLLO_H_
-#define APOLLO_H_
+#include "machine/apollo_dbg.h"
+#include "machine/apollo_kbd.h"
#include "cpu/m68000/m68000.h"
-#include "bus/rs232/rs232.h"
-#include "machine/terminal.h"
-#include "machine/ram.h"
+
#include "machine/6840ptm.h"
-#include "machine/mc68681.h"
#include "machine/am9517a.h"
-#include "machine/pic8259.h"
-#include "machine/mc146818.h"
-#include "machine/apollo_dbg.h"
-#include "machine/apollo_kbd.h"
#include "machine/clock.h"
+#include "machine/mc146818.h"
+#include "machine/mc68681.h"
+#include "machine/pic8259.h"
+#include "machine/ram.h"
+#include "machine/terminal.h"
+
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
#include "bus/isa/3c505.h"
+
+#include "bus/rs232/rs232.h"
+
#ifndef VERBOSE
#define VERBOSE 0
#endif
@@ -338,7 +343,7 @@ private:
uint8_t m_ip6;
};
-extern const device_type APOLLO_SIO;
+DECLARE_DEVICE_TYPE(APOLLO_SIO, apollo_sio)
/*----------- machine/apollo_ni.c -----------*/
@@ -387,7 +392,7 @@ private:
};
// device type definition
-extern const device_type APOLLO_NI;
+DECLARE_DEVICE_TYPE(APOLLO_NI, apollo_ni)
/*----------- video/apollo.c -----------*/
@@ -397,7 +402,6 @@ class apollo_graphics_15i : public device_t
{
public:
apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, device_type type, const char *name, const char *shortname, const char *source);
~apollo_graphics_15i();
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -425,6 +429,8 @@ public:
int is_mono() { return m_n_planes == 1; }
protected:
+ apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, device_type type);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -624,7 +630,7 @@ private:
running_machine *m_machine;
};
-extern const device_type APOLLO_GRAPHICS;
+DECLARE_DEVICE_TYPE(APOLLO_GRAPHICS, apollo_graphics_15i)
#define MCFG_APOLLO_GRAPHICS_ADD( _tag) \
MCFG_FRAGMENT_ADD(apollo_graphics) \
@@ -645,7 +651,7 @@ private:
// internal state
};
-extern const device_type APOLLO_MONO19I;
+DECLARE_DEVICE_TYPE(APOLLO_MONO19I, apollo_graphics_19i)
#define MCFG_APOLLO_MONO19I_ADD(_tag) \
MCFG_FRAGMENT_ADD(apollo_mono19i) \
@@ -708,7 +714,7 @@ private:
};
// device type definition
-extern const device_type APOLLO_STDIO;
+DECLARE_DEVICE_TYPE(APOLLO_STDIO, apollo_stdio_device)
#endif /* APOLLO_XXL */
-#endif /* APOLLO_H_ */
+#endif // MAME_INCLUDES_APOLLO_H
diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h
index 43446b315fa..ebb34c4d6ff 100644
--- a/src/mame/includes/apple3.h
+++ b/src/mame/includes/apple3.h
@@ -69,7 +69,7 @@ public:
required_device<via6522_device> m_via_0;
required_device<via6522_device> m_via_1;
required_device<mos6551_device> m_acia;
- required_device<appleiii_fdc> m_fdc;
+ required_device<appleiii_fdc_device> m_fdc;
required_device<ay3600_device> m_ay3600;
required_device<a2bus_device> m_a2bus;
required_device<mm58167_device> m_rtc;
diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h
index 21a1c5f3c50..f2171ce36b1 100644
--- a/src/mame/includes/arcadia.h
+++ b/src/mame/includes/arcadia.h
@@ -6,8 +6,8 @@
*
****************************************************************************/
-#ifndef ARCADIA_H_
-#define ARCADIA_H_
+#ifndef MAME_INCLUDES_ARCADIA_H
+#define MAME_INCLUDES_ARCADIA_H
#include "cpu/s2650/s2650.h"
#include "audio/arcadia.h"
@@ -126,4 +126,4 @@ protected:
required_device<palette_device> m_palette;
required_device<screen_device> m_screen;
};
-#endif /* ARCADIA_H_ */
+#endif // MAME_INCLUDES_ARCADIA_H
diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h
index 16c5782c78e..7db518ccfc6 100644
--- a/src/mame/includes/archimds.h
+++ b/src/mame/includes/archimds.h
@@ -100,7 +100,7 @@ public:
protected:
required_device<cpu_device> m_maincpu;
optional_device<i2cmem_device> m_i2cmem;
- optional_device<wd1772_t> m_fdc;
+ optional_device<wd1772_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
required_memory_region m_region_maincpu;
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index e958683f36e..7e632b4d544 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -6,8 +6,9 @@
*************************************************************************/
-#include "machine/atarigen.h"
#include "audio/cage.h"
+#include "machine/atarigen.h"
+#include "video/atarirle.h"
#define CRAM_ENTRIES 0x4000
#define TRAM_ENTRIES 0x4000
diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h
index 11618c9ea09..76e4199be92 100644
--- a/src/mame/includes/atarigx2.h
+++ b/src/mame/includes/atarigx2.h
@@ -16,14 +16,14 @@ class atarigx2_state : public atarigen_state
{
public:
atarigx2_state(const machine_config &mconfig, device_type type, const char *tag)
- : atarigen_state(mconfig, type, tag),
- m_jsa(*this, "jsa"),
- m_xga(*this, "xga"),
- m_mo_command(*this, "mo_command"),
- m_playfield_tilemap(*this, "playfield"),
- m_alpha_tilemap(*this, "alpha"),
- m_rle(*this, "rle")
- { }
+ : atarigen_state(mconfig, type, tag)
+ , m_jsa(*this, "jsa")
+ , m_xga(*this, "xga")
+ , m_mo_command(*this, "mo_command")
+ , m_playfield_tilemap(*this, "playfield")
+ , m_alpha_tilemap(*this, "alpha")
+ , m_rle(*this, "rle")
+ { }
uint16_t m_playfield_base;
diff --git a/src/mame/includes/atarist.h b/src/mame/includes/atarist.h
index bddb2781113..5ed1f0d373f 100644
--- a/src/mame/includes/atarist.h
+++ b/src/mame/includes/atarist.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder, Olivier Galibert
-#pragma once
+#ifndef MAME_INCLUDES_ATARI_ST_H
+#define MAME_INCLUDES_ATARI_ST_H
-#ifndef __ATARI_ST__
-#define __ATARI_ST__
+#pragma once
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
@@ -124,7 +124,7 @@ public:
{ }
required_device<cpu_device> m_maincpu;
- required_device<wd1772_t> m_fdc;
+ required_device<wd1772_device> m_fdc;
required_device<mc68901_device> m_mfp;
required_device<acia6850_device> m_acia0;
required_device<acia6850_device> m_acia1;
@@ -465,4 +465,4 @@ public:
DECLARE_READ8_MEMBER( mfp_gpio_r );
};
-#endif
+#endif // MAME_INCLUDES_ATARI_ST_H
diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h
index 4fe530f4ed3..7cb3a5268c6 100644
--- a/src/mame/includes/aussiebyte.h
+++ b/src/mame/includes/aussiebyte.h
@@ -131,7 +131,7 @@ private:
required_device<z80sio0_device> m_sio2;
required_device<centronics_device> m_centronics;
required_device<rs232_port_device> m_rs232;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
required_device<mc6845_device> m_crtc;
diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h
index 156e2c7df9a..03ab576cf62 100644
--- a/src/mame/includes/b2m.h
+++ b/src/mame/includes/b2m.h
@@ -9,6 +9,8 @@
#ifndef MAME_INCLUDES_B2M_H
#define MAME_INCLUDES_B2M_H
+#pragma once
+
#include "machine/i8255.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
@@ -21,45 +23,23 @@ class b2m_state : public driver_device
{
public:
b2m_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_speaker(*this, "speaker"),
- m_pit(*this, "pit8253"),
- m_ram(*this, RAM_TAG),
- m_palette(*this, "palette") { }
-
- uint8_t m_b2m_8255_porta;
- uint8_t m_b2m_video_scroll;
- uint8_t m_b2m_8255_portc;
-
- uint8_t m_b2m_video_page;
- uint8_t m_b2m_drive;
- uint8_t m_b2m_side;
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_speaker(*this, "speaker")
+ , m_pit(*this, "pit8253")
+ , m_ram(*this, RAM_TAG)
+ , m_palette(*this, "palette")
+ , m_fdc(*this, "fd1793")
+ , m_pic(*this, "pic8259")
+ { }
- uint8_t m_b2m_romdisk_lsb;
- uint8_t m_b2m_romdisk_msb;
-
- uint8_t m_b2m_color[4];
- uint8_t m_b2m_localmachine;
- uint8_t m_vblank_state;
- required_device<cpu_device> m_maincpu;
- required_device<speaker_sound_device> m_speaker;
- required_device<pit8253_device> m_pit;
- required_device<ram_device> m_ram;
- required_device<palette_device> m_palette;
-
- /* devices */
- fd1793_t *m_fdc;
- pic8259_device *m_pic;
DECLARE_READ8_MEMBER(b2m_keyboard_r);
DECLARE_WRITE8_MEMBER(b2m_palette_w);
DECLARE_READ8_MEMBER(b2m_palette_r);
DECLARE_WRITE8_MEMBER(b2m_localmachine_w);
DECLARE_READ8_MEMBER(b2m_localmachine_r);
DECLARE_DRIVER_INIT(b2m);
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
+
DECLARE_PALETTE_INIT(b2m);
uint32_t screen_update_b2m(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(b2m_vblank_interrupt);
@@ -74,8 +54,38 @@ public:
DECLARE_WRITE8_MEMBER(b2m_romdisk_portc_w);
DECLARE_WRITE_LINE_MEMBER(b2m_fdc_drq);
DECLARE_FLOPPY_FORMATS( b2m_floppy_formats );
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
void b2m_postload();
void b2m_set_bank(int bank);
+
+ uint8_t m_b2m_8255_porta;
+ uint8_t m_b2m_video_scroll;
+ uint8_t m_b2m_8255_portc;
+
+ uint8_t m_b2m_video_page;
+ uint8_t m_b2m_drive;
+ uint8_t m_b2m_side;
+
+ uint8_t m_b2m_romdisk_lsb;
+ uint8_t m_b2m_romdisk_msb;
+
+ uint8_t m_b2m_color[4];
+ uint8_t m_b2m_localmachine;
+ uint8_t m_vblank_state;
+ required_device<cpu_device> m_maincpu;
+ required_device<speaker_sound_device> m_speaker;
+ required_device<pit8253_device> m_pit;
+ required_device<ram_device> m_ram;
+ required_device<palette_device> m_palette;
+
+ /* devices */
+ optional_device<fd1793_device> m_fdc;
+ optional_device<pic8259_device> m_pic;
};
#endif // MAME_INCLUDES_B2M_H
diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h
index 2899c8c88be..dacbdf4d622 100644
--- a/src/mame/includes/bbc.h
+++ b/src/mame/includes/bbc.h
@@ -230,8 +230,8 @@ public: // HACK FOR MC6845
optional_device<mc146818_device> m_rtc;
optional_device<bbc_fdc_slot_device> m_fdc;
optional_device<i8271_device> m_i8271;
- optional_device<wd1770_t> m_wd1770;
- optional_device<wd1772_t> m_wd1772;
+ optional_device<wd1770_device> m_wd1770;
+ optional_device<wd1772_device> m_wd1772;
optional_device<generic_slot_device> m_exp1;
optional_device<generic_slot_device> m_exp2;
optional_device<generic_slot_device> m_exp3;
diff --git a/src/mame/includes/bfm_sc4.h b/src/mame/includes/bfm_sc4.h
index 1933b6cdc92..be08dd9d447 100644
--- a/src/mame/includes/bfm_sc4.h
+++ b/src/mame/includes/bfm_sc4.h
@@ -2,6 +2,10 @@
// copyright-holders:David Haywood
/* Scorpion 4 + 5 driver related includes */
/* mainly used for stuff which is currently shared between sc4 / 5 sets to avoid duplication */
+#ifndef MAME_INCLUDES_BFP_SC4_H
+#define MAME_INCLUDES_BFP_SC4_H
+
+#pragma once
#include "machine/sec.h"
#include "machine/steppers.h" // stepper motor
@@ -95,8 +99,8 @@ public:
public:
required_device<mc68681_device> m_duart;
- optional_device<bfm_bda_t> m_vfd0;
- optional_device<bfmdm01_device> m_dm01;
+ optional_device<bfm_bda_device> m_vfd0;
+ optional_device<bfm_dm01_device> m_dm01;
required_device<ymz280b_device> m_ymz;
// serial vfd
@@ -139,7 +143,7 @@ public:
m_dochk41 = false;
}
- required_device<m68307cpu_device> m_maincpu;
+ required_device<m68307_cpu_device> m_maincpu;
required_memory_region m_cpuregion;
// devices
required_device<nvram_device> m_nvram;
@@ -638,7 +642,7 @@ public:
DECLARE_MACHINE_START(adder4);
// devices
- required_device<m68340cpu_device> m_adder4cpu;
+ required_device<m68340_cpu_device> m_adder4cpu;
};
@@ -3373,3 +3377,5 @@ INPUT_PORTS_EXTERN( sc4_raw );
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \
/* not for either of these games? */ \
ROM_LOAD( "casroysnd.bin", 0x00000, 0x80000, CRC(cf1d4b59) SHA1(1b2bc74c6fcc43197a6f295bc34554da01f7b517) )
+
+#endif // MAME_INCLUDES_BFP_SC4_H
diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h
index 3b9ca19b9f4..9902d4e2753 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_BULLET_H
+#define MAME_INCLUDES_BULLET_H
-#ifndef __BULLET__
-#define __BULLET__
+#pragma once
#include "cpu/z80/z80.h"
#include "bus/centronics/ctronics.h"
@@ -55,28 +55,6 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<z80ctc_device> m_ctc;
- required_device<z80dart_device> m_dart;
- required_device<z80dma_device> m_dmac;
- required_device<mb8877_t> m_fdc;
- required_device<ram_device> m_ram;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<floppy_connector> m_floppy2;
- required_device<floppy_connector> m_floppy3;
- required_device<floppy_connector> m_floppy4;
- required_device<floppy_connector> m_floppy5;
- required_device<floppy_connector> m_floppy6;
- required_device<floppy_connector> m_floppy7;
- floppy_image_device *m_floppy;
- required_device<centronics_device> m_centronics;
- required_memory_region m_rom;
- required_ioport m_sw1;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
DECLARE_READ8_MEMBER( mreq_r );
DECLARE_WRITE8_MEMBER( mreq_w );
DECLARE_READ8_MEMBER( info_r );
@@ -99,7 +77,36 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_centronics_fault );
DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+ TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
+ DECLARE_WRITE_LINE_MEMBER(dart_rxtxca_w);
+ DECLARE_READ8_MEMBER(io_read_byte);
+ DECLARE_WRITE8_MEMBER(io_write_byte);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
void update_dma_rdy();
+
+ required_device<cpu_device> m_maincpu;
+ required_device<z80ctc_device> m_ctc;
+ required_device<z80dart_device> m_dart;
+ required_device<z80dma_device> m_dmac;
+ required_device<mb8877_device> m_fdc;
+ required_device<ram_device> m_ram;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<floppy_connector> m_floppy2;
+ required_device<floppy_connector> m_floppy3;
+ required_device<floppy_connector> m_floppy4;
+ required_device<floppy_connector> m_floppy5;
+ required_device<floppy_connector> m_floppy6;
+ required_device<floppy_connector> m_floppy7;
+ floppy_image_device *m_floppy;
+ required_device<centronics_device> m_centronics;
+ required_memory_region m_rom;
+ required_ioport m_sw1;
+
// memory state
int m_segst;
int m_brom;
@@ -120,11 +127,6 @@ public:
int m_centronics_perror;
int m_centronics_select;
int m_centronics_fault;
-
- TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
- DECLARE_WRITE_LINE_MEMBER(dart_rxtxca_w);
- DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
};
class bulletf_state : public bullet_state
@@ -141,16 +143,6 @@ public:
{
}
- required_device<floppy_connector> m_floppy8;
- required_device<floppy_connector> m_floppy9;
- required_device<SCSI_PORT_DEVICE> m_scsibus;
- required_device<input_buffer_device> m_scsi_data_in;
- required_device<output_latch_device> m_scsi_data_out;
- required_device<input_buffer_device> m_scsi_ctrl_in;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
DECLARE_READ8_MEMBER( mreq_r );
DECLARE_WRITE8_MEMBER( mreq_w );
DECLARE_WRITE8_MEMBER( xdma0_w );
@@ -166,8 +158,19 @@ public:
DECLARE_WRITE_LINE_MEMBER( cstrb_w );
DECLARE_WRITE_LINE_MEMBER( req_w );
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
void update_dma_rdy();
+ required_device<floppy_connector> m_floppy8;
+ required_device<floppy_connector> m_floppy9;
+ required_device<scsi_port_device> m_scsibus;
+ required_device<input_buffer_device> m_scsi_data_in;
+ required_device<output_latch_device> m_scsi_data_out;
+ required_device<input_buffer_device> m_scsi_ctrl_in;
+
int m_rome;
uint8_t m_xdma0;
uint8_t m_mbank;
@@ -175,4 +178,4 @@ public:
int m_wrdy;
};
-#endif
+#endif // MAME_INCLUDES_BULLET_H
diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h
index 067fe96a983..f9a36bc9614 100644
--- a/src/mame/includes/bw2.h
+++ b/src/mame/includes/bw2.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_BW2_H
+#define MAME_INCLUDES_BW2_H
-#ifndef __BW2__
-#define __BW2__
+#pragma once
#include "bus/bw2/exp.h"
#include "cpu/z80/z80.h"
@@ -50,7 +50,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<i8251_device> m_uart;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<msm6255_device> m_lcdc;
required_device<pit8253_device> m_pit;
required_device<centronics_device> m_centronics;
@@ -96,4 +96,4 @@ public:
int m_centronics_busy;
};
-#endif
+#endif // MAME_INCLUDES_BW2_H
diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h
index 2cffa30c5c7..5d856c1a27c 100644
--- a/src/mame/includes/capbowl.h
+++ b/src/mame/includes/capbowl.h
@@ -5,6 +5,10 @@
Coors Light Bowling/Bowl-O-Rama hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_CAPBOWL_H
+#define MAME_INCLUDES_CAPBOWL_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "machine/nvram.h"
@@ -72,8 +76,10 @@ public:
TIMER_CALLBACK_MEMBER(update);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- inline rgb_t pen_for_pixel( uint8_t *src, uint8_t pix );
+ inline rgb_t pen_for_pixel( uint8_t const *src, uint8_t pix );
protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
+
+#endif // MAME_INCLUDES_CAPBOWL_H
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index 4fecb52f077..4c101366e49 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_CIDELSA_H
+#define MAME_INCLUDES_CIDELSA_H
-#ifndef __CIDELSA__
-#define __CIDELSA__
+#pragma once
#include "cpu/cosmac/cosmac.h"
@@ -13,6 +13,7 @@
#include "machine/cdp1852.h"
#include "machine/nvram.h"
+
#define SCREEN_TAG "screen"
#define CDP1802_TAG "cdp1802"
#define CDP1869_TAG "cdp1869"
@@ -22,9 +23,9 @@
#define DESTRYER_CHR1 3579000.0 // unverified
#define DESTRYER_CHR2 XTAL_5_7143MHz
#define ALTAIR_CHR1 3579000.0 // unverified
-#define ALTAIR_CHR2 CDP1869_DOT_CLK_PAL // unverified
+#define ALTAIR_CHR2 cdp1869_device::DOT_CLK_PAL // unverified
#define DRACO_CHR1 XTAL_4_43361MHz
-#define DRACO_CHR2 CDP1869_DOT_CLK_PAL // unverified
+#define DRACO_CHR2 cdp1869_device::DOT_CLK_PAL // unverified
#define DRACO_SND_CHR1 XTAL_2_01216MHz
#define CIDELSA_PAGERAM_SIZE 0x400
@@ -35,6 +36,7 @@
#define DRACO_PAGERAM_MASK 0x7ff
#define CIDELSA_CHARRAM_MASK 0x7ff
+
class cidelsa_state : public driver_device
{
public:
@@ -44,9 +46,9 @@ public:
};
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)
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, CDP1802_TAG)
+ , m_vis(*this, CDP1869_TAG)
{ }
required_device<cosmac_device> m_maincpu;
@@ -121,4 +123,4 @@ MACHINE_CONFIG_EXTERN( destryer_video );
MACHINE_CONFIG_EXTERN( altair_video );
MACHINE_CONFIG_EXTERN( draco_video );
-#endif
+#endif // MAME_INCLUDES_CIDELSA_H
diff --git a/src/mame/includes/dgn_beta.h b/src/mame/includes/dgn_beta.h
index 497ed180b36..9e6d7f24c7c 100644
--- a/src/mame/includes/dgn_beta.h
+++ b/src/mame/includes/dgn_beta.h
@@ -108,7 +108,7 @@ public:
required_device<pia6821_device> m_pia_0;
required_device<pia6821_device> m_pia_1;
required_device<pia6821_device> m_pia_2;
- required_device<wd2797_t> m_fdc;
+ required_device<wd2797_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
diff --git a/src/mame/includes/dgnalpha.h b/src/mame/includes/dgnalpha.h
index 9ea62d3aeef..128f5e3915b 100644
--- a/src/mame/includes/dgnalpha.h
+++ b/src/mame/includes/dgnalpha.h
@@ -8,10 +8,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_INCLUDES_DGNALPHA_H
+#define MAME_INCLUDES_DGNALPHA_H
-#ifndef __DGNALPHA__
-#define __DGNALPHA__
+#pragma once
#include "includes/dragon.h"
@@ -52,14 +52,6 @@ public:
DECLARE_FLOPPY_FORMATS(dragon_formats);
- required_device<pia6821_device> m_pia_2;
- required_device<ay8912_device> m_ay8912;
- required_device<wd2797_t> m_fdc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<floppy_connector> m_floppy2;
- required_device<floppy_connector> m_floppy3;
-
/* pia2 */
DECLARE_WRITE8_MEMBER( pia2_pa_w );
@@ -86,6 +78,14 @@ protected:
virtual DECLARE_READ8_MEMBER( ff20_read ) override;
virtual DECLARE_WRITE8_MEMBER( ff20_write ) override;
+ required_device<pia6821_device> m_pia_2;
+ required_device<ay8912_device> m_ay8912;
+ required_device<wd2797_device> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<floppy_connector> m_floppy2;
+ required_device<floppy_connector> m_floppy3;
+
private:
uint8_t m_just_reset;
@@ -94,4 +94,4 @@ private:
void modem_w(offs_t offset, uint8_t data);
};
-#endif /* __DGNALPHA__ */
+#endif // MAME_INCLUDES_DGNALPHA_H
diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h
index b50ee550e78..8b2b52b588d 100644
--- a/src/mame/includes/dm7000.h
+++ b/src/mame/includes/dm7000.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Lukasz Markowski
-#ifndef DM7000_H_
-#define DM7000_H_
+#ifndef MAME_INCLUDES_DM7000_H
+#define MAME_INCLUDES_DM7000_H
+
+#pragma once
#include "cpu/powerpc/ppc.h"
#include "machine/terminal.h"
@@ -28,7 +30,7 @@ public:
DECLARE_WRITE8_MEMBER ( dm7000_scc0_w );
DECLARE_READ8_MEMBER ( dm7000_scc0_r );
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
uint8_t m_scc0_lcr;
uint8_t m_scc0_lsr;
uint8_t m_term_data;
@@ -90,4 +92,4 @@ public:
#define DCRSTB045_DISP_MODE 0x154 /* Display Mode Register */
#define DCRSTB045_FRAME_BUFR_BASE 0x179 /* Frame Buffers Base Address Register */
-#endif /* DM7000_H_ */
+#endif // MAME_INCLUDES_DM7000_H
diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h
deleted file mode 100644
index 44da12b5215..00000000000
--- a/src/mame/includes/dooyong.h
+++ /dev/null
@@ -1,297 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria,Vas Crabb
-#include "video/bufsprite.h"
-#include "screen.h"
-
-#define MCFG_DOOYONG_ROM_TILEMAP_ADD(tag, gfx, num, rom, offset) \
- MCFG_DEVICE_ADD(tag, DOOYONG_ROM_TILEMAP, 0) \
- dooyong_rom_tilemap_device::static_set_gfxdecode_tag(*device, "^" gfx); \
- dooyong_rom_tilemap_device::static_set_tilerom_tag(*device, "^" rom); \
- dooyong_rom_tilemap_device::static_set_gfxnum(*device, (num)); \
- dooyong_rom_tilemap_device::static_set_tilerom_offset(*device, (offset));
-#define MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(pen) \
- dooyong_rom_tilemap_device::static_set_transparent_pen(*device, (pen));
-#define MCFG_DOOYONG_ROM_TILEMAP_PRIMELLA_CODE_BITS(bits) \
- dooyong_rom_tilemap_device::static_set_primella_code_bits(*device, (bits));
-
-#define MCFG_RSHARK_ROM_TILEMAP_ADD(tag, gfx, num, rom, offset, rom2, offset2) \
- MCFG_DEVICE_ADD(tag, RSHARK_ROM_TILEMAP, 0) \
- dooyong_rom_tilemap_device::static_set_gfxdecode_tag(*device, "^" gfx); \
- dooyong_rom_tilemap_device::static_set_tilerom_tag(*device, "^" rom); \
- dooyong_rom_tilemap_device::static_set_gfxnum(*device, (num)); \
- dooyong_rom_tilemap_device::static_set_tilerom_offset(*device, (offset)); \
- dooyong_rom_tilemap_device::static_set_primella_code_bits(*device, 13); \
- rshark_rom_tilemap_device::static_set_colorrom_tag(*device, "^" rom2); \
- rshark_rom_tilemap_device::static_set_colorrom_offset(*device, (offset2));
-
-#define MCFG_DOOYONG_RAM_TILEMAP_ADD(tag, gfx, num) \
- MCFG_DEVICE_ADD(tag, DOOYONG_RAM_TILEMAP, 0) \
- dooyong_rom_tilemap_device::static_set_gfxdecode_tag(*device, "^" gfx); \
- dooyong_rom_tilemap_device::static_set_gfxnum(*device, (num));
-
-
-extern device_type const DOOYONG_ROM_TILEMAP;
-extern device_type const RSHARK_ROM_TILEMAP;
-extern device_type const DOOYONG_RAM_TILEMAP;
-
-
-class dooyong_tilemap_device_base : public device_t
-{
-public:
- static void static_set_gfxdecode_tag(device_t &device, char const *tag);
- static void static_set_gfxnum(device_t &device, int gfxnum);
-
- void draw(screen_device &screen, bitmap_ind16 &dest, rectangle const &cliprect, uint32_t flags, uint8_t priority);
-
- void set_palette_bank(uint16_t bank);
-
-protected:
- dooyong_tilemap_device_base(
- machine_config const &mconfig,
- device_type type,
- char const *name,
- char const *tag,
- device_t *owner,
- uint32_t clock,
- char const *shortname,
- char const *source);
-
- gfx_element const &gfx() const { return *m_gfxdecode->gfx(m_gfxnum); }
-
- required_device<gfxdecode_device> m_gfxdecode;
- int m_gfxnum;
-
- tilemap_t *m_tilemap;
- uint16_t m_palette_bank;
-};
-
-class dooyong_rom_tilemap_device : public dooyong_tilemap_device_base
-{
-public:
- dooyong_rom_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
-
- static void static_set_tilerom_tag(device_t &device, char const *tag);
- static void static_set_tilerom_offset(device_t &device, int offset);
- static void static_set_transparent_pen(device_t &device, unsigned pen);
- static void static_set_primella_code_bits(device_t &device, unsigned bits);
-
- DECLARE_WRITE8_MEMBER(ctrl_w);
-
-protected:
- dooyong_rom_tilemap_device(
- machine_config const &mconfig,
- device_type type,
- char const *name,
- char const *tag,
- device_t *owner,
- uint32_t clock,
- char const *shortname,
- char const *source);
-
- virtual void device_start() override;
-
- virtual TILE_GET_INFO_MEMBER(tile_info);
-
- tilemap_memory_index adjust_tile_index(tilemap_memory_index tile_index) const
- { return tile_index + ((unsigned(m_registers[1]) * 256U / gfx().width()) * m_rows); }
-
- int m_rows;
-
-private:
- required_region_ptr<uint16_t> m_tilerom;
- int m_tilerom_offset;
- unsigned m_transparent_pen;
- unsigned m_primella_code_mask;
- unsigned m_primella_color_mask;
- unsigned m_primella_color_shift;
-
- uint8_t m_registers[0x10];
-};
-
-class rshark_rom_tilemap_device : public dooyong_rom_tilemap_device
-{
-public:
- rshark_rom_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
-
- static void static_set_colorrom_tag(device_t &device, char const *tag);
- static void static_set_colorrom_offset(device_t &device, int offset);
-
-protected:
- virtual void device_start() override;
-
- virtual TILE_GET_INFO_MEMBER(tile_info) override;
-
-private:
- required_region_ptr<uint8_t> m_colorrom;
- int m_colorrom_offset;
-};
-
-class dooyong_ram_tilemap_device : public dooyong_tilemap_device_base
-{
-public:
- dooyong_ram_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
-
- DECLARE_READ16_MEMBER(tileram_r) { return m_tileram[offset & ((64U * 32U) - 1)]; }
- DECLARE_WRITE16_MEMBER(tileram_w);
- void set_scrolly(int value) { m_tilemap->set_scrolly(value); }
-
-protected:
- virtual void device_start() override;
-
-private:
- TILE_GET_INFO_MEMBER(tile_info);
-
- std::unique_ptr<uint16_t[]> m_tileram;
-};
-
-
-class dooyong_state : public driver_device
-{
-public:
- dooyong_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_gfxdecode(*this, "gfxdecode")
- , m_palette(*this, "palette")
- , m_bg(*this, "bg")
- , m_bg2(*this, "bg2")
- , m_fg(*this, "fg")
- , m_fg2(*this, "fg2")
- {
- }
-
- required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_audiocpu;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
- optional_device<dooyong_rom_tilemap_device> m_bg;
- optional_device<dooyong_rom_tilemap_device> m_bg2;
- optional_device<dooyong_rom_tilemap_device> m_fg;
- optional_device<dooyong_rom_tilemap_device> m_fg2;
-};
-
-class dooyong_z80_state : public dooyong_state
-{
-public:
- dooyong_z80_state(const machine_config &mconfig, device_type type, const char *tag)
- : dooyong_state(mconfig, type, tag)
- , m_tx(*this, "tx")
- , m_spriteram(*this, "spriteram")
- {
- }
-
- enum
- {
- SPRITE_12BIT = 0x01,
- SPRITE_HEIGHT = 0x02,
- SPRITE_YSHIFT_BLUEHAWK = 0x04,
- SPRITE_YSHIFT_FLYTIGER = 0x08
- };
-
- DECLARE_WRITE8_MEMBER(flip_screen_w);
- DECLARE_WRITE8_MEMBER(bankswitch_w);
- DECLARE_READ8_MEMBER(lastday_tx_r);
- DECLARE_WRITE8_MEMBER(lastday_tx_w);
- DECLARE_READ8_MEMBER(bluehawk_tx_r);
- DECLARE_WRITE8_MEMBER(bluehawk_tx_w);
- DECLARE_WRITE8_MEMBER(primella_ctrl_w);
- DECLARE_READ8_MEMBER(paletteram_flytiger_r);
- DECLARE_WRITE8_MEMBER(paletteram_flytiger_w);
- DECLARE_WRITE8_MEMBER(flytiger_ctrl_w);
- TILE_GET_INFO_MEMBER(get_tx_tile_info);
- void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions = 0);
- uint32_t screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_MACHINE_START(cpu_z80);
- DECLARE_VIDEO_START(bluehawk);
- DECLARE_VIDEO_START(flytiger);
- DECLARE_VIDEO_START(primella);
-
- std::unique_ptr<uint8_t[]> m_paletteram_flytiger;
- uint8_t m_sprites_disabled = 0;
- uint8_t m_flytiger_pri = 0;
- uint8_t m_tx_pri = 0;
- uint8_t m_palette_bank = 0;
-
- required_device<dooyong_ram_tilemap_device> m_tx;
- optional_device<buffered_spriteram8_device> m_spriteram;
-};
-
-class dooyong_z80_ym2203_state : public dooyong_z80_state
-{
-public:
- dooyong_z80_ym2203_state(const machine_config &mconfig, device_type type, const char *tag)
- : dooyong_z80_state(mconfig, type, tag)
- {
- }
-
- DECLARE_WRITE8_MEMBER(lastday_ctrl_w);
- DECLARE_WRITE8_MEMBER(pollux_ctrl_w);
- DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_1);
- DECLARE_WRITE_LINE_MEMBER(irqhandler_2203_2);
- DECLARE_READ8_MEMBER(unk_r);
- DECLARE_MACHINE_RESET(sound_ym2203);
- uint32_t screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_VIDEO_START(lastday);
- DECLARE_VIDEO_START(gulfstrm);
- DECLARE_VIDEO_START(pollux);
-
- int m_interrupt_line_1 = 0;
- int m_interrupt_line_2 = 0;
-};
-
-class dooyong_68k_state : public dooyong_state
-{
-public:
- dooyong_68k_state(const machine_config &mconfig, device_type type, const char *tag)
- : dooyong_state(mconfig, type, tag)
- , m_spriteram(*this, "spriteram")
- {
- }
-
- DECLARE_WRITE16_MEMBER(ctrl_w);
- TIMER_DEVICE_CALLBACK_MEMBER(scanline);
-
-protected:
- void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
- uint16_t m_bg2_priority = 0;
- required_device<buffered_spriteram16_device> m_spriteram;
-};
-
-class rshark_state : public dooyong_68k_state
-{
-public:
- rshark_state(const machine_config &mconfig, device_type type, const char *tag)
- : dooyong_68k_state(mconfig, type, tag)
- {
- }
-
- uint32_t screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_VIDEO_START(rshark);
-};
-
-class popbingo_state : public dooyong_68k_state
-{
-public:
- popbingo_state(const machine_config &mconfig, device_type type, const char *tag)
- : dooyong_68k_state(mconfig, type, tag)
- , m_bg_bitmap()
- , m_bg2_bitmap()
- , m_screen(*this, "screen")
- {
- }
-
- uint32_t screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_VIDEO_START(popbingo);
-
-protected:
- bitmap_ind16 m_bg_bitmap;
- bitmap_ind16 m_bg2_bitmap;
-
- required_device<screen_device> m_screen;
-};
diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h
index 92f4d88220d..c1d47b339fb 100644
--- a/src/mame/includes/einstein.h
+++ b/src/mame/includes/einstein.h
@@ -6,8 +6,10 @@
***************************************************************************/
-#ifndef EINSTEIN_H_
-#define EINSTEIN_H_
+#ifndef MAME_INCLUDES_EINSTEIN_H
+#define MAME_INCLUDES_EINSTEIN_H
+
+#pragma once
#include "video/mc6845.h"
#include "cpu/z80/z80daisy.h"
@@ -65,44 +67,14 @@ public:
m_bank1(*this, "bank1"),
m_bank2(*this, "bank2"),
m_bank3(*this, "bank3"),
- m_line0(*this, "LINE0"),
- m_line1(*this, "LINE1"),
- m_line2(*this, "LINE2"),
- m_line3(*this, "LINE3"),
- m_line4(*this, "LINE4"),
- m_line5(*this, "LINE5"),
- m_line6(*this, "LINE6"),
- m_line7(*this, "LINE7"),
+ m_line(*this, "LINE%u", 0),
m_extra(*this, "EXTRA"),
m_buttons(*this, "BUTTONS"),
m_config(*this, "config"),
m_80column_dips(*this, "80column_dips"),
- m_palette(*this, "palette") { }
-
- required_device<wd1770_t> m_fdc;
- required_device<screen_device> m_color_screen;
- required_device<z80ctc_device> m_ctc;
- required_device<tms9929a_device> m_tms9929a;
- optional_memory_region m_region_gfx1;
-
- int m_rom_enabled;
- int m_interrupt;
- int m_interrupt_mask;
- int m_ctc_trigger;
-
- /* keyboard */
- uint8_t m_keyboard_line;
- uint8_t m_keyboard_data;
-
- /* 80 column device */
- optional_device<mc6845_device> m_mc6845;
- optional_device<screen_device> m_crtc_screen;
- std::unique_ptr<uint8_t[]> m_crtc_ram;
- uint8_t m_de;
-
- int m_centronics_busy;
- int m_centronics_perror;
- int m_centronics_fault;
+ m_palette(*this, "palette")
+ {
+ }
DECLARE_FLOPPY_FORMATS( floppy_formats );
DECLARE_WRITE8_MEMBER(einstein_80col_ram_w);
@@ -118,8 +90,6 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
DECLARE_WRITE_LINE_MEMBER(write_centronics_perror);
DECLARE_WRITE_LINE_MEMBER(write_centronics_fault);
- virtual void machine_start() override;
- virtual void machine_reset() override;
DECLARE_MACHINE_START(einstein2);
DECLARE_MACHINE_RESET(einstein2);
uint32_t screen_update_einstein2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -131,7 +101,36 @@ public:
DECLARE_WRITE_LINE_MEMBER(einstein_serial_receive_clock);
MC6845_UPDATE_ROW(crtc_update_row);
+ int m_interrupt;
+ int m_interrupt_mask;
+
protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ required_device<wd1770_device> m_fdc;
+ required_device<screen_device> m_color_screen;
+ required_device<z80ctc_device> m_ctc;
+ required_device<tms9929a_device> m_tms9929a;
+ optional_memory_region m_region_gfx1;
+
+ int m_rom_enabled;
+ int m_ctc_trigger;
+
+ /* keyboard */
+ uint8_t m_keyboard_line;
+ uint8_t m_keyboard_data;
+
+ /* 80 column device */
+ optional_device<mc6845_device> m_mc6845;
+ optional_device<screen_device> m_crtc_screen;
+ std::unique_ptr<uint8_t[]> m_crtc_ram;
+ uint8_t m_de;
+
+ int m_centronics_busy;
+ int m_centronics_perror;
+ int m_centronics_fault;
+
required_device<i8251_device> m_uart;
required_device<ram_device> m_ram;
required_device<centronics_device> m_centronics;
@@ -139,18 +138,12 @@ protected:
required_memory_bank m_bank1;
required_memory_bank m_bank2;
required_memory_bank m_bank3;
- required_ioport m_line0;
- required_ioport m_line1;
- required_ioport m_line2;
- required_ioport m_line3;
- required_ioport m_line4;
- required_ioport m_line5;
- required_ioport m_line6;
- required_ioport m_line7;
+ required_ioport_array<8> m_line;
required_ioport m_extra;
required_ioport m_buttons;
required_ioport m_config;
optional_ioport m_80column_dips;
+
public:
optional_device<palette_device> m_palette;
@@ -161,8 +154,7 @@ public:
// ======================> einstein_keyboard_daisy_device
-class einstein_keyboard_daisy_device : public device_t,
- public device_z80daisy_interface
+class einstein_keyboard_daisy_device : public device_t, public device_z80daisy_interface
{
public:
// construction/destruction
@@ -176,13 +168,12 @@ private:
virtual void z80daisy_irq_reti() override;
};
-extern const device_type EINSTEIN_KEYBOARD_DAISY;
+DECLARE_DEVICE_TYPE(EINSTEIN_KEYBOARD_DAISY, einstein_keyboard_daisy_device)
// ======================> einstein_adc_daisy_device
-class einstein_adc_daisy_device : public device_t,
- public device_z80daisy_interface
+class einstein_adc_daisy_device : public device_t, public device_z80daisy_interface
{
public:
// construction/destruction
@@ -197,12 +188,11 @@ private:
};
-extern const device_type EINSTEIN_ADC_DAISY;
+DECLARE_DEVICE_TYPE(EINSTEIN_ADC_DAISY, einstein_adc_daisy_device)
// ======================> einstein_fire_daisy_device
-class einstein_fire_daisy_device : public device_t,
- public device_z80daisy_interface
+class einstein_fire_daisy_device : public device_t, public device_z80daisy_interface
{
public:
// construction/destruction
@@ -216,6 +206,6 @@ private:
virtual void z80daisy_irq_reti() override;
};
-extern const device_type EINSTEIN_FIRE_DAISY;
+DECLARE_DEVICE_TYPE(EINSTEIN_FIRE_DAISY, einstein_fire_daisy_device)
-#endif /* EINSTEIN_H_ */
+#endif // MAME_INCLUDES_EINSTEIN_H
diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h
index 49631341e7e..4d0a7315cdd 100644
--- a/src/mame/includes/fm7.h
+++ b/src/mame/includes/fm7.h
@@ -1,5 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
+/*
+ *
+ * FM-7 header file
+ *
+ */
+#ifndef MAME_INCLUDES_FM7_H
+#define MAME_INCLUDES_FM7_H
+
+#pragma once
+
+
#include "machine/buffer.h"
#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
@@ -8,14 +19,6 @@
#include "machine/wd_fdc.h"
#include "machine/bankdev.h"
-/*
- *
- * FM-7 header file
- *
- */
-
-#ifndef FM7_H_
-#define FM7_H_
// Interrupt flags
#define IRQ_FLAG_KEY 0x01
@@ -342,7 +345,7 @@ protected:
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_cent_data_out;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
floppy_image_device *m_floppy;
@@ -405,4 +408,4 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
-#endif /*FM7_H_*/
+#endif // MAME_INCLUDES_FM7_H
diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h
index c7342c0bc86..fff7ba23a12 100644
--- a/src/mame/includes/fmtowns.h
+++ b/src/mame/includes/fmtowns.h
@@ -128,7 +128,7 @@ class towns_state : public driver_device
required_device<upd71071_device> m_dma_2;
required_device<palette_device> m_palette;
required_device<ram_device> m_ram;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<floppy_connector> m_flop0;
required_device<floppy_connector> m_flop1;
required_device<fmt_icmem_device> m_icmemcard;
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index 45d0f80040a..e443d80d1a7 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -1,5 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi, David Haywood
+#ifndef MAME_INCLUDES_GOMOKU_H
+#define MAME_INCLUDES_GOMOKU_H
+
#include "screen.h"
class gomoku_state : public driver_device
@@ -38,75 +41,4 @@ public:
required_device<screen_device> m_screen;
};
-
-/*----------- defined in audio/gomoku.c -----------*/
-
-/* 4 voices max */
-#define GOMOKU_MAX_VOICES 4
-
-//**************************************************************************
-// TYPE DEFINITIONS
-//**************************************************************************
-
-struct gomoku_sound_channel
-{
- gomoku_sound_channel():
- channel(0),
- frequency(0),
- counter(0),
- volume(0),
- oneshotplaying(0) {}
-
- int channel;
- int frequency;
- int counter;
- int volume;
- int oneshotplaying;
-};
-
-
-// ======================> gomoku_sound_device
-
-class gomoku_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~gomoku_sound_device() { }
-
-protected:
- // device-level overrides
- virtual void device_start() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-public:
- DECLARE_WRITE8_MEMBER( sound1_w );
- DECLARE_WRITE8_MEMBER( sound2_w );
-
-private:
- void make_mixer_table(int voices, int gain);
-
-private:
- /* data about the sound system */
- gomoku_sound_channel m_channel_list[GOMOKU_MAX_VOICES];
- gomoku_sound_channel *m_last_channel;
-
- /* global sound parameters */
- const uint8_t *m_sound_rom;
- int m_num_voices;
- int m_sound_enable;
- sound_stream *m_stream;
-
- /* mixer tables and internal buffers */
- std::unique_ptr<int16_t[]> m_mixer_table;
- int16_t *m_mixer_lookup;
- std::unique_ptr<short[]> m_mixer_buffer;
- short *m_mixer_buffer_2;
-
- uint8_t m_soundregs1[0x20];
- uint8_t m_soundregs2[0x20];
-};
-
-extern const device_type GOMOKU;
+#endif // MAME_INCLUDES_GOMOKU_H
diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h
index c14d27b722d..45fa8aa3c05 100644
--- a/src/mame/includes/gridlee.h
+++ b/src/mame/includes/gridlee.h
@@ -76,8 +76,7 @@ public:
/*----------- defined in audio/gridlee.c -----------*/
-class gridlee_sound_device : public device_t,
- public device_sound_interface
+class gridlee_sound_device : public device_t, public device_sound_interface
{
public:
gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -106,4 +105,4 @@ private:
uint8_t m_sound_data[24];
};
-extern const device_type GRIDLEE;
+DECLARE_DEVICE_TYPE(GRIDLEE, gridlee_sound_device)
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index cff18a7e6f9..f408df654c0 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -5,48 +5,52 @@
Driver for Atari polygon racer games
**************************************************************************/
+#ifndef MAME_INCLUDES_HARDDRIV_H
+#define MAME_INCLUDES_HARDDRIV_H
+
+#pragma once
+
+#include "audio/atarijsa.h"
+
+#include "bus/rs232/rs232.h"
-#include "cpu/m68000/m68000.h"
-#include "cpu/tms34010/tms34010.h"
-#include "cpu/tms32010/tms32010.h"
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/dsp32/dsp32.h"
-#include "audio/atarijsa.h"
-#include "sound/dac.h"
-#include "machine/mc68681.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/tms32010/tms32010.h"
+#include "cpu/tms34010/tms34010.h"
+
#include "machine/asic65.h"
+#include "machine/mc68681.h"
#include "machine/timekpr.h"
-#include "bus/rs232/rs232.h"
+
+#include "sound/dac.h"
+
#include "screen.h"
#define HARDDRIV_MASTER_CLOCK XTAL_32MHz
#define HARDDRIV_GSP_CLOCK XTAL_48MHz
-extern const device_type HARDDRIV_BOARD_DEVICE;
-extern const device_type HARDDRIVC_BOARD_DEVICE;
-extern const device_type RACEDRIV_BOARD_DEVICE;
-extern const device_type RACEDRIVC_BOARD_DEVICE;
-extern const device_type RACEDRIVC1_BOARD_DEVICE;
-extern const device_type RACEDRIVB1_BOARD_DEVICE;
-extern const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE;
-extern const device_type STUNRUN_BOARD_DEVICE;
-extern const device_type STEELTAL_BOARD_DEVICE;
-extern const device_type STEELTAL1_BOARD_DEVICE;
-extern const device_type STEELTALP_BOARD_DEVICE;
-extern const device_type STRTDRIV_BOARD_DEVICE;
-extern const device_type HDRIVAIR_BOARD_DEVICE;
-extern const device_type HDRIVAIRP_BOARD_DEVICE;
-extern const device_type HARDDRIV_SOUND_BOARD_DEVICE;
-
-
-class harddriv_sound_board_device;
-
-class harddriv_state : public device_t
- /* public device_video_interface */
+DECLARE_DEVICE_TYPE(HARDDRIV_BOARD, harddriv_board_device_state)
+DECLARE_DEVICE_TYPE(HARDDRIVC_BOARD, harddrivc_board_device_state)
+DECLARE_DEVICE_TYPE(RACEDRIV_BOARD, racedrivc_board_device_state)
+DECLARE_DEVICE_TYPE(RACEDRIVB1_BOARD, racedrivb1_board_device_state)
+DECLARE_DEVICE_TYPE(RACEDRIVC_BOARD, racedrivc_board_device_state)
+DECLARE_DEVICE_TYPE(RACEDRIVC1_BOARD, racedrivc1_board_device_state)
+DECLARE_DEVICE_TYPE(RACEDRIVC_PANORAMA_SIDE_BOARD,racedrivc_panorama_side_board_device_state)
+DECLARE_DEVICE_TYPE(STUNRUN_BOARD, stunrun_board_device_state)
+DECLARE_DEVICE_TYPE(STEELTAL_BOARD, steeltal_board_device_state)
+DECLARE_DEVICE_TYPE(STEELTAL1_BOARD, steeltal1_board_device_state)
+DECLARE_DEVICE_TYPE(STEELTALP_BOARD, steeltalp_board_device_state)
+DECLARE_DEVICE_TYPE(STRTDRIV_BOARD, strtdriv_board_device_state)
+DECLARE_DEVICE_TYPE(HDRIVAIR_BOARD, hdrivair_board_device_state)
+DECLARE_DEVICE_TYPE(HDRIVAIRP_BOARD, hdrivairp_board_device_state)
+DECLARE_DEVICE_TYPE(HARDDRIV_SOUND_BOARD, harddriv_sound_board_device)
+
+
+class harddriv_state : public device_t
{
public:
- harddriv_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
void init_strtdriv(void);
void init_harddriv(void);
@@ -248,6 +252,8 @@ public:
DECLARE_READ32_MEMBER(hdds3xdsp_serial_rx_callback);
protected:
+ harddriv_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
required_device<cpu_device> m_maincpu;
required_device<tms34010_device> m_gsp;
optional_device<tms34010_device> m_msp;
@@ -560,9 +566,10 @@ class racedriv_board_device_state : public harddriv_state
{
public:
racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- racedriv_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ racedriv_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
// virtual void device_reset();
@@ -583,9 +590,10 @@ class racedrivc_board_device_state : public harddriv_state
{
public:
racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- racedrivc_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ racedrivc_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
// virtual void device_reset();
@@ -630,9 +638,10 @@ class steeltal_board_device_state : public harddriv_state
{
public:
steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- steeltal_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ steeltal_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
// virtual void device_reset();
@@ -677,9 +686,10 @@ class hdrivair_board_device_state : public harddriv_state
{
public:
hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- hdrivair_board_device_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ hdrivair_board_device_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
// virtual void device_reset();
@@ -692,3 +702,5 @@ public:
protected:
virtual void device_start() override;
};
+
+#endif // MAME_INCLUDES_HARDDRIV_H
diff --git a/src/mame/includes/hec2hrp.h b/src/mame/includes/hec2hrp.h
index c2d81923fa4..b12e900253f 100644
--- a/src/mame/includes/hec2hrp.h
+++ b/src/mame/includes/hec2hrp.h
@@ -38,6 +38,10 @@
TODO : Add the cartridge function,
Adjust the one shot and A/D timing (sn76477)
*/
+#ifndef MAME_INCLUDES_HEC2HRP_H
+#define MAME_INCLUDES_HEC2HRP_H
+
+#pragma once
#include "machine/upd765.h"
#include "machine/wd_fdc.h"
@@ -99,7 +103,7 @@ public:
optional_shared_ptr<uint8_t> m_hector_videoram;
required_ioport_array<9> m_keyboard;
- optional_device<fd1793_t> m_minidisc_fdc;
+ optional_device<fd1793_device> m_minidisc_fdc;
optional_device<floppy_connector> m_floppy0;
uint8_t m_hector_flag_hr;
@@ -197,3 +201,5 @@ public:
};
MACHINE_CONFIG_EXTERN( hector_audio );
+
+#endif // MAME_INCLUDES_HEC2HRP_H
diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h
index 89ba8b8ba6f..bcc88e6f029 100644
--- a/src/mame/includes/hp48.h
+++ b/src/mame/includes/hp48.h
@@ -7,8 +7,13 @@
Hewlett Packard HP48 S/SX & G/GX and HP49 G
**********************************************************************/
+#ifndef MAME_INCLUDES_HP84_H
+#define MAME_INCLUDES_HP84_H
+
+#pragma once
#include "sound/dac.h"
+
/* model */
typedef enum {
HP48_S,
@@ -214,8 +219,10 @@ private:
};
// device type definition
-extern const device_type HP48_PORT;
+DECLARE_DEVICE_TYPE(HP48_PORT, hp48_port_image_device)
#define MCFG_HP48_PORT_ADD(_tag, _port, _module, _max_size) \
MCFG_DEVICE_ADD(_tag, HP48_PORT, 0) \
hp48_port_image_device::set_port_config(*device, _port, _module, _max_size);
+
+#endif // MAME_INCLUDES_HP84_H
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 39883a8afd4..b03c5037ce0 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -96,7 +96,7 @@ public:
int m_slidesout;
int m_hopper[3];
int m_motor[3];
- optional_device<s16lf01_t> m_vfd;
+ optional_device<s16lf01_device> m_vfd;
optional_shared_ptr<uint16_t> m_vram;
struct bt477_t m_bt477;
DECLARE_READ16_MEMBER(duart_1_r);
diff --git a/src/mame/includes/jpmsys5.h b/src/mame/includes/jpmsys5.h
index a02b918f972..78c323c5d29 100644
--- a/src/mame/includes/jpmsys5.h
+++ b/src/mame/includes/jpmsys5.h
@@ -36,7 +36,7 @@ public:
required_device<acia6850_device> m_acia6850_2;
required_device<upd7759_device> m_upd7759;
optional_device<tms34061_device> m_tms34061;
- optional_device<s16lf01_t> m_vfd;
+ optional_device<s16lf01_device> m_vfd;
required_ioport m_direct_port;
optional_device<palette_device> m_palette;
optional_device<meters_device> m_meters; //jpmsys5v doesn't use this
diff --git a/src/mame/includes/jupiter.h b/src/mame/includes/jupiter.h
index 0f624613125..d85690ecc4b 100644
--- a/src/mame/includes/jupiter.h
+++ b/src/mame/includes/jupiter.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol, Robbbert
-#pragma once
+#ifndef MAME_INCLUDES_JUPITER_H
+#define MAME_INCLUDES_JUPITER_H
-#ifndef __JUPITER__
-#define __JUPITER__
+#pragma once
#define MCM6571AP_TAG "vid125_6c"
#define S6820_TAG "vid125_4a"
@@ -19,12 +19,13 @@ public:
jupiter2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, MCM6571AP_TAG)
- { }
+ { }
DECLARE_DRIVER_INIT(jupiter);
private:
required_device<cpu_device> m_maincpu;
+
virtual void machine_start() override;
};
@@ -37,22 +38,23 @@ public:
, m_p_videoram(*this, "videoram")
, m_p_ram(*this, "ram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_DRIVER_INIT(jupiter3);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(status_r);
DECLARE_READ8_MEMBER(key_r);
DECLARE_READ8_MEMBER(ff_r);
private:
- uint8_t m_term_data;
virtual void machine_reset() override;
+
+ uint8_t m_term_data;
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_p_videoram;
required_shared_ptr<uint8_t> m_p_ram;
required_region_ptr<u8> m_p_chargen;
};
-#endif
+#endif // MAME_INCLUDES_JUPITER_H
diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h
index 2973e21a70f..ba977be1ef0 100644
--- a/src/mame/includes/kaypro.h
+++ b/src/mame/includes/kaypro.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert
+#ifndef MAME_INCLUDES_KAYPRO_H
+#define MAME_INCLUDES_KAYPRO_H
+
+#pragma once
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
@@ -100,9 +105,11 @@ private:
required_device<z80sio0_device> m_sio;
optional_device<z80sio0_device> m_sio2x;
required_device<centronics_device> m_centronics;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
optional_device<mc6845_device> m_crtc;
required_device<beep_device> m_beep;
};
+
+#endif // MAME_INCLUDES_KAYPRO_H
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index 4662cda5e51..e6c6168fa6a 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -5,13 +5,14 @@
Cinemat/Leland driver
*************************************************************************/
+#ifndef MAME_INCLUDES_LELAND_H
+#define MAME_INCLUDES_LELAND_H
+
+#pragma once
#include "machine/eepromser.h"
-#include "sound/ym2151.h"
#include "sound/dac.h"
#include "sound/ay8910.h"
-#include "machine/pit8253.h"
-#include "cpu/i86/i186.h"
#include "screen.h"
#define LELAND_BATTERY_RAM_SIZE 0x4000
@@ -217,123 +218,9 @@ public:
#define SERIAL_TYPE_ENCRYPT_XOR 4
-/*----------- defined in audio/leland.c -----------*/
-
-class leland_80186_sound_device : public device_t
-{
-public:
- leland_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- leland_80186_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- virtual machine_config_constructor device_mconfig_additions() const override;
-
- DECLARE_WRITE16_MEMBER(peripheral_ctrl);
- DECLARE_WRITE8_MEMBER(leland_80186_control_w);
- DECLARE_WRITE8_MEMBER(ataxx_80186_control_w);
- DECLARE_READ16_MEMBER(peripheral_r);
- DECLARE_WRITE16_MEMBER(peripheral_w);
- DECLARE_WRITE8_MEMBER(leland_80186_command_lo_w);
- DECLARE_WRITE8_MEMBER(leland_80186_command_hi_w);
- DECLARE_READ8_MEMBER(leland_80186_response_r);
- DECLARE_WRITE16_MEMBER(dac_w);
- DECLARE_WRITE16_MEMBER(ataxx_dac_control);
- DECLARE_WRITE_LINE_MEMBER(pit0_2_w);
- DECLARE_WRITE_LINE_MEMBER(pit1_0_w);
- DECLARE_WRITE_LINE_MEMBER(pit1_1_w);
- DECLARE_WRITE_LINE_MEMBER(pit1_2_w);
- DECLARE_WRITE_LINE_MEMBER(i80186_tmr0_w);
- DECLARE_WRITE_LINE_MEMBER(i80186_tmr1_w);
-protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
- int m_type;
-
- enum {
- TYPE_LELAND,
- TYPE_REDLINE,
- TYPE_ATAXX,
- TYPE_WSF
- };
-
- required_device<dac_byte_interface> m_dac1;
- required_device<dac_byte_interface> m_dac2;
- required_device<dac_byte_interface> m_dac3;
- required_device<dac_byte_interface> m_dac4;
- optional_device<dac_byte_interface> m_dac5;
- optional_device<dac_byte_interface> m_dac6;
- optional_device<dac_byte_interface> m_dac7;
- optional_device<dac_byte_interface> m_dac8;
- optional_device<dac_word_interface> m_dac9;
- required_device<dac_byte_interface> m_dac1vol;
- required_device<dac_byte_interface> m_dac2vol;
- required_device<dac_byte_interface> m_dac3vol;
- required_device<dac_byte_interface> m_dac4vol;
- optional_device<dac_byte_interface> m_dac5vol;
- optional_device<dac_byte_interface> m_dac6vol;
- optional_device<dac_byte_interface> m_dac7vol;
- optional_device<dac_byte_interface> m_dac8vol;
-
-private:
- void command_lo_sync(void *ptr, int param);
- void delayed_response_r(void *ptr, int param);
- void set_clock_line(int which, int state) { m_clock_active = state ? (m_clock_active | (1<<which)) : (m_clock_active & ~(1<<which)); }
-
- // internal state
- i80186_cpu_device *m_audiocpu;
- uint16_t m_peripheral;
- uint8_t m_last_control;
- uint8_t m_clock_active;
- uint8_t m_clock_tick;
- uint16_t m_sound_command;
- uint16_t m_sound_response;
- uint32_t m_ext_start;
- uint32_t m_ext_stop;
- uint8_t m_ext_active;
- uint8_t* m_ext_base;
-
- required_device<pit8254_device> m_pit0;
- optional_device<pit8254_device> m_pit1;
- optional_device<pit8254_device> m_pit2;
- optional_device<ym2151_device> m_ymsnd;
-};
-
-extern const device_type LELAND_80186;
-
-class redline_80186_sound_device : public leland_80186_sound_device
-{
-public:
- redline_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE16_MEMBER(redline_dac_w);
- virtual machine_config_constructor device_mconfig_additions() const override;
-};
-
-extern const device_type REDLINE_80186;
-
-class ataxx_80186_sound_device : public leland_80186_sound_device
-{
-public:
- ataxx_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual machine_config_constructor device_mconfig_additions() const override;
-};
-
-extern const device_type ATAXX_80186;
-
-class wsf_80186_sound_device : public leland_80186_sound_device
-{
-public:
- wsf_80186_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual machine_config_constructor device_mconfig_additions() const override;
-};
-
-extern const device_type WSF_80186;
-
-ADDRESS_MAP_EXTERN(leland_80186_map_program, 16);
-ADDRESS_MAP_EXTERN(leland_80186_map_io, 16);
-ADDRESS_MAP_EXTERN(redline_80186_map_io, 16);
-ADDRESS_MAP_EXTERN(ataxx_80186_map_io, 16);
-
-
/*----------- defined in video/leland.c -----------*/
MACHINE_CONFIG_EXTERN( leland_video );
MACHINE_CONFIG_EXTERN( ataxx_video );
+
+#endif // MAME_INCLUDES_LELAND_H
diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h
index 38317d538e4..24f5cd6461d 100644
--- a/src/mame/includes/llc.h
+++ b/src/mame/includes/llc.h
@@ -9,6 +9,9 @@
#ifndef MAME_INCLUDES_LLC_H
#define MAME_INCLUDES_LLC_H
+#pragma once
+
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/k7659kb.h"
@@ -31,7 +34,7 @@ public:
DECLARE_WRITE8_MEMBER(llc2_rom_disable_w);
DECLARE_WRITE8_MEMBER(llc2_basic_enable_w);
- DECLARE_WRITE8_MEMBER(kbd_put);
+ void kbd_put(u8 data);
DECLARE_READ8_MEMBER(llc1_port1_a_r);
DECLARE_READ8_MEMBER(llc1_port2_a_r);
DECLARE_READ8_MEMBER(llc1_port2_b_r);
diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h
index 758020efa9d..d23f3e109a1 100644
--- a/src/mame/includes/m5.h
+++ b/src/mame/includes/m5.h
@@ -51,24 +51,6 @@ public:
, m_DIPS(*this, "DIPS")
{ }
- required_device<cpu_device> m_maincpu;
- required_device<z80ctc_device> m_ctc;
- //I've changed following devices to optional since we have to remove them in BRNO mod (I don't know better solution)
- optional_device<cpu_device> m_fd5cpu;
- optional_device<i8255_device> m_ppi;
- optional_device<upd765a_device> m_fdc;
- optional_device<floppy_image_device> m_floppy0;
- required_device<cassette_image_device> m_cassette;
- optional_device<m5_cart_slot_device> m_cart1;
- optional_device<m5_cart_slot_device> m_cart2;
- required_device<centronics_device> m_centronics;
- required_device<ram_device> m_ram;
- required_ioport m_reset;
- optional_ioport m_DIPS;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
DECLARE_READ8_MEMBER( sts_r );
DECLARE_WRITE8_MEMBER( com_w );
DECLARE_READ8_MEMBER( ppi_pa_r );
@@ -86,10 +68,6 @@ public:
DECLARE_FLOPPY_FORMATS( floppy_formats );
- // video state
-// const TMS9928a_interface *m_vdp_intf;
-
- int m_centronics_busy;
DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
DECLARE_DRIVER_INIT(pal);
@@ -101,6 +79,31 @@ public:
DECLARE_WRITE8_MEMBER( mem64KBI_w );
DECLARE_WRITE8_MEMBER( mem64KBF_w );
DECLARE_WRITE8_MEMBER( mem64KRX_w );
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<z80ctc_device> m_ctc;
+ //I've changed following devices to optional since we have to remove them in BRNO mod (I don't know better solution)
+ optional_device<cpu_device> m_fd5cpu;
+ optional_device<i8255_device> m_ppi;
+ optional_device<upd765a_device> m_fdc;
+ optional_device<floppy_image_device> m_floppy0;
+ required_device<cassette_image_device> m_cassette;
+ optional_device<m5_cart_slot_device> m_cart1;
+ optional_device<m5_cart_slot_device> m_cart2;
+ required_device<centronics_device> m_centronics;
+ required_device<ram_device> m_ram;
+ required_ioport m_reset;
+ optional_ioport m_DIPS;
+
+ // video state
+// const TMS9928a_interface *m_vdp_intf;
+
+ int m_centronics_busy;
+
uint8_t m_ram_mode;
uint8_t m_ram_type;
memory_region *m_cart_rom;
@@ -112,7 +115,6 @@ public:
int m_intra;
int m_ibfa;
int m_obfa;
-
};
@@ -120,22 +122,13 @@ class brno_state : public m5_state
{
public:
brno_state(const machine_config &mconfig, device_type type, const char *tag)
- : m5_state(mconfig, type, tag),
-
- m_fdc(*this, WD2797_TAG),
- m_floppy0(*this, WD2797_TAG":0"),
- m_floppy1(*this, WD2797_TAG":1")
- // m_ramdisk(*this, RAMDISK)
+ : m5_state(mconfig, type, tag)
+ , m_fdc(*this, WD2797_TAG)
+ , m_floppy0(*this, WD2797_TAG":0")
+ , m_floppy1(*this, WD2797_TAG":1")
+ //, m_ramdisk(*this, RAMDISK)
{ }
-
- required_device<wd2797_t> m_fdc;
- required_device<floppy_connector> m_floppy0;
- optional_device<floppy_connector> m_floppy1;
- floppy_image_device *m_floppy;
-
-
-
DECLARE_READ8_MEMBER( mmu_r );
DECLARE_WRITE8_MEMBER( mmu_w );
DECLARE_READ8_MEMBER( ramsel_r );
@@ -157,16 +150,20 @@ public:
DECLARE_SNAPSHOT_LOAD_MEMBER( brno );
// DECLARE_DEVICE_IMAGE_LOAD_MEMBER(m5_cart);
-
+protected:
virtual void machine_start() override;
virtual void machine_reset() override;
+ required_device<wd2797_device> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ optional_device<floppy_connector> m_floppy1;
+ floppy_image_device *m_floppy;
+
uint8_t m_rambank; // bank #
uint8_t m_ramcpu; //where Ramdisk bank is mapped
bool m_romen;
bool m_ramen;
-
uint8_t m_rammap[16]; // memory map
};
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 455fda8269d..29a5dcdae6d 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -82,10 +82,10 @@ public:
#if OLD_SOUND
optional_device<discrete_device> m_discrete;
#else
- optional_device<netlist_mame_logic_input_t> m_audio_snd0;
- optional_device<netlist_mame_logic_input_t> m_audio_snd1;
- optional_device<netlist_mame_logic_input_t> m_audio_snd7;
- optional_device<netlist_mame_int_input_t> m_audio_dac;
+ optional_device<netlist_mame_logic_input_device> m_audio_snd0;
+ optional_device<netlist_mame_logic_input_device> m_audio_snd1;
+ optional_device<netlist_mame_logic_input_device> m_audio_snd7;
+ optional_device<netlist_mame_int_input_device> m_audio_dac;
#endif
/* memory pointers */
diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h
index bc5c31ef129..d7d40c913a7 100644
--- a/src/mame/includes/maygay1b.h
+++ b/src/mame/includes/maygay1b.h
@@ -55,7 +55,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<i80c51_device> m_mcu;
- optional_device<s16lf01_t> m_vfd;
+ optional_device<s16lf01_device> m_vfd;
required_device<ay8910_device> m_ay;
optional_device<okim6376_device> m_msm6376;
optional_device<upd7759_device> m_upd7759;
diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h
index 0abbe9c9ffc..e463e5688f0 100644
--- a/src/mame/includes/mbc55x.h
+++ b/src/mame/includes/mbc55x.h
@@ -116,20 +116,6 @@ public:
DECLARE_FLOPPY_FORMATS(floppy_formats);
- required_device<cpu_device> m_maincpu;
- required_device<mc6845_device> m_crtc;
- required_device<i8251_device> m_kb_uart;
- required_device<pit8253_device> m_pit;
- required_device<i8255_device> m_ppi;
- required_device<pic8259_device> m_pic;
- required_device<fd1793_t> m_fdc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<floppy_connector> m_floppy2;
- required_device<floppy_connector> m_floppy3;
- required_device<speaker_sound_device> m_speaker;
- required_device<ram_device> m_ram;
- required_device<palette_device> m_palette;
//DECLARE_READ8_MEMBER(pic8259_r);
//DECLARE_WRITE8_MEMBER(pic8259_w);
//DECLARE_READ8_MEMBER(mbc55x_disk_r);
@@ -154,12 +140,6 @@ public:
DECLARE_WRITE_LINE_MEMBER(vid_vsync_changed);
DECLARE_WRITE_LINE_MEMBER(pit8253_t2);
- uint32_t m_debug_machine;
- uint32_t m_debug_video;
- uint8_t m_video_mem[VIDEO_MEM_SIZE];
- uint8_t m_vram_page;
-
- keyboard_t m_keyboard;
DECLARE_READ8_MEMBER(mbcpic8259_r);
DECLARE_WRITE8_MEMBER(mbcpic8259_w);
DECLARE_READ8_MEMBER(mbcpit8253_r);
@@ -169,18 +149,46 @@ public:
DECLARE_READ8_MEMBER(mbc55x_kb_usart_r);
DECLARE_WRITE8_MEMBER(mbc55x_kb_usart_w);
DECLARE_DRIVER_INIT(mbc55x);
+
MC6845_UPDATE_ROW(crtc_update_row);
+ DECLARE_PALETTE_INIT(mbc55x);
+ DECLARE_WRITE_LINE_MEMBER(screen_vblank_mbc55x);
+ TIMER_CALLBACK_MEMBER(keyscan_callback);
+
+ required_device<cpu_device> m_maincpu;
+
+ uint32_t m_debug_machine;
+
+protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
virtual void video_reset() override;
- DECLARE_PALETTE_INIT(mbc55x);
- DECLARE_WRITE_LINE_MEMBER(screen_vblank_mbc55x);
- TIMER_CALLBACK_MEMBER(keyscan_callback);
+
void keyboard_reset();
void scan_keyboard();
void set_ram_size();
+ required_device<mc6845_device> m_crtc;
+ required_device<i8251_device> m_kb_uart;
+ required_device<pit8253_device> m_pit;
+ required_device<i8255_device> m_ppi;
+ required_device<pic8259_device> m_pic;
+ required_device<fd1793_device> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<floppy_connector> m_floppy2;
+ required_device<floppy_connector> m_floppy3;
+ required_device<speaker_sound_device> m_speaker;
+ required_device<ram_device> m_ram;
+ required_device<palette_device> m_palette;
+
+ uint32_t m_debug_video;
+ uint8_t m_video_mem[VIDEO_MEM_SIZE];
+ uint8_t m_vram_page;
+
+ keyboard_t m_keyboard;
+
private:
void debug_command(int ref, const std::vector<std::string> &params);
void video_debug(int ref, const std::vector<std::string> &params);
diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h
index fe91bd4cbf8..771606aa25f 100644
--- a/src/mame/includes/mbee.h
+++ b/src/mame/includes/mbee.h
@@ -160,7 +160,7 @@ private:
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_cent_data_out;
required_device<mc6845_device> m_crtc;
- optional_device<wd2793_t> m_fdc;
+ optional_device<wd2793_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
optional_device<mc146818_device> m_rtc;
@@ -174,4 +174,4 @@ private:
required_device<screen_device> m_screen;
};
-#endif /* MAME_INCLUDES_MBEE_H */
+#endif // MAME_INCLUDES_MBEE_H
diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h
index 87d11f4f571..eeb57b3dbcf 100644
--- a/src/mame/includes/micro3d.h
+++ b/src/mame/includes/micro3d.h
@@ -5,6 +5,10 @@
Microprose Games 3D hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_MICRO3D_H
+#define MAME_INCLUDES_MICRO3D_H
+
+#pragma once
#include "cpu/tms34010/tms34010.h"
#include "cpu/mcs51/mcs51.h"
@@ -32,13 +36,6 @@ enum planes
CLIP_Y_MAX
};
-enum dac_registers {
- VCF,
- VCQ,
- VCA,
- PAN
-};
-
class micro3d_sound_device;
class micro3d_state : public driver_device
@@ -93,7 +90,6 @@ public:
/* Sound */
uint8_t m_sound_port_latch[4];
- uint8_t m_dac_data;
/* TI UART */
uint8_t m_ti_uart[9];
@@ -203,66 +199,4 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
-/*----------- defined in audio/micro3d.c -----------*/
-
-struct biquad
-{
- double a0, a1, a2; /* Numerator coefficients */
- double b0, b1, b2; /* Denominator coefficients */
-};
-
-struct lp_filter
-{
- std::unique_ptr<float[]> history;
- std::unique_ptr<float[]> coef;
- double fs;
- biquad ProtoCoef[2];
-};
-
-struct m3d_filter_state
-{
- double capval;
- double exponent;
-};
-
-class micro3d_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~micro3d_sound_device() {}
-
- void noise_sh_w(uint8_t data);
-
-protected:
- // device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-private:
- // internal state
-// union
-// {
-// struct
-// {
-// uint8_t m_vcf;
-// uint8_t m_vcq;
-// uint8_t m_vca;
-// uint8_t m_pan;
-// };
- uint8_t m_dac[4];
-// };
-
- float m_gain;
- uint32_t m_noise_shift;
- uint8_t m_noise_value;
- uint8_t m_noise_subcount;
-
- m3d_filter_state m_noise_filters[4];
- lp_filter m_filter;
- sound_stream *m_stream;
-};
-
-extern const device_type MICRO3D;
+#endif // MAME_INCLUDES_MICRO3D_H
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index c78b43bb84e..0c5fa94cb12 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -470,7 +470,7 @@ private:
optional_shared_ptr<uint16_t> m_paletteram16;
required_device<palette_device> m_palette;
- required_device<segas24_tile> m_tiles;
+ required_device<segas24_tile_device> m_tiles;
// I/O related
uint16_t m_lamp_state;
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 13b3007fa81..965584d8702 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -51,7 +51,7 @@ public:
m_gears(*this, "GEARS"),
m_analog_ports(*this, {"ANA0", "ANA1", "ANA2", "ANA3"}),
m_lightgun_ports(*this, {"P1_Y", "P1_X", "P2_Y", "P2_X"})
- { }
+ { }
required_shared_ptr<uint32_t> m_workram;
required_shared_ptr<uint32_t> m_bufferram;
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index 0b9e55a0ef3..d0eaa5658a9 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -275,7 +275,7 @@ protected:
void mpu4_config_common();
required_device<cpu_device> m_maincpu;
- optional_device<roc10937_t> m_vfd;
+ optional_device<roc10937_device> m_vfd;
optional_device<ptm6840_device> m_6840ptm;
optional_device<pia6821_device> m_pia3;
optional_device<pia6821_device> m_pia4;
diff --git a/src/mame/includes/mpz80.h b/src/mame/includes/mpz80.h
index 4a4f771f4d4..ca478bd0c5a 100644
--- a/src/mame/includes/mpz80.h
+++ b/src/mame/includes/mpz80.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_MPZ80_H
+#define MAME_INCLUDES_MPZ80_H
-#ifndef __MPZ80__
-#define __MPZ80__
+#pragma once
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
@@ -38,7 +38,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
- required_device<s100_bus_t> m_s100;
+ required_device<s100_bus_device> m_s100;
required_memory_region m_rom;
optional_shared_ptr<uint8_t> m_map_ram;
required_ioport m_16c;
@@ -93,4 +93,4 @@ public:
DECLARE_DRIVER_INIT(mpz80);
};
-#endif
+#endif // MAME_INCLUDES_MPZ80_H
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index cdc9cc52ca6..a2d8ffa8ceb 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Ryan Holtz
-#ifndef _INCLUDES_N64_H_
-#define _INCLUDES_N64_H_
+#ifndef MAME_INCLUDES_N64_H
+#define MAME_INCLUDES_N64_H
+
+#pragma once
#include "cpu/rsp/rsp.h"
#include "cpu/mips/mips3.h"
@@ -307,7 +309,7 @@ private:
};
// device type definition
-extern const device_type N64PERIPH;
+DECLARE_DEVICE_TYPE(N64PERIPH, n64_periphs)
/*----------- defined in video/n64.c -----------*/
@@ -402,4 +404,4 @@ const unsigned int ddStartOffset[16] =
{0x0,0x5F15E0,0xB79D00,0x10801A0,0x1523720,0x1963D80,0x1D414C0,0x20BBCE0,
0x23196E0,0x28A1E00,0x2DF5DC0,0x3299340,0x36D99A0,0x3AB70E0,0x3E31900,0x4149200};
-#endif
+#endif // MAME_INCLUDES_N64_H
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 971caa9c803..05a67e643ec 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -8,11 +8,11 @@
***************************************************************************/
-#include "namcoic.h"
-#include "cpu/m6502/m3745x.h"
-#include "video/c45.h"
-#include "machine/namco_c148.h"
#include "machine/namco_c139.h"
+#include "machine/namco_c148.h"
+#include "video/c45.h"
+
+#include "cpu/m6502/m3745x.h"
#include "screen.h"
/* CPU reference numbers */
diff --git a/src/mame/includes/nb1413m3.h b/src/mame/includes/nb1413m3.h
index 6135130b5b6..5240d2f3e70 100644
--- a/src/mame/includes/nb1413m3.h
+++ b/src/mame/includes/nb1413m3.h
@@ -7,6 +7,10 @@
Driver by Takahiro Nogi <nogi@kt.rim.or.jp> 1999/11/05 -
******************************************************************************/
+#ifndef MAME_INCLUDES_NB1413M3_H
+#define MAME_INCLUDES_NB1413M3_H
+
+#pragma once
#define NB1413M3_VCR_NOP 0x00
#define NB1413M3_VCR_POWER 0x01
@@ -193,7 +197,10 @@ INPUT_PORTS_EXTERN( nbhf1_ctrl );
INPUT_PORTS_EXTERN( nbhf2_ctrl );
extern const device_type NB1413M3;
+DECLARE_DEVICE_TYPE(NB1413M3, nb1413m3_device)
#define MCFG_NB1413M3_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, NB1413M3, 0)
+
+#endif // MAME_INCLUDES_NB1413M3_H
diff --git a/src/mame/includes/nb1414m4.h b/src/mame/includes/nb1414m4.h
index 4a3718baa33..bba25f89e12 100644
--- a/src/mame/includes/nb1414m4.h
+++ b/src/mame/includes/nb1414m4.h
@@ -1,11 +1,14 @@
// license:LGPL-2.1+
// copyright-holders:Angelo Salese
-class nb1414m4_device : public device_t,
- public device_video_interface
+#ifndef MAME_INCLUDES_NB1414M4_H
+#define MAME_INCLUDES_NB1414M4_H
+
+#pragma once
+
+class nb1414m4_device : public device_t, public device_video_interface
{
public:
nb1414m4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~nb1414m4_device() {}
void exec(uint16_t mcu_cmd, uint8_t *vram, uint16_t &scrollx, uint16_t &scrolly, tilemap_t *tilemap);
@@ -28,4 +31,6 @@ private:
};
-extern const device_type NB1414M4;
+DECLARE_DEVICE_TYPE(NB1414M4, nb1414m4_device)
+
+#endif // MAME_INCLUDES_NB1414M4_H
diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h
index c9d5ec6470f..1ba3f013236 100644
--- a/src/mame/includes/nes.h
+++ b/src/mame/includes/nes.h
@@ -8,11 +8,14 @@
****************************************************************************/
-#ifndef NES_H_
-#define NES_H_
+#ifndef MAME_INCLUDES_NES_H
+#define MAME_INCLUDES_NES_H
+
+#pragma once
#include "video/ppu2c0x.h"
+#include "bus/nes/disksys.h"
#include "bus/nes/nes_slot.h"
#include "bus/nes/nes_carts.h"
#include "bus/nes_ctrl/ctrl.h"
@@ -49,32 +52,16 @@ class nes_state : public driver_device
{
public:
nes_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_ppu(*this, "ppu"),
- m_ctrl1(*this, "ctrl1"),
- m_ctrl2(*this, "ctrl2"),
- m_exp(*this, "exp"),
- m_cartslot(*this, "nes_slot"),
- m_disk(*this, "disk")
- { }
-
- /* video-related */
- int m_last_frame_flip;
-
- /* misc */
- ioport_port *m_io_disksel;
-
- uint8_t *m_vram;
- std::unique_ptr<uint8_t[]> m_ciram; //PPU nametable RAM - external to PPU!
-
- required_device<cpu_device> m_maincpu;
- required_device<ppu2c0x_device> m_ppu;
- required_device<nes_control_port_device> m_ctrl1;
- required_device<nes_control_port_device> m_ctrl2;
- optional_device<nes_control_port_device> m_exp;
- optional_device<nes_cart_slot_device> m_cartslot;
- optional_device<nes_disksys_device> m_disk;
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_ppu(*this, "ppu")
+ , m_ctrl1(*this, "ctrl1")
+ , m_ctrl2(*this, "ctrl2")
+ , m_exp(*this, "exp")
+ , m_cartslot(*this, "nes_slot")
+ , m_disk(*this, "disk")
+ {
+ }
int nes_ppu_vidaccess(int address, int data);
void ppu_nmi(int *ppu_regs);
@@ -104,7 +91,24 @@ public:
void setup_disk(nes_disksys_device *slot);
private:
+ /* video-related */
+ int m_last_frame_flip;
+
+ /* misc */
+ ioport_port *m_io_disksel;
+
+ uint8_t *m_vram;
+ std::unique_ptr<uint8_t[]> m_ciram; //PPU nametable RAM - external to PPU!
+
+ required_device<cpu_device> m_maincpu;
+ required_device<ppu2c0x_device> m_ppu;
+ required_device<nes_control_port_device> m_ctrl1;
+ required_device<nes_control_port_device> m_ctrl2;
+ optional_device<nes_control_port_device> m_exp;
+ optional_device<nes_cart_slot_device> m_cartslot;
+ optional_device<nes_disksys_device> m_disk;
+
memory_bank *m_prg_bank_mem[5];
};
-#endif /* NES_H_ */
+#endif // MAME_INCLUDES_NES_H
diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h
index 9b97f7028aa..41f6e4958a6 100644
--- a/src/mame/includes/newbrain.h
+++ b/src/mame/includes/newbrain.h
@@ -97,7 +97,7 @@ protected:
required_device<z80_device> m_maincpu;
required_device<cop400_cpu_device> m_cop;
required_device<palette_device> m_palette;
- required_device<newbrain_expansion_slot_t> m_exp;
+ required_device<newbrain_expansion_slot_device> m_exp;
required_device<cassette_image_device> m_cassette1;
required_device<cassette_image_device> m_cassette2;
required_device<rs232_port_device> m_rs232_v24;
diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h
index b025736dadb..bc2beae935f 100644
--- a/src/mame/includes/orion.h
+++ b/src/mame/includes/orion.h
@@ -49,27 +49,6 @@ public:
, m_bank8(*this, "bank8")
{ }
- uint8_t m_orion128_video_mode;
- uint8_t m_orion128_video_page;
- uint8_t m_orion128_video_width;
- uint8_t m_video_mode_mask;
- uint8_t m_orionpro_pseudo_color;
- uint8_t m_romdisk_lsb;
- uint8_t m_romdisk_msb;
- uint8_t m_orion128_memory_page;
- uint8_t m_orionz80_memory_page;
- uint8_t m_orionz80_dispatcher;
- uint8_t m_speaker_data;
- uint8_t m_orionpro_ram0_segment;
- uint8_t m_orionpro_ram1_segment;
- uint8_t m_orionpro_ram2_segment;
- uint8_t m_orionpro_page;
- uint8_t m_orionpro_128_page;
- uint8_t m_orionpro_rom2_segment;
- uint8_t m_orionpro_dispatcher;
-
- required_device<fd1793_t> m_fdc;
-
DECLARE_READ8_MEMBER(orion128_system_r);
DECLARE_WRITE8_MEMBER(orion128_system_w);
DECLARE_READ8_MEMBER(orion128_romdisk_r);
@@ -106,6 +85,27 @@ public:
DECLARE_FLOPPY_FORMATS( orion_floppy_formats );
protected:
+ uint8_t m_orion128_video_mode;
+ uint8_t m_orion128_video_page;
+ uint8_t m_orion128_video_width;
+ uint8_t m_video_mode_mask;
+ uint8_t m_orionpro_pseudo_color;
+ uint8_t m_romdisk_lsb;
+ uint8_t m_romdisk_msb;
+ uint8_t m_orion128_memory_page;
+ uint8_t m_orionz80_memory_page;
+ uint8_t m_orionz80_dispatcher;
+ uint8_t m_speaker_data;
+ uint8_t m_orionpro_ram0_segment;
+ uint8_t m_orionpro_ram1_segment;
+ uint8_t m_orionpro_ram2_segment;
+ uint8_t m_orionpro_page;
+ uint8_t m_orionpro_128_page;
+ uint8_t m_orionpro_rom2_segment;
+ uint8_t m_orionpro_dispatcher;
+
+ required_device<fd1793_device> m_fdc;
+
required_device<ram_device> m_ram;
required_device<floppy_connector> m_fd0;
required_device<floppy_connector> m_fd1;
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index 33da903005a..f2cc2fea32f 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -102,7 +102,7 @@ public:
required_device<pia6821_device> m_pia0;
required_device<pia6821_device> m_pia1;
required_device<acia6850_device> m_acia;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<ram_device> m_ram;
required_device<ieee488_device> m_ieee;
required_device<floppy_connector> m_floppy0;
diff --git a/src/mame/includes/partner.h b/src/mame/includes/partner.h
index ba204d4646b..7cf4e69a1ab 100644
--- a/src/mame/includes/partner.h
+++ b/src/mame/includes/partner.h
@@ -27,8 +27,6 @@ public:
{
}
- uint8_t m_mem_page;
- uint8_t m_win_mem_page;
DECLARE_READ8_MEMBER(partner_floppy_r);
DECLARE_WRITE8_MEMBER(partner_floppy_w);
DECLARE_WRITE8_MEMBER(partner_win_memory_page_w);
@@ -38,13 +36,19 @@ public:
DECLARE_MACHINE_RESET(partner);
I8275_DRAW_CHARACTER_MEMBER(display_pixels);
+ DECLARE_FLOPPY_FORMATS( floppy_formats );
+
+protected:
void partner_window_1(uint8_t bank_num, uint16_t offset,uint8_t *rom);
void partner_window_2(uint8_t bank_num, uint16_t offset,uint8_t *rom);
void partner_iomap_bank(uint8_t *rom);
void partner_bank_switch();
+
+ uint8_t m_mem_page;
+ uint8_t m_win_mem_page;
+
required_device<ram_device> m_ram;
- required_device<fd1793_t> m_fdc;
- DECLARE_FLOPPY_FORMATS( floppy_formats );
+ required_device<fd1793_device> m_fdc;
};
diff --git a/src/mame/includes/patinhofeio.h b/src/mame/includes/patinhofeio.h
index e9e5d7f586b..74d5fc91fad 100644
--- a/src/mame/includes/patinhofeio.h
+++ b/src/mame/includes/patinhofeio.h
@@ -1,5 +1,10 @@
// license:GPL2+
// copyright-holders:Felipe Sanches
+#ifndef MAME_INCLUDES_PATINHOFEIO_H
+#define MAME_INCLUDES_PATINHOFEIO_H
+
+#pragma once
+
#include "machine/teleprinter.h"
class patinho_feio_state : public driver_device {
@@ -12,26 +17,29 @@ public:
{ }
DECLARE_DRIVER_INIT(patinho_feio);
- DECLARE_READ16_MEMBER(rc_r);
- DECLARE_READ16_MEMBER(buttons_r);
DECLARE_WRITE8_MEMBER(decwriter_data_w);
- DECLARE_WRITE8_MEMBER(decwriter_kbd_input);
+ void decwriter_kbd_input(u8 data);
TIMER_CALLBACK_MEMBER(decwriter_callback);
DECLARE_WRITE8_MEMBER(teletype_data_w);
- DECLARE_WRITE8_MEMBER(teletype_kbd_input);
+ void teletype_kbd_input(u8 data);
TIMER_CALLBACK_MEMBER(teletype_callback);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( patinho_tape );
- void load_tape(const char* name);
- void load_raw_data(const char* name, unsigned int start_address, unsigned int data_length);
+
void update_panel(uint8_t ACC, uint8_t opcode, uint8_t mem_data, uint16_t mem_addr, uint16_t PC, uint8_t FLAGS, uint16_t RC, uint8_t mode);
+
+protected:
virtual void machine_start() override;
+ void load_tape(const char* name);
+ void load_raw_data(const char* name, unsigned int start_address, unsigned int data_length);
+
required_device<patinho_feio_cpu_device> m_maincpu;
required_device<teleprinter_device> m_decwriter;
required_device<teleprinter_device> m_tty;
+
private:
uint8_t* paper_tape_data;
uint32_t paper_tape_length;
@@ -48,3 +56,5 @@ private:
uint8_t m_prev_FLAGS;
uint16_t m_prev_RC;
};
+
+#endif // MAME_INCLUDES_PATINHOFEIO_H
diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h
index 0c36f09a66a..f44879733b5 100644
--- a/src/mame/includes/pc1512.h
+++ b/src/mame/includes/pc1512.h
@@ -97,7 +97,7 @@ public:
required_device<centronics_device> m_centronics;
required_device<output_latch_device> m_cent_data_out;
required_device<speaker_sound_device> m_speaker;
- required_device<pc1512_keyboard_t> m_kb;
+ required_device<pc1512_keyboard_device> m_kb;
required_device<ram_device> m_ram;
required_device<floppy_image_device> m_floppy0;
optional_device<floppy_image_device> m_floppy1;
diff --git a/src/mame/includes/pes.h b/src/mame/includes/pes.h
index dcd93cda9f0..de3ba6aa129 100644
--- a/src/mame/includes/pes.h
+++ b/src/mame/includes/pes.h
@@ -45,7 +45,7 @@ public:
DECLARE_WRITE8_MEMBER(port3_w);
DECLARE_READ8_MEMBER(port1_r);
DECLARE_READ8_MEMBER(port3_r);
- DECLARE_WRITE8_MEMBER(pes_kbd_input);
+ void pes_kbd_input(u8 data);
DECLARE_READ8_MEMBER(data_to_i8031);
DECLARE_WRITE8_MEMBER(data_from_i8031);
};
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index a14fbf13d85..9bfdb286e8c 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -1,32 +1,25 @@
// license:BSD-3-Clause
// copyright-holders:Richard Davies
+#ifndef MAME_INCLUDES_PHOENIX_H
+#define MAME_INCLUDES_PHOENIX_H
+
+#pragma once
+
#include "audio/pleiads.h"
-#include "sound/discrete.h"
-#include "sound/tms36xx.h"
class phoenix_state : public driver_device
{
public:
phoenix_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) ,
- m_maincpu(*this, "maincpu"),
- m_pleiads_custom(*this, "pleiads_custom"),
- m_gfxdecode(*this, "gfxdecode") { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_pleiads_custom(*this, "pleiads_custom")
+ , m_gfxdecode(*this, "gfxdecode")
+ , m_fg_tilemap(nullptr)
+ , m_bg_tilemap(nullptr)
+ {
+ }
- required_device<cpu_device> m_maincpu;
- optional_device<pleiads_sound_device> m_pleiads_custom;
- required_device<gfxdecode_device> m_gfxdecode;
- std::unique_ptr<uint8_t[]> m_videoram_pg[2];
- uint8_t m_videoram_pg_index;
- uint8_t m_palette_bank;
- uint8_t m_cocktail_mode;
- uint8_t m_pleiads_protection_question;
- uint8_t m_survival_protection_value;
- int m_survival_sid_value;
- tilemap_t *m_fg_tilemap;
- tilemap_t *m_bg_tilemap;
- uint8_t m_survival_input_latches[2];
- uint8_t m_survival_input_readc;
DECLARE_WRITE8_MEMBER(phoenix_videoram_w);
DECLARE_WRITE8_MEMBER(phoenix_videoreg_w);
DECLARE_WRITE8_MEMBER(pleiads_videoreg_w);
@@ -47,6 +40,24 @@ public:
uint32_t screen_update_phoenix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER(survival_protection_r);
DECLARE_READ_LINE_MEMBER(survival_sid_callback);
+
+protected:
+ required_device<cpu_device> m_maincpu;
+ optional_device<pleiads_sound_device> m_pleiads_custom;
+ required_device<gfxdecode_device> m_gfxdecode;
+
+ tilemap_t *m_fg_tilemap;
+ tilemap_t *m_bg_tilemap;
+
+ std::unique_ptr<uint8_t[]> m_videoram_pg[2];
+ uint8_t m_videoram_pg_index;
+ uint8_t m_palette_bank;
+ uint8_t m_cocktail_mode;
+ uint8_t m_pleiads_protection_question;
+ uint8_t m_survival_protection_value;
+ int m_survival_sid_value;
+ uint8_t m_survival_input_latches[2];
+ uint8_t m_survival_input_readc;
};
@@ -63,55 +74,4 @@ public:
#define VBSTART (208)
#define VBEND (0)
-/*----------- defined in audio/phoenix.c -----------*/
-
-struct c_state
-{
- int32_t counter;
- int32_t level;
-};
-
-struct n_state
-{
- int32_t counter;
- int32_t polyoffs;
- int32_t polybit;
- int32_t lowpass_counter;
- int32_t lowpass_polybit;
-};
-
-class phoenix_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~phoenix_sound_device() {}
-
- DECLARE_WRITE8_MEMBER( control_a_w );
- DECLARE_WRITE8_MEMBER( control_b_w );
-
-protected:
- // device-level overrides
- virtual void device_start() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-private:
- // internal state
- struct c_state m_c24_state;
- struct c_state m_c25_state;
- struct n_state m_noise_state;
- uint8_t m_sound_latch_a;
- sound_stream * m_channel;
- std::unique_ptr<uint32_t[]> m_poly18;
- discrete_device *m_discrete;
- tms36xx_device *m_tms;
-
- int update_c24(int samplerate);
- int update_c25(int samplerate);
- int noise(int samplerate);
-};
-
-extern const device_type PHOENIX;
-
-DISCRETE_SOUND_EXTERN( phoenix );
+#endif // MAME_INCLUDES_PHOENIX_H
diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h
index ffa47827dc8..c15a9c3bb60 100644
--- a/src/mame/includes/pk8020.h
+++ b/src/mame/includes/pk8020.h
@@ -88,7 +88,7 @@ protected:
required_device<i8251_device> m_rs232;
required_device<i8251_device> m_lan;
required_device<ram_device> m_ram;
- required_device<fd1793_t> m_wd1793;
+ required_device<fd1793_device> m_wd1793;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index 2a741b265ea..ddcf4ab811f 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Andrew Gardner
+#ifndef MAME_INCLUDES_PLYGONET_H
+#define MAME_INCLUDES_PLYGONET_H
+
+#pragma once
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
@@ -31,7 +35,7 @@ public:
m_shared_ram(*this, "shared_ram"),
m_dsp56k_p_mirror(*this, "dsp56k_p_mirror"),
m_dsp56k_p_8000(*this, "dsp56k_p_8000")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -110,3 +114,5 @@ public:
INTERRUPT_GEN_MEMBER(polygonet_interrupt);
DECLARE_WRITE_LINE_MEMBER(k054539_nmi_gen);
};
+
+#endif // MAME_INCLUDES_PLYGONET_H
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index a2900e4ffbd..f9b08e76656 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -5,6 +5,10 @@
Pole Position hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_POLEPOS_H
+#define MAME_INCLUDES_POLEPOS_H
+
+#pragma once
#include "machine/gen_latch.h"
#include "sound/namco.h"
@@ -161,6 +165,8 @@ private:
filter2_context m_filter_engine[3];
};
-extern const device_type POLEPOS;
+DECLARE_DEVICE_TYPE(POLEPOS, polepos_sound_device)
DISCRETE_SOUND_EXTERN( polepos );
+
+#endif // MAME_INCLUDES_POLEPOS_H
diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h
index c43219a3f31..b853afa34ce 100644
--- a/src/mame/includes/rm380z.h
+++ b/src/mame/includes/rm380z.h
@@ -7,8 +7,10 @@ Research Machines RM 380Z
*/
-#ifndef RM380Z_H_
-#define RM380Z_H_
+#ifndef MAME_INCLUDES_RM380Z_H
+#define MAME_INCLUDES_RM380Z_H
+
+#pragma once
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
@@ -90,7 +92,7 @@ private:
required_device<cpu_device> m_maincpu;
optional_device<cassette_image_device> m_cassette;
optional_device<ram_device> m_messram;
- optional_device<fd1771_t> m_fdc;
+ optional_device<fd1771_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
@@ -125,7 +127,7 @@ public:
DECLARE_WRITE8_MEMBER(disk_0_control);
- DECLARE_WRITE8_MEMBER( keyboard_put );
+ void keyboard_put(u8 data);
DECLARE_DRIVER_INIT(rm380z);
DECLARE_DRIVER_INIT(rm380z34d);
@@ -140,5 +142,4 @@ public:
TIMER_CALLBACK_MEMBER(static_vblank_timer);
};
-
-#endif
+#endif // MAME_INCLUDES_RM380Z_H
diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h
index 7e8b8803f8c..0a31b41fb08 100644
--- a/src/mame/includes/rmnimbus.h
+++ b/src/mame/includes/rmnimbus.h
@@ -7,6 +7,11 @@
Phill Harvey-Smith
2009-11-29.
*/
+#ifndef MAME_INCLUDES_RMNIMBUS_H
+#define MAME_INCLUDES_RMNIMBUS_H
+
+#pragma once
+
#include "cpu/i86/i186.h"
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
@@ -77,7 +82,7 @@ public:
required_device<i80186_cpu_device> m_maincpu;
required_device<msm5205_device> m_msm;
- required_device<SCSI_PORT_DEVICE> m_scsibus;
+ required_device<scsi_port_device> m_scsibus;
required_device<ram_device> m_ram;
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<via6522_device> m_via;
@@ -86,7 +91,7 @@ public:
required_device<output_latch_device> m_scsi_data_out;
required_device<input_buffer_device> m_scsi_data_in;
required_device<output_latch_device> m_scsi_ctrl_out;
- required_device<wd2793_t> m_fdc;
+ required_device<wd2793_device> m_fdc;
required_device<z80sio2_device> m_z80sio;
required_device<screen_device> m_screen;
required_ioport m_io_config;
@@ -223,3 +228,5 @@ private:
void debug_command(int ref, const std::vector<std::string> &params);
void video_debug(int ref, const std::vector<std::string> &params);
};
+
+#endif // MAME_INCLUDES_RMNIMBUS_H
diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h
index 76e873f194e..f1f3967a19c 100644
--- a/src/mame/includes/samcoupe.h
+++ b/src/mame/includes/samcoupe.h
@@ -162,7 +162,7 @@ public:
required_device<centronics_device> m_lpt2;
required_device<ram_device> m_ram;
required_device<msm6242_device> m_rtc;
- required_device<wd1772_t> m_fdc;
+ required_device<wd1772_device> m_fdc;
required_device<floppy_connector> m_wd1772_0;
required_device<floppy_connector> m_wd1772_1;
required_memory_region m_region_maincpu;
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index b36079d4330..c598f547798 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -5,6 +5,11 @@
Sega G-80 raster hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_SEGAG80R_H
+#define MAME_INCLUDES_SEGAG80R_H
+
+#pragma once
+
#include "sound/samples.h"
#include "machine/segag80.h"
#include "sound/sn76496.h"
@@ -185,7 +190,7 @@ private:
TIMER_CALLBACK_MEMBER( sega005_auto_timer );
};
-extern const device_type SEGA005;
+DECLARE_DEVICE_TYPE(SEGA005, sega005_sound_device)
MACHINE_CONFIG_EXTERN( astrob_sound_board );
@@ -200,3 +205,5 @@ MACHINE_CONFIG_EXTERN( monsterb_sound_board );
#define G80_BACKGROUND_MONSTERB 2
#define G80_BACKGROUND_PIGNEWT 3
#define G80_BACKGROUND_SINDBADM 4
+
+#endif // MAME_INCLUDES_SEGAG80R_H
diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h
index c69cd5c9821..39f6006a6a3 100644
--- a/src/mame/includes/segas16b.h
+++ b/src/mame/includes/segas16b.h
@@ -43,7 +43,7 @@ public:
m_soundlatch(*this, "soundlatch"),
m_workram(*this, "workram"),
m_romboard(ROM_BOARD_INVALID),
- m_tilemap_type(SEGAIC16_TILEMAP_16B),
+ m_tilemap_type(segaic16_video_device::TILEMAP_16B),
m_disable_screen_blanking(false),
m_i8751_initial_config(nullptr),
m_atomicp_sound_divisor(0),
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 68e8eb27ae5..b55370912b6 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -82,9 +82,9 @@ public:
uint16_t *shared_ram;
- segas24_tile *vtile;
- segas24_sprite *vsprite;
- segas24_mixer *vmixer;
+ segas24_tile_device *vtile;
+ segas24_sprite_device *vsprite;
+ segas24_mixer_device *vmixer;
DECLARE_WRITE_LINE_MEMBER(irq_ym);
DECLARE_READ16_MEMBER( sys16_paletteram_r );
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index f3371b6c28e..8cbb0e04222 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -5,6 +5,10 @@
Sega System 32/Multi 32 hardware
***************************************************************************/
+#ifndef MAME_INCLUDES_SEGAS32_H
+#define MAME_INCLUDES_SEGAS32_H
+
+#pragma once
#include "sound/multipcm.h"
#include "machine/s32comm.h"
@@ -17,7 +21,6 @@ class segas32_state : public device_t
{
public:
segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- segas32_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
required_shared_ptr<uint8_t> m_z80_shared_ram;
optional_shared_ptr<uint16_t> m_system32_workram;
@@ -239,6 +242,8 @@ public:
void init_titlef(void);
protected:
+ segas32_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
};
@@ -373,4 +378,6 @@ protected:
/*----------- defined in machine/segas32.c -----------*/
extern const uint8_t ga2_v25_opcode_table[];
-extern const device_type SEGA_S32_PCB;
+DECLARE_DEVICE_TYPE(SEGA_S32_PCB, segas32_state)
+
+#endif // MAME_INCLUDES_SEGAS32_H
diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h
index acfe42a5f3d..7ee29f0d974 100644
--- a/src/mame/includes/segaxbd.h
+++ b/src/mame/includes/segaxbd.h
@@ -5,16 +5,22 @@
Sega X-Board hardware
***************************************************************************/
+#ifndef MAME_INCLUDES_SEGAXBD_H
+#define MAME_INCLUDES_SEGAXBD_H
+
+#pragma once
+
+#include "machine/segaic16.h"
+#include "video/segaic16.h"
+#include "video/segaic16_road.h"
+#include "video/sega16sp.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/mb3773.h"
-#include "machine/segaic16.h"
-#include "video/segaic16.h"
-#include "video/segaic16_road.h"
-#include "video/sega16sp.h"
+#include "machine/watchdog.h"
#include "video/resnet.h"
#include "screen.h"
@@ -26,7 +32,6 @@ class segaxbd_state : public device_t
public:
// construction/destruction
segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- segaxbd_state(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
// compare/timer chip callbacks
void timer_ack_callback();
@@ -77,6 +82,8 @@ protected:
TID_SOUND_WRITE
};
+ segaxbd_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device overrides
// virtual void machine_reset();
virtual void video_start();
@@ -146,8 +153,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
@@ -159,8 +164,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
class segaxbd_aburner2_state : public segaxbd_state
@@ -181,8 +184,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
class segaxbd_lastsurv_state : public segaxbd_state
@@ -192,8 +193,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
@@ -204,8 +203,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
@@ -216,8 +213,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
@@ -228,6 +223,6 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-// virtual void device_start();
-// virtual void device_reset();
};
+
+#endif // MAME_INCLUDES_SEGAXBD_H
diff --git a/src/mame/includes/slapstic.h b/src/mame/includes/slapstic.h
index f3fdbb9a48c..4e57f5e8d40 100644
--- a/src/mame/includes/slapstic.h
+++ b/src/mame/includes/slapstic.h
@@ -11,16 +11,16 @@
*************************************************************************/
-#pragma once
+#ifndef MAME_INCLUDES_SLAPSTIC_H
+#define MAME_INCLUDES_SLAPSTIC_H
-#ifndef __SLAPSTIC__
-#define __SLAPSTIC__
+#pragma once
#include "cpu/m6800/m6800.h"
#include "cpu/m68000/m68000.h"
-extern const device_type SLAPSTIC;
+DECLARE_DEVICE_TYPE(SLAPSTIC, atari_slapstic_device)
#define MCFG_SLAPSTIC_ADD(_tag, _chip) \
MCFG_DEVICE_ADD(_tag, SLAPSTIC, 0) \
@@ -29,16 +29,6 @@ extern const device_type SLAPSTIC;
/*************************************
*
- * Debugging
- *
- *************************************/
-
-#define LOG_SLAPSTIC (0)
-
-
-
-/*************************************
- *
* Structure of slapstic params
*
*************************************/
@@ -179,16 +169,6 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_validity_check(validity_checker &valid) const override;
-
-
-private:
-
-
-
-
};
-
-
-
-#endif
+#endif // MAME_INCLUDES_SLAPSTIC_H
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 955a5b4902d..3538845b0d5 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -5,10 +5,11 @@
rokola hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_SNK6502_H
+#define MAME_INCLUDES_SNK6502_H
+
+#pragma once
-#include "sound/discrete.h"
-#include "sound/samples.h"
-#include "sound/sn76477.h"
class snk6502_sound_device;
@@ -53,6 +54,7 @@ public:
DECLARE_WRITE8_MEMBER(scrollx_w);
DECLARE_WRITE8_MEMBER(scrolly_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
+ DECLARE_WRITE8_MEMBER(fantasy_flipscreen_w);
DECLARE_WRITE8_MEMBER(satansat_b002_w);
DECLARE_WRITE8_MEMBER(satansat_backcolor_w);
@@ -86,75 +88,4 @@ public:
void postload();
};
-
-/*----------- defined in audio/snk6502.c -----------*/
-
-#define CHANNELS 3
-
-struct TONE
-{
- int mute;
- int offset;
- int base;
- int mask;
- int32_t sample_rate;
- int32_t sample_step;
- int32_t sample_cur;
- int16_t form[16];
-};
-
-class snk6502_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~snk6502_sound_device() {}
-
- DECLARE_WRITE8_MEMBER( sasuke_sound_w );
- DECLARE_WRITE8_MEMBER( satansat_sound_w );
- DECLARE_WRITE8_MEMBER( vanguard_sound_w );
- DECLARE_WRITE8_MEMBER( vanguard_speech_w );
- DECLARE_WRITE8_MEMBER( fantasy_sound_w );
- DECLARE_WRITE8_MEMBER( fantasy_speech_w );
-
- void set_music_clock(double clock_time);
- void set_music_freq(int freq);
- int music0_playing();
-
-protected:
- // device-level overrides
- virtual void device_start() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-private:
- // internal state
- TONE m_tone_channels[CHANNELS];
- int32_t m_tone_clock_expire;
- int32_t m_tone_clock;
- sound_stream * m_tone_stream;
-
- optional_device<samples_device> m_samples;
- uint8_t *m_ROM;
- int m_Sound0StopOnRollover;
- uint8_t m_LastPort1;
-
- int m_hd38880_cmd;
- uint32_t m_hd38880_addr;
- int m_hd38880_data_bytes;
- double m_hd38880_speed;
-
- inline void validate_tone_channel(int channel);
- void sasuke_build_waveform(int mask);
- void satansat_build_waveform(int mask);
- void build_waveform(int channel, int mask);
- void speech_w(uint8_t data, const uint16_t *table, int start);
-};
-
-extern const device_type SNK6502;
-
-DISCRETE_SOUND_EXTERN( fantasy );
-extern const char *const sasuke_sample_names[];
-extern const char *const vanguard_sample_names[];
-extern const char *const fantasy_sample_names[];
+#endif // MAME_INCLUDES_SNK6502_H
diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h
index 8bce05cfd80..606e9e9e1a1 100644
--- a/src/mame/includes/softbox.h
+++ b/src/mame/includes/softbox.h
@@ -36,7 +36,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<com8116_device> m_dbrg;
required_device<ieee488_device> m_ieee;
- required_device<corvus_hdc_t> m_hdc;
+ required_device<corvus_hdc_device> m_hdc;
virtual void machine_start() override;
virtual void device_reset_after_children() override;
diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h
index 0e40d43dcdf..80ea784e24d 100644
--- a/src/mame/includes/special.h
+++ b/src/mame/includes/special.h
@@ -6,8 +6,10 @@
*
****************************************************************************/
-#ifndef SPECIAL_H_
-#define SPECIAL_H_
+#ifndef MAME_INCLUDES_SPECIAL_H
+#define MAME_INCLUDES_SPECIAL_H
+
+#pragma once
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
@@ -117,7 +119,7 @@ private:
uint8_t m_RC_register;
required_device<cpu_device> m_maincpu;
optional_device<i8255_device> m_ppi;
- optional_device<fd1793_t> m_fdc;
+ optional_device<fd1793_device> m_fdc;
optional_device<dac_bit_interface> m_dac;
optional_device<pit8253_device> m_pit;
optional_device<cassette_image_device> m_cassette;
@@ -148,4 +150,4 @@ private:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
-#endif /* SPECIAL_H_ */
+#endif // MAME_INCLUDES_SPECIAL_H
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index 0ec8fc2729c..5470b1567bc 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_SUPER6_H
+#define MAME_INCLUDES_SUPER6_H
-#ifndef __SUPER6__
-#define __SUPER6__
+#pragma once
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
@@ -45,22 +45,6 @@ public:
m_j7(*this, "J7")
{ }
- required_device<cpu_device> m_maincpu;
- required_device<z80ctc_device> m_ctc;
- required_device<z80dart_device> m_dart;
- required_device<z80dma_device> m_dma;
- required_device<z80pio_device> m_pio;
- required_device<wd2793_t> m_fdc;
- required_device<com8116_device> m_brg;
- required_device<ram_device> m_ram;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_region_ptr<uint8_t> m_rom;
- required_ioport m_j7;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
DECLARE_READ8_MEMBER( fdc_r );
DECLARE_WRITE8_MEMBER( fdc_w );
DECLARE_WRITE8_MEMBER( s100_w );
@@ -71,17 +55,35 @@ public:
DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+ TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
+ DECLARE_READ8_MEMBER(memory_read_byte);
+ DECLARE_WRITE8_MEMBER(memory_write_byte);
+ DECLARE_READ8_MEMBER(io_read_byte);
+ DECLARE_WRITE8_MEMBER(io_write_byte);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
void bankswitch();
+ required_device<cpu_device> m_maincpu;
+ required_device<z80ctc_device> m_ctc;
+ required_device<z80dart_device> m_dart;
+ required_device<z80dma_device> m_dma;
+ required_device<z80pio_device> m_pio;
+ required_device<wd2793_device> m_fdc;
+ required_device<com8116_device> m_brg;
+ required_device<ram_device> m_ram;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_region_ptr<uint8_t> m_rom;
+ required_ioport m_j7;
+
// memory state
uint8_t m_s100;
uint8_t m_bank0;
uint8_t m_bank1;
- TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
- DECLARE_READ8_MEMBER(memory_read_byte);
- DECLARE_WRITE8_MEMBER(memory_write_byte);
- DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
};
-#endif
+#endif // MAME_INCLUDES_SUPER6_H
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index bc6755ca4d0..66402fae33d 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -126,7 +126,7 @@ private:
required_ioport_array<8> m_io_keyboard;
optional_device<mc6845_device> m_crtc;
optional_device<z80dma_device> m_dma;
- optional_device<wd2793_t> m_fdc;
+ optional_device<wd2793_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
};
diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h
index 7e43cf2ea35..af1317d7834 100644
--- a/src/mame/includes/swtpc09.h
+++ b/src/mame/includes/swtpc09.h
@@ -6,8 +6,10 @@
****************************************************************************/
-#ifndef swtpc09_H_
-#define swtpc09_H_
+#ifndef MAME_INCLUDES_SWTPC09_H
+#define MAME_INCLUDES_SWTPC09_H
+
+#pragma once
#include "cpu/m6809/m6809.h"
#include "video/generic.h"
@@ -29,38 +31,24 @@ class swtpc09_state : public driver_device
{
public:
swtpc09_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_pia(*this, "pia"),
- m_ptm(*this, "ptm"),
- m_acia(*this, "acia"),
- m_fdc(*this, "fdc"),
- m_floppy0(*this, "fdc:0"),
- m_floppy1(*this, "fdc:1"),
- m_floppy2(*this, "fdc:2"),
- m_floppy3(*this, "fdc:3"),
- m_via(*this, "via"),
- m_piaide(*this, "piaide"),
- m_harddisk(*this, "harddisk"),
- m_ide(*this, "ide")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_pia(*this, "pia")
+ , m_ptm(*this, "ptm")
+ , m_acia(*this, "acia")
+ , m_fdc(*this, "fdc")
+ , m_floppy0(*this, "fdc:0")
+ , m_floppy1(*this, "fdc:1")
+ , m_floppy2(*this, "fdc:2")
+ , m_floppy3(*this, "fdc:3")
+ , m_via(*this, "via")
+ , m_piaide(*this, "piaide")
+ , m_harddisk(*this, "harddisk")
+ , m_ide(*this, "ide")
{ }
DECLARE_FLOPPY_FORMATS(floppy_formats);
- required_device<cpu_device> m_maincpu;
- required_device<pia6821_device> m_pia;
- required_device<ptm6840_device> m_ptm;
- required_device<acia6850_device> m_acia;
- required_device<fd1793_t> m_fdc;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<floppy_connector> m_floppy2;
- required_device<floppy_connector> m_floppy3;
- optional_device<via6522_device> m_via;
- optional_device<pia6821_device> m_piaide;
- optional_device<device_t> m_harddisk;
- optional_device<ide_controller_device> m_ide;
-
DECLARE_READ8_MEMBER(pia0_a_r);
DECLARE_READ8_MEMBER(pia0_ca1_r);
DECLARE_WRITE_LINE_MEMBER( pia0_irq_a );
@@ -104,9 +92,27 @@ public:
DECLARE_DRIVER_INIT( swtpc09u );
DECLARE_DRIVER_INIT( swtpc09d3 );
+ DECLARE_READ8_MEMBER ( m6844_r );
+ DECLARE_WRITE8_MEMBER ( m6844_w );
+
+protected:
void swtpc09_fdc_dma_transfer();
void swtpc09_irq_handler(uint8_t peripheral, uint8_t state);
+ required_device<cpu_device> m_maincpu;
+ required_device<pia6821_device> m_pia;
+ required_device<ptm6840_device> m_ptm;
+ required_device<acia6850_device> m_acia;
+ required_device<fd1793_device> m_fdc;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<floppy_connector> m_floppy2;
+ required_device<floppy_connector> m_floppy3;
+ optional_device<via6522_device> m_via;
+ optional_device<pia6821_device> m_piaide;
+ optional_device<device_t> m_harddisk;
+ optional_device<ide_controller_device> m_ide;
+
uint8_t m_term_data; // terminal keyboard value
uint8_t m_pia_counter; // this is the counter on pia porta
uint8_t m_fdc_dma_address_reg; // dmf2 or dmf3 dma extended address reg
@@ -119,11 +125,10 @@ public:
uint8_t m_active_interrupt;
uint8_t m_interrupt;
-
// TODO: move this in proper device
/* channel_data structure holds info about each 6844 DMA channel */
- typedef struct m6844_channel_data
+ struct m6844_channel_data
{
int active;
int address;
@@ -131,16 +136,13 @@ public:
uint8_t control;
int start_address;
int start_counter;
- } m6844_channel_data;
+ };
/* 6844 description */
m6844_channel_data m_m6844_channel[4];
uint8_t m_m6844_priority;
uint8_t m_m6844_interrupt;
uint8_t m_m6844_chain;
- DECLARE_READ8_MEMBER ( m6844_r );
- DECLARE_WRITE8_MEMBER ( m6844_w );
-
};
-#endif /* swtpc09_H_ */
+#endif // MAME_INCLUDES_SWTPC09_H
diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h
index a5affb130a2..573aa33a75f 100644
--- a/src/mame/includes/tandy2k.h
+++ b/src/mame/includes/tandy2k.h
@@ -108,10 +108,10 @@ public:
required_device<i8272a_device> m_fdc;
required_device<pic8259_device> m_pic0;
required_device<pic8259_device> m_pic1;
- required_device<crt9007_t> m_vpac;
- required_device<crt9212_t> m_drb0;
- required_device<crt9212_t> m_drb1;
- required_device<crt9021_t> m_vac;
+ required_device<crt9007_device> m_vpac;
+ required_device<crt9212_device> m_drb0;
+ required_device<crt9212_device> m_drb1;
+ required_device<crt9021_device> m_vac;
required_device<palette_device> m_palette;
required_device<timer_device> m_timer_vidldsh;
required_device<centronics_device> m_centronics;
diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h
index 92d04243f87..b8e0b4d1bfa 100644
--- a/src/mame/includes/thomson.h
+++ b/src/mame/includes/thomson.h
@@ -8,8 +8,10 @@
**********************************************************************/
-#ifndef _THOMSON_H_
-#define _THOMSON_H_
+#ifndef MAME_INCLUDES_THOMSON_H
+#define MAME_INCLUDES_THOMSON_H
+
+#pragma once
#include "cpu/m6809/m6809.h"
#include "formats/thom_cas.h"
@@ -697,9 +699,9 @@ private:
int m_dsr;
};
-extern const device_type TO7_IO_LINE;
+DECLARE_DEVICE_TYPE(TO7_IO_LINE, to7_io_line_device)
#define MCFG_TO7_IO_LINE_ADD(_tag) \
MCFG_DEVICE_ADD((_tag), TO7_IO_LINE, 0)
-#endif /* _THOMSON_H_ */
+#endif // MAME_INCLUDES_THOMSON_H
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 44ae26dafea..7586e4a5134 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -66,80 +66,4 @@ private:
void update_bg_palette();
};
-
-/*----------- defined in audio/tiamc1.c -----------*/
-
-//**************************************************************************
-// TYPE DEFINITIONS
-//**************************************************************************
-
-struct timer8253chan
-{
- timer8253chan() :
- count(0),
- cnval(0),
- bcdMode(0),
- cntMode(0),
- valMode(0),
- gate(0),
- output(0),
- loadCnt(0),
- enable(0)
- {}
-
- uint16_t count;
- uint16_t cnval;
- uint8_t bcdMode;
- uint8_t cntMode;
- uint8_t valMode;
- uint8_t gate;
- uint8_t output;
- uint8_t loadCnt;
- uint8_t enable;
-};
-
-struct timer8253struct
-{
- struct timer8253chan channel[3];
-};
-
-
-// ======================> tiamc1_sound_device
-
-class tiamc1_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tiamc1_sound_device() { }
-
-protected:
- // device-level overrides
- virtual void device_start() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-public:
- DECLARE_WRITE8_MEMBER( tiamc1_timer0_w );
- DECLARE_WRITE8_MEMBER( tiamc1_timer1_w );
- DECLARE_WRITE8_MEMBER( tiamc1_timer1_gate_w );
-
-private:
- void timer8253_reset(struct timer8253struct *t);
- void timer8253_tick(struct timer8253struct *t,int chn);
- void timer8253_wr(struct timer8253struct *t, int reg, uint8_t val);
- char timer8253_get_output(struct timer8253struct *t, int chn);
- void timer8253_set_gate(struct timer8253struct *t, int chn, uint8_t gate);
-
-private:
- sound_stream *m_channel;
- int m_timer1_divider;
-
- timer8253struct m_timer0;
- timer8253struct m_timer1;
-};
-
-extern const device_type TIAMC1;
-
#endif // MAME_INCLUDES_TIAMC1_H
diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h
index 3cd378c4140..299bd033d86 100644
--- a/src/mame/includes/tiki100.h
+++ b/src/mame/includes/tiki100.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_TIKI100_H
+#define MAME_INCLUDES_TIKI100_H
-#ifndef __TIKI100__
-#define __TIKI100__
+#pragma once
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
@@ -65,28 +65,6 @@ public:
m_vire(1)
{ }
- required_device<cpu_device> m_maincpu;
- required_device<z80ctc_device> m_ctc;
- required_device<fd1797_t> m_fdc;
- required_device<z80pio_device> m_pio;
- required_device<z80dart_device> m_dart;
- required_device<ay8912_device> m_psg;
- required_device<ram_device> m_ram;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<cassette_image_device> m_cassette;
- required_device<centronics_device> m_centronics;
- required_device<tiki100_bus_t> m_exp;
- required_memory_region m_rom;
- required_memory_region m_prom;
- optional_shared_ptr<uint8_t> m_video_ram;
- required_ioport_array<12> m_y;
- required_ioport m_st_io;
- required_device<palette_device> m_palette;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER( mrq_r );
@@ -117,6 +95,29 @@ public:
DECLARE_WRITE_LINE_MEMBER( busrq_w );
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<z80ctc_device> m_ctc;
+ required_device<fd1797_device> m_fdc;
+ required_device<z80pio_device> m_pio;
+ required_device<z80dart_device> m_dart;
+ required_device<ay8912_device> m_psg;
+ required_device<ram_device> m_ram;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<cassette_image_device> m_cassette;
+ required_device<centronics_device> m_centronics;
+ required_device<tiki100_bus_device> m_exp;
+ required_memory_region m_rom;
+ required_memory_region m_prom;
+ optional_shared_ptr<uint8_t> m_video_ram;
+ required_ioport_array<12> m_y;
+ required_ioport m_st_io;
+ required_device<palette_device> m_palette;
+
enum
{
ROM0 = 0x01,
@@ -146,4 +147,4 @@ public:
bool m_st;
};
-#endif
+#endif // MAME_INCLUDES_TIKI100_H
diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h
index fa60cd09b85..146eb533c03 100644
--- a/src/mame/includes/tranz330.h
+++ b/src/mame/includes/tranz330.h
@@ -59,7 +59,7 @@ private:
required_device<z80dart_device> m_dart;
required_device<z80pio_device> m_pio;
required_device<msm6242_device> m_rtc;
- required_device<mic10937_t> m_vfd;
+ required_device<mic10937_device> m_vfd;
required_device<rs232_port_device> m_rs232;
required_device<speaker_sound_device> m_speaker;
required_ioport_array<4> m_keypad;
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index 02f3408d0f9..c65340d9003 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -162,7 +162,7 @@ private:
optional_device<output_latch_device> m_cent_data_out;
optional_device<input_buffer_device> m_cent_status_in;
optional_device<ay31015_device> m_ay31015;
- optional_device<fd1793_t> m_fdc;
+ optional_device<fd1793_device> m_fdc;
optional_device<floppy_connector> m_floppy0;
optional_device<floppy_connector> m_floppy1;
optional_device<floppy_connector> m_floppy2;
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 151b57b667c..6a799948dc9 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_TRS80M2_H
+#define MAME_INCLUDES_TRS80M2_H
-#ifndef __TRS80M2__
-#define __TRS80M2__
+#pragma once
#include "cpu/z80/z80.h"
@@ -60,29 +60,6 @@ public:
{
}
- required_device<cpu_device> m_maincpu;
- required_device<z80ctc_device> m_ctc;
- required_device<z80dma_device> m_dmac;
- required_device<z80pio_device> m_pio;
- required_device<mc6845_device> m_crtc;
- required_device<palette_device> m_palette;
- required_device<fd1791_t> m_fdc;
- required_device<centronics_device> m_centronics;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<floppy_connector> m_floppy2;
- required_device<floppy_connector> m_floppy3;
- floppy_image_device *m_floppy;
- required_device<ram_device> m_ram;
- required_device<trs80m2_keyboard_device> m_kb;
- required_memory_region m_rom;
- required_memory_region m_char_rom;
- optional_shared_ptr<uint8_t> m_video_ram;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
- virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_READ8_MEMBER( read );
@@ -101,10 +78,43 @@ public:
DECLARE_WRITE8_MEMBER( pio_pa_w );
DECLARE_WRITE_LINE_MEMBER( strobe_w );
DECLARE_WRITE_LINE_MEMBER( kb_clock_w );
- DECLARE_WRITE8_MEMBER( kbd_w );
+ void kbd_w(u8 data);
MC6845_UPDATE_ROW( crtc_update_row );
+ TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
+ DECLARE_READ8_MEMBER(io_read_byte);
+ DECLARE_WRITE8_MEMBER(io_write_byte);
+
+ DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
+ DECLARE_WRITE_LINE_MEMBER(write_centronics_fault);
+ DECLARE_WRITE_LINE_MEMBER(write_centronics_perror);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ virtual void video_start() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<z80ctc_device> m_ctc;
+ required_device<z80dma_device> m_dmac;
+ required_device<z80pio_device> m_pio;
+ required_device<mc6845_device> m_crtc;
+ required_device<palette_device> m_palette;
+ required_device<fd1791_device> m_fdc;
+ required_device<centronics_device> m_centronics;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<floppy_connector> m_floppy2;
+ required_device<floppy_connector> m_floppy3;
+ floppy_image_device *m_floppy;
+ required_device<ram_device> m_ram;
+ required_device<trs80m2_keyboard_device> m_kb;
+ required_memory_region m_rom;
+ required_memory_region m_char_rom;
+ optional_shared_ptr<uint8_t> m_video_ram;
+
// memory state
int m_boot_rom;
int m_bank;
@@ -125,39 +135,33 @@ public:
int m_rtc_int;
int m_enable_rtc_int;
- TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
- DECLARE_READ8_MEMBER(io_read_byte);
- DECLARE_WRITE8_MEMBER(io_write_byte);
-
int m_centronics_busy;
int m_centronics_fault;
int m_centronics_perror;
-
- DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
- DECLARE_WRITE_LINE_MEMBER(write_centronics_fault);
- DECLARE_WRITE_LINE_MEMBER(write_centronics_perror);
};
class trs80m16_state : public trs80m2_state
{
public:
trs80m16_state(const machine_config &mconfig, device_type type, const char *tag)
- : trs80m2_state(mconfig, type, tag),
- m_subcpu(*this, M68000_TAG),
- m_pic(*this, AM9519A_TAG)
- { }
+ : trs80m2_state(mconfig, type, tag)
+ , m_subcpu(*this, M68000_TAG)
+ , m_pic(*this, AM9519A_TAG)
+ {
+ }
- required_device<cpu_device> m_subcpu;
- required_device<pic8259_device> m_pic;
+ DECLARE_WRITE8_MEMBER( ual_w );
+ DECLARE_WRITE8_MEMBER( tcl_w );
+protected:
virtual void machine_start() override;
- DECLARE_WRITE8_MEMBER( ual_w );
- DECLARE_WRITE8_MEMBER( tcl_w );
+ required_device<cpu_device> m_subcpu;
+ required_device<pic8259_device> m_pic;
uint16_t m_ual;
uint8_t m_limit[2];
uint8_t m_offset[2];
};
-#endif
+#endif // MAME_INCLUDES_TRS80M2_H
diff --git a/src/mame/includes/tsispch.h b/src/mame/includes/tsispch.h
index 6b3db7d4f25..952d10badff 100644
--- a/src/mame/includes/tsispch.h
+++ b/src/mame/includes/tsispch.h
@@ -6,12 +6,11 @@
****************************************************************************/
-#pragma once
+#ifndef MAME_INCLUDES_TSISPCH_H
+#define MAME_INCLUDES_TSISPCH_H
-#ifndef _TSISPCH_H_
-#define _TSISPCH_H_
+#pragma once
-#include "machine/i8251.h"
#include "machine/pic8259.h"
#include "machine/terminal.h"
@@ -25,21 +24,10 @@ public:
m_maincpu(*this, "maincpu"),
m_dsp(*this, "dsp"),
m_terminal(*this, TERMINAL_TAG),
- m_uart(*this, "i8251a_u15"),
m_pic(*this, "pic8259")
{
}
- required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_dsp;
- required_device<generic_terminal_device> m_terminal;
- required_device<i8251_device> m_uart;
- required_device<pic8259_device> m_pic;
-
- uint8_t m_paramReg; // status leds and resets and etc
-
- virtual void machine_reset() override;
- DECLARE_WRITE8_MEMBER(i8251_rxd);
DECLARE_READ8_MEMBER(dsw_r);
DECLARE_WRITE8_MEMBER(peripheral_w);
DECLARE_READ16_MEMBER(dsp_data_r);
@@ -52,7 +40,16 @@ public:
DECLARE_WRITE_LINE_MEMBER(i8251_txrdy_int);
DECLARE_WRITE_LINE_MEMBER(dsp_to_8086_p0_w);
DECLARE_WRITE_LINE_MEMBER(dsp_to_8086_p1_w);
-};
+protected:
+ virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<cpu_device> m_dsp;
+ required_device<generic_terminal_device> m_terminal;
+ required_device<pic8259_device> m_pic;
+
+ uint8_t m_paramReg; // status leds and resets and etc
+};
-#endif // _TSISPCH_H_
+#endif // MAME_INCLUDES_TSISPCH_H
diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h
index cf540a6e8ef..fc9f74e4c2a 100644
--- a/src/mame/includes/turrett.h
+++ b/src/mame/includes/turrett.h
@@ -5,6 +5,10 @@
Turret Tower hardware
****************************************************************************/
+#ifndef MAME_INCLUDES_TURRETT_H
+#define MAME_INCLUDES_TURRETT_H
+
+#pragma once
#include "machine/ataintf.h"
#include "screen.h"
@@ -128,4 +132,6 @@ private:
};
// device type definition
-extern const device_type TURRETT;
+DECLARE_DEVICE_TYPE(TURRETT, turrett_device)
+
+#endif // MAME_INCLUDES_TURRETT_H
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index e22cd8be080..d9fe40a979f 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -5,6 +5,10 @@
TX-1/Buggy Boy hardware
*************************************************************************/
+#ifndef MAME_INCLUDES_TX1_H
+#define MAME_INCLUDES_TX1_H
+
+#pragma once
#include "screen.h"
@@ -258,7 +262,6 @@ class tx1_sound_device : public device_t,
{
public:
tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- tx1_sound_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
~tx1_sound_device() {}
DECLARE_READ8_MEMBER( pit8253_r );
@@ -267,6 +270,8 @@ public:
DECLARE_WRITE8_MEMBER( ay8910_b_w );
protected:
+ tx1_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -308,7 +313,7 @@ protected:
uint16_t m_eng_voltages[16];
};
-extern const device_type TX1;
+DECLARE_DEVICE_TYPE(TX1, tx1_sound_device)
class buggyboy_sound_device : public tx1_sound_device
{
@@ -331,4 +336,6 @@ private:
// internal state
};
-extern const device_type BUGGYBOY;
+DECLARE_DEVICE_TYPE(BUGGYBOY, buggyboy_sound_device)
+
+#endif // MAME_INCLUDES_TX1_H
diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h
index 2c6ea33a5b1..16056093234 100644
--- a/src/mame/includes/v1050.h
+++ b/src/mame/includes/v1050.h
@@ -1,9 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#ifndef MAME_INCLUDES_V1050_H
+#define MAME_INCLUDES_V1050_H
+
#pragma once
-#ifndef __V1050__
-#define __V1050__
+#pragma once
#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
@@ -162,7 +164,6 @@ private:
void scan_keyboard();
void set_baud_sel(int sel);
-public: // HACK for MC6845
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<i8214_device> m_pic;
@@ -171,7 +172,7 @@ public: // HACK for MC6845
required_device<msm58321_device> m_rtc;
required_device<i8251_device> m_uart_kb;
required_device<i8251_device> m_uart_sio;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<mc6845_device> m_crtc;
required_device<palette_device> m_palette;
required_device<centronics_device> m_centronics;
@@ -183,7 +184,7 @@ public: // HACK for MC6845
required_device<clock_device> m_clock_sio;
required_device<timer_device> m_timer_ack;
required_device<timer_device> m_timer_rst;
- required_device<SCSI_PORT_DEVICE> m_sasibus;
+ required_device<scsi_port_device> m_sasibus;
required_device<output_latch_device> m_sasi_data_out;
required_device<input_buffer_device> m_sasi_data_in;
required_device<input_buffer_device> m_sasi_ctrl_in;
@@ -229,4 +230,4 @@ public: // HACK for MC6845
MACHINE_CONFIG_EXTERN( v1050_video );
-#endif
+#endif // MAME_INCLUDES_V1050_H
diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h
index b9a0e9b5fce..19e17d6524c 100644
--- a/src/mame/includes/vector06.h
+++ b/src/mame/includes/vector06.h
@@ -90,7 +90,7 @@ private:
required_device<speaker_sound_device> m_speaker;
required_device<cassette_image_device> m_cassette;
required_device<generic_slot_device> m_cart;
- required_device<kr1818vg93_t> m_fdc;
+ required_device<kr1818vg93_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<i8255_device> m_ppi;
diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h
index 60e75070ba2..969dbd7b151 100644
--- a/src/mame/includes/vixen.h
+++ b/src/mame/includes/vixen.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_VIXEN_H
+#define MAME_INCLUDES_VIXEN_H
-#ifndef __VIXEN__
-#define __VIXEN__
+#pragma once
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
@@ -77,7 +77,7 @@ public:
private:
required_device<cpu_device> m_maincpu;
- required_device<fd1797_t> m_fdc;
+ required_device<fd1797_device> m_fdc;
required_device<i8155_device> m_io_i8155;
required_device<i8251_device> m_usart;
required_device<discrete_sound_device> m_discrete;
@@ -129,4 +129,4 @@ private:
bool m_256;
};
-#endif
+#endif // MAME_INCLUDES_VIXEN_H
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index 3329e1b883f..0abab512956 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -6,8 +6,10 @@
*
****************************************************************************/
-#ifndef X1_H_
-#define X1_H_
+#ifndef MAME_INCLUDES_X1_H
+#define MAME_INCLUDES_X1_H
+
+#pragma once
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
@@ -44,35 +46,35 @@ private:
virtual void z80daisy_irq_reti() override;
};
-struct scrn_reg_t
+class x1_state : public driver_device
{
- uint8_t gfx_bank;
- uint8_t disp_bank;
- uint8_t pcg_mode;
- uint8_t v400_mode;
- uint8_t ank_sel;
+public:
+ struct scrn_reg_t
+ {
+ uint8_t gfx_bank;
+ uint8_t disp_bank;
+ uint8_t pcg_mode;
+ uint8_t v400_mode;
+ uint8_t ank_sel;
- uint8_t pri;
- uint8_t blackclip; // x1 turbo specific
-};
+ uint8_t pri;
+ uint8_t blackclip; // x1 turbo specific
+ };
-struct turbo_reg_t
-{
- uint8_t pal;
- uint8_t gfx_pal;
- uint8_t txt_pal[8];
- uint8_t txt_disp;
-};
+ struct turbo_reg_t
+ {
+ uint8_t pal;
+ uint8_t gfx_pal;
+ uint8_t txt_pal[8];
+ uint8_t txt_disp;
+ };
-struct x1_rtc_t
-{
- uint8_t sec, min, hour, day, wday, month, year;
-};
+ struct x1_rtc_t
+ {
+ uint8_t sec, min, hour, day, wday, month, year;
+ };
-class x1_state : public driver_device
-{
-public:
x1_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this,"x1_cpu"),
@@ -95,7 +97,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cassette_image_device> m_cassette;
required_device<generic_slot_device> m_cart;
- required_device<mb8877_t> m_fdc;
+ required_device<mb8877_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
@@ -299,6 +301,6 @@ public:
/*----------- defined in machine/x1.c -----------*/
-extern const device_type X1_KEYBOARD;
+DECLARE_DEVICE_TYPE(X1_KEYBOARD, x1_keyboard_device)
-#endif /* X1_H_ */
+#endif // MAME_INCLUDES_X1_H
diff --git a/src/mame/includes/xbox_pci.h b/src/mame/includes/xbox_pci.h
index 2ab41a2ea27..7c9f34b5d8d 100644
--- a/src/mame/includes/xbox_pci.h
+++ b/src/mame/includes/xbox_pci.h
@@ -299,7 +299,7 @@ protected:
virtual void device_reset() override;
};
-extern const device_type NV2A_AGP;
+DECLARE_DEVICE_TYPE(NV2A_AGP, nv2a_agp_device)
/*
* NV2A 3D Accelerator
@@ -331,7 +331,7 @@ private:
DECLARE_ADDRESS_MAP(nv2a_mirror, 32);
};
-extern const device_type NV2A_GPU;
+DECLARE_DEVICE_TYPE(NV2A_GPU, nv2a_gpu_device)
#define MCFG_MCPX_NV2A_GPU_CPU(_cpu_tag) \
downcast<nv2a_gpu_device *>(device)->set_cpu_tag(_cpu_tag);
diff --git a/src/mame/includes/xbox_usb.h b/src/mame/includes/xbox_usb.h
index 1a483b98911..bf32b1ad2ab 100644
--- a/src/mame/includes/xbox_usb.h
+++ b/src/mame/includes/xbox_usb.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Samuele Zannoli
+#ifndef MAME_INCLUDES_XBOX_USB_H
+#define MAME_INCLUDES_XBOX_USB_H
#pragma once
@@ -453,12 +455,12 @@ protected:
usb_device_configuration *selected_configuration;
};
-extern const device_type OHCI_GAME_CONTROLLER;
+DECLARE_DEVICE_TYPE(OHCI_GAME_CONTROLLER, ohci_game_controller_device)
-class ohci_game_controller : public device_t, public ohci_function
+class ohci_game_controller_device : public device_t, public ohci_function
{
public:
- ohci_game_controller(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ohci_game_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void initialize(running_machine &machine) override;
int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) override;
int handle_interrupt_pid(int endpoint, int pid, uint8_t *buffer, int size) override;
@@ -487,3 +489,5 @@ private:
required_ioport m_Black; // analog button
required_ioport m_White; // analog button
};
+
+#endif // MAME_INCLUDES_XBOX_USB_H
diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h
index 2969f58712c..b3f3fbdd8bf 100644
--- a/src/mame/includes/xerox820.h
+++ b/src/mame/includes/xerox820.h
@@ -66,36 +66,39 @@ public:
m_400_460(0)
{ }
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+ DECLARE_READ8_MEMBER( fdc_r );
+ DECLARE_WRITE8_MEMBER( fdc_w );
+ DECLARE_WRITE8_MEMBER( scroll_w );
+ //DECLARE_WRITE8_MEMBER( x120_system_w );
+ DECLARE_READ8_MEMBER( kbpio_pa_r );
+ DECLARE_WRITE8_MEMBER( kbpio_pa_w );
+ DECLARE_READ8_MEMBER( kbpio_pb_r );
+ DECLARE_WRITE_LINE_MEMBER( fr_w );
+ DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
+ DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+
+ TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
+
+protected:
virtual void machine_start() override;
virtual void machine_reset() override;
- uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
required_device<cpu_device> m_maincpu;
required_device<z80pio_device> m_kbpio;
required_device<z80ctc_device> m_ctc;
required_device<z80sio0_device> m_sio;
- required_device<wd_fdc_t> m_fdc;
+ required_device<wd_fdc_device_base> m_fdc;
required_device<ram_device> m_ram;
required_device<palette_device> m_palette;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
- required_device<xerox_820_keyboard_t> m_kb;
+ required_device<xerox_820_keyboard_device> m_kb;
required_memory_region m_rom;
required_memory_region m_char_rom;
required_shared_ptr<uint8_t> m_video_ram;
- DECLARE_READ8_MEMBER( fdc_r );
- DECLARE_WRITE8_MEMBER( fdc_w );
- DECLARE_WRITE8_MEMBER( scroll_w );
- //DECLARE_WRITE8_MEMBER( x120_system_w );
- DECLARE_READ8_MEMBER( kbpio_pa_r );
- DECLARE_WRITE8_MEMBER( kbpio_pa_w );
- DECLARE_READ8_MEMBER( kbpio_pb_r );
- DECLARE_WRITE_LINE_MEMBER( fr_w );
- DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
- DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
-
virtual void bankswitch(int bank);
void update_nmi();
@@ -112,27 +115,26 @@ public:
bool m_fdc_drq; /* data request */
int m_8n5; /* 5.25" / 8" drive select */
int m_400_460; /* double sided disk detect */
-
- TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick);
};
class bigboard_state : public xerox820_state
{
public:
bigboard_state(const machine_config &mconfig, device_type type, const char *tag)
- : xerox820_state(mconfig, type, tag),
- m_beeper(*this, "beeper")
+ : xerox820_state(mconfig, type, tag)
+ , m_beeper(*this, "beeper")
{ }
- required_device<beep_device> m_beeper;
+ DECLARE_WRITE8_MEMBER( kbpio_pa_w );
+protected:
virtual void machine_reset() override;
- DECLARE_WRITE8_MEMBER( kbpio_pa_w );
+ TIMER_CALLBACK_MEMBER(bigboard_beepoff);
- bool m_bit5;
+ required_device<beep_device> m_beeper;
- TIMER_CALLBACK_MEMBER(bigboard_beepoff);
+ bool m_bit5;
};
class xerox820ii_state : public xerox820_state
@@ -145,11 +147,6 @@ public:
{
}
- required_device<speaker_sound_device> m_speaker;
- required_device<SCSI_PORT_DEVICE> m_sasibus;
-
- virtual void machine_reset() override;
-
DECLARE_WRITE8_MEMBER( bell_w );
DECLARE_WRITE8_MEMBER( slden_w );
DECLARE_WRITE8_MEMBER( chrom_w );
@@ -159,7 +156,13 @@ public:
DECLARE_WRITE8_MEMBER( rdpio_pb_w );
DECLARE_WRITE_LINE_MEMBER( rdpio_pardy_w );
+protected:
+ virtual void machine_reset() override;
+
void bankswitch(int bank) override;
+
+ required_device<speaker_sound_device> m_speaker;
+ required_device<scsi_port_device> m_sasibus;
};
#endif // MAME_INCLUDES_XEROX820_H
diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h
index 63423cbf5fb..1656fd18b3f 100644
--- a/src/mame/includes/xor100.h
+++ b/src/mame/includes/xor100.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#pragma once
+#ifndef MAME_INCLUDES_XOR100_H
+#define MAME_INCLUDES_XOR100_H
-#ifndef __XOR100__
-#define __XOR100__
+#pragma once
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
@@ -48,24 +48,6 @@ public:
m_rom(*this, Z80_TAG)
{ }
- required_device<cpu_device> m_maincpu;
- required_device<com8116_device> m_dbrg;
- required_device<i8251_device> m_uart_a;
- required_device<i8251_device> m_uart_b;
- required_device<fd1795_t> m_fdc;
- required_device<z80ctc_device> m_ctc;
- required_device<ram_device> m_ram;
- required_device<centronics_device> m_centronics;
- required_device<s100_bus_t> m_s100;
- required_device<floppy_connector> m_floppy0;
- required_device<floppy_connector> m_floppy1;
- required_device<floppy_connector> m_floppy2;
- required_device<floppy_connector> m_floppy3;
- required_memory_region m_rom;
-
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
DECLARE_WRITE8_MEMBER( mmu_w );
DECLARE_WRITE8_MEMBER( prom_toggle_w );
DECLARE_READ8_MEMBER( prom_disable_r );
@@ -78,9 +60,37 @@ public:
void fdc_intrq_w(bool state);
void fdc_drq_w(bool state);
+ DECLARE_WRITE_LINE_MEMBER(com5016_fr_w);
+ DECLARE_WRITE_LINE_MEMBER(com5016_ft_w);
+ DECLARE_READ8_MEMBER(i8255_pc_r);
+ DECLARE_WRITE_LINE_MEMBER(ctc_z0_w);
+ DECLARE_WRITE_LINE_MEMBER(ctc_z1_w);
+ DECLARE_WRITE_LINE_MEMBER(ctc_z2_w);
+ DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
+ DECLARE_WRITE_LINE_MEMBER(write_centronics_select);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
void bankswitch();
void post_load();
+ required_device<cpu_device> m_maincpu;
+ required_device<com8116_device> m_dbrg;
+ required_device<i8251_device> m_uart_a;
+ required_device<i8251_device> m_uart_b;
+ required_device<fd1795_device> m_fdc;
+ required_device<z80ctc_device> m_ctc;
+ required_device<ram_device> m_ram;
+ required_device<centronics_device> m_centronics;
+ required_device<s100_bus_device> m_s100;
+ required_device<floppy_connector> m_floppy0;
+ required_device<floppy_connector> m_floppy1;
+ required_device<floppy_connector> m_floppy2;
+ required_device<floppy_connector> m_floppy3;
+ required_memory_region m_rom;
+
// memory state
int m_mode;
int m_bank;
@@ -89,17 +99,9 @@ public:
bool m_fdc_irq;
bool m_fdc_drq;
int m_fdc_dden;
- DECLARE_WRITE_LINE_MEMBER(com5016_fr_w);
- DECLARE_WRITE_LINE_MEMBER(com5016_ft_w);
- DECLARE_READ8_MEMBER(i8255_pc_r);
- DECLARE_WRITE_LINE_MEMBER(ctc_z0_w);
- DECLARE_WRITE_LINE_MEMBER(ctc_z1_w);
- DECLARE_WRITE_LINE_MEMBER(ctc_z2_w);
int m_centronics_busy;
int m_centronics_select;
- DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
- DECLARE_WRITE_LINE_MEMBER(write_centronics_select);
};
-#endif
+#endif // MAME_INCLUDES_XOR100_H
diff --git a/src/mame/includes/z80ne.h b/src/mame/includes/z80ne.h
index 03068d5e97e..ffe4765b7f5 100644
--- a/src/mame/includes/z80ne.h
+++ b/src/mame/includes/z80ne.h
@@ -10,8 +10,10 @@
*
****************************************************************************/
-#ifndef Z80NE_H_
-#define Z80NE_H_
+#ifndef MAME_INCLUDES_Z80NE_H
+#define MAME_INCLUDES_Z80NE_H
+
+#pragma once
#include "video/mc6847.h"
#include "imagedev/cassette.h"
@@ -158,7 +160,7 @@ protected:
optional_device<floppy_connector> m_floppy3;
required_device<cassette_image_device> m_cassette1;
required_device<cassette_image_device> m_cassette2;
- optional_device<fd1771_t> m_wd1771;
+ optional_device<fd1771_device> m_wd1771;
required_memory_region m_region_z80ne;
optional_memory_bank m_bank1;
optional_memory_bank m_bank2;
@@ -190,4 +192,4 @@ protected:
void reset_lx390_banking();
};
-#endif /* Z80NE_H_ */
+#endif // MAME_INCLUDES_Z80NE_H
diff --git a/src/mame/includes/zorba.h b/src/mame/includes/zorba.h
index 1c14b8399b3..14fa6bb41e2 100644
--- a/src/mame/includes/zorba.h
+++ b/src/mame/includes/zorba.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert, Vas Crabb
+#ifndef MAME_INCLUDES_ZORBA_H
+#define MAME_INCLUDES_ZORBA_H
+
+#pragma once
#include "sound/beep.h"
@@ -95,7 +99,7 @@ private:
required_device<beep_device> m_beep;
- required_device<fd1793_t> m_fdc;
+ required_device<fd1793_device> m_fdc;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
@@ -111,3 +115,5 @@ private:
uint8_t m_term_data;
};
+
+#endif // MAME_INCLUDES_ZORBA_H
diff --git a/src/mame/machine/315-5838_317-0229_comp.cpp b/src/mame/machine/315-5838_317-0229_comp.cpp
index dd03de19e1d..b54ed9a51ae 100644
--- a/src/mame/machine/315-5838_317-0229_comp.cpp
+++ b/src/mame/machine/315-5838_317-0229_comp.cpp
@@ -48,12 +48,12 @@
#include "emu.h"
#include "machine/315-5838_317-0229_comp.h"
-const device_type SEGA315_5838_COMP = device_creator<sega_315_5838_comp_device>;
+DEFINE_DEVICE_TYPE(SEGA315_5838_COMP, sega_315_5838_comp_device, "sega315_5838", "Sega 315-4838 / 317-0029 Compression (Encryption?)")
//#define DEBUG_DATA_DUMP
sega_315_5838_comp_device::sega_315_5838_comp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA315_5838_COMP, "Sega 315-5838 / 317-0029 Compression (Encryption?)", tag, owner, clock, "sega315_5838", __FILE__)
+ : device_t(mconfig, SEGA315_5838_COMP, tag, owner, clock)
{
}
diff --git a/src/mame/machine/315-5838_317-0229_comp.h b/src/mame/machine/315-5838_317-0229_comp.h
index 1d741c73ac3..0990472fadb 100644
--- a/src/mame/machine/315-5838_317-0229_comp.h
+++ b/src/mame/machine/315-5838_317-0229_comp.h
@@ -1,16 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_315_5838_371_0229_COMP_H
+#define MAME_MACHINE_315_5838_371_0229_COMP_H
#pragma once
-#ifndef __SEGA315_5838_COMP__
-#define __SEGA315_5838_COMP__
-
-#define CHANNELS 2
-
typedef device_delegate<uint16_t (uint32_t)> sega_dec_read_delegate;
-extern const device_type SEGA315_5838_COMP;
+DECLARE_DEVICE_TYPE(SEGA315_5838_COMP, sega_315_5838_comp_device)
#define MCFG_SET_5838_READ_CALLBACK_CH1( _class, _method) \
sega_315_5838_comp_device::set_read_cb_ch1(*device, sega_m2_read_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
@@ -24,8 +21,6 @@ public:
// construction/destruction
sega_315_5838_comp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- sega_dec_read_delegate m_read_ch2;
-
static void set_read_cb_ch1(device_t &device,sega_dec_read_delegate readcb)
{
sega_315_5838_comp_device &dev = downcast<sega_315_5838_comp_device &>(device);
@@ -65,6 +60,10 @@ protected:
virtual void device_reset() override;
private:
+ static constexpr unsigned CHANNELS = 2;
+
+ sega_dec_read_delegate m_read_ch2;
+
uint16_t m_decathlt_prottable1[24];
uint16_t m_decathlt_dictionaryy[128];
@@ -84,12 +83,10 @@ private:
channel_type m_channel[2];
-
-
// Doa
int m_protstate;
int m_prot_a;
uint8_t m_protram[256];
};
-#endif
+#endif // MAME_MACHINE_315_5838_371_0229_COMP_H
diff --git a/src/mame/machine/315-5881_crypt.cpp b/src/mame/machine/315-5881_crypt.cpp
index 124f430c4e1..f7f861339e2 100644
--- a/src/mame/machine/315-5881_crypt.cpp
+++ b/src/mame/machine/315-5881_crypt.cpp
@@ -17,11 +17,11 @@
#include "emu.h"
#include "machine/315-5881_crypt.h"
-const device_type SEGA315_5881_CRYPT = device_creator<sega_315_5881_crypt_device>;
+DEFINE_DEVICE_TYPE(SEGA315_5881_CRYPT, sega_315_5881_crypt_device, "sega315_5881", "Sega 315-5881 Encryption")
sega_315_5881_crypt_device::sega_315_5881_crypt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA315_5881_CRYPT, "Sega 315-5881 Encryption", tag, owner, clock, "sega315_5881", __FILE__)
+ : device_t(mconfig, SEGA315_5881_CRYPT, tag, owner, clock)
{
}
diff --git a/src/mame/machine/315-5881_crypt.h b/src/mame/machine/315-5881_crypt.h
index 109ec4c23b9..62c0de16e9a 100644
--- a/src/mame/machine/315-5881_crypt.h
+++ b/src/mame/machine/315-5881_crypt.h
@@ -1,14 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_315_5881_CRYPT_H
+#define MAME_MACHINE_315_5881_CRYPT_H
#pragma once
-#ifndef __SEGA315_5881_CRYPT__
-#define __SEGA315_5881_CRYPT__
typedef device_delegate<uint16_t (uint32_t)> sega_m2_read_delegate;
-extern const device_type SEGA315_5881_CRYPT;
+DECLARE_DEVICE_TYPE(SEGA315_5881_CRYPT, sega_315_5881_crypt_device)
#define MCFG_SET_READ_CALLBACK( _class, _method) \
sega_315_5881_crypt_device::set_read_cb(*device, sega_m2_read_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
@@ -97,4 +97,4 @@ private:
};
-#endif
+#endif // MAME_MACHINE_315_5881_CRYPT_H
diff --git a/src/mame/machine/315_5296.cpp b/src/mame/machine/315_5296.cpp
index d51d0bcea77..c169671020d 100644
--- a/src/mame/machine/315_5296.cpp
+++ b/src/mame/machine/315_5296.cpp
@@ -26,14 +26,14 @@
#include "machine/315_5296.h"
-const device_type SEGA_315_5296 = device_creator<sega_315_5296_device>;
+DEFINE_DEVICE_TYPE(SEGA_315_5296, sega_315_5296_device, "315_5296", "Sega 315-5296 I/O")
//-------------------------------------------------
// sega_315_5296_device - constructor
//-------------------------------------------------
sega_315_5296_device::sega_315_5296_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA_315_5296, "Sega 315-5296 I/O", tag, owner, clock, "315_5296", __FILE__),
+ : device_t(mconfig, SEGA_315_5296, tag, owner, clock),
m_in_pa_cb(*this),
m_in_pb_cb(*this),
m_in_pc_cb(*this),
diff --git a/src/mame/machine/315_5296.h b/src/mame/machine/315_5296.h
index f66064895c0..f02e82f1ca5 100644
--- a/src/mame/machine/315_5296.h
+++ b/src/mame/machine/315_5296.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_315_5296_H
+#define MAME_MACHINE_315_5296_H
-#ifndef _SEGA_315_5296_H
-#define _SEGA_315_5296_H
+#pragma once
@@ -139,7 +139,7 @@ private:
};
// device type definition
-extern const device_type SEGA_315_5296;
+DECLARE_DEVICE_TYPE(SEGA_315_5296, sega_315_5296_device)
-#endif /* _SEGA_315_5296_H */
+#endif // MAME_MACHINE_315_5296_H
diff --git a/src/mame/machine/6883sam.cpp b/src/mame/machine/6883sam.cpp
index 597d99a510b..d5d064167dd 100644
--- a/src/mame/machine/6883sam.cpp
+++ b/src/mame/machine/6883sam.cpp
@@ -59,7 +59,7 @@
#define LOG_SAM 0
-const device_type SAM6883 = device_creator<sam6883_device>;
+DEFINE_DEVICE_TYPE(SAM6883, sam6883_device, "sam6883", "MC6883 SAM")
@@ -72,7 +72,7 @@ const device_type SAM6883 = device_creator<sam6883_device>;
//-------------------------------------------------
sam6883_device::sam6883_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SAM6883, "SAM6883", tag, owner, clock, "sam6883", __FILE__),
+ : device_t(mconfig, SAM6883, tag, owner, clock),
m_cpu_tag(nullptr),
m_cpu_space_ref(AS_PROGRAM),
m_read_res(*this),
diff --git a/src/mame/machine/6883sam.h b/src/mame/machine/6883sam.h
index 02bfd0603ae..1a2ce5bd045 100644
--- a/src/mame/machine/6883sam.h
+++ b/src/mame/machine/6883sam.h
@@ -8,10 +8,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_6883SAM_H
+#define MAME_MACHINE_6883SAM_H
-#ifndef __6883SAM__
-#define __6883SAM__
+#pragma once
#define MCFG_SAM6883_ADD(_tag, _clock, _cputag, _cpuspace) \
@@ -88,7 +88,7 @@ class sam6883_device : public device_t, public sam6883_friend_device
public:
sam6883_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_res_rd_callback(device_t &device, _Object object) { return downcast<sam6883_device &>(device).m_read_res.set_callback(object); }
+ template <class Object> static devcb_base &set_res_rd_callback(device_t &device, Object &&cb) { return downcast<sam6883_device &>(device).m_read_res.set_callback(std::forward<Object>(cb)); }
static void configure_cpu(device_t &device, const char *tag, address_spacenum space)
{
@@ -151,7 +151,7 @@ private:
// represents one of the memory "spaces" (e.g. - $8000-$9FFF) that
// can ultimately point to a bank
- template<uint16_t _addrstart, uint16_t _addrend>
+ template <uint16_t _addrstart, uint16_t _addrend>
class sam_space
{
public:
@@ -173,7 +173,7 @@ private:
// incidentals
address_space * m_cpu_space;
- devcb_read8 m_read_res;
+ devcb_read8 m_read_res;
sam_bank m_banks[8];
sam_space<0x0000, 0x7FFF> m_space_0000;
sam_space<0x8000, 0x9FFF> m_space_8000;
@@ -260,6 +260,6 @@ private:
void update_memory(void);
};
-extern const device_type SAM6883;
+DECLARE_DEVICE_TYPE(SAM6883, sam6883_device)
-#endif /* __6883SAM__ */
+#endif // MAME_MACHINE_6883SAM_H
diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp
index 16e2338a9b2..3b3e812c53e 100644
--- a/src/mame/machine/abc1600mac.cpp
+++ b/src/mame/machine/abc1600mac.cpp
@@ -54,7 +54,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC1600_MAC = device_creator<abc1600_mac_device>;
+DEFINE_DEVICE_TYPE(ABC1600_MAC, abc1600_mac_device, "abc1600mac", "ABC 1600 MAC")
DEVICE_ADDRESS_MAP_START( map, 8, abc1600_mac_device )
@@ -110,7 +110,7 @@ const tiny_rom_entry *abc1600_mac_device::device_rom_region() const
//-------------------------------------------------
abc1600_mac_device::abc1600_mac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ABC1600_MAC, "ABC 1600 MAC", tag, owner, clock, "abc1600mac", __FILE__),
+ device_t(mconfig, ABC1600_MAC, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_space_config("program", ENDIANNESS_LITTLE, 8, 22, 0, *ADDRESS_MAP_NAME(program_map)),
m_rom(*this, "boot"),
diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h
index a13a7bf40d0..78edac40e1a 100644
--- a/src/mame/machine/abc1600mac.h
+++ b/src/mame/machine/abc1600mac.h
@@ -5,11 +5,11 @@
Luxor ABC 1600 Memory Access Controller emulation
**********************************************************************/
+#ifndef MAME_MACHINE_ABC1600MAC_H
+#define MAME_MACHINE_ABC1600MAC_H
#pragma once
-#ifndef __ABC1600_MAC__
-#define __ABC1600_MAC__
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
@@ -132,8 +132,7 @@ private:
// device type definition
-extern const device_type ABC1600_MAC;
+DECLARE_DEVICE_TYPE(ABC1600_MAC, abc1600_mac_device)
-
-#endif
+#endif // MAME_MACHINE_ABC1600MAC_H
diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp
index afefb8cf5d8..d689ea88c1f 100644
--- a/src/mame/machine/abc80kb.cpp
+++ b/src/mame/machine/abc80kb.cpp
@@ -74,6 +74,8 @@ Notes:
#include "emu.h"
#include "abc80kb.h"
+#include "cpu/mcs48/mcs48.h"
+
//**************************************************************************
@@ -88,7 +90,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC80_KEYBOARD = device_creator<abc80_keyboard_device>;
+DEFINE_DEVICE_TYPE(ABC80_KEYBOARD, abc80_keyboard_device, "abc80kb", "ABC-80 Keyboard")
//-------------------------------------------------
@@ -169,9 +171,9 @@ ioport_constructor abc80_keyboard_device::device_input_ports() const
//-------------------------------------------------
abc80_keyboard_device::abc80_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ABC80_KEYBOARD, "ABC-80 Keyboard", tag, owner, clock, "abc80kb", __FILE__),
- m_write_keydown(*this),
- m_maincpu(*this, I8048_TAG)
+ : device_t(mconfig, ABC80_KEYBOARD, tag, owner, clock)
+ , m_write_keydown(*this)
+ , m_maincpu(*this, I8048_TAG)
{
}
diff --git a/src/mame/machine/abc80kb.h b/src/mame/machine/abc80kb.h
index 67beace62b3..6dfe5d9175d 100644
--- a/src/mame/machine/abc80kb.h
+++ b/src/mame/machine/abc80kb.h
@@ -5,14 +5,11 @@
Luxor ABC-80 keyboard emulation
**********************************************************************/
+#ifndef MAME_MACHINE_ABC80KB_H
+#define MAME_MACHINE_ABC80KB_H
#pragma once
-#ifndef __ABC80_KEYBOARD__
-#define __ABC80_KEYBOARD__
-
-#include "cpu/mcs48/mcs48.h"
-
//**************************************************************************
@@ -66,8 +63,8 @@ private:
// device type definition
-extern const device_type ABC80_KEYBOARD;
+DECLARE_DEVICE_TYPE(ABC80_KEYBOARD, abc80_keyboard_device)
-#endif
+#endif // MAME_MACHINE_ABC80KB_H
diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp
index 9aa3522329c..f277f989894 100644
--- a/src/mame/machine/alpha8201.cpp
+++ b/src/mame/machine/alpha8201.cpp
@@ -277,15 +277,15 @@ Notes:
/**************************************************************************/
-const device_type ALPHA_8201 = device_creator<alpha_8201_device>;
+DEFINE_DEVICE_TYPE(ALPHA_8201, alpha_8201_device, "alpha8201", "ALPHA-8201")
//-------------------------------------------------
// alpha_8201_device - constructor
//-------------------------------------------------
alpha_8201_device::alpha_8201_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, ALPHA_8201, "ALPHA-8201", tag, owner, clock, "alpha8201", __FILE__),
- m_mcu(*this, "mcu")
+ : device_t(mconfig, ALPHA_8201, tag, owner, clock)
+ , m_mcu(*this, "mcu")
{
}
@@ -372,7 +372,7 @@ READ8_MEMBER(alpha_8201_device::mcu_data_r)
else
logerror("%s: MCU side invalid read\n", tag());
- if (offset == HMCS40_PORT_R0X)
+ if (offset == hmcs40_cpu_device::PORT_R0X)
ret >>= 4;
return ret & 0xf;
}
diff --git a/src/mame/machine/alpha8201.h b/src/mame/machine/alpha8201.h
index c116d2cbf92..2a6250f7dc0 100644
--- a/src/mame/machine/alpha8201.h
+++ b/src/mame/machine/alpha8201.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef _ALPHA8201_H_
-#define _ALPHA8201_H_
+#ifndef MAME_MACHINE_ALPHA8201_H
+#define MAME_MACHINE_ALPHA8201_H
class alpha_8201_device : public device_t
@@ -48,7 +48,7 @@ private:
};
-extern const device_type ALPHA_8201;
+DECLARE_DEVICE_TYPE(ALPHA_8201, alpha_8201_device)
-#endif /* _ALPHA8201_H_ */
+#endif // MAME_MACHINE_ALPHA8201_H
diff --git a/src/mame/machine/amstrad.cpp b/src/mame/machine/amstrad.cpp
index 5e7ad87c902..95c5aa5c768 100644
--- a/src/mame/machine/amstrad.cpp
+++ b/src/mame/machine/amstrad.cpp
@@ -1168,7 +1168,7 @@ void amstrad_state::amstrad_setLowerRom()
if ((m_gate_array.mrer & (1<<2)) == 0 && m_gate_array.romdis == 0)
{
if (m_exp)
- m_exp->set_mapping(MAP_LOWER);
+ m_exp->set_mapping(device_cpc_expansion_card_interface::MAP_LOWER);
}
}
else // CPC+/GX4000
@@ -1235,7 +1235,7 @@ void amstrad_state::amstrad_setLowerRom()
m_bank1->set_base(m_region_cart->base());
m_bank2->set_base(m_region_cart->base() + 0x2000);
if (m_exp)
- m_exp->set_mapping(MAP_LOWER);
+ m_exp->set_mapping(device_cpc_expansion_card_interface::MAP_LOWER);
}
}
}
@@ -1270,7 +1270,7 @@ void amstrad_state::amstrad_setUpperRom()
if ( ! ( m_gate_array.mrer & 0x08 ) && m_gate_array.romdis == 0)
{
if (m_exp)
- m_exp->set_mapping(MAP_UPPER);
+ m_exp->set_mapping(device_cpc_expansion_card_interface::MAP_UPPER);
}
}
@@ -2462,7 +2462,7 @@ void amstrad_state::amstrad_rethinkMemory()
/* mappings for other expansion devices */
if (m_exp)
- m_exp->set_mapping(MAP_OTHER);
+ m_exp->set_mapping(device_cpc_expansion_card_interface::MAP_OTHER);
}
@@ -3007,7 +3007,7 @@ void amstrad_state::enumerate_roms()
{
char str[20];
sprintf(str, "rom%i", i + 1);
- rom_image_device* romimage = romexp->subdevice<rom_image_device>(str);
+ cpc_rom_image_device* romimage = romexp->subdevice<cpc_rom_image_device>(str);
if(romimage != nullptr && romimage->base() != nullptr)
{
m_Amstrad_ROM_Table[m_rom_count] = romimage->base();
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 7ed02aaf7a8..db79e533abf 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -137,10 +137,10 @@ private:
// internal state
};
-const device_type APOLLO_CONF = device_creator<apollo_config_device>;
+DEFINE_DEVICE_TYPE(APOLLO_CONF, apollo_config_device, "apollo_config", "Apollo Configuration")
apollo_config_device::apollo_config_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, APOLLO_CONF, "Apollo Configuration", tag, owner, clock, "apollo_config", __FILE__)
+ : device_t(mconfig, APOLLO_CONF, tag, owner, clock)
{
}
@@ -712,9 +712,8 @@ TIMER_CALLBACK_MEMBER( apollo_state::apollo_rtc_timer )
#undef VERBOSE
#define VERBOSE 0
-apollo_sio::apollo_sio(const machine_config &mconfig, const char *tag,
- device_t *owner, uint32_t clock) :
- mc68681_base_device(mconfig, APOLLO_SIO, "DN3000/DS3500 SIO", tag, owner, clock, "apollo_sio", __FILE__),
+apollo_sio::apollo_sio(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ mc68681_base_device(mconfig, APOLLO_SIO, tag, owner, clock),
m_csrb(0),
m_ip6(0)
{
@@ -809,7 +808,7 @@ WRITE8_MEMBER( apollo_sio::write )
}
// device type definition
-const device_type APOLLO_SIO = device_creator<apollo_sio>;
+DEFINE_DEVICE_TYPE(APOLLO_SIO, apollo_sio, "apollo_sio", "DN3000/DS3500 SIO")
WRITE_LINE_MEMBER(apollo_state::sio_irq_handler)
{
@@ -862,16 +861,15 @@ WRITE_LINE_MEMBER(apollo_state::sio2_irq_handler)
/*** Apollo Node ID device ***/
// device type definition
-const device_type APOLLO_NI = device_creator<apollo_ni> ;
+DEFINE_DEVICE_TYPE(APOLLO_NI, apollo_ni, "node_id", "Apollo Node ID")
//-------------------------------------------------
// apollo_ni - constructor
//-------------------------------------------------
-apollo_ni::apollo_ni(const machine_config &mconfig, const char *tag,
- device_t *owner, uint32_t clock) :
- device_t(mconfig, APOLLO_NI, "Node ID", tag, owner, clock, "node_id",
- __FILE__), device_image_interface(mconfig, *this)
+apollo_ni::apollo_ni(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, APOLLO_NI, tag, owner, clock),
+ device_image_interface(mconfig, *this)
{
}
@@ -1263,17 +1261,16 @@ MACHINE_RESET_MEMBER(apollo_state,apollo)
***************************************************************************/
// device type definition
-const device_type APOLLO_STDIO = device_creator<apollo_stdio_device> ;
+DEFINE_DEVICE_TYPE(APOLLO_STDIO, apollo_stdio_device, "apollo_stdio", "Apollo STDIO")
//-------------------------------------------------
// apollo_stdio_device - constructor
//-------------------------------------------------
-apollo_stdio_device::apollo_stdio_device(const machine_config &mconfig,
- const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, APOLLO_STDIO, "Apollo STDIO", tag, owner, clock,
- "apollo_stdio", __FILE__), device_serial_interface(mconfig, *this),
- m_tx_w(*this)
+apollo_stdio_device::apollo_stdio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, APOLLO_STDIO, tag, owner, clock),
+ device_serial_interface(mconfig, *this),
+ m_tx_w(*this)
{
}
diff --git a/src/mame/machine/apollo_dbg.h b/src/mame/machine/apollo_dbg.h
index 3ce08a200f4..f9f77b8b8d7 100644
--- a/src/mame/machine/apollo_dbg.h
+++ b/src/mame/machine/apollo_dbg.h
@@ -8,12 +8,14 @@
*
*/
+#ifndef MAME_MACHINE_APOLLO_DBG_H
+#define MAME_MACHINE_APOLLO_DBG_H
+
#pragma once
-#ifndef __APOLLO_DBG_H__
-#define __APOLLO_DBG_H__
+#include "cpu/m68000/m68000.h"
int apollo_debug_instruction_hook(m68000_base_device *device, offs_t curpc);
-#endif
+#endif // MAME_MACHINE_APOLLO_DBG_H
diff --git a/src/mame/machine/apollo_kbd.cpp b/src/mame/machine/apollo_kbd.cpp
index 67244a77f24..e8b9510fc7e 100644
--- a/src/mame/machine/apollo_kbd.cpp
+++ b/src/mame/machine/apollo_kbd.cpp
@@ -10,11 +10,12 @@
*
*/
+#include "emu.h"
+
#define VERBOSE 0
-#include "emu.h"
#include "machine/apollo_kbd.h"
-#include "sound/beep.h"
+
#define LOG(x) { m_device->logerror ("%s apollo_kbd: ", m_device->cpu_context()); m_device->logerror x; m_device->logerror ("\n"); }
#define LOG1(x) { if (VERBOSE > 0) LOG(x)}
@@ -26,8 +27,6 @@
// DEVICE DEFINITIONS
//**************************************************************************
-//const device_type APOLLO_KBD = apollo_kbd_device_config::static_alloc_device_config;
-
//**************************************************************************
// CONSTANTS
//**************************************************************************
@@ -56,14 +55,14 @@
***************************************************************************/
// device type definition
-const device_type APOLLO_KBD = device_creator<apollo_kbd_device>;
+DEFINE_DEVICE_TYPE(APOLLO_KBD, apollo_kbd_device, "apollo_kbd", "Apollo Keyboard")
//-------------------------------------------------
// apollo_kbd_device - constructor
//-------------------------------------------------
apollo_kbd_device::apollo_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, APOLLO_KBD, "Apollo Keyboard", tag, owner, clock, "apollo_kbd", __FILE__),
+ : device_t(mconfig, APOLLO_KBD, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_tx_w(*this),
m_german_r(*this)
diff --git a/src/mame/machine/apollo_kbd.h b/src/mame/machine/apollo_kbd.h
index 369c3873095..3d4c9d7789a 100644
--- a/src/mame/machine/apollo_kbd.h
+++ b/src/mame/machine/apollo_kbd.h
@@ -8,10 +8,10 @@
*
*/
-#pragma once
+#ifndef MAME_MACHINE_APOLLO_KBD_H
+#define MAME_MACHINE_APOLLO_KBD_H
-#ifndef __APOLLO_KBD_H__
-#define __APOLLO_KBD_H__
+#pragma once
#include "sound/beep.h"
@@ -42,7 +42,7 @@ INPUT_PORTS_EXTERN(apollo_kbd);
// ======================> apollo_kbd_device
-class apollo_kbd_device : public device_t, public device_serial_interface
+class apollo_kbd_device : public device_t, public device_serial_interface
{
public:
// construction/destruction
@@ -155,6 +155,6 @@ private:
};
// device type definition
-extern const device_type APOLLO_KBD;
+DECLARE_DEVICE_TYPE(APOLLO_KBD, apollo_kbd_device)
-#endif
+#endif // MAME_MACHINE_APOLLO_KBD_H
diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp
index 558145031c7..9691e1c9941 100644
--- a/src/mame/machine/apricotkb.cpp
+++ b/src/mame/machine/apricotkb.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type APRICOT_KEYBOARD = device_creator<apricot_keyboard_device>;
+DEFINE_DEVICE_TYPE(APRICOT_KEYBOARD, apricot_keyboard_device, "aprikb", "Apricot Keyboard")
//-------------------------------------------------
@@ -247,7 +247,7 @@ ioport_constructor apricot_keyboard_device::device_input_ports() const
//-------------------------------------------------
apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, APRICOT_KEYBOARD, "Apricot Keyboard", tag, owner, clock, "aprikb", __FILE__),
+ device_t(mconfig, APRICOT_KEYBOARD, tag, owner, clock),
m_write_txd(*this),
m_y(*this, "Y%u", 0),
m_modifiers(*this, "MODIFIERS")
diff --git a/src/mame/machine/apricotkb.h b/src/mame/machine/apricotkb.h
index 598155fd011..ed0bbc6a9aa 100644
--- a/src/mame/machine/apricotkb.h
+++ b/src/mame/machine/apricotkb.h
@@ -6,10 +6,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_APRICOTKB_H
+#define MAME_MACHINE_APRICOTKB_H
-#ifndef __APRICOT_KEYBOARD__
-#define __APRICOT_KEYBOARD__
+#pragma once
@@ -77,8 +77,8 @@ private:
// device type definition
-extern const device_type APRICOT_KEYBOARD;
+DECLARE_DEVICE_TYPE(APRICOT_KEYBOARD, apricot_keyboard_device)
-#endif
+#endif // MAME_MACHINE_APRICOTKB_H
diff --git a/src/mame/machine/asic65.cpp b/src/mame/machine/asic65.cpp
index 2336825677b..47f7331ca02 100644
--- a/src/mame/machine/asic65.cpp
+++ b/src/mame/machine/asic65.cpp
@@ -82,10 +82,10 @@ static const uint8_t command_map[3][MAX_COMMANDS] =
}
};
-const device_type ASIC65 = device_creator<asic65_device>;
+DEFINE_DEVICE_TYPE(ASIC65, asic65_device, "asic65", "Atari ASIC65")
asic65_device::asic65_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ASIC65, "Atari ASIC65", tag, owner, clock, "asic65", __FILE__),
+ : device_t(mconfig, ASIC65, tag, owner, clock),
m_asic65_type(0),
m_command(0),
m_yorigin(0x1800),
diff --git a/src/mame/machine/asic65.h b/src/mame/machine/asic65.h
index 1900528794a..1dd9e32851c 100644
--- a/src/mame/machine/asic65.h
+++ b/src/mame/machine/asic65.h
@@ -5,10 +5,14 @@
* Implementation of ASIC65
*
*************************************/
+#ifndef MAME_MACHINE_ASIC65_H
+#define MAME_MACHINE_ASIC65_H
- #include "cpu/tms32010/tms32010.h"
+#pragma once
- enum {
+#include "cpu/tms32010/tms32010.h"
+
+enum {
ASIC65_STANDARD,
ASIC65_STEELTAL,
ASIC65_GUARDIANS,
@@ -68,8 +72,10 @@ private:
FILE * m_log;
};
-extern const device_type ASIC65;
+DECLARE_DEVICE_TYPE(ASIC65, asic65_device)
#define MCFG_ASIC65_ADD(_tag, _type) \
MCFG_DEVICE_ADD(_tag, ASIC65, 0) \
asic65_device::set_type(*device, _type);
+
+#endif // MAME_MACHINE_ASIC65_H
diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp
index 5dcca6b3177..a4287c23ae6 100644
--- a/src/mame/machine/at.cpp
+++ b/src/mame/machine/at.cpp
@@ -17,10 +17,10 @@
#define LOG_PORT80 0
-const device_type AT_MB = device_creator<at_mb_device>;
+DEFINE_DEVICE_TYPE(AT_MB, at_mb_device, "at_mb", "PC/AT Motherboard")
at_mb_device::at_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, AT_MB, "PC/AT Motherboard", tag, owner, clock, "at_mb", __FILE__),
+ : device_t(mconfig, AT_MB, tag, owner, clock),
m_maincpu(*this, ":maincpu"),
m_isabus(*this, "isabus"),
m_pic8259_slave(*this, "pic8259_slave"),
diff --git a/src/mame/machine/at.h b/src/mame/machine/at.h
index 3eac37f4355..9a0797deaab 100644
--- a/src/mame/machine/at.h
+++ b/src/mame/machine/at.h
@@ -87,7 +87,7 @@ private:
uint8_t m_nmi_enabled;
};
-extern const device_type AT_MB;
+DECLARE_DEVICE_TYPE(AT_MB, at_mb_device)
MACHINE_CONFIG_EXTERN(at_softlists);
diff --git a/src/mame/machine/atari_vg.cpp b/src/mame/machine/atari_vg.cpp
index f9d0a999074..76281f54a23 100644
--- a/src/mame/machine/atari_vg.cpp
+++ b/src/mame/machine/atari_vg.cpp
@@ -35,14 +35,14 @@
// device type definition
-const device_type ATARIVGEAROM = device_creator<atari_vg_earom_device>;
+DEFINE_DEVICE_TYPE(ATARIVGEAROM, atari_vg_earom_device, "atari_vg_earom", "Atari VG EAROM")
//-------------------------------------------------
// atari_vg_earom_device - constructor
//-------------------------------------------------
atari_vg_earom_device::atari_vg_earom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ATARIVGEAROM, "Atari VG EAROM", tag, owner, clock, "atari_vg_earom", __FILE__),
+ : device_t(mconfig, ATARIVGEAROM, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/atari_vg.h b/src/mame/machine/atari_vg.h
index 49515261e4b..cc597a3b8a0 100644
--- a/src/mame/machine/atari_vg.h
+++ b/src/mame/machine/atari_vg.h
@@ -6,8 +6,10 @@
***************************************************************************/
-#ifndef __ATARIVGEAROM_H__
-#define __ATARIVGEAROM_H__
+#ifndef MAME_MACHINE_ATARI_VG_H
+#define MAME_MACHINE_ATARI_VG_H
+
+#pragma once
/***************************************************************************
DEVICE CONFIGURATION MACROS
@@ -27,6 +29,11 @@ class atari_vg_earom_device : public device_t,
public:
// construction/destruction
atari_vg_earom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_READ8_MEMBER( read );
+ DECLARE_WRITE8_MEMBER( write );
+ DECLARE_WRITE8_MEMBER( ctrl_w );
+
protected:
// device-level overrides
virtual void device_start() override;
@@ -36,10 +43,7 @@ protected:
virtual void nvram_default() override;
virtual void nvram_read(emu_file &file) override;
virtual void nvram_write(emu_file &file) override;
-public:
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_WRITE8_MEMBER( ctrl_w );
+
private:
int m_old_ctrl;
int m_state;
@@ -50,6 +54,6 @@ private:
};
// device type definition
-extern const device_type ATARIVGEAROM;
+DECLARE_DEVICE_TYPE(ATARIVGEAROM, atari_vg_earom_device)
-#endif
+#endif // MAME_MACHINE_ATARI_VG_H
diff --git a/src/mame/machine/atarifdc.cpp b/src/mame/machine/atarifdc.cpp
index ef399bb11c8..a965ea9c604 100644
--- a/src/mame/machine/atarifdc.cpp
+++ b/src/mame/machine/atarifdc.cpp
@@ -10,16 +10,17 @@
***************************************************************************/
-#include <ctype.h>
-
#include "emu.h"
-#include "cpu/m6502/m6502.h"
-#include "includes/atari400.h"
#include "atarifdc.h"
-#include "sound/pokey.h"
+
#include "machine/6821pia.h"
+#include "sound/pokey.h"
+
#include "formats/atari_dsk.h"
+#include <ctype.h>
+
+
#define VERBOSE_SERIAL 0
#define VERBOSE_CHKSUM 0
@@ -749,10 +750,10 @@ legacy_floppy_image_device *atari_fdc_device::atari_floppy_get_device_child(int
return nullptr;
}
-const device_type ATARI_FDC = device_creator<atari_fdc_device>;
+DEFINE_DEVICE_TYPE(ATARI_FDC, atari_fdc_device, "atari_fdc", "Atari FDC")
atari_fdc_device::atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ATARI_FDC, "Atari FDC", tag, owner, clock, "atari_fdc", __FILE__),
+ : device_t(mconfig, ATARI_FDC, tag, owner, clock),
m_serout_count(0),
m_serout_offs(0),
m_serout_chksum(0),
diff --git a/src/mame/machine/atarifdc.h b/src/mame/machine/atarifdc.h
index f7d8045e207..e68612b5204 100644
--- a/src/mame/machine/atarifdc.h
+++ b/src/mame/machine/atarifdc.h
@@ -5,8 +5,8 @@
*/
-#ifndef _ATARIFDC_H
-#define _ATARIFDC_H
+#ifndef MAME_MACHINE_ATARIFDC_H
+#define MAME_MACHINE_ATARIFDC_H
#include "imagedev/flopdrv.h"
@@ -64,6 +64,6 @@ private:
atari_drive m_drv[4];
};
-extern const device_type ATARI_FDC;
+DECLARE_DEVICE_TYPE(ATARI_FDC, atari_fdc_device)
-#endif /* _ATARIFDC_H */
+#endif // MAME_MACHINE_ATARIFDC_H
diff --git a/src/mame/machine/atarigen.cpp b/src/mame/machine/atarigen.cpp
index 57f851b131a..3b8aa98bc89 100644
--- a/src/mame/machine/atarigen.cpp
+++ b/src/mame/machine/atarigen.cpp
@@ -49,14 +49,14 @@ inline const atarigen_screen_timer *get_screen_timer(screen_device &screen)
//**************************************************************************
// device type definition
-const device_type ATARI_SOUND_COMM = device_creator<atari_sound_comm_device>;
+DEFINE_DEVICE_TYPE(ATARI_SOUND_COMM, atari_sound_comm_device, "atarscom", "Atari Sound Communications")
//-------------------------------------------------
// atari_sound_comm_device - constructor
//-------------------------------------------------
atari_sound_comm_device::atari_sound_comm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ATARI_SOUND_COMM, "Atari Sound Communications", tag, owner, clock, "atarscom", __FILE__),
+ : device_t(mconfig, ATARI_SOUND_COMM, tag, owner, clock),
m_sound_cpu_tag(nullptr),
m_main_int_cb(*this),
m_sound_cpu(nullptr),
@@ -342,14 +342,14 @@ void atari_sound_comm_device::delayed_6502_write(int data)
//**************************************************************************
// device type definition
-const device_type ATARI_VAD = device_creator<atari_vad_device>;
+DEFINE_DEVICE_TYPE(ATARI_VAD, atari_vad_device, "atarivad", "Atari VAD")
//-------------------------------------------------
// atari_vad_device - constructor
//-------------------------------------------------
atari_vad_device::atari_vad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ATARI_VAD, "Atari VAD", tag, owner, clock, "atarivad", __FILE__),
+ : device_t(mconfig, ATARI_VAD, tag, owner, clock),
device_video_interface(mconfig, *this),
m_scanline_int_cb(*this),
m_alpha_tilemap(*this, "alpha"),
@@ -819,15 +819,15 @@ void atari_vad_device::eof_update(emu_timer &timer)
//**************************************************************************
// device type definition
-const device_type ATARI_EEPROM_2804 = device_creator<atari_eeprom_2804_device>;
-const device_type ATARI_EEPROM_2816 = device_creator<atari_eeprom_2816_device>;
+DEFINE_DEVICE_TYPE(ATARI_EEPROM_2804, atari_eeprom_2804_device, "atari2804", "Atari EEPROM Interface (2804)")
+DEFINE_DEVICE_TYPE(ATARI_EEPROM_2816, atari_eeprom_2816_device, "atari2816", "Atari EEPROM Interface (2816)")
//-------------------------------------------------
// atari_eeprom_device - constructor
//-------------------------------------------------
-atari_eeprom_device::atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file)
- : device_t(mconfig, devtype, name, tag, owner, 0, shortname, file),
+atari_eeprom_device::atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner)
+ : device_t(mconfig, devtype, tag, owner, 0),
m_eeprom(*this, "eeprom"),
m_unlocked(false)
{
@@ -894,7 +894,7 @@ void atari_eeprom_device::device_reset()
//-------------------------------------------------
atari_eeprom_2804_device::atari_eeprom_2804_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : atari_eeprom_device(mconfig, ATARI_EEPROM_2804, "Atari EEPROM Interface (2804)", tag, owner, "atari2804", __FILE__)
+ : atari_eeprom_device(mconfig, ATARI_EEPROM_2804, tag, owner)
{
}
@@ -919,7 +919,7 @@ machine_config_constructor atari_eeprom_2804_device::device_mconfig_additions()
//-------------------------------------------------
atari_eeprom_2816_device::atari_eeprom_2816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : atari_eeprom_device(mconfig, ATARI_EEPROM_2816, "Atari EEPROM Interface (2816)", tag, owner, "atari2816", __FILE__)
+ : atari_eeprom_device(mconfig, ATARI_EEPROM_2816, tag, owner)
{
}
diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h
index bcede09ed34..95d29226874 100644
--- a/src/mame/machine/atarigen.h
+++ b/src/mame/machine/atarigen.h
@@ -103,9 +103,9 @@
// ======================> atari_sound_comm_device
// device type definition
-extern const device_type ATARI_SOUND_COMM;
+DECLARE_DEVICE_TYPE(ATARI_SOUND_COMM, atari_sound_comm_device)
-class atari_sound_comm_device : public device_t
+class atari_sound_comm_device : public device_t
{
public:
// construction/destruction
@@ -175,7 +175,7 @@ private:
// ======================> atari_vad_device
// device type definition
-extern const device_type ATARI_VAD;
+DECLARE_DEVICE_TYPE(ATARI_VAD, atari_vad_device)
class atari_vad_device : public device_t,
public device_video_interface
@@ -256,14 +256,14 @@ private:
// ======================> atari_eeprom_device
// device type definition
-extern const device_type ATARI_EEPROM_2804;
-extern const device_type ATARI_EEPROM_2816;
+DECLARE_DEVICE_TYPE(ATARI_EEPROM_2804, atari_eeprom_2804_device)
+DECLARE_DEVICE_TYPE(ATARI_EEPROM_2816, atari_eeprom_2816_device)
class atari_eeprom_device : public device_t
{
protected:
// construction/destruction
- atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file);
+ atari_eeprom_device(const machine_config &mconfig, device_type devtype, const char *tag, device_t *owner);
public:
// unlock controls
diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp
index 6608463b266..d3858fcce86 100644
--- a/src/mame/machine/atarixga.cpp
+++ b/src/mame/machine/atarixga.cpp
@@ -63,10 +63,10 @@ static uint16_t parity(uint16_t x)
*
*************************************/
-const device_type ATARI_136094_0072 = device_creator<atari_136094_0072_device>;
+DEFINE_DEVICE_TYPE(ATARI_136094_0072, atari_136094_0072_device, "136094_0072", "Atari 136094-0072 XGA")
atari_136094_0072_device::atari_136094_0072_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-: atari_xga_device(mconfig, ATARI_136094_0072, tag, owner, clock, "Atari 136094-0072 XGA", "136094_0072")
+ : atari_xga_device(mconfig, ATARI_136094_0072, tag, owner, clock)
{
}
@@ -283,10 +283,10 @@ READ32_MEMBER(atari_136094_0072_device::read)
*
*************************************/
-const device_type ATARI_136095_0072 = device_creator<atari_136095_0072_device>;
+DEFINE_DEVICE_TYPE(ATARI_136095_0072, atari_136095_0072_device, "136095_0072", "Atari 136095-0072 XGA")
atari_136095_0072_device::atari_136095_0072_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-: atari_xga_device(mconfig, ATARI_136095_0072, tag, owner, clock, "Atari 136095-0072 XGA", "136095_0072")
+ : atari_xga_device(mconfig, ATARI_136095_0072, tag, owner, clock)
{
}
diff --git a/src/mame/machine/atarixga.h b/src/mame/machine/atarixga.h
index 5204caa5e94..6f1ab1c52ad 100644
--- a/src/mame/machine/atarixga.h
+++ b/src/mame/machine/atarixga.h
@@ -8,25 +8,25 @@
*************************************************************************/
-#ifndef __MACHINE_ATARIXGA__
-#define __MACHINE_ATARIXGA__
+#ifndef MAME_MACHINE_ATARIXGA_H
+#define MAME_MACHINE_ATARIXGA_H
-extern const device_type ATARI_136094_0072;
-extern const device_type ATARI_136095_0072;
+DECLARE_DEVICE_TYPE(ATARI_136094_0072, atari_136094_0072_device)
+DECLARE_DEVICE_TYPE(ATARI_136095_0072, atari_136095_0072_device)
class atari_xga_device : public device_t
{
public:
- // construction/destruction
- atari_xga_device(const machine_config &mconfig, device_type type, const char *tag,
- device_t *owner, uint32_t clock, const char *name, const char *shortname)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
- {}
-
virtual DECLARE_WRITE32_MEMBER(write) = 0;
virtual DECLARE_READ32_MEMBER(read) = 0;
protected:
+ // construction/destruction
+ atari_xga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ {
+ }
+
virtual void device_start() override = 0;
virtual void device_reset() override = 0;
@@ -108,4 +108,4 @@ private:
};
-#endif
+#endif // MAME_MACHINE_ATARIXGA_H
diff --git a/src/mame/machine/awboard.cpp b/src/mame/machine/awboard.cpp
index dcccc77efc1..226bd72b0bc 100644
--- a/src/mame/machine/awboard.cpp
+++ b/src/mame/machine/awboard.cpp
@@ -153,7 +153,7 @@ ROM board internal layouts:
*/
-const device_type AW_ROM_BOARD = device_creator<aw_rom_board>;
+DEFINE_DEVICE_TYPE(AW_ROM_BOARD, aw_rom_board, "aw_rom_board", "Sammy Atomiswave ROM Board")
DEVICE_ADDRESS_MAP_START(submap, 16, aw_rom_board)
AM_RANGE(0x00, 0x01) AM_WRITE(epr_offsetl_w)
@@ -166,7 +166,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, aw_rom_board)
ADDRESS_MAP_END
aw_rom_board::aw_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : naomi_g1_device(mconfig, AW_ROM_BOARD, "Sammy Atomiswave ROM Board", tag, owner, clock, "aw_rom_board", __FILE__)
+ : naomi_g1_device(mconfig, AW_ROM_BOARD, tag, owner, clock)
, m_region(*this, DEVICE_SELF)
, m_keyregion(*this, finder_base::DUMMY_TAG)
{
diff --git a/src/mame/machine/awboard.h b/src/mame/machine/awboard.h
index 9f47c20b4b1..c2c8afcdd7e 100644
--- a/src/mame/machine/awboard.h
+++ b/src/mame/machine/awboard.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert,Andreas Naive
-#ifndef _AWBOARD_H_
-#define _AWBOARD_H_
+#ifndef MAME_MACHINE_AWBOARD_H
+#define MAME_MACHINE_AWBOARD_H
+
+#pragma once
#include "naomig1.h"
@@ -63,6 +65,6 @@ private:
void recalc_dma_offset(int mode);
};
-extern const device_type AW_ROM_BOARD;
+DECLARE_DEVICE_TYPE(AW_ROM_BOARD, aw_rom_board)
-#endif
+#endif // MAME_MACHINE_AWBOARD_H
diff --git a/src/mame/machine/b2m.cpp b/src/mame/machine/b2m.cpp
index e771ffa3529..1948c3bd53a 100644
--- a/src/mame/machine/b2m.cpp
+++ b/src/mame/machine/b2m.cpp
@@ -269,9 +269,6 @@ void b2m_state::b2m_postload()
void b2m_state::machine_start()
{
- m_pic = machine().device<pic8259_device>("pic8259");
- m_fdc = machine().device<fd1793_t>("fd1793");
-
/* register for state saving */
save_item(NAME(m_b2m_8255_porta));
save_item(NAME(m_b2m_video_scroll));
diff --git a/src/mame/machine/balsente.cpp b/src/mame/machine/balsente.cpp
index 3390a42fbe4..b6a81536e08 100644
--- a/src/mame/machine/balsente.cpp
+++ b/src/mame/machine/balsente.cpp
@@ -209,7 +209,7 @@ void balsente_state::poly17_init()
inline void balsente_state::noise_gen_chip(int chip, int count, short *buffer)
{
/* noise generator runs at 100kHz */
- uint32_t step = (100000 << 14) / CEM3394_SAMPLE_RATE;
+ uint32_t step = (100000 << 14) / cem3394_device::SAMPLE_RATE;
uint32_t noise_counter = m_noise_position[chip];
while (count--)
@@ -895,17 +895,17 @@ void balsente_state::update_counter_0_timer()
/* find the counter with the maximum frequency */
/* this is used to calibrate the timers at startup */
for (i = 0; i < 6; i++)
- if (m_cem_device[i]->get_parameter(CEM3394_FINAL_GAIN) < 10.0)
+ if (m_cem_device[i]->get_parameter(cem3394_device::FINAL_GAIN) < 10.0)
{
double tempfreq;
/* if the filter resonance is high, then they're calibrating the filter frequency */
- if (m_cem_device[i]->get_parameter(CEM3394_FILTER_RESONANCE) > 0.9)
- tempfreq = m_cem_device[i]->get_parameter(CEM3394_FILTER_FREQENCY);
+ if (m_cem_device[i]->get_parameter(cem3394_device::FILTER_RESONANCE) > 0.9)
+ tempfreq = m_cem_device[i]->get_parameter(cem3394_device::FILTER_FREQENCY);
/* otherwise, they're calibrating the VCO frequency */
else
- tempfreq = m_cem_device[i]->get_parameter(CEM3394_VCO_FREQUENCY);
+ tempfreq = m_cem_device[i]->get_parameter(cem3394_device::VCO_FREQUENCY);
if (tempfreq > maxfreq) maxfreq = tempfreq;
}
@@ -987,16 +987,16 @@ WRITE8_MEMBER(balsente_state::balsente_counter_control_w)
WRITE8_MEMBER(balsente_state::balsente_chip_select_w)
{
- static const uint8_t register_map[8] =
+ static constexpr uint8_t register_map[8] =
{
- CEM3394_VCO_FREQUENCY,
- CEM3394_FINAL_GAIN,
- CEM3394_FILTER_RESONANCE,
- CEM3394_FILTER_FREQENCY,
- CEM3394_MIXER_BALANCE,
- CEM3394_MODULATION_AMOUNT,
- CEM3394_PULSE_WIDTH,
- CEM3394_WAVE_SELECT
+ cem3394_device::VCO_FREQUENCY,
+ cem3394_device::FINAL_GAIN,
+ cem3394_device::FILTER_RESONANCE,
+ cem3394_device::FILTER_FREQENCY,
+ cem3394_device::MIXER_BALANCE,
+ cem3394_device::MODULATION_AMOUNT,
+ cem3394_device::PULSE_WIDTH,
+ cem3394_device::WAVE_SELECT
};
double voltage = (double)m_dac_value * (8.0 / 4096.0) - 4.0;
diff --git a/src/mame/machine/bebox.cpp b/src/mame/machine/bebox.cpp
index 49856bdbb9c..4838fe68107 100644
--- a/src/mame/machine/bebox.cpp
+++ b/src/mame/machine/bebox.cpp
@@ -623,28 +623,28 @@ READ64_MEMBER(bebox_state::scsi53c810_r )
int reg = offset*8;
uint64_t r = 0;
if (!ACCESSING_BITS_56_63) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+0) << 56;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+0) << 56;
}
if (!ACCESSING_BITS_48_55) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+1) << 48;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+1) << 48;
}
if (!ACCESSING_BITS_40_47) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+2) << 40;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+2) << 40;
}
if (!ACCESSING_BITS_32_39) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+3) << 32;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+3) << 32;
}
if (!ACCESSING_BITS_24_31) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+4) << 24;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+4) << 24;
}
if (!ACCESSING_BITS_16_23) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+5) << 16;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+5) << 16;
}
if (!ACCESSING_BITS_8_15) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+6) << 8;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+6) << 8;
}
if (!ACCESSING_BITS_0_7) {
- r |= (uint64_t)m_lsi53c810->lsi53c810_reg_r(reg+7) << 0;
+ r |= (uint64_t)m_lsi53c810->reg_r(reg+7) << 0;
}
return r;
@@ -655,28 +655,28 @@ WRITE64_MEMBER(bebox_state::scsi53c810_w )
{
int reg = offset*8;
if (!ACCESSING_BITS_56_63) {
- m_lsi53c810->lsi53c810_reg_w(reg+0, data >> 56);
+ m_lsi53c810->reg_w(reg+0, data >> 56);
}
if (!ACCESSING_BITS_48_55) {
- m_lsi53c810->lsi53c810_reg_w(reg+1, data >> 48);
+ m_lsi53c810->reg_w(reg+1, data >> 48);
}
if (!ACCESSING_BITS_40_47) {
- m_lsi53c810->lsi53c810_reg_w(reg+2, data >> 40);
+ m_lsi53c810->reg_w(reg+2, data >> 40);
}
if (!ACCESSING_BITS_32_39) {
- m_lsi53c810->lsi53c810_reg_w(reg+3, data >> 32);
+ m_lsi53c810->reg_w(reg+3, data >> 32);
}
if (!ACCESSING_BITS_24_31) {
- m_lsi53c810->lsi53c810_reg_w(reg+4, data >> 24);
+ m_lsi53c810->reg_w(reg+4, data >> 24);
}
if (!ACCESSING_BITS_16_23) {
- m_lsi53c810->lsi53c810_reg_w(reg+5, data >> 16);
+ m_lsi53c810->reg_w(reg+5, data >> 16);
}
if (!ACCESSING_BITS_8_15) {
- m_lsi53c810->lsi53c810_reg_w(reg+6, data >> 8);
+ m_lsi53c810->reg_w(reg+6, data >> 8);
}
if (!ACCESSING_BITS_0_7) {
- m_lsi53c810->lsi53c810_reg_w(reg+7, data >> 0);
+ m_lsi53c810->reg_w(reg+7, data >> 0);
}
}
diff --git a/src/mame/machine/beta.cpp b/src/mame/machine/beta.cpp
index 83d01f23f19..693e4c29488 100644
--- a/src/mame/machine/beta.cpp
+++ b/src/mame/machine/beta.cpp
@@ -15,19 +15,20 @@ BUGS:
*/
#include "emu.h"
-#include "formats/trd_dsk.h"
#include "machine/beta.h"
+#include "formats/trd_dsk.h"
+
/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/
-const device_type BETA_DISK = device_creator<beta_disk_device>;
+DEFINE_DEVICE_TYPE(BETA_DISK, beta_disk_device, "betadisk", "Beta Disk Interface")
beta_disk_device::beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, BETA_DISK, "Beta Disk Interface", tag, owner, clock, "betadisk", __FILE__)
+ : device_t(mconfig, BETA_DISK, tag, owner, clock)
, m_betadisk_active(0)
, m_wd179x(*this, "wd179x")
, m_floppy0(*this, "wd179x:0")
diff --git a/src/mame/machine/beta.h b/src/mame/machine/beta.h
index c1ffa85db4d..a8505977cf1 100644
--- a/src/mame/machine/beta.h
+++ b/src/mame/machine/beta.h
@@ -9,8 +9,10 @@
04/05/2008 Created by Miodrag Milanovic
*********************************************************************/
-#ifndef __BETA_H__
-#define __BETA_H__
+#ifndef MAME_MACHINE_BETA_H
+#define MAME_MACHINE_BETA_H
+
+#pragma once
#include "machine/wd_fdc.h"
@@ -21,7 +23,6 @@ class beta_disk_device : public device_t
{
public:
beta_disk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~beta_disk_device() {}
DECLARE_READ8_MEMBER(status_r);
DECLARE_READ8_MEMBER(track_r);
@@ -40,8 +41,6 @@ public:
void enable();
void disable();
- uint8_t m_betadisk_active;
-
protected:
// device-level overrides
virtual void device_start() override;
@@ -50,14 +49,16 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
private:
- required_device<kr1818vg93_t> m_wd179x;
+ uint8_t m_betadisk_active;
+
+ required_device<kr1818vg93_device> m_wd179x;
required_device<floppy_connector> m_floppy0;
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
required_device<floppy_connector> m_floppy3;
};
-extern const device_type BETA_DISK;
+DECLARE_DEVICE_TYPE(BETA_DISK, beta_disk_device)
#define MCFG_BETA_DISK_ADD(_tag) \
@@ -66,4 +67,4 @@ extern const device_type BETA_DISK;
#define MCFG_BETA_DISK_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-#endif /* __BETA_H__ */
+#endif // MAME_MACHINE_BETA_H
diff --git a/src/mame/machine/bfm_bd1.cpp b/src/mame/machine/bfm_bd1.cpp
index e16118c9424..affed8679d3 100644
--- a/src/mame/machine/bfm_bd1.cpp
+++ b/src/mame/machine/bfm_bd1.cpp
@@ -11,7 +11,7 @@
#include "emu.h"
#include "bfm_bd1.h"
-const device_type BFM_BD1 = device_creator<bfm_bd1_t>;
+DEFINE_DEVICE_TYPE(BFM_BD1, bfm_bd1_device, "bfm_bd1", "BFM BD1 VFD controller")
/*
@@ -101,19 +101,19 @@ static const uint16_t BD1charset[]=
0x4406, // 0100 0100 0000 0110 ?
};
-bfm_bd1_t::bfm_bd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, BFM_BD1, "BFM BD1 VFD controller", tag, owner, clock, "bfm_bd1", __FILE__),
+bfm_bd1_device::bfm_bd1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, BFM_BD1, tag, owner, clock),
m_port_val(0)
{
}
-void bfm_bd1_t::static_set_value(device_t &device, int val)
+void bfm_bd1_device::static_set_value(device_t &device, int val)
{
- bfm_bd1_t &bd1 = downcast<bfm_bd1_t &>(device);
+ bfm_bd1_device &bd1 = downcast<bfm_bd1_device &>(device);
bd1.m_port_val = val;
}
-void bfm_bd1_t::device_start()
+void bfm_bd1_device::device_start()
{
save_item(NAME(m_cursor));
save_item(NAME(m_cursor_pos));
@@ -138,7 +138,7 @@ void bfm_bd1_t::device_start()
device_reset();
}
-void bfm_bd1_t::device_reset()
+void bfm_bd1_device::device_reset()
{
m_cursor = 0;
m_cursor_pos = 0;
@@ -162,17 +162,17 @@ void bfm_bd1_t::device_reset()
memset(m_attrs, 0, sizeof(m_attrs));
}
-uint16_t bfm_bd1_t::set_display(uint16_t segin)
+uint16_t bfm_bd1_device::set_display(uint16_t segin)
{
return BITSWAP16(segin,8,12,11,7,6,4,10,3,14,15,0,13,9,5,1,2);
}
-void bfm_bd1_t::device_post_load()
+void bfm_bd1_device::device_post_load()
{
update_display();
}
-void bfm_bd1_t::update_display()
+void bfm_bd1_device::update_display()
{
for (int i =0; i<16; i++)
{
@@ -188,7 +188,7 @@ void bfm_bd1_t::update_display()
}
}
///////////////////////////////////////////////////////////////////////////
-void bfm_bd1_t::blank(int data)
+void bfm_bd1_device::blank(int data)
{
switch ( data & 0x03 )
{
@@ -241,7 +241,7 @@ void bfm_bd1_t::blank(int data)
}
}
-int bfm_bd1_t::write_char(int data)
+int bfm_bd1_device::write_char(int data)
{
int change = 0;
if ( m_user_def )
@@ -374,7 +374,7 @@ int bfm_bd1_t::write_char(int data)
}
///////////////////////////////////////////////////////////////////////////
-void bfm_bd1_t::setdata(int segdata, int data)
+void bfm_bd1_device::setdata(int segdata, int data)
{
int move = 0;
int change =0;
@@ -538,7 +538,7 @@ void bfm_bd1_t::setdata(int segdata, int data)
}
}
-void bfm_bd1_t::shift_clock(int state)
+void bfm_bd1_device::shift_clock(int state)
{
if (m_sclk != state)
{
@@ -561,10 +561,10 @@ void bfm_bd1_t::shift_clock(int state)
m_sclk = state;
}
-WRITE_LINE_MEMBER( bfm_bd1_t::sclk ) { shift_clock(state); }
-WRITE_LINE_MEMBER( bfm_bd1_t::data ) { m_data = state; }
+WRITE_LINE_MEMBER( bfm_bd1_device::sclk ) { shift_clock(state); }
+WRITE_LINE_MEMBER( bfm_bd1_device::data ) { m_data = state; }
-WRITE_LINE_MEMBER( bfm_bd1_t::por )
+WRITE_LINE_MEMBER( bfm_bd1_device::por )
{
if (!state)
{
diff --git a/src/mame/machine/bfm_bd1.h b/src/mame/machine/bfm_bd1.h
index 02026b586b1..f1a825dcf9d 100644
--- a/src/mame/machine/bfm_bd1.h
+++ b/src/mame/machine/bfm_bd1.h
@@ -1,21 +1,23 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_BFM_BD1_H
+#define MAME_MACHINE_BFM_BD1_H
+
#pragma once
-#ifndef BFM_BD1_H
-#define BFM_BD1_H
+
#define MCFG_BFMBD1_ADD(_tag,_val) \
MCFG_DEVICE_ADD(_tag, BFM_BD1,60)\
MCFG_BD1_PORT(_val)
#define MCFG_BD1_PORT(_val) \
- bfm_bd1_t::static_set_value(*device, _val);
+ bfm_bd1_device::static_set_value(*device, _val);
#define MCFG_BFMBD1_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-class bfm_bd1_t : public device_t
+class bfm_bd1_device : public device_t
{
public:
- bfm_bd1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bfm_bd1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration helpers
static void static_set_value(device_t &device, int val);
@@ -65,5 +67,6 @@ protected:
};
-extern const device_type BFM_BD1;
-#endif
+DECLARE_DEVICE_TYPE(BFM_BD1, bfm_bd1_device)
+
+#endif // MAME_MACHINE_BFM_BD1_H
diff --git a/src/mame/machine/bfm_bda.cpp b/src/mame/machine/bfm_bda.cpp
index 9d32eb883cd..fc345c94215 100644
--- a/src/mame/machine/bfm_bda.cpp
+++ b/src/mame/machine/bfm_bda.cpp
@@ -10,7 +10,7 @@
#include "emu.h"
#include "bfm_bda.h"
-const device_type BFM_BDA = device_creator<bfm_bda_t>;
+DEFINE_DEVICE_TYPE(BFM_BDA, bfm_bda_device, "bfm_bda", "BFM BDA VFD controller")
//I currently use the BDA character set, until a suitable image can be programmed
@@ -83,19 +83,19 @@ static const uint16_t BDAcharset[]=
0x4406, // 0100 0100 0000 0110 ?
};
-bfm_bda_t::bfm_bda_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, BFM_BDA, "BFM BDA VFD controller", tag, owner, clock, "bfm_bda", __FILE__),
+bfm_bda_device::bfm_bda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, BFM_BDA, tag, owner, clock),
m_port_val(0)
{
}
-void bfm_bda_t::static_set_value(device_t &device, int val)
+void bfm_bda_device::static_set_value(device_t &device, int val)
{
- bfm_bda_t &BDA = downcast<bfm_bda_t &>(device);
+ bfm_bda_device &BDA = downcast<bfm_bda_device &>(device);
BDA.m_port_val = val;
}
-void bfm_bda_t::device_start()
+void bfm_bda_device::device_start()
{
save_item(NAME(m_cursor));
save_item(NAME(m_cursor_pos));
@@ -120,7 +120,7 @@ void bfm_bda_t::device_start()
device_reset();
}
-void bfm_bda_t::device_reset()
+void bfm_bda_device::device_reset()
{
m_cursor = 0;
m_cursor_pos = 0;
@@ -144,12 +144,12 @@ void bfm_bda_t::device_reset()
memset(m_attrs, 0, sizeof(m_attrs));
}
-uint16_t bfm_bda_t::set_display(uint16_t segin)
+uint16_t bfm_bda_device::set_display(uint16_t segin)
{
return BITSWAP16(segin,8,12,11,7,6,4,10,3,14,15,0,13,9,5,1,2);
}
-void bfm_bda_t::device_post_load()
+void bfm_bda_device::device_post_load()
{
for (int i =0; i<16; i++)
{
@@ -157,7 +157,7 @@ void bfm_bda_t::device_post_load()
}
}
-void bfm_bda_t::update_display()
+void bfm_bda_device::update_display()
{
for (int i =0; i<16; i++)
{
@@ -173,7 +173,7 @@ void bfm_bda_t::update_display()
}
}
///////////////////////////////////////////////////////////////////////////
-void bfm_bda_t::blank(int data)
+void bfm_bda_device::blank(int data)
{
switch ( data & 0x03 ) // TODO: wrong case values???
{
@@ -226,7 +226,7 @@ void bfm_bda_t::blank(int data)
}
}
-int bfm_bda_t::write_char(int data)
+int bfm_bda_device::write_char(int data)
{
int change = 0;
if ( m_user_def )
@@ -381,7 +381,7 @@ int bfm_bda_t::write_char(int data)
}
///////////////////////////////////////////////////////////////////////////
-void bfm_bda_t::setdata(int segdata, int data)
+void bfm_bda_device::setdata(int segdata, int data)
{
int move = 0;
int change =0;
@@ -545,7 +545,7 @@ void bfm_bda_t::setdata(int segdata, int data)
}
}
-void bfm_bda_t::shift_data(int data)
+void bfm_bda_device::shift_data(int data)
{
m_shift_data <<= 1;
diff --git a/src/mame/machine/bfm_bda.h b/src/mame/machine/bfm_bda.h
index 1e5c8a664cd..04a9f058a3d 100644
--- a/src/mame/machine/bfm_bda.h
+++ b/src/mame/machine/bfm_bda.h
@@ -1,21 +1,23 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_BFM_BDA_H
+#define MAME_MACHINE_BFM_BDA_H
+
#pragma once
-#ifndef BFM_BDA_H
-#define BFM_BDA_H
+
#define MCFG_BFMBDA_ADD(_tag,_val) \
MCFG_DEVICE_ADD(_tag, BFM_BDA,60)\
MCFG_BDA_PORT(_val)
#define MCFG_BDA_PORT(_val) \
- bfm_bda_t::static_set_value(*device, _val);
+ bfm_bda_device::static_set_value(*device, _val);
#define MCFG_BFMBDA_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-class bfm_bda_t : public device_t
+class bfm_bda_device : public device_t
{
public:
- bfm_bda_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bfm_bda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration helpers
static void static_set_value(device_t &device, int val);
@@ -61,5 +63,6 @@ protected:
};
-extern const device_type BFM_BDA;
-#endif
+DECLARE_DEVICE_TYPE(BFM_BDA, bfm_bda_device)
+
+#endif // MAME_MACHINE_BFM_BDA_H
diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp
index 36e8b5e3305..ccb493c583a 100644
--- a/src/mame/machine/c117.cpp
+++ b/src/mame/machine/c117.cpp
@@ -31,7 +31,7 @@ static MACHINE_CONFIG_FRAGMENT( namco_c117 )
MACHINE_CONFIG_END
-const device_type NAMCO_C117 = device_creator<namco_c117_device>;
+DEFINE_DEVICE_TYPE(NAMCO_C117, namco_c117_device, "namco_c117", "Namco C117 MMU")
//-------------------------------------------------
@@ -39,7 +39,7 @@ const device_type NAMCO_C117 = device_creator<namco_c117_device>;
//-------------------------------------------------
namco_c117_device::namco_c117_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_C117, "Namco C117 MMU", tag, owner, clock, "namco_c117", __FILE__),
+ : device_t(mconfig, NAMCO_C117, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_subres_cb(*this),
m_program_config("program", ENDIANNESS_BIG, 8, 23),
diff --git a/src/mame/machine/c117.h b/src/mame/machine/c117.h
index 1ff70089072..4586332a56e 100644
--- a/src/mame/machine/c117.h
+++ b/src/mame/machine/c117.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Alex W. Jackson
+#ifndef MAME_MACHINE_C117_H
+#define MAME_MACHINE_C117_H
#pragma once
-#ifndef __C117_H__
-#define __C117_H__
#include "machine/watchdog.h"
@@ -84,6 +84,6 @@ private:
};
// device type definition
-extern const device_type NAMCO_C117;
+DECLARE_DEVICE_TYPE(NAMCO_C117, namco_c117_device)
-#endif
+#endif // MAME_MACHINE_C117_H
diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp
index 65c2a12e4f1..262b6b5ad45 100644
--- a/src/mame/machine/cammu.cpp
+++ b/src/mame/machine/cammu.cpp
@@ -39,21 +39,27 @@ DEVICE_ADDRESS_MAP_START(map, 32, cammu_c3_device)
AM_RANGE(0x000, 0xfff) AM_READWRITE(cammu_r, cammu_w)
ADDRESS_MAP_END
-const device_type CAMMU_C4T = device_creator<cammu_c4t_device>;
-const device_type CAMMU_C4I = device_creator<cammu_c4i_device>;
-const device_type CAMMU_C3 = device_creator<cammu_c3_device>;
+DEFINE_DEVICE_TYPE(CAMMU_C4T, cammu_c4t_device, "c4t", "C4E/C4T CAMMU")
+DEFINE_DEVICE_TYPE(CAMMU_C4I, cammu_c4i_device, "c4i", "C4I CAMMU")
+DEFINE_DEVICE_TYPE(CAMMU_C3, cammu_c3_device, "c3", "C1/C3 CAMMU")
cammu_c4t_device::cammu_c4t_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cammu_device(mconfig, CAMMU_C4T, "C4E/C4T CAMMU", tag, owner, clock, "c4t", __FILE__) { }
+ : cammu_device(mconfig, CAMMU_C4T, tag, owner, clock)
+{
+}
cammu_c4i_device::cammu_c4i_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cammu_device(mconfig, CAMMU_C4I, "C4I CAMMU", tag, owner, clock, "c4i", __FILE__) { }
+ : cammu_device(mconfig, CAMMU_C4I, tag, owner, clock)
+{
+}
cammu_c3_device::cammu_c3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : cammu_device(mconfig, CAMMU_C3, "C1/C3 CAMMU", tag, owner, clock, "c3", __FILE__) { }
+ : cammu_device(mconfig, CAMMU_C3, tag, owner, clock)
+{
+}
-cammu_device::cammu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+cammu_device::cammu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_memory_interface(mconfig, *this),
m_main_space_config("main", ENDIANNESS_LITTLE, 32, 32, 0),
m_io_space_config("io", ENDIANNESS_LITTLE, 32, 32, 0),
diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h
index 15d0d7a4c66..23265109486 100644
--- a/src/mame/machine/cammu.h
+++ b/src/mame/machine/cammu.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#pragma once
+#ifndef MAME_MACHINE_CAMMU_H
+#define MAME_MACHINE_CAMMU_H
-#ifndef CAMMU_H_
-#define CAMMU_H_
+#pragma once
// the following enables a very crude instruction cache - it has known (future)
@@ -18,9 +18,7 @@
class cammu_device : public device_t, public device_memory_interface
{
public:
- cammu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
- template<class _Object> static devcb_base &static_set_ssw_callback(device_t &device, _Object object) { return downcast<cammu_device &>(device).m_ssw_func.set_callback(object); }
+ template <class Object> static devcb_base &static_set_ssw_callback(device_t &device, Object &&cb) { return downcast<cammu_device &>(device).m_ssw_func.set_callback(std::forward<Object>(cb)); }
virtual DECLARE_ADDRESS_MAP(map, 32) = 0;
@@ -31,6 +29,8 @@ public:
DECLARE_WRITE32_MEMBER(cammu_w) { m_cammu[offset] = data; }
protected:
+ cammu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -83,8 +83,8 @@ public:
};
// device type definitions
-extern const device_type CAMMU_C4T;
-extern const device_type CAMMU_C4I;
-extern const device_type CAMMU_C3;
+DECLARE_DEVICE_TYPE(CAMMU_C4T, cammu_c4t_device)
+DECLARE_DEVICE_TYPE(CAMMU_C4I, cammu_c4i_device)
+DECLARE_DEVICE_TYPE(CAMMU_C3, cammu_c3_device)
-#endif
+#endif // MAME_MACHINE_CAMMU_H
diff --git a/src/mame/machine/cat702.cpp b/src/mame/machine/cat702.cpp
index 7a3dc1f0e52..1daafb75fa5 100644
--- a/src/mame/machine/cat702.cpp
+++ b/src/mame/machine/cat702.cpp
@@ -87,10 +87,10 @@
#include "emu.h"
#include "cat702.h"
-const device_type CAT702 = device_creator<cat702_device>;
+DEFINE_DEVICE_TYPE(CAT702, cat702_device, "cat702", "CAT702")
cat702_device::cat702_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, CAT702, "CAT702", tag, owner, clock, "cat702", __FILE__),
+ device_t(mconfig, CAT702, tag, owner, clock),
m_region(*this, DEVICE_SELF),
m_dataout_handler(*this)
{
diff --git a/src/mame/machine/cat702.h b/src/mame/machine/cat702.h
index e6c63dea541..550da70f991 100644
--- a/src/mame/machine/cat702.h
+++ b/src/mame/machine/cat702.h
@@ -2,13 +2,13 @@
// copyright-holders:smf
/* CAT702 security chip */
-#pragma once
+#ifndef MAME_MACHINE_CAT702_H
+#define MAME_MACHINE_CAT702_H
-#ifndef __CAT702_H__
-#define __CAT702_H__
+#pragma once
-extern const device_type CAT702;
+DECLARE_DEVICE_TYPE(CAT702, cat702_device)
#define MCFG_CAT702_DATAOUT_HANDLER(_devcb) \
devcb = &cat702_device::set_dataout_handler(*device, DEVCB_##_devcb);
@@ -19,7 +19,7 @@ public:
cat702_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- template<class _Object> static devcb_base &set_dataout_handler(device_t &device, _Object object) { return downcast<cat702_device &>(device).m_dataout_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_dataout_handler(device_t &device, Object &&cb) { return downcast<cat702_device &>(device).m_dataout_handler.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER(write_select);
DECLARE_WRITE_LINE_MEMBER(write_datain);
@@ -45,4 +45,4 @@ private:
devcb_write_line m_dataout_handler;
};
-#endif
+#endif // MAME_MACHINE_CAT702_H
diff --git a/src/mame/machine/cdi070.cpp b/src/mame/machine/cdi070.cpp
index c3ba4d00891..c7baa63b3b0 100644
--- a/src/mame/machine/cdi070.cpp
+++ b/src/mame/machine/cdi070.cpp
@@ -22,12 +22,13 @@ TODO:
*******************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "machine/cdi070.h"
#include "includes/cdi.h"
+#include "cpu/m68000/m68000.h"
+
// device type definition
-const device_type MACHINE_CDI68070 = device_creator<cdi68070_device>;
+DEFINE_DEVICE_TYPE(MACHINE_CDI68070, cdi68070_device, "cdi68070", "CDI68070")
#if ENABLE_VERBOSE_LOG
static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...)
@@ -55,7 +56,7 @@ static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, co
//-------------------------------------------------
cdi68070_device::cdi68070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MACHINE_CDI68070, "CDI68070", tag, owner, clock, "cdi68070", __FILE__)
+ : device_t(mconfig, MACHINE_CDI68070, tag, owner, clock)
{
}
diff --git a/src/mame/machine/cdi070.h b/src/mame/machine/cdi070.h
index 478297d27b6..0f1df7f7bad 100644
--- a/src/mame/machine/cdi070.h
+++ b/src/mame/machine/cdi070.h
@@ -21,8 +21,10 @@ TODO:
*******************************************************************************/
-#ifndef _MACHINE_CDI68070_H_
-#define _MACHINE_CDI68070_H_
+#ifndef MAME_MACHINE_CDI070_H
+#define MAME_MACHINE_CDI070_H
+
+#pragma once
#define ISR_MST 0x80 // Master
@@ -297,6 +299,6 @@ private:
};
// device type definition
-extern const device_type MACHINE_CDI68070;
+DECLARE_DEVICE_TYPE(MACHINE_CDI68070, cdi68070_device)
-#endif // _MACHINE_CDI68070_H_
+#endif // MAME_MACHINE_CDI070_H
diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp
index 022fd1313c3..c04602721d4 100644
--- a/src/mame/machine/cdicdic.cpp
+++ b/src/mame/machine/cdicdic.cpp
@@ -22,15 +22,17 @@ TODO:
*******************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "cdrom.h"
#include "machine/cdicdic.h"
#include "includes/cdi.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cdrom.h"
#include "sound/cdda.h"
#include "imagedev/chd_cd.h"
+
// device type definition
-const device_type MACHINE_CDICDIC = device_creator<cdicdic_device>;
+DEFINE_DEVICE_TYPE(MACHINE_CDICDIC, cdicdic_device, "cdicdic", "CDICDIC")
#if ENABLE_VERBOSE_LOG
static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...)
@@ -1162,7 +1164,7 @@ WRITE16_MEMBER( cdicdic_device::regs_w )
//-------------------------------------------------
cdicdic_device::cdicdic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MACHINE_CDICDIC, "CDICDIC", tag, owner, clock, "cdicdic", __FILE__)
+ : device_t(mconfig, MACHINE_CDICDIC, tag, owner, clock)
{
}
diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h
index 881f6ab16da..e275ed5739b 100644
--- a/src/mame/machine/cdicdic.h
+++ b/src/mame/machine/cdicdic.h
@@ -21,10 +21,10 @@ TODO:
*******************************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_CDICDIC_H
+#define MAME_MACHINE_CDICDIC_H
-#ifndef __CDICDIC_H__
-#define __CDICDIC_H__
+#pragma once
#include "cdrom.h"
#include "sound/cdda.h"
@@ -115,6 +115,6 @@ private:
};
// device type definition
-extern const device_type MACHINE_CDICDIC;
+DECLARE_DEVICE_TYPE(MACHINE_CDICDIC, cdicdic_device)
-#endif // __CDICDIC_H__
+#endif // MAME_MACHINE_CDICDIC_H
diff --git a/src/mame/machine/cdislave.cpp b/src/mame/machine/cdislave.cpp
index bbf21038307..1e24587088c 100644
--- a/src/mame/machine/cdislave.cpp
+++ b/src/mame/machine/cdislave.cpp
@@ -22,13 +22,15 @@ TODO:
*******************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "machine/cdislave.h"
#include "machine/cdi070.h"
#include "includes/cdi.h"
+#include "cpu/m68000/m68000.h"
+
+
// device type definition
-const device_type MACHINE_CDISLAVE = device_creator<cdislave_device>;
+DEFINE_DEVICE_TYPE(MACHINE_CDISLAVE, cdislave_device, "cdislave", "CDISLAVE")
#if ENABLE_VERBOSE_LOG
@@ -419,7 +421,7 @@ WRITE16_MEMBER( cdislave_device::slave_w )
//-------------------------------------------------
cdislave_device::cdislave_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MACHINE_CDISLAVE, "CDISLAVE", tag, owner, clock, "cdislave", __FILE__)
+ : device_t(mconfig, MACHINE_CDISLAVE, tag, owner, clock)
{
}
diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h
index 7fee3e4561b..3791a98378d 100644
--- a/src/mame/machine/cdislave.h
+++ b/src/mame/machine/cdislave.h
@@ -21,10 +21,10 @@ TODO:
*******************************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_CDISLAVE_H
+#define MAME_MACHINE_CDISLAVE_H
-#ifndef __CDISLAVE_H__
-#define __CDISLAVE_H__
+#pragma once
//**************************************************************************
diff --git a/src/mame/machine/cedar_magnet_board.h b/src/mame/machine/cedar_magnet_board.h
index dbdddbed103..08cc36d9a9a 100644
--- a/src/mame/machine/cedar_magnet_board.h
+++ b/src/mame/machine/cedar_magnet_board.h
@@ -2,11 +2,11 @@
// copyright-holders:David Haywood
// device interface to hold some common functions of the EFO / Cedar Magnet System PCBs
+#ifndef MAME_MACHINE_CEDAR_MAGNET_BOARD_H
+#define MAME_MACHINE_CEDAR_MAGNET_BOARD_H
#pragma once
-#ifndef CEDAR_MAGNET_BOARD_DEF
-#define CEDAR_MAGNET_BOARD_DEF
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
@@ -46,4 +46,4 @@ private:
bool m_is_running;
};
-#endif
+#endif // MAME_MACHINE_CEDAR_MAGNET_BOARD_H
diff --git a/src/mame/machine/cedar_magnet_flop.cpp b/src/mame/machine/cedar_magnet_flop.cpp
index 1b3329b7199..a9b0d3a407a 100644
--- a/src/mame/machine/cedar_magnet_flop.cpp
+++ b/src/mame/machine/cedar_magnet_flop.cpp
@@ -8,10 +8,10 @@
#include "emu.h"
#include "cedar_magnet_flop.h"
-const device_type CEDAR_MAGNET_FLOP = device_creator<cedar_magnet_flop_device>;
+DEFINE_DEVICE_TYPE(CEDAR_MAGNET_FLOP, cedar_magnet_flop_device, "cedmag_flop", "Cedar Floppy Simulation")
cedar_magnet_flop_device::cedar_magnet_flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CEDAR_MAGNET_FLOP, "Cedar Floppy Simulation", tag, owner, clock, "cedmag_flop", __FILE__)
+ : device_t(mconfig, CEDAR_MAGNET_FLOP, tag, owner, clock)
{
}
diff --git a/src/mame/machine/cedar_magnet_flop.h b/src/mame/machine/cedar_magnet_flop.h
index c73f8f6e031..fc82a4adb8d 100644
--- a/src/mame/machine/cedar_magnet_flop.h
+++ b/src/mame/machine/cedar_magnet_flop.h
@@ -1,33 +1,25 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_CEDAR_MAGNET_FLOP_H
+#define MAME_MACHINE_CEDAR_MAGNET_FLOP_H
#pragma once
-#ifndef CEDAR_MAGNET_FLOP_DEF
-#define CEDAR_MAGNET_FLOP_DEF
extern const device_type CEDAR_MAGNET_FLOP;
+DECLARE_DEVICE_TYPE(CEDAR_MAGNET_FLOP, cedar_magnet_flop_device)
#define MCFG_CEDAR_MAGNET_FLOP_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CEDAR_MAGNET_FLOP, 0)
#include "machine/nvram.h"
-class cedar_magnet_flop_device : public device_t
+class cedar_magnet_flop_device : public device_t
{
public:
// construction/destruction
cedar_magnet_flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- uint8_t m_flopdat;
- uint8_t m_flopcmd;
- uint8_t m_flopsec;
- uint8_t m_flopstat;
- uint8_t m_floptrk;
-
- uint8_t m_curtrack;
- int m_secoffs;
-
DECLARE_READ8_MEMBER(port60_r);
DECLARE_READ8_MEMBER(port61_r);
DECLARE_READ8_MEMBER(port63_r);
@@ -43,7 +35,17 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
virtual void device_reset() override;
+
private:
+ uint8_t m_flopdat;
+ uint8_t m_flopcmd;
+ uint8_t m_flopsec;
+ uint8_t m_flopstat;
+ uint8_t m_floptrk;
+
+ uint8_t m_curtrack;
+ int m_secoffs;
+
};
-#endif
+#endif // MAME_MACHINE_CEDAR_MAGNET_FLOP_H
diff --git a/src/mame/machine/cedar_magnet_plane.cpp b/src/mame/machine/cedar_magnet_plane.cpp
index 9646d49dbed..3d69bb43c5b 100644
--- a/src/mame/machine/cedar_magnet_plane.cpp
+++ b/src/mame/machine/cedar_magnet_plane.cpp
@@ -6,12 +6,12 @@
#include "cedar_magnet_plane.h"
-const device_type CEDAR_MAGNET_PLANE = device_creator<cedar_magnet_plane_device>;
+DEFINE_DEVICE_TYPE(CEDAR_MAGNET_PLANE, cedar_magnet_plane_device, "cedmag_plane", "Cedar Plane")
cedar_magnet_plane_device::cedar_magnet_plane_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CEDAR_MAGNET_PLANE, "Cedar Plane", tag, owner, clock, "cedmag_plane", __FILE__),
- cedar_magnet_board_interface(mconfig, *this, "planecpu", "ram")
+ : device_t(mconfig, CEDAR_MAGNET_PLANE, tag, owner, clock)
+ , cedar_magnet_board_interface(mconfig, *this, "planecpu", "ram")
{
}
diff --git a/src/mame/machine/cedar_magnet_plane.h b/src/mame/machine/cedar_magnet_plane.h
index a1bafdc74b9..1b6cadf78b0 100644
--- a/src/mame/machine/cedar_magnet_plane.h
+++ b/src/mame/machine/cedar_magnet_plane.h
@@ -1,15 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_CEDAR_MAGNET_PLANE_H
+#define MAME_MACHINE_CEDAR_MAGNET_PLANE_H
#pragma once
-#ifndef CEDAR_MAGNET_PLANE_DEF
-#define CEDAR_MAGNET_PLANE_DEF
#include "machine/cedar_magnet_board.h"
#include "machine/z80pio.h"
extern const device_type CEDAR_MAGNET_PLANE;
+DECLARE_DEVICE_TYPE(CEDAR_MAGNET_PLANE, cedar_magnet_plane_device)
#define MCFG_CEDAR_MAGNET_PLANE_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CEDAR_MAGNET_PLANE, 0)
@@ -38,6 +39,13 @@ public:
INTERRUPT_GEN_MEMBER(vblank_irq);
+ uint32_t draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palbase);
+
+protected:
+ virtual machine_config_constructor device_mconfig_additions() const override;
+ virtual void device_start() override;
+
+private:
uint8_t m_framebuffer[0x10000];
int m_curline;
int m_lineoffset;
@@ -50,13 +58,6 @@ public:
uint8_t m_cd_data;
uint8_t m_cf_data;
- uint32_t draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palbase);
-protected:
- virtual machine_config_constructor device_mconfig_additions() const override;
- virtual void device_start() override;
-// virtual void device_reset() override;
-
-private:
};
-#endif
+#endif // MAME_MACHINE_CEDAR_MAGNET_PLANE_H
diff --git a/src/mame/machine/cedar_magnet_sprite.cpp b/src/mame/machine/cedar_magnet_sprite.cpp
index d84ebc08c84..ef653288022 100644
--- a/src/mame/machine/cedar_magnet_sprite.cpp
+++ b/src/mame/machine/cedar_magnet_sprite.cpp
@@ -10,11 +10,11 @@
#include "cedar_magnet_sprite.h"
-const device_type CEDAR_MAGNET_SPRITE = device_creator<cedar_magnet_sprite_device>;
+DEFINE_DEVICE_TYPE(CEDAR_MAGNET_SPRITE, cedar_magnet_sprite_device, "cedmag_sprite", "Cedar Sprite")
cedar_magnet_sprite_device::cedar_magnet_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CEDAR_MAGNET_SPRITE, "Cedar Sprite", tag, owner, clock, "cedmag_sprite", __FILE__),
+ : device_t(mconfig, CEDAR_MAGNET_SPRITE, tag, owner, clock),
cedar_magnet_board_interface(mconfig, *this, "spritecpu", "ram"),
m_sprite_ram_bankdev(*this, "sp_sub_ram"),
m_pio0(*this, "z80pio0"),
diff --git a/src/mame/machine/cedar_magnet_sprite.h b/src/mame/machine/cedar_magnet_sprite.h
index f6882e50923..3bdf55ed0f0 100644
--- a/src/mame/machine/cedar_magnet_sprite.h
+++ b/src/mame/machine/cedar_magnet_sprite.h
@@ -1,18 +1,18 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_CEDAR_MAGNET_SPRITE_H
+#define MAME_MACHINE_CEDAR_MAGNET_SPRITE_H
#pragma once
-#ifndef CEDAR_MAGNET_SPRITE_DEF
-#define CEDAR_MAGNET_SPRITE_DEF
+#include "machine/cedar_magnet_board.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
#include "machine/bankdev.h"
-#include "machine/cedar_magnet_board.h"
-extern const device_type CEDAR_MAGNET_SPRITE;
+DECLARE_DEVICE_TYPE(CEDAR_MAGNET_SPRITE, cedar_magnet_sprite_device)
#define MCFG_CEDAR_MAGNET_SPRITE_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, CEDAR_MAGNET_SPRITE, 0)
@@ -24,11 +24,6 @@ public:
// construction/destruction
cedar_magnet_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- uint8_t m_framebuffer[0x10000];
- uint8_t pio2_pb_data;
-
- required_device<address_map_bank_device> m_sprite_ram_bankdev;
-
DECLARE_READ8_MEMBER(pio0_pa_r);
DECLARE_WRITE8_MEMBER(pio0_pa_w);
// DECLARE_READ8_MEMBER(pio0_pb_r);
@@ -52,11 +47,26 @@ public:
DECLARE_READ8_MEMBER(exzisus_hack_r);
- uint8_t m_upperaddr;
- uint8_t m_loweraddr;
+ INTERRUPT_GEN_MEMBER(irq);
+
+ uint32_t draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palbase);
+protected:
+ virtual machine_config_constructor device_mconfig_additions() const override;
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+private:
void do_blit();
+ uint8_t m_framebuffer[0x10000];
+ uint8_t pio2_pb_data;
+
+ required_device<address_map_bank_device> m_sprite_ram_bankdev;
+
+ uint8_t m_upperaddr;
+ uint8_t m_loweraddr;
+
uint8_t m_spritesize;
uint8_t pio0_pb_data;
uint8_t m_spritecodelow;
@@ -65,19 +75,9 @@ public:
int m_high_write;
uint8_t m_uppersprite;
- INTERRUPT_GEN_MEMBER(irq);
-
required_device<z80pio_device> m_pio0;
required_device<z80pio_device> m_pio1;
required_device<z80pio_device> m_pio2;
-
- uint32_t draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int palbase);
-protected:
- virtual machine_config_constructor device_mconfig_additions() const override;
- virtual void device_start() override;
- virtual void device_reset() override;
-
-private:
};
-#endif
+#endif // MAME_MACHINE_CEDAR_MAGNET_SPRITE_H
diff --git a/src/mame/machine/coco_vhd.cpp b/src/mame/machine/coco_vhd.cpp
index 2cbb0eeef90..2384127346e 100644
--- a/src/mame/machine/coco_vhd.cpp
+++ b/src/mame/machine/coco_vhd.cpp
@@ -65,15 +65,15 @@
CORE IMPLEMENTATION
***************************************************************************/
-const device_type COCO_VHD = device_creator<coco_vhd_image_device>;
+DEFINE_DEVICE_TYPE(COCO_VHD, coco_vhd_image_device, "coco_vhd_image", "CoCo Virtual Hard Disk")
//-------------------------------------------------
// coco_vhd_image_device - constructor
//-------------------------------------------------
coco_vhd_image_device::coco_vhd_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, COCO_VHD, "Virtual Hard Disk", tag, owner, clock, "coco_vhd_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, COCO_VHD, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/coco_vhd.h b/src/mame/machine/coco_vhd.h
index 08e8499c56a..2d4a2c3deb8 100644
--- a/src/mame/machine/coco_vhd.h
+++ b/src/mame/machine/coco_vhd.h
@@ -8,9 +8,10 @@
***************************************************************************/
-#ifndef COCOVHD_H
-#define COCOVHD_H
+#ifndef MAME_MACHINE_COCO_VHD_H
+#define MAME_MACHINE_COCO_VHD_H
+#pragma once
/***************************************************************************
TYPE DEFINITIONS
@@ -59,7 +60,7 @@ private:
};
// device type definition
-extern const device_type COCO_VHD;
+DECLARE_DEVICE_TYPE(COCO_VHD, coco_vhd_image_device)
/***************************************************************************
DEVICE CONFIGURATION MACROS
@@ -67,4 +68,5 @@ extern const device_type COCO_VHD;
#define MCFG_COCO_VHD_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, COCO_VHD, 0)
-#endif /* COCOVHD_H */
+
+#endif // MAME_MACHINE_COCO_VHD_H
diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp
index 79212d26540..ae4884da194 100644
--- a/src/mame/machine/compiskb.cpp
+++ b/src/mame/machine/compiskb.cpp
@@ -28,7 +28,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type COMPIS_KEYBOARD = device_creator<compis_keyboard_device>;
+DEFINE_DEVICE_TYPE(COMPIS_KEYBOARD, compis_keyboard_device, "compiskb", "Compis Keyboard")
//-------------------------------------------------
@@ -233,7 +233,7 @@ ioport_constructor compis_keyboard_device::device_input_ports() const
//-------------------------------------------------
compis_keyboard_device::compis_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, COMPIS_KEYBOARD, "Compis Keyboard", tag, owner, clock, "compiskb", __FILE__),
+ : device_t(mconfig, COMPIS_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8748_TAG),
m_speaker(*this, SPEAKER_TAG),
m_y(*this, "Y%u", 1),
diff --git a/src/mame/machine/compiskb.h b/src/mame/machine/compiskb.h
index dfaf863bee4..a4087f1f2cf 100644
--- a/src/mame/machine/compiskb.h
+++ b/src/mame/machine/compiskb.h
@@ -31,13 +31,13 @@
// ======================> compis_keyboard_device
-class compis_keyboard_device : public device_t
+class compis_keyboard_device : public device_t
{
public:
// construction/destruction
compis_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast<compis_keyboard_device &>(device).m_out_tx_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_out_tx_handler(device_t &device, Object &&cb) { return downcast<compis_keyboard_device &>(device).m_out_tx_handler.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -65,7 +65,7 @@ private:
required_device<speaker_sound_device> m_speaker;
required_ioport_array<9> m_y;
required_ioport m_special;
- devcb_write_line m_out_tx_handler;
+ devcb_write_line m_out_tx_handler;
uint8_t m_bus;
uint8_t m_keylatch;
@@ -74,7 +74,6 @@ private:
// device type definition
extern const device_type COMPIS_KEYBOARD;
-
-
+DECLARE_DEVICE_TYPE(COMPIS_KEYBOARD, compis_keyboard_device)
#endif // MAME_INCLUDES_COMPISKB_H
diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp
index 5ce2edfbd9a..7ef3d210cd3 100644
--- a/src/mame/machine/cuda.cpp
+++ b/src/mame/machine/cuda.cpp
@@ -54,7 +54,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type CUDA = device_creator<cuda_device>;
+DEFINE_DEVICE_TYPE(CUDA, cuda_device, "cuda", "Apple Cuda")
ROM_START( cuda )
ROM_REGION(0x4400, CUDA_CPU_TAG, 0)
@@ -383,7 +383,7 @@ WRITE8_MEMBER( cuda_device::pram_w )
//-------------------------------------------------
cuda_device::cuda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CUDA, "Apple Cuda", tag, owner, clock, "cuda", __FILE__),
+ : device_t(mconfig, CUDA, tag, owner, clock),
device_nvram_interface(mconfig, *this),
write_reset(*this),
write_linechange(*this),
diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h
index ecc77b127d2..7e5e614623d 100644
--- a/src/mame/machine/cuda.h
+++ b/src/mame/machine/cuda.h
@@ -135,6 +135,6 @@ private:
};
// device type definition
-extern const device_type CUDA;
+DECLARE_DEVICE_TYPE(CUDA, cuda_device)
#endif
diff --git a/src/mame/machine/dc-ctrl.cpp b/src/mame/machine/dc-ctrl.cpp
index 48db78e1af6..fa8f28346f5 100644
--- a/src/mame/machine/dc-ctrl.cpp
+++ b/src/mame/machine/dc-ctrl.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "dc-ctrl.h"
-const device_type DC_CONTROLLER = device_creator<dc_controller_device>;
+DEFINE_DEVICE_TYPE(DC_CONTROLLER, dc_controller_device, "dcctrl", "Dreamcast Controller")
void dc_controller_device::static_set_port_tag(device_t &device, int port, const char *tag)
{
@@ -30,7 +30,7 @@ void dc_controller_device::static_set_versions(device_t &device, const char *ver
}
dc_controller_device::dc_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- maple_device(mconfig, DC_CONTROLLER, "Dreamcast Controller", tag, owner, clock, "dcctrl", __FILE__)
+ maple_device(mconfig, DC_CONTROLLER, tag, owner, clock)
{
memset(port_tag, 0, sizeof(port_tag));
diff --git a/src/mame/machine/dc-ctrl.h b/src/mame/machine/dc-ctrl.h
index afc935c5f75..b5b98f42dab 100644
--- a/src/mame/machine/dc-ctrl.h
+++ b/src/mame/machine/dc-ctrl.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _DC_CTRL_H_
-#define _DC_CTRL_H_
+#ifndef MAME_MACHINE_DC_CTRL_H
+#define MAME_MACHINE_DC_CTRL_H
+
+#pragma once
#include "mapledev.h"
@@ -53,6 +55,6 @@ private:
ioport_port *port[8];
};
-extern const device_type DC_CONTROLLER;
+DECLARE_DEVICE_TYPE(DC_CONTROLLER, dc_controller_device)
-#endif // _DC_CTRL_H_
+#endif // MAME_MACHINE_DC_CTRL_H
diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp
index 97b7da6829b..d1c95ed1e5c 100644
--- a/src/mame/machine/dec_lk201.cpp
+++ b/src/mame/machine/dec_lk201.cpp
@@ -177,7 +177,7 @@ ________|D7 |D6 |D5 |D4 |D3 |D2 |D1 |D0
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type LK201 = device_creator<lk201_device>;
+DEFINE_DEVICE_TYPE(LK201, lk201_device, "lk201", "DEC LK201 Keyboard")
ROM_START( lk201 )
ROM_REGION(0x2000, LK201_CPU_TAG, 0)
@@ -512,7 +512,7 @@ ioport_constructor lk201_device::device_input_ports() const
//-------------------------------------------------
lk201_device::lk201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, LK201, "DEC LK201 keyboard", tag, owner, clock, "lk201", __FILE__),
+ : device_t(mconfig, LK201, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_maincpu(*this, LK201_CPU_TAG),
m_speaker(*this, LK201_SPK_TAG),
diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h
index 308d6a98052..d451ea8d530 100644
--- a/src/mame/machine/dec_lk201.h
+++ b/src/mame/machine/dec_lk201.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, M. Burke
-#pragma once
+#ifndef MAME_MACHINE_DEC_LK201_H
+#define MAME_MACHINE_DEC_LK201_H
-#ifndef __LK201_H__
-#define __LK201_H__
+#pragma once
#include "sound/beep.h"
@@ -139,6 +139,6 @@ private:
};
// device type definition
-extern const device_type LK201;
+DECLARE_DEVICE_TYPE(LK201, lk201_device)
-#endif
+#endif // MAME_MACHINE_DEC_LK201_H
diff --git a/src/mame/machine/deco104.cpp b/src/mame/machine/deco104.cpp
index 42ce906f9a6..36fffd62e70 100644
--- a/src/mame/machine/deco104.cpp
+++ b/src/mame/machine/deco104.cpp
@@ -14,14 +14,12 @@
***************************************************************************/
#include "emu.h"
-#include "machine/eepromser.h"
#include "deco104.h"
+#include "machine/eepromser.h"
-
-
-deco146port_xx port104_table[] = {
+static deco146port_xx const port104_table[] = {
/* 0x000 */ { 0x04, { NIB3__, NIB0__, NIB1__, NIB2__ } , 1, 1 },
/* 0x002 */ { 0x2a, { NIB1__, NIB3__, NIB0__, NIB2__ } , 0, 1 },
/* 0x004 */ { 0x5e, { NIB0__, NIB1__, NIB2__, NIB3__ } , 0, 0 },
@@ -1051,12 +1049,12 @@ deco146port_xx port104_table[] = {
-const device_type DECO104PROT = device_creator<deco104_device>;
+DEFINE_DEVICE_TYPE(DECO104PROT, deco104_device, "deco104", "DECO 104 Protection")
deco104_device::deco104_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : deco_146_base_device(mconfig, DECO104PROT, "DECO 104 Protection", tag, owner, clock, "deco104", __FILE__)
+ : deco_146_base_device(mconfig, DECO104PROT, tag, owner, clock)
{
m_bankswitch_swap_read_address = 0x66;
m_magic_read_address_xor = 0x2a4;
diff --git a/src/mame/machine/deco104.h b/src/mame/machine/deco104.h
index cae62defaf0..e9bde950888 100644
--- a/src/mame/machine/deco104.h
+++ b/src/mame/machine/deco104.h
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_DECO104_H
+#define MAME_MACHINE_DECO104_H
+
#pragma once
-#ifndef __DECO104_H__
-#define __DECO104_H__
#include "deco146.h"
-
/* Data East 104 protection chip */
class deco104_device : public deco_146_base_device
@@ -15,29 +15,15 @@ class deco104_device : public deco_146_base_device
public:
deco104_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-
-
protected:
virtual void device_start() override;
virtual void device_reset() override;
-
-
-
-
-
-private:
-
-
};
-extern const device_type DECO104PROT;
+DECLARE_DEVICE_TYPE(DECO104PROT, deco104_device)
#define MCFG_DECO104_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, DECO104PROT, 0)
-
-
-
-#endif
+#endif // MAME_MACHINE_DECO104_H
diff --git a/src/mame/machine/deco146.cpp b/src/mame/machine/deco146.cpp
index e5c9f35cd59..089217af218 100644
--- a/src/mame/machine/deco146.cpp
+++ b/src/mame/machine/deco146.cpp
@@ -92,10 +92,7 @@
#include "machine/eepromser.h"
-
-
-
-deco146port_xx port_table[] = {
+static deco146port_xx const port_table[] = {
/* 0x000 */ { 0x08a, { NIB1__, NIB2__, NIB3__, BLANK_ }, 0, 1 },
/* 0x002 */ { 0x0aa, { NIB3__, NIB2__, NIB0__, NIB1__ }, 0, 0 },
/* 0x004 */ { 0x018, { NIB2R2, NIB3__, BLANK_, BLANK_ }, 0, 1 },
@@ -1122,7 +1119,7 @@ deco146port_xx port_table[] = {
/* 0x7fe */ { 0x04c, { NIB1__, NIB2__, NIB0__, NIB3__ }, 0, 1 }
};
-uint16_t reorder(uint16_t input, uint8_t *weights)
+inline uint16_t reorder(uint16_t input, uint8_t const *weights)
{
uint16_t temp = 0;
for(int i = 0; i < 16; i++)
@@ -1315,12 +1312,9 @@ uint16_t deco_146_base_device::read_data(uint16_t address, uint16_t mem_mask, ui
}
-//const device_type DECO146BASE = device_creator<deco_146_base_device>;
-
-
-deco_146_base_device::deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+deco_146_base_device::deco_146_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
m_sound_latch(*this, ":soundlatch")
{
m_port_a_r = deco146_port_read_cb(FUNC(deco_146_base_device::port_a_default), this);
@@ -1458,15 +1452,6 @@ void deco_146_base_device::device_reset()
}
-
-
-
-
-
-
-const device_type DECO146PROT = device_creator<deco146_device>;
-
-
uint16_t deco_146_base_device::read_data_getloc(uint16_t address, int& location)
{
uint16_t retdata = 0;
@@ -1502,8 +1487,12 @@ uint16_t deco_146_base_device::read_data_getloc(uint16_t address, int& location)
}
+
+DEFINE_DEVICE_TYPE(DECO146PROT, deco146_device, "deco146", "DECO 146 Protection")
+
+
deco146_device::deco146_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : deco_146_base_device(mconfig, DECO146PROT, "DECO 146 Protection", tag, owner, clock, "deco146", __FILE__)
+ : deco_146_base_device(mconfig, DECO146PROT, tag, owner, clock)
{
m_bankswitch_swap_read_address = 0x78;
m_magic_read_address_xor = 0x44a;
diff --git a/src/mame/machine/deco146.h b/src/mame/machine/deco146.h
index d8bf3bf5c28..1ef7ab87082 100644
--- a/src/mame/machine/deco146.h
+++ b/src/mame/machine/deco146.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Charles MacDonald
+#ifndef MAME_MACHINE_DECO146_H
+#define MAME_MACHINE_DECO146_H
+
#pragma once
-#ifndef __DECO146_H__
-#define __DECO146_H__
#include "machine/gen_latch.h"
@@ -82,9 +83,6 @@ struct deco146port_xx
class deco_146_base_device : public device_t
{
public:
- //deco_146_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- deco_146_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
void write_data(address_space &space, uint16_t address, uint16_t data, uint16_t mem_mask, uint8_t &csflags);
uint16_t read_data(uint16_t address, uint16_t mem_mask, uint8_t &csflags);
@@ -121,18 +119,11 @@ public:
uint8_t m_external_addrswap[10];
- deco146port_xx* m_lookup_table;
-
-
-
-// for older handlers
-#define DECO146__PORT(p) (prot_ram[p/2])
-
-
-
-
+ deco146port_xx const *m_lookup_table;
protected:
+ deco_146_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -161,8 +152,6 @@ private:
};
-extern const device_type DECO146BASE;
-
class deco146_device : public deco_146_base_device
{
public:
@@ -170,14 +159,9 @@ public:
};
extern const device_type DECO146PROT;
+DECLARE_DEVICE_TYPE(DECO146PROT, deco146_device)
#define MCFG_DECO146_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, DECO146PROT, 0)
-
-
-
-
-
-
-#endif
+#endif // MAME_MACHINE_DECO146_H
diff --git a/src/mame/machine/deco156.h b/src/mame/machine/deco156.h
index b73b82f4b56..f33670c459a 100644
--- a/src/mame/machine/deco156.h
+++ b/src/mame/machine/deco156.h
@@ -1,4 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
+#ifndef MAME_MACHINE_DECO156_H
+#define MAME_MACHINE_DECO156_H
+
+#pragma once
void deco156_decrypt(running_machine &machine);
+
+#endif // MAME_MACHINE_DECO156_H
diff --git a/src/mame/machine/deco222.cpp b/src/mame/machine/deco222.cpp
index d19aefade66..50478cc48bc 100644
--- a/src/mame/machine/deco222.cpp
+++ b/src/mame/machine/deco222.cpp
@@ -8,12 +8,12 @@
#include "emu.h"
#include "deco222.h"
-const device_type DECO_222 = device_creator<deco_222_device>;
-const device_type DECO_C10707 = device_creator<deco_c10707_device>;
+DEFINE_DEVICE_TYPE(DECO_222, deco_222_device, "deco222", "DECO 222")
+DEFINE_DEVICE_TYPE(DECO_C10707, deco_c10707_device, "decoc10707", "DECO C10707")
deco_222_device::deco_222_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- m6502_device(mconfig, DECO_222, "DECO 222", tag, owner, clock, "deco222", __FILE__)
+ m6502_device(mconfig, DECO_222, tag, owner, clock)
{
}
@@ -37,7 +37,7 @@ uint8_t deco_222_device::mi_decrypt::read_sync(uint16_t adr)
deco_c10707_device::deco_c10707_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- m6502_device(mconfig, DECO_C10707, "DECO C10707", tag, owner, clock, "decoc10707", __FILE__)
+ m6502_device(mconfig, DECO_C10707, tag, owner, clock)
{
}
diff --git a/src/mame/machine/deco222.h b/src/mame/machine/deco222.h
index 56df49a0bad..c7bf940acac 100644
--- a/src/mame/machine/deco222.h
+++ b/src/mame/machine/deco222.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_DECO222
+#define MAME_MACHINE_DECO222
+
+#pragma once
#include "cpu/m6502/m6502.h"
@@ -42,5 +46,7 @@ protected:
};
-extern const device_type DECO_222;
-extern const device_type DECO_C10707;
+DECLARE_DEVICE_TYPE(DECO_222, deco_222_device)
+DECLARE_DEVICE_TYPE(DECO_C10707, deco_c10707_device)
+
+#endif // MAME_MACHINE_DECO222
diff --git a/src/mame/machine/decocass_tape.cpp b/src/mame/machine/decocass_tape.cpp
index a3be6307cfc..8686be2cb06 100644
--- a/src/mame/machine/decocass_tape.cpp
+++ b/src/mame/machine/decocass_tape.cpp
@@ -7,9 +7,10 @@
***********************************************************************/
#include "emu.h"
+#include "machine/decocass_tape.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/mcs48/mcs48.h"
-#include "machine/decocass_tape.h"
#define LOG_CASSETTE_STATE 0
@@ -56,10 +57,10 @@
static uint16_t tape_crc16_byte(uint16_t crc, uint8_t data);
-const device_type DECOCASS_TAPE = device_creator<decocass_tape_device>;
+DEFINE_DEVICE_TYPE(DECOCASS_TAPE, decocass_tape_device, "decocass_tape", "DECO Cassette Tape")
decocass_tape_device::decocass_tape_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECOCASS_TAPE, "DECO Cassette Tape", tag, owner, clock, "decocass_tape", __FILE__),
+ : device_t(mconfig, DECOCASS_TAPE, tag, owner, clock),
m_tape_timer(nullptr),
m_speed(0),
m_region(REGION_LEADER),
diff --git a/src/mame/machine/decocass_tape.h b/src/mame/machine/decocass_tape.h
index c8a766c101a..0b6131d5ae8 100644
--- a/src/mame/machine/decocass_tape.h
+++ b/src/mame/machine/decocass_tape.h
@@ -1,7 +1,9 @@
// license:GPL-2.0+
// copyright-holders:Juergen Buchmueller, David Haywood
-#ifndef __DECOCASS_TAPE_H__
-#define __DECOCASS_TAPE_H__
+#ifndef MAME_MACHINE_DECOCASS_TAPE_H
+#define MAME_MACHINE_DECOCASS_TAPE_H
+
+#pragma once
class decocass_tape_device : public device_t
{
@@ -69,9 +71,9 @@ private:
TIMER_CALLBACK_MEMBER( tape_clock_callback );
};
-extern const device_type DECOCASS_TAPE;
+DECLARE_DEVICE_TYPE(DECOCASS_TAPE, decocass_tape_device)
#define MCFG_DECOCASS_TAPE_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, DECOCASS_TAPE, 0)
-#endif
+#endif // MAME_MACHINE_DECOCASS_TAPE_H
diff --git a/src/mame/machine/decocpu6.cpp b/src/mame/machine/decocpu6.cpp
index 2162812d3dd..3d855e2864d 100644
--- a/src/mame/machine/decocpu6.cpp
+++ b/src/mame/machine/decocpu6.cpp
@@ -9,11 +9,11 @@
#include "emu.h"
#include "decocpu6.h"
-const device_type DECO_CPU6 = device_creator<deco_cpu6_device>;
+DEFINE_DEVICE_TYPE(DECO_CPU6, deco_cpu6_device, "decocpu6", "DECO CPU-6")
deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- m6502_device(mconfig, DECO_CPU6, "DECO CPU-6", tag, owner, clock, "decocpu6", __FILE__)
+ m6502_device(mconfig, DECO_CPU6, tag, owner, clock)
{
}
diff --git a/src/mame/machine/decocpu6.h b/src/mame/machine/decocpu6.h
index 5db333114fc..21e649ed5ac 100644
--- a/src/mame/machine/decocpu6.h
+++ b/src/mame/machine/decocpu6.h
@@ -1,6 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_DECOCPU6_H
+#define MAME_MACHINE_DECOCPU6_H
+#pragma once
#include "cpu/m6502/m6502.h"
@@ -20,4 +23,6 @@ protected:
};
-extern const device_type DECO_CPU6;
+DECLARE_DEVICE_TYPE(DECO_CPU6, deco_cpu6_device)
+
+#endif // MAME_MACHINE_DECOCPU6_H
diff --git a/src/mame/machine/decocpu7.cpp b/src/mame/machine/decocpu7.cpp
index 6c7fe9c8179..332cea3ac45 100644
--- a/src/mame/machine/decocpu7.cpp
+++ b/src/mame/machine/decocpu7.cpp
@@ -4,11 +4,11 @@
#include "emu.h"
#include "decocpu7.h"
-const device_type DECO_CPU7 = device_creator<deco_cpu7_device>;
+DEFINE_DEVICE_TYPE(DECO_CPU7, deco_cpu7_device, "decocpu7", "DECO CPU-7")
deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- m6502_device(mconfig, DECO_CPU7, "DECO CPU-7", tag, owner, clock, "decocpu7", __FILE__)
+ m6502_device(mconfig, DECO_CPU7, tag, owner, clock)
{
}
diff --git a/src/mame/machine/decocpu7.h b/src/mame/machine/decocpu7.h
index 18d1510bcb9..4f854816f21 100644
--- a/src/mame/machine/decocpu7.h
+++ b/src/mame/machine/decocpu7.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_DECOCPU7_H
+#define MAME_MACHINE_DECOCPU7_H
+
+#pragma once
#include "cpu/m6502/m6502.h"
@@ -22,4 +26,6 @@ protected:
};
-extern const device_type DECO_CPU7;
+DECLARE_DEVICE_TYPE(DECO_CPU7, deco_cpu7_device)
+
+#endif // MAME_MACHINE_DECOCPU7_H
diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp
index 38082be8ad4..4f9424cdc84 100644
--- a/src/mame/machine/decopincpu.cpp
+++ b/src/mame/machine/decopincpu.cpp
@@ -16,10 +16,10 @@
#include "emu.h"
#include "decopincpu.h"
-const device_type DECOCPU1 = device_creator<decocpu_type1_device>;
-const device_type DECOCPU2 = device_creator<decocpu_type2_device>;
-const device_type DECOCPU3 = device_creator<decocpu_type3_device>;
-const device_type DECOCPU3B = device_creator<decocpu_type3b_device>;
+DEFINE_DEVICE_TYPE(DECOCPU1, decocpu_type1_device, "decocpu1", "Data East Pinball CPU Board Type 1")
+DEFINE_DEVICE_TYPE(DECOCPU2, decocpu_type2_device, "decocpu2", "Data East Pinball CPU Board Type 2")
+DEFINE_DEVICE_TYPE(DECOCPU3, decocpu_type3_device, "decocpu3", "Data East Pinball CPU Board Type 3")
+DEFINE_DEVICE_TYPE(DECOCPU3B, decocpu_type3b_device, "decocpu3b", "Data East Pinball CPU Board Type 3B")
static ADDRESS_MAP_START( decocpu1_map, AS_PROGRAM, 8, decocpu_type1_device )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
@@ -264,26 +264,11 @@ ioport_constructor decocpu_type1_device::device_input_ports() const
}
decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECOCPU1, "Data East Pinball CPU Board Type 1", tag, owner, clock, "decocpu1", __FILE__),
- m_cpu(*this,"maincpu"),
- m_pia21(*this, "pia21"),
- m_pia24(*this, "pia24"),
- m_pia28(*this, "pia28"),
- m_pia2c(*this, "pia2c"),
- m_pia30(*this, "pia30"),
- m_pia34(*this, "pia34"),
- m_read_display(*this),
- m_write_display(*this),
- m_read_dmdstatus(*this),
- m_write_soundlatch(*this),
- m_read_switch(*this),
- m_write_switch(*this),
- m_write_lamp(*this),
- m_write_solenoid(*this)
+ : decocpu_type1_device(mconfig, DECOCPU1, tag, owner, clock)
{}
-decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+decocpu_type1_device::decocpu_type1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
m_cpu(*this,"maincpu"),
m_pia21(*this, "pia21"),
m_pia24(*this, "pia24"),
@@ -329,11 +314,11 @@ void decocpu_type1_device::static_set_cpuregion(device_t &device, const char *ta
}
decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : decocpu_type1_device(mconfig, DECOCPU2, "Data East Pinball CPU Board Type 2", tag, owner, clock, "decocpu2", __FILE__)
+ : decocpu_type2_device(mconfig, DECOCPU2, tag, owner, clock)
{}
-decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : decocpu_type1_device(mconfig, type, name, tag, owner, clock, shortname, source)
+decocpu_type2_device::decocpu_type2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : decocpu_type1_device(mconfig, type, tag, owner, clock)
{}
machine_config_constructor decocpu_type2_device::device_mconfig_additions() const
@@ -347,11 +332,11 @@ void decocpu_type2_device::device_start()
}
decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : decocpu_type2_device(mconfig, DECOCPU3, "Data East Pinball CPU Board Type 3", tag, owner, clock, "decocpu3", __FILE__)
+ : decocpu_type3_device(mconfig, DECOCPU3, tag, owner, clock)
{}
-decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : decocpu_type2_device(mconfig, type, name, tag, owner, clock, shortname, source)
+decocpu_type3_device::decocpu_type3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : decocpu_type2_device(mconfig, type, tag, owner, clock)
{}
void decocpu_type3_device::device_start()
@@ -360,7 +345,7 @@ void decocpu_type3_device::device_start()
}
decocpu_type3b_device::decocpu_type3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : decocpu_type3_device(mconfig, DECOCPU3B, "Data East Pinball CPU Board Type 3B", tag, owner, clock, "decocpu3b", __FILE__)
+ : decocpu_type3_device(mconfig, DECOCPU3B, tag, owner, clock)
{}
void decocpu_type3b_device::device_start()
diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h
index 73385b3ea99..cb40d0b26f9 100644
--- a/src/mame/machine/decopincpu.h
+++ b/src/mame/machine/decopincpu.h
@@ -6,8 +6,10 @@
* Created on: 10/07/2013
*/
-#ifndef DECOPINCPU_H_
-#define DECOPINCPU_H_
+#ifndef MAME_MACHINE_DECOPINCPU_H
+#define MAME_MACHINE_DECOPINCPU_H
+
+#pragma once
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
@@ -64,24 +66,16 @@ class decocpu_type1_device : public device_t
{
public:
decocpu_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- required_device<cpu_device> m_cpu;
- required_device<pia6821_device> m_pia21;
- required_device<pia6821_device> m_pia24;
- required_device<pia6821_device> m_pia28;
- required_device<pia6821_device> m_pia2c;
- required_device<pia6821_device> m_pia30;
- required_device<pia6821_device> m_pia34;
// callbacks
- template<class _disp_r> void set_display_read_callback(_disp_r disp_r) { m_read_display.set_callback(disp_r); }
- template<class _disp_w> void set_display_write_callback(_disp_w disp_w) { m_write_display.set_callback(disp_w); }
- template<class _dmdstat_r> void set_dmdstatus_read_callback(_dmdstat_r dmdstat_r) { m_read_dmdstatus.set_callback(dmdstat_r); }
- template<class _soundlatch_w> void set_soundlatch_write_callback(_soundlatch_w slatch_w) { m_write_soundlatch.set_callback(slatch_w); }
- template<class _switch_r> void set_switch_read_callback(_switch_r switch_r) { m_read_switch.set_callback(switch_r); }
- template<class _switch_w> void set_switch_write_callback(_switch_w switch_w) { m_write_switch.set_callback(switch_w); }
- template<class _lamp_w> void set_lamp_write_callback(_lamp_w lamp_w) { m_write_lamp.set_callback(lamp_w); }
- template<class _sol_w> void set_solenoid_write_callback(_sol_w sol_w) { m_write_solenoid.set_callback(sol_w); }
+ template <class Object> void set_display_read_callback(Object &&cb) { m_read_display.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_display_write_callback(Object &&cb) { m_write_display.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_dmdstatus_read_callback(Object &&cb) { m_read_dmdstatus.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_soundlatch_write_callback(Object &&cb) { m_write_soundlatch.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_switch_read_callback(Object &&cb) { m_read_switch.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_switch_write_callback(Object &&cb) { m_write_switch.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_lamp_write_callback(Object &&cb) { m_write_lamp.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_solenoid_write_callback(Object &&cb) { m_write_solenoid.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER(cpu_pia_irq);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
@@ -106,12 +100,23 @@ public:
static void static_set_cpuregion(device_t &device, const char *tag);
protected:
+ static constexpr device_timer_id TIMER_IRQ = 0;
+
+ decocpu_type1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
virtual ioport_constructor device_input_ports() const override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- static const device_timer_id TIMER_IRQ = 0;
+
+ required_device<cpu_device> m_cpu;
+ required_device<pia6821_device> m_pia21;
+ required_device<pia6821_device> m_pia24;
+ required_device<pia6821_device> m_pia28;
+ required_device<pia6821_device> m_pia2c;
+ required_device<pia6821_device> m_pia30;
+ required_device<pia6821_device> m_pia34;
private:
const char* m_cputag; // region for cpu board code and data
@@ -134,8 +139,10 @@ class decocpu_type2_device : public decocpu_type1_device
{
public:
decocpu_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+
protected:
+ decocpu_type2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
@@ -145,9 +152,10 @@ class decocpu_type3_device : public decocpu_type2_device
{
public:
decocpu_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ decocpu_type3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// overrides
virtual void device_start() override;
};
@@ -162,9 +170,9 @@ protected:
virtual void device_start() override;
};
-extern const device_type DECOCPU1;
-extern const device_type DECOCPU2;
-extern const device_type DECOCPU3;
-extern const device_type DECOCPU3B;
+DECLARE_DEVICE_TYPE(DECOCPU1, decocpu_type1_device)
+DECLARE_DEVICE_TYPE(DECOCPU2, decocpu_type2_device)
+DECLARE_DEVICE_TYPE(DECOCPU3, decocpu_type3_device)
+DECLARE_DEVICE_TYPE(DECOCPU3B, decocpu_type3b_device)
-#endif /* DECOPINCPU_H_ */
+#endif // MAME_MACHINE_DECOPINCPU_H
diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp
index bbec3fa8def..f4fca72fc18 100644
--- a/src/mame/machine/dmv_keyb.cpp
+++ b/src/mame/machine/dmv_keyb.cpp
@@ -14,7 +14,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type DMV_KEYBOARD = device_creator<dmv_keyboard_device>;
+DEFINE_DEVICE_TYPE(DMV_KEYBOARD, dmv_keyboard_device, "dmv_keyboard", "Decision Mate V Keyboard")
//***************************************************************************
@@ -205,7 +205,7 @@ ioport_constructor dmv_keyboard_device::device_input_ports() const
//-------------------------------------------------
dmv_keyboard_device::dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DMV_KEYBOARD, "Decision Mate V Keyboard", tag, owner, clock, "dmv_keyboard", __FILE__)
+ : device_t(mconfig, DMV_KEYBOARD, tag, owner, clock)
, m_maincpu(*this, "mcu")
, m_keyboard(*this, "COL.%u", 0)
{
diff --git a/src/mame/machine/dmv_keyb.h b/src/mame/machine/dmv_keyb.h
index 77317be417a..6411b39ed1b 100644
--- a/src/mame/machine/dmv_keyb.h
+++ b/src/mame/machine/dmv_keyb.h
@@ -6,10 +6,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_DMV_KEYB_H
+#define MAME_MACHINE_DMV_KEYB_H
-#ifndef __DMV_KEYBOARD__
-#define __DMV_KEYBOARD__
+#pragma once
#include "cpu/mcs48/mcs48.h"
@@ -49,7 +49,6 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() override { m_shortname = "dmv_keyb"; }
virtual void device_start() override;
virtual void device_reset() override;
@@ -64,7 +63,7 @@ private:
// device type definition
-extern const device_type DMV_KEYBOARD;
+DECLARE_DEVICE_TYPE(DMV_KEYBOARD, dmv_keyboard_device)
-#endif
+#endif // MAME_MACHINE_DMV_KEYB_H
diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp
index d6ef4bdca30..717a3178734 100644
--- a/src/mame/machine/docg3.cpp
+++ b/src/mame/machine/docg3.cpp
@@ -32,15 +32,15 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
***************************************************************************/
// device type definition
-const device_type DISKONCHIP_G3 = device_creator<diskonchip_g3_device>;
+DEFINE_DEVICE_TYPE(DISKONCHIP_G3, diskonchip_g3_device, "diskonchip_g3", "DiskOnChip G3")
//-------------------------------------------------
// diskonchip_g3_device - constructor
//-------------------------------------------------
diskonchip_g3_device::diskonchip_g3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DISKONCHIP_G3, "DiskOnChip G3", tag, owner, clock, "diskonchip_g3", __FILE__),
- device_nvram_interface(mconfig, *this)
+ : device_t(mconfig, DISKONCHIP_G3, tag, owner, clock)
+ , device_nvram_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/docg3.h b/src/mame/machine/docg3.h
index 76346933d1e..d7e328caec2 100644
--- a/src/mame/machine/docg3.h
+++ b/src/mame/machine/docg3.h
@@ -8,17 +8,18 @@
*/
-#ifndef __DOCG3_H__
-#define __DOCG3_H__
+#ifndef MAME_MACHINE_DOCG3_H
+#define MAME_MACHINE_DOCG3_H
+
+#pragma once
#define MCFG_DISKONCHIP_G3_ADD(_tag, _size) \
MCFG_DEVICE_ADD(_tag, DISKONCHIP_G3, 0) \
- static_cast<diskonchip_g3_device *>(device)->set_size(_size);
+ downcast<diskonchip_g3_device *>(device)->set_size(_size);
// ======================> diskonchip_g3_device
-class diskonchip_g3_device : public device_t,
- public device_nvram_interface
+class diskonchip_g3_device : public device_t, public device_nvram_interface
{
public:
// construction/destruction
@@ -98,6 +99,6 @@ private:
};
// device type definition
-extern const device_type DISKONCHIP_G3;
+DECLARE_DEVICE_TYPE(DISKONCHIP_G3, diskonchip_g3_device)
-#endif /* __DOCG3_H__ */
+#endif // MAME_MACHINE_DOCG3_H
diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp
index 4ca3dd6fb3e..35852a1c8ef 100644
--- a/src/mame/machine/egret.cpp
+++ b/src/mame/machine/egret.cpp
@@ -53,7 +53,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type EGRET = device_creator<egret_device>;
+DEFINE_DEVICE_TYPE(EGRET, egret_device, "egret", "Apple Egret")
ROM_START( egret )
ROM_REGION(0x4400, EGRET_CPU_TAG, 0)
@@ -334,7 +334,7 @@ WRITE8_MEMBER( egret_device::pram_w )
//-------------------------------------------------
egret_device::egret_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EGRET, "Apple Egret", tag, owner, clock, "egret", __FILE__),
+ : device_t(mconfig, EGRET, tag, owner, clock),
device_nvram_interface(mconfig, *this),
write_reset(*this),
write_linechange(*this),
diff --git a/src/mame/machine/egret.h b/src/mame/machine/egret.h
index 04f461fa5f3..742c3e47929 100644
--- a/src/mame/machine/egret.h
+++ b/src/mame/machine/egret.h
@@ -1,10 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#pragma once
-
-#ifndef __EGRET_H__
-#define __EGRET_H__
+#ifndef MAME_MACHINE_EGRET_H
+#define MAME_MACHINE_EGRET_H
+#pragma once
@@ -134,6 +133,6 @@ private:
};
// device type definition
-extern const device_type EGRET;
+DECLARE_DEVICE_TYPE(EGRET, egret_device)
-#endif
+#endif // MAME_MACHINE_EGRET_H
diff --git a/src/mame/machine/einstein.cpp b/src/mame/machine/einstein.cpp
index d9145ab2509..9e2c31d8074 100644
--- a/src/mame/machine/einstein.cpp
+++ b/src/mame/machine/einstein.cpp
@@ -15,7 +15,7 @@
****************************************************************/
-const device_type EINSTEIN_KEYBOARD_DAISY = device_creator<einstein_keyboard_daisy_device>;
+DEFINE_DEVICE_TYPE(EINSTEIN_KEYBOARD_DAISY, einstein_keyboard_daisy_device, "einstein_keyboard", "Einstein keyboard daisy chain")
//**************************************************************************
@@ -27,8 +27,8 @@ const device_type EINSTEIN_KEYBOARD_DAISY = device_creator<einstein_keyboard_dai
//-------------------------------------------------
einstein_keyboard_daisy_device::einstein_keyboard_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EINSTEIN_KEYBOARD_DAISY, "Einstein keyboard daisy chain", tag, owner, clock, "einstein_keyboard", __FILE__),
- device_z80daisy_interface(mconfig, *this)
+ : device_t(mconfig, EINSTEIN_KEYBOARD_DAISY, tag, owner, clock)
+ , device_z80daisy_interface(mconfig, *this)
{
}
@@ -79,7 +79,7 @@ void einstein_keyboard_daisy_device::z80daisy_irq_reti()
{
}
-const device_type EINSTEIN_ADC_DAISY = device_creator<einstein_adc_daisy_device>;
+DEFINE_DEVICE_TYPE(EINSTEIN_ADC_DAISY, einstein_adc_daisy_device, "einstein_adc", "Einstein ADC daisy chain")
//**************************************************************************
// LIVE DEVICE
@@ -90,8 +90,8 @@ const device_type EINSTEIN_ADC_DAISY = device_creator<einstein_adc_daisy_device>
//-------------------------------------------------
einstein_adc_daisy_device::einstein_adc_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EINSTEIN_ADC_DAISY, "Einstein ADC daisy chain", tag, owner, clock, "einstein_adc_daisy", __FILE__),
- device_z80daisy_interface(mconfig, *this)
+ : device_t(mconfig, EINSTEIN_ADC_DAISY, tag, owner, clock)
+ , device_z80daisy_interface(mconfig, *this)
{
}
@@ -143,7 +143,7 @@ void einstein_adc_daisy_device::z80daisy_irq_reti()
}
-const device_type EINSTEIN_FIRE_DAISY = device_creator<einstein_fire_daisy_device>;
+DEFINE_DEVICE_TYPE(EINSTEIN_FIRE_DAISY, einstein_fire_daisy_device, "einstein_fire", "Einstein fire button daisy chain")
//**************************************************************************
@@ -155,8 +155,8 @@ const device_type EINSTEIN_FIRE_DAISY = device_creator<einstein_fire_daisy_devic
//-------------------------------------------------
einstein_fire_daisy_device::einstein_fire_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EINSTEIN_FIRE_DAISY, "Einstein fire button daisy chain", tag, owner, clock, "einstein_fire_daisy", __FILE__),
- device_z80daisy_interface(mconfig, *this)
+ : device_t(mconfig, EINSTEIN_FIRE_DAISY, tag, owner, clock)
+ , device_z80daisy_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp
index 9e71f99c2f0..7e81ca2705d 100644
--- a/src/mame/machine/esqlcd.cpp
+++ b/src/mame/machine/esqlcd.cpp
@@ -10,7 +10,7 @@
//#define VERBOSE
-const device_type ESQ2x16_SQ1 = device_creator<esq2x16_sq1_t>;
+DEFINE_DEVICE_TYPE(ESQ2X16_SQ1, esq2x16_sq1_device, "esq2x16_sq1", "Ensoniq 2x16 VFD (SQ-1 variant)")
// --- SQ1 - Parduz --------------------------------------------------------------------------------------------------------------------------
static MACHINE_CONFIG_FRAGMENT(esq2x16)
@@ -32,7 +32,7 @@ MACHINE_CONFIG_END
//*****************************************************************************
// standard ascii 5x7 font
// defines ascii characters 0x20-0x7F (32-127)
-static unsigned char Font5x7[][5] = {
+static unsigned char const Font5x7[][5] = {
{0x00, 0x00, 0x08, 0x00, 0x00}, // _Undef_ 0x00 - dots for debug purposes
{0x01, 0x00, 0x00, 0x00, 0x40}, // _Undef_ 0x01 - dots for debug purposes
{0x02, 0x00, 0x00, 0x00, 0x00}, // _Undef_ 0x02
@@ -163,12 +163,12 @@ static unsigned char Font5x7[][5] = {
{0x08, 0x1C, 0x2A, 0x08, 0x08} // <- 0x7F
};
//--------------------------------------------------------------------------------------------------------------------------------------------
-machine_config_constructor esq2x16_sq1_t::device_mconfig_additions() const
+machine_config_constructor esq2x16_sq1_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( esq2x16 );
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-void esq2x16_sq1_t::write_char(int data)
+void esq2x16_sq1_device::write_char(int data)
{
int DisplayCode = data;
int LedState;
@@ -183,7 +183,7 @@ void esq2x16_sq1_t::write_char(int data)
) data = '^'; // musical notes
// Resolve here 2-Bytes commands: the command was saved previously
- switch (m_LcdCommand) {
+ switch (m_lcd_command) {
case 0:
// No current command.
break;
@@ -191,30 +191,30 @@ void esq2x16_sq1_t::write_char(int data)
case 0x87:
// Go To
#ifdef VERBOSE
- printf("LCD %02X: Go To %02X - pos=%02X (%d)\n", m_LcdCommand, DisplayCode, m_lcdPos, m_lcdPage);
+ printf("LCD %02X: Go To %02X - pos=%02X (%d)\n", m_lcd_command, DisplayCode, m_lcdPos, m_lcdPage);
#endif
m_lcdPos = DisplayCode;
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
case 0x88:
// Save Cursor position - What the second byte (00 or 01) means?
#ifdef VERBOSE
- printf("LCD %02X: Save Pos. (%02X) - pos=%02X (%d)\n", m_LcdCommand, DisplayCode, m_lcdPos, m_lcdPage);
+ printf("LCD %02X: Save Pos. (%02X) - pos=%02X (%d)\n", m_lcd_command, DisplayCode, m_lcdPos, m_lcdPage);
#endif
m_lcdSavedPos = m_lcdPos;
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
case 0x89:
// Restore Cursor position - What the second byte (00 or 01) means?
#ifdef VERBOSE
- printf("LCD %02X: Restore Pos. (%02X) - pos=%02X (%d)\n", m_LcdCommand, DisplayCode, m_lcdPos, m_lcdPage);
+ printf("LCD %02X: Restore Pos. (%02X) - pos=%02X (%d)\n", m_lcd_command, DisplayCode, m_lcdPos, m_lcdPage);
#endif
m_lcdPos = m_lcdSavedPos;
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
@@ -222,7 +222,7 @@ void esq2x16_sq1_t::write_char(int data)
case 0x8E:
case 0x8F:
// LED OFF, ON, BLINK
- LedState = m_LcdCommand & 0x03;
+ LedState = m_lcd_command & 0x03;
if (
DisplayCode >= 16 || // Out of bounds
DisplayCode == 6 || // non-existent
@@ -232,7 +232,7 @@ void esq2x16_sq1_t::write_char(int data)
)
{
#ifdef VERBOSE
- printf("LCD %02X: Led %02d does'nt exist - pos=%02X (%d)\n", m_LcdCommand, DisplayCode, m_lcdPos, m_lcdPage);
+ printf("LCD %02X: Led %02d does'nt exist - pos=%02X (%d)\n", m_lcd_command, DisplayCode, m_lcdPos, m_lcdPage);
#endif
}
else
@@ -244,15 +244,15 @@ void esq2x16_sq1_t::write_char(int data)
}
update_display();
}
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
default:
#ifdef VERBOSE
- printf("LCD: Unknown 2-Bytes Command:%02X-%02X - pos=%02X (%d)\n", m_LcdCommand, DisplayCode, m_lcdPos, m_lcdPage);
+ printf("LCD: Unknown 2-Bytes Command:%02X-%02X - pos=%02X (%d)\n", m_lcd_command, DisplayCode, m_lcdPos, m_lcdPage);
#endif
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
}
@@ -277,7 +277,7 @@ void esq2x16_sq1_t::write_char(int data)
case 0x88: // Save Cursor Position
case 0x89: // Restore Cursor Position
// Save the command for the next byte
- m_LcdCommand = DisplayCode;
+ m_lcd_command = DisplayCode;
return;
break;
@@ -286,7 +286,7 @@ void esq2x16_sq1_t::write_char(int data)
case 0x86:
case 0x95:
// ??? - related to blinking chars? - 2 bytes command
- m_LcdCommand = DisplayCode;
+ m_lcd_command = DisplayCode;
return;
break;
@@ -294,7 +294,7 @@ void esq2x16_sq1_t::write_char(int data)
case 0x8E:
case 0x8F:
// LEDs OFF,ON and BLINK - 2 bytes command
- m_LcdCommand = DisplayCode;
+ m_lcd_command = DisplayCode;
return;
break;
@@ -306,7 +306,7 @@ void esq2x16_sq1_t::write_char(int data)
#ifdef VERBOSE
printf("LCD %02X: Page Change ? - pos=%02X (%d)\n", DisplayCode, m_lcdPos, m_lcdPage);
#endif
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
@@ -329,7 +329,7 @@ void esq2x16_sq1_t::write_char(int data)
#ifdef VERBOSE
printf("LCD %02X: Unknown Command - pos=%02X (%d)\n", DisplayCode, m_lcdPos, m_lcdPage);
#endif
- m_LcdCommand = 0;
+ m_lcd_command = 0;
return;
break;
}
@@ -342,13 +342,13 @@ void esq2x16_sq1_t::write_char(int data)
#endif
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-esq2x16_sq1_t::esq2x16_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_t(mconfig, ESQ2x16_SQ1, "Ensoniq 2x16 VFD (SQ-1 variant)", tag, owner, clock, "esq2x16_sq1", __FILE__)
+esq2x16_sq1_device::esq2x16_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_device(mconfig, ESQ2X16_SQ1, tag, owner, clock)
{
m_rows = 2;
m_cols = 16;
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-void esq2x16_sq1_t::update_display()
+void esq2x16_sq1_device::update_display()
{
char lcdCharRow;
@@ -366,35 +366,35 @@ void esq2x16_sq1_t::update_display()
{
// stealed from tecnbras.cpp and modified
for (int rr=0; rr<7; rr++) {
- lcdCharRow = RotateLcdChar(m_lcdpg[page][pos],rr);
+ lcdCharRow = rotate_lcd_char(m_lcdpg[page][pos],rr);
machine().output().set_indexed_value("pg_", (page+1)*1000 + pos*7 + rr, 0x1F & lcdCharRow);
}
}
}
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-void esq2x16_sq1_t::device_reset()
+void esq2x16_sq1_device::device_reset()
{
//lcd_reset();
- m_lcdPage = m_lcdSavedPos = m_lcdPos = m_LcdCommand = 0;
+ m_lcdPage = m_lcdSavedPos = m_lcdPos = m_lcd_command = 0;
memset(m_leds, 0, sizeof(m_leds));
memset(m_lcdpg, 1, sizeof(m_lcdpg)); // Set to 1 for debug: to see what "pages" are set to 0 from the firmware
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-void esq2x16_sq1_t::lcd_reset()
+void esq2x16_sq1_device::lcd_reset()
{
- m_lcdPage = m_lcdSavedPos = m_lcdPos = m_LcdCommand = 0;
+ m_lcdPage = m_lcdSavedPos = m_lcdPos = m_lcd_command = 0;
memset(m_leds, 0, sizeof(m_leds));
memset(m_lcdpg, 0, sizeof(m_lcdpg));
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-void esq2x16_sq1_t::page_reset()
+void esq2x16_sq1_device::page_reset()
{
memset(m_lcdpg[m_lcdPage], 0, 32);
- m_lcdPos = m_LcdCommand = 0;
+ m_lcdPos = m_lcd_command = 0;
}
//--------------------------------------------------------------------------------------------------------------------------------------------
-char esq2x16_sq1_t::RotateLcdChar(uint8_t lcdChar, int charRow)
+char esq2x16_sq1_device::rotate_lcd_char(uint8_t lcdChar, int charRow)
{
char lcdCharRow = 0;
for (int cc=0; cc<5; cc++){
diff --git a/src/mame/machine/esqlcd.h b/src/mame/machine/esqlcd.h
index cb474cd6b8f..967c64af07f 100644
--- a/src/mame/machine/esqlcd.h
+++ b/src/mame/machine/esqlcd.h
@@ -1,33 +1,32 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, Parduz
-#ifndef ESQLCD_H
-#define ESQLCD_H
+#ifndef MAME_MACHINE_ESQLCD_H
+#define MAME_MACHINE_ESQLCD_H
+
+#pragma once
#include "esqvfd.h"
// --- SQ1 - Parduz --------------------------------------------------------------------------------------------------------------------------
-#define MCFG_ESQ2x16_SQ1_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQ2x16_SQ1, 60)
+#define MCFG_ESQ2X16_SQ1_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQ2X16_SQ1, 60)
-#define MCFG_ESQ2x16_SQ1_REMOVE(_tag) \
+#define MCFG_ESQ2X16_SQ1_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-class esq2x16_sq1_t : public esqvfd_t {
+class esq2x16_sq1_device : public esqvfd_device {
public:
- esq2x16_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ esq2x16_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void write_char(int data) override;
virtual void update_display() override;
- virtual void device_reset() override;
-
- void lcd_reset();
- void page_reset();
- char RotateLcdChar(uint8_t lcdChar, int charRow);
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
+ virtual void device_reset() override;
+
uint8_t m_lcdpg[4][32];
int m_lcdPage;
int m_lcdPos,m_lcdSavedPos;
@@ -36,9 +35,14 @@ protected:
uint8_t m_ledsDirty[16];
private:
- int m_LcdCommand;
+ void lcd_reset();
+ void page_reset();
+
+ static char rotate_lcd_char(uint8_t lcdChar, int charRow);
+
+ int m_lcd_command;
};
-extern const device_type ESQ2x16_SQ1;
+DECLARE_DEVICE_TYPE(ESQ2X16_SQ1, esq2x16_sq1_device)
-#endif
+#endif // MAME_MACHINE_ESQLCD_H
diff --git a/src/mame/machine/esqpanel.cpp b/src/mame/machine/esqpanel.cpp
index e0bdfc823b5..fe73622a722 100644
--- a/src/mame/machine/esqpanel.cpp
+++ b/src/mame/machine/esqpanel.cpp
@@ -14,9 +14,9 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ESQPANEL1x22 = device_creator<esqpanel1x22_device>;
-const device_type ESQPANEL2x40 = device_creator<esqpanel2x40_device>;
-const device_type ESQPANEL2x16_SQ1 = device_creator<esqpanel2x16_sq1_device>;
+DEFINE_DEVICE_TYPE(ESQPANEL1X22, esqpanel1x22_device, "esqpanel122", "Ensoniq front panel with 1x22 VFD")
+DEFINE_DEVICE_TYPE(ESQPANEL2X40, esqpanel2x40_device, "esqpanel240", "Ensoniq front panel with 2x40 VFD")
+DEFINE_DEVICE_TYPE(ESQPANEL2X16_SQ1, esqpanel2x16_sq1_device, "esqpanel216_sq1", "Ensoniq front panel with 2x16 LCD")
//**************************************************************************
// LIVE DEVICE
@@ -26,8 +26,8 @@ const device_type ESQPANEL2x16_SQ1 = device_creator<esqpanel2x16_sq1_device>;
// esqpanel_device - constructor
//-------------------------------------------------
-esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+esqpanel_device::esqpanel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_write_tx(*this),
m_write_analog(*this)
@@ -201,7 +201,7 @@ void esqpanel_device::set_analog_value(offs_t offset, uint16_t value)
/* panel with 1x22 VFD display used in the EPS-16 and EPS-16 Plus */
static MACHINE_CONFIG_FRAGMENT(esqpanel1x22)
- MCFG_ESQ1x22_ADD("vfd")
+ MCFG_ESQ1X22_ADD("vfd")
MACHINE_CONFIG_END
machine_config_constructor esqpanel1x22_device::device_mconfig_additions() const
@@ -210,7 +210,7 @@ machine_config_constructor esqpanel1x22_device::device_mconfig_additions() const
}
esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- esqpanel_device(mconfig, ESQPANEL1x22, "Ensoniq front panel with 1x22 VFD", tag, owner, clock, "esqpanel122", __FILE__),
+ esqpanel_device(mconfig, ESQPANEL1X22, tag, owner, clock),
m_vfd(*this, "vfd")
{
m_eps_mode = true;
@@ -219,7 +219,7 @@ esqpanel1x22_device::esqpanel1x22_device(const machine_config &mconfig, const ch
/* panel with 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */
static MACHINE_CONFIG_FRAGMENT(esqpanel2x40)
- MCFG_ESQ2x40_ADD("vfd")
+ MCFG_ESQ2X40_ADD("vfd")
MACHINE_CONFIG_END
machine_config_constructor esqpanel2x40_device::device_mconfig_additions() const
@@ -228,7 +228,7 @@ machine_config_constructor esqpanel2x40_device::device_mconfig_additions() const
}
esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- esqpanel_device(mconfig, ESQPANEL2x40, "Ensoniq front panel with 2x40 VFD", tag, owner, clock, "esqpanel240", __FILE__),
+ esqpanel_device(mconfig, ESQPANEL2X40, tag, owner, clock),
m_vfd(*this, "vfd")
{
m_eps_mode = false;
@@ -236,7 +236,7 @@ esqpanel2x40_device::esqpanel2x40_device(const machine_config &mconfig, const ch
// --- SQ1 - Parduz --------------------------------------------------------------------------------------------------------------------------
static MACHINE_CONFIG_FRAGMENT(esqpanel2x16_sq1)
- MCFG_ESQ2x16_SQ1_ADD("vfd")
+ MCFG_ESQ2X16_SQ1_ADD("vfd")
MACHINE_CONFIG_END
// --- SQ1 - Parduz --------------------------------------------------------------------------------------------------------------------------
machine_config_constructor esqpanel2x16_sq1_device::device_mconfig_additions() const
@@ -245,7 +245,7 @@ machine_config_constructor esqpanel2x16_sq1_device::device_mconfig_additions() c
}
// --- SQ1 - Parduz --------------------------------------------------------------------------------------------------------------------------
esqpanel2x16_sq1_device::esqpanel2x16_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- esqpanel_device(mconfig, ESQPANEL2x16_SQ1, "Ensoniq front panel with 2x16 LCD", tag, owner, clock, "esqpanel216_sq1", __FILE__),
+ esqpanel_device(mconfig, ESQPANEL2X16_SQ1, tag, owner, clock),
m_vfd(*this, "vfd")
{
m_eps_mode = false;
diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h
index f92ad91d501..2a2352507a4 100644
--- a/src/mame/machine/esqpanel.h
+++ b/src/mame/machine/esqpanel.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#pragma once
+#ifndef MAME_MACHINE_ESQPANEL_H
+#define MAME_MACHINE_ESQPANEL_H
-#ifndef __ESQPANEL_H__
-#define __ESQPANEL_H__
+#pragma once
#include "machine/esqvfd.h"
#include "machine/esqlcd.h"
@@ -12,31 +12,31 @@
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
-#define MCFG_ESQPANEL1x22_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQPANEL1x22, 0)
+#define MCFG_ESQPANEL1X22_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQPANEL1X22, 0)
-#define MCFG_ESQPANEL1x22_REPLACE(_tag) \
- MCFG_DEVICE_REPLACE(_tag, ESQPANEL1x22, 0)
+#define MCFG_ESQPANEL1X22_REPLACE(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, ESQPANEL1X22, 0)
-#define MCFG_ESQPANEL1x22_REMOVE(_tag) \
+#define MCFG_ESQPANEL1X22_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-#define MCFG_ESQPANEL2x40_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQPANEL2x40, 0)
+#define MCFG_ESQPANEL2X40_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQPANEL2X40, 0)
-#define MCFG_ESQPANEL2x40_REPLACE(_tag) \
- MCFG_DEVICE_REPLACE(_tag, ESQPANEL2x40, 0)
+#define MCFG_ESQPANEL2X40_REPLACE(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, ESQPANEL2X40, 0)
-#define MCFG_ESQPANEL_2x40_REMOVE(_tag) \
+#define MCFG_ESQPANEL_2X40_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-#define MCFG_ESQPANEL2x16_SQ1_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQPANEL2x16_SQ1, 0)
+#define MCFG_ESQPANEL2X16_SQ1_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQPANEL2X16_SQ1, 0)
-#define MCFG_ESQPANEL2x16_SQ1_REPLACE(_tag) \
- MCFG_DEVICE_REPLACE(_tag, ESQPANEL2x16_SQ1, 0)
+#define MCFG_ESQPANEL2X16_SQ1_REPLACE(_tag) \
+ MCFG_DEVICE_REPLACE(_tag, ESQPANEL2X16_SQ1, 0)
-#define MCFG_ESQPANEL2x16_SQ1_REMOVE(_tag) \
+#define MCFG_ESQPANEL2X16_SQ1_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
#define MCFG_ESQPANEL_TX_CALLBACK(_write) \
@@ -51,21 +51,19 @@
// ======================> esqpanel_device
-class esqpanel_device : public device_t, public device_serial_interface
+class esqpanel_device : public device_t, public device_serial_interface
{
public:
- // construction/destruction
- esqpanel_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
- template<class _Object> static devcb_base &set_tx_wr_callback(device_t &device, _Object object) { return downcast<esqpanel_device &>(device).m_write_tx.set_callback(object); }
- template<class _Object> static devcb_base &set_analog_wr_callback(device_t &device, _Object object) { return downcast<esqpanel_device &>(device).m_write_analog.set_callback(object); }
-
- virtual void send_to_display(uint8_t data) = 0;
+ template <class Object> static devcb_base &set_tx_wr_callback(device_t &device, Object &&cb) { return downcast<esqpanel_device &>(device).m_write_tx.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_analog_wr_callback(device_t &device, Object &&cb) { return downcast<esqpanel_device &>(device).m_write_analog.set_callback(std::forward<Object>(cb)); }
void xmit_char(uint8_t data);
void set_analog_value(offs_t offset, uint16_t value);
protected:
+ // construction/destruction
+ esqpanel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -76,6 +74,8 @@ protected:
virtual void tra_complete() override; // Tx completed sending byte
virtual void tra_callback() override; // Tx send bit
+ virtual void send_to_display(uint8_t data) = 0;
+
bool m_eps_mode;
private:
@@ -95,42 +95,36 @@ class esqpanel1x22_device : public esqpanel_device {
public:
esqpanel1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_device<esq1x22_t> m_vfd;
-
- virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
-
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-private:
+ virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
+
+ required_device<esq1x22_device> m_vfd;
};
class esqpanel2x40_device : public esqpanel_device {
public:
esqpanel2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_device<esq2x40_t> m_vfd;
-
- virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
-
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-private:
+ virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
+
+ required_device<esq2x40_device> m_vfd;
};
class esqpanel2x40_sq1_device : public esqpanel_device {
public:
esqpanel2x40_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_device<esq2x40_sq1_t> m_vfd;
-
- virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
-
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-private:
+ virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
+
+ required_device<esq2x40_sq1_device> m_vfd;
};
// --- SQ1 - Parduz --------------------------------------------------------------------------------------------------------------------------
@@ -138,18 +132,17 @@ class esqpanel2x16_sq1_device : public esqpanel_device {
public:
esqpanel2x16_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_device<esq2x16_sq1_t> m_vfd;
-
- virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
-
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-private:
+ virtual void send_to_display(uint8_t data) override { m_vfd->write_char(data); }
+
+ required_device<esq2x16_sq1_device> m_vfd;
};
-extern const device_type ESQPANEL1x22;
-extern const device_type ESQPANEL2x40;
-extern const device_type ESQPANEL2x16_SQ1;
+DECLARE_DEVICE_TYPE(ESQPANEL1X22, esqpanel1x22_device)
+DECLARE_DEVICE_TYPE(ESQPANEL2X40, esqpanel2x40_device)
+DECLARE_DEVICE_TYPE(ESQPANEL2X40_SQ1, esqpanel2x40_sq1_device)
+DECLARE_DEVICE_TYPE(ESQPANEL2X16_SQ1, esqpanel2x16_sq1_device)
-#endif
+#endif // MAME_MACHINE_ESQPANEL_H
diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp
index 81a7400b223..06b8a4b3073 100644
--- a/src/mame/machine/esqvfd.cpp
+++ b/src/mame/machine/esqvfd.cpp
@@ -7,12 +7,13 @@
#include "emu.h"
#include "esqvfd.h"
+
#include "esq1by22.lh"
#include "esq2by40.lh"
-const device_type ESQ1x22 = device_creator<esq1x22_t>;
-const device_type ESQ2x40 = device_creator<esq2x40_t>;
-const device_type ESQ2x40_SQ1 = device_creator<esq2x40_sq1_t>;
+DEFINE_DEVICE_TYPE(ESQ1X22, esq1x22_device, "esq1x22", "Ensoniq 1x22 VFD")
+DEFINE_DEVICE_TYPE(ESQ2X40, esq2x40_device, "esq2x40", "Ensoniq 2x40 VFD")
+DEFINE_DEVICE_TYPE(ESQ2X40_SQ1, esq2x40_sq1_device, "esq2x40_sq1", "Ensoniq 2x40 VFD (SQ-1 variant)")
// adapted from bfm_bd1, rearranged to work with ASCII data used by the Ensoniq h/w
static const uint16_t font[]=
@@ -115,16 +116,16 @@ static const uint16_t font[]=
0x0000, // 0000 0000 0000 0000 (DEL)
};
-esqvfd_t::esqvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+esqvfd_device::esqvfd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock)
{
}
-void esqvfd_t::device_start()
+void esqvfd_device::device_start()
{
}
-void esqvfd_t::device_reset()
+void esqvfd_device::device_reset()
{
m_cursx = m_cursy = 0;
m_savedx = m_savedy = 0;
@@ -135,12 +136,12 @@ void esqvfd_t::device_reset()
memset(m_dirty, 1, sizeof(m_attrs));
}
-void esqvfd_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void esqvfd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
}
// why isn't the font just stored in this order?
-uint32_t esqvfd_t::conv_segments(uint16_t segin)
+uint32_t esqvfd_device::conv_segments(uint16_t segin)
{
uint32_t segout = 0;
@@ -164,7 +165,7 @@ uint32_t esqvfd_t::conv_segments(uint16_t segin)
}
// generic display update; can override from child classes if not good enough
-void esqvfd_t::update_display()
+void esqvfd_device::update_display()
{
for (int row = 0; row < m_rows; row++)
{
@@ -194,12 +195,12 @@ static MACHINE_CONFIG_FRAGMENT(esq2x40)
MCFG_DEFAULT_LAYOUT(layout_esq2by40)
MACHINE_CONFIG_END
-machine_config_constructor esq2x40_t::device_mconfig_additions() const
+machine_config_constructor esq2x40_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( esq2x40 );
}
-void esq2x40_t::write_char(int data)
+void esq2x40_device::write_char(int data)
{
// ESQ-1 sends (cursor move) 0xfa 0xYY to mark YY characters as underlined at the current cursor location
if (m_lastchar == 0xfa)
@@ -282,7 +283,7 @@ void esq2x40_t::write_char(int data)
update_display();
}
-esq2x40_t::esq2x40_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_t(mconfig, ESQ2x40, "Ensoniq 2x40 VFD", tag, owner, clock, "esq2x40", __FILE__)
+esq2x40_device::esq2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_device(mconfig, ESQ2X40, tag, owner, clock)
{
m_rows = 2;
m_cols = 40;
@@ -294,12 +295,12 @@ static MACHINE_CONFIG_FRAGMENT(esq1x22)
MCFG_DEFAULT_LAYOUT(layout_esq1by22)
MACHINE_CONFIG_END
-machine_config_constructor esq1x22_t::device_mconfig_additions() const
+machine_config_constructor esq1x22_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( esq1x22 );
}
-void esq1x22_t::write_char(int data)
+void esq1x22_device::write_char(int data)
{
if (data >= 0x60)
{
@@ -335,34 +336,34 @@ void esq1x22_t::write_char(int data)
update_display();
}
-esq1x22_t::esq1x22_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_t(mconfig, ESQ1x22, "Ensoniq 1x22 VFD", tag, owner, clock, "esq1x22", __FILE__)
+esq1x22_device::esq1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_device(mconfig, ESQ1X22, tag, owner, clock)
{
m_rows = 1;
m_cols = 22;
}
/* SQ-1 display, I think it's really an LCD but we'll deal with it for now */
-machine_config_constructor esq2x40_sq1_t::device_mconfig_additions() const
+machine_config_constructor esq2x40_sq1_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( esq2x40 ); // we use the normal 2x40 layout
}
-void esq2x40_sq1_t::write_char(int data)
+void esq2x40_sq1_device::write_char(int data)
{
if (data == 0x09) // musical note
{
data = '^'; // approximate for now
}
- if (m_Wait87Shift)
+ if (m_wait87shift)
{
m_cursy = (data >> 4) & 0xf;
m_cursx = data & 0xf;
- m_Wait87Shift = false;
+ m_wait87shift = false;
}
- else if (m_Wait88Shift)
+ else if (m_wait88shift)
{
- m_Wait88Shift = false;
+ m_wait88shift = false;
}
else if ((data >= 0x20) && (data <= 0x7f))
{
@@ -387,11 +388,11 @@ void esq2x40_sq1_t::write_char(int data)
}
else if (data == 0x87)
{
- m_Wait87Shift = true;
+ m_wait87shift = true;
}
else if (data == 0x88)
{
- m_Wait88Shift = true;
+ m_wait88shift = true;
}
else
{
@@ -399,10 +400,10 @@ void esq2x40_sq1_t::write_char(int data)
}
}
-esq2x40_sq1_t::esq2x40_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_t(mconfig, ESQ2x40_SQ1, "Ensoniq 2x40 VFD (SQ-1 variant)", tag, owner, clock, "esq2x40_sq1", __FILE__)
+esq2x40_sq1_device::esq2x40_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : esqvfd_device(mconfig, ESQ2X40_SQ1, tag, owner, clock)
{
m_rows = 2;
m_cols = 40;
- m_Wait87Shift = false;
- m_Wait88Shift = false;
+ m_wait87shift = false;
+ m_wait88shift = false;
}
diff --git a/src/mame/machine/esqvfd.h b/src/mame/machine/esqvfd.h
index f804bc698b5..ac70201defc 100644
--- a/src/mame/machine/esqvfd.h
+++ b/src/mame/machine/esqvfd.h
@@ -1,31 +1,29 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef ESQVFD_H
-#define ESQVFD_H
+#ifndef MAME_MACHINE_ESQVFD_H
+#define MAME_MACHINE_ESQVFD_H
-#define MCFG_ESQ1x22_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQ1x22, 60)
+#define MCFG_ESQ1X22_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQ1X22, 60)
#define MCFG_ESQ1x22_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-#define MCFG_ESQ2x40_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQ2x40, 60)
+#define MCFG_ESQ2X40_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQ2X40, 60)
-#define MCFG_ESQ2x40_REMOVE(_tag) \
+#define MCFG_ESQ2X40_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-#define MCFG_ESQ2x40_SQ1_ADD(_tag) \
- MCFG_DEVICE_ADD(_tag, ESQ2x40_SQ1, 60)
+#define MCFG_ESQ2X40_SQ1_ADD(_tag) \
+ MCFG_DEVICE_ADD(_tag, ESQ2X40_SQ1, 60)
-#define MCFG_ESQ2x40_SQ1_REMOVE(_tag) \
+#define MCFG_ESQ2X40_SQ1_REMOVE(_tag) \
MCFG_DEVICE_REMOVE(_tag)
-class esqvfd_t : public device_t {
+class esqvfd_device : public device_t {
public:
- esqvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
DECLARE_WRITE8_MEMBER( write ) { write_char(data); }
virtual void write_char(int data) = 0;
@@ -34,11 +32,13 @@ public:
uint32_t conv_segments(uint16_t segin);
protected:
- static const uint8_t AT_NORMAL = 0x00;
- static const uint8_t AT_BOLD = 0x01;
- static const uint8_t AT_UNDERLINE = 0x02;
- static const uint8_t AT_BLINK = 0x04;
- static const uint8_t AT_BLINKED = 0x80; // set when character should be blinked off
+ esqvfd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ static constexpr uint8_t AT_NORMAL = 0x00;
+ static constexpr uint8_t AT_BOLD = 0x01;
+ static constexpr uint8_t AT_UNDERLINE = 0x02;
+ static constexpr uint8_t AT_BLINK = 0x04;
+ static constexpr uint8_t AT_BLINKED = 0x80; // set when character should be blinked off
virtual void device_start() override;
virtual void device_reset() override;
@@ -54,9 +54,9 @@ protected:
uint8_t m_dirty[2][40];
};
-class esq1x22_t : public esqvfd_t {
+class esq1x22_device : public esqvfd_device {
public:
- esq1x22_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ esq1x22_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void write_char(int data) override;
@@ -66,21 +66,19 @@ protected:
private:
};
-class esq2x40_t : public esqvfd_t {
+class esq2x40_device : public esqvfd_device {
public:
- esq2x40_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ esq2x40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void write_char(int data) override;
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
-
-private:
};
-class esq2x40_sq1_t : public esqvfd_t {
+class esq2x40_sq1_device : public esqvfd_device {
public:
- esq2x40_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ esq2x40_sq1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual void write_char(int data) override;
@@ -88,11 +86,11 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
private:
- bool m_Wait87Shift, m_Wait88Shift;
+ bool m_wait87shift, m_wait88shift;
};
-extern const device_type ESQ1x22;
-extern const device_type ESQ2x40;
-extern const device_type ESQ2x40_SQ1;
+DECLARE_DEVICE_TYPE(ESQ1X22, esq1x22_device)
+DECLARE_DEVICE_TYPE(ESQ2X40, esq2x40_device)
+DECLARE_DEVICE_TYPE(ESQ2X40_SQ1, esq2x40_sq1_device)
-#endif
+#endif // MAME_MACHINE_ESQVFD_H
diff --git a/src/mame/machine/fd1089.cpp b/src/mame/machine/fd1089.cpp
index 03d4a17c476..e29fad8275c 100644
--- a/src/mame/machine/fd1089.cpp
+++ b/src/mame/machine/fd1089.cpp
@@ -142,8 +142,8 @@
//**************************************************************************
// device type definition
-const device_type FD1089A = device_creator<fd1089a_device>;
-const device_type FD1089B = device_creator<fd1089b_device>;
+DEFINE_DEVICE_TYPE(FD1089A, fd1089a_device, "fd1089a", "Hitachi FD1089A Encrypted CPU")
+DEFINE_DEVICE_TYPE(FD1089B, fd1089b_device, "fd1089b", "Hitachi FD1089B Encrypted CPU")
// common base lookup table, shared between A and B variants
const uint8_t fd1089_base_device::s_basetable_fd1089[0x100] =
@@ -221,26 +221,23 @@ ADDRESS_MAP_END
// fd1089_base_device - constructor
//-------------------------------------------------
-fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : m68000_device(mconfig, type, name, tag, owner, clock, shortname, source),
+fd1089_base_device::fd1089_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : m68000_device(mconfig, type, tag, owner, clock),
m_region(*this, DEVICE_SELF),
m_key(*this, "key"),
m_decrypted_opcodes(*this, ":fd1089_decrypted_opcodes")
{
- // override the name after the m68000 initializes
- m_name.assign(name);
-
// add the decrypted opcodes map
m_address_map[AS_DECRYPTED_OPCODES] = ADDRESS_MAP_NAME(decrypted_opcodes_map);
}
fd1089a_device::fd1089a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : fd1089_base_device(mconfig, FD1089A, "FD1089A", tag, owner, clock, "fd1089a", __FILE__)
+ : fd1089_base_device(mconfig, FD1089A, tag, owner, clock)
{
}
fd1089b_device::fd1089b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : fd1089_base_device(mconfig, FD1089B, "FD1089B", tag, owner, clock, "fd1089b", __FILE__)
+ : fd1089_base_device(mconfig, FD1089B, tag, owner, clock)
{
}
diff --git a/src/mame/machine/fd1089.h b/src/mame/machine/fd1089.h
index f77427ff3f6..4fc70bfc40f 100644
--- a/src/mame/machine/fd1089.h
+++ b/src/mame/machine/fd1089.h
@@ -12,8 +12,10 @@
***************************************************************************/
-#ifndef __FD1089_H__
-#define __FD1089_H__
+#ifndef MAME_MACHINE_FD1089_H
+#define MAME_MACHINE_FD1089_H
+
+#pragma once
#include "cpu/m68000/m68000.h"
@@ -23,8 +25,8 @@
//**************************************************************************
// device type definition
-extern const device_type FD1089A;
-extern const device_type FD1089B;
+DECLARE_DEVICE_TYPE(FD1089A, fd1089a_device)
+DECLARE_DEVICE_TYPE(FD1089B, fd1089b_device)
@@ -38,13 +40,13 @@ extern const device_type FD1089B;
class fd1089_base_device : public m68000_device
{
public:
- // construction/destruction
- fd1089_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// explicit decryption helpers
void decrypt(offs_t baseaddr, uint32_t size, offs_t regionoffs, uint16_t *opcodesptr, uint16_t *dataptr) { decrypt(baseaddr, size, &m_plaintext[regionoffs/2], opcodesptr, dataptr); }
protected:
+ // construction/destruction
+ fd1089_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device overrides
virtual void device_start() override;
@@ -102,4 +104,4 @@ protected:
};
-#endif
+#endif // MAME_MACHINE_FD1089_H
diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp
index a9af8ba32ea..14cfdd65aeb 100644
--- a/src/mame/machine/fd1094.cpp
+++ b/src/mame/machine/fd1094.cpp
@@ -379,7 +379,7 @@
//**************************************************************************
// device type definition
-const device_type FD1094 = device_creator<fd1094_device>;
+DEFINE_DEVICE_TYPE(FD1094, fd1094_device, "fd1094", "Hitachi FD1094 Encrypted CPU")
/*
317-0162 CPU also needs to mask:
@@ -553,7 +553,7 @@ uint16_t *fd1094_decryption_cache::decrypted_opcodes(uint8_t state)
fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m68000_device(mconfig, FD1094, "FD1094", tag, owner, clock, "fd1094", __FILE__)
+ : m68000_device(mconfig, FD1094, tag, owner, clock)
, m_decrypted_opcodes_bank(*this, "^fd1094_decrypted_opcodes")
, m_state(0x00)
, m_irqmode(false)
@@ -562,9 +562,6 @@ fd1094_device::fd1094_device(const machine_config &mconfig, const char *tag, dev
, m_rom(*this, DEVICE_SELF)
, m_key(*this, "key")
{
- // override the name after the m68000 initializes
- m_name.assign("FD1094");
-
// add the decrypted opcodes map
// m_address_map[AS_DECRYPTED_OPCODES] = ADDRESS_MAP_NAME(decrypted_opcodes_map);
diff --git a/src/mame/machine/fd1094.h b/src/mame/machine/fd1094.h
index ba04da2858a..41f4294da05 100644
--- a/src/mame/machine/fd1094.h
+++ b/src/mame/machine/fd1094.h
@@ -12,8 +12,10 @@
***************************************************************************/
-#ifndef __FD1094_H__
-#define __FD1094_H__
+#ifndef MAME_MACHINE_FD1094_H
+#define MAME_MACHINE_FD1094_H
+
+#pragma once
#include "cpu/m68000/m68000.h"
@@ -127,4 +129,4 @@ struct fd1094_constraint
uint16_t mask;
};
-#endif
+#endif // MAME_MACHINE_FD1094_H
diff --git a/src/mame/machine/fm_scsi.cpp b/src/mame/machine/fm_scsi.cpp
index 164f26e7610..ada0ef8cb7e 100644
--- a/src/mame/machine/fm_scsi.cpp
+++ b/src/mame/machine/fm_scsi.cpp
@@ -28,18 +28,38 @@
#include "fm_scsi.h"
#include "debugger.h"
+// SCSI input lines (from target)
+#define FMSCSI_LINE_REQ 0x80
+#define FMSCSI_LINE_IO 0x40
+#define FMSCSI_LINE_MSG 0x20
+#define FMSCSI_LINE_CD 0x10
+#define FMSCSI_LINE_BSY 0x08
+#define FMSCSI_LINE_EX 0x04
+#define FMSCSI_LINE_INT 0x02
+#define FMSCSI_LINE_PERR 0x01
+
+// SCSI output lines (to target)
+#define FMSCSI_LINE_WEN 0x80
+#define FMSCSI_LINE_IMSK 0x40
+#define FMSCSI_LINE_RMSK 0x20
+#define FMSCSI_LINE_ATN 0x10
+#define FMSCSI_LINE_WRD 0x08
+#define FMSCSI_LINE_SEL 0x04
+#define FMSCSI_LINE_DMAE 0x02
+#define FMSCSI_LINE_RST 0x01
+
/*
* Device config
*/
-const device_type FMSCSI = device_creator<fmscsi_device>;
+DEFINE_DEVICE_TYPE(FMSCSI, fmscsi_device, "fmscsi", "FM-SCSI")
/*
* Device
*/
fmscsi_device::fmscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : legacy_scsi_host_adapter(mconfig, FMSCSI, "FM-SCSI", tag, owner, clock, "fmscsi", __FILE__),
+ : legacy_scsi_host_adapter(mconfig, FMSCSI, tag, owner, clock),
m_irq_handler(*this),
m_drq_handler(*this)
{
diff --git a/src/mame/machine/fm_scsi.h b/src/mame/machine/fm_scsi.h
index 895d25e494c..d9d3a09d1e0 100644
--- a/src/mame/machine/fm_scsi.h
+++ b/src/mame/machine/fm_scsi.h
@@ -7,31 +7,11 @@
*
*/
-#ifndef FM_SCSI_H_
-#define FM_SCSI_H_
+#ifndef MAME_MACHINE_FM_SCSI_H
+#define MAME_MACHINE_FM_SCSI_H
#include "machine/legscsi.h"
-// SCSI input lines (from target)
-#define FMSCSI_LINE_REQ 0x80
-#define FMSCSI_LINE_IO 0x40
-#define FMSCSI_LINE_MSG 0x20
-#define FMSCSI_LINE_CD 0x10
-#define FMSCSI_LINE_BSY 0x08
-#define FMSCSI_LINE_EX 0x04
-#define FMSCSI_LINE_INT 0x02
-#define FMSCSI_LINE_PERR 0x01
-
-// SCSI output lines (to target)
-#define FMSCSI_LINE_WEN 0x80
-#define FMSCSI_LINE_IMSK 0x40
-#define FMSCSI_LINE_RMSK 0x20
-#define FMSCSI_LINE_ATN 0x10
-#define FMSCSI_LINE_WRD 0x08
-#define FMSCSI_LINE_SEL 0x04
-#define FMSCSI_LINE_DMAE 0x02
-#define FMSCSI_LINE_RST 0x01
-
#define MCFG_FMSCSI_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, FMSCSI, 0)
@@ -47,8 +27,8 @@ public:
fmscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<fmscsi_device &>(device).m_irq_handler.set_callback(object); }
- template<class _Object> static devcb_base &set_drq_handler(device_t &device, _Object object) { return downcast<fmscsi_device &>(device).m_drq_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb) { return downcast<fmscsi_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_drq_handler(device_t &device, Object &&cb) { return downcast<fmscsi_device &>(device).m_drq_handler.set_callback(std::forward<Object>(cb)); }
// any publically accessible interfaces needed for runtime
uint8_t fmscsi_data_r(void);
@@ -98,6 +78,6 @@ private:
emu_timer* m_phase_timer;
};
-extern const device_type FMSCSI;
+DECLARE_DEVICE_TYPE(FMSCSI, fmscsi_device)
-#endif /* FM_SCSI_H_ */
+#endif // MAME_MACHINE_FM_SCSI_H
diff --git a/src/mame/machine/fmt_icmem.cpp b/src/mame/machine/fmt_icmem.cpp
index 2d19ca908fb..d0ab625a508 100644
--- a/src/mame/machine/fmt_icmem.cpp
+++ b/src/mame/machine/fmt_icmem.cpp
@@ -14,14 +14,14 @@
#include "fmt_icmem.h"
// device type definition
-const device_type FMT_ICMEM = device_creator<fmt_icmem_device>;
+DEFINE_DEVICE_TYPE(FMT_ICMEM, fmt_icmem_device, "fmt_icmem", "FM Towns IC Memory Card")
//-------------------------------------------------
// fmt_icmem_device - constructor
//-------------------------------------------------
fmt_icmem_device::fmt_icmem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, FMT_ICMEM, "FM Towns IC Memory Card", tag, owner, clock, "fmt_icmem", __FILE__),
+ : device_t(mconfig, FMT_ICMEM, tag, owner, clock),
device_image_interface(mconfig, *this),
m_writeprotect(*this,"icmem"),
m_change(false),
diff --git a/src/mame/machine/fmt_icmem.h b/src/mame/machine/fmt_icmem.h
index b9def9a8f30..6b3c8456687 100644
--- a/src/mame/machine/fmt_icmem.h
+++ b/src/mame/machine/fmt_icmem.h
@@ -8,10 +8,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_FMT_ICMEM_H
+#define MAME_MACHINE_FMT_ICMEM_H
-#ifndef __FMT_ICMEM_H__
-#define __FMT_ICMEM_H__
+#pragma once
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
@@ -24,8 +24,7 @@
FUNCTION PROTOTYPES
***************************************************************************/
-class fmt_icmem_device : public device_t,
- public device_image_interface
+class fmt_icmem_device : public device_t, public device_image_interface
{
public:
// construction/destruction
@@ -70,7 +69,7 @@ private:
// device type definition
-extern const device_type FMT_ICMEM;
+DECLARE_DEVICE_TYPE(FMT_ICMEM, fmt_icmem_device)
-#endif /* __FMT_ICMEM_H__ */
+#endif // MAME_MACHINE_FMT_ICMEM_H
diff --git a/src/mame/machine/gaelco3d.cpp b/src/mame/machine/gaelco3d.cpp
index f1a7c4851b7..331c0a62774 100644
--- a/src/mame/machine/gaelco3d.cpp
+++ b/src/mame/machine/gaelco3d.cpp
@@ -54,6 +54,18 @@
#define LOGMSG(x) do {} while (0);
#endif
+/* external status bits */
+#define GAELCOSER_STATUS_READY 0x01
+#define GAELCOSER_STATUS_RTS 0x02
+
+/* only RTS currently understood ! */
+//#define GAELCOSER_STATUS_DTR 0x04
+
+/* internal bits follow ... */
+#define GAELCOSER_STATUS_IRQ_ENABLE 0x10
+#define GAELCOSER_STATUS_RESET 0x20
+#define GAELCOSER_STATUS_SEND 0x40
+
/*
* 115200 seems plausible, radikalb won't work below this speed
* surfplnt will not work below 460800 ....
@@ -82,7 +94,7 @@
/* code below currently works on unix only */
#ifdef SHARED_MEM_DRIVER
-static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t size)
+gaelco_serial_device::osd_shared_mem *gaelco_serial_device::osd_sharedmem_alloc(const char *path, int create, size_t size)
{
int fd;
osd_shared_mem *os_shmem = (osd_shared_mem *)malloc(sizeof(osd_shared_mem));
@@ -117,7 +129,7 @@ static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t
return os_shmem;
}
-static void osd_sharedmem_free(osd_shared_mem *os_shmem)
+void gaelco_serial_device::osd_sharedmem_free(osd_shared_mem *os_shmem)
{
munmap(os_shmem->ptr, os_shmem->size);
if (os_shmem->creator)
@@ -126,12 +138,12 @@ static void osd_sharedmem_free(osd_shared_mem *os_shmem)
free(os_shmem);
}
-static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
+void *gaelco_serial_device::osd_sharedmem_ptr(osd_shared_mem *os_shmem)
{
return os_shmem->ptr;
}
#else
-static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t size)
+gaelco_serial_device::osd_shared_mem *gaelco_serial_device::osd_sharedmem_alloc(const char *path, int create, size_t size)
{
osd_shared_mem *os_shmem = (osd_shared_mem *) malloc(sizeof(osd_shared_mem));
@@ -142,13 +154,13 @@ static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t
return os_shmem;
}
-static void osd_sharedmem_free(osd_shared_mem *os_shmem)
+void gaelco_serial_device::osd_sharedmem_free(osd_shared_mem *os_shmem)
{
free(os_shmem->ptr);
free(os_shmem);
}
-static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
+void *gaelco_serial_device::osd_sharedmem_ptr(osd_shared_mem *os_shmem)
{
return os_shmem->ptr;
}
@@ -160,18 +172,18 @@ static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem)
#define PATH_NAME "/tmp/gaelco_serial"
-static void buf_reset(buf_t *buf)
+void gaelco_serial_device::buf_reset(buf_t *buf)
{
- buf->stat = GAELCOSER_STATUS_RTS| GAELCOSER_STATUS_RESET;
+ buf->stat = GAELCOSER_STATUS_RTS | GAELCOSER_STATUS_RESET;
buf->data = 0;
buf->data_cnt = -1;
buf->cnt = 0;
}
-const device_type GAELCO_SERIAL = device_creator<gaelco_serial_device>;
+DEFINE_DEVICE_TYPE(GAELCO_SERIAL, gaelco_serial_device, "gaelco_serial", "Gaelco 3D Serial Hardware")
gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GAELCO_SERIAL, "Gaelco 3D Serial Hardware", tag, owner, clock, "gaelco_serial", __FILE__),
+ : device_t(mconfig, GAELCO_SERIAL, tag, owner, clock),
m_irq_handler(*this),
m_status(0),
m_last_in_msg_cnt(0),
diff --git a/src/mame/machine/gaelco3d.h b/src/mame/machine/gaelco3d.h
index 50e9fafdaed..85ba9283a3e 100644
--- a/src/mame/machine/gaelco3d.h
+++ b/src/mame/machine/gaelco3d.h
@@ -5,6 +5,10 @@
Gaelco 3D serial hardware
***************************************************************************/
+#ifndef MAME_MACHINE_GAELCO3D_H
+#define MAME_MACHINE_GAELCO3D_H
+
+#pragma once
/***************************************************************************
@@ -14,20 +18,6 @@
#define MCFG_GAELCO_SERIAL_IRQ_HANDLER(_devcb) \
devcb = &gaelco_serial_device::set_irq_handler(*device, DEVCB_##_devcb);
-/* external status bits */
-#define GAELCOSER_STATUS_READY 0x01
-#define GAELCOSER_STATUS_RTS 0x02
-
-/* only RTS currently understood ! */
-//#define GAELCOSER_STATUS_DTR 0x04
-
-#define GAELCOSER_EXT_STATUS_MASK 0x03
-
-/* internal bits follow ... */
-#define GAELCOSER_STATUS_IRQ_ENABLE 0x10
-#define GAELCOSER_STATUS_RESET 0x20
-#define GAELCOSER_STATUS_SEND 0x40
-
/***************************************************************************
@@ -36,34 +26,14 @@
/* ----- device interface ----- */
-struct buf_t
-{
- volatile uint8_t data;
- volatile uint8_t stat;
- volatile int cnt;
- volatile int data_cnt;
-};
-
-struct shmem_t
-{
- buf_t buf[2];
-};
-
-struct osd_shared_mem
-{
- char *fn;
- size_t size;
- void *ptr;
- int creator;
-};
-
class gaelco_serial_device : public device_t
{
public:
+ static constexpr unsigned EXT_STATUS_MASK = 0x03;
+
gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~gaelco_serial_device() {}
- template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<gaelco_serial_device &>(device).m_irq_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb) { return downcast<gaelco_serial_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( status_r);
DECLARE_WRITE8_MEMBER( data_w);
@@ -91,6 +61,33 @@ protected:
virtual void device_reset() override;
private:
+ struct buf_t
+ {
+ volatile uint8_t data;
+ volatile uint8_t stat;
+ volatile int cnt;
+ volatile int data_cnt;
+ };
+
+ struct shmem_t
+ {
+ buf_t buf[2];
+ };
+
+ struct osd_shared_mem
+ {
+ char *fn;
+ size_t size;
+ void *ptr;
+ int creator;
+ };
+
+ static osd_shared_mem *osd_sharedmem_alloc(const char *path, int create, size_t size);
+ static void osd_sharedmem_free(osd_shared_mem *os_shmem);
+ static void *osd_sharedmem_ptr(osd_shared_mem *os_shmem);
+
+ static void buf_reset(buf_t *buf);
+
// internal state
devcb_write_line m_irq_handler;
@@ -114,3 +111,5 @@ private:
};
extern const device_type GAELCO_SERIAL;
+
+#endif // MAME_MACHINE_GAELCO3D_H
diff --git a/src/mame/machine/gdrom.cpp b/src/mame/machine/gdrom.cpp
index e7420ec9383..5f6bd02fe17 100644
--- a/src/mame/machine/gdrom.cpp
+++ b/src/mame/machine/gdrom.cpp
@@ -434,10 +434,10 @@ void gdrom_device::WriteData( uint8_t *data, int dataLength )
}
// device type definition
-const device_type GDROM = device_creator<gdrom_device>;
+DEFINE_DEVICE_TYPE(GDROM, gdrom_device, "gdrom", "GD-ROM")
gdrom_device::gdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- atapi_cdrom_device(mconfig, GDROM, "GDROM", tag, owner, clock, "gdrom", __FILE__)
+ atapi_cdrom_device(mconfig, GDROM, tag, owner, clock)
{
}
diff --git a/src/mame/machine/gdrom.h b/src/mame/machine/gdrom.h
index 954e3b29231..eae39ce0541 100644
--- a/src/mame/machine/gdrom.h
+++ b/src/mame/machine/gdrom.h
@@ -6,8 +6,10 @@
***************************************************************************/
-#ifndef _GDROM_H_
-#define _GDROM_H_
+#ifndef MAME_MACHINE_GDROM_H
+#define MAME_MACHINE_GDROM_H
+
+#pragma once
#include "machine/atapicdr.h"
@@ -36,7 +38,6 @@ private:
uint32_t transferOffset;
};
-// device type definition
-extern const device_type GDROM;
+DECLARE_DEVICE_TYPE(GDROM, gdrom_device)
-#endif
+#endif // MAME_MACHINE_GDROM_H
diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp
index 72aba7c92b7..1dfd2e05b56 100644
--- a/src/mame/machine/hp48.cpp
+++ b/src/mame/machine/hp48.cpp
@@ -914,7 +914,7 @@ void hp48_state::hp48_encode_nibble( uint8_t* dst, uint8_t* src, int size )
/* ----- card images ------ */
-const device_type HP48_PORT = device_creator<hp48_port_image_device>;
+DEFINE_DEVICE_TYPE(HP48_PORT, hp48_port_image_device, "hp48_port_image", "HP48 memory card")
/* helper for load and create */
void hp48_port_image_device::hp48_fill_port()
@@ -1011,8 +1011,8 @@ void hp48_port_image_device::device_start()
}
hp48_port_image_device::hp48_port_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, HP48_PORT, "HP48 memory card", tag, owner, clock, "hp48_port_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, HP48_PORT, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp
index 094bae9c931..732627f7eb1 100644
--- a/src/mame/machine/ibm6580_fdc.cpp
+++ b/src/mame/machine/ibm6580_fdc.cpp
@@ -3,6 +3,8 @@
#include "emu.h"
#include "ibm6580_fdc.h"
+#include "cpu/mcs48/mcs48.h"
+
#define VERBOSE_DBG 2 /* general debug messages */
@@ -17,7 +19,7 @@
} while (0)
-const device_type DW_FDC = device_creator<dw_fdc_device>;
+DEFINE_DEVICE_TYPE(DW_FDC, dw_fdc_device, "dw_fdc", "IBM Displaywriter Floppy")
ROM_START( dw_fdc )
ROM_REGION(0x800, "mcu", 0)
@@ -54,7 +56,7 @@ machine_config_constructor dw_fdc_device::device_mconfig_additions() const
}
dw_fdc_device::dw_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DW_FDC, "IBM Displaywriter Floppy", tag, owner, clock, "dw_kbd", __FILE__)
+ : device_t(mconfig, DW_FDC, tag, owner, clock)
, m_out_data(*this)
, m_out_clock(*this)
, m_out_strobe(*this)
diff --git a/src/mame/machine/ibm6580_fdc.h b/src/mame/machine/ibm6580_fdc.h
index 88ad3253e78..b76562a9357 100644
--- a/src/mame/machine/ibm6580_fdc.h
+++ b/src/mame/machine/ibm6580_fdc.h
@@ -1,9 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
-#ifndef DWFDC_H_
-#define DWFDC_H_
+#ifndef MAME_MACHINE_IBM6580_FDC_H
+#define MAME_MACHINE_IBM6580_FDC_H
+
+#pragma once
-#include "cpu/mcs48/mcs48.h"
#include "machine/i8255.h"
#include "machine/upd765.h"
@@ -23,9 +24,9 @@ class dw_fdc_device : public device_t
public:
dw_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_data_handler(device_t &device, _Object object) { return downcast<dw_fdc_device &>(device).m_out_data.set_callback(object); }
- template<class _Object> static devcb_base &set_out_clock_handler(device_t &device, _Object object) { return downcast<dw_fdc_device &>(device).m_out_clock.set_callback(object); }
- template<class _Object> static devcb_base &set_out_strobe_handler(device_t &device, _Object object) { return downcast<dw_fdc_device &>(device).m_out_strobe.set_callback(object); }
+ template <class Object> static devcb_base &set_out_data_handler(device_t &device, Object &&cb) { return downcast<dw_fdc_device &>(device).m_out_data.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_clock_handler(device_t &device, Object &&cb) { return downcast<dw_fdc_device &>(device).m_out_clock.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_strobe_handler(device_t &device, Object &&cb) { return downcast<dw_fdc_device &>(device).m_out_strobe.set_callback(std::forward<Object>(cb)); }
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,6 +55,6 @@ private:
required_device<cpu_device> m_mcu;
};
-extern const device_type DW_FDC;
+DECLARE_DEVICE_TYPE(DW_FDC, dw_fdc_device)
-#endif /* DWFDC_H_ */
+#endif // MAME_MACHINE_IBM6580_FDC_H
diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp
index e550f591389..950a7d34695 100644
--- a/src/mame/machine/ibm6580_kbd.cpp
+++ b/src/mame/machine/ibm6580_kbd.cpp
@@ -3,6 +3,9 @@
#include "emu.h"
#include "ibm6580_kbd.h"
+#include "cpu/mcs48/mcs48.h"
+
+
#define VERBOSE_DBG 0 /* general debug messages */
#define DBG_LOG(N,M,A) \
@@ -16,7 +19,7 @@
} while (0)
-const device_type DW_KEYBOARD = device_creator<dw_keyboard_device>;
+DEFINE_DEVICE_TYPE(DW_KEYBOARD, dw_keyboard_device, "dw_kbd", "IBM Displaywriter Keyboard")
ROM_START( dw_keyboard )
ROM_REGION(0x800, "mcu", 0)
@@ -183,7 +186,7 @@ ioport_constructor dw_keyboard_device::device_input_ports() const
}
dw_keyboard_device::dw_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DW_KEYBOARD, "IBM Displaywriter Keyboard", tag, owner, clock, "dw_kbd", __FILE__)
+ : device_t(mconfig, DW_KEYBOARD, tag, owner, clock)
, m_kbd(*this, "COL.%u", 0)
, m_out_data(*this)
, m_out_clock(*this)
diff --git a/src/mame/machine/ibm6580_kbd.h b/src/mame/machine/ibm6580_kbd.h
index a1491196ec1..b5e583ea7bc 100644
--- a/src/mame/machine/ibm6580_kbd.h
+++ b/src/mame/machine/ibm6580_kbd.h
@@ -1,9 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
-#ifndef DWKBD_H_
-#define DWKBD_H_
+#ifndef MAME_MACHINE_IBM6580_KBD_H
+#define MAME_MACHINE_IBM6580_KBD_H
+
+#pragma once
-#include "cpu/mcs48/mcs48.h"
#define MCFG_DW_KEYBOARD_OUT_DATA_HANDLER(_devcb) \
devcb = &dw_keyboard_device::set_out_data_handler(*device, DEVCB_##_devcb);
@@ -19,9 +20,9 @@ class dw_keyboard_device : public device_t
public:
dw_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_data_handler(device_t &device, _Object object) { return downcast<dw_keyboard_device &>(device).m_out_data.set_callback(object); }
- template<class _Object> static devcb_base &set_out_clock_handler(device_t &device, _Object object) { return downcast<dw_keyboard_device &>(device).m_out_clock.set_callback(object); }
- template<class _Object> static devcb_base &set_out_strobe_handler(device_t &device, _Object object) { return downcast<dw_keyboard_device &>(device).m_out_strobe.set_callback(object); }
+ template <class Object> static devcb_base &set_out_data_handler(device_t &device, Object &&cb) { return downcast<dw_keyboard_device &>(device).m_out_data.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_clock_handler(device_t &device, Object &&cb) { return downcast<dw_keyboard_device &>(device).m_out_clock.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_strobe_handler(device_t &device, Object &&cb) { return downcast<dw_keyboard_device &>(device).m_out_strobe.set_callback(std::forward<Object>(cb)); }
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -54,6 +55,6 @@ private:
required_device<cpu_device> m_mcu;
};
-extern const device_type DW_KEYBOARD;
+DECLARE_DEVICE_TYPE(DW_KEYBOARD, dw_keyboard_device)
-#endif /* DWKBD_H_ */
+#endif // MAME_MACHINE_IBM6580_KBD_H
diff --git a/src/mame/machine/igs022.cpp b/src/mame/machine/igs022.cpp
index afa5dda87e9..a46a6ba71b4 100644
--- a/src/mame/machine/igs022.cpp
+++ b/src/mame/machine/igs022.cpp
@@ -13,7 +13,7 @@
igs022_device::igs022_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IGS022, "IGS022", tag, owner, clock, "igs022", __FILE__)
+ : device_t(mconfig, IGS022, tag, owner, clock)
{
}
@@ -273,4 +273,4 @@ void igs022_device::IGS022_handle_command()
}
-const device_type IGS022 = device_creator<igs022_device>;
+DEFINE_DEVICE_TYPE(IGS022, igs022_device, "igs022", "IGS022")
diff --git a/src/mame/machine/igs022.h b/src/mame/machine/igs022.h
index 0460b1586d6..69c36bc9199 100644
--- a/src/mame/machine/igs022.h
+++ b/src/mame/machine/igs022.h
@@ -4,6 +4,8 @@
#ifndef MAME_MACHINE_IGS022_H
#define MAME_MACHINE_IGS022_H
+#pragma once
+
class igs022_device : public device_t
{
@@ -25,6 +27,6 @@ protected:
};
-extern const device_type IGS022;
+DECLARE_DEVICE_TYPE(IGS022, igs022_device)
#endif // MAME_MACHINE_IGS022_H
diff --git a/src/mame/machine/igs025.cpp b/src/mame/machine/igs025.cpp
index 5bbec6fa07e..c1e1b3d83e9 100644
--- a/src/mame/machine/igs025.cpp
+++ b/src/mame/machine/igs025.cpp
@@ -17,7 +17,7 @@
igs025_device::igs025_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IGS025, "IGS025", tag, owner, clock, "igs_025_022", __FILE__)
+ : device_t(mconfig, IGS025, tag, owner, clock)
{
m_execute_external = igs025_execute_external(FUNC(igs025_device::no_callback_setup), this);
}
@@ -352,8 +352,4 @@ void igs025_device::killbld_protection_calculate_hilo()
}
-
-
-
-
-const device_type IGS025 = device_creator<igs025_device>;
+DEFINE_DEVICE_TYPE(IGS025, igs025_device, "igs025", "IGS025")
diff --git a/src/mame/machine/igs025.h b/src/mame/machine/igs025.h
index d3dc87f0447..7d58b365b8b 100644
--- a/src/mame/machine/igs025.h
+++ b/src/mame/machine/igs025.h
@@ -4,6 +4,7 @@
#ifndef MAME_MACHINE_IGS025_H
#define MAME_MACHINE_IGS025_H
+#pragma once
// used to connect the 022
typedef device_delegate<void (void)> igs025_execute_external;
@@ -57,6 +58,6 @@ protected:
};
-extern const device_type IGS025;
+DECLARE_DEVICE_TYPE(IGS025, igs025_device)
#endif // MAME_MACHINE_IGS025_H
diff --git a/src/mame/machine/igs028.cpp b/src/mame/machine/igs028.cpp
index 74205936960..7060d33395f 100644
--- a/src/mame/machine/igs028.cpp
+++ b/src/mame/machine/igs028.cpp
@@ -12,7 +12,7 @@
igs028_device::igs028_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IGS028, "IGS028", tag, owner, clock, "igs028", __FILE__)
+ : device_t(mconfig, IGS028, tag, owner, clock)
{
}
@@ -212,4 +212,4 @@ void igs028_device::IGS028_handle()
}
-const device_type IGS028 = device_creator<igs028_device>;
+DEFINE_DEVICE_TYPE(IGS028, igs028_device, "igs028", "IGS028")
diff --git a/src/mame/machine/igs028.h b/src/mame/machine/igs028.h
index 911781d19ca..287f5671a51 100644
--- a/src/mame/machine/igs028.h
+++ b/src/mame/machine/igs028.h
@@ -4,6 +4,8 @@
#ifndef MAME_MACHINE_IGS028_H
#define MAME_MACHINE_IGS028_H
+#pragma once
+
class igs028_device : public device_t
{
@@ -25,6 +27,6 @@ protected:
};
-extern const device_type IGS028;
+DECLARE_DEVICE_TYPE(IGS028, igs028_device)
#endif // MAME_MACHINE_IGS028_H
diff --git a/src/mame/machine/inder_sb.cpp b/src/mame/machine/inder_sb.cpp
index b199717fa76..19087400189 100644
--- a/src/mame/machine/inder_sb.cpp
+++ b/src/mame/machine/inder_sb.cpp
@@ -10,14 +10,14 @@
#include "speaker.h"
-const device_type INDER_AUDIO = device_creator<inder_sb_device>;
+DEFINE_DEVICE_TYPE(INDER_AUDIO, inder_sb_device, "indersb", "Inder 4xDAC Sound Board")
inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, INDER_AUDIO, "Inder 4xDAC Sound Board", tag, owner, clock, "indersb", __FILE__),
- device_mixer_interface(mconfig, *this, 2),
- m_audiocpu(*this, "audiocpu"),
- m_ctc(*this, "ctc")
+ : device_t(mconfig, INDER_AUDIO, tag, owner, clock)
+ , device_mixer_interface(mconfig, *this, 2)
+ , m_audiocpu(*this, "audiocpu")
+ , m_ctc(*this, "ctc")
{
}
diff --git a/src/mame/machine/inder_sb.h b/src/mame/machine/inder_sb.h
index 87bed3d80ea..939e509bbe3 100644
--- a/src/mame/machine/inder_sb.h
+++ b/src/mame/machine/inder_sb.h
@@ -3,10 +3,10 @@
/* */
-#pragma once
+#ifndef MAME_MACHINE_INDER_SB_H
+#define MAME_MACHINE_INDER_SB_H
-#ifndef __INDER_AUDIO__
-#define __INDER_AUDIO__
+#pragma once
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
@@ -14,7 +14,7 @@
#include "sound/dac.h"
-extern const device_type INDER_AUDIO;
+DECLARE_DEVICE_TYPE(INDER_AUDIO, inder_sb_device)
#define MCFG_INDER_AUDIO_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, INDER_AUDIO, 0)
@@ -53,12 +53,6 @@ public:
DECLARE_READ16_MEMBER(megaphx_0x050002_r);
DECLARE_WRITE16_MEMBER(megaphx_0x050000_w);
- uint8_t m_soundbank[4];
-
- int m_soundsent;
- uint8_t m_sounddata;
- uint8_t m_soundback;
-
void install_sound_hacks(void);
void update_sound_irqs(void);
@@ -68,12 +62,15 @@ protected:
virtual void device_reset() override;
- int m_soundirq;
-
private:
+ uint8_t m_soundbank[4];
+ int m_soundsent;
+ uint8_t m_sounddata;
+ uint8_t m_soundback;
+ int m_soundirq;
};
-#endif
+#endif // MAME_MACHINE_INDER_SB_H
diff --git a/src/mame/machine/inder_vid.cpp b/src/mame/machine/inder_vid.cpp
index 82568dec121..bc3b7d3d97f 100644
--- a/src/mame/machine/inder_vid.cpp
+++ b/src/mame/machine/inder_vid.cpp
@@ -11,11 +11,11 @@
#include "screen.h"
-const device_type INDER_VIDEO = device_creator<inder_vid_device>;
+DEFINE_DEVICE_TYPE(INDER_VIDEO, inder_vid_device, "indervd", "Inder / Dinamic TMS Video")
inder_vid_device::inder_vid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, INDER_VIDEO, "Inder / Dinamic TMS Video", tag, owner, clock, "indervd", __FILE__),
+ : device_t(mconfig, INDER_VIDEO, tag, owner, clock),
/* device_video_interface(mconfig, *this, false), */
m_vram(*this, "vram"),
m_palette(*this, "palette"),
diff --git a/src/mame/machine/inder_vid.h b/src/mame/machine/inder_vid.h
index 581ba051228..5bb62591d15 100644
--- a/src/mame/machine/inder_vid.h
+++ b/src/mame/machine/inder_vid.h
@@ -6,35 +6,30 @@
/* */
-#pragma once
+#ifndef MAME_MACHINE_INDER_VID_H
+#define MAME_MACHINE_INDER_VID_H
-#ifndef __INDER_VIDEO__
-#define __INDER_VIDEO__
+#pragma once
#include "video/ramdac.h"
#include "cpu/tms34010/tms34010.h"
-extern const device_type INDER_VIDEO;
+DECLARE_DEVICE_TYPE(INDER_VIDEO, inder_vid_device)
#define MCFG_INDER_VIDEO_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, INDER_VIDEO, 0)
-class inder_vid_device : public device_t
+class inder_vid_device : public device_t
/* public device_video_interface */
{
public:
// construction/destruction
inder_vid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_shared_ptr<uint16_t> m_vram;
- required_device<palette_device> m_palette;
- required_device<tms34010_device> m_tms;
-
DECLARE_WRITE_LINE_MEMBER(m68k_gen_int);
- int m_shiftfull; // this might be a driver specific hack for a TMS bug.
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline);
@@ -45,6 +40,11 @@ protected:
virtual void device_reset() override;
private:
+ required_shared_ptr<uint16_t> m_vram;
+ required_device<palette_device> m_palette;
+ required_device<tms34010_device> m_tms;
+
+ int m_shiftfull; // this might be a driver specific hack for a TMS bug.
};
-#endif
+#endif // MAME_MACHINE_INDER_VID_H
diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp
index a169013b8fb..f08c03adef6 100644
--- a/src/mame/machine/interpro_ioga.cpp
+++ b/src/mame/machine/interpro_ioga.cpp
@@ -56,10 +56,10 @@ DEVICE_ADDRESS_MAP_START(map, 32, interpro_ioga_device)
AM_RANGE(0xb0, 0xbf) AM_READWRITE16(softint_vector_r, softint_vector_w, 0xffffffff)
ADDRESS_MAP_END
-const device_type INTERPRO_IOGA = device_creator<interpro_ioga_device>;
+DEFINE_DEVICE_TYPE(INTERPRO_IOGA, interpro_ioga_device, "ioga", "InterPro IOGA")
interpro_ioga_device::interpro_ioga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, INTERPRO_IOGA, "InterPro IOGA", tag, owner, clock, "ioga", __FILE__),
+ : device_t(mconfig, INTERPRO_IOGA, tag, owner, clock),
m_out_nmi_func(*this),
m_out_int_func(*this),
m_memory_space(nullptr),
diff --git a/src/mame/machine/interpro_ioga.h b/src/mame/machine/interpro_ioga.h
index 4c5f07bb8c8..34d8ed8f7dd 100644
--- a/src/mame/machine/interpro_ioga.h
+++ b/src/mame/machine/interpro_ioga.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#pragma once
+#ifndef MAME_MACHINE_INTERPRO_IOGA_H
+#define MAME_MACHINE_INTERPRO_IOGA_H
-#ifndef INTERPRO_IOGA_H_
-#define INTERPRO_IOGA_H_
+#pragma once
#define MCFG_INTERPRO_IOGA_ADD(_tag) \
@@ -249,6 +249,6 @@ private:
};
// device type definition
-extern const device_type INTERPRO_IOGA;
+DECLARE_DEVICE_TYPE(INTERPRO_IOGA, interpro_ioga_device)
-#endif
+#endif // MAME_MACHINE_INTERPRO_IOGA_H
diff --git a/src/mame/machine/interpro_mcga.cpp b/src/mame/machine/interpro_mcga.cpp
index e049a76f5ef..ac6b0546a2b 100644
--- a/src/mame/machine/interpro_mcga.cpp
+++ b/src/mame/machine/interpro_mcga.cpp
@@ -25,10 +25,10 @@ DEVICE_ADDRESS_MAP_START(map, 16, interpro_mcga_device)
AM_RANGE(0x00, 0x3f) AM_READWRITE16(read, write, 0xffff)
ADDRESS_MAP_END
-const device_type INTERPRO_MCGA = device_creator<interpro_mcga_device>;
+DEFINE_DEVICE_TYPE(INTERPRO_MCGA, interpro_mcga_device, "mcga", "InterPro MCGA")
interpro_mcga_device::interpro_mcga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, INTERPRO_MCGA, "InterPro MCGA", tag, owner, clock, "mcga", __FILE__)
+ : device_t(mconfig, INTERPRO_MCGA, tag, owner, clock)
{
}
diff --git a/src/mame/machine/interpro_mcga.h b/src/mame/machine/interpro_mcga.h
index 3f2dd2f489d..bb48f9b1689 100644
--- a/src/mame/machine/interpro_mcga.h
+++ b/src/mame/machine/interpro_mcga.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#pragma once
+#ifndef MAME_MACHINE_INTERPRO_MCGA_H
+#define MAME_MACHINE_INTERPRO_MCGA_H
-#ifndef INTERPRO_MCGA_H_
-#define INTERPRO_MCGA_H_
+#pragma once
// mcga control register
@@ -39,6 +39,6 @@ private:
};
// device type definition
-extern const device_type INTERPRO_MCGA;
+DECLARE_DEVICE_TYPE(INTERPRO_MCGA, interpro_mcga_device)
-#endif
+#endif // MAME_MACHINE_INTERPRO_MCGA_H
diff --git a/src/mame/machine/interpro_sga.cpp b/src/mame/machine/interpro_sga.cpp
index 37fddebd74f..332225ffd74 100644
--- a/src/mame/machine/interpro_sga.cpp
+++ b/src/mame/machine/interpro_sga.cpp
@@ -35,10 +35,10 @@ DEVICE_ADDRESS_MAP_START(map, 32, interpro_sga_device)
AM_RANGE(0xbc, 0xbf) AM_READWRITE(ddtc1_r, ddtc1_w)
ADDRESS_MAP_END
-const device_type INTERPRO_SGA = device_creator<interpro_sga_device>;
+DEFINE_DEVICE_TYPE(INTERPRO_SGA, interpro_sga_device, "sga", "InterPro SGA")
interpro_sga_device::interpro_sga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, INTERPRO_SGA, "InterPro SGA", tag, owner, clock, "sga", __FILE__)
+ : device_t(mconfig, INTERPRO_SGA, tag, owner, clock)
{
}
diff --git a/src/mame/machine/interpro_sga.h b/src/mame/machine/interpro_sga.h
index b48dbe61829..ab850ea01a2 100644
--- a/src/mame/machine/interpro_sga.h
+++ b/src/mame/machine/interpro_sga.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#pragma once
+#ifndef MAME_MACHINE_INTERPRO_SGA_H
+#define MAME_MACHINE_INTERPRO_SGA_H
-#ifndef INTERPRO_SGA_H_
-#define INTERPRO_SGA_H_
+#pragma once
class interpro_sga_device : public device_t
@@ -65,6 +65,6 @@ private:
};
// device type definition
-extern const device_type INTERPRO_SGA;
+DECLARE_DEVICE_TYPE(INTERPRO_SGA, interpro_sga_device)
-#endif
+#endif // MAME_MACHINE_INTERPRO_SGA_H
diff --git a/src/mame/machine/intv.cpp b/src/mame/machine/intv.cpp
index 68c3d2bf78f..3604a44b1d8 100644
--- a/src/mame/machine/intv.cpp
+++ b/src/mame/machine/intv.cpp
@@ -557,7 +557,7 @@ void intv_state::machine_reset()
m_maincpu->set_input_line_vector(CP1610_INT_INTR, 0x1004);
/* Set initial PC */
- m_maincpu->set_state_int(CP1610_R7, 0x1000);
+ m_maincpu->set_state_int(cp1610_cpu_device::CP1610_R7, 0x1000);
if (m_is_keybd)
{
@@ -646,8 +646,8 @@ TIMER_CALLBACK_MEMBER(intv_state::intv_btb_fill)
uint8_t row = m_backtab_row;
//m_maincpu->adjust_icount(-STIC_ROW_FETCH);
- for (int column = 0; column < STIC_BACKTAB_WIDTH; column++)
- m_stic->write_to_btb(row, column, m_ram16[column + row * STIC_BACKTAB_WIDTH]);
+ for (int column = 0; column < stic_device::BACKTAB_WIDTH; column++)
+ m_stic->write_to_btb(row, column, m_ram16[column + row * stic_device::BACKTAB_WIDTH]);
m_backtab_row += 1;
}
@@ -660,16 +660,16 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt)
m_bus_copy_mode = 1;
m_backtab_row = 0;
- m_maincpu->adjust_icount(-(12*STIC_ROW_BUSRQ+STIC_FRAME_BUSRQ)); // Account for stic cycle stealing
- timer_set(m_maincpu->cycles_to_attotime(STIC_VBLANK_END), TIMER_INTV_INTERRUPT_COMPLETE);
- for (int row = 0; row < STIC_BACKTAB_HEIGHT; row++)
+ m_maincpu->adjust_icount(-(12*stic_device::ROW_BUSRQ+stic_device::FRAME_BUSRQ)); // Account for stic cycle stealing
+ timer_set(m_maincpu->cycles_to_attotime(stic_device::VBLANK_END), TIMER_INTV_INTERRUPT_COMPLETE);
+ for (int row = 0; row < stic_device::BACKTAB_HEIGHT; row++)
{
- timer_set(m_maincpu->cycles_to_attotime(STIC_FIRST_FETCH-STIC_FRAME_BUSRQ+STIC_CYCLES_PER_SCANLINE*STIC_Y_SCALE*delay + (STIC_CYCLES_PER_SCANLINE*STIC_Y_SCALE*STIC_CARD_HEIGHT - STIC_ROW_BUSRQ)*row), TIMER_INTV_BTB_FILL);
+ timer_set(m_maincpu->cycles_to_attotime(stic_device::FIRST_FETCH-stic_device::FRAME_BUSRQ+stic_device::CYCLES_PER_SCANLINE*stic_device::Y_SCALE*delay + (stic_device::CYCLES_PER_SCANLINE*stic_device::Y_SCALE*stic_device::CARD_HEIGHT - stic_device::ROW_BUSRQ)*row), TIMER_INTV_BTB_FILL);
}
if (delay == 0)
{
- m_maincpu->adjust_icount(-STIC_ROW_BUSRQ); // extra row fetch occurs if vertical delay == 0
+ m_maincpu->adjust_icount(-stic_device::ROW_BUSRQ); // extra row fetch occurs if vertical delay == 0
}
m_stic->screenrefresh();
diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp
index df2562bd1f3..f7f21f80c9f 100644
--- a/src/mame/machine/isbc_208.cpp
+++ b/src/mame/machine/isbc_208.cpp
@@ -6,10 +6,13 @@
#include "emu.h"
#include "isbc_208.h"
-const device_type ISBC_208 = device_creator<isbc_208_device>;
+#include "formats/pc_dsk.h"
+
+
+DEFINE_DEVICE_TYPE(ISBC_208, isbc_208_device, "isbc_208", "ISBC 208 Flexible Disk Driver Controller")
isbc_208_device::isbc_208_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ISBC_208, "ISBC 208 Flexible Disk Drive Controller", tag, owner, clock, "isbc_208", __FILE__),
+ device_t(mconfig, ISBC_208, tag, owner, clock),
m_dmac(*this, "dmac"),
m_fdc(*this, "fdc"),
m_out_irq_func(*this)
diff --git a/src/mame/machine/isbc_208.h b/src/mame/machine/isbc_208.h
index 691266e0a67..0611cbe0007 100644
--- a/src/mame/machine/isbc_208.h
+++ b/src/mame/machine/isbc_208.h
@@ -1,10 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef ISBC_208_H_
-#define ISBC_208_H_
+#ifndef MAME_MACHINE_ISBC_208_H
+#define MAME_MACHINE_ISBC_208_H
+
+#pragma once
-#include "formats/pc_dsk.h"
#include "machine/upd765.h"
#include "machine/am9517a.h"
@@ -24,7 +25,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(irq_w);
DECLARE_FLOPPY_FORMATS( floppy_formats );
- template<class _Object> static devcb_base &static_set_irq_callback(device_t &device, _Object object) { return downcast<isbc_208_device &>(device).m_out_irq_func.set_callback(object); }
+ template <class Object> static devcb_base &static_set_irq_callback(device_t &device, Object &&cb) { return downcast<isbc_208_device &>(device).m_out_irq_func.set_callback(std::forward<Object>(cb)); }
static void static_set_maincpu_tag(device_t &device, const char *maincpu_tag) { downcast<isbc_208_device &>(device).m_maincpu_tag = maincpu_tag; }
protected:
@@ -47,6 +48,6 @@ private:
#define MCFG_ISBC_208_IRQ(_irq_line) \
devcb = &isbc_208_device::static_set_irq_callback(*device, DEVCB_##_irq_line);
-extern const device_type ISBC_208;
+DECLARE_DEVICE_TYPE(ISBC_208, isbc_208_device)
-#endif /* ISBC_208_H_ */
+#endif // MAME_MACHINE_ISBC_208_H
diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp
index a142ff9819b..8d69ad6b53f 100644
--- a/src/mame/machine/isbc_215g.cpp
+++ b/src/mame/machine/isbc_215g.cpp
@@ -9,10 +9,10 @@
#include "emu.h"
#include "isbc_215g.h"
-const device_type ISBC_215G = device_creator<isbc_215g_device>;
+DEFINE_DEVICE_TYPE(ISBC_215G, isbc_215g_device, "isbc_215g", "ISBC 215G Winchester Disk Controller")
isbc_215g_device::isbc_215g_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ISBC_215G, "ISBC 215G Winchester Disk Controller", tag, owner, clock, "isbc_215g", __FILE__),
+ device_t(mconfig, ISBC_215G, tag, owner, clock),
m_dmac(*this, "u84"),
m_hdd0(*this, "drive0"),
m_hdd1(*this, "drive1"),
diff --git a/src/mame/machine/isbc_215g.h b/src/mame/machine/isbc_215g.h
index 3b13ee4326c..70695e91990 100644
--- a/src/mame/machine/isbc_215g.h
+++ b/src/mame/machine/isbc_215g.h
@@ -1,8 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef ISBC_215G_H_
-#define ISBC_215G_H_
+#ifndef MAME_MACHINE_ISBC_215G_H
+#define MAME_MACHINE_ISBC_215G_H
+
+#pragma once
#include "cpu/i8089/i8089.h"
#include "bus/isbx/isbx.h"
@@ -71,6 +73,6 @@ private:
#define MCFG_ISBC_215_IRQ(_irq_line) \
devcb = &isbc_215g_device::static_set_irq_callback(*device, DEVCB_##_irq_line);
-extern const device_type ISBC_215G;
+DECLARE_DEVICE_TYPE(ISBC_215G, isbc_215g_device)
-#endif /* ISBC_215G_H_ */
+#endif // MAME_MACHINE_ISBC_215G_H
diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp
index 78f661b5031..416ea1cfc90 100644
--- a/src/mame/machine/iteagle_fpga.cpp
+++ b/src/mame/machine/iteagle_fpga.cpp
@@ -15,7 +15,7 @@
#define COM1_TAG "com1"
#define COM2_TAG "com2"
-const device_type ITEAGLE_FPGA = device_creator<iteagle_fpga_device>;
+DEFINE_DEVICE_TYPE(ITEAGLE_FPGA, iteagle_fpga_device, "iteagle_fpga", "ITEagle FPGA")
MACHINE_CONFIG_FRAGMENT(iteagle_fpga)
MCFG_NVRAM_ADD_0FILL("eagle2_rtc")
@@ -27,14 +27,14 @@ MACHINE_CONFIG_FRAGMENT(iteagle_fpga)
MCFG_Z80SCC_OUT_TXDB_CB(DEVWRITELINE(COM1_TAG, rs232_port_device, write_txd))
MCFG_RS232_PORT_ADD(COM1_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85C30_device, rxb_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85C30_device, dcdb_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85C30_device, ctsb_w))
+ MCFG_RS232_RXD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, rxb_w))
+ MCFG_RS232_DCD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, dcdb_w))
+ MCFG_RS232_CTS_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, ctsb_w))
MCFG_RS232_PORT_ADD(COM2_TAG, default_rs232_devices, nullptr)
- MCFG_RS232_RXD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85C30_device, rxa_w))
- MCFG_RS232_DCD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85C30_device, dcda_w))
- MCFG_RS232_CTS_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85C30_device, ctsa_w))
+ MCFG_RS232_RXD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, rxa_w))
+ MCFG_RS232_DCD_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, dcda_w))
+ MCFG_RS232_CTS_HANDLER(DEVWRITELINE(AM85C30_TAG, scc85c30_device, ctsa_w))
MACHINE_CONFIG_END
DEVICE_ADDRESS_MAP_START(fpga_map, 32, iteagle_fpga_device)
@@ -50,7 +50,7 @@ DEVICE_ADDRESS_MAP_START(ram_map, 32, iteagle_fpga_device)
ADDRESS_MAP_END
iteagle_fpga_device::iteagle_fpga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, ITEAGLE_FPGA, "ITEagle FPGA", tag, owner, clock, "iteagle_fpga", __FILE__),
+ : pci_device(mconfig, ITEAGLE_FPGA, tag, owner, clock),
m_rtc(*this, "eagle2_rtc"), m_scc1(*this, AM85C30_TAG), m_version(0), m_seq_init(0)
{
}
@@ -609,7 +609,7 @@ WRITE32_MEMBER( iteagle_fpga_device::ram_w )
// Attached serial EEPROM
//************************************
-const device_type ITEAGLE_EEPROM = device_creator<iteagle_eeprom_device>;
+DEFINE_DEVICE_TYPE(ITEAGLE_EEPROM, iteagle_eeprom_device, "iteagle_eeprom", "ITEagle EEPROM AT93C46")
DEVICE_ADDRESS_MAP_START(eeprom_map, 32, iteagle_eeprom_device)
AM_RANGE(0x0000, 0x000F) AM_READWRITE(eeprom_r, eeprom_w)
@@ -625,7 +625,7 @@ machine_config_constructor iteagle_eeprom_device::device_mconfig_additions() con
}
iteagle_eeprom_device::iteagle_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, ITEAGLE_EEPROM, "ITEagle EEPROM AT93C46", tag, owner, clock, "eeprom", __FILE__),
+ : pci_device(mconfig, ITEAGLE_EEPROM, tag, owner, clock),
m_eeprom(*this, "eeprom"), m_sw_version(0), m_hw_version(0)
{
// When corrupt writes 0x3=2, 0x3e=2, 0xa=0, 0x30=0
@@ -743,14 +743,14 @@ machine_config_constructor iteagle_periph_device::device_mconfig_additions() con
return MACHINE_CONFIG_NAME(eagle1);
}
-const device_type ITEAGLE_PERIPH = device_creator<iteagle_periph_device>;
+DEFINE_DEVICE_TYPE(ITEAGLE_PERIPH, iteagle_periph_device, "iteagle_periph", "ITEagle Peripheral Controller")
DEVICE_ADDRESS_MAP_START(ctrl_map, 32, iteagle_periph_device)
AM_RANGE(0x000, 0x0cf) AM_READWRITE(ctrl_r, ctrl_w)
ADDRESS_MAP_END
iteagle_periph_device::iteagle_periph_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, ITEAGLE_PERIPH, "ITEagle Peripheral Controller", tag, owner, clock, "periph", __FILE__),
+ : pci_device(mconfig, ITEAGLE_PERIPH, tag, owner, clock),
m_rtc(*this, "eagle1_rtc")
{
}
diff --git a/src/mame/machine/iteagle_fpga.h b/src/mame/machine/iteagle_fpga.h
index f0cef354373..7ed878c58ba 100644
--- a/src/mame/machine/iteagle_fpga.h
+++ b/src/mame/machine/iteagle_fpga.h
@@ -3,8 +3,8 @@
//*************************************
// iteagle fpga device
//*************************************
-#ifndef ITEAGLE_FPGA_H
-#define ITEAGLE_FPGA_H
+#ifndef MAME_MACHINE_ITEAGLE_FPGA_H
+#define MAME_MACHINE_ITEAGLE_FPGA_H
#include "machine/pci.h"
#include "machine/nvram.h"
@@ -59,7 +59,7 @@ public:
virtual machine_config_constructor device_mconfig_additions() const override;
required_device<nvram_device> m_rtc;
- required_device<scc85C30_device> m_scc1;
+ required_device<scc85c30_device> m_scc1;
void set_init_info(int version, int seq_init) {m_version=version; m_seq_init=seq_init;}
void set_irq_info(const char *tag, const int irq_num, const int serial_num) {
@@ -158,8 +158,8 @@ private:
};
-extern const device_type ITEAGLE_FPGA;
-extern const device_type ITEAGLE_EEPROM;
-extern const device_type ITEAGLE_PERIPH;
+DECLARE_DEVICE_TYPE(ITEAGLE_FPGA, iteagle_fpga_device)
+DECLARE_DEVICE_TYPE(ITEAGLE_EEPROM, iteagle_eeprom_device)
+DECLARE_DEVICE_TYPE(ITEAGLE_PERIPH, iteagle_periph_device)
-#endif
+#endif // MAME_MACHINE_ITEAGLE_FPGA_H
diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp
index e8247d286f3..586626a0376 100644
--- a/src/mame/machine/jvs13551.cpp
+++ b/src/mame/machine/jvs13551.cpp
@@ -5,15 +5,15 @@
#include "cpu/tlcs90/tlcs90.h"
-const device_type SEGA_837_13551 = device_creator<sega_837_13551>;
+DEFINE_DEVICE_TYPE(SEGA_837_13551, sega_837_13551_device, "jvs13551", "Sega 837-13551 I/O Board")
-WRITE_LINE_MEMBER(sega_837_13551::jvs13551_coin_1_w)
+WRITE_LINE_MEMBER(sega_837_13551_device::jvs13551_coin_1_w)
{
if(state)
inc_coin(0);
}
-WRITE_LINE_MEMBER(sega_837_13551::jvs13551_coin_2_w)
+WRITE_LINE_MEMBER(sega_837_13551_device::jvs13551_coin_2_w)
{
if(state)
inc_coin(1);
@@ -21,8 +21,8 @@ WRITE_LINE_MEMBER(sega_837_13551::jvs13551_coin_2_w)
static INPUT_PORTS_START(sega_837_13551_coins)
PORT_START("COINS")
- PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, sega_837_13551, jvs13551_coin_1_w)
- PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, sega_837_13551, jvs13551_coin_2_w)
+ PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, sega_837_13551_device, jvs13551_coin_1_w)
+ PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_COIN2) PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, sega_837_13551_device, jvs13551_coin_2_w)
INPUT_PORTS_END
MACHINE_CONFIG_FRAGMENT(sega_837_13551)
@@ -42,53 +42,53 @@ ROM_START( jvs13551 )
ROM_LOAD( "315-6215.bin", 0x0000, 0x4000, CRC(98202738) SHA1(8c4dc85438298e31e25f69542804a78ff0e20962))
ROM_END
-const tiny_rom_entry *sega_837_13551::device_rom_region() const
+const tiny_rom_entry *sega_837_13551_device::device_rom_region() const
{
return ROM_NAME(jvs13551);
}
-void sega_837_13551::static_set_port_tag(device_t &device, int port, const char *tag)
+void sega_837_13551_device::static_set_port_tag(device_t &device, int port, const char *tag)
{
- sega_837_13551 &ctrl = downcast<sega_837_13551 &>(device);
+ sega_837_13551_device &ctrl = downcast<sega_837_13551_device &>(device);
ctrl.port_tag[port] = tag;
}
-machine_config_constructor sega_837_13551::device_mconfig_additions() const
+machine_config_constructor sega_837_13551_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME(sega_837_13551);
}
-ioport_constructor sega_837_13551::device_input_ports() const
+ioport_constructor sega_837_13551_device::device_input_ports() const
{
return INPUT_PORTS_NAME(sega_837_13551_coins);
}
-sega_837_13551::sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : jvs_device(mconfig, SEGA_837_13551, "Sega 837-13551 I/O Board", tag, owner, clock, "jvs13551", __FILE__)
+sega_837_13551_device::sega_837_13551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : jvs_device(mconfig, SEGA_837_13551, tag, owner, clock)
{
memset(port_tag, 0, sizeof(port_tag));
}
-const char *sega_837_13551::device_id()
+const char *sega_837_13551_device::device_id()
{
return "SEGA ENTERPRISES,LTD.;I/O BD JVS;837-13551";
}
-uint8_t sega_837_13551::command_format_version()
+uint8_t sega_837_13551_device::command_format_version()
{
return 0x11;
}
-uint8_t sega_837_13551::jvs_standard_version()
+uint8_t sega_837_13551_device::jvs_standard_version()
{
return 0x20;
}
-uint8_t sega_837_13551::comm_method_version()
+uint8_t sega_837_13551_device::comm_method_version()
{
return 0x10;
}
-void sega_837_13551::device_start()
+void sega_837_13551_device::device_start()
{
jvs_device::device_start();
for (int i = 0; i < ARRAY_LENGTH(port_tag); i++)
@@ -98,14 +98,14 @@ void sega_837_13551::device_start()
save_item(NAME(coin_counter));
}
-void sega_837_13551::device_reset()
+void sega_837_13551_device::device_reset()
{
jvs_device::device_reset();
coin_counter[0] = 0;
coin_counter[1] = 0;
}
-void sega_837_13551::inc_coin(int coin)
+void sega_837_13551_device::inc_coin(int coin)
{
coin_counter[coin]++;
if(coin_counter[coin] == 16384)
@@ -113,7 +113,7 @@ void sega_837_13551::inc_coin(int coin)
}
-void sega_837_13551::function_list(uint8_t *&buf)
+void sega_837_13551_device::function_list(uint8_t *&buf)
{
// SW input - 2 players, 13 bits
*buf++ = 0x01; *buf++ = 2; *buf++ = 13; *buf++ = 0;
@@ -128,7 +128,7 @@ void sega_837_13551::function_list(uint8_t *&buf)
*buf++ = 0x12; *buf++ = 6; *buf++ = 0; *buf++ = 0;
}
-bool sega_837_13551::coin_counters(uint8_t *&buf, uint8_t count)
+bool sega_837_13551_device::coin_counters(uint8_t *&buf, uint8_t count)
{
if(count > 2)
return false;
@@ -142,7 +142,7 @@ bool sega_837_13551::coin_counters(uint8_t *&buf, uint8_t count)
return true;
}
-bool sega_837_13551::coin_add(uint8_t slot, int32_t count)
+bool sega_837_13551_device::coin_add(uint8_t slot, int32_t count)
{
if(slot < 1 || slot > 2)
return false;
@@ -152,7 +152,7 @@ bool sega_837_13551::coin_add(uint8_t slot, int32_t count)
return true;
}
-bool sega_837_13551::switches(uint8_t *&buf, uint8_t count_players, uint8_t bytes_per_switch)
+bool sega_837_13551_device::switches(uint8_t *&buf, uint8_t count_players, uint8_t bytes_per_switch)
{
if(count_players > 2 || bytes_per_switch > 2)
return false;
@@ -167,7 +167,7 @@ bool sega_837_13551::switches(uint8_t *&buf, uint8_t count_players, uint8_t byte
}
-bool sega_837_13551::analogs(uint8_t *&buf, uint8_t count)
+bool sega_837_13551_device::analogs(uint8_t *&buf, uint8_t count)
{
if(count > 8)
return false;
@@ -179,7 +179,7 @@ bool sega_837_13551::analogs(uint8_t *&buf, uint8_t count)
return true;
}
-bool sega_837_13551::swoutputs(uint8_t count, const uint8_t *vals)
+bool sega_837_13551_device::swoutputs(uint8_t count, const uint8_t *vals)
{
// WARNING! JVS standard have reversed bits count order
// so "board have 6 output bits" means 6 MSB bits is used, the same rules for input too
@@ -194,7 +194,7 @@ bool sega_837_13551::swoutputs(uint8_t count, const uint8_t *vals)
return true;
}
-bool sega_837_13551::swoutputs(uint8_t id, uint8_t val)
+bool sega_837_13551_device::swoutputs(uint8_t id, uint8_t val)
{
if(id > 6)
return false;
diff --git a/src/mame/machine/jvs13551.h b/src/mame/machine/jvs13551.h
index f3fc6a9647d..eccf1dd4b2f 100644
--- a/src/mame/machine/jvs13551.h
+++ b/src/mame/machine/jvs13551.h
@@ -1,31 +1,33 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __JVS13551_H__
-#define __JVS13551_H__
+#ifndef MAME_MACHINE_JVS13551_H
+#define MAME_MACHINE_JVS13551_H
+
+#pragma once
#include "machine/jvsdev.h"
#define MCFG_SEGA_837_13551_DEVICE_ADD(_tag, _host, tilt, d0, d1, a0, a1, a2, a3, a4, a5, a6, a7, out) \
MCFG_JVS_DEVICE_ADD(_tag, SEGA_837_13551, _host) \
- sega_837_13551::static_set_port_tag(*device, 0, tilt); \
- sega_837_13551::static_set_port_tag(*device, 1, d0); \
- sega_837_13551::static_set_port_tag(*device, 2, d1); \
- sega_837_13551::static_set_port_tag(*device, 3, a0); \
- sega_837_13551::static_set_port_tag(*device, 4, a1); \
- sega_837_13551::static_set_port_tag(*device, 5, a2); \
- sega_837_13551::static_set_port_tag(*device, 6, a3); \
- sega_837_13551::static_set_port_tag(*device, 7, a4); \
- sega_837_13551::static_set_port_tag(*device, 8, a5); \
- sega_837_13551::static_set_port_tag(*device, 9, a6); \
- sega_837_13551::static_set_port_tag(*device, 10, a7); \
- sega_837_13551::static_set_port_tag(*device, 11, out);
+ sega_837_13551_device::static_set_port_tag(*device, 0, tilt); \
+ sega_837_13551_device::static_set_port_tag(*device, 1, d0); \
+ sega_837_13551_device::static_set_port_tag(*device, 2, d1); \
+ sega_837_13551_device::static_set_port_tag(*device, 3, a0); \
+ sega_837_13551_device::static_set_port_tag(*device, 4, a1); \
+ sega_837_13551_device::static_set_port_tag(*device, 5, a2); \
+ sega_837_13551_device::static_set_port_tag(*device, 6, a3); \
+ sega_837_13551_device::static_set_port_tag(*device, 7, a4); \
+ sega_837_13551_device::static_set_port_tag(*device, 8, a5); \
+ sega_837_13551_device::static_set_port_tag(*device, 9, a6); \
+ sega_837_13551_device::static_set_port_tag(*device, 10, a7); \
+ sega_837_13551_device::static_set_port_tag(*device, 11, out);
class jvs_host;
-class sega_837_13551 : public jvs_device
+class sega_837_13551_device : public jvs_device
{
public:
- sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ sega_837_13551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void static_set_port_tag(device_t &device, int port, const char *tag);
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -61,5 +63,6 @@ private:
};
extern const device_type SEGA_837_13551;
+DECLARE_DEVICE_TYPE(SEGA_837_13551, sega_837_13551_device)
-#endif
+#endif // MAME_MACHINE_JVS13551_H
diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp
index e2dfa9a2edd..e0ad9e5f590 100644
--- a/src/mame/machine/k573cass.cpp
+++ b/src/mame/machine/k573cass.cpp
@@ -62,17 +62,15 @@ READ_LINE_MEMBER(konami573_cassette_interface::read_line_adc083x_sars)
}
-const device_type KONAMI573_CASSETTE_X = device_creator<konami573_cassette_x_device>;
+DEFINE_DEVICE_TYPE(KONAMI573_CASSETTE_X, konami573_cassette_x_device, "k573cassx", "Konami 573 Cassette X")
konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI573_CASSETTE_X, "Konami 573 Cassette X", tag, owner, clock, "k573cassx", __FILE__),
- konami573_cassette_interface(mconfig, *this),
- m_x76f041(*this, "eeprom")
+ konami573_cassette_x_device(mconfig, KONAMI573_CASSETTE_X, tag, owner, clock)
{
}
-konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
+konami573_cassette_x_device::konami573_cassette_x_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
konami573_cassette_interface(mconfig, *this),
m_x76f041(*this, "eeprom")
{
@@ -118,10 +116,10 @@ READ_LINE_MEMBER(konami573_cassette_x_device::read_line_secflash_sda)
}
-const device_type KONAMI573_CASSETTE_XI = device_creator<konami573_cassette_xi_device>;
+DEFINE_DEVICE_TYPE(KONAMI573_CASSETTE_XI, konami573_cassette_xi_device, "k573cassxi", "Konami 573 Cassette XI")
konami573_cassette_xi_device::konami573_cassette_xi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- konami573_cassette_x_device(mconfig, KONAMI573_CASSETTE_XI, "Konami 573 Cassette XI", tag, owner, clock, "k573cassxi", __FILE__),
+ konami573_cassette_x_device(mconfig, KONAMI573_CASSETTE_XI, tag, owner, clock),
m_ds2401(*this, "id"),
m_adc0838(*this, "adc0838")
{
@@ -178,25 +176,15 @@ READ_LINE_MEMBER(konami573_cassette_xi_device::read_line_adc083x_sars)
}
-const device_type KONAMI573_CASSETTE_Y = device_creator<konami573_cassette_y_device>;
+DEFINE_DEVICE_TYPE(KONAMI573_CASSETTE_Y, konami573_cassette_y_device, "k573cassy", "Konami 573 Cassette Y")
konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI573_CASSETTE_Y, "Konami 573 Cassette Y", tag, owner, clock, "k573cassy", __FILE__),
- konami573_cassette_interface(mconfig, *this),
- m_x76f100(*this, "eeprom"),
- m_d0_handler(*this),
- m_d1_handler(*this),
- m_d2_handler(*this),
- m_d3_handler(*this),
- m_d4_handler(*this),
- m_d5_handler(*this),
- m_d6_handler(*this),
- m_d7_handler(*this)
+ konami573_cassette_y_device(mconfig, KONAMI573_CASSETTE_Y, tag, owner, clock)
{
}
-konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
+konami573_cassette_y_device::konami573_cassette_y_device(const machine_config &mconfig, const device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
konami573_cassette_interface(mconfig, *this),
m_x76f100(*this, "eeprom"),
m_d0_handler(*this),
@@ -283,10 +271,10 @@ WRITE_LINE_MEMBER(konami573_cassette_y_device::write_line_d7)
}
-const device_type KONAMI573_CASSETTE_YI = device_creator<konami573_cassette_yi_device>;
+DEFINE_DEVICE_TYPE(KONAMI573_CASSETTE_YI, konami573_cassette_yi_device, "k573cassyi", "Konami 573 Cassette YI")
konami573_cassette_yi_device::konami573_cassette_yi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- konami573_cassette_y_device(mconfig, KONAMI573_CASSETTE_YI, "Konami 573 Cassette YI", tag, owner, clock, "k573cassyi", __FILE__),
+ konami573_cassette_y_device(mconfig, KONAMI573_CASSETTE_YI, tag, owner, clock),
m_ds2401(*this, "id")
{
}
@@ -314,10 +302,10 @@ READ_LINE_MEMBER(konami573_cassette_yi_device::read_line_ds2401)
}
-const device_type KONAMI573_CASSETTE_ZI = device_creator<konami573_cassette_zi_device>;
+DEFINE_DEVICE_TYPE(KONAMI573_CASSETTE_ZI, konami573_cassette_zi_device, "k573casszi", "Konami 573 Cassette ZI")
konami573_cassette_zi_device::konami573_cassette_zi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI573_CASSETTE_ZI, "Konami 573 Cassette ZI", tag, owner, clock, "k573casszi", __FILE__),
+ device_t(mconfig, KONAMI573_CASSETTE_ZI, tag, owner, clock),
konami573_cassette_interface(mconfig, *this),
m_zs01(*this,"eeprom"),
m_ds2401(*this, "id")
@@ -376,10 +364,10 @@ READ_LINE_MEMBER(konami573_cassette_zi_device::read_line_secflash_sda)
}
-const device_type KONAMI573_CASSETTE_SLOT = device_creator<konami573_cassette_slot_device>;
+DEFINE_DEVICE_TYPE(KONAMI573_CASSETTE_SLOT, konami573_cassette_slot_device, "k572cassslot", "Konami 573 Cassette Slot")
konami573_cassette_slot_device::konami573_cassette_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI573_CASSETTE_SLOT, "Konami 573 Cassette Slot", tag, owner, clock, "k573cassslot", __FILE__),
+ device_t(mconfig, KONAMI573_CASSETTE_SLOT, tag, owner, clock),
device_slot_interface(mconfig, *this),
m_dsr_handler(*this)
{
diff --git a/src/mame/machine/k573cass.h b/src/mame/machine/k573cass.h
index ee5057746cc..442ec5d2d86 100644
--- a/src/mame/machine/k573cass.h
+++ b/src/mame/machine/k573cass.h
@@ -4,11 +4,11 @@
* Konami 573 Security Cassette
*
*/
+#ifndef MAME_MACHINE_K573CASS_H
+#define MAME_MACHINE_K573CASS_H
#pragma once
-#ifndef __K573CASS_H__
-#define __K573CASS_H__
#include "machine/adc083x.h"
#include "machine/ds2401.h"
@@ -20,7 +20,7 @@
devcb = &konami573_cassette_slot_device::set_dsr_handler(*device, DEVCB_##_devcb);
-extern const device_type KONAMI573_CASSETTE_SLOT;
+DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_SLOT, konami573_cassette_slot_device)
class konami573_cassette_interface;
@@ -32,7 +32,7 @@ class konami573_cassette_slot_device : public device_t,
public:
konami573_cassette_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast<konami573_cassette_slot_device &>(device).m_dsr_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_dsr_handler(device_t &device, Object &&cb) { return downcast<konami573_cassette_slot_device &>(device).m_dsr_handler.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER(write_line_d0);
DECLARE_WRITE_LINE_MEMBER(write_line_d1);
@@ -62,7 +62,6 @@ class konami573_cassette_interface : public device_slot_card_interface
friend class konami573_cassette_slot_device;
public:
- konami573_cassette_interface(const machine_config &mconfig, device_t &device);
virtual ~konami573_cassette_interface();
DECLARE_WRITE_LINE_MEMBER(output_dsr) { m_slot->m_dsr_handler(state); }
@@ -81,18 +80,20 @@ public:
virtual DECLARE_READ_LINE_MEMBER(read_line_adc083x_do);
virtual DECLARE_READ_LINE_MEMBER(read_line_adc083x_sars);
+protected:
+ konami573_cassette_interface(const machine_config &mconfig, device_t &device);
+
konami573_cassette_slot_device *m_slot;
};
-extern const device_type KONAMI573_CASSETTE_X;
+DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_X, konami573_cassette_x_device)
class konami573_cassette_x_device: public device_t,
public konami573_cassette_interface
{
public:
konami573_cassette_x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- konami573_cassette_x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock,const char *shortname, const char *source);
virtual DECLARE_READ_LINE_MEMBER(read_line_secflash_sda) override;
virtual DECLARE_WRITE_LINE_MEMBER(write_line_d0) override;
@@ -101,6 +102,8 @@ public:
virtual DECLARE_WRITE_LINE_MEMBER(write_line_d3) override;
protected:
+ konami573_cassette_x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -109,7 +112,7 @@ private:
};
-extern const device_type KONAMI573_CASSETTE_XI;
+DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_XI, konami573_cassette_xi_device)
class konami573_cassette_xi_device: public konami573_cassette_x_device
{
@@ -136,7 +139,7 @@ private:
};
-extern const device_type KONAMI573_CASSETTE_Y;
+DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_Y, konami573_cassette_y_device)
#define MCFG_KONAMI573_CASSETTE_Y_D0_HANDLER(_devcb) \
@@ -168,7 +171,6 @@ class konami573_cassette_y_device: public device_t,
{
public:
konami573_cassette_y_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock,const char *shortname, const char *source);
// static configuration helpers
template<class _Object> static devcb_base &set_d0_handler(device_t &device, _Object object) { return downcast<konami573_cassette_y_device &>(device).m_d0_handler.set_callback(object); }
@@ -191,6 +193,8 @@ public:
virtual DECLARE_WRITE_LINE_MEMBER(write_line_d7) override;
protected:
+ konami573_cassette_y_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -207,7 +211,7 @@ private:
};
-extern const device_type KONAMI573_CASSETTE_YI;
+DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_YI, konami573_cassette_yi_device)
class konami573_cassette_yi_device: public konami573_cassette_y_device
{
@@ -225,7 +229,7 @@ private:
};
-extern const device_type KONAMI573_CASSETTE_ZI;
+DECLARE_DEVICE_TYPE(KONAMI573_CASSETTE_ZI, konami573_cassette_zi_device)
class konami573_cassette_zi_device: public device_t,
public konami573_cassette_interface
@@ -251,4 +255,4 @@ private:
};
-#endif
+#endif // MAME_MACHINE_K573CASS_H
diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp
index e805f12c389..5df5bcfd84e 100644
--- a/src/mame/machine/k573dio.cpp
+++ b/src/mame/machine/k573dio.cpp
@@ -65,7 +65,7 @@
*/
-const device_type KONAMI_573_DIGITAL_IO_BOARD = device_creator<k573dio_device>;
+DEFINE_DEVICE_TYPE(KONAMI_573_DIGITAL_IO_BOARD, k573dio_device, "k573_dio", "Konami 573 digital I/O board")
DEVICE_ADDRESS_MAP_START(amap, 16, k573dio_device)
AM_RANGE(0x00, 0x01) AM_READ(a00_r)
@@ -106,7 +106,7 @@ static MACHINE_CONFIG_FRAGMENT( k573dio )
MACHINE_CONFIG_END
k573dio_device::k573dio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KONAMI_573_DIGITAL_IO_BOARD, "Konami 573 digital I/O board", tag, owner, clock, "k573dio", __FILE__),
+ : device_t(mconfig, KONAMI_573_DIGITAL_IO_BOARD, tag, owner, clock),
mas3507d(*this, "mpeg"),
digital_id(*this, "digital_id"),
output_cb(*this)
diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h
index 0fb3ee47ce5..9387238a622 100644
--- a/src/mame/machine/k573dio.h
+++ b/src/mame/machine/k573dio.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:smf
-#pragma once
+#ifndef MAME_MACHINE_K573DIO_H
+#define MAME_MACHINE_K573DIO_H
-#ifndef _K573DIO_H_
-#define _K573DIO_H_
+#pragma once
#include "sound/mas3507d.h"
#include "machine/ds2401.h"
@@ -80,6 +80,6 @@ private:
void output(int offset, uint16_t data);
};
-extern const device_type KONAMI_573_DIGITAL_IO_BOARD;
+DECLARE_DEVICE_TYPE(KONAMI_573_DIGITAL_IO_BOARD, k573dio_device)
-#endif
+#endif // MAME_MACHINE_K573DIO_H
diff --git a/src/mame/machine/k573mcr.cpp b/src/mame/machine/k573mcr.cpp
index 43db5e70cc7..1255fa50a20 100644
--- a/src/mame/machine/k573mcr.cpp
+++ b/src/mame/machine/k573mcr.cpp
@@ -13,7 +13,7 @@
*/
k573mcr_device::k573mcr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI_573_MEMORY_CARD_READER, "Konami 573 Memory Card Reader", tag, owner, clock, "k573mcr", __FILE__)
+ device_t(mconfig, KONAMI_573_MEMORY_CARD_READER, tag, owner, clock)
{
}
@@ -31,4 +31,4 @@ const tiny_rom_entry *k573mcr_device::device_rom_region() const
return ROM_NAME( k573mcr );
}
-const device_type KONAMI_573_MEMORY_CARD_READER = device_creator<k573mcr_device>;
+DEFINE_DEVICE_TYPE(KONAMI_573_MEMORY_CARD_READER, k573mcr_device, "k573mcr", "Konami 573 Memory Card Reader")
diff --git a/src/mame/machine/k573mcr.h b/src/mame/machine/k573mcr.h
index 720f027fc9c..29e44ca098e 100644
--- a/src/mame/machine/k573mcr.h
+++ b/src/mame/machine/k573mcr.h
@@ -4,14 +4,14 @@
* Konami 573 Memory Card Reader
*
*/
+#ifndef MAME_MACHINE_K573_MCR_H
+#define MAME_MACHINE_K573_MCR_H
#pragma once
-#ifndef __K573MCR_H__
-#define __K573MCR_H__
-extern const device_type KONAMI_573_MEMORY_CARD_READER;
+DECLARE_DEVICE_TYPE(KONAMI_573_MEMORY_CARD_READER, k573mcr_device)
class k573mcr_device : public device_t
{
@@ -24,4 +24,4 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
};
-#endif
+#endif // MAME_MACHINE_K573_MCR_H
diff --git a/src/mame/machine/k573msu.cpp b/src/mame/machine/k573msu.cpp
index 4113837a44e..2f04b9672a3 100644
--- a/src/mame/machine/k573msu.cpp
+++ b/src/mame/machine/k573msu.cpp
@@ -73,7 +73,7 @@
*/
k573msu_device::k573msu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI_573_MULTI_SESSION_UNIT, "Konami 573 Multi Session Unit", tag, owner, clock, "k573msu", __FILE__)
+ device_t(mconfig, KONAMI_573_MULTI_SESSION_UNIT, tag, owner, clock)
{
}
@@ -94,4 +94,4 @@ const tiny_rom_entry *k573msu_device::device_rom_region() const
return ROM_NAME( k573msu );
}
-const device_type KONAMI_573_MULTI_SESSION_UNIT = device_creator<k573msu_device>;
+DEFINE_DEVICE_TYPE(KONAMI_573_MULTI_SESSION_UNIT, k573msu_device, "k573msu", "Konami 573 Multi Session Unit")
diff --git a/src/mame/machine/k573msu.h b/src/mame/machine/k573msu.h
index 64623d5ca82..e32121a1c14 100644
--- a/src/mame/machine/k573msu.h
+++ b/src/mame/machine/k573msu.h
@@ -4,14 +4,14 @@
* Konami 573 Multi Session Unit
*
*/
+#ifndef MAME_MACHINE_K573MSU_H
+#define MAME_MACHINE_K573MSU_H
#pragma once
-#ifndef __K573MSU_H__
-#define __K573MSU_H__
-extern const device_type KONAMI_573_MULTI_SESSION_UNIT;
+DECLARE_DEVICE_TYPE(KONAMI_573_MULTI_SESSION_UNIT, k573msu_device)
class k573msu_device : public device_t
{
@@ -24,4 +24,4 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
};
-#endif
+#endif // MAME_MACHINE_K573MSU_H
diff --git a/src/mame/machine/k573npu.cpp b/src/mame/machine/k573npu.cpp
index 5364b4c3001..5d06644ae29 100644
--- a/src/mame/machine/k573npu.cpp
+++ b/src/mame/machine/k573npu.cpp
@@ -73,7 +73,7 @@
*/
k573npu_device::k573npu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KONAMI_573_NETWORK_PCB_UNIT, "Konami 573 Network PCB Unit", tag, owner, clock, "k573npu", __FILE__)
+ device_t(mconfig, KONAMI_573_NETWORK_PCB_UNIT, tag, owner, clock)
{
}
@@ -91,4 +91,4 @@ const tiny_rom_entry *k573npu_device::device_rom_region() const
return ROM_NAME( k573npu );
}
-const device_type KONAMI_573_NETWORK_PCB_UNIT = device_creator<k573npu_device>;
+DEFINE_DEVICE_TYPE(KONAMI_573_NETWORK_PCB_UNIT, k573npu_device, "k573npu", "Konami 573 Network PCB Unit")
diff --git a/src/mame/machine/k573npu.h b/src/mame/machine/k573npu.h
index e1c9fa35842..c4317f2dc67 100644
--- a/src/mame/machine/k573npu.h
+++ b/src/mame/machine/k573npu.h
@@ -4,14 +4,14 @@
* Konami 573 Network PCB Unit
*
*/
+#ifndef MAME_MACHINE_K573NPU_H
+#define MAME_MACHINE_K573NPU_H
#pragma once
-#ifndef __K573NPU_H__
-#define __K573NPU_H__
-extern const device_type KONAMI_573_NETWORK_PCB_UNIT;
+DECLARE_DEVICE_TYPE(KONAMI_573_NETWORK_PCB_UNIT, k573npu_device)
class k573npu_device : public device_t
{
@@ -24,4 +24,4 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
};
-#endif
+#endif // MAME_MACHINE_K573NPU_H
diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp
index 9c9114c8d4a..a58e3c5d220 100644
--- a/src/mame/machine/k7659kb.cpp
+++ b/src/mame/machine/k7659kb.cpp
@@ -22,7 +22,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type K7659_KEYBOARD = device_creator<k7659_keyboard_device>;
+DEFINE_DEVICE_TYPE(K7659_KEYBOARD, k7659_keyboard_device, "k7659_keyboard", "K7659 Keyboard")
@@ -214,7 +214,7 @@ ioport_constructor k7659_keyboard_device::device_input_ports() const
//-------------------------------------------------
k7659_keyboard_device::k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K7659_KEYBOARD, "K7659 Keyboard", tag, owner, clock, "k7659kb", __FILE__)
+ : device_t(mconfig, K7659_KEYBOARD, tag, owner, clock)
{}
diff --git a/src/mame/machine/k7659kb.h b/src/mame/machine/k7659kb.h
index d5ed7ab3ee4..42f1ab26dc2 100644
--- a/src/mame/machine/k7659kb.h
+++ b/src/mame/machine/k7659kb.h
@@ -6,11 +6,10 @@
*********************************************************************/
-#pragma once
-
-#ifndef __K7659_KEYBOARD__
-#define __K7659_KEYBOARD__
+#ifndef MAME_MACHINE_K7659KB_H
+#define MAME_MACHINE_K7659KB_H
+#pragma once
@@ -68,7 +67,7 @@ private:
// device type definition
extern const device_type K7659_KEYBOARD;
+DECLARE_DEVICE_TYPE(K7659_KEYBOARD, k7659_keyboard_device)
-
-#endif
+#endif // MAME_MACHINE_K7659KB_H
diff --git a/src/mame/machine/kaneko_calc3.cpp b/src/mame/machine/kaneko_calc3.cpp
index 78ccadafb80..13ab946a72b 100644
--- a/src/mame/machine/kaneko_calc3.cpp
+++ b/src/mame/machine/kaneko_calc3.cpp
@@ -27,10 +27,13 @@
#include "kaneko_calc3.h"
#include "machine/eepromser.h"
-const device_type KANEKO_CALC3 = device_creator<kaneko_calc3_device>;
+#define VERBOSE_OUTPUT 0
+
+
+DEFINE_DEVICE_TYPE(KANEKO_CALC3, kaneko_calc3_device, "kaneko_calc3", "Kaneko CALC3 MCU")
kaneko_calc3_device::kaneko_calc3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KANEKO_CALC3, "Kaneko CALC3 MCU", tag, owner, clock, "kaneko_calc3", __FILE__),
+ : device_t(mconfig, KANEKO_CALC3, tag, owner, clock),
m_mcuram(*this, ":mcuram"),
m_mcu_status(0),
m_mcu_command_offset(0),
diff --git a/src/mame/machine/kaneko_calc3.h b/src/mame/machine/kaneko_calc3.h
index 51a3b52a4b4..3400883aed9 100644
--- a/src/mame/machine/kaneko_calc3.h
+++ b/src/mame/machine/kaneko_calc3.h
@@ -1,9 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, David Haywood
/* CALC 3 */
+#ifndef MAME_MACHINE_KANEKO_CALC3_H
+#define MAME_MACHINE_KANEKO_CALC3_H
-#define VERBOSE_OUTPUT 0
-
+#pragma once
class kaneko_calc3_device : public device_t
@@ -59,4 +60,6 @@ private:
};
-extern const device_type KANEKO_CALC3;
+DECLARE_DEVICE_TYPE(KANEKO_CALC3, kaneko_calc3_device)
+
+#endif // MAME_MACHINE_KANEKO_CALC3_H
diff --git a/src/mame/machine/kaneko_hit.cpp b/src/mame/machine/kaneko_hit.cpp
index 47200d796b6..fdb758645a6 100644
--- a/src/mame/machine/kaneko_hit.cpp
+++ b/src/mame/machine/kaneko_hit.cpp
@@ -28,10 +28,10 @@
#include "emu.h"
#include "kaneko_hit.h"
-const device_type KANEKO_HIT = device_creator<kaneko_hit_device>;
+DEFINE_DEVICE_TYPE(KANEKO_HIT, kaneko_hit_device, "kaneko_hit", "Kaneko CALC Hitbox")
kaneko_hit_device::kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KANEKO_HIT, "Kaneko CALC Hitbox", tag, owner, clock, "kaneko_hit", __FILE__),
+ : device_t(mconfig, KANEKO_HIT, tag, owner, clock),
m_watchdog(*this, "^watchdog")
{
m_hittype = -1;
diff --git a/src/mame/machine/kaneko_hit.h b/src/mame/machine/kaneko_hit.h
index 35cbbef2c50..40f3355776a 100644
--- a/src/mame/machine/kaneko_hit.h
+++ b/src/mame/machine/kaneko_hit.h
@@ -1,59 +1,63 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, David Haywood,Stephane Humbert
/* Kaneko Hit protection */
+#ifndef MAME_MACHINE_KANEKO_HIT_H
+#define MAME_MACHINE_KANEKO_HIT_H
+
+#pragma once
#include "machine/watchdog.h"
-struct calc1_hit_t
+class kaneko_hit_device : public device_t
{
- uint16_t x1p, y1p, x1s, y1s;
- uint16_t x2p, y2p, x2s, y2s;
+public:
+ kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- int16_t x12, y12, x21, y21;
+ static void set_type(device_t &device, int hittype);
- uint16_t mult_a, mult_b;
-};
+ int m_hittype;
-struct calc3_hit_t
-{
- int x1p, y1p, z1p, x1s, y1s, z1s;
- int x2p, y2p, z2p, x2s, y2s, z2s;
+ DECLARE_READ16_MEMBER(kaneko_hit_r);
+ DECLARE_WRITE16_MEMBER(kaneko_hit_w);
- int x1po, y1po, z1po, x1so, y1so, z1so;
- int x2po, y2po, z2po, x2so, y2so, z2so;
+protected:
+ virtual void device_start() override;
+ virtual void device_reset() override;
- int x12, y12, z12, x21, y21, z21;
+private:
+ struct calc1_hit_t
+ {
+ uint16_t x1p, y1p, x1s, y1s;
+ uint16_t x2p, y2p, x2s, y2s;
- int x_coll, y_coll, z_coll;
+ int16_t x12, y12, x21, y21;
- int x1tox2, y1toy2, z1toz2;
+ uint16_t mult_a, mult_b;
+ };
- uint16_t mult_a, mult_b;
+ struct calc3_hit_t
+ {
+ int x1p, y1p, z1p, x1s, y1s, z1s;
+ int x2p, y2p, z2p, x2s, y2s, z2s;
- uint16_t flags;
- uint16_t mode;
-};
+ int x1po, y1po, z1po, x1so, y1so, z1so;
+ int x2po, y2po, z2po, x2so, y2so, z2so;
+ int x12, y12, z12, x21, y21, z21;
+ int x_coll, y_coll, z_coll;
-class kaneko_hit_device : public device_t
-{
-public:
- kaneko_hit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ int x1tox2, y1toy2, z1toz2;
- static void set_type(device_t &device, int hittype);
+ uint16_t mult_a, mult_b;
- int m_hittype;
+ uint16_t flags;
+ uint16_t mode;
+ };
- DECLARE_READ16_MEMBER(kaneko_hit_r);
- DECLARE_WRITE16_MEMBER(kaneko_hit_w);
-protected:
- virtual void device_start() override;
- virtual void device_reset() override;
-private:
required_device<watchdog_timer_device> m_watchdog;
calc1_hit_t m_hit;
@@ -75,4 +79,6 @@ private:
};
-extern const device_type KANEKO_HIT;
+DECLARE_DEVICE_TYPE(KANEKO_HIT, kaneko_hit_device)
+
+#endif // MAME_MACHINE_KANEKO_HIT_H
diff --git a/src/mame/machine/kaneko_toybox.cpp b/src/mame/machine/kaneko_toybox.cpp
index 3a1868e4e9a..930573fbb70 100644
--- a/src/mame/machine/kaneko_toybox.cpp
+++ b/src/mame/machine/kaneko_toybox.cpp
@@ -51,10 +51,331 @@ mcu_subcmd = kaneko16_mcu_ram[0x0014/2]; // sub-command parameter, happens o
#include "kaneko_toybox.h"
#include "machine/eepromser.h"
-const device_type KANEKO_TOYBOX = device_creator<kaneko_toybox_device>;
+/***************************************************************************
+
+ TOYBOX MCU data for Bonk's Adventure
+
+***************************************************************************/
+
+// notes based on test programs results, verified on PCB:
+// - bonkadv_mcu_4_30 is the only cmd that outputs an odd (655) number of bytes
+// - bonkadv_mcu_4_33: the 32 'zeroed' bytes every 64 bytes are effectively written by the MCU
+
+// MCU executed command: 4300 0100 - factory settings
+// this command is issued whenever the nvram settings are corrupted
+// the MCU writes directly to NVRAM
+static const uint16_t bonkadv_mcu_43[] = {
+ 0x8BE0,0x8E71,0x0102,0x0102,0x0300,0x010C,0x0202,0x0202,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0030,0x0020,0x4F6B,0x0305,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0082,0x6F82,0x628C,0xB490,0x6CAB
+};
+
+// MCU executed command: 0400 0E00 0034 - code
+/*
+200E00: 7071 moveq #$71, D0
+200E02: 7273 moveq #$73, D1
+200E04: 7475 moveq #$75, D2
+200E06: 7677 moveq #$77, D3
+200E08: 7879 moveq #$79, D4
+200E0A: 7A7B moveq #$7b, D5
+200E0C: 7C7D moveq #$7d, D6
+200E0E: 7E7F moveq #$7f, D7
+200E10: 4E75 rts
+*/
+static const uint16_t bonkadv_mcu_4_34[] = {
+ 0x7071,0x7273,0x7475,0x7677,0x7879,0x7a7b,0x7c7d,0x7e7f,
+ 0x4e75
+};
+// MCU executed command: 0400 0180 0032 - 128 bytes at $200180
+static const uint16_t bonkadv_mcu_4_32[] = {
+ 0x00cc,0xcc0c,0xc0c0,0xc080,0x0484,0xb6a6,0x0404,0x80c0,
+ 0x80b1,0xb1a1,0xa1b2,0xa2b3,0xb3a3,0xa3b1,0xb1b1,0xb1c0,
+ 0xc0a1,0xa1a1,0xa1b2,0xb2a2,0xa290,0x9090,0xb9b9,0xa9a9,
+ 0xbaaa,0xbbbb,0xabab,0xb9b9,0xb9b9,0xc8c8,0xa9a9,0xa9a9,
+ 0xbaba,0xaaaa,0x9898,0x98b9,0xb9a9,0xa9ba,0xaabb,0xbbab,
+ 0xabb9,0xb9b9,0xb9c8,0xc8a9,0xa9a9,0xa9ba,0xbaaa,0xaa98,
+ 0x9898,0xb1b1,0xa1a1,0xb2a2,0xb3b3,0xa3a3,0xb1b1,0xb1b1,
+ 0xc0c0,0xa1a1,0xa1a1,0xb2b2,0xa2a2,0x9090,0x9000,0x0000
+};
+// MCU executed command: 0400 0280 0031 - 112 bytes at $200280
+static const uint16_t bonkadv_mcu_4_31[] = {
+ 0x1013,0x1411,0x1216,0x1519,0x1a17,0x1824,0x2322,0x211f,
+ 0x201e,0x1d1c,0x1b27,0x2825,0x2629,0x2a2b,0x2e2f,0x2c2d,
+ 0x3130,0x3435,0x3233,0x3f3e,0x3d3c,0x3a3b,0x3938,0x3736,
+ 0x4243,0x4041,0x4445,0x4649,0x4a47,0x484c,0x4b4f,0x504d,
+ 0x4e5a,0x5958,0x5755,0x5654,0x5352,0x515d,0x5e5b,0x5c5f,
+ 0x6061,0x6465,0x6263,0x6766,0x6a6b,0x6869,0x7574,0x7372,
+ 0x7071,0x6f6e,0x6d6c,0x7879,0x7677,0x7a7b,0x7c7d,0x7e7f
+};
+// MCU executed command: 0400 0E50 0030 - 655 bytes at $200E50 (656 here)
+static const uint16_t bonkadv_mcu_4_30[] = {
+ 0x8c00,0x9700,0xa000,0xa700,0xb200,0xb700,0xc000,0xcc00,
+ 0xd600,0xdf00,0xef00,0xf500,0xfd00,0x0501,0x0b01,0x1801,
+ 0x1e01,0x2901,0x3101,0x3701,0x4101,0x4901,0x0b01,0x5d01,
+ 0xa700,0xb200,0x6c01,0x8101,0xb200,0x8101,0x8101,0x8101,
+ 0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,
+ 0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,
+ 0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x2e02,
+ 0x3602,0x3d02,0x4102,0x4f02,0x5502,0x5502,0x5f02,0x6402,
+ 0x6d02,0x7302,0x7802,0x7d02,0x8302,0x8a02,0x0165,0x712b,
+ 0x57fe,0x57a2,0xff00,0x0003,0x7c3a,0x436c,0x66ff,0x0000,
+ 0x026c,0x6d43,0xff00,0x0000,0x74a5,0x8373,0x3599,0x9fff,
+
+ 0x0000,0x074a,0xff00,0x0002,0x8788,0x3331,0x32ff,0x0000,
+ 0x0276,0x8c71,0x2d8c,0xfe12,0x8cff,0x0000,0x0171,0x0d29,
+ 0xfe0d,0x29ff,0x0000,0x0559,0x5a5b,0x8a8b,0xff00,0x0003,
+ 0x0d0e,0x576a,0x641e,0xfe0d,0x0efe,0x64a3,0xff00,0x0006,
+ 0x0262,0xff00,0x0007,0x3e3f,0x7a7b,0xff00,0x0007,0x7584,
+ 0x4c53,0xff00,0x0001,0x6645,0xff00,0x0007,0x0d18,0x2984,
+ 0x5384,0xfe0d,0x29ff,0x0000,0x0457,0x5cff,0x0000,0x0751,
+ 0x5202,0x45fe,0x4575,0xff00,0x0000,0x191a,0x1b6e,0xff00,
+ 0x0006,0x3472,0xff00,0x0000,0x6569,0x090f,0x8b23,0xff00,
+ 0x0004,0x3b3c,0x3d79,0xff00,0x0080,0x770a,0x8176,0x2a65,
+ 0x64fe,0x7776,0xfe2a,0x76fe,0x650a,0xff00,0x0000,0x1011,
+ 0x1226,0x2728,0xa655,0x940f,0x68ff,0x0000,0x8045,0x6477,
+ 0x0a81,0x762a,0x65fe,0x7776,0xfe2a,0x76fe,0x650a,0xff00,
+ 0x0000,0x166b,0xff00,0x0007,0x1e30,0x39ff,0x0000,0x0345,
+ 0x3a77,0x7843,0x4647,0xff00,0x0000,0x7335,0x8399,0x9fff,
+ 0x0000,0x0237,0x38ff,0x0000,0x0044,0x303b,0xff00,0x0000,
+
+ 0x7d7e,0x7fa1,0x0aff,0x0000,0x0070,0xff00,0x0000,0x3e3f,
+ 0x7a7b,0x6180,0x89a4,0xff00,0x0006,0x86a5,0x4f42,0xff00,
+ 0x0000,0x1011,0x1255,0x0f68,0xff00,0x0002,0x8788,0x4033,
+ 0xff00,0x0005,0x650f,0xff00,0x0008,0x9596,0x9ba7,0xff00,
+ 0x0000,0x4849,0x82ff,0x0000,0x022e,0x2f30,0xff00,0x0001,
+ 0x7778,0x5826,0x2728,0xa6ff,0x0000,0x0813,0x1402,0x51ff,
+ 0x0000,0x072e,0x5c5d,0xff00,0x0006,0x57ff,0x0000,0x0230,
+ 0x391e,0x65fe,0x6530,0xff00,0x0000,0x4bff,0x0000,0x008e,
+ 0x8f90,0x91ff,0x0000,0x0092,0x9d17,0xff00,0x0000,0xff00,
+ 0x0000,0x8d9b,0xa77d,0x7e7f,0xa10a,0x9596,0xff00,0x0001,
+ 0x1993,0xff00,0x0000,0x67ff,0x0000,0x0067,0xff00,0x0000,
+ 0x27ff,0x0000,0x0390,0x8e23,0x978b,0xff00,0x0000,0x1d9e,
+ 0xff00,0x0007,0x3bff,0x0000,0x001d,0xff00,0x0000,0x8e90,
+ 0xff00,0x0005,0x2495,0x96ff,0x0000,0x009a,0xff00,0x0000
+};
+// MCU executed command: 0400 0400 0033 - 2560 bytes at $200400
+static const uint16_t bonkadv_mcu_4_33[] = {
+ 0x00a4,0x0001,0x00a5,0x005a,0x00a6,0x0074,0x00a7,0x009b,
+ 0x00a8,0x00d0,0x00a9,0x00fe,0x00aa,0x015d,0x00ab,0x01b0,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0001,0x0002,0x0019,0x005b,0x0022,0x0075,0x002d,0x009c,
+ 0x0041,0x00d1,0x004e,0x00ff,0x0060,0x015f,0x0072,0x01b1,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0002,0x0008,0x001a,0x0061,0x0023,0x007b,0x002e,0x00a2,
+ 0x0042,0x00d7,0x004f,0x0107,0x0061,0x0165,0x0073,0x01b7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x000a,0x0000,0x0063,0x0000,0x007d,0x0000,0x00a4,
+ 0x0000,0x00d9,0x0000,0x0109,0x0000,0x0167,0x0000,0x01b9,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x0003,0x000b,0x001b,0x0064,0x0024,0x007e,0x002f,0x00a5,
+ 0x0043,0x00da,0x0050,0x010a,0x0062,0x0168,0x0074,0x01ba,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x000c,0x0000,0x0065,0x0000,0x007f,0x0000,0x00a6,
+ 0x0000,0x00db,0x0000,0x010b,0x0000,0x0169,0x0000,0x01bb,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0004,0x0008,0x001c,0x0061,0x0025,0x007b,0x0030,0x00a2,
+ 0x0044,0x00d7,0x0051,0x0107,0x0063,0x0165,0x0075,0x01b7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0005,0x000d,0x001d,0x0066,0x0025,0x007b,0x0031,0x00a7,
+ 0x0045,0x00dc,0x0051,0x0107,0x0063,0x0165,0x0075,0x01b7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x0000,0x0017,0x0000,0x0069,0x0000,0x0089,0x0000,0x00af,
+ 0x0000,0x00df,0x0000,0x0115,0x0000,0x0173,0x0000,0x01c5,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0009,0x0015,0x001e,0x0067,0x0029,0x0087,0x0034,0x00ad,
+ 0x0046,0x00dd,0x0055,0x0113,0x0067,0x0171,0x0079,0x01c3,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0006,0x000e,0x0006,0x000e,0x0026,0x0080,0x0006,0x000e,
+ 0x0000,0x0000,0x0052,0x010c,0x0064,0x016a,0x0076,0x01bc,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0007,0x0010,0x0007,0x0010,0x0027,0x0082,0x0032,0x00a8,
+ 0x0000,0x0000,0x0053,0x010e,0x0065,0x016c,0x0077,0x01be,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x0000,0x0013,0x0000,0x0013,0x0000,0x0085,0x0000,0x00ab,
+ 0x0000,0x0000,0x0000,0x0111,0x0000,0x016f,0x0000,0x01c1,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0008,0x0014,0x0008,0x0014,0x0028,0x0086,0x0033,0x00ac,
+ 0x0000,0x0000,0x0054,0x0112,0x0066,0x0170,0x0078,0x01c2,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0018,0x0000,0x006a,0x0000,0x008a,0x0000,0x00b0,
+ 0x0000,0x00e0,0x0000,0x0116,0x0000,0x0174,0x0000,0x01c6,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x000c,0x0000,0x0065,0x0000,0x007f,0x0000,0x00a6,
+ 0x0000,0x00db,0x0000,0x010b,0x0000,0x0169,0x0000,0x01bb,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x000a,0x0019,0x001f,0x006b,0x002a,0x008b,0x0035,0x00b1,
+ 0x0047,0x00e1,0x0056,0x0117,0x0068,0x0175,0x007a,0x01c7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x000b,0x0019,0x0020,0x006b,0x002b,0x008b,0x0036,0x00b1,
+ 0x0048,0x00e1,0x0057,0x0117,0x0069,0x0175,0x007a,0x01c7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0015,0x003e,0x0015,0x003e,0x0099,0x0095,0x0015,0x003e,
+ 0x0000,0x0000,0x009e,0x013a,0x006d,0x018f,0x007e,0x01dc,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x000c,0x001d,0x000c,0x001d,0x000c,0x001d,0x000c,0x001d,
+ 0x0049,0x00e5,0x0058,0x011b,0x006a,0x0179,0x007b,0x01c9,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x0000,0x001f,0x0000,0x001f,0x0000,0x001f,0x0000,0x001f,
+ 0x0000,0x00e7,0x0000,0x011d,0x0000,0x017b,0x0000,0x01cb,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x000d,0x0020,0x0021,0x006f,0x002c,0x008f,0x0037,0x00b5,
+ 0x004a,0x00e8,0x0059,0x011e,0x006b,0x017c,0x007c,0x01cc,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0022,0x0000,0x0071,0x0000,0x0091,0x0000,0x00b7,
+ 0x0000,0x00ea,0x0000,0x0120,0x0000,0x017e,0x0000,0x01ce,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0014,0x003b,0x0014,0x003b,0x005d,0x0092,0x0014,0x003b,
+ 0x0014,0x003b,0x009d,0x0137,0x00a0,0x018c,0x00a1,0x01d9,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x0012,0x0036,0x0012,0x0036,0x0012,0x0036,0x0012,0x0036,
+ 0x008a,0x00e5,0x00be,0x013c,0x006c,0x0184,0x007d,0x01d1,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0013,0x0038,0x0013,0x0038,0x0013,0x0038,0x0013,0x0038,
+ 0x008a,0x00e5,0x00bf,0x013d,0x006c,0x0184,0x007d,0x01d1,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0038,0x00ba,0x0038,0x00ba,0x0038,0x00ba,0x0038,0x00ba,
+ 0x0038,0x00ba,0x00a2,0x0128,0x006e,0x019c,0x007f,0x01e7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x005c,0x014d,0x005c,0x014d,0x005c,0x014d,0x005c,0x014d,
+ 0x0000,0x0000,0x009c,0x0124,0x0071,0x01a5,0x0082,0x01f0,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x005b,0x014d,0x005b,0x014d,0x005b,0x014d,0x005b,0x014d,
+ 0x0000,0x0000,0x009b,0x0124,0x0070,0x01a1,0x0081,0x01ec,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0044,0x0000,0x0044,0x0000,0x0044,0x0000,0x0044,
+ 0x0000,0x00db,0x0000,0x010b,0x0000,0x0169,0x0000,0x01bb,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0018,0x0045,0x0018,0x0045,0x0018,0x0045,0x0018,0x0045,
+ 0x0044,0x00d7,0x0051,0x0107,0x0063,0x0165,0x0075,0x01b7,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x008b,0x000e,0x008b,0x000e,0x008c,0x0080,0x008b,0x000e,
+ 0x0000,0x0000,0x008d,0x010c,0x008e,0x016a,0x008f,0x01bc,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x0090,0x0010,0x0090,0x0010,0x0091,0x0082,0x0092,0x00a8,
+ 0x0000,0x0000,0x0093,0x010e,0x0094,0x016c,0x0095,0x01be,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0096,0x003e,0x0096,0x003e,0x009a,0x0095,0x0096,0x003e,
+ 0x0000,0x0000,0x009f,0x013a,0x0097,0x018f,0x0098,0x01dc,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0049,0x0000,0x0069,0x0000,0x0098,0x0000,0x00af,
+ 0x0000,0x00df,0x0000,0x0145,0x0000,0x0173,0x0000,0x01c5,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x005e,0x0048,0x005f,0x0068,0x006f,0x0097,0x0080,0x00ae,
+ 0x00ac,0x00de,0x00ad,0x0144,0x00ae,0x0172,0x00af,0x01c4,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+
+ 0x004b,0x00ed,0x004b,0x00ed,0x004b,0x00ed,0x004b,0x00ed,
+ 0x004b,0x00ed,0x00b0,0x012b,0x00b6,0x0186,0x00ba,0x01d3,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0087,0x00f2,0x0087,0x00f2,0x0087,0x00f2,0x0087,0x00f2,
+ 0x0087,0x00f2,0x00b3,0x0130,0x00b8,0x018b,0x00bc,0x01d8,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x00c1,0x0050,0x00c1,0x0050,0x00c1,0x0050,0x00c1,0x0050,
+ 0x00c1,0x0050,0x00c3,0x0148,0x00c5,0x019a,0x00c7,0x01e5,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x00c2,0x0050,0x00c2,0x0050,0x00c2,0x0050,0x00c2,0x0050,
+ 0x00c2,0x0050,0x00c4,0x0148,0x00c6,0x019a,0x00c8,0x01e5,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
+};
+
+/* decryption table */
+static const uint8_t decryption_table[0x100] = {
+ 0x7b,0x82,0xf0,0xbc,0x7f,0x1d,0xa2,0xc5,0x2a,0xfa,0x55,0xee,0x1a,0xd0,0x59,0x76,
+ 0x5e,0x75,0x79,0x16,0xa5,0xf6,0x84,0xed,0x0f,0x2e,0xf2,0x36,0x61,0xac,0xcd,0xab,
+ 0x01,0x3b,0x01,0x87,0x73,0xab,0xce,0x5d,0xd4,0x1d,0x68,0x2a,0x35,0xea,0x13,0x27,
+ 0x00,0xaa,0x46,0x36,0x6e,0x65,0x80,0x7e,0x19,0xe2,0x96,0xab,0xac,0xa5,0x6c,0x63,
+ 0x4a,0x6f,0x87,0xf6,0x6a,0xac,0x38,0xe2,0x1f,0x87,0xf9,0xaa,0xf5,0x41,0x60,0xa6,
+ 0x42,0xb9,0x30,0xf2,0xc3,0x1c,0x4e,0x4b,0x08,0x10,0x42,0x32,0xbf,0xb2,0xc5,0x0f,
+ 0x7a,0xab,0x97,0xf6,0xe7,0xb3,0x46,0xf8,0xec,0x2b,0x7d,0x5f,0xb1,0x10,0x03,0xe4,
+ 0x0f,0x22,0xdf,0x8d,0x10,0x66,0xa7,0x7e,0x96,0xbd,0x5a,0xaf,0xaa,0x43,0xdf,0x10,
+ 0x7c,0x04,0xe2,0x9d,0x66,0xd7,0xf0,0x02,0x58,0x8a,0x55,0x17,0x16,0xe2,0xe2,0x52,
+ 0xaf,0xd9,0xf9,0x0d,0x59,0x70,0x86,0x3c,0x05,0xd1,0x52,0xa7,0xf0,0xbf,0x17,0xd0,
+ 0x23,0x15,0xfe,0x23,0xf2,0x80,0x60,0x6f,0x95,0x89,0x67,0x65,0xc9,0x0e,0xfc,0x16,
+ 0xd6,0x8a,0x9f,0x25,0x2c,0x0f,0x2d,0xe4,0x51,0xb2,0xa8,0x18,0x3a,0x5d,0x66,0xa0,
+ 0x9f,0xb0,0x58,0xea,0x78,0x72,0x08,0x6a,0x90,0xb6,0xa4,0xf5,0x08,0x19,0x60,0x4e,
+ 0x92,0xbd,0xf1,0x05,0x67,0x4f,0x24,0x99,0x69,0x1d,0x0c,0x6d,0xe7,0x74,0x88,0x22,
+ 0x2d,0x15,0x7a,0xa2,0x37,0xa9,0xa0,0xb0,0x2c,0xfb,0x27,0xe5,0x4f,0xb6,0xcd,0x75,
+ 0xdc,0x39,0xce,0x6f,0x1f,0xfe,0xcc,0xb5,0xe6,0xda,0xd8,0xee,0x85,0xee,0x2f,0x04,
+};
+
+/* alt decryption table (gtmr2) */
+static const uint8_t decryption_table_alt[0x100] = {
+ 0x26,0x17,0xb9,0xcf,0x1a,0xf5,0x14,0x1e,0x0c,0x35,0xb3,0x66,0xa0,0x17,0xe9,0xe4,
+ 0x90,0xf6,0xd5,0x35,0xac,0x95,0x49,0x43,0x64,0x0c,0x03,0x75,0x4d,0xda,0xb6,0xdf,
+ 0x06,0xcf,0x83,0x9e,0x35,0x2c,0x71,0x2a,0xab,0xcc,0x65,0xd4,0x1f,0xb0,0x88,0x3c,
+ 0xb7,0x87,0x35,0xc0,0x41,0x65,0x9f,0xa0,0xd5,0x8c,0x3e,0x06,0x53,0xdb,0x45,0x64,
+ 0x09,0x1e,0xc5,0x8d,0x50,0x24,0xe2,0x4a,0x9b,0x99,0x77,0x25,0x43,0xa9,0x1d,0xac,
+ 0x99,0x31,0x75,0xb5,0x53,0xab,0xad,0x5a,0x42,0x14,0xa1,0x52,0xac,0xec,0x5f,0xf8,
+ 0x8c,0x78,0x05,0x47,0xea,0xb8,0xde,0x69,0x98,0x2d,0x8f,0x9d,0xfc,0x05,0xea,0xee,
+ 0x77,0xbb,0xa9,0x31,0x01,0x00,0xea,0xd8,0x9c,0x43,0xb5,0x2f,0x4e,0xb5,0x1b,0xd2,
+ 0x01,0x4b,0xc4,0xf8,0x76,0x92,0x59,0x4f,0x20,0x52,0xd9,0x7f,0xa9,0x19,0xe9,0x7c,
+ 0x8d,0x3b,0xec,0xe0,0x60,0x08,0x2e,0xbd,0x27,0x8b,0xb2,0xfc,0x29,0xd8,0x39,0x8a,
+ 0x4f,0x2f,0x6b,0x04,0x10,0xbd,0xa1,0x04,0xde,0xc0,0xd5,0x0f,0x04,0x86,0xd6,0xd8,
+ 0xfd,0xb1,0x3c,0x4c,0xd1,0xc4,0xf1,0x5b,0xf5,0x8b,0xe3,0xc4,0x89,0x3c,0x39,0x86,
+ 0xd2,0x92,0xc9,0xe5,0x2c,0x4f,0xe2,0x2f,0x2d,0xc5,0x35,0x09,0x94,0x47,0x3c,0x04,
+ 0x40,0x8b,0x57,0x08,0xf6,0x74,0xe9,0xb8,0x36,0x4d,0xc5,0x26,0x13,0x3d,0x75,0xa0,
+ 0xa8,0x29,0x09,0x8c,0x87,0xf7,0x13,0xaf,0x4c,0x38,0x0b,0x8a,0x7f,0x2c,0x62,0x27,
+ 0x47,0xaa,0xda,0x07,0x92,0x8d,0xfd,0x1f,0xee,0x48,0x1a,0x53,0x3b,0x98,0x6a,0x72,
+};
+
+
+DEFINE_DEVICE_TYPE(KANEKO_TOYBOX, kaneko_toybox_device, "kaneko_toybox", "Kaneko Toybox MCU")
kaneko_toybox_device::kaneko_toybox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KANEKO_TOYBOX, "Kaneko Toybox MCU", tag, owner, clock, "kaneko_toybox", __FILE__),
+ : device_t(mconfig, KANEKO_TOYBOX, tag, owner, clock),
m_mcuram(*this, ":mcuram"),
m_gametype(GAME_NORMAL),
m_tabletype(TABLE_NORMAL)
diff --git a/src/mame/machine/kaneko_toybox.h b/src/mame/machine/kaneko_toybox.h
index acabe623d6d..6d040ae1d76 100644
--- a/src/mame/machine/kaneko_toybox.h
+++ b/src/mame/machine/kaneko_toybox.h
@@ -1,340 +1,20 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Luca Elia, Sebastien Volpe
/* Kaneko Toybox */
+#ifndef MAME_MACHINE_KANEKO_TOYBOX_H
+#define MAME_MACHINE_KANEKO_TOYBOX_H
-
-#define GAME_NORMAL (0)
-#define GAME_BONK (1)
-
-#define TABLE_NORMAL (0)
-#define TABLE_ALT (1)
-
-
-
-/***************************************************************************
-
- TOYBOX MCU data for Bonk's Adventure
-
-***************************************************************************/
-
-// notes based on test programs results, verified on PCB:
-// - bonkadv_mcu_4_30 is the only cmd that outputs an odd (655) number of bytes
-// - bonkadv_mcu_4_33: the 32 'zeroed' bytes every 64 bytes are effectively written by the MCU
-
-// MCU executed command: 4300 0100 - factory settings
-// this command is issued whenever the nvram settings are corrupted
-// the MCU writes directly to NVRAM
-static const uint16_t bonkadv_mcu_43[] = {
- 0x8BE0,0x8E71,0x0102,0x0102,0x0300,0x010C,0x0202,0x0202,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0030,0x0020,0x4F6B,0x0305,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0082,0x6F82,0x628C,0xB490,0x6CAB
-};
-
-// MCU executed command: 0400 0E00 0034 - code
-/*
-200E00: 7071 moveq #$71, D0
-200E02: 7273 moveq #$73, D1
-200E04: 7475 moveq #$75, D2
-200E06: 7677 moveq #$77, D3
-200E08: 7879 moveq #$79, D4
-200E0A: 7A7B moveq #$7b, D5
-200E0C: 7C7D moveq #$7d, D6
-200E0E: 7E7F moveq #$7f, D7
-200E10: 4E75 rts
-*/
-static const uint16_t bonkadv_mcu_4_34[] = {
- 0x7071,0x7273,0x7475,0x7677,0x7879,0x7a7b,0x7c7d,0x7e7f,
- 0x4e75
-};
-// MCU executed command: 0400 0180 0032 - 128 bytes at $200180
-static const uint16_t bonkadv_mcu_4_32[] = {
- 0x00cc,0xcc0c,0xc0c0,0xc080,0x0484,0xb6a6,0x0404,0x80c0,
- 0x80b1,0xb1a1,0xa1b2,0xa2b3,0xb3a3,0xa3b1,0xb1b1,0xb1c0,
- 0xc0a1,0xa1a1,0xa1b2,0xb2a2,0xa290,0x9090,0xb9b9,0xa9a9,
- 0xbaaa,0xbbbb,0xabab,0xb9b9,0xb9b9,0xc8c8,0xa9a9,0xa9a9,
- 0xbaba,0xaaaa,0x9898,0x98b9,0xb9a9,0xa9ba,0xaabb,0xbbab,
- 0xabb9,0xb9b9,0xb9c8,0xc8a9,0xa9a9,0xa9ba,0xbaaa,0xaa98,
- 0x9898,0xb1b1,0xa1a1,0xb2a2,0xb3b3,0xa3a3,0xb1b1,0xb1b1,
- 0xc0c0,0xa1a1,0xa1a1,0xb2b2,0xa2a2,0x9090,0x9000,0x0000
-};
-// MCU executed command: 0400 0280 0031 - 112 bytes at $200280
-static const uint16_t bonkadv_mcu_4_31[] = {
- 0x1013,0x1411,0x1216,0x1519,0x1a17,0x1824,0x2322,0x211f,
- 0x201e,0x1d1c,0x1b27,0x2825,0x2629,0x2a2b,0x2e2f,0x2c2d,
- 0x3130,0x3435,0x3233,0x3f3e,0x3d3c,0x3a3b,0x3938,0x3736,
- 0x4243,0x4041,0x4445,0x4649,0x4a47,0x484c,0x4b4f,0x504d,
- 0x4e5a,0x5958,0x5755,0x5654,0x5352,0x515d,0x5e5b,0x5c5f,
- 0x6061,0x6465,0x6263,0x6766,0x6a6b,0x6869,0x7574,0x7372,
- 0x7071,0x6f6e,0x6d6c,0x7879,0x7677,0x7a7b,0x7c7d,0x7e7f
-};
-// MCU executed command: 0400 0E50 0030 - 655 bytes at $200E50 (656 here)
-static const uint16_t bonkadv_mcu_4_30[] = {
- 0x8c00,0x9700,0xa000,0xa700,0xb200,0xb700,0xc000,0xcc00,
- 0xd600,0xdf00,0xef00,0xf500,0xfd00,0x0501,0x0b01,0x1801,
- 0x1e01,0x2901,0x3101,0x3701,0x4101,0x4901,0x0b01,0x5d01,
- 0xa700,0xb200,0x6c01,0x8101,0xb200,0x8101,0x8101,0x8101,
- 0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,
- 0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,
- 0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x8101,0x2e02,
- 0x3602,0x3d02,0x4102,0x4f02,0x5502,0x5502,0x5f02,0x6402,
- 0x6d02,0x7302,0x7802,0x7d02,0x8302,0x8a02,0x0165,0x712b,
- 0x57fe,0x57a2,0xff00,0x0003,0x7c3a,0x436c,0x66ff,0x0000,
- 0x026c,0x6d43,0xff00,0x0000,0x74a5,0x8373,0x3599,0x9fff,
-
- 0x0000,0x074a,0xff00,0x0002,0x8788,0x3331,0x32ff,0x0000,
- 0x0276,0x8c71,0x2d8c,0xfe12,0x8cff,0x0000,0x0171,0x0d29,
- 0xfe0d,0x29ff,0x0000,0x0559,0x5a5b,0x8a8b,0xff00,0x0003,
- 0x0d0e,0x576a,0x641e,0xfe0d,0x0efe,0x64a3,0xff00,0x0006,
- 0x0262,0xff00,0x0007,0x3e3f,0x7a7b,0xff00,0x0007,0x7584,
- 0x4c53,0xff00,0x0001,0x6645,0xff00,0x0007,0x0d18,0x2984,
- 0x5384,0xfe0d,0x29ff,0x0000,0x0457,0x5cff,0x0000,0x0751,
- 0x5202,0x45fe,0x4575,0xff00,0x0000,0x191a,0x1b6e,0xff00,
- 0x0006,0x3472,0xff00,0x0000,0x6569,0x090f,0x8b23,0xff00,
- 0x0004,0x3b3c,0x3d79,0xff00,0x0080,0x770a,0x8176,0x2a65,
- 0x64fe,0x7776,0xfe2a,0x76fe,0x650a,0xff00,0x0000,0x1011,
- 0x1226,0x2728,0xa655,0x940f,0x68ff,0x0000,0x8045,0x6477,
- 0x0a81,0x762a,0x65fe,0x7776,0xfe2a,0x76fe,0x650a,0xff00,
- 0x0000,0x166b,0xff00,0x0007,0x1e30,0x39ff,0x0000,0x0345,
- 0x3a77,0x7843,0x4647,0xff00,0x0000,0x7335,0x8399,0x9fff,
- 0x0000,0x0237,0x38ff,0x0000,0x0044,0x303b,0xff00,0x0000,
-
- 0x7d7e,0x7fa1,0x0aff,0x0000,0x0070,0xff00,0x0000,0x3e3f,
- 0x7a7b,0x6180,0x89a4,0xff00,0x0006,0x86a5,0x4f42,0xff00,
- 0x0000,0x1011,0x1255,0x0f68,0xff00,0x0002,0x8788,0x4033,
- 0xff00,0x0005,0x650f,0xff00,0x0008,0x9596,0x9ba7,0xff00,
- 0x0000,0x4849,0x82ff,0x0000,0x022e,0x2f30,0xff00,0x0001,
- 0x7778,0x5826,0x2728,0xa6ff,0x0000,0x0813,0x1402,0x51ff,
- 0x0000,0x072e,0x5c5d,0xff00,0x0006,0x57ff,0x0000,0x0230,
- 0x391e,0x65fe,0x6530,0xff00,0x0000,0x4bff,0x0000,0x008e,
- 0x8f90,0x91ff,0x0000,0x0092,0x9d17,0xff00,0x0000,0xff00,
- 0x0000,0x8d9b,0xa77d,0x7e7f,0xa10a,0x9596,0xff00,0x0001,
- 0x1993,0xff00,0x0000,0x67ff,0x0000,0x0067,0xff00,0x0000,
- 0x27ff,0x0000,0x0390,0x8e23,0x978b,0xff00,0x0000,0x1d9e,
- 0xff00,0x0007,0x3bff,0x0000,0x001d,0xff00,0x0000,0x8e90,
- 0xff00,0x0005,0x2495,0x96ff,0x0000,0x009a,0xff00,0x0000
-};
-// MCU executed command: 0400 0400 0033 - 2560 bytes at $200400
-static const uint16_t bonkadv_mcu_4_33[] = {
- 0x00a4,0x0001,0x00a5,0x005a,0x00a6,0x0074,0x00a7,0x009b,
- 0x00a8,0x00d0,0x00a9,0x00fe,0x00aa,0x015d,0x00ab,0x01b0,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0001,0x0002,0x0019,0x005b,0x0022,0x0075,0x002d,0x009c,
- 0x0041,0x00d1,0x004e,0x00ff,0x0060,0x015f,0x0072,0x01b1,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0002,0x0008,0x001a,0x0061,0x0023,0x007b,0x002e,0x00a2,
- 0x0042,0x00d7,0x004f,0x0107,0x0061,0x0165,0x0073,0x01b7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x000a,0x0000,0x0063,0x0000,0x007d,0x0000,0x00a4,
- 0x0000,0x00d9,0x0000,0x0109,0x0000,0x0167,0x0000,0x01b9,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x0003,0x000b,0x001b,0x0064,0x0024,0x007e,0x002f,0x00a5,
- 0x0043,0x00da,0x0050,0x010a,0x0062,0x0168,0x0074,0x01ba,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x000c,0x0000,0x0065,0x0000,0x007f,0x0000,0x00a6,
- 0x0000,0x00db,0x0000,0x010b,0x0000,0x0169,0x0000,0x01bb,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0004,0x0008,0x001c,0x0061,0x0025,0x007b,0x0030,0x00a2,
- 0x0044,0x00d7,0x0051,0x0107,0x0063,0x0165,0x0075,0x01b7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0005,0x000d,0x001d,0x0066,0x0025,0x007b,0x0031,0x00a7,
- 0x0045,0x00dc,0x0051,0x0107,0x0063,0x0165,0x0075,0x01b7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x0000,0x0017,0x0000,0x0069,0x0000,0x0089,0x0000,0x00af,
- 0x0000,0x00df,0x0000,0x0115,0x0000,0x0173,0x0000,0x01c5,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0009,0x0015,0x001e,0x0067,0x0029,0x0087,0x0034,0x00ad,
- 0x0046,0x00dd,0x0055,0x0113,0x0067,0x0171,0x0079,0x01c3,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0006,0x000e,0x0006,0x000e,0x0026,0x0080,0x0006,0x000e,
- 0x0000,0x0000,0x0052,0x010c,0x0064,0x016a,0x0076,0x01bc,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0007,0x0010,0x0007,0x0010,0x0027,0x0082,0x0032,0x00a8,
- 0x0000,0x0000,0x0053,0x010e,0x0065,0x016c,0x0077,0x01be,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x0000,0x0013,0x0000,0x0013,0x0000,0x0085,0x0000,0x00ab,
- 0x0000,0x0000,0x0000,0x0111,0x0000,0x016f,0x0000,0x01c1,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0008,0x0014,0x0008,0x0014,0x0028,0x0086,0x0033,0x00ac,
- 0x0000,0x0000,0x0054,0x0112,0x0066,0x0170,0x0078,0x01c2,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0018,0x0000,0x006a,0x0000,0x008a,0x0000,0x00b0,
- 0x0000,0x00e0,0x0000,0x0116,0x0000,0x0174,0x0000,0x01c6,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x000c,0x0000,0x0065,0x0000,0x007f,0x0000,0x00a6,
- 0x0000,0x00db,0x0000,0x010b,0x0000,0x0169,0x0000,0x01bb,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x000a,0x0019,0x001f,0x006b,0x002a,0x008b,0x0035,0x00b1,
- 0x0047,0x00e1,0x0056,0x0117,0x0068,0x0175,0x007a,0x01c7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x000b,0x0019,0x0020,0x006b,0x002b,0x008b,0x0036,0x00b1,
- 0x0048,0x00e1,0x0057,0x0117,0x0069,0x0175,0x007a,0x01c7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0015,0x003e,0x0015,0x003e,0x0099,0x0095,0x0015,0x003e,
- 0x0000,0x0000,0x009e,0x013a,0x006d,0x018f,0x007e,0x01dc,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x000c,0x001d,0x000c,0x001d,0x000c,0x001d,0x000c,0x001d,
- 0x0049,0x00e5,0x0058,0x011b,0x006a,0x0179,0x007b,0x01c9,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x0000,0x001f,0x0000,0x001f,0x0000,0x001f,0x0000,0x001f,
- 0x0000,0x00e7,0x0000,0x011d,0x0000,0x017b,0x0000,0x01cb,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x000d,0x0020,0x0021,0x006f,0x002c,0x008f,0x0037,0x00b5,
- 0x004a,0x00e8,0x0059,0x011e,0x006b,0x017c,0x007c,0x01cc,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0022,0x0000,0x0071,0x0000,0x0091,0x0000,0x00b7,
- 0x0000,0x00ea,0x0000,0x0120,0x0000,0x017e,0x0000,0x01ce,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0014,0x003b,0x0014,0x003b,0x005d,0x0092,0x0014,0x003b,
- 0x0014,0x003b,0x009d,0x0137,0x00a0,0x018c,0x00a1,0x01d9,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x0012,0x0036,0x0012,0x0036,0x0012,0x0036,0x0012,0x0036,
- 0x008a,0x00e5,0x00be,0x013c,0x006c,0x0184,0x007d,0x01d1,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0013,0x0038,0x0013,0x0038,0x0013,0x0038,0x0013,0x0038,
- 0x008a,0x00e5,0x00bf,0x013d,0x006c,0x0184,0x007d,0x01d1,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0038,0x00ba,0x0038,0x00ba,0x0038,0x00ba,0x0038,0x00ba,
- 0x0038,0x00ba,0x00a2,0x0128,0x006e,0x019c,0x007f,0x01e7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x005c,0x014d,0x005c,0x014d,0x005c,0x014d,0x005c,0x014d,
- 0x0000,0x0000,0x009c,0x0124,0x0071,0x01a5,0x0082,0x01f0,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x005b,0x014d,0x005b,0x014d,0x005b,0x014d,0x005b,0x014d,
- 0x0000,0x0000,0x009b,0x0124,0x0070,0x01a1,0x0081,0x01ec,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0044,0x0000,0x0044,0x0000,0x0044,0x0000,0x0044,
- 0x0000,0x00db,0x0000,0x010b,0x0000,0x0169,0x0000,0x01bb,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0018,0x0045,0x0018,0x0045,0x0018,0x0045,0x0018,0x0045,
- 0x0044,0x00d7,0x0051,0x0107,0x0063,0x0165,0x0075,0x01b7,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x008b,0x000e,0x008b,0x000e,0x008c,0x0080,0x008b,0x000e,
- 0x0000,0x0000,0x008d,0x010c,0x008e,0x016a,0x008f,0x01bc,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x0090,0x0010,0x0090,0x0010,0x0091,0x0082,0x0092,0x00a8,
- 0x0000,0x0000,0x0093,0x010e,0x0094,0x016c,0x0095,0x01be,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0096,0x003e,0x0096,0x003e,0x009a,0x0095,0x0096,0x003e,
- 0x0000,0x0000,0x009f,0x013a,0x0097,0x018f,0x0098,0x01dc,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0049,0x0000,0x0069,0x0000,0x0098,0x0000,0x00af,
- 0x0000,0x00df,0x0000,0x0145,0x0000,0x0173,0x0000,0x01c5,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x005e,0x0048,0x005f,0x0068,0x006f,0x0097,0x0080,0x00ae,
- 0x00ac,0x00de,0x00ad,0x0144,0x00ae,0x0172,0x00af,0x01c4,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
- 0x004b,0x00ed,0x004b,0x00ed,0x004b,0x00ed,0x004b,0x00ed,
- 0x004b,0x00ed,0x00b0,0x012b,0x00b6,0x0186,0x00ba,0x01d3,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0087,0x00f2,0x0087,0x00f2,0x0087,0x00f2,0x0087,0x00f2,
- 0x0087,0x00f2,0x00b3,0x0130,0x00b8,0x018b,0x00bc,0x01d8,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x00c1,0x0050,0x00c1,0x0050,0x00c1,0x0050,0x00c1,0x0050,
- 0x00c1,0x0050,0x00c3,0x0148,0x00c5,0x019a,0x00c7,0x01e5,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x00c2,0x0050,0x00c2,0x0050,0x00c2,0x0050,0x00c2,0x0050,
- 0x00c2,0x0050,0x00c4,0x0148,0x00c6,0x019a,0x00c8,0x01e5,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
-};
-
-/* decryption table */
-static const uint8_t decryption_table[0x100] = {
-0x7b,0x82,0xf0,0xbc,0x7f,0x1d,0xa2,0xc5,0x2a,0xfa,0x55,0xee,0x1a,0xd0,0x59,0x76,
-0x5e,0x75,0x79,0x16,0xa5,0xf6,0x84,0xed,0x0f,0x2e,0xf2,0x36,0x61,0xac,0xcd,0xab,
-0x01,0x3b,0x01,0x87,0x73,0xab,0xce,0x5d,0xd4,0x1d,0x68,0x2a,0x35,0xea,0x13,0x27,
-0x00,0xaa,0x46,0x36,0x6e,0x65,0x80,0x7e,0x19,0xe2,0x96,0xab,0xac,0xa5,0x6c,0x63,
-0x4a,0x6f,0x87,0xf6,0x6a,0xac,0x38,0xe2,0x1f,0x87,0xf9,0xaa,0xf5,0x41,0x60,0xa6,
-0x42,0xb9,0x30,0xf2,0xc3,0x1c,0x4e,0x4b,0x08,0x10,0x42,0x32,0xbf,0xb2,0xc5,0x0f,
-0x7a,0xab,0x97,0xf6,0xe7,0xb3,0x46,0xf8,0xec,0x2b,0x7d,0x5f,0xb1,0x10,0x03,0xe4,
-0x0f,0x22,0xdf,0x8d,0x10,0x66,0xa7,0x7e,0x96,0xbd,0x5a,0xaf,0xaa,0x43,0xdf,0x10,
-0x7c,0x04,0xe2,0x9d,0x66,0xd7,0xf0,0x02,0x58,0x8a,0x55,0x17,0x16,0xe2,0xe2,0x52,
-0xaf,0xd9,0xf9,0x0d,0x59,0x70,0x86,0x3c,0x05,0xd1,0x52,0xa7,0xf0,0xbf,0x17,0xd0,
-0x23,0x15,0xfe,0x23,0xf2,0x80,0x60,0x6f,0x95,0x89,0x67,0x65,0xc9,0x0e,0xfc,0x16,
-0xd6,0x8a,0x9f,0x25,0x2c,0x0f,0x2d,0xe4,0x51,0xb2,0xa8,0x18,0x3a,0x5d,0x66,0xa0,
-0x9f,0xb0,0x58,0xea,0x78,0x72,0x08,0x6a,0x90,0xb6,0xa4,0xf5,0x08,0x19,0x60,0x4e,
-0x92,0xbd,0xf1,0x05,0x67,0x4f,0x24,0x99,0x69,0x1d,0x0c,0x6d,0xe7,0x74,0x88,0x22,
-0x2d,0x15,0x7a,0xa2,0x37,0xa9,0xa0,0xb0,0x2c,0xfb,0x27,0xe5,0x4f,0xb6,0xcd,0x75,
-0xdc,0x39,0xce,0x6f,0x1f,0xfe,0xcc,0xb5,0xe6,0xda,0xd8,0xee,0x85,0xee,0x2f,0x04,
-};
-
-/* alt decryption table (gtmr2) */
-static const uint8_t decryption_table_alt[0x100] = {
-0x26,0x17,0xb9,0xcf,0x1a,0xf5,0x14,0x1e,0x0c,0x35,0xb3,0x66,0xa0,0x17,0xe9,0xe4,
-0x90,0xf6,0xd5,0x35,0xac,0x95,0x49,0x43,0x64,0x0c,0x03,0x75,0x4d,0xda,0xb6,0xdf,
-0x06,0xcf,0x83,0x9e,0x35,0x2c,0x71,0x2a,0xab,0xcc,0x65,0xd4,0x1f,0xb0,0x88,0x3c,
-0xb7,0x87,0x35,0xc0,0x41,0x65,0x9f,0xa0,0xd5,0x8c,0x3e,0x06,0x53,0xdb,0x45,0x64,
-0x09,0x1e,0xc5,0x8d,0x50,0x24,0xe2,0x4a,0x9b,0x99,0x77,0x25,0x43,0xa9,0x1d,0xac,
-0x99,0x31,0x75,0xb5,0x53,0xab,0xad,0x5a,0x42,0x14,0xa1,0x52,0xac,0xec,0x5f,0xf8,
-0x8c,0x78,0x05,0x47,0xea,0xb8,0xde,0x69,0x98,0x2d,0x8f,0x9d,0xfc,0x05,0xea,0xee,
-0x77,0xbb,0xa9,0x31,0x01,0x00,0xea,0xd8,0x9c,0x43,0xb5,0x2f,0x4e,0xb5,0x1b,0xd2,
-0x01,0x4b,0xc4,0xf8,0x76,0x92,0x59,0x4f,0x20,0x52,0xd9,0x7f,0xa9,0x19,0xe9,0x7c,
-0x8d,0x3b,0xec,0xe0,0x60,0x08,0x2e,0xbd,0x27,0x8b,0xb2,0xfc,0x29,0xd8,0x39,0x8a,
-0x4f,0x2f,0x6b,0x04,0x10,0xbd,0xa1,0x04,0xde,0xc0,0xd5,0x0f,0x04,0x86,0xd6,0xd8,
-0xfd,0xb1,0x3c,0x4c,0xd1,0xc4,0xf1,0x5b,0xf5,0x8b,0xe3,0xc4,0x89,0x3c,0x39,0x86,
-0xd2,0x92,0xc9,0xe5,0x2c,0x4f,0xe2,0x2f,0x2d,0xc5,0x35,0x09,0x94,0x47,0x3c,0x04,
-0x40,0x8b,0x57,0x08,0xf6,0x74,0xe9,0xb8,0x36,0x4d,0xc5,0x26,0x13,0x3d,0x75,0xa0,
-0xa8,0x29,0x09,0x8c,0x87,0xf7,0x13,0xaf,0x4c,0x38,0x0b,0x8a,0x7f,0x2c,0x62,0x27,
-0x47,0xaa,0xda,0x07,0x92,0x8d,0xfd,0x1f,0xee,0x48,0x1a,0x53,0x3b,0x98,0x6a,0x72,
-};
-
+#pragma once
class kaneko_toybox_device : public device_t
{
public:
+ static constexpr int GAME_NORMAL = 0;
+ static constexpr int GAME_BONK = 1;
+
+ static constexpr int TABLE_NORMAL = 0;
+ static constexpr int TABLE_ALT = 1;
+
kaneko_toybox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void set_table(device_t &device, int tabletype);
@@ -364,10 +44,12 @@ private:
};
-extern const device_type KANEKO_TOYBOX;
+DECLARE_DEVICE_TYPE(KANEKO_TOYBOX, kaneko_toybox_device)
#define MCFG_TOYBOX_TABLE_TYPE(_type) \
- kaneko_toybox_device::set_table(*device, _type);
+ kaneko_toybox_device::set_table(*device, kaneko_toybox_device::TABLE_##_type);
#define MCFG_TOYBOX_GAME_TYPE(_type) \
- kaneko_toybox_device::set_game_type(*device, _type);
+ kaneko_toybox_device::set_game_type(*device, kaneko_toybox_device::GAME_##_type);
+
+#endif // MAME_MACHINE_KANEKO_TOYBOX_H
diff --git a/src/mame/machine/kc_keyb.cpp b/src/mame/machine/kc_keyb.cpp
index 6dc9f46d0ec..37c1beb7397 100644
--- a/src/mame/machine/kc_keyb.cpp
+++ b/src/mame/machine/kc_keyb.cpp
@@ -322,13 +322,13 @@ triggers the time measurement by the CTC channel 3."
#include "kc_keyb.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
//**************************************************************************
// GLOBAL VARIABLES
//**************************************************************************
-const device_type KC_KEYBOARD = device_creator<kc_keyboard_device>;
+DEFINE_DEVICE_TYPE(KC_KEYBOARD, kc_keyboard_device, "kc_keyboard", "KC Keyboard")
//**************************************************************************
// Input Ports
@@ -436,7 +436,7 @@ INPUT_PORTS_END
// kc_keyboard_device - constructor
//-------------------------------------------------
kc_keyboard_device::kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, KC_KEYBOARD, "KC Keyboard", tag, owner, clock, "kc_keyboard", __FILE__),
+ device_t(mconfig, KC_KEYBOARD, tag, owner, clock),
m_write_out(*this)
{
}
@@ -506,7 +506,7 @@ void kc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int
// get current pulse state
int pulse_state = (m_transmit_buffer.data[pulse_byte_count]>>pulse_bit_count) & 0x01;
- LOG(("KC keyboard sending pulse: %02x\n", pulse_state));
+ LOG("KC keyboard sending pulse: %02x\n", pulse_state);
// send pulse
m_write_out(pulse_state ? ASSERT_LINE : CLEAR_LINE);
@@ -535,7 +535,7 @@ void kc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int
{
// generate fake code
uint8_t code = (i<<3) | b;
- LOG(("Code: %02x\n",code));
+ LOG("Code: %02x\n",code);
transmit_scancode(code);
}
@@ -553,7 +553,7 @@ void kc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int
void kc_keyboard_device::add_pulse_to_transmit_buffer(int pulse_state, int pulse_number)
{
- if (m_transmit_buffer.pulse_count + 1 < KC_TRANSMIT_BUFFER_LENGTH)
+ if (m_transmit_buffer.pulse_count + 1 < TRANSMIT_BUFFER_LENGTH)
{
for (int i=0; i<pulse_number; i++)
{
diff --git a/src/mame/machine/kc_keyb.h b/src/mame/machine/kc_keyb.h
index 4bebcd761a1..726724df280 100644
--- a/src/mame/machine/kc_keyb.h
+++ b/src/mame/machine/kc_keyb.h
@@ -6,8 +6,10 @@
*********************************************************************/
-#ifndef __KC_KEYB_H__
-#define __KC_KEYB_H__
+#ifndef MAME_MACHINE_KC_KEYB_H
+#define MAME_MACHINE_KC_KEYB_H
+
+#pragma once
#define MCFG_KC_KEYBOARD_OUT_CALLBACK(_write) \
devcb = &kc_keyboard_device::set_out_wr_callback(*device, DEVCB_##_write);
@@ -16,9 +18,6 @@
TYPE DEFINITIONS
***************************************************************************/
-/* number of pulses that can be stored */
-#define KC_TRANSMIT_BUFFER_LENGTH 256
-
// ======================> kc_keyboard_device
class kc_keyboard_device : public device_t
@@ -28,12 +27,15 @@ public:
kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~kc_keyboard_device();
- template<class _Object> static devcb_base &set_out_wr_callback(device_t &device, _Object object) { return downcast<kc_keyboard_device &>(device).m_write_out.set_callback(object); }
+ template <class Object> static devcb_base &set_out_wr_callback(device_t &device, Object &&cb) { return downcast<kc_keyboard_device &>(device).m_write_out.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
protected:
+ /* number of pulses that can be stored */
+ static constexpr unsigned TRANSMIT_BUFFER_LENGTH = 256;
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -44,22 +46,22 @@ protected:
void transmit_scancode(uint8_t scan_code);
private:
- static const device_timer_id TIMER_TRANSMIT_PULSE = 1;
+ static constexpr device_timer_id TIMER_TRANSMIT_PULSE = 1;
// internal state
- emu_timer * m_timer_transmit_pulse;
+ emu_timer * m_timer_transmit_pulse;
devcb_write_line m_write_out;
// pulses to transmit
struct
{
- uint8_t data[KC_TRANSMIT_BUFFER_LENGTH>>3];
+ uint8_t data[TRANSMIT_BUFFER_LENGTH>>3];
int pulse_sent;
int pulse_count;
} m_transmit_buffer;
};
// device type definition
-extern const device_type KC_KEYBOARD;
+DECLARE_DEVICE_TYPE(KC_KEYBOARD, kc_keyboard_device)
-#endif /* __KC_KEYB_H__ */
+#endif // MAME_MACHINE_KC_KEYB_H
diff --git a/src/mame/machine/km035.cpp b/src/mame/machine/km035.cpp
index b8ffbf956de..6b144f5b4e2 100644
--- a/src/mame/machine/km035.cpp
+++ b/src/mame/machine/km035.cpp
@@ -34,7 +34,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type KM035 = device_creator<km035_device>;
+DEFINE_DEVICE_TYPE(KM035, km035_device, "km035", "KM035 Keyboard")
ROM_START( km035 )
ROM_REGION (0x800, KM035_CPU_TAG, 0)
@@ -269,7 +269,7 @@ ioport_constructor km035_device::device_input_ports() const
//-------------------------------------------------
km035_device::km035_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KM035, "KM035 keyboard", tag, owner, clock, "km035", __FILE__),
+ : device_t(mconfig, KM035, tag, owner, clock),
m_maincpu(*this, KM035_CPU_TAG),
m_speaker(*this, KM035_SPK_TAG),
m_kbd(*this, "KBD%u", 0),
diff --git a/src/mame/machine/km035.h b/src/mame/machine/km035.h
index b52f5105a1c..599c2cd64a2 100644
--- a/src/mame/machine/km035.h
+++ b/src/mame/machine/km035.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
-#pragma once
+#ifndef MAME_MACHINE_KM035_H
+#define MAME_MACHINE_KM035_H
-#ifndef __KM035_H__
-#define __KM035_H__
+#pragma once
#include "cpu/mcs48/mcs48.h"
#include "sound/beep.h"
@@ -73,6 +73,6 @@ private:
};
// device type definition
-extern const device_type KM035;
+DECLARE_DEVICE_TYPE(KM035, km035_device)
-#endif
+#endif // MAME_MACHINE_KM035_H
diff --git a/src/mame/machine/konami1.cpp b/src/mame/machine/konami1.cpp
index f3b6b920934..501b54c3018 100644
--- a/src/mame/machine/konami1.cpp
+++ b/src/mame/machine/konami1.cpp
@@ -9,10 +9,10 @@
#include "emu.h"
#include "konami1.h"
-const device_type KONAMI1 = device_creator<konami1_device>;
+DEFINE_DEVICE_TYPE(KONAMI1, konami1_device, "konami1", "KONAMI-1")
konami1_device::konami1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m6809_base_device(mconfig, "KONAMI-1", tag, owner, clock, KONAMI1, 1, "konami1", __FILE__)
+ : m6809_base_device(mconfig, tag, owner, clock, KONAMI1, 1)
{
m_boundary = 0x0000;
}
diff --git a/src/mame/machine/konami1.h b/src/mame/machine/konami1.h
index a15ad165b36..a21542a1967 100644
--- a/src/mame/machine/konami1.h
+++ b/src/mame/machine/konami1.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#ifndef MAME_MACHINE_KONAMI1_H
+#define MAME_MACHINE_KONAMI1_H
+
+#pragma once
+
#include "cpu/m6809/m6809.h"
@@ -23,4 +28,6 @@ protected:
virtual void device_start() override;
};
-extern const device_type KONAMI1;
+DECLARE_DEVICE_TYPE(KONAMI1, konami1_device)
+
+#endif // MAME_MACHINE_KONAMI1_H
diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp
index 2d841620c82..b9429c8a1e6 100644
--- a/src/mame/machine/konppc.cpp
+++ b/src/mame/machine/konppc.cpp
@@ -14,10 +14,10 @@
/*****************************************************************************/
-const device_type KONPPC = device_creator<konppc_device>;
+DEFINE_DEVICE_TYPE(KONPPC, konppc_device, "konppc", "Konami PowerPC Common Functions")
konppc_device::konppc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KONPPC, "Konami PowerPC Common Functions", tag, owner, clock, "konppc", __FILE__),
+ : device_t(mconfig, KONPPC, tag, owner, clock),
cgboard_type(0),
num_cgboards(0)/*,
cgboard_id(MAX_CG_BOARDS)*/
diff --git a/src/mame/machine/konppc.h b/src/mame/machine/konppc.h
index a4657a01edc..8ec5324e1bd 100644
--- a/src/mame/machine/konppc.h
+++ b/src/mame/machine/konppc.h
@@ -1,25 +1,27 @@
// license:BSD-3-Clause
// copyright-holders:Ville Linde
-#ifndef _KONPPC_H
-#define _KONPPC_H
+#ifndef MAME_MACHINE_KONPPC_H
+#define MAME_MACHINE_KONPPC_H
-#define CGBOARD_TYPE_ZR107 0
-#define CGBOARD_TYPE_GTICLUB 1
-#define CGBOARD_TYPE_NWKTR 2
-#define CGBOARD_TYPE_HORNET 3
-#define CGBOARD_TYPE_HANGPLT 4
-
-#define MAX_CG_BOARDS 2
+#pragma once
#define MCFG_KONPPC_CGBOARD_NUMBER(_num) \
konppc_device::static_set_num_boards(*device, _num);
#define MCFG_KONPPC_CGBOARD_TYPE(_cgtype) \
- konppc_device::static_set_cbboard_type(*device, _cgtype);
+ konppc_device::static_set_cbboard_type(*device, konppc_device::CGBOARD_TYPE_##_cgtype);
class konppc_device : public device_t
{
public:
+ static constexpr int CGBOARD_TYPE_ZR107 = 0;
+ static constexpr int CGBOARD_TYPE_GTICLUB = 1;
+ static constexpr int CGBOARD_TYPE_NWKTR = 2;
+ static constexpr int CGBOARD_TYPE_HORNET = 3;
+ static constexpr int CGBOARD_TYPE_HANGPLT = 4;
+
+ static constexpr int MAX_CG_BOARDS = 2;
+
// construction/destruction
konppc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -98,9 +100,9 @@ private:
// device type definition
-extern const device_type KONPPC;
+DECLARE_DEVICE_TYPE(KONPPC, konppc_device)
void draw_7segment_led(bitmap_rgb32 &bitmap, int x, int y, uint8_t value);
-#endif
+#endif // MAME_MACHINE_KONPPC_H
diff --git a/src/mame/machine/leland.cpp b/src/mame/machine/leland.cpp
index ae9972572be..694c910383f 100644
--- a/src/mame/machine/leland.cpp
+++ b/src/mame/machine/leland.cpp
@@ -9,8 +9,10 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/leland.h"
+#include "audio/leland.h"
+
+#include "cpu/z80/z80.h"
/*************************************
diff --git a/src/mame/machine/lviv.cpp b/src/mame/machine/lviv.cpp
index 024652e8173..24701e193d1 100644
--- a/src/mame/machine/lviv.cpp
+++ b/src/mame/machine/lviv.cpp
@@ -227,29 +227,29 @@ Lviv snapshot files (SAV)
1411D - 1412A: ??? (something additional)
*******************************************************************************/
-void lviv_state::lviv_setup_snapshot (uint8_t * data)
+void lviv_state::lviv_setup_snapshot(uint8_t * data)
{
unsigned char lo,hi;
/* Set registers */
lo = data[0x14112] & 0x0ff;
hi = data[0x14111] & 0x0ff;
- m_maincpu->set_state_int(I8085_BC, (hi << 8) | lo);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_BC, (hi << 8) | lo);
lo = data[0x14114] & 0x0ff;
hi = data[0x14113] & 0x0ff;
- m_maincpu->set_state_int(I8085_DE, (hi << 8) | lo);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_DE, (hi << 8) | lo);
lo = data[0x14116] & 0x0ff;
hi = data[0x14115] & 0x0ff;
- m_maincpu->set_state_int(I8085_HL, (hi << 8) | lo);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_HL, (hi << 8) | lo);
lo = data[0x14118] & 0x0ff;
hi = data[0x14117] & 0x0ff;
- m_maincpu->set_state_int(I8085_AF, (hi << 8) | lo);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_AF, (hi << 8) | lo);
lo = data[0x14119] & 0x0ff;
hi = data[0x1411a] & 0x0ff;
- m_maincpu->set_state_int(I8085_SP, (hi << 8) | lo);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_SP, (hi << 8) | lo);
lo = data[0x1411b] & 0x0ff;
hi = data[0x1411c] & 0x0ff;
- m_maincpu->set_state_int(I8085_PC, (hi << 8) | lo);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_PC, (hi << 8) | lo);
/* Memory dump */
memcpy (m_ram->pointer(), data+0x0011, 0xc000);
@@ -265,12 +265,12 @@ void lviv_state::lviv_setup_snapshot (uint8_t * data)
void lviv_state::dump_registers()
{
- logerror("PC = %04x\n", (unsigned) m_maincpu->state_int(I8085_PC));
- logerror("SP = %04x\n", (unsigned) m_maincpu->state_int(I8085_SP));
- logerror("AF = %04x\n", (unsigned) m_maincpu->state_int(I8085_AF));
- logerror("BC = %04x\n", (unsigned) m_maincpu->state_int(I8085_BC));
- logerror("DE = %04x\n", (unsigned) m_maincpu->state_int(I8085_DE));
- logerror("HL = %04x\n", (unsigned) m_maincpu->state_int(I8085_HL));
+ logerror("PC = %04x\n", (unsigned) m_maincpu->state_int(i8080_cpu_device::I8085_PC));
+ logerror("SP = %04x\n", (unsigned) m_maincpu->state_int(i8080_cpu_device::I8085_SP));
+ logerror("AF = %04x\n", (unsigned) m_maincpu->state_int(i8080_cpu_device::I8085_AF));
+ logerror("BC = %04x\n", (unsigned) m_maincpu->state_int(i8080_cpu_device::I8085_BC));
+ logerror("DE = %04x\n", (unsigned) m_maincpu->state_int(i8080_cpu_device::I8085_DE));
+ logerror("HL = %04x\n", (unsigned) m_maincpu->state_int(i8080_cpu_device::I8085_HL));
}
image_verify_result lviv_state::lviv_verify_snapshot(uint8_t * data, uint32_t size)
diff --git a/src/mame/machine/m1comm.cpp b/src/mame/machine/m1comm.cpp
index be4f81f0381..c078bac817e 100644
--- a/src/mame/machine/m1comm.cpp
+++ b/src/mame/machine/m1comm.cpp
@@ -57,7 +57,8 @@ Notes:
#define Z80_TAG "m1commcpu"
-//#define __M1COMM_VERBOSE__
+#define VERBOSE 0
+#include "logmacro.h"
/*************************************
* M1COMM Memory Map
@@ -95,7 +96,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type M1COMM = device_creator<m1comm_device>;
+DEFINE_DEVICE_TYPE(M1COMM, m1comm_device, "m1comm", "Model 1 Communication Board")
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -125,7 +126,7 @@ const tiny_rom_entry *m1comm_device::device_rom_region() const
//-------------------------------------------------
m1comm_device::m1comm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, M1COMM, "MODEL-1 COMMUNICATION BD", tag, owner, clock, "m1comm", __FILE__),
+ device_t(mconfig, M1COMM, tag, owner, clock),
m_commcpu(*this, Z80_TAG),
m_line_rx(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE ),
m_line_tx(OPEN_FLAG_READ)
@@ -178,43 +179,33 @@ READ8_MEMBER(m1comm_device::dlc_reg_r)
// dirty hack to keep Z80 in RESET state
uint8_t result = m_dlc_reg[offset];
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-dlc_reg_r: read register %02x for value %02x\n", offset, result);
-#endif
+ LOG("m1comm-dlc_reg_r: read register %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(m1comm_device::dlc_reg_w)
{
m_dlc_reg[offset] = data;
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-dlc_reg_w: write register %02x for value %02x\n", offset, data);
-#endif
+ LOG("m1comm-dlc_reg_w: write register %02x for value %02x\n", offset, data);
}
READ8_MEMBER(m1comm_device::dma_reg_r)
{
uint8_t result = m_dma_reg[offset];
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-dma_reg_r: read register %02x for value %02x\n", offset, result);
-#endif
+ LOG("m1comm-dma_reg_r: read register %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(m1comm_device::dma_reg_w)
{
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-dma_reg_w: %02x %02x\n", offset, data);
-#endif
+ LOG("m1comm-dma_reg_w: %02x %02x\n", offset, data);
m_dma_reg[offset] = data;
}
READ8_MEMBER(m1comm_device::syn_r)
{
uint8_t result = m_syn | 0xfc;
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-syn_r: read register %02x for value %02x\n", offset, result);
-#endif
+ LOG("m1comm-syn_r: read register %02x for value %02x\n", offset, result);
return result;
}
@@ -222,38 +213,32 @@ WRITE8_MEMBER(m1comm_device::syn_w)
{
m_syn = data & 0x03;
-#ifdef __M1COMM_VERBOSE__
switch (data & 0x02)
{
- case 0x00:
- osd_printf_verbose("m1comm-syn_w: VINT disabled\n");
- break;
+ case 0x00:
+ LOG("m1comm-syn_w: VINT disabled\n");
+ break;
- case 0x02:
- osd_printf_verbose("m1comm-syn_w: VINT enabled\n");
- break;
+ case 0x02:
+ LOG("m1comm-syn_w: VINT enabled\n");
+ break;
- default:
- osd_printf_verbose("m1comm-syn_w: %02x\n", data);
- break;
+ default:
+ LOG("m1comm-syn_w: %02x\n", data);
+ break;
}
-#endif
}
READ8_MEMBER(m1comm_device::zfg_r)
{
uint8_t result = m_zfg | (~m_fg << 7) | 0x7e;
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-zfg_r: read register %02x for value %02x\n", offset, result);
-#endif
+ LOG("m1comm-zfg_r: read register %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(m1comm_device::zfg_w)
{
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-zfg_w: %02x\n", data);
-#endif
+ LOG("m1comm-zfg_w: %02x\n", data);
m_zfg = data & 0x01;
}
@@ -276,7 +261,7 @@ WRITE8_MEMBER(m1comm_device::cn_w)
{
m_cn = data & 0x01;
-#ifndef __M1COMM_SIMULATION__
+#ifndef M1COMM_SIMULATION
if (!m_cn)
device_reset();
else
@@ -317,20 +302,18 @@ WRITE8_MEMBER(m1comm_device::fg_w)
void m1comm_device::check_vint_irq()
{
-#ifndef __M1COMM_SIMULATION__
+#ifndef M1COMM_SIMULATION
if (m_syn & 0x02)
{
m_commcpu->set_input_line_and_vector(0, HOLD_LINE, 0xef);
-#ifdef __M1COMM_VERBOSE__
- osd_printf_verbose("m1comm-INT5\n");
-#endif
+ LOG("m1comm-INT5\n");
}
#else
comm_tick();
#endif
}
-#ifdef __M1COMM_SIMULATION__
+#ifdef M1COMM_SIMULATION
void m1comm_device::comm_tick()
{
if (m_linkenable == 0x01)
diff --git a/src/mame/machine/m1comm.h b/src/mame/machine/m1comm.h
index 2321c5ebddb..064a0f04a16 100644
--- a/src/mame/machine/m1comm.h
+++ b/src/mame/machine/m1comm.h
@@ -1,11 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Ariane Fugmann
-#pragma once
+#ifndef MAME_MACHINE_M1COMM_H
+#define MAME_MACHINE_M1COMM_H
-#ifndef __M1COMM_H__
-#define __M1COMM_H__
+#pragma once
-#define __M1COMM_SIMULATION__
+#define M1COMM_SIMULATION
#include "cpu/z80/z80.h"
@@ -80,7 +80,7 @@ private:
char m_remotehost[256];
uint8_t m_buffer[0x1000];
-#ifdef __M1COMM_SIMULATION__
+#ifdef M1COMM_SIMULATION
uint8_t m_linkenable;
uint16_t m_linktimer;
uint8_t m_linkalive;
@@ -94,4 +94,4 @@ private:
// device type definition
extern const device_type M1COMM;
-#endif /* __M1COMM_H__ */
+#endif // MAME_MACHINE_M1COMM_H
diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp
index fa690919fa4..891128bf1ad 100644
--- a/src/mame/machine/m20_8086.cpp
+++ b/src/mame/machine/m20_8086.cpp
@@ -4,10 +4,10 @@
#include "m20_8086.h"
#include "machine/ram.h"
-const device_type M20_8086 = device_creator<m20_8086_device>;
+DEFINE_DEVICE_TYPE(M20_8086, m20_8086_device, "m20_8086", "Olivetti M20 8086 Adapter")
m20_8086_device::m20_8086_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, M20_8086, "Olivetti M20 8086 Adapter", tag, owner, clock, "m20_8086", __FILE__),
+ device_t(mconfig, M20_8086, tag, owner, clock),
m_8086(*this, "8086"),
m_maincpu(*this, ":maincpu"),
m_pic(*this, ":i8259"),
diff --git a/src/mame/machine/m20_8086.h b/src/mame/machine/m20_8086.h
index 56f7a81e43a..c49fe1173cc 100644
--- a/src/mame/machine/m20_8086.h
+++ b/src/mame/machine/m20_8086.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef M20_8086_H_
-#define M20_8086_H_
+#ifndef MAME_MACHINE_M20_8086_H
+#define MAME_MACHINE_M20_8086_H
#include "cpu/i86/i86.h"
#include "machine/pic8259.h"
@@ -20,20 +20,22 @@ public:
DECLARE_WRITE_LINE_MEMBER(nvi_w);
DECLARE_WRITE16_MEMBER(handshake_w);
IRQ_CALLBACK_MEMBER(int_cb);
- bool halted() { return m_8086_halt; }
- required_device<cpu_device> m_8086;
+
+ void halt() { m_8086->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); }
+ bool halted() const { return m_8086_halt; }
protected:
void device_start() override;
void device_reset() override;
private:
+ required_device<cpu_device> m_8086;
required_device<cpu_device> m_maincpu;
required_device<pic8259_device> m_pic;
bool m_8086_halt;
int m_nvi, m_vi;
};
-extern const device_type M20_8086;
+DECLARE_DEVICE_TYPE(M20_8086, m20_8086_device)
-#endif /* M20_8086_H_ */
+#endif // MAME_MACHINE_M20_8086_H
diff --git a/src/mame/machine/m20_kbd.cpp b/src/mame/machine/m20_kbd.cpp
index 796dcae5a7b..78942ef41b4 100644
--- a/src/mame/machine/m20_kbd.cpp
+++ b/src/mame/machine/m20_kbd.cpp
@@ -155,7 +155,7 @@ INPUT_PORTS_END
m20_keyboard_device::m20_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : buffered_rs232_device(mconfig, M20_KEYBOARD, "M20 Keyboard", tag, owner, 0, "m20_keyboard", __FILE__)
+ : buffered_rs232_device(mconfig, M20_KEYBOARD, tag, owner, 0)
, device_matrix_keyboard_interface(mconfig, *this, "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8")
, m_modifiers(*this, "MODIFIERS")
{
@@ -235,4 +235,4 @@ void m20_keyboard_device::received_byte(uint8_t byte)
}
-const device_type M20_KEYBOARD = device_creator<m20_keyboard_device>;
+DEFINE_DEVICE_TYPE(M20_KEYBOARD, m20_keyboard_device, "m20_kbd", "Olivetti M20 Keyboard")
diff --git a/src/mame/machine/m20_kbd.h b/src/mame/machine/m20_kbd.h
index 2c6ac21f144..7b022f905f4 100644
--- a/src/mame/machine/m20_kbd.h
+++ b/src/mame/machine/m20_kbd.h
@@ -23,6 +23,6 @@ private:
required_ioport m_modifiers;
};
-extern const device_type M20_KEYBOARD;
+DECLARE_DEVICE_TYPE(M20_KEYBOARD, m20_keyboard_device)
#endif // MAME_MACHINE_M20KBD_H
diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp
index 701b6cf0d8c..835d1216e2e 100644
--- a/src/mame/machine/m24_kbd.cpp
+++ b/src/mame/machine/m24_kbd.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "m24_kbd.h"
-const device_type M24_KEYBOARD = device_creator<m24_keyboard_device>;
+DEFINE_DEVICE_TYPE(M24_KEYBOARD, m24_keyboard_device, "m24_kbd", "Olivetti M24 Keyboard")
ROM_START( m24_keyboard )
ROM_REGION(0x800, "mcu", 0)
@@ -209,7 +209,7 @@ ioport_constructor m24_keyboard_device::device_input_ports() const
}
m24_keyboard_device::m24_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, M24_KEYBOARD, "Olivetti M24 Keyboard", tag, owner, clock, "m24_kbd", __FILE__)
+ : device_t(mconfig, M24_KEYBOARD, tag, owner, clock)
, m_rows(*this, "ROW.%u", 0)
, m_mousebtn(*this, "MOUSEBTN")
, m_out_data(*this)
diff --git a/src/mame/machine/m24_kbd.h b/src/mame/machine/m24_kbd.h
index 6a043c8afd6..a8845809ff8 100644
--- a/src/mame/machine/m24_kbd.h
+++ b/src/mame/machine/m24_kbd.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef M24KBD_H_
-#define M24KBD_H_
+#ifndef MAME_MACHINE_M24_KBD_H
+#define MAME_MACHINE_M24_KBD_H
+
+#pragma once
#include "cpu/mcs48/mcs48.h"
@@ -13,16 +15,12 @@ class m24_keyboard_device : public device_t
public:
m24_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_data_handler(device_t &device, _Object object) { return downcast<m24_keyboard_device &>(device).m_out_data.set_callback(object); }
+ template <class Object> static devcb_base &set_out_data_handler(device_t &device, Object &&cb) { return downcast<m24_keyboard_device &>(device).m_out_data.set_callback(std::forward<Object>(cb)); }
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
virtual ioport_constructor device_input_ports() const override;
- void device_start() override;
- void device_reset() override;
- void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-
DECLARE_WRITE8_MEMBER(bus_w);
DECLARE_READ8_MEMBER(p1_r);
DECLARE_WRITE8_MEMBER(p1_w);
@@ -31,6 +29,12 @@ public:
DECLARE_READ_LINE_MEMBER(t1_r);
DECLARE_WRITE_LINE_MEMBER(clock_w);
DECLARE_WRITE_LINE_MEMBER(data_w);
+
+protected:
+ void device_start() override;
+ void device_reset() override;
+ void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
private:
required_ioport_array<16> m_rows;
required_ioport m_mousebtn;
@@ -41,6 +45,6 @@ private:
emu_timer *m_reset_timer;
};
-extern const device_type M24_KEYBOARD;
+DECLARE_DEVICE_TYPE(M24_KEYBOARD, m24_keyboard_device)
-#endif /* M24KBD_H_ */
+#endif // MAME_MACHINE_M24_KBD_H
diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp
index ffdc85a89d9..2edf10fe7c0 100644
--- a/src/mame/machine/m24_z8000.cpp
+++ b/src/mame/machine/m24_z8000.cpp
@@ -3,10 +3,10 @@
#include "emu.h"
#include "m24_z8000.h"
-const device_type M24_Z8000 = device_creator<m24_z8000_device>;
+DEFINE_DEVICE_TYPE(M24_Z8000, m24_z8000_device, "m24_z8000", "Olivetti M24 Z8000 Adapter")
m24_z8000_device::m24_z8000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, M24_Z8000, "Olivetti M24 Z8000 Adapter", tag, owner, clock, "m24_z8000", __FILE__),
+ device_t(mconfig, M24_Z8000, tag, owner, clock),
m_z8000(*this, "z8000"),
m_maincpu(*this, ":maincpu"),
m_pic(*this, ":mb:pic8259"),
diff --git a/src/mame/machine/m24_z8000.h b/src/mame/machine/m24_z8000.h
index e0eac4ef2ca..9e2590701ef 100644
--- a/src/mame/machine/m24_z8000.h
+++ b/src/mame/machine/m24_z8000.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef M24_Z8000_H_
-#define M24_Z8000_H_
+#ifndef MAME_MACHINE_M24_Z8000_H
+#define MAME_MACHINE_M24_Z8000_H
+
+#pragma once
#include "cpu/z8000/z8000.h"
#include "machine/i8251.h"
@@ -18,7 +20,7 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
- template<class _Object> static devcb_base &set_halt_callback(device_t &device, _Object object) { return downcast<m24_z8000_device &>(device).m_halt_out.set_callback(object); }
+ template <class Object> static devcb_base &set_halt_callback(device_t &device, Object &&cb) { return downcast<m24_z8000_device &>(device).m_halt_out.set_callback(std::forward<Object>(cb)); }
DECLARE_READ16_MEMBER(pmem_r);
DECLARE_WRITE16_MEMBER(pmem_w);
@@ -33,14 +35,18 @@ public:
DECLARE_WRITE_LINE_MEMBER(mo_w);
DECLARE_WRITE_LINE_MEMBER(timer_irq_w);
IRQ_CALLBACK_MEMBER(int_cb);
- bool halted() { return m_z8000_halt; }
- required_device<z8001_device> m_z8000;
+ DECLARE_WRITE_LINE_MEMBER(halt_w) { m_z8000->set_input_line(INPUT_LINE_HALT, state); }
+ DECLARE_WRITE_LINE_MEMBER(int_w) { m_z8000->set_input_line(INPUT_LINE_IRQ1, state); }
+
+ bool halted() const { return m_z8000_halt; }
+
protected:
void device_start() override;
void device_reset() override;
private:
+ required_device<z8001_device> m_z8000;
required_device<cpu_device> m_maincpu;
required_device<pic8259_device> m_pic;
devcb_write_line m_halt_out;
@@ -51,5 +57,6 @@ private:
};
extern const device_type M24_Z8000;
+DECLARE_DEVICE_TYPE(M24_Z8000, m24_z8000_device)
-#endif /* M24_Z8000_H_ */
+#endif // MAME_MACHINE_M24_Z8000_H
diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp
index d7b313b8e08..3285e9a7dff 100644
--- a/src/mame/machine/m2comm.cpp
+++ b/src/mame/machine/m2comm.cpp
@@ -168,7 +168,8 @@ Sega PC BD MODEL2 C-CRX COMMUNICATION 837-12839
#include "emuopts.h"
#include "machine/m2comm.h"
-//#define __M2COMM_VERBOSE__
+#define VERBOSE 0
+#include "logmacro.h"
MACHINE_CONFIG_FRAGMENT( m2comm )
MACHINE_CONFIG_END
@@ -177,7 +178,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type M2COMM = device_creator<m2comm_device>;
+DEFINE_DEVICE_TYPE(M2COMM, m2comm_device, "m2comm", "Model 2 Communication Board")
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -198,7 +199,7 @@ machine_config_constructor m2comm_device::device_mconfig_additions() const
//-------------------------------------------------
m2comm_device::m2comm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, M2COMM, "MODEL2 COMMUNICATION BD", tag, owner, clock, "m2comm", __FILE__),
+ device_t(mconfig, M2COMM, tag, owner, clock),
m_line_rx(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE ),
m_line_tx(OPEN_FLAG_READ)
{
@@ -239,34 +240,26 @@ void m2comm_device::device_reset()
READ8_MEMBER(m2comm_device::zfg_r)
{
uint8_t result = m_zfg | (~m_fg << 7) | 0x7e;
-#ifdef __M2COMM_VERBOSE__
- osd_printf_verbose("m2comm-zfg_r: read register %02x for value %02x\n", offset, result);
-#endif
+ LOG("m2comm-zfg_r: read register %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(m2comm_device::zfg_w)
{
-#ifdef __M2COMM_VERBOSE__
- osd_printf_verbose("m2comm-zfg_w: %02x\n", data);
-#endif
+ LOG("m2comm-zfg_w: %02x\n", data);
m_zfg = data & 0x01;
}
READ8_MEMBER(m2comm_device::share_r)
{
uint8_t result = m_shared[offset];
-#ifdef __M2COMM_VERBOSE__
- osd_printf_verbose("m2comm-share_r: read shared memory %02x for value %02x\n", offset, result);
-#endif
+ LOG("m2comm-share_r: read shared memory %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(m2comm_device::share_w)
{
-#ifdef __M2COMM_VERBOSE__
- osd_printf_verbose("m2comm-share_w: %02x %02x\n", offset, data);
-#endif
+ LOG("m2comm-share_w: %02x %02x\n", offset, data);
m_shared[offset] = data;
}
@@ -279,7 +272,7 @@ WRITE8_MEMBER(m2comm_device::cn_w)
{
m_cn = data & 0x01;
-#ifndef __M2COMM_SIMULATION__
+#ifndef M2COMM_SIMULATION
if (!m_cn)
device_reset();
#else
@@ -336,13 +329,13 @@ WRITE8_MEMBER(m2comm_device::fg_w)
void m2comm_device::check_vint_irq()
{
-#ifndef __M2COMM_SIMULATION__
+#ifndef M2COMM_SIMULATION
#else
comm_tick();
#endif
}
-#ifdef __M2COMM_SIMULATION__
+#ifdef M2COMM_SIMULATION
void m2comm_device::comm_tick()
{
if (m_linkenable == 0x01)
diff --git a/src/mame/machine/m2comm.h b/src/mame/machine/m2comm.h
index 5145b59d54b..2667f277340 100644
--- a/src/mame/machine/m2comm.h
+++ b/src/mame/machine/m2comm.h
@@ -1,11 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Ariane Fugmann
-#pragma once
+#ifndef MAME_MACHINE_M2COMM_H
+#define MAME_MACHINE_M2COMM_H
-#ifndef __M2COMM_H__
-#define __M2COMM_H__
+#pragma once
-#define __M2COMM_SIMULATION__
+#define M2COMM_SIMULATION
#define MCFG_M2COMM_ADD(_tag ) \
@@ -64,7 +64,7 @@ private:
char m_remotehost[256];
uint8_t m_buffer[0x4000];
-#ifdef __M2COMM_SIMULATION__
+#ifdef M2COMM_SIMULATION
uint8_t m_linkenable;
uint16_t m_linktimer;
uint8_t m_linkalive;
@@ -76,6 +76,6 @@ private:
};
// device type definition
-extern const device_type M2COMM;
+DECLARE_DEVICE_TYPE(M2COMM, m2comm_device)
-#endif /* __M2COMM_H__ */
+#endif // MAME_MACHINE_M2COMM_H
diff --git a/src/mame/machine/m3comm.cpp b/src/mame/machine/m3comm.cpp
index 0c90c8a025a..7017e16928a 100644
--- a/src/mame/machine/m3comm.cpp
+++ b/src/mame/machine/m3comm.cpp
@@ -116,7 +116,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type M3COMM = device_creator<m3comm_device>;
+DEFINE_DEVICE_TYPE(M3COMM, m3comm_device, "m3comm", "Model 3 Communication Board")
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -137,7 +137,7 @@ machine_config_constructor m3comm_device::device_mconfig_additions() const
//-------------------------------------------------
m3comm_device::m3comm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, M3COMM, "MODEL-3 COMMUNICATION BD", tag, owner, clock, "m3comm", __FILE__),
+ device_t(mconfig, M3COMM, tag, owner, clock),
m68k_ram(*this, "m68k_ram"),
m_commcpu(*this, M68K_TAG),
m_ram(*this, RAM_TAG),
diff --git a/src/mame/machine/m3comm.h b/src/mame/machine/m3comm.h
index 5e1ba416664..2989bddabba 100644
--- a/src/mame/machine/m3comm.h
+++ b/src/mame/machine/m3comm.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:MetalliC
-#pragma once
+#ifndef MAME_MACHINE_M3COMM_H
+#define MAME_MACHINE_M3COMM_H
-#ifndef __M3COMM_H__
-#define __M3COMM_H__
+#pragma once
#include "machine/ram.h"
#include "cpu/m68000/m68000.h"
@@ -77,6 +77,6 @@ private:
};
// device type definition
-extern const device_type M3COMM;
+DECLARE_DEVICE_TYPE(M3COMM, m3comm_device)
-#endif /* __M3COMM_H__ */
+#endif // MAME_MACHINE_M3COMM_H
diff --git a/src/mame/machine/mackbd.cpp b/src/mame/machine/mackbd.cpp
index 089ddf4254f..d6f35dbc6aa 100644
--- a/src/mame/machine/mackbd.cpp
+++ b/src/mame/machine/mackbd.cpp
@@ -65,7 +65,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MACKBD = device_creator<mackbd_device>;
+DEFINE_DEVICE_TYPE(MACKBD, mackbd_device, "mackbd", "Macintosh Keyboard")
ROM_START( mackbd )
ROM_REGION(0x800, MACKBD_CPU_TAG, 0)
@@ -212,7 +212,7 @@ ioport_constructor mackbd_device::device_input_ports() const
//-------------------------------------------------
mackbd_device::mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MACKBD, "Macintosh keyboard", tag, owner, clock, "mackbd", __FILE__),
+ : device_t(mconfig, MACKBD, tag, owner, clock),
m_maincpu(*this, MACKBD_CPU_TAG),
m_clkout_handler(*this),
m_dataout_handler(*this)
diff --git a/src/mame/machine/mackbd.h b/src/mame/machine/mackbd.h
index 4797b247ef8..4984f8ebc12 100644
--- a/src/mame/machine/mackbd.h
+++ b/src/mame/machine/mackbd.h
@@ -1,10 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#pragma once
-
-#ifndef __MACKBD_H__
-#define __MACKBD_H__
+#ifndef MAME_MACHINE_MACKBD_H
+#define MAME_MACHINE_MACKBD_H
+#pragma once
@@ -72,6 +71,6 @@ private:
};
// device type definition
-extern const device_type MACKBD;
+DECLARE_DEVICE_TYPE(MACKBD, mackbd_device)
-#endif
+#endif // MAME_MACHINE_MACKBD_H
diff --git a/src/mame/machine/macrtc.cpp b/src/mame/machine/macrtc.cpp
index 94a5c5435ff..b375098daf1 100644
--- a/src/mame/machine/macrtc.cpp
+++ b/src/mame/machine/macrtc.cpp
@@ -33,7 +33,7 @@ enum
//**************************************************************************
// device type definition
-const device_type RTC3430042 = device_creator<rtc3430042_device>;
+DEFINE_DEVICE_TYPE(RTC3430042, rtc3430042_device, "rtc3430042", "Apple 343-0042 clock/PRAM")
//-------------------------------------------------
@@ -41,7 +41,7 @@ const device_type RTC3430042 = device_creator<rtc3430042_device>;
//-------------------------------------------------
rtc3430042_device::rtc3430042_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, RTC3430042, "Apple 343-0042 clock/PRAM", tag, owner, clock, "rtc3430042", __FILE__),
+ : device_t(mconfig, RTC3430042, tag, owner, clock),
device_rtc_interface(mconfig, *this),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/mame/machine/macrtc.h b/src/mame/machine/macrtc.h
index dd96403cd99..01fba185e20 100644
--- a/src/mame/machine/macrtc.h
+++ b/src/mame/machine/macrtc.h
@@ -7,10 +7,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_MACRTC_H
+#define MAME_MACHINE_MACRTC_H
-#ifndef __RTC3430042_H__
-#define __RTC3430042_H__
+#pragma once
#include "dirtc.h"
@@ -96,6 +96,6 @@ private:
// device type definition
-extern const device_type RTC3430042;
+DECLARE_DEVICE_TYPE(RTC3430042, rtc3430042_device)
-#endif
+#endif // MAME_MACHINE_MACRTC_H
diff --git a/src/mame/machine/maple-dc.cpp b/src/mame/machine/maple-dc.cpp
index aa51b0fcdf9..41bbdacc173 100644
--- a/src/mame/machine/maple-dc.cpp
+++ b/src/mame/machine/maple-dc.cpp
@@ -5,7 +5,7 @@
#include "maple-dc.h"
#include "mie.h"
-const device_type MAPLE_DC = device_creator<maple_dc_device>;
+DEFINE_DEVICE_TYPE(MAPLE_DC, maple_dc_device, "maple_dc", "Dreamcast Maple Bus")
DEVICE_ADDRESS_MAP_START(amap, 32, maple_dc_device)
AM_RANGE(0x04, 0x07) AM_READWRITE(sb_mdstar_r, sb_mdstar_w)
@@ -29,7 +29,7 @@ void maple_dc_device::static_set_irq_cb(device_t &device, void (*irq_cb)(running
}
maple_dc_device::maple_dc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MAPLE_DC, "Dreamcast Maple Bus", tag, owner, clock, "maple_dc", __FILE__)
+ : device_t(mconfig, MAPLE_DC, tag, owner, clock)
{
// Do not move that in device_start or there will be a race
// condition with the maple devices call to register_port.
diff --git a/src/mame/machine/maple-dc.h b/src/mame/machine/maple-dc.h
index 7c8e1b69c46..8752c34cbce 100644
--- a/src/mame/machine/maple-dc.h
+++ b/src/mame/machine/maple-dc.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __MAPLE_DC_H__
-#define __MAPLE_DC_H__
+#ifndef MAME_MACHINE_MAPLE_DC_H
+#define MAME_MACHINE_MAPLE_DC_H
+
+#pragma once
#include "cpu/sh4/sh4.h"
@@ -72,6 +74,6 @@ private:
const char *maincpu_tag;
};
-extern const device_type MAPLE_DC;
+DECLARE_DEVICE_TYPE(MAPLE_DC, maple_dc_device)
-#endif /* __MAPLE_DC_H__ */
+#endif // MAME_MACHINE_MAPLE_DC_H
diff --git a/src/mame/machine/mapledev.cpp b/src/mame/machine/mapledev.cpp
index 01ba48849a9..68144ee0f97 100644
--- a/src/mame/machine/mapledev.cpp
+++ b/src/mame/machine/mapledev.cpp
@@ -12,7 +12,7 @@ void maple_device::static_set_host(device_t &device, const char *_host_tag, int
}
-maple_device::maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+maple_device::maple_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock)
{
host_tag = nullptr;
host_port = 0;
diff --git a/src/mame/machine/mapledev.h b/src/mame/machine/mapledev.h
index f8942d13853..6d858fbd442 100644
--- a/src/mame/machine/mapledev.h
+++ b/src/mame/machine/mapledev.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _MAPLEDEV_H_
-#define _MAPLEDEV_H_
+#ifndef MAME_MACHINE_MAPLEDEV_H
+#define MAME_MACHINE_MAPLEDEV_H
#define MCFG_MAPLE_DEVICE_ADD(_tag, _type, _clock, _host_tag, _host_port) \
MCFG_DEVICE_ADD(_tag, _type, _clock) \
@@ -10,8 +10,6 @@
class maple_device : public device_t
{
public:
- maple_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
static void static_set_host(device_t &device, const char *_host_tag, int _host_port);
virtual void maple_w(const uint32_t *data, uint32_t in_size) = 0;
void maple_r(uint32_t *data, uint32_t &out_size, bool &partial);
@@ -20,6 +18,8 @@ public:
protected:
enum { TIMER_ID = 1000 };
+ maple_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
uint32_t reply_size;
bool reply_partial;
uint32_t reply_buffer[256];
@@ -47,4 +47,4 @@ private:
emu_timer *timer;
};
-#endif // _MAPLEDEV_H_
+#endif // MAME_MACHINE_MAPLEDEV_H
diff --git a/src/mame/machine/mathbox.cpp b/src/mame/machine/mathbox.cpp
index 658881873dd..fe29aa10fca 100644
--- a/src/mame/machine/mathbox.cpp
+++ b/src/mame/machine/mathbox.cpp
@@ -37,10 +37,10 @@
// mathbox_device - constructor
//-------------------------------------------------
-const device_type MATHBOX = device_creator<mathbox_device>;
+DEFINE_DEVICE_TYPE(MATHBOX, mathbox_device, "mathbox", "Atari MATHBOX")
mathbox_device::mathbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MATHBOX, "Atari MATHBOX", tag, owner, clock, "mathbox", __FILE__)
+ : device_t(mconfig, MATHBOX, tag, owner, clock)
{
}
diff --git a/src/mame/machine/mathbox.h b/src/mame/machine/mathbox.h
index a4492309b5c..035093b0c4b 100644
--- a/src/mame/machine/mathbox.h
+++ b/src/mame/machine/mathbox.h
@@ -6,6 +6,10 @@
* Copyright Eric Smith
*
*/
+#ifndef MAME_MACHINE_MATHBOX_H
+#define MAME_MACHINE_MATHBOX_H
+
+#pragma once
/***************************************************************************
DEVICE CONFIGURATION MACROS
@@ -41,4 +45,6 @@ protected:
int16_t m_result;
};
-extern const device_type MATHBOX;
+DECLARE_DEVICE_TYPE(MATHBOX, mathbox_device)
+
+#endif // MAME_MACHINE_MATHBOX_H
diff --git a/src/mame/machine/mc8123.cpp b/src/mame/machine/mc8123.cpp
index 10eb243cc25..8a4ff955299 100644
--- a/src/mame/machine/mc8123.cpp
+++ b/src/mame/machine/mc8123.cpp
@@ -80,15 +80,15 @@ CPU # Game Notes Seed Upper Limit
#include "mc8123.h"
-const device_type MC8123 = device_creator<mc8123_device>;
+DEFINE_DEVICE_TYPE(MC8123, mc8123_device, "mc8123", "MC-8123")
//-------------------------------------------------
// mc8123_device - constructor
//-------------------------------------------------
mc8123_device::mc8123_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : z80_device(mconfig, MC8123, "MC-8123", tag, owner, clock, "mc8123", __FILE__),
- m_key(*this, "key", 0x2000)
+ : z80_device(mconfig, MC8123, tag, owner, clock)
+ , m_key(*this, "key", 0x2000)
{
}
diff --git a/src/mame/machine/mc8123.h b/src/mame/machine/mc8123.h
index 0003e824a9b..8c5d322a968 100644
--- a/src/mame/machine/mc8123.h
+++ b/src/mame/machine/mc8123.h
@@ -6,10 +6,10 @@
***************************************************************************/
-#pragma once
-
#ifndef MAME_MACHINE_MC8123
-#define MAME_MACHINE_MC8123 1
+#define MAME_MACHINE_MC8123
+
+#pragma once
#include "cpu/z80/z80.h"
@@ -39,5 +39,6 @@ private:
};
extern const device_type MC8123;
+DECLARE_DEVICE_TYPE(MC8123, mc8123_device)
-#endif
+#endif // MAME_MACHINE_MC8123
diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp
index df371297ec3..5969e929393 100644
--- a/src/mame/machine/mega32x.cpp
+++ b/src/mame/machine/mega32x.cpp
@@ -202,27 +202,49 @@ GFX check (these don't explicitly fails):
#include "sound/volt_reg.h"
-const device_type SEGA_32X_NTSC = device_creator<sega_32x_ntsc_device>;
-const device_type SEGA_32X_PAL = device_creator<sega_32x_pal_device>;
+// Fifa96 needs the CPUs swapped for the gameplay to enter due to some race conditions
+// when using the DRC core. Needs further investigation, the non-DRC core works either
+// way
+#define _32X_SWAP_MASTER_SLAVE_HACK
+#define _32X_COMMS_PORT_SYNC 0
+#define MAX_HPOSITION 480
+/* need to make some pwm stuff part of device */
+#define PWM_FIFO_SIZE m_pwm_tm_reg // guess, Marsch calls this register as FIFO width
+#define PWM_CLOCK m_32x_pal ? ((MASTER_CLOCK_PAL*3) / 7) : ((MASTER_CLOCK_NTSC*3) / 7)
-sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+
+
+#define SH2_VRES_IRQ_LEVEL 14
+#define SH2_VINT_IRQ_LEVEL 12
+#define SH2_HINT_IRQ_LEVEL 10
+#define SH2_CINT_IRQ_LEVEL 8
+#define SH2_PINT_IRQ_LEVEL 6
+
+#define MASTER_CLOCK_NTSC 53693175
+#define MASTER_CLOCK_PAL 53203424
+
+
+DEFINE_DEVICE_TYPE(SEGA_32X_NTSC, sega_32x_ntsc_device, "sega_32x_ntsc", "Sega 32X (NTSC)")
+DEFINE_DEVICE_TYPE(SEGA_32X_PAL, sega_32x_pal_device, "sega_32x_pal", "Sega 32X (PAL)")
+
+sega_32x_device::sega_32x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_sh2_shared(*this, "sh2_shared")
, m_master_cpu(*this, "32x_master_sh2")
, m_slave_cpu(*this, "32x_slave_sh2")
, m_ldac(*this, "ldac")
, m_rdac(*this, "rdac")
- , m_sh2_shared(*this, "sh2_shared")
, m_palette(*this, finder_base::DUMMY_TAG)
{
}
sega_32x_ntsc_device::sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_32x_device(mconfig, SEGA_32X_NTSC, "sega_32x_ntsc", tag, owner, clock, "sega_32x_ntsc", __FILE__)
+ : sega_32x_device(mconfig, SEGA_32X_NTSC, tag, owner, clock)
{
}
sega_32x_pal_device::sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_32x_device(mconfig, SEGA_32X_PAL, "sega_32x_pal", tag, owner, clock, "sega_32x_pal", __FILE__)
+ : sega_32x_device(mconfig, SEGA_32X_PAL, tag, owner, clock)
{
}
diff --git a/src/mame/machine/mega32x.h b/src/mame/machine/mega32x.h
index de465b5f7ca..4b2328100a3 100644
--- a/src/mame/machine/mega32x.h
+++ b/src/mame/machine/mega32x.h
@@ -1,28 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/* 32X */
+#ifndef MAME_MACHINE_MEGA32X_H
+#define MAME_MACHINE_MEGA32X_H
-
-// Fifa96 needs the CPUs swapped for the gameplay to enter due to some race conditions
-// when using the DRC core. Needs further investigation, the non-DRC core works either
-// way
-#define _32X_SWAP_MASTER_SLAVE_HACK
-#define _32X_COMMS_PORT_SYNC 0
-#define MAX_HPOSITION 480
-/* need to make some pwm stuff part of device */
-#define PWM_FIFO_SIZE m_pwm_tm_reg // guess, Marsch calls this register as FIFO width
-#define PWM_CLOCK m_32x_pal ? ((MASTER_CLOCK_PAL*3) / 7) : ((MASTER_CLOCK_NTSC*3) / 7)
-
-
-
-#define SH2_VRES_IRQ_LEVEL 14
-#define SH2_VINT_IRQ_LEVEL 12
-#define SH2_HINT_IRQ_LEVEL 10
-#define SH2_CINT_IRQ_LEVEL 8
-#define SH2_PINT_IRQ_LEVEL 6
-
-#define MASTER_CLOCK_NTSC 53693175
-#define MASTER_CLOCK_PAL 53203424
+#pragma once
#include "cpu/sh2/sh2.h"
#include "cpu/sh2/sh2comn.h"
@@ -31,22 +13,19 @@
class sega_32x_device : public device_t
{
public:
- sega_32x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
- required_device<sh2_device> m_master_cpu;
- required_device<sh2_device> m_slave_cpu;
- required_device<dac_word_interface> m_ldac;
- required_device<dac_word_interface> m_rdac;
-
- required_shared_ptr<uint32_t> m_sh2_shared;
-
void pause_cpu();
// set some variables at start, depending on region (shall be moved to a device interface?)
void set_framerate(int rate) { m_framerate = rate; }
void set_32x_pal(bool pal) { m_32x_pal = pal ? 1 : 0; }
void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this get set at start only
- void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF
+
+ void screen_eof(bool mode3)
+ {
+ m_32x_vblank_flag = 0;
+ m_32x_hcount_compare_val = -1;
+ update_total_scanlines(mode3);
+ }
// static configuration
static void static_set_palette_tag(device_t &device, const char *tag);
@@ -126,7 +105,25 @@ public:
void _32x_check_irqs();
void _32x_interrupt_cb(int scanline, int irq6);
+protected:
+ sega_32x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ required_shared_ptr<uint32_t> m_sh2_shared;
+
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // optional information overrides
+ virtual machine_config_constructor device_mconfig_additions() const override;
+
+ void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF
+
/* our main vblank handler resets this */
+ required_device<sh2_device> m_master_cpu;
+ required_device<sh2_device> m_slave_cpu;
+ required_device<dac_word_interface> m_ldac;
+ required_device<dac_word_interface> m_rdac;
+
int m_32x_hcount_compare_val;
int m_32x_vblank_flag;
int m_sh2_are_running;
@@ -147,14 +144,6 @@ public:
emu_timer *m_32x_pwm_timer;
-protected:
- virtual void device_start() override;
- virtual void device_reset() override;
-
- // optional information overrides
-// virtual const rom_entry *device_rom_region() const;
- virtual machine_config_constructor device_mconfig_additions() const override;
-
private:
int m_32x_displaymode;
@@ -213,22 +202,24 @@ private:
class sega_32x_ntsc_device : public sega_32x_device
{
- public:
- sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+public:
+ sega_32x_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class sega_32x_pal_device : public sega_32x_device
{
- public:
- sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- protected:
- virtual machine_config_constructor device_mconfig_additions() const override;
+public:
+ sega_32x_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+protected:
+ virtual machine_config_constructor device_mconfig_additions() const override;
};
-extern const device_type SEGA_32X_NTSC;
-extern const device_type SEGA_32X_PAL;
+DECLARE_DEVICE_TYPE(SEGA_32X_NTSC, sega_32x_ntsc_device)
+DECLARE_DEVICE_TYPE(SEGA_32X_PAL, sega_32x_pal_device)
#define MCFG_SEGA_32X_PALETTE(_palette_tag) \
sega_32x_device::static_set_palette_tag(*device, "^" _palette_tag);
+
+#endif // MAME_MACHINE_MEGA32X_H
diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp
index 1c75615f3d8..dbb7665468a 100644
--- a/src/mame/machine/megacd.cpp
+++ b/src/mame/machine/megacd.cpp
@@ -6,9 +6,41 @@
#include "megacd.lh"
-const device_type SEGA_SEGACD_US = device_creator<sega_segacd_us_device>;
-const device_type SEGA_SEGACD_JAPAN = device_creator<sega_segacd_japan_device>;
-const device_type SEGA_SEGACD_EUROPE = device_creator<sega_segacd_europe_device>;
+#define SEGACD_CLOCK 12500000
+
+#define RAM_MODE_2MEG (0)
+#define RAM_MODE_1MEG (2)
+
+#define DMA_PCM (0x0400)
+#define DMA_PRG (0x0500)
+#define DMA_WRAM (0x0700)
+
+// irq3 timer
+#define CHECK_SCD_LV3_INTERRUPT \
+ if (m_lc89510_temp->get_segacd_irq_mask() & 0x08) \
+ { \
+ m_scdcpu->set_input_line(3, HOLD_LINE); \
+ }
+// from master
+#define CHECK_SCD_LV2_INTERRUPT \
+ if (m_lc89510_temp->get_segacd_irq_mask() & 0x04) \
+ { \
+ m_scdcpu->set_input_line(2, HOLD_LINE); \
+ }
+
+// gfx convert
+#define CHECK_SCD_LV1_INTERRUPT \
+ if (m_lc89510_temp->get_segacd_irq_mask() & 0x02) \
+ { \
+ m_scdcpu->set_input_line(1, HOLD_LINE); \
+ }
+
+#define SEGACD_IRQ3_TIMER_SPEED (attotime::from_nsec(m_irq3_timer_reg*30720))
+
+
+DEFINE_DEVICE_TYPE(SEGA_SEGACD_US, sega_segacd_us_device, "segacd_us", "Sega Sega CD (US)")
+DEFINE_DEVICE_TYPE(SEGA_SEGACD_JAPAN, sega_segacd_japan_device, "segacd_japan", "Sega Mega-CD (Japan)")
+DEFINE_DEVICE_TYPE(SEGA_SEGACD_EUROPE, sega_segacd_europe_device, "segacd_europe", "Sega Mega-CD (PAL)")
/* Callback when the genesis enters interrupt code */
@@ -289,8 +321,8 @@ machine_config_constructor sega_segacd_device::device_mconfig_additions() const
}
-sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_gfx_interface(mconfig, *this, GFXDECODE_NAME( segacd )),
m_scdcpu(*this, "segacd_68k"),
m_rfsnd(*this, "rfsnd"),
@@ -306,17 +338,17 @@ sega_segacd_device::sega_segacd_device(const machine_config &mconfig, device_typ
}
sega_segacd_us_device::sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_segacd_device(mconfig, SEGA_SEGACD_US, "sega_segacd_us", tag, owner, clock, "sega_segacd_us", __FILE__)
+ : sega_segacd_device(mconfig, SEGA_SEGACD_US, tag, owner, clock)
{
}
sega_segacd_japan_device::sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_segacd_device(mconfig, SEGA_SEGACD_JAPAN, "sega_segacd_japan", tag, owner, clock, "sega_segacd_japan", __FILE__)
+ : sega_segacd_device(mconfig, SEGA_SEGACD_JAPAN, tag, owner, clock)
{
}
sega_segacd_europe_device::sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_segacd_device(mconfig, SEGA_SEGACD_EUROPE, "sega_segacd_europe", tag, owner, clock, "sega_segacd_europe", __FILE__)
+ : sega_segacd_device(mconfig, SEGA_SEGACD_EUROPE, tag, owner, clock)
{
}
diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h
index 9d447b3d8d9..cab6d1ea258 100644
--- a/src/mame/machine/megacd.h
+++ b/src/mame/machine/megacd.h
@@ -1,48 +1,113 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/* Sega CD / Mega CD */
+#ifndef MAME_MACHINE_MEGACD_H
+#define MAME_MACHINE_MEGACD_H
+
+#pragma once
#include "cpu/m68000/m68000.h"
#include "machine/lc89510.h"
#include "machine/megacdcd.h"
#include "sound/rf5c68.h"
-#define SEGACD_CLOCK 12500000
+class sega_segacd_device : public device_t, public device_gfx_interface
+{
+public:
+ // set some variables at start, depending on region (shall be moved to a device interface?)
+ void set_framerate(int rate) { m_framerate = rate; }
+ void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this gets set at start only
+ void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF
-#define RAM_MODE_2MEG (0)
-#define RAM_MODE_1MEG (2)
+ DECLARE_READ16_MEMBER( segacd_dmaaddr_r );
+ DECLARE_WRITE16_MEMBER( segacd_dmaaddr_w );
-#define DMA_PCM (0x0400)
-#define DMA_PRG (0x0500)
-#define DMA_WRAM (0x0700)
+ DECLARE_WRITE16_MEMBER( scd_a12000_halt_reset_w );
+ DECLARE_READ16_MEMBER( scd_a12000_halt_reset_r );
+ DECLARE_READ16_MEMBER( scd_a12002_memory_mode_r );
+ DECLARE_WRITE8_MEMBER( scd_a12002_memory_mode_w_8_15 );
+ DECLARE_WRITE8_MEMBER( scd_a12002_memory_mode_w_0_7 );
+ DECLARE_WRITE16_MEMBER( scd_a12002_memory_mode_w );
+ DECLARE_READ16_MEMBER( segacd_sub_memory_mode_r );
+ DECLARE_WRITE8_MEMBER( segacd_sub_memory_mode_w_8_15 );
+ DECLARE_WRITE8_MEMBER( segacd_sub_memory_mode_w_0_7 );
+ DECLARE_WRITE16_MEMBER( segacd_sub_memory_mode_w );
+
+ DECLARE_READ16_MEMBER( segacd_comms_flags_r );
+ DECLARE_WRITE16_MEMBER( segacd_comms_flags_subcpu_w );
+ DECLARE_WRITE16_MEMBER( segacd_comms_flags_maincpu_w );
+ DECLARE_READ16_MEMBER( scd_4m_prgbank_ram_r );
+ DECLARE_WRITE16_MEMBER( scd_4m_prgbank_ram_w );
+ DECLARE_READ16_MEMBER( segacd_comms_main_part1_r );
+ DECLARE_WRITE16_MEMBER( segacd_comms_main_part1_w );
+ DECLARE_READ16_MEMBER( segacd_comms_main_part2_r );
+ DECLARE_WRITE16_MEMBER( segacd_comms_main_part2_w );
+ DECLARE_READ16_MEMBER( segacd_comms_sub_part1_r );
+ DECLARE_WRITE16_MEMBER( segacd_comms_sub_part1_w );
+ DECLARE_READ16_MEMBER( segacd_comms_sub_part2_r );
+ DECLARE_WRITE16_MEMBER( segacd_comms_sub_part2_w );
+
+
+
+ DECLARE_READ16_MEMBER( segacd_main_dataram_part1_r );
+ DECLARE_WRITE16_MEMBER( segacd_main_dataram_part1_w );
+
+ DECLARE_READ16_MEMBER( scd_hint_vector_r );
+ DECLARE_READ16_MEMBER( scd_a12006_hint_register_r );
+ DECLARE_WRITE16_MEMBER( scd_a12006_hint_register_w );
+
+
+ DECLARE_WRITE16_MEMBER( segacd_stopwatch_timer_w );
+ DECLARE_READ16_MEMBER( segacd_stopwatch_timer_r );
+ DECLARE_READ16_MEMBER( segacd_sub_led_ready_r );
+ DECLARE_WRITE16_MEMBER( segacd_sub_led_ready_w );
+ DECLARE_READ16_MEMBER( segacd_sub_dataram_part1_r );
+ DECLARE_WRITE16_MEMBER( segacd_sub_dataram_part1_w );
+ DECLARE_READ16_MEMBER( segacd_sub_dataram_part2_r );
+ DECLARE_WRITE16_MEMBER( segacd_sub_dataram_part2_w );
+
+
+ DECLARE_READ16_MEMBER( segacd_stampsize_r );
+ DECLARE_WRITE16_MEMBER( segacd_stampsize_w );
-// irq3 timer
-#define CHECK_SCD_LV3_INTERRUPT \
- if (m_lc89510_temp->get_segacd_irq_mask() & 0x08) \
- { \
- m_scdcpu->set_input_line(3, HOLD_LINE); \
- }
-// from master
-#define CHECK_SCD_LV2_INTERRUPT \
- if (m_lc89510_temp->get_segacd_irq_mask() & 0x04) \
- { \
- m_scdcpu->set_input_line(2, HOLD_LINE); \
- }
+ TILE_GET_INFO_MEMBER( get_stampmap_16x16_1x1_tile_info );
+ TILE_GET_INFO_MEMBER( get_stampmap_32x32_1x1_tile_info );
+ TILE_GET_INFO_MEMBER( get_stampmap_16x16_16x16_tile_info );
+ TILE_GET_INFO_MEMBER( get_stampmap_32x32_16x16_tile_info );
-// gfx convert
-#define CHECK_SCD_LV1_INTERRUPT \
- if (m_lc89510_temp->get_segacd_irq_mask() & 0x02) \
- { \
- m_scdcpu->set_input_line(1, HOLD_LINE); \
- }
+ WRITE16_MEMBER( segacd_trace_vector_base_address_w );
+ READ16_MEMBER( segacd_imagebuffer_vdot_size_r );
+ WRITE16_MEMBER( segacd_imagebuffer_vdot_size_w );
+ READ16_MEMBER( segacd_stampmap_base_address_r );
+ WRITE16_MEMBER( segacd_stampmap_base_address_w );
+ READ16_MEMBER( segacd_imagebuffer_start_address_r );
+ WRITE16_MEMBER( segacd_imagebuffer_start_address_w );
+ READ16_MEMBER( segacd_imagebuffer_offset_r );
+ WRITE16_MEMBER( segacd_imagebuffer_offset_w );
+ READ16_MEMBER( segacd_imagebuffer_vcell_size_r );
+ WRITE16_MEMBER( segacd_imagebuffer_vcell_size_w );
+ READ16_MEMBER( segacd_imagebuffer_hdot_size_r );
+ WRITE16_MEMBER( segacd_imagebuffer_hdot_size_w );
+ READ16_MEMBER( segacd_irq3timer_r );
+ WRITE16_MEMBER( segacd_irq3timer_w );
+ READ8_MEMBER( backupram_r );
+ WRITE8_MEMBER( backupram_w );
+ READ8_MEMBER( font_color_r );
+ WRITE8_MEMBER( font_color_w );
+ READ16_MEMBER( font_converted_r );
+ TIMER_DEVICE_CALLBACK_MEMBER( dma_timer_callback );
+ IRQ_CALLBACK_MEMBER(segacd_sub_int_callback);
+
+ TIMER_DEVICE_CALLBACK_MEMBER( irq3_timer_callback );
+ TIMER_DEVICE_CALLBACK_MEMBER( stamp_timer_callback );
-#define SEGACD_IRQ3_TIMER_SPEED (attotime::from_nsec(m_irq3_timer_reg*30720))
+ void SegaCD_CDC_Do_DMA( int &dmacount, uint8_t *CDC_BUFFER, uint16_t &dma_addrc, uint16_t &destination );
+protected:
+ sega_segacd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-class sega_segacd_device : public device_t, public device_gfx_interface
-{
-public:
- sega_segacd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ // optional information overrides
+ virtual machine_config_constructor device_mconfig_additions() const override;
required_device<cpu_device> m_scdcpu;
required_device<rf5c68_device> m_rfsnd;
@@ -94,15 +159,10 @@ public:
uint8_t m_irq3_timer_reg;
- TIMER_DEVICE_CALLBACK_MEMBER( irq3_timer_callback );
- TIMER_DEVICE_CALLBACK_MEMBER( stamp_timer_callback );
-
inline void write_pixel(uint8_t pix, int pixeloffset);
uint16_t segacd_1meg_mode_word_read(int offset, uint16_t mem_mask);
void segacd_1meg_mode_word_write(int offset, uint16_t data, uint16_t mem_mask, int use_pm);
- DECLARE_READ16_MEMBER( segacd_dmaaddr_r );
- DECLARE_WRITE16_MEMBER( segacd_dmaaddr_w );
uint16_t m_dmaaddr;
uint16_t m_a12000_halt_reset_reg;
@@ -114,138 +174,44 @@ public:
void segacd_mark_tiles_dirty(int offset);
int segacd_get_active_stampmap_tilemap(void);
- // set some variables at start, depending on region (shall be moved to a device interface?)
- void set_framerate(int rate) { m_framerate = rate; }
- void set_total_scanlines(int total) { m_base_total_scanlines = total; } // this gets set at start only
- void update_total_scanlines(bool mode3) { m_total_scanlines = mode3 ? (m_base_total_scanlines * 2) : m_base_total_scanlines; } // this gets set at each EOF
-
void SCD_GET_TILE_INFO_16x16_1x1( int& tile_region, int& tileno, int tile_index );
void SCD_GET_TILE_INFO_32x32_1x1( int& tile_region, int& tileno, int tile_index );
void SCD_GET_TILE_INFO_16x16_16x16( int& tile_region, int& tileno, int tile_index );
void SCD_GET_TILE_INFO_32x32_16x16( int& tile_region, int& tileno, int tile_index );
- TILE_GET_INFO_MEMBER( get_stampmap_16x16_1x1_tile_info );
- TILE_GET_INFO_MEMBER( get_stampmap_32x32_1x1_tile_info );
- TILE_GET_INFO_MEMBER( get_stampmap_16x16_16x16_tile_info );
- TILE_GET_INFO_MEMBER( get_stampmap_32x32_16x16_tile_info );
-
uint8_t get_stampmap_16x16_1x1_tile_info_pixel(int xpos, int ypos);
uint8_t get_stampmap_32x32_1x1_tile_info_pixel(int xpos, int ypos);
uint8_t get_stampmap_16x16_16x16_tile_info_pixel(int xpos, int ypos);
uint8_t get_stampmap_32x32_16x16_tile_info_pixel(int xpos, int ypos);
- WRITE16_MEMBER( scd_a12000_halt_reset_w );
- READ16_MEMBER( scd_a12000_halt_reset_r );
- READ16_MEMBER( scd_a12002_memory_mode_r );
- WRITE8_MEMBER( scd_a12002_memory_mode_w_8_15 );
- WRITE8_MEMBER( scd_a12002_memory_mode_w_0_7 );
- WRITE16_MEMBER( scd_a12002_memory_mode_w );
- READ16_MEMBER( segacd_sub_memory_mode_r );
- WRITE8_MEMBER( segacd_sub_memory_mode_w_8_15 );
- WRITE8_MEMBER( segacd_sub_memory_mode_w_0_7 );
- WRITE16_MEMBER( segacd_sub_memory_mode_w );
-
- READ16_MEMBER( segacd_comms_flags_r );
- WRITE16_MEMBER( segacd_comms_flags_subcpu_w );
- WRITE16_MEMBER( segacd_comms_flags_maincpu_w );
- READ16_MEMBER( scd_4m_prgbank_ram_r );
- WRITE16_MEMBER( scd_4m_prgbank_ram_w );
- READ16_MEMBER( segacd_comms_main_part1_r );
- WRITE16_MEMBER( segacd_comms_main_part1_w );
- READ16_MEMBER( segacd_comms_main_part2_r );
- WRITE16_MEMBER( segacd_comms_main_part2_w );
- READ16_MEMBER( segacd_comms_sub_part1_r );
- WRITE16_MEMBER( segacd_comms_sub_part1_w );
- READ16_MEMBER( segacd_comms_sub_part2_r );
- WRITE16_MEMBER( segacd_comms_sub_part2_w );
-
-
-
- READ16_MEMBER( segacd_main_dataram_part1_r );
- WRITE16_MEMBER( segacd_main_dataram_part1_w );
-
- READ16_MEMBER( scd_hint_vector_r );
- READ16_MEMBER( scd_a12006_hint_register_r );
- WRITE16_MEMBER( scd_a12006_hint_register_w );
-
-
- WRITE16_MEMBER( segacd_stopwatch_timer_w );
- READ16_MEMBER( segacd_stopwatch_timer_r );
- READ16_MEMBER( segacd_sub_led_ready_r );
- WRITE16_MEMBER( segacd_sub_led_ready_w );
- READ16_MEMBER( segacd_sub_dataram_part1_r );
- WRITE16_MEMBER( segacd_sub_dataram_part1_w );
- READ16_MEMBER( segacd_sub_dataram_part2_r );
- WRITE16_MEMBER( segacd_sub_dataram_part2_w );
-
-
- READ16_MEMBER( segacd_stampsize_r );
- WRITE16_MEMBER( segacd_stampsize_w );
-
uint8_t read_pixel_from_stampmap(bitmap_ind16* srcbitmap, int x, int y);
- WRITE16_MEMBER( segacd_trace_vector_base_address_w );
- READ16_MEMBER( segacd_imagebuffer_vdot_size_r );
- WRITE16_MEMBER( segacd_imagebuffer_vdot_size_w );
- READ16_MEMBER( segacd_stampmap_base_address_r );
- WRITE16_MEMBER( segacd_stampmap_base_address_w );
- READ16_MEMBER( segacd_imagebuffer_start_address_r );
- WRITE16_MEMBER( segacd_imagebuffer_start_address_w );
- READ16_MEMBER( segacd_imagebuffer_offset_r );
- WRITE16_MEMBER( segacd_imagebuffer_offset_w );
- READ16_MEMBER( segacd_imagebuffer_vcell_size_r );
- WRITE16_MEMBER( segacd_imagebuffer_vcell_size_w );
- READ16_MEMBER( segacd_imagebuffer_hdot_size_r );
- WRITE16_MEMBER( segacd_imagebuffer_hdot_size_w );
- READ16_MEMBER( segacd_irq3timer_r );
- WRITE16_MEMBER( segacd_irq3timer_w );
- READ8_MEMBER( backupram_r );
- WRITE8_MEMBER( backupram_w );
- READ8_MEMBER( font_color_r );
- WRITE8_MEMBER( font_color_w );
- READ16_MEMBER( font_converted_r );
- TIMER_DEVICE_CALLBACK_MEMBER( dma_timer_callback );
- IRQ_CALLBACK_MEMBER(segacd_sub_int_callback);
-
- void SegaCD_CDC_Do_DMA( int &dmacount, uint8_t *CDC_BUFFER, uint16_t &dma_addrc, uint16_t &destination );
-
-protected:
virtual void device_start() override;
virtual void device_reset() override;
-
- // optional information overrides
-// virtual const rom_entry *device_rom_region() const;
- virtual machine_config_constructor device_mconfig_additions() const override;
-private:
-
};
class sega_segacd_us_device : public sega_segacd_device
{
- public:
- sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- protected:
-
+public:
+ sega_segacd_us_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class sega_segacd_japan_device : public sega_segacd_device
{
- public:
- sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- protected:
-// virtual machine_config_constructor device_mconfig_additions() const;
+public:
+ sega_segacd_japan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
class sega_segacd_europe_device : public sega_segacd_device
{
- public:
- sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- protected:
-// virtual machine_config_constructor device_mconfig_additions() const;
+public:
+ sega_segacd_europe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
-extern const device_type SEGA_SEGACD_US;
-extern const device_type SEGA_SEGACD_JAPAN;
-extern const device_type SEGA_SEGACD_EUROPE;
+DECLARE_DEVICE_TYPE(SEGA_SEGACD_US, sega_segacd_us_device)
+DECLARE_DEVICE_TYPE(SEGA_SEGACD_JAPAN, sega_segacd_japan_device)
+DECLARE_DEVICE_TYPE(SEGA_SEGACD_EUROPE, sega_segacd_europe_device)
+
+#endif // MAME_MACHINE_MEGACD_H
diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp
index 23b9a9b0ff4..7714e7d83ac 100644
--- a/src/mame/machine/megacdcd.cpp
+++ b/src/mame/machine/megacdcd.cpp
@@ -10,10 +10,131 @@
#include "emu.h"
#include "machine/megacdcd.h"
-const device_type LC89510_TEMP = device_creator<lc89510_temp_device>;
+#define READ_MAIN (0x0200)
+#define READ_SUB (0x0300)
+
+#define REG_W_SBOUT (0x0)
+#define REG_W_IFCTRL (0x1)
+#define REG_W_DBCL (0x2)
+#define REG_W_DBCH (0x3)
+#define REG_W_DACL (0x4)
+#define REG_W_DACH (0x5)
+#define REG_W_DTTRG (0x6)
+#define REG_W_DTACK (0x7)
+#define REG_W_WAL (0x8)
+#define REG_W_WAH (0x9)
+#define REG_W_CTRL0 (0xA)
+#define REG_W_CTRL1 (0xB)
+#define REG_W_PTL (0xC)
+#define REG_W_PTH (0xD)
+#define REG_W_CTRL2 (0xE)
+#define REG_W_RESET (0xF)
+
+#define REG_R_COMIN (0x0)
+#define REG_R_IFSTAT (0x1)
+#define REG_R_DBCL (0x2)
+#define REG_R_DBCH (0x3)
+#define REG_R_HEAD0 (0x4)
+#define REG_R_HEAD1 (0x5)
+#define REG_R_HEAD2 (0x6)
+#define REG_R_HEAD3 (0x7)
+#define REG_R_PTL (0x8)
+#define REG_R_PTH (0x9)
+#define REG_R_WAL (0xa)
+#define REG_R_WAH (0xb)
+#define REG_R_STAT0 (0xc)
+#define REG_R_STAT1 (0xd)
+#define REG_R_STAT2 (0xe)
+#define REG_R_STAT3 (0xf)
+
+#define CMD_STATUS (0x0)
+#define CMD_STOPALL (0x1)
+#define CMD_GETTOC (0x2)
+#define CMD_READ (0x3)
+#define CMD_SEEK (0x4)
+// (0x5)
+#define CMD_STOP (0x6)
+#define CMD_RESUME (0x7)
+#define CMD_FF (0x8)
+#define CMD_RW (0x9)
+#define CMD_INIT (0xa)
+// (0xb)
+#define CMD_CLOSE (0xc)
+#define CMD_OPEN (0xd)
+// (0xe)
+// (0xf)
+
+
+#define TOCCMD_CURPOS (0x0)
+#define TOCCMD_TRKPOS (0x1)
+#define TOCCMD_CURTRK (0x2)
+#define TOCCMD_LENGTH (0x3)
+#define TOCCMD_FIRSTLAST (0x4)
+#define TOCCMD_TRACKADDR (0x5)
+
+
+
+
+#define SET_CDD_DATA_MODE \
+ CDD_CONTROL |= 0x0100;
+#define SET_CDD_AUDIO_MODE \
+ CDD_CONTROL &= ~0x0100;
+#define STOP_CDC_READ \
+ SCD_STATUS_CDC &= ~0x01;
+#define SET_CDC_READ \
+ SCD_STATUS_CDC |= 0x01;
+#define SET_CDC_DMA \
+ SCD_STATUS_CDC |= 0x08;
+#define STOP_CDC_DMA \
+ SCD_STATUS_CDC &= ~0x08;
+#define SCD_READ_ENABLED \
+ (SCD_STATUS_CDC & 1)
+
+#define SCD_DMA_ENABLED \
+ (SCD_STATUS_CDC & 0x08)
+
+#define CLEAR_CDD_RESULT \
+ CDD_MIN = CDD_SEC = CDD_FRAME = CDD_EXT = 0;
+#define CHECK_SCD_LV5_INTERRUPT \
+ if (segacd_irq_mask & 0x20) \
+ { \
+ machine.device(":segacd:segacd_68k")->execute().set_input_line(5, HOLD_LINE); \
+ }
+#define CHECK_SCD_LV4_INTERRUPT \
+ if (segacd_irq_mask & 0x10) \
+ { \
+ machine.device(":segacd:segacd_68k")->execute().set_input_line(4, HOLD_LINE); \
+ }
+#define CHECK_SCD_LV4_INTERRUPT_A \
+ if (segacd_irq_mask & 0x10) \
+ { \
+ machine().device(":segacd:segacd_68k")->execute().set_input_line(4, HOLD_LINE); \
+ }
+
+
+#define CURRENT_TRACK_IS_DATA \
+ (segacd.toc->tracks[SCD_CURTRK - 1].trktype != CD_TRACK_AUDIO)
+
+#define CDD_PLAYINGCDDA 0x0100
+#define CDD_READY 0x0400
+#define CDD_STOPPED 0x0900
+
+
+/* neocd */
+
+#define CD_FRAMES_MINUTE (60 * 75)
+#define CD_FRAMES_SECOND ( 75)
+#define CD_FRAMES_PREGAP ( 2 * 75)
+
+#define SEK_IRQSTATUS_NONE (0x0000)
+#define SEK_IRQSTATUS_AUTO (0x2000)
+#define SEK_IRQSTATUS_ACK (0x1000)
+
+
+DEFINE_DEVICE_TYPE(LC89510_TEMP, lc89510_temp_device, "lc89510_temp", "lc89510_temp_device")
lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, LC89510_TEMP, "lc89510_temp_device", tag, owner, clock, "lc89510_temp", __FILE__)
+ : device_t(mconfig, LC89510_TEMP, tag, owner, clock)
{
segacd_dma_callback = segacd_dma_delegate(FUNC(lc89510_temp_device::Fake_CDC_Do_DMA), this);
type1_interrupt_callback = interrupt_delegate(FUNC(lc89510_temp_device::dummy_interrupt_callback), this);
@@ -1163,7 +1284,7 @@ char* lc89510_temp_device::LC8915InitTransfer(int NeoCDDMACount)
//bprintf(PRINT_ERROR, _T(" LC8951 DOUTEN status invalid\n"));
return nullptr;
}
- if (((LC8951RegistersW[REG_W_DACH] << 8) | LC8951RegistersW[REG_W_DACL]) + (NeoCDDMACount << 1) > LC89510_EXTERNAL_BUFFER_SIZE) {
+ if (((LC8951RegistersW[REG_W_DACH] << 8) | LC8951RegistersW[REG_W_DACL]) + (NeoCDDMACount << 1) > EXTERNAL_BUFFER_SIZE) {
//bprintf(PRINT_ERROR, _T(" DMA transfer exceeds current sector in LC8951 external buffer\n"));
return nullptr;
diff --git a/src/mame/machine/megacdcd.h b/src/mame/machine/megacdcd.h
index 35f5cfc7e7f..c933a2cb887 100644
--- a/src/mame/machine/megacdcd.h
+++ b/src/mame/machine/megacdcd.h
@@ -1,127 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_SEGACDCD_H
+#define MAME_MACHINE_SEGACDCD_H
-#include "sound/cdda.h"
#include "imagedev/chd_cd.h"
+#include "sound/cdda.h"
typedef device_delegate<void (int&, uint8_t*, uint16_t&, uint16_t&)> segacd_dma_delegate;
typedef device_delegate<void (void)> interrupt_delegate;
-
-#define READ_MAIN (0x0200)
-#define READ_SUB (0x0300)
-
-#define REG_W_SBOUT (0x0)
-#define REG_W_IFCTRL (0x1)
-#define REG_W_DBCL (0x2)
-#define REG_W_DBCH (0x3)
-#define REG_W_DACL (0x4)
-#define REG_W_DACH (0x5)
-#define REG_W_DTTRG (0x6)
-#define REG_W_DTACK (0x7)
-#define REG_W_WAL (0x8)
-#define REG_W_WAH (0x9)
-#define REG_W_CTRL0 (0xA)
-#define REG_W_CTRL1 (0xB)
-#define REG_W_PTL (0xC)
-#define REG_W_PTH (0xD)
-#define REG_W_CTRL2 (0xE)
-#define REG_W_RESET (0xF)
-
-#define REG_R_COMIN (0x0)
-#define REG_R_IFSTAT (0x1)
-#define REG_R_DBCL (0x2)
-#define REG_R_DBCH (0x3)
-#define REG_R_HEAD0 (0x4)
-#define REG_R_HEAD1 (0x5)
-#define REG_R_HEAD2 (0x6)
-#define REG_R_HEAD3 (0x7)
-#define REG_R_PTL (0x8)
-#define REG_R_PTH (0x9)
-#define REG_R_WAL (0xa)
-#define REG_R_WAH (0xb)
-#define REG_R_STAT0 (0xc)
-#define REG_R_STAT1 (0xd)
-#define REG_R_STAT2 (0xe)
-#define REG_R_STAT3 (0xf)
-
-#define CMD_STATUS (0x0)
-#define CMD_STOPALL (0x1)
-#define CMD_GETTOC (0x2)
-#define CMD_READ (0x3)
-#define CMD_SEEK (0x4)
-// (0x5)
-#define CMD_STOP (0x6)
-#define CMD_RESUME (0x7)
-#define CMD_FF (0x8)
-#define CMD_RW (0x9)
-#define CMD_INIT (0xa)
-// (0xb)
-#define CMD_CLOSE (0xc)
-#define CMD_OPEN (0xd)
-// (0xe)
-// (0xf)
-
-
-#define TOCCMD_CURPOS (0x0)
-#define TOCCMD_TRKPOS (0x1)
-#define TOCCMD_CURTRK (0x2)
-#define TOCCMD_LENGTH (0x3)
-#define TOCCMD_FIRSTLAST (0x4)
-#define TOCCMD_TRACKADDR (0x5)
-
-
-
-
-#define SECTOR_SIZE (2352)
-
-#define SET_CDD_DATA_MODE \
- CDD_CONTROL |= 0x0100;
-#define SET_CDD_AUDIO_MODE \
- CDD_CONTROL &= ~0x0100;
-#define STOP_CDC_READ \
- SCD_STATUS_CDC &= ~0x01;
-#define SET_CDC_READ \
- SCD_STATUS_CDC |= 0x01;
-#define SET_CDC_DMA \
- SCD_STATUS_CDC |= 0x08;
-#define STOP_CDC_DMA \
- SCD_STATUS_CDC &= ~0x08;
-#define SCD_READ_ENABLED \
- (SCD_STATUS_CDC & 1)
-
-#define SCD_DMA_ENABLED \
- (SCD_STATUS_CDC & 0x08)
-
-#define CLEAR_CDD_RESULT \
- CDD_MIN = CDD_SEC = CDD_FRAME = CDD_EXT = 0;
-#define CHECK_SCD_LV5_INTERRUPT \
- if (segacd_irq_mask & 0x20) \
- { \
- machine.device(":segacd:segacd_68k")->execute().set_input_line(5, HOLD_LINE); \
- }
-#define CHECK_SCD_LV4_INTERRUPT \
- if (segacd_irq_mask & 0x10) \
- { \
- machine.device(":segacd:segacd_68k")->execute().set_input_line(4, HOLD_LINE); \
- }
-#define CHECK_SCD_LV4_INTERRUPT_A \
- if (segacd_irq_mask & 0x10) \
- { \
- machine().device(":segacd:segacd_68k")->execute().set_input_line(4, HOLD_LINE); \
- }
-
-
-#define CURRENT_TRACK_IS_DATA \
- (segacd.toc->tracks[SCD_CURTRK - 1].trktype != CD_TRACK_AUDIO)
-
-#define CDD_PLAYINGCDDA 0x0100
-#define CDD_READY 0x0400
-#define CDD_STOPPED 0x0900
-
-
#define MCFG_SEGACD_HACK_SET_CDC_DO_DMA( _class, _method) \
lc89510_temp_device::set_CDC_Do_DMA(*device, segacd_dma_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
#define MCFG_SEGACD_HACK_SET_NEOCD \
@@ -132,23 +21,66 @@ typedef device_delegate<void (void)> interrupt_delegate;
lc89510_temp_device::set_type2_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
#define MCFG_SET_TYPE3_INTERRUPT_CALLBACK( _class, _method) \
lc89510_temp_device::set_type3_interrupt_callback(*device, interrupt_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
-/* neocd */
-
-#define CD_FRAMES_MINUTE (60 * 75)
-#define CD_FRAMES_SECOND ( 75)
-#define CD_FRAMES_PREGAP ( 2 * 75)
-
-#define SEK_IRQSTATUS_NONE (0x0000)
-#define SEK_IRQSTATUS_AUTO (0x2000)
-#define SEK_IRQSTATUS_ACK (0x1000)
-
-#define LC89510_EXTERNAL_BUFFER_SIZE ((32 * 1024 * 2) + SECTOR_SIZE)
class lc89510_temp_device : public device_t
{
public:
+ static void set_is_neoCD(device_t &device, bool is_neoCD);
+
+ static void set_type1_interrupt_callback(device_t &device,interrupt_delegate interrupt_callback);
+ static void set_type2_interrupt_callback(device_t &device,interrupt_delegate interrupt_callback);
+ static void set_type3_interrupt_callback(device_t &device,interrupt_delegate interrupt_callback);
+
+ static void set_CDC_Do_DMA(device_t &device,segacd_dma_delegate new_segacd_dma_callback);
+
+
lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ uint16_t get_segacd_irq_mask() const { return segacd_irq_mask; }
+
+ DECLARE_READ16_MEMBER( segacd_irq_mask_r );
+ DECLARE_WRITE16_MEMBER( segacd_irq_mask_w );
+ DECLARE_READ16_MEMBER( segacd_cdd_ctrl_r );
+ DECLARE_WRITE16_MEMBER( segacd_cdd_ctrl_w );
+ DECLARE_READ8_MEMBER( segacd_cdd_rx_r );
+ DECLARE_WRITE8_MEMBER( segacd_cdd_tx_w );
+ READ16_MEMBER( segacd_cdfader_r );
+ WRITE16_MEMBER( segacd_cdfader_w );
+
+ WRITE16_MEMBER( segacd_cdc_mode_address_w );
+ READ16_MEMBER( segacd_cdc_mode_address_r );
+ WRITE16_MEMBER( segacd_cdc_data_w );
+ READ16_MEMBER( segacd_cdc_data_r );
+ READ16_MEMBER( cdc_data_sub_r );
+ READ16_MEMBER( cdc_data_main_r );
+
+ void CDC_Do_DMA(running_machine& machine, int rate);
+
+ uint8_t CDC_Reg_r(void);
+ void CDC_Reg_w(uint8_t data);
+
+ void reset_cd();
+
+ // NeoGeo CD stuff
+ void neocd_cdd_tx_w(uint8_t data);
+ uint8_t neocd_cdd_rx_r();
+ void NeoCDCommsControl(uint8_t clock, uint8_t send);
+ void NeoCDCommsReset();
+
+ uint16_t nff0016_r();
+ void nff0016_set(uint16_t wordValue);
+ void nff0002_set(uint16_t wordValue);
+
+ char* LC8915InitTransfer(int NeoCDDMACount);
+ void LC8915EndTransfer();
+
+
+ TIMER_DEVICE_CALLBACK_MEMBER( segacd_access_timer_callback );
+
+protected:
+ static constexpr unsigned SECTOR_SIZE = 2352;
+ static constexpr unsigned EXTERNAL_BUFFER_SIZE = (32 * 1024 * 2) + SECTOR_SIZE;
+
// HACK for DMA handling
segacd_dma_delegate segacd_dma_callback;
interrupt_delegate type1_interrupt_callback;
@@ -156,15 +88,8 @@ public:
interrupt_delegate type3_interrupt_callback;
void Fake_CDC_Do_DMA(int &dmacount, uint8_t *CDC_BUFFER, uint16_t &dma_addrc, uint16_t &destination );
- static void set_CDC_Do_DMA(device_t &device,segacd_dma_delegate new_segacd_dma_callback);
void dummy_interrupt_callback(void);
- static void set_type1_interrupt_callback(device_t &device,interrupt_delegate interrupt_callback);
- static void set_type2_interrupt_callback(device_t &device,interrupt_delegate interrupt_callback);
- static void set_type3_interrupt_callback(device_t &device,interrupt_delegate interrupt_callback);
-
-
- static void set_is_neoCD(device_t &device, bool is_neoCD);
// HACK for neoCD handling
@@ -193,7 +118,7 @@ public:
uint16_t CDC_REG0;
uint16_t CDC_REG1;
- uint8_t CDC_BUFFER[LC89510_EXTERNAL_BUFFER_SIZE];
+ uint8_t CDC_BUFFER[EXTERNAL_BUFFER_SIZE];
uint8_t CDD_RX[10];
@@ -241,34 +166,11 @@ public:
void CDC_Reset(void);
void lc89510_Reset(void);
void CDC_End_Transfer(running_machine& machine);
- void CDC_Do_DMA(running_machine& machine, int rate);
uint16_t CDC_Host_r(running_machine& machine, uint16_t type);
- uint8_t CDC_Reg_r(void);
- void CDC_Reg_w(uint8_t data);
void CDD_Process(running_machine& machine, int reason);
void CDD_Handle_TOC_Commands(void);
bool CDD_Import(running_machine& machine);
- READ16_MEMBER( segacd_irq_mask_r );
- WRITE16_MEMBER( segacd_irq_mask_w );
- READ16_MEMBER( segacd_cdd_ctrl_r );
- WRITE16_MEMBER( segacd_cdd_ctrl_w );
- READ8_MEMBER( segacd_cdd_rx_r );
- WRITE8_MEMBER( segacd_cdd_tx_w );
- READ16_MEMBER( segacd_cdfader_r );
- WRITE16_MEMBER( segacd_cdfader_w );
-
- void reset_cd(void);
-
- WRITE16_MEMBER( segacd_cdc_mode_address_w );
- READ16_MEMBER( segacd_cdc_mode_address_r );
- WRITE16_MEMBER( segacd_cdc_data_w );
- READ16_MEMBER( segacd_cdc_data_r );
- READ16_MEMBER( cdc_data_sub_r );
- READ16_MEMBER( cdc_data_main_r );
- TIMER_DEVICE_CALLBACK_MEMBER( segacd_access_timer_callback );
-
- uint16_t get_segacd_irq_mask(void) { return segacd_irq_mask; }
uint16_t segacd_irq_mask;
cdda_device* m_cdda;
@@ -288,30 +190,14 @@ public:
int32_t NeoCD_StatusHack;
-
-
-
- void NeoCDCommsControl(uint8_t clock, uint8_t send);
void LC8951UpdateHeader();
- char* LC8915InitTransfer(int NeoCDDMACount);
- void LC8915EndTransfer();
- void neocd_cdd_tx_w(uint8_t data);
- uint8_t neocd_cdd_rx_r();
- void NeoCDCommsReset();
-
- uint16_t nff0016_r(void);
- void nff0016_set(uint16_t wordValue);
- void nff0002_set(uint16_t wordValue);
-
-protected:
virtual void device_start() override;
virtual void device_reset() override;
virtual machine_config_constructor device_mconfig_additions() const override;
-private:
-
-
};
-extern const device_type LC89510_TEMP;
+DECLARE_DEVICE_TYPE(LC89510_TEMP, lc89510_temp_device)
+
+#endif // MAME_MACHINE_SEGACDCD_H
diff --git a/src/mame/machine/meters.cpp b/src/mame/machine/meters.cpp
index 9a15cf9b6e0..62a1ca25092 100644
--- a/src/mame/machine/meters.cpp
+++ b/src/mame/machine/meters.cpp
@@ -15,11 +15,11 @@
DEVICE INTERFACE
*****************************************************************************/
-const device_type METERS = device_creator<meters_device>;
+DEFINE_DEVICE_TYPE(METERS, meters_device, "meters", "Electromechanical meters")
meters_device::meters_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, METERS, "Electro mechanical meters", tag, owner, clock, "meters", __FILE__),
- m_number_mtr(0)
+ : device_t(mconfig, METERS, tag, owner, clock)
+ , m_number_mtr(0)
{
memset(m_meter_info, 0, sizeof(m_meter_info));
}
diff --git a/src/mame/machine/meters.h b/src/mame/machine/meters.h
index f248d9295a9..fd69152f0b7 100644
--- a/src/mame/machine/meters.h
+++ b/src/mame/machine/meters.h
@@ -9,24 +9,23 @@
// //
///////////////////////////////////////////////////////////////////////////
-#pragma once
-
-#ifndef __METERS_H__
-#define __METERS_H__
+#ifndef MAME_MACHINE_METERS_H
+#define MAME_MACHINE_METERS_H
+#pragma once
#define MCFG_METERS_NUMBER(_number) \
meters_device::static_set_number_meters(*device, _number);
-#define MAXMECHMETERS 8
-
-#define METERREACTTIME 0.025 // number of seconds meter has to be active to tick
class meters_device : public device_t
{
public:
+ static constexpr unsigned MAXMECHMETERS = 8;
+
+ static constexpr double METERREACTTIME = 0.025; // number of seconds meter has to be active to tick
+
meters_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~meters_device() {}
static void static_set_number_meters(device_t &device, int number) { downcast<meters_device &>(device).m_number_mtr = number; }
@@ -60,6 +59,6 @@ private:
int m_number_mtr;
};
-extern const device_type METERS;
+DECLARE_DEVICE_TYPE(METERS, meters_device)
-#endif
+#endif // MAME_MACHINE_METERS_H
diff --git a/src/mame/machine/micro3d.cpp b/src/mame/machine/micro3d.cpp
index 4929e2c64ec..512a9483b53 100644
--- a/src/mame/machine/micro3d.cpp
+++ b/src/mame/machine/micro3d.cpp
@@ -7,11 +7,13 @@
****************************************************************************/
#include "emu.h"
+#include "includes/micro3d.h"
+#include "audio/micro3d.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/am29000/am29000.h"
#include "cpu/mcs51/mcs51.h"
-#include "includes/micro3d.h"
/*************************************
@@ -579,6 +581,74 @@ WRITE32_MEMBER(micro3d_state::drmath_intr2_ack)
}
+/***************************************************************************
+
+ 8031 port mappings:
+
+ Port 1 Port 2
+ ======= ======
+ 0: S/H sel A (O) 0:
+ 1: S/H sel B (O) 1:
+ 2: S/H sel C (O) 2: uPD bank select (O)
+ 3: S/H en (O) 3: /uPD busy (I)
+ 4: DS1267 data (O) 4: /uPD reset (O)
+ 5: DS1267 clock (O) 5: Watchdog reset (O)
+ 6: /DS1267 reset (O) 6:
+ 7: Test SW (I) 7:
+
+***************************************************************************/
+
+
+WRITE8_MEMBER(micro3d_state::micro3d_snd_dac_a)
+{
+ m_noise_1->dac_w(data);
+ m_noise_2->dac_w(data);
+}
+
+WRITE8_MEMBER(micro3d_state::micro3d_snd_dac_b)
+{
+ /* TODO: This controls upd7759 volume */
+}
+
+WRITE8_MEMBER(micro3d_state::micro3d_sound_io_w)
+{
+ m_sound_port_latch[offset] = data;
+
+ switch (offset)
+ {
+ case 0x01:
+ {
+ micro3d_sound_device *noise = (data & 4) ? m_noise_2 : m_noise_1;
+ noise->noise_sh_w(data);
+ break;
+ }
+ case 0x03:
+ {
+ m_upd7759->set_bank_base((data & 0x4) ? 0x20000 : 0);
+ m_upd7759->reset_w((data & 0x10) ? 0 : 1);
+ break;
+ }
+ }
+}
+
+READ8_MEMBER(micro3d_state::micro3d_sound_io_r)
+{
+ switch (offset)
+ {
+ case 0x01: return (m_sound_port_latch[offset] & 0x7f) | m_sound_sw->read();
+ case 0x03: return (m_sound_port_latch[offset] & 0xf7) | (m_upd7759->busy_r() ? 0x08 : 0);
+ default: return 0;
+ }
+}
+
+WRITE8_MEMBER(micro3d_state::micro3d_upd7759_w)
+{
+ m_upd7759->port_w(space, 0, data);
+ m_upd7759->start_w(0);
+ m_upd7759->start_w(1);
+}
+
+
/*************************************
*
* Driver initialisation
diff --git a/src/mame/machine/microdrv.cpp b/src/mame/machine/microdrv.cpp
index f19d2671b25..1947d22f840 100644
--- a/src/mame/machine/microdrv.cpp
+++ b/src/mame/machine/microdrv.cpp
@@ -37,14 +37,14 @@
***************************************************************************/
// device type definition
-const device_type MICRODRIVE = device_creator<microdrive_image_device>;
+DEFINE_DEVICE_TYPE(MICRODRIVE, microdrive_image_device, "microdrive_image", "Sinclair Microdrive")
//-------------------------------------------------
// microdrive_image_device - constructor
//-------------------------------------------------
microdrive_image_device::microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MICRODRIVE, "Microdrive", tag, owner, clock, "microdrive_image", __FILE__),
+ device_t(mconfig, MICRODRIVE, tag, owner, clock),
device_image_interface(mconfig, *this),
m_write_comms_out(*this)
{
diff --git a/src/mame/machine/microdrv.h b/src/mame/machine/microdrv.h
index 2b3ee762f36..069f4e37d87 100644
--- a/src/mame/machine/microdrv.h
+++ b/src/mame/machine/microdrv.h
@@ -8,10 +8,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_MICRODRV_H
+#define MAME_MACHINE_MICRODRV_H
-#ifndef __MICRODRV__
-#define __MICRODRV__
+#pragma once
#include "softlist_dev.h"
@@ -46,7 +46,7 @@ public:
microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~microdrive_image_device();
- template<class _Object> static devcb_base &set_comms_out_wr_callback(device_t &device, _Object object) { return downcast<microdrive_image_device &>(device).m_write_comms_out.set_callback(object); }
+ template <class Object> static devcb_base &set_comms_out_wr_callback(device_t &device, Object &&cb) { return downcast<microdrive_image_device &>(device).m_write_comms_out.set_callback(std::forward<Object>(cb)); }
// image-level overrides
virtual image_init_result call_load() override;
@@ -97,8 +97,6 @@ private:
// device type definition
-extern const device_type MICRODRIVE;
-
-
+DECLARE_DEVICE_TYPE(MICRODRIVE, microdrive_image_device)
-#endif
+#endif // MAME_MACHINE_MICRODRV_H
diff --git a/src/mame/machine/micropolis.cpp b/src/mame/machine/micropolis.cpp
index a747e7d2a36..e3c760dd82f 100644
--- a/src/mame/machine/micropolis.cpp
+++ b/src/mame/machine/micropolis.cpp
@@ -63,10 +63,10 @@ static const uint8_t track_SD[][2] = {
MAME DEVICE INTERFACE
***************************************************************************/
-const device_type MICROPOLIS = device_creator<micropolis_device>;
+DEFINE_DEVICE_TYPE(MICROPOLIS, micropolis_device, "micropolis", "Micropolis FDC")
micropolis_device::micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MICROPOLIS, "MICROPOLIS", tag, owner, clock, "micropolis", __FILE__),
+ : device_t(mconfig, MICROPOLIS, tag, owner, clock),
m_read_dden(*this),
m_write_intrq(*this),
m_write_drq(*this),
@@ -82,11 +82,8 @@ micropolis_device::micropolis_device(const machine_config &mconfig, const char *
m_sector_length(0),
m_drive(nullptr)
{
- for (auto & elem : m_buffer)
- elem = 0;
-
- for (auto & elem : m_floppy_drive_tags)
- elem = nullptr;
+ std::fill(std::begin(m_buffer), std::end(m_buffer), 0);
+ std::fill(std::begin(m_floppy_drive_tags), std::end(m_floppy_drive_tags), nullptr);
}
//-------------------------------------------------
diff --git a/src/mame/machine/micropolis.h b/src/mame/machine/micropolis.h
index 12e9bea0431..9ee893c1cdd 100644
--- a/src/mame/machine/micropolis.h
+++ b/src/mame/machine/micropolis.h
@@ -9,8 +9,10 @@
*********************************************************************/
-#ifndef __MICROPOLIS_H__
-#define __MICROPOLIS_H__
+#ifndef MAME_MACHINE_MICROPOLIS_H
+#define MAME_MACHINE_MICROPOLIS_H
+
+#pragma once
#include "imagedev/flopdrv.h"
@@ -42,11 +44,10 @@ class micropolis_device : public device_t
{
public:
micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~micropolis_device() {}
- template<class _Object> static devcb_base &set_dden_rd_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_read_dden.set_callback(object); }
- template<class _Object> static devcb_base &set_intrq_wr_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_write_intrq.set_callback(object); }
- template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<micropolis_device &>(device).m_write_drq.set_callback(object); }
+ template <class Object> static devcb_base &set_dden_rd_callback(device_t &device, Object &&cb) { return downcast<micropolis_device &>(device).m_read_dden.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_intrq_wr_callback(device_t &device, Object &&cb) { return downcast<micropolis_device &>(device).m_write_intrq.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_drq_wr_callback(device_t &device, Object &&cb) { return downcast<micropolis_device &>(device).m_write_drq.set_callback(std::forward<Object>(cb)); }
static void set_drive_tags(device_t &device, const char *tag1, const char *tag2, const char *tag3, const char *tag4)
{
@@ -105,7 +106,7 @@ private:
void write_sector();
};
-extern const device_type MICROPOLIS;
+DECLARE_DEVICE_TYPE(MICROPOLIS, micropolis_device)
-#endif /* __MICROPOLIS_H__ */
+#endif // MAME_MACHINE_MICROPOLIS_H
diff --git a/src/mame/machine/midikbd.cpp b/src/mame/machine/midikbd.cpp
index 3fdbb105cf9..35eb0dc5507 100644
--- a/src/mame/machine/midikbd.cpp
+++ b/src/mame/machine/midikbd.cpp
@@ -3,10 +3,10 @@
#include "emu.h"
#include "machine/midikbd.h"
-const device_type MIDI_KBD = device_creator<midi_keyboard_device>;
+DEFINE_DEVICE_TYPE(MIDI_KBD, midi_keyboard_device, "midi_kbd", "Generic MIDI Keyboard")
midi_keyboard_device::midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MIDI_KBD, "Generic MIDI Keyboard", tag, owner, clock, "midi_kbd", __FILE__),
+ device_t(mconfig, MIDI_KBD, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_out_tx_func(*this),
m_keyboard(*this, "KEYBOARD")
diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h
index 84c811c237d..2d1e81f4dcc 100644
--- a/src/mame/machine/midikbd.h
+++ b/src/mame/machine/midikbd.h
@@ -1,21 +1,22 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef MIDIKBD_H_
-#define MIDIKBD_H_
+#ifndef MAME_MACHINE_MIDIKBD_H
+#define MAME_MACHINE_MIDIKBD_H
+
+#pragma once
#define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \
MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \
devcb = &midi_keyboard_device::static_set_tx_callback(*device, DEVCB_##_devcb);
-class midi_keyboard_device : public device_t,
- public device_serial_interface
+class midi_keyboard_device : public device_t, public device_serial_interface
{
public:
midi_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
ioport_constructor device_input_ports() const override;
- template<class _Object> static devcb_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<midi_keyboard_device &>(device).m_out_tx_func.set_callback(object); }
+ template <class Object> static devcb_base &static_set_tx_callback(device_t &device, Object &&cb) { return downcast<midi_keyboard_device &>(device).m_out_tx_func.set_callback(std::forward<Object>(cb)); }
protected:
void device_start() override;
@@ -34,6 +35,6 @@ private:
uint8_t m_head, m_tail;
};
-extern const device_type MIDI_KBD;
+DECLARE_DEVICE_TYPE(MIDI_KBD, midi_keyboard_device)
-#endif /* MIDIKBD_H_ */
+#endif // MAME_MACHINE_MIDIKBD_H
diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp
index 32b4ead1cd6..49a917a065c 100644
--- a/src/mame/machine/midwayic.cpp
+++ b/src/mame/machine/midwayic.cpp
@@ -105,7 +105,7 @@ void midway_serial_pic_device::serial_register_state()
save_item(NAME(m_ormask));
}
-const device_type MIDWAY_SERIAL_PIC = device_creator<midway_serial_pic_device>;
+DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC, midway_serial_pic_device, "midway_serial_pic_sim", "Midway Serial PIC Simulation")
//-------------------------------------------------
@@ -113,12 +113,12 @@ const device_type MIDWAY_SERIAL_PIC = device_creator<midway_serial_pic_device>;
//-------------------------------------------------
midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- midway_serial_pic_device(mconfig, MIDWAY_SERIAL_PIC, "Midway Serial Pic Simulation", tag, owner, clock, "midway_serial_pic_sim", __FILE__)
+ midway_serial_pic_device(mconfig, MIDWAY_SERIAL_PIC, tag, owner, clock)
{
}
-midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
m_upper(0),
m_buff(0),
m_idx(0),
@@ -193,7 +193,7 @@ WRITE8_MEMBER(midway_serial_pic_device::write)
*************************************/
-const device_type MIDWAY_SERIAL_PIC_EMU = device_creator<midway_serial_pic_emu_device>;
+DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC_EMU, midway_serial_pic_emu_device, "midway_serial_pic_emu", "Midway Serial PIC Emulation")
//-------------------------------------------------
@@ -201,7 +201,7 @@ const device_type MIDWAY_SERIAL_PIC_EMU = device_creator<midway_serial_pic_emu_d
//-------------------------------------------------
midway_serial_pic_emu_device::midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MIDWAY_SERIAL_PIC_EMU, "Midway Serial Pic Emulation", tag, owner, clock, "midway_serial_pic_emu", __FILE__)
+ device_t(mconfig, MIDWAY_SERIAL_PIC_EMU, tag, owner, clock)
{
}
@@ -278,7 +278,7 @@ static inline uint8_t make_bcd(uint8_t data)
return ((data / 10) << 4) | (data % 10);
}
-const device_type MIDWAY_SERIAL_PIC2 = device_creator<midway_serial_pic2_device>;
+DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC2, midway_serial_pic2_device, "midway_serial_pic2", "Midway Serial PIC 2")
//-------------------------------------------------
@@ -286,27 +286,12 @@ const device_type MIDWAY_SERIAL_PIC2 = device_creator<midway_serial_pic2_device>
//-------------------------------------------------
midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- midway_serial_pic_device(mconfig, MIDWAY_SERIAL_PIC2, "Midway Serial Pic 2", tag, owner, clock, "midway_serial_pic2", __FILE__),
- device_nvram_interface(mconfig, *this),
- m_latch(0),
- m_state(0),
- m_index(0),
- m_total(0),
- m_nvram_addr(0),
- m_time_index(0),
- m_time_just_written(0),
- m_yearoffs(0),
- m_time_write_timer(nullptr)
+ midway_serial_pic2_device(mconfig, MIDWAY_SERIAL_PIC2, tag, owner, clock)
{
- memset(m_buffer,0,sizeof(m_buffer));
- memset(m_time_buf,0,sizeof(m_time_buf));
- memset(m_nvram,0,sizeof(m_nvram));
- memset(m_default_nvram,0,sizeof(m_default_nvram));
-
}
-midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- midway_serial_pic_device(mconfig, type, name, tag, owner, clock, shortname, source),
+midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ midway_serial_pic_device(mconfig, type, tag, owner, clock),
device_nvram_interface(mconfig, *this),
m_latch(0),
m_state(0),
@@ -655,7 +640,7 @@ void midway_ioasic_device::ioasic_register_state()
save_item(NAME(m_fifo_force_buffer_empty_pc));
}
-const device_type MIDWAY_IOASIC = device_creator<midway_ioasic_device>;
+DEFINE_DEVICE_TYPE(MIDWAY_IOASIC, midway_ioasic_device, "midway_ioasic", "Midway IOASIC")
//-------------------------------------------------
@@ -663,7 +648,7 @@ const device_type MIDWAY_IOASIC = device_creator<midway_ioasic_device>;
//-------------------------------------------------
midway_ioasic_device::midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- midway_serial_pic2_device(mconfig, MIDWAY_IOASIC, "Midway IOASIC", tag, owner, clock, "midway_ioasic", __FILE__),
+ midway_serial_pic2_device(mconfig, MIDWAY_IOASIC, tag, owner, clock),
m_serial_tx_cb(*this),
m_has_dcs(0),
m_has_cage(0),
@@ -1109,7 +1094,7 @@ WRITE32_MEMBER( midway_ioasic_device::packed_w )
write(space, offset*2+1, data >> 16, 0x0000ffff);
}
-WRITE8_MEMBER(midway_ioasic_device::serial_rx_w)
+void midway_ioasic_device::serial_rx_w(u8 data)
{
// Break Detect 0x0100
// Frame Error 0x0200
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h
index 28bdcd6c6ee..65a6c6cf8fb 100644
--- a/src/mame/machine/midwayic.h
+++ b/src/mame/machine/midwayic.h
@@ -5,9 +5,11 @@
Emulation of various Midway ICs
***************************************************************************/
+#ifndef MAME_MACHINE_MIDWAY_IC_H
+#define MAME_MACHINE_MIDWAY_IC_H
+
+#pragma once
-#ifndef __MIDWAY_IC__
-#define __MIDWAY_IC__
#include "audio/cage.h"
#include "audio/dcs.h"
@@ -20,7 +22,6 @@ class midway_serial_pic_device : public device_t
public:
// construction/destruction
midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
static void static_set_upper(device_t &device, int upper) { downcast<midway_serial_pic_device &>(device).m_upper = upper; }
@@ -30,6 +31,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( reset_w );
protected:
+ midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
@@ -48,7 +51,7 @@ private:
// device type definition
-extern const device_type MIDWAY_SERIAL_PIC;
+DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC, midway_serial_pic_device)
#define MCFG_MIDWAY_SERIAL_PIC_UPPER(_upper) \
midway_serial_pic_device::static_set_upper(*device, _upper);
@@ -60,7 +63,6 @@ class midway_serial_pic_emu_device : public device_t
public:
// construction/destruction
midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- midway_serial_pic_emu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER(read_a);
DECLARE_READ8_MEMBER(read_b);
@@ -70,17 +72,16 @@ public:
DECLARE_WRITE8_MEMBER(write_c);
protected:
+ midway_serial_pic_emu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
-
-private:
-
};
// device type definition
-extern const device_type MIDWAY_SERIAL_PIC_EMU;
+DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC_EMU, midway_serial_pic_emu_device)
@@ -88,13 +89,11 @@ extern const device_type MIDWAY_SERIAL_PIC_EMU;
// ======================> midway_serial_pic2_device
-class midway_serial_pic2_device : public midway_serial_pic_device,
- public device_nvram_interface
+class midway_serial_pic2_device : public midway_serial_pic_device, public device_nvram_interface
{
public:
// construction/destruction
midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
static void static_set_yearoffs(device_t &device, int yearoffs) { downcast<midway_serial_pic2_device &>(device).m_yearoffs = yearoffs; }
@@ -105,6 +104,8 @@ public:
void set_default_nvram(const uint8_t *nvram);
protected:
+ midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
@@ -136,7 +137,7 @@ private:
// device type definition
-extern const device_type MIDWAY_SERIAL_PIC2;
+DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC2, midway_serial_pic2_device)
#define MCFG_MIDWAY_SERIAL_PIC2_UPPER MCFG_MIDWAY_SERIAL_PIC_UPPER
@@ -178,7 +179,7 @@ public:
DECLARE_WRITE8_MEMBER(cage_irq_handler);
- DECLARE_WRITE8_MEMBER(serial_rx_w);
+ void serial_rx_w(u8 data);
void ioasic_reset();
@@ -218,7 +219,7 @@ private:
// device type definition
-extern const device_type MIDWAY_IOASIC;
+DECLARE_DEVICE_TYPE(MIDWAY_IOASIC, midway_ioasic_device)
#define MCFG_MIDWAY_IOASIC_UPPER MCFG_MIDWAY_SERIAL_PIC_UPPER
@@ -253,4 +254,4 @@ enum
MIDWAY_IOASIC_HYPRDRIV
};
-#endif
+#endif // MAME_MACHINE_MIDWAY_IC_H
diff --git a/src/mame/machine/mie.cpp b/src/mame/machine/mie.cpp
index a130493dc3a..6f020a7a2d2 100644
--- a/src/mame/machine/mie.cpp
+++ b/src/mame/machine/mie.cpp
@@ -23,8 +23,8 @@
// - Speed is all wrong
-const device_type MIE = device_creator<mie_device>;
-const device_type MIE_JVS = device_creator<mie_jvs_device>;
+DEFINE_DEVICE_TYPE(MIE, mie_device, "mie", "Sega 315-6146 MIE")
+DEFINE_DEVICE_TYPE(MIE_JVS, mie_jvs_device, "mie_jvs", "JVS (MIE)")
static ADDRESS_MAP_START( mie_map, AS_PROGRAM, 8, mie_device)
AM_RANGE(0x0000, 0x07ff) AM_ROM
@@ -88,12 +88,12 @@ machine_config_constructor mie_device::device_mconfig_additions() const
}
mie_jvs_device::mie_jvs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : jvs_host(mconfig, MIE_JVS, "JVS (MIE)", tag, owner, clock, "mie_jvs", __FILE__)
+ : jvs_host(mconfig, MIE_JVS, tag, owner, clock)
{
}
mie_device::mie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : maple_device(mconfig, MIE, "Sega 315-6146 MIE", tag, owner, clock, "mie", __FILE__)
+ : maple_device(mconfig, MIE, tag, owner, clock)
{
memset(gpio_name, 0, sizeof(gpio_name));
jvs_name = nullptr;
diff --git a/src/mame/machine/mie.h b/src/mame/machine/mie.h
index 4d3e5213354..f74def20266 100644
--- a/src/mame/machine/mie.h
+++ b/src/mame/machine/mie.h
@@ -1,12 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __MIE_H__
-#define __MIE_H__
+#ifndef MAME_MACHINE_MIE_H
+#define MAME_MACHINE_MIE_H
+
+#pragma once
+
+#include "machine/mapledev.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "machine/jvshost.h"
-#include "machine/mapledev.h"
#define MCFG_MIE_ADD(_tag, _clock, _host_tag, _host_port, g0, g1, g2, g3, g4, g5, g6, g7) \
MCFG_MAPLE_DEVICE_ADD(_tag "_maple", MIE, _clock, _host_tag, _host_port) \
@@ -128,6 +131,7 @@ public:
// device type definition
-extern const device_type MIE, MIE_JVS;
+DECLARE_DEVICE_TYPE(MIE, mie_device)
+DECLARE_DEVICE_TYPE(MIE_JVS, mie_jvs_device)
-#endif /* __MIE_H__ */
+#endif // MAME_MACHINE_MIE_H
diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp
index 875076bd196..4db233d9ea3 100644
--- a/src/mame/machine/mm1kb.cpp
+++ b/src/mame/machine/mm1kb.cpp
@@ -17,7 +17,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MM1_KEYBOARD = device_creator<mm1_keyboard_t>;
+DEFINE_DEVICE_TYPE(MM1_KEYBOARD, mm1_keyoard_device, "mm1kb", "MikroMikko 1 keyboard")
//-------------------------------------------------
@@ -34,7 +34,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
-const tiny_rom_entry *mm1_keyboard_t::device_rom_region() const
+const tiny_rom_entry *mm1_keyoard_device::device_rom_region() const
{
return ROM_NAME( mm1_keyboard );
}
@@ -51,7 +51,7 @@ static const char *const mm1_kb_sample_names[] =
nullptr
};
-bool mm1_keyboard_t::first_time = true;
+bool mm1_keyoard_device::first_time = true;
//-------------------------------------------------
// MACHINE_DRIVER( mm1_keyboard )
@@ -71,7 +71,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
-machine_config_constructor mm1_keyboard_t::device_mconfig_additions() const
+machine_config_constructor mm1_keyoard_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( mm1_keyboard );
}
@@ -193,7 +193,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
-ioport_constructor mm1_keyboard_t::device_input_ports() const
+ioport_constructor mm1_keyoard_device::device_input_ports() const
{
return INPUT_PORTS_NAME( mm1_keyboard );
}
@@ -205,11 +205,11 @@ ioport_constructor mm1_keyboard_t::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
-// mm1_keyboard_t - constructor
+// mm1_keyoard_device - constructor
//-------------------------------------------------
-mm1_keyboard_t::mm1_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, MM1_KEYBOARD, "MikroMikko 1 keyboard", tag, owner, clock, "mm1kb", __FILE__),
+mm1_keyoard_device::mm1_keyoard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, MM1_KEYBOARD, tag, owner, clock),
m_write_kbst(*this),
m_samples(*this, "keyboard_and_chassis_sounds"),
m_rom(*this, "keyboard"),
@@ -230,7 +230,7 @@ enum
// device_start - device-specific startup
//-------------------------------------------------
-void mm1_keyboard_t::device_start()
+void mm1_keyoard_device::device_start()
{
// resolve callbacks
m_write_kbst.resolve_safe();
@@ -240,7 +240,7 @@ void mm1_keyboard_t::device_start()
m_scan_timer->adjust(attotime::from_hz(clock()), 0, attotime::from_hz(clock()));
// add notification request for system shut down (to play back the power switch sound once more)
- machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&mm1_keyboard_t::shut_down_mm1, this));
+ machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(&mm1_keyoard_device::shut_down_mm1, this));
// state saving
save_item(NAME(m_sense));
@@ -248,7 +248,7 @@ void mm1_keyboard_t::device_start()
save_item(NAME(m_data));
}
-void mm1_keyboard_t::shut_down_mm1()
+void mm1_keyoard_device::shut_down_mm1()
{
m_samples->start(1, 1); // pretty useless this, as far as there is no way to delay the shut down process...
}
@@ -257,7 +257,7 @@ void mm1_keyboard_t::shut_down_mm1()
// device_timer - handler timer events
//-------------------------------------------------
-void mm1_keyboard_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void mm1_keyoard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
// handle scan timer
uint8_t data = 0xff;
diff --git a/src/mame/machine/mm1kb.h b/src/mame/machine/mm1kb.h
index f5c19f7e74c..ce5af33d784 100644
--- a/src/mame/machine/mm1kb.h
+++ b/src/mame/machine/mm1kb.h
@@ -5,11 +5,11 @@
Nokia MikroMikko 1 keyboard emulation
*********************************************************************/
+#ifndef MAME_MACHINE_MM1KB_H
+#define MAME_MACHINE_MM1KB_H
#pragma once
-#ifndef __MM1_KEYBOARD__
-#define __MM1_KEYBOARD__
#include "sound/samples.h"
@@ -20,7 +20,7 @@
//**************************************************************************
#define MCFG_MM1_KEYBOARD_KBST_CALLBACK(_write) \
- devcb = &mm1_keyboard_t::set_kbst_wr_callback(*device, DEVCB_##_write);
+ devcb = &mm1_keyoard_device::set_kbst_wr_callback(*device, DEVCB_##_write);
@@ -28,15 +28,15 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> mm1_keyboard_t
+// ======================> mm1_keyoard_device
-class mm1_keyboard_t : public device_t
+class mm1_keyoard_device : public device_t
{
public:
// construction/destruction
- mm1_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mm1_keyoard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_kbst_wr_callback(device_t &device, _Object object) { return downcast<mm1_keyboard_t &>(device).m_write_kbst.set_callback(object); }
+ template <class Object> static devcb_base &set_kbst_wr_callback(device_t &device, Object &&cb) { return downcast<mm1_keyoard_device &>(device).m_write_kbst.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -83,8 +83,8 @@ private:
// device type definition
-extern const device_type MM1_KEYBOARD;
+DECLARE_DEVICE_TYPE(MM1_KEYBOARD, mm1_keyoard_device)
-#endif
+#endif // MAME_MACHINE_MM1KB_H
diff --git a/src/mame/machine/ms7004.cpp b/src/mame/machine/ms7004.cpp
index d6fb86e964b..601643727eb 100644
--- a/src/mame/machine/ms7004.cpp
+++ b/src/mame/machine/ms7004.cpp
@@ -36,7 +36,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type MS7004 = device_creator<ms7004_device>;
+DEFINE_DEVICE_TYPE(MS7004, ms7004_device, "ms7004", "MS7004 keyboard")
ROM_START( ms7004 )
ROM_REGION (0x800, MS7004_CPU_TAG, 0)
@@ -357,7 +357,7 @@ ioport_constructor ms7004_device::device_input_ports() const
//-------------------------------------------------
ms7004_device::ms7004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MS7004, "MS7004 keyboard", tag, owner, clock, "ms7004", __FILE__),
+ : device_t(mconfig, MS7004, tag, owner, clock),
m_maincpu(*this, MS7004_CPU_TAG),
m_speaker(*this, MS7004_SPK_TAG),
m_i8243(*this, "i8243"),
diff --git a/src/mame/machine/ms7004.h b/src/mame/machine/ms7004.h
index 0acc1789d4e..f8bf4b1def2 100644
--- a/src/mame/machine/ms7004.h
+++ b/src/mame/machine/ms7004.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
-#pragma once
+#ifndef MAME_MACHINE_MS7004_H
+#define MAME_MACHINE_MS7004_H
-#ifndef __MS7004_H__
-#define __MS7004_H__
+#pragma once
#include "cpu/mcs48/mcs48.h"
#include "machine/i8243.h"
@@ -37,8 +37,8 @@ public:
// construction/destruction
ms7004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_tx_handler(device_t &device, _Object wr) { return downcast<ms7004_device &>(device).m_tx_handler.set_callback(wr); }
- template<class _Object> static devcb_base &set_rts_handler(device_t &device, _Object wr) { return downcast<ms7004_device &>(device).m_rts_handler.set_callback(wr); }
+ template <class Object> static devcb_base &set_tx_handler(device_t &device, Object &&wr) { return downcast<ms7004_device &>(device).m_tx_handler.set_callback(std::forward<Object>(wr)); }
+ template <class Object> static devcb_base &set_rts_handler(device_t &device, Object &&wr) { return downcast<ms7004_device &>(device).m_rts_handler.set_callback(std::forward<Object>(wr)); }
DECLARE_WRITE8_MEMBER( p1_w );
DECLARE_WRITE8_MEMBER( p2_w );
@@ -71,6 +71,6 @@ private:
};
// device type definition
-extern const device_type MS7004;
+DECLARE_DEVICE_TYPE(MS7004, ms7004_device)
-#endif
+#endif // MAME_MACHINE_MS7004_H
diff --git a/src/mame/machine/msx_matsushita.cpp b/src/mame/machine/msx_matsushita.cpp
index 563b8003162..c4fbcdfa9bb 100644
--- a/src/mame/machine/msx_matsushita.cpp
+++ b/src/mame/machine/msx_matsushita.cpp
@@ -5,10 +5,10 @@
const uint8_t manufacturer_id = 0x08;
-const device_type MSX_MATSUSHITA = device_creator<msx_matsushita_device>;
+DEFINE_DEVICE_TYPE(MSX_MATSUSHITA, msx_matsushita_device, "msx_matsushita", "Matsushita switched device")
msx_matsushita_device::msx_matsushita_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_MATSUSHITA, "Matsushita switched device", tag, owner, clock, "msx_matsushita", __FILE__)
+ : device_t(mconfig, MSX_MATSUSHITA, tag, owner, clock)
, device_nvram_interface(mconfig, *this)
, m_io_config(*this, "CONFIG")
, m_turbo_out_cb(*this)
diff --git a/src/mame/machine/msx_matsushita.h b/src/mame/machine/msx_matsushita.h
index 6fd29efee16..8daad1a006b 100644
--- a/src/mame/machine/msx_matsushita.h
+++ b/src/mame/machine/msx_matsushita.h
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef __MSX_MATSUSHITA_H
-#define __MSX_MATSUSHITA_H
+#ifndef MAME_MACHINE_MSX_MATSUSHITA_H
+#define MAME_MACHINE_MSX_MATSUSHITA_H
#include "msx_switched.h"
-extern const device_type MSX_MATSUSHITA;
+DECLARE_DEVICE_TYPE(MSX_MATSUSHITA, msx_matsushita_device)
#define MCFG_MSX_MATSUSHITA_ADD(_tag) \
@@ -24,7 +24,8 @@ class msx_matsushita_device : public device_t,
public:
msx_matsushita_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_turbo_callback(device_t &device, _Object object) { return downcast<msx_matsushita_device &>(device).m_turbo_out_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_turbo_callback(device_t &device, Object &&cb)
+ { return downcast<msx_matsushita_device &>(device).m_turbo_out_cb.set_callback(std::forward<Object>(cb)); }
virtual DECLARE_READ8_MEMBER(switched_read) override;
virtual DECLARE_WRITE8_MEMBER(switched_write) override;
@@ -50,4 +51,4 @@ private:
uint8_t m_pattern;
};
-#endif
+#endif // MAME_MACHINE_MSX_MATSUSHITA_H
diff --git a/src/mame/machine/msx_s1985.cpp b/src/mame/machine/msx_s1985.cpp
index 54695ee6b54..f596600c15c 100644
--- a/src/mame/machine/msx_s1985.cpp
+++ b/src/mame/machine/msx_s1985.cpp
@@ -5,10 +5,10 @@
const uint8_t manufacturer_id = 0xfe;
-const device_type MSX_S1985 = device_creator<msx_s1985_device>;
+DEFINE_DEVICE_TYPE(MSX_S1985, msx_s1985_device, "msx_s1985", "MSX-Engine S1985")
msx_s1985_device::msx_s1985_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_S1985, "MSX-Engine S1985", tag, owner, clock, "msx_s1985", __FILE__)
+ : device_t(mconfig, MSX_S1985, tag, owner, clock)
, device_nvram_interface(mconfig, *this)
, m_selected(false)
, m_backup_ram_address(0)
diff --git a/src/mame/machine/msx_s1985.h b/src/mame/machine/msx_s1985.h
index d1ccde5fff4..df93f2f455d 100644
--- a/src/mame/machine/msx_s1985.h
+++ b/src/mame/machine/msx_s1985.h
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef __MSX_S1985_H
-#define __MSX_S1985_H
+#ifndef MAME_MACHINE_MSX_S1985_H
+#define MAME_MACHINE_MSX_S1985_H
#include "msx_switched.h"
-extern const device_type MSX_S1985;
+DECLARE_DEVICE_TYPE(MSX_S1985, msx_s1985_device)
#define MCFG_MSX_S1985_ADD(_tag) \
@@ -43,4 +43,4 @@ private:
uint8_t m_pattern;
};
-#endif
+#endif // MAME_MACHINE_MSX_S1985_H
diff --git a/src/mame/machine/msx_systemflags.cpp b/src/mame/machine/msx_systemflags.cpp
index 4aa79e46fac..7857df6761a 100644
--- a/src/mame/machine/msx_systemflags.cpp
+++ b/src/mame/machine/msx_systemflags.cpp
@@ -4,11 +4,11 @@
#include "msx_systemflags.h"
-const device_type MSX_SYSTEMFLAGS = device_creator<msx_systemflags_device>;
+DEFINE_DEVICE_TYPE(MSX_SYSTEMFLAGS, msx_systemflags_device, "msx_systemflags", "MSX System Flags")
msx_systemflags_device::msx_systemflags_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MSX_SYSTEMFLAGS, "MSX System Flags", tag, owner, clock, "msx_systemflags", __FILE__)
+ : device_t(mconfig, MSX_SYSTEMFLAGS, tag, owner, clock)
, m_initial_value(0xff)
, m_system_flags(0xff)
{
diff --git a/src/mame/machine/msx_systemflags.h b/src/mame/machine/msx_systemflags.h
index c91f8e9b364..aacb60187a0 100644
--- a/src/mame/machine/msx_systemflags.h
+++ b/src/mame/machine/msx_systemflags.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef __MSX_SYSTEMFLAGS_H
-#define __MSX_SYSTEMFLAGS_H
+#ifndef MAME_MACHINE_MSX_SYSTEMFLAGS_H
+#define MAME_MACHINE_MSX_SYSTEMFLAGS_H
/*
Some MSX2+ and TurboR machines have a 'system flags' I/O port ($F4).
@@ -9,7 +9,7 @@ The value in this register is cleared on power up, but it keeps it's
value during a reset of the system.
*/
-extern const device_type MSX_SYSTEMFLAGS;
+DECLARE_DEVICE_TYPE(MSX_SYSTEMFLAGS, msx_systemflags_device)
#define MCFG_MSX_SYSTEMFLAGS_ADD(_tag, _initial_value) \
@@ -36,4 +36,4 @@ private:
uint8_t m_system_flags;
};
-#endif
+#endif // MAME_MACHINE_MSX_SYSTEMFLAGS_H
diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp
index dcf424d69c9..52eaa42d1c2 100644
--- a/src/mame/machine/n64.cpp
+++ b/src/mame/machine/n64.cpp
@@ -10,10 +10,10 @@
#include "video/n64.h"
// device type definition
-const device_type N64PERIPH = device_creator<n64_periphs>;
+DEFINE_DEVICE_TYPE(N64PERIPH, n64_periphs, "n64_periphs", "N64 Peripheral Chips")
n64_periphs::n64_periphs(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, N64PERIPH, "N64 Periphal Chips", tag, owner, clock, "n64_periphs", __FILE__)
+ : device_t(mconfig, N64PERIPH, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_nvram_image(nullptr)
, dd_present(false)
diff --git a/src/mame/machine/namco06.cpp b/src/mame/machine/namco06.cpp
index 11d2647abed..0b3ba86d86a 100644
--- a/src/mame/machine/namco06.cpp
+++ b/src/mame/machine/namco06.cpp
@@ -85,18 +85,18 @@
#include "machine/namco06.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
TIMER_CALLBACK_MEMBER( namco_06xx_device::nmi_generate )
{
if (!m_nmicpu->suspended(SUSPEND_REASON_HALT | SUSPEND_REASON_RESET | SUSPEND_REASON_DISABLE))
{
- LOG(("NMI cpu '%s'\n",m_nmicpu->tag()));
+ LOG("NMI cpu '%s'\n",m_nmicpu->tag());
m_nmicpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
else
- LOG(("NMI not generated because cpu '%s' is suspended\n",m_nmicpu->tag()));
+ LOG("NMI not generated because cpu '%s' is suspended\n",m_nmicpu->tag());
}
@@ -104,7 +104,7 @@ READ8_MEMBER( namco_06xx_device::data_r )
{
uint8_t result = 0xff;
- LOG(("%s: 06XX '%s' read offset %d\n",machine().describe_context(),tag(),offset));
+ LOG("%s: 06XX '%s' read offset %d\n",machine().describe_context(),tag(),offset);
if (!(m_control & 0x10))
{
@@ -112,10 +112,10 @@ READ8_MEMBER( namco_06xx_device::data_r )
return 0;
}
- if ((m_control & (1 << 0)) && !m_read_0.isnull()) result &= m_read_0(space, 0);
- if ((m_control & (1 << 1)) && !m_read_1.isnull()) result &= m_read_1(space, 0);
- if ((m_control & (1 << 2)) && !m_read_2.isnull()) result &= m_read_2(space, 0);
- if ((m_control & (1 << 3)) && !m_read_3.isnull()) result &= m_read_3(space, 0);
+ if (BIT(m_control, 0)) result &= m_read[0](space, 0);
+ if (BIT(m_control, 1)) result &= m_read[1](space, 0);
+ if (BIT(m_control, 2)) result &= m_read[2](space, 0);
+ if (BIT(m_control, 3)) result &= m_read[3](space, 0);
return result;
}
@@ -123,40 +123,40 @@ READ8_MEMBER( namco_06xx_device::data_r )
WRITE8_MEMBER( namco_06xx_device::data_w )
{
- LOG(("%s: 06XX '%s' write offset %d = %02x\n",machine().describe_context(),tag(),offset,data));
+ LOG("%s: 06XX '%s' write offset %d = %02x\n",machine().describe_context(),tag(),offset,data);
if (m_control & 0x10)
{
logerror("%s: 06XX '%s' write in read mode %02x\n",machine().describe_context(),tag(),m_control);
return;
}
- if ((m_control & (1 << 0)) && !m_write_0.isnull()) m_write_0(space, 0, data);
- if ((m_control & (1 << 1)) && !m_write_1.isnull()) m_write_1(space, 0, data);
- if ((m_control & (1 << 2)) && !m_write_2.isnull()) m_write_2(space, 0, data);
- if ((m_control & (1 << 3)) && !m_write_3.isnull()) m_write_3(space, 0, data);
+ if (BIT(m_control, 0)) m_write[0](space, 0, data);
+ if (BIT(m_control, 1)) m_write[1](space, 0, data);
+ if (BIT(m_control, 2)) m_write[2](space, 0, data);
+ if (BIT(m_control, 3)) m_write[3](space, 0, data);
}
READ8_MEMBER( namco_06xx_device::ctrl_r )
{
- LOG(("%s: 06XX '%s' ctrl_r\n",machine().describe_context(),tag()));
+ LOG("%s: 06XX '%s' ctrl_r\n",machine().describe_context(),tag());
return m_control;
}
WRITE8_MEMBER( namco_06xx_device::ctrl_w )
{
- LOG(("%s: 06XX '%s' control %02x\n",space.machine().describe_context(),tag(),data));
+ LOG("%s: 06XX '%s' control %02x\n",space.machine().describe_context(),tag(),data);
m_control = data;
if ((m_control & 0x0f) == 0)
{
- LOG(("disabling nmi generate timer\n"));
+ LOG("disabling nmi generate timer\n");
m_nmi_timer->adjust(attotime::never);
}
else
{
- LOG(("setting nmi generate timer to 200us\n"));
+ LOG("setting nmi generate timer to 200us\n");
// this timing is critical. Due to a bug, Bosconian will stop responding to
// inputs if a transfer terminates at the wrong time.
@@ -164,34 +164,26 @@ WRITE8_MEMBER( namco_06xx_device::ctrl_w )
// not have enough time to process the incoming controls.
m_nmi_timer->adjust(attotime::from_usec(200), 0, attotime::from_usec(200));
- if (m_control & 0x10) {
- if ((m_control & (1 << 0)) && !m_readreq_0.isnull()) m_readreq_0(space, 0);
- if ((m_control & (1 << 1)) && !m_readreq_1.isnull()) m_readreq_1(space, 0);
- if ((m_control & (1 << 2)) && !m_readreq_2.isnull()) m_readreq_2(space, 0);
- if ((m_control & (1 << 3)) && !m_readreq_3.isnull()) m_readreq_3(space, 0);
+ if (m_control & 0x10)
+ {
+ if (BIT(m_control, 0)) m_readreq[0](space, 0);
+ if (BIT(m_control, 1)) m_readreq[1](space, 0);
+ if (BIT(m_control, 2)) m_readreq[2](space, 0);
+ if (BIT(m_control, 3)) m_readreq[3](space, 0);
}
}
}
-const device_type NAMCO_06XX = device_creator<namco_06xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_06XX, namco_06xx_device, "namco06", "Namco 06xx")
namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_06XX, "Namco 06xx", tag, owner, clock, "namco06xx", __FILE__)
+ : device_t(mconfig, NAMCO_06XX, tag, owner, clock)
, m_control(0)
, m_nmicpu(*this, finder_base::DUMMY_TAG)
- , m_read_0(*this)
- , m_read_1(*this)
- , m_read_2(*this)
- , m_read_3(*this)
- , m_readreq_0(*this)
- , m_readreq_1(*this)
- , m_readreq_2(*this)
- , m_readreq_3(*this)
- , m_write_0(*this)
- , m_write_1(*this)
- , m_write_2(*this)
- , m_write_3(*this)
+ , m_read{ { *this }, { *this }, { *this }, { *this } }
+ , m_readreq{ { *this }, { *this }, { *this }, { *this } }
+ , m_write{ { *this }, { *this }, { *this }, { *this } }
{
}
@@ -201,18 +193,15 @@ namco_06xx_device::namco_06xx_device(const machine_config &mconfig, const char *
void namco_06xx_device::device_start()
{
- m_read_0.resolve();
- m_read_1.resolve();
- m_read_2.resolve();
- m_read_3.resolve();
- m_readreq_0.resolve();
- m_readreq_1.resolve();
- m_readreq_2.resolve();
- m_readreq_3.resolve();
- m_write_0.resolve();
- m_write_1.resolve();
- m_write_2.resolve();
- m_write_3.resolve();
+ for (devcb_read8 &cb : m_read)
+ cb.resolve_safe(0xff);
+
+ for (devcb_write_line &cb : m_readreq)
+ cb.resolve_safe();
+
+ for (devcb_write8 &cb : m_write)
+ cb.resolve_safe();
+
/* allocate a timer */
m_nmi_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(namco_06xx_device::nmi_generate),this));
diff --git a/src/mame/machine/namco06.h b/src/mame/machine/namco06.h
index 04f4e56af28..9b2af7522ad 100644
--- a/src/mame/machine/namco06.h
+++ b/src/mame/machine/namco06.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#ifndef NAMCO06_H
-#define NAMCO06_H
+#ifndef MAME_MACHINE_NAMCO06_H
+#define MAME_MACHINE_NAMCO06_H
+
+#pragma once
struct namco_06xx_config
@@ -21,42 +23,42 @@ struct namco_06xx_config
namco_06xx_device::set_maincpu(*device, "^" _tag);
#define MCFG_NAMCO_06XX_READ_0_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_1_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_2_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_3_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_REQUEST_0_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_request_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_request_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_REQUEST_1_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_request_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_request_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_REQUEST_2_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_request_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_request_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_READ_REQUEST_3_CB(_devcb) \
- devcb = &namco_06xx_device::set_read_request_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_read_request_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_WRITE_0_CB(_devcb) \
- devcb = &namco_06xx_device::set_write_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_write_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_WRITE_1_CB(_devcb) \
- devcb = &namco_06xx_device::set_write_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_write_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_WRITE_2_CB(_devcb) \
- devcb = &namco_06xx_device::set_write_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_write_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_06XX_WRITE_3_CB(_devcb) \
- devcb = &namco_06xx_device::set_write_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_06xx_device::set_write_callback<3>(*device, DEVCB_##_devcb);
/* device get info callback */
@@ -67,21 +69,11 @@ public:
static void set_maincpu(device_t &device, const char *tag) { downcast<namco_06xx_device &>(device).m_nmicpu.set_tag(tag); }
- template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_0.set_callback(object); }
- template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_1.set_callback(object); }
- template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_2.set_callback(object); }
- template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_read_3.set_callback(object); }
-
- template<class _Object> static devcb_base &set_read_request_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_0.set_callback(object); }
- template<class _Object> static devcb_base &set_read_request_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_1.set_callback(object); }
- template<class _Object> static devcb_base &set_read_request_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_2.set_callback(object); }
- template<class _Object> static devcb_base &set_read_request_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_readreq_3.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_read_callback(device_t &device, Object &&cb) { return downcast<namco_06xx_device &>(device).m_read[N].set_callback(std::forward<Object>(cb)); }
+ template <unsigned N, class Object> static devcb_base &set_read_request_callback(device_t &device, Object &&cb) { return downcast<namco_06xx_device &>(device).m_readreq[N].set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_write_0_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_0.set_callback(object); }
- template<class _Object> static devcb_base &set_write_1_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_1.set_callback(object); }
- template<class _Object> static devcb_base &set_write_2_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_2.set_callback(object); }
- template<class _Object> static devcb_base &set_write_3_callback(device_t &device, _Object object) { return downcast<namco_06xx_device &>(device).m_write_3.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_write_callback(device_t &device, Object &&cb) { return downcast<namco_06xx_device &>(device).m_write[N].set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
@@ -102,24 +94,14 @@ private:
required_device<cpu_device> m_nmicpu;
- devcb_read8 m_read_0;
- devcb_read8 m_read_1;
- devcb_read8 m_read_2;
- devcb_read8 m_read_3;
+ devcb_read8 m_read[4];
- devcb_write_line m_readreq_0;
- devcb_write_line m_readreq_1;
- devcb_write_line m_readreq_2;
- devcb_write_line m_readreq_3;
+ devcb_write_line m_readreq[4];
- devcb_write8 m_write_0;
- devcb_write8 m_write_1;
- devcb_write8 m_write_2;
- devcb_write8 m_write_3;
+ devcb_write8 m_write[4];
};
-extern const device_type NAMCO_06XX;
-
+DECLARE_DEVICE_TYPE(NAMCO_06XX, namco_06xx_device)
-#endif
+#endif // MAME_MACHINE_NAMCO06_H
diff --git a/src/mame/machine/namco50.cpp b/src/mame/machine/namco50.cpp
index 8b54f21e05e..ae9f97338bd 100644
--- a/src/mame/machine/namco50.cpp
+++ b/src/mame/machine/namco50.cpp
@@ -237,10 +237,10 @@ ROM_START( namco_50xx )
ROM_END
-const device_type NAMCO_50XX = device_creator<namco_50xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_50XX, namco_50xx_device, "namco50", "Namco 50xx")
namco_50xx_device::namco_50xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_50XX, "Namco 50xx", tag, owner, clock, "namco50", __FILE__),
+ : device_t(mconfig, NAMCO_50XX, tag, owner, clock),
m_cpu(*this, "mcu"),
m_latched_cmd(0),
m_latched_rw(0),
diff --git a/src/mame/machine/namco50.h b/src/mame/machine/namco50.h
index 565bb4320b4..ed9dfda7bd3 100644
--- a/src/mame/machine/namco50.h
+++ b/src/mame/machine/namco50.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#ifndef NAMCO50_H
-#define NAMCO50_H
+#ifndef MAME_MACHINE_NAMCO50_H
+#define MAME_MACHINE_NAMCO50_H
+
+#pragma once
#include "cpu/mb88xx/mb88xx.h"
@@ -42,6 +44,6 @@ private:
uint8_t m_portO;
};
-extern const device_type NAMCO_50XX;
+DECLARE_DEVICE_TYPE(NAMCO_50XX, namco_50xx_device)
-#endif /* NAMCO50_H */
+#endif // MAME_MACHINE_NAMCO50_H
diff --git a/src/mame/machine/namco51.cpp b/src/mame/machine/namco51.cpp
index a7b1257723a..9b0e0c9e285 100644
--- a/src/mame/machine/namco51.cpp
+++ b/src/mame/machine/namco51.cpp
@@ -62,17 +62,17 @@
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-#define READ_PORT(num) m_in_##num(space, 0)
-#define WRITE_PORT(num,data) m_out_##num(space, 0, data)
+#define READ_PORT(num) m_in[num](space, 0)
+#define WRITE_PORT(num, data) m_out[num](space, 0, data)
WRITE8_MEMBER( namco_51xx_device::write )
{
data &= 0x07;
- LOG(("%s: custom 51XX write %02x\n",machine().describe_context(),data));
+ LOG("%s: custom 51XX write %02x\n",machine().describe_context(),data);
if (m_coincred_mode)
{
@@ -168,7 +168,7 @@ static const int joy_map[16] =
READ8_MEMBER( namco_51xx_device::read )
{
- LOG(("%s: custom 51XX read\n",machine().describe_context()));
+ LOG("%s: custom 51XX read\n",machine().describe_context());
if (m_mode == 0) /* switch mode */
{
@@ -341,17 +341,13 @@ ROM_START( namco_51xx )
ROM_LOAD( "51xx.bin", 0x0000, 0x0400, CRC(c2f57ef8) SHA1(50de79e0d6a76bda95ffb02fcce369a79e6abfec) )
ROM_END
-const device_type NAMCO_51XX = device_creator<namco_51xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_51XX, namco_51xx_device, "namco51", "Namco 51xx")
namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_51XX, "Namco 51xx", tag, owner, clock, "namco51", __FILE__),
+ : device_t(mconfig, NAMCO_51XX, tag, owner, clock),
m_cpu(*this, "mcu"),
- m_in_0(*this),
- m_in_1(*this),
- m_in_2(*this),
- m_in_3(*this),
- m_out_0(*this),
- m_out_1(*this),
+ m_in{ { *this }, { *this }, { *this }, { *this } },
+ m_out{ { *this }, { *this } },
m_lastcoins(0),
m_lastbuttons(0),
m_mode(0),
@@ -367,14 +363,12 @@ namco_51xx_device::namco_51xx_device(const machine_config &mconfig, const char *
void namco_51xx_device::device_start()
{
/* resolve our read callbacks */
- m_in_0.resolve_safe(0);
- m_in_1.resolve_safe(0);
- m_in_2.resolve_safe(0);
- m_in_3.resolve_safe(0);
+ for (devcb_read8 &cb : m_in)
+ cb.resolve_safe(0);
/* resolve our write callbacks */
- m_out_0.resolve_safe();
- m_out_1.resolve_safe();
+ for (devcb_write8 &cb : m_out)
+ cb.resolve_safe();
save_item(NAME(m_lastcoins));
save_item(NAME(m_lastbuttons));
diff --git a/src/mame/machine/namco51.h b/src/mame/machine/namco51.h
index 56c11d3d788..bbdb17dcd04 100644
--- a/src/mame/machine/namco51.h
+++ b/src/mame/machine/namco51.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#ifndef NAMCO51_H
-#define NAMCO51_H
+#ifndef MAME_MACHINE_NAMCO51_H
+#define MAME_MACHINE_NAMCO51_H
+
+#pragma once
#include "cpu/mb88xx/mb88xx.h"
@@ -10,35 +12,31 @@
MCFG_DEVICE_ADD(_tag, NAMCO_51XX, _clock)
#define MCFG_NAMCO_51XX_INPUT_0_CB(_devcb) \
- devcb = &namco_51xx_device::set_input_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_51xx_device::set_input_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_51XX_INPUT_1_CB(_devcb) \
- devcb = &namco_51xx_device::set_input_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_51xx_device::set_input_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_51XX_INPUT_2_CB(_devcb) \
- devcb = &namco_51xx_device::set_input_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_51xx_device::set_input_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_51XX_INPUT_3_CB(_devcb) \
- devcb = &namco_51xx_device::set_input_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_51xx_device::set_input_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_51XX_OUTPUT_0_CB(_devcb) \
- devcb = &namco_51xx_device::set_output_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_51xx_device::set_output_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_51XX_OUTPUT_1_CB(_devcb) \
- devcb = &namco_51xx_device::set_output_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_51xx_device::set_output_callback<1>(*device, DEVCB_##_devcb);
class namco_51xx_device : public device_t
{
public:
namco_51xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_0.set_callback(object); }
- template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_1.set_callback(object); }
- template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_2.set_callback(object); }
- template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_in_3.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_input_callback(device_t &device, Object &&cb) { return downcast<namco_51xx_device &>(device).m_in[N].set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_0.set_callback(object); }
- template<class _Object> static devcb_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_51xx_device &>(device).m_out_1.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_output_callback(device_t &device, Object &&cb) { return downcast<namco_51xx_device &>(device).m_out[N].set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
@@ -52,12 +50,8 @@ protected:
private:
// internal state
required_device<mb88_cpu_device> m_cpu;
- devcb_read8 m_in_0;
- devcb_read8 m_in_1;
- devcb_read8 m_in_2;
- devcb_read8 m_in_3;
- devcb_write8 m_out_0;
- devcb_write8 m_out_1;
+ devcb_read8 m_in[4];
+ devcb_write8 m_out[2];
int32_t m_lastcoins;
int32_t m_lastbuttons;
@@ -71,8 +65,7 @@ private:
int32_t m_remap_joy;
};
-extern const device_type NAMCO_51XX;
-
+DECLARE_DEVICE_TYPE(NAMCO_51XX, namco_51xx_device)
-#endif /* NAMCO51_H */
+#endif // NAMCO_51XX
diff --git a/src/mame/machine/namco53.cpp b/src/mame/machine/namco53.cpp
index a76388149f1..1b183a614a9 100644
--- a/src/mame/machine/namco53.cpp
+++ b/src/mame/machine/namco53.cpp
@@ -59,7 +59,8 @@
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
+
READ8_MEMBER( namco_53xx_device::K_r )
{
@@ -68,14 +69,7 @@ READ8_MEMBER( namco_53xx_device::K_r )
READ8_MEMBER( namco_53xx_device::Rx_r )
{
- switch(offset) {
- case 0 : return m_in_0(0);
- case 1 : return m_in_1(0);
- case 2 : return m_in_2(0);
- case 3 : return m_in_3(0);
- default : return 0xff;
- }
-
+ return (offset < ARRAY_LENGTH(m_in)) ? m_in[offset](0) : 0xff;
}
WRITE8_MEMBER( namco_53xx_device::O_w )
@@ -143,17 +137,14 @@ ROM_START( namco_53xx )
ROM_LOAD( "53xx.bin", 0x0000, 0x0400, CRC(b326fecb) SHA1(758d8583d658e4f1df93184009d86c3eb8713899) )
ROM_END
-const device_type NAMCO_53XX = device_creator<namco_53xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_53XX, namco_53xx_device, "namco53", "Namco 53xx")
namco_53xx_device::namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_53XX, "Namco 53xx", tag, owner, clock, "namco53", __FILE__),
+ : device_t(mconfig, NAMCO_53XX, tag, owner, clock),
m_cpu(*this, "mcu"),
m_portO(0),
m_k(*this),
- m_in_0(*this),
- m_in_1(*this),
- m_in_2(*this),
- m_in_3(*this),
+ m_in{ { *this }, { *this }, { *this }, { *this } },
m_p(*this)
{
}
@@ -165,10 +156,8 @@ void namco_53xx_device::device_start()
{
/* resolve our read/write callbacks */
m_k.resolve_safe(0);
- m_in_0.resolve_safe(0);
- m_in_1.resolve_safe(0);
- m_in_2.resolve_safe(0);
- m_in_3.resolve_safe(0);
+ for (devcb_read8 &cb : m_in)
+ cb.resolve_safe(0);
m_p.resolve_safe();
save_item(NAME(m_portO));
diff --git a/src/mame/machine/namco53.h b/src/mame/machine/namco53.h
index ba23efe4123..3526fb9176a 100644
--- a/src/mame/machine/namco53.h
+++ b/src/mame/machine/namco53.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
-#ifndef NAMCO53_H
-#define NAMCO53_H
+#ifndef MAME_MACHINE_NAMCO53_H
+#define MAME_MACHINE_NAMCO53_H
+
+#pragma once
#include "cpu/mb88xx/mb88xx.h"
@@ -12,16 +14,16 @@
devcb = &namco_53xx_device::set_k_port_callback(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_53XX_INPUT_0_CB(_devcb) \
- devcb = &namco_53xx_device::set_input_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_53xx_device::set_input_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_53XX_INPUT_1_CB(_devcb) \
- devcb = &namco_53xx_device::set_input_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_53xx_device::set_input_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_53XX_INPUT_2_CB(_devcb) \
- devcb = &namco_53xx_device::set_input_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_53xx_device::set_input_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_53XX_INPUT_3_CB(_devcb) \
- devcb = &namco_53xx_device::set_input_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_53xx_device::set_input_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_53XX_P_CB(_devcb) \
devcb = &namco_53xx_device::set_p_port_callback(*device, DEVCB_##_devcb);
@@ -32,13 +34,10 @@ class namco_53xx_device : public device_t
public:
namco_53xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_0.set_callback(object); }
- template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_1.set_callback(object); }
- template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_2.set_callback(object); }
- template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_in_3.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_input_callback(device_t &device, Object &&cb) { return downcast<namco_53xx_device &>(device).m_in[N].set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_k_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_k.set_callback(object); }
- template<class _Object> static devcb_base &set_p_port_callback(device_t &device, _Object object) { return downcast<namco_53xx_device &>(device).m_p.set_callback(object); }
+ template <class Object> static devcb_base &set_k_port_callback(device_t &device, Object &&cb) { return downcast<namco_53xx_device &>(device).m_k.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_p_port_callback(device_t &device, Object &&cb) { return downcast<namco_53xx_device &>(device).m_p.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( K_r );
DECLARE_READ8_MEMBER( Rx_r );
@@ -60,16 +59,12 @@ private:
required_device<mb88_cpu_device> m_cpu;
uint8_t m_portO;
devcb_read8 m_k;
- devcb_read8 m_in_0;
- devcb_read8 m_in_1;
- devcb_read8 m_in_2;
- devcb_read8 m_in_3;
+ devcb_read8 m_in[4];
devcb_write8 m_p;
};
-extern const device_type NAMCO_53XX;
-
+DECLARE_DEVICE_TYPE(NAMCO_53XX, namco_53xx_device)
-#endif /* NAMCO53_H */
+#endif // MAME_MACHINE_NAMCO53_H
diff --git a/src/mame/machine/namco62.cpp b/src/mame/machine/namco62.cpp
index 4ef3d0e79e7..680b1223f37 100644
--- a/src/mame/machine/namco62.cpp
+++ b/src/mame/machine/namco62.cpp
@@ -15,7 +15,7 @@
#include "machine/namco62.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
/***************************************************************************
@@ -42,17 +42,13 @@ ROM_START( namco_62xx )
ROM_END
-const device_type NAMCO_62XX = device_creator<namco_62xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_62XX, namco_62xx_device, "namco62", "Namco 62xx")
namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_62XX, "Namco 62xx", tag, owner, clock, "namco62", __FILE__),
+ : device_t(mconfig, NAMCO_62XX, tag, owner, clock),
m_cpu(*this, "mcu"),
- m_in_0(*this),
- m_in_1(*this),
- m_in_2(*this),
- m_in_3(*this),
- m_out_0(*this),
- m_out_1(*this)
+ m_in{ { *this }, { *this }, { *this }, { *this } },
+ m_out{ { *this }, { *this } }
{
}
@@ -63,14 +59,12 @@ namco_62xx_device::namco_62xx_device(const machine_config &mconfig, const char *
void namco_62xx_device::device_start()
{
/* resolve our read callbacks */
- m_in_0.resolve_safe(0);
- m_in_1.resolve_safe(0);
- m_in_2.resolve_safe(0);
- m_in_3.resolve_safe(0);
+ for (devcb_read8 &cb : m_in)
+ cb.resolve_safe(0);
/* resolve our write callbacks */
- m_out_0.resolve_safe();
- m_out_1.resolve_safe();
+ for (devcb_write8 &cb : m_out)
+ cb.resolve_safe();
}
//-------------------------------------------------
diff --git a/src/mame/machine/namco62.h b/src/mame/machine/namco62.h
index e41af64a221..d21f186a6e5 100644
--- a/src/mame/machine/namco62.h
+++ b/src/mame/machine/namco62.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Philip Bennett
-#ifndef NAMCO62_H
-#define NAMCO62_H
+#ifndef MAME_MACHINE_NAMCO62_H
+#define MAME_MACHINE_NAMCO62_H
#include "cpu/mb88xx/mb88xx.h"
@@ -9,22 +9,22 @@
MCFG_DEVICE_ADD(_tag, NAMCO_62XX, _clock)
#define MCFG_NAMCO_62XX_INPUT_0_CB(_devcb) \
- devcb = &namco_62xx_device::set_input_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_62xx_device::set_input_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_62XX_INPUT_1_CB(_devcb) \
- devcb = &namco_62xx_device::set_input_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_62xx_device::set_input_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_62XX_INPUT_2_CB(_devcb) \
- devcb = &namco_62xx_device::set_input_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_62xx_device::set_input_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_62XX_INPUT_3_CB(_devcb) \
- devcb = &namco_62xx_device::set_input_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_62xx_device::set_input_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_62XX_OUTPUT_0_CB(_devcb) \
- devcb = &namco_62xx_device::set_output_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_62xx_device::set_output_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO_62XX_OUTPUT_1_CB(_devcb) \
- devcb = &namco_62xx_device::set_output_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco_62xx_device::set_output_callback<1>(*device, DEVCB_##_devcb);
class namco_62xx_device : public device_t
@@ -32,13 +32,9 @@ class namco_62xx_device : public device_t
public:
namco_62xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_input_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_0.set_callback(object); }
- template<class _Object> static devcb_base &set_input_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_1.set_callback(object); }
- template<class _Object> static devcb_base &set_input_2_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_2.set_callback(object); }
- template<class _Object> static devcb_base &set_input_3_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_in_3.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_input_callback(device_t &device, Object &&cb) { return downcast<namco_62xx_device &>(device).m_in[N].set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_output_0_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_0.set_callback(object); }
- template<class _Object> static devcb_base &set_output_1_callback(device_t &device, _Object object) { return downcast<namco_62xx_device &>(device).m_out_1.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_output_callback(device_t &device, Object &&cb) { return downcast<namco_62xx_device &>(device).m_out[N].set_callback(std::forward<Object>(cb)); }
protected:
// device-level overrides
virtual void device_start() override;
@@ -48,14 +44,10 @@ protected:
private:
// internal state
required_device<mb88_cpu_device> m_cpu;
- devcb_read8 m_in_0;
- devcb_read8 m_in_1;
- devcb_read8 m_in_2;
- devcb_read8 m_in_3;
- devcb_write8 m_out_0;
- devcb_write8 m_out_1;
+ devcb_read8 m_in[4];
+ devcb_write8 m_out[2];
};
-extern const device_type NAMCO_62XX;
+DECLARE_DEVICE_TYPE(NAMCO_62XX, namco_62xx_device)
-#endif /* NAMCO62_H */
+#endif // MAME_MACHINE_NAMCO62_H
diff --git a/src/mame/machine/namco_c139.cpp b/src/mame/machine/namco_c139.cpp
index 9581a8325b0..ac8b9216a28 100644
--- a/src/mame/machine/namco_c139.cpp
+++ b/src/mame/machine/namco_c139.cpp
@@ -21,7 +21,7 @@
//**************************************************************************
// device type definition
-const device_type NAMCO_C139 = device_creator<namco_c139_device>;
+DEFINE_DEVICE_TYPE(NAMCO_C139, namco_c139_device, "namco_c139", "Namco C139 Serial")
//**************************************************************************
@@ -45,7 +45,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
namco_c139_device::namco_c139_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_C139, "namco_c139_longname", tag, owner, clock, "namco_c139", __FILE__),
+ : device_t(mconfig, NAMCO_C139, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_space_config("data", ENDIANNESS_BIG, 16, 14, 0, *ADDRESS_MAP_NAME(data_map))
{
diff --git a/src/mame/machine/namco_c139.h b/src/mame/machine/namco_c139.h
index bee3f51a6a3..7eb5f117978 100644
--- a/src/mame/machine/namco_c139.h
+++ b/src/mame/machine/namco_c139.h
@@ -5,11 +5,11 @@
Namco C139 - Serial I/F Controller
***************************************************************************/
+#ifndef MAME_MACHINE_NAMCO_C139_H
+#define MAME_MACHINE_NAMCO_C139_H
#pragma once
-#ifndef __NAMCO_C139DEV_H__
-#define __NAMCO_C139DEV_H__
@@ -54,7 +54,7 @@ private:
// device type definition
-extern const device_type NAMCO_C139;
+DECLARE_DEVICE_TYPE(NAMCO_C139, namco_c139_device)
@@ -64,4 +64,4 @@ extern const device_type NAMCO_C139;
-#endif
+#endif // MAME_MACHINE_NAMCO_C139_H
diff --git a/src/mame/machine/namco_c148.cpp b/src/mame/machine/namco_c148.cpp
index ab8470b67eb..491daef7496 100644
--- a/src/mame/machine/namco_c148.cpp
+++ b/src/mame/machine/namco_c148.cpp
@@ -9,7 +9,7 @@
Based off implementation from K.Wilkins and Phil Stroffolino
TODO:
- - hookup C116 device, @see mame/includes/namcoic.h
+ - hookup C116 device, @see mame/machine/namcoic.h
=============================================================================
Interrupt Controller C148 1C0000-1FFFFF R/W D00-D02
@@ -45,7 +45,7 @@ Interrupt Controller C148 1C0000-1FFFFF R/W D00-D02
#include "namco_c148.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) printf x; } while (0)
+#include "logmacro.h"
@@ -54,7 +54,7 @@ Interrupt Controller C148 1C0000-1FFFFF R/W D00-D02
//**************************************************************************
// device type definition
-const device_type NAMCO_C148 = device_creator<namco_c148_device>;
+DEFINE_DEVICE_TYPE(NAMCO_C148, namco_c148_device, "namco_c148", "Namco C148 Interrupt Controller")
//**************************************************************************
@@ -66,7 +66,7 @@ const device_type NAMCO_C148 = device_creator<namco_c148_device>;
//-------------------------------------------------
namco_c148_device::namco_c148_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_C148, "Namco C148 Interrupt Controller", tag, owner, clock, "namco_c148", __FILE__),
+ : device_t(mconfig, NAMCO_C148, tag, owner, clock),
m_out_ext1_cb(*this),
m_out_ext2_cb(*this),
m_hostcpu_tag(nullptr),
@@ -154,11 +154,11 @@ inline void namco_c148_device::flush_irq_acks()
m_hostcpu->set_input_line(i,CLEAR_LINE);
}
-WRITE8_MEMBER( namco_c148_device::pos_irq_level_w ) { m_irqlevel.pos = data & 7; flush_irq_acks(); if(data != 0) { LOG(("%s: pos IRQ level = %02x\n",this->tag(),data)); } }
-WRITE8_MEMBER( namco_c148_device::vblank_irq_level_w ) { m_irqlevel.vblank = data & 7; flush_irq_acks(); LOG(("%s: vblank IRQ level = %02x\n",this->tag(),data)); }
-WRITE8_MEMBER( namco_c148_device::cpu_irq_level_w ) { m_irqlevel.cpu = data & 7; flush_irq_acks(); LOG(("%s: cpu IRQ level = %02x\n",this->tag(),data)); }
-WRITE8_MEMBER( namco_c148_device::ex_irq_level_w ) { m_irqlevel.ex = data & 7; flush_irq_acks(); LOG(("%s: ex IRQ level = %02x\n",this->tag(),data)); }
-WRITE8_MEMBER( namco_c148_device::sci_irq_level_w ) { m_irqlevel.sci = data & 7; flush_irq_acks(); LOG(("%s: sci IRQ level = %02x\n",this->tag(),data)); }
+WRITE8_MEMBER( namco_c148_device::pos_irq_level_w ) { m_irqlevel.pos = data & 7; flush_irq_acks(); if(data != 0) { LOG("%s: pos IRQ level = %02x\n",data); } }
+WRITE8_MEMBER( namco_c148_device::vblank_irq_level_w ) { m_irqlevel.vblank = data & 7; flush_irq_acks(); LOG("%s: vblank IRQ level = %02x\n",data); }
+WRITE8_MEMBER( namco_c148_device::cpu_irq_level_w ) { m_irqlevel.cpu = data & 7; flush_irq_acks(); LOG("%s: cpu IRQ level = %02x\n",data); }
+WRITE8_MEMBER( namco_c148_device::ex_irq_level_w ) { m_irqlevel.ex = data & 7; flush_irq_acks(); LOG("%s: ex IRQ level = %02x\n",data); }
+WRITE8_MEMBER( namco_c148_device::sci_irq_level_w ) { m_irqlevel.sci = data & 7; flush_irq_acks(); LOG("%s: sci IRQ level = %02x\n",data); }
READ16_MEMBER( namco_c148_device::vblank_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.vblank, CLEAR_LINE); return 0; }
READ16_MEMBER( namco_c148_device::pos_irq_ack_r ) { m_hostcpu->set_input_line(m_irqlevel.pos, CLEAR_LINE); return 0; }
diff --git a/src/mame/machine/namco_c148.h b/src/mame/machine/namco_c148.h
index 7b920708e2b..4da06b3df38 100644
--- a/src/mame/machine/namco_c148.h
+++ b/src/mame/machine/namco_c148.h
@@ -5,11 +5,11 @@
Namco C148 - CPU Bus Manager
***************************************************************************/
+#ifndef MAME_MACHINE_NAMCO_C148_H
+#define MAME_MACHINE_NAMCO_C148_H
#pragma once
-#ifndef __NAMCO_C148DEV_H__
-#define __NAMCO_C148DEV_H__
@@ -130,7 +130,7 @@ private:
// device type definition
-extern const device_type NAMCO_C148;
+DECLARE_DEVICE_TYPE(NAMCO_C148, namco_c148_device)
@@ -140,4 +140,4 @@ extern const device_type NAMCO_C148;
-#endif
+#endif // MAME_MACHINE_NAMCO_C148_H
diff --git a/src/mame/machine/namco_settings.cpp b/src/mame/machine/namco_settings.cpp
index 7d3a4c1a82b..1df580b9574 100644
--- a/src/mame/machine/namco_settings.cpp
+++ b/src/mame/machine/namco_settings.cpp
@@ -3,10 +3,10 @@
#include "emu.h"
#include "namco_settings.h"
-const device_type NAMCO_SETTINGS = device_creator<namco_settings_device>;
+DEFINE_DEVICE_TYPE(NAMCO_SETTINGS, namco_settings_device, "namco_settings", "Namco Settings")
namco_settings_device::namco_settings_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, NAMCO_SETTINGS, "Namco Settings", tag, owner, clock, "namco_settings", __FILE__)
+ device_t(mconfig, NAMCO_SETTINGS, tag, owner, clock)
{
}
diff --git a/src/mame/machine/namco_settings.h b/src/mame/machine/namco_settings.h
index 7f8c8b4826b..bc25f7db48e 100644
--- a/src/mame/machine/namco_settings.h
+++ b/src/mame/machine/namco_settings.h
@@ -3,8 +3,10 @@
// Namco system 12/23 settings device
-#ifndef __NAMCO_SETTINGS_H__
-#define __NAMCO_SETTINGS_H__
+#ifndef MAME_MACHINE_NAMCO_SETTINGS_H
+#define MAME_MACHINE_NAMCO_SETTINGS_H
+
+#pragma once
#define MCFG_NAMCO_SETTINGS_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, NAMCO_SETTINGS, 0)
@@ -27,6 +29,6 @@ private:
uint8_t adr, value;
};
-extern const device_type NAMCO_SETTINGS;
+DECLARE_DEVICE_TYPE(NAMCO_SETTINGS, namco_settings_device)
-#endif
+#endif // MAME_MACHINE_NAMCO_SETTINGS_H
diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp
index 89edb72d9bd..292e22f02de 100644
--- a/src/mame/machine/namcoic.cpp
+++ b/src/mame/machine/namcoic.cpp
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Phil Stroffolino
#include "emu.h"
+#include "machine/namcoic.h"
+
#include "includes/namcos2.h" /* for game-specific hacks */
-#include "includes/namcoic.h"
/**************************************************************************************/
diff --git a/src/mame/includes/namcoic.h b/src/mame/machine/namcoic.h
index 7a74112b3b1..8d69e541eef 100644
--- a/src/mame/includes/namcoic.h
+++ b/src/mame/machine/namcoic.h
@@ -90,14 +90,13 @@ C102 - Controls CPU access to ROZ Memory Area.
/***********************************************************************************/
-#pragma once
-
-#ifndef __NAMCOIC_H__
-#define __NAMCOIC_H__
+#ifndef MAME_MACHINE_NAMCOIC_H
+#define MAME_MACHINE_NAMCOIC_H
+#pragma once
/***********************************************************************************/
-#endif
+#endif // MAME_MACHINE_NAMCOIC_H
diff --git a/src/mame/machine/namcoio.cpp b/src/mame/machine/namcoio.cpp
index b4a32041a0e..c94ec7d6dba 100644
--- a/src/mame/machine/namcoio.cpp
+++ b/src/mame/machine/namcoio.cpp
@@ -115,40 +115,34 @@ TODO:
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-const device_type NAMCO56XX = device_creator<namco56xx_device>;
-const device_type NAMCO58XX = device_creator<namco58xx_device>;
-const device_type NAMCO59XX = device_creator<namco59xx_device>;
+DEFINE_DEVICE_TYPE(NAMCO_56XX, namco56xx_device, "namco56", "Namco 56xx I/O")
+DEFINE_DEVICE_TYPE(NAMCO_58XX, namco58xx_device, "namco58", "Namco 58xx I/O")
+DEFINE_DEVICE_TYPE(NAMCO_59XX, namco59xx_device, "namco59", "Namco 59xx I/O")
-namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, uint32_t clock, const char *shortname)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
- m_in_0_cb(*this),
- m_in_1_cb(*this),
- m_in_2_cb(*this),
- m_in_3_cb(*this),
- m_out_0_cb(*this),
- m_out_1_cb(*this)
+namcoio_device::namcoio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int device_type)
+ : device_t(mconfig, type, tag, owner, clock)
+ , m_in_cb{ { *this }, { *this }, { *this }, { *this } }
+ , m_out_cb{ { *this }, { *this } }
+ //, m_device_type(device_type)
{
}
namco56xx_device::namco56xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : namcoio_device(mconfig, NAMCO56XX, "Namco 56xx", tag, owner, clock, "56xx")
+ : namcoio_device(mconfig, NAMCO_56XX, tag, owner, clock, TYPE_NAMCO56XX)
{
- m_device_type = TYPE_NAMCO56XX;
}
namco58xx_device::namco58xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : namcoio_device(mconfig, NAMCO58XX, "Namco 58xx", tag, owner, clock, "58xx")
+ : namcoio_device(mconfig, NAMCO_58XX, tag, owner, clock, TYPE_NAMCO58XX)
{
- m_device_type = TYPE_NAMCO58XX;
}
namco59xx_device::namco59xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : namcoio_device(mconfig, NAMCO59XX, "Namco 59xx", tag, owner, clock, "59xx")
+ : namcoio_device(mconfig, NAMCO_59XX, tag, owner, clock, TYPE_NAMCO59XX)
{
- m_device_type = TYPE_NAMCO59XX;
}
//-------------------------------------------------
@@ -157,12 +151,10 @@ namco59xx_device::namco59xx_device(const machine_config &mconfig, const char *ta
void namcoio_device::device_start()
{
- m_in_0_cb.resolve_safe(0);
- m_in_1_cb.resolve_safe(0);
- m_in_2_cb.resolve_safe(0);
- m_in_3_cb.resolve_safe(0);
- m_out_0_cb.resolve_safe();
- m_out_1_cb.resolve_safe();
+ for (devcb_read8 &cb : m_in_cb)
+ cb.resolve_safe(0);
+ for (devcb_write8 &cb : m_out_cb)
+ cb.resolve_safe();
save_item(NAME(m_ram));
save_item(NAME(m_reset));
@@ -203,7 +195,7 @@ void namcoio_device::handle_coins( int swap )
//popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15));
- val = ~m_in_0_cb(0 & 0x0f); // pins 38-41
+ val = ~m_in_cb[0](0 & 0x0f); // pins 38-41
toggled = val ^ m_lastcoins;
m_lastcoins = val;
@@ -235,7 +227,7 @@ void namcoio_device::handle_coins( int swap )
credit_add = 1;
}
- val = ~m_in_3_cb(0 & 0x0f); // pins 30-33
+ val = ~m_in_cb[3](0 & 0x0f); // pins 30-33
toggled = val ^ m_lastbuttons;
m_lastbuttons = val;
@@ -259,10 +251,10 @@ void namcoio_device::handle_coins( int swap )
IORAM_WRITE(1 ^ swap, m_credits % 10); // BCD credits
IORAM_WRITE(2 ^ swap, credit_add); // credit increment (coin inputs)
IORAM_WRITE(3 ^ swap, credit_sub); // credit decrement (start buttons)
- IORAM_WRITE(4, ~m_in_1_cb(0 & 0x0f)); // pins 22-25
+ IORAM_WRITE(4, ~m_in_cb[1](0 & 0x0f)); // pins 22-25
button = ((val & 0x05) << 1) | (val & toggled & 0x05);
IORAM_WRITE(5, button); // pins 30 & 32 normal and impulse
- IORAM_WRITE(6, ~m_in_2_cb(0 & 0x0f)); // pins 26-29
+ IORAM_WRITE(6, ~m_in_cb[2](0 & 0x0f)); // pins 26-29
button = (val & 0x0a) | ((val & toggled & 0x0a) >> 1);
IORAM_WRITE(7, button); // pins 31 & 33 normal and impulse
}
@@ -270,7 +262,7 @@ void namcoio_device::handle_coins( int swap )
void namco56xx_device::customio_run()
{
- LOG(("execute 56XX mode %d\n", IORAM_READ(8)));
+ LOG("execute 56XX mode %d\n", IORAM_READ(8));
switch (IORAM_READ(8))
{
@@ -278,15 +270,15 @@ void namco56xx_device::customio_run()
break;
case 1: // read switch inputs
- IORAM_WRITE(0, ~m_in_0_cb(0 & 0x0f)); // pins 38-41
- IORAM_WRITE(1, ~m_in_1_cb(0 & 0x0f)); // pins 22-25
- IORAM_WRITE(2, ~m_in_2_cb(0 & 0x0f)); // pins 26-29
- IORAM_WRITE(3, ~m_in_3_cb(0 & 0x0f)); // pins 30-33
+ IORAM_WRITE(0, ~m_in_cb[0](0 & 0x0f)); // pins 38-41
+ IORAM_WRITE(1, ~m_in_cb[1](0 & 0x0f)); // pins 22-25
+ IORAM_WRITE(2, ~m_in_cb[2](0 & 0x0f)); // pins 26-29
+ IORAM_WRITE(3, ~m_in_cb[3](0 & 0x0f)); // pins 30-33
//popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15));
- m_out_0_cb((offs_t)0, IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus)
- m_out_1_cb((offs_t)0, IORAM_READ(10)); // output to pins 17-20 (gaplus)
+ m_out_cb[0]((offs_t)0, IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus)
+ m_out_cb[1]((offs_t)0, IORAM_READ(10)); // output to pins 17-20 (gaplus)
break;
case 2: // initialize coinage settings
@@ -329,16 +321,16 @@ void namco56xx_device::customio_run()
break;
case 9: // read dip switches and inputs
- m_out_0_cb((offs_t)0, 0 & 0x0f); // set pin 13 = 0
- IORAM_WRITE(0, ~m_in_0_cb(0 & 0x0f)); // pins 38-41, pin 13 = 0
- IORAM_WRITE(2, ~m_in_1_cb(0 & 0x0f)); // pins 22-25, pin 13 = 0
- IORAM_WRITE(4, ~m_in_2_cb(0 & 0x0f)); // pins 26-29, pin 13 = 0
- IORAM_WRITE(6, ~m_in_3_cb(0 & 0x0f)); // pins 30-33, pin 13 = 0
- m_out_0_cb((offs_t)0, 1 & 0x0f); // set pin 13 = 1
- IORAM_WRITE(1, ~m_in_0_cb(0 & 0x0f)); // pins 38-41, pin 13 = 1
- IORAM_WRITE(3, ~m_in_1_cb(0 & 0x0f)); // pins 22-25, pin 13 = 1
- IORAM_WRITE(5, ~m_in_2_cb(0 & 0x0f)); // pins 26-29, pin 13 = 1
- IORAM_WRITE(7, ~m_in_3_cb(0 & 0x0f)); // pins 30-33, pin 13 = 1
+ m_out_cb[0]((offs_t)0, 0 & 0x0f); // set pin 13 = 0
+ IORAM_WRITE(0, ~m_in_cb[0](0 & 0x0f)); // pins 38-41, pin 13 = 0
+ IORAM_WRITE(2, ~m_in_cb[1](0 & 0x0f)); // pins 22-25, pin 13 = 0
+ IORAM_WRITE(4, ~m_in_cb[2](0 & 0x0f)); // pins 26-29, pin 13 = 0
+ IORAM_WRITE(6, ~m_in_cb[3](0 & 0x0f)); // pins 30-33, pin 13 = 0
+ m_out_cb[0]((offs_t)0, 1 & 0x0f); // set pin 13 = 1
+ IORAM_WRITE(1, ~m_in_cb[0](0 & 0x0f)); // pins 38-41, pin 13 = 1
+ IORAM_WRITE(3, ~m_in_cb[1](0 & 0x0f)); // pins 22-25, pin 13 = 1
+ IORAM_WRITE(5, ~m_in_cb[2](0 & 0x0f)); // pins 26-29, pin 13 = 1
+ IORAM_WRITE(7, ~m_in_cb[3](0 & 0x0f)); // pins 30-33, pin 13 = 1
break;
default:
@@ -350,7 +342,7 @@ void namco56xx_device::customio_run()
void namco59xx_device::customio_run()
{
- LOG(("execute 59XX mode %d\n", IORAM_READ(8)));
+ LOG("execute 59XX mode %d\n", IORAM_READ(8));
switch (IORAM_READ(8))
{
@@ -358,10 +350,10 @@ void namco59xx_device::customio_run()
break;
case 3: // pacnpal chip #1: read dip switches and inputs
- IORAM_WRITE(4, ~m_in_0_cb(0 & 0x0f)); // pins 38-41, pin 13 = 0 ?
- IORAM_WRITE(5, ~m_in_2_cb(0 & 0x0f)); // pins 26-29 ?
- IORAM_WRITE(6, ~m_in_1_cb(0 & 0x0f)); // pins 22-25 ?
- IORAM_WRITE(7, ~m_in_3_cb(0 & 0x0f)); // pins 30-33
+ IORAM_WRITE(4, ~m_in_cb[0](0 & 0x0f)); // pins 38-41, pin 13 = 0 ?
+ IORAM_WRITE(5, ~m_in_cb[2](0 & 0x0f)); // pins 26-29 ?
+ IORAM_WRITE(6, ~m_in_cb[1](0 & 0x0f)); // pins 22-25 ?
+ IORAM_WRITE(7, ~m_in_cb[3](0 & 0x0f)); // pins 30-33
break;
default:
@@ -373,7 +365,7 @@ void namco59xx_device::customio_run()
void namco58xx_device::customio_run()
{
- LOG(("execute 58XX mode %d\n", IORAM_READ(8)));
+ LOG("execute 58XX mode %d\n", IORAM_READ(8));
switch (IORAM_READ(8))
{
@@ -381,15 +373,15 @@ void namco58xx_device::customio_run()
break;
case 1: // read switch inputs
- IORAM_WRITE(4, ~m_in_0_cb(0 & 0x0f)); // pins 38-41
- IORAM_WRITE(5, ~m_in_1_cb(0 & 0x0f)); // pins 22-25
- IORAM_WRITE(6, ~m_in_2_cb(0 & 0x0f)); // pins 26-29
- IORAM_WRITE(7, ~m_in_3_cb(0 & 0x0f)); // pins 30-33
+ IORAM_WRITE(4, ~m_in_cb[0](0 & 0x0f)); // pins 38-41
+ IORAM_WRITE(5, ~m_in_cb[1](0 & 0x0f)); // pins 22-25
+ IORAM_WRITE(6, ~m_in_cb[2](0 & 0x0f)); // pins 26-29
+ IORAM_WRITE(7, ~m_in_cb[3](0 & 0x0f)); // pins 30-33
//popmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15));
- m_out_0_cb((offs_t)0, IORAM_READ(9)); // output to pins 13-16 (toypop)
- m_out_1_cb((offs_t)0, IORAM_READ(10)); // output to pins 17-20 (toypop)
+ m_out_cb[0]((offs_t)0, IORAM_READ(9)); // output to pins 13-16 (toypop)
+ m_out_cb[1]((offs_t)0, IORAM_READ(10)); // output to pins 17-20 (toypop)
break;
case 2: // initialize coinage settings
@@ -407,16 +399,16 @@ void namco58xx_device::customio_run()
break;
case 4: // read dip switches and inputs
- m_out_0_cb((offs_t)0, 0 & 0x0f); // set pin 13 = 0
- IORAM_WRITE(0, ~m_in_0_cb(0 & 0x0f)); // pins 38-41, pin 13 = 0
- IORAM_WRITE(2, ~m_in_1_cb(0 & 0x0f)); // pins 22-25, pin 13 = 0
- IORAM_WRITE(4, ~m_in_2_cb(0 & 0x0f)); // pins 26-29, pin 13 = 0
- IORAM_WRITE(6, ~m_in_3_cb(0 & 0x0f)); // pins 30-33, pin 13 = 0
- m_out_0_cb((offs_t)0, 1 & 0x0f); // set pin 13 = 1
- IORAM_WRITE(1, ~m_in_0_cb(0 & 0x0f)); // pins 38-41, pin 13 = 1
- IORAM_WRITE(3, ~m_in_1_cb(0 & 0x0f)); // pins 22-25, pin 13 = 1
- IORAM_WRITE(5, ~m_in_2_cb(0 & 0x0f)); // pins 26-29, pin 13 = 1
- IORAM_WRITE(7, ~m_in_3_cb(0 & 0x0f)); // pins 30-33, pin 13 = 1
+ m_out_cb[0]((offs_t)0, 0 & 0x0f); // set pin 13 = 0
+ IORAM_WRITE(0, ~m_in_cb[0](0 & 0x0f)); // pins 38-41, pin 13 = 0
+ IORAM_WRITE(2, ~m_in_cb[1](0 & 0x0f)); // pins 22-25, pin 13 = 0
+ IORAM_WRITE(4, ~m_in_cb[2](0 & 0x0f)); // pins 26-29, pin 13 = 0
+ IORAM_WRITE(6, ~m_in_cb[3](0 & 0x0f)); // pins 30-33, pin 13 = 0
+ m_out_cb[0]((offs_t)0, 1 & 0x0f); // set pin 13 = 1
+ IORAM_WRITE(1, ~m_in_cb[0](0 & 0x0f)); // pins 38-41, pin 13 = 1
+ IORAM_WRITE(3, ~m_in_cb[1](0 & 0x0f)); // pins 22-25, pin 13 = 1
+ IORAM_WRITE(5, ~m_in_cb[2](0 & 0x0f)); // pins 26-29, pin 13 = 1
+ IORAM_WRITE(7, ~m_in_cb[3](0 & 0x0f)); // pins 30-33, pin 13 = 1
break;
case 5: // bootup check
@@ -483,7 +475,7 @@ READ8_MEMBER( namcoio_device::read )
// RAM is 4-bit wide; Pac & Pal requires the | 0xf0 otherwise Easter egg doesn't work
offset &= 0x3f;
-// LOG(("%04x: I/O read: mode %d, offset %d = %02x\n", space.device().safe_pc(), offset / 16, namcoio_ram[(offset & 0x30) + 8], offset & 0x0f, namcoio_ram[offset]&0x0f));
+// LOG("%04x: I/O read: mode %d, offset %d = %02x\n", space.device().safe_pc(), offset / 16, namcoio_ram[(offset & 0x30) + 8], offset & 0x0f, namcoio_ram[offset]&0x0f);
return 0xf0 | m_ram[offset];
}
@@ -493,7 +485,7 @@ WRITE8_MEMBER( namcoio_device::write )
offset &= 0x3f;
data &= 0x0f; // RAM is 4-bit wide
-// LOG(("%04x: I/O write %d: offset %d = %02x\n", space.device().safe_pc(), offset / 16, offset & 0x0f, data));
+// LOG("%04x: I/O write %d: offset %d = %02x\n", space.device().safe_pc(), offset / 16, offset & 0x0f, data);
m_ram[offset] = data;
}
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index 40b8ac15b76..2dece40ec90 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __NAMCOIO_H__
-#define __NAMCOIO_H__
+#ifndef MAME_MACHINE_NAMCOIO_H
+#define MAME_MACHINE_NAMCOIO_H
/***************************************************************************
@@ -11,14 +11,8 @@
class namcoio_device : public device_t
{
public:
- namcoio_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, uint32_t clock, const char *shortname);
-
- template<class _Object> static devcb_base &set_in_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_in_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_in_2_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_in_3_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_in_3_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_0_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_1_callback(device_t &device, _Object object) { return downcast<namcoio_device &>(device).m_out_1_cb.set_callback(object); }
+ template <unsigned N, class Object> static devcb_base &set_in_callback(device_t &device, Object &&cb) { return downcast<namcoio_device &>(device).m_in_cb[N].set_callback(std::forward<Object>(cb)); }
+ template <unsigned N, class Object> static devcb_base &set_out_callback(device_t &device, Object &&cb) { return downcast<namcoio_device &>(device).m_out_cb[N].set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
@@ -27,13 +21,15 @@ public:
WRITE_LINE_MEMBER( set_reset_line );
READ_LINE_MEMBER( read_reset_line );
+ virtual void customio_run() = 0;
+
protected:
+ namcoio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int device_type);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
- int m_device_type;
-
enum {
TYPE_NAMCO56XX,
TYPE_NAMCO58XX,
@@ -43,12 +39,8 @@ protected:
// internal state
uint8_t m_ram[16];
- devcb_read8 m_in_0_cb;
- devcb_read8 m_in_1_cb;
- devcb_read8 m_in_2_cb;
- devcb_read8 m_in_3_cb;
- devcb_write8 m_out_0_cb;
- devcb_write8 m_out_1_cb;
+ devcb_read8 m_in_cb[4];
+ devcb_write8 m_out_cb[2];
int m_reset;
int32_t m_lastcoins, m_lastbuttons;
@@ -60,10 +52,8 @@ protected:
void handle_coins( int swap );
- virtual void customio_run() {}
-
private:
-
+ //int m_device_type;
};
class namco56xx_device : public namcoio_device
@@ -90,68 +80,68 @@ public:
virtual void customio_run() override;
};
-extern const device_type NAMCO56XX;
-extern const device_type NAMCO58XX;
-extern const device_type NAMCO59XX;
+DECLARE_DEVICE_TYPE(NAMCO_56XX, namco56xx_device)
+DECLARE_DEVICE_TYPE(NAMCO_58XX, namco58xx_device)
+DECLARE_DEVICE_TYPE(NAMCO_59XX, namco59xx_device)
/***************************************************************************
DEVICE CONFIGURATION MACROS
***************************************************************************/
#define MCFG_NAMCO56XX_IN_0_CB(_devcb) \
- devcb = &namco56xx_device::set_in_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco56xx_device::set_in_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO56XX_IN_1_CB(_devcb) \
- devcb = &namco56xx_device::set_in_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco56xx_device::set_in_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO56XX_IN_2_CB(_devcb) \
- devcb = &namco56xx_device::set_in_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco56xx_device::set_in_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO56XX_IN_3_CB(_devcb) \
- devcb = &namco56xx_device::set_in_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco56xx_device::set_in_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO56XX_OUT_0_CB(_devcb) \
- devcb = &namco56xx_device::set_out_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco56xx_device::set_out_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO56XX_OUT_1_CB(_devcb) \
- devcb = &namco56xx_device::set_out_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco56xx_device::set_out_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_0_CB(_devcb) \
- devcb = &namco58xx_device::set_in_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco58xx_device::set_in_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_1_CB(_devcb) \
- devcb = &namco58xx_device::set_in_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco58xx_device::set_in_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_2_CB(_devcb) \
- devcb = &namco58xx_device::set_in_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco58xx_device::set_in_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO58XX_IN_3_CB(_devcb) \
- devcb = &namco58xx_device::set_in_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco58xx_device::set_in_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO58XX_OUT_0_CB(_devcb) \
- devcb = &namco58xx_device::set_out_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco58xx_device::set_out_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO58XX_OUT_1_CB(_devcb) \
- devcb = &namco58xx_device::set_out_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco58xx_device::set_out_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_0_CB(_devcb) \
- devcb = &namco59xx_device::set_in_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco59xx_device::set_in_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_1_CB(_devcb) \
- devcb = &namco59xx_device::set_in_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco59xx_device::set_in_callback<1>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_2_CB(_devcb) \
- devcb = &namco59xx_device::set_in_2_callback(*device, DEVCB_##_devcb);
+ devcb = &namco59xx_device::set_in_callback<2>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO59XX_IN_3_CB(_devcb) \
- devcb = &namco59xx_device::set_in_3_callback(*device, DEVCB_##_devcb);
+ devcb = &namco59xx_device::set_in_callback<3>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO59XX_OUT_0_CB(_devcb) \
- devcb = &namco59xx_device::set_out_0_callback(*device, DEVCB_##_devcb);
+ devcb = &namco59xx_device::set_out_callback<0>(*device, DEVCB_##_devcb);
#define MCFG_NAMCO59XX_OUT_1_CB(_devcb) \
- devcb = &namco59xx_device::set_out_1_callback(*device, DEVCB_##_devcb);
+ devcb = &namco59xx_device::set_out_callback<1>(*device, DEVCB_##_devcb);
-#endif /* __NAMCOIO_H__ */
+#endif // MAME_MACHINE_NAMCOIO_H
diff --git a/src/mame/machine/namcoio_gearbox.cpp b/src/mame/machine/namcoio_gearbox.cpp
index 6e4d8096a7c..94855c8ab42 100644
--- a/src/mame/machine/namcoio_gearbox.cpp
+++ b/src/mame/machine/namcoio_gearbox.cpp
@@ -33,7 +33,7 @@
//**************************************************************************
// device type definition
-const device_type NAMCOIO_GEARBOX = device_creator<namcoio_gearbox_device>;
+DEFINE_DEVICE_TYPE(NAMCOIO_GEARBOX, namcoio_gearbox_device, "namcoio_gearbox", "Namco I/O Gearbox")
//**************************************************************************
@@ -45,7 +45,7 @@ const device_type NAMCOIO_GEARBOX = device_creator<namcoio_gearbox_device>;
//-------------------------------------------------
namcoio_gearbox_device::namcoio_gearbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCOIO_GEARBOX, "Namco I/O Gearbox", tag, owner, clock, "namcoio_gearbox", __FILE__)
+ : device_t(mconfig, NAMCOIO_GEARBOX, tag, owner, clock)
{
}
diff --git a/src/mame/machine/namcoio_gearbox.h b/src/mame/machine/namcoio_gearbox.h
index 5d80d09d8e4..d276a08c7a0 100644
--- a/src/mame/machine/namcoio_gearbox.h
+++ b/src/mame/machine/namcoio_gearbox.h
@@ -5,11 +5,11 @@
Namco 6-speed Gearbox device
***************************************************************************/
+#ifndef MAME_MACHINE_NAMCOIO_GEARBOX_H
+#define MAME_MACHINE_NAMCOIO_GEARBOX_H
#pragma once
-#ifndef __NAMCOIO_GEARBOXDEV_H__
-#define __NAMCOIO_GEARBOXDEV_H__
@@ -47,7 +47,7 @@ protected:
// device type definition
-extern const device_type NAMCOIO_GEARBOX;
+DECLARE_DEVICE_TYPE(NAMCOIO_GEARBOX, namcoio_gearbox_device)
@@ -57,4 +57,4 @@ extern const device_type NAMCOIO_GEARBOX;
-#endif
+#endif // MAME_MACHINE_NAMCOIO_GEARBOX_H
diff --git a/src/mame/machine/namcomcu.cpp b/src/mame/machine/namcomcu.cpp
index b49e53a1b7b..eb23789f6cb 100644
--- a/src/mame/machine/namcomcu.cpp
+++ b/src/mame/machine/namcomcu.cpp
@@ -16,11 +16,11 @@ C76 System 11
#include "namcomcu.h"
-const device_type NAMCO_C69 = device_creator<namco_c69_device>;
-const device_type NAMCO_C70 = device_creator<namco_c70_device>;
-const device_type NAMCO_C74 = device_creator<namco_c74_device>;
-const device_type NAMCO_C75 = device_creator<namco_c75_device>;
-const device_type NAMCO_C76 = device_creator<namco_c76_device>;
+DEFINE_DEVICE_TYPE(NAMCO_C69, namco_c69_device, "namcoc69", "Namco C69 (M37702)")
+DEFINE_DEVICE_TYPE(NAMCO_C70, namco_c70_device, "namcoc70", "Namco C70 (M37702)")
+DEFINE_DEVICE_TYPE(NAMCO_C74, namco_c74_device, "namcoc74", "Namco C74 (M37702)")
+DEFINE_DEVICE_TYPE(NAMCO_C75, namco_c75_device, "namcoc75", "Namco C75 (M37702)")
+DEFINE_DEVICE_TYPE(NAMCO_C76, namco_c76_device, "namcoc76", "Namco C76 (M37702)")
ROM_START( c69 )
@@ -54,27 +54,27 @@ ROM_END
namco_c69_device::namco_c69_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m37702m2_device(mconfig, NAMCO_C69, "C69 (M37702)", tag, owner, clock, "namcoc69", __FILE__)
+ : m37702m2_device(mconfig, NAMCO_C69, tag, owner, clock)
{
}
namco_c70_device::namco_c70_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m37702m2_device(mconfig, NAMCO_C70, "C70 (M37702)", tag, owner, clock, "namcoc70", __FILE__)
+ : m37702m2_device(mconfig, NAMCO_C70, tag, owner, clock)
{
}
namco_c74_device::namco_c74_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m37702m2_device(mconfig, NAMCO_C74, "C74 (M37702)", tag, owner, clock, "namcoc74", __FILE__)
+ : m37702m2_device(mconfig, NAMCO_C74, tag, owner, clock)
{
}
namco_c75_device::namco_c75_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m37702m2_device(mconfig, NAMCO_C75, "C75 (M37702)", tag, owner, clock, "namcoc75", __FILE__)
+ : m37702m2_device(mconfig, NAMCO_C75, tag, owner, clock)
{
}
namco_c76_device::namco_c76_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : m37702m2_device(mconfig, NAMCO_C76, "C76 (M37702)", tag, owner, clock, "namcoc76", __FILE__)
+ : m37702m2_device(mconfig, NAMCO_C76, tag, owner, clock)
{
}
diff --git a/src/mame/machine/namcomcu.h b/src/mame/machine/namcomcu.h
index 31ae1e5dc28..c7332e2faeb 100644
--- a/src/mame/machine/namcomcu.h
+++ b/src/mame/machine/namcomcu.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Alex W. Jackson
-#pragma once
+#ifndef MAME_MACHINE_NAMCOMCU_H
+#define MAME_MACHINE_NAMCOMCU_H
-#ifndef __NAMCOMCU_H__
-#define __NAMCOMCU_H__
+#pragma once
#include "cpu/m37710/m37710.h"
@@ -53,11 +53,11 @@ protected:
};
-extern const device_type NAMCO_C69;
-extern const device_type NAMCO_C70;
-extern const device_type NAMCO_C74;
-extern const device_type NAMCO_C75;
-extern const device_type NAMCO_C76;
+DECLARE_DEVICE_TYPE(NAMCO_C69, namco_c69_device)
+DECLARE_DEVICE_TYPE(NAMCO_C70, namco_c70_device)
+DECLARE_DEVICE_TYPE(NAMCO_C74, namco_c74_device)
+DECLARE_DEVICE_TYPE(NAMCO_C75, namco_c75_device)
+DECLARE_DEVICE_TYPE(NAMCO_C76, namco_c76_device)
-#endif
+#endif // MAME_MACHINE_NAMCOMCU_H
diff --git a/src/mame/machine/naomibd.cpp b/src/mame/machine/naomibd.cpp
index 559ec53c9f7..90154b7de73 100644
--- a/src/mame/machine/naomibd.cpp
+++ b/src/mame/machine/naomibd.cpp
@@ -73,8 +73,8 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_board)
AM_RANGE(0x00, 0xff) AM_READ(default_r)
ADDRESS_MAP_END
-naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : naomi_g1_device(mconfig, type, name, tag, owner, clock, shortname, source)
+naomi_board::naomi_board(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : naomi_g1_device(mconfig, type, tag, owner, clock)
{
eeprom_tag = nullptr;
}
diff --git a/src/mame/machine/naomibd.h b/src/mame/machine/naomibd.h
index 6b087c66798..94e767bb4b8 100644
--- a/src/mame/machine/naomibd.h
+++ b/src/mame/machine/naomibd.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _NAOMIBD_H_
-#define _NAOMIBD_H_
+#ifndef MAME_MACHINE_NAOMIBD_H
+#define MAME_MACHINE_NAOMIBD_H
+
+#pragma once
#include "machine/naomig1.h"
#include "machine/x76f100.h"
@@ -13,8 +15,6 @@
class naomi_board : public naomi_g1_device
{
public:
- naomi_board(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
static void static_set_eeprom_tag(device_t &device, const char *_eeprom_tag);
// Can be patched in the underlying class
@@ -34,6 +34,8 @@ public:
DECLARE_READ16_MEMBER( default_r);
protected:
+ naomi_board(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
@@ -58,4 +60,4 @@ private:
x76f100_device *eeprom;
};
-#endif
+#endif // MAME_MACHINE_NAOMIBD_H
diff --git a/src/mame/machine/naomig1.cpp b/src/mame/machine/naomig1.cpp
index c96a1afc6fc..1b0d197b533 100644
--- a/src/mame/machine/naomig1.cpp
+++ b/src/mame/machine/naomig1.cpp
@@ -25,9 +25,9 @@ DEVICE_ADDRESS_MAP_START(amap, 32, naomi_g1_device)
AM_RANGE(0xf8, 0xfb) AM_READ(sb_gdlend_r)
ADDRESS_MAP_END
-naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
- irq_cb(*this)
+naomi_g1_device::naomi_g1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , irq_cb(*this)
{
}
diff --git a/src/mame/machine/naomig1.h b/src/mame/machine/naomig1.h
index c833bb114d3..0a4b6d066cc 100644
--- a/src/mame/machine/naomig1.h
+++ b/src/mame/machine/naomig1.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _NAOMIG1_H_
-#define _NAOMIG1_H_
+#ifndef MAME_MACHINE_NAOMIG1_H
+#define MAME_MACHINE_NAOMIG1_H
+
+#pragma once
#include "cpu/sh4/sh4.h"
@@ -18,9 +20,8 @@ public:
typedef delegate<void (uint32_t main_adr, void *dma_ptr, uint32_t length, uint32_t size, bool to_mainram)> dma_cb;
- naomi_g1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- template<class _cb> void set_irq_cb(_cb cb) { irq_cb.set_callback(cb); }
- void set_dma_cb(dma_cb _cb) { _dma_cb = _cb; }
+ template <class Object> void set_irq_cb(Object &&cb) { irq_cb.set_callback(std::forward<Object>(cb)); }
+ void set_dma_cb(dma_cb cb) { _dma_cb = cb; }
DECLARE_ADDRESS_MAP(amap, 32);
@@ -53,6 +54,8 @@ public:
protected:
enum { G1_TIMER_ID = 0x42 };
+ naomi_g1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -70,4 +73,4 @@ private:
void dma(void *dma_ptr, uint32_t main_adr, uint32_t size, bool to_mainram);
};
-#endif
+#endif // MAME_MACHINE_NAOMIG1_H
diff --git a/src/mame/machine/naomigd.cpp b/src/mame/machine/naomigd.cpp
index 0f095c33365..2327e4def75 100644
--- a/src/mame/machine/naomigd.cpp
+++ b/src/mame/machine/naomigd.cpp
@@ -98,7 +98,7 @@ SH4 IO port A bits
*/
-const device_type NAOMI_GDROM_BOARD = device_creator<naomi_gdrom_board>;
+DEFINE_DEVICE_TYPE(NAOMI_GDROM_BOARD, naomi_gdrom_board, "segadimm", "Sega DIMM Board")
const uint32_t naomi_gdrom_board::DES_LEFTSWAP[] = {
0x00000000, 0x00000001, 0x00000100, 0x00000101, 0x00010000, 0x00010001, 0x00010100, 0x00010101,
@@ -401,7 +401,7 @@ void naomi_gdrom_board::write_from_qword(uint8_t *region, uint64_t qword)
}
naomi_gdrom_board::naomi_gdrom_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : naomi_board(mconfig, NAOMI_GDROM_BOARD, "Sega DIMM Board", tag, owner, clock, "segadimm", __FILE__)
+ : naomi_board(mconfig, NAOMI_GDROM_BOARD, tag, owner, clock)
{
image_tag = nullptr;
pic_tag = nullptr;
diff --git a/src/mame/machine/naomigd.h b/src/mame/machine/naomigd.h
index 33d2edd3adb..fb71f919195 100644
--- a/src/mame/machine/naomigd.h
+++ b/src/mame/machine/naomigd.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _NAOMIGD_H_
-#define _NAOMIGD_H_
+#ifndef MAME_MACHINE_NAOMIGD_H
+#define MAME_MACHINE_NAOMIGD_H
+
+#pragma once
#include "machine/naomibd.h"
@@ -63,5 +65,6 @@ private:
};
extern const device_type NAOMI_GDROM_BOARD;
+DECLARE_DEVICE_TYPE(NAOMI_GDROM_BOARD, naomi_gdrom_board)
-#endif
+#endif // MAME_MACHINE_NAOMIGD_H
diff --git a/src/mame/machine/naomim1.cpp b/src/mame/machine/naomim1.cpp
index 84412849767..760f6e8e020 100644
--- a/src/mame/machine/naomim1.cpp
+++ b/src/mame/machine/naomim1.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "naomim1.h"
-const device_type NAOMI_M1_BOARD = device_creator<naomi_m1_board>;
+DEFINE_DEVICE_TYPE(NAOMI_M1_BOARD, naomi_m1_board, "naomi_m1_board", "Sega NAOMI M1 Board")
DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m1_board)
AM_RANGE(0x0a, 0x0b) AM_READ(actel_id_r)
@@ -13,8 +13,8 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m1_board)
ADDRESS_MAP_END
naomi_m1_board::naomi_m1_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : naomi_board(mconfig, NAOMI_M1_BOARD, "Sega NAOMI M1 Board", tag, owner, clock, "naomi_m1_board", __FILE__),
- m_region(*this, DEVICE_SELF)
+ : naomi_board(mconfig, NAOMI_M1_BOARD, tag, owner, clock)
+ , m_region(*this, DEVICE_SELF)
{
}
diff --git a/src/mame/machine/naomim1.h b/src/mame/machine/naomim1.h
index 9ce67ce3565..341e2b40372 100644
--- a/src/mame/machine/naomim1.h
+++ b/src/mame/machine/naomim1.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _NAOMIM1_H_
-#define _NAOMIM1_H_
+#ifndef MAME_MACHINE_NAOMIM1_H
+#define MAME_MACHINE_NAOMIM1_H
+
+#pragma once
#include "naomibd.h"
@@ -51,6 +53,6 @@ private:
void wb(uint8_t byte);
};
-extern const device_type NAOMI_M1_BOARD;
+DECLARE_DEVICE_TYPE(NAOMI_M1_BOARD, naomi_m1_board)
-#endif
+#endif // MAME_MACHINE_NAOMIM1_H
diff --git a/src/mame/machine/naomim2.cpp b/src/mame/machine/naomim2.cpp
index a2d089e6e9b..e6d1e1198f2 100644
--- a/src/mame/machine/naomim2.cpp
+++ b/src/mame/machine/naomim2.cpp
@@ -109,12 +109,12 @@ note: if ROM is not mounted its area readed as 0xFF
********************************************************************************************************/
-const device_type NAOMI_M2_BOARD = device_creator<naomi_m2_board>;
+DEFINE_DEVICE_TYPE(NAOMI_M2_BOARD, naomi_m2_board, "naomi_m2_board", "Sega NAOMI M2 Board")
naomi_m2_board::naomi_m2_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : naomi_board(mconfig, NAOMI_M2_BOARD, "Sega NAOMI M2 Board", tag, owner, clock, "naomi_m2_board", __FILE__),
- m_cryptdevice(*this, "segam2crypt"),
- m_region(*this, DEVICE_SELF)
+ : naomi_board(mconfig, NAOMI_M2_BOARD, tag, owner, clock)
+ , m_cryptdevice(*this, "segam2crypt")
+ , m_region(*this, DEVICE_SELF)
{
}
diff --git a/src/mame/machine/naomim2.h b/src/mame/machine/naomim2.h
index c51de4e90a6..3f916ad947e 100644
--- a/src/mame/machine/naomim2.h
+++ b/src/mame/machine/naomim2.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _NAOMIM2_H_
-#define _NAOMIM2_H_
+#ifndef MAME_MACHINE_NAOMIM2_H
+#define MAME_MACHINE_NAOMIM2_H
+
+#pragma once
#include "naomibd.h"
#include "315-5881_crypt.h"
@@ -35,6 +37,6 @@ private:
required_memory_region m_region;
};
-extern const device_type NAOMI_M2_BOARD;
+DECLARE_DEVICE_TYPE(NAOMI_M2_BOARD, naomi_m2_board)
-#endif
+#endif // MAME_MACHINE_NAOMIM2_H
diff --git a/src/mame/machine/naomim4.cpp b/src/mame/machine/naomim4.cpp
index 12077a6f579..bbf567b8b1b 100644
--- a/src/mame/machine/naomim4.cpp
+++ b/src/mame/machine/naomim4.cpp
@@ -21,7 +21,7 @@
// the algorithm is a 32-bits key stored in the PIC16C621A. The hardware auto-reset the feed value
// to the cart-based IV every 16 blocks (32 bytes); that reset is not address-based, but index-based.
-const device_type NAOMI_M4_BOARD = device_creator<naomi_m4_board>;
+DEFINE_DEVICE_TYPE(NAOMI_M4_BOARD, naomi_m4_board, "naomi_m4_board", "Sega NAOMI M4 Board")
const uint8_t naomi_m4_board::k_sboxes[4][16] = {
{9,8,2,11,1,14,5,15,12,6,0,3,7,13,10,4},
@@ -47,7 +47,7 @@ DEVICE_ADDRESS_MAP_START(submap, 16, naomi_m4_board)
ADDRESS_MAP_END
naomi_m4_board::naomi_m4_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : naomi_board(mconfig, NAOMI_M4_BOARD, "Sega NAOMI M4 Board", tag, owner, clock, "naomi_m4_board", __FILE__)
+ : naomi_board(mconfig, NAOMI_M4_BOARD, tag, owner, clock)
, m_region(*this, DEVICE_SELF)
, m_key_data(*this, finder_base::DUMMY_TAG)
{
diff --git a/src/mame/machine/naomim4.h b/src/mame/machine/naomim4.h
index 7fb81fa333d..4fb778fd769 100644
--- a/src/mame/machine/naomim4.h
+++ b/src/mame/machine/naomim4.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert,Andreas Naive
-#ifndef _NAOMIM4_H_
-#define _NAOMIM4_H_
+#ifndef MAME_MACHINE_NAOMIM4_H
+#define MAME_MACHINE_NAOMIM4_H
#include "naomibd.h"
@@ -52,6 +52,6 @@ private:
uint16_t decrypt_one_round(uint16_t word, uint16_t subkey);
};
-extern const device_type NAOMI_M4_BOARD;
+DECLARE_DEVICE_TYPE(NAOMI_M4_BOARD, naomi_m4_board)
-#endif
+#endif // MAME_MACHINE_NAOMIM4_H
diff --git a/src/mame/machine/naomirom.cpp b/src/mame/machine/naomirom.cpp
index 62f53eb4eb7..ddb8bcc4c7f 100644
--- a/src/mame/machine/naomirom.cpp
+++ b/src/mame/machine/naomirom.cpp
@@ -3,11 +3,11 @@
#include "emu.h"
#include "naomirom.h"
-const device_type NAOMI_ROM_BOARD = device_creator<naomi_rom_board>;
+DEFINE_DEVICE_TYPE(NAOMI_ROM_BOARD, naomi_rom_board, "naomi_rom_board", "Sega NAOMI ROM Board")
naomi_rom_board::naomi_rom_board(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : naomi_board(mconfig, NAOMI_ROM_BOARD, "Sega NAOMI ROM Board", tag, owner, clock, "naomi_rom_board", __FILE__),
- m_region(*this, DEVICE_SELF)
+ : naomi_board(mconfig, NAOMI_ROM_BOARD, tag, owner, clock)
+ , m_region(*this, DEVICE_SELF)
{
}
diff --git a/src/mame/machine/naomirom.h b/src/mame/machine/naomirom.h
index a1261b35717..fc23b604058 100644
--- a/src/mame/machine/naomirom.h
+++ b/src/mame/machine/naomirom.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef _NAOMIROM_H_
-#define _NAOMIROM_H_
+#ifndef MAME_MACHINE_NAOMIROM_H
+#define MAME_MACHINE_NAOMIROM_H
#include "naomibd.h"
@@ -26,6 +26,6 @@ private:
required_memory_region m_region;
};
-extern const device_type NAOMI_ROM_BOARD;
+DECLARE_DEVICE_TYPE(NAOMI_ROM_BOARD, naomi_rom_board)
-#endif
+#endif // MAME_MACHINE_NAOMIROM_H
diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp
index 7ce1d1f7010..0092777d760 100644
--- a/src/mame/machine/nb1413m3.cpp
+++ b/src/mame/machine/nb1413m3.cpp
@@ -13,18 +13,19 @@ Memo:
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
+#include "cpu/z80/z80.h"
+
#define NB1413M3_DEBUG 0
#define NB1413M3_TIMER_BASE 20000000
-const device_type NB1413M3 = device_creator<nb1413m3_device>;
+DEFINE_DEVICE_TYPE(NB1413M3, nb1413m3_device, "nb1413m3", "NB1413 Mahjong Custom")
nb1413m3_device::nb1413m3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NB1413M3, "NB1413M3 Mahjong Custom", tag, owner, clock, "nb1413m3", __FILE__),
+ : device_t(mconfig, NB1413M3, tag, owner, clock),
m_sndromrgntag("voice"),
m_sndrombank1(0),
m_sndrombank2(0),
diff --git a/src/mame/machine/nb1414m4.cpp b/src/mame/machine/nb1414m4.cpp
index c7e4cfe98b2..ce48c057bba 100644
--- a/src/mame/machine/nb1414m4.cpp
+++ b/src/mame/machine/nb1414m4.cpp
@@ -31,10 +31,10 @@ Notes:
#include "includes/nb1414m4.h"
#include "screen.h"
-const device_type NB1414M4 = device_creator<nb1414m4_device>;
+DEFINE_DEVICE_TYPE(NB1414M4, nb1414m4_device, "nb1414m4", "NB1414M4 Mahjong Custom")
nb1414m4_device::nb1414m4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NB1414M4, "NB1414M4 Mahjong Custom", tag, owner, clock, "nb1414m4", __FILE__)
+ : device_t(mconfig, NB1414M4, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_data(*this, DEVICE_SELF)
{
diff --git a/src/mame/machine/nes.cpp b/src/mame/machine/nes.cpp
index 97f6070c020..9c3c3e5c728 100644
--- a/src/mame/machine/nes.cpp
+++ b/src/mame/machine/nes.cpp
@@ -67,9 +67,9 @@ void nes_state::machine_start()
m_ppu->space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(device_nes_cart_interface::chr_r),m_cartslot->m_cart), write8_delegate(FUNC(device_nes_cart_interface::chr_w),m_cartslot->m_cart));
m_ppu->space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(device_nes_cart_interface::nt_r),m_cartslot->m_cart), write8_delegate(FUNC(device_nes_cart_interface::nt_w),m_cartslot->m_cart));
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(device_nes_cart_interface::scanline_irq),m_cartslot->m_cart));
- m_ppu->set_hblank_callback(ppu2c0x_hblank_delegate(FUNC(device_nes_cart_interface::hblank_irq),m_cartslot->m_cart));
- m_ppu->set_latch(ppu2c0x_latch_delegate(FUNC(device_nes_cart_interface::ppu_latch),m_cartslot->m_cart));
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(device_nes_cart_interface::scanline_irq),m_cartslot->m_cart));
+ m_ppu->set_hblank_callback(ppu2c0x_device::hblank_delegate(FUNC(device_nes_cart_interface::hblank_irq),m_cartslot->m_cart));
+ m_ppu->set_latch(ppu2c0x_device::latch_delegate(FUNC(device_nes_cart_interface::ppu_latch),m_cartslot->m_cart));
// install additional handlers (read_h, read_ex, write_ex)
if (m_cartslot->get_pcb_id() == STD_EXROM || m_cartslot->get_pcb_id() == STD_NROM368 || m_cartslot->get_pcb_id() == STD_DISKSYS
diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp
index 2f696f58cc3..d102775d480 100644
--- a/src/mame/machine/nextkbd.cpp
+++ b/src/mame/machine/nextkbd.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "nextkbd.h"
-const device_type NEXTKBD = device_creator<nextkbd_device>;
+DEFINE_DEVICE_TYPE(NEXTKBD, nextkbd_device, "nextkbd", "NeXT Keyboard")
DEVICE_ADDRESS_MAP_START(amap, 32, nextkbd_device)
AM_RANGE(0x0, 0x3) AM_READWRITE8(status_snd_r, ctrl_snd_w, 0xff000000)
@@ -16,7 +16,7 @@ DEVICE_ADDRESS_MAP_START(amap, 32, nextkbd_device)
ADDRESS_MAP_END
nextkbd_device::nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, NEXTKBD, "NEXTKBD", tag, owner, clock, "nextkbd", __FILE__),
+ device_t(mconfig, NEXTKBD, tag, owner, clock),
int_change_cb(*this),
int_power_cb(*this),
int_nmi_cb(*this),
diff --git a/src/mame/machine/nextkbd.h b/src/mame/machine/nextkbd.h
index 41b183a12ec..e0382354b27 100644
--- a/src/mame/machine/nextkbd.h
+++ b/src/mame/machine/nextkbd.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __NEXTKBD_H__
-#define __NEXTKBD_H__
+#ifndef MAME_MACHINE_NEXTKBD_H
+#define MAME_MACHINE_NEXTKBD_H
+
+#pragma once
#define MCFG_NEXTKBD_INT_CHANGE_CALLBACK(_write) \
@@ -17,9 +19,9 @@ class nextkbd_device : public device_t {
public:
nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_int_change_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_change_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_int_power_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_power_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_int_nmi_wr_callback(device_t &device, _Object object) { return downcast<nextkbd_device &>(device).int_nmi_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_int_change_wr_callback(device_t &device, Object &&cb) { return downcast<nextkbd_device &>(device).int_change_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_int_power_wr_callback(device_t &device, Object &&cb) { return downcast<nextkbd_device &>(device).int_power_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_int_nmi_wr_callback(device_t &device, Object &&cb) { return downcast<nextkbd_device &>(device).int_nmi_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_ADDRESS_MAP(amap, 32);
@@ -113,6 +115,6 @@ private:
void handle_command();
};
-extern const device_type NEXTKBD;
+DECLARE_DEVICE_TYPE(NEXTKBD, nextkbd_device)
-#endif
+#endif // MAME_MACHINE_NEXTKBD_H
diff --git a/src/mame/machine/nextmo.cpp b/src/mame/machine/nextmo.cpp
index 2df3346f762..d1633f37790 100644
--- a/src/mame/machine/nextmo.cpp
+++ b/src/mame/machine/nextmo.cpp
@@ -4,7 +4,7 @@
#include "emu.h"
#include "nextmo.h"
-const device_type NEXTMO = device_creator<nextmo_device>;
+DEFINE_DEVICE_TYPE(NEXTMO, nextmo_device, "nextmo", "NeXT Magneto-optical drive")
DEVICE_ADDRESS_MAP_START(map, 8, nextmo_device)
AM_RANGE(0x04, 0x04) AM_READWRITE(r4_r, r4_w)
@@ -19,7 +19,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, nextmo_device)
ADDRESS_MAP_END
nextmo_device::nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, NEXTMO, "NeXT Magneto-optical drive", tag, owner, clock, "nextmo", __FILE__),
+ device_t(mconfig, NEXTMO, tag, owner, clock),
r4(0),
irq_cb(*this),
drq_cb(*this)
diff --git a/src/mame/machine/nextmo.h b/src/mame/machine/nextmo.h
index 31b4627e74e..741f9d3e16d 100644
--- a/src/mame/machine/nextmo.h
+++ b/src/mame/machine/nextmo.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef NEXTMO_H
-#define NEXTMO_H
+#ifndef MAME_MACHINE_NEXTMO_H
+#define MAME_MACHINE_NEXTMO_H
+
+#pragma once
#define MCFG_NEXTMO_IRQ_CALLBACK(_write) \
devcb = &nextmo_device::set_irq_wr_callback(*device, DEVCB_##_write);
@@ -14,8 +16,8 @@ class nextmo_device : public device_t
public:
nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<nextmo_device &>(device).irq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<nextmo_device &>(device).drq_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<nextmo_device &>(device).irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_drq_wr_callback(device_t &device, Object &&cb) { return downcast<nextmo_device &>(device).drq_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_ADDRESS_MAP(map, 32);
@@ -58,4 +60,4 @@ private:
extern const device_type NEXTMO;
-#endif
+#endif // MAME_MACHINE_NEXTMO_H
diff --git a/src/mame/machine/ng_memcard.cpp b/src/mame/machine/ng_memcard.cpp
index ca15f3b9d19..9c1fc7ff7e1 100644
--- a/src/mame/machine/ng_memcard.cpp
+++ b/src/mame/machine/ng_memcard.cpp
@@ -10,18 +10,20 @@
#include "emu.h"
#include "emuopts.h"
+
#include "ng_memcard.h"
+
// device type definition
-const device_type NG_MEMCARD = device_creator<ng_memcard_device>;
+DEFINE_DEVICE_TYPE(NG_MEMCARD, ng_memcard_device, "ng_memcard", "NeoGeo Memory Card")
//-------------------------------------------------
// ng_memcard_device - constructor
//-------------------------------------------------
ng_memcard_device::ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NG_MEMCARD, "NeoGeo Memory Card", tag, owner, clock, "ng_memcard", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, NG_MEMCARD, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h
index 2e3af83e0a9..9fcb73ea0b4 100644
--- a/src/mame/machine/ng_memcard.h
+++ b/src/mame/machine/ng_memcard.h
@@ -7,11 +7,11 @@
NEOGEO Memory card functions.
*********************************************************************/
+#ifndef MAME_MACHINE_NG_MEMCARD_H
+#define MAME_MACHINE_NG_MEMCARD_H
#pragma once
-#ifndef __NG_MEMCARD_H__
-#define __NG_MEMCARD_H__
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
@@ -60,7 +60,7 @@ private:
// device type definition
-extern const device_type NG_MEMCARD;
+DECLARE_DEVICE_TYPE(NG_MEMCARD, ng_memcard_device)
-#endif /* __NG_MEMCARD_H__ */
+#endif // MAME_MACHINE_NG_MEMCARD_H
diff --git a/src/mame/machine/ngen_kb.cpp b/src/mame/machine/ngen_kb.cpp
index 1fa1f79732d..7d418649fba 100644
--- a/src/mame/machine/ngen_kb.cpp
+++ b/src/mame/machine/ngen_kb.cpp
@@ -12,7 +12,7 @@
#include "ngen_kb.h"
ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : serial_keyboard_device(mconfig, NGEN_KEYBOARD, "NGEN Keyboard", tag, owner, 0, "ngen_keyboard", __FILE__)
+ : serial_keyboard_device(mconfig, NGEN_KEYBOARD, tag, owner, 0)
, m_keys_down(0U)
, m_last_reset(0U)
{
@@ -106,4 +106,4 @@ void ngen_keyboard_device::key_break(uint8_t row, uint8_t column)
}
}
-const device_type NGEN_KEYBOARD = device_creator<ngen_keyboard_device>;
+DEFINE_DEVICE_TYPE(NGEN_KEYBOARD, ngen_keyboard_device, "ngen_kb", "NGEN Keyboard")
diff --git a/src/mame/machine/ngen_kb.h b/src/mame/machine/ngen_kb.h
index f2a9f8923ab..37589926303 100644
--- a/src/mame/machine/ngen_kb.h
+++ b/src/mame/machine/ngen_kb.h
@@ -5,6 +5,8 @@
#ifndef MAME_MACHINE_NGEN_KB_H
#define MAME_MACHINE_NGEN_KB_H
+#pragma once
+
#include "bus/rs232/keyboard.h"
class ngen_keyboard_device : public serial_keyboard_device
@@ -27,6 +29,6 @@ private:
uint8_t m_last_reset;
};
-extern const device_type NGEN_KEYBOARD;
+DECLARE_DEVICE_TYPE(NGEN_KEYBOARD, ngen_keyboard_device)
#endif // MAME_MACHINE_NGEN_KB_H
diff --git a/src/mame/machine/nmk004.cpp b/src/mame/machine/nmk004.cpp
index d8e117b6f25..84199d34ef1 100644
--- a/src/mame/machine/nmk004.cpp
+++ b/src/mame/machine/nmk004.cpp
@@ -9,6 +9,10 @@
#include "emu.h"
#include "nmk004.h"
+#include "sound/2203intf.h"
+#include "sound/okim6295.h"
+
+
WRITE8_MEMBER( nmk004_device::write )
{
machine().scheduler().synchronize();
@@ -26,7 +30,7 @@ WRITE8_MEMBER(nmk004_device::nmk004_port4_w)
// bit 0x08 toggles frequently but is connected to nothing?
// bit 0x01 is set to reset the 68k
- m_systemcpu->set_input_line(INPUT_LINE_RESET, (data & 1) ? ASSERT_LINE : CLEAR_LINE);
+ m_reset_cb(BIT(data, 0) ? ASSERT_LINE : CLEAR_LINE);
}
WRITE8_MEMBER(nmk004_device::nmk004_oki0_bankswitch_w)
@@ -90,12 +94,12 @@ ROM_START( nmk004 )
ROM_END
-const device_type NMK004 = device_creator<nmk004_device>;
+DEFINE_DEVICE_TYPE(NMK004, nmk004_device, "nmk004", "NMK004")
nmk004_device::nmk004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NMK004, "NMK004", tag, owner, clock, "nmk004", __FILE__),
+ : device_t(mconfig, NMK004, tag, owner, clock),
m_cpu(*this, "mcu"),
- m_systemcpu(*this, ":maincpu"),
+ m_reset_cb(*this),
to_nmk004(0xff),
to_main(0xff)
{
@@ -107,6 +111,8 @@ nmk004_device::nmk004_device(const machine_config &mconfig, const char *tag, dev
//-------------------------------------------------
void nmk004_device::device_start()
{
+ m_reset_cb.resolve_safe();
+
membank(":okibank1")->configure_entries(0, 4, memregion(":oki1")->base() + 0x20000, 0x20000);
membank(":okibank2")->configure_entries(0, 4, memregion(":oki2")->base() + 0x20000, 0x20000);
}
diff --git a/src/mame/machine/nmk004.h b/src/mame/machine/nmk004.h
index 2851d4a6056..273d539447d 100644
--- a/src/mame/machine/nmk004.h
+++ b/src/mame/machine/nmk004.h
@@ -6,25 +6,33 @@
***************************************************************************/
-#ifndef NMK004_H
-#define NMK004_H
+#ifndef MAME_MACHINE_NMK004_H
+#define MAME_MACHINE_NMK004_H
#include "cpu/tlcs90/tlcs90.h"
-#include "sound/2203intf.h"
-#include "sound/okim6295.h"
-#define MCFG_NMK004_ADD(_tag, _clock) \
- MCFG_DEVICE_ADD(_tag, NMK004, _clock)
+#pragma once
-/* device get info callback */
+#define MCFG_NMK004_ADD(tag, clock) \
+ MCFG_DEVICE_ADD(tag, NMK004, clock)
+
+#define MCFG_NMK004_RESET_CB(cb) \
+ nmk004_device::set_reset_cb(*device, DEVCB_##cb);
+
class nmk004_device : public device_t
{
public:
+ template <typename Obj> static devcb_base &set_reset_cb(device_t &device, Obj &&object)
+ { return downcast<nmk004_device &>(device).m_reset_cb.set_callback(std::forward<Obj>(object)); }
+
nmk004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- WRITE8_MEMBER( write );
- READ8_MEMBER( read );
+ // host interface
+ DECLARE_WRITE8_MEMBER( write );
+ DECLARE_READ8_MEMBER( read );
+ DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_cpu->set_input_line(INPUT_LINE_NMI, state); }
+
DECLARE_WRITE8_MEMBER(nmk004_port4_w);
DECLARE_WRITE8_MEMBER(nmk004_oki0_bankswitch_w);
@@ -32,7 +40,6 @@ public:
DECLARE_READ8_MEMBER(nmk004_tonmk004_r);
DECLARE_WRITE8_MEMBER(nmk004_tomain_w);
void ym2203_irq_handler(int irq);
- required_device<tlcs90_device> m_cpu;
protected:
// device-level overrides
@@ -40,15 +47,15 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual machine_config_constructor device_mconfig_additions() const override;
-
private:
// internal state
- required_device<cpu_device> m_systemcpu;
+ required_device<tlcs90_device> m_cpu;
+ devcb_write_line m_reset_cb;
+
uint8_t to_nmk004;
uint8_t to_main;
-
};
-extern const device_type NMK004;
+DECLARE_DEVICE_TYPE(NMK004, nmk004_device)
-#endif /* NMK004_H */
+#endif // MAME_MACHINE_NMK004_H
diff --git a/src/mame/machine/nmk112.cpp b/src/mame/machine/nmk112.cpp
index 1f1d7157af4..e4cbe57ccca 100644
--- a/src/mame/machine/nmk112.cpp
+++ b/src/mame/machine/nmk112.cpp
@@ -17,10 +17,10 @@
-const device_type NMK112 = device_creator<nmk112_device>;
+DEFINE_DEVICE_TYPE(NMK112, nmk112_device, "nmk112", "NMK112")
nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NMK112, "NMK112", tag, owner, clock, "nmk112", __FILE__),
+ : device_t(mconfig, NMK112, tag, owner, clock),
m_page_mask(0xff),
m_tag0(nullptr),
m_tag1(nullptr),
diff --git a/src/mame/machine/nmk112.h b/src/mame/machine/nmk112.h
index 31724490a7a..ac722031c55 100644
--- a/src/mame/machine/nmk112.h
+++ b/src/mame/machine/nmk112.h
@@ -6,8 +6,10 @@
**************************************************************************/
-#ifndef __NMK112_H__
-#define __NMK112_H__
+#ifndef MAME_MACHINE_NMK112_H
+#define MAME_MACHINE_NMK112_H
+
+#pragma once
/***************************************************************************
TYPE DEFINITIONS
@@ -17,7 +19,6 @@ class nmk112_device : public device_t
{
public:
nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~nmk112_device() {}
// static configuration
static void set_rom0_tag(device_t &device, const char *tag) { downcast<nmk112_device &>(device).m_tag0 = tag; }
@@ -47,7 +48,7 @@ private:
int m_size0, m_size1;
};
-extern const device_type NMK112;
+DECLARE_DEVICE_TYPE(NMK112, nmk112_device)
/***************************************************************************
@@ -64,4 +65,4 @@ extern const device_type NMK112;
nmk112_device::set_page_mask(*device, _mask);
-#endif /* __NMK112_H__ */
+#endif // MAME_MACHINE_NMK112_H
diff --git a/src/mame/machine/ns10crypt.cpp b/src/mame/machine/ns10crypt.cpp
index bcfcf7847e3..f15c5044f75 100644
--- a/src/mame/machine/ns10crypt.cpp
+++ b/src/mame/machine/ns10crypt.cpp
@@ -118,19 +118,19 @@ really exist.
#include "emu.h"
#include "ns10crypt.h"
-const device_type CHOCOVDR_DECRYPTER = device_creator<chocovdr_decrypter_device>;
-const device_type GAMSHARA_DECRYPTER = device_creator<gamshara_decrypter_device>;
-const device_type GJSPACE_DECRYPTER = device_creator<gjspace_decrypter_device>;
-const device_type KNPUZZLE_DECRYPTER = device_creator<knpuzzle_decrypter_device>;
-const device_type KONOTAKO_DECRYPTER = device_creator<konotako_decrypter_device>;
-const device_type MRDRILR2_DECRYPTER = device_creator<mrdrilr2_decrypter_device>;
-const device_type NFLCLSFB_DECRYPTER = device_creator<nflclsfb_decrypter_device>;
-const device_type STARTRGN_DECRYPTER = device_creator<startrgn_decrypter_device>;
+DEFINE_DEVICE_TYPE(CHOCOVDR_DECRYPTER, chocovdr_decrypter_device, "chocovdr_decrypter", "Chocovader Contactee decrypter")
+DEFINE_DEVICE_TYPE(GAMSHARA_DECRYPTER, gamshara_decrypter_device, "gamshara_decrypter", "Gamshara decrypter")
+DEFINE_DEVICE_TYPE(GJSPACE_DECRYPTER, gjspace_decrypter_device, "gjspace_decrypter", "Gekitorider-Jong Space decrypter")
+DEFINE_DEVICE_TYPE(KNPUZZLE_DECRYPTER, knpuzzle_decrypter_device, "knpuzzle_decrypter", "Kotoba no Puzzle Mojipittan decrypter")
+DEFINE_DEVICE_TYPE(KONOTAKO_DECRYPTER, konotako_decrypter_device, "konotako_decrypter", "Kono Tako decrypter")
+DEFINE_DEVICE_TYPE(MRDRILR2_DECRYPTER, mrdrilr2_decrypter_device, "mrdrilr2_decrypter", "Mr Driller 2 decrypter")
+DEFINE_DEVICE_TYPE(NFLCLSFB_DECRYPTER, nflclsfb_decrypter_device, "nflclsfg_decrypter", "NFL Classic Football decrypter")
+DEFINE_DEVICE_TYPE(STARTRGN_DECRYPTER, startrgn_decrypter_device, "startrgn_decrypter", "Star Trigon decrypter")
// base class
-ns10_decrypter_device::ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__)
+ns10_decrypter_device::ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
{
_active = false;
}
@@ -163,8 +163,8 @@ constexpr int U {UNKNOWN};
// this could perfectly be part of the per-game logic but, with only one known type-1 game, we cannot say anything definitive
const int ns10_type1_decrypter_device::initSbox[16] {U,U,U,0,4,9,U,U,U,8,U,1,U,9,U,5};
-ns10_type1_decrypter_device::ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : ns10_decrypter_device(mconfig, type, name, tag, owner, clock, shortname, source)
+ns10_type1_decrypter_device::ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : ns10_decrypter_device(mconfig, type, tag, owner, clock)
{
}
@@ -213,8 +213,8 @@ void ns10_type1_decrypter_device::device_start()
// this could perfectly be part of the per-game logic; by now, only gamshara seems to use it, so we keep it global
const int ns10_type2_decrypter_device::initSbox[16] {0,12,13,6,2,4,9,8,11,1,7,15,10,5,14,3};
-ns10_type2_decrypter_device::ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, const ns10_type2_decrypter_device::ns10_crypto_logic &logic)
- : ns10_decrypter_device(mconfig, type, name, tag, owner, clock, shortname, source)
+ns10_type2_decrypter_device::ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const ns10_type2_decrypter_device::ns10_crypto_logic &logic)
+ : ns10_decrypter_device(mconfig, type, tag, owner, clock)
, _logic(logic)
{
}
@@ -257,7 +257,7 @@ void ns10_type2_decrypter_device::device_start()
}
-gf2_reducer::gf2_reducer()
+ns10_type2_decrypter_device::gf2_reducer::gf2_reducer()
{
int reduction;
@@ -274,7 +274,7 @@ gf2_reducer::gf2_reducer()
}
}
-int gf2_reducer::gf2_reduce(uint64_t num)const
+int ns10_type2_decrypter_device::gf2_reducer::gf2_reduce(uint64_t num)const
{
return
_gf2Reduction[num & 0xffff] ^
@@ -298,13 +298,13 @@ int gf2_reducer::gf2_reduce(uint64_t num)const
// & (reducer.gf2_reduce(0x0000a13140090000ull & previous_cipherwords) ^ reducer.gf2_reduce(0x0000806240090000ull & previous_plainwords))) << 2;
// }
-static uint16_t chocovdr_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer& reducer)
+uint16_t chocovdr_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer& reducer)
{
uint64_t previous_masks = previous_cipherwords ^ previous_plainwords;
return ((previous_masks >> 9) & (reducer.gf2_reduce(0x0000000010065810ull & previous_cipherwords) ^ reducer.gf2_reduce(0x0000000021005810ull & previous_plainwords)) & 1) << 10;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic chocovdr_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic chocovdr_decrypter_device::crypto_logic = {
{
0x00005239351ec1daull, 0x0000000000008090ull, 0x0000000048264808ull, 0x0000000000004820ull,
0x0000000000000500ull, 0x0000000058ff5a54ull, 0x00000000d8220208ull, 0x00005239351e91d3ull,
@@ -317,16 +317,16 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic chocovdr_crypto_
0x000000006800d3f5ull, 0x0000000000000058ull, 0x000000006800d2d5ull, 0x0000000000001840ull,
},
0x5b22,
- chocovdr_nonlinear_calc
+ &nonlinear_calc
};
-static uint16_t gamshara_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
+uint16_t gamshara_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
{
uint64_t previous_masks = previous_cipherwords ^ previous_plainwords;
return ((previous_masks >> 7) & (previous_masks >> 13) & 1) << 2;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic gamshara_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic gamshara_decrypter_device::crypto_logic = {
{
0x0000000000000028ull, 0x0000cae83f389fd9ull, 0x0000000000001000ull, 0x0000000042823402ull,
0x0000cae8736a0592ull, 0x0000cae8736a8596ull, 0x000000008b4095b9ull, 0x0000000000002100ull,
@@ -339,15 +339,15 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic gamshara_crypto_
0x000000004400d1f1ull, 0x000000006001ce08ull, 0x00000000000000c8ull, 0x0000000054023002ull,
},
0x25ab,
- gamshara_nonlinear_calc
+ &nonlinear_calc
};
-static uint16_t gjspace_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
+uint16_t gjspace_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
{
return 0;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic gjspace_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic gjspace_decrypter_device::crypto_logic = {
{
0x0000000000000240ull, 0x0000d617eb0f1ab1ull, 0x00000000451111c0ull, 0x00000000013b1f44ull,
0x0000aab0b356abceull, 0x00007ca76b89602aull, 0x0000000000001800ull, 0x00000000031d1303ull,
@@ -360,16 +360,16 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic gjspace_crypto_l
0x0000000000001101ull, 0x000000000000a002ull, 0x0000000029001740ull, 0x00000000a4309bfcull,
},
0x2e7f,
- gjspace_nonlinear_calc
+ &nonlinear_calc
};
-static uint16_t knpuzzle_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer& reducer)
+uint16_t knpuzzle_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer& reducer)
{
uint64_t previous_masks = previous_cipherwords ^ previous_plainwords;
return ((previous_masks >> 0x13) & (reducer.gf2_reduce(0x0000000014001290ull & previous_cipherwords) ^ reducer.gf2_reduce(0x0000000000021290ull & previous_plainwords)) & 1) << 1;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic knpuzzle_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic knpuzzle_decrypter_device::crypto_logic = {
{
0x00000000c0a4208cull, 0x00000000204100a8ull, 0x000000000c0306a0ull, 0x000000000819e944ull,
0x0000000000001400ull, 0x0000000000000061ull, 0x000000000141401cull, 0x0000000000000020ull,
@@ -382,16 +382,16 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic knpuzzle_crypto_
0x00000000012a04a2ull, 0x00000000003984a4ull, 0x0000000000000700ull, 0x0000000000000882ull,
},
0x01e2,
- knpuzzle_nonlinear_calc
+ &nonlinear_calc
};
-static uint16_t konotako_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
+uint16_t konotako_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
{
uint64_t previous_masks = previous_cipherwords ^ previous_plainwords;
return ((previous_masks >> 7) & (previous_masks >> 15) & 1) << 15;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic konotako_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic konotako_decrypter_device::crypto_logic = {
{
0x000000000000004cull, 0x00000000d39e3d3dull, 0x0000000000001110ull, 0x0000000000002200ull,
0x000000003680c008ull, 0x0000000000000281ull, 0x0000000000005002ull, 0x00002a7371895a47ull,
@@ -404,16 +404,16 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic konotako_crypto_
0x000000009000200bull, 0x0000000000000310ull, 0x0000000000001840ull, 0x0000000000000400ull,
},
0x0748,
- konotako_nonlinear_calc
+ &nonlinear_calc
};
-static uint16_t nflclsfb_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer& reducer)
+uint16_t nflclsfb_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer& reducer)
{
uint64_t previous_masks = previous_cipherwords ^ previous_plainwords;
return ((previous_masks >> 1) & (reducer.gf2_reduce(0x0000000040de8fb3ull & previous_cipherwords) ^ reducer.gf2_reduce(0x0000000088008fb3ull & previous_plainwords)) & 1) << 2;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic nflclsfb_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic nflclsfb_decrypter_device::crypto_logic = {
{
0x000034886e281880ull, 0x0000000012c5e7baull, 0x0000000000000200ull, 0x000000002900002aull,
0x00000000000004c0ull, 0x0000000012c5e6baull, 0x00000000e0df8bbbull, 0x000000002011532aull,
@@ -426,16 +426,16 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic nflclsfb_crypto_
0x0000000000000404ull, 0x0000000000004201ull, 0x0000000000001100ull, 0x000000008c0057b2ull,
},
0xbe32,
- nflclsfb_nonlinear_calc
+ &nonlinear_calc
};
-static uint16_t startrgn_nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
+uint16_t startrgn_decrypter_device::nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer&)
{
uint64_t previous_masks = previous_cipherwords ^ previous_plainwords;
return ((previous_masks >> 12) & (previous_masks >> 14) & 1) << 4;
}
-static constexpr ns10_type2_decrypter_device::ns10_crypto_logic startrgn_crypto_logic = {
+const ns10_type2_decrypter_device::ns10_crypto_logic startrgn_decrypter_device::crypto_logic = {
{
0x00003e4bfe92c6a9ull, 0x000000000000010cull, 0x00003e4b7bd6c4aaull, 0x0000b1a904b8fab8ull,
0x0000000000000080ull, 0x0000000000008c00ull, 0x0000b1a9b2f0b4cdull, 0x000000006c100828ull,
@@ -448,48 +448,48 @@ static constexpr ns10_type2_decrypter_device::ns10_crypto_logic startrgn_crypto_
0x0000000000000428ull, 0x0000000000001001ull, 0x000012020b10ceabull, 0x0000000000000144ull,
},
0x8c46,
- startrgn_nonlinear_calc
+ &nonlinear_calc
};
// game-specific devices
mrdrilr2_decrypter_device::mrdrilr2_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type1_decrypter_device(mconfig, MRDRILR2_DECRYPTER, "Mr Driller 2 decrypter", tag, owner, clock, "mrdrilr2_decrypter", __FILE__)
+ : ns10_type1_decrypter_device(mconfig, MRDRILR2_DECRYPTER, tag, owner, clock)
{
}
chocovdr_decrypter_device::chocovdr_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, CHOCOVDR_DECRYPTER, "Chocovader Contactee decrypter", tag, owner, clock, "chocovdr_decrypter", __FILE__, chocovdr_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, CHOCOVDR_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
gamshara_decrypter_device::gamshara_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, GAMSHARA_DECRYPTER, "Gamshara decrypter", tag, owner, clock, "gamshara_decrypter", __FILE__, gamshara_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, GAMSHARA_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
gjspace_decrypter_device::gjspace_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, GJSPACE_DECRYPTER, "Gekitoride-Jong Space decrypter", tag, owner, clock, "gjspace_decrypter", __FILE__, gjspace_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, GJSPACE_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
knpuzzle_decrypter_device::knpuzzle_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, KNPUZZLE_DECRYPTER, "Kotoba no Puzzle Mojipittan decrypter", tag, owner, clock, "knpuzzle_decrypter", __FILE__, knpuzzle_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, KNPUZZLE_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
konotako_decrypter_device::konotako_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, KONOTAKO_DECRYPTER, "Kono Tako decrypter", tag, owner, clock, "konotako_decrypter", __FILE__, konotako_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, KONOTAKO_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
nflclsfb_decrypter_device::nflclsfb_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, NFLCLSFB_DECRYPTER, "NFL Classic Football decrypter", tag, owner, clock, "nflclsfb_decrypter", __FILE__, nflclsfb_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, NFLCLSFB_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
startrgn_decrypter_device::startrgn_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : ns10_type2_decrypter_device(mconfig, STARTRGN_DECRYPTER, "Star Trigon decrypter", tag, owner, clock, "startrgn_decrypter", __FILE__, startrgn_crypto_logic)
+ : ns10_type2_decrypter_device(mconfig, STARTRGN_DECRYPTER, tag, owner, clock, crypto_logic)
{
}
diff --git a/src/mame/machine/ns10crypt.h b/src/mame/machine/ns10crypt.h
index ac2926ae464..960342f682b 100644
--- a/src/mame/machine/ns10crypt.h
+++ b/src/mame/machine/ns10crypt.h
@@ -1,21 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Andreas Naive
-#ifndef _NS10CRYPT_H_
-#define _NS10CRYPT_H_
+#ifndef MAME_MACHINE_NS10CRYPT_H
+#define MAME_MACHINE_NS10CRYPT_H
#include <cstdint>
-class gf2_reducer // helper class
-{
-public:
- gf2_reducer();
- int gf2_reduce(uint64_t num)const;
-private:
- int _gf2Reduction[0x10000];
-};
-
-
class ns10_decrypter_device : public device_t
{
public:
@@ -27,7 +17,7 @@ public:
virtual ~ns10_decrypter_device();
protected:
- ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ ns10_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual void init(int iv)=0;
virtual void device_start()override=0;
@@ -43,7 +33,7 @@ public:
uint16_t decrypt(uint16_t cipherword)override;
protected:
- ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+ ns10_type1_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
private:
uint16_t _mask;
@@ -58,6 +48,18 @@ private:
class ns10_type2_decrypter_device : public ns10_decrypter_device
{
public:
+ uint16_t decrypt(uint16_t cipherword)override;
+
+protected:
+ class gf2_reducer // helper class
+ {
+ public:
+ gf2_reducer();
+ int gf2_reduce(uint64_t num)const;
+ private:
+ int _gf2Reduction[0x10000];
+ };
+
// this encodes the decryption logic, which varies per game
// and is probably hard-coded into the CPLD
struct ns10_crypto_logic
@@ -68,11 +70,7 @@ public:
uint16_t(*nonlinear_calculation)(uint64_t, uint64_t, const gf2_reducer&); // preliminary encoding; need research
};
- uint16_t decrypt(uint16_t cipherword)override;
-
-protected:
- ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source,
- const ns10_type2_decrypter_device::ns10_crypto_logic &logic);
+ ns10_type2_decrypter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const ns10_crypto_logic &logic);
private:
uint16_t _mask;
@@ -100,52 +98,73 @@ class chocovdr_decrypter_device : public ns10_type2_decrypter_device
{
public:
chocovdr_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
class gamshara_decrypter_device : public ns10_type2_decrypter_device
{
public:
gamshara_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
class gjspace_decrypter_device : public ns10_type2_decrypter_device
{
public:
gjspace_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
class knpuzzle_decrypter_device : public ns10_type2_decrypter_device
{
public:
knpuzzle_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
class konotako_decrypter_device : public ns10_type2_decrypter_device
{
public:
konotako_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
class nflclsfb_decrypter_device : public ns10_type2_decrypter_device
{
public:
nflclsfb_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
class startrgn_decrypter_device : public ns10_type2_decrypter_device
{
public:
startrgn_decrypter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+private:
+ static uint16_t nonlinear_calc(uint64_t previous_cipherwords, uint64_t previous_plainwords, const gf2_reducer &reducer);
+ static const ns10_crypto_logic crypto_logic;
};
-extern const device_type MRDRILR2_DECRYPTER;
-extern const device_type CHOCOVDR_DECRYPTER;
-extern const device_type GAMSHARA_DECRYPTER;
-extern const device_type GJSPACE_DECRYPTER;
-extern const device_type KNPUZZLE_DECRYPTER;
-extern const device_type KONOTAKO_DECRYPTER;
-extern const device_type NFLCLSFB_DECRYPTER;
-extern const device_type STARTRGN_DECRYPTER;
+DECLARE_DEVICE_TYPE(CHOCOVDR_DECRYPTER, chocovdr_decrypter_device)
+DECLARE_DEVICE_TYPE(GAMSHARA_DECRYPTER, gamshara_decrypter_device)
+DECLARE_DEVICE_TYPE(GJSPACE_DECRYPTER, gjspace_decrypter_device)
+DECLARE_DEVICE_TYPE(KNPUZZLE_DECRYPTER, knpuzzle_decrypter_device)
+DECLARE_DEVICE_TYPE(KONOTAKO_DECRYPTER, konotako_decrypter_device)
+DECLARE_DEVICE_TYPE(MRDRILR2_DECRYPTER, mrdrilr2_decrypter_device)
+DECLARE_DEVICE_TYPE(NFLCLSFB_DECRYPTER, nflclsfb_decrypter_device)
+DECLARE_DEVICE_TYPE(STARTRGN_DECRYPTER, startrgn_decrypter_device)
-#endif
+#endif // MAME_MACHINE_NS10CRYPT_H
diff --git a/src/mame/machine/ns11prot.cpp b/src/mame/machine/ns11prot.cpp
index bec5d68e7a4..6e0f711d795 100644
--- a/src/mame/machine/ns11prot.cpp
+++ b/src/mame/machine/ns11prot.cpp
@@ -8,8 +8,8 @@
#include "emu.h"
#include "ns11prot.h"
-ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock)
{
}
@@ -30,7 +30,7 @@ void ns11_keycus_device::device_reset()
/* tekken 2 */
keycus_c406_device::keycus_c406_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C406, "Namco C406 KEYCUS", tag, owner, clock, "keycus_c406", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C406, tag, owner, clock)
{
}
@@ -65,12 +65,12 @@ WRITE16_MEMBER(keycus_c406_device::write)
logerror( "keycus_c406_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C406 = device_creator<keycus_c406_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C406, keycus_c406_device, "keycus_c406", "Namco C406 KEYCUS")
/* soul edge */
keycus_c409_device::keycus_c409_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C409, "Namco C409 KEYCUS", tag, owner, clock, "keycus_c409", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C409, tag, owner, clock)
{
}
@@ -105,12 +105,12 @@ WRITE16_MEMBER(keycus_c409_device::write)
logerror( "keycus_c409_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C409 = device_creator<keycus_c409_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C409, keycus_c409_device, "keycus_c409", "Namco C409 KEYCUS")
/* dunk mania */
keycus_c410_device::keycus_c410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C410, "Namco C410 KEYCUS", tag, owner, clock, "keycus_c410", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C410, tag, owner, clock)
{
}
@@ -159,12 +159,12 @@ WRITE16_MEMBER(keycus_c410_device::write)
logerror( "keycus_c410_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C410 = device_creator<keycus_c410_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C410, keycus_c410_device, "keycus_c410", "Namco C410 KEYCUS")
/* prime goal ex */
keycus_c411_device::keycus_c411_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C411, "Namco C411 KEYCUS", tag, owner, clock, "keycus_c411", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C411, tag, owner, clock)
{
}
@@ -215,12 +215,12 @@ WRITE16_MEMBER(keycus_c411_device::write)
logerror( "keycus_c411_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C411 = device_creator<keycus_c411_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C411, keycus_c411_device, "keycus_c411", "Namco C411 KEYCUS")
/* xevious 3d/g */
keycus_c430_device::keycus_c430_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C430, "Namco C430 KEYCUS", tag, owner, clock, "keycus_c430", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C430, tag, owner, clock)
{
}
@@ -274,12 +274,12 @@ WRITE16_MEMBER(keycus_c430_device::write)
logerror( "keycus_c430_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C430 = device_creator<keycus_c430_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C430, keycus_c430_device, "keycus_c430", "Namco C430 KEYCUS")
/* dancing eyes */
keycus_c431_device::keycus_c431_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C431, "Namco C431 KEYCUS", tag, owner, clock, "keycus_c431", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C431, tag, owner, clock)
{
}
@@ -332,12 +332,12 @@ WRITE16_MEMBER(keycus_c431_device::write)
logerror( "keycus_c431_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C431 = device_creator<keycus_c431_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C431, keycus_c431_device, "keycus_c431", "Namco C431 KEYCUS")
/* pocket racer */
keycus_c432_device::keycus_c432_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C432, "Namco C432 KEYCUS", tag, owner, clock, "keycus_c432", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C432, tag, owner, clock)
{
}
@@ -392,12 +392,12 @@ WRITE16_MEMBER(keycus_c432_device::write)
logerror( "keycus_c432_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C432 = device_creator<keycus_c432_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C432, keycus_c432_device, "keycus_c432", "Namco C432 KEYCUS")
/* star sweep */
keycus_c442_device::keycus_c442_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C442, "Namco C442 KEYCUS", tag, owner, clock, "keycus_c442", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C442, tag, owner, clock)
{
}
@@ -440,12 +440,12 @@ WRITE16_MEMBER(keycus_c442_device::write)
logerror( "keycus_c442_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C442 = device_creator<keycus_c442_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C442, keycus_c442_device, "keycus_c442", "Namco C442 KEYCUS")
/* kosodate quiz my angel 3 / point blank 2 */
keycus_c443_device::keycus_c443_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- ns11_keycus_device(mconfig, KEYCUS_C443, "Namco C443 KEYCUS", tag, owner, clock, "keycus_c443", __FILE__)
+ ns11_keycus_device(mconfig, KEYCUS_C443, tag, owner, clock)
{
}
@@ -486,4 +486,4 @@ WRITE16_MEMBER(keycus_c443_device::write)
logerror( "keycus_c443_device::write unexpected offset=%d data=%04x\n", offset, data );
}
-const device_type KEYCUS_C443 = device_creator<keycus_c443_device>;
+DEFINE_DEVICE_TYPE(KEYCUS_C443, keycus_c443_device, "keycus_c443", "Namco C443 KEYCUS")
diff --git a/src/mame/machine/ns11prot.h b/src/mame/machine/ns11prot.h
index de9af03b7d6..f45eca27b7e 100644
--- a/src/mame/machine/ns11prot.h
+++ b/src/mame/machine/ns11prot.h
@@ -4,17 +4,20 @@
* Namco System 11 Protection
*
*/
+#ifndef MAME_MACHINE_NS11PROT_H
+#define MAME_MACHINE_NS11PROT_H
+
+#pragma once
class ns11_keycus_device : public device_t
{
protected:
- ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock,const char *shortname, const char *source);
+ ns11_keycus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
-protected:
uint16_t m_p1;
uint16_t m_p2;
uint16_t m_p3;
@@ -35,7 +38,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C406;
+DECLARE_DEVICE_TYPE(KEYCUS_C406, keycus_c406_device)
/* soul edge */
@@ -48,7 +51,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C409;
+DECLARE_DEVICE_TYPE(KEYCUS_C409, keycus_c409_device)
/* dunk mania */
@@ -61,7 +64,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C410;
+DECLARE_DEVICE_TYPE(KEYCUS_C410, keycus_c410_device)
/* prime goal ex */
@@ -74,7 +77,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C411;
+DECLARE_DEVICE_TYPE(KEYCUS_C411, keycus_c411_device)
/* xevious 3d/g */
@@ -87,7 +90,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C430;
+DECLARE_DEVICE_TYPE(KEYCUS_C430, keycus_c430_device)
/* dancing eyes */
@@ -100,7 +103,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C431;
+DECLARE_DEVICE_TYPE(KEYCUS_C431, keycus_c431_device)
/* pocket racer */
@@ -113,7 +116,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C432;
+DECLARE_DEVICE_TYPE(KEYCUS_C432, keycus_c432_device)
/* star sweep */
@@ -126,7 +129,7 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C442;
+DECLARE_DEVICE_TYPE(KEYCUS_C442, keycus_c442_device)
/* kosodate quiz my angel 3 / point blank 2 */
@@ -139,4 +142,6 @@ public:
virtual DECLARE_WRITE16_MEMBER( write ) override;
};
-extern const device_type KEYCUS_C443;
+DECLARE_DEVICE_TYPE(KEYCUS_C443, keycus_c443_device)
+
+#endif // MAME_MACHINE_NS11PROT_H
diff --git a/src/mame/machine/octo_kbd.cpp b/src/mame/machine/octo_kbd.cpp
index a5d7219619b..b309bea81dc 100644
--- a/src/mame/machine/octo_kbd.cpp
+++ b/src/mame/machine/octo_kbd.cpp
@@ -7,7 +7,7 @@
octopus_keyboard_device::octopus_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : buffered_rs232_device(mconfig, OCTOPUS_KEYBOARD, "Octopus Keyboard", tag, owner, 0, "octopus_kb", __FILE__)
+ : buffered_rs232_device(mconfig, OCTOPUS_KEYBOARD, tag, owner, 0)
, device_matrix_keyboard_interface(mconfig, *this, "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8", "LINE9", "LINEA", "LINEB", "LINEC", "LINED", "LINEE", "LINEF")
{
}
@@ -260,6 +260,4 @@ void octopus_keyboard_device::device_timer(emu_timer &timer, device_timer_id id,
}
-const device_type OCTOPUS_KEYBOARD = device_creator<octopus_keyboard_device>;
-
-
+DEFINE_DEVICE_TYPE(OCTOPUS_KEYBOARD, octopus_keyboard_device, "octopus_kb", "Octopus Keyboard")
diff --git a/src/mame/machine/octo_kbd.h b/src/mame/machine/octo_kbd.h
index c51fe7b62f2..ab04f8def30 100644
--- a/src/mame/machine/octo_kbd.h
+++ b/src/mame/machine/octo_kbd.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
-#ifndef OCTO_KBD_H
-#define OCTO_KBD_H
+#ifndef MAME_MACHINE_OCTO_KBD_H
+#define MAME_MACHINE_OCTO_KBD_H
+
+#pragma once
#include "bus/rs232/keyboard.h"
@@ -27,6 +29,6 @@ private:
uint8_t m_enabled; // keyboard enabled?
};
-extern const device_type OCTOPUS_KEYBOARD;
+DECLARE_DEVICE_TYPE(OCTOPUS_KEYBOARD, octopus_keyboard_device)
-#endif // OCTO_KBD_H
+#endif // MAME_MACHINE_OCTO_KBD_H
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index 9677219ffc1..9b806435ab9 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PC1512_KEYBOARD = device_creator<pc1512_keyboard_t>;
+DEFINE_DEVICE_TYPE(PC1512_KEYBOARD, pc1512_keyboard_device, "pc1512kb", "Amstrad PC1512 Keyboard")
//-------------------------------------------------
@@ -40,7 +40,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
-const tiny_rom_entry *pc1512_keyboard_t::device_rom_region() const
+const tiny_rom_entry *pc1512_keyboard_device::device_rom_region() const
{
return ROM_NAME( pc1512_keyboard );
}
@@ -52,12 +52,12 @@ const tiny_rom_entry *pc1512_keyboard_t::device_rom_region() const
static MACHINE_CONFIG_FRAGMENT( pc1512_keyboard )
MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_6MHz)
- MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_t, kb_bus_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_t, kb_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(pc1512_keyboard_t, kb_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pc1512_keyboard_t, kb_p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(pc1512_keyboard_t, kb_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(pc1512_keyboard_t, kb_t1_r))
+ MCFG_MCS48_PORT_BUS_IN_CB(READ8(pc1512_keyboard_device, kb_bus_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(pc1512_keyboard_device, kb_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(pc1512_keyboard_device, kb_p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(pc1512_keyboard_device, kb_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(pc1512_keyboard_device, kb_t1_r))
MCFG_VCS_CONTROL_PORT_ADD("joy", vcs_control_port_devices, nullptr)
MACHINE_CONFIG_END
@@ -68,7 +68,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
-machine_config_constructor pc1512_keyboard_t::device_mconfig_additions() const
+machine_config_constructor pc1512_keyboard_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( pc1512_keyboard );
}
@@ -195,7 +195,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
-ioport_constructor pc1512_keyboard_t::device_input_ports() const
+ioport_constructor pc1512_keyboard_device::device_input_ports() const
{
return INPUT_PORTS_NAME( pc1512_keyboard );
}
@@ -207,11 +207,11 @@ ioport_constructor pc1512_keyboard_t::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
-// pc1512_keyboard_t - constructor
+// pc1512_keyboard_device - constructor
//-------------------------------------------------
-pc1512_keyboard_t::pc1512_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, PC1512_KEYBOARD, "Amstrad PC1512 Keyboard", tag, owner, clock, "pc1512kb", __FILE__),
+pc1512_keyboard_device::pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, PC1512_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8048_TAG),
m_joy(*this, "joy"),
m_y(*this, "Y%u", 1),
@@ -231,7 +231,7 @@ pc1512_keyboard_t::pc1512_keyboard_t(const machine_config &mconfig, const char *
// device_start - device-specific startup
//-------------------------------------------------
-void pc1512_keyboard_t::device_start()
+void pc1512_keyboard_device::device_start()
{
// allocate timers
m_reset_timer = timer_alloc();
@@ -254,7 +254,7 @@ void pc1512_keyboard_t::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void pc1512_keyboard_t::device_reset()
+void pc1512_keyboard_device::device_reset()
{
m_maincpu->set_input_line(MCS48_INPUT_EA, CLEAR_LINE);
}
@@ -264,7 +264,7 @@ void pc1512_keyboard_t::device_reset()
// device_timer - handler timer events
//-------------------------------------------------
-void pc1512_keyboard_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void pc1512_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
if (!m_clock_in)
{
@@ -277,7 +277,7 @@ void pc1512_keyboard_t::device_timer(emu_timer &timer, device_timer_id id, int p
// data_w - keyboard data input
//-------------------------------------------------
-WRITE_LINE_MEMBER( pc1512_keyboard_t::data_w )
+WRITE_LINE_MEMBER( pc1512_keyboard_device::data_w )
{
m_data_in = state;
}
@@ -287,7 +287,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_t::data_w )
// clock_w - keyboard clock input
//-------------------------------------------------
-WRITE_LINE_MEMBER( pc1512_keyboard_t::clock_w )
+WRITE_LINE_MEMBER( pc1512_keyboard_device::clock_w )
{
if (m_clock_in != state)
{
@@ -309,7 +309,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_t::clock_w )
// m1_w - mouse button 1
//-------------------------------------------------
-WRITE_LINE_MEMBER( pc1512_keyboard_t::m1_w )
+WRITE_LINE_MEMBER( pc1512_keyboard_device::m1_w )
{
m_m1 = state;
}
@@ -319,7 +319,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_t::m1_w )
// m2_w - mouse button 2
//-------------------------------------------------
-WRITE_LINE_MEMBER( pc1512_keyboard_t::m2_w )
+WRITE_LINE_MEMBER( pc1512_keyboard_device::m2_w )
{
m_m2 = state;
}
@@ -329,7 +329,7 @@ WRITE_LINE_MEMBER( pc1512_keyboard_t::m2_w )
// kb_bus_r -
//-------------------------------------------------
-READ8_MEMBER( pc1512_keyboard_t::kb_bus_r )
+READ8_MEMBER( pc1512_keyboard_device::kb_bus_r )
{
/*
@@ -372,7 +372,7 @@ READ8_MEMBER( pc1512_keyboard_t::kb_bus_r )
// kb_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( pc1512_keyboard_t::kb_p1_w )
+WRITE8_MEMBER( pc1512_keyboard_device::kb_p1_w )
{
/*
@@ -397,7 +397,7 @@ WRITE8_MEMBER( pc1512_keyboard_t::kb_p1_w )
// kb_p2_r -
//-------------------------------------------------
-READ8_MEMBER( pc1512_keyboard_t::kb_p2_r )
+READ8_MEMBER( pc1512_keyboard_device::kb_p2_r )
{
/*
@@ -427,7 +427,7 @@ READ8_MEMBER( pc1512_keyboard_t::kb_p2_r )
// kb_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( pc1512_keyboard_t::kb_p2_w )
+WRITE8_MEMBER( pc1512_keyboard_device::kb_p2_w )
{
/*
@@ -468,7 +468,7 @@ WRITE8_MEMBER( pc1512_keyboard_t::kb_p2_w )
// kb_t0_r -
//-------------------------------------------------
-READ_LINE_MEMBER( pc1512_keyboard_t::kb_t0_r )
+READ_LINE_MEMBER( pc1512_keyboard_device::kb_t0_r )
{
return m_m1;
}
@@ -478,7 +478,7 @@ READ_LINE_MEMBER( pc1512_keyboard_t::kb_t0_r )
// kb_t1_r -
//-------------------------------------------------
-READ_LINE_MEMBER( pc1512_keyboard_t::kb_t1_r )
+READ_LINE_MEMBER( pc1512_keyboard_device::kb_t1_r )
{
return m_m2;
}
diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h
index 8fc7f09339f..469c744d909 100644
--- a/src/mame/machine/pc1512kb.h
+++ b/src/mame/machine/pc1512kb.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_PC1512KB_H
+#define MAME_MACHINE_PC1512KB_H
-#ifndef __PC1512_KEYBOARD__
-#define __PC1512_KEYBOARD__
+#pragma once
#include "bus/vcs_ctrl/ctrl.h"
@@ -30,10 +30,10 @@
//**************************************************************************
#define MCFG_PC1512_KEYBOARD_CLOCK_CALLBACK(_write) \
- devcb = &pc1512_keyboard_t::set_clock_wr_callback(*device, DEVCB_##_write);
+ devcb = &pc1512_keyboard_device::set_clock_wr_callback(*device, DEVCB_##_write);
#define MCFG_PC1512_KEYBOARD_DATA_CALLBACK(_write) \
- devcb = &pc1512_keyboard_t::set_data_wr_callback(*device, DEVCB_##_write);
+ devcb = &pc1512_keyboard_device::set_data_wr_callback(*device, DEVCB_##_write);
@@ -41,16 +41,16 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> pc1512_keyboard_t
+// ======================> pc1512_keyboard_device
-class pc1512_keyboard_t : public device_t
+class pc1512_keyboard_device : public device_t
{
public:
// construction/destruction
- pc1512_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc1512_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_t &>(device).m_write_clock.set_callback(object); }
- template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<pc1512_keyboard_t &>(device).m_write_data.set_callback(object); }
+ template <class Object> static devcb_base &set_clock_wr_callback(device_t &device, Object &&cb) { return downcast<pc1512_keyboard_device &>(device).m_write_clock.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_data_wr_callback(device_t &device, Object &&cb) { return downcast<pc1512_keyboard_device &>(device).m_write_data.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -102,8 +102,7 @@ private:
// device type definition
-extern const device_type PC1512_KEYBOARD;
-
+DECLARE_DEVICE_TYPE(PC1512_KEYBOARD, pc1512_keyboard_device)
-#endif
+#endif // MAME_MACHINE_PC1512KB_H
diff --git a/src/mame/machine/pc9801_118.cpp b/src/mame/machine/pc9801_118.cpp
index 3fdd6dd0e06..2d2b9a015cd 100644
--- a/src/mame/machine/pc9801_118.cpp
+++ b/src/mame/machine/pc9801_118.cpp
@@ -27,7 +27,7 @@
//**************************************************************************
// device type definition
-const device_type PC9801_118 = device_creator<pc9801_118_device>;
+DEFINE_DEVICE_TYPE(PC9801_118, pc9801_118_device, "pc9801_118", "pc9801_118")
READ8_MEMBER(pc9801_118_device::opn_porta_r)
@@ -121,7 +121,7 @@ const tiny_rom_entry *pc9801_118_device::device_rom_region() const
//-------------------------------------------------
pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC9801_118, "pc9801_118", tag, owner, clock, "pc9801_118", __FILE__),
+ : device_t(mconfig, PC9801_118, tag, owner, clock),
// m_maincpu(*this, "^maincpu"),
m_opn3(*this, "opn3")
{
diff --git a/src/mame/machine/pc9801_118.h b/src/mame/machine/pc9801_118.h
index 87bc44cb7db..ea6d0397cb0 100644
--- a/src/mame/machine/pc9801_118.h
+++ b/src/mame/machine/pc9801_118.h
@@ -6,11 +6,11 @@
***************************************************************************/
+#ifndef MAME_MACHINE_PC9801_118_H
+#define MAME_MACHINE_PC9801_118_H
#pragma once
-#ifndef __PC9801_118DEV_H__
-#define __PC9801_118DEV_H__
#include "machine/pic8259.h"
#include "sound/2608intf.h"
@@ -40,9 +40,8 @@ public:
DECLARE_WRITE8_MEMBER(pc9801_118_ext_w);
DECLARE_WRITE_LINE_MEMBER(pc9801_sound_irq);
-// required_device<cpu_device> m_maincpu;
- required_device<ym2608_device> m_opn3;
virtual const tiny_rom_entry *device_rom_region() const override;
+
protected:
// device-level overrides
virtual void device_validity_check(validity_checker &valid) const override;
@@ -51,13 +50,16 @@ protected:
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
private:
+// required_device<cpu_device> m_maincpu;
+ required_device<ym2608_device> m_opn3;
+
uint8_t m_joy_sel;
uint8_t m_ext_reg;
};
// device type definition
-extern const device_type PC9801_118;
+DECLARE_DEVICE_TYPE(PC9801_118, pc9801_118_device)
@@ -67,4 +69,4 @@ extern const device_type PC9801_118;
-#endif
+#endif // MAME_MACHINE_PC9801_118_H
diff --git a/src/mame/machine/pc9801_26.cpp b/src/mame/machine/pc9801_26.cpp
index 29b65d10b96..5992a2daa7e 100644
--- a/src/mame/machine/pc9801_26.cpp
+++ b/src/mame/machine/pc9801_26.cpp
@@ -26,7 +26,7 @@
//**************************************************************************
// device type definition
-const device_type PC9801_26 = device_creator<pc9801_26_device>;
+DEFINE_DEVICE_TYPE(PC9801_26, pc9801_26_device, "pc9801_26", "pc9801_26")
@@ -113,7 +113,7 @@ ioport_constructor pc9801_26_device::device_input_ports() const
//-------------------------------------------------
pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC9801_26, "pc9801_26", tag, owner, clock, "pc9801_26", __FILE__),
+ : device_t(mconfig, PC9801_26, tag, owner, clock),
// m_maincpu(*this, "^maincpu"),
m_opn(*this, "opn")
{
diff --git a/src/mame/machine/pc9801_26.h b/src/mame/machine/pc9801_26.h
index 4239891c7f2..1aa42a013e9 100644
--- a/src/mame/machine/pc9801_26.h
+++ b/src/mame/machine/pc9801_26.h
@@ -6,11 +6,11 @@ Template for skeleton device
***************************************************************************/
+#ifndef MAME_MACHINE_PC9801_26_H
+#define MAME_MACHINE_PC9801_26_H
#pragma once
-#ifndef __PC9801_26DEV_H__
-#define __PC9801_26DEV_H__
#include "machine/pic8259.h"
#include "sound/2203intf.h"
@@ -38,8 +38,6 @@ public:
DECLARE_WRITE8_MEMBER(pc9801_26_w);
DECLARE_WRITE_LINE_MEMBER(pc9801_sound_irq);
-// required_device<cpu_device> m_maincpu;
- required_device<ym2203_device> m_opn;
protected:
// device-level overrides
virtual void device_validity_check(validity_checker &valid) const override;
@@ -48,13 +46,15 @@ protected:
void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
private:
- uint8_t m_joy_sel;
+// required_device<cpu_device> m_maincpu;
+ required_device<ym2203_device> m_opn;
+ uint8_t m_joy_sel;
};
// device type definition
-extern const device_type PC9801_26;
+DECLARE_DEVICE_TYPE(PC9801_26, pc9801_26_device)
@@ -64,4 +64,4 @@ extern const device_type PC9801_26;
-#endif
+#endif // MAME_MACHINE_PC9801_26_H
diff --git a/src/mame/machine/pc9801_86.cpp b/src/mame/machine/pc9801_86.cpp
index 15899b1029d..f94b6476c4b 100644
--- a/src/mame/machine/pc9801_86.cpp
+++ b/src/mame/machine/pc9801_86.cpp
@@ -28,7 +28,7 @@
//**************************************************************************
// device type definition
-const device_type PC9801_86 = device_creator<pc9801_86_device>;
+DEFINE_DEVICE_TYPE(PC9801_86, pc9801_86_device, "pc9801_86", "pc9801_86")
READ8_MEMBER(pc9801_86_device::opn_porta_r)
@@ -129,7 +129,7 @@ ioport_constructor pc9801_86_device::device_input_ports() const
//-------------------------------------------------
pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC9801_86, "pc9801_86", tag, owner, clock, "pc9801_86", __FILE__),
+ : device_t(mconfig, PC9801_86, tag, owner, clock),
m_opna(*this, "opna"),
m_ldac(*this, "ldac"),
m_rdac(*this, "rdac"),
diff --git a/src/mame/machine/pc9801_86.h b/src/mame/machine/pc9801_86.h
index 0e99f90fc10..eb022a8a92d 100644
--- a/src/mame/machine/pc9801_86.h
+++ b/src/mame/machine/pc9801_86.h
@@ -6,11 +6,11 @@
***************************************************************************/
+#ifndef MAME_MACHINE_PC9801_86_H
+#define MAME_MACHINE_PC9801_86_H
#pragma once
-#ifndef __PC9801_86DEV_H__
-#define __PC9801_86DEV_H__
#include "machine/pic8259.h"
#include "sound/2608intf.h"
@@ -66,7 +66,7 @@ private:
// device type definition
-extern const device_type PC9801_86;
+DECLARE_DEVICE_TYPE(PC9801_86, pc9801_86_device)
@@ -76,4 +76,4 @@ extern const device_type PC9801_86;
-#endif
+#endif // MAME_MACHINE_PC9801_86_H
diff --git a/src/mame/machine/pc9801_cbus.cpp b/src/mame/machine/pc9801_cbus.cpp
index ec3b0df3eb0..06af21561d3 100644
--- a/src/mame/machine/pc9801_cbus.cpp
+++ b/src/mame/machine/pc9801_cbus.cpp
@@ -15,7 +15,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type PC9801CBUS_SLOT = device_creator<pc9801_slot_device>;
+DEFINE_DEVICE_TYPE(PC9801CBUS_SLOT, pc9801_slot_device, "pc9801_slot", "PC-9801 sound cbus slot")
@@ -53,8 +53,8 @@ device_pc9801cbus_card_interface::~device_pc9801cbus_card_interface()
//-------------------------------------------------
pc9801_slot_device::pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, PC9801CBUS_SLOT, "PC-9801 sound cbus slot", tag, owner, clock, "pc9801_slot", __FILE__),
- device_slot_interface(mconfig, *this)
+ device_t(mconfig, PC9801CBUS_SLOT, tag, owner, clock),
+ device_slot_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/pc9801_cbus.h b/src/mame/machine/pc9801_cbus.h
index b3d8b85c142..1b1084d8961 100644
--- a/src/mame/machine/pc9801_cbus.h
+++ b/src/mame/machine/pc9801_cbus.h
@@ -4,11 +4,11 @@
**********************************************************************/
+#ifndef MAME_MACHINE_PC9801_CBUS_H
+#define MAME_MACHINE_PC9801_CBUS_H
#pragma once
-#ifndef __PC9801_SLOTCBUS__
-#define __PC9801_SLOTCBUS__
@@ -52,13 +52,13 @@ public:
// ======================> pc9801_slot_device
-class pc9801_slot_device : public device_t,
- public device_slot_interface
+class pc9801_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+protected:
// device-level overrides
virtual void device_start() override;
virtual void device_config_complete() override;
@@ -69,8 +69,6 @@ public:
// device type definition
-extern const device_type PC9801CBUS_SLOT;
+DECLARE_DEVICE_TYPE(PC9801CBUS_SLOT, pc9801_slot_device)
-
-
-#endif
+#endif // MAME_MACHINE_PC9801_CBUS_H
diff --git a/src/mame/machine/pc9801_cd.cpp b/src/mame/machine/pc9801_cd.cpp
index a8ec66ac672..46368ddfcc9 100644
--- a/src/mame/machine/pc9801_cd.cpp
+++ b/src/mame/machine/pc9801_cd.cpp
@@ -4,10 +4,10 @@
#include "pc9801_cd.h"
// device type definition
-const device_type PC9801_CD = device_creator<pc9801_cd_device>;
+DEFINE_DEVICE_TYPE(PC9801_CD, pc9801_cd_device, "pc9801_cd", "PC9801 CD-ROM Drive")
pc9801_cd_device::pc9801_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- atapi_cdrom_device(mconfig, PC9801_CD, "PC9801 CD-ROM Drive", tag, owner, clock, "pc9801_cd", __FILE__)
+ atapi_cdrom_device(mconfig, PC9801_CD, tag, owner, clock)
{
}
diff --git a/src/mame/machine/pc9801_cd.h b/src/mame/machine/pc9801_cd.h
index 5fdc19eaf21..9abee3a8092 100644
--- a/src/mame/machine/pc9801_cd.h
+++ b/src/mame/machine/pc9801_cd.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:smf
-#ifndef __PC9801_CD_H__
-#define __PC9801_CD_H__
+#ifndef MAME_MACHINE_PC9801_CD_H
+#define MAME_MACHINE_PC9801_CD_H
#include "machine/atapicdr.h"
@@ -18,6 +18,6 @@ protected:
};
// device type definition
-extern const device_type PC9801_CD;
+DECLARE_DEVICE_TYPE(PC9801_CD, pc9801_cd_device)
-#endif
+#endif // MAME_MACHINE_PC9801_CD_H
diff --git a/src/mame/machine/pc9801_kbd.cpp b/src/mame/machine/pc9801_kbd.cpp
index d7e01fc887a..2788453358d 100644
--- a/src/mame/machine/pc9801_kbd.cpp
+++ b/src/mame/machine/pc9801_kbd.cpp
@@ -24,7 +24,7 @@
//**************************************************************************
// device type definition
-const device_type PC9801_KBD = device_creator<pc9801_kbd_device>;
+DEFINE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device, "pc9801_kbd", "PC-9801 Keyboard")
//**************************************************************************
@@ -36,7 +36,7 @@ const device_type PC9801_KBD = device_creator<pc9801_kbd_device>;
//-------------------------------------------------
pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, PC9801_KBD, "pc9801_kbd", tag, owner, clock, "pc9801_kbd_", __FILE__),
+ device_t(mconfig, PC9801_KBD, tag, owner, clock),
m_write_irq(*this)
{
}
diff --git a/src/mame/machine/pc9801_kbd.h b/src/mame/machine/pc9801_kbd.h
index 547dca96f64..a5b6912c1cc 100644
--- a/src/mame/machine/pc9801_kbd.h
+++ b/src/mame/machine/pc9801_kbd.h
@@ -5,11 +5,11 @@
PC-9801 Keyboard simulation
***************************************************************************/
+#ifndef MAME_MACHINE_PC9801_KBD_H
+#define MAME_MACHINE_PC9801_KBD_H
#pragma once
-#ifndef __PC9801_KBDDEV_H__
-#define __PC9801_KBDDEV_H__
//**************************************************************************
@@ -32,7 +32,7 @@ public:
// construction/destruction
pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<pc9801_kbd_device &>(device).m_write_irq.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<pc9801_kbd_device &>(device).m_write_irq.set_callback(std::forward<Object>(cb)); }
virtual ioport_constructor device_input_ports() const override;
@@ -60,7 +60,7 @@ protected:
// device type definition
-extern const device_type PC9801_KBD;
+DECLARE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device)
@@ -70,4 +70,4 @@ extern const device_type PC9801_KBD;
-#endif
+#endif // MAME_MACHINE_PC9801_KBD_H
diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp
index d356084b042..41e1152e3e7 100644
--- a/src/mame/machine/pcd_kbd.cpp
+++ b/src/mame/machine/pcd_kbd.cpp
@@ -7,7 +7,7 @@
#include "sound/spkrdev.h"
#include "speaker.h"
-const device_type PCD_KEYBOARD = device_creator<pcd_keyboard_device>;
+DEFINE_DEVICE_TYPE(PCD_KEYBOARD, pcd_keyboard_device, "pcd_kbd", "Siemens PC-D Keyboard")
ROM_START( pcd_keyboard )
ROM_REGION(0x1000, "mcu", 0)
@@ -224,7 +224,7 @@ ioport_constructor pcd_keyboard_device::device_input_ports() const
}
pcd_keyboard_device::pcd_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PCD_KEYBOARD, "PC-D Keyboard", tag, owner, clock, "pcd_kbd", __FILE__)
+ : device_t(mconfig, PCD_KEYBOARD, tag, owner, clock)
, m_rows(*this, "ROW.%u", 0)
, m_p1(0)
, m_out_tx_handler(*this)
diff --git a/src/mame/machine/pcd_kbd.h b/src/mame/machine/pcd_kbd.h
index 6dcf1d9a426..de373132a6b 100644
--- a/src/mame/machine/pcd_kbd.h
+++ b/src/mame/machine/pcd_kbd.h
@@ -3,6 +3,8 @@
#ifndef MAME_INCLUDES_PCD_KBD_H
#define MAME_INCLUDES_PCD_KBD_H
+#pragma once
+
#define MCFG_PCD_KEYBOARD_OUT_TX_HANDLER(_devcb) \
devcb = &pcd_keyboard_device::set_out_tx_handler(*device, DEVCB_##_devcb);
@@ -24,6 +26,7 @@ public:
DECLARE_WRITE8_MEMBER( p1_w );
DECLARE_READ_LINE_MEMBER( t0_r );
DECLARE_WRITE_LINE_MEMBER( t0_w );
+
private:
required_ioport_array<17> m_rows;
uint8_t m_p1;
@@ -32,5 +35,6 @@ private:
};
extern const device_type PCD_KEYBOARD;
+DECLARE_DEVICE_TYPE(PCD_KEYBOARD, pcd_keyboard_device)
#endif // MAME_INCLUDES_PCD_KBD_H
diff --git a/src/mame/machine/pce220_ser.cpp b/src/mame/machine/pce220_ser.cpp
index 4d233fdda5b..a6459ebac6c 100644
--- a/src/mame/machine/pce220_ser.cpp
+++ b/src/mame/machine/pce220_ser.cpp
@@ -37,15 +37,15 @@ enum
};
// device type definition
-const device_type PCE220SERIAL = device_creator<pce220_serial_device>;
+DEFINE_DEVICE_TYPE(PCE220SERIAL, pce220_serial_device, "pce220_serial", "Sharp PC-E220 serial")
//-------------------------------------------------
// pce220_serial_device - constructor
//-------------------------------------------------
pce220_serial_device::pce220_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PCE220SERIAL, "Sharp PC-E220 serial", tag, owner, clock, "pce220_serial", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, PCE220SERIAL, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/pce220_ser.h b/src/mame/machine/pce220_ser.h
index 73ed3babd28..f8ff2257e58 100644
--- a/src/mame/machine/pce220_ser.h
+++ b/src/mame/machine/pce220_ser.h
@@ -8,8 +8,10 @@
****************************************************************************/
-#ifndef __PCE220_SER_H__
-#define __PCE220_SER_H__
+#ifndef MAME_MACHINE_PCE220_SER_H
+#define MAME_MACHINE_PCE220_SER_H
+
+#pragma once
/***************************************************************************
@@ -80,7 +82,7 @@ private:
};
// device type definition
-extern const device_type PCE220SERIAL;
+DECLARE_DEVICE_TYPE(PCE220SERIAL, pce220_serial_device)
/***************************************************************************
DEVICE CONFIGURATION MACROS
@@ -89,4 +91,5 @@ extern const device_type PCE220SERIAL;
#define MCFG_PCE220_SERIAL_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, PCE220SERIAL, 0)
-#endif /* __PCE220_SER_H__ */
+
+#endif // MAME_MACHINE_PCE220_SER_H
diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp
index a3919312903..8226802c2b3 100644
--- a/src/mame/machine/pce_cd.cpp
+++ b/src/mame/machine/pce_cd.cpp
@@ -75,16 +75,16 @@ CD Interface Register 0x0f - ADPCM fade in/out register
#define PCE_CD_CLOCK 9216000
-const device_type PCE_CD = device_creator<pce_cd_device>;
+DEFINE_DEVICE_TYPE(PCE_CD, pce_cd_device, "pcecd", "PCE CD Add-on")
pce_cd_device::pce_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PCE_CD, "PCE CD Add-on", tag, owner, clock, "pcecd", __FILE__),
- m_maincpu(*this, ":maincpu"),
- m_msm(*this, "msm5205"),
- m_cdda(*this, "cdda"),
- m_nvram(*this, "bram"),
- m_cdrom(*this, "cdrom")
+ : device_t(mconfig, PCE_CD, tag, owner, clock)
+ , m_maincpu(*this, ":maincpu")
+ , m_msm(*this, "msm5205")
+ , m_cdda(*this, "cdda")
+ , m_nvram(*this, "bram")
+ , m_cdrom(*this, "cdrom")
{
}
@@ -249,7 +249,7 @@ static MACHINE_CONFIG_FRAGMENT( pce_cd )
MCFG_SOUND_ADD( "msm5205", MSM5205, PCE_CD_CLOCK / 6 )
MCFG_MSM5205_VCLK_CB(WRITELINE(pce_cd_device, msm5205_int)) /* interrupt function */
- MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 1/48 prescaler, 4bit data */
+ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 1/48 prescaler, 4bit data */
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "^:lspeaker", 0.50 )
MCFG_SOUND_ROUTE( ALL_OUTPUTS, "^:rspeaker", 0.50 )
diff --git a/src/mame/machine/pce_cd.h b/src/mame/machine/pce_cd.h
index 504dacc2b36..dba5682b082 100644
--- a/src/mame/machine/pce_cd.h
+++ b/src/mame/machine/pce_cd.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef __PCE_CD_H
-#define __PCE_CD_H
+#ifndef MAME_MACHINE_PCE_CD_H
+#define MAME_MACHINE_PCE_CD_H
+
+#pragma once
/***************************************************************************
TYPE DEFINITIONS
@@ -43,7 +45,6 @@ class pce_cd_device : public device_t
public:
// construction/destruction
pce_cd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual ~pce_cd_device() {}
// device-level overrides
virtual void device_start() override;
@@ -174,7 +175,7 @@ private:
// device type definition
-extern const device_type PCE_CD;
+DECLARE_DEVICE_TYPE(PCE_CD, pce_cd_device)
/***************************************************************************
@@ -185,4 +186,4 @@ extern const device_type PCE_CD;
MCFG_DEVICE_ADD(_tag, PCE_CD, 0)
-#endif
+#endif // MAME_MACHINE_PCE_CD_H
diff --git a/src/mame/machine/pecom.cpp b/src/mame/machine/pecom.cpp
index 894eed534bd..ba2bc89a032 100644
--- a/src/mame/machine/pecom.cpp
+++ b/src/mame/machine/pecom.cpp
@@ -108,7 +108,7 @@ READ8_MEMBER(pecom_state::pecom_keyboard_r)
Address is available on address bus during reading of value from port, and that is
used to determine keyboard line reading
*/
- uint16_t addr = m_cdp1802->state_int(COSMAC_R0 + m_cdp1802->state_int(COSMAC_X));
+ uint16_t addr = m_cdp1802->state_int(cosmac_device::COSMAC_R0 + m_cdp1802->state_int(cosmac_device::COSMAC_X));
/* just in case somone is reading non existing ports */
if (addr<0x7cca || addr>0x7ce3) return 0;
return m_io_ports[addr - 0x7cca]->read() & 0x03;
diff --git a/src/mame/machine/pgmprot_igs025_igs012.cpp b/src/mame/machine/pgmprot_igs025_igs012.cpp
index 5a410899d93..fa965163b1b 100644
--- a/src/mame/machine/pgmprot_igs025_igs012.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs012.cpp
@@ -132,7 +132,7 @@ static ADDRESS_MAP_START( drgw2_mem, AS_PROGRAM, 16, pgm_012_025_state )
AM_RANGE(0xd00000, 0xd00fff) AM_NOP // Written, but never read back? Related to the protection device? - IGS012?
ADDRESS_MAP_END
-MACHINE_CONFIG_START( pgm_012_025_drgw2, pgm_012_025_state )
+MACHINE_CONFIG_START( pgm_012_025_drgw2 )
MCFG_FRAGMENT_ADD(pgmbase)
MCFG_CPU_MODIFY("maincpu")
diff --git a/src/mame/machine/pgmprot_igs025_igs022.cpp b/src/mame/machine/pgmprot_igs025_igs022.cpp
index 403f8ee35a2..fad7d6a4c0e 100644
--- a/src/mame/machine/pgmprot_igs025_igs022.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs022.cpp
@@ -374,7 +374,7 @@ static ADDRESS_MAP_START( killbld_mem, AS_PROGRAM, 16, pgm_022_025_state )
ADDRESS_MAP_END
-MACHINE_CONFIG_START( pgm_022_025, pgm_022_025_state )
+MACHINE_CONFIG_START( pgm_022_025 )
MCFG_FRAGMENT_ADD(pgmbase)
MCFG_CPU_MODIFY("maincpu")
diff --git a/src/mame/machine/pgmprot_igs025_igs028.cpp b/src/mame/machine/pgmprot_igs025_igs028.cpp
index 84fcfbe731e..1f679289299 100644
--- a/src/mame/machine/pgmprot_igs025_igs028.cpp
+++ b/src/mame/machine/pgmprot_igs025_igs028.cpp
@@ -185,7 +185,7 @@ void pgm_028_025_state::igs025_to_igs028_callback( void )
}
-MACHINE_CONFIG_START( pgm_028_025_ol, pgm_028_025_state )
+MACHINE_CONFIG_START( pgm_028_025_ol )
MCFG_FRAGMENT_ADD(pgmbase)
MCFG_CPU_MODIFY("maincpu")
diff --git a/src/mame/machine/pgmprot_igs027a_type1.cpp b/src/mame/machine/pgmprot_igs027a_type1.cpp
index 51cb33039d3..adfa59a023f 100644
--- a/src/mame/machine/pgmprot_igs027a_type1.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type1.cpp
@@ -211,7 +211,7 @@ MACHINE_START_MEMBER(pgm_arm_type1_state,pgm_arm_type1)
save_item(NAME(m_slots));
}
-MACHINE_CONFIG_START( pgm_arm_type1_cave, pgm_arm_type1_state )
+MACHINE_CONFIG_START( pgm_arm_type1_cave )
MCFG_FRAGMENT_ADD(pgmbase)
MCFG_CPU_MODIFY("maincpu")
diff --git a/src/mame/machine/pgmprot_igs027a_type2.cpp b/src/mame/machine/pgmprot_igs027a_type2.cpp
index 7f7e72565e2..b172cf07eaa 100644
--- a/src/mame/machine/pgmprot_igs027a_type2.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type2.cpp
@@ -130,7 +130,7 @@ MACHINE_START_MEMBER(pgm_arm_type2_state,pgm_arm_type2)
/******* ARM 55857F *******/
-MACHINE_CONFIG_START( pgm_arm_type2, pgm_arm_type2_state )
+MACHINE_CONFIG_START( pgm_arm_type2 )
MCFG_FRAGMENT_ADD(pgmbase)
MCFG_MACHINE_START_OVERRIDE(pgm_arm_type2_state, pgm_arm_type2 )
diff --git a/src/mame/machine/pgmprot_igs027a_type3.cpp b/src/mame/machine/pgmprot_igs027a_type3.cpp
index 0aab879fc9b..9bfcbded9d9 100644
--- a/src/mame/machine/pgmprot_igs027a_type3.cpp
+++ b/src/mame/machine/pgmprot_igs027a_type3.cpp
@@ -188,7 +188,7 @@ MACHINE_START_MEMBER(pgm_arm_type3_state,pgm_arm_type3)
/******* ARM 55857G *******/
-MACHINE_CONFIG_START( pgm_arm_type3, pgm_arm_type3_state )
+MACHINE_CONFIG_START( pgm_arm_type3 )
MCFG_FRAGMENT_ADD(pgmbase)
MCFG_MACHINE_START_OVERRIDE(pgm_arm_type3_state, pgm_arm_type3 )
diff --git a/src/mame/machine/pgmprot_orlegend.cpp b/src/mame/machine/pgmprot_orlegend.cpp
index 13efe757335..9f6d6aa5aff 100644
--- a/src/mame/machine/pgmprot_orlegend.cpp
+++ b/src/mame/machine/pgmprot_orlegend.cpp
@@ -220,6 +220,6 @@ INPUT_PORTS_START( orlegendk )
INPUT_PORTS_END
-MACHINE_CONFIG_START( pgm_asic3, pgm_asic3_state )
+MACHINE_CONFIG_START( pgm_asic3 )
MCFG_FRAGMENT_ADD(pgmbase)
MACHINE_CONFIG_END
diff --git a/src/mame/machine/playch10.cpp b/src/mame/machine/playch10.cpp
index c6ef69d0149..aec05bfadb3 100644
--- a/src/mame/machine/playch10.cpp
+++ b/src/mame/machine/playch10.cpp
@@ -752,7 +752,7 @@ DRIVER_INIT_MEMBER(playch10_state,pceboard)
machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::eboard_rom_switch_w),this));
/* ppu_latch callback */
- m_ppu->set_latch(ppu2c0x_latch_delegate(FUNC(playch10_state::mapper9_latch),this));
+ m_ppu->set_latch(ppu2c0x_device::latch_delegate(FUNC(playch10_state::mapper9_latch),this));
/* nvram at $6000-$6fff */
machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x6fff);
@@ -804,7 +804,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcfboard_2)
void playch10_state::gboard_scanline_cb( int scanline, int vblank, int blanked )
{
- if (scanline < PPU_BOTTOM_VISIBLE_SCANLINE)
+ if (scanline < ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE)
{
int priorCount = m_IRQ_count;
if (m_IRQ_count == 0)
@@ -979,7 +979,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcgboard)
/* common init */
DRIVER_INIT_CALL(playch10);
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this));
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this));
}
DRIVER_INIT_MEMBER(playch10_state,pcgboard_type2)
@@ -1099,7 +1099,7 @@ DRIVER_INIT_MEMBER(playch10_state,pchboard)
/* common init */
DRIVER_INIT_CALL(playch10);
- m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this));
+ m_ppu->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(playch10_state::gboard_scanline_cb),this));
}
/**********************************************************************************/
diff --git a/src/mame/machine/poly88.cpp b/src/mame/machine/poly88.cpp
index 11a8ed5de3e..579f478a45a 100644
--- a/src/mame/machine/poly88.cpp
+++ b/src/mame/machine/poly88.cpp
@@ -302,7 +302,7 @@ SNAPSHOT_LOAD_MEMBER( poly88_state, poly88 )
break;
case 3 :
/* 03 Auto Start @ Address */
- m_maincpu->set_state_int(I8085_PC, address);
+ m_maincpu->set_state_int(i8080_cpu_device::I8085_PC, address);
theend = 1;
break;
case 4 :
diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp
index a89ed51af15..e46479cd43b 100644
--- a/src/mame/machine/prof80mmu.cpp
+++ b/src/mame/machine/prof80mmu.cpp
@@ -15,7 +15,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PROF80_MMU = device_creator<prof80_mmu_device>;
+DEFINE_DEVICE_TYPE(PROF80_MMU, prof80_mmu_device, "prof80_mmu", "PROF80 MMU")
DEVICE_ADDRESS_MAP_START( z80_program_map, 8, prof80_mmu_device )
@@ -36,9 +36,9 @@ ADDRESS_MAP_END
//-------------------------------------------------
prof80_mmu_device::prof80_mmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PROF80_MMU, "PROF80_MMU", tag, owner, clock, "prof80_mmu", __FILE__),
- device_memory_interface(mconfig, *this),
- m_program_space_config("program", ENDIANNESS_LITTLE, 8, 20, 0, *ADDRESS_MAP_NAME(program_map))
+ : device_t(mconfig, PROF80_MMU, tag, owner, clock)
+ , device_memory_interface(mconfig, *this)
+ , m_program_space_config("program", ENDIANNESS_LITTLE, 8, 20, 0, *ADDRESS_MAP_NAME(program_map))
{
}
diff --git a/src/mame/machine/prof80mmu.h b/src/mame/machine/prof80mmu.h
index f6694ac7a1f..0df2a19d553 100644
--- a/src/mame/machine/prof80mmu.h
+++ b/src/mame/machine/prof80mmu.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_PROF80MMU_H
+#define MAME_MACHINE_PROF80MMU_H
-#ifndef __PROF80_MMU__
-#define __PROF80_MMU__
+#pragma once
@@ -30,8 +30,7 @@
// ======================> prof80_mmu_device
-class prof80_mmu_device : public device_t,
- public device_memory_interface
+class prof80_mmu_device : public device_t, public device_memory_interface
{
public:
prof80_mmu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -60,8 +59,8 @@ private:
// device type definition
-extern const device_type PROF80_MMU;
+DECLARE_DEVICE_TYPE(PROF80_MMU, prof80_mmu_device)
-#endif
+#endif // MAME_MACHINE_PROF80MMU_H
diff --git a/src/mame/machine/psion_pack.cpp b/src/mame/machine/psion_pack.cpp
index a6e91766cd4..498ceeaf85c 100644
--- a/src/mame/machine/psion_pack.cpp
+++ b/src/mame/machine/psion_pack.cpp
@@ -54,15 +54,15 @@ static const char *datapack_option_spec =
// device type definition
-const device_type PSION_DATAPACK = device_creator<datapack_device>;
+DEFINE_DEVICE_TYPE(PSION_DATAPACK, datapack_device, "datapack", "Psion Datapack")
//-------------------------------------------------
// datapack_device - constructor
//-------------------------------------------------
datapack_device::datapack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PSION_DATAPACK, "Psion Datapack", tag, owner, clock, "datapack", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, PSION_DATAPACK, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/psion_pack.h b/src/mame/machine/psion_pack.h
index 24516a93341..13584013754 100644
--- a/src/mame/machine/psion_pack.h
+++ b/src/mame/machine/psion_pack.h
@@ -6,8 +6,8 @@
****************************************************************************/
-#ifndef __PSION_PACK_H__
-#define __PSION_PACK_H__
+#ifndef MAME_MACHINE_PSION_PACK_H
+#define MAME_MACHINE_PSION_PACK_H
#include "softlist_dev.h"
@@ -69,7 +69,7 @@ private:
// device type definition
-extern const device_type PSION_DATAPACK;
+DECLARE_DEVICE_TYPE(PSION_DATAPACK, datapack_device)
/***************************************************************************
@@ -78,4 +78,5 @@ extern const device_type PSION_DATAPACK;
#define MCFG_PSION_DATAPACK_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, PSION_DATAPACK, 0)
-#endif /* __PSION_PACK_H__ */
+
+#endif // MAME_MACHINE_PSION_PACK_H
diff --git a/src/mame/machine/psxcd.cpp b/src/mame/machine/psxcd.cpp
index f1b4a3fd0c5..f3f1a1cb5e3 100644
--- a/src/mame/machine/psxcd.cpp
+++ b/src/mame/machine/psxcd.cpp
@@ -83,10 +83,10 @@ enum submode_flags
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type PSXCD = device_creator<psxcd_device>;
+DEFINE_DEVICE_TYPE(PSXCD, psxcd_device, "psx_cd", "PSX CD-ROM")
psxcd_device::psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- cdrom_image_device(mconfig, PSXCD, "PSX Cdrom", tag, owner, clock, "psx_cd", __FILE__),
+ cdrom_image_device(mconfig, PSXCD, tag, owner, clock),
m_irq_handler(*this)
{
static_set_interface(*this, "psx_cdrom");
diff --git a/src/mame/machine/psxcd.h b/src/mame/machine/psxcd.h
index 509817eab1e..b1cc0e5966a 100644
--- a/src/mame/machine/psxcd.h
+++ b/src/mame/machine/psxcd.h
@@ -1,13 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:smf,R. Belmont,pSXAuthor,Carl
-#ifndef _included_psxcdrom_
-#define _included_psxcdrom_
+#ifndef MAME_MACHINE_PSXCD_H
+#define MAME_MACHINE_PSXCD_H
+
+#pragma once
#include "imagedev/chd_cd.h"
#include "sound/spu.h"
-#define MAX_PSXCD_TIMERS (4)
-
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
//**************************************************************************
@@ -24,7 +24,7 @@ public:
psxcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<psxcd_device &>(device).m_irq_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb) { return downcast<psxcd_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
virtual image_init_result call_load() override;
virtual void call_unload() override;
@@ -40,6 +40,8 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
private:
+ static constexpr unsigned MAX_PSXCD_TIMERS = 4;
+
void write_command(uint8_t byte);
typedef void (psxcd_device::*cdcmd)();
@@ -156,6 +158,6 @@ private:
};
// device type definition
-extern const device_type PSXCD;
+DECLARE_DEVICE_TYPE(PSXCD, psxcd_device)
-#endif
+#endif // MAME_MACHINE_PSXCD_H
diff --git a/src/mame/machine/qimi.cpp b/src/mame/machine/qimi.cpp
index c698f3d587f..00bbc5fc209 100644
--- a/src/mame/machine/qimi.cpp
+++ b/src/mame/machine/qimi.cpp
@@ -15,14 +15,14 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type QIMI = device_creator<qimi_t>;
+DEFINE_DEVICE_TYPE(QIMI, qimi_device, "qimi", "QL Internal Mouse Interface")
//-------------------------------------------------
// INPUT_CHANGED_MEMBER( mouse_x_changed )
//-------------------------------------------------
-INPUT_CHANGED_MEMBER( qimi_t::mouse_x_changed )
+INPUT_CHANGED_MEMBER( qimi_device::mouse_x_changed )
{
if (newval > oldval)
{
@@ -46,7 +46,7 @@ INPUT_CHANGED_MEMBER( qimi_t::mouse_x_changed )
// INPUT_CHANGED_MEMBER( mouse_y_changed )
//-------------------------------------------------
-INPUT_CHANGED_MEMBER( qimi_t::mouse_y_changed )
+INPUT_CHANGED_MEMBER( qimi_device::mouse_y_changed )
{
if (newval < oldval)
{
@@ -72,10 +72,10 @@ INPUT_CHANGED_MEMBER( qimi_t::mouse_y_changed )
INPUT_PORTS_START( qimi )
PORT_START("mouse_x")
- PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, qimi_t, mouse_x_changed, 0)
+ PORT_BIT( 0xff, 0x00, IPT_MOUSE_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, qimi_device, mouse_x_changed, 0)
PORT_START("mouse_y")
- PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, qimi_t, mouse_y_changed, 0)
+ PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_CHANGED_MEMBER(DEVICE_SELF, qimi_device, mouse_y_changed, 0)
PORT_START("mouse_buttons")
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Right Mouse Button") PORT_CODE(MOUSECODE_BUTTON2)
@@ -88,7 +88,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
-ioport_constructor qimi_t::device_input_ports() const
+ioport_constructor qimi_device::device_input_ports() const
{
return INPUT_PORTS_NAME( qimi );
}
@@ -100,11 +100,11 @@ ioport_constructor qimi_t::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
-// qimi_t - constructor
+// qimi_device - constructor
//-------------------------------------------------
-qimi_t::qimi_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, QIMI, "QL Internal Mouse Interface", tag, owner, clock, "qimi", __FILE__),
+qimi_device::qimi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, QIMI, tag, owner, clock),
m_write_extint(*this),
m_buttons(*this, "mouse_buttons"),
m_status(0),
@@ -117,7 +117,7 @@ qimi_t::qimi_t(const machine_config &mconfig, const char *tag, device_t *owner,
// device_start - device-specific startup
//-------------------------------------------------
-void qimi_t::device_start()
+void qimi_device::device_start()
{
// resolve callbacks
m_write_extint.resolve_safe();
@@ -128,7 +128,7 @@ void qimi_t::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void qimi_t::device_reset()
+void qimi_device::device_reset()
{
m_status = 0;
m_extint_en = false;
@@ -139,7 +139,7 @@ void qimi_t::device_reset()
// read -
//-------------------------------------------------
-uint8_t qimi_t::read(address_space &space, offs_t offset, uint8_t data)
+uint8_t qimi_device::read(address_space &space, offs_t offset, uint8_t data)
{
switch (offset)
{
@@ -169,7 +169,7 @@ uint8_t qimi_t::read(address_space &space, offs_t offset, uint8_t data)
// write -
//-------------------------------------------------
-WRITE8_MEMBER( qimi_t::write )
+WRITE8_MEMBER( qimi_device::write )
{
// write to 0x1bfbe resets int status
if (offset == 0x1bfbe)
diff --git a/src/mame/machine/qimi.h b/src/mame/machine/qimi.h
index f35cbf1f749..4a714ccdf16 100644
--- a/src/mame/machine/qimi.h
+++ b/src/mame/machine/qimi.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_QIMI_H
+#define MAME_MACHINE_QIMI_H
-#ifndef __QIMI__
-#define __QIMI__
+#pragma once
@@ -19,7 +19,7 @@
//**************************************************************************
#define MCFG_QIMI_EXTINT_CALLBACK(_write) \
- devcb = &qimi_t::set_exting_wr_callback(*device, DEVCB_##_write);
+ devcb = &qimi_device::set_exting_wr_callback(*device, DEVCB_##_write);
@@ -27,15 +27,15 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> qimi_t
+// ======================> qimi_device
-class qimi_t : public device_t
+class qimi_device : public device_t
{
public:
// construction/destruction
- qimi_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ qimi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_exting_wr_callback(device_t &device, _Object object) { return downcast<qimi_t &>(device).m_write_extint.set_callback(object); }
+ template <class Object> static devcb_base &set_exting_wr_callback(device_t &device, Object &&cb) { return downcast<qimi_device &>(device).m_write_extint.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
@@ -71,7 +71,7 @@ private:
// device type definition
extern const device_type QIMI;
+DECLARE_DEVICE_TYPE(QIMI, qimi_device)
-
-#endif
+#endif // MAME_MACHINE_QIMI_H
diff --git a/src/mame/machine/qx10kbd.cpp b/src/mame/machine/qx10kbd.cpp
index a93bf7c7dd4..540ec24a2a8 100644
--- a/src/mame/machine/qx10kbd.cpp
+++ b/src/mame/machine/qx10kbd.cpp
@@ -9,7 +9,7 @@
qx10_keyboard_device::qx10_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : buffered_rs232_device(mconfig, QX10_KEYBOARD, "QX10 Keyboard", tag, owner, 0, "qx10_keyboard", __FILE__)
+ : buffered_rs232_device(mconfig, QX10_KEYBOARD, tag, owner, 0)
, device_matrix_keyboard_interface(mconfig, *this, "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8", "LINE9", "LINEA", "LINEB", "LINEC", "LINED", "LINEE", "LINEF")
{
}
@@ -244,4 +244,4 @@ ioport_constructor qx10_keyboard_device::device_input_ports() const
}
-const device_type QX10_KEYBOARD = device_creator<qx10_keyboard_device>;
+DEFINE_DEVICE_TYPE(QX10_KEYBOARD, qx10_keyboard_device, "qx10_keyboard", "Epson QX-10 Keyboard")
diff --git a/src/mame/machine/qx10kbd.h b/src/mame/machine/qx10kbd.h
index 61c0f40d7cb..11fd997875c 100644
--- a/src/mame/machine/qx10kbd.h
+++ b/src/mame/machine/qx10kbd.h
@@ -3,7 +3,11 @@
#ifndef MAME_MACHINE_QX10KBD_H
#define MAME_MACHINE_QX10KBD_H
-#include "bus/rs232/keyboard.h"
+#pragma once
+
+#include "bus/rs232/rs232.h"
+#include "machine/keyboard.h"
+
class qx10_keyboard_device : public buffered_rs232_device<16U>, protected device_matrix_keyboard_interface<16U>
{
@@ -20,6 +24,6 @@ private:
virtual void received_byte(uint8_t data) override;
};
-extern const device_type QX10_KEYBOARD;
+DECLARE_DEVICE_TYPE(QX10_KEYBOARD, qx10_keyboard_device)
#endif // MAME_MACHINE_QX10KBD_H
diff --git a/src/mame/machine/radio86.cpp b/src/mame/machine/radio86.cpp
index 8c083958504..c64d01fff69 100644
--- a/src/mame/machine/radio86.cpp
+++ b/src/mame/machine/radio86.cpp
@@ -129,7 +129,8 @@ void radio86_state::device_timer(emu_timer &timer, device_timer_id id, int param
READ8_MEMBER(radio86_state::radio_cpu_state_r)
{
- return space.device().state().state_int(I8085_STATUS);
+ // FIXME: the driver should handler the status callback rather than accessing this through the state interface
+ return space.device().state().state_int(i8080_cpu_device::I8085_STATUS);
}
READ8_MEMBER(radio86_state::radio_io_r)
diff --git a/src/mame/machine/rm380z.cpp b/src/mame/machine/rm380z.cpp
index c3919c51c23..e811de279fa 100644
--- a/src/mame/machine/rm380z.cpp
+++ b/src/mame/machine/rm380z.cpp
@@ -200,7 +200,7 @@ TIMER_CALLBACK_MEMBER(rm380z_state::static_vblank_timer)
}
}
-WRITE8_MEMBER( rm380z_state::keyboard_put )
+void rm380z_state::keyboard_put(u8 data)
{
if (data)
{
diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp
index 4f504107d90..d37fcf92e80 100644
--- a/src/mame/machine/rmnimbus.cpp
+++ b/src/mame/machine/rmnimbus.cpp
@@ -1487,7 +1487,7 @@ void rmnimbus_state::rmni_sound_reset()
{
m_msm->reset_w(1);
- m_last_playmode = MSM5205_S48_4B;
+ m_last_playmode = msm5205_device::S48_4B;
m_msm->playmode_w(m_last_playmode);
m_ay8910_a=0;
diff --git a/src/mame/machine/rmnkbd.cpp b/src/mame/machine/rmnkbd.cpp
index b7ba96f296b..93d9aa7d508 100644
--- a/src/mame/machine/rmnkbd.cpp
+++ b/src/mame/machine/rmnkbd.cpp
@@ -7,6 +7,7 @@
namespace {
+
INPUT_PORTS_START( rmnimbus_keyboard )
PORT_START("LINE0") // Key row 0 scancodes 00..07
PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -119,7 +120,7 @@ INPUT_PORTS_END
rmnimbus_keyboard_device::rmnimbus_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : buffered_rs232_device(mconfig, RMNIMBUS_KEYBOARD, "RM Nimbus Keyboard", tag, owner, 0, "rmnimbus_keyboard", __FILE__)
+ : buffered_rs232_device(mconfig, RMNIMBUS_KEYBOARD, tag, owner, clock)
, device_matrix_keyboard_interface(mconfig, *this, "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8", "LINE9", "LINEA")
{
}
@@ -177,4 +178,4 @@ void rmnimbus_keyboard_device::received_byte(uint8_t byte)
}
-const device_type RMNIMBUS_KEYBOARD = device_creator<rmnimbus_keyboard_device>;
+DEFINE_DEVICE_TYPE(RMNIMBUS_KEYBOARD, rmnimbus_keyboard_device, "rmnimbus_keyboard", "RM Nimbus Keyboard")
diff --git a/src/mame/machine/rmnkbd.h b/src/mame/machine/rmnkbd.h
index 7398cf0d211..f7a4ed26342 100644
--- a/src/mame/machine/rmnkbd.h
+++ b/src/mame/machine/rmnkbd.h
@@ -23,5 +23,6 @@ private:
};
extern const device_type RMNIMBUS_KEYBOARD;
+DECLARE_DEVICE_TYPE(RMNIMBUS_KEYBOARD, rmnimbus_keyboard_device)
#endif // MAME_MACHINE_RMNKBD_H
diff --git a/src/mame/machine/rx01.cpp b/src/mame/machine/rx01.cpp
index dd62af3cdc8..f202793cf12 100644
--- a/src/mame/machine/rx01.cpp
+++ b/src/mame/machine/rx01.cpp
@@ -42,14 +42,14 @@ MACHINE_CONFIG_END
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type RX01 = device_creator<rx01_device>;
+DEFINE_DEVICE_TYPE(RX01, rx01_device, "rx01", "RX01")
//-------------------------------------------------
// rx01_device - constructor
//-------------------------------------------------
rx01_device::rx01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, RX01, "RX01", tag, owner, clock, "rx01", __FILE__)
+ : device_t(mconfig, RX01, tag, owner, clock)
{
}
diff --git a/src/mame/machine/rx01.h b/src/mame/machine/rx01.h
index 81bebf2bac9..0b9381ab3a4 100644
--- a/src/mame/machine/rx01.h
+++ b/src/mame/machine/rx01.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_RX01_H
+#define MAME_MACHINE_RX01_H
-#ifndef __RX01__
-#define __RX01__
+#pragma once
#include "imagedev/flopdrv.h"
@@ -79,6 +79,6 @@ private:
};
// device type definition
-extern const device_type RX01;
+DECLARE_DEVICE_TYPE(RX01, rx01_device)
-#endif
+#endif // MAME_MACHINE_RX01_H
diff --git a/src/mame/machine/s32comm.cpp b/src/mame/machine/s32comm.cpp
index d25d3bdfc32..66f55286f01 100644
--- a/src/mame/machine/s32comm.cpp
+++ b/src/mame/machine/s32comm.cpp
@@ -70,7 +70,8 @@ Sega System Multi32 Comm PCB 837-8792-91
#include "emuopts.h"
#include "machine/s32comm.h"
-//#define __S32COMM_VERBOSE__
+#define VERBOSE 0
+#include "logmacro.h"
MACHINE_CONFIG_FRAGMENT( s32comm )
MACHINE_CONFIG_END
@@ -79,7 +80,7 @@ MACHINE_CONFIG_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type S32COMM = device_creator<s32comm_device>;
+DEFINE_DEVICE_TYPE(S32COMM, s32comm_device, "s32comm", "System 32 Communication Board")
//-------------------------------------------------
// machine_config_additions - device-specific
@@ -100,7 +101,7 @@ machine_config_constructor s32comm_device::device_mconfig_additions() const
//-------------------------------------------------
s32comm_device::s32comm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, S32COMM, "SYSTEM32 COMMUNICATION BD", tag, owner, clock, "s32comm", __FILE__),
+ device_t(mconfig, S32COMM, tag, owner, clock),
m_line_rx(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE ),
m_line_tx(OPEN_FLAG_READ)
{
@@ -141,34 +142,26 @@ void s32comm_device::device_reset()
READ8_MEMBER(s32comm_device::zfg_r)
{
uint8_t result = m_zfg | 0xFE;
-#ifdef __S32COMM_VERBOSE__
- osd_printf_verbose("s32comm-zfg_r: read register %02x for value %02x\n", offset, result);
-#endif
+ LOG("s32comm-zfg_r: read register %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(s32comm_device::zfg_w)
{
-#ifdef __S32COMM_VERBOSE__
- osd_printf_verbose("s32comm-zfg_w: %02x\n", data);
-#endif
+ LOG("s32comm-zfg_w: %02x\n", data);
m_zfg = data & 0x01;
}
READ8_MEMBER(s32comm_device::share_r)
{
uint8_t result = m_shared[offset];
-#ifdef __S32COMM_VERBOSE__
- osd_printf_verbose("s32comm-share_r: read shared memory %02x for value %02x\n", offset, result);
-#endif
+ LOG("s32comm-share_r: read shared memory %02x for value %02x\n", offset, result);
return result;
}
WRITE8_MEMBER(s32comm_device::share_w)
{
-#ifdef __S32COMM_VERBOSE__
- osd_printf_verbose("s32comm-share_w: %02x %02x\n", offset, data);
-#endif
+ LOG("s32comm-share_w: %02x %02x\n", offset, data);
m_shared[offset] = data;
}
@@ -181,7 +174,7 @@ WRITE8_MEMBER(s32comm_device::cn_w)
{
m_cn = data & 0x01;
-#ifndef __S32COMM_SIMULATION__
+#ifndef S32COMM_SIMULATION
if (!m_cn)
device_reset();
#else
@@ -221,13 +214,13 @@ WRITE8_MEMBER(s32comm_device::fg_w)
void s32comm_device::check_vint_irq()
{
-#ifndef __S32COMM_SIMULATION__
+#ifndef S32COMM_SIMULATION
#else
comm_tick();
#endif
}
-#ifdef __S32COMM_SIMULATION__
+#ifdef S32COMM_SIMULATION
void s32comm_device::set_linktype(uint16_t linktype)
{
m_linktype = linktype;
diff --git a/src/mame/machine/s32comm.h b/src/mame/machine/s32comm.h
index ffd82ffafa4..c88ec806f4a 100644
--- a/src/mame/machine/s32comm.h
+++ b/src/mame/machine/s32comm.h
@@ -1,11 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Ariane Fugmann
-#pragma once
+#ifndef MAME_MACHINE_S32COMM_H
+#define MAME_MACHINE_S32COMM_H
-#ifndef __S32COMM_H__
-#define __S32COMM_H__
+#pragma once
-#define __S32COMM_SIMULATION__
+#define S32COMM_SIMULATION
#define MCFG_S32COMM_ADD(_tag ) \
MCFG_DEVICE_ADD(_tag, S32COMM, 0)
@@ -45,7 +45,7 @@ public:
// IRQ logic - 5 = VINT, 7 = DLC
void check_vint_irq();
-#ifdef __S32COMM_SIMULATION__
+#ifdef S32COMM_SIMULATION
void set_linktype(uint16_t linktype);
#endif
@@ -66,7 +66,7 @@ private:
char m_remotehost[256];
uint8_t m_buffer[0x800];
-#ifdef __S32COMM_SIMULATION__
+#ifdef S32COMM_SIMULATION
uint8_t m_linkenable;
uint16_t m_linktimer;
uint8_t m_linkalive;
@@ -84,6 +84,6 @@ private:
};
// device type definition
-extern const device_type S32COMM;
+DECLARE_DEVICE_TYPE(S32COMM, s32comm_device)
-#endif /* __S32COMM_H__ */
+#endif // MAME_MACHINE_S32COMM_H
diff --git a/src/mame/machine/segabb.cpp b/src/mame/machine/segabb.cpp
index e930caa4f3c..63a5dd7edb2 100644
--- a/src/mame/machine/segabb.cpp
+++ b/src/mame/machine/segabb.cpp
@@ -3,7 +3,7 @@
#include "emu.h"
#include "segabb.h"
-const device_type SEGA_LINDBERGH_BASEBOARD = device_creator<sega_lindbergh_baseboard_device>;
+DEFINE_DEVICE_TYPE(SEGA_LINDBERGH_BASEBOARD, sega_lindbergh_baseboard_device, "lindbergh_baseboard", "Sega Lindbergh Baseboard")
DEVICE_ADDRESS_MAP_START(map1, 32, sega_lindbergh_baseboard_device)
ADDRESS_MAP_END
@@ -15,7 +15,7 @@ DEVICE_ADDRESS_MAP_START(map3, 32, sega_lindbergh_baseboard_device)
ADDRESS_MAP_END
sega_lindbergh_baseboard_device::sega_lindbergh_baseboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, SEGA_LINDBERGH_BASEBOARD, "Sega Lindbergh Baseboard", tag, owner, clock, "sega_lindbergh_baseboard", __FILE__)
+ : pci_device(mconfig, SEGA_LINDBERGH_BASEBOARD, tag, owner, clock)
{
}
diff --git a/src/mame/machine/segabb.h b/src/mame/machine/segabb.h
index 4dfc922a63a..1f1aba4b0a3 100644
--- a/src/mame/machine/segabb.h
+++ b/src/mame/machine/segabb.h
@@ -2,8 +2,10 @@
// copyright-holders:Olivier Galibert
// Lindbergh Sega baseboard
-#ifndef SEGABB_H
-#define SEGABB_H
+#ifndef MAME_MACHINE_SEGABB_H
+#define MAME_MACHINE_SEGABB_H
+
+#pragma once
#include "machine/pci.h"
@@ -24,6 +26,6 @@ private:
DECLARE_ADDRESS_MAP(map3, 32);
};
-extern const device_type SEGA_LINDBERGH_BASEBOARD;
+DECLARE_DEVICE_TYPE(SEGA_LINDBERGH_BASEBOARD, sega_lindbergh_baseboard_device)
-#endif
+#endif // MAME_MACHINE_SEGABB_H
diff --git a/src/mame/machine/segacrp2_device.cpp b/src/mame/machine/segacrp2_device.cpp
index 63b0dd4b8a5..2ac88287eeb 100644
--- a/src/mame/machine/segacrp2_device.cpp
+++ b/src/mame/machine/segacrp2_device.cpp
@@ -84,20 +84,20 @@ static void decode(uint8_t *rom, uint8_t *decrypted,
}
}
-const device_type SEGA_315_5179 = device_creator<sega_315_5179_device>;
-const device_type SEGA_315_5178 = device_creator<sega_315_5178_device>;
-const device_type SEGA_315_5177 = device_creator<sega_315_5177_device>; // also seen as 317-5000
-const device_type SEGA_315_5176 = device_creator<sega_315_5176_device>; // TODO!
-const device_type SEGA_315_5162 = device_creator<sega_315_5162_device>;
+DEFINE_DEVICE_TYPE(SEGA_315_5179, sega_315_5179_device, "sega_315_5179", "Sega 315-5179")
+DEFINE_DEVICE_TYPE(SEGA_315_5178, sega_315_5178_device, "sega_315_5178", "Sega 315-5178")
+DEFINE_DEVICE_TYPE(SEGA_315_5177, sega_315_5177_device, "sega_315_5177", "Sega 315-5177") // also seen as 317-5000
+DEFINE_DEVICE_TYPE(SEGA_315_5176, sega_315_5176_device, "sega_315_5176", "Sega 315-5176") // TODO!
+DEFINE_DEVICE_TYPE(SEGA_315_5162, sega_315_5162_device, "sega_315_5162", "Sega 315-5162")
-const device_type SEGA_317_0004 = device_creator<sega_317_0004_device>;
-const device_type SEGA_317_0005 = device_creator<sega_317_0005_device>;
-const device_type SEGA_317_0006 = device_creator<sega_317_0006_device>;
-const device_type SEGA_317_0007 = device_creator<sega_317_0007_device>;
+DEFINE_DEVICE_TYPE(SEGA_317_0004, sega_317_0004_device, "sega_317_0004", "Sega 317-0004")
+DEFINE_DEVICE_TYPE(SEGA_317_0005, sega_317_0005_device, "sega_317_0005", "Sega 317-0005")
+DEFINE_DEVICE_TYPE(SEGA_317_0006, sega_317_0006_device, "sega_317_0006", "Sega 317-0006")
+DEFINE_DEVICE_TYPE(SEGA_317_0007, sega_317_0007_device, "sega_317_0007", "Sega 317-0007")
-segacrp2_z80_device::segacrp2_z80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) : z80_device(mconfig, type, name, tag, owner, clock, shortname, __FILE__) {}
+segacrp2_z80_device::segacrp2_z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : z80_device(mconfig, type, tag, owner, clock) {}
void segacrp2_z80_device::device_start() { z80_device::device_start(); decrypt(); }
void segacrp2_z80_device::device_reset() { z80_device::device_reset(); }
void segacrp2_z80_device::decrypt() { }
@@ -109,7 +109,7 @@ void segacrp2_z80_device::set_decrypted_tag(device_t &device, const char* decryp
}
-sega_315_5177_device::sega_315_5177_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5177, "Sega 315-5177", tag, owner, clock, "sega_315_5177", __FILE__) {}
+sega_315_5177_device::sega_315_5177_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5177, tag, owner, clock) {}
void sega_315_5177_device::decrypt()
{
@@ -167,7 +167,7 @@ void sega_315_5177_device::decrypt()
}
-sega_315_5176_device::sega_315_5176_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5176, "Sega 315-5176", tag, owner, clock, "sega_315_5176", __FILE__) {}
+sega_315_5176_device::sega_315_5176_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5176, tag, owner, clock) {}
void sega_315_5176_device::decrypt()
{
@@ -176,7 +176,7 @@ void sega_315_5176_device::decrypt()
}
-sega_315_5162_device::sega_315_5162_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5162, "Sega 315-5162", tag, owner, clock, "sega_315_5162", __FILE__) {}
+sega_315_5162_device::sega_315_5162_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5162, tag, owner, clock) {}
void sega_315_5162_device::decrypt()
{
// 315-5162
@@ -212,7 +212,7 @@ void sega_315_5162_device::decrypt()
-sega_315_5178_device::sega_315_5178_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5178, "Sega 315-5178", tag, owner, clock, "sega_315_5178", __FILE__) {}
+sega_315_5178_device::sega_315_5178_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5178, tag, owner, clock) {}
void sega_315_5178_device::decrypt()
{ // 315-5178
static const uint8_t xor_table[128] =
@@ -260,7 +260,7 @@ void sega_315_5178_device::decrypt()
-sega_315_5179_device::sega_315_5179_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5179, "Sega 315-5179", tag, owner, clock, "sega_315_5179", __FILE__) {}
+sega_315_5179_device::sega_315_5179_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_315_5179, tag, owner, clock) {}
void sega_315_5179_device::decrypt()
{ // 315-5179
static const uint8_t xor_table[128] =
@@ -310,7 +310,7 @@ void sega_315_5179_device::decrypt()
******************************************************************************/
-void _sega_decode_317(uint8_t *rom, uint8_t *decrypted, int shift)
+static void sega_decode_317(uint8_t *rom, uint8_t *decrypted, int shift)
{
static const uint8_t xor_table[128+3] =
{
@@ -342,29 +342,29 @@ void _sega_decode_317(uint8_t *rom, uint8_t *decrypted, int shift)
}
-sega_317_0004_device::sega_317_0004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0004, "Sega 317-0004", tag, owner, clock, "sega_317_0004", __FILE__) {}
+sega_317_0004_device::sega_317_0004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0004, tag, owner, clock) {}
void sega_317_0004_device::decrypt()
{ // 317-0004
- _sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 0);
+ sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 0);
}
-sega_317_0005_device::sega_317_0005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0005, "Sega 317-0005", tag, owner, clock, "sega_317_0005", __FILE__) {}
+sega_317_0005_device::sega_317_0005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0005, tag, owner, clock) {}
void sega_317_0005_device::decrypt()
{ // 317-0005
- _sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 1);
+ sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 1);
}
-sega_317_0006_device::sega_317_0006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0006, "Sega 317-0006", tag, owner, clock, "sega_317_0006", __FILE__) {}
+sega_317_0006_device::sega_317_0006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0006, tag, owner, clock) {}
void sega_317_0006_device::decrypt()
{ // 317-0006
- _sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 2);
+ sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 2);
}
-sega_317_0007_device::sega_317_0007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0007, "Sega 317-0007", tag, owner, clock, "sega_317_0007", __FILE__) {}
+sega_317_0007_device::sega_317_0007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrp2_z80_device(mconfig, SEGA_317_0007, tag, owner, clock) {}
void sega_317_0007_device::decrypt()
{ // 317-0006
- _sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 3);
+ sega_decode_317(memregion(tag())->base(), (uint8_t*)memshare(m_decrypted_tag)->ptr(), 3);
}
diff --git a/src/mame/machine/segacrp2_device.h b/src/mame/machine/segacrp2_device.h
index 37fbf2fc606..8bda4564b43 100644
--- a/src/mame/machine/segacrp2_device.h
+++ b/src/mame/machine/segacrp2_device.h
@@ -1,26 +1,26 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_SEGACRP2_DEVICE_H
+#define MAME_MACHINE_SEGACRP2_DEVICE_H
#pragma once
-#ifndef __SEGACRP2_Z80__
-#define __SEGACRP2_Z80__
+
+#include "cpu/z80/z80.h"
#define MCFG_SEGAZ80_SET_DECRYPTED_TAG(_tag) \
segacrp2_z80_device::set_decrypted_tag(*device, _tag);
-#include "cpu/z80/z80.h"
-
// base class
class segacrp2_z80_device : public z80_device
{
public:
- segacrp2_z80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
static void set_decrypted_tag(device_t &device, const char* decrypted_tag);
const char* m_decrypted_tag;
protected:
+ segacrp2_z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual void device_start() override;
virtual void device_reset() override;
virtual void decrypt();
@@ -105,16 +105,16 @@ protected:
};
-extern const device_type SEGA_315_5179;
-extern const device_type SEGA_315_5178;
-extern const device_type SEGA_315_5177;
-extern const device_type SEGA_315_5176;
-extern const device_type SEGA_315_5162;
+DECLARE_DEVICE_TYPE(SEGA_315_5179, sega_315_5179_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5178, sega_315_5178_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5177, sega_315_5177_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5176, sega_315_5176_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5162, sega_315_5162_device)
-extern const device_type SEGA_317_0004;
-extern const device_type SEGA_317_0005;
-extern const device_type SEGA_317_0006;
-extern const device_type SEGA_317_0007;
+DECLARE_DEVICE_TYPE(SEGA_317_0004, sega_317_0004_device)
+DECLARE_DEVICE_TYPE(SEGA_317_0005, sega_317_0005_device)
+DECLARE_DEVICE_TYPE(SEGA_317_0006, sega_317_0006_device)
+DECLARE_DEVICE_TYPE(SEGA_317_0007, sega_317_0007_device)
-#endif /// __SEGACRP2_Z80__
+#endif // MAME_MACHINE_SEGACRP2_DEVICE_H
diff --git a/src/mame/machine/segacrpt_device.cpp b/src/mame/machine/segacrpt_device.cpp
index ff06ff38f5d..99e772560d6 100644
--- a/src/mame/machine/segacrpt_device.cpp
+++ b/src/mame/machine/segacrpt_device.cpp
@@ -255,47 +255,53 @@ static void decode(uint8_t *data, uint8_t *opcodes, int size, const uint8_t conv
-const device_type SEGA_315_5132 = device_creator<sega_315_5132_device>;
-const device_type SEGA_315_5155 = device_creator<sega_315_5155_device>;
-const device_type SEGA_315_5110 = device_creator<sega_315_5110_device>;
-const device_type SEGA_315_5135 = device_creator<sega_315_5135_device>;
-const device_type SEGA_315_5051 = device_creator<sega_315_5051_device>;
-const device_type SEGA_315_5098 = device_creator<sega_315_5098_device>; // also 315-5030 ?
-const device_type SEGA_315_5102 = device_creator<sega_315_5102_device>;
-const device_type SEGA_315_5065 = device_creator<sega_315_5065_device>;
-const device_type SEGA_315_5064 = device_creator<sega_315_5064_device>;
-const device_type SEGA_315_5033 = device_creator<sega_315_5033_device>;
-const device_type SEGA_315_5041 = device_creator<sega_315_5041_device>;
-const device_type SEGA_315_5048 = device_creator<sega_315_5048_device>;
-const device_type SEGA_315_5093 = device_creator<sega_315_5093_device>;
-const device_type SEGA_315_5099 = device_creator<sega_315_5099_device>;
-const device_type SEGA_315_5015 = device_creator<sega_315_5015_device>;
-const device_type SEGA_315_5133 = device_creator<sega_315_5133_device>; // NOT DECRYPTED YET
-const device_type SEGA_315_5061 = device_creator<sega_315_5061_device>;
-const device_type SEGA_315_5028 = device_creator<sega_315_5028_device>;
-const device_type SEGA_315_5084 = device_creator<sega_315_5084_device>;
-const device_type SEGA_315_5013 = device_creator<sega_315_5013_device>;
-const device_type SEGA_315_5014 = device_creator<sega_315_5014_device>;
-const device_type SEGA_315_5018 = device_creator<sega_315_5018_device>;
-const device_type SEGA_315_5010 = device_creator<sega_315_5010_device>;
+DEFINE_DEVICE_TYPE(SEGA_315_5132, sega_315_5132_device, "sega_315_5132", "Sega 315-5132")
+DEFINE_DEVICE_TYPE(SEGA_315_5155, sega_315_5155_device, "sega_315_5155", "Sega 315-5155")
+DEFINE_DEVICE_TYPE(SEGA_315_5110, sega_315_5110_device, "sega_315_5110", "Sega 315-5110")
+DEFINE_DEVICE_TYPE(SEGA_315_5135, sega_315_5135_device, "sega_315_5135", "Sega 315-5135")
+DEFINE_DEVICE_TYPE(SEGA_315_5051, sega_315_5051_device, "sega_315_5051", "Sega 315-5051")
+DEFINE_DEVICE_TYPE(SEGA_315_5098, sega_315_5098_device, "sega_315_5098", "Sega 315-5098") // also 315-5030 ?
+DEFINE_DEVICE_TYPE(SEGA_315_5102, sega_315_5102_device, "sega_315_5102", "Sega 315-5102")
+DEFINE_DEVICE_TYPE(SEGA_315_5065, sega_315_5065_device, "sega_315_5065", "Sega 315-5065")
+DEFINE_DEVICE_TYPE(SEGA_315_5064, sega_315_5064_device, "sega_315_5064", "Sega 315-5064")
+DEFINE_DEVICE_TYPE(SEGA_315_5033, sega_315_5033_device, "sega_315_5033", "Sega 315-5033")
+DEFINE_DEVICE_TYPE(SEGA_315_5041, sega_315_5041_device, "sega_315_5041", "Sega 315-5041")
+DEFINE_DEVICE_TYPE(SEGA_315_5048, sega_315_5048_device, "sega_315_5048", "Sega 315-5048")
+DEFINE_DEVICE_TYPE(SEGA_315_5093, sega_315_5093_device, "sega_315_5093", "Sega 315-5093")
+DEFINE_DEVICE_TYPE(SEGA_315_5099, sega_315_5099_device, "sega_315_5099", "Sega 315-5099")
+DEFINE_DEVICE_TYPE(SEGA_315_5015, sega_315_5015_device, "sega_315_5015", "Sega 315-5015")
+DEFINE_DEVICE_TYPE(SEGA_315_5133, sega_315_5133_device, "sega_315_5133", "Sega 315-5133") // NOT DECRYPTED YET
+DEFINE_DEVICE_TYPE(SEGA_315_5061, sega_315_5061_device, "sega_315_5061", "Sega 315-5061")
+DEFINE_DEVICE_TYPE(SEGA_315_5028, sega_315_5028_device, "sega_315_5028", "Sega 315-5028")
+DEFINE_DEVICE_TYPE(SEGA_315_5084, sega_315_5084_device, "sega_315_5084", "Sega 315-5084")
+DEFINE_DEVICE_TYPE(SEGA_315_5013, sega_315_5013_device, "sega_315_5013", "Sega 315-5013")
+DEFINE_DEVICE_TYPE(SEGA_315_5014, sega_315_5014_device, "sega_315_5014", "Sega 315-5014")
+DEFINE_DEVICE_TYPE(SEGA_315_5018, sega_315_5018_device, "sega_315_5018", "Sega 315-5018")
+DEFINE_DEVICE_TYPE(SEGA_315_5010, sega_315_5010_device, "sega_315_5010", "Sega 315-5010")
// below are unknown part numbers
-const device_type SEGA_315_SPAT = device_creator<sega_315_spat_device>; // unknown part number
-const device_type SEGA_CPU_PBACTIO4 = device_creator<sega_cpu_pbactio4_device>;
+DEFINE_DEVICE_TYPE(SEGA_315_SPAT, sega_315_spat_device, "sega_315_spat", "Sega 315-???? Spat") // unknown part number
+DEFINE_DEVICE_TYPE(SEGA_CPU_PBACTIO4, sega_cpu_pbactio4_device, "sega_pbactio4", "Sega pbactio4")
-segacrpt_z80_device::segacrpt_z80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- z80_device(mconfig, type, name, tag, owner, clock, shortname, source),
+segacrpt_z80_device::segacrpt_z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ z80_device(mconfig, type, tag, owner, clock),
m_decrypted_ptr(nullptr),
m_region_ptr(nullptr),
m_decode_size(0x8000),
m_numbanks(0),
m_banksize(0),
m_decryption_done(false)
- {}
-void segacrpt_z80_device::device_start() { z80_device::device_start(); }
+{
+}
+
+void segacrpt_z80_device::device_start()
+{
+ z80_device::device_start();
+}
+
void segacrpt_z80_device::device_reset()
{
// decrypt on reset, makes sure DRIVER_INIT stuff happens first (for myherok)
@@ -316,9 +322,7 @@ void segacrpt_z80_device::device_reset()
m_decryption_done = true;
}
z80_device::device_reset();
-
}
-void segacrpt_z80_device::decrypt() { }
void segacrpt_z80_device::set_decrypted_tag(device_t &device, const char* decrypted_tag)
{
@@ -363,7 +367,7 @@ void segacrpt_z80_device::set_banksize(device_t &device, int banksize)
-sega_315_5132_device::sega_315_5132_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5132, "Sega 315-5132", tag, owner, clock, "sega_315_5132", __FILE__) {}
+sega_315_5132_device::sega_315_5132_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5132, tag, owner, clock) {}
void sega_315_5132_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -394,7 +398,7 @@ void sega_315_5132_device::decrypt()
-sega_315_5155_device::sega_315_5155_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5155, "Sega 315-5155", tag, owner, clock, "sega_315_5155", __FILE__) {}
+sega_315_5155_device::sega_315_5155_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5155, tag, owner, clock) {}
void sega_315_5155_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -425,7 +429,7 @@ void sega_315_5155_device::decrypt()
-sega_315_5110_device::sega_315_5110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5110, "Sega 315-5110", tag, owner, clock, "sega_315_5110", __FILE__) {}
+sega_315_5110_device::sega_315_5110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5110, tag, owner, clock) {}
void sega_315_5110_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -455,7 +459,7 @@ void sega_315_5110_device::decrypt()
-sega_315_5135_device::sega_315_5135_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5135, "Sega 315-5135", tag, owner, clock, "sega_315_5135", __FILE__) {}
+sega_315_5135_device::sega_315_5135_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5135, tag, owner, clock) {}
void sega_315_5135_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -486,7 +490,7 @@ void sega_315_5135_device::decrypt()
-sega_315_5051_device::sega_315_5051_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5051, "Sega 315-5051", tag, owner, clock, "sega_315_5051", __FILE__) {}
+sega_315_5051_device::sega_315_5051_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5051, tag, owner, clock) {}
void sega_315_5051_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -516,7 +520,7 @@ void sega_315_5051_device::decrypt()
-sega_315_5098_device::sega_315_5098_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5098, "Sega 315-5098", tag, owner, clock, "sega_315_5098", __FILE__) {}
+sega_315_5098_device::sega_315_5098_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5098, tag, owner, clock) {}
void sega_315_5098_device::decrypt()
{
// also 315-5030 ?
@@ -548,7 +552,7 @@ void sega_315_5098_device::decrypt()
-sega_315_5102_device::sega_315_5102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5102, "Sega 315-5102", tag, owner, clock, "sega_315_5102", __FILE__) {}
+sega_315_5102_device::sega_315_5102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5102, tag, owner, clock) {}
void sega_315_5102_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -577,7 +581,7 @@ void sega_315_5102_device::decrypt()
}
-sega_315_5065_device::sega_315_5065_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5065, "Sega 315-5065", tag, owner, clock, "sega_315_5065", __FILE__) {}
+sega_315_5065_device::sega_315_5065_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5065, tag, owner, clock) {}
void sega_315_5065_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -606,7 +610,7 @@ void sega_315_5065_device::decrypt()
}
-sega_315_5064_device::sega_315_5064_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5064, "Sega 315-5064", tag, owner, clock, "sega_315_5064", __FILE__) {}
+sega_315_5064_device::sega_315_5064_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5064, tag, owner, clock) {}
void sega_315_5064_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -636,7 +640,7 @@ void sega_315_5064_device::decrypt()
-sega_315_5033_device::sega_315_5033_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5033, "Sega 315-5033", tag, owner, clock, "sega_315_5033", __FILE__) {}
+sega_315_5033_device::sega_315_5033_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5033, tag, owner, clock) {}
void sega_315_5033_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -665,7 +669,7 @@ void sega_315_5033_device::decrypt()
}
-sega_315_5041_device::sega_315_5041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5041, "Sega 315-5041", tag, owner, clock, "sega_315_5041", __FILE__) {}
+sega_315_5041_device::sega_315_5041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5041, tag, owner, clock) {}
void sega_315_5041_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -695,7 +699,7 @@ void sega_315_5041_device::decrypt()
-sega_315_5048_device::sega_315_5048_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5048, "Sega 315-5048", tag, owner, clock, "sega_315_5048", __FILE__) {}
+sega_315_5048_device::sega_315_5048_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5048, tag, owner, clock) {}
void sega_315_5048_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -724,7 +728,7 @@ void sega_315_5048_device::decrypt()
}
-sega_315_5093_device::sega_315_5093_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5093, "Sega 315-5093", tag, owner, clock, "sega_315_5093", __FILE__) {}
+sega_315_5093_device::sega_315_5093_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5093, tag, owner, clock) {}
void sega_315_5093_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -754,7 +758,7 @@ void sega_315_5093_device::decrypt()
-sega_315_5099_device::sega_315_5099_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5099, "Sega 315-5099", tag, owner, clock, "sega_315_5099", __FILE__) {}
+sega_315_5099_device::sega_315_5099_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5099, tag, owner, clock) {}
void sega_315_5099_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -785,7 +789,7 @@ void sega_315_5099_device::decrypt()
-sega_315_spat_device::sega_315_spat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_SPAT, "Sega 315-???? Spat", tag, owner, clock, "sega_315_spat", __FILE__) {}
+sega_315_spat_device::sega_315_spat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_SPAT, tag, owner, clock) {}
void sega_315_spat_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -813,7 +817,7 @@ void sega_315_spat_device::decrypt()
decode(m_region_ptr, m_decrypted_ptr, m_decode_size, convtable, m_numbanks, m_banksize);
}
-sega_315_5015_device::sega_315_5015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5015, "Sega 315-5015", tag, owner, clock, "sega_315_5015", __FILE__) {}
+sega_315_5015_device::sega_315_5015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5015, tag, owner, clock) {}
void sega_315_5015_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -843,7 +847,7 @@ void sega_315_5015_device::decrypt()
}
-sega_315_5133_device::sega_315_5133_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5133, "Sega 315-5133", tag, owner, clock, "sega_315_5133", __FILE__) {}
+sega_315_5133_device::sega_315_5133_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5133, tag, owner, clock) {}
void sega_315_5133_device::decrypt()
{
// TODO
@@ -851,7 +855,7 @@ void sega_315_5133_device::decrypt()
-sega_315_5014_device::sega_315_5014_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5014, "Sega 315-5014", tag, owner, clock, "sega_315_5014", __FILE__) {}
+sega_315_5014_device::sega_315_5014_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5014, tag, owner, clock) {}
void sega_315_5014_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -880,7 +884,7 @@ void sega_315_5014_device::decrypt()
-sega_315_5013_device::sega_315_5013_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5013, "Sega 315-5013", tag, owner, clock, "sega_315_5013", __FILE__) {}
+sega_315_5013_device::sega_315_5013_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5013, tag, owner, clock) {}
void sega_315_5013_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -909,7 +913,7 @@ void sega_315_5013_device::decrypt()
}
-sega_315_5061_device::sega_315_5061_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5061, "Sega 315-5061", tag, owner, clock, "sega_315_5061", __FILE__) {}
+sega_315_5061_device::sega_315_5061_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5061, tag, owner, clock) {}
void sega_315_5061_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -939,7 +943,7 @@ void sega_315_5061_device::decrypt()
-sega_315_5018_device::sega_315_5018_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5018, "Sega 315-5018", tag, owner, clock, "sega_315_5018", __FILE__) {}
+sega_315_5018_device::sega_315_5018_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5018, tag, owner, clock) {}
void sega_315_5018_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -969,7 +973,7 @@ void sega_315_5018_device::decrypt()
}
-sega_315_5010_device::sega_315_5010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5010, "Sega 315-5010", tag, owner, clock, "sega_315_5010", __FILE__) {}
+sega_315_5010_device::sega_315_5010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5010, tag, owner, clock) {}
void sega_315_5010_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -1000,7 +1004,7 @@ void sega_315_5010_device::decrypt()
-sega_cpu_pbactio4_device::sega_cpu_pbactio4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_CPU_PBACTIO4, "Sega pbactio4", tag, owner, clock, "sega_pbactio4", __FILE__) {}
+sega_cpu_pbactio4_device::sega_cpu_pbactio4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_CPU_PBACTIO4, tag, owner, clock) {}
void sega_cpu_pbactio4_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -1029,7 +1033,7 @@ void sega_cpu_pbactio4_device::decrypt()
}
-sega_315_5028_device::sega_315_5028_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5028, "Sega 315-5028", tag, owner, clock, "sega_315_5028", __FILE__) {}
+sega_315_5028_device::sega_315_5028_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5028, tag, owner, clock) {}
void sega_315_5028_device::decrypt()
{
static const uint8_t convtable[32][4] =
@@ -1058,7 +1062,7 @@ void sega_315_5028_device::decrypt()
}
-sega_315_5084_device::sega_315_5084_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5084, "Sega 315-5084", tag, owner, clock, "sega_315_5084", __FILE__) {}
+sega_315_5084_device::sega_315_5084_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : segacrpt_z80_device(mconfig, SEGA_315_5084, tag, owner, clock) {}
void sega_315_5084_device::decrypt()
{
static const uint8_t convtable[32][4] =
diff --git a/src/mame/machine/segacrpt_device.h b/src/mame/machine/segacrpt_device.h
index da3a8ad6ddf..50bf16e14cf 100644
--- a/src/mame/machine/segacrpt_device.h
+++ b/src/mame/machine/segacrpt_device.h
@@ -1,10 +1,12 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_MACHINE_SEGACRYPT_DEVICE_H
+#define MAME_MACHINE_SEGACRYPT_DEVICE_H
+
#pragma once
-#ifndef __SEGACRPT_Z80__
-#define __SEGACRPT_Z80__
+#include "cpu/z80/z80.h"
#define MCFG_SEGACRPT_SET_DECRYPTED_TAG(_tag) \
@@ -23,35 +25,35 @@
segacrpt_z80_device::set_banksize(*device, _banksize);
-#include "cpu/z80/z80.h"
-
// base class
class segacrpt_z80_device : public z80_device
{
public:
- segacrpt_z80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
static void set_decrypted_tag(device_t &device, const char* decrypted_tag);
static void set_decrypted_ptr(device_t &device, uint8_t* ptr); // toprollr
static void set_size(device_t &device, int size);
static void set_numbanks(device_t &device, int _numbanks);
static void set_banksize(device_t &device, int _banksize);
+ void set_decrypted_p(uint8_t* ptr);
+ void set_region_p(uint8_t* ptr);
+
+protected:
+ segacrpt_z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual void decrypt() = 0;
+
const char* m_decrypted_tag;
uint8_t* m_decrypted_ptr;
uint8_t* m_region_ptr;
int m_decode_size;
int m_numbanks;
int m_banksize;
- bool m_decryption_done;
-
- void set_decrypted_p(uint8_t* ptr);
- void set_region_p(uint8_t* ptr);
-protected:
- virtual void device_start() override;
- virtual void device_reset() override;
- virtual void decrypt();
+private:
+ bool m_decryption_done;
};
@@ -264,31 +266,31 @@ protected:
};
-extern const device_type SEGA_315_5132;
-extern const device_type SEGA_315_5155;
-extern const device_type SEGA_315_5110;
-extern const device_type SEGA_315_5135;
-extern const device_type SEGA_315_5051;
-extern const device_type SEGA_315_5098;
-extern const device_type SEGA_315_5102;
-extern const device_type SEGA_315_5065;
-extern const device_type SEGA_315_5064;
-extern const device_type SEGA_315_5033;
-extern const device_type SEGA_315_5041;
-extern const device_type SEGA_315_5048;
-extern const device_type SEGA_315_5093;
-extern const device_type SEGA_315_5099;
-extern const device_type SEGA_315_SPAT;
-extern const device_type SEGA_315_5015;
-extern const device_type SEGA_315_5133;
-extern const device_type SEGA_315_5014;
-extern const device_type SEGA_315_5013;
-extern const device_type SEGA_315_5061;
-extern const device_type SEGA_315_5018;
-extern const device_type SEGA_315_5010;
-extern const device_type SEGA_CPU_PBACTIO4;
-extern const device_type SEGA_315_5028;
-extern const device_type SEGA_315_5084;
-
-
-#endif /// __SEGACRPT_Z80__
+DECLARE_DEVICE_TYPE(SEGA_315_5132, sega_315_5132_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5155, sega_315_5155_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5110, sega_315_5110_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5135, sega_315_5135_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5051, sega_315_5051_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5098, sega_315_5098_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5102, sega_315_5102_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5065, sega_315_5065_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5064, sega_315_5064_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5033, sega_315_5033_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5041, sega_315_5041_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5048, sega_315_5048_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5093, sega_315_5093_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5099, sega_315_5099_device)
+DECLARE_DEVICE_TYPE(SEGA_315_SPAT, sega_315_spat_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5015, sega_315_5015_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5133, sega_315_5133_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5014, sega_315_5014_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5013, sega_315_5013_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5061, sega_315_5061_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5018, sega_315_5018_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5010, sega_315_5010_device)
+DECLARE_DEVICE_TYPE(SEGA_CPU_PBACTIO4, sega_cpu_pbactio4_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5028, sega_315_5028_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5084, sega_315_5084_sevice)
+
+
+#endif // MAME_MACHINE_SEGACRYPT_DEVICE_H
diff --git a/src/mame/machine/segaic16.cpp b/src/mame/machine/segaic16.cpp
index f1def1e17af..fd46cadf6cc 100644
--- a/src/mame/machine/segaic16.cpp
+++ b/src/mame/machine/segaic16.cpp
@@ -27,10 +27,10 @@
//**************************************************************************
// device type definition
-const device_type SEGA_315_5195_MEM_MAPPER = device_creator<sega_315_5195_mapper_device>;
-const device_type SEGA_315_5248_MULTIPLIER = device_creator<sega_315_5248_multiplier_device>;
-const device_type SEGA_315_5249_DIVIDER = device_creator<sega_315_5249_divider_device>;
-const device_type SEGA_315_5250_COMPARE_TIMER = device_creator<sega_315_5250_compare_timer_device>;
+DEFINE_DEVICE_TYPE(SEGA_315_5195_MEM_MAPPER, sega_315_5195_mapper_device, "sega_315_5195", "Sega 315-5195 Memory Mapper")
+DEFINE_DEVICE_TYPE(SEGA_315_5248_MULTIPLIER, sega_315_5248_multiplier_device, "sega_315_5248", "Sega 315-5248 Multiplier")
+DEFINE_DEVICE_TYPE(SEGA_315_5249_DIVIDER, sega_315_5249_divider_device, "sega_315_5249", "Sega 315-5249 Divider")
+DEFINE_DEVICE_TYPE(SEGA_315_5250_COMPARE_TIMER, sega_315_5250_compare_timer_device, "sega_315_5250", "Sega 315-5250 Compare/Timer")
@@ -199,7 +199,7 @@ WRITE16_MEMBER( sega_16bit_common_base::philko_paletteram_w )
//-------------------------------------------------
sega_315_5195_mapper_device::sega_315_5195_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA_315_5195_MEM_MAPPER, "Sega 315-5195 Memory Mapper", tag, owner, clock, "sega_315_5195", __FILE__)
+ : device_t(mconfig, SEGA_315_5195_MEM_MAPPER, tag, owner, clock)
, m_cpu(*this, finder_base::DUMMY_TAG)
, m_cpuregion(*this, finder_base::DUMMY_TAG)
, m_space(nullptr)
@@ -739,7 +739,7 @@ void sega_315_5195_mapper_device::decrypt_bank::update()
//-------------------------------------------------
sega_315_5248_multiplier_device::sega_315_5248_multiplier_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA_315_5248_MULTIPLIER, "Sega 315-5248 Multiplier", tag, owner, clock, "sega_315_5248", __FILE__)
+ : device_t(mconfig, SEGA_315_5248_MULTIPLIER, tag, owner, clock)
{
}
@@ -807,7 +807,7 @@ void sega_315_5248_multiplier_device::device_reset()
//-------------------------------------------------
sega_315_5249_divider_device::sega_315_5249_divider_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA_315_5249_DIVIDER, "Sega 315-5249 Divider", tag, owner, clock, "sega_315_5249", __FILE__)
+ : device_t(mconfig, SEGA_315_5249_DIVIDER, tag, owner, clock)
{
}
@@ -952,7 +952,7 @@ void sega_315_5249_divider_device::execute(int mode)
//-------------------------------------------------
sega_315_5250_compare_timer_device::sega_315_5250_compare_timer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGA_315_5250_COMPARE_TIMER, "Sega 315-5250 Compare/Timer", tag, owner, clock, "sega_315_5250", __FILE__)
+ : device_t(mconfig, SEGA_315_5250_COMPARE_TIMER, tag, owner, clock)
{
}
diff --git a/src/mame/machine/segaic16.h b/src/mame/machine/segaic16.h
index 28c672e6583..b8e73ac6c84 100644
--- a/src/mame/machine/segaic16.h
+++ b/src/mame/machine/segaic16.h
@@ -51,9 +51,6 @@
class sega_16bit_common_base : public driver_device
{
public:
- // construction/destruction
- sega_16bit_common_base(const machine_config &mconfig, device_type type, const char *tag);
-
// open bus read helpers
DECLARE_READ16_MEMBER( open_bus_r );
@@ -62,6 +59,9 @@ public:
DECLARE_WRITE16_MEMBER( philko_paletteram_w );
protected:
+ // construction/destruction
+ sega_16bit_common_base(const machine_config &mconfig, device_type type, const char *tag);
+
// internal helpers
void palette_init();
@@ -269,10 +269,10 @@ private:
// device type definition
-extern const device_type SEGA_315_5195_MEM_MAPPER;
-extern const device_type SEGA_315_5248_MULTIPLIER;
-extern const device_type SEGA_315_5249_DIVIDER;
-extern const device_type SEGA_315_5250_COMPARE_TIMER;
+DECLARE_DEVICE_TYPE(SEGA_315_5195_MEM_MAPPER, sega_315_5195_mapper_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5248_MULTIPLIER, sega_315_5248_multiplier_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5249_DIVIDER, sega_315_5249_divider_device)
+DECLARE_DEVICE_TYPE(SEGA_315_5250_COMPARE_TIMER, sega_315_5250_compare_timer_device)
#endif // MAME_MACHINE_SEGAIC16_H
diff --git a/src/mame/machine/seibucop/seibucop.cpp b/src/mame/machine/seibucop/seibucop.cpp
index b85675f19c8..50efbf83cac 100644
--- a/src/mame/machine/seibucop/seibucop.cpp
+++ b/src/mame/machine/seibucop/seibucop.cpp
@@ -110,10 +110,10 @@
if (LOG_Commands) logerror
-const device_type RAIDEN2COP = device_creator<raiden2cop_device>;
+DEFINE_DEVICE_TYPE(RAIDEN2COP, raiden2cop_device, "raiden2cop", "Seibu COP (Raiden 2)")
raiden2cop_device::raiden2cop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, RAIDEN2COP, "Seibu COP (Raiden 2)", tag, owner, clock, "raiden2cop", __FILE__),
+ : device_t(mconfig, RAIDEN2COP, tag, owner, clock),
cop_latch_addr(0),
cop_latch_trigger(0),
cop_latch_value(0),
diff --git a/src/mame/machine/seibucop/seibucop.h b/src/mame/machine/seibucop/seibucop.h
index 9f92b9885e0..7d1a81eaec6 100644
--- a/src/mame/machine/seibucop/seibucop.h
+++ b/src/mame/machine/seibucop/seibucop.h
@@ -274,6 +274,6 @@ private:
void dma_zsorting(uint16_t data);
};
-extern const device_type RAIDEN2COP;
+DECLARE_DEVICE_TYPE(RAIDEN2COP, raiden2cop_device)
#endif /* RAIDEN2COP_H */
diff --git a/src/mame/machine/seicop.cpp b/src/mame/machine/seicop.cpp
index 515b31282a1..55dcd642f74 100644
--- a/src/mame/machine/seicop.cpp
+++ b/src/mame/machine/seicop.cpp
@@ -18,7 +18,7 @@
#include "includes/legionna.h"
-const device_type SEIBU_COP_BOOTLEG = device_creator<seibu_cop_bootleg_device>;
+DEFINE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device, "seibu_cop_boot", "Seibu COP (bootleg)")
READ16_MEMBER(seibu_cop_bootleg_device::reg_lo_addr_r)
{
@@ -246,7 +246,7 @@ static ADDRESS_MAP_START( seibucopbl_map, AS_0, 16, seibu_cop_bootleg_device )
ADDRESS_MAP_END
seibu_cop_bootleg_device::seibu_cop_bootleg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEIBU_COP_BOOTLEG, "Seibu COP (Bootleg)", tag, owner, clock, "seibu_cop_boot", __FILE__),
+ : device_t(mconfig, SEIBU_COP_BOOTLEG, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_space_config("regs", ENDIANNESS_LITTLE, 16, 9, 0, nullptr, *ADDRESS_MAP_NAME(seibucopbl_map))
{
diff --git a/src/mame/machine/seicop.h b/src/mame/machine/seicop.h
index a25a6d22de0..1c25a77e629 100644
--- a/src/mame/machine/seicop.h
+++ b/src/mame/machine/seicop.h
@@ -1,12 +1,15 @@
// license:LGPL-2.1+
// copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina
+#ifndef MAME_MACHINE_SEICOP_H
+#define MAME_MACHINE_SEICOP_H
+
+#pragma once
#include "seibucop/seibucop.h"
-class seibu_cop_bootleg_device : public device_t,
- public device_memory_interface
+class seibu_cop_bootleg_device : public device_t, public device_memory_interface
{
public:
seibu_cop_bootleg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -46,6 +49,9 @@ private:
};
extern const device_type SEIBU_COP_BOOTLEG;
+DECLARE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device)
#define MCFG_DEVICE_SEIBUCOP_BOOTLEG_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, SEIBU_COP_BOOTLEG, 0)
+
+#endif // MAME_MACHINE_SEICOP_H
diff --git a/src/mame/machine/sgi.cpp b/src/mame/machine/sgi.cpp
index 909d821fef0..f9dad1b0c2a 100644
--- a/src/mame/machine/sgi.cpp
+++ b/src/mame/machine/sgi.cpp
@@ -28,10 +28,10 @@ static inline void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_
}
#endif
-const device_type SGI_MC = device_creator<sgi_mc_device>;
+DEFINE_DEVICE_TYPE(SGI_MC, sgi_mc_device, "sgi_mc", "SGI Memory Controller")
sgi_mc_device::sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SGI_MC, "SGI Memory Controller", tag, owner, clock, "sgi_mc", __FILE__),
+ : device_t(mconfig, SGI_MC, tag, owner, clock),
m_tUpdateTimer(nullptr),
m_nCPUControl0(0),
m_nCPUControl1(0),
diff --git a/src/mame/machine/sgi.h b/src/mame/machine/sgi.h
index f164879d21e..428d68ef499 100644
--- a/src/mame/machine/sgi.h
+++ b/src/mame/machine/sgi.h
@@ -8,17 +8,18 @@
*********************************************************************/
-#ifndef _SGIMC_H
-#define _SGIMC_H
+#ifndef MAME_MACHINE_SGI_H
+#define MAME_MACHINE_SGI_H
+
+#pragma once
class sgi_mc_device : public device_t
{
public:
sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~sgi_mc_device() {}
-DECLARE_READ32_MEMBER(read);
-DECLARE_WRITE32_MEMBER(write);
+ DECLARE_READ32_MEMBER(read);
+ DECLARE_WRITE32_MEMBER(write);
protected:
// device-level overrides
@@ -74,7 +75,7 @@ private:
void timer_init();
};
-extern const device_type SGI_MC;
+DECLARE_DEVICE_TYPE(SGI_MC, sgi_mc_device)
-#endif /* _SGIMC_H */
+#endif // MAME_MACHINE_SGI_H
diff --git a/src/mame/machine/slapstic.cpp b/src/mame/machine/slapstic.cpp
index 38f74b9358d..45ba5f48312 100644
--- a/src/mame/machine/slapstic.cpp
+++ b/src/mame/machine/slapstic.cpp
@@ -185,10 +185,20 @@
#include "includes/slapstic.h"
-const device_type SLAPSTIC = device_creator<atari_slapstic_device>;
+/*************************************
+ *
+ * Debugging
+ *
+ *************************************/
+
+#define LOG_SLAPSTIC (0)
+
+
+
+DEFINE_DEVICE_TYPE(SLAPSTIC, atari_slapstic_device, "slapstic", "Atari Slapstic")
atari_slapstic_device::atari_slapstic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SLAPSTIC, "Atari Slapstic", tag, owner, clock, "slapstic", __FILE__),
+ : device_t(mconfig, SLAPSTIC, tag, owner, clock),
state(0),
current_bank(0),
access_68k(-1),
diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp
index 993fab144d1..93f24511f7c 100644
--- a/src/mame/machine/sms.cpp
+++ b/src/mame/machine/sms.cpp
@@ -68,7 +68,7 @@ WRITE_LINE_MEMBER(sms_state::sms_ctrl2_th_input)
WRITE_LINE_MEMBER(sms_state::gg_ext_th_input)
{
- if (!(m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode()))
+ if (!(m_cartslot->exists() && m_cartslot->get_sms_mode()))
return;
// The EXT port act as the controller port 2 on SMS compatibility mode.
@@ -128,7 +128,7 @@ WRITE8_MEMBER(sms_state::sms_io_control_w)
uint8_t ctrl1_port_data = 0xff;
uint8_t ctrl2_port_data = 0xff;
- if (m_is_gamegear && !(m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode()))
+ if (m_is_gamegear && !(m_cartslot->exists() && m_cartslot->get_sms_mode()))
{
m_io_ctrl_reg = data;
return;
@@ -226,7 +226,7 @@ WRITE_LINE_MEMBER(sms_state::sms_pause_callback)
if (m_is_gamegear)
{
- if (!(m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode()))
+ if (!(m_cartslot->exists() && m_cartslot->get_sms_mode()))
return;
if (!(m_port_start->read() & 0x80))
@@ -325,7 +325,7 @@ READ8_MEMBER(sms_state::sms_input_port_dc_r)
{
// If SMS mode is disabled, just return the data read from the
// input port. Its mapped port bits match the bits of register $dc.
- if (!(m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode()))
+ if (!(m_cartslot->exists() && m_cartslot->get_sms_mode()))
return m_port_gg_dc->read();
}
else
@@ -370,7 +370,7 @@ READ8_MEMBER(sms_state::sms_input_port_dd_r)
if (m_is_gamegear)
{
- if (!(m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode()))
+ if (!(m_cartslot->exists() && m_cartslot->get_sms_mode()))
return 0xff;
}
else
@@ -539,7 +539,7 @@ WRITE8_MEMBER(sms_state::gg_psg_w)
WRITE8_MEMBER(sms_state::gg_psg_stereo_w)
{
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
return;
m_psg_gg->stereo_w(space, offset, data, mem_mask);
@@ -548,7 +548,7 @@ WRITE8_MEMBER(sms_state::gg_psg_stereo_w)
READ8_MEMBER(sms_state::gg_input_port_00_r)
{
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
return 0xff;
else
{
@@ -840,7 +840,7 @@ WRITE8_MEMBER(sms_state::sg1000m3_peripheral_w)
WRITE8_MEMBER(sms_state::gg_sio_w)
{
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
return;
logerror("*** write %02X to SIO register #%d\n", data, offset);
@@ -868,7 +868,7 @@ WRITE8_MEMBER(sms_state::gg_sio_w)
READ8_MEMBER(sms_state::gg_sio_r)
{
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
return 0xff;
logerror("*** read SIO register #%d\n", offset);
@@ -918,7 +918,7 @@ void sms_state::setup_enabled_slots()
return;
}
- if (!(m_mem_ctrl_reg & IO_EXPANSION) && m_smsexpslot && m_smsexpslot->m_device)
+ if (!(m_mem_ctrl_reg & IO_EXPANSION) && m_smsexpslot && m_smsexpslot->device_present())
{
m_mem_device_enabled |= ENABLE_EXPANSION;
logerror("Expansion port enabled.\n");
@@ -976,11 +976,11 @@ void sms_state::setup_media_slots()
m_lphaser_x_offs = -1; // same value returned for ROMs without custom offset.
if (m_mem_device_enabled & ENABLE_CART)
- m_lphaser_x_offs = m_cartslot->m_cart->get_lphaser_xoffs();
+ m_lphaser_x_offs = m_cartslot->get_lphaser_xoffs();
else if (m_mem_device_enabled & ENABLE_CARD)
- m_lphaser_x_offs = m_cardslot->m_cart->get_lphaser_xoffs();
+ m_lphaser_x_offs = m_cardslot->get_lphaser_xoffs();
else if (m_mem_device_enabled & ENABLE_EXPANSION)
- m_lphaser_x_offs = m_smsexpslot->m_device->get_lphaser_xoffs();
+ m_lphaser_x_offs = m_smsexpslot->get_lphaser_xoffs();
if (m_lphaser_x_offs == -1)
m_lphaser_x_offs = 36;
@@ -1146,7 +1146,7 @@ MACHINE_RESET_MEMBER(sms_state,sms)
if (m_is_gamegear)
{
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
m_vdp->set_sega315_5124_compatibility_mode(true);
/* Initialize SIO stuff for GG */
@@ -1491,7 +1491,7 @@ VIDEO_RESET_MEMBER(sms_state,gamegear)
m_prev_bitmap.fill(rgb_t::black());
m_prev_bitmap_copied = false;
}
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
{
m_gg_sms_mode_bitmap.fill(rgb_t::black());
memset(m_line_buffer.get(), 0, 160 * 4 * sizeof(int));
@@ -1640,7 +1640,7 @@ uint32_t sms_state::screen_update_gamegear(screen_device &screen, bitmap_rgb32 &
{
bitmap_rgb32 *source_bitmap;
- if (m_cartslot->exists() && m_cartslot->m_cart->get_sms_mode())
+ if (m_cartslot->exists() && m_cartslot->get_sms_mode())
{
screen_gg_sms_mode_scaling(screen, m_gg_sms_mode_bitmap, cliprect);
source_bitmap = &m_gg_sms_mode_bitmap;
diff --git a/src/mame/machine/snes.cpp b/src/mame/machine/snes.cpp
index 3b688b45e03..56f452e2fa1 100644
--- a/src/mame/machine/snes.cpp
+++ b/src/mame/machine/snes.cpp
@@ -105,11 +105,11 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_reset_oam_address)
// make sure we're in the 65816's context since we're messing with the OAM and stuff
address_space &space = m_maincpu->space(AS_PROGRAM);
- if (!(m_ppu->m_screen_disabled)) //Reset OAM address, byuu says it happens at H=10
+ if (!m_ppu->screen_disabled()) //Reset OAM address, byuu says it happens at H=10
{
- space.write_byte(OAMADDL, m_ppu->m_oam.saved_address_low); /* Reset oam address */
- space.write_byte(OAMADDH, m_ppu->m_oam.saved_address_high);
- m_ppu->m_oam.first_sprite = m_ppu->m_oam.priority_rotation ? (m_ppu->m_oam.address >> 1) & 127 : 0;
+ space.write_byte(OAMADDL, m_ppu->saved_oam_address_low()); /* Reset oam address */
+ space.write_byte(OAMADDH, m_ppu->saved_oam_address_high());
+ m_ppu->set_first_sprite();
}
}
@@ -130,7 +130,7 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_update_io)
TIMER_CALLBACK_MEMBER(snes_state::snes_scanline_tick)
{
/* Increase current line - we want to latch on this line during it, not after it */
- m_ppu->m_beam.current_vert = m_screen->vpos();
+ m_ppu->set_current_vert(m_screen->vpos());
// not in hblank
SNES_CPU_REG(HVBJOY) &= ~0x40;
@@ -138,7 +138,7 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_scanline_tick)
/* Vertical IRQ timer - only if horizontal isn't also enabled! */
if ((SNES_CPU_REG(NMITIMEN) & 0x20) && !(SNES_CPU_REG(NMITIMEN) & 0x10))
{
- if (m_ppu->m_beam.current_vert == m_vtime)
+ if (m_ppu->current_vert() == m_vtime)
{
SNES_CPU_REG(TIMEUP) = 0x80; /* Indicate that irq occurred */
// IRQ latches the counters, do it now
@@ -155,7 +155,7 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_scanline_tick)
// is the HIRQ on a specific scanline?
if (SNES_CPU_REG(NMITIMEN) & 0x20)
{
- if (m_ppu->m_beam.current_vert != m_vtime)
+ if (m_ppu->current_vert() != m_vtime)
{
setirq = 0;
}
@@ -163,22 +163,22 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_scanline_tick)
if (setirq)
{
-// printf("HIRQ @ %d, %d\n", pixel * m_ppu->m_htmult, m_ppu->m_beam.current_vert);
+// printf("HIRQ @ %d, %d\n", pixel * m_ppu->htmult(), m_ppu->current_vert());
if (pixel == 0)
{
hirq_tick();
}
else
{
- m_hirq_timer->adjust(m_screen->time_until_pos(m_ppu->m_beam.current_vert, pixel * m_ppu->m_htmult));
+ m_hirq_timer->adjust(m_screen->time_until_pos(m_ppu->current_vert(), pixel * m_ppu->htmult()));
}
}
}
/* Start of VBlank */
- if (m_ppu->m_beam.current_vert == m_ppu->m_beam.last_visible_line)
+ if (m_ppu->current_vert() == m_ppu->last_visible_line())
{
- timer_set(m_screen->time_until_pos(m_ppu->m_beam.current_vert, 10), TIMER_RESET_OAM_ADDRESS);
+ timer_set(m_screen->time_until_pos(m_ppu->current_vert(), 10), TIMER_RESET_OAM_ADDRESS);
SNES_CPU_REG(HVBJOY) |= 0x81; /* Set vblank bit to on & indicate controllers being read */
SNES_CPU_REG(RDNMI) |= 0x80; /* Set NMI occurred bit */
@@ -190,30 +190,30 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_scanline_tick)
}
/* three lines after start of vblank we update the controllers (value from snes9x) */
- m_io_timer->adjust(m_screen->time_until_pos(m_ppu->m_beam.current_vert + 2, m_hblank_offset * m_ppu->m_htmult));
+ m_io_timer->adjust(m_screen->time_until_pos(m_ppu->current_vert() + 2, m_hblank_offset * m_ppu->htmult()));
}
// hdma reset happens at scanline 0, H=~6
- if (m_ppu->m_beam.current_vert == 0)
+ if (m_ppu->current_vert() == 0)
{
address_space &cpu0space = m_maincpu->space(AS_PROGRAM);
hdma_init(cpu0space);
}
- if (m_ppu->m_beam.current_vert == 0)
+ if (m_ppu->current_vert() == 0)
{ /* VBlank is over, time for a new frame */
SNES_CPU_REG(HVBJOY) &= 0x7f; /* Clear vblank bit */
SNES_CPU_REG(RDNMI) &= 0x7f; /* Clear nmi occurred bit */
- m_ppu->m_stat78 ^= 0x80; /* Toggle field flag */
- m_ppu->m_stat77 &= 0x3f; /* Clear Time Over and Range Over bits */
+ m_ppu->toggle_field();
+ m_ppu->clear_time_range_over();
m_maincpu->set_input_line(G65816_LINE_NMI, CLEAR_LINE );
}
m_scanline_timer->adjust(attotime::never);
- m_hblank_timer->adjust(m_screen->time_until_pos(m_ppu->m_beam.current_vert, m_hblank_offset * m_ppu->m_htmult));
+ m_hblank_timer->adjust(m_screen->time_until_pos(m_ppu->current_vert(), m_hblank_offset * m_ppu->htmult()));
-// printf("%02x %d\n",SNES_CPU_REG(HVBJOY),m_ppu->m_beam.current_vert);
+// printf("%02x %d\n",SNES_CPU_REG(HVBJOY),m_ppu->current_vert());
}
/* This is called at the start of hblank *before* the scanline indicated in current_vert! */
@@ -222,13 +222,13 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_hblank_tick)
address_space &cpu0space = m_maincpu->space(AS_PROGRAM);
int nextscan;
- m_ppu->m_beam.current_vert = m_screen->vpos();
+ m_ppu->set_current_vert(m_screen->vpos());
/* make sure we halt */
m_hblank_timer->adjust(attotime::never);
/* draw a scanline */
- if (m_ppu->m_beam.current_vert <= m_ppu->m_beam.last_visible_line)
+ if (m_ppu->current_vert() <= m_ppu->last_visible_line())
{
if (m_screen->vpos() > 0)
{
@@ -236,7 +236,7 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_hblank_tick)
if (SNES_CPU_REG(HDMAEN))
hdma(cpu0space);
- m_screen->update_partial((m_ppu->m_interlace == 2) ? (m_ppu->m_beam.current_vert * m_ppu->m_interlace) : m_ppu->m_beam.current_vert - 1);
+ m_screen->update_partial((m_ppu->interlace() == 2) ? (m_ppu->current_vert() * m_ppu->interlace()) : m_ppu->current_vert() - 1);
}
}
@@ -244,8 +244,8 @@ TIMER_CALLBACK_MEMBER(snes_state::snes_hblank_tick)
SNES_CPU_REG(HVBJOY) |= 0x40;
/* kick off the start of scanline timer */
- nextscan = m_ppu->m_beam.current_vert + 1;
- if (nextscan >= (((m_ppu->m_stat78 & 0x10) == SNES_NTSC) ? SNES_VTOTAL_NTSC : SNES_VTOTAL_PAL))
+ nextscan = m_ppu->current_vert() + 1;
+ if (nextscan >= m_ppu->vtotal())
{
nextscan = 0;
}
@@ -561,7 +561,7 @@ WRITE8_MEMBER( snes_state::snes_w_io )
return;
case HDMAEN: /* HDMA channel designation */
if (data) //if a HDMA is enabled, data is inited at the next scanline
- timer_set(m_screen->time_until_pos(m_ppu->m_beam.current_vert + 1), TIMER_RESET_HDMA);
+ timer_set(m_screen->time_until_pos(m_ppu->current_vert() + 1), TIMER_RESET_HDMA);
SNES_CPU_REG(HDMAEN) = data;
return;
case TIMEUP: // IRQ Flag is cleared on both read and write
@@ -1038,7 +1038,7 @@ void snes_state::snes_init_timers()
// SNES hcounter has a 0-339 range. hblank starts at counter 260.
// clayfighter sets an HIRQ at 260, apparently it wants it to be before hdma kicks off, so we'll delay 2 pixels.
m_hblank_offset = 274;
- m_hblank_timer->adjust(m_screen->time_until_pos(((m_ppu->m_stat78 & 0x10) == SNES_NTSC) ? SNES_VTOTAL_NTSC - 1 : SNES_VTOTAL_PAL - 1, m_hblank_offset));
+ m_hblank_timer->adjust(m_screen->time_until_pos(m_ppu->vtotal() - 1, m_hblank_offset));
}
void snes_state::snes_init_ram()
@@ -1065,9 +1065,9 @@ void snes_state::snes_init_ram()
// init frame counter so first line is 0
if (ATTOSECONDS_TO_HZ(m_screen->frame_period().attoseconds()) >= 59)
- m_ppu->m_beam.current_vert = SNES_VTOTAL_NTSC;
+ m_ppu->set_current_vert(SNES_VTOTAL_NTSC);
else
- m_ppu->m_beam.current_vert = SNES_VTOTAL_PAL;
+ m_ppu->set_current_vert(SNES_VTOTAL_PAL);
}
void snes_state::machine_start()
@@ -1141,9 +1141,7 @@ void snes_state::machine_reset()
m_htime = 0x1ff;
m_vtime = 0x1ff;
- m_ppu->m_htmult = 1;
- m_ppu->m_interlace = 1;
- m_ppu->m_obj_interlace = 1;
+ m_ppu->reset_interlace();
}
diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp
index fc14f746b50..ef83a14aaf1 100644
--- a/src/mame/machine/st0016.cpp
+++ b/src/mame/machine/st0016.cpp
@@ -7,7 +7,7 @@
#include "speaker.h"
-const device_type ST0016_CPU = device_creator<st0016_cpu_device>;
+DEFINE_DEVICE_TYPE(ST0016_CPU, st0016_cpu_device, "st0016_cpu", "ST0016")
static ADDRESS_MAP_START(st0016_cpu_internal_map, AS_PROGRAM, 8, st0016_cpu_device)
AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
@@ -30,7 +30,7 @@ ADDRESS_MAP_END
// note: a lot of bits are left uninitialized by the games, the default values are uncertain
st0016_cpu_device::st0016_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : z80_device(mconfig, ST0016_CPU, "ST0016", tag, owner, clock, "st0016_cpu", __FILE__),
+ : z80_device(mconfig, ST0016_CPU, tag, owner, clock),
device_gfx_interface(mconfig, *this, nullptr, "palette"),
st0016_spr_bank(0),
st0016_spr2_bank(0),
@@ -148,8 +148,8 @@ WRITE8_MEMBER(st0016_cpu_device::st0016_sprite_bank_w)
xxxx - spriteram bank1
xxxx - spriteram bank2
*/
- st0016_spr_bank=data&ST0016_SPR_BANK_MASK;
- st0016_spr2_bank=(data>>4)&ST0016_SPR_BANK_MASK;
+ st0016_spr_bank=data&SPR_BANK_MASK;
+ st0016_spr2_bank=(data>>4)&SPR_BANK_MASK;
}
WRITE8_MEMBER(st0016_cpu_device::st0016_palette_bank_w)
@@ -159,7 +159,7 @@ WRITE8_MEMBER(st0016_cpu_device::st0016_palette_bank_w)
xx - palram bank
xxxxxx - unknown/unused
*/
- st0016_pal_bank=data&ST0016_PAL_BANK_MASK;
+ st0016_pal_bank=data&PAL_BANK_MASK;
}
WRITE8_MEMBER(st0016_cpu_device::st0016_character_bank_w)
@@ -174,40 +174,40 @@ WRITE8_MEMBER(st0016_cpu_device::st0016_character_bank_w)
else
st0016_char_bank=(st0016_char_bank&0xff00)|data;
- st0016_char_bank&=ST0016_CHAR_BANK_MASK;
+ st0016_char_bank&=CHAR_BANK_MASK;
}
READ8_MEMBER(st0016_cpu_device::st0016_sprite_ram_r)
{
- return st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr_bank+offset];
+ return st0016_spriteram[SPR_BANK_SIZE*st0016_spr_bank+offset];
}
WRITE8_MEMBER(st0016_cpu_device::st0016_sprite_ram_w)
{
- st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr_bank+offset]=data;
+ st0016_spriteram[SPR_BANK_SIZE*st0016_spr_bank+offset]=data;
}
READ8_MEMBER(st0016_cpu_device::st0016_sprite2_ram_r)
{
- return st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr2_bank+offset];
+ return st0016_spriteram[SPR_BANK_SIZE*st0016_spr2_bank+offset];
}
WRITE8_MEMBER(st0016_cpu_device::st0016_sprite2_ram_w)
{
- st0016_spriteram[ST0016_SPR_BANK_SIZE*st0016_spr2_bank+offset]=data;
+ st0016_spriteram[SPR_BANK_SIZE*st0016_spr2_bank+offset]=data;
}
READ8_MEMBER(st0016_cpu_device::st0016_palette_ram_r)
{
- return st0016_paletteram[ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset];
+ return st0016_paletteram[PAL_BANK_SIZE*st0016_pal_bank+offset];
}
WRITE8_MEMBER(st0016_cpu_device::st0016_palette_ram_w)
{
- int color=(ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset)/2;
+ int color=(PAL_BANK_SIZE*st0016_pal_bank+offset)/2;
int val;
- st0016_paletteram[ST0016_PAL_BANK_SIZE*st0016_pal_bank+offset]=data;
+ st0016_paletteram[PAL_BANK_SIZE*st0016_pal_bank+offset]=data;
val=st0016_paletteram[color*2]+(st0016_paletteram[color*2+1]<<8);
if(!color)
palette().set_pen_color(UNUSED_PEN,pal5bit(val >> 0),pal5bit(val >> 5),pal5bit(val >> 10)); /* same as color 0 - bg ? */
@@ -216,12 +216,12 @@ WRITE8_MEMBER(st0016_cpu_device::st0016_palette_ram_w)
READ8_MEMBER(st0016_cpu_device::st0016_character_ram_r)
{
- return m_charram[ST0016_CHAR_BANK_SIZE*st0016_char_bank+offset];
+ return m_charram[CHAR_BANK_SIZE*st0016_char_bank+offset];
}
WRITE8_MEMBER(st0016_cpu_device::st0016_character_ram_w)
{
- m_charram[ST0016_CHAR_BANK_SIZE*st0016_char_bank+offset]=data;
+ m_charram[CHAR_BANK_SIZE*st0016_char_bank+offset]=data;
gfx(st0016_ramgfx)->mark_dirty(st0016_char_bank);
}
@@ -258,7 +258,7 @@ READ8_MEMBER(st0016_cpu_device::st0016_vregs_r)
READ8_MEMBER(st0016_cpu_device::st0016_dma_r)
{
/* bits 0 and 1 = 0 -> DMA transfer complete */
- if(ISMACS)
+ if(ismacs())
return 0;
else
return 0;
@@ -313,7 +313,7 @@ WRITE8_MEMBER(st0016_cpu_device::st0016_vregs_w)
while(length>0)
{
- if( srcadr < srclen && (dstadr < ST0016_MAX_CHAR_BANK*ST0016_CHAR_BANK_SIZE))
+ if( srcadr < srclen && (dstadr < MAX_CHAR_BANK*CHAR_BANK_SIZE))
{
st0016_char_bank=dstadr>>5;
st0016_character_ram_w(space,dstadr&0x1f,mem[srcadr]);
@@ -386,7 +386,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
int i, j, lx, ly, x, y, code, offset, length, sx, sy, color, flipx, flipy, scrollx, scrolly/*,plx,ply*/;
- for (i = 0; i < ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK; i += 8)
+ for (i = 0; i < SPR_BANK_SIZE*MAX_SPR_BANK; i += 8)
{
x = st0016_spriteram[i + 4] + ((st0016_spriteram[i + 5] & 3) << 8);
y = st0016_spriteram[i + 6] + ((st0016_spriteram[i + 7] & 3) << 8);
@@ -398,7 +398,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
scrollx = (st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 0x40] + 256 * st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 1 + 0x40]) & 0x3ff;
scrolly = (st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 2 + 0x40] + 256 * st0016_vregs[(((st0016_spriteram[i + 1] & 0x0f) >> 1) << 2) + 3 + 0x40]) & 0x3ff;
- if (!ISMACS)
+ if (!ismacs())
{
if (x & 0x200) x -= 0x400; //sign
if (y & 0x200) y -= 0x400;
@@ -407,7 +407,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
if (scrolly & 0x200) scrolly -= 0x400;
}
- if (ISMACS1)
+ if (ismacs1())
{
if (x & 0x200) x -= 0x400; //sign
if (y & 0x200) y -= 0x2b0;//0x400;
@@ -419,7 +419,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
x += scrollx;
y += scrolly;
- if (ISMACS)
+ if (ismacs())
{
y += 0x20;
}
@@ -435,7 +435,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
//plx=(st0016_spriteram[i+5]>>2)&0x3;
//ply=(st0016_spriteram[i+7]>>2)&0x3;
- if (offset < ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK)
+ if (offset < SPR_BANK_SIZE*MAX_SPR_BANK)
{
for (j = 0; j < length; j++)
{
@@ -443,12 +443,12 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
sx = st0016_spriteram[offset + 4] + ((st0016_spriteram[offset + 5] & 1) << 8);
sy = st0016_spriteram[offset + 6] + ((st0016_spriteram[offset + 7] & 1) << 8);
- if (ISMACS && !(ISMACS1))
+ if (ismacs() && !ismacs1())
{
if (sy & 0x100) sy -= 0x200; //yuka & yujan
}
- if (ISMACS)
+ if (ismacs())
{
sy = 0xe0 - sy;
}
@@ -480,7 +480,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
flipx = st0016_spriteram[offset + 3] & 0x80;
flipy = st0016_spriteram[offset + 3] & 0x40;
- if (ISMACS)
+ if (ismacs())
sy -= (1 << ly) * 8;
{
@@ -497,7 +497,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
int gfxoffs;
ypos = sy + y0 * 8 + spr_dy;
xpos = sx + x0 * 8 + spr_dx;
- tileno = (code + i0++)&ST0016_CHAR_BANK_MASK;
+ tileno = (code + i0++)&CHAR_BANK_MASK;
gfxoffs = 0;
srcgfx = gfx->get_data(tileno);
@@ -530,7 +530,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
}
else
{
- if (ISMACS2)
+ if (ismacs2())
{
if (pixdata)//|| destline[drawxpos]==UNUSED_PEN)
{
@@ -553,7 +553,7 @@ void st0016_cpu_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clip
}
}
offset += 8;
- if (offset >= ST0016_SPR_BANK_SIZE*ST0016_MAX_SPR_BANK)
+ if (offset >= SPR_BANK_SIZE*MAX_SPR_BANK)
break;
}
}
@@ -570,9 +570,9 @@ void st0016_cpu_device::st0016_save_init()
save_item(NAME(m_dma_offset));
//save_item(NAME(st0016_rom_bank));
save_item(NAME(st0016_vregs));
- save_pointer(NAME(m_charram.get()), ST0016_MAX_CHAR_BANK*ST0016_CHAR_BANK_SIZE);
- save_pointer(NAME(st0016_paletteram.get()), ST0016_MAX_PAL_BANK*ST0016_PAL_BANK_SIZE);
- save_pointer(NAME(st0016_spriteram.get()), ST0016_MAX_SPR_BANK*ST0016_SPR_BANK_SIZE);
+ save_pointer(NAME(m_charram.get()), MAX_CHAR_BANK*CHAR_BANK_SIZE);
+ save_pointer(NAME(st0016_paletteram.get()), MAX_PAL_BANK*PAL_BANK_SIZE);
+ save_pointer(NAME(st0016_spriteram.get()), MAX_SPR_BANK*SPR_BANK_SIZE);
}
@@ -581,9 +581,9 @@ void st0016_cpu_device::startup()
int gfx_index=0;
m_dma_offset = 0;
- m_charram=make_unique_clear<uint8_t[]>(ST0016_MAX_CHAR_BANK*ST0016_CHAR_BANK_SIZE);
- st0016_spriteram=make_unique_clear<uint8_t[]>(ST0016_MAX_SPR_BANK*ST0016_SPR_BANK_SIZE);
- st0016_paletteram=make_unique_clear<uint8_t[]>(ST0016_MAX_PAL_BANK*ST0016_PAL_BANK_SIZE);
+ m_charram=make_unique_clear<uint8_t[]>(MAX_CHAR_BANK*CHAR_BANK_SIZE);
+ st0016_spriteram=make_unique_clear<uint8_t[]>(MAX_SPR_BANK*SPR_BANK_SIZE);
+ st0016_paletteram=make_unique_clear<uint8_t[]>(MAX_PAL_BANK*PAL_BANK_SIZE);
/* find first empty slot to decode gfx */
for (gfx_index = 0; gfx_index < MAX_GFX_ELEMENTS; gfx_index++)
@@ -671,7 +671,7 @@ void st0016_cpu_device::draw_bgmap(bitmap_ind16 &bitmap, const rectangle &clipre
destline[drawxpos] = (destline[drawxpos] | (pixdata << 4)) & 0x3ff;
else
{
- if (ISMACS2)
+ if (ismacs2())
{
if (pixdata)// || destline[drawxpos]==UNUSED_PEN)
{
@@ -716,13 +716,13 @@ uint32_t st0016_cpu_device::update(screen_device &screen, bitmap_ind16 &bitmap,
{
int h,j;
FILE *p=fopen("vram.bin","wb");
- fwrite(st0016_spriteram.get(),1,0x1000*ST0016_MAX_SPR_BANK,p);
+ fwrite(st0016_spriteram.get(),1,0x1000*MAX_SPR_BANK,p);
fclose(p);
p=fopen("vram.txt","wt");
for(h=0;h<0xc0;h++)
fprintf(p,"VREG %.4x - %.4x\n",h,st0016_vregs[h]);
- for(h=0;h<0x1000*ST0016_MAX_SPR_BANK;h+=8)
+ for(h=0;h<0x1000*MAX_SPR_BANK;h+=8)
{
fprintf(p,"%.4x - %.4x - ",h,h>>3);
for(j=0;j<8;j++)
diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h
index c25b1e425e5..92c1805422b 100644
--- a/src/mame/machine/st0016.h
+++ b/src/mame/machine/st0016.h
@@ -2,8 +2,8 @@
// copyright-holders:Tomasz Slanina, David Haywood
/* ST0016 - CPU (z80) + Sound + Video */
-#ifndef MAME_MACHINE_ST0016_CPU_H
-#define MAME_MACHINE_ST0016_CPU_H
+#ifndef MAME_MACHINE_ST0016_H
+#define MAME_MACHINE_ST0016_H
#pragma once
@@ -11,26 +11,6 @@
#include "sound/st0016.h"
#include "screen.h"
-#define ISMACS (m_game_flag & 0x80)
-#define ISMACS1 (((m_game_flag & 0x180) == 0x180))
-#define ISMACS2 (((m_game_flag & 0x180) == 0x080))
-
-
-#define ST0016_MAX_SPR_BANK 0x10
-#define ST0016_MAX_CHAR_BANK 0x10000
-#define ST0016_MAX_PAL_BANK 4
-
-#define ST0016_SPR_BANK_SIZE 0x1000
-#define ST0016_CHAR_BANK_SIZE 0x20
-#define ST0016_PAL_BANK_SIZE 0x200
-
-#define UNUSED_PEN 1024
-
-#define ST0016_SPR_BANK_MASK (ST0016_MAX_SPR_BANK-1)
-#define ST0016_CHAR_BANK_MASK (ST0016_MAX_CHAR_BANK-1)
-#define ST0016_PAL_BANK_MASK (ST0016_MAX_PAL_BANK-1)
-
-
typedef device_delegate<uint8_t (void)> st0016_dma_offs_delegate;
#define ST0016_DMA_OFFS_CB(name) uint8_t name(void)
@@ -83,6 +63,26 @@ public:
std::unique_ptr<uint8_t[]> m_charram;
protected:
+ bool ismacs() const { return m_game_flag & 0x80; }
+ bool ismacs1() const { return (m_game_flag & 0x180) == 0x180; }
+ bool ismacs2() const { return (m_game_flag & 0x180) == 0x080; }
+
+
+ static constexpr unsigned MAX_SPR_BANK = 0x10;
+ static constexpr unsigned MAX_CHAR_BANK = 0x10000;
+ static constexpr unsigned MAX_PAL_BANK = 4;
+
+ static constexpr unsigned SPR_BANK_SIZE = 0x1000;
+ static constexpr unsigned CHAR_BANK_SIZE = 0x20;
+ static constexpr unsigned PAL_BANK_SIZE = 0x200;
+
+ static constexpr unsigned UNUSED_PEN = 1024;
+
+ static constexpr unsigned SPR_BANK_MASK = MAX_SPR_BANK - 1;
+ static constexpr unsigned CHAR_BANK_MASK = MAX_CHAR_BANK - 1;
+ static constexpr unsigned PAL_BANK_MASK = MAX_PAL_BANK - 1;
+
+
// device-level overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
@@ -111,7 +111,7 @@ private:
// device type definition
-extern const device_type ST0016_CPU;
+DECLARE_DEVICE_TYPE(ST0016_CPU, st0016_cpu_device)
-#endif // MAME_MACHINE_ST0016_CPU_H
+#endif // MAME_MACHINE_ST0016_H
diff --git a/src/mame/machine/swim.cpp b/src/mame/machine/swim.cpp
index 59537173bd8..6e901d1f288 100644
--- a/src/mame/machine/swim.cpp
+++ b/src/mame/machine/swim.cpp
@@ -32,14 +32,14 @@ enum
DEVICE
***************************************************************************/
-const device_type SWIM = device_creator<swim_device>;
+DEFINE_DEVICE_TYPE(SWIM, swim_device, "swim", "Apple SWIM (Steve Woz Integrated Machine")
//-------------------------------------------------
// ctor
//-------------------------------------------------
swim_device::swim_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : applefdc_base_device(APPLEFDC_SWIM, mconfig, SWIM, "Apple SWIM (Steve Woz Integrated Machine)", tag, owner, clock, "swim", __FILE__)
+ : applefdc_base_device(APPLEFDC_SWIM, mconfig, SWIM, tag, owner, clock)
{
}
diff --git a/src/mame/machine/swim.h b/src/mame/machine/swim.h
index f15412e352e..93d326c32b4 100644
--- a/src/mame/machine/swim.h
+++ b/src/mame/machine/swim.h
@@ -9,8 +9,8 @@
*********************************************************************/
-#ifndef __SWIM_H__
-#define __SWIM_H__
+#ifndef MAME_MACHINE_SWIM_H
+#define MAME_MACHINE_SWIM_H
#include "machine/applefdc.h"
@@ -19,7 +19,7 @@
DEVICE
***************************************************************************/
-extern const device_type SWIM;
+DECLARE_DEVICE_TYPE(SWIM, swim_device)
class swim_device : public applefdc_base_device
{
@@ -60,4 +60,4 @@ private:
MCFG_DEVICE_MODIFY(_tag) \
MCFG_APPLEFDC_CONFIG(_intrf)
-#endif // __SWIM_H__
+#endif // MAME_MACHINE_SWIM_H
diff --git a/src/mame/machine/swtpc09.cpp b/src/mame/machine/swtpc09.cpp
index 7f325b2a2b0..9e7773a09fb 100644
--- a/src/mame/machine/swtpc09.cpp
+++ b/src/mame/machine/swtpc09.cpp
@@ -461,7 +461,7 @@ WRITE8_MEMBER(swtpc09_state::dat_w)
address_space &mem = m_maincpu->space(AS_PROGRAM);
- fd1793_t *fdc = machine().device<fd1793_t>("fdc");
+ fd1793_device *fdc = machine().device<fd1793_device>("fdc");
pia6821_device *pia = machine().device<pia6821_device>("pia");
ptm6840_device *ptm = machine().device<ptm6840_device>("ptm");
acia6850_device *acia = machine().device<acia6850_device>("acia");
@@ -498,7 +498,7 @@ WRITE8_MEMBER(swtpc09_state::dat_w)
mem.install_readwrite_handler(logical_address+0x004, logical_address+0x004, read8_delegate(FUNC(acia6850_device::status_r), acia), write8_delegate(FUNC(acia6850_device::control_w),acia));
mem.install_readwrite_handler(logical_address+0x005, logical_address+0x005, read8_delegate(FUNC(acia6850_device::data_r), acia), write8_delegate(FUNC(acia6850_device::data_w),acia));
mem.install_write_handler(logical_address+0x014, logical_address+0x014, write8_delegate(FUNC(swtpc09_state::dc4_control_reg_w),this));
- mem.install_readwrite_handler(logical_address+0x018, logical_address+0x01b, read8_delegate(FUNC(fd1793_t::read), fdc), write8_delegate(FUNC(fd1793_t::write),fdc));
+ mem.install_readwrite_handler(logical_address+0x018, logical_address+0x01b, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc));
//mem.nop_readwrite(logical_address+0x01c, logical_address+0x05f);
mem.install_readwrite_handler(logical_address+0x060, logical_address+0x06f, read8_delegate(FUNC(pia6821_device::read), piaide), write8_delegate(FUNC(pia6821_device::write), piaide));
//mem.nop_readwrite(logical_address+0x070, logical_address+0x07f);
@@ -522,7 +522,7 @@ WRITE8_MEMBER(swtpc09_state::dat_w)
if (m_system_type == UNIFLEX_DMF2 || m_system_type == FLEX_DMF2) // if DMF2 conroller this is the map
{
mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this));
- mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_t::read), fdc), write8_delegate(FUNC(fd1793_t::write),fdc));
+ mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc));
mem.install_readwrite_handler(logical_address+0x024, logical_address+0x03f, read8_delegate(FUNC(swtpc09_state::dmf2_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_control_reg_w),this));
mem.install_readwrite_handler(logical_address+0x040, logical_address+0x041, read8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_w),this));
//mem.nop_readwrite(logical_address+0x042, logical_address+0x7ff);
@@ -532,7 +532,7 @@ WRITE8_MEMBER(swtpc09_state::dat_w)
else if (m_system_type == FLEX_DC4_PIAIDE) // 2k ram for piaide on s09 board
{
//mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this));
- //mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_t::read), fdc), write8_delegate(FUNC(fd1793_t::write),fdc));
+ //mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc));
//mem.install_readwrite_handler(logical_address+0x024, logical_address+0x03f, read8_delegate(FUNC(swtpc09_state::dmf2_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_control_reg_w),this));
//mem.install_readwrite_handler(logical_address+0x040, logical_address+0x041, read8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf2_dma_address_reg_w),this));
mem.install_ram(logical_address+0x000, logical_address+0x7ff, &RAM[0xf000]);
@@ -542,7 +542,7 @@ WRITE8_MEMBER(swtpc09_state::dat_w)
else // assume DMF3 controller
{
mem.install_readwrite_handler(logical_address+0x000, logical_address+0x01f, read8_delegate(FUNC(swtpc09_state::m6844_r),this), write8_delegate(FUNC(swtpc09_state::m6844_w),this));
- mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_t::read), fdc), write8_delegate(FUNC(fd1793_t::write),fdc));
+ mem.install_readwrite_handler(logical_address+0x020, logical_address+0x023, read8_delegate(FUNC(fd1793_device::read), fdc), write8_delegate(FUNC(fd1793_device::write),fdc));
mem.install_readwrite_handler(logical_address+0x024, logical_address+0x024, read8_delegate(FUNC(swtpc09_state::dmf3_control_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf3_control_reg_w),this));
mem.install_readwrite_handler(logical_address+0x025, logical_address+0x025, read8_delegate(FUNC(swtpc09_state::dmf3_dma_address_reg_r),this), write8_delegate(FUNC(swtpc09_state::dmf3_dma_address_reg_w),this));
//mem.nop_readwrite(logical_address+0x030, logical_address+0x03f);
diff --git a/src/mame/machine/tait8741.cpp b/src/mame/machine/tait8741.cpp
index ba5c223a025..ae9c570b689 100644
--- a/src/mame/machine/tait8741.cpp
+++ b/src/mame/machine/tait8741.cpp
@@ -13,7 +13,7 @@ Taito 8741 emulation
#include "tait8741.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) printf x; } while (0)
+#include "logmacro.h"
/****************************************************************************
@@ -33,10 +33,10 @@ gladiatr and Great Swordsman set.
#define CMD_08 1
#define CMD_4a 2
-const device_type TAITO8741_4PACK = device_creator<taito8741_4pack_device>;
+DEFINE_DEVICE_TYPE(TAITO8741_4PACK, taito8741_4pack_device, "taito8741_4pack", "I8741 MCU Simulation (Taito 4Pack)")
taito8741_4pack_device::taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TAITO8741_4PACK, "I8741 MCU Simulation (Taito 4Pack)", tag, owner, clock, "taito8741_4pack", __FILE__),
+ : device_t(mconfig, TAITO8741_4PACK, tag, owner, clock),
m_port_handler_0_r(*this),
m_port_handler_1_r(*this),
m_port_handler_2_r(*this),
@@ -91,7 +91,7 @@ TIMER_CALLBACK_MEMBER( taito8741_4pack_device::serial_tx )
sst = &m_taito8741[st->connect];
/* transfer data */
serial_rx(sst,st->txd);
- LOG(("8741-%d Serial data TX to %d\n",num,st->connect));
+ LOG("8741-%d Serial data TX to %d\n",num,st->connect);
if( sst->mode==TAITO8741_SLAVE)
sst->serial_out = 1;
}
@@ -275,7 +275,7 @@ int taito8741_4pack_device::status_r(int num)
{
I8741 *st = &m_taito8741[num];
update(num);
- LOG(("%s:8741-%d ST Read %02x\n",machine().describe_context(),num,st->status));
+ LOG("%s:8741-%d ST Read %02x\n",machine().describe_context(),num,st->status);
return st->status;
}
@@ -285,7 +285,7 @@ int taito8741_4pack_device::data_r(int num)
I8741 *st = &m_taito8741[num];
int ret = st->toData;
st->status &= 0xfe;
- LOG(("%s:8741-%d DATA Read %02x\n",machine().describe_context(),num,ret));
+ LOG("%s:8741-%d DATA Read %02x\n",machine().describe_context(),num,ret);
/* update chip */
update(num);
@@ -303,7 +303,7 @@ int taito8741_4pack_device::data_r(int num)
void taito8741_4pack_device::data_w(int num, int data)
{
I8741 *st = &m_taito8741[num];
- LOG(("%s:8741-%d DATA Write %02x\n",machine().describe_context(),num,data));
+ LOG("%s:8741-%d DATA Write %02x\n",machine().describe_context(),num,data);
st->fromData = data;
st->status |= 0x02;
/* update chip */
@@ -314,7 +314,7 @@ void taito8741_4pack_device::data_w(int num, int data)
void taito8741_4pack_device::command_w(int num, int data)
{
I8741 *st = &m_taito8741[num];
- LOG(("%s:8741-%d CMD Write %02x\n",machine().describe_context(),num,data));
+ LOG("%s:8741-%d CMD Write %02x\n",machine().describe_context(),num,data);
st->fromCmd = data;
st->status |= 0x04;
/* update chip */
diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h
index 77e2c6338f7..ba97e80b8e3 100644
--- a/src/mame/machine/tait8741.h
+++ b/src/mame/machine/tait8741.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Jarek Parchanski
-#ifndef __TAITO8741__
-#define __TAITO8741__
+#ifndef MAME_MACHINE_TAITO8741_H
+#define MAME_MACHINE_TAITO8741_H
+#pragma once
/****************************************************************************
gladiatr and Great Swordsman set.
@@ -38,32 +39,13 @@
class taito8741_4pack_device : public device_t
{
- struct I8741 {
- int number;
- uint8_t toData; /* to host data */
- uint8_t fromData; /* from host data */
- uint8_t fromCmd; /* from host command */
- uint8_t status; /* b0 = rd ready,b1 = wd full,b2 = cmd ?? */
- uint8_t mode;
- uint8_t phase;
- uint8_t txd[8];
- uint8_t rxd[8];
- uint8_t parallelselect;
- uint8_t txpoint;
- int connect;
- uint8_t pending4a;
- int serial_out;
- int coins;
- };
-
public:
taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~taito8741_4pack_device() {}
- template<class _Object> static devcb_base &set_port_handler_0_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_0_r.set_callback(object); }
- template<class _Object> static devcb_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); }
- template<class _Object> static devcb_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); }
- template<class _Object> static devcb_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); }
+ template <class Object> static devcb_base &set_port_handler_0_callback(device_t &device, Object &&cb) { return downcast<taito8741_4pack_device &>(device).m_port_handler_0_r.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_port_handler_1_callback(device_t &device, Object &&cb) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_port_handler_2_callback(device_t &device, Object &&cb) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_port_handler_3_callback(device_t &device, Object &&cb) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(std::forward<Object>(cb)); }
static void static_set_mode(device_t &device, int num, uint8_t mode) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].mode = mode; }
static void static_set_connect(device_t &device, int num, int conn) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].connect = conn; }
@@ -92,6 +74,24 @@ protected:
virtual void device_reset() override;
private:
+ struct I8741 {
+ int number;
+ uint8_t toData; /* to host data */
+ uint8_t fromData; /* from host data */
+ uint8_t fromCmd; /* from host command */
+ uint8_t status; /* b0 = rd ready,b1 = wd full,b2 = cmd ?? */
+ uint8_t mode;
+ uint8_t phase;
+ uint8_t txd[8];
+ uint8_t rxd[8];
+ uint8_t parallelselect;
+ uint8_t txpoint;
+ int connect;
+ uint8_t pending4a;
+ int serial_out;
+ int coins;
+ };
+
void hostdata_w(I8741 *st,int data);
int hostdata_r(I8741 *st);
int hostcmd_r(I8741 *st);
@@ -107,6 +107,6 @@ private:
};
-extern const device_type TAITO8741_4PACK;
+DECLARE_DEVICE_TYPE(TAITO8741_4PACK, taito8741_4pack_device)
-#endif
+#endif // MAME_MACHINE_TAITO8741_H
diff --git a/src/mame/machine/taito68705interface.cpp b/src/mame/machine/taito68705interface.cpp
index 6d08d10468f..176dbe899b2 100644
--- a/src/mame/machine/taito68705interface.cpp
+++ b/src/mame/machine/taito68705interface.cpp
@@ -73,10 +73,10 @@ MACHINE_CONFIG_END
} // anonymous namespace
-device_type const TAITO68705_MCU = device_creator<taito68705_mcu_device>;
-device_type const TAITO68705_MCU_TIGER = device_creator<taito68705_mcu_tiger_device>;
-device_type const ARKANOID_68705P3 = device_creator<arkanoid_68705p3_device>;
-device_type const ARKANOID_68705P5 = device_creator<arkanoid_68705p5_device>;
+DEFINE_DEVICE_TYPE(TAITO68705_MCU, taito68705_mcu_device, "taito68705", "Taito MC68705 MCU Interface")
+DEFINE_DEVICE_TYPE(TAITO68705_MCU_TIGER, taito68705_mcu_tiger_device, "taito68705tiger", "Taito MC68705 MCU Interface (Tiger Heli)")
+DEFINE_DEVICE_TYPE(ARKANOID_68705P3, arkanoid_68705p3_device, "arkanoid68705p3", "Arkanoid MC68705P3 Interface")
+DEFINE_DEVICE_TYPE(ARKANOID_68705P5, arkanoid_68705p5_device, "arkanoid68705p5", "Arkanoid MC68705P5 Interface")
READ8_MEMBER(taito68705_mcu_device_base::data_r)
@@ -122,13 +122,10 @@ WRITE8_MEMBER(taito68705_mcu_device_base::mcu_pa_w)
taito68705_mcu_device_base::taito68705_mcu_device_base(
machine_config const &mconfig,
device_type type,
- char const *name,
char const *tag,
device_t *owner,
- u32 clock,
- char const *shortname,
- char const *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ u32 clock)
+ : device_t(mconfig, type, tag, owner, clock)
, m_mcu(*this, "mcu")
, m_semaphore_cb(*this)
, m_latch_driven(false)
@@ -209,12 +206,12 @@ void taito68705_mcu_device_base::latch_control(u8 data, u8 &value, unsigned host
taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : taito68705_mcu_device(mconfig, TAITO68705_MCU, "Taito MC68705 MCU Interface", tag, owner, clock, "taito68705", __FILE__)
+ : taito68705_mcu_device(mconfig, TAITO68705_MCU, tag, owner, clock)
{
}
-taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source)
- : taito68705_mcu_device_base(mconfig, type, name, tag, owner, clock, shortname, source)
+taito68705_mcu_device::taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+ : taito68705_mcu_device_base(mconfig, type, tag, owner, clock)
, m_aux_strobe_cb(*this)
, m_pb_output(0xff)
{
@@ -285,7 +282,7 @@ WRITE8_MEMBER(taito68705_mcu_device::mcu_portb_w)
/* The Tiger Heli interface has some extensions, handle them here */
taito68705_mcu_tiger_device::taito68705_mcu_tiger_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : taito68705_mcu_device(mconfig, TAITO68705_MCU_TIGER, "Taito MC68705 MCU Interface (Tiger Heli)", tag, owner, clock, "taito68705tiger", __FILE__)
+ : taito68705_mcu_device(mconfig, TAITO68705_MCU_TIGER, tag, owner, clock)
{
}
@@ -320,13 +317,10 @@ WRITE8_MEMBER(arkanoid_mcu_device_base::mcu_pc_w)
arkanoid_mcu_device_base::arkanoid_mcu_device_base(
machine_config const &mconfig,
device_type type,
- char const *name,
char const *tag,
device_t *owner,
- u32 clock,
- char const *shortname,
- char const *source)
- : taito68705_mcu_device_base(mconfig, type, name, tag, owner, clock, shortname, source)
+ u32 clock)
+ : taito68705_mcu_device_base(mconfig, type, tag, owner, clock)
, m_portb_r_cb(*this)
, m_pc_output(0xff)
{
@@ -349,7 +343,7 @@ arkanoid_68705p3_device::arkanoid_68705p3_device(
char const *tag,
device_t *owner,
u32 clock)
- : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P3, "Arkanoid MC68705P3 Interface", tag, owner, clock, "arkanoid68705p3", __FILE__)
+ : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P3, tag, owner, clock)
{
}
@@ -364,7 +358,7 @@ arkanoid_68705p5_device::arkanoid_68705p5_device(
char const *tag,
device_t *owner,
u32 clock)
- : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P5, "Arkanoid MC68705P5 Interface", tag, owner, clock, "arkanoid68705p5", __FILE__)
+ : arkanoid_mcu_device_base(mconfig, ARKANOID_68705P5, tag, owner, clock)
{
}
diff --git a/src/mame/machine/taito68705interface.h b/src/mame/machine/taito68705interface.h
index aa0ea8f35d3..dd718e68510 100644
--- a/src/mame/machine/taito68705interface.h
+++ b/src/mame/machine/taito68705interface.h
@@ -1,13 +1,17 @@
// license:BSD-3-Clause
// copyright-holders:Ernesto Corvi, Nicola Salmoria, David Haywood, Vas Crabb
+#ifndef MAME_MACHINE_TAITO68705INTERFACE_H
+#define MAME_MACHINE_TAITO68705INTERFACE_H
+
+#pragma once
#include "cpu/m6805/m68705.h"
-extern const device_type TAITO68705_MCU;
-extern const device_type TAITO68705_MCU_TIGER;
-extern const device_type ARKANOID_68705P3;
-extern const device_type ARKANOID_68705P5;
+DECLARE_DEVICE_TYPE(TAITO68705_MCU, taito68705_mcu_device)
+DECLARE_DEVICE_TYPE(TAITO68705_MCU_TIGER, taito68705_mcu_tiger_device)
+DECLARE_DEVICE_TYPE(ARKANOID_68705P3, arkanoid_68705p3_device)
+DECLARE_DEVICE_TYPE(ARKANOID_68705P5, arkanoid_68705p5_device)
class taito68705_mcu_device_base : public device_t
@@ -32,12 +36,9 @@ protected:
taito68705_mcu_device_base(
machine_config const &mconfig,
device_type type,
- char const *name,
char const *tag,
device_t *owner,
- u32 clock,
- char const *shortname,
- char const *source);
+ u32 clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -77,7 +78,7 @@ public:
DECLARE_WRITE8_MEMBER(mcu_portb_w);
protected:
- taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, u32 clock, const char *shortname, const char *source);
+ taito68705_mcu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
@@ -117,12 +118,9 @@ protected:
arkanoid_mcu_device_base(
machine_config const &mconfig,
device_type type,
- char const *name,
char const *tag,
device_t *owner,
- u32 clock,
- char const *shortname,
- char const *source);
+ u32 clock);
virtual void device_start() override;
@@ -150,3 +148,5 @@ public:
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
};
+
+#endif // MAME_MACHINE_TAITO68705INTERFACE_H
diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp
index cd38073857a..aa3b1940af7 100644
--- a/src/mame/machine/taitoio.cpp
+++ b/src/mame/machine/taitoio.cpp
@@ -59,10 +59,10 @@ MACHINE_CONFIG_END
/* */
/***************************************************************************/
-const device_type TC0220IOC = device_creator<tc0220ioc_device>;
+DEFINE_DEVICE_TYPE(TC0220IOC, tc0220ioc_device, "tc0220ioc", "Taito TC0220IOC")
tc0220ioc_device::tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0220IOC, "Taito TC0220IOC", tag, owner, clock, "tc0220ioc", __FILE__),
+ : device_t(mconfig, TC0220IOC, tag, owner, clock),
m_watchdog(*this, "watchdog"),
m_read_0_cb(*this),
m_read_1_cb(*this),
@@ -196,10 +196,10 @@ WRITE8_MEMBER( tc0220ioc_device::portreg_w )
/***************************************************************************/
-const device_type TC0510NIO = device_creator<tc0510nio_device>;
+DEFINE_DEVICE_TYPE(TC0510NIO, tc0510nio_device, "tc0510nio", "Taito TC0510NIO")
tc0510nio_device::tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0510NIO, "Taito TC0510NIO", tag, owner, clock, "tc0510nio", __FILE__),
+ : device_t(mconfig, TC0510NIO, tag, owner, clock),
m_watchdog(*this, "watchdog"),
m_read_0_cb(*this),
m_read_1_cb(*this),
@@ -334,10 +334,10 @@ WRITE16_MEMBER( tc0510nio_device::halfword_wordswap_w )
/***************************************************************************/
-const device_type TC0640FIO = device_creator<tc0640fio_device>;
+DEFINE_DEVICE_TYPE(TC0640FIO, tc0640fio_device, "tc0640fio", "Taito TC0640FIO")
tc0640fio_device::tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0640FIO, "Taito TC0640FIO", tag, owner, clock, "tc0640fio", __FILE__),
+ : device_t(mconfig, TC0640FIO, tag, owner, clock),
m_watchdog(*this, "watchdog"),
m_read_0_cb(*this),
m_read_1_cb(*this),
diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h
index 30bef9e7eae..83919a71a26 100644
--- a/src/mame/machine/taitoio.h
+++ b/src/mame/machine/taitoio.h
@@ -8,8 +8,10 @@
**************************************************************************/
-#ifndef __TAITOIO_H__
-#define __TAITOIO_H__
+#ifndef MAME_MACHINE_TAITOIO_H
+#define MAME_MACHINE_TAITOIO_H
+
+#pragma once
#include "machine/watchdog.h"
@@ -18,13 +20,12 @@ class tc0220ioc_device : public device_t
{
public:
tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0220ioc_device() {}
- template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_3_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0220ioc_device &>(device).m_read_7_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_read_0_callback(device_t &device, Object &&cb) { return downcast<tc0220ioc_device &>(device).m_read_0_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_1_callback(device_t &device, Object &&cb) { return downcast<tc0220ioc_device &>(device).m_read_1_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_2_callback(device_t &device, Object &&cb) { return downcast<tc0220ioc_device &>(device).m_read_2_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_3_callback(device_t &device, Object &&cb) { return downcast<tc0220ioc_device &>(device).m_read_3_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_7_callback(device_t &device, Object &&cb) { return downcast<tc0220ioc_device &>(device).m_read_7_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -53,19 +54,18 @@ private:
devcb_read8 m_read_7_cb;
};
-extern const device_type TC0220IOC;
+DECLARE_DEVICE_TYPE(TC0220IOC, tc0220ioc_device)
class tc0510nio_device : public device_t
{
public:
tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0510nio_device() {}
- template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_3_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0510nio_device &>(device).m_read_7_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_read_0_callback(device_t &device, Object &&cb) { return downcast<tc0510nio_device &>(device).m_read_0_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_1_callback(device_t &device, Object &&cb) { return downcast<tc0510nio_device &>(device).m_read_1_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_2_callback(device_t &device, Object &&cb) { return downcast<tc0510nio_device &>(device).m_read_2_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_3_callback(device_t &device, Object &&cb) { return downcast<tc0510nio_device &>(device).m_read_3_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_7_callback(device_t &device, Object &&cb) { return downcast<tc0510nio_device &>(device).m_read_7_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -93,19 +93,18 @@ private:
devcb_read8 m_read_7_cb;
};
-extern const device_type TC0510NIO;
+DECLARE_DEVICE_TYPE(TC0510NIO, tc0510nio_device)
class tc0640fio_device : public device_t
{
public:
tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0640fio_device() {}
- template<class _Object> static devcb_base &set_read_0_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_0_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_1_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_2_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_3_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_3_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_read_7_callback(device_t &device, _Object object) { return downcast<tc0640fio_device &>(device).m_read_7_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_read_0_callback(device_t &device, Object &&cb) { return downcast<tc0640fio_device &>(device).m_read_0_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_1_callback(device_t &device, Object &&cb) { return downcast<tc0640fio_device &>(device).m_read_1_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_2_callback(device_t &device, Object &&cb) { return downcast<tc0640fio_device &>(device).m_read_2_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_3_callback(device_t &device, Object &&cb) { return downcast<tc0640fio_device &>(device).m_read_3_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_read_7_callback(device_t &device, Object &&cb) { return downcast<tc0640fio_device &>(device).m_read_7_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
@@ -134,7 +133,7 @@ protected:
devcb_read8 m_read_7_cb;
};
-extern const device_type TC0640FIO;
+DECLARE_DEVICE_TYPE(TC0640FIO, tc0640fio_device)
/***************************************************************************
@@ -189,4 +188,4 @@ extern const device_type TC0640FIO;
devcb = &tc0640fio_device::set_read_7_callback(*device, DEVCB_##_devcb);
-#endif /* __TAITOIO_H__ */
+#endif // MAME_MACHINE_TAITOIO_H
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index c3ea1183832..395fd26c09b 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TANDY2K_KEYBOARD = device_creator<tandy2k_keyboard_device>;
+DEFINE_DEVICE_TYPE(TANDY2K_KEYBOARD, tandy2k_keyboard_device, "tandy2kb", "Tandy 2000 Keyboard")
@@ -218,7 +218,7 @@ ioport_constructor tandy2k_keyboard_device::device_input_ports() const
//-------------------------------------------------
tandy2k_keyboard_device::tandy2k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, TANDY2K_KEYBOARD, "Tandy 2000 Keyboard", tag, owner, clock, "tandy2kb", __FILE__),
+ device_t(mconfig, TANDY2K_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8048_TAG),
m_y(*this, "Y%u", 0),
m_write_clock(*this),
diff --git a/src/mame/machine/tandy2kb.h b/src/mame/machine/tandy2kb.h
index b2ad63a38f1..255caae6f4e 100644
--- a/src/mame/machine/tandy2kb.h
+++ b/src/mame/machine/tandy2kb.h
@@ -6,10 +6,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_TANDY2KB_H
+#define MAME_MACHINE_TANDY2KB_H
-#ifndef __TANDY2K_KEYBOARD__
-#define __TANDY2K_KEYBOARD__
+#pragma once
#include "cpu/mcs48/mcs48.h"
@@ -47,8 +47,8 @@ public:
// construction/destruction
tandy2k_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<tandy2k_keyboard_device &>(device).m_write_clock.set_callback(object); }
- template<class _Object> static devcb_base &set_data_wr_callback(device_t &device, _Object object) { return downcast<tandy2k_keyboard_device &>(device).m_write_data.set_callback(object); }
+ template <class Object> static devcb_base &set_clock_wr_callback(device_t &device, Object &&cb) { return downcast<tandy2k_keyboard_device &>(device).m_write_clock.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_data_wr_callback(device_t &device, Object &&cb) { return downcast<tandy2k_keyboard_device &>(device).m_write_data.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -91,8 +91,6 @@ private:
// device type definition
-extern const device_type TANDY2K_KEYBOARD;
-
-
+DECLARE_DEVICE_TYPE(TANDY2K_KEYBOARD, tandy2k_keyboard_device)
-#endif
+#endif // MAME_MACHINE_TANDY2KB_H
diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp
index b2b3ffdae10..0f55b706630 100644
--- a/src/mame/machine/teleprinter.cpp
+++ b/src/mame/machine/teleprinter.cpp
@@ -140,20 +140,20 @@ static const uint8_t teleprinter_font[128*8] =
};
teleprinter_device::teleprinter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : generic_terminal_device(mconfig, TELEPRINTER, "Teleprinter", tag, owner, clock, "teleprinter", __FILE__)
+ : generic_terminal_device(mconfig, TELEPRINTER, tag, owner, clock, WIDTH, HEIGHT)
{
}
void teleprinter_device::scroll_line()
{
- memmove(m_buffer,m_buffer+TELEPRINTER_WIDTH,(TELEPRINTER_HEIGHT-1)*TELEPRINTER_WIDTH);
- memset(m_buffer + TELEPRINTER_WIDTH*(TELEPRINTER_HEIGHT-1),0x20,TELEPRINTER_WIDTH);
+ memmove(m_buffer.get(), m_buffer.get() + m_width, (m_height-1) * m_width);
+ memset(m_buffer.get() + m_width * (m_height-1), 0x20, m_width);
}
void teleprinter_device::write_char(uint8_t data) {
- m_buffer[(TELEPRINTER_HEIGHT-1)*TELEPRINTER_WIDTH+m_x_pos] = data;
+ m_buffer[(m_height-1)*m_width+m_x_pos] = data;
m_x_pos++;
- if (m_x_pos >= TELEPRINTER_WIDTH)
+ if (m_x_pos >= m_width)
{
m_x_pos = 0;
scroll_line();
@@ -161,7 +161,7 @@ void teleprinter_device::write_char(uint8_t data) {
}
void teleprinter_device::clear() {
- memset(m_buffer,0,TELEPRINTER_WIDTH*TELEPRINTER_HEIGHT);
+ memset(m_buffer.get(), 0, m_width*m_height);
m_x_pos = 0;
}
@@ -173,8 +173,8 @@ void teleprinter_device::term_write(uint8_t data)
break;
case 13: m_x_pos = 0; break;
case 9: m_x_pos = (m_x_pos & 0xf8) + 8;
- if (m_x_pos >= TELEPRINTER_WIDTH)
- m_x_pos = TELEPRINTER_WIDTH-1;
+ if (m_x_pos >= m_width)
+ m_x_pos = m_width-1;
break;
case 16: break;
@@ -190,14 +190,14 @@ uint32_t teleprinter_device::tp_update(screen_device &device, bitmap_rgb32 &bitm
uint8_t code;
int y, c, x, b;
- for (y = 0; y < TELEPRINTER_HEIGHT; y++)
+ for (y = 0; y < m_height; y++)
{
for (c = 0; c < 8; c++)
{
int horpos = 0;
- for (x = 0; x < TELEPRINTER_WIDTH; x++)
+ for (x = 0; x < m_width; x++)
{
- code = teleprinter_font[(m_buffer[y*TELEPRINTER_WIDTH + x] & 0x7f) *8 + c];
+ code = teleprinter_font[(m_buffer[y*m_width + x] & 0x7f) *8 + c];
for (b = 0; b < 8; b++)
{
bitmap.pix32(y*8 + c, horpos++) = (code >> b) & 0x01 ? 0 : 0x00ffffff;
@@ -215,11 +215,11 @@ MACHINE_CONFIG_FRAGMENT( generic_teleprinter )
MCFG_SCREEN_ADD(TELEPRINTER_SCREEN_TAG, RASTER)
MCFG_SCREEN_REFRESH_RATE(50)
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
- MCFG_SCREEN_SIZE(TELEPRINTER_WIDTH*8, TELEPRINTER_HEIGHT*8)
- MCFG_SCREEN_VISIBLE_AREA(0, TELEPRINTER_WIDTH*8-1, 0, TELEPRINTER_HEIGHT*8-1)
+ MCFG_SCREEN_SIZE(teleprinter_device::WIDTH*8, teleprinter_device::HEIGHT*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, teleprinter_device::WIDTH*8-1, 0, teleprinter_device::HEIGHT*8-1)
MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, teleprinter_device, tp_update)
MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
- MCFG_GENERIC_KEYBOARD_CB(WRITE8(generic_terminal_device, kbd_put))
+ MCFG_GENERIC_KEYBOARD_CB(PUT(generic_terminal_device, kbd_put))
MCFG_SPEAKER_STANDARD_MONO("bell")
MCFG_SOUND_ADD("beeper", BEEP, 2'000)
@@ -241,4 +241,4 @@ void teleprinter_device::device_reset()
generic_terminal_device::device_reset();
}
-const device_type TELEPRINTER = device_creator<teleprinter_device>;
+DEFINE_DEVICE_TYPE(TELEPRINTER, teleprinter_device, "teleprinter", "Teleprinter")
diff --git a/src/mame/machine/teleprinter.h b/src/mame/machine/teleprinter.h
index f9f58130452..83a46e24a64 100644
--- a/src/mame/machine/teleprinter.h
+++ b/src/mame/machine/teleprinter.h
@@ -1,12 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
-#ifndef __TELEPRINTER_H__
-#define __TELEPRINTER_H__
+#ifndef MAME_MACHINE_TELEPRINTER_H
+#define MAME_MACHINE_TELEPRINTER_H
-#include "machine/terminal.h"
+#pragma once
-#define TELEPRINTER_WIDTH 80
-#define TELEPRINTER_HEIGHT 50
+#include "machine/terminal.h"
/***************************************************************************
@@ -15,8 +14,8 @@
#define TELEPRINTER_TAG "teleprinter"
#define TELEPRINTER_SCREEN_TAG "tty_screen"
-#define MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(_devcb) \
- devcb = &generic_terminal_device::set_keyboard_callback(*device, DEVCB_##_devcb);
+#define MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(cb) \
+ generic_terminal_device::set_keyboard_callback(*device, KEYBOARDCB_##cb);
/***************************************************************************
FUNCTION PROTOTYPES
@@ -25,18 +24,23 @@
class teleprinter_device : public generic_terminal_device
{
public:
+ static constexpr unsigned WIDTH = 80;
+ static constexpr unsigned HEIGHT = 50;
+
teleprinter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
uint32_t tp_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
protected:
virtual void term_write(uint8_t data) override;
virtual void device_reset() override;
virtual machine_config_constructor device_mconfig_additions() const override;
+
private:
void scroll_line();
void write_char(uint8_t data);
void clear();
};
-extern const device_type TELEPRINTER;
+DECLARE_DEVICE_TYPE(TELEPRINTER, teleprinter_device)
-#endif /* __TELEPRINTER_H__ */
+#endif // MAME_MACHINE_TELEPRINTER_H
diff --git a/src/mame/machine/thomflop.cpp b/src/mame/machine/thomflop.cpp
index 6bb7416c51f..25fa0292a7f 100644
--- a/src/mame/machine/thomflop.cpp
+++ b/src/mame/machine/thomflop.cpp
@@ -276,7 +276,7 @@ static uint8_t to7_5p14_select;
READ8_MEMBER( thomson_state::to7_5p14_r )
{
- wd2793_t *fdc = machine().device<wd2793_t>("wd2793");
+ wd2793_device *fdc = machine().device<wd2793_device>("wd2793");
if ( offset < 4 )
return fdc->read(space, offset );
@@ -291,7 +291,7 @@ READ8_MEMBER( thomson_state::to7_5p14_r )
WRITE8_MEMBER( thomson_state::to7_5p14_w )
{
- wd2793_t *fdc = machine().device<wd2793_t>("wd2793");
+ wd2793_device *fdc = machine().device<wd2793_device>("wd2793");
if ( offset < 4 )
fdc->write(space, offset, data );
else if ( offset == 8 )
@@ -320,7 +320,7 @@ WRITE8_MEMBER( thomson_state::to7_5p14_w )
void thomson_state::to7_5p14_reset()
{
- wd2793_t *fdc = machine().device<wd2793_t>("wd2793");
+ wd2793_device *fdc = machine().device<wd2793_device>("wd2793");
LOG(( "to7_5p14_reset: CD 90-640 controller\n" ));
fdc->reset();
}
diff --git a/src/mame/machine/thomson.cpp b/src/mame/machine/thomson.cpp
index 36774c557a8..649a0b96789 100644
--- a/src/mame/machine/thomson.cpp
+++ b/src/mame/machine/thomson.cpp
@@ -9,9 +9,9 @@
**********************************************************************/
#include "emu.h"
+#include "includes/thomson.h"
#include "machine/thomflop.h"
#include "formats/thom_dsk.h"
-#include "includes/thomson.h"
#include "machine/6821pia.h"
#include "machine/ram.h"
@@ -593,14 +593,14 @@ READ8_MEMBER( thomson_state::to7_sys_portb_in )
because the Data Transmit Ready bit is shared in an incompatible way!
*/
-const device_type TO7_IO_LINE = device_creator<to7_io_line_device>;
+DEFINE_DEVICE_TYPE(TO7_IO_LINE, to7_io_line_device, "to7_io_line", "TO7 Serial source")
//-------------------------------------------------
// to7_io_line_device - constructor
//-------------------------------------------------
to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TO7_IO_LINE, "T07 Serial source", tag, owner, clock, "to7_io_line", __FILE__),
+ : device_t(mconfig, TO7_IO_LINE, tag, owner, clock),
m_pia_io(*this, THOM_PIA_IO),
m_rs232(*this, "rs232"),
m_last_low(0)
diff --git a/src/mame/machine/ticket.cpp b/src/mame/machine/ticket.cpp
index 68cb586d32e..92265c814ae 100644
--- a/src/mame/machine/ticket.cpp
+++ b/src/mame/machine/ticket.cpp
@@ -26,7 +26,7 @@
//**************************************************************************
// device type definition
-const device_type TICKET_DISPENSER = device_creator<ticket_dispenser_device>;
+DEFINE_DEVICE_TYPE(TICKET_DISPENSER, ticket_dispenser_device, "ticket_dispenser", "Ticket Dispenser")
@@ -39,7 +39,7 @@ const device_type TICKET_DISPENSER = device_creator<ticket_dispenser_device>;
//-------------------------------------------------
ticket_dispenser_device::ticket_dispenser_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TICKET_DISPENSER, "Ticket Dispenser", tag, owner, clock, "ticket_dispenser", __FILE__),
+ : device_t(mconfig, TICKET_DISPENSER, tag, owner, clock),
m_motor_sense(TICKET_MOTOR_ACTIVE_LOW),
m_status_sense(TICKET_STATUS_ACTIVE_LOW),
m_period(attotime::from_msec(100)),
diff --git a/src/mame/machine/ticket.h b/src/mame/machine/ticket.h
index 18ed3901bdd..cb48cba8587 100644
--- a/src/mame/machine/ticket.h
+++ b/src/mame/machine/ticket.h
@@ -7,6 +7,8 @@
Generic ticket dispensing device.
***************************************************************************/
+#ifndef MAME_MACHINE_TICKET_H
+#define MAME_MACHINE_TICKET_H
#pragma once
@@ -16,7 +18,7 @@
//**************************************************************************
// device type definition
-extern const device_type TICKET_DISPENSER;
+DECLARE_DEVICE_TYPE(TICKET_DISPENSER, ticket_dispenser_device)
@@ -87,3 +89,5 @@ protected:
uint8_t m_power;
emu_timer *m_timer;
};
+
+#endif // MAME_MACHINE_TICKET_H
diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp
index 5cb3001ec68..6b12bb3ab26 100644
--- a/src/mame/machine/trs80.cpp
+++ b/src/mame/machine/trs80.cpp
@@ -567,10 +567,10 @@ WRITE8_MEMBER( trs80_state::lnw80_fe_w )
mem.install_readwrite_handler (0x37e0, 0x37e3, read8_delegate(FUNC(trs80_state::trs80_irq_status_r), this), write8_delegate(FUNC(trs80_state::trs80_motor_w), this));
mem.install_readwrite_handler (0x37e8, 0x37eb, read8_delegate(FUNC(trs80_state::trs80_printer_r), this), write8_delegate(FUNC(trs80_state::trs80_printer_w), this));
mem.install_read_handler (0x37ec, 0x37ec, read8_delegate(FUNC(trs80_state::trs80_wd179x_r), this));
- mem.install_write_handler (0x37ec, 0x37ec, write8_delegate(FUNC(fd1793_t::cmd_w),(fd1793_t*)m_fdc));
- mem.install_readwrite_handler (0x37ed, 0x37ed, read8_delegate(FUNC(fd1793_t::track_r),(fd1793_t*)m_fdc), write8_delegate(FUNC(fd1793_t::track_w),(fd1793_t*)m_fdc));
- mem.install_readwrite_handler (0x37ee, 0x37ee, read8_delegate(FUNC(fd1793_t::sector_r),(fd1793_t*)m_fdc), write8_delegate(FUNC(fd1793_t::sector_w),(fd1793_t*)m_fdc));
- mem.install_readwrite_handler (0x37ef, 0x37ef, read8_delegate(FUNC(fd1793_t::data_r),(fd1793_t*)m_fdc),write8_delegate( FUNC(fd1793_t::data_w),(fd1793_t*)m_fdc));
+ mem.install_write_handler (0x37ec, 0x37ec, write8_delegate(FUNC(fd1793_device::cmd_w),(fd1793_device*)m_fdc));
+ mem.install_readwrite_handler (0x37ed, 0x37ed, read8_delegate(FUNC(fd1793_device::track_r),(fd1793_device*)m_fdc), write8_delegate(FUNC(fd1793_device::track_w),(fd1793_device*)m_fdc));
+ mem.install_readwrite_handler (0x37ee, 0x37ee, read8_delegate(FUNC(fd1793_device::sector_r),(fd1793_device*)m_fdc), write8_delegate(FUNC(fd1793_device::sector_w),(fd1793_device*)m_fdc));
+ mem.install_readwrite_handler (0x37ef, 0x37ef, read8_delegate(FUNC(fd1793_device::data_r),(fd1793_device*)m_fdc),write8_delegate( FUNC(fd1793_device::data_w),(fd1793_device*)m_fdc));
mem.install_read_handler (0x3800, 0x38ff, 0, 0x0300, 0, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this));
mem.install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this));
}
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 9d6411d3313..40dabc57d11 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -23,7 +23,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type TRS80M2_KEYBOARD = device_creator<trs80m2_keyboard_device>;
+DEFINE_DEVICE_TYPE(TRS80M2_KEYBOARD, trs80m2_keyboard_device, "trs80m2kb", "TRS-80 Model II Keyboard")
@@ -219,7 +219,7 @@ ioport_constructor trs80m2_keyboard_device::device_input_ports() const
//-------------------------------------------------
trs80m2_keyboard_device::trs80m2_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, TRS80M2_KEYBOARD, "TRS-80 Model II Keyboard", tag, owner, clock, "trs80m2kb", __FILE__),
+ device_t(mconfig, TRS80M2_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8021_TAG),
m_y(*this, "Y%u", 0),
m_write_clock(*this),
diff --git a/src/mame/machine/trs80m2kb.h b/src/mame/machine/trs80m2kb.h
index 9ce7ba94b28..4c779a35486 100644
--- a/src/mame/machine/trs80m2kb.h
+++ b/src/mame/machine/trs80m2kb.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_TRS80M2KB_H
+#define MAME_MACHINE_TRS80M2KB_H
-#ifndef __TRS80M2_KEYBOARD__
-#define __TRS80M2_KEYBOARD__
+#pragma once
#include "cpu/mcs48/mcs48.h"
#include "sound/discrete.h"
@@ -45,7 +45,7 @@ public:
// construction/destruction
trs80m2_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_clock_wr_callback(device_t &device, _Object object) { return downcast<trs80m2_keyboard_device &>(device).m_write_clock.set_callback(object); }
+ template <class Object> static devcb_base &set_clock_wr_callback(device_t &device, Object &&cb) { return downcast<trs80m2_keyboard_device &>(device).m_write_clock.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -87,8 +87,8 @@ private:
// device type definition
-extern const device_type TRS80M2_KEYBOARD;
+DECLARE_DEVICE_TYPE(TRS80M2_KEYBOARD, trs80m2_keyboard_device)
-#endif
+#endif // MAME_MACHINE_TRS80M2KB_H
diff --git a/src/mame/machine/upd65031.cpp b/src/mame/machine/upd65031.cpp
index 8c57602dbd6..74584e6cbba 100644
--- a/src/mame/machine/upd65031.cpp
+++ b/src/mame/machine/upd65031.cpp
@@ -27,7 +27,7 @@
// device type definition
-const device_type UPD65031 = device_creator<upd65031_device>;
+DEFINE_DEVICE_TYPE(UPD65031, upd65031_device, "upd65031", "NEC uPD65031")
//**************************************************************************
@@ -197,7 +197,7 @@ inline void upd65031_device::set_mode(int mode)
//-------------------------------------------------
upd65031_device::upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, UPD65031, "NEC uPD65031", tag, owner, clock, "upd65031", __FILE__),
+ : device_t(mconfig, UPD65031, tag, owner, clock),
m_read_kb(*this),
m_write_int(*this),
m_write_nmi(*this),
diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h
index aad871e80c6..4c5127727fa 100644
--- a/src/mame/machine/upd65031.h
+++ b/src/mame/machine/upd65031.h
@@ -6,11 +6,10 @@
**********************************************************************/
-#pragma once
-
-#ifndef __UPD65031__
-#define __UPD65031__
+#ifndef MAME_MACHINE_UPD65031_H
+#define MAME_MACHINE_UPD65031_H
+#pragma once
@@ -114,7 +113,7 @@ private:
// device type definition
-extern const device_type UPD65031;
+DECLARE_DEVICE_TYPE(UPD65031, upd65031_device)
-#endif
+#endif // MAME_MACHINE_UPD65031_H
diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp
index fdb6aa8fa0a..dab6e0bf902 100644
--- a/src/mame/machine/v1050kb.cpp
+++ b/src/mame/machine/v1050kb.cpp
@@ -26,7 +26,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type V1050_KEYBOARD = device_creator<v1050_keyboard_device>;
+DEFINE_DEVICE_TYPE(V1050_KEYBOARD, v1050_keyboard_device, "v1050kb", "Visual 1050 Keyboard")
//-------------------------------------------------
@@ -297,7 +297,7 @@ ioport_constructor v1050_keyboard_device::device_input_ports() const
//-------------------------------------------------
v1050_keyboard_device::v1050_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, V1050_KEYBOARD, "Visual 1050 Keyboard", tag, owner, clock, "v1050kb", __FILE__),
+ device_t(mconfig, V1050_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8049_TAG),
m_discrete(*this, DISCRETE_TAG),
m_y(*this, "Y%u", 0),
diff --git a/src/mame/machine/v1050kb.h b/src/mame/machine/v1050kb.h
index 052748b394b..af66b205a1b 100644
--- a/src/mame/machine/v1050kb.h
+++ b/src/mame/machine/v1050kb.h
@@ -6,10 +6,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_V1050KB_H
+#define MAME_MACHINE_V1050KB_H
-#ifndef __V1050_KEYBOARD__
-#define __V1050_KEYBOARD__
+#pragma once
#include "cpu/mcs48/mcs48.h"
#include "sound/discrete.h"
@@ -37,7 +37,7 @@ public:
// construction/destruction
v1050_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_tx_handler(device_t &device, _Object object) { return downcast<v1050_keyboard_device &>(device).m_out_tx_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_out_tx_handler(device_t &device, Object &&cb) { return downcast<v1050_keyboard_device &>(device).m_out_tx_handler.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -67,8 +67,6 @@ private:
// device type definition
-extern const device_type V1050_KEYBOARD;
-
-
+DECLARE_DEVICE_TYPE(V1050_KEYBOARD, v1050_keyboard_device)
-#endif
+#endif // MAME_MACHINE_V1050KB_H
diff --git a/src/mame/machine/vector06.cpp b/src/mame/machine/vector06.cpp
index db91755457f..3b0d3b6be42 100644
--- a/src/mame/machine/vector06.cpp
+++ b/src/mame/machine/vector06.cpp
@@ -187,7 +187,7 @@ void vector06_state::update_mem()
WRITE8_MEMBER(vector06_state::vector06_ramdisk_w)
{
- uint8_t oldbank = m_rambank;
+ const uint8_t oldbank = m_rambank;
m_rambank = data;
if (oldbank != m_rambank)
update_mem();
@@ -195,8 +195,8 @@ WRITE8_MEMBER(vector06_state::vector06_ramdisk_w)
WRITE8_MEMBER(vector06_state::vector06_status_callback)
{
- bool oldstate = m_stack_state;
- m_stack_state = (data & I8085_STATUS_STACK) ? true : false;
+ const bool oldstate = m_stack_state;
+ m_stack_state = bool(data & i8080_cpu_device::STATUS_STACK);
if (oldstate != m_stack_state && (m_rambank & 0x10))
update_mem();
}
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index 855f32fb507..53f78ad57f7 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -78,7 +78,7 @@
#define MOTOR_POLES 8.0
// TODO wrong values here! motor speed is controlled by an LM2917, with help from the spindle TACH and a DAC0808 whose value is set by the SCP 8048
-const int victor_9000_fdc_t::rpm[] = { 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 254, 255, 257, 259, 260, 262, 264, 266, 267, 269, 271, 273, 275, 276, 278, 280, 282, 284, 286, 288, 290, 291, 293, 295, 297, 299, 301, 303, 305, 307, 309, 311, 313, 315, 318, 320, 322, 324, 326, 328, 330, 333, 335, 337, 339, 342, 344, 346, 348, 351, 353, 355, 358, 360, 362, 365, 367, 370, 372, 375, 377, 380, 382, 385, 387, 390, 392, 395, 398, 400, 403, 406, 408, 411, 414, 416, 419, 422, 425, 428, 430, 433, 436, 439, 442, 445, 448, 451, 454, 457, 460, 463, 466, 469, 472, 475, 478, 482, 485, 488, 491, 494, 498, 501, 504, 508, 511, 514, 518, 521, 525, 528, 532, 535, 539, 542, 546, 550, 553, 557, 561, 564, 568, 572, 576, 579, 583, 587, 591, 595, 599, 603, 607, 611, 615, 619, 623, 627, 631, 636, 640, 644, 648, 653, 657, 661, 666, 670, 674, 679, 683, 688, 693, 697, 702, 706, 711, 716, 721, 725, 730, 735, 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, 790, 796, 801, 806, 812, 817, 822, 828, 833, 839, 844, 850, 856, 861, 867, 873, 878, 884 };
+const int victor_9000_fdc_device::rpm[] = { 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 254, 255, 257, 259, 260, 262, 264, 266, 267, 269, 271, 273, 275, 276, 278, 280, 282, 284, 286, 288, 290, 291, 293, 295, 297, 299, 301, 303, 305, 307, 309, 311, 313, 315, 318, 320, 322, 324, 326, 328, 330, 333, 335, 337, 339, 342, 344, 346, 348, 351, 353, 355, 358, 360, 362, 365, 367, 370, 372, 375, 377, 380, 382, 385, 387, 390, 392, 395, 398, 400, 403, 406, 408, 411, 414, 416, 419, 422, 425, 428, 430, 433, 436, 439, 442, 445, 448, 451, 454, 457, 460, 463, 466, 469, 472, 475, 478, 482, 485, 488, 491, 494, 498, 501, 504, 508, 511, 514, 518, 521, 525, 528, 532, 535, 539, 542, 546, 550, 553, 557, 561, 564, 568, 572, 576, 579, 583, 587, 591, 595, 599, 603, 607, 611, 615, 619, 623, 627, 631, 636, 640, 644, 648, 653, 657, 661, 666, 670, 674, 679, 683, 688, 693, 697, 702, 706, 711, 716, 721, 725, 730, 735, 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, 790, 796, 801, 806, 812, 817, 822, 828, 833, 839, 844, 850, 856, 861, 867, 873, 878, 884 };
@@ -86,7 +86,7 @@ const int victor_9000_fdc_t::rpm[] = { 252, 252, 252, 252, 252, 252, 252, 252, 2
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VICTOR_9000_FDC = device_creator<victor_9000_fdc_t>;
+DEFINE_DEVICE_TYPE(VICTOR_9000_FDC, victor_9000_fdc_device, "victor9k_fdc", "Victor 9000 FDC")
//-------------------------------------------------
@@ -106,7 +106,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
-const tiny_rom_entry *victor_9000_fdc_t::device_rom_region() const
+const tiny_rom_entry *victor_9000_fdc_device::device_rom_region() const
{
return ROM_NAME( victor_9000_fdc );
}
@@ -116,7 +116,7 @@ const tiny_rom_entry *victor_9000_fdc_t::device_rom_region() const
// SLOT_INTERFACE( victor9k_floppies )
//-------------------------------------------------
-image_init_result victor_9000_fdc_t::load0_cb(floppy_image_device *device)
+image_init_result victor_9000_fdc_device::load0_cb(floppy_image_device *device)
{
// DOOR OPEN 0
m_via4->write_ca1(0);
@@ -124,13 +124,13 @@ image_init_result victor_9000_fdc_t::load0_cb(floppy_image_device *device)
return image_init_result::PASS;
}
-void victor_9000_fdc_t::unload0_cb(floppy_image_device *device)
+void victor_9000_fdc_device::unload0_cb(floppy_image_device *device)
{
// DOOR OPEN 0
m_via4->write_ca1(1);
}
-image_init_result victor_9000_fdc_t::load1_cb(floppy_image_device *device)
+image_init_result victor_9000_fdc_device::load1_cb(floppy_image_device *device)
{
// DOOR OPEN 1
m_via4->write_cb1(0);
@@ -138,7 +138,7 @@ image_init_result victor_9000_fdc_t::load1_cb(floppy_image_device *device)
return image_init_result::PASS;
}
-void victor_9000_fdc_t::unload1_cb(floppy_image_device *device)
+void victor_9000_fdc_device::unload1_cb(floppy_image_device *device)
{
// DOOR OPEN 1
m_via4->write_cb1(1);
@@ -149,7 +149,7 @@ static SLOT_INTERFACE_START( victor9k_floppies )
SLOT_INTERFACE( "525qd", FLOPPY_525_QD ) // Tandon TM100-4 with custom electronics
SLOT_INTERFACE_END
-FLOPPY_FORMATS_MEMBER( victor_9000_fdc_t::floppy_formats )
+FLOPPY_FORMATS_MEMBER( victor_9000_fdc_device::floppy_formats )
FLOPPY_VICTOR_9000_FORMAT
FLOPPY_FORMATS_END
@@ -160,38 +160,38 @@ FLOPPY_FORMATS_END
static MACHINE_CONFIG_FRAGMENT( victor_9000_fdc )
MCFG_CPU_ADD(I8048_TAG, I8048, XTAL_30MHz/6)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_t, floppy_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_t, floppy_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(victor_9000_fdc_t, floppy_p2_r))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(victor_9000_fdc_t, floppy_p2_w))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(victor_9000_fdc_t, tach0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_fdc_t, tach1_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(victor_9000_fdc_t, da_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_fdc_device, floppy_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(victor_9000_fdc_device, floppy_p2_r))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(victor_9000_fdc_device, floppy_p2_w))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(victor_9000_fdc_device, tach0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_fdc_device, tach1_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(victor_9000_fdc_device, da_w))
MCFG_DEVICE_ADD(M6522_4_TAG, VIA6522, XTAL_30MHz/30)
- MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_t, via4_pa_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_t, via4_pa_w))
- MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_t, via4_pb_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_t, via4_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_t, wrsync_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_t, via4_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via4_pa_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_device, via4_pa_w))
+ MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_device, via4_pb_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via4_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_device, wrsync_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via4_irq_w))
MCFG_DEVICE_ADD(M6522_5_TAG, VIA6522, XTAL_30MHz/30)
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_t, via5_irq_w))
- MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_t, via5_pa_r))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_t, via5_pb_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via5_irq_w))
+ MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via5_pa_r))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via5_pb_w))
MCFG_DEVICE_ADD(M6522_6_TAG, VIA6522, XTAL_30MHz/30)
- MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_t, via6_pa_r))
- MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_t, via6_pb_r))
- MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_t, via6_pa_w))
- MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_t, via6_pb_w))
- MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_t, drw_w))
- MCFG_VIA6522_CB2_HANDLER(WRITELINE(victor_9000_fdc_t, erase_w))
- MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_t, via6_irq_w))
-
- MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":0", victor9k_floppies, "525qd", victor_9000_fdc_t::floppy_formats)
- MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":1", victor9k_floppies, "525qd", victor_9000_fdc_t::floppy_formats)
+ MCFG_VIA6522_READPA_HANDLER(READ8(victor_9000_fdc_device, via6_pa_r))
+ MCFG_VIA6522_READPB_HANDLER(READ8(victor_9000_fdc_device, via6_pb_r))
+ MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(victor_9000_fdc_device, via6_pa_w))
+ MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(victor_9000_fdc_device, via6_pb_w))
+ MCFG_VIA6522_CA2_HANDLER(WRITELINE(victor_9000_fdc_device, drw_w))
+ MCFG_VIA6522_CB2_HANDLER(WRITELINE(victor_9000_fdc_device, erase_w))
+ MCFG_VIA6522_IRQ_HANDLER(WRITELINE(victor_9000_fdc_device, via6_irq_w))
+
+ MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":0", victor9k_floppies, "525qd", victor_9000_fdc_device::floppy_formats)
+ MCFG_FLOPPY_DRIVE_ADD(I8048_TAG":1", victor9k_floppies, "525qd", victor_9000_fdc_device::floppy_formats)
MACHINE_CONFIG_END
@@ -200,7 +200,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
-machine_config_constructor victor_9000_fdc_t::device_mconfig_additions() const
+machine_config_constructor victor_9000_fdc_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( victor_9000_fdc );
}
@@ -212,11 +212,11 @@ machine_config_constructor victor_9000_fdc_t::device_mconfig_additions() const
//**************************************************************************
//-------------------------------------------------
-// victor_9000_fdc_t - constructor
+// victor_9000_fdc_device - constructor
//-------------------------------------------------
-victor_9000_fdc_t::victor_9000_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, VICTOR_9000_FDC, "Victor 9000 FDC", tag, owner, clock, "victor9k_fdc", __FILE__),
+victor_9000_fdc_device::victor_9000_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, VICTOR_9000_FDC, tag, owner, clock),
m_irq_cb(*this),
m_syn_cb(*this),
m_lbrdy_cb(*this),
@@ -269,7 +269,7 @@ victor_9000_fdc_t::victor_9000_fdc_t(const machine_config &mconfig, const char *
// device_start - device-specific startup
//-------------------------------------------------
-void victor_9000_fdc_t::device_start()
+void victor_9000_fdc_device::device_start()
{
// resolve callbacks
m_irq_cb.resolve_safe();
@@ -321,7 +321,7 @@ void victor_9000_fdc_t::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void victor_9000_fdc_t::device_reset()
+void victor_9000_fdc_device::device_reset()
{
live_abort();
@@ -333,14 +333,14 @@ void victor_9000_fdc_t::device_reset()
// set floppy callbacks
if (m_floppy0->get_device())
{
- m_floppy0->get_device()->setup_load_cb(floppy_image_device::load_cb(&victor_9000_fdc_t::load0_cb, this));
- m_floppy0->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&victor_9000_fdc_t::unload0_cb, this));
+ m_floppy0->get_device()->setup_load_cb(floppy_image_device::load_cb(&victor_9000_fdc_device::load0_cb, this));
+ m_floppy0->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&victor_9000_fdc_device::unload0_cb, this));
}
if (m_floppy1->get_device())
{
- m_floppy1->get_device()->setup_load_cb(floppy_image_device::load_cb(&victor_9000_fdc_t::load1_cb, this));
- m_floppy1->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&victor_9000_fdc_t::unload1_cb, this));
+ m_floppy1->get_device()->setup_load_cb(floppy_image_device::load_cb(&victor_9000_fdc_device::load1_cb, this));
+ m_floppy1->get_device()->setup_unload_cb(floppy_image_device::unload_cb(&victor_9000_fdc_device::unload1_cb, this));
}
}
@@ -349,7 +349,7 @@ void victor_9000_fdc_t::device_reset()
// device_timer - handler timer events
//-------------------------------------------------
-void victor_9000_fdc_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void victor_9000_fdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
switch (id)
{
@@ -375,7 +375,7 @@ void victor_9000_fdc_t::device_timer(emu_timer &timer, device_timer_id id, int p
// floppy_p1_r -
//-------------------------------------------------
-READ8_MEMBER( victor_9000_fdc_t::floppy_p1_r )
+READ8_MEMBER( victor_9000_fdc_device::floppy_p1_r )
{
/*
@@ -400,7 +400,7 @@ READ8_MEMBER( victor_9000_fdc_t::floppy_p1_r )
// floppy_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( victor_9000_fdc_t::floppy_p1_w )
+WRITE8_MEMBER( victor_9000_fdc_device::floppy_p1_w )
{
/*
@@ -426,7 +426,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::floppy_p1_w )
// floppy_p2_r -
//-------------------------------------------------
-READ8_MEMBER( victor_9000_fdc_t::floppy_p2_r )
+READ8_MEMBER( victor_9000_fdc_device::floppy_p2_r )
{
/*
@@ -456,7 +456,7 @@ READ8_MEMBER( victor_9000_fdc_t::floppy_p2_r )
// floppy_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( victor_9000_fdc_t::floppy_p2_w )
+WRITE8_MEMBER( victor_9000_fdc_device::floppy_p2_w )
{
/*
@@ -536,7 +536,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::floppy_p2_w )
// tach0_r -
//-------------------------------------------------
-READ_LINE_MEMBER( victor_9000_fdc_t::tach0_r )
+READ_LINE_MEMBER( victor_9000_fdc_device::tach0_r )
{
if (LOG_SCP) logerror("%s %s Read TACH0 %u\n", machine().time().as_string(), machine().describe_context(), m_tach0);
return m_tach0;
@@ -547,14 +547,14 @@ READ_LINE_MEMBER( victor_9000_fdc_t::tach0_r )
// tach1_r -
//-------------------------------------------------
-READ_LINE_MEMBER( victor_9000_fdc_t::tach1_r )
+READ_LINE_MEMBER( victor_9000_fdc_device::tach1_r )
{
if (LOG_SCP) logerror("%s %s Read TACH1 %u\n", machine().time().as_string(), machine().describe_context(), m_tach1);
return m_tach1;
}
-void victor_9000_fdc_t::update_stepper_motor(floppy_image_device *floppy, int stp, int old_st, int st)
+void victor_9000_fdc_device::update_stepper_motor(floppy_image_device *floppy, int stp, int old_st, int st)
{
if (stp) return;
@@ -584,7 +584,7 @@ void victor_9000_fdc_t::update_stepper_motor(floppy_image_device *floppy, int st
floppy->set_rpm(victor9k_format::get_rpm(m_side, floppy->get_cyl()));
}
-void victor_9000_fdc_t::update_spindle_motor(floppy_image_device *floppy, emu_timer *t_tach, bool start, bool stop, bool sel, uint8_t &da)
+void victor_9000_fdc_device::update_spindle_motor(floppy_image_device *floppy, emu_timer *t_tach, bool start, bool stop, bool sel, uint8_t &da)
{
#ifdef USE_SCP
if (start && !stop && floppy->mon_r()) {
@@ -599,7 +599,7 @@ void victor_9000_fdc_t::update_spindle_motor(floppy_image_device *floppy, emu_ti
#endif
}
-void victor_9000_fdc_t::update_rpm(floppy_image_device *floppy, emu_timer *t_tach, bool sel, uint8_t &da)
+void victor_9000_fdc_device::update_rpm(floppy_image_device *floppy, emu_timer *t_tach, bool sel, uint8_t &da)
{
#ifdef USE_SCP
if (sel) {
@@ -618,7 +618,7 @@ void victor_9000_fdc_t::update_rpm(floppy_image_device *floppy, emu_timer *t_tac
#endif
}
-void victor_9000_fdc_t::update_rdy()
+void victor_9000_fdc_device::update_rdy()
{
m_via5->write_ca2((m_via_rdy0 && m_via_rdy1) ? m_rdy0 : m_scp_rdy0);
m_via5->write_cb2((m_via_rdy0 && m_via_rdy1) ? m_rdy1 : m_scp_rdy1);
@@ -629,7 +629,7 @@ void victor_9000_fdc_t::update_rdy()
// da_w -
//-------------------------------------------------
-WRITE8_MEMBER( victor_9000_fdc_t::da_w )
+WRITE8_MEMBER( victor_9000_fdc_device::da_w )
{
if (LOG_SCP) logerror("%s %s DA %02x SEL0 %u SEL1 %u\n", machine().time().as_string(), machine().describe_context(), data, m_sel0, m_sel1);
@@ -641,7 +641,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::da_w )
live_run();
}
-READ8_MEMBER( victor_9000_fdc_t::via4_pa_r )
+READ8_MEMBER( victor_9000_fdc_device::via4_pa_r )
{
/*
@@ -661,7 +661,7 @@ READ8_MEMBER( victor_9000_fdc_t::via4_pa_r )
return m_scp_l0ms;
}
-WRITE8_MEMBER( victor_9000_fdc_t::via4_pa_w )
+WRITE8_MEMBER( victor_9000_fdc_device::via4_pa_w )
{
/*
@@ -706,7 +706,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::via4_pa_w )
}
}
-READ8_MEMBER( victor_9000_fdc_t::via4_pb_r )
+READ8_MEMBER( victor_9000_fdc_device::via4_pb_r )
{
/*
@@ -726,7 +726,7 @@ READ8_MEMBER( victor_9000_fdc_t::via4_pb_r )
return m_scp_l1ms;
}
-WRITE8_MEMBER( victor_9000_fdc_t::via4_pb_w )
+WRITE8_MEMBER( victor_9000_fdc_device::via4_pb_w )
{
/*
@@ -771,7 +771,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::via4_pb_w )
}
}
-WRITE_LINE_MEMBER( victor_9000_fdc_t::wrsync_w )
+WRITE_LINE_MEMBER( victor_9000_fdc_device::wrsync_w )
{
if (m_wrsync != state)
{
@@ -784,14 +784,14 @@ WRITE_LINE_MEMBER( victor_9000_fdc_t::wrsync_w )
}
}
-WRITE_LINE_MEMBER( victor_9000_fdc_t::via4_irq_w )
+WRITE_LINE_MEMBER( victor_9000_fdc_device::via4_irq_w )
{
m_via4_irq = state;
m_irq_cb(m_via4_irq || m_via5_irq || m_via6_irq);
}
-READ8_MEMBER( victor_9000_fdc_t::via5_pa_r )
+READ8_MEMBER( victor_9000_fdc_device::via5_pa_r )
{
/*
@@ -811,7 +811,7 @@ READ8_MEMBER( victor_9000_fdc_t::via5_pa_r )
return GCR_DECODE(checkpoint_live.e, checkpoint_live.i);
}
-WRITE8_MEMBER( victor_9000_fdc_t::via5_pb_w )
+WRITE8_MEMBER( victor_9000_fdc_device::via5_pb_w )
{
/*
@@ -841,7 +841,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::via5_pb_w )
}
}
-WRITE_LINE_MEMBER( victor_9000_fdc_t::via5_irq_w )
+WRITE_LINE_MEMBER( victor_9000_fdc_device::via5_irq_w )
{
m_via5_irq = state;
@@ -849,7 +849,7 @@ WRITE_LINE_MEMBER( victor_9000_fdc_t::via5_irq_w )
}
-READ8_MEMBER( victor_9000_fdc_t::via6_pa_r )
+READ8_MEMBER( victor_9000_fdc_device::via6_pa_r )
{
/*
@@ -885,7 +885,7 @@ READ8_MEMBER( victor_9000_fdc_t::via6_pa_r )
return data;
}
-WRITE8_MEMBER( victor_9000_fdc_t::via6_pa_w )
+WRITE8_MEMBER( victor_9000_fdc_device::via6_pa_w )
{
/*
@@ -937,7 +937,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::via6_pa_w )
}
}
-READ8_MEMBER( victor_9000_fdc_t::via6_pb_r )
+READ8_MEMBER( victor_9000_fdc_device::via6_pb_r )
{
/*
@@ -974,7 +974,7 @@ READ8_MEMBER( victor_9000_fdc_t::via6_pb_r )
return data;
}
-WRITE8_MEMBER( victor_9000_fdc_t::via6_pb_w )
+WRITE8_MEMBER( victor_9000_fdc_device::via6_pb_w )
{
/*
@@ -1027,7 +1027,7 @@ WRITE8_MEMBER( victor_9000_fdc_t::via6_pb_w )
}
}
-WRITE_LINE_MEMBER( victor_9000_fdc_t::drw_w )
+WRITE_LINE_MEMBER( victor_9000_fdc_device::drw_w )
{
if (m_drw != state)
{
@@ -1044,7 +1044,7 @@ WRITE_LINE_MEMBER( victor_9000_fdc_t::drw_w )
}
}
-WRITE_LINE_MEMBER( victor_9000_fdc_t::erase_w )
+WRITE_LINE_MEMBER( victor_9000_fdc_device::erase_w )
{
if (m_erase != state)
{
@@ -1056,14 +1056,14 @@ WRITE_LINE_MEMBER( victor_9000_fdc_t::erase_w )
}
}
-WRITE_LINE_MEMBER( victor_9000_fdc_t::via6_irq_w )
+WRITE_LINE_MEMBER( victor_9000_fdc_device::via6_irq_w )
{
m_via6_irq = state;
m_irq_cb(m_via4_irq || m_via5_irq || m_via6_irq);
}
-READ8_MEMBER( victor_9000_fdc_t::cs7_r )
+READ8_MEMBER( victor_9000_fdc_device::cs7_r )
{
m_lbrdy_cb(1);
@@ -1072,7 +1072,7 @@ READ8_MEMBER( victor_9000_fdc_t::cs7_r )
return m_via5->read(space, offset);
}
-WRITE8_MEMBER( victor_9000_fdc_t::cs7_w )
+WRITE8_MEMBER( victor_9000_fdc_device::cs7_w )
{
m_lbrdy_cb(1);
@@ -1081,12 +1081,12 @@ WRITE8_MEMBER( victor_9000_fdc_t::cs7_w )
m_via5->write(space, offset, data);
}
-floppy_image_device* victor_9000_fdc_t::get_floppy()
+floppy_image_device* victor_9000_fdc_device::get_floppy()
{
return m_drive ? m_floppy1->get_device() : m_floppy0->get_device();
}
-void victor_9000_fdc_t::live_start()
+void victor_9000_fdc_device::live_start()
{
cur_live.tm = machine().time();
cur_live.state = RUNNING;
@@ -1112,63 +1112,63 @@ void victor_9000_fdc_t::live_start()
live_run();
}
-void victor_9000_fdc_t::pll_reset(const attotime &when)
+void victor_9000_fdc_device::pll_reset(const attotime &when)
{
cur_pll.reset(when);
cur_pll.set_clock(attotime::from_nsec(2130));
}
-void victor_9000_fdc_t::pll_start_writing(const attotime &tm)
+void victor_9000_fdc_device::pll_start_writing(const attotime &tm)
{
cur_pll.start_writing(tm);
pll_reset(cur_live.tm);
}
-void victor_9000_fdc_t::pll_commit(floppy_image_device *floppy, const attotime &tm)
+void victor_9000_fdc_device::pll_commit(floppy_image_device *floppy, const attotime &tm)
{
cur_pll.commit(floppy, tm);
}
-void victor_9000_fdc_t::pll_stop_writing(floppy_image_device *floppy, const attotime &tm)
+void victor_9000_fdc_device::pll_stop_writing(floppy_image_device *floppy, const attotime &tm)
{
cur_pll.stop_writing(floppy, tm);
pll_reset(cur_live.tm);
}
-void victor_9000_fdc_t::pll_save_checkpoint()
+void victor_9000_fdc_device::pll_save_checkpoint()
{
checkpoint_pll = cur_pll;
}
-void victor_9000_fdc_t::pll_retrieve_checkpoint()
+void victor_9000_fdc_device::pll_retrieve_checkpoint()
{
cur_pll = checkpoint_pll;
}
-int victor_9000_fdc_t::pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit)
+int victor_9000_fdc_device::pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit)
{
return cur_pll.get_next_bit(tm, floppy, limit);
}
-bool victor_9000_fdc_t::pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit)
+bool victor_9000_fdc_device::pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit)
{
return cur_pll.write_next_bit(bit, tm, floppy, limit);
}
-void victor_9000_fdc_t::checkpoint()
+void victor_9000_fdc_device::checkpoint()
{
pll_commit(get_floppy(), cur_live.tm);
checkpoint_live = cur_live;
pll_save_checkpoint();
}
-void victor_9000_fdc_t::rollback()
+void victor_9000_fdc_device::rollback()
{
cur_live = checkpoint_live;
pll_retrieve_checkpoint();
}
-void victor_9000_fdc_t::live_delay(int state)
+void victor_9000_fdc_device::live_delay(int state)
{
cur_live.next_state = state;
if(cur_live.tm != machine().time())
@@ -1177,7 +1177,7 @@ void victor_9000_fdc_t::live_delay(int state)
live_sync();
}
-void victor_9000_fdc_t::live_sync()
+void victor_9000_fdc_device::live_sync()
{
if(!cur_live.tm.is_never()) {
if(cur_live.tm > machine().time()) {
@@ -1200,7 +1200,7 @@ void victor_9000_fdc_t::live_sync()
}
}
-void victor_9000_fdc_t::live_abort()
+void victor_9000_fdc_device::live_abort()
{
if(!cur_live.tm.is_never() && cur_live.tm > machine().time()) {
rollback();
@@ -1221,7 +1221,7 @@ void victor_9000_fdc_t::live_abort()
cur_live.gcr_err = 1;
}
-void victor_9000_fdc_t::live_run(const attotime &limit)
+void victor_9000_fdc_device::live_run(const attotime &limit)
{
if(cur_live.state == IDLE || cur_live.next_state != -1)
return;
diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h
index 447604368eb..15e92f7defc 100644
--- a/src/mame/machine/victor9k_fdc.h
+++ b/src/mame/machine/victor9k_fdc.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_VICTOR9K_FDC_H
+#define MAME_MACHINE_VICTOR9K_FDC_H
-#ifndef __VICTOR_9000_FDC__
-#define __VICTOR_9000_FDC__
+#pragma once
#include "cpu/mcs48/mcs48.h"
#include "formats/victor9k_dsk.h"
@@ -24,13 +24,13 @@
//**************************************************************************
#define MCFG_VICTOR_9000_FDC_IRQ_CB(_write) \
- devcb = &victor_9000_fdc_t::set_irq_wr_callback(*device, DEVCB_##_write);
+ devcb = &victor_9000_fdc_device::set_irq_wr_callback(*device, DEVCB_##_write);
#define MCFG_VICTOR_9000_FDC_SYN_CB(_write) \
- devcb = &victor_9000_fdc_t::set_syn_wr_callback(*device, DEVCB_##_write);
+ devcb = &victor_9000_fdc_device::set_syn_wr_callback(*device, DEVCB_##_write);
#define MCFG_VICTOR_9000_FDC_LBRDY_CB(_write) \
- devcb = &victor_9000_fdc_t::set_lbrdy_wr_callback(*device, DEVCB_##_write);
+ devcb = &victor_9000_fdc_device::set_lbrdy_wr_callback(*device, DEVCB_##_write);
@@ -38,17 +38,17 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> victor_9000_fdc_t
+// ======================> victor_9000_fdc_device
-class victor_9000_fdc_t : public device_t
+class victor_9000_fdc_device : public device_t
{
public:
// construction/destruction
- victor_9000_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ victor_9000_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<victor_9000_fdc_t &>(device).m_irq_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_syn_wr_callback(device_t &device, _Object object) { return downcast<victor_9000_fdc_t &>(device).m_syn_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_lbrdy_wr_callback(device_t &device, _Object object) { return downcast<victor_9000_fdc_t &>(device).m_lbrdy_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<victor_9000_fdc_device &>(device).m_irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_syn_wr_callback(device_t &device, Object &&cb) { return downcast<victor_9000_fdc_device &>(device).m_syn_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_lbrdy_wr_callback(device_t &device, Object &&cb) { return downcast<victor_9000_fdc_device &>(device).m_lbrdy_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( cs5_r ) { return m_via4->read(space, offset); }
DECLARE_WRITE8_MEMBER( cs5_w ) { m_via4->write(space, offset, data); }
@@ -239,8 +239,7 @@ private:
// device type definition
-extern const device_type VICTOR_9000_FDC;
-
+DECLARE_DEVICE_TYPE(VICTOR_9000_FDC, victor_9000_fdc_device)
-#endif
+#endif // MAME_MACHINE_VICTOR9K_FDC_H
diff --git a/src/mame/machine/victor9kb.cpp b/src/mame/machine/victor9k_kb.cpp
index 6f2c80a2295..291cab8d8ec 100644
--- a/src/mame/machine/victor9kb.cpp
+++ b/src/mame/machine/victor9k_kb.cpp
@@ -335,7 +335,7 @@ Y11 104 103 102 101 100 99 98 97 kN/A k. k00 k0 RGHT LEFT PAUS
*/
#include "emu.h"
-#include "victor9kb.h"
+#include "victor9k_kb.h"
@@ -353,7 +353,7 @@ Y11 104 103 102 101 100 99 98 97 kN/A k. k00 k0 RGHT LEFT PAUS
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type VICTOR9K_KEYBOARD = device_creator<victor_9000_keyboard_t>;
+DEFINE_DEVICE_TYPE(VICTOR9K_KEYBOARD, victor_9000_keyboard_device, "victor9k_kb", "Victor 9000 Keyboard")
//-------------------------------------------------
@@ -370,7 +370,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
-const tiny_rom_entry *victor_9000_keyboard_t::device_rom_region() const
+const tiny_rom_entry *victor_9000_keyboard_device::device_rom_region() const
{
return ROM_NAME( victor9k_keyboard );
}
@@ -383,10 +383,10 @@ const tiny_rom_entry *victor_9000_keyboard_t::device_rom_region() const
static MACHINE_CONFIG_FRAGMENT( victor9k_keyboard )
MCFG_CPU_ADD(I8021_TAG, I8021, XTAL_3_579545MHz)
// P0 is unconnected on pcb
- MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_t, kb_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_keyboard_t, kb_p1_w))
- MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(victor_9000_keyboard_t, kb_p2_w))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_keyboard_t, kb_t1_r))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(victor_9000_keyboard_device, kb_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(victor_9000_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(victor_9000_keyboard_device, kb_p2_w))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(victor_9000_keyboard_device, kb_t1_r))
MACHINE_CONFIG_END
@@ -395,7 +395,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
-machine_config_constructor victor_9000_keyboard_t::device_mconfig_additions() const
+machine_config_constructor victor_9000_keyboard_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( victor9k_keyboard );
}
@@ -542,7 +542,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
-ioport_constructor victor_9000_keyboard_t::device_input_ports() const
+ioport_constructor victor_9000_keyboard_device::device_input_ports() const
{
return INPUT_PORTS_NAME( victor9k_keyboard );
}
@@ -554,11 +554,11 @@ ioport_constructor victor_9000_keyboard_t::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
-// victor_9000_keyboard_t - constructor
+// victor_9000_keyboard_device - constructor
//-------------------------------------------------
-victor_9000_keyboard_t::victor_9000_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, VICTOR9K_KEYBOARD, "Victor 9000 Keyboard", tag, owner, clock, "victor9kb", __FILE__),
+victor_9000_keyboard_device::victor_9000_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, VICTOR9K_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8021_TAG),
m_y(*this, "Y%u", 0),
m_kbrdy_cb(*this),
@@ -575,7 +575,7 @@ victor_9000_keyboard_t::victor_9000_keyboard_t(const machine_config &mconfig, co
// device_start - device-specific startup
//-------------------------------------------------
-void victor_9000_keyboard_t::device_start()
+void victor_9000_keyboard_device::device_start()
{
// resolve callbacks
m_kbrdy_cb.resolve_safe();
@@ -596,7 +596,7 @@ void victor_9000_keyboard_t::device_start()
// kback_w -
//-------------------------------------------------
-WRITE_LINE_MEMBER( victor_9000_keyboard_t::kback_w )
+WRITE_LINE_MEMBER( victor_9000_keyboard_device::kback_w )
{
if (LOG) logerror("KBACK %u\n", state);
@@ -608,7 +608,7 @@ WRITE_LINE_MEMBER( victor_9000_keyboard_t::kback_w )
// kb_p1_r -
//-------------------------------------------------
-READ8_MEMBER( victor_9000_keyboard_t::kb_p1_r )
+READ8_MEMBER( victor_9000_keyboard_device::kb_p1_r )
{
uint8_t data = 0xff;
@@ -630,7 +630,7 @@ READ8_MEMBER( victor_9000_keyboard_t::kb_p1_r )
// kb_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( victor_9000_keyboard_t::kb_p1_w )
+WRITE8_MEMBER( victor_9000_keyboard_device::kb_p1_w )
{
m_p1 = data;
}
@@ -640,7 +640,7 @@ WRITE8_MEMBER( victor_9000_keyboard_t::kb_p1_w )
// kb_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( victor_9000_keyboard_t::kb_p2_w )
+WRITE8_MEMBER( victor_9000_keyboard_device::kb_p2_w )
{
/*
@@ -672,7 +672,7 @@ WRITE8_MEMBER( victor_9000_keyboard_t::kb_p2_w )
// kb_t1_r -
//-------------------------------------------------
-READ_LINE_MEMBER( victor_9000_keyboard_t::kb_t1_r )
+READ_LINE_MEMBER( victor_9000_keyboard_device::kb_t1_r )
{
return m_kback;
}
diff --git a/src/mame/machine/victor9kb.h b/src/mame/machine/victor9k_kb.h
index 4f235437675..dd13aff5790 100644
--- a/src/mame/machine/victor9kb.h
+++ b/src/mame/machine/victor9k_kb.h
@@ -6,11 +6,11 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_VICTOR9K_KB_H
+#define MAME_MACHINE_VICTOR9K_KB_H
-#ifndef __VICTOR9K_KEYBOARD__
-#define __VICTOR9K_KEYBOARD__
+#pragma once
#include "cpu/mcs48/mcs48.h"
@@ -21,26 +21,26 @@
//**************************************************************************
#define MCFG_VICTOR9K_KBRDY_HANDLER(_devcb) \
- devcb = &victor_9000_keyboard_t::set_kbrdy_cb(*device, DEVCB_##_devcb);
+ devcb = &victor_9000_keyboard_device::set_kbrdy_cb(*device, DEVCB_##_devcb);
#define MCFG_VICTOR9K_KBDATA_HANDLER(_devcb) \
- devcb = &victor_9000_keyboard_t::set_kbdata_cb(*device, DEVCB_##_devcb);
+ devcb = &victor_9000_keyboard_device::set_kbdata_cb(*device, DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> victor_9000_keyboard_t
+// ======================> victor_9000_keyboard_device
-class victor_9000_keyboard_t : public device_t
+class victor_9000_keyboard_device : public device_t
{
public:
// construction/destruction
- victor_9000_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ victor_9000_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_kbrdy_cb(device_t &device, _Object object) { return downcast<victor_9000_keyboard_t &>(device).m_kbrdy_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_kbdata_cb(device_t &device, _Object object) { return downcast<victor_9000_keyboard_t &>(device).m_kbdata_cb.set_callback(object); }
+ template<class _Object> static devcb_base &set_kbrdy_cb(device_t &device, _Object object) { return downcast<victor_9000_keyboard_device &>(device).m_kbrdy_cb.set_callback(object); }
+ template<class _Object> static devcb_base &set_kbdata_cb(device_t &device, _Object object) { return downcast<victor_9000_keyboard_device &>(device).m_kbdata_cb.set_callback(object); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -77,8 +77,8 @@ private:
// device type definition
-extern const device_type VICTOR9K_KEYBOARD;
+DECLARE_DEVICE_TYPE(VICTOR9K_KEYBOARD, victor_9000_keyboard_device)
-#endif
+#endif // MAME_MACHINE_VICTOR9K_KB_H
diff --git a/src/mame/machine/vs9209.cpp b/src/mame/machine/vs9209.cpp
index 02620a286a1..849247a8ac7 100644
--- a/src/mame/machine/vs9209.cpp
+++ b/src/mame/machine/vs9209.cpp
@@ -30,7 +30,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type VS9209 = device_creator<vs9209_device>;
+DEFINE_DEVICE_TYPE(VS9209, vs9209_device, "vs9209", "VS9209 I/O")
//**************************************************************************
// DEVICE DEFINITION
@@ -41,9 +41,9 @@ const device_type VS9209 = device_creator<vs9209_device>;
//-------------------------------------------------
vs9209_device::vs9209_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, VS9209, "VS9209 I/O", tag, owner, clock, "vs9209", __FILE__),
- m_input_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}},
- m_output_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}
+ : device_t(mconfig, VS9209, tag, owner, clock)
+ , m_input_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}
+ , m_output_cb{{*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}, {*this}}
{
}
diff --git a/src/mame/machine/vs9209.h b/src/mame/machine/vs9209.h
index d6e1460e8ab..f4fb1cee393 100644
--- a/src/mame/machine/vs9209.h
+++ b/src/mame/machine/vs9209.h
@@ -6,11 +6,11 @@
**********************************************************************/
-#pragma once
-
#ifndef MAME_MACHINE_VS9209_H
#define MAME_MACHINE_VS9209_H
+#pragma once
+
//**************************************************************************
// CONFIGURATION MACROS
//**************************************************************************
@@ -97,6 +97,6 @@ private:
};
// device type definition
-extern const device_type VS9209;
+DECLARE_DEVICE_TYPE(VS9209, vs9209_device)
-#endif
+#endif // MAME_MACHINE_VS9209_H
diff --git a/src/mame/machine/vsnes.cpp b/src/mame/machine/vsnes.cpp
index 666f5319d2d..2f90695c044 100644
--- a/src/mame/machine/vsnes.cpp
+++ b/src/mame/machine/vsnes.cpp
@@ -678,12 +678,10 @@ void vsnes_state::mapper4_set_chr( )
v_set_videorom_bank(chr_page ^ 7, 1, m_MMC3_chr_bank[5]);
}
-#define BOTTOM_VISIBLE_SCANLINE 239 /* The bottommost visible scanline */
-#define NUM_SCANLINE 262
void vsnes_state::mapper4_irq( int scanline, int vblank, int blanked )
{
- if (scanline < PPU_BOTTOM_VISIBLE_SCANLINE)
+ if (scanline < ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE)
{
int priorCount = m_IRQ_count;
if (m_IRQ_count == 0)
@@ -763,12 +761,12 @@ WRITE8_MEMBER(vsnes_state::mapper4_w)
case 0x6000: /* $e000 - Disable IRQs */
m_IRQ_enable = 0;
m_IRQ_count = m_IRQ_count_latch;
- m_ppu1->set_scanline_callback(ppu2c0x_scanline_delegate());
+ m_ppu1->set_scanline_callback(ppu2c0x_device::scanline_delegate());
break;
case 0x6001: /* $e001 - Enable IRQs */
m_IRQ_enable = 1;
- m_ppu1->set_scanline_callback(ppu2c0x_scanline_delegate(FUNC(vsnes_state::mapper4_irq), this));
+ m_ppu1->set_scanline_callback(ppu2c0x_device::scanline_delegate(FUNC(vsnes_state::mapper4_irq), this));
break;
default:
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index e9332d7dc06..d5567615b7a 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -70,7 +70,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type WANGPC_KEYBOARD = device_creator<wangpc_keyboard_t>;
+DEFINE_DEVICE_TYPE(WANGPC_KEYBOARD, wangpc_keyboard_device, "wangpckb", "Wang PC Keyboard")
@@ -88,7 +88,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
-const tiny_rom_entry *wangpc_keyboard_t::device_rom_region() const
+const tiny_rom_entry *wangpc_keyboard_device::device_rom_region() const
{
return ROM_NAME( wangpc_keyboard );
}
@@ -98,7 +98,7 @@ const tiny_rom_entry *wangpc_keyboard_t::device_rom_region() const
// ADDRESS_MAP( wangpc_keyboard_io )
//-------------------------------------------------
-static ADDRESS_MAP_START( wangpc_keyboard_io, AS_IO, 8, wangpc_keyboard_t )
+static ADDRESS_MAP_START( wangpc_keyboard_io, AS_IO, 8, wangpc_keyboard_device )
//AM_RANGE(0x0000, 0xfeff) AM_READNOP
AM_RANGE(0x47, 0x58) AM_MIRROR(0xff00) AM_READNOP
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_DEVWRITE(SN76496_TAG, sn76496_device, write)
@@ -115,8 +115,8 @@ ADDRESS_MAP_END
static MACHINE_CONFIG_FRAGMENT( wangpc_keyboard )
MCFG_CPU_ADD(I8051_TAG, I8051, XTAL_4MHz)
MCFG_CPU_IO_MAP(wangpc_keyboard_io)
- MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_t, mcs51_tx_callback))
- MCFG_MCS51_SERIAL_RX_CB(READ8(wangpc_keyboard_t, mcs51_rx_callback))
+ MCFG_MCS51_SERIAL_TX_CB(WRITE8(wangpc_keyboard_device, mcs51_tx_callback))
+ MCFG_MCS51_SERIAL_RX_CB(READ8(wangpc_keyboard_device, mcs51_rx_callback))
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -130,7 +130,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
-machine_config_constructor wangpc_keyboard_t::device_mconfig_additions() const
+machine_config_constructor wangpc_keyboard_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( wangpc_keyboard );
}
@@ -359,7 +359,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
-ioport_constructor wangpc_keyboard_t::device_input_ports() const
+ioport_constructor wangpc_keyboard_device::device_input_ports() const
{
return INPUT_PORTS_NAME( wangpc_keyboard );
}
@@ -371,11 +371,11 @@ ioport_constructor wangpc_keyboard_t::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
-// wangpc_keyboard_t - constructor
+// wangpc_keyboard_device - constructor
//-------------------------------------------------
-wangpc_keyboard_t::wangpc_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, WANGPC_KEYBOARD, "Wang PC Keyboard", tag, owner, clock, "wangpckb", __FILE__),
+wangpc_keyboard_device::wangpc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, WANGPC_KEYBOARD, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_maincpu(*this, I8051_TAG),
m_y(*this, "Y%u", 0),
@@ -390,7 +390,7 @@ wangpc_keyboard_t::wangpc_keyboard_t(const machine_config &mconfig, const char *
// device_start - device-specific startup
//-------------------------------------------------
-void wangpc_keyboard_t::device_start()
+void wangpc_keyboard_device::device_start()
{
m_txd_handler.resolve_safe();
@@ -408,7 +408,7 @@ void wangpc_keyboard_t::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void wangpc_keyboard_t::device_reset()
+void wangpc_keyboard_device::device_reset()
{
receive_register_reset();
transmit_register_reset();
@@ -421,7 +421,7 @@ void wangpc_keyboard_t::device_reset()
// device_timer - handler timer events
//-------------------------------------------------
-void wangpc_keyboard_t::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void wangpc_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
device_serial_interface::device_timer(timer, id, param, ptr);
}
@@ -431,7 +431,7 @@ void wangpc_keyboard_t::device_timer(emu_timer &timer, device_timer_id id, int p
// tra_callback -
//-------------------------------------------------
-void wangpc_keyboard_t::tra_callback()
+void wangpc_keyboard_device::tra_callback()
{
int bit = transmit_register_get_data_bit();
@@ -445,7 +445,7 @@ void wangpc_keyboard_t::tra_callback()
// tra_complete -
//-------------------------------------------------
-void wangpc_keyboard_t::tra_complete()
+void wangpc_keyboard_device::tra_complete()
{
}
@@ -454,7 +454,7 @@ void wangpc_keyboard_t::tra_complete()
// rcv_callback -
//-------------------------------------------------
-void wangpc_keyboard_t::rcv_callback()
+void wangpc_keyboard_device::rcv_callback()
{
if (LOG) logerror("KB '%s' Receive Bit %u\n", tag(), m_rxd);
@@ -466,7 +466,7 @@ void wangpc_keyboard_t::rcv_callback()
// rcv_complete -
//-------------------------------------------------
-void wangpc_keyboard_t::rcv_complete()
+void wangpc_keyboard_device::rcv_complete()
{
receive_register_extract();
@@ -481,7 +481,7 @@ void wangpc_keyboard_t::rcv_complete()
// write_rxd -
//-------------------------------------------------
-WRITE_LINE_MEMBER(wangpc_keyboard_t::write_rxd)
+WRITE_LINE_MEMBER(wangpc_keyboard_device::write_rxd)
{
m_rxd = state;
@@ -493,7 +493,7 @@ WRITE_LINE_MEMBER(wangpc_keyboard_t::write_rxd)
// mcs51_rx_callback -
//-------------------------------------------------
-READ8_MEMBER(wangpc_keyboard_t::mcs51_rx_callback)
+READ8_MEMBER(wangpc_keyboard_device::mcs51_rx_callback)
{
if (LOG) logerror("KB '%s' CPU Receive Data %02x\n", tag(), get_received_char());
@@ -505,7 +505,7 @@ READ8_MEMBER(wangpc_keyboard_t::mcs51_rx_callback)
// mcs51_tx_callback -
//-------------------------------------------------
-WRITE8_MEMBER(wangpc_keyboard_t::mcs51_tx_callback)
+WRITE8_MEMBER(wangpc_keyboard_device::mcs51_tx_callback)
{
if (LOG) logerror("KB '%s' CPU Transmit Data %02x\n", tag(), data);
@@ -523,7 +523,7 @@ WRITE8_MEMBER(wangpc_keyboard_t::mcs51_tx_callback)
// kb_p1_r -
//-------------------------------------------------
-READ8_MEMBER( wangpc_keyboard_t::kb_p1_r )
+READ8_MEMBER( wangpc_keyboard_device::kb_p1_r )
{
return m_y[m_keylatch]->read();
}
@@ -533,7 +533,7 @@ READ8_MEMBER( wangpc_keyboard_t::kb_p1_r )
// kb_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( wangpc_keyboard_t::kb_p1_w )
+WRITE8_MEMBER( wangpc_keyboard_device::kb_p1_w )
{
/*
@@ -563,7 +563,7 @@ WRITE8_MEMBER( wangpc_keyboard_t::kb_p1_w )
// kb_p2_w -
//-------------------------------------------------
-WRITE8_MEMBER( wangpc_keyboard_t::kb_p2_w )
+WRITE8_MEMBER( wangpc_keyboard_device::kb_p2_w )
{
/*
@@ -590,7 +590,7 @@ WRITE8_MEMBER( wangpc_keyboard_t::kb_p2_w )
// kb_p3_w -
//-------------------------------------------------
-WRITE8_MEMBER( wangpc_keyboard_t::kb_p3_w )
+WRITE8_MEMBER( wangpc_keyboard_device::kb_p3_w )
{
/*
diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h
index a621d9e8f88..938be9bde46 100644
--- a/src/mame/machine/wangpckb.h
+++ b/src/mame/machine/wangpckb.h
@@ -6,10 +6,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_WANGPCKB_H
+#define MAME_MACHINE_WANGPCKB_H
-#ifndef __WANGPC_KEYBOARD__
-#define __WANGPC_KEYBOARD__
+#pragma once
#include "cpu/mcs51/mcs51.h"
@@ -33,23 +33,23 @@
MCFG_DEVICE_ADD(WANGPC_KEYBOARD_TAG, WANGPC_KEYBOARD, 0)
#define MCFG_WANGPCKB_TXD_HANDLER(_devcb) \
- devcb = &wangpc_keyboard_t::set_txd_handler(*device, DEVCB_##_devcb);
+ devcb = &wangpc_keyboard_device::set_txd_handler(*device, DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> wangpc_keyboard_t
+// ======================> wangpc_keyboard_device
-class wangpc_keyboard_t : public device_t,
+class wangpc_keyboard_device : public device_t,
public device_serial_interface
{
public:
// construction/destruction
- wangpc_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ wangpc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<wangpc_keyboard_t &>(device).m_txd_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_txd_handler(device_t &device, Object &&cb) { return downcast<wangpc_keyboard_device &>(device).m_txd_handler.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -90,8 +90,6 @@ private:
// device type definition
-extern const device_type WANGPC_KEYBOARD;
-
-
+DECLARE_DEVICE_TYPE(WANGPC_KEYBOARD, wangpc_keyboard_device)
-#endif
+#endif // MAME_MACHINE_WANGPCKB_H
diff --git a/src/mame/machine/wpc.cpp b/src/mame/machine/wpc.cpp
index b959966164e..4a4dbea06a0 100644
--- a/src/mame/machine/wpc.cpp
+++ b/src/mame/machine/wpc.cpp
@@ -11,10 +11,10 @@
#define LOG_WPC (0)
-const device_type WPCASIC = device_creator<wpc_device>;
+DEFINE_DEVICE_TYPE(WPCASIC, wpc_device, "wpc", "Williams WPC ASIC")
wpc_device::wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig,WPCASIC,"Williams WPC ASIC",tag,owner,clock, "wpc", __FILE__),
+ : device_t(mconfig, WPCASIC, tag, owner, clock),
m_dmd_visiblepage(0),
m_irq_cb(*this),
m_firq_cb(*this),
diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h
index 146c0f74754..326e0037c75 100644
--- a/src/mame/machine/wpc.h
+++ b/src/mame/machine/wpc.h
@@ -6,8 +6,10 @@
* Created on: 7/10/2013
*/
-#ifndef WPC_H_
-#define WPC_H_
+#ifndef MAME_MACHINE_WPC_H
+#define MAME_MACHINE_WPC_H
+
+#pragma once
/* A = Alpha-numeric
@@ -101,39 +103,41 @@
class wpc_device : public device_t
{
public:
+ static constexpr device_timer_id TIMER_IRQ = 1;
+ static constexpr device_timer_id TIMER_ZEROCROSS = 2;
+
wpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
uint16_t get_memprotect_mask() { return m_memprotect_mask; }
- bool memprotect_active() { if(m_memprotect == 0xb4) return false; else return true; }
- uint16_t get_alphanumeric(uint8_t offset) { if(offset < 40) return m_alpha_data[offset]; else return 0; }
- void reset_alphanumeric() { memset(m_alpha_data,0,40*2); }
+ bool memprotect_active() { return m_memprotect != 0xb4; }
+ uint16_t get_alphanumeric(uint8_t offset) { return (offset < 40) ? m_alpha_data[offset] : 0; }
+ void reset_alphanumeric() { std::fill(std::begin(m_alpha_data), std::end(m_alpha_data), 0); }
uint8_t get_visible_page() { return m_dmd_visiblepage; }
uint8_t get_dmd_firq_line() { return m_dmd_irqline; }
void set_dmd_firq() { m_dmd_irqsrc = true; }
void set_snd_firq() { m_snd_irqsrc = true; }
// callbacks
- template<class _irq> void set_irq_callback(_irq irq) { m_irq_cb.set_callback(irq); }
- template<class _firq> void set_firq_callback(_firq firq) { m_firq_cb.set_callback(firq); }
- template<class _sounddata_r> void set_sound_data_read(_sounddata_r sounddata_r) { m_sounddata_r.set_callback(sounddata_r); }
- template<class _sounddata_w> void set_sound_data_write(_sounddata_w sounddata_w) { m_sounddata_w.set_callback(sounddata_w); }
- template<class _soundctrl_r> void set_sound_ctrl_read(_soundctrl_r soundctrl_r) { m_soundctrl_r.set_callback(soundctrl_r); }
- template<class _soundctrl_w> void set_sound_ctrl_write(_soundctrl_w soundctrl_w) { m_soundctrl_w.set_callback(soundctrl_w); }
- template<class _sounds11> void set_sound_s11_write(_sounds11 sounds11) { m_sounds11_w.set_callback(sounds11); }
- template<class _bank_w> void set_bank_write(_bank_w bank_w) { m_bank_w.set_callback(bank_w); }
- template<class _dmdbank_w> void set_dmdbank_write(_dmdbank_w dmdbank_w) { m_dmdbank_w.set_callback(dmdbank_w); }
+ template <class Object> void set_irq_callback(Object &&cb) { m_irq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_firq_callback(Object &&cb) { m_firq_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_sound_data_read(Object &&cb) { m_sounddata_r.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_sound_data_write(Object &&cb) { m_sounddata_w.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_sound_ctrl_read(Object &&cb) { m_soundctrl_r.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_sound_ctrl_write(Object &&cb) { m_soundctrl_w.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_sound_s11_write(Object &&cb) { m_sounds11_w.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_bank_write(Object &&cb) { m_bank_w.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_dmdbank_write(Object &&cb) { m_dmdbank_w.set_callback(std::forward<Object>(cb)); }
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- static const device_timer_id TIMER_IRQ = 1;
- static const device_timer_id TIMER_ZEROCROSS = 2;
protected:
// overrides
virtual void device_start() override;
virtual void device_reset() override;
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
private:
uint8_t m_shift_addr_high;
uint8_t m_shift_addr_low;
@@ -163,6 +167,6 @@ private:
devcb_write8 m_dmdbank_w;
};
-extern const device_type WPCASIC;
+DECLARE_DEVICE_TYPE(WPCASIC, wpc_device)
-#endif /* WPC_H_ */
+#endif // MAME_MACHINE_WPC_H
diff --git a/src/mame/machine/wpc_lamp.cpp b/src/mame/machine/wpc_lamp.cpp
index d40bc033b03..bab67eb0299 100644
--- a/src/mame/machine/wpc_lamp.cpp
+++ b/src/mame/machine/wpc_lamp.cpp
@@ -4,10 +4,10 @@
#include "emu.h"
#include "wpc_lamp.h"
-const device_type WPC_LAMP = device_creator<wpc_lamp_device>;
+DEFINE_DEVICE_TYPE(WPC_LAMP, wpc_lamp_device, "wpc_lamp", "Williams Pinball Controller Lamp Control")
wpc_lamp_device::wpc_lamp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, WPC_LAMP, "Williams Pinball Controller Lamp Control", tag, owner, clock, "wpc_lamp", __FILE__)
+ device_t(mconfig, WPC_LAMP, tag, owner, clock)
{
names = nullptr;
}
diff --git a/src/mame/machine/wpc_lamp.h b/src/mame/machine/wpc_lamp.h
index c1e7de09620..b4fb87ab074 100644
--- a/src/mame/machine/wpc_lamp.h
+++ b/src/mame/machine/wpc_lamp.h
@@ -3,8 +3,10 @@
// Williams Pinball Controller lamp control
-#ifndef WPC_LAMP_H
-#define WPC_LAMP_H
+#ifndef MAME_MACHINE_WPC_LAMP_H
+#define MAME_MACHINE_WPC_LAMP_H
+
+#pragma once
#define MCFG_WPC_LAMP_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, WPC_LAMP, 0 )
@@ -33,6 +35,6 @@ protected:
void update();
};
-extern const device_type WPC_LAMP;
+DECLARE_DEVICE_TYPE(WPC_LAMP, wpc_lamp_device)
-#endif
+#endif // MAME_MACHINE_WPC_LAMP_H
diff --git a/src/mame/machine/wpc_out.cpp b/src/mame/machine/wpc_out.cpp
index 1e5cb36f084..5a8941efab9 100644
--- a/src/mame/machine/wpc_out.cpp
+++ b/src/mame/machine/wpc_out.cpp
@@ -4,10 +4,10 @@
#include "emu.h"
#include "wpc_out.h"
-const device_type WPC_OUT = device_creator<wpc_out_device>;
+DEFINE_DEVICE_TYPE(WPC_OUT, wpc_out_device, "wpc_out", "Williams Pinball Controller Output Control")
wpc_out_device::wpc_out_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, WPC_OUT, "Williams Pinball Controller Output Control", tag, owner, clock, "wpc_out", __FILE__)
+ device_t(mconfig, WPC_OUT, tag, owner, clock)
{
names = nullptr;
}
diff --git a/src/mame/machine/wpc_out.h b/src/mame/machine/wpc_out.h
index 5755ed90d87..eaa08c7f8db 100644
--- a/src/mame/machine/wpc_out.h
+++ b/src/mame/machine/wpc_out.h
@@ -3,8 +3,10 @@
// Williams Pinball Controller outputs control (solenoids, flashers, generic logic, global illumination, coin counter, cpu led)
-#ifndef WPC_OUT_H
-#define WPC_OUT_H
+#ifndef MAME_MACHINE_WPC_OUT_H
+#define MAME_MACHINE_WPC_OUT_H
+
+#pragma once
#define MCFG_WPC_OUT_ADD( _tag, _count ) \
MCFG_DEVICE_ADD( _tag, WPC_OUT, 0 ) \
@@ -46,6 +48,6 @@ protected:
void gi_update();
};
-extern const device_type WPC_OUT;
+DECLARE_DEVICE_TYPE(WPC_OUT, wpc_out_device)
-#endif
+#endif // MAME_MACHINE_WPC_OUT_H
diff --git a/src/mame/machine/wpc_pic.cpp b/src/mame/machine/wpc_pic.cpp
index 64ec9fbafb5..a5a25b70bb9 100644
--- a/src/mame/machine/wpc_pic.cpp
+++ b/src/mame/machine/wpc_pic.cpp
@@ -4,10 +4,10 @@
#include "emu.h"
#include "wpc_pic.h"
-const device_type WPC_PIC = device_creator<wpc_pic_device>;
+DEFINE_DEVICE_TYPE(WPC_PIC, wpc_pic_device, "wpc_pic", "Williams Pinball Controller PIC Security")
wpc_pic_device::wpc_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, WPC_PIC, "Williams Pinball Controller PIC Security", tag, owner, clock, "wpc_pic", __FILE__),
+ device_t(mconfig, WPC_PIC, tag, owner, clock),
swarray(*this, ":SW.%u", 0)
{
serial = "000 000000 00000 000";
diff --git a/src/mame/machine/wpc_pic.h b/src/mame/machine/wpc_pic.h
index c1f7690f039..4b1fcda7baf 100644
--- a/src/mame/machine/wpc_pic.h
+++ b/src/mame/machine/wpc_pic.h
@@ -3,8 +3,10 @@
// Williams Pinball Controller Pic-based protection simulation
-#ifndef WPC_PIC_H
-#define WPC_PIC_H
+#ifndef MAME_MACHINE_WPC_PIC_H
+#define MAME_MACHINE_WPC_PIC_H
+
+#pragma once
#define MCFG_WPC_PIC_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, WPC_PIC, 0 )
@@ -33,6 +35,6 @@ protected:
void check_game_id();
};
-extern const device_type WPC_PIC;
+DECLARE_DEVICE_TYPE(WPC_PIC, wpc_pic_device)
-#endif
+#endif // MAME_MACHINE_WPC_PIC_H
diff --git a/src/mame/machine/wpc_shift.cpp b/src/mame/machine/wpc_shift.cpp
index a8cfa7c853c..1a51477694a 100644
--- a/src/mame/machine/wpc_shift.cpp
+++ b/src/mame/machine/wpc_shift.cpp
@@ -4,10 +4,10 @@
#include "emu.h"
#include "wpc_shift.h"
-const device_type WPC_SHIFT = device_creator<wpc_shift_device>;
+DEFINE_DEVICE_TYPE(WPC_SHIFT, wpc_shift_device, "wpc_shift", "Windows Pinball Controller Shifter")
wpc_shift_device::wpc_shift_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, WPC_SHIFT, "Williams Pinball Controller Shifter", tag, owner, clock, "wpc_shift", __FILE__)
+ device_t(mconfig, WPC_SHIFT, tag, owner, clock)
{
}
diff --git a/src/mame/machine/wpc_shift.h b/src/mame/machine/wpc_shift.h
index 0870588c530..661bbb4fb83 100644
--- a/src/mame/machine/wpc_shift.h
+++ b/src/mame/machine/wpc_shift.h
@@ -3,8 +3,8 @@
// Williams Pinball Controller Shift-based protection simulation
-#ifndef WPC_SHIFT_H
-#define WPC_SHIFT_H
+#ifndef MAME_MACHINE_WPC_SHIFT_H
+#define MAME_MACHINE_WPC_SHIFT_H
#define MCFG_WPC_SHIFT_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, WPC_SHIFT, 0 )
@@ -34,6 +34,6 @@ protected:
virtual void device_reset() override;
};
-extern const device_type WPC_SHIFT;
+DECLARE_DEVICE_TYPE(WPC_SHIFT, wpc_shift_device)
-#endif
+#endif // MAME_MACHINE_WPC_SHIFT_H
diff --git a/src/mame/machine/x1.cpp b/src/mame/machine/x1.cpp
index 71cdb6ff643..6a2ddc2f771 100644
--- a/src/mame/machine/x1.cpp
+++ b/src/mame/machine/x1.cpp
@@ -9,15 +9,15 @@
// LIVE DEVICE
//**************************************************************************
-const device_type X1_KEYBOARD = device_creator<x1_keyboard_device>;
+DEFINE_DEVICE_TYPE(X1_KEYBOARD, x1_keyboard_device, "x1_keyboard", "Sharp X1 Keyboard")
//-------------------------------------------------
// z80ctc_device - constructor
//-------------------------------------------------
x1_keyboard_device::x1_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, X1_KEYBOARD, "X1 Keyboard", tag, owner, clock, "x1_keyboard", __FILE__),
- device_z80daisy_interface(mconfig, *this)
+ : device_t(mconfig, X1_KEYBOARD, tag, owner, clock)
+ , device_z80daisy_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp
index da4cebfd53d..de909abad0a 100644
--- a/src/mame/machine/x68k_hdc.cpp
+++ b/src/mame/machine/x68k_hdc.cpp
@@ -22,11 +22,80 @@
#include "imagedev/harddriv.h"
#include "image.h"
-const device_type X68KHDC = device_creator<x68k_hdc_image_device>;
+enum
+{
+ SASI_PHASE_BUSFREE = 0,
+ SASI_PHASE_ARBITRATION,
+ SASI_PHASE_SELECTION,
+ SASI_PHASE_RESELECTION,
+ SASI_PHASE_COMMAND,
+ SASI_PHASE_DATA,
+ SASI_PHASE_STATUS,
+ SASI_PHASE_MESSAGE,
+ SASI_PHASE_READ,
+ SASI_PHASE_WRITE
+};
+
+// SASI commands, based on the SASI standard
+enum
+{
+ // Class 0 (6-byte) commands
+ SASI_CMD_TEST_UNIT_READY = 0,
+ SASI_CMD_REZERO_UNIT,
+ SASI_CMD_RESERVED_02,
+ SASI_CMD_REQUEST_SENSE,
+ SASI_CMD_FORMAT_UNIT,
+ SASI_CMD_RESERVED_05,
+ SASI_CMD_FORMAT_UNIT_06, // the X68000 uses command 0x06 for Format Unit, despite the SASI specs saying 0x04
+ SASI_CMD_RESERVED_07,
+ SASI_CMD_READ,
+ SASI_CMD_RESERVED_09,
+ SASI_CMD_WRITE,
+ SASI_CMD_SEEK,
+ SASI_CMD_RESERVED_0C,
+ SASI_CMD_RESERVED_0D,
+ SASI_CMD_RESERVED_0E,
+ SASI_CMD_WRITE_FILE_MARK,
+ SASI_CMD_INVALID_10,
+ SASI_CMD_INVALID_11,
+ SASI_CMD_RESERVE_UNIT,
+ SASI_CMD_RELEASE_UNIT,
+ SASI_CMD_INVALID_14,
+ SASI_CMD_INVALID_15,
+ SASI_CMD_READ_CAPACITY,
+ SASI_CMD_INVALID_17,
+ SASI_CMD_INVALID_18,
+ SASI_CMD_INVALID_19,
+ SASI_CMD_READ_DIAGNOSTIC,
+ SASI_CMD_WRITE_DIAGNOSTIC,
+ SASI_CMD_INVALID_1C,
+ SASI_CMD_INVALID_1D,
+ SASI_CMD_INVALID_1E,
+ SASI_CMD_INQUIRY,
+ // Class 1 commands (yes, just the one)
+ SASI_CMD_RESERVED_20,
+ SASI_CMD_RESERVED_21,
+ SASI_CMD_RESERVED_22,
+ SASI_CMD_SET_BLOCK_LIMITS = 0x28,
+ // Class 2 commands
+ SASI_CMD_EXTENDED_ADDRESS_READ = 0x48,
+ SASI_CMD_INVALID_49,
+ SASI_CMD_EXTENDED_ADDRESS_WRITE,
+ SASI_CMD_WRITE_AND_VERIFY = 0x54,
+ SASI_CMD_VERIFY,
+ SASI_CMD_INVALID_56,
+ SASI_CMD_SEARCH_DATA_HIGH,
+ SASI_CMD_SEARCH_DATA_EQUAL,
+ SASI_CMD_SEARCH_DATA_LOW,
+ // controller-specific commands
+ SASI_CMD_SPECIFY = 0xc2
+};
+
+DEFINE_DEVICE_TYPE(X68KHDC, x68k_hdc_image_device, "x68k_hdc_image", "SASI Hard Disk")
x68k_hdc_image_device::x68k_hdc_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, X68KHDC, "SASI Hard Disk", tag, owner, clock, "x68k_hdc_image", __FILE__),
- device_image_interface(mconfig, *this)
+ : device_t(mconfig, X68KHDC, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
{
}
diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h
index decc9a6ef82..20f943d46b6 100644
--- a/src/mame/machine/x68k_hdc.h
+++ b/src/mame/machine/x68k_hdc.h
@@ -5,76 +5,11 @@
X68000 Custom SASI HD controller
*/
+#ifndef MAME_MACHINE_X68K_HDC_H
+#define MAME_MACHINE_X68K_HDC_H
+#pragma once
-enum
-{
- SASI_PHASE_BUSFREE = 0,
- SASI_PHASE_ARBITRATION,
- SASI_PHASE_SELECTION,
- SASI_PHASE_RESELECTION,
- SASI_PHASE_COMMAND,
- SASI_PHASE_DATA,
- SASI_PHASE_STATUS,
- SASI_PHASE_MESSAGE,
- SASI_PHASE_READ,
- SASI_PHASE_WRITE
-};
-
-// SASI commands, based on the SASI standard
-enum
-{
- // Class 0 (6-byte) commands
- SASI_CMD_TEST_UNIT_READY = 0,
- SASI_CMD_REZERO_UNIT,
- SASI_CMD_RESERVED_02,
- SASI_CMD_REQUEST_SENSE,
- SASI_CMD_FORMAT_UNIT,
- SASI_CMD_RESERVED_05,
- SASI_CMD_FORMAT_UNIT_06, // the X68000 uses command 0x06 for Format Unit, despite the SASI specs saying 0x04
- SASI_CMD_RESERVED_07,
- SASI_CMD_READ,
- SASI_CMD_RESERVED_09,
- SASI_CMD_WRITE,
- SASI_CMD_SEEK,
- SASI_CMD_RESERVED_0C,
- SASI_CMD_RESERVED_0D,
- SASI_CMD_RESERVED_0E,
- SASI_CMD_WRITE_FILE_MARK,
- SASI_CMD_INVALID_10,
- SASI_CMD_INVALID_11,
- SASI_CMD_RESERVE_UNIT,
- SASI_CMD_RELEASE_UNIT,
- SASI_CMD_INVALID_14,
- SASI_CMD_INVALID_15,
- SASI_CMD_READ_CAPACITY,
- SASI_CMD_INVALID_17,
- SASI_CMD_INVALID_18,
- SASI_CMD_INVALID_19,
- SASI_CMD_READ_DIAGNOSTIC,
- SASI_CMD_WRITE_DIAGNOSTIC,
- SASI_CMD_INVALID_1C,
- SASI_CMD_INVALID_1D,
- SASI_CMD_INVALID_1E,
- SASI_CMD_INQUIRY,
- // Class 1 commands (yes, just the one)
- SASI_CMD_RESERVED_20,
- SASI_CMD_RESERVED_21,
- SASI_CMD_RESERVED_22,
- SASI_CMD_SET_BLOCK_LIMITS = 0x28,
- // Class 2 commands
- SASI_CMD_EXTENDED_ADDRESS_READ = 0x48,
- SASI_CMD_INVALID_49,
- SASI_CMD_EXTENDED_ADDRESS_WRITE,
- SASI_CMD_WRITE_AND_VERIFY = 0x54,
- SASI_CMD_VERIFY,
- SASI_CMD_INVALID_56,
- SASI_CMD_SEARCH_DATA_HIGH,
- SASI_CMD_SEARCH_DATA_EQUAL,
- SASI_CMD_SEARCH_DATA_LOW,
- // controller-specific commands
- SASI_CMD_SPECIFY = 0xc2
-};
class x68k_hdc_image_device : public device_t,
public device_image_interface
@@ -86,11 +21,11 @@ public:
// image-level overrides
virtual iodevice_t image_type() const override { return IO_HARDDISK; }
- virtual bool is_readable() const override { return 1; }
- virtual bool is_writeable() const override { return 1; }
- virtual bool is_creatable() const override { return 1; }
- virtual bool must_be_loaded() const override { return 0; }
- virtual bool is_reset_on_load() const override { return 0; }
+ virtual bool is_readable() const override { return true; }
+ virtual bool is_writeable() const override { return true; }
+ virtual bool is_creatable() const override { return true; }
+ virtual bool must_be_loaded() const override { return false; }
+ virtual bool is_reset_on_load() const override { return false; }
virtual const char *file_extensions() const override { return "hdf"; }
virtual const char *custom_instance_name() const override { return "sasihd"; }
virtual const char *custom_brief_instance_name() const override { return "sasi"; }
@@ -122,7 +57,9 @@ private:
};
// device type definition
-extern const device_type X68KHDC;
+DECLARE_DEVICE_TYPE(X68KHDC, x68k_hdc_image_device)
#define MCFG_X68KHDC_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, X68KHDC, 0)
+
+#endif // MAME_MACHINE_X68K_HDC_H
diff --git a/src/mame/machine/x68k_kbd.cpp b/src/mame/machine/x68k_kbd.cpp
index 7aa06e76a31..ec3ed0cbe03 100644
--- a/src/mame/machine/x68k_kbd.cpp
+++ b/src/mame/machine/x68k_kbd.cpp
@@ -7,7 +7,7 @@
x68k_keyboard_device::x68k_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : buffered_rs232_device(mconfig, X68K_KEYBOARD, "X68k Keyboard", tag, owner, 0, "x68k_keyboard", __FILE__)
+ : buffered_rs232_device(mconfig, X68K_KEYBOARD, tag, owner, 0)
, device_matrix_keyboard_interface(mconfig, *this, "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7", "LINE8", "LINE9", "LINEA", "LINEB", "LINEC", "LINED", "LINEE")
{
}
@@ -302,7 +302,7 @@ void x68k_keyboard_device::device_timer(emu_timer &timer, device_timer_id id, in
}
-const device_type X68K_KEYBOARD = device_creator<x68k_keyboard_device>;
+DEFINE_DEVICE_TYPE(X68K_KEYBOARD, x68k_keyboard_device, "x68k_keyboard", "Sharp X68000 Keyboard")
#if 0
diff --git a/src/mame/machine/x68k_kbd.h b/src/mame/machine/x68k_kbd.h
index f856a68efb2..13fff783557 100644
--- a/src/mame/machine/x68k_kbd.h
+++ b/src/mame/machine/x68k_kbd.h
@@ -27,6 +27,6 @@ private:
uint8_t m_enabled; // keyboard enabled?
};
-extern const device_type X68K_KEYBOARD;
+DECLARE_DEVICE_TYPE(X68K_KEYBOARD, x68k_keyboard_device)
#endif // MAME_MACHINE_X68K_KBD_H
diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp
index 6ff49b781e3..22f9f9d6823 100644
--- a/src/mame/machine/x820kb.cpp
+++ b/src/mame/machine/x820kb.cpp
@@ -57,7 +57,7 @@ Notes:
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type XEROX_820_KEYBOARD = device_creator<xerox_820_keyboard_t>;
+DEFINE_DEVICE_TYPE(XEROX_820_KEYBOARD, xerox_820_keyboard_device, "x820kb", "Xerox 820 Keyboard")
//-------------------------------------------------
@@ -74,7 +74,7 @@ ROM_END
// rom_region - device-specific ROM region
//-------------------------------------------------
-const tiny_rom_entry *xerox_820_keyboard_t::device_rom_region() const
+const tiny_rom_entry *xerox_820_keyboard_device::device_rom_region() const
{
return ROM_NAME( xerox_820_keyboard );
}
@@ -86,12 +86,12 @@ const tiny_rom_entry *xerox_820_keyboard_t::device_rom_region() const
static MACHINE_CONFIG_FRAGMENT( xerox_820_keyboard )
MCFG_CPU_ADD(I8748_TAG, I8048, XTAL_6MHz)
- MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_t, kb_p1_r))
- MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_t, kb_p1_w))
- MCFG_MCS48_PORT_P2_IN_CB(READ8(xerox_820_keyboard_t, kb_p2_r))
- MCFG_MCS48_PORT_T0_IN_CB(READLINE(xerox_820_keyboard_t, kb_t0_r))
- MCFG_MCS48_PORT_T1_IN_CB(READLINE(xerox_820_keyboard_t, kb_t1_r))
- MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(xerox_820_keyboard_t, kb_bus_w))
+ MCFG_MCS48_PORT_P1_IN_CB(READ8(xerox_820_keyboard_device, kb_p1_r))
+ MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_p1_w))
+ MCFG_MCS48_PORT_P2_IN_CB(READ8(xerox_820_keyboard_device, kb_p2_r))
+ MCFG_MCS48_PORT_T0_IN_CB(READLINE(xerox_820_keyboard_device, kb_t0_r))
+ MCFG_MCS48_PORT_T1_IN_CB(READLINE(xerox_820_keyboard_device, kb_t1_r))
+ MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(xerox_820_keyboard_device, kb_bus_w))
MACHINE_CONFIG_END
@@ -100,7 +100,7 @@ MACHINE_CONFIG_END
// machine configurations
//-------------------------------------------------
-machine_config_constructor xerox_820_keyboard_t::device_mconfig_additions() const
+machine_config_constructor xerox_820_keyboard_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( xerox_820_keyboard );
}
@@ -235,7 +235,7 @@ INPUT_PORTS_END
// input_ports - device-specific input ports
//-------------------------------------------------
-ioport_constructor xerox_820_keyboard_t::device_input_ports() const
+ioport_constructor xerox_820_keyboard_device::device_input_ports() const
{
return INPUT_PORTS_NAME( xerox_820_keyboard );
}
@@ -247,11 +247,11 @@ ioport_constructor xerox_820_keyboard_t::device_input_ports() const
//**************************************************************************
//-------------------------------------------------
-// xerox_820_keyboard_t - constructor
+// xerox_820_keyboard_device - constructor
//-------------------------------------------------
-xerox_820_keyboard_t::xerox_820_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, XEROX_820_KEYBOARD, "Xerox 820 Keyboard", tag, owner, clock, "x820kb", __FILE__),
+xerox_820_keyboard_device::xerox_820_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, XEROX_820_KEYBOARD, tag, owner, clock),
m_maincpu(*this, I8748_TAG),
m_y(*this, "Y%u", 0),
m_kbstb_cb(*this),
@@ -265,7 +265,7 @@ xerox_820_keyboard_t::xerox_820_keyboard_t(const machine_config &mconfig, const
// device_start - device-specific startup
//-------------------------------------------------
-void xerox_820_keyboard_t::device_start()
+void xerox_820_keyboard_device::device_start()
{
// state saving
save_item(NAME(m_p1));
@@ -277,12 +277,12 @@ void xerox_820_keyboard_t::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void xerox_820_keyboard_t::device_reset()
+void xerox_820_keyboard_device::device_reset()
{
m_kbstb_cb.resolve_safe();
}
-void xerox_820_keyboard_t::device_reset_after_children()
+void xerox_820_keyboard_device::device_reset_after_children()
{
m_maincpu->set_input_line(MCS48_INPUT_IRQ, ASSERT_LINE);
}
@@ -292,7 +292,7 @@ void xerox_820_keyboard_t::device_reset_after_children()
// kb_p1_r -
//-------------------------------------------------
-READ8_MEMBER( xerox_820_keyboard_t::kb_p1_r )
+READ8_MEMBER( xerox_820_keyboard_device::kb_p1_r )
{
return m_p1; // TODO: move to mcs48.c
}
@@ -302,7 +302,7 @@ READ8_MEMBER( xerox_820_keyboard_t::kb_p1_r )
// kb_p1_w -
//-------------------------------------------------
-WRITE8_MEMBER( xerox_820_keyboard_t::kb_p1_w )
+WRITE8_MEMBER( xerox_820_keyboard_device::kb_p1_w )
{
/*
@@ -329,7 +329,7 @@ WRITE8_MEMBER( xerox_820_keyboard_t::kb_p1_w )
// kb_p2_r -
//-------------------------------------------------
-READ8_MEMBER( xerox_820_keyboard_t::kb_p2_r )
+READ8_MEMBER( xerox_820_keyboard_device::kb_p2_r )
{
return m_y[m_p1 & 0x0f]->read();
}
@@ -339,7 +339,7 @@ READ8_MEMBER( xerox_820_keyboard_t::kb_p2_r )
// kb_t0_r -
//-------------------------------------------------
-READ_LINE_MEMBER( xerox_820_keyboard_t::kb_t0_r )
+READ_LINE_MEMBER( xerox_820_keyboard_device::kb_t0_r )
{
uint8_t data = 1;
@@ -357,7 +357,7 @@ READ_LINE_MEMBER( xerox_820_keyboard_t::kb_t0_r )
// kb_t1_r -
//-------------------------------------------------
-READ_LINE_MEMBER( xerox_820_keyboard_t::kb_t1_r )
+READ_LINE_MEMBER( xerox_820_keyboard_device::kb_t1_r )
{
return 1; // ??? if 0, toggle P17
}
@@ -367,7 +367,7 @@ READ_LINE_MEMBER( xerox_820_keyboard_t::kb_t1_r )
// kb_bus_w -
//-------------------------------------------------
-WRITE8_MEMBER( xerox_820_keyboard_t::kb_bus_w )
+WRITE8_MEMBER( xerox_820_keyboard_device::kb_bus_w )
{
m_bus = data;
}
diff --git a/src/mame/machine/x820kb.h b/src/mame/machine/x820kb.h
index bca655a5faa..f7845b8c7c1 100644
--- a/src/mame/machine/x820kb.h
+++ b/src/mame/machine/x820kb.h
@@ -6,10 +6,10 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_X820KB_H
+#define MAME_MACHINE_X820KB_H
-#ifndef __XEROX_820_KEYBOARD__
-#define __XEROX_820_KEYBOARD__
+#pragma once
#include "cpu/mcs48/mcs48.h"
@@ -20,7 +20,7 @@
//**************************************************************************
#define MCFG_XEROX_820_KEYBOARD_KBSTB_CALLBACK(_devcb) \
- devcb = &xerox_820_keyboard_t::set_kbstb_wr_callback(*device, DEVCB_##_devcb);
+ devcb = &xerox_820_keyboard_device::set_kbstb_wr_callback(*device, DEVCB_##_devcb);
@@ -28,15 +28,15 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> xerox_820_keyboard_t
+// ======================> xerox_820_keyboard_device
-class xerox_820_keyboard_t : public device_t
+class xerox_820_keyboard_device : public device_t
{
public:
// construction/destruction
- xerox_820_keyboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ xerox_820_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_kbstb_wr_callback(device_t &device, _Object object) { return downcast<xerox_820_keyboard_t &>(device).m_kbstb_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_kbstb_wr_callback(device_t &device, Object &&cb) { return downcast<xerox_820_keyboard_device &>(device).m_kbstb_cb.set_callback(std::forward<Object>(cb)); }
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -70,8 +70,7 @@ private:
// device type definition
-extern const device_type XEROX_820_KEYBOARD;
-
+DECLARE_DEVICE_TYPE(XEROX_820_KEYBOARD, xerox_820_keyboard_device)
-#endif
+#endif // MAME_MACHINE_X820KB_H
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index dc4432e5b35..301620b112c 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -858,7 +858,7 @@ ADDRESS_MAP_START(xbox_base_map_io, AS_IO, 32, xbox_base_state)
#endif
ADDRESS_MAP_END
-MACHINE_CONFIG_START(xbox_base, xbox_base_state)
+MACHINE_CONFIG_START(xbox_base)
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", PENTIUM3, 733333333) /* Wrong! family 6 model 8 stepping 10 */
MCFG_CPU_PROGRAM_MAP(xbox_base_map)
diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp
index 46892b4484f..33b86730cfc 100644
--- a/src/mame/machine/xbox_pci.cpp
+++ b/src/mame/machine/xbox_pci.cpp
@@ -13,10 +13,10 @@
* Host
*/
-const device_type NV2A_HOST = device_creator<nv2a_host_device>;
+DEFINE_DEVICE_TYPE(NV2A_HOST, nv2a_host_device, "nv2a_host", "NV2A PCI Bridge Device - Host Bridge")
nv2a_host_device::nv2a_host_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_host_device(mconfig, NV2A_HOST, "PCI Bridge Device - Host Bridge", tag, owner, clock, "nv2a_host", __FILE__),
+ : pci_host_device(mconfig, NV2A_HOST, tag, owner, clock),
cpu_tag(nullptr),
cpu(nullptr)
{
@@ -59,7 +59,7 @@ void nv2a_host_device::device_reset()
* Ram
*/
-const device_type NV2A_RAM = device_creator<nv2a_ram_device>;
+DEFINE_DEVICE_TYPE(NV2A_RAM, nv2a_ram_device, "nv2a_ram", "NV2A Memory Controller - SDRAM")
DEVICE_ADDRESS_MAP_START(config_map, 32, nv2a_ram_device)
AM_RANGE(0x6c, 0x6f) AM_READWRITE(config_register_r, config_register_w)
@@ -67,7 +67,7 @@ DEVICE_ADDRESS_MAP_START(config_map, 32, nv2a_ram_device)
ADDRESS_MAP_END
nv2a_ram_device::nv2a_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, NV2A_RAM, "Memory Controller - SDRAM", tag, owner, clock, "nv2a_ram", __FILE__)
+ : pci_device(mconfig, NV2A_RAM, tag, owner, clock)
{
}
@@ -84,14 +84,14 @@ WRITE32_MEMBER(nv2a_ram_device::config_register_w)
* LPC Bus
*/
-const device_type MCPX_LPC = device_creator<mcpx_lpc_device>;
+DEFINE_DEVICE_TYPE(MCPX_LPC, mcpx_lpc_device, "mcpx_lpc", "MCPX HUB Interface - ISA Bridge")
DEVICE_ADDRESS_MAP_START(lpc_io, 32, mcpx_lpc_device)
AM_RANGE(0x00000000, 0x000000ff) AM_READWRITE(lpc_r, lpc_w)
ADDRESS_MAP_END
mcpx_lpc_device::mcpx_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_LPC, "HUB Interface - ISA Bridge", tag, owner, clock, "mcpx_lpc", __FILE__)
+ : pci_device(mconfig, MCPX_LPC, tag, owner, clock)
{
}
@@ -120,7 +120,7 @@ WRITE32_MEMBER(mcpx_lpc_device::lpc_w)
* SMBus
*/
-const device_type MCPX_SMBUS = device_creator<mcpx_smbus_device>;
+DEFINE_DEVICE_TYPE(MCPX_SMBUS, mcpx_smbus_device, "mcpx_smbus", "MCPX SMBus Controller")
DEVICE_ADDRESS_MAP_START(smbus_io0, 32, mcpx_smbus_device)
AM_RANGE(0x00000000, 0x0000000f) AM_NOP
@@ -135,7 +135,7 @@ DEVICE_ADDRESS_MAP_START(smbus_io2, 32, mcpx_smbus_device)
ADDRESS_MAP_END
mcpx_smbus_device::mcpx_smbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_SMBUS, "SMBus Controller", tag, owner, clock, "mcpx_smbus", __FILE__),
+ : pci_device(mconfig, MCPX_SMBUS, tag, owner, clock),
m_interrupt_handler(*this)
{
}
@@ -219,14 +219,14 @@ WRITE32_MEMBER(mcpx_smbus_device::smbus_w)
* OHCI USB Controller
*/
-const device_type MCPX_OHCI = device_creator<mcpx_ohci_device>;
+DEFINE_DEVICE_TYPE(MCPX_OHCI, mcpx_ohci_device, "mcpx_ohci", "MCPX OHCI USB Controller")
DEVICE_ADDRESS_MAP_START(ohci_mmio, 32, mcpx_ohci_device)
AM_RANGE(0x00000000, 0x00000fff) AM_READWRITE(ohci_r, ohci_w)
ADDRESS_MAP_END
mcpx_ohci_device::mcpx_ohci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_OHCI, "MCPX OHCI USB Controller", tag, owner, clock, "mcpx_ohci", __FILE__),
+ : pci_device(mconfig, MCPX_OHCI, tag, owner, clock),
ohci_usb(nullptr),
m_interrupt_handler(*this),
timer(nullptr)
@@ -292,7 +292,7 @@ WRITE32_MEMBER(mcpx_ohci_device::ohci_w)
* Ethernet
*/
-const device_type MCPX_ETH = device_creator<mcpx_eth_device>;
+DEFINE_DEVICE_TYPE(MCPX_ETH, mcpx_eth_device, "mcpx_eth", "MCP Networking Adapter")
DEVICE_ADDRESS_MAP_START(eth_mmio, 32, mcpx_eth_device)
AM_RANGE(0x00000000, 0x0000003ff) AM_READWRITE(eth_r, eth_w)
@@ -303,7 +303,7 @@ DEVICE_ADDRESS_MAP_START(eth_io, 32, mcpx_eth_device)
ADDRESS_MAP_END
mcpx_eth_device::mcpx_eth_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_ETH, "MCP Networking Adapter", tag, owner, clock, "mcpx_eth", __FILE__)
+ : pci_device(mconfig, MCPX_ETH, tag, owner, clock)
{
}
@@ -343,14 +343,14 @@ WRITE32_MEMBER(mcpx_eth_device::eth_io_w)
* Audio Processing Unit
*/
-const device_type MCPX_APU = device_creator<mcpx_apu_device>;
+DEFINE_DEVICE_TYPE(MCPX_APU, mcpx_apu_device, "mcpx_apu", "MCP APU")
DEVICE_ADDRESS_MAP_START(apu_mmio, 32, mcpx_apu_device)
AM_RANGE(0x00000000, 0x00007ffff) AM_READWRITE(apu_r, apu_w)
ADDRESS_MAP_END
mcpx_apu_device::mcpx_apu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_APU, "MCP APU", tag, owner, clock, "mcpx_apu", __FILE__),
+ : pci_device(mconfig, MCPX_APU, tag, owner, clock),
cpu_tag(nullptr),
cpu(nullptr)
{
@@ -536,7 +536,7 @@ WRITE32_MEMBER(mcpx_apu_device::apu_w)
* AC97 Audio Controller
*/
-const device_type MCPX_AC97_AUDIO = device_creator<mcpx_ac97_audio_device>;
+DEFINE_DEVICE_TYPE(MCPX_AC97_AUDIO, mcpx_ac97_audio_device, "mcpx_ac97_audio", "MCPX AC'97 Audio Codec Interface")
DEVICE_ADDRESS_MAP_START(ac97_mmio, 32, mcpx_ac97_audio_device)
AM_RANGE(0x00000000, 0x000000fff) AM_READWRITE(ac97_audio_r, ac97_audio_w)
@@ -551,7 +551,7 @@ DEVICE_ADDRESS_MAP_START(ac97_io1, 32, mcpx_ac97_audio_device)
ADDRESS_MAP_END
mcpx_ac97_audio_device::mcpx_ac97_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_AC97_AUDIO, "AC`97 Audio Codec Interface", tag, owner, clock, "mcpx_av97_audio", __FILE__)
+ : pci_device(mconfig, MCPX_AC97_AUDIO, tag, owner, clock)
{
}
@@ -641,10 +641,10 @@ WRITE32_MEMBER(mcpx_ac97_audio_device::ac97_audio_io1_w)
* AC97 Modem Controller
*/
-const device_type MCPX_AC97_MODEM = device_creator<mcpx_ac97_modem_device>;
+DEFINE_DEVICE_TYPE(MCPX_AC97_MODEM, mcpx_ac97_modem_device, "mcpx_ac97_modem", "MCPX AC'97 Modem Controller")
mcpx_ac97_modem_device::mcpx_ac97_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_AC97_MODEM, "AC`97 Modem Controller", tag, owner, clock, "mcpx_ac97_modem", __FILE__)
+ : pci_device(mconfig, MCPX_AC97_MODEM, tag, owner, clock)
{
}
@@ -652,7 +652,7 @@ mcpx_ac97_modem_device::mcpx_ac97_modem_device(const machine_config &mconfig, co
* IDE Controller
*/
-const device_type MCPX_IDE = device_creator<mcpx_ide_device>;
+DEFINE_DEVICE_TYPE(MCPX_IDE, mcpx_ide_device, "mcpx_ide", "MCPX IDE Controller")
DEVICE_ADDRESS_MAP_START(mcpx_ide_io, 32, mcpx_ide_device)
AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("ide", bus_master_ide_controller_device, bmdma_r, bmdma_w)
@@ -665,7 +665,7 @@ static MACHINE_CONFIG_FRAGMENT(mcpx_ide)
MACHINE_CONFIG_END
mcpx_ide_device::mcpx_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, MCPX_IDE, "MCPX IDE Controller", tag, owner, clock, "mcpx_ide", __FILE__),
+ : pci_device(mconfig, MCPX_IDE, tag, owner, clock),
m_interrupt_handler(*this)
{
}
@@ -697,10 +697,10 @@ WRITE_LINE_MEMBER(mcpx_ide_device::ide_interrupt)
* AGP Bridge
*/
-const device_type NV2A_AGP = device_creator<nv2a_agp_device>;
+DEFINE_DEVICE_TYPE(NV2A_AGP, nv2a_agp_device, "nv2a_agp", "NV2A AGP Host to PCI Bridge")
nv2a_agp_device::nv2a_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : agp_bridge_device(mconfig, NV2A_AGP, "AGP Host to PCI Bridge", tag, owner, clock, "nv2a_agp", __FILE__)
+ : agp_bridge_device(mconfig, NV2A_AGP, tag, owner, clock)
{
}
@@ -718,7 +718,7 @@ void nv2a_agp_device::device_reset()
* NV2A 3D Accelerator
*/
-const device_type NV2A_GPU = device_creator<nv2a_gpu_device>;
+DEFINE_DEVICE_TYPE(NV2A_GPU, nv2a_gpu_device, "nv2a_gpu", "NVIDIA NV2A GPU")
DEVICE_ADDRESS_MAP_START(nv2a_mmio, 32, nv2a_gpu_device)
AM_RANGE(0x00000000, 0x00ffffff) AM_RAM AM_READWRITE(geforce_r, geforce_w)
@@ -729,7 +729,7 @@ DEVICE_ADDRESS_MAP_START(nv2a_mirror, 32, nv2a_gpu_device)
ADDRESS_MAP_END
nv2a_gpu_device::nv2a_gpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pci_device(mconfig, NV2A_GPU, "Nvidia NV2A GPU", tag, owner, clock, "nv2a_gpu", __FILE__),
+ : pci_device(mconfig, NV2A_GPU, tag, owner, clock),
nvidia_nv2a(nullptr),
cpu_tag(nullptr),
m_interrupt_handler(*this),
diff --git a/src/mame/machine/xbox_usb.cpp b/src/mame/machine/xbox_usb.cpp
index 54e79008087..e8776dce19b 100644
--- a/src/mame/machine/xbox_usb.cpp
+++ b/src/mame/machine/xbox_usb.cpp
@@ -1380,16 +1380,16 @@ INPUT_PORTS_START(xbox_controller)
PORT_CODE_DEC(KEYCODE_H) PORT_CODE_INC(KEYCODE_Y)
INPUT_PORTS_END
-const USBStandardDeviceDescriptor ohci_game_controller::devdesc = { 18,1,0x110,0x00,0x00,0x00,64,0x45e,0x202,0x100,0,0,0,1 };
-const USBStandardConfigurationDescriptor ohci_game_controller::condesc = { 9,2,0x20,1,1,0,0x80,50 };
-const USBStandardInterfaceDescriptor ohci_game_controller::intdesc = { 9,4,0,0,2,0x58,0x42,0,0 };
-const USBStandardEndpointDescriptor ohci_game_controller::enddesc82 = { 7,5,0x82,3,0x20,4 };
-const USBStandardEndpointDescriptor ohci_game_controller::enddesc02 = { 7,5,0x02,3,0x20,4 };
+const USBStandardDeviceDescriptor ohci_game_controller_device::devdesc = { 18,1,0x110,0x00,0x00,0x00,64,0x45e,0x202,0x100,0,0,0,1 };
+const USBStandardConfigurationDescriptor ohci_game_controller_device::condesc = { 9,2,0x20,1,1,0,0x80,50 };
+const USBStandardInterfaceDescriptor ohci_game_controller_device::intdesc = { 9,4,0,0,2,0x58,0x42,0,0 };
+const USBStandardEndpointDescriptor ohci_game_controller_device::enddesc82 = { 7,5,0x82,3,0x20,4 };
+const USBStandardEndpointDescriptor ohci_game_controller_device::enddesc02 = { 7,5,0x02,3,0x20,4 };
-const device_type OHCI_GAME_CONTROLLER = device_creator<ohci_game_controller>;
+DEFINE_DEVICE_TYPE(OHCI_GAME_CONTROLLER, ohci_game_controller_device, "ohci_gc", "OHCI Game Controller")
-ohci_game_controller::ohci_game_controller(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, OHCI_GAME_CONTROLLER, "OHCI Game Controller", tag, owner, clock, "ohci_gc", __FILE__),
+ohci_game_controller_device::ohci_game_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, OHCI_GAME_CONTROLLER, tag, owner, clock),
ohci_function(),
m_ThumbstickLh(*this, "ThumbstickLh"),
m_ThumbstickLv(*this, "ThumbstickLv"),
@@ -1408,7 +1408,7 @@ ohci_game_controller::ohci_game_controller(const machine_config &mconfig, const
{
}
-void ohci_game_controller::initialize(running_machine &machine)
+void ohci_game_controller_device::initialize(running_machine &machine)
{
ohci_function::initialize(machine);
add_device_descriptor(devdesc);
@@ -1418,7 +1418,7 @@ void ohci_game_controller::initialize(running_machine &machine)
add_endpoint_descriptor(enddesc02);
}
-int ohci_game_controller::handle_nonstandard_request(int endpoint, USBSetupPacket *setup)
+int ohci_game_controller_device::handle_nonstandard_request(int endpoint, USBSetupPacket *setup)
{
// >=8 ==42 !=0 !=0 1,3 2<20 <=20
static const uint8_t reportinfo[16] = { 0x10,0x42 ,0x32,0x43,1 ,0x65,0x14,0x20,0x98,0xa9,0xba,0xcb,0xdc,0xed,0xfe };
@@ -1471,7 +1471,7 @@ int ohci_game_controller::handle_nonstandard_request(int endpoint, USBSetupPacke
return -1;
}
-int ohci_game_controller::handle_interrupt_pid(int endpoint, int pid, uint8_t *buffer, int size)
+int ohci_game_controller_device::handle_interrupt_pid(int endpoint, int pid, uint8_t *buffer, int size)
{
if ((endpoint == 2) && (pid == InPid)) {
int v;
@@ -1511,11 +1511,11 @@ int ohci_game_controller::handle_interrupt_pid(int endpoint, int pid, uint8_t *b
return -1;
}
-void ohci_game_controller::device_start()
+void ohci_game_controller_device::device_start()
{
}
-ioport_constructor ohci_game_controller::device_input_ports() const
+ioport_constructor ohci_game_controller_device::device_input_ports() const
{
return INPUT_PORTS_NAME(xbox_controller);
}
diff --git a/src/mame/machine/z80bin.cpp b/src/mame/machine/z80bin.cpp
index 5a683273881..6fcf9998a36 100644
--- a/src/mame/machine/z80bin.cpp
+++ b/src/mame/machine/z80bin.cpp
@@ -8,7 +8,7 @@
memory
-------------------------------------------------*/
-image_init_result z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, uint16_t *exec_addr, uint16_t *start_addr, uint16_t *end_addr )
+image_init_result z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, uint16_t *exec_addr, uint16_t *start_addr, uint16_t *end_addr)
{
int ch;
uint16_t args[3];
diff --git a/src/mame/machine/z80bin.h b/src/mame/machine/z80bin.h
index b47aa9fa76c..904b89c9325 100644
--- a/src/mame/machine/z80bin.h
+++ b/src/mame/machine/z80bin.h
@@ -8,11 +8,11 @@
*********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_Z80BIN_H
+#define MAME_MACHINE_Z80BIN_H
-#ifndef __Z80_BIN__
-#define __Z80_BIN__
+#pragma once
-image_init_result z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, uint16_t *exec_addr, uint16_t *start_addr, uint16_t *end_addr );
+image_init_result z80bin_load_file(device_image_interface *image, address_space &space, const char *file_type, uint16_t *exec_addr, uint16_t *start_addr, uint16_t *end_addr);
-#endif
+#endif // MAME_MACHINE_Z80BIN_H
diff --git a/src/mame/machine/z80ne.cpp b/src/mame/machine/z80ne.cpp
index 5b80e5b1ed4..2f1f2c9bd79 100644
--- a/src/mame/machine/z80ne.cpp
+++ b/src/mame/machine/z80ne.cpp
@@ -19,8 +19,8 @@
/* Devices */
#include "imagedev/flopdrv.h"
-#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+//#define VERBOSE 1
+#include "logmacro.h"
@@ -170,8 +170,8 @@ void z80ne_state::device_timer(emu_timer &timer, device_timer_id id, int param,
void z80ne_state::reset_lx388()
{
- m_lx388_kr2376->set_input_pin( KR2376_DSII, 0);
- m_lx388_kr2376->set_input_pin( KR2376_PII, 0);
+ m_lx388_kr2376->set_input_pin( kr2376_device::KR2376_DSII, 0);
+ m_lx388_kr2376->set_input_pin( kr2376_device::KR2376_PII, 0);
}
void z80ne_state::reset_lx382_banking()
@@ -241,7 +241,7 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
{
int i;
- LOG(("In machine_reset z80ne_base\n"));
+ LOG("In machine_reset z80ne_base\n");
for ( i=0; i<LX383_KEYS; i++)
m_lx383_key[i] = 0xf0 | i;
@@ -291,28 +291,28 @@ MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
MACHINE_RESET_MEMBER(z80ne_state,z80ne)
{
- LOG(("In machine_reset z80ne\n"));
+ LOG("In machine_reset z80ne\n");
reset_lx382_banking();
MACHINE_RESET_CALL_MEMBER( z80ne_base );
}
MACHINE_RESET_MEMBER(z80ne_state,z80net)
{
- LOG(("In machine_reset z80net\n"));
+ LOG("In machine_reset z80net\n");
MACHINE_RESET_CALL_MEMBER( z80ne );
reset_lx388();
}
MACHINE_RESET_MEMBER(z80ne_state,z80netb)
{
- LOG(("In machine_reset z80netb\n"));
+ LOG("In machine_reset z80netb\n");
MACHINE_RESET_CALL_MEMBER( z80ne_base );
reset_lx388();
}
MACHINE_RESET_MEMBER(z80ne_state,z80netf)
{
- LOG(("In machine_reset z80netf\n"));
+ LOG("In machine_reset z80netf\n");
reset_lx390_banking();
MACHINE_RESET_CALL_MEMBER( z80ne_base );
reset_lx388();
@@ -342,7 +342,7 @@ INPUT_CHANGED_MEMBER(z80ne_state::z80ne_nmi)
MACHINE_START_MEMBER(z80ne_state,z80ne)
{
- LOG(("In MACHINE_START z80ne\n"));
+ LOG("In MACHINE_START z80ne\n");
m_timer_nmi = timer_alloc(0);
m_timer_reset = timer_alloc(1);
@@ -359,19 +359,19 @@ MACHINE_START_MEMBER(z80ne_state,z80ne)
MACHINE_START_MEMBER(z80ne_state,z80net)
{
MACHINE_START_CALL_MEMBER( z80ne );
- LOG(("In MACHINE_START z80net\n"));
+ LOG("In MACHINE_START z80net\n");
}
MACHINE_START_MEMBER(z80ne_state,z80netb)
{
MACHINE_START_CALL_MEMBER( z80net );
- LOG(("In MACHINE_START z80netb\n"));
+ LOG("In MACHINE_START z80netb\n");
}
MACHINE_START_MEMBER(z80ne_state,z80netf)
{
MACHINE_START_CALL_MEMBER( z80net );
- LOG(("In MACHINE_START z80netf\n"));
+ LOG("In MACHINE_START z80netf\n");
}
/******************************************************************************
@@ -585,7 +585,7 @@ READ8_MEMBER(z80ne_state::lx388_data_r)
uint8_t data;
data = m_lx388_kr2376->data_r(space, 0) & 0x7f;
- data |= m_lx388_kr2376->get_output_pin(KR2376_SO) << 7;
+ data |= m_lx388_kr2376->get_output_pin(kr2376_device::KR2376_SO) << 7;
return data;
}
@@ -651,12 +651,12 @@ READ8_MEMBER(z80ne_state::lx390_reset_bank)
pc = m_maincpu->pc();
if((pc >= 0xf000) && (pc <=0xffff))
{
- LOG(("lx390_reset_bank, reset memory bank 1\n"));
+ LOG("lx390_reset_bank, reset memory bank 1\n");
m_bank1->set_entry(0); /* RAM at 0x0000 (bank 1) */
}
else
{
- LOG(("lx390_reset_bank, bypass because in debugger\n"));
+ LOG("lx390_reset_bank, bypass because in debugger\n");
}
return 0xff;
}
@@ -669,19 +669,19 @@ READ8_MEMBER(z80ne_state::lx390_fdc_r)
{
case 0:
d = m_wd1771->status_r(space, 0) ^ 0xff;
- LOG(("lx390_fdc_r, WD17xx status: %02x\n", d));
+ LOG("lx390_fdc_r, WD17xx status: %02x\n", d);
break;
case 1:
d = m_wd1771->track_r(space, 0) ^ 0xff;
- LOG(("lx390_fdc_r, WD17xx track: %02x\n", d));
+ LOG("lx390_fdc_r, WD17xx track: %02x\n", d);
break;
case 2:
d = m_wd1771->sector_r(space, 0) ^ 0xff;
- LOG(("lx390_fdc_r, WD17xx sector: %02x\n", d));
+ LOG("lx390_fdc_r, WD17xx sector: %02x\n", d);
break;
case 3:
d = m_wd1771->data_r(space, 0) ^ 0xff;
- LOG(("lx390_fdc_r, WD17xx data3: %02x\n", d));
+ LOG("lx390_fdc_r, WD17xx data3: %02x\n", d);
break;
case 6:
d = 0xff;
@@ -689,7 +689,7 @@ READ8_MEMBER(z80ne_state::lx390_fdc_r)
break;
case 7:
d = m_wd1771->data_r(space, 3) ^ 0xff;
- LOG(("lx390_fdc_r, WD17xx data7, force: %02x\n", d));
+ LOG("lx390_fdc_r, WD17xx data7, force: %02x\n", d);
break;
default:
d = 0x00;
@@ -705,7 +705,7 @@ WRITE8_MEMBER(z80ne_state::lx390_fdc_w)
switch(offset)
{
case 0:
- LOG(("lx390_fdc_w, WD17xx command: %02x\n", d));
+ LOG("lx390_fdc_w, WD17xx command: %02x\n", d);
m_wd1771->cmd_w(space, offset, d ^ 0xff);
if (m_wd17xx_state.drive & 1)
output().set_value("drv0", 2);
@@ -713,23 +713,23 @@ WRITE8_MEMBER(z80ne_state::lx390_fdc_w)
output().set_value("drv1", 2);
break;
case 1:
- LOG(("lx390_fdc_w, WD17xx track: %02x\n", d));
+ LOG("lx390_fdc_w, WD17xx track: %02x\n", d);
m_wd1771->track_w(space, offset, d ^ 0xff);
break;
case 2:
- LOG(("lx390_fdc_w, WD17xx sector: %02x\n", d));
+ LOG("lx390_fdc_w, WD17xx sector: %02x\n", d);
m_wd1771->sector_w(space, offset, d ^ 0xff);
break;
case 3:
m_wd1771->data_w(space, 0, d ^ 0xff);
- LOG(("lx390_fdc_w, WD17xx data3: %02x\n", d));
+ LOG("lx390_fdc_w, WD17xx data3: %02x\n", d);
break;
case 6:
- LOG(("lx390_fdc_w, motor_w: %02x\n", d));
+ LOG("lx390_fdc_w, motor_w: %02x\n", d);
lx390_motor_w(space, 0, d);
break;
case 7:
- LOG(("lx390_fdc_w, WD17xx data7, force: %02x\n", d));
+ LOG("lx390_fdc_w, WD17xx data7, force: %02x\n", d);
m_wd1771->data_w(space, 3, d ^ 0xff);
break;
}
diff --git a/src/mame/machine/znmcu.cpp b/src/mame/machine/znmcu.cpp
index 8e4d1d8ba2c..1b21d956e1b 100644
--- a/src/mame/machine/znmcu.cpp
+++ b/src/mame/machine/znmcu.cpp
@@ -3,10 +3,10 @@
#include "emu.h"
#include "znmcu.h"
-const device_type ZNMCU = device_creator<znmcu_device>;
+DEFINE_DEVICE_TYPE(ZNMCU, znmcu_device, "znmcu", "Sony ZN MCU")
znmcu_device::znmcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ZNMCU, "Sony ZN MCU", tag, owner, clock, "znmcu", __FILE__),
+ device_t(mconfig, ZNMCU, tag, owner, clock),
m_dsw_handler(*this),
m_analog1_handler(*this),
m_analog2_handler(*this),
diff --git a/src/mame/machine/znmcu.h b/src/mame/machine/znmcu.h
index b7c19c89331..2c97e21a128 100644
--- a/src/mame/machine/znmcu.h
+++ b/src/mame/machine/znmcu.h
@@ -1,12 +1,12 @@
// license:BSD-3-Clause
// copyright-holders:smf
-#pragma once
+#ifndef MAME_MACHINE_ZNMCU_H
+#define MAME_MACHINE_ZNMCU_H
-#ifndef __ZNMCU_H__
-#define __ZNMCU_H__
+#pragma once
-extern const device_type ZNMCU;
+DECLARE_DEVICE_TYPE(ZNMCU, znmcu_device)
#define MCFG_ZNMCU_DATAOUT_HANDLER(_devcb) \
devcb = &znmcu_device::set_dataout_handler(*device, DEVCB_##_devcb);
@@ -29,11 +29,11 @@ public:
znmcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration helpers
- template<class _Object> static devcb_base &set_dsw_handler(device_t &device, _Object object) { return downcast<znmcu_device &>(device).m_dsw_handler.set_callback(object); }
- template<class _Object> static devcb_base &set_analog1_handler(device_t &device, _Object object) { return downcast<znmcu_device &>(device).m_analog1_handler.set_callback(object); }
- template<class _Object> static devcb_base &set_analog2_handler(device_t &device, _Object object) { return downcast<znmcu_device &>(device).m_analog2_handler.set_callback(object); }
- template<class _Object> static devcb_base &set_dataout_handler(device_t &device, _Object object) { return downcast<znmcu_device &>(device).m_dataout_handler.set_callback(object); }
- template<class _Object> static devcb_base &set_dsr_handler(device_t &device, _Object object) { return downcast<znmcu_device &>(device).m_dsr_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_dsw_handler(device_t &device, Object &&cb) { return downcast<znmcu_device &>(device).m_dsw_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_analog1_handler(device_t &device, Object &&cb) { return downcast<znmcu_device &>(device).m_analog1_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_analog2_handler(device_t &device, Object &&cb) { return downcast<znmcu_device &>(device).m_analog2_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_dataout_handler(device_t &device, Object &&cb) { return downcast<znmcu_device &>(device).m_dataout_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_dsr_handler(device_t &device, Object &&cb) { return downcast<znmcu_device &>(device).m_dsr_handler.set_callback(std::forward<Object>(cb)); }
WRITE_LINE_MEMBER(write_select);
WRITE_LINE_MEMBER(write_clock);
@@ -60,4 +60,4 @@ private:
emu_timer *m_mcu_timer;
};
-#endif
+#endif // MAME_MACHINE_ZNMCU_H
diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp
index b0aa346a688..f552c3014e7 100644
--- a/src/mame/machine/zorbakbd.cpp
+++ b/src/mame/machine/zorbakbd.cpp
@@ -260,7 +260,7 @@ ROM_END
} // anonymous namespace
-device_type const ZORBA_KEYBOARD = device_creator<zorba_keyboard_device>;
+DEFINE_DEVICE_TYPE(ZORBA_KEYBOARD, zorba_keyboard_device, "zorba_kbd", "Zorba Keyboard")
zorba_keyboard_device::zorba_keyboard_device(
@@ -268,15 +268,7 @@ zorba_keyboard_device::zorba_keyboard_device(
char const *tag,
device_t *owner,
uint32_t clock)
- : device_t(
- mconfig,
- ZORBA_KEYBOARD,
- "Zorba Keyboard",
- tag,
- owner,
- clock,
- "zorba_kbd",
- __FILE__)
+ : device_t(mconfig, ZORBA_KEYBOARD, tag, owner, clock)
, m_rows(*this, "ROW%u", 0)
, m_beeper(*this, "beeper")
, m_rxd_cb(*this)
diff --git a/src/mame/machine/zorbakbd.h b/src/mame/machine/zorbakbd.h
index 6d03fc5a9c5..451e4102d8d 100644
--- a/src/mame/machine/zorbakbd.h
+++ b/src/mame/machine/zorbakbd.h
@@ -3,10 +3,12 @@
#ifndef MAME_MACHINE_ZORBAKBD_H
#define MAME_MACHINE_ZORBAKBD_H
+#pragma once
+
#include "sound/beep.h"
-extern device_type const ZORBA_KEYBOARD;
+DECLARE_DEVICE_TYPE(ZORBA_KEYBOARD, zorba_keyboard_device)
#define MCFG_ZORBA_KEYBOARD_RXD_CB(cb) \
zorba_keyboard_device::set_rxd_cb(*device, DEVCB_##cb);
@@ -14,8 +16,8 @@ extern device_type const ZORBA_KEYBOARD;
class zorba_keyboard_device : public device_t
{
public:
- template <typename Obj> static devcb_base &set_rxd_cb(device_t &device, Obj &&object)
- { return downcast<zorba_keyboard_device &>(device).m_rxd_cb.set_callback(std::forward<Obj>(object)); }
+ template <typename Obj> static devcb_base &set_rxd_cb(device_t &device, Obj &&cb)
+ { return downcast<zorba_keyboard_device &>(device).m_rxd_cb.set_callback(std::forward<Obj>(cb)); }
zorba_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
diff --git a/src/mame/machine/zs01.cpp b/src/mame/machine/zs01.cpp
index 57d938939d3..75a552745b6 100644
--- a/src/mame/machine/zs01.cpp
+++ b/src/mame/machine/zs01.cpp
@@ -28,10 +28,10 @@ inline void ATTR_PRINTF( 3, 4 ) zs01_device::verboselog( int n_level, const char
}
// device type definition
-const device_type ZS01 = device_creator<zs01_device>;
+DEFINE_DEVICE_TYPE(ZS01, zs01_device, "zs01", "Konami ZS01 PIC")
zs01_device::zs01_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
- : device_t( mconfig, ZS01, "Konami ZS01 PIC", tag, owner, clock, "zs01", __FILE__ ),
+ : device_t(mconfig, ZS01, tag, owner, clock),
device_nvram_interface(mconfig, *this),
m_region(*this, DEVICE_SELF),
m_cs( 0 ),
diff --git a/src/mame/machine/zs01.h b/src/mame/machine/zs01.h
index 2eb0dca8049..60611ade967 100644
--- a/src/mame/machine/zs01.h
+++ b/src/mame/machine/zs01.h
@@ -6,11 +6,11 @@
* Secure SerialFlash
*
*/
+#ifndef MAME_MACHINE_ZS01_H
+#define MAME_MACHINE_ZS01_H
#pragma once
-#ifndef __ZS01_H__
-#define __ZS01_H__
#include "machine/ds2401.h"
@@ -97,6 +97,6 @@ private:
// device type definition
-extern const device_type ZS01;
+DECLARE_DEVICE_TYPE(ZS01, zs01_device)
-#endif
+#endif // MAME_MACHINE_ZS01_H
diff --git a/src/mame/machine/zx8302.cpp b/src/mame/machine/zx8302.cpp
index e4680ef865f..5d17d2c1e19 100644
--- a/src/mame/machine/zx8302.cpp
+++ b/src/mame/machine/zx8302.cpp
@@ -19,10 +19,12 @@
*/
#include "emu.h"
-#include <time.h>
-#include "machine/microdrv.h"
#include "zx8302.h"
+#include "machine/microdrv.h"
+
+#include <time.h>
+
//**************************************************************************
@@ -41,7 +43,7 @@ static const int RTC_BASE_ADJUST = 283996800;
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ZX8302 = device_creator<zx8302_device>;
+DEFINE_DEVICE_TYPE(ZX8302, zx8302_device, "zx8302", "Sinclair ZX8302")
//**************************************************************************
// INLINE HELPERS
@@ -128,7 +130,7 @@ inline void zx8302_device::transmit_ipc_data()
//-------------------------------------------------
zx8302_device::zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ZX8302, "Sinclair ZX8302", tag, owner, clock, "zx8302", __FILE__),
+ : device_t(mconfig, ZX8302, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_rtc_clock(0),
m_out_ipl1l_cb(*this),
diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h
index 679438cfa0e..4ada67efb8c 100644
--- a/src/mame/machine/zx8302.h
+++ b/src/mame/machine/zx8302.h
@@ -29,10 +29,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_ZX8302_H
+#define MAME_MACHINE_ZX8302_H
-#ifndef __ZX8302__
-#define __ZX8302__
+#pragma once
@@ -100,20 +100,20 @@ public:
zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void set_rtc_clock(device_t &device, int rtc_clock) { downcast<zx8302_device &>(device).m_rtc_clock = rtc_clock; }
- template<class _Object> static devcb_base &set_out_ipl1l_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_ipl1l_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_baudx4_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_baudx4_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_comdata_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_comdata_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_txd1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_txd1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_txd2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_txd2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_netout_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_netout_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_mdselck_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdselck_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_mdseld_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdseld_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_mdrdw_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_mdrdw_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_erase_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_erase_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_raw1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_raw1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_in_raw1_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_in_raw1_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_raw2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_out_raw2_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_in_raw2_callback(device_t &device, _Object object) { return downcast<zx8302_device &>(device).m_in_raw2_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_ipl1l_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_ipl1l_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_baudx4_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_baudx4_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_comdata_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_comdata_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_txd1_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_txd1_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_txd2_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_txd2_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_netout_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_netout_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_mdselck_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_mdselck_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_mdseld_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_mdseld_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_mdrdw_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_mdrdw_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_erase_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_erase_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_raw1_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_raw1_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_in_raw1_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_in_raw1_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_raw2_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_out_raw2_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_in_raw2_callback(device_t &device, Object &&cb) { return downcast<zx8302_device &>(device).m_in_raw2_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( rtc_r );
DECLARE_WRITE8_MEMBER( rtc_w );
@@ -259,4 +259,4 @@ extern const device_type ZX8302;
-#endif
+#endif // MAME_MACHINE_ZX8302_H
diff --git a/src/mame/video/733_asr.cpp b/src/mame/video/733_asr.cpp
index f5fc7277af5..eb87ffe6acb 100644
--- a/src/mame/video/733_asr.cpp
+++ b/src/mame/video/733_asr.cpp
@@ -79,10 +79,10 @@ PALETTE_INIT_MEMBER(asr733_device, asr733)
}
-const device_type ASR733 = device_creator<asr733_device>;
+DEFINE_DEVICE_TYPE(ASR733, asr733_device, "asr733", "733 ASR")
asr733_device::asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ASR733, "733 ASR", tag, owner, clock, "asr733", __FILE__),
+ : device_t(mconfig, ASR733, tag, owner, clock),
device_gfx_interface(mconfig, *this, GFXDECODE_NAME(asr733), "palette"),
m_keyint_line(*this),
m_lineint_line(*this)
diff --git a/src/mame/video/733_asr.h b/src/mame/video/733_asr.h
index 4f14ededda4..567eaebe1bf 100644
--- a/src/mame/video/733_asr.h
+++ b/src/mame/video/733_asr.h
@@ -1,18 +1,22 @@
// license:GPL-2.0+
// copyright-holders:Raphael Nabet
+#ifndef MAME_VIDEO_733_ASR
+#define MAME_VIDEO_733_ASR
-#define asr733_chr_region ":gfx1"
+#pragma once
-enum
-{
- /* 8 bytes per character definition */
- asr733_single_char_len = 8,
- asr733_chr_region_len = 128*asr733_single_char_len
-};
+#define asr733_chr_region ":gfx1"
class asr733_device : public device_t, public device_gfx_interface
{
public:
+ enum
+ {
+ /* 8 bytes per character definition */
+ single_char_len = 8,
+ chr_region_len = 128*single_char_len
+ };
+
asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_PALETTE_INIT(asr733);
@@ -20,13 +24,13 @@ public:
DECLARE_READ8_MEMBER(cru_r);
DECLARE_WRITE8_MEMBER(cru_w);
- template<class _Object> static devcb_base &static_set_keyint_callback(device_t &device, _Object object)
+ template <class Object> static devcb_base &static_set_keyint_callback(device_t &device, Object &&cb)
{
- return downcast<asr733_device &>(device).m_keyint_line.set_callback(object);
+ return downcast<asr733_device &>(device).m_keyint_line.set_callback(std::forward<Object>(cb));
}
- template<class _Object> static devcb_base &static_set_lineint_callback(device_t &device, _Object object)
+ template <class Object> static devcb_base &static_set_lineint_callback(device_t &device, Object &&cb)
{
- return downcast<asr733_device &>(device).m_lineint_line.set_callback(object);
+ return downcast<asr733_device &>(device).m_lineint_line.set_callback(std::forward<Object>(cb));
}
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -76,10 +80,12 @@ private:
devcb_write_line m_lineint_line;
};
-extern const device_type ASR733;
+DECLARE_DEVICE_TYPE(ASR733, asr733_device)
#define MCFG_ASR733_KEYINT_HANDLER( _intcallb ) \
devcb = &asr733_device::static_set_keyint_callback( *device, DEVCB_##_intcallb );
#define MCFG_ASR733_LINEINT_HANDLER( _intcallb ) \
devcb = &asr733_device::static_set_lineint_callback( *device, DEVCB_##_intcallb );
+
+#endif // MAME_VIDEO_733_ASR
diff --git a/src/mame/video/911_vdt.cpp b/src/mame/video/911_vdt.cpp
index 96a6236c262..ed17d6a32a6 100644
--- a/src/mame/video/911_vdt.cpp
+++ b/src/mame/video/911_vdt.cpp
@@ -48,31 +48,31 @@ static const gfx_layout fontlayout_8bit =
static GFXDECODE_START( vdt911 )
// Caution: Array must use same order as vdt911_model_t
// US
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_US_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::US_chr_offset, fontlayout_7bit, 0, 4 )
// UK
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_UK_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::UK_chr_offset, fontlayout_7bit, 0, 4 )
// French (without accented characters)
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_US_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::US_chr_offset, fontlayout_7bit, 0, 4 )
// German
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_german_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::german_chr_offset, fontlayout_7bit, 0, 4 )
// Swedish
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_swedish_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::swedish_chr_offset, fontlayout_7bit, 0, 4 )
// Norwegian
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_norwegian_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::norwegian_chr_offset, fontlayout_7bit, 0, 4 )
// Japanese
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_japanese_chr_offset, fontlayout_8bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::japanese_chr_offset, fontlayout_8bit, 0, 4 )
// Arabic
- // GFXDECODE_ENTRY( vdt911_chr_region, vdt911_arabic_chr_offset, fontlayout_8bit, 0, 4 )
+ // GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::arabic_chr_offset, fontlayout_8bit, 0, 4 )
// FrenchWP (contains accented characters)
- GFXDECODE_ENTRY( vdt911_chr_region, vdt911_frenchWP_chr_offset, fontlayout_7bit, 0, 4 )
+ GFXDECODE_ENTRY( vdt911_chr_region, vdt911_device::frenchWP_chr_offset, fontlayout_7bit, 0, 4 )
GFXDECODE_END
static const unsigned char vdt911_colors[] =
@@ -94,13 +94,13 @@ static const unsigned short vdt911_palette[] =
Macros for model features
*/
/* TRUE for Japanese and Arabic terminals, which use 8-bit charcodes and keyboard shift modes */
-#define USES_8BIT_CHARCODES() ((m_model == vdt911_model_Japanese) /*|| (m_model == vdt911_model_Arabic)*/)
+#define USES_8BIT_CHARCODES() ((m_model == model::Japanese) /*|| (m_model == model::Arabic)*/)
/* TRUE for keyboards which have this extra key (on the left of TAB/SKIP)
(Most localized keyboards have it) */
-#define HAS_EXTRA_KEY_67() (! ((m_model == vdt911_model_US) || (m_model == vdt911_model_UK) || (m_model == vdt911_model_French)))
+#define HAS_EXTRA_KEY_67() (! ((m_model == model::US) || (m_model == model::UK) || (m_model == model::French)))
/* TRUE for keyboards which have this extra key (on the right of space),
AND do not use it as a modifier */
-#define HAS_EXTRA_KEY_91() ((m_model == vdt911_model_German) || (m_model == vdt911_model_Swedish) || (m_model == vdt911_model_Norwegian))
+#define HAS_EXTRA_KEY_91() ((m_model == model::German) || (m_model == model::Swedish) || (m_model == model::Norwegian))
/*
Initialize vdt911 palette
@@ -145,10 +145,10 @@ static void apply_char_overrides(int nb_char_overrides, const char_override_t ch
}
}
-const device_type VDT911 = device_creator<vdt911_device>;
+DEFINE_DEVICE_TYPE(VDT911, vdt911_device, "vdt911", "911 VDT")
vdt911_device::vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VDT911, "911 VDT", tag, owner, clock, "vdt911", __FILE__),
+ : device_t(mconfig, VDT911, tag, owner, clock),
device_gfx_interface(mconfig, *this, GFXDECODE_NAME(vdt911), "palette"),
m_beeper(*this, "beeper"),
m_keyint_line(*this),
@@ -191,49 +191,49 @@ void vdt911_device::device_start()
uint8_t *chr = machine().root_device().memregion(vdt911_chr_region)->base();
/* set up US character definitions */
- base = chr+vdt911_US_chr_offset;
+ base = chr+US_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
/* set up UK character definitions */
- base = chr+vdt911_UK_chr_offset;
+ base = chr+UK_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(UK_overrides)/sizeof(char_override_t), UK_overrides, base);
/* French character set is identical to US character set */
/* set up German character definitions */
- base = chr+vdt911_german_chr_offset;
+ base = chr+german_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(german_overrides)/sizeof(char_override_t), german_overrides, base);
/* set up Swedish/Finnish character definitions */
- base = chr+vdt911_swedish_chr_offset;
+ base = chr+swedish_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(swedish_overrides)/sizeof(char_override_t), swedish_overrides, base);
/* set up Norwegian/Danish character definitions */
- base = chr+vdt911_norwegian_chr_offset;
+ base = chr+norwegian_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(norwegian_overrides)/sizeof(char_override_t), norwegian_overrides, base);
/* set up French word processing character definitions */
- base = chr+vdt911_frenchWP_chr_offset;
+ base = chr+frenchWP_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(frenchWP_overrides)/sizeof(char_override_t), frenchWP_overrides, base);
/* set up Katakana Japanese character definitions */
- base = chr+vdt911_japanese_chr_offset;
+ base = chr+japanese_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(japanese_overrides)/sizeof(char_override_t), japanese_overrides, base);
- base = chr+vdt911_japanese_chr_offset+128*vdt911_single_char_len;
+ base = chr+japanese_chr_offset+128*single_char_len;
copy_character_matrix_array(char_defs+char_defs_katakana_base, base);
#if 0
/* set up Arabic character definitions */
- base = chr+vdt911_arabic_chr_offset;
+ base = chr+arabic_chr_offset;
copy_character_matrix_array(char_defs+char_defs_US_base, base);
apply_char_overrides(sizeof(arabic_overrides)/sizeof(char_override_t), arabic_overrides, base);
- base = chr+vdt911_arabic_chr_offset+128*vdt911_single_char_len;
+ base = chr+arabic_chr_offset+128*single_char_len;
copy_character_matrix_array(char_defs+char_defs_arabic_base, base);
#endif
}
@@ -241,10 +241,10 @@ void vdt911_device::device_start()
void vdt911_device::device_reset()
{
- m_model = (vdt911_model_t)ioport("LOCALE")->read();
- m_screen_size = (vdt911_screen_size_t)ioport("SCREEN")->read();
+ m_model = model(ioport("LOCALE")->read());
+ m_screen_size = screen_size(ioport("SCREEN")->read());
- if (m_screen_size == char_960)
+ if (m_screen_size == screen_size::char_960)
m_cursor_address_mask = 0x3ff; /* 1kb of RAM */
else
m_cursor_address_mask = 0x7ff; /* 2 kb of RAM */
@@ -460,8 +460,8 @@ WRITE8_MEMBER( vdt911_device::cru_w )
*/
void vdt911_device::refresh(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y)
{
- gfx_element *gfx = this->gfx(m_model);
- int height = (m_screen_size == char_960) ? 12 : /*25*/24;
+ gfx_element *gfx = this->gfx(unsigned(m_model));
+ int height = (m_screen_size == screen_size::char_960) ? 12 : /*25*/24;
int use_8bit_charcodes = USES_8BIT_CHARCODES();
int address = 0;
@@ -652,7 +652,7 @@ void vdt911_device::check_keyboard()
m_last_key_pressed = (i << 4) | j;
m_last_modifier_state = modifier_state;
- m_keyboard_data = (int)key_translate[m_model][modifier_state][m_last_key_pressed];
+ m_keyboard_data = (int)key_translate[unsigned(m_model)][modifier_state][m_last_key_pressed];
m_keyboard_data_ready = 1;
if (m_keyboard_interrupt_enable)
m_keyint_line(ASSERT_LINE);
@@ -667,7 +667,7 @@ void vdt911_device::check_keyboard()
int vdt911_device::get_refresh_rate()
{
// European models have 50 Hz
- return ((m_model == vdt911_model_US) || (m_model == vdt911_model_Japanese))? 60 : 50;
+ return ((m_model == model::US) || (m_model == model::Japanese))? 60 : 50;
}
uint32_t vdt911_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -679,20 +679,20 @@ uint32_t vdt911_device::screen_update(screen_device &screen, bitmap_ind16 &bitma
INPUT_PORTS_START( vdt911 )
PORT_START( "LOCALE" )
PORT_CONFNAME( 0x0f, 0x00, "Terminal language" )
- PORT_CONFSETTING( vdt911_model_US, "English US" )
- PORT_CONFSETTING( vdt911_model_UK, "English UK" )
- PORT_CONFSETTING( vdt911_model_French, "French" )
- PORT_CONFSETTING( vdt911_model_German, "German" )
- PORT_CONFSETTING( vdt911_model_Swedish, "Swedish" )
- PORT_CONFSETTING( vdt911_model_Norwegian, "Norwegian" )
- PORT_CONFSETTING( vdt911_model_Japanese, "Japanese" )
- // PORT_CONFSETTING( vdt911_model_Arabic, "Arabic" )
- PORT_CONFSETTING( vdt911_model_FrenchWP, "French Word Processing" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::US), "English US" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::UK), "English UK" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::French), "French" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::German), "German" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::Swedish), "Swedish" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::Norwegian), "Norwegian" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::Japanese), "Japanese" )
+ // PORT_CONFSETTING( ioport_value(vdt911_device::model::Arabic), "Arabic" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::model::FrenchWP), "French Word Processing" )
PORT_START( "SCREEN" )
- PORT_CONFNAME( 0x01, char_960, "Terminal screen size" )
- PORT_CONFSETTING( char_960, "960 chars (12 lines)")
- PORT_CONFSETTING( char_1920, "1920 chars (24 lines)")
+ PORT_CONFNAME( 0x01, ioport_value(vdt911_device::screen_size::char_960), "Terminal screen size" )
+ PORT_CONFSETTING( ioport_value(vdt911_device::screen_size::char_960), "960 chars (12 lines)")
+ PORT_CONFSETTING( ioport_value(vdt911_device::screen_size::char_1920), "1920 chars (24 lines)")
PORT_START("KEY0") /* keys 1-16 */ \
PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) \
diff --git a/src/mame/video/911_vdt.h b/src/mame/video/911_vdt.h
index ea495f12d1e..12134c330f2 100644
--- a/src/mame/video/911_vdt.h
+++ b/src/mame/video/911_vdt.h
@@ -1,42 +1,48 @@
// license:GPL-2.0+
// copyright-holders:Raphael Nabet
+#ifndef MAME_VIDEO_911_VDT_H
+#define MAME_VIDEO_911_VDT_H
+
+#pragma once
#include "sound/beep.h"
#define vdt911_chr_region ":gfx1"
-enum
-{
- /* 10 bytes per character definition */
- vdt911_single_char_len = 10,
-
- vdt911_US_chr_offset = 0,
- vdt911_UK_chr_offset = vdt911_US_chr_offset+128*vdt911_single_char_len,
- vdt911_german_chr_offset = vdt911_UK_chr_offset+128*vdt911_single_char_len,
- vdt911_swedish_chr_offset = vdt911_german_chr_offset+128*vdt911_single_char_len,
- vdt911_norwegian_chr_offset = vdt911_swedish_chr_offset+128*vdt911_single_char_len,
- vdt911_frenchWP_chr_offset = vdt911_norwegian_chr_offset+128*vdt911_single_char_len,
- vdt911_japanese_chr_offset = vdt911_frenchWP_chr_offset+128*vdt911_single_char_len,
-
- vdt911_chr_region_len = vdt911_japanese_chr_offset+256*vdt911_single_char_len
-};
-
-enum vdt911_screen_size_t { char_960 = 0, char_1920 };
-enum vdt911_model_t
-{
- vdt911_model_US = 0,
- vdt911_model_UK,
- vdt911_model_French,
- vdt911_model_German,
- vdt911_model_Swedish, // Swedish/Finnish
- vdt911_model_Norwegian, // Norwegian/Danish
- vdt911_model_Japanese, // Katakana Japanese
- /*vdt911_model_Arabic,*/ // Arabic
- vdt911_model_FrenchWP // French word processing
-};
class vdt911_device : public device_t, public device_gfx_interface
{
public:
+ enum
+ {
+ /* 10 bytes per character definition */
+ single_char_len = 10,
+
+ US_chr_offset = 0,
+ UK_chr_offset = US_chr_offset+128*single_char_len,
+ german_chr_offset = UK_chr_offset+128*single_char_len,
+ swedish_chr_offset = german_chr_offset+128*single_char_len,
+ norwegian_chr_offset = swedish_chr_offset+128*single_char_len,
+ frenchWP_chr_offset = norwegian_chr_offset+128*single_char_len,
+ japanese_chr_offset = frenchWP_chr_offset+128*single_char_len,
+
+ chr_region_len = japanese_chr_offset+256*single_char_len
+ };
+
+ enum class screen_size { char_960 = 0, char_1920 };
+
+ enum class model
+ {
+ US = 0,
+ UK,
+ French,
+ German,
+ Swedish, // Swedish/Finnish
+ Norwegian, // Norwegian/Danish
+ Japanese, // Katakana Japanese
+ /*Arabic,*/ // Arabic
+ FrenchWP // French word processing
+ };
+
vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ8_MEMBER(cru_r);
@@ -44,14 +50,14 @@ public:
DECLARE_PALETTE_INIT(vdt911);
- template<class _Object> static devcb_base &static_set_keyint_callback(device_t &device, _Object object)
+ template <class Object> static devcb_base &static_set_keyint_callback(device_t &device, Object &&cb)
{
- return downcast<vdt911_device &>(device).m_keyint_line.set_callback(object);
+ return downcast<vdt911_device &>(device).m_keyint_line.set_callback(std::forward<Object>(cb));
}
- template<class _Object> static devcb_base &static_set_lineint_callback(device_t &device, _Object object)
+ template <class Object> static devcb_base &static_set_lineint_callback(device_t &device, Object &&cb)
{
- return downcast<vdt911_device &>(device).m_lineint_line.set_callback(object);
+ return downcast<vdt911_device &>(device).m_lineint_line.set_callback(std::forward<Object>(cb));
}
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -71,8 +77,8 @@ private:
int get_refresh_rate();
void check_keyboard();
- vdt911_screen_size_t m_screen_size; // char_960 for 960-char, 12-line model; char_1920 for 1920-char, 24-line model
- vdt911_model_t m_model; // country code
+ screen_size m_screen_size; // char_960 for 960-char, 12-line model; char_1920 for 1920-char, 24-line model
+ model m_model; // country code
uint8_t m_data_reg; // dt911 write buffer
uint8_t m_display_RAM[2048]; // vdt911 char buffer (1kbyte for 960-char model, 2kbytes for 1920-char model)
@@ -106,10 +112,12 @@ private:
devcb_write_line m_lineint_line;
};
-extern const device_type VDT911;
+DECLARE_DEVICE_TYPE(VDT911, vdt911_device)
#define MCFG_VDT911_KEYINT_HANDLER( _intcallb ) \
devcb = &vdt911_device::static_set_keyint_callback( *device, DEVCB_##_intcallb );
#define MCFG_VDT911_LINEINT_HANDLER( _intcallb ) \
devcb = &vdt911_device::static_set_lineint_callback( *device, DEVCB_##_intcallb );
+
+#endif // MAME_VIDEO_911_VDT_H
diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp
index 559590ec1cc..93f37116251 100644
--- a/src/mame/video/abc1600.cpp
+++ b/src/mame/video/abc1600.cpp
@@ -44,7 +44,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type ABC1600_MOVER = device_creator<abc1600_mover_device>;
+DEFINE_DEVICE_TYPE(ABC1600_MOVER, abc1600_mover_device, "abc1600mover", "ABC 1600 Mover")
DEVICE_ADDRESS_MAP_START( vram_map, 8, abc1600_mover_device )
@@ -229,7 +229,7 @@ machine_config_constructor abc1600_mover_device::device_mconfig_additions() cons
//-------------------------------------------------
abc1600_mover_device::abc1600_mover_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ABC1600_MOVER, "ABC 1600 Mover", tag, owner, clock, "abc1600mover", __FILE__),
+ device_t(mconfig, ABC1600_MOVER, tag, owner, clock),
device_memory_interface(mconfig, *this),
m_space_config("vram", ENDIANNESS_BIG, 16, 18, -1, *ADDRESS_MAP_NAME(mover_map)),
m_crtc(*this, SY6845E_TAG),
diff --git a/src/mame/video/abc1600.h b/src/mame/video/abc1600.h
index eae56c6e1ab..3d3b0059eca 100644
--- a/src/mame/video/abc1600.h
+++ b/src/mame/video/abc1600.h
@@ -5,11 +5,11 @@
Luxor ABC 1600 Mover emulation
**********************************************************************/
+#ifndef MAME_VIDEO_ABC1600_H
+#define MAME_VIDEO_ABC1600_H
#pragma once
-#ifndef __ABC1600_MOVER__
-#define __ABC1600_MOVER__
#include "video/mc6845.h"
@@ -145,8 +145,8 @@ private:
// device type definition
-extern const device_type ABC1600_MOVER;
+DECLARE_DEVICE_TYPE(ABC1600_MOVER, abc1600_mover_device)
-#endif
+#endif // MAME_VIDEO_ABC1600_H
diff --git a/src/mame/video/agat7.cpp b/src/mame/video/agat7.cpp
index 679dea10edd..76d5c8e04b6 100644
--- a/src/mame/video/agat7.cpp
+++ b/src/mame/video/agat7.cpp
@@ -19,6 +19,7 @@
*********************************************************************/
+#include "emu.h"
#include "video/agat7.h"
#include "screen.h"
@@ -32,7 +33,7 @@
// GLOBAL VARIABLES
//**************************************************************************
-const device_type AGAT7VIDEO = device_creator<agat7video_device>;
+DEFINE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device, "agat7video", "Agat-7 Video")
MACHINE_CONFIG_FRAGMENT(agat7video)
MCFG_SCREEN_ADD("a7screen", RASTER)
@@ -63,7 +64,7 @@ machine_config_constructor agat7video_device::device_mconfig_additions() const
//**************************************************************************
agat7video_device::agat7video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, AGAT7VIDEO, "Agat-7 video", tag, owner, clock, "agat7video", __FILE__),
+ device_t(mconfig, AGAT7VIDEO, tag, owner, clock),
m_palette(*this, "a7palette")
{
}
diff --git a/src/mame/video/agat7.h b/src/mame/video/agat7.h
index 510e55e23c5..728b68e8626 100644
--- a/src/mame/video/agat7.h
+++ b/src/mame/video/agat7.h
@@ -8,10 +8,10 @@
*********************************************************************/
-#ifndef __AGAT7VIDEO__
-#define __AGAT7VIDEO__
+#ifndef MAME_VIDEO_AGAT7_H
+#define MAME_VIDEO_AGAT7_H
-#include "emu.h"
+#pragma once
#include "machine/ram.h"
@@ -20,8 +20,7 @@
// TYPE DEFINITIONS
//**************************************************************************
-class agat7video_device:
- public device_t
+class agat7video_device : public device_t
{
public:
// construction/destruction
@@ -70,6 +69,6 @@ public:
};
// device type definition
-extern const device_type AGAT7VIDEO;
+DECLARE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device)
-#endif /* __AGAT7VIDEO__ */
+#endif // MAME_VIDEO_AGAT7_H
diff --git a/src/mame/video/airraid_dev.cpp b/src/mame/video/airraid_dev.cpp
index 1b3d1b768e3..3750b5e296d 100644
--- a/src/mame/video/airraid_dev.cpp
+++ b/src/mame/video/airraid_dev.cpp
@@ -9,10 +9,10 @@
#include "emu.h"
#include "airraid_dev.h"
-const device_type AIRRAID_VIDEO = device_creator<airraid_video_device>;
+DEFINE_DEVICE_TYPE(AIRRAID_VIDEO, airraid_video_device, "airraid_vid", "Seibu Air Raid Video")
airraid_video_device::airraid_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, AIRRAID_VIDEO, "Seibu Air Raid Video", tag, owner, clock, "airraid_vid", __FILE__),
+ : device_t(mconfig, AIRRAID_VIDEO, tag, owner, clock),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "^palette"),
m_screen(*this, "screen"),
diff --git a/src/mame/video/airraid_dev.h b/src/mame/video/airraid_dev.h
index fb91af5e28c..c00a6f011bd 100644
--- a/src/mame/video/airraid_dev.h
+++ b/src/mame/video/airraid_dev.h
@@ -9,7 +9,7 @@
#include "screen.h"
-extern const device_type AIRRAID_VIDEO;
+DECLARE_DEVICE_TYPE(AIRRAID_VIDEO, airraid_video_device)
#define MCFG_AIRRAID_VIDEO_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, AIRRAID_VIDEO, 0)
diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp
index 247173d40fd..c5f4a51e819 100644
--- a/src/mame/video/antic.cpp
+++ b/src/mame/video/antic.cpp
@@ -20,40 +20,321 @@
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#define CYCLES_PER_LINE 114 /* total number of cpu cycles per scanline (incl. hblank) */
+#define CYCLES_REFRESH 9 /* number of cycles lost for ANTICs RAM refresh using DMA */
+#define CYCLES_HSTART 32 /* where does the ANTIC DMA fetch start */
+#define CYCLES_DLI_NMI 7 /* number of cycles until the CPU recognizes a DLI */
+#define CYCLES_HSYNC 104 /* where does the HSYNC position of a scanline start */
+
+#define PMOFFSET 32 /* # of pixels to adjust p/m hpos */
+
+#define VPAGE 0xf000 /* 4K page mask for video data src */
+#define VOFFS 0x0fff /* 4K offset mask for video data src */
+#define DPAGE 0xfc00 /* 1K page mask for display list */
+#define DOFFS 0x03ff /* 1K offset mask for display list */
+
+#define DLI_NMI 0x80 /* 10000000b bit mask for display list interrupt */
+#define VBL_NMI 0x40 /* 01000000b bit mask for vertical blank interrupt */
+
+#define ANTIC_DLI 0x80 /* 10000000b cmds with display list intr */
+#define ANTIC_LMS 0x40 /* 01000000b cmds with load memory scan */
+#define ANTIC_VSCR 0x20 /* 00100000b cmds with vertical scroll */
+#define ANTIC_HSCR 0x10 /* 00010000b cmds with horizontal scroll */
+#define ANTIC_MODE 0x0f /* 00001111b cmd mode mask */
+
+#define DMA_ANTIC 0x20 /* 00100000b ANTIC DMA enable */
+#define DMA_PM_DBLLINE 0x10 /* 00010000b double line player/missile */
+#define DMA_PLAYER 0x08 /* 00001000b player DMA enable */
+#define DMA_MISSILE 0x04 /* 00000100b missile DMA enable */
+
+#define OFS_MIS_SINGLE 3*256 /* offset missiles single line DMA */
+#define OFS_PL0_SINGLE 4*256 /* offset player 0 single line DMA */
+#define OFS_PL1_SINGLE 5*256 /* offset player 1 single line DMA */
+#define OFS_PL2_SINGLE 6*256 /* offset player 2 single line DMA */
+#define OFS_PL3_SINGLE 7*256 /* offset player 3 single line DMA */
+
+#define OFS_MIS_DOUBLE 3*128 /* offset missiles double line DMA */
+#define OFS_PL0_DOUBLE 4*128 /* offset player 0 double line DMA */
+#define OFS_PL1_DOUBLE 5*128 /* offset player 1 double line DMA */
+#define OFS_PL2_DOUBLE 6*128 /* offset player 2 double line DMA */
+#define OFS_PL3_DOUBLE 7*128 /* offset player 3 double line DMA */
+
+#define PFD 0x00 /* 00000000b playfield default color */
+
+#define PBK 0x00 /* 00000000b playfield background */
+#define PF0 0x01 /* 00000001b playfield color #0 */
+#define PF1 0x02 /* 00000010b playfield color #1 */
+#define PF2 0x04 /* 00000100b playfield color #2 */
+#define PF3 0x08 /* 00001000b playfield color #3 */
+#define PL0 0x11 /* 00010001b player #0 */
+#define PL1 0x12 /* 00010010b player #1 */
+#define PL2 0x14 /* 00010100b player #2 */
+#define PL3 0x18 /* 00011000b player #3 */
+#define MI0 0x21 /* 00100001b missile #0 */
+#define MI1 0x22 /* 00100010b missile #1 */
+#define MI2 0x24 /* 00100100b missile #2 */
+#define MI3 0x28 /* 00101000b missile #3 */
+#define T00 0x40 /* 01000000b text mode pixels 00 */
+#define P000 0x48 /* 01001000b player #0 pixels 00 */
+#define P100 0x4a /* 01001010b player #1 pixels 00 */
+#define P200 0x4c /* 01001100b player #2 pixels 00 */
+#define P300 0x4e /* 01001110b player #3 pixels 00 */
+#define P400 0x4f /* 01001111b missiles pixels 00 */
+#define T01 0x50 /* 01010000b text mode pixels 01 */
+#define P001 0x58 /* 01011000b player #0 pixels 01 */
+#define P101 0x5a /* 01011010b player #1 pixels 01 */
+#define P201 0x5c /* 01011100b player #2 pixels 01 */
+#define P301 0x5e /* 01011110b player #3 pixels 01 */
+#define P401 0x5f /* 01011111b missiles pixels 01 */
+#define T10 0x60 /* 01100000b text mode pixels 10 */
+#define P010 0x68 /* 01101000b player #0 pixels 10 */
+#define P110 0x6a /* 01101010b player #1 pixels 10 */
+#define P210 0x6c /* 01101100b player #2 pixels 10 */
+#define P310 0x6e /* 01101110b player #3 pixels 10 */
+#define P410 0x6f /* 01101111b missiles pixels 10 */
+#define T11 0x70 /* 01110000b text mode pixels 11 */
+#define P011 0x78 /* 01111000b player #0 pixels 11 */
+#define P111 0x7a /* 01111010b player #1 pixels 11 */
+#define P211 0x7c /* 01111100b player #2 pixels 11 */
+#define P311 0x7e /* 01111110b player #3 pixels 11 */
+#define P411 0x7f /* 01111111b missiles pixels 11 */
+#define G00 0x80 /* 10000000b hires gfx pixels 00 */
+#define G01 0x90 /* 10010000b hires gfx pixels 01 */
+#define G10 0xa0 /* 10100000b hires gfx pixels 10 */
+#define G11 0xb0 /* 10110000b hires gfx pixels 11 */
+#define GT1 0xc0 /* 11000000b gtia mode 1 */
+#define GT2 0xd0 /* 11010000b gtia mode 2 */
+#define GT3 0xe0 /* 11100000b gtia mode 3 */
+#define ILL 0xfe /* 11111110b illegal priority */
+#define EOR 0xff /* 11111111b EOR mode color */
+
+#define LUM 0x0f /* 00001111b luminance bits */
+#define HUE 0xf0 /* 11110000b hue bits */
+
+#define TRIGGER_VBLANK 64715
+#define TRIGGER_STEAL 64716
+#define TRIGGER_HSYNC 64717
+
+
+/*****************************************************************************
+ * If your memcpy does not expand too well if you use it with constant
+ * size_t field, you might want to define these macros somehow different.
+ * NOTE: dst is not necessarily uint32_t aligned (because of horz scrolling)!
+ *****************************************************************************/
+#define COPY4(dst,s1) *dst++ = s1
+#define COPY8(dst,s1,s2) *dst++ = s1; *dst++ = s2
+#define COPY16(dst,s1,s2,s3,s4) *dst++ = s1; *dst++ = s2; *dst++ = s3; *dst++ = s4
+
+#define RDANTIC(space) space.read_byte(m_dpage+m_doffs)
+#define RDVIDEO(space,o) space.read_byte(m_vpage+((m_voffs+(o))&VOFFS))
+#define RDCHGEN(space,o) space.read_byte(m_chbase+(o))
+#define RDPMGFXS(space,o) space.read_byte(m_pmbase_s+(o)+(m_scanline>>1))
+#define RDPMGFXD(space,o) space.read_byte(m_pmbase_d+(o)+m_scanline)
+
+#define PREPARE() \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]
+
+#define PREPARE_TXT2(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ { \
+ uint16_t ch = RDVIDEO(space,i) << 3; \
+ if (ch & 0x400) \
+ { \
+ ch = RDCHGEN(space,(ch & 0x3f8) + m_w.chbasl); \
+ ch = (ch ^ m_chxor) & m_chand; \
+ } \
+ else \
+ { \
+ ch = RDCHGEN(space,ch + m_w.chbasl); \
+ } \
+ video->data[i] = ch; \
+ }
+
+#define PREPARE_TXT3(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ { \
+ uint16_t ch = RDVIDEO(space,i) << 3; \
+ if (ch & 0x400) \
+ { \
+ ch &= 0x3f8; \
+ if ((ch & 0x300) == 0x300) \
+ { \
+ if (m_w.chbasl < 2) /* first two lines empty */ \
+ ch = 0x00; \
+ else /* lines 2..7 are standard, 8&9 are 0&1 */ \
+ ch = RDCHGEN(space,ch + (m_w.chbasl & 7));\
+ } \
+ else \
+ { \
+ if (m_w.chbasl > 7) /* last two lines empty */ \
+ ch = 0x00; \
+ else /* lines 0..7 are standard */ \
+ ch = RDCHGEN(space,ch + m_w.chbasl); \
+ } \
+ ch = (ch ^ m_chxor) & m_chand; \
+ } \
+ else \
+ { \
+ if ((ch & 0x300) == 0x300) \
+ { \
+ if (m_w.chbasl < 2) /* first two lines empty */ \
+ ch = 0x00; \
+ else /* lines 2..7 are standard, 8&9 are 0&1 */ \
+ ch = RDCHGEN(space,ch + (m_w.chbasl & 7));\
+ } \
+ else \
+ { \
+ if (m_w.chbasl > 7) /* last two lines empty */ \
+ ch = 0x00; \
+ else /* lines 0..7 are standard */ \
+ ch = RDCHGEN(space,ch + m_w.chbasl); \
+ } \
+ } \
+ video->data[i] = ch; \
+ }
+
+#define PREPARE_TXT45(space,width,shift) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ { \
+ uint16_t ch = RDVIDEO(space,i) << 3; \
+ ch = ((ch>>2)&0x100)|RDCHGEN(space,(ch&0x3f8)+(m_w.chbasl>>shift)); \
+ video->data[i] = ch; \
+ }
+
+
+#define PREPARE_TXT67(space,width,shift) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ { \
+ uint16_t ch = RDVIDEO(space,i) << 3; \
+ ch = (ch&0x600)|(RDCHGEN(space,(ch&0x1f8)+(m_w.chbasl>>shift))<<1); \
+ video->data[i] = ch; \
+ }
+
+#define PREPARE_GFX8(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i) << 2
+
+#define PREPARE_GFX9BC(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i) << 1
+
+#define PREPARE_GFXA(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i) << 1
+
+#define PREPARE_GFXDE(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i)
+
+#define PREPARE_GFXF(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i)
+
+#define PREPARE_GFXG1(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i)
+
+#define PREPARE_GFXG2(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i)
+
+#define PREPARE_GFXG3(space,width) \
+ uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
+ for (int i = 0; i < width; i++) \
+ video->data[i] = RDVIDEO(space,i)
+
+/******************************************************************
+ * common end of a single antic/gtia mode emulation function
+ ******************************************************************/
+#define POST() \
+ --m_modelines
+
+#define POST_GFX(width) \
+ m_steal_cycles += width; \
+ if (--m_modelines == 0) \
+ m_voffs = (m_voffs + width) & VOFFS
+
+#define POST_TXT(width) \
+ m_steal_cycles += width; \
+ if (--m_modelines == 0) \
+ m_voffs = (m_voffs + width) & VOFFS; \
+ else if (m_w.chactl & 4) \
+ m_w.chbasl--; \
+ else \
+ m_w.chbasl++
+
+/* erase a number of color clocks to background color PBK */
+#define ERASE(size) \
+ for (int i = 0; i < size; i++) \
+ { \
+ *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
+ }
+#define ZAP48() \
+ dst = (uint32_t *)&antic.cclock[PMOFFSET]; \
+ dst[ 0] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
+ dst[ 1] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
+ dst[ 2] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
+ dst[45] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
+ dst[46] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
+ dst[47] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK
+
+#define REP(FUNC, size) \
+ for (int i = 0; i < size; i++) \
+ { \
+ FUNC(i); \
+ }
+
+
+constexpr unsigned antic_device::TOTAL_LINES_60HZ;
+constexpr unsigned antic_device::TOTAL_LINES_50HZ;
+constexpr double antic_device::FRAME_RATE_50HZ;
+constexpr double antic_device::FRAME_RATE_60HZ;
+
// devices
-const device_type ATARI_ANTIC = device_creator<antic_device>;
+DEFINE_DEVICE_TYPE(ATARI_ANTIC, antic_device, "antic", "Atari ANTIC")
//-------------------------------------------------
// antic_device - constructor
//-------------------------------------------------
antic_device::antic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ATARI_ANTIC, "Atari ANTIC", tag, owner, clock, "antic", __FILE__),
- device_video_interface(mconfig, *this),
- m_gtia_tag(nullptr),
- m_maincpu(*this, ":maincpu"),
- m_djoy_b(*this, ":djoy_b"),
- m_artifacts(*this, ":artifacts"),
- m_tv_artifacts(0),
- m_render1(0),
- m_render2(0),
- m_render3(0),
- m_cmd(0),
- m_steal_cycles(0),
- m_vscrol_old(0),
- m_hscrol_old(0),
- m_modelines(0),
- m_chbase(0),
- m_chand(0),
- m_chxor(0),
- m_scanline(0),
- m_pfwidth(0),
- m_dpage(0),
- m_doffs(0),
- m_vpage(0),
- m_voffs(0),
- m_pmbase_s(0),
- m_pmbase_d(0)
+ device_t(mconfig, ATARI_ANTIC, tag, owner, clock),
+ device_video_interface(mconfig, *this),
+ m_gtia_tag(nullptr),
+ m_maincpu(*this, ":maincpu"),
+ m_djoy_b(*this, ":djoy_b"),
+ m_artifacts(*this, ":artifacts"),
+ m_tv_artifacts(0),
+ m_render1(0),
+ m_render2(0),
+ m_render3(0),
+ m_cmd(0),
+ m_steal_cycles(0),
+ m_vscrol_old(0),
+ m_hscrol_old(0),
+ m_modelines(0),
+ m_chbase(0),
+ m_chand(0),
+ m_chxor(0),
+ m_scanline(0),
+ m_pfwidth(0),
+ m_dpage(0),
+ m_doffs(0),
+ m_vpage(0),
+ m_voffs(0),
+ m_pmbase_s(0),
+ m_pmbase_d(0)
{
}
diff --git a/src/mame/video/antic.h b/src/mame/video/antic.h
index 68915e19f55..9aa7053ab03 100644
--- a/src/mame/video/antic.h
+++ b/src/mame/video/antic.h
@@ -10,360 +10,38 @@
***************************************************************************/
-#ifndef __ANTIC_H__
-#define __ANTIC_H__
-
-#include "video/gtia.h"
+#ifndef MAME_VIDEO_ANTIC_H
+#define MAME_VIDEO_ANTIC_H
+#pragma once
-#define CYCLES_PER_LINE 114 /* total number of cpu cycles per scanline (incl. hblank) */
-#define CYCLES_REFRESH 9 /* number of cycles lost for ANTICs RAM refresh using DMA */
-#define CYCLES_HSTART 32 /* where does the ANTIC DMA fetch start */
-#define CYCLES_DLI_NMI 7 /* number of cycles until the CPU recognizes a DLI */
-#define CYCLES_HSYNC 104 /* where does the HSYNC position of a scanline start */
-
-#define VBL_END 8 /* vblank ends in this scanline */
-#define VDATA_START 11 /* video display begins in this scanline */
-#define VDATA_END 244 /* video display ends in this scanline */
-#define VBL_START 248 /* vblank starts in this scanline */
-
-/* total number of lines per frame (incl. vblank) */
-#define TOTAL_LINES_60HZ 262
-#define TOTAL_LINES_50HZ 312
-
-/* frame rates */
-#define FRAME_RATE_50HZ (double)1789790/114/TOTAL_LINES_50HZ
-#define FRAME_RATE_60HZ (double)1789790/114/TOTAL_LINES_60HZ
-
-#define HWIDTH 48 /* total characters per line */
-#define HCHARS 44 /* visible characters per line */
-#define VHEIGHT 32
-#define VCHARS (VDATA_END-VDATA_START+7)/8
-#define BUF_OFFS0 (HWIDTH-HCHARS)/2
-#define MIN_X ((HWIDTH-42)/2)*8
-#define MAX_X MIN_X+42*8-1
-#define MIN_Y VDATA_START
-#define MAX_Y VDATA_END-8-1
-
-#define PMOFFSET 32 /* # of pixels to adjust p/m hpos */
-
-#define VPAGE 0xf000 /* 4K page mask for video data src */
-#define VOFFS 0x0fff /* 4K offset mask for video data src */
-#define DPAGE 0xfc00 /* 1K page mask for display list */
-#define DOFFS 0x03ff /* 1K offset mask for display list */
-
-#define DLI_NMI 0x80 /* 10000000b bit mask for display list interrupt */
-#define VBL_NMI 0x40 /* 01000000b bit mask for vertical blank interrupt */
-
-#define ANTIC_DLI 0x80 /* 10000000b cmds with display list intr */
-#define ANTIC_LMS 0x40 /* 01000000b cmds with load memory scan */
-#define ANTIC_VSCR 0x20 /* 00100000b cmds with vertical scroll */
-#define ANTIC_HSCR 0x10 /* 00010000b cmds with horizontal scroll */
-#define ANTIC_MODE 0x0f /* 00001111b cmd mode mask */
-
-#define DMA_ANTIC 0x20 /* 00100000b ANTIC DMA enable */
-#define DMA_PM_DBLLINE 0x10 /* 00010000b double line player/missile */
-#define DMA_PLAYER 0x08 /* 00001000b player DMA enable */
-#define DMA_MISSILE 0x04 /* 00000100b missile DMA enable */
-
-#define OFS_MIS_SINGLE 3*256 /* offset missiles single line DMA */
-#define OFS_PL0_SINGLE 4*256 /* offset player 0 single line DMA */
-#define OFS_PL1_SINGLE 5*256 /* offset player 1 single line DMA */
-#define OFS_PL2_SINGLE 6*256 /* offset player 2 single line DMA */
-#define OFS_PL3_SINGLE 7*256 /* offset player 3 single line DMA */
-
-#define OFS_MIS_DOUBLE 3*128 /* offset missiles double line DMA */
-#define OFS_PL0_DOUBLE 4*128 /* offset player 0 double line DMA */
-#define OFS_PL1_DOUBLE 5*128 /* offset player 1 double line DMA */
-#define OFS_PL2_DOUBLE 6*128 /* offset player 2 double line DMA */
-#define OFS_PL3_DOUBLE 7*128 /* offset player 3 double line DMA */
-
-#define PFD 0x00 /* 00000000b playfield default color */
-
-#define PBK 0x00 /* 00000000b playfield background */
-#define PF0 0x01 /* 00000001b playfield color #0 */
-#define PF1 0x02 /* 00000010b playfield color #1 */
-#define PF2 0x04 /* 00000100b playfield color #2 */
-#define PF3 0x08 /* 00001000b playfield color #3 */
-#define PL0 0x11 /* 00010001b player #0 */
-#define PL1 0x12 /* 00010010b player #1 */
-#define PL2 0x14 /* 00010100b player #2 */
-#define PL3 0x18 /* 00011000b player #3 */
-#define MI0 0x21 /* 00100001b missile #0 */
-#define MI1 0x22 /* 00100010b missile #1 */
-#define MI2 0x24 /* 00100100b missile #2 */
-#define MI3 0x28 /* 00101000b missile #3 */
-#define T00 0x40 /* 01000000b text mode pixels 00 */
-#define P000 0x48 /* 01001000b player #0 pixels 00 */
-#define P100 0x4a /* 01001010b player #1 pixels 00 */
-#define P200 0x4c /* 01001100b player #2 pixels 00 */
-#define P300 0x4e /* 01001110b player #3 pixels 00 */
-#define P400 0x4f /* 01001111b missiles pixels 00 */
-#define T01 0x50 /* 01010000b text mode pixels 01 */
-#define P001 0x58 /* 01011000b player #0 pixels 01 */
-#define P101 0x5a /* 01011010b player #1 pixels 01 */
-#define P201 0x5c /* 01011100b player #2 pixels 01 */
-#define P301 0x5e /* 01011110b player #3 pixels 01 */
-#define P401 0x5f /* 01011111b missiles pixels 01 */
-#define T10 0x60 /* 01100000b text mode pixels 10 */
-#define P010 0x68 /* 01101000b player #0 pixels 10 */
-#define P110 0x6a /* 01101010b player #1 pixels 10 */
-#define P210 0x6c /* 01101100b player #2 pixels 10 */
-#define P310 0x6e /* 01101110b player #3 pixels 10 */
-#define P410 0x6f /* 01101111b missiles pixels 10 */
-#define T11 0x70 /* 01110000b text mode pixels 11 */
-#define P011 0x78 /* 01111000b player #0 pixels 11 */
-#define P111 0x7a /* 01111010b player #1 pixels 11 */
-#define P211 0x7c /* 01111100b player #2 pixels 11 */
-#define P311 0x7e /* 01111110b player #3 pixels 11 */
-#define P411 0x7f /* 01111111b missiles pixels 11 */
-#define G00 0x80 /* 10000000b hires gfx pixels 00 */
-#define G01 0x90 /* 10010000b hires gfx pixels 01 */
-#define G10 0xa0 /* 10100000b hires gfx pixels 10 */
-#define G11 0xb0 /* 10110000b hires gfx pixels 11 */
-#define GT1 0xc0 /* 11000000b gtia mode 1 */
-#define GT2 0xd0 /* 11010000b gtia mode 2 */
-#define GT3 0xe0 /* 11100000b gtia mode 3 */
-#define ILL 0xfe /* 11111110b illegal priority */
-#define EOR 0xff /* 11111111b EOR mode color */
-
-#define LUM 0x0f /* 00001111b luminance bits */
-#define HUE 0xf0 /* 11110000b hue bits */
-
-#define TRIGGER_VBLANK 64715
-#define TRIGGER_STEAL 64716
-#define TRIGGER_HSYNC 64717
-
-
-/*****************************************************************************
- * If your memcpy does not expand too well if you use it with constant
- * size_t field, you might want to define these macros somehow different.
- * NOTE: dst is not necessarily uint32_t aligned (because of horz scrolling)!
- *****************************************************************************/
-#define COPY4(dst,s1) *dst++ = s1
-#define COPY8(dst,s1,s2) *dst++ = s1; *dst++ = s2
-#define COPY16(dst,s1,s2,s3,s4) *dst++ = s1; *dst++ = s2; *dst++ = s3; *dst++ = s4
-
-#define RDANTIC(space) space.read_byte(m_dpage+m_doffs)
-#define RDVIDEO(space,o) space.read_byte(m_vpage+((m_voffs+(o))&VOFFS))
-#define RDCHGEN(space,o) space.read_byte(m_chbase+(o))
-#define RDPMGFXS(space,o) space.read_byte(m_pmbase_s+(o)+(m_scanline>>1))
-#define RDPMGFXD(space,o) space.read_byte(m_pmbase_d+(o)+m_scanline)
-
-#define PREPARE() \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]
-
-#define PREPARE_TXT2(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- { \
- uint16_t ch = RDVIDEO(space,i) << 3; \
- if (ch & 0x400) \
- { \
- ch = RDCHGEN(space,(ch & 0x3f8) + m_w.chbasl); \
- ch = (ch ^ m_chxor) & m_chand; \
- } \
- else \
- { \
- ch = RDCHGEN(space,ch + m_w.chbasl); \
- } \
- video->data[i] = ch; \
- }
-
-#define PREPARE_TXT3(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- { \
- uint16_t ch = RDVIDEO(space,i) << 3; \
- if (ch & 0x400) \
- { \
- ch &= 0x3f8; \
- if ((ch & 0x300) == 0x300) \
- { \
- if (m_w.chbasl < 2) /* first two lines empty */ \
- ch = 0x00; \
- else /* lines 2..7 are standard, 8&9 are 0&1 */ \
- ch = RDCHGEN(space,ch + (m_w.chbasl & 7));\
- } \
- else \
- { \
- if (m_w.chbasl > 7) /* last two lines empty */ \
- ch = 0x00; \
- else /* lines 0..7 are standard */ \
- ch = RDCHGEN(space,ch + m_w.chbasl); \
- } \
- ch = (ch ^ m_chxor) & m_chand; \
- } \
- else \
- { \
- if ((ch & 0x300) == 0x300) \
- { \
- if (m_w.chbasl < 2) /* first two lines empty */ \
- ch = 0x00; \
- else /* lines 2..7 are standard, 8&9 are 0&1 */ \
- ch = RDCHGEN(space,ch + (m_w.chbasl & 7));\
- } \
- else \
- { \
- if (m_w.chbasl > 7) /* last two lines empty */ \
- ch = 0x00; \
- else /* lines 0..7 are standard */ \
- ch = RDCHGEN(space,ch + m_w.chbasl); \
- } \
- } \
- video->data[i] = ch; \
- }
-
-#define PREPARE_TXT45(space,width,shift) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- { \
- uint16_t ch = RDVIDEO(space,i) << 3; \
- ch = ((ch>>2)&0x100)|RDCHGEN(space,(ch&0x3f8)+(m_w.chbasl>>shift)); \
- video->data[i] = ch; \
- }
-
-
-#define PREPARE_TXT67(space,width,shift) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- { \
- uint16_t ch = RDVIDEO(space,i) << 3; \
- ch = (ch&0x600)|(RDCHGEN(space,(ch&0x1f8)+(m_w.chbasl>>shift))<<1); \
- video->data[i] = ch; \
- }
-
-#define PREPARE_GFX8(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i) << 2
-
-#define PREPARE_GFX9BC(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i) << 1
-
-#define PREPARE_GFXA(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i) << 1
-
-#define PREPARE_GFXDE(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i)
-
-#define PREPARE_GFXF(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i)
-
-#define PREPARE_GFXG1(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i)
-
-#define PREPARE_GFXG2(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i)
-
-#define PREPARE_GFXG3(space,width) \
- uint32_t *dst = (uint32_t *)&m_cclock[PMOFFSET]; \
- for (int i = 0; i < width; i++) \
- video->data[i] = RDVIDEO(space,i)
-
-/******************************************************************
- * common end of a single antic/gtia mode emulation function
- ******************************************************************/
-#define POST() \
- --m_modelines
-
-#define POST_GFX(width) \
- m_steal_cycles += width; \
- if (--m_modelines == 0) \
- m_voffs = (m_voffs + width) & VOFFS
-
-#define POST_TXT(width) \
- m_steal_cycles += width; \
- if (--m_modelines == 0) \
- m_voffs = (m_voffs + width) & VOFFS; \
- else if (m_w.chactl & 4) \
- m_w.chbasl--; \
- else \
- m_w.chbasl++
-
-/* erase a number of color clocks to background color PBK */
-#define ERASE(size) \
- for (int i = 0; i < size; i++) \
- { \
- *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
- }
-#define ZAP48() \
- dst = (uint32_t *)&antic.cclock[PMOFFSET]; \
- dst[ 0] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
- dst[ 1] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
- dst[ 2] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
- dst[45] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
- dst[46] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \
- dst[47] = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK
-
-#define REP(FUNC, size) \
- for (int i = 0; i < size; i++) \
- { \
- FUNC(i); \
- }
-
-
-struct ANTIC_R {
- uint8_t antic00; /* 00 nothing */
- uint8_t antic01; /* 01 nothing */
- uint8_t antic02; /* 02 nothing */
- uint8_t antic03; /* 03 nothing */
- uint8_t antic04; /* 04 nothing */
- uint8_t antic05; /* 05 nothing */
- uint8_t antic06; /* 06 nothing */
- uint8_t antic07; /* 07 nothing */
- uint8_t antic08; /* 08 nothing */
- uint8_t antic09; /* 09 nothing */
- uint8_t antic0a; /* 0a nothing */
- uint8_t vcount; /* 0b vertical (scanline) counter */
- uint8_t penh; /* 0c light pen horizontal pos */
- uint8_t penv; /* 0d light pen vertical pos */
- uint8_t antic0e; /* 0e nothing */
- uint8_t nmist; /* 0f NMI status */
-}; /* read registers */
-
-struct ANTIC_W {
- uint8_t dmactl; /* 00 write DMA control */
- uint8_t chactl; /* 01 write character control */
- uint8_t dlistl; /* 02 display list low */
- uint8_t dlisth; /* 03 display list high */
- uint8_t hscrol; /* 04 horz scroll */
- uint8_t vscrol; /* 05 vert scroll */
- uint8_t pmbasl; /* 06 player/missile base addr low */
- uint8_t pmbash; /* 07 player/missile base addr high */
- uint8_t chbasl; /* 08 character generator base addr low */
- uint8_t chbash; /* 09 character generator base addr high */
- uint8_t wsync; /* 0a wait for hsync */
- uint8_t antic0b; /* 0b nothing */
- uint8_t antic0c; /* 0c nothing */
- uint8_t antic0d; /* 0d nothing */
- uint8_t nmien; /* 0e NMI enable */
- uint8_t nmires; /* 0f NMI reset */
-}; /* write registers */
-
-/* per scanline buffer for video data (and optimization variables) */
-struct VIDEO {
- uint32_t cmd; /* antic command for this scanline */
- uint16_t data[HWIDTH]; /* graphics data buffer (text through chargen) */
-};
+#include "video/gtia.h"
-class antic_device : public device_t,
- public device_video_interface
+class antic_device : public device_t, public device_video_interface
{
+private:
+ static constexpr unsigned VBL_END = 8; // vblank ends in this scanline
+ static constexpr unsigned VDATA_START = 11; // video display begins in this scanline
+ static constexpr unsigned VDATA_END = 244; // video display ends in this scanline
+ static constexpr unsigned VBL_START = 248; // vblank starts in this scanline
+
public:
+ // total number of lines per frame (incl. vblank)
+ static constexpr unsigned TOTAL_LINES_60HZ = 262;
+ static constexpr unsigned TOTAL_LINES_50HZ = 312;
+
+ // frame rates
+ static constexpr double FRAME_RATE_50HZ = 1789790.0 / 114 / TOTAL_LINES_50HZ;
+ static constexpr double FRAME_RATE_60HZ = 1789790.0 / 114 / TOTAL_LINES_60HZ;
+
+ static constexpr unsigned HWIDTH = 48; // total characters per line
+ static constexpr unsigned VHEIGHT = 32;
+ static constexpr unsigned MIN_X = ((HWIDTH - 42) / 2) * 8;
+ static constexpr unsigned MAX_X = MIN_X + (42 * 8) - 1;
+ static constexpr unsigned MIN_Y = VDATA_START;
+ static constexpr unsigned MAX_Y = VDATA_END - 8 - 1;
+
// construction/destruction
antic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -381,10 +59,59 @@ public:
void generic_interrupt(int button_count);
private:
- static const device_timer_id TIMER_CYCLE_STEAL = 0;
- static const device_timer_id TIMER_ISSUE_DLI = 1;
- static const device_timer_id TIMER_LINE_REND = 2;
- static const device_timer_id TIMER_LINE_DONE = 3;
+ static constexpr device_timer_id TIMER_CYCLE_STEAL = 0;
+ static constexpr device_timer_id TIMER_ISSUE_DLI = 1;
+ static constexpr device_timer_id TIMER_LINE_REND = 2;
+ static constexpr device_timer_id TIMER_LINE_DONE = 3;
+
+ static constexpr unsigned HCHARS = 44; // visible characters per line
+ static constexpr unsigned VCHARS = (VDATA_END - VDATA_START + 7) / 8;
+ static constexpr unsigned BUF_OFFS0 = (HWIDTH - HCHARS) / 2;
+
+ struct ANTIC_R {
+ uint8_t antic00; /* 00 nothing */
+ uint8_t antic01; /* 01 nothing */
+ uint8_t antic02; /* 02 nothing */
+ uint8_t antic03; /* 03 nothing */
+ uint8_t antic04; /* 04 nothing */
+ uint8_t antic05; /* 05 nothing */
+ uint8_t antic06; /* 06 nothing */
+ uint8_t antic07; /* 07 nothing */
+ uint8_t antic08; /* 08 nothing */
+ uint8_t antic09; /* 09 nothing */
+ uint8_t antic0a; /* 0a nothing */
+ uint8_t vcount; /* 0b vertical (scanline) counter */
+ uint8_t penh; /* 0c light pen horizontal pos */
+ uint8_t penv; /* 0d light pen vertical pos */
+ uint8_t antic0e; /* 0e nothing */
+ uint8_t nmist; /* 0f NMI status */
+ }; /* read registers */
+
+ struct ANTIC_W {
+ uint8_t dmactl; /* 00 write DMA control */
+ uint8_t chactl; /* 01 write character control */
+ uint8_t dlistl; /* 02 display list low */
+ uint8_t dlisth; /* 03 display list high */
+ uint8_t hscrol; /* 04 horz scroll */
+ uint8_t vscrol; /* 05 vert scroll */
+ uint8_t pmbasl; /* 06 player/missile base addr low */
+ uint8_t pmbash; /* 07 player/missile base addr high */
+ uint8_t chbasl; /* 08 character generator base addr low */
+ uint8_t chbash; /* 09 character generator base addr high */
+ uint8_t wsync; /* 0a wait for hsync */
+ uint8_t antic0b; /* 0b nothing */
+ uint8_t antic0c; /* 0c nothing */
+ uint8_t antic0d; /* 0d nothing */
+ uint8_t nmien; /* 0e NMI enable */
+ uint8_t nmires; /* 0f NMI reset */
+ }; /* write registers */
+
+ /* per scanline buffer for video data (and optimization variables) */
+ struct VIDEO {
+ uint32_t cmd; /* antic command for this scanline */
+ uint16_t data[HWIDTH]; /* graphics data buffer (text through chargen) */
+ };
+
const char *m_gtia_tag;
gtia_device *m_gtia;
@@ -480,12 +207,27 @@ private:
// device type definition
-extern const device_type ATARI_ANTIC;
+DECLARE_DEVICE_TYPE(ATARI_ANTIC, antic_device)
#define MCFG_ANTIC_GTIA(_tag) \
- antic_device::set_gtia_tag(*device, _tag);
+ antic_device::set_gtia_tag(*device, _tag);
+
+#define MCFG_SCREEN_VISIBLE_AREA_ANTIC() \
+ MCFG_SCREEN_VISIBLE_AREA(antic_device::MIN_X, antic_device::MAX_X, antic_device::MIN_Y, antic_device::MAX_Y)
+
+#define MCFG_SCREEN_REFRESH_RATE_ANTIC_50HZ() \
+ MCFG_SCREEN_REFRESH_RATE(antic_device::FRAME_RATE_50HZ)
+
+#define MCFG_SCREEN_REFRESH_RATE_ANTIC_60HZ() \
+ MCFG_SCREEN_REFRESH_RATE(antic_device::FRAME_RATE_60HZ)
+
+#define MCFG_SCREEN_SIZE_ANTIC_50HZ() \
+ MCFG_SCREEN_SIZE(antic_device::HWIDTH * 8, antic_device::TOTAL_LINES_50HZ)
+
+#define MCFG_SCREEN_SIZE_ANTIC_60HZ() \
+ MCFG_SCREEN_SIZE(antic_device::HWIDTH * 8, antic_device::TOTAL_LINES_60HZ)
-#endif /* __GTIA_H__ */
+#endif // MAME_VIDEO_ANTIC_H
diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp
index 9f1e9f9d59b..a87c625530d 100644
--- a/src/mame/video/apollo.cpp
+++ b/src/mame/video/apollo.cpp
@@ -1720,17 +1720,17 @@ MACHINE_CONFIG_FRAGMENT( apollo_graphics )
MCFG_SCREEN_UPDATE_DEVICE(APOLLO_SCREEN_TAG, apollo_graphics_15i, screen_update)
MACHINE_CONFIG_END
-const device_type APOLLO_GRAPHICS = device_creator<apollo_graphics_15i> ;
+DEFINE_DEVICE_TYPE(APOLLO_GRAPHICS, apollo_graphics_15i, "apollo_graphics_15i", "Apollo Screen")
apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, APOLLO_GRAPHICS, "Apollo Screen", tag, owner, clock,"apollo_graphics_15i", __FILE__),
+ device_t(mconfig, APOLLO_GRAPHICS, tag, owner, clock),
m_lut_fifo(nullptr),
m_bt458(nullptr)
{
}
-apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, uint32_t clock, device_type type,const char *name, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+apollo_graphics_15i::apollo_graphics_15i(const machine_config &mconfig,const char *tag, device_t *owner, uint32_t clock, device_type type) :
+ device_t(mconfig, type, tag, owner, clock),
m_lut_fifo(nullptr),
m_bt458(nullptr)
{
@@ -1891,12 +1891,10 @@ MACHINE_CONFIG_FRAGMENT( apollo_mono19i )
MCFG_SCREEN_UPDATE_DEVICE(APOLLO_SCREEN_TAG, apollo_graphics_19i, screen_update)
MACHINE_CONFIG_END
-const device_type APOLLO_MONO19I = device_creator<apollo_graphics_19i> ;
+DEFINE_DEVICE_TYPE(APOLLO_MONO19I, apollo_graphics_19i, "apollo_graphics_19i", "Apollo 19\" Monochrome Screen")
-apollo_graphics_19i::apollo_graphics_19i(const machine_config &mconfig,
- const char *tag, device_t *owner, uint32_t clock) :
- apollo_graphics_15i(mconfig, tag, owner, clock, APOLLO_MONO19I,
- "Apollo 19\" Monochrome Screen", "apollo_graphics_19i", __FILE__)
+apollo_graphics_19i::apollo_graphics_19i(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ apollo_graphics_15i(mconfig, tag, owner, clock, APOLLO_MONO19I)
{
}
diff --git a/src/mame/video/apple2.cpp b/src/mame/video/apple2.cpp
index 9747cee634e..19d07343d00 100644
--- a/src/mame/video/apple2.cpp
+++ b/src/mame/video/apple2.cpp
@@ -668,14 +668,14 @@ uint32_t apple2_state::screen_update_apple2(screen_device &screen, bitmap_ind16
New implementation
*/
-const device_type APPLE2_VIDEO = device_creator<a2_video_device>;
+DEFINE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device, "a2video", "Apple II video")
//-------------------------------------------------
// a2_video_device - constructor
//-------------------------------------------------
a2_video_device::a2_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, APPLE2_VIDEO, "Apple II video", tag, owner, clock, "a2video", __FILE__)
+ : device_t(mconfig, APPLE2_VIDEO, tag, owner, clock)
{
}
diff --git a/src/mame/video/apple2.h b/src/mame/video/apple2.h
index e3daa888210..b9bc4b5f44f 100644
--- a/src/mame/video/apple2.h
+++ b/src/mame/video/apple2.h
@@ -58,6 +58,6 @@ private:
};
// device type definition
-extern const device_type APPLE2_VIDEO;
+DECLARE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device)
#endif // MAME_VIDEO_APPLE2_H
diff --git a/src/mame/video/asterix.cpp b/src/mame/video/asterix.cpp
index 50726b4dd8a..77f904e3853 100644
--- a/src/mame/video/asterix.cpp
+++ b/src/mame/video/asterix.cpp
@@ -45,7 +45,7 @@ K056832_CB_MEMBER(asterix_state::tile_callback)
uint32_t asterix_state::screen_update_asterix(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- static const int K053251_CI[4] = { K053251_CI0, K053251_CI2, K053251_CI3, K053251_CI4 };
+ static const int K053251_CI[4] = { k053251_device::CI0, k053251_device::CI2, k053251_device::CI3, k053251_device::CI4 };
int layer[3], plane, new_colorbase;
/* Layer offsets are different if horizontally flipped */
@@ -71,7 +71,7 @@ uint32_t asterix_state::screen_update_asterix(screen_device &screen, bitmap_ind1
m_tilebanks[3] = (m_k056832->get_lookup(3) << 10);
// update color info and refresh tilemaps
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
for (plane = 0; plane < 4; plane++)
{
@@ -84,11 +84,11 @@ uint32_t asterix_state::screen_update_asterix(screen_device &screen, bitmap_ind1
}
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI0);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI0);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI2);
layer[2] = 3;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI4);
konami_sortlayers3(layer, m_layerpri);
diff --git a/src/mame/video/atarimo.cpp b/src/mame/video/atarimo.cpp
index e16b5499567..1100d646b82 100644
--- a/src/mame/video/atarimo.cpp
+++ b/src/mame/video/atarimo.cpp
@@ -118,14 +118,14 @@ inline int atari_motion_objects_device::round_to_powerof2(int value)
//**************************************************************************
// device type definition
-const device_type ATARI_MOTION_OBJECTS = device_creator<atari_motion_objects_device>;
+DEFINE_DEVICE_TYPE(ATARI_MOTION_OBJECTS, atari_motion_objects_device, "atarimo", "Atari Motion Objects")
//-------------------------------------------------
// atari_motion_objects_device - constructor
//-------------------------------------------------
atari_motion_objects_device::atari_motion_objects_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sprite16_device_ind16(mconfig, ATARI_MOTION_OBJECTS, "Atari Motion Objects", tag, owner, "atarimo", __FILE__)
+ : sprite16_device_ind16(mconfig, ATARI_MOTION_OBJECTS, tag, owner)
, device_video_interface(mconfig, *this)
, m_tilewidth(0)
, m_tileheight(0)
diff --git a/src/mame/video/atarimo.h b/src/mame/video/atarimo.h
index 618646fb852..0631b7a69fa 100644
--- a/src/mame/video/atarimo.h
+++ b/src/mame/video/atarimo.h
@@ -8,8 +8,8 @@
***************************************************************************/
-#ifndef __ATARIMO__
-#define __ATARIMO__
+#ifndef MAME_VIDEO_ATARIMO_H
+#define MAME_VIDEO_ATARIMO_H
#include "video/sprite.h"
@@ -73,7 +73,7 @@ struct atari_motion_objects_config
// ======================> atari_motion_objects_device
// device type definition
-extern const device_type ATARI_MOTION_OBJECTS;
+DECLARE_DEVICE_TYPE(ATARI_MOTION_OBJECTS, atari_motion_objects_device)
class atari_motion_objects_device : public sprite16_device_ind16,
public device_video_interface,
@@ -225,4 +225,4 @@ private:
};
-#endif
+#endif // MAME_VIDEO_ATARIMO_H
diff --git a/src/mame/video/atarirle.cpp b/src/mame/video/atarirle.cpp
index d3e41edff56..c006f2ad814 100644
--- a/src/mame/video/atarirle.cpp
+++ b/src/mame/video/atarirle.cpp
@@ -29,7 +29,7 @@
// CONSTANTS
//**************************************************************************
-const device_type ATARI_RLE_OBJECTS = device_creator<atari_rle_objects_device>;
+DEFINE_DEVICE_TYPE(ATARI_RLE_OBJECTS, atari_rle_objects_device, "atari_rle", "Atari RLE Motion Objects")
enum { atarirle_hilite_index = -1 };
@@ -68,7 +68,7 @@ inline int atari_rle_objects_device::round_to_powerof2(int value)
//-------------------------------------------------
atari_rle_objects_device::atari_rle_objects_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ATARI_RLE_OBJECTS, "Atari RLE Motion Objects", tag, owner, clock, "atari_rle", __FILE__),
+ : device_t(mconfig, ATARI_RLE_OBJECTS, tag, owner, clock),
device_video_interface(mconfig, *this),
m_rombase(*this, DEVICE_SELF)
{
diff --git a/src/mame/video/atarirle.h b/src/mame/video/atarirle.h
index ce59c841862..3bd70986705 100644
--- a/src/mame/video/atarirle.h
+++ b/src/mame/video/atarirle.h
@@ -9,8 +9,8 @@
***************************************************************************/
-#ifndef __ATARIRLE__
-#define __ATARIRLE__
+#ifndef MAME_VIDEO_ATARIRLE_H
+#define MAME_VIDEO_ATARIRLE_H
//**************************************************************************
@@ -70,7 +70,7 @@ struct atari_rle_objects_config
// ======================> atari_rle_objects_device
// device type definition
-extern const device_type ATARI_RLE_OBJECTS;
+DECLARE_DEVICE_TYPE(ATARI_RLE_OBJECTS, atari_rle_objects_device)
class atari_rle_objects_device : public device_t,
public device_video_interface,
@@ -179,6 +179,4 @@ private:
uint16_t m_rle_table_data[0x500];
};
-
-
-#endif
+#endif // MAME_VIDEO_ATARIRLE_H
diff --git a/src/mame/video/avgdvg.cpp b/src/mame/video/avgdvg.cpp
index 99ef35ae8a5..0786b1d61ff 100644
--- a/src/mame/video/avgdvg.cpp
+++ b/src/mame/video/avgdvg.cpp
@@ -233,7 +233,7 @@ void dvg_device::dvg_draw_to(int x, int y, int intensity)
if (((x | y) & 0x400) == 0)
vg_add_point_buf((xmin + x - 512) << 16,
(ymin + 512 - y) << 16,
- VECTOR_COLOR111(7), intensity << 4);
+ vector_device::color111(7), intensity << 4);
}
int dvg_device::handler_2() //dvg_gostrobe
@@ -674,7 +674,7 @@ int avg_device::handler_7() // avg_strobe3
if ((m_op & 5) == 0)
{
- vg_add_point_buf(m_xpos, m_ypos, VECTOR_COLOR111(m_color),
+ vg_add_point_buf(m_xpos, m_ypos, vector_device::color111(m_color),
(((m_int_latch >> 1) == 1)? m_intensity: m_int_latch & 0xe) << 4);
}
@@ -947,7 +947,7 @@ int avg_starwars_device::handler_7() // starwars_strobe3
if ((m_op & 5) == 0)
{
- vg_add_point_buf(m_xpos, m_ypos, VECTOR_COLOR111(m_color),
+ vg_add_point_buf(m_xpos, m_ypos, vector_device::color111(m_color),
((m_int_latch >> 1) * m_intensity) >> 3);
}
@@ -1187,7 +1187,7 @@ int avg_bzone_device::handler_7() // bzone_strobe3
if ((m_op & 5) == 0)
{
- vg_add_point_buf(m_xpos, m_ypos, VECTOR_COLOR111(7),
+ vg_add_point_buf(m_xpos, m_ypos, vector_device::color111(7),
(((m_int_latch >> 1) == 1)? m_intensity: m_int_latch & 0xe) << 4);
}
@@ -1219,7 +1219,7 @@ int avg_tomcat_device::handler_7() // starwars_strobe3
if ((m_op & 5) == 0)
{
- vg_add_point_buf(m_xpos, m_ypos, VECTOR_COLOR111(m_color),
+ vg_add_point_buf(m_xpos, m_ypos, vector_device::color111(m_color),
((m_int_latch >> 1) * m_intensity) >> 3);
}
@@ -1467,8 +1467,8 @@ void avgdvg_device::static_set_vector_tag(device_t &device, const char *tag)
downcast<avgdvg_device &>(device).m_vector.set_tag(tag);
}
-avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, m_vector(*this, finder_base::DUMMY_TAG)
{
m_pc = 0;
@@ -1524,55 +1524,55 @@ avgdvg_device::avgdvg_device(const machine_config &mconfig, device_type type, co
}
dvg_device::dvg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avgdvg_device(mconfig, DVG, "Atari DVG", tag, owner, clock, "dvg", __FILE__)
+ avgdvg_device(mconfig, DVG, tag, owner, clock)
{
}
avg_device::avg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avgdvg_device(mconfig, AVG, "Atari AVG", tag, owner, clock, "avg", __FILE__)
+ avg_device(mconfig, AVG, tag, owner, clock)
{
}
-avg_device::avg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- avgdvg_device(mconfig, type, name, tag, owner, clock, shortname, source)
+avg_device::avg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ avgdvg_device(mconfig, type, tag, owner, clock)
{
}
avg_tempest_device::avg_tempest_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avg_device(mconfig, AVG_TEMPEST, "Atari AVG (Tempest)", tag, owner, clock, "avg_tempest", __FILE__)
+ avg_device(mconfig, AVG_TEMPEST, tag, owner, clock)
{
}
avg_mhavoc_device::avg_mhavoc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avg_device(mconfig, AVG_MHAVOC, "Atari AVG (Major Havoc)", tag, owner, clock, "avg_mhavoc", __FILE__)
+ avg_device(mconfig, AVG_MHAVOC, tag, owner, clock)
{
}
avg_starwars_device::avg_starwars_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avg_device(mconfig, AVG_STARWARS, "Atari AVG (Star Wars)", tag, owner, clock, "avg_starwars", __FILE__)
+ avg_device(mconfig, AVG_STARWARS, tag, owner, clock)
{
}
avg_quantum_device::avg_quantum_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avg_device(mconfig, AVG_QUANTUM, "Atari AVG (Quantum)", tag, owner, clock, "avg_quantum", __FILE__)
+ avg_device(mconfig, AVG_QUANTUM, tag, owner, clock)
{
}
avg_bzone_device::avg_bzone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avg_device(mconfig, AVG_BZONE, "Atari AVG (Battle Zone)", tag, owner, clock, "avg_bzone", __FILE__)
+ avg_device(mconfig, AVG_BZONE, tag, owner, clock)
{
}
avg_tomcat_device::avg_tomcat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- avg_device(mconfig, AVG_TOMCAT, "Atari AVG (TomCat)", tag, owner, clock, "avg_tomcat", __FILE__)
+ avg_device(mconfig, AVG_TOMCAT, tag, owner, clock)
{
}
-const device_type DVG = device_creator<dvg_device>;
-const device_type AVG = device_creator<avg_device>;
-const device_type AVG_TEMPEST = device_creator<avg_tempest_device>;
-const device_type AVG_MHAVOC = device_creator<avg_mhavoc_device>;
-const device_type AVG_STARWARS = device_creator<avg_starwars_device>;
-const device_type AVG_QUANTUM = device_creator<avg_quantum_device>;
-const device_type AVG_BZONE = device_creator<avg_bzone_device>;
-const device_type AVG_TOMCAT = device_creator<avg_tomcat_device>;
+DEFINE_DEVICE_TYPE(DVG, dvg_device, "dvg", "Atari DVG")
+DEFINE_DEVICE_TYPE(AVG, avg_device, "avg", "Atari AVG")
+DEFINE_DEVICE_TYPE(AVG_TEMPEST, avg_tempest_device, "avg_tempest", "Atari AVG (Tempest)")
+DEFINE_DEVICE_TYPE(AVG_MHAVOC, avg_mhavoc_device, "avg_mhavoc", "Atari AVG (Major Havoc)")
+DEFINE_DEVICE_TYPE(AVG_STARWARS, avg_starwars_device, "avg_starwars", "Atari AVG (Star Wars)")
+DEFINE_DEVICE_TYPE(AVG_QUANTUM, avg_quantum_device, "avg_quantum", "Atari AVG (Quantum)")
+DEFINE_DEVICE_TYPE(AVG_BZONE, avg_bzone_device, "avg_bzone", "Atari AVG (Battle Zone)")
+DEFINE_DEVICE_TYPE(AVG_TOMCAT, avg_tomcat_device, "avg_tomcat", "Atari AVG (TomCat)")
diff --git a/src/mame/video/avgdvg.h b/src/mame/video/avgdvg.h
index 157c8c69fd4..113d7633032 100644
--- a/src/mame/video/avgdvg.h
+++ b/src/mame/video/avgdvg.h
@@ -1,33 +1,21 @@
// license:BSD-3-Clause
// copyright-holders:Mathis Rosenhauer
// thanks-to:Eric Smith, Brad Oliver, Bernd Wiebelt, Aaron Giles, Andrew Caldwell
-#ifndef __AVGDVG__
-#define __AVGDVG__
+#ifndef MAME_VIDEO_AVGDVG_H
+#define MAME_VIDEO_AVGDVG_H
-#define MAXVECT (10000)
+#pragma once
#include "video/vector.h"
#define MCFG_AVGDVG_VECTOR(_tag) \
avgdvg_device::static_set_vector_tag(*device, "^" _tag);
-struct vgvector
-{
- int x; int y;
- rgb_t color;
- int intensity;
- int arg1; int arg2;
- int status;
-};
-
// ======================> avgdvg_device
class avgdvg_device : public device_t
{
public:
- // construction/destruction
- avgdvg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
static void static_set_vector_tag(device_t &device, const char *tag);
DECLARE_CUSTOM_INPUT_MEMBER(done_r);
@@ -44,6 +32,20 @@ public:
TIMER_CALLBACK_MEMBER(vg_set_halt_callback);
TIMER_CALLBACK_MEMBER(run_state_machine);
protected:
+ static constexpr unsigned MAXVECT = 10000;
+
+ struct vgvector
+ {
+ int x; int y;
+ rgb_t color;
+ int intensity;
+ int arg1; int arg2;
+ int status;
+ };
+
+ // construction/destruction
+ avgdvg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
void apply_flipping(int *x, int *y);
void vg_set_halt(int dummy);
@@ -132,6 +134,7 @@ public:
void dvg_draw_to(int x, int y, int intensity);
+protected:
virtual int handler_0() override;
virtual int handler_1() override;
virtual int handler_2() override;
@@ -149,19 +152,21 @@ public:
};
// device type definition
-extern const device_type DVG;
+DECLARE_DEVICE_TYPE(DVG, dvg_device)
class avg_device : public avgdvg_device
{
public:
// construction/destruction
avg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- avg_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
int avg_common_strobe1();
int avg_common_strobe2();
int avg_common_strobe3();
+protected:
+ avg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
virtual int handler_0() override;
virtual int handler_1() override;
virtual int handler_2() override;
@@ -179,7 +184,7 @@ public:
};
// device type definition
-extern const device_type AVG;
+DECLARE_DEVICE_TYPE(AVG, avg_device)
class avg_tempest_device : public avg_device
{
@@ -187,13 +192,14 @@ public:
// construction/destruction
avg_tempest_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+protected:
virtual int handler_6() override;
virtual int handler_7() override;
//virtual void vggo();
};
// device type definition
-extern const device_type AVG_TEMPEST;
+DECLARE_DEVICE_TYPE(AVG_TEMPEST, avg_tempest_device)
class avg_mhavoc_device : public avg_device
{
@@ -201,6 +207,7 @@ public:
// construction/destruction
avg_mhavoc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+protected:
virtual int handler_1() override;
virtual int handler_6() override;
virtual int handler_7() override;
@@ -209,26 +216,30 @@ public:
};
// device type definition
-extern const device_type AVG_MHAVOC;
+DECLARE_DEVICE_TYPE(AVG_MHAVOC, avg_mhavoc_device)
class avg_starwars_device : public avg_device
{
public:
// construction/destruction
avg_starwars_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
virtual int handler_6() override;
virtual int handler_7() override;
virtual void update_databus() override;
};
// device type definition
-extern const device_type AVG_STARWARS;
+DECLARE_DEVICE_TYPE(AVG_STARWARS, avg_starwars_device)
class avg_quantum_device : public avg_device
{
public:
// construction/destruction
avg_quantum_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
virtual int handler_0() override;
virtual int handler_1() override;
virtual int handler_2() override;
@@ -242,20 +253,22 @@ public:
};
// device type definition
-extern const device_type AVG_QUANTUM;
+DECLARE_DEVICE_TYPE(AVG_QUANTUM, avg_quantum_device)
class avg_bzone_device : public avg_device
{
public:
// construction/destruction
avg_bzone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
virtual int handler_1() override;
virtual int handler_6() override;
virtual int handler_7() override;
};
// device type definition
-extern const device_type AVG_BZONE;
+DECLARE_DEVICE_TYPE(AVG_BZONE, avg_bzone_device)
class avg_tomcat_device : public avg_device
{
@@ -263,12 +276,13 @@ public:
// construction/destruction
avg_tomcat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+protected:
virtual int handler_6() override;
virtual int handler_7() override;
};
// device type definition
-extern const device_type AVG_TOMCAT;
+DECLARE_DEVICE_TYPE(AVG_TOMCAT, avg_tomcat_device)
-#endif
+#endif // MAME_VIDEO_AVGDVG_H
diff --git a/src/mame/video/aztarac.cpp b/src/mame/video/aztarac.cpp
index 95a6899f241..f6c1558d71a 100644
--- a/src/mame/video/aztarac.cpp
+++ b/src/mame/video/aztarac.cpp
@@ -52,7 +52,7 @@ WRITE16_MEMBER(aztarac_state::ubr_w)
{
/* latch color only once */
intensity = (c >> 8);
- color = VECTOR_COLOR222(c & 0x3f);
+ color = vector_device::color222(c & 0x3f);
while (ndefs--)
{
defaddr++;
@@ -70,7 +70,7 @@ WRITE16_MEMBER(aztarac_state::ubr_w)
{
defaddr++;
read_vectorram(m_vectorram, defaddr, &x, &y, &c);
- color = VECTOR_COLOR222(c & 0x3f);
+ color = vector_device::color222(c & 0x3f);
AVECTOR (x + xoffset, y + yoffset, color, c >> 8);
}
}
diff --git a/src/mame/video/bfm_adr2.cpp b/src/mame/video/bfm_adr2.cpp
index ca941ef9781..092aadd0c18 100644
--- a/src/mame/video/bfm_adr2.cpp
+++ b/src/mame/video/bfm_adr2.cpp
@@ -137,12 +137,12 @@ static GFXDECODE_START( adder2 )
GFXDECODE_ENTRY( ":gfx1", 0, charlayout, 0, 16 )
GFXDECODE_END
-const device_type BFM_ADDER2 = device_creator<bfm_adder2_device>;
+DEFINE_DEVICE_TYPE(BFM_ADDER2, bfm_adder2_device, "bfm_adder2", "BFM ADDER2")
bfm_adder2_device::bfm_adder2_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
- : device_t(mconfig, BFM_ADDER2, "BFM ADDER2", tag, owner, clock, "bfm_adder2", __FILE__),
- device_gfx_interface(mconfig, *this, GFXDECODE_NAME(adder2), "palette"),
- m_cpu(*this, "adder2")
+ : device_t(mconfig, BFM_ADDER2, tag, owner, clock)
+ , device_gfx_interface(mconfig, *this, GFXDECODE_NAME(adder2), "palette")
+ , m_cpu(*this, "adder2")
{
}
diff --git a/src/mame/video/bfm_adr2.h b/src/mame/video/bfm_adr2.h
index c459231b241..02f95e69772 100644
--- a/src/mame/video/bfm_adr2.h
+++ b/src/mame/video/bfm_adr2.h
@@ -1,7 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#ifndef INC_BFMADDER2
-#define INC_BFMADDER2
+#ifndef MAME_INCLUDES_BFM_ADR2_H
+#define MAME_INCLUDES_BFM_ADR2_H
+
+#pragma once
+
class bfm_adder2_device : public device_t, public device_gfx_interface
{
@@ -64,7 +67,7 @@ private:
};
// device type definition
-extern const device_type BFM_ADDER2;
+DECLARE_DEVICE_TYPE(BFM_ADDER2, bfm_adder2_device)
//**************************************************************************
@@ -74,4 +77,4 @@ extern const device_type BFM_ADDER2;
#define MCFG_BFM_ADDER2_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, BFM_ADDER2, 0)
-#endif
+#endif // MAME_INCLUDES_BFM_ADR2_H
diff --git a/src/mame/video/bfm_dm01.cpp b/src/mame/video/bfm_dm01.cpp
index 3077451f046..c82a3b59cb1 100644
--- a/src/mame/video/bfm_dm01.cpp
+++ b/src/mame/video/bfm_dm01.cpp
@@ -51,11 +51,11 @@ Standard dm01 memorymap
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type BF_DM01 = device_creator<bfmdm01_device>;
+DEFINE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device, "bfm_dm01", "BFM Dotmatrix 01")
-bfmdm01_device::bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, BF_DM01, "BFM Dotmatrix 01", tag, owner, clock, "bfm_dm01", __FILE__),
+bfm_dm01_device::bfm_dm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, BFM_DM01, tag, owner, clock),
m_matrixcpu(*this, "matrix"),
m_screen(*this, "dmd"),
m_palette(*this, "palette_lcd"),
@@ -77,7 +77,7 @@ bfmdm01_device::bfmdm01_device(const machine_config &mconfig, const char *tag, d
// device_start - device-specific startup
//-------------------------------------------------
-void bfmdm01_device::device_start()
+void bfm_dm01_device::device_start()
{
if(!m_screen->started())
throw device_missing_dependencies();
@@ -96,7 +96,7 @@ void bfmdm01_device::device_start()
for (int i = 0; i < 65; i++)
save_item(NAME(m_segbuffer), i);
- for (int i = 0; i < DM_BYTESPERROW; i++)
+ for (int i = 0; i < BYTES_PER_ROW; i++)
save_item(NAME(m_scanline), i);
m_screen->register_screen_bitmap(m_tmpbitmap);
@@ -111,7 +111,7 @@ void bfmdm01_device::device_start()
// device_reset - device-specific reset
//-------------------------------------------------
-void bfmdm01_device::device_reset()
+void bfm_dm01_device::device_reset()
{
m_busy = 0;
m_control = 0;
@@ -123,7 +123,7 @@ void bfmdm01_device::device_reset()
///////////////////////////////////////////////////////////////////////////
-int bfmdm01_device::read_data(void)
+int bfm_dm01_device::read_data(void)
{
int data = m_comdata;
@@ -134,14 +134,14 @@ int bfmdm01_device::read_data(void)
///////////////////////////////////////////////////////////////////////////
-READ8_MEMBER( bfmdm01_device::control_r )
+READ8_MEMBER( bfm_dm01_device::control_r )
{
return 0;
}
///////////////////////////////////////////////////////////////////////////
-WRITE8_MEMBER( bfmdm01_device::control_w )
+WRITE8_MEMBER( bfm_dm01_device::control_w )
{
int changed = m_control ^ data;
@@ -168,18 +168,18 @@ WRITE8_MEMBER( bfmdm01_device::control_w )
///////////////////////////////////////////////////////////////////////////
-READ8_MEMBER( bfmdm01_device::mux_r )
+READ8_MEMBER( bfm_dm01_device::mux_r )
{
return 0;
}
///////////////////////////////////////////////////////////////////////////
-WRITE8_MEMBER( bfmdm01_device::mux_w )
+WRITE8_MEMBER( bfm_dm01_device::mux_w )
{
g_profiler.start(PROFILER_USER2);
- if ( m_xcounter < DM_BYTESPERROW )
+ if ( m_xcounter < BYTES_PER_ROW )
{
m_scanline[m_xcounter] = data;
m_xcounter++;
@@ -192,7 +192,7 @@ WRITE8_MEMBER( bfmdm01_device::mux_w )
{
int p = 0;
- while ( p < (DM_BYTESPERROW) )
+ while ( p < (BYTES_PER_ROW) )
{
uint8_t d = m_scanline[p];
@@ -224,7 +224,7 @@ WRITE8_MEMBER( bfmdm01_device::mux_w )
///////////////////////////////////////////////////////////////////////////
-READ8_MEMBER( bfmdm01_device::comm_r )
+READ8_MEMBER( bfm_dm01_device::comm_r )
{
int result = 0;
@@ -245,26 +245,26 @@ READ8_MEMBER( bfmdm01_device::comm_r )
///////////////////////////////////////////////////////////////////////////
-WRITE8_MEMBER( bfmdm01_device::comm_w )
+WRITE8_MEMBER( bfm_dm01_device::comm_w )
{
}
///////////////////////////////////////////////////////////////////////////
-READ8_MEMBER( bfmdm01_device::unknown_r )
+READ8_MEMBER( bfm_dm01_device::unknown_r )
{
return 0;
}
///////////////////////////////////////////////////////////////////////////
-WRITE8_MEMBER( bfmdm01_device::unknown_w )
+WRITE8_MEMBER( bfm_dm01_device::unknown_w )
{
m_matrixcpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE ); //?
}
///////////////////////////////////////////////////////////////////////////
-ADDRESS_MAP_START( bfm_dm01_memmap, AS_PROGRAM, 8, bfmdm01_device )
+ADDRESS_MAP_START( bfm_dm01_memmap, AS_PROGRAM, 8, bfm_dm01_device )
AM_RANGE(0x0000, 0x1fff) AM_RAM // 8k RAM
AM_RANGE(0x2000, 0x2000) AM_READWRITE(control_r, control_w) // control reg
AM_RANGE(0x2800, 0x2800) AM_READWRITE(mux_r, mux_w) // mux
@@ -274,7 +274,7 @@ ADDRESS_MAP_START( bfm_dm01_memmap, AS_PROGRAM, 8, bfmdm01_device )
ADDRESS_MAP_END
-uint32_t bfmdm01_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t bfm_dm01_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
copybitmap(bitmap, m_tmpbitmap, 0, 0, 0, 0, cliprect);
return 0;
@@ -282,7 +282,7 @@ uint32_t bfmdm01_device::screen_update(screen_device &screen, bitmap_ind16 &bitm
-INTERRUPT_GEN_MEMBER( bfmdm01_device::nmi_line_assert )
+INTERRUPT_GEN_MEMBER( bfm_dm01_device::nmi_line_assert )
{
m_matrixcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
}
@@ -290,7 +290,7 @@ INTERRUPT_GEN_MEMBER( bfmdm01_device::nmi_line_assert )
static MACHINE_CONFIG_FRAGMENT( bdmdm01 )
MCFG_CPU_ADD("matrix", M6809, 2000000 ) /* matrix board 6809 CPU at 2 Mhz ?? I don't know the exact freq.*/
MCFG_CPU_PROGRAM_MAP(bfm_dm01_memmap)
- MCFG_CPU_PERIODIC_INT_DRIVER(bfmdm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
+ MCFG_CPU_PERIODIC_INT_DRIVER(bfm_dm01_device, nmi_line_assert, 1500 ) /* generate 1500 NMI's per second ?? what is the exact freq?? */
MCFG_PALETTE_ADD("palette_lcd", 3)
@@ -299,12 +299,12 @@ static MACHINE_CONFIG_FRAGMENT( bdmdm01 )
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
MCFG_SCREEN_SIZE(65*2, 21*2)
MCFG_SCREEN_VISIBLE_AREA(0, 65*2-1, 0, 21*2-1)
- MCFG_SCREEN_UPDATE_DRIVER(bfmdm01_device, screen_update)
+ MCFG_SCREEN_UPDATE_DRIVER(bfm_dm01_device, screen_update)
MCFG_SCREEN_PALETTE("palette_lcd")
MACHINE_CONFIG_END
-machine_config_constructor bfmdm01_device::device_mconfig_additions() const
+machine_config_constructor bfm_dm01_device::device_mconfig_additions() const
{
return MACHINE_CONFIG_NAME( bdmdm01 );
}
@@ -312,7 +312,7 @@ machine_config_constructor bfmdm01_device::device_mconfig_additions() const
///////////////////////////////////////////////////////////////////////////
-void bfmdm01_device::writedata(uint8_t data)
+void bfm_dm01_device::writedata(uint8_t data)
{
m_comdata = data;
m_data_avail = 1;
@@ -322,7 +322,7 @@ void bfmdm01_device::writedata(uint8_t data)
}
///////////////////////////////////////////////////////////////////////////
-int bfmdm01_device::busy(void)
+int bfm_dm01_device::busy(void)
{
return m_data_avail;
}
diff --git a/src/mame/video/bfm_dm01.h b/src/mame/video/bfm_dm01.h
index 47755cd2582..458d0f2e9d0 100644
--- a/src/mame/video/bfm_dm01.h
+++ b/src/mame/video/bfm_dm01.h
@@ -5,23 +5,23 @@
Bellfruit dotmatrix driver, (under heavy construction !!!)
*************************************************************************************/
-#include "screen.h"
+#ifndef MAME_VIDEO_BFM_DM01
+#define MAME_VIDEO_BFM_DM01
-#ifndef BFM_DM01
-#define BFM_DM01
+#pragma once
-#define DM_BYTESPERROW 9
+#include "screen.h"
-#define MCFG_BF_DM01_BUSY_CB(_devcb) \
- devcb = &bfmdm01_device::set_busy_callback(*device, DEVCB_##_devcb);
+#define MCFG_BFM_DM01_BUSY_CB(_devcb) \
+ devcb = &bfm_dm01_device::set_busy_callback(*device, DEVCB_##_devcb);
-class bfmdm01_device : public device_t
+class bfm_dm01_device : public device_t
{
public:
- bfmdm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~bfmdm01_device() {}
+ bfm_dm01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ~bfm_dm01_device() {}
- template<class _Object> static devcb_base &set_busy_callback(device_t &device, _Object object) { return downcast<bfmdm01_device &>(device).m_busy_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_busy_callback(device_t &device, Object &&cb) { return downcast<bfm_dm01_device &>(device).m_busy_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( control_r );
DECLARE_WRITE8_MEMBER( control_w );
@@ -46,6 +46,8 @@ protected:
virtual void device_reset() override;
private:
+ static constexpr unsigned BYTES_PER_ROW = 9;
+
required_device<cpu_device> m_matrixcpu;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
@@ -57,7 +59,7 @@ private:
int m_segbuffer[65];
int m_busy;
- uint8_t m_scanline[DM_BYTESPERROW];
+ uint8_t m_scanline[BYTES_PER_ROW];
uint8_t m_comdata;
devcb_write_line m_busy_cb;
@@ -68,7 +70,6 @@ private:
};
-extern const device_type BF_DM01;
-
+DECLARE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device)
-#endif
+#endif // MAME_VIDEO_BFM_DM01
diff --git a/src/mame/video/c45.cpp b/src/mame/video/c45.cpp
index 960c1fc23c0..b2c72aacc8b 100644
--- a/src/mame/video/c45.cpp
+++ b/src/mame/video/c45.cpp
@@ -45,7 +45,7 @@
//****************************************************************************
// device type definition
-const device_type NAMCO_C45_ROAD = device_creator<namco_c45_road_device>;
+DEFINE_DEVICE_TYPE(NAMCO_C45_ROAD, namco_c45_road_device, "namco_c45_road", "Namco C45 Road")
const gfx_layout namco_c45_road_device::tilelayout =
@@ -77,7 +77,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
namco_c45_road_device::namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_C45_ROAD, "Namco C45 Road", tag, owner, clock, "namco_c45_road", __FILE__),
+ : device_t(mconfig, NAMCO_C45_ROAD, tag, owner, clock),
device_gfx_interface(mconfig, *this, gfxinfo),
device_memory_interface(mconfig, *this),
m_space_config("c45", ENDIANNESS_BIG, 16, 17, 0, address_map_delegate(FUNC(namco_c45_road_device::map), this)),
diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h
index 621308e493a..bc9172d1b5e 100644
--- a/src/mame/video/c45.h
+++ b/src/mame/video/c45.h
@@ -1,9 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Phil Stroffolino, Aaron Giles, Alex W. Jackson
-#pragma once
+#ifndef MAME_VIDEO_C45_H
+#define MAME_VIDEO_C45_H
-#ifndef __C45_H__
-#define __C45_H__
+#pragma once
//**************************************************************************
@@ -23,15 +23,6 @@
class namco_c45_road_device : public device_t, public device_gfx_interface, public device_memory_interface
{
- // constants
- static const int ROAD_COLS = 64;
- static const int ROAD_ROWS = 512;
- static const int ROAD_TILE_SIZE = 16;
- static const int ROAD_TILEMAP_WIDTH = ROAD_TILE_SIZE * ROAD_COLS;
- static const int ROAD_TILEMAP_HEIGHT = ROAD_TILE_SIZE * ROAD_ROWS;
- static const int WORDS_PER_ROAD_TILE = 0x40/2;
- static const gfx_layout tilelayout;
-
public:
// construction/destruction
namco_c45_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -52,6 +43,15 @@ protected:
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
private:
+ // constants
+ static constexpr int ROAD_COLS = 64;
+ static constexpr int ROAD_ROWS = 512;
+ static constexpr int ROAD_TILE_SIZE = 16;
+ static constexpr int ROAD_TILEMAP_WIDTH = ROAD_TILE_SIZE * ROAD_COLS;
+ static constexpr int ROAD_TILEMAP_HEIGHT = ROAD_TILE_SIZE * ROAD_ROWS;
+ static constexpr int WORDS_PER_ROAD_TILE = 0x40/2;
+ static const gfx_layout tilelayout;
+
// internal helpers
DECLARE_GFXDECODE_MEMBER(gfxinfo);
DECLARE_WRITE16_MEMBER( tilemap_w );
@@ -70,6 +70,6 @@ private:
// device type definition
-extern const device_type NAMCO_C45_ROAD;
+DECLARE_DEVICE_TYPE(NAMCO_C45_ROAD, namco_c45_road_device)
-#endif
+#endif // MAME_VIDEO_C45_H
diff --git a/src/mame/video/capbowl.cpp b/src/mame/video/capbowl.cpp
index fc5d0a625f6..66b3a599676 100644
--- a/src/mame/video/capbowl.cpp
+++ b/src/mame/video/capbowl.cpp
@@ -117,7 +117,7 @@ READ8_MEMBER(capbowl_state::bowlrama_blitter_r)
*
*************************************/
-inline rgb_t capbowl_state::pen_for_pixel( uint8_t *src, uint8_t pix )
+inline rgb_t capbowl_state::pen_for_pixel( uint8_t const *src, uint8_t pix )
{
return rgb_t(pal4bit(src[(pix << 1) + 0] >> 0),
pal4bit(src[(pix << 1) + 1] >> 4),
@@ -131,7 +131,7 @@ uint32_t capbowl_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
m_tms34061->get_display_state();
/* if we're blanked, just fill with black */
- if (m_tms34061->m_display.blanked)
+ if (m_tms34061->blanked())
{
bitmap.fill(rgb_t::black(), cliprect);
return 0;
@@ -140,7 +140,7 @@ uint32_t capbowl_state::screen_update(screen_device &screen, bitmap_rgb32 &bitma
/* now regenerate the bitmap */
for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
{
- uint8_t *src = &m_tms34061->m_display.vram[256 * y];
+ uint8_t const *src = &m_tms34061->vram(y);
uint32_t *dest = &bitmap.pix32(y);
for (int x = cliprect.min_x & ~1; x <= cliprect.max_x; x += 2)
diff --git a/src/mame/video/cchasm.cpp b/src/mame/video/cchasm.cpp
index e97437241ef..9aa48af8bca 100644
--- a/src/mame/video/cchasm.cpp
+++ b/src/mame/video/cchasm.cpp
@@ -65,7 +65,7 @@ void cchasm_state::refresh ()
logerror("JUMP to %x\n", data);
break;
case COLOR:
- color = VECTOR_COLOR444(data ^ 0xfff);
+ color = vector_device::color444(data ^ 0xfff);
break;
case SCALEY:
scaley = data << 5;
diff --git a/src/mame/video/cinemat.cpp b/src/mame/video/cinemat.cpp
index 09e5d235b2a..fb90344d2ea 100644
--- a/src/mame/video/cinemat.cpp
+++ b/src/mame/video/cinemat.cpp
@@ -86,7 +86,7 @@ WRITE8_MEMBER(cinemat_state::cinemat_vector_control_w)
/* X register as the intensity */
if (data != m_last_control && data)
{
- int xval = cpu->state_int(CCPU_X) & 0x0f;
+ int xval = cpu->state_int(ccpu_cpu_device::CCPU_X) & 0x0f;
i = (xval + 1) * 255 / 16;
m_vector_color = rgb_t(i,i,i);
}
@@ -97,7 +97,7 @@ WRITE8_MEMBER(cinemat_state::cinemat_vector_control_w)
/* X register as the intensity */
if (data != m_last_control && data)
{
- int xval = cpu->state_int(CCPU_X);
+ int xval = cpu->state_int(ccpu_cpu_device::CCPU_X);
xval = (~xval >> 2) & 0x3f;
i = (xval + 1) * 255 / 64;
m_vector_color = rgb_t(i,i,i);
@@ -109,7 +109,7 @@ WRITE8_MEMBER(cinemat_state::cinemat_vector_control_w)
/* as 4-4-4 BGR values */
if (data != m_last_control && data)
{
- int xval = cpu->state_int(CCPU_X);
+ int xval = cpu->state_int(ccpu_cpu_device::CCPU_X);
r = (~xval >> 0) & 0x0f;
r = r * 255 / 15;
g = (~xval >> 4) & 0x0f;
@@ -128,15 +128,15 @@ WRITE8_MEMBER(cinemat_state::cinemat_vector_control_w)
/* on an IV instruction if data == 0 here */
if (data != m_last_control && !data)
{
- m_qb3_lastx = cpu->state_int(CCPU_X);
- m_qb3_lasty = cpu->state_int(CCPU_Y);
+ m_qb3_lastx = cpu->state_int(ccpu_cpu_device::CCPU_X);
+ m_qb3_lasty = cpu->state_int(ccpu_cpu_device::CCPU_Y);
}
/* on the rising edge of the data value, latch the Y register */
/* as 2-3-3 BGR values */
if (data != m_last_control && data)
{
- int yval = cpu->state_int(CCPU_Y);
+ int yval = cpu->state_int(ccpu_cpu_device::CCPU_Y);
r = (~yval >> 0) & 0x07;
r = r * 255 / 7;
g = (~yval >> 3) & 0x07;
@@ -146,8 +146,8 @@ WRITE8_MEMBER(cinemat_state::cinemat_vector_control_w)
m_vector_color = rgb_t(r,g,b);
/* restore the original X,Y values */
- cpu->set_state_int(CCPU_X, m_qb3_lastx);
- cpu->set_state_int(CCPU_Y, m_qb3_lasty);
+ cpu->set_state_int(ccpu_cpu_device::CCPU_X, m_qb3_lastx);
+ cpu->set_state_int(ccpu_cpu_device::CCPU_Y, m_qb3_lasty);
}
}
break;
diff --git a/src/mame/video/comx35.cpp b/src/mame/video/comx35.cpp
index 32da4703c94..013809140f5 100644
--- a/src/mame/video/comx35.cpp
+++ b/src/mame/video/comx35.cpp
@@ -89,13 +89,13 @@ void comx35_state::video_start()
/* Machine Drivers */
MACHINE_CONFIG_FRAGMENT( comx35_pal_video )
- MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, CDP1869_DOT_CLK_PAL)
+ MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1869_ADD(CDP1869_TAG, CDP1869_DOT_CLK_PAL, cdp1869_page_ram)
- MCFG_CDP1869_COLOR_CLOCK(CDP1869_COLOR_CLK_PAL)
+ MCFG_CDP1869_ADD(CDP1869_TAG, cdp1869_device::DOT_CLK_PAL, cdp1869_page_ram)
+ MCFG_CDP1869_COLOR_CLOCK(cdp1869_device::COLOR_CLK_PAL)
MCFG_CDP1869_CHAR_PCB_READ_OWNER(comx35_state, comx35_pcb_r)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(comx35_state, comx35_charram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(comx35_state, comx35_charram_w)
@@ -109,13 +109,13 @@ MACHINE_CONFIG_FRAGMENT( comx35_pal_video )
MACHINE_CONFIG_END
MACHINE_CONFIG_FRAGMENT( comx35_ntsc_video )
- MCFG_CDP1869_SCREEN_NTSC_ADD(CDP1869_TAG, SCREEN_TAG, CDP1869_DOT_CLK_NTSC)
+ MCFG_CDP1869_SCREEN_NTSC_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_NTSC)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1869_ADD(CDP1869_TAG, CDP1869_DOT_CLK_NTSC, cdp1869_page_ram)
- MCFG_CDP1869_COLOR_CLOCK(CDP1869_COLOR_CLK_NTSC)
+ MCFG_CDP1869_ADD(CDP1869_TAG, cdp1869_device::DOT_CLK_NTSC, cdp1869_page_ram)
+ MCFG_CDP1869_COLOR_CLOCK(cdp1869_device::COLOR_CLK_NTSC)
MCFG_CDP1869_CHAR_PCB_READ_OWNER(comx35_state, comx35_pcb_r)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(comx35_state, comx35_charram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(comx35_state, comx35_charram_w)
diff --git a/src/mame/video/crt.cpp b/src/mame/video/crt.cpp
index a29fce66706..c4a13af52a0 100644
--- a/src/mame/video/crt.cpp
+++ b/src/mame/video/crt.cpp
@@ -39,7 +39,7 @@ enum
// device type definition
-const device_type CRT = device_creator<crt_device>;
+DEFINE_DEVICE_TYPE(CRT, crt_device, "crt", "CRT Video")
//**************************************************************************
// LIVE DEVICE
@@ -50,7 +50,7 @@ const device_type CRT = device_creator<crt_device>;
//-------------------------------------------------
crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, CRT, "CRT Video", tag, owner, clock, "crt", __FILE__),
+ : device_t(mconfig, CRT, tag, owner, clock),
m_list(nullptr),
m_list_head(nullptr),
m_decay_counter(0),
diff --git a/src/mame/video/crt.h b/src/mame/video/crt.h
index 9f4376c911e..34c546107f3 100644
--- a/src/mame/video/crt.h
+++ b/src/mame/video/crt.h
@@ -8,8 +8,10 @@
*************************************************************************/
-#ifndef __CRT_H__
-#define __CRT_H__
+#ifndef MAME_VIDEO_CRT_H
+#define MAME_VIDEO_CRT_H
+
+#pragma once
//**************************************************************************
@@ -30,24 +32,12 @@
// TYPE DEFINITIONS
//**************************************************************************
-struct crt_point
-{
- crt_point() :
- intensity(0),
- next(0) {}
-
- int intensity; /* current intensity of the pixel */
- /* a node is not in the list when (intensity == -1) */
- int next; /* index of next pixel in list */
-};
-
// ======================> crt_device
class crt_device : public device_t
{
public:
crt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~crt_device() { }
static void set_num_levels(device_t &device, int levels) { downcast<crt_device &>(device).m_num_intensity_levels = levels; }
static void set_offsets(device_t &device, int x_offset, int y_offset)
@@ -72,6 +62,15 @@ protected:
virtual void device_start() override;
private:
+ struct crt_point
+ {
+ crt_point() { }
+
+ int intensity = 0; /* current intensity of the pixel */
+ /* a node is not in the list when (intensity == -1) */
+ int next = 0; /* index of next pixel in list */
+ };
+
crt_point *m_list; /* array of (crt_window_width*crt_window_height) point */
std::unique_ptr<int[]> m_list_head; /* head of the list of lit pixels (index in the array) */
/* keep a separate list for each display line (makes the video code slightly faster) */
@@ -86,8 +85,8 @@ private:
int m_window_height;
};
-extern const device_type CRT;
+DECLARE_DEVICE_TYPE(CRT, crt_device)
-#endif /* CRT_H_ */
+#endif // MAME_VIDEO_CRT_H
diff --git a/src/mame/video/dbz.cpp b/src/mame/video/dbz.cpp
index ee91f5d1b2e..dae60f3e7ea 100644
--- a/src/mame/video/dbz.cpp
+++ b/src/mame/video/dbz.cpp
@@ -90,10 +90,10 @@ void dbz_state::video_start()
uint32_t dbz_state::screen_update_dbz(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- static const int K053251_CI[6] = { K053251_CI3, K053251_CI4, K053251_CI4, K053251_CI4, K053251_CI2, K053251_CI1 };
+ static const int K053251_CI[6] = { k053251_device::CI3, k053251_device::CI4, k053251_device::CI4, k053251_device::CI4, k053251_device::CI2, k053251_device::CI1 };
int layer[5], plane, new_colorbase;
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
for (plane = 0; plane < 6; plane++)
{
@@ -113,15 +113,15 @@ uint32_t dbz_state::screen_update_dbz(screen_device &screen, bitmap_ind16 &bitma
//layers priority
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI3);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI4);
layer[2] = 3;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI0);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI0);
layer[3] = 4;
- m_layerpri[3] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[3] = m_k053251->get_priority(k053251_device::CI2);
layer[4] = 5;
- m_layerpri[4] = m_k053251->get_priority(K053251_CI1);
+ m_layerpri[4] = m_k053251->get_priority(k053251_device::CI1);
konami_sortlayers5(layer, m_layerpri);
diff --git a/src/mame/video/decbac06.cpp b/src/mame/video/decbac06.cpp
index 7f140cf2365..9ae938168e6 100644
--- a/src/mame/video/decbac06.cpp
+++ b/src/mame/video/decbac06.cpp
@@ -65,10 +65,10 @@ Priority word (Midres):
#include "emu.h"
#include "decbac06.h"
-const device_type DECO_BAC06 = device_creator<deco_bac06_device>;
+DEFINE_DEVICE_TYPE(DECO_BAC06, deco_bac06_device, "deco_back06", "DECO BAC06 Tilemap")
deco_bac06_device::deco_bac06_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECO_BAC06, "DECO BAC06 Tilemap", tag, owner, clock, "deco_bac06", __FILE__),
+ : device_t(mconfig, DECO_BAC06, tag, owner, clock),
m_pf_data(nullptr),
m_pf_rowscroll(nullptr),
m_pf_colscroll(nullptr),
diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h
index 882f8ef3d23..bf639b7bda7 100644
--- a/src/mame/video/decbac06.h
+++ b/src/mame/video/decbac06.h
@@ -1,6 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail, David Haywood
-/* BAC06 */
+#ifndef MAME_VIDEO_DECOBAC06_H
+#define MAME_VIDEO_DECOBAC06_H
+
+#pragma once
+
+#include <memory>
#define MCFG_BAC06_BOOTLEG_DISABLE_8x8 \
deco_bac06_device::disable_8x8(*device);
@@ -148,10 +153,12 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type DECO_BAC06;
+DECLARE_DEVICE_TYPE(DECO_BAC06, deco_bac06_device)
#define MCFG_DECO_BAC06_GFXDECODE(_gfxtag) \
deco_bac06_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
#define MCFG_DECO_BAC06_GFX_REGION_WIDE(_8x8, _16x16, _wide) \
deco_bac06_device::set_gfx_region_wide(*device, _8x8, _16x16, _wide);
+
+#endif // MAME_VIDEO_DECOBAC06_H
diff --git a/src/mame/video/deckarn.cpp b/src/mame/video/deckarn.cpp
index 78f4f38f49b..e0437548660 100644
--- a/src/mame/video/deckarn.cpp
+++ b/src/mame/video/deckarn.cpp
@@ -12,10 +12,10 @@ void deco_karnovsprites_device::set_gfx_region(device_t &device, int region)
dev.m_gfxregion = region;
}
-const device_type DECO_KARNOVSPRITES = device_creator<deco_karnovsprites_device>;
+DEFINE_DEVICE_TYPE(DECO_KARNOVSPRITES, deco_karnovsprites_device, "deco_karnovsprites", "DECO Karnov Sprites")
deco_karnovsprites_device::deco_karnovsprites_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECO_KARNOVSPRITES, "DECO Karnov Sprites", tag, owner, clock, "deco_karnovsprites", __FILE__)
+ : device_t(mconfig, DECO_KARNOVSPRITES, tag, owner, clock)
, m_gfxregion(0)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
diff --git a/src/mame/video/deckarn.h b/src/mame/video/deckarn.h
index 1250d559a87..137ea8a5403 100644
--- a/src/mame/video/deckarn.h
+++ b/src/mame/video/deckarn.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail,David Haywood
+#ifndef MAME_VIDEO_DECKARN_H
+#define MAME_VIDEO_DECKARN_H
+
+#pragma once
class deco_karnovsprites_device : public device_t
@@ -22,10 +26,12 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type DECO_KARNOVSPRITES;
+DECLARE_DEVICE_TYPE(DECO_KARNOVSPRITES, deco_karnovsprites_device)
#define MCFG_DECO_KARNOVSPRITES_GFXDECODE(_gfxtag) \
deco_karnovsprites_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
#define MCFG_DECO_KARNOVSPRITES_GFX_REGION(_region) \
deco_karnovsprites_device::set_gfx_region(*device, _region);
+
+#endif // MAME_VIDEO_DECKARN_H
diff --git a/src/mame/video/decmxc06.cpp b/src/mame/video/decmxc06.cpp
index 46966a99a2e..220cd81127d 100644
--- a/src/mame/video/decmxc06.cpp
+++ b/src/mame/video/decmxc06.cpp
@@ -48,10 +48,10 @@ void deco_mxc06_device::set_gfx_region(device_t &device, int region)
}
-const device_type DECO_MXC06 = device_creator<deco_mxc06_device>;
+DEFINE_DEVICE_TYPE(DECO_MXC06, deco_mxc06_device, "deco_mxc06", "DECO MXC06 Sprite")
deco_mxc06_device::deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECO_MXC06, "DECO MXC06 Sprite", tag, owner, clock, "deco_mxc06", __FILE__)
+ : device_t(mconfig, DECO_MXC06, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_gfxregion(0)
, m_ramsize(0x800)
diff --git a/src/mame/video/decmxc06.h b/src/mame/video/decmxc06.h
index 45036eb8a41..1d31aaa93e3 100644
--- a/src/mame/video/decmxc06.h
+++ b/src/mame/video/decmxc06.h
@@ -1,10 +1,12 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail, David Haywood
-/* MXC06 */
+#ifndef MAME_VIDEO_DECMXC06_H
+#define MAME_VIDEO_DECMXC06_H
+#pragma once
-class deco_mxc06_device : public device_t,
- public device_video_interface
+
+class deco_mxc06_device : public device_t, public device_video_interface
{
public:
deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -36,7 +38,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type DECO_MXC06;
+DECLARE_DEVICE_TYPE(DECO_MXC06, deco_mxc06_device)
#define MCFG_DECO_MXC06_GFXDECODE(_gfxtag) \
deco_mxc06_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
@@ -46,3 +48,5 @@ extern const device_type DECO_MXC06;
#define MCFG_DECO_MXC06_RAMSIZE(_size) \
deco_mxc06_device::set_ram_size(*device, _size);
+
+#endif // MAME_VIDEO_DECMXC06_H
diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp
index aa5e5cf99e0..55daf66fa2a 100644
--- a/src/mame/video/deco16ic.cpp
+++ b/src/mame/video/deco16ic.cpp
@@ -174,10 +174,10 @@ Rowscroll style:
#include "video/deco16ic.h"
#include "render.h"
-const device_type DECO16IC = device_creator<deco16ic_device>;
+DEFINE_DEVICE_TYPE(DECO16IC, deco16ic_device, "deco16ic", "DECO 55 / 56 / 74 / 141 IC")
deco16ic_device::deco16ic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECO16IC, "DECO 55 / 56 / 74 / 141 IC", tag, owner, clock, "deco16ic", __FILE__),
+ : device_t(mconfig, DECO16IC, tag, owner, clock),
device_video_interface(mconfig, *this),
m_pf1_data(nullptr),
m_pf2_data(nullptr),
diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h
index 1483c62c24c..b1e6794410a 100644
--- a/src/mame/video/deco16ic.h
+++ b/src/mame/video/deco16ic.h
@@ -8,10 +8,10 @@
Data East IC 55 / 56 / 74 / 141
**************************************************************************/
+#ifndef MAME_VIDEO_DECO16IC_H
+#define MAME_VIDEO_DECO16IC_H
#pragma once
-#ifndef __DECO16IC_H__
-#define __DECO16IC_H__
@@ -156,7 +156,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type DECO16IC;
+DECLARE_DEVICE_TYPE(DECO16IC, deco16ic_device)
@@ -208,4 +208,4 @@ extern const device_type DECO16IC;
// function definition for a callback
#define DECO16IC_BANK_CB_MEMBER(_name) int _name(int bank)
-#endif
+#endif // MAME_VIDEO_DECO16IC_H
diff --git a/src/mame/video/deco_zoomspr.cpp b/src/mame/video/deco_zoomspr.cpp
index 1933b0797eb..4a613bf5e78 100644
--- a/src/mame/video/deco_zoomspr.cpp
+++ b/src/mame/video/deco_zoomspr.cpp
@@ -13,10 +13,10 @@
#include "emu.h"
#include "deco_zoomspr.h"
-const device_type DECO_ZOOMSPR = device_creator<deco_zoomspr_device>;
+DEFINE_DEVICE_TYPE(DECO_ZOOMSPR, deco_zoomspr_device, "deco_zoomspr", "DECO Zooming Sprites")
deco_zoomspr_device::deco_zoomspr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECO_ZOOMSPR, "DECO Zooming Sprites", tag, owner, clock, "deco_zoomspr", __FILE__)
+ : device_t(mconfig, DECO_ZOOMSPR, tag, owner, clock)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
}
diff --git a/src/mame/video/deco_zoomspr.h b/src/mame/video/deco_zoomspr.h
index 5f4236e510d..83236eb4ff6 100644
--- a/src/mame/video/deco_zoomspr.h
+++ b/src/mame/video/deco_zoomspr.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail,David Haywood
+#ifndef MAME_VIDEO_DECO_ZOOMSPR_H
+#define MAME_VIDEO_DECO_ZOOMSPR_H
+
+#pragma once
class deco_zoomspr_device : public device_t
@@ -29,7 +33,9 @@ private:
};
-extern const device_type DECO_ZOOMSPR;
+DECLARE_DEVICE_TYPE(DECO_ZOOMSPR, deco_zoomspr_device)
#define MCFG_DECO_ZOOMSPR_GFXDECODE(_gfxtag) \
deco_zoomspr_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_DECO_ZOOMSPR_H
diff --git a/src/mame/video/decocomn.cpp b/src/mame/video/decocomn.cpp
index b9612e2ea4f..61a5226b21d 100644
--- a/src/mame/video/decocomn.cpp
+++ b/src/mame/video/decocomn.cpp
@@ -10,10 +10,10 @@
#include "video/decocomn.h"
-const device_type DECOCOMN = device_creator<decocomn_device>;
+DEFINE_DEVICE_TYPE(DECOCOMN, decocomn_device, "decocomn", "DECO Common Video Functions")
decocomn_device::decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECOCOMN, "DECO Common Video Functions", tag, owner, clock, "decocomn", __FILE__),
+ : device_t(mconfig, DECOCOMN, tag, owner, clock),
device_video_interface(mconfig, *this),
m_dirty_palette(nullptr),
m_priority(0),
diff --git a/src/mame/video/decocomn.h b/src/mame/video/decocomn.h
index ff70be8ef23..80879d3810d 100644
--- a/src/mame/video/decocomn.h
+++ b/src/mame/video/decocomn.h
@@ -5,10 +5,10 @@
decocomn.h
**************************************************************************/
+#ifndef MAME_VIDEO_DECOCOMN_H
+#define MAME_VIDEO_DECOCOMN_H
#pragma once
-#ifndef __DECOCOMN_H__
-#define __DECOCOMN_H__
/***************************************************************************
@@ -21,7 +21,6 @@ class decocomn_device : public device_t,
{
public:
decocomn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~decocomn_device() {}
// static configuration
static void static_set_palette_tag(device_t &device, const char *tag);
@@ -46,7 +45,7 @@ private:
required_shared_ptr<uint16_t> m_generic_paletteram_16;
};
-extern const device_type DECOCOMN;
+DECLARE_DEVICE_TYPE(DECOCOMN, decocomn_device)
@@ -60,4 +59,4 @@ extern const device_type DECOCOMN;
#define MCFG_DECOCOMN_PALETTE(_palette_tag) \
decocomn_device::static_set_palette_tag(*device, "^" _palette_tag);
-#endif
+#endif // MAME_VIDEO_DECOCOMN_H
diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp
index 810d9562208..409c7f92018 100644
--- a/src/mame/video/decodmd1.cpp
+++ b/src/mame/video/decodmd1.cpp
@@ -12,7 +12,7 @@
#include "rendlay.h"
#include "screen.h"
-const device_type DECODMD1 = device_creator<decodmd_type1_device>;
+DEFINE_DEVICE_TYPE(DECODMD1, decodmd_type1_device, "decodmd1", "Data East Pinball Dot Matrix Display Type 1")
READ8_MEMBER( decodmd_type1_device::latch_r )
{
@@ -233,7 +233,7 @@ machine_config_constructor decodmd_type1_device::device_mconfig_additions() cons
}
decodmd_type1_device::decodmd_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECODMD1, "Data East Pinball Dot Matrix Display Type 1", tag, owner, clock, "decodmd1", __FILE__),
+ : device_t(mconfig, DECODMD1, tag, owner, clock),
m_cpu(*this,"dmdcpu"),
m_rombank1(*this,"dmdbank1"),
m_rombank2(*this,"dmdbank2"),
diff --git a/src/mame/video/decodmd1.h b/src/mame/video/decodmd1.h
index 3a5e605d58a..6e44c91cf62 100644
--- a/src/mame/video/decodmd1.h
+++ b/src/mame/video/decodmd1.h
@@ -4,8 +4,10 @@
* Data East Pinball DMD Type 1 display
*/
-#ifndef DECODMD1_H_
-#define DECODMD1_H_
+#ifndef MAME_VIDEO_DECODMD1_H
+#define MAME_VIDEO_DECODMD1_H
+
+#pragma once
#include "cpu/z80/z80.h"
#include "machine/ram.h"
@@ -14,10 +16,6 @@
MCFG_DEVICE_ADD(_tag, DECODMD1, 0) \
decodmd_type1_device::static_set_gfxregion(*device, _region);
-#define B_CLR 0x01
-#define B_SET 0x02
-#define B_CLK 0x04
-
class decodmd_type1_device : public device_t
{
public:
@@ -49,6 +47,10 @@ protected:
virtual void device_reset() override;
private:
+ static constexpr unsigned B_CLR = 0x01;
+ static constexpr unsigned B_SET = 0x02;
+ static constexpr unsigned B_CLK = 0x04;
+
uint8_t m_latch;
uint8_t m_status;
uint8_t m_ctrl;
@@ -73,7 +75,7 @@ private:
void set_busy(uint8_t input, uint8_t val);
};
-extern const device_type DECODMD1;
+DECLARE_DEVICE_TYPE(DECODMD1, decodmd_type1_device)
-#endif /* DECODMD1_H_ */
+#endif // MAME_VIDEO_DECODMD1_H
diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp
index d801afe3025..3e0d94137b0 100644
--- a/src/mame/video/decodmd2.cpp
+++ b/src/mame/video/decodmd2.cpp
@@ -13,7 +13,7 @@
#include "rendlay.h"
#include "screen.h"
-const device_type DECODMD2 = device_creator<decodmd_type2_device>;
+DEFINE_DEVICE_TYPE(DECODMD2, decodmd_type2_device, "decodmd2", "Data East Pinball Dot Matrix Display Type 2")
WRITE8_MEMBER( decodmd_type2_device::bank_w )
{
@@ -161,7 +161,7 @@ machine_config_constructor decodmd_type2_device::device_mconfig_additions() cons
}
decodmd_type2_device::decodmd_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECODMD2, "Data East Pinball Dot Matrix Display Type 2", tag, owner, clock, "decodmd2", __FILE__),
+ : device_t(mconfig, DECODMD2, tag, owner, clock),
m_cpu(*this,"dmdcpu"),
m_mc6845(*this,"dmd6845"),
m_rombank1(*this,"dmdbank1"),
diff --git a/src/mame/video/decodmd2.h b/src/mame/video/decodmd2.h
index 413653ea170..73dbe10ca33 100644
--- a/src/mame/video/decodmd2.h
+++ b/src/mame/video/decodmd2.h
@@ -4,30 +4,23 @@
* Data East Pinball DMD Type 2 Display
*/
-#ifndef DECODMD_H_
-#define DECODMD_H_
+#ifndef MAME_VIDEO_DECODMD2_H
+#define MAME_VIDEO_DECODMD2_H
+
+#pragma once
#include "cpu/m6809/m6809.h"
-#include "video/mc6845.h"
#include "machine/ram.h"
+#include "video/mc6845.h"
#define MCFG_DECODMD_TYPE2_ADD(_tag, _region) \
MCFG_DEVICE_ADD(_tag, DECODMD2, 0) \
decodmd_type2_device::static_set_gfxregion(*device, _region);
-#define START_ADDRESS (((m_crtc_reg[0x0c]<<8) & 0x3f00) | (m_crtc_reg[0x0d] & 0xff))
-
class decodmd_type2_device : public device_t
{
public:
decodmd_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_device<cpu_device> m_cpu;
- required_device<mc6845_device> m_mc6845;
- required_memory_bank m_rombank1;
- required_memory_bank m_rombank2;
- required_memory_bank m_rambank;
- required_device<ram_device> m_ram;
- memory_region* m_rom;
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_WRITE8_MEMBER(crtc_address_w);
@@ -50,7 +43,17 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
+ uint16_t start_address() const { return ((m_crtc_reg[0x0c] << 8) & 0x3f00) | (m_crtc_reg[0x0d] & 0xff); }
+
private:
+ required_device<cpu_device> m_cpu;
+ required_device<mc6845_device> m_mc6845;
+ required_memory_bank m_rombank1;
+ required_memory_bank m_rombank2;
+ required_memory_bank m_rambank;
+ required_device<ram_device> m_ram;
+ memory_region* m_rom;
+
uint8_t m_crtc_index;
uint8_t m_crtc_reg[0x100];
uint8_t m_latch;
@@ -61,6 +64,6 @@ private:
const char* m_gfxtag;
};
-extern const device_type DECODMD2;
+DECLARE_DEVICE_TYPE(DECODMD2, decodmd_type2_device)
-#endif /* DECODMD_H_ */
+#endif // MAME_VIDEO_DECODMD2_H
diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp
index a5702d4c97d..72f6e068cc3 100644
--- a/src/mame/video/decodmd3.cpp
+++ b/src/mame/video/decodmd3.cpp
@@ -13,7 +13,7 @@
#include "rendlay.h"
#include "screen.h"
-const device_type DECODMD3 = device_creator<decodmd_type3_device>;
+DEFINE_DEVICE_TYPE(DECODMD3, decodmd_type3_device, "decodmd3", "Data East Pinball Dot Matrix Display Type 3")
WRITE8_MEMBER( decodmd_type3_device::data_w )
{
@@ -162,7 +162,7 @@ machine_config_constructor decodmd_type3_device::device_mconfig_additions() cons
}
decodmd_type3_device::decodmd_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECODMD3, "Data East Pinball Dot Matrix Display Type 3", tag, owner, clock, "decodmd3", __FILE__),
+ : device_t(mconfig, DECODMD3, tag, owner, clock),
m_cpu(*this,"dmdcpu"),
m_mc6845(*this,"dmd6845"),
m_ram(*this,RAM_TAG),
diff --git a/src/mame/video/decodmd3.h b/src/mame/video/decodmd3.h
index 7bcc898017c..c53504ac373 100644
--- a/src/mame/video/decodmd3.h
+++ b/src/mame/video/decodmd3.h
@@ -4,12 +4,14 @@
* Data East Pinball DMD Type 3 Display
*/
-#ifndef DECODMD3_H_
-#define DECODMD3_H_
+#ifndef MAME_VIDEO_DECODMD3_H
+#define MAME_VIDEO_DECODMD3_H
+
+#pragma once
#include "cpu/m68000/m68000.h"
-#include "video/mc6845.h"
#include "machine/ram.h"
+#include "video/mc6845.h"
#define MCFG_DECODMD_TYPE3_ADD(_tag, _region) \
MCFG_DEVICE_ADD(_tag, DECODMD3, 0) \
@@ -19,11 +21,6 @@ class decodmd_type3_device : public device_t
{
public:
decodmd_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- required_device<cpu_device> m_cpu;
- required_device<mc6845_device> m_mc6845;
- required_device<ram_device> m_ram;
- required_memory_bank m_rambank;
- required_memory_bank m_rombank;
DECLARE_WRITE8_MEMBER(data_w);
DECLARE_READ8_MEMBER(busy_r);
@@ -39,14 +36,20 @@ public:
static void static_set_gfxregion(device_t &device, const char *tag);
- memory_region* m_rom;
-
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
virtual void device_reset() override;
private:
+ required_device<cpu_device> m_cpu;
+ required_device<mc6845_device> m_mc6845;
+ required_device<ram_device> m_ram;
+ required_memory_bank m_rambank;
+ required_memory_bank m_rombank;
+
+ memory_region* m_rom;
+
uint8_t m_status;
uint8_t m_crtc_index;
uint8_t m_crtc_reg[0x100];
@@ -58,7 +61,6 @@ private:
const char* m_gfxtag;
};
-extern const device_type DECODMD3;
-
+DECLARE_DEVICE_TYPE(DECODMD3, decodmd_type3_device)
-#endif /* DECODMD3_H_ */
+#endif // MAME_VIDEO_DECODMD3_H
diff --git a/src/mame/video/decospr.cpp b/src/mame/video/decospr.cpp
index f98e5e61f9c..f332a201074 100644
--- a/src/mame/video/decospr.cpp
+++ b/src/mame/video/decospr.cpp
@@ -146,10 +146,10 @@ void decospr_device::set_gfx_region(device_t &device, int gfxregion)
// printf("decospr_device::set_gfx_region()\n");
}
-const device_type DECO_SPRITE = device_creator<decospr_device>;
+DEFINE_DEVICE_TYPE(DECO_SPRITE, decospr_device, "decospr", "DECO 52 Sprite")
decospr_device::decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, DECO_SPRITE, "DECO 52 Sprite", tag, owner, clock, "decospr", __FILE__),
+ : device_t(mconfig, DECO_SPRITE, tag, owner, clock),
device_video_interface(mconfig, *this),
m_gfxregion(0),
m_is_bootleg(false),
diff --git a/src/mame/video/decospr.h b/src/mame/video/decospr.h
index c420c6f04b1..883ad675b55 100644
--- a/src/mame/video/decospr.h
+++ b/src/mame/video/decospr.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail, David Haywood
+#ifndef MAME_VIDEO_DECOSPR_H
+#define MAME_VIDEO_DECOSPR_H
+
+#pragma once
typedef device_delegate<uint16_t (uint16_t pri)> decospr_pri_cb_delegate;
typedef device_delegate<uint16_t (uint16_t col)> decospr_col_cb_delegate;
@@ -10,8 +14,7 @@ typedef device_delegate<uint16_t (uint16_t col)> decospr_col_cb_delegate;
#define DECOSPR_COLOUR_CB_MEMBER(_name) uint16_t _name(uint16_t col)
-class decospr_device : public device_t,
- public device_video_interface
+class decospr_device : public device_t, public device_video_interface
{
public:
decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -68,7 +71,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type DECO_SPRITE;
+DECLARE_DEVICE_TYPE(DECO_SPRITE, decospr_device)
#define MCFG_DECO_SPRITE_GFX_REGION(_region) \
decospr_device::set_gfx_region(*device, _region);
@@ -96,3 +99,5 @@ extern const device_type DECO_SPRITE;
#define MCFG_DECO_SPRITE_GFXDECODE(_gfxtag) \
decospr_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_DECOSPR_H
diff --git a/src/mame/video/dooyong.cpp b/src/mame/video/dooyong.cpp
index cd3999440d5..baae9402616 100644
--- a/src/mame/video/dooyong.cpp
+++ b/src/mame/video/dooyong.cpp
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria,Vas Crabb
+// copyright-holders:Vas Crabb
#include "emu.h"
-#include "includes/dooyong.h"
+#include "video/dooyong.h"
+
+#include "screen.h"
/* These games all have ROM-based tilemaps for the backgrounds, title
@@ -14,21 +16,18 @@
when the x scroll moves out of range (trying to decode the whole lot
at once uses hundreds of megabytes of RAM). */
-device_type const DOOYONG_ROM_TILEMAP = device_creator<dooyong_rom_tilemap_device>;
-device_type const RSHARK_ROM_TILEMAP = device_creator<rshark_rom_tilemap_device>;
-device_type const DOOYONG_RAM_TILEMAP = device_creator<dooyong_ram_tilemap_device>;
+DEFINE_DEVICE_TYPE(DOOYONG_ROM_TILEMAP, dooyong_rom_tilemap_device, "dooyong_rom_tilemap", "Dooyong ROM Tilemap")
+DEFINE_DEVICE_TYPE(RSHARK_ROM_TILEMAP, rshark_rom_tilemap_device, "rshark_rom_tilemap", "R-Shark ROM Tilemap")
+DEFINE_DEVICE_TYPE(DOOYONG_RAM_TILEMAP, dooyong_ram_tilemap_device, "dooyong_ram_tilemap", "Dooyong RAM Tilemap")
dooyong_tilemap_device_base::dooyong_tilemap_device_base(
- machine_config const &mconfig,
- device_type type,
- char const *name,
- char const *tag,
- device_t *owner,
- uint32_t clock,
- char const *shortname,
- char const *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ machine_config const &mconfig,
+ device_type type,
+ char const *tag,
+ device_t *owner,
+ uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
, m_gfxnum(0)
, m_tilemap(nullptr)
@@ -62,20 +61,17 @@ void dooyong_tilemap_device_base::set_palette_bank(uint16_t bank)
dooyong_rom_tilemap_device::dooyong_rom_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
- : dooyong_rom_tilemap_device(mconfig, DOOYONG_ROM_TILEMAP, "Dooyong ROM Tilemap", tag, owner, clock, "dooyong_rom_tilemap", __FILE__)
+ : dooyong_rom_tilemap_device(mconfig, DOOYONG_ROM_TILEMAP, tag, owner, clock)
{
}
dooyong_rom_tilemap_device::dooyong_rom_tilemap_device(
- machine_config const &mconfig,
- device_type type,
- char const *name,
- char const *tag,
- device_t *owner,
- uint32_t clock,
- char const *shortname,
- char const *source)
- : dooyong_tilemap_device_base(mconfig, type, name, tag, owner, clock, shortname, source)
+ machine_config const &mconfig,
+ device_type type,
+ char const *tag,
+ device_t *owner,
+ uint32_t clock)
+ : dooyong_tilemap_device_base(mconfig, type, tag, owner, clock)
, m_rows(8)
, m_tilerom(*this, finder_base::DUMMY_TAG)
, m_tilerom_offset(0)
@@ -208,7 +204,7 @@ TILE_GET_INFO_MEMBER(dooyong_rom_tilemap_device::tile_info)
rshark_rom_tilemap_device::rshark_rom_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
- : dooyong_rom_tilemap_device(mconfig, RSHARK_ROM_TILEMAP, "R-Shark ROM Tilemap", tag, owner, clock, "rshark_rom_tilemap", __FILE__)
+ : dooyong_rom_tilemap_device(mconfig, RSHARK_ROM_TILEMAP, tag, owner, clock)
, m_colorrom(*this, finder_base::DUMMY_TAG)
, m_colorrom_offset(0)
{
@@ -243,7 +239,7 @@ TILE_GET_INFO_MEMBER(rshark_rom_tilemap_device::tile_info)
dooyong_ram_tilemap_device::dooyong_ram_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
- : dooyong_tilemap_device_base(mconfig, DOOYONG_RAM_TILEMAP, "Dooyong RAM Tilemap", tag, owner, clock, "dooyong_ram_tilemap", __FILE__)
+ : dooyong_tilemap_device_base(mconfig, DOOYONG_RAM_TILEMAP, tag, owner, clock)
, m_tileram()
{
}
@@ -293,507 +289,3 @@ TILE_GET_INFO_MEMBER(dooyong_ram_tilemap_device::tile_info)
unsigned const attr(m_tileram[tile_index]);
tileinfo.set(m_gfxnum, attr & 0x0fffU, m_palette_bank | ((attr >> 12) & 0x0fU), 0);
}
-
-
-READ8_MEMBER(dooyong_z80_state::lastday_tx_r)
-{
- bool const lane(BIT(offset, 11));
- return m_tx->tileram_r(space, offset & 0x07ffU) >> (lane ? 8 : 0);
-}
-
-WRITE8_MEMBER(dooyong_z80_state::lastday_tx_w)
-{
- bool const lane(BIT(offset, 11));
- m_tx->tileram_w(space, offset & 0x07ffU, uint16_t(data) << (lane ? 8 : 0), lane ? 0xff00U : 0x00ffU);
-}
-
-READ8_MEMBER(dooyong_z80_state::bluehawk_tx_r)
-{
- bool const lane(BIT(offset, 0));
- return m_tx->tileram_r(space, offset >> 1) >> (lane ? 8 : 0);
-}
-
-WRITE8_MEMBER(dooyong_z80_state::bluehawk_tx_w)
-{
- bool const lane(BIT(offset, 0));
- m_tx->tileram_w(space, offset >> 1, uint16_t(data) << (lane ? 8 : 0), lane ? 0xff00U : 0x00ffU);
-}
-
-
-/* Control registers seem to be different on every game */
-
-WRITE8_MEMBER(dooyong_z80_ym2203_state::lastday_ctrl_w)
-{
- /* bits 0 and 1 are coin counters */
- machine().bookkeeping().coin_counter_w(0, data & 0x01);
- machine().bookkeeping().coin_counter_w(1, data & 0x02);
-
- /* bit 3 is used but unknown */
-
- /* bit 4 disables sprites */
- m_sprites_disabled = data & 0x10;
-
- /* bit 6 is flip screen */
- flip_screen_set(data & 0x40);
-}
-
-WRITE8_MEMBER(dooyong_z80_ym2203_state::pollux_ctrl_w)
-{
-// printf("pollux_ctrl_w %02x\n", data);
-
- /* bit 0 is flip screen */
- flip_screen_set(data & 0x01);
-
- /* bits 6 and 7 are coin counters */
- machine().bookkeeping().coin_counter_w(0, data & 0x80);
- machine().bookkeeping().coin_counter_w(1, data & 0x40);
-
- /* bit 1 is used but unknown - palette banking (both write and display based on pollux bombs) */
- uint8_t const last_palbank = m_palette_bank;
- if (m_paletteram_flytiger) m_palette_bank = BIT(data, 1);
- if (last_palbank != m_palette_bank)
- {
- m_bg->set_palette_bank(m_palette_bank << 6);
- m_fg->set_palette_bank(m_palette_bank << 6);
- m_tx->set_palette_bank(m_palette_bank << 6);
- }
-
- /* bit 2 is continuously toggled (unknown) */
-
- /* bit 4 is used but unknown - display disable? */
-}
-
-
-
-WRITE8_MEMBER(dooyong_z80_state::primella_ctrl_w)
-{
- /* bits 0-2 select ROM bank */
- membank("bank1")->set_entry(data & 0x07);
-
- /* bit 3 disables tx layer */
- m_tx_pri = data & 0x08;
-
- /* bit 4 flips screen */
- flip_screen_set(data & 0x10);
-
- /* bit 5 used but unknown */
-
-// logerror("%04x: bankswitch = %02x\n",space.device().safe_pc(),data&0xe0);
-}
-
-READ8_MEMBER(dooyong_z80_state::paletteram_flytiger_r)
-{
- if (m_palette_bank) offset |= 0x800;
-
- return m_paletteram_flytiger[offset];
-}
-
-
-WRITE8_MEMBER(dooyong_z80_state::paletteram_flytiger_w)
-{
- if (m_palette_bank) offset |= 0x800;
-
- m_paletteram_flytiger[offset] = data;
- uint16_t const value = m_paletteram_flytiger[offset & ~1] | (m_paletteram_flytiger[offset | 1] << 8);
- m_palette->set_pen_color(offset/2, pal5bit(value >> 10), pal5bit(value >> 5), pal5bit(value >> 0));
-
-}
-
-WRITE8_MEMBER(dooyong_z80_state::flytiger_ctrl_w)
-{
- /* bit 0 is flip screen */
- flip_screen_set(data & 0x01);
-
- /* bits 1, 2 used but unknown */
-
- /* bit 3 palette banking */
- uint8_t const last_palbank = m_palette_bank;
- m_palette_bank = BIT(data, 3);
- if (last_palbank != m_palette_bank)
- {
- m_bg->set_palette_bank(m_palette_bank << 6);
- m_fg->set_palette_bank(m_palette_bank << 6);
- m_tx->set_palette_bank(m_palette_bank << 6);
- }
-
- /* bit 4 changes tilemaps priority */
- m_flytiger_pri = data & 0x10;
-}
-
-
-void dooyong_z80_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, unsigned extensions)
-{
- /* Sprites take 32 bytes each in memory:
- MSB LSB
- [offs + 0x00] cccc cccc (bits 7-0 of gfx code)
- [offs + 0x01] cccx CCCC (bits 10-8 of gfx code, bit 8 of x position, bits 3-0 of color code)
- [offs + 0x02] yyyy yyyy
- [offs + 0x03] xxxx xxxx (bits 7-0 of x offset)
- ...
- [offs + 0x1c] ?hhh XY*c (bits 2-0 of height, x flip, y flip, * see note, bit 11 of gfx code)
- ...
- ? = unused/unknown
- E = enable
- c = gfx code
- x = x position
- y = y position
- C = color code
- w = width
- X = x flip
- Y = y flip
- * = alters y position in bluehawk and flytiger - see code below
- bit 11 of gfx code only used by gulfstrm, pollux, bluehawk and flytiger
- height only used by pollux, bluehawk and flytiger
- x flip and y flip only used by pollux and flytiger */
-
- uint8_t const *const buffered_spriteram = m_spriteram->buffer();
- for (int offs = 0; offs < m_spriteram->bytes(); offs += 32)
- {
- int sx = buffered_spriteram[offs+3] | ((buffered_spriteram[offs+1] & 0x10) << 4);
- int sy = buffered_spriteram[offs+2];
- int code = buffered_spriteram[offs] | ((buffered_spriteram[offs+1] & 0xe0) << 3);
- int color = buffered_spriteram[offs+1] & 0x0f;
-
- //TODO: This priority mechanism works for known games, but seems a bit strange.
- //Are we missing something? (The obvious spare palette bit isn't it.)
- int const pri = (((color == 0x00) || (color == 0x0f)) ? 0xfc : 0xf0);
-
- bool flipx = false, flipy = false;
- int height = 0;
- if (extensions)
- {
- uint8_t const ext = buffered_spriteram[offs+0x1c];
-
- if (extensions & SPRITE_12BIT)
- code |= ((ext & 0x01) << 11);
-
- if (extensions & SPRITE_HEIGHT)
- {
- height = (ext & 0x70) >> 4;
- code &= ~height;
-
- flipx = ext & 0x08;
- flipy = ext & 0x04;
- }
-
- if (extensions & SPRITE_YSHIFT_BLUEHAWK)
- sy += 6 - ((~ext & 0x02) << 7);
-
- if (extensions & SPRITE_YSHIFT_FLYTIGER)
- sy -=(ext & 0x02) << 7;
- }
-
- if (flip_screen())
- {
- sx = 498 - sx;
- sy = 240 - (16 * height) - sy;
- flipx = !flipx;
- flipy = !flipy;
- }
-
- color |= m_palette_bank << 6;
-
- for (int y = 0; y <= height; y++)
- {
- m_gfxdecode->gfx(1)->prio_transpen(bitmap,cliprect,
- code + y,
- color,
- flipx, flipy,
- sx, sy + (16 * (flipy ? (height - y) : y)),
- screen.priority(),
- pri, 15);
- }
- }
-}
-
-
-uint32_t dooyong_z80_ym2203_state::screen_update_lastday(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- /* Text layer is offset on this machine */
- m_tx->set_scrolly(flip_screen() ? -8 : 8);
-
- m_bg->draw(screen, bitmap, cliprect, 0, 1);
- m_fg->draw(screen, bitmap, cliprect, 0, 2);
- m_tx->draw(screen, bitmap, cliprect, 0, 4);
-
- if (!m_sprites_disabled)
- draw_sprites(screen, bitmap, cliprect);
-
- return 0;
-}
-
-uint32_t dooyong_z80_ym2203_state::screen_update_gulfstrm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- /* Text layer is offset on this machine */
- m_tx->set_scrolly(flip_screen() ? -8 : 8);
-
- m_bg->draw(screen, bitmap, cliprect, 0, 1);
- m_fg->draw(screen, bitmap, cliprect, 0, 2);
- m_tx->draw(screen, bitmap, cliprect, 0, 4);
-
- draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT);
-
- return 0;
-}
-
-uint32_t dooyong_z80_ym2203_state::screen_update_pollux(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- m_bg->draw(screen, bitmap, cliprect, 0, 1);
- m_fg->draw(screen, bitmap, cliprect, 0, 2);
- m_tx->draw(screen, bitmap, cliprect, 0, 4);
-
- draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT | SPRITE_HEIGHT);
-
- return 0;
-}
-
-uint32_t dooyong_z80_state::screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- if (m_flytiger_pri)
- {
- m_fg->draw(screen, bitmap, cliprect, 0, 1);
- m_bg->draw(screen, bitmap, cliprect, 0, 2);
- }
- else
- {
- m_bg->draw(screen, bitmap, cliprect, 0, 1);
- m_fg->draw(screen, bitmap, cliprect, 0, 2);
- }
- m_tx->draw(screen, bitmap, cliprect, 0, 4);
-
- draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT | SPRITE_HEIGHT | SPRITE_YSHIFT_FLYTIGER);
-
- return 0;
-}
-
-
-uint32_t dooyong_z80_state::screen_update_bluehawk(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- m_bg->draw(screen, bitmap, cliprect, 0, 1);
- m_fg->draw(screen, bitmap, cliprect, 0, 2);
- m_fg2->draw(screen, bitmap, cliprect, 0, 4);
- m_tx->draw(screen, bitmap, cliprect, 0, 4);
-
- draw_sprites(screen, bitmap, cliprect, SPRITE_12BIT | SPRITE_HEIGHT | SPRITE_YSHIFT_BLUEHAWK);
-
- return 0;
-}
-
-uint32_t dooyong_z80_state::screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
-
- m_bg->draw(screen, bitmap, cliprect, 0, 0);
- if (m_tx_pri) m_tx->draw(screen, bitmap, cliprect, 0, 0);
- m_fg->draw(screen, bitmap, cliprect, 0, 0);
- if (!m_tx_pri) m_tx->draw(screen, bitmap, cliprect, 0, 0);
-
- return 0;
-}
-
-
-
-VIDEO_START_MEMBER(dooyong_z80_ym2203_state, lastday)
-{
- /* Register for save/restore */
- save_item(NAME(m_sprites_disabled));
- save_item(NAME(m_interrupt_line_1));
- save_item(NAME(m_interrupt_line_2));
-}
-
-VIDEO_START_MEMBER(dooyong_z80_ym2203_state, gulfstrm)
-{
- m_palette_bank = 0;
-
- /* Register for save/restore */
- save_item(NAME(m_palette_bank));
- save_item(NAME(m_interrupt_line_1));
- save_item(NAME(m_interrupt_line_2));
-}
-
-VIDEO_START_MEMBER(dooyong_z80_ym2203_state, pollux)
-{
- m_paletteram_flytiger = make_unique_clear<uint8_t[]>(0x1000);
- save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000);
-
- m_palette_bank = 0;
-
- /* Register for save/restore */
- save_item(NAME(m_palette_bank));
- save_item(NAME(m_interrupt_line_1));
- save_item(NAME(m_interrupt_line_2));
-}
-
-VIDEO_START_MEMBER(dooyong_z80_state, bluehawk)
-{
-}
-
-VIDEO_START_MEMBER(dooyong_z80_state, flytiger)
-{
- m_paletteram_flytiger = make_unique_clear<uint8_t[]>(0x1000);
- save_pointer(NAME(m_paletteram_flytiger.get()), 0x1000);
-
- m_palette_bank = 0;
-
- /* Register for save/restore */
- save_item(NAME(m_palette_bank));
- save_item(NAME(m_flytiger_pri));
-}
-
-VIDEO_START_MEMBER(dooyong_z80_state, primella)
-{
- /* Register for save/restore */
- save_item(NAME(m_tx_pri));
-}
-
-
-WRITE16_MEMBER(dooyong_68k_state::ctrl_w)
-{
- if (ACCESSING_BITS_0_7)
- {
- /* bit 0 flips screen */
- flip_screen_set(data & 0x0001);
-
- /* bit 4 changes tilemaps priority */
- m_bg2_priority = data & 0x0010;
-
- /* bit 5 used but unknown */
- }
-}
-
-
-void dooyong_68k_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- /* Sprites take 8 16-bit words each in memory:
- MSB LSB
- [offs + 0] ???? ???? ???? ???E
- [offs + 1] ???? ???? hhhh wwww
- [offs + 2] ???? ???? ???? ????
- [offs + 3] cccc cccc cccc cccc
- [offs + 4] ???? ???x xxxx xxxx
- [offs + 5] ???? ???? ???? ????
- [offs + 6] ???? ???y yyyy yyyy
- [offs + 7] ???? ???? ???? CCCC
- ? = unused/unknown
- E = enable
- c = gfx code
- x = x offset
- y = y offset (signed)
- C = color code
- w = width
- h = height */
-
- uint16_t const *const buffered_spriteram = m_spriteram->buffer();
- for (int offs = (m_spriteram->bytes() / 2) - 8; offs >= 0; offs -= 8)
- {
- if (buffered_spriteram[offs] & 0x0001) /* enable */
- {
- int code = buffered_spriteram[offs+3];
- int const color = buffered_spriteram[offs+7] & 0x000f;
- //TODO: This priority mechanism works for known games, but seems a bit strange.
- //Are we missing something? (The obvious spare palette bit isn't it.)
- int const pri = (((color == 0x00) || (color == 0x0f)) ? 0xfc : 0xf0);
- int const width = buffered_spriteram[offs+1] & 0x000f;
- int const height = (buffered_spriteram[offs+1] & 0x00f0) >> 4;
-
- bool const flip = flip_screen();
- int sx = buffered_spriteram[offs+4] & 0x01ff;
- int sy = (int16_t)buffered_spriteram[offs+6] & 0x01ff;
- if (sy & 0x0100) sy |= ~(int)0x01ff; // Correctly sign-extend 9-bit number
- if (flip)
- {
- sx = 498 - (16 * width) - sx;
- sy = 240 - (16 * height) - sy;
- }
-
- for (int y = 0; y <= height; y++)
- {
- int const _y = sy + (16 * (flip ? (height - y) : y));
- for (int x = 0; x <= width; x++)
- {
- int const _x = sx + (16 * (flip ? (width - x) : x));
- m_gfxdecode->gfx(0)->prio_transpen(bitmap,cliprect,
- code,
- color,
- flip, flip,
- _x, _y,
- screen.priority(),
- pri, 15);
- code++;
- }
- }
- }
- }
-}
-
-
-uint32_t rshark_state::screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- m_bg->draw(screen, bitmap, cliprect, 0, 1);
- m_bg2->draw(screen, bitmap, cliprect, 0, (m_bg2_priority ? 2 : 1));
- m_fg->draw(screen, bitmap, cliprect, 0, 2);
- m_fg2->draw(screen, bitmap, cliprect, 0, 2);
-
- draw_sprites(screen, bitmap, cliprect);
-
- return 0;
-}
-
-VIDEO_START_MEMBER(rshark_state, rshark)
-{
- /* Register for save/restore */
- save_item(NAME(m_bg2_priority));
-}
-
-
-uint32_t popbingo_state::screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- bitmap.fill(m_palette->black_pen(), cliprect);
- screen.priority().fill(0, cliprect);
-
- m_bg_bitmap.fill(m_palette->black_pen(), cliprect);
- m_bg->draw(screen, m_bg_bitmap, cliprect, 0, 1);
-
- m_bg2_bitmap.fill(m_palette->black_pen(), cliprect);
- m_bg2->draw(screen, m_bg2_bitmap, cliprect, 0, 1);
-
- for (int y = cliprect.min_y; cliprect.max_y >= y; y++)
- {
- uint16_t const *const bg_src(&m_bg_bitmap.pix16(y, 0));
- uint16_t const *const bg2_src(&m_bg2_bitmap.pix16(y, 0));
- uint16_t *const dst(&bitmap.pix16(y, 0));
- for (int x = cliprect.min_x; cliprect.max_x >= x; x++)
- dst[x] = 0x100U | (bg_src[x] << 4) | bg2_src[x];
- }
-
- draw_sprites(screen, bitmap, cliprect);
-
- return 0;
-}
-
-VIDEO_START_MEMBER(popbingo_state, popbingo)
-{
- m_screen->register_screen_bitmap(m_bg_bitmap);
- m_screen->register_screen_bitmap(m_bg2_bitmap);
-
- /* Register for save/restore */
- save_item(NAME(m_bg2_priority)); // Not used atm
-}
diff --git a/src/mame/video/dooyong.h b/src/mame/video/dooyong.h
new file mode 100644
index 00000000000..03f9bbde16c
--- /dev/null
+++ b/src/mame/video/dooyong.h
@@ -0,0 +1,145 @@
+// license:BSD-3-Clause
+// copyright-holders:Vas Crabb
+#ifndef MAME_VIDEO_DOOYONG_H
+#define MAME_VIDEO_DOOYONG_H
+
+#pragma once
+
+#include "video/bufsprite.h"
+
+#define MCFG_DOOYONG_ROM_TILEMAP_ADD(tag, gfx, num, rom, offset) \
+ MCFG_DEVICE_ADD(tag, DOOYONG_ROM_TILEMAP, 0) \
+ dooyong_rom_tilemap_device::static_set_gfxdecode_tag(*device, "^" gfx); \
+ dooyong_rom_tilemap_device::static_set_tilerom_tag(*device, "^" rom); \
+ dooyong_rom_tilemap_device::static_set_gfxnum(*device, (num)); \
+ dooyong_rom_tilemap_device::static_set_tilerom_offset(*device, (offset));
+#define MCFG_DOOYONG_ROM_TILEMAP_TRANSPARENT_PEN(pen) \
+ dooyong_rom_tilemap_device::static_set_transparent_pen(*device, (pen));
+#define MCFG_DOOYONG_ROM_TILEMAP_PRIMELLA_CODE_BITS(bits) \
+ dooyong_rom_tilemap_device::static_set_primella_code_bits(*device, (bits));
+
+#define MCFG_RSHARK_ROM_TILEMAP_ADD(tag, gfx, num, rom, offset, rom2, offset2) \
+ MCFG_DEVICE_ADD(tag, RSHARK_ROM_TILEMAP, 0) \
+ dooyong_rom_tilemap_device::static_set_gfxdecode_tag(*device, "^" gfx); \
+ dooyong_rom_tilemap_device::static_set_tilerom_tag(*device, "^" rom); \
+ dooyong_rom_tilemap_device::static_set_gfxnum(*device, (num)); \
+ dooyong_rom_tilemap_device::static_set_tilerom_offset(*device, (offset)); \
+ dooyong_rom_tilemap_device::static_set_primella_code_bits(*device, 13); \
+ rshark_rom_tilemap_device::static_set_colorrom_tag(*device, "^" rom2); \
+ rshark_rom_tilemap_device::static_set_colorrom_offset(*device, (offset2));
+
+#define MCFG_DOOYONG_RAM_TILEMAP_ADD(tag, gfx, num) \
+ MCFG_DEVICE_ADD(tag, DOOYONG_RAM_TILEMAP, 0) \
+ dooyong_rom_tilemap_device::static_set_gfxdecode_tag(*device, "^" gfx); \
+ dooyong_rom_tilemap_device::static_set_gfxnum(*device, (num));
+
+
+DECLARE_DEVICE_TYPE(DOOYONG_ROM_TILEMAP, dooyong_rom_tilemap_device)
+DECLARE_DEVICE_TYPE(RSHARK_ROM_TILEMAP, rshark_rom_tilemap_device)
+DECLARE_DEVICE_TYPE(DOOYONG_RAM_TILEMAP, dooyong_ram_tilemap_device)
+
+
+class dooyong_tilemap_device_base : public device_t
+{
+public:
+ static void static_set_gfxdecode_tag(device_t &device, char const *tag);
+ static void static_set_gfxnum(device_t &device, int gfxnum);
+
+ void draw(screen_device &screen, bitmap_ind16 &dest, rectangle const &cliprect, uint32_t flags, uint8_t priority);
+
+ void set_palette_bank(uint16_t bank);
+
+protected:
+ dooyong_tilemap_device_base(
+ machine_config const &mconfig,
+ device_type type,
+ char const *tag,
+ device_t *owner,
+ uint32_t clock);
+
+ gfx_element const &gfx() const { return *m_gfxdecode->gfx(m_gfxnum); }
+
+ required_device<gfxdecode_device> m_gfxdecode;
+ int m_gfxnum;
+
+ tilemap_t *m_tilemap;
+ uint16_t m_palette_bank;
+};
+
+class dooyong_rom_tilemap_device : public dooyong_tilemap_device_base
+{
+public:
+ dooyong_rom_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+
+ static void static_set_tilerom_tag(device_t &device, char const *tag);
+ static void static_set_tilerom_offset(device_t &device, int offset);
+ static void static_set_transparent_pen(device_t &device, unsigned pen);
+ static void static_set_primella_code_bits(device_t &device, unsigned bits);
+
+ DECLARE_WRITE8_MEMBER(ctrl_w);
+
+protected:
+ dooyong_rom_tilemap_device(
+ machine_config const &mconfig,
+ device_type type,
+ char const *tag,
+ device_t *owner,
+ uint32_t clock);
+
+ virtual void device_start() override;
+
+ virtual TILE_GET_INFO_MEMBER(tile_info);
+
+ tilemap_memory_index adjust_tile_index(tilemap_memory_index tile_index) const
+ { return tile_index + ((unsigned(m_registers[1]) * 256U / gfx().width()) * m_rows); }
+
+ int m_rows;
+
+private:
+ required_region_ptr<uint16_t> m_tilerom;
+ int m_tilerom_offset;
+ unsigned m_transparent_pen;
+ unsigned m_primella_code_mask;
+ unsigned m_primella_color_mask;
+ unsigned m_primella_color_shift;
+
+ uint8_t m_registers[0x10];
+};
+
+class rshark_rom_tilemap_device : public dooyong_rom_tilemap_device
+{
+public:
+ rshark_rom_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+
+ static void static_set_colorrom_tag(device_t &device, char const *tag);
+ static void static_set_colorrom_offset(device_t &device, int offset);
+
+protected:
+ virtual void device_start() override;
+
+ virtual TILE_GET_INFO_MEMBER(tile_info) override;
+
+private:
+ required_region_ptr<uint8_t> m_colorrom;
+ int m_colorrom_offset;
+};
+
+class dooyong_ram_tilemap_device : public dooyong_tilemap_device_base
+{
+public:
+ dooyong_ram_tilemap_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+
+ DECLARE_READ16_MEMBER(tileram_r) { return m_tileram[offset & ((64U * 32U) - 1)]; }
+ DECLARE_WRITE16_MEMBER(tileram_w);
+ void set_scrolly(int value) { m_tilemap->set_scrolly(value); }
+
+protected:
+ virtual void device_start() override;
+
+private:
+ TILE_GET_INFO_MEMBER(tile_info);
+
+ std::unique_ptr<uint16_t[]> m_tileram;
+};
+
+#endif // MAME_VIDEO_DOOYONG_H
diff --git a/src/mame/video/excellent_spr.cpp b/src/mame/video/excellent_spr.cpp
index 2b77f721cbd..7b5168563d0 100644
--- a/src/mame/video/excellent_spr.cpp
+++ b/src/mame/video/excellent_spr.cpp
@@ -20,11 +20,11 @@
#include "screen.h"
-const device_type EXCELLENT_SPRITE = device_creator<excellent_spr_device>;
+DEFINE_DEVICE_TYPE(EXCELLENT_SPRITE, excellent_spr_device, "excellent_spr", "Excellent 8-bit Sprite")
excellent_spr_device::excellent_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, EXCELLENT_SPRITE, "Excellent 8-bit Sprite", tag, owner, clock, "excellent_spr", __FILE__),
- device_video_interface(mconfig, *this)
+ : device_t(mconfig, EXCELLENT_SPRITE, tag, owner, clock)
+ , device_video_interface(mconfig, *this)
{
}
diff --git a/src/mame/video/excellent_spr.h b/src/mame/video/excellent_spr.h
index bad423784b5..36c3d002a29 100644
--- a/src/mame/video/excellent_spr.h
+++ b/src/mame/video/excellent_spr.h
@@ -1,8 +1,12 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_EXCELLENT_SPR_H
+#define MAME_VIDEO_EXCELLENT_SPR_H
-class excellent_spr_device : public device_t,
- public device_video_interface
+#pragma once
+
+
+class excellent_spr_device : public device_t, public device_video_interface
{
public:
excellent_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -21,4 +25,6 @@ protected:
private:
};
-extern const device_type EXCELLENT_SPRITE;
+DECLARE_DEVICE_TYPE(EXCELLENT_SPRITE, excellent_spr_device)
+
+#endif // MAME_VIDEO_EXCELLENT_SPR_H
diff --git a/src/mame/video/exterm.cpp b/src/mame/video/exterm.cpp
index aa5be9cd190..5327fcbd1db 100644
--- a/src/mame/video/exterm.cpp
+++ b/src/mame/video/exterm.cpp
@@ -69,7 +69,7 @@ TMS340X0_SCANLINE_IND16_CB_MEMBER(exterm_state::scanline_update)
uint16_t *bgsrc = &m_master_videoram[(params->rowaddr << 8) & 0xff00];
uint16_t *fgsrc = nullptr;
uint16_t *dest = &bitmap.pix16(scanline);
- tms34010_display_params fgparams;
+ tms340x0_device::display_params fgparams;
int coladdr = params->coladdr;
int fgcoladdr = 0;
int x;
diff --git a/src/mame/video/fuukifg.cpp b/src/mame/video/fuukifg.cpp
index 1e43d668911..5fb1012ce60 100644
--- a/src/mame/video/fuukifg.cpp
+++ b/src/mame/video/fuukifg.cpp
@@ -7,10 +7,10 @@
#include "fuukifg.h"
#include "screen.h"
-const device_type FUUKI_VIDEO = device_creator<fuukivid_device>;
+DEFINE_DEVICE_TYPE(FUUKI_VIDEO, fuukivid_device, "fuukivid", "Fuuki Video")
fuukivid_device::fuukivid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, FUUKI_VIDEO, "Fuuki Video", tag, owner, clock, "fuukivid", __FILE__)
+ : device_t(mconfig, FUUKI_VIDEO, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
diff --git a/src/mame/video/fuukifg.h b/src/mame/video/fuukifg.h
index e93b3865d65..5e57722f2cc 100644
--- a/src/mame/video/fuukifg.h
+++ b/src/mame/video/fuukifg.h
@@ -1,6 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, David Haywood
+#ifndef MAME_VIDEO_FUUKIFH_H
+#define MAME_VIDEO_FUUKIFH_H
+#pragma once
class fuukivid_device : public device_t,
@@ -38,7 +41,9 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type FUUKI_VIDEO;
+DECLARE_DEVICE_TYPE(FUUKI_VIDEO, fuukivid_device)
#define MCFG_FUUKI_VIDEO_GFXDECODE(_gfxtag) \
fuukivid_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_FUUKIFH_H
diff --git a/src/mame/video/gic.cpp b/src/mame/video/gic.cpp
index 03d9f27b4b4..03c9e1c5692 100644
--- a/src/mame/video/gic.cpp
+++ b/src/mame/video/gic.cpp
@@ -65,7 +65,7 @@
#include "screen.h"
// device type definition
-const device_type GIC = device_creator<gic_device>;
+DEFINE_DEVICE_TYPE(GIC, gic_device, "gic", "AY-3-8800-1 GIC")
//Font data taken from Paul Robson's simulator
@@ -82,27 +82,20 @@ ROM_END
//-------------------------------------------------
gic_device::gic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GIC, "GIC", tag, owner, clock, "gic", __FILE__)
- , device_sound_interface(mconfig, *this)
- , device_video_interface(mconfig, *this)
- , m_cgrom(nullptr)
- , m_audiocnt(0)
- , m_audioval(0)
- , m_audioreset(0)
- , m_ram(nullptr)
+ : gic_device(mconfig, GIC, tag, owner, clock)
{
}
-gic_device::gic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, int lines, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+gic_device::gic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
- , m_cgrom(nullptr)
+ , m_cgrom(*this, "cgrom")
, m_audiocnt(0)
, m_audioval(0)
, m_audioreset(0)
- , m_ram(nullptr)
+ , m_ram(*this)
{
}
@@ -118,8 +111,6 @@ const tiny_rom_entry *gic_device::device_rom_region() const
void gic_device::device_start()
{
- m_cgrom = memregion("cgrom")->base();
-
// Let the screen create our temporary bitmap with the screen's dimensions
m_screen->register_screen_bitmap(m_bitmap);
@@ -128,6 +119,8 @@ void gic_device::device_start()
// allocate the audio stream
m_stream = stream_alloc( 0, 1, clock()/(2*228) );
+
+ m_ram.resolve_safe(0xff);
}
@@ -193,7 +186,7 @@ uint32_t gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
for(uint8_t cx=0;cx<GIC_LEFT_W;cx++){
draw_char_left(XSTART+(cx*GIC_CHAR_W),
YSTART+(cy*GIC_CHAR_H),
- m_ram[current],
+ m_ram(machine().dummy_space(), current, 0xff),
m_bitmap);
current++;
}
@@ -206,7 +199,7 @@ uint32_t gic_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
for(uint8_t cy=0;cy<GIC_RIGHT_H;cy++){
for(uint8_t cx=0;cx<GIC_RIGHT_W;cx++){
//complex case
- uint8_t data = m_ram[current++];
+ uint8_t data = m_ram(machine().dummy_space(), current++, 0xff);
size_t currX = (XSTART+ (cx*(3+GIC_CHAR_W)));
size_t currUP = (YSTART+ (cy*(2*GIC_CHAR_H)));
@@ -302,9 +295,7 @@ void gic_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
//lo for 1824(228*8)
//hi for 1824(228*8)
- if(!m_ram) return;
-
- uint8_t audioByte = m_ram[GIC_AUDIO_BYTE]*2;
+ uint8_t audioByte = m_ram(machine().dummy_space(), GIC_AUDIO_BYTE, 0xff)*2;
if(!audioByte){
for(size_t i = 0; i < samples; i++)
diff --git a/src/mame/video/gic.h b/src/mame/video/gic.h
index 35b2a675cb8..463d6a818c0 100644
--- a/src/mame/video/gic.h
+++ b/src/mame/video/gic.h
@@ -11,10 +11,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_VIDEO_GIC_H
+#define MAME_VIDEO_GIC_H
-#ifndef __GIC_H__
-#define __GIC_H__
+#pragma once
@@ -22,9 +22,10 @@
DEVICE CONFIGURATION MACROS
***************************************************************************/
-#define MCFG_GIC_ADD(_tag, _clock, _screen_tag) \
- MCFG_DEVICE_ADD(_tag, GIC, _clock) \
- MCFG_VIDEO_SET_SCREEN(_screen_tag)
+#define MCFG_GIC_ADD(tag, clock, screen_tag, ram_cb) \
+ MCFG_DEVICE_ADD(tag, GIC, clock) \
+ MCFG_VIDEO_SET_SCREEN(screen_tag) \
+ gic_device::set_ram(*device, DEVCB_##ram_cb);
/***************************************************************************
TYPE DEFINITIONS
@@ -54,10 +55,10 @@ class gic_device : public device_t
public:
// construction/destruction
gic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- gic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, int lines, const char *shortname, const char *source);
// static configuration helpers
static void set_screen_tag(device_t &device, const char *screen_tag) { downcast<gic_device &>(device).m_screen_tag = screen_tag; }
+ template <typename Obj> static void set_ram(device_t &device, Obj &&cb) { downcast<gic_device &>(device).m_ram.set_callback(std::forward<Obj>(cb)); }
DECLARE_PALETTE_INIT(gic);
@@ -65,19 +66,18 @@ public:
inline bitmap_ind16 *get_bitmap() { return &m_bitmap; }
- //plgDavid please change this to a MESS friendly handshake
- void set_shared_memory(const uint8_t*m){ m_ram = m;};
-
// Global constants (non measured figures)
- static const int START_ACTIVE_SCAN = 10;
- static const int BORDER_SIZE = GIC_CHAR_W*3;
- static const int END_ACTIVE_SCAN = 10 + GIC_CHAR_W*2 + 150 + GIC_CHAR_W*2;
- static const int START_Y = 1;
- static const int SCREEN_HEIGHT = GIC_CHAR_H*(GIC_LEFT_H+2);
- static const int LINE_CLOCKS = 455;
- static const int LINES = 262;
+ static constexpr int START_ACTIVE_SCAN = 10;
+ static constexpr int BORDER_SIZE = GIC_CHAR_W*3;
+ static constexpr int END_ACTIVE_SCAN = 10 + GIC_CHAR_W*2 + 150 + GIC_CHAR_W*2;
+ static constexpr int START_Y = 1;
+ static constexpr int SCREEN_HEIGHT = GIC_CHAR_H*(GIC_LEFT_H+2);
+ static constexpr int LINE_CLOCKS = 455;
+ static constexpr int LINES = 262;
protected:
+ gic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -96,7 +96,7 @@ protected:
void draw_char_right(int x, int y, uint8_t code, bitmap_ind16 &bitmap,int bg_col);
bitmap_ind16 m_bitmap;
- uint8_t * m_cgrom; // internal chargen ROM
+ required_region_ptr<uint8_t> m_cgrom; // internal chargen ROM
emu_timer *m_vblank_timer;
sound_stream *m_stream;
@@ -104,10 +104,10 @@ protected:
int m_audiocnt;
int m_audioval;
int m_audioreset;
- const uint8_t* m_ram;
+ devcb_read8 m_ram;
};
// device type definition
-extern const device_type GIC;
+DECLARE_DEVICE_TYPE(GIC, gic_device)
-#endif /* __GIC_H__ */
+#endif // MAME_VIDEO_GIC_H
diff --git a/src/mame/video/gijoe.cpp b/src/mame/video/gijoe.cpp
index b8969055690..13bec02c520 100644
--- a/src/mame/video/gijoe.cpp
+++ b/src/mame/video/gijoe.cpp
@@ -75,7 +75,7 @@ void gijoe_state::video_start()
uint32_t gijoe_state::screen_update_gijoe(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 };
+ static const int K053251_CI[4] = { k053251_device::CI1, k053251_device::CI2, k053251_device::CI3, k053251_device::CI4 };
int layer[4];
int vrc_mode, vrc_new, colorbase_new, /*primode,*/ dirty, i;
int mask = 0;
@@ -99,7 +99,7 @@ uint32_t gijoe_state::screen_update_gijoe(screen_device &screen, bitmap_ind16 &b
m_avac_bits[3] = m_avac_bits[2] = m_avac_bits[1] = m_avac_bits[0] = 0xf000;
// update color info and refresh tilemaps
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
for (i = 0; i < 4; i++)
{
@@ -142,16 +142,16 @@ uint32_t gijoe_state::screen_update_gijoe(screen_device &screen, bitmap_ind16 &b
}
// seems to switch the K053251 between different priority modes, detail unknown
- // primode = m_k053251->get_priority(K053251_CI1);
+ // primode = m_k053251->get_priority(k053251_device::CI1);
layer[0] = 0;
m_layer_pri[0] = 0; // not sure
layer[1] = 1;
- m_layer_pri[1] = m_k053251->get_priority(K053251_CI2);
+ m_layer_pri[1] = m_k053251->get_priority(k053251_device::CI2);
layer[2] = 2;
- m_layer_pri[2] = m_k053251->get_priority(K053251_CI3);
+ m_layer_pri[2] = m_k053251->get_priority(k053251_device::CI3);
layer[3] = 3;
- m_layer_pri[3] = m_k053251->get_priority(K053251_CI4);
+ m_layer_pri[3] = m_k053251->get_priority(k053251_device::CI4);
konami_sortlayers4(layer, m_layer_pri);
diff --git a/src/mame/video/gime.cpp b/src/mame/video/gime.cpp
index 97ee4fb5515..0009b950ea8 100644
--- a/src/mame/video/gime.cpp
+++ b/src/mame/video/gime.cpp
@@ -108,8 +108,8 @@
// ctor
//-------------------------------------------------
-gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const uint8_t *fontdata, const char *shortname, const char *source)
- : mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, true, 263, 25+192+26+3, false, shortname, source),
+gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const uint8_t *fontdata)
+ : mc6847_friend_device(mconfig, type, tag, owner, clock, fontdata, true, 263, 25+192+26+3, false),
m_write_irq(*this),
m_write_firq(*this),
m_read_floating_bus(*this),
@@ -2023,8 +2023,8 @@ const uint8_t gime_base_device::hires_font[128][12] =
// VARIATIONS
//**************************************************************************
-const device_type GIME_NTSC = device_creator<gime_ntsc_device>;
-const device_type GIME_PAL = device_creator<gime_pal_device>;
+DEFINE_DEVICE_TYPE(GIME_NTSC, gime_ntsc_device, "gime_ntsc", "CoCo GIME (NTSC)")
+DEFINE_DEVICE_TYPE(GIME_PAL, gime_pal_device, "gime_pal", "CoCo GIME (PAL)")
@@ -2033,7 +2033,7 @@ const device_type GIME_PAL = device_creator<gime_pal_device>;
//-------------------------------------------------
gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : gime_base_device(mconfig, GIME_NTSC, "GIME_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, "gime_ntsc", __FILE__)
+ : gime_base_device(mconfig, GIME_NTSC, tag, owner, clock, ntsc_round_fontdata8x12)
{
}
@@ -2044,6 +2044,6 @@ gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, const char *ta
//-------------------------------------------------
gime_pal_device::gime_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : gime_base_device(mconfig, GIME_PAL, "GIME_PAL", tag, owner, clock, pal_round_fontdata8x12, "gime_pal", __FILE__)
+ : gime_base_device(mconfig, GIME_PAL, tag, owner, clock, pal_round_fontdata8x12)
{
}
diff --git a/src/mame/video/gime.h b/src/mame/video/gime.h
index 52e4aeca021..e2b3ec96354 100644
--- a/src/mame/video/gime.h
+++ b/src/mame/video/gime.h
@@ -9,10 +9,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_VIDEO_GIME_H
+#define MAME_VIDEO_GIME_H
-#ifndef __GIME__
-#define __GIME__
+#pragma once
#include "video/mc6847.h"
#include "machine/6883sam.h"
@@ -55,9 +55,9 @@ class cococart_slot_device;
class gime_base_device : public mc6847_friend_device, public sam6883_friend_device
{
public:
- template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_write_irq.set_callback(object); }
- template<class _Object> static devcb_base &set_firq_wr_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_write_firq.set_callback(object); }
- template<class _Object> static devcb_base &set_floating_bus_rd_callback(device_t &device, _Object object) { return downcast<gime_base_device &>(device).m_read_floating_bus.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<gime_base_device &>(device).m_write_irq.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_firq_wr_callback(device_t &device, Object &&cb) { return downcast<gime_base_device &>(device).m_write_firq.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_floating_bus_rd_callback(device_t &device, Object &&cb) { return downcast<gime_base_device &>(device).m_read_floating_bus.set_callback(std::forward<Object>(cb)); }
static void set_maincpu_tag(device_t &device, const char *tag) { downcast<gime_base_device &>(device).m_maincpu_tag = tag; }
static void set_ram_tag(device_t &device, const char *tag) { downcast<gime_base_device &>(device).m_ram_tag = tag; }
static void set_ext_tag(device_t &device, const char *tag) { downcast<gime_base_device &>(device).m_ext_tag = tag; }
@@ -91,7 +91,7 @@ public:
void set_il2(bool value) { set_interrupt_value(INTERRUPT_EI2, value); }
protected:
- gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const uint8_t *fontdata, const char *shortname, const char *source);
+ gime_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const uint8_t *fontdata);
// device-level overrides
virtual void device_start(void) override;
@@ -307,7 +307,7 @@ public:
gime_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
-extern const device_type GIME_NTSC;
-extern const device_type GIME_PAL;
+DECLARE_DEVICE_TYPE(GIME_NTSC, gime_ntsc_device)
+DECLARE_DEVICE_TYPE(GIME_PAL, gime_pal_device)
-#endif /* __GIME__ */
+#endif //MAME_VIDEO_GIME_H
diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp
index 3469e84b95a..6fcf7e3bf44 100644
--- a/src/mame/video/gp9001.cpp
+++ b/src/mame/video/gp9001.cpp
@@ -212,10 +212,10 @@ GFXDECODE_MEMBER( gp9001vdp_device::gfxinfo )
GFXDECODE_END
-const device_type GP9001_VDP = device_creator<gp9001vdp_device>;
+DEFINE_DEVICE_TYPE(GP9001_VDP, gp9001vdp_device, "gp9001vdp", "GP9001 VDP")
gp9001vdp_device::gp9001vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, GP9001_VDP, "GP9001 VDP", tag, owner, clock, "gp9001vdp", __FILE__),
+ : device_t(mconfig, GP9001_VDP, tag, owner, clock),
device_gfx_interface(mconfig, *this, gfxinfo),
device_video_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
@@ -238,12 +238,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_top0_tile_info)
attrib = m_vram_top[2*tile_index];
- tile_number = m_vram_top[2*tile_index+1];
-
- if (gp9001_gfxrom_is_banked)
- {
- tile_number = ( gp9001_gfxrom_bank[(tile_number >> 13) & 7] << 13 ) | ( tile_number & 0x1fff );
- }
+ tile_number = get_tile_number(m_vram_top, tile_index);
color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
SET_TILE_INFO_MEMBER(0,
@@ -259,13 +254,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_fg0_tile_info)
attrib = m_vram_fg[2*tile_index];
- tile_number = m_vram_fg[2*tile_index+1];
-
-
- if (gp9001_gfxrom_is_banked)
- {
- tile_number = ( gp9001_gfxrom_bank[(tile_number >> 13) & 7] << 13 ) | ( tile_number & 0x1fff );
- }
+ tile_number = get_tile_number(m_vram_fg, tile_index);
color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
SET_TILE_INFO_MEMBER(0,
@@ -280,12 +269,7 @@ TILE_GET_INFO_MEMBER(gp9001vdp_device::get_bg0_tile_info)
int color, tile_number, attrib;
attrib = m_vram_bg[2*tile_index];
- tile_number = m_vram_bg[2*tile_index+1];
-
- if (gp9001_gfxrom_is_banked)
- {
- tile_number = ( gp9001_gfxrom_bank[(tile_number >> 13) & 7] << 13 ) | ( tile_number & 0x1fff );
- }
+ tile_number = get_tile_number(m_vram_bg, tile_index);
color = attrib & 0x0fff; // 0x0f00 priority, 0x007f colour
SET_TILE_INFO_MEMBER(0,
@@ -309,11 +293,11 @@ void gp9001vdp_device::create_tilemaps()
void gp9001vdp_device::device_start()
{
- sp.vram16_buffer = make_unique_clear<uint16_t[]>(GP9001_SPRITERAM_SIZE/2);
+ sp.vram16_buffer = make_unique_clear<uint16_t[]>(SPRITERAM_SIZE/2);
create_tilemaps();
- save_pointer(NAME(sp.vram16_buffer.get()), GP9001_SPRITERAM_SIZE/2);
+ save_pointer(NAME(sp.vram16_buffer.get()), SPRITERAM_SIZE/2);
save_item(NAME(gp9001_scroll_reg));
save_item(NAME(gp9001_voffs));
@@ -330,9 +314,9 @@ void gp9001vdp_device::device_start()
save_item(NAME(top.flip));
save_item(NAME(sp.flip));
- gp9001_gfxrom_is_banked = 0;
- gp9001_gfxrom_bank_dirty = 0;
- save_item(NAME(gp9001_gfxrom_bank));
+ gfxrom_is_banked = false;
+ gfxrom_bank_dirty = false;
+ save_item(NAME(gfxrom_bank));
// default layer offsets used by all original games
bg.extra_xoffset.normal = -0x1d6;
@@ -416,80 +400,80 @@ void gp9001vdp_device::gp9001_scroll_reg_select_w(uint16_t data, uint16_t mem_ma
}
}
-static void gp9001_set_scrollx_and_flip_reg(gp9001tilemaplayer* layer, uint16_t data, uint16_t mem_mask, int flip)
+void gp9001vdp_device::tilemaplayer::set_scrollx_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f)
{
- COMBINE_DATA(&layer->scrollx);
+ COMBINE_DATA(&scrollx);
- if (flip)
+ if (f)
{
- layer->flip |= TILEMAP_FLIPX;
- layer->tmap->set_scrollx(0,-(layer->scrollx+layer->extra_xoffset.flipped));
+ flip |= TILEMAP_FLIPX;
+ tmap->set_scrollx(0, -(scrollx + extra_xoffset.flipped));
}
else
{
- layer->flip &= (~TILEMAP_FLIPX);
- layer->tmap->set_scrollx(0,layer->scrollx+layer->extra_xoffset.normal);
+ flip &= ~TILEMAP_FLIPX;
+ tmap->set_scrollx(0, scrollx + extra_xoffset.normal);
}
- layer->tmap->set_flip(layer->flip);
+ tmap->set_flip(flip);
}
-static void gp9001_set_scrolly_and_flip_reg(gp9001tilemaplayer* layer, uint16_t data, uint16_t mem_mask, int flip)
+void gp9001vdp_device::tilemaplayer::set_scrolly_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f)
{
- COMBINE_DATA(&layer->scrolly);
+ COMBINE_DATA(&scrolly);
- if (flip)
+ if (f)
{
- layer->flip |= TILEMAP_FLIPY;
- layer->tmap->set_scrolly(0,-(layer->scrolly+layer->extra_yoffset.flipped));
+ flip |= TILEMAP_FLIPY;
+ tmap->set_scrolly(0, -(scrolly + extra_yoffset.flipped));
}
else
{
- layer->flip &= (~TILEMAP_FLIPY);
- layer->tmap->set_scrolly(0,layer->scrolly+layer->extra_yoffset.normal);
+ flip &= ~TILEMAP_FLIPY;
+ tmap->set_scrolly(0, scrolly + extra_yoffset.normal);
}
- layer->tmap->set_flip(layer->flip);
+ tmap->set_flip(flip);
}
-static void gp9001_set_sprite_scrollx_and_flip_reg(gp9001spritelayer* layer, uint16_t data, uint16_t mem_mask, int flip)
+void gp9001vdp_device::spritelayer::set_scrollx_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f)
{
- if (flip)
+ if (f)
{
- data += layer->extra_xoffset.flipped;
- COMBINE_DATA(&layer->scrollx);
- if (layer->scrollx & 0x8000) layer->scrollx |= 0xfe00;
- else layer->scrollx &= 0x1ff;
- layer->flip |= GP9001_SPRITE_FLIPX;
+ data += extra_xoffset.flipped;
+ COMBINE_DATA(&scrollx);
+ if (scrollx & 0x8000) scrollx |= 0xfe00;
+ else scrollx &= 0x1ff;
+ flip |= SPRITE_FLIPX;
}
else
{
- data += layer->extra_xoffset.normal;
- COMBINE_DATA(&layer->scrollx);
+ data += extra_xoffset.normal;
+ COMBINE_DATA(&scrollx);
- if (layer->scrollx & 0x8000) layer->scrollx |= 0xfe00;
- else layer->scrollx &= 0x1ff;
- layer->flip &= (~GP9001_SPRITE_FLIPX);
+ if (scrollx & 0x8000) scrollx |= 0xfe00;
+ else scrollx &= 0x1ff;
+ flip &= ~SPRITE_FLIPX;
}
}
-static void gp9001_set_sprite_scrolly_and_flip_reg(gp9001spritelayer* layer, uint16_t data, uint16_t mem_mask, int flip)
+void gp9001vdp_device::spritelayer::set_scrolly_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f)
{
- if (flip)
+ if (f)
{
- data += layer->extra_yoffset.flipped;
- COMBINE_DATA(&layer->scrolly);
- if (layer->scrolly & 0x8000) layer->scrolly |= 0xfe00;
- else layer->scrolly &= 0x1ff;
- layer->flip |= GP9001_SPRITE_FLIPY;
+ data += extra_yoffset.flipped;
+ COMBINE_DATA(&scrolly);
+ if (scrolly & 0x8000) scrolly |= 0xfe00;
+ else scrolly &= 0x1ff;
+ flip |= SPRITE_FLIPY;
}
else
{
- data += layer->extra_yoffset.normal;
- COMBINE_DATA(&layer->scrolly);
- if (layer->scrolly & 0x8000) layer->scrolly |= 0xfe00;
- else layer->scrolly &= 0x1ff;
- layer->flip &= (~GP9001_SPRITE_FLIPY);
+ data += extra_yoffset.normal;
+ COMBINE_DATA(&scrolly);
+ if (scrolly & 0x8000) scrolly |= 0xfe00;
+ else scrolly &= 0x1ff;
+ flip &= ~SPRITE_FLIPY;
}
}
@@ -502,19 +486,19 @@ void gp9001vdp_device::gp9001_scroll_reg_data_w(uint16_t data, uint16_t mem_mask
// writes with 8x set turn on flip for the specified layer / axis
int flip = gp9001_scroll_reg & 0x80;
- switch(gp9001_scroll_reg&0x7f)
+ switch (gp9001_scroll_reg&0x7f)
{
- case 0x00: gp9001_set_scrollx_and_flip_reg(&bg, data, mem_mask, flip); break;
- case 0x01: gp9001_set_scrolly_and_flip_reg(&bg, data, mem_mask, flip); break;
+ case 0x00: bg.set_scrollx_and_flip_reg(data, mem_mask, flip); break;
+ case 0x01: bg.set_scrolly_and_flip_reg(data, mem_mask, flip); break;
- case 0x02: gp9001_set_scrollx_and_flip_reg(&fg, data, mem_mask, flip); break;
- case 0x03: gp9001_set_scrolly_and_flip_reg(&fg, data, mem_mask, flip); break;
+ case 0x02: fg.set_scrollx_and_flip_reg(data, mem_mask, flip); break;
+ case 0x03: fg.set_scrolly_and_flip_reg(data, mem_mask, flip); break;
- case 0x04: gp9001_set_scrollx_and_flip_reg(&top,data, mem_mask, flip); break;
- case 0x05: gp9001_set_scrolly_and_flip_reg(&top,data, mem_mask, flip); break;
+ case 0x04: top.set_scrollx_and_flip_reg(data, mem_mask, flip); break;
+ case 0x05: top.set_scrolly_and_flip_reg(data, mem_mask, flip); break;
- case 0x06: gp9001_set_sprite_scrollx_and_flip_reg(&sp, data,mem_mask,flip); break;
- case 0x07: gp9001_set_sprite_scrolly_and_flip_reg(&sp, data,mem_mask,flip); break;
+ case 0x06: sp.set_scrollx_and_flip_reg(data, mem_mask, flip); break;
+ case 0x07: sp.set_scrolly_and_flip_reg(data, mem_mask, flip); break;
case 0x0e: /******* Initialise video controller register ? *******/
@@ -529,14 +513,14 @@ void gp9001vdp_device::gp9001_scroll_reg_data_w(uint16_t data, uint16_t mem_mask
void gp9001vdp_device::init_scroll_regs()
{
- gp9001_set_scrollx_and_flip_reg(&bg, 0, 0xffff, 0);
- gp9001_set_scrolly_and_flip_reg(&bg, 0, 0xffff, 0);
- gp9001_set_scrollx_and_flip_reg(&fg, 0, 0xffff, 0);
- gp9001_set_scrolly_and_flip_reg(&fg, 0, 0xffff, 0);
- gp9001_set_scrollx_and_flip_reg(&top,0, 0xffff, 0);
- gp9001_set_scrolly_and_flip_reg(&top,0, 0xffff, 0);
- gp9001_set_sprite_scrollx_and_flip_reg(&sp, 0,0xffff,0);
- gp9001_set_sprite_scrolly_and_flip_reg(&sp, 0,0xffff,0);
+ bg.set_scrollx_and_flip_reg(0, 0xffff, 0);
+ bg.set_scrolly_and_flip_reg(0, 0xffff, 0);
+ fg.set_scrollx_and_flip_reg(0, 0xffff, 0);
+ fg.set_scrolly_and_flip_reg(0, 0xffff, 0);
+ top.set_scrollx_and_flip_reg(0, 0xffff, 0);
+ top.set_scrolly_and_flip_reg(0, 0xffff, 0);
+ sp.set_scrollx_and_flip_reg(0, 0xffff, 0);
+ sp.set_scrolly_and_flip_reg(0, 0xffff, 0);
}
@@ -689,7 +673,7 @@ void gp9001vdp_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clip
int old_x = (-(sp.scrollx)) & 0x1ff;
int old_y = (-(sp.scrolly)) & 0x1ff;
- for (int offs = 0; offs < (GP9001_SPRITERAM_SIZE/2); offs += 4)
+ for (int offs = 0; offs < (SPRITERAM_SIZE/2); offs += 4)
{
int attrib, sprite, color, priority, flipx, flipy, sx, sy;
int sprite_sizex, sprite_sizey, dim_x, dim_y, sx_base, sy_base;
@@ -700,7 +684,7 @@ void gp9001vdp_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clip
if ((attrib & 0x8000))
{
- if (!gp9001_gfxrom_is_banked) /* No Sprite select bank switching needed */
+ if (!gfxrom_is_banked) /* No Sprite select bank switching needed */
{
sprite = ((attrib & 3) << 16) | source[offs + 1]; /* 18 bit */
}
@@ -708,7 +692,7 @@ void gp9001vdp_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clip
{
sprite_num = source[offs + 1] & 0x7fff;
bank = ((attrib & 3) << 1) | (source[offs + 1] >> 15);
- sprite = (gp9001_gfxrom_bank[bank] << 15 ) | sprite_num;
+ sprite = (gfxrom_bank[bank] << 15 ) | sprite_num;
}
color = (attrib >> 2) & 0x3f;
@@ -730,8 +714,8 @@ void gp9001vdp_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clip
old_x = sx_base;
old_y = sy_base;
- flipx = attrib & GP9001_SPRITE_FLIPX;
- flipy = attrib & GP9001_SPRITE_FLIPY;
+ flipx = attrib & SPRITE_FLIPX;
+ flipy = attrib & SPRITE_FLIPY;
if (flipx)
{
@@ -757,15 +741,15 @@ void gp9001vdp_device::draw_sprites( bitmap_ind16 &bitmap, const rectangle &clip
/***** Flip the sprite layer in any active X or Y flip *****/
if (sp.flip)
{
- if (sp.flip & GP9001_SPRITE_FLIPX)
+ if (sp.flip & SPRITE_FLIPX)
sx_base = 320 - sx_base;
- if (sp.flip & GP9001_SPRITE_FLIPY)
+ if (sp.flip & SPRITE_FLIPY)
sy_base = 240 - sy_base;
}
/***** Cancel flip, if it, and sprite layer flip are active *****/
- flipx = (flipx ^ (sp.flip & GP9001_SPRITE_FLIPX));
- flipy = (flipy ^ (sp.flip & GP9001_SPRITE_FLIPY));
+ flipx = (flipx ^ (sp.flip & SPRITE_FLIPX));
+ flipy = (flipy ^ (sp.flip & SPRITE_FLIPY));
/***** Draw the complete sprites using the dimension info *****/
for (dim_y = 0; dim_y < sprite_sizey; dim_y += 8)
@@ -920,11 +904,11 @@ static const uint8_t batsugun_prienable0[16]={ 1, 1, 1, 1, 1, 1,
void gp9001vdp_device::gp9001_render_vdp(bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- if (gp9001_gfxrom_is_banked && gp9001_gfxrom_bank_dirty)
+ if (gfxrom_is_banked && gfxrom_bank_dirty)
{
bg.tmap->mark_all_dirty();
fg.tmap->mark_all_dirty();
- gp9001_gfxrom_bank_dirty = 0;
+ gfxrom_bank_dirty = false;
}
gp9001_draw_custom_tilemap(bitmap, bg.tmap, gp9001_primap1, batsugun_prienable0);
@@ -937,5 +921,5 @@ void gp9001vdp_device::gp9001_render_vdp(bitmap_ind16 &bitmap, const rectangle &
void gp9001vdp_device::gp9001_screen_eof(void)
{
/** Shift sprite RAM buffers *** Used to fix sprite lag **/
- if (sp.use_sprite_buffer) memcpy(sp.vram16_buffer.get(),m_spriteram,GP9001_SPRITERAM_SIZE);
+ if (sp.use_sprite_buffer) memcpy(sp.vram16_buffer.get(),m_spriteram,SPRITERAM_SIZE);
}
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index c788f1788d0..703d4e08ee5 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -1,59 +1,19 @@
// license:BSD-3-Clause
// copyright-holders:Quench, David Haywood
/* GP9001 Video Controller */
+#ifndef MAME_VIDEO_GP9001_H
+#define MAME_VIDEO_GP9001_H
-struct gp9001layeroffsets
-{
- int normal;
- int flipped;
-};
-
-struct gp9001layer
-{
- uint16_t flip;
- uint16_t scrollx;
- uint16_t scrolly;
-
- gp9001layeroffsets extra_xoffset;
- gp9001layeroffsets extra_yoffset;
-};
-
-struct gp9001tilemaplayer : gp9001layer
-{
- tilemap_t *tmap;
-};
-
-struct gp9001spritelayer : gp9001layer
-{
- bool use_sprite_buffer;
- std::unique_ptr<uint16_t[]> vram16_buffer; // vram buffer for this layer
-};
-
+#pragma once
class gp9001vdp_device : public device_t,
public device_gfx_interface,
public device_video_interface,
public device_memory_interface
{
- static const gfx_layout tilelayout, spritelayout;
- DECLARE_GFXDECODE_MEMBER(gfxinfo);
-
public:
gp9001vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- uint16_t gp9001_voffs;
- uint16_t gp9001_scroll_reg;
-
- gp9001tilemaplayer bg, top, fg;
- gp9001spritelayer sp;
-
- // technically this is just rom banking, allowing the chip to see more graphic ROM, however it's easier to handle it
- // in the chip implementation than externally for now (which would require dynamic decoding of the entire charsets every
- // time the bank was changed)
- int gp9001_gfxrom_is_banked;
- int gp9001_gfxrom_bank_dirty; /* dirty flag of object bank (for Batrider) */
- uint16_t gp9001_gfxrom_bank[8]; /* Batrider object bank */
-
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, const uint8_t* primap );
void gp9001_draw_custom_tilemap( bitmap_ind16 &bitmap, tilemap_t* tilemap, const uint8_t* priremap, const uint8_t* pri_enable );
@@ -66,6 +26,24 @@ public:
DECLARE_ADDRESS_MAP(map, 16);
+ // game-specific hack stuff
+ void disable_sprite_buffer() { sp.use_sprite_buffer = 0; }
+ void set_bg_extra_offsets(int xn, int yn, int xf, int yf) { bg.set_extra_offsets(xn, yn, xf, yf); }
+ void set_fg_extra_offsets(int xn, int yn, int xf, int yf) { fg.set_extra_offsets(xn, yn, xf, yf); }
+ void set_top_extra_offsets(int xn, int yn, int xf, int yf) { top.set_extra_offsets(xn, yn, xf, yf); }
+ void set_sp_extra_offsets(int xn, int yn, int xf, int yf) { sp.set_extra_offsets(xn, yn, xf, yf); }
+
+ // ROM banking control
+ void set_gfxrom_banked() { gfxrom_is_banked = true; }
+ void set_gfxrom_bank(unsigned index, uint16_t value)
+ {
+ if (gfxrom_bank[index] != value)
+ {
+ gfxrom_bank[index] = value;
+ gfxrom_bank_dirty = true;
+ }
+ }
+
// access to VDP
DECLARE_READ16_MEMBER( gp9001_vdp_r );
DECLARE_WRITE16_MEMBER( gp9001_vdp_w );
@@ -97,10 +75,65 @@ protected:
TILE_GET_INFO_MEMBER(get_bg0_tile_info);
private:
- required_shared_ptr<uint16_t> m_vram_bg;
- required_shared_ptr<uint16_t> m_vram_fg;
- required_shared_ptr<uint16_t> m_vram_top;
- required_shared_ptr<uint16_t> m_spriteram;
+ static constexpr unsigned BG_VRAM_SIZE = 0x1000; /* Background RAM size */
+ static constexpr unsigned FG_VRAM_SIZE = 0x1000; /* Foreground RAM size */
+ static constexpr unsigned TOP_VRAM_SIZE = 0x1000; /* Top Layer RAM size */
+ static constexpr unsigned SPRITERAM_SIZE = 0x0800; /* Sprite RAM size */
+ static constexpr unsigned SPRITE_FLIPX = 0x1000; /* Sprite flip flags */
+ static constexpr unsigned SPRITE_FLIPY = 0x2000;
+
+ struct gp9001layeroffsets
+ {
+ int normal;
+ int flipped;
+ };
+
+ struct gp9001layer
+ {
+ void set_extra_offsets(int xn, int yn, int xf, int yf)
+ {
+ extra_xoffset.normal = xn;
+ extra_yoffset.normal = yn;
+ extra_xoffset.flipped = xf;
+ extra_yoffset.flipped = yf;
+ }
+
+ uint16_t flip;
+ uint16_t scrollx;
+ uint16_t scrolly;
+
+ gp9001layeroffsets extra_xoffset;
+ gp9001layeroffsets extra_yoffset;
+ };
+
+ struct tilemaplayer : gp9001layer
+ {
+ void set_scrollx_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f);
+ void set_scrolly_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f);
+
+ tilemap_t *tmap;
+ };
+
+ struct spritelayer : gp9001layer
+ {
+ void set_scrollx_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f);
+ void set_scrolly_and_flip_reg(uint16_t data, uint16_t mem_mask, bool f);
+
+ bool use_sprite_buffer;
+ std::unique_ptr<uint16_t[]> vram16_buffer; // vram buffer for this layer
+ };
+
+ int get_tile_number(uint16_t const *vram, int index)
+ {
+ uint16_t const value = vram[(index << 1) | 1];
+ if (gfxrom_is_banked)
+ return (gfxrom_bank[(value >> 13) & 7] << 13) | (value & 0x1fff);
+ else
+ return value;
+ }
+
+ static const gfx_layout tilelayout, spritelayout;
+ DECLARE_GFXDECODE_MEMBER(gfxinfo);
void gp9001_voffs_w(uint16_t data, uint16_t mem_mask);
int gp9001_videoram16_r(void);
@@ -108,13 +141,26 @@ private:
uint16_t gp9001_vdpstatus_r(void);
void gp9001_scroll_reg_select_w(uint16_t data, uint16_t mem_mask);
void gp9001_scroll_reg_data_w(uint16_t data, uint16_t mem_mask);
+
+ uint16_t gp9001_voffs;
+ uint16_t gp9001_scroll_reg;
+
+ tilemaplayer bg, top, fg;
+ spritelayer sp;
+
+ // technically this is just rom banking, allowing the chip to see more graphic ROM, however it's easier to handle it
+ // in the chip implementation than externally for now (which would require dynamic decoding of the entire charsets every
+ // time the bank was changed)
+ bool gfxrom_is_banked;
+ bool gfxrom_bank_dirty; /* dirty flag of object bank (for Batrider) */
+ uint16_t gfxrom_bank[8]; /* Batrider object bank */
+
+ required_shared_ptr<uint16_t> m_vram_bg;
+ required_shared_ptr<uint16_t> m_vram_fg;
+ required_shared_ptr<uint16_t> m_vram_top;
+ required_shared_ptr<uint16_t> m_spriteram;
};
-extern const device_type GP9001_VDP;
+DECLARE_DEVICE_TYPE(GP9001_VDP, gp9001vdp_device)
-#define GP9001_BG_VRAM_SIZE 0x1000 /* Background RAM size */
-#define GP9001_FG_VRAM_SIZE 0x1000 /* Foreground RAM size */
-#define GP9001_TOP_VRAM_SIZE 0x1000 /* Top Layer RAM size */
-#define GP9001_SPRITERAM_SIZE 0x800 /* Sprite RAM size */
-#define GP9001_SPRITE_FLIPX 0x1000 /* Sprite flip flags */
-#define GP9001_SPRITE_FLIPY 0x2000
+#endif // MAME_VIDEO_GP9001_H
diff --git a/src/mame/video/gstriker.cpp b/src/mame/video/gstriker.cpp
index 72e1ee4c1bc..4b6bab05a61 100644
--- a/src/mame/video/gstriker.cpp
+++ b/src/mame/video/gstriker.cpp
@@ -27,7 +27,7 @@ uint32_t gstriker_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
m_spr->draw_sprites(m_CG10103_m_vram, 0x2000, screen, bitmap, cliprect, 0x2, 0x0);
- m_tx->draw( screen, bitmap, cliprect, 0);
+ m_tx->draw(screen, bitmap, cliprect, 0);
m_spr->draw_sprites(m_CG10103_m_vram, 0x2000, screen, bitmap, cliprect, 0x2, 0x2);
@@ -37,8 +37,8 @@ uint32_t gstriker_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
void gstriker_state::video_start()
{
// Initialize the chip for the score plane
- m_tx->get_tilemap()->set_transparent_pen(0xf);
+ m_tx->set_transparent_pen(0xf);
// Initialize the chip for the screen plane
- m_bg->get_tilemap()->set_transparent_pen(0xf);
+ m_bg->set_transparent_pen(0xf);
}
diff --git a/src/mame/video/gtia.cpp b/src/mame/video/gtia.cpp
index 3010dad1121..cacd7d84c97 100644
--- a/src/mame/video/gtia.cpp
+++ b/src/mame/video/gtia.cpp
@@ -112,16 +112,16 @@
// devices
-const device_type ATARI_GTIA = device_creator<gtia_device>;
+DEFINE_DEVICE_TYPE(ATARI_GTIA, gtia_device, "gtia", "Atari GTIA")
//-------------------------------------------------
// upd7220_device - constructor
//-------------------------------------------------
gtia_device::gtia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ATARI_GTIA, "Atari GTIA", tag, owner, clock, "gtia", __FILE__),
- m_read_cb(*this),
- m_write_cb(*this)
+ device_t(mconfig, ATARI_GTIA, tag, owner, clock),
+ m_read_cb(*this),
+ m_write_cb(*this)
{
}
diff --git a/src/mame/video/gtia.h b/src/mame/video/gtia.h
index 6bb78f407ed..68f911fde35 100644
--- a/src/mame/video/gtia.h
+++ b/src/mame/video/gtia.h
@@ -10,110 +10,12 @@
***************************************************************************/
-#ifndef __GTIA_H__
-#define __GTIA_H__
+#ifndef MAME_VIDEO_GTIA_H
+#define MAME_VIDEO_GTIA_H
+#pragma once
-/* reading registers */
-struct gtia_readregs
-{
- uint8_t m0pf; /* d000 missile 0 playfield collisions */
- uint8_t m1pf; /* d001 missile 1 playfield collisions */
- uint8_t m2pf; /* d002 missile 2 playfield collisions */
- uint8_t m3pf; /* d003 missile 3 playfield collisions */
- uint8_t p0pf; /* d004 player 0 playfield collisions */
- uint8_t p1pf; /* d005 player 1 playfield collisions */
- uint8_t p2pf; /* d006 player 2 playfield collisions */
- uint8_t p3pf; /* d007 player 3 playfield collisions */
- uint8_t m0pl; /* d008 missile 0 player collisions */
- uint8_t m1pl; /* d009 missile 1 player collisions */
- uint8_t m2pl; /* d00a missile 2 player collisions */
- uint8_t m3pl; /* d00b missile 3 player collisions */
- uint8_t p0pl; /* d00c player 0 player collisions */
- uint8_t p1pl; /* d00d player 1 player collisions */
- uint8_t p2pl; /* d00e player 2 player collisions */
- uint8_t p3pl; /* d00f player 3 player collisions */
- uint8_t but[4]; /* d010-d013 button stick 0-3 */
- uint8_t pal; /* d014 PAL/NTSC config (D3,2,1 0=PAL, 1=NTSC */
- uint8_t gtia15; /* d015 nothing */
- uint8_t gtia16; /* d016 nothing */
- uint8_t gtia17; /* d017 nothing */
- uint8_t gtia18; /* d018 nothing */
- uint8_t gtia19; /* d019 nothing */
- uint8_t gtia1a; /* d01a nothing */
- uint8_t gtia1b; /* d01b nothing */
- uint8_t gtia1c; /* d01c nothing */
- uint8_t gtia1d; /* d01d nothing */
- uint8_t gtia1e; /* d01e nothing */
- uint8_t cons; /* d01f console keys */
-};
-
-/* writing registers */
-struct gtia_writeregs
-{
- uint8_t hposp0; /* d000 player 0 horz position */
- uint8_t hposp1; /* d001 player 1 horz position */
- uint8_t hposp2; /* d002 player 2 horz position */
- uint8_t hposp3; /* d003 player 3 horz position */
- uint8_t hposm0; /* d004 missile 0 horz position */
- uint8_t hposm1; /* d005 missile 1 horz position */
- uint8_t hposm2; /* d006 missile 2 horz position */
- uint8_t hposm3; /* d007 missile 3 horz position */
- uint8_t sizep0; /* d008 size player 0 */
- uint8_t sizep1; /* d009 size player 1 */
- uint8_t sizep2; /* d00a size player 2 */
- uint8_t sizep3; /* d00b size player 3 */
- uint8_t sizem; /* d00c size missiles */
- uint8_t grafp0[2]; /* d00d graphics data for player 0 */
- uint8_t grafp1[2]; /* d00e graphics data for player 1 */
- uint8_t grafp2[2]; /* d00f graphics data for player 2 */
- uint8_t grafp3[2]; /* d010 graphics data for player 3 */
- uint8_t grafm[2]; /* d011 graphics data for missiles */
- uint8_t colpm0; /* d012 color for player/missile 0 */
- uint8_t colpm1; /* d013 color for player/missile 1 */
- uint8_t colpm2; /* d014 color for player/missile 2 */
- uint8_t colpm3; /* d015 color for player/missile 3 */
- uint8_t colpf0; /* d016 playfield color 0 */
- uint8_t colpf1; /* d017 playfield color 1 */
- uint8_t colpf2; /* d018 playfield color 2 */
- uint8_t colpf3; /* d019 playfield color 3 */
- uint8_t colbk; /* d01a background playfield */
- uint8_t prior; /* d01b priority select */
- uint8_t vdelay; /* d01c delay until vertical retrace */
- uint8_t gractl; /* d01d graphics control */
- uint8_t hitclr; /* d01e clear collisions */
- uint8_t cons; /* d01f write console (speaker) */
-};
-
-/* helpers */
-struct gtia_helpervars
-{
- uint8_t grafp0; /* optimized graphics data player 0 */
- uint8_t grafp1; /* optimized graphics data player 1 */
- uint8_t grafp2; /* optimized graphics data player 2 */
- uint8_t grafp3; /* optimized graphics data player 3 */
- uint8_t grafm0; /* optimized graphics data missile 0 */
- uint8_t grafm1; /* optimized graphics data missile 1 */
- uint8_t grafm2; /* optimized graphics data missile 2 */
- uint8_t grafm3; /* optimized graphics data missile 3 */
- uint32_t hitclr_frames;/* frames gone since last hitclr */
- uint8_t sizem; /* optimized size missiles */
- uint8_t usedp; /* mask for used player colors */
- uint8_t usedm0; /* mask for used missile 0 color */
- uint8_t usedm1; /* mask for used missile 1 color */
- uint8_t usedm2; /* mask for used missile 2 color */
- uint8_t usedm3; /* mask for used missile 3 color */
- uint8_t vdelay_m0; /* vertical delay for missile 0 */
- uint8_t vdelay_m1; /* vertical delay for missile 1 */
- uint8_t vdelay_m2; /* vertical delay for missile 2 */
- uint8_t vdelay_m3; /* vertical delay for missile 3 */
- uint8_t vdelay_p0; /* vertical delay for player 0 */
- uint8_t vdelay_p1; /* vertical delay for player 1 */
- uint8_t vdelay_p2; /* vertical delay for player 2 */
- uint8_t vdelay_p3; /* vertical delay for player 3 */
-};
-
#define MCFG_GTIA_READ_CB(_devcb) \
devcb = &gtia_device::set_read_callback(*device, DEVCB_##_devcb);
@@ -129,8 +31,8 @@ public:
// construction/destruction
gtia_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_read_callback(device_t &device, _Object object) { return downcast<gtia_device &>(device).m_read_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_write_callback(device_t &device, _Object object) { return downcast<gtia_device &>(device).m_write_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_read_callback(device_t &device, Object &&cb) { return downcast<gtia_device &>(device).m_read_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_write_callback(device_t &device, Object &&cb) { return downcast<gtia_device &>(device).m_write_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -168,6 +70,105 @@ protected:
inline void missile_render(uint8_t gfx, int size, uint8_t color, uint8_t *dst);
private:
+ /* reading registers */
+ struct gtia_readregs
+ {
+ uint8_t m0pf; /* d000 missile 0 playfield collisions */
+ uint8_t m1pf; /* d001 missile 1 playfield collisions */
+ uint8_t m2pf; /* d002 missile 2 playfield collisions */
+ uint8_t m3pf; /* d003 missile 3 playfield collisions */
+ uint8_t p0pf; /* d004 player 0 playfield collisions */
+ uint8_t p1pf; /* d005 player 1 playfield collisions */
+ uint8_t p2pf; /* d006 player 2 playfield collisions */
+ uint8_t p3pf; /* d007 player 3 playfield collisions */
+ uint8_t m0pl; /* d008 missile 0 player collisions */
+ uint8_t m1pl; /* d009 missile 1 player collisions */
+ uint8_t m2pl; /* d00a missile 2 player collisions */
+ uint8_t m3pl; /* d00b missile 3 player collisions */
+ uint8_t p0pl; /* d00c player 0 player collisions */
+ uint8_t p1pl; /* d00d player 1 player collisions */
+ uint8_t p2pl; /* d00e player 2 player collisions */
+ uint8_t p3pl; /* d00f player 3 player collisions */
+ uint8_t but[4]; /* d010-d013 button stick 0-3 */
+ uint8_t pal; /* d014 PAL/NTSC config (D3,2,1 0=PAL, 1=NTSC */
+ uint8_t gtia15; /* d015 nothing */
+ uint8_t gtia16; /* d016 nothing */
+ uint8_t gtia17; /* d017 nothing */
+ uint8_t gtia18; /* d018 nothing */
+ uint8_t gtia19; /* d019 nothing */
+ uint8_t gtia1a; /* d01a nothing */
+ uint8_t gtia1b; /* d01b nothing */
+ uint8_t gtia1c; /* d01c nothing */
+ uint8_t gtia1d; /* d01d nothing */
+ uint8_t gtia1e; /* d01e nothing */
+ uint8_t cons; /* d01f console keys */
+ };
+
+ /* writing registers */
+ struct gtia_writeregs
+ {
+ uint8_t hposp0; /* d000 player 0 horz position */
+ uint8_t hposp1; /* d001 player 1 horz position */
+ uint8_t hposp2; /* d002 player 2 horz position */
+ uint8_t hposp3; /* d003 player 3 horz position */
+ uint8_t hposm0; /* d004 missile 0 horz position */
+ uint8_t hposm1; /* d005 missile 1 horz position */
+ uint8_t hposm2; /* d006 missile 2 horz position */
+ uint8_t hposm3; /* d007 missile 3 horz position */
+ uint8_t sizep0; /* d008 size player 0 */
+ uint8_t sizep1; /* d009 size player 1 */
+ uint8_t sizep2; /* d00a size player 2 */
+ uint8_t sizep3; /* d00b size player 3 */
+ uint8_t sizem; /* d00c size missiles */
+ uint8_t grafp0[2]; /* d00d graphics data for player 0 */
+ uint8_t grafp1[2]; /* d00e graphics data for player 1 */
+ uint8_t grafp2[2]; /* d00f graphics data for player 2 */
+ uint8_t grafp3[2]; /* d010 graphics data for player 3 */
+ uint8_t grafm[2]; /* d011 graphics data for missiles */
+ uint8_t colpm0; /* d012 color for player/missile 0 */
+ uint8_t colpm1; /* d013 color for player/missile 1 */
+ uint8_t colpm2; /* d014 color for player/missile 2 */
+ uint8_t colpm3; /* d015 color for player/missile 3 */
+ uint8_t colpf0; /* d016 playfield color 0 */
+ uint8_t colpf1; /* d017 playfield color 1 */
+ uint8_t colpf2; /* d018 playfield color 2 */
+ uint8_t colpf3; /* d019 playfield color 3 */
+ uint8_t colbk; /* d01a background playfield */
+ uint8_t prior; /* d01b priority select */
+ uint8_t vdelay; /* d01c delay until vertical retrace */
+ uint8_t gractl; /* d01d graphics control */
+ uint8_t hitclr; /* d01e clear collisions */
+ uint8_t cons; /* d01f write console (speaker) */
+ };
+
+ /* helpers */
+ struct gtia_helpervars
+ {
+ uint8_t grafp0; /* optimized graphics data player 0 */
+ uint8_t grafp1; /* optimized graphics data player 1 */
+ uint8_t grafp2; /* optimized graphics data player 2 */
+ uint8_t grafp3; /* optimized graphics data player 3 */
+ uint8_t grafm0; /* optimized graphics data missile 0 */
+ uint8_t grafm1; /* optimized graphics data missile 1 */
+ uint8_t grafm2; /* optimized graphics data missile 2 */
+ uint8_t grafm3; /* optimized graphics data missile 3 */
+ uint32_t hitclr_frames;/* frames gone since last hitclr */
+ uint8_t sizem; /* optimized size missiles */
+ uint8_t usedp; /* mask for used player colors */
+ uint8_t usedm0; /* mask for used missile 0 color */
+ uint8_t usedm1; /* mask for used missile 1 color */
+ uint8_t usedm2; /* mask for used missile 2 color */
+ uint8_t usedm3; /* mask for used missile 3 color */
+ uint8_t vdelay_m0; /* vertical delay for missile 0 */
+ uint8_t vdelay_m1; /* vertical delay for missile 1 */
+ uint8_t vdelay_m2; /* vertical delay for missile 2 */
+ uint8_t vdelay_m3; /* vertical delay for missile 3 */
+ uint8_t vdelay_p0; /* vertical delay for player 0 */
+ uint8_t vdelay_p1; /* vertical delay for player 1 */
+ uint8_t vdelay_p2; /* vertical delay for player 2 */
+ uint8_t vdelay_p3; /* vertical delay for player 3 */
+ };
+
gtia_readregs m_r; /* read registers */
gtia_writeregs m_w; /* write registers */
gtia_helpervars m_h; /* helper variables */
@@ -184,6 +185,6 @@ private:
// device type definition
-extern const device_type ATARI_GTIA;
+DECLARE_DEVICE_TYPE(ATARI_GTIA, gtia_device)
-#endif /* __GTIA_H__ */
+#endif // MAME_VIDEO_GTIA_H
diff --git a/src/mame/video/igs017_igs031.cpp b/src/mame/video/igs017_igs031.cpp
index 9c6e46c010d..91dabdf1771 100644
--- a/src/mame/video/igs017_igs031.cpp
+++ b/src/mame/video/igs017_igs031.cpp
@@ -73,10 +73,10 @@ GFXDECODE_MEMBER( igs017_igs031_device::gfxinfo )
GFXDECODE_END
-const device_type IGS017_IGS031 = device_creator<igs017_igs031_device>;
+DEFINE_DEVICE_TYPE(IGS017_IGS031, igs017_igs031_device, "igs017_031", "IGS017_IGS031")
igs017_igs031_device::igs017_igs031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, IGS017_IGS031, "IGS017_IGS031", tag, owner, clock, "igs017_igs031", __FILE__),
+ : device_t(mconfig, IGS017_IGS031, tag, owner, clock),
device_gfx_interface(mconfig, *this, gfxinfo),
device_video_interface(mconfig, *this),
device_memory_interface(mconfig, *this),
diff --git a/src/mame/video/igs017_igs031.h b/src/mame/video/igs017_igs031.h
index 39b6290b5b2..6285b7391d1 100644
--- a/src/mame/video/igs017_igs031.h
+++ b/src/mame/video/igs017_igs031.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Pierpaolo Prazzoli, Luca Elia
+#ifndef MAME_VIDEO_IGS017_IGS031_H
+#define MAME_VIDEO_IGS017_IGS031_H
+
+#pragma once
#include "machine/i8255.h"
@@ -16,9 +20,6 @@ class igs017_igs031_device : public device_t,
public device_video_interface,
public device_memory_interface
{
- //static const gfx_layout tilelayout, spritelayout;
- DECLARE_GFXDECODE_MEMBER(gfxinfo);
-
public:
igs017_igs031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -40,26 +41,10 @@ public:
DECLARE_READ8_MEMBER(read);
DECLARE_WRITE8_MEMBER(write);
- // the gfx roms were often hooked up with the bits backwards, allow us to handle it here to save doing it in every driver.
- int m_revbits;
-
- int m_toggle;
- int m_debug_addr;
- int m_debug_width;
- uint8_t m_video_disable;
- tilemap_t *m_fg_tilemap;
- tilemap_t *m_bg_tilemap;
- std::unique_ptr<uint8_t[]> m_sprites_gfx;
- int m_sprites_gfx_size;
-
int get_nmi_enable() { return m_nmi_enable; }
int get_irq_enable() { return m_irq_enable; }
- int m_nmi_enable;
- int m_irq_enable;
-
-
DECLARE_WRITE8_MEMBER(palram_w);
DECLARE_READ8_MEMBER(i8255_r);
@@ -90,9 +75,11 @@ protected:
virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override;
+ DECLARE_GFXDECODE_MEMBER(gfxinfo);
+
+private:
address_space_config m_space_config;
-public:
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_fg_videoram;
required_shared_ptr<uint8_t> m_bg_videoram;
@@ -100,7 +87,22 @@ public:
optional_device<i8255_device> m_i8255;
required_device<palette_device> m_palette;
-private:
+ // the gfx roms were often hooked up with the bits backwards, allow us to handle it here to save doing it in every driver.
+ int m_revbits;
+
+ int m_toggle;
+ int m_debug_addr;
+ int m_debug_width;
+ uint8_t m_video_disable;
+ tilemap_t *m_fg_tilemap;
+ tilemap_t *m_bg_tilemap;
+ std::unique_ptr<uint8_t[]> m_sprites_gfx;
+ int m_sprites_gfx_size;
+
+ int m_nmi_enable;
+ int m_irq_enable;
};
-extern const device_type IGS017_IGS031;
+DECLARE_DEVICE_TYPE(IGS017_IGS031, igs017_igs031_device)
+
+#endif // MAME_VIDEO_IGS017_IGS031_H
diff --git a/src/mame/video/intv.cpp b/src/mame/video/intv.cpp
index 678c820765b..cf1bf324777 100644
--- a/src/mame/video/intv.cpp
+++ b/src/mame/video/intv.cpp
@@ -23,8 +23,8 @@ uint32_t intv_state::screen_update_intvkbd(screen_device &screen, bitmap_ind16 &
if (!m_intvkbd_text_blanked)
{
uint8_t *videoram = m_videoram;
- int xoffset = STIC_OVERSCAN_LEFT_WIDTH*STIC_X_SCALE*INTVKBD_X_SCALE;
- int yoffset = STIC_OVERSCAN_TOP_HEIGHT*STIC_Y_SCALE*INTVKBD_Y_SCALE;
+ int xoffset = stic_device::OVERSCAN_LEFT_WIDTH*stic_device::X_SCALE*INTVKBD_X_SCALE;
+ int yoffset = stic_device::OVERSCAN_TOP_HEIGHT*stic_device::Y_SCALE*INTVKBD_Y_SCALE;
rectangle cursor_rect;
m_crtc->cursor_bounds(cursor_rect);
diff --git a/src/mame/video/itech8.cpp b/src/mame/video/itech8.cpp
index b96353a17ca..48ff06ed009 100644
--- a/src/mame/video/itech8.cpp
+++ b/src/mame/video/itech8.cpp
@@ -263,7 +263,7 @@ inline void itech8_state::consume_rle(int count)
void itech8_state::perform_blit(address_space &space)
{
- offs_t addr = m_tms34061->m_display.regs[TMS34061_XYADDRESS] | ((m_tms34061->m_display.regs[TMS34061_XYOFFSET] & 0x300) << 8);
+ offs_t addr = m_tms34061->xyaddress() | ((m_tms34061->xyoffset() & 0x300) << 8);
uint8_t shift = (BLITTER_FLAGS & BLITFLAG_SHIFT) ? 4 : 0;
int transparent = (BLITTER_FLAGS & BLITFLAG_TRANSPARENT);
int ydir = (BLITTER_FLAGS & BLITFLAG_YFLIP) ? -1 : 1;
@@ -283,7 +283,7 @@ void itech8_state::perform_blit(address_space &space)
logerror("Blit: scan=%d src=%06x @ (%05x) for %dx%d ... flags=%02x\n",
m_screen->vpos(),
(m_grom_bank << 16) | (BLITTER_ADDRHI << 8) | BLITTER_ADDRLO,
- m_tms34061->m_display.regs[TMS34061_XYADDRESS] | ((m_tms34061->m_display.regs[TMS34061_XYOFFSET] & 0x300) << 8),
+ m_tms34061->xyaddress() | ((m_tms34061->xyoffset() & 0x300) << 8),
BLITTER_WIDTH, BLITTER_HEIGHT, BLITTER_FLAGS);
/* initialize the fetcher */
@@ -455,7 +455,7 @@ WRITE8_MEMBER(itech8_state::blitter_w)
if (BLIT_LOGGING)
{
logerror("Blit: XY=%1X%04X SRC=%02X%02X%02X SIZE=%3dx%3d FLAGS=%02x",
- (m_tms34061->m_display.regs[TMS34061_XYOFFSET] >> 8) & 0x0f, m_tms34061->m_display.regs[TMS34061_XYADDRESS],
+ (m_tms34061->xyoffset() >> 8) & 0x0f, m_tms34061->xyaddress(),
m_grom_bank, m_blitter_data[0], m_blitter_data[1],
m_blitter_data[4], m_blitter_data[5],
m_blitter_data[2]);
@@ -584,7 +584,7 @@ uint32_t itech8_state::screen_update_2layer(screen_device &screen, bitmap_rgb32
m_tms34061->get_display_state();
/* if we're blanked, just fill with black */
- if (m_tms34061->m_display.blanked)
+ if (m_tms34061->blanked())
{
bitmap.fill(rgb_t::black(), cliprect);
return 0;
@@ -619,7 +619,7 @@ uint32_t itech8_state::screen_update_grmatch(screen_device &screen, bitmap_rgb32
m_tms34061->get_display_state();
/* if we're blanked, just fill with black */
- if (m_tms34061->m_display.blanked)
+ if (m_tms34061->blanked())
{
bitmap.fill(rgb_t::black(), cliprect);
return 0;
@@ -667,7 +667,7 @@ uint32_t itech8_state::screen_update_2page(screen_device &screen, bitmap_rgb32 &
m_tms34061->get_display_state();
/* if we're blanked, just fill with black */
- if (m_tms34061->m_display.blanked)
+ if (m_tms34061->blanked())
{
bitmap.fill(rgb_t::black(), cliprect);
return 0;
@@ -698,7 +698,7 @@ uint32_t itech8_state::screen_update_2page_large(screen_device &screen, bitmap_r
m_tms34061->get_display_state();
/* if we're blanked, just fill with black */
- if (m_tms34061->m_display.blanked)
+ if (m_tms34061->blanked())
{
bitmap.fill(rgb_t::black(), cliprect);
return 0;
diff --git a/src/mame/video/jalblend.cpp b/src/mame/video/jalblend.cpp
index 3f0faeab5f6..650bd99a8f2 100644
--- a/src/mame/video/jalblend.cpp
+++ b/src/mame/video/jalblend.cpp
@@ -22,11 +22,11 @@
-const device_type JALECO_BLEND = device_creator<jaleco_blend_device>;
+DEFINE_DEVICE_TYPE(JALECO_BLEND, jaleco_blend_device, "jaleco_blend", "Jaleco Blending Device")
jaleco_blend_device::jaleco_blend_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, JALECO_BLEND, "Jaleco Blending Device", tag, owner, clock, "jaleco_blend", __FILE__),
- m_table(nullptr)
+ : device_t(mconfig, JALECO_BLEND, tag, owner, clock)
+ , m_table(nullptr)
{
}
diff --git a/src/mame/video/jalblend.h b/src/mame/video/jalblend.h
index 7eb21f82ba8..825f2ab18f1 100644
--- a/src/mame/video/jalblend.h
+++ b/src/mame/video/jalblend.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Luca Elia
+#ifndef MAME_VIDEO_JALBLEND_H
+#define MAME_VIDEO_JALBLEND_H
+
+#pragma once
+
class jaleco_blend_device : public device_t
{
public:
@@ -30,4 +35,6 @@ private:
int transparent_color);
};
-extern const device_type JALECO_BLEND;
+DECLARE_DEVICE_TYPE(JALECO_BLEND, jaleco_blend_device)
+
+#endif // MAME_VIDEO_JALBLEND_H
diff --git a/src/mame/video/k001005.cpp b/src/mame/video/k001005.cpp
index f677a03d15d..8e44865eb47 100644
--- a/src/mame/video/k001005.cpp
+++ b/src/mame/video/k001005.cpp
@@ -3,6 +3,8 @@
#include "emu.h"
#include "k001005.h"
+#include "video/k001006.h"
+
/*****************************************************************************/
/* Konami K001005 Polygon Renderer (KS10071) */
@@ -1181,10 +1183,10 @@ void k001005_renderer::draw(bitmap_rgb32 &bitmap, const rectangle &cliprect)
-const device_type K001005 = device_creator<k001005_device>;
+DEFINE_DEVICE_TYPE(K001005, k001005_device, "k001005", "K001005 Polygon Renderer")
k001005_device::k001005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K001005, "K001005 Polygon Renderer", tag, owner, clock, "k001005", __FILE__),
+ : device_t(mconfig, K001005, tag, owner, clock),
device_video_interface(mconfig, *this),
m_k001006(nullptr),
m_fifo(nullptr),
diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h
index e36c3c5a0ee..4a459295d24 100644
--- a/src/mame/video/k001005.h
+++ b/src/mame/video/k001005.h
@@ -1,14 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K001005_H
+#define MAME_VIDEO_K001005_H
+
#pragma once
-#ifndef __K001005_H__
-#define __K001005_H__
-#include <float.h>
#include "video/poly.h"
-#include "video/k001006.h"
#include "cpu/sharc/sharc.h"
+#include <float.h>
+
struct k001005_polydata
{
@@ -44,7 +45,6 @@ class k001005_renderer : public poly_manager<float, k001005_polydata, 8, 50000>
{
public:
k001005_renderer(device_t &parent, screen_device &screen, device_t *k001006);
- ~k001005_renderer() {}
void reset();
void push_data(uint32_t data);
@@ -60,16 +60,16 @@ public:
void draw_scanline_tex(int32_t scanline, const extent_t &extent, const k001005_polydata &extradata, int threadid);
void draw_scanline_gouraud_blend(int32_t scanline, const extent_t &extent, const k001005_polydata &extradata, int threadid);
- static const int POLY_Z = 0;
- static const int POLY_FOG = 1;
- static const int POLY_BRI = 2;
- static const int POLY_U = 3;
- static const int POLY_V = 4;
- static const int POLY_W = 5;
- static const int POLY_A = 2;
- static const int POLY_R = 3;
- static const int POLY_G = 4;
- static const int POLY_B = 5;
+ static constexpr int POLY_Z = 0;
+ static constexpr int POLY_FOG = 1;
+ static constexpr int POLY_BRI = 2;
+ static constexpr int POLY_U = 3;
+ static constexpr int POLY_V = 4;
+ static constexpr int POLY_W = 5;
+ static constexpr int POLY_A = 2;
+ static constexpr int POLY_R = 3;
+ static constexpr int POLY_G = 4;
+ static constexpr int POLY_B = 5;
private:
std::unique_ptr<bitmap_rgb32> m_fb[2];
@@ -99,12 +99,10 @@ private:
};
-class k001005_device : public device_t,
- public device_video_interface
+class k001005_device : public device_t, public device_video_interface
{
public:
k001005_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k001005_device() {}
static void set_texel_chip(device_t &device, const char *tag);
@@ -138,10 +136,10 @@ private:
k001005_renderer *m_renderer;
};
-extern const device_type K001005;
+DECLARE_DEVICE_TYPE(K001005, k001005_device)
#define MCFG_K001005_TEXEL_CHIP(_tag) \
k001005_device::set_texel_chip(*device, _tag);
-#endif
+#endif // MAME_VIDEO_K001005_H
diff --git a/src/mame/video/k001006.cpp b/src/mame/video/k001006.cpp
index 9d4b1f62516..54aa9d088cf 100644
--- a/src/mame/video/k001006.cpp
+++ b/src/mame/video/k001006.cpp
@@ -12,10 +12,10 @@
/* */
/***************************************************************************/
-const device_type K001006 = device_creator<k001006_device>;
+DEFINE_DEVICE_TYPE(K001006, k001006_device, "k001006", "K001006 Texel Unit")
k001006_device::k001006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K001006, "K001006 Texel Unit", tag, owner, clock, "k001006", __FILE__),
+ : device_t(mconfig, K001006, tag, owner, clock),
m_pal_ram(nullptr),
m_unknown_ram(nullptr),
m_addr(0),
diff --git a/src/mame/video/k001006.h b/src/mame/video/k001006.h
index b41696a6b52..8a49eb1c891 100644
--- a/src/mame/video/k001006.h
+++ b/src/mame/video/k001006.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K001006_H
+#define MAME_VIDEO_K001006_H
+
#pragma once
-#ifndef __K001006_H__
-#define __K001006_H__
@@ -49,6 +50,7 @@ private:
extern const device_type K001006;
+DECLARE_DEVICE_TYPE(K001006, k001006_device)
#define MCFG_K001006_GFX_REGION(_tag) \
@@ -57,4 +59,4 @@ extern const device_type K001006;
#define MCFG_K001006_TEX_LAYOUT(x) \
k001006_device::set_tex_layout(*device, x);
-#endif
+#endif // MAME_VIDEO_K001006_H
diff --git a/src/mame/video/k001604.cpp b/src/mame/video/k001604.cpp
index 1ad9bf82123..39955b2a803 100644
--- a/src/mame/video/k001604.cpp
+++ b/src/mame/video/k001604.cpp
@@ -15,10 +15,10 @@
#define K001604_NUM_TILES_LAYER0 16384
#define K001604_NUM_TILES_LAYER1 4096
-const device_type K001604 = device_creator<k001604_device>;
+DEFINE_DEVICE_TYPE(K001604, k001604_device, "k001604_device", "K001604 2D tilemaps + 2x ROZ")
k001604_device::k001604_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K001604, "K001604 2D tilemaps + 2x ROZ", tag, owner, clock, "k001604", __FILE__),
+ : device_t(mconfig, K001604, tag, owner, clock),
device_gfx_interface(mconfig, *this, nullptr),
m_layer_size(0),
m_roz_size(0),
diff --git a/src/mame/video/k001604.h b/src/mame/video/k001604.h
index d149b9460a8..1bbe1278ae2 100644
--- a/src/mame/video/k001604.h
+++ b/src/mame/video/k001604.h
@@ -1,15 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K001604_H
+#define MAME_VIDEO_K001604_H
+
#pragma once
-#ifndef __K001604_H__
-#define __K001604_H__
class k001604_device : public device_t, public device_gfx_interface
{
public:
k001604_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k001604_device() {}
// static configuration
static void set_layer_size(device_t &device, int size) { downcast<k001604_device &>(device).m_layer_size = size; }
@@ -54,7 +54,7 @@ private:
TILE_GET_INFO_MEMBER(tile_info_layer_roz);
};
-extern const device_type K001604;
+DECLARE_DEVICE_TYPE(K001604, k001604_device)
#define MCFG_K001604_LAYER_SIZE(_size) \
@@ -72,4 +72,4 @@ extern const device_type K001604;
#define MCFG_K001604_PALETTE(_palette_tag) \
MCFG_GFX_PALETTE(_palette_tag)
-#endif
+#endif // MAME_VIDEO_K001604_H
diff --git a/src/mame/video/k007121.cpp b/src/mame/video/k007121.cpp
index c8dcb08cb15..04a367572e5 100644
--- a/src/mame/video/k007121.cpp
+++ b/src/mame/video/k007121.cpp
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+// copyright-holders:Fabio Priuli, Acho A. Tang, R. Belmont
/*
Konami 007121
------
@@ -119,10 +119,10 @@ control registers
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type K007121 = device_creator<k007121_device>;
+DEFINE_DEVICE_TYPE(K007121, k007121_device, "k007121", "K007121 Sprite/Tilemap Controller")
k007121_device::k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K007121, "K007121 Sprite/Tilemap Controller", tag, owner, clock, "k007121", __FILE__)
+ : device_t(mconfig, K007121, tag, owner, clock)
, m_flipscreen(0)
, m_palette(*this, finder_base::DUMMY_TAG)
{
diff --git a/src/mame/video/k007121.h b/src/mame/video/k007121.h
index e972362a12d..74aeaf5b7d4 100644
--- a/src/mame/video/k007121.h
+++ b/src/mame/video/k007121.h
@@ -1,14 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K007121_H
+#define MAME_VIDEO_K007121_H
+
#pragma once
-#ifndef __K007121_H__
-#define __K007121_H__
+
class k007121_device : public device_t
{
public:
k007121_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k007121_device() {}
static void static_set_palette_tag(device_t &device, const char *tag);
@@ -31,7 +32,7 @@ private:
required_device<palette_device> m_palette;
};
-extern const device_type K007121;
+DECLARE_DEVICE_TYPE(K007121, k007121_device)
#define MCFG_K007121_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K007121, 0)
@@ -39,4 +40,4 @@ extern const device_type K007121;
#define MCFG_K007121_PALETTE(_palette_tag) \
k007121_device::static_set_palette_tag(*device, "^" _palette_tag);
-#endif
+#endif // MAME_VIDEO_K007121_H
diff --git a/src/mame/video/k007342.cpp b/src/mame/video/k007342.cpp
index 65fa0dc9ae1..5290b1636e6 100644
--- a/src/mame/video/k007342.cpp
+++ b/src/mame/video/k007342.cpp
@@ -35,10 +35,10 @@ control registers
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type K007342 = device_creator<k007342_device>;
+DEFINE_DEVICE_TYPE(K007342, k007342_device, "k007342", "K007342 Video Controller")
k007342_device::k007342_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K007342, "K007342 Video Controller", tag, owner, clock, "k007342", __FILE__),
+ : device_t(mconfig, K007342, tag, owner, clock),
m_ram(nullptr),
m_scroll_ram(nullptr),
m_videoram_0(nullptr),
diff --git a/src/mame/video/k007342.h b/src/mame/video/k007342.h
index f3bc0439398..a25e16f244d 100644
--- a/src/mame/video/k007342.h
+++ b/src/mame/video/k007342.h
@@ -1,8 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K007342_H
+#define MAME_VIDEO_K007342_H
+
#pragma once
-#ifndef __K007342_H__
-#define __K007342_H__
+
typedef device_delegate<void (int layer, int bank, int *code, int *color, int *flags)> k007342_delegate;
@@ -10,7 +12,6 @@ class k007342_device : public device_t
{
public:
k007342_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k007342_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -55,7 +56,7 @@ private:
void get_tile_info( tile_data &tileinfo, int tile_index, int layer, uint8_t *cram, uint8_t *vram );
};
-extern const device_type K007342;
+DECLARE_DEVICE_TYPE(K007342, k007342_device)
#define MCFG_K007342_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K007342, 0)
@@ -74,4 +75,4 @@ extern const device_type K007342;
// function definition for a callback
#define K007342_CALLBACK_MEMBER(_name) void _name(int layer, int bank, int *code, int *color, int *flags)
-#endif
+#endif // MAME_VIDEO_K007342_H
diff --git a/src/mame/video/k007420.cpp b/src/mame/video/k007420.cpp
index 30c735f7248..235ee5c222c 100644
--- a/src/mame/video/k007420.cpp
+++ b/src/mame/video/k007420.cpp
@@ -16,10 +16,10 @@ and a variable amount of ROM. Nothing is known about its external interface.
#define K007420_SPRITERAM_SIZE 0x200
-const device_type K007420 = device_creator<k007420_device>;
+DEFINE_DEVICE_TYPE(K007420, k007420_device, "k007420", "K007420 Sprite Generator")
k007420_device::k007420_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K007420, "K007420 Sprite Generator", tag, owner, clock, "k007420", __FILE__)
+ : device_t(mconfig, K007420, tag, owner, clock)
, m_ram(nullptr)
, m_flipscreen(0)
, m_palette(*this, finder_base::DUMMY_TAG)
diff --git a/src/mame/video/k007420.h b/src/mame/video/k007420.h
index 637adf200ab..c4bb9a318c6 100644
--- a/src/mame/video/k007420.h
+++ b/src/mame/video/k007420.h
@@ -1,8 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K007420_H
+#define MAME_VIDEO_K007420_H
+
#pragma once
-#ifndef __K007420_H__
-#define __K007420_H__
+
typedef device_delegate<void (int *code, int *color)> k007420_delegate;
@@ -10,7 +12,6 @@ class k007420_device : public device_t
{
public:
k007420_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k007420_device() {}
static void static_set_palette_tag(device_t &device, const char *tag);
static void static_set_bank_limit(device_t &device, int limit) { downcast<k007420_device &>(device).m_banklimit = limit; }
@@ -35,7 +36,7 @@ private:
k007420_delegate m_callback;
};
-extern const device_type K007420;
+DECLARE_DEVICE_TYPE(K007420, k007420_device)
#define MCFG_K007420_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K007420, 0)
@@ -53,4 +54,4 @@ extern const device_type K007420;
#define K007420_CALLBACK_MEMBER(_name) void _name(int *code, int *color)
-#endif
+#endif // MAME_VIDEO_K007420_H
diff --git a/src/mame/video/k037122.cpp b/src/mame/video/k037122.cpp
index 4885c080e63..9939cdaa24f 100644
--- a/src/mame/video/k037122.cpp
+++ b/src/mame/video/k037122.cpp
@@ -14,10 +14,10 @@ Konami 037122
#define K037122_NUM_TILES 16384
-const device_type K037122 = device_creator<k037122_device>;
+DEFINE_DEVICE_TYPE(K037122, k037122_device, "k037122", "K037122 2D Tilemap")
k037122_device::k037122_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K037122, "K037122 2D Tilemap", tag, owner, clock, "k037122", __FILE__),
+ : device_t(mconfig, K037122, tag, owner, clock),
device_video_interface(mconfig, *this),
device_gfx_interface(mconfig, *this, nullptr),
m_tile_ram(nullptr),
diff --git a/src/mame/video/k037122.h b/src/mame/video/k037122.h
index 317627d8783..dd0dff6f216 100644
--- a/src/mame/video/k037122.h
+++ b/src/mame/video/k037122.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
-// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+// copyright-holders:Fabio Priuli, Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K037122_H
+#define MAME_VIDEO_K037122_H
#pragma once
-#ifndef __K037122_H__
-#define __K037122_H__
class k037122_device : public device_t,
public device_video_interface,
@@ -10,7 +10,6 @@ class k037122_device : public device_t,
{
public:
k037122_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k037122_device() {}
// static configuration
static void static_set_gfx_index(device_t &device, int index) { downcast<k037122_device &>(device).m_gfx_index = index; }
@@ -43,7 +42,7 @@ private:
void update_palette_color( uint32_t palette_base, int color );
};
-extern const device_type K037122;
+DECLARE_DEVICE_TYPE(K037122, k037122_device)
#define MCFG_K037122_ADD(_tag, _screen) \
MCFG_DEVICE_ADD(_tag, K037122, 0) \
@@ -52,4 +51,4 @@ extern const device_type K037122;
#define MCFG_K037122_PALETTE(_palette_tag) \
MCFG_GFX_PALETTE(_palette_tag)
-#endif
+#endif // MAME_VIDEO_K037122_H
diff --git a/src/mame/video/k051316.cpp b/src/mame/video/k051316.cpp
index e60bcc06bac..18fecde3e1e 100644
--- a/src/mame/video/k051316.cpp
+++ b/src/mame/video/k051316.cpp
@@ -41,9 +41,10 @@ control registers
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-const device_type K051316 = device_creator<k051316_device>;
+
+DEFINE_DEVICE_TYPE(K051316, k051316_device, "k051316", "K051316 PSAC")
const gfx_layout k051316_device::charlayout4 =
@@ -104,7 +105,7 @@ GFXDECODE_END
k051316_device::k051316_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K051316, "K051316 PSAC", tag, owner, clock, "k051316", __FILE__),
+ : device_t(mconfig, K051316, tag, owner, clock),
device_gfx_interface(mconfig, *this, gfxinfo),
m_zoom_rom(*this, DEVICE_SELF),
m_dx(0),
diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h
index 0c3670a1fa2..dcf0a380973 100644
--- a/src/mame/video/k051316.h
+++ b/src/mame/video/k051316.h
@@ -1,8 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K051316_H
+#define MAME_VIDEO_K051316_H
+
#pragma once
-#ifndef __K051316_H__
-#define __K051316_H__
+
typedef device_delegate<void (int *code, int *color, int *flags)> k051316_cb_delegate;
#define K051316_CB_MEMBER(_name) void _name(int *code, int *color, int *flags)
@@ -24,12 +26,10 @@ typedef device_delegate<void (int *code, int *color, int *flags)> k051316_cb_del
k051316_device::set_wrap(*device, _wrap);
-class k051316_device : public device_t,
- public device_gfx_interface
+class k051316_device : public device_t, public device_gfx_interface
{
public:
k051316_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k051316_device() {}
static const gfx_layout charlayout4;
static const gfx_layout charlayout7;
@@ -95,6 +95,6 @@ private:
TILE_GET_INFO_MEMBER(get_tile_info);
};
-extern const device_type K051316;
+DECLARE_DEVICE_TYPE(K051316, k051316_device)
-#endif
+#endif // MAME_VIDEO_K051316_H
diff --git a/src/mame/video/k051733.cpp b/src/mame/video/k051733.cpp
index 6bd7f99d412..25feef68b02 100644
--- a/src/mame/video/k051733.cpp
+++ b/src/mame/video/k051733.cpp
@@ -60,12 +60,13 @@ reads from 0x0006, and only uses bit 1.
#include "konami_helper.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-const device_type K051733 = device_creator<k051733_device>;
+
+DEFINE_DEVICE_TYPE(K051733, k051733_device, "k051733", "K051733 Protection")
k051733_device::k051733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K051733, "K051733 Protection", tag, owner, clock, "k051733", __FILE__),
+ : device_t(mconfig, K051733, tag, owner, clock),
//m_ram[0x20],
m_rng(0)
{
diff --git a/src/mame/video/k051733.h b/src/mame/video/k051733.h
index f24106dedd1..e743409cb53 100644
--- a/src/mame/video/k051733.h
+++ b/src/mame/video/k051733.h
@@ -1,14 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K051733_H
+#define MAME_VIDEO_K051733_H
+
#pragma once
-#ifndef __K051733_H__
-#define __K051733_H__
+
class k051733_device : public device_t
{
public:
k051733_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k051733_device() {}
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
@@ -23,9 +24,9 @@ private:
uint8_t m_rng;
};
-extern const device_type K051733;
+DECLARE_DEVICE_TYPE(K051733, k051733_device)
#define MCFG_K051733_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K051733, 0)
-#endif
+#endif // MAME_VIDEO_K051733_H
diff --git a/src/mame/video/k051960.cpp b/src/mame/video/k051960.cpp
index 93299644cd3..cc90a4d4619 100644
--- a/src/mame/video/k051960.cpp
+++ b/src/mame/video/k051960.cpp
@@ -61,9 +61,10 @@ memory map:
#include "k051960.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-const device_type K051960 = device_creator<k051960_device>;
+
+DEFINE_DEVICE_TYPE(K051960, k051960_device, "k051960", "K051960 Sprite Generator")
const gfx_layout k051960_device::spritelayout =
{
@@ -126,7 +127,7 @@ GFXDECODE_END
k051960_device::k051960_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K051960, "K051960 Sprite Generator", tag, owner, clock, "k051960", __FILE__)
+ : device_t(mconfig, K051960, tag, owner, clock)
, device_gfx_interface(mconfig, *this, gfxinfo)
, m_ram(nullptr)
, m_sprite_rom(*this, DEVICE_SELF)
diff --git a/src/mame/video/k051960.h b/src/mame/video/k051960.h
index caab61d3975..c9b83843311 100644
--- a/src/mame/video/k051960.h
+++ b/src/mame/video/k051960.h
@@ -34,8 +34,7 @@ typedef device_delegate<void (int *code, int *color, int *priority, int *shadow)
devcb = &k051960_device::set_nmi_handler(*device, DEVCB_##_devcb);
-class k051960_device : public device_t,
- public device_gfx_interface
+class k051960_device : public device_t, public device_gfx_interface
{
static const gfx_layout spritelayout;
static const gfx_layout spritelayout_reverse;
@@ -46,13 +45,12 @@ class k051960_device : public device_t,
public:
k051960_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k051960_device() {}
- template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object)
- { return downcast<k051960_device &>(device).m_irq_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb)
+ { return downcast<k051960_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_nmi_handler(device_t &device, _Object object)
- { return downcast<k051960_device &>(device).m_nmi_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_nmi_handler(device_t &device, Object &&cb)
+ { return downcast<k051960_device &>(device).m_nmi_handler.set_callback(std::forward<Object>(cb)); }
// static configuration
static void set_k051960_callback(device_t &device, k051960_cb_delegate callback) { downcast<k051960_device &>(device).m_k051960_cb = callback; }
@@ -111,6 +109,6 @@ private:
int k051960_fetchromdata( int byte );
};
-extern const device_type K051960;
+DECLARE_DEVICE_TYPE(K051960, k051960_device)
#endif // MAME_VIDEO_K051960_H
diff --git a/src/mame/video/k052109.cpp b/src/mame/video/k052109.cpp
index 3dbab67b8c7..a8fc8c2223e 100644
--- a/src/mame/video/k052109.cpp
+++ b/src/mame/video/k052109.cpp
@@ -124,9 +124,10 @@ to through the chip.
#include "k052109.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-const device_type K052109 = device_creator<k052109_device>;
+
+DEFINE_DEVICE_TYPE(K052109, k052109_device, "k052109", "K052109 Tilemap Generator")
const gfx_layout k052109_device::charlayout =
{
@@ -160,7 +161,7 @@ GFXDECODE_END
k052109_device::k052109_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K052109, "K052109 Tilemap Generator", tag, owner, clock, "k052109", __FILE__),
+ : device_t(mconfig, K052109, tag, owner, clock),
device_gfx_interface(mconfig, *this, gfxinfo),
m_ram(nullptr),
m_videoram_F(nullptr),
diff --git a/src/mame/video/k052109.h b/src/mame/video/k052109.h
index e31adc250a0..0deacf9b467 100644
--- a/src/mame/video/k052109.h
+++ b/src/mame/video/k052109.h
@@ -2,6 +2,7 @@
// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
#ifndef MAME_VIDEO_K052109_H
#define MAME_VIDEO_K052109_H
+
#pragma once
#include "screen.h"
@@ -33,8 +34,8 @@ public:
k052109_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~k052109_device() {}
- template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object)
- { return downcast<k052109_device &>(device).m_irq_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb)
+ { return downcast<k052109_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
static void set_k052109_callback(device_t &device, k052109_cb_delegate callback) { downcast<k052109_device &>(device).m_k052109_cb = callback; }
static void set_ram(device_t &device, bool ram);
@@ -116,6 +117,6 @@ private:
void tileflip_reset();
};
-extern const device_type K052109;
+DECLARE_DEVICE_TYPE(K052109, k052109_device)
#endif // MAME_VIDEO_K052109_H
diff --git a/src/mame/video/k053244_k053245.cpp b/src/mame/video/k053244_k053245.cpp
index 2d9e0e1b4c4..9e96492e276 100644
--- a/src/mame/video/k053244_k053245.cpp
+++ b/src/mame/video/k053244_k053245.cpp
@@ -33,7 +33,7 @@ main ram and the buffer.
#include "konami_helper.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
@@ -41,7 +41,8 @@ main ram and the buffer.
DEVICE INTERFACE
*****************************************************************************/
-const device_type K053244 = device_creator<k05324x_device>;
+DEFINE_DEVICE_TYPE(K053244, k05324x_device, "k05324x", "K053244/053245 Sprite Generator")
+device_type const K053245 = K053244;
const gfx_layout k05324x_device::spritelayout =
{
@@ -82,7 +83,7 @@ GFXDECODE_END
k05324x_device::k05324x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K053244, "K053244 & 053245 Sprite Generator", tag, owner, clock, "k05324x", __FILE__),
+ : device_t(mconfig, K053244, tag, owner, clock),
device_gfx_interface(mconfig, *this, gfxinfo),
m_ram(nullptr),
m_buffer(nullptr),
diff --git a/src/mame/video/k053244_k053245.h b/src/mame/video/k053244_k053245.h
index f677e0b6653..e0176b39079 100644
--- a/src/mame/video/k053244_k053245.h
+++ b/src/mame/video/k053244_k053245.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K053244_K053245_H
+#define MAME_VIDEO_K053244_K053245_H
+
#pragma once
-#ifndef __K053244_K053245_H__
-#define __K053244_K053245_H__
typedef device_delegate<void (int *code, int *color, int *priority)> k05324x_cb_delegate;
@@ -19,8 +20,7 @@ typedef device_delegate<void (int *code, int *color, int *priority)> k05324x_cb_
k05324x_device::set_offsets(*device, _xoffs, _yoffs);
-class k05324x_device : public device_t,
- public device_gfx_interface
+class k05324x_device : public device_t, public device_gfx_interface
{
static const gfx_layout spritelayout;
static const gfx_layout spritelayout_6bpp;
@@ -29,7 +29,6 @@ class k05324x_device : public device_t,
public:
k05324x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k05324x_device() {}
// static configuration
static void set_bpp(device_t &device, int bpp);
@@ -78,7 +77,7 @@ private:
};
-extern const device_type K053244;
-#define K053245 K053244
+DECLARE_DEVICE_TYPE(K053244, k05324x_device)
+extern device_type const K053245;
-#endif
+#endif // MAME_VIDEO_K053244_K053245_H
diff --git a/src/mame/video/k053246_k053247_k055673.cpp b/src/mame/video/k053246_k053247_k055673.cpp
index 1ffa4dc6acd..4948c7b8f60 100644
--- a/src/mame/video/k053246_k053247_k055673.cpp
+++ b/src/mame/video/k053246_k053247_k055673.cpp
@@ -39,7 +39,7 @@ The sprite RAM format is very similar to the 053245.
#include "konami_helper.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
/*****************************************************************************
@@ -162,7 +162,7 @@ READ16_MEMBER( k053247_device::k055673_5bpp_rom_word_r ) // 5bpp
romofs /= 2;
return ROM8[romofs];
default:
- LOG(("55673_rom_word_r: Unknown read offset %x\n", offset));
+ LOG("55673_rom_word_r: Unknown read offset %x\n", offset);
break;
}
@@ -214,7 +214,7 @@ READ8_MEMBER( k053247_device::k053246_r )
}
else
{
-// LOG(("%04x: read from unknown 053246 address %x\n", space.device().safe_pc(), offset));
+// LOG("%04x: read from unknown 053246 address %x\n", space.device().safe_pc(), offset);
return 0;
}
}
@@ -914,10 +914,10 @@ void k053247_device::zdrawgfxzoom32GP(
-const device_type K055673 = device_creator<k055673_device>;
+DEFINE_DEVICE_TYPE(K055673, k055673_device, "k055673", "K055673 Sprite Generator")
k055673_device::k055673_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : k053247_device(mconfig, K055673, "K053246 & K055673 Sprite Generator", tag, owner, clock, "k055673", __FILE__)
+ : k053247_device(mconfig, K055673, tag, owner, clock)
{
}
@@ -1067,19 +1067,16 @@ void k055673_device::device_start()
-const device_type K053246 = device_creator<k053247_device>;
+DEFINE_DEVICE_TYPE(K053247, k053247_device, "k053247", "K053246/K053247 Sprite Generator")
+device_type const K053246 = K053247;
k053247_device::k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K053246, "K053246 & K053247 Sprite Generator", tag, owner, clock, "k053247", __FILE__),
- device_video_interface(mconfig, *this),
- device_gfx_interface(mconfig, *this),
- m_gfx_num(0)
+ : k053247_device(mconfig, K053247, tag, owner, clock)
{
- clear_all();
}
-k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+k053247_device::k053247_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_video_interface(mconfig, *this),
device_gfx_interface(mconfig, *this, nullptr),
m_gfx_num(0)
diff --git a/src/mame/video/k053246_k053247_k055673.h b/src/mame/video/k053246_k053247_k055673.h
index 9083662b249..4782ca54a35 100644
--- a/src/mame/video/k053246_k053247_k055673.h
+++ b/src/mame/video/k053246_k053247_k055673.h
@@ -65,9 +65,6 @@ class k053247_device : public device_t,
{
public:
k053247_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- k053247_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
- ~k053247_device() { }
// static configuration
static void set_k053247_callback(device_t &device, k053247_cb_delegate callback) { downcast<k053247_device &>(device).m_k053247_cb = callback; }
@@ -463,23 +460,18 @@ public:
}
-
-
-
- template<class _BitmapClass>
- void k053247_sprites_draw_common( _BitmapClass &bitmap, const rectangle &cliprect );
-
-
protected:
+ k053247_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
-private:
-
+ template <class _BitmapClass> void k053247_sprites_draw_common( _BitmapClass &bitmap, const rectangle &cliprect );
};
-extern const device_type K053246;
+DECLARE_DEVICE_TYPE(K053247, k053247_device)
+extern device_type const K053246;
class k055673_device : public k053247_device
{
@@ -495,7 +487,7 @@ private:
};
-extern const device_type K055673;
+DECLARE_DEVICE_TYPE(K055673, k055673_device)
#define MCFG_K053246_SET_SCREEN MCFG_VIDEO_SET_SCREEN
diff --git a/src/mame/video/k053250.cpp b/src/mame/video/k053250.cpp
index 09ad0464add..f3c393cecf6 100644
--- a/src/mame/video/k053250.cpp
+++ b/src/mame/video/k053250.cpp
@@ -5,10 +5,10 @@
#include "screen.h"
-const device_type K053250 = device_creator<k053250_device>;
+DEFINE_DEVICE_TYPE(K053250, k053250_device, "k053250", "K053250 LVC")
k053250_device::k053250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K053250, "K053250 LVC", tag, owner, clock, "k053250", __FILE__),
+ : device_t(mconfig, K053250, tag, owner, clock),
device_gfx_interface(mconfig, *this),
device_video_interface(mconfig, *this),
m_rom(*this, DEVICE_SELF)
diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h
index c4980bc058e..3365c7f4dbe 100644
--- a/src/mame/video/k053250.h
+++ b/src/mame/video/k053250.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __K053250_H__
-#define __K053250_H__
+#ifndef MAME_VIDEO_K053250_H
+#define MAME_VIDEO_K053250_H
+
+#pragma once
//
// Konami 053250 road generator
@@ -57,6 +59,6 @@ private:
uint32_t clipmask, uint32_t wrapmask, uint32_t orientation, bitmap_ind8 &priority, uint8_t pri);
};
-extern const device_type K053250;
+DECLARE_DEVICE_TYPE(K053250, k053250_device)
-#endif
+#endif // MAME_VIDEO_K053250_H
diff --git a/src/mame/video/k053250_ps.cpp b/src/mame/video/k053250_ps.cpp
index 72e841b55f2..9d607f5cba6 100644
--- a/src/mame/video/k053250_ps.cpp
+++ b/src/mame/video/k053250_ps.cpp
@@ -38,10 +38,10 @@
xxxx xxxx ROM access address [15:8]
*/
-const device_type K053250PS = device_creator<k053250ps_device>;
+DEFINE_DEVICE_TYPE(K053250PS, k053250ps_device, "k053250ps", "K053250PS LVC")
k053250ps_device::k053250ps_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K053250PS, "K053250PS LVC", tag, owner, clock, "k053250ps", __FILE__),
+ : device_t(mconfig, K053250PS, tag, owner, clock),
device_gfx_interface(mconfig, *this),
device_video_interface(mconfig, *this),
m_dmairq_cb(*this),
diff --git a/src/mame/video/k053250_ps.h b/src/mame/video/k053250_ps.h
index f0835e37568..99479e5a9a2 100644
--- a/src/mame/video/k053250_ps.h
+++ b/src/mame/video/k053250_ps.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __K053250PS_H__
-#define __K053250PS_H__
+#ifndef MAME_VIDEO_K053250PS_H
+#define MAME_VIDEO_K053250PS_H
+
+#pragma once
//
// Konami 053250 road generator (Pirate Ship version)
@@ -75,6 +77,6 @@ private:
uint32_t clipmask, uint32_t wrapmask, uint32_t orientation, bitmap_ind8 &priority, uint8_t pri);
};
-extern const device_type K053250PS;
+DECLARE_DEVICE_TYPE(K053250PS, k053250ps_device)
-#endif
+#endif // MAME_VIDEO_K053250PS_H
diff --git a/src/mame/video/k053251.cpp b/src/mame/video/k053251.cpp
index 876a1497666..21eece746f6 100644
--- a/src/mame/video/k053251.cpp
+++ b/src/mame/video/k053251.cpp
@@ -122,12 +122,13 @@ actually used, since the priority is taken from the external ports.
#include "konami_helper.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
-const device_type K053251 = device_creator<k053251_device>;
+
+DEFINE_DEVICE_TYPE(K053251, k053251_device, "k053251", "K053251 Priority Encoder")
k053251_device::k053251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K053251, "K053251 Priority Encoder", tag, owner, clock, "k053251", __FILE__),
+ : device_t(mconfig, K053251, tag, owner, clock),
//m_dirty_tmap[5],
//m_ram[16],
m_tilemaps_set(0)
diff --git a/src/mame/video/k053251.h b/src/mame/video/k053251.h
index 6c1baed9636..b2736f71d4c 100644
--- a/src/mame/video/k053251.h
+++ b/src/mame/video/k053251.h
@@ -1,22 +1,21 @@
// license:BSD-3-Clause
-// copyright-holders:Fabio Priuli,Acho A. Tang, R. Belmont
-#ifndef __K053251_H__
-#define __K053251_H__
+// copyright-holders:Fabio Priuli, Acho A. Tang, R. Belmont
+#ifndef MAME_VIDEO_K053251_H
+#define MAME_VIDEO_K053251_H
+class k053251_device : public device_t
+{
+public:
enum
{
- K053251_CI0 = 0,
- K053251_CI1,
- K053251_CI2,
- K053251_CI3,
- K053251_CI4
+ CI0 = 0,
+ CI1,
+ CI2,
+ CI3,
+ CI4
};
-class k053251_device : public device_t
-{
-public:
k053251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k053251_device() {}
/*
Note: k053251_w() automatically does a ALL_TILEMAPS->mark_all_dirty()
@@ -52,8 +51,9 @@ private:
};
extern const device_type K053251;
+DECLARE_DEVICE_TYPE(K053251, k053251_device)
#define MCFG_K053251_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K053251, 0)
-#endif
+#endif // MAME_VIDEO_K053251_H
diff --git a/src/mame/video/k053936.cpp b/src/mame/video/k053936.cpp
index 54269a89a32..429d033084d 100644
--- a/src/mame/video/k053936.cpp
+++ b/src/mame/video/k053936.cpp
@@ -6,7 +6,7 @@
#include "k053936.h"
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
// Localized K053936/ROZ+
@@ -227,10 +227,10 @@ void K053936_set_offset(int chip, int xoffs, int yoffs)
/* */
/***************************************************************************/
-const device_type K053936 = device_creator<k053936_device>;
+DEFINE_DEVICE_TYPE(K053936, k053936_device, "k053936", "K053936 Video Controller")
k053936_device::k053936_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K053936, "K053936 Video Controller", tag, owner, clock, "k053936", __FILE__),
+ : device_t(mconfig, K053936, tag, owner, clock),
m_ctrl(nullptr),
m_linectrl(nullptr),
m_wrap(0),
diff --git a/src/mame/video/k053936.h b/src/mame/video/k053936.h
index cae0e8a7394..f1546e8482b 100644
--- a/src/mame/video/k053936.h
+++ b/src/mame/video/k053936.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K053936_H
+#define MAME_VIDEO_K053936_H
+
#pragma once
-#ifndef __K053936_H__
-#define __K053936_H__
void K053936_0_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,tilemap_t *tmap,int flags,uint32_t priority, int glfgreat_hack);
@@ -51,7 +52,7 @@ private:
int m_wrap, m_xoff, m_yoff;
};
-extern const device_type K053936;
+DECLARE_DEVICE_TYPE(K053936, k053936_device)
#define MCFG_K053936_WRAP(_wrap) \
k053936_device::set_wrap(*device, _wrap);
@@ -59,4 +60,4 @@ extern const device_type K053936;
#define MCFG_K053936_OFFSETS(_xoffs, _yoffs) \
k053936_device::set_offsets(*device, _xoffs, _yoffs);
-#endif
+#endif // MAME_VIDEO_K053936_H
diff --git a/src/mame/video/k054000.cpp b/src/mame/video/k054000.cpp
index f34f8c84155..2b96bdcdce9 100644
--- a/src/mame/video/k054000.cpp
+++ b/src/mame/video/k054000.cpp
@@ -6,7 +6,8 @@
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
+
/***************************************************************************/
/* */
@@ -52,10 +53,10 @@ Memory map:
/* */
/***************************************************************************/
-const device_type K054000 = device_creator<k054000_device>;
+DEFINE_DEVICE_TYPE(K054000, k054000_device, "k054000", "K054000 Protection")
k054000_device::k054000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K054000, "K054000 Protection", tag, owner, clock, "k054000", __FILE__)
+ : device_t(mconfig, K054000, tag, owner, clock)
{
}
diff --git a/src/mame/video/k054000.h b/src/mame/video/k054000.h
index f8ebe242dc8..9e951822456 100644
--- a/src/mame/video/k054000.h
+++ b/src/mame/video/k054000.h
@@ -1,9 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K054000_H
+#define MAME_VIDEO_K054000_H
#pragma once
-#ifndef __K054000_H__
-#define __K054000_H__
+
#define MCFG_K054000_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K054000, 0)
@@ -29,9 +30,6 @@ private:
uint8_t m_regs[0x20];
};
-extern const device_type K054000;
-
-
-
+DECLARE_DEVICE_TYPE(K054000, k054000_device)
-#endif
+#endif // MAME_VIDEO_K054000_H
diff --git a/src/mame/video/k054156_k054157_k056832.cpp b/src/mame/video/k054156_k054157_k056832.cpp
index 2fb5942aabe..0348da64ce8 100644
--- a/src/mame/video/k054156_k054157_k056832.cpp
+++ b/src/mame/video/k054156_k054157_k056832.cpp
@@ -168,6 +168,11 @@ ones. The other 7 words are ignored. Global scrollx is ignored.
#include "k054156_k054157_k056832.h"
#include "konami_helper.h"
+#include "video/k055555.h" // still needs k055555_get_palette_index
+
+#define VERBOSE 0
+#include "logmacro.h"
+
/* end common functions */
@@ -179,10 +184,10 @@ ones. The other 7 words are ignored. Global scrollx is ignored.
-const device_type K056832 = device_creator<k056832_device>;
+DEFINE_DEVICE_TYPE(K056832, k056832_device, "k056832", "K056832 Tilemap Generator")
k056832_device::k056832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K056832, "K056832 Tilemap Generator", tag, owner, clock, "k056832", __FILE__),
+ : device_t(mconfig, K056832, tag, owner, clock),
device_gfx_interface(mconfig, *this),
//m_tilemap[K056832_PAGE_COUNT],
//*m_pixmap[K056832_PAGE_COUNT],
@@ -643,9 +648,7 @@ READ16_MEMBER( k056832_device::k_5bpp_rom_word_r )
else if (mem_mask == 0x00ff)
return rom_read_b(offset * 2 + 1, 4, 5, 0)<<16;
else
- {
- //LOG(("Non-byte read of tilemap ROM, PC=%x (mask=%x)\n", space.device().safe_pc(), mem_mask));
- }
+ LOG("Non-byte read of tilemap ROM, PC=%x (mask=%x)\n", space.device().safe_pc(), mem_mask);
return 0;
}
@@ -660,9 +663,7 @@ READ32_MEMBER( k056832_device::k_5bpp_rom_long_r )
else if (mem_mask == 0x000000ff)
return rom_read_b(offset * 4 + 3, 4, 5, 1);
else
- {
- //LOG(("Non-byte read of tilemap ROM, PC=%x (mask=%x)\n", space.device().safe_pc(), mem_mask));
- }
+ LOG("Non-byte read of tilemap ROM, PC=%x (mask=%x)\n", space.device().safe_pc(), mem_mask);
return 0;
}
@@ -677,9 +678,7 @@ READ32_MEMBER( k056832_device::k_6bpp_rom_long_r )
else if (mem_mask == 0x000000ff)
return rom_read_b(offset * 4 + 3, 4, 6, 0);
else
- {
- //LOG(("Non-byte read of tilemap ROM, PC=%x (mask=%x)\n", space.device().safe_pc(), mem_mask));
- }
+ LOG("Non-byte read of tilemap ROM, PC=%x (mask=%x)\n", space.device().safe_pc(), mem_mask);
return 0;
}
diff --git a/src/mame/video/k054156_k054157_k056832.h b/src/mame/video/k054156_k054157_k056832.h
index 8854645b752..410306b070a 100644
--- a/src/mame/video/k054156_k054157_k056832.h
+++ b/src/mame/video/k054156_k054157_k056832.h
@@ -1,13 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#pragma once
-#ifndef __K056832_H__
-#define __K056832_H__
-
-#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#ifndef MAME_VIDEO_K054156_K054157_K056832_H
+#define MAME_VIDEO_K054156_K054157_K056832_H
-#include "video/k055555.h"// still needs k055555_get_palette_index
+#pragma once
typedef device_delegate<void (int layer, int *code, int *color, int *flags)> k056832_cb_delegate;
@@ -36,14 +32,12 @@ typedef device_delegate<void (int layer, int *code, int *color, int *flags)> k05
#define K056382_DRAW_FLAG_FORCE_XYSCROLL 0x00800000
+class k055555_device;
+
class k056832_device : public device_t, public device_gfx_interface
{
public:
k056832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k056832_device()
- {
- m_k055555 = nullptr;
- }
static void set_k056832_callback(device_t &device, k056832_cb_delegate callback) { downcast<k056832_device &>(device).m_k056832_cb = callback; }
static void set_config(device_t &device, const char *gfx_reg, int bpp, int big, int djmain_hack, const char *k055555)
@@ -222,13 +216,12 @@ private:
int altK056832_update_linemap(screen_device &screen, bitmap_rgb32 &bitmap, int page, int flags);
};
-extern const device_type K056832;
-
-
+DECLARE_DEVICE_TYPE(K056832, k056832_device)
#define MCFG_K056832_PALETTE(_palette_tag) \
MCFG_GFX_PALETTE(_palette_tag)
-#endif
+#endif // MAME_VIDEO_K054156_K054157_K056832_H
+
diff --git a/src/mame/video/k054338.cpp b/src/mame/video/k054338.cpp
index 1ca97eea33b..a8d97bcda4d 100644
--- a/src/mame/video/k054338.cpp
+++ b/src/mame/video/k054338.cpp
@@ -4,9 +4,9 @@
#include "emu.h"
#include "k054338.h"
-
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
+
/***************************************************************************/
/* */
@@ -18,10 +18,10 @@
// because the implementation is video dependant, this is just a
// register-handling shell.
-const device_type K054338 = device_creator<k054338_device>;
+DEFINE_DEVICE_TYPE(K054338, k054338_device, "k054338", "K054338 Mixer")
k054338_device::k054338_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K054338, "K054338 Mixer", tag, owner, clock, "k054338", __FILE__),
+ : device_t(mconfig, K054338, tag, owner, clock),
device_video_interface(mconfig, *this),
m_alpha_inv(0),
m_k055555_tag(nullptr)
diff --git a/src/mame/video/k054338.h b/src/mame/video/k054338.h
index 93022f66c45..8385fe10c2d 100644
--- a/src/mame/video/k054338.h
+++ b/src/mame/video/k054338.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_K054338_H
+#define MAME_VIDEO_K054338_H
+
#pragma once
-#ifndef __K054338_H__
-#define __K054338_H__
#include "k055555.h"
@@ -26,7 +27,6 @@ class k054338_device : public device_t,
{
public:
k054338_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~k054338_device() {}
// static configuration
static void set_mixer_tag(device_t &device, const char *tag) { downcast<k054338_device &>(device).m_k055555_tag = tag; }
@@ -60,7 +60,7 @@ private:
k055555_device *m_k055555; /* used to fill BG color */
};
-extern const device_type K054338;
+DECLARE_DEVICE_TYPE(K054338, k054338_device)
#define MCFG_K054338_MIXER(_tag) \
@@ -71,4 +71,4 @@ extern const device_type K054338;
#define MCFG_K054338_SET_SCREEN MCFG_VIDEO_SET_SCREEN
-#endif
+#endif // MAME_VIDEO_K054338_H
diff --git a/src/mame/video/k055555.cpp b/src/mame/video/k055555.cpp
index 5be5657e5ce..68abbbdfb09 100644
--- a/src/mame/video/k055555.cpp
+++ b/src/mame/video/k055555.cpp
@@ -64,7 +64,8 @@ Lots of byte-wise registers. A partial map:
#define VERBOSE 0
-#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
+#include "logmacro.h"
+
/* K055555 5-bit-per-pixel priority encoder */
/* This device has 48 8-bit-wide registers */
@@ -83,7 +84,7 @@ void k055555_device::K055555_write_reg(uint8_t regnum, uint8_t regdat)
if (regdat != m_regs[regnum])
{
- LOG(("5^5: %x to reg %x (%s)\n", regdat, regnum, rnames[regnum]));
+ LOG("5^5: %x to reg %x (%s)\n", regdat, regnum, rnames[regnum]);
}
m_regs[regnum] = regdat;
@@ -140,10 +141,10 @@ int k055555_device::K055555_get_palette_index(int idx)
-const device_type K055555 = device_creator<k055555_device>;
+DEFINE_DEVICE_TYPE(K055555, k055555_device, "k055555", "K055555 Priority Encoder")
k055555_device::k055555_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K055555, "K055555 Priority Encoder", tag, owner, clock, "k055555", __FILE__)
+ : device_t(mconfig, K055555, tag, owner, clock)
{
}
@@ -163,5 +164,5 @@ void k055555_device::device_start()
void k055555_device::device_reset()
{
- memset(m_regs, 0, 64 * sizeof(uint8_t));
+ std::fill(std::begin(m_regs), std::end(m_regs), 0);
}
diff --git a/src/mame/video/k055555.h b/src/mame/video/k055555.h
index 01c615cac03..ea0cc05dbd6 100644
--- a/src/mame/video/k055555.h
+++ b/src/mame/video/k055555.h
@@ -1,10 +1,11 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/* */
+#ifndef MAME_MACHINE_K055555_H
+#define MAME_MACHINE_K055555_H
#pragma once
-#ifndef __K055555_H__
-#define __K055555_H__
+
#define MCFG_K055555_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, K055555, 0)
@@ -100,7 +101,7 @@ private:
uint8_t m_regs[128];
};
-extern const device_type K055555;
+DECLARE_DEVICE_TYPE(K055555, k055555_device)
-#endif
+#endif // MAME_MACHINE_K055555_H
diff --git a/src/mame/video/k057714.cpp b/src/mame/video/k057714.cpp
index ddbad471cfe..eafecfa74c8 100644
--- a/src/mame/video/k057714.cpp
+++ b/src/mame/video/k057714.cpp
@@ -12,11 +12,11 @@
#define PRINT_GCU 0
-const device_type K057714 = device_creator<k057714_device>;
+DEFINE_DEVICE_TYPE(K057714, k057714_device, "k057714", "k057714_device GCU")
k057714_device::k057714_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K057714, "K057714 GCU", tag, owner, clock, "k057714", __FILE__),
- m_irq(*this)
+ : device_t(mconfig, K057714, tag, owner, clock)
+ , m_irq(*this)
{
}
diff --git a/src/mame/video/k057714.h b/src/mame/video/k057714.h
index 6290464459b..c5bf4b0bf40 100644
--- a/src/mame/video/k057714.h
+++ b/src/mame/video/k057714.h
@@ -1,15 +1,16 @@
// license:BSD-3-Clause
// copyright-holders:Ville Linde
+#ifndef MAME_MACHINE_K057714_H
+#define MAME_MACHINE_K057714_H
#pragma once
-#ifndef __K057714_H__
-#define __K057714_H__
+
class k057714_device : public device_t
{
public:
k057714_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &static_set_irq_callback(device_t &device, _Object object) { return downcast<k057714_device &>(device).m_irq.set_callback(object); }
+ template <class Object> static devcb_base &static_set_irq_callback(device_t &device, Object &&cb) { return downcast<k057714_device &>(device).m_irq.set_callback(std::forward<Object>(cb)); }
int draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -60,10 +61,10 @@ private:
devcb_write_line m_irq;
};
-extern const device_type K057714;
+DECLARE_DEVICE_TYPE(K057714, k057714_device)
#define MCFG_K057714_IRQ_CALLBACK(_devcb) \
devcb = &k057714_device::static_set_irq_callback(*device, DEVCB_##_devcb);
-#endif
+#endif // MAME_MACHINE_K057714_H
diff --git a/src/mame/video/k1ge.cpp b/src/mame/video/k1ge.cpp
index 402345f1060..15baa56265b 100644
--- a/src/mame/video/k1ge.cpp
+++ b/src/mame/video/k1ge.cpp
@@ -862,18 +862,15 @@ void k1ge_device::device_reset()
}
-const device_type K1GE = device_creator<k1ge_device>;
+DEFINE_DEVICE_TYPE(K1GE, k1ge_device, "k1ge", "K1GE Monochrome Graphics + LCD")
k1ge_device::k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, K1GE, "K1GE Monochrome Graphics + LCD", tag, owner, clock, "k1ge", __FILE__)
- , device_video_interface(mconfig, *this)
- , m_vblank_pin_w(*this)
- , m_hblank_pin_w(*this)
+ : k1ge_device(mconfig, K1GE, tag, owner, clock)
{
}
-k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_vblank_pin_w(*this)
, m_hblank_pin_w(*this)
@@ -896,10 +893,10 @@ machine_config_constructor k1ge_device::device_mconfig_additions() const
}
-const device_type K2GE = device_creator<k2ge_device>;
+DEFINE_DEVICE_TYPE(K2GE, k2ge_device, "k2ge", "K2GE Color Graphics + LCD")
k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : k1ge_device(mconfig, K2GE, "K2GE Color Graphics + LCD", tag, owner, clock, "k2ge", __FILE__)
+ : k1ge_device(mconfig, K2GE, tag, owner, clock)
{
}
diff --git a/src/mame/video/k1ge.h b/src/mame/video/k1ge.h
index 4c73467d03f..0761f0d03c1 100644
--- a/src/mame/video/k1ge.h
+++ b/src/mame/video/k1ge.h
@@ -6,8 +6,10 @@
******************************************************************************/
-#ifndef __K2GE_H_
-#define __K2GE_H_
+#ifndef MAME_VIDEO_K1GE_H
+#define MAME_VIDEO_K1GE_H
+
+#pragma once
#define MCFG_K1GE_ADD(_tag, _clock, _screen, _vblank, _hblank ) \
@@ -23,12 +25,10 @@
devcb = &k1ge_device::static_set_hblank_callback( *device, DEVCB_##_hblank );
-class k1ge_device : public device_t,
- public device_video_interface
+class k1ge_device : public device_t, public device_video_interface
{
public:
k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -38,11 +38,14 @@ public:
void update( bitmap_ind16 &bitmap, const rectangle &cliprect );
// Static methods
- template<class _Object> static devcb_base &static_set_vblank_callback(device_t &device, _Object object) { return downcast<k1ge_device &>(device).m_vblank_pin_w.set_callback(object); }
- template<class _Object> static devcb_base &static_set_hblank_callback(device_t &device, _Object object) { return downcast<k1ge_device &>(device).m_hblank_pin_w.set_callback(object); }
+ template <class Object> static devcb_base &static_set_vblank_callback(device_t &device, Object &&cb) { return downcast<k1ge_device &>(device).m_vblank_pin_w.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &static_set_hblank_callback(device_t &device, Object &&cb) { return downcast<k1ge_device &>(device).m_hblank_pin_w.set_callback(std::forward<Object>(cb)); }
static const int K1GE_SCREEN_HEIGHT = 199;
+
protected:
+ k1ge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -73,6 +76,7 @@ public:
k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_PALETTE_INIT(k2ge);
+
protected:
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -85,8 +89,7 @@ protected:
};
-extern const device_type K1GE;
-extern const device_type K2GE;
-
+DECLARE_DEVICE_TYPE(K1GE, k1ge_device)
+DECLARE_DEVICE_TYPE(K2GE, k2ge_device)
-#endif
+#endif // MAME_VIDEO_K1GE_H
diff --git a/src/mame/video/kan_pand.cpp b/src/mame/video/kan_pand.cpp
index c8639ebfc57..6c30e9b04a4 100644
--- a/src/mame/video/kan_pand.cpp
+++ b/src/mame/video/kan_pand.cpp
@@ -53,10 +53,10 @@
#include "video/kan_pand.h"
#include "screen.h"
-const device_type KANEKO_PANDORA = device_creator<kaneko_pandora_device>;
+DEFINE_DEVICE_TYPE(KANEKO_PANDORA, kaneko_pandora_device, "kaneko_pandora", "Kaneko PANDORA GFX")
kaneko_pandora_device::kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KANEKO_PANDORA, "Kaneko PANDORA GFX", tag, owner, clock, "kaneko_pandora", __FILE__)
+ : device_t(mconfig, KANEKO_PANDORA, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_gfx_region(0)
, m_xoffset(0)
diff --git a/src/mame/video/kan_pand.h b/src/mame/video/kan_pand.h
index d0e25faed36..175debb9dbf 100644
--- a/src/mame/video/kan_pand.h
+++ b/src/mame/video/kan_pand.h
@@ -8,8 +8,10 @@
**************************************************************************/
-#ifndef __KAN_PAND_H__
-#define __KAN_PAND_H__
+#ifndef MAME_VIDEO_KAN_PAND_H
+#define MAME_VIDEO_KAN_PAND_H
+
+#pragma once
/***************************************************************************
TYPE DEFINITIONS
@@ -20,7 +22,6 @@ class kaneko_pandora_device : public device_t,
{
public:
kaneko_pandora_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~kaneko_pandora_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -60,7 +61,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type KANEKO_PANDORA;
+DECLARE_DEVICE_TYPE(KANEKO_PANDORA, kaneko_pandora_device)
/***************************************************************************
@@ -76,4 +77,4 @@ extern const device_type KANEKO_PANDORA;
#define MCFG_KANEKO_PANDORA_GFXDECODE(_gfxtag) \
kaneko_pandora_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif /* __KAN_PAND_H__ */
+#endif // MAME_VIDEO_KAN_PAND_H
diff --git a/src/mame/video/kaneko_grap2.cpp b/src/mame/video/kaneko_grap2.cpp
index bcc09283668..07b0e08c8cd 100644
--- a/src/mame/video/kaneko_grap2.cpp
+++ b/src/mame/video/kaneko_grap2.cpp
@@ -14,10 +14,10 @@
#include "emu.h"
#include "kaneko_grap2.h"
-const device_type KANEKO_GRAP2 = device_creator<kaneko_grap2_device>;
+DEFINE_DEVICE_TYPE(KANEKO_GRAP2, kaneko_grap2_device, "kaneko_grap2", "Kaneko GRAP2")
kaneko_grap2_device::kaneko_grap2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KANEKO_GRAP2, "Kaneko GRAP2", tag, owner, clock, "kaneko_grap2", __FILE__)
+ : device_t(mconfig, KANEKO_GRAP2, tag, owner, clock)
, m_palette(*this, finder_base::DUMMY_TAG)
{
m_chipnum = 0;
diff --git a/src/mame/video/kaneko_grap2.h b/src/mame/video/kaneko_grap2.h
index 921b94df347..65380accf6d 100644
--- a/src/mame/video/kaneko_grap2.h
+++ b/src/mame/video/kaneko_grap2.h
@@ -1,6 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_KANEKO_GRAP2_H
+#define MAME_VIDEO_KANEKO_GRAP2_H
+#pragma once
#define GRAP2_AREA( _BASE, name ) \
@@ -91,7 +94,10 @@ private:
};
-extern const device_type KANEKO_GRAP2;
+DECLARE_DEVICE_TYPE(KANEKO_GRAP2, kaneko_grap2_device)
#define MCFG_KANEKO_GRAP2_PALETTE(_palette_tag) \
kaneko_grap2_device::static_set_palette_tag(*device, "^" _palette_tag);
+
+
+#endif // MAME_VIDEO_KANEKO_GRAP2_H
diff --git a/src/mame/video/kaneko_spr.cpp b/src/mame/video/kaneko_spr.cpp
index 106e74a7b63..6a738e11a92 100644
--- a/src/mame/video/kaneko_spr.cpp
+++ b/src/mame/video/kaneko_spr.cpp
@@ -28,19 +28,16 @@
#include "kaneko_spr.h"
#include "screen.h"
-const device_type KANEKO_VU002_SPRITE = device_creator<kaneko_vu002_sprite_device>;
-const device_type KANEKO_KC002_SPRITE = device_creator<kaneko_kc002_sprite_device>;
+DEFINE_DEVICE_TYPE(KANEKO_VU002_SPRITE, kaneko_vu002_sprite_device, "kaneko_vu002", "Kaneko VU002 Sprites")
+DEFINE_DEVICE_TYPE(KANEKO_KC002_SPRITE, kaneko_kc002_sprite_device, "kaneko_kc002", "Kaneko KC002 Sprites")
kaneko16_sprite_device::kaneko16_sprite_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
@@ -619,12 +616,12 @@ void kaneko16_sprite_device::kaneko16_render_sprites_common(_BitmapClass &bitmap
}
kaneko_vu002_sprite_device::kaneko_vu002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : kaneko16_sprite_device(mconfig, KANEKO_VU002_SPRITE, "Kaneko VU002 Sprites", tag, owner, clock, "kaneko_vu002", __FILE__)
+ : kaneko16_sprite_device(mconfig, KANEKO_VU002_SPRITE, tag, owner, clock)
{
}
kaneko_kc002_sprite_device::kaneko_kc002_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : kaneko16_sprite_device(mconfig, KANEKO_KC002_SPRITE, "Kaneko KC002 Sprites", tag, owner, clock, "kaneko_kc002", __FILE__)
+ : kaneko16_sprite_device(mconfig, KANEKO_KC002_SPRITE, tag, owner, clock)
{
}
diff --git a/src/mame/video/kaneko_spr.h b/src/mame/video/kaneko_spr.h
index 88dff484812..8a27bb8013e 100644
--- a/src/mame/video/kaneko_spr.h
+++ b/src/mame/video/kaneko_spr.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, David Haywood
+#ifndef MAME_VIDEO_KANEKO_SPR_H
+#define MAME_VIDEO_KANEKO_SPR_H
+
+#pragma once
/* Kaneko Sprites */
@@ -56,12 +60,9 @@ protected:
kaneko16_sprite_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source);
+ uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -125,7 +126,7 @@ public:
int get_sprite_type(void) override{ return 0; };
};
-extern const device_type KANEKO_VU002_SPRITE;
+DECLARE_DEVICE_TYPE(KANEKO_VU002_SPRITE, kaneko_vu002_sprite_device)
class kaneko_kc002_sprite_device : public kaneko16_sprite_device
{
@@ -135,4 +136,6 @@ public:
int get_sprite_type(void) override{ return 1; };
};
-extern const device_type KANEKO_KC002_SPRITE;
+DECLARE_DEVICE_TYPE(KANEKO_KC002_SPRITE, kaneko_kc002_sprite_device)
+
+#endif // MAME_VIDEO_KANEKO_SPR_H
diff --git a/src/mame/video/kaneko_tmap.cpp b/src/mame/video/kaneko_tmap.cpp
index 77e1046d49a..d9770bc8478 100644
--- a/src/mame/video/kaneko_tmap.cpp
+++ b/src/mame/video/kaneko_tmap.cpp
@@ -94,10 +94,10 @@ There are more!
#include "emu.h"
#include "kaneko_tmap.h"
-const device_type KANEKO_TMAP = device_creator<kaneko_view2_tilemap_device>;
+DEFINE_DEVICE_TYPE(KANEKO_TMAP, kaneko_view2_tilemap_device, "kaneko_view2", "Kaneko VIEW2 Tilemaps")
kaneko_view2_tilemap_device::kaneko_view2_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, KANEKO_TMAP, "Kaneko VIEW2 Tilemaps", tag, owner, clock, "kaneko_view2_tilemap", __FILE__)
+ : device_t(mconfig, KANEKO_TMAP, tag, owner, clock)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
m_invert_flip = 0;
diff --git a/src/mame/video/kaneko_tmap.h b/src/mame/video/kaneko_tmap.h
index a504b3a23c6..23daae62f50 100644
--- a/src/mame/video/kaneko_tmap.h
+++ b/src/mame/video/kaneko_tmap.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, David Haywood
+#ifndef MAME_VIDEO_KANEKO_TMAP_H
+#define MAME_VIDEO_KANEKO_TMAP_H
+
+#pragma once
+
class kaneko_view2_tilemap_device : public device_t
@@ -13,17 +18,6 @@ public:
static void set_offset(device_t &device, int dx, int dy, int xdim, int ydim);
static void set_invert_flip(device_t &device, int invert_flip); // for fantasia (bootleg)
- // set when creating device
- int m_tilebase;
- int m_dx, m_dy, m_xdim, m_ydim;
- int m_invert_flip;
-
- std::unique_ptr<uint16_t[]> m_vram[2];
- std::unique_ptr<uint16_t[]> m_vscroll[2];
- std::unique_ptr<uint16_t[]> m_regs;
- tilemap_t* m_tmap[2];
- uint16_t m_vram_tile_addition[2]; // galsnew
-
void get_tile_info(tile_data &tileinfo, tilemap_memory_index tile_index, int _N_);
void kaneko16_vram_w(offs_t offset, uint16_t data, uint16_t mem_mask, int _N_);
@@ -75,10 +69,23 @@ private:
TILE_GET_INFO_MEMBER(get_tile_info_0);
TILE_GET_INFO_MEMBER(get_tile_info_1);
required_device<gfxdecode_device> m_gfxdecode;
+
+ // set when creating device
+ int m_tilebase;
+ int m_dx, m_dy, m_xdim, m_ydim;
+ int m_invert_flip;
+
+ std::unique_ptr<uint16_t[]> m_vram[2];
+ std::unique_ptr<uint16_t[]> m_vscroll[2];
+ std::unique_ptr<uint16_t[]> m_regs;
+ tilemap_t* m_tmap[2];
+ uint16_t m_vram_tile_addition[2]; // galsnew
};
-extern const device_type KANEKO_TMAP;
+DECLARE_DEVICE_TYPE(KANEKO_TMAP, kaneko_view2_tilemap_device)
#define MCFG_KANEKO_TMAP_GFXDECODE(_gfxtag) \
kaneko_view2_tilemap_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_KANEKO_TMAP_H
diff --git a/src/mame/video/leland.cpp b/src/mame/video/leland.cpp
index 7f51b56b7c7..4683e7f9361 100644
--- a/src/mame/video/leland.cpp
+++ b/src/mame/video/leland.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "includes/leland.h"
+#include "audio/leland.h"
/* constants */
diff --git a/src/mame/video/maria.cpp b/src/mame/video/maria.cpp
index d76cced296a..f4632c478f4 100644
--- a/src/mame/video/maria.cpp
+++ b/src/mame/video/maria.cpp
@@ -55,12 +55,12 @@
#define READ_MEM(x) space.read_byte(x)
-const device_type ATARI_MARIA = device_creator<atari_maria_device>;
+DEFINE_DEVICE_TYPE(ATARI_MARIA, atari_maria_device, "atari_maria", "Atari MARIA")
atari_maria_device::atari_maria_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ATARI_MARIA, "Atari MARIA", tag, owner, clock, "atari_maria", __FILE__)
+ : device_t(mconfig, ATARI_MARIA, tag, owner, clock)
{
}
diff --git a/src/mame/video/maria.h b/src/mame/video/maria.h
index 346414dfae3..48145b4062d 100644
--- a/src/mame/video/maria.h
+++ b/src/mame/video/maria.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Dan Boris
-#ifndef __ATARI_MARIA__
-#define __ATARI_MARIA__
+#ifndef MAME_VIDEO_MARIA_H
+#define MAME_VIDEO_MARIA_H
+
+#pragma once
// ======================> atari_maria_device
@@ -61,11 +63,11 @@ private:
// device type definition
-extern const device_type ATARI_MARIA;
+DECLARE_DEVICE_TYPE(ATARI_MARIA, atari_maria_device)
#define MCFG_MARIA_DMACPU(_tag) \
atari_maria_device::set_cpu_tag(*device, _tag);
-#endif
+#endif // MAME_VIDEO_MARIA_H
diff --git a/src/mame/video/mb60553.cpp b/src/mame/video/mb60553.cpp
index 9f34417a83c..9178227b0e4 100644
--- a/src/mame/video/mb60553.cpp
+++ b/src/mame/video/mb60553.cpp
@@ -13,27 +13,25 @@
#include "screen.h"
-const device_type MB60553 = device_creator<mb60553_zooming_tilemap_device>;
+DEFINE_DEVICE_TYPE(MB60553, mb60553_zooming_tilemap_device, "mb60553", "MB60553 Zooming Tilemap")
mb60553_zooming_tilemap_device::mb60553_zooming_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MB60553, "MB60553 Zooming Tilemap", tag, owner, clock, "mb60553", __FILE__),
- m_vram(nullptr),
- m_pal_base(0),
- m_lineram(nullptr),
- m_gfx_region(0),
- m_gfxdecode(*this, finder_base::DUMMY_TAG)
+ : device_t(mconfig, MB60553, tag, owner, clock)
+ , m_tmap(nullptr)
+ , m_vram()
+ , m_regs{ 0, 0, 0, 0, 0, 0, 0, 0 }
+ , m_bank{ 0, 0, 0, 0, 0, 0, 0, 0, }
+ , m_pal_base(0)
+ , m_lineram()
+ , m_gfx_region(0)
+ , m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
- for (int i = 0; i < 8; i++)
- {
- m_regs[i] = 0;
- m_bank[i] = 0;
- }
}
void mb60553_zooming_tilemap_device::device_start()
{
- if(!m_gfxdecode->started())
+ if (!m_gfxdecode->started())
throw device_missing_dependencies();
m_lineram = make_unique_clear<uint16_t[]>(0x1000/2);
@@ -179,15 +177,9 @@ void mb60553_zooming_tilemap_device::reg_written( int num_reg)
TILEMAP_MAPPER_MEMBER(mb60553_zooming_tilemap_device::twc94_scan)
{
/* logical (col,row) -> memory offset */
- return (row*64) + (col&63) + ((col&64)<<6);
-}
-
-void mb60553_zooming_tilemap_device::set_pal_base( int pal_base)
-{
- m_pal_base = pal_base;
+ return (row << 6) + (col & 0x003f) + (BIT(col, 6) << 12);
}
-
void mb60553_zooming_tilemap_device::draw_roz_core(screen_device &screen, bitmap_ind16 &destbitmap, const rectangle &cliprect,
uint32_t startx, uint32_t starty, int incxx, int incxy, int incyx, int incyy, bool wraparound)
{
@@ -298,12 +290,6 @@ void mb60553_zooming_tilemap_device::draw( screen_device &screen, bitmap_ind16&
}
}
-tilemap_t* mb60553_zooming_tilemap_device::get_tilemap()
-{
- return m_tmap;
-}
-
-
WRITE16_MEMBER(mb60553_zooming_tilemap_device::regs_w)
{
uint16_t oldreg = m_regs[offset];
diff --git a/src/mame/video/mb60553.h b/src/mame/video/mb60553.h
index b23df749314..71d387227c2 100644
--- a/src/mame/video/mb60553.h
+++ b/src/mame/video/mb60553.h
@@ -2,27 +2,23 @@
// copyright-holders:David Haywood
/*** MB60553 **********************************************/
+#ifndef MAME_VIDEO_MB60533_H
+#define MAME_VIDEO_MB60533_H
+
+#pragma once
class mb60553_zooming_tilemap_device : public device_t
{
public:
- mb60553_zooming_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
static void set_gfx_region(device_t &device, int gfxregion);
- tilemap_t* m_tmap;
- std::unique_ptr<uint16_t[]> m_vram;
- uint16_t m_regs[8];
- uint8_t m_bank[8];
- uint16_t m_pal_base;
- void reg_written( int num_reg);
- TILE_GET_INFO_MEMBER(get_tile_info);
- void set_pal_base( int m_pal_base);
- void draw( screen_device &screen, bitmap_ind16& bitmap, const rectangle &cliprect, int priority);
- tilemap_t* get_tilemap();
+ mb60553_zooming_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- std::unique_ptr<uint16_t[]> m_lineram;
+ void set_pal_base(int pal_base) { m_pal_base = pal_base; }
+ void set_transparent_pen(pen_t pen) { m_tmap->set_transparent_pen(pen); }
+ void draw(screen_device &screen, bitmap_ind16& bitmap, const rectangle &cliprect, int priority);
TILEMAP_MAPPER_MEMBER(twc94_scan);
@@ -34,22 +30,33 @@ public:
DECLARE_READ16_MEMBER(vram_r);
DECLARE_READ16_MEMBER(line_r);
- void draw_roz_core(screen_device &screen, bitmap_ind16 &destbitmap, const rectangle &cliprect,
- uint32_t startx, uint32_t starty, int incxx, int incxy, int incyx, int incyy, bool wraparound);
-
protected:
virtual void device_start() override;
virtual void device_reset() override;
-
private:
+
+ void draw_roz_core(screen_device &screen, bitmap_ind16 &destbitmap, const rectangle &cliprect,
+ uint32_t startx, uint32_t starty, int incxx, int incxy, int incyx, int incyy, bool wraparound);
+
+ void reg_written(int num_reg);
+ TILE_GET_INFO_MEMBER(get_tile_info);
+
+ tilemap_t* m_tmap;
+ std::unique_ptr<uint16_t[]> m_vram;
+ uint16_t m_regs[8];
+ uint8_t m_bank[8];
+ uint16_t m_pal_base;
+
+ std::unique_ptr<uint16_t[]> m_lineram;
+
uint8_t m_gfx_region;
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type MB60553;
+DECLARE_DEVICE_TYPE(MB60553, mb60553_zooming_tilemap_device)
#define MCFG_MB60553_GFX_REGION(_region) \
@@ -57,3 +64,5 @@ extern const device_type MB60553;
#define MCFG_MB60553_GFXDECODE(_gfxtag) \
mb60553_zooming_tilemap_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_MB60533_H
diff --git a/src/mame/video/mcd212.cpp b/src/mame/video/mcd212.cpp
index a87dc288561..b4460062bd9 100644
--- a/src/mame/video/mcd212.cpp
+++ b/src/mame/video/mcd212.cpp
@@ -30,7 +30,7 @@ TODO:
// device type definition
-const device_type MACHINE_MCD212 = device_creator<mcd212_device>;
+DEFINE_DEVICE_TYPE(MACHINE_MCD212, mcd212_device, "mcd212", "MCD212 Video")
#if ENABLE_VERBOSE_LOG
static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...)
@@ -1518,8 +1518,8 @@ void mcd212_device::device_reset()
//-------------------------------------------------
mcd212_device::mcd212_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MACHINE_MCD212, "MCD212 Video", tag, owner, clock, "mcd212", __FILE__),
- device_video_interface(mconfig, *this)
+ : device_t(mconfig, MACHINE_MCD212, tag, owner, clock)
+ , device_video_interface(mconfig, *this)
{
}
diff --git a/src/mame/video/mcd212.h b/src/mame/video/mcd212.h
index e902697c6cd..05088b8f0bb 100644
--- a/src/mame/video/mcd212.h
+++ b/src/mame/video/mcd212.h
@@ -21,8 +21,10 @@ TODO:
*******************************************************************************/
-#ifndef _VIDEO_MCD212_H_
-#define _VIDEO_MCD212_H_
+#ifndef MAME_VIDEO_MCD212_H
+#define MAME_VIDEO_MCD212_H
+
+#pragma once
#define MCD212_CURCNT_COLOR 0x00000f // Cursor color
@@ -247,6 +249,6 @@ private:
};
// device type definition
-extern const device_type MACHINE_MCD212;
+DECLARE_DEVICE_TYPE(MACHINE_MCD212, mcd212_device)
-#endif // _VIDEO_MCD212_H_
+#endif // MAME_VIDEO_MCD212_H
diff --git a/src/mame/video/micro3d.cpp b/src/mame/video/micro3d.cpp
index fa15bf259f3..8a8a177e68f 100644
--- a/src/mame/video/micro3d.cpp
+++ b/src/mame/video/micro3d.cpp
@@ -11,8 +11,10 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/am29000/am29000.h"
#include "includes/micro3d.h"
+#include "audio/micro3d.h"
+
+#include "cpu/am29000/am29000.h"
/*************************************
diff --git a/src/mame/video/model2.cpp b/src/mame/video/model2.cpp
index a98f05199df..dca574e56b4 100644
--- a/src/mame/video/model2.cpp
+++ b/src/mame/video/model2.cpp
@@ -2607,7 +2607,7 @@ uint32_t model2_state::screen_update_model2(screen_device &screen, bitmap_rgb32
bitmap.fill(m_palette->pen(0), cliprect);
m_sys24_bitmap.fill(0, cliprect);
- segas24_tile *tile = machine().device<segas24_tile>("tile");
+ segas24_tile_device *tile = machine().device<segas24_tile_device>("tile");
tile->draw(screen, m_sys24_bitmap, cliprect, 7, 0, 0);
tile->draw(screen, m_sys24_bitmap, cliprect, 6, 0, 0);
tile->draw(screen, m_sys24_bitmap, cliprect, 5, 0, 0);
diff --git a/src/mame/video/moo.cpp b/src/mame/video/moo.cpp
index 5d5fcfb3d1e..9d9327a2c1b 100644
--- a/src/mame/video/moo.cpp
+++ b/src/mame/video/moo.cpp
@@ -66,11 +66,11 @@ VIDEO_START_MEMBER(moo_state,bucky)
uint32_t moo_state::screen_update_moo(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 };
+ static const int K053251_CI[4] = { k053251_device::CI1, k053251_device::CI2, k053251_device::CI3, k053251_device::CI4 };
int layers[3];
int new_colorbase, plane, dirty, alpha;
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
m_layer_colorbase[0] = 0x70;
if (m_k056832->get_layer_association())
@@ -101,11 +101,11 @@ uint32_t moo_state::screen_update_moo(screen_device &screen, bitmap_rgb32 &bitma
}
layers[0] = 1;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
layers[1] = 2;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI3);
layers[2] = 3;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI4);
konami_sortlayers3(layers, m_layerpri);
@@ -114,7 +114,7 @@ uint32_t moo_state::screen_update_moo(screen_device &screen, bitmap_rgb32 &bitma
screen.priority().fill(0, cliprect);
- if (m_layerpri[0] < m_k053251->get_priority(K053251_CI1)) /* bucky hides back layer behind background */
+ if (m_layerpri[0] < m_k053251->get_priority(k053251_device::CI1)) /* bucky hides back layer behind background */
m_k056832->tilemap_draw(screen, bitmap, cliprect, layers[0], 0, 1);
m_k056832->tilemap_draw(screen, bitmap, cliprect, layers[1], 0, 2);
diff --git a/src/mame/video/ms1_tmap.cpp b/src/mame/video/ms1_tmap.cpp
index baf05535713..babccf4fafe 100644
--- a/src/mame/video/ms1_tmap.cpp
+++ b/src/mame/video/ms1_tmap.cpp
@@ -36,10 +36,10 @@ static constexpr int TILES_PER_PAGE = TILES_PER_PAGE_X * TILES_PER_PAGE_Y;
*/
-const device_type MEGASYS1_TILEMAP = device_creator<megasys1_tilemap_device>;
+DEFINE_DEVICE_TYPE(MEGASYS1_TILEMAP, megasys1_tilemap_device, "ms1_tmap", "Mega System 1 Tilemap")
megasys1_tilemap_device::megasys1_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, MEGASYS1_TILEMAP, "Mega System 1 Tilemap", tag, owner, clock, "ms1_tmap", __FILE__),
+ : device_t(mconfig, MEGASYS1_TILEMAP, tag, owner, clock),
device_gfx_interface(mconfig, *this),
m_scrollram(*this, DEVICE_SELF),
m_8x8_scroll_factor(1),
diff --git a/src/mame/video/ms1_tmap.h b/src/mame/video/ms1_tmap.h
index f0607b9a4be..4bf19756931 100644
--- a/src/mame/video/ms1_tmap.h
+++ b/src/mame/video/ms1_tmap.h
@@ -8,11 +8,11 @@
and mahjong games from the same period.
***************************************************************************/
+#ifndef MAME_VIDEO_MS1_TMAP_H
+#define MAME_VIDEO_MS1_TMAP_H
#pragma once
-#ifndef MAME_VIDEO_MEGASYS1_TILEMAP_DEVICE
-#define MAME_VIDEO_MEGASYS1_TILEMAP_DEVICE
//**************************************************************************
// DEVICE CONFIGURATION MACROS
@@ -96,6 +96,6 @@ private:
};
// device type definition
-extern const device_type MEGASYS1_TILEMAP;
+DECLARE_DEVICE_TYPE(MEGASYS1_TILEMAP, megasys1_tilemap_device)
-#endif /* MAME_VIDEO_MEGASYS1_TILEMAP_DEVICE */
+#endif // MAME_VIDEO_MS1_TMAP_H
diff --git a/src/mame/video/namco_c116.cpp b/src/mame/video/namco_c116.cpp
index c62831ba901..4ccd853693f 100644
--- a/src/mame/video/namco_c116.cpp
+++ b/src/mame/video/namco_c116.cpp
@@ -68,14 +68,14 @@ i960 CPU, needs to write its clip and raster values byteswapped.
#include "emu.h"
#include "video/namco_c116.h"
-const device_type NAMCO_C116 = device_creator<namco_c116_device>;
+DEFINE_DEVICE_TYPE(NAMCO_C116, namco_c116_device, "namco_c116", "Namco C116 Video Controller")
//-------------------------------------------------
// namco_c116_device -- constructor
//-------------------------------------------------
namco_c116_device::namco_c116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NAMCO_C116, "Namco C116 Video Controller", tag, owner, clock, "namco_c116", __FILE__),
+ : device_t(mconfig, NAMCO_C116, tag, owner, clock),
device_gfx_interface(mconfig, *this),
device_video_interface(mconfig, *this)
{
diff --git a/src/mame/video/namco_c116.h b/src/mame/video/namco_c116.h
index 48d5c46f932..e24d61119c0 100644
--- a/src/mame/video/namco_c116.h
+++ b/src/mame/video/namco_c116.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Alex W. Jackson
+#ifndef MAME_VIDEO_NAMCO_C116_H
+#define MAME_VIDEO_NAMCO_C116_H
#pragma once
-#ifndef __C116_H__
-#define __C116_H__
//***************************************************************************
@@ -39,6 +39,6 @@ private:
uint16_t m_regs[8];
};
-extern const device_type NAMCO_C116;
+DECLARE_DEVICE_TYPE(NAMCO_C116, namco_c116_device)
-#endif
+#endif // MAME_VIDEO_NAMCO_C116_H
diff --git a/src/mame/video/namcofl.cpp b/src/mame/video/namcofl.cpp
index 8aebd020598..f23c3648f33 100644
--- a/src/mame/video/namcofl.cpp
+++ b/src/mame/video/namcofl.cpp
@@ -3,9 +3,10 @@
/* video/namcofl.cpp */
#include "emu.h"
-#include "includes/namcoic.h"
#include "includes/namcofl.h"
+#include "machine/namcoic.h"
+
/* nth_word32 is a general-purpose utility function, which allows us to
* read from 32-bit aligned memory as if it were an array of 16 bit words.
diff --git a/src/mame/video/namconb1.cpp b/src/mame/video/namconb1.cpp
index 6c52af6bb61..ae13ed4e4b5 100644
--- a/src/mame/video/namconb1.cpp
+++ b/src/mame/video/namconb1.cpp
@@ -4,7 +4,8 @@
#include "emu.h"
#include "includes/namconb1.h"
-#include "includes/namcoic.h"
+
+#include "machine/namcoic.h"
/* nth_word32 is a general-purpose utility function, which allows us to
diff --git a/src/mame/video/namcos2.cpp b/src/mame/video/namcos2.cpp
index 409c4e43dc4..55f6f07a109 100644
--- a/src/mame/video/namcos2.cpp
+++ b/src/mame/video/namcos2.cpp
@@ -3,9 +3,7 @@
/* video hardware for Namco System II */
#include "emu.h"
-
#include "includes/namcos2.h"
-#include "includes/namcoic.h"
void namcos2_state::TilemapCB(uint16_t code, int *tile, int *mask)
{
diff --git a/src/mame/video/namcos21.cpp b/src/mame/video/namcos21.cpp
index d7f5cb7ad14..5fdb1deda54 100644
--- a/src/mame/video/namcos21.cpp
+++ b/src/mame/video/namcos21.cpp
@@ -25,9 +25,11 @@ Namco System 21 Video Hardware
*/
#include "emu.h"
-#include "includes/namcoic.h"
#include "includes/namcos21.h"
+#include "machine/namcoic.h"
+
+
#define FRAMEBUFFER_SIZE_IN_BYTES (sizeof(uint16_t)*NAMCOS21_POLY_FRAME_WIDTH*NAMCOS21_POLY_FRAME_HEIGHT)
READ16_MEMBER(namcos21_state::winrun_gpu_color_r)
diff --git a/src/mame/video/neogeo.cpp b/src/mame/video/neogeo.cpp
index d71f196748f..ad0481ac655 100644
--- a/src/mame/video/neogeo.cpp
+++ b/src/mame/video/neogeo.cpp
@@ -11,6 +11,9 @@
#include "includes/neogeo.h"
#include "video/resnet.h"
+#define VERBOSE (0)
+
+
#define NUM_PENS (0x1000)
/*************************************
diff --git a/src/mame/video/neogeo_spr.cpp b/src/mame/video/neogeo_spr.cpp
index 91c3348d93c..069015f632f 100644
--- a/src/mame/video/neogeo_spr.cpp
+++ b/src/mame/video/neogeo_spr.cpp
@@ -14,13 +14,10 @@
neosprite_base_device::neosprite_base_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+ uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, m_bppshift(4)
{
}
@@ -649,10 +646,10 @@ void neosprite_base_device::set_pens(const pen_t* pens)
/* regions (alternatively I could add an additional size check in the draw routine, but that would be slower) */
/*********************************************************************************************************************************/
-const device_type NEOGEO_SPRITE_REGULAR = device_creator<neosprite_regular_device>;
+DEFINE_DEVICE_TYPE(NEOGEO_SPRITE_REGULAR, neosprite_regular_device, "neosprite_reg", "Neo-Geo Sprites (regular)")
neosprite_regular_device::neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : neosprite_base_device(mconfig, NEOGEO_SPRITE_REGULAR, "Neo-Geo Sprites (regular)", tag, owner, clock, "neosprite_reg", __FILE__)
+ : neosprite_base_device(mconfig, NEOGEO_SPRITE_REGULAR, tag, owner, clock)
{
}
@@ -697,10 +694,10 @@ inline void neosprite_regular_device::draw_pixel(int romaddr, uint32_t* dst, con
/* for additional speed */
/*********************************************************************************************************************************/
-const device_type NEOGEO_SPRITE_OPTIMZIED = device_creator<neosprite_optimized_device>;
+DEFINE_DEVICE_TYPE(NEOGEO_SPRITE_OPTIMZIED, neosprite_optimized_device, "neosprite_opt", "Neo-Geo Sprites (optimized)")
neosprite_optimized_device::neosprite_optimized_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : neosprite_base_device(mconfig, NEOGEO_SPRITE_OPTIMZIED, "Neo-Geo Sprites (optimized)", tag, owner, clock, "neosprite_opt", __FILE__)
+ : neosprite_base_device(mconfig, NEOGEO_SPRITE_OPTIMZIED, tag, owner, clock)
, m_spritegfx8(nullptr)
{
}
@@ -773,11 +770,11 @@ inline void neosprite_optimized_device::draw_pixel(int romaddr, uint32_t* dst, c
/* and uploads the zoom table. The additional videoram buffering is a guess because 'hammer' is very glitchy without it */
/*********************************************************************************************************************************/
-const device_type NEOGEO_SPRITE_MIDAS = device_creator<neosprite_midas_device>;
+DEFINE_DEVICE_TYPE(NEOGEO_SPRITE_MIDAS, neosprite_midas_device, "midassprite", "MIDAS Sprites")
neosprite_midas_device::neosprite_midas_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : neosprite_base_device(mconfig, NEOGEO_SPRITE_MIDAS, "MIDAS Sprites", tag, owner, clock, "midassprite", __FILE__)
+ : neosprite_base_device(mconfig, NEOGEO_SPRITE_MIDAS, tag, owner, clock)
{
m_bppshift = 8;
}
diff --git a/src/mame/video/neogeo_spr.h b/src/mame/video/neogeo_spr.h
index 8c040c4f903..0c4cc9ce5d6 100644
--- a/src/mame/video/neogeo_spr.h
+++ b/src/mame/video/neogeo_spr.h
@@ -1,7 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail,Ernesto Corvi,Andrew Prime,Zsolt Vasvari
// thanks-to:Fuzz
-#define VERBOSE (0)
+#ifndef MAME_VIDEO_NEOGEO_SPR_H
+#define MAME_VIDEO_NEOGEO_SPR_H
+
+#pragma once
// todo, move these back, currently the sprite code needs some of the values tho
#define NEOGEO_MASTER_CLOCK (24000000)
@@ -80,12 +83,9 @@ protected:
neosprite_base_device(
const machine_config &mconfig,
device_type type,
- const char *name,
const char *tag,
device_t *owner,
- uint32_t clock,
- const char *shortname,
- const char *source);
+ uint32_t clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -97,8 +97,6 @@ protected:
const pen_t *m_pens;
};
-//extern const device_type NEOGEO_SPRITE_BASE;
-
class neosprite_regular_device : public neosprite_base_device
{
@@ -109,7 +107,7 @@ public:
};
-extern const device_type NEOGEO_SPRITE_REGULAR;
+DECLARE_DEVICE_TYPE(NEOGEO_SPRITE_REGULAR, neosprite_regular_device)
class neosprite_optimized_device : public neosprite_base_device
@@ -126,10 +124,7 @@ private:
uint32_t optimize_helper(std::vector<uint8_t> &spritegfx, uint8_t* region_sprites, uint32_t region_sprites_size);
};
-extern const device_type NEOGEO_SPRITE_OPTIMZIED;
-
-
-
+DECLARE_DEVICE_TYPE(NEOGEO_SPRITE_OPTIMZIED, neosprite_optimized_device)
class neosprite_midas_device : public neosprite_base_device
@@ -149,4 +144,6 @@ public:
};
-extern const device_type NEOGEO_SPRITE_MIDAS;
+DECLARE_DEVICE_TYPE(NEOGEO_SPRITE_MIDAS, neosprite_midas_device)
+
+#endif // MAME_VIDEO_NEOGEO_SPR_H
diff --git a/src/mame/video/nes.cpp b/src/mame/video/nes.cpp
index 5443911540c..a4306ca4ed5 100644
--- a/src/mame/video/nes.cpp
+++ b/src/mame/video/nes.cpp
@@ -13,7 +13,7 @@
void nes_state::video_reset()
{
- m_ppu->set_vidaccess_callback(ppu2c0x_vidaccess_delegate(FUNC(nes_state::nes_ppu_vidaccess),this));
+ m_ppu->set_vidaccess_callback(ppu2c0x_device::vidaccess_delegate(FUNC(nes_state::nes_ppu_vidaccess),this));
}
void nes_state::video_start()
diff --git a/src/mame/video/newport.cpp b/src/mame/video/newport.cpp
index 21a03eef2db..8691d996dd1 100644
--- a/src/mame/video/newport.cpp
+++ b/src/mame/video/newport.cpp
@@ -80,11 +80,11 @@ static inline void ATTR_PRINTF(3,4) verboselog(running_machine &machine, int n_l
#define XMAP1_MODETBLIDX m_XMAP1.nRegister[0x07]
-const device_type NEWPORT_VIDEO = device_creator<newport_video_device>;
+DEFINE_DEVICE_TYPE(NEWPORT_VIDEO, newport_video_device, "newport_video", "SGI Newport graphics board")
newport_video_device::newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NEWPORT_VIDEO, "SGI Newport graphics board", tag, owner, clock, "newport_video", __FILE__)
+ : device_t(mconfig, NEWPORT_VIDEO, tag, owner, clock)
{
}
diff --git a/src/mame/video/newport.h b/src/mame/video/newport.h
index 4c210b2176f..46774652a0b 100644
--- a/src/mame/video/newport.h
+++ b/src/mame/video/newport.h
@@ -5,116 +5,15 @@
*/
-#ifndef __VIDHRDW_NEWPORT__
-#define __VIDHRDW_NEWPORT__
-
-struct VC2_t
-{
- uint16_t nRegister[0x21];
- uint16_t nRAM[0x8000];
- uint8_t nRegIdx;
- uint16_t nRegData;
-};
-
-
-struct XMAP_t
-{
- uint32_t nRegister[0x08];
- uint32_t nModeTable[0x20];
-};
-
-struct REX3_t
-{
- uint32_t nDrawMode1;
- uint32_t nDrawMode0;
- uint32_t nLSMode;
- uint32_t nLSPattern;
- uint32_t nLSPatSave;
- uint32_t nZPattern;
- uint32_t nColorBack;
- uint32_t nColorVRAM;
- uint32_t nAlphaRef;
- //uint32_t nStall0;
- uint32_t nSMask0X;
- uint32_t nSMask0Y;
- uint32_t nSetup;
- uint32_t nStepZ;
- uint32_t nXStart;
- uint32_t nYStart;
- uint32_t nXEnd;
- uint32_t nYEnd;
- uint32_t nXSave;
- uint32_t nXYMove;
- uint32_t nBresD;
- uint32_t nBresS1;
- uint32_t nBresOctInc1;
- uint32_t nBresRndInc2;
- uint32_t nBresE1;
- uint32_t nBresS2;
- uint32_t nAWeight0;
- uint32_t nAWeight1;
- uint32_t nXStartF;
- uint32_t nYStartF;
- uint32_t nXEndF;
- uint32_t nYEndF;
- uint32_t nXStartI;
- //uint32_t nYEndF1;
- uint32_t nXYStartI;
- uint32_t nXYEndI;
- uint32_t nXStartEndI;
- uint32_t nColorRed;
- uint32_t nColorAlpha;
- uint32_t nColorGreen;
- uint32_t nColorBlue;
- uint32_t nSlopeRed;
- uint32_t nSlopeAlpha;
- uint32_t nSlopeGreen;
- uint32_t nSlopeBlue;
- uint32_t nWriteMask;
- uint32_t nZeroFract;
- uint32_t nZeroOverflow;
- //uint32_t nColorIndex;
- uint32_t nHostDataPortMSW;
- uint32_t nHostDataPortLSW;
- uint32_t nDCBMode;
- uint32_t nDCBRegSelect;
- uint32_t nDCBSlvSelect;
- uint32_t nDCBDataMSW;
- uint32_t nDCBDataLSW;
- uint32_t nSMask1X;
- uint32_t nSMask1Y;
- uint32_t nSMask2X;
- uint32_t nSMask2Y;
- uint32_t nSMask3X;
- uint32_t nSMask3Y;
- uint32_t nSMask4X;
- uint32_t nSMask4Y;
- uint32_t nTopScanline;
- uint32_t nXYWin;
- uint32_t nClipMode;
- uint32_t nConfig;
- uint32_t nStatus;
- uint8_t nXFerWidth;
-#if 0
- uint32_t nCurrentX;
- uint32_t nCurrentY;
-#endif
- uint32_t nKludge_SkipLine;
-};
-
-
-struct CMAP_t
-{
- uint16_t nPaletteIndex;
- uint32_t nPalette[0x10000];
-};
+#ifndef MAME_VIDEO_NEWPORT_H
+#define MAME_VIDEO_NEWPORT_H
+#pragma once
class newport_video_device : public device_t
{
public:
newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~newport_video_device() {}
DECLARE_READ32_MEMBER( rex3_r );
@@ -128,6 +27,108 @@ protected:
virtual void device_reset() override;
private:
+ struct VC2_t
+ {
+ uint16_t nRegister[0x21];
+ uint16_t nRAM[0x8000];
+ uint8_t nRegIdx;
+ uint16_t nRegData;
+ };
+
+
+ struct XMAP_t
+ {
+ uint32_t nRegister[0x08];
+ uint32_t nModeTable[0x20];
+ };
+
+ struct REX3_t
+ {
+ uint32_t nDrawMode1;
+ uint32_t nDrawMode0;
+ uint32_t nLSMode;
+ uint32_t nLSPattern;
+ uint32_t nLSPatSave;
+ uint32_t nZPattern;
+ uint32_t nColorBack;
+ uint32_t nColorVRAM;
+ uint32_t nAlphaRef;
+ //uint32_t nStall0;
+ uint32_t nSMask0X;
+ uint32_t nSMask0Y;
+ uint32_t nSetup;
+ uint32_t nStepZ;
+ uint32_t nXStart;
+ uint32_t nYStart;
+ uint32_t nXEnd;
+ uint32_t nYEnd;
+ uint32_t nXSave;
+ uint32_t nXYMove;
+ uint32_t nBresD;
+ uint32_t nBresS1;
+ uint32_t nBresOctInc1;
+ uint32_t nBresRndInc2;
+ uint32_t nBresE1;
+ uint32_t nBresS2;
+ uint32_t nAWeight0;
+ uint32_t nAWeight1;
+ uint32_t nXStartF;
+ uint32_t nYStartF;
+ uint32_t nXEndF;
+ uint32_t nYEndF;
+ uint32_t nXStartI;
+ //uint32_t nYEndF1;
+ uint32_t nXYStartI;
+ uint32_t nXYEndI;
+ uint32_t nXStartEndI;
+ uint32_t nColorRed;
+ uint32_t nColorAlpha;
+ uint32_t nColorGreen;
+ uint32_t nColorBlue;
+ uint32_t nSlopeRed;
+ uint32_t nSlopeAlpha;
+ uint32_t nSlopeGreen;
+ uint32_t nSlopeBlue;
+ uint32_t nWriteMask;
+ uint32_t nZeroFract;
+ uint32_t nZeroOverflow;
+ //uint32_t nColorIndex;
+ uint32_t nHostDataPortMSW;
+ uint32_t nHostDataPortLSW;
+ uint32_t nDCBMode;
+ uint32_t nDCBRegSelect;
+ uint32_t nDCBSlvSelect;
+ uint32_t nDCBDataMSW;
+ uint32_t nDCBDataLSW;
+ uint32_t nSMask1X;
+ uint32_t nSMask1Y;
+ uint32_t nSMask2X;
+ uint32_t nSMask2Y;
+ uint32_t nSMask3X;
+ uint32_t nSMask3Y;
+ uint32_t nSMask4X;
+ uint32_t nSMask4Y;
+ uint32_t nTopScanline;
+ uint32_t nXYWin;
+ uint32_t nClipMode;
+ uint32_t nConfig;
+ uint32_t nStatus;
+ uint8_t nXFerWidth;
+#if 0
+ uint32_t nCurrentX;
+ uint32_t nCurrentY;
+#endif
+ uint32_t nKludge_SkipLine;
+ };
+
+
+ struct CMAP_t
+ {
+ uint16_t nPaletteIndex;
+ uint32_t nPalette[0x10000];
+ };
+
+
// internal state
DECLARE_READ32_MEMBER( cmap0_r );
@@ -156,7 +157,7 @@ private:
MCFG_DEVICE_ADD(_tag, NEWPORT_VIDEO, 0)
-extern const device_type NEWPORT_VIDEO;
+DECLARE_DEVICE_TYPE(NEWPORT_VIDEO, newport_video_device)
-#endif
+#endif // MAME_VIDEO_NEWPORT_H
diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp
index d8191174fdf..906d715ec6f 100644
--- a/src/mame/video/nick.cpp
+++ b/src/mame/video/nick.cpp
@@ -73,7 +73,7 @@
// DEVICE DEFINITIONS
//**************************************************************************
-const device_type NICK = device_creator<nick_device>;
+DEFINE_DEVICE_TYPE(NICK, nick_device, "nick", "NICK")
DEVICE_ADDRESS_MAP_START( vram_map, 8, nick_device )
@@ -103,7 +103,7 @@ ADDRESS_MAP_END
//-------------------------------------------------
nick_device::nick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, NICK, "NICK", tag, owner, clock, "nick", __FILE__),
+ : device_t(mconfig, NICK, tag, owner, clock),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
m_space_config("vram", ENDIANNESS_LITTLE, 8, 16, 0, *ADDRESS_MAP_NAME(nick_map)),
diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h
index 4a8ccb6357e..c769928e911 100644
--- a/src/mame/video/nick.h
+++ b/src/mame/video/nick.h
@@ -168,6 +168,6 @@ private:
// device type definition
-extern const device_type NICK;
+DECLARE_DEVICE_TYPE(NICK, nick_device)
#endif // MAME_VIDEO_NICK_H
diff --git a/src/mame/video/overdriv.cpp b/src/mame/video/overdriv.cpp
index c140ce6a37d..826d4067d37 100644
--- a/src/mame/video/overdriv.cpp
+++ b/src/mame/video/overdriv.cpp
@@ -50,11 +50,11 @@ K051316_CB_MEMBER(overdriv_state::zoom_callback_2)
uint32_t overdriv_state::screen_update_overdriv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_road_colorbase[1] = m_k053251->get_palette_index(K053251_CI1);
- m_road_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_zoom_colorbase[1] = m_k053251->get_palette_index(K053251_CI3);
- m_zoom_colorbase[0] = m_k053251->get_palette_index(K053251_CI4);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_road_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI1);
+ m_road_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_zoom_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI3);
+ m_zoom_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI4);
screen.priority().fill(0, cliprect);
diff --git a/src/mame/video/parodius.cpp b/src/mame/video/parodius.cpp
index 96826b1050a..d830ec7c562 100644
--- a/src/mame/video/parodius.cpp
+++ b/src/mame/video/parodius.cpp
@@ -48,20 +48,20 @@ uint32_t parodius_state::screen_update_parodius(screen_device &screen, bitmap_in
{
int layer[3], bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI4);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI3);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI4);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI3);
m_k052109->tilemap_update();
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI4);
layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI3);
konami_sortlayers3(layer, m_layerpri);
diff --git a/src/mame/video/pc080sn.cpp b/src/mame/video/pc080sn.cpp
index 40022810636..f277554f771 100644
--- a/src/mame/video/pc080sn.cpp
+++ b/src/mame/video/pc080sn.cpp
@@ -49,10 +49,10 @@ Control registers
#define PC080SN_RAM_SIZE 0x10000
#define TOPSPEED_ROAD_COLORS
-const device_type PC080SN = device_creator<pc080sn_device>;
+DEFINE_DEVICE_TYPE(PC080SN, pc080sn_device, "pc080sn", "Taito PC080SN")
pc080sn_device::pc080sn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC080SN, "Taito PC080SN", tag, owner, clock, "pc080sn", __FILE__),
+ : device_t(mconfig, PC080SN, tag, owner, clock),
m_ram(nullptr),
m_gfxnum(0),
m_x_offset(0),
diff --git a/src/mame/video/pc080sn.h b/src/mame/video/pc080sn.h
index 62cb583d93e..a108b45ffbb 100644
--- a/src/mame/video/pc080sn.h
+++ b/src/mame/video/pc080sn.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __PC080SN_H__
-#define __PC080SN_H__
+#ifndef MAME_VIDEO_PC080SN_H
+#define MAME_VIDEO_PC080SN_H
+
+#pragma once
class pc080sn_device : public device_t
{
public:
pc080sn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~pc080sn_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -69,7 +70,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type PC080SN;
+DECLARE_DEVICE_TYPE(PC080SN, pc080sn_device)
#define MCFG_PC080SN_GFX_REGION(_region) \
@@ -87,4 +88,4 @@ extern const device_type PC080SN;
#define MCFG_PC080SN_GFXDECODE(_gfxtag) \
pc080sn_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif
+#endif // MAME_VIDEO_PC080SN_H
diff --git a/src/mame/video/pc090oj.cpp b/src/mame/video/pc090oj.cpp
index 21c9373e7ab..59988bdd08a 100644
--- a/src/mame/video/pc090oj.cpp
+++ b/src/mame/video/pc090oj.cpp
@@ -72,10 +72,10 @@ Taito pc090oj
*****************************************************************************/
-const device_type PC090OJ = device_creator<pc090oj_device>;
+DEFINE_DEVICE_TYPE(PC090OJ, pc090oj_device, "pc090oj", "Taito PC090OJ")
pc090oj_device::pc090oj_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PC090OJ, "Taito PC090OJ", tag, owner, clock, "pc090oj", __FILE__),
+ : device_t(mconfig, PC090OJ, tag, owner, clock),
m_ctrl(0),
m_sprite_ctrl(0),
m_ram(nullptr),
diff --git a/src/mame/video/pc090oj.h b/src/mame/video/pc090oj.h
index 312dd336efb..85a1ee7e904 100644
--- a/src/mame/video/pc090oj.h
+++ b/src/mame/video/pc090oj.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __PC090OJ_H__
-#define __PC090OJ_H__
+#ifndef MAME_VIDEO_PC090OJ_H
+#define MAME_VIDEO_PC090OJ_H
+
+#pragma once
class pc090oj_device : public device_t
{
public:
pc090oj_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~pc090oj_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -58,7 +59,7 @@ private:
required_device<palette_device> m_palette;
};
-extern const device_type PC090OJ;
+DECLARE_DEVICE_TYPE(PC090OJ, pc090oj_device)
#define MCFG_PC090OJ_GFX_REGION(_region) \
@@ -76,4 +77,4 @@ extern const device_type PC090OJ;
#define MCFG_PC090OJ_PALETTE(_palette_tag) \
pc090oj_device::static_set_palette_tag(*device, "^" _palette_tag);
-#endif
+#endif // MAME_VIDEO_PC090)J_H
diff --git a/src/mame/video/pc_t1t.cpp b/src/mame/video/pc_t1t.cpp
index a4a91c8c61b..69d026a5ce8 100644
--- a/src/mame/video/pc_t1t.cpp
+++ b/src/mame/video/pc_t1t.cpp
@@ -31,11 +31,11 @@ enum
};
-const device_type PCVIDEO_T1000 = device_creator<pcvideo_t1000_device>;
-const device_type PCVIDEO_PCJR = device_creator<pcvideo_pcjr_device>;
+DEFINE_DEVICE_TYPE(PCVIDEO_T1000, pcvideo_t1000_device, "tandy_1000_graphics", "Tandy 1000 Graphics Adapter")
+DEFINE_DEVICE_TYPE(PCVIDEO_PCJR, pcvideo_pcjr_device, "pcjr_graphics", "PC Jr Graphics Adapter")
-pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock),
device_video_interface(mconfig, *this),
m_mc6845(*this, T1000_MC6845_NAME),
m_mode_control(0),
@@ -59,12 +59,12 @@ pc_t1t_device::pc_t1t_device(const machine_config &mconfig, device_type type, co
}
pcvideo_t1000_device::pcvideo_t1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pc_t1t_device(mconfig, PCVIDEO_T1000, "Tandy 1000 Graphics Adapter", tag, owner, clock, "tandy_1000_graphics_adapter", __FILE__)
+ : pc_t1t_device(mconfig, PCVIDEO_T1000, tag, owner, clock)
{
}
pcvideo_pcjr_device::pcvideo_pcjr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : pc_t1t_device(mconfig, PCVIDEO_PCJR, "PC Jr Graphics Adapter", tag, owner, clock, "pcjr_graphics_adapter", __FILE__),
+ : pc_t1t_device(mconfig, PCVIDEO_PCJR, tag, owner, clock),
m_jxkanji(nullptr)
{
}
diff --git a/src/mame/video/pc_t1t.h b/src/mame/video/pc_t1t.h
index c3c5b345046..fb622d72087 100644
--- a/src/mame/video/pc_t1t.h
+++ b/src/mame/video/pc_t1t.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef PC_T1T_H
-#define PC_T1T_H
+#ifndef MAME_VIDEO_PC_T1T_H
+#define MAME_VIDEO_PC_T1T_H
#include "video/mc6845.h"
#include "machine/ram.h"
@@ -10,34 +10,9 @@
#define T1000_SCREEN_NAME "screen"
#define T1000_MC6845_NAME "mc6845_t1000"
-// used in tandy1000hx; used in pcjr???
-struct reg
-{
- reg()
- {
- index = 0;
- memset(&data, 0, sizeof(data));
- }
-
- uint8_t index;
- uint8_t data[0x20];
- /* see vgadoc
- 0 mode control 1
- 1 palette mask
- 2 border color
- 3 mode control 2
- 4 reset
- 0x10-0x1f palette registers
- */
-};
-
-class pc_t1t_device : public device_t,
- public device_video_interface
+class pc_t1t_device : public device_t, public device_video_interface
{
public:
- // construction/destruction
- pc_t1t_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
DECLARE_PALETTE_INIT( pcjr );
DECLARE_WRITE_LINE_MEMBER( t1000_de_changed );
@@ -52,6 +27,30 @@ public:
MC6845_UPDATE_ROW( t1000_gfx_1bpp_update_row );
protected:
+ // used in tandy1000hx; used in pcjr???
+ struct reg
+ {
+ reg()
+ {
+ index = 0;
+ memset(&data, 0, sizeof(data));
+ }
+
+ uint8_t index;
+ uint8_t data[0x20];
+ /* see vgadoc
+ 0 mode control 1
+ 1 palette mask
+ 2 border color
+ 3 mode control 2
+ 4 reset
+ 0x10-0x1f palette registers
+ */
+ };
+
+ // construction/destruction
+ pc_t1t_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
required_device<mc6845_device> m_mc6845;
uint8_t m_mode_control, m_color_select;
uint8_t m_status;
@@ -111,7 +110,7 @@ private:
bool m_disable;
};
-extern const device_type PCVIDEO_T1000;
+DECLARE_DEVICE_TYPE(PCVIDEO_T1000, pcvideo_t1000_device)
#define MCFG_PCVIDEO_T1000_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, PCVIDEO_T1000, 0)
@@ -125,8 +124,6 @@ public:
DECLARE_WRITE8_MEMBER( write );
DECLARE_WRITE_LINE_MEMBER( pcjr_vsync_changed );
- uint8_t *m_jxkanji;
-
virtual MC6845_UPDATE_ROW( crtc_update_row ) override;
MC6845_UPDATE_ROW( pcjx_text_update_row );
MC6845_UPDATE_ROW( pcjr_gfx_2bpp_high_update_row );
@@ -135,6 +132,8 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
+ uint8_t *m_jxkanji;
+
private:
void pc_pcjr_mode_switch();
void pc_pcjr_vga_data_w(int data);
@@ -142,10 +141,10 @@ private:
void pc_pcjx_bank_w(int data);
};
-extern const device_type PCVIDEO_PCJR;
+DECLARE_DEVICE_TYPE(PCVIDEO_PCJR, pcvideo_pcjr_device)
#define MCFG_PCVIDEO_PCJR_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, PCVIDEO_PCJR, 0)
-#endif /* PC_T1T_H */
+#endif // MAME_VIDEO_PC_T1T_H
diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp
index 99040971f32..1b6f5ae318f 100644
--- a/src/mame/video/pcd.cpp
+++ b/src/mame/video/pcd.cpp
@@ -9,11 +9,11 @@
#include "screen.h"
-const device_type PCD_VIDEO = device_creator<pcd_video_device>;
-const device_type PCX_VIDEO = device_creator<pcx_video_device>;
+DEFINE_DEVICE_TYPE(PCD_VIDEO, pcd_video_device, "pcd_video", "Siemens PC-D Video")
+DEFINE_DEVICE_TYPE(PCX_VIDEO, pcx_video_device, "pcx_video", "Siemens PC-X Video")
-pcdx_video_device::pcdx_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
- device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+pcdx_video_device::pcdx_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, type, tag, owner, clock),
device_gfx_interface(mconfig, *this, nullptr, "palette"),
m_maincpu(*this, ":maincpu"),
m_mcu(*this, "graphics"),
@@ -23,7 +23,7 @@ pcdx_video_device::pcdx_video_device(const machine_config &mconfig, device_type
}
pcd_video_device::pcd_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- pcdx_video_device(mconfig, PCD_VIDEO, "Siemens PC-D Video", tag, owner, clock, "pcd_video", __FILE__),
+ pcdx_video_device(mconfig, PCD_VIDEO, tag, owner, clock),
m_mouse_btn(*this, "MOUSE"),
m_mouse_x(*this, "MOUSEX"),
m_mouse_y(*this, "MOUSEY"),
@@ -33,7 +33,7 @@ pcd_video_device::pcd_video_device(const machine_config &mconfig, const char *ta
}
pcx_video_device::pcx_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- pcdx_video_device(mconfig, PCX_VIDEO, "Siemens PC-X Video", tag, owner, clock, "pcx_video", __FILE__),
+ pcdx_video_device(mconfig, PCX_VIDEO, tag, owner, clock),
device_serial_interface(mconfig, *this),
m_vram(4*1024),
m_charrom(*this, "char"),
diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h
index 5617f4b2027..ad1802e0676 100644
--- a/src/mame/video/pcd.h
+++ b/src/mame/video/pcd.h
@@ -1,8 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef _PCD_H_
-#define _PCD_H_
+#ifndef MAME_VIDEO_PCD_H
+#define MAME_VIDEO_PCD_H
+
+#pragma once
#include "machine/pic8259.h"
#include "video/scn2674.h"
@@ -13,14 +15,14 @@
class pcdx_video_device : public device_t, public device_gfx_interface
{
public:
- pcdx_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
virtual DECLARE_ADDRESS_MAP(map, 16) = 0;
DECLARE_READ8_MEMBER(detect_r);
DECLARE_WRITE8_MEMBER(detect_w);
DECLARE_PALETTE_INIT(pcdx);
protected:
+ pcdx_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_mcu;
required_device<scn2674_device> m_crtc;
@@ -76,7 +78,7 @@ class pcx_video_device : public pcdx_video_device,
{
public:
pcx_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_txd_handler(device_t &device, _Object object) { return downcast<pcx_video_device &>(device).m_txd_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_txd_handler(device_t &device, Object &&cb) { return downcast<pcx_video_device &>(device).m_txd_handler.set_callback(std::forward<Object>(cb)); }
virtual DECLARE_ADDRESS_MAP(map, 16) override;
DECLARE_READ8_MEMBER(term_r);
@@ -108,7 +110,7 @@ private:
uint8_t m_term_key, m_term_char, m_term_stat, m_vram_latch_r[2], m_vram_latch_w[2], m_p1;
};
-extern const device_type PCD_VIDEO;
-extern const device_type PCX_VIDEO;
+DECLARE_DEVICE_TYPE(PCD_VIDEO, pcd_video_device)
+DECLARE_DEVICE_TYPE(PCX_VIDEO, pcx_video_device)
-#endif
+#endif // MAME_VIDEO_PCD_H
diff --git a/src/mame/video/pecom.cpp b/src/mame/video/pecom.cpp
index cb79b8ea4cd..434dca9c60a 100644
--- a/src/mame/video/pecom.cpp
+++ b/src/mame/video/pecom.cpp
@@ -91,14 +91,14 @@ VIDEO_START_MEMBER(pecom_state,pecom)
}
MACHINE_CONFIG_FRAGMENT( pecom_video )
- MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, CDP1869_DOT_CLK_PAL)
+ MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL)
MCFG_VIDEO_START_OVERRIDE(pecom_state,pecom)
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1869_ADD(CDP1869_TAG, CDP1869_DOT_CLK_PAL, cdp1869_page_ram)
- MCFG_CDP1869_COLOR_CLOCK(CDP1869_COLOR_CLK_PAL)
+ MCFG_CDP1869_ADD(CDP1869_TAG, cdp1869_device::DOT_CLK_PAL, cdp1869_page_ram)
+ MCFG_CDP1869_COLOR_CLOCK(cdp1869_device::COLOR_CLK_PAL)
MCFG_CDP1869_CHAR_PCB_READ_OWNER(pecom_state, pecom_pcb_r)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(pecom_state, pecom_char_ram_r)
MCFG_CDP1869_CHAR_RAM_WRITE_OWNER(pecom_state, pecom_char_ram_w)
diff --git a/src/mame/video/powervr2.cpp b/src/mame/video/powervr2.cpp
index e49bc6f845c..10e3abd67d3 100644
--- a/src/mame/video/powervr2.cpp
+++ b/src/mame/video/powervr2.cpp
@@ -7,11 +7,13 @@
#include "emu.h"
#include "powervr2.h"
#include "includes/dc.h"
+
#include "cpu/sh4/sh4.h"
-#include "rendutil.h"
#include "video/rgbutil.h"
+#include "rendutil.h"
+
-const device_type POWERVR2 = device_creator<powervr2_device>;
+DEFINE_DEVICE_TYPE(POWERVR2, powervr2_device, "powervr2", "PowerVR 2")
DEVICE_ADDRESS_MAP_START(ta_map, 32, powervr2_device)
AM_RANGE(0x0000, 0x0003) AM_READ( id_r)
@@ -3607,7 +3609,7 @@ void powervr2_device::pvr_dma_execute(address_space &space)
}
powervr2_device::powervr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, POWERVR2, "PowerVR 2", tag, owner, clock, "powervr2", __FILE__),
+ : device_t(mconfig, POWERVR2, tag, owner, clock),
device_video_interface(mconfig, *this),
irq_cb(*this),
m_mamedebug(*this, ":MAMEDEBUG")
diff --git a/src/mame/video/powervr2.h b/src/mame/video/powervr2.h
index 7ef55f553c3..afdf4b23458 100644
--- a/src/mame/video/powervr2.h
+++ b/src/mame/video/powervr2.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef __POWERVR2_H__
-#define __POWERVR2_H__
+#ifndef MAME_VIDEO_POWERVR2_H
+#define MAME_VIDEO_POWERVR2_H
+
+#pragma once
#define MCFG_POWERVR2_ADD(_tag, _irq_cb) \
MCFG_DEVICE_ADD(_tag, POWERVR2, 0) \
@@ -483,6 +485,6 @@ private:
};
-extern const device_type POWERVR2;
+DECLARE_DEVICE_TYPE(POWERVR2, powervr2_device)
-#endif
+#endif // MAME_VIDEO_POWERVR2_H
diff --git a/src/mame/video/sega16sp.cpp b/src/mame/video/sega16sp.cpp
index 7f17e58d3d6..e5609298baf 100644
--- a/src/mame/video/sega16sp.cpp
+++ b/src/mame/video/sega16sp.cpp
@@ -17,14 +17,14 @@
//****************************************************************************
// device type definition
-const device_type SEGA_HANGON_SPRITES = device_creator<sega_hangon_sprite_device>;
-const device_type SEGA_SHARRIER_SPRITES = device_creator<sega_sharrier_sprite_device>;
-const device_type SEGA_OUTRUN_SPRITES = device_creator<sega_outrun_sprite_device>;
-const device_type SEGA_SYS16A_SPRITES = device_creator<sega_sys16a_sprite_device>;
-const device_type BOOTLEG_SYS16A_SPRITES = device_creator<bootleg_sys16a_sprite_device>;
-const device_type SEGA_SYS16B_SPRITES = device_creator<sega_sys16b_sprite_device>;
-const device_type SEGA_XBOARD_SPRITES = device_creator<sega_xboard_sprite_device>;
-const device_type SEGA_YBOARD_SPRITES = device_creator<sega_yboard_sprite_device>;
+DEFINE_DEVICE_TYPE(SEGA_HANGON_SPRITES, sega_hangon_sprite_device, "sega_hangon_sprite", "Sega Custom Sprites (Hang On)")
+DEFINE_DEVICE_TYPE(SEGA_SHARRIER_SPRITES, sega_sharrier_sprite_device, "sega_sharrier_sprite", "Sega Custom Sprites (Space Harrier)")
+DEFINE_DEVICE_TYPE(SEGA_OUTRUN_SPRITES, sega_outrun_sprite_device, "sega_outrun_sprite", "Sega Custom Sprites (Out Run)")
+DEFINE_DEVICE_TYPE(SEGA_SYS16A_SPRITES, sega_sys16a_sprite_device, "sega_sys16a_sprite", "Sega System 16A Sprites")
+DEFINE_DEVICE_TYPE(BOOTLEG_SYS16A_SPRITES, bootleg_sys16a_sprite_device, "bootleg_sys16a_sprite", "Sega System 16A Sprites (bootleg)")
+DEFINE_DEVICE_TYPE(SEGA_SYS16B_SPRITES, sega_sys16b_sprite_device, "sega_sys16b_sprite", "Sega System 16B Sprites")
+DEFINE_DEVICE_TYPE(SEGA_XBOARD_SPRITES, sega_xboard_sprite_device, "sega_xboard_sprite", "Sega X-Board Sprites")
+DEFINE_DEVICE_TYPE(SEGA_YBOARD_SPRITES, sega_yboard_sprite_device, "sega_yboard_sprite", "Sega Y-Board Sprites")
@@ -36,9 +36,9 @@ const device_type SEGA_YBOARD_SPRITES = device_creator<sega_yboard_sprite_device
// sega_16bit_sprite_device -- core constructor
//-------------------------------------------------
-sega_16bit_sprite_device::sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, const char *shortname, const char *source)
- : sprite16_device_ind16(mconfig, type, name, tag, owner, shortname, source),
- m_flip(false)
+sega_16bit_sprite_device::sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner)
+ : sprite16_device_ind16(mconfig, type, tag, owner)
+ , m_flip(false)
{
// default to 1:1 bank mapping
for (int bank = 0; bank < ARRAY_LENGTH(m_bank); bank++)
@@ -95,7 +95,7 @@ WRITE16_MEMBER( sega_16bit_sprite_device::draw_write )
//-------------------------------------------------
sega_hangon_sprite_device::sega_hangon_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, SEGA_HANGON_SPRITES, "Sega Custom Sprites (Hang On)", tag, owner, "sega_hangon_sprite", __FILE__)
+ : sega_16bit_sprite_device(mconfig, SEGA_HANGON_SPRITES, tag, owner)
, m_sprite_region_ptr(*this, DEVICE_SELF)
{
set_local_origin(189, -1);
@@ -272,7 +272,7 @@ void sega_hangon_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
//-------------------------------------------------
sega_sharrier_sprite_device::sega_sharrier_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, SEGA_SHARRIER_SPRITES, "Sega Custom Sprites (Space Harrier)", tag, owner, "sega_sharrier_sprite", __FILE__)
+ : sega_16bit_sprite_device(mconfig, SEGA_SHARRIER_SPRITES, tag, owner)
, m_sprite_region_ptr(*this, DEVICE_SELF)
{
set_local_origin(189, -1);
@@ -460,7 +460,7 @@ void sega_sharrier_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &cl
//-------------------------------------------------
sega_sys16a_sprite_device::sega_sys16a_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, SEGA_SYS16A_SPRITES, "Sega System 16A Sprites", tag, owner, "sega_sys16a_sprite", __FILE__)
+ : sega_16bit_sprite_device(mconfig, SEGA_SYS16A_SPRITES, tag, owner)
, m_sprite_region_ptr(*this, DEVICE_SELF)
{
set_local_origin(189, -1, -189, -1);
@@ -640,7 +640,7 @@ void sega_sys16a_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
//-------------------------------------------------
bootleg_sys16a_sprite_device::bootleg_sys16a_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, BOOTLEG_SYS16A_SPRITES, "Sega System 16A Sprites (Bootleg)", tag, owner, "bootleg_sys16a_sprite", __FILE__)
+ : sega_16bit_sprite_device(mconfig, BOOTLEG_SYS16A_SPRITES, tag, owner)
, m_sprite_region_ptr(*this, DEVICE_SELF)
{
m_addrmap[0] = 0;
@@ -829,7 +829,7 @@ void bootleg_sys16a_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &c
//-------------------------------------------------
sega_sys16b_sprite_device::sega_sys16b_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, "Sega System 16B Sprites", tag, owner, "sega_16bit_sprite", __FILE__)
+ : sega_16bit_sprite_device(mconfig, SEGA_SYS16B_SPRITES, tag, owner)
, m_sprite_region_ptr(*this, DEVICE_SELF)
{
set_local_origin(184, 0x00, -184, 0);
@@ -1025,19 +1025,16 @@ void sega_sys16b_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
//-------------------------------------------------
sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, SEGA_OUTRUN_SPRITES, "Sega Custom Sprites (Out Run)", tag, owner, "sega_outrun_sprite", __FILE__),
- m_is_xboard(false),
- m_sprite_region_ptr(*this, DEVICE_SELF)
+ : sega_outrun_sprite_device(mconfig, SEGA_OUTRUN_SPRITES, tag, owner, clock, false)
{
- set_local_origin(189, 0x00);
}
-sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, bool xboard_variant, const char *shortname, const char *source)
- : sega_16bit_sprite_device(mconfig, SEGA_XBOARD_SPRITES, "Sega X-Board Sprites", tag, owner, shortname, source),
- m_is_xboard(true),
- m_sprite_region_ptr(*this, DEVICE_SELF)
+sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool xboard_variant)
+ : sega_16bit_sprite_device(mconfig, type, tag, owner)
+ , m_is_xboard(xboard_variant)
+ , m_sprite_region_ptr(*this, DEVICE_SELF)
{
- set_local_origin(190, 0x00);
+ set_local_origin(xboard_variant ? 190 : 189, 0x00);
}
@@ -1046,7 +1043,7 @@ sega_outrun_sprite_device::sega_outrun_sprite_device(const machine_config &mconf
//-------------------------------------------------
sega_xboard_sprite_device::sega_xboard_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_outrun_sprite_device(mconfig, tag, owner, clock, true, "sega_xboard_sprite", __FILE__)
+ : sega_outrun_sprite_device(mconfig, SEGA_XBOARD_SPRITES, tag, owner, clock, true)
{
}
@@ -1240,7 +1237,7 @@ void sega_outrun_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &clip
//-------------------------------------------------
sega_yboard_sprite_device::sega_yboard_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : sega_16bit_sprite_device(mconfig, SEGA_YBOARD_SPRITES, "Sega Y-Board Sprites", tag, owner, "sega_yboard_sprite", __FILE__)
+ : sega_16bit_sprite_device(mconfig, SEGA_YBOARD_SPRITES, tag, owner)
, m_sprite_region_ptr(*this, DEVICE_SELF)
{
set_local_origin(0x600, 0x600);
diff --git a/src/mame/video/sega16sp.h b/src/mame/video/sega16sp.h
index c8bab38d152..87d3e4e7483 100644
--- a/src/mame/video/sega16sp.h
+++ b/src/mame/video/sega16sp.h
@@ -5,14 +5,14 @@
Sega 16-bit sprite hardware
***************************************************************************/
+#ifndef MAME_VIDEO_SEGA16SP_H
+#define MAME_VIDEO_SEGA16SP_H
#pragma once
#include "video/sprite.h"
#include "segaic16.h"
-#ifndef __SEGA16SP_H__
-#define __SEGA16SP_H__
//**************************************************************************
@@ -66,7 +66,7 @@ class sega_16bit_sprite_device : public sprite16_device_ind16
{
protected:
// construction/destruction
- sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, const char *shortname, const char *source);
+ sega_16bit_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner);
public:
// live configuration
@@ -161,7 +161,7 @@ public:
// construction/destruction
sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
- sega_outrun_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, bool xboard_variant, const char *shortname, const char *source);
+ sega_outrun_sprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool xboard_variant);
protected:
// subclass overrides
@@ -242,6 +242,8 @@ protected:
class sega_yboard_sprite_device : public sega_16bit_sprite_device
{
public:
+ typedef segaic16_video_device::rotate_info rotate_info;
+
// construction/destruction
sega_yboard_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_rotate_ptr(rotate_info* segaic16_rotate) { m_segaic16_rotate = segaic16_rotate; }
@@ -256,14 +258,14 @@ protected:
// device type definition
-extern const device_type SEGA_HANGON_SPRITES;
-extern const device_type SEGA_SHARRIER_SPRITES;
-extern const device_type SEGA_OUTRUN_SPRITES;
-extern const device_type SEGA_SYS16A_SPRITES;
-extern const device_type BOOTLEG_SYS16A_SPRITES;
-extern const device_type SEGA_SYS16B_SPRITES;
-extern const device_type SEGA_XBOARD_SPRITES;
-extern const device_type SEGA_YBOARD_SPRITES;
+DECLARE_DEVICE_TYPE(SEGA_HANGON_SPRITES, sega_hangon_sprite_device)
+DECLARE_DEVICE_TYPE(SEGA_SHARRIER_SPRITES, sega_sharrier_sprite_device)
+DECLARE_DEVICE_TYPE(SEGA_OUTRUN_SPRITES, sega_outrun_sprite_device)
+DECLARE_DEVICE_TYPE(SEGA_SYS16A_SPRITES, sega_sys16a_sprite_device)
+DECLARE_DEVICE_TYPE(BOOTLEG_SYS16A_SPRITES, bootleg_sys16a_sprite_device)
+DECLARE_DEVICE_TYPE(SEGA_SYS16B_SPRITES, sega_sys16b_sprite_device)
+DECLARE_DEVICE_TYPE(SEGA_XBOARD_SPRITES, sega_xboard_sprite_device)
+DECLARE_DEVICE_TYPE(SEGA_YBOARD_SPRITES, sega_yboard_sprite_device)
-#endif
+#endif // MAME_VIDEO_SEGA16SP_H
diff --git a/src/mame/video/segag80v.cpp b/src/mame/video/segag80v.cpp
index b643b120397..d3731bb37e5 100644
--- a/src/mame/video/segag80v.cpp
+++ b/src/mame/video/segag80v.cpp
@@ -235,7 +235,7 @@ void segag80v_state::sega_generate_vector_list()
total_time -= 4.0 / (double)U51_CLOCK;
/* Compute color/intensity values from the attributes */
- color = VECTOR_COLOR222((attrib >> 1) & 0x3f);
+ color = vector_device::color222((attrib >> 1) & 0x3f);
if ((attrib & 1) && color)
intensity = 0xff;
else
diff --git a/src/mame/video/segahang.cpp b/src/mame/video/segahang.cpp
index 0aa4a5efa50..b875aa47fd5 100644
--- a/src/mame/video/segahang.cpp
+++ b/src/mame/video/segahang.cpp
@@ -18,10 +18,10 @@
void segahang_state::video_start()
{
// initialize the tile/text layers
- m_segaic16vid->tilemap_init( 0, SEGAIC16_TILEMAP_HANGON, 0x000, 0, 2);
+ m_segaic16vid->tilemap_init( 0, segaic16_video_device::TILEMAP_HANGON, 0x000, 0, 2);
// initialize the road
- m_segaic16road->segaic16_road_init(machine(), 0, m_sharrier_video ? SEGAIC16_ROAD_SHARRIER : SEGAIC16_ROAD_HANGON, 0x038, 0x7c0, 0x7c0, 0);
+ m_segaic16road->segaic16_road_init(machine(), 0, m_sharrier_video ? segaic16_road_device::ROAD_SHARRIER : segaic16_road_device::ROAD_HANGON, 0x038, 0x7c0, 0x7c0, 0);
}
@@ -45,24 +45,24 @@ uint32_t segahang_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
screen.priority().fill(0, cliprect);
// draw the low priority road layer
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_BACKGROUND);
// draw background
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
// draw foreground
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
// draw the high priority road
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_FOREGROUND);
// text layer
// note that we inflate the priority of the text layer to prevent sprites
// from drawing over the high scores
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x08);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x08);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
// mix in sprites
bitmap_ind16 &sprites = m_sprites->bitmap();
diff --git a/src/mame/video/segaic16.cpp b/src/mame/video/segaic16.cpp
index d3b7a6767d6..061ce37988a 100644
--- a/src/mame/video/segaic16.cpp
+++ b/src/mame/video/segaic16.cpp
@@ -373,11 +373,11 @@ Quick review of the system16 hardware:
-const device_type SEGAIC16VID = device_creator<segaic16_video_device>;
+DEFINE_DEVICE_TYPE(SEGAIC16VID, segaic16_video_device, "segaic16_video", "Sega 16-bit Video")
segaic16_video_device::segaic16_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGAIC16VID, "Sega 16-bit Video", tag, owner, clock, "segaic16_video", __FILE__),
- device_video_interface(mconfig, *this)
+ : device_t(mconfig, SEGAIC16VID, tag, owner, clock)
+ , device_video_interface(mconfig, *this)
, m_display_enable(0)
, m_tileram(*this, "^tileram")
, m_textram(*this, "^textram")
@@ -447,7 +447,7 @@ void segaic16_video_device::set_display_enable(int enable)
*
*************************************/
-void draw_virtual_tilemap(screen_device &screen, struct tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t pages, uint16_t xscroll, uint16_t yscroll, uint32_t flags, uint32_t priority)
+void draw_virtual_tilemap(screen_device &screen, segaic16_video_device::tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t pages, uint16_t xscroll, uint16_t yscroll, uint32_t flags, uint32_t priority)
{
int leftmin = -1, leftmax = -1, rightmin = -1, rightmax = -1;
int topmin = -1, topmax = -1, bottommin = -1, bottommax = -1;
@@ -688,7 +688,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16a_text_info )
}
-void tilemap_16a_draw_layer(screen_device &screen, struct tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flags, int priority)
+static void tilemap_16a_draw_layer(screen_device &screen, segaic16_video_device::tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flags, int priority)
{
uint16_t *textram = info->textram;
@@ -930,7 +930,7 @@ TILE_GET_INFO_MEMBER( segaic16_video_device::tilemap_16b_alt_text_info )
}
-void tilemap_16b_draw_layer(screen_device &screen, struct tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flags, int priority)
+static void tilemap_16b_draw_layer(screen_device &screen, segaic16_video_device::tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flags, int priority)
{
uint16_t *textram = info->textram;
uint16_t xscroll, yscroll, pages;
@@ -1051,7 +1051,7 @@ TIMER_CALLBACK_MEMBER( segaic16_video_device::tilemap_16b_latch_values )
}
-void tilemap_16b_reset(screen_device &screen, struct tilemap_info *info)
+static void tilemap_16b_reset(screen_device &screen, segaic16_video_device::tilemap_info *info)
{
/* set a timer to latch values on scanline 261 */
info->latch_timer->adjust(screen.time_until_pos(261), info->index);
@@ -1097,7 +1097,7 @@ void segaic16_video_device::tilemap_init(int which, int type, int colorbase, int
/* determine the parameters of the tilemaps */
switch (type)
{
- case SEGAIC16_TILEMAP_HANGON:
+ case TILEMAP_HANGON:
get_text_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16a_text_info),this);
get_tile_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16a_tile_info),this);
info->numpages = 4;
@@ -1106,7 +1106,7 @@ void segaic16_video_device::tilemap_init(int which, int type, int colorbase, int
info->latch_timer = nullptr;
break;
- case SEGAIC16_TILEMAP_16A:
+ case TILEMAP_16A:
get_text_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16a_text_info),this);
get_tile_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16a_tile_info),this);
info->numpages = 8;
@@ -1115,7 +1115,7 @@ void segaic16_video_device::tilemap_init(int which, int type, int colorbase, int
info->latch_timer = nullptr;
break;
- case SEGAIC16_TILEMAP_16B:
+ case TILEMAP_16B:
get_text_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16b_text_info),this);
get_tile_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16b_tile_info),this);
info->numpages = 16;
@@ -1124,7 +1124,7 @@ void segaic16_video_device::tilemap_init(int which, int type, int colorbase, int
info->latch_timer = machine().scheduler().timer_alloc( timer_expired_delegate(FUNC(segaic16_video_device::tilemap_16b_latch_values),this) );
break;
- case SEGAIC16_TILEMAP_16B_ALT:
+ case TILEMAP_16B_ALT:
get_text_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16b_alt_text_info),this);
get_tile_info = tilemap_get_info_delegate(FUNC(segaic16_video_device::tilemap_16b_alt_tile_info),this);
info->numpages = 16;
@@ -1189,7 +1189,7 @@ void segaic16_video_device::tilemap_draw(screen_device &screen, bitmap_ind16 &bi
struct tilemap_info *info = &m_bg_tilemap[which];
/* text layer is a special common case */
- if (map == SEGAIC16_TILEMAP_TEXT)
+ if (map == TILEMAP_TEXT)
info->textmap->draw(screen, bitmap, cliprect, priority, priority_mark);
/* other layers are handled differently per-system */
@@ -1370,7 +1370,7 @@ void segaic16_video_device::rotate_init(int which, int type, int colorbase)
/* determine the parameters of the rotate */
switch (type)
{
- case SEGAIC16_ROTATE_YBOARD:
+ case ROTATE_YBOARD:
info->ramsize = 0x800;
break;
diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h
index 873f5107d24..15554d3f3b5 100644
--- a/src/mame/video/segaic16.h
+++ b/src/mame/video/segaic16.h
@@ -5,10 +5,10 @@
Sega 16-bit common hardware
***************************************************************************/
+#ifndef MAME_VIDEO_SEGAIC16_H
+#define MAME_VIDEO_SEGAIC16_H
#pragma once
-#ifndef __SEGAIC16VID_H__
-#define __SEGAIC16VID_H__
typedef device_delegate<void (int, uint16_t*, uint16_t*, uint16_t*, uint16_t*)> segaic16_video_pagelatch_delegate;
@@ -16,27 +16,6 @@ typedef device_delegate<void (int, uint16_t*, uint16_t*, uint16_t*, uint16_t*)>
segaic16_video_device::set_pagelatch_cb(*device, segaic16_video_pagelatch_delegate(&_class::_method, #_class "::" #_method, nullptr, (_class *)nullptr));
-/* tilemap systems */
-#define SEGAIC16_MAX_TILEMAPS 1
-
-#define SEGAIC16_TILEMAP_HANGON 0
-#define SEGAIC16_TILEMAP_16A 1
-#define SEGAIC16_TILEMAP_16B 2
-#define SEGAIC16_TILEMAP_16B_ALT 3
-
-#define SEGAIC16_TILEMAP_FOREGROUND 0
-#define SEGAIC16_TILEMAP_BACKGROUND 1
-#define SEGAIC16_TILEMAP_TEXT 2
-
-
-
-/* rotation systems */
-#define SEGAIC16_MAX_ROTATE 1
-
-#define SEGAIC16_ROTATE_YBOARD 0
-
-
-
/*************************************
*
* Type definitions
@@ -45,50 +24,6 @@ typedef device_delegate<void (int, uint16_t*, uint16_t*, uint16_t*, uint16_t*)>
-struct tilemap_callback_info
-{
- uint16_t * rambase; /* base of RAM for this tilemap page */
- const uint8_t * bank; /* pointer to bank array */
- uint16_t banksize; /* size of banks */
-};
-
-
-struct tilemap_info
-{
- uint8_t index; /* index of this structure */
- uint8_t type; /* type of tilemap (see segaic16.h for details) */
- uint8_t numpages; /* number of allocated pages */
- uint8_t flip; /* screen flip? */
- uint8_t rowscroll, colscroll; /* are rowscroll/colscroll enabled (if external enables are used) */
- uint8_t bank[8]; /* indexes of the tile banks */
- uint16_t banksize; /* number of tiles per bank */
- uint16_t latched_xscroll[4]; /* latched X scroll values */
- uint16_t latched_yscroll[4]; /* latched Y scroll values */
- uint16_t latched_pageselect[4]; /* latched page select values */
- int32_t xoffs; /* X scroll offset */
- tilemap_t * tilemaps[16]; /* up to 16 tilemap pages */
- tilemap_t * textmap; /* a single text tilemap */
- struct tilemap_callback_info tmap_info[16]; /* callback info for 16 tilemap pages */
- struct tilemap_callback_info textmap_info; /* callback info for a single textmap page */
- void (*reset)(screen_device &screen, struct tilemap_info *info);/* reset callback */
- void (*draw_layer)(screen_device &screen, struct tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flags, int priority);
- uint16_t * textram; /* pointer to textram pointer */
- uint16_t * tileram; /* pointer to tileram pointer */
- emu_timer * latch_timer; /* timer for latching 16b tilemap scroll values */
-};
-
-
-struct rotate_info
-{
- uint8_t index; /* index of this structure */
- uint8_t type; /* type of rotate system (see segaic16.h for details) */
- uint16_t colorbase; /* base color index */
- int32_t ramsize; /* size of rotate RAM */
- uint16_t * rotateram; /* pointer to rotateram pointer */
- std::unique_ptr<uint16_t[]> buffer; /* buffered data */
-};
-
-
/***************************************************************************
FUNCTION PROTOTYPES
***************************************************************************/
@@ -99,8 +34,72 @@ class segaic16_video_device : public device_t,
public device_video_interface
{
public:
+ /* tilemap systems */
+ static constexpr unsigned MAX_TILEMAPS = 1;
+
+ static constexpr unsigned TILEMAP_HANGON = 0;
+ static constexpr unsigned TILEMAP_16A = 1;
+ static constexpr unsigned TILEMAP_16B = 2;
+ static constexpr unsigned TILEMAP_16B_ALT = 3;
+
+ static constexpr unsigned TILEMAP_FOREGROUND = 0;
+ static constexpr unsigned TILEMAP_BACKGROUND = 1;
+ static constexpr unsigned TILEMAP_TEXT = 2;
+
+
+
+ /* rotation systems */
+ static constexpr unsigned MAX_ROTATE = 1;
+
+ static constexpr unsigned ROTATE_YBOARD = 0;
+
+
+
+ struct tilemap_callback_info
+ {
+ uint16_t * rambase; /* base of RAM for this tilemap page */
+ const uint8_t * bank; /* pointer to bank array */
+ uint16_t banksize; /* size of banks */
+ };
+
+
+ struct tilemap_info
+ {
+ uint8_t index; /* index of this structure */
+ uint8_t type; /* type of tilemap (see segaic16.h for details) */
+ uint8_t numpages; /* number of allocated pages */
+ uint8_t flip; /* screen flip? */
+ uint8_t rowscroll, colscroll; /* are rowscroll/colscroll enabled (if external enables are used) */
+ uint8_t bank[8]; /* indexes of the tile banks */
+ uint16_t banksize; /* number of tiles per bank */
+ uint16_t latched_xscroll[4]; /* latched X scroll values */
+ uint16_t latched_yscroll[4]; /* latched Y scroll values */
+ uint16_t latched_pageselect[4]; /* latched page select values */
+ int32_t xoffs; /* X scroll offset */
+ tilemap_t * tilemaps[16]; /* up to 16 tilemap pages */
+ tilemap_t * textmap; /* a single text tilemap */
+ struct tilemap_callback_info tmap_info[16]; /* callback info for 16 tilemap pages */
+ struct tilemap_callback_info textmap_info; /* callback info for a single textmap page */
+ void (*reset)(screen_device &screen, struct tilemap_info *info);/* reset callback */
+ void (*draw_layer)(screen_device &screen, struct tilemap_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int which, int flags, int priority);
+ uint16_t * textram; /* pointer to textram pointer */
+ uint16_t * tileram; /* pointer to tileram pointer */
+ emu_timer * latch_timer; /* timer for latching 16b tilemap scroll values */
+ };
+
+
+ struct rotate_info
+ {
+ uint8_t index; /* index of this structure */
+ uint8_t type; /* type of rotate system (see segaic16.h for details) */
+ uint16_t colorbase; /* base color index */
+ int32_t ramsize; /* size of rotate RAM */
+ uint16_t * rotateram; /* pointer to rotateram pointer */
+ std::unique_ptr<uint16_t[]> buffer; /* buffered data */
+ };
+
+
segaic16_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~segaic16_video_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -126,8 +125,8 @@ public:
void tilemap_16b_fill_latch(int i, uint16_t* latched_pageselect, uint16_t* latched_yscroll, uint16_t* latched_xscroll, uint16_t* textram);
TIMER_CALLBACK_MEMBER( tilemap_16b_latch_values );
- struct rotate_info m_rotate[SEGAIC16_MAX_ROTATE];
- struct tilemap_info m_bg_tilemap[SEGAIC16_MAX_TILEMAPS];
+ struct rotate_info m_rotate[MAX_ROTATE];
+ struct tilemap_info m_bg_tilemap[MAX_TILEMAPS];
void set_display_enable(int enable);
void tilemap_init(int which, int type, int colorbase, int xoffs, int numbanks);
@@ -160,7 +159,7 @@ private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type SEGAIC16VID;
+DECLARE_DEVICE_TYPE(SEGAIC16VID, segaic16_video_device)
#define MCFG_SEGAIC16VID_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, SEGAIC16VID, 0)
@@ -168,4 +167,4 @@ extern const device_type SEGAIC16VID;
#define MCFG_SEGAIC16VID_GFXDECODE(_gfxtag) \
segaic16_video_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif
+#endif // MAME_VIDEO_SEGAIC16_H
diff --git a/src/mame/video/segaic16_road.cpp b/src/mame/video/segaic16_road.cpp
index d20ceb9aba4..107ad71ef4d 100644
--- a/src/mame/video/segaic16_road.cpp
+++ b/src/mame/video/segaic16_road.cpp
@@ -6,10 +6,10 @@
#include "segaic16_road.h"
#include "video/resnet.h"
-const device_type SEGAIC16_ROAD = device_creator<segaic16_road_device>;
+DEFINE_DEVICE_TYPE(SEGAIC16_ROAD, segaic16_road_device, "segaic16_road", "Sega 16-bit Road Generator")
segaic16_road_device::segaic16_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEGAIC16_ROAD, "Sega 16-bit Road Generator", tag, owner, clock, "segaic16_road", __FILE__)
+ : device_t(mconfig, SEGAIC16_ROAD, tag, owner, clock)
{
}
@@ -69,7 +69,7 @@ void segaic16_road_device::device_reset()
-void segaic16_road_device::segaic16_road_hangon_decode(running_machine &machine, struct road_info *info)
+void segaic16_road_device::segaic16_road_hangon_decode(running_machine &machine, road_info *info)
{
int x, y;
const uint8_t *gfx = memregion("^gfx3")->base();
@@ -91,7 +91,7 @@ void segaic16_road_device::segaic16_road_hangon_decode(running_machine &machine,
}
-static void segaic16_road_hangon_draw(struct road_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
+static void segaic16_road_hangon_draw(segaic16_road_device::road_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
{
uint16_t *roadram = info->roadram;
int x, y;
@@ -111,8 +111,8 @@ static void segaic16_road_hangon_draw(struct road_info *info, bitmap_ind16 &bitm
plycont = (control >> 10) & 3;
/* skip layers we aren't supposed to be drawing */
- if ((plycont == 0 && priority != SEGAIC16_ROAD_BACKGROUND) ||
- (plycont != 0 && priority != SEGAIC16_ROAD_FOREGROUND))
+ if ((plycont == 0 && priority != segaic16_road_device::ROAD_BACKGROUND) ||
+ (plycont != 0 && priority != segaic16_road_device::ROAD_FOREGROUND))
continue;
/* compute the offset of the road graphics for this line */
@@ -153,7 +153,7 @@ static void segaic16_road_hangon_draw(struct road_info *info, bitmap_ind16 &bitm
/* for the Hang On/Super Hang On case only: if the control word bit 9 is clear, we will forcibly */
/* set the flip-flip at 9J (upper half) */
- if (info->type == SEGAIC16_ROAD_HANGON && !(control & 0x200))
+ if (info->type == segaic16_road_device::ROAD_HANGON && !(control & 0x200))
ff9j2 = 1;
/* ---- now process the pixel ---- */
@@ -161,7 +161,7 @@ static void segaic16_road_hangon_draw(struct road_info *info, bitmap_ind16 &bitm
/* the Space Harrier/Enduro Racer hardware has a tweak that maps the control word bit 9 to the */
/* /CE line on the road ROM; use this to effectively disable the road data */
- if (info->type != SEGAIC16_ROAD_SHARRIER || !(control & 0x200))
+ if (info->type != segaic16_road_device::ROAD_SHARRIER || !(control & 0x200))
/* the /OE line on the road ROM is linked to the AND of bits 2 & 3 of the counter at 9N */
if ((ctr9n9p & 0xc0) == 0xc0)
@@ -330,7 +330,7 @@ static void segaic16_road_hangon_draw(struct road_info *info, bitmap_ind16 &bitm
*
*******************************************************************************************/
-void segaic16_road_device::segaic16_road_outrun_decode(running_machine &machine, struct road_info *info)
+void segaic16_road_device::segaic16_road_outrun_decode(running_machine &machine, road_info *info)
{
int x, y;
const uint8_t *gfx = memregion("^gfx3")->base();
@@ -361,7 +361,7 @@ void segaic16_road_device::segaic16_road_outrun_decode(running_machine &machine,
}
-static void segaic16_road_outrun_draw(struct road_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
+static void segaic16_road_outrun_draw(segaic16_road_device::road_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
{
uint16_t *roadram = info->buffer.get();
int x, y;
@@ -383,7 +383,7 @@ static void segaic16_road_outrun_draw(struct road_info *info, bitmap_ind16 &bitm
int data1 = roadram[0x100 + y];
/* background case: look for solid fill scanlines */
- if (priority == SEGAIC16_ROAD_BACKGROUND)
+ if (priority == segaic16_road_device::ROAD_BACKGROUND)
{
int color = -1;
@@ -536,7 +536,7 @@ static void segaic16_road_outrun_draw(struct road_info *info, bitmap_ind16 &bitm
void segaic16_road_device::segaic16_road_init(running_machine &machine, int which, int type, int colorbase1, int colorbase2, int colorbase3, int xoffs)
{
- struct road_info *info = &segaic16_road[which];
+ road_info *info = &segaic16_road[which];
/* reset the tilemap info */
memset(info, 0, sizeof(*info));
@@ -561,14 +561,14 @@ void segaic16_road_device::segaic16_road_init(running_machine &machine, int whic
/* determine the parameters of the road */
switch (type)
{
- case SEGAIC16_ROAD_HANGON:
- case SEGAIC16_ROAD_SHARRIER:
+ case ROAD_HANGON:
+ case ROAD_SHARRIER:
info->draw = segaic16_road_hangon_draw;
segaic16_road_hangon_decode(machine, info);
break;
- case SEGAIC16_ROAD_OUTRUN:
- case SEGAIC16_ROAD_XBOARD:
+ case ROAD_OUTRUN:
+ case ROAD_XBOARD:
info->buffer = std::make_unique<uint16_t[]>(0x1000/2);
info->draw = segaic16_road_outrun_draw;
segaic16_road_outrun_decode(machine, info);
@@ -589,7 +589,7 @@ void segaic16_road_device::segaic16_road_init(running_machine &machine, int whic
void segaic16_road_device::segaic16_road_draw(int which, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority)
{
- struct road_info *info = &segaic16_road[which];
+ road_info *info = &segaic16_road[which];
(*info->draw)(info, bitmap, cliprect, priority);
}
@@ -603,7 +603,7 @@ void segaic16_road_device::segaic16_road_draw(int which, bitmap_ind16 &bitmap, c
READ16_MEMBER( segaic16_road_device::segaic16_road_control_0_r )
{
- struct road_info *info = &segaic16_road[0];
+ road_info *info = &segaic16_road[0];
if (info->buffer)
{
@@ -626,10 +626,10 @@ READ16_MEMBER( segaic16_road_device::segaic16_road_control_0_r )
WRITE16_MEMBER( segaic16_road_device::segaic16_road_control_0_w )
{
- struct road_info *info = &segaic16_road[0];
+ road_info *info = &segaic16_road[0];
if (ACCESSING_BITS_0_7)
{
- info->control = data & ((info->type == SEGAIC16_ROAD_OUTRUN) ? 3 : 7);
+ info->control = data & ((info->type == ROAD_OUTRUN) ? 3 : 7);
}
}
diff --git a/src/mame/video/segaic16_road.h b/src/mame/video/segaic16_road.h
index 9d835582c86..f95e40b0cba 100644
--- a/src/mame/video/segaic16_road.h
+++ b/src/mame/video/segaic16_road.h
@@ -1,54 +1,53 @@
// license:BSD-3-Clause
// copyright-holders:Aaron Giles
/* Sega Road Generators */
-
+#ifndef MAME_VIDEO_SEGAIC16_ROAD_H
+#define MAME_VIDEO_SEGAIC16_ROAD_H
#pragma once
-#ifndef __SEGAIC16_ROAD_H__
-#define __SEGAIC16_ROAD_H__
-/* road systems */
-#define SEGAIC16_MAX_ROADS 1
-#define SEGAIC16_ROAD_HANGON 0
-#define SEGAIC16_ROAD_SHARRIER 1
-#define SEGAIC16_ROAD_OUTRUN 2
-#define SEGAIC16_ROAD_XBOARD 3
+class segaic16_road_device : public device_t
+{
+public:
+ /* road systems */
+ static constexpr unsigned MAX_ROADS = 1;
-#define SEGAIC16_ROAD_BACKGROUND 0
-#define SEGAIC16_ROAD_FOREGROUND 1
+ static constexpr unsigned ROAD_HANGON = 0;
+ static constexpr unsigned ROAD_SHARRIER = 1;
+ static constexpr unsigned ROAD_OUTRUN = 2;
+ static constexpr unsigned ROAD_XBOARD = 3;
+ static constexpr unsigned ROAD_BACKGROUND = 0;
+ static constexpr unsigned ROAD_FOREGROUND = 1;
-struct road_info
-{
- uint8_t index; /* index of this structure */
- uint8_t type; /* type of road system (see segaic16.h for details) */
- uint8_t control; /* control register value */
- uint16_t colorbase1; /* color base for road ROM data */
- uint16_t colorbase2; /* color base for road background data */
- uint16_t colorbase3; /* color base for sky data */
- int32_t xoffs; /* X scroll offset */
- void (*draw)(struct road_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority);
- uint16_t * roadram; /* pointer to roadram pointer */
- std::unique_ptr<uint16_t[]> buffer; /* buffered roadram pointer */
- std::unique_ptr<uint8_t[]> gfx; /* expanded road graphics */
-};
+
+ struct road_info
+ {
+ uint8_t index; /* index of this structure */
+ uint8_t type; /* type of road system (see segaic16.h for details) */
+ uint8_t control; /* control register value */
+ uint16_t colorbase1; /* color base for road ROM data */
+ uint16_t colorbase2; /* color base for road background data */
+ uint16_t colorbase3; /* color base for sky data */
+ int32_t xoffs; /* X scroll offset */
+ void (*draw)(struct road_info *info, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority);
+ uint16_t * roadram; /* pointer to roadram pointer */
+ std::unique_ptr<uint16_t[]> buffer; /* buffered roadram pointer */
+ std::unique_ptr<uint8_t[]> gfx; /* expanded road graphics */
+ };
-class segaic16_road_device : public device_t
-{
-public:
segaic16_road_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~segaic16_road_device() {}
uint16_t *segaic16_roadram_0;
void segaic16_road_hangon_decode(running_machine &machine, struct road_info *info);
void segaic16_road_outrun_decode(running_machine &machine, struct road_info *info);
- struct road_info segaic16_road[SEGAIC16_MAX_ROADS];
+ struct road_info segaic16_road[MAX_ROADS];
void segaic16_road_init(running_machine &machine, int which, int type, int colorbase1, int colorbase2, int colorbase3, int xoffs);
void segaic16_road_draw(int which, bitmap_ind16 &bitmap, const rectangle &cliprect, int priority);
@@ -66,9 +65,9 @@ private:
// internal state
};
-extern const device_type SEGAIC16_ROAD;
+DECLARE_DEVICE_TYPE(SEGAIC16_ROAD, segaic16_road_device)
#define MCFG_SEGAIC16_ROAD_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, SEGAIC16_ROAD, 0)
-#endif
+#endif // MAME_VIDEO_SEGAIC16_ROAD_H
diff --git a/src/mame/video/segaic24.cpp b/src/mame/video/segaic24.cpp
index 6747046de0b..0cd954ca3d7 100644
--- a/src/mame/video/segaic24.cpp
+++ b/src/mame/video/segaic24.cpp
@@ -19,26 +19,26 @@ System 24 68000x2 315-5292 315-5293 315-5294 315-5242 ym2151 da
#include "screen.h"
-const device_type S24TILE = device_creator<segas24_tile>;
-const device_type S24SPRITE = device_creator<segas24_sprite>;
-const device_type S24MIXER = device_creator<segas24_mixer>;
+DEFINE_DEVICE_TYPE(S24TILE, segas24_tile_device, "segas24_tile", "Sega System 24 Tilemap")
+DEFINE_DEVICE_TYPE(S24SPRITE, segas24_sprite_device, "segas24_sprite", "Sega System 24 Sprites")
+DEFINE_DEVICE_TYPE(S24MIXER, segas24_mixer_device, "segas24_mixer", "Sega System 24 Mixer")
-segas24_tile::segas24_tile(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, S24TILE, "Sega System 24 Tilemap", tag, owner, clock, "segas24_tile", __FILE__),
- device_gfx_interface(mconfig, *this),
- char_gfx_index(0)
+segas24_tile_device::segas24_tile_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, S24TILE, tag, owner, clock)
+ , device_gfx_interface(mconfig, *this)
+ , char_gfx_index(0)
{
}
-void segas24_tile::static_set_tile_mask(device_t &device, uint16_t _tile_mask)
+void segas24_tile_device::static_set_tile_mask(device_t &device, uint16_t _tile_mask)
{
- segas24_tile &dev = downcast<segas24_tile &>(device);
+ segas24_tile_device &dev = downcast<segas24_tile_device &>(device);
dev.tile_mask = _tile_mask;
}
-const gfx_layout segas24_tile::char_layout = {
+const gfx_layout segas24_tile_device::char_layout = {
8, 8,
SYS24_TILES,
4,
@@ -48,34 +48,34 @@ const gfx_layout segas24_tile::char_layout = {
8*32
};
-void segas24_tile::tile_info(int offset, tile_data &tileinfo, tilemap_memory_index tile_index)
+void segas24_tile_device::tile_info(int offset, tile_data &tileinfo, tilemap_memory_index tile_index)
{
uint16_t val = tile_ram[tile_index|offset];
SET_TILE_INFO_MEMBER(char_gfx_index, val & tile_mask, (val >> 7) & 0xff, 0);
tileinfo.category = (val & 0x8000) != 0;
}
-TILE_GET_INFO_MEMBER(segas24_tile::tile_info_0s)
+TILE_GET_INFO_MEMBER(segas24_tile_device::tile_info_0s)
{
tile_info(0x0000, tileinfo, tile_index);
}
-TILE_GET_INFO_MEMBER( segas24_tile::tile_info_0w)
+TILE_GET_INFO_MEMBER( segas24_tile_device::tile_info_0w)
{
tile_info(0x1000, tileinfo, tile_index);
}
-TILE_GET_INFO_MEMBER(segas24_tile::tile_info_1s)
+TILE_GET_INFO_MEMBER(segas24_tile_device::tile_info_1s)
{
tile_info(0x2000, tileinfo, tile_index);
}
-TILE_GET_INFO_MEMBER(segas24_tile::tile_info_1w)
+TILE_GET_INFO_MEMBER(segas24_tile_device::tile_info_1w)
{
tile_info(0x3000, tileinfo, tile_index);
}
-void segas24_tile::device_start()
+void segas24_tile_device::device_start()
{
if (!palette().device().started())
throw device_missing_dependencies();
@@ -83,10 +83,10 @@ void segas24_tile::device_start()
char_ram = std::make_unique<uint16_t[]>(0x80000/2);
tile_ram = std::make_unique<uint16_t[]>(0x10000/2);
- tile_layer[0] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_0s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
- tile_layer[1] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_0w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
- tile_layer[2] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_1s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
- tile_layer[3] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile::tile_info_1w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ tile_layer[0] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile_device::tile_info_0s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ tile_layer[1] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile_device::tile_info_0w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ tile_layer[2] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile_device::tile_info_1s),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+ tile_layer[3] = &machine().tilemap().create(*this, tilemap_get_info_delegate(FUNC(segas24_tile_device::tile_info_1w),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
tile_layer[0]->set_transparent_pen(0);
tile_layer[1]->set_transparent_pen(0);
@@ -102,7 +102,7 @@ void segas24_tile::device_start()
save_pointer(NAME(char_ram.get()), 0x80000/2);
}
-void segas24_tile::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_ind16 &dm, const uint16_t *mask,
+void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_ind16 &dm, const uint16_t *mask,
uint16_t tpri, uint8_t lpri, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2)
{
int y;
@@ -236,7 +236,7 @@ void segas24_tile::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind
// about sprite priority hence the lack of support for the
// priority_bitmap
-void segas24_tile::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_rgb32 &dm, const uint16_t *mask,
+void segas24_tile_device::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind8 &tm, bitmap_rgb32 &dm, const uint16_t *mask,
uint16_t tpri, uint8_t lpri, int win, int sx, int sy, int xx1, int yy1, int xx2, int yy2)
{
int y;
@@ -349,7 +349,7 @@ void segas24_tile::draw_rect(screen_device &screen, bitmap_ind16 &bm, bitmap_ind
}
template<class _BitmapClass>
-void segas24_tile::draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int layer, int lpri, int flags)
+void segas24_tile_device::draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int layer, int lpri, int flags)
{
uint16_t hscr = tile_ram[0x5000+(layer >> 1)];
uint16_t vscr = tile_ram[0x5004+(layer >> 1)];
@@ -524,30 +524,30 @@ void segas24_tile::draw_common(screen_device &screen, _BitmapClass &bitmap, cons
}
}
-void segas24_tile::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int lpri, int flags)
+void segas24_tile_device::draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int lpri, int flags)
{ draw_common(screen, bitmap, cliprect, layer, lpri, flags); }
-void segas24_tile::draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int lpri, int flags)
+void segas24_tile_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, int layer, int lpri, int flags)
{ draw_common(screen, bitmap, cliprect, layer, lpri, flags); }
-READ16_MEMBER(segas24_tile::tile_r)
+READ16_MEMBER(segas24_tile_device::tile_r)
{
return tile_ram[offset];
}
-READ16_MEMBER(segas24_tile::char_r)
+READ16_MEMBER(segas24_tile_device::char_r)
{
return char_ram[offset];
}
-WRITE16_MEMBER(segas24_tile::tile_w)
+WRITE16_MEMBER(segas24_tile_device::tile_w)
{
COMBINE_DATA(tile_ram.get() + offset);
if(offset < 0x4000)
tile_layer[offset >> 12]->mark_tile_dirty(offset & 0xfff);
}
-WRITE16_MEMBER(segas24_tile::char_w)
+WRITE16_MEMBER(segas24_tile_device::char_w)
{
uint16_t old = char_ram[offset];
COMBINE_DATA(char_ram.get() + offset);
@@ -555,35 +555,35 @@ WRITE16_MEMBER(segas24_tile::char_w)
gfx(char_gfx_index)->mark_dirty(offset / 16);
}
-READ32_MEMBER(segas24_tile::tile32_r)
+READ32_MEMBER(segas24_tile_device::tile32_r)
{
return tile_r(space, offset*2, mem_mask&0xffff) | tile_r(space, (offset*2)+1, mem_mask>>16)<<16;
}
-READ32_MEMBER(segas24_tile::char32_r)
+READ32_MEMBER(segas24_tile_device::char32_r)
{
return char_r(space, offset*2, mem_mask&0xffff) | char_r(space, (offset*2)+1, mem_mask>>16)<<16;
}
-WRITE32_MEMBER(segas24_tile::tile32_w)
+WRITE32_MEMBER(segas24_tile_device::tile32_w)
{
tile_w(space, offset*2, data&0xffff, mem_mask&0xffff);
tile_w(space, (offset*2)+1, data>>16, mem_mask>>16);
}
-WRITE32_MEMBER(segas24_tile::char32_w)
+WRITE32_MEMBER(segas24_tile_device::char32_w)
{
char_w(space, offset*2, data&0xffff, mem_mask&0xffff);
char_w(space, (offset*2)+1, data>>16, mem_mask>>16);
}
-segas24_sprite::segas24_sprite(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, S24SPRITE, "Sega System 24 Sprites", tag, owner, clock, "segas24_sprite", __FILE__)
+segas24_sprite_device::segas24_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, S24SPRITE, tag, owner, clock)
{
}
-void segas24_sprite::device_start()
+void segas24_sprite_device::device_start()
{
sprite_ram = std::make_unique<uint16_t[]>(0x40000/2);
@@ -614,7 +614,7 @@ void segas24_sprite::device_start()
0 11------ --------
*/
-void segas24_sprite::draw(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, const int *spri)
+void segas24_sprite_device::draw(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, const int *spri)
{
uint16_t curspr = 0;
int countspr = 0;
@@ -812,39 +812,39 @@ void segas24_sprite::draw(bitmap_ind16 &bitmap, const rectangle &cliprect, bitma
}
-WRITE16_MEMBER(segas24_sprite::write)
+WRITE16_MEMBER(segas24_sprite_device::write)
{
COMBINE_DATA(sprite_ram.get() + offset);
}
-READ16_MEMBER(segas24_sprite::read)
+READ16_MEMBER(segas24_sprite_device::read)
{
return sprite_ram[offset];
}
-segas24_mixer::segas24_mixer(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, S24MIXER, "Sega System 24 Mixer", tag, owner, clock, "segas24_mixer", __FILE__)
+segas24_mixer_device::segas24_mixer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, S24MIXER, tag, owner, clock)
{
}
-void segas24_mixer::device_start()
+void segas24_mixer_device::device_start()
{
memset(mixer_reg, 0, sizeof(mixer_reg));
save_item(NAME(mixer_reg));
}
-WRITE16_MEMBER(segas24_mixer::write)
+WRITE16_MEMBER(segas24_mixer_device::write)
{
COMBINE_DATA(mixer_reg + offset);
}
-READ16_MEMBER(segas24_mixer::read)
+READ16_MEMBER(segas24_mixer_device::read)
{
return mixer_reg[offset];
}
-uint16_t segas24_mixer::get_reg(int reg)
+uint16_t segas24_mixer_device::get_reg(int reg)
{
return mixer_reg[reg];
}
diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h
index 5c95f172285..abcf5c6a4ee 100644
--- a/src/mame/video/segaic24.h
+++ b/src/mame/video/segaic24.h
@@ -5,12 +5,14 @@
*/
-#ifndef __SEGAIC24_H
-#define __SEGAIC24_H
+#ifndef MAME_VIDEO_SEGAIC24_H
+#define MAME_VIDEO_SEGAIC24_H
+
+#pragma once
#define MCFG_S24TILE_DEVICE_ADD(_tag, tile_mask) \
MCFG_DEVICE_ADD(_tag, S24TILE, 0) \
- segas24_tile::static_set_tile_mask(*device, tile_mask);
+ segas24_tile_device::static_set_tile_mask(*device, tile_mask);
#define MCFG_S24SPRITE_DEVICE_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, S24SPRITE, 0)
@@ -22,12 +24,12 @@
#define MCFG_S24TILE_DEVICE_PALETTE(_palette_tag) \
MCFG_GFX_PALETTE(_palette_tag)
-class segas24_tile : public device_t, public device_gfx_interface
+class segas24_tile_device : public device_t, public device_gfx_interface
{
friend class segas24_tile_config;
public:
- segas24_tile(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ segas24_tile_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// static configuration
static void static_set_tile_mask(device_t &device, uint16_t tile_mask);
@@ -76,12 +78,12 @@ private:
void draw_common(screen_device &screen, _BitmapClass &bitmap, const rectangle &cliprect, int layer, int pri, int flags);
};
-class segas24_sprite : public device_t
+class segas24_sprite_device : public device_t
{
friend class segas24_sprite_config;
public:
- segas24_sprite(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ segas24_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER(read);
DECLARE_WRITE16_MEMBER(write);
@@ -96,12 +98,12 @@ private:
};
-class segas24_mixer : public device_t
+class segas24_mixer_device : public device_t
{
friend class segas24_mixer_config;
public:
- segas24_mixer(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ segas24_mixer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
DECLARE_READ16_MEMBER(read);
DECLARE_WRITE16_MEMBER(write);
@@ -115,8 +117,8 @@ private:
uint16_t mixer_reg[16];
};
-extern const device_type S24TILE;
-extern const device_type S24SPRITE;
-extern const device_type S24MIXER;
+DECLARE_DEVICE_TYPE(S24TILE, segas24_tile_device)
+DECLARE_DEVICE_TYPE(S24SPRITE, segas24_sprite_device)
+DECLARE_DEVICE_TYPE(S24MIXER, segas24_mixer_device)
-#endif
+#endif // MAME_VIDEO_SEGAIC24_H
diff --git a/src/mame/video/segaorun.cpp b/src/mame/video/segaorun.cpp
index 3e77259dc88..469f574a9b2 100644
--- a/src/mame/video/segaorun.cpp
+++ b/src/mame/video/segaorun.cpp
@@ -20,18 +20,18 @@ void segaorun_state::video_start()
if (m_shangon_video)
{
// initialize the tile/text layers
- m_segaic16vid->tilemap_init(0, SEGAIC16_TILEMAP_16B_ALT, 0x000, 0, 2);
+ m_segaic16vid->tilemap_init(0, segaic16_video_device::TILEMAP_16B_ALT, 0x000, 0, 2);
// initialize the road
- m_segaic16road->segaic16_road_init(machine(), 0, SEGAIC16_ROAD_OUTRUN, 0x7f6, 0x7c0, 0x7c0, 0);
+ m_segaic16road->segaic16_road_init(machine(), 0, segaic16_road_device::ROAD_OUTRUN, 0x7f6, 0x7c0, 0x7c0, 0);
}
else
{
// initialize the tile/text layers
- m_segaic16vid->tilemap_init(0, SEGAIC16_TILEMAP_16B, 0x000, 0, 2);
+ m_segaic16vid->tilemap_init(0, segaic16_video_device::TILEMAP_16B, 0x000, 0, 2);
// initialize the road
- m_segaic16road->segaic16_road_init(machine(), 0, SEGAIC16_ROAD_OUTRUN, 0x400, 0x420, 0x780, 0);
+ m_segaic16road->segaic16_road_init(machine(), 0, segaic16_road_device::ROAD_OUTRUN, 0x400, 0x420, 0x780, 0);
}
}
@@ -50,24 +50,24 @@ uint32_t segaorun_state::screen_update_shangon(screen_device &screen, bitmap_ind
screen.priority().fill(0, cliprect);
// draw the low priority road layer
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_BACKGROUND);
// draw background
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
// draw foreground
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
// draw the high priority road
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_FOREGROUND);
// text layer
// note that we inflate the priority of the text layer to prevent sprites
// from drawing over the high scores
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x08);
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x08);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
// mix in sprites
bitmap_ind16 &sprites = m_sprites->bitmap();
@@ -119,22 +119,22 @@ uint32_t segaorun_state::screen_update_outrun(screen_device &screen, bitmap_ind1
screen.priority().fill(0, cliprect);
// draw the low priority road layer
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_BACKGROUND);
// draw background
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
// draw foreground
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
// draw the high priority road
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_FOREGROUND);
// text layer
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x04);
- m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x04);
+ m_segaic16vid->tilemap_draw(screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
// mix in sprites
bitmap_ind16 &sprites = m_sprites->bitmap();
diff --git a/src/mame/video/segas16a.cpp b/src/mame/video/segas16a.cpp
index 88346c30ec1..809263dd606 100644
--- a/src/mame/video/segas16a.cpp
+++ b/src/mame/video/segas16a.cpp
@@ -18,7 +18,7 @@
void segas16a_state::video_start()
{
// initialize the tile/text layers
- m_segaic16vid->tilemap_init( 0, SEGAIC16_TILEMAP_16A, 0x000, 0, 1);
+ m_segaic16vid->tilemap_init( 0, segaic16_video_device::TILEMAP_16A, 0x000, 0, 1);
}
@@ -42,21 +42,21 @@ uint32_t segas16a_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
screen.priority().fill(0, cliprect);
// draw background opaquely first, not setting any priorities
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00);
// draw background again, just to set the priorities on non-transparent pixels
bitmap_ind16 dummy_bitmap;
- m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
// draw foreground
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
// text layer
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x04);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
// mix in sprites
bitmap_ind16 &sprites = m_sprites->bitmap();
diff --git a/src/mame/video/segas16b.cpp b/src/mame/video/segas16b.cpp
index 2302db46d81..026456a1ec7 100644
--- a/src/mame/video/segas16b.cpp
+++ b/src/mame/video/segas16b.cpp
@@ -43,21 +43,21 @@ uint32_t segas16b_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
screen.priority().fill(0, cliprect);
// draw background opaquely first, not setting any priorities
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00);
// draw background again, just to set the priorities on non-transparent pixels
bitmap_ind16 dummy_bitmap;
- m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw( screen, dummy_bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
// draw foreground
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
// text layer
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x04);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
// mix in sprites
if (!m_sprites.found()) return 0;
diff --git a/src/mame/video/segas18.cpp b/src/mame/video/segas18.cpp
index a7c6229f40e..f6033172e24 100644
--- a/src/mame/video/segas18.cpp
+++ b/src/mame/video/segas18.cpp
@@ -34,7 +34,7 @@ void segas18_state::video_start()
m_vdp_mixing = 0;
// initialize the tile/text layers
- m_segaic16vid->tilemap_init( 0, SEGAIC16_TILEMAP_16B, 0x000, 0, 8);
+ m_segaic16vid->tilemap_init( 0, segaic16_video_device::TILEMAP_16B, 0x000, 0, 8);
save_item(NAME(m_grayscale_enable));
save_item(NAME(m_vdp_enable));
@@ -200,23 +200,23 @@ uint32_t segas18_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
screen.priority().fill(0, cliprect);
// draw background opaquely first, not setting any priorities
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0 | TILEMAP_DRAW_OPAQUE, 0x00);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1 | TILEMAP_DRAW_OPAQUE, 0x00);
if (m_vdp_enable && vdplayer == 0) draw_vdp(screen, bitmap, cliprect, vdppri);
// draw background again to draw non-transparent pixels over the VDP and set the priority
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
if (m_vdp_enable && vdplayer == 1) draw_vdp(screen, bitmap, cliprect, vdppri);
// draw foreground
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
if (m_vdp_enable && vdplayer == 2) draw_vdp(screen, bitmap, cliprect, vdppri);
// text layer
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x04);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
if (m_vdp_enable && vdplayer == 3) draw_vdp(screen, bitmap, cliprect, vdppri);
// mix in sprites
diff --git a/src/mame/video/segas24.cpp b/src/mame/video/segas24.cpp
index 056c9a7732e..74dac813a55 100644
--- a/src/mame/video/segas24.cpp
+++ b/src/mame/video/segas24.cpp
@@ -15,7 +15,7 @@
namespace {
struct layer_sort {
- layer_sort(segas24_mixer *_mixer) { mixer = _mixer; }
+ layer_sort(segas24_mixer_device *_mixer) { mixer = _mixer; }
bool operator()(int l1, int l2) {
static const int default_pri[12] = { 0, 1, 2, 3, 4, 5, 6, 7, -4, -3, -2, -1 };
@@ -26,7 +26,7 @@ namespace {
return default_pri[l2] - default_pri[l1] < 0;
}
- segas24_mixer *mixer;
+ segas24_mixer_device *mixer;
};
}
diff --git a/src/mame/video/segaxbd.cpp b/src/mame/video/segaxbd.cpp
index 12de6fcaab2..b7e06d0e311 100644
--- a/src/mame/video/segaxbd.cpp
+++ b/src/mame/video/segaxbd.cpp
@@ -23,10 +23,10 @@ void segaxbd_state::video_start()
throw device_missing_dependencies();
// initialize the tile/text layers
- m_segaic16vid->tilemap_init( 0, SEGAIC16_TILEMAP_16B, 0x1c00, 0, 2);
+ m_segaic16vid->tilemap_init( 0, segaic16_video_device::TILEMAP_16B, 0x1c00, 0, 2);
// initialize the road
- m_segaic16road->segaic16_road_init(machine(), 0, SEGAIC16_ROAD_XBOARD, 0x1700, 0x1720, 0x1780, -166);
+ m_segaic16road->segaic16_road_init(machine(), 0, segaic16_road_device::ROAD_XBOARD, 0x1700, 0x1720, 0x1780, -166);
}
@@ -51,25 +51,25 @@ uint32_t segaxbd_state::screen_update(screen_device &screen, bitmap_ind16 &bitma
screen.priority().fill(0, cliprect);
// draw the low priority road layer
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_BACKGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_BACKGROUND);
if (m_road_priority == 0)
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_FOREGROUND);
// draw background
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 0, 0x01);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_BACKGROUND, 1, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 0, 0x01);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_BACKGROUND, 1, 0x02);
// draw foreground
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 0, 0x02);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_FOREGROUND, 1, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 0, 0x02);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_FOREGROUND, 1, 0x04);
// draw the high priority road
if (m_road_priority == 1)
- m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, SEGAIC16_ROAD_FOREGROUND);
+ m_segaic16road->segaic16_road_draw(0, bitmap, cliprect, segaic16_road_device::ROAD_FOREGROUND);
// text layer
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 0, 0x04);
- m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, SEGAIC16_TILEMAP_TEXT, 1, 0x08);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 0, 0x04);
+ m_segaic16vid->tilemap_draw( screen, bitmap, cliprect, 0, segaic16_video_device::TILEMAP_TEXT, 1, 0x08);
// mix in sprites
bitmap_ind16 &sprites = m_sprites->bitmap();
diff --git a/src/mame/video/segaybd.cpp b/src/mame/video/segaybd.cpp
index e5e40484ef5..fb93042f19e 100644
--- a/src/mame/video/segaybd.cpp
+++ b/src/mame/video/segaybd.cpp
@@ -17,7 +17,7 @@
void segaybd_state::video_start()
{
// initialize the rotation layer
- m_segaic16vid->rotate_init(0, SEGAIC16_ROTATE_YBOARD, 0x000);
+ m_segaic16vid->rotate_init(0, segaic16_video_device::ROTATE_YBOARD, 0x000);
m_ysprites->set_rotate_ptr(m_segaic16vid->m_rotate);
}
diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp
index 774507e970e..fb2ee4b2321 100644
--- a/src/mame/video/seibu_crtc.cpp
+++ b/src/mame/video/seibu_crtc.cpp
@@ -213,7 +213,7 @@ List of default vregs (title screen):
//**************************************************************************
// device type definition
-const device_type SEIBU_CRTC = device_creator<seibu_crtc_device>;
+DEFINE_DEVICE_TYPE(SEIBU_CRTC, seibu_crtc_device, "seibu_crtc", "Seibu CRT Controller")
static ADDRESS_MAP_START( seibu_crtc_vregs, AS_0, 16, seibu_crtc_device )
AM_RANGE(0x0014, 0x0015) AM_WRITE(decrypt_key_w)
@@ -270,7 +270,7 @@ WRITE16_MEMBER( seibu_crtc_device::layer_scroll_base_w)
//-------------------------------------------------
seibu_crtc_device::seibu_crtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SEIBU_CRTC, "Seibu CRT Controller", tag, owner, clock, "seibu_crtc", __FILE__),
+ : device_t(mconfig, SEIBU_CRTC, tag, owner, clock),
device_memory_interface(mconfig, *this),
device_video_interface(mconfig, *this),
m_decrypt_key_cb(*this),
diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h
index 96c1789d175..fe58abbf1cf 100644
--- a/src/mame/video/seibu_crtc.h
+++ b/src/mame/video/seibu_crtc.h
@@ -6,10 +6,10 @@
***************************************************************************/
-#pragma once
+#ifndef MAME_VIDEO_SEIBU_CRTC_H
+#define MAME_VIDEO_SEIBU_CRTC_H
-#ifndef __SEIBU_CRTCDEV_H__
-#define __SEIBU_CRTCDEV_H__
+#pragma once
//**************************************************************************
@@ -46,11 +46,11 @@ public:
// construction/destruction
seibu_crtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_decrypt_key_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_decrypt_key_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_layer_en_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_en_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_layer_scroll_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_reg_1a_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_reg_1a_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_layer_scroll_base_callback(device_t &device, _Object object) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_base_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_decrypt_key_callback(device_t &device, Object &&cb) { return downcast<seibu_crtc_device &>(device).m_decrypt_key_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_layer_en_callback(device_t &device, Object &&cb) { return downcast<seibu_crtc_device &>(device).m_layer_en_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_layer_scroll_callback(device_t &device, Object &&cb) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_reg_1a_callback(device_t &device, Object &&cb) { return downcast<seibu_crtc_device &>(device).m_reg_1a_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_layer_scroll_base_callback(device_t &device, Object &&cb) { return downcast<seibu_crtc_device &>(device).m_layer_scroll_base_cb.set_callback(std::forward<Object>(cb)); }
// I/O operations
DECLARE_WRITE16_MEMBER( write );
@@ -88,6 +88,6 @@ private:
// device type definition
-extern const device_type SEIBU_CRTC;
+DECLARE_DEVICE_TYPE(SEIBU_CRTC, seibu_crtc_device)
-#endif
+#endif // MAME_VIDEO_SEIBU_CRTC_H
diff --git a/src/mame/video/seta001.cpp b/src/mame/video/seta001.cpp
index 25adb5ce2ba..67ead040f9b 100644
--- a/src/mame/video/seta001.cpp
+++ b/src/mame/video/seta001.cpp
@@ -30,10 +30,10 @@
#include "screen.h"
-const device_type SETA001_SPRITE = device_creator<seta001_device>;
+DEFINE_DEVICE_TYPE(SETA001_SPRITE, seta001_device, "seta001", "Seta SETA001 Sprites")
seta001_device::seta001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SETA001_SPRITE, "Seta SETA001 Sprite", tag, owner, clock, "seta001", __FILE__)
+ : device_t(mconfig, SETA001_SPRITE, tag, owner, clock)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
}
diff --git a/src/mame/video/seta001.h b/src/mame/video/seta001.h
index 23e1e4fa17b..2deab65033c 100644
--- a/src/mame/video/seta001.h
+++ b/src/mame/video/seta001.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, David Haywood
+#ifndef MAME_VIDEO_SETA001_H
+#define MAME_VIDEO_SETA001_H
+
+#pragma once
typedef device_delegate<int (uint16_t code, uint8_t color)> gfxbank_cb_delegate;
@@ -82,7 +86,9 @@ private:
uint8_t m_spritecodehigh[0x2000]; // ^
};
-extern const device_type SETA001_SPRITE;
+DECLARE_DEVICE_TYPE(SETA001_SPRITE, seta001_device)
#define MCFG_SETA001_SPRITE_GFXDECODE(_gfxtag) \
seta001_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_SETA001_H
diff --git a/src/mame/video/simpsons.cpp b/src/mame/video/simpsons.cpp
index 5fc201ab186..a25ed485e43 100644
--- a/src/mame/video/simpsons.cpp
+++ b/src/mame/video/simpsons.cpp
@@ -93,20 +93,20 @@ uint32_t simpsons_state::screen_update_simpsons(screen_device &screen, bitmap_in
{
int layer[3], bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI3);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI4);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI3);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI4);
m_k052109->tilemap_update();
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI3);
layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI4);
konami_sortlayers3(layer, m_layerpri);
diff --git a/src/mame/video/sknsspr.cpp b/src/mame/video/sknsspr.cpp
index 8efcd50503a..6e1aed35ec5 100644
--- a/src/mame/video/sknsspr.cpp
+++ b/src/mame/video/sknsspr.cpp
@@ -19,12 +19,12 @@
#include "sknsspr.h"
#include "screen.h"
-const device_type SKNS_SPRITE = device_creator<sknsspr_device>;
+DEFINE_DEVICE_TYPE(SKNS_SPRITE, sknsspr_device, "sknsspr", "SKNS Sprite")
sknsspr_device::sknsspr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SKNS_SPRITE, "SKNS Sprite", tag, owner, clock, "sknsspr", __FILE__),
- device_video_interface(mconfig, *this)
+ : device_t(mconfig, SKNS_SPRITE, tag, owner, clock)
+ , device_video_interface(mconfig, *this)
{
}
diff --git a/src/mame/video/sknsspr.h b/src/mame/video/sknsspr.h
index ca9548c1e98..251387a16e3 100644
--- a/src/mame/video/sknsspr.h
+++ b/src/mame/video/sknsspr.h
@@ -3,8 +3,9 @@
#ifndef MAME_VIDEO_SKNSSPR_H
#define MAME_VIDEO_SKNSSPR_H
-class sknsspr_device : public device_t,
- public device_video_interface
+#pragma once
+
+class sknsspr_device : public device_t, public device_video_interface
{
public:
sknsspr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -16,12 +17,12 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
private:
+ static constexpr unsigned SUPRNOVA_DECODE_BUFFER_SIZE = 0x2000;
int sprite_kludge_x, sprite_kludge_y;
- #define SUPRNOVA_DECODE_BUFFER_SIZE 0x2000
uint8_t decodebuffer[SUPRNOVA_DECODE_BUFFER_SIZE];
int skns_rle_decode ( int romoffset, int size, uint8_t*gfx_source, size_t gfx_length );
};
-extern const device_type SKNS_SPRITE;
+DECLARE_DEVICE_TYPE(SKNS_SPRITE, sknsspr_device)
#endif // MAME_VIDEO_SKNSSPR_H
diff --git a/src/mame/video/snk6502.cpp b/src/mame/video/snk6502.cpp
index fb8be98cea7..46f6a8107a8 100644
--- a/src/mame/video/snk6502.cpp
+++ b/src/mame/video/snk6502.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "includes/snk6502.h"
+#include "audio/snk6502.h"
#define TOTAL_COLORS(gfxn) (m_gfxdecode->gfx(gfxn)->colors() * m_gfxdecode->gfx(gfxn)->granularity())
@@ -136,6 +137,12 @@ WRITE8_MEMBER(snk6502_state::flipscreen_w)
}
}
+WRITE8_MEMBER(snk6502_state::fantasy_flipscreen_w)
+{
+ m_sound->fantasy_sound_w(space, offset | 0x03, data, mem_mask);
+ flipscreen_w(space, offset, data, mem_mask);
+}
+
WRITE8_MEMBER(snk6502_state::scrollx_w)
{
m_bg_tilemap->set_scrollx(0, data);
diff --git a/src/mame/video/snk68_spr.cpp b/src/mame/video/snk68_spr.cpp
index a11d9900d47..6ce6e8c5761 100644
--- a/src/mame/video/snk68_spr.cpp
+++ b/src/mame/video/snk68_spr.cpp
@@ -5,10 +5,10 @@
#include "emu.h"
#include "snk68_spr.h"
-const device_type SNK68_SPR = device_creator<snk68_spr_device>;
+DEFINE_DEVICE_TYPE(SNK68_SPR, snk68_spr_device, "snk68_spr", "SNK68 Sprites")
snk68_spr_device::snk68_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, SNK68_SPR, "SNK68 Sprites", tag, owner, clock, "snk68_spr", __FILE__)
+ : device_t(mconfig, SNK68_SPR, tag, owner, clock)
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
, m_spriteram(*this, "^spriteram")
, m_screen(*this, "^screen")
diff --git a/src/mame/video/snk68_spr.h b/src/mame/video/snk68_spr.h
index bbcc05c8b98..d7c9433b811 100644
--- a/src/mame/video/snk68_spr.h
+++ b/src/mame/video/snk68_spr.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail, Acho A. Tang, Nicola Salmoria
+#ifndef MAME_VIDEO_SNK68_SPR_H
+#define MAME_VIDEO_SNK68_SPR_H
+
+#pragma once
+
#include "screen.h"
typedef device_delegate<void (int&, int&, int&, int&)> snk68_tile_indirection_delegate;
@@ -45,4 +50,6 @@ private:
};
-extern const device_type SNK68_SPR;
+DECLARE_DEVICE_TYPE(SNK68_SPR, snk68_spr_device)
+
+#endif // MAME_VIDEO_SNK68_SPR_H
diff --git a/src/mame/video/st0020.cpp b/src/mame/video/st0020.cpp
index 37900c18bb3..158fc331085 100644
--- a/src/mame/video/st0020.cpp
+++ b/src/mame/video/st0020.cpp
@@ -18,7 +18,7 @@
#include "st0020.h"
#include "render.h"
-const device_type ST0020_SPRITES = device_creator<st0020_device>;
+DEFINE_DEVICE_TYPE(ST0020_SPRITES, st0020_device, "st0020", "Seta ST0020 Sprites")
#define ST0020_ST0032_BYTESWAP_DATA \
@@ -28,7 +28,7 @@ const device_type ST0020_SPRITES = device_creator<st0020_device>;
st0020_device::st0020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, ST0020_SPRITES, "Seta ST0020 Sprites", tag, owner, clock, "st0020", __FILE__),
+ device_t(mconfig, ST0020_SPRITES, tag, owner, clock),
device_gfx_interface(mconfig, *this)
{
m_is_st0032 = 0;
diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h
index 8f423ef2538..4f3a84722b4 100644
--- a/src/mame/video/st0020.h
+++ b/src/mame/video/st0020.h
@@ -1,5 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia,David Haywood
+#ifndef MAME_VIDEO_ST0020_H
+#define MAME_VIDEO_ST0020_H
+
+#pragma once
+
class st0020_device : public device_t, public device_gfx_interface
{
@@ -67,7 +72,9 @@ private:
void draw_zooming_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int priority);
};
-extern const device_type ST0020_SPRITES;
+DECLARE_DEVICE_TYPE(ST0020_SPRITES, st0020_device)
#define MCFG_ST0020_SPRITES_PALETTE(_palette_tag) \
MCFG_GFX_PALETTE(_palette_tag)
+
+#endif // MAME_VIDEO_ST0020_H
diff --git a/src/mame/video/stfight_dev.cpp b/src/mame/video/stfight_dev.cpp
index d434b61fea6..5a89418055f 100644
--- a/src/mame/video/stfight_dev.cpp
+++ b/src/mame/video/stfight_dev.cpp
@@ -9,11 +9,11 @@
#include "screen.h"
-const device_type STFIGHT_VIDEO = device_creator<stfight_video_device>;
+DEFINE_DEVICE_TYPE(STFIGHT_VIDEO, stfight_video_device, "stfight_vid", "Seibu Street Fight Video")
stfight_video_device::stfight_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, STFIGHT_VIDEO, "Seibu Street Fight Video", tag, owner, clock, "stfight_vid", __FILE__),
+ : device_t(mconfig, STFIGHT_VIDEO, tag, owner, clock),
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this,"^palette"),
m_screen(*this, "screen"),
diff --git a/src/mame/video/stfight_dev.h b/src/mame/video/stfight_dev.h
index 24b5a0227a0..e399726116e 100644
--- a/src/mame/video/stfight_dev.h
+++ b/src/mame/video/stfight_dev.h
@@ -1,14 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Mark McDougall, David Haywood
-#ifndef MAME_VIDEO_STFIGHT_VIDEO_H
-#define MAME_VIDEO_STFIGHT_VIDEO_H
+#ifndef MAME_VIDEO_STFIGHT_DEV_H
+#define MAME_VIDEO_STFIGHT_DEV_H
#pragma once
-extern const device_type STFIGHT_VIDEO;
+DECLARE_DEVICE_TYPE(STFIGHT_VIDEO, stfight_video_device)
#define MCFG_STFIGHT_VIDEO_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, STFIGHT_VIDEO, 0)
@@ -73,4 +73,4 @@ private:
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
};
-#endif // MAME_VIDEO_STFIGHT_VIDEO_H
+#endif // MAME_VIDEO_STFIGHT_DEV_H
diff --git a/src/mame/video/stic.cpp b/src/mame/video/stic.cpp
index 85a38be4580..bd48a7978eb 100644
--- a/src/mame/video/stic.cpp
+++ b/src/mame/video/stic.cpp
@@ -12,17 +12,384 @@
#include "screen.h"
-const device_type STIC = device_creator<stic_device>;
+/****************************************************************************
+ * *
+ * MXR 0000[..0007] MOB X REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-----+---+---+--+--+--+--+--+--+--+--+ *
+ * | | | | | |XSIZE|VIS|COL|X7|X6|X5|X4|X3|X2|X1|X0| *
+ * +-+-+-+-+-+-----+---+---+--+--+--+--+--+--+--+--+ *
+ * *
+ * Xn x-position [0..255] *
+ * COL collision detection [1=enable] *
+ * VIS visibility [1=visible] *
+ * XSIZE double width [1=double] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. If X=0, the sprite is not visible and does not register collisions. *
+ * 2. The horizontal handle is 8 pixels from the left of the sprite, *
+ * regardless of width. *
+ * *
+ ****************************************************************************/
+#define STIC_MXR 0x0000
+
+#define STIC_MXR_XSIZE 0x0400
+#define STIC_MXR_VIS 0x0200
+#define STIC_MXR_COL 0x0100
+#define STIC_MXR_X 0x00FF
+
+/****************************************************************************
+ * *
+ * MYR 0008[..000F] MOB Y REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-----+-----+-----+-----+----+--+--+--+--+--+--+--+ *
+ * | | | | |YFLIP|XFLIP|YSIZE|YFULL|YRES|Y6|Y5|Y4|Y3|Y2|Y1|Y0| *
+ * +-+-+-+-+-----+-----+-----+-----+----+--+--+--+--+--+--+--+ *
+ * *
+ * Yn y-position [0..127] *
+ * YRES y-resolution [0=8 scanlines,1=16 scanlines] *
+ * YFULL double scanline height [1=double] *
+ * YSIZE quadruple scanline height [1=quadruple] *
+ * XFLIP horizontally flip image [1=flip] *
+ * YFLIP vertically flip image [1=flip] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. A sprite with YRES=1 will display two cards. *
+ * 2. A sprite with YFULL=0 and YSIZE=0 will have scanlines half the *
+ * height of a background card. *
+ * 3, The minimum size of a sprite is 8x8 (XSIZE=YRES=YSIZE=YFULL=0). *
+ * 4. The maximum size of a sprite is 16x128 (XSIZE=YRES=YSIZE=YFULL=1). *
+ * 5. The Y-position is measured in double height scanlines. *
+ * 6. The vertical handle is 8 double height scanlines from the top of the *
+ * sprite, regardless of height. *
+ * *
+ ****************************************************************************/
+#define STIC_MYR 0x0008
+
+#define STIC_MYR_YFLIP 0x0800
+#define STIC_MYR_XFLIP 0x0400
+#define STIC_MYR_YSIZE 0x0200
+#define STIC_MYR_YFULL 0x0100
+#define STIC_MYR_YRES 0x0080
+#define STIC_MYR_Y 0x007F
+
+/****************************************************************************
+ * *
+ * SAR 0010[..0017] MOB ATTRIBUTE REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+---+---+---+-+-+--+--+--+--+--+--+---+---+---+ *
+ * | | |PRI|FG3|SEL| | |C5|C4|C3|C2|C1|C0|FG2|FG1|FG0| *
+ * +-+-+---+---+---+-+-+--+--+--+--+--+--+---+---+---+ *
+ * *
+ * FGn foreground color [0..15] *
+ * Cn card # [0..63] *
+ * SEL card memory select [0=GROM, 1=GRAM] *
+ * PRI sprite priority [1=behind set background bit] *
+ * *
+ ****************************************************************************/
+#define STIC_MAR 0x0010
+
+#define STIC_MAR_PRI 0x2000
+#define STIC_MAR_FG3 0x1000
+#define STIC_MAR_SEL 0x0800
+#define STIC_MAR_C 0x07F8
+#define STIC_MAR_FG20 0x0007
+
+/****************************************************************************
+ * *
+ * SCR 0018[..001F] MOB COLLISION REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+----+----+----+----+----+----+----+----+----+----+ *
+ * | | | | | | |BRDR|BKGD|SPR7|SPR6|SPR5|SPR4|SPR3|SPR2|SPR1|SPR0| *
+ * +-+-+-+-+-+-+----+----+----+----+----+----+----+----+----+----+ *
+ * *
+ * SPRn 1=collision with sprite #n *
+ * BKGD 1=collision with set background bit *
+ * BRDR 1=collision with screen border *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. All collisions are latched. Successive reads read from the latch. *
+ * A write will reset the latch. *
+ * 2. Sprites with VIS=0 register collisions. *
+ * 3. Sprites with X=0 do not register collisions. *
+ * 4. Two overlapping sprites with different priorities, one completely *
+ * hidden behind the background, still register a collision. *
+ * *
+ ****************************************************************************/
+#define STIC_MCR 0x0018
+
+#define STIC_MCR_BRDR 0x0200
+#define STIC_MCR_BKGD 0x0100
+#define STIC_MCR_SPR7 0x0080
+#define STIC_MCR_SPR6 0x0040
+#define STIC_MCR_SPR5 0x0020
+#define STIC_MCR_SPR4 0x0010
+#define STIC_MCR_SPR3 0x0008
+#define STIC_MCR_SPR2 0x0004
+#define STIC_MCR_SPR1 0x0002
+#define STIC_MCR_SPR0 0x0001
+
+/****************************************************************************
+ * *
+ * DER 0021 DISPLAY ENABLE REGISTER W *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
+ * | | | | | | | | | | | | | | | | | *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. Any write during VBLANK enables STIC output. *
+ * *
+ ****************************************************************************/
+#define STIC_DER 0x0020
+
+/****************************************************************************
+ * *
+ * GMR 0021 GRAPHICS MODE REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
+ * | | | | | | | | | | | | | | | | | *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. Any write during VBLANK enables FOREGROUND/BACKGROUND mode. *
+ * 2. Any read during VBLANK enables COLOR STACK/COLORED SQUARES mode. *
+ * *
+ ****************************************************************************/
+#define STIC_GMR 0x0021
+
+/****************************************************************************
+ * *
+ * CSR 0028 COLOR STACK REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
+ * | | | | | | | | | | | | |BG3|BG2|BG1|BG0| *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
+ * *
+ * BGn background color [0..15] *
+ * *
+ ****************************************************************************/
+#define STIC_CSR 0x0028
+
+#define STIC_CSR_BG 0x000F
+
+/****************************************************************************
+ * *
+ * BCR 002C BORDER COLOR REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
+ * | | | | | | | | | | | | |BC3|BC2|BC1|BC0| *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
+ * *
+ * BCn border color [0..15] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. Affects overscan, and column and row blockouts. *
+ * *
+ ****************************************************************************/
+#define STIC_BCR 0x002C
+
+#define STIC_BCR_BC 0x000F
+
+/****************************************************************************
+ * *
+ * HDR 0030 HORIZONTAL DELAY REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
+ * | | | | | | | | | | | | | |DEL2|DEL1|DEL0| *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
+ * *
+ * DELn horizontal delay [0..7] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. Affects both BACKTAB and MOBs. *
+ * *
+ ****************************************************************************/
+#define STIC_HDR 0x0030
+
+#define STIC_HDR_DEL 0x0007
+
+/****************************************************************************
+ * *
+ * STIC_VDR 0030 VERTICAL DELAY REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
+ * | | | | | | | | | | | | | |DEL2|DEL1|DEL0| *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
+ * *
+ * DELn vertical delay [0..7] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. Affects both BACKTAB and MOBs. *
+ * *
+ ****************************************************************************/
+#define STIC_VDR 0x0031
+
+#define STIC_VDR_DEL 0x0007
+
+/****************************************************************************
+ * *
+ * STIC_CBR 0032 CARD BLOCKOUT REGISTER RW *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+---+---+ *
+ * | | | | | | | | | | | | | | |ROW|COL| *
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+---+---+ *
+ * *
+ * COL blockout first card column [1=blockout] *
+ * ROW blockout first card row [1=blockout] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES *
+ * *
+ * 1. Generally used in conjunction with HDR and VDR registers, to achieve *
+ * smooth scrolling. *
+ * *
+ ****************************************************************************/
+#define STIC_CBR 0x0032
+
+#define STIC_CBR_ROW 0x0002
+#define STIC_CBR_COL 0x0001
+
+/****************************************************************************
+ * *
+ * FOREGROUND/BACKGROUND MODE *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+---+---+---+---+---+--+--+--+--+--+--+---+---+---+ *
+ * | | |BG2|BG3|SEL|BG1|BG0|C5|C4|C3|C2|C1|C0|FG2|FG1|FG0| *
+ * +-+-+---+---+---+---+---+--+--+--+--+--+--+---+---+---+ *
+ * *
+ * FGn foreground color [0..7] *
+ * Cn card # [0..63] *
+ * SEL card memory select [0=GROM, 1=GRAM] *
+ * BGn background color [0..15] *
+ * *
+ ****************************************************************************/
+#define STIC_FBM_BG2 0x2000
+#define STIC_FBM_BG310 0x1600
+#define STIC_FBM_SEL 0x0800
+#define STIC_FBM_C 0x01F8
+#define STIC_FBM_FG 0x0007
+
+/****************************************************************************
+ * *
+ * COLOR STACK MODE *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+---+---+---+--+--+--+--+--+--+--+--+---+---+---+ *
+ * | | |ADV|FG3|SEL|C7|C6|C5|C4|C3|C2|C1|C0|FG2|FG1|FG0| *
+ * +-+-+---+---+---+--+--+--+--+--+--+--+--+---+---+---+ *
+ * *
+ * FGn foreground color [0..15] *
+ * Cn card # [GROM=0..212, GRAM=0..63] *
+ * SEL card memory select [0=GROM, 1=GRAM] *
+ * ADV advance color stack index [1=advance] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES: *
+ * *
+ * 1. When FG3=1 and SEL=0, COLORED SQUARES MODE is enabled. *
+ * 2. When SEL=1, C7 and C6 can be used as user-defined flags. *
+ * *
+ ****************************************************************************/
+#define STIC_CSTM_ADV 0x2000
+#define STIC_CSTM_FG3 0x1000
+#define STIC_CSTM_SEL 0x0800
+#define STIC_CSTM_C7 0x0400
+#define STIC_CSTM_C6 0x0200
+#define STIC_CSTM_C50 0x01F8
+#define STIC_CSTM_FG20 0x0007
+
+#define STIC_CSTM_C (STIC_CSTM_C7|STIC_CSTM_C6|STIC_CSTM_C50)
+
+/****************************************************************************
+ * *
+ * COLORED SQUARES MODE *
+ * *
+ * (MSB) (LSB) *
+ * +-+-+--+-+-+--+--+--+--+--+--+--+--+--+--+--+ *
+ * | | |D2|1|0|D1|D0|C2|C1|C0|B2|B1|B0|A2|A1|A0| *
+ * +-+-+--+-+-+--+--+--+--+--+--+--+--+--+--+--+ *
+ * *
+ * An color a [0..7] *
+ * Bn color b [0..7] *
+ * Cn color c [0..7] *
+ * Dn color d [0..7] *
+ * *
+ ****************************************************************************
+ * *
+ * NOTES: *
+ * *
+ * 1. Each color corresponds to one of the following 4 x 4 squares: *
+ * *
+ * +---+---+ *
+ * | a | b | *
+ * +---+---+ *
+ * | c | d | *
+ * +---+---+ *
+ * *
+ * 2. When color 7 is specified, the color is taken from the color stack. *
+ * *
+ ****************************************************************************/
+#define STIC_CSQM_D2 0x2000
+#define STIC_CSQM_D10 0x0600
+#define STIC_CSQM_C 0x01C0
+#define STIC_CSQM_B 0x0038
+#define STIC_CSQM_A 0x0007
+
+#define STIC_CSQM_WIDTH (CARD_WIDTH / 2)
+#define STIC_CSQM_HEIGHT (CARD_HEIGHT / 2)
+
+
+
+DEFINE_DEVICE_TYPE(STIC, stic_device, "stic", "STIC (Standard Television Interface Chip) Video Chip");
//-------------------------------------------------
// stic_device - constructor
//-------------------------------------------------
stic_device::stic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, STIC, "STIC (Standard Television Interface Chip) Video Chip", tag, owner, clock, "stic", __FILE__),
- m_grom(*this, "grom"),
- m_x_scale(1),
- m_y_scale(1)
+ device_t(mconfig, STIC, tag, owner, clock),
+ m_grom(*this, "grom"),
+ m_x_scale(1),
+ m_y_scale(1)
{
}
@@ -56,7 +423,7 @@ void stic_device::device_start()
save_item(NAME(m_left_edge_inhibit));
save_item(NAME(m_top_edge_inhibit));
save_item(NAME(m_backtab_buffer));
- for (int sp = 0; sp < STIC_MOBS; sp++)
+ for (int sp = 0; sp < MOBS; sp++)
{
save_item(m_sprite[sp].visible, "STIC sprite/m_sprite[sp].visible", sp);
save_item(m_sprite[sp].xpos, "STIC sprite/m_sprite[sp].xpos", sp);
@@ -80,7 +447,7 @@ void stic_device::device_start()
void stic_device::device_reset()
{
- for (int i = 0; i < STIC_MOBS; i++)
+ for (int i = 0; i < MOBS; i++)
{
intv_sprite_type* s = &m_sprite[i];
s->visible = 0;
@@ -178,14 +545,14 @@ bool stic_device::sprites_collide(int spriteNum1, int spriteNum2)
intv_sprite_type* s1 = &m_sprite[spriteNum1];
intv_sprite_type* s2 = &m_sprite[spriteNum2];
- x0 = STIC_OVERSCAN_LEFT_WIDTH + m_col_delay - STIC_CARD_WIDTH;
- y0 = STIC_OVERSCAN_TOP_HEIGHT + m_row_delay - STIC_CARD_HEIGHT;
- x1 = (s1->xpos + x0) * STIC_X_SCALE; y1 = (s1->ypos + y0) * STIC_Y_SCALE;
- x2 = (s2->xpos + x0) * STIC_X_SCALE; y2 = (s2->ypos + y0) * STIC_Y_SCALE;
- w1 = (s1->doublex ? 2 : 1) * STIC_CARD_WIDTH;
- w2 = (s2->doublex ? 2 : 1) * STIC_CARD_WIDTH;
- h1 = (s1->quady ? 4 : 1) * (s1->doubley ? 2 : 1) * (s1->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
- h2 = (s2->quady ? 4 : 1) * (s2->doubley ? 2 : 1) * (s2->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
+ x0 = OVERSCAN_LEFT_WIDTH + m_col_delay - CARD_WIDTH;
+ y0 = OVERSCAN_TOP_HEIGHT + m_row_delay - CARD_HEIGHT;
+ x1 = (s1->xpos + x0) * X_SCALE; y1 = (s1->ypos + y0) * Y_SCALE;
+ x2 = (s2->xpos + x0) * X_SCALE; y2 = (s2->ypos + y0) * Y_SCALE;
+ w1 = (s1->doublex ? 2 : 1) * CARD_WIDTH;
+ w2 = (s2->doublex ? 2 : 1) * CARD_WIDTH;
+ h1 = (s1->quady ? 4 : 1) * (s1->doubley ? 2 : 1) * (s1->doubleyres ? 2 : 1) * CARD_HEIGHT;
+ h2 = (s2->quady ? 4 : 1) * (s2->doubley ? 2 : 1) * (s2->doubleyres ? 2 : 1) * CARD_HEIGHT;
if ((x1 >= x2 + w2) || (y1 >= y2 + h2) ||
(x2 >= x1 + w1) || (y2 >= y1 + h1))
@@ -216,13 +583,13 @@ bool stic_device::sprites_collide(int spriteNum1, int spriteNum2)
void stic_device::determine_sprite_collisions()
{
// check sprite to sprite collisions
- for (int i = 0; i < STIC_MOBS - 1; i++)
+ for (int i = 0; i < MOBS - 1; i++)
{
intv_sprite_type* s1 = &m_sprite[i];
if (s1->xpos == 0 || !s1->coll)
continue;
- for (int j = i + 1; j < STIC_MOBS; j++)
+ for (int j = i + 1; j < MOBS; j++)
{
intv_sprite_type* s2 = &m_sprite[j];
if (s2->xpos == 0 || !s2->coll)
@@ -247,17 +614,17 @@ void stic_device::render_sprites()
int32_t nextY;
int32_t xInc;
- for (int i = 0; i < STIC_MOBS; i++)
+ for (int i = 0; i < MOBS; i++)
{
intv_sprite_type* s = &m_sprite[i];
if (s->grom)
- cardMemoryLocation = (s->card * STIC_CARD_HEIGHT);
+ cardMemoryLocation = (s->card * CARD_HEIGHT);
else
- cardMemoryLocation = ((s->card & 0x003F) * STIC_CARD_HEIGHT);
+ cardMemoryLocation = ((s->card & 0x003F) * CARD_HEIGHT);
pixelSize = (s->quady ? 4 : 1) * (s->doubley ? 2 : 1);
- spritePixelHeight = pixelSize * (s->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
+ spritePixelHeight = pixelSize * (s->doubleyres ? 2 : 1) * CARD_HEIGHT;
for (int j = 0; j < spritePixelHeight; j++)
{
@@ -268,13 +635,13 @@ void stic_device::render_sprites()
nextData = m_gram[nextMemoryLocation];
else
nextData = 0xFFFF;
- nextX = (s->xflip ? ((s->doublex ? 2 : 1) * STIC_CARD_WIDTH - 1) : 0);
+ nextX = (s->xflip ? ((s->doublex ? 2 : 1) * CARD_WIDTH - 1) : 0);
nextY = (s->yflip ? (spritePixelHeight - j - 1) : j);
xInc = (s->xflip ? -1: 1);
- for (int k = 0; k < STIC_CARD_WIDTH * (1 + s->doublex); k++)
+ for (int k = 0; k < CARD_WIDTH * (1 + s->doublex); k++)
{
- m_sprite_buffers[i][nextX + k * xInc][nextY] = (nextData & (1 << ((STIC_CARD_WIDTH - 1) - k / (1 + s->doublex)))) != 0;
+ m_sprite_buffers[i][nextX + k * xInc][nextY] = (nextData & (1 << ((CARD_WIDTH - 1) - k / (1 + s->doublex)))) != 0;
}
}
}
@@ -284,9 +651,9 @@ void stic_device::render_line(bitmap_ind16 &bitmap, uint8_t nextByte, uint16_t x
{
uint32_t color;
- for (int i = 0; i < STIC_CARD_WIDTH; i++)
+ for (int i = 0; i < CARD_WIDTH; i++)
{
- color = (nextByte & (1 << ((STIC_CARD_WIDTH - 1) - i)) ? fgcolor : bgcolor);
+ color = (nextByte & (1 << ((CARD_WIDTH - 1) - i)) ? fgcolor : bgcolor);
intv_set_pixel(bitmap, x+i, y, color);
intv_set_pixel(bitmap, x+i, y+1, color);
}
@@ -294,10 +661,10 @@ void stic_device::render_line(bitmap_ind16 &bitmap, uint8_t nextByte, uint16_t x
void stic_device::render_colored_squares(bitmap_ind16 &bitmap, uint16_t x, uint16_t y, uint8_t color0, uint8_t color1, uint8_t color2, uint8_t color3)
{
- intv_plot_box(bitmap, x, y, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, color0);
- intv_plot_box(bitmap, x + STIC_CSQM_WIDTH * STIC_X_SCALE, y, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, color1);
- intv_plot_box(bitmap, x, y + STIC_CSQM_HEIGHT * STIC_Y_SCALE, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, color2);
- intv_plot_box(bitmap, x + STIC_CSQM_WIDTH * STIC_X_SCALE, y + STIC_CSQM_HEIGHT * STIC_Y_SCALE, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, color3);
+ intv_plot_box(bitmap, x, y, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, color0);
+ intv_plot_box(bitmap, x + STIC_CSQM_WIDTH * X_SCALE, y, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, color1);
+ intv_plot_box(bitmap, x, y + STIC_CSQM_HEIGHT * Y_SCALE, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, color2);
+ intv_plot_box(bitmap, x + STIC_CSQM_WIDTH * X_SCALE, y + STIC_CSQM_HEIGHT * Y_SCALE, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, color3);
}
void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
@@ -306,13 +673,13 @@ void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
uint8_t csPtr = 0;
uint16_t nextCard;
- for (h = 0, nexty = (STIC_OVERSCAN_TOP_HEIGHT + m_row_delay) * STIC_Y_SCALE;
- h < STIC_BACKTAB_HEIGHT;
- h++, nexty += STIC_CARD_HEIGHT * STIC_Y_SCALE)
+ for (h = 0, nexty = (OVERSCAN_TOP_HEIGHT + m_row_delay) * Y_SCALE;
+ h < BACKTAB_HEIGHT;
+ h++, nexty += CARD_HEIGHT * Y_SCALE)
{
- for (w = 0, nextx = (STIC_OVERSCAN_LEFT_WIDTH + m_col_delay) * STIC_X_SCALE;
- w < STIC_BACKTAB_WIDTH;
- w++, nextx += STIC_CARD_WIDTH * STIC_X_SCALE)
+ for (w = 0, nextx = (OVERSCAN_LEFT_WIDTH + m_col_delay) * X_SCALE;
+ w < BACKTAB_WIDTH;
+ w++, nextx += CARD_WIDTH * X_SCALE)
{
nextCard = m_backtab_buffer[h][w];
@@ -340,7 +707,7 @@ void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
//advance the color pointer, if necessary
if (nextCard & STIC_CSTM_ADV)
- csPtr = (csPtr+1) & (STIC_CSRS - 1);
+ csPtr = (csPtr+1) & (CSRS - 1);
fgcolor = ((nextCard & STIC_CSTM_FG3) >> 9) |
(nextCard & (STIC_CSTM_FG20)) | FOREGROUND_BIT;
@@ -351,17 +718,17 @@ void stic_device::render_color_stack_mode(bitmap_ind16 &bitmap)
{
memoryLocation = nextCard & STIC_CSTM_C;
memory = m_grom;
- for (int j = 0; j < STIC_CARD_HEIGHT; j++)
+ for (int j = 0; j < CARD_HEIGHT; j++)
render_line(bitmap, memory[memoryLocation + j],
- nextx, nexty + j * STIC_Y_SCALE, fgcolor, bgcolor);
+ nextx, nexty + j * Y_SCALE, fgcolor, bgcolor);
}
else
{
memoryLocation = nextCard & STIC_CSTM_C50;
memory = m_gram;
- for (int j = 0; j < STIC_CARD_HEIGHT; j++)
+ for (int j = 0; j < CARD_HEIGHT; j++)
render_line(bitmap, memory[memoryLocation + j],
- nextx, nexty + j * STIC_Y_SCALE, fgcolor, bgcolor);
+ nextx, nexty + j * Y_SCALE, fgcolor, bgcolor);
}
}
}
@@ -375,13 +742,13 @@ void stic_device::render_fg_bg_mode(bitmap_ind16 &bitmap)
uint16_t nextCard, memoryLocation;
uint8_t* memory;
- for (h = 0, nexty = (STIC_OVERSCAN_TOP_HEIGHT + m_row_delay) * STIC_Y_SCALE;
- h < STIC_BACKTAB_HEIGHT;
- h++, nexty += STIC_CARD_HEIGHT * STIC_Y_SCALE)
+ for (h = 0, nexty = (OVERSCAN_TOP_HEIGHT + m_row_delay) * Y_SCALE;
+ h < BACKTAB_HEIGHT;
+ h++, nexty += CARD_HEIGHT * Y_SCALE)
{
- for (w = 0, nextx = (STIC_OVERSCAN_LEFT_WIDTH + m_col_delay) * STIC_X_SCALE;
- w < STIC_BACKTAB_WIDTH;
- w++, nextx += STIC_CARD_WIDTH * STIC_X_SCALE)
+ for (w = 0, nextx = (OVERSCAN_LEFT_WIDTH + m_col_delay) * X_SCALE;
+ w < BACKTAB_WIDTH;
+ w++, nextx += CARD_WIDTH * X_SCALE)
{
nextCard = m_backtab_buffer[h][w];
fgcolor = (nextCard & STIC_FBM_FG) | FOREGROUND_BIT;
@@ -393,17 +760,17 @@ void stic_device::render_fg_bg_mode(bitmap_ind16 &bitmap)
{
memoryLocation = nextCard & STIC_FBM_C;
memory = m_grom;
- for (int j = 0; j < STIC_CARD_HEIGHT; j++)
+ for (int j = 0; j < CARD_HEIGHT; j++)
render_line(bitmap, memory[memoryLocation + j],
- nextx, nexty + j * STIC_Y_SCALE, fgcolor, bgcolor);
+ nextx, nexty + j * Y_SCALE, fgcolor, bgcolor);
}
else
{
memoryLocation = nextCard & STIC_FBM_C;
memory = m_gram;
- for (int j = 0; j < STIC_CARD_HEIGHT; j++)
+ for (int j = 0; j < CARD_HEIGHT; j++)
render_line(bitmap, memory[memoryLocation + j],
- nextx, nexty + j * STIC_Y_SCALE, fgcolor, bgcolor);
+ nextx, nexty + j * Y_SCALE, fgcolor, bgcolor);
}
}
}
@@ -418,7 +785,7 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
int16_t leftBorder, rightBorder, topBorder, bottomBorder;
int32_t nextX;
- for (int i = STIC_MOBS - 1; i >= 0; i--)
+ for (int i = MOBS - 1; i >= 0; i--)
{
intv_sprite_type *s = &m_sprite[i];
if (s->xpos == 0 || (!s->coll && !s->visible))
@@ -427,16 +794,16 @@ void stic_device::copy_sprites_to_background(bitmap_ind16 &bitmap)
borderCollision = false;
foregroundCollision = false;
- spritePixelHeight = (s->quady ? 4 : 1) * (s->doubley ? 2 : 1) * (s->doubleyres ? 2 : 1) * STIC_CARD_HEIGHT;
- width = (s->doublex ? 2 : 1) * STIC_CARD_WIDTH;
+ spritePixelHeight = (s->quady ? 4 : 1) * (s->doubley ? 2 : 1) * (s->doubleyres ? 2 : 1) * CARD_HEIGHT;
+ width = (s->doublex ? 2 : 1) * CARD_WIDTH;
- leftX = (s->xpos - STIC_CARD_WIDTH + STIC_OVERSCAN_LEFT_WIDTH + m_col_delay) * STIC_X_SCALE;
- nextY = (s->ypos - STIC_CARD_HEIGHT + STIC_OVERSCAN_TOP_HEIGHT + m_row_delay) * STIC_Y_SCALE;
+ leftX = (s->xpos - CARD_WIDTH + OVERSCAN_LEFT_WIDTH + m_col_delay) * X_SCALE;
+ nextY = (s->ypos - CARD_HEIGHT + OVERSCAN_TOP_HEIGHT + m_row_delay) * Y_SCALE;
- leftBorder = (STIC_OVERSCAN_LEFT_WIDTH + (m_left_edge_inhibit ? STIC_CARD_WIDTH : 0)) * STIC_X_SCALE;
- rightBorder = (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1 - 1) * STIC_X_SCALE;
- topBorder = (STIC_OVERSCAN_TOP_HEIGHT + (m_top_edge_inhibit ? STIC_CARD_HEIGHT : 0)) * STIC_Y_SCALE;
- bottomBorder = (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT) * STIC_Y_SCALE - 1;
+ leftBorder = (OVERSCAN_LEFT_WIDTH + (m_left_edge_inhibit ? CARD_WIDTH : 0)) * X_SCALE;
+ rightBorder = (OVERSCAN_LEFT_WIDTH + BACKTAB_WIDTH * CARD_WIDTH - 1 - 1) * X_SCALE;
+ topBorder = (OVERSCAN_TOP_HEIGHT + (m_top_edge_inhibit ? CARD_HEIGHT : 0)) * Y_SCALE;
+ bottomBorder = (OVERSCAN_TOP_HEIGHT + BACKTAB_HEIGHT * CARD_HEIGHT) * Y_SCALE - 1;
for (y = 0; y < spritePixelHeight; y++)
{
@@ -511,15 +878,15 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
int j;
- int x0 = STIC_OVERSCAN_LEFT_WIDTH + m_col_delay;
- int y0 = STIC_OVERSCAN_TOP_HEIGHT + m_row_delay;
+ int x0 = OVERSCAN_LEFT_WIDTH + m_col_delay;
+ int y0 = OVERSCAN_TOP_HEIGHT + m_row_delay;
if (m_color_stack_mode == 1)
{
m_color_stack_offset = 0;
- for(row = 0; row < STIC_BACKTAB_HEIGHT; row++)
+ for(row = 0; row < BACKTAB_HEIGHT; row++)
{
- for(col = 0; col < STIC_BACKTAB_WIDTH; col++)
+ for(col = 0; col < BACKTAB_WIDTH; col++)
{
value = m_ram16[offs];
@@ -534,21 +901,21 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
colorc = (value & STIC_CSQM_C) >> 6;
colord = ((n_bit & STIC_CSQM_D2) >> 11) + ((value & STIC_CSQM_D10) >> 9);
// color 7 if the top of the color stack in this mode
- if (colora == 7) colora = m_stic_registers[STIC_CSR + STIC_CSR3];
- if (colorb == 7) colorb = m_stic_registers[STIC_CSR + STIC_CSR3];
- if (colorc == 7) colorc = m_stic_registers[STIC_CSR + STIC_CSR3];
- if (colord == 7) colord = m_stic_registers[STIC_CSR + STIC_CSR3];
- intv_plot_box(bitmap, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, colora);
- intv_plot_box(bitmap, (x0 + col * STIC_CARD_WIDTH + STIC_CSQM_WIDTH)) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, colorb);
- intv_plot_box(bitmap, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT + STIC_CSQM_HEIGHT) * STIC_Y_SCALE, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, colorc);
- intv_plot_box(bitmap, (x0 + col * STIC_CARD_WIDTH + STIC_CSQM_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT + STIC_CSQM_HEIGHT) * STIC_Y_SCALE, STIC_CSQM_WIDTH * STIC_X_SCALE, STIC_CSQM_HEIGHT * STIC_Y_SCALE, colord);
+ if (colora == 7) colora = m_stic_registers[STIC_CSR + CSR3];
+ if (colorb == 7) colorb = m_stic_registers[STIC_CSR + CSR3];
+ if (colorc == 7) colorc = m_stic_registers[STIC_CSR + CSR3];
+ if (colord == 7) colord = m_stic_registers[STIC_CSR + CSR3];
+ intv_plot_box(bitmap, (x0 + col * CARD_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT) * Y_SCALE, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, colora);
+ intv_plot_box(bitmap, (x0 + col * CARD_WIDTH + STIC_CSQM_WIDTH)) * X_SCALE, (y0 + row * CARD_HEIGHT) * Y_SCALE, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, colorb);
+ intv_plot_box(bitmap, (x0 + col * CARD_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT + STIC_CSQM_HEIGHT) * Y_SCALE, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, colorc);
+ intv_plot_box(bitmap, (x0 + col * CARD_WIDTH + STIC_CSQM_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT + STIC_CSQM_HEIGHT) * Y_SCALE, STIC_CSQM_WIDTH * X_SCALE, STIC_CSQM_HEIGHT * Y_SCALE, colord);
}
else // normal color stack mode
{
if (n_bit) // next color
{
m_color_stack_offset += 1;
- m_color_stack_offset &= (STIC_CSRS - 1);
+ m_color_stack_offset &= (CSRS - 1);
}
if (p_bit) // pastel color set
@@ -574,12 +941,12 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
drawgfx(bitmap,m_gfxdecode->gfx(1),
code,
bgcolor*16+fgcolor,
- 0,0, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE,
+ 0,0, (x0 + col * CARD_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT) * Y_SCALE,
0,transparency,bgcolor);
for(j=0;j<8;j++)
{
- //intv_set_pixel(bitmap, (x0 + col * STIC_CARD_WIDTH + j) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT + 7) * STIC_Y_SCALE + 1, 1);
+ //intv_set_pixel(bitmap, (x0 + col * CARD_WIDTH + j) * X_SCALE, (y0 + row * CARD_HEIGHT + 7) * Y_SCALE + 1, 1);
}
}
@@ -588,12 +955,12 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
drawgfx(bitmap,m_gfxdecode->gfx(0),
code,
bgcolor*16+fgcolor,
- 0,0, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE,
+ 0,0, (x0 + col * CARD_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT) * Y_SCALE,
0,transparency,bgcolor);
for(j=0;j<8;j++)
{
- //intv_set_pixel(bitmap, (x0 + col * STIC_CARD_WIDTH + j) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT + 7) * STIC_Y_SCALE + 1, 2);
+ //intv_set_pixel(bitmap, (x0 + col * CARD_WIDTH + j) * X_SCALE, (y0 + row * CARD_HEIGHT + 7) * Y_SCALE + 1, 2);
}
}
}
@@ -604,9 +971,9 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
else
{
// fg/bg mode goes here
- for(row = 0; row < STIC_BACKTAB_HEIGHT; row++)
+ for(row = 0; row < BACKTAB_HEIGHT; row++)
{
- for(col = 0; col < STIC_BACKTAB_WIDTH; col++)
+ for(col = 0; col < BACKTAB_WIDTH; col++)
{
value = m_ram16[offs];
fgcolor = value & STIC_FBM_FG;
@@ -627,7 +994,7 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
drawgfx(bitmap,m_gfxdecode->gfx(1),
code,
bgcolor*16+fgcolor,
- 0,0, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE,
+ 0,0, (x0 + col * CARD_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT) * Y_SCALE,
0,transparency,bgcolor);
}
else // read from GROM
@@ -635,7 +1002,7 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
drawgfx(bitmap,m_gfxdecode->gfx(0),
code,
bgcolor*16+fgcolor,
- 0,0, (x0 + col * STIC_CARD_WIDTH) * STIC_X_SCALE, (y0 + row * STIC_CARD_HEIGHT) * STIC_Y_SCALE,
+ 0,0, (x0 + col * CARD_WIDTH) * X_SCALE, (y0 + row * CARD_HEIGHT) * Y_SCALE,
0,transparency,bgcolor);
}
offs++;
@@ -650,10 +1017,10 @@ void stic_device::draw_background(bitmap_ind16 &bitmap, int transparency)
void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
{
int code;
- int x0 = STIC_OVERSCAN_LEFT_WIDTH + m_col_delay - STIC_CARD_WIDTH;
- int y0 = STIC_OVERSCAN_TOP_HEIGHT + m_row_delay - STIC_CARD_HEIGHT;
+ int x0 = OVERSCAN_LEFT_WIDTH + m_col_delay - CARD_WIDTH;
+ int y0 = OVERSCAN_TOP_HEIGHT + m_row_delay - CARD_HEIGHT;
- for (int i = STIC_MOBS - 1; i >= 0; --i)
+ for (int i = MOBS - 1; i >= 0; --i)
{
intv_sprite_type *s = &m_sprite[i];
if (s->visible && (s->behind_foreground == behind_foreground))
@@ -677,7 +1044,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
code,
s->color,
s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE,
+ (s->xpos + x0) * X_SCALE, (s->ypos + y0) * Y_SCALE,
0x8000 * s->xsize, 0x8000 * s->ysize,0);
}
else
@@ -700,13 +1067,13 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
code,
s->color,
s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
+ (s->xpos + x0) * X_SCALE, (s->ypos + y0) * Y_SCALE + s->yflip * s->ysize * CARD_HEIGHT,
0x8000*s->xsize, 0x8000*s->ysize,0);
m_gfxdecode->gfx(1)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code+1,
s->color,
s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + (1 - s->yflip) * s->ysize * STIC_CARD_HEIGHT,
+ (s->xpos + x0) * X_SCALE, (s->ypos + y0) * Y_SCALE + (1 - s->yflip) * s->ysize * CARD_HEIGHT,
0x8000*s->xsize, 0x8000*s->ysize,0);
}
}
@@ -719,7 +1086,7 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
code,
s->color,
s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE,
+ (s->xpos + x0) * X_SCALE, (s->ypos + y0) * Y_SCALE,
0x8000*s->xsize, 0x8000*s->ysize,0);
}
else
@@ -728,13 +1095,13 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
code,
s->color,
s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + s->yflip * s->ysize * STIC_CARD_HEIGHT,
+ (s->xpos + x0) * X_SCALE, (s->ypos + y0) * Y_SCALE + s->yflip * s->ysize * CARD_HEIGHT,
0x8000*s->xsize, 0x8000*s->ysize,0);
m_gfxdecode->gfx(0)->zoom_transpen(bitmap,&machine().screen[0].visarea,
code+1,
s->color,
s->xflip,s->yflip,
- (s->xpos + x0) * STIC_X_SCALE, (s->ypos + y0) * STIC_Y_SCALE + (1 - s->yflip) * s->ysize * STIC_CARD_HEIGHT,
+ (s->xpos + x0) * X_SCALE, (s->ypos + y0) * Y_SCALE + (1 - s->yflip) * s->ysize * CARD_HEIGHT,
0x8000*s->xsize, 0x8000*s->ysize,0);
}
}
@@ -745,11 +1112,11 @@ void stic_device::draw_sprites(bitmap_ind16 &bitmap, int behind_foreground)
void stic_device::draw_borders(bitmap_ind16 &bitmap)
{
- intv_plot_box(bitmap, 0, 0, (STIC_OVERSCAN_LEFT_WIDTH + (m_left_edge_inhibit ? STIC_CARD_WIDTH : m_col_delay)) * STIC_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT + STIC_OVERSCAN_BOTTOM_HEIGHT) * STIC_Y_SCALE, m_border_color);
- intv_plot_box(bitmap, (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1) * STIC_X_SCALE, 0, STIC_OVERSCAN_RIGHT_WIDTH, (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT + STIC_OVERSCAN_BOTTOM_HEIGHT) * STIC_Y_SCALE, m_border_color);
+ intv_plot_box(bitmap, 0, 0, (OVERSCAN_LEFT_WIDTH + (m_left_edge_inhibit ? CARD_WIDTH : m_col_delay)) * X_SCALE, (OVERSCAN_TOP_HEIGHT + BACKTAB_HEIGHT * CARD_HEIGHT + OVERSCAN_BOTTOM_HEIGHT) * Y_SCALE, m_border_color);
+ intv_plot_box(bitmap, (OVERSCAN_LEFT_WIDTH + BACKTAB_WIDTH * CARD_WIDTH - 1) * X_SCALE, 0, OVERSCAN_RIGHT_WIDTH, (OVERSCAN_TOP_HEIGHT + BACKTAB_HEIGHT * CARD_HEIGHT + OVERSCAN_BOTTOM_HEIGHT) * Y_SCALE, m_border_color);
- intv_plot_box(bitmap, 0, 0, (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1 + STIC_OVERSCAN_RIGHT_WIDTH) * STIC_X_SCALE, (STIC_OVERSCAN_TOP_HEIGHT + (m_top_edge_inhibit ? STIC_CARD_HEIGHT : m_row_delay)) * STIC_Y_SCALE, m_border_color);
- intv_plot_box(bitmap, 0, (STIC_OVERSCAN_TOP_HEIGHT + STIC_BACKTAB_HEIGHT * STIC_CARD_HEIGHT) * STIC_Y_SCALE, (STIC_OVERSCAN_LEFT_WIDTH + STIC_BACKTAB_WIDTH * STIC_CARD_WIDTH - 1 + STIC_OVERSCAN_RIGHT_WIDTH) * STIC_X_SCALE, STIC_OVERSCAN_BOTTOM_HEIGHT * STIC_Y_SCALE, m_border_color);
+ intv_plot_box(bitmap, 0, 0, (OVERSCAN_LEFT_WIDTH + BACKTAB_WIDTH * CARD_WIDTH - 1 + OVERSCAN_RIGHT_WIDTH) * X_SCALE, (OVERSCAN_TOP_HEIGHT + (m_top_edge_inhibit ? CARD_HEIGHT : m_row_delay)) * Y_SCALE, m_border_color);
+ intv_plot_box(bitmap, 0, (OVERSCAN_TOP_HEIGHT + BACKTAB_HEIGHT * CARD_HEIGHT) * Y_SCALE, (OVERSCAN_LEFT_WIDTH + BACKTAB_WIDTH * CARD_WIDTH - 1 + OVERSCAN_RIGHT_WIDTH) * X_SCALE, OVERSCAN_BOTTOM_HEIGHT * Y_SCALE, m_border_color);
}
void stic_device::screenrefresh()
@@ -766,7 +1133,7 @@ void stic_device::screenrefresh()
// Copy the sprites to the background
copy_sprites_to_background(m_bitmap);
determine_sprite_collisions();
- for (int i = 0; i < STIC_MOBS; i++)
+ for (int i = 0; i < MOBS; i++)
m_stic_registers[STIC_MCR + i] |= m_sprite[i].collision;
/* draw the screen borders if enabled */
draw_borders(m_bitmap);
@@ -785,41 +1152,41 @@ READ16_MEMBER( stic_device::read )
//logerror("%x = stic_r(%x)\n",0,offset);
switch (offset)
{
- case STIC_MXR + STIC_MOB0:
- case STIC_MXR + STIC_MOB1:
- case STIC_MXR + STIC_MOB2:
- case STIC_MXR + STIC_MOB3:
- case STIC_MXR + STIC_MOB4:
- case STIC_MXR + STIC_MOB5:
- case STIC_MXR + STIC_MOB6:
- case STIC_MXR + STIC_MOB7:
+ case STIC_MXR + MOB0:
+ case STIC_MXR + MOB1:
+ case STIC_MXR + MOB2:
+ case STIC_MXR + MOB3:
+ case STIC_MXR + MOB4:
+ case STIC_MXR + MOB5:
+ case STIC_MXR + MOB6:
+ case STIC_MXR + MOB7:
return 0x3800 | (m_stic_registers[offset] & 0x07FF);
- case STIC_MYR + STIC_MOB0:
- case STIC_MYR + STIC_MOB1:
- case STIC_MYR + STIC_MOB2:
- case STIC_MYR + STIC_MOB3:
- case STIC_MYR + STIC_MOB4:
- case STIC_MYR + STIC_MOB5:
- case STIC_MYR + STIC_MOB6:
- case STIC_MYR + STIC_MOB7:
+ case STIC_MYR + MOB0:
+ case STIC_MYR + MOB1:
+ case STIC_MYR + MOB2:
+ case STIC_MYR + MOB3:
+ case STIC_MYR + MOB4:
+ case STIC_MYR + MOB5:
+ case STIC_MYR + MOB6:
+ case STIC_MYR + MOB7:
return 0x3000 | (m_stic_registers[offset] & 0x0FFF);
- case STIC_MAR + STIC_MOB0:
- case STIC_MAR + STIC_MOB1:
- case STIC_MAR + STIC_MOB2:
- case STIC_MAR + STIC_MOB3:
- case STIC_MAR + STIC_MOB4:
- case STIC_MAR + STIC_MOB5:
- case STIC_MAR + STIC_MOB6:
- case STIC_MAR + STIC_MOB7:
+ case STIC_MAR + MOB0:
+ case STIC_MAR + MOB1:
+ case STIC_MAR + MOB2:
+ case STIC_MAR + MOB3:
+ case STIC_MAR + MOB4:
+ case STIC_MAR + MOB5:
+ case STIC_MAR + MOB6:
+ case STIC_MAR + MOB7:
return m_stic_registers[offset] & 0x3FFF;
- case STIC_MCR + STIC_MOB0:
- case STIC_MCR + STIC_MOB1:
- case STIC_MCR + STIC_MOB2:
- case STIC_MCR + STIC_MOB3:
- case STIC_MCR + STIC_MOB4:
- case STIC_MCR + STIC_MOB5:
- case STIC_MCR + STIC_MOB6:
- case STIC_MCR + STIC_MOB7:
+ case STIC_MCR + MOB0:
+ case STIC_MCR + MOB1:
+ case STIC_MCR + MOB2:
+ case STIC_MCR + MOB3:
+ case STIC_MCR + MOB4:
+ case STIC_MCR + MOB5:
+ case STIC_MCR + MOB6:
+ case STIC_MCR + MOB7:
return 0x3C00 | (m_stic_registers[offset] & 0x03FF);
case STIC_GMR:
m_color_stack_mode = 1;
@@ -827,10 +1194,10 @@ READ16_MEMBER( stic_device::read )
/*** fall through ***/
case STIC_DER:
return 0x3FFF;
- case STIC_CSR + STIC_CSR0:
- case STIC_CSR + STIC_CSR1:
- case STIC_CSR + STIC_CSR2:
- case STIC_CSR + STIC_CSR3:
+ case STIC_CSR + CSR0:
+ case STIC_CSR + CSR1:
+ case STIC_CSR + CSR2:
+ case STIC_CSR + CSR3:
case STIC_BCR:
return 0x3FF0 | (m_stic_registers[offset] & 0x000F);
case STIC_HDR:
@@ -852,30 +1219,30 @@ WRITE16_MEMBER( stic_device::write )
switch (offset)
{
// X Positions
- case STIC_MXR + STIC_MOB0:
- case STIC_MXR + STIC_MOB1:
- case STIC_MXR + STIC_MOB2:
- case STIC_MXR + STIC_MOB3:
- case STIC_MXR + STIC_MOB4:
- case STIC_MXR + STIC_MOB5:
- case STIC_MXR + STIC_MOB6:
- case STIC_MXR + STIC_MOB7:
- s = &m_sprite[offset & (STIC_MOBS - 1)];
+ case STIC_MXR + MOB0:
+ case STIC_MXR + MOB1:
+ case STIC_MXR + MOB2:
+ case STIC_MXR + MOB3:
+ case STIC_MXR + MOB4:
+ case STIC_MXR + MOB5:
+ case STIC_MXR + MOB6:
+ case STIC_MXR + MOB7:
+ s = &m_sprite[offset & (MOBS - 1)];
s->doublex = !!(data & STIC_MXR_XSIZE);
s->visible = !!(data & STIC_MXR_VIS);
s->coll = !!(data & STIC_MXR_COL);
s->xpos = (data & STIC_MXR_X);
break;
// Y Positions
- case STIC_MYR + STIC_MOB0:
- case STIC_MYR + STIC_MOB1:
- case STIC_MYR + STIC_MOB2:
- case STIC_MYR + STIC_MOB3:
- case STIC_MYR + STIC_MOB4:
- case STIC_MYR + STIC_MOB5:
- case STIC_MYR + STIC_MOB6:
- case STIC_MYR + STIC_MOB7:
- s = &m_sprite[offset & (STIC_MOBS - 1)];
+ case STIC_MYR + MOB0:
+ case STIC_MYR + MOB1:
+ case STIC_MYR + MOB2:
+ case STIC_MYR + MOB3:
+ case STIC_MYR + MOB4:
+ case STIC_MYR + MOB5:
+ case STIC_MYR + MOB6:
+ case STIC_MYR + MOB7:
+ s = &m_sprite[offset & (MOBS - 1)];
s->yflip = !!(data & STIC_MYR_YFLIP);
s->xflip = !!(data & STIC_MYR_XFLIP);
s->quady = !!(data & STIC_MYR_YSIZE);
@@ -884,32 +1251,32 @@ WRITE16_MEMBER( stic_device::write )
s->ypos = (data & STIC_MYR_Y);
break;
// Attributes
- case STIC_MAR + STIC_MOB0:
- case STIC_MAR + STIC_MOB1:
- case STIC_MAR + STIC_MOB2:
- case STIC_MAR + STIC_MOB3:
- case STIC_MAR + STIC_MOB4:
- case STIC_MAR + STIC_MOB5:
- case STIC_MAR + STIC_MOB6:
- case STIC_MAR + STIC_MOB7:
- s = &m_sprite[offset & (STIC_MOBS - 1)];
+ case STIC_MAR + MOB0:
+ case STIC_MAR + MOB1:
+ case STIC_MAR + MOB2:
+ case STIC_MAR + MOB3:
+ case STIC_MAR + MOB4:
+ case STIC_MAR + MOB5:
+ case STIC_MAR + MOB6:
+ case STIC_MAR + MOB7:
+ s = &m_sprite[offset & (MOBS - 1)];
s->behind_foreground = !!(data & STIC_MAR_PRI);
s->grom = !(data & STIC_MAR_SEL);
s->card = ((data & STIC_MAR_C) >> 3);
s->color = ((data & STIC_MAR_FG3) >> 9) | (data & STIC_MAR_FG20);
break;
// Collision Detection - TBD
- case STIC_MCR + STIC_MOB0:
- case STIC_MCR + STIC_MOB1:
- case STIC_MCR + STIC_MOB2:
- case STIC_MCR + STIC_MOB3:
- case STIC_MCR + STIC_MOB4:
- case STIC_MCR + STIC_MOB5:
- case STIC_MCR + STIC_MOB6:
- case STIC_MCR + STIC_MOB7:
+ case STIC_MCR + MOB0:
+ case STIC_MCR + MOB1:
+ case STIC_MCR + MOB2:
+ case STIC_MCR + MOB3:
+ case STIC_MCR + MOB4:
+ case STIC_MCR + MOB5:
+ case STIC_MCR + MOB6:
+ case STIC_MCR + MOB7:
// a MOB's own collision bit is *always* zero, even if a
// one is poked into it
- data &= ~(1 << (offset & (STIC_MOBS - 1)));
+ data &= ~(1 << (offset & (MOBS - 1)));
break;
// Display enable
case STIC_DER:
@@ -921,11 +1288,11 @@ WRITE16_MEMBER( stic_device::write )
m_color_stack_mode = 0;
break;
// Color Stack
- case STIC_CSR + STIC_CSR0:
- case STIC_CSR + STIC_CSR1:
- case STIC_CSR + STIC_CSR2:
- case STIC_CSR + STIC_CSR3:
- //logerror("Setting color_stack[%x] = %x (%x)\n", offset & (STIC_CSRS - 1),data & STIC_CSR_BG, space.device().safe_pc());
+ case STIC_CSR + CSR0:
+ case STIC_CSR + CSR1:
+ case STIC_CSR + CSR2:
+ case STIC_CSR + CSR3:
+ //logerror("Setting color_stack[%x] = %x (%x)\n", offset & (CSRS - 1),data & STIC_CSR_BG, space.device().safe_pc());
break;
// Border Color
case STIC_BCR:
diff --git a/src/mame/video/stic.h b/src/mame/video/stic.h
index 14b1bf1999e..b09422591c1 100644
--- a/src/mame/video/stic.h
+++ b/src/mame/video/stic.h
@@ -6,20 +6,8 @@
*
****************************************************************************/
-#ifndef STIC_H_
-#define STIC_H_
-
-// GROM/GRAM cards are 8x8
-#define STIC_CARD_WIDTH 8
-#define STIC_CARD_HEIGHT 8
-
-// Intellivision resolution is 20x12 BACKTAB CARDs, minus the rightmost column,
-// for an effective resolution of (19 * 8 + 1 * 7) x (12 * 8) == 159x96.
-//
-// MOB scanline height can be half of a card scanline height, so y-coordinates
-// are scaled by 2.
-#define STIC_X_SCALE 1
-#define STIC_Y_SCALE 2
+#ifndef MAME_VIDEO_STIC_H
+#define MAME_VIDEO_STIC_H
// the Intellivision emulation scales to match the output format at the last
// step. The Intellivision keyboard component appears to be 320x96, but can
@@ -30,425 +18,6 @@
#define INTVKBD_X_SCALE 2
#define INTVKBD_Y_SCALE INTV_Y_SCALE
-// overscan sizes in intv pixels
-// these values are approximate.
-#define STIC_OVERSCAN_LEFT_WIDTH 13
-#define STIC_OVERSCAN_RIGHT_WIDTH 17
-#define STIC_OVERSCAN_TOP_HEIGHT 12
-#define STIC_OVERSCAN_BOTTOM_HEIGHT 12
-
-//Timing constants based on Joe Zbiciak's documentation
-#define STIC_CYCLES_PER_SCANLINE 57
-#define STIC_ROW_BUSRQ 110 // CPU paused during backtab row buffering
-#define STIC_FRAME_BUSRQ 42 // CPU paused just after end of vblank and before first row fetch (approximate)
-#define STIC_VBLANK_END 3790
-#define STIC_FIRST_FETCH 3933
-
-/*** STIC registers *********************************************************/
-
-// number of STIC registers
-#define STIC_REGISTERS 0x33
-
-// STIC MOBs (Moveable OBjects)
-enum
-{
- STIC_MOB0,
- STIC_MOB1,
- STIC_MOB2,
- STIC_MOB3,
- STIC_MOB4,
- STIC_MOB5,
- STIC_MOB6,
- STIC_MOB7,
-
- STIC_MOBS
-};
-
-// STIC Color Stack
-enum
-{
- STIC_CSR0,
- STIC_CSR1,
- STIC_CSR2,
- STIC_CSR3,
-
- STIC_CSRS
-};
-
-/****************************************************************************
- * *
- * MXR 0000[..0007] MOB X REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-----+---+---+--+--+--+--+--+--+--+--+ *
- * | | | | | |XSIZE|VIS|COL|X7|X6|X5|X4|X3|X2|X1|X0| *
- * +-+-+-+-+-+-----+---+---+--+--+--+--+--+--+--+--+ *
- * *
- * Xn x-position [0..255] *
- * COL collision detection [1=enable] *
- * VIS visibility [1=visible] *
- * XSIZE double width [1=double] *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. If X=0, the sprite is not visible and does not register collisions. *
- * 2. The horizontal handle is 8 pixels from the left of the sprite, *
- * regardless of width. *
- * *
- ****************************************************************************/
-#define STIC_MXR 0x0000
-
-#define STIC_MXR_XSIZE 0x0400
-#define STIC_MXR_VIS 0x0200
-#define STIC_MXR_COL 0x0100
-#define STIC_MXR_X 0x00FF
-
-/****************************************************************************
- * *
- * MYR 0008[..000F] MOB Y REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-----+-----+-----+-----+----+--+--+--+--+--+--+--+ *
- * | | | | |YFLIP|XFLIP|YSIZE|YFULL|YRES|Y6|Y5|Y4|Y3|Y2|Y1|Y0| *
- * +-+-+-+-+-----+-----+-----+-----+----+--+--+--+--+--+--+--+ *
- * *
- * Yn y-position [0..127] *
- * YRES y-resolution [0=8 scanlines,1=16 scanlines] *
- * YFULL double scanline height [1=double] *
- * YSIZE quadruple scanline height [1=quadruple] *
- * XFLIP horizontally flip image [1=flip] *
- * YFLIP vertically flip image [1=flip] *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. A sprite with YRES=1 will display two cards. *
- * 2. A sprite with YFULL=0 and YSIZE=0 will have scanlines half the *
- * height of a background card. *
- * 3, The minimum size of a sprite is 8x8 (XSIZE=YRES=YSIZE=YFULL=0). *
- * 4. The maximum size of a sprite is 16x128 (XSIZE=YRES=YSIZE=YFULL=1). *
- * 5. The Y-position is measured in double height scanlines. *
- * 6. The vertical handle is 8 double height scanlines from the top of the *
- * sprite, regardless of height. *
- * *
- ****************************************************************************/
-#define STIC_MYR 0x0008
-
-#define STIC_MYR_YFLIP 0x0800
-#define STIC_MYR_XFLIP 0x0400
-#define STIC_MYR_YSIZE 0x0200
-#define STIC_MYR_YFULL 0x0100
-#define STIC_MYR_YRES 0x0080
-#define STIC_MYR_Y 0x007F
-
-/****************************************************************************
- * *
- * SAR 0010[..0017] MOB ATTRIBUTE REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+---+---+---+-+-+--+--+--+--+--+--+---+---+---+ *
- * | | |PRI|FG3|SEL| | |C5|C4|C3|C2|C1|C0|FG2|FG1|FG0| *
- * +-+-+---+---+---+-+-+--+--+--+--+--+--+---+---+---+ *
- * *
- * FGn foreground color [0..15] *
- * Cn card # [0..63] *
- * SEL card memory select [0=GROM, 1=GRAM] *
- * PRI sprite priority [1=behind set background bit] *
- * *
- ****************************************************************************/
-#define STIC_MAR 0x0010
-
-#define STIC_MAR_PRI 0x2000
-#define STIC_MAR_FG3 0x1000
-#define STIC_MAR_SEL 0x0800
-#define STIC_MAR_C 0x07F8
-#define STIC_MAR_FG20 0x0007
-
-/****************************************************************************
- * *
- * SCR 0018[..001F] MOB COLLISION REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+----+----+----+----+----+----+----+----+----+----+ *
- * | | | | | | |BRDR|BKGD|SPR7|SPR6|SPR5|SPR4|SPR3|SPR2|SPR1|SPR0| *
- * +-+-+-+-+-+-+----+----+----+----+----+----+----+----+----+----+ *
- * *
- * SPRn 1=collision with sprite #n *
- * BKGD 1=collision with set background bit *
- * BRDR 1=collision with screen border *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. All collisions are latched. Successive reads read from the latch. *
- * A write will reset the latch. *
- * 2. Sprites with VIS=0 register collisions. *
- * 3. Sprites with X=0 do not register collisions. *
- * 4. Two overlapping sprites with different priorities, one completely *
- * hidden behind the background, still register a collision. *
- * *
- ****************************************************************************/
-#define STIC_MCR 0x0018
-
-#define STIC_MCR_BRDR 0x0200
-#define STIC_MCR_BKGD 0x0100
-#define STIC_MCR_SPR7 0x0080
-#define STIC_MCR_SPR6 0x0040
-#define STIC_MCR_SPR5 0x0020
-#define STIC_MCR_SPR4 0x0010
-#define STIC_MCR_SPR3 0x0008
-#define STIC_MCR_SPR2 0x0004
-#define STIC_MCR_SPR1 0x0002
-#define STIC_MCR_SPR0 0x0001
-
-/****************************************************************************
- * *
- * DER 0021 DISPLAY ENABLE REGISTER W *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
- * | | | | | | | | | | | | | | | | | *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. Any write during VBLANK enables STIC output. *
- * *
- ****************************************************************************/
-#define STIC_DER 0x0020
-
-/****************************************************************************
- * *
- * GMR 0021 GRAPHICS MODE REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
- * | | | | | | | | | | | | | | | | | *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. Any write during VBLANK enables FOREGROUND/BACKGROUND mode. *
- * 2. Any read during VBLANK enables COLOR STACK/COLORED SQUARES mode. *
- * *
- ****************************************************************************/
-#define STIC_GMR 0x0021
-
-/****************************************************************************
- * *
- * CSR 0028 COLOR STACK REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
- * | | | | | | | | | | | | |BG3|BG2|BG1|BG0| *
- * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
- * *
- * BGn background color [0..15] *
- * *
- ****************************************************************************/
-#define STIC_CSR 0x0028
-
-#define STIC_CSR_BG 0x000F
-
-/****************************************************************************
- * *
- * BCR 002C BORDER COLOR REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
- * | | | | | | | | | | | | |BC3|BC2|BC1|BC0| *
- * +-+-+-+-+-+-+-+-+-+-+-+-+---+---+---+---+ *
- * *
- * BCn border color [0..15] *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. Affects overscan, and column and row blockouts. *
- * *
- ****************************************************************************/
-#define STIC_BCR 0x002C
-
-#define STIC_BCR_BC 0x000F
-
-/****************************************************************************
- * *
- * HDR 0030 HORIZONTAL DELAY REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
- * | | | | | | | | | | | | | |DEL2|DEL1|DEL0| *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
- * *
- * DELn horizontal delay [0..7] *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. Affects both BACKTAB and MOBs. *
- * *
- ****************************************************************************/
-#define STIC_HDR 0x0030
-
-#define STIC_HDR_DEL 0x0007
-
-/****************************************************************************
- * *
- * STIC_VDR 0030 VERTICAL DELAY REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
- * | | | | | | | | | | | | | |DEL2|DEL1|DEL0| *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+----+----+----+ *
- * *
- * DELn vertical delay [0..7] *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. Affects both BACKTAB and MOBs. *
- * *
- ****************************************************************************/
-#define STIC_VDR 0x0031
-
-#define STIC_VDR_DEL 0x0007
-
-/****************************************************************************
- * *
- * STIC_CBR 0032 CARD BLOCKOUT REGISTER RW *
- * *
- * (MSB) (LSB) *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+---+---+ *
- * | | | | | | | | | | | | | | |ROW|COL| *
- * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+---+---+ *
- * *
- * COL blockout first card column [1=blockout] *
- * ROW blockout first card row [1=blockout] *
- * *
- ****************************************************************************
- * *
- * NOTES *
- * *
- * 1. Generally used in conjunction with HDR and VDR registers, to achieve *
- * smooth scrolling. *
- * *
- ****************************************************************************/
-#define STIC_CBR 0x0032
-
-#define STIC_CBR_ROW 0x0002
-#define STIC_CBR_COL 0x0001
-
-/*** BACKTAB ****************************************************************/
-
-// BACKTAB is made up of 20x12 cards
-// (the first 19 columns are 8x8, the 20th column is 7x8)
-#define STIC_BACKTAB_WIDTH 20
-#define STIC_BACKTAB_HEIGHT 12
-
-/****************************************************************************
- * *
- * FOREGROUND/BACKGROUND MODE *
- * *
- * (MSB) (LSB) *
- * +-+-+---+---+---+---+---+--+--+--+--+--+--+---+---+---+ *
- * | | |BG2|BG3|SEL|BG1|BG0|C5|C4|C3|C2|C1|C0|FG2|FG1|FG0| *
- * +-+-+---+---+---+---+---+--+--+--+--+--+--+---+---+---+ *
- * *
- * FGn foreground color [0..7] *
- * Cn card # [0..63] *
- * SEL card memory select [0=GROM, 1=GRAM] *
- * BGn background color [0..15] *
- * *
- ****************************************************************************/
-#define STIC_FBM_BG2 0x2000
-#define STIC_FBM_BG310 0x1600
-#define STIC_FBM_SEL 0x0800
-#define STIC_FBM_C 0x01F8
-#define STIC_FBM_FG 0x0007
-
-/****************************************************************************
- * *
- * COLOR STACK MODE *
- * *
- * (MSB) (LSB) *
- * +-+-+---+---+---+--+--+--+--+--+--+--+--+---+---+---+ *
- * | | |ADV|FG3|SEL|C7|C6|C5|C4|C3|C2|C1|C0|FG2|FG1|FG0| *
- * +-+-+---+---+---+--+--+--+--+--+--+--+--+---+---+---+ *
- * *
- * FGn foreground color [0..15] *
- * Cn card # [GROM=0..212, GRAM=0..63] *
- * SEL card memory select [0=GROM, 1=GRAM] *
- * ADV advance color stack index [1=advance] *
- * *
- ****************************************************************************
- * *
- * NOTES: *
- * *
- * 1. When FG3=1 and SEL=0, COLORED SQUARES MODE is enabled. *
- * 2. When SEL=1, C7 and C6 can be used as user-defined flags. *
- * *
- ****************************************************************************/
-#define STIC_CSTM_ADV 0x2000
-#define STIC_CSTM_FG3 0x1000
-#define STIC_CSTM_SEL 0x0800
-#define STIC_CSTM_C7 0x0400
-#define STIC_CSTM_C6 0x0200
-#define STIC_CSTM_C50 0x01F8
-#define STIC_CSTM_FG20 0x0007
-
-#define STIC_CSTM_C (STIC_CSTM_C7|STIC_CSTM_C6|STIC_CSTM_C50)
-
-/****************************************************************************
- * *
- * COLORED SQUARES MODE *
- * *
- * (MSB) (LSB) *
- * +-+-+--+-+-+--+--+--+--+--+--+--+--+--+--+--+ *
- * | | |D2|1|0|D1|D0|C2|C1|C0|B2|B1|B0|A2|A1|A0| *
- * +-+-+--+-+-+--+--+--+--+--+--+--+--+--+--+--+ *
- * *
- * An color a [0..7] *
- * Bn color b [0..7] *
- * Cn color c [0..7] *
- * Dn color d [0..7] *
- * *
- ****************************************************************************
- * *
- * NOTES: *
- * *
- * 1. Each color corresponds to one of the following 4 x 4 squares: *
- * *
- * +---+---+ *
- * | a | b | *
- * +---+---+ *
- * | c | d | *
- * +---+---+ *
- * *
- * 2. When color 7 is specified, the color is taken from the color stack. *
- * *
- ****************************************************************************/
-#define STIC_CSQM_D2 0x2000
-#define STIC_CSQM_D10 0x0600
-#define STIC_CSQM_C 0x01C0
-#define STIC_CSQM_B 0x0038
-#define STIC_CSQM_A 0x0007
-
-#define STIC_CSQM_WIDTH (STIC_CARD_WIDTH / 2)
-#define STIC_CSQM_HEIGHT (STIC_CARD_HEIGHT / 2)
-
-
-
struct intv_sprite_type
{
int visible;
@@ -475,6 +44,42 @@ struct intv_sprite_type
class stic_device : public device_t
{
public:
+ // GROM/GRAM cards are 8x8
+ static constexpr unsigned CARD_WIDTH = 8;
+ static constexpr unsigned CARD_HEIGHT = 8;
+
+ // Intellivision resolution is 20x12 BACKTAB CARDs, minus the rightmost column,
+ // for an effective resolution of (19 * 8 + 1 * 7) x (12 * 8) == 159x96.
+ //
+ // MOB scanline height can be half of a card scanline height, so y-coordinates
+ // are scaled by 2.
+ static constexpr unsigned X_SCALE = 1;
+ static constexpr unsigned Y_SCALE = 2;
+
+ // overscan sizes in intv pixels
+ // these values are approximate.
+ static constexpr unsigned OVERSCAN_LEFT_WIDTH = 13;
+ static constexpr unsigned OVERSCAN_RIGHT_WIDTH = 17;
+ static constexpr unsigned OVERSCAN_TOP_HEIGHT = 12;
+ static constexpr unsigned OVERSCAN_BOTTOM_HEIGHT = 12;
+
+ //Timing constants based on Joe Zbiciak's documentation
+ static constexpr int CYCLES_PER_SCANLINE = 57;
+ static constexpr int ROW_BUSRQ = 110; // CPU paused during backtab row buffering
+ static constexpr int FRAME_BUSRQ = 42; // CPU paused just after end of vblank and before first row fetch (approximate)
+ static constexpr int VBLANK_END = 3790;
+ static constexpr int FIRST_FETCH = 3933;
+
+ /*** BACKTAB ****************************************************************/
+
+ // BACKTAB is made up of 20x12 cards
+ // (the first 19 columns are 8x8, the 20th column is 7x8)
+ static constexpr unsigned BACKTAB_WIDTH = 20;
+ static constexpr unsigned BACKTAB_HEIGHT = 12;
+
+ static constexpr unsigned SCREEN_WIDTH = (OVERSCAN_LEFT_WIDTH + (BACKTAB_WIDTH * CARD_WIDTH) - 1 + OVERSCAN_RIGHT_WIDTH) * X_SCALE;
+ static constexpr unsigned SCREEN_HEIGHT = (OVERSCAN_TOP_HEIGHT + (BACKTAB_HEIGHT * CARD_HEIGHT) + OVERSCAN_BOTTOM_HEIGHT) * Y_SCALE;
+
// construction/destruction
stic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~stic_device();
@@ -500,6 +105,37 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
private:
+ /*** STIC registers *********************************************************/
+
+ // number of STIC registers
+ static constexpr unsigned STIC_REGISTERS = 0x33;
+
+ // STIC MOBs (Moveable OBjects)
+ enum
+ {
+ MOB0,
+ MOB1,
+ MOB2,
+ MOB3,
+ MOB4,
+ MOB5,
+ MOB6,
+ MOB7,
+
+ MOBS
+ };
+
+ // STIC Color Stack
+ enum
+ {
+ CSR0,
+ CSR1,
+ CSR2,
+ CSR3,
+
+ CSRS
+ };
+
required_region_ptr<uint8_t> m_grom;
@@ -524,9 +160,9 @@ private:
bitmap_ind16 m_bitmap;
- intv_sprite_type m_sprite[STIC_MOBS];
- uint8_t m_sprite_buffers[STIC_MOBS][STIC_CARD_WIDTH * 2][STIC_CARD_HEIGHT * 4 * 2 * 2];
- uint16_t m_backtab_buffer[STIC_BACKTAB_HEIGHT][STIC_BACKTAB_WIDTH];
+ intv_sprite_type m_sprite[MOBS];
+ uint8_t m_sprite_buffers[MOBS][CARD_WIDTH * 2][CARD_HEIGHT * 4 * 2 * 2];
+ uint16_t m_backtab_buffer[BACKTAB_HEIGHT][BACKTAB_WIDTH];
int m_color_stack_mode;
int m_stic_registers[STIC_REGISTERS];
int m_color_stack_offset;
@@ -545,7 +181,7 @@ private:
};
// device type definition
-extern const device_type STIC;
+DECLARE_DEVICE_TYPE(STIC, stic_device)
/***************************************************************************
@@ -556,4 +192,4 @@ extern const device_type STIC;
MCFG_DEVICE_ADD(_tag, STIC, 0)
-#endif /* STIC_H_ */
+#endif // MAME_VIDEO_STIC_H
diff --git a/src/mame/video/surpratk.cpp b/src/mame/video/surpratk.cpp
index 5484d1030d0..a88c327d468 100644
--- a/src/mame/video/surpratk.cpp
+++ b/src/mame/video/surpratk.cpp
@@ -49,20 +49,20 @@ uint32_t surpratk_state::screen_update_surpratk(screen_device &screen, bitmap_in
{
int layer[3], bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI4);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI3);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI4);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI3);
m_k052109->tilemap_update();
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI4);
layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI3);
konami_sortlayers3(layer, m_layerpri);
diff --git a/src/mame/video/tc0080vco.cpp b/src/mame/video/tc0080vco.cpp
index 774ae2a44fb..a0e4a622081 100644
--- a/src/mame/video/tc0080vco.cpp
+++ b/src/mame/video/tc0080vco.cpp
@@ -78,10 +78,10 @@ this seems to be the only zoom feature actually used in the games.
*****************************************************************************/
-const device_type TC0080VCO = device_creator<tc0080vco_device>;
+DEFINE_DEVICE_TYPE(TC0080VCO, tc0080vco_device, "tc0080vco", "Taito TC0080VCO")
tc0080vco_device::tc0080vco_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0080VCO, "Taito TC0080VCO", tag, owner, clock, "tc0080vco", __FILE__),
+ : device_t(mconfig, TC0080VCO, tag, owner, clock),
m_ram(nullptr),
m_bg0_ram_0(nullptr),
m_bg0_ram_1(nullptr),
diff --git a/src/mame/video/tc0080vco.h b/src/mame/video/tc0080vco.h
index 62007085527..52670b67efc 100644
--- a/src/mame/video/tc0080vco.h
+++ b/src/mame/video/tc0080vco.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __TC0080VCO_H__
-#define __TC0080VCO_H__
+#ifndef MAME_VIDEO_TC0080VCO_H
+#define MAME_VIDEO_TC0080VCO_H
+
+#pragma once
class tc0080vco_device : public device_t
{
public:
tc0080vco_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0080vco_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -82,7 +83,7 @@ private:
void bg1_tilemap_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int flags, uint32_t priority );
};
-extern const device_type TC0080VCO;
+DECLARE_DEVICE_TYPE(TC0080VCO, tc0080vco_device)
#define MCFG_TC0080VCO_GFX_REGION(_region) \
tc0080vco_device::set_gfx_region(*device, _region);
@@ -99,4 +100,4 @@ extern const device_type TC0080VCO;
#define MCFG_TC0080VCO_GFXDECODE(_gfxtag) \
tc0080vco_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif
+#endif // MAME_VIDEO_TC0080VCO_H
diff --git a/src/mame/video/tc0100scn.cpp b/src/mame/video/tc0100scn.cpp
index 7489bee5b9a..a919f4379bf 100644
--- a/src/mame/video/tc0100scn.cpp
+++ b/src/mame/video/tc0100scn.cpp
@@ -147,10 +147,10 @@ the wide tilemap mode)
#define TC0100SCN_RAM_SIZE 0x14000 /* enough for double-width tilemaps */
#define TC0100SCN_TOTAL_CHARS 256
-const device_type TC0100SCN = device_creator<tc0100scn_device>;
+DEFINE_DEVICE_TYPE(TC0100SCN, tc0100scn_device, "tc0100scn", "Taito TC0100SCN")
tc0100scn_device::tc0100scn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0100SCN, "Taito TC0100SCN", tag, owner, clock, "tc0100scn", __FILE__),
+ : device_t(mconfig, TC0100SCN, tag, owner, clock),
m_ram(nullptr),
m_bg_ram(nullptr),
m_fg_ram(nullptr),
diff --git a/src/mame/video/tc0100scn.h b/src/mame/video/tc0100scn.h
index 62cac593657..0b98a5b1b1d 100644
--- a/src/mame/video/tc0100scn.h
+++ b/src/mame/video/tc0100scn.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __TC0100SCN_H__
-#define __TC0100SCN_H__
+#ifndef MAME_VIDEO_TC0100SCN_H
+#define MAME_VIDEO_TC0100SCN_H
+
+#pragma once
class tc0100scn_device : public device_t
{
public:
tc0100scn_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0100scn_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -35,7 +36,7 @@ public:
dev.m_flip_text_yoffs = y_offset;
}
- #define TC0100SCN_SINGLE_VDU 1024
+ static constexpr unsigned SINGLE_VDU = 1024; // for set_multiscr_xoffs
/* Function to set separate color banks for the three tilemapped layers.
To change from the default (0,0,0) use after calling TC0100SCN_vh_start */
@@ -118,7 +119,7 @@ private:
void restore_scroll();
};
-extern const device_type TC0100SCN;
+DECLARE_DEVICE_TYPE(TC0100SCN, tc0100scn_device)
#define MCFG_TC0100SCN_GFX_REGION(_region) \
@@ -148,4 +149,4 @@ extern const device_type TC0100SCN;
#define MCFG_TC0100SCN_PALETTE(_palette_tag) \
tc0100scn_device::static_set_palette_tag(*device, "^" _palette_tag);
-#endif
+#endif // MAME_VIDEO_TC0100SCN_H
diff --git a/src/mame/video/tc0110pcr.cpp b/src/mame/video/tc0110pcr.cpp
index f1e1dab12c4..a4ddb188236 100644
--- a/src/mame/video/tc0110pcr.cpp
+++ b/src/mame/video/tc0110pcr.cpp
@@ -18,10 +18,10 @@ The data bus is 16 bits wide.
#define TC0110PCR_RAM_SIZE 0x2000
-const device_type TC0110PCR = device_creator<tc0110pcr_device>;
+DEFINE_DEVICE_TYPE(TC0110PCR, tc0110pcr_device, "tc0110pcr", "Taito TC0110PCR")
tc0110pcr_device::tc0110pcr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0110PCR, "Taito TC0110PCR", tag, owner, clock, "tc0110pcr", __FILE__)
+ : device_t(mconfig, TC0110PCR, tag, owner, clock)
, m_ram(nullptr)
, m_type(0)
, m_addr(0)
diff --git a/src/mame/video/tc0110pcr.h b/src/mame/video/tc0110pcr.h
index 3f650d0a72b..dae0f99626c 100644
--- a/src/mame/video/tc0110pcr.h
+++ b/src/mame/video/tc0110pcr.h
@@ -1,14 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef _TC0110PCR_H_
-#define _TC0110PCR_H_
+#ifndef MAME_VIDEO_TC0110PCR_H
+#define MAME_VIDEO_TC0110PCR_H
+
+#pragma once
class tc0110pcr_device : public device_t
{
public:
tc0110pcr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0110pcr_device() {}
DECLARE_READ16_MEMBER( word_r );
DECLARE_WRITE16_MEMBER( word_w ); /* color index goes up in step of 2 */
@@ -32,11 +33,11 @@ private:
required_device<palette_device> m_palette;
};
-extern const device_type TC0110PCR;
+DECLARE_DEVICE_TYPE(TC0110PCR, tc0110pcr_device)
#define MCFG_TC0110PCR_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, TC0110PCR, 0)
#define MCFG_TC0110PCR_PALETTE(_palette_tag) \
tc0110pcr_device::static_set_palette_tag(*device, "^" _palette_tag);
-#endif
+#endif // MAME_VIDEO_TC0110PCR_H
diff --git a/src/mame/video/tc0150rod.cpp b/src/mame/video/tc0150rod.cpp
index c85d6cf8ede..5e9fc0fca9b 100644
--- a/src/mame/video/tc0150rod.cpp
+++ b/src/mame/video/tc0150rod.cpp
@@ -12,11 +12,11 @@ Road generator. Two roads allow for forking. Gfx data fetched from ROM. Refer to
#define TC0150ROD_RAM_SIZE 0x2000
-const device_type TC0150ROD = device_creator<tc0150rod_device>;
+DEFINE_DEVICE_TYPE(TC0150ROD, tc0150rod_device, "tc0150rod", "Taito TC0150ROD")
tc0150rod_device::tc0150rod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0150ROD, "Taito TC0150ROD", tag, owner, clock, "tc0150rod", __FILE__),
- m_roadgfx(*this, DEVICE_SELF, 0x40000)
+ : device_t(mconfig, TC0150ROD, tag, owner, clock)
+ , m_roadgfx(*this, DEVICE_SELF, 0x40000)
{
}
diff --git a/src/mame/video/tc0150rod.h b/src/mame/video/tc0150rod.h
index 82677caf929..403bdb0a626 100644
--- a/src/mame/video/tc0150rod.h
+++ b/src/mame/video/tc0150rod.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __TC0150ROD_H__
-#define __TC0150ROD_H__
+#ifndef MAME_VIDEO_TC0150ROD_H
+#define MAME_VIDEO_TC0150ROD_H
+
+#pragma once
class tc0150rod_device : public device_t
{
public:
tc0150rod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0150rod_device() {}
DECLARE_READ16_MEMBER( word_r );
DECLARE_WRITE16_MEMBER( word_w );
@@ -23,7 +24,7 @@ private:
required_region_ptr<uint16_t> m_roadgfx;
};
-extern const device_type TC0150ROD;
+DECLARE_DEVICE_TYPE(TC0150ROD, tc0150rod_device)
-#endif
+#endif // MAME_VIDEO_TC0150ROD_H
diff --git a/src/mame/video/tc0180vcu.cpp b/src/mame/video/tc0180vcu.cpp
index 19cf6694bee..e3a8aacac71 100644
--- a/src/mame/video/tc0180vcu.cpp
+++ b/src/mame/video/tc0180vcu.cpp
@@ -9,10 +9,10 @@
#define TC0180VCU_SCROLLRAM_SIZE 0x0800
-const device_type TC0180VCU = device_creator<tc0180vcu_device>;
+DEFINE_DEVICE_TYPE(TC0180VCU, tc0180vcu_device, "tc0180vcu", "Taito TC0180VCU")
tc0180vcu_device::tc0180vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0180VCU, "Taito TC0180VCU", tag, owner, clock, "tc0180vcu", __FILE__),
+ : device_t(mconfig, TC0180VCU, tag, owner, clock),
m_ram(nullptr),
//m_scrollram(nullptr),
//m_bg_rambank(0),
diff --git a/src/mame/video/tc0180vcu.h b/src/mame/video/tc0180vcu.h
index ae1b25dc51f..7d2a6800f19 100644
--- a/src/mame/video/tc0180vcu.h
+++ b/src/mame/video/tc0180vcu.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __TC0180VCU_H__
-#define __TC0180VCU_H__
+#ifndef MAME_VIDEO_TC0180VCU_H
+#define MAME_VIDEO_TC0180VCU_H
+
+#pragma once
class tc0180vcu_device : public device_t
{
public:
tc0180vcu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0180vcu_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -57,7 +58,7 @@ private:
void video_control( uint8_t data );
};
-extern const device_type TC0180VCU;
+DECLARE_DEVICE_TYPE(TC0180VCU, tc0180vcu_device)
#define MCFG_TC0180VCU_BG_COLORBASE(_color) \
tc0180vcu_device::set_bg_colorbase(*device, _color);
@@ -71,4 +72,4 @@ extern const device_type TC0180VCU;
#define MCFG_TC0180VCU_GFXDECODE(_gfxtag) \
tc0180vcu_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif
+#endif // MAME_VIDEO_TC0180VCU_H
diff --git a/src/mame/video/tc0280grd.cpp b/src/mame/video/tc0280grd.cpp
index 86504d584b2..35f1920c4c5 100644
--- a/src/mame/video/tc0280grd.cpp
+++ b/src/mame/video/tc0280grd.cpp
@@ -25,10 +25,10 @@ control registers:
#define TC0280GRD_RAM_SIZE 0x2000
-const device_type TC0280GRD = device_creator<tc0280grd_device>;
+DEFINE_DEVICE_TYPE(TC0280GRD, tc0280grd_device, "tc0280grd", "Taito TC0280GRD / TC0430GRW")
tc0280grd_device::tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0280GRD, "Taito TC0280GRD & TC0430GRW", tag, owner, clock, "tc0280grd", __FILE__),
+ : device_t(mconfig, TC0280GRD, tag, owner, clock),
m_ram(nullptr),
//m_ctrl[8](0),
m_base_color(0),
diff --git a/src/mame/video/tc0280grd.h b/src/mame/video/tc0280grd.h
index 912919726a2..93bd12eea06 100644
--- a/src/mame/video/tc0280grd.h
+++ b/src/mame/video/tc0280grd.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __TC0280GRD_H__
-#define __TC0280GRD_H__
+#ifndef MAME_VIDEO_TC0280GRD_H
+#define MAME_VIDEO_TC0280GRD_H
+
+#pragma once
class tc0280grd_device : public device_t
{
public:
tc0280grd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0280grd_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -45,7 +46,7 @@ private:
void zoom_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int xoffset, int yoffset, uint32_t priority, int xmultiply );
};
-extern const device_type TC0280GRD;
+DECLARE_DEVICE_TYPE(TC0280GRD, tc0280grd_device)
#define TC0430GRW TC0280GRD
@@ -60,4 +61,5 @@ extern const device_type TC0280GRD;
#define MCFG_TC0430GRW_GFXDECODE(_gfxtag) \
tc0280grd_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif
+
+#endif // MAME_VIDEO_TC0280GRD_H
diff --git a/src/mame/video/tc0360pri.cpp b/src/mame/video/tc0360pri.cpp
index beba1fc556a..71ca816aedc 100644
--- a/src/mame/video/tc0360pri.cpp
+++ b/src/mame/video/tc0360pri.cpp
@@ -43,10 +43,10 @@ each one of them can declare to have four different priority levels.
#include "tc0360pri.h"
-const device_type TC0360PRI = device_creator<tc0360pri_device>;
+DEFINE_DEVICE_TYPE(TC0360PRI, tc0360pri_device, "tc0360pri", "Taito TC0360PRI")
tc0360pri_device::tc0360pri_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0360PRI, "Taito TC0360PRI", tag, owner, clock, "tc0360pri", __FILE__)
+ : device_t(mconfig, TC0360PRI, tag, owner, clock)
{
}
diff --git a/src/mame/video/tc0360pri.h b/src/mame/video/tc0360pri.h
index d64eafb96b2..65fe0c7820c 100644
--- a/src/mame/video/tc0360pri.h
+++ b/src/mame/video/tc0360pri.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef _TC0360PRI_H_
-#define _TC0360PRI_H_
+#ifndef MAME_VIDEO_TC0360PRI_H
+#define MAME_VIDEO_TC0360PRI_H
+
+#pragma once
class tc0360pri_device : public device_t
{
public:
tc0360pri_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0360pri_device() {}
DECLARE_WRITE8_MEMBER( write );
DECLARE_READ8_MEMBER( read );
@@ -22,9 +23,9 @@ private:
uint8_t m_regs[16];
};
-extern const device_type TC0360PRI;
+DECLARE_DEVICE_TYPE(TC0360PRI, tc0360pri_device)
#define MCFG_TC0360PRI_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, TC0360PRI, 0)
-#endif
+#endif // MAME_VIDEO_TC0360PRI_H
diff --git a/src/mame/video/tc0480scp.cpp b/src/mame/video/tc0480scp.cpp
index 8a1aed0fae1..1ca4156d1b3 100644
--- a/src/mame/video/tc0480scp.cpp
+++ b/src/mame/video/tc0480scp.cpp
@@ -150,10 +150,10 @@ Control registers
#define TC0480SCP_TOTAL_CHARS 256
-const device_type TC0480SCP = device_creator<tc0480scp_device>;
+DEFINE_DEVICE_TYPE(TC0480SCP, tc0480scp_device, "tc0480scp", "Taito TC0480SCP")
tc0480scp_device::tc0480scp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0480SCP, "Taito TC0480SCP", tag, owner, clock, "tc0480scp", __FILE__),
+ : device_t(mconfig, TC0480SCP, tag, owner, clock),
m_tx_ram(nullptr),
m_char_ram(nullptr),
m_pri_reg(0),
diff --git a/src/mame/video/tc0480scp.h b/src/mame/video/tc0480scp.h
index 46ed5fdf63a..b63fd3442df 100644
--- a/src/mame/video/tc0480scp.h
+++ b/src/mame/video/tc0480scp.h
@@ -1,13 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#ifndef __TC0480SCP_H__
-#define __TC0480SCP_H__
+#ifndef MAME_VIDEO_TC0480SCP_H
+#define MAME_VIDEO_TC0480SCP_H
+
+#pragma once
class tc0480scp_device : public device_t
{
public:
tc0480scp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0480scp_device() {}
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
@@ -110,7 +111,7 @@ private:
void bg23_draw( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, uint32_t priority );
};
-extern const device_type TC0480SCP;
+DECLARE_DEVICE_TYPE(TC0480SCP, tc0480scp_device)
#define MCFG_TC0480SCP_GFX_REGION(_region) \
@@ -134,4 +135,4 @@ extern const device_type TC0480SCP;
#define MCFG_TC0480SCP_GFXDECODE(_gfxtag) \
tc0480scp_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
-#endif
+#endif // MAME_VIDEO_TC0480SCP_H
diff --git a/src/mame/video/tc0780fpa.cpp b/src/mame/video/tc0780fpa.cpp
index 590a657ff15..32a34796395 100644
--- a/src/mame/video/tc0780fpa.cpp
+++ b/src/mame/video/tc0780fpa.cpp
@@ -390,11 +390,11 @@ void tc0780fpa_renderer::render(uint16_t *polygon_fifo, int length)
}
}
-const device_type TC0780FPA = device_creator<tc0780fpa_device>;
+DEFINE_DEVICE_TYPE(TC0780FPA, tc0780fpa_device, "tc0780fpa", "TC0780FPA Polygon Renderer")
tc0780fpa_device::tc0780fpa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TC0780FPA, "TC0780FPA Polygon Renderer", tag, owner, clock, "tc0780fpa", __FILE__),
- device_video_interface(mconfig, *this)
+ : device_t(mconfig, TC0780FPA, tag, owner, clock)
+ , device_video_interface(mconfig, *this)
{
}
diff --git a/src/mame/video/tc0780fpa.h b/src/mame/video/tc0780fpa.h
index 7c947365571..a7d383434db 100644
--- a/src/mame/video/tc0780fpa.h
+++ b/src/mame/video/tc0780fpa.h
@@ -1,9 +1,10 @@
// license:LGPL-2.1+
// copyright-holders:Ville Linde, Angelo Salese, hap
+#ifndef MAME_VIDEO_TC0780FPA_H
+#define MAME_VIDEO_TC0780FPA_H
+
#pragma once
-#ifndef __TC0780FPA_H__
-#define __TC0780FPA_H__
#include "video/poly.h"
@@ -21,7 +22,6 @@ class tc0780fpa_renderer : public poly_manager<float, tc0780fpa_polydata, 6, 100
{
public:
tc0780fpa_renderer(device_t &parent, screen_device &screen, const uint8_t *texture_ram);
- ~tc0780fpa_renderer() {}
void render_solid_scan(int32_t scanline, const extent_t &extent, const tc0780fpa_polydata &extradata, int threadid);
void render_shade_scan(int32_t scanline, const extent_t &extent, const tc0780fpa_polydata &extradata, int threadid);
@@ -46,7 +46,6 @@ class tc0780fpa_device : public device_t, public device_video_interface
{
public:
tc0780fpa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~tc0780fpa_device() {}
void draw(bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -75,6 +74,6 @@ private:
int m_texbase_y;
};
-extern const device_type TC0780FPA;
+DECLARE_DEVICE_TYPE(TC0780FPA, tc0780fpa_device)
-#endif
+#endif // MAME_VIDEO_TC0780FPA_H
diff --git a/src/mame/video/tecmo_mix.cpp b/src/mame/video/tecmo_mix.cpp
index c12f5cfd4a0..ec1ac96a42c 100644
--- a/src/mame/video/tecmo_mix.cpp
+++ b/src/mame/video/tecmo_mix.cpp
@@ -5,10 +5,10 @@
#include "tecmo_mix.h"
-const device_type TECMO_MIXER = device_creator<tecmo_mix_device>;
+DEFINE_DEVICE_TYPE(TECMO_MIXER, tecmo_mix_device, "tecmo_mix", "Tecmo 16-bit Mixer")
tecmo_mix_device::tecmo_mix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TECMO_MIXER, "Tecmo 16-bit Mixer", tag, owner, clock, "tecmo_mix", __FILE__),
+ : device_t(mconfig, TECMO_MIXER, tag, owner, clock),
device_video_interface(mconfig, *this),
m_sprpri_shift(0),
m_sprbln_shift(0),
diff --git a/src/mame/video/tecmo_mix.h b/src/mame/video/tecmo_mix.h
index b305b63d754..cc2616b2dc3 100644
--- a/src/mame/video/tecmo_mix.h
+++ b/src/mame/video/tecmo_mix.h
@@ -1,11 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/* Tecmo Mixer */
+#ifndef MAME_VIDEO_TECMO_MIX_H
+#define MAME_VIDEO_TECMO_MIX_H
+#pragma once
-class tecmo_mix_device : public device_t,
- public device_video_interface
+class tecmo_mix_device : public device_t, public device_video_interface
{
public:
tecmo_mix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -49,7 +51,7 @@ private:
uint32_t sum_colors(const pen_t *pal, int c1_idx, int c2_idx);
};
-extern const device_type TECMO_MIXER;
+DECLARE_DEVICE_TYPE(TECMO_MIXER, tecmo_mix_device)
@@ -70,3 +72,5 @@ extern const device_type TECMO_MIXER;
#define MCFG_TECMO_MIXER_BGPEN(_bgpen) \
tecmo_mix_device::set_bgpen(*device, _bgpen);
+
+#endif // MAME_VIDEO_TECMO_MIX_H
diff --git a/src/mame/video/tecmo_spr.cpp b/src/mame/video/tecmo_spr.cpp
index c52c3bc0f43..6bc94adb2a0 100644
--- a/src/mame/video/tecmo_spr.cpp
+++ b/src/mame/video/tecmo_spr.cpp
@@ -15,13 +15,13 @@
#include "screen.h"
-const device_type TECMO_SPRITE = device_creator<tecmo_spr_device>;
+DEFINE_DEVICE_TYPE(TECMO_SPRITE, tecmo_spr_device, "tecmo_spr", "Tecmo Chained Sprites")
tecmo_spr_device::tecmo_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TECMO_SPRITE, "Tecmo Chained Sprites", tag, owner, clock, "tecmo_spr", __FILE__),
-m_gfxregion(0),
-m_bootleg(0),
-m_yoffset(0)
+ : device_t(mconfig, TECMO_SPRITE, tag, owner, clock)
+ , m_gfxregion(0)
+ , m_bootleg(0)
+ , m_yoffset(0)
{
}
diff --git a/src/mame/video/tecmo_spr.h b/src/mame/video/tecmo_spr.h
index b9c879d25b4..b8b3d8075ff 100644
--- a/src/mame/video/tecmo_spr.h
+++ b/src/mame/video/tecmo_spr.h
@@ -1,7 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
/* Tecmo Sprites */
+#ifndef MAME_VIDEO_TECMO_SPR_H
+#define MAME_VIDEO_TECMO_SPR_H
+#pragma once
class tecmo_spr_device : public device_t
@@ -31,11 +34,9 @@ protected:
uint8_t m_gfxregion;
int m_bootleg; // for Gals Pinball / Hot Pinball
int m_yoffset;
-
-private:
};
-extern const device_type TECMO_SPRITE;
+DECLARE_DEVICE_TYPE(TECMO_SPRITE, tecmo_spr_device)
#define MCFG_TECMO_SPRITE_GFX_REGION(_region) \
@@ -46,3 +47,5 @@ extern const device_type TECMO_SPRITE;
#define MCFG_TECMO_SPRITE_YOFFSET(_yoffset) \
tecmo_spr_device::set_yoffset(*device, _yoffset);
+
+#endif // MAME_VIDEO_TECMO_SPR_H
diff --git a/src/mame/video/tia.cpp b/src/mame/video/tia.cpp
index a4d3729b636..601bdb7b1f1 100644
--- a/src/mame/video/tia.cpp
+++ b/src/mame/video/tia.cpp
@@ -352,24 +352,24 @@ PALETTE_INIT_MEMBER(tia_pal_video_device, tia_pal)
extend_palette( palette );
}
-tia_video_device::tia_video_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, __FILE__),
- device_video_interface(mconfig, *this),
- m_read_input_port_cb(*this),
- m_databus_contents_cb(*this),
- m_vsync_cb(*this)
+tia_video_device::tia_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_video_interface(mconfig, *this)
+ , m_read_input_port_cb(*this)
+ , m_databus_contents_cb(*this)
+ , m_vsync_cb(*this)
{
}
// device type definition
-const device_type TIA_PAL_VIDEO = device_creator<tia_pal_video_device>;
+DEFINE_DEVICE_TYPE(TIA_PAL_VIDEO, tia_pal_video_device, "tia_pal_video", "TIA Video (PAL)")
//-------------------------------------------------
// tia_pal_video_device - constructor
//-------------------------------------------------
tia_pal_video_device::tia_pal_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : tia_video_device(mconfig, TIA_PAL_VIDEO, "TIA Video (PAL)", "tia_pal_video", tag, owner, clock)
+ : tia_video_device(mconfig, TIA_PAL_VIDEO, tag, owner, clock)
{
}
@@ -389,14 +389,14 @@ machine_config_constructor tia_pal_video_device::device_mconfig_additions() cons
}
// device type definition
-const device_type TIA_NTSC_VIDEO = device_creator<tia_ntsc_video_device>;
+DEFINE_DEVICE_TYPE(TIA_NTSC_VIDEO, tia_ntsc_video_device, "tia_ntsc_video", "TIA Video (NTSC)")
//-------------------------------------------------
// tia_ntsc_video_device - constructor
//-------------------------------------------------
tia_ntsc_video_device::tia_ntsc_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : tia_video_device(mconfig, TIA_NTSC_VIDEO, "TIA Video (NTSC)", "tia_ntsc_video", tag, owner, clock)
+ : tia_video_device(mconfig, TIA_NTSC_VIDEO, tag, owner, clock)
{
}
diff --git a/src/mame/video/tia.h b/src/mame/video/tia.h
index a73a1103287..e05789cf623 100644
--- a/src/mame/video/tia.h
+++ b/src/mame/video/tia.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol,Stefan Jokisch
-#ifndef _VIDEO_TIA_H_
-#define _VIDEO_TIA_H_
+#ifndef MAME_VIDEO_VIDEO_TIA_H
+#define MAME_VIDEO_VIDEO_TIA_H
+
+#pragma once
//**************************************************************************
// MACROS / CONSTANTS
@@ -61,7 +63,7 @@ public:
protected:
// construction/destruction
- tia_video_device(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, device_t *owner, uint32_t clock);
+ tia_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// device-level overrides
virtual void device_start() override;
@@ -229,7 +231,7 @@ protected:
// device type definition
-extern const device_type TIA_PAL_VIDEO;
-extern const device_type TIA_NTSC_VIDEO;
+DECLARE_DEVICE_TYPE(TIA_PAL_VIDEO, tia_pal_video_device)
+DECLARE_DEVICE_TYPE(TIA_NTSC_VIDEO, tia_ntsc_video_device)
-#endif /* _VIDEO_TIA_H_ */
+#endif // MAME_VIDEO_TIA_H
diff --git a/src/mame/video/tigeroad_spr.cpp b/src/mame/video/tigeroad_spr.cpp
index 40c8383e0ed..f26fb04158a 100644
--- a/src/mame/video/tigeroad_spr.cpp
+++ b/src/mame/video/tigeroad_spr.cpp
@@ -19,10 +19,10 @@
#include "tigeroad_spr.h"
-const device_type TIGEROAD_SPRITE = device_creator<tigeroad_spr_device>;
+DEFINE_DEVICE_TYPE(TIGEROAD_SPRITE, tigeroad_spr_device, "tigeroad_spr", "Simple Capcom (Tiger Road) Sprite")
tigeroad_spr_device::tigeroad_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TIGEROAD_SPRITE, "Simple Capcom (Tiger Road) Sprite", tag, owner, clock, "tigeroad_spr", __FILE__)
+ : device_t(mconfig, TIGEROAD_SPRITE, tag, owner, clock)
{
}
diff --git a/src/mame/video/tigeroad_spr.h b/src/mame/video/tigeroad_spr.h
index 21ff8afdd79..11b1c1b98aa 100644
--- a/src/mame/video/tigeroad_spr.h
+++ b/src/mame/video/tigeroad_spr.h
@@ -1,5 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_TIGEROAD_SPR_H
+#define MAME_VIDEO_TIGEROAD_SPR_H
+
+#pragma once
class tigeroad_spr_device : public device_t
{
@@ -15,4 +19,6 @@ protected:
private:
};
-extern const device_type TIGEROAD_SPRITE;
+DECLARE_DEVICE_TYPE(TIGEROAD_SPRITE, tigeroad_spr_device)
+
+#endif // MAME_VIDEO_TIGEROAD_SPR_H
diff --git a/src/mame/video/tmc600.cpp b/src/mame/video/tmc600.cpp
index 65c403e64ed..1c7d1fd2642 100644
--- a/src/mame/video/tmc600.cpp
+++ b/src/mame/video/tmc600.cpp
@@ -128,15 +128,15 @@ GFXDECODE_END
MACHINE_CONFIG_FRAGMENT( tmc600_video )
// video hardware
- MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, CDP1869_DOT_CLK_PAL)
+ MCFG_CDP1869_SCREEN_PAL_ADD(CDP1869_TAG, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL)
MCFG_TIMER_DRIVER_ADD_PERIODIC("blink", tmc600_state, blink_tick, attotime::from_hz(2))
MCFG_GFXDECODE_ADD("gfxdecode", CDP1869_TAG":palette", tmc600)
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_CDP1869_ADD(CDP1869_TAG, CDP1869_DOT_CLK_PAL, cdp1869_page_ram)
- MCFG_CDP1869_COLOR_CLOCK(CDP1869_COLOR_CLK_PAL)
+ MCFG_CDP1869_ADD(CDP1869_TAG, cdp1869_device::DOT_CLK_PAL, cdp1869_page_ram)
+ MCFG_CDP1869_COLOR_CLOCK(cdp1869_device::COLOR_CLK_PAL)
MCFG_CDP1869_CHAR_PCB_READ_OWNER(tmc600_state, tmc600_pcb_r)
MCFG_CDP1869_CHAR_RAM_READ_OWNER(tmc600_state, tmc600_char_ram_r)
MCFG_CDP1869_PAL_NTSC_CALLBACK(VCC)
diff --git a/src/mame/video/tmnt.cpp b/src/mame/video/tmnt.cpp
index 6853335fc96..7da27c28eee 100644
--- a/src/mame/video/tmnt.cpp
+++ b/src/mame/video/tmnt.cpp
@@ -546,19 +546,19 @@ uint32_t tmnt_state::screen_update_tmnt(screen_device &screen, bitmap_ind16 &bit
uint32_t tmnt_state::screen_update_punkshot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI4);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI3);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI4);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI3);
m_k052109->tilemap_update();
m_sorted_layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
m_sorted_layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI4);
m_sorted_layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI3);
konami_sortlayers3(m_sorted_layer, m_layerpri);
@@ -576,20 +576,20 @@ uint32_t tmnt_state::screen_update_lgtnfght(screen_device &screen, bitmap_ind16
{
int bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI4);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI3);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI4);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI3);
m_k052109->tilemap_update();
m_sorted_layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
m_sorted_layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI4);
m_sorted_layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI3);
konami_sortlayers3(m_sorted_layer, m_layerpri);
@@ -620,20 +620,20 @@ uint32_t tmnt_state::screen_update_glfgreat(screen_device &screen, bitmap_ind16
{
int bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI3) + 8; /* weird... */
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI4);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI3) + 8; /* weird... */
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI4);
m_k052109->tilemap_update();
m_sorted_layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
m_sorted_layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI3);
m_sorted_layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI4);
konami_sortlayers3(m_sorted_layer, m_layerpri);
@@ -725,20 +725,20 @@ uint32_t tmnt_state::screen_update_thndrx2(screen_device &screen, bitmap_ind16 &
{
int bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI0);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI4);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI3);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI4);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI3);
m_k052109->tilemap_update();
m_sorted_layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
m_sorted_layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI4);
m_sorted_layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI3);
konami_sortlayers3(m_sorted_layer, m_layerpri);
diff --git a/src/mame/video/toaplan2.cpp b/src/mame/video/toaplan2.cpp
index d68b8e39ab2..86bddaec96f 100644
--- a/src/mame/video/toaplan2.cpp
+++ b/src/mame/video/toaplan2.cpp
@@ -108,17 +108,10 @@ VIDEO_START_MEMBER(toaplan2_state,fixeightbl)
create_tx_tilemap();
/* This bootleg has additional layer offsets on the VDP */
- m_vdp0->bg.extra_xoffset.normal = -0x1d6 -26;
- m_vdp0->bg.extra_yoffset.normal = -0x1ef -15;
-
- m_vdp0->fg.extra_xoffset.normal = -0x1d8 -22;
- m_vdp0->fg.extra_yoffset.normal = -0x1ef -15;
-
- m_vdp0->top.extra_xoffset.normal = -0x1da -18;
- m_vdp0->top.extra_yoffset.normal = -0x1ef -15;
-
- m_vdp0->sp.extra_xoffset.normal = 8;//-0x1cc -64;
- m_vdp0->sp.extra_yoffset.normal = 8;//-0x1ef -128;
+ m_vdp0->set_bg_extra_offsets( -0x1d6 - 26, -0x1ef - 15, 0, 0 );
+ m_vdp0->set_fg_extra_offsets( -0x1d8 - 22, -0x1ef - 15, 0, 0 );
+ m_vdp0->set_top_extra_offsets( -0x1da - 18, -0x1ef - 15, 0, 0 );
+ m_vdp0->set_sp_extra_offsets(8/*-0x1cc - 64*/, 8/*-0x1ef - 128*/, 0, 0);
m_vdp0->init_scroll_regs();
}
@@ -143,7 +136,7 @@ VIDEO_START_MEMBER(toaplan2_state,batrider)
{
VIDEO_START_CALL_MEMBER( toaplan2 );
- m_vdp0->sp.use_sprite_buffer = 0; // disable buffering on this game
+ m_vdp0->disable_sprite_buffer(); // disable buffering on this game
/* Create the Text tilemap for this game */
m_tx_gfxram16.allocate(RAIZING_TX_GFXRAM_SIZE/2);
@@ -153,7 +146,7 @@ VIDEO_START_MEMBER(toaplan2_state,batrider)
create_tx_tilemap(0x1d4, 0x16b);
/* Has special banking */
- m_vdp0->gp9001_gfxrom_is_banked = 1;
+ m_vdp0->set_gfxrom_banked();
}
WRITE16_MEMBER(toaplan2_state::toaplan2_tx_videoram_w)
@@ -214,14 +207,7 @@ WRITE16_MEMBER(toaplan2_state::batrider_unknown_dma_w)
WRITE16_MEMBER(toaplan2_state::batrider_objectbank_w)
{
if (ACCESSING_BITS_0_7)
- {
- data &= 0xf;
- if (m_vdp0->gp9001_gfxrom_bank[offset] != data)
- {
- m_vdp0->gp9001_gfxrom_bank[offset] = data;
- m_vdp0->gp9001_gfxrom_bank_dirty = 1;
- }
- }
+ m_vdp0->set_gfxrom_bank(offset, data & 0x0f);
}
diff --git a/src/mame/video/toaplan_scu.cpp b/src/mame/video/toaplan_scu.cpp
index 2402e1df285..a6d02b4df4e 100644
--- a/src/mame/video/toaplan_scu.cpp
+++ b/src/mame/video/toaplan_scu.cpp
@@ -11,7 +11,7 @@
#include "screen.h"
-const device_type TOAPLAN_SCU = device_creator<toaplan_scu_device>;
+DEFINE_DEVICE_TYPE(TOAPLAN_SCU, toaplan_scu_device, "toaplan_scu", "Toaplan SCU")
const gfx_layout toaplan_scu_device::spritelayout =
{
@@ -30,8 +30,8 @@ GFXDECODE_END
toaplan_scu_device::toaplan_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, TOAPLAN_SCU, "Toaplan SCU", tag, owner, clock, "toaplan_scu", __FILE__),
- device_gfx_interface(mconfig, *this, gfxinfo )
+ : device_t(mconfig, TOAPLAN_SCU, tag, owner, clock)
+ , device_gfx_interface(mconfig, *this, gfxinfo)
{
}
diff --git a/src/mame/video/toaplan_scu.h b/src/mame/video/toaplan_scu.h
index 89b6d90fb6a..3466380c102 100644
--- a/src/mame/video/toaplan_scu.h
+++ b/src/mame/video/toaplan_scu.h
@@ -1,14 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Quench
/* toaplan SCU */
+#ifndef MAME_VIDEO_TOAPLAN_SCU_H
+#define MAME_VIDEO_TOAPLAN_SCU_H
+#pragma once
class toaplan_scu_device : public device_t, public device_gfx_interface
{
- static const gfx_layout spritelayout;
- DECLARE_GFXDECODE_MEMBER(gfxinfo);
-
public:
toaplan_scu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -24,14 +24,19 @@ protected:
virtual void device_reset() override;
private:
+ static const gfx_layout spritelayout;
+ DECLARE_GFXDECODE_MEMBER(gfxinfo);
+
bitmap_ind16 m_temp_spritebitmap;
int m_xoffs;
int m_xoffs_flipped;
};
-extern const device_type TOAPLAN_SCU;
+DECLARE_DEVICE_TYPE(TOAPLAN_SCU, toaplan_scu_device)
#define MCFG_TOAPLAN_SCU_ADD(_tag, _palette_tag, _xoffs, _xoffs_flipped ) \
MCFG_DEVICE_ADD(_tag, TOAPLAN_SCU, 0) \
MCFG_GFX_PALETTE(_palette_tag) \
toaplan_scu_device::static_set_xoffsets(*device, _xoffs, _xoffs_flipped);
+
+#endif // MAME_VIDEO_TOAPLAN_SCU_H
diff --git a/src/mame/video/uv201.cpp b/src/mame/video/uv201.cpp
index fdbd98ab2af..d6485b2c556 100644
--- a/src/mame/video/uv201.cpp
+++ b/src/mame/video/uv201.cpp
@@ -90,7 +90,7 @@
//**************************************************************************
// device type definition
-const device_type UV201 = device_creator<uv201_device>;
+DEFINE_DEVICE_TYPE(UV201, uv201_device, "uv201", "UV201")
//-------------------------------------------------
@@ -98,7 +98,7 @@ const device_type UV201 = device_creator<uv201_device>;
//-------------------------------------------------
uv201_device::uv201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, UV201, "UV201", tag, owner, clock, "uv201", __FILE__),
+ device_t(mconfig, UV201, tag, owner, clock),
device_video_interface(mconfig, *this),
m_write_ext_int(*this),
m_write_hblank(*this),
diff --git a/src/mame/video/uv201.h b/src/mame/video/uv201.h
index 48f34921cb3..97363c4b118 100644
--- a/src/mame/video/uv201.h
+++ b/src/mame/video/uv201.h
@@ -96,9 +96,9 @@ public:
// construction/destruction
uv201_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_ext_int_wr_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_write_ext_int.set_callback(object); }
- template<class _Object> static devcb_base &set_hblank_wr_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_write_hblank.set_callback(object); }
- template<class _Object> static devcb_base &set_db_rd_callback(device_t &device, _Object object) { return downcast<uv201_device &>(device).m_read_db.set_callback(object); }
+ template <class Object> static devcb_base &set_ext_int_wr_callback(device_t &device, Object &&cb) { return downcast<uv201_device &>(device).m_write_ext_int.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_hblank_wr_callback(device_t &device, Object &&cb) { return downcast<uv201_device &>(device).m_write_hblank.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_db_rd_callback(device_t &device, Object &&cb) { return downcast<uv201_device &>(device).m_read_db.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -153,5 +153,6 @@ private:
// device type definition
extern const device_type UV201;
+DECLARE_DEVICE_TYPE(UV201, uv201_device)
#endif // MAME_VIDEO_UV201_H
diff --git a/src/mame/video/vendetta.cpp b/src/mame/video/vendetta.cpp
index 21d2cdae864..66686c97b00 100644
--- a/src/mame/video/vendetta.cpp
+++ b/src/mame/video/vendetta.cpp
@@ -54,19 +54,19 @@ uint32_t vendetta_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
{
int layer[3];
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI2);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI3);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI4);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI2);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI3);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI4);
m_k052109->tilemap_update();
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI3);
layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI4);
konami_sortlayers3(layer, m_layerpri);
diff --git a/src/mame/video/vertigo.cpp b/src/mame/video/vertigo.cpp
index 8903dcc2223..a51b34f15c4 100644
--- a/src/mame/video/vertigo.cpp
+++ b/src/mame/video/vertigo.cpp
@@ -56,7 +56,7 @@
*************************************/
#define V_ADDPOINT(h,v,c,i) \
- m_vector->add_point (((h) & 0x7ff) << 14, (0x6ff - ((v) & 0x7ff)) << 14, VECTOR_COLOR444(c), (i))
+ m_vector->add_point (((h) & 0x7ff) << 14, (0x6ff - ((v) & 0x7ff)) << 14, vector_device::color444(c), (i))
#define ADD(r,s,c) (((r) + (s) + (c)) & 0xffff)
#define SUBR(r,s,c) ((~(r) + (s) + (c)) & 0xffff)
diff --git a/src/mame/video/vicdual-97269pb.cpp b/src/mame/video/vicdual-97269pb.cpp
index 5e993516b29..2ae3c31c4d0 100644
--- a/src/mame/video/vicdual-97269pb.cpp
+++ b/src/mame/video/vicdual-97269pb.cpp
@@ -72,7 +72,7 @@ ROM_END
// GLOBAL VARIABLES
//**************************************************************************
-const device_type S97269PB = device_creator<s97269pb_device>;
+DEFINE_DEVICE_TYPE(S97269PB, s97269pb_device, "s97269pb", "N-Sub Daughterboard 97269-P-B")
//-------------------------------------------------
// rom_region - device-specific ROM region
@@ -92,7 +92,7 @@ const tiny_rom_entry *s97269pb_device::device_rom_region() const
//-------------------------------------------------
s97269pb_device::s97269pb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, S97269PB, "N-Sub Daughterboard 97269-P-B", tag, owner, clock, "s97269pb", __FILE__),
+ device_t(mconfig, S97269PB, tag, owner, clock),
m_prom_ptr(*this, "s97269pb")
{
}
diff --git a/src/mame/video/vicdual-97269pb.h b/src/mame/video/vicdual-97269pb.h
index 3897efac93a..c2d239233b7 100644
--- a/src/mame/video/vicdual-97269pb.h
+++ b/src/mame/video/vicdual-97269pb.h
@@ -1,10 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Ariane Fugmann
-#pragma once
-
#ifndef MAME_VIDEO_VICDUAL_97269PB_H
#define MAME_VIDEO_VICDUAL_97269PB_H
+#pragma once
+
#define MCFG_S97269PB_ADD(_tag ) \
MCFG_DEVICE_ADD(_tag, S97269PB, 0)
@@ -37,6 +37,6 @@ private:
};
// device type definition
-extern const device_type S97269PB;
+DECLARE_DEVICE_TYPE(S97269PB, s97269pb_device)
-#endif /* MAME_VIDEO_VICDUAL_97269PB_H */
+#endif // MAME_VIDEO_VICDUAL_97269PB_H
diff --git a/src/mame/video/vrender0.cpp b/src/mame/video/vrender0.cpp
index 22b514d1840..772a41fd679 100644
--- a/src/mame/video/vrender0.cpp
+++ b/src/mame/video/vrender0.cpp
@@ -23,10 +23,10 @@
DEVICE INTERFACE
*****************************************************************************/
-const device_type VIDEO_VRENDER0 = device_creator<vr0video_device>;
+DEFINE_DEVICE_TYPE(VIDEO_VRENDER0, vr0video_device, "vr0video", "VRender0 Video")
vr0video_device::vr0video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VIDEO_VRENDER0, "VRender0 Video", tag, owner, clock, "vr0video", __FILE__)
+ : device_t(mconfig, VIDEO_VRENDER0, tag, owner, clock)
, m_cpu(*this, finder_base::DUMMY_TAG)
{
}
diff --git a/src/mame/video/vrender0.h b/src/mame/video/vrender0.h
index 913c5de66b3..607e24a2905 100644
--- a/src/mame/video/vrender0.h
+++ b/src/mame/video/vrender0.h
@@ -1,37 +1,15 @@
// license:BSD-3-Clause
// copyright-holders:ElSemi
-#ifndef __VR0VIDEO_H__
-#define __VR0VIDEO_H__
+#ifndef MAME_VIDEO_VRENDER0_H
+#define MAME_VIDEO_VRENDER0_H
+
+#pragma once
/***************************************************************************
TYPE DEFINITIONS
***************************************************************************/
-struct RenderStateInfo
-{
- uint32_t Tx;
- uint32_t Ty;
- uint32_t Txdx;
- uint32_t Tydx;
- uint32_t Txdy;
- uint32_t Tydy;
- uint32_t SrcAlphaColor;
- uint32_t SrcBlend;
- uint32_t DstAlphaColor;
- uint32_t DstBlend;
- uint32_t ShadeColor;
- uint32_t TransColor;
- uint32_t TileOffset;
- uint32_t FontOffset;
- uint32_t PalOffset;
- uint32_t PaletteBank;
- uint32_t TextureMode;
- uint32_t PixelFormat;
- uint32_t Width;
- uint32_t Height;
-};
-
class vr0video_device : public device_t
{
public:
@@ -48,6 +26,30 @@ protected:
virtual void device_reset() override;
private:
+ struct RenderStateInfo
+ {
+ uint32_t Tx;
+ uint32_t Ty;
+ uint32_t Txdx;
+ uint32_t Tydx;
+ uint32_t Txdy;
+ uint32_t Tydy;
+ uint32_t SrcAlphaColor;
+ uint32_t SrcBlend;
+ uint32_t DstAlphaColor;
+ uint32_t DstBlend;
+ uint32_t ShadeColor;
+ uint32_t TransColor;
+ uint32_t TileOffset;
+ uint32_t FontOffset;
+ uint32_t PalOffset;
+ uint32_t PaletteBank;
+ uint32_t TextureMode;
+ uint32_t PixelFormat;
+ uint32_t Width;
+ uint32_t Height;
+ };
+
// internal state
required_device<cpu_device> m_cpu;
@@ -57,10 +59,10 @@ private:
RenderStateInfo m_RenderState;
};
-extern const device_type VIDEO_VRENDER0;
+DECLARE_DEVICE_TYPE(VIDEO_VRENDER0, vr0video_device)
#define MCFG_VIDEO_VRENDER0_CPU(_tag) \
vr0video_device::set_cpu_tag(*device, "^" _tag);
-#endif /* __VR0VIDEO_H__ */
+#endif // MAME_VIDEO_VRENDER0_H
diff --git a/src/mame/video/vs920a.cpp b/src/mame/video/vs920a.cpp
index da5811f9fd8..a6c0cf10a32 100644
--- a/src/mame/video/vs920a.cpp
+++ b/src/mame/video/vs920a.cpp
@@ -30,22 +30,22 @@ t=tile, p=palette
#include "vs920a.h"
-const device_type VS920A = device_creator<vs920a_text_tilemap_device>;
+DEFINE_DEVICE_TYPE(VS920A, vs920a_text_tilemap_device, "vs920a", "VS920A Text Tilemap")
vs920a_text_tilemap_device::vs920a_text_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VS920A, "VS920A Text Tilemap", tag, owner, clock, "vs920a", __FILE__),
- m_vram(nullptr),
- m_pal_base(0),
- m_gfx_region(0),
- m_gfxdecode(*this, finder_base::DUMMY_TAG)
-
+ : device_t(mconfig, VS920A, tag, owner, clock)
+ , m_tmap(nullptr)
+ , m_vram()
+ , m_pal_base(0)
+ , m_gfx_region(0)
+ , m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
}
void vs920a_text_tilemap_device::device_start()
{
- if(!m_gfxdecode->started())
+ if (!m_gfxdecode->started())
throw device_missing_dependencies();
m_vram = make_unique_clear<uint16_t[]>(0x1000/2);
@@ -101,16 +101,6 @@ READ16_MEMBER(vs920a_text_tilemap_device::vram_r)
}
-tilemap_t* vs920a_text_tilemap_device::get_tilemap()
-{
- return m_tmap;
-}
-
-void vs920a_text_tilemap_device::set_pal_base(int pal_base)
-{
- m_pal_base = pal_base;
-}
-
void vs920a_text_tilemap_device::draw(screen_device &screen, bitmap_ind16& bitmap, const rectangle &cliprect, int priority)
{
m_tmap->draw(screen, bitmap, cliprect, 0, priority);
diff --git a/src/mame/video/vs920a.h b/src/mame/video/vs920a.h
index c05e3bf5508..5d53191630f 100644
--- a/src/mame/video/vs920a.h
+++ b/src/mame/video/vs920a.h
@@ -1,39 +1,43 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#ifndef MAME_VIDEO_VS920A_H
+#define MAME_VIDEO_VS920A_H
+
+#pragma once
class vs920a_text_tilemap_device : public device_t
{
public:
- vs920a_text_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
static void set_gfx_region(device_t &device, int gfxregion);
- tilemap_t* m_tmap;
- std::unique_ptr<uint16_t[]> m_vram;
- uint16_t m_pal_base;
+ vs920a_text_tilemap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- TILE_GET_INFO_MEMBER(get_tile_info);
- tilemap_t* get_tilemap();
- void set_pal_base(int m_pal_base);
+ void set_pal_base(int pal_base) { m_pal_base = pal_base; }
+ void set_transparent_pen(pen_t pen) { m_tmap->set_transparent_pen(pen); }
void draw(screen_device &screen, bitmap_ind16& bitmap, const rectangle &cliprect, int priority);
DECLARE_WRITE16_MEMBER(vram_w);
DECLARE_READ16_MEMBER(vram_r);
-
protected:
virtual void device_start() override;
virtual void device_reset() override;
-
private:
+ TILE_GET_INFO_MEMBER(get_tile_info);
+
+ tilemap_t* m_tmap;
+ std::unique_ptr<uint16_t[]> m_vram;
+ uint16_t m_pal_base;
+
uint8_t m_gfx_region;
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type VS920A;
+DECLARE_DEVICE_TYPE(VS920A, vs920a_text_tilemap_device)
#define MCFG_VS920A_GFX_REGION(_region) \
@@ -41,3 +45,5 @@ extern const device_type VS920A;
#define MCFG_VS920A_GFXDECODE(_gfxtag) \
vs920a_text_tilemap_device::static_set_gfxdecode_tag(*device, "^" _gfxtag);
+
+#endif // MAME_VIDEO_VS920A_H
diff --git a/src/mame/video/vsystem_gga.cpp b/src/mame/video/vsystem_gga.cpp
index 2d57fcdec59..b320f3b6828 100644
--- a/src/mame/video/vsystem_gga.cpp
+++ b/src/mame/video/vsystem_gga.cpp
@@ -17,14 +17,14 @@
//**************************************************************************
// device type definition
-const device_type VSYSTEM_GGA = device_creator<vsystem_gga_device>;
+DEFINE_DEVICE_TYPE(VSYSTEM_GGA, vsystem_gga_device, "vsystem_gga", "Video System C7-01 GGA")
//-------------------------------------------------
// vsystem_gga_device - constructor
//-------------------------------------------------
vsystem_gga_device::vsystem_gga_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, VSYSTEM_GGA, "Video System C7-01 GGA", tag, owner, clock, "vsystem_gga", __FILE__),
+ : device_t(mconfig, VSYSTEM_GGA, tag, owner, clock),
device_video_interface(mconfig, *this, false),
m_write_cb(*this)
{
diff --git a/src/mame/video/vsystem_gga.h b/src/mame/video/vsystem_gga.h
index 25bdafb3f39..e8804972e85 100644
--- a/src/mame/video/vsystem_gga.h
+++ b/src/mame/video/vsystem_gga.h
@@ -6,11 +6,11 @@
******************************************************************************/
-#pragma once
-
#ifndef MAME_VIDEO_VSYSTEM_GGA_H
#define MAME_VIDEO_VSYSTEM_GGA_H
+#pragma once
+
//**************************************************************************
// CONFIGURATION MACROS
//**************************************************************************
@@ -52,6 +52,6 @@ private:
};
// device type definition
-extern const device_type VSYSTEM_GGA;
+DECLARE_DEVICE_TYPE(VSYSTEM_GGA, vsystem_gga_device)
-#endif
+#endif // MAME_VIDEO_VSYSTEM_GGA_H
diff --git a/src/mame/video/vsystem_spr.cpp b/src/mame/video/vsystem_spr.cpp
index d7ffb4ce830..e271b648fb2 100644
--- a/src/mame/video/vsystem_spr.cpp
+++ b/src/mame/video/vsystem_spr.cpp
@@ -64,23 +64,21 @@ Abstracts the VS9210
#include "screen.h"
-const device_type VSYSTEM_SPR = device_creator<vsystem_spr_device>;
+DEFINE_DEVICE_TYPE(VSYSTEM_SPR, vsystem_spr_device, "vsystem_spr", "Video System Sprites")
vsystem_spr_device::vsystem_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VSYSTEM_SPR, "Video System Sprites", tag, owner, clock, "vsystem_spr", __FILE__)
+ : device_t(mconfig, VSYSTEM_SPR, tag, owner, clock)
+ , m_newtilecb(FUNC(vsystem_spr_device::tile_callback_noindirect), this)
+ , m_xoffs(0)
+ , m_yoffs(0)
+ , m_pdraw(false)
+ , m_pal_mask(0x3f)
+ , m_gfx_region(-1)
+ , m_transpen(15)
+ , m_pal_base(0)
+ , m_curr_sprite()
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
- m_transpen = 15;
- m_pal_base = 0;
- m_xoffs = 0;
- m_yoffs = 0;
- m_pdraw = false;
- m_gfx_region = -1;
- m_pal_mask = 0x3f;
-
- m_newtilecb = vsystem_tile_indirection_delegate(FUNC(vsystem_spr_device::tile_callback_noindirect), this);
-
- memset(&m_curr_sprite, 0, sizeof(m_curr_sprite));
}
//-------------------------------------------------
@@ -137,11 +135,6 @@ void vsystem_spr_device::CG10103_set_pal_base(device_t &device, int pal_base)
}
-void vsystem_spr_device::set_pal_base(int pal_base)
-{
- m_pal_base = pal_base;
-}
-
// static
void vsystem_spr_device::set_pal_mask(device_t &device, int pal_mask)
{
@@ -181,7 +174,7 @@ void vsystem_spr_device::device_reset()
{
}
-void vsystem_spr_device::get_sprite_attributes(uint16_t* ram)
+void vsystem_spr_device::sprite_attributes::get(uint16_t const *ram)
{
/*
attr_start + 0x0000
@@ -205,21 +198,21 @@ void vsystem_spr_device::get_sprite_attributes(uint16_t* ram)
xxxx xxxx xxxx xxxx map start (lsb)
*/
- m_curr_sprite.oy = (ram[0] & 0x01ff);
- m_curr_sprite.ysize = (ram[0] & 0x0e00) >> 9;
- m_curr_sprite.zoomy = (ram[0] & 0xf000) >> 12;
+ oy = (ram[0] & 0x01ff);
+ ysize = (ram[0] & 0x0e00) >> 9;
+ zoomy = (ram[0] & 0xf000) >> 12;
- m_curr_sprite.ox = (ram[1] & 0x01ff);
- m_curr_sprite.xsize = (ram[1] & 0x0e00) >> 9;
- m_curr_sprite.zoomx = (ram[1] & 0xf000) >> 12;
+ ox = (ram[1] & 0x01ff);
+ xsize = (ram[1] & 0x0e00) >> 9;
+ zoomx = (ram[1] & 0xf000) >> 12;
- m_curr_sprite.flipx = (ram[2] & 0x4000);
- m_curr_sprite.flipy = (ram[2] & 0x8000);
- m_curr_sprite.color = (ram[2] & 0x3f00) >> 8;
- m_curr_sprite.pri = (ram[2] & 0x3000) >> 12;
- m_curr_sprite.map = (ram[2] & 0x0001) << 16;
+ flipx = (ram[2] & 0x4000);
+ flipy = (ram[2] & 0x8000);
+ color = (ram[2] & 0x3f00) >> 8;
+ pri = (ram[2] & 0x3000) >> 12;
+ map = (ram[2] & 0x0001) << 16;
- m_curr_sprite.map |= (ram[3] & 0xffff);
+ map |= (ram[3] & 0xffff);
}
@@ -286,7 +279,7 @@ void vsystem_spr_device::common_sprite_drawgfx(bitmap_ind16 &bitmap, const recta
-void vsystem_spr_device::draw_sprites( uint16_t* spriteram, int spriteram_bytes, screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int prihack_mask, int prihack_val )
+void vsystem_spr_device::draw_sprites(uint16_t const *spriteram, int spriteram_bytes, screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int prihack_mask, int prihack_val )
{
int offs;
int end = 0;
@@ -323,7 +316,7 @@ void vsystem_spr_device::draw_sprites( uint16_t* spriteram, int spriteram_bytes,
attr_start = 4 * (spriteram[offs] & 0x03ff);
- get_sprite_attributes(&spriteram[attr_start]);
+ m_curr_sprite.get(&spriteram[attr_start]);
m_curr_sprite.color &= m_pal_mask;
diff --git a/src/mame/video/vsystem_spr.h b/src/mame/video/vsystem_spr.h
index 8167cb5a31c..c033b0d6903 100644
--- a/src/mame/video/vsystem_spr.h
+++ b/src/mame/video/vsystem_spr.h
@@ -4,6 +4,8 @@
#ifndef MAME_VIDEO_VSYSTEM_SPR_H
#define MAME_VIDEO_VSYSTEM_SPR_H
+#pragma once
+
typedef device_delegate<uint32_t (uint32_t)> vsystem_tile_indirection_delegate;
@@ -25,19 +27,47 @@ typedef device_delegate<uint32_t (uint32_t)> vsystem_tile_indirection_delegate;
class vsystem_spr_device : public device_t
{
public:
- vsystem_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
// static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
static void set_offsets(device_t &device, int xoffs, int yoffs);
static void set_pdraw(device_t &device, bool pdraw);
- static void set_tile_indirect_cb(device_t &device,vsystem_tile_indirection_delegate newtilecb);
+ static void set_tile_indirect_cb(device_t &device, vsystem_tile_indirection_delegate newtilecb);
static void set_gfx_region(device_t &device, int gfx_region);
static void CG10103_set_pal_base(device_t &device, int pal_base);
static void set_pal_mask(device_t &device, int pal_mask);
static void CG10103_set_transpen(device_t &device, int transpen);
+ vsystem_spr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+ void draw_sprites(uint16_t const *spriteram, int spriteram_bytes, screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int prihack_mask = -1, int prihack_val = -1 );
+ void set_pal_base(int pal_base) { m_pal_base = pal_base; }
+
+protected:
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+private:
+ struct sprite_attributes
+ {
+ sprite_attributes() { }
+ void get(uint16_t const *ram);
+
+ int ox = 0;
+ int xsize = 0;
+ int zoomx = 0;
+ int oy = 0;
+ int ysize = 0;
+ int zoomy = 0;
+ int flipx = 0;
+ int flipy = 0;
+ int color = 0;
+ int pri = 0;
+ uint32_t map = 0;
+ };
+
uint32_t tile_callback_noindirect(uint32_t tile);
+ void common_sprite_drawgfx(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap);
+
vsystem_tile_indirection_delegate m_newtilecb;
// inline config
@@ -49,37 +79,12 @@ public:
uint16_t m_pal_base;
- struct vsystem_sprite_attributes
- {
- int ox;
- int xsize;
- int zoomx;
- int oy;
- int ysize;
- int zoomy;
- int flipx;
- int flipy;
- int color;
- int pri;
- uint32_t map;
- } m_curr_sprite;
-
- void get_sprite_attributes(uint16_t* ram);
- void common_sprite_drawgfx(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap);
-
- void draw_sprites( uint16_t* spriteram, int spriteram_bytes, screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int prihack_mask = -1, int prihack_val = -1 );
- void set_pal_base(int pal_base);
+ sprite_attributes m_curr_sprite;
-
-protected:
- virtual void device_start() override;
- virtual void device_reset() override;
-
-private:
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type VSYSTEM_SPR;
+DECLARE_DEVICE_TYPE(VSYSTEM_SPR, vsystem_spr_device)
#endif // MAME_VIDEO_VSYSTEM_SPR_H
diff --git a/src/mame/video/vsystem_spr2.cpp b/src/mame/video/vsystem_spr2.cpp
index 74712e37021..19e6df502f9 100644
--- a/src/mame/video/vsystem_spr2.cpp
+++ b/src/mame/video/vsystem_spr2.cpp
@@ -27,17 +27,18 @@
#include "vsystem_spr2.h"
-const device_type VSYSTEM_SPR2 = device_creator<vsystem_spr2_device>;
+DEFINE_DEVICE_TYPE(VSYSTEM_SPR2, vsystem_spr2_device, "vsystem2_spr", "Video System Sprites Type 2")
vsystem_spr2_device::vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, VSYSTEM_SPR2, "Video System Sprites Type 2", tag, owner, clock, "vsystem_spr2", __FILE__)
+ : device_t(mconfig, VSYSTEM_SPR2, tag, owner, clock)
+ , m_newtilecb(vsystem_tile2_indirection_delegate(FUNC(vsystem_spr2_device::tile_callback_noindirect), this))
+ , m_pritype(0) // hack until we have better handling
+ , m_gfx_region(0)
+ , m_xoffs(0)
+ , m_yoffs(0)
+ , m_curr_sprite()
, m_gfxdecode(*this, finder_base::DUMMY_TAG)
{
- m_newtilecb = vsystem_tile2_indirection_delegate(FUNC(vsystem_spr2_device::tile_callback_noindirect), this);
- m_pritype = 0; // hack until we have better handling
- m_gfx_region = 0;
- m_xoffs = 0;
- m_yoffs = 0;
}
//-------------------------------------------------
@@ -93,42 +94,42 @@ void vsystem_spr2_device::device_reset()
}
-int vsystem_spr2_device::get_sprite_attributes(uint16_t* ram)
+bool vsystem_spr2_device::sprite_attributes::get(uint16_t const *ram)
{
// sprite is disabled
if (!(ram[2] & 0x0080))
- return 0;
+ return false;
- curr_sprite.oy = (ram[0] & 0x01ff);
- curr_sprite.zoomy = (ram[0] & 0xf000) >> 12;
+ oy = (ram[0] & 0x01ff);
+ zoomy = (ram[0] & 0xf000) >> 12;
- curr_sprite.ox = (ram[1] & 0x01ff);
- curr_sprite.zoomx = (ram[1] & 0xf000) >> 12;
+ ox = (ram[1] & 0x01ff);
+ zoomx = (ram[1] & 0xf000) >> 12;
- curr_sprite.xsize = (ram[2] & 0x0700) >> 8;
- curr_sprite.flipx = (ram[2] & 0x0800);
+ xsize = (ram[2] & 0x0700) >> 8;
+ flipx = (ram[2] & 0x0800);
- curr_sprite.ysize = (ram[2] & 0x7000) >> 12;
- curr_sprite.flipy = (ram[2] & 0x8000);
+ ysize = (ram[2] & 0x7000) >> 12;
+ flipy = (ram[2] & 0x8000);
- curr_sprite.color = (ram[2] & 0x000f);
- curr_sprite.pri = (ram[2] & 0x0010);
+ color = (ram[2] & 0x000f);
+ pri = (ram[2] & 0x0010);
- curr_sprite.map = (ram[3]);
+ map = (ram[3]);
- return 1;
+ return true;
}
-void vsystem_spr2_device::handle_xsize_map_inc(void)
+void vsystem_spr2_device::sprite_attributes::handle_xsize_map_inc()
{
- if (curr_sprite.xsize == 2) curr_sprite.map += 1;
- if (curr_sprite.xsize == 4) curr_sprite.map += 3;
- if (curr_sprite.xsize == 5) curr_sprite.map += 2;
- if (curr_sprite.xsize == 6) curr_sprite.map += 1;
+ if (xsize == 2) map += 1;
+ if (xsize == 4) map += 3;
+ if (xsize == 5) map += 2;
+ if (xsize == 6) map += 1;
}
-template<class _BitmapClass>
-void vsystem_spr2_device::turbofrc_draw_sprites_common( uint16_t* spriteram3, int spriteram3_bytes, int spritepalettebank, _BitmapClass &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param )
+template<class BitmapClass>
+void vsystem_spr2_device::turbofrc_draw_sprites_common(uint16_t const *spriteram3, int spriteram3_bytes, int spritepalettebank, BitmapClass &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param )
{
int attr_start, first;
first = 4 * spriteram3[0x1fe];
@@ -156,30 +157,30 @@ void vsystem_spr2_device::turbofrc_draw_sprites_common( uint16_t* spriteram3, i
{
int x, y;
- if (!get_sprite_attributes(&spriteram3[attr_start]))
+ if (!m_curr_sprite.get(&spriteram3[attr_start]))
continue;
// pipedrm
- curr_sprite.ox += m_xoffs;
- curr_sprite.oy += m_yoffs;
+ m_curr_sprite.ox += m_xoffs;
+ m_curr_sprite.oy += m_yoffs;
int usepri = 0;
// these are still calling the function multiple times to filter out priorities, even if some are also using pdrawgfx(!)
if (m_pritype == 0 || m_pritype == 1 || m_pritype == 3) // turbo force, spinlbrk, pipedrm etc.
{
- if ((curr_sprite.pri>>4) != pri_param)
+ if ((m_curr_sprite.pri>>4) != pri_param)
continue;
}
if (m_pritype == 0) // turbo force etc.
{
- usepri = curr_sprite.pri ? 0 : 2;
+ usepri = m_curr_sprite.pri ? 0 : 2;
}
else if (m_pritype == 1) // spinlbrk
{
- usepri = curr_sprite.pri ? 2 : 0;
+ usepri = m_curr_sprite.pri ? 2 : 0;
}
else if (m_pritype == 2) // f1gp
{
@@ -188,55 +189,59 @@ void vsystem_spr2_device::turbofrc_draw_sprites_common( uint16_t* spriteram3, i
- curr_sprite.color += 16 * spritepalettebank;
+ m_curr_sprite.color += 16 * spritepalettebank;
- curr_sprite.zoomx = 32 - curr_sprite.zoomx;
- curr_sprite.zoomy = 32 - curr_sprite.zoomy;
+ m_curr_sprite.zoomx = 32 - m_curr_sprite.zoomx;
+ m_curr_sprite.zoomy = 32 - m_curr_sprite.zoomy;
- for (y = 0; y <= curr_sprite.ysize; y++)
+ for (y = 0; y <= m_curr_sprite.ysize; y++)
{
int sx, sy;
- if (curr_sprite.flipy)
- sy = ((curr_sprite.oy + curr_sprite.zoomy * (curr_sprite.ysize - y)/2 + 16) & 0x1ff) - 16;
+ if (m_curr_sprite.flipy)
+ sy = ((m_curr_sprite.oy + m_curr_sprite.zoomy * (m_curr_sprite.ysize - y)/2 + 16) & 0x1ff) - 16;
else
- sy = ((curr_sprite.oy + curr_sprite.zoomy * y / 2 + 16) & 0x1ff) - 16;
+ sy = ((m_curr_sprite.oy + m_curr_sprite.zoomy * y / 2 + 16) & 0x1ff) - 16;
- for (x = 0; x <= curr_sprite.xsize; x++)
+ for (x = 0; x <= m_curr_sprite.xsize; x++)
{
int curr;
- if (curr_sprite.flipx)
- sx = ((curr_sprite.ox + curr_sprite.zoomx * (curr_sprite.xsize - x) / 2 + 16) & 0x1ff) - 16;
+ if (m_curr_sprite.flipx)
+ sx = ((m_curr_sprite.ox + m_curr_sprite.zoomx * (m_curr_sprite.xsize - x) / 2 + 16) & 0x1ff) - 16;
else
- sx = ((curr_sprite.ox + curr_sprite.zoomx * x / 2 + 16) & 0x1ff) - 16;
+ sx = ((m_curr_sprite.ox + m_curr_sprite.zoomx * x / 2 + 16) & 0x1ff) - 16;
- curr = m_newtilecb(curr_sprite.map++);
+ curr = m_newtilecb(m_curr_sprite.map++);
if (m_pritype == 0 || m_pritype == 1 || m_pritype == 2) // pdrawgfx cases
{
- m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
- m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
- m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
- m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
+ m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x000,sy-0x000, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
+ m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x200,sy-0x000, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
+ m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x000,sy-0x200, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
+ m_gfxdecode->gfx(m_gfx_region)->prio_zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x200,sy-0x200, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11, priority_bitmap,usepri,15);
}
else // drawgfx cases (welltris, pipedrm)
{
- m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15);
- m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x000, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15);
- m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x000,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15);
- m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, curr_sprite.color, curr_sprite.flipx,curr_sprite.flipy, sx-0x200,sy-0x200, curr_sprite.zoomx << 11, curr_sprite.zoomy << 11,15);
+ m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x000,sy-0x000, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11,15);
+ m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x200,sy-0x000, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11,15);
+ m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x000,sy-0x200, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11,15);
+ m_gfxdecode->gfx(m_gfx_region)->zoom_transpen(bitmap,cliprect, curr, m_curr_sprite.color, m_curr_sprite.flipx,m_curr_sprite.flipy, sx-0x200,sy-0x200, m_curr_sprite.zoomx << 11, m_curr_sprite.zoomy << 11,15);
}
}
- handle_xsize_map_inc();
+ m_curr_sprite.handle_xsize_map_inc();
}
}
}
-void vsystem_spr2_device::turbofrc_draw_sprites( uint16_t* spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param )
-{ turbofrc_draw_sprites_common( spriteram3, spriteram3_bytes, spritepalettebank, bitmap, cliprect, priority_bitmap, pri_param ); }
+void vsystem_spr2_device::turbofrc_draw_sprites(uint16_t const *spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param )
+{
+ turbofrc_draw_sprites_common( spriteram3, spriteram3_bytes, spritepalettebank, bitmap, cliprect, priority_bitmap, pri_param );
+}
-void vsystem_spr2_device::turbofrc_draw_sprites( uint16_t* spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param )
-{ turbofrc_draw_sprites_common( spriteram3, spriteram3_bytes, spritepalettebank, bitmap, cliprect, priority_bitmap, pri_param ); }
+void vsystem_spr2_device::turbofrc_draw_sprites(uint16_t const *spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param )
+{
+ turbofrc_draw_sprites_common( spriteram3, spriteram3_bytes, spritepalettebank, bitmap, cliprect, priority_bitmap, pri_param );
+}
diff --git a/src/mame/video/vsystem_spr2.h b/src/mame/video/vsystem_spr2.h
index 646abf8d0c7..2ab7b87fffa 100644
--- a/src/mame/video/vsystem_spr2.h
+++ b/src/mame/video/vsystem_spr2.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria, David Haywood
// Video System Sprites
+#ifndef MAME_VIDEO_VSYSTEM_SPR2_H
+#define MAME_VIDEO_VSYSTEM_SPR2_H
typedef device_delegate<uint32_t (uint32_t)> vsystem_tile2_indirection_delegate;
@@ -18,54 +20,58 @@ typedef device_delegate<uint32_t (uint32_t)> vsystem_tile2_indirection_delegate;
class vsystem_spr2_device : public device_t
{
public:
- vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
- // static configuration
+ // static configuration
static void static_set_gfxdecode_tag(device_t &device, const char *tag);
- static void set_tile_indirect_cb(device_t &device,vsystem_tile2_indirection_delegate newtilecb);
+ static void set_tile_indirect_cb(device_t &device, vsystem_tile2_indirection_delegate newtilecb);
static void set_pritype(device_t &device, int pritype);
static void set_gfx_region(device_t &device, int gfx_region);
static void set_offsets(device_t &device, int xoffs, int yoffs);
- struct vsystem_sprite_attributes
- {
- int ox;
- int xsize;
- int zoomx;
- int oy;
- int ysize;
- int zoomy;
- int flipx;
- int flipy;
- int color;
- int pri;
- uint32_t map;
- } curr_sprite;
-
- int get_sprite_attributes(uint16_t* ram);
- void handle_xsize_map_inc(void);
- vsystem_tile2_indirection_delegate m_newtilecb;
- uint32_t tile_callback_noindirect(uint32_t tile);
- int m_pritype;
- int m_gfx_region;
- int m_xoffs, m_yoffs;
-
- template<class _BitmapClass>
- void turbofrc_draw_sprites_common( uint16_t* spriteram3, int spriteram3_bytes, int spritepalettebank, _BitmapClass &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param );
-
- void turbofrc_draw_sprites( uint16_t* spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param );
- void turbofrc_draw_sprites( uint16_t* spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param );
-
+ vsystem_spr2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ void turbofrc_draw_sprites(uint16_t const *spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param );
+ void turbofrc_draw_sprites(uint16_t const *spriteram3, int spriteram3_bytes, int spritepalettebank, bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param );
protected:
virtual void device_start() override;
virtual void device_reset() override;
-
private:
+ struct sprite_attributes
+ {
+ sprite_attributes() { }
+ bool get(uint16_t const *ram);
+ void handle_xsize_map_inc();
+
+ int ox = 0;
+ int xsize = 0;
+ int zoomx = 0;
+ int oy = 0;
+ int ysize = 0;
+ int zoomy = 0;
+ int flipx = 0;
+ int flipy = 0;
+ int color = 0;
+ int pri = 0;
+ uint32_t map = 0;
+ };
+
+ uint32_t tile_callback_noindirect(uint32_t tile);
+
+ template<class BitmapClass>
+ void turbofrc_draw_sprites_common(uint16_t const *spriteram3, int spriteram3_bytes, int spritepalettebank, BitmapClass &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri_param );
+
+ vsystem_tile2_indirection_delegate m_newtilecb;
+ int m_pritype;
+ int m_gfx_region;
+ int m_xoffs, m_yoffs;
+
+ sprite_attributes m_curr_sprite;
+
required_device<gfxdecode_device> m_gfxdecode;
};
-extern const device_type VSYSTEM_SPR2;
+DECLARE_DEVICE_TYPE(VSYSTEM_SPR2, vsystem_spr2_device)
+
+#endif // MAME_VIDEO_VSYSTEM_SPR2_H
diff --git a/src/mame/video/vtvideo.cpp b/src/mame/video/vtvideo.cpp
index 4e3114a5a02..79b9019987c 100644
--- a/src/mame/video/vtvideo.cpp
+++ b/src/mame/video/vtvideo.cpp
@@ -70,12 +70,12 @@ PARAMETERS
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
-const device_type VT100_VIDEO = device_creator<vt100_video_device>;
-const device_type RAINBOW_VIDEO = device_creator<rainbow_video_device>;
+DEFINE_DEVICE_TYPE(VT100_VIDEO, vt100_video_device, "vt100_video", "VT100 Video")
+DEFINE_DEVICE_TYPE(RAINBOW_VIDEO, rainbow_video_device, "rainbow_video", "Rainbow Video")
-vt100_video_device::vt100_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source)
- : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
+vt100_video_device::vt100_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, type, tag, owner, clock)
, device_video_interface(mconfig, *this)
, m_read_ram(*this)
, m_write_clear_video_interrupt(*this)
@@ -86,13 +86,13 @@ vt100_video_device::vt100_video_device(const machine_config &mconfig, device_typ
vt100_video_device::vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : vt100_video_device(mconfig, VT100_VIDEO, "VT100 Video", tag, owner, clock, "vt100_video", __FILE__)
+ : vt100_video_device(mconfig, VT100_VIDEO, tag, owner, clock)
{
}
rainbow_video_device::rainbow_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : vt100_video_device(mconfig, RAINBOW_VIDEO, "Rainbow Video", tag, owner, clock, "rainbow_video", __FILE__)
+ : vt100_video_device(mconfig, RAINBOW_VIDEO, tag, owner, clock)
{
}
diff --git a/src/mame/video/vtvideo.h b/src/mame/video/vtvideo.h
index 9a2e7e4c6ad..f753e2cb4fc 100644
--- a/src/mame/video/vtvideo.h
+++ b/src/mame/video/vtvideo.h
@@ -9,20 +9,20 @@ DEC VT Terminal video emulation
**********************************************************************/
-#ifndef __VT_VIDEO__
-#define __VT_VIDEO__
+#ifndef MAME_VIDEO_VTVIDEO_H
+#define MAME_VIDEO_VTVIDEO_H
+
+#pragma once
class vt100_video_device : public device_t,
public device_video_interface
{
public:
- vt100_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- ~vt100_video_device() {}
- template<class _Object> static devcb_base &set_ram_rd_callback(device_t &device, _Object object) { return downcast<vt100_video_device &>(device).m_read_ram.set_callback(object); }
- template<class _Object> static devcb_base &set_clear_video_irq_wr_callback(device_t &device, _Object object) { return downcast<vt100_video_device &>(device).m_write_clear_video_interrupt.set_callback(object); }
+ template <class Object> static devcb_base &set_ram_rd_callback(device_t &device, Object &&cb) { return downcast<vt100_video_device &>(device).m_read_ram.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_clear_video_irq_wr_callback(device_t &device, Object &&cb) { return downcast<vt100_video_device &>(device).m_write_clear_video_interrupt.set_callback(std::forward<Object>(cb)); }
static void set_chargen_tag(device_t &device, const char *tag) { downcast<vt100_video_device &>(device).m_char_rom.set_tag(tag); }
@@ -33,6 +33,8 @@ public:
virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect);
protected:
+ vt100_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -93,8 +95,8 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
};
-extern const device_type VT100_VIDEO;
-extern const device_type RAINBOW_VIDEO;
+DECLARE_DEVICE_TYPE(VT100_VIDEO, vt100_video_device)
+DECLARE_DEVICE_TYPE(RAINBOW_VIDEO, rainbow_video_device)
#define MCFG_VT_SET_SCREEN MCFG_VIDEO_SET_SCREEN
@@ -108,4 +110,4 @@ extern const device_type RAINBOW_VIDEO;
#define MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(_write) \
devcb = &vt100_video_device::set_clear_video_irq_wr_callback(*device, DEVCB_##_write);
-#endif
+#endif // MAME_VIDEO_VTVIDEO_H
diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp
index fc6338f3301..755c4b7fbc4 100644
--- a/src/mame/video/wpc_dmd.cpp
+++ b/src/mame/video/wpc_dmd.cpp
@@ -5,7 +5,7 @@
#include "rendlay.h"
#include "screen.h"
-const device_type WPC_DMD = device_creator<wpc_dmd_device>;
+DEFINE_DEVICE_TYPE(WPC_DMD, wpc_dmd_device, "wpc_dmd", "Williams Pinball Controller Dot Matrix Display")
DEVICE_ADDRESS_MAP_START( registers, 8, wpc_dmd_device )
AM_RANGE(0, 0) AM_WRITE(bank2_w)
@@ -32,7 +32,7 @@ MACHINE_CONFIG_END
wpc_dmd_device::wpc_dmd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, WPC_DMD, "Williams Pinball Controller Dot Matrix Display", tag, owner, clock, "wpc_dmd", __FILE__),
+ device_t(mconfig, WPC_DMD, tag, owner, clock),
scanline_cb(*this),
dmd0(*this, ":dmd0"),
dmd2(*this, ":dmd2"),
diff --git a/src/mame/video/wpc_dmd.h b/src/mame/video/wpc_dmd.h
index e5c51fd04af..6fc3f1b57e7 100644
--- a/src/mame/video/wpc_dmd.h
+++ b/src/mame/video/wpc_dmd.h
@@ -5,8 +5,8 @@
// A 128x32 plasma display with 16 pages and refreshed at 240Hz (for PWM luminosity control)
-#ifndef WPC_DMD_H
-#define WPC_DMD_H
+#ifndef MAME_VIDEO_WPC_DMD_H
+#define MAME_VIDEO_WPC_DMD_H
#define MCFG_WPC_DMD_ADD( _tag, _scanline_cb ) \
MCFG_DEVICE_ADD( _tag, WPC_DMD, 0 ) \
@@ -32,7 +32,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(scanline_timer);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- template<class _Object> static devcb_base &set_scanline_cb(device_t &device, _Object object) { return downcast<wpc_dmd_device &>(device).scanline_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_scanline_cb(device_t &device, Object &&cb) { return downcast<wpc_dmd_device &>(device).scanline_cb.set_callback(std::forward<Object>(cb)); }
protected:
devcb_write_line scanline_cb;
@@ -46,6 +46,6 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override;
};
-extern const device_type WPC_DMD;
+DECLARE_DEVICE_TYPE(WPC_DMD, wpc_dmd_device)
-#endif
+#endif // MAME_VIDEO_WPC_DMD_H
diff --git a/src/mame/video/wswan.cpp b/src/mame/video/wswan.cpp
index 4ac72c2e596..cbfe7219f2f 100644
--- a/src/mame/video/wswan.cpp
+++ b/src/mame/video/wswan.cpp
@@ -17,12 +17,12 @@
#include "wswan.h"
#include "screen.h"
-const device_type WSWAN_VIDEO = device_creator<wswan_video_device>;
+DEFINE_DEVICE_TYPE(WSWAN_VIDEO, wswan_video_device, "wswan_video", "Bandai WonderSwam VDP")
wswan_video_device::wswan_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, WSWAN_VIDEO, "Bandai WonderSwan VDP", tag, owner, clock, "wswan_video", __FILE__),
- m_vdp_type(VDP_TYPE_WSWAN)
+ : device_t(mconfig, WSWAN_VIDEO, tag, owner, clock)
+ , m_vdp_type(VDP_TYPE_WSWAN)
{
}
diff --git a/src/mame/video/wswan.h b/src/mame/video/wswan.h
index 8a6b550b3ca..e6735ba768f 100644
--- a/src/mame/video/wswan.h
+++ b/src/mame/video/wswan.h
@@ -11,8 +11,10 @@
**********************************************************************/
-#ifndef __WSWAN_VIDEO__
-#define __WSWAN_VIDEO__
+#ifndef MAME_VIDEO_WSWAN_H
+#define MAME_VIDEO_WSWAN_H
+
+#pragma once
enum
@@ -142,7 +144,7 @@ protected:
static const uint8_t WSWAN_VIDEO_IFLAG_HBLTMR = 0x80;
};
-extern const device_type WSWAN_VIDEO;
+DECLARE_DEVICE_TYPE(WSWAN_VIDEO, wswan_video_device)
-#endif
+#endif // MAME_VIDEO_WSWAN_H
diff --git a/src/mame/video/xexex.cpp b/src/mame/video/xexex.cpp
index 57d154484d2..3ce65d86128 100644
--- a/src/mame/video/xexex.cpp
+++ b/src/mame/video/xexex.cpp
@@ -43,12 +43,12 @@ void xexex_state::video_start()
uint32_t xexex_state::screen_update_xexex(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- static const int K053251_CI[4] = { K053251_CI1, K053251_CI2, K053251_CI3, K053251_CI4 };
+ static const int K053251_CI[4] = { k053251_device::CI1, k053251_device::CI2, k053251_device::CI3, k053251_device::CI4 };
int layer[4];
int bg_colorbase, new_colorbase, plane, alpha;
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI0);
- bg_colorbase = m_k053251->get_palette_index(K053251_CI1);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI0);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
m_layer_colorbase[0] = 0x70;
for (plane = 1; plane < 4; plane++)
@@ -62,13 +62,13 @@ uint32_t xexex_state::screen_update_xexex(screen_device &screen, bitmap_rgb32 &b
}
layer[0] = 1;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI2);
layer[1] = 2;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI3);
layer[2] = 3;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI4);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI4);
layer[3] = -1;
- m_layerpri[3] = m_k053251->get_priority(K053251_CI1);
+ m_layerpri[3] = m_k053251->get_priority(k053251_device::CI1);
konami_sortlayers4(layer, m_layerpri);
diff --git a/src/mame/video/xmen.cpp b/src/mame/video/xmen.cpp
index fed6ed11011..e3592f4f678 100644
--- a/src/mame/video/xmen.cpp
+++ b/src/mame/video/xmen.cpp
@@ -71,20 +71,20 @@ uint32_t xmen_state::screen_update_xmen(screen_device &screen, bitmap_ind16 &bit
{
int layer[3], bg_colorbase;
- bg_colorbase = m_k053251->get_palette_index(K053251_CI4);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI3);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI0);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI2);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI4);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI3);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI0);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI2);
m_k052109->tilemap_update();
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI3);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI0);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI0);
layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI2);
konami_sortlayers3(layer, m_layerpri);
@@ -191,20 +191,20 @@ WRITE_LINE_MEMBER(xmen_state::screen_vblank_xmen6p)
}
- bg_colorbase = m_k053251->get_palette_index(K053251_CI4);
- m_sprite_colorbase = m_k053251->get_palette_index(K053251_CI1);
- m_layer_colorbase[0] = m_k053251->get_palette_index(K053251_CI3);
- m_layer_colorbase[1] = m_k053251->get_palette_index(K053251_CI0);
- m_layer_colorbase[2] = m_k053251->get_palette_index(K053251_CI2);
+ bg_colorbase = m_k053251->get_palette_index(k053251_device::CI4);
+ m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
+ m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI3);
+ m_layer_colorbase[1] = m_k053251->get_palette_index(k053251_device::CI0);
+ m_layer_colorbase[2] = m_k053251->get_palette_index(k053251_device::CI2);
m_k052109->tilemap_update();
layer[0] = 0;
- m_layerpri[0] = m_k053251->get_priority(K053251_CI3);
+ m_layerpri[0] = m_k053251->get_priority(k053251_device::CI3);
layer[1] = 1;
- m_layerpri[1] = m_k053251->get_priority(K053251_CI0);
+ m_layerpri[1] = m_k053251->get_priority(k053251_device::CI0);
layer[2] = 2;
- m_layerpri[2] = m_k053251->get_priority(K053251_CI2);
+ m_layerpri[2] = m_k053251->get_priority(k053251_device::CI2);
konami_sortlayers3(layer, m_layerpri);
diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp
index 0366048e3c6..2b622eaf786 100644
--- a/src/mame/video/ygv608.cpp
+++ b/src/mame/video/ygv608.cpp
@@ -36,6 +36,187 @@
#include "screen.h"
+// Fundamental constants
+enum {
+ p5_rwai = 0x80, // increment register select on reads
+ p5_rrai = 0x40, // increment register select on writes
+ p5_rn = 0x3f, // register select
+
+// p6_res6 = 0xe0,
+ p6_fp = 0x10, // position detection flag
+ p6_fv = 0x08, // vertical border interval flag
+ p6_fc = 0x04,
+ p6_hb = 0x02, // horizontal blanking flag?
+ p6_vb = 0x01, // vertical blanking flag?
+
+// p7_res7 = 0xc0,
+ p7_tr = 0x20,
+ p7_tc = 0x10,
+ p7_tl = 0x08,
+ p7_ts = 0x04,
+ p7_tn = 0x02,
+ p7_sr = 0x01,
+
+ r0_pnya = 0x80, // if set, increment name table address after reads
+ r0_b_a = 0x40, // if set, we're reading from the second plane of tile data
+ r0_pny = 0x3f, // y-coordinate of current name table address
+
+ r1_pnxa = 0x80, // if set, increment name table address after read
+ r1_res1 = 0x40,
+ r1_pnx = 0x3f, // x-coordinate of current name table address
+
+ r2_cpaw = 0x80, // if set, increment color palette address after writes
+ r2_cpar = 0x40, // if set, increment color palette address after reads
+// r2_res2 = 0x20,
+ r2_b_a = 0x10,
+ r2_scaw = 0x08, // if set, increment scroll address after writes
+ r2_scar = 0x04, // if set, increment scroll address after reads
+ r2_saaw = 0x02, // if set, increment sprite address after writes
+ r2_saar = 0x01, // if set, increment sprite address after reads
+
+ r7_dckm = 0x80,
+ r7_flip = 0x40,
+// r7_res7 = 0x30,
+ r7_zron = 0x08, // if set, roz plane is active
+ r7_md = 0x06, // determines 1 of 4 possible video modes
+ r7_dspe = 0x01, // if set, display is enabled
+
+ r8_hds = 0xc0,
+ r8_vds = 0x30,
+ r8_rlrt = 0x08,
+ r8_rlsc = 0x04,
+// r8_res8 = 0x02,
+ r8_pgs = 0x01,
+
+ r9_pts = 0xc0,
+ r9_slh = 0x38,
+ r9_slv = 0x07,
+
+ r10_spa = 0xc0, // misc global sprite attributes (x/y flip or sprite size)
+ r10_spas = 0x20, // if set, spa controls sprite flip, if clear, controls sprite size
+ r10_sprd = 0x10, // if set, sprites are disabled
+ r10_mcb = 0x0c,
+ r10_mca = 0x03,
+
+ r11_scm = 0xc0,
+ r11_yse = 0x20,
+ r11_cbdr = 0x10,
+ r11_prm = 0x0c, // determines one of 4 priority settings
+ r11_ctpb = 0x02,
+ r11_ctpa = 0x01,
+
+ r12_spf = 0xc0,
+ r12_bpf = 0x38,
+ r12_apf = 0x07,
+
+// r14_res14 = 0xfc,
+ r14_iep = 0x02, // if set, generate IRQ on position detection (?)
+ r14_iev = 0x01, // if set, generate IRQ on vertical border interval draw
+
+ // these 4 are currently unimplemented by us
+ r16_fpm = 0x80,
+ r16_il8 = 0x40,
+ r16_res16 = 0x20,
+ r16_ih = 0x1f,
+
+ r17_ba1 = 0x70,
+ r17_ba0 = 0x07,
+ r18_ba3 = 0x70,
+ r18_ba2 = 0x07,
+ r19_ba5 = 0x70,
+ r19_ba4 = 0x07,
+ r20_ba7 = 0x70,
+ r20_ba6 = 0x07,
+ r21_bb1 = 0x70,
+ r21_bb0 = 0x07,
+ r22_bb3 = 0x70,
+ r22_bb2 = 0x07,
+ r23_bb5 = 0x70,
+ r23_bb4 = 0x07,
+ r24_bb7 = 0x70,
+ r24_bb6 = 0x07,
+
+ r39_hsw = 0xe0,
+ r39_hbw = 0x1f,
+
+ r40_htl89 = 0xc0,
+ r40_hdw = 0x3f,
+
+ r43_vsw = 0xe0,
+ r43_vbw = 0x1f,
+
+ r44_vsls = 0x40,
+ r44_vdw = 0x1f,
+
+ r45_vtl8 = 0x80,
+ r45_tres = 0x40,
+ r45_vdp = 0x1f
+};
+
+
+// R#7(md)
+#define MD_2PLANE_8BIT 0x00
+#define MD_2PLANE_16BIT 0x02
+#define MD_1PLANE_16COLOUR 0x04
+#define MD_1PLANE_256COLOUR 0x06
+#define MD_1PLANE (MD_1PLANE_16COLOUR & MD_1PLANE_256COLOUR)
+#define MD_SHIFT 0
+#define MD_MASK 0x06
+
+// R#8
+#define PGS_64X32 0x0
+#define PGS_32X64 0x1
+#define PGS_SHIFT 0
+#define PGS_MASK 0x01
+
+// R#9
+#define SLV_SCREEN 0x00
+#define SLV_8 0x04
+#define SLV_16 0x05
+#define SLV_32 0x06
+#define SLV_64 0x07
+#define SLH_SCREEN 0x00
+#define SLH_8 0x04
+#define SLH_16 0x05
+#define SLH_32 0x06
+#define SLH_64 0x07
+#define PTS_8X8 0x00
+#define PTS_16X16 0x40
+#define PTS_32X32 0x80
+#define PTS_64X64 0xc0
+#define PTS_SHIFT 0
+#define PTS_MASK 0xc0
+
+// R#10
+#define SPAS_SPRITESIZE 0
+#define SPAS_SPRITEREVERSE 1
+
+// R#10(spas)=1
+#define SZ_8X8 0x00
+#define SZ_16X16 0x01
+#define SZ_32X32 0x02
+#define SZ_64X64 0x03
+
+// R#10(spas)=0
+#define SZ_NOREVERSE 0x00
+#define SZ_VERTREVERSE 0x01
+#define SZ_HORIZREVERSE 0x02
+#define SZ_BOTHREVERSE 0x03
+
+// R#11(prm)
+#define PRM_SABDEX 0x00
+#define PRM_ASBDEX 0x04
+#define PRM_SEABDX 0x08
+#define PRM_ASEBDX 0x0c
+
+// R#40
+#define HDW_SHIFT 0
+#define HDW_MASK 0x3f
+
+// R#44
+#define VDW_SHIFT 0
+#define VDW_MASK 0x3f
+
#define _ENABLE_SPRITES
#define _ENABLE_SCROLLX
#define _ENABLE_SCROLLY
@@ -149,11 +330,11 @@ static GFXDECODE_START( ygv608 )
GFXDECODE_END
-const device_type YGV608 = device_creator<ygv608_device>;
+DEFINE_DEVICE_TYPE(YGV608, ygv608_device, "ygv608", "YGV608 VDP")
ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock )
- : device_t(mconfig, YGV608, "YGV608 VDP", tag, owner, clock, "ygv608", __FILE__),
- device_gfx_interface(mconfig, *this, GFXDECODE_NAME(ygv608))
+ : device_t(mconfig, YGV608, tag, owner, clock)
+ , device_gfx_interface(mconfig, *this, GFXDECODE_NAME(ygv608))
{
}
@@ -667,8 +848,8 @@ void ygv608_device::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect
/* draw sprites */
spriteClip &= cliprect;
- sa = &m_sprite_attribute_table.s[YGV608_MAX_SPRITES-1];
- for( i=0; i<YGV608_MAX_SPRITES; i++, sa-- )
+ sa = &m_sprite_attribute_table.s[MAX_SPRITES-1];
+ for( i=0; i<MAX_SPRITES; i++, sa-- )
{
int code, color, sx, sy, size, attr, g_attr, spf;
@@ -1365,7 +1546,7 @@ void ygv608_device::HandleYGV608Reset()
/* Clear internal ram */
memset( m_pattern_name_table, 0, 4096 );
memset( m_sprite_attribute_table.b, 0,
- YGV608_SPRITE_ATTR_TABLE_SIZE );
+ SPRITE_ATTR_TABLE_SIZE );
memset( m_scroll_data_table, 0, 2*256 );
memset( m_colour_palette, 0, 256*3 );
diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h
index 14eb337d2a3..bbe1e90ced7 100644
--- a/src/mame/video/ygv608.h
+++ b/src/mame/video/ygv608.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Mark McDougall
-#ifndef __YGV608_H__
-#define __YGV608_H__
+#ifndef MAME_VIDEO_YGV608_H
+#define MAME_VIDEO_YGV608_H
+
+#pragma once
#include "tilemap.h"
/*
@@ -9,279 +11,6 @@
* - Mark McDougall
*/
-// Fundamental constants
-#define YGV608_SPRITE_ATTR_TABLE_SIZE 256
-
-enum {
- p5_rwai = 0x80, // increment register select on reads
- p5_rrai = 0x40, // increment register select on writes
- p5_rn = 0x3f, // register select
-
-// p6_res6 = 0xe0,
- p6_fp = 0x10, // position detection flag
- p6_fv = 0x08, // vertical border interval flag
- p6_fc = 0x04,
- p6_hb = 0x02, // horizontal blanking flag?
- p6_vb = 0x01, // vertical blanking flag?
-
-// p7_res7 = 0xc0,
- p7_tr = 0x20,
- p7_tc = 0x10,
- p7_tl = 0x08,
- p7_ts = 0x04,
- p7_tn = 0x02,
- p7_sr = 0x01,
-
- r0_pnya = 0x80, // if set, increment name table address after reads
- r0_b_a = 0x40, // if set, we're reading from the second plane of tile data
- r0_pny = 0x3f, // y-coordinate of current name table address
-
- r1_pnxa = 0x80, // if set, increment name table address after read
- r1_res1 = 0x40,
- r1_pnx = 0x3f, // x-coordinate of current name table address
-
- r2_cpaw = 0x80, // if set, increment color palette address after writes
- r2_cpar = 0x40, // if set, increment color palette address after reads
-// r2_res2 = 0x20,
- r2_b_a = 0x10,
- r2_scaw = 0x08, // if set, increment scroll address after writes
- r2_scar = 0x04, // if set, increment scroll address after reads
- r2_saaw = 0x02, // if set, increment sprite address after writes
- r2_saar = 0x01, // if set, increment sprite address after reads
-
- r7_dckm = 0x80,
- r7_flip = 0x40,
-// r7_res7 = 0x30,
- r7_zron = 0x08, // if set, roz plane is active
- r7_md = 0x06, // determines 1 of 4 possible video modes
- r7_dspe = 0x01, // if set, display is enabled
-
- r8_hds = 0xc0,
- r8_vds = 0x30,
- r8_rlrt = 0x08,
- r8_rlsc = 0x04,
-// r8_res8 = 0x02,
- r8_pgs = 0x01,
-
- r9_pts = 0xc0,
- r9_slh = 0x38,
- r9_slv = 0x07,
-
- r10_spa = 0xc0, // misc global sprite attributes (x/y flip or sprite size)
- r10_spas = 0x20, // if set, spa controls sprite flip, if clear, controls sprite size
- r10_sprd = 0x10, // if set, sprites are disabled
- r10_mcb = 0x0c,
- r10_mca = 0x03,
-
- r11_scm = 0xc0,
- r11_yse = 0x20,
- r11_cbdr = 0x10,
- r11_prm = 0x0c, // determines one of 4 priority settings
- r11_ctpb = 0x02,
- r11_ctpa = 0x01,
-
- r12_spf = 0xc0,
- r12_bpf = 0x38,
- r12_apf = 0x07,
-
-// r14_res14 = 0xfc,
- r14_iep = 0x02, // if set, generate IRQ on position detection (?)
- r14_iev = 0x01, // if set, generate IRQ on vertical border interval draw
-
- // these 4 are currently unimplemented by us
- r16_fpm = 0x80,
- r16_il8 = 0x40,
- r16_res16 = 0x20,
- r16_ih = 0x1f,
-
- r17_ba1 = 0x70,
- r17_ba0 = 0x07,
- r18_ba3 = 0x70,
- r18_ba2 = 0x07,
- r19_ba5 = 0x70,
- r19_ba4 = 0x07,
- r20_ba7 = 0x70,
- r20_ba6 = 0x07,
- r21_bb1 = 0x70,
- r21_bb0 = 0x07,
- r22_bb3 = 0x70,
- r22_bb2 = 0x07,
- r23_bb5 = 0x70,
- r23_bb4 = 0x07,
- r24_bb7 = 0x70,
- r24_bb6 = 0x07,
-
- r39_hsw = 0xe0,
- r39_hbw = 0x1f,
-
- r40_htl89 = 0xc0,
- r40_hdw = 0x3f,
-
- r43_vsw = 0xe0,
- r43_vbw = 0x1f,
-
- r44_vsls = 0x40,
- r44_vdw = 0x1f,
-
- r45_vtl8 = 0x80,
- r45_tres = 0x40,
- r45_vdp = 0x1f
-};
-
-
-struct YGV_PORTS {
- uint8_t na; // P#0 - pattern name table data port (read/write)
- uint8_t p1; // P#1 - sprite data port (read/write)
- uint8_t p2; // P#2 - scroll data port (read/write)
- uint8_t p3; // P#3 - colour palette data port (read/write)
- uint8_t p4; // P#4 - register data port (read/write)
- uint8_t p5; // P#5 - register select port (write only)
- uint8_t p6; // P#6 - status port (read/write)
- uint8_t p7; // P#7 - system control port (read/write)
-};
-
-struct YGV_REGS {
- uint8_t r0; // R#0 - pattern name table access ptr (r/w)
- uint8_t r1; // R#1 - pattern name table access ptr (r/w)
- uint8_t r2; // R#2 - built in ram access control
- uint8_t saa; // R#3 - sprite attribute table access ptr (r/w)
- uint8_t sca; // R#4 - scroll table access ptr (r/w)
- uint8_t cc; // R#5 - color palette access ptr (r/w)
- uint8_t sba; // R#6 - sprite generator base address (r/w)
-
- // R#7 - R#11 - screen control (r/w)
- uint8_t r7; // misc screen control (r/w)
- uint8_t r8; // misc screen control (r/w)
- uint8_t r9; // misc screen control (r/w)
- uint8_t r10; // misc screen control (r/w)
- uint8_t r11; // misc screen control (r/w)
-
- uint8_t r12; // R#12 - color palette selection (r/w)
- uint8_t bdc; // R#13 - border colour (wo)
-
- // R#14 - R#16 - interrupt control
- uint8_t r14;
- uint8_t il;
- uint8_t r16;
-
- // R#17 - R#24 - base address (wo)
- uint8_t r17;
- uint8_t r18;
- uint8_t r19;
- uint8_t r20;
- uint8_t r21;
- uint8_t r22;
- uint8_t r23;
- uint8_t r24;
-
- // R#25 - R#38 - enlargement, contraction and rotation parameters (wo)
- uint8_t ax0;
- uint8_t ax8;
- uint8_t ax16;
-
- uint8_t dx0;
- uint8_t dx8;
- uint8_t dxy0;
- uint8_t dxy8;
-
- uint8_t ay0;
- uint8_t ay8;
- uint8_t ay16;
-
- uint8_t dy0;
- uint8_t dy8;
- uint8_t dyx0;
- uint8_t dyx8;
-
- // R#39 - R#46 - display scan control (wo)
- uint8_t r39;
- uint8_t r40;
- uint8_t hdsp;
- uint8_t htl;
- uint8_t r43;
- uint8_t r44;
- uint8_t r45;
- uint8_t vtl;
-
- // R#47 - R#49 - rom transfer control (wo)
- uint8_t tb5;
- uint8_t tb13;
- uint8_t tn4;
-
-};
-
-#define YGV608_MAX_SPRITES (YGV608_SPRITE_ATTR_TABLE_SIZE>>2)
-
-// R#7(md)
-#define MD_2PLANE_8BIT 0x00
-#define MD_2PLANE_16BIT 0x02
-#define MD_1PLANE_16COLOUR 0x04
-#define MD_1PLANE_256COLOUR 0x06
-#define MD_1PLANE (MD_1PLANE_16COLOUR & MD_1PLANE_256COLOUR)
-#define MD_SHIFT 0
-#define MD_MASK 0x06
-
-// R#8
-#define PGS_64X32 0x0
-#define PGS_32X64 0x1
-#define PGS_SHIFT 0
-#define PGS_MASK 0x01
-
-// R#9
-#define SLV_SCREEN 0x00
-#define SLV_8 0x04
-#define SLV_16 0x05
-#define SLV_32 0x06
-#define SLV_64 0x07
-#define SLH_SCREEN 0x00
-#define SLH_8 0x04
-#define SLH_16 0x05
-#define SLH_32 0x06
-#define SLH_64 0x07
-#define PTS_8X8 0x00
-#define PTS_16X16 0x40
-#define PTS_32X32 0x80
-#define PTS_64X64 0xc0
-#define PTS_SHIFT 0
-#define PTS_MASK 0xc0
-
-// R#10
-#define SPAS_SPRITESIZE 0
-#define SPAS_SPRITEREVERSE 1
-
-// R#10(spas)=1
-#define SZ_8X8 0x00
-#define SZ_16X16 0x01
-#define SZ_32X32 0x02
-#define SZ_64X64 0x03
-
-// R#10(spas)=0
-#define SZ_NOREVERSE 0x00
-#define SZ_VERTREVERSE 0x01
-#define SZ_HORIZREVERSE 0x02
-#define SZ_BOTHREVERSE 0x03
-
-// R#11(prm)
-#define PRM_SABDEX 0x00
-#define PRM_ASBDEX 0x04
-#define PRM_SEABDX 0x08
-#define PRM_ASEBDX 0x0c
-
-// R#40
-#define HDW_SHIFT 0
-#define HDW_MASK 0x3f
-
-// R#44
-#define VDW_SHIFT 0
-#define VDW_MASK 0x3f
-
-struct SPRITE_ATTR {
- uint8_t sy; // y dot position 7:0
- uint8_t sx; // x dot position 7:0
- uint8_t attr; // 0xf0 = color, 0x0c = size, reverse, 0x02 = x hi bit, 0x01 = y hi bit
- uint8_t sn; // pattern name (0-255)
-};
-
class ygv608_device : public device_t, public device_gfx_interface
{
public:
@@ -303,7 +32,100 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
+
private:
+ static constexpr unsigned SPRITE_ATTR_TABLE_SIZE = 256;
+
+ struct YGV_PORTS {
+ uint8_t na; // P#0 - pattern name table data port (read/write)
+ uint8_t p1; // P#1 - sprite data port (read/write)
+ uint8_t p2; // P#2 - scroll data port (read/write)
+ uint8_t p3; // P#3 - colour palette data port (read/write)
+ uint8_t p4; // P#4 - register data port (read/write)
+ uint8_t p5; // P#5 - register select port (write only)
+ uint8_t p6; // P#6 - status port (read/write)
+ uint8_t p7; // P#7 - system control port (read/write)
+ };
+
+ struct YGV_REGS {
+ uint8_t r0; // R#0 - pattern name table access ptr (r/w)
+ uint8_t r1; // R#1 - pattern name table access ptr (r/w)
+ uint8_t r2; // R#2 - built in ram access control
+ uint8_t saa; // R#3 - sprite attribute table access ptr (r/w)
+ uint8_t sca; // R#4 - scroll table access ptr (r/w)
+ uint8_t cc; // R#5 - color palette access ptr (r/w)
+ uint8_t sba; // R#6 - sprite generator base address (r/w)
+
+ // R#7 - R#11 - screen control (r/w)
+ uint8_t r7; // misc screen control (r/w)
+ uint8_t r8; // misc screen control (r/w)
+ uint8_t r9; // misc screen control (r/w)
+ uint8_t r10; // misc screen control (r/w)
+ uint8_t r11; // misc screen control (r/w)
+
+ uint8_t r12; // R#12 - color palette selection (r/w)
+ uint8_t bdc; // R#13 - border colour (wo)
+
+ // R#14 - R#16 - interrupt control
+ uint8_t r14;
+ uint8_t il;
+ uint8_t r16;
+
+ // R#17 - R#24 - base address (wo)
+ uint8_t r17;
+ uint8_t r18;
+ uint8_t r19;
+ uint8_t r20;
+ uint8_t r21;
+ uint8_t r22;
+ uint8_t r23;
+ uint8_t r24;
+
+ // R#25 - R#38 - enlargement, contraction and rotation parameters (wo)
+ uint8_t ax0;
+ uint8_t ax8;
+ uint8_t ax16;
+
+ uint8_t dx0;
+ uint8_t dx8;
+ uint8_t dxy0;
+ uint8_t dxy8;
+
+ uint8_t ay0;
+ uint8_t ay8;
+ uint8_t ay16;
+
+ uint8_t dy0;
+ uint8_t dy8;
+ uint8_t dyx0;
+ uint8_t dyx8;
+
+ // R#39 - R#46 - display scan control (wo)
+ uint8_t r39;
+ uint8_t r40;
+ uint8_t hdsp;
+ uint8_t htl;
+ uint8_t r43;
+ uint8_t r44;
+ uint8_t r45;
+ uint8_t vtl;
+
+ // R#47 - R#49 - rom transfer control (wo)
+ uint8_t tb5;
+ uint8_t tb13;
+ uint8_t tn4;
+
+ };
+
+ static constexpr unsigned MAX_SPRITES = SPRITE_ATTR_TABLE_SIZE >> 2;
+
+ struct SPRITE_ATTR {
+ uint8_t sy; // y dot position 7:0
+ uint8_t sx; // x dot position 7:0
+ uint8_t attr; // 0xf0 = color, 0x0c = size, reverse, 0x02 = x hi bit, 0x01 = y hi bit
+ uint8_t sn; // pattern name (0-255)
+ };
+
TILEMAP_MAPPER_MEMBER(get_tile_offset);
TILE_GET_INFO_MEMBER(get_tile_info_A_8);
TILE_GET_INFO_MEMBER(get_tile_info_B_8);
@@ -347,8 +169,8 @@ private:
uint8_t m_pattern_name_table[4096];
union {
- uint8_t b[YGV608_SPRITE_ATTR_TABLE_SIZE];
- SPRITE_ATTR s[YGV608_MAX_SPRITES];
+ uint8_t b[SPRITE_ATTR_TABLE_SIZE];
+ SPRITE_ATTR s[MAX_SPRITES];
} m_sprite_attribute_table;
uint8_t m_scroll_data_table[2][256];
@@ -376,7 +198,7 @@ private:
};
// device type definition
-extern const device_type YGV608;
+DECLARE_DEVICE_TYPE(YGV608, ygv608_device)
//**************************************************************************
diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp
index bac4b89729b..6e2184f9f42 100644
--- a/src/mame/video/zx8301.cpp
+++ b/src/mame/video/zx8301.cpp
@@ -52,7 +52,7 @@ static const rgb_t PALETTE_ZX8301[] =
//**************************************************************************
// devices
-const device_type ZX8301 = device_creator<zx8301_device>;
+DEFINE_DEVICE_TYPE(ZX8301, zx8301_device, "zx8301", "Sinclair ZX8301")
// default address map
@@ -107,7 +107,7 @@ inline void zx8301_device::writebyte(offs_t address, uint8_t data)
//-------------------------------------------------
zx8301_device::zx8301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, ZX8301, "Sinclair ZX8301", tag, owner, clock, "zx8301", __FILE__)
+ : device_t(mconfig, ZX8301, tag, owner, clock)
, device_memory_interface(mconfig, *this)
, device_video_interface(mconfig, *this)
, m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, nullptr, *ADDRESS_MAP_NAME(zx8301))
diff --git a/src/mame/video/zx8301.h b/src/mame/video/zx8301.h
index f3e1b8b252d..d2729eed02e 100644
--- a/src/mame/video/zx8301.h
+++ b/src/mame/video/zx8301.h
@@ -29,10 +29,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_VIDEO_ZX8301_H
+#define MAME_VIDEO_ZX8301_H
-#ifndef __ZX8301__
-#define __ZX8301__
+#pragma once
@@ -63,7 +63,7 @@ public:
// construction/destruction
zx8301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_vsync_wr_callback(device_t &device, _Object object) { return downcast<zx8301_device &>(device).m_write_vsync.set_callback(object); }
+ template <class Object> static devcb_base &set_vsync_wr_callback(device_t &device, Object &&cb) { return downcast<zx8301_device &>(device).m_write_vsync.set_callback(std::forward<Object>(cb)); }
static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<zx8301_device &>(device).m_cpu.set_tag(tag); }
DECLARE_WRITE8_MEMBER( control_w );
@@ -115,8 +115,8 @@ private:
// device type definition
-extern const device_type ZX8301;
+DECLARE_DEVICE_TYPE(ZX8301, zx8301_device)
-#endif
+#endif // MAME_VIDEO_ZX8301_H