summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar David Haywood <hazemamewip@hotmail.com>2018-07-01 20:19:58 +0100
committerGravatarGravatar ajrhacker <ajrhacker@users.noreply.github.com>2018-07-01 15:19:58 -0400
commite3aae75004d3d6551e9282b1330d53ba1f5d05e2 (patch) (github)
tree17fa92253713e6f94e86e07cd52806395fe4ce1e
parent6e15d298234a0d8140061b7a4be8c617f12c9690 (diff)
downloadmame-e3aae75004d3d6551e9282b1330d53ba1f5d05e2.tar.bz2
mame-e3aae75004d3d6551e9282b1330d53ba1f5d05e2.zip
private: use (S, T, U, V) (nw) (#3720)
* private: use (S) (nw) * T part 1 (nw) * T part 2 (nw) * U,V (nw)
-rw-r--r--src/mame/drivers/s3.cpp13
-rw-r--r--src/mame/drivers/s4.cpp13
-rw-r--r--src/mame/drivers/s6.cpp15
-rw-r--r--src/mame/drivers/s6a.cpp15
-rw-r--r--src/mame/drivers/s7.cpp16
-rw-r--r--src/mame/drivers/s8.cpp15
-rw-r--r--src/mame/drivers/s8a.cpp15
-rw-r--r--src/mame/drivers/s9.cpp15
-rw-r--r--src/mame/drivers/sacstate.cpp6
-rw-r--r--src/mame/drivers/safarir.cpp4
-rw-r--r--src/mame/drivers/sam.cpp6
-rw-r--r--src/mame/drivers/sandscrp.cpp4
-rw-r--r--src/mame/drivers/sansa_fuze.cpp4
-rw-r--r--src/mame/drivers/sapi1.cpp24
-rw-r--r--src/mame/drivers/sartorius.cpp2
-rw-r--r--src/mame/drivers/saturn.cpp18
-rw-r--r--src/mame/drivers/savia84.cpp6
-rw-r--r--src/mame/drivers/savquest.cpp8
-rw-r--r--src/mame/drivers/sbc6510.cpp6
-rw-r--r--src/mame/drivers/sbowling.cpp5
-rw-r--r--src/mame/drivers/sbrain.cpp7
-rw-r--r--src/mame/drivers/sbrkout.cpp3
-rw-r--r--src/mame/drivers/sc1.cpp6
-rw-r--r--src/mame/drivers/sc2.cpp3
-rw-r--r--src/mame/drivers/scm_500.cpp4
-rw-r--r--src/mame/drivers/scobra.cpp29
-rw-r--r--src/mame/drivers/scopus.cpp8
-rw-r--r--src/mame/drivers/scorpion.cpp13
-rw-r--r--src/mame/drivers/scregg.cpp10
-rw-r--r--src/mame/drivers/scv.cpp8
-rw-r--r--src/mame/drivers/scyclone.cpp10
-rw-r--r--src/mame/drivers/sderby2.cpp7
-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.cpp4
-rw-r--r--src/mame/drivers/seattle.cpp70
-rw-r--r--src/mame/drivers/seattlecmp.cpp6
-rw-r--r--src/mame/drivers/segac2.cpp50
-rw-r--r--src/mame/drivers/segacoin.cpp4
-rw-r--r--src/mame/drivers/segae.cpp21
-rw-r--r--src/mame/drivers/segajw.cpp7
-rw-r--r--src/mame/drivers/segald.cpp7
-rw-r--r--src/mame/drivers/segam1.cpp6
-rw-r--r--src/mame/drivers/segapico.cpp14
-rw-r--r--src/mame/drivers/segapm.cpp4
-rw-r--r--src/mame/drivers/segas32.cpp32
-rw-r--r--src/mame/drivers/segaufo.cpp3
-rw-r--r--src/mame/drivers/segaxbd.cpp27
-rw-r--r--src/mame/drivers/seibucats.cpp11
-rw-r--r--src/mame/drivers/seicupbl.cpp7
-rw-r--r--src/mame/drivers/selz80.cpp8
-rw-r--r--src/mame/drivers/sengokmj.cpp5
-rw-r--r--src/mame/drivers/sfbonus.cpp32
-rw-r--r--src/mame/drivers/sfcbox.cpp4
-rw-r--r--src/mame/drivers/sfkick.cpp6
-rw-r--r--src/mame/drivers/sg1000a.cpp11
-rw-r--r--src/mame/drivers/sh4robot.cpp4
-rw-r--r--src/mame/drivers/shanghai.cpp10
-rw-r--r--src/mame/drivers/shootaway2.cpp5
-rw-r--r--src/mame/drivers/shougi.cpp3
-rw-r--r--src/mame/drivers/shtzone.cpp5
-rw-r--r--src/mame/drivers/sigmab52.cpp9
-rw-r--r--src/mame/drivers/sigmab98.cpp52
-rw-r--r--src/mame/drivers/silvmil.cpp11
-rw-r--r--src/mame/drivers/sitcom.cpp4
-rw-r--r--src/mame/drivers/sk1.cpp5
-rw-r--r--src/mame/drivers/skeetsht.cpp4
-rw-r--r--src/mame/drivers/skimaxx.cpp4
-rw-r--r--src/mame/drivers/skyarmy.cpp4
-rw-r--r--src/mame/drivers/skylncr.cpp22
-rw-r--r--src/mame/drivers/slc1.cpp3
-rw-r--r--src/mame/drivers/sleic.cpp6
-rw-r--r--src/mame/drivers/slicer.cpp6
-rw-r--r--src/mame/drivers/sliver.cpp5
-rw-r--r--src/mame/drivers/slotcarn.cpp4
-rw-r--r--src/mame/drivers/sm1800.cpp4
-rw-r--r--src/mame/drivers/sm7238.cpp6
-rw-r--r--src/mame/drivers/smc777.cpp7
-rw-r--r--src/mame/drivers/smsmcorp.cpp7
-rw-r--r--src/mame/drivers/snes.cpp7
-rw-r--r--src/mame/drivers/snesb.cpp28
-rw-r--r--src/mame/drivers/socrates.cpp43
-rw-r--r--src/mame/drivers/solbourne.cpp6
-rw-r--r--src/mame/drivers/sothello.cpp7
-rw-r--r--src/mame/drivers/spartanxtec.cpp3
-rw-r--r--src/mame/drivers/spc1000.cpp6
-rw-r--r--src/mame/drivers/spc1500.cpp8
-rw-r--r--src/mame/drivers/spectra.cpp3
-rw-r--r--src/mame/drivers/speglsht.cpp8
-rw-r--r--src/mame/drivers/spinb.cpp19
-rw-r--r--src/mame/drivers/spirit76.cpp6
-rw-r--r--src/mame/drivers/splus.cpp9
-rw-r--r--src/mame/drivers/spoker.cpp17
-rw-r--r--src/mame/drivers/spool99.cpp9
-rw-r--r--src/mame/drivers/sprcros2.cpp7
-rw-r--r--src/mame/drivers/spyhuntertec.cpp11
-rw-r--r--src/mame/drivers/squale.cpp6
-rw-r--r--src/mame/drivers/srmp5.cpp9
-rw-r--r--src/mame/drivers/srmp6.cpp7
-rw-r--r--src/mame/drivers/ssem.cpp9
-rw-r--r--src/mame/drivers/ssfindo.cpp16
-rw-r--r--src/mame/drivers/sshot.cpp4
-rw-r--r--src/mame/drivers/ssingles.cpp13
-rw-r--r--src/mame/drivers/sstrangr.cpp6
-rw-r--r--src/mame/drivers/st17xx.cpp4
-rw-r--r--src/mame/drivers/st_mp100.cpp11
-rw-r--r--src/mame/drivers/st_mp200.cpp16
-rw-r--r--src/mame/drivers/stargame.cpp6
-rw-r--r--src/mame/drivers/statriv2.cpp27
-rw-r--r--src/mame/drivers/stellafr.cpp3
-rw-r--r--src/mame/drivers/stratos.cpp7
-rw-r--r--src/mame/drivers/strkzn.cpp4
-rw-r--r--src/mame/drivers/studio2.cpp21
-rw-r--r--src/mame/drivers/stuntair.cpp4
-rw-r--r--src/mame/drivers/su2000.cpp8
-rw-r--r--src/mame/drivers/subhuntr.cpp3
-rw-r--r--src/mame/drivers/subsino2.cpp42
-rw-r--r--src/mame/drivers/summit.cpp4
-rw-r--r--src/mame/drivers/sumt8035.cpp3
-rw-r--r--src/mame/drivers/sun1.cpp3
-rw-r--r--src/mame/drivers/sun2.cpp8
-rw-r--r--src/mame/drivers/sun3.cpp14
-rw-r--r--src/mame/drivers/sun3x.cpp8
-rw-r--r--src/mame/drivers/sun4.cpp18
-rw-r--r--src/mame/drivers/supdrapo.cpp4
-rw-r--r--src/mame/drivers/supduck.cpp5
-rw-r--r--src/mame/drivers/supercrd.cpp4
-rw-r--r--src/mame/drivers/superdq.cpp9
-rw-r--r--src/mame/drivers/superslave.cpp3
-rw-r--r--src/mame/drivers/supertnk.cpp6
-rw-r--r--src/mame/drivers/superwng.cpp5
-rw-r--r--src/mame/drivers/supracan.cpp4
-rw-r--r--src/mame/drivers/suprgolf.cpp7
-rw-r--r--src/mame/drivers/supstarf.cpp7
-rw-r--r--src/mame/drivers/sv8000.cpp3
-rw-r--r--src/mame/drivers/svi318.cpp13
-rw-r--r--src/mame/drivers/svmu.cpp6
-rw-r--r--src/mame/drivers/swtpc.cpp8
-rw-r--r--src/mame/drivers/swyft.cpp6
-rw-r--r--src/mame/drivers/sym1.cpp9
-rw-r--r--src/mame/drivers/symbolics.cpp11
-rw-r--r--src/mame/drivers/sys2900.cpp20
-rw-r--r--src/mame/drivers/sys9002.cpp6
-rw-r--r--src/mame/drivers/systec.cpp4
-rw-r--r--src/mame/drivers/taito.cpp17
-rw-r--r--src/mame/drivers/taitogn.cpp20
-rw-r--r--src/mame/drivers/taitopjc.cpp9
-rw-r--r--src/mame/drivers/taitottl.cpp11
-rw-r--r--src/mame/drivers/taitotx.cpp4
-rw-r--r--src/mame/drivers/taitotz.cpp34
-rw-r--r--src/mame/drivers/taitowlf.cpp9
-rw-r--r--src/mame/drivers/tamag1.cpp6
-rw-r--r--src/mame/drivers/tandy1t.cpp21
-rw-r--r--src/mame/drivers/tapatune.cpp7
-rw-r--r--src/mame/drivers/tasman.cpp9
-rw-r--r--src/mame/drivers/tattack.cpp12
-rw-r--r--src/mame/drivers/tavernie.cpp8
-rw-r--r--src/mame/drivers/tb303.cpp4
-rw-r--r--src/mame/drivers/tec1.cpp7
-rw-r--r--src/mame/drivers/techno.cpp5
-rw-r--r--src/mame/drivers/tecnbras.cpp3
-rw-r--r--src/mame/drivers/tek410x.cpp6
-rw-r--r--src/mame/drivers/tek440x.cpp4
-rw-r--r--src/mame/drivers/tekxp33x.cpp4
-rw-r--r--src/mame/drivers/tempest.cpp6
-rw-r--r--src/mame/drivers/terak.cpp6
-rw-r--r--src/mame/drivers/terco.cpp4
-rw-r--r--src/mame/drivers/test_t400.cpp6
-rw-r--r--src/mame/drivers/testconsole.cpp3
-rw-r--r--src/mame/drivers/tg100.cpp4
-rw-r--r--src/mame/drivers/tgtpanic.cpp4
-rw-r--r--src/mame/drivers/thayers.cpp24
-rw-r--r--src/mame/drivers/thedealr.cpp7
-rw-r--r--src/mame/drivers/ti630.cpp9
-rw-r--r--src/mame/drivers/ti74.cpp11
-rw-r--r--src/mame/drivers/ti990_4.cpp14
-rw-r--r--src/mame/drivers/ti99_2.cpp10
-rw-r--r--src/mame/drivers/ti99_4p.cpp6
-rw-r--r--src/mame/drivers/ti99_4x.cpp28
-rw-r--r--src/mame/drivers/ti99_8.cpp10
-rw-r--r--src/mame/drivers/ticalc1x.cpp40
-rw-r--r--src/mame/drivers/tickee.cpp26
-rw-r--r--src/mame/drivers/tim011.cpp4
-rw-r--r--src/mame/drivers/tim100.cpp6
-rw-r--r--src/mame/drivers/timetrv.cpp4
-rw-r--r--src/mame/drivers/tispeak.cpp3
-rw-r--r--src/mame/drivers/tispellb.cpp11
-rw-r--r--src/mame/drivers/tk80.cpp3
-rw-r--r--src/mame/drivers/tk80bs.cpp6
-rw-r--r--src/mame/drivers/tm990189.cpp13
-rw-r--r--src/mame/drivers/tmaster.cpp18
-rw-r--r--src/mame/drivers/tmspoker.cpp8
-rw-r--r--src/mame/drivers/tomcat.cpp3
-rw-r--r--src/mame/drivers/tonton.cpp4
-rw-r--r--src/mame/drivers/toratora.cpp4
-rw-r--r--src/mame/drivers/tosh1000.cpp10
-rw-r--r--src/mame/drivers/tourtabl.cpp3
-rw-r--r--src/mame/drivers/tourvis.cpp6
-rw-r--r--src/mame/drivers/toypop.cpp11
-rw-r--r--src/mame/drivers/tr175.cpp6
-rw-r--r--src/mame/drivers/tr606.cpp4
-rw-r--r--src/mame/drivers/tricep.cpp2
-rw-r--r--src/mame/drivers/triforce.cpp6
-rw-r--r--src/mame/drivers/trs80dt1.cpp6
-rw-r--r--src/mame/drivers/trvmadns.cpp4
-rw-r--r--src/mame/drivers/ts3000.cpp3
-rw-r--r--src/mame/drivers/ts802.cpp7
-rw-r--r--src/mame/drivers/ts803.cpp9
-rw-r--r--src/mame/drivers/ts816.cpp9
-rw-r--r--src/mame/drivers/ttchamp.cpp4
-rw-r--r--src/mame/drivers/tti.cpp6
-rw-r--r--src/mame/drivers/tugboat.cpp21
-rw-r--r--src/mame/drivers/tutor.cpp6
-rw-r--r--src/mame/drivers/tv910.cpp6
-rw-r--r--src/mame/drivers/tv912.cpp10
-rw-r--r--src/mame/drivers/tv950.cpp6
-rw-r--r--src/mame/drivers/tv990.cpp9
-rw-r--r--src/mame/drivers/tvboy.cpp3
-rw-r--r--src/mame/drivers/tvc.cpp5
-rw-r--r--src/mame/drivers/tvcapcom.cpp5
-rw-r--r--src/mame/drivers/tvgame.cpp6
-rw-r--r--src/mame/drivers/twinkle.cpp3
-rw-r--r--src/mame/drivers/twins.cpp8
-rw-r--r--src/mame/drivers/uapce.cpp5
-rw-r--r--src/mame/drivers/uknc.cpp5
-rw-r--r--src/mame/drivers/ultrsprt.cpp7
-rw-r--r--src/mame/drivers/unianapc.cpp4
-rw-r--r--src/mame/drivers/unichamp.cpp9
-rw-r--r--src/mame/drivers/unior.cpp3
-rw-r--r--src/mame/drivers/univac.cpp3
-rw-r--r--src/mame/drivers/unixpc.cpp2
-rw-r--r--src/mame/drivers/unkhorse.cpp4
-rw-r--r--src/mame/drivers/upscope.cpp10
-rw-r--r--src/mame/drivers/usbilliards.cpp9
-rw-r--r--src/mame/drivers/uzebox.cpp6
-rw-r--r--src/mame/drivers/v100.cpp6
-rw-r--r--src/mame/drivers/v102.cpp6
-rw-r--r--src/mame/drivers/v550.cpp3
-rw-r--r--src/mame/drivers/v6809.cpp6
-rw-r--r--src/mame/drivers/vax11.cpp4
-rw-r--r--src/mame/drivers/vboy.cpp5
-rw-r--r--src/mame/drivers/vd.cpp5
-rw-r--r--src/mame/drivers/vector4.cpp5
-rw-r--r--src/mame/drivers/vectrix.cpp12
-rw-r--r--src/mame/drivers/vega.cpp9
-rw-r--r--src/mame/drivers/vegaeo.cpp7
-rw-r--r--src/mame/drivers/vegas.cpp76
-rw-r--r--src/mame/drivers/vg5k.cpp7
-rw-r--r--src/mame/drivers/vic10.cpp4
-rw-r--r--src/mame/drivers/vic20.cpp9
-rw-r--r--src/mame/drivers/victor9k.cpp5
-rw-r--r--src/mame/drivers/videopkr.cpp16
-rw-r--r--src/mame/drivers/vii.cpp59
-rw-r--r--src/mame/drivers/viper.cpp18
-rw-r--r--src/mame/drivers/vis.cpp13
-rw-r--r--src/mame/drivers/vk100.cpp20
-rw-r--r--src/mame/drivers/vlc.cpp7
-rw-r--r--src/mame/drivers/votrpss.cpp6
-rw-r--r--src/mame/drivers/votrtnt.cpp6
-rw-r--r--src/mame/drivers/voyager.cpp8
-rw-r--r--src/mame/drivers/vp101.cpp7
-rw-r--r--src/mame/drivers/vp122.cpp6
-rw-r--r--src/mame/drivers/vp60.cpp6
-rw-r--r--src/mame/drivers/vpoker.cpp4
-rw-r--r--src/mame/drivers/vroulet.cpp4
-rw-r--r--src/mame/drivers/vsmilepro.cpp4
-rw-r--r--src/mame/drivers/vt100.cpp12
-rw-r--r--src/mame/drivers/vt220.cpp6
-rw-r--r--src/mame/drivers/vt240.cpp7
-rw-r--r--src/mame/drivers/vt320.cpp4
-rw-r--r--src/mame/drivers/vt520.cpp6
-rw-r--r--src/mame/drivers/vtech1.cpp14
-rw-r--r--src/mame/drivers/vtech_eu3a12.cpp4
-rw-r--r--src/mame/drivers/vtech_unk1.cpp4
-rw-r--r--src/mame/drivers/vtech_unk2.cpp4
-rw-r--r--src/mame/includes/s11.h30
-rw-r--r--src/mame/includes/s11a.h12
-rw-r--r--src/mame/includes/s11b.h18
-rw-r--r--src/mame/includes/s11c.h12
-rw-r--r--src/mame/includes/sage2.h9
-rw-r--r--src/mame/includes/samcoupe.h21
-rw-r--r--src/mame/includes/saturn.h28
-rw-r--r--src/mame/includes/sauro.h14
-rw-r--r--src/mame/includes/sbasketb.h10
-rw-r--r--src/mame/includes/sbugger.h4
-rw-r--r--src/mame/includes/sderby.h15
-rw-r--r--src/mame/includes/segag80r.h74
-rw-r--r--src/mame/includes/segag80v.h36
-rw-r--r--src/mame/includes/segahang.h54
-rw-r--r--src/mame/includes/segaorun.h33
-rw-r--r--src/mame/includes/segas16a.h50
-rw-r--r--src/mame/includes/segas16b.h96
-rw-r--r--src/mame/includes/segas18.h20
-rw-r--r--src/mame/includes/segas32.h89
-rw-r--r--src/mame/includes/segasp.h9
-rw-r--r--src/mame/includes/segaxbd.h46
-rw-r--r--src/mame/includes/segaybd.h26
-rw-r--r--src/mame/includes/seibuspi.h54
-rw-r--r--src/mame/includes/seicross.h12
-rw-r--r--src/mame/includes/senjyo.h21
-rw-r--r--src/mame/includes/seta.h165
-rw-r--r--src/mame/includes/seta2.h45
-rw-r--r--src/mame/includes/sf.h11
-rw-r--r--src/mame/includes/sg1000.h28
-rw-r--r--src/mame/includes/shadfrce.h5
-rw-r--r--src/mame/includes/shangha3.h16
-rw-r--r--src/mame/includes/shangkid.h16
-rw-r--r--src/mame/includes/shaolins.h4
-rw-r--r--src/mame/includes/shisen.h5
-rw-r--r--src/mame/includes/shootout.h17
-rw-r--r--src/mame/includes/shuuz.h3
-rw-r--r--src/mame/includes/sidearms.h18
-rw-r--r--src/mame/includes/sidepckt.h13
-rw-r--r--src/mame/includes/silkroad.h4
-rw-r--r--src/mame/includes/simpl156.h27
-rw-r--r--src/mame/includes/simple_st0016.h19
-rw-r--r--src/mame/includes/simpsons.h18
-rw-r--r--src/mame/includes/skullxbo.h6
-rw-r--r--src/mame/includes/skydiver.h3
-rw-r--r--src/mame/includes/skyfox.h11
-rw-r--r--src/mame/includes/skykid.h8
-rw-r--r--src/mame/includes/skyraid.h3
-rw-r--r--src/mame/includes/slapfght.h31
-rw-r--r--src/mame/includes/slapshot.h12
-rw-r--r--src/mame/includes/sms.h47
-rw-r--r--src/mame/includes/sms_bootleg.h13
-rw-r--r--src/mame/includes/snes.h33
-rw-r--r--src/mame/includes/snk.h63
-rw-r--r--src/mame/includes/snk6502.h21
-rw-r--r--src/mame/includes/snk68.h8
-rw-r--r--src/mame/includes/snookr10.h11
-rw-r--r--src/mame/includes/snowbros.h44
-rw-r--r--src/mame/includes/softbox.h5
-rw-r--r--src/mame/includes/solomon.h5
-rw-r--r--src/mame/includes/sonson.h5
-rw-r--r--src/mame/includes/sorcerer.h27
-rw-r--r--src/mame/includes/spacefb.h17
-rw-r--r--src/mame/includes/spbactn.h11
-rw-r--r--src/mame/includes/spcforce.h8
-rw-r--r--src/mame/includes/spdodgeb.h7
-rw-r--r--src/mame/includes/special.h32
-rw-r--r--src/mame/includes/spectrum.h46
-rw-r--r--src/mame/includes/speedatk.h5
-rw-r--r--src/mame/includes/speedbal.h10
-rw-r--r--src/mame/includes/speedspn.h5
-rw-r--r--src/mame/includes/splash.h20
-rw-r--r--src/mame/includes/sprint2.h20
-rw-r--r--src/mame/includes/sprint4.h6
-rw-r--r--src/mame/includes/sprint8.h3
-rw-r--r--src/mame/includes/spy.h5
-rw-r--r--src/mame/includes/srmp2.h11
-rw-r--r--src/mame/includes/srumbler.h4
-rw-r--r--src/mame/includes/sshangha.h31
-rw-r--r--src/mame/includes/sslam.h12
-rw-r--r--src/mame/includes/ssozumo.h11
-rw-r--r--src/mame/includes/sspeedr.h5
-rw-r--r--src/mame/includes/ssrj.h5
-rw-r--r--src/mame/includes/ssv.h96
-rw-r--r--src/mame/includes/ssystem3.h7
-rw-r--r--src/mame/includes/stactics.h7
-rw-r--r--src/mame/includes/stadhero.h4
-rw-r--r--src/mame/includes/starcrus.h3
-rw-r--r--src/mame/includes/starfire.h12
-rw-r--r--src/mame/includes/starshp1.h5
-rw-r--r--src/mame/includes/starwars.h17
-rw-r--r--src/mame/includes/stfight.h12
-rw-r--r--src/mame/includes/stlforce.h13
-rw-r--r--src/mame/includes/stv.h19
-rw-r--r--src/mame/includes/sub.h6
-rw-r--r--src/mame/includes/subs.h5
-rw-r--r--src/mame/includes/suna16.h15
-rw-r--r--src/mame/includes/suna8.h45
-rw-r--r--src/mame/includes/supbtime.h7
-rw-r--r--src/mame/includes/super6.h3
-rw-r--r--src/mame/includes/super80.h20
-rw-r--r--src/mame/includes/superqix.h39
-rw-r--r--src/mame/includes/suprloco.h7
-rw-r--r--src/mame/includes/suprnova.h58
-rw-r--r--src/mame/includes/suprridr.h12
-rw-r--r--src/mame/includes/suprslam.h5
-rw-r--r--src/mame/includes/surpratk.h4
-rw-r--r--src/mame/includes/svision.h22
-rw-r--r--src/mame/includes/swtpc09.h24
-rw-r--r--src/mame/includes/system16.h100
-rw-r--r--src/mame/includes/tagteam.h7
-rw-r--r--src/mame/includes/tail2nos.h7
-rw-r--r--src/mame/includes/taito_b.h63
-rw-r--r--src/mame/includes/taito_f2.h116
-rw-r--r--src/mame/includes/taito_f3.h115
-rw-r--r--src/mame/includes/taito_h.h10
-rw-r--r--src/mame/includes/taito_l.h15
-rw-r--r--src/mame/includes/taito_o.h4
-rw-r--r--src/mame/includes/taito_x.h13
-rw-r--r--src/mame/includes/taitoair.h5
-rw-r--r--src/mame/includes/taitojc.h15
-rw-r--r--src/mame/includes/taitosj.h27
-rw-r--r--src/mame/includes/tandy2k.h7
-rw-r--r--src/mame/includes/tank8.h16
-rw-r--r--src/mame/includes/tankbatt.h8
-rw-r--r--src/mame/includes/tankbust.h5
-rw-r--r--src/mame/includes/taotaido.h4
-rw-r--r--src/mame/includes/targeth.h7
-rw-r--r--src/mame/includes/tatsumi.h44
-rw-r--r--src/mame/includes/taxidriv.h4
-rw-r--r--src/mame/includes/tbowl.h5
-rw-r--r--src/mame/includes/tceptor.h5
-rw-r--r--src/mame/includes/tdv2324.h4
-rw-r--r--src/mame/includes/tecmo.h25
-rw-r--r--src/mame/includes/tecmo16.h9
-rw-r--r--src/mame/includes/tecmosys.h12
-rw-r--r--src/mame/includes/tehkanwc.h21
-rw-r--r--src/mame/includes/tek405x.h8
-rw-r--r--src/mame/includes/terracre.h13
-rw-r--r--src/mame/includes/tetrisp2.h53
-rw-r--r--src/mame/includes/thedeep.h5
-rw-r--r--src/mame/includes/thepit.h16
-rw-r--r--src/mame/includes/thief.h16
-rw-r--r--src/mame/includes/thomson.h92
-rw-r--r--src/mame/includes/thoop2.h7
-rw-r--r--src/mame/includes/thunderj.h6
-rw-r--r--src/mame/includes/thunderx.h23
-rw-r--r--src/mame/includes/ti85.h26
-rw-r--r--src/mame/includes/ti89.h17
-rw-r--r--src/mame/includes/tiamc1.h9
-rw-r--r--src/mame/includes/tigeroad.h20
-rw-r--r--src/mame/includes/tiki100.h6
-rw-r--r--src/mame/includes/timelimt.h5
-rw-r--r--src/mame/includes/timeplt.h14
-rw-r--r--src/mame/includes/tmc2000e.h5
-rw-r--r--src/mame/includes/tmc600.h7
-rw-r--r--src/mame/includes/tmnt.h46
-rw-r--r--src/mame/includes/tnzs.h57
-rw-r--r--src/mame/includes/toaplan1.h34
-rw-r--r--src/mame/includes/toaplan2.h72
-rw-r--r--src/mame/includes/toki.h17
-rw-r--r--src/mame/includes/toobin.h3
-rw-r--r--src/mame/includes/topspeed.h8
-rw-r--r--src/mame/includes/tp84.h7
-rw-r--r--src/mame/includes/trackfld.h23
-rw-r--r--src/mame/includes/tranz330.h3
-rw-r--r--src/mame/includes/travrusa.h16
-rw-r--r--src/mame/includes/triplhnt.h16
-rw-r--r--src/mame/includes/trs80.h38
-rw-r--r--src/mame/includes/truco.h4
-rw-r--r--src/mame/includes/trucocl.h19
-rw-r--r--src/mame/includes/tryout.h9
-rw-r--r--src/mame/includes/tsamurai.h14
-rw-r--r--src/mame/includes/tsispch.h9
-rw-r--r--src/mame/includes/tubep.h27
-rw-r--r--src/mame/includes/tumbleb.h59
-rw-r--r--src/mame/includes/tunhunt.h3
-rw-r--r--src/mame/includes/turbo.h25
-rw-r--r--src/mame/includes/turrett.h9
-rw-r--r--src/mame/includes/twin16.h40
-rw-r--r--src/mame/includes/twincobr.h12
-rw-r--r--src/mame/includes/tx0.h20
-rw-r--r--src/mame/includes/tx1.h22
-rw-r--r--src/mame/includes/ultraman.h4
-rw-r--r--src/mame/includes/ultratnk.h10
-rw-r--r--src/mame/includes/undrfire.h10
-rw-r--r--src/mame/includes/ut88.h25
-rw-r--r--src/mame/includes/v1050.h9
-rw-r--r--src/mame/includes/vaportra.h8
-rw-r--r--src/mame/includes/vastar.h5
-rw-r--r--src/mame/includes/vball.h5
-rw-r--r--src/mame/includes/vc4000.h18
-rw-r--r--src/mame/includes/vcs80.h5
-rw-r--r--src/mame/includes/vector06.h6
-rw-r--r--src/mame/includes/vendetta.h17
-rw-r--r--src/mame/includes/vertigo.h3
-rw-r--r--src/mame/includes/vicdual.h97
-rw-r--r--src/mame/includes/victory.h3
-rw-r--r--src/mame/includes/vidbrain.h10
-rw-r--r--src/mame/includes/videopin.h13
-rw-r--r--src/mame/includes/vigilant.h9
-rw-r--r--src/mame/includes/vindictr.h6
-rw-r--r--src/mame/includes/vip.h14
-rw-r--r--src/mame/includes/vixen.h9
-rw-r--r--src/mame/includes/volfied.h14
-rw-r--r--src/mame/includes/vp415.h2
-rw-r--r--src/mame/includes/vsnes.h49
-rw-r--r--src/mame/includes/vtech2.h3
-rw-r--r--src/mame/includes/vulgus.h5
485 files changed, 4078 insertions, 2880 deletions
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index cbfaee98789..48355dec7e2 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -65,6 +65,13 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s3a(machine_config &config);
+ void s3(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -86,15 +93,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
TIMER_DEVICE_CALLBACK_MEMBER(irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s3);
DECLARE_MACHINE_RESET(s3a);
- void s3a(machine_config &config);
- void s3(machine_config &config);
void s3_audio_map(address_map &map);
void s3_main_map(address_map &map);
-private:
+
uint8_t m_t_c;
uint8_t m_sound_data;
uint8_t m_strobe;
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index 62b6d50e6ca..c09c74cb200 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -59,6 +59,13 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s4(machine_config &config);
+ void s4a(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -80,15 +87,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
TIMER_DEVICE_CALLBACK_MEMBER(irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s4);
DECLARE_MACHINE_RESET(s4a);
- void s4(machine_config &config);
- void s4a(machine_config &config);
void s4_audio_map(address_map &map);
void s4_main_map(address_map &map);
-private:
+
uint8_t m_t_c;
uint8_t m_sound_data;
uint8_t m_strobe;
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index 4d5d8aff38b..7c0e99fc290 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -75,6 +75,14 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s6(machine_config &config);
+
+ void init_s6();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -94,14 +102,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s6);
- void init_s6();
- void s6(machine_config &config);
+
void s6_audio_map(address_map &map);
void s6_main_map(address_map &map);
-private:
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp
index bcd6279b038..d0fa1fad5cc 100644
--- a/src/mame/drivers/s6a.cpp
+++ b/src/mame/drivers/s6a.cpp
@@ -68,6 +68,14 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s6a(machine_config &config);
+
+ void init_s6a();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -87,14 +95,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s6a);
- void init_s6a();
- void s6a(machine_config &config);
+
void s6a_audio_map(address_map &map);
void s6a_main_map(address_map &map);
-private:
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index 019b5ae36b8..c9b50fb2603 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -86,6 +86,15 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s7(machine_config &config);
+
+ void init_s7();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(diag_coin);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -112,15 +121,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(diag_coin);
DECLARE_MACHINE_RESET(s7);
- void init_s7();
- void s7(machine_config &config);
void s7_audio_map(address_map &map);
void s7_main_map(address_map &map);
-private:
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index fc6e1db34a0..cb2f2dc70c9 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -71,6 +71,14 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s8(machine_config &config);
+
+ void init_s8();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -88,14 +96,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4
DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s8);
- void init_s8();
- void s8(machine_config &config);
+
void s8_audio_map(address_map &map);
void s8_main_map(address_map &map);
-private:
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index 93f362885ae..ccd47b5dd3f 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -47,6 +47,14 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s8a(machine_config &config);
+
+ void init_s8a();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -64,14 +72,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4
DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s8a);
- void init_s8a();
- void s8a(machine_config &config);
+
void s8a_audio_map(address_map &map);
void s8a_main_map(address_map &map);
-private:
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index 4c4c64ca5e1..341db9bae18 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -58,6 +58,14 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s9(machine_config &config);
+
+ void init_s9();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+private:
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(dig0_w);
DECLARE_WRITE8_MEMBER(dig1_w);
@@ -75,14 +83,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4
DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_MACHINE_RESET(s9);
- void init_s9();
- void s9(machine_config &config);
+
void s9_audio_map(address_map &map);
void s9_main_map(address_map &map);
-private:
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/drivers/sacstate.cpp b/src/mame/drivers/sacstate.cpp
index fe225bb28fa..f69cda3a6c7 100644
--- a/src/mame/drivers/sacstate.cpp
+++ b/src/mame/drivers/sacstate.cpp
@@ -48,15 +48,17 @@ public:
, m_terminal(*this, "terminal")
{ }
+ void sacstate(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(port00_r);
DECLARE_READ8_MEMBER(port01_r);
DECLARE_READ8_MEMBER(port04_r);
DECLARE_WRITE8_MEMBER(port08_w);
void kbd_put(u8 data);
- void sacstate(machine_config &config);
void sacstate_io(address_map &map);
void sacstate_mem(address_map &map);
-private:
+
uint8_t m_term_data;
uint8_t m_val;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index 80c047e4cfd..16f03d73f77 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -68,6 +68,9 @@ public:
m_gfxdecode(*this, "gfxdecode")
{ }
+ void safarir(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<samples_device> m_samples;
required_shared_ptr<uint8_t> m_ram;
@@ -92,7 +95,6 @@ public:
virtual void video_start() override;
DECLARE_PALETTE_INIT(safarir);
uint32_t screen_update_safarir(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void safarir(machine_config &config);
void safarir_audio(machine_config &config);
void main_map(address_map &map);
};
diff --git a/src/mame/drivers/sam.cpp b/src/mame/drivers/sam.cpp
index 3cf4af0f1a7..58e7bef05f8 100644
--- a/src/mame/drivers/sam.cpp
+++ b/src/mame/drivers/sam.cpp
@@ -10,8 +10,10 @@ public:
sam_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
- void sam(machine_config &config);
- void sam_map(address_map &map);
+ void sam(machine_config &config);
+
+private:
+ void sam_map(address_map &map);
};
void sam_state::sam_map(address_map &map)
diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp
index d191efc164f..fc5aa8c6633 100644
--- a/src/mame/drivers/sandscrp.cpp
+++ b/src/mame/drivers/sandscrp.cpp
@@ -100,6 +100,9 @@ public:
, m_audiobank(*this, "audiobank")
{ }
+ void sandscrp(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<kaneko_pandora_device> m_pandora;
@@ -130,7 +133,6 @@ public:
INTERRUPT_GEN_MEMBER(interrupt);
void update_irq_state();
- void sandscrp(machine_config &config);
void sandscrp(address_map &map);
void sandscrp_soundmem(address_map &map);
void sandscrp_soundport(address_map &map);
diff --git a/src/mame/drivers/sansa_fuze.cpp b/src/mame/drivers/sansa_fuze.cpp
index bc64622bb8b..b82788b4909 100644
--- a/src/mame/drivers/sansa_fuze.cpp
+++ b/src/mame/drivers/sansa_fuze.cpp
@@ -21,8 +21,10 @@ public:
m_maincpu(*this, "maincpu")
{ }
- required_device<cpu_device> m_maincpu;
void sansa_fuze(machine_config &config);
+
+private:
+ required_device<cpu_device> m_maincpu;
void sansa_fuze_map(address_map &map);
};
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index 1410fc90af3..f72c6ea7d3e 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -60,6 +60,17 @@ public:
{
}
+ void sapi3(machine_config &config);
+ void sapi1(machine_config &config);
+ void sapi2(machine_config &config);
+ void sapi3a(machine_config &config);
+ void sapi3b(machine_config &config);
+
+ void init_sapizps3();
+ void init_sapizps3a();
+ void init_sapizps3b();
+
+private:
optional_shared_ptr<uint8_t> m_p_videoram;
DECLARE_READ8_MEMBER(sapi1_keyboard_r);
DECLARE_WRITE8_MEMBER(sapi1_keyboard_w);
@@ -75,19 +86,12 @@ public:
DECLARE_READ8_MEMBER(uart_ready_r);
DECLARE_WRITE8_MEMBER(uart_mode_w);
DECLARE_WRITE8_MEMBER(uart_reset_w);
- void init_sapizps3();
- void init_sapizps3a();
- void init_sapizps3b();
DECLARE_MACHINE_RESET(sapi1);
DECLARE_MACHINE_RESET(sapizps3);
MC6845_UPDATE_ROW(crtc_update_row);
uint32_t screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sapi3(machine_config &config);
- void sapi1(machine_config &config);
- void sapi2(machine_config &config);
- void sapi3a(machine_config &config);
- void sapi3b(machine_config &config);
+
void sapi1_mem(address_map &map);
void sapi2_mem(address_map &map);
void sapi3_io(address_map &map);
@@ -96,7 +100,7 @@ public:
void sapi3a_mem(address_map &map);
void sapi3b_io(address_map &map);
void sapi3b_mem(address_map &map);
-private:
+
uint8_t m_term_data;
uint8_t m_keyboard_mask;
uint8_t m_refresh_counter;
@@ -110,7 +114,7 @@ private:
required_device<cpu_device> m_maincpu;
optional_device<ay31015_device> m_uart;
optional_device<rs232_port_device> m_v24;
-public:
+
optional_device<palette_device> m_palette;
};
diff --git a/src/mame/drivers/sartorius.cpp b/src/mame/drivers/sartorius.cpp
index 751cdf5807b..d455c705050 100644
--- a/src/mame/drivers/sartorius.cpp
+++ b/src/mame/drivers/sartorius.cpp
@@ -63,6 +63,8 @@ public:
}
void sart3733(machine_config &config);
+
+private:
void sart3733_memory(address_map &map);
void sart3733_rom(address_map &map);
void sart3733_status(address_map &map);
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index d1251985327..191072b3b73 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -459,9 +459,20 @@ public:
, m_ctrl2(*this, "ctrl2")
{ }
+ void saturn(machine_config &config);
+ void saturnjp(machine_config &config);
+ void saturneu(machine_config &config);
+ void saturnus(machine_config &config);
+
+ void init_saturnus();
+ void init_saturneu();
+ void init_saturnjp();
+
DECLARE_INPUT_CHANGED_MEMBER(tray_open);
DECLARE_INPUT_CHANGED_MEMBER(tray_close);
+private:
+
DECLARE_MACHINE_START(saturn);
DECLARE_MACHINE_RESET(saturn);
@@ -472,9 +483,6 @@ public:
DECLARE_WRITE32_MEMBER(saturn_null_ram_w);
void saturn_init_driver(int rgn);
- void init_saturnus();
- void init_saturneu();
- void init_saturnjp();
DECLARE_READ8_MEMBER(saturn_pdr1_direct_r);
DECLARE_READ8_MEMBER(saturn_pdr2_direct_r);
DECLARE_WRITE8_MEMBER(saturn_pdr1_direct_w);
@@ -493,10 +501,6 @@ public:
required_device<saturn_control_port_device> m_ctrl1;
required_device<saturn_control_port_device> m_ctrl2;
- void saturn(machine_config &config);
- void saturnjp(machine_config &config);
- void saturneu(machine_config &config);
- void saturnus(machine_config &config);
void saturn_mem(address_map &map);
void sound_mem(address_map &map);
};
diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp
index a7d7c9292f7..2f6efa75d86 100644
--- a/src/mame/drivers/savia84.cpp
+++ b/src/mame/drivers/savia84.cpp
@@ -44,15 +44,17 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void savia84(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(savia84_8255_portc_r);
DECLARE_WRITE8_MEMBER(savia84_8255_porta_w);
DECLARE_WRITE8_MEMBER(savia84_8255_portb_w);
DECLARE_WRITE8_MEMBER(savia84_8255_portc_w);
- void savia84(machine_config &config);
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
+
uint8_t m_kbd;
uint8_t m_segment;
uint8_t m_digit;
diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp
index db683288005..baac98042b9 100644
--- a/src/mame/drivers/savquest.cpp
+++ b/src/mame/drivers/savquest.cpp
@@ -69,6 +69,9 @@ public:
{
}
+ void savquest(machine_config &config);
+
+private:
std::unique_ptr<uint32_t[]> m_bios_f0000_ram;
std::unique_ptr<uint32_t[]> m_bios_e0000_ram;
std::unique_ptr<uint32_t[]> m_bios_e4000_ram;
@@ -113,15 +116,12 @@ public:
DECLARE_READ8_MEMBER(smram_r);
DECLARE_WRITE8_MEMBER(smram_w);
- void savquest(machine_config &config);
void savquest_io(address_map &map);
void savquest_map(address_map &map);
-protected:
-
// driver_device overrides
// virtual void video_start();
-public:
+
virtual void machine_start() override;
virtual void machine_reset() override;
void intel82439tx_init();
diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp
index 26a7d0eb186..8ccaa329136 100644
--- a/src/mame/drivers/sbc6510.cpp
+++ b/src/mame/drivers/sbc6510.cpp
@@ -71,6 +71,9 @@ public:
, m_keyboard(*this, "X%u", 0)
{ }
+ void sbc6510(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(a2_r);
DECLARE_WRITE8_MEMBER(a2_w);
DECLARE_READ8_MEMBER(psg_a_r);
@@ -78,12 +81,11 @@ public:
DECLARE_WRITE8_MEMBER(key_w);
DECLARE_READ8_MEMBER(key_r);
- void sbc6510(machine_config &config);
void sbc6510_mem(address_map &map);
void sbc6510_video_data(address_map &map);
void sbc6510_video_io(address_map &map);
void sbc6510_video_mem(address_map &map);
-private:
+
uint8_t m_key_row;
uint8_t m_2;
virtual void machine_start() override;
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index 26be2e0f214..f489da0d004 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -60,6 +60,9 @@ public:
m_videoram(*this, "videoram"),
m_gfxdecode(*this, "gfxdecode") { }
+ void sbowling(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_videoram;
required_device<gfxdecode_device> m_gfxdecode;
@@ -88,7 +91,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void postload();
- void sbowling(machine_config &config);
+
void main_map(address_map &map);
void port_map(address_map &map);
};
diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp
index 0e355f20143..7f1862a2227 100644
--- a/src/mame/drivers/sbrain.cpp
+++ b/src/mame/drivers/sbrain.cpp
@@ -75,7 +75,11 @@ public:
, m_keyboard(*this, "X%u", 0)
{}
+ void sbrain(machine_config &config);
+
void init_sbrain();
+
+private:
DECLARE_MACHINE_RESET(sbrain);
DECLARE_READ8_MEMBER(ppi_pa_r);
DECLARE_WRITE8_MEMBER(ppi_pa_w);
@@ -90,12 +94,11 @@ public:
u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(kbd_scan);
- void sbrain(machine_config &config);
void sbrain_io(address_map &map);
void sbrain_mem(address_map &map);
void sbrain_subio(address_map &map);
void sbrain_submem(address_map &map);
-private:
+
bool m_busak;
u8 m_keydown;
u8 m_porta;
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 36e4a6a2aba..19fd78c9e7c 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -61,7 +61,7 @@ public:
void sbrkout(machine_config &config);
-protected:
+private:
DECLARE_WRITE8_MEMBER(irq_ack_w);
virtual DECLARE_READ8_MEMBER(switches_r);
DECLARE_WRITE_LINE_MEMBER(pot_mask1_w);
@@ -85,7 +85,6 @@ protected:
void update_nmi_state();
void main_map(address_map &map);
-private:
required_shared_ptr<uint8_t> m_videoram;
emu_timer *m_scanline_timer;
emu_timer *m_pot_timer;
diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp
index 7e2d944cbed..5d8d4e1e72f 100644
--- a/src/mame/drivers/sc1.cpp
+++ b/src/mame/drivers/sc1.cpp
@@ -33,14 +33,16 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void sc1(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER( matrix_w );
DECLARE_WRITE8_MEMBER( pio_port_a_w );
DECLARE_READ8_MEMBER( pio_port_b_r );
- void sc1(machine_config &config);
void sc1_io(address_map &map);
void sc1_mem(address_map &map);
-private:
+
uint8_t m_matrix;
virtual void machine_start() override { m_digits.resolve(); }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp
index 0e8c72e1562..a938e8bdfd1 100644
--- a/src/mame/drivers/sc2.cpp
+++ b/src/mame/drivers/sc2.cpp
@@ -30,7 +30,9 @@ public:
m_leds(*this, "led%u", 0U)
{ }
+ void sc2(machine_config &config);
+private:
DECLARE_READ8_MEMBER(pio_port_a_r);
DECLARE_READ8_MEMBER(pio_port_b_r);
DECLARE_WRITE8_MEMBER(pio_port_a_w);
@@ -44,7 +46,6 @@ public:
void sc2_update_display();
virtual void machine_start() override;
virtual void machine_reset() override;
- void sc2(machine_config &config);
void sc2_io(address_map &map);
void sc2_mem(address_map &map);
diff --git a/src/mame/drivers/scm_500.cpp b/src/mame/drivers/scm_500.cpp
index bba0f10d7f1..7983f6482e3 100644
--- a/src/mame/drivers/scm_500.cpp
+++ b/src/mame/drivers/scm_500.cpp
@@ -20,9 +20,11 @@ public:
// ,m_maincpu(*this, "maincpu")
{ }
+ void scm_500(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
- void scm_500(machine_config &config);
// required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp
index 49ebb27eeab..7e0ef2bf9c0 100644
--- a/src/mame/drivers/scobra.cpp
+++ b/src/mame/drivers/scobra.cpp
@@ -52,18 +52,6 @@ public:
: scramble_state(mconfig, type, tag),
m_soundram(*this, "soundram") { }
- DECLARE_READ8_MEMBER(scobra_soundram_r);
- DECLARE_WRITE8_MEMBER(scobra_soundram_w);
- DECLARE_READ8_MEMBER(scobra_type2_ppi8255_0_r);
- DECLARE_READ8_MEMBER(scobra_type2_ppi8255_1_r);
- DECLARE_READ8_MEMBER(hustler_ppi8255_0_r);
- DECLARE_READ8_MEMBER(hustler_ppi8255_1_r);
- DECLARE_WRITE8_MEMBER(scobra_type2_ppi8255_0_w);
- DECLARE_WRITE8_MEMBER(scobra_type2_ppi8255_1_w);
- DECLARE_WRITE8_MEMBER(hustler_ppi8255_0_w);
- DECLARE_WRITE8_MEMBER(hustler_ppi8255_1_w);
- DECLARE_CUSTOM_INPUT_MEMBER(stratgyx_coinage_r);
-
void mimonkey(machine_config &config);
void stratgyx(machine_config &config);
void type1(machine_config &config);
@@ -78,6 +66,21 @@ public:
void tazmani3(machine_config &config);
void hustlerb(machine_config &config);
void rescuefe(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(stratgyx_coinage_r);
+
+private:
+ DECLARE_READ8_MEMBER(scobra_soundram_r);
+ DECLARE_WRITE8_MEMBER(scobra_soundram_w);
+ DECLARE_READ8_MEMBER(scobra_type2_ppi8255_0_r);
+ DECLARE_READ8_MEMBER(scobra_type2_ppi8255_1_r);
+ DECLARE_READ8_MEMBER(hustler_ppi8255_0_r);
+ DECLARE_READ8_MEMBER(hustler_ppi8255_1_r);
+ DECLARE_WRITE8_MEMBER(scobra_type2_ppi8255_0_w);
+ DECLARE_WRITE8_MEMBER(scobra_type2_ppi8255_1_w);
+ DECLARE_WRITE8_MEMBER(hustler_ppi8255_0_w);
+ DECLARE_WRITE8_MEMBER(hustler_ppi8255_1_w);
+
void hustler_map(address_map &map);
void hustler_sound_io_map(address_map &map);
void hustler_sound_map(address_map &map);
@@ -92,7 +95,7 @@ public:
void tazmani3_map(address_map &map);
void type1_map(address_map &map);
void type2_map(address_map &map);
-private:
+
optional_shared_ptr<uint8_t> m_soundram;
};
diff --git a/src/mame/drivers/scopus.cpp b/src/mame/drivers/scopus.cpp
index f221aedff41..e3737710b1f 100644
--- a/src/mame/drivers/scopus.cpp
+++ b/src/mame/drivers/scopus.cpp
@@ -41,15 +41,18 @@ public:
m_dma8257(*this, "dma"),
m_maincpu(*this, "maincpu"){ }
+ void sagitta180(machine_config &config);
+
void init_sagitta180();
+
+private:
DECLARE_WRITE_LINE_MEMBER(hrq_w);
DECLARE_READ8_MEMBER(memory_read_byte);
I8275_DRAW_CHARACTER_MEMBER(crtc_display_pixels);
- void sagitta180(machine_config &config);
void maincpu_io_map(address_map &map);
void maincpu_map(address_map &map);
-private:
+
/* devices */
required_device<palette_device> m_palette;
required_device<i8275_device> m_crtc;
@@ -59,7 +62,6 @@ private:
// Character generator
const uint8_t *m_chargen;
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
};
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index 27594d41c7e..40a103be38d 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -24,6 +24,11 @@ public:
, m_beta(*this, BETA_DISK_TAG)
{ }
+ void scorpion(machine_config &config);
+ void profi(machine_config &config);
+ void quorum(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(beta_neutral_r);
DECLARE_READ8_MEMBER(beta_enable_r);
DECLARE_READ8_MEMBER(beta_disable_r);
@@ -33,19 +38,17 @@ public:
DECLARE_MACHINE_START(scorpion);
DECLARE_MACHINE_RESET(scorpion);
TIMER_DEVICE_CALLBACK_MEMBER(nmi_check_callback);
- void scorpion(machine_config &config);
- void profi(machine_config &config);
- void quorum(machine_config &config);
+
void scorpion_io(address_map &map);
void scorpion_mem(address_map &map);
void scorpion_switch(address_map &map);
-protected:
+
required_memory_bank m_bank1;
required_memory_bank m_bank2;
required_memory_bank m_bank3;
required_memory_bank m_bank4;
required_device<beta_disk_device> m_beta;
-private:
+
address_space *m_program;
uint8_t *m_p_ram;
void scorpion_update_memory();
diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp
index 0d21b2c1945..7b6a278073a 100644
--- a/src/mame/drivers/scregg.cpp
+++ b/src/mame/drivers/scregg.cpp
@@ -66,16 +66,20 @@ public:
scregg_state(const machine_config &mconfig, device_type type, const char *tag)
: btime_state(mconfig, type, tag) { }
+ void scregg(machine_config &config);
+ void dommy(machine_config &config);
+
+ void init_rockduck();
+
+private:
DECLARE_WRITE8_MEMBER(scregg_irqack_w);
DECLARE_READ8_MEMBER(scregg_irqack_r);
- void init_rockduck();
DECLARE_MACHINE_START(scregg);
DECLARE_MACHINE_RESET(scregg);
TIMER_DEVICE_CALLBACK_MEMBER(scregg_interrupt);
- void scregg(machine_config &config);
- void dommy(machine_config &config);
void dommy_map(address_map &map);
+
void eggs_map(address_map &map);
};
diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp
index 2e5a4487ca0..171e883f99c 100644
--- a/src/mame/drivers/scv.cpp
+++ b/src/mame/drivers/scv.cpp
@@ -31,6 +31,10 @@ public:
m_pc0(*this, "PC0"),
m_charrom(*this, "charrom") { }
+ void scv(machine_config &config);
+ void scv_pal(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(porta_w);
DECLARE_READ8_MEMBER(portb_r);
DECLARE_READ8_MEMBER(portc_r);
@@ -45,10 +49,8 @@ public:
DECLARE_PALETTE_INIT(scv);
uint32_t screen_update_scv(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void scv(machine_config &config);
- void scv_pal(machine_config &config);
void scv_mem(address_map &map);
-protected:
+
enum
{
TIMER_VB
diff --git a/src/mame/drivers/scyclone.cpp b/src/mame/drivers/scyclone.cpp
index 04533b1f29a..3266b40f400 100644
--- a/src/mame/drivers/scyclone.cpp
+++ b/src/mame/drivers/scyclone.cpp
@@ -65,6 +65,11 @@ public:
m_soundlatch(*this, "soundlatch")
{ }
+ void scyclone(machine_config &config);
+
+ CUSTOM_INPUT_MEMBER(collision_r);
+
+private:
DECLARE_WRITE8_MEMBER(vidctrl_w);
DECLARE_WRITE8_MEMBER(sprite_xpos_w);
@@ -87,19 +92,16 @@ public:
INTERRUPT_GEN_MEMBER(irq);
- CUSTOM_INPUT_MEMBER(collision_r);
- void scyclone(machine_config &config);
void scyclone_iomap(address_map &map);
void scyclone_map(address_map &map);
void scyclone_sub_iomap(address_map &map);
void scyclone_sub_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_region_ptr<uint8_t> m_stars;
diff --git a/src/mame/drivers/sderby2.cpp b/src/mame/drivers/sderby2.cpp
index 90bd2ab94f3..69f6ecd5a7e 100644
--- a/src/mame/drivers/sderby2.cpp
+++ b/src/mame/drivers/sderby2.cpp
@@ -52,11 +52,15 @@ public:
m_proms(*this, "proms"),
m_palette(*this, "palette") { }
+ void sderby2(machine_config &config);
+
+ void init_sderby2();
+
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
- void init_sderby2();
DECLARE_PALETTE_INIT(sderby2);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -79,7 +83,6 @@ public:
uint8_t sub_data;
uint8_t main_data;
uint8_t host_io_40;
- void sderby2(machine_config &config);
void main_io_map(address_map &map);
void main_program_map(address_map &map);
void sub_io_map(address_map &map);
diff --git a/src/mame/drivers/sdk80.cpp b/src/mame/drivers/sdk80.cpp
index d380edc6871..803f3c28432 100644
--- a/src/mame/drivers/sdk80.cpp
+++ b/src/mame/drivers/sdk80.cpp
@@ -51,12 +51,14 @@ public:
, m_usart_clock_state(0)
{ }
+ void sdk80(machine_config &config);
+
+private:
DECLARE_WRITE_LINE_MEMBER( usart_clock_tick );
- void sdk80(machine_config &config);
void sdk80_io(address_map &map);
void sdk80_mem(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<i8251_device> m_usart;
required_device<i8255_device> m_ppi_0;
diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp
index e03ae1e2146..346b8c5ee74 100644
--- a/src/mame/drivers/sdk85.cpp
+++ b/src/mame/drivers/sdk85.cpp
@@ -55,13 +55,15 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void sdk85(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(scanlines_w);
DECLARE_WRITE8_MEMBER(digit_w);
DECLARE_READ8_MEMBER(kbd_r);
- void sdk85(machine_config &config);
void sdk85_io(address_map &map);
void sdk85_mem(address_map &map);
-private:
+
u8 m_digit;
virtual void machine_reset() override;
virtual void machine_start() override { m_digits.resolve(); }
diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp
index 1a82205b551..f43f0932ad5 100644
--- a/src/mame/drivers/sdk86.cpp
+++ b/src/mame/drivers/sdk86.cpp
@@ -48,14 +48,16 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void sdk86(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(scanlines_w);
DECLARE_WRITE8_MEMBER(digit_w);
DECLARE_READ8_MEMBER(kbd_r);
- void sdk86(machine_config &config);
void sdk86_io(address_map &map);
void sdk86_mem(address_map &map);
-private:
+
uint8_t m_digit;
virtual void machine_start() override { m_digits.resolve(); }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index b92e115186a..bbac7edfd12 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -62,6 +62,9 @@ public:
m_palette(*this, "palette")
{ }
+ void seabattl(machine_config &config);
+
+private:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
DECLARE_WRITE8_MEMBER(seabattl_videoram_w);
DECLARE_WRITE8_MEMBER(seabattl_colorram_w);
@@ -80,16 +83,13 @@ public:
DECLARE_PALETTE_INIT(seabattl);
uint32_t screen_update_seabattl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void seabattl(machine_config &config);
void seabattl_data_map(address_map &map);
void seabattl_map(address_map &map);
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-private:
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp
index af85d0e1c75..b6a1594ef3b 100644
--- a/src/mame/drivers/sealy.cpp
+++ b/src/mame/drivers/sealy.cpp
@@ -46,6 +46,9 @@ public:
m_palette(*this, "palette")
{ }
+ void sealy(machine_config &config);
+
+private:
// devices
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
@@ -53,7 +56,6 @@ public:
// screen updates
DECLARE_PALETTE_INIT(sealy);
uint32_t screen_update_sealy(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void sealy(machine_config &config);
void sealy_map(address_map &map);
};
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp
index 75729102ec8..37abdb7a0e4 100644
--- a/src/mame/drivers/seattle.cpp
+++ b/src/mame/drivers/seattle.cpp
@@ -292,6 +292,43 @@ public:
m_leds(*this, "led%u", 0U)
{}
+ void seattle_common(machine_config &config);
+ void phoenixsa(machine_config &config);
+ void seattle150(machine_config &config);
+ void seattle150_widget(machine_config &config);
+ void seattle200(machine_config &config);
+ void seattle200_widget(machine_config &config);
+ void flagstaff(machine_config &config);
+ void wg3dh(machine_config &config);
+ void sfrush(machine_config &config);
+ void hyprdriv(machine_config &config);
+ void carnevil(machine_config &config);
+ void blitz99(machine_config &config);
+ void blitz2k(machine_config &config);
+ void blitz(machine_config &config);
+ void biofreak(machine_config &config);
+ void sfrushrkw(machine_config &config);
+ void calspeed(machine_config &config);
+ void mace(machine_config &config);
+ void vaportrx(machine_config &config);
+ void sfrushrk(machine_config &config);
+
+ void init_sfrush();
+ void init_blitz2k();
+ void init_carnevil();
+ void init_biofreak();
+ void init_calspeed();
+ void init_sfrushrk();
+ void init_vaportrx();
+ void init_hyprdriv();
+ void init_blitz();
+ void init_wg3dh();
+ void init_mace();
+ void init_blitz99();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
+
+private:
required_device<nvram_device> m_nvram;
required_device<mips3_device> m_maincpu;
optional_device<atari_cage_seattle_device> m_cage;
@@ -357,24 +394,11 @@ public:
DECLARE_READ32_MEMBER(widget_r);
DECLARE_WRITE32_MEMBER(widget_w);
DECLARE_WRITE32_MEMBER(wheel_board_w);
- DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
DECLARE_WRITE_LINE_MEMBER(ide_interrupt);
DECLARE_WRITE_LINE_MEMBER(vblank_assert);
- void init_sfrush();
- void init_blitz2k();
- void init_carnevil();
- void init_biofreak();
- void init_calspeed();
- void init_sfrushrk();
- void init_vaportrx();
- void init_hyprdriv();
- void init_blitz();
- void init_wg3dh();
- void init_mace();
- void init_blitz99();
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -386,26 +410,6 @@ public:
void update_widget_irq();
void init_common(int config);
- void seattle_common(machine_config &config);
- void phoenixsa(machine_config &config);
- void seattle150(machine_config &config);
- void seattle150_widget(machine_config &config);
- void seattle200(machine_config &config);
- void seattle200_widget(machine_config &config);
- void flagstaff(machine_config &config);
- void wg3dh(machine_config &config);
- void sfrush(machine_config &config);
- void hyprdriv(machine_config &config);
- void carnevil(machine_config &config);
- void blitz99(machine_config &config);
- void blitz2k(machine_config &config);
- void blitz(machine_config &config);
- void biofreak(machine_config &config);
- void sfrushrkw(machine_config &config);
- void calspeed(machine_config &config);
- void mace(machine_config &config);
- void vaportrx(machine_config &config);
- void sfrushrk(machine_config &config);
void seattle_cs0_map(address_map &map);
void seattle_cs1_map(address_map &map);
void seattle_cs2_map(address_map &map);
diff --git a/src/mame/drivers/seattlecmp.cpp b/src/mame/drivers/seattlecmp.cpp
index 50aeae721f4..4cd8cc944fa 100644
--- a/src/mame/drivers/seattlecmp.cpp
+++ b/src/mame/drivers/seattlecmp.cpp
@@ -47,12 +47,14 @@ public:
, m_pic(*this, "pic%u", 1)
{ }
+ void seattle(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(pic_slave_ack);
- void seattle(machine_config &config);
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device_array<pic8259_device, 2> m_pic;
};
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp
index e5f5407af04..4f1298afce1 100644
--- a/src/mame/drivers/segac2.cpp
+++ b/src/mame/drivers/segac2.cpp
@@ -111,27 +111,8 @@ public:
{
}
- // for Print Club only
- int m_cam_data;
-
- int m_segac2_enable_display;
-
- required_shared_ptr<uint16_t> m_paletteram;
- optional_memory_region m_upd_region;
-
- /* protection-related tracking */
- segac2_prot_delegate m_prot_func; /* emulation of protection chip */
- uint8_t m_prot_write_buf; /* remembers what was written */
- uint8_t m_prot_read_buf; /* remembers what was returned */
-
- /* palette-related variables */
- uint8_t m_segac2_alt_palette_mode;
- uint8_t m_palbank;
- uint8_t m_bg_palbase;
- uint8_t m_sp_palbase;
-
- /* sound-related variables */
- uint8_t m_sound_banks; /* number of sound banks */
+ void segac2(machine_config &config);
+ void segac(machine_config &config);
void init_c2boot();
void init_bloxeedc();
@@ -159,6 +140,30 @@ public:
void init_pclubjv2();
void init_pclubjv4();
void init_pclubjv5();
+
+private:
+ // for Print Club only
+ int m_cam_data;
+
+ int m_segac2_enable_display;
+
+ required_shared_ptr<uint16_t> m_paletteram;
+ optional_memory_region m_upd_region;
+
+ /* protection-related tracking */
+ segac2_prot_delegate m_prot_func; /* emulation of protection chip */
+ uint8_t m_prot_write_buf; /* remembers what was written */
+ uint8_t m_prot_read_buf; /* remembers what was returned */
+
+ /* palette-related variables */
+ uint8_t m_segac2_alt_palette_mode;
+ uint8_t m_palbank;
+ uint8_t m_bg_palbase;
+ uint8_t m_sp_palbase;
+
+ /* sound-related variables */
+ uint8_t m_sound_banks; /* number of sound banks */
+
void segac2_common_init(segac2_prot_delegate prot_func);
DECLARE_VIDEO_START(segac2_new);
DECLARE_MACHINE_START(segac2);
@@ -214,8 +219,7 @@ public:
int prot_func_pclubjv2(int in);
int prot_func_pclubjv4(int in);
int prot_func_pclubjv5(int in);
- void segac2(machine_config &config);
- void segac(machine_config &config);
+
void main_map(address_map &map);
};
diff --git a/src/mame/drivers/segacoin.cpp b/src/mame/drivers/segacoin.cpp
index 91a3acc5b16..6f26d1569ea 100644
--- a/src/mame/drivers/segacoin.cpp
+++ b/src/mame/drivers/segacoin.cpp
@@ -34,9 +34,11 @@ public:
m_audiocpu(*this, "audiocpu")
{ }
+ void westdrm(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
- void westdrm(machine_config &config);
void main_map(address_map &map);
void main_portmap(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index 356484eb431..e596a7a71bb 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -329,23 +329,26 @@ public:
m_lamp(*this, "lamp0")
{ }
+ void systemex_315_5177(machine_config &config);
+ void systemex(machine_config &config);
+ void ridleofp(machine_config &config);
+ void hangonjr(machine_config &config);
+ void systeme(machine_config &config);
+ void systemeb(machine_config &config);
+
+ void init_opaopa();
+ void init_fantzn2();
+
+private:
DECLARE_WRITE8_MEMBER(bank_write);
DECLARE_WRITE8_MEMBER(coin_counters_write);
DECLARE_READ8_MEMBER( hangonjr_port_f8_read );
DECLARE_WRITE8_MEMBER( hangonjr_port_fa_write );
- void init_opaopa();
- void init_fantzn2();
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void systemex_315_5177(machine_config &config);
- void systemex(machine_config &config);
- void ridleofp(machine_config &config);
- void hangonjr(machine_config &config);
- void systeme(machine_config &config);
- void systemeb(machine_config &config);
void banked_decrypted_opcodes_map(address_map &map);
void decrypted_opcodes_map(address_map &map);
void io_map(address_map &map);
@@ -353,10 +356,8 @@ public:
void vdp1_map(address_map &map);
void vdp2_map(address_map &map);
-protected:
virtual void machine_start() override;
-private:
// Devices
required_device<cpu_device> m_maincpu;
required_device<sega315_5124_device> m_vdp1;
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index 9f3538f19ce..93d49389d33 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -53,13 +53,13 @@ public:
, m_towerlamps(*this, "towerlamp%u", 0U)
{ }
+ void segajw(machine_config &config);
+
DECLARE_INPUT_CHANGED_MEMBER(coin_drop_start);
DECLARE_CUSTOM_INPUT_MEMBER(coin_sensors_r);
DECLARE_CUSTOM_INPUT_MEMBER(hopper_sensors_r);
- void segajw(machine_config &config);
-
-protected:
+private:
DECLARE_READ8_MEMBER(coin_counter_r);
DECLARE_WRITE8_MEMBER(coin_counter_w);
DECLARE_WRITE8_MEMBER(hopper_w);
@@ -77,7 +77,6 @@ protected:
void segajw_hd63484_map(address_map &map);
void segajw_map(address_map &map);
-private:
// devices
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp
index 5afc70a53c1..6b178a960b8 100644
--- a/src/mame/drivers/segald.cpp
+++ b/src/mame/drivers/segald.cpp
@@ -42,6 +42,11 @@ public:
m_palette(*this, "palette")
{ }
+ void astron(machine_config &config);
+
+ void init_astron();
+
+private:
uint8_t m_nmi_enable;
required_device<pioneer_ldv1000_device> m_laserdisc;
@@ -63,7 +68,6 @@ public:
DECLARE_WRITE8_MEMBER(astron_COLOR_write);
DECLARE_WRITE8_MEMBER(astron_FIX_write);
DECLARE_WRITE8_MEMBER(astron_io_bankswitch_w);
- void init_astron();
virtual void machine_start() override;
uint32_t screen_update_astron(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void astron_draw_characters(bitmap_rgb32 &bitmap,const rectangle &cliprect);
@@ -71,7 +75,6 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void astron(machine_config &config);
void mainmem(address_map &map);
void mainport(address_map &map);
};
diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp
index 0bf68adb3c8..958f6e4a4f3 100644
--- a/src/mame/drivers/segam1.cpp
+++ b/src/mame/drivers/segam1.cpp
@@ -61,6 +61,10 @@ public:
, m_ymsnd(*this, "ymsnd")
{ }
+ void unkm1(machine_config &config);
+ void segam1(machine_config &config);
+
+private:
DECLARE_WRITE16_MEMBER(paletteram_w);
DECLARE_WRITE8_MEMBER(sound_a0_bank_w);
@@ -75,8 +79,6 @@ public:
required_device<segas24_tile_device> m_tile;
required_device<segas24_mixer_device> m_mixer;
required_device<ym3438_device> m_ymsnd;
- void unkm1(machine_config &config);
- void segam1(machine_config &config);
void segam1_comms_map(address_map &map);
void segam1_map(address_map &map);
void segam1_sound_io_map(address_map &map);
diff --git a/src/mame/drivers/segapico.cpp b/src/mame/drivers/segapico.cpp
index dadc897a2f5..16939df090f 100644
--- a/src/mame/drivers/segapico.cpp
+++ b/src/mame/drivers/segapico.cpp
@@ -139,6 +139,11 @@ public:
m_io_peny(*this, "PENY")
{ }
+ void init_pico();
+ void init_picou();
+ void init_picoj();
+
+protected:
optional_device<sega_315_5641_pcm_device> m_sega_315_5641_pcm;
required_ioport m_io_page;
@@ -153,9 +158,6 @@ public:
DECLARE_WRITE16_MEMBER(pico_68k_io_write);
DECLARE_WRITE_LINE_MEMBER(sound_cause_irq);
- void init_pico();
- void init_picou();
- void init_picoj();
void pico_mem(address_map &map);
};
@@ -166,10 +168,12 @@ public:
: pico_base_state(mconfig, type, tag),
m_picocart(*this, "picoslot") { }
- required_device<pico_cart_slot_device> m_picocart;
- DECLARE_MACHINE_START(pico);
void pico(machine_config &config);
void picopal(machine_config &config);
+
+private:
+ required_device<pico_cart_slot_device> m_picocart;
+ DECLARE_MACHINE_START(pico);
};
diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp
index 5d84438d845..bbed1cd5f25 100644
--- a/src/mame/drivers/segapm.cpp
+++ b/src/mame/drivers/segapm.cpp
@@ -21,10 +21,12 @@ public:
m_maincpu(*this, "maincpu")
{ }
+ void segapm(machine_config &config);
+
+private:
virtual void video_start() override;
uint32_t screen_update_segapm(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
- void segapm(machine_config &config);
void segapm_map(address_map &map);
};
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index bad1b4adaec..1ad0169693c 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -2685,8 +2685,18 @@ public:
, m_slavepcb(*this, "slavepcb")
{ }
- required_device<segas32_state> m_mainpcb;
- optional_device<segas32_state> m_slavepcb;
+ void sega_multi32(machine_config &config);
+ void sega_system32(machine_config &config);
+ void sega_multi32_analog(machine_config &config);
+ void sega_multi32_6p(machine_config &config);
+ void sega_system32_dual_direct_upd7725(machine_config &config);
+ void sega_system32_dual_direct(machine_config &config);
+ void sega_system32_track(machine_config &config);
+ void sega_system32_ga2(machine_config &config);
+ void sega_system32_cd(machine_config &config);
+ void sega_system32_arf(machine_config &config);
+ void sega_system32_analog(machine_config &config);
+ void sega_system32_4p(machine_config &config);
void init_titlef();
void init_slipstrm();
@@ -2712,25 +2722,15 @@ public:
void init_f1lap();
void init_orunners();
+private:
+ required_device<segas32_state> m_mainpcb;
+ optional_device<segas32_state> m_slavepcb;
+
std::unique_ptr<uint16_t[]> m_dual_pcb_comms;
DECLARE_WRITE16_MEMBER(dual_pcb_comms_w);
DECLARE_READ16_MEMBER(dual_pcb_comms_r);
DECLARE_READ16_MEMBER(dual_pcb_masterslave);
DECLARE_READ16_MEMBER(dual_pcb_slave);
-
-
- void sega_multi32(machine_config &config);
- void sega_system32(machine_config &config);
- void sega_multi32_analog(machine_config &config);
- void sega_multi32_6p(machine_config &config);
- void sega_system32_dual_direct_upd7725(machine_config &config);
- void sega_system32_dual_direct(machine_config &config);
- void sega_system32_track(machine_config &config);
- void sega_system32_ga2(machine_config &config);
- void sega_system32_cd(machine_config &config);
- void sega_system32_arf(machine_config &config);
- void sega_system32_analog(machine_config &config);
- void sega_system32_4p(machine_config &config);
};
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index df648138f70..71107b00e43 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -92,7 +92,7 @@ public:
void newufo(machine_config &config);
void ufo800(machine_config &config);
-protected:
+private:
void motor_tick(int p, int m);
DECLARE_WRITE_LINE_MEMBER(pit_out0);
@@ -126,7 +126,6 @@ protected:
void ex_ufo21_portmap(address_map &map);
void ex_ufo800_portmap(address_map &map);
-private:
struct Player
{
struct Motor
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index d20362e4eb1..ba8901fe663 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -360,7 +360,14 @@ public:
{
}
- required_device<segaxbd_state> m_mainpcb;
+ void sega_smgp_fd1094(machine_config &config);
+ void sega_lastsurv_fd1094(machine_config &config);
+ void sega_lastsurv(machine_config &config);
+ void sega_xboard(machine_config &config);
+ void sega_aburner2(machine_config &config);
+ void sega_xboard_fd1094(machine_config &config);
+ void sega_rascot(machine_config &config);
+ void sega_smgp(machine_config &config);
// game-specific driver init
void init_generic();
@@ -371,14 +378,8 @@ public:
void init_rascot();
void init_gprider();
- void sega_smgp_fd1094(machine_config &config);
- void sega_lastsurv_fd1094(machine_config &config);
- void sega_lastsurv(machine_config &config);
- void sega_xboard(machine_config &config);
- void sega_aburner2(machine_config &config);
- void sega_xboard_fd1094(machine_config &config);
- void sega_rascot(machine_config &config);
- void sega_smgp(machine_config &config);
+protected:
+ required_device<segaxbd_state> m_mainpcb;
};
class segaxbd_new_state_double : public segaxbd_new_state
@@ -396,6 +397,11 @@ public:
rampage2 = 0x0000;
}
+ void sega_xboard_fd1094_double(machine_config &config);
+
+ void init_gprider_double();
+
+private:
required_device<segaxbd_state> m_subpcb;
DECLARE_READ16_MEMBER(shareram1_r) {
@@ -429,12 +435,9 @@ public:
}
}
- void init_gprider_double();
-
uint16_t shareram[0x800];
uint16_t rampage1;
uint16_t rampage2;
- void sega_xboard_fd1094_double(machine_config &config);
};
//**************************************************************************
diff --git a/src/mame/drivers/seibucats.cpp b/src/mame/drivers/seibucats.cpp
index f3f2a09afbf..25c998fc9c0 100644
--- a/src/mame/drivers/seibucats.cpp
+++ b/src/mame/drivers/seibucats.cpp
@@ -105,6 +105,11 @@ public:
{
}
+ void seibucats(machine_config &config);
+
+ void init_seibucats();
+
+private:
// screen updates
// uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
// IRQ_CALLBACK_MEMBER(spi_irq_callback);
@@ -114,19 +119,15 @@ public:
DECLARE_WRITE16_MEMBER(input_select_w);
DECLARE_WRITE16_MEMBER(output_latch_w);
DECLARE_WRITE16_MEMBER(aux_rtc_w);
- void init_seibucats();
- void seibucats(machine_config &config);
void seibucats_map(address_map &map);
-protected:
+
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
// virtual void video_start() override;
-
-private:
uint16_t m_input_select;
// optional_ioport_array<5> m_key;
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index 8333f8c786c..ec7f4c6cdc5 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -46,6 +46,9 @@ public:
, m_palette(*this, "palette")
{ }
+ void cupsocbl(machine_config &config);
+
+private:
// devices
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -75,17 +78,15 @@ public:
TILE_GET_INFO_MEMBER(get_sc2_tileinfo);
TILE_GET_INFO_MEMBER(get_sc3_tileinfo);
- void cupsocbl(machine_config &config);
void cupsocbl_mem(address_map &map);
void cupsocbl_sound_mem(address_map &map);
-protected:
+
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-private:
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect);
uint16_t m_layer_disable;
};
diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp
index 5c636290f92..04d2385cda2 100644
--- a/src/mame/drivers/selz80.cpp
+++ b/src/mame/drivers/selz80.cpp
@@ -50,18 +50,20 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void selz80(machine_config &config);
+ void dagz80(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(scanlines_w);
DECLARE_WRITE8_MEMBER(digit_w);
DECLARE_READ8_MEMBER(kbd_r);
DECLARE_MACHINE_RESET(dagz80);
DECLARE_MACHINE_RESET(selz80);
- void selz80(machine_config &config);
- void dagz80(machine_config &config);
void dagz80_mem(address_map &map);
void selz80_io(address_map &map);
void selz80_mem(address_map &map);
-private:
+
uint8_t m_digit;
void setup_baud();
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index d1f496b2cb7..16173ca2ea0 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -80,6 +80,9 @@ public:
m_sc3_vram(*this, "sc3_vram"),
m_spriteram16(*this, "sprite_ram") { }
+ void sengokmj(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -123,7 +126,7 @@ public:
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int pri);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sengokmj(machine_config &config);
+
void sengokmj_io_map(address_map &map);
void sengokmj_map(address_map &map);
};
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 2937453cc1d..4845ccb0ced 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -302,18 +302,8 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
- DECLARE_WRITE8_MEMBER(sfbonus_videoram_w);
- DECLARE_WRITE8_MEMBER(sfbonus_bank_w);
- DECLARE_READ8_MEMBER(sfbonus_2800_r);
- DECLARE_READ8_MEMBER(sfbonus_2801_r);
- DECLARE_READ8_MEMBER(sfbonus_2c00_r);
- DECLARE_READ8_MEMBER(sfbonus_2c01_r);
- DECLARE_READ8_MEMBER(sfbonus_3800_r);
- DECLARE_WRITE8_MEMBER(sfbonus_1800_w);
- DECLARE_WRITE8_MEMBER(sfbonus_3800_w);
- DECLARE_WRITE8_MEMBER(sfbonus_3000_w);
- DECLARE_WRITE8_MEMBER(sfbonus_2801_w);
- DECLARE_WRITE8_MEMBER(sfbonus_2c01_w);
+ void sfbonus(machine_config &config);
+
void init_hldspin2d();
void init_ch2000v3();
void init_fb5v();
@@ -430,6 +420,21 @@ public:
void init_tighookv();
void init_robadv();
void init_pirpok2d();
+
+private:
+ DECLARE_WRITE8_MEMBER(sfbonus_videoram_w);
+ DECLARE_WRITE8_MEMBER(sfbonus_bank_w);
+ DECLARE_READ8_MEMBER(sfbonus_2800_r);
+ DECLARE_READ8_MEMBER(sfbonus_2801_r);
+ DECLARE_READ8_MEMBER(sfbonus_2c00_r);
+ DECLARE_READ8_MEMBER(sfbonus_2c01_r);
+ DECLARE_READ8_MEMBER(sfbonus_3800_r);
+ DECLARE_WRITE8_MEMBER(sfbonus_1800_w);
+ DECLARE_WRITE8_MEMBER(sfbonus_3800_w);
+ DECLARE_WRITE8_MEMBER(sfbonus_3000_w);
+ DECLARE_WRITE8_MEMBER(sfbonus_2801_w);
+ DECLARE_WRITE8_MEMBER(sfbonus_2c01_w);
+
void sfbonus_bitswap(uint8_t xor0, uint8_t b00, uint8_t b01, uint8_t b02, uint8_t b03, uint8_t b04, uint8_t b05, uint8_t b06,uint8_t b07,
uint8_t xor1, uint8_t b10, uint8_t b11, uint8_t b12, uint8_t b13, uint8_t b14, uint8_t b15, uint8_t b16,uint8_t b17,
uint8_t xor2, uint8_t b20, uint8_t b21, uint8_t b22, uint8_t b23, uint8_t b24, uint8_t b25, uint8_t b26,uint8_t b27,
@@ -445,12 +450,11 @@ public:
TILE_GET_INFO_MEMBER(get_sfbonus_reel4_tile_info);
void draw_reel_layer(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int category);
uint32_t screen_update_sfbonus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sfbonus(machine_config &config);
+
void ramdac_map(address_map &map);
void sfbonus_io(address_map &map);
void sfbonus_map(address_map &map);
-protected:
virtual void machine_start() override { m_lamps.resolve(); }
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp
index 6bc0df68f4d..e45f566f8de 100644
--- a/src/mame/drivers/sfcbox.cpp
+++ b/src/mame/drivers/sfcbox.cpp
@@ -137,6 +137,9 @@ public:
, m_s3520cf(*this, "s3520cf")
{ }
+ void sfcbox(machine_config &config);
+
+private:
required_device<cpu_device> m_bios;
required_device<mb90082_device> m_mb90082;
required_device<s3520cf_device> m_s3520cf;
@@ -154,7 +157,6 @@ public:
virtual void machine_reset() override;
DECLARE_READ8_MEMBER(spc_ram_100_r);
DECLARE_WRITE8_MEMBER(spc_ram_100_w);
- void sfcbox(machine_config &config);
void sfcbox_io(address_map &map);
void sfcbox_map(address_map &map);
void snes_map(address_map &map);
diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp
index 797ced80a9a..04a3a06c7b3 100644
--- a/src/mame/drivers/sfkick.cpp
+++ b/src/mame/drivers/sfkick.cpp
@@ -189,10 +189,11 @@ public:
m_dsw2(*this, "DSW2")
{ }
- void init_sfkick();
void sfkick(machine_config &config);
-protected:
+ void init_sfkick();
+
+private:
DECLARE_WRITE8_MEMBER(page0_w);
DECLARE_WRITE8_MEMBER(page1_w);
DECLARE_WRITE8_MEMBER(page2_w);
@@ -209,7 +210,6 @@ protected:
void sfkick_sound_io_map(address_map &map);
void sfkick_sound_map(address_map &map);
-private:
std::unique_ptr<uint8_t[]> m_main_mem;
int m_bank_cfg;
int m_bank[8];
diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp
index c181174ebf1..dda6d2a306e 100644
--- a/src/mame/drivers/sg1000a.cpp
+++ b/src/mame/drivers/sg1000a.cpp
@@ -286,13 +286,16 @@ public:
m_maincpu(*this, "maincpu"),
m_decrypted_opcodes(*this, "decrypted_opcodes") { }
- DECLARE_WRITE8_MEMBER(sg1000a_coin_counter_w);
- void init_sg1000a();
- required_device<cpu_device> m_maincpu;
- optional_shared_ptr<uint8_t> m_decrypted_opcodes;
void sderby2s(machine_config &config);
void sg1000ax(machine_config &config);
void sg1000a(machine_config &config);
+
+ void init_sg1000a();
+
+private:
+ DECLARE_WRITE8_MEMBER(sg1000a_coin_counter_w);
+ required_device<cpu_device> m_maincpu;
+ optional_shared_ptr<uint8_t> m_decrypted_opcodes;
void decrypted_opcodes_map(address_map &map);
void io_map(address_map &map);
void program_map(address_map &map);
diff --git a/src/mame/drivers/sh4robot.cpp b/src/mame/drivers/sh4robot.cpp
index 0beaf1f83ac..66ff981bf09 100644
--- a/src/mame/drivers/sh4robot.cpp
+++ b/src/mame/drivers/sh4robot.cpp
@@ -42,9 +42,11 @@ public:
{ }
void sh4robot(machine_config &config);
+
+private:
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp
index 4ddee0de229..9e8d8f0812e 100644
--- a/src/mame/drivers/shanghai.cpp
+++ b/src/mame/drivers/shanghai.cpp
@@ -40,13 +40,15 @@ public:
m_screen(*this,"screen")
{ }
+ void shanghai(machine_config &config);
+ void shangha2(machine_config &config);
+ void kothello(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(shanghai_coin_w);
DECLARE_PALETTE_INIT(shanghai);
INTERRUPT_GEN_MEMBER(half_vblank_irq);
- void shanghai(machine_config &config);
- void shangha2(machine_config &config);
- void kothello(machine_config &config);
void hd63484_map(address_map &map);
void kothello_map(address_map &map);
void kothello_sound_map(address_map &map);
@@ -54,7 +56,7 @@ public:
void shangha2_portmap(address_map &map);
void shanghai_map(address_map &map);
void shanghai_portmap(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
};
diff --git a/src/mame/drivers/shootaway2.cpp b/src/mame/drivers/shootaway2.cpp
index 4c1fbb081b9..327e25ef62b 100644
--- a/src/mame/drivers/shootaway2.cpp
+++ b/src/mame/drivers/shootaway2.cpp
@@ -31,15 +31,16 @@ public:
m_subcpu(*this, "subcpu")
{ }
+ void m74(machine_config &config);
+
+private:
virtual void machine_reset() override;
virtual void machine_start() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void m74(machine_config &config);
void c68_map(address_map &map);
void sub_map(address_map &map);
-protected:
// devices
required_device<m37450_device> m_maincpu;
diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp
index 345e64206c4..7ff83a5da3a 100644
--- a/src/mame/drivers/shougi.cpp
+++ b/src/mame/drivers/shougi.cpp
@@ -102,7 +102,7 @@ public:
void shougi(machine_config &config);
-protected:
+private:
DECLARE_WRITE_LINE_MEMBER(nmi_enable_w);
DECLARE_READ8_MEMBER(semaphore_r);
@@ -116,7 +116,6 @@ protected:
void readport_sub(address_map &map);
void sub_map(address_map &map);
-private:
// devices/pointers
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp
index 56f3d3a9dac..9b6df3aa13c 100644
--- a/src/mame/drivers/shtzone.cpp
+++ b/src/mame/drivers/shtzone.cpp
@@ -59,11 +59,14 @@ class shtzone_state : public driver_device
public:
shtzone_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
+
+ void shtzone(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_shtzone(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void shtzone(machine_config &config);
void shtzone_map(address_map &map);
};
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index f8589119a54..925bbb0589e 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -150,11 +150,13 @@ public:
m_towerlamps(*this, "towerlamp%u", 0U)
{ }
- DECLARE_INPUT_CHANGED_MEMBER(coin_drop_start);
- void init_jwildb52();
void jwildb52(machine_config &config);
-protected:
+ void init_jwildb52();
+
+ DECLARE_INPUT_CHANGED_MEMBER(coin_drop_start);
+
+private:
DECLARE_READ8_MEMBER(unk_f700_r);
DECLARE_READ8_MEMBER(unk_f760_r);
DECLARE_READ8_MEMBER(in0_r);
@@ -177,7 +179,6 @@ protected:
void jwildb52_map(address_map &map);
void sound_prog_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<ptm6840_device> m_6840ptm_2;
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 7afab228a74..587fc3382c7 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -154,6 +154,33 @@ public:
m_leds(*this, "led%u", 0U)
{ }
+ void sigmab98(machine_config &config);
+ void pyenaget(machine_config &config);
+ void dodghero(machine_config &config);
+ void dashhero(machine_config &config);
+ void gegege(machine_config &config);
+ void haekaka(machine_config &config);
+ void gocowboy(machine_config &config);
+ void tdoboon(machine_config &config);
+ void animalc(machine_config &config);
+ void sammymdl(machine_config &config);
+ void itazuram(machine_config &config);
+
+ void init_dodghero();
+ void init_b3rinsya();
+ void init_tbeastw2();
+ void init_dashhero();
+ void init_gegege();
+ void init_pepsiman();
+ void init_itazuram();
+ void init_animalc();
+ void init_ucytokyu();
+ void init_haekaka();
+ void init_gocowboy();
+
+ uint32_t screen_update_sigmab98(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+protected:
DECLARE_WRITE8_MEMBER(gegege_regs_w);
DECLARE_READ8_MEMBER(gegege_regs_r);
DECLARE_WRITE8_MEMBER(gegege_regs2_w);
@@ -232,38 +259,14 @@ public:
DECLARE_READ8_MEMBER(sammymdl_eeprom_r);
DECLARE_WRITE8_MEMBER(sammymdl_eeprom_w);
- void init_dodghero();
- void init_b3rinsya();
- void init_tbeastw2();
- void init_dashhero();
- void init_gegege();
- void init_pepsiman();
- void init_itazuram();
- void init_animalc();
- void init_ucytokyu();
- void init_haekaka();
- void init_gocowboy();
-
DECLARE_MACHINE_RESET(sigmab98);
DECLARE_MACHINE_RESET(sammymdl);
- uint32_t screen_update_sigmab98(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_sammymdl);
INTERRUPT_GEN_MEMBER(sigmab98_vblank_interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(sammymdl_irq);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask);
- void sigmab98(machine_config &config);
- void pyenaget(machine_config &config);
- void dodghero(machine_config &config);
- void dashhero(machine_config &config);
- void gegege(machine_config &config);
- void haekaka(machine_config &config);
- void gocowboy(machine_config &config);
- void tdoboon(machine_config &config);
- void animalc(machine_config &config);
- void sammymdl(machine_config &config);
- void itazuram(machine_config &config);
void animalc_io(address_map &map);
void animalc_map(address_map &map);
void dashhero_io_map(address_map &map);
@@ -281,7 +284,6 @@ public:
void tdoboon_io(address_map &map);
void tdoboon_map(address_map &map);
-protected:
virtual void machine_start() override { m_leds.resolve(); }
virtual void video_start() override;
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index 2959a5231b2..580b03e9f78 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -48,7 +48,13 @@ public:
m_fg_videoram(*this, "fg_videoram"),
m_spriteram(*this, "spriteram") { }
+ void puzzlovek(machine_config &config);
+ void puzzlove(machine_config &config);
+ void silvmil(machine_config &config);
+
+ void init_silvmil();
+private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -124,7 +130,6 @@ public:
}
- void init_silvmil();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILEMAP_MAPPER_MEMBER(deco16_scan_rows);
@@ -133,9 +138,7 @@ public:
virtual void video_start() override;
uint32_t screen_update_silvmil(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void tumblepb_gfx1_rearrange();
- void puzzlovek(machine_config &config);
- void puzzlove(machine_config &config);
- void silvmil(machine_config &config);
+
void silvmil_map(address_map &map);
void silvmil_sound_map(address_map &map);
};
diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp
index 523dbad4dd1..4d0b44bc91f 100644
--- a/src/mame/drivers/sitcom.cpp
+++ b/src/mame/drivers/sitcom.cpp
@@ -66,10 +66,10 @@ public:
{
}
- DECLARE_INPUT_CHANGED_MEMBER(update_buttons);
-
void sitcom(machine_config &config);
+ DECLARE_INPUT_CHANGED_MEMBER(update_buttons);
+
protected:
template <unsigned D> DECLARE_WRITE16_MEMBER(update_ds) { m_digits[(D << 2) | offset] = data; }
DECLARE_WRITE_LINE_MEMBER(update_rxd) { m_rxd = bool(state); }
diff --git a/src/mame/drivers/sk1.cpp b/src/mame/drivers/sk1.cpp
index f18074c3b03..6b2c2d0b5e1 100644
--- a/src/mame/drivers/sk1.cpp
+++ b/src/mame/drivers/sk1.cpp
@@ -40,14 +40,15 @@ public:
// make slide switches usable on a keyboard
template <ioport_value V> DECLARE_INPUT_CHANGED_MEMBER(sw_function);
template <ioport_value V> DECLARE_INPUT_CHANGED_MEMBER(sw_mode);
+
DECLARE_CUSTOM_INPUT_MEMBER(function_in) { return m_sw_function; }
DECLARE_CUSTOM_INPUT_MEMBER(mode_in) { return m_sw_mode; }
+private:
void sk1_memory(address_map &map);
-protected:
+
virtual void driver_start() override;
-private:
ioport_value m_sw_function = 0xfe;
ioport_value m_sw_mode = 0xfe;
};
diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp
index ac7272a6cd9..ebddda70296 100644
--- a/src/mame/drivers/skeetsht.cpp
+++ b/src/mame/drivers/skeetsht.cpp
@@ -40,6 +40,9 @@ public:
{
}
+ void skeetsht(machine_config &config);
+
+private:
required_device<tlc34076_device> m_tlc34076;
required_shared_ptr<uint16_t> m_tms_vram;
uint8_t m_porta_latch;
@@ -60,7 +63,6 @@ public:
required_device<cpu_device> m_68hc11;
required_device<ay8910_device> m_ay;
required_device<tms34010_device> m_tms;
- void skeetsht(machine_config &config);
void hc11_io_map(address_map &map);
void hc11_pgm_map(address_map &map);
void tms_program_map(address_map &map);
diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp
index 42570529a56..25c9871256f 100644
--- a/src/mame/drivers/skimaxx.cpp
+++ b/src/mame/drivers/skimaxx.cpp
@@ -58,6 +58,9 @@ public:
m_fg_buffer(*this, "fg_buffer")
{ }
+ void skimaxx(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
required_device<tms34010_device> m_tms;
@@ -92,7 +95,6 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
- void skimaxx(machine_config &config);
void m68030_1_map(address_map &map);
void m68030_2_map(address_map &map);
void tms_program_map(address_map &map);
diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp
index 6af2347bcd6..959fa208a2b 100644
--- a/src/mame/drivers/skyarmy.cpp
+++ b/src/mame/drivers/skyarmy.cpp
@@ -46,6 +46,9 @@ public:
m_spriteram(*this, "spriteram"),
m_scrollram(*this, "scrollram") { }
+ void skyarmy(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -74,7 +77,6 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(nmi_source);
- void skyarmy(machine_config &config);
void skyarmy_io_map(address_map &map);
void skyarmy_map(address_map &map);
};
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index c94e45fe348..82b203761d1 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -161,6 +161,18 @@ public:
m_lamps(*this, "lamp%u", 1U)
{ }
+ void neraidou(machine_config &config);
+ void sstar97(machine_config &config);
+ void bdream97(machine_config &config);
+ void skylncr(machine_config &config);
+ void mbutrfly(machine_config &config);
+
+ void init_miaction();
+ void init_sonikfig();
+
+ READ_LINE_MEMBER(mbutrfly_prot_r);
+
+private:
DECLARE_WRITE8_MEMBER(skylncr_videoram_w);
DECLARE_WRITE8_MEMBER(skylncr_colorram_w);
DECLARE_WRITE8_MEMBER(reeltiles_1_w);
@@ -179,10 +191,8 @@ public:
DECLARE_READ8_MEMBER(ret_ff);
DECLARE_WRITE8_MEMBER(skylncr_nmi_enable_w);
DECLARE_WRITE8_MEMBER(mbutrfly_prot_w);
- READ_LINE_MEMBER(mbutrfly_prot_r);
DECLARE_READ8_MEMBER(bdream97_opcode_r);
- void init_miaction();
- void init_sonikfig();
+
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_reel_1_tile_info);
TILE_GET_INFO_MEMBER(get_reel_2_tile_info);
@@ -190,11 +200,6 @@ public:
TILE_GET_INFO_MEMBER(get_reel_4_tile_info);
uint32_t screen_update_skylncr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(skylncr_vblank_interrupt);
- void neraidou(machine_config &config);
- void sstar97(machine_config &config);
- void bdream97(machine_config &config);
- void skylncr(machine_config &config);
- void mbutrfly(machine_config &config);
void bdream97_opcode_map(address_map &map);
void io_map_mbutrfly(address_map &map);
void io_map_skylncr(address_map &map);
@@ -202,7 +207,6 @@ public:
void ramdac2_map(address_map &map);
void ramdac_map(address_map &map);
-protected:
virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp
index 316d82a016b..f966c7f9b0a 100644
--- a/src/mame/drivers/slc1.cpp
+++ b/src/mame/drivers/slc1.cpp
@@ -68,7 +68,7 @@ public:
void slc1(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER( io_r );
DECLARE_WRITE8_MEMBER( io_w );
@@ -78,7 +78,6 @@ protected:
void mem_map(address_map &map);
void io_map(address_map &map);
-private:
uint8_t m_digit = 0;
bool m_kbd_type = false;
diff --git a/src/mame/drivers/sleic.cpp b/src/mame/drivers/sleic.cpp
index 713adde4574..92681d38aba 100644
--- a/src/mame/drivers/sleic.cpp
+++ b/src/mame/drivers/sleic.cpp
@@ -38,15 +38,15 @@ public:
void sleic(machine_config &config);
void sleic_map(address_map &map);
-protected:
+ void init_sleic();
+
+private:
// devices
required_device<cpu_device> m_maincpu;
// driver_device overrides
virtual void machine_reset() override;
-public:
- void init_sleic();
};
diff --git a/src/mame/drivers/slicer.cpp b/src/mame/drivers/slicer.cpp
index 192dcdfba04..1aba773c3c2 100644
--- a/src/mame/drivers/slicer.cpp
+++ b/src/mame/drivers/slicer.cpp
@@ -24,13 +24,15 @@ public:
{
}
+ void slicer(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(sio_out_w);
template<unsigned int drive> DECLARE_WRITE_LINE_MEMBER(drive_sel_w);
- void slicer(machine_config &config);
void slicer_io(address_map &map);
void slicer_map(address_map &map);
-protected:
+
required_device<fd1797_device> m_fdc;
required_device<scsi_port_device> m_sasi;
};
diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp
index a454b38d459..547b753d149 100644
--- a/src/mame/drivers/sliver.cpp
+++ b/src/mame/drivers/sliver.cpp
@@ -96,6 +96,9 @@ public:
m_soundlatch(*this, "soundlatch"),
m_colorram(*this, "colorram") { }
+ void sliver(machine_config &config);
+
+private:
uint16_t m_io_offset;
uint16_t m_io_reg[IO_SIZE];
uint16_t m_fifo[FIFO_SIZE];
@@ -139,7 +142,7 @@ public:
void render_jpeg();
void postload();
- void sliver(machine_config &config);
+
void oki_map(address_map &map);
void ramdac_map(address_map &map);
void sliver_map(address_map &map);
diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp
index 5d8720a3031..a1878176215 100644
--- a/src/mame/drivers/slotcarn.cpp
+++ b/src/mame/drivers/slotcarn.cpp
@@ -47,6 +47,9 @@ public:
m_maincpu(*this, "maincpu"),
m_screen(*this, "screen") { }
+ void slotcarn(machine_config &config);
+
+private:
pen_t m_pens[NUM_PENS];
required_shared_ptr<uint8_t> m_backup_ram;
required_shared_ptr<uint8_t> m_ram_attr;
@@ -60,7 +63,6 @@ public:
virtual void machine_start() override;
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
- void slotcarn(machine_config &config);
void slotcarn_map(address_map &map);
void spielbud_io_map(address_map &map);
};
diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp
index 9fd5d06caae..5709c911a50 100644
--- a/src/mame/drivers/sm1800.cpp
+++ b/src/mame/drivers/sm1800.cpp
@@ -36,6 +36,9 @@ public:
, m_palette(*this, "palette")
{ }
+ void sm1800(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<i8251_device> m_uart;
required_device<i8255_device> m_ppi;
@@ -51,7 +54,6 @@ public:
INTERRUPT_GEN_MEMBER(sm1800_vblank_interrupt);
IRQ_CALLBACK_MEMBER(sm1800_irq_callback);
I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels );
- void sm1800(machine_config &config);
void sm1800_io(address_map &map);
void sm1800_mem(address_map &map);
};
diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp
index 2e987fac286..bd808e309f7 100644
--- a/src/mame/drivers/sm7238.cpp
+++ b/src/mame/drivers/sm7238.cpp
@@ -79,6 +79,9 @@ public:
static constexpr feature_type unemulated_features() { return feature::KEYBOARD; }
+ void sm7238(machine_config &config);
+
+private:
DECLARE_PALETTE_INIT(sm7238);
DECLARE_WRITE_LINE_MEMBER(write_keyboard_clock);
@@ -90,11 +93,10 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sm7238(machine_config &config);
void sm7238_io(address_map &map);
void sm7238_mem(address_map &map);
void videobank_map(address_map &map);
-private:
+
void recompute_parameters();
struct
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index d86c6e1b1ad..2d0edba44e4 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -69,6 +69,9 @@ public:
, m_palette(*this, "palette")
{ }
+ void smc777(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(mc6845_w);
DECLARE_READ8_MEMBER(vram_r);
DECLARE_READ8_MEMBER(attr_r);
@@ -105,15 +108,13 @@ public:
DECLARE_QUICKLOAD_LOAD_MEMBER(smc777);
- void smc777(machine_config &config);
void smc777_io(address_map &map);
void smc777_mem(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
required_device<mc6845_device> m_crtc;
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index ff8faf1ebe8..fa767d73fd2 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -235,6 +235,10 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
+ void sureshot(machine_config &config);
+ void sms(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_READ8_MEMBER(link_r);
DECLARE_WRITE8_MEMBER(link_w);
@@ -247,13 +251,10 @@ public:
DECLARE_WRITE8_MEMBER(ppi0_b_w);
DECLARE_MACHINE_START(sureshot);
uint32_t screen_update_sms(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sureshot(machine_config &config);
- void sms(machine_config &config);
void sms_map(address_map &map);
void sub_map(address_map &map);
void sureshot_map(address_map &map);
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp
index e09e624fc9d..5ad6dd856f0 100644
--- a/src/mame/drivers/snes.cpp
+++ b/src/mame/drivers/snes.cpp
@@ -51,6 +51,10 @@ public:
, m_cartslot(*this, "snsslot")
{ }
+ void snespal(machine_config &config);
+ void snes(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER( snes20_hi_r );
DECLARE_WRITE8_MEMBER( snes20_hi_w );
DECLARE_READ8_MEMBER( snes20_lo_r );
@@ -106,8 +110,7 @@ public:
required_device<snes_control_port_device> m_ctrl1;
required_device<snes_control_port_device> m_ctrl2;
optional_device<sns_cart_slot_device> m_cartslot;
- void snespal(machine_config &config);
- void snes(machine_config &config);
+
void snes_map(address_map &map);
void spc_map(address_map &map);
};
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index de6bebbc5dd..baf6ec31bdf 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -156,8 +156,23 @@ class snesb_state : public snes_state
{
public:
snesb_state(const machine_config &mconfig, device_type type, const char *tag)
- : snes_state(mconfig, type, tag) { }
+ : snes_state(mconfig, type, tag)
+ { }
+ void mk3snes(machine_config &config);
+ void ffight2b(machine_config &config);
+ void kinstb(machine_config &config);
+
+ void init_iron();
+ void init_denseib();
+ void init_kinstb();
+ void init_sblast2b();
+ void init_ffight2b();
+ void init_endless();
+ void init_mk3snes();
+ void init_legendsb();
+
+private:
std::unique_ptr<int8_t[]> m_shared_ram;
uint8_t m_cnt;
std::unique_ptr<int8_t[]> m_shared_ram2;
@@ -176,18 +191,7 @@ public:
DECLARE_READ8_MEMBER(snesb_coin_r);
DECLARE_READ8_MEMBER(spc_ram_100_r);
DECLARE_WRITE8_MEMBER(spc_ram_100_w);
- void init_iron();
- void init_denseib();
- void init_kinstb();
- void init_sblast2b();
- void init_ffight2b();
- void init_endless();
- void init_mk3snes();
- void init_legendsb();
DECLARE_MACHINE_RESET(ffight2b);
- void mk3snes(machine_config &config);
- void ffight2b(machine_config &config);
- void kinstb(machine_config &config);
void mcu_io_map(address_map &map);
void snesb_map(address_map &map);
void spc_mem(address_map &map);
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp
index 83d05f0b7d6..11db57a8883 100644
--- a/src/mame/drivers/socrates.cpp
+++ b/src/mame/drivers/socrates.cpp
@@ -97,13 +97,6 @@ TODO:
class socrates_state : public driver_device
{
public:
- enum
- {
- TIMER_KBMCU_SIM,
- TIMER_CLEAR_SPEECH,
- TIMER_CLEAR_IRQ
- };
-
socrates_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -118,6 +111,23 @@ public:
m_rambank2(*this, "rambank2"),
m_kbdrow(*this, "IN%u", 0)
{ }
+
+ void socrates_pal(machine_config &config);
+ void socrates(machine_config &config);
+
+ void init_socrates();
+ void init_iqunlimz();
+
+ DECLARE_PALETTE_INIT(socrates);
+
+protected:
+ enum
+ {
+ TIMER_KBMCU_SIM,
+ TIMER_CLEAR_SPEECH,
+ TIMER_CLEAR_IRQ
+ };
+
required_device<cpu_device> m_maincpu;
required_device<socrates_snd_device> m_sound;
required_device<screen_device> m_screen;
@@ -167,12 +177,11 @@ public:
DECLARE_WRITE8_MEMBER(reset_speech);
DECLARE_WRITE8_MEMBER(socrates_scroll_w);
DECLARE_WRITE8_MEMBER(socrates_sound_w);
- void init_socrates();
- void init_iqunlimz();
+
virtual void machine_reset() override;
virtual void machine_start() override;
virtual void video_start() override;
- DECLARE_PALETTE_INIT(socrates);
+
uint32_t screen_update_socrates(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(assert_irq);
TIMER_CALLBACK_MEMBER(kbmcu_sim_cb);
@@ -193,13 +202,11 @@ public:
uint8_t count;
} m_kb_queue;
- void socrates_pal(machine_config &config);
- void socrates(machine_config &config);
void socrates_rambank_map(address_map &map);
void socrates_rombank_map(address_map &map);
void z80_io(address_map &map);
void z80_mem(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
@@ -211,23 +218,25 @@ public:
: socrates_state(mconfig, type, tag)
{ }
+ void iqunlimz(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER( send_input );
+
+private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE8_MEMBER( colors_w );
DECLARE_READ8_MEMBER( video_regs_r );
DECLARE_WRITE8_MEMBER( video_regs_w );
DECLARE_READ8_MEMBER( status_r );
- DECLARE_INPUT_CHANGED_MEMBER( send_input );
- void iqunlimz(machine_config &config);
void iqunlimz_io(address_map &map);
void iqunlimz_mem(address_map &map);
void iqunlimz_rambank_map(address_map &map);
void iqunlimz_rombank_map(address_map &map);
-protected:
+
virtual void machine_reset() override;
int get_color(int index, int y);
-private:
uint8_t m_colors[8];
uint8_t m_video_regs[4];
diff --git a/src/mame/drivers/solbourne.cpp b/src/mame/drivers/solbourne.cpp
index e4968c72773..fd0ee9cc345 100644
--- a/src/mame/drivers/solbourne.cpp
+++ b/src/mame/drivers/solbourne.cpp
@@ -15,12 +15,12 @@ class solbourne_state : public driver_device
public:
solbourne_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
-// , m_maincpu(*this, "maincpu")
+ // , m_maincpu(*this, "maincpu")
{ }
-void solbourne(machine_config &config);
+ void solbourne(machine_config &config);
private:
-// required_device<cpu_device> m_maincpu;
+ // required_device<cpu_device> m_maincpu;
};
static INPUT_PORTS_START( solbourne )
diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp
index 27d0a913a83..684a253c610 100644
--- a/src/mame/drivers/sothello.cpp
+++ b/src/mame/drivers/sothello.cpp
@@ -59,6 +59,9 @@ public:
m_mainbank(*this, "mainbank")
{ }
+ void sothello(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_READ8_MEMBER(subcpu_halt_set);
DECLARE_READ8_MEMBER(subcpu_halt_clear);
@@ -73,17 +76,15 @@ public:
DECLARE_WRITE8_MEMBER(msm_cfg_w);
DECLARE_WRITE_LINE_MEMBER(adpcm_int);
- void sothello(machine_config &config);
void maincpu_io_map(address_map &map);
void maincpu_mem_map(address_map &map);
void soundcpu_io_map(address_map &map);
void soundcpu_mem_map(address_map &map);
void subcpu_mem_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
int m_subcpu_status;
int m_soundcpu_busy;
int m_msm_data;
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
index 0dfcb7319f6..50780bf8bec 100644
--- a/src/mame/drivers/spartanxtec.cpp
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -48,7 +48,7 @@ public:
void spartanxtec(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
@@ -66,7 +66,6 @@ protected:
void spartanxtec_sound_io(address_map &map);
void spartanxtec_sound_map(address_map &map);
-private:
required_shared_ptr<uint8_t> m_m62_tileram;
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_scroll_lo;
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index bdc2c5e5ba1..03a65bca8fc 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -163,6 +163,9 @@ public:
, m_centronics(*this, "centronics")
{}
+ void spc1000(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(iplk_w);
DECLARE_READ8_MEMBER(iplk_r);
DECLARE_WRITE_LINE_MEMBER(irq_w);
@@ -178,10 +181,9 @@ public:
return m_p_videoram[0x1000 + (ch & 0x7f) * 16 + line];
}
- void spc1000(machine_config &config);
void spc1000_io(address_map &map);
void spc1000_mem(address_map &map);
-private:
+
uint8_t m_IPLK;
uint8_t m_GMODE;
uint16_t m_page;
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index ec970416f1a..12577a9187a 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -262,6 +262,10 @@ public:
, m_palette(*this, "palette")
, m_timer(nullptr)
{}
+
+ void spc1500(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(psga_r);
DECLARE_READ8_MEMBER(porta_r);
DECLARE_WRITE_LINE_MEMBER( centronics_busy_w ) { m_centronics_busy = state; }
@@ -292,10 +296,10 @@ public:
MC6845_UPDATE_ROW(crtc_update_row);
MC6845_RECONFIGURE(crtc_reconfig);
TIMER_DEVICE_CALLBACK_MEMBER(timer);
- void spc1500(machine_config &config);
+
void spc1500_double_io(address_map &map);
void spc1500_mem(address_map &map);
-private:
+
uint8_t *m_p_ram;
uint8_t m_ipl;
uint8_t m_palet[3];
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index 9c2adec6e45..7398b8df6a1 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -59,7 +59,7 @@ public:
void spectra(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER(porta_r);
DECLARE_READ8_MEMBER(portb_r);
DECLARE_WRITE8_MEMBER(porta_w);
@@ -68,7 +68,6 @@ protected:
TIMER_DEVICE_CALLBACK_MEMBER(outtimer);
void spectra_map(address_map &map);
-private:
uint8_t m_porta;
uint8_t m_portb;
uint8_t m_t_c;
diff --git a/src/mame/drivers/speglsht.cpp b/src/mame/drivers/speglsht.cpp
index 45555f246fb..3515d9dc1e5 100644
--- a/src/mame/drivers/speglsht.cpp
+++ b/src/mame/drivers/speglsht.cpp
@@ -125,6 +125,11 @@ public:
m_st0016_bank(*this, "st0016_bank")
{ }
+ void speglsht(machine_config &config);
+
+ void init_speglsht();
+
+private:
required_device<palette_device> m_palette;
required_device<st0016_cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
@@ -144,14 +149,13 @@ public:
DECLARE_WRITE32_MEMBER(cop_w);
DECLARE_READ32_MEMBER(cop_r);
DECLARE_READ32_MEMBER(irq_ack_clear);
- void init_speglsht();
+
DECLARE_MACHINE_RESET(speglsht);
virtual void machine_start() override;
DECLARE_VIDEO_START(speglsht);
uint32_t screen_update_speglsht(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE8_MEMBER(st0016_rom_bank_w);
- void speglsht(machine_config &config);
void speglsht_mem(address_map &map);
void st0016_io(address_map &map);
void st0016_mem(address_map &map);
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp
index aa14c198ba4..c3ea03f73f4 100644
--- a/src/mame/drivers/spinb.cpp
+++ b/src/mame/drivers/spinb.cpp
@@ -63,6 +63,15 @@ public:
, m_switches(*this, "SW.%u", 0)
{ }
+ void jolypark(machine_config &config);
+ void vrnwrld(machine_config &config);
+ void spinb(machine_config &config);
+
+ void init_game0();
+ void init_game1();
+ void init_game2();
+
+private:
DECLARE_WRITE8_MEMBER(p1_w);
DECLARE_READ8_MEMBER(p3_r);
DECLARE_WRITE8_MEMBER(p3_w);
@@ -90,21 +99,17 @@ public:
DECLARE_WRITE8_MEMBER(disp_w);
DECLARE_WRITE_LINE_MEMBER(ic5a_w);
DECLARE_WRITE_LINE_MEMBER(ic5m_w);
- void init_game0();
- void init_game1();
- void init_game2();
DECLARE_PALETTE_INIT(spinb);
+
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void jolypark(machine_config &config);
- void vrnwrld(machine_config &config);
- void spinb(machine_config &config);
+
void dmd_io(address_map &map);
void dmd_mem(address_map &map);
void spinb_audio_map(address_map &map);
void spinb_map(address_map &map);
void spinb_music_map(address_map &map);
void vrnwrld_map(address_map &map);
-private:
+
bool m_pc0a;
bool m_pc0m;
uint8_t m_game;
diff --git a/src/mame/drivers/spirit76.cpp b/src/mame/drivers/spirit76.cpp
index 9194cb0c6b5..68a85c0b568 100644
--- a/src/mame/drivers/spirit76.cpp
+++ b/src/mame/drivers/spirit76.cpp
@@ -33,6 +33,9 @@ public:
: genpin_class(mconfig, type, tag)
, m_maincpu(*this, "maincpu") { }
+ void spirit76(machine_config &config);
+
+private:
TIMER_DEVICE_CALLBACK_MEMBER(irq);
DECLARE_WRITE8_MEMBER(porta_w);
DECLARE_WRITE8_MEMBER(portb_w);
@@ -40,9 +43,8 @@ public:
DECLARE_READ8_MEMBER(portb_r);
DECLARE_WRITE8_MEMBER(unk_w);
DECLARE_READ8_MEMBER(unk_r);
- void spirit76(machine_config &config);
void maincpu_map(address_map &map);
-private:
+
u8 m_t_c;
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp
index 4223bbdaccd..241ef796120 100644
--- a/src/mame/drivers/splus.cpp
+++ b/src/mame/drivers/splus.cpp
@@ -67,6 +67,11 @@ public:
m_p1_unknown = 0x00;
}
+ void splus(machine_config &config);
+
+ void init_splus();
+
+private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
return 0;
@@ -85,12 +90,10 @@ public:
DECLARE_READ8_MEMBER(splus_registers_r);
DECLARE_WRITE8_MEMBER(i2c_nvram_w);
DECLARE_READ8_MEMBER(splus_reel_optics_r);
- void init_splus();
- void splus(machine_config &config);
+
void splus_iomap(address_map &map);
void splus_map(address_map &map);
-private:
// EEPROM States
int m_sda_dir;
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index 05193d26daa..0ab360e3a24 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -54,6 +54,16 @@ public:
m_leds(*this, "led%u", 0U)
{ }
+ void spoker(machine_config &config);
+ void _3super8(machine_config &config);
+
+ void init_spkleftover();
+ void init_spk116it();
+ void init_3super8();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(hopper_r);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
@@ -89,11 +99,6 @@ public:
DECLARE_WRITE8_MEMBER(magic_w);
DECLARE_READ8_MEMBER(magic_r);
- DECLARE_CUSTOM_INPUT_MEMBER(hopper_r);
-
- void init_spkleftover();
- void init_spk116it();
- void init_3super8();
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
@@ -102,8 +107,6 @@ public:
TILE_GET_INFO_MEMBER(get_fg_tile_info);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void spoker(machine_config &config);
- void _3super8(machine_config &config);
void _3super8_portmap(address_map &map);
void spoker_map(address_map &map);
void spoker_portmap(address_map &map);
diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp
index ad7b90a1d44..00226e2535c 100644
--- a/src/mame/drivers/spool99.cpp
+++ b/src/mame/drivers/spool99.cpp
@@ -113,6 +113,12 @@ public:
m_vram(*this, "vram"),
m_cram(*this, "cram") { }
+ void vcarn(machine_config &config);
+ void spool99(machine_config &config);
+
+ void init_spool99();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<okim6295_device> m_oki;
@@ -132,13 +138,10 @@ public:
DECLARE_WRITE8_MEMBER(eeprom_clockline_w);
DECLARE_WRITE8_MEMBER(eeprom_dataline_w);
- void init_spool99();
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TILE_GET_INFO_MEMBER(get_tile_info);
- void vcarn(machine_config &config);
- void spool99(machine_config &config);
void spool99_map(address_map &map);
void vcarn_map(address_map &map);
};
diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp
index d6fb54e0a2f..f4b1c2f6fce 100644
--- a/src/mame/drivers/sprcros2.cpp
+++ b/src/mame/drivers/sprcros2.cpp
@@ -77,6 +77,9 @@ public:
, m_sprram(*this, "sprram")
{ }
+ void sprcros2(machine_config &config);
+
+private:
// devices
required_device<cpu_device> m_master_cpu;
required_device<cpu_device> m_slave_cpu;
@@ -105,19 +108,17 @@ public:
bool m_slave_nmi_enable;
bool m_screen_enable;
uint8_t m_bg_scrollx, m_bg_scrolly;
- void sprcros2(machine_config &config);
void master_io(address_map &map);
void master_map(address_map &map);
void slave_io(address_map &map);
void slave_map(address_map &map);
-protected:
+
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-private:
void legacy_bg_draw(bitmap_ind16 &bitmap,const rectangle &cliprect);
void legacy_fg_draw(bitmap_ind16 &bitmap,const rectangle &cliprect);
void legacy_obj_draw(bitmap_ind16 &bitmap,const rectangle &cliprect);
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index 3ce79d61573..519321165f0 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -48,7 +48,11 @@ public:
m_soundlatch(*this, "soundlatch")
{ }
+ void spyhuntertec(machine_config &config);
+
+ void init_spyhuntertec();
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<timer_device> m_analog_timer;
@@ -69,8 +73,6 @@ public:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-
uint8_t m_spyhunt_sprite_color_mask;
int16_t m_spyhunt_scroll_offset;
int16_t m_spyhunt_scrollx;
@@ -81,8 +83,8 @@ public:
tilemap_t *m_alpha_tilemap;
tilemap_t *m_bg_tilemap;
DECLARE_WRITE8_MEMBER(spyhuntertec_paletteram_w);
- void init_spyhuntertec();
-// DECLARE_VIDEO_START(spyhuntertec);
+
+ // DECLARE_VIDEO_START(spyhuntertec);
// uint32_t screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE8_MEMBER(spyhuntertec_port04_w);
DECLARE_WRITE8_MEMBER(spyhuntertec_portf0_w);
@@ -112,7 +114,6 @@ public:
uint8_t m_analog_select;
uint8_t m_analog_count;
- void spyhuntertec(machine_config &config);
void spyhuntertec_map(address_map &map);
void spyhuntertec_portmap(address_map &map);
void spyhuntertec_sound_map(address_map &map);
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index 98b83b645a1..748914c43c5 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -94,6 +94,9 @@ public:
, m_cart(*this, "cartslot")
{ }
+ void squale(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(ctrl_w);
DECLARE_READ8_MEMBER(video_ram_read_reg1);
DECLARE_READ8_MEMBER(video_ram_read_reg2);
@@ -134,9 +137,8 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(squale_scanline);
- void squale(machine_config &config);
void squale_mem(address_map &map);
-private:
+
required_device<acia6850_device> m_acia;
required_device<ay8910_device> m_ay8910;
required_device<pia6821_device> m_pia_u72;
diff --git a/src/mame/drivers/srmp5.cpp b/src/mame/drivers/srmp5.cpp
index b5e42364fcc..064315bc951 100644
--- a/src/mame/drivers/srmp5.cpp
+++ b/src/mame/drivers/srmp5.cpp
@@ -77,6 +77,12 @@ public:
, m_chrbank(0)
{
}
+
+ void srmp5(machine_config &config);
+
+ void init_srmp5();
+
+private:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<cpu_device> m_maincpu;
@@ -120,12 +126,9 @@ public:
DECLARE_READ8_MEMBER(cmd2_r);
DECLARE_READ8_MEMBER(cmd_stat8_r);
virtual void machine_start() override;
- void init_srmp5();
uint32_t screen_update_srmp5(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
DECLARE_WRITE8_MEMBER(st0016_rom_bank_w);
- void srmp5(machine_config &config);
void srmp5_mem(address_map &map);
void st0016_io(address_map &map);
void st0016_mem(address_map &map);
diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp
index e5cd5de0f32..5136b178bb4 100644
--- a/src/mame/drivers/srmp6.cpp
+++ b/src/mame/drivers/srmp6.cpp
@@ -89,6 +89,8 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void srmp6(machine_config &config);
+private:
std::unique_ptr<uint16_t[]> m_tileram;
required_shared_ptr<uint16_t> m_sprram;
required_shared_ptr<uint16_t> m_chrram;
@@ -103,6 +105,9 @@ public:
unsigned short m_lastb;
unsigned short m_lastb2;
int m_destl;
+
+ void init_INIT();
+
DECLARE_WRITE16_MEMBER(srmp6_input_select_w);
DECLARE_READ16_MEMBER(srmp6_inputs_r);
DECLARE_WRITE16_MEMBER(video_regs_w);
@@ -112,7 +117,6 @@ public:
DECLARE_WRITE16_MEMBER(tileram_w);
DECLARE_WRITE16_MEMBER(paletteram_w);
DECLARE_READ16_MEMBER(srmp6_irq_ack_r);
- void init_INIT();
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update_srmp6(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -121,7 +125,6 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void srmp6(machine_config &config);
void srmp6_map(address_map &map);
};
diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp
index 644039024ec..297b9927e87 100644
--- a/src/mame/drivers/ssem.cpp
+++ b/src/mame/drivers/ssem.cpp
@@ -24,17 +24,20 @@ public:
{
}
+ void ssem(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(panel_check);
+
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update_ssem(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_INPUT_CHANGED_MEMBER(panel_check);
DECLARE_QUICKLOAD_LOAD_MEMBER(ssem_store);
inline uint32_t reverse(uint32_t v);
void strlower(char *buf);
- void ssem(machine_config &config);
void ssem_map(address_map &map);
-private:
+
template <typename Format, typename... Params>
void glyph_print(bitmap_rgb32 &bitmap, int32_t x, int32_t y, Format &&fmt, Params &&...args);
diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp
index 564de754393..abb19fd6dc0 100644
--- a/src/mame/drivers/ssfindo.cpp
+++ b/src/mame/drivers/ssfindo.cpp
@@ -230,6 +230,15 @@ public:
m_flashrom(*this, "flash"),
m_io_ps7500(*this, "PS7500") { }
+ void ssfindo(machine_config &config);
+ void ppcar(machine_config &config);
+ void tetfight(machine_config &config);
+
+ void init_ssfindo();
+ void init_ppcar();
+ void init_tetfight();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
optional_device<i2cmem_device> m_i2cmem;
@@ -278,9 +287,6 @@ public:
DECLARE_WRITE32_MEMBER(tetfight_unk_w);
void init_common();
- void init_ssfindo();
- void init_ppcar();
- void init_tetfight();
virtual void machine_reset() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -297,9 +303,7 @@ public:
void PS7500_reset();
void ssfindo_speedups();
void ppcar_speedups();
- void ssfindo(machine_config &config);
- void ppcar(machine_config &config);
- void tetfight(machine_config &config);
+
void ppcar_map(address_map &map);
void ssfindo_map(address_map &map);
void tetfight_map(address_map &map);
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index f54fa112f67..94fd7b58000 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -179,6 +179,9 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode") { }
+ void supershot(machine_config &config);
+
+private:
required_shared_ptr<uint8_t> m_videoram;
tilemap_t *m_tilemap;
DECLARE_WRITE8_MEMBER(supershot_vidram_w);
@@ -189,7 +192,6 @@ public:
uint32_t screen_update_supershot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
- void supershot(machine_config &config);
void supershot_map(address_map &map);
};
diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp
index 4dbaeb219a8..af6e7142d5a 100644
--- a/src/mame/drivers/ssingles.cpp
+++ b/src/mame/drivers/ssingles.cpp
@@ -164,6 +164,14 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
+ void ssingles(machine_config &config);
+ void atamanot(machine_config &config);
+
+ void init_ssingles();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(controls_r);
+
+private:
uint8_t m_videoram[VMEM_SIZE];
uint8_t m_colorram[VMEM_SIZE];
uint8_t m_prot_data;
@@ -177,15 +185,12 @@ public:
DECLARE_WRITE8_MEMBER(c001_w);
DECLARE_READ8_MEMBER(atamanot_prot_r);
DECLARE_WRITE8_MEMBER(atamanot_prot_w);
- DECLARE_CUSTOM_INPUT_MEMBER(controls_r);
- void init_ssingles();
+
virtual void video_start() override;
DECLARE_WRITE_LINE_MEMBER(atamanot_irq);
MC6845_UPDATE_ROW(ssingles_update_row);
MC6845_UPDATE_ROW(atamanot_update_row);
required_device<cpu_device> m_maincpu;
- void ssingles(machine_config &config);
- void atamanot(machine_config &config);
void atamanot_io_map(address_map &map);
void atamanot_map(address_map &map);
void ssingles_io_map(address_map &map);
diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp
index 5b9b8c1a3ee..e5dd90b0c26 100644
--- a/src/mame/drivers/sstrangr.cpp
+++ b/src/mame/drivers/sstrangr.cpp
@@ -24,6 +24,10 @@ public:
m_palette(*this, "palette"),
m_ram(*this, "ram") { }
+ void sstrngr2(machine_config &config);
+ void sstrangr(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<palette_device> m_palette;
required_shared_ptr<uint8_t> m_ram;
@@ -36,8 +40,6 @@ public:
uint32_t screen_update_sstrangr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sstrngr2(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void sstrngr2(machine_config &config);
- void sstrangr(machine_config &config);
void sstrangr_io_map(address_map &map);
void sstrangr_map(address_map &map);
};
diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp
index 43d50492b61..fb0d51cb550 100644
--- a/src/mame/drivers/st17xx.cpp
+++ b/src/mame/drivers/st17xx.cpp
@@ -50,11 +50,13 @@ public:
st17xx_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
+ void st17xx(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void st17xx(machine_config &config);
void cpu_map(address_map &map);
};
diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp
index d14b147db8b..8417cd14e3d 100644
--- a/src/mame/drivers/st_mp100.cpp
+++ b/src/mame/drivers/st_mp100.cpp
@@ -44,6 +44,12 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void st_mp100(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(activity_test);
+ DECLARE_INPUT_CHANGED_MEMBER(self_test);
+
+private:
DECLARE_READ8_MEMBER(u10_a_r);
DECLARE_WRITE8_MEMBER(u10_a_w);
DECLARE_READ8_MEMBER(u10_b_r);
@@ -55,13 +61,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(u10_cb2_w);
DECLARE_WRITE_LINE_MEMBER(u11_ca2_w);
DECLARE_WRITE_LINE_MEMBER(u11_cb2_w);
- DECLARE_INPUT_CHANGED_MEMBER(activity_test);
- DECLARE_INPUT_CHANGED_MEMBER(self_test);
TIMER_DEVICE_CALLBACK_MEMBER(timer_x);
TIMER_DEVICE_CALLBACK_MEMBER(u11_timer);
- void st_mp100(machine_config &config);
void st_mp100_map(address_map &map);
-private:
+
uint8_t m_u10a;
uint8_t m_u10b;
uint8_t m_u11a;
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index 18dac58b62a..ba7a317051d 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -51,9 +51,17 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void st_mp201(machine_config &config);
+ void st_mp200(machine_config &config);
+
void init_st_mp200();
void init_st_mp201();
void init_st_mp202();
+
+ DECLARE_INPUT_CHANGED_MEMBER(activity_test);
+ DECLARE_INPUT_CHANGED_MEMBER(self_test);
+
+private:
DECLARE_READ8_MEMBER(u10_a_r);
DECLARE_WRITE8_MEMBER(u10_a_w);
DECLARE_READ8_MEMBER(u10_b_r);
@@ -65,14 +73,12 @@ public:
DECLARE_WRITE_LINE_MEMBER(u10_cb2_w);
DECLARE_WRITE_LINE_MEMBER(u11_ca2_w);
DECLARE_WRITE_LINE_MEMBER(u11_cb2_w);
- DECLARE_INPUT_CHANGED_MEMBER(activity_test);
- DECLARE_INPUT_CHANGED_MEMBER(self_test);
+
TIMER_DEVICE_CALLBACK_MEMBER(timer_x);
TIMER_DEVICE_CALLBACK_MEMBER(u11_timer);
- void st_mp201(machine_config &config);
- void st_mp200(machine_config &config);
+
void st_mp200_map(address_map &map);
-private:
+
uint8_t m_u10a;
uint8_t m_u10b;
uint8_t m_u11a;
diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp
index bbad6a68b4c..c1a56c8cc59 100644
--- a/src/mame/drivers/stargame.cpp
+++ b/src/mame/drivers/stargame.cpp
@@ -29,15 +29,17 @@ public:
, m_ctc(*this, "ctc")
{ }
+ void stargame(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(rint_w);
DECLARE_MACHINE_RESET(stargame);
- void stargame(machine_config &config);
void audiocpu_io(address_map &map);
void audiocpu_map(address_map &map);
void maincpu_io(address_map &map);
void maincpu_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<z80ctc_device> m_ctc;
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index f9f0c438915..cc2f62928d4 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -94,6 +94,21 @@ public:
, m_palette(*this, "palette")
{ }
+
+ void statriv2(machine_config &config);
+ void funcsino(machine_config &config);
+ void statriv2v(machine_config &config);
+
+ void init_addr_xlh();
+ void init_addr_lhx();
+ void init_addr_lmh();
+ void init_addr_lmhe();
+ void init_addr_xhl();
+ void init_laserdisc();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(latched_coin_r);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<tms9927_device> m_tms;
required_shared_ptr<uint8_t> m_videoram;
@@ -108,14 +123,8 @@ public:
uint8_t m_last_coin;
DECLARE_WRITE8_MEMBER(statriv2_videoram_w);
DECLARE_READ8_MEMBER(question_data_r);
- DECLARE_CUSTOM_INPUT_MEMBER(latched_coin_r);
DECLARE_WRITE8_MEMBER(ppi_portc_hi_w);
- void init_addr_xlh();
- void init_addr_lhx();
- void init_addr_lmh();
- void init_addr_lmhe();
- void init_addr_xhl();
- void init_laserdisc();
+
TILE_GET_INFO_MEMBER(horizontal_tile_info);
TILE_GET_INFO_MEMBER(vertical_tile_info);
virtual void video_start() override;
@@ -123,9 +132,7 @@ public:
DECLARE_VIDEO_START(vertical);
uint32_t screen_update_statriv2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(statriv2_interrupt);
- void statriv2(machine_config &config);
- void funcsino(machine_config &config);
- void statriv2v(machine_config &config);
+
void statriv2_io_map(address_map &map);
void statriv2_map(address_map &map);
};
diff --git a/src/mame/drivers/stellafr.cpp b/src/mame/drivers/stellafr.cpp
index a3aa5b1d43c..62a30cfdded 100644
--- a/src/mame/drivers/stellafr.cpp
+++ b/src/mame/drivers/stellafr.cpp
@@ -28,7 +28,7 @@ public:
void stellafr(machine_config &config);
-protected:
+private:
IRQ_CALLBACK_MEMBER(irq_ack);
DECLARE_WRITE8_MEMBER(write_8000c1);
DECLARE_READ8_MEMBER(read_800101);
@@ -38,7 +38,6 @@ protected:
void stellafr_map(address_map &map);
-private:
// devices
required_device<cpu_device> m_maincpu;
required_device<mc68681_device> m_duart;
diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp
index 518756c31b8..a8f62068a4d 100644
--- a/src/mame/drivers/stratos.cpp
+++ b/src/mame/drivers/stratos.cpp
@@ -24,7 +24,11 @@ public:
, nvram_bank(*this, "nvram_bank")
{ }
+ void stratos(machine_config &config);
+
void init_stratos();
+
+private:
DECLARE_WRITE8_MEMBER(p2000_w);
DECLARE_READ8_MEMBER(p2200_r);
DECLARE_WRITE8_MEMBER(p2200_w);
@@ -37,9 +41,8 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(irq_timer);
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void stratos(machine_config &config);
void stratos_mem(address_map &map);
-private:
+
std::unique_ptr<uint8_t[]> nvram_data;
uint8_t control, led_latch_control;
uint32_t individual_leds;
diff --git a/src/mame/drivers/strkzn.cpp b/src/mame/drivers/strkzn.cpp
index 7deae6dc853..2835d263db1 100644
--- a/src/mame/drivers/strkzn.cpp
+++ b/src/mame/drivers/strkzn.cpp
@@ -23,11 +23,13 @@ public:
{ }
void strkzn(machine_config &config);
+
+private:
void light_io(address_map &map);
void light_mem(address_map &map);
void main_io(address_map &map);
void main_mem(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_lightcpu;
};
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index 26938614ac3..95a3690d20e 100644
--- a/src/mame/drivers/studio2.cpp
+++ b/src/mame/drivers/studio2.cpp
@@ -219,6 +219,14 @@ public:
m_screen(*this, "screen")
{ }
+ void studio2_cartslot(machine_config &config);
+ void studio2(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER( reset_w );
+
+ DECLARE_READ8_MEMBER( cart_400 );
+
+protected:
required_device<cosmac_device> m_maincpu;
required_device<beep_device> m_beeper;
optional_device<cdp1861_device> m_vdc;
@@ -231,7 +239,6 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- DECLARE_READ8_MEMBER( cart_400 );
DECLARE_READ8_MEMBER( cart_a00 );
DECLARE_READ8_MEMBER( cart_e00 );
DECLARE_READ8_MEMBER( dispon_r );
@@ -241,13 +248,11 @@ public:
DECLARE_READ_LINE_MEMBER( ef3_r );
DECLARE_READ_LINE_MEMBER( ef4_r );
DECLARE_WRITE_LINE_MEMBER( q_w );
- DECLARE_INPUT_CHANGED_MEMBER( reset_w );
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( studio2_cart_load );
/* keyboard state */
uint8_t m_keylatch;
- void studio2_cartslot(machine_config &config);
- void studio2(machine_config &config);
+
void studio2_io_map(address_map &map);
void studio2_map(address_map &map);
};
@@ -261,13 +266,15 @@ public:
m_color1_ram(*this, "color1_ram")
{ }
+ void visicom(machine_config &config);
+
+private:
virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_shared_ptr<uint8_t> m_color0_ram;
required_shared_ptr<uint8_t> m_color1_ram;
DECLARE_WRITE8_MEMBER( dma_w );
- void visicom(machine_config &config);
void visicom_io_map(address_map &map);
void visicom_map(address_map &map);
};
@@ -281,6 +288,9 @@ public:
m_color_ram(*this, "color_ram")
{ }
+ void mpt02(machine_config &config);
+
+private:
required_device<cdp1864_device> m_cti;
virtual void machine_start() override;
@@ -295,7 +305,6 @@ public:
/* video state */
required_shared_ptr<uint8_t> m_color_ram;
uint8_t m_color;
- void mpt02(machine_config &config);
void mpt02_io_map(address_map &map);
void mpt02_map(address_map &map);
};
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 1211e8a5696..408beb3f85d 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -107,6 +107,9 @@ public:
m_soundlatch(*this, "soundlatch")
{ }
+ void stuntair(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_shared_ptr<uint8_t> m_fgram;
@@ -144,7 +147,6 @@ public:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_stuntair(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_PALETTE_INIT(stuntair);
- void stuntair(machine_config &config);
void stuntair_map(address_map &map);
void stuntair_sound_map(address_map &map);
void stuntair_sound_portmap(address_map &map);
diff --git a/src/mame/drivers/su2000.cpp b/src/mame/drivers/su2000.cpp
index e3c7375bbce..7c9c9aa3f4e 100644
--- a/src/mame/drivers/su2000.cpp
+++ b/src/mame/drivers/su2000.cpp
@@ -65,9 +65,11 @@ public:
su2000_state(const machine_config &mconfig, device_type type, const char *tag)
: pcat_base_state(mconfig, type, tag){ }
- void su2000(machine_config &config);
- void pcat_io(address_map &map);
- void pcat_map(address_map &map);
+ void su2000(machine_config &config);
+
+private:
+ void pcat_io(address_map &map);
+ void pcat_map(address_map &map);
};
diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp
index 73cb0192e8e..be50969f82d 100644
--- a/src/mame/drivers/subhuntr.cpp
+++ b/src/mame/drivers/subhuntr.cpp
@@ -37,7 +37,7 @@ public:
void subhuntr(machine_config &config);
-protected:
+private:
INTERRUPT_GEN_MEMBER(subhuntr_interrupt);
virtual void machine_start() override;
@@ -50,7 +50,6 @@ protected:
void subhuntr_io_map(address_map &map);
void subhuntr_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 060207aa046..7290fd2c733 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -102,6 +102,27 @@ public:
, m_leds(*this, "led%u", 0U)
{ }
+ void bishjan(machine_config &config);
+ void saklove(machine_config &config);
+ void mtrain(machine_config &config);
+ void humlan(machine_config &config);
+ void new2001(machine_config &config);
+ void expcard(machine_config &config);
+ void xplan(machine_config &config);
+ void xtrain(machine_config &config);
+
+ void init_bishjan();
+ void init_new2001();
+ void init_humlan();
+ void init_xtrain();
+ void init_expcard();
+ void init_wtrnymph();
+ void init_mtrain();
+ void init_saklove();
+ void init_xplan();
+ void init_ptrain();
+
+private:
DECLARE_WRITE8_MEMBER(ss9601_byte_lo_w);
DECLARE_WRITE8_MEMBER(ss9601_byte_lo2_w);
DECLARE_WRITE8_MEMBER(ss9601_videoram_0_hi_w);
@@ -154,30 +175,13 @@ public:
DECLARE_WRITE8_MEMBER(xtrain_outputs_w);
DECLARE_WRITE8_MEMBER(oki_bank_bit0_w);
DECLARE_WRITE8_MEMBER(oki_bank_bit4_w);
- void init_bishjan();
- void init_new2001();
- void init_humlan();
- void init_xtrain();
- void init_expcard();
- void init_wtrnymph();
- void init_mtrain();
- void init_saklove();
- void init_xplan();
- void init_ptrain();
+
TILE_GET_INFO_MEMBER(ss9601_get_tile_info_0);
TILE_GET_INFO_MEMBER(ss9601_get_tile_info_1);
DECLARE_VIDEO_START(subsino2);
uint32_t screen_update_subsino2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(am188em_int0_irq);
- void bishjan(machine_config &config);
- void saklove(machine_config &config);
- void mtrain(machine_config &config);
- void humlan(machine_config &config);
- void new2001(machine_config &config);
- void expcard(machine_config &config);
- void xplan(machine_config &config);
- void xtrain(machine_config &config);
void bishjan_map(address_map &map);
void expcard_io(address_map &map);
void humlan_map(address_map &map);
@@ -192,7 +196,6 @@ public:
void xplan_map(address_map &map);
void xtrain_io(address_map &map);
-protected:
virtual void machine_start() override { m_leds.resolve(); }
layer_t m_layers[2];
@@ -220,7 +223,6 @@ protected:
optional_ioport m_system;
output_finder<9> m_leds;
-private:
inline void ss9601_get_tile_info(layer_t *l, tile_data &tileinfo, tilemap_memory_index tile_index);
};
diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp
index 1352690c27a..d326e85a98b 100644
--- a/src/mame/drivers/summit.cpp
+++ b/src/mame/drivers/summit.cpp
@@ -34,6 +34,9 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void summit(machine_config &config);
+
+private:
required_shared_ptr<uint8_t> m_attr;
required_shared_ptr<uint8_t> m_vram;
DECLARE_WRITE8_MEMBER(out_w);
@@ -43,7 +46,6 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void summit(machine_config &config);
void mainmap(address_map &map);
};
diff --git a/src/mame/drivers/sumt8035.cpp b/src/mame/drivers/sumt8035.cpp
index 088179ffba7..f2c6ca9e801 100644
--- a/src/mame/drivers/sumt8035.cpp
+++ b/src/mame/drivers/sumt8035.cpp
@@ -25,9 +25,10 @@ public:
{ }
void summit(machine_config &config);
+
+private:
void sumt_map(address_map &map);
void sumt_portmap(address_map &map);
-protected:
// devices
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/sun1.cpp b/src/mame/drivers/sun1.cpp
index 7b4ee8ab596..231b50e43d7 100644
--- a/src/mame/drivers/sun1.cpp
+++ b/src/mame/drivers/sun1.cpp
@@ -76,8 +76,9 @@ public:
}
void sun1(machine_config &config);
+
+private:
void sun1_mem(address_map &map);
-protected:
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp
index 9b40f705e15..d70868daaf3 100644
--- a/src/mame/drivers/sun2.cpp
+++ b/src/mame/drivers/sun2.cpp
@@ -158,6 +158,10 @@ public:
, m_bw2_vram(*this, "bw2_vram")
{ }
+ void sun2mbus(machine_config &config);
+ void sun2vme(machine_config &config);
+
+private:
required_device<m68010_device> m_maincpu;
required_memory_region m_rom, m_idprom;
required_device<ram_device> m_ram;
@@ -176,8 +180,6 @@ public:
uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void sun2mbus(machine_config &config);
- void sun2vme(machine_config &config);
void mbustype0space_map(address_map &map);
void mbustype1space_map(address_map &map);
void mbustype2space_map(address_map &map);
@@ -187,7 +189,7 @@ public:
void vmetype1space_map(address_map &map);
void vmetype2space_map(address_map &map);
void vmetype3space_map(address_map &map);
-private:
+
uint16_t *m_rom_ptr, *m_ram_ptr;
uint8_t *m_idprom_ptr;
uint16_t m_diagreg, m_sysenable, m_buserror;
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index f8dbad0f454..57e3c63f3f3 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -236,6 +236,13 @@ public:
m_ram(*this, RAM_TAG)
{ }
+ void sun3(machine_config &config);
+ void sun3e(machine_config &config);
+ void sun3_60(machine_config &config);
+ void sun3200(machine_config &config);
+ void sun3_50(machine_config &config);
+
+private:
required_device<m68020_device> m_maincpu;
required_device<z80scc_device> m_scc1;
required_device<z80scc_device> m_scc2;
@@ -267,18 +274,13 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(sun3_timer);
- void sun3(machine_config &config);
- void sun3e(machine_config &config);
- void sun3_60(machine_config &config);
- void sun3200(machine_config &config);
- void sun3_50(machine_config &config);
void sun3_mem(address_map &map);
void vmetype0space_map(address_map &map);
void vmetype0space_novram_map(address_map &map);
void vmetype1space_map(address_map &map);
void vmetype2space_map(address_map &map);
void vmetype3space_map(address_map &map);
-private:
+
uint32_t *m_rom_ptr, *m_ram_ptr;
uint8_t *m_idprom_ptr;
uint32_t m_enable, m_diag, m_dvma_enable, m_parregs[8], m_irqctrl, m_ecc[4];
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 2a368da8950..94ee4e18f82 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -171,6 +171,10 @@ public:
m_bw2_vram(*this, "bw2_vram")
{ }
+ void sun3_80(machine_config &config);
+ void sun3_460(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<z80scc_device> m_scc1;
required_device<z80scc_device> m_scc2;
@@ -211,11 +215,9 @@ public:
uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void sun3_80(machine_config &config);
- void sun3_460(machine_config &config);
void sun3_460_mem(address_map &map);
void sun3_80_mem(address_map &map);
-private:
+
uint32_t m_enable, m_buserr, m_diag, m_printer, m_irqctrl, m_memreg, m_memerraddr;
uint32_t m_iommu[0x800];
bool m_bInBusErr;
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index ad2c324de19..082c7031ff0 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -552,6 +552,14 @@ public:
{
}
+ void sun4c(machine_config &config);
+ void sun4(machine_config &config);
+
+ void init_sun4();
+ void init_sun4c();
+ void init_ss2();
+
+private:
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;
@@ -583,23 +591,18 @@ public:
DECLARE_WRITE_LINE_MEMBER( scc1_int );
DECLARE_WRITE_LINE_MEMBER( scc2_int );
- void init_sun4();
- void init_sun4c();
- void init_ss2();
-
DECLARE_FLOPPY_FORMATS( floppy_formats );
uint32_t bw2_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void ncr5390(device_t *device);
- void sun4c(machine_config &config);
- void sun4(machine_config &config);
+
void sun4_mem(address_map &map);
void sun4c_mem(address_map &map);
void type0space_map(address_map &map);
void type1space_map(address_map &map);
void type1space_s4_map(address_map &map);
-protected:
+
required_device<mb86901_device> m_maincpu;
required_device<mk48t12_device> m_timekpr;
@@ -626,7 +629,6 @@ protected:
uint32_t m_dma_pack_register;
int m_scsi_irq;
-private:
uint32_t *m_ram_ptr;
uint8_t m_segmap[16][4096];
uint32_t m_pagemap[16384];
diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp
index 53f37489899..9afd2b18787 100644
--- a/src/mame/drivers/supdrapo.cpp
+++ b/src/mame/drivers/supdrapo.cpp
@@ -84,6 +84,9 @@ public:
m_videoram(*this, "videoram"),
m_char_bank(*this, "char_bank") { }
+ void supdrapo(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<watchdog_timer_device> m_watchdog;
required_device<gfxdecode_device> m_gfxdecode;
@@ -110,7 +113,6 @@ public:
DECLARE_PALETTE_INIT(supdrapo);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void supdrapo(machine_config &config);
void sdpoker_mem(address_map &map);
};
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index d2c013a8c80..bfb7638a741 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -49,6 +49,9 @@ public:
m_soundlatch(*this, "soundlatch")
{ }
+ void supduck(machine_config &config);
+
+private:
// devices
required_device<cpu_device> m_maincpu;
required_device<z80_device> m_audiocpu;
@@ -82,11 +85,9 @@ public:
DECLARE_WRITE8_MEMBER(okibank_w);
- void supduck(machine_config &config);
void main_map(address_map &map);
void oki_map(address_map &map);
void sound_map(address_map &map);
-protected:
// driver_device overrides
virtual void machine_start() override;
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index 05125e31440..af77e72a119 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -184,6 +184,9 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode") { }
+ void supercrd(machine_config &config);
+
+private:
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
tilemap_t *m_bg_tilemap;
@@ -195,7 +198,6 @@ public:
uint32_t screen_update_supercrd(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
- void supercrd(machine_config &config);
void supercrd_map(address_map &map);
};
diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp
index 8eaef54573b..77c65bf0e94 100644
--- a/src/mame/drivers/superdq.cpp
+++ b/src/mame/drivers/superdq.cpp
@@ -36,12 +36,16 @@ class superdq_state : public driver_device
public:
superdq_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_laserdisc(*this, "laserdisc") ,
+ m_laserdisc(*this, "laserdisc"),
m_videoram(*this, "videoram"),
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette")
+ { }
+ void superdq(machine_config &config);
+
+private:
required_device<pioneer_ldv1000_device> m_laserdisc;
uint8_t m_ld_in_latch;
uint8_t m_ld_out_latch;
@@ -63,7 +67,6 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void superdq(machine_config &config);
void superdq_io(address_map &map);
void superdq_map(address_map &map);
};
diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp
index dedf29c58e0..9e88b3f5377 100644
--- a/src/mame/drivers/superslave.cpp
+++ b/src/mame/drivers/superslave.cpp
@@ -61,7 +61,7 @@ public:
void superslave(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
void superslave_io(address_map &map);
@@ -73,7 +73,6 @@ protected:
DECLARE_READ8_MEMBER( status_r );
DECLARE_WRITE8_MEMBER( cmd_w );
-private:
required_device<cpu_device> m_maincpu;
required_device<com8116_device> m_dbrg;
required_device<ram_device> m_ram;
diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp
index 1030abd6f2b..648ca72b604 100644
--- a/src/mame/drivers/supertnk.cpp
+++ b/src/mame/drivers/supertnk.cpp
@@ -118,10 +118,11 @@ public:
, m_maincpu(*this, "maincpu")
{ }
- void init_supertnk();
void supertnk(machine_config &config);
-protected:
+ void init_supertnk();
+
+private:
DECLARE_WRITE8_MEMBER(supertnk_bankswitch_0_w);
DECLARE_WRITE8_MEMBER(supertnk_bankswitch_1_w);
DECLARE_WRITE8_MEMBER(supertnk_interrupt_ack_w);
@@ -138,7 +139,6 @@ protected:
void supertnk_io_map(address_map &map);
void supertnk_map(address_map &map);
-private:
std::unique_ptr<uint8_t[]> m_videoram[3];
uint8_t m_rom_bank;
uint8_t m_bitplane_select;
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index b5554b1a7c2..a113e4f8615 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -57,6 +57,9 @@ public:
m_palette(*this, "palette")
{ }
+ void superwng(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_shared_ptr<uint8_t> m_videoram_bg;
@@ -98,7 +101,7 @@ public:
uint32_t screen_update_superwng(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(superwng_nmi_interrupt);
INTERRUPT_GEN_MEMBER(superwng_sound_nmi_assert);
- void superwng(machine_config &config);
+
void superwng_map(address_map &map);
void superwng_sound_map(address_map &map);
};
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index 4c3f9d7dd7e..06d3e732fa4 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -131,6 +131,8 @@ public:
m_m6502_reset = 0;
}
+ void supracan(machine_config &config);
+
private:
DECLARE_READ16_MEMBER(_68k_soundram_r);
DECLARE_WRITE16_MEMBER(_68k_soundram_w);
@@ -237,8 +239,6 @@ private:
void supracan_suprnova_draw_roz(bitmap_ind16 &bitmap, const rectangle &cliprect, tilemap_t *tmap, uint32_t startx, uint32_t starty, int incxx, int incxy, int incyx, int incyy, int wraparound/*, int columnscroll, uint32_t* scrollram*/, int transmask);
void supracan_mem(address_map &map);
void supracan_sound_mem(address_map &map);
-public:
- void supracan(machine_config &config);
};
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index 97f52d0dabd..efa4f7923d5 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -44,6 +44,11 @@ public:
m_videoram(*this, "videoram")
{ }
+ void suprgolf(machine_config &config);
+
+ void init_suprgolf();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<msm5205_device> m_msm;
required_device<gfxdecode_device> m_gfxdecode;
@@ -86,13 +91,11 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info);
- void init_suprgolf();
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void suprgolf(machine_config &config);
void io_map(address_map &map);
void suprgolf_map(address_map &map);
};
diff --git a/src/mame/drivers/supstarf.cpp b/src/mame/drivers/supstarf.cpp
index 78ffa6db7f7..7f27eaa3e34 100644
--- a/src/mame/drivers/supstarf.cpp
+++ b/src/mame/drivers/supstarf.cpp
@@ -27,6 +27,9 @@ public:
{
}
+ void supstarf(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(psg_latch_r);
DECLARE_WRITE8_MEMBER(psg_latch_w);
DECLARE_WRITE8_MEMBER(port1_w);
@@ -38,15 +41,13 @@ public:
DECLARE_WRITE8_MEMBER(lights_a_w);
DECLARE_WRITE8_MEMBER(lights_b_w);
- void supstarf(machine_config &config);
void main_io_map(address_map &map);
void main_map(address_map &map);
void sound_io_map(address_map &map);
void sound_map(address_map &map);
-protected:
+
virtual void machine_start() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
required_device_array<ay8910_device, 2> m_psg;
diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp
index 4cf259c30bd..9560fa76d32 100644
--- a/src/mame/drivers/sv8000.cpp
+++ b/src/mame/drivers/sv8000.cpp
@@ -53,7 +53,7 @@ public:
void sv8000(machine_config &config);
-protected:
+private:
DECLARE_DEVICE_IMAGE_LOAD_MEMBER( cart );
DECLARE_READ8_MEMBER( ay_port_a_r );
@@ -75,7 +75,6 @@ protected:
void sv8000_io(address_map &map);
void sv8000_mem(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<s68047_device> m_s68047p;
required_device<generic_slot_device> m_cart;
diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index b6f7b64fa00..44e2a3378bc 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -71,6 +71,12 @@ public:
m_keyboard_row(0)
{}
+ void svi328n(machine_config &config);
+ void svi318(machine_config &config);
+ void svi318n(machine_config &config);
+ void svi328(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER( ppi_port_a_r );
DECLARE_READ8_MEMBER( ppi_port_b_r );
DECLARE_WRITE8_MEMBER( ppi_port_c_w );
@@ -91,18 +97,13 @@ public:
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cartridge);
- void svi328n(machine_config &config);
- void svi318(machine_config &config);
- void svi318n(machine_config &config);
- void svi328(machine_config &config);
void svi3x8_io(address_map &map);
void svi3x8_io_bank(address_map &map);
void svi3x8_mem(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<address_map_bank_device> m_io;
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index c907ef5a6d4..51475b91609 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -39,6 +39,9 @@ public:
m_bios(*this, "bios")
{ }
+ void svmu(machine_config &config);
+
+private:
required_device<lc8670_cpu_device> m_maincpu;
required_device<intelfsh8_device> m_flash;
required_device<speaker_sound_device> m_speaker;
@@ -55,10 +58,9 @@ public:
DECLARE_READ8_MEMBER(p7_r);
DECLARE_QUICKLOAD_LOAD_MEMBER( svmu );
- void svmu(machine_config &config);
void svmu_io_mem(address_map &map);
void svmu_mem(address_map &map);
-private:
+
uint8_t m_page;
};
diff --git a/src/mame/drivers/swtpc.cpp b/src/mame/drivers/swtpc.cpp
index 19bab2f9750..6d6db26618f 100644
--- a/src/mame/drivers/swtpc.cpp
+++ b/src/mame/drivers/swtpc.cpp
@@ -56,12 +56,14 @@ public:
, m_brg(*this, "brg")
{ }
- virtual void machine_start() override;
-
void swtpcm(machine_config &config);
void swtpc(machine_config &config);
- void mem_map(address_map &map);
+
private:
+ virtual void machine_start() override;
+
+ void mem_map(address_map &map);
+
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<mc14411_device> m_brg;
diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp
index 5ffc7575a7f..4cb7c1cbc46 100644
--- a/src/mame/drivers/swyft.cpp
+++ b/src/mame/drivers/swyft.cpp
@@ -319,6 +319,9 @@ public:
m_y7(*this, "Y7")*/
{ }
+ void swyft(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<centronics_device> m_ctx;
optional_device<output_latch_device> m_ctx_data_out;
@@ -371,9 +374,8 @@ public:
uint8_t m_keyboard_line;
uint8_t m_floppy_control;
- void swyft(machine_config &config);
void swyft_mem(address_map &map);
-//protected:
+
//virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
};
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index 260d858704f..6970a11fe2d 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -56,6 +56,11 @@ public:
m_digits(*this, "digit%u", 0U)
{ }
+ void sym1(machine_config &config);
+
+ void init_sym1();
+
+private:
required_shared_ptr<uint8_t> m_ram_1k;
required_shared_ptr<uint8_t> m_ram_2k;
required_shared_ptr<uint8_t> m_ram_3k;
@@ -64,7 +69,6 @@ public:
uint8_t m_riot_port_a;
uint8_t m_riot_port_b;
emu_timer *m_led_update;
- void init_sym1();
virtual void machine_reset() override;
virtual void machine_start() override { m_digits.resolve(); }
TIMER_CALLBACK_MEMBER(led_refresh);
@@ -80,9 +84,8 @@ public:
DECLARE_WRITE8_MEMBER(riot_b_w);
DECLARE_WRITE8_MEMBER(via3_a_w);
- void sym1(machine_config &config);
void sym1_map(address_map &map);
-protected:
+
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<ttl74145_device> m_ttl74145;
diff --git a/src/mame/drivers/symbolics.cpp b/src/mame/drivers/symbolics.cpp
index b55c641ef7e..e8777dbf165 100644
--- a/src/mame/drivers/symbolics.cpp
+++ b/src/mame/drivers/symbolics.cpp
@@ -93,8 +93,12 @@ public:
{
}
- required_device<m68000_base_device> m_maincpu;
+ void symbolics(machine_config &config);
+
void init_symbolics();
+
+private:
+ required_device<m68000_base_device> m_maincpu;
DECLARE_READ16_MEMBER(buserror_r);
DECLARE_READ16_MEMBER(fep_paddle_id_prom_r);
//DECLARE_READ16_MEMBER(ram_parity_hack_r);
@@ -105,10 +109,9 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- void symbolics(machine_config &config);
void m68k_mem(address_map &map);
-//protected:
-// virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+ // virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
READ16_MEMBER(symbolics_state::buserror_r)
diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp
index 5acd9ceabdb..52ba62ba3ab 100644
--- a/src/mame/drivers/sys2900.cpp
+++ b/src/mame/drivers/sys2900.cpp
@@ -54,26 +54,28 @@ Status:
class sys2900_state : public driver_device
{
public:
- enum
- {
- TIMER_BOOT
- };
-
sys2900_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
- , m_maincpu(*this, "maincpu") { }
+ , m_maincpu(*this, "maincpu")
+ { }
+
+ void sys2900(machine_config &config);
void init_sys2900();
+
+private:
+ enum
+ {
+ TIMER_BOOT
+ };
uint32_t screen_update_sys2900(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sys2900(machine_config &config);
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
+
virtual void machine_reset() override;
virtual void video_start() override;
required_device<cpu_device> m_maincpu;
-protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/drivers/sys9002.cpp b/src/mame/drivers/sys9002.cpp
index 48bce3af092..ac0c29d20cd 100644
--- a/src/mame/drivers/sys9002.cpp
+++ b/src/mame/drivers/sys9002.cpp
@@ -37,12 +37,14 @@ public:
, m_palette(*this, "palette")
{ }
+ void sys9002(machine_config &config);
+
+private:
MC6845_UPDATE_ROW(crtc_update_row);
- void sys9002(machine_config &config);
void sys9002_io(address_map &map);
void sys9002_mem(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_p_videoram;
required_device<palette_device> m_palette;
diff --git a/src/mame/drivers/systec.cpp b/src/mame/drivers/systec.cpp
index c23d1536186..45e4ccca455 100644
--- a/src/mame/drivers/systec.cpp
+++ b/src/mame/drivers/systec.cpp
@@ -49,9 +49,11 @@ public:
{ }
void systec(machine_config &config);
+
+private:
void systec_io(address_map &map);
void systec_mem(address_map &map);
-private:
+
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 26e283ed70d..f5ea46ac553 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -70,7 +70,16 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void taito2(machine_config &config);
+ void taito6(machine_config &config);
+ void taito(machine_config &config);
+ void shock(machine_config &config);
+ void taito4(machine_config &config);
+ void taito5(machine_config &config);
+
void init_taito();
+
+private:
DECLARE_READ8_MEMBER(io_r);
DECLARE_WRITE8_MEMBER(io_w);
DECLARE_READ8_MEMBER(pia_pb_r);
@@ -78,12 +87,6 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia_cb2_w);
DECLARE_WRITE_LINE_MEMBER(votrax_request);
TIMER_DEVICE_CALLBACK_MEMBER(timer_a);
- void taito2(machine_config &config);
- void taito6(machine_config &config);
- void taito(machine_config &config);
- void shock(machine_config &config);
- void taito4(machine_config &config);
- void taito5(machine_config &config);
void taito_ay_audio(machine_config &config);
void shock_map(address_map &map);
void shock_sub_map(address_map &map);
@@ -91,7 +94,7 @@ public:
void taito_sub_map(address_map &map);
void taito_sub_map2(address_map &map);
void taito_sub_map5(address_map &map);
-private:
+
uint8_t m_out_offs;
uint8_t m_sndcmd;
uint8_t m_votrax_cmd;
diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp
index 050792d0402..384faae0d4a 100644
--- a/src/mame/drivers/taitogn.cpp
+++ b/src/mame/drivers/taitogn.cpp
@@ -370,6 +370,16 @@ public:
std::fill(std::begin(m_cat702_dataout), std::end(m_cat702_dataout), 1);
}
+ void init_coh3002t_nz();
+
+ void coh3002t_t2_mp(machine_config &config);
+ void coh3002t(machine_config &config);
+ void coh3002t_t1_mp(machine_config &config);
+ void coh3002t_cf(machine_config &config);
+ void coh3002t_t2(machine_config &config);
+ void coh3002t_t1(machine_config &config);
+
+private:
DECLARE_WRITE_LINE_MEMBER(sio0_sck){ m_cat702[0]->write_clock(state); m_cat702[1]->write_clock(state); m_znmcu->write_clock(state); }
DECLARE_WRITE_LINE_MEMBER(sio0_txd){ m_cat702[0]->write_datain(state); m_cat702[1]->write_datain(state); }
DECLARE_WRITE_LINE_MEMBER(cat702_1_dataout){ m_cat702_dataout[0] = state; update_sio0_rxd(); }
@@ -391,22 +401,14 @@ public:
DECLARE_READ8_MEMBER(coin_r);
DECLARE_READ8_MEMBER(gnet_mahjong_panel_r);
DECLARE_READ32_MEMBER(zsg2_ext_r);
- void init_coh3002t_nz();
- void coh3002t_t2_mp(machine_config &config);
- void coh3002t(machine_config &config);
- void coh3002t_t1_mp(machine_config &config);
- void coh3002t_cf(machine_config &config);
- void coh3002t_t2(machine_config &config);
- void coh3002t_t1(machine_config &config);
void flashbank_map(address_map &map);
void taitogn_map(address_map &map);
void taitogn_mp_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
required_device<psxsio0_device> m_sio0;
required_device_array<cat702_device, 2> m_cat702;
required_device<znmcu_device> m_znmcu;
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index d5315b26e30..b96e43824a2 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -111,6 +111,11 @@ public:
m_gfxdecode(*this, "gfxdecode")
{ }
+ void taitopjc(machine_config &config);
+
+ void init_optiger();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_iocpu;
required_device<cpu_device> m_soundcpu;
@@ -148,8 +153,6 @@ public:
TILEMAP_MAPPER_MEMBER(tile_scan_layer0);
TILEMAP_MAPPER_MEMBER(tile_scan_layer1);
- void init_optiger();
-
uint16_t m_dsp_ram[0x1000];
uint16_t m_io_share_ram[0x2000];
@@ -161,7 +164,7 @@ public:
uint32_t m_video_address;
uint32_t m_dsp_rom_address;
- void taitopjc(machine_config &config);
+
void mn10200_map(address_map &map);
void ppc603e_mem(address_map &map);
void tlcs900h_mem(address_map &map);
diff --git a/src/mame/drivers/taitottl.cpp b/src/mame/drivers/taitottl.cpp
index 6448b18c27f..fdc42f64015 100644
--- a/src/mame/drivers/taitottl.cpp
+++ b/src/mame/drivers/taitottl.cpp
@@ -94,21 +94,18 @@ public:
{
}
+ void taitottl(machine_config &config);
+
+private:
// devices
required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
-
- void taitottl(machine_config &config);
-protected:
-
+
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-
-private:
-
};
diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp
index 1940613a8c5..83e5169e335 100644
--- a/src/mame/drivers/taitotx.cpp
+++ b/src/mame/drivers/taitotx.cpp
@@ -129,13 +129,15 @@ public:
m_maincpu(*this, "maincpu")
{ }
+ void taito_type_x(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_taito_type_x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void taito_type_x(machine_config &config);
void taito_type_x_map(address_map &map);
};
diff --git a/src/mame/drivers/taitotz.cpp b/src/mame/drivers/taitotz.cpp
index 584a08dab9b..90e2e5b92da 100644
--- a/src/mame/drivers/taitotz.cpp
+++ b/src/mame/drivers/taitotz.cpp
@@ -540,21 +540,36 @@ class taitotz_state : public driver_device
public:
taitotz_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
+ m_screen(*this, "screen"),
m_maincpu(*this, "maincpu"),
m_iocpu(*this, "iocpu"),
m_work_ram(*this, "work_ram"),
m_mbox_ram(*this, "mbox_ram"),
- m_ata(*this, "ata"),
- m_screen(*this, "screen")
+ m_ata(*this, "ata")
{
}
+ void taitotz(machine_config &config);
+ void landhigh(machine_config &config);
+
+ void init_batlgr2a();
+ void init_batlgr2();
+ void init_pwrshovl();
+ void init_batlgear();
+ void init_landhigh();
+ void init_landhigha();
+ void init_raizpin();
+ void init_raizpinj();
+ void init_styphp();
+
+ required_device<screen_device> m_screen;
+
+private:
required_device<ppc_device> m_maincpu;
required_device<cpu_device> m_iocpu;
required_shared_ptr<uint64_t> m_work_ram;
required_shared_ptr<uint16_t> m_mbox_ram;
required_device<ata_interface_device> m_ata;
- required_device<screen_device> m_screen;
DECLARE_READ64_MEMBER(ppc_common_r);
DECLARE_WRITE64_MEMBER(ppc_common_w);
@@ -593,15 +608,7 @@ public:
int m_count;
std::unique_ptr<taitotz_renderer> m_renderer;
- void init_batlgr2a();
- void init_batlgr2();
- void init_pwrshovl();
- void init_batlgear();
- void init_landhigh();
- void init_landhigha();
- void init_raizpin();
- void init_raizpinj();
- void init_styphp();
+
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
@@ -617,8 +624,7 @@ public:
void video_reg_w(uint32_t reg, uint32_t data);
void init_taitotz_152();
void init_taitotz_111a();
- void taitotz(machine_config &config);
- void landhigh(machine_config &config);
+
void landhigh_tlcs900h_mem(address_map &map);
void ppc603e_mem(address_map &map);
void tlcs900h_mem(address_map &map);
diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp
index 5d2953e2782..b523873d72b 100644
--- a/src/mame/drivers/taitowlf.cpp
+++ b/src/mame/drivers/taitowlf.cpp
@@ -51,13 +51,18 @@ public:
m_bank1(*this, "bank1"),
m_palette(*this, "palette") { }
+ void taitowlf(machine_config &config);
+
+ void init_taitowlf();
+
+private:
required_region_ptr<uint8_t> m_bootscreen_rom;
required_memory_bank m_bank1;
optional_device<palette_device> m_palette;
DECLARE_WRITE32_MEMBER(pnp_config_w);
DECLARE_WRITE32_MEMBER(pnp_data_w);
DECLARE_WRITE32_MEMBER(bios_ram_w);
- void init_taitowlf();
+
virtual void machine_start() override;
virtual void machine_reset() override;
#if !ENABLE_VGA
@@ -65,7 +70,6 @@ public:
#endif
uint32_t screen_update_taitowlf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void intel82439tx_init();
- void taitowlf(machine_config &config);
void taitowlf_io(address_map &map);
void taitowlf_map(address_map &map);
@@ -78,7 +82,6 @@ public:
uint32_t intel82371ab_pci_r(int function, int reg, uint32_t mem_mask);
void intel82371ab_pci_w(int function, int reg, uint32_t data, uint32_t mem_mask);
-private:
std::unique_ptr<uint32_t[]> m_bios_ram;
uint8_t m_mtxc_config_reg[256];
uint8_t m_piix4_config_reg[4][256];
diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp
index e3cf871be31..0ea21efaceb 100644
--- a/src/mame/drivers/tamag1.cpp
+++ b/src/mame/drivers/tamag1.cpp
@@ -28,17 +28,17 @@ public:
m_out_x(*this, "%u.%u", 0U, 0U)
{ }
- DECLARE_INPUT_CHANGED_MEMBER(input_changed);
void tama(machine_config &config);
-protected:
+ DECLARE_INPUT_CHANGED_MEMBER(input_changed);
+
+private:
DECLARE_WRITE8_MEMBER(speaker_w);
DECLARE_PALETTE_INIT(tama);
E0C6S46_PIXEL_UPDATE(pixel_update);
virtual void machine_start() override;
-private:
required_device<e0c6s46_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
output_finder<16, 40> m_out_x;
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index 67157c1548b..c8c975b1ba4 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -82,6 +82,17 @@ public:
, m_ram(*this, RAM_TAG)
, m_vram_bank(0) { }
+ void tandy1000_common(machine_config &config);
+ void tandy1000_90key(machine_config &config);
+ void tandy1000_101key(machine_config &config);
+ void t1000tl(machine_config &config);
+ void t1000sx(machine_config &config);
+ void t1000rl(machine_config &config);
+ void t1000sl2(machine_config &config);
+ void t1000hx(machine_config &config);
+ void t1000tx(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
// Memory regions for the machines that support rom banking
@@ -131,15 +142,7 @@ public:
uint8_t m_vram_bank;
static void cfg_fdc_35(device_t *device);
static void cfg_fdc_525(device_t *device);
- void tandy1000_common(machine_config &config);
- void tandy1000_90key(machine_config &config);
- void tandy1000_101key(machine_config &config);
- void t1000tl(machine_config &config);
- void t1000sx(machine_config &config);
- void t1000rl(machine_config &config);
- void t1000sl2(machine_config &config);
- void t1000hx(machine_config &config);
- void t1000tx(machine_config &config);
+
void biosbank_map(address_map &map);
void tandy1000_16_io(address_map &map);
void tandy1000_286_map(address_map &map);
diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp
index fc10488ff35..9773e184cbe 100644
--- a/src/mame/drivers/tapatune.cpp
+++ b/src/mame/drivers/tapatune.cpp
@@ -61,6 +61,10 @@ public:
m_bsmt(*this, "bsmt"),
m_videoram(*this, "videoram") {}
+ void tapatune(machine_config &config);
+ void tapatune_base(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_videocpu;
required_device<bsmt2000_device> m_bsmt;
@@ -106,8 +110,7 @@ public:
MC6845_BEGIN_UPDATE(crtc_begin_update);
MC6845_UPDATE_ROW(crtc_update_row);
- void tapatune(machine_config &config);
- void tapatune_base(machine_config &config);
+
void maincpu_io_map(address_map &map);
void maincpu_map(address_map &map);
void video_map(address_map &map);
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index db913c2aa7d..df0b0e2f689 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -53,6 +53,11 @@ public:
m_vram(*this, "vram")
{ }
+ void kongambl(machine_config &config);
+
+ void init_kingtut();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<k053252_device> m_k053252;
required_device<k055673_device> m_k055673;
@@ -70,7 +75,7 @@ public:
DECLARE_WRITE8_MEMBER(kongambl_ff_w);
DECLARE_READ32_MEMBER(test_r);
// DECLARE_READ32_MEMBER(rng_r);
- void init_kingtut();
+
DECLARE_VIDEO_START(kongambl);
uint8_t m_irq_mask;
@@ -81,7 +86,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(kongambl_vblank);
K056832_CB_MEMBER(tile_callback);
K053246_CB_MEMBER(sprite_callback);
- void kongambl(machine_config &config);
+
void kongamaud_map(address_map &map);
void kongambl_map(address_map &map);
};
diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp
index f626a1a8e4b..90d922a2561 100644
--- a/src/mame/drivers/tattack.cpp
+++ b/src/mame/drivers/tattack.cpp
@@ -69,20 +69,24 @@ public:
m_samples(*this,"samples")
{ }
+ void tattack(machine_config &config);
+
+ void init_tattack();
+
+private:
DECLARE_WRITE8_MEMBER(paddle_w);
DECLARE_WRITE8_MEMBER(ball_w);
DECLARE_WRITE8_MEMBER(brick_dma_w);
DECLARE_WRITE8_MEMBER(sound_w);
- void init_tattack();
+
TILE_GET_INFO_MEMBER(get_tile_info);
DECLARE_PALETTE_INIT(tattack);
uint32_t screen_update_tattack(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void tattack(machine_config &config);
void tattack_map(address_map &map);
-protected:
+
virtual void video_start() override;
-private:
+
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_ram;
required_shared_ptr<uint8_t> m_videoram;
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index cad92408b1d..0d88627cb32 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -86,6 +86,10 @@ public:
{
}
+ void ivg09(machine_config &config);
+ void cpu09(machine_config &config);
+
+private:
DECLARE_READ_LINE_MEMBER(ca1_r);
DECLARE_READ8_MEMBER(pa_r);
DECLARE_WRITE8_MEMBER(pa_w);
@@ -98,11 +102,9 @@ public:
DECLARE_MACHINE_RESET(ivg09);
MC6845_UPDATE_ROW(crtc_update_row);
- void ivg09(machine_config &config);
- void cpu09(machine_config &config);
void cpu09_mem(address_map &map);
void ivg09_mem(address_map &map);
-private:
+
uint8_t m_term_data;
uint8_t m_pa;
optional_shared_ptr<uint8_t> m_p_videoram;
diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp
index 17e78b9840c..9592fd7f8e9 100644
--- a/src/mame/drivers/tb303.cpp
+++ b/src/mame/drivers/tb303.cpp
@@ -27,6 +27,9 @@ public:
: hh_ucom4_state(mconfig, type, tag)
{ }
+ void tb303(machine_config &config);
+
+private:
u8 m_ram[0xc00];
u16 m_ram_address;
bool m_ram_ce;
@@ -45,7 +48,6 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(tp3_clear) { m_maincpu->set_input_line(0, CLEAR_LINE); }
virtual void machine_start() override;
- void tb303(machine_config &config);
};
// TP2 to MCU CLK: LC circuit(TI S74230), stable sine wave, 2.2us interval
diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp
index 07da9e83a3a..46aa6c05871 100644
--- a/src/mame/drivers/tec1.cpp
+++ b/src/mame/drivers/tec1.cpp
@@ -99,6 +99,10 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void tec1(machine_config &config);
+ void tecjmon(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
optional_device<cassette_image_device> m_cass;
@@ -125,8 +129,7 @@ public:
virtual void machine_reset() override;
virtual void machine_start() override;
TIMER_CALLBACK_MEMBER(tec1_kbd_callback);
- void tec1(machine_config &config);
- void tecjmon(machine_config &config);
+
void tec1_io(address_map &map);
void tec1_map(address_map &map);
void tecjmon_io(address_map &map);
diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp
index 8c305e7f17f..ecb46bdbf67 100644
--- a/src/mame/drivers/techno.cpp
+++ b/src/mame/drivers/techno.cpp
@@ -30,6 +30,9 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void techno(machine_config &config);
+
+private:
enum
{
IRQ_SET_TIMER,
@@ -51,11 +54,9 @@ public:
DECLARE_READ8_MEMBER(rd_r) { return 0; }
DECLARE_WRITE8_MEMBER(wr_w) {}
- void techno(machine_config &config);
void techno_map(address_map &map);
void techno_sub_map(address_map &map);
-private:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp
index 7897b31c8ab..48f9713fccf 100644
--- a/src/mame/drivers/tecnbras.cpp
+++ b/src/mame/drivers/tecnbras.cpp
@@ -38,7 +38,7 @@ public:
void tecnbras(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -50,7 +50,6 @@ protected:
void i80c31_io(address_map &map);
void i80c31_prg(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
output_finder<14 * 7> m_dmds;
diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp
index 02136bb0940..9c8fb81594a 100644
--- a/src/mame/drivers/tek410x.cpp
+++ b/src/mame/drivers/tek410x.cpp
@@ -32,12 +32,14 @@ public:
tek4107a_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
+ void tek4109a(machine_config &config);
+ void tek4107a(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void tek4109a(machine_config &config);
- void tek4107a(machine_config &config);
void tek4107a_io(address_map &map);
void tek4107a_mem(address_map &map);
};
diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp
index 6c0191487e7..fda9931f5fc 100644
--- a/src/mame/drivers/tek440x.cpp
+++ b/src/mame/drivers/tek440x.cpp
@@ -67,6 +67,9 @@ public:
m_vram(*this, "vram")
{}
+ void tek4404(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -74,7 +77,6 @@ public:
required_device<m6502_device> m_fdccpu;
required_shared_ptr<uint16_t> m_mainram;
required_shared_ptr<uint16_t> m_vram;
- void tek4404(machine_config &config);
void fdccpu_map(address_map &map);
void maincpu_map(address_map &map);
};
diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp
index 621025a91eb..9598b6ff9d4 100644
--- a/src/mame/drivers/tekxp33x.cpp
+++ b/src/mame/drivers/tekxp33x.cpp
@@ -50,11 +50,13 @@ public:
tekxp330_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag) { }
+ void tekxp330(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void tekxp330(machine_config &config);
void cpu_map(address_map &map);
void tms_map(address_map &map);
};
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index 3e21730f5a7..e9e0eb9c46c 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -315,12 +315,13 @@ public:
m_leds(*this, "led%u", 0U)
{ }
+ void tempest(machine_config &config);
+
DECLARE_CUSTOM_INPUT_MEMBER(tempest_knob_r);
DECLARE_CUSTOM_INPUT_MEMBER(tempest_buttons_r);
DECLARE_CUSTOM_INPUT_MEMBER(clock_r);
- void tempest(machine_config &config);
-protected:
+private:
DECLARE_WRITE8_MEMBER(wdclr_w);
DECLARE_WRITE8_MEMBER(tempest_led_w);
DECLARE_WRITE8_MEMBER(tempest_coin_w);
@@ -336,7 +337,6 @@ protected:
virtual void machine_start() override;
void main_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<mathbox_device> m_mathbox;
required_device<watchdog_timer_device> m_watchdog;
diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp
index 53dae966472..bb2fc931eaf 100644
--- a/src/mame/drivers/terak.cpp
+++ b/src/mame/drivers/terak.cpp
@@ -25,15 +25,17 @@ public:
, m_maincpu(*this, "maincpu")
{ }
+ void terak(machine_config &config);
+
+private:
DECLARE_READ16_MEMBER(terak_fdc_status_r);
DECLARE_WRITE16_MEMBER(terak_fdc_command_w);
DECLARE_READ16_MEMBER(terak_fdc_data_r);
DECLARE_WRITE16_MEMBER(terak_fdc_data_w);
uint32_t screen_update_terak(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void terak(machine_config &config);
void mem_map(address_map &map);
-private:
+
uint8_t m_unit;
uint8_t m_cmd;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/terco.cpp b/src/mame/drivers/terco.cpp
index 78eb4fb3720..7ce129f7df2 100644
--- a/src/mame/drivers/terco.cpp
+++ b/src/mame/drivers/terco.cpp
@@ -265,9 +265,11 @@ public:
//,m_brg(*this, "brg")
//,m_ay3600(*this, "ay3600")
{ }
+
void t4490(machine_config &config);
- void t4490_map(address_map &map);
+
private:
+ void t4490_map(address_map &map);
required_device<m6800_cpu_device> m_maincpu;
// virtual void machine_reset() override { m_maincpu->reset(); LOG("--->%s()\n", FUNCNAME); };
required_device<pia6821_device> m_pia1;
diff --git a/src/mame/drivers/test_t400.cpp b/src/mame/drivers/test_t400.cpp
index 4fae2dec5b2..6f560c84d86 100644
--- a/src/mame/drivers/test_t400.cpp
+++ b/src/mame/drivers/test_t400.cpp
@@ -18,10 +18,12 @@ public:
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu") { }
- DECLARE_WRITE8_MEMBER( port_l_w );
- required_device<cpu_device> m_maincpu;
void test_t410(machine_config &config);
void test_t420(machine_config &config);
+
+private:
+ DECLARE_WRITE8_MEMBER( port_l_w );
+ required_device<cpu_device> m_maincpu;
};
WRITE8_MEMBER( t400_test_suite_state::port_l_w )
diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp
index 7dbe96fce50..d66819e8a15 100644
--- a/src/mame/drivers/testconsole.cpp
+++ b/src/mame/drivers/testconsole.cpp
@@ -82,7 +82,7 @@ public:
void whousetc(machine_config &config);
-protected:
+private:
template <unsigned Dsp> DECLARE_WRITE16_MEMBER(update_dsp)
{
m_digit[(Dsp << 2) | offset] = data;
@@ -102,7 +102,6 @@ protected:
void io_map(address_map &map);
void program_map(address_map &map);
-private:
required_device_array<dl1416_device, 4> m_dsp;
output_finder<16> m_digit;
};
diff --git a/src/mame/drivers/tg100.cpp b/src/mame/drivers/tg100.cpp
index 13c2620011f..4f047d21d19 100644
--- a/src/mame/drivers/tg100.cpp
+++ b/src/mame/drivers/tg100.cpp
@@ -43,9 +43,11 @@ public:
m_ymw258(*this, "ymw258")
{ }
+ void tg100(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<multipcm_device> m_ymw258;
- void tg100(machine_config &config);
void tg100_io_map(address_map &map);
void tg100_map(address_map &map);
void ymw258_map(address_map &map);
diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp
index 20c7d79bf4e..33d194bea99 100644
--- a/src/mame/drivers/tgtpanic.cpp
+++ b/src/mame/drivers/tgtpanic.cpp
@@ -25,6 +25,9 @@ public:
m_screen(*this, "screen"),
m_ram(*this, "ram") { }
+ void tgtpanic(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
@@ -37,7 +40,6 @@ public:
virtual void machine_start() override;
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void tgtpanic(machine_config &config);
void io_map(address_map &map);
void prg_map(address_map &map);
};
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp
index 3843f0055be..8f8c03be365 100644
--- a/src/mame/drivers/thayers.cpp
+++ b/src/mame/drivers/thayers.cpp
@@ -40,12 +40,6 @@ struct ssi263_t
class thayers_state : public driver_device
{
public:
- enum
- {
- TIMER_INTRQ_TICK,
- TIMER_SSI263_PHONEME_TICK
- };
-
thayers_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_pr7820(*this, "laserdisc")
@@ -56,6 +50,18 @@ public:
{
}
+ void thayers(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(laserdisc_enter_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(laserdisc_ready_r);
+
+private:
+ enum
+ {
+ TIMER_INTRQ_TICK,
+ TIMER_SSI263_PHONEME_TICK
+ };
+
optional_device<pioneer_pr7820_device> m_pr7820;
optional_device<pioneer_ldv1000_device> m_ldv1000;
uint8_t m_laserdisc_data;
@@ -97,8 +103,7 @@ public:
DECLARE_WRITE8_MEMBER(den2_w);
DECLARE_WRITE8_MEMBER(ssi263_register_w);
DECLARE_READ8_MEMBER(ssi263_register_r);
- DECLARE_CUSTOM_INPUT_MEMBER(laserdisc_enter_r);
- DECLARE_CUSTOM_INPUT_MEMBER(laserdisc_ready_r);
+
virtual void machine_start() override;
virtual void machine_reset() override;
void check_interrupt();
@@ -106,10 +111,9 @@ public:
required_ioport_array<10> m_row;
output_finder<16> m_digits;
- void thayers(machine_config &config);
void thayers_io_map(address_map &map);
void thayers_map(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index 055ac12aefb..07e54756b9a 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -53,6 +53,9 @@ public:
m_leds(*this, "led%u", 0U)
{ }
+ void thedealr(machine_config &config);
+
+private:
// IOX
DECLARE_READ8_MEMBER(iox_r);
DECLARE_WRITE8_MEMBER(iox_w);
@@ -71,15 +74,13 @@ public:
DECLARE_PALETTE_INIT(thedealr);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
- void thedealr(machine_config &config);
+
void thedealr(address_map &map);
void thedealr_sub(address_map &map);
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
// devices
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp
index bc40592465b..540722bced5 100644
--- a/src/mame/drivers/ti630.cpp
+++ b/src/mame/drivers/ti630.cpp
@@ -51,15 +51,18 @@ public:
, m_lcdc(*this, "hd44780")
{ }
+ void ti630(machine_config &config);
+
+ void init_ti630();
+
+private:
DECLARE_WRITE8_MEMBER(i80c31_p1_w);
DECLARE_WRITE8_MEMBER(i80c31_p3_w);
DECLARE_READ8_MEMBER(i80c31_p1_r);
- void init_ti630();
DECLARE_PALETTE_INIT(ti630);
- void ti630(machine_config &config);
void i80c31_io(address_map &map);
void i80c31_prg(address_map &map);
-private:
+
virtual void machine_start() override;
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp
index 527a39a9e33..04969624c1d 100644
--- a/src/mame/drivers/ti74.cpp
+++ b/src/mame/drivers/ti74.cpp
@@ -95,6 +95,12 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
+ void ti74(machine_config &config);
+ void ti95(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(battery_status_changed);
+
+private:
void update_lcd_indicator(u8 y, u8 x, int state);
void update_battery_status(int state);
@@ -103,19 +109,14 @@ public:
DECLARE_WRITE8_MEMBER(bankswitch_w);
DECLARE_PALETTE_INIT(ti74);
- DECLARE_INPUT_CHANGED_MEMBER(battery_status_changed);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(ti74_cartridge);
HD44780_PIXEL_UPDATE(ti74_pixel_update);
HD44780_PIXEL_UPDATE(ti95_pixel_update);
- void ti74(machine_config &config);
- void ti95(machine_config &config);
void main_map(address_map &map);
-protected:
virtual void machine_reset() override;
virtual void machine_start() override;
-private:
required_device<tms70c46_device> m_maincpu;
required_device<generic_slot_device> m_cart;
required_ioport_array<8> m_key_matrix;
diff --git a/src/mame/drivers/ti990_4.cpp b/src/mame/drivers/ti990_4.cpp
index 4a419223ba4..7b4a4ab66c9 100644
--- a/src/mame/drivers/ti990_4.cpp
+++ b/src/mame/drivers/ti990_4.cpp
@@ -55,6 +55,13 @@ public:
m_maincpu(*this, "maincpu"),
m_fd800(*this, "fd800") { }
+ void ti990_4v(machine_config &config);
+ void ti990_4(machine_config &config);
+
+ void init_ti990_4();
+ void init_ti990_4v();
+
+private:
DECLARE_READ8_MEMBER( panel_read );
DECLARE_WRITE8_MEMBER( panel_write );
DECLARE_WRITE8_MEMBER( external_operation );
@@ -64,17 +71,12 @@ public:
DECLARE_WRITE_LINE_MEMBER( vdtkey_interrupt );
DECLARE_WRITE_LINE_MEMBER( line_interrupt );
- void init_ti990_4();
- void init_ti990_4v();
-
DECLARE_MACHINE_RESET(ti990_4);
- void ti990_4v(machine_config &config);
- void ti990_4(machine_config &config);
void cru_map(address_map &map);
void cru_map_v(address_map &map);
void memmap(address_map &map);
-private:
+
void hold_load();
void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
int m_intlines;
diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp
index 43eaa7ba890..7a24c4a3b8c 100644
--- a/src/mame/drivers/ti99_2.cpp
+++ b/src/mame/drivers/ti99_2.cpp
@@ -204,6 +204,11 @@ public:
m_first_ram_page(0)
{ }
+ void ti99_2(machine_config &config);
+ void ti99_224(machine_config &config);
+ void ti99_232(machine_config &config);
+
+private:
DECLARE_MACHINE_START( ti99_224 );
DECLARE_MACHINE_START( ti99_232 );
DECLARE_MACHINE_RESET( ti99_2 );
@@ -223,11 +228,6 @@ public:
void crumap(address_map &map);
void memmap(address_map &map);
- void ti99_2(machine_config &config);
- void ti99_224(machine_config &config);
- void ti99_232(machine_config &config);
-
-private:
required_device<tms9995_device> m_maincpu;
required_device<bus::ti99::internal::video992_device> m_videoctrl;
required_device<bus::ti99::internal::io992_device> m_io992;
diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp
index 3d9d980d7ac..316935f8ecc 100644
--- a/src/mame/drivers/ti99_4p.cpp
+++ b/src/mame/drivers/ti99_4p.cpp
@@ -152,6 +152,9 @@ public:
m_alpha(*this, "ALPHA")
{ }
+ void ti99_4p_60hz(machine_config &config);
+
+private:
DECLARE_WRITE_LINE_MEMBER( ready_line );
DECLARE_WRITE_LINE_MEMBER( extint );
DECLARE_WRITE_LINE_MEMBER( notconnected );
@@ -186,11 +189,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(video_interrupt_in);
- void ti99_4p_60hz(machine_config &config);
void cru_map(address_map &map);
void memmap(address_map &map);
void memmap_setoffset(address_map &map);
-private:
+
void datamux_clock_in(int clock);
// Devices
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index 0eb2f7a19ff..74767af549d 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -93,6 +93,20 @@ public:
m_alphabug(*this, "ALPHABUG")
{ }
+ void ti99_4(machine_config &config);
+ void ti99_4_50hz(machine_config &config);
+ void ti99_4ev_60hz(machine_config &config);
+ void ti99_4qi(machine_config &config);
+ void ti99_4qi_60hz(machine_config &config);
+ void ti99_4a_50hz(machine_config &config);
+ void ti99_4a_60hz(machine_config &config);
+ void ti99_4a(machine_config &config);
+ void ti99_4_60hz(machine_config &config);
+
+ // Interrupt triggers
+ DECLARE_INPUT_CHANGED_MEMBER( load_interrupt );
+
+private:
// Machine management
DECLARE_MACHINE_START(ti99_4);
DECLARE_MACHINE_START(ti99_4a);
@@ -141,26 +155,14 @@ public:
DECLARE_WRITE_LINE_MEMBER(cs2_motor);
DECLARE_WRITE_LINE_MEMBER(alphaW);
- // Interrupt triggers
- DECLARE_INPUT_CHANGED_MEMBER( load_interrupt );
-
// Used by EVPC
DECLARE_WRITE_LINE_MEMBER( video_interrupt_evpc_in );
void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- void ti99_4(machine_config &config);
- void ti99_4_50hz(machine_config &config);
- void ti99_4ev_60hz(machine_config &config);
- void ti99_4qi(machine_config &config);
- void ti99_4qi_60hz(machine_config &config);
- void ti99_4a_50hz(machine_config &config);
- void ti99_4a_60hz(machine_config &config);
- void ti99_4a(machine_config &config);
- void ti99_4_60hz(machine_config &config);
void cru_map(address_map &map);
void memmap(address_map &map);
void memmap_setoffset(address_map &map);
-private:
+
void set_keyboard_column(int number, int data);
int m_keyboard_column;
int m_check_alphalock;
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 9f2f3ae95c6..22ab23ab025 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -227,6 +227,11 @@ public:
{
}
+ void ti99_8(machine_config &config);
+ void ti99_8_60hz(machine_config &config);
+ void ti99_8_50hz(machine_config &config);
+
+private:
// Machine management
DECLARE_MACHINE_START(ti99_8);
DECLARE_MACHINE_RESET(ti99_8);
@@ -262,13 +267,10 @@ public:
DECLARE_WRITE_LINE_MEMBER(cassette_motor);
DECLARE_WRITE8_MEMBER(tms9901_interrupt);
- void ti99_8(machine_config &config);
- void ti99_8_60hz(machine_config &config);
- void ti99_8_50hz(machine_config &config);
void crumap(address_map &map);
void memmap(address_map &map);
void memmap_setoffset(address_map &map);
-private:
+
// Keyboard support
void set_keyboard_column(int number, int data);
int m_keyboard_column;
diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp
index 6a9f83b5415..9f0835c8ca8 100644
--- a/src/mame/drivers/ticalc1x.cpp
+++ b/src/mame/drivers/ticalc1x.cpp
@@ -67,11 +67,13 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void cmulti8(machine_config &config);
+
+private:
void prepare_display();
DECLARE_WRITE16_MEMBER(write_o);
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_READ8_MEMBER(read_k);
- void cmulti8(machine_config &config);
};
// handlers
@@ -452,11 +454,13 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void ti1270(machine_config &config);
+ void ti1250(machine_config &config);
+
+private:
DECLARE_WRITE16_MEMBER(write_o);
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_READ8_MEMBER(read_k);
- void ti1270(machine_config &config);
- void ti1250(machine_config &config);
};
// handlers
@@ -587,11 +591,13 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void ti25503(machine_config &config);
+
+private:
void prepare_display();
DECLARE_WRITE16_MEMBER(write_o);
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_READ8_MEMBER(read_k);
- void ti25503(machine_config &config);
};
// handlers
@@ -706,10 +712,12 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void ti1000(machine_config &config);
+
+private:
DECLARE_WRITE16_MEMBER(write_o);
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_READ8_MEMBER(read_k);
- void ti1000(machine_config &config);
};
// handlers
@@ -804,10 +812,11 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void wizatron(machine_config &config);
+
virtual DECLARE_WRITE16_MEMBER(write_o);
virtual DECLARE_WRITE16_MEMBER(write_r);
virtual DECLARE_READ8_MEMBER(read_k);
- void wizatron(machine_config &config);
};
// handlers
@@ -908,9 +917,11 @@ public:
: wizatron_state(mconfig, type, tag)
{ }
+ void lilprof(machine_config &config);
+
+private:
virtual DECLARE_WRITE16_MEMBER(write_o) override;
virtual DECLARE_READ8_MEMBER(read_k) override;
- void lilprof(machine_config &config);
};
// handlers
@@ -983,10 +994,12 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void lilprof78(machine_config &config);
+
+private:
DECLARE_WRITE16_MEMBER(write_o);
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_READ8_MEMBER(read_k);
- void lilprof78(machine_config &config);
};
// handlers
@@ -1091,11 +1104,12 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void dataman(machine_config &config);
+
virtual void prepare_display();
virtual DECLARE_WRITE16_MEMBER(write_o);
virtual DECLARE_WRITE16_MEMBER(write_r);
virtual DECLARE_READ8_MEMBER(read_k);
- void dataman(machine_config &config);
};
// handlers
@@ -1207,8 +1221,10 @@ public:
: dataman_state(mconfig, type, tag)
{ }
- virtual DECLARE_WRITE16_MEMBER(write_r) override;
void mathmarv(machine_config &config);
+
+private:
+ virtual DECLARE_WRITE16_MEMBER(write_r) override;
};
// handlers
@@ -1289,10 +1305,12 @@ public:
: ticalc1x_state(mconfig, type, tag)
{ }
+ void ti30(machine_config &config);
+
+private:
DECLARE_WRITE16_MEMBER(write_o);
DECLARE_WRITE16_MEMBER(write_r);
DECLARE_READ8_MEMBER(read_k);
- void ti30(machine_config &config);
};
// handlers
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index d786575d926..db343ee45bb 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -36,13 +36,6 @@
class tickee_state : public driver_device
{
public:
- enum
- {
- TIMER_TRIGGER_GUN_INTERRUPT,
- TIMER_CLEAR_GUN_INTERRUPT,
- TIMER_SETUP_GUN_INTERRUPTS
- };
-
tickee_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -53,6 +46,19 @@ public:
m_vram(*this, "vram"),
m_control(*this, "control") { }
+ void rapidfir(machine_config &config);
+ void ghoshunt(machine_config &config);
+ void tickee(machine_config &config);
+ void mouseatk(machine_config &config);
+
+private:
+ enum
+ {
+ TIMER_TRIGGER_GUN_INTERRUPT,
+ TIMER_CLEAR_GUN_INTERRUPT,
+ TIMER_SETUP_GUN_INTERRUPTS
+ };
+
required_device<tms34010_device> m_maincpu;
optional_device<okim6295_device> m_oki;
required_device<screen_device> m_screen;
@@ -91,15 +97,11 @@ public:
TMS340X0_SCANLINE_RGB32_CB_MEMBER(scanline_update);
TMS340X0_SCANLINE_RGB32_CB_MEMBER(rapidfir_scanline_update);
- void rapidfir(machine_config &config);
- void ghoshunt(machine_config &config);
- void tickee(machine_config &config);
- void mouseatk(machine_config &config);
void ghoshunt_map(address_map &map);
void mouseatk_map(address_map &map);
void rapidfir_map(address_map &map);
void tickee_map(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp
index 37c367ff5ed..cad70b3cab4 100644
--- a/src/mame/drivers/tim011.cpp
+++ b/src/mame/drivers/tim011.cpp
@@ -28,6 +28,9 @@ public:
m_floppy2(*this, FDC9266_TAG ":2:35dd"),
m_floppy3(*this, FDC9266_TAG ":3:35dd") { }
+ void tim011(machine_config &config);
+
+private:
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_tim011(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -44,7 +47,6 @@ public:
required_device<floppy_image_device> m_floppy1;
required_device<floppy_image_device> m_floppy2;
required_device<floppy_image_device> m_floppy3;
- void tim011(machine_config &config);
void tim011_io(address_map &map);
void tim011_mem(address_map &map);
};
diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp
index 773a90d9740..f76dcea0f8e 100644
--- a/src/mame/drivers/tim100.cpp
+++ b/src/mame/drivers/tim100.cpp
@@ -35,14 +35,16 @@ public:
, m_crtc(*this, "crtc")
{ }
+ void tim100(machine_config &config);
+
+private:
DECLARE_WRITE_LINE_MEMBER(drq_w);
DECLARE_WRITE_LINE_MEMBER(irq_w);
I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels );
- void tim100(machine_config &config);
void tim100_io(address_map &map);
void tim100_mem(address_map &map);
-private:
+
virtual void machine_start() override;
uint8_t *m_charmap;
uint16_t m_dma_adr;
diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp
index c5ff1ceb350..a77bf2b0793 100644
--- a/src/mame/drivers/timetrv.cpp
+++ b/src/mame/drivers/timetrv.cpp
@@ -44,6 +44,9 @@ public:
m_led_vram_hi(*this, "led_vrahi"),
m_maincpu(*this, "maincpu") { }
+ void timetrv(machine_config &config);
+
+private:
required_shared_ptr<uint8_t> m_led_vram_lo;
required_shared_ptr<uint8_t> m_led_vram_hi;
DECLARE_READ8_MEMBER(test1_r);
@@ -52,7 +55,6 @@ public:
virtual void video_start() override;
uint32_t screen_update_timetrv(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
- void timetrv(machine_config &config);
void timetrv_io(address_map &map);
void timetrv_map(address_map &map);
};
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index 409ba1e5ac7..9206af6be13 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -459,7 +459,7 @@ public:
void lantutor(machine_config &config);
void k28m2(machine_config &config);
-protected:
+private:
virtual void power_off() override;
void prepare_display();
bool vfd_filament_on() { return m_display_decay[15][16] != 0; }
@@ -488,7 +488,6 @@ protected:
virtual void machine_start() override;
-private:
// devices
required_device<tms5110_device> m_tms5100;
required_device<tms6100_device> m_tms6100;
diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp
index 718d4f36760..13d39065f74 100644
--- a/src/mame/drivers/tispellb.cpp
+++ b/src/mame/drivers/tispellb.cpp
@@ -75,6 +75,12 @@ public:
m_tms6100(*this, "tms6100")
{ }
+ void rev1(machine_config &config);
+ void rev2(machine_config &config);
+
+ virtual DECLARE_INPUT_CHANGED_MEMBER(power_button) override;
+
+private:
// devices
optional_device<cpu_device> m_subcpu;
optional_device<tms6100_device> m_tms6100;
@@ -83,7 +89,6 @@ public:
u16 m_sub_o;
u16 m_sub_r;
- virtual DECLARE_INPUT_CHANGED_MEMBER(power_button) override;
virtual void power_off() override;
void prepare_display();
bool vfd_filament_on() { return m_display_decay[15][16] != 0; }
@@ -101,10 +106,6 @@ public:
DECLARE_WRITE16_MEMBER(rev2_write_o);
DECLARE_WRITE16_MEMBER(rev2_write_r);
- void rev1(machine_config &config);
- void rev2(machine_config &config);
-
-protected:
virtual void machine_start() override;
};
diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp
index a769d067324..6000dcaa414 100644
--- a/src/mame/drivers/tk80.cpp
+++ b/src/mame/drivers/tk80.cpp
@@ -69,7 +69,7 @@ public:
void nd80z(machine_config &config);
void tk85(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
DECLARE_READ8_MEMBER(key_matrix_r);
@@ -87,7 +87,6 @@ protected:
void tk80_mem(address_map &map);
void tk85_mem(address_map &map);
-private:
uint8_t m_term_data;
uint8_t m_keyb_press;
uint8_t m_keyb_press_flag;
diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp
index 2d3c9686021..144a7f6c077 100644
--- a/src/mame/drivers/tk80bs.cpp
+++ b/src/mame/drivers/tk80bs.cpp
@@ -42,6 +42,9 @@ public:
{
}
+ void tk80bs(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(ppi_custom_r);
DECLARE_WRITE8_MEMBER(ppi_custom_w);
void kbd_put(u8 data);
@@ -49,9 +52,8 @@ public:
DECLARE_READ8_MEMBER(port_b_r);
uint32_t screen_update_tk80bs(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_shared_ptr<uint8_t> m_p_videoram;
- void tk80bs(machine_config &config);
void tk80bs_mem(address_map &map);
-private:
+
uint8_t m_term_data;
required_device<cpu_device> m_maincpu;
required_device<i8255_device> m_ppi;
diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp
index 94c5193e0a6..e9e8814581e 100644
--- a/src/mame/drivers/tm990189.cpp
+++ b/src/mame/drivers/tm990189.cpp
@@ -96,6 +96,12 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void tm990_189_v(machine_config &config);
+ void tm990_189(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER( load_interrupt );
+
+private:
DECLARE_READ8_MEMBER(video_vdp_r);
DECLARE_WRITE8_MEMBER(video_vdp_w);
DECLARE_READ8_MEMBER(video_joy_r);
@@ -103,8 +109,6 @@ public:
DECLARE_WRITE8_MEMBER( external_operation );
- DECLARE_INPUT_CHANGED_MEMBER( load_interrupt );
-
DECLARE_WRITE_LINE_MEMBER(usr9901_led0_w);
DECLARE_WRITE_LINE_MEMBER(usr9901_led1_w);
DECLARE_WRITE_LINE_MEMBER(usr9901_led2_w);
@@ -138,13 +142,8 @@ public:
DECLARE_MACHINE_START(tm990_189_v);
DECLARE_MACHINE_RESET(tm990_189_v);
- void tm990_189_v(machine_config &config);
- void tm990_189(machine_config &config);
-
-protected:
emu_timer *m_rs232_input_timer;
-private:
void tm990_189_cru_map(address_map &map);
void tm990_189_memmap(address_map &map);
void tm990_189_v_memmap(address_map &map);
diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp
index efd18d4b81f..224a72a1157 100644
--- a/src/mame/drivers/tmaster.cpp
+++ b/src/mame/drivers/tmaster.cpp
@@ -124,25 +124,27 @@ public:
m_duart(*this, "duart68681")
{ }
- DECLARE_WRITE_LINE_MEMBER(blitter_irq_callback);
+ void tm(machine_config &config);
+ void tmds1204(machine_config &config);
- TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt);
- uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ DECLARE_READ_LINE_MEMBER(read_rand);
DECLARE_WRITE_LINE_MEMBER(write_oki_bank0);
DECLARE_WRITE_LINE_MEMBER(write_oki_bank1);
+private:
+ DECLARE_WRITE_LINE_MEMBER(blitter_irq_callback);
+
+ TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt);
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
DECLARE_WRITE_LINE_MEMBER(duart_irq_handler);
DECLARE_READ16_MEMBER(rtc_r);
DECLARE_WRITE16_MEMBER(rtc_w);
- DECLARE_READ_LINE_MEMBER(read_rand);
-
- void tm(machine_config &config);
- void tmds1204(machine_config &config);
void tmaster_map(address_map &map);
-protected:
+
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index af6ea71f675..317ca7e6915 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -225,12 +225,16 @@ public:
m_maincpu(*this, "maincpu"),
m_gfxdecode(*this, "gfxdecode") { }
+ void tmspoker(machine_config &config);
+
+ void init_bus();
+
+private:
required_shared_ptr<uint8_t> m_videoram;
tilemap_t *m_bg_tilemap;
DECLARE_WRITE8_MEMBER(tmspoker_videoram_w);
//DECLARE_WRITE8_MEMBER(debug_w);
DECLARE_READ8_MEMBER(unk_r);
- void init_bus();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -240,7 +244,7 @@ public:
INTERRUPT_GEN_MEMBER(tmspoker_interrupt);
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
- void tmspoker(machine_config &config);
+
void tmspoker_cru_map(address_map &map);
void tmspoker_map(address_map &map);
};
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index 769feb5748a..84e96470886 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -59,7 +59,7 @@ public:
void tomcat(machine_config &config);
-protected:
+private:
DECLARE_WRITE8_MEMBER(adcon_w);
DECLARE_READ16_MEMBER(tomcat_inputs_r);
DECLARE_WRITE16_MEMBER(main_latch_w);
@@ -81,7 +81,6 @@ protected:
void sound_map(address_map &map);
void tomcat_map(address_map &map);
-private:
required_device<tms5220_device> m_tms;
required_shared_ptr<uint16_t> m_shared_ram;
uint8_t m_nvram[0x800];
diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp
index c94e7aabad7..8290651a60f 100644
--- a/src/mame/drivers/tonton.cpp
+++ b/src/mame/drivers/tonton.cpp
@@ -41,6 +41,9 @@ public:
m_hopper(*this, "hopper")
{ }
+ void tonton(machine_config &config);
+
+private:
required_device<v9938_device> m_v9938;
DECLARE_WRITE8_MEMBER(tonton_outport_w);
DECLARE_WRITE8_MEMBER(hopper_w);
@@ -50,7 +53,6 @@ public:
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
required_device<ticket_dispenser_device> m_hopper;
- void tonton(machine_config &config);
void tonton_io(address_map &map);
void tonton_map(address_map &map);
};
diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp
index 44fc0610828..03242cd931f 100644
--- a/src/mame/drivers/toratora.cpp
+++ b/src/mame/drivers/toratora.cpp
@@ -63,6 +63,9 @@ public:
m_pia_u2(*this, "pia_u2"),
m_pia_u3(*this, "pia_u3") { }
+ void toratora(machine_config &config);
+
+private:
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
@@ -93,7 +96,6 @@ public:
virtual void machine_reset() override;
uint32_t screen_update_toratora(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(toratora_timer);
- void toratora(machine_config &config);
void main_map(address_map &map);
};
diff --git a/src/mame/drivers/tosh1000.cpp b/src/mame/drivers/tosh1000.cpp
index cdddc1c37bf..dcb06a1f592 100644
--- a/src/mame/drivers/tosh1000.cpp
+++ b/src/mame/drivers/tosh1000.cpp
@@ -72,9 +72,13 @@ public:
, m_bram(*this, "bram")
{ }
- DECLARE_MACHINE_RESET(tosh1000);
+ void tosh1000(machine_config &config);
+
void init_tosh1000();
+private:
+ DECLARE_MACHINE_RESET(tosh1000);
+
DECLARE_WRITE8_MEMBER(romdos_bank_w);
DECLARE_READ8_MEMBER(romdos_bank_r);
@@ -82,16 +86,14 @@ public:
DECLARE_READ8_MEMBER(bram_r);
static void cfg_fdc_35(device_t *device);
- void tosh1000(machine_config &config);
void tosh1000_io(address_map &map);
void tosh1000_map(address_map &map);
void tosh1000_romdos(address_map &map);
-protected:
+
required_device<cpu_device> m_maincpu;
required_device<address_map_bank_device> m_bankdev;
required_device<tosh1000_bram_device> m_bram;
-private:
enum {
IDLE, READ_DATA, WRITE_DATA
};
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index 2b820e6f20f..93d55150bd5 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -29,14 +29,13 @@ public:
void tourtabl(machine_config &config);
-protected:
+private:
virtual void machine_start() override { m_leds.resolve(); }
DECLARE_WRITE8_MEMBER(tourtabl_led_w);
DECLARE_READ16_MEMBER(tourtabl_read_input_port);
DECLARE_READ8_MEMBER(tourtabl_get_databus_contents);
void main_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
output_finder<4> m_leds;
};
diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp
index 80e7ef84333..d34046908d2 100644
--- a/src/mame/drivers/tourvis.cpp
+++ b/src/mame/drivers/tourvis.cpp
@@ -200,6 +200,9 @@ public:
, m_cart(*this, "cartslot")
{ }
+ void tourvision(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(tourvision_8085_d000_w);
DECLARE_WRITE8_MEMBER(tourvision_i8155_a_w);
DECLARE_WRITE8_MEMBER(tourvision_i8155_b_w);
@@ -208,11 +211,10 @@ public:
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(tourvision_cart);
- void tourvision(machine_config &config);
void pce_io(address_map &map);
void pce_mem(address_map &map);
void tourvision_8085_map(address_map &map);
-private:
+
required_device<cpu_device> m_subcpu;
required_device<generic_slot_device> m_cart;
uint32_t m_rom_size;
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index 5c8d888189e..65c9cab4c9c 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -61,6 +61,10 @@ public:
m_fgattr(*this, "fgattr")
{ }
+ void toypop(machine_config &config);
+ void liblrabl(machine_config &config);
+
+private:
required_device<cpu_device> m_master_cpu;
required_device<cpu_device> m_slave_cpu;
required_device<cpu_device> m_sound_cpu;
@@ -102,20 +106,19 @@ public:
DECLARE_WRITE8_MEMBER(sound_halt_ctrl_w);
DECLARE_READ8_MEMBER(bg_rmw_r);
DECLARE_WRITE8_MEMBER(bg_rmw_w);
- void toypop(machine_config &config);
- void liblrabl(machine_config &config);
+
void master_liblrabl_map(address_map &map);
void master_toypop_map(address_map &map);
void namcos16_master_base_map(address_map &map);
void slave_map(address_map &map);
void sound_map(address_map &map);
-protected:
+
// driver_device overrides
// virtual void machine_start() override;
virtual void machine_reset() override;
// virtual void video_start() override;
-private:
+
bool m_master_irq_enable;
bool m_slave_irq_enable;
uint8_t m_pal_bank;
diff --git a/src/mame/drivers/tr175.cpp b/src/mame/drivers/tr175.cpp
index f5e3f78351c..a2483da9233 100644
--- a/src/mame/drivers/tr175.cpp
+++ b/src/mame/drivers/tr175.cpp
@@ -21,16 +21,18 @@ public:
, m_maincpu(*this, "maincpu")
{ }
+ void tr175(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(ffec01_w);
DECLARE_WRITE8_MEMBER(fff000_w);
DECLARE_READ8_MEMBER(fff400_r);
SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
- void tr175(machine_config &config);
void mem_map(address_map &map);
void ramdac_map(address_map &map);
void vram_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp
index 4a5081675d6..affe49799e1 100644
--- a/src/mame/drivers/tr606.cpp
+++ b/src/mame/drivers/tr606.cpp
@@ -27,11 +27,13 @@ public:
: hh_ucom4_state(mconfig, type, tag)
{ }
+ void tr606(machine_config &config);
+
+private:
TIMER_DEVICE_CALLBACK_MEMBER(tp3_clock) { m_maincpu->set_input_line(0, ASSERT_LINE); }
TIMER_DEVICE_CALLBACK_MEMBER(tp3_clear) { m_maincpu->set_input_line(0, CLEAR_LINE); }
virtual void machine_start() override;
- void tr606(machine_config &config);
};
// TP2 to MCU CLK: LC circuit(TI S74230), stable sine wave, 2.2us interval
diff --git a/src/mame/drivers/tricep.cpp b/src/mame/drivers/tricep.cpp
index 0500ec690bb..f2a924e5dc4 100644
--- a/src/mame/drivers/tricep.cpp
+++ b/src/mame/drivers/tricep.cpp
@@ -25,7 +25,7 @@ public:
}
void tricep(machine_config &config);
-protected:
+private:
DECLARE_WRITE8_MEMBER(pci_mux_w);
DECLARE_READ8_MEMBER(pci_r);
DECLARE_WRITE8_MEMBER(pci_w);
diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp
index becb52205c0..798f2f547ed 100644
--- a/src/mame/drivers/triforce.cpp
+++ b/src/mame/drivers/triforce.cpp
@@ -454,6 +454,10 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
+ void triforcegd(machine_config &config);
+ void triforce_base(machine_config &config);
+
+private:
DECLARE_READ64_MEMBER(gc_pi_r);
DECLARE_WRITE64_MEMBER(gc_pi_w);
DECLARE_READ64_MEMBER(gc_exi_r);
@@ -462,8 +466,6 @@ public:
virtual void video_start() override;
uint32_t screen_update_triforce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_device<ppc_device> m_maincpu;
- void triforcegd(machine_config &config);
- void triforce_base(machine_config &config);
void gc_map(address_map &map);
};
diff --git a/src/mame/drivers/trs80dt1.cpp b/src/mame/drivers/trs80dt1.cpp
index daea3cf5487..b51fdcd3681 100644
--- a/src/mame/drivers/trs80dt1.cpp
+++ b/src/mame/drivers/trs80dt1.cpp
@@ -55,6 +55,9 @@ public:
, m_7474(*this, "7474")
{ }
+ void trs80dt1(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(dma_r);
DECLARE_READ8_MEMBER(key_r);
DECLARE_WRITE8_MEMBER(store_w);
@@ -62,10 +65,9 @@ public:
DECLARE_WRITE8_MEMBER(port3_w);
I8275_DRAW_CHARACTER_MEMBER(crtc_update_row);
- void trs80dt1(machine_config &config);
void io_map(address_map &map);
void prg_map(address_map &map);
-private:
+
bool m_bow;
virtual void machine_reset() override;
virtual void machine_start() override;
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index 1ec0bcfe9dd..6d5f731121b 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -107,6 +107,9 @@ public:
m_palette(*this, "palette"),
m_generic_paletteram_8(*this, "paletteram") { }
+ void trvmadns(machine_config &config);
+
+private:
tilemap_t *m_bg_tilemap;
required_shared_ptr<uint8_t> m_gfxram;
required_shared_ptr<uint8_t> m_tileram;
@@ -125,7 +128,6 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_shared_ptr<uint8_t> m_generic_paletteram_8;
- void trvmadns(machine_config &config);
void cpu_map(address_map &map);
void io_map(address_map &map);
};
diff --git a/src/mame/drivers/ts3000.cpp b/src/mame/drivers/ts3000.cpp
index 558dfc41c5f..3d297f2e586 100644
--- a/src/mame/drivers/ts3000.cpp
+++ b/src/mame/drivers/ts3000.cpp
@@ -23,11 +23,10 @@ public:
void ts3000(machine_config &config);
-protected:
+private:
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
// required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/ts802.cpp b/src/mame/drivers/ts802.cpp
index 565db23ad6f..99efcb84488 100644
--- a/src/mame/drivers/ts802.cpp
+++ b/src/mame/drivers/ts802.cpp
@@ -39,7 +39,11 @@ public:
, m_terminal(*this, "terminal")
{ }
+ void ts802(machine_config &config);
+
void init_ts802();
+
+private:
DECLARE_MACHINE_RESET(ts802);
DECLARE_READ8_MEMBER(port00_r) { return 0x80; };
DECLARE_READ8_MEMBER(port0c_r) { return 1; };
@@ -54,10 +58,9 @@ public:
DECLARE_READ8_MEMBER(io_read_byte);
DECLARE_WRITE8_MEMBER(io_write_byte);
void kbd_put(u8 data);
- void ts802(machine_config &config);
void ts802_io(address_map &map);
void ts802_mem(address_map &map);
-private:
+
uint8_t m_term_data;
address_space *m_mem;
address_space *m_io;
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 0f66129a94d..0cef0658543 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -73,6 +73,11 @@ public:
, m_io_dsw(*this, "DSW")
{ }
+ void ts803(machine_config &config);
+
+ void init_ts803();
+
+private:
DECLARE_READ8_MEMBER(port10_r);
DECLARE_WRITE8_MEMBER(port10_w);
DECLARE_READ8_MEMBER(porta0_r);
@@ -82,13 +87,11 @@ public:
MC6845_UPDATE_ROW(crtc_update_row);
MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr);
DECLARE_WRITE8_MEMBER( crtc_controlreg_w );
- void init_ts803();
uint32_t screen_update_ts803(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void ts803(machine_config &config);
void ts803_io(address_map &map);
void ts803_mem(address_map &map);
-private:
+
std::unique_ptr<uint8_t[]> m_videoram;
std::unique_ptr<uint8_t[]> m_56kram;
bool m_graphics_mode;
diff --git a/src/mame/drivers/ts816.cpp b/src/mame/drivers/ts816.cpp
index 38fa978d5ee..db45c706b00 100644
--- a/src/mame/drivers/ts816.cpp
+++ b/src/mame/drivers/ts816.cpp
@@ -35,6 +35,11 @@ public:
, m_terminal(*this, "terminal")
{ }
+ void ts816(machine_config &config);
+
+ void init_ts816();
+
+private:
void kbd_put(u8 data);
DECLARE_READ8_MEMBER(keyin_r);
DECLARE_READ8_MEMBER(status_r);
@@ -42,12 +47,10 @@ public:
DECLARE_WRITE8_MEMBER(port78_w);
DECLARE_WRITE8_MEMBER(porte0_w);
DECLARE_WRITE8_MEMBER(portf0_w);
- void init_ts816();
- void ts816(machine_config &config);
void ts816_io(address_map &map);
void ts816_mem(address_map &map);
-private:
+
uint8_t m_term_data;
uint8_t m_status;
bool m_2ndbank;
diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp
index 8648ef53f63..b4bbad792c5 100644
--- a/src/mame/drivers/ttchamp.cpp
+++ b/src/mame/drivers/ttchamp.cpp
@@ -83,6 +83,9 @@ public:
m_maincpu(*this, "maincpu"),
m_palette(*this, "palette") { }
+ void ttchamp(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
@@ -142,7 +145,6 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(irq);
- void ttchamp(machine_config &config);
void ttchamp_io(address_map &map);
void ttchamp_map(address_map &map);
};
diff --git a/src/mame/drivers/tti.cpp b/src/mame/drivers/tti.cpp
index 8d4d673b795..8ff60924a84 100644
--- a/src/mame/drivers/tti.cpp
+++ b/src/mame/drivers/tti.cpp
@@ -31,11 +31,13 @@ public:
, m_mfp(*this, "mfp")
{ }
+ void tti(machine_config &config);
+
+private:
IRQ_CALLBACK_MEMBER(intack);
- void tti(machine_config &config);
void prg_map(address_map &map);
-protected:
+
required_device<cpu_device> m_maincpu;
required_device<mc68901_device> m_mfp;
};
diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp
index e7dc7cf6ba8..92b0d26880a 100644
--- a/src/mame/drivers/tugboat.cpp
+++ b/src/mame/drivers/tugboat.cpp
@@ -37,11 +37,6 @@ always false - counter was reloaded and incremented before interrupt occurs
class tugboat_state : public driver_device
{
public:
- enum
- {
- TIMER_INTERRUPT
- };
-
tugboat_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -50,6 +45,14 @@ public:
m_palette(*this, "palette"),
m_ram(*this, "ram") { }
+ void tugboat(machine_config &config);
+
+private:
+ enum
+ {
+ TIMER_INTERRUPT
+ };
+
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
@@ -76,12 +79,10 @@ public:
DECLARE_PALETTE_INIT(tugboat);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void draw_tilemap(bitmap_ind16 &bitmap,const rectangle &cliprect,
- int addr,int gfx0,int gfx1,int transparency);
+ void draw_tilemap(bitmap_ind16 &bitmap, const rectangle &cliprect, int addr, int gfx0, int gfx1, int transparency);
+
+ void main_map(address_map &map);
- void tugboat(machine_config &config);
- void main_map(address_map &map);
-protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp
index c7a202c64bd..f58d68da2ce 100644
--- a/src/mame/drivers/tutor.cpp
+++ b/src/mame/drivers/tutor.cpp
@@ -200,6 +200,10 @@ public:
{
}
+ void pyuutajr(machine_config &config);
+ void tutor(machine_config &config);
+
+private:
required_device<tms9995_device> m_maincpu;
required_device<generic_slot_device> m_cart;
optional_device<cassette_image_device> m_cass;
@@ -227,8 +231,6 @@ public:
int m_centronics_busy;
DECLARE_WRITE_LINE_MEMBER(write_centronics_busy);
- void pyuutajr(machine_config &config);
- void tutor(machine_config &config);
void pyuutajr_mem(address_map &map);
void tutor_io(address_map &map);
void tutor_memmap(address_map &map);
diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp
index 54e9ea5a7e7..3380f785186 100644
--- a/src/mame/drivers/tv910.cpp
+++ b/src/mame/drivers/tv910.cpp
@@ -59,6 +59,9 @@ public:
, m_charset(*this, "CHARSET")
{ }
+ void tv910(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -80,9 +83,8 @@ public:
DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w);
DECLARE_WRITE_LINE_MEMBER(ay3600_ako_w);
- void tv910(machine_config &config);
void tv910_mem(address_map &map);
-private:
+
required_device<m6502_device> m_maincpu;
required_device<input_merger_device> m_mainirq;
required_device<r6545_1_device> m_crtc;
diff --git a/src/mame/drivers/tv912.cpp b/src/mame/drivers/tv912.cpp
index 5a482dd8909..79673153301 100644
--- a/src/mame/drivers/tv912.cpp
+++ b/src/mame/drivers/tv912.cpp
@@ -91,6 +91,11 @@ public:
, m_baudgen_timer(nullptr)
{ }
+ void tv912(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(uart_settings_changed);
+
+private:
DECLARE_WRITE8_MEMBER(p1_w);
DECLARE_READ8_MEMBER(p2_r);
DECLARE_WRITE8_MEMBER(p2_w);
@@ -102,13 +107,10 @@ public:
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- DECLARE_INPUT_CHANGED_MEMBER(uart_settings_changed);
-
- void tv912(machine_config &config);
void bank_map(address_map &map);
void io_map(address_map &map);
void prog_map(address_map &map);
-private:
+
enum
{
TIMER_BAUDGEN
diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp
index 345dc286972..b1ce6dce2a6 100644
--- a/src/mame/drivers/tv950.cpp
+++ b/src/mame/drivers/tv950.cpp
@@ -65,6 +65,9 @@ public:
, m_gfx(*this, "graphics")
{ }
+ void tv950(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(via_a_w);
DECLARE_WRITE8_MEMBER(via_b_w);
DECLARE_READ8_MEMBER(via_b_r);
@@ -75,9 +78,8 @@ public:
DECLARE_WRITE8_MEMBER(row_addr_w);
DECLARE_WRITE_LINE_MEMBER(via_crtc_reset_w);
- void tv950(machine_config &config);
void tv950_mem(address_map &map);
-private:
+
uint8_t m_via_row;
uint8_t m_attr_row;
uint8_t m_attr_screen;
diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp
index 60a6b3f1377..b15988ea45c 100644
--- a/src/mame/drivers/tv990.cpp
+++ b/src/mame/drivers/tv990.cpp
@@ -65,6 +65,11 @@ public:
{
}
+ void tv990(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(color);
+
+private:
required_device<m68000_device> m_maincpu;
required_shared_ptr<uint16_t> m_vram;
required_shared_ptr<uint16_t> m_fontram;
@@ -91,10 +96,8 @@ public:
DECLARE_WRITE_LINE_MEMBER(lpt_irq);
INTERRUPT_GEN_MEMBER(vblank);
- DECLARE_INPUT_CHANGED_MEMBER(color);
- void tv990(machine_config &config);
void tv990_mem(address_map &map);
-private:
+
uint16_t tvi1111_regs[(0x100/2)+2];
emu_timer *m_rowtimer;
int m_rowh, m_width, m_height;
diff --git a/src/mame/drivers/tvboy.cpp b/src/mame/drivers/tvboy.cpp
index d30b96a3f63..5a9f0bae655 100644
--- a/src/mame/drivers/tvboy.cpp
+++ b/src/mame/drivers/tvboy.cpp
@@ -29,7 +29,7 @@ public:
void tvboyii(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -38,7 +38,6 @@ protected:
void rom_map(address_map &map);
void tvboy_mem(address_map &map);
-private:
required_memory_bank m_crom;
required_region_ptr<uint8_t> m_rom;
};
diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp
index 7da8304d6c3..39ce3080db8 100644
--- a/src/mame/drivers/tvc.cpp
+++ b/src/mame/drivers/tvc.cpp
@@ -56,6 +56,9 @@ public:
, m_keyboard(*this, "LINE.%u", 0)
{ }
+ void tvc(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_device<tvc_sound_device> m_sound;
@@ -110,7 +113,7 @@ public:
uint8_t m_cassette_ff;
uint8_t m_centronics_ff;
DECLARE_PALETTE_INIT(tvc);
- void tvc(machine_config &config);
+
void tvc_io(address_map &map);
void tvc_mem(address_map &map);
};
diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp
index 1f94be7f637..cb66f0074ce 100644
--- a/src/mame/drivers/tvcapcom.cpp
+++ b/src/mame/drivers/tvcapcom.cpp
@@ -22,11 +22,14 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu") { }
+ void tvcapcom(machine_config &config);
+
+private:
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update_tvcapcom(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
required_device<ppc_device> m_maincpu;
- void tvcapcom(machine_config &config);
+
void gc_map(address_map &map);
};
diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp
index 5e58f6e08d6..bbd63648f58 100644
--- a/src/mame/drivers/tvgame.cpp
+++ b/src/mame/drivers/tvgame.cpp
@@ -29,12 +29,14 @@ public:
, m_p_videoram(*this, "videoram")
{ }
+ void tvgame(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(speaker_w);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void tvgame(machine_config &config);
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
required_shared_ptr<uint8_t> m_p_videoram;
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index ad2de065565..99f289019b5 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -274,7 +274,7 @@ public:
void twinklei(machine_config &config);
void twinkle(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
DECLARE_WRITE8_MEMBER(twinkle_io_w);
@@ -304,7 +304,6 @@ protected:
void rf5c400_map(address_map &map);
void sound_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<am53cf96_device> m_am53cf96;
diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp
index 4ae728b4a27..27f0b3b7e7b 100644
--- a/src/mame/drivers/twins.cpp
+++ b/src/mame/drivers/twins.cpp
@@ -83,6 +83,11 @@ public:
, m_videorambank(0)
{ }
+ void spider(machine_config &config);
+ void twins(machine_config &config);
+ void twinsa(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
optional_shared_ptr<uint16_t> m_paletteram;
required_device<palette_device> m_palette;
@@ -118,9 +123,6 @@ public:
uint16_t* m_rom16;
uint8_t* m_rom8;
- void spider(machine_config &config);
- void twins(machine_config &config);
- void twinsa(machine_config &config);
void ramdac_map(address_map &map);
void spider_io(address_map &map);
void twins_io(address_map &map);
diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp
index af72f8d715d..44dc5315740 100644
--- a/src/mame/drivers/uapce.cpp
+++ b/src/mame/drivers/uapce.cpp
@@ -113,6 +113,9 @@ public:
: pce_common_state(mconfig, type, tag),
m_discrete(*this, "discrete") { }
+ void uapce(machine_config &config);
+
+private:
uint8_t m_jamma_if_control_latch;
DECLARE_WRITE8_MEMBER(jamma_if_control_latch_w);
DECLARE_READ8_MEMBER(jamma_if_control_latch_r);
@@ -120,7 +123,7 @@ public:
virtual uint8_t joy_read() override;
virtual void machine_reset() override;
required_device<discrete_device> m_discrete;
- void uapce(machine_config &config);
+
void pce_io(address_map &map);
void pce_mem(address_map &map);
void z80_map(address_map &map);
diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp
index 1e136b2076a..9622f9b2bcc 100644
--- a/src/mame/drivers/uknc.cpp
+++ b/src/mame/drivers/uknc.cpp
@@ -21,11 +21,14 @@ public:
: driver_device(mconfig, type, tag) ,
m_maincpu(*this, "maincpu") { }
+ void uknc(machine_config &config);
+
+private:
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_uknc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
- void uknc(machine_config &config);
+
void uknc_mem(address_map &map);
void uknc_sub_mem(address_map &map);
};
diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp
index d7b54ae27f4..1f63af875ca 100644
--- a/src/mame/drivers/ultrsprt.cpp
+++ b/src/mame/drivers/ultrsprt.cpp
@@ -32,6 +32,9 @@ public:
m_upd(*this, "upd%u", 1),
m_service(*this, "SERVICE") { }
+ void ultrsprt(machine_config &config);
+
+private:
static const uint32_t VRAM_PAGES = 2;
static const uint32_t VRAM_PAGE_BYTES = 512 * 1024;
@@ -53,14 +56,12 @@ public:
uint32_t screen_update_ultrsprt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void ultrsprt(machine_config &config);
void sound_map(address_map &map);
void ultrsprt_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
std::unique_ptr<uint8_t[]> m_vram;
uint32_t m_cpu_vram_page;
};
diff --git a/src/mame/drivers/unianapc.cpp b/src/mame/drivers/unianapc.cpp
index 9de58eca3e4..fcbbd2f470b 100644
--- a/src/mame/drivers/unianapc.cpp
+++ b/src/mame/drivers/unianapc.cpp
@@ -35,13 +35,15 @@ public:
m_maincpu(*this, "maincpu")
{ }
+ void unianapc(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
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);
- void unianapc(machine_config &config);
void unianapc_map(address_map &map);
};
diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp
index 0c64b8c5d4e..e7f580e07d4 100644
--- a/src/mame/drivers/unichamp.cpp
+++ b/src/mame/drivers/unichamp.cpp
@@ -60,12 +60,16 @@ public:
m_cart(*this, "cartslot"),
m_ctrls(*this, "CTRLS"){}
+ void unichamp(machine_config &config);
+
+ void init_unichamp();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gic_device> m_gic;
required_device<generic_slot_device> m_cart;
uint8_t m_ram[256];
- void init_unichamp();
virtual void machine_start() override;
virtual void machine_reset() override;
DECLARE_PALETTE_INIT(unichamp);
@@ -82,9 +86,8 @@ public:
uint32_t screen_update_unichamp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void unichamp(machine_config &config);
void unichamp_mem(address_map &map);
-protected:
+
required_ioport m_ctrls;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp
index ab18623a4bf..9cec34e40bb 100644
--- a/src/mame/drivers/unior.cpp
+++ b/src/mame/drivers/unior.cpp
@@ -64,7 +64,7 @@ public:
void unior(machine_config &config);
-protected:
+private:
DECLARE_WRITE8_MEMBER(vram_w);
DECLARE_WRITE8_MEMBER(scroll_w);
DECLARE_READ8_MEMBER(ppi0_b_r);
@@ -82,7 +82,6 @@ protected:
void unior_io(address_map &map);
void unior_mem(address_map &map);
-private:
uint8_t m_4c;
uint8_t m_4e;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index 14966c10682..9f175aadaca 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -77,7 +77,7 @@ public:
void uts20(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER(ram_r);
DECLARE_READ8_MEMBER(bank_r);
DECLARE_WRITE8_MEMBER(ram_w);
@@ -96,7 +96,6 @@ protected:
virtual void machine_reset() override;
virtual void device_post_load() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<nvram_device> m_nvram;
required_device<z80ctc_device> m_ctc;
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index 332370f6661..0e538f9e91c 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -46,7 +46,7 @@ public:
void unixpc(machine_config &config);
-protected:
+private:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
virtual void machine_start() override;
diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp
index e8fad15fce1..290caa9a691 100644
--- a/src/mame/drivers/unkhorse.cpp
+++ b/src/mame/drivers/unkhorse.cpp
@@ -39,6 +39,9 @@ public:
m_vram(*this, "vram")
{ }
+ void horse(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
required_ioport_array<4> m_inp_matrix;
@@ -54,7 +57,6 @@ public:
virtual void machine_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void horse(machine_config &config);
void horse_io_map(address_map &map);
void horse_map(address_map &map);
};
diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp
index 8e03fe75d51..dd57b6f57d1 100644
--- a/src/mame/drivers/upscope.cpp
+++ b/src/mame/drivers/upscope.cpp
@@ -44,6 +44,11 @@ public:
m_ppi(*this, "ppi")
{ }
+ void upscope(machine_config &config);
+
+ void init_upscope();
+
+private:
uint8_t m_nvram[0x100];
uint8_t m_prev_cia1_porta;
uint8_t m_parallel_data;
@@ -58,16 +63,13 @@ public:
DECLARE_WRITE8_MEMBER(lamps_w);
DECLARE_WRITE8_MEMBER(coin_counter_w);
- void init_upscope();
- void upscope(machine_config &config);
void a500_mem(address_map &map);
void main_map(address_map &map);
void overlay_512kb_map(address_map &map);
-protected:
+
virtual void machine_reset() override;
-private:
required_device<i8255_device> m_ppi;
};
diff --git a/src/mame/drivers/usbilliards.cpp b/src/mame/drivers/usbilliards.cpp
index 95e1af44c7f..e77e5423ad5 100644
--- a/src/mame/drivers/usbilliards.cpp
+++ b/src/mame/drivers/usbilliards.cpp
@@ -47,21 +47,18 @@ public:
{
}
+ void usbilliards(machine_config &config);
+
+private:
// devices
required_device<netlist_mame_device> m_maincpu;
required_device<fixedfreq_device> m_video;
- void usbilliards(machine_config &config);
-protected:
-
// driver_device overrides
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
-
-private:
-
};
diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp
index d5c7478fd9b..6401d3046ba 100644
--- a/src/mame/drivers/uzebox.cpp
+++ b/src/mame/drivers/uzebox.cpp
@@ -43,6 +43,9 @@ public:
, m_speaker(*this, "speaker")
{ }
+ void uzebox(machine_config &config);
+
+private:
required_device<avr8_device> m_maincpu;
required_device<screen_device> m_screen;
required_device<generic_slot_device> m_cart;
@@ -65,11 +68,10 @@ public:
uint32_t screen_update_uzebox(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(uzebox_cart);
- void uzebox(machine_config &config);
void uzebox_data_map(address_map &map);
void uzebox_io_map(address_map &map);
void uzebox_prg_map(address_map &map);
-private:
+
int m_vpos;
uint64_t m_line_start_cycles;
uint32_t m_line_pos_cycles;
diff --git a/src/mame/drivers/v100.cpp b/src/mame/drivers/v100.cpp
index 296d76c2bd5..5eaa2cc6080 100644
--- a/src/mame/drivers/v100.cpp
+++ b/src/mame/drivers/v100.cpp
@@ -40,6 +40,9 @@ public:
, m_key_row(*this, "ROW%u", 0)
{ }
+ void v100(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(earom_r);
DECLARE_WRITE8_MEMBER(port30_w);
DECLARE_READ8_MEMBER(keyboard_r);
@@ -52,10 +55,9 @@ public:
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void v100(machine_config &config);
void io_map(address_map &map);
void mem_map(address_map &map);
-private:
+
virtual void machine_start() override;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/v102.cpp b/src/mame/drivers/v102.cpp
index 7d4c3f146cd..8e86e3fd662 100644
--- a/src/mame/drivers/v102.cpp
+++ b/src/mame/drivers/v102.cpp
@@ -28,13 +28,15 @@ public:
, m_p_chargen(*this, "chargen")
{ }
+ void v102(machine_config &config);
+
+private:
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void v102(machine_config &config);
void io_map(address_map &map);
void kbd_map(address_map &map);
void mem_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_region_ptr<u8> m_p_chargen;
};
diff --git a/src/mame/drivers/v550.cpp b/src/mame/drivers/v550.cpp
index 5ca0198e720..40a85747775 100644
--- a/src/mame/drivers/v550.cpp
+++ b/src/mame/drivers/v550.cpp
@@ -37,8 +37,9 @@ public:
void v550(machine_config &config);
- u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
private:
+ u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; }
+
void mem_map(address_map &map);
void io_map(address_map &map);
void pvtc_map(address_map &map);
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index f79cf629e4d..1b90d14fa59 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -82,6 +82,9 @@ public:
{
}
+ void v6809(machine_config &config);
+
+private:
DECLARE_WRITE_LINE_MEMBER(speaker_en_w);
DECLARE_WRITE_LINE_MEMBER(speaker_w);
DECLARE_READ8_MEMBER(pb_r);
@@ -94,9 +97,8 @@ public:
MC6845_UPDATE_ROW(crtc_update_row);
MC6845_ON_UPDATE_ADDR_CHANGED(crtc_update_addr);
- void v6809(machine_config &config);
void v6809_mem(address_map &map);
-private:
+
uint16_t m_video_address;
bool m_speaker_en;
uint8_t m_video_index;
diff --git a/src/mame/drivers/vax11.cpp b/src/mame/drivers/vax11.cpp
index e1b25cbdcb1..1b93b0a8b5b 100644
--- a/src/mame/drivers/vax11.cpp
+++ b/src/mame/drivers/vax11.cpp
@@ -82,6 +82,9 @@ public:
{
}
+ void vax11(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<generic_terminal_device> m_terminal;
DECLARE_READ16_MEMBER( term_r );
@@ -91,7 +94,6 @@ public:
void kbd_put(u8 data);
uint8_t m_term_data;
uint16_t m_term_status;
- void vax11(machine_config &config);
void vax11_mem(address_map &map);
};
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index d1b3b016e39..7b08e528a2a 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -161,6 +161,9 @@ public:
m_vboy_timer.latch = 0;
}
+ void vboy(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<vboy_cart_slot_device> m_cart;
required_device<timer_device> m_maintimer;
@@ -226,7 +229,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(timer_main_tick);
TIMER_DEVICE_CALLBACK_MEMBER(timer_pad_tick);
TIMER_DEVICE_CALLBACK_MEMBER(vboy_scanlineL);
- void vboy(machine_config &config);
+
void vboy_io(address_map &map);
void vboy_mem(address_map &map);
};
diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp
index 45b07f45512..5424f20cad5 100644
--- a/src/mame/drivers/vd.cpp
+++ b/src/mame/drivers/vd.cpp
@@ -34,17 +34,18 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void vd(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(ack_r);
DECLARE_WRITE8_MEMBER(col_w);
DECLARE_WRITE8_MEMBER(disp_w);
DECLARE_WRITE8_MEMBER(lamp_w) { };
DECLARE_WRITE8_MEMBER(sol_w) { };
TIMER_DEVICE_CALLBACK_MEMBER(irq);
- void vd(machine_config &config);
void vd_io(address_map &map);
void vd_map(address_map &map);
-private:
uint8_t m_t_c;
uint8_t segment[5];
virtual void machine_reset() override;
diff --git a/src/mame/drivers/vector4.cpp b/src/mame/drivers/vector4.cpp
index 1fe533fd7c8..6a2ccb41ada 100644
--- a/src/mame/drivers/vector4.cpp
+++ b/src/mame/drivers/vector4.cpp
@@ -23,11 +23,12 @@ public:
, m_maincpu(*this, "maincpu")
{ }
-
void vector4(machine_config &config);
+
+private:
void vector4_io(address_map &map);
void vector4_mem(address_map &map);
-private:
+
virtual void machine_reset() override;
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/vectrix.cpp b/src/mame/drivers/vectrix.cpp
index d43a471c340..dc1fdead34e 100644
--- a/src/mame/drivers/vectrix.cpp
+++ b/src/mame/drivers/vectrix.cpp
@@ -23,14 +23,16 @@ class vectrix_state : public driver_device
public:
vectrix_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
-// , m_maincpu(*this, "maincpu")
+ // , m_maincpu(*this, "maincpu")
{ }
-void vectrix(machine_config &config);
-void io_map(address_map &map);
-void mem_map(address_map &map);
+ void vectrix(machine_config &config);
+
private:
-// required_device<cpu_device> m_maincpu;
+ void io_map(address_map &map);
+ void mem_map(address_map &map);
+
+ // required_device<cpu_device> m_maincpu;
};
void vectrix_state::mem_map(address_map &map)
diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp
index d57060919a8..5456658a03b 100644
--- a/src/mame/drivers/vega.cpp
+++ b/src/mame/drivers/vega.cpp
@@ -115,6 +115,11 @@ public:
{
}
+ void vega(machine_config &config);
+
+ void init_vega();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<i8255_device> m_i8255;
required_device<ins8154_device> m_ins8154;
@@ -161,15 +166,11 @@ public:
DECLARE_READ8_MEMBER(ay8910_pb_r);
DECLARE_WRITE8_MEMBER(ay8910_pb_w);
- void init_vega();
-
-
virtual void machine_start() override;
virtual void machine_reset() override;
DECLARE_PALETTE_INIT(vega);
void draw_tilemap(screen_device& screen, bitmap_ind16& bitmap, const rectangle& cliprect);
uint32_t screen_update_vega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void vega(machine_config &config);
void vega_io_map(address_map &map);
void vega_map(address_map &map);
};
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index e51dde24ed0..5de1155a080 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -33,6 +33,11 @@ public:
{
}
+ void vega(machine_config &config);
+
+ void init_vegaeo();
+
+private:
required_device<generic_latch_8_device> m_soundlatch;
required_ioport m_system_io;
@@ -47,11 +52,9 @@ public:
DECLARE_WRITE8_MEMBER(qs1000_p2_w);
DECLARE_WRITE8_MEMBER(qs1000_p3_w);
- void init_vegaeo();
DECLARE_VIDEO_START(vega);
uint32_t screen_update_vega(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void vega(machine_config &config);
void vega_map(address_map &map);
};
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index 8c4e2dede0c..50d6be6dc36 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -338,6 +338,46 @@ public:
m_lamps(*this, "lamp%u", 0U),
m_a2d_shift(0)
{ }
+
+ void vegascore(machine_config &config);
+ void vegas(machine_config &config);
+ void vegas250(machine_config &config);
+ void vegas32m(machine_config &config);
+ void vegasban(machine_config &config);
+ void vegasv3(machine_config &config);
+ void denver(machine_config &config);
+
+ void nbanfl(machine_config &config);
+ void sf2049te(machine_config &config);
+ void sf2049se(machine_config &config);
+ void nbashowt(machine_config &config);
+ void gauntdl(machine_config &config);
+ void sf2049(machine_config &config);
+ void gauntleg(machine_config &config);
+ void cartfury(machine_config &config);
+ void tenthdeg(machine_config &config);
+ void nbagold(machine_config &config);
+ void roadburn(machine_config &config);
+ void warfa(machine_config &config);
+
+ void init_gauntleg();
+ void init_cartfury();
+ void init_tenthdeg();
+ void init_nbashowt();
+ void init_nbagold();
+ void init_warfa();
+ void init_roadburn();
+ void init_sf2049te();
+ void init_gauntdl();
+ void init_nbanfl();
+ void init_sf2049();
+ void init_sf2049se();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(i40_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(keypad_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
+
+private:
static constexpr unsigned SYSTEM_CLOCK = 100000000;
required_device<mips3_device> m_maincpu;
@@ -378,18 +418,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(duart_irq_cb);
DECLARE_WRITE_LINE_MEMBER(vblank_assert);
- void init_gauntleg();
- void init_cartfury();
- void init_tenthdeg();
- void init_nbashowt();
- void init_nbagold();
- void init_warfa();
- void init_roadburn();
- void init_sf2049te();
- void init_gauntdl();
- void init_nbanfl();
- void init_sf2049();
- void init_sf2049se();
+
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -423,32 +452,11 @@ public:
DECLARE_WRITE8_MEMBER(parallel_w);
DECLARE_WRITE8_MEMBER(mpsreset_w);
DECLARE_WRITE32_MEMBER(i40_w);
- DECLARE_CUSTOM_INPUT_MEMBER(i40_r);
- DECLARE_CUSTOM_INPUT_MEMBER(keypad_r);
- DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
+
DECLARE_WRITE32_MEMBER(wheel_board_w);
std::string sioIRQString(uint8_t data);
- void vegascore(machine_config &config);
- void vegas(machine_config &config);
- void vegas250(machine_config &config);
- void vegas32m(machine_config &config);
- void vegasban(machine_config &config);
- void vegasv3(machine_config &config);
- void denver(machine_config &config);
- void nbanfl(machine_config &config);
- void sf2049te(machine_config &config);
- void sf2049se(machine_config &config);
- void nbashowt(machine_config &config);
- void gauntdl(machine_config &config);
- void sf2049(machine_config &config);
- void gauntleg(machine_config &config);
- void cartfury(machine_config &config);
- void tenthdeg(machine_config &config);
- void nbagold(machine_config &config);
- void roadburn(machine_config &config);
- void warfa(machine_config &config);
void vegas_cs2_map(address_map &map);
void vegas_cs3_map(address_map &map);
void vegas_cs4_map(address_map &map);
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index 30c6500f21c..09de28915dc 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -79,6 +79,11 @@ public:
, m_ram(*this, RAM_TAG)
{ }
+ void vg5k(machine_config &config);
+
+ void init_vg5k();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<ef9345_device> m_ef9345;
required_device<dac_bit_interface> m_dac;
@@ -98,11 +103,9 @@ public:
DECLARE_WRITE8_MEMBER ( ef9345_io_w );
DECLARE_READ8_MEMBER ( cassette_r );
DECLARE_WRITE8_MEMBER ( cassette_w );
- void init_vg5k();
TIMER_CALLBACK_MEMBER(z80_irq_clear);
TIMER_DEVICE_CALLBACK_MEMBER(z80_irq);
TIMER_DEVICE_CALLBACK_MEMBER(vg5k_scanline);
- void vg5k(machine_config &config);
void vg5k_io(address_map &map);
void vg5k_mem(address_map &map);
};
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index 008beb9f0d7..fb120e8c1c5 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -54,6 +54,9 @@ public:
m_exp_irq(CLEAR_LINE)
{ }
+ void vic10(machine_config &config);
+
+private:
required_device<m6510_device> m_maincpu;
required_device<mos6566_device> m_vic;
required_device<mos6581_device> m_sid;
@@ -98,7 +101,6 @@ public:
int m_cia_irq;
int m_vic_irq;
int m_exp_irq;
- void vic10(machine_config &config);
void vic10_mem(address_map &map);
void vic_colorram_map(address_map &map);
void vic_videoram_map(address_map &map);
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 2379e70d787..d8fca07908d 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -58,6 +58,11 @@ public:
m_lock(*this, "LOCK")
{ }
+ void ntsc(machine_config &config);
+ void pal(machine_config &config);
+ void vic20(machine_config &config);
+
+private:
required_device<m6502_device> m_maincpu;
required_device<via6522_device> m_via1;
required_device<via6522_device> m_via2;
@@ -146,9 +151,7 @@ public:
IO2 = 6,
IO3 = 7
};
- void ntsc(machine_config &config);
- void pal(machine_config &config);
- void vic20(machine_config &config);
+
void vic20_mem(address_map &map);
void vic_colorram_map(address_map &map);
void vic_videoram_map(address_map &map);
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index d08c4724f41..c048e2e2e21 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -97,6 +97,9 @@ public:
m_kbackctl(0)
{ }
+ void victor9k(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<ieee488_device> m_ieee488;
required_device<pic8259_device> m_pic;
@@ -169,7 +172,7 @@ public:
int m_kbackctl;
void update_kback();
- void victor9k(machine_config &config);
+
void victor9k_mem(address_map &map);
};
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 1745b74e1b1..d43c68ebf33 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -315,6 +315,14 @@ public:
, m_lamps(*this, "lamp%u", 0U)
{ }
+ void babypkr(machine_config &config);
+ void videodad(machine_config &config);
+ void videopkr(machine_config &config);
+ void fortune1(machine_config &config);
+ void blckjack(machine_config &config);
+ void bpoker(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(videopkr_io_r);
DECLARE_WRITE8_MEMBER(videopkr_io_w);
DECLARE_READ8_MEMBER(videopkr_p1_data_r);
@@ -339,12 +347,7 @@ public:
uint32_t screen_update_videopkr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(sound_t1_callback);
void count_7dig(unsigned long data, uint8_t index);
- void babypkr(machine_config &config);
- void videodad(machine_config &config);
- void videopkr(machine_config &config);
- void fortune1(machine_config &config);
- void blckjack(machine_config &config);
- void bpoker(machine_config &config);
+
void i8039_io_port(address_map &map);
void i8039_map(address_map &map);
void i8039_sound_mem(address_map &map);
@@ -354,7 +357,6 @@ public:
void i8751_io_port(address_map &map);
void i8751_map(address_map &map);
-protected:
virtual void machine_start() override;
virtual void video_start() override;
diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp
index f69b7682027..a51582c960b 100644
--- a/src/mame/drivers/vii.cpp
+++ b/src/mame/drivers/vii.cpp
@@ -114,6 +114,7 @@ class spg2xx_game_state : public driver_device
public:
spg2xx_game_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
+ m_bank(*this, "cart"),
m_maincpu(*this, "maincpu"),
m_p_ram(*this, "p_ram"),
m_p_rowscroll(*this, "p_rowscroll"),
@@ -121,10 +122,32 @@ public:
m_p_spriteram(*this, "p_spriteram"),
m_io_p1(*this, "P1"),
m_io_p2(*this, "P2"),
- m_io_p3(*this, "P3"),
- m_bank(*this, "cart")
+ m_io_p3(*this, "P3")
{ }
+ void spg2xx_base(machine_config &config);
+ void spg2xx_basep(machine_config &config);
+ void batman(machine_config &config);
+
+ void init_walle();
+ void init_batman();
+ void init_wirels60();
+ void init_rad_skat();
+ void init_rad_crik();
+
+protected:
+ void switch_bank(uint32_t bank);
+ uint32_t m_centered_coordinates; // this must be a vreg?
+ void test_centered(uint8_t *ROM);
+
+ virtual void machine_start() override;
+
+ typedef delegate<uint16_t(uint16_t, int)> vii_io_rw_delegate;
+ vii_io_rw_delegate m_vii_io_rw;
+
+ required_memory_bank m_bank;
+
+private:
DECLARE_READ16_MEMBER(video_r);
DECLARE_WRITE16_MEMBER(video_w);
DECLARE_READ16_MEMBER(audio_r);
@@ -133,12 +156,6 @@ public:
DECLARE_WRITE16_MEMBER(io_w);
DECLARE_READ16_MEMBER(rom_r);
- void init_walle();
- void init_batman();
- void init_wirels60();
- void init_rad_skat();
- void init_rad_crik();
-
uint32_t screen_update_vii(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vii_vblank);
@@ -146,23 +163,11 @@ public:
TIMER_CALLBACK_MEMBER(tmb1_tick);
TIMER_CALLBACK_MEMBER(tmb2_tick);
- void spg2xx_base(machine_config &config);
- void spg2xx_basep(machine_config &config);
- void batman(machine_config &config);
void vii_mem(address_map &map);
-protected:
- virtual void machine_start() override;
+
virtual void machine_reset() override;
virtual void video_start() override;
- void switch_bank(uint32_t bank);
- uint32_t m_centered_coordinates; // this must be a vreg?
- void test_centered(uint8_t *ROM);
-
- typedef delegate<uint16_t(uint16_t, int)> vii_io_rw_delegate;
- vii_io_rw_delegate m_vii_io_rw;
-private:
-
uint16_t do_spg240_rad_skat_io(uint16_t what, int index);
uint16_t do_spg243_batman_io(uint16_t what, int index);
uint16_t do_spg243_wireless60_io(uint16_t what, int index);
@@ -212,9 +217,6 @@ private:
// temp hack
DECLARE_READ16_MEMBER(rad_crik_hack_r);
-
-protected:
- required_memory_bank m_bank;
};
@@ -226,22 +228,21 @@ public:
m_cart(*this, "cartslot")
{ }
+ void vii(machine_config &config);
+ void vsmile(machine_config &config);
+
void init_vii();
void init_vsmile();
+private:
uint16_t do_spg243_vsmile_io(uint16_t what, int index);
uint16_t do_spg243_vii_io(uint16_t what, int index);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(vii_cart);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(vsmile_cart);
- void vii(machine_config &config);
- void vsmile(machine_config &config);
-
-protected:
virtual void machine_start() override;
-private:
optional_device<generic_slot_device> m_cart;
memory_region *m_cart_rom;
};
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index dad7aef6ae0..914b1f9546c 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -387,6 +387,15 @@ public:
{
}
+ void viper(machine_config &config);
+
+ void init_viper();
+ void init_vipercf();
+ void init_viperhd();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(ds2430_unk_r);
+
+private:
DECLARE_READ32_MEMBER(epic_r);
DECLARE_WRITE32_MEMBER(epic_w);
DECLARE_WRITE64_MEMBER(unk2_w);
@@ -417,25 +426,20 @@ public:
DECLARE_READ64_MEMBER(unk_serial_r);
DECLARE_WRITE64_MEMBER(unk_serial_w);
DECLARE_WRITE_LINE_MEMBER(voodoo_vblank);
- void init_viper();
- void init_vipercf();
- void init_viperhd();
+
uint32_t screen_update_viper(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(viper_vblank);
WRITE_LINE_MEMBER(voodoo_pciint);
- DECLARE_CUSTOM_INPUT_MEMBER(ds2430_unk_r);
//the following two arrays need to stay public til the legacy PCI bus is removed
uint32_t m_voodoo3_pci_reg[0x100];
uint32_t m_mpc8240_regs[256/4];
- void viper(machine_config &config);
void viper_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
TIMER_CALLBACK_MEMBER(epic_global_timer_callback);
TIMER_CALLBACK_MEMBER(ds2430_timer_callback);
diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp
index a36d12b9fdb..caa61fa09a7 100644
--- a/src/mame/drivers/vis.cpp
+++ b/src/mame/drivers/vis.cpp
@@ -18,6 +18,7 @@ class vis_audio_device : public device_t,
{
public:
vis_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
DECLARE_READ8_MEMBER(pcm_r);
DECLARE_WRITE8_MEMBER(pcm_w);
protected:
@@ -698,6 +699,12 @@ public:
m_pic2(*this, "mb:pic8259_slave"),
m_pad(*this, "PAD")
{ }
+
+ void vis(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(update);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<pic8259_device> m_pic1;
required_device<pic8259_device> m_pic2;
@@ -713,13 +720,11 @@ public:
DECLARE_WRITE16_MEMBER(pad_w);
DECLARE_READ8_MEMBER(unk1_r);
DECLARE_WRITE8_MEMBER(unk1_w);
- DECLARE_INPUT_CHANGED_MEMBER(update);
- void vis(machine_config &config);
void at16_io(address_map &map);
void at16_map(address_map &map);
-protected:
+
void machine_reset() override;
-private:
+
uint8_t m_sysctl;
uint8_t m_unkidx;
uint8_t m_unk[16];
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index 5c96f47e218..f5b0045f616 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -168,11 +168,6 @@ state machine and sees if the GO bit ever finishes and goes back to 0
class vk100_state : public driver_device
{
public:
- enum
- {
- TIMER_EXECUTE_VG
- };
-
vk100_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -188,6 +183,16 @@ public:
{
}
+ void vk100(machine_config &config);
+
+ void init_vk100();
+
+private:
+ enum
+ {
+ TIMER_EXECUTE_VG
+ };
+
required_device<cpu_device> m_maincpu;
required_device<mc6845_device> m_crtc;
required_device<beep_device> m_speaker;
@@ -241,7 +246,7 @@ public:
DECLARE_READ8_MEMBER(vk100_keyboard_column_r);
DECLARE_READ8_MEMBER(SYSTAT_A);
DECLARE_READ8_MEMBER(SYSTAT_B);
- void init_vk100();
+
virtual void machine_start() override;
virtual void video_start() override;
TIMER_CALLBACK_MEMBER(execute_vg);
@@ -254,10 +259,9 @@ public:
MC6845_UPDATE_ROW(crtc_update_row);
void vram_write(uint8_t data);
- void vk100(machine_config &config);
void vk100_io(address_map &map);
void vk100_mem(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index b31a3330d84..d4faed6ff54 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -168,6 +168,11 @@ public:
m_gfxdecode(*this, "gfxdecode")
{ }
+ void nevada(machine_config &config);
+
+ void init_nevada();
+
+private:
required_device_array<mc68681_device, 3> m_duart;
required_device<msm6242_device> m_rtc;
@@ -204,11 +209,9 @@ public:
DECLARE_WRITE16_MEMBER( vram_w );
DECLARE_MACHINE_START(nevada);
- void init_nevada();
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void nevada(machine_config &config);
void nevada_map(address_map &map);
};
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index f6eb5e142ee..b8eb8d2b0ee 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -89,6 +89,9 @@ public:
, m_ppi(*this, "ppi")
{ }
+ void votrpss(machine_config &config);
+
+private:
void kbd_put(u8 data);
DECLARE_READ8_MEMBER(ppi_pa_r);
DECLARE_READ8_MEMBER(ppi_pb_r);
@@ -100,10 +103,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_uart_clock);
IRQ_CALLBACK_MEMBER(irq_ack);
- void votrpss(machine_config &config);
void votrpss_io(address_map &map);
void votrpss_mem(address_map &map);
-private:
+
uint8_t m_term_data;
uint8_t m_porta;
uint8_t m_portb;
diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp
index 870860b1c8c..e44b71bec01 100644
--- a/src/mame/drivers/votrtnt.cpp
+++ b/src/mame/drivers/votrtnt.cpp
@@ -51,11 +51,13 @@ public:
, m_clock(*this, "acia_clock")
{ }
+ void votrtnt(machine_config &config);
+
+private:
DECLARE_MACHINE_RESET(votrtnt);
- void votrtnt(machine_config &config);
void _6802_mem(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<votrax_sc01_device> m_votrax;
required_device<clock_device> m_clock;
diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp
index 4afee96d8b8..94281c7b4d2 100644
--- a/src/mame/drivers/voyager.cpp
+++ b/src/mame/drivers/voyager.cpp
@@ -46,17 +46,21 @@ public:
{
}
+ void voyager(machine_config &config);
+
+ void init_voyager();
+
+private:
std::unique_ptr<uint32_t[]> m_bios_ram;
uint8_t m_mtxc_config_reg[256];
uint8_t m_piix4_config_reg[4][256];
uint32_t m_idle_skip_ram;
DECLARE_WRITE32_MEMBER(bios_ram_w);
- void init_voyager();
+
virtual void machine_start() override;
virtual void machine_reset() override;
void intel82439tx_init();
- void voyager(machine_config &config);
void voyager_io(address_map &map);
void voyager_map(address_map &map);
diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp
index 9eea9fcb08e..c52ff86695c 100644
--- a/src/mame/drivers/vp101.cpp
+++ b/src/mame/drivers/vp101.cpp
@@ -116,6 +116,10 @@ public:
m_in0(*this, "IN0")
{ }
+ void vp50(machine_config &config);
+ void vp101(machine_config &config);
+
+private:
virtual void machine_reset() override;
virtual void machine_start() override;
@@ -140,11 +144,8 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t vp50_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void vp50(machine_config &config);
- void vp101(machine_config &config);
void main_map(address_map &map);
void vp50_map(address_map &map);
-protected:
// devices
required_device<mips3_device> m_maincpu;
diff --git a/src/mame/drivers/vp122.cpp b/src/mame/drivers/vp122.cpp
index 614761c0718..f184fa3db72 100644
--- a/src/mame/drivers/vp122.cpp
+++ b/src/mame/drivers/vp122.cpp
@@ -25,13 +25,15 @@ public:
, m_p_chargen(*this, "chargen")
{ }
+ void vp122(machine_config &config);
+
+private:
SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
- void vp122(machine_config &config);
void io_map(address_map &map);
void mem_map(address_map &map);
void vram_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
required_region_ptr<u8> m_p_chargen;
diff --git a/src/mame/drivers/vp60.cpp b/src/mame/drivers/vp60.cpp
index 7a84342ca6e..754fc177999 100644
--- a/src/mame/drivers/vp60.cpp
+++ b/src/mame/drivers/vp60.cpp
@@ -23,13 +23,15 @@ public:
, m_p_chargen(*this, "chargen")
{ }
+ void vp60(machine_config &config);
+
+private:
u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void vp60(machine_config &config);
void io_map(address_map &map);
void kbd_map(address_map &map);
void mem_map(address_map &map);
-private:
+
required_device<cpu_device> m_maincpu;
required_region_ptr<u8> m_p_chargen;
};
diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp
index 2418b63aadd..b5ee89fdcc5 100644
--- a/src/mame/drivers/vpoker.cpp
+++ b/src/mame/drivers/vpoker.cpp
@@ -115,6 +115,9 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void vpoker(machine_config &config);
+
+private:
std::unique_ptr<uint8_t[]> m_videoram;
uint8_t m_blit_ram[8];
DECLARE_READ8_MEMBER(blitter_r);
@@ -125,7 +128,6 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void vpoker(machine_config &config);
void main_map(address_map &map);
};
diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp
index e529bf7fea5..b7272bfbc7b 100644
--- a/src/mame/drivers/vroulet.cpp
+++ b/src/mame/drivers/vroulet.cpp
@@ -59,6 +59,9 @@ public:
m_colorram(*this, "colorram"),
m_ball(*this, "ball") { }
+ void vroulet(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -82,7 +85,6 @@ public:
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void vroulet(machine_config &config);
void vroulet_io_map(address_map &map);
void vroulet_map(address_map &map);
};
diff --git a/src/mame/drivers/vsmilepro.cpp b/src/mame/drivers/vsmilepro.cpp
index 99eea10b734..60e2f628cfb 100644
--- a/src/mame/drivers/vsmilepro.cpp
+++ b/src/mame/drivers/vsmilepro.cpp
@@ -35,8 +35,10 @@ public:
{ }
void vsmilpro(machine_config &config);
- void vsmilpro_map(address_map &map);
+
private:
+ void vsmilpro_map(address_map &map);
+
required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index d9907fdfd8e..a037d29b416 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -75,6 +75,13 @@ public:
{
}
+ void vt100(machine_config &config);
+ void vt100ac(machine_config &config);
+ void vt101(machine_config &config);
+ void vt102(machine_config &config);
+ void vt180(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<vt100_video_device> m_crtc;
required_device<vt100_keyboard_device> m_keyboard;
@@ -97,11 +104,6 @@ public:
virtual void machine_reset() override;
uint32_t screen_update_vt100(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
IRQ_CALLBACK_MEMBER(vt102_irq_callback);
- void vt100(machine_config &config);
- void vt100ac(machine_config &config);
- void vt101(machine_config &config);
- void vt102(machine_config &config);
- void vt180(machine_config &config);
void vt100_mem(address_map &map);
void vt100_io(address_map &map);
void vt102_io(address_map &map);
diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp
index 5485dfed592..4c4608b2ae7 100644
--- a/src/mame/drivers/vt220.cpp
+++ b/src/mame/drivers/vt220.cpp
@@ -50,13 +50,15 @@ public:
m_maincpu(*this, "maincpu"),
m_ram(*this, RAM_TAG) { }
+ void vt220(machine_config &config);
+ void vt220a(machine_config &config);
+
+private:
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_vt220(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
- void vt220(machine_config &config);
- void vt220a(machine_config &config);
void vt220_io(address_map &map);
void vt220_mem(address_map &map);
void vt220a_io(address_map &map);
diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp
index 95487d32619..23f43a804f5 100644
--- a/src/mame/drivers/vt240.cpp
+++ b/src/mame/drivers/vt240.cpp
@@ -55,6 +55,10 @@ public:
{
}
+ void mc7105(machine_config &config);
+ void vt240(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_i8085;
required_device<i8251_device> m_i8251;
@@ -123,8 +127,7 @@ public:
uint16_t m_irqs;
bool m_lb;
uint16_t m_scrl;
- void mc7105(machine_config &config);
- void vt240(machine_config &config);
+
void bank_map(address_map &map);
void upd7220_map(address_map &map);
void vt240_char_io(address_map &map);
diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp
index 7bbb890fffc..5f7f775256f 100644
--- a/src/mame/drivers/vt320.cpp
+++ b/src/mame/drivers/vt320.cpp
@@ -25,12 +25,14 @@ public:
{
}
+ void vt320(machine_config &config);
+
+private:
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_vt320(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
- void vt320(machine_config &config);
void vt320_io(address_map &map);
void vt320_mem(address_map &map);
};
diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp
index eb27b62cda6..1f48f6ae4e8 100644
--- a/src/mame/drivers/vt520.cpp
+++ b/src/mame/drivers/vt520.cpp
@@ -24,14 +24,16 @@ public:
m_maincpu(*this, "maincpu"),
m_rom(*this, "maincpu") { }
+ void vt520(machine_config &config);
+ void vt420(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(vt520_some_r);
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_vt520(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
required_device<cpu_device> m_maincpu;
required_region_ptr<uint8_t> m_rom;
- void vt520(machine_config &config);
- void vt420(machine_config &config);
void vt520_io(address_map &map);
void vt520_mem(address_map &map);
};
diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp
index c0b464fa213..445b4626ae9 100644
--- a/src/mame/drivers/vtech1.cpp
+++ b/src/mame/drivers/vtech1.cpp
@@ -77,9 +77,16 @@ public:
{
}
+ void laser310(machine_config &config);
+ void laser200(machine_config &config);
+ void laser310h(machine_config &config);
+ void laser110(machine_config &config);
+ void laser210(machine_config &config);
+
void init_vtech1();
void init_vtech1h();
+private:
DECLARE_READ8_MEMBER(vtech1_lightpen_r);
DECLARE_READ8_MEMBER(vtech1_keyboard_r);
DECLARE_WRITE8_MEMBER(vtech1_latch_w);
@@ -89,17 +96,12 @@ public:
DECLARE_SNAPSHOT_LOAD_MEMBER( vtech1 );
- void laser310(machine_config &config);
- void laser200(machine_config &config);
- void laser310h(machine_config &config);
- void laser110(machine_config &config);
- void laser210(machine_config &config);
void laser110_mem(address_map &map);
void laser210_mem(address_map &map);
void laser310_mem(address_map &map);
void vtech1_io(address_map &map);
void vtech1_shrg_io(address_map &map);
-private:
+
static const uint8_t VZ_BASIC = 0xf0;
static const uint8_t VZ_MCODE = 0xf1;
diff --git a/src/mame/drivers/vtech_eu3a12.cpp b/src/mame/drivers/vtech_eu3a12.cpp
index e876694500e..d398bb6747a 100644
--- a/src/mame/drivers/vtech_eu3a12.cpp
+++ b/src/mame/drivers/vtech_eu3a12.cpp
@@ -13,8 +13,10 @@ public:
: driver_device(mconfig, type, tag)
{ }
- virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void vreadere(machine_config &config);
+
+private:
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
};
uint32_t vreadere_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/vtech_unk1.cpp b/src/mame/drivers/vtech_unk1.cpp
index d865a0adac3..3e317da3cd5 100644
--- a/src/mame/drivers/vtech_unk1.cpp
+++ b/src/mame/drivers/vtech_unk1.cpp
@@ -52,8 +52,10 @@ public:
: driver_device(mconfig, type, tag)
{ }
- virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void gl8008cx(machine_config &config);
+
+private:
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
};
uint32_t gl8008cx_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/vtech_unk2.cpp b/src/mame/drivers/vtech_unk2.cpp
index cc4e332ecb2..8178e02b5cb 100644
--- a/src/mame/drivers/vtech_unk2.cpp
+++ b/src/mame/drivers/vtech_unk2.cpp
@@ -13,8 +13,10 @@ public:
: driver_device(mconfig, type, tag)
{ }
- virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void glmmc(machine_config &config);
+
+private:
+ virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
};
uint32_t glmmc_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/includes/s11.h b/src/mame/includes/s11.h
index 9c73da17393..4e92c7d9868 100644
--- a/src/mame/includes/s11.h
+++ b/src/mame/includes/s11.h
@@ -48,6 +48,13 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void s11(machine_config &config);
+
+ void init_s11();
+
+ DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
DECLARE_READ8_MEMBER(sound_r);
DECLARE_WRITE8_MEMBER(bank_w);
DECLARE_WRITE8_MEMBER(dig0_w);
@@ -57,6 +64,7 @@ public:
DECLARE_WRITE8_MEMBER(sol2_w) { }; // solenoids 8-15
DECLARE_WRITE8_MEMBER(sol3_w); // solenoids 0-7
DECLARE_WRITE8_MEMBER(sound_w);
+
DECLARE_WRITE8_MEMBER(pia2c_pa_w);
DECLARE_WRITE8_MEMBER(pia2c_pb_w);
DECLARE_WRITE8_MEMBER(pia34_pa_w);
@@ -64,9 +72,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia34_cb2_w);
DECLARE_WRITE8_MEMBER(pia40_pb_w);
DECLARE_WRITE_LINE_MEMBER(pia40_cb2_w);
- DECLARE_READ8_MEMBER(switch_r);
- DECLARE_WRITE8_MEMBER(switch_w);
- DECLARE_READ8_MEMBER(pia28_w7_r);
+
DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
@@ -77,15 +83,17 @@ public:
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; // dummy to stop error log filling up
DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w);
DECLARE_WRITE_LINE_MEMBER(pia_irq);
- DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+ DECLARE_READ8_MEMBER(switch_r);
+ DECLARE_WRITE8_MEMBER(switch_w);
+ DECLARE_READ8_MEMBER(pia28_w7_r);
+
+protected:
DECLARE_MACHINE_RESET(s11);
- void init_s11();
- void s11(machine_config &config);
void s11_audio_map(address_map &map);
void s11_bg_map(address_map &map);
void s11_main_map(address_map &map);
-protected:
+
// devices
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
@@ -114,10 +122,12 @@ protected:
void set_segment2(uint32_t s) { m_segment2 = s; }
void set_timer(emu_timer* t) { m_irq_timer = t; }
- virtual void machine_start() override { m_digits.resolve(); }
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
static const device_timer_id TIMER_IRQ = 0;
+
private:
+ virtual void machine_start() override { m_digits.resolve(); }
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_kbdrow;
diff --git a/src/mame/includes/s11a.h b/src/mame/includes/s11a.h
index 3220a2d0f17..e47e37c8e07 100644
--- a/src/mame/includes/s11a.h
+++ b/src/mame/includes/s11a.h
@@ -18,19 +18,19 @@ public:
: s11_state(mconfig, type, tag)
{ }
+ void s11a(machine_config &config);
+
+ void init_s11a();
+
DECLARE_WRITE8_MEMBER(bgbank_w);
DECLARE_WRITE8_MEMBER(dig0_w);
+
+private:
DECLARE_MACHINE_RESET(s11a);
- void init_s11a();
- void s11a(machine_config &config);
void s11a_audio_map(address_map &map);
void s11a_bg_map(address_map &map);
void s11a_main_map(address_map &map);
-protected:
-
-private:
-
};
#endif // MAME_INCLUDES_S11A_H
diff --git a/src/mame/includes/s11b.h b/src/mame/includes/s11b.h
index 1ede5d1d446..4eed61422ad 100644
--- a/src/mame/includes/s11b.h
+++ b/src/mame/includes/s11b.h
@@ -19,6 +19,11 @@ public:
, m_bg_hc55516(*this, "hc55516_bg")
{ }
+ void s11b(machine_config &config);
+
+ void init_s11b();
+ void init_s11b_invert();
+
DECLARE_WRITE8_MEMBER(dig1_w);
DECLARE_WRITE8_MEMBER(pia2c_pa_w);
DECLARE_WRITE8_MEMBER(pia2c_pb_w);
@@ -27,23 +32,20 @@ public:
DECLARE_WRITE8_MEMBER(bg_speech_clock_w);
DECLARE_WRITE8_MEMBER(bg_speech_digit_w);
+protected:
+ void set_invert(bool inv) { m_invert = inv; }
+
+private:
DECLARE_MACHINE_RESET(s11b);
- void init_s11b();
- void init_s11b_invert();
- void s11b(machine_config &config);
void s11b_audio_map(address_map &map);
void s11b_bg_map(address_map &map);
void s11b_main_map(address_map &map);
-protected:
+
optional_device<hc55516_device> m_bg_hc55516;
- void set_invert(bool inv) { m_invert = inv; }
-private:
bool m_invert; // later System 11B games start expecting inverted data to the display LED segments.
-
-
};
#endif // MAME_INCLUDES_S11B_H
diff --git a/src/mame/includes/s11c.h b/src/mame/includes/s11c.h
index 5052ebbfcef..539c01947fb 100644
--- a/src/mame/includes/s11c.h
+++ b/src/mame/includes/s11c.h
@@ -18,18 +18,16 @@ public:
: s11b_state(mconfig, type, tag)
{ }
- DECLARE_MACHINE_RESET(s11c);
+ void s11c(machine_config &config);
+
void init_s11c();
- void s11c(machine_config &config);
+private:
+ DECLARE_MACHINE_RESET(s11c);
+
void s11c_main_map(address_map &map);
void s11c_audio_map(address_map &map);
void s11c_bg_map(address_map &map);
-protected:
-
-private:
-
-
};
diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h
index 5542a6716ec..ff0259dc7df 100644
--- a/src/mame/includes/sage2.h
+++ b/src/mame/includes/sage2.h
@@ -47,6 +47,11 @@ public:
, m_led(*this, "led0")
{ }
+ void sage2(machine_config &config);
+
+ void init_sage2();
+
+private:
void update_fdc_int();
DECLARE_READ16_MEMBER(rom_r);
@@ -63,11 +68,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(write_centronics_perror);
DECLARE_WRITE_LINE_MEMBER(write_centronics_select);
DECLARE_WRITE_LINE_MEMBER(write_centronics_fault);
- void sage2(machine_config &config);
+
void sage2_mem(address_map &map);
- void init_sage2();
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h
index 1490f3c33af..076dbffa3ee 100644
--- a/src/mame/includes/samcoupe.h
+++ b/src/mame/includes/samcoupe.h
@@ -45,13 +45,6 @@
class samcoupe_state : public driver_device
{
public:
- enum
- {
- TIMER_IRQ_OFF,
- TIMER_MOUSE_RESET,
- TIMER_VIDEO_UPDATE
- };
-
samcoupe_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -90,6 +83,16 @@ public:
sam_bank_write_ptr[3] = nullptr;
}
+ void samcoupe(machine_config &config);
+
+private:
+ enum
+ {
+ TIMER_IRQ_OFF,
+ TIMER_MOUSE_RESET,
+ TIMER_VIDEO_UPDATE
+ };
+
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -200,10 +203,10 @@ public:
int m_lpt1_busy;
int m_lpt2_busy;
- void samcoupe(machine_config &config);
+
void samcoupe_io(address_map &map);
void samcoupe_mem(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h
index 716da438d50..0d5644f6419 100644
--- a/src/mame/includes/saturn.h
+++ b/src/mame/includes/saturn.h
@@ -48,6 +48,20 @@ public:
{
}
+ DECLARE_WRITE8_MEMBER(scsp_irq);
+
+ // SMPC HLE delegates
+ DECLARE_WRITE_LINE_MEMBER(master_sh2_reset_w);
+ DECLARE_WRITE_LINE_MEMBER(master_sh2_nmi_w);
+ DECLARE_WRITE_LINE_MEMBER(slave_sh2_reset_w);
+ DECLARE_WRITE_LINE_MEMBER(sound_68k_reset_w);
+ DECLARE_WRITE_LINE_MEMBER(system_reset_w);
+ DECLARE_WRITE_LINE_MEMBER(system_halt_w);
+ DECLARE_WRITE_LINE_MEMBER(dot_select_w);
+
+ DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback);
+
+protected:
required_region_ptr<uint32_t> m_rom;
required_shared_ptr<uint32_t> m_workram_l;
required_shared_ptr<uint32_t> m_workram_h;
@@ -133,7 +147,7 @@ public:
DECLARE_WRITE32_MEMBER(saturn_sinit_w);
DECLARE_READ8_MEMBER(saturn_backupram_r);
DECLARE_WRITE8_MEMBER(saturn_backupram_w);
- DECLARE_WRITE8_MEMBER(scsp_irq);
+
int m_scsp_last_line;
DECLARE_READ16_MEMBER ( saturn_vdp1_regs_r );
@@ -424,22 +438,10 @@ public:
} stv_rbg_cache_data;
- DECLARE_WRITE_LINE_MEMBER(m68k_reset_callback);
-
// DECLARE_WRITE_LINE_MEMBER(scudsp_end_w);
// DECLARE_READ16_MEMBER(scudsp_dma_r);
// DECLARE_WRITE16_MEMBER(scudsp_dma_w);
- // SMPC HLE delegates
- DECLARE_WRITE_LINE_MEMBER(master_sh2_reset_w);
- DECLARE_WRITE_LINE_MEMBER(master_sh2_nmi_w);
- DECLARE_WRITE_LINE_MEMBER(slave_sh2_reset_w);
- DECLARE_WRITE_LINE_MEMBER(sound_68k_reset_w);
- DECLARE_WRITE_LINE_MEMBER(system_reset_w);
- DECLARE_WRITE_LINE_MEMBER(system_halt_w);
- DECLARE_WRITE_LINE_MEMBER(dot_select_w);
-
-
// void debug_scudma_command(int ref, const std::vector<std::string> &params);
// void debug_scuirq_command(int ref, const std::vector<std::string> &params);
// void debug_help_command(int ref, const std::vector<std::string> &params);
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index 00de48f5b9d..4e3f34df336 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -21,6 +21,14 @@ public:
m_videoram2(*this, "videoram2"),
m_colorram2(*this, "colorram2") { }
+ void trckydoc(machine_config &config);
+ void tecfri(machine_config &config);
+ void sauro(machine_config &config);
+ void saurob(machine_config &config);
+
+ void init_tecfri();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -64,7 +72,6 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_bg);
TILE_GET_INFO_MEMBER(get_tile_info_fg);
- void init_tecfri();
DECLARE_VIDEO_START(trckydoc);
DECLARE_VIDEO_START(sauro);
@@ -72,10 +79,7 @@ public:
uint32_t screen_update_sauro(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void sauro_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void trckydoc_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void trckydoc(machine_config &config);
- void tecfri(machine_config &config);
- void sauro(machine_config &config);
- void saurob(machine_config &config);
+
void sauro_io_map(address_map &map);
void sauro_map(address_map &map);
void sauro_sound_map(address_map &map);
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index e39bc740b4b..0780c076d95 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -34,6 +34,12 @@ public:
m_palette(*this, "palette")
{ }
+ void sbasketb(machine_config &config);
+ void sbasketbu(machine_config &config);
+
+ void init_sbasketb();
+
+private:
/* memory pointers */
required_shared_ptr<uint8_t> m_colorram;
required_shared_ptr<uint8_t> m_videoram;
@@ -65,7 +71,6 @@ public:
DECLARE_WRITE8_MEMBER(sbasketb_colorram_w);
DECLARE_WRITE_LINE_MEMBER(flipscreen_w);
DECLARE_WRITE_LINE_MEMBER(spriteram_select_w);
- void init_sbasketb();
uint8_t m_SN76496_latch;
DECLARE_WRITE8_MEMBER( konami_SN76496_latch_w ) { m_SN76496_latch = data; };
@@ -76,8 +81,7 @@ public:
uint32_t screen_update_sbasketb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
- void sbasketb(machine_config &config);
- void sbasketbu(machine_config &config);
+
void sbasketb_map(address_map &map);
void sbasketb_sound_map(address_map &map);
};
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index ec4cd6d0290..20a717ded99 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -13,6 +13,9 @@ public:
m_videoram_attr(*this, "videoram_attr"),
m_videoram(*this, "videoram") { }
+ void sbugger(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -30,7 +33,6 @@ public:
DECLARE_PALETTE_INIT(sbugger);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sbugger(machine_config &config);
void sbugger_io_map(address_map &map);
void sbugger_map(address_map &map);
};
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index 2d40e6cea98..8e88291856f 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -18,6 +18,14 @@ public:
m_lamps(*this, "lamp%u", 1U)
{ }
+ void spacewin(machine_config &config);
+ void sderbya(machine_config &config);
+ void pmroulet(machine_config &config);
+ void shinygld(machine_config &config);
+ void sderby(machine_config &config);
+ void luckboom(machine_config &config);
+
+private:
DECLARE_READ16_MEMBER(sderby_input_r);
DECLARE_READ16_MEMBER(sderbya_input_r);
DECLARE_READ16_MEMBER(roulette_input_r);
@@ -36,12 +44,6 @@ public:
uint32_t screen_update_sderby(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_pmroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect,int codeshift);
- void spacewin(machine_config &config);
- void sderbya(machine_config &config);
- void pmroulet(machine_config &config);
- void shinygld(machine_config &config);
- void sderby(machine_config &config);
- void luckboom(machine_config &config);
void luckboom_map(address_map &map);
void roulette_map(address_map &map);
void sderby_map(address_map &map);
@@ -49,7 +51,6 @@ public:
void shinygld_map(address_map &map);
void spacewin_map(address_map &map);
-protected:
virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index c20adbc5c98..550c4b2cc1c 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -25,11 +25,6 @@ class sega005_sound_device;
class segag80r_state : public segag80snd_common
{
public:
- enum
- {
- TIMER_VBLANK_LATCH_CLEAR
- };
-
segag80r_state(const machine_config &mconfig, device_type type, const char *tag)
: segag80snd_common(mconfig, type, tag),
m_mainram(*this, "mainram"),
@@ -49,6 +44,43 @@ public:
m_ppi(*this, "ppi8255"),
m_decrypted_opcodes(*this, "decrypted_opcodes") { }
+ void g80r_base(machine_config &config);
+ void monsterb(machine_config &config);
+ void sindbadm(machine_config &config);
+ void astrob(machine_config &config);
+ void pignewt(machine_config &config);
+ void monster2(machine_config &config);
+ void sega005(machine_config &config);
+ void spaceod(machine_config &config);
+ void astrob_sound_board(machine_config &config);
+ void sega005_sound_board(machine_config &config);
+ void spaceod_sound_board(machine_config &config);
+ void monsterb_sound_board(machine_config &config);
+
+ void init_spaceod();
+ void init_sindbadm();
+ void init_pignewt();
+ void init_monsterb();
+ void init_005();
+ void init_monster2();
+ void init_astrob();
+
+ DECLARE_INPUT_CHANGED_MEMBER(service_switch);
+
+ uint8_t m_sound_state[2];
+ uint8_t m_sound_rate;
+ uint16_t m_sound_addr;
+ uint8_t m_sound_data;
+ uint8_t m_square_state;
+ uint8_t m_square_count;
+ inline void sega005_update_sound_data();
+
+private:
+ enum
+ {
+ TIMER_VBLANK_LATCH_CLEAR
+ };
+
required_shared_ptr<uint8_t> m_mainram;
required_shared_ptr<uint8_t> m_videoram;
@@ -71,12 +103,6 @@ public:
offs_t m_scrambled_write_pc;
- uint8_t m_sound_state[2];
- uint8_t m_sound_rate;
- uint16_t m_sound_addr;
- uint8_t m_sound_data;
- uint8_t m_square_state;
- uint8_t m_square_count;
segag80_decrypt_func m_decrypt;
uint8_t m_background_pcb;
double m_rweights[3];
@@ -123,19 +149,13 @@ public:
DECLARE_WRITE8_MEMBER(sindbadm_back_port_w);
DECLARE_WRITE8_MEMBER(astrob_sound_w);
DECLARE_WRITE8_MEMBER(spaceod_sound_w);
- DECLARE_INPUT_CHANGED_MEMBER(service_switch);
+
DECLARE_WRITE8_MEMBER(usb_ram_w);
DECLARE_READ8_MEMBER(sindbadm_sound_data_r);
DECLARE_WRITE8_MEMBER(sindbadm_misc_w);
DECLARE_WRITE8_MEMBER(sindbadm_sn1_SN76496_w);
DECLARE_WRITE8_MEMBER(sindbadm_sn2_SN76496_w);
- void init_spaceod();
- void init_sindbadm();
- void init_pignewt();
- void init_monsterb();
- void init_005();
- void init_monster2();
- void init_astrob();
+
TILE_GET_INFO_MEMBER(spaceod_get_tile_info);
TILEMAP_MAPPER_MEMBER(spaceod_scan_rows);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
@@ -147,7 +167,7 @@ public:
INTERRUPT_GEN_MEMBER(sindbadm_vblank_start);
DECLARE_WRITE8_MEMBER(sega005_sound_a_w);
DECLARE_WRITE8_MEMBER(sega005_sound_b_w);
- inline void sega005_update_sound_data();
+
void vblank_latch_set();
void g80_set_palette_entry(int entry, uint8_t data);
void spaceod_bg_init_palette();
@@ -159,18 +179,6 @@ public:
inline uint8_t demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2, uint8_t d1d0);
void monsterb_expand_gfx(const char *region);
- void g80r_base(machine_config &config);
- void monsterb(machine_config &config);
- void sindbadm(machine_config &config);
- void astrob(machine_config &config);
- void pignewt(machine_config &config);
- void monster2(machine_config &config);
- void sega005(machine_config &config);
- void spaceod(machine_config &config);
- void astrob_sound_board(machine_config &config);
- void sega005_sound_board(machine_config &config);
- void spaceod_sound_board(machine_config &config);
- void monsterb_sound_board(machine_config &config);
void g80r_opcodes_map(address_map &map);
void main_map(address_map &map);
void main_portmap(address_map &map);
@@ -178,7 +186,7 @@ public:
void sega_315_opcodes_map(address_map &map);
void sindbadm_portmap(address_map &map);
void sindbadm_sound_map(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
emu_timer *m_vblank_latch_clear_timer;
};
diff --git a/src/mame/includes/segag80v.h b/src/mame/includes/segag80v.h
index 377d5b4263d..1e52864da60 100644
--- a/src/mame/includes/segag80v.h
+++ b/src/mame/includes/segag80v.h
@@ -29,6 +29,24 @@ public:
m_vector(*this, "vector"),
m_screen(*this, "screen"){ }
+ void g80v_base(machine_config &config);
+ void tacscan(machine_config &config);
+ void elim2(machine_config &config);
+ void startrek(machine_config &config);
+ void zektor(machine_config &config);
+ void spacfury(machine_config &config);
+
+ void init_zektor();
+ void init_startrek();
+ void init_elim4();
+ void init_elim2();
+ void init_tacscan();
+ void init_spacfury();
+
+ DECLARE_INPUT_CHANGED_MEMBER(service_switch);
+ DECLARE_CUSTOM_INPUT_MEMBER(elim4_joint_coin_r);
+
+private:
required_shared_ptr<uint8_t> m_mainram;
required_shared_ptr<uint8_t> m_vectorram;
@@ -61,21 +79,16 @@ public:
DECLARE_READ8_MEMBER(multiply_r);
DECLARE_WRITE8_MEMBER(coin_count_w);
DECLARE_WRITE8_MEMBER(unknown_w);
- DECLARE_CUSTOM_INPUT_MEMBER(elim4_joint_coin_r);
+
DECLARE_WRITE8_MEMBER(elim1_sh_w);
DECLARE_WRITE8_MEMBER(elim2_sh_w);
DECLARE_WRITE8_MEMBER(zektor1_sh_w);
DECLARE_WRITE8_MEMBER(zektor2_sh_w);
DECLARE_WRITE8_MEMBER(spacfury1_sh_w);
DECLARE_WRITE8_MEMBER(spacfury2_sh_w);
- DECLARE_INPUT_CHANGED_MEMBER(service_switch);
+
DECLARE_WRITE8_MEMBER(usb_ram_w);
- void init_zektor();
- void init_startrek();
- void init_elim4();
- void init_elim2();
- void init_tacscan();
- void init_spacfury();
+
virtual void machine_start() override;
virtual void video_start() override;
uint32_t screen_update_segag80v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -83,12 +96,7 @@ public:
void sega_generate_vector_list();
offs_t decrypt_offset(address_space &space, offs_t offset);
inline uint8_t demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2, uint8_t d1d0);
- void g80v_base(machine_config &config);
- void tacscan(machine_config &config);
- void elim2(machine_config &config);
- void startrek(machine_config &config);
- void zektor(machine_config &config);
- void spacfury(machine_config &config);
+
void main_map(address_map &map);
void opcodes_map(address_map &map);
void main_portmap(address_map &map);
diff --git a/src/mame/includes/segahang.h b/src/mame/includes/segahang.h
index fb5e217b690..8c47ddccb1b 100644
--- a/src/mame/includes/segahang.h
+++ b/src/mame/includes/segahang.h
@@ -43,6 +43,33 @@ public:
, m_lamps(*this, "lamp%u", 0U)
{ }
+ void sound_board_2203(machine_config &config);
+ void sound_board_2203x2(machine_config &config);
+ void sound_board_2151(machine_config &config);
+ void shared_base(machine_config &config);
+ void hangon_base(machine_config &config);
+ void sharrier_base(machine_config &config);
+ void enduror_base(machine_config &config);
+ void endurord_base(machine_config &config);
+ void endurob2(machine_config &config);
+ void shangupb(machine_config &config);
+ void enduror(machine_config &config);
+ void shangonro(machine_config &config);
+ void enduror1d(machine_config &config);
+ void endurord(machine_config &config);
+ void sharrier(machine_config &config);
+ void endurobl(machine_config &config);
+ void enduror1(machine_config &config);
+ void hangon(machine_config &config);
+
+ // game-specific driver init
+ void init_generic();
+ void init_sharrier();
+ void init_enduror();
+ void init_endurobl();
+ void init_endurob2();
+
+private:
// PPI read/write callbacks
DECLARE_WRITE8_MEMBER( video_lamps_w );
DECLARE_WRITE8_MEMBER( tilemap_sound_w );
@@ -61,34 +88,9 @@ public:
// I8751-related VBLANK interrupt handlers
INTERRUPT_GEN_MEMBER( i8751_main_cpu_vblank );
- // game-specific driver init
- void init_generic();
- void init_sharrier();
- void init_enduror();
- void init_endurobl();
- void init_endurob2();
-
// video updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sound_board_2203(machine_config &config);
- void sound_board_2203x2(machine_config &config);
- void sound_board_2151(machine_config &config);
- void shared_base(machine_config &config);
- void hangon_base(machine_config &config);
- void sharrier_base(machine_config &config);
- void enduror_base(machine_config &config);
- void endurord_base(machine_config &config);
- void endurob2(machine_config &config);
- void shangupb(machine_config &config);
- void enduror(machine_config &config);
- void shangonro(machine_config &config);
- void enduror1d(machine_config &config);
- void endurord(machine_config &config);
- void sharrier(machine_config &config);
- void endurobl(machine_config &config);
- void enduror1(machine_config &config);
- void hangon(machine_config &config);
void decrypted_opcodes_map(address_map &map);
void fd1094_decrypted_opcodes_map(address_map &map);
void hangon_map(address_map &map);
@@ -100,7 +102,7 @@ public:
void sound_portmap_2203(address_map &map);
void sound_portmap_2203x2(address_map &map);
void sub_map(address_map &map);
-protected:
+
// internal types
typedef delegate<void ()> i8751_sim_delegate;
diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h
index c9d748429eb..22e32629ecd 100644
--- a/src/mame/includes/segaorun.h
+++ b/src/mame/includes/segaorun.h
@@ -50,6 +50,23 @@ public:
m_bankmotor_delta(0)
{ }
+ void shangon_fd1089b(machine_config &config);
+ void outrun_fd1094(machine_config &config);
+ void outrundx(machine_config &config);
+ void shangon(machine_config &config);
+ void outrun_fd1089a(machine_config &config);
+ void outrun(machine_config &config);
+ void outrun_base(machine_config &config);
+
+ // game-specific driver init
+ void init_generic();
+ void init_outrun();
+ void init_outrunb();
+ void init_shangon();
+
+ CUSTOM_INPUT_MEMBER( bankmotor_pos_r );
+
+private:
// PPI read/write handlers
DECLARE_READ8_MEMBER( unknown_porta_r );
DECLARE_READ8_MEMBER( unknown_portb_r );
@@ -68,12 +85,6 @@ public:
DECLARE_WRITE16_MEMBER( misc_io_w );
DECLARE_WRITE16_MEMBER( nop_w );
- // game-specific driver init
- void init_generic();
- void init_outrun();
- void init_outrunb();
- void init_shangon();
-
// video updates
uint32_t screen_update_outrun(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_shangon(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -83,22 +94,14 @@ public:
DECLARE_READ16_MEMBER( sega_road_control_0_r ) { return m_segaic16road->segaic16_road_control_0_r(space,offset,mem_mask); };
DECLARE_WRITE16_MEMBER( sega_road_control_0_w ) { m_segaic16road->segaic16_road_control_0_w(space,offset,data,mem_mask); };
- CUSTOM_INPUT_MEMBER( bankmotor_pos_r );
TIMER_DEVICE_CALLBACK_MEMBER(bankmotor_update);
- void shangon_fd1089b(machine_config &config);
- void outrun_fd1094(machine_config &config);
- void outrundx(machine_config &config);
- void shangon(machine_config &config);
- void outrun_fd1089a(machine_config &config);
- void outrun(machine_config &config);
- void outrun_base(machine_config &config);
void decrypted_opcodes_map(address_map &map);
void outrun_map(address_map &map);
void sound_map(address_map &map);
void sound_portmap(address_map &map);
void sub_map(address_map &map);
-protected:
+
// timer IDs
enum
{
diff --git a/src/mame/includes/segas16a.h b/src/mame/includes/segas16a.h
index 857b785e827..90804513a4b 100644
--- a/src/mame/includes/segas16a.h
+++ b/src/mame/includes/segas16a.h
@@ -57,6 +57,30 @@ public:
, m_lamps(*this, "lamp%u", 0U)
{ }
+ void system16a_no7751(machine_config &config);
+ void system16a(machine_config &config);
+ void system16a_fd1089a_no7751(machine_config &config);
+ void system16a_fd1089b_no7751(machine_config &config);
+ void system16a_fd1089a(machine_config &config);
+ void system16a_fd1094(machine_config &config);
+ void system16a_no7751p(machine_config &config);
+ void system16a_fd1094_no7751(machine_config &config);
+ void system16a_i8751(machine_config &config);
+ void system16a_fd1089b(machine_config &config);
+ void aceattaca_fd1094(machine_config &config);
+
+ // game-specific driver init
+ void init_generic();
+ void init_dumpmtmt();
+ void init_quartet();
+ void init_fantzonep();
+ void init_sjryukoa();
+ void init_aceattaca();
+ void init_passsht16a();
+ void init_mjleague();
+ void init_sdi();
+
+private:
// PPI read/write callbacks
DECLARE_WRITE8_MEMBER( misc_control_w );
DECLARE_WRITE8_MEMBER( tilemap_sound_w );
@@ -86,31 +110,9 @@ public:
// I8751-related VBLANK interrupt handlers
DECLARE_WRITE_LINE_MEMBER(i8751_main_cpu_vblank_w);
- // game-specific driver init
- void init_generic();
- void init_dumpmtmt();
- void init_quartet();
- void init_fantzonep();
- void init_sjryukoa();
- void init_aceattaca();
- void init_passsht16a();
- void init_mjleague();
- void init_sdi();
-
// video updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void system16a_no7751(machine_config &config);
- void system16a(machine_config &config);
- void system16a_fd1089a_no7751(machine_config &config);
- void system16a_fd1089b_no7751(machine_config &config);
- void system16a_fd1089a(machine_config &config);
- void system16a_fd1094(machine_config &config);
- void system16a_no7751p(machine_config &config);
- void system16a_fd1094_no7751(machine_config &config);
- void system16a_i8751(machine_config &config);
- void system16a_fd1089b(machine_config &config);
- void aceattaca_fd1094(machine_config &config);
void decrypted_opcodes_map(address_map &map);
void mcu_io_map(address_map &map);
void sound_decrypted_opcodes_map(address_map &map);
@@ -118,7 +120,7 @@ public:
void sound_no7751_portmap(address_map &map);
void sound_portmap(address_map &map);
void system16a_map(address_map &map);
-protected:
+
// internal types
typedef delegate<void ()> i8751_sim_delegate;
typedef delegate<void (uint8_t, uint8_t)> lamp_changed_delegate;
@@ -201,7 +203,7 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(afighter_handl_left_r);
DECLARE_CUSTOM_INPUT_MEMBER(afighter_handl_right_r);
-protected:
+private:
required_ioport m_accel;
required_ioport m_steer;
};
diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h
index f11f1f995d7..f7fca6b1564 100644
--- a/src/mame/includes/segas16b.h
+++ b/src/mame/includes/segas16b.h
@@ -68,31 +68,23 @@ public:
, m_lamps(*this, "lamp%u", 0U)
{ }
- // memory mapping
- void memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t index);
-
- // main CPU read/write handlers
- DECLARE_WRITE16_MEMBER( rom_5704_bank_w );
- DECLARE_READ16_MEMBER( rom_5797_bank_math_r );
- DECLARE_WRITE16_MEMBER( rom_5797_bank_math_w );
- DECLARE_READ16_MEMBER( unknown_rgn2_r );
- DECLARE_WRITE16_MEMBER( unknown_rgn2_w );
- DECLARE_READ16_MEMBER( standard_io_r );
- DECLARE_WRITE16_MEMBER( standard_io_w );
- DECLARE_WRITE16_MEMBER( atomicp_sound_w );
-
- DECLARE_READ16_MEMBER( bootleg_custom_io_r );
- DECLARE_WRITE16_MEMBER( bootleg_custom_io_w );
-
- // sound CPU read/write handlers
- DECLARE_WRITE8_MEMBER( upd7759_control_w );
- DECLARE_READ8_MEMBER( upd7759_status_r );
- DECLARE_WRITE16_MEMBER( sound_w16 );
-
- // other callbacks
- DECLARE_WRITE_LINE_MEMBER(upd7759_generate_nmi);
- INTERRUPT_GEN_MEMBER( i8751_main_cpu_vblank );
- DECLARE_WRITE8_MEMBER(spin_68k_w);
+ void rom_5797_fragment(machine_config &config);
+ void system16b_fd1094_5797(machine_config &config);
+ void fpointbla(machine_config &config);
+ void atomicp(machine_config &config);
+ void aceattacb_fd1094(machine_config &config);
+ void system16b_i8751(machine_config &config);
+ void system16c(machine_config &config);
+ void system16b_mc8123(machine_config &config);
+ void system16b_i8751_5797(machine_config &config);
+ void system16b_fd1089a(machine_config &config);
+ void system16b_5797(machine_config &config);
+ void system16b_split(machine_config &config);
+ void system16b_fd1089b(machine_config &config);
+ void system16b(machine_config &config);
+ void system16b_fd1094(machine_config &config);
+ void fpointbl(machine_config &config);
+ void lockonph(machine_config &config);
// ROM board-specific driver init
void init_generic_5521();
@@ -129,6 +121,33 @@ public:
void init_altbeas4_5521();
void init_aliensyn7_5358_small();
+protected:
+ // memory mapping
+ void memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t index);
+
+ // main CPU read/write handlers
+ DECLARE_WRITE16_MEMBER( rom_5704_bank_w );
+ DECLARE_READ16_MEMBER( rom_5797_bank_math_r );
+ DECLARE_WRITE16_MEMBER( rom_5797_bank_math_w );
+ DECLARE_READ16_MEMBER( unknown_rgn2_r );
+ DECLARE_WRITE16_MEMBER( unknown_rgn2_w );
+ DECLARE_READ16_MEMBER( standard_io_r );
+ DECLARE_WRITE16_MEMBER( standard_io_w );
+ DECLARE_WRITE16_MEMBER( atomicp_sound_w );
+
+ DECLARE_READ16_MEMBER( bootleg_custom_io_r );
+ DECLARE_WRITE16_MEMBER( bootleg_custom_io_w );
+
+ // sound CPU read/write handlers
+ DECLARE_WRITE8_MEMBER( upd7759_control_w );
+ DECLARE_READ8_MEMBER( upd7759_status_r );
+ DECLARE_WRITE16_MEMBER( sound_w16 );
+
+ // other callbacks
+ DECLARE_WRITE_LINE_MEMBER(upd7759_generate_nmi);
+ INTERRUPT_GEN_MEMBER( i8751_main_cpu_vblank );
+ DECLARE_WRITE8_MEMBER(spin_68k_w);
+
// video updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -138,23 +157,6 @@ public:
// bootleg stuff
void tilemap_16b_fpointbl_fill_latch(int i, uint16_t* latched_pageselect, uint16_t* latched_yscroll, uint16_t* latched_xscroll, uint16_t* textram);
- void rom_5797_fragment(machine_config &config);
- void system16b_fd1094_5797(machine_config &config);
- void fpointbla(machine_config &config);
- void atomicp(machine_config &config);
- void aceattacb_fd1094(machine_config &config);
- void system16b_i8751(machine_config &config);
- void system16c(machine_config &config);
- void system16b_mc8123(machine_config &config);
- void system16b_i8751_5797(machine_config &config);
- void system16b_fd1089a(machine_config &config);
- void system16b_5797(machine_config &config);
- void system16b_split(machine_config &config);
- void system16b_fd1089b(machine_config &config);
- void system16b(machine_config &config);
- void system16b_fd1094(machine_config &config);
- void fpointbl(machine_config &config);
- void lockonph(machine_config &config);
void decrypted_opcodes_map(address_map &map);
void decrypted_opcodes_map_fpointbla(address_map &map);
void decrypted_opcodes_map_x(address_map &map);
@@ -173,7 +175,7 @@ public:
void system16b_bootleg_map(address_map &map);
void system16b_map(address_map &map);
void system16c_map(address_map &map);
-protected:
+
// internal types
typedef delegate<void ()> i8751_sim_delegate;
@@ -224,7 +226,6 @@ protected:
DECLARE_READ16_MEMBER( sjryuko_custom_io_r );
DECLARE_WRITE16_MEMBER( sjryuko_custom_io_w );
-protected:
// devices
optional_device<sega_315_5195_mapper_device> m_mapper;
required_device<m68000_device> m_maincpu;
@@ -289,7 +290,7 @@ public:
DECLARE_CUSTOM_INPUT_MEMBER(afighter_handl_left_r);
DECLARE_CUSTOM_INPUT_MEMBER(afighter_handl_right_r);
- protected:
+private:
required_ioport m_accel;
required_ioport m_steer;
};
@@ -318,11 +319,14 @@ public:
m_rle_byte(0)
{ }
+ void isgsm(machine_config &config);
+
// driver init
void init_isgsm();
void init_shinfz();
void init_tetrbx();
+private:
// read/write handlers
DECLARE_WRITE16_MEMBER( cart_addr_high_w );
DECLARE_WRITE16_MEMBER( cart_addr_low_w );
@@ -342,7 +346,6 @@ public:
uint32_t shinfz_security(uint32_t input);
uint32_t tetrbx_security(uint32_t input);
-//protected:
// driver overrides
virtual void machine_reset() override;
@@ -364,6 +367,5 @@ public:
uint8_t m_rle_control_byte;
bool m_rle_latched;
uint8_t m_rle_byte;
- void isgsm(machine_config &config);
void isgsm_map(address_map &map);
};
diff --git a/src/mame/includes/segas18.h b/src/mame/includes/segas18.h
index d94287bc531..d983d93ee2d 100644
--- a/src/mame/includes/segas18.h
+++ b/src/mame/includes/segas18.h
@@ -51,6 +51,15 @@ public:
{
}
+ void wwally(machine_config &config);
+ void system18(machine_config &config);
+ void lghost_fd1094(machine_config &config);
+ void wwally_fd1094(machine_config &config);
+ void system18_fd1094(machine_config &config);
+ void system18_fd1094_i8751(machine_config &config);
+ void lghost(machine_config &config);
+ void system18_i8751(machine_config &config);
+
// driver init
void init_ddcrew();
void init_lghost();
@@ -60,6 +69,7 @@ public:
void init_generic_5987();
void init_hamaway();
+private:
// memory mapping
void memory_mapper(sega_315_5195_mapper_device &mapper, uint8_t index);
@@ -95,21 +105,13 @@ public:
DECLARE_WRITE_LINE_MEMBER(set_grayscale);
DECLARE_WRITE_LINE_MEMBER(set_vdp_enable);
- void wwally(machine_config &config);
- void system18(machine_config &config);
- void lghost_fd1094(machine_config &config);
- void wwally_fd1094(machine_config &config);
- void system18_fd1094(machine_config &config);
- void system18_fd1094_i8751(machine_config &config);
- void lghost(machine_config &config);
- void system18_i8751(machine_config &config);
void decrypted_opcodes_map(address_map &map);
void mcu_io_map(address_map &map);
void pcm_map(address_map &map);
void sound_map(address_map &map);
void sound_portmap(address_map &map);
void system18_map(address_map &map);
-protected:
+
// timer IDs
enum
{
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index 02c1bdf6fe6..b16854d4855 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -24,6 +24,51 @@ class segas32_state : public device_t
public:
segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ void init_alien3(void);
+ void init_arescue(int m_hasdsp);
+ void init_arabfgt(void);
+ void init_brival(void);
+ void init_darkedge(void);
+ void init_dbzvrvs(void);
+ void init_f1en(void);
+ void init_f1lap(void);
+ void init_ga2(void);
+ void init_harddunk(void);
+ void init_holo(void);
+ void init_jpark(void);
+ void init_orunners(void);
+ void init_radm(void);
+ void init_radr(void);
+ void init_scross(void);
+ void init_slipstrm(void);
+ void init_sonic(void);
+ void init_sonicp(void);
+ void init_spidman(void);
+ void init_svf(void);
+ void init_jleague(void);
+ void init_titlef(void);
+
+ cpu_device* maincpu() { return m_maincpu; }
+
+ uint32_t screen_update_system32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_multi32_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+ uint32_t screen_update_multi32_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+ DECLARE_WRITE_LINE_MEMBER(ym3438_irq_handler);
+ TIMER_DEVICE_CALLBACK_MEMBER(signal_v60_irq_callback);
+ INTERRUPT_GEN_MEMBER(start_of_vblank_int);
+
+ DECLARE_WRITE8_MEMBER(misc_output_0_w);
+ DECLARE_WRITE8_MEMBER(misc_output_1_w);
+ DECLARE_WRITE8_MEMBER(sw2_output_0_w);
+ DECLARE_WRITE8_MEMBER(sw2_output_1_w);
+ DECLARE_WRITE_LINE_MEMBER(display_enable_0_w);
+ DECLARE_WRITE_LINE_MEMBER(display_enable_1_w);
+ DECLARE_WRITE8_MEMBER(tilebank_external_w);
+
+protected:
+ segas32_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
typedef void (segas32_state::*sys32_output_callback)(int which, uint16_t data);
struct layer_info
@@ -77,13 +122,7 @@ public:
DECLARE_WRITE32_MEMBER(multi32_mixer_1_w);
DECLARE_READ8_MEMBER(int_control_r);
DECLARE_WRITE8_MEMBER(int_control_w);
- DECLARE_WRITE8_MEMBER(misc_output_0_w);
- DECLARE_WRITE8_MEMBER(misc_output_1_w);
- DECLARE_WRITE8_MEMBER(sw2_output_0_w);
- DECLARE_WRITE8_MEMBER(sw2_output_1_w);
- DECLARE_WRITE8_MEMBER(tilebank_external_w);
- DECLARE_WRITE_LINE_MEMBER(display_enable_0_w);
- DECLARE_WRITE_LINE_MEMBER(display_enable_1_w);
+
DECLARE_WRITE16_MEMBER(random_number_w);
DECLARE_READ16_MEMBER(random_number_r);
DECLARE_READ8_MEMBER(shared_ram_r);
@@ -99,13 +138,10 @@ public:
DECLARE_WRITE8_MEMBER(scross_bank_w);
TILE_GET_INFO_MEMBER(get_tile_info);
- uint32_t screen_update_system32(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_multi32_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_multi32_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- INTERRUPT_GEN_MEMBER(start_of_vblank_int);
+
TIMER_CALLBACK_MEMBER(end_of_vblank_int);
TIMER_CALLBACK_MEMBER(update_sprites);
- TIMER_DEVICE_CALLBACK_MEMBER(signal_v60_irq_callback);
+
void common_start(int multi32);
void system32_set_vblank(int state);
inline uint16_t xBBBBBGGGGGRRRRR_to_xBGRBBBBGGGGRRRR(uint16_t value);
@@ -153,36 +189,11 @@ public:
void update_tilemap_text(screen_device &screen, struct layer_info *layer, const rectangle &cliprect);
void update_bitmap(screen_device &screen, struct layer_info *layer, const rectangle &cliprect);
void update_background(struct layer_info *layer, const rectangle &cliprect);
- DECLARE_WRITE_LINE_MEMBER(ym3438_irq_handler);
+
void signal_sound_irq(int which);
void clear_sound_irq(int which);
void darkedge_fd1149_vblank();
void f1lap_fd1149_vblank();
- cpu_device* maincpu() { return m_maincpu; }
-
- void init_alien3(void);
- void init_arescue(int m_hasdsp);
- void init_arabfgt(void);
- void init_brival(void);
- void init_darkedge(void);
- void init_dbzvrvs(void);
- void init_f1en(void);
- void init_f1lap(void);
- void init_ga2(void);
- void init_harddunk(void);
- void init_holo(void);
- void init_jpark(void);
- void init_orunners(void);
- void init_radm(void);
- void init_radr(void);
- void init_scross(void);
- void init_slipstrm(void);
- void init_sonic(void);
- void init_sonicp(void);
- void init_spidman(void);
- void init_svf(void);
- void init_jleague(void);
- void init_titlef(void);
void ga2_main_map(address_map &map);
void multi32_6player_map(address_map &map);
@@ -200,8 +211,6 @@ public:
void upd7725_data_map(address_map &map);
void upd7725_prg_map(address_map &map);
void v25_map(address_map &map);
-protected:
- segas32_state(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual void device_start() override;
diff --git a/src/mame/includes/segasp.h b/src/mame/includes/segasp.h
index 0d2754793f8..88ef71f4663 100644
--- a/src/mame/includes/segasp.h
+++ b/src/mame/includes/segasp.h
@@ -15,9 +15,14 @@ public:
: naomi_state(mconfig, type, tag),
m_sp_eeprom(*this, "sp_eeprom")
{ }
- required_device<eeprom_serial_93cxx_device> m_sp_eeprom;
+
+ void segasp(machine_config &config);
void init_segasp();
+
+private:
+ required_device<eeprom_serial_93cxx_device> m_sp_eeprom;
+
DECLARE_READ64_MEMBER(sp_eeprom_r);
DECLARE_WRITE64_MEMBER(sp_eeprom_w);
DECLARE_READ64_MEMBER(sp_rombdflg_r);
@@ -28,8 +33,6 @@ public:
DECLARE_WRITE64_MEMBER(sp_bank_w);
uint16_t m_sp_bank;
- void segasp(machine_config &config);
void onchip_port(address_map &map);
void segasp_map(address_map &map);
-protected:
};
diff --git a/src/mame/includes/segaxbd.h b/src/mame/includes/segaxbd.h
index 11527adca94..915a0848bad 100644
--- a/src/mame/includes/segaxbd.h
+++ b/src/mame/includes/segaxbd.h
@@ -33,17 +33,15 @@ public:
// construction/destruction
segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // main CPU read/write handlers
- DECLARE_READ16_MEMBER(adc_r);
- DECLARE_WRITE16_MEMBER(adc_w);
- DECLARE_WRITE16_MEMBER(iocontrol_w);
+ void xboard_base_mconfig(machine_config &config);
- // game-specific main CPU read/write handlers
- DECLARE_WRITE16_MEMBER(loffire_sync0_w);
- DECLARE_READ16_MEMBER(rascot_excs_r);
- DECLARE_WRITE16_MEMBER(rascot_excs_w);
- DECLARE_READ16_MEMBER(smgp_excs_r);
- DECLARE_WRITE16_MEMBER(smgp_excs_w);
+ void install_aburner2(void);
+ void install_loffire(void);
+ void install_smgp(void);
+ void install_gprider(void);
+
+ // devices
+ required_device<m68000_device> m_maincpu;
// custom I/O
DECLARE_READ8_MEMBER(aburner2_motor_r);
@@ -53,17 +51,25 @@ public:
DECLARE_READ8_MEMBER(lastsurv_port_r);
DECLARE_WRITE8_MEMBER(lastsurv_muxer_w);
+ // game-specific main CPU read/write handlers
+ DECLARE_WRITE16_MEMBER(loffire_sync0_w);
+ DECLARE_READ16_MEMBER(rascot_excs_r);
+ DECLARE_WRITE16_MEMBER(rascot_excs_w);
+ DECLARE_READ16_MEMBER(smgp_excs_r);
+ DECLARE_WRITE16_MEMBER(smgp_excs_w);
+
+protected:
+ // main CPU read/write handlers
+ DECLARE_READ16_MEMBER(adc_r);
+ DECLARE_WRITE16_MEMBER(adc_w);
+ DECLARE_WRITE16_MEMBER(iocontrol_w);
+
// video updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
// palette helpers
DECLARE_WRITE16_MEMBER(paletteram_w);
- void install_aburner2(void);
- void install_loffire(void);
- void install_smgp(void);
- void install_gprider(void);
-
void decrypted_opcodes_map(address_map &map);
void main_map(address_map &map);
void rascot_z80_map(address_map &map);
@@ -77,7 +83,7 @@ public:
void sound_map(address_map &map);
void sound_portmap(address_map &map);
void sub_map(address_map &map);
-protected:
+
// timer IDs
enum
{
@@ -104,9 +110,6 @@ protected:
DECLARE_WRITE8_MEMBER(pd_0_w);
// devices
-public:
- required_device<m68000_device> m_maincpu;
-protected:
required_device<m68000_device> m_subcpu;
required_device<z80_device> m_soundcpu;
optional_device<z80_device> m_soundcpu2;
@@ -131,12 +134,11 @@ protected:
// game-specific state
uint16_t * m_loffire_sync;
uint8_t m_lastsurv_mux;
-public: // -- stupid system16.c
+
// memory pointers
required_shared_ptr<uint16_t> m_paletteram;
bool m_gprider_hack;
-protected:
void palette_init();
uint32_t m_palette_entries; // number of palette entries
uint8_t m_palette_normal[32]; // RGB translations for normal pixels
@@ -149,10 +151,8 @@ protected:
optional_ioport_array<4> m_mux_ports;
output_finder<4> m_lamps;
-protected:
virtual void device_start() override;
virtual void device_reset() override;
- void xboard_base_mconfig(machine_config &config);
};
diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h
index 2e7cef84730..e96b7d3f3fb 100644
--- a/src/mame/includes/segaybd.h
+++ b/src/mame/includes/segaybd.h
@@ -42,6 +42,19 @@ public:
{
}
+ void yboard_deluxe(machine_config &config);
+ void yboard_link(machine_config &config);
+ void yboard(machine_config &config);
+
+ // game-specific driver init
+ void init_generic();
+ void init_pdrift();
+ void init_r360();
+ void init_gforce2();
+ void init_rchase();
+ void init_gloc();
+
+private:
// main CPU read/write handlers
DECLARE_WRITE8_MEMBER(output1_w);
DECLARE_WRITE8_MEMBER(misc_output_w);
@@ -68,20 +81,9 @@ public:
void pdrift_output_cb2(uint16_t data);
void rchase_output_cb2(uint16_t data);
- // game-specific driver init
- void init_generic();
- void init_pdrift();
- void init_r360();
- void init_gforce2();
- void init_rchase();
- void init_gloc();
-
// video updates
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void yboard_deluxe(machine_config &config);
- void yboard_link(machine_config &config);
- void yboard(machine_config &config);
void link_map(address_map &map);
void link_portmap(address_map &map);
void main_map(address_map &map);
@@ -91,7 +93,7 @@ public:
void sound_portmap(address_map &map);
void subx_map(address_map &map);
void suby_map(address_map &map);
-protected:
+
// internal types
typedef delegate<void (uint16_t)> output_delegate;
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index 3f5a9c6b0f0..de3c6e2b051 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -30,6 +30,35 @@ public:
, m_z80_bank(*this, "z80_bank")
{ }
+ void sys386f(machine_config &config);
+ void sxx2f(machine_config &config);
+ void rdft2(machine_config &config);
+ void ejanhs(machine_config &config);
+ void sys386i(machine_config &config);
+ void sxx2g(machine_config &config);
+ void spi(machine_config &config);
+ void sxx2e(machine_config &config);
+
+ void init_sei252();
+ void init_batlball();
+ void init_senkyu();
+ void init_viprp1();
+ void init_viprp1o();
+ void init_rdft();
+ void init_rfjet();
+ void init_senkyua();
+ void init_rdft2();
+ void init_ejanhs();
+ void init_sys386f();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(ejanhs_encode);
+
+ IRQ_CALLBACK_MEMBER(spi_irq_callback);
+ INTERRUPT_GEN_MEMBER(spi_interrupt);
+
+ uint32_t screen_update_sys386f(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+protected:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
required_shared_ptr<uint32_t> m_mainram;
@@ -111,11 +140,7 @@ public:
DECLARE_READ32_MEMBER(rf2_speedup_r);
DECLARE_READ32_MEMBER(rfjet_speedup_r);
- DECLARE_CUSTOM_INPUT_MEMBER(ejanhs_encode);
-
DECLARE_WRITE_LINE_MEMBER(ymf_irqhandler);
- IRQ_CALLBACK_MEMBER(spi_irq_callback);
- INTERRUPT_GEN_MEMBER(spi_interrupt);
void set_layer_offsets();
void drawgfx_blend(bitmap_rgb32 &bitmap, const rectangle &cliprect, gfx_element *gfx, uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, bitmap_ind8 &primap, int primask);
@@ -133,21 +158,9 @@ public:
TILE_GET_INFO_MEMBER(get_midl_tile_info);
TILE_GET_INFO_MEMBER(get_fore_tile_info);
uint32_t screen_update_spi(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_sys386f(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
void register_video_state();
void init_spi_common();
- void init_sei252();
- void init_batlball();
- void init_senkyu();
- void init_viprp1();
- void init_viprp1o();
- void init_rdft();
- void init_rfjet();
- void init_senkyua();
- void init_rdft2();
- void init_ejanhs();
- void init_sys386f();
void text_decrypt(uint8_t *rom);
void bg_decrypt(uint8_t *rom, int size);
@@ -157,14 +170,7 @@ public:
void rfjet_text_decrypt(uint8_t *rom);
void rfjet_bg_decrypt(uint8_t *rom, int size);
- void sys386f(machine_config &config);
- void sxx2f(machine_config &config);
- void rdft2(machine_config &config);
- void ejanhs(machine_config &config);
- void sys386i(machine_config &config);
- void sxx2g(machine_config &config);
- void spi(machine_config &config);
- void sxx2e(machine_config &config);
+
void base_map(address_map &map);
void rdft2_map(address_map &map);
void rise_map(address_map &map);
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index 49bea554df0..8ca54f5d284 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -23,6 +23,13 @@ public:
m_colorram(*this, "colorram"),
m_decrypted_opcodes(*this, "decrypted_opcodes") { }
+ void no_nvram(machine_config &config);
+ void friskytb(machine_config &config);
+ void nvram(machine_config &config);
+
+ void init_friskytb();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_mcu;
required_device<dac_byte_interface> m_dac;
@@ -56,7 +63,6 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_PALETTE_INIT(seicross);
- void init_friskytb();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
@@ -64,9 +70,7 @@ public:
void nvram_init(nvram_device &nvram, void *data, size_t size);
DECLARE_WRITE8_MEMBER(dac_w);
- void no_nvram(machine_config &config);
- void friskytb(machine_config &config);
- void nvram(machine_config &config);
+
void decrypted_opcodes_map(address_map &map);
void main_map(address_map &map);
void main_portmap(address_map &map);
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index 404fa4416fa..f24ca968936 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -34,6 +34,17 @@ public:
m_bgstripesram(*this, "bgstripesram"),
m_decrypted_opcodes(*this, "decrypted_opcodes") { }
+ void senjyox_e(machine_config &config);
+ void senjyo(machine_config &config);
+ void starforb(machine_config &config);
+ void senjyox_a(machine_config &config);
+
+ void init_starfora();
+ void init_senjyo();
+ void init_starfore();
+ void init_starforc();
+
+private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<z80pio_device> m_pio;
@@ -90,11 +101,6 @@ public:
DECLARE_PALETTE_DECODER(IIBBGGRR);
DECLARE_PALETTE_INIT(radar);
- void init_starfora();
- void init_senjyo();
- void init_starfore();
- void init_starforc();
-
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(senjyo_bg1_tile_info);
TILE_GET_INFO_MEMBER(starforc_bg1_tile_info);
@@ -108,10 +114,7 @@ public:
void draw_bgbitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect);
void draw_radar(bitmap_rgb32 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_rgb32 &bitmap, const rectangle &cliprect,int priority);
- void senjyox_e(machine_config &config);
- void senjyo(machine_config &config);
- void starforb(machine_config &config);
- void senjyox_a(machine_config &config);
+
void decrypted_opcodes_map(address_map &map);
void senjyo_map(address_map &map);
void senjyo_sound_io_map(address_map &map);
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 5a06334d09c..54829179bd0 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -70,6 +70,75 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void keroppij(machine_config &config);
+ void madshark(machine_config &config);
+ void jjsquawb(machine_config &config);
+ void oisipuzl(machine_config &config);
+ void zingzipbl(machine_config &config);
+ void eightfrc(machine_config &config);
+ void gundhara(machine_config &config);
+ void triplfun(machine_config &config);
+ void calibr50(machine_config &config);
+ void blandiap(machine_config &config);
+ void wits(machine_config &config);
+ void msgundam(machine_config &config);
+ void extdwnhl(machine_config &config);
+ void pairlove(machine_config &config);
+ void zingzip(machine_config &config);
+ void wiggie(machine_config &config);
+ void umanclub(machine_config &config);
+ void tndrcade(machine_config &config);
+ void daioh(machine_config &config);
+ void atehate(machine_config &config);
+ void usclssic(machine_config &config);
+ void zombraid(machine_config &config);
+ void thunderlbl(machine_config &config);
+ void blockcarb(machine_config &config);
+ void wrofaero(machine_config &config);
+ void downtown(machine_config &config);
+ void blockcar(machine_config &config);
+ void crazyfgt(machine_config &config);
+ void keroppi(machine_config &config);
+ void drgnunit(machine_config &config);
+ void orbs(machine_config &config);
+ void daiohp(machine_config &config);
+ void magspeed(machine_config &config);
+ void krzybowl(machine_config &config);
+ void kiwame(machine_config &config);
+ void qzkklgy2(machine_config &config);
+ void kamenrid(machine_config &config);
+ void superbar(machine_config &config);
+ void jjsquawk(machine_config &config);
+ void twineagl(machine_config &config);
+ void blandia(machine_config &config);
+ void thunderl(machine_config &config);
+ void metafox(machine_config &config);
+ void utoukond(machine_config &config);
+ void rezon(machine_config &config);
+
+ void init_bank6502();
+ void init_downtown();
+ void init_rezon();
+ void init_twineagl();
+ void init_crazyfgt();
+ void init_metafox();
+ void init_arbalest();
+ void init_wiggie();
+ void init_blandia();
+ void init_kiwame();
+ void init_eightfrc();
+ void init_pairlove();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(usclssic_trackball_x_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(usclssic_trackball_y_r);
+
+ DECLARE_PALETTE_INIT(palette_init_RRRRRGGGGGBBBBB_proms);
+
+ SETA001_SPRITE_GFXBANK_CB_MEMBER(setac_gfxbank_callback);
+
+ uint32_t screen_update_seta_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+protected:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<cpu_device> m_subcpu;
@@ -146,8 +215,7 @@ public:
DECLARE_WRITE16_MEMBER(sub_ctrl_w);
DECLARE_READ16_MEMBER(seta_dsw_r);
DECLARE_READ16_MEMBER(usclssic_dsw_r);
- DECLARE_CUSTOM_INPUT_MEMBER(usclssic_trackball_x_r);
- DECLARE_CUSTOM_INPUT_MEMBER(usclssic_trackball_y_r);
+
DECLARE_WRITE8_MEMBER(usclssic_lockout_w);
ADC083X_INPUT_CB(zombraid_adc_cb);
DECLARE_READ16_MEMBER(zombraid_gun_r);
@@ -181,18 +249,7 @@ public:
DECLARE_READ8_MEMBER(dsw1_r);
DECLARE_READ8_MEMBER(dsw2_r);
DECLARE_READ16_MEMBER(extra_r);
- void init_bank6502();
- void init_downtown();
- void init_rezon();
- void init_twineagl();
- void init_crazyfgt();
- void init_metafox();
- void init_arbalest();
- void init_wiggie();
- void init_blandia();
- void init_kiwame();
- void init_eightfrc();
- void init_pairlove();
+
TILE_GET_INFO_MEMBER(twineagl_get_tile_info);
template<int Layer> TILE_GET_INFO_MEMBER(get_tile_info);
DECLARE_VIDEO_START(seta_no_layers);
@@ -200,7 +257,7 @@ public:
DECLARE_VIDEO_START(twineagl_1_layer);
DECLARE_VIDEO_START(seta_1_layer);
DECLARE_MACHINE_RESET(calibr50);
- DECLARE_PALETTE_INIT(palette_init_RRRRRGGGGGBBBBB_proms);
+
DECLARE_PALETTE_INIT(usclssic);
DECLARE_MACHINE_START(usclssic);
DECLARE_VIDEO_START(seta_2_layers);
@@ -216,7 +273,7 @@ public:
uint32_t screen_update_seta_no_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_seta(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_usclssic(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_seta_layers(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
DECLARE_WRITE_LINE_MEMBER(screen_vblank_seta_buffer_sprites);
DECLARE_READ16_MEMBER(ipl0_ack_r);
DECLARE_WRITE16_MEMBER(ipl0_ack_w);
@@ -241,52 +298,7 @@ public:
void uPD71054_timer_init( );
DECLARE_WRITE_LINE_MEMBER(pit_out0);
DECLARE_WRITE_LINE_MEMBER(utoukond_ym3438_interrupt);
- SETA001_SPRITE_GFXBANK_CB_MEMBER(setac_gfxbank_callback);
- void keroppij(machine_config &config);
- void madshark(machine_config &config);
- void jjsquawb(machine_config &config);
- void oisipuzl(machine_config &config);
- void zingzipbl(machine_config &config);
- void eightfrc(machine_config &config);
- void gundhara(machine_config &config);
- void triplfun(machine_config &config);
- void calibr50(machine_config &config);
- void blandiap(machine_config &config);
- void wits(machine_config &config);
- void msgundam(machine_config &config);
- void extdwnhl(machine_config &config);
- void pairlove(machine_config &config);
- void zingzip(machine_config &config);
- void wiggie(machine_config &config);
- void umanclub(machine_config &config);
- void tndrcade(machine_config &config);
- void daioh(machine_config &config);
- void atehate(machine_config &config);
- void usclssic(machine_config &config);
- void zombraid(machine_config &config);
- void thunderlbl(machine_config &config);
- void blockcarb(machine_config &config);
- void wrofaero(machine_config &config);
- void downtown(machine_config &config);
- void blockcar(machine_config &config);
- void crazyfgt(machine_config &config);
- void keroppi(machine_config &config);
- void drgnunit(machine_config &config);
- void orbs(machine_config &config);
- void daiohp(machine_config &config);
- void magspeed(machine_config &config);
- void krzybowl(machine_config &config);
- void kiwame(machine_config &config);
- void qzkklgy2(machine_config &config);
- void kamenrid(machine_config &config);
- void superbar(machine_config &config);
- void jjsquawk(machine_config &config);
- void twineagl(machine_config &config);
- void blandia(machine_config &config);
- void thunderl(machine_config &config);
- void metafox(machine_config &config);
- void utoukond(machine_config &config);
- void rezon(machine_config &config);
+
void atehate_map(address_map &map);
void blandia_map(address_map &map);
void blandiap_map(address_map &map);
@@ -349,16 +361,21 @@ public:
m_coin_start_cycles(0)
{ }
+ void setaroul(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(coin_drop_start);
+ DECLARE_CUSTOM_INPUT_MEMBER(coin_sensors_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(hopper_sensors_r);
+
+ DECLARE_WRITE_LINE_MEMBER(screen_vblank);
+
+private:
DECLARE_WRITE16_MEMBER(rtc_w);
DECLARE_READ16_MEMBER(rtc_r);
DECLARE_READ16_MEMBER(inputs_r);
DECLARE_WRITE16_MEMBER(mux_w);
- DECLARE_INPUT_CHANGED_MEMBER(coin_drop_start);
- DECLARE_CUSTOM_INPUT_MEMBER(coin_sensors_r);
- DECLARE_CUSTOM_INPUT_MEMBER(hopper_sensors_r);
-
DECLARE_WRITE8_MEMBER(pay_w);
DECLARE_WRITE8_MEMBER(led_w);
@@ -376,12 +393,10 @@ public:
DECLARE_PALETTE_INIT(setaroul);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE_LINE_MEMBER(screen_vblank);
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
- void setaroul(machine_config &config);
void setaroul_map(address_map &map);
-private:
+
required_device<upd4992_device> m_rtc; // ! Actually D4911C !
required_device<ticket_dispenser_device> m_hopper;
required_ioport_array<26> m_bet;
@@ -419,6 +434,12 @@ public:
m_out(0)
{ }
+ void inttoote(machine_config &config);
+ void jockeyc(machine_config &config);
+
+ void init_inttoote();
+
+private:
DECLARE_WRITE16_MEMBER(rtc_w);
DECLARE_READ16_MEMBER(rtc_r);
@@ -440,12 +461,10 @@ public:
DECLARE_WRITE16_MEMBER(inttoote_mux_w);
DECLARE_WRITE16_MEMBER(inttoote_out_w);
DECLARE_READ16_MEMBER(inttoote_700000_r);
- void init_inttoote();
- void inttoote(machine_config &config);
- void jockeyc(machine_config &config);
+
void inttoote_map(address_map &map);
void jockeyc_map(address_map &map);
-private:
+
required_device<upd4992_device> m_rtc; // ! Actually D4911C !
required_device<ticket_dispenser_device> m_hopper1, m_hopper2; // the 2nd hopper is optional
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index ea64b325776..27dad1d9c63 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -43,6 +43,23 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
+ void seta2(machine_config &config);
+ void grdians(machine_config &config);
+ void myangel(machine_config &config);
+ void penbros(machine_config &config);
+ void pzlbowl(machine_config &config);
+ void myangel2(machine_config &config);
+ void reelquak(machine_config &config);
+ void ablastb(machine_config &config);
+ void gundamex(machine_config &config);
+ void telpacfl(machine_config &config);
+ void samshoot(machine_config &config);
+ void namcostr(machine_config &config);
+
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+ DECLARE_WRITE_LINE_MEMBER(screen_vblank);
+
DECLARE_WRITE16_MEMBER(spriteram16_word_w);
DECLARE_READ16_MEMBER(spriteram16_word_r);
DECLARE_WRITE16_MEMBER(vregs_w);
@@ -50,6 +67,8 @@ public:
DECLARE_WRITE32_MEMBER(oki_write);
DECLARE_WRITE16_MEMBER(sound_bank_w);
+protected:
+
DECLARE_WRITE16_MEMBER(grdians_lockout_w);
DECLARE_READ16_MEMBER(mj4simai_p1_r);
@@ -72,30 +91,15 @@ public:
DECLARE_READ16_MEMBER(gundamex_eeprom_r);
DECLARE_WRITE16_MEMBER(gundamex_eeprom_w);
-
DECLARE_VIDEO_START(yoffset);
DECLARE_VIDEO_START(xoffset);
DECLARE_VIDEO_START(xoffset1);
- uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- DECLARE_WRITE_LINE_MEMBER(screen_vblank);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(seta2_interrupt);
INTERRUPT_GEN_MEMBER(samshoot_interrupt);
- void seta2(machine_config &config);
- void grdians(machine_config &config);
- void myangel(machine_config &config);
- void penbros(machine_config &config);
- void pzlbowl(machine_config &config);
- void myangel2(machine_config &config);
- void reelquak(machine_config &config);
- void ablastb(machine_config &config);
- void gundamex(machine_config &config);
- void telpacfl(machine_config &config);
- void samshoot(machine_config &config);
- void namcostr(machine_config &config);
void ablastb_map(address_map &map);
void grdians_map(address_map &map);
void gundamex_map(address_map &map);
@@ -110,7 +114,6 @@ public:
void samshoot_map(address_map &map);
void telpacfl_map(address_map &map);
-protected:
virtual void machine_start() override { m_leds.resolve(); m_lamps.resolve(); }
virtual void video_start() override;
@@ -171,11 +174,10 @@ public:
void init_funcube();
void init_funcube2();
-protected:
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
DECLARE_READ32_MEMBER(funcube_nvram_dword_r);
DECLARE_WRITE32_MEMBER(funcube_nvram_dword_w);
DECLARE_READ32_MEMBER(funcube_debug_r);
@@ -212,6 +214,9 @@ public:
}
static constexpr feature_type unemulated_features() { return feature::CAMERA | feature::PRINTER; }
+ void staraudi(machine_config &config);
+
+private:
DECLARE_WRITE16_MEMBER(staraudi_camera_w);
DECLARE_WRITE16_MEMBER(staraudi_lamps1_w);
DECLARE_WRITE16_MEMBER(staraudi_lamps2_w);
@@ -220,14 +225,12 @@ public:
uint32_t staraudi_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void staraudi(machine_config &config);
void staraudi_map(address_map &map);
-protected:
+
virtual void driver_start() override;
void staraudi_debug_outputs();
-private:
void draw_rgbram(bitmap_ind16 &bitmap);
required_shared_ptr<uint16_t> m_rgbram;
diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h
index ef6e682c981..61dfb063187 100644
--- a/src/mame/includes/sf.h
+++ b/src/mame/includes/sf.h
@@ -27,6 +27,12 @@ public:
m_audiobank(*this, "audiobank")
{ }
+ void sfp(machine_config &config);
+ void sfjp(machine_config &config);
+ void sfus(machine_config &config);
+ void sfan(machine_config &config);
+
+private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -69,10 +75,7 @@ public:
inline int invert( int nb );
void draw_sprites( bitmap_ind16 &bitmap,const rectangle &cliprect );
void write_dword( address_space &space, offs_t offset, uint32_t data );
- void sfp(machine_config &config);
- void sfjp(machine_config &config);
- void sfus(machine_config &config);
- void sfan(machine_config &config);
+
void sfan_map(address_map &map);
void sfjp_map(address_map &map);
void sfus_map(address_map &map);
diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h
index 58d3329265c..eef5b228232 100644
--- a/src/mame/includes/sg1000.h
+++ b/src/mame/includes/sg1000.h
@@ -36,11 +36,6 @@
class sg1000_state : public driver_device
{
public:
- enum
- {
- TIMER_LIGHTGUN_TICK
- };
-
sg1000_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, Z80_TAG),
@@ -52,6 +47,17 @@ public:
m_pb7(*this, "PB7")
{ }
+ void sg1000(machine_config &config);
+ void omv(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER( trigger_nmi );
+
+protected:
+ enum
+ {
+ TIMER_LIGHTGUN_TICK
+ };
+
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
required_memory_region m_rom;
@@ -64,12 +70,10 @@ public:
DECLARE_READ8_MEMBER( peripheral_r );
DECLARE_WRITE8_MEMBER( peripheral_w );
- DECLARE_INPUT_CHANGED_MEMBER( trigger_nmi );
DECLARE_READ8_MEMBER( omv_r );
DECLARE_WRITE8_MEMBER( omv_w );
- void sg1000(machine_config &config);
- void omv(machine_config &config);
+
void omv_io_map(address_map &map);
void omv_map(address_map &map);
void sc3000_io_map(address_map &map);
@@ -85,8 +89,10 @@ public:
: sg1000_state(mconfig, type, tag)
{ }
- virtual void machine_start() override;
void sc3000(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
};
class sf7000_state : public sc3000_state
@@ -99,6 +105,9 @@ public:
m_floppy0(*this, UPD765_TAG ":0:3ssdd")
{ }
+ void sf7000(machine_config &config);
+
+private:
required_device<upd765a_device> m_fdc;
required_device<centronics_device> m_centronics;
required_device<floppy_image_device> m_floppy0;
@@ -112,7 +121,6 @@ public:
DECLARE_WRITE8_MEMBER( ppi_pc_w );
DECLARE_FLOPPY_FORMATS( floppy_formats );
- void sf7000(machine_config &config);
void sf7000_io_map(address_map &map);
void sf7000_map(address_map &map);
};
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index 45fe4b4eaeb..c7980da0c2c 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -32,6 +32,9 @@ public:
m_bg1videoram(*this, "bg1videoram"),
m_spvideoram(*this, "spvideoram") { }
+ void shadfrce(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<okim6295_device> m_oki;
@@ -91,7 +94,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
- void shadfrce(machine_config &config);
+
void shadfrce_map(address_map &map);
void shadfrce_sound_map(address_map &map);
};
diff --git a/src/mame/includes/shangha3.h b/src/mame/includes/shangha3.h
index 75278458b07..0fa2254c788 100644
--- a/src/mame/includes/shangha3.h
+++ b/src/mame/includes/shangha3.h
@@ -22,6 +22,15 @@ public:
m_okibank(*this, "okibank")
{ }
+ void shangha3(machine_config &config);
+ void heberpop(machine_config &config);
+ void blocken(machine_config &config);
+
+ void init_shangha3();
+ void init_heberpop();
+ void init_blocken();
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
required_device<okim6295_device> m_oki;
@@ -59,15 +68,10 @@ public:
// blocken specific
DECLARE_WRITE8_MEMBER(blocken_coinctrl_w);
- void init_shangha3();
- void init_heberpop();
- void init_blocken();
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void shangha3(machine_config &config);
- void heberpop(machine_config &config);
- void blocken(machine_config &config);
+
void blocken_map(address_map &map);
void blocken_oki_map(address_map &map);
void heberpop_map(address_map &map);
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index f7467cf1678..0f4a36d1687 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -19,6 +19,15 @@ public:
m_spriteram(*this, "spriteram"),
m_videoreg(*this, "videoreg") { }
+ void dynamski(machine_config &config);
+ void chinhero(machine_config &config);
+ void shangkid(machine_config &config);
+
+ void init_dynamski();
+ void init_shangkid();
+ void init_chinhero();
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<cpu_device> m_bbx;
@@ -58,9 +67,6 @@ public:
TILE_GET_INFO_MEMBER(get_bg_tile_info);
- void init_dynamski();
- void init_shangkid();
- void init_chinhero();
DECLARE_VIDEO_START(shangkid);
DECLARE_PALETTE_INIT(dynamski);
DECLARE_MACHINE_RESET(shangkid);
@@ -71,9 +77,7 @@ public:
void shangkid_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void dynamski_draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri );
void dynamski_draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
- void dynamski(machine_config &config);
- void chinhero(machine_config &config);
- void shangkid(machine_config &config);
+
void chinhero_bbx_map(address_map &map);
void chinhero_bbx_portmap(address_map &map);
void chinhero_main_map(address_map &map);
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index c6a53353879..ad17681cc51 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -16,6 +16,9 @@ public:
m_colorram(*this, "colorram"),
m_videoram(*this, "videoram") { }
+ void shaolins(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -43,6 +46,5 @@ public:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
- void shaolins(machine_config &config);
void shaolins_map(address_map &map);
};
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index 9d68584761d..2e20f59a32d 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -15,6 +15,9 @@ public:
m_paletteram(*this, "paletteram"),
m_videoram(*this, "videoram") { }
+ void shisen(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<m72_audio_device> m_audio;
required_device<gfxdecode_device> m_gfxdecode;
@@ -37,7 +40,7 @@ public:
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void shisen(machine_config &config);
+
void shisen_io_map(address_map &map);
void shisen_map(address_map &map);
void shisen_sound_io_map(address_map &map);
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index d65164141d5..e0396cb50ac 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -18,6 +18,15 @@ public:
m_textram(*this, "textram"),
m_videoram(*this, "videoram") { }
+ void shootouj(machine_config &config);
+ void shootouk(machine_config &config);
+ void shootout(machine_config &config);
+
+ void init_shootout();
+
+ DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -41,10 +50,6 @@ public:
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(textram_w);
- DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
- void init_shootout();
-
virtual void machine_reset() override;
virtual void video_start() override;
@@ -56,9 +61,7 @@ public:
uint32_t screen_update_shootout(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_shootouj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int bank_bits );
- void shootouj(machine_config &config);
- void shootouk(machine_config &config);
- void shootout(machine_config &config);
+
void shootouj_map(address_map &map);
void shootout_map(address_map &map);
void shootout_sound_map(address_map &map);
diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h
index 5764e245f21..dd5295aabce 100644
--- a/src/mame/includes/shuuz.h
+++ b/src/mame/includes/shuuz.h
@@ -24,7 +24,7 @@ public:
void shuuz(machine_config &config);
-protected:
+private:
virtual void update_interrupts() override;
DECLARE_WRITE16_MEMBER(latch_w);
@@ -39,7 +39,6 @@ protected:
void main_map(address_map &map);
-private:
required_device<atari_vad_device> m_vad;
int m_cur[2];
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index 785e97afab7..8ae5323143b 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -21,6 +21,16 @@ public:
{
}
+ void sidearms(machine_config &config);
+ void turtship(machine_config &config);
+ void whizz(machine_config &config);
+
+ void init_dyger();
+ void init_sidearms();
+ void init_whizz();
+ void init_turtship();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -63,10 +73,6 @@ public:
DECLARE_WRITE8_MEMBER(whizz_bankswitch_w);
- void init_dyger();
- void init_sidearms();
- void init_whizz();
- void init_turtship();
virtual void machine_start() override;
virtual void video_start() override;
@@ -79,9 +85,7 @@ public:
void draw_sprites_region(bitmap_ind16 &bitmap, const rectangle &cliprect, int start_offset, int end_offset );
void draw_starfield( bitmap_ind16 &bitmap );
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sidearms(machine_config &config);
- void turtship(machine_config &config);
- void whizz(machine_config &config);
+
void sidearms_map(address_map &map);
void sidearms_sound_map(address_map &map);
void turtship_map(address_map &map);
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index 14f032d294b..4b3a25f71b7 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -24,6 +24,13 @@ public:
m_spriteram(*this, "spriteram")
{ }
+ void sidepcktb(machine_config &config);
+ void sidepckt(machine_config &config);
+
+ void init_sidepckt();
+ void init_sidepcktj();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -50,9 +57,6 @@ public:
DECLARE_READ8_MEMBER(scroll_y_r);
DECLARE_WRITE8_MEMBER(scroll_y_w);
- void init_sidepckt();
- void init_sidepcktj();
-
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void machine_reset() override;
@@ -61,8 +65,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
- void sidepcktb(machine_config &config);
- void sidepckt(machine_config &config);
+
void sidepckt_map(address_map &map);
void sidepcktb_map(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h
index 98c63cfbb8b..79ccb07908e 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -19,6 +19,9 @@ public:
m_sprram(*this, "sprram"),
m_regs(*this, "regs") { }
+ void silkroad(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<okim6295_device> m_oki1;
required_device<gfxdecode_device> m_gfxdecode;
@@ -50,6 +53,5 @@ public:
uint32_t screen_update_silkroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void silkroad(machine_config &config);
void cpu_map(address_map &map);
};
diff --git a/src/mame/includes/simpl156.h b/src/mame/includes/simpl156.h
index 9ed461bc64e..3d36843e90b 100644
--- a/src/mame/includes/simpl156.h
+++ b/src/mame/includes/simpl156.h
@@ -26,6 +26,20 @@ public:
m_sprgen(*this, "spritegen"),
m_palette(*this, "palette") { }
+ void joemacr(machine_config &config);
+ void magdrop(machine_config &config);
+ void chainrec(machine_config &config);
+ void mitchell156(machine_config &config);
+ void magdropp(machine_config &config);
+
+ void init_simpl156();
+ void init_joemacr();
+ void init_charlien();
+ void init_prtytime();
+ void init_osman();
+ void init_chainrec();
+
+private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<deco16ic_device> m_deco_tilegen1;
@@ -57,20 +71,11 @@ public:
DECLARE_READ32_MEMBER(prtytime_speedup_r);
DECLARE_READ32_MEMBER(charlien_speedup_r);
DECLARE_READ32_MEMBER(osman_speedup_r);
- void init_simpl156();
- void init_joemacr();
- void init_charlien();
- void init_prtytime();
- void init_osman();
- void init_chainrec();
+
virtual void video_start() override;
uint32_t screen_update_simpl156(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(simpl156_vbl_interrupt);
- void joemacr(machine_config &config);
- void magdrop(machine_config &config);
- void chainrec(machine_config &config);
- void mitchell156(machine_config &config);
- void magdropp(machine_config &config);
+
void chainrec_map(address_map &map);
void joemacr_map(address_map &map);
void magdrop_map(address_map &map);
diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h
index b18a181c819..6fb2036dc40 100644
--- a/src/mame/includes/simple_st0016.h
+++ b/src/mame/includes/simple_st0016.h
@@ -16,6 +16,16 @@ public:
m_mainbank(*this, "mainbank")
{ }
+ void st0016(machine_config &config);
+ void renju(machine_config &config);
+ void mayjinsn(machine_config &config);
+
+ void init_nratechu();
+ void init_mayjinsn();
+ void init_mayjisn2();
+ void init_renju();
+
+private:
int mux_port;
// uint32_t m_st0016_rom_bank;
@@ -33,17 +43,12 @@ public:
DECLARE_WRITE8_MEMBER(latch8_w);
DECLARE_WRITE8_MEMBER(st0016_rom_bank_w);
- void init_nratechu();
- void init_mayjinsn();
- void init_mayjisn2();
- void init_renju();
+
virtual void machine_start() override;
DECLARE_VIDEO_START(st0016);
uint32_t screen_update_st0016(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(st0016_int);
- void st0016(machine_config &config);
- void renju(machine_config &config);
- void mayjinsn(machine_config &config);
+
void renju_mem(address_map &map);
void st0016_io(address_map &map);
void st0016_m2_io(address_map &map);
diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h
index e63f769d1d2..65b2e6c93bb 100644
--- a/src/mame/includes/simpsons.h
+++ b/src/mame/includes/simpsons.h
@@ -9,12 +9,6 @@
class simpsons_state : public driver_device
{
public:
- enum
- {
- TIMER_NMI,
- TIMER_DMAEND
- };
-
simpsons_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -25,6 +19,15 @@ public:
m_k053246(*this, "k053246"),
m_k053251(*this, "k053251") { }
+ void simpsons(machine_config &config);
+
+private:
+ enum
+ {
+ TIMER_NMI,
+ TIMER_DMAEND
+ };
+
/* memory pointers */
std::unique_ptr<uint16_t[]> m_spriteram;
@@ -64,11 +67,10 @@ public:
DECLARE_WRITE8_MEMBER(banking_callback);
K053246_CB_MEMBER(sprite_callback);
- void simpsons(machine_config &config);
void bank0000_map(address_map &map);
void bank2000_map(address_map &map);
void main_map(address_map &map);
void z80_map(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h
index ae997b94ea9..b3f71e9d440 100644
--- a/src/mame/includes/skullxbo.h
+++ b/src/mame/includes/skullxbo.h
@@ -28,10 +28,11 @@ public:
m_playfield_latch(-1)
{ }
- void init_skullxbo();
void skullxbo(machine_config &config);
-protected:
+ void init_skullxbo();
+
+private:
virtual void machine_reset() override;
virtual void update_interrupts() override;
virtual void scanline_update(screen_device &screen, int scanline) override;
@@ -50,7 +51,6 @@ protected:
void main_map(address_map &map);
-private:
required_device<atari_jsa_ii_device> m_jsa;
required_device<timer_device> m_scanline_timer;
required_device<tilemap_device> m_playfield_tilemap;
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index eabb57afcd8..fbe3958073d 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -53,7 +53,7 @@ public:
void skydiver(machine_config &config);
-protected:
+private:
DECLARE_WRITE_LINE_MEMBER(nmion_w);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_READ8_MEMBER(wram_r);
@@ -84,7 +84,6 @@ protected:
INTERRUPT_GEN_MEMBER(interrupt);
void skydiver_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<watchdog_timer_device> m_watchdog;
required_device<f9334_device> m_latch3;
diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h
index a3bf37b4f40..a24c20b711e 100644
--- a/src/mame/includes/skyfox.h
+++ b/src/mame/includes/skyfox.h
@@ -24,6 +24,13 @@ public:
m_spriteram(*this, "spriteram")
{ }
+ void skyfox(machine_config &config);
+
+ void init_skyfox();
+
+ DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
+private:
/* devices/memory pointers */
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -37,8 +44,6 @@ public:
int m_bg_ctrl;
DECLARE_WRITE8_MEMBER(skyfox_vregs_w);
- DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
- void init_skyfox();
virtual void machine_start() override;
virtual void machine_reset() override;
DECLARE_PALETTE_INIT(skyfox);
@@ -46,7 +51,7 @@ public:
INTERRUPT_GEN_MEMBER(skyfox_interrupt);
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
void draw_background(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void skyfox(machine_config &config);
+
void skyfox_map(address_map &map);
void skyfox_sound_map(address_map &map);
};
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index f3708f8a264..bcd136b8389 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -20,6 +20,11 @@ public:
, m_leds(*this, "led%u", 0U)
{ }
+ void skykid(machine_config &config);
+
+ void init_skykid();
+
+private:
DECLARE_WRITE8_MEMBER(inputport_select_w);
DECLARE_READ8_MEMBER(inputport_r);
DECLARE_WRITE8_MEMBER(skykid_led_w);
@@ -35,7 +40,6 @@ public:
DECLARE_WRITE8_MEMBER(skykid_scroll_x_w);
DECLARE_WRITE8_MEMBER(skykid_scroll_y_w);
DECLARE_WRITE8_MEMBER(skykid_flipscreen_priority_w);
- void init_skykid();
TILEMAP_MAPPER_MEMBER(tx_tilemap_scan);
TILE_GET_INFO_MEMBER(tx_get_tile_info);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
@@ -43,12 +47,10 @@ public:
uint32_t screen_update_skykid(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
- void skykid(machine_config &config);
void mcu_map(address_map &map);
void mcu_port_map(address_map &map);
void skykid_map(address_map &map);
-protected:
virtual void machine_start() override;
virtual void video_start() override;
diff --git a/src/mame/includes/skyraid.h b/src/mame/includes/skyraid.h
index de71aa9dfbb..4c546097ac2 100644
--- a/src/mame/includes/skyraid.h
+++ b/src/mame/includes/skyraid.h
@@ -25,7 +25,7 @@ public:
void skyraid(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER(skyraid_port_0_r);
DECLARE_WRITE8_MEMBER(skyraid_range_w);
DECLARE_WRITE8_MEMBER(skyraid_offset_w);
@@ -43,7 +43,6 @@ protected:
void skyraid_map(address_map &map);
-private:
int m_analog_range;
int m_analog_offset;
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index 5722e1846fc..8d44e7b3f95 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -30,6 +30,22 @@ public:
m_fixcolorram(*this, "fixcolorram")
{ }
+ void tigerhb2(machine_config &config);
+ void tigerhb1(machine_config &config);
+ void tigerh(machine_config &config);
+ void getstarb2(machine_config &config);
+ void slapfighb2(machine_config &config);
+ void getstarb1(machine_config &config);
+ void perfrman(machine_config &config);
+ void slapfigh(machine_config &config);
+ void slapfighb1(machine_config &config);
+
+ void init_banks();
+ void init_getstarb1();
+ void init_slapfigh();
+ void init_getstarb2();
+
+private:
// devices, memory pointers
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
@@ -99,11 +115,6 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
- void init_banks();
- void init_getstarb1();
- void init_slapfigh();
- void init_getstarb2();
-
TILE_GET_INFO_MEMBER(get_pf_tile_info);
TILE_GET_INFO_MEMBER(get_pf1_tile_info);
TILE_GET_INFO_MEMBER(get_fix_tile_info);
@@ -117,15 +128,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
INTERRUPT_GEN_MEMBER(sound_nmi);
- void tigerhb2(machine_config &config);
- void tigerhb1(machine_config &config);
- void tigerh(machine_config &config);
- void getstarb2(machine_config &config);
- void slapfighb2(machine_config &config);
- void getstarb1(machine_config &config);
- void perfrman(machine_config &config);
- void slapfigh(machine_config &config);
- void slapfighb1(machine_config &config);
+
void getstar_map(address_map &map);
void getstarb1_io_map(address_map &map);
void getstarb2_io_map(address_map &map);
diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h
index 76628e2fd67..bbeed581f16 100644
--- a/src/mame/includes/slapshot.h
+++ b/src/mame/includes/slapshot.h
@@ -25,11 +25,6 @@ struct slapshot_tempsprite
class slapshot_state : public driver_device
{
public:
- enum
- {
- TIMER_SLAPSHOT_INTERRUPT6
- };
-
slapshot_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -42,9 +37,9 @@ public:
m_spriteram(*this,"spriteram"),
m_spriteext(*this,"spriteext") { }
-
void opwolf3(machine_config &config);
void slapshot(machine_config &config);
+
void init_slapshot();
protected:
@@ -53,6 +48,11 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
+ enum
+ {
+ TIMER_SLAPSHOT_INTERRUPT6
+ };
+
/* devices */
required_device<cpu_device> m_maincpu;
required_device<tc0140syt_device> m_tc0140syt;
diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h
index 30e3ed66d16..4a89dd91ad8 100644
--- a/src/mame/includes/sms.h
+++ b/src/mame/includes/sms.h
@@ -73,6 +73,31 @@ public:
m_store_cart_selection_data(false)
{ }
+ void sms_base(machine_config &config);
+ void sms_ntsc_base(machine_config &config);
+ void sms_pal_base(machine_config &config);
+ void sms_paln_base(machine_config &config);
+ void sms_br_base(machine_config &config);
+ void sms3_br(machine_config &config);
+ void sg1000m3(machine_config &config);
+ void smsj(machine_config &config);
+ void sms1_paln(machine_config &config);
+ void sms1_ntsc(machine_config &config);
+ void gamegear(machine_config &config);
+ void gamegeaj(machine_config &config);
+ void sms3_paln(machine_config &config);
+ void sms1_pal(machine_config &config);
+ void sms2_pal(machine_config &config);
+ void sms2_kr(machine_config &config);
+ void sms1_br(machine_config &config);
+ void sms2_ntsc(machine_config &config);
+ void sms1_kr(machine_config &config);
+
+ DECLARE_WRITE_LINE_MEMBER(sms_pause_callback);
+
+ uint32_t screen_update_sms(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+protected:
void store_post_load();
void store_select_cart(uint8_t data);
@@ -105,7 +130,6 @@ public:
DECLARE_READ8_MEMBER(sms_sscope_r);
DECLARE_WRITE8_MEMBER(sms_sscope_w);
- DECLARE_WRITE_LINE_MEMBER(sms_pause_callback);
DECLARE_WRITE_LINE_MEMBER(sms_csync_callback);
DECLARE_WRITE_LINE_MEMBER(sms_ctrl1_th_input);
DECLARE_WRITE_LINE_MEMBER(sms_ctrl2_th_input);
@@ -117,7 +141,6 @@ public:
DECLARE_VIDEO_START(sms1);
DECLARE_VIDEO_RESET(sms1);
- uint32_t screen_update_sms(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sms1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sms1_left(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_sms1_right(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -125,25 +148,6 @@ public:
void screen_gg_sms_mode_scaling(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_sms1);
- void sms_base(machine_config &config);
- void sms_ntsc_base(machine_config &config);
- void sms_pal_base(machine_config &config);
- void sms_paln_base(machine_config &config);
- void sms_br_base(machine_config &config);
- void sms3_br(machine_config &config);
- void sg1000m3(machine_config &config);
- void smsj(machine_config &config);
- void sms1_paln(machine_config &config);
- void sms1_ntsc(machine_config &config);
- void gamegear(machine_config &config);
- void gamegeaj(machine_config &config);
- void sms3_paln(machine_config &config);
- void sms1_pal(machine_config &config);
- void sms2_pal(machine_config &config);
- void sms2_kr(machine_config &config);
- void sms1_br(machine_config &config);
- void sms2_ntsc(machine_config &config);
- void sms1_kr(machine_config &config);
void gg_io(address_map &map);
void sg1000m3_io(address_map &map);
void sms1_mem(address_map &map);
@@ -152,7 +156,6 @@ public:
void smsj_io(address_map &map);
void smskr_io(address_map &map);
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
uint8_t read_bus(address_space &space, unsigned int bank, uint16_t base_addr, uint16_t offset);
diff --git a/src/mame/includes/sms_bootleg.h b/src/mame/includes/sms_bootleg.h
index 4aead1b8730..693e993fd2d 100644
--- a/src/mame/includes/sms_bootleg.h
+++ b/src/mame/includes/sms_bootleg.h
@@ -2,16 +2,19 @@
class smsbootleg_state : public sms_state
{
- public:
- smsbootleg_state(const machine_config &mconfig, device_type type, const char *tag)
- : sms_state(mconfig, type, tag)
- {}
+public:
+ smsbootleg_state(const machine_config &mconfig, device_type type, const char *tag)
+ : sms_state(mconfig, type, tag)
+ {}
+
+ void sms_supergame(machine_config &config);
void init_sms_supergame();
+
+private:
DECLARE_WRITE8_MEMBER(port08_w);
DECLARE_WRITE8_MEMBER(port18_w);
- void sms_supergame(machine_config &config);
void sms_supergame_io(address_map &map);
void sms_supergame_map(address_map &map);
};
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 82227a3fd1e..e13ed483b38 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -299,6 +299,22 @@ struct snes_cart_info
class snes_state : public driver_device
{
public:
+ snes_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_soundcpu(*this, "soundcpu"),
+ m_spc700(*this, "spc700"),
+ m_ppu(*this, "ppu"),
+ m_screen(*this, "screen") { }
+
+ void init_snes();
+ void init_snes_hirom();
+ void init_snes_mess();
+ void init_snesst();
+
+ uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+protected:
enum
{
TIMER_NMI_TICK,
@@ -311,14 +327,6 @@ public:
TIMER_SNES_LAST
};
- snes_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_soundcpu(*this, "soundcpu"),
- m_spc700(*this, "spc700"),
- m_ppu(*this, "ppu"),
- m_screen(*this, "screen") { }
-
/* misc */
uint16_t m_hblank_offset;
uint32_t m_wram_address;
@@ -374,8 +382,6 @@ public:
snes_cart_info m_cart; // used by NSS/SFCBox only! to be moved in a derived class!
void rom_map_setup(uint32_t size);
- uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
/* devices */
required_device<_5a22_device> m_maincpu;
required_device<spc700_device> m_soundcpu;
@@ -383,12 +389,6 @@ public:
required_device<snes_ppu_device> m_ppu;
required_device<screen_device> m_screen;
-
- void init_snes();
- void init_snes_hirom();
- void init_snes_mess();
- void init_snesst();
-
inline int dma_abus_valid(uint32_t address);
inline uint8_t abus_read(address_space &space, uint32_t abus);
inline void dma_transfer(address_space &space, uint8_t dma, uint32_t abus, uint16_t bbus);
@@ -435,7 +435,6 @@ public:
virtual void machine_start() override;
virtual void machine_reset() override;
-protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index cc25e97241a..dd65349ee81 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -35,6 +35,38 @@ public:
m_bonus_io(*this, "BONUS")
{ }
+ void gwar(machine_config &config);
+ void psychos(machine_config &config);
+ void fitegolf(machine_config &config);
+ void countryc(machine_config &config);
+ void tdfever2(machine_config &config);
+ void aso(machine_config &config);
+ void gwara(machine_config &config);
+ void tdfever(machine_config &config);
+ void fitegolf2(machine_config &config);
+ void jcross(machine_config &config);
+ void choppera(machine_config &config);
+ void tnk3(machine_config &config);
+ void victroad(machine_config &config);
+ void chopper1(machine_config &config);
+ void vangrd2(machine_config &config);
+ void bermudat(machine_config &config);
+ void hal21(machine_config &config);
+ void marvins(machine_config &config);
+ void athena(machine_config &config);
+ void ikari(machine_config &config);
+ void sgladiat(machine_config &config);
+ void madcrush(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(marvins_sound_busy);
+ DECLARE_CUSTOM_INPUT_MEMBER(snk_sound_busy);
+ DECLARE_CUSTOM_INPUT_MEMBER(gwar_rotary);
+ DECLARE_CUSTOM_INPUT_MEMBER(gwarb_rotary);
+ DECLARE_CUSTOM_INPUT_MEMBER(countryc_trackball_x);
+ DECLARE_CUSTOM_INPUT_MEMBER(countryc_trackball_y);
+ DECLARE_CUSTOM_INPUT_MEMBER(snk_bonus_r);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<cpu_device> m_subcpu;
@@ -165,13 +197,7 @@ public:
DECLARE_WRITE8_MEMBER(gwara_sp_scroll_msb_w);
DECLARE_WRITE8_MEMBER(tdfever_sp_scroll_msb_w);
DECLARE_WRITE8_MEMBER(tdfever_spriteram_w);
- DECLARE_CUSTOM_INPUT_MEMBER(marvins_sound_busy);
- DECLARE_CUSTOM_INPUT_MEMBER(snk_sound_busy);
- DECLARE_CUSTOM_INPUT_MEMBER(gwar_rotary);
- DECLARE_CUSTOM_INPUT_MEMBER(gwarb_rotary);
- DECLARE_CUSTOM_INPUT_MEMBER(countryc_trackball_x);
- DECLARE_CUSTOM_INPUT_MEMBER(countryc_trackball_y);
- DECLARE_CUSTOM_INPUT_MEMBER(snk_bonus_r);
+
TILEMAP_MAPPER_MEMBER(marvins_tx_scan_cols);
TILE_GET_INFO_MEMBER(marvins_get_tx_tile_info);
TILE_GET_INFO_MEMBER(ikari_get_tx_tile_info);
@@ -213,28 +239,7 @@ public:
int turbofront_check(int small, int num);
int turbofront_check8(int small, int num);
DECLARE_WRITE_LINE_MEMBER(ymirq_callback_1);
- void gwar(machine_config &config);
- void psychos(machine_config &config);
- void fitegolf(machine_config &config);
- void countryc(machine_config &config);
- void tdfever2(machine_config &config);
- void aso(machine_config &config);
- void gwara(machine_config &config);
- void tdfever(machine_config &config);
- void fitegolf2(machine_config &config);
- void jcross(machine_config &config);
- void choppera(machine_config &config);
- void tnk3(machine_config &config);
- void victroad(machine_config &config);
- void chopper1(machine_config &config);
- void vangrd2(machine_config &config);
- void bermudat(machine_config &config);
- void hal21(machine_config &config);
- void marvins(machine_config &config);
- void athena(machine_config &config);
- void ikari(machine_config &config);
- void sgladiat(machine_config &config);
- void madcrush(machine_config &config);
+
void Y8950_sound_map(address_map &map);
void YM3526_Y8950_sound_map(address_map &map);
void YM3526_YM3526_sound_map(address_map &map);
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 7b14c36a46d..f5cfedfda92 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -29,6 +29,16 @@ public:
m_charram(*this, "charram")
{ }
+ void satansat(machine_config &config);
+ void vanguard(machine_config &config);
+ void sasuke(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(sasuke_count_r);
+ DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
+ DECLARE_VIDEO_START(pballoon);
+
+protected:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -58,9 +68,6 @@ public:
DECLARE_WRITE8_MEMBER(satansat_b002_w);
DECLARE_WRITE8_MEMBER(satansat_backcolor_w);
- DECLARE_CUSTOM_INPUT_MEMBER(sasuke_count_r);
- DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_fg_tile_info);
TILE_GET_INFO_MEMBER(satansat_get_bg_tile_info);
@@ -72,7 +79,6 @@ public:
DECLARE_PALETTE_INIT(satansat);
DECLARE_VIDEO_START(snk6502);
DECLARE_PALETTE_INIT(snk6502);
- DECLARE_VIDEO_START(pballoon);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -82,9 +88,7 @@ public:
void sasuke_start_counter();
void postload();
- void satansat(machine_config &config);
- void vanguard(machine_config &config);
- void sasuke(machine_config &config);
+
void sasuke_map(address_map &map);
void satansat_map(address_map &map);
void vanguard_map(address_map &map);
@@ -103,13 +107,12 @@ public:
void nibbler(machine_config &config);
void pballoon(machine_config &config);
-protected:
+private:
DECLARE_WRITE8_MEMBER(fantasy_flipscreen_w);
void fantasy_map(address_map &map);
void pballoon_map(address_map &map);
-private:
required_device<fantasy_sound_device> m_sound;
};
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index d5911655fe8..c67add4832f 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -22,6 +22,11 @@ public:
m_spriteram(*this, "spriteram")
{ }
+ void streetsm(machine_config &config);
+ void searchar(machine_config &config);
+ void pow(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_soundcpu;
required_device<upd7759_device> m_upd7759;
@@ -71,9 +76,6 @@ public:
void tile_callback_pow(int &tile, int& fx, int& fy, int& region);
void tile_callback_notpow(int &tile, int& fx, int& fy, int& region);
- void streetsm(machine_config &config);
- void searchar(machine_config &config);
- void pow(machine_config &config);
void pow_map(address_map &map);
void searchar_map(address_map &map);
void sound_io_map(address_map &map);
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index f604c334e9d..9c635db6d9b 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -15,6 +15,12 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
+ void apple10(machine_config &config);
+ void snookr10(machine_config &config);
+ void crystalc(machine_config &config);
+ void tenballs(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(dsw_port_1_r);
DECLARE_READ8_MEMBER(port2000_8_r);
DECLARE_WRITE8_MEMBER(output_port_0_w);
@@ -30,15 +36,10 @@ public:
DECLARE_PALETTE_INIT(apple10);
DECLARE_PALETTE_INIT(crystalc);
uint32_t screen_update_snookr10(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void apple10(machine_config &config);
- void snookr10(machine_config &config);
- void crystalc(machine_config &config);
- void tenballs(machine_config &config);
void crystalc_map(address_map &map);
void snookr10_map(address_map &map);
void tenballs_map(address_map &map);
-protected:
virtual void machine_start() override { m_lamps.resolve(); }
virtual void video_start() override;
diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h
index 5777c5516fe..9611cec6dcb 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -23,6 +23,29 @@ public:
m_bootleg_spriteram16(*this, "spriteram16b")
{ }
+ void _4in1(machine_config &config);
+ void semiprot(machine_config &config);
+ void semicom_mcu(machine_config &config);
+ void yutnori(machine_config &config);
+ void snowbros(machine_config &config);
+ void semicom(machine_config &config);
+ void twinadv(machine_config &config);
+ void wintbob(machine_config &config);
+ void honeydol(machine_config &config);
+ void snowbro3(machine_config &config);
+ void finalttr(machine_config &config);
+
+ void init_pzlbreak();
+ void init_snowbro3();
+ void init_cookbib3();
+ void init_4in1boot();
+ void init_3in1semi();
+ void init_cookbib2();
+ void init_toto();
+ void init_hyperpac();
+ void init_yutnori();
+
+private:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_soundcpu;
optional_device<okim6295_device> m_oki;
@@ -54,15 +77,6 @@ public:
DECLARE_WRITE16_MEMBER(sb3_sound_w);
DECLARE_READ16_MEMBER(toto_read);
- void init_pzlbreak();
- void init_snowbro3();
- void init_cookbib3();
- void init_4in1boot();
- void init_3in1semi();
- void init_cookbib2();
- void init_toto();
- void init_hyperpac();
- void init_yutnori();
DECLARE_MACHINE_RESET(semiprot);
DECLARE_MACHINE_RESET(finalttr);
@@ -78,17 +92,7 @@ public:
void sb3_play_music(int data);
void sb3_play_sound(int data);
- void _4in1(machine_config &config);
- void semiprot(machine_config &config);
- void semicom_mcu(machine_config &config);
- void yutnori(machine_config &config);
- void snowbros(machine_config &config);
- void semicom(machine_config &config);
- void twinadv(machine_config &config);
- void wintbob(machine_config &config);
- void honeydol(machine_config &config);
- void snowbro3(machine_config &config);
- void finalttr(machine_config &config);
+
void finalttr_map(address_map &map);
void honeydol_map(address_map &map);
void honeydol_sound_io_map(address_map &map);
diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h
index 23b452a8076..18b71aa7523 100644
--- a/src/mame/includes/softbox.h
+++ b/src/mame/includes/softbox.h
@@ -33,6 +33,9 @@ public:
, m_leds(*this, "led%u", 0U)
{ }
+ void softbox(machine_config &config);
+
+private:
// device_ieee488_interface overrides
virtual void ieee488_ifc(int state);
@@ -51,12 +54,10 @@ public:
LED_READY
};
- void softbox(machine_config &config);
void softbox_io(address_map &map);
void softbox_mem(address_map &map);
int m_ifc; // Tracks previous state of IEEE-488 IFC line
-protected:
virtual void machine_start() override;
virtual void device_reset_after_children() override;
diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h
index 8e947d6a927..aad7b75fc90 100644
--- a/src/mame/includes/solomon.h
+++ b/src/mame/includes/solomon.h
@@ -20,6 +20,9 @@ public:
m_palette(*this, "palette"),
m_soundlatch(*this, "soundlatch") { }
+ void solomon(machine_config &config);
+
+private:
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
@@ -49,7 +52,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
required_device<generic_latch_8_device> m_soundlatch;
- void solomon(machine_config &config);
+
void main_map(address_map &map);
void sound_map(address_map &map);
void sound_portmap(address_map &map);
diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h
index ade1bd5f319..4656491d16d 100644
--- a/src/mame/includes/sonson.h
+++ b/src/mame/includes/sonson.h
@@ -21,6 +21,9 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void sonson(machine_config &config);
+
+private:
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
@@ -46,7 +49,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
- void sonson(machine_config &config);
+
void main_map(address_map &map);
void sound_map(address_map &map);
};
diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h
index 7db223944cb..ae88c951cf7 100644
--- a/src/mame/includes/sorcerer.h
+++ b/src/mame/includes/sorcerer.h
@@ -44,13 +44,6 @@ struct cass_data_t {
class sorcerer_state : public driver_device
{
public:
- enum
- {
- TIMER_SERIAL,
- TIMER_CASSETTE,
- TIMER_RESET
- };
-
sorcerer_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
@@ -68,25 +61,37 @@ public:
, m_iop_x(*this, "X.%u", 0)
{ }
+ void sorcerer(machine_config &config);
+ void sorcererd(machine_config &config);
+
+ void init_sorcerer();
+
+private:
+ enum
+ {
+ TIMER_SERIAL,
+ TIMER_CASSETTE,
+ TIMER_RESET
+ };
+
DECLARE_READ8_MEMBER(sorcerer_fd_r);
DECLARE_READ8_MEMBER(sorcerer_fe_r);
DECLARE_WRITE8_MEMBER(sorcerer_fd_w);
DECLARE_WRITE8_MEMBER(sorcerer_fe_w);
DECLARE_WRITE8_MEMBER(sorcerer_ff_w);
DECLARE_MACHINE_START(sorcererd);
- void init_sorcerer();
+
TIMER_CALLBACK_MEMBER(sorcerer_cassette_tc);
TIMER_CALLBACK_MEMBER(sorcerer_serial_tc);
TIMER_CALLBACK_MEMBER(sorcerer_reset);
DECLARE_SNAPSHOT_LOAD_MEMBER( sorcerer );
DECLARE_QUICKLOAD_LOAD_MEMBER( sorcerer);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void sorcerer(machine_config &config);
- void sorcererd(machine_config &config);
+
void sorcerer_io(address_map &map);
void sorcerer_mem(address_map &map);
void sorcererd_mem(address_map &map);
-private:
+
uint8_t m_fe;
uint8_t m_keyboard_line;
const uint8_t *m_p_videoram;
diff --git a/src/mame/includes/spacefb.h b/src/mame/includes/spacefb.h
index a7b90c6f159..279181d514c 100644
--- a/src/mame/includes/spacefb.h
+++ b/src/mame/includes/spacefb.h
@@ -38,6 +38,15 @@ public:
m_screen(*this, "screen"),
m_videoram(*this, "videoram") { }
+ void spacefb(machine_config &config);
+ void spacefb_audio(machine_config &config);
+
+private:
+ enum
+ {
+ TIMER_INTERRUPT
+ };
+
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<samples_device> m_samples;
@@ -77,17 +86,9 @@ public:
void draw_sprite(offs_t offs, pen_t *pens, bitmap_rgb32 &bitmap, const rectangle &cliprect, int flip);
void draw_objects(bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void spacefb(machine_config &config);
- void spacefb_audio(machine_config &config);
void spacefb_audio_map(address_map &map);
void spacefb_main_io_map(address_map &map);
void spacefb_main_map(address_map &map);
-protected:
-
- enum
- {
- TIMER_INTERRUPT
- };
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h
index d9fb1ba1ff9..221a4d09c6d 100644
--- a/src/mame/includes/spbactn.h
+++ b/src/mame/includes/spbactn.h
@@ -27,6 +27,10 @@ public:
m_extraram2(*this, "extraram2")
{ }
+ void spbactn(machine_config &config);
+ void spbactnp(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -57,13 +61,10 @@ public:
DECLARE_WRITE8_MEMBER(extraram_w);
TILE_GET_INFO_MEMBER(get_extra_tile_info);
-
-
bitmap_ind16 m_tile_bitmap_bg;
bitmap_ind16 m_tile_bitmap_fg;
bitmap_ind16 m_sprite_bitmap;
-
DECLARE_WRITE16_MEMBER(spbatnp_90006_w);
DECLARE_WRITE16_MEMBER(spbatnp_9000a_w);
DECLARE_WRITE16_MEMBER(spbatnp_9000c_w);
@@ -75,7 +76,6 @@ public:
DECLARE_VIDEO_START(spbactn);
DECLARE_VIDEO_START(spbactnp);
-
//virtual void video_start();
uint32_t screen_update_spbactn(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint32_t screen_update_spbactnp(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -86,8 +86,7 @@ public:
{
return 0xffff;
}
- void spbactn(machine_config &config);
- void spbactnp(machine_config &config);
+
void spbactn_map(address_map &map);
void spbactn_sound_map(address_map &map);
void spbactnp_extra_map(address_map &map);
diff --git a/src/mame/includes/spcforce.h b/src/mame/includes/spcforce.h
index f2f9b5694cf..c5a34668322 100644
--- a/src/mame/includes/spcforce.h
+++ b/src/mame/includes/spcforce.h
@@ -22,6 +22,10 @@ public:
m_lamps(*this, "lamp%u", 0U)
{ }
+ void meteors(machine_config &config);
+ void spcforce(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(SN76496_latch_w);
DECLARE_READ8_MEMBER(SN76496_select_r);
DECLARE_WRITE8_MEMBER(SN76496_select_w);
@@ -40,12 +44,10 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(vblank_irq);
- void meteors(machine_config &config);
- void spcforce(machine_config &config);
+
void spcforce_map(address_map &map);
void spcforce_sound_map(address_map &map);
-protected:
virtual void machine_start() override;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 9b59bd0188c..6174ba80ff4 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -28,6 +28,11 @@ public:
m_videoram(*this, "videoram"),
m_spriteram(*this, "spriteram") { }
+ void spdodgeb(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(mcu63705_busy_r);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<msm5205_device> m_msm1;
@@ -84,11 +89,9 @@ public:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
- DECLARE_CUSTOM_INPUT_MEMBER(mcu63705_busy_r);
void mcu63705_update_inputs();
void spd_adpcm_int(msm5205_device *device, int chip);
- void spdodgeb(machine_config &config);
void spdodgeb_map(address_map &map);
void spdodgeb_sound_map(address_map &map);
};
diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h
index a88b9ead896..93efa62815d 100644
--- a/src/mame/includes/special.h
+++ b/src/mame/includes/special.h
@@ -30,12 +30,6 @@
class special_state : public driver_device
{
public:
- enum
- {
- TIMER_RESET,
- TIMER_PIT8253_GATES
- };
-
special_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -57,6 +51,22 @@ public:
m_io_line(*this, "LINE%u", 0U),
m_palette(*this, "palette") { }
+ void special(machine_config &config);
+ void erik(machine_config &config);
+ void specimx(machine_config &config);
+ void specialp(machine_config &config);
+ void specialm(machine_config &config);
+
+ void init_erik();
+ void init_special();
+
+private:
+ enum
+ {
+ TIMER_RESET,
+ TIMER_PIT8253_GATES
+ };
+
DECLARE_WRITE8_MEMBER(specimx_select_bank);
DECLARE_WRITE8_MEMBER(video_memory_w);
DECLARE_WRITE8_MEMBER(specimx_video_color_w);
@@ -76,8 +86,7 @@ public:
DECLARE_WRITE8_MEMBER(specialist_8255_porta_w);
DECLARE_WRITE8_MEMBER(specialist_8255_portb_w);
DECLARE_WRITE8_MEMBER(specialist_8255_portc_w);
- void init_erik();
- void init_special();
+
DECLARE_MACHINE_RESET(special);
DECLARE_VIDEO_START(special);
DECLARE_MACHINE_RESET(erik);
@@ -95,17 +104,12 @@ public:
DECLARE_WRITE_LINE_MEMBER(fdc_drq);
DECLARE_FLOPPY_FORMATS( specimx_floppy_formats );
- void special(machine_config &config);
- void erik(machine_config &config);
- void specimx(machine_config &config);
- void specialp(machine_config &config);
- void specialm(machine_config &config);
void erik_io_map(address_map &map);
void erik_mem(address_map &map);
void specialist_mem(address_map &map);
void specialp_mem(address_map &map);
void specimx_mem(address_map &map);
-private:
+
void specimx_set_bank(offs_t i, uint8_t data);
void erik_set_bank();
std::unique_ptr<uint8_t[]> m_specimx_colorram;
diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h
index 2e014a16593..05b96dec6b7 100644
--- a/src/mame/includes/spectrum.h
+++ b/src/mame/includes/spectrum.h
@@ -65,12 +65,6 @@ struct EVENT_LIST_ITEM
class spectrum_state : public driver_device
{
public:
- enum
- {
- TIMER_IRQ_ON,
- TIMER_IRQ_OFF,
- TIMER_SCANLINE
- };
spectrum_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_video_ram(*this, "video_ram"),
@@ -102,6 +96,26 @@ public:
m_io_joy1(*this, "JOY1"),
m_io_joy2(*this, "JOY2") { }
+ void spectrum_common(machine_config &config);
+ void spectrum(machine_config &config);
+ void ts2068(machine_config &config);
+ void uk2086(machine_config &config);
+ void tc2048(machine_config &config);
+ void spectrum_plus3(machine_config &config);
+ void spectrum_128(machine_config &config);
+
+ void init_spectrum();
+ void init_plus2();
+ void init_plus3();
+
+protected:
+ enum
+ {
+ TIMER_IRQ_ON,
+ TIMER_IRQ_OFF,
+ TIMER_SCANLINE
+ };
+
int m_port_fe_data;
int m_port_7ffd_data;
int m_port_1ffd_data; /* scorpion and plus3 */
@@ -160,9 +174,6 @@ public:
DECLARE_WRITE8_MEMBER(ts2068_port_ff_w);
DECLARE_WRITE8_MEMBER(tc2048_port_ff_w);
- void init_spectrum();
- void init_plus2();
- void init_plus3();
DECLARE_MACHINE_RESET(spectrum);
DECLARE_VIDEO_START(spectrum);
DECLARE_PALETTE_INIT(spectrum);
@@ -180,7 +191,7 @@ public:
INTERRUPT_GEN_MEMBER(spec_interrupt);
// for timex cart only
- DECLARE_DEVICE_IMAGE_LOAD_MEMBER( timex_cart );
+ DECLARE_DEVICE_IMAGE_LOAD_MEMBER(timex_cart);
int m_dock_cart_type, m_ram_chunks;
memory_region *m_dock_crt;
@@ -189,24 +200,17 @@ public:
unsigned int m_previous_screen_x, m_previous_screen_y;
bitmap_ind16 m_screen_bitmap;
- DECLARE_FLOPPY_FORMATS( floppy_formats );
+ DECLARE_FLOPPY_FORMATS(floppy_formats);
void spectrum_128_update_memory();
void spectrum_plus3_update_memory();
void ts2068_update_memory();
- DECLARE_SNAPSHOT_LOAD_MEMBER( spectrum );
- DECLARE_QUICKLOAD_LOAD_MEMBER( spectrum );
+ DECLARE_SNAPSHOT_LOAD_MEMBER(spectrum);
+ DECLARE_QUICKLOAD_LOAD_MEMBER(spectrum);
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
- void spectrum_common(machine_config &config);
- void spectrum(machine_config &config);
- void ts2068(machine_config &config);
- void uk2086(machine_config &config);
- void tc2048(machine_config &config);
- void spectrum_plus3(machine_config &config);
- void spectrum_128(machine_config &config);
void spectrum_128_io(address_map &map);
void spectrum_128_mem(address_map &map);
void spectrum_io(address_map &map);
@@ -217,7 +221,7 @@ public:
void tc2048_mem(address_map &map);
void ts2068_io(address_map &map);
void ts2068_mem(address_map &map);
-protected:
+
required_device<cassette_image_device> m_cassette;
required_device<ram_device> m_ram;
required_device<speaker_sound_device> m_speaker;
diff --git a/src/mame/includes/speedatk.h b/src/mame/includes/speedatk.h
index bb0f220498d..d0ab125e916 100644
--- a/src/mame/includes/speedatk.h
+++ b/src/mame/includes/speedatk.h
@@ -16,6 +16,9 @@ public:
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram") { }
+ void speedatk(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<h46505_device> m_crtc;
required_device<gfxdecode_device> m_gfxdecode;
@@ -46,7 +49,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint8_t iox_key_matrix_calc(uint8_t p_side);
- void speedatk(machine_config &config);
+
void speedatk_io(address_map &map);
void speedatk_mem(address_map &map);
};
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index 7273349c483..1beb3adbac1 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -17,6 +17,12 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void speedbal(machine_config &config);
+
+ void init_speedbal();
+ void init_musicbal();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -31,8 +37,6 @@ public:
tilemap_t *m_bg_tilemap;
tilemap_t *m_fg_tilemap;
- void init_speedbal();
- void init_musicbal();
virtual void machine_start() override;
virtual void video_start() override;
@@ -49,7 +53,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void speedbal(machine_config &config);
+
void main_cpu_io_map(address_map &map);
void main_cpu_map(address_map &map);
void sound_cpu_io_map(address_map &map);
diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h
index 325f863a4e9..1e9ab2c243f 100644
--- a/src/mame/includes/speedspn.h
+++ b/src/mame/includes/speedspn.h
@@ -20,6 +20,9 @@ public:
m_okibank(*this, "okibank"),
m_attram(*this, "attram") { }
+ void speedspn(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<okim6295_device> m_oki;
@@ -49,7 +52,7 @@ public:
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
- void speedspn(machine_config &config);
+
void io_map(address_map &map);
void oki_map(address_map &map);
void program_map(address_map &map);
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index d348da7ecc9..74fcb56a686 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -31,6 +31,15 @@ public:
m_bitmap_mode(*this, "bitmap_mode")
{ }
+ void roldfrog(machine_config &config);
+ void splash(machine_config &config);
+
+ void init_splash10();
+ void init_roldfrog();
+ void init_splash();
+ void init_rebus();
+
+protected:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
optional_device<msm5205_device> m_msm;
@@ -81,10 +90,6 @@ public:
//roldfrog and funystrp specific
DECLARE_WRITE8_MEMBER(sound_bank_w);
- void init_splash10();
- void init_roldfrog();
- void init_splash();
- void init_rebus();
virtual void video_start() override;
DECLARE_MACHINE_START(splash);
DECLARE_MACHINE_START(roldfrog);
@@ -99,8 +104,7 @@ public:
INTERRUPT_GEN_MEMBER(roldfrog_interrupt);
void roldfrog_update_irq( );
- void roldfrog(machine_config &config);
- void splash(machine_config &config);
+
void funystrp_sound_map(address_map &map);
void roldfrog_map(address_map &map);
void roldfrog_sound_io_map(address_map &map);
@@ -122,10 +126,10 @@ public:
m_funystrp_ff3cc8_val(0)
{ }
- void init_funystrp();
-
void funystrp(machine_config &config);
+ void init_funystrp();
+
protected:
virtual void machine_start() override;
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index 9731bb53e7c..15ad43d5873 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -45,6 +45,17 @@ public:
m_screen(*this, "screen"),
m_palette(*this, "palette") { }
+ void sprint1(machine_config &config);
+ void sprint2(machine_config &config);
+ void dominos4(machine_config &config);
+ void dominos(machine_config &config);
+
+ void init_sprint1();
+ void init_sprint2();
+ void init_dominos();
+ void init_dominos4();
+
+private:
int m_steering[2];
int m_gear[2];
int m_game;
@@ -70,10 +81,6 @@ public:
DECLARE_WRITE8_MEMBER(sprint2_collision_reset2_w);
DECLARE_WRITE8_MEMBER(sprint2_video_ram_w);
DECLARE_WRITE8_MEMBER(sprint2_noise_reset_w);
- void init_sprint1();
- void init_sprint2();
- void init_dominos();
- void init_dominos4();
TILE_GET_INFO_MEMBER(get_tile_info);
virtual void video_start() override;
DECLARE_PALETTE_INIT(sprint2);
@@ -92,10 +99,7 @@ public:
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
- void sprint1(machine_config &config);
- void sprint2(machine_config &config);
- void dominos4(machine_config &config);
- void dominos(machine_config &config);
+
void sprint2_map(address_map &map);
};
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index f8703bfc48b..2646d78b411 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -29,12 +29,13 @@ public:
m_videoram(*this, "videoram")
{ }
+ void sprint4(machine_config &config);
+
DECLARE_CUSTOM_INPUT_MEMBER(get_lever);
DECLARE_CUSTOM_INPUT_MEMBER(get_wheel);
DECLARE_CUSTOM_INPUT_MEMBER(get_collision);
- void sprint4(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER(wram_r);
DECLARE_READ8_MEMBER(analog_r);
DECLARE_READ8_MEMBER(coin_r);
@@ -64,7 +65,6 @@ protected:
void sprint4_cpu_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<watchdog_timer_device> m_watchdog;
required_device<discrete_device> m_discrete;
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index c858b1e2c2d..f6af552bb8c 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -29,7 +29,7 @@ public:
void sprint8(machine_config &config);
-protected:
+private:
DECLARE_READ8_MEMBER(collision_r);
DECLARE_READ8_MEMBER(input_r);
DECLARE_WRITE8_MEMBER(lockout_w);
@@ -55,7 +55,6 @@ protected:
void sprint8_audio(machine_config &config);
void sprint8_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<screen_device> m_screen;
diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h
index 8db0b067e1c..d5f8c754c64 100644
--- a/src/mame/includes/spy.h
+++ b/src/mame/includes/spy.h
@@ -25,6 +25,9 @@ public:
m_k051960(*this, "k051960"),
m_palette(*this, "palette") { }
+ void spy(machine_config &config);
+
+private:
/* memory pointers */
required_shared_ptr<uint8_t> m_ram;
uint8_t m_pmcram[0x800];
@@ -61,7 +64,7 @@ public:
DECLARE_WRITE8_MEMBER(volume_callback1);
K052109_CB_MEMBER(tile_callback);
K051960_CB_MEMBER(sprite_callback);
- void spy(machine_config &config);
+
void spy_map(address_map &map);
void spy_sound_map(address_map &map);
};
diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h
index 72e12c51a14..1ad9f968351 100644
--- a/src/mame/includes/srmp2.h
+++ b/src/mame/includes/srmp2.h
@@ -24,6 +24,12 @@ public:
m_mainbank(*this, "mainbank")
{ }
+ void mjyuugi(machine_config &config);
+ void srmp2(machine_config &config);
+ void rmgoldyh(machine_config &config);
+ void srmp3(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<seta001_device> m_seta001;
required_device<msm5205_device> m_msm;
@@ -80,10 +86,7 @@ public:
SETA001_SPRITE_GFXBANK_CB_MEMBER(srmp3_gfxbank_callback);
uint8_t iox_key_matrix_calc(uint8_t p_side);
- void mjyuugi(machine_config &config);
- void srmp2(machine_config &config);
- void rmgoldyh(machine_config &config);
- void srmp3(machine_config &config);
+
void mjyuugi_map(address_map &map);
void rmgoldyh_io_map(address_map &map);
void rmgoldyh_map(address_map &map);
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index 5862bb28629..e3b5432c514 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -17,6 +17,9 @@ public:
m_backgroundram(*this, "backgroundram"),
m_foregroundram(*this, "foregroundram") { }
+ void srumbler(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<buffered_spriteram8_device> m_spriteram;
required_device<gfxdecode_device> m_gfxdecode;
@@ -45,7 +48,6 @@ public:
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
- void srumbler(machine_config &config);
void srumbler_map(address_map &map);
void srumbler_sound_map(address_map &map);
};
diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h
index 52cef935b4a..d77b2fdb1b1 100644
--- a/src/mame/includes/sshangha.h
+++ b/src/mame/includes/sshangha.h
@@ -10,10 +10,10 @@ class sshangha_state : public driver_device
public:
sshangha_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
- m_deco146(*this, "ioprot"),
- m_deco_tilegen1(*this, "tilegen1"),
- m_spriteram(*this, "spriteram"),
- m_spriteram2(*this, "spriteram2"),
+ m_deco146(*this, "ioprot"),
+ m_deco_tilegen1(*this, "tilegen1"),
+ m_spriteram(*this, "spriteram"),
+ m_spriteram2(*this, "spriteram2"),
m_sound_shared_ram(*this, "sound_shared"),
m_pf1_rowscroll(*this, "pf1_rowscroll"),
m_pf2_rowscroll(*this, "pf2_rowscroll"),
@@ -26,8 +26,15 @@ public:
m_sprgen2(*this, "spritegen2"),
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
- m_palette(*this, "palette") { }
+ m_palette(*this, "palette")
+ { }
+ void sshanghb(machine_config &config);
+ void sshangha(machine_config &config);
+
+ void init_sshangha();
+
+private:
optional_device<deco146_device> m_deco146;
required_device<deco16ic_device> m_deco_tilegen1;
required_shared_ptr<uint16_t> m_spriteram;
@@ -50,11 +57,10 @@ public:
int m_video_control;
DECO16IC_BANK_CB_MEMBER(bank_callback);
- DECLARE_READ16_MEMBER( sshangha_protection_region_8_146_r );
- DECLARE_WRITE16_MEMBER( sshangha_protection_region_8_146_w );
- DECLARE_READ16_MEMBER( sshangha_protection_region_d_146_r );
- DECLARE_WRITE16_MEMBER( sshangha_protection_region_d_146_w );
-
+ DECLARE_READ16_MEMBER(sshangha_protection_region_8_146_r);
+ DECLARE_WRITE16_MEMBER(sshangha_protection_region_8_146_w);
+ DECLARE_READ16_MEMBER(sshangha_protection_region_d_146_r);
+ DECLARE_WRITE16_MEMBER(sshangha_protection_region_d_146_w);
DECLARE_READ16_MEMBER(sshanghb_protection16_r);
DECLARE_READ16_MEMBER(deco_71_r);
@@ -65,7 +71,7 @@ public:
DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilelow_w);
DECLARE_WRITE16_MEMBER(paletteram16_xbgr_word_be_tilehigh_w);
DECLARE_WRITE16_MEMBER(sshangha_video_w);
- void init_sshangha();
+
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_sshangha(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -73,8 +79,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<palette_device> m_palette;
- void sshanghb(machine_config &config);
- void sshangha(machine_config &config);
+
void sshangha_map(address_map &map);
void sshangha_sound_map(address_map &map);
void sshanghb_map(address_map &map);
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index d89bcf0f7f0..0bb7be28a2a 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -22,7 +22,13 @@ public:
m_regs(*this, "regs"),
m_spriteram(*this, "spriteram") { }
+ void sslam(machine_config &config);
+ void powerbls(machine_config &config);
+
+ void init_sslam();
+ void init_powerbls();
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<okim6295_device> m_oki;
@@ -62,8 +68,7 @@ public:
DECLARE_WRITE16_MEMBER(sslam_bg_tileram_w);
DECLARE_WRITE16_MEMBER(powerbls_bg_tileram_w);
DECLARE_WRITE8_MEMBER(sslam_snd_w);
- void init_sslam();
- void init_powerbls();
+
TILE_GET_INFO_MEMBER(get_sslam_tx_tile_info);
TILE_GET_INFO_MEMBER(get_sslam_md_tile_info);
TILE_GET_INFO_MEMBER(get_sslam_bg_tile_info);
@@ -75,8 +80,7 @@ public:
TIMER_CALLBACK_MEMBER(music_playback);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
void sslam_play(int track, int data);
- void sslam(machine_config &config);
- void powerbls(machine_config &config);
+
void powerbls_map(address_map &map);
void sslam_program_map(address_map &map);
};
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index 97a32df9e1f..a2affae7b49 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -19,6 +19,11 @@ public:
m_videoram2(*this, "videoram2"),
m_colorram2(*this, "colorram2") { }
+ void ssozumo(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
+private:
DECLARE_WRITE8_MEMBER(sound_nmi_mask_w);
DECLARE_WRITE8_MEMBER(videoram_w);
DECLARE_WRITE8_MEMBER(colorram_w);
@@ -28,8 +33,6 @@ public:
DECLARE_WRITE8_MEMBER(scroll_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
INTERRUPT_GEN_MEMBER(sound_timer_irq);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
@@ -38,14 +41,12 @@ public:
DECLARE_PALETTE_INIT(ssozumo);
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void ssozumo(machine_config &config);
void ssozumo_map(address_map &map);
void ssozumo_sound_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void video_start() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h
index 4a895d97568..7cb6bc05184 100644
--- a/src/mame/includes/sspeedr.h
+++ b/src/mame/includes/sspeedr.h
@@ -14,6 +14,9 @@ public:
, m_digits(*this, "digit%u", 0U)
{ }
+ void sspeedr(machine_config &config);
+
+private:
DECLARE_WRITE8_MEMBER(sspeedr_int_ack_w);
DECLARE_WRITE8_MEMBER(sspeedr_lamp_w);
DECLARE_WRITE8_MEMBER(sspeedr_time_w);
@@ -34,11 +37,9 @@ public:
DECLARE_PALETTE_INIT(sspeedr);
uint32_t screen_update_sspeedr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_sspeedr);
- void sspeedr(machine_config &config);
void sspeedr_io_map(address_map &map);
void sspeedr_map(address_map &map);
-private:
uint8_t m_led_TIME[2];
uint8_t m_led_SCORE[24];
int m_toggle;
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index e20f342aa4f..4db0839e211 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -17,6 +17,9 @@ public:
m_vram4(*this, "vram4"),
m_scrollram(*this, "scrollram") { }
+ void ssrj(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -50,6 +53,6 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank);
void draw_objects(bitmap_ind16 &bitmap, const rectangle &cliprect );
- void ssrj(machine_config &config);
+
void ssrj_map(address_map &map);
};
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index cfb3ed2ebca..aeedc05b698 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -38,6 +38,54 @@ public:
m_palette(*this, "palette")
{ }
+ void ssv(machine_config &config);
+ void gdfs(machine_config &config);
+ void dynagear(machine_config &config);
+ void hypreac2(machine_config &config);
+ void meosism(machine_config &config);
+ void drifto94(machine_config &config);
+ void stmblade(machine_config &config);
+ void srmp4(machine_config &config);
+ void srmp7(machine_config &config);
+ void twineag2(machine_config &config);
+ void ryorioh(machine_config &config);
+ void janjans1(machine_config &config);
+ void eaglshot(machine_config &config);
+ void survarts(machine_config &config);
+ void sxyreac2(machine_config &config);
+ void ultrax(machine_config &config);
+ void vasara(machine_config &config);
+ void sxyreact(machine_config &config);
+ void mslider(machine_config &config);
+ void jsk(machine_config &config);
+ void hypreact(machine_config &config);
+ void keithlcy(machine_config &config);
+ void cairblad(machine_config &config);
+
+ void init_gdfs();
+ void init_sxyreac2();
+ void init_hypreac2();
+ void init_hypreact();
+ void init_dynagear();
+ void init_eaglshot();
+ void init_srmp4();
+ void init_srmp7();
+ void init_keithlcy();
+ void init_meosism();
+ void init_vasara();
+ void init_cairblad();
+ void init_sxyreact();
+ void init_janjans1();
+ void init_ryorioh();
+ void init_drifto94();
+ void init_survarts();
+ void init_ultrax();
+ void init_stmblade();
+ void init_jsk();
+ void init_twineag2();
+ void init_mslider();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<es5506_device> m_ensoniq;
optional_device<eeprom_serial_93cxx_device> m_eeprom;
@@ -103,28 +151,6 @@ public:
TILE_GET_INFO_MEMBER(get_tile_info_0);
- void init_gdfs();
- void init_sxyreac2();
- void init_hypreac2();
- void init_hypreact();
- void init_dynagear();
- void init_eaglshot();
- void init_srmp4();
- void init_srmp7();
- void init_keithlcy();
- void init_meosism();
- void init_vasara();
- void init_cairblad();
- void init_sxyreact();
- void init_janjans1();
- void init_ryorioh();
- void init_drifto94();
- void init_survarts();
- void init_ultrax();
- void init_stmblade();
- void init_jsk();
- void init_twineag2();
- void init_mslider();
virtual void machine_reset() override;
virtual void video_start() override;
DECLARE_VIDEO_START(gdfs);
@@ -148,29 +174,7 @@ public:
void init_hypreac2_common();
void init_eaglshot_banking();
- void ssv(machine_config &config);
- void gdfs(machine_config &config);
- void dynagear(machine_config &config);
- void hypreac2(machine_config &config);
- void meosism(machine_config &config);
- void drifto94(machine_config &config);
- void stmblade(machine_config &config);
- void srmp4(machine_config &config);
- void srmp7(machine_config &config);
- void twineag2(machine_config &config);
- void ryorioh(machine_config &config);
- void janjans1(machine_config &config);
- void eaglshot(machine_config &config);
- void survarts(machine_config &config);
- void sxyreac2(machine_config &config);
- void ultrax(machine_config &config);
- void vasara(machine_config &config);
- void sxyreact(machine_config &config);
- void mslider(machine_config &config);
- void jsk(machine_config &config);
- void hypreact(machine_config &config);
- void keithlcy(machine_config &config);
- void cairblad(machine_config &config);
+
void drifto94_map(address_map &map);
void dsp_data_map(address_map &map);
void dsp_prg_map(address_map &map);
@@ -191,7 +195,7 @@ public:
void sxyreact_map(address_map &map);
void twineag2_map(address_map &map);
void ultrax_map(address_map &map);
-protected:
+
optional_ioport_array<4> m_io_key;
optional_ioport m_io_service;
optional_ioport m_io_paddle;
diff --git a/src/mame/includes/ssystem3.h b/src/mame/includes/ssystem3.h
index bcbd7c061b8..7a61d7986ac 100644
--- a/src/mame/includes/ssystem3.h
+++ b/src/mame/includes/ssystem3.h
@@ -51,7 +51,11 @@ public:
, m_matrix(*this, "matrix.%u", 0)
{ }
+ void ssystem3(machine_config &config);
+
void init_ssystem3();
+
+private:
virtual void video_start() override;
DECLARE_PALETTE_INIT(ssystem3);
uint32_t screen_update_ssystem3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -68,9 +72,8 @@ public:
void ssystem3_playfield_write(int reset, int signal);
void ssystem3_playfield_read(int *on, int *ready);
- void ssystem3(machine_config &config);
void ssystem3_map(address_map &map);
-private:
+
uint8_t m_porta;
std::unique_ptr<uint8_t[]> m_videoram;
playfield_t m_playfield;
diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h
index 52cf3013327..c6ed94e64fe 100644
--- a/src/mame/includes/stactics.h
+++ b/src/mame/includes/stactics.h
@@ -38,15 +38,15 @@ public:
m_fake(*this, "FAKE")
{ }
+ void stactics(machine_config &config);
+
DECLARE_CUSTOM_INPUT_MEMBER(get_frame_count_d3);
DECLARE_CUSTOM_INPUT_MEMBER(get_shot_standby);
DECLARE_CUSTOM_INPUT_MEMBER(get_not_shot_arrive);
DECLARE_CUSTOM_INPUT_MEMBER(get_motor_not_ready);
DECLARE_CUSTOM_INPUT_MEMBER(get_rng);
- void stactics(machine_config &config);
-
-protected:
+private:
DECLARE_READ8_MEMBER(vert_pos_r);
DECLARE_READ8_MEMBER(horiz_pos_r);
DECLARE_WRITE_LINE_MEMBER(coin_lockout_1_w);
@@ -83,7 +83,6 @@ protected:
void stactics_video(machine_config &config);
void main_map(address_map &map);
-private:
required_device<cpu_device> m_maincpu;
required_device<ls259_device> m_outlatch;
diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h
index 60c21ac4205..547a42ed624 100644
--- a/src/mame/includes/stadhero.h
+++ b/src/mame/includes/stadhero.h
@@ -19,6 +19,9 @@ public:
m_spriteram(*this, "spriteram"),
m_pf1_data(*this, "pf1_data") { }
+ void stadhero(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<deco_bac06_device> m_tilegen1;
@@ -38,7 +41,6 @@ public:
TILE_GET_INFO_MEMBER(get_pf1_tile_info);
uint32_t screen_update_stadhero(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void stadhero(machine_config &config);
void audio_map(address_map &map);
void main_map(address_map &map);
};
diff --git a/src/mame/includes/starcrus.h b/src/mame/includes/starcrus.h
index a7caa02b771..ed5181c443f 100644
--- a/src/mame/includes/starcrus.h
+++ b/src/mame/includes/starcrus.h
@@ -17,6 +17,7 @@ public:
void starcrus(machine_config &config);
+private:
DECLARE_WRITE8_MEMBER(s1_x_w);
DECLARE_WRITE8_MEMBER(s1_y_w);
DECLARE_WRITE8_MEMBER(s2_x_w);
@@ -31,11 +32,9 @@ public:
DECLARE_WRITE8_MEMBER(proj_parm_2_w);
DECLARE_READ8_MEMBER(coll_det_r);
-protected:
virtual void machine_start() override;
virtual void video_start() override;
-private:
required_device<cpu_device> m_maincpu;
required_device<samples_device> m_samples;
required_device<gfxdecode_device> m_gfxdecode;
diff --git a/src/mame/includes/starfire.h b/src/mame/includes/starfire.h
index 56e5a0fe40a..8dda83c71bd 100644
--- a/src/mame/includes/starfire.h
+++ b/src/mame/includes/starfire.h
@@ -34,6 +34,13 @@ public:
m_maincpu(*this, "maincpu"),
m_screen(*this, "screen") { }
+ void fireone(machine_config &config);
+ void starfire(machine_config &config);
+
+ void init_starfire();
+ void init_fireone();
+
+private:
required_shared_ptr<uint8_t> m_starfire_colorram;
required_shared_ptr<uint8_t> m_starfire_videoram;
optional_device<samples_device> m_samples;
@@ -62,8 +69,6 @@ public:
DECLARE_READ8_MEMBER(starfire_colorram_r);
DECLARE_WRITE8_MEMBER(starfire_videoram_w);
DECLARE_READ8_MEMBER(starfire_videoram_r);
- void init_starfire();
- void init_fireone();
virtual void video_start() override;
uint32_t screen_update_starfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
TIMER_CALLBACK_MEMBER(starfire_scanline_callback);
@@ -71,7 +76,6 @@ public:
void get_pens(pen_t *pens);
required_device<cpu_device> m_maincpu;
required_device<screen_device> m_screen;
- void fireone(machine_config &config);
- void starfire(machine_config &config);
+
void main_map(address_map &map);
};
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index bdf2484f73c..25bbf4ef447 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -63,11 +63,12 @@ public:
m_led(*this, "led0")
{ }
+ void starshp1(machine_config &config);
+
DECLARE_CUSTOM_INPUT_MEMBER(starshp1_analog_r);
DECLARE_CUSTOM_INPUT_MEMBER(collision_latch_r);
- void starshp1(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
DECLARE_WRITE8_MEMBER(starshp1_collision_reset_w);
DECLARE_WRITE8_MEMBER(starshp1_analog_in_w);
diff --git a/src/mame/includes/starwars.h b/src/mame/includes/starwars.h
index 98459efcc05..7177faab06d 100644
--- a/src/mame/includes/starwars.h
+++ b/src/mame/includes/starwars.h
@@ -35,6 +35,15 @@ public:
m_slapstic_device(*this, "slapstic")
{ }
+ void starwars(machine_config &config);
+ void esb(machine_config &config);
+
+ void init_esb();
+ void init_starwars();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(matrix_flag_r);
+
+private:
required_device<generic_latch_8_device> m_soundlatch;
required_device<generic_latch_8_device> m_mainlatch;
required_device<riot6532_device> m_riot;
@@ -76,23 +85,21 @@ public:
DECLARE_READ8_MEMBER(starwars_div_reh_r);
DECLARE_READ8_MEMBER(starwars_div_rel_r);
DECLARE_WRITE8_MEMBER(starwars_math_w);
- DECLARE_CUSTOM_INPUT_MEMBER(matrix_flag_r);
+
DECLARE_READ8_MEMBER(starwars_main_ready_flag_r);
DECLARE_WRITE_LINE_MEMBER(boost_interleave_hack);
DECLARE_WRITE8_MEMBER(starwars_soundrst_w);
DECLARE_WRITE8_MEMBER(quad_pokeyn_w);
- void init_esb();
- void init_starwars();
virtual void machine_reset() override;
TIMER_CALLBACK_MEMBER(math_run_clear);
DECLARE_READ8_MEMBER(r6532_porta_r);
DECLARE_WRITE8_MEMBER(r6532_porta_w);
+
void starwars_mproc_init();
void starwars_mproc_reset();
void run_mproc();
void esb_slapstic_tweak(address_space &space, offs_t offset);
- void starwars(machine_config &config);
- void esb(machine_config &config);
+
void esb_main_map(address_map &map);
void main_map(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/stfight.h b/src/mame/includes/stfight.h
index cab600114d2..f67f715b091 100644
--- a/src/mame/includes/stfight.h
+++ b/src/mame/includes/stfight.h
@@ -34,12 +34,17 @@ public:
{
}
- DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int);
+ void stfight_base(machine_config &config);
+ void stfight(machine_config &config);
+ void cshooter(machine_config &config);
void init_stfight();
void init_empcity();
void init_cshooter();
+private:
+ DECLARE_WRITE_LINE_MEMBER(stfight_adpcm_int);
+
DECLARE_WRITE8_MEMBER(stfight_io_w);
DECLARE_READ8_MEMBER(stfight_coin_r);
DECLARE_WRITE8_MEMBER(stfight_coin_w);
@@ -58,15 +63,12 @@ public:
DECLARE_WRITE8_MEMBER(stfight_68705_port_b_w);
DECLARE_WRITE8_MEMBER(stfight_68705_port_c_w);
- void stfight_base(machine_config &config);
- void stfight(machine_config &config);
- void cshooter(machine_config &config);
void cpu1_map(address_map &map);
void cpu2_map(address_map &map);
void cshooter_cpu1_map(address_map &map);
void decrypted_opcodes_map(address_map &map);
void stfight_cpu1_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h
index f8faf1966da..6061804005c 100644
--- a/src/mame/includes/stlforce.h
+++ b/src/mame/includes/stlforce.h
@@ -24,6 +24,13 @@ public:
m_spriteram(*this, "spriteram"),
m_okibank(*this, "okibank") { }
+ void stlforce(machine_config &config);
+ void twinbrat(machine_config &config);
+
+ void init_twinbrat();
+ void init_stlforce();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_device<gfxdecode_device> m_gfxdecode;
@@ -55,9 +62,6 @@ public:
DECLARE_WRITE8_MEMBER(eeprom_w);
DECLARE_WRITE8_MEMBER(oki_bank_w);
- void init_twinbrat();
- void init_stlforce();
-
TILE_GET_INFO_MEMBER(get_bg_tile_info);
TILE_GET_INFO_MEMBER(get_mlow_tile_info);
TILE_GET_INFO_MEMBER(get_mhigh_tile_info);
@@ -66,8 +70,7 @@ public:
virtual void video_start() override;
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect );
- void stlforce(machine_config &config);
- void twinbrat(machine_config &config);
+
void stlforce_map(address_map &map);
void twinbrat_oki_map(address_map &map);
};
diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h
index 8379c27af97..dac9786053f 100644
--- a/src/mame/includes/stv.h
+++ b/src/mame/includes/stv.h
@@ -27,6 +27,15 @@ public:
{
}
+ void stv_slot(machine_config &config);
+ void stv_cartslot(machine_config &config);
+ void stv(machine_config &config);
+ void hopper(machine_config &config);
+ void batmanfr(machine_config &config);
+ void stv_5838(machine_config &config);
+ void stv_5881(machine_config &config);
+ void stvcd(machine_config &config);
+
void init_astrass();
void init_batmanfr();
void init_finlarch();
@@ -74,6 +83,7 @@ public:
void init_mausuke();
void init_hopper();
+private:
DECLARE_READ8_MEMBER(stv_ioga_r);
DECLARE_WRITE8_MEMBER(stv_ioga_w);
DECLARE_READ8_MEMBER(critcrsh_ioga_r);
@@ -144,14 +154,7 @@ public:
DECLARE_WRITE8_MEMBER(pdr2_output_w);
void stv_select_game(int gameno);
uint8_t m_prev_gamebank_select;
- void stv_slot(machine_config &config);
- void stv_cartslot(machine_config &config);
- void stv(machine_config &config);
- void hopper(machine_config &config);
- void batmanfr(machine_config &config);
- void stv_5838(machine_config &config);
- void stv_5881(machine_config &config);
- void stvcd(machine_config &config);
+
void sound_mem(address_map &map);
void stv_mem(address_map &map);
void stvcd_mem(address_map &map);
diff --git a/src/mame/includes/sub.h b/src/mame/includes/sub.h
index eea664e068c..730597baa07 100644
--- a/src/mame/includes/sub.h
+++ b/src/mame/includes/sub.h
@@ -36,6 +36,9 @@ public:
m_spriteram2(*this, "spriteram2"),
m_scrolly(*this, "scrolly") { }
+ void sub(machine_config &config);
+
+private:
bool m_int_en;
bool m_nmi_en;
@@ -52,17 +55,14 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(main_irq);
INTERRUPT_GEN_MEMBER(sound_irq);
- void sub(machine_config &config);
void subm_io(address_map &map);
void subm_map(address_map &map);
void subm_sound_io(address_map &map);
void subm_sound_map(address_map &map);
-protected:
virtual void machine_start() override;
virtual void video_start() override;
-private:
tilemap_t *m_tilemap;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/subs.h b/src/mame/includes/subs.h
index 6c420fb57fb..f969077d381 100644
--- a/src/mame/includes/subs.h
+++ b/src/mame/includes/subs.h
@@ -34,6 +34,9 @@ public:
m_videoram(*this, "videoram")
{ }
+ void subs(machine_config &config);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<gfxdecode_device> m_gfxdecode;
required_device<palette_device> m_palette;
@@ -68,7 +71,7 @@ public:
int steering_1();
int steering_2();
- void subs(machine_config &config);
+
void main_map(address_map &map);
};
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index 4271a960e5f..362f4a4611c 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -25,6 +25,14 @@ public:
, m_leds(*this, "led%u", 0U)
{ }
+ void uballoon(machine_config &config);
+ void sunaq(machine_config &config);
+ void bssoccer(machine_config &config);
+ void bestbest(machine_config &config);
+
+ void init_uballoon();
+
+private:
// common
DECLARE_WRITE16_MEMBER(soundlatch_w);
DECLARE_READ16_MEMBER(paletteram_r);
@@ -51,7 +59,6 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(bssoccer_interrupt);
- void init_uballoon();
virtual void video_start() override;
DECLARE_MACHINE_START(bestbest);
DECLARE_MACHINE_START(bssoccer);
@@ -61,10 +68,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_bestbest(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, uint16_t *sprites, int gfx);
- void uballoon(machine_config &config);
- void sunaq(machine_config &config);
- void bssoccer(machine_config &config);
- void bestbest(machine_config &config);
+
void bestbest_map(address_map &map);
void bestbest_pcm_1_iomap(address_map &map);
void bestbest_pcm_1_map(address_map &map);
@@ -82,7 +86,6 @@ public:
void uballoon_pcm_1_map(address_map &map);
void uballoon_sound_map(address_map &map);
-protected:
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_pcm1;
optional_device<cpu_device> m_pcm2;
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 220869dd95c..6b55fe81c88 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -34,6 +34,29 @@ public:
m_leds(*this, "led%u", 0U)
{ }
+ void brickzn(machine_config &config);
+ void starfigh(machine_config &config);
+ void sparkman(machine_config &config);
+ void hardhea2b(machine_config &config);
+ void brickzn11(machine_config &config);
+ void hardhead(machine_config &config);
+ void hardhea2(machine_config &config);
+ void rranger(machine_config &config);
+
+ void init_brickzn_common();
+ void init_brickznv5();
+ void init_brickznv4();
+ void init_starfigh();
+ void init_hardhea2();
+ void init_hardhea2b();
+ void init_hardhedb();
+ void init_sparkman();
+ void init_brickzn();
+ void init_brickzn11();
+ void init_hardhead();
+ void init_suna8();
+
+private:
enum GFXBANK_TYPE_T
{
GFXBANK_TYPE_SPARKMAN,
@@ -96,18 +119,6 @@ public:
DECLARE_READ8_MEMBER(suna8_banked_spriteram_r);
DECLARE_WRITE8_MEMBER(suna8_spriteram_w);
DECLARE_WRITE8_MEMBER(suna8_banked_spriteram_w);
- void init_brickzn_common();
- void init_brickznv5();
- void init_brickznv4();
- void init_starfigh();
- void init_hardhea2();
- void init_hardhea2b();
- void init_hardhedb();
- void init_sparkman();
- void init_brickzn();
- void init_brickzn11();
- void init_hardhead();
- void init_suna8();
void suna8_vh_start_common(bool has_text, GFXBANK_TYPE_T gfxbank_type);
DECLARE_VIDEO_START(suna8_text);
@@ -130,14 +141,7 @@ public:
void draw_sprites (screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int start, int end, int which);
void draw_text_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int start, int end, int ypos, bool write_mask);
uint8_t *brickzn_decrypt();
- void brickzn(machine_config &config);
- void starfigh(machine_config &config);
- void sparkman(machine_config &config);
- void hardhea2b(machine_config &config);
- void brickzn11(machine_config &config);
- void hardhead(machine_config &config);
- void hardhea2(machine_config &config);
- void rranger(machine_config &config);
+
void brickzn11_map(address_map &map);
void brickzn_io_map(address_map &map);
void brickzn_map(address_map &map);
@@ -156,7 +160,6 @@ public:
void sparkman_map(address_map &map);
void starfigh_map(address_map &map);
-protected:
virtual void machine_start() override { m_leds.resolve(); }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/supbtime.h b/src/mame/includes/supbtime.h
index dd48e89d15e..52665b50bb9 100644
--- a/src/mame/includes/supbtime.h
+++ b/src/mame/includes/supbtime.h
@@ -33,13 +33,13 @@ public:
, m_sprgen(*this, "spritegen")
{ }
- void init_tumblep();
-
void chinatwn(machine_config &config);
void supbtime(machine_config &config);
void tumblep(machine_config &config);
-protected:
+ void init_tumblep();
+
+private:
DECLARE_WRITE_LINE_MEMBER(vblank_w);
DECLARE_READ16_MEMBER(vblank_ack_r);
uint32_t screen_update_supbtime(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -50,7 +50,6 @@ protected:
void supbtime_map(address_map &map);
void tumblep_map(address_map &map);
-private:
required_shared_ptr<uint16_t> m_spriteram;
required_shared_ptr_array<uint16_t, 2> m_pf_rowscroll;
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index 14103e90021..1fecf3ae3aa 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -48,7 +48,7 @@ public:
void super6(machine_config &config);
-protected:
+private:
virtual void machine_start() override;
virtual void machine_reset() override;
@@ -71,7 +71,6 @@ protected:
void bankswitch();
-private:
required_device<cpu_device> m_maincpu;
required_device<z80ctc_device> m_ctc;
required_device<z80dart_device> m_dart;
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index 32c8cd00b4e..e5a963ae191 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -57,6 +57,16 @@ public:
, m_cass_led(*this, "cass_led")
{ }
+ void super80m(machine_config &config);
+ void super80(machine_config &config);
+ void super80r(machine_config &config);
+ void super80e(machine_config &config);
+ void super80d(machine_config &config);
+ void super80v(machine_config &config);
+
+ void init_super80();
+
+private:
void machine_start() override;
DECLARE_READ8_MEMBER(super80v_low_r);
@@ -80,7 +90,6 @@ public:
DECLARE_WRITE8_MEMBER(io_write_byte);
DECLARE_WRITE8_MEMBER(pio_port_a_w);
DECLARE_READ8_MEMBER(pio_port_b_r);
- void init_super80();
DECLARE_MACHINE_RESET(super80);
DECLARE_MACHINE_RESET(super80r);
DECLARE_VIDEO_START(super80);
@@ -97,12 +106,7 @@ public:
TIMER_DEVICE_CALLBACK_MEMBER(timer_h);
TIMER_DEVICE_CALLBACK_MEMBER(timer_k);
TIMER_DEVICE_CALLBACK_MEMBER(timer_p);
- void super80m(machine_config &config);
- void super80(machine_config &config);
- void super80r(machine_config &config);
- void super80e(machine_config &config);
- void super80d(machine_config &config);
- void super80v(machine_config &config);
+
void super80_io(address_map &map);
void super80_map(address_map &map);
void super80e_io(address_map &map);
@@ -110,7 +114,7 @@ public:
void super80r_io(address_map &map);
void super80v_io(address_map &map);
void super80v_map(address_map &map);
-private:
+
uint8_t m_s_options;
uint8_t m_portf0;
uint8_t m_mc6845_cursor[16];
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 8f845890b6a..3c93235c4f1 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -20,6 +20,13 @@ public:
m_ay1(*this, "ay1"),
m_mcu(*this, "mcu") { }
+ void init_perestro();
+ void init_sqix();
+ void init_sqixr0();
+ void init_pbillian();
+ void init_hotsmash();
+
+protected:
required_device<cpu_device> m_maincpu;
required_shared_ptr<uint8_t> m_spriteram;
required_shared_ptr<uint8_t> m_videoram;
@@ -51,11 +58,7 @@ public:
DECLARE_WRITE8_MEMBER(superqix_bitmapram_w);
DECLARE_WRITE8_MEMBER(superqix_bitmapram2_w);
DECLARE_WRITE8_MEMBER(superqix_0410_w);
- void init_perestro();
- void init_sqix();
- void init_sqixr0();
- void init_pbillian();
- void init_hotsmash();
+
TILE_GET_INFO_MEMBER(sqix_get_bg_tile_info);
DECLARE_VIDEO_START(superqix);
DECLARE_PALETTE_DECODER(BBGGRRII);
@@ -63,7 +66,7 @@ public:
void superqix_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect);
void main_map(address_map &map);
-protected:
+
virtual void machine_init_common();
};
@@ -77,6 +80,14 @@ public:
{
}
+ void sqix(machine_config &config);
+ void sqix_8031(machine_config &config);
+ void sqix_nomcu(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(fromz80_semaphore_input_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(frommcu_semaphore_input_r);
+
+private:
required_device<ay8910_device> m_ay2;
// 8031 and/or 8751 MCU related
@@ -96,19 +107,14 @@ public:
DECLARE_READ8_MEMBER(z80_ay2_iob_r);
DECLARE_WRITE8_MEMBER(z80_ay2_iob_w);
DECLARE_WRITE8_MEMBER(bootleg_flipscreen_w);
- DECLARE_CUSTOM_INPUT_MEMBER(fromz80_semaphore_input_r);
- DECLARE_CUSTOM_INPUT_MEMBER(frommcu_semaphore_input_r);
DECLARE_READ8_MEMBER(bootleg_in0_r);
INTERRUPT_GEN_MEMBER(sqix_timer_irq);
DECLARE_MACHINE_START(superqix);
DECLARE_MACHINE_RESET(superqix);
- void sqix(machine_config &config);
- void sqix_8031(machine_config &config);
- void sqix_nomcu(machine_config &config);
void sqix_port_map(address_map &map);
void sqix_8031_map(address_map &map);
-protected:
+
virtual void machine_init_common() override;
TIMER_CALLBACK_MEMBER(z80_semaphore_assert_cb);
@@ -139,6 +145,11 @@ public:
{
}
+ void pbillian(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(pbillian_semaphore_input_r);
+
+private:
DECLARE_READ8_MEMBER(hotsmash_68705_portA_r);
DECLARE_WRITE8_MEMBER(hotsmash_68705_portB_w);
DECLARE_WRITE8_MEMBER(hotsmash_68705_portC_w);
@@ -147,7 +158,6 @@ public:
DECLARE_WRITE8_MEMBER(pbillian_sample_trigger_w);
DECLARE_WRITE8_MEMBER(pbillian_0410_w);
- DECLARE_CUSTOM_INPUT_MEMBER(pbillian_semaphore_input_r);
DECLARE_WRITE_LINE_MEMBER(vblank_irq);
@@ -160,9 +170,8 @@ public:
u32 screen_update_pbillian(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void pbillian(machine_config &config);
void pbillian_port_map(address_map &map);
-protected:
+
virtual void machine_init_common() override;
int read_inputs(int player);
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index d83936072dc..a2b53d6d748 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -18,6 +18,11 @@ public:
m_scrollram(*this, "scrollram"),
m_decrypted_opcodes(*this, "decrypted_opcodes") { }
+ void suprloco(machine_config &config);
+
+ void init_suprloco();
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -40,13 +45,11 @@ public:
virtual void video_start() override;
DECLARE_PALETTE_INIT(suprloco);
- void init_suprloco();
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
inline void draw_pixel(bitmap_ind16 &bitmap,const rectangle &cliprect,int x,int y,int color,int flip);
void draw_sprite(bitmap_ind16 &bitmap,const rectangle &cliprect,int spr_number);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void suprloco(machine_config &config);
void decrypted_opcodes_map(address_map &map);
void main_map(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index d875bb60e9c..9519c775319 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -46,6 +46,36 @@ public:
m_main_ram(*this, "main_ram"),
m_cache_ram(*this, "cache_ram") { }
+ void sknsk(machine_config &config);
+ void sknsu(machine_config &config);
+ void sknsa(machine_config &config);
+ void sknsj(machine_config &config);
+ void sknse(machine_config &config);
+ void skns(machine_config &config);
+
+ void init_sengekis();
+ void init_cyvern();
+ void init_puzzloopa();
+ void init_teljan();
+ void init_panicstr();
+ void init_puzzloope();
+ void init_sengekij();
+ void init_puzzloopj();
+ void init_sarukani();
+ void init_gutsn();
+ void init_jjparad2();
+ void init_galpans3();
+ void init_jjparads();
+ void init_galpans2();
+ void init_galpanis();
+ void init_puzzloopu();
+ void init_senknow();
+ void init_galpani4();
+ void init_ryouran();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(paddle_r);
+
+private:
required_device<sh2_device> m_maincpu;
required_device<sknsspr_device> m_spritegen;
required_device<gfxdecode_device> m_gfxdecode;
@@ -122,27 +152,6 @@ public:
DECLARE_READ32_MEMBER(sengekis_speedup_r);
DECLARE_READ32_MEMBER(sengekij_speedup_r);
- DECLARE_CUSTOM_INPUT_MEMBER(paddle_r);
-
- void init_sengekis();
- void init_cyvern();
- void init_puzzloopa();
- void init_teljan();
- void init_panicstr();
- void init_puzzloope();
- void init_sengekij();
- void init_puzzloopj();
- void init_sarukani();
- void init_gutsn();
- void init_jjparad2();
- void init_galpans3();
- void init_jjparads();
- void init_galpans2();
- void init_galpanis();
- void init_puzzloopu();
- void init_senknow();
- void init_galpani4();
- void init_ryouran();
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
@@ -166,11 +175,6 @@ public:
void hit_recalc();
void init_drc();
void set_drc_pcflush(uint32_t addr);
- void sknsk(machine_config &config);
- void sknsu(machine_config &config);
- void sknsa(machine_config &config);
- void sknsj(machine_config &config);
- void sknse(machine_config &config);
- void skns(machine_config &config);
+
void skns_map(address_map &map);
};
diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h
index b304f0a5311..50ff0f28ac2 100644
--- a/src/mame/includes/suprridr.h
+++ b/src/mame/includes/suprridr.h
@@ -21,8 +21,14 @@ public:
m_palette(*this, "palette"),
m_fgram(*this, "fgram"),
m_bgram(*this, "bgram"),
- m_spriteram(*this, "spriteram") { }
+ m_spriteram(*this, "spriteram")
+ { }
+ void suprridr(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(control_r);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<generic_latch_8_device> m_soundlatch;
@@ -50,8 +56,6 @@ public:
DECLARE_WRITE8_MEMBER(bgram_w);
DECLARE_WRITE8_MEMBER(fgram_w);
- DECLARE_CUSTOM_INPUT_MEMBER(control_r);
-
TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tile_info2);
@@ -64,7 +68,7 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
int is_screen_flipped();
- void suprridr(machine_config &config);
+
void main_map(address_map &map);
void main_portmap(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h
index b166fd69453..3295c7e08bd 100644
--- a/src/mame/includes/suprslam.h
+++ b/src/mame/includes/suprslam.h
@@ -30,6 +30,9 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_soundlatch(*this, "soundlatch") { }
+ void suprslam(machine_config &config);
+
+private:
/* memory pointers */
required_shared_ptr<uint16_t> m_screen_videoram;
required_shared_ptr<uint16_t> m_bg_videoram;
@@ -65,7 +68,7 @@ public:
virtual void machine_reset() override;
virtual void video_start() override;
uint32_t screen_update_suprslam(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void suprslam(machine_config &config);
+
void sound_io_map(address_map &map);
void sound_map(address_map &map);
void suprslam_map(address_map &map);
diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h
index dd946c650f9..dcd942830d4 100644
--- a/src/mame/includes/surpratk.h
+++ b/src/mame/includes/surpratk.h
@@ -25,6 +25,9 @@ public:
m_k053251(*this, "k053251"),
m_palette(*this, "palette") { }
+ void surpratk(machine_config &config);
+
+private:
/* video-related */
int m_layer_colorbase[3];
int m_sprite_colorbase;
@@ -48,7 +51,6 @@ public:
K05324X_CB_MEMBER(sprite_callback);
K052109_CB_MEMBER(tile_callback);
DECLARE_WRITE8_MEMBER(banking_callback);
- void surpratk(machine_config &config);
void bank0000_map(address_map &map);
void surpratk_map(address_map &map);
};
diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h
index 2285a7675f8..b595b90b5c7 100644
--- a/src/mame/includes/svision.h
+++ b/src/mame/includes/svision.h
@@ -54,26 +54,28 @@ public:
, m_bank2(*this, "bank2")
{ }
+ void svisionp(machine_config &config);
+ void svisions(machine_config &config);
+ void tvlinkp(machine_config &config);
+ void svision(machine_config &config);
+ void svisionn(machine_config &config);
+ void svision_base(machine_config &config);
+
+ void init_svisions();
+ void init_svision();
+
+private:
DECLARE_WRITE_LINE_MEMBER(sound_irq_w);
DECLARE_READ8_MEMBER(svision_r);
DECLARE_WRITE8_MEMBER(svision_w);
DECLARE_READ8_MEMBER(tvlink_r);
DECLARE_WRITE8_MEMBER(tvlink_w);
- void init_svisions();
- void init_svision();
+
uint32_t screen_update_svision(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_tvlink(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(frame_int_w);
DECLARE_DEVICE_IMAGE_LOAD_MEMBER(svision_cart);
- void svisionp(machine_config &config);
- void svisions(machine_config &config);
- void tvlinkp(machine_config &config);
- void svision(machine_config &config);
- void svisionn(machine_config &config);
- void svision_base(machine_config &config);
-
-protected:
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h
index 6bf76e40628..1a059e59ea3 100644
--- a/src/mame/includes/swtpc09.h
+++ b/src/mame/includes/swtpc09.h
@@ -50,6 +50,18 @@ public:
, m_dat(*this, "dat")
{ }
+ void swtpc09_base(machine_config &config);
+ void swtpc09i(machine_config &config);
+ void swtpc09d3(machine_config &config);
+ void swtpc09u(machine_config &config);
+ void swtpc09(machine_config &config);
+
+ void init_swtpc09();
+ void init_swtpc09i();
+ void init_swtpc09u();
+ void init_swtpc09d3();
+
+private:
DECLARE_FLOPPY_FORMATS(floppy_formats);
DECLARE_READ8_MEMBER(pia0_a_r);
@@ -91,25 +103,15 @@ public:
DECLARE_READ8_MEMBER(main_r);
DECLARE_WRITE8_MEMBER(main_w);
- void init_swtpc09();
- void init_swtpc09i();
- void init_swtpc09u();
- void init_swtpc09d3();
-
DECLARE_READ8_MEMBER ( m6844_r );
DECLARE_WRITE8_MEMBER ( m6844_w );
- void swtpc09_base(machine_config &config);
- void swtpc09i(machine_config &config);
- void swtpc09d3(machine_config &config);
- void swtpc09u(machine_config &config);
- void swtpc09(machine_config &config);
void flex_dc4_piaide_mem(address_map &map);
void flex_dmf2_mem(address_map &map);
void mp09_mem(address_map &map);
void uniflex_dmf2_mem(address_map &map);
void uniflex_dmf3_mem(address_map &map);
-protected:
+
virtual void machine_start() override;
void swtpc09_fdc_dma_transfer();
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index 7585724dac5..d757d5268e7 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -35,6 +35,56 @@ public:
, m_leds(*this, "led%u", 0U)
{ }
+ void z80_ym2151(machine_config &config);
+ void z80_ym2151_upd7759(machine_config &config);
+ void datsu_ym2151_msm5205(machine_config &config);
+ void datsu_2x_ym2203_msm5205(machine_config &config);
+ void system16_base(machine_config &config);
+ void goldnaxeb_base(machine_config &config);
+ void passshtb(machine_config &config);
+ void goldnaxeb2(machine_config &config);
+ void beautyb(machine_config &config);
+ void goldnaxeb1(machine_config &config);
+ void mwalkbl(machine_config &config);
+ void eswatbl2(machine_config &config);
+ void ddcrewbl(machine_config &config);
+ void shdancbla(machine_config &config);
+ void astormbl(machine_config &config);
+ void astormb2(machine_config &config);
+ void passsht4b(machine_config &config);
+ void wb3bb(machine_config &config);
+ void shdancbl(machine_config &config);
+ void shinobi_datsu(machine_config &config);
+ void bayrouteb1(machine_config &config);
+ void tetrisbl(machine_config &config);
+ void eswatbl(machine_config &config);
+ void dduxbl(machine_config &config);
+ void bayrouteb2(machine_config &config);
+ void tturfbl(machine_config &config);
+ void altbeastbl(machine_config &config);
+ void system18(machine_config &config);
+
+ void init_passsht();
+ void init_wb3bbl();
+ void init_fpointbl();
+ void init_eswatbl();
+ void init_astormbl();
+ void init_sys18bl_oki();
+ void init_astormb2();
+ void init_shdancbl();
+ void init_dduxbl();
+ void init_altbeastbl();
+ void init_goldnaxeb2();
+ void init_bayrouteb1();
+ void init_beautyb();
+ void init_bayrouteb2();
+ void init_shinobl();
+ void init_tturfbl();
+ void init_goldnaxeb1();
+ void init_ddcrewbl();
+ void init_common();
+
+private:
DECLARE_WRITE16_MEMBER(sound_command_nmi_w);
DECLARE_WRITE16_MEMBER(sound_command_irq_w);
DECLARE_READ8_MEMBER(sound_command_irq_r);
@@ -82,25 +132,7 @@ public:
DECLARE_WRITE16_MEMBER(s16a_bootleg_fgscrollx_w);
DECLARE_WRITE16_MEMBER(s16a_bootleg_tilemapselect_w);
DECLARE_WRITE8_MEMBER(upd7759_bank_w);
- void init_passsht();
- void init_wb3bbl();
- void init_fpointbl();
- void init_eswatbl();
- void init_astormbl();
- void init_sys18bl_oki();
- void init_astormb2();
- void init_shdancbl();
- void init_dduxbl();
- void init_altbeastbl();
- void init_goldnaxeb2();
- void init_bayrouteb1();
- void init_beautyb();
- void init_bayrouteb2();
- void init_shinobl();
- void init_tturfbl();
- void init_goldnaxeb1();
- void init_ddcrewbl();
- void init_common();
+
DECLARE_MACHINE_RESET(ddcrewbl);
TILEMAP_MAPPER_MEMBER(sys16_bg_map);
TILEMAP_MAPPER_MEMBER(sys16_text_map);
@@ -132,34 +164,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(datsu_msm5205_callback);
DECLARE_WRITE_LINE_MEMBER(shdancbl_msm5205_callback);
DECLARE_WRITE_LINE_MEMBER(sound_cause_nmi);
- void z80_ym2151(machine_config &config);
- void z80_ym2151_upd7759(machine_config &config);
- void datsu_ym2151_msm5205(machine_config &config);
- void datsu_2x_ym2203_msm5205(machine_config &config);
- void system16_base(machine_config &config);
- void goldnaxeb_base(machine_config &config);
- void passshtb(machine_config &config);
- void goldnaxeb2(machine_config &config);
- void beautyb(machine_config &config);
- void goldnaxeb1(machine_config &config);
- void mwalkbl(machine_config &config);
- void eswatbl2(machine_config &config);
- void ddcrewbl(machine_config &config);
- void shdancbla(machine_config &config);
- void astormbl(machine_config &config);
- void astormb2(machine_config &config);
- void passsht4b(machine_config &config);
- void wb3bb(machine_config &config);
- void shdancbl(machine_config &config);
- void shinobi_datsu(machine_config &config);
- void bayrouteb1(machine_config &config);
- void tetrisbl(machine_config &config);
- void eswatbl(machine_config &config);
- void dduxbl(machine_config &config);
- void bayrouteb2(machine_config &config);
- void tturfbl(machine_config &config);
- void altbeastbl(machine_config &config);
- void system18(machine_config &config);
+
void astormbl_map(address_map &map);
void bayrouteb1_map(address_map &map);
void bayrouteb2_map(address_map &map);
@@ -196,7 +201,6 @@ public:
void tturfbl_sound_map(address_map &map);
void wb3bbl_map(address_map &map);
-protected:
virtual void machine_start() override { m_leds.resolve(); }
required_shared_ptr<uint16_t> m_textram;
diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h
index e7984334465..36f93a1d6cc 100644
--- a/src/mame/includes/tagteam.h
+++ b/src/mame/includes/tagteam.h
@@ -17,6 +17,11 @@ public:
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram") { }
+ void tagteam(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
+
+private:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<gfxdecode_device> m_gfxdecode;
@@ -41,7 +46,6 @@ public:
DECLARE_WRITE8_MEMBER(control_w);
DECLARE_WRITE8_MEMBER(flipscreen_w);
- DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
INTERRUPT_GEN_MEMBER(sound_timer_irq);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
@@ -52,7 +56,6 @@ public:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
- void tagteam(machine_config &config);
void main_map(address_map &map);
void sound_map(address_map &map);
};
diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h
index 36562b041cd..3ea1b7e97dd 100644
--- a/src/mame/includes/tail2nos.h
+++ b/src/mame/includes/tail2nos.h
@@ -27,6 +27,11 @@ public:
m_soundlatch(*this, "soundlatch"),
m_acia(*this, "acia") { }
+ void tail2nos(machine_config &config);
+
+ DECLARE_CUSTOM_INPUT_MEMBER(analog_in_r);
+
+private:
/* memory pointers */
required_shared_ptr<uint16_t> m_txvideoram;
required_shared_ptr<uint16_t> m_spriteram;
@@ -48,7 +53,6 @@ public:
required_device<generic_latch_8_device> m_soundlatch;
required_device<acia6850_device> m_acia;
- DECLARE_CUSTOM_INPUT_MEMBER(analog_in_r);
DECLARE_WRITE16_MEMBER(tail2nos_txvideoram_w);
DECLARE_WRITE16_MEMBER(tail2nos_zoomdata_w);
DECLARE_WRITE8_MEMBER(tail2nos_gfxbank_w);
@@ -62,7 +66,6 @@ public:
void tail2nos_postload();
void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
K051316_CB_MEMBER(zoom_callback);
- void tail2nos(machine_config &config);
void main_map(address_map &map);
void sound_map(address_map &map);
void sound_port_map(address_map &map);
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
index 8aff84fa865..33b98ae3875 100644
--- a/src/mame/includes/taito_b.h
+++ b/src/mame/includes/taito_b.h
@@ -35,6 +35,39 @@ public:
m_tracky_io(*this, "TRACKY%u", 1U)
{ }
+ void spacedx(machine_config &config);
+ void rambo3(machine_config &config);
+ void hitice(machine_config &config);
+ void ashura(machine_config &config);
+ void silentd(machine_config &config);
+ void tetrista(machine_config &config);
+ void spacedxo(machine_config &config);
+ void rambo3p(machine_config &config);
+ void rastsag2(machine_config &config);
+ void qzshowby(machine_config &config);
+ void sbm(machine_config &config);
+ void tetrist(machine_config &config);
+ void pbobble(machine_config &config);
+ void masterw(machine_config &config);
+ void ryujin(machine_config &config);
+ void viofight(machine_config &config);
+ void crimec(machine_config &config);
+ void selfeena(machine_config &config);
+
+ void init_taito_b();
+
+ DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor);
+
+ DECLARE_VIDEO_START(realpunc);
+ uint32_t screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+ DECLARE_WRITE8_MEMBER(player_12_coin_ctrl_w);
+
+ void realpunc_map(address_map &map);
+ void realpunc_hd63484_map(address_map &map);
+ void sound_map(address_map &map);
+
+private:
DECLARE_WRITE8_MEMBER(bankswitch_w);
template<int Player> DECLARE_READ16_MEMBER(tracky_hi_r);
template<int Player> DECLARE_READ16_MEMBER(tracky_lo_r);
@@ -43,7 +76,6 @@ public:
DECLARE_WRITE16_MEMBER(gain_control_w);
DECLARE_READ16_MEMBER(eep_latch_r);
DECLARE_WRITE16_MEMBER(eeprom_w);
- DECLARE_WRITE8_MEMBER(player_12_coin_ctrl_w);
DECLARE_READ16_MEMBER(player_34_coin_ctrl_r);
DECLARE_WRITE16_MEMBER(player_34_coin_ctrl_w);
DECLARE_WRITE16_MEMBER(spacedxo_tc0220ioc_w);
@@ -52,33 +84,11 @@ public:
DECLARE_WRITE16_MEMBER(hitice_pixel_scroll_w);
DECLARE_WRITE16_MEMBER(realpunc_video_ctrl_w);
DECLARE_WRITE8_MEMBER(mb87078_gain_changed);
- DECLARE_INPUT_CHANGED_MEMBER(realpunc_sensor);
- void init_taito_b();
DECLARE_VIDEO_START(hitice);
DECLARE_VIDEO_RESET(hitice);
- DECLARE_VIDEO_START(realpunc);
DECLARE_VIDEO_START(taitob_core);
uint32_t screen_update_taitob(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- uint32_t screen_update_realpunc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
- void spacedx(machine_config &config);
- void rambo3(machine_config &config);
- void hitice(machine_config &config);
- void ashura(machine_config &config);
- void silentd(machine_config &config);
- void tetrista(machine_config &config);
- void spacedxo(machine_config &config);
- void rambo3p(machine_config &config);
- void rastsag2(machine_config &config);
- void qzshowby(machine_config &config);
- void sbm(machine_config &config);
- void tetrist(machine_config &config);
- void pbobble(machine_config &config);
- void masterw(machine_config &config);
- void ryujin(machine_config &config);
- void viofight(machine_config &config);
- void crimec(machine_config &config);
- void selfeena(machine_config &config);
void crimec_map(address_map &map);
void hitice_map(address_map &map);
void masterw_map(address_map &map);
@@ -87,23 +97,20 @@ public:
void qzshowby_map(address_map &map);
void rambo3_map(address_map &map);
void rastsag2_map(address_map &map);
- void realpunc_hd63484_map(address_map &map);
- void realpunc_map(address_map &map);
+
void sbm_map(address_map &map);
void selfeena_map(address_map &map);
void silentd_map(address_map &map);
- void sound_map(address_map &map);
void spacedx_map(address_map &map);
void spacedxo_map(address_map &map);
void tetrist_map(address_map &map);
void tetrista_map(address_map &map);
void viofight_map(address_map &map);
void viofight_sound_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
-private:
/* memory pointers */
optional_shared_ptr<uint16_t> m_pixelram;
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index a318884a82c..6a744fc7bc0 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -22,20 +22,6 @@
class taitof2_state : public driver_device
{
public:
- enum
- {
- TIMER_TAITOF2_INTERRUPT6
- };
-
- struct f2_tempsprite
- {
- int code, color;
- int flipx, flipy;
- int x, y;
- int zoomx, zoomy;
- int primask;
- };
-
taitof2_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_sprite_extension(*this, "sprite_ext"),
@@ -59,6 +45,64 @@ public:
m_palette(*this, "palette")
{ }
+
+ void taito_f2_tc0220ioc(machine_config &config);
+ void taito_f2_tc0510nio(machine_config &config);
+ void taito_f2_te7750(machine_config &config);
+ void taito_f2(machine_config &config);
+ void thundfox(machine_config &config);
+ void dinorex(machine_config &config);
+ void mjnquest(machine_config &config);
+ void cameltrya(machine_config &config);
+ void koshien(machine_config &config);
+ void qzchikyu(machine_config &config);
+ void metalb(machine_config &config);
+ void yesnoj(machine_config &config);
+ void quizhq(machine_config &config);
+ void dondokod(machine_config &config);
+ void qcrayon2(machine_config &config);
+ void qtorimon(machine_config &config);
+ void driftout(machine_config &config);
+ void solfigtr(machine_config &config);
+ void qzquest(machine_config &config);
+ void liquidk(machine_config &config);
+ void deadconx(machine_config &config);
+ void ssi(machine_config &config);
+ void pulirula(machine_config &config);
+ void growl(machine_config &config);
+ void ninjak(machine_config &config);
+ void footchmp(machine_config &config);
+ void cameltry(machine_config &config);
+ void finalb(machine_config &config);
+ void hthero(machine_config &config);
+ void driveout(machine_config &config);
+ void gunfront(machine_config &config);
+ void qcrayon(machine_config &config);
+ void megab(machine_config &config);
+ void qjinsei(machine_config &config);
+ void deadconxj(machine_config &config);
+ void footchmpbl(machine_config &config);
+ void yuyugogo(machine_config &config);
+
+ void init_driveout();
+ void init_cameltry();
+ void init_mjnquest();
+ void init_finalb();
+
+private:
+ enum
+ {
+ TIMER_TAITOF2_INTERRUPT6
+ };
+
+ struct f2_tempsprite
+ {
+ int code, color;
+ int flipx, flipy;
+ int x, y;
+ int zoomx, zoomy;
+ int primask;
+ };
/* memory pointers */
optional_shared_ptr<uint16_t> m_sprite_extension;
required_shared_ptr<uint16_t> m_spriteram;
@@ -141,10 +185,7 @@ public:
DECLARE_WRITE16_MEMBER(taitof2_spritebank_w);
DECLARE_WRITE16_MEMBER(koshien_spritebank_w);
DECLARE_WRITE8_MEMBER(cameltrya_porta_w);
- void init_driveout();
- void init_cameltry();
- void init_mjnquest();
- void init_finalb();
+
DECLARE_MACHINE_START(f2);
DECLARE_VIDEO_START(taitof2_default);
DECLARE_MACHINE_START(common);
@@ -197,43 +238,6 @@ public:
void taito_f2_tc360_spritemixdraw(screen_device &screen, bitmap_ind16 &dest_bmp, const rectangle &clip, gfx_element *gfx,
uint32_t code, uint32_t color, int flipx, int flipy, int sx, int sy, int scalex, int scaley );
- void taito_f2_tc0220ioc(machine_config &config);
- void taito_f2_tc0510nio(machine_config &config);
- void taito_f2_te7750(machine_config &config);
- void taito_f2(machine_config &config);
- void thundfox(machine_config &config);
- void dinorex(machine_config &config);
- void mjnquest(machine_config &config);
- void cameltrya(machine_config &config);
- void koshien(machine_config &config);
- void qzchikyu(machine_config &config);
- void metalb(machine_config &config);
- void yesnoj(machine_config &config);
- void quizhq(machine_config &config);
- void dondokod(machine_config &config);
- void qcrayon2(machine_config &config);
- void qtorimon(machine_config &config);
- void driftout(machine_config &config);
- void solfigtr(machine_config &config);
- void qzquest(machine_config &config);
- void liquidk(machine_config &config);
- void deadconx(machine_config &config);
- void ssi(machine_config &config);
- void pulirula(machine_config &config);
- void growl(machine_config &config);
- void ninjak(machine_config &config);
- void footchmp(machine_config &config);
- void cameltry(machine_config &config);
- void finalb(machine_config &config);
- void hthero(machine_config &config);
- void driveout(machine_config &config);
- void gunfront(machine_config &config);
- void qcrayon(machine_config &config);
- void megab(machine_config &config);
- void qjinsei(machine_config &config);
- void deadconxj(machine_config &config);
- void footchmpbl(machine_config &config);
- void yuyugogo(machine_config &config);
void cameltry_map(address_map &map);
void cameltrya_map(address_map &map);
void cameltrya_sound_map(address_map &map);
@@ -267,7 +271,7 @@ public:
void thundfox_map(address_map &map);
void yesnoj_map(address_map &map);
void yuyugogo_map(address_map &map);
-protected:
+
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
};
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index e5353352883..d72543ecff8 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -51,11 +51,6 @@ enum {
class taito_f3_state : public driver_device
{
public:
- enum
- {
- TIMER_F3_INTERRUPT3
- };
-
taito_f3_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
@@ -71,9 +66,65 @@ public:
m_input(*this, "IN.%u", 0),
m_dial(*this, "DIAL.%u", 0),
m_eepromin(*this, "EEPROMIN")
-
{ }
+ void f3_eeprom(machine_config &config);
+ void f3(machine_config &config);
+ void f3_224a(machine_config &config);
+ void bubsympb(machine_config &config);
+ void f3_224b(machine_config &config);
+ void f3_224c(machine_config &config);
+ void f3_224b_eeprom(machine_config &config);
+
+ void init_commandw();
+ void init_pbobble2();
+ void init_puchicar();
+ void init_intcup94();
+ void init_landmakr();
+ void init_twinqix();
+ void init_elvactr();
+ void init_arabianm();
+ void init_bubsympb();
+ void init_ktiger2();
+ void init_lightbr();
+ void init_gekirido();
+ void init_arkretrn();
+ void init_kirameki();
+ void init_qtheater();
+ void init_popnpop();
+ void init_spcinvdj();
+ void init_pbobbl2p();
+ void init_landmkrp();
+ void init_bubblem();
+ void init_ridingf();
+ void init_gseeker();
+ void init_bubsymph();
+ void init_hthero95();
+ void init_gunlock();
+ void init_pbobble4();
+ void init_dariusg();
+ void init_recalh();
+ void init_kaiserkn();
+ void init_spcinv95();
+ void init_trstaroj();
+ void init_ringrage();
+ void init_cupfinal();
+ void init_quizhuhu();
+ void init_pbobble3();
+ void init_cleopatr();
+ void init_scfinals();
+ void init_pbobbl2x();
+
+ DECLARE_CUSTOM_INPUT_MEMBER(f3_analog_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(f3_coin_r);
+ DECLARE_CUSTOM_INPUT_MEMBER(eeprom_read);
+
+protected:
+ enum
+ {
+ TIMER_F3_INTERRUPT3
+ };
+
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_audiocpu;
optional_device<taito_en_device> m_taito_en;
@@ -260,47 +311,7 @@ public:
DECLARE_READ16_MEMBER(f3_lineram_r);
DECLARE_WRITE16_MEMBER(f3_lineram_w);
DECLARE_WRITE32_MEMBER(f3_palette_24bit_w);
- DECLARE_CUSTOM_INPUT_MEMBER(f3_analog_r);
- DECLARE_CUSTOM_INPUT_MEMBER(f3_coin_r);
- DECLARE_CUSTOM_INPUT_MEMBER(eeprom_read);
- void init_commandw();
- void init_pbobble2();
- void init_puchicar();
- void init_intcup94();
- void init_landmakr();
- void init_twinqix();
- void init_elvactr();
- void init_arabianm();
- void init_bubsympb();
- void init_ktiger2();
- void init_lightbr();
- void init_gekirido();
- void init_arkretrn();
- void init_kirameki();
- void init_qtheater();
- void init_popnpop();
- void init_spcinvdj();
- void init_pbobbl2p();
- void init_landmkrp();
- void init_bubblem();
- void init_ridingf();
- void init_gseeker();
- void init_bubsymph();
- void init_hthero95();
- void init_gunlock();
- void init_pbobble4();
- void init_dariusg();
- void init_recalh();
- void init_kaiserkn();
- void init_spcinv95();
- void init_trstaroj();
- void init_ringrage();
- void init_cupfinal();
- void init_quizhuhu();
- void init_pbobble3();
- void init_cleopatr();
- void init_scfinals();
- void init_pbobbl2x();
+
TILE_GET_INFO_MEMBER(get_tile_info1);
TILE_GET_INFO_MEMBER(get_tile_info2);
TILE_GET_INFO_MEMBER(get_tile_info3);
@@ -315,16 +326,9 @@ public:
DECLARE_WRITE_LINE_MEMBER(screen_vblank_f3);
INTERRUPT_GEN_MEMBER(f3_interrupt2);
- void f3_eeprom(machine_config &config);
- void f3(machine_config &config);
- void f3_224a(machine_config &config);
- void bubsympb(machine_config &config);
- void f3_224b(machine_config &config);
- void f3_224c(machine_config &config);
- void f3_224b_eeprom(machine_config &config);
void bubsympb_map(address_map &map);
void f3_map(address_map &map);
-protected:
+
virtual void machine_start() override;
virtual void machine_reset() override;
virtual void video_start() override;
@@ -332,7 +336,6 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void device_post_load(void) override;
-private:
inline void get_tile_info(tile_data &tileinfo, int tile_index, uint16_t *gfx_base);
inline void f3_drawgfx(bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx,int code,int color,int flipx,int flipy,int sx,int sy,uint8_t pri_dst);
inline void f3_drawgfxzoom(bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx,int code,int color,int flipx,int flipy,int sx,int sy,int scalex,int scaley,uint8_t pri_dst);
diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h
index 4decc9bb6fd..a776fd3cd3d 100644
--- a/src/mame/includes/taito_h.h
+++ b/src/mame/includes/taito_h.h
@@ -23,6 +23,12 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void recordbr(machine_config &config);
+ void syvalion(machine_config &config);
+ void dleague(machine_config &config);
+ void tetristh(machine_config &config);
+
+private:
/* memory pointers */
required_shared_ptr<uint16_t> m_m68000_mainram;
@@ -46,10 +52,6 @@ public:
void recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority );
void dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority );
void taitoh_log_vram();
- void recordbr(machine_config &config);
- void syvalion(machine_config &config);
- void dleague(machine_config &config);
- void tetristh(machine_config &config);
void dleague_map(address_map &map);
void recordbr_map(address_map &map);
void sound_map(address_map &map);
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 8b45f6fa36f..7f9f65498a9 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -25,6 +25,13 @@ public:
{
}
+ DECLARE_MACHINE_START(taito_l);
+ DECLARE_MACHINE_RESET(taito_l);
+ IRQ_CALLBACK_MEMBER(irq_callback);
+
+ DECLARE_WRITE8_MEMBER(coin_control_w);
+
+protected:
static constexpr size_t SPRITERAM_SIZE = 0x400;
/* memory pointers */
@@ -55,7 +62,7 @@ public:
DECLARE_READ8_MEMBER(rombankswitch_r);
DECLARE_WRITE8_MEMBER(rambankswitch_w);
DECLARE_READ8_MEMBER(rambankswitch_r);
- DECLARE_WRITE8_MEMBER(coin_control_w);
+
DECLARE_WRITE8_MEMBER(mcu_control_w);
DECLARE_READ8_MEMBER(mcu_control_r);
DECLARE_WRITE8_MEMBER(taitol_bankc_w);
@@ -65,19 +72,17 @@ public:
DECLARE_WRITE8_MEMBER(vram_w);
template<int Offset> TILE_GET_INFO_MEMBER(get_tile_info);
TILE_GET_INFO_MEMBER(get_tx_tile_info);
- DECLARE_MACHINE_START(taito_l);
DECLARE_VIDEO_START(taito_l);
- DECLARE_MACHINE_RESET(taito_l);
u32 screen_update_taitol(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_WRITE_LINE_MEMBER(screen_vblank_taitol);
TIMER_DEVICE_CALLBACK_MEMBER(vbl_interrupt);
- IRQ_CALLBACK_MEMBER(irq_callback);
+
void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void l_system_video(machine_config &config);
void common_banks_map(address_map &map);
void tc0090lvc_map(address_map &map);
-protected:
+
virtual void state_register();
virtual void taito_machine_reset();
diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h
index 6b1aab2b42a..15fcd89dceb 100644
--- a/src/mame/includes/taito_o.h
+++ b/src/mame/includes/taito_o.h
@@ -22,6 +22,9 @@ public:
m_gfxdecode(*this, "gfxdecode"),
m_palette(*this, "palette") { }
+ void parentj(machine_config &config);
+
+private:
/* devices */
required_device<cpu_device> m_maincpu;
required_device<watchdog_timer_device> m_watchdog;
@@ -35,6 +38,5 @@ public:
uint32_t screen_update_parentj(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
TIMER_DEVICE_CALLBACK_MEMBER(parentj_interrupt);
void parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int priority );
- void parentj(machine_config &config);
void parentj_map(address_map &map);
};
diff --git a/src/mame/includes/taito_x.h b/src/mame/includes/taito_x.h
index 6523bf9d600..216a759c194 100644
--- a/src/mame/includes/taito_x.h
+++ b/src/mame/includes/taito_x.h
@@ -23,6 +23,13 @@ public:
m_in_io(*this, "IN%u", 0U)
{ }
+ void superman(machine_config &config);
+ void ballbros(machine_config &config);
+ void kyustrkr(machine_config &config);
+ void gigandes(machine_config &config);
+ void daisenpu(machine_config &config);
+
+private:
DECLARE_READ16_MEMBER(superman_dsw_input_r);
DECLARE_WRITE8_MEMBER(superman_counters_w);
DECLARE_READ16_MEMBER(daisenpu_input_r);
@@ -34,11 +41,6 @@ public:
INTERRUPT_GEN_MEMBER(interrupt);
TIMER_DEVICE_CALLBACK_MEMBER(cchip_irq_clear_cb);
- void superman(machine_config &config);
- void ballbros(machine_config &config);
- void kyustrkr(machine_config &config);
- void gigandes(machine_config &config);
- void daisenpu(machine_config &config);
void ballbros_map(address_map &map);
void daisenpu_map(address_map &map);
void daisenpu_sound_map(address_map &map);
@@ -48,7 +50,6 @@ public:
void superman_map(address_map &map);
void taito_x_base_map(address_map &map);
-private:
optional_device<taito_cchip_device> m_cchip;
optional_device<timer_device> m_cchip_irq_clear;
required_memory_bank m_z80bank;
diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h
index 87c9d973176..cf3960d7e37 100644
--- a/src/mame/includes/taitoair.h
+++ b/src/mame/includes/taitoair.h
@@ -47,6 +47,9 @@ public:
m_palette(*this, "palette")
{ }
+ void airsys(machine_config &config);
+
+private:
/* memory pointers */
required_shared_ptr<uint16_t> m_m68000_mainram;
required_shared_ptr<uint16_t> m_line_ram;
@@ -136,7 +139,7 @@ public: