From a6592163c3e56ed938da9d139600857399396af6 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Wed, 1 Feb 2023 18:00:33 +0100 Subject: - vsystem/crshrace.cpp, vsystem/f1gp.cpp, vsystem/taotaido.cpp: consolidated drivers in single files - mame/*: further updated #ifndef guards to the current tree structure --- src/mame/acorn/atom.h | 6 +- src/mame/acorn/bbc.h | 6 +- src/mame/acorn/electron.h | 6 +- src/mame/acorn/z88.h | 6 +- src/mame/adc/super6.h | 6 +- src/mame/alesis/alesis.h | 6 +- src/mame/alpha/alpha68k.h | 6 +- src/mame/alpha/champbas.h | 6 +- src/mame/amiga/amiga.h | 6 +- src/mame/amstrad/amstrad.h | 6 +- src/mame/amstrad/nc.h | 6 +- src/mame/amstrad/pc1512.h | 6 +- src/mame/amstrad/pcw.h | 6 +- src/mame/amstrad/pcw16.h | 6 +- src/mame/apollo/apollo.h | 6 +- src/mame/apple/apple2e.h | 6 +- src/mame/apple/apple3.h | 6 +- src/mame/apple/lisa.h | 6 +- src/mame/apple/mac.h | 6 +- src/mame/apple/macpci.h | 6 +- src/mame/arcadia/arcadia.h | 6 +- src/mame/arcadia/arcadia_a.h | 6 +- src/mame/atari/atari400.h | 6 +- src/mame/atari/atarifb.h | 6 +- src/mame/atari/atarig42.h | 6 +- src/mame/atari/atarigx2.h | 6 +- src/mame/atari/atarist_v.h | 6 +- src/mame/atari/atarisy1.h | 6 +- src/mame/atari/badlands.h | 6 +- src/mame/atari/batman.h | 6 +- src/mame/atari/beathead.h | 6 +- src/mame/atari/blstroid.h | 6 +- src/mame/atari/bsktball.h | 6 +- src/mame/atari/bwidow.h | 6 +- src/mame/atari/bzone.h | 6 +- src/mame/atari/canyon.h | 6 +- src/mame/atari/ccastles.h | 6 +- src/mame/atari/centiped.h | 6 +- src/mame/atari/cloak.h | 6 +- src/mame/atari/cloud9.h | 6 +- src/mame/atari/copsnrob.h | 6 +- src/mame/atari/cyberbal.h | 6 +- src/mame/atari/dragrace.h | 6 +- src/mame/atari/eprom.h | 6 +- src/mame/atari/firetrk.h | 6 +- src/mame/atari/foodf.h | 6 +- src/mame/atari/gauntlet.h | 6 +- src/mame/atari/harddriv.h | 6 +- src/mame/atari/irobot.h | 6 +- src/mame/atari/jedi.h | 6 +- src/mame/atari/klax.h | 6 +- src/mame/atari/liberatr.h | 6 +- src/mame/atari/lynx.h | 6 +- src/mame/atari/metalmx.h | 6 +- src/mame/atari/nitedrvr.h | 6 +- src/mame/atari/offtwall.h | 6 +- src/mame/atari/orbit.h | 6 +- src/mame/atari/poolshrk.h | 6 +- src/mame/atari/rampart.h | 6 +- src/mame/atari/relief.h | 6 +- src/mame/atari/shuuz.h | 6 +- src/mame/atari/skullxbo.h | 6 +- src/mame/atari/skydiver.h | 6 +- src/mame/atari/skyraid.h | 6 +- src/mame/atari/slapstic.h | 6 +- src/mame/atari/sprint2.h | 6 +- src/mame/atari/sprint8.h | 6 +- src/mame/atari/starshp1.h | 6 +- src/mame/atari/starwars.h | 6 +- src/mame/atari/subs.h | 6 +- src/mame/atari/tank8.h | 6 +- src/mame/atari/thunderj.h | 6 +- src/mame/atari/toobin.h | 6 +- src/mame/atari/triplhnt.h | 6 +- src/mame/atari/tunhunt.h | 6 +- src/mame/atari/ultratnk.h | 6 +- src/mame/atari/videopin.h | 6 +- src/mame/atari/vindictr.h | 6 +- src/mame/atari/wolfpack.h | 6 +- src/mame/atari/xybots.h | 6 +- src/mame/ausnz/aussiebyte.h | 6 +- src/mame/ausnz/mbee.h | 6 +- src/mame/ausnz/poly.h | 6 +- src/mame/ausnz/super80.h | 6 +- src/mame/bandai/wswan_v.h | 6 +- src/mame/be/bebox.h | 6 +- src/mame/bfm/bfm_ad5.h | 6 +- src/mame/bfm/bfm_adr2.h | 6 +- src/mame/bfm/bfm_sc4.h | 6 +- src/mame/bfm/bfm_sc5.h | 6 +- src/mame/bitcorp/gamate_v.h | 6 +- src/mame/bondwell/bw12.h | 6 +- src/mame/bondwell/bw2.h | 6 +- src/mame/booth/apexc.h | 6 +- src/mame/booth/apexc_m.h | 6 +- src/mame/canon/x07.h | 6 +- src/mame/capcom/1942.h | 6 +- src/mame/capcom/1943.h | 6 +- src/mame/capcom/cps1.h | 6 +- src/mame/capcom/cps3.h | 6 +- src/mame/capcom/cps3_a.h | 6 +- src/mame/capcom/fcrash.h | 6 +- src/mame/capcom/lastduel.h | 6 +- src/mame/capcom/sidearms.h | 6 +- src/mame/chromatics/cgc7900.h | 6 +- src/mame/cinematronics/cinemat.h | 6 +- src/mame/cinematronics/cinemat_a.h | 6 +- src/mame/cinematronics/jack.h | 6 +- src/mame/cinematronics/leland.h | 6 +- src/mame/cinematronics/leland_a.h | 6 +- src/mame/coleco/adam.h | 6 +- src/mame/coleco/coleco.h | 6 +- src/mame/coleco/coleco_m.h | 6 +- src/mame/comx/comx35.h | 6 +- src/mame/concept/concept.h | 6 +- src/mame/conitec/prof180x.h | 6 +- src/mame/conitec/prof80.h | 6 +- src/mame/cvs/cvs.h | 6 +- src/mame/cvs/galaxia.h | 6 +- src/mame/cvs/quasar.h | 6 +- src/mame/cybiko/cybiko.h | 6 +- src/mame/dai/dai.h | 6 +- src/mame/dataeast/btime.h | 6 +- src/mame/dataeast/compgolf.h | 6 +- src/mame/dataeast/dec0.h | 6 +- src/mame/dataeast/dec8.h | 6 +- src/mame/dataeast/deco156_m.h | 6 +- src/mame/dataeast/decocass.h | 6 +- src/mame/dataeast/kchamp.h | 6 +- src/mame/dataeast/kingobox.h | 6 +- src/mame/dataeast/liberate.h | 6 +- src/mame/dataeast/madalien.h | 6 +- src/mame/dataeast/rohga.h | 6 +- src/mame/dataeast/supbtime.h | 6 +- src/mame/dataeast/tumbleb.h | 6 +- src/mame/ddr/huebler.h | 6 +- src/mame/ddr/kc.h | 6 +- src/mame/ddr/polyplay.h | 6 +- src/mame/dynax/dynax.h | 6 +- src/mame/dynax/realbrk.h | 6 +- src/mame/edevices/fantland.h | 6 +- src/mame/efo/cidelsa.h | 6 +- src/mame/epson/hx20.h | 6 +- src/mame/epson/px8.h | 6 +- src/mame/exidy/carpolo.h | 6 +- src/mame/exidy/circus.h | 6 +- src/mame/exidy/exidy440.h | 6 +- src/mame/exidy/exidy440_a.h | 6 +- src/mame/exidy/sorcerer.h | 6 +- src/mame/exidy/starfire.h | 6 +- src/mame/exidy/vertigo.h | 6 +- src/mame/exidy/victory.h | 6 +- src/mame/fairchild/channelf.h | 6 +- src/mame/fairchild/channelf_a.h | 8 +- src/mame/fujitsu/fm7.h | 6 +- src/mame/fujitsu/fmtowns.h | 6 +- src/mame/funworld/funworld.h | 6 +- src/mame/funworld/snookr10.h | 6 +- src/mame/fuuki/fuukifg2.h | 6 +- src/mame/fuuki/fuukifg3.h | 6 +- src/mame/gaelco/gaelco3d.h | 6 +- src/mame/gaelco/gaelco3d_m.h | 6 +- src/mame/gaelco/splash.h | 6 +- src/mame/galaxian/galaxian.h | 6 +- src/mame/galaxian/galaxian_a.h | 6 +- src/mame/galaxian/galaxold.h | 6 +- src/mame/gamepark/gp32.h | 6 +- src/mame/gottlieb/exterm.h | 6 +- src/mame/grundy/newbrain.h | 6 +- src/mame/hec2hrp/hec2hrp.h | 6 +- src/mame/hp/hp48.h | 6 +- src/mame/hp/hp9845.h | 6 +- src/mame/ice/lethalj.h | 6 +- src/mame/igs/goldstar.h | 6 +- src/mame/igs/iqblock.h | 6 +- src/mame/igs/pgm.h | 6 +- src/mame/igs/pgm2.h | 6 +- src/mame/interton/vc4000.h | 6 +- src/mame/interton/vc4000_a.h | 6 +- src/mame/irem/m10.h | 6 +- src/mame/irem/m107.h | 6 +- src/mame/irem/m52.h | 6 +- src/mame/irem/m57.h | 6 +- src/mame/irem/m58.h | 6 +- src/mame/irem/m62.h | 6 +- src/mame/irem/m72.h | 6 +- src/mame/irem/m72_a.h | 6 +- src/mame/irem/m90.h | 6 +- src/mame/irem/m92.h | 6 +- src/mame/irem/redalert.h | 6 +- src/mame/irem/redalert_a.h | 6 +- src/mame/irem/travrusa.h | 6 +- src/mame/irem/vigilant.h | 6 +- src/mame/itech/itech32.h | 6 +- src/mame/jaleco/cischeat.h | 6 +- src/mame/jaleco/citycon.h | 6 +- src/mame/jaleco/megasys1.h | 6 +- src/mame/jaleco/ms32.h | 6 +- src/mame/kaneko/snowbros.h | 6 +- src/mame/kaneko/suprnova.h | 6 +- src/mame/kaypro/kaypro.h | 6 +- src/mame/konami/88games.h | 6 +- src/mame/konami/asterix.h | 6 +- src/mame/konami/bishi.h | 6 +- src/mame/konami/chqflag.h | 6 +- src/mame/konami/combatsc.h | 6 +- src/mame/konami/crimfght.h | 6 +- src/mame/konami/dbz.h | 6 +- src/mame/konami/djmain.h | 6 +- src/mame/konami/gijoe.h | 6 +- src/mame/konami/gradius3.h | 6 +- src/mame/konami/k053246_k053247_k055673.h | 6 +- src/mame/konami/konamigx.h | 6 +- src/mame/konami/lethal.h | 6 +- src/mame/konami/moo.h | 6 +- src/mame/konami/nemesis.h | 6 +- src/mame/konami/qdrmfgp.h | 6 +- src/mame/konami/rungun.h | 6 +- src/mame/konami/simpsons.h | 6 +- src/mame/konami/spy.h | 6 +- src/mame/konami/thunderx.h | 6 +- src/mame/konami/tmnt.h | 6 +- src/mame/konami/trackfld.h | 6 +- src/mame/konami/trackfld_a.h | 6 +- src/mame/konami/tutankhm.h | 6 +- src/mame/konami/twin16.h | 6 +- src/mame/konami/ultraman.h | 6 +- src/mame/konami/wecleman.h | 6 +- src/mame/konami/xexex.h | 6 +- src/mame/kyocera/kyocera.h | 6 +- src/mame/luxor/abc1600.h | 6 +- src/mame/luxor/abc1600_v.h | 6 +- src/mame/luxor/abc80.h | 6 +- src/mame/luxor/abc80x.h | 6 +- src/mame/mattel/aquarius.h | 6 +- src/mame/mattel/intv.h | 6 +- src/mame/meadows/lazercmd.h | 6 +- src/mame/meadows/meadows.h | 6 +- src/mame/memotech/mtx.h | 6 +- src/mame/microkey/primo.h | 6 +- src/mame/midw8080/8080bw.h | 6 +- src/mame/midw8080/8080bw_a.h | 6 +- src/mame/midw8080/m79amb.h | 6 +- src/mame/midw8080/mw8080bw.h | 6 +- src/mame/midw8080/mw8080bw_a.h | 6 +- src/mame/midway/astrocde.h | 6 +- src/mame/midway/balsente.h | 6 +- src/mame/midway/gridlee.h | 6 +- src/mame/midway/mcr3.h | 6 +- src/mame/midway/midyunit.h | 6 +- src/mame/midway/sspeedr.h | 6 +- src/mame/miltonbradley/vectrex.h | 6 +- src/mame/misc/3do.h | 6 +- src/mame/misc/ampoker2.h | 6 +- src/mame/misc/calomega.h | 6 +- src/mame/misc/coolpool.h | 6 +- src/mame/misc/dcheese.h | 6 +- src/mame/misc/efdt.h | 6 +- src/mame/misc/esripsys.h | 6 +- src/mame/misc/flower_a.h | 6 +- src/mame/misc/homedata.h | 6 +- src/mame/misc/kyugo.h | 6 +- src/mame/misc/ladyfrog.h | 6 +- src/mame/misc/malzak.h | 6 +- src/mame/misc/micro3d.h | 6 +- src/mame/misc/micro3d_a.h | 6 +- src/mame/misc/norautp.h | 6 +- src/mame/misc/shangkid.h | 6 +- src/mame/misc/truco.h | 6 +- src/mame/misc/trucocl.h | 6 +- src/mame/morrow/mpz80.h | 6 +- src/mame/multitech/mpf1.h | 6 +- src/mame/namco/20pacgal.h | 6 +- src/mame/namco/bosco.h | 6 +- src/mame/namco/digdug.h | 6 +- src/mame/namco/galaga.h | 6 +- src/mame/namco/gaplus.h | 6 +- src/mame/namco/mappy.h | 6 +- src/mame/namco/namcona1.h | 6 +- src/mame/namco/namconb1.h | 6 +- src/mame/namco/namcos1.h | 6 +- src/mame/namco/namcos2.h | 6 +- src/mame/namco/namcos22.h | 6 +- src/mame/namco/namcos86.h | 6 +- src/mame/namco/polepos.h | 6 +- src/mame/namco/polepos_a.h | 6 +- src/mame/namco/tceptor.h | 6 +- src/mame/namco/turrett.h | 6 +- src/mame/namco/warpwarp.h | 6 +- src/mame/namco/warpwarp_a.h | 6 +- src/mame/namco/xevious.h | 6 +- src/mame/ncd/bert_m.h | 6 +- src/mame/nec/bungo.h | 6 +- src/mame/nec/pc8401a.h | 6 +- src/mame/nec/pc9801.h | 6 +- src/mame/nec/pc9801_epson.h | 6 +- src/mame/nec/pc9821.h | 6 +- src/mame/nec/pc98ha.h | 6 +- src/mame/nec/pce.h | 6 +- src/mame/neogeo/neogeo.h | 6 +- src/mame/netronics/elf.h | 6 +- src/mame/next/next.h | 6 +- src/mame/nichibutsu/armedf.h | 6 +- src/mame/nichibutsu/clshroad.h | 6 +- src/mame/nichibutsu/cop01.h | 6 +- src/mame/nichibutsu/galivan.h | 6 +- src/mame/nichibutsu/gomoku_a.h | 6 +- src/mame/nichibutsu/magmax.h | 6 +- src/mame/nichibutsu/nbmj8688.h | 6 +- src/mame/nichibutsu/nbmj8900.h | 6 +- src/mame/nichibutsu/nbmj9195.h | 6 +- src/mame/nichibutsu/pastelg.h | 6 +- src/mame/nichibutsu/seicross.h | 6 +- src/mame/nichibutsu/terracre.h | 6 +- src/mame/nichibutsu/tubep.h | 6 +- src/mame/nichibutsu/wiping_a.h | 6 +- src/mame/nintendo/dkong.h | 6 +- src/mame/nintendo/gba.h | 6 +- src/mame/nintendo/mario.h | 6 +- src/mame/nintendo/n8080.h | 6 +- src/mame/nintendo/nds.h | 6 +- src/mame/nintendo/nes.h | 6 +- src/mame/nintendo/popeye.h | 6 +- src/mame/nintendo/punchout.h | 6 +- src/mame/nintendo/snes.h | 6 +- src/mame/nix/fitfight.h | 6 +- src/mame/nmk/nmk16.h | 6 +- src/mame/nmk/powerins.h | 6 +- src/mame/nokia/mikromik.h | 6 +- src/mame/olympia/dday.h | 6 +- src/mame/olympia/portrait.h | 6 +- src/mame/omnibyte/ob68k1a.h | 6 +- src/mame/osborne/osborne1.h | 6 +- src/mame/osi/osi.h | 6 +- src/mame/pacman/pacman.h | 6 +- src/mame/philips/cdi.h | 6 +- src/mame/philips/p2000t.h | 6 +- src/mame/phoenix/naughtyb.h | 6 +- src/mame/phoenix/phoenix.h | 6 +- src/mame/phoenix/phoenix_a.h | 6 +- src/mame/pinball/s11.h | 6 +- src/mame/playmark/playmark.h | 6 +- src/mame/playmark/sslam.h | 6 +- src/mame/poly88/poly88.h | 6 +- src/mame/psikyo/psikyo.h | 6 +- src/mame/psikyo/psikyosh.h | 6 +- src/mame/psion/psion.h | 6 +- src/mame/psion/psion5.h | 6 +- src/mame/ramtek/hitme.h | 6 +- src/mame/ramtek/starcrus.h | 6 +- src/mame/rca/vip.h | 6 +- src/mame/rm/rm380z.h | 6 +- src/mame/rm/rmnimbus.h | 6 +- src/mame/rockwell/aim65.h | 6 +- src/mame/saitek/stratos.h | 6 +- src/mame/sanritsu/mermaid.h | 6 +- src/mame/sanyo/mbc55x.h | 6 +- src/mame/sanyo/phc25.h | 6 +- src/mame/sega/dc.h | 6 +- src/mame/sega/dc_atomiswave.h | 6 +- src/mame/sega/megadriv_acbl.h | 6 +- src/mame/sega/model1.h | 6 +- src/mame/sega/model2.h | 2 +- src/mame/sega/model3.h | 6 +- src/mame/sega/naomi.h | 6 +- src/mame/sega/saturn.h | 6 +- src/mame/sega/segag80.h | 6 +- src/mame/sega/segag80r.h | 6 +- src/mame/sega/segag80r_a.h | 6 +- src/mame/sega/segag80v.h | 6 +- src/mame/sega/segaic16.h | 6 +- src/mame/sega/segaic16_m.h | 6 +- src/mame/sega/segas16b.h | 6 +- src/mame/sega/segas18.h | 6 +- src/mame/sega/segas24.h | 6 +- src/mame/sega/segas32.h | 6 +- src/mame/sega/segasp.h | 6 +- src/mame/sega/segaxbd.h | 6 +- src/mame/sega/segaybd.h | 6 +- src/mame/sega/sms.h | 6 +- src/mame/sega/system1.h | 6 +- src/mame/sega/system16.h | 6 +- src/mame/sega/turbo.h | 6 +- src/mame/sega/vicdual_a.h | 6 +- src/mame/sega/zaxxon.h | 6 +- src/mame/seibu/darkmist.h | 6 +- src/mame/seibu/kncljoe.h | 6 +- src/mame/seibu/stfight.h | 6 +- src/mame/seibu/wiz.h | 6 +- src/mame/seta/seta.h | 6 +- src/mame/seta/seta2.h | 6 +- src/mame/seta/speedatk.h | 6 +- src/mame/seta/srmp2.h | 6 +- src/mame/seta/ssv.h | 6 +- src/mame/shared/cclimber_a.h | 6 +- src/mame/shared/pk8000_v.h | 6 +- src/mame/shared/timeplt_a.h | 6 +- src/mame/shared/xbox_nv2a.h | 6 +- src/mame/shared/xbox_usb.h | 6 +- src/mame/sharp/mz2500.h | 6 +- src/mame/sharp/mz700.h | 6 +- src/mame/sharp/mz80.h | 6 +- src/mame/sharp/pc1251.h | 6 +- src/mame/sharp/pc1350.h | 6 +- src/mame/sharp/pc1401.h | 6 +- src/mame/sharp/pc1403.h | 6 +- src/mame/sharp/pocketc.h | 6 +- src/mame/sharp/x1.h | 6 +- src/mame/sharp/x68k.h | 6 +- src/mame/siemens/pcd_kbd.h | 6 +- src/mame/sigma/spiders.h | 6 +- src/mame/sinclair/beta_m.h | 6 +- src/mame/skeleton/busicom.h | 6 +- src/mame/skeleton/cosmicos.h | 6 +- src/mame/skeleton/cxhumax.h | 6 +- src/mame/skeleton/dm7000.h | 6 +- src/mame/skeleton/micronic.h | 6 +- src/mame/skeleton/softbox.h | 6 +- src/mame/skeleton/vp415.h | 6 +- src/mame/skeleton/xor100.h | 6 +- src/mame/skeleton/zorba.h | 6 +- src/mame/snk/hng64.h | 6 +- src/mame/snk/lasso.h | 6 +- src/mame/snk/prehisle.h | 6 +- src/mame/snk/snk.h | 6 +- src/mame/snk/snk6502.h | 6 +- src/mame/snk/snk6502_a.h | 6 +- src/mame/stern/cliffhgr_a.h | 6 +- src/mame/subsino/subsino_m.h | 6 +- src/mame/suna/suna8.h | 6 +- src/mame/sunelectronics/markham.h | 6 +- src/mame/sunelectronics/route16.h | 6 +- src/mame/sunelectronics/shangha3.h | 6 +- src/mame/svision/svision.h | 6 +- src/mame/swtpc/swtpc09.h | 6 +- src/mame/taito/crbaloon.h | 6 +- src/mame/taito/darius.h | 6 +- src/mame/taito/grchamp.h | 6 +- src/mame/taito/gsword.h | 6 +- src/mame/taito/ninjaw.h | 6 +- src/mame/taito/othunder.h | 6 +- src/mame/taito/qix.h | 6 +- src/mame/taito/slapshot.h | 6 +- src/mame/taito/spdheat.h | 6 +- src/mame/taito/superchs.h | 6 +- src/mame/taito/superqix.h | 6 +- src/mame/taito/taito_b.h | 6 +- src/mame/taito/taito_f2.h | 6 +- src/mame/taito/taito_f3.h | 6 +- src/mame/taito/taito_h.h | 6 +- src/mame/taito/taito_l.h | 6 +- src/mame/taito/taito_z.h | 6 +- src/mame/taito/taitoair.h | 6 +- src/mame/taito/topspeed.h | 6 +- src/mame/taito/tsamurai.h | 6 +- src/mame/taito/undrfire.h | 6 +- src/mame/taito/wgp.h | 6 +- src/mame/tandberg/tdv2324.h | 6 +- src/mame/tangerine/microtan.h | 6 +- src/mame/tatsumi/lockon.h | 6 +- src/mame/tatsumi/tatsumi.h | 6 +- src/mame/tatsumi/tx1.h | 6 +- src/mame/tatsumi/tx1_a.h | 6 +- src/mame/tch/kickgoal.h | 6 +- src/mame/technos/ddragon.h | 6 +- src/mame/technos/ddragon3.h | 6 +- src/mame/tecmo/gaiden.h | 6 +- src/mame/tecmo/senjyo.h | 6 +- src/mame/tecmo/tecmo.h | 6 +- src/mame/tecmo/tecmosys.h | 6 +- src/mame/tektronix/tek405x.h | 6 +- src/mame/telenova/compiskb.h | 6 +- src/mame/telercas/tmc1800.h | 6 +- src/mame/telercas/tmc2000e.h | 6 +- src/mame/telercas/tmc600.h | 6 +- src/mame/tesla/ondra.h | 6 +- src/mame/tesla/pmd85.h | 6 +- src/mame/thepit/thepit.h | 6 +- src/mame/thomson/thomson.h | 6 +- src/mame/ti/avigo.h | 6 +- src/mame/ti/ti85.h | 6 +- src/mame/tiger/gamecom.h | 6 +- src/mame/tiki/tiki100.h | 6 +- src/mame/toaplan/toaplan1.h | 6 +- src/mame/toaplan/toaplan2.h | 6 +- src/mame/toaplan/twincobr.h | 6 +- src/mame/trs/coco.h | 6 +- src/mame/trs/coco12.h | 6 +- src/mame/trs/coco3.h | 6 +- src/mame/trs/dgn_beta.h | 6 +- src/mame/trs/dragon.h | 6 +- src/mame/trs/tandy2k.h | 6 +- src/mame/trs/trs80.h | 6 +- src/mame/trs/trs80m2.h | 6 +- src/mame/trs/trs80m3.h | 6 +- src/mame/tvgames/elan_eu3a05_a.h | 6 +- src/mame/tvgames/generalplus_gpl16250.h | 6 +- src/mame/tvgames/generalplus_gpl16250_m.h | 6 +- src/mame/tvgames/generalplus_gpl16250_nand.h | 6 +- src/mame/tvgames/generalplus_gpl16250_romram.h | 6 +- src/mame/tvgames/spg2xx.h | 6 +- src/mame/tvgames/xavix.h | 6 +- src/mame/tvgames/xavix_2000.h | 6 +- src/mame/tvgames/xavix_2002.h | 6 +- src/mame/unico/drgnmst.h | 6 +- src/mame/unico/unico.h | 6 +- src/mame/universal/cheekyms.h | 6 +- src/mame/universal/cheekyms_a.h | 6 +- src/mame/universal/cosmic.h | 6 +- src/mame/universal/docastle.h | 6 +- src/mame/universal/mrdo.h | 6 +- src/mame/upl/ninjakd2.h | 6 +- src/mame/upl/nova2001.h | 6 +- src/mame/ussr/b2m.h | 6 +- src/mame/ussr/bk.h | 6 +- src/mame/ussr/lviv.h | 6 +- src/mame/ussr/mikro80.h | 6 +- src/mame/ussr/partner.h | 6 +- src/mame/ussr/pk8020.h | 6 +- src/mame/ussr/radio86.h | 6 +- src/mame/ussr/tiamc1.h | 6 +- src/mame/ussr/tiamc1_a.h | 6 +- src/mame/ussr/ut88.h | 6 +- src/mame/ussr/vector06.h | 6 +- src/mame/valadon/bagman.h | 6 +- src/mame/verifone/tranz330.h | 6 +- src/mame/vidbrain/vidbrain.h | 6 +- src/mame/videoton/tvc_a.h | 6 +- src/mame/visual/v1050.h | 6 +- src/mame/vsystem/aerofgt.h | 6 +- src/mame/vsystem/crshrace.cpp | 321 ++++++++-- src/mame/vsystem/crshrace.h | 86 --- src/mame/vsystem/crshrace_v.cpp | 125 ---- src/mame/vsystem/f1gp.cpp | 792 +++++++++++++++++++------ src/mame/vsystem/f1gp.h | 140 ----- src/mame/vsystem/f1gp_v.cpp | 285 --------- src/mame/vsystem/fromanc2.h | 6 +- src/mame/vsystem/fromance.h | 6 +- src/mame/vsystem/ojankohs.h | 6 +- src/mame/vsystem/taotaido.cpp | 333 +++++++++-- src/mame/vsystem/taotaido.h | 80 --- src/mame/vsystem/taotaido_v.cpp | 146 ----- src/mame/vtech/crvision.h | 6 +- src/mame/vtech/pc4.h | 6 +- src/mame/vtech/socrates_a.h | 6 +- src/mame/vtech/vsmile.h | 6 +- src/mame/vtech/vtech2.h | 6 +- src/mame/wavemate/bullet.h | 6 +- src/mame/wing/lucky74.h | 6 +- src/mame/xerox/xerox820.h | 6 +- src/mame/zaccaria/laserbat.h | 6 +- src/mame/zaccaria/zac2650.h | 6 +- src/mame/zaccaria/zaccaria.h | 6 +- src/mame/zaccaria/zaccaria_a.h | 6 +- src/mame/zvt/pp01.h | 6 +- 555 files changed, 2779 insertions(+), 2803 deletions(-) delete mode 100644 src/mame/vsystem/crshrace.h delete mode 100644 src/mame/vsystem/crshrace_v.cpp delete mode 100644 src/mame/vsystem/f1gp.h delete mode 100644 src/mame/vsystem/f1gp_v.cpp delete mode 100644 src/mame/vsystem/taotaido.h delete mode 100644 src/mame/vsystem/taotaido_v.cpp diff --git a/src/mame/acorn/atom.h b/src/mame/acorn/atom.h index 35bfcc3e078..57d672a0caa 100644 --- a/src/mame/acorn/atom.h +++ b/src/mame/acorn/atom.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nathan Woods -#ifndef MAME_INCLUDES_ATOM_H -#define MAME_INCLUDES_ATOM_H +#ifndef MAME_ACORN_ATOM_H +#define MAME_ACORN_ATOM_H #pragma once @@ -143,4 +143,4 @@ private: void atomeb_mem(address_map &map); }; -#endif // MAME_INCLUDES_ATOM_H +#endif // MAME_ACORN_ATOM_H diff --git a/src/mame/acorn/bbc.h b/src/mame/acorn/bbc.h index 1f38be90468..b7207ca1801 100644 --- a/src/mame/acorn/bbc.h +++ b/src/mame/acorn/bbc.h @@ -7,8 +7,8 @@ * Driver by Gordon Jefferyes * ****************************************************************************/ -#ifndef MAME_INCLUDES_BBC_H -#define MAME_INCLUDES_BBC_H +#ifndef MAME_ACORN_BBC_H +#define MAME_ACORN_BBC_H #pragma once @@ -463,4 +463,4 @@ protected: }; -#endif // MAME_INCLUDES_BBC_H +#endif // MAME_ACORN_BBC_H diff --git a/src/mame/acorn/electron.h b/src/mame/acorn/electron.h index 4d2d9719ef6..90ce43665a6 100644 --- a/src/mame/acorn/electron.h +++ b/src/mame/acorn/electron.h @@ -9,8 +9,8 @@ * Driver by Wilbert Pol * ****************************************************************************/ -#ifndef MAME_INCLUDES_ELECTRON_H -#define MAME_INCLUDES_ELECTRON_H +#ifndef MAME_ACORN_ELECTRON_H +#define MAME_ACORN_ELECTRON_H #pragma once @@ -187,4 +187,4 @@ private: }; -#endif // MAME_INCLUDES_ELECTRON_H +#endif // MAME_ACORN_ELECTRON_H diff --git a/src/mame/acorn/z88.h b/src/mame/acorn/z88.h index 6d19027d935..da130b5b546 100644 --- a/src/mame/acorn/z88.h +++ b/src/mame/acorn/z88.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_Z88_H -#define MAME_INCLUDES_Z88_H +#ifndef MAME_ACORN_Z88_H +#define MAME_ACORN_Z88_H #pragma once @@ -92,4 +92,4 @@ private: memory_view m_boot_view; }; -#endif // MAME_INCLUDES_Z88_H +#endif // MAME_ACORN_Z88_H diff --git a/src/mame/adc/super6.h b/src/mame/adc/super6.h index 9db9096e451..a50be58c2aa 100644 --- a/src/mame/adc/super6.h +++ b/src/mame/adc/super6.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_SUPER6_H -#define MAME_INCLUDES_SUPER6_H +#ifndef MAME_ADC_SUPER6_H +#define MAME_ADC_SUPER6_H #pragma once @@ -88,4 +88,4 @@ private: uint8_t m_bank1 = 0; }; -#endif // MAME_INCLUDES_SUPER6_H +#endif // MAME_ADC_SUPER6_H diff --git a/src/mame/alesis/alesis.h b/src/mame/alesis/alesis.h index 0d1ef4ac055..8c83ce13fc3 100644 --- a/src/mame/alesis/alesis.h +++ b/src/mame/alesis/alesis.h @@ -6,8 +6,8 @@ ****************************************************************************/ -#ifndef MAME_INCLUDES_ALESIS_H -#define MAME_INCLUDES_ALESIS_H +#ifndef MAME_ALESIS_ALESIS_H +#define MAME_ALESIS_ALESIS_H #pragma once @@ -231,4 +231,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(ALESIS_DM3AG, alesis_dm3ag_device) -#endif // MAME_INCLUDES_ALESIS_H +#endif // MAME_ALESIS_ALESIS_H diff --git a/src/mame/alpha/alpha68k.h b/src/mame/alpha/alpha68k.h index c0710814384..03c902103a2 100644 --- a/src/mame/alpha/alpha68k.h +++ b/src/mame/alpha/alpha68k.h @@ -5,8 +5,8 @@ SNK/Alpha 68000 based games *************************************************************************/ -#ifndef MAME_INCLUDES_ALPHA68K_H -#define MAME_INCLUDES_ALPHA68K_H +#ifndef MAME_ALPHA_ALPHA68K_H +#define MAME_ALPHA_ALPHA68K_H #pragma once @@ -424,4 +424,4 @@ enum PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )\ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) -#endif // MAME_INCLUDES_ALPHA68K_H +#endif // MAME_ALPHA_ALPHA68K_H diff --git a/src/mame/alpha/champbas.h b/src/mame/alpha/champbas.h index 666ca7ac63d..b42b7e9dfd7 100644 --- a/src/mame/alpha/champbas.h +++ b/src/mame/alpha/champbas.h @@ -5,8 +5,8 @@ Talbot - Champion Base Ball - Exciting Soccer *************************************************************************/ -#ifndef MAME_INCLUDES_CHAMPBAS_H -#define MAME_INCLUDES_CHAMPBAS_H +#ifndef MAME_ALPHA_CHAMPBAS_H +#define MAME_ALPHA_CHAMPBAS_H #pragma once @@ -136,4 +136,4 @@ private: required_device m_audiocpu; }; -#endif // MAME_INCLUDES_CHAMPBAS_H +#endif // MAME_ALPHA_CHAMPBAS_H diff --git a/src/mame/amiga/amiga.h b/src/mame/amiga/amiga.h index bbc655f40fa..40e05d66a2b 100644 --- a/src/mame/amiga/amiga.h +++ b/src/mame/amiga/amiga.h @@ -9,8 +9,8 @@ Ernesto Corvi & Mariusz Wojcieszek ***************************************************************************/ -#ifndef MAME_INCLUDES_AMIGA_H -#define MAME_INCLUDES_AMIGA_H +#ifndef MAME_AMIGA_AMIGA_H +#define MAME_AMIGA_AMIGA_H #pragma once @@ -729,4 +729,4 @@ private: uint32_t amiga_gethvpos(); }; -#endif // MAME_INCLUDES_AMIGA_H +#endif // MAME_AMIGA_AMIGA_H diff --git a/src/mame/amstrad/amstrad.h b/src/mame/amstrad/amstrad.h index deda66687e8..984b4d97ca7 100644 --- a/src/mame/amstrad/amstrad.h +++ b/src/mame/amstrad/amstrad.h @@ -5,8 +5,8 @@ * includes/amstrad.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_AMSTRAD_H -#define MAME_INCLUDES_AMSTRAD_H +#ifndef MAME_AMSTRAD_AMSTRAD_H +#define MAME_AMSTRAD_AMSTRAD_H #pragma once @@ -319,4 +319,4 @@ private: void cpc_exp_cards(device_slot_interface &device); void cpcplus_exp_cards(device_slot_interface &device); -#endif // MAME_INCLUDES_AMSTRAD_H +#endif // MAME_AMSTRAD_AMSTRAD_H diff --git a/src/mame/amstrad/nc.h b/src/mame/amstrad/nc.h index 492746f2d7a..0ccb2d3770f 100644 --- a/src/mame/amstrad/nc.h +++ b/src/mame/amstrad/nc.h @@ -5,8 +5,8 @@ * includes/nc.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_NC_H -#define MAME_INCLUDES_NC_H +#ifndef MAME_AMSTRAD_NC_H +#define MAME_AMSTRAD_NC_H #pragma once @@ -209,4 +209,4 @@ private: }; -#endif // MAME_INCLUDES_NC_H +#endif // MAME_AMSTRAD_NC_H diff --git a/src/mame/amstrad/pc1512.h b/src/mame/amstrad/pc1512.h index ce6ba999186..94e98c09401 100644 --- a/src/mame/amstrad/pc1512.h +++ b/src/mame/amstrad/pc1512.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_PC1512_H -#define MAME_INCLUDES_PC1512_H +#ifndef MAME_AMSTRAD_PC1512_H +#define MAME_AMSTRAD_PC1512_H #pragma once @@ -237,4 +237,4 @@ public: void pc1640_mem(address_map &map); }; -#endif // MAME_INCLUDES_PC1512_H +#endif // MAME_AMSTRAD_PC1512_H diff --git a/src/mame/amstrad/pcw.h b/src/mame/amstrad/pcw.h index ef3526c4d6d..1a1b6d3150c 100644 --- a/src/mame/amstrad/pcw.h +++ b/src/mame/amstrad/pcw.h @@ -5,8 +5,8 @@ * includes/pcw.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_PCW_H -#define MAME_INCLUDES_PCW_H +#ifndef MAME_AMSTRAD_PCW_H +#define MAME_AMSTRAD_PCW_H #pragma once @@ -169,4 +169,4 @@ private: void pcw_map(address_map &map); }; -#endif // MAME_INCLUDES_PCW_H +#endif // MAME_AMSTRAD_PCW_H diff --git a/src/mame/amstrad/pcw16.h b/src/mame/amstrad/pcw16.h index 7382bb25149..aa58808a074 100644 --- a/src/mame/amstrad/pcw16.h +++ b/src/mame/amstrad/pcw16.h @@ -5,8 +5,8 @@ * includes/pcw16.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_PCW16_H -#define MAME_INCLUDES_PCW16_H +#ifndef MAME_AMSTRAD_PCW16_H +#define MAME_AMSTRAD_PCW16_H #pragma once @@ -153,4 +153,4 @@ private: int m_video_control = 0; }; -#endif // MAME_INCLUDES_PCW16_H +#endif // MAME_AMSTRAD_PCW16_H diff --git a/src/mame/apollo/apollo.h b/src/mame/apollo/apollo.h index 1cde2af27d6..1cbbb9dfe56 100644 --- a/src/mame/apollo/apollo.h +++ b/src/mame/apollo/apollo.h @@ -8,8 +8,8 @@ * */ -#ifndef MAME_INCLUDES_APOLLO_H -#define MAME_INCLUDES_APOLLO_H +#ifndef MAME_APOLLO_APOLLO_H +#define MAME_APOLLO_APOLLO_H #pragma once @@ -716,4 +716,4 @@ private: DECLARE_DEVICE_TYPE(APOLLO_STDIO, apollo_stdio_device) #endif /* APOLLO_XXL */ -#endif // MAME_INCLUDES_APOLLO_H +#endif // MAME_APOLLO_APOLLO_H diff --git a/src/mame/apple/apple2e.h b/src/mame/apple/apple2e.h index daf8fecb873..6832715507e 100644 --- a/src/mame/apple/apple2e.h +++ b/src/mame/apple/apple2e.h @@ -6,9 +6,9 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_APPLE2E_H -#define MAME_INCLUDES_APPLE2E_H +#ifndef MAME_APPLE_APPLE2E_H +#define MAME_APPLE_APPLE2E_H INPUT_PORTS_EXTERN( apple2ep ); -#endif // MAME_INCLUDES_APPLE2E_H +#endif // MAME_APPLE_APPLE2E_H diff --git a/src/mame/apple/apple3.h b/src/mame/apple/apple3.h index f096bedd9ef..0cf9d3092c7 100644 --- a/src/mame/apple/apple3.h +++ b/src/mame/apple/apple3.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_APPLE3_H -#define MAME_INCLUDES_APPLE3_H +#ifndef MAME_APPLE_APPLE3_H +#define MAME_APPLE_APPLE3_H #pragma once @@ -170,4 +170,4 @@ private: int m_inh_state = 0; }; -#endif // MAME_INCLUDES_APPLE3_H +#endif // MAME_APPLE_APPLE3_H diff --git a/src/mame/apple/lisa.h b/src/mame/apple/lisa.h index 4e86b0f383c..c2331fef0cc 100644 --- a/src/mame/apple/lisa.h +++ b/src/mame/apple/lisa.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_LISA_H -#define MAME_INCLUDES_LISA_H +#ifndef MAME_APPLE_LISA_H +#define MAME_APPLE_LISA_H #include "cpu/m6502/m6504.h" #include "cpu/m68000/m68000.h" @@ -256,4 +256,4 @@ private: void lisa_map(address_map &map); }; -#endif // MAME_INCLUDES_LISA_H +#endif // MAME_APPLE_LISA_H diff --git a/src/mame/apple/mac.h b/src/mame/apple/mac.h index 0c460f8f5a1..e9686413a5c 100644 --- a/src/mame/apple/mac.h +++ b/src/mame/apple/mac.h @@ -7,8 +7,8 @@ * Macintosh II driver declarations * ****************************************************************************/ -#ifndef MAME_INCLUDES_MAC_H -#define MAME_INCLUDES_MAC_H +#ifndef MAME_APPLE_MAC_H +#define MAME_APPLE_MAC_H #pragma once @@ -293,4 +293,4 @@ private: void mac_install_memory(offs_t memory_begin, offs_t memory_end, offs_t memory_size, void *memory_data, int is_rom); }; -#endif // MAME_INCLUDES_MAC_H +#endif // MAME_APPLE_MAC_H diff --git a/src/mame/apple/macpci.h b/src/mame/apple/macpci.h index 87775a987aa..368ce87acb2 100644 --- a/src/mame/apple/macpci.h +++ b/src/mame/apple/macpci.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_MACPCI_H -#define MAME_INCLUDES_MACPCI_H +#ifndef MAME_APPLE_MACPCI_H +#define MAME_APPLE_MACPCI_H #include "machine/8530scc.h" #include "machine/6522via.h" @@ -166,4 +166,4 @@ private: void mac_driver_init(model_t model); }; -#endif // MAME_INCLUDES_MACPCI_H +#endif // MAME_APPLE_MACPCI_H diff --git a/src/mame/arcadia/arcadia.h b/src/mame/arcadia/arcadia.h index 033c4c92290..7e634712c5d 100644 --- a/src/mame/arcadia/arcadia.h +++ b/src/mame/arcadia/arcadia.h @@ -5,8 +5,8 @@ * includes/arcadia.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_ARCADIA_H -#define MAME_INCLUDES_ARCADIA_H +#ifndef MAME_ARCADIA_ARCADIA_H +#define MAME_ARCADIA_ARCADIA_H #pragma once @@ -137,4 +137,4 @@ private: void draw_sprites(); }; -#endif // MAME_INCLUDES_ARCADIA_H +#endif // MAME_ARCADIA_ARCADIA_H diff --git a/src/mame/arcadia/arcadia_a.h b/src/mame/arcadia/arcadia_a.h index e705583d397..be2da18c2e5 100644 --- a/src/mame/arcadia/arcadia_a.h +++ b/src/mame/arcadia/arcadia_a.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Peter Trauner -#ifndef MAME_ARCADIA_ARCADIA_H -#define MAME_ARCADIA_ARCADIA_H +#ifndef MAME_ARCADIA_ARCADIA_A_H +#define MAME_ARCADIA_ARCADIA_A_H //************************************************************************** // TYPE DEFINITIONS @@ -34,4 +34,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(ARCADIA_SOUND, arcadia_sound_device) -#endif // MAME_ARCADIA_ARCADIA_H +#endif // MAME_ARCADIA_ARCADIA_A_H diff --git a/src/mame/atari/atari400.h b/src/mame/atari/atari400.h index 96b99a759fa..7b551ff1f6f 100644 --- a/src/mame/atari/atari400.h +++ b/src/mame/atari/atari400.h @@ -11,8 +11,8 @@ ******************************************************************************/ -#ifndef MAME_INCLUDES_ATARI400_H -#define MAME_INCLUDES_ATARI400_H +#ifndef MAME_ATARI_ATARI400_H +#define MAME_ATARI_ATARI400_H #pragma once @@ -66,4 +66,4 @@ protected: void config_pal_screen(machine_config &config); }; -#endif // MAME_INCLUDES_ATARI400_H +#endif // MAME_ATARI_ATARI400_H diff --git a/src/mame/atari/atarifb.h b/src/mame/atari/atarifb.h index eb6d090d7ba..7d0d0626197 100644 --- a/src/mame/atari/atarifb.h +++ b/src/mame/atari/atarifb.h @@ -6,8 +6,8 @@ *************************************************************************/ -#ifndef MAME_INCLUDES_ATARIFB_H -#define MAME_INCLUDES_ATARIFB_H +#ifndef MAME_ATARI_ATARIFB_H +#define MAME_ATARI_ATARIFB_H #pragma once @@ -137,4 +137,4 @@ private: DISCRETE_SOUND_EXTERN( atarifb_discrete ); DISCRETE_SOUND_EXTERN( abaseb_discrete ); -#endif // MAME_INCLUDES_ATARIFB_H +#endif // MAME_ATARI_ATARIFB_H diff --git a/src/mame/atari/atarig42.h b/src/mame/atari/atarig42.h index da94495a84f..203b224f1b1 100644 --- a/src/mame/atari/atarig42.h +++ b/src/mame/atari/atarig42.h @@ -5,8 +5,8 @@ Atari G42 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_ATARIG42_H -#define MAME_INCLUDES_ATARIG42_H +#ifndef MAME_ATARI_ATARIG42_H +#define MAME_ATARI_ATARIG42_H #pragma once @@ -103,4 +103,4 @@ protected: void guardians_sloop_tweak(int offset); }; -#endif // MAME_INCLUDES_ATARIG42_H +#endif // MAME_ATARI_ATARIG42_H diff --git a/src/mame/atari/atarigx2.h b/src/mame/atari/atarigx2.h index 43c2fe3b834..2b161156c2b 100644 --- a/src/mame/atari/atarigx2.h +++ b/src/mame/atari/atarigx2.h @@ -5,8 +5,8 @@ Atari GX2 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_ATARIGX2_H -#define MAME_INCLUDES_ATARIGX2_H +#ifndef MAME_ATARI_ATARIGX2_H +#define MAME_ATARI_ATARIGX2_H #pragma once @@ -86,4 +86,4 @@ private: uint32_t m_protection_ram[0x1000]{}; }; -#endif // MAME_INCLUDES_ATARIGX2_H +#endif // MAME_ATARI_ATARIGX2_H diff --git a/src/mame/atari/atarist_v.h b/src/mame/atari/atarist_v.h index 3e9c8786613..f8befb602ea 100644 --- a/src/mame/atari/atarist_v.h +++ b/src/mame/atari/atarist_v.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Olivier Galibert -#ifndef MAME_ATARI_ATARIST_H -#define MAME_ATARI_ATARIST_H +#ifndef MAME_ATARI_ATARIST_V_H +#define MAME_ATARI_ATARIST_V_H #pragma once @@ -131,4 +131,4 @@ DECLARE_DEVICE_TYPE(STE_VIDEO, ste_video_device) //DECLARE_DEVICE_TYPE(STBOOK_VIDEO, stbook_video_device) //DECLARE_DEVICE_TYPE(TT_VIDEO, tt_video_device) -#endif // MAME_ATARI_ATARIST_H +#endif // MAME_ATARI_ATARIST_V_H diff --git a/src/mame/atari/atarisy1.h b/src/mame/atari/atarisy1.h index 04ecd2244e4..68a42973719 100644 --- a/src/mame/atari/atarisy1.h +++ b/src/mame/atari/atarisy1.h @@ -5,8 +5,8 @@ Atari System 1 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_ATARISY1_H -#define MAME_INCLUDES_ATARISY1_H +#ifndef MAME_ATARI_ATARISY1_H +#define MAME_ATARI_ATARISY1_H #pragma once @@ -164,4 +164,4 @@ public: virtual void update_timers(int scanline) override; }; -#endif // MAME_INCLUDES_ATARISY1_H +#endif // MAME_ATARI_ATARISY1_H diff --git a/src/mame/atari/badlands.h b/src/mame/atari/badlands.h index 71dd4e2bed5..e7ab66f297a 100644 --- a/src/mame/atari/badlands.h +++ b/src/mame/atari/badlands.h @@ -5,8 +5,8 @@ Atari Bad Lands hardware *************************************************************************/ -#ifndef MAME_INCLUDES_BADLANDS_H -#define MAME_INCLUDES_BADLANDS_H +#ifndef MAME_ATARI_BADLANDS_H +#define MAME_ATARI_BADLANDS_H #pragma once @@ -125,6 +125,6 @@ private: }; -#endif // MAME_INCLUDES_BADLANDS_H +#endif // MAME_ATARI_BADLANDS_H diff --git a/src/mame/atari/batman.h b/src/mame/atari/batman.h index da68ff9f4f3..d6d0145d734 100644 --- a/src/mame/atari/batman.h +++ b/src/mame/atari/batman.h @@ -5,8 +5,8 @@ Atari Batman hardware *************************************************************************/ -#ifndef MAME_INCLUDES_BATMAN_H -#define MAME_INCLUDES_BATMAN_H +#ifndef MAME_ATARI_BATMAN_H +#define MAME_ATARI_BATMAN_H #pragma once @@ -55,4 +55,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_BATMAN_H +#endif // MAME_ATARI_BATMAN_H diff --git a/src/mame/atari/beathead.h b/src/mame/atari/beathead.h index 7c4802ecaa5..95eb3b931fc 100644 --- a/src/mame/atari/beathead.h +++ b/src/mame/atari/beathead.h @@ -5,8 +5,8 @@ Atari "Stella on Steroids" hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_BEATHEAD_H -#define MAME_INCLUDES_BEATHEAD_H +#ifndef MAME_ATARI_BEATHEAD_H +#define MAME_ATARI_BEATHEAD_H #pragma once @@ -89,4 +89,4 @@ private: uint8_t m_irq_state[3]{}; }; -#endif // MAME_INCLUDES_BEATHEAD_H +#endif // MAME_ATARI_BEATHEAD_H diff --git a/src/mame/atari/blstroid.h b/src/mame/atari/blstroid.h index c2680341523..4254d6e1c8a 100644 --- a/src/mame/atari/blstroid.h +++ b/src/mame/atari/blstroid.h @@ -5,8 +5,8 @@ Atari Blasteroids hardware *************************************************************************/ -#ifndef MAME_INCLUDES_BLSTROID_H -#define MAME_INCLUDES_BLSTROID_H +#ifndef MAME_ATARI_BLSTROID_H +#define MAME_ATARI_BLSTROID_H #pragma once @@ -59,4 +59,4 @@ private: bool m_scanline_int_state = false; }; -#endif // MAME_INCLUDES_BLSTROID_H +#endif // MAME_ATARI_BLSTROID_H diff --git a/src/mame/atari/bsktball.h b/src/mame/atari/bsktball.h index 8d518432441..f0889f5bf42 100644 --- a/src/mame/atari/bsktball.h +++ b/src/mame/atari/bsktball.h @@ -5,8 +5,8 @@ Atari Basketball hardware *************************************************************************/ -#ifndef MAME_INCLUDES_BSKTBALL_H -#define MAME_INCLUDES_BSKTBALL_H +#ifndef MAME_ATARI_BSKTBALL_H +#define MAME_ATARI_BSKTBALL_H #pragma once @@ -94,4 +94,4 @@ private: DISCRETE_SOUND_EXTERN( bsktball_discrete ); -#endif // MAME_INCLUDES_BSKTBALL_H +#endif // MAME_ATARI_BSKTBALL_H diff --git a/src/mame/atari/bwidow.h b/src/mame/atari/bwidow.h index 20bed5458b9..94923413d04 100644 --- a/src/mame/atari/bwidow.h +++ b/src/mame/atari/bwidow.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver, Bernd Wiebelt, Allard van der Bas -#ifndef MAME_INCLUDES_BWIDOW_H -#define MAME_INCLUDES_BWIDOW_H +#ifndef MAME_ATARI_BWIDOW_H +#define MAME_ATARI_BWIDOW_H #include "video/avgdvg.h" #include "machine/er2055.h" @@ -64,4 +64,4 @@ protected: output_finder<2> m_leds; }; -#endif // MAME_INCLUDES_BWIDOW_H +#endif // MAME_ATARI_BWIDOW_H diff --git a/src/mame/atari/bzone.h b/src/mame/atari/bzone.h index b88bfa7f10d..f179178e63c 100644 --- a/src/mame/atari/bzone.h +++ b/src/mame/atari/bzone.h @@ -5,8 +5,8 @@ Atari Battle Zone hardware *************************************************************************/ -#ifndef MAME_INCLUDES_BZONE_H -#define MAME_INCLUDES_BZONE_H +#ifndef MAME_ATARI_BZONE_H +#define MAME_ATARI_BZONE_H #pragma once @@ -90,4 +90,4 @@ private: uint8_t m_rb_input_select = 0U; }; -#endif // MAME_INCLUDES_BZONE_H +#endif // MAME_ATARI_BZONE_H diff --git a/src/mame/atari/canyon.h b/src/mame/atari/canyon.h index 2c16c763c8d..4681c13e4bb 100644 --- a/src/mame/atari/canyon.h +++ b/src/mame/atari/canyon.h @@ -5,8 +5,8 @@ Atari Canyon Bomber hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CANYON_H -#define MAME_INCLUDES_CANYON_H +#ifndef MAME_ATARI_CANYON_H +#define MAME_ATARI_CANYON_H #pragma once @@ -79,4 +79,4 @@ private: /*----------- defined in audio/canyon.c -----------*/ DISCRETE_SOUND_EXTERN( canyon_discrete ); -#endif // MAME_INCLUDES_CANYON_H +#endif // MAME_ATARI_CANYON_H diff --git a/src/mame/atari/ccastles.h b/src/mame/atari/ccastles.h index fb224da868e..8e601e5d6c3 100644 --- a/src/mame/atari/ccastles.h +++ b/src/mame/atari/ccastles.h @@ -5,8 +5,8 @@ Atari Crystal Castles hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CCASTLES_H -#define MAME_INCLUDES_CCASTLES_H +#ifndef MAME_ATARI_CCASTLES_H +#define MAME_ATARI_CCASTLES_H #pragma once @@ -94,4 +94,4 @@ private: uint8_t m_irq_state = 0U; }; -#endif // MAME_INCLUDES_CCASTLES_H +#endif // MAME_ATARI_CCASTLES_H diff --git a/src/mame/atari/centiped.h b/src/mame/atari/centiped.h index 9e3b0e732e6..41ddf2c0eb0 100644 --- a/src/mame/atari/centiped.h +++ b/src/mame/atari/centiped.h @@ -5,8 +5,8 @@ Atari Centipede hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CENTIPED_H -#define MAME_INCLUDES_CENTIPED_H +#ifndef MAME_ATARI_CENTIPED_H +#define MAME_ATARI_CENTIPED_H #pragma once @@ -185,4 +185,4 @@ private: void multiped_map(address_map &map); }; -#endif // MAME_INCLUDES_CENTIPED_H +#endif // MAME_ATARI_CENTIPED_H diff --git a/src/mame/atari/cloak.h b/src/mame/atari/cloak.h index 1880c7f93b1..3574ee15557 100644 --- a/src/mame/atari/cloak.h +++ b/src/mame/atari/cloak.h @@ -5,8 +5,8 @@ Atari Cloak & Dagger hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CLOAK_H -#define MAME_INCLUDES_CLOAK_H +#ifndef MAME_ATARI_CLOAK_H +#define MAME_ATARI_CLOAK_H #pragma once @@ -75,4 +75,4 @@ private: required_device m_palette; }; -#endif // MAME_INCLUDES_CLOAK_H +#endif // MAME_ATARI_CLOAK_H diff --git a/src/mame/atari/cloud9.h b/src/mame/atari/cloud9.h index 96bd2457d68..71823175513 100644 --- a/src/mame/atari/cloud9.h +++ b/src/mame/atari/cloud9.h @@ -5,8 +5,8 @@ Atari Cloud 9 (prototype) hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CLOUD9_H -#define MAME_INCLUDES_CLOUD9_H +#ifndef MAME_ATARI_CLOUD9_H +#define MAME_ATARI_CLOUD9_H #pragma once @@ -85,4 +85,4 @@ private: uint8_t m_irq_state = 0U; }; -#endif // MAME_INCLUDES_CLOUD9_H +#endif // MAME_ATARI_CLOUD9_H diff --git a/src/mame/atari/copsnrob.h b/src/mame/atari/copsnrob.h index ce5c5a5ad39..2a958b2dc23 100644 --- a/src/mame/atari/copsnrob.h +++ b/src/mame/atari/copsnrob.h @@ -5,8 +5,8 @@ Atari Cops'n Robbers hardware *************************************************************************/ -#ifndef MAME_INCLUDES_COPSNROB_H -#define MAME_INCLUDES_COPSNROB_H +#ifndef MAME_ATARI_COPSNROB_H +#define MAME_ATARI_COPSNROB_H #pragma once @@ -70,4 +70,4 @@ private: output_finder<2> m_leds; }; -#endif // MAME_INCLUDES_COPSNROB_H +#endif // MAME_ATARI_COPSNROB_H diff --git a/src/mame/atari/cyberbal.h b/src/mame/atari/cyberbal.h index bb19352351a..b200da13bfa 100644 --- a/src/mame/atari/cyberbal.h +++ b/src/mame/atari/cyberbal.h @@ -5,8 +5,8 @@ Atari Cyberball hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CYBERBAL_H -#define MAME_INCLUDES_CYBERBAL_H +#ifndef MAME_ATARI_CYBERBAL_H +#define MAME_ATARI_CYBERBAL_H #pragma once @@ -145,4 +145,4 @@ private: }; -#endif // MAME_INCLUDES_CYBERBAL_H +#endif // MAME_ATARI_CYBERBAL_H diff --git a/src/mame/atari/dragrace.h b/src/mame/atari/dragrace.h index 5e7ccddc5c4..beabb0ca558 100644 --- a/src/mame/atari/dragrace.h +++ b/src/mame/atari/dragrace.h @@ -5,8 +5,8 @@ Atari Drag Race hardware *************************************************************************/ -#ifndef MAME_INCLUDES_DRAGRACE_H -#define MAME_INCLUDES_DRAGRACE_H +#ifndef MAME_ATARI_DRAGRACE_H +#define MAME_ATARI_DRAGRACE_H #pragma once @@ -101,4 +101,4 @@ private: //----------- defined in audio/dragrace.cpp ----------- DISCRETE_SOUND_EXTERN( dragrace_discrete ); -#endif // MAME_INCLUDES_DRAGRACE_H +#endif // MAME_ATARI_DRAGRACE_H diff --git a/src/mame/atari/eprom.h b/src/mame/atari/eprom.h index 5eaa628b9a9..8f195890918 100644 --- a/src/mame/atari/eprom.h +++ b/src/mame/atari/eprom.h @@ -5,8 +5,8 @@ Atari Escape hardware *************************************************************************/ -#ifndef MAME_INCLUDES_EPROM_H -#define MAME_INCLUDES_EPROM_H +#ifndef MAME_ATARI_EPROM_H +#define MAME_ATARI_EPROM_H #pragma once @@ -80,4 +80,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_EPROM_H +#endif // MAME_ATARI_EPROM_H diff --git a/src/mame/atari/firetrk.h b/src/mame/atari/firetrk.h index f0345e0be64..809a41d28b0 100644 --- a/src/mame/atari/firetrk.h +++ b/src/mame/atari/firetrk.h @@ -5,8 +5,8 @@ Atari Fire Truck + Super Bug + Monte Carlo driver *************************************************************************/ -#ifndef MAME_INCLUDES_FIRETRK_H -#define MAME_INCLUDES_FIRETRK_H +#ifndef MAME_ATARI_FIRETRK_H +#define MAME_ATARI_FIRETRK_H #pragma once @@ -179,4 +179,4 @@ DISCRETE_SOUND_EXTERN( firetrk_discrete ); DISCRETE_SOUND_EXTERN( superbug_discrete ); DISCRETE_SOUND_EXTERN( montecar_discrete ); -#endif // MAME_INCLUDES_FIRETRK_H +#endif // MAME_ATARI_FIRETRK_H diff --git a/src/mame/atari/foodf.h b/src/mame/atari/foodf.h index b1ee957759b..ba3cc680c38 100644 --- a/src/mame/atari/foodf.h +++ b/src/mame/atari/foodf.h @@ -5,8 +5,8 @@ Atari Food Fight hardware *************************************************************************/ -#ifndef MAME_INCLUDES_FOODF_H -#define MAME_INCLUDES_FOODF_H +#ifndef MAME_ATARI_FOODF_H +#define MAME_ATARI_FOODF_H #pragma once @@ -73,4 +73,4 @@ private: output_finder<2> m_leds; }; -#endif // MAME_INCLUDES_FOODF_H +#endif // MAME_ATARI_FOODF_H diff --git a/src/mame/atari/gauntlet.h b/src/mame/atari/gauntlet.h index e0c0129a78a..a77fa3e1118 100644 --- a/src/mame/atari/gauntlet.h +++ b/src/mame/atari/gauntlet.h @@ -5,8 +5,8 @@ Atari Gauntlet hardware *************************************************************************/ -#ifndef MAME_INCLUDES_GAUNTLET_H -#define MAME_INCLUDES_GAUNTLET_H +#ifndef MAME_ATARI_GAUNTLET_H +#define MAME_ATARI_GAUNTLET_H #pragma once @@ -106,4 +106,4 @@ private: void slapstic_tweak(offs_t offset, u16 &, u16); }; -#endif // MAME_INCLUDES_GAUNTLET_H +#endif // MAME_ATARI_GAUNTLET_H diff --git a/src/mame/atari/harddriv.h b/src/mame/atari/harddriv.h index e1e2cb52cff..b940349d956 100644 --- a/src/mame/atari/harddriv.h +++ b/src/mame/atari/harddriv.h @@ -5,8 +5,8 @@ Driver for Atari polygon racer games **************************************************************************/ -#ifndef MAME_INCLUDES_HARDDRIV_H -#define MAME_INCLUDES_HARDDRIV_H +#ifndef MAME_ATARI_HARDDRIV_H +#define MAME_ATARI_HARDDRIV_H #pragma once @@ -747,4 +747,4 @@ protected: virtual void device_start() override; }; -#endif // MAME_INCLUDES_HARDDRIV_H +#endif // MAME_ATARI_HARDDRIV_H diff --git a/src/mame/atari/irobot.h b/src/mame/atari/irobot.h index 5084b446b51..9bcbaf6bcf9 100644 --- a/src/mame/atari/irobot.h +++ b/src/mame/atari/irobot.h @@ -5,8 +5,8 @@ Atari I, Robot hardware *************************************************************************/ -#ifndef MAME_INCLUDES_IROBOT_H -#define MAME_INCLUDES_IROBOT_H +#ifndef MAME_ATARI_IROBOT_H +#define MAME_ATARI_IROBOT_H #pragma once @@ -127,4 +127,4 @@ private: output_finder<2> m_leds; }; -#endif // MAME_INCLUDES_IROBOT_H +#endif // MAME_ATARI_IROBOT_H diff --git a/src/mame/atari/jedi.h b/src/mame/atari/jedi.h index ad6a6cb6573..4055a5893ee 100644 --- a/src/mame/atari/jedi.h +++ b/src/mame/atari/jedi.h @@ -5,8 +5,8 @@ Atari Return of the Jedi hardware *************************************************************************/ -#ifndef MAME_INCLUDES_JEDI_H -#define MAME_INCLUDES_JEDI_H +#ifndef MAME_ATARI_JEDI_H +#define MAME_ATARI_JEDI_H #pragma once @@ -124,4 +124,4 @@ private: required_memory_bank m_mainbank; }; -#endif // MAME_INCLUDES_JEDI_H +#endif // MAME_ATARI_JEDI_H diff --git a/src/mame/atari/klax.h b/src/mame/atari/klax.h index 8117ed99b7e..781e919dbab 100644 --- a/src/mame/atari/klax.h +++ b/src/mame/atari/klax.h @@ -5,8 +5,8 @@ Atari Klax hardware *************************************************************************/ -#ifndef MAME_INCLUDES_KLAX_H -#define MAME_INCLUDES_KLAX_H +#ifndef MAME_ATARI_KLAX_H +#define MAME_ATARI_KLAX_H #pragma once @@ -92,4 +92,4 @@ private: bool m_audio_nibble = false; }; -#endif // MAME_INCLUDES_KLAX_H +#endif // MAME_ATARI_KLAX_H diff --git a/src/mame/atari/liberatr.h b/src/mame/atari/liberatr.h index 08f0046a1c6..93be0ed6689 100644 --- a/src/mame/atari/liberatr.h +++ b/src/mame/atari/liberatr.h @@ -5,8 +5,8 @@ Atari Liberator hardware *************************************************************************/ -#ifndef MAME_INCLUDES_LIBERATR_H -#define MAME_INCLUDES_LIBERATR_H +#ifndef MAME_ATARI_LIBERATR_H +#define MAME_ATARI_LIBERATR_H #pragma once @@ -126,4 +126,4 @@ private: planet m_planets[2]{}; }; -#endif // MAME_INCLUDES_LIBERATR_H +#endif // MAME_ATARI_LIBERATR_H diff --git a/src/mame/atari/lynx.h b/src/mame/atari/lynx.h index 92e0bb361fc..3d3005062e9 100644 --- a/src/mame/atari/lynx.h +++ b/src/mame/atari/lynx.h @@ -5,8 +5,8 @@ Atari Lynx ******************************************************************************/ -#ifndef MAME_INCLUDES_LYNX_H -#define MAME_INCLUDES_LYNX_H +#ifndef MAME_ATARI_LYNX_H +#define MAME_ATARI_LYNX_H #pragma once @@ -410,4 +410,4 @@ private: #define SCB_STRETCH 0x0F // L H H/V Size Adder #define SCB_TILT 0x11 // L,H H Position Adder -#endif // MAME_INCLUDES_LYNX_H +#endif // MAME_ATARI_LYNX_H diff --git a/src/mame/atari/metalmx.h b/src/mame/atari/metalmx.h index 58eae295fc2..5855d0b5878 100644 --- a/src/mame/atari/metalmx.h +++ b/src/mame/atari/metalmx.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett -#ifndef MAME_INCLUDES_METALMX_H -#define MAME_INCLUDES_METALMX_H +#ifndef MAME_ATARI_METALMX_H +#define MAME_ATARI_METALMX_H #pragma once @@ -69,4 +69,4 @@ private: required_shared_ptr m_gsp_vram; }; -#endif // MAME_INCLUDES_METALMX_H +#endif // MAME_ATARI_METALMX_H diff --git a/src/mame/atari/nitedrvr.h b/src/mame/atari/nitedrvr.h index de9c6305c02..6db9505feca 100644 --- a/src/mame/atari/nitedrvr.h +++ b/src/mame/atari/nitedrvr.h @@ -5,8 +5,8 @@ Atari Night Driver hardware *************************************************************************/ -#ifndef MAME_INCLUDES_NITEDRVR_H -#define MAME_INCLUDES_NITEDRVR_H +#ifndef MAME_ATARI_NITEDRVR_H +#define MAME_ATARI_NITEDRVR_H #pragma once @@ -96,4 +96,4 @@ private: //----------- defined in audio/nitedrvr.cpp ----------- DISCRETE_SOUND_EXTERN( nitedrvr_discrete ); -#endif // MAME_INCLUDES_NITEDRVR_H +#endif // MAME_ATARI_NITEDRVR_H diff --git a/src/mame/atari/offtwall.h b/src/mame/atari/offtwall.h index 6027e0ba236..8c906d0a578 100644 --- a/src/mame/atari/offtwall.h +++ b/src/mame/atari/offtwall.h @@ -5,8 +5,8 @@ Atari "Round" hardware *************************************************************************/ -#ifndef MAME_INCLUDES_OFFTWALL_H -#define MAME_INCLUDES_OFFTWALL_H +#ifndef MAME_ATARI_OFFTWALL_H +#define MAME_ATARI_OFFTWALL_H #pragma once @@ -58,4 +58,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_OFFTWALL_H +#endif // MAME_ATARI_OFFTWALL_H diff --git a/src/mame/atari/orbit.h b/src/mame/atari/orbit.h index 3d18efa3337..c00237d0ef8 100644 --- a/src/mame/atari/orbit.h +++ b/src/mame/atari/orbit.h @@ -5,8 +5,8 @@ Atari Orbit hardware *************************************************************************/ -#ifndef MAME_INCLUDES_ORBIT_H -#define MAME_INCLUDES_ORBIT_H +#ifndef MAME_ATARI_ORBIT_H +#define MAME_ATARI_ORBIT_H #pragma once @@ -90,4 +90,4 @@ private: DISCRETE_SOUND_EXTERN( orbit_discrete ); -#endif // MAME_INCLUDES_ORBIT_H +#endif // MAME_ATARI_ORBIT_H diff --git a/src/mame/atari/poolshrk.h b/src/mame/atari/poolshrk.h index 3105ce2357b..d3ae182e7ec 100644 --- a/src/mame/atari/poolshrk.h +++ b/src/mame/atari/poolshrk.h @@ -5,8 +5,8 @@ Atari Pool Shark hardware *************************************************************************/ -#ifndef MAME_INCLUDES_POOLSHRK_H -#define MAME_INCLUDES_POOLSHRK_H +#ifndef MAME_ATARI_POOLSHRK_H +#define MAME_ATARI_POOLSHRK_H #pragma once @@ -76,4 +76,4 @@ private: /*----------- defined in audio/poolshrk.c -----------*/ DISCRETE_SOUND_EXTERN( poolshrk_discrete ); -#endif // MAME_INCLUDES_POOLSHRK_H +#endif // MAME_ATARI_POOLSHRK_H diff --git a/src/mame/atari/rampart.h b/src/mame/atari/rampart.h index ff9760b76ec..7eb4487109c 100644 --- a/src/mame/atari/rampart.h +++ b/src/mame/atari/rampart.h @@ -5,8 +5,8 @@ Atari Rampart hardware *************************************************************************/ -#ifndef MAME_INCLUDES_RAMPART_H -#define MAME_INCLUDES_RAMPART_H +#ifndef MAME_ATARI_RAMPART_H +#define MAME_ATARI_RAMPART_H #pragma once @@ -63,4 +63,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_RAMPART_H +#endif // MAME_ATARI_RAMPART_H diff --git a/src/mame/atari/relief.h b/src/mame/atari/relief.h index 823f6a974e6..22aa9e1a02c 100644 --- a/src/mame/atari/relief.h +++ b/src/mame/atari/relief.h @@ -5,8 +5,8 @@ Atari "Round" hardware *************************************************************************/ -#ifndef MAME_INCLUDES_RELIEF_H -#define MAME_INCLUDES_RELIEF_H +#ifndef MAME_ATARI_RELIEF_H +#define MAME_ATARI_RELIEF_H #pragma once @@ -63,4 +63,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_RELIEF_H +#endif // MAME_ATARI_RELIEF_H diff --git a/src/mame/atari/shuuz.h b/src/mame/atari/shuuz.h index da385533471..49c21c57c2a 100644 --- a/src/mame/atari/shuuz.h +++ b/src/mame/atari/shuuz.h @@ -5,8 +5,8 @@ Atari Shuuz hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SHUUZ_H -#define MAME_INCLUDES_SHUUZ_H +#ifndef MAME_ATARI_SHUUZ_H +#define MAME_ATARI_SHUUZ_H #pragma once @@ -53,4 +53,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_SHUUZ_H +#endif // MAME_ATARI_SHUUZ_H diff --git a/src/mame/atari/skullxbo.h b/src/mame/atari/skullxbo.h index f09b51c047a..a7e265c37c6 100644 --- a/src/mame/atari/skullxbo.h +++ b/src/mame/atari/skullxbo.h @@ -5,8 +5,8 @@ Atari Skull & Crossbones hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SKULLXBO_H -#define MAME_INCLUDES_SKULLXBO_H +#ifndef MAME_ATARI_SKULLXBO_H +#define MAME_ATARI_SKULLXBO_H #pragma once @@ -71,4 +71,4 @@ private: bool m_scanline_int_state; }; -#endif // MAME_INCLUDES_SKULLXBO_H +#endif // MAME_ATARI_SKULLXBO_H diff --git a/src/mame/atari/skydiver.h b/src/mame/atari/skydiver.h index 91a79b27897..3dd1956c065 100644 --- a/src/mame/atari/skydiver.h +++ b/src/mame/atari/skydiver.h @@ -5,8 +5,8 @@ Atari Skydiver hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SKYDIVER_H -#define MAME_INCLUDES_SKYDIVER_H +#ifndef MAME_ATARI_SKYDIVER_H +#define MAME_ATARI_SKYDIVER_H #pragma once @@ -111,4 +111,4 @@ private: /*----------- defined in audio/skydiver.c -----------*/ DISCRETE_SOUND_EXTERN( skydiver_discrete ); -#endif // MAME_INCLUDES_SKYDIVER_H +#endif // MAME_ATARI_SKYDIVER_H diff --git a/src/mame/atari/skyraid.h b/src/mame/atari/skyraid.h index 111a2b5c0a6..02b82b51883 100644 --- a/src/mame/atari/skyraid.h +++ b/src/mame/atari/skyraid.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch -#ifndef MAME_INCLUDES_SKYRAID_H -#define MAME_INCLUDES_SKYRAID_H +#ifndef MAME_ATARI_SKYRAID_H +#define MAME_ATARI_SKYRAID_H #pragma once @@ -64,4 +64,4 @@ private: /*----------- defined in audio/skyraid.c -----------*/ DISCRETE_SOUND_EXTERN( skyraid_discrete ); -#endif // MAME_INCLUDES_SKYRAID_H +#endif // MAME_ATARI_SKYRAID_H diff --git a/src/mame/atari/slapstic.h b/src/mame/atari/slapstic.h index a74bd1a8992..0bd82e2094d 100644 --- a/src/mame/atari/slapstic.h +++ b/src/mame/atari/slapstic.h @@ -11,8 +11,8 @@ *************************************************************************/ -#ifndef MAME_INCLUDES_SLAPSTIC_H -#define MAME_INCLUDES_SLAPSTIC_H +#ifndef MAME_ATARI_SLAPSTIC_H +#define MAME_ATARI_SLAPSTIC_H #pragma once @@ -290,4 +290,4 @@ private: void commit_bank(); }; -#endif // MAME_INCLUDES_SLAPSTIC_H +#endif // MAME_ATARI_SLAPSTIC_H diff --git a/src/mame/atari/sprint2.h b/src/mame/atari/sprint2.h index d98875462a5..2fd49d2e16d 100644 --- a/src/mame/atari/sprint2.h +++ b/src/mame/atari/sprint2.h @@ -5,8 +5,8 @@ Atari Sprint hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SPRINT2_H -#define MAME_INCLUDES_SPRINT2_H +#ifndef MAME_ATARI_SPRINT2_H +#define MAME_ATARI_SPRINT2_H #pragma once @@ -118,4 +118,4 @@ DISCRETE_SOUND_EXTERN( sprint2_discrete ); DISCRETE_SOUND_EXTERN( sprint1_discrete ); DISCRETE_SOUND_EXTERN( dominos_discrete ); -#endif // MAME_INCLUDES_SPRINT2_H +#endif // MAME_ATARI_SPRINT2_H diff --git a/src/mame/atari/sprint8.h b/src/mame/atari/sprint8.h index 6b3aeed9b01..37f142e614e 100644 --- a/src/mame/atari/sprint8.h +++ b/src/mame/atari/sprint8.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch -#ifndef MAME_INCLUDES_SPRINT8_H -#define MAME_INCLUDES_SPRINT8_H +#ifndef MAME_ATARI_SPRINT8_H +#define MAME_ATARI_SPRINT8_H #pragma once @@ -88,4 +88,4 @@ private: /*----------- defined in audio/sprint8.c -----------*/ DISCRETE_SOUND_EXTERN( sprint8_discrete ); -#endif // MAME_INCLUDES_SPRINT8_H +#endif // MAME_ATARI_SPRINT8_H diff --git a/src/mame/atari/starshp1.h b/src/mame/atari/starshp1.h index d2731318720..d2553fc9a57 100644 --- a/src/mame/atari/starshp1.h +++ b/src/mame/atari/starshp1.h @@ -25,8 +25,8 @@ * Horizontal Visible Area 384 (0x180) 768 (0x300) * Horizontal Blanking Time 128 (0x080) 256 (0x100) */ -#ifndef MAME_INCLUDES_STARSHP1_H -#define MAME_INCLUDES_STARSHP1_H +#ifndef MAME_ATARI_STARSHP1_H +#define MAME_ATARI_STARSHP1_H #pragma once @@ -160,4 +160,4 @@ DISCRETE_SOUND_EXTERN( starshp1_discrete ); #define STARSHP1_PHASOR_ON NODE_09 #define STARSHP1_ATTRACT NODE_10 -#endif // MAME_INCLUDES_STARSHP1_H +#endif // MAME_ATARI_STARSHP1_H diff --git a/src/mame/atari/starwars.h b/src/mame/atari/starwars.h index dd575314948..0d2838be79b 100644 --- a/src/mame/atari/starwars.h +++ b/src/mame/atari/starwars.h @@ -5,8 +5,8 @@ Atari Star Wars hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_STARWARS_H -#define MAME_INCLUDES_STARWARS_H +#ifndef MAME_ATARI_STARWARS_H +#define MAME_ATARI_STARWARS_H #pragma once @@ -100,4 +100,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_STARWARS_H +#endif // MAME_ATARI_STARWARS_H diff --git a/src/mame/atari/subs.h b/src/mame/atari/subs.h index a54f4ab3188..caeedd052eb 100644 --- a/src/mame/atari/subs.h +++ b/src/mame/atari/subs.h @@ -5,8 +5,8 @@ Atari Subs hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SUBS_H -#define MAME_INCLUDES_SUBS_H +#ifndef MAME_ATARI_SUBS_H +#define MAME_ATARI_SUBS_H #pragma once @@ -81,4 +81,4 @@ private: DISCRETE_SOUND_EXTERN( subs_discrete ); -#endif // MAME_INCLUDES_SUBS_H +#endif // MAME_ATARI_SUBS_H diff --git a/src/mame/atari/tank8.h b/src/mame/atari/tank8.h index 48d32a612b6..75a72e18cc1 100644 --- a/src/mame/atari/tank8.h +++ b/src/mame/atari/tank8.h @@ -5,8 +5,8 @@ Atari tank8 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_TANK8_H -#define MAME_INCLUDES_TANK8_H +#ifndef MAME_ATARI_TANK8_H +#define MAME_ATARI_TANK8_H #pragma once @@ -106,4 +106,4 @@ private: DISCRETE_SOUND_EXTERN( tank8_discrete ); -#endif // MAME_INCLUDES_TANK8_H +#endif // MAME_ATARI_TANK8_H diff --git a/src/mame/atari/thunderj.h b/src/mame/atari/thunderj.h index 1a54dc7150c..cb0d4e19e1a 100644 --- a/src/mame/atari/thunderj.h +++ b/src/mame/atari/thunderj.h @@ -5,8 +5,8 @@ Atari ThunderJaws hardware *************************************************************************/ -#ifndef MAME_INCLUDES_THUNDERJ_H -#define MAME_INCLUDES_THUNDERJ_H +#ifndef MAME_ATARI_THUNDERJ_H +#define MAME_ATARI_THUNDERJ_H #pragma once @@ -56,4 +56,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_THUNDERJ_H +#endif // MAME_ATARI_THUNDERJ_H diff --git a/src/mame/atari/toobin.h b/src/mame/atari/toobin.h index 4728ec3b454..ab6ed731a7c 100644 --- a/src/mame/atari/toobin.h +++ b/src/mame/atari/toobin.h @@ -5,8 +5,8 @@ Atari Toobin' hardware *************************************************************************/ -#ifndef MAME_INCLUDES_TOOBIN_H -#define MAME_INCLUDES_TOOBIN_H +#ifndef MAME_ATARI_TOOBIN_H +#define MAME_ATARI_TOOBIN_H #pragma once @@ -80,4 +80,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_TOOBIN_H +#endif // MAME_ATARI_TOOBIN_H diff --git a/src/mame/atari/triplhnt.h b/src/mame/atari/triplhnt.h index 9f09e05595f..c4603ec546d 100644 --- a/src/mame/atari/triplhnt.h +++ b/src/mame/atari/triplhnt.h @@ -5,8 +5,8 @@ Atari Triple Hunt hardware *************************************************************************/ -#ifndef MAME_INCLUDES_TRIPLHNT_H -#define MAME_INCLUDES_TRIPLHNT_H +#ifndef MAME_ATARI_TRIPLHNT_H +#define MAME_ATARI_TRIPLHNT_H #pragma once @@ -105,4 +105,4 @@ private: DISCRETE_SOUND_EXTERN( triplhnt_discrete ); extern const char *const triplhnt_sample_names[]; -#endif // MAME_INCLUDES_TRIPLHNT_H +#endif // MAME_ATARI_TRIPLHNT_H diff --git a/src/mame/atari/tunhunt.h b/src/mame/atari/tunhunt.h index 6c78707ce8a..e38eefdb98d 100644 --- a/src/mame/atari/tunhunt.h +++ b/src/mame/atari/tunhunt.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, David Haywood -#ifndef MAME_INCLUDES_TUNHUNT_H -#define MAME_INCLUDES_TUNHUNT_H +#ifndef MAME_ATARI_TUNHUNT_H +#define MAME_ATARI_TUNHUNT_H #pragma once @@ -91,4 +91,4 @@ private: uint8_t m_mobjv = 0; }; -#endif // MAME_INCLUDES_TUNHUNT_H +#endif // MAME_ATARI_TUNHUNT_H diff --git a/src/mame/atari/ultratnk.h b/src/mame/atari/ultratnk.h index 345f074135d..26e7128ffa6 100644 --- a/src/mame/atari/ultratnk.h +++ b/src/mame/atari/ultratnk.h @@ -5,8 +5,8 @@ Atari Ultra Tank hardware *************************************************************************/ -#ifndef MAME_INCLUDES_ULTRATNK_H -#define MAME_INCLUDES_ULTRATNK_H +#ifndef MAME_ATARI_ULTRATNK_H +#define MAME_ATARI_ULTRATNK_H #pragma once @@ -81,4 +81,4 @@ private: emu_timer *m_nmi_timer = nullptr; }; -#endif // MAME_INCLUDES_ULTRATNK_H +#endif // MAME_ATARI_ULTRATNK_H diff --git a/src/mame/atari/videopin.h b/src/mame/atari/videopin.h index 246933a4ed1..b118ab5476f 100644 --- a/src/mame/atari/videopin.h +++ b/src/mame/atari/videopin.h @@ -5,8 +5,8 @@ Atari Video Pinball hardware *************************************************************************/ -#ifndef MAME_INCLUDES_VIDEOPIN_H -#define MAME_INCLUDES_VIDEOPIN_H +#ifndef MAME_ATARI_VIDEOPIN_H +#define MAME_ATARI_VIDEOPIN_H #pragma once @@ -87,4 +87,4 @@ private: /*----------- defined in audio/videopin.c -----------*/ DISCRETE_SOUND_EXTERN( videopin_discrete ); -#endif // MAME_INCLUDES_VIDEOPIN_H +#endif // MAME_ATARI_VIDEOPIN_H diff --git a/src/mame/atari/vindictr.h b/src/mame/atari/vindictr.h index 5970698bb53..bfc431dc540 100644 --- a/src/mame/atari/vindictr.h +++ b/src/mame/atari/vindictr.h @@ -5,8 +5,8 @@ Atari Vindicators hardware *************************************************************************/ -#ifndef MAME_INCLUDES_VINDICTR_H -#define MAME_INCLUDES_VINDICTR_H +#ifndef MAME_ATARI_VINDICTR_H +#define MAME_ATARI_VINDICTR_H #pragma once @@ -67,4 +67,4 @@ private: uint16_t m_playfield_yscroll = 0; }; -#endif // MAME_INCLUDES_VINDICTR_H +#endif // MAME_ATARI_VINDICTR_H diff --git a/src/mame/atari/wolfpack.h b/src/mame/atari/wolfpack.h index 2df3fd34824..ccbddf577f3 100644 --- a/src/mame/atari/wolfpack.h +++ b/src/mame/atari/wolfpack.h @@ -5,8 +5,8 @@ Atari Wolf Pack (prototype) driver ***************************************************************************/ -#ifndef MAME_INCLUDES_WOLFPACK_H -#define MAME_INCLUDES_WOLFPACK_H +#ifndef MAME_ATARI_WOLFPACK_H +#define MAME_ATARI_WOLFPACK_H #pragma once @@ -106,4 +106,4 @@ private: emu_timer *m_periodic_timer = nullptr; }; -#endif // MAME_INCLUDES_WOLFPACK_H +#endif // MAME_ATARI_WOLFPACK_H diff --git a/src/mame/atari/xybots.h b/src/mame/atari/xybots.h index 81318cc594d..f956b80653f 100644 --- a/src/mame/atari/xybots.h +++ b/src/mame/atari/xybots.h @@ -5,8 +5,8 @@ Atari Xybots hardware *************************************************************************/ -#ifndef MAME_INCLUDES_XYBOTS_H -#define MAME_INCLUDES_XYBOTS_H +#ifndef MAME_ATARI_XYBOTS_H +#define MAME_ATARI_XYBOTS_H #pragma once @@ -60,4 +60,4 @@ private: static const atari_motion_objects_config s_mob_config; }; -#endif // MAME_INCLUDES_XYBOTS_H +#endif // MAME_ATARI_XYBOTS_H diff --git a/src/mame/ausnz/aussiebyte.h b/src/mame/ausnz/aussiebyte.h index 046307795b2..88d0294e934 100644 --- a/src/mame/ausnz/aussiebyte.h +++ b/src/mame/ausnz/aussiebyte.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Robbbert -#ifndef MAME_INCLUDES_AUSSIEBYTE_H -#define MAME_INCLUDES_AUSSIEBYTE_H +#ifndef MAME_AUSNZ_AUSSIEBYTE_H +#define MAME_AUSNZ_AUSSIEBYTE_H #pragma once @@ -154,4 +154,4 @@ private: required_device m_rtc; }; -#endif // MAME_INCLUDES_AUSSIEBYTE_H +#endif // MAME_AUSNZ_AUSSIEBYTE_H diff --git a/src/mame/ausnz/mbee.h b/src/mame/ausnz/mbee.h index 8cb40b3d5e0..82687732546 100644 --- a/src/mame/ausnz/mbee.h +++ b/src/mame/ausnz/mbee.h @@ -5,8 +5,8 @@ * includes/mbee.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_MBEE_H -#define MAME_INCLUDES_MBEE_H +#ifndef MAME_AUSNZ_MBEE_H +#define MAME_AUSNZ_MBEE_H #pragma once @@ -209,4 +209,4 @@ private: optional_device_array m_pak; }; -#endif // MAME_INCLUDES_MBEE_H +#endif // MAME_AUSNZ_MBEE_H diff --git a/src/mame/ausnz/poly.h b/src/mame/ausnz/poly.h index a39c91ef979..7e386778d9c 100644 --- a/src/mame/ausnz/poly.h +++ b/src/mame/ausnz/poly.h @@ -30,8 +30,8 @@ ****************************************************************************/ -#ifndef MAME_INCLUDES_POLY_H -#define MAME_INCLUDES_POLY_H +#ifndef MAME_AUSNZ_POLY_H +#define MAME_AUSNZ_POLY_H #pragma once @@ -184,4 +184,4 @@ private: floppy_image_device *m_current_floppy; }; -#endif // MAME_INCLUDES_POLY_H +#endif // MAME_AUSNZ_POLY_H diff --git a/src/mame/ausnz/super80.h b/src/mame/ausnz/super80.h index a8a74191a55..78c414b8683 100644 --- a/src/mame/ausnz/super80.h +++ b/src/mame/ausnz/super80.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Robbbert -#ifndef MAME_INCLUDES_SUPER80_H -#define MAME_INCLUDES_SUPER80_H +#ifndef MAME_AUSNZ_SUPER80_H +#define MAME_AUSNZ_SUPER80_H #pragma once @@ -185,4 +185,4 @@ private: }; -#endif // MAME_INCLUDES_SUPER80_H +#endif // MAME_AUSNZ_SUPER80_H diff --git a/src/mame/bandai/wswan_v.h b/src/mame/bandai/wswan_v.h index 8b8ed439739..237848e3b40 100644 --- a/src/mame/bandai/wswan_v.h +++ b/src/mame/bandai/wswan_v.h @@ -11,8 +11,8 @@ **********************************************************************/ -#ifndef MAME_BANDAI_WSWAN_H -#define MAME_BANDAI_WSWAN_H +#ifndef MAME_BANDAI_WSWAN_V_H +#define MAME_BANDAI_WSWAN_V_H #pragma once @@ -134,4 +134,4 @@ protected: DECLARE_DEVICE_TYPE(WSWAN_VIDEO, wswan_video_device) -#endif // MAME_BANDAI_WSWAN_H +#endif // MAME_BANDAI_WSWAN_V_H diff --git a/src/mame/be/bebox.h b/src/mame/be/bebox.h index ccb3282e1e3..80af70ec3c8 100644 --- a/src/mame/be/bebox.h +++ b/src/mame/be/bebox.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_BEBOX_H -#define MAME_INCLUDES_BEBOX_H +#ifndef MAME_BE_BEBOX_H +#define MAME_BE_BEBOX_H #include "cpu/powerpc/ppc.h" @@ -136,4 +136,4 @@ private: }; -#endif // MAME_INCLUDES_BEBOX_H +#endif // MAME_BE_BEBOX_H diff --git a/src/mame/bfm/bfm_ad5.h b/src/mame/bfm/bfm_ad5.h index e3eabacf46d..44d66ff147c 100644 --- a/src/mame/bfm/bfm_ad5.h +++ b/src/mame/bfm/bfm_ad5.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_BFM_AD5_H -#define MAME_INCLUDES_BFM_AD5_H +#ifndef MAME_BFM_BFM_AD5_H +#define MAME_BFM_BFM_AD5_H #pragma once @@ -30,4 +30,4 @@ private: INPUT_PORTS_EXTERN( bfm_ad5 ); -#endif // MAME_INCLUDES_BFM_AD5_H +#endif // MAME_BFM_BFM_AD5_H diff --git a/src/mame/bfm/bfm_adr2.h b/src/mame/bfm/bfm_adr2.h index 21cfaa67d96..064ac9b8944 100644 --- a/src/mame/bfm/bfm_adr2.h +++ b/src/mame/bfm/bfm_adr2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_BFM_ADR2_H -#define MAME_INCLUDES_BFM_ADR2_H +#ifndef MAME_BFM_BFM_ADR2_H +#define MAME_BFM_BFM_ADR2_H #pragma once @@ -71,4 +71,4 @@ private: DECLARE_DEVICE_TYPE(BFM_ADDER2, bfm_adder2_device) -#endif // MAME_INCLUDES_BFM_ADR2_H +#endif // MAME_BFM_BFM_ADR2_H diff --git a/src/mame/bfm/bfm_sc4.h b/src/mame/bfm/bfm_sc4.h index e42b6ca71e5..df79f02dda2 100644 --- a/src/mame/bfm/bfm_sc4.h +++ b/src/mame/bfm/bfm_sc4.h @@ -2,8 +2,8 @@ // copyright-holders:David Haywood /* Scorpion 4 + 5 driver related includes */ /* mainly used for stuff which is currently shared between sc4 / 5 sets to avoid duplication */ -#ifndef MAME_INCLUDES_BFP_SC4_H -#define MAME_INCLUDES_BFP_SC4_H +#ifndef MAME_BFM_BFP_SC4_H +#define MAME_BFM_BFP_SC4_H #pragma once @@ -3375,4 +3375,4 @@ INPUT_PORTS_EXTERN( sc4_raw ); /* not for either of these games? */ \ ROM_LOAD( "casroysnd.bin", 0x00000, 0x80000, CRC(cf1d4b59) SHA1(1b2bc74c6fcc43197a6f295bc34554da01f7b517) ) -#endif // MAME_INCLUDES_BFP_SC4_H +#endif // MAME_BFM_BFP_SC4_H diff --git a/src/mame/bfm/bfm_sc5.h b/src/mame/bfm/bfm_sc5.h index 1d7dfbdf460..59e9ede898c 100644 --- a/src/mame/bfm/bfm_sc5.h +++ b/src/mame/bfm/bfm_sc5.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_BFM_SC5_H -#define MAME_INCLUDES_BFM_SC5_H +#ifndef MAME_BFM_BFM_SC5_H +#define MAME_BFM_BFM_SC5_H #pragma once @@ -41,4 +41,4 @@ protected: INPUT_PORTS_EXTERN( bfm_sc5 ); -#endif // MAME_INCLUDES_BFM_SC5_H +#endif // MAME_BFM_BFM_SC5_H diff --git a/src/mame/bitcorp/gamate_v.h b/src/mame/bitcorp/gamate_v.h index 534dcc3acea..e7d858fa56c 100644 --- a/src/mame/bitcorp/gamate_v.h +++ b/src/mame/bitcorp/gamate_v.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Peter Wilhelmsen, Kevtris -#ifndef MAME_BITCORP_GAMATE_H -#define MAME_BITCORP_GAMATE_H +#ifndef MAME_BITCORP_GAMATE_V_H +#define MAME_BITCORP_GAMATE_V_H #pragma once @@ -60,4 +60,4 @@ private: int m_displayblank; }; -#endif // MAME_BITCORP_GAMATE_H +#endif // MAME_BITCORP_GAMATE_V_H diff --git a/src/mame/bondwell/bw12.h b/src/mame/bondwell/bw12.h index 895ee67a3f9..028560e2169 100644 --- a/src/mame/bondwell/bw12.h +++ b/src/mame/bondwell/bw12.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_BW12_H -#define MAME_INCLUDES_BW12_H +#ifndef MAME_BONDWELL_BW12_H +#define MAME_BONDWELL_BW12_H #include "cpu/z80/z80.h" #include "machine/ram.h" @@ -143,4 +143,4 @@ protected: int m_centronics_perror = 0; }; -#endif +#endif // MAME_BONDWELL_BW12_H diff --git a/src/mame/bondwell/bw2.h b/src/mame/bondwell/bw2.h index bc908758d35..31656857366 100644 --- a/src/mame/bondwell/bw2.h +++ b/src/mame/bondwell/bw2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_BW2_H -#define MAME_INCLUDES_BW2_H +#ifndef MAME_BONDWELL_BW2_H +#define MAME_BONDWELL_BW2_H #pragma once @@ -98,4 +98,4 @@ public: void lcdc_map(address_map &map); }; -#endif // MAME_INCLUDES_BW2_H +#endif // MAME_BONDWELL_BW2_H diff --git a/src/mame/booth/apexc.h b/src/mame/booth/apexc.h index 2cd9e9a1e13..170987e12cb 100644 --- a/src/mame/booth/apexc.h +++ b/src/mame/booth/apexc.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Raphael Nabet, Robbbert -#ifndef MAME_INCLUDES_APEXC -#define MAME_INCLUDES_APEXC +#ifndef MAME_BOOTH_APEXC_H +#define MAME_BOOTH_APEXC_H #pragma once @@ -81,4 +81,4 @@ private: static const rgb_t palette_table[4]; }; -#endif // MAME_INCLUDES_APEXC +#endif // MAME_BOOTH_APEXC_H diff --git a/src/mame/booth/apexc_m.h b/src/mame/booth/apexc_m.h index b39b94b2d8c..75a26db18f9 100644 --- a/src/mame/booth/apexc_m.h +++ b/src/mame/booth/apexc_m.h @@ -8,8 +8,8 @@ see cpu/apexc.cpp for background and tech info */ -#ifndef MAME_BOOTH_APEXC -#define MAME_BOOTH_APEXC +#ifndef MAME_BOOTH_APEXC_M_H +#define MAME_BOOTH_APEXC_M_H #pragma once @@ -138,4 +138,4 @@ DECLARE_DEVICE_TYPE(APEXC_CYLINDER, apexc_cylinder_image_device) DECLARE_DEVICE_TYPE(APEXC_TAPE_PUNCHER, apexc_tape_puncher_image_device) DECLARE_DEVICE_TYPE(APEXC_TAPE_READER, apexc_tape_reader_image_device) -#endif // MAME_BOOTH_APEXC +#endif // MAME_BOOTH_APEXC_M_H diff --git a/src/mame/canon/x07.h b/src/mame/canon/x07.h index ecc3b43cd47..c0b999b7a55 100644 --- a/src/mame/canon/x07.h +++ b/src/mame/canon/x07.h @@ -5,8 +5,8 @@ includes/x07.h *********************************************************************/ -#ifndef MAME_INCLUDES_X07_H -#define MAME_INCLUDES_X07_H +#ifndef MAME_CANON_X07_H +#define MAME_CANON_X07_H #pragma once @@ -294,4 +294,4 @@ private: void x07_mem(address_map &map); }; -#endif // MAME_INCLUDES_X07_H +#endif // MAME_CANON_X07_H diff --git a/src/mame/capcom/1942.h b/src/mame/capcom/1942.h index 86f756c6db9..70cd157542c 100644 --- a/src/mame/capcom/1942.h +++ b/src/mame/capcom/1942.h @@ -5,8 +5,8 @@ 1942 ***************************************************************************/ -#ifndef MAME_INCLUDES_1942_H -#define MAME_INCLUDES_1942_H +#ifndef MAME_CAPCOM_1942_H +#define MAME_CAPCOM_1942_H #pragma once @@ -107,4 +107,4 @@ protected: required_shared_ptr m_protopal; }; -#endif // MAME_INCLUDES_1942_H +#endif // MAME_CAPCOM_1942_H diff --git a/src/mame/capcom/1943.h b/src/mame/capcom/1943.h index 2478381df2c..0dd19536070 100644 --- a/src/mame/capcom/1943.h +++ b/src/mame/capcom/1943.h @@ -5,8 +5,8 @@ 1943 ***************************************************************************/ -#ifndef MAME_INCLUDES_1943_H -#define MAME_INCLUDES_1943_H +#ifndef MAME_CAPCOM_1943_H +#define MAME_CAPCOM_1943_H #pragma once @@ -102,4 +102,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_1943_H +#endif // MAME_CAPCOM_1943_H diff --git a/src/mame/capcom/cps1.h b/src/mame/capcom/cps1.h index 1ef7ea62d0e..9a033e2899a 100644 --- a/src/mame/capcom/cps1.h +++ b/src/mame/capcom/cps1.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_CPS1_H -#define MAME_INCLUDES_CPS1_H +#ifndef MAME_CAPCOM_CPS1_H +#define MAME_CAPCOM_CPS1_H #pragma once @@ -333,4 +333,4 @@ INPUT_PORTS_EXTERN( varth ); INPUT_PORTS_EXTERN( captcomm ); INPUT_PORTS_EXTERN( wof ); -#endif // MAME_INCLUDES_CPS1_H +#endif // MAME_CAPCOM_CPS1_H diff --git a/src/mame/capcom/cps3.h b/src/mame/capcom/cps3.h index 6ed933aeeaf..d32413be652 100644 --- a/src/mame/capcom/cps3.h +++ b/src/mame/capcom/cps3.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Andreas Naive, Tomasz Slanina, ElSemi -#ifndef MAME_INCLUDES_CPS3_H -#define MAME_INCLUDES_CPS3_H +#ifndef MAME_CAPCOM_CPS3_H +#define MAME_CAPCOM_CPS3_H #pragma once @@ -193,4 +193,4 @@ private: void decrypted_opcodes_map(address_map &map); }; -#endif // MAME_INCLUDES_CPS3_H +#endif // MAME_CAPCOM_CPS3_H diff --git a/src/mame/capcom/cps3_a.h b/src/mame/capcom/cps3_a.h index be6f451374d..6c5a49c1e72 100644 --- a/src/mame/capcom/cps3_a.h +++ b/src/mame/capcom/cps3_a.h @@ -5,8 +5,8 @@ Capcom CPS-3 Sound Hardware ****************************************************************************/ -#ifndef MAME_CAPCOM_CPS3_H -#define MAME_CAPCOM_CPS3_H +#ifndef MAME_CAPCOM_CPS3_A_H +#define MAME_CAPCOM_CPS3_A_H #pragma once @@ -57,4 +57,4 @@ private: DECLARE_DEVICE_TYPE(CPS3, cps3_sound_device) -#endif // MAME_CAPCOM_CPS3_H +#endif // MAME_CAPCOM_CPS3_A_H diff --git a/src/mame/capcom/fcrash.h b/src/mame/capcom/fcrash.h index 39a13a887b5..516d5a8a97c 100644 --- a/src/mame/capcom/fcrash.h +++ b/src/mame/capcom/fcrash.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_FCRASH_H -#define MAME_INCLUDES_FCRASH_H +#ifndef MAME_CAPCOM_FCRASH_H +#define MAME_CAPCOM_FCRASH_H #pragma once @@ -128,4 +128,4 @@ private: void fcrash_build_palette() override; }; -#endif // MAME_INCLUDES_FCRASH_H +#endif // MAME_CAPCOM_FCRASH_H diff --git a/src/mame/capcom/lastduel.h b/src/mame/capcom/lastduel.h index 52f986f44fd..2cd47e654f9 100644 --- a/src/mame/capcom/lastduel.h +++ b/src/mame/capcom/lastduel.h @@ -5,8 +5,8 @@ Last Duel *************************************************************************/ -#ifndef MAME_INCLUDES_LASTDUEL_H -#define MAME_INCLUDES_LASTDUEL_H +#ifndef MAME_CAPCOM_LASTDUEL_H +#define MAME_CAPCOM_LASTDUEL_H #pragma once @@ -86,4 +86,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_LASTDUEL_H +#endif // MAME_CAPCOM_LASTDUEL_H diff --git a/src/mame/capcom/sidearms.h b/src/mame/capcom/sidearms.h index 72a2b4fc921..70f794c4c78 100644 --- a/src/mame/capcom/sidearms.h +++ b/src/mame/capcom/sidearms.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Paul Leaman, Curt Coder -#ifndef MAME_INCLUDES_SIDEARMS_H -#define MAME_INCLUDES_SIDEARMS_H +#ifndef MAME_CAPCOM_SIDEARMS_H +#define MAME_CAPCOM_SIDEARMS_H #pragma once @@ -100,4 +100,4 @@ private: void whizz_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_SIDEARMS_H +#endif // MAME_CAPCOM_SIDEARMS_H diff --git a/src/mame/chromatics/cgc7900.h b/src/mame/chromatics/cgc7900.h index 10a2c6dd102..1a40eff933b 100644 --- a/src/mame/chromatics/cgc7900.h +++ b/src/mame/chromatics/cgc7900.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_CGC7900_H -#define MAME_INCLUDES_CGC7900_H +#ifndef MAME_CHROMATICS_CGC7900_H +#define MAME_CHROMATICS_CGC7900_H #pragma once @@ -127,4 +127,4 @@ private: void irq_encoder(int pin, int state); }; -#endif +#endif // MAME_CHROMATICS_CGC7900_H diff --git a/src/mame/cinematronics/cinemat.h b/src/mame/cinematronics/cinemat.h index 387c803f71f..da1cb60de7c 100644 --- a/src/mame/cinematronics/cinemat.h +++ b/src/mame/cinematronics/cinemat.h @@ -5,8 +5,8 @@ Cinematronics vector hardware *************************************************************************/ -#ifndef MAME_INCLUDES_CINEMAT_H -#define MAME_INCLUDES_CINEMAT_H +#ifndef MAME_CINEMATRONICS_CINEMAT_H +#define MAME_CINEMATRONICS_CINEMAT_H #pragma once @@ -230,4 +230,4 @@ private: int m_qb3_lasty = 0; }; -#endif // MAME_INCLUDES_CINEMAT_H +#endif // MAME_CINEMATRONICS_CINEMAT_H diff --git a/src/mame/cinematronics/cinemat_a.h b/src/mame/cinematronics/cinemat_a.h index 507a8affb71..9c3fa620227 100644 --- a/src/mame/cinematronics/cinemat_a.h +++ b/src/mame/cinematronics/cinemat_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_CINEMATRONICS_CINEMAT_H -#define MAME_CINEMATRONICS_CINEMAT_H +#ifndef MAME_CINEMATRONICS_CINEMAT_A_H +#define MAME_CINEMATRONICS_CINEMAT_A_H #pragma once @@ -139,4 +139,4 @@ DECLARE_DEVICE_TYPE(BOXING_BUGS_AUDIO, boxingb_audio_device) DECLARE_DEVICE_TYPE(STAR_CASTLE_AUDIO, starcas_audio_device) DECLARE_DEVICE_TYPE(WAR_OF_THE_WORLDS_AUDIO, wotw_audio_device) -#endif // MAME_CINEMATRONICS_CINEMAT_H +#endif // MAME_CINEMATRONICS_CINEMAT_A_H diff --git a/src/mame/cinematronics/jack.h b/src/mame/cinematronics/jack.h index cc9bd1dbce6..fdfe36bc0c5 100644 --- a/src/mame/cinematronics/jack.h +++ b/src/mame/cinematronics/jack.h @@ -6,8 +6,8 @@ Jack the Giant Killer *************************************************************************/ -#ifndef MAME_INCLUDES_JACK_H -#define MAME_INCLUDES_JACK_H +#ifndef MAME_CINEMATRONICS_JACK_H +#define MAME_CINEMATRONICS_JACK_H #pragma once @@ -109,4 +109,4 @@ private: void unclepoo_map(address_map &map); }; -#endif // MAME_INCLUDES_JACK_H +#endif // MAME_CINEMATRONICS_JACK_H diff --git a/src/mame/cinematronics/leland.h b/src/mame/cinematronics/leland.h index 98d55ed27c1..8b25b1d6f00 100644 --- a/src/mame/cinematronics/leland.h +++ b/src/mame/cinematronics/leland.h @@ -5,8 +5,8 @@ Cinemat/Leland driver *************************************************************************/ -#ifndef MAME_INCLUDES_LELAND_H -#define MAME_INCLUDES_LELAND_H +#ifndef MAME_CINEMATRONICS_LELAND_H +#define MAME_CINEMATRONICS_LELAND_H #pragma once @@ -323,4 +323,4 @@ private: #define SERIAL_TYPE_ENCRYPT 3 #define SERIAL_TYPE_ENCRYPT_XOR 4 -#endif // MAME_INCLUDES_LELAND_H +#endif // MAME_CINEMATRONICS_LELAND_H diff --git a/src/mame/cinematronics/leland_a.h b/src/mame/cinematronics/leland_a.h index 5e86e2f9db5..5b72d188ec1 100644 --- a/src/mame/cinematronics/leland_a.h +++ b/src/mame/cinematronics/leland_a.h @@ -5,8 +5,8 @@ Cinemat/Leland driver *************************************************************************/ -#ifndef MAME_CINEMATRONICS_LELAND_H -#define MAME_CINEMATRONICS_LELAND_H +#ifndef MAME_CINEMATRONICS_LELAND_A_H +#define MAME_CINEMATRONICS_LELAND_A_H #pragma once @@ -129,4 +129,4 @@ DECLARE_DEVICE_TYPE(REDLINE_80186, redline_80186_sound_device) DECLARE_DEVICE_TYPE(ATAXX_80186, ataxx_80186_sound_device) DECLARE_DEVICE_TYPE(WSF_80186, wsf_80186_sound_device) -#endif // MAME_CINEMATRONICS_LELAND_H +#endif // MAME_CINEMATRONICS_LELAND_A_H diff --git a/src/mame/coleco/adam.h b/src/mame/coleco/adam.h index 47ef46e4e6c..92f6534246e 100644 --- a/src/mame/coleco/adam.h +++ b/src/mame/coleco/adam.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_ADAM_H -#define MAME_INCLUDES_ADAM_H +#ifndef MAME_COLECO_ADAM_H +#define MAME_COLECO_ADAM_H #include "bus/adam/exp.h" #include "bus/adamnet/adamnet.h" @@ -116,4 +116,4 @@ private: void m6801_mem(address_map &map); }; -#endif +#endif // MAME_COLECO_ADAM_H diff --git a/src/mame/coleco/coleco.h b/src/mame/coleco/coleco.h index 95d4b6027ab..d264ef43703 100644 --- a/src/mame/coleco/coleco.h +++ b/src/mame/coleco/coleco.h @@ -2,8 +2,8 @@ // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young, Frank Palazzolo #pragma once -#ifndef MAME_INCLUDES_COLECO_H -#define MAME_INCLUDES_COLECO_H +#ifndef MAME_COLECO_COLECO_H +#define MAME_COLECO_COLECO_H #include "cpu/z80/z80.h" @@ -136,4 +136,4 @@ private: uint8_t m_unknown = 0U; }; -#endif +#endif // MAME_COLECO_COLECO_H diff --git a/src/mame/coleco/coleco_m.h b/src/mame/coleco/coleco_m.h index c860c23e679..3fdc2305e20 100644 --- a/src/mame/coleco/coleco_m.h +++ b/src/mame/coleco/coleco_m.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young -#ifndef MAME_COLECO_COLECO_H -#define MAME_COLECO_COLECO_H +#ifndef MAME_COLECO_COLECO_M_H +#define MAME_COLECO_COLECO_M_H #pragma once INPUT_PORTS_EXTERN( coleco ); -#endif // MAME_COLECO_COLECO_H +#endif // MAME_COLECO_COLECO_M_H diff --git a/src/mame/comx/comx35.h b/src/mame/comx/comx35.h index c09e9299c7d..7f74ef2db03 100644 --- a/src/mame/comx/comx35.h +++ b/src/mame/comx/comx35.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_COMX35_H -#define MAME_INCLUDES_COMX35_H +#ifndef MAME_COMX_COMX35_H +#define MAME_COMX_COMX35_H #include "bus/comx35/exp.h" #include "cpu/cosmac/cosmac.h" @@ -103,4 +103,4 @@ private: int m_cr1 = 0; // interrupt enable }; -#endif +#endif // MAME_COMX_COMX35_H diff --git a/src/mame/concept/concept.h b/src/mame/concept/concept.h index 8b32c99f7f1..a23645661da 100644 --- a/src/mame/concept/concept.h +++ b/src/mame/concept/concept.h @@ -10,8 +10,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_CONCEPT_H -#define MAME_INCLUDES_CONCEPT_H +#ifndef MAME_CONCEPT_CONCEPT_H +#define MAME_CONCEPT_CONCEPT_H #include "cpu/m68000/m68000.h" #include "machine/6522via.h" @@ -76,4 +76,4 @@ private: void concept_memmap(address_map &map); }; -#endif // MAME_INCLUDES_CONCEPT_H +#endif // MAME_CONCEPT_CONCEPT_H diff --git a/src/mame/conitec/prof180x.h b/src/mame/conitec/prof180x.h index 1cf54ce01c8..a0fc5f96334 100644 --- a/src/mame/conitec/prof180x.h +++ b/src/mame/conitec/prof180x.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_PROF180X_H -#define MAME_INCLUDES_PROF180X_H +#ifndef MAME_CONITEC_PROF180X_H +#define MAME_CONITEC_PROF180X_H #pragma once @@ -58,4 +58,4 @@ private: void prof180x_mem(address_map &map); }; -#endif // MAME_INCLUDES_PROF180X_H +#endif // MAME_CONITEC_PROF180X_H diff --git a/src/mame/conitec/prof80.h b/src/mame/conitec/prof80.h index 70d92ab867f..61169e6b612 100644 --- a/src/mame/conitec/prof80.h +++ b/src/mame/conitec/prof80.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_PROF80_H -#define MAME_INCLUDES_PROF80_H +#ifndef MAME_CONITEC_PROF80_H +#define MAME_CONITEC_PROF80_H #pragma once @@ -98,4 +98,4 @@ private: void prof80_mmu(address_map &map); }; -#endif +#endif // MAME_CONITEC_PROF80_H diff --git a/src/mame/cvs/cvs.h b/src/mame/cvs/cvs.h index 3ee2574b5cb..174d6e8cafb 100644 --- a/src/mame/cvs/cvs.h +++ b/src/mame/cvs/cvs.h @@ -5,8 +5,8 @@ Century CVS System ****************************************************************************/ -#ifndef MAME_INCLUDES_CVS_H -#define MAME_INCLUDES_CVS_H +#ifndef MAME_CVS_CVS_H +#define MAME_CVS_CVS_H #pragma once @@ -161,4 +161,4 @@ protected: we can use the same gfx_layout */ }; -#endif // MAME_INCLUDES_CVS_H +#endif // MAME_CVS_CVS_H diff --git a/src/mame/cvs/galaxia.h b/src/mame/cvs/galaxia.h index a92a49ee0d3..60221c822e5 100644 --- a/src/mame/cvs/galaxia.h +++ b/src/mame/cvs/galaxia.h @@ -5,8 +5,8 @@ Zaccaria Galaxia HW ****************************************************************************/ -#ifndef MAME_INCLUDES_GALAXIA_H -#define MAME_INCLUDES_GALAXIA_H +#ifndef MAME_CVS_GALAXIA_H +#define MAME_CVS_GALAXIA_H #pragma once @@ -51,4 +51,4 @@ private: void galaxia_mem_map(address_map &map); }; -#endif // MAME_INCLUDES_GALAXIA_H +#endif // MAME_CVS_GALAXIA_H diff --git a/src/mame/cvs/quasar.h b/src/mame/cvs/quasar.h index 0db746289c2..ccd405e1ddc 100644 --- a/src/mame/cvs/quasar.h +++ b/src/mame/cvs/quasar.h @@ -5,8 +5,8 @@ Zaccaria Quasar ****************************************************************************/ -#ifndef MAME_INCLUDES_QUASAR_H -#define MAME_INCLUDES_QUASAR_H +#ifndef MAME_CVS_QUASAR_H +#define MAME_CVS_QUASAR_H #pragma once @@ -51,4 +51,4 @@ private: uint8_t m_io_page = 0; }; -#endif // MAME_INCLUDES_QUASAR_H +#endif // MAME_CVS_QUASAR_H diff --git a/src/mame/cybiko/cybiko.h b/src/mame/cybiko/cybiko.h index de820538637..5d1549a5f56 100644 --- a/src/mame/cybiko/cybiko.h +++ b/src/mame/cybiko/cybiko.h @@ -14,8 +14,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_CYBIKO_H -#define MAME_INCLUDES_CYBIKO_H +#ifndef MAME_CYBIKO_CYBIKO_H +#define MAME_CYBIKO_CYBIKO_H #include "bus/rs232/rs232.h" @@ -101,4 +101,4 @@ private: void cybikoxt_mem(address_map &map); }; -#endif // MAME_INCLUDES_CYBIKO_H +#endif // MAME_CYBIKO_CYBIKO_H diff --git a/src/mame/dai/dai.h b/src/mame/dai/dai.h index 402fd9893f7..32ee733f61a 100644 --- a/src/mame/dai/dai.h +++ b/src/mame/dai/dai.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_DAI_H -#define MAME_INCLUDES_DAI_H +#ifndef MAME_DAI_DAI_H +#define MAME_DAI_DAI_H #include "dai_snd.h" @@ -81,4 +81,4 @@ private: }; -#endif // MAME_INCLUDES_DAI_H +#endif // MAME_DAI_DAI_H diff --git a/src/mame/dataeast/btime.h b/src/mame/dataeast/btime.h index a8df67be9e5..56815763047 100644 --- a/src/mame/dataeast/btime.h +++ b/src/mame/dataeast/btime.h @@ -5,8 +5,8 @@ Burger Time hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_BTIME_H -#define MAME_INCLUDES_BTIME_H +#ifndef MAME_DATAEAST_BTIME_H +#define MAME_DATAEAST_BTIME_H #pragma once @@ -160,4 +160,4 @@ public: void zoar_map(address_map &map); }; -#endif // MAME_INCLUDES_BTIME_H +#endif // MAME_DATAEAST_BTIME_H diff --git a/src/mame/dataeast/compgolf.h b/src/mame/dataeast/compgolf.h index 9df82343dc8..fb4f38767c2 100644 --- a/src/mame/dataeast/compgolf.h +++ b/src/mame/dataeast/compgolf.h @@ -5,8 +5,8 @@ Competition Golf Final Round *************************************************************************/ -#ifndef MAME_INCLUDES_COMPGOLF_H -#define MAME_INCLUDES_COMPGOLF_H +#ifndef MAME_DATAEAST_COMPGOLF_H +#define MAME_DATAEAST_COMPGOLF_H #pragma once @@ -66,4 +66,4 @@ private: void compgolf_map(address_map &map); }; -#endif // MAME_INCLUDES_COMPGOLF_H +#endif // MAME_DATAEAST_COMPGOLF_H diff --git a/src/mame/dataeast/dec0.h b/src/mame/dataeast/dec0.h index 64acd7500b1..b3fcab2aac6 100644 --- a/src/mame/dataeast/dec0.h +++ b/src/mame/dataeast/dec0.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_DEC0_H -#define MAME_INCLUDES_DEC0_H +#ifndef MAME_DATAEAST_DEC0_H +#define MAME_DATAEAST_DEC0_H #pragma once @@ -213,4 +213,4 @@ private: void secretab_s_map(address_map &map); }; -#endif // MAME_INCLUDES_DEC0_H +#endif // MAME_DATAEAST_DEC0_H diff --git a/src/mame/dataeast/dec8.h b/src/mame/dataeast/dec8.h index 7b6df939967..81ad310fec0 100644 --- a/src/mame/dataeast/dec8.h +++ b/src/mame/dataeast/dec8.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_DEC8_H -#define MAME_INCLUDES_DEC8_H +#ifndef MAME_DATAEAST_DEC8_H +#define MAME_DATAEAST_DEC8_H #pragma once @@ -253,4 +253,4 @@ private: int m_msm5205next = 0; }; -#endif // MAME_INCLUDES_DEC8_H +#endif // MAME_DATAEAST_DEC8_H diff --git a/src/mame/dataeast/deco156_m.h b/src/mame/dataeast/deco156_m.h index c84af1781b5..7ebfb1088a7 100644 --- a/src/mame/dataeast/deco156_m.h +++ b/src/mame/dataeast/deco156_m.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_DATAEAST_DECO156_H -#define MAME_DATAEAST_DECO156_H +#ifndef MAME_DATAEAST_DECO156_M_H +#define MAME_DATAEAST_DECO156_M_H #pragma once void deco156_decrypt(running_machine &machine); -#endif // MAME_DATAEAST_DECO156_H +#endif // MAME_DATAEAST_DECO156_M_H diff --git a/src/mame/dataeast/decocass.h b/src/mame/dataeast/decocass.h index dfa26ce111a..6240d3a37cf 100644 --- a/src/mame/dataeast/decocass.h +++ b/src/mame/dataeast/decocass.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller, David Haywood -#ifndef MAME_INCLUDES_DECOCASS_H -#define MAME_INCLUDES_DECOCASS_H +#ifndef MAME_DATAEAST_DECOCASS_H +#define MAME_DATAEAST_DECOCASS_H #pragma once @@ -472,4 +472,4 @@ private: uint32_t m_address; }; -#endif // MAME_INCLUDES_DECOCASS_H +#endif // MAME_DATAEAST_DECOCASS_H diff --git a/src/mame/dataeast/kchamp.h b/src/mame/dataeast/kchamp.h index e6049a1a86f..62cb8bfd6c4 100644 --- a/src/mame/dataeast/kchamp.h +++ b/src/mame/dataeast/kchamp.h @@ -5,8 +5,8 @@ Karate Champ *************************************************************************/ -#ifndef MAME_INCLUDES_KCHAMP_H -#define MAME_INCLUDES_KCHAMP_H +#ifndef MAME_DATAEAST_KCHAMP_H +#define MAME_DATAEAST_KCHAMP_H #pragma once @@ -104,4 +104,4 @@ private: void kchampvs_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_KCHAMP_H +#endif // MAME_DATAEAST_KCHAMP_H diff --git a/src/mame/dataeast/kingobox.h b/src/mame/dataeast/kingobox.h index 1ed2813e0a9..be29ae6cb7c 100644 --- a/src/mame/dataeast/kingobox.h +++ b/src/mame/dataeast/kingobox.h @@ -5,8 +5,8 @@ King of Boxer - Ring King *************************************************************************/ -#ifndef MAME_INCLUDES_KINGOBOX_H -#define MAME_INCLUDES_KINGOBOX_H +#ifndef MAME_DATAEAST_KINGOBOX_H +#define MAME_DATAEAST_KINGOBOX_H #pragma once @@ -102,4 +102,4 @@ private: void ringking_video_map(address_map &map); }; -#endif // MAME_INCLUDES_KINGOBOX_H +#endif // MAME_DATAEAST_KINGOBOX_H diff --git a/src/mame/dataeast/liberate.h b/src/mame/dataeast/liberate.h index c33e6480f1f..560fc36a4e6 100644 --- a/src/mame/dataeast/liberate.h +++ b/src/mame/dataeast/liberate.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_LIBERATE_H -#define MAME_INCLUDES_LIBERATE_H +#ifndef MAME_DATAEAST_LIBERATE_H +#define MAME_DATAEAST_LIBERATE_H #pragma once @@ -113,4 +113,4 @@ private: void prosport_map(address_map &map); }; -#endif // MAME_INCLUDES_LIBERATE_H +#endif // MAME_DATAEAST_LIBERATE_H diff --git a/src/mame/dataeast/madalien.h b/src/mame/dataeast/madalien.h index 6157e7dfb02..54c4c898548 100644 --- a/src/mame/dataeast/madalien.h +++ b/src/mame/dataeast/madalien.h @@ -7,8 +7,8 @@ Original driver by Norbert Kehrer (February 2004) ***************************************************************************/ -#ifndef MAME_INCLUDES_MADALIEN_H -#define MAME_INCLUDES_MADALIEN_H +#ifndef MAME_DATAEAST_MADALIEN_H +#define MAME_DATAEAST_MADALIEN_H #pragma once @@ -109,4 +109,4 @@ DISCRETE_SOUND_EXTERN( madalien_discrete ); #define MADALIEN_8910_PORTA NODE_01 #define MADALIEN_8910_PORTB NODE_02 -#endif // MAME_INCLUDES_MADALIEN_H +#endif // MAME_DATAEAST_MADALIEN_H diff --git a/src/mame/dataeast/rohga.h b/src/mame/dataeast/rohga.h index 37440b29143..e06771a6a80 100644 --- a/src/mame/dataeast/rohga.h +++ b/src/mame/dataeast/rohga.h @@ -5,8 +5,8 @@ Data East 'Rohga' era hardware *************************************************************************/ -#ifndef MAME_INCLUDES_ROHGA_H -#define MAME_INCLUDES_ROHGA_H +#ifndef MAME_DATAEAST_ROHGA_H +#define MAME_DATAEAST_ROHGA_H #pragma once @@ -100,4 +100,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_ROHGA_H +#endif // MAME_DATAEAST_ROHGA_H diff --git a/src/mame/dataeast/supbtime.h b/src/mame/dataeast/supbtime.h index 9d180b1f451..bb1dd75647b 100644 --- a/src/mame/dataeast/supbtime.h +++ b/src/mame/dataeast/supbtime.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_SUPBTIME_H -#define MAME_INCLUDES_SUPBTIME_H +#ifndef MAME_DATAEAST_SUPBTIME_H +#define MAME_DATAEAST_SUPBTIME_H #include "cpu/m68000/m68000.h" #include "cpu/h6280/h6280.h" @@ -61,4 +61,4 @@ private: }; -#endif +#endif // MAME_DATAEAST_SUPBTIME_H diff --git a/src/mame/dataeast/tumbleb.h b/src/mame/dataeast/tumbleb.h index 64d78784a04..b8c455333d6 100644 --- a/src/mame/dataeast/tumbleb.h +++ b/src/mame/dataeast/tumbleb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood,Bryan McPhail -#ifndef MAME_INCLUDES_TUMBLEB_H -#define MAME_INCLUDES_TUMBLEB_H +#ifndef MAME_DATAEAST_TUMBLEB_H +#define MAME_DATAEAST_TUMBLEB_H #pragma once @@ -212,4 +212,4 @@ private: uint8_t m_pic_data; }; -#endif // MAME_INCLUDES_TUMBLEB_H +#endif // MAME_DATAEAST_TUMBLEB_H diff --git a/src/mame/ddr/huebler.h b/src/mame/ddr/huebler.h index 432b3beb3fa..5a04ad6f0cd 100644 --- a/src/mame/ddr/huebler.h +++ b/src/mame/ddr/huebler.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_HUEBLER_H -#define MAME_INCLUDES_HUEBLER_H +#ifndef MAME_DDR_HUEBLER_H +#define MAME_DDR_HUEBLER_H #define SCREEN_TAG "screen" #define Z80_TAG "z80" @@ -83,4 +83,4 @@ private: bool m_cassbit = false; }; -#endif +#endif // MAME_DDR_HUEBLER_H diff --git a/src/mame/ddr/kc.h b/src/mame/ddr/kc.h index 272c235e190..76d0e21a445 100644 --- a/src/mame/ddr/kc.h +++ b/src/mame/ddr/kc.h @@ -5,8 +5,8 @@ * includes/kc.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_KC_H -#define MAME_INCLUDES_KC_H +#ifndef MAME_DDR_KC_H +#define MAME_DDR_KC_H #pragma once @@ -198,4 +198,4 @@ public: void kc85_4_mem(address_map &map); }; -#endif // MAME_INCLUDES_KC_H +#endif // MAME_DDR_KC_H diff --git a/src/mame/ddr/polyplay.h b/src/mame/ddr/polyplay.h index c14ab8d9520..f3ab4b31ae4 100644 --- a/src/mame/ddr/polyplay.h +++ b/src/mame/ddr/polyplay.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Martin Buchholz // thanks-to:James Wallace, Martin Buchholz, Juergen Oppermann, Volker Hann, Jan-Ole Christian -#ifndef MAME_INCLUDES_POLYPLAY_H -#define MAME_INCLUDES_POLYPLAY_H +#ifndef MAME_DDR_POLYPLAY_H +#define MAME_DDR_POLYPLAY_H #include "cpu/z80/z80.h" #include "machine/z80ctc.h" @@ -86,4 +86,4 @@ private: output_finder<4> m_lamps; }; -#endif // MAME_INCLUDES_POLYPLAY_H +#endif // MAME_DDR_POLYPLAY_H diff --git a/src/mame/dynax/dynax.h b/src/mame/dynax/dynax.h index c11efdd467f..9afd030ad36 100644 --- a/src/mame/dynax/dynax.h +++ b/src/mame/dynax/dynax.h @@ -5,8 +5,8 @@ Dynax hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_DYNAX_H -#define MAME_INCLUDES_DYNAX_H +#ifndef MAME_DYNAX_DYNAX_H +#define MAME_DYNAX_DYNAX_H #pragma once @@ -351,4 +351,4 @@ private: INPUT_PORTS_EXTERN( HANAFUDA_KEYS_BET ); -#endif // MAME_INCLUDES_DYNAX_H +#endif // MAME_DYNAX_DYNAX_H diff --git a/src/mame/dynax/realbrk.h b/src/mame/dynax/realbrk.h index 492950119eb..4f6289c712d 100644 --- a/src/mame/dynax/realbrk.h +++ b/src/mame/dynax/realbrk.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_REALBRK_H -#define MAME_INCLUDES_REALBRK_H +#ifndef MAME_DYNAX_REALBRK_H +#define MAME_DYNAX_REALBRK_H #pragma once @@ -94,4 +94,4 @@ private: void realbrk_mem(address_map &map); }; -#endif // MAME_INCLUDES_REALBRK_H +#endif // MAME_DYNAX_REALBRK_H diff --git a/src/mame/edevices/fantland.h b/src/mame/edevices/fantland.h index 776d3a53ae3..d34d813909f 100644 --- a/src/mame/edevices/fantland.h +++ b/src/mame/edevices/fantland.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_FANTLAND_H -#define MAME_INCLUDES_FANTLAND_H +#ifndef MAME_EDEVICES_FANTLAND_H +#define MAME_EDEVICES_FANTLAND_H #pragma once @@ -111,4 +111,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_FANTLAND_H +#endif // MAME_EDEVICES_FANTLAND_H diff --git a/src/mame/efo/cidelsa.h b/src/mame/efo/cidelsa.h index f9f12d8b557..034f0cfaf10 100644 --- a/src/mame/efo/cidelsa.h +++ b/src/mame/efo/cidelsa.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_CIDELSA_H -#define MAME_INCLUDES_CIDELSA_H +#ifndef MAME_EFO_CIDELSA_H +#define MAME_EFO_CIDELSA_H #pragma once @@ -133,4 +133,4 @@ protected: int m_psg_latch = 0; }; -#endif // MAME_INCLUDES_CIDELSA_H +#endif // MAME_EFO_CIDELSA_H diff --git a/src/mame/epson/hx20.h b/src/mame/epson/hx20.h index ebc6467822c..80cd408c849 100644 --- a/src/mame/epson/hx20.h +++ b/src/mame/epson/hx20.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_HX20_H -#define MAME_INCLUDES_HX20_H +#ifndef MAME_EPSON_HX20_H +#define MAME_EPSON_HX20_H #pragma once @@ -124,4 +124,4 @@ private: void cm6127_mem(address_map &map); }; -#endif // MAME_INCLUDES_HX20_H +#endif // MAME_EPSON_HX20_H diff --git a/src/mame/epson/px8.h b/src/mame/epson/px8.h index 4a55d407574..e39412ba5da 100644 --- a/src/mame/epson/px8.h +++ b/src/mame/epson/px8.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Curt Coder,Dirk Best -#ifndef MAME_INCLUDES_PX8_H -#define MAME_INCLUDES_PX8_H +#ifndef MAME_EPSON_PX8_H +#define MAME_EPSON_PX8_H #pragma once @@ -91,4 +91,4 @@ private: void px8_slave_mem(address_map &map); }; -#endif +#endif // MAME_EPSON_PX8_H diff --git a/src/mame/exidy/carpolo.h b/src/mame/exidy/carpolo.h index ddea779f6de..d64af4fc889 100644 --- a/src/mame/exidy/carpolo.h +++ b/src/mame/exidy/carpolo.h @@ -7,8 +7,8 @@ driver by Zsolt Vasvari ****************************************************************************/ -#ifndef MAME_INCLUDES_CARPOLO_H -#define MAME_INCLUDES_CARPOLO_H +#ifndef MAME_EXIDY_CARPOLO_H +#define MAME_EXIDY_CARPOLO_H #pragma once @@ -159,4 +159,4 @@ private: required_device_array m_player_crash; }; -#endif // MAME_INCLUDES_CARPOLO_H +#endif // MAME_EXIDY_CARPOLO_H diff --git a/src/mame/exidy/circus.h b/src/mame/exidy/circus.h index 90f9becf3d1..de0546fa603 100644 --- a/src/mame/exidy/circus.h +++ b/src/mame/exidy/circus.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates -#ifndef MAME_INCLUDES_CIRCUS_H -#define MAME_INCLUDES_CIRCUS_H +#ifndef MAME_EXIDY_CIRCUS_H +#define MAME_EXIDY_CIRCUS_H #pragma once @@ -89,4 +89,4 @@ extern const char *const crash_sample_names[]; extern const char *const ripcord_sample_names[]; extern const char *const robotbwl_sample_names[]; -#endif // MAME_INCLUDES_CIRCUS_H +#endif // MAME_EXIDY_CIRCUS_H diff --git a/src/mame/exidy/exidy440.h b/src/mame/exidy/exidy440.h index 9fc30faea98..c7003e9aace 100644 --- a/src/mame/exidy/exidy440.h +++ b/src/mame/exidy/exidy440.h @@ -5,8 +5,8 @@ Exidy 440 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_EXIDY440_H -#define MAME_INCLUDES_EXIDY440_H +#ifndef MAME_EXIDY_EXIDY440_H +#define MAME_EXIDY_EXIDY440_H #pragma once @@ -123,4 +123,4 @@ private: uint8_t m_topsecex_yscroll = 0U; }; -#endif // MAME_INCLUDES_EXIDY440_H +#endif // MAME_EXIDY_EXIDY440_H diff --git a/src/mame/exidy/exidy440_a.h b/src/mame/exidy/exidy440_a.h index 2fab62f1e46..ff144d0761a 100644 --- a/src/mame/exidy/exidy440_a.h +++ b/src/mame/exidy/exidy440_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_EXIDY_EXIDY440_H -#define MAME_EXIDY_EXIDY440_H +#ifndef MAME_EXIDY_EXIDY440_A_H +#define MAME_EXIDY_EXIDY440_A_H #pragma once @@ -118,4 +118,4 @@ private: DECLARE_DEVICE_TYPE(EXIDY440, exidy440_sound_device) -#endif // MAME_EXIDY_EXIDY440_H +#endif // MAME_EXIDY_EXIDY440_A_H diff --git a/src/mame/exidy/sorcerer.h b/src/mame/exidy/sorcerer.h index d55f7344573..bc8adb746c3 100644 --- a/src/mame/exidy/sorcerer.h +++ b/src/mame/exidy/sorcerer.h @@ -5,8 +5,8 @@ * includes/sorcerer.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_SORCERER_H -#define MAME_INCLUDES_SORCERER_H +#ifndef MAME_EXIDY_SORCERER_H +#define MAME_EXIDY_SORCERER_H #pragma once @@ -183,4 +183,4 @@ private: }; -#endif // MAME_INCLUDES_SORCERER_H +#endif // MAME_EXIDY_SORCERER_H diff --git a/src/mame/exidy/starfire.h b/src/mame/exidy/starfire.h index e6f1c75d743..374b2fe1cb1 100644 --- a/src/mame/exidy/starfire.h +++ b/src/mame/exidy/starfire.h @@ -5,8 +5,8 @@ Star Fire/Fire One system ***************************************************************************/ -#ifndef MAME_INCLUDES_STARFIRE_H -#define MAME_INCLUDES_STARFIRE_H +#ifndef MAME_EXIDY_STARFIRE_H +#define MAME_EXIDY_STARFIRE_H #pragma once @@ -199,4 +199,4 @@ private: required_device m_music_c; }; -#endif // MAME_INCLUDES_STARFIRE_H +#endif // MAME_EXIDY_STARFIRE_H diff --git a/src/mame/exidy/vertigo.h b/src/mame/exidy/vertigo.h index 85f57c22a9c..dabcb39330e 100644 --- a/src/mame/exidy/vertigo.h +++ b/src/mame/exidy/vertigo.h @@ -5,8 +5,8 @@ Exidy Vertigo hardware *************************************************************************/ -#ifndef MAME_INCLUDES_VERTIGO_H -#define MAME_INCLUDES_VERTIGO_H +#ifndef MAME_EXIDY_VERTIGO_H +#define MAME_EXIDY_VERTIGO_H #pragma once @@ -144,4 +144,4 @@ private: microcode m_mc[MC_LENGTH]; }; -#endif // MAME_INCLUDES_VERTIGO_H +#endif // MAME_EXIDY_VERTIGO_H diff --git a/src/mame/exidy/victory.h b/src/mame/exidy/victory.h index 5482800f4a5..80af00c77e1 100644 --- a/src/mame/exidy/victory.h +++ b/src/mame/exidy/victory.h @@ -5,8 +5,8 @@ Victory system ****************************************************************************/ -#ifndef MAME_INCLUDES_VICTORY_H -#define MAME_INCLUDES_VICTORY_H +#ifndef MAME_EXIDY_VICTORY_H +#define MAME_EXIDY_VICTORY_H #pragma once @@ -110,4 +110,4 @@ private: emu_timer *m_bgcoll_irq_timer = nullptr; }; -#endif // MAME_INCLUDES_VICTORY_H +#endif // MAME_EXIDY_VICTORY_H diff --git a/src/mame/fairchild/channelf.h b/src/mame/fairchild/channelf.h index 393490af2a3..9dac1aded44 100644 --- a/src/mame/fairchild/channelf.h +++ b/src/mame/fairchild/channelf.h @@ -5,8 +5,8 @@ * includes/channelf.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_CHANNELF_H -#define MAME_INCLUDES_CHANNELF_H +#ifndef MAME_FAIRCHILD_CHANNELF_H +#define MAME_FAIRCHILD_CHANNELF_H #pragma once @@ -62,4 +62,4 @@ public: void channelf_map(address_map &map); }; -#endif // MAME_INCLUDES_CHANNELF_H +#endif // MAME_FAIRCHILD_CHANNELF_H diff --git a/src/mame/fairchild/channelf_a.h b/src/mame/fairchild/channelf_a.h index e6354f982d1..42790e18115 100644 --- a/src/mame/fairchild/channelf_a.h +++ b/src/mame/fairchild/channelf_a.h @@ -2,12 +2,12 @@ // copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle /***************************************************************************** * - * audio/channelf.h + * fairchild/channelf.h * ****************************************************************************/ -#ifndef MAME_FAIRCHILD_CHANNELF_H -#define MAME_FAIRCHILD_CHANNELF_H +#ifndef MAME_FAIRCHILD_CHANNELF_A_H +#define MAME_FAIRCHILD_CHANNELF_A_H class channelf_sound_device : public device_t, public device_sound_interface { @@ -36,4 +36,4 @@ private: DECLARE_DEVICE_TYPE(CHANNELF_SOUND, channelf_sound_device) -#endif // MAME_FAIRCHILD_CHANNELF_H +#endif // MAME_FAIRCHILD_CHANNELF_A_H diff --git a/src/mame/fujitsu/fm7.h b/src/mame/fujitsu/fm7.h index 76d118d73b5..f708591bd51 100644 --- a/src/mame/fujitsu/fm7.h +++ b/src/mame/fujitsu/fm7.h @@ -5,8 +5,8 @@ * FM-7 header file * */ -#ifndef MAME_INCLUDES_FM7_H -#define MAME_INCLUDES_FM7_H +#ifndef MAME_FUJITSU_FM7_H +#define MAME_FUJITSU_FM7_H #pragma once @@ -422,4 +422,4 @@ private: required_device m_x86; }; -#endif // MAME_INCLUDES_FM7_H +#endif // MAME_FUJITSU_FM7_H diff --git a/src/mame/fujitsu/fmtowns.h b/src/mame/fujitsu/fmtowns.h index f450575dd32..b4989905501 100644 --- a/src/mame/fujitsu/fmtowns.h +++ b/src/mame/fujitsu/fmtowns.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Barry Rodewald -#ifndef MAME_INCLUDES_FMTOWNS_H -#define MAME_INCLUDES_FMTOWNS_H +#ifndef MAME_FUJITSU_FMTOWNS_H +#define MAME_FUJITSU_FMTOWNS_H #pragma once @@ -433,4 +433,4 @@ protected: virtual void driver_start() override; }; -#endif // MAME_INCLUDES_FMTOWNS_H +#endif // MAME_FUJITSU_FMTOWNS_H diff --git a/src/mame/funworld/funworld.h b/src/mame/funworld/funworld.h index e25b5c961af..434054457a8 100644 --- a/src/mame/funworld/funworld.h +++ b/src/mame/funworld/funworld.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Roberto Fresca, Peter Ferrie -#ifndef MAME_INCLUDES_FUNWORLD_H -#define MAME_INCLUDES_FUNWORLD_H +#ifndef MAME_FUNWORLD_FUNWORLD_H +#define MAME_FUNWORLD_FUNWORLD_H #pragma once @@ -206,4 +206,4 @@ private: bool m_crtc_selected; }; -#endif // MAME_INCLUDES_FUNWORLD_H +#endif // MAME_FUNWORLD_FUNWORLD_H diff --git a/src/mame/funworld/snookr10.h b/src/mame/funworld/snookr10.h index 933de515dad..6f25eeeee2b 100644 --- a/src/mame/funworld/snookr10.h +++ b/src/mame/funworld/snookr10.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Roberto Fresca -#ifndef MAME_INCLUDES_SNOOKR10_H -#define MAME_INCLUDES_SNOOKR10_H +#ifndef MAME_FUNWORLD_SNOOKR10_H +#define MAME_FUNWORLD_SNOOKR10_H #pragma once @@ -64,4 +64,4 @@ private: output_finder<7> m_lamps; }; -#endif // MAME_INCLUDES_SNOOKR10_H +#endif // MAME_FUNWORLD_SNOOKR10_H diff --git a/src/mame/fuuki/fuukifg2.h b/src/mame/fuuki/fuukifg2.h index e5e5be3b718..0712d904023 100644 --- a/src/mame/fuuki/fuukifg2.h +++ b/src/mame/fuuki/fuukifg2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia,Paul Priest -#ifndef MAME_INCLUDES_FUUKIFG2_H -#define MAME_INCLUDES_FUUKIFG2_H +#ifndef MAME_FUUKI_FUUKIFG2_H +#define MAME_FUUKI_FUUKIFG2_H #pragma once @@ -89,4 +89,4 @@ private: emu_timer *m_raster_interrupt_timer = nullptr; }; -#endif // MAME_INCLUDES_FUUKIFG2_H +#endif // MAME_FUUKI_FUUKIFG2_H diff --git a/src/mame/fuuki/fuukifg3.h b/src/mame/fuuki/fuukifg3.h index 59900aab6b7..5ced217a235 100644 --- a/src/mame/fuuki/fuukifg3.h +++ b/src/mame/fuuki/fuukifg3.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Paul Priest, David Haywood, Luca Elia -#ifndef MAME_INCLUDES_FUUKIFG3_H -#define MAME_INCLUDES_FUUKIFG3_H +#ifndef MAME_FUUKI_FUUKIFG3_H +#define MAME_FUUKI_FUUKIFG3_H #pragma once @@ -105,4 +105,4 @@ private: emu_timer *m_raster_interrupt_timer = nullptr; }; -#endif // MAME_INCLUDES_FUUKIFG3_H +#endif // MAME_FUUKI_FUUKIFG3_H diff --git a/src/mame/gaelco/gaelco3d.h b/src/mame/gaelco/gaelco3d.h index 4b9918d8cbe..cd638d7bdff 100644 --- a/src/mame/gaelco/gaelco3d.h +++ b/src/mame/gaelco/gaelco3d.h @@ -7,8 +7,8 @@ driver by Aaron Giles **************************************************************************/ -#ifndef MAME_INCLUDES_GAELCO3D_H -#define MAME_INCLUDES_GAELCO3D_H +#ifndef MAME_GAELCO_GAELCO3D_H +#define MAME_GAELCO_GAELCO3D_H #pragma once @@ -180,4 +180,4 @@ private: void tms_map(address_map &map); }; -#endif // MAME_INCLUDES_GAELCO3D_H +#endif // MAME_GAELCO_GAELCO3D_H diff --git a/src/mame/gaelco/gaelco3d_m.h b/src/mame/gaelco/gaelco3d_m.h index b395ed80792..d599834c917 100644 --- a/src/mame/gaelco/gaelco3d_m.h +++ b/src/mame/gaelco/gaelco3d_m.h @@ -5,8 +5,8 @@ Gaelco 3D serial hardware ***************************************************************************/ -#ifndef MAME_GAELCO_GAELCO3D_H -#define MAME_GAELCO_GAELCO3D_H +#ifndef MAME_GAELCO_GAELCO3D_M_H +#define MAME_GAELCO_GAELCO3D_M_H #pragma once @@ -105,4 +105,4 @@ private: DECLARE_DEVICE_TYPE(GAELCO_SERIAL, gaelco_serial_device) -#endif // MAME_GAELCO_GAELCO3D_H +#endif // MAME_GAELCO_GAELCO3D_M_H diff --git a/src/mame/gaelco/splash.h b/src/mame/gaelco/splash.h index bbee339fb11..ab546c5f857 100644 --- a/src/mame/gaelco/splash.h +++ b/src/mame/gaelco/splash.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia, David Haywood -#ifndef MAME_INCLUDES_SPLASH_H -#define MAME_INCLUDES_SPLASH_H +#ifndef MAME_GAELCO_SPLASH_H +#define MAME_GAELCO_SPLASH_H #pragma once @@ -171,4 +171,4 @@ private: int m_snd_interrupt_enable2 = 0; }; -#endif // MAME_INCLUDES_SPLASH_H +#endif // MAME_GAELCO_SPLASH_H diff --git a/src/mame/galaxian/galaxian.h b/src/mame/galaxian/galaxian.h index 883398ad99f..e5a25217adb 100644 --- a/src/mame/galaxian/galaxian.h +++ b/src/mame/galaxian/galaxian.h @@ -5,8 +5,8 @@ Galaxian hardware family ***************************************************************************/ -#ifndef MAME_INCLUDES_GALAXIAN_H -#define MAME_INCLUDES_GALAXIAN_H +#ifndef MAME_GALAXIAN_GALAXIAN_H +#define MAME_GALAXIAN_GALAXIAN_H #pragma once @@ -934,4 +934,4 @@ private: }; -#endif // MAME_INCLUDES_GALAXIAN_H +#endif // MAME_GALAXIAN_GALAXIAN_H diff --git a/src/mame/galaxian/galaxian_a.h b/src/mame/galaxian/galaxian_a.h index 85ee8561f17..fd333ddf6d5 100644 --- a/src/mame/galaxian/galaxian_a.h +++ b/src/mame/galaxian/galaxian_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_GALAXIAN_GALAXIAN_H -#define MAME_GALAXIAN_GALAXIAN_H +#ifndef MAME_GALAXIAN_GALAXIAN_A_H +#define MAME_GALAXIAN_GALAXIAN_A_H #pragma once @@ -63,4 +63,4 @@ DECLARE_DEVICE_TYPE(GALAXIAN_SOUND, galaxian_sound_device) DECLARE_DEVICE_TYPE(MOONCRST_SOUND, mooncrst_sound_device) DECLARE_DEVICE_TYPE(SBHOEI_SOUND, sbhoei_sound_device) -#endif // MAME_GALAXIAN_GALAXIAN_H +#endif // MAME_GALAXIAN_GALAXIAN_A_H diff --git a/src/mame/galaxian/galaxold.h b/src/mame/galaxian/galaxold.h index 6bf0b11bef7..2051f3e9404 100644 --- a/src/mame/galaxian/galaxold.h +++ b/src/mame/galaxian/galaxold.h @@ -11,8 +11,8 @@ - scobra.cpp ***************************************************************************/ -#ifndef MAME_INCLUDES_GALAXOLD_H -#define MAME_INCLUDES_GALAXOLD_H +#ifndef MAME_GALAXIAN_GALAXOLD_H +#define MAME_GALAXIAN_GALAXOLD_H #pragma once @@ -300,4 +300,4 @@ protected: #define galaxold_coin_counter_0_w galaxold_coin_counter_w -#endif +#endif // MAME_GALAXIAN_GALAXOLD_H diff --git a/src/mame/gamepark/gp32.h b/src/mame/gamepark/gp32.h index e93e605c169..f78d808ce94 100644 --- a/src/mame/gamepark/gp32.h +++ b/src/mame/gamepark/gp32.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Tim Schuerewegen -#ifndef MAME_INCLUDES_GP32_H -#define MAME_INCLUDES_GP32_H +#ifndef MAME_GAMEPARK_GP32_H +#define MAME_GAMEPARK_GP32_H #include "machine/smartmed.h" #include "sound/dac.h" @@ -256,4 +256,4 @@ private: }; -#endif +#endif // MAME_GAMEPARK_GP32_H diff --git a/src/mame/gottlieb/exterm.h b/src/mame/gottlieb/exterm.h index 0aff3c1ed6d..dac86d18e72 100644 --- a/src/mame/gottlieb/exterm.h +++ b/src/mame/gottlieb/exterm.h @@ -5,8 +5,8 @@ Gottlieb Exterminator hardware *************************************************************************/ -#ifndef MAME_INCLUDES_EXTERM_H -#define MAME_INCLUDES_EXTERM_H +#ifndef MAME_GOTTLIEB_EXTERM_H +#define MAME_GOTTLIEB_EXTERM_H #pragma once @@ -81,4 +81,4 @@ private: void sound_slave_map(address_map &map); }; -#endif // MAME_INCLUDES_EXTERM_H +#endif // MAME_GOTTLIEB_EXTERM_H diff --git a/src/mame/grundy/newbrain.h b/src/mame/grundy/newbrain.h index 7f12a9b4e75..f0da527fe61 100644 --- a/src/mame/grundy/newbrain.h +++ b/src/mame/grundy/newbrain.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_NEWBRAIN_H -#define MAME_INCLUDES_NEWBRAIN_H +#ifndef MAME_GRUNDY_NEWBRAIN_H +#define MAME_GRUNDY_NEWBRAIN_H #pragma once @@ -142,4 +142,4 @@ private: emu_timer *m_clkint_timer = nullptr; }; -#endif +#endif // MAME_GRUNDY_NEWBRAIN_H diff --git a/src/mame/hec2hrp/hec2hrp.h b/src/mame/hec2hrp/hec2hrp.h index ae34fc21b46..bed1490b2bc 100644 --- a/src/mame/hec2hrp/hec2hrp.h +++ b/src/mame/hec2hrp/hec2hrp.h @@ -4,8 +4,8 @@ ////// HECTOR HEADER FILE ///////////////////////////////////////// ///////////////////////////////////////////////////////////////////// -#ifndef MAME_INCLUDES_HEC2HRP_H -#define MAME_INCLUDES_HEC2HRP_H +#ifndef MAME_HEC2HRP_HEC2HRP_H +#define MAME_HEC2HRP_HEC2HRP_H #pragma once @@ -210,4 +210,4 @@ private: optional_device_array m_upd_connector; }; -#endif // MAME_INCLUDES_HEC2HRP_H +#endif // MAME_HEC2HRP_HEC2HRP_H diff --git a/src/mame/hp/hp48.h b/src/mame/hp/hp48.h index 16cad569601..a471d137082 100644 --- a/src/mame/hp/hp48.h +++ b/src/mame/hp/hp48.h @@ -7,8 +7,8 @@ Hewlett Packard HP48 S/SX & G/GX and HP49 G **********************************************************************/ -#ifndef MAME_INCLUDES_HP84_H -#define MAME_INCLUDES_HP84_H +#ifndef MAME_HP_HP84_H +#define MAME_HP_HP84_H #pragma once @@ -215,4 +215,4 @@ private: #define HP48_NCE3 4 #define HP48_NCE1 5 -#endif // MAME_INCLUDES_HP84_H +#endif // MAME_HP_HP84_H diff --git a/src/mame/hp/hp9845.h b/src/mame/hp/hp9845.h index 00217deb7fb..03fb0ef231c 100644 --- a/src/mame/hp/hp9845.h +++ b/src/mame/hp/hp9845.h @@ -3,8 +3,8 @@ // ******************************* // Driver for HP 9845B/C/T systems // ******************************* -#ifndef MAME_INCLUDES_HP9845_H -#define MAME_INCLUDES_HP9845_H +#ifndef MAME_HP_HP9845_H +#define MAME_HP_HP9845_H #pragma once @@ -140,4 +140,4 @@ protected: int m_slot_sc[ 4 ]{}; }; -#endif // MAME_INCLUDES_HP9845_H +#endif // MAME_HP_HP9845_H diff --git a/src/mame/ice/lethalj.h b/src/mame/ice/lethalj.h index 09a35df4994..6cae2b57b47 100644 --- a/src/mame/ice/lethalj.h +++ b/src/mame/ice/lethalj.h @@ -5,8 +5,8 @@ The Game Room Lethal Justice hardware **************************************************************************/ -#ifndef MAME_INCLUDES_LETHALJ_H -#define MAME_INCLUDES_LETHALJ_H +#ifndef MAME_ICE_LETHALJ_H +#define MAME_ICE_LETHALJ_H #pragma once @@ -82,4 +82,4 @@ private: uint8_t m_blank_palette = 0; }; -#endif // MAME_INCLUDES_LETHALJ_H +#endif // MAME_ICE_LETHALJ_H diff --git a/src/mame/igs/goldstar.h b/src/mame/igs/goldstar.h index ea134c96af5..ede34755d55 100644 --- a/src/mame/igs/goldstar.h +++ b/src/mame/igs/goldstar.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Roberto Fresca, Vas Crabb -#ifndef MAME_INCLUDES_GOLDSTAR_H -#define MAME_INCLUDES_GOLDSTAR_H +#ifndef MAME_IGS_GOLDSTAR_H +#define MAME_IGS_GOLDSTAR_H #pragma once @@ -427,4 +427,4 @@ private: optional_device m_ticket_dispenser; }; -#endif // MAME_INCLUDES_GOLDSTAR_H +#endif // MAME_IGS_GOLDSTAR_H diff --git a/src/mame/igs/iqblock.h b/src/mame/igs/iqblock.h index 07438602f54..459311f12b0 100644 --- a/src/mame/igs/iqblock.h +++ b/src/mame/igs/iqblock.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Ernesto Corvi -#ifndef MAME_INCLUDES_IQBLOCK_H -#define MAME_INCLUDES_IQBLOCK_H +#ifndef MAME_IGS_IQBLOCK_H +#define MAME_IGS_IQBLOCK_H #pragma once @@ -58,4 +58,4 @@ private: void main_portmap(address_map &map); }; -#endif // MAME_INCLUDES_IQBLOCK_H +#endif // MAME_IGS_IQBLOCK_H diff --git a/src/mame/igs/pgm.h b/src/mame/igs/pgm.h index 224a011e8c6..e0880c45900 100644 --- a/src/mame/igs/pgm.h +++ b/src/mame/igs/pgm.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, ElSemi -#ifndef MAME_INCLUDES_PGM_H -#define MAME_INCLUDES_PGM_H +#ifndef MAME_IGS_PGM_H +#define MAME_IGS_PGM_H #pragma once @@ -153,4 +153,4 @@ INPUT_PORTS_EXTERN(pgm); extern gfx_decode_entry const gfx_pgm[]; -#endif // MAME_INCLUDES_PGM_H +#endif // MAME_IGS_PGM_H diff --git a/src/mame/igs/pgm2.h b/src/mame/igs/pgm2.h index 10e1070875f..66a79da4072 100644 --- a/src/mame/igs/pgm2.h +++ b/src/mame/igs/pgm2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_PGM2_H -#define MAME_INCLUDES_PGM2_H +#ifndef MAME_IGS_PGM2_H +#define MAME_IGS_PGM2_H #pragma once @@ -194,4 +194,4 @@ private: required_memory_region m_mainrom; }; -#endif +#endif // MAME_IGS_PGM2_H diff --git a/src/mame/interton/vc4000.h b/src/mame/interton/vc4000.h index bef161461e1..ebc0010c6be 100644 --- a/src/mame/interton/vc4000.h +++ b/src/mame/interton/vc4000.h @@ -6,8 +6,8 @@ * includes/vc4000.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_VC4000_H -#define MAME_INCLUDES_VC4000_H +#ifndef MAME_INTERTON_VC4000_H +#define MAME_INTERTON_VC4000_H #pragma once @@ -168,4 +168,4 @@ private: inline void vc4000_draw_grid(uint8_t *collision); }; -#endif // MAME_INCLUDES_VC4000_H +#endif // MAME_INTERTON_VC4000_H diff --git a/src/mame/interton/vc4000_a.h b/src/mame/interton/vc4000_a.h index 41010fe731c..c5e8589fbf8 100644 --- a/src/mame/interton/vc4000_a.h +++ b/src/mame/interton/vc4000_a.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INTERTON_VC4000_H -#define MAME_INTERTON_VC4000_H +#ifndef MAME_INTERTON_VC4000_A_H +#define MAME_INTERTON_VC4000_A_H #pragma once @@ -43,4 +43,4 @@ private: DECLARE_DEVICE_TYPE(VC4000_SND, vc4000_sound_device) -#endif // MAME_INTERTON_VC4000_H +#endif // MAME_INTERTON_VC4000_A_H diff --git a/src/mame/irem/m10.h b/src/mame/irem/m10.h index 0c17bc58e4b..6f826c912fa 100644 --- a/src/mame/irem/m10.h +++ b/src/mame/irem/m10.h @@ -5,8 +5,8 @@ IREM M-10,M-11 and M-15 based hardware ****************************************************************************/ -#ifndef MAME_INCLUDES_M10_H -#define MAME_INCLUDES_M10_H +#ifndef MAME_IREM_M10_H +#define MAME_IREM_M10_H #pragma once @@ -155,4 +155,4 @@ private: void m15_main(address_map &map); }; -#endif // MAME_INCLUDES_M10_H +#endif // MAME_IREM_M10_H diff --git a/src/mame/irem/m107.h b/src/mame/irem/m107.h index 5cc3068a250..72f04081082 100644 --- a/src/mame/irem/m107.h +++ b/src/mame/irem/m107.h @@ -5,8 +5,8 @@ Irem M107 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_M107_H -#define MAME_INCLUDES_M107_H +#ifndef MAME_IREM_M107_H +#define MAME_IREM_M107_H #pragma once @@ -103,4 +103,4 @@ private: void wpksoc_map(address_map &map); }; -#endif // MAME_INCLUDES_M107_H +#endif // MAME_IREM_M107_H diff --git a/src/mame/irem/m52.h b/src/mame/irem/m52.h index 6166dee3b08..cab7da9b2a1 100644 --- a/src/mame/irem/m52.h +++ b/src/mame/irem/m52.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_M52_H -#define MAME_INCLUDES_M52_H +#ifndef MAME_IREM_M52_H +#define MAME_IREM_M52_H #pragma once @@ -103,4 +103,4 @@ protected: }; -#endif // MAME_INCLUDES_M52_H +#endif // MAME_IREM_M52_H diff --git a/src/mame/irem/m57.h b/src/mame/irem/m57.h index bb3f98528f7..e1f0b721149 100644 --- a/src/mame/irem/m57.h +++ b/src/mame/irem/m57.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino -#ifndef MAME_INCLUDES_M57_H -#define MAME_INCLUDES_M57_H +#ifndef MAME_IREM_M57_H +#define MAME_IREM_M57_H #pragma once @@ -46,4 +46,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_M57_H +#endif // MAME_IREM_M57_H diff --git a/src/mame/irem/m58.h b/src/mame/irem/m58.h index 26566763af8..d2a7dd755af 100644 --- a/src/mame/irem/m58.h +++ b/src/mame/irem/m58.h @@ -6,8 +6,8 @@ Irem M58 hardware ****************************************************************************/ -#ifndef MAME_INCLUDES_M58_H -#define MAME_INCLUDES_M58_H +#ifndef MAME_IREM_M58_H +#define MAME_IREM_M58_H #pragma once @@ -69,4 +69,4 @@ private: void yard_map(address_map &map); }; -#endif // MAME_INCLUDES_M58_H +#endif // MAME_IREM_M58_H diff --git a/src/mame/irem/m62.h b/src/mame/irem/m62.h index 20eef286118..e3338129c23 100644 --- a/src/mame/irem/m62.h +++ b/src/mame/irem/m62.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:smf, David Haywood -#ifndef MAME_INCLUDES_M62_H -#define MAME_INCLUDES_M62_H +#ifndef MAME_IREM_M62_H +#define MAME_IREM_M62_H #pragma once @@ -194,4 +194,4 @@ private: INPUT_PORTS_EXTERN( m62_common ); INPUT_PORTS_EXTERN( kungfum ); -#endif // MAME_INCLUDES_M62_H +#endif // MAME_IREM_M62_H diff --git a/src/mame/irem/m72.h b/src/mame/irem/m72.h index 7da53829143..4980573443d 100644 --- a/src/mame/irem/m72.h +++ b/src/mame/irem/m72.h @@ -5,8 +5,8 @@ Irem M72 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_M72_H -#define MAME_INCLUDES_M72_H +#ifndef MAME_IREM_M72_H +#define MAME_IREM_M72_H #pragma once @@ -263,4 +263,4 @@ private: void xmultiplm72_map(address_map &map); }; -#endif // MAME_INCLUDES_M72_H +#endif // MAME_IREM_M72_H diff --git a/src/mame/irem/m72_a.h b/src/mame/irem/m72_a.h index d8c551a4a93..ca8877ecb2f 100644 --- a/src/mame/irem/m72_a.h +++ b/src/mame/irem/m72_a.h @@ -5,8 +5,8 @@ M72 audio interface ****************************************************************************/ -#ifndef MAME_IREM_M72_H -#define MAME_IREM_M72_H +#ifndef MAME_IREM_M72_A_H +#define MAME_IREM_M72_A_H #pragma once @@ -44,4 +44,4 @@ private: DECLARE_DEVICE_TYPE(IREM_M72_AUDIO, m72_audio_device) -#endif // MAME_IREM_M72_H +#endif // MAME_IREM_M72_A_H diff --git a/src/mame/irem/m90.h b/src/mame/irem/m90.h index fd3baec5edf..24ec939ea0e 100644 --- a/src/mame/irem/m90.h +++ b/src/mame/irem/m90.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_M90_H -#define MAME_INCLUDES_M90_H +#ifndef MAME_IREM_M90_H +#define MAME_IREM_M90_H #pragma once @@ -92,4 +92,4 @@ private: void quizf1_main_cpu_map(address_map &map); }; -#endif // MAME_INCLUDES_M90_H +#endif // MAME_IREM_M90_H diff --git a/src/mame/irem/m92.h b/src/mame/irem/m92.h index 08efd2eac9c..2668b7b35e6 100644 --- a/src/mame/irem/m92.h +++ b/src/mame/irem/m92.h @@ -5,8 +5,8 @@ Irem M92 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_M92_H -#define MAME_INCLUDES_M92_H +#ifndef MAME_IREM_M92_H +#define MAME_IREM_M92_H #pragma once @@ -130,4 +130,4 @@ private: TIMER_CALLBACK_MEMBER(spritebuffer_done); }; -#endif // MAME_INCLUDES_M92_H +#endif // MAME_IREM_M92_H diff --git a/src/mame/irem/redalert.h b/src/mame/irem/redalert.h index f6610a1f95b..e7fcbe1f296 100644 --- a/src/mame/irem/redalert.h +++ b/src/mame/irem/redalert.h @@ -12,8 +12,8 @@ ****************************************************************************/ -#ifndef MAME_INCLUDES_REDALERT_H -#define MAME_INCLUDES_REDALERT_H +#ifndef MAME_IREM_REDALERT_H +#define MAME_IREM_REDALERT_H #pragma once @@ -82,4 +82,4 @@ private: u8 m_demoneye_bitmap_yoffs = 0; }; -#endif // MAME_INCLUDES_REDALERT_H +#endif // MAME_IREM_REDALERT_H diff --git a/src/mame/irem/redalert_a.h b/src/mame/irem/redalert_a.h index ff3fa7d8bed..4747bd09169 100644 --- a/src/mame/irem/redalert_a.h +++ b/src/mame/irem/redalert_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour -#ifndef MAME_IREM_REDALERT_H -#define MAME_IREM_REDALERT_H +#ifndef MAME_IREM_REDALERT_A_H +#define MAME_IREM_REDALERT_A_H #pragma once @@ -124,4 +124,4 @@ private: uint8_t m_ay8910_latch_2 = 0; }; -#endif // MAME_IREM_REDALERT_H +#endif // MAME_IREM_REDALERT_A_H diff --git a/src/mame/irem/travrusa.h b/src/mame/irem/travrusa.h index 5a689f5065b..44e3d591bb9 100644 --- a/src/mame/irem/travrusa.h +++ b/src/mame/irem/travrusa.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Lee Taylor // thanks-to:John Clegg,Tomasz Slanina -#ifndef MAME_INCLUDES_TRAVRUSA_H -#define MAME_INCLUDES_TRAVRUSA_H +#ifndef MAME_IREM_TRAVRUSA_H +#define MAME_IREM_TRAVRUSA_H #pragma once @@ -57,4 +57,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_TRAVRUSA_H +#endif // MAME_IREM_TRAVRUSA_H diff --git a/src/mame/irem/vigilant.h b/src/mame/irem/vigilant.h index 905f654034b..7f3b50d94f8 100644 --- a/src/mame/irem/vigilant.h +++ b/src/mame/irem/vigilant.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour -#ifndef MAME_INCLUDES_VIGILANT_H -#define MAME_INCLUDES_VIGILANT_H +#ifndef MAME_IREM_VIGILANT_H +#define MAME_IREM_VIGILANT_H #pragma once @@ -93,4 +93,4 @@ private: void bowmen_io_map(address_map &map); }; -#endif // MAME_INCLUDES_VIGILANT_H +#endif // MAME_IREM_VIGILANT_H diff --git a/src/mame/itech/itech32.h b/src/mame/itech/itech32.h index 85ac4af43ba..3e60c916e34 100644 --- a/src/mame/itech/itech32.h +++ b/src/mame/itech/itech32.h @@ -6,8 +6,8 @@ (32-bit blitter variant) **************************************************************************/ -#ifndef MAME_INCLUDES_ITECH32_H -#define MAME_INCLUDES_ITECH32_H +#ifndef MAME_ITECH_ITECH32_H +#define MAME_ITECH_ITECH32_H #pragma once @@ -303,4 +303,4 @@ private: emu_timer *m_gun_timer = nullptr; }; -#endif // MAME_INCLUDES_ITECH32_H +#endif // MAME_ITECH_ITECH32_H diff --git a/src/mame/jaleco/cischeat.h b/src/mame/jaleco/cischeat.h index bb5f8b573a3..80ea01f8dee 100644 --- a/src/mame/jaleco/cischeat.h +++ b/src/mame/jaleco/cischeat.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_CISCHEAT_H -#define MAME_INCLUDES_CISCHEAT_H +#ifndef MAME_JALECO_CISCHEAT_H +#define MAME_JALECO_CISCHEAT_H #pragma once @@ -252,4 +252,4 @@ private: uint16_t m_motor_pos[2]; }; -#endif +#endif // MAME_JALECO_CISCHEAT_H diff --git a/src/mame/jaleco/citycon.h b/src/mame/jaleco/citycon.h index 468d12bc9ec..0ada107f682 100644 --- a/src/mame/jaleco/citycon.h +++ b/src/mame/jaleco/citycon.h @@ -5,8 +5,8 @@ City Connection *************************************************************************/ -#ifndef MAME_INCLUDES_CITYCON_H -#define MAME_INCLUDES_CITYCON_H +#ifndef MAME_JALECO_CITYCON_H +#define MAME_JALECO_CITYCON_H #pragma once @@ -65,4 +65,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_CITYCON_H +#endif // MAME_JALECO_CITYCON_H diff --git a/src/mame/jaleco/megasys1.h b/src/mame/jaleco/megasys1.h index 1b5c51a7970..5cf63da6d99 100644 --- a/src/mame/jaleco/megasys1.h +++ b/src/mame/jaleco/megasys1.h @@ -7,8 +7,8 @@ driver by Luca Elia (l.elia@tin.it) ***************************************************************************/ -#ifndef MAME_INCLUDES_MEGASYS1_H -#define MAME_INCLUDES_MEGASYS1_H +#ifndef MAME_JALECO_MEGASYS1_H +#define MAME_JALECO_MEGASYS1_H #pragma once @@ -216,4 +216,4 @@ private: void z80_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MEGASYS1_H +#endif // MAME_JALECO_MEGASYS1_H diff --git a/src/mame/jaleco/ms32.h b/src/mame/jaleco/ms32.h index 7d15d6d6928..c6caafe203e 100644 --- a/src/mame/jaleco/ms32.h +++ b/src/mame/jaleco/ms32.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood,Paul Priest -#ifndef MAME_INCLUDES_MS32_H -#define MAME_INCLUDES_MS32_H +#ifndef MAME_JALECO_MS32_H +#define MAME_JALECO_MS32_H #pragma once @@ -204,4 +204,4 @@ private: tilemap_t* m_extra_tilemap; }; -#endif // MAME_INCLUDES_MS32_H +#endif // MAME_JALECO_MS32_H diff --git a/src/mame/kaneko/snowbros.h b/src/mame/kaneko/snowbros.h index df007347fff..473fcc8843c 100644 --- a/src/mame/kaneko/snowbros.h +++ b/src/mame/kaneko/snowbros.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Mike Coates -#ifndef MAME_INCLUDES_SNOWBROS_H -#define MAME_INCLUDES_SNOWBROS_H +#ifndef MAME_KANEKO_SNOWBROS_H +#define MAME_KANEKO_SNOWBROS_H #pragma once @@ -125,4 +125,4 @@ private: void yutnori_map(address_map &map); }; -#endif // MAME_INCLUDES_SNOWBROS_H +#endif // MAME_KANEKO_SNOWBROS_H diff --git a/src/mame/kaneko/suprnova.h b/src/mame/kaneko/suprnova.h index f2cc0d783f7..3a6e7e9e1da 100644 --- a/src/mame/kaneko/suprnova.h +++ b/src/mame/kaneko/suprnova.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Sylvain Glaize, Paul Priest, Olivier Galibert -#ifndef MAME_INCLUDES_SUPRNOVA_H -#define MAME_INCLUDES_SUPRNOVA_H +#ifndef MAME_KANEKO_SUPRNOVA_H +#define MAME_KANEKO_SUPRNOVA_H #pragma once @@ -192,4 +192,4 @@ private: void skns_map(address_map &map); }; -#endif // MAME_INCLUDES_SUPRNOVA_H +#endif // MAME_KANEKO_SUPRNOVA_H diff --git a/src/mame/kaypro/kaypro.h b/src/mame/kaypro/kaypro.h index 9c9ec03cd94..c46ac1e6fea 100644 --- a/src/mame/kaypro/kaypro.h +++ b/src/mame/kaypro/kaypro.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Robbbert -#ifndef MAME_INCLUDES_KAYPRO_H -#define MAME_INCLUDES_KAYPRO_H +#ifndef MAME_KAYPRO_KAYPRO_H +#define MAME_KAYPRO_KAYPRO_H #pragma once @@ -123,4 +123,4 @@ private: output_finder<2> m_leds; }; -#endif // MAME_INCLUDES_KAYPRO_H +#endif // MAME_KAYPRO_KAYPRO_H diff --git a/src/mame/konami/88games.h b/src/mame/konami/88games.h index 39cf51b19de..94fd5f582f9 100644 --- a/src/mame/konami/88games.h +++ b/src/mame/konami/88games.h @@ -5,8 +5,8 @@ 88 Games *************************************************************************/ -#ifndef MAME_INCLUDES_88GAMES_H -#define MAME_INCLUDES_88GAMES_H +#ifndef MAME_KONAMI_88GAMES_H +#define MAME_KONAMI_88GAMES_H #pragma once @@ -77,4 +77,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_88GAMES_H +#endif // MAME_KONAMI_88GAMES_H diff --git a/src/mame/konami/asterix.h b/src/mame/konami/asterix.h index 1779340961b..afab9140c56 100644 --- a/src/mame/konami/asterix.h +++ b/src/mame/konami/asterix.h @@ -5,8 +5,8 @@ Asterix *************************************************************************/ -#ifndef MAME_INCLUDES_ASTERIX_H -#define MAME_INCLUDES_ASTERIX_H +#ifndef MAME_KONAMI_ASTERIX_H +#define MAME_KONAMI_ASTERIX_H #pragma once @@ -68,4 +68,4 @@ private: required_device m_k053251; }; -#endif // MAME_INCLUDES_ASTERIX_H +#endif // MAME_KONAMI_ASTERIX_H diff --git a/src/mame/konami/bishi.h b/src/mame/konami/bishi.h index 2209700aa48..a85007827a6 100644 --- a/src/mame/konami/bishi.h +++ b/src/mame/konami/bishi.h @@ -5,8 +5,8 @@ Bishi Bashi Champ Mini Game Senshuken *************************************************************************/ -#ifndef MAME_INCLUDES_BISHI_H -#define MAME_INCLUDES_BISHI_H +#ifndef MAME_KONAMI_BISHI_H +#define MAME_KONAMI_BISHI_H #pragma once @@ -68,4 +68,4 @@ private: required_device m_screen; }; -#endif // MAME_INCLUDES_BISHI_H +#endif // MAME_KONAMI_BISHI_H diff --git a/src/mame/konami/chqflag.h b/src/mame/konami/chqflag.h index c8b92fc11c0..a3b72fd94e3 100644 --- a/src/mame/konami/chqflag.h +++ b/src/mame/konami/chqflag.h @@ -5,8 +5,8 @@ Chequered Flag *************************************************************************/ -#ifndef MAME_INCLUDES_CHQFLAG_H -#define MAME_INCLUDES_CHQFLAG_H +#ifndef MAME_KONAMI_CHQFLAG_H +#define MAME_KONAMI_CHQFLAG_H #pragma once @@ -78,4 +78,4 @@ private: void update_background_shadows(uint8_t data); }; -#endif // MAME_INCLUDES_CHQFLAG_H +#endif // MAME_KONAMI_CHQFLAG_H diff --git a/src/mame/konami/combatsc.h b/src/mame/konami/combatsc.h index c99b716d4f8..a1c4a880124 100644 --- a/src/mame/konami/combatsc.h +++ b/src/mame/konami/combatsc.h @@ -5,8 +5,8 @@ Combat School *************************************************************************/ -#ifndef MAME_INCLUDES_COMBATSC_H -#define MAME_INCLUDES_COMBATSC_H +#ifndef MAME_KONAMI_COMBATSC_H +#define MAME_KONAMI_COMBATSC_H #pragma once @@ -168,4 +168,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_COMBATSC_H +#endif // MAME_KONAMI_COMBATSC_H diff --git a/src/mame/konami/crimfght.h b/src/mame/konami/crimfght.h index 37c4ce857a0..084afbb4a67 100644 --- a/src/mame/konami/crimfght.h +++ b/src/mame/konami/crimfght.h @@ -5,8 +5,8 @@ Crime Fighters *************************************************************************/ -#ifndef MAME_INCLUDES_CRIMFGHT_H -#define MAME_INCLUDES_CRIMFGHT_H +#ifndef MAME_KONAMI_CRIMFGHT_H +#define MAME_KONAMI_CRIMFGHT_H #pragma once @@ -70,4 +70,4 @@ private: int m_init = 0; }; -#endif // MAME_INCLUDES_CRIMFGHT_H +#endif // MAME_KONAMI_CRIMFGHT_H diff --git a/src/mame/konami/dbz.h b/src/mame/konami/dbz.h index 9fbf428cd09..c099f69c4c6 100644 --- a/src/mame/konami/dbz.h +++ b/src/mame/konami/dbz.h @@ -5,8 +5,8 @@ Dragon Ball Z *************************************************************************/ -#ifndef MAME_INCLUDES_DBZ_H -#define MAME_INCLUDES_DBZ_H +#ifndef MAME_KONAMI_DBZ_H +#define MAME_KONAMI_DBZ_H #pragma once @@ -95,4 +95,4 @@ private: void dbz_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_DBZ_H +#endif // MAME_KONAMI_DBZ_H diff --git a/src/mame/konami/djmain.h b/src/mame/konami/djmain.h index 5862befdf33..27bdf256067 100644 --- a/src/mame/konami/djmain.h +++ b/src/mame/konami/djmain.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:smf -#ifndef MAME_INCLUDES_DJMAIN_H -#define MAME_INCLUDES_DJMAIN_H +#ifndef MAME_KONAMI_DJMAIN_H +#define MAME_KONAMI_DJMAIN_H #pragma once @@ -104,4 +104,4 @@ private: const uint8_t *m_ata_master_password = nullptr; }; -#endif // MAME_INCLUDES_DJMAIN_H +#endif // MAME_KONAMI_DJMAIN_H diff --git a/src/mame/konami/gijoe.h b/src/mame/konami/gijoe.h index f6a65a6fc86..a0238e3f45c 100644 --- a/src/mame/konami/gijoe.h +++ b/src/mame/konami/gijoe.h @@ -5,8 +5,8 @@ GI Joe *************************************************************************/ -#ifndef MAME_INCLUDES_GIJOE_H -#define MAME_INCLUDES_GIJOE_H +#ifndef MAME_KONAMI_GIJOE_H +#define MAME_KONAMI_GIJOE_H #pragma once @@ -80,4 +80,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_GIJOE_H +#endif // MAME_KONAMI_GIJOE_H diff --git a/src/mame/konami/gradius3.h b/src/mame/konami/gradius3.h index 41aa0c9bf0c..cc58657de49 100644 --- a/src/mame/konami/gradius3.h +++ b/src/mame/konami/gradius3.h @@ -5,8 +5,8 @@ Gradius 3 *************************************************************************/ -#ifndef MAME_INCLUDES_GRADIUS3_H -#define MAME_INCLUDES_GRADIUS3_H +#ifndef MAME_KONAMI_GRADIUS3_H +#define MAME_KONAMI_GRADIUS3_H #pragma once @@ -75,4 +75,4 @@ private: void gradius3_s_map(address_map &map); }; -#endif // MAME_INCLUDES_GRADIUS3_H +#endif // MAME_KONAMI_GRADIUS3_H diff --git a/src/mame/konami/k053246_k053247_k055673.h b/src/mame/konami/k053246_k053247_k055673.h index 242a3907259..a12921b2898 100644 --- a/src/mame/konami/k053246_k053247_k055673.h +++ b/src/mame/konami/k053246_k053247_k055673.h @@ -3,8 +3,8 @@ /* */ /* todo: remove code from header, linker starts throwing silly messages when I try due to the templates.. make sense of them */ -#ifndef MAME_INCLUDES_K053246_K053247_K055673_H -#define MAME_INCLUDES_K053246_K053247_K055673_H +#ifndef MAME_KONAMI_K053246_K053247_K055673_H +#define MAME_KONAMI_K053246_K053247_K055673_H #pragma once @@ -467,4 +467,4 @@ private: DECLARE_DEVICE_TYPE(K055673, k055673_device) -#endif // MAME_INCLUDES_K053246_K053247_K055673_H +#endif // MAME_KONAMI_K053246_K053247_K055673_H diff --git a/src/mame/konami/konamigx.h b/src/mame/konami/konamigx.h index 423be3313db..ba9f3360ccc 100644 --- a/src/mame/konami/konamigx.h +++ b/src/mame/konami/konamigx.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Acho A. Tang, Phil Stroffolino, Olivier Galibert -#ifndef MAME_INCLUDES_KONAMIGX_H -#define MAME_INCLUDES_KONAMIGX_H +#ifndef MAME_KONAMI_KONAMIGX_H +#define MAME_KONAMI_KONAMIGX_H #pragma once @@ -348,4 +348,4 @@ protected: #define GXSUB_5BPP 0x05 // 32 colors #define GXSUB_8BPP 0x08 // 256 colors -#endif // MAME_INCLUDES_KONAMIGX_H +#endif // MAME_KONAMI_KONAMIGX_H diff --git a/src/mame/konami/lethal.h b/src/mame/konami/lethal.h index 2792cc3e698..ac2786074f3 100644 --- a/src/mame/konami/lethal.h +++ b/src/mame/konami/lethal.h @@ -5,8 +5,8 @@ Lethal Enforcers *************************************************************************/ -#ifndef MAME_INCLUDES_LETHAL_H -#define MAME_INCLUDES_LETHAL_H +#ifndef MAME_KONAMI_LETHAL_H +#define MAME_KONAMI_LETHAL_H #pragma once @@ -73,4 +73,4 @@ private: void le_sound(address_map &map); }; -#endif // MAME_INCLUDES_LETHAL_H +#endif // MAME_KONAMI_LETHAL_H diff --git a/src/mame/konami/moo.h b/src/mame/konami/moo.h index 5a4c9f10076..91dff8ad55d 100644 --- a/src/mame/konami/moo.h +++ b/src/mame/konami/moo.h @@ -5,8 +5,8 @@ Wild West C.O.W.boys of Moo Mesa / Bucky O'Hare *************************************************************************/ -#ifndef MAME_INCLUDES_MOO_H -#define MAME_INCLUDES_MOO_H +#ifndef MAME_KONAMI_MOO_H +#define MAME_KONAMI_MOO_H #pragma once @@ -102,4 +102,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MOO_H +#endif // MAME_KONAMI_MOO_H diff --git a/src/mame/konami/nemesis.h b/src/mame/konami/nemesis.h index cfc6ec3e582..d785f7b2dee 100644 --- a/src/mame/konami/nemesis.h +++ b/src/mame/konami/nemesis.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_NEMESIS_H -#define MAME_INCLUDES_NEMESIS_H +#ifndef MAME_KONAMI_NEMESIS_H +#define MAME_KONAMI_NEMESIS_H #pragma once @@ -182,4 +182,4 @@ private: void bubsys_map(address_map &map); }; -#endif // MAME_INCLUDES_NEMESIS_H +#endif // MAME_KONAMI_NEMESIS_H diff --git a/src/mame/konami/qdrmfgp.h b/src/mame/konami/qdrmfgp.h index d7161e61322..a403f9df498 100644 --- a/src/mame/konami/qdrmfgp.h +++ b/src/mame/konami/qdrmfgp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Hau -#ifndef MAME_INCLUDES_QDRMFGP_H -#define MAME_INCLUDES_QDRMFGP_H +#ifndef MAME_KONAMI_QDRMFGP_H +#define MAME_KONAMI_QDRMFGP_H #pragma once @@ -89,4 +89,4 @@ private: void qdrmfgp_map(address_map &map); }; -#endif // MAME_INCLUDES_QDRMFGP_H +#endif // MAME_KONAMI_QDRMFGP_H diff --git a/src/mame/konami/rungun.h b/src/mame/konami/rungun.h index 4da780ca987..4e27f2df3c9 100644 --- a/src/mame/konami/rungun.h +++ b/src/mame/konami/rungun.h @@ -5,8 +5,8 @@ Run and Gun / Slam Dunk *************************************************************************/ -#ifndef MAME_INCLUDES_RUNGUN_H -#define MAME_INCLUDES_RUNGUN_H +#ifndef MAME_KONAMI_RUNGUN_H +#define MAME_KONAMI_RUNGUN_H #pragma once @@ -122,4 +122,4 @@ private: void rungun_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_RUNGUN_H +#endif // MAME_KONAMI_RUNGUN_H diff --git a/src/mame/konami/simpsons.h b/src/mame/konami/simpsons.h index 00325513669..2d7d4930d5b 100644 --- a/src/mame/konami/simpsons.h +++ b/src/mame/konami/simpsons.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi -#ifndef MAME_INCLUDES_SIMPSONS_H -#define MAME_INCLUDES_SIMPSONS_H +#ifndef MAME_KONAMI_SIMPSONS_H +#define MAME_KONAMI_SIMPSONS_H #pragma once @@ -82,4 +82,4 @@ private: K053246_CB_MEMBER(sprite_callback); }; -#endif // MAME_INCLUDES_SIMPSONS_H +#endif // MAME_KONAMI_SIMPSONS_H diff --git a/src/mame/konami/spy.h b/src/mame/konami/spy.h index 06d2acbd6bc..bf48adcfa75 100644 --- a/src/mame/konami/spy.h +++ b/src/mame/konami/spy.h @@ -5,8 +5,8 @@ S.P.Y. *************************************************************************/ -#ifndef MAME_INCLUDES_SPY_H -#define MAME_INCLUDES_SPY_H +#ifndef MAME_KONAMI_SPY_H +#define MAME_KONAMI_SPY_H #pragma once @@ -74,4 +74,4 @@ private: void spy_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_SPY_H +#endif // MAME_KONAMI_SPY_H diff --git a/src/mame/konami/thunderx.h b/src/mame/konami/thunderx.h index c77b67beb89..1f2145db7ff 100644 --- a/src/mame/konami/thunderx.h +++ b/src/mame/konami/thunderx.h @@ -5,8 +5,8 @@ Super Contra / Thunder Cross *************************************************************************/ -#ifndef MAME_INCLUDES_THUNDERX_H -#define MAME_INCLUDES_THUNDERX_H +#ifndef MAME_KONAMI_THUNDERX_H +#define MAME_KONAMI_THUNDERX_H #pragma once @@ -96,4 +96,4 @@ private: void thunderx_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_THUNDERX_H +#endif // MAME_KONAMI_THUNDERX_H diff --git a/src/mame/konami/tmnt.h b/src/mame/konami/tmnt.h index 7b64cfbd721..74da15b7702 100644 --- a/src/mame/konami/tmnt.h +++ b/src/mame/konami/tmnt.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_TMNT_H -#define MAME_INCLUDES_TMNT_H +#ifndef MAME_KONAMI_TMNT_H +#define MAME_KONAMI_TMNT_H #pragma once @@ -263,4 +263,4 @@ private: int m_roz_char_bank = 0; }; -#endif // MAME_INCLUDES_TMNT_H +#endif // MAME_KONAMI_TMNT_H diff --git a/src/mame/konami/trackfld.h b/src/mame/konami/trackfld.h index cd353ed42ab..6df829fc00b 100644 --- a/src/mame/konami/trackfld.h +++ b/src/mame/konami/trackfld.h @@ -5,8 +5,8 @@ Track'n'Field ***************************************************************************/ -#ifndef MAME_INCLUDES_TRACKFLD_H -#define MAME_INCLUDES_TRACKFLD_H +#ifndef MAME_KONAMI_TRACKFLD_H +#define MAME_KONAMI_TRACKFLD_H #pragma once @@ -132,4 +132,4 @@ private: void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); }; -#endif // MAME_INCLUDES_TRACKFLD_H +#endif // MAME_KONAMI_TRACKFLD_H diff --git a/src/mame/konami/trackfld_a.h b/src/mame/konami/trackfld_a.h index 8346aa86db7..c6ea34b8b33 100644 --- a/src/mame/konami/trackfld_a.h +++ b/src/mame/konami/trackfld_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Chris Hardy -#ifndef MAME_KONAMI_TRACKFLD_H -#define MAME_KONAMI_TRACKFLD_H +#ifndef MAME_KONAMI_TRACKFLD_A_H +#define MAME_KONAMI_TRACKFLD_A_H #pragma once @@ -44,4 +44,4 @@ private: DECLARE_DEVICE_TYPE(TRACKFLD_AUDIO, trackfld_audio_device) -#endif // MAME_KONAMI_TRACKFLD_H +#endif // MAME_KONAMI_TRACKFLD_A_H diff --git a/src/mame/konami/tutankhm.h b/src/mame/konami/tutankhm.h index 0a4513c7291..3b978b8a95b 100644 --- a/src/mame/konami/tutankhm.h +++ b/src/mame/konami/tutankhm.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni -#ifndef MAME_INCLUDES_TUTANKHM_H -#define MAME_INCLUDES_TUTANKHM_H +#ifndef MAME_KONAMI_TUTANKHM_H +#define MAME_KONAMI_TUTANKHM_H #pragma once @@ -98,4 +98,4 @@ protected: uint8_t m_stars_blink_state = 0; }; -#endif // MAME_INCLUDES_TUTANKHM_H +#endif // MAME_KONAMI_TUTANKHM_H diff --git a/src/mame/konami/twin16.h b/src/mame/konami/twin16.h index 56e78f0787b..41f147bd896 100644 --- a/src/mame/konami/twin16.h +++ b/src/mame/konami/twin16.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino -#ifndef MAME_INCLUDES_TWIN16_H -#define MAME_INCLUDES_TWIN16_H +#ifndef MAME_KONAMI_TWIN16_H +#define MAME_KONAMI_TWIN16_H #pragma once @@ -152,4 +152,4 @@ private: uint16_t m_nvram[0x400 * 0x20 / 2]{}; }; -#endif // MAME_INCLUDES_TWIN16_H +#endif // MAME_KONAMI_TWIN16_H diff --git a/src/mame/konami/ultraman.h b/src/mame/konami/ultraman.h index 6e77c76a83b..63c0f2f9ddd 100644 --- a/src/mame/konami/ultraman.h +++ b/src/mame/konami/ultraman.h @@ -5,8 +5,8 @@ Ultraman *************************************************************************/ -#ifndef MAME_INCLUDES_ULTRAMAN_H -#define MAME_INCLUDES_ULTRAMAN_H +#ifndef MAME_KONAMI_ULTRAMAN_H +#define MAME_KONAMI_ULTRAMAN_H #pragma once @@ -57,4 +57,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_ULTRAMAN_H +#endif // MAME_KONAMI_ULTRAMAN_H diff --git a/src/mame/konami/wecleman.h b/src/mame/konami/wecleman.h index c2d3f250c1f..deca4ab08ab 100644 --- a/src/mame/konami/wecleman.h +++ b/src/mame/konami/wecleman.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_WECLEMAN_H -#define MAME_INCLUDES_WECLEMAN_H +#ifndef MAME_KONAMI_WECLEMAN_H +#define MAME_KONAMI_WECLEMAN_H #pragma once @@ -199,4 +199,4 @@ private: void hotchase_sub_map(address_map &map); }; -#endif // MAME_INCLUDES_WECLEMAN_H +#endif // MAME_KONAMI_WECLEMAN_H diff --git a/src/mame/konami/xexex.h b/src/mame/konami/xexex.h index 98e39872d2f..b66c9a49416 100644 --- a/src/mame/konami/xexex.h +++ b/src/mame/konami/xexex.h @@ -5,8 +5,8 @@ Xexex *************************************************************************/ -#ifndef MAME_INCLUDES_XEXEX_H -#define MAME_INCLUDES_XEXEX_H +#ifndef MAME_KONAMI_XEXEX_H +#define MAME_KONAMI_XEXEX_H #pragma once @@ -116,4 +116,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_XEXEX_H +#endif // MAME_KONAMI_XEXEX_H diff --git a/src/mame/kyocera/kyocera.h b/src/mame/kyocera/kyocera.h index 9c8001f889d..1fd36bb7ffd 100644 --- a/src/mame/kyocera/kyocera.h +++ b/src/mame/kyocera/kyocera.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_KYOCERA_H -#define MAME_INCLUDES_KYOCERA_H +#ifndef MAME_KYOCERA_KYOCERA_H +#define MAME_KYOCERA_KYOCERA_H #pragma once @@ -264,4 +264,4 @@ private: void tandy200_mem(address_map &map); }; -#endif // MAME_INCLUDES_KYOCERA_H +#endif // MAME_KYOCERA_KYOCERA_H diff --git a/src/mame/luxor/abc1600.h b/src/mame/luxor/abc1600.h index 2ddaa81dc23..ca4c59fd43b 100644 --- a/src/mame/luxor/abc1600.h +++ b/src/mame/luxor/abc1600.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_ABC1600_H -#define MAME_INCLUDES_ABC1600_H +#ifndef MAME_LUXOR_ABC1600_H +#define MAME_LUXOR_ABC1600_H #include "bus/abcbus/abcbus.h" #include "bus/abckb/abckb.h" @@ -167,4 +167,4 @@ private: -#endif +#endif // MAME_LUXOR_ABC1600_H diff --git a/src/mame/luxor/abc1600_v.h b/src/mame/luxor/abc1600_v.h index 12ed527ab0d..fa789de275c 100644 --- a/src/mame/luxor/abc1600_v.h +++ b/src/mame/luxor/abc1600_v.h @@ -5,8 +5,8 @@ Luxor ABC 1600 Mover emulation **********************************************************************/ -#ifndef MAME_LUXOR_ABC1600_H -#define MAME_LUXOR_ABC1600_H +#ifndef MAME_LUXOR_ABC1600_V_H +#define MAME_LUXOR_ABC1600_V_H #pragma once @@ -143,4 +143,4 @@ DECLARE_DEVICE_TYPE(ABC1600_MOVER, abc1600_mover_device) -#endif // MAME_LUXOR_ABC1600_H +#endif // MAME_LUXOR_ABC1600_V_H diff --git a/src/mame/luxor/abc80.h b/src/mame/luxor/abc80.h index b504bac7be1..94c44150cab 100644 --- a/src/mame/luxor/abc80.h +++ b/src/mame/luxor/abc80.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_ABC80_H -#define MAME_INCLUDES_ABC80_H +#ifndef MAME_LUXOR_ABC80_H +#define MAME_LUXOR_ABC80_H #pragma once @@ -189,4 +189,4 @@ protected: emu_timer *m_keyboard_clear_timer = nullptr; }; -#endif // MAME_INCLUDES_ABC80_H +#endif // MAME_LUXOR_ABC80_H diff --git a/src/mame/luxor/abc80x.h b/src/mame/luxor/abc80x.h index 79a7a025e29..6b7a2a6c884 100644 --- a/src/mame/luxor/abc80x.h +++ b/src/mame/luxor/abc80x.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_ABC800_H -#define MAME_INCLUDES_ABC800_H +#ifndef MAME_LUXOR_ABC800_H +#define MAME_LUXOR_ABC800_H #pragma once @@ -340,4 +340,4 @@ public: void abc806_mem(address_map &map); }; -#endif +#endif // MAME_LUXOR_ABC800_H diff --git a/src/mame/mattel/aquarius.h b/src/mame/mattel/aquarius.h index 8b18078717d..1b21e81511b 100644 --- a/src/mame/mattel/aquarius.h +++ b/src/mame/mattel/aquarius.h @@ -5,8 +5,8 @@ * includes/aquarius.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_AQUARIUS_H -#define MAME_INCLUDES_AQUARIUS_H +#ifndef MAME_MATTEL_AQUARIUS_H +#define MAME_MATTEL_AQUARIUS_H #pragma once @@ -95,4 +95,4 @@ private: void aquarius_mem(address_map &map); }; -#endif // MAME_INCLUDES_AQUARIUS_H +#endif // MAME_MATTEL_AQUARIUS_H diff --git a/src/mame/mattel/intv.h b/src/mame/mattel/intv.h index c11e22946f8..cabb38677c2 100644 --- a/src/mame/mattel/intv.h +++ b/src/mame/mattel/intv.h @@ -5,8 +5,8 @@ * includes/intv.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_INTV_H -#define MAME_INCLUDES_INTV_H +#ifndef MAME_MATTEL_INTV_H +#define MAME_MATTEL_INTV_H #pragma once @@ -148,4 +148,4 @@ private: ioport_port *m_intv_keyboard[10]; }; -#endif // MAME_INCLUDES_INTV_H +#endif // MAME_MATTEL_INTV_H diff --git a/src/mame/meadows/lazercmd.h b/src/mame/meadows/lazercmd.h index 9fbc762edff..ef946b2e8ab 100644 --- a/src/mame/meadows/lazercmd.h +++ b/src/mame/meadows/lazercmd.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller -#ifndef MAME_INCLUDES_LAZERCMD_H -#define MAME_INCLUDES_LAZERCMD_H +#ifndef MAME_MEADOWS_LAZERCMD_H +#define MAME_MEADOWS_LAZERCMD_H #pragma once @@ -94,4 +94,4 @@ private: void medlanes_map(address_map &map); }; -#endif // MAME_INCLUDES_LAZERCMD_H +#endif // MAME_MEADOWS_LAZERCMD_H diff --git a/src/mame/meadows/meadows.h b/src/mame/meadows/meadows.h index 2ce6137caf3..9b8a4707d39 100644 --- a/src/mame/meadows/meadows.h +++ b/src/mame/meadows/meadows.h @@ -5,8 +5,8 @@ Meadows S2650 hardware *************************************************************************/ -#ifndef MAME_INCLUDES_MEADOWS_H -#define MAME_INCLUDES_MEADOWS_H +#ifndef MAME_MEADOWS_MEADOWS_H +#define MAME_MEADOWS_MEADOWS_H #pragma once @@ -95,4 +95,4 @@ private: void minferno_main_map(address_map &map); }; -#endif // MAME_INCLUDES_MEADOWS_H +#endif // MAME_MEADOWS_MEADOWS_H diff --git a/src/mame/memotech/mtx.h b/src/mame/memotech/mtx.h index 0f8789d96fa..f0262ab2f99 100644 --- a/src/mame/memotech/mtx.h +++ b/src/mame/memotech/mtx.h @@ -6,8 +6,8 @@ *************************************************************************/ -#ifndef MAME_INCLUDES_MTX_H -#define MAME_INCLUDES_MTX_H +#ifndef MAME_MEMOTECH_MTX_H +#define MAME_MEMOTECH_MTX_H #include "imagedev/snapquik.h" #include "imagedev/cassette.h" @@ -139,4 +139,4 @@ private: void rs128_io(address_map &map); }; -#endif // MAME_INCLUDES_MTX_H +#endif // MAME_MEMOTECH_MTX_H diff --git a/src/mame/microkey/primo.h b/src/mame/microkey/primo.h index 1c14510d9cd..8f07526736e 100644 --- a/src/mame/microkey/primo.h +++ b/src/mame/microkey/primo.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PRIMO_H -#define MAME_INCLUDES_PRIMO_H +#ifndef MAME_MICROKEY_PRIMO_H +#define MAME_MICROKEY_PRIMO_H #pragma once @@ -95,4 +95,4 @@ private: }; -#endif // MAME_INCLUDES_PRIMO_H +#endif // MAME_MICROKEY_PRIMO_H diff --git a/src/mame/midw8080/8080bw.h b/src/mame/midw8080/8080bw.h index 2c87b91b554..380cd2c15b3 100644 --- a/src/mame/midw8080/8080bw.h +++ b/src/mame/midw8080/8080bw.h @@ -6,8 +6,8 @@ 8080-based black and white hardware ****************************************************************************/ -#ifndef MAME_INCLUDES_8080BW_H -#define MAME_INCLUDES_8080BW_H +#ifndef MAME_MIDW8080_8080BW_H +#define MAME_MIDW8080_8080BW_H #pragma once @@ -652,4 +652,4 @@ private: required_device m_eeprom; }; -#endif // MAME_INCLUDES_8080BW_H +#endif // MAME_MIDW8080_8080BW_H diff --git a/src/mame/midw8080/8080bw_a.h b/src/mame/midw8080/8080bw_a.h index ebdc7aed222..3d9f85d818d 100644 --- a/src/mame/midw8080/8080bw_a.h +++ b/src/mame/midw8080/8080bw_a.h @@ -5,8 +5,8 @@ 8080-based black and white sound hardware ****************************************************************************/ -#ifndef MAME_MIDW8080_8080BW_H -#define MAME_MIDW8080_8080BW_H +#ifndef MAME_MIDW8080_8080BW_A_H +#define MAME_MIDW8080_8080BW_A_H #pragma once @@ -42,4 +42,4 @@ private: DECLARE_DEVICE_TYPE(CANE_AUDIO, cane_audio_device) -#endif // MAME_MIDW8080_8080BW_H +#endif // MAME_MIDW8080_8080BW_A_H diff --git a/src/mame/midw8080/m79amb.h b/src/mame/midw8080/m79amb.h index 7a77114e52a..9bd67730225 100644 --- a/src/mame/midw8080/m79amb.h +++ b/src/mame/midw8080/m79amb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Al Kossow -#ifndef MAME_INCLUDES_M79AMB_H -#define MAME_INCLUDES_M79AMB_H +#ifndef MAME_MIDW8080_M79AMB_H +#define MAME_MIDW8080_M79AMB_H #pragma once @@ -55,4 +55,4 @@ private: DISCRETE_SOUND_EXTERN( m79amb_discrete ); -#endif // MAME_INCLUDES_M79AMB_H +#endif // MAME_MIDW8080_M79AMB_H diff --git a/src/mame/midw8080/mw8080bw.h b/src/mame/midw8080/mw8080bw.h index 91de08037c5..43881673ee6 100644 --- a/src/mame/midw8080/mw8080bw.h +++ b/src/mame/midw8080/mw8080bw.h @@ -6,8 +6,8 @@ Midway 8080-based black and white hardware ****************************************************************************/ -#ifndef MAME_INCLUDES_MW8080BW_H -#define MAME_INCLUDES_MW8080BW_H +#ifndef MAME_MIDW8080_MW8080BW_H +#define MAME_MIDW8080_MW8080BW_H #pragma once @@ -452,4 +452,4 @@ private: extern const internal_layout layout_invaders; -#endif // MAME_INCLUDES_MW8080BW_H +#endif // MAME_MIDW8080_MW8080BW_H diff --git a/src/mame/midw8080/mw8080bw_a.h b/src/mame/midw8080/mw8080bw_a.h index f7df37a5095..98c3cdadc40 100644 --- a/src/mame/midw8080/mw8080bw_a.h +++ b/src/mame/midw8080/mw8080bw_a.h @@ -6,8 +6,8 @@ Midway 8080-based black and white hardware ****************************************************************************/ -#ifndef MAME_MIDW8080_MW8080BW_H -#define MAME_MIDW8080_MW8080BW_H +#ifndef MAME_MIDW8080_MW8080BW_A_H +#define MAME_MIDW8080_MW8080BW_A_H #pragma once @@ -360,4 +360,4 @@ DECLARE_DEVICE_TYPE(INVAD2CT_AUDIO, invad2ct_audio_device) DECLARE_DEVICE_TYPE(ZZZAP_AUDIO, zzzap_audio_device) DECLARE_DEVICE_TYPE(LAGUNAR_AUDIO, lagunar_audio_device) -#endif // MAME_MIDW8080_MW8080BW_H +#endif // MAME_MIDW8080_MW8080BW_A_H diff --git a/src/mame/midway/astrocde.h b/src/mame/midway/astrocde.h index 587e505e211..b9f4a0f0875 100644 --- a/src/mame/midway/astrocde.h +++ b/src/mame/midway/astrocde.h @@ -5,8 +5,8 @@ Bally Astrocade-based hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_ASTROCDE_H -#define MAME_INCLUDES_ASTROCDE_H +#ifndef MAME_MIDWAY_ASTROCDE_H +#define MAME_MIDWAY_ASTROCDE_H #pragma once @@ -269,4 +269,4 @@ private: output_finder<19> m_lamps; }; -#endif // MAME_INCLUDES_ASTROCDE_H +#endif // MAME_MIDWAY_ASTROCDE_H diff --git a/src/mame/midway/balsente.h b/src/mame/midway/balsente.h index 4831bb0a196..53dd691c8da 100644 --- a/src/mame/midway/balsente.h +++ b/src/mame/midway/balsente.h @@ -7,8 +7,8 @@ driver by Aaron Giles ***************************************************************************/ -#ifndef MAME_INCLUDES_BALSENTE_H -#define MAME_INCLUDES_BALSENTE_H +#ifndef MAME_MIDWAY_BALSENTE_H +#define MAME_MIDWAY_BALSENTE_H #pragma once @@ -209,4 +209,4 @@ private: required_memory_bank m_bankef; }; -#endif // MAME_INCLUDES_BALSENTE_H +#endif // MAME_MIDWAY_BALSENTE_H diff --git a/src/mame/midway/gridlee.h b/src/mame/midway/gridlee.h index 7467067d7b6..4f24e5c5583 100644 --- a/src/mame/midway/gridlee.h +++ b/src/mame/midway/gridlee.h @@ -7,8 +7,8 @@ driver by Aaron Giles ***************************************************************************/ -#ifndef MAME_INCLUDES_GRIDLEE_H -#define MAME_INCLUDES_GRIDLEE_H +#ifndef MAME_MIDWAY_GRIDLEE_H +#define MAME_MIDWAY_GRIDLEE_H #pragma once @@ -121,4 +121,4 @@ private: DECLARE_DEVICE_TYPE(GRIDLEE, gridlee_sound_device) -#endif // MAME_INCLUDES_GRIDLEE_H +#endif // MAME_MIDWAY_GRIDLEE_H diff --git a/src/mame/midway/mcr3.h b/src/mame/midway/mcr3.h index 1e986b729fc..50080df6ae1 100644 --- a/src/mame/midway/mcr3.h +++ b/src/mame/midway/mcr3.h @@ -5,8 +5,8 @@ Midway MCR-3 system **************************************************************************/ -#ifndef MAME_INCLUDES_MCR3_H -#define MAME_INCLUDES_MCR3_H +#ifndef MAME_MIDWAY_MCR3_H +#define MAME_MIDWAY_MCR3_H #pragma once @@ -149,4 +149,4 @@ private: required_ioport_array<2> m_analog_inputs; }; -#endif // MAME_INCLUDES_MCR3_H +#endif // MAME_MIDWAY_MCR3_H diff --git a/src/mame/midway/midyunit.h b/src/mame/midway/midyunit.h index 4bc3f59a72f..e4709779d6d 100644 --- a/src/mame/midway/midyunit.h +++ b/src/mame/midway/midyunit.h @@ -6,8 +6,8 @@ Williams/Midway Y/Z-unit system **************************************************************************/ -#ifndef MAME_INCLUDES_MIDYUNIT_H -#define MAME_INCLUDES_MIDYUNIT_H +#ifndef MAME_MIDWAY_MIDYUNIT_H +#define MAME_MIDWAY_MIDYUNIT_H #pragma once @@ -175,4 +175,4 @@ private: void term2_init_common(write16s_delegate hack_w); }; -#endif // MAME_INCLUDES_MIDYUNIT_H +#endif // MAME_MIDWAY_MIDYUNIT_H diff --git a/src/mame/midway/sspeedr.h b/src/mame/midway/sspeedr.h index 820c5d9942e..40e64612e0f 100644 --- a/src/mame/midway/sspeedr.h +++ b/src/mame/midway/sspeedr.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Stefan Jokisch -#ifndef MAME_INCLUDES_SSPEEDR_H -#define MAME_INCLUDES_SSPEEDR_H +#ifndef MAME_MIDWAY_SSPEEDR_H +#define MAME_MIDWAY_SSPEEDR_H #pragma once @@ -96,4 +96,4 @@ private: required_region_ptr m_track; }; -#endif // MAME_INCLUDES_SSPEEDR_H +#endif // MAME_MIDWAY_SSPEEDR_H diff --git a/src/mame/miltonbradley/vectrex.h b/src/mame/miltonbradley/vectrex.h index adf12def1f1..bd994740435 100644 --- a/src/mame/miltonbradley/vectrex.h +++ b/src/mame/miltonbradley/vectrex.h @@ -5,8 +5,8 @@ * includes/vectrex.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_VECTREX_H -#define MAME_INCLUDES_VECTREX_H +#ifndef MAME_MILTONBRADLEY_VECTREX_H +#define MAME_MILTONBRADLEY_VECTREX_H #pragma once @@ -189,4 +189,4 @@ private: required_ioport m_io_coin; }; -#endif // MAME_INCLUDES_VECTREX_H +#endif // MAME_MILTONBRADLEY_VECTREX_H diff --git a/src/mame/misc/3do.h b/src/mame/misc/3do.h index 71dfef24f7d..c255e0a7703 100644 --- a/src/mame/misc/3do.h +++ b/src/mame/misc/3do.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_3DO_H -#define MAME_INCLUDES_3DO_H +#ifndef MAME_MISC_3DO_H +#define MAME_MISC_3DO_H #include "machine/nvram.h" #include "machine/timer.h" @@ -198,4 +198,4 @@ private: }; -#endif // MAME_INCLUDES_3DO_H +#endif // MAME_MISC_3DO_H diff --git a/src/mame/misc/ampoker2.h b/src/mame/misc/ampoker2.h index 0e143c8d2f4..3377b575294 100644 --- a/src/mame/misc/ampoker2.h +++ b/src/mame/misc/ampoker2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Roberto Fresca, Grull Osgo -#ifndef MAME_INCLUDES_AMPOKER2_H -#define MAME_INCLUDES_AMPOKER2_H +#ifndef MAME_MISC_AMPOKER2_H +#define MAME_MISC_AMPOKER2_H #pragma once @@ -58,4 +58,4 @@ private: output_finder<10> m_lamps; }; -#endif // MAME_INCLUDES_AMPOKER2_H +#endif // MAME_MISC_AMPOKER2_H diff --git a/src/mame/misc/calomega.h b/src/mame/misc/calomega.h index 62eae3a9657..05bad596fdc 100644 --- a/src/mame/misc/calomega.h +++ b/src/mame/misc/calomega.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders: Roberto Fresca, Grull Osgo -#ifndef MAME_INCLUDES_CALOMEGA_H -#define MAME_INCLUDES_CALOMEGA_H +#ifndef MAME_MISC_CALOMEGA_H +#define MAME_MISC_CALOMEGA_H #pragma once @@ -161,4 +161,4 @@ private: tilemap_t *m_bg_tilemap = nullptr; }; -#endif // MAME_INCLUDES_CALOMEGA_H +#endif // MAME_MISC_CALOMEGA_H diff --git a/src/mame/misc/coolpool.h b/src/mame/misc/coolpool.h index b8003b0ecb9..ee1401a6b13 100644 --- a/src/mame/misc/coolpool.h +++ b/src/mame/misc/coolpool.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles,Nicola Salmoria -#ifndef MAME_INCLUDES_COOLPOOL_H -#define MAME_INCLUDES_COOLPOOL_H +#ifndef MAME_MISC_COOLPOOL_H +#define MAME_MISC_COOLPOOL_H #pragma once @@ -107,4 +107,4 @@ private: void nballsht_map(address_map &map); }; -#endif // MAME_INCLUDES_COOLPOOL_H +#endif // MAME_MISC_COOLPOOL_H diff --git a/src/mame/misc/dcheese.h b/src/mame/misc/dcheese.h index a8554ebc2ce..ca3140c31dc 100644 --- a/src/mame/misc/dcheese.h +++ b/src/mame/misc/dcheese.h @@ -6,8 +6,8 @@ HAR MadMax hardware **************************************************************************/ -#ifndef MAME_INCLUDES_DCHEESE_H -#define MAME_INCLUDES_DCHEESE_H +#ifndef MAME_MISC_DCHEESE_H +#define MAME_MISC_DCHEESE_H #pragma once @@ -95,4 +95,4 @@ private: void sound_cpu_map(address_map &map); }; -#endif // MAME_INCLUDES_DCHEESE_H +#endif // MAME_MISC_DCHEESE_H diff --git a/src/mame/misc/efdt.h b/src/mame/misc/efdt.h index 77c948cedc8..8d460d39f0d 100644 --- a/src/mame/misc/efdt.h +++ b/src/mame/misc/efdt.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders: ElSemi, Roberto Fresca. -#ifndef MAME_INCLUDES_EFDT_H -#define MAME_INCLUDES_EFDT_H +#ifndef MAME_MISC_EFDT_H +#define MAME_MISC_EFDT_H #pragma once @@ -75,4 +75,4 @@ private: void efdt_snd_map(address_map &map); }; -#endif // MAME_INCLUDES_EFDT_H +#endif // MAME_MISC_EFDT_H diff --git a/src/mame/misc/esripsys.h b/src/mame/misc/esripsys.h index 844bd2ec229..8b5bfef387e 100644 --- a/src/mame/misc/esripsys.h +++ b/src/mame/misc/esripsys.h @@ -6,8 +6,8 @@ *************************************************************************/ -#ifndef MAME_INCLUDES_ESRIPSYS_H -#define MAME_INCLUDES_ESRIPSYS_H +#ifndef MAME_MISC_ESRIPSYS_H +#define MAME_MISC_ESRIPSYS_H #pragma once @@ -141,4 +141,4 @@ private: void video_cpu_map(address_map &map); }; -#endif // MAME_INCLUDES_ESRIPSYS_H +#endif // MAME_MISC_ESRIPSYS_H diff --git a/src/mame/misc/flower_a.h b/src/mame/misc/flower_a.h index 7ea953746da..86f06e3289d 100644 --- a/src/mame/misc/flower_a.h +++ b/src/mame/misc/flower_a.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MISC_FLOWER_H -#define MAME_MISC_FLOWER_H +#ifndef MAME_MISC_FLOWER_A_H +#define MAME_MISC_FLOWER_A_H #pragma once @@ -91,4 +91,4 @@ private: DECLARE_DEVICE_TYPE(FLOWER_CUSTOM, flower_sound_device) -#endif // MAME_MISC_FLOWER_H +#endif // MAME_MISC_FLOWER_A_H diff --git a/src/mame/misc/homedata.h b/src/mame/misc/homedata.h index c8625c86b86..e6633dca1cf 100644 --- a/src/mame/misc/homedata.h +++ b/src/mame/misc/homedata.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, Nicola Salmoria -#ifndef MAME_INCLUDES_HOMEDATA_H -#define MAME_INCLUDES_HOMEDATA_H +#ifndef MAME_MISC_HOMEDATA_H +#define MAME_MISC_HOMEDATA_H #pragma once @@ -190,4 +190,4 @@ private: void reikaids_upd7807_map(address_map &map); }; -#endif // MAME_INCLUDES_HOMEDATA_H +#endif // MAME_MISC_HOMEDATA_H diff --git a/src/mame/misc/kyugo.h b/src/mame/misc/kyugo.h index 50437f39654..5dcdbe02aae 100644 --- a/src/mame/misc/kyugo.h +++ b/src/mame/misc/kyugo.h @@ -5,8 +5,8 @@ Kyugo hardware games ***************************************************************************/ -#ifndef MAME_INCLUDES_KYUGO_H -#define MAME_INCLUDES_KYUGO_H +#ifndef MAME_MISC_KYUGO_H +#define MAME_MISC_KYUGO_H #pragma once @@ -100,4 +100,4 @@ private: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif // MAME_INCLUDES_KYUGO_H +#endif // MAME_MISC_KYUGO_H diff --git a/src/mame/misc/ladyfrog.h b/src/mame/misc/ladyfrog.h index a069c99a856..3fa6785b1b1 100644 --- a/src/mame/misc/ladyfrog.h +++ b/src/mame/misc/ladyfrog.h @@ -5,8 +5,8 @@ Lady Frog *************************************************************************/ -#ifndef MAME_INCLUDES_LADYFROG_H -#define MAME_INCLUDES_LADYFROG_H +#ifndef MAME_MISC_LADYFROG_H +#define MAME_MISC_LADYFROG_H #pragma once @@ -94,4 +94,4 @@ private: void ladyfrog_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_LADYFROG_H +#endif // MAME_MISC_LADYFROG_H diff --git a/src/mame/misc/malzak.h b/src/mame/misc/malzak.h index 378e2129869..08b61aa232e 100644 --- a/src/mame/misc/malzak.h +++ b/src/mame/misc/malzak.h @@ -5,8 +5,8 @@ Malzak *************************************************************************/ -#ifndef MAME_INCLUDES_MALZAK_H -#define MAME_INCLUDES_MALZAK_H +#ifndef MAME_MISC_MALZAK_H +#define MAME_MISC_MALZAK_H #pragma once @@ -80,4 +80,4 @@ private: u8 m_playfield_bank = 0; }; -#endif // MAME_INCLUDES_MALZAK_H +#endif // MAME_MISC_MALZAK_H diff --git a/src/mame/misc/micro3d.h b/src/mame/misc/micro3d.h index 1ef5029bd54..eb3d005069b 100644 --- a/src/mame/misc/micro3d.h +++ b/src/mame/misc/micro3d.h @@ -5,8 +5,8 @@ Microprose Games 3D hardware *************************************************************************/ -#ifndef MAME_INCLUDES_MICRO3D_H -#define MAME_INCLUDES_MICRO3D_H +#ifndef MAME_MISC_MICRO3D_H +#define MAME_MISC_MICRO3D_H #pragma once @@ -206,4 +206,4 @@ private: required_device m_vgb_uart; }; -#endif // MAME_INCLUDES_MICRO3D_H +#endif // MAME_MISC_MICRO3D_H diff --git a/src/mame/misc/micro3d_a.h b/src/mame/misc/micro3d_a.h index 3b6852d541a..22a165393fa 100644 --- a/src/mame/misc/micro3d_a.h +++ b/src/mame/misc/micro3d_a.h @@ -5,8 +5,8 @@ Microprose Games 3D hardware *************************************************************************/ -#ifndef MAME_MISC_MICRO3D_H -#define MAME_MISC_MICRO3D_H +#ifndef MAME_MISC_MICRO3D_A_H +#define MAME_MISC_MICRO3D_A_H #pragma once @@ -75,4 +75,4 @@ private: DECLARE_DEVICE_TYPE(MICRO3D_SOUND, micro3d_sound_device) -#endif // MAME_MISC_MICRO3D_H +#endif // MAME_MISC_MICRO3D_A_H diff --git a/src/mame/misc/norautp.h b/src/mame/misc/norautp.h index 05759f970b8..bee30391634 100644 --- a/src/mame/misc/norautp.h +++ b/src/mame/misc/norautp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese, Roberto Fresca -#ifndef MAME_INCLUDES_NORAUTP_H -#define MAME_INCLUDES_NORAUTP_H +#ifndef MAME_MISC_NORAUTP_H +#define MAME_MISC_NORAUTP_H #pragma once @@ -97,4 +97,4 @@ DISCRETE_SOUND_EXTERN( norautp_discrete ); DISCRETE_SOUND_EXTERN( dphl_discrete ); DISCRETE_SOUND_EXTERN( kimble_discrete ); -#endif // MAME_INCLUDES_NORAUTP_H +#endif // MAME_MISC_NORAUTP_H diff --git a/src/mame/misc/shangkid.h b/src/mame/misc/shangkid.h index 2445b7dc05b..05b26a71b67 100644 --- a/src/mame/misc/shangkid.h +++ b/src/mame/misc/shangkid.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino -#ifndef MAME_INCLUDES_SHANGKID_H -#define MAME_INCLUDES_SHANGKID_H +#ifndef MAME_MISC_SHANGKID_H +#define MAME_MISC_SHANGKID_H #pragma once @@ -127,4 +127,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_SHANGKID_H +#endif // MAME_MISC_SHANGKID_H diff --git a/src/mame/misc/truco.h b/src/mame/misc/truco.h index fb33edc525d..2996f259ce7 100644 --- a/src/mame/misc/truco.h +++ b/src/mame/misc/truco.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi, Roberto Fresca -#ifndef MAME_INCLUDES_TRUCO_H -#define MAME_INCLUDES_TRUCO_H +#ifndef MAME_MISC_TRUCO_H +#define MAME_MISC_TRUCO_H #pragma once @@ -54,4 +54,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_TRUCO_H +#endif // MAME_MISC_TRUCO_H diff --git a/src/mame/misc/trucocl.h b/src/mame/misc/trucocl.h index 0d7e948836f..51373748633 100644 --- a/src/mame/misc/trucocl.h +++ b/src/mame/misc/trucocl.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi -#ifndef MAME_INCLUDES_TRUCOCL_H -#define MAME_INCLUDES_TRUCOCL_H +#ifndef MAME_MISC_TRUCOCL_H +#define MAME_MISC_TRUCOCL_H #pragma once @@ -58,4 +58,4 @@ private: required_device m_gfxdecode; }; -#endif // MAME_INCLUDES_TRUCOCL_H +#endif // MAME_MISC_TRUCOCL_H diff --git a/src/mame/morrow/mpz80.h b/src/mame/morrow/mpz80.h index af11aebc9a0..5e6c616c458 100644 --- a/src/mame/morrow/mpz80.h +++ b/src/mame/morrow/mpz80.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_MPZ80_H -#define MAME_INCLUDES_MPZ80_H +#ifndef MAME_MORROW_MPZ80_H +#define MAME_MORROW_MPZ80_H #pragma once @@ -100,4 +100,4 @@ private: void mpz80_mem(address_map &map); }; -#endif // MAME_INCLUDES_MPZ80_H +#endif // MAME_MORROW_MPZ80_H diff --git a/src/mame/multitech/mpf1.h b/src/mame/multitech/mpf1.h index 0382ae8c20f..72e6cfea8e6 100644 --- a/src/mame/multitech/mpf1.h +++ b/src/mame/multitech/mpf1.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol, Curt Coder -#ifndef MAME_INCLUDES_MPF1_H -#define MAME_INCLUDES_MPF1_H +#ifndef MAME_MULTITECH_MPF1_H +#define MAME_MULTITECH_MPF1_H #pragma once @@ -85,4 +85,4 @@ private: void mpf1p_map(address_map &map); }; -#endif // MAME_INCLUDES_MPF1_H +#endif // MAME_MULTITECH_MPF1_H diff --git a/src/mame/namco/20pacgal.h b/src/mame/namco/20pacgal.h index 77c74f6948f..20df9be76e3 100644 --- a/src/mame/namco/20pacgal.h +++ b/src/mame/namco/20pacgal.h @@ -7,8 +7,8 @@ driver by Nicola Salmoria ***************************************************************************/ -#ifndef MAME_INCLUDES_20PACGAL_H -#define MAME_INCLUDES_20PACGAL_H +#ifndef MAME_NAMCO_20PACGAL_H +#define MAME_NAMCO_20PACGAL_H #pragma once @@ -122,4 +122,4 @@ private: void _25pacman_map(address_map &map); }; -#endif // MAME_INCLUDES_20PACGAL_H +#endif // MAME_NAMCO_20PACGAL_H diff --git a/src/mame/namco/bosco.h b/src/mame/namco/bosco.h index 5ec8e0d5685..d83e94b8026 100644 --- a/src/mame/namco/bosco.h +++ b/src/mame/namco/bosco.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_BOSCO_H -#define MAME_INCLUDES_BOSCO_H +#ifndef MAME_NAMCO_BOSCO_H +#define MAME_NAMCO_BOSCO_H #pragma once @@ -54,4 +54,4 @@ private: void bosco_map(address_map &map); }; -#endif // MAME_INCLUDES_BOSCO_H +#endif // MAME_NAMCO_BOSCO_H diff --git a/src/mame/namco/digdug.h b/src/mame/namco/digdug.h index 24bb1d880d0..35ec019f8a9 100644 --- a/src/mame/namco/digdug.h +++ b/src/mame/namco/digdug.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_DIGDUG_H -#define MAME_INCLUDES_DIGDUG_H +#ifndef MAME_NAMCO_DIGDUG_H +#define MAME_NAMCO_DIGDUG_H #pragma once @@ -55,4 +55,4 @@ private: void digdug_map(address_map &map); }; -#endif // MAME_INCLUDES_DIGDUG_H +#endif // MAME_NAMCO_DIGDUG_H diff --git a/src/mame/namco/galaga.h b/src/mame/namco/galaga.h index 52fda94e5df..3a613b6bb33 100644 --- a/src/mame/namco/galaga.h +++ b/src/mame/namco/galaga.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_GALAGA_H -#define MAME_INCLUDES_GALAGA_H +#ifndef MAME_NAMCO_GALAGA_H +#define MAME_NAMCO_GALAGA_H #pragma once @@ -107,4 +107,4 @@ protected: DISCRETE_SOUND_EXTERN( galaga_discrete ); DISCRETE_SOUND_EXTERN( bosco_discrete ); -#endif // MAME_INCLUDES_GALAGA_H +#endif // MAME_NAMCO_GALAGA_H diff --git a/src/mame/namco/gaplus.h b/src/mame/namco/gaplus.h index bc4b62ec20e..699011693e2 100644 --- a/src/mame/namco/gaplus.h +++ b/src/mame/namco/gaplus.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Manuel Abadia, Ernesto Corvi, Nicola Salmoria -#ifndef MAME_INCLUDES_GAPLUS_H -#define MAME_INCLUDES_GAPLUS_H +#ifndef MAME_NAMCO_GAPLUS_H +#define MAME_NAMCO_GAPLUS_H #pragma once @@ -153,4 +153,4 @@ protected: output_finder<2> m_lamps; }; -#endif // MAME_INCLUDES_GAPLUS_H +#endif // MAME_NAMCO_GAPLUS_H diff --git a/src/mame/namco/mappy.h b/src/mame/namco/mappy.h index 1b4dfeb278a..f725431195a 100644 --- a/src/mame/namco/mappy.h +++ b/src/mame/namco/mappy.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_MAPPY_H -#define MAME_INCLUDES_MAPPY_H +#ifndef MAME_NAMCO_MAPPY_H +#define MAME_NAMCO_MAPPY_H #pragma once @@ -109,4 +109,4 @@ private: void superpac_cpu2_map(address_map &map); }; -#endif // MAME_INCLUDES_MAPPY_H +#endif // MAME_NAMCO_MAPPY_H diff --git a/src/mame/namco/namcona1.h b/src/mame/namco/namcona1.h index 769677c2d74..2a976cbb33d 100644 --- a/src/mame/namco/namcona1.h +++ b/src/mame/namco/namcona1.h @@ -5,8 +5,8 @@ Namco NA-1 System hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_NAMCONA1_H -#define MAME_INCLUDES_NAMCONA1_H +#ifndef MAME_NAMCO_NAMCONA1_H +#define MAME_NAMCO_NAMCONA1_H #pragma once @@ -220,4 +220,4 @@ private: void xday2_main_map(address_map &map); }; -#endif // MAME_INCLUDES_NAMCONA1_H +#endif // MAME_NAMCO_NAMCONA1_H diff --git a/src/mame/namco/namconb1.h b/src/mame/namco/namconb1.h index 9aa88395100..9d8e4b38d75 100644 --- a/src/mame/namco/namconb1.h +++ b/src/mame/namco/namconb1.h @@ -5,8 +5,8 @@ Namco System NB-1 hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_NAMCONB1_H -#define MAME_INCLUDES_NAMCONB1_H +#ifndef MAME_NAMCO_NAMCONB1_H +#define MAME_NAMCO_NAMCONB1_H #pragma once @@ -160,4 +160,4 @@ private: void namconb2_am(address_map &map); }; -#endif // MAME_INCLUDES_NAMCONB1_H +#endif // MAME_NAMCO_NAMCONB1_H diff --git a/src/mame/namco/namcos1.h b/src/mame/namco/namcos1.h index 1823ee97e48..1cb504081ef 100644 --- a/src/mame/namco/namcos1.h +++ b/src/mame/namco/namcos1.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi -#ifndef MAME_INCLUDES_NAMCOS1_H -#define MAME_INCLUDES_NAMCOS1_H +#ifndef MAME_NAMCO_NAMCOS1_H +#define MAME_NAMCO_NAMCOS1_H #pragma once @@ -156,4 +156,4 @@ private: void virtual_map(address_map &map); }; -#endif // MAME_INCLUDES_NAMCOS1_H +#endif // MAME_NAMCO_NAMCOS1_H diff --git a/src/mame/namco/namcos2.h b/src/mame/namco/namcos2.h index 76d5c165da7..b60a2f0bd78 100644 --- a/src/mame/namco/namcos2.h +++ b/src/mame/namco/namcos2.h @@ -7,8 +7,8 @@ Common functions & declarations for the Namco System 2 driver ***************************************************************************/ -#ifndef MAME_INCLUDES_NAMCOS2_H -#define MAME_INCLUDES_NAMCOS2_H +#ifndef MAME_NAMCO_NAMCOS2_H +#define MAME_NAMCO_NAMCOS2_H #pragma once @@ -311,4 +311,4 @@ private: #define NAMCOS2_C148_SERIRQ 6 /* 0x1cc000 */ #define NAMCOS2_C148_VBLANKIRQ 7 /* 0x1ce000 */ -#endif // MAME_INCLUDES_NAMCOS2_H +#endif // MAME_NAMCO_NAMCOS2_H diff --git a/src/mame/namco/namcos22.h b/src/mame/namco/namcos22.h index 55c92e3233f..e1c09146dde 100644 --- a/src/mame/namco/namcos22.h +++ b/src/mame/namco/namcos22.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_NAMCOS22_H -#define MAME_INCLUDES_NAMCOS22_H +#ifndef MAME_NAMCO_NAMCOS22_H +#define MAME_NAMCO_NAMCOS22_H #pragma once @@ -680,4 +680,4 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(trackball_interrupt); }; -#endif // MAME_INCLUDES_NAMCOS22_H +#endif // MAME_NAMCO_NAMCOS22_H diff --git a/src/mame/namco/namcos86.h b/src/mame/namco/namcos86.h index 8d8883e47be..79bf443bc4b 100644 --- a/src/mame/namco/namcos86.h +++ b/src/mame/namco/namcos86.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_NAMCOS86_H -#define MAME_INCLUDES_NAMCOS86_H +#ifndef MAME_NAMCO_NAMCOS86_H +#define MAME_NAMCO_NAMCOS86_H #pragma once @@ -120,4 +120,4 @@ private: void set_scroll(int layer); }; -#endif // MAME_INCLUDES_NAMCOS86_H +#endif // MAME_NAMCO_NAMCOS86_H diff --git a/src/mame/namco/polepos.h b/src/mame/namco/polepos.h index 4b48373c878..1216a1b22d6 100644 --- a/src/mame/namco/polepos.h +++ b/src/mame/namco/polepos.h @@ -5,8 +5,8 @@ Pole Position hardware *************************************************************************/ -#ifndef MAME_INCLUDES_POLEPOS_H -#define MAME_INCLUDES_POLEPOS_H +#ifndef MAME_NAMCO_POLEPOS_H +#define MAME_NAMCO_POLEPOS_H #pragma once @@ -134,4 +134,4 @@ private: void z80_map(address_map &map); }; -#endif // MAME_INCLUDES_POLEPOS_H +#endif // MAME_NAMCO_POLEPOS_H diff --git a/src/mame/namco/polepos_a.h b/src/mame/namco/polepos_a.h index be325ecab88..657e1e7b05c 100644 --- a/src/mame/namco/polepos_a.h +++ b/src/mame/namco/polepos_a.h @@ -1,5 +1,5 @@ -#ifndef MAME_NAMCO_POLEPOS_H -#define MAME_NAMCO_POLEPOS_H +#ifndef MAME_NAMCO_POLEPOS_A_H +#define MAME_NAMCO_POLEPOS_A_H #pragma once @@ -54,4 +54,4 @@ DECLARE_DEVICE_TYPE(POLEPOS_SOUND, polepos_sound_device) DISCRETE_SOUND_EXTERN( polepos_discrete ); -#endif // MAME_NAMCO_POLEPOS_H +#endif // MAME_NAMCO_POLEPOS_A_H diff --git a/src/mame/namco/tceptor.h b/src/mame/namco/tceptor.h index be92101f328..2b95e96684f 100644 --- a/src/mame/namco/tceptor.h +++ b/src/mame/namco/tceptor.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:BUT -#ifndef MAME_INCLUDES_TCEPTOR_H -#define MAME_INCLUDES_TCEPTOR_H +#ifndef MAME_NAMCO_TCEPTOR_H +#define MAME_NAMCO_TCEPTOR_H #pragma once @@ -124,4 +124,4 @@ private: void mcu_map(address_map &map); }; -#endif // MAME_INCLUDES_TCEPTOR_H +#endif // MAME_NAMCO_TCEPTOR_H diff --git a/src/mame/namco/turrett.h b/src/mame/namco/turrett.h index cd3ef6b3968..d8e4188c7e3 100644 --- a/src/mame/namco/turrett.h +++ b/src/mame/namco/turrett.h @@ -5,8 +5,8 @@ Turret Tower hardware ****************************************************************************/ -#ifndef MAME_INCLUDES_TURRETT_H -#define MAME_INCLUDES_TURRETT_H +#ifndef MAME_NAMCO_TURRETT_H +#define MAME_NAMCO_TURRETT_H #pragma once @@ -145,4 +145,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TURRETT, turrett_device) -#endif // MAME_INCLUDES_TURRETT_H +#endif // MAME_NAMCO_TURRETT_H diff --git a/src/mame/namco/warpwarp.h b/src/mame/namco/warpwarp.h index 00e9835363e..3de5f129c43 100644 --- a/src/mame/namco/warpwarp.h +++ b/src/mame/namco/warpwarp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Chris Hardy -#ifndef MAME_INCLUDES_WARPWARP_H -#define MAME_INCLUDES_WARPWARP_H +#ifndef MAME_NAMCO_WARPWARP_H +#define MAME_NAMCO_WARPWARP_H #pragma once @@ -126,4 +126,4 @@ private: void warpwarp_map(address_map &map); }; -#endif // MAME_INCLUDES_WARPWARP_H +#endif // MAME_NAMCO_WARPWARP_H diff --git a/src/mame/namco/warpwarp_a.h b/src/mame/namco/warpwarp_a.h index 3cb11c762eb..aefcfb3b8bf 100644 --- a/src/mame/namco/warpwarp_a.h +++ b/src/mame/namco/warpwarp_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Allard van der Bas -#ifndef MAME_NAMCO_WARPWARP_H -#define MAME_NAMCO_WARPWARP_H +#ifndef MAME_NAMCO_WARPWARP_A_H +#define MAME_NAMCO_WARPWARP_A_H #pragma once @@ -50,4 +50,4 @@ private: DECLARE_DEVICE_TYPE(WARPWARP_SOUND, warpwarp_sound_device) -#endif // MAME_NAMCO_WARPWARP_H +#endif // MAME_NAMCO_WARPWARP_A_H diff --git a/src/mame/namco/xevious.h b/src/mame/namco/xevious.h index 5f3110e634b..b9e773f6935 100644 --- a/src/mame/namco/xevious.h +++ b/src/mame/namco/xevious.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_XEVIOUS -#define MAME_INCLUDES_XEVIOUS +#ifndef MAME_NAMCO_XEVIOUS +#define MAME_NAMCO_XEVIOUS #pragma once @@ -106,4 +106,4 @@ private: char m_sound_played = 0; }; -#endif // MAME_INCLUDES_XEVIOUS +#endif // MAME_NAMCO_XEVIOUS diff --git a/src/mame/ncd/bert_m.h b/src/mame/ncd/bert_m.h index e913bb45e8c..92acc4d7bc0 100644 --- a/src/mame/ncd/bert_m.h +++ b/src/mame/ncd/bert_m.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Patrick Mackinlay -#ifndef MAME_NCD_BERT_H -#define MAME_NCD_BERT_H +#ifndef MAME_NCD_BERT_M_H +#define MAME_NCD_BERT_M_H #pragma once @@ -37,4 +37,4 @@ private: DECLARE_DEVICE_TYPE(BERT, bert_device) -#endif // MAME_NCD_BERT_H +#endif // MAME_NCD_BERT_M_H diff --git a/src/mame/nec/bungo.h b/src/mame/nec/bungo.h index 34019980194..2f15d145ce2 100644 --- a/src/mame/nec/bungo.h +++ b/src/mame/nec/bungo.h @@ -6,8 +6,8 @@ * ***********************************************/ -#ifndef MAME_INCLUDES_BUNGO_H -#define MAME_INCLUDES_BUNGO_H +#ifndef MAME_NEC_BUNGO_H +#define MAME_NEC_BUNGO_H #pragma once @@ -42,4 +42,4 @@ private: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); }; -#endif // MAME_INCLUDES_BUNGO_H +#endif // MAME_NEC_BUNGO_H diff --git a/src/mame/nec/pc8401a.h b/src/mame/nec/pc8401a.h index 11f86766cfd..0834733684e 100644 --- a/src/mame/nec/pc8401a.h +++ b/src/mame/nec/pc8401a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_PC8401A_H -#define MAME_INCLUDES_PC8401A_H +#ifndef MAME_NEC_PC8401A_H +#define MAME_NEC_PC8401A_H #pragma once @@ -124,4 +124,4 @@ private: uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif // MAME_INCLUDES_PC8401A_H +#endif // MAME_NEC_PC8401A_H diff --git a/src/mame/nec/pc9801.h b/src/mame/nec/pc9801.h index a53d6d8a41b..578fb956238 100644 --- a/src/mame/nec/pc9801.h +++ b/src/mame/nec/pc9801.h @@ -6,8 +6,8 @@ * ******************************************/ -#ifndef MAME_INCLUDES_PC9801_H -#define MAME_INCLUDES_PC9801_H +#ifndef MAME_NEC_PC9801_H +#define MAME_NEC_PC9801_H #pragma once @@ -547,4 +547,4 @@ private: void gdc_31kHz_w(offs_t offset, u8 data); }; -#endif // MAME_INCLUDES_PC9801_H +#endif // MAME_NEC_PC9801_H diff --git a/src/mame/nec/pc9801_epson.h b/src/mame/nec/pc9801_epson.h index 5c7e168cc03..4a352de177d 100644 --- a/src/mame/nec/pc9801_epson.h +++ b/src/mame/nec/pc9801_epson.h @@ -6,8 +6,8 @@ * ******************************************/ -#ifndef MAME_INCLUDES_PC9801_EPSON_H -#define MAME_INCLUDES_PC9801_EPSON_H +#ifndef MAME_NEC_PC9801_EPSON_H +#define MAME_NEC_PC9801_EPSON_H #pragma once @@ -62,4 +62,4 @@ private: // u8 m_itf_bank; }; -#endif // MAME_INCLUDES_PC9801_EPSON_H +#endif // MAME_NEC_PC9801_EPSON_H diff --git a/src/mame/nec/pc9821.h b/src/mame/nec/pc9821.h index 758e5467ac8..ebf0e8f7445 100644 --- a/src/mame/nec/pc9821.h +++ b/src/mame/nec/pc9821.h @@ -6,8 +6,8 @@ * ******************************************/ -#ifndef MAME_INCLUDES_PC9821_H -#define MAME_INCLUDES_PC9821_H +#ifndef MAME_NEC_PC9821_H +#define MAME_NEC_PC9821_H #pragma once @@ -194,4 +194,4 @@ public: }; -#endif // MAME_INCLUDES_PC9821_H +#endif // MAME_NEC_PC9821_H diff --git a/src/mame/nec/pc98ha.h b/src/mame/nec/pc98ha.h index 607ee623b39..a0cc016dbb2 100644 --- a/src/mame/nec/pc98ha.h +++ b/src/mame/nec/pc98ha.h @@ -6,8 +6,8 @@ * ******************************************/ -#ifndef MAME_INCLUDES_PC98HA_H -#define MAME_INCLUDES_PC98HA_H +#ifndef MAME_NEC_PC98HA_H +#define MAME_NEC_PC98HA_H #pragma once @@ -101,4 +101,4 @@ private: u8 m_ext_view_sel = 0; }; -#endif // MAME_INCLUDES_PC98HA_H +#endif // MAME_NEC_PC98HA_H diff --git a/src/mame/nec/pce.h b/src/mame/nec/pce.h index e4ccdd8dde3..a4d5374b0de 100644 --- a/src/mame/nec/pce.h +++ b/src/mame/nec/pce.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PCE_H -#define MAME_INCLUDES_PCE_H +#ifndef MAME_NEC_PCE_H +#define MAME_NEC_PCE_H #include "pce_cd.h" @@ -85,4 +85,4 @@ private: void sgx_mem(address_map &map); }; -#endif // MAME_INCLUDES_PCE_H +#endif // MAME_NEC_PCE_H diff --git a/src/mame/neogeo/neogeo.h b/src/mame/neogeo/neogeo.h index 4c386ad6254..a0bd8cc1cfe 100644 --- a/src/mame/neogeo/neogeo.h +++ b/src/mame/neogeo/neogeo.h @@ -6,8 +6,8 @@ Neo-Geo hardware *************************************************************************/ -#ifndef MAME_INCLUDES_NEOGEO_H -#define MAME_INCLUDES_NEOGEO_H +#ifndef MAME_NEOGEO_NEOGEO_H +#define MAME_NEOGEO_NEOGEO_H #pragma once @@ -280,4 +280,4 @@ private: INPUT_PORTS_EXTERN(neogeo); INPUT_PORTS_EXTERN(aes); -#endif // MAME_INCLUDES_NEOGEO_H +#endif // MAME_NEOGEO_NEOGEO_H diff --git a/src/mame/netronics/elf.h b/src/mame/netronics/elf.h index 6715acc18fc..bd166673963 100644 --- a/src/mame/netronics/elf.h +++ b/src/mame/netronics/elf.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_ELF_H -#define MAME_INCLUDES_ELF_H +#ifndef MAME_NETRONICS_ELF_H +#define MAME_NETRONICS_ELF_H #pragma once @@ -78,4 +78,4 @@ private: uint8_t m_data = 0; }; -#endif +#endif // MAME_NETRONICS_ELF_H diff --git a/src/mame/next/next.h b/src/mame/next/next.h index 87ca987a7a1..fc0162df2ed 100644 --- a/src/mame/next/next.h +++ b/src/mame/next/next.h @@ -2,8 +2,8 @@ // copyright-holders:Olivier Galibert #pragma once -#ifndef MAME_INCLUDES_NEXT_H -#define MAME_INCLUDES_NEXT_H +#ifndef MAME_NEXT_NEXT_H +#define MAME_NEXT_NEXT_H #include "cpu/m68000/m68030.h" #include "cpu/m68000/m68040.h" @@ -219,4 +219,4 @@ private: void dma_end(int slot); }; -#endif +#endif // MAME_NEXT_NEXT_H diff --git a/src/mame/nichibutsu/armedf.h b/src/mame/nichibutsu/armedf.h index 6f7cb1276e9..9f3265e4d0e 100644 --- a/src/mame/nichibutsu/armedf.h +++ b/src/mame/nichibutsu/armedf.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Phil Stroffolino, Carlos A. Lozano -#ifndef MAME_INCLUDES_ARMEDF_H -#define MAME_INCLUDES_ARMEDF_H +#ifndef MAME_NICHIBUTSU_ARMEDF_H +#define MAME_NICHIBUTSU_ARMEDF_H #pragma once @@ -191,4 +191,4 @@ private: void bigfghtr_mcu_map(address_map &map); }; -#endif // MAME_INCLUDES_ARMEDF_H +#endif // MAME_NICHIBUTSU_ARMEDF_H diff --git a/src/mame/nichibutsu/clshroad.h b/src/mame/nichibutsu/clshroad.h index fc66b87f1dc..37329e7621d 100644 --- a/src/mame/nichibutsu/clshroad.h +++ b/src/mame/nichibutsu/clshroad.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_CLSHROAD_H -#define MAME_INCLUDES_CLSHROAD_H +#ifndef MAME_NICHIBUTSU_CLSHROAD_H +#define MAME_NICHIBUTSU_CLSHROAD_H #pragma once @@ -81,4 +81,4 @@ private: void clshroad_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_CLSHROAD_H +#endif // MAME_NICHIBUTSU_CLSHROAD_H diff --git a/src/mame/nichibutsu/cop01.h b/src/mame/nichibutsu/cop01.h index f4a32f8a441..09b1ee202b6 100644 --- a/src/mame/nichibutsu/cop01.h +++ b/src/mame/nichibutsu/cop01.h @@ -5,8 +5,8 @@ Cop 01 *************************************************************************/ -#ifndef MAME_INCLUDES_COP01_H -#define MAME_INCLUDES_COP01_H +#ifndef MAME_NICHIBUTSU_COP01_H +#define MAME_NICHIBUTSU_COP01_H #pragma once @@ -93,4 +93,4 @@ private: required_device m_prot; }; -#endif // MAME_INCLUDES_COP01_H +#endif // MAME_NICHIBUTSU_COP01_H diff --git a/src/mame/nichibutsu/galivan.h b/src/mame/nichibutsu/galivan.h index cf9c964f9fb..8e14a503cd4 100644 --- a/src/mame/nichibutsu/galivan.h +++ b/src/mame/nichibutsu/galivan.h @@ -5,8 +5,8 @@ Galivan - Cosmo Police ***************************************************************************/ -#ifndef MAME_INCLUDES_GALIVAN_H -#define MAME_INCLUDES_GALIVAN_H +#ifndef MAME_NICHIBUTSU_GALIVAN_H +#define MAME_NICHIBUTSU_GALIVAN_H #pragma once @@ -131,4 +131,4 @@ private: void dangarj_io_map(address_map &map); }; -#endif // MAME_INCLUDES_GALIVAN_H +#endif // MAME_NICHIBUTSU_GALIVAN_H diff --git a/src/mame/nichibutsu/gomoku_a.h b/src/mame/nichibutsu/gomoku_a.h index 239c709d9e6..2236ea6ad75 100644 --- a/src/mame/nichibutsu/gomoku_a.h +++ b/src/mame/nichibutsu/gomoku_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi, David Haywood -#ifndef MAME_NICHIBUTSU_GOMOKU_H -#define MAME_NICHIBUTSU_GOMOKU_H +#ifndef MAME_NICHIBUTSU_GOMOKU_A_H +#define MAME_NICHIBUTSU_GOMOKU_A_H //************************************************************************** // TYPE DEFINITIONS @@ -60,4 +60,4 @@ private: DECLARE_DEVICE_TYPE(GOMOKU_SOUND, gomoku_sound_device) -#endif // MAME_NICHIBUTSU_GOMOKU_H +#endif // MAME_NICHIBUTSU_GOMOKU_A_H diff --git a/src/mame/nichibutsu/magmax.h b/src/mame/nichibutsu/magmax.h index 864ef6c7028..8c223bb39dd 100644 --- a/src/mame/nichibutsu/magmax.h +++ b/src/mame/nichibutsu/magmax.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#ifndef MAME_INCLUDES_MAGMAX_H -#define MAME_INCLUDES_MAGMAX_H +#ifndef MAME_NICHIBUTSU_MAGMAX_H +#define MAME_NICHIBUTSU_MAGMAX_H #pragma once @@ -82,4 +82,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MAGMAX_H +#endif // MAME_NICHIBUTSU_MAGMAX_H diff --git a/src/mame/nichibutsu/nbmj8688.h b/src/mame/nichibutsu/nbmj8688.h index 118637dcbdc..6e70eff389e 100644 --- a/src/mame/nichibutsu/nbmj8688.h +++ b/src/mame/nichibutsu/nbmj8688.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#ifndef MAME_INCLUDES_NBMJ8688_H -#define MAME_INCLUDES_NBMJ8688_H +#ifndef MAME_NICHIBUTSU_NBMJ8688_H +#define MAME_NICHIBUTSU_NBMJ8688_H #pragma once @@ -156,4 +156,4 @@ private: TIMER_CALLBACK_MEMBER(clear_busy_flag); }; -#endif // MAME_INCLUDES_NBMJ8688_H +#endif // MAME_NICHIBUTSU_NBMJ8688_H diff --git a/src/mame/nichibutsu/nbmj8900.h b/src/mame/nichibutsu/nbmj8900.h index cff9d241951..1f09eacd707 100644 --- a/src/mame/nichibutsu/nbmj8900.h +++ b/src/mame/nichibutsu/nbmj8900.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#ifndef MAME_INCLUDES_NBMJ8900_H -#define MAME_INCLUDES_NBMJ8900_H +#ifndef MAME_NICHIBUTSU_NBMJ8900_H +#define MAME_NICHIBUTSU_NBMJ8900_H #pragma once @@ -88,4 +88,4 @@ private: TIMER_CALLBACK_MEMBER(clear_busy_flag); }; -#endif // MAME_INCLUDES_NBMJ8900_H +#endif // MAME_NICHIBUTSU_NBMJ8900_H diff --git a/src/mame/nichibutsu/nbmj9195.h b/src/mame/nichibutsu/nbmj9195.h index 70428df1f74..a15e38f8daf 100644 --- a/src/mame/nichibutsu/nbmj9195.h +++ b/src/mame/nichibutsu/nbmj9195.h @@ -5,8 +5,8 @@ nbmj9195 - Nichibutsu Mahjong games for years 1991-1995 ******************************************************************************/ -#ifndef MAME_INCLUDES_NBMJ9195_H -#define MAME_INCLUDES_NBMJ9195_H +#ifndef MAME_NICHIBUTSU_NBMJ9195_H +#define MAME_NICHIBUTSU_NBMJ9195_H #pragma once @@ -191,4 +191,4 @@ private: void yosimoto_io_map(address_map &map); }; -#endif // MAME_INCLUDES_NBMJ9195_H +#endif // MAME_NICHIBUTSU_NBMJ9195_H diff --git a/src/mame/nichibutsu/pastelg.h b/src/mame/nichibutsu/pastelg.h index 45c2f96d201..11570eca6f1 100644 --- a/src/mame/nichibutsu/pastelg.h +++ b/src/mame/nichibutsu/pastelg.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi -#ifndef MAME_INCLUDES_PASTELG_H -#define MAME_INCLUDES_PASTELG_H +#ifndef MAME_NICHIBUTSU_PASTELG_H +#define MAME_NICHIBUTSU_PASTELG_H #pragma once @@ -111,4 +111,4 @@ private: void io_map(address_map &map); }; -#endif // MAME_INCLUDES_PASTELG_H +#endif // MAME_NICHIBUTSU_PASTELG_H diff --git a/src/mame/nichibutsu/seicross.h b/src/mame/nichibutsu/seicross.h index 9cb9a49bbc7..8c839b935f8 100644 --- a/src/mame/nichibutsu/seicross.h +++ b/src/mame/nichibutsu/seicross.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_SEICROSS_H -#define MAME_INCLUDES_SEICROSS_H +#ifndef MAME_NICHIBUTSU_SEICROSS_H +#define MAME_NICHIBUTSU_SEICROSS_H #pragma once @@ -83,4 +83,4 @@ private: void mcu_nvram_map(address_map &map); }; -#endif // MAME_INCLUDES_SEICROSS_H +#endif // MAME_NICHIBUTSU_SEICROSS_H diff --git a/src/mame/nichibutsu/terracre.h b/src/mame/nichibutsu/terracre.h index 04e2a27c01f..a2a0a850649 100644 --- a/src/mame/nichibutsu/terracre.h +++ b/src/mame/nichibutsu/terracre.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Carlos A. Lozano -#ifndef MAME_INCLUDES_TERRACRE_H -#define MAME_INCLUDES_TERRACRE_H +#ifndef MAME_NICHIBUTSU_TERRACRE_H +#define MAME_NICHIBUTSU_TERRACRE_H #pragma once @@ -102,4 +102,4 @@ private: required_device m_prot; }; -#endif // MAME_INCLUDES_TERRACRE_H +#endif // MAME_NICHIBUTSU_TERRACRE_H diff --git a/src/mame/nichibutsu/tubep.h b/src/mame/nichibutsu/tubep.h index 7135f9f13dd..a0f3235324e 100644 --- a/src/mame/nichibutsu/tubep.h +++ b/src/mame/nichibutsu/tubep.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski -#ifndef MAME_INCLUDES_TUBEP_H -#define MAME_INCLUDES_TUBEP_H +#ifndef MAME_NICHIBUTSU_TUBEP_H +#define MAME_NICHIBUTSU_TUBEP_H #pragma once @@ -166,4 +166,4 @@ private: bool m_msm5205_toggle = 0; }; -#endif // MAME_INCLUDES_TUBEP_H +#endif // MAME_NICHIBUTSU_TUBEP_H diff --git a/src/mame/nichibutsu/wiping_a.h b/src/mame/nichibutsu/wiping_a.h index ef95e672aff..4594aecf266 100644 --- a/src/mame/nichibutsu/wiping_a.h +++ b/src/mame/nichibutsu/wiping_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Allard van der Bas -#ifndef MAME_NICHIBUTSU_WIPING_H -#define MAME_NICHIBUTSU_WIPING_H +#ifndef MAME_NICHIBUTSU_WIPING_A_H +#define MAME_NICHIBUTSU_WIPING_A_H #pragma once @@ -57,4 +57,4 @@ private: DECLARE_DEVICE_TYPE(WIPING_CUSTOM, wiping_sound_device) -#endif // MAME_NICHIBUTSU_WIPING_H +#endif // MAME_NICHIBUTSU_WIPING_A_H diff --git a/src/mame/nintendo/dkong.h b/src/mame/nintendo/dkong.h index fac5b2582e7..914609fa46b 100644 --- a/src/mame/nintendo/dkong.h +++ b/src/mame/nintendo/dkong.h @@ -5,8 +5,8 @@ Nintendo Donkey Kong hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_DKONG_H -#define MAME_INCLUDES_DKONG_H +#ifndef MAME_NINTENDO_DKONG_H +#define MAME_NINTENDO_DKONG_H #pragma once @@ -361,4 +361,4 @@ private: uint32_t screen_update_spclforc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif // MAME_INCLUDES_DKONG_H +#endif // MAME_NINTENDO_DKONG_H diff --git a/src/mame/nintendo/gba.h b/src/mame/nintendo/gba.h index 895ae30bea3..d6c13a02d8b 100644 --- a/src/mame/nintendo/gba.h +++ b/src/mame/nintendo/gba.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont,Ryan Holtz -#ifndef MAME_INCLUDES_GBA_H -#define MAME_INCLUDES_GBA_H +#ifndef MAME_NINTENDO_GBA_H +#define MAME_NINTENDO_GBA_H #include "sound/gb.h" #include "machine/intelfsh.h" @@ -125,4 +125,4 @@ protected: }; -#endif +#endif // MAME_NINTENDO_GBA_H diff --git a/src/mame/nintendo/mario.h b/src/mame/nintendo/mario.h index f3887e62005..ac913f1824a 100644 --- a/src/mame/nintendo/mario.h +++ b/src/mame/nintendo/mario.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni -#ifndef MAME_INCLUDES_MARIO_H -#define MAME_INCLUDES_MARIO_H +#ifndef MAME_NINTENDO_MARIO_H +#define MAME_NINTENDO_MARIO_H #pragma once @@ -157,4 +157,4 @@ private: void masao_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_MARIO_H +#endif // MAME_NINTENDO_MARIO_H diff --git a/src/mame/nintendo/n8080.h b/src/mame/nintendo/n8080.h index 69c160173ee..6ca77595b11 100644 --- a/src/mame/nintendo/n8080.h +++ b/src/mame/nintendo/n8080.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Pierpaolo Prazzoli -#ifndef MAME_INCLUDES_N8080_H -#define MAME_INCLUDES_N8080_H +#ifndef MAME_NINTENDO_N8080_H +#define MAME_NINTENDO_N8080_H #pragma once @@ -206,4 +206,4 @@ private: }; -#endif // MAME_INCLUDES_N8080_H +#endif // MAME_NINTENDO_N8080_H diff --git a/src/mame/nintendo/nds.h b/src/mame/nintendo/nds.h index 3d94c0cfbf7..4e180898f93 100644 --- a/src/mame/nintendo/nds.h +++ b/src/mame/nintendo/nds.h @@ -2,8 +2,8 @@ // copyright-holders:Ryan Holtz, R. Belmont #pragma once -#ifndef MAME_INCLUDES_NDS_H -#define MAME_INCLUDES_NDS_H +#ifndef MAME_NINTENDO_NDS_H +#define MAME_NINTENDO_NDS_H #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" @@ -114,4 +114,4 @@ private: void dma_exec(int ch); }; -#endif // INCLUDES_NDS_H +#endif // MAME_NINTENDO_NDS_H diff --git a/src/mame/nintendo/nes.h b/src/mame/nintendo/nes.h index 05e04e6267d..dffed1d54b3 100644 --- a/src/mame/nintendo/nes.h +++ b/src/mame/nintendo/nes.h @@ -8,8 +8,8 @@ ****************************************************************************/ -#ifndef MAME_INCLUDES_NES_H -#define MAME_INCLUDES_NES_H +#ifndef MAME_NINTENDO_NES_H +#define MAME_NINTENDO_NES_H #pragma once @@ -114,4 +114,4 @@ private: memory_bank_array_creator<4> m_prg_bank; }; -#endif // MAME_INCLUDES_NES_H +#endif // MAME_NINTENDO_NES_H diff --git a/src/mame/nintendo/popeye.h b/src/mame/nintendo/popeye.h index 8b8bd114b7b..e654621b67d 100644 --- a/src/mame/nintendo/popeye.h +++ b/src/mame/nintendo/popeye.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:smf, Nicola Salmoria, Couriersud // thanks-to: Marc Lafontaine -#ifndef MAME_INCLUDES_POPEYE_H -#define MAME_INCLUDES_POPEYE_H +#ifndef MAME_NINTENDO_POPEYE_H +#define MAME_NINTENDO_POPEYE_H #pragma once @@ -158,4 +158,4 @@ protected: virtual void maincpu_program_map(address_map &map) override; }; -#endif // MAME_INCLUDES_POPEYE_H +#endif // MAME_NINTENDO_POPEYE_H diff --git a/src/mame/nintendo/punchout.h b/src/mame/nintendo/punchout.h index ca0658422ac..98d0b635a78 100644 --- a/src/mame/nintendo/punchout.h +++ b/src/mame/nintendo/punchout.h @@ -5,8 +5,8 @@ Punch Out / Super Punch Out / Arm Wrestling ***************************************************************************/ -#ifndef MAME_INCLUDES_PUNCHOUT_H -#define MAME_INCLUDES_PUNCHOUT_H +#ifndef MAME_NINTENDO_PUNCHOUT_H +#define MAME_NINTENDO_PUNCHOUT_H #pragma once @@ -109,4 +109,4 @@ private: void spnchout_io_map(address_map &map); }; -#endif // MAME_INCLUDES_PUNCHOUT_H +#endif // MAME_NINTENDO_PUNCHOUT_H diff --git a/src/mame/nintendo/snes.h b/src/mame/nintendo/snes.h index 4e33492e90a..a778afe06d8 100644 --- a/src/mame/nintendo/snes.h +++ b/src/mame/nintendo/snes.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese, R. Belmont, Anthony Kruize, Fabio Priuli, Ryan Holtz -#ifndef MAME_INCLUDES_SNES_H -#define MAME_INCLUDES_SNES_H +#ifndef MAME_NINTENDO_SNES_H +#define MAME_NINTENDO_SNES_H #include "cpu/g65816/g65816.h" #include "machine/input_merger.h" @@ -455,4 +455,4 @@ enum HAS_UNK }; -#endif // MAME_INCLUDES_SNES_H +#endif // MAME_NINTENDO_SNES_H diff --git a/src/mame/nix/fitfight.h b/src/mame/nix/fitfight.h index 28850ee8e1b..04726d0911f 100644 --- a/src/mame/nix/fitfight.h +++ b/src/mame/nix/fitfight.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_FITFIGHT_H -#define MAME_INCLUDES_FITFIGHT_H +#ifndef MAME_NIX_FITFIGHT_H +#define MAME_NIX_FITFIGHT_H #pragma once @@ -92,4 +92,4 @@ private: required_device m_palette; }; -#endif // MAME_INCLUDES_FITFIGHT_H +#endif // MAME_NIX_FITFIGHT_H diff --git a/src/mame/nmk/nmk16.h b/src/mame/nmk/nmk16.h index f0703882e99..2269eb2be97 100644 --- a/src/mame/nmk/nmk16.h +++ b/src/mame/nmk/nmk16.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni,Nicola Salmoria,Bryan McPhail,David Haywood,R. Belmont,Alex Marshall,Angelo Salese,Luca Elia // thanks-to:Richard Bush -#ifndef MAME_INCLUDES_NMK16_H -#define MAME_INCLUDES_NMK16_H +#ifndef MAME_NMK_NMK16_H +#define MAME_NMK_NMK16_H #pragma once @@ -316,4 +316,4 @@ private: void tomagic_sound_io_map(address_map &map); }; -#endif //MAME_INCLUDES_NMK16_H +#endif //MAME_NMK_NMK16_H diff --git a/src/mame/nmk/powerins.h b/src/mame/nmk/powerins.h index 593b9a62c4c..9459ed31caf 100644 --- a/src/mame/nmk/powerins.h +++ b/src/mame/nmk/powerins.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_POWERINS_H -#define MAME_INCLUDES_POWERINS_H +#ifndef MAME_NMK_POWERINS_H +#define MAME_NMK_POWERINS_H #include "nmk16.h" #include "nmk16spr.h" @@ -44,4 +44,4 @@ private: void powerinsb_sound_io_map(address_map &map); }; -#endif // MAME_INCLUDES_POWERINS_H +#endif // MAME_NMK_POWERINS_H diff --git a/src/mame/nokia/mikromik.h b/src/mame/nokia/mikromik.h index 6719cf522f7..f58c2f02f35 100644 --- a/src/mame/nokia/mikromik.h +++ b/src/mame/nokia/mikromik.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_MIKROMIK_H -#define MAME_INCLUDES_MIKROMIK_H +#ifndef MAME_NOKIA_MIKROMIK_H +#define MAME_NOKIA_MIKROMIK_H #pragma once @@ -152,4 +152,4 @@ private: void mm1_upd7220_map(address_map &map); }; -#endif // MAME_INCLUDES_MIKROMIK_H +#endif // MAME_NOKIA_MIKROMIK_H diff --git a/src/mame/olympia/dday.h b/src/mame/olympia/dday.h index 1762382e0a2..3bf7e708ac7 100644 --- a/src/mame/olympia/dday.h +++ b/src/mame/olympia/dday.h @@ -5,8 +5,8 @@ D-Day *************************************************************************/ -#ifndef MAME_INCLUDES_DDAY_H -#define MAME_INCLUDES_DDAY_H +#ifndef MAME_OLYMPIA_DDAY_H +#define MAME_OLYMPIA_DDAY_H #pragma once @@ -84,4 +84,4 @@ private: void dday_map(address_map &map); }; -#endif // MAME_INCLUDES_DDAY_H +#endif // MAME_OLYMPIA_DDAY_H diff --git a/src/mame/olympia/portrait.h b/src/mame/olympia/portrait.h index e13df0ea59c..eeb70f0cef0 100644 --- a/src/mame/olympia/portrait.h +++ b/src/mame/olympia/portrait.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Steve Ellenoff, Pierpaolo Prazzoli, Angelo Salese -#ifndef MAME_INCLUDES_PORTRAIT_H -#define MAME_INCLUDES_PORTRAIT_H +#ifndef MAME_OLYMPIA_PORTRAIT_H +#define MAME_OLYMPIA_PORTRAIT_H #pragma once @@ -67,4 +67,4 @@ private: tilemap_t *m_background = nullptr; }; -#endif // MAME_INCLUDES_PORTRAIT_H +#endif // MAME_OLYMPIA_PORTRAIT_H diff --git a/src/mame/omnibyte/ob68k1a.h b/src/mame/omnibyte/ob68k1a.h index a2df4e01c63..46b2cdabe16 100644 --- a/src/mame/omnibyte/ob68k1a.h +++ b/src/mame/omnibyte/ob68k1a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_OB68K1A_H -#define MAME_INCLUDES_OB68K1A_H +#ifndef MAME_OMNIBYTE_OB68K1A_H +#define MAME_OMNIBYTE_OB68K1A_H #pragma once @@ -60,4 +60,4 @@ private: void ob68k1a_mem(address_map &map); }; -#endif +#endif // MAME_OMNIBYTE_OB68K1A_H diff --git a/src/mame/osborne/osborne1.h b/src/mame/osborne/osborne1.h index 66e2c2bfe15..10184bdd6eb 100644 --- a/src/mame/osborne/osborne1.h +++ b/src/mame/osborne/osborne1.h @@ -5,8 +5,8 @@ * includes/osborne1.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_OSBORNE1_H -#define MAME_INCLUDES_OSBORNE1_H +#ifndef MAME_OSBORNE_OSBORNE1_H +#define MAME_OSBORNE_OSBORNE1_H #pragma once @@ -219,4 +219,4 @@ private: required_region_ptr m_p_nuevo; }; -#endif // MAME_INCLUDES_OSBORNE1_H +#endif // MAME_OSBORNE_OSBORNE1_H diff --git a/src/mame/osi/osi.h b/src/mame/osi/osi.h index 7c49d9a1ffd..83c29a272a5 100644 --- a/src/mame/osi/osi.h +++ b/src/mame/osi/osi.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Robbbert, Wilbert Pol -#ifndef MAME_INCLUDES_OSI_H -#define MAME_INCLUDES_OSI_H +#ifndef MAME_OSI_OSI_H +#define MAME_OSI_OSI_H #pragma once @@ -159,4 +159,4 @@ protected: void uk101_mem(address_map &map); }; -#endif // MAME_INCLUDES_OSI_H +#endif // MAME_OSI_OSI_H diff --git a/src/mame/pacman/pacman.h b/src/mame/pacman/pacman.h index 8fa463ae9fa..b8dedf9ba98 100644 --- a/src/mame/pacman/pacman.h +++ b/src/mame/pacman/pacman.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_PACMAN_H -#define MAME_INCLUDES_PACMAN_H +#ifndef MAME_PACMAN_PACMAN_H +#define MAME_PACMAN_PACMAN_H #pragma once @@ -324,4 +324,4 @@ protected: }; -#endif // MAME_INCLUDES_PACMAN_H +#endif // MAME_PACMAN_PACMAN_H diff --git a/src/mame/philips/cdi.h b/src/mame/philips/cdi.h index 85004324a19..83fca558144 100644 --- a/src/mame/philips/cdi.h +++ b/src/mame/philips/cdi.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_INCLUDES_CDI_H -#define MAME_INCLUDES_CDI_H +#ifndef MAME_PHILIPS_CDI_H +#define MAME_PHILIPS_CDI_H #include "machine/scc68070.h" #include "cdislavehle.h" @@ -128,4 +128,4 @@ private: // 0x001: French // 0x188: German -#endif // MAME_INCLUDES_CDI_H +#endif // MAME_PHILIPS_CDI_H diff --git a/src/mame/philips/p2000t.h b/src/mame/philips/p2000t.h index 9ec1937551f..fe216ac25db 100644 --- a/src/mame/philips/p2000t.h +++ b/src/mame/philips/p2000t.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_P2000T_H -#define MAME_INCLUDES_P2000T_H +#ifndef MAME_PHILIPS_P2000T_H +#define MAME_PHILIPS_P2000T_H #pragma once @@ -96,4 +96,4 @@ private: int8_t m_frame_count = 0; }; -#endif // MAME_INCLUDES_P2000T_H +#endif // MAME_PHILIPS_P2000T_H diff --git a/src/mame/phoenix/naughtyb.h b/src/mame/phoenix/naughtyb.h index edfc671b6ff..eeaad012f98 100644 --- a/src/mame/phoenix/naughtyb.h +++ b/src/mame/phoenix/naughtyb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver,Sal and John Bugliarisi,Paul Priest -#ifndef MAME_INCLUDES_NAUGHTYB_H -#define MAME_INCLUDES_NAUGHTYB_H +#ifndef MAME_PHOENIX_NAUGHTYB_H +#define MAME_PHOENIX_NAUGHTYB_H #pragma once @@ -75,4 +75,4 @@ private: void popflame_map(address_map &map); }; -#endif // MAME_INCLUDES_NAUGHTYB_H +#endif // MAME_PHOENIX_NAUGHTYB_H diff --git a/src/mame/phoenix/phoenix.h b/src/mame/phoenix/phoenix.h index e0f634b9457..8ba053ded21 100644 --- a/src/mame/phoenix/phoenix.h +++ b/src/mame/phoenix/phoenix.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Richard Davies -#ifndef MAME_INCLUDES_PHOENIX_H -#define MAME_INCLUDES_PHOENIX_H +#ifndef MAME_PHOENIX_PHOENIX_H +#define MAME_PHOENIX_PHOENIX_H #pragma once @@ -89,4 +89,4 @@ private: #define VBSTART (208) #define VBEND (0) -#endif // MAME_INCLUDES_PHOENIX_H +#endif // MAME_PHOENIX_PHOENIX_H diff --git a/src/mame/phoenix/phoenix_a.h b/src/mame/phoenix/phoenix_a.h index 255ece6b700..3738de54b8f 100644 --- a/src/mame/phoenix/phoenix_a.h +++ b/src/mame/phoenix/phoenix_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Richard Davies -#ifndef MAME_PHOENIX_PHOENIX_H -#define MAME_PHOENIX_PHOENIX_H +#ifndef MAME_PHOENIX_PHOENIX_A_H +#define MAME_PHOENIX_PHOENIX_A_H #pragma once @@ -59,4 +59,4 @@ DECLARE_DEVICE_TYPE(PHOENIX_SOUND, phoenix_sound_device) DISCRETE_SOUND_EXTERN(phoenix_discrete); -#endif // MAME_PHOENIX_PHOENIX_H +#endif // MAME_PHOENIX_PHOENIX_A_H diff --git a/src/mame/pinball/s11.h b/src/mame/pinball/s11.h index 0b187d57507..5ffcdaf9bbe 100644 --- a/src/mame/pinball/s11.h +++ b/src/mame/pinball/s11.h @@ -6,8 +6,8 @@ * Created on: 2013-01-01 */ -#ifndef MAME_INCLUDES_S11_H -#define MAME_INCLUDES_S11_H +#ifndef MAME_PINBALL_S11_H +#define MAME_PINBALL_S11_H #include "cpu/m6800/m6800.h" #include "pinsnd88.h" @@ -241,4 +241,4 @@ protected: }; -#endif // MAME_INCLUDES_S11_H +#endif // MAME_PINBALL_S11_H diff --git a/src/mame/playmark/playmark.h b/src/mame/playmark/playmark.h index a7445ac7164..795c2a3b1eb 100644 --- a/src/mame/playmark/playmark.h +++ b/src/mame/playmark/playmark.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Pierpaolo Prazzoli, Quench -#ifndef MAME_INCLUDES_PLAYMARK_H -#define MAME_INCLUDES_PLAYMARK_H +#ifndef MAME_PLAYMARK_PLAYMARK_H +#define MAME_PLAYMARK_PLAYMARK_H #pragma once @@ -190,4 +190,4 @@ private: void wbeachvl_base(machine_config &config); }; -#endif // MAME_INCLUDES_PLAYMARK_H +#endif // MAME_PLAYMARK_PLAYMARK_H diff --git a/src/mame/playmark/sslam.h b/src/mame/playmark/sslam.h index 6979cc8d3c5..cfd0966ef1b 100644 --- a/src/mame/playmark/sslam.h +++ b/src/mame/playmark/sslam.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Pierpaolo Prazzoli, Quench -#ifndef MAME_INCLUDES_SSLAM_H -#define MAME_INCLUDES_SSLAM_H +#ifndef MAME_PLAYMARK_SSLAM_H +#define MAME_PLAYMARK_SSLAM_H #pragma once @@ -115,4 +115,4 @@ protected: void powerbls_bg_tileram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); }; -#endif // MAME_INCLUDES_SSLAM_H +#endif // MAME_PLAYMARK_SSLAM_H diff --git a/src/mame/poly88/poly88.h b/src/mame/poly88/poly88.h index 38a26de0b95..e6073b9a085 100644 --- a/src/mame/poly88/poly88.h +++ b/src/mame/poly88/poly88.h @@ -5,8 +5,8 @@ * includes/poly88.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_POLY88_H -#define MAME_INCLUDES_POLY88_H +#ifndef MAME_POLY88_POLY88_H +#define MAME_POLY88_POLY88_H #pragma once @@ -85,4 +85,4 @@ private: bool m_onboard_disable = false; }; -#endif // MAME_INCLUDES_POLY88_H +#endif // MAME_POLY88_POLY88_H diff --git a/src/mame/psikyo/psikyo.h b/src/mame/psikyo/psikyo.h index 6d02dbffc48..e0df0a5637a 100644 --- a/src/mame/psikyo/psikyo.h +++ b/src/mame/psikyo/psikyo.h @@ -5,8 +5,8 @@ Psikyo Games *************************************************************************/ -#ifndef MAME_INCLUDES_PSIKYO_H -#define MAME_INCLUDES_PSIKYO_H +#ifndef MAME_PSIKYO_PSIKYO_H +#define MAME_PSIKYO_PSIKYO_H #pragma once @@ -167,4 +167,4 @@ private: void sngkace_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_PSIKYO_H +#endif // MAME_PSIKYO_PSIKYO_H diff --git a/src/mame/psikyo/psikyosh.h b/src/mame/psikyo/psikyosh.h index 12bc214486b..89ae2e097cb 100644 --- a/src/mame/psikyo/psikyosh.h +++ b/src/mame/psikyo/psikyosh.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Paul Priest -#ifndef MAME_INCLUDES_PSIKYOSH_H -#define MAME_INCLUDES_PSIKYOSH_H +#ifndef MAME_PSIKYO_PSIKYOSH_H +#define MAME_PSIKYO_PSIKYOSH_H #pragma once @@ -129,4 +129,4 @@ private: void s1945iiibl_map(address_map &map); }; -#endif // MAME_INCLUDES_PSIKYOSH_H +#endif // MAME_PSIKYO_PSIKYOSH_H diff --git a/src/mame/psion/psion.h b/src/mame/psion/psion.h index 2b94420f53c..b2dbbb5feae 100644 --- a/src/mame/psion/psion.h +++ b/src/mame/psion/psion.h @@ -5,8 +5,8 @@ Psion Organiser II series ****************************************************************************/ -#ifndef MAME_INCLUDES_PSION_H -#define MAME_INCLUDES_PSION_H +#ifndef MAME_PSION_PSION_H +#define MAME_PSION_PSION_H #pragma once @@ -123,4 +123,4 @@ private: void psion1_mem(address_map &map); }; -#endif // MAME_INCLUDES_PSION_H +#endif // MAME_PSION_PSION_H diff --git a/src/mame/psion/psion5.h b/src/mame/psion/psion5.h index 39d64a47c3e..3dad0a0e415 100644 --- a/src/mame/psion/psion5.h +++ b/src/mame/psion/psion5.h @@ -8,8 +8,8 @@ ****************************************************************************/ -#ifndef MAME_INCLUDES_PSION5_H -#define MAME_INCLUDES_PSION5_H +#ifndef MAME_PSION_PSION5_H +#define MAME_PSION_PSION5_H #pragma once @@ -214,4 +214,4 @@ private: emu_timer *m_rtc_ticker = nullptr; }; -#endif // MAME_INCLUDES_PSION5_H +#endif // MAME_PSION_PSION5_H diff --git a/src/mame/ramtek/hitme.h b/src/mame/ramtek/hitme.h index c3087969d2e..66e865a2e9c 100644 --- a/src/mame/ramtek/hitme.h +++ b/src/mame/ramtek/hitme.h @@ -5,8 +5,8 @@ Hitme hardware *************************************************************************/ -#ifndef MAME_INCLUDES_HITME_H -#define MAME_INCLUDES_HITME_H +#ifndef MAME_RAMTEK_HITME_H +#define MAME_RAMTEK_HITME_H #pragma once @@ -72,4 +72,4 @@ private: /*----------- defined in audio/hitme.c -----------*/ DISCRETE_SOUND_EXTERN( hitme_discrete ); -#endif // MAME_INCLUDES_HITME_H +#endif // MAME_RAMTEK_HITME_H diff --git a/src/mame/ramtek/starcrus.h b/src/mame/ramtek/starcrus.h index 02aff7f3a1f..a227a987588 100644 --- a/src/mame/ramtek/starcrus.h +++ b/src/mame/ramtek/starcrus.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Frank Palazzolo, Ryan Holtz -#ifndef MAME_INCLUDES_STARCRUS_H -#define MAME_INCLUDES_STARCRUS_H +#ifndef MAME_RAMTEK_STARCRUS_H +#define MAME_RAMTEK_STARCRUS_H #pragma once @@ -85,4 +85,4 @@ private: required_device_array m_engine; }; -#endif // MAME_INCLUDES_STARCRUS_H +#endif // MAME_RAMTEK_STARCRUS_H diff --git a/src/mame/rca/vip.h b/src/mame/rca/vip.h index b5de9839ac8..0d2fe4ccc09 100644 --- a/src/mame/rca/vip.h +++ b/src/mame/rca/vip.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_VIP_H -#define MAME_INCLUDES_VIP_H +#ifndef MAME_RCA_VIP_H +#define MAME_RCA_VIP_H #include "bus/vip/byteio.h" #include "bus/vip/exp.h" @@ -132,4 +132,4 @@ private: output_finder<3> m_leds; }; -#endif +#endif // MAME_RCA_VIP_H diff --git a/src/mame/rm/rm380z.h b/src/mame/rm/rm380z.h index 4417ca4cb33..d9fc0001710 100644 --- a/src/mame/rm/rm380z.h +++ b/src/mame/rm/rm380z.h @@ -7,8 +7,8 @@ Research Machines RM 380Z */ -#ifndef MAME_INCLUDES_RM380Z_H -#define MAME_INCLUDES_RM380Z_H +#ifndef MAME_RM_RM380Z_H +#define MAME_RM_RM380Z_H #pragma once @@ -147,4 +147,4 @@ private: void rm480z_mem(address_map &map); }; -#endif // MAME_INCLUDES_RM380Z_H +#endif // MAME_RM_RM380Z_H diff --git a/src/mame/rm/rmnimbus.h b/src/mame/rm/rmnimbus.h index fd8ed6909bf..d9f4f1b880c 100644 --- a/src/mame/rm/rmnimbus.h +++ b/src/mame/rm/rmnimbus.h @@ -7,8 +7,8 @@ Phill Harvey-Smith 2009-11-29. */ -#ifndef MAME_INCLUDES_RMNIMBUS_H -#define MAME_INCLUDES_RMNIMBUS_H +#ifndef MAME_RM_RMNIMBUS_H +#define MAME_RM_RMNIMBUS_H #pragma once @@ -261,4 +261,4 @@ private: TIMER_CALLBACK_MEMBER(do_mouse); }; -#endif // MAME_INCLUDES_RMNIMBUS_H +#endif // MAME_RM_RMNIMBUS_H diff --git a/src/mame/rockwell/aim65.h b/src/mame/rockwell/aim65.h index 3524020edc6..14907a10ee9 100644 --- a/src/mame/rockwell/aim65.h +++ b/src/mame/rockwell/aim65.h @@ -7,8 +7,8 @@ * Rockwell AIM-65 * ****************************************************************************/ -#ifndef MAME_INCLUDES_AIM65_H -#define MAME_INCLUDES_AIM65_H +#ifndef MAME_ROCKWELL_AIM65_H +#define MAME_ROCKWELL_AIM65_H #pragma once @@ -130,4 +130,4 @@ private: }; -#endif // MAME_INCLUDES_AIM65_H +#endif // MAME_ROCKWELL_AIM65_H diff --git a/src/mame/saitek/stratos.h b/src/mame/saitek/stratos.h index 23a0bf694fe..ba646ef16a8 100644 --- a/src/mame/saitek/stratos.h +++ b/src/mame/saitek/stratos.h @@ -7,8 +7,8 @@ */ -#ifndef MAME_INCLUDES_SAITEK_STRATOS_H -#define MAME_INCLUDES_SAITEK_STRATOS_H +#ifndef MAME_SAITEK_STRATOS_H +#define MAME_SAITEK_STRATOS_H #pragma once @@ -59,4 +59,4 @@ protected: INPUT_PORTS_EXTERN( saitek_stratos ); -#endif // MAME_INCLUDES_SAITEK_STRATOS_H +#endif // MAME_SAITEK_STRATOS_H diff --git a/src/mame/sanritsu/mermaid.h b/src/mame/sanritsu/mermaid.h index 4f1963ef6aa..db00111acb2 100644 --- a/src/mame/sanritsu/mermaid.h +++ b/src/mame/sanritsu/mermaid.h @@ -5,8 +5,8 @@ Mermaid *************************************************************************/ -#ifndef MAME_INCLUDES_MERMAID_H -#define MAME_INCLUDES_MERMAID_H +#ifndef MAME_SANRITSU_MERMAID_H +#define MAME_SANRITSU_MERMAID_H #pragma once @@ -126,4 +126,4 @@ private: void mermaid_map(address_map &map); }; -#endif // MAME_INCLUDES_MERMAID_H +#endif // MAME_SANRITSU_MERMAID_H diff --git a/src/mame/sanyo/mbc55x.h b/src/mame/sanyo/mbc55x.h index ca999176d7c..f08ced15d46 100644 --- a/src/mame/sanyo/mbc55x.h +++ b/src/mame/sanyo/mbc55x.h @@ -7,8 +7,8 @@ Phill Harvey-Smith 2011-01-29. */ -#ifndef MAME_INCLUDES_MBC55X_H -#define MAME_INCLUDES_MBC55X_H +#ifndef MAME_SANYO_MBC55X_H +#define MAME_SANYO_MBC55X_H #pragma once @@ -180,4 +180,4 @@ private: #define OUTPUT_SEGOFS(mess,seg,ofs) logerror("%s=%04X:%04X [%08X]\n",mess,seg,ofs,((seg<<4)+ofs)) -#endif // MAME_INCLUDES_MBC55X_H +#endif // MAME_SANYO_MBC55X_H diff --git a/src/mame/sanyo/phc25.h b/src/mame/sanyo/phc25.h index de828bdd796..a9cb1053cdf 100644 --- a/src/mame/sanyo/phc25.h +++ b/src/mame/sanyo/phc25.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder, Robbbert #pragma once -#ifndef MAME_INCLUDES_PHC25_H -#define MAME_INCLUDES_PHC25_H +#ifndef MAME_SANYO_PHC25_H +#define MAME_SANYO_PHC25_H #include "cpu/z80/z80.h" @@ -60,4 +60,4 @@ private: required_device m_cassette; }; -#endif +#endif // MAME_SANYO_PHC25_H diff --git a/src/mame/sega/dc.h b/src/mame/sega/dc.h index cf2eb344f42..bedea554910 100644 --- a/src/mame/sega/dc.h +++ b/src/mame/sega/dc.h @@ -1,8 +1,8 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese, Olivier Galibert, David Haywood, Samuele Zannoli, R. Belmont, ElSemi -#ifndef MAME_INCLUDES_DC_H -#define MAME_INCLUDES_DC_H +#ifndef MAME_SEGA_DC_H +#define MAME_SEGA_DC_H #pragma once @@ -284,4 +284,4 @@ protected: #define IST_ERR_ISP_LIMIT 0x00000004 #define IST_ERR_PVRIF_ILL_ADDR 0x00000040 -#endif // MAME_INCLUDES_DC_H +#endif // MAME_SEGA_DC_H diff --git a/src/mame/sega/dc_atomiswave.h b/src/mame/sega/dc_atomiswave.h index ba692522ebf..cb42e189858 100644 --- a/src/mame/sega/dc_atomiswave.h +++ b/src/mame/sega/dc_atomiswave.h @@ -1,8 +1,8 @@ // license:LGPL-2.1+ // copyright-holders: Samuele Zannoli, R. Belmont, ElSemi, David Haywood, Angelo Salese, Olivier Galibert, MetalliC -#ifndef MAME_INCLUDES_DC_ATOMISWAVE_H -#define MAME_INCLUDES_DC_ATOMISWAVE_H +#ifndef MAME_SEGA_DC_ATOMISWAVE_H +#define MAME_SEGA_DC_ATOMISWAVE_H #pragma once @@ -66,4 +66,4 @@ private: uint64_t allnet_hack_r(offs_t offset, uint64_t mem_mask = ~0); }; -#endif // MAME_INCLUDES_DC_ATOMISWAVE_H +#endif // MAME_SEGA_DC_ATOMISWAVE_H diff --git a/src/mame/sega/megadriv_acbl.h b/src/mame/sega/megadriv_acbl.h index 11496a4c610..e804d3a3392 100644 --- a/src/mame/sega/megadriv_acbl.h +++ b/src/mame/sega/megadriv_acbl.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_MEGADRIV_ACBL_H -#define MAME_INCLUDES_MEGADRIV_ACBL_H +#ifndef MAME_SEGA_MEGADRIV_ACBL_H +#define MAME_SEGA_MEGADRIV_ACBL_H #include "megadriv.h" @@ -87,4 +87,4 @@ private: void ssf2mdb_68k_map(address_map &map); }; -#endif // MAME_INCLUDES_MEGADRIV_ACBL_H +#endif // MAME_SEGA_MEGADRIV_ACBL_H diff --git a/src/mame/sega/model1.h b/src/mame/sega/model1.h index 1d45a01b2c1..538b2735bc3 100644 --- a/src/mame/sega/model1.h +++ b/src/mame/sega/model1.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_INCLUDES_MODEL1_H -#define MAME_INCLUDES_MODEL1_H +#ifndef MAME_SEGA_MODEL1_H +#define MAME_SEGA_MODEL1_H #pragma once @@ -353,4 +353,4 @@ private: void drive_board_w(uint8_t data); }; -#endif // MAME_INCLUDES_MODEL1_H +#endif // MAME_SEGA_MODEL1_H diff --git a/src/mame/sega/model2.h b/src/mame/sega/model2.h index 1df4c92b2b0..d7e0432c073 100644 --- a/src/mame/sega/model2.h +++ b/src/mame/sega/model2.h @@ -859,4 +859,4 @@ struct model2_state::geo_state model2_state * state = nullptr; }; -#endif // MAME_INCLUDES_MODEL2_H +#endif // MAME_SEGA_MODEL2_H diff --git a/src/mame/sega/model3.h b/src/mame/sega/model3.h index a90382eb4c8..43e6eb92653 100644 --- a/src/mame/sega/model3.h +++ b/src/mame/sega/model3.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, Ville Linde -#ifndef MAME_INCLUDES_MODEL3_H -#define MAME_INCLUDES_MODEL3_H +#ifndef MAME_SEGA_MODEL3_H +#define MAME_SEGA_MODEL3_H #pragma once @@ -438,4 +438,4 @@ private: void getbass_iocpu_io(address_map &map); }; -#endif // MAME_INCLUDES_MODEL3_H +#endif // MAME_SEGA_MODEL3_H diff --git a/src/mame/sega/naomi.h b/src/mame/sega/naomi.h index 7c6e98f92fa..09660f0cb59 100644 --- a/src/mame/sega/naomi.h +++ b/src/mame/sega/naomi.h @@ -1,8 +1,8 @@ // license:LGPL-2.1+ // copyright-holders: Samuele Zannoli, R. Belmont, ElSemi, David Haywood, Angelo Salese, Olivier Galibert, MetalliC -#ifndef MAME_INCLUDES_NAOMI_H -#define MAME_INCLUDES_NAOMI_H +#ifndef MAME_SEGA_NAOMI_H +#define MAME_SEGA_NAOMI_H #pragma once @@ -122,4 +122,4 @@ private: void elan_regs_w(offs_t offset, uint32_t data); }; -#endif // MAME_INCLUDES_NAOMI_H +#endif // MAME_SEGA_NAOMI_H diff --git a/src/mame/sega/saturn.h b/src/mame/sega/saturn.h index 29f9f2053c5..efceec16768 100644 --- a/src/mame/sega/saturn.h +++ b/src/mame/sega/saturn.h @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont -#ifndef MAME_INCLUDES_SATURN_H -#define MAME_INCLUDES_SATURN_H +#ifndef MAME_SEGA_SATURN_H +#define MAME_SEGA_SATURN_H #pragma once @@ -456,4 +456,4 @@ protected: extern gfx_decode_entry const gfx_stv[]; -#endif // MAME_INCLUDES_SATURN_H +#endif // MAME_SEGA_SATURN_H diff --git a/src/mame/sega/segag80.h b/src/mame/sega/segag80.h index e61f784f378..46bfe4f04f4 100644 --- a/src/mame/sega/segag80.h +++ b/src/mame/sega/segag80.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_SEGA_SEGAG80V_H -#define MAME_SEGA_SEGAG80V_H +#ifndef MAME_SEGA_SEGAG80_H +#define MAME_SEGA_SEGAG80_H #pragma once @@ -70,4 +70,4 @@ DECLARE_DEVICE_TYPE(ZEKTOR_AUDIO, zektor_audio_device) DECLARE_DEVICE_TYPE(SPACE_FURY_AUDIO, spacfury_audio_device) DECLARE_DEVICE_TYPE(ASTRO_BLASTER_AUDIO, astrob_audio_device) -#endif // MAME_SEGA_SEGAG80V_H +#endif // MAME_SEGA_SEGAG80_H diff --git a/src/mame/sega/segag80r.h b/src/mame/sega/segag80r.h index a5988521f30..574313157da 100644 --- a/src/mame/sega/segag80r.h +++ b/src/mame/sega/segag80r.h @@ -5,8 +5,8 @@ Sega G-80 raster hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SEGAG80R_H -#define MAME_INCLUDES_SEGAG80R_H +#ifndef MAME_SEGA_SEGAG80R_H +#define MAME_SEGA_SEGAG80R_H #pragma once @@ -225,4 +225,4 @@ DECLARE_DEVICE_TYPE(SEGA005, sega005_sound_device) #define G80_BACKGROUND_PIGNEWT 3 #define G80_BACKGROUND_SINDBADM 4 -#endif // MAME_INCLUDES_SEGAG80R_H +#endif // MAME_SEGA_SEGAG80R_H diff --git a/src/mame/sega/segag80r_a.h b/src/mame/sega/segag80r_a.h index 6fe60432a03..6bc15eaea7f 100644 --- a/src/mame/sega/segag80r_a.h +++ b/src/mame/sega/segag80r_a.h @@ -9,8 +9,8 @@ ***************************************************************************/ -#ifndef MAME_SEGA_SEGAG80R -#define MAME_SEGA_SEGAG80R +#ifndef MAME_SEGA_SEGAG80R_A_H +#define MAME_SEGA_SEGAG80R_A_H #pragma once @@ -66,4 +66,4 @@ protected: DECLARE_DEVICE_TYPE(MONSTERB_SOUND, monsterb_sound_device) -#endif // MAME_SEGA_SEGAG80R +#endif // MAME_SEGA_SEGAG80R_A_H diff --git a/src/mame/sega/segag80v.h b/src/mame/sega/segag80v.h index c31a98c051c..6f7b916136d 100644 --- a/src/mame/sega/segag80v.h +++ b/src/mame/sega/segag80v.h @@ -5,8 +5,8 @@ Sega vector hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SEGAG80V_H -#define MAME_INCLUDES_SEGAG80V_H +#ifndef MAME_SEGA_SEGAG80V_H +#define MAME_SEGA_SEGAG80V_H #pragma once @@ -172,4 +172,4 @@ private: void spacfurybl_speech_io_map(address_map &map); }; -#endif // MAME_INCLUDES_SEGAG80V_H +#endif // MAME_SEGA_SEGAG80V_H diff --git a/src/mame/sega/segaic16.h b/src/mame/sega/segaic16.h index 353ada0c996..7cf8706416b 100644 --- a/src/mame/sega/segaic16.h +++ b/src/mame/sega/segaic16.h @@ -5,8 +5,8 @@ Sega 16-bit common hardware ***************************************************************************/ -#ifndef MAME_SEGA__SEGAIC16_H -#define MAME_SEGA__SEGAIC16_H +#ifndef MAME_SEGA_SEGAIC16_H +#define MAME_SEGA_SEGAIC16_H #pragma once @@ -187,4 +187,4 @@ private: DECLARE_DEVICE_TYPE(SEGAIC16VID, segaic16_video_device) -#endif // MAME_SEGA__SEGAIC16_H +#endif // MAME_SEGA_SEGAIC16_H diff --git a/src/mame/sega/segaic16_m.h b/src/mame/sega/segaic16_m.h index 220df675718..6ef7e799dd3 100644 --- a/src/mame/sega/segaic16_m.h +++ b/src/mame/sega/segaic16_m.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_SEGA_SEGAIC16_H -#define MAME_SEGA_SEGAIC16_H +#ifndef MAME_SEGA_SEGAIC16_M_H +#define MAME_SEGA_SEGAIC16_M_H #pragma once @@ -113,4 +113,4 @@ DECLARE_DEVICE_TYPE(SEGA_315_5249_DIVIDER, sega_315_5249_divider_device) DECLARE_DEVICE_TYPE(SEGA_315_5250_COMPARE_TIMER, sega_315_5250_compare_timer_device) -#endif // MAME_SEGA_SEGAIC16_H +#endif // MAME_SEGA_SEGAIC16_M_H diff --git a/src/mame/sega/segas16b.h b/src/mame/sega/segas16b.h index 92668e3cb7b..8e73b3c474a 100644 --- a/src/mame/sega/segas16b.h +++ b/src/mame/sega/segas16b.h @@ -5,8 +5,8 @@ Sega System 16B hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SEGAS16B_H -#define MAME_INCLUDES_SEGAS16B_H +#ifndef MAME_SEGA_SEGAS16B_H +#define MAME_SEGA_SEGAS16B_H #pragma once @@ -332,4 +332,4 @@ private: required_ioport m_steer; }; -#endif // MAME_INCLUDES_SEGAS16B_H +#endif // MAME_SEGA_SEGAS16B_H diff --git a/src/mame/sega/segas18.h b/src/mame/sega/segas18.h index 1605af66a31..6b0183396df 100644 --- a/src/mame/sega/segas18.h +++ b/src/mame/sega/segas18.h @@ -5,8 +5,8 @@ Sega System 16A/16B/18/Outrun/Hang On/X-Board/Y-Board hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SEGAS18_H -#define MAME_INCLUDES_SEGAS18_H +#ifndef MAME_SEGA_SEGAS18_H +#define MAME_SEGA_SEGAS18_H #pragma once @@ -181,4 +181,4 @@ private: uint8_t m_lghost_select; }; -#endif // MAME_INCLUDES_SEGAS18_H +#endif // MAME_SEGA_SEGAS18_H diff --git a/src/mame/sega/segas24.h b/src/mame/sega/segas24.h index 5beae3fb322..4c91044aba3 100644 --- a/src/mame/sega/segas24.h +++ b/src/mame/sega/segas24.h @@ -4,8 +4,8 @@ * Sega System 24 * */ -#ifndef MAME_INCLUDES_SEGAS24_H -#define MAME_INCLUDES_SEGAS24_H +#ifndef MAME_SEGA_SEGAS24_H +#define MAME_SEGA_SEGAS24_H #pragma once @@ -201,4 +201,4 @@ private: void dcclubj_cpu2_map(address_map &map); }; -#endif // MAME_INCLUDES_SEGAS24_H +#endif // MAME_SEGA_SEGAS24_H diff --git a/src/mame/sega/segas32.h b/src/mame/sega/segas32.h index 3f617a43e3b..51209be29cd 100644 --- a/src/mame/sega/segas32.h +++ b/src/mame/sega/segas32.h @@ -5,8 +5,8 @@ Sega System 32/Multi 32 hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SEGAS32_H -#define MAME_INCLUDES_SEGAS32_H +#ifndef MAME_SEGA_SEGAS32_H +#define MAME_SEGA_SEGAS32_H #pragma once @@ -394,4 +394,4 @@ protected: DECLARE_DEVICE_TYPE(SEGA_S32_PCB, segas32_state) -#endif // MAME_INCLUDES_SEGAS32_H +#endif // MAME_SEGA_SEGAS32_H diff --git a/src/mame/sega/segasp.h b/src/mame/sega/segasp.h index 2d4f2495982..18747ea058c 100644 --- a/src/mame/sega/segasp.h +++ b/src/mame/sega/segasp.h @@ -6,8 +6,8 @@ */ -#ifndef MAME_INCLUDES_SEGASP_H -#define MAME_INCLUDES_SEGASP_H +#ifndef MAME_SEGA_SEGASP_H +#define MAME_SEGA_SEGASP_H #pragma once @@ -42,4 +42,4 @@ private: void segasp_map(address_map &map); }; -#endif // MAME_INCLUDES_SEGASP_H +#endif // MAME_SEGA_SEGASP_H diff --git a/src/mame/sega/segaxbd.h b/src/mame/sega/segaxbd.h index 30ab96e9d9d..8cc6f6aa719 100644 --- a/src/mame/sega/segaxbd.h +++ b/src/mame/sega/segaxbd.h @@ -5,8 +5,8 @@ Sega X-Board hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SEGAXBD_H -#define MAME_INCLUDES_SEGAXBD_H +#ifndef MAME_SEGA_SEGAXBD_H +#define MAME_SEGA_SEGAXBD_H #pragma once @@ -241,4 +241,4 @@ private: uint8_t m_commram_bank = 0; }; -#endif // MAME_INCLUDES_SEGAXBD_H +#endif // MAME_SEGA_SEGAXBD_H diff --git a/src/mame/sega/segaybd.h b/src/mame/sega/segaybd.h index 6d7f4ac628d..6074bf35cdf 100644 --- a/src/mame/sega/segaybd.h +++ b/src/mame/sega/segaybd.h @@ -5,8 +5,8 @@ Sega Y-Board hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SEGAYBD_H -#define MAME_INCLUDES_SEGAYBD_H +#ifndef MAME_SEGA_SEGAYBD_H +#define MAME_SEGA_SEGAYBD_H #pragma once @@ -137,4 +137,4 @@ private: uint8_t m_misc_io_data = 0; }; -#endif // MAME_INCLUDES_SEGAYBD_H +#endif // MAME_SEGA_SEGAYBD_H diff --git a/src/mame/sega/sms.h b/src/mame/sega/sms.h index 7e4875ffe02..2981324cdb4 100644 --- a/src/mame/sega/sms.h +++ b/src/mame/sega/sms.h @@ -5,8 +5,8 @@ * sega/sms.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_SMS_H -#define MAME_INCLUDES_SMS_H +#ifndef MAME_SEGA_SMS_H +#define MAME_SEGA_SMS_H #pragma once @@ -359,4 +359,4 @@ private: #define IO_BIOS_ROM (0x08) /* BIOS ROM disabled (1= disabled, 0= enabled) */ #define IO_CHIP (0x04) /* I/O chip disabled (1= disabled, 0= enabled) */ -#endif // MAME_INCLUDES_SMS_H +#endif // MAME_SEGA_SMS_H diff --git a/src/mame/sega/system1.h b/src/mame/sega/system1.h index 8c73c21de14..584eff8582f 100644 --- a/src/mame/sega/system1.h +++ b/src/mame/sega/system1.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Jarek Parchanski, Nicola Salmoria, Mirko Buffoni -#ifndef MAME_INCLUDES_SYSTEM1_H -#define MAME_INCLUDES_SYSTEM1_H +#ifndef MAME_SEGA_SYSTEM1_H +#define MAME_SEGA_SYSTEM1_H #pragma once @@ -244,4 +244,4 @@ private: void system1_ppi_io_map(address_map &map); }; -#endif // MAME_INCLUDES_SYSTEM1_H +#endif // MAME_SEGA_SYSTEM1_H diff --git a/src/mame/sega/system16.h b/src/mame/sega/system16.h index eb9a8c99023..35db1720014 100644 --- a/src/mame/sega/system16.h +++ b/src/mame/sega/system16.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria, Phil Stroffolino, Mirko Buffoni -#ifndef MAME_INCLUDES_SYSTEM16_H -#define MAME_INCLUDES_SYSTEM16_H +#ifndef MAME_SEGA_SYSTEM16_H +#define MAME_SEGA_SYSTEM16_H #pragma once @@ -310,4 +310,4 @@ private: output_finder<2> m_leds; }; -#endif // MAME_INCLUDES_SYSTEM16_H +#endif // MAME_SEGA_SYSTEM16_H diff --git a/src/mame/sega/turbo.h b/src/mame/sega/turbo.h index 420f2262758..57174acaf10 100644 --- a/src/mame/sega/turbo.h +++ b/src/mame/sega/turbo.h @@ -5,8 +5,8 @@ Sega Z80-3D system *************************************************************************/ -#ifndef MAME_INCLUDES_TURBO_H -#define MAME_INCLUDES_TURBO_H +#ifndef MAME_SEGA_TURBO_H +#define MAME_SEGA_TURBO_H #pragma once @@ -278,4 +278,4 @@ private: }; -#endif // MAME_INCLUDES_TURBO_H +#endif // MAME_SEGA_TURBO_H diff --git a/src/mame/sega/vicdual_a.h b/src/mame/sega/vicdual_a.h index 59eac6b6998..e41e7713ff1 100644 --- a/src/mame/sega/vicdual_a.h +++ b/src/mame/sega/vicdual_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_SEGA_VICDUAL_H -#define MAME_SEGA_VICDUAL_H +#ifndef MAME_SEGA_VICDUAL_A_H +#define MAME_SEGA_VICDUAL_A_H #pragma once @@ -46,4 +46,4 @@ public: DECLARE_DEVICE_TYPE(BORDERLINE_AUDIO, borderline_audio_device) DECLARE_DEVICE_TYPE(FROGS_AUDIO, frogs_audio_device) -#endif // MAME_SEGA_VICDUAL_H +#endif // MAME_SEGA_VICDUAL_A_H diff --git a/src/mame/sega/zaxxon.h b/src/mame/sega/zaxxon.h index 26cac38bdf4..8f70a2e12f2 100644 --- a/src/mame/sega/zaxxon.h +++ b/src/mame/sega/zaxxon.h @@ -5,8 +5,8 @@ Sega Zaxxon hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_ZAXXON_H -#define MAME_INCLUDES_ZAXXON_H +#ifndef MAME_SEGA_ZAXXON_H +#define MAME_SEGA_ZAXXON_H #pragma once @@ -138,4 +138,4 @@ private: void zaxxon_map(address_map &map); }; -#endif // MAME_INCLUDES_ZAXXON_H +#endif // MAME_SEGA_ZAXXON_H diff --git a/src/mame/seibu/darkmist.h b/src/mame/seibu/darkmist.h index da3ee84a486..de4a20a6458 100644 --- a/src/mame/seibu/darkmist.h +++ b/src/mame/seibu/darkmist.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Nicola Salmoria, Tomasz Slanina -#ifndef MAME_INCLUDES_DARKMIST_H -#define MAME_INCLUDES_DARKMIST_H +#ifndef MAME_SEIBU_DARKMIST_H +#define MAME_SEIBU_DARKMIST_H #pragma once @@ -84,4 +84,4 @@ private: void memmap(address_map &map); }; -#endif // MAME_INCLUDES_DARKMIST_H +#endif // MAME_SEIBU_DARKMIST_H diff --git a/src/mame/seibu/kncljoe.h b/src/mame/seibu/kncljoe.h index b869fdc0f75..7b8a0ffbc18 100644 --- a/src/mame/seibu/kncljoe.h +++ b/src/mame/seibu/kncljoe.h @@ -6,8 +6,8 @@ *************************************************************************/ -#ifndef MAME_INCLUDES_KNCLJOE_H -#define MAME_INCLUDES_KNCLJOE_H +#ifndef MAME_SEIBU_KNCLJOE_H +#define MAME_SEIBU_KNCLJOE_H #pragma once @@ -85,4 +85,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_KNCLJOE_H +#endif // MAME_SEIBU_KNCLJOE_H diff --git a/src/mame/seibu/stfight.h b/src/mame/seibu/stfight.h index ec80b618e7a..89c2ad366f4 100644 --- a/src/mame/seibu/stfight.h +++ b/src/mame/seibu/stfight.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mark McDougall -#ifndef MAME_INCLUDES_STFIGHT_H -#define MAME_INCLUDES_STFIGHT_H +#ifndef MAME_SEIBU_STFIGHT_H +#define MAME_SEIBU_STFIGHT_H #pragma once @@ -105,4 +105,4 @@ private: emu_timer *m_int1_timer = nullptr; }; -#endif // MAME_INCLUDES_STFIGHT_H +#endif // MAME_SEIBU_STFIGHT_H diff --git a/src/mame/seibu/wiz.h b/src/mame/seibu/wiz.h index 5988b6905a7..d30e14d976b 100644 --- a/src/mame/seibu/wiz.h +++ b/src/mame/seibu/wiz.h @@ -5,8 +5,8 @@ Seibu Stinger/Wiz hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_WIZ_H -#define MAME_INCLUDES_WIZ_H +#ifndef MAME_SEIBU_WIZ_H +#define MAME_SEIBU_WIZ_H #pragma once @@ -102,4 +102,4 @@ private: void wiz_main_map(address_map &map); }; -#endif // MAME_INCLUDES_WIZ_H +#endif // MAME_SEIBU_WIZ_H diff --git a/src/mame/seta/seta.h b/src/mame/seta/seta.h index b8b97334d97..d69b130dc69 100644 --- a/src/mame/seta/seta.h +++ b/src/mame/seta/seta.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_SETA_H -#define MAME_INCLUDES_SETA_H +#ifndef MAME_SETA_SETA_H +#define MAME_SETA_SETA_H #pragma once @@ -612,4 +612,4 @@ private: void show_outputs(); }; -#endif // MAME_INCLUDES_SETA_H +#endif // MAME_SETA_SETA_H diff --git a/src/mame/seta/seta2.h b/src/mame/seta/seta2.h index 90519324500..d63c0aca72c 100644 --- a/src/mame/seta/seta2.h +++ b/src/mame/seta/seta2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood -#ifndef MAME_INCLUDES_SETA2_H -#define MAME_INCLUDES_SETA2_H +#ifndef MAME_SETA_SETA2_H +#define MAME_SETA_SETA2_H #pragma once @@ -248,4 +248,4 @@ private: uint8_t m_lamps1 = 0, m_lamps2 = 0, m_cam = 0; }; -#endif // MAME_INCLUDES_SETA2_H +#endif // MAME_SETA_SETA2_H diff --git a/src/mame/seta/speedatk.h b/src/mame/seta/speedatk.h index 21fc30ae783..64b3a6d2a2b 100644 --- a/src/mame/seta/speedatk.h +++ b/src/mame/seta/speedatk.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese, Pierpaolo Prazzoli -#ifndef MAME_INCLUDES_SPEEDATK_H -#define MAME_INCLUDES_SPEEDATK_H +#ifndef MAME_SETA_SPEEDATK_H +#define MAME_SETA_SPEEDATK_H #pragma once @@ -61,4 +61,4 @@ private: void speedatk_mem(address_map &map); }; -#endif // MAME_INCLUDES_SPEEDATK_H +#endif // MAME_SETA_SPEEDATK_H diff --git a/src/mame/seta/srmp2.h b/src/mame/seta/srmp2.h index ee8d564b7ea..fb7f5423cf9 100644 --- a/src/mame/seta/srmp2.h +++ b/src/mame/seta/srmp2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Yochizo, Takahiro Nogi -#ifndef MAME_INCLUDES_SRMP2_H -#define MAME_INCLUDES_SRMP2_H +#ifndef MAME_SETA_SRMP2_H +#define MAME_SETA_SRMP2_H #pragma once @@ -99,4 +99,4 @@ private: void srmp3_map(address_map &map); }; -#endif // MAME_INCLUDES_SRMP2_H +#endif // MAME_SETA_SRMP2_H diff --git a/src/mame/seta/ssv.h b/src/mame/seta/ssv.h index cb84855c8ca..a4ee9f948c6 100644 --- a/src/mame/seta/ssv.h +++ b/src/mame/seta/ssv.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_SSV_H -#define MAME_INCLUDES_SSV_H +#ifndef MAME_SETA_SSV_H +#define MAME_SETA_SSV_H #pragma once @@ -256,4 +256,4 @@ private: required_ioport m_io_service; }; -#endif // MAME_INCLUDES_SSV_H +#endif // MAME_SETA_SSV_H diff --git a/src/mame/shared/cclimber_a.h b/src/mame/shared/cclimber_a.h index dfa9bdb9014..c189b6d2a01 100644 --- a/src/mame/shared/cclimber_a.h +++ b/src/mame/shared/cclimber_a.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_SHARED_CCLIMBER_H -#define MAME_SHARED_CCLIMBER_H +#ifndef MAME_SHARED_CCLIMBER_A_H +#define MAME_SHARED_CCLIMBER_A_H #pragma once @@ -58,4 +58,4 @@ private: }; -#endif // MAME_SHARED_CCLIMBER_H +#endif // MAME_SHARED_CCLIMBER_A_H diff --git a/src/mame/shared/pk8000_v.h b/src/mame/shared/pk8000_v.h index b5abbd6039d..c9643e0bc02 100644 --- a/src/mame/shared/pk8000_v.h +++ b/src/mame/shared/pk8000_v.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic -#ifndef MAME_INCLUDES_PK8000_V_H -#define MAME_INCLUDES_PK8000_V_H +#ifndef MAME_SHARED_PK8000_V_H +#define MAME_SHARED_PK8000_V_H #pragma once @@ -48,4 +48,4 @@ protected: required_device m_maincpu; }; -#endif // MAME_INCLUDES_PK8000_V_H +#endif // MAME_SHARED_PK8000_V_H diff --git a/src/mame/shared/timeplt_a.h b/src/mame/shared/timeplt_a.h index 7629179f997..0efbd2cf4a6 100644 --- a/src/mame/shared/timeplt_a.h +++ b/src/mame/shared/timeplt_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_SHARED_TIMEPLT_H -#define MAME_SHARED_TIMEPLT_H +#ifndef MAME_SHARED_TIMEPLT_A_H +#define MAME_SHARED_TIMEPLT_A_H #pragma once @@ -59,4 +59,4 @@ protected: DECLARE_DEVICE_TYPE(TIMEPLT_AUDIO, timeplt_audio_device) DECLARE_DEVICE_TYPE(LOCOMOTN_AUDIO, locomotn_audio_device) -#endif // MAME_SHARED_TIMEPLT_H +#endif // MAME_SHARED_TIMEPLT_A_H diff --git a/src/mame/shared/xbox_nv2a.h b/src/mame/shared/xbox_nv2a.h index 81c400bb877..feae8059a53 100644 --- a/src/mame/shared/xbox_nv2a.h +++ b/src/mame/shared/xbox_nv2a.h @@ -3,8 +3,8 @@ /* * geforce 3d (NV2A) vertex program disassembler */ -#ifndef MAME_INCLUDES_XBOX_NV2A_H -#define MAME_INCLUDES_XBOX_NV2A_H +#ifndef MAME_SHARED_XBOX_NV2A_H +#define MAME_SHARED_XBOX_NV2A_H #pragma once @@ -892,4 +892,4 @@ public: bool enable_clipping_w = false; }; -#endif // MAME_INCLUDES_XBOX_NV2A_H +#endif // MAME_SHARED_XBOX_NV2A_H diff --git a/src/mame/shared/xbox_usb.h b/src/mame/shared/xbox_usb.h index 495e68ad749..571ef9f04c5 100644 --- a/src/mame/shared/xbox_usb.h +++ b/src/mame/shared/xbox_usb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Samuele Zannoli -#ifndef MAME_INCLUDES_XBOX_USB_H -#define MAME_INCLUDES_XBOX_USB_H +#ifndef MAME_SHARED_XBOX_USB_H +#define MAME_SHARED_XBOX_USB_H #pragma once @@ -531,4 +531,4 @@ private: required_ioport m_White; // analog button }; -#endif // MAME_INCLUDES_XBOX_USB_H +#endif // MAME_SHARED_XBOX_USB_H diff --git a/src/mame/sharp/mz2500.h b/src/mame/sharp/mz2500.h index 7366ea739d4..987b78e363d 100644 --- a/src/mame/sharp/mz2500.h +++ b/src/mame/sharp/mz2500.h @@ -5,8 +5,8 @@ Sharp MZ-2500 (c) 1985 Sharp Corporation ********************************************************************************************************************************/ -#ifndef MAME_INCLUDES_MZ2500_H -#define MAME_INCLUDES_MZ2500_H +#ifndef MAME_SHARP_MZ2500_H +#define MAME_SHARP_MZ2500_H #pragma once @@ -206,4 +206,4 @@ private: void mz2500_bank_window_map(address_map &map); }; -#endif // MAME_INCLUDES_MZ2500_H +#endif // MAME_SHARP_MZ2500_H diff --git a/src/mame/sharp/mz700.h b/src/mame/sharp/mz700.h index 7b416a0cafc..48bb63f15d8 100644 --- a/src/mame/sharp/mz700.h +++ b/src/mame/sharp/mz700.h @@ -6,8 +6,8 @@ * Reference: http://sharpmz.computingmuseum.com * ******************************************************************************/ -#ifndef MAME_INCLUDES_MZ700_H -#define MAME_INCLUDES_MZ700_H +#ifndef MAME_SHARP_MZ700_H +#define MAME_SHARP_MZ700_H #pragma once @@ -170,4 +170,4 @@ private: uint16_t m_mz800_ramaddr = 0; }; -#endif // MAME_INCLUDES_MZ700_H +#endif // MAME_SHARP_MZ700_H diff --git a/src/mame/sharp/mz80.h b/src/mame/sharp/mz80.h index fbe06966a1a..1c46404ec1e 100644 --- a/src/mame/sharp/mz80.h +++ b/src/mame/sharp/mz80.h @@ -5,8 +5,8 @@ * includes/mz80.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_MZ80_H -#define MAME_INCLUDES_MZ80_H +#ifndef MAME_SHARP_MZ80_H +#define MAME_SHARP_MZ80_H #pragma once @@ -77,4 +77,4 @@ private: extern const gfx_layout mz80k_charlayout; extern const gfx_layout mz80kj_charlayout; -#endif // MAME_INCLUDES_MZ80_H +#endif // MAME_SHARP_MZ80_H diff --git a/src/mame/sharp/pc1251.h b/src/mame/sharp/pc1251.h index e8e5895a52b..b7c4d8c9d36 100644 --- a/src/mame/sharp/pc1251.h +++ b/src/mame/sharp/pc1251.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PC1251_H -#define MAME_INCLUDES_PC1251_H +#ifndef MAME_SHARP_PC1251_H +#define MAME_SHARP_PC1251_H #include "pocketc.h" @@ -80,4 +80,4 @@ protected: virtual void machine_start() override; }; -#endif // MAME_INCLUDES_PC1251_H +#endif // MAME_SHARP_PC1251_H diff --git a/src/mame/sharp/pc1350.h b/src/mame/sharp/pc1350.h index 510d298cae4..94f660c4389 100644 --- a/src/mame/sharp/pc1350.h +++ b/src/mame/sharp/pc1350.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PC1350_H -#define MAME_INCLUDES_PC1350_H +#ifndef MAME_SHARP_PC1350_H +#define MAME_SHARP_PC1350_H #include "pocketc.h" #include "machine/ram.h" @@ -57,4 +57,4 @@ private: static const char* const s_sml[5]; }; -#endif // MAME_INCLUDES_PC1350_H +#endif // MAME_SHARP_PC1350_H diff --git a/src/mame/sharp/pc1401.h b/src/mame/sharp/pc1401.h index 45a391e481b..862e7b918fe 100644 --- a/src/mame/sharp/pc1401.h +++ b/src/mame/sharp/pc1401.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PC1401_H -#define MAME_INCLUDES_PC1401_H +#ifndef MAME_SHARP_PC1401_H +#define MAME_SHARP_PC1401_H #include "pocketc.h" @@ -63,4 +63,4 @@ private: static const char* const s_e[5]; }; -#endif // MAME_INCLUDES_PC1401_H +#endif // MAME_SHARP_PC1401_H diff --git a/src/mame/sharp/pc1403.h b/src/mame/sharp/pc1403.h index 2fb8b8aefea..e0b26fdd2b4 100644 --- a/src/mame/sharp/pc1403.h +++ b/src/mame/sharp/pc1403.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PC1403_H -#define MAME_INCLUDES_PC1403_H +#ifndef MAME_SHARP_PC1403_H +#define MAME_SHARP_PC1403_H #include "pocketc.h" @@ -83,4 +83,4 @@ protected: virtual void video_start() override; }; -#endif // MAME_INCLUDES_PC1403_H +#endif // MAME_SHARP_PC1403_H diff --git a/src/mame/sharp/pocketc.h b/src/mame/sharp/pocketc.h index 56e31b8d072..a06e3e6a503 100644 --- a/src/mame/sharp/pocketc.h +++ b/src/mame/sharp/pocketc.h @@ -5,8 +5,8 @@ * includes/pocketc.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_POCKETC_H -#define MAME_INCLUDES_POCKETC_H +#ifndef MAME_SHARP_POCKETC_H +#define MAME_SHARP_POCKETC_H #pragma once @@ -64,4 +64,4 @@ protected: static const rgb_t indirect_palette[6]; }; -#endif // MAME_INCLUDES_POCKETC_H +#endif // MAME_SHARP_POCKETC_H diff --git a/src/mame/sharp/x1.h b/src/mame/sharp/x1.h index 0c28bbbac72..49b2ea6eb87 100644 --- a/src/mame/sharp/x1.h +++ b/src/mame/sharp/x1.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_X1_H -#define MAME_INCLUDES_X1_H +#ifndef MAME_SHARP_X1_H +#define MAME_SHARP_X1_H #pragma once @@ -341,4 +341,4 @@ protected: DECLARE_DEVICE_TYPE(X1_KEYBOARD, x1_keyboard_device) -#endif // MAME_INCLUDES_X1_H +#endif // MAME_SHARP_X1_H diff --git a/src/mame/sharp/x68k.h b/src/mame/sharp/x68k.h index 5932d84f43d..ec9b23710ec 100644 --- a/src/mame/sharp/x68k.h +++ b/src/mame/sharp/x68k.h @@ -8,8 +8,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_X68K_H -#define MAME_INCLUDES_X68K_H +#ifndef MAME_SHARP_X68K_H +#define MAME_SHARP_X68K_H #pragma once @@ -344,4 +344,4 @@ protected: void x68030_map(address_map &map); }; -#endif // MAME_INCLUDES_X68K_H +#endif // MAME_SHARP_X68K_H diff --git a/src/mame/siemens/pcd_kbd.h b/src/mame/siemens/pcd_kbd.h index 7b6f31b5734..8faf838922e 100644 --- a/src/mame/siemens/pcd_kbd.h +++ b/src/mame/siemens/pcd_kbd.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Carl -#ifndef MAME_INCLUDES_PCD_KBD_H -#define MAME_INCLUDES_PCD_KBD_H +#ifndef MAME_SIEMENS_PCD_KBD_H +#define MAME_SIEMENS_PCD_KBD_H #pragma once @@ -37,4 +37,4 @@ private: DECLARE_DEVICE_TYPE(PCD_KEYBOARD, pcd_keyboard_device) -#endif // MAME_INCLUDES_PCD_KBD_H +#endif // MAME_SIEMENS_PCD_KBD_H diff --git a/src/mame/sigma/spiders.h b/src/mame/sigma/spiders.h index 0e0da365564..a742a020e13 100644 --- a/src/mame/sigma/spiders.h +++ b/src/mame/sigma/spiders.h @@ -5,8 +5,8 @@ Sigma Spiders hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_SPIDERS_H -#define MAME_INCLUDES_SPIDERS_H +#ifndef MAME_SIGMA_SPIDERS_H +#define MAME_SIGMA_SPIDERS_H #pragma once @@ -62,4 +62,4 @@ private: uint8_t m_gfx_rom_ctrl_data = 0; }; -#endif // MAME_INCLUDES_SPIDERS_H +#endif // MAME_SIGMA_SPIDERS_H diff --git a/src/mame/sinclair/beta_m.h b/src/mame/sinclair/beta_m.h index 72ed4353cd0..fbf90773b38 100644 --- a/src/mame/sinclair/beta_m.h +++ b/src/mame/sinclair/beta_m.h @@ -9,8 +9,8 @@ 04/05/2008 Created by Miodrag Milanovic *********************************************************************/ -#ifndef MAME_SINCLAIR_BETA_H -#define MAME_SINCLAIR_BETA_H +#ifndef MAME_SINCLAIR_BETA_M_H +#define MAME_SINCLAIR_BETA_M_H #pragma once @@ -67,4 +67,4 @@ private: DECLARE_DEVICE_TYPE(BETA_DISK, beta_disk_device) -#endif // MAME_SINCLAIR_BETA_H +#endif // MAME_SINCLAIR_BETA_M_H diff --git a/src/mame/skeleton/busicom.h b/src/mame/skeleton/busicom.h index e77babc0bc2..3cde14f7171 100644 --- a/src/mame/skeleton/busicom.h +++ b/src/mame/skeleton/busicom.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_BUSICOM_H -#define MAME_INCLUDES_BUSICOM_H +#ifndef MAME_SKELETON_BUSICOM_H +#define MAME_SKELETON_BUSICOM_H #pragma once @@ -62,4 +62,4 @@ private: required_ioport_array<10> m_input_lines; }; -#endif // MAME_INCLUDES_BUSICOM_H +#endif // MAME_SKELETON_BUSICOM_H diff --git a/src/mame/skeleton/cosmicos.h b/src/mame/skeleton/cosmicos.h index 72e09c5fbc4..9af09a0bbf5 100644 --- a/src/mame/skeleton/cosmicos.h +++ b/src/mame/skeleton/cosmicos.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_COSMICOS_H -#define MAME_INCLUDES_COSMICOS_H +#ifndef MAME_SKELETON_COSMICOS_H +#define MAME_SKELETON_COSMICOS_H #pragma once @@ -144,4 +144,4 @@ private: output_finder<14> m_leds; }; -#endif // MAME_INCLUDES_COSMICOS_H +#endif // MAME_SKELETON_COSMICOS_H diff --git a/src/mame/skeleton/cxhumax.h b/src/mame/skeleton/cxhumax.h index 0dd31d9a989..d94b4245e1f 100644 --- a/src/mame/skeleton/cxhumax.h +++ b/src/mame/skeleton/cxhumax.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Lukasz Markowski -#ifndef MAME_INCLUDES_CXHUMAX_H -#define MAME_INCLUDES_CXHUMAX_H +#ifndef MAME_SKELETON_CXHUMAX_H +#define MAME_SKELETON_CXHUMAX_H #pragma once @@ -283,4 +283,4 @@ private: #define DRM_BCKGND_REG 3 #define DRM_OSD_PTR_REG 32 -#endif // MAME_INCLUDES_CXHUMAX_H +#endif // MAME_SKELETON_CXHUMAX_H diff --git a/src/mame/skeleton/dm7000.h b/src/mame/skeleton/dm7000.h index 5cd5bc8ee5c..e112e48b0f2 100644 --- a/src/mame/skeleton/dm7000.h +++ b/src/mame/skeleton/dm7000.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Lukasz Markowski -#ifndef MAME_INCLUDES_DM7000_H -#define MAME_INCLUDES_DM7000_H +#ifndef MAME_SKELETON_DM7000_H +#define MAME_SKELETON_DM7000_H #pragma once @@ -95,4 +95,4 @@ private: #define DCRSTB045_DISP_MODE 0x154 /* Display Mode Register */ #define DCRSTB045_FRAME_BUFR_BASE 0x179 /* Frame Buffers Base Address Register */ -#endif // MAME_INCLUDES_DM7000_H +#endif // MAME_SKELETON_DM7000_H diff --git a/src/mame/skeleton/micronic.h b/src/mame/skeleton/micronic.h index 5613849754c..23694bd18f7 100644 --- a/src/mame/skeleton/micronic.h +++ b/src/mame/skeleton/micronic.h @@ -5,8 +5,8 @@ includes/micronic.h *****************************************************************************/ -#ifndef MAME_INCLUDES_MICRONIC_H -#define MAME_INCLUDES_MICRONIC_H +#ifndef MAME_SKELETON_MICRONIC_H +#define MAME_SKELETON_MICRONIC_H #pragma once @@ -105,4 +105,4 @@ private: optional_device m_cassette; }; -#endif // MAME_INCLUDES_MICRONIC_H +#endif // MAME_SKELETON_MICRONIC_H diff --git a/src/mame/skeleton/softbox.h b/src/mame/skeleton/softbox.h index cdaf5a38a6b..8c75724ecac 100644 --- a/src/mame/skeleton/softbox.h +++ b/src/mame/skeleton/softbox.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Mike Naberezny -#ifndef MAME_INCLUDES_SOFTBOX_H -#define MAME_INCLUDES_SOFTBOX_H +#ifndef MAME_SKELETON_SOFTBOX_H +#define MAME_SKELETON_SOFTBOX_H #pragma once @@ -67,4 +67,4 @@ private: output_finder<3> m_leds; }; -#endif +#endif // MAME_SKELETON_SOFTBOX_H diff --git a/src/mame/skeleton/vp415.h b/src/mame/skeleton/vp415.h index 37f682e5209..abaa86641ce 100644 --- a/src/mame/skeleton/vp415.h +++ b/src/mame/skeleton/vp415.h @@ -38,8 +38,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_VP415_H -#define MAME_INCLUDES_VP415_H +#ifndef MAME_SKELETON_VP415_H +#define MAME_SKELETON_VP415_H #pragma once @@ -277,4 +277,4 @@ private: static const char *const SYNCGEN_TAG; }; -#endif // MAME_INCLUDES_VP415_H +#endif // MAME_SKELETON_VP415_H diff --git a/src/mame/skeleton/xor100.h b/src/mame/skeleton/xor100.h index 06179202412..04751838180 100644 --- a/src/mame/skeleton/xor100.h +++ b/src/mame/skeleton/xor100.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_XOR100_H -#define MAME_INCLUDES_XOR100_H +#ifndef MAME_SKELETON_XOR100_H +#define MAME_SKELETON_XOR100_H #pragma once @@ -110,4 +110,4 @@ private: int m_centronics_select = 0; }; -#endif // MAME_INCLUDES_XOR100_H +#endif // MAME_SKELETON_XOR100_H diff --git a/src/mame/skeleton/zorba.h b/src/mame/skeleton/zorba.h index 2b67f2d0368..9c7266428d7 100644 --- a/src/mame/skeleton/zorba.h +++ b/src/mame/skeleton/zorba.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Robbbert, Vas Crabb -#ifndef MAME_INCLUDES_ZORBA_H -#define MAME_INCLUDES_ZORBA_H +#ifndef MAME_SKELETON_ZORBA_H +#define MAME_SKELETON_ZORBA_H #pragma once @@ -128,4 +128,4 @@ private: uint8_t m_term_data = 0U; }; -#endif // MAME_INCLUDES_ZORBA_H +#endif // MAME_SKELETON_ZORBA_H diff --git a/src/mame/snk/hng64.h b/src/mame/snk/hng64.h index 1a4be231e91..3b7368135be 100644 --- a/src/mame/snk/hng64.h +++ b/src/mame/snk/hng64.h @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner -#ifndef MAME_INCLUDES_HNG64_H -#define MAME_INCLUDES_HNG64_H +#ifndef MAME_SNK_HNG64_H +#define MAME_SNK_HNG64_H #pragma once @@ -509,4 +509,4 @@ private: void hng_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_HNG64_H +#endif // MAME_SNK_HNG64_H diff --git a/src/mame/snk/lasso.h b/src/mame/snk/lasso.h index e77a8679b77..537cd3f1694 100644 --- a/src/mame/snk/lasso.h +++ b/src/mame/snk/lasso.h @@ -5,8 +5,8 @@ Lasso and similar hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_LASSO_H -#define MAME_INCLUDES_LASSO_H +#ifndef MAME_SNK_LASSO_H +#define MAME_SNK_LASSO_H #pragma once @@ -113,4 +113,4 @@ private: void wwjgtin_main_map(address_map &map); }; -#endif // MAME_INCLUDES_LASSO_H +#endif // MAME_SNK_LASSO_H diff --git a/src/mame/snk/prehisle.h b/src/mame/snk/prehisle.h index 8da44163e53..39a2d917b28 100644 --- a/src/mame/snk/prehisle.h +++ b/src/mame/snk/prehisle.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_PREHISLE_H -#define MAME_INCLUDES_PREHISLE_H +#ifndef MAME_SNK_PREHISLE_H +#define MAME_SNK_PREHISLE_H #pragma once @@ -77,4 +77,4 @@ private: required_device m_soundlatch; }; -#endif // MAME_INCLUDES_PREHISLE_H +#endif // MAME_SNK_PREHISLE_H diff --git a/src/mame/snk/snk.h b/src/mame/snk/snk.h index 9e61df6356c..f0ac901b90a 100644 --- a/src/mame/snk/snk.h +++ b/src/mame/snk/snk.h @@ -7,8 +7,8 @@ various SNK triple Z80 games *************************************************************************/ -#ifndef MAME_INCLUDES_SNK_H -#define MAME_INCLUDES_SNK_H +#ifndef MAME_SNK_SNK_H +#define MAME_SNK_SNK_H #pragma once @@ -289,4 +289,4 @@ private: void tnk3_cpuB_map(address_map &map); }; -#endif // MAME_INCLUDES_SNK_H +#endif // MAME_SNK_SNK_H diff --git a/src/mame/snk/snk6502.h b/src/mame/snk/snk6502.h index d9a8d321fb6..45cdbc9f25a 100644 --- a/src/mame/snk/snk6502.h +++ b/src/mame/snk/snk6502.h @@ -5,8 +5,8 @@ rokola hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SNK6502_H -#define MAME_INCLUDES_SNK6502_H +#ifndef MAME_SNK_SNK6502_H +#define MAME_SNK_SNK6502_H #pragma once @@ -139,4 +139,4 @@ private: required_device m_sound; }; -#endif // MAME_INCLUDES_SNK6502_H +#endif // MAME_SNK_SNK6502_H diff --git a/src/mame/snk/snk6502_a.h b/src/mame/snk/snk6502_a.h index 8780ffa5044..9b067ed166c 100644 --- a/src/mame/snk/snk6502_a.h +++ b/src/mame/snk/snk6502_a.h @@ -5,8 +5,8 @@ rokola hardware *************************************************************************/ -#ifndef MAME_SNK_SNK6502_H -#define MAME_SNK_SNK6502_H +#ifndef MAME_SNK_SNK6502_A_H +#define MAME_SNK_SNK6502_A_H #pragma once @@ -192,4 +192,4 @@ DECLARE_DEVICE_TYPE(PBALLOON_SOUND, pballoon_sound_device) DECLARE_DEVICE_TYPE(SASUKE_SOUND, sasuke_sound_device) DECLARE_DEVICE_TYPE(SATANSAT_SOUND, satansat_sound_device) -#endif // MAME_SNK_SNK6502_H +#endif // MAME_SNK_SNK6502_A_H diff --git a/src/mame/stern/cliffhgr_a.h b/src/mame/stern/cliffhgr_a.h index bd128d79178..353d892ecc1 100644 --- a/src/mame/stern/cliffhgr_a.h +++ b/src/mame/stern/cliffhgr_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles,Ernesto Corvi -#ifndef MAME_STERN_CLIFFHGR_H -#define MAME_STERN_CLIFFHGR_H +#ifndef MAME_STERN_CLIFFHGR_A_H +#define MAME_STERN_CLIFFHGR_A_H #pragma once @@ -9,4 +9,4 @@ DISCRETE_SOUND_EXTERN( cliffhgr_discrete ); -#endif // MAME_STERN_CLIFFHGR_H +#endif // MAME_STERN_CLIFFHGR_A_H diff --git a/src/mame/subsino/subsino_m.h b/src/mame/subsino/subsino_m.h index 3f66ec053cf..ffad2f463f0 100644 --- a/src/mame/subsino/subsino_m.h +++ b/src/mame/subsino/subsino_m.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia, David Haywood, Angelo Salese, Roberto Fresca -#ifndef MAME_SUBSINO_SUBSINO_H -#define MAME_SUBSINO_SUBSINO_H +#ifndef MAME_SUBSINO_SUBSINO_M_H +#define MAME_SUBSINO_SUBSINO_M_H #pragma once @@ -20,4 +20,4 @@ void victor21_bitswaps(uint8_t *decrypt, int i); void subsino_decrypt(running_machine& machine, void (*bitswaps)(uint8_t *decrypt, int i), const uint8_t *xors, int size); -#endif // MAME_SUBSINO_SUBSINO_H +#endif // MAME_SUBSINO_SUBSINO_M_H diff --git a/src/mame/suna/suna8.h b/src/mame/suna/suna8.h index da4f804676d..7dc93f0499f 100644 --- a/src/mame/suna/suna8.h +++ b/src/mame/suna/suna8.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_SUNA8_H -#define MAME_INCLUDES_SUNA8_H +#ifndef MAME_SUNA_SUNA8_H +#define MAME_SUNA_SUNA8_H #pragma once @@ -220,4 +220,4 @@ private: int m_numsamples = 0; }; -#endif // MAME_INCLUDES_SUNA8_H +#endif // MAME_SUNA_SUNA8_H diff --git a/src/mame/sunelectronics/markham.h b/src/mame/sunelectronics/markham.h index 4234d9d8bb4..a9943c71edf 100644 --- a/src/mame/sunelectronics/markham.h +++ b/src/mame/sunelectronics/markham.h @@ -7,8 +7,8 @@ *************************************************************************/ -#ifndef MAME_INCLUDES_MARKHAM_H -#define MAME_INCLUDES_MARKHAM_H +#ifndef MAME_SUNELECTRONICS_MARKHAM_H +#define MAME_SUNELECTRONICS_MARKHAM_H #pragma once @@ -129,4 +129,4 @@ private: u8 m_strnskil_slave_irq = 0; }; -#endif // MAME_INCLUDES_MARKHAM_H +#endif // MAME_SUNELECTRONICS_MARKHAM_H diff --git a/src/mame/sunelectronics/route16.h b/src/mame/sunelectronics/route16.h index 72a43159957..b5c2a78d8a9 100644 --- a/src/mame/sunelectronics/route16.h +++ b/src/mame/sunelectronics/route16.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari -#ifndef MAME_INCLUDES_ROUTE16_H -#define MAME_INCLUDES_ROUTE16_H +#ifndef MAME_SUNELECTRONICS_ROUTE16_H +#define MAME_SUNELECTRONICS_ROUTE16_H #pragma once @@ -84,4 +84,4 @@ protected: uint8_t m_palette_2 = 0; }; -#endif // MAME_INCLUDES_ROUTE16_H +#endif // MAME_SUNELECTRONICS_ROUTE16_H diff --git a/src/mame/sunelectronics/shangha3.h b/src/mame/sunelectronics/shangha3.h index 9082d612289..74e4a9eb661 100644 --- a/src/mame/sunelectronics/shangha3.h +++ b/src/mame/sunelectronics/shangha3.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_SHANGHA3_H -#define MAME_INCLUDES_SHANGHA3_H +#ifndef MAME_SUNELECTRONICS_SHANGHA3_H +#define MAME_SUNELECTRONICS_SHANGHA3_H #pragma once @@ -88,4 +88,4 @@ private: void shangha3_map(address_map &map); }; -#endif // MAME_INCLUDES_SHANGHA3_H +#endif // MAME_SUNELECTRONICS_SHANGHA3_H diff --git a/src/mame/svision/svision.h b/src/mame/svision/svision.h index 1387991bb56..e0c8fe09756 100644 --- a/src/mame/svision/svision.h +++ b/src/mame/svision/svision.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_SVISION_H -#define MAME_INCLUDES_SVISION_H +#ifndef MAME_SVISION_SVISION_H +#define MAME_SVISION_SVISION_H #pragma once @@ -125,4 +125,4 @@ private: bool m_dma_finished = false; }; -#endif // MAME_INCLUDES_SVISION_H +#endif // MAME_SVISION_SVISION_H diff --git a/src/mame/swtpc/swtpc09.h b/src/mame/swtpc/swtpc09.h index e8794e1a22c..1edae23de49 100644 --- a/src/mame/swtpc/swtpc09.h +++ b/src/mame/swtpc/swtpc09.h @@ -6,8 +6,8 @@ ****************************************************************************/ -#ifndef MAME_INCLUDES_SWTPC09_H -#define MAME_INCLUDES_SWTPC09_H +#ifndef MAME_SWTPC_SWTPC09_H +#define MAME_SWTPC_SWTPC09_H #pragma once @@ -237,4 +237,4 @@ private: void m6844_hdc_dma_transfer(uint8_t channel); }; -#endif // MAME_INCLUDES_SWTPC09_H +#endif // MAME_SWTPC_SWTPC09_H diff --git a/src/mame/taito/crbaloon.h b/src/mame/taito/crbaloon.h index 3fcdf1357fa..d021e8de373 100644 --- a/src/mame/taito/crbaloon.h +++ b/src/mame/taito/crbaloon.h @@ -5,8 +5,8 @@ Crazy Ballooon *************************************************************************/ -#ifndef MAME_INCLUDES_CRBALOON_H -#define MAME_INCLUDES_CRBALOON_H +#ifndef MAME_TAITO_CRBALOON_H +#define MAME_TAITO_CRBALOON_H #pragma once @@ -80,4 +80,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_CRBALOON_H +#endif // MAME_TAITO_CRBALOON_H diff --git a/src/mame/taito/darius.h b/src/mame/taito/darius.h index ea66b46186b..8d90be56ab7 100644 --- a/src/mame/taito/darius.h +++ b/src/mame/taito/darius.h @@ -5,8 +5,8 @@ Darius *************************************************************************/ -#ifndef MAME_INCLUDES_DARIUS_H -#define MAME_INCLUDES_DARIUS_H +#ifndef MAME_TAITO_DARIUS_H +#define MAME_TAITO_DARIUS_H #pragma once @@ -125,4 +125,4 @@ private: void darius_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_DARIUS_H +#endif // MAME_TAITO_DARIUS_H diff --git a/src/mame/taito/grchamp.h b/src/mame/taito/grchamp.h index 9f90850af27..2f4c582c407 100644 --- a/src/mame/taito/grchamp.h +++ b/src/mame/taito/grchamp.h @@ -5,8 +5,8 @@ Taito Grand Champ hardware *************************************************************************/ -#ifndef MAME_INCLUDES_GRCHAMP_H -#define MAME_INCLUDES_GRCHAMP_H +#ifndef MAME_TAITO_GRCHAMP_H +#define MAME_TAITO_GRCHAMP_H #pragma once @@ -147,4 +147,4 @@ private: DISCRETE_SOUND_EXTERN( grchamp_discrete ); -#endif // MAME_INCLUDES_GRCHAMP_H +#endif // MAME_TAITO_GRCHAMP_H diff --git a/src/mame/taito/gsword.h b/src/mame/taito/gsword.h index 049b0ad6b72..53f6f93a5fc 100644 --- a/src/mame/taito/gsword.h +++ b/src/mame/taito/gsword.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Steve Ellenoff,Jarek Parchanski -#ifndef MAME_INCLUDES_GSWORD_H -#define MAME_INCLUDES_GSWORD_H +#ifndef MAME_TAITO_GSWORD_H +#define MAME_TAITO_GSWORD_H #pragma once @@ -171,4 +171,4 @@ private: u8 m_mcu2_p1; }; -#endif // MAME_INCLUDES_GSWORD_H +#endif // MAME_TAITO_GSWORD_H diff --git a/src/mame/taito/ninjaw.h b/src/mame/taito/ninjaw.h index 148b4e3d3ae..d71d85ee0f3 100644 --- a/src/mame/taito/ninjaw.h +++ b/src/mame/taito/ninjaw.h @@ -5,8 +5,8 @@ Taito Triple Screen Games *************************************************************************/ -#ifndef MAME_INCLUDES_NINJAW_H -#define MAME_INCLUDES_NINJAW_H +#ifndef MAME_TAITO_NINJAW_H +#define MAME_TAITO_NINJAW_H #pragma once @@ -83,4 +83,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_NINJAW_H +#endif // MAME_TAITO_NINJAW_H diff --git a/src/mame/taito/othunder.h b/src/mame/taito/othunder.h index 8ed0a2483ef..0f22d6a7111 100644 --- a/src/mame/taito/othunder.h +++ b/src/mame/taito/othunder.h @@ -5,8 +5,8 @@ Operation Thunderbolt *************************************************************************/ -#ifndef MAME_INCLUDES_OTHUNDER_H -#define MAME_INCLUDES_OTHUNDER_H +#ifndef MAME_TAITO_OTHUNDER_H +#define MAME_TAITO_OTHUNDER_H #pragma once @@ -101,4 +101,4 @@ private: required_device m_gfxdecode; }; -#endif // MAME_INCLUDES_OTHUNDER_H +#endif // MAME_TAITO_OTHUNDER_H diff --git a/src/mame/taito/qix.h b/src/mame/taito/qix.h index d5e545f4e76..bc18b808b8b 100644 --- a/src/mame/taito/qix.h +++ b/src/mame/taito/qix.h @@ -6,8 +6,8 @@ Taito Qix hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_QIX_H -#define MAME_INCLUDES_QIX_H +#ifndef MAME_TAITO_QIX_H +#define MAME_TAITO_QIX_H #pragma once @@ -211,4 +211,4 @@ private: required_memory_bank m_vidbank; }; -#endif // MAME_INCLUDES_QIX_H +#endif // MAME_TAITO_QIX_H diff --git a/src/mame/taito/slapshot.h b/src/mame/taito/slapshot.h index aff1c276c75..99116c35be3 100644 --- a/src/mame/taito/slapshot.h +++ b/src/mame/taito/slapshot.h @@ -5,8 +5,8 @@ Slapshot / Operation Wolf 3 *************************************************************************/ -#ifndef MAME_INCLUDES_SLAPSHOT_H -#define MAME_INCLUDES_SLAPSHOT_H +#ifndef MAME_TAITO_SLAPSHOT_H +#define MAME_TAITO_SLAPSHOT_H #pragma once @@ -113,4 +113,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_SLAPSHOT_H +#endif // MAME_TAITO_SLAPSHOT_H diff --git a/src/mame/taito/spdheat.h b/src/mame/taito/spdheat.h index 4ac5a093fd5..880574bc5c1 100644 --- a/src/mame/taito/spdheat.h +++ b/src/mame/taito/spdheat.h @@ -5,8 +5,8 @@ Super Dead Heat hardware *************************************************************************/ -#ifndef MAME_INCLUDES_SPDHEAT_H -#define MAME_INCLUDES_SPDHEAT_H +#ifndef MAME_TAITO_SPDHEAT_H +#define MAME_TAITO_SPDHEAT_H #pragma once @@ -100,4 +100,4 @@ private: template uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); }; -#endif // MAME_INCLUDES_SPDHEAT_H +#endif // MAME_TAITO_SPDHEAT_H diff --git a/src/mame/taito/superchs.h b/src/mame/taito/superchs.h index 320fd7dd665..7b2d76f6940 100644 --- a/src/mame/taito/superchs.h +++ b/src/mame/taito/superchs.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves -#ifndef MAME_INCLUDES_SUPERCHS_H -#define MAME_INCLUDES_SUPERCHS_H +#ifndef MAME_TAITO_SUPERCHS_H +#define MAME_TAITO_SUPERCHS_H #pragma once @@ -73,4 +73,4 @@ private: void superchs_map(address_map &map); }; -#endif // MAME_INCLUDES_SUPERCHS_H +#endif // MAME_TAITO_SUPERCHS_H diff --git a/src/mame/taito/superqix.h b/src/mame/taito/superqix.h index 784857082a2..5d895479095 100644 --- a/src/mame/taito/superqix.h +++ b/src/mame/taito/superqix.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni, Nicola Salmoria, Tomasz Slanina -#ifndef MAME_INCLUDES_SUPERQIX_H -#define MAME_INCLUDES_SUPERQIX_H +#ifndef MAME_TAITO_SUPERQIX_H +#define MAME_TAITO_SUPERQIX_H #pragma once @@ -212,4 +212,4 @@ private: int m_dial_sign[2]; }; -#endif // MAME_INCLUDES_SUPERQIX_H +#endif // MAME_TAITO_SUPERQIX_H diff --git a/src/mame/taito/taito_b.h b/src/mame/taito/taito_b.h index e41a325c216..18489bffac1 100644 --- a/src/mame/taito/taito_b.h +++ b/src/mame/taito/taito_b.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Jarek Burczynski -#ifndef MAME_INCLUDES_TAITO_B_H -#define MAME_INCLUDES_TAITO_B_H +#ifndef MAME_TAITO_TAITO_B_H +#define MAME_TAITO_TAITO_B_H #pragma once @@ -172,4 +172,4 @@ private: required_shared_ptr m_pixelram; }; -#endif // MAME_INCLUDES_TAITO_B_H +#endif // MAME_TAITO_TAITO_B_H diff --git a/src/mame/taito/taito_f2.h b/src/mame/taito/taito_f2.h index 0afe7e742ae..fd672262295 100644 --- a/src/mame/taito/taito_f2.h +++ b/src/mame/taito/taito_f2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Graves, Bryan McPhail, Brad Oliver, Andrew Prime, Brian Troha, Nicola Salmoria -#ifndef MAME_INCLUDES_TAITO_F2_H -#define MAME_INCLUDES_TAITO_F2_H +#ifndef MAME_TAITO_TAITO_F2_H +#define MAME_TAITO_TAITO_F2_H #pragma once @@ -287,4 +287,4 @@ protected: void yuyugogo_map(address_map &map); }; -#endif // MAME_INCLUDES_TAITO_F2_H +#endif // MAME_TAITO_TAITO_F2_H diff --git a/src/mame/taito/taito_f3.h b/src/mame/taito/taito_f3.h index 03a4c11d546..e667f5fbad9 100644 --- a/src/mame/taito/taito_f3.h +++ b/src/mame/taito/taito_f3.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail -#ifndef MAME_INCLUDES_TAITO_F3_H -#define MAME_INCLUDES_TAITO_F3_H +#ifndef MAME_TAITO_TAITO_F3_H +#define MAME_TAITO_TAITO_F3_H #pragma once @@ -396,4 +396,4 @@ private: void bubsympb_oki_map(address_map &map); }; -#endif // MAME_INCLUDES_TAITO_F3_H +#endif // MAME_TAITO_TAITO_F3_H diff --git a/src/mame/taito/taito_h.h b/src/mame/taito/taito_h.h index 80975d11d8c..e89745092d1 100644 --- a/src/mame/taito/taito_h.h +++ b/src/mame/taito/taito_h.h @@ -5,8 +5,8 @@ Taito H system *************************************************************************/ -#ifndef MAME_INCLUDES_TAITO_H_H -#define MAME_INCLUDES_TAITO_H_H +#ifndef MAME_TAITO_TAITO_H_H +#define MAME_TAITO_TAITO_H_H #pragma once @@ -84,4 +84,4 @@ private: void syvalion_map(address_map &map); }; -#endif // MAME_INCLUDES_TAITO_H_H +#endif // MAME_TAITO_TAITO_H_H diff --git a/src/mame/taito/taito_l.h b/src/mame/taito/taito_l.h index 0f1c57baa0c..fe22b1c2c0c 100644 --- a/src/mame/taito/taito_l.h +++ b/src/mame/taito/taito_l.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_INCLUDES_TAITO_L_H -#define MAME_INCLUDES_TAITO_L_H +#ifndef MAME_TAITO_TAITO_L_H +#define MAME_TAITO_TAITO_L_H #pragma once @@ -224,4 +224,4 @@ private: void horshoes_map(address_map &map); }; -#endif // MAME_INCLUDES_TAITO_L_H +#endif // MAME_TAITO_TAITO_L_H diff --git a/src/mame/taito/taito_z.h b/src/mame/taito/taito_z.h index 987c9541511..6402bc6417c 100644 --- a/src/mame/taito/taito_z.h +++ b/src/mame/taito/taito_z.h @@ -5,8 +5,8 @@ Taito Z system *************************************************************************/ -#ifndef MAME_INCLUDES_TAITO_Z_H -#define MAME_INCLUDES_TAITO_Z_H +#ifndef MAME_TAITO_TAITO_Z_H +#define MAME_TAITO_TAITO_Z_H #pragma once @@ -312,4 +312,4 @@ private: output_finder<2> m_recoil; }; -#endif // MAME_INCLUDES_TAITO_Z_H +#endif // MAME_TAITO_TAITO_Z_H diff --git a/src/mame/taito/taitoair.h b/src/mame/taito/taitoair.h index 327833315bb..0807f2bc6a5 100644 --- a/src/mame/taito/taitoair.h +++ b/src/mame/taito/taitoair.h @@ -5,8 +5,8 @@ Taito Air System *************************************************************************/ -#ifndef MAME_INCLUDES_TAITOAIR_H -#define MAME_INCLUDES_TAITOAIR_H +#ifndef MAME_TAITO_TAITOAIR_H +#define MAME_TAITO_TAITOAIR_H #pragma once @@ -152,4 +152,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_TAITOAIR_H +#endif // MAME_TAITO_TAITOAIR_H diff --git a/src/mame/taito/topspeed.h b/src/mame/taito/topspeed.h index c8bb825e8dc..2c5c35b22fb 100644 --- a/src/mame/taito/topspeed.h +++ b/src/mame/taito/topspeed.h @@ -5,8 +5,8 @@ Top Speed / Full Throttle *************************************************************************/ -#ifndef MAME_INCLUDES_TOPSPEED_H -#define MAME_INCLUDES_TOPSPEED_H +#ifndef MAME_TAITO_TOPSPEED_H +#define MAME_TAITO_TOPSPEED_H #pragma once @@ -112,4 +112,4 @@ private: void z80_prg(address_map &map); }; -#endif // MAME_INCLUDES_TOPSPEED_H +#endif // MAME_TAITO_TOPSPEED_H diff --git a/src/mame/taito/tsamurai.h b/src/mame/taito/tsamurai.h index 01012b9d46b..6841b633912 100644 --- a/src/mame/taito/tsamurai.h +++ b/src/mame/taito/tsamurai.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino -#ifndef MAME_INCLUDES_TSAMURAI_H -#define MAME_INCLUDES_TSAMURAI_H +#ifndef MAME_TAITO_TSAMURAI_H +#define MAME_TAITO_TSAMURAI_H #pragma once @@ -175,4 +175,4 @@ private: int m_sound_command3 = 0; }; -#endif // MAME_INCLUDES_TSAMURAI_H +#endif // MAME_TAITO_TSAMURAI_H diff --git a/src/mame/taito/undrfire.h b/src/mame/taito/undrfire.h index 5f9d12a4ddd..611bf62f5bd 100644 --- a/src/mame/taito/undrfire.h +++ b/src/mame/taito/undrfire.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Graves -#ifndef MAME_INCLUDES_UNDRFIRE_H -#define MAME_INCLUDES_UNDRFIRE_H +#ifndef MAME_TAITO_UNDRFIRE_H +#define MAME_TAITO_UNDRFIRE_H #pragma once @@ -96,4 +96,4 @@ private: void undrfire_map(address_map &map); }; -#endif // MAME_INCLUDES_UNDRFIRE_H +#endif // MAME_TAITO_UNDRFIRE_H diff --git a/src/mame/taito/wgp.h b/src/mame/taito/wgp.h index a030258b07d..777424bbbe1 100644 --- a/src/mame/taito/wgp.h +++ b/src/mame/taito/wgp.h @@ -5,8 +5,8 @@ World Grand Prix *************************************************************************/ -#ifndef MAME_INCLUDES_WGP_H -#define MAME_INCLUDES_WGP_H +#ifndef MAME_TAITO_WGP_H +#define MAME_TAITO_WGP_H #pragma once @@ -121,4 +121,4 @@ private: optional_ioport m_fake; }; -#endif // MAME_INCLUDES_WGP_H +#endif // MAME_TAITO_WGP_H diff --git a/src/mame/tandberg/tdv2324.h b/src/mame/tandberg/tdv2324.h index 9b8164c92cb..1eb6e38cdeb 100644 --- a/src/mame/tandberg/tdv2324.h +++ b/src/mame/tandberg/tdv2324.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder,Jonathan Gevaryahu -#ifndef MAME_INCLUDES_TDV2324_H -#define MAME_INCLUDES_TDV2324_H +#ifndef MAME_TANDBERG_TDV2324_H +#define MAME_TANDBERG_TDV2324_H #pragma once @@ -89,4 +89,4 @@ private: }; -#endif +#endif // MAME_TANDBERG_TDV2324_H diff --git a/src/mame/tangerine/microtan.h b/src/mame/tangerine/microtan.h index 9c279b303d3..16a9af5966c 100644 --- a/src/mame/tangerine/microtan.h +++ b/src/mame/tangerine/microtan.h @@ -10,8 +10,8 @@ * ******************************************************************************/ -#ifndef MAME_INCLUDES_MICROTAN_H -#define MAME_INCLUDES_MICROTAN_H +#ifndef MAME_TANGERINE_MICROTAN_H +#define MAME_TANGERINE_MICROTAN_H #pragma once @@ -117,4 +117,4 @@ private: void bffx_w(offs_t offset, uint8_t data); }; -#endif // MAME_INCLUDES_MICROTAN_H +#endif // MAME_TANGERINE_MICROTAN_H diff --git a/src/mame/tatsumi/lockon.h b/src/mame/tatsumi/lockon.h index 39ea84ea77d..c14378c5dd0 100644 --- a/src/mame/tatsumi/lockon.h +++ b/src/mame/tatsumi/lockon.h @@ -5,8 +5,8 @@ Lock-On hardware *************************************************************************/ -#ifndef MAME_INCLUDES_LOCKON_H -#define MAME_INCLUDES_LOCKON_H +#ifndef MAME_TATSUMI_LOCKON_H +#define MAME_TATSUMI_LOCKON_H #pragma once @@ -158,4 +158,4 @@ private: void sound_prg(address_map &map); }; -#endif // MAME_INCLUDES_LOCKON_H +#endif // MAME_TATSUMI_LOCKON_H diff --git a/src/mame/tatsumi/tatsumi.h b/src/mame/tatsumi/tatsumi.h index 15fd6230212..f03b2f24a16 100644 --- a/src/mame/tatsumi/tatsumi.h +++ b/src/mame/tatsumi/tatsumi.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, Angelo Salese -#ifndef MAME_INCLUDES_TATSUMI_H -#define MAME_INCLUDES_TATSUMI_H +#ifndef MAME_TATSUMI_TATSUMI_H +#define MAME_TATSUMI_TATSUMI_H #pragma once @@ -262,4 +262,4 @@ private: void apply_highlight_bitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect, bitmap_ind8 &highlight_bitmap); }; -#endif // MAME_INCLUDES_TATSUMI_H +#endif // MAME_TATSUMI_TATSUMI_H diff --git a/src/mame/tatsumi/tx1.h b/src/mame/tatsumi/tx1.h index 76dd6e1182f..482d1813136 100644 --- a/src/mame/tatsumi/tx1.h +++ b/src/mame/tatsumi/tx1.h @@ -5,8 +5,8 @@ TX-1/Buggy Boy hardware *************************************************************************/ -#ifndef MAME_INCLUDES_TX1_H -#define MAME_INCLUDES_TX1_H +#ifndef MAME_TATSUMI_TX1_H +#define MAME_TATSUMI_TX1_H #pragma once @@ -243,4 +243,4 @@ private: void tx1_math(address_map &map); }; -#endif // MAME_INCLUDES_TX1_H +#endif // MAME_TATSUMI_TX1_H diff --git a/src/mame/tatsumi/tx1_a.h b/src/mame/tatsumi/tx1_a.h index 8403a55804a..149ba2a8dd6 100644 --- a/src/mame/tatsumi/tx1_a.h +++ b/src/mame/tatsumi/tx1_a.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_TATSUMI_TX1_H -#define MAME_TATSUMI_TX1_H +#ifndef MAME_TATSUMI_TX1_A_H +#define MAME_TATSUMI_TX1_A_H #pragma once @@ -192,4 +192,4 @@ DECLARE_DEVICE_TYPE(TX1J_SOUND, tx1j_sound_device) DECLARE_DEVICE_TYPE(BUGGYBOY_SOUND, buggyboy_sound_device) DECLARE_DEVICE_TYPE(BUGGYBOYJR_SOUND, buggyboyjr_sound_device) -#endif // MAME_TATSUMI_TX1_H +#endif // MAME_TATSUMI_TX1_A_H diff --git a/src/mame/tch/kickgoal.h b/src/mame/tch/kickgoal.h index 65173fc3e71..0bb5861cac7 100644 --- a/src/mame/tch/kickgoal.h +++ b/src/mame/tch/kickgoal.h @@ -5,8 +5,8 @@ Kick Goal - Action Hollywood *************************************************************************/ -#ifndef MAME_INCLUDES_KICKGOAL_H -#define MAME_INCLUDES_KICKGOAL_H +#ifndef MAME_TCH_KICKGOAL_H +#define MAME_TCH_KICKGOAL_H #pragma once @@ -121,4 +121,4 @@ private: required_device m_soundlatch; }; -#endif // MAME_INCLUDES_KICKGOAL_H +#endif // MAME_TCH_KICKGOAL_H diff --git a/src/mame/technos/ddragon.h b/src/mame/technos/ddragon.h index f0446c09530..69db1bff42a 100644 --- a/src/mame/technos/ddragon.h +++ b/src/mame/technos/ddragon.h @@ -5,8 +5,8 @@ Double Dragon & Double Dragon II (but also China Gate) *************************************************************************/ -#ifndef MAME_INCLUDES_DDRAGON_H -#define MAME_INCLUDES_DDRAGON_H +#ifndef MAME_TECHNOS_DDRAGON_H +#define MAME_TECHNOS_DDRAGON_H #pragma once @@ -202,4 +202,4 @@ private: void toffy_map(address_map &map); }; -#endif // MAME_INCLUDES_DDRAGON_H +#endif // MAME_TECHNOS_DDRAGON_H diff --git a/src/mame/technos/ddragon3.h b/src/mame/technos/ddragon3.h index 7bba19657a1..aa1f61a0402 100644 --- a/src/mame/technos/ddragon3.h +++ b/src/mame/technos/ddragon3.h @@ -6,8 +6,8 @@ Double Dragon 3 & The Combatribes *************************************************************************/ -#ifndef MAME_INCLUDES_DDRAGON3_H -#define MAME_INCLUDES_DDRAGON3_H +#ifndef MAME_TECHNOS_DDRAGON3_H +#define MAME_TECHNOS_DDRAGON3_H #pragma once @@ -156,4 +156,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_DDRAGON3_H +#endif // MAME_TECHNOS_DDRAGON3_H diff --git a/src/mame/tecmo/gaiden.h b/src/mame/tecmo/gaiden.h index 7950e67ac08..9f6c7be95d2 100644 --- a/src/mame/tecmo/gaiden.h +++ b/src/mame/tecmo/gaiden.h @@ -6,8 +6,8 @@ Ninja Gaiden ***************************************************************************/ -#ifndef MAME_INCLUDES_GAIDEN_H -#define MAME_INCLUDES_GAIDEN_H +#ifndef MAME_TECMO_GAIDEN_H +#define MAME_TECMO_GAIDEN_H #pragma once @@ -153,4 +153,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_GAIDEN_H +#endif // MAME_TECMO_GAIDEN_H diff --git a/src/mame/tecmo/senjyo.h b/src/mame/tecmo/senjyo.h index 10e0d0270b5..3a476e3b511 100644 --- a/src/mame/tecmo/senjyo.h +++ b/src/mame/tecmo/senjyo.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mirko Buffoni -#ifndef MAME_INCLUDES_SENJYO_H -#define MAME_INCLUDES_SENJYO_H +#ifndef MAME_TECMO_SENJYO_H +#define MAME_TECMO_SENJYO_H #pragma once @@ -137,4 +137,4 @@ private: }; -#endif // MAME_INCLUDES_SENJYO_H +#endif // MAME_TECMO_SENJYO_H diff --git a/src/mame/tecmo/tecmo.h b/src/mame/tecmo/tecmo.h index e5e21116b57..9a49a0b4f0a 100644 --- a/src/mame/tecmo/tecmo.h +++ b/src/mame/tecmo/tecmo.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_TECMO_H -#define MAME_INCLUDES_TECMO_H +#ifndef MAME_TECMO_TECMO_H +#define MAME_TECMO_TECMO_H #pragma once @@ -109,4 +109,4 @@ private: void backfirt_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_TECMO_H +#endif // MAME_TECMO_TECMO_H diff --git a/src/mame/tecmo/tecmosys.h b/src/mame/tecmo/tecmosys.h index 3ba4206c949..ce24e852f32 100644 --- a/src/mame/tecmo/tecmosys.h +++ b/src/mame/tecmo/tecmosys.h @@ -5,8 +5,8 @@ tecmosys protection simulation ***************************************************************************/ -#ifndef MAME_INCLUDES_TECMOSYS_H -#define MAME_INCLUDES_TECMOSYS_H +#ifndef MAME_TECMO_TECMOSYS_H +#define MAME_TECMO_TECMOSYS_H #pragma once @@ -122,4 +122,4 @@ private: void sound_map(address_map &map); }; -#endif // MAME_INCLUDES_TECMOSYS_H +#endif // MAME_TECMO_TECMOSYS_H diff --git a/src/mame/tektronix/tek405x.h b/src/mame/tektronix/tek405x.h index 93eed3bc563..11c6ce6b115 100644 --- a/src/mame/tektronix/tek405x.h +++ b/src/mame/tektronix/tek405x.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_TEK405X_H -#define MAME_INCLUDES_TEK405X_H +#ifndef MAME_TEKTRONIX_TEK405X_H +#define MAME_TEKTRONIX_TEK405X_H #pragma once @@ -173,4 +173,4 @@ private: required_device m_ram; }; -#endif // MAME_INCLUDES_TEK405X_H +#endif // MAME_TEKTRONIX_TEK405X_H diff --git a/src/mame/telenova/compiskb.h b/src/mame/telenova/compiskb.h index 5232f1d5e1b..436b9a234d4 100644 --- a/src/mame/telenova/compiskb.h +++ b/src/mame/telenova/compiskb.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_INCLUDES_COMPISKB_H -#define MAME_INCLUDES_COMPISKB_H +#ifndef MAME_TELENOVA_COMPISKB_H +#define MAME_TELENOVA_COMPISKB_H #pragma once @@ -61,4 +61,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(COMPIS_KEYBOARD, compis_keyboard_device) -#endif // MAME_INCLUDES_COMPISKB_H +#endif // MAME_TELENOVA_COMPISKB_H diff --git a/src/mame/telercas/tmc1800.h b/src/mame/telercas/tmc1800.h index 559a99ae1f7..d2b247c1d68 100644 --- a/src/mame/telercas/tmc1800.h +++ b/src/mame/telercas/tmc1800.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_TMC1800_H -#define MAME_INCLUDES_TMC1800_H +#ifndef MAME_TELERCAS_TMC1800_H +#define MAME_TELERCAS_TMC1800_H #pragma once @@ -199,4 +199,4 @@ protected: int m_keylatch = 0; }; -#endif +#endif // MAME_TELERCAS_TMC1800_H diff --git a/src/mame/telercas/tmc2000e.h b/src/mame/telercas/tmc2000e.h index 8211c60c9fd..32a956e2514 100644 --- a/src/mame/telercas/tmc2000e.h +++ b/src/mame/telercas/tmc2000e.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_TMC2000E_H -#define MAME_INCLUDES_TMC2000E_H +#ifndef MAME_TELERCAS_TMC2000E_H +#define MAME_TELERCAS_TMC2000E_H #include "cpu/cosmac/cosmac.h" @@ -74,4 +74,4 @@ private: output_finder<> m_led; }; -#endif +#endif // MAME_TELERCAS_TMC2000E_H diff --git a/src/mame/telercas/tmc600.h b/src/mame/telercas/tmc600.h index 162ade88e57..6332bbd4d0f 100644 --- a/src/mame/telercas/tmc600.h +++ b/src/mame/telercas/tmc600.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_TMC600_H -#define MAME_INCLUDES_TMC600_H +#ifndef MAME_TELERCAS_TMC600_H +#define MAME_TELERCAS_TMC600_H #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h" @@ -97,4 +97,4 @@ private: void tmc600_map(address_map &map); }; -#endif +#endif // MAME_TELERCAS_TMC600_H diff --git a/src/mame/tesla/ondra.h b/src/mame/tesla/ondra.h index c8b009a47e7..80a3d6a46d5 100644 --- a/src/mame/tesla/ondra.h +++ b/src/mame/tesla/ondra.h @@ -5,8 +5,8 @@ * includes/ondra.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_ONDRA_H -#define MAME_INCLUDES_ONDRA_H +#ifndef MAME_TESLA_ONDRA_H +#define MAME_TESLA_ONDRA_H #pragma once @@ -62,4 +62,4 @@ private: required_ioport_array<10> m_io_keyboard; }; -#endif // MAME_INCLUDES_ONDRA_H +#endif // MAME_TESLA_ONDRA_H diff --git a/src/mame/tesla/pmd85.h b/src/mame/tesla/pmd85.h index ec50c9967d7..d1634f5c43e 100644 --- a/src/mame/tesla/pmd85.h +++ b/src/mame/tesla/pmd85.h @@ -5,8 +5,8 @@ * includes/pmd85.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_PMD85_H -#define MAME_INCLUDES_PMD85_H +#ifndef MAME_TESLA_PMD85_H +#define MAME_TESLA_PMD85_H #pragma once @@ -149,4 +149,4 @@ private: }; -#endif // MAME_INCLUDES_PMD85_H +#endif // MAME_TESLA_PMD85_H diff --git a/src/mame/thepit/thepit.h b/src/mame/thepit/thepit.h index 5927302f37e..3f8350a1a7f 100644 --- a/src/mame/thepit/thepit.h +++ b/src/mame/thepit/thepit.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Zsolt Vasvari -#ifndef MAME_INCLUDES_THEPIT_H -#define MAME_INCLUDES_THEPIT_H +#ifndef MAME_THEPIT_THEPIT_H +#define MAME_THEPIT_THEPIT_H #pragma once @@ -106,4 +106,4 @@ private: void theportr_main_map(address_map &map); }; -#endif // MAME_INCLUDES_THEPIT_H +#endif // MAME_THEPIT_THEPIT_H diff --git a/src/mame/thomson/thomson.h b/src/mame/thomson/thomson.h index 670f951dbb3..bd502d08470 100644 --- a/src/mame/thomson/thomson.h +++ b/src/mame/thomson/thomson.h @@ -8,8 +8,8 @@ **********************************************************************/ -#ifndef MAME_INCLUDES_THOMSON_H -#define MAME_INCLUDES_THOMSON_H +#ifndef MAME_THOMSON_THOMSON_H +#define MAME_THOMSON_THOMSON_H #pragma once @@ -653,4 +653,4 @@ protected: -#endif // MAME_INCLUDES_THOMSON_H +#endif // MAME_THOMSON_THOMSON_H diff --git a/src/mame/ti/avigo.h b/src/mame/ti/avigo.h index c80107564f9..26ad8847b1f 100644 --- a/src/mame/ti/avigo.h +++ b/src/mame/ti/avigo.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_AVIGO_H -#define MAME_INCLUDES_AVIGO_H +#ifndef MAME_TI_AVIGO_H +#define MAME_TI_AVIGO_H #pragma once @@ -118,4 +118,4 @@ protected: uint8_t m_warm_start = 0U; }; -#endif // MAME_INCLUDES_AVIGO_H +#endif // MAME_TI_AVIGO_H diff --git a/src/mame/ti/ti85.h b/src/mame/ti/ti85.h index 45d3f62be52..f8942fb27a7 100644 --- a/src/mame/ti/ti85.h +++ b/src/mame/ti/ti85.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_TI85_H -#define MAME_INCLUDES_TI85_H +#ifndef MAME_TI_TI85_H +#define MAME_TI_TI85_H #pragma once @@ -259,4 +259,4 @@ private: //address_space &asic; }; -#endif // MAME_INCLUDES_TI85_H +#endif // MAME_TI_TI85_H diff --git a/src/mame/tiger/gamecom.h b/src/mame/tiger/gamecom.h index d34889c7708..6fcbbdcf549 100644 --- a/src/mame/tiger/gamecom.h +++ b/src/mame/tiger/gamecom.h @@ -9,8 +9,8 @@ * Driver by Wilbert Pol * ****************************************************************************/ -#ifndef MAME_INCLUDES_GAMECOM_H -#define MAME_INCLUDES_GAMECOM_H +#ifndef MAME_TIGER_GAMECOM_H +#define MAME_TIGER_GAMECOM_H #pragma once @@ -303,4 +303,4 @@ private: required_ioport_array<13> m_io_grid; }; -#endif // MAME_INCLUDES_GAMECOM_H +#endif // MAME_TIGER_GAMECOM_H diff --git a/src/mame/tiki/tiki100.h b/src/mame/tiki/tiki100.h index d7035fd715f..252c2c35776 100644 --- a/src/mame/tiki/tiki100.h +++ b/src/mame/tiki/tiki100.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Frode van der Meeren -#ifndef MAME_INCLUDES_TIKI100_H -#define MAME_INCLUDES_TIKI100_H +#ifndef MAME_TIKI_TIKI100_H +#define MAME_TIKI_TIKI100_H #pragma once @@ -162,4 +162,4 @@ private: }; -#endif // MAME_INCLUDES_TIKI100_H +#endif // MAME_TIKI_TIKI100_H diff --git a/src/mame/toaplan/toaplan1.h b/src/mame/toaplan/toaplan1.h index 95f0e943692..a35935cf2e3 100644 --- a/src/mame/toaplan/toaplan1.h +++ b/src/mame/toaplan/toaplan1.h @@ -4,8 +4,8 @@ ToaPlan game hardware from 1988-1991 ------------------------------------ ****************************************************************************/ -#ifndef MAME_INCLUDES_TOAPLAN1_H -#define MAME_INCLUDES_TOAPLAN1_H +#ifndef MAME_TOAPLAN_TOAPLAN1_H +#define MAME_TOAPLAN_TOAPLAN1_H #pragma once @@ -254,4 +254,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_TOAPLAN1_H +#endif // MAME_TOAPLAN_TOAPLAN1_H diff --git a/src/mame/toaplan/toaplan2.h b/src/mame/toaplan/toaplan2.h index a18efa95faf..ba6360a0ca8 100644 --- a/src/mame/toaplan/toaplan2.h +++ b/src/mame/toaplan/toaplan2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Quench, Yochizo, David Haywood -#ifndef MAME_INCLUDES_TOAPLAN2_H -#define MAME_INCLUDES_TOAPLAN2_H +#ifndef MAME_TOAPLAN_TOAPLAN2_H +#define MAME_TOAPLAN_TOAPLAN2_H #pragma once @@ -249,4 +249,4 @@ private: void vfive_v25_mem(address_map &map); }; -#endif // MAME_INCLUDES_TOAPLAN2_H +#endif // MAME_TOAPLAN_TOAPLAN2_H diff --git a/src/mame/toaplan/twincobr.h b/src/mame/toaplan/twincobr.h index bcd3a179b4a..d2da936a9fc 100644 --- a/src/mame/toaplan/twincobr.h +++ b/src/mame/toaplan/twincobr.h @@ -4,8 +4,8 @@ Twincobr/Flying Shark/Wardner game hardware from 1986-1987 ----------------------------------------------------------- ****************************************************************************/ -#ifndef MAME_INCLUDES_TWINCOBR_H -#define MAME_INCLUDES_TWINCOBR_H +#ifndef MAME_TOAPLAN_TWINCOBR_H +#define MAME_TOAPLAN_TWINCOBR_H #pragma once @@ -153,4 +153,4 @@ protected: void sound_program_map(address_map &map); }; -#endif // MAME_INCLUDES_TWINCOBR_H +#endif // MAME_TOAPLAN_TWINCOBR_H diff --git a/src/mame/trs/coco.h b/src/mame/trs/coco.h index c08e0779f23..4371ac7b7dd 100644 --- a/src/mame/trs/coco.h +++ b/src/mame/trs/coco.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_COCO_H -#define MAME_INCLUDES_COCO_H +#ifndef MAME_TRS_COCO_H +#define MAME_TRS_COCO_H #pragma once @@ -269,4 +269,4 @@ protected: bool m_in_floating_bus_read = false; }; -#endif // MAME_INCLUDES_COCO_H +#endif // MAME_TRS_COCO_H diff --git a/src/mame/trs/coco12.h b/src/mame/trs/coco12.h index 4d6f793ea64..aab25e8461f 100644 --- a/src/mame/trs/coco12.h +++ b/src/mame/trs/coco12.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_COCO12_H -#define MAME_INCLUDES_COCO12_H +#ifndef MAME_TRS_COCO12_H +#define MAME_TRS_COCO12_H #pragma once @@ -109,4 +109,4 @@ protected: required_device m_psg; }; -#endif // MAME_INCLUDES_COCO12_H +#endif // MAME_TRS_COCO12_H diff --git a/src/mame/trs/coco3.h b/src/mame/trs/coco3.h index fa8359b2032..0a7adce998a 100644 --- a/src/mame/trs/coco3.h +++ b/src/mame/trs/coco3.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_COCO3_H -#define MAME_INCLUDES_COCO3_H +#ifndef MAME_TRS_COCO3_H +#define MAME_TRS_COCO3_H #pragma once @@ -63,4 +63,4 @@ private: required_ioport m_screen_config; }; -#endif // MAME_INCLUDES_COCO3_H +#endif // MAME_TRS_COCO3_H diff --git a/src/mame/trs/dgn_beta.h b/src/mame/trs/dgn_beta.h index 04142a34e03..ce9495aef36 100644 --- a/src/mame/trs/dgn_beta.h +++ b/src/mame/trs/dgn_beta.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_DGN_BETA_H -#define MAME_INCLUDES_DGN_BETA_H +#ifndef MAME_TRS_DGN_BETA_H +#define MAME_TRS_DGN_BETA_H #pragma once @@ -232,4 +232,4 @@ private: void execute_beta_dat_log(const std::vector ¶ms); }; -#endif // MAME_INCLUDES_DGN_BETA_H +#endif // MAME_TRS_DGN_BETA_H diff --git a/src/mame/trs/dragon.h b/src/mame/trs/dragon.h index b0149343073..a502f059dc6 100644 --- a/src/mame/trs/dragon.h +++ b/src/mame/trs/dragon.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_INCLUDES_DRAGON_H -#define MAME_INCLUDES_DRAGON_H +#ifndef MAME_TRS_DRAGON_H +#define MAME_TRS_DRAGON_H #pragma once @@ -148,4 +148,4 @@ private: required_memory_region m_char_rom; }; -#endif // MAME_INCLUDES_DRAGON_H +#endif // MAME_TRS_DRAGON_H diff --git a/src/mame/trs/tandy2k.h b/src/mame/trs/tandy2k.h index a77662a39e6..bf62063651a 100644 --- a/src/mame/trs/tandy2k.h +++ b/src/mame/trs/tandy2k.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_TANDY2K_H -#define MAME_INCLUDES_TANDY2K_H +#ifndef MAME_TRS_TANDY2K_H +#define MAME_TRS_TANDY2K_H #include "bus/centronics/ctronics.h" #include "bus/rs232/rs232.h" @@ -274,4 +274,4 @@ private: required_ioport m_y_axis; }; -#endif // MAME_INCLUDES_TANDY2K_H +#endif // MAME_TRS_TANDY2K_H diff --git a/src/mame/trs/trs80.h b/src/mame/trs/trs80.h index 629f37ff7ef..dbac92c8027 100644 --- a/src/mame/trs/trs80.h +++ b/src/mame/trs/trs80.h @@ -2,8 +2,8 @@ // copyright-holders:Juergen Buchmueller, Robbbert //***************************************************************************** -#ifndef MAME_INCLUDES_TRS80_H -#define MAME_INCLUDES_TRS80_H +#ifndef MAME_TRS_TRS80_H +#define MAME_TRS_TRS80_H #pragma once @@ -128,4 +128,4 @@ private: static void floppy_formats(format_registration &fr); }; -#endif // MAME_INCLUDES_TRS80_H +#endif // MAME_TRS_TRS80_H diff --git a/src/mame/trs/trs80m2.h b/src/mame/trs/trs80m2.h index fc1716ee9fc..094993029b2 100644 --- a/src/mame/trs/trs80m2.h +++ b/src/mame/trs/trs80m2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_TRS80M2_H -#define MAME_INCLUDES_TRS80M2_H +#ifndef MAME_TRS_TRS80M2_H +#define MAME_TRS_TRS80M2_H #pragma once @@ -173,4 +173,4 @@ protected: uint8_t m_offset[2]; }; -#endif // MAME_INCLUDES_TRS80M2_H +#endif // MAME_TRS_TRS80M2_H diff --git a/src/mame/trs/trs80m3.h b/src/mame/trs/trs80m3.h index 742885df11b..8c237ba2a44 100644 --- a/src/mame/trs/trs80m3.h +++ b/src/mame/trs/trs80m3.h @@ -2,8 +2,8 @@ // copyright-holders:Robbbert //***************************************************************************** -#ifndef MAME_INCLUDES_TRS80M3_H -#define MAME_INCLUDES_TRS80M3_H +#ifndef MAME_TRS_TRS80M3_H +#define MAME_TRS_TRS80M3_H #pragma once @@ -154,4 +154,4 @@ private: optional_memory_bank m_vidbank; }; -#endif // MAME_INCLUDES_TRS80M3_H +#endif // MAME_TRS_TRS80M3_H diff --git a/src/mame/tvgames/elan_eu3a05_a.h b/src/mame/tvgames/elan_eu3a05_a.h index 1ceff48f493..4bdee96f01e 100644 --- a/src/mame/tvgames/elan_eu3a05_a.h +++ b/src/mame/tvgames/elan_eu3a05_a.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_TVGAMES_ELAN_EU3A05_H -#define MAME_TVGAMES_ELAN_EU3A05_H +#ifndef MAME_TVGAMES_ELAN_EU3A05_A_H +#define MAME_TVGAMES_ELAN_EU3A05_A_H #include "sound/okiadpcm.h" @@ -86,4 +86,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_SOUND, elan_eu3a05_sound_device) -#endif // MAME_TVGAMES_RAD_EU3A05_H +#endif // MAME_TVGAMES_RAD_EU3A05_A_H diff --git a/src/mame/tvgames/generalplus_gpl16250.h b/src/mame/tvgames/generalplus_gpl16250.h index 1520a3aaba5..f43c61475b5 100644 --- a/src/mame/tvgames/generalplus_gpl16250.h +++ b/src/mame/tvgames/generalplus_gpl16250.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_SUNPLUS_GCM394_H -#define MAME_INCLUDES_SUNPLUS_GCM394_H +#ifndef MAME_TVGAMES_SUNPLUS_GCM394_H +#define MAME_TVGAMES_SUNPLUS_GCM394_H #pragma once @@ -141,4 +141,4 @@ private: }; -#endif +#endif // MAME_TVGAMES_SUNPLUS_GCM394_H diff --git a/src/mame/tvgames/generalplus_gpl16250_m.h b/src/mame/tvgames/generalplus_gpl16250_m.h index a622bd222a5..3c482f5bb9e 100644 --- a/src/mame/tvgames/generalplus_gpl16250_m.h +++ b/src/mame/tvgames/generalplus_gpl16250_m.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_TVGAMES_GENERALPLUS_GPL16250_H -#define MAME_TVGAMES_GENERALPLUS_GPL16250_H +#ifndef MAME_TVGAMES_GENERALPLUS_GPL16250_M_H +#define MAME_TVGAMES_GENERALPLUS_GPL16250_M_H #pragma once @@ -39,4 +39,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(FULL_MEMORY, full_memory_device) -#endif // MAME_TVGAMES_GENERALPLUS_GPL16250_H +#endif // MAME_TVGAMES_GENERALPLUS_GPL16250_M_H diff --git a/src/mame/tvgames/generalplus_gpl16250_nand.h b/src/mame/tvgames/generalplus_gpl16250_nand.h index fa156013f62..bd9d93ff137 100644 --- a/src/mame/tvgames/generalplus_gpl16250_nand.h +++ b/src/mame/tvgames/generalplus_gpl16250_nand.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_GENERALPLUS_GPL16250_NAND_H -#define MAME_INCLUDES_GENERALPLUS_GPL16250_NAND_H +#ifndef MAME_TVGAMES_GENERALPLUS_GPL16250_NAND_H +#define MAME_TVGAMES_GENERALPLUS_GPL16250_NAND_H #pragma once @@ -86,5 +86,5 @@ private: }; -#endif // MAME_INCLUDES_GENERALPLUS_GPL16250_NAND_H +#endif // MAME_TVGAMES_GENERALPLUS_GPL16250_NAND_H diff --git a/src/mame/tvgames/generalplus_gpl16250_romram.h b/src/mame/tvgames/generalplus_gpl16250_romram.h index cc054b775db..428275f6ee1 100644 --- a/src/mame/tvgames/generalplus_gpl16250_romram.h +++ b/src/mame/tvgames/generalplus_gpl16250_romram.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_GENERALPLUS_GPL16250_ROMRAM_H -#define MAME_INCLUDES_GENERALPLUS_GPL16250_ROMRAM_H +#ifndef MAME_TVGAMES_GENERALPLUS_GPL16250_ROMRAM_H +#define MAME_TVGAMES_GENERALPLUS_GPL16250_ROMRAM_H #pragma once @@ -133,5 +133,5 @@ private: -#endif // MAME_INCLUDES_GENERALPLUS_GPL16250_ROMRAM_H +#endif // MAME_TVGAMES_GENERALPLUS_GPL16250_ROMRAM_H diff --git a/src/mame/tvgames/spg2xx.h b/src/mame/tvgames/spg2xx.h index 58eed48b69f..67618304f22 100644 --- a/src/mame/tvgames/spg2xx.h +++ b/src/mame/tvgames/spg2xx.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz, David Haywood -#ifndef MAME_INCLUDES_SPG2XX_H -#define MAME_INCLUDES_SPG2XX_H +#ifndef MAME_TVGAMES_SPG2XX_H +#define MAME_TVGAMES_SPG2XX_H #pragma once @@ -358,4 +358,4 @@ private: -#endif // MAME_INCLUDES_SPG2XX_H +#endif // MAME_TVGAMES_SPG2XX_H diff --git a/src/mame/tvgames/xavix.h b/src/mame/tvgames/xavix.h index 0c124d8f221..a43413623b1 100644 --- a/src/mame/tvgames/xavix.h +++ b/src/mame/tvgames/xavix.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_XAVIX_H -#define MAME_INCLUDES_XAVIX_H +#ifndef MAME_TVGAMES_XAVIX_H +#define MAME_TVGAMES_XAVIX_H #include "cpu/m6502/xavix.h" #include "cpu/m6502/xavix2000.h" @@ -987,4 +987,4 @@ protected: }; -#endif // MAME_INCLUDES_XAVIX_H +#endif // MAME_TVGAMES_XAVIX_H diff --git a/src/mame/tvgames/xavix_2000.h b/src/mame/tvgames/xavix_2000.h index 0611ba3149c..27492005a58 100644 --- a/src/mame/tvgames/xavix_2000.h +++ b/src/mame/tvgames/xavix_2000.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_XAVIX_2000_H -#define MAME_INCLUDES_XAVIX_2000_H +#ifndef MAME_TVGAMES_XAVIX_2000_H +#define MAME_TVGAMES_XAVIX_2000_H #include "xavix.h" @@ -24,4 +24,4 @@ private: uint8_t sdb_anport3_r() { return m_mouse1y->read()^0x7f; } }; -#endif // MAME_INCLUDES_XAVIX_2000_H +#endif // MAME_TVGAMES_XAVIX_2000_H diff --git a/src/mame/tvgames/xavix_2002.h b/src/mame/tvgames/xavix_2002.h index 98271273b16..9d7012f93e0 100644 --- a/src/mame/tvgames/xavix_2002.h +++ b/src/mame/tvgames/xavix_2002.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_XAVIX_2002_H -#define MAME_INCLUDES_XAVIX_2002_H +#ifndef MAME_TVGAMES_XAVIX_2002_H +#define MAME_TVGAMES_XAVIX_2002_H #include "xavix_2000.h" @@ -52,4 +52,4 @@ public: }; -#endif // MAME_INCLUDES_XAVIX_2002_H +#endif // MAME_TVGAMES_XAVIX_2002_H diff --git a/src/mame/unico/drgnmst.h b/src/mame/unico/drgnmst.h index ef519741de4..daa7462f28d 100644 --- a/src/mame/unico/drgnmst.h +++ b/src/mame/unico/drgnmst.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_INCLUDES_DRGNMST_H -#define MAME_INCLUDES_DRGNMST_H +#ifndef MAME_UNICO_DRGNMST_H +#define MAME_UNICO_DRGNMST_H #pragma once @@ -144,4 +144,4 @@ private: }; -#endif // MAME_INCLUDES_DRGNMST_H +#endif // MAME_UNICO_DRGNMST_H diff --git a/src/mame/unico/unico.h b/src/mame/unico/unico.h index c3f7ce703f6..29cc10c3c9b 100644 --- a/src/mame/unico/unico.h +++ b/src/mame/unico/unico.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Luca Elia -#ifndef MAME_INCLUDES_UNICO_H -#define MAME_INCLUDES_UNICO_H +#ifndef MAME_UNICO_UNICO_H +#define MAME_UNICO_UNICO_H #pragma once @@ -123,4 +123,4 @@ private: required_device m_eeprom; }; -#endif // MAME_INCLUDES_UNICO_H +#endif // MAME_UNICO_UNICO_H diff --git a/src/mame/universal/cheekyms.h b/src/mame/universal/cheekyms.h index 068ba663d13..0c1f338a090 100644 --- a/src/mame/universal/cheekyms.h +++ b/src/mame/universal/cheekyms.h @@ -5,8 +5,8 @@ Cheeky Mouse *************************************************************************/ -#ifndef MAME_INCLUDES_CHEEKYMS_H -#define MAME_INCLUDES_CHEEKYMS_H +#ifndef MAME_UNIVERSAL_CHEEKYMS_H +#define MAME_UNIVERSAL_CHEEKYMS_H #pragma once @@ -75,4 +75,4 @@ private: uint8_t m_irq_mask = 0U; }; -#endif // MAME_INCLUDES_CHEEKYMS_H +#endif // MAME_UNIVERSAL_CHEEKYMS_H diff --git a/src/mame/universal/cheekyms_a.h b/src/mame/universal/cheekyms_a.h index ce638af63b0..dbc3c57cd97 100644 --- a/src/mame/universal/cheekyms_a.h +++ b/src/mame/universal/cheekyms_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -#ifndef MAME_UNIVERSAL_CHEEKYMS_H -#define MAME_UNIVERSAL_CHEEKYMS_H +#ifndef MAME_UNIVERSAL_CHEEKYMS_A_H +#define MAME_UNIVERSAL_CHEEKYMS_A_H #pragma once @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(CHEEKY_MOUSE_AUDIO, cheekyms_audio_device) -#endif // MAME_UNIVERSAL_CHEEKYMS_H +#endif // MAME_UNIVERSAL_CHEEKYMS_A_H diff --git a/src/mame/universal/cosmic.h b/src/mame/universal/cosmic.h index a48bad75830..46152b56cff 100644 --- a/src/mame/universal/cosmic.h +++ b/src/mame/universal/cosmic.h @@ -5,8 +5,8 @@ Cosmic Guerilla & other Universal boards (in cosmic.c) *************************************************************************/ -#ifndef MAME_INCLUDES_COSMIC_H -#define MAME_INCLUDES_COSMIC_H +#ifndef MAME_UNIVERSAL_COSMIC_H +#define MAME_UNIVERSAL_COSMIC_H #pragma once @@ -119,4 +119,4 @@ private: void panic_map(address_map &map); }; -#endif // MAME_INCLUDES_COSMIC_H +#endif // MAME_UNIVERSAL_COSMIC_H diff --git a/src/mame/universal/docastle.h b/src/mame/universal/docastle.h index 5a07f1efc97..467c005f02a 100644 --- a/src/mame/universal/docastle.h +++ b/src/mame/universal/docastle.h @@ -5,8 +5,8 @@ Mr. Do's Castle hardware ***************************************************************************/ -#ifndef MAME_INCLUDES_DOCASTLE_H -#define MAME_INCLUDES_DOCASTLE_H +#ifndef MAME_UNIVERSAL_DOCASTLE_H +#define MAME_UNIVERSAL_DOCASTLE_H #pragma once @@ -100,4 +100,4 @@ private: void idsoccer_map(address_map &map); }; -#endif // MAME_INCLUDES_DOCASTLE_H +#endif // MAME_UNIVERSAL_DOCASTLE_H diff --git a/src/mame/universal/mrdo.h b/src/mame/universal/mrdo.h index 177502a31bf..686ca75d9d7 100644 --- a/src/mame/universal/mrdo.h +++ b/src/mame/universal/mrdo.h @@ -5,8 +5,8 @@ Mr. Do *************************************************************************/ -#ifndef MAME_INCLUDES_MRDO_H -#define MAME_INCLUDES_MRDO_H +#ifndef MAME_UNIVERSAL_MRDO_H +#define MAME_UNIVERSAL_MRDO_H #pragma once @@ -93,4 +93,4 @@ protected: virtual uint8_t protection_r() override { return 0; } }; -#endif // MAME_INCLUDES_MRDO_H +#endif // MAME_UNIVERSAL_MRDO_H diff --git a/src/mame/upl/ninjakd2.h b/src/mame/upl/ninjakd2.h index da3a0c8888d..4dcf9d47884 100644 --- a/src/mame/upl/ninjakd2.h +++ b/src/mame/upl/ninjakd2.h @@ -5,8 +5,8 @@ UPL "sprite framebuffer" hardware ******************************************************************************/ -#ifndef MAME_INCLUDES_NINJAKD2_H -#define MAME_INCLUDES_NINJAKD2_H +#ifndef MAME_UPL_NINJAKD2_H +#define MAME_UPL_NINJAKD2_H #pragma once @@ -202,4 +202,4 @@ private: int m_io_protection_tick = 0; }; -#endif // MAME_INCLUDES_NINJAKD2_H +#endif // MAME_UPL_NINJAKD2_H diff --git a/src/mame/upl/nova2001.h b/src/mame/upl/nova2001.h index 21e0fb7e3ac..4a9b6d67235 100644 --- a/src/mame/upl/nova2001.h +++ b/src/mame/upl/nova2001.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Howie Cohen, Frank Palazzolo, Alex Pasadyn, David Haywood, Phil Stroffolino, Uki -#ifndef MAME_INCLUDES_NOVA2001_H -#define MAME_INCLUDES_NOVA2001_H +#ifndef MAME_UPL_NOVA2001_H +#define MAME_UPL_NOVA2001_H #pragma once @@ -94,4 +94,4 @@ private: void raiders5_io(address_map &map); }; -#endif // MAME_INCLUDES_NOVA2001_H +#endif // MAME_UPL_NOVA2001_H diff --git a/src/mame/ussr/b2m.h b/src/mame/ussr/b2m.h index 924fb98c2eb..0983c990d4d 100644 --- a/src/mame/ussr/b2m.h +++ b/src/mame/ussr/b2m.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_B2M_H -#define MAME_INCLUDES_B2M_H +#ifndef MAME_USSR_B2M_H +#define MAME_USSR_B2M_H #pragma once @@ -93,4 +93,4 @@ private: optional_device m_pic; }; -#endif // MAME_INCLUDES_B2M_H +#endif // MAME_USSR_B2M_H diff --git a/src/mame/ussr/bk.h b/src/mame/ussr/bk.h index fd1bb3ee8b3..f1bfde9f21e 100644 --- a/src/mame/ussr/bk.h +++ b/src/mame/ussr/bk.h @@ -5,8 +5,8 @@ * includes/bk.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_BK_H -#define MAME_INCLUDES_BK_H +#ifndef MAME_USSR_BK_H +#define MAME_USSR_BK_H #pragma once @@ -59,4 +59,4 @@ private: void bk0010fd_mem(address_map &map); }; -#endif // MAME_INCLUDES_BK_H +#endif // MAME_USSR_BK_H diff --git a/src/mame/ussr/lviv.h b/src/mame/ussr/lviv.h index 0210f281493..de42e0ffec4 100644 --- a/src/mame/ussr/lviv.h +++ b/src/mame/ussr/lviv.h @@ -5,8 +5,8 @@ * includes/lviv.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_LVIV_H -#define MAME_INCLUDES_LVIV_H +#ifndef MAME_USSR_LVIV_H +#define MAME_USSR_LVIV_H #pragma once @@ -97,4 +97,4 @@ private: static const rgb_t s_palette[8]; }; -#endif // MAME_INCLUDES_LVIV_H +#endif // MAME_USSR_LVIV_H diff --git a/src/mame/ussr/mikro80.h b/src/mame/ussr/mikro80.h index 72e0e14a6fe..0637f027f21 100644 --- a/src/mame/ussr/mikro80.h +++ b/src/mame/ussr/mikro80.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_MIKRO80_H -#define MAME_INCLUDES_MIKRO80_H +#ifndef MAME_USSR_MIKRO80_H +#define MAME_USSR_MIKRO80_H #pragma once @@ -72,4 +72,4 @@ private: required_device m_maincpu; }; -#endif // MAME_INCLUDES_MIKRO80_H +#endif // MAME_USSR_MIKRO80_H diff --git a/src/mame/ussr/partner.h b/src/mame/ussr/partner.h index 66f0f8bddbb..8b11b0b9017 100644 --- a/src/mame/ussr/partner.h +++ b/src/mame/ussr/partner.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PARTNER_H -#define MAME_INCLUDES_PARTNER_H +#ifndef MAME_USSR_PARTNER_H +#define MAME_USSR_PARTNER_H #pragma once @@ -62,4 +62,4 @@ private: }; -#endif // MAME_INCLUDES_PARTNER_H +#endif // MAME_USSR_PARTNER_H diff --git a/src/mame/ussr/pk8020.h b/src/mame/ussr/pk8020.h index d47b51f77d5..d81f98473c7 100644 --- a/src/mame/ussr/pk8020.h +++ b/src/mame/ussr/pk8020.h @@ -5,8 +5,8 @@ * includes/pk8020.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_PK8020_H -#define MAME_INCLUDES_PK8020_H +#ifndef MAME_USSR_PK8020_H +#define MAME_USSR_PK8020_H #pragma once @@ -112,4 +112,4 @@ private: required_device m_palette; }; -#endif // MAME_INCLUDES_PK8020_H +#endif // MAME_USSR_PK8020_H diff --git a/src/mame/ussr/radio86.h b/src/mame/ussr/radio86.h index 3215a34099e..9f059086c50 100644 --- a/src/mame/ussr/radio86.h +++ b/src/mame/ussr/radio86.h @@ -5,8 +5,8 @@ * includes/radio86.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_RADIO86_H -#define MAME_INCLUDES_RADIO86_H +#ifndef MAME_USSR_RADIO86_H +#define MAME_USSR_RADIO86_H #pragma once @@ -117,4 +117,4 @@ private: INPUT_PORTS_EXTERN( radio86 ); INPUT_PORTS_EXTERN( ms7007 ); -#endif // MAME_INCLUDES_RADIO86_H +#endif // MAME_USSR_RADIO86_H diff --git a/src/mame/ussr/tiamc1.h b/src/mame/ussr/tiamc1.h index c034d97f747..128cba669d8 100644 --- a/src/mame/ussr/tiamc1.h +++ b/src/mame/ussr/tiamc1.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Eugene Sandulenko -#ifndef MAME_INCLUDES_TIAMC1_H -#define MAME_INCLUDES_TIAMC1_H +#ifndef MAME_USSR_TIAMC1_H +#define MAME_USSR_TIAMC1_H #pragma once @@ -79,4 +79,4 @@ private: void update_bg_palette(); }; -#endif // MAME_INCLUDES_TIAMC1_H +#endif // MAME_USSR_TIAMC1_H diff --git a/src/mame/ussr/tiamc1_a.h b/src/mame/ussr/tiamc1_a.h index aaf856a4156..fe59bef6591 100644 --- a/src/mame/ussr/tiamc1_a.h +++ b/src/mame/ussr/tiamc1_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Eugene Sandulenko -#ifndef MAME_USSR_TIAMC1_H -#define MAME_USSR_TIAMC1_H +#ifndef MAME_USSR_TIAMC1_A_H +#define MAME_USSR_TIAMC1_A_H #pragma once @@ -64,4 +64,4 @@ private: DECLARE_DEVICE_TYPE(TIAMC1, tiamc1_sound_device) -#endif // MAME_USSR_TIAMC1_H +#endif // MAME_USSR_TIAMC1_A_H diff --git a/src/mame/ussr/ut88.h b/src/mame/ussr/ut88.h index 1479297244d..6bfc817fe9e 100644 --- a/src/mame/ussr/ut88.h +++ b/src/mame/ussr/ut88.h @@ -5,8 +5,8 @@ * includes/ut88.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_UT88_H -#define MAME_INCLUDES_UT88_H +#ifndef MAME_USSR_UT88_H +#define MAME_USSR_UT88_H #pragma once @@ -126,4 +126,4 @@ private: }; -#endif // MAME_INCLUDES_UT88_H +#endif // MAME_USSR_UT88_H diff --git a/src/mame/ussr/vector06.h b/src/mame/ussr/vector06.h index 046e497b9f2..20d520d0ac7 100644 --- a/src/mame/ussr/vector06.h +++ b/src/mame/ussr/vector06.h @@ -5,8 +5,8 @@ * includes/vector06.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_VECTOR06_H -#define MAME_INCLUDES_VECTOR06_H +#ifndef MAME_USSR_VECTOR06_H +#define MAME_USSR_VECTOR06_H #pragma once @@ -117,4 +117,4 @@ private: bool m_romen = false; }; -#endif // MAME_INCLUDES_VECTOR06_H +#endif // MAME_USSR_VECTOR06_H diff --git a/src/mame/valadon/bagman.h b/src/mame/valadon/bagman.h index 4e39fbf324b..204f86bbd84 100644 --- a/src/mame/valadon/bagman.h +++ b/src/mame/valadon/bagman.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_BAGMAN_H -#define MAME_INCLUDES_BAGMAN_H +#ifndef MAME_VALADON_BAGMAN_H +#define MAME_VALADON_BAGMAN_H #pragma once @@ -159,4 +159,4 @@ private: #define VBEND (0x10) #define VBSTART (0xf0) -#endif // MAME_INCLUDES_BAGMAN_H +#endif // MAME_VALADON_BAGMAN_H diff --git a/src/mame/verifone/tranz330.h b/src/mame/verifone/tranz330.h index ce702185caf..d30346285f2 100644 --- a/src/mame/verifone/tranz330.h +++ b/src/mame/verifone/tranz330.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_INCLUDES_TRANZ330_H -#define MAME_INCLUDES_TRANZ330_H +#ifndef MAME_VERIFONE_TRANZ330_H +#define MAME_VERIFONE_TRANZ330_H #pragma once @@ -73,4 +73,4 @@ private: uint8_t m_keypad_col_mask = 0; }; -#endif // VERIFONE_TRANZ330_H +#endif // MAME_VERIFONE_TRANZ330_H diff --git a/src/mame/vidbrain/vidbrain.h b/src/mame/vidbrain/vidbrain.h index 9461e4ff645..f64b7d8420b 100644 --- a/src/mame/vidbrain/vidbrain.h +++ b/src/mame/vidbrain/vidbrain.h @@ -2,8 +2,8 @@ // copyright-holders:Curt Coder #pragma once -#ifndef MAME_INCLUDES_VIDBRAIN_H -#define MAME_INCLUDES_VIDBRAIN_H +#ifndef MAME_VIDBRAIN_VIDBRAIN_H +#define MAME_VIDBRAIN_VIDBRAIN_H #include "bus/vidbrain/exp.h" #include "cpu/f8/f8.h" @@ -91,4 +91,4 @@ private: emu_timer *m_timer_ne555 = nullptr; }; -#endif +#endif // MAME_VIDBRAIN_VIDBRAIN_H diff --git a/src/mame/videoton/tvc_a.h b/src/mame/videoton/tvc_a.h index 6e8288d41bd..419348dbe71 100644 --- a/src/mame/videoton/tvc_a.h +++ b/src/mame/videoton/tvc_a.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_VIDEOTON_TVC_H -#define MAME_VIDEOTON_TVC_H +#ifndef MAME_VIDEOTON_TVC_A_H +#define MAME_VIDEOTON_TVC_A_H #pragma once @@ -52,4 +52,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TVC_SOUND, tvc_sound_device) -#endif // MAME_VIDEOTON_TVC_H +#endif // MAME_VIDEOTON_TVC_A_H diff --git a/src/mame/visual/v1050.h b/src/mame/visual/v1050.h index 63f31cf3485..a8416b12d40 100644 --- a/src/mame/visual/v1050.h +++ b/src/mame/visual/v1050.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_V1050_H -#define MAME_INCLUDES_V1050_H +#ifndef MAME_VISUAL_V1050_H +#define MAME_VISUAL_V1050_H #pragma once @@ -235,4 +235,4 @@ private: int m_centronics_perror = 0; }; -#endif // MAME_INCLUDES_V1050_H +#endif // MAME_VISUAL_V1050_H diff --git a/src/mame/vsystem/aerofgt.h b/src/mame/vsystem/aerofgt.h index cf31093abe0..20182d3978a 100644 --- a/src/mame/vsystem/aerofgt.h +++ b/src/mame/vsystem/aerofgt.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_AEROFGT_H -#define MAME_INCLUDES_AEROFGT_H +#ifndef MAME_VSYSTEM_AEROFGT_H +#define MAME_VSYSTEM_AEROFGT_H #pragma once @@ -179,4 +179,4 @@ public: void wbbc97_sound_map(address_map &map); }; -#endif // MAME_INCLUDES_AEROFGT_H +#endif // MAME_VSYSTEM_AEROFGT_H diff --git a/src/mame/vsystem/crshrace.cpp b/src/mame/vsystem/crshrace.cpp index 020602b2bce..cee339f0cf1 100644 --- a/src/mame/vsystem/crshrace.cpp +++ b/src/mame/vsystem/crshrace.cpp @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria + /*************************************************************************** Crash Race (c) 1993 Video System Co. @@ -130,17 +131,229 @@ Dip locations verified with Service Mode. ***************************************************************************/ #include "emu.h" -#include "crshrace.h" + +#include "vsystem_spr.h" #include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" #include "sound/ymopn.h" +#include "video/bufsprite.h" +#include "video/k053936.h" + +#include "emupal.h" #include "screen.h" #include "speaker.h" +#include "tilemap.h" + + +// configurable logging +#define LOG_GFXCTRL (1U << 1) +//#define VERBOSE (LOG_GENERAL | LOG_GFXCTRL) + +#include "logmacro.h" + +#define LOGGFXCTRL(...) LOGMASKED(LOG_GFXCTRL, __VA_ARGS__) + + +namespace { #define CRSHRACE_3P_HACK 0 +class crshrace_state : public driver_device +{ +public: + crshrace_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_videoram(*this, "videoram.%u", 0U), + m_z80bank(*this, "bank1"), + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_spr(*this, "vsystem_spr"), + m_k053936(*this, "k053936"), + m_spriteram(*this, "spriteram.%u", 0U), + m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"), + m_soundlatch(*this, "soundlatch") + { } + + void crshrace(machine_config &config); + + void init_crshrace2(); + void init_crshrace(); + +protected: + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + +private: + // memory pointers + required_shared_ptr_array m_videoram; + + required_memory_bank m_z80bank; + + // devices + required_device m_maincpu; + required_device m_audiocpu; + required_device m_spr; + required_device m_k053936; + required_device_array m_spriteram; + required_device m_gfxdecode; + required_device m_palette; + required_device m_soundlatch; + + // video-related + tilemap_t *m_tilemap[2]{}; + uint8_t m_roz_bank = 0U; + uint8_t m_gfxctrl = 0U; + uint8_t m_flipscreen = 0U; + + uint32_t tile_callback(uint32_t code); + void sh_bankswitch_w(uint8_t data); + template void videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_videoram[Which][offset]); m_tilemap[Which]->mark_tile_dirty(offset); } + void roz_bank_w(offs_t offset, uint8_t data); + void gfxctrl_w(offs_t offset, uint8_t data); + TILE_GET_INFO_MEMBER(get_fgtile_info); + TILE_GET_INFO_MEMBER(get_bgtile_info); + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void draw_bg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + + void main_map(address_map &map); + void sound_io_map(address_map &map); + void sound_map(address_map &map); + + [[maybe_unused]] void patch_code(uint16_t offset); +}; + + +// video + +/*************************************************************************** + + Callbacks for the TileMap code + +***************************************************************************/ + +TILE_GET_INFO_MEMBER(crshrace_state::get_fgtile_info) +{ + int const code = m_videoram[0][tile_index]; + + tileinfo.set(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0); +} + +TILE_GET_INFO_MEMBER(crshrace_state::get_bgtile_info) +{ + int const code = m_videoram[1][tile_index]; + + tileinfo.set(0, code, 0, 0); +} + + +/*************************************************************************** + + Start the video hardware emulation. + +***************************************************************************/ + + +uint32_t crshrace_state::tile_callback(uint32_t code) +{ + return m_spriteram[1]->buffer()[code&0x7fff]; +} + + +void crshrace_state::video_start() +{ + m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_fgtile_info)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_bgtile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); + + m_tilemap[0]->set_transparent_pen(0x0f); + m_tilemap[1]->set_transparent_pen(0xff); + +} + + +/*************************************************************************** + + Memory handlers + +***************************************************************************/ + + +void crshrace_state::roz_bank_w(offs_t offset, uint8_t data) +{ + if (m_roz_bank != data) + { + m_roz_bank = data; + m_tilemap[0]->mark_all_dirty(); + } +} + + +void crshrace_state::gfxctrl_w(offs_t offset, uint8_t data) +{ + m_gfxctrl = data; + m_flipscreen = data & 0x20; +} + + +/*************************************************************************** + + Display refresh + +***************************************************************************/ + +void crshrace_state::draw_bg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0); +} + + +void crshrace_state::draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + m_k053936->zoom_draw(screen, bitmap, cliprect, m_tilemap[0], 0, 0, 1); +} + + +uint32_t crshrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + if (m_gfxctrl & 0x04) // display disable? + { + bitmap.fill(m_palette->black_pen(), cliprect); + return 0; + } + + bitmap.fill(0x1ff, cliprect); + + + + switch (m_gfxctrl & 0xfb) + { + case 0x00: // high score screen + m_spr->draw_sprites(m_spriteram[0]->buffer(), 0x2000, screen, bitmap, cliprect); + draw_bg(screen, bitmap, cliprect); + draw_fg(screen, bitmap, cliprect); + break; + case 0x01: + case 0x02: + draw_bg(screen, bitmap, cliprect); + draw_fg(screen, bitmap, cliprect); + m_spr->draw_sprites(m_spriteram[0]->buffer(), 0x2000, screen, bitmap, cliprect); + break; + default: + LOGGFXCTRL("gfxctrl = %02x", m_gfxctrl); + break; + } + return 0; +} + + +// machine + void crshrace_state::sh_bankswitch_w(uint8_t data) { m_z80bank->set_entry(data & 0x03); @@ -381,14 +594,14 @@ void crshrace_state::machine_reset() m_flipscreen = 0; } -void crshrace_state::crshrace(machine_config &config) +void crshrace_state::crshrace(machine_config &config) // TODO: PCB sports 32 MHz and 24 MHz XTALs. Derive from those and verify dividers. { // basic machine hardware - M68000(config, m_maincpu, 16000000); // 16 MHz ??? + M68000(config, m_maincpu, 16'000'000); // 16 MHz ??? m_maincpu->set_addrmap(AS_PROGRAM, &crshrace_state::main_map); m_maincpu->set_vblank_int("screen", FUNC(crshrace_state::irq1_line_hold)); - Z80(config, m_audiocpu, 4000000); // 4 MHz ??? + Z80(config, m_audiocpu, 4'000'000); // 4 MHz ??? m_audiocpu->set_addrmap(AS_PROGRAM, &crshrace_state::sound_map); m_audiocpu->set_addrmap(AS_IO, &crshrace_state::sound_io_map); @@ -425,7 +638,7 @@ void crshrace_state::crshrace(machine_config &config) m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); m_soundlatch->set_separate_acknowledge(true); - ym2610_device &ymsnd(YM2610(config, "ymsnd", 8000000)); + ym2610_device &ymsnd(YM2610(config, "ymsnd", 8'000'000)); ymsnd.irq_handler().set_inputline(m_audiocpu, 0); ymsnd.add_route(0, "lspeaker", 0.25); ymsnd.add_route(0, "rspeaker", 0.25); @@ -436,101 +649,101 @@ void crshrace_state::crshrace(machine_config &config) ROM_START( crshrace ) ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 code - ROM_LOAD16_WORD_SWAP( "1.ic10", 0x000000, 0x80000, CRC(21e34fb7) SHA1(be47b4a9bce2d6ce0a127dffe032c61547b2a3c0) ) + ROM_LOAD16_WORD_SWAP( "1.ic10", 0x000000, 0x80000, CRC(21e34fb7) SHA1(be47b4a9bce2d6ce0a127dffe032c61547b2a3c0) ) ROM_REGION16_BE( 0x100000, "user1", 0 ) // extra ROM - ROM_LOAD16_WORD_SWAP( "w21.ic14", 0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) ) + ROM_LOAD16_WORD_SWAP( "w21.ic14", 0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) ) ROM_REGION16_BE( 0x100000, "user2", 0 ) // extra ROM - ROM_LOAD16_WORD_SWAP( "w22.ic13", 0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) ) + ROM_LOAD16_WORD_SWAP( "w22.ic13", 0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) // 64k for the audio CPU + banks - ROM_LOAD( "2.ic58", 0x00000, 0x20000, CRC(e70a900f) SHA1(edfe5df2dab5a7dccebe1a6f978144bcd516ab03) ) + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "2.ic58", 0x00000, 0x20000, CRC(e70a900f) SHA1(edfe5df2dab5a7dccebe1a6f978144bcd516ab03) ) ROM_REGION( 0x100000, "chars", 0 ) - ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) ) + ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) ) ROM_REGION( 0x400000, "tiles", 0 ) - ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) ) - ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) ) - ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) ) + ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) ) + ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) ) + ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) ) // 300000-3fffff empty ROM_REGION( 0x400000, "sprites", 0 ) - ROM_LOAD( "h897.ic29", 0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) ) - ROM_LOAD( "h896.ic75", 0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) ) + ROM_LOAD( "h897.ic29", 0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) ) + ROM_LOAD( "h896.ic75", 0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) ) - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) // sound samples - ROM_LOAD( "h894.ic73", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "h894.ic73", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) - ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) // sound samples - ROM_LOAD( "h893.ic69", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) + ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "h893.ic69", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) ROM_END ROM_START( crshrace2 ) ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 code - ROM_LOAD16_WORD_SWAP( "01.ic10", 0x000000, 0x80000, CRC(b284aacd) SHA1(f0ef279cdec30eb32e8aa8cdd51e289b70f2d6f5) ) + ROM_LOAD16_WORD_SWAP( "01.ic10", 0x000000, 0x80000, CRC(b284aacd) SHA1(f0ef279cdec30eb32e8aa8cdd51e289b70f2d6f5) ) ROM_REGION16_BE( 0x100000, "user1", 0 ) // extra ROM - ROM_LOAD16_WORD_SWAP( "w21.ic14", 0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) ) + ROM_LOAD16_WORD_SWAP( "w21.ic14", 0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) ) ROM_REGION16_BE( 0x100000, "user2", 0 ) // extra ROM - ROM_LOAD16_WORD_SWAP( "w22.ic13", 0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) ) + ROM_LOAD16_WORD_SWAP( "w22.ic13", 0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) // 64k for the audio CPU + banks - ROM_LOAD( "2.ic58", 0x00000, 0x20000, CRC(e70a900f) SHA1(edfe5df2dab5a7dccebe1a6f978144bcd516ab03) ) + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "2.ic58", 0x00000, 0x20000, CRC(e70a900f) SHA1(edfe5df2dab5a7dccebe1a6f978144bcd516ab03) ) ROM_REGION( 0x100000, "chars", 0 ) - ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) ) + ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) ) ROM_REGION( 0x400000, "tiles", 0 ) - ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) ) - ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) ) - ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) ) + ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) ) + ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) ) + ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) ) // 300000-3fffff empty ROM_REGION( 0x400000, "sprites", 0 ) - ROM_LOAD( "h897.ic29", 0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) ) - ROM_LOAD( "h896.ic75", 0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) ) + ROM_LOAD( "h897.ic29", 0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) ) + ROM_LOAD( "h896.ic75", 0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) ) - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) // sound samples - ROM_LOAD( "h894.ic73", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "h894.ic73", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) - ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) // sound samples - ROM_LOAD( "h893.ic69", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) + ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "h893.ic69", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) ROM_END ROM_START( crshrace2a ) ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 code - ROM_LOAD16_WORD_SWAP( "01.ic10", 0x000000, 0x80000, CRC(b284aacd) SHA1(f0ef279cdec30eb32e8aa8cdd51e289b70f2d6f5) ) + ROM_LOAD16_WORD_SWAP( "01.ic10", 0x000000, 0x80000, CRC(b284aacd) SHA1(f0ef279cdec30eb32e8aa8cdd51e289b70f2d6f5) ) ROM_REGION16_BE( 0x100000, "user1", 0 ) // extra ROM - ROM_LOAD16_WORD_SWAP( "w21.ic14", 0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) ) + ROM_LOAD16_WORD_SWAP( "w21.ic14", 0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) ) ROM_REGION16_BE( 0x100000, "user2", 0 ) // extra ROM - ROM_LOAD16_WORD_SWAP( "w22.ic13", 0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) ) + ROM_LOAD16_WORD_SWAP( "w22.ic13", 0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) // 64k for the audio CPU + banks - ROM_LOAD( "2.ic58", 0x00000, 0x20000, CRC(7ef4f9dc) SHA1(cf9cc1cf16349b0b930f4572194b7ed3828c3bd8) ) // sldh + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "2.ic58", 0x00000, 0x20000, CRC(7ef4f9dc) SHA1(cf9cc1cf16349b0b930f4572194b7ed3828c3bd8) ) // sldh ROM_REGION( 0x100000, "chars", 0 ) - ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) ) + ROM_LOAD( "h895.ic50", 0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) ) ROM_REGION( 0x400000, "tiles", 0 ) // on a riser board - ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) ) - ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) ) - ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) ) + ROM_LOAD( "w18.rom-a", 0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) ) + ROM_LOAD( "w19.rom-b", 0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) ) + ROM_LOAD( "w20.rom-c", 0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) ) // 300000-3fffff empty ROM_REGION( 0x400000, "sprites", 0 ) - ROM_LOAD( "h897.ic29", 0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) ) - ROM_LOAD( "h896.ic75", 0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) ) + ROM_LOAD( "h897.ic29", 0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) ) + ROM_LOAD( "h896.ic75", 0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) ) - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) // sound samples - ROM_LOAD( "h894.ic73", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "h894.ic73", 0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) ) - ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) // sound samples - ROM_LOAD( "h893.ic69", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) + ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "h893.ic69", 0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) ) ROM_END @@ -538,9 +751,9 @@ void crshrace_state::patch_code(uint16_t offset) { // A hack which shows 3 player mode in code which is disabled uint16_t *RAM = (uint16_t *)memregion("maincpu")->base(); - RAM[(offset + 0)/2] = 0x4e71; - RAM[(offset + 2)/2] = 0x4e71; - RAM[(offset + 4)/2] = 0x4e71; + RAM[(offset + 0) / 2] = 0x4e71; + RAM[(offset + 2) / 2] = 0x4e71; + RAM[(offset + 4) / 2] = 0x4e71; } @@ -558,6 +771,8 @@ void crshrace_state::init_crshrace2() #endif } +} // anonymous namespace + GAME( 1993, crshrace, 0, crshrace, crshrace, crshrace_state, init_crshrace, ROT270, "Video System Co.", "Lethal Crash Race / Bakuretsu Crash Race (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1993, crshrace2, crshrace, crshrace, crshrace2, crshrace_state, init_crshrace2, ROT270, "Video System Co.", "Lethal Crash Race / Bakuretsu Crash Race (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/vsystem/crshrace.h b/src/mame/vsystem/crshrace.h deleted file mode 100644 index 66088e19707..00000000000 --- a/src/mame/vsystem/crshrace.h +++ /dev/null @@ -1,86 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria -#ifndef MAME_VSYSTEM_CRSHRACE_H -#define MAME_VSYSTEM_CRSHRACE_H - -#pragma once - -#include "vsystem_spr.h" - -#include "cpu/z80/z80.h" -#include "machine/gen_latch.h" -#include "video/bufsprite.h" -#include "video/k053936.h" - -#include "emupal.h" -#include "tilemap.h" - - -class crshrace_state : public driver_device -{ -public: - crshrace_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_videoram(*this, "videoram.%u", 0U), - m_z80bank(*this, "bank1"), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_spr(*this, "vsystem_spr"), - m_k053936(*this, "k053936"), - m_spriteram(*this, "spriteram.%u", 0U), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch") - { } - - void crshrace(machine_config &config); - - void init_crshrace2(); - void init_crshrace(); - -protected: - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void video_start() override; - -private: - // memory pointers - required_shared_ptr_array m_videoram; - - required_memory_bank m_z80bank; - - // devices - required_device m_maincpu; - required_device m_audiocpu; - required_device m_spr; - required_device m_k053936; - required_device_array m_spriteram; - required_device m_gfxdecode; - required_device m_palette; - required_device m_soundlatch; - - // video-related - tilemap_t *m_tilemap[2]{}; - uint8_t m_roz_bank = 0U; - uint8_t m_gfxctrl = 0U; - uint8_t m_flipscreen = 0U; - - uint32_t tile_callback(uint32_t code); - void sh_bankswitch_w(uint8_t data); - template void videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_videoram[Which][offset]); m_tilemap[Which]->mark_tile_dirty(offset); } - void roz_bank_w(offs_t offset, uint8_t data); - void gfxctrl_w(offs_t offset, uint8_t data); - TILE_GET_INFO_MEMBER(get_tile_info1); - TILE_GET_INFO_MEMBER(get_tile_info2); - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_bg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - - void main_map(address_map &map); - void sound_io_map(address_map &map); - void sound_map(address_map &map); - - [[maybe_unused]] void patch_code(uint16_t offset); -}; - -#endif // MAME_VSYSTEM_CRSHRACE_H diff --git a/src/mame/vsystem/crshrace_v.cpp b/src/mame/vsystem/crshrace_v.cpp deleted file mode 100644 index 6b6c339037c..00000000000 --- a/src/mame/vsystem/crshrace_v.cpp +++ /dev/null @@ -1,125 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria -#include "emu.h" - -#include "crshrace.h" - - -/*************************************************************************** - - Callbacks for the TileMap code - -***************************************************************************/ - -TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info1) -{ - int code = m_videoram[0][tile_index]; - - tileinfo.set(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0); -} - -TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info2) -{ - int code = m_videoram[1][tile_index]; - - tileinfo.set(0, code, 0, 0); -} - - -/*************************************************************************** - - Start the video hardware emulation. - -***************************************************************************/ - - -uint32_t crshrace_state::tile_callback(uint32_t code) -{ - return m_spriteram[1]->buffer()[code&0x7fff]; -} - - -void crshrace_state::video_start() -{ - m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_tile_info1)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_tile_info2)), TILEMAP_SCAN_ROWS, 8, 8, 64, 64); - - m_tilemap[0]->set_transparent_pen(0x0f); - m_tilemap[1]->set_transparent_pen(0xff); - -} - - -/*************************************************************************** - - Memory handlers - -***************************************************************************/ - - -void crshrace_state::roz_bank_w(offs_t offset, uint8_t data) -{ - if (m_roz_bank != data) - { - m_roz_bank = data; - m_tilemap[0]->mark_all_dirty(); - } -} - - -void crshrace_state::gfxctrl_w(offs_t offset, uint8_t data) -{ - m_gfxctrl = data; - m_flipscreen = data & 0x20; -} - - -/*************************************************************************** - - Display refresh - -***************************************************************************/ - -void crshrace_state::draw_bg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0); -} - - -void crshrace_state::draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - m_k053936->zoom_draw(screen, bitmap, cliprect, m_tilemap[0], 0, 0, 1); -} - - -uint32_t crshrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - if (m_gfxctrl & 0x04) // display disable? - { - bitmap.fill(m_palette->black_pen(), cliprect); - return 0; - } - - bitmap.fill(0x1ff, cliprect); - - - - switch (m_gfxctrl & 0xfb) - { - case 0x00: // high score screen - m_spr->draw_sprites(m_spriteram[0]->buffer(), 0x2000, screen, bitmap, cliprect); - draw_bg(screen, bitmap, cliprect); - draw_fg(screen, bitmap, cliprect); - break; - case 0x01: - case 0x02: - draw_bg(screen, bitmap, cliprect); - draw_fg(screen, bitmap, cliprect); - m_spr->draw_sprites(m_spriteram[0]->buffer(), 0x2000, screen, bitmap, cliprect); - break; - default: - popmessage("gfxctrl = %02x", m_gfxctrl); - break; - } - return 0; -} diff --git a/src/mame/vsystem/f1gp.cpp b/src/mame/vsystem/f1gp.cpp index a8546346415..30f6b1b7faf 100644 --- a/src/mame/vsystem/f1gp.cpp +++ b/src/mame/vsystem/f1gp.cpp @@ -25,21 +25,438 @@ ***************************************************************************/ #include "emu.h" -#include "f1gp.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" +#include "vsystem_gga.h" +#include "vsystem_spr.h" +#include "vsystem_spr2.h" +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/6850acia.h" #include "machine/clock.h" - +#include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/ymopn.h" +#include "video/k053936.h" -#include "vsystem_gga.h" - +#include "emupal.h" #include "screen.h" #include "speaker.h" +#include "tilemap.h" + + +// configurable logging +#define LOG_PRIORITIES (1U << 1) +#define LOG_UNKSPRITEFLAGS (1U << 2) + +//#define VERBOSE (LOG_GENERAL | LOG_PRIORITIES | LOG_UNKSPRITEFLAGS) + +#include "logmacro.h" + +#define LOGPRIORITIES(...) LOGMASKED(LOG_PRIORITIES, __VA_ARGS__) +#define LOGUNKSPRITEFLAGS(...) LOGMASKED(LOG_UNKSPRITEFLAGS, __VA_ARGS__) + + +namespace { + +class f1gp_state : public driver_device +{ +public: + f1gp_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_sharedram(*this, "sharedram"), + m_sprvram(*this, "spr%uvram", 1U), + m_sprcgram(*this, "spr%ucgram", 1U), + m_fgvideoram(*this, "fgvideoram"), + m_rozvideoram(*this, "rozvideoram"), + m_spriteram(*this, "spriteram"), + m_fgregs(*this, "fgregs"), + m_rozregs(*this, "rozregs"), + m_z80bank(*this, "z80bank"), + m_maincpu(*this, "maincpu"), + m_gfxdecode(*this, "gfxdecode"), + m_audiocpu(*this, "audiocpu"), + m_k053936(*this, "k053936"), + m_palette(*this, "palette"), + m_soundlatch(*this, "soundlatch"), + m_acia(*this, "acia"), + m_rozgfxram(*this, "rozgfxram"), + m_spr_old(*this, "vsystem_spr_old%u", 1U) + { } + + void f1gpb(machine_config &config); + void f1gp(machine_config &config); + +protected: + // memory pointers + required_shared_ptr m_sharedram; + optional_shared_ptr_array m_sprvram; + optional_shared_ptr_array m_sprcgram; + required_shared_ptr m_fgvideoram; + required_shared_ptr m_rozvideoram; + optional_shared_ptr m_spriteram; + optional_shared_ptr m_fgregs; + optional_shared_ptr m_rozregs; + + optional_memory_bank m_z80bank; + + // video-related + tilemap_t *m_fg_tilemap = nullptr; + tilemap_t *m_roz_tilemap = nullptr; + uint8_t m_flipscreen = 0; + uint8_t m_gfxctrl = 0; + uint16_t m_scroll[2]{}; + template uint32_t tile_callback(uint32_t code); + + // devices + required_device m_maincpu; + required_device m_gfxdecode; + optional_device m_audiocpu; + optional_device m_k053936; + required_device m_palette; + optional_device m_soundlatch; // not f1gpb + required_device m_acia; + + void sh_bankswitch_w(uint8_t data); + uint8_t command_pending_r(); + void rozvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void fgscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void gfxctrl_w(uint8_t data); + TILE_GET_INFO_MEMBER(get_fg_tile_info); + + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + + void f1gp_cpu2_map(address_map &map); + void sound_io_map(address_map &map); + void sound_map(address_map &map); + +private: + // memory pointers + optional_shared_ptr m_rozgfxram; + + // devices + optional_device_array m_spr_old; // f1gp + + void f1gpb_misc_w(uint16_t data); + void rozgfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + TILE_GET_INFO_MEMBER(get_roz_tile_info); + + uint32_t screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void f1gpb_draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); + void f1gp_cpu1_map(address_map &map); + void f1gpb_cpu1_map(address_map &map); + void f1gpb_cpu2_map(address_map &map); +}; + +class f1gp2_state : public f1gp_state +{ +public: + f1gp2_state(const machine_config &mconfig, device_type type, const char *tag) : + f1gp_state(mconfig, type, tag), + m_spr(*this, "vsystem_spr") + { } + + void f1gp2(machine_config &config); + +protected: + virtual void machine_reset() override; + virtual void video_start() override; + +private: + // video-related + uint8_t m_roz_bank = 0; + + // devices + optional_device m_spr; // f1gp2 + + void rozbank_w(uint8_t data); + + TILE_GET_INFO_MEMBER(get_roz_tile_info); + + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + void f1gp2_cpu1_map(address_map &map); +}; + + +// video + +/*************************************************************************** + + Callbacks for the TileMap code + +***************************************************************************/ + +TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) +{ + int const code = m_fgvideoram[tile_index]; + + tileinfo.set(0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0); +} + +TILE_GET_INFO_MEMBER(f1gp_state::get_roz_tile_info) +{ + int const code = m_rozvideoram[tile_index]; + + tileinfo.set(3, code & 0x7ff, code >> 12, 0); +} + +TILE_GET_INFO_MEMBER(f1gp2_state::get_roz_tile_info) +{ + int const code = m_rozvideoram[tile_index]; + + tileinfo.set(2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0); +} + + +/*************************************************************************** + + Start the video hardware emulation. + +***************************************************************************/ + + +void f1gp_state::video_start() +{ + m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp_state::get_roz_tile_info)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp_state::get_fg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + + m_fg_tilemap->set_transparent_pen(0xff); + + save_item(NAME(m_flipscreen)); + save_item(NAME(m_gfxctrl)); + save_item(NAME(m_scroll)); +} + + +void f1gp2_state::video_start() +{ + m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp2_state::get_roz_tile_info)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); + m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp2_state::get_fg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); + + m_fg_tilemap->set_transparent_pen(0xff); + m_roz_tilemap->set_transparent_pen(0x0f); + + m_fg_tilemap->set_scrolldx(-80, 0); + m_fg_tilemap->set_scrolldy(-26, 0); + + save_item(NAME(m_roz_bank)); + save_item(NAME(m_flipscreen)); + save_item(NAME(m_gfxctrl)); + save_item(NAME(m_scroll)); +} + + +/*************************************************************************** + + Memory handlers + +***************************************************************************/ + +void f1gp_state::rozgfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + COMBINE_DATA(&m_rozgfxram[offset]); + m_gfxdecode->gfx(3)->mark_dirty(offset / 64); +} + +void f1gp_state::rozvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + COMBINE_DATA(&m_rozvideoram[offset]); + m_roz_tilemap->mark_tile_dirty(offset); +} +void f1gp_state::fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + COMBINE_DATA(&m_fgvideoram[offset]); + m_fg_tilemap->mark_tile_dirty(offset); +} + +void f1gp_state::fgscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + COMBINE_DATA(&m_scroll[offset]); + + m_fg_tilemap->set_scrollx(0, m_scroll[0]); + m_fg_tilemap->set_scrolly(0, m_scroll[1]); +} + +void f1gp_state::gfxctrl_w(uint8_t data) +{ + m_flipscreen = data & 0x20; + m_gfxctrl = data & 0xdf; +} + +void f1gp2_state::rozbank_w(uint8_t data) +{ + if (m_roz_bank != data) + { + m_roz_bank = data; + m_roz_tilemap->mark_all_dirty(); + } +} + + +/*************************************************************************** + + Display refresh + +***************************************************************************/ + + +uint32_t f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + screen.priority().fill(0, cliprect); + + m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, 0, 0, 1); + + m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 1); + + // quick kludge for "continue" screen priority + if (m_gfxctrl == 0x00) + { + m_spr_old[0]->turbofrc_draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02); + m_spr_old[1]->turbofrc_draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02); + } + else + { + m_spr_old[0]->turbofrc_draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x00); + m_spr_old[1]->turbofrc_draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02); + } + return 0; +} + + +uint32_t f1gp2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + if (m_gfxctrl & 4) // blank screen + bitmap.fill(m_palette->black_pen(), cliprect); + else + { + switch (m_gfxctrl & 3) + { + case 0: + m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1); + m_spr->draw_sprites(m_sprvram[0], 0x2000, screen, bitmap, cliprect); + m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + break; + case 1: + m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1); + m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); + m_spr->draw_sprites(m_sprvram[0], 0x2000, screen, bitmap, cliprect); + break; + case 2: + m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); + m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, 0, 0, 1); + m_spr->draw_sprites(m_sprvram[0], 0x2000, screen, bitmap, cliprect); + break; + case 3: + LOGPRIORITIES("unsupported priority 3\n"); + } + } + return 0; +} + +/*************************************************************************** + + BOOTLEG SUPPORT + +***************************************************************************/ + +// BOOTLEG +void f1gp_state::f1gpb_draw_sprites(screen_device &screen,bitmap_ind16 &bitmap,const rectangle &cliprect) +{ + int start_offset = m_spriteram.bytes() / 2 - 4; + + // find the "end of list" to draw the sprites in reverse order + for (int attr_start = 4; attr_start < m_spriteram.bytes() / 2; attr_start += 4) + { + if (m_spriteram[attr_start + 3 - 4] == 0xffff) // end of list marker + { + start_offset = attr_start - 4; + break; + } + } + + for (int attr_start = start_offset; attr_start >= 4; attr_start -= 4) + { + int const x = (m_spriteram[attr_start + 2] & 0x03ff) - 48; + int const y = (256 - (m_spriteram[attr_start + 3 - 4] & 0x03ff)) - 15; + int const flipx = m_spriteram[attr_start + 1] & 0x0800; + int const flipy = m_spriteram[attr_start + 1] & 0x8000; + int const color = m_spriteram[attr_start + 1] & 0x000f; + int code = m_spriteram[attr_start + 0] & 0x3fff; + int const pri = 0; //? + + if ((m_spriteram[attr_start + 1] & 0x00f0) && (m_spriteram[attr_start + 1] & 0x00f0) != 0xc0) + { + LOGUNKSPRITEFLAGS("attr %X\n", m_spriteram[attr_start + 1] & 0x00f0); + code = machine().rand(); + } + + if (m_spriteram[attr_start + 1] & ~0x88cf) + LOGUNKSPRITEFLAGS("1 = %X\n", m_spriteram[attr_start + 1] & ~0x88cf); + + int gfx; + + if (code >= 0x2000) + { + gfx = 1; + code -= 0x2000; + } + else + { + gfx = 0; + } + + m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap, cliprect, + code, + color, + flipx, flipy, + x, y, + screen.priority(), + pri ? 0 : 0x2, 15); + + // wrap around x + m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap, cliprect, + code, + color, + flipx, flipy, + x - 512, y, + screen.priority(), + pri ? 0 : 0x2, 15); + } +} + +// BOOTLEG +uint32_t f1gp_state::screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ + int const incxy = (int16_t)m_rozregs[1]; + int const incyx = -incxy; + int const incxx = (int16_t)m_rozregs[3]; + int const incyy = incxx; + uint32_t const startx = m_rozregs[0] + 328; + uint32_t const starty = m_rozregs[2]; + + m_fg_tilemap->set_scrolly(0, m_fgregs[0] + 8); + + screen.priority().fill(0, cliprect); + + m_roz_tilemap->draw_roz(screen, bitmap, cliprect, + startx << 13, starty << 13, + incxx << 5, incxy << 5, incyx << 5, incyy << 5, + 1, 0, 0); + + m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 1); + + f1gpb_draw_sprites(screen, bitmap, cliprect); + + return 0; +} + + +// machine void f1gp_state::sh_bankswitch_w(uint8_t data) { @@ -223,7 +640,7 @@ static INPUT_PORTS_START( f1gp ) PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:1") PORT_DIPSETTING( 0x0100, DEF_STR( No ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x0e00, 0x0e00, DEF_STR( Coin_A ) ) PORT_CONDITION("DSW1",0x8000,EQUALS,0x8000) PORT_DIPLOCATION("SW1:2,3,4") + PORT_DIPNAME( 0x0e00, 0x0e00, DEF_STR( Coin_A ) ) PORT_CONDITION("DSW1", 0x8000, EQUALS, 0x8000) PORT_DIPLOCATION("SW1:2,3,4") PORT_DIPSETTING( 0x0a00, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x0c00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x0e00, DEF_STR( 1C_1C ) ) @@ -232,7 +649,7 @@ static INPUT_PORTS_START( f1gp ) PORT_DIPSETTING( 0x0400, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x0200, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x7000, 0x7000, DEF_STR( Coin_B ) ) PORT_CONDITION("DSW1",0x8000,EQUALS,0x8000) PORT_DIPLOCATION("SW1:5,6,7") + PORT_DIPNAME( 0x7000, 0x7000, DEF_STR( Coin_B ) ) PORT_CONDITION("DSW1", 0x8000, EQUALS, 0x8000) PORT_DIPLOCATION("SW1:5,6,7") PORT_DIPSETTING( 0x5000, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x6000, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x7000, DEF_STR( 1C_1C ) ) @@ -241,7 +658,7 @@ static INPUT_PORTS_START( f1gp ) PORT_DIPSETTING( 0x2000, DEF_STR( 1C_4C ) ) PORT_DIPSETTING( 0x1000, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0000, DEF_STR( 1C_6C ) ) - PORT_DIPNAME( 0x7e00, 0x7e00, DEF_STR( Coinage ) ) PORT_CONDITION("DSW1",0x8000,NOTEQUALS,0x8000) PORT_DIPLOCATION("SW1:2,3,4,5,6,7") + PORT_DIPNAME( 0x7e00, 0x7e00, DEF_STR( Coinage ) ) PORT_CONDITION("DSW1", 0x8000, NOTEQUALS, 0x8000) PORT_DIPLOCATION("SW1:2,3,4,5,6,7") PORT_DIPSETTING( 0x7e00, "2 to Start, 1 to Continue" ) PORT_DIPNAME( 0x8000, 0x8000, "Continue Coin" ) PORT_DIPLOCATION("SW1:8") PORT_DIPSETTING( 0x8000, "Normal Coinage" ) @@ -251,18 +668,18 @@ static INPUT_PORTS_START( f1gp ) PORT_DIPSETTING( 0x0003, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x0001, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x0000, DEF_STR( Hardest ) ) - PORT_DIPNAME( 0x0004, 0x0004, "Game Mode" ) PORT_DIPLOCATION("SW2:3") /* Setting to Multiple results in "ID CHECK ERROR" then hang */ + PORT_DIPNAME( 0x0004, 0x0004, "Game Mode" ) PORT_DIPLOCATION("SW2:3") // Setting to Multiple results in "ID CHECK ERROR" then hang PORT_DIPSETTING( 0x0004, DEF_STR( Single ) ) PORT_DIPSETTING( 0x0000, "Multiple" ) PORT_DIPNAME( 0x0008, 0x0008, "Multi Player Mode" ) PORT_DIPLOCATION("SW2:4") - PORT_DIPSETTING( 0x0008, "Single or Multi Player" ) PORT_CONDITION("DSW1",0x0004,EQUALS,0x0000) - PORT_DIPSETTING( 0x0000, "Multi Player Game Only" ) PORT_CONDITION("DSW1",0x0004,EQUALS,0x0000) - PORT_DIPSETTING( 0x0008, "Multi Player Off" ) PORT_CONDITION("DSW1",0x0004,NOTEQUALS,0x0000) - PORT_DIPSETTING( 0x0000, "Multi Player Off" ) PORT_CONDITION("DSW1",0x0004,NOTEQUALS,0x0000) - PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0010, "SW2:5" ) /* Listed as "Unused", reverses joystick left/right directions? */ - PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0020, "SW2:6" ) /* Listed as "Unused", two buttons to accelerate? */ - PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0040, "SW2:7" ) /* Listed as "Unused", reverses button activeness? */ - PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW2:8" ) /* Listed as "Unused" */ + PORT_DIPSETTING( 0x0008, "Single or Multi Player" ) PORT_CONDITION("DSW1", 0x0004, EQUALS, 0x0000) + PORT_DIPSETTING( 0x0000, "Multi Player Game Only" ) PORT_CONDITION("DSW1", 0x0004, EQUALS, 0x0000) + PORT_DIPSETTING( 0x0008, "Multi Player Off" ) PORT_CONDITION("DSW1", 0x0004, NOTEQUALS, 0x0000) + PORT_DIPSETTING( 0x0000, "Multi Player Off" ) PORT_CONDITION("DSW1", 0x0004, NOTEQUALS, 0x0000) + PORT_DIPUNUSED_DIPLOC( 0x0010, 0x0010, "SW2:5" ) // Listed as "Unused", reverses joystick left/right directions? + PORT_DIPUNUSED_DIPLOC( 0x0020, 0x0020, "SW2:6" ) // Listed as "Unused", two buttons to accelerate? + PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0040, "SW2:7" ) // Listed as "Unused", reverses button activeness? + PORT_DIPUNUSED_DIPLOC( 0x0080, 0x0080, "SW2:8" ) // Listed as "Unused" PORT_START("DSW2") PORT_SERVICE_DIPLOC( 0x0100, IP_ACTIVE_LOW, "SW3:1" ) @@ -272,10 +689,10 @@ static INPUT_PORTS_START( f1gp ) PORT_DIPNAME( 0x0400, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW3:3") PORT_DIPSETTING( 0x0400, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPUNUSED_DIPLOC( 0x0800, 0x0800, "SW3:4" ) /* Listed as "Unused" */ - PORT_DIPUNUSED_DIPLOC( 0x1000, 0x1000, "SW3:5" ) /* Listed as "Unused" */ - PORT_DIPUNUSED_DIPLOC( 0x2000, 0x2000, "SW3:6" ) /* Listed as "Unused" */ - PORT_DIPUNUSED_DIPLOC( 0x4000, 0x4000, "SW3:7" ) /* Listed as "Unused" */ + PORT_DIPUNUSED_DIPLOC( 0x0800, 0x0800, "SW3:4" ) // Listed as "Unused" + PORT_DIPUNUSED_DIPLOC( 0x1000, 0x1000, "SW3:5" ) // Listed as "Unused" + PORT_DIPUNUSED_DIPLOC( 0x2000, 0x2000, "SW3:6" ) // Listed as "Unused" + PORT_DIPUNUSED_DIPLOC( 0x4000, 0x4000, "SW3:7" ) // Listed as "Unused" // listed as "Unused" in manual, it selects between joystick or steering wheel PORT_DIPNAME( 0x8000, 0x8000, "Input Method" ) PORT_DIPLOCATION("SW3:8") PORT_DIPSETTING( 0x8000, "Joystick" ) @@ -284,14 +701,14 @@ static INPUT_PORTS_START( f1gp ) PORT_DIPSETTING( 0x0000, "Steering Wheel" ) PORT_START("DSW3") - PORT_DIPNAME( 0x001f, 0x0010, DEF_STR( Region ) ) /* Jumpers?? */ + PORT_DIPNAME( 0x001f, 0x0010, DEF_STR( Region ) ) // Jumpers?? PORT_DIPSETTING( 0x0010, DEF_STR( World ) ) PORT_DIPSETTING( 0x0001, "USA & Canada" ) PORT_DIPSETTING( 0x0000, DEF_STR( Japan ) ) PORT_DIPSETTING( 0x0002, DEF_STR( Korea ) ) PORT_DIPSETTING( 0x0004, DEF_STR( Hong_Kong ) ) PORT_DIPSETTING( 0x0008, DEF_STR( Taiwan ) ) - /* all other values are invalid */ + // all other values are invalid PORT_START("JOY_TYPE") PORT_CONFNAME( 0x01, 0x01, "Joystick Type" ) @@ -318,16 +735,16 @@ INPUT_PORTS_END static GFXDECODE_START( gfx_f1gp ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x8_raw, 0x000, 1 ) - GFXDECODE_ENTRY( "gfx2", 0, gfx_16x16x4_packed_lsb, 0x100, 16 ) - GFXDECODE_ENTRY( "gfx3", 0, gfx_16x16x4_packed_lsb, 0x200, 16 ) - GFXDECODE_RAM( "rozgfxram", 0, gfx_16x16x4_packed_msb, 0x300, 16 ) + GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x8_raw, 0x000, 1 ) + GFXDECODE_ENTRY( "sprites1", 0, gfx_16x16x4_packed_lsb, 0x100, 16 ) + GFXDECODE_ENTRY( "sprites2", 0, gfx_16x16x4_packed_lsb, 0x200, 16 ) + GFXDECODE_RAM( "rozgfxram", 0, gfx_16x16x4_packed_msb, 0x300, 16 ) GFXDECODE_END static GFXDECODE_START( gfx_f1gp2 ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x8_raw, 0x000, 1 ) - GFXDECODE_ENTRY( "gfx2", 0, gfx_16x16x4_packed_lsb, 0x200, 32 ) - GFXDECODE_ENTRY( "gfx3", 0, gfx_16x16x4_packed_msb, 0x100, 16 ) + GFXDECODE_ENTRY( "fgtiles", 0, gfx_8x8x8_raw, 0x000, 1 ) + GFXDECODE_ENTRY( "sprites1", 0, gfx_16x16x4_packed_lsb, 0x200, 32 ) + GFXDECODE_ENTRY( "sprites2", 0, gfx_16x16x4_packed_msb, 0x100, 16 ) GFXDECODE_END @@ -358,38 +775,38 @@ void f1gp2_state::machine_reset() m_roz_bank = 0; } -template -uint32_t f1gp_state::tile_callback( uint32_t code ) +template +uint32_t f1gp_state::tile_callback(uint32_t code) { return m_sprcgram[Chip][code & (m_sprcgram[Chip].length() - 1)]; } void f1gp_state::f1gp(machine_config &config) { - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(20'000'000)/2); /* verified on pcb */ + // basic machine hardware + M68000(config, m_maincpu, XTAL(20'000'000) / 2); // verified on PCB m_maincpu->set_addrmap(AS_PROGRAM, &f1gp_state::f1gp_cpu1_map); m_maincpu->set_vblank_int("screen", FUNC(f1gp_state::irq1_line_hold)); - m68000_device &sub(M68000(config, "sub", XTAL(20'000'000)/2)); /* verified on pcb */ + m68000_device &sub(M68000(config, "sub", XTAL(20'000'000) / 2)); // verified on PCB sub.set_addrmap(AS_PROGRAM, &f1gp_state::f1gp_cpu2_map); sub.set_vblank_int("screen", FUNC(f1gp_state::irq1_line_hold)); - Z80(config, m_audiocpu, XTAL(20'000'000)/4); /* verified on pcb */ + Z80(config, m_audiocpu, XTAL(20'000'000) / 4); // verified on PCB m_audiocpu->set_addrmap(AS_PROGRAM, &f1gp_state::sound_map); m_audiocpu->set_addrmap(AS_IO, &f1gp_state::sound_io_map); - config.set_maximum_quantum(attotime::from_hz(6000)); /* 100 CPU slices per frame */ + config.set_maximum_quantum(attotime::from_hz(6'000)); // 100 CPU slices per frame ACIA6850(config, m_acia, 0); m_acia->irq_handler().set_inputline("sub", M68K_IRQ_3); m_acia->txd_handler().set("acia", FUNC(acia6850_device::write_rxd)); // loopback for now - clock_device &acia_clock(CLOCK(config, "acia_clock", 1000000)); // guessed + clock_device &acia_clock(CLOCK(config, "acia_clock", 1'000'000)); // guessed acia_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc)); acia_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc)); - /* video hardware */ + // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(60); screen.set_size(64*8, 32*8); @@ -418,7 +835,7 @@ void f1gp_state::f1gp(machine_config &config) m_k053936->set_wrap(1); m_k053936->set_offsets(-58, -2); - /* sound hardware */ + // sound hardware SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -436,27 +853,27 @@ void f1gp_state::f1gp(machine_config &config) void f1gp_state::f1gpb(machine_config &config) { - /* basic machine hardware */ - M68000(config, m_maincpu, 10000000); /* 10 MHz ??? */ + // basic machine hardware + M68000(config, m_maincpu, 10'000'000); // 10 MHz ??? m_maincpu->set_addrmap(AS_PROGRAM, &f1gp_state::f1gpb_cpu1_map); m_maincpu->set_vblank_int("screen", FUNC(f1gp_state::irq1_line_hold)); - m68000_device &sub(M68000(config, "sub", 10000000)); /* 10 MHz ??? */ + m68000_device &sub(M68000(config, "sub", 10'000'000)); // 10 MHz ??? sub.set_addrmap(AS_PROGRAM, &f1gp_state::f1gpb_cpu2_map); sub.set_vblank_int("screen", FUNC(f1gp_state::irq1_line_hold)); - /* NO sound CPU */ - config.set_maximum_quantum(attotime::from_hz(6000)); /* 100 CPU slices per frame */ + // NO sound CPU + config.set_maximum_quantum(attotime::from_hz(6'000)); // 100 CPU slices per frame ACIA6850(config, m_acia, 0); m_acia->irq_handler().set_inputline("sub", M68K_IRQ_3); m_acia->txd_handler().set("acia", FUNC(acia6850_device::write_rxd)); // loopback for now - clock_device &acia_clock(CLOCK(config, "acia_clock", 1000000)); // guessed + clock_device &acia_clock(CLOCK(config, "acia_clock", 1'000'000)); // guessed acia_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc)); acia_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc)); - /* video hardware */ + // video hardware screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); screen.set_refresh_hz(60); screen.set_size(64*8, 32*8); @@ -469,10 +886,10 @@ void f1gp_state::f1gpb(machine_config &config) //VSYSTEM_GGA(config, "gga", 0); - /* sound hardware */ + // sound hardware SPEAKER(config, "mono").front_center(); - okim6295_device &oki(OKIM6295(config, "oki", 1000000, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified + okim6295_device &oki(OKIM6295(config, "oki", 1'000'000, okim6295_device::PIN7_HIGH)); // clock frequency & pin 7 not verified oki.add_route(ALL_OUTPUTS, "mono", 1.00); } @@ -480,10 +897,10 @@ void f1gp2_state::f1gp2(machine_config &config) { f1gp_state::f1gp(config); - /* basic machine hardware */ + // basic machine hardware m_maincpu->set_addrmap(AS_PROGRAM, &f1gp2_state::f1gp2_cpu1_map); - /* video hardware */ + // video hardware m_gfxdecode->set_info(gfx_f1gp2); subdevice("screen")->set_visarea(0*8, 40*8-1, 0*8, 28*8-1); @@ -503,97 +920,89 @@ void f1gp2_state::f1gp2(machine_config &config) ROM_START( f1gp ) - ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_WORD_SWAP( "v1.rom1.rom", 0x000000, 0x40000, CRC(56c8eccd) SHA1(2b55f13df83761ea2d1f9cc64519c35a9ff64c6e) ) // 27C2048 is correct, game data extends to 0x28ADE then 0xFF filled - - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* extra ROMs mapped at 100000 */ - ROM_LOAD16_BYTE( "rom10-a.1", 0x000000, 0x40000, CRC(46a289fb) SHA1(6a8c19e08b6d836fe83378fd77fead82a0b2db7c) ) - ROM_LOAD16_BYTE( "rom11-a.2", 0x000001, 0x40000, CRC(53df8ea1) SHA1(25d50bb787f3bd35c9a8ae2b0ab9a21e000debb0) ) - ROM_LOAD16_BYTE( "rom12-a.3", 0x080000, 0x40000, CRC(d8c1bcf4) SHA1(d6d77354eb1ab413ba8cfa5d973cf5b0c851c23b) ) - ROM_LOAD16_BYTE( "rom13-a.4", 0x080001, 0x40000, CRC(7d92e1fa) SHA1(c23f5beea85b0804c61ef9e7f131b186d076221f) ) - ROM_LOAD16_BYTE( "rom7-a.5", 0x100000, 0x40000, CRC(7a014ba6) SHA1(8f0abbb68100e396e5a41337254cb6bf1a2ed00b) ) - ROM_LOAD16_BYTE( "rom6-a.6", 0x100001, 0x40000, CRC(6d947a3f) SHA1(2cd01ee2a73ab105a45a5464a29fd75aa43ba2db) ) - ROM_LOAD16_BYTE( "rom8-a.7", 0x180000, 0x40000, CRC(0ed783c7) SHA1(c0c467ede51c08d84999897c6d5cc8b584b23b67) ) - ROM_LOAD16_BYTE( "rom9-a.8", 0x180001, 0x40000, CRC(49286572) SHA1(c5e16bd1ccd43452337a4cd76db70db079ca0706) ) - - ROM_REGION16_BE( 0x200000, "user2", 0 ) /* extra ROMs mapped at a00000 */ - /* containing gfx data for the 053936 */ - ROM_LOAD16_WORD_SWAP( "rom2-a.06", 0x000000, 0x100000, CRC(747dd112) SHA1(b9264bec61467ab256cf6cb698b6e0ea8f8006e0) ) - ROM_LOAD16_WORD_SWAP( "rom3-a.05", 0x100000, 0x100000, CRC(264aed13) SHA1(6f0de860d4299befffc530b7a8f19656982a51c4) ) - - ROM_REGION( 0x20000, "sub", 0 ) /* 68000 code */ - ROM_LOAD16_WORD_SWAP( "rom4-a.4", 0x000000, 0x20000, CRC(8e811d36) SHA1(2b806b50a3a307a21894687f16485ace287a7c4c) ) - - ROM_REGION( 0x20000, "audiocpu", 0 ) /* 64k for the audio CPU + banks */ - ROM_LOAD( "rom5-a.8", 0x00000, 0x20000, CRC(9ea36e35) SHA1(9254dea8362318d8cfbd5e36e476e0e235e6326a) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "rom3-b.07", 0x000000, 0x100000, CRC(ffb1d489) SHA1(9330b67e0eaaf67d6c38f40a02c72419bd38fb81) ) - ROM_LOAD( "rom2-b.04", 0x100000, 0x100000, CRC(d1b3471f) SHA1(d1a95fbaad1c3d9ec2121bf65abbcdb5441bd0ac) ) - - ROM_REGION( 0x100000, "gfx2", 0 ) - ROM_LOAD32_WORD( "rom5-b.2", 0x000000, 0x80000, CRC(17572b36) SHA1(c58327c2f708783a3e8470e290cae0d71454f1da) ) - ROM_LOAD32_WORD( "rom4-b.3", 0x000002, 0x80000, CRC(72d12129) SHA1(11da6990a54ae1b6f6d0bed5d0431552f83a0dda) ) - - ROM_REGION( 0x080000, "gfx3", 0 ) - ROM_LOAD32_WORD( "rom7-b.17", 0x000000, 0x40000, CRC(2aed9003) SHA1(45ff9953ad98063573e7fd7b930ae8b0183cdd04) ) - ROM_LOAD32_WORD( "rom6-b.16", 0x000002, 0x40000, CRC(6789ef12) SHA1(9b0d1cc6e9c6398ccb7f635c4c148fddd224a21f) ) - - ROM_REGION( 0x40000, "gfx4", ROMREGION_ERASE00 ) /* gfx data for the 053936 */ - /* RAM, not ROM - handled at run time */ - - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) /* sound samples */ + ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code + ROM_LOAD16_WORD_SWAP( "v1.rom1.rom", 0x00000, 0x40000, CRC(56c8eccd) SHA1(2b55f13df83761ea2d1f9cc64519c35a9ff64c6e) ) // 27C2048 is correct, game data extends to 0x28ADE then 0xFF filled + + ROM_REGION16_BE( 0x200000, "user1", 0 ) // extra ROMs mapped at 100000 + ROM_LOAD16_BYTE( "rom10-a.1", 0x000000, 0x40000, CRC(46a289fb) SHA1(6a8c19e08b6d836fe83378fd77fead82a0b2db7c) ) + ROM_LOAD16_BYTE( "rom11-a.2", 0x000001, 0x40000, CRC(53df8ea1) SHA1(25d50bb787f3bd35c9a8ae2b0ab9a21e000debb0) ) + ROM_LOAD16_BYTE( "rom12-a.3", 0x080000, 0x40000, CRC(d8c1bcf4) SHA1(d6d77354eb1ab413ba8cfa5d973cf5b0c851c23b) ) + ROM_LOAD16_BYTE( "rom13-a.4", 0x080001, 0x40000, CRC(7d92e1fa) SHA1(c23f5beea85b0804c61ef9e7f131b186d076221f) ) + ROM_LOAD16_BYTE( "rom7-a.5", 0x100000, 0x40000, CRC(7a014ba6) SHA1(8f0abbb68100e396e5a41337254cb6bf1a2ed00b) ) + ROM_LOAD16_BYTE( "rom6-a.6", 0x100001, 0x40000, CRC(6d947a3f) SHA1(2cd01ee2a73ab105a45a5464a29fd75aa43ba2db) ) + ROM_LOAD16_BYTE( "rom8-a.7", 0x180000, 0x40000, CRC(0ed783c7) SHA1(c0c467ede51c08d84999897c6d5cc8b584b23b67) ) + ROM_LOAD16_BYTE( "rom9-a.8", 0x180001, 0x40000, CRC(49286572) SHA1(c5e16bd1ccd43452337a4cd76db70db079ca0706) ) + + ROM_REGION16_BE( 0x200000, "user2", 0 ) // extra ROMs mapped at a00000 containing gfx data for the 053936 + ROM_LOAD16_WORD_SWAP( "rom2-a.06", 0x000000, 0x100000, CRC(747dd112) SHA1(b9264bec61467ab256cf6cb698b6e0ea8f8006e0) ) + ROM_LOAD16_WORD_SWAP( "rom3-a.05", 0x100000, 0x100000, CRC(264aed13) SHA1(6f0de860d4299befffc530b7a8f19656982a51c4) ) + + ROM_REGION( 0x20000, "sub", 0 ) // 68000 code + ROM_LOAD16_WORD_SWAP( "rom4-a.4", 0x00000, 0x20000, CRC(8e811d36) SHA1(2b806b50a3a307a21894687f16485ace287a7c4c) ) + + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "rom5-a.8", 0x00000, 0x20000, CRC(9ea36e35) SHA1(9254dea8362318d8cfbd5e36e476e0e235e6326a) ) + + ROM_REGION( 0x200000, "fgtiles", 0 ) + ROM_LOAD( "rom3-b.07", 0x000000, 0x100000, CRC(ffb1d489) SHA1(9330b67e0eaaf67d6c38f40a02c72419bd38fb81) ) + ROM_LOAD( "rom2-b.04", 0x100000, 0x100000, CRC(d1b3471f) SHA1(d1a95fbaad1c3d9ec2121bf65abbcdb5441bd0ac) ) + + ROM_REGION( 0x100000, "sprites1", 0 ) + ROM_LOAD32_WORD( "rom5-b.2", 0x00000, 0x80000, CRC(17572b36) SHA1(c58327c2f708783a3e8470e290cae0d71454f1da) ) + ROM_LOAD32_WORD( "rom4-b.3", 0x00002, 0x80000, CRC(72d12129) SHA1(11da6990a54ae1b6f6d0bed5d0431552f83a0dda) ) + + ROM_REGION( 0x080000, "sprites2", 0 ) + ROM_LOAD32_WORD( "rom7-b.17", 0x00000, 0x40000, CRC(2aed9003) SHA1(45ff9953ad98063573e7fd7b930ae8b0183cdd04) ) + ROM_LOAD32_WORD( "rom6-b.16", 0x00002, 0x40000, CRC(6789ef12) SHA1(9b0d1cc6e9c6398ccb7f635c4c148fddd224a21f) ) + + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) ROM_LOAD( "rom14-a.09", 0x000000, 0x100000, CRC(b4c1ac31) SHA1(acab2e1b5ce4ca3a5c4734562481b54db4b46995) ) - ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) /* sound samples */ + ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) ROM_LOAD( "rom17-a.08", 0x000000, 0x100000, CRC(ea70303d) SHA1(8de1a0e6d47cd80a622663c1745a1da54cd0ea05) ) ROM_END ROM_START( f1gpa ) - ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_WORD_SWAP( "rom1-a.3", 0x000000, 0x20000, CRC(2d8f785b) SHA1(6eca42ad2d57a31e055496141c89cb537f284378) ) // 27C1024 is correct, game data extends to 0x195AC then 0xFF filled - - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* extra ROMs mapped at 100000 */ - ROM_LOAD16_BYTE( "rom10-a.1", 0x000000, 0x40000, CRC(46a289fb) SHA1(6a8c19e08b6d836fe83378fd77fead82a0b2db7c) ) - ROM_LOAD16_BYTE( "rom11-a.2", 0x000001, 0x40000, CRC(53df8ea1) SHA1(25d50bb787f3bd35c9a8ae2b0ab9a21e000debb0) ) - ROM_LOAD16_BYTE( "rom12-a.3", 0x080000, 0x40000, CRC(d8c1bcf4) SHA1(d6d77354eb1ab413ba8cfa5d973cf5b0c851c23b) ) - ROM_LOAD16_BYTE( "rom13-a.4", 0x080001, 0x40000, CRC(7d92e1fa) SHA1(c23f5beea85b0804c61ef9e7f131b186d076221f) ) - ROM_LOAD16_BYTE( "rom7-a.5", 0x100000, 0x40000, CRC(7a014ba6) SHA1(8f0abbb68100e396e5a41337254cb6bf1a2ed00b) ) - ROM_LOAD16_BYTE( "rom6-a.6", 0x100001, 0x40000, CRC(6d947a3f) SHA1(2cd01ee2a73ab105a45a5464a29fd75aa43ba2db) ) - ROM_LOAD16_BYTE( "rom8-a.7", 0x180000, 0x40000, CRC(0ed783c7) SHA1(c0c467ede51c08d84999897c6d5cc8b584b23b67) ) - ROM_LOAD16_BYTE( "rom9-a.8", 0x180001, 0x40000, CRC(49286572) SHA1(c5e16bd1ccd43452337a4cd76db70db079ca0706) ) - - ROM_REGION16_BE( 0x200000, "user2", 0 ) /* extra ROMs mapped at a00000 */ - /* containing gfx data for the 053936 */ - ROM_LOAD16_WORD_SWAP( "rom2-a.06", 0x000000, 0x100000, CRC(747dd112) SHA1(b9264bec61467ab256cf6cb698b6e0ea8f8006e0) ) - ROM_LOAD16_WORD_SWAP( "rom3-a.05", 0x100000, 0x100000, CRC(264aed13) SHA1(6f0de860d4299befffc530b7a8f19656982a51c4) ) - - ROM_REGION( 0x20000, "sub", 0 ) /* 68000 code */ - ROM_LOAD16_WORD_SWAP( "rom4-a.4", 0x000000, 0x20000, CRC(8e811d36) SHA1(2b806b50a3a307a21894687f16485ace287a7c4c) ) + ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code + ROM_LOAD16_WORD_SWAP( "rom1-a.3", 0x00000, 0x20000, CRC(2d8f785b) SHA1(6eca42ad2d57a31e055496141c89cb537f284378) ) // 27C1024 is correct, game data extends to 0x195AC then 0xFF filled + + ROM_REGION16_BE( 0x200000, "user1", 0 ) // extra ROMs mapped at 100000 + ROM_LOAD16_BYTE( "rom10-a.1", 0x000000, 0x40000, CRC(46a289fb) SHA1(6a8c19e08b6d836fe83378fd77fead82a0b2db7c) ) + ROM_LOAD16_BYTE( "rom11-a.2", 0x000001, 0x40000, CRC(53df8ea1) SHA1(25d50bb787f3bd35c9a8ae2b0ab9a21e000debb0) ) + ROM_LOAD16_BYTE( "rom12-a.3", 0x080000, 0x40000, CRC(d8c1bcf4) SHA1(d6d77354eb1ab413ba8cfa5d973cf5b0c851c23b) ) + ROM_LOAD16_BYTE( "rom13-a.4", 0x080001, 0x40000, CRC(7d92e1fa) SHA1(c23f5beea85b0804c61ef9e7f131b186d076221f) ) + ROM_LOAD16_BYTE( "rom7-a.5", 0x100000, 0x40000, CRC(7a014ba6) SHA1(8f0abbb68100e396e5a41337254cb6bf1a2ed00b) ) + ROM_LOAD16_BYTE( "rom6-a.6", 0x100001, 0x40000, CRC(6d947a3f) SHA1(2cd01ee2a73ab105a45a5464a29fd75aa43ba2db) ) + ROM_LOAD16_BYTE( "rom8-a.7", 0x180000, 0x40000, CRC(0ed783c7) SHA1(c0c467ede51c08d84999897c6d5cc8b584b23b67) ) + ROM_LOAD16_BYTE( "rom9-a.8", 0x180001, 0x40000, CRC(49286572) SHA1(c5e16bd1ccd43452337a4cd76db70db079ca0706) ) + + ROM_REGION16_BE( 0x200000, "user2", 0 ) // extra ROMs mapped at a00000 containing gfx data for the 053936 + ROM_LOAD16_WORD_SWAP( "rom2-a.06", 0x000000, 0x100000, CRC(747dd112) SHA1(b9264bec61467ab256cf6cb698b6e0ea8f8006e0) ) + ROM_LOAD16_WORD_SWAP( "rom3-a.05", 0x100000, 0x100000, CRC(264aed13) SHA1(6f0de860d4299befffc530b7a8f19656982a51c4) ) + + ROM_REGION( 0x20000, "sub", 0 ) // 68000 code + ROM_LOAD16_WORD_SWAP( "rom4-a.4", 0x00000, 0x20000, CRC(8e811d36) SHA1(2b806b50a3a307a21894687f16485ace287a7c4c) ) ROM_REGION( 0x20000, "audiocpu", 0 ) /* 64k for the audio CPU + banks */ - ROM_LOAD( "rom5-a.8", 0x00000, 0x20000, CRC(9ea36e35) SHA1(9254dea8362318d8cfbd5e36e476e0e235e6326a) ) + ROM_LOAD( "rom5-a.8", 0x00000, 0x20000, CRC(9ea36e35) SHA1(9254dea8362318d8cfbd5e36e476e0e235e6326a) ) - ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "rom3-b.07", 0x000000, 0x100000, CRC(ffb1d489) SHA1(9330b67e0eaaf67d6c38f40a02c72419bd38fb81) ) - ROM_LOAD( "rom2-b.04", 0x100000, 0x100000, CRC(d1b3471f) SHA1(d1a95fbaad1c3d9ec2121bf65abbcdb5441bd0ac) ) + ROM_REGION( 0x200000, "fgtiles", 0 ) + ROM_LOAD( "rom3-b.07", 0x000000, 0x100000, CRC(ffb1d489) SHA1(9330b67e0eaaf67d6c38f40a02c72419bd38fb81) ) + ROM_LOAD( "rom2-b.04", 0x100000, 0x100000, CRC(d1b3471f) SHA1(d1a95fbaad1c3d9ec2121bf65abbcdb5441bd0ac) ) - ROM_REGION( 0x100000, "gfx2", 0 ) - ROM_LOAD32_WORD( "rom5-b.2", 0x000000, 0x80000, CRC(17572b36) SHA1(c58327c2f708783a3e8470e290cae0d71454f1da) ) - ROM_LOAD32_WORD( "rom4-b.3", 0x000002, 0x80000, CRC(72d12129) SHA1(11da6990a54ae1b6f6d0bed5d0431552f83a0dda) ) + ROM_REGION( 0x100000, "sprites1", 0 ) + ROM_LOAD32_WORD( "rom5-b.2", 0x00000, 0x80000, CRC(17572b36) SHA1(c58327c2f708783a3e8470e290cae0d71454f1da) ) + ROM_LOAD32_WORD( "rom4-b.3", 0x00002, 0x80000, CRC(72d12129) SHA1(11da6990a54ae1b6f6d0bed5d0431552f83a0dda) ) - ROM_REGION( 0x080000, "gfx3", 0 ) - ROM_LOAD32_WORD( "rom7-b.17", 0x000000, 0x40000, CRC(2aed9003) SHA1(45ff9953ad98063573e7fd7b930ae8b0183cdd04) ) - ROM_LOAD32_WORD( "rom6-b.16", 0x000002, 0x40000, CRC(6789ef12) SHA1(9b0d1cc6e9c6398ccb7f635c4c148fddd224a21f) ) + ROM_REGION( 0x080000, "sprites2", 0 ) + ROM_LOAD32_WORD( "rom7-b.17", 0x00000, 0x40000, CRC(2aed9003) SHA1(45ff9953ad98063573e7fd7b930ae8b0183cdd04) ) + ROM_LOAD32_WORD( "rom6-b.16", 0x00002, 0x40000, CRC(6789ef12) SHA1(9b0d1cc6e9c6398ccb7f635c4c148fddd224a21f) ) - ROM_REGION( 0x40000, "gfx4", ROMREGION_ERASE00 ) /* gfx data for the 053936 */ - /* RAM, not ROM - handled at run time */ - - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) /* sound samples */ - ROM_LOAD( "rom14-a.09", 0x000000, 0x100000, CRC(b4c1ac31) SHA1(acab2e1b5ce4ca3a5c4734562481b54db4b46995) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "rom14-a.09", 0x000000, 0x100000, CRC(b4c1ac31) SHA1(acab2e1b5ce4ca3a5c4734562481b54db4b46995) ) - ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) /* sound samples */ - ROM_LOAD( "rom17-a.08", 0x000000, 0x100000, CRC(ea70303d) SHA1(8de1a0e6d47cd80a622663c1745a1da54cd0ea05) ) + ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "rom17-a.08", 0x000000, 0x100000, CRC(ea70303d) SHA1(8de1a0e6d47cd80a622663c1745a1da54cd0ea05) ) ROM_END /* This is a bootleg of f1gp, produced by Playmark in Italy @@ -601,96 +1010,95 @@ ROM_END */ ROM_START( f1gpb ) - ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - /* these have extra data at 0x30000 which isn't preset in the f1gp set, is it related to the changed sound hardware? */ - ROM_LOAD16_BYTE( "1.ic38", 0x000001, 0x20000, CRC(046dd83a) SHA1(ea65fa88f9d9a79664de666e63594a7a7de86650) ) - ROM_LOAD16_BYTE( "7.ic39", 0x000000, 0x20000, CRC(960f5db4) SHA1(addc461538e2140afae400e8d7364d0bcc42a0cb) ) - - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* extra ROMs mapped at 100000 */ - ROM_LOAD16_BYTE( "8.ic41", 0x000000, 0x80000, CRC(39af8180) SHA1(aa1577195b1463069870db2d64db3b5e61d6bbe8) ) - ROM_LOAD16_BYTE( "2.ic48", 0x000001, 0x80000, CRC(b3b315c3) SHA1(568592e450401cd95206dbe439e565dd28499dd1) ) - ROM_LOAD16_BYTE( "9.ic166", 0x100000, 0x80000, CRC(bb596d5b) SHA1(f29ed135e8f09d4a15353360a811c13aba681382) ) - ROM_LOAD16_BYTE( "3.ic165", 0x100001, 0x80000, CRC(b7295a30) SHA1(4120dda38673d59343aea0f030d2f275a0ae3d95) ) - - ROM_REGION16_BE( 0x200000, "user2", 0 ) /* extra ROMs mapped at a00000 */ - ROM_LOAD16_BYTE( "10.ic43", 0x000000, 0x80000, CRC(d60e7706) SHA1(23c383e47e6600a68d6fd8bcfc9552fe0d660630) ) - ROM_LOAD16_BYTE( "4.ic42", 0x000001, 0x80000, CRC(5dbde98a) SHA1(536553eaad0ebfe219e44a4f50a4707209024469) ) - ROM_LOAD16_BYTE( "11.ic168", 0x100000, 0x80000, CRC(92a28e52) SHA1(dc203486b96fdc1930f7e63021e84f203540a64e) ) - ROM_LOAD16_BYTE( "5.ic167", 0x100001, 0x80000, CRC(48c36293) SHA1(2a5d92537ba331a99697d13b4394b8d2737eeaf2) ) - - ROM_REGION( 0x20000, "sub", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "16.u7", 0x000000, 0x10000, CRC(7609d818) SHA1(eb841b8e7b34f1c677f1a79bfeda5dafc1f6849f) ) - ROM_LOAD16_BYTE( "17.u6", 0x000001, 0x10000, CRC(951befde) SHA1(28754f00ca0fe38fe1d4e68c203a7b401baa9714) ) - - ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "13.ic151", 0x000000, 0x080000, CRC(4238074b) SHA1(a6b169165c7f7da9e746db8f1fb02e15c02c2b60) ) - ROM_LOAD( "12.ic152", 0x080000, 0x080000, CRC(e97c2b6e) SHA1(3d964999b70af2f39a734eba3feec6d4583261c7) ) - ROM_LOAD( "15.ic153", 0x100000, 0x080000, CRC(c2867d7f) SHA1(86b1be9672cf9f610e1d7efff90d6a73dc1cdb90) ) - ROM_LOAD( "14.ic154", 0x180000, 0x080000, CRC(0cd20423) SHA1(cddad02247b898c0a5a2fe061c41f68ecdf04d5c) ) + ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code + // these have extra data at 0x30000 which isn't preset in the f1gp set, is it related to the changed sound hardware? + ROM_LOAD16_BYTE( "1.ic38", 0x00001, 0x20000, CRC(046dd83a) SHA1(ea65fa88f9d9a79664de666e63594a7a7de86650) ) + ROM_LOAD16_BYTE( "7.ic39", 0x00000, 0x20000, CRC(960f5db4) SHA1(addc461538e2140afae400e8d7364d0bcc42a0cb) ) + + ROM_REGION16_BE( 0x200000, "user1", 0 ) // extra ROMs mapped at 100000 + ROM_LOAD16_BYTE( "8.ic41", 0x000000, 0x80000, CRC(39af8180) SHA1(aa1577195b1463069870db2d64db3b5e61d6bbe8) ) + ROM_LOAD16_BYTE( "2.ic48", 0x000001, 0x80000, CRC(b3b315c3) SHA1(568592e450401cd95206dbe439e565dd28499dd1) ) + ROM_LOAD16_BYTE( "9.ic166", 0x100000, 0x80000, CRC(bb596d5b) SHA1(f29ed135e8f09d4a15353360a811c13aba681382) ) + ROM_LOAD16_BYTE( "3.ic165", 0x100001, 0x80000, CRC(b7295a30) SHA1(4120dda38673d59343aea0f030d2f275a0ae3d95) ) + + ROM_REGION16_BE( 0x200000, "user2", 0 ) // extra ROMs mapped at a00000 + ROM_LOAD16_BYTE( "10.ic43", 0x000000, 0x80000, CRC(d60e7706) SHA1(23c383e47e6600a68d6fd8bcfc9552fe0d660630) ) + ROM_LOAD16_BYTE( "4.ic42", 0x000001, 0x80000, CRC(5dbde98a) SHA1(536553eaad0ebfe219e44a4f50a4707209024469) ) + ROM_LOAD16_BYTE( "11.ic168", 0x100000, 0x80000, CRC(92a28e52) SHA1(dc203486b96fdc1930f7e63021e84f203540a64e) ) + ROM_LOAD16_BYTE( "5.ic167", 0x100001, 0x80000, CRC(48c36293) SHA1(2a5d92537ba331a99697d13b4394b8d2737eeaf2) ) + + ROM_REGION( 0x20000, "sub", 0 ) // 68000 code + ROM_LOAD16_BYTE( "16.u7", 0x00000, 0x10000, CRC(7609d818) SHA1(eb841b8e7b34f1c677f1a79bfeda5dafc1f6849f) ) + ROM_LOAD16_BYTE( "17.u6", 0x00001, 0x10000, CRC(951befde) SHA1(28754f00ca0fe38fe1d4e68c203a7b401baa9714) ) + + ROM_REGION( 0x200000, "fgtiles", 0 ) + ROM_LOAD( "13.ic151", 0x000000, 0x080000, CRC(4238074b) SHA1(a6b169165c7f7da9e746db8f1fb02e15c02c2b60) ) + ROM_LOAD( "12.ic152", 0x080000, 0x080000, CRC(e97c2b6e) SHA1(3d964999b70af2f39a734eba3feec6d4583261c7) ) + ROM_LOAD( "15.ic153", 0x100000, 0x080000, CRC(c2867d7f) SHA1(86b1be9672cf9f610e1d7efff90d6a73dc1cdb90) ) + ROM_LOAD( "14.ic154", 0x180000, 0x080000, CRC(0cd20423) SHA1(cddad02247b898c0a5a2fe061c41f68ecdf04d5c) ) /* Roms 20 and 21 were missing from the PCB, however the others match perfectly (just with a different data layout) I've reconstructed what should be the correct data for this bootleg. - Note, the bootleg combines 2 GFX regions into a single set of 4-way interleaved roms, so we load them in a user + Note, the bootleg combines 2 GFX regions into a single set of 4-way interleaved ROMs, so we load them in a user region and use ROM_COPY. */ ROM_REGION( 0x200000, "user3", 0 ) - ROMX_LOAD( "rom21", 0x000003, 0x80000, CRC(7a08c3b7) SHA1(369123348a88513c066c239ed6aa4db5ae4ef0ac), ROM_SKIP(3) ) - ROMX_LOAD( "rom20", 0x000001, 0x80000, CRC(bd1273d0) SHA1(cc7caee231fe3bd87d8403d34059e1292c7f7a00), ROM_SKIP(3) ) - ROMX_LOAD( "19.ic141", 0x000002, 0x80000, CRC(aa4ebdfe) SHA1(ed117e6a84554c5ed2ad4379b834898a4c40d51e), ROM_SKIP(3) ) - ROMX_LOAD( "18.ic140", 0x000000, 0x80000, CRC(9b2a4325) SHA1(b2020e08251366686c4c0045f3fd523fa327badf), ROM_SKIP(3) ) + ROM_LOAD32_BYTE( "rom21", 0x000003, 0x80000, CRC(7a08c3b7) SHA1(369123348a88513c066c239ed6aa4db5ae4ef0ac) ) + ROM_LOAD32_BYTE( "rom20", 0x000001, 0x80000, CRC(bd1273d0) SHA1(cc7caee231fe3bd87d8403d34059e1292c7f7a00) ) + ROM_LOAD32_BYTE( "19.ic141", 0x000002, 0x80000, CRC(aa4ebdfe) SHA1(ed117e6a84554c5ed2ad4379b834898a4c40d51e) ) + ROM_LOAD32_BYTE( "18.ic140", 0x000000, 0x80000, CRC(9b2a4325) SHA1(b2020e08251366686c4c0045f3fd523fa327badf) ) - ROM_REGION( 0x100000, "gfx2", 0 ) + ROM_REGION( 0x100000, "sprites1", 0 ) ROM_COPY("user3", 0x000000, 0, 0x100000) - ROM_REGION( 0x080000, "gfx3", 0 ) + ROM_REGION( 0x080000, "sprites2", 0 ) ROM_COPY("user3", 0x100000, 0, 0x80000) - ROM_REGION( 0x40000, "gfx4", ROMREGION_ERASE00 ) /* gfx data for the 053936 */ - /* RAM, not ROM - handled at run time */ - - ROM_REGION( 0x90000, "oki", 0 ) /* sound samples */ - ROM_LOAD( "6.ic13", 0x000000, 0x030000, CRC(6e83ffd8) SHA1(618fd6cd6c0844a4be96f77ff22cd41364718d16) ) // a second dump has 0x40 instead of 0x44 at 0x54cbc. Which one is bad? - ROM_CONTINUE( 0x040000, 0x050000 ) + ROM_REGION( 0x90000, "oki", 0 ) + ROM_LOAD( "6.ic13", 0x00000, 0x030000, CRC(6e83ffd8) SHA1(618fd6cd6c0844a4be96f77ff22cd41364718d16) ) // a second dump has 0x40 instead of 0x44 at 0x54cbc. Which one is bad? + ROM_CONTINUE( 0x40000, 0x050000 ) ROM_END ROM_START( f1gp2 ) - ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "rom12.v1", 0x000000, 0x20000, CRC(c5c5f199) SHA1(56fcbf1d9b15a37204296c578e1585599f76a107) ) - ROM_LOAD16_BYTE( "rom14.v2", 0x000001, 0x20000, CRC(dd5388e2) SHA1(66e88f86edc2407e5794519f988203a52d65636d) ) + ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code + ROM_LOAD16_BYTE( "rom12.v1", 0x00000, 0x20000, CRC(c5c5f199) SHA1(56fcbf1d9b15a37204296c578e1585599f76a107) ) + ROM_LOAD16_BYTE( "rom14.v2", 0x00001, 0x20000, CRC(dd5388e2) SHA1(66e88f86edc2407e5794519f988203a52d65636d) ) - ROM_REGION16_BE( 0x200000, "user1", 0 ) /* extra ROMs mapped at 100000 */ - ROM_LOAD16_WORD_SWAP( "rom2", 0x100000, 0x100000, CRC(3b0cfa82) SHA1(ea6803dd8d30aa9f3bd578e113fc26f20c640751) ) - ROM_CONTINUE( 0x000000, 0x100000 ) + ROM_REGION16_BE( 0x200000, "user1", 0 ) // extra ROMs mapped at 100000 + ROM_LOAD16_WORD_SWAP( "rom2", 0x100000, 0x100000, CRC(3b0cfa82) SHA1(ea6803dd8d30aa9f3bd578e113fc26f20c640751) ) + ROM_CONTINUE( 0x000000, 0x100000 ) - ROM_REGION( 0x20000, "sub", 0 ) /* 68000 code */ - ROM_LOAD16_WORD_SWAP( "rom13.v3", 0x000000, 0x20000, CRC(c37aa303) SHA1(0fe09b398191888620fb676ed0f1593be575512d) ) + ROM_REGION( 0x20000, "sub", 0 ) // 68000 code + ROM_LOAD16_WORD_SWAP( "rom13.v3", 0x000000, 0x20000, CRC(c37aa303) SHA1(0fe09b398191888620fb676ed0f1593be575512d) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) /* 64k for the audio CPU + banks */ - ROM_LOAD( "rom5.v4", 0x00000, 0x20000, CRC(6a9398a1) SHA1(e907fe5f9c135c5b10ec650ec0c6d08cb856230c) ) + ROM_REGION( 0x20000, "audiocpu", 0 ) + ROM_LOAD( "rom5.v4", 0x00000, 0x20000, CRC(6a9398a1) SHA1(e907fe5f9c135c5b10ec650ec0c6d08cb856230c) ) - ROM_REGION( 0x200000, "gfx1", 0 ) - ROM_LOAD( "rom1", 0x000000, 0x200000, CRC(f2d55ad7) SHA1(2f2d9dc4fab63b06ed7cba0ef1ced286dbfaa7b4) ) + ROM_REGION( 0x200000, "fgtiles", 0 ) + ROM_LOAD( "rom1", 0x000000, 0x200000, CRC(f2d55ad7) SHA1(2f2d9dc4fab63b06ed7cba0ef1ced286dbfaa7b4) ) - ROM_REGION( 0x200000, "gfx2", 0 ) - ROM_LOAD( "rom15", 0x000000, 0x200000, CRC(1ac03e2e) SHA1(9073d0ae24364229a993046bd71e403988692993) ) + ROM_REGION( 0x200000, "sprites1", 0 ) + ROM_LOAD( "rom15", 0x000000, 0x200000, CRC(1ac03e2e) SHA1(9073d0ae24364229a993046bd71e403988692993) ) - ROM_REGION( 0x400000, "gfx3", 0 ) - ROM_LOAD16_WORD_SWAP( "rom11", 0x000000, 0x100000, CRC(b22a2c1f) SHA1(b5e67726be5a8561cd04c3c07895b8518b73b89c) ) - ROM_LOAD16_WORD_SWAP( "rom10", 0x100000, 0x100000, CRC(43fcbe23) SHA1(54ab58d904890a0b907e674f855092e974c45edc) ) - ROM_LOAD16_WORD_SWAP( "rom9", 0x200000, 0x100000, CRC(1bede8a1) SHA1(325ecc3afb30d281c2c8a56719e83e4dc20545bb) ) - ROM_LOAD16_WORD_SWAP( "rom8", 0x300000, 0x100000, CRC(98baf2a1) SHA1(df7bd1a743ad0a6e067641e2b7a352c466875ef6) ) + ROM_REGION( 0x400000, "sprites2", 0 ) + ROM_LOAD16_WORD_SWAP( "rom11", 0x000000, 0x100000, CRC(b22a2c1f) SHA1(b5e67726be5a8561cd04c3c07895b8518b73b89c) ) + ROM_LOAD16_WORD_SWAP( "rom10", 0x100000, 0x100000, CRC(43fcbe23) SHA1(54ab58d904890a0b907e674f855092e974c45edc) ) + ROM_LOAD16_WORD_SWAP( "rom9", 0x200000, 0x100000, CRC(1bede8a1) SHA1(325ecc3afb30d281c2c8a56719e83e4dc20545bb) ) + ROM_LOAD16_WORD_SWAP( "rom8", 0x300000, 0x100000, CRC(98baf2a1) SHA1(df7bd1a743ad0a6e067641e2b7a352c466875ef6) ) - ROM_REGION( 0x080000, "ymsnd:adpcmb", 0 ) /* sound samples */ - ROM_LOAD( "rom4", 0x000000, 0x080000, CRC(c2d3d7ad) SHA1(3178096741583cfef1ca8f53e6efa0a59e1d5cb6) ) + ROM_REGION( 0x080000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "rom4", 0x00000, 0x080000, CRC(c2d3d7ad) SHA1(3178096741583cfef1ca8f53e6efa0a59e1d5cb6) ) - ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) /* sound samples */ - ROM_LOAD( "rom3", 0x000000, 0x100000, CRC(7f8f066f) SHA1(5e051d5feb327ac818e9c7f7ac721dada3a102b6) ) + ROM_REGION( 0x100000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "rom3", 0x000000, 0x100000, CRC(7f8f066f) SHA1(5e051d5feb327ac818e9c7f7ac721dada3a102b6) ) ROM_END +} // anonymous namespace + GAME( 1991, f1gp, 0, f1gp, f1gp, f1gp_state, empty_init, ROT90, "Video System Co.", "F-1 Grand Prix (set 1)", MACHINE_NO_COCKTAIL | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE ) GAME( 1991, f1gpa, f1gp, f1gp, f1gp, f1gp_state, empty_init, ROT90, "Video System Co.", "F-1 Grand Prix (set 2)", MACHINE_NO_COCKTAIL | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/vsystem/f1gp.h b/src/mame/vsystem/f1gp.h deleted file mode 100644 index cccc0410fce..00000000000 --- a/src/mame/vsystem/f1gp.h +++ /dev/null @@ -1,140 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria -#ifndef MAME_VSYSTEM_F1GP_H -#define MAME_VSYSTEM_F1GP_H - -#pragma once - -#include "vsystem_spr.h" -#include "vsystem_spr2.h" - -#include "machine/6850acia.h" -#include "machine/gen_latch.h" -#include "video/k053936.h" - -#include "emupal.h" -#include "tilemap.h" - -class f1gp_state : public driver_device -{ -public: - f1gp_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_sharedram(*this, "sharedram"), - m_sprvram(*this, "spr%uvram", 1U), - m_sprcgram(*this, "spr%ucgram", 1U), - m_fgvideoram(*this, "fgvideoram"), - m_rozvideoram(*this, "rozvideoram"), - m_spriteram(*this, "spriteram"), - m_fgregs(*this, "fgregs"), - m_rozregs(*this, "rozregs"), - m_z80bank(*this, "z80bank"), - m_maincpu(*this, "maincpu"), - m_gfxdecode(*this, "gfxdecode"), - m_audiocpu(*this, "audiocpu"), - m_k053936(*this, "k053936"), - m_palette(*this, "palette"), - m_soundlatch(*this, "soundlatch"), - m_acia(*this, "acia"), - m_rozgfxram(*this, "rozgfxram"), - m_spr_old(*this, "vsystem_spr_old%u", 1U) - { } - - void f1gpb(machine_config &config); - void f1gp(machine_config &config); - -protected: - /* memory pointers */ - required_shared_ptr m_sharedram; - optional_shared_ptr_array m_sprvram; - optional_shared_ptr_array m_sprcgram; - required_shared_ptr m_fgvideoram; - required_shared_ptr m_rozvideoram; - optional_shared_ptr m_spriteram; - optional_shared_ptr m_fgregs; - optional_shared_ptr m_rozregs; - - optional_memory_bank m_z80bank; - - /* video-related */ - tilemap_t *m_fg_tilemap = nullptr; - tilemap_t *m_roz_tilemap = nullptr; - int m_flipscreen = 0; - int m_gfxctrl = 0; - int m_scroll[2]{}; - template uint32_t tile_callback( uint32_t code ); - - /* devices */ - required_device m_maincpu; - required_device m_gfxdecode; - optional_device m_audiocpu; - optional_device m_k053936; - required_device m_palette; - optional_device m_soundlatch; // not f1gpb - required_device m_acia; - - void sh_bankswitch_w(uint8_t data); - uint8_t command_pending_r(); - void rozvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void fgscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void gfxctrl_w(uint8_t data); - TILE_GET_INFO_MEMBER(get_fg_tile_info); - - virtual void machine_start() override; - virtual void machine_reset() override; - - void f1gp_cpu2_map(address_map &map); - void sound_io_map(address_map &map); - void sound_map(address_map &map); - -private: - /* memory pointers */ - optional_shared_ptr m_rozgfxram; - - /* devices */ - optional_device_array m_spr_old; // f1gp - - void f1gpb_misc_w(uint16_t data); - void rozgfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - TILE_GET_INFO_MEMBER(get_roz_tile_info); - - virtual void video_start() override; - - uint32_t screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void f1gpb_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect ); - void f1gp_cpu1_map(address_map &map); - void f1gpb_cpu1_map(address_map &map); - void f1gpb_cpu2_map(address_map &map); -}; - -class f1gp2_state : public f1gp_state -{ -public: - f1gp2_state(const machine_config &mconfig, device_type type, const char *tag) : - f1gp_state(mconfig, type, tag), - m_spr(*this, "vsystem_spr") - { } - - void f1gp2(machine_config &config); - -private: - /* video-related */ - int m_roz_bank = 0; - - /* devices */ - optional_device m_spr; // f1gp2 - - void rozbank_w(uint8_t data); - - TILE_GET_INFO_MEMBER(get_roz_tile_info); - - virtual void machine_reset() override; - virtual void video_start() override; - - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void f1gp2_cpu1_map(address_map &map); -}; - -#endif // MAME_VSYSTEM_F1GP_H diff --git a/src/mame/vsystem/f1gp_v.cpp b/src/mame/vsystem/f1gp_v.cpp deleted file mode 100644 index 09ebb76d6a1..00000000000 --- a/src/mame/vsystem/f1gp_v.cpp +++ /dev/null @@ -1,285 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Nicola Salmoria -#include "emu.h" -#include "f1gp.h" - -#include "screen.h" - - -/*************************************************************************** - - Callbacks for the TileMap code - -***************************************************************************/ - -TILE_GET_INFO_MEMBER(f1gp_state::get_fg_tile_info) -{ - int code = m_fgvideoram[tile_index]; - - tileinfo.set(0, code & 0x7fff, 0, (code & 0x8000) ? TILE_FLIPY : 0); -} - -TILE_GET_INFO_MEMBER(f1gp_state::get_roz_tile_info) -{ - int code = m_rozvideoram[tile_index]; - - tileinfo.set(3, code & 0x7ff, code >> 12, 0); -} - -TILE_GET_INFO_MEMBER(f1gp2_state::get_roz_tile_info) -{ - int code = m_rozvideoram[tile_index]; - - tileinfo.set(2, (code & 0x7ff) + (m_roz_bank << 11), code >> 12, 0); -} - - -/*************************************************************************** - - Start the video hardware emulation. - -***************************************************************************/ - - -void f1gp_state::video_start() -{ - m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp_state::get_roz_tile_info)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp_state::get_fg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - - m_fg_tilemap->set_transparent_pen(0xff); - - save_item(NAME(m_flipscreen)); - save_item(NAME(m_gfxctrl)); - save_item(NAME(m_scroll)); -} - - -void f1gp2_state::video_start() -{ - m_roz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp2_state::get_roz_tile_info)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64); - m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(f1gp2_state::get_fg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 64, 32); - - m_fg_tilemap->set_transparent_pen(0xff); - m_roz_tilemap->set_transparent_pen(0x0f); - - m_fg_tilemap->set_scrolldx(-80, 0); - m_fg_tilemap->set_scrolldy(-26, 0); - - save_item(NAME(m_roz_bank)); - save_item(NAME(m_flipscreen)); - save_item(NAME(m_gfxctrl)); - save_item(NAME(m_scroll)); -} - - -/*************************************************************************** - - Memory handlers - -***************************************************************************/ - -void f1gp_state::rozgfxram_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - COMBINE_DATA(&m_rozgfxram[offset]); - m_gfxdecode->gfx(3)->mark_dirty(offset / 64); -} - -void f1gp_state::rozvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - COMBINE_DATA(&m_rozvideoram[offset]); - m_roz_tilemap->mark_tile_dirty(offset); -} - -void f1gp_state::fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - COMBINE_DATA(&m_fgvideoram[offset]); - m_fg_tilemap->mark_tile_dirty(offset); -} - -void f1gp_state::fgscroll_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - COMBINE_DATA(&m_scroll[offset]); - - m_fg_tilemap->set_scrollx(0, m_scroll[0]); - m_fg_tilemap->set_scrolly(0, m_scroll[1]); -} - -void f1gp_state::gfxctrl_w(uint8_t data) -{ - m_flipscreen = data & 0x20; - m_gfxctrl = data & 0xdf; -} - -void f1gp2_state::rozbank_w(uint8_t data) -{ - if (m_roz_bank != data) - { - m_roz_bank = data; - m_roz_tilemap->mark_all_dirty(); - } -} - - -/*************************************************************************** - - Display refresh - -***************************************************************************/ - - -uint32_t f1gp_state::screen_update_f1gp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - screen.priority().fill(0, cliprect); - - m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, 0, 0, 1); - - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 1); - - /* quick kludge for "continue" screen priority */ - if (m_gfxctrl == 0x00) - { - m_spr_old[0]->turbofrc_draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02); - m_spr_old[1]->turbofrc_draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02); - } - else - { - m_spr_old[0]->turbofrc_draw_sprites(m_sprvram[0], m_sprvram[0].bytes(), 0, bitmap, cliprect, screen.priority(), 0x00); - m_spr_old[1]->turbofrc_draw_sprites(m_sprvram[1], m_sprvram[1].bytes(), 0, bitmap, cliprect, screen.priority(), 0x02); - } - return 0; -} - - -uint32_t f1gp2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - if (m_gfxctrl & 4) /* blank screen */ - bitmap.fill(m_palette->black_pen(), cliprect); - else - { - switch (m_gfxctrl & 3) - { - case 0: - m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1); - m_spr->draw_sprites(m_sprvram[0], 0x2000, screen, bitmap, cliprect); - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - break; - case 1: - m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, TILEMAP_DRAW_OPAQUE, 0, 1); - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0); - m_spr->draw_sprites(m_sprvram[0], 0x2000, screen, bitmap, cliprect); - break; - case 2: - m_fg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); - m_k053936->zoom_draw(screen, bitmap, cliprect, m_roz_tilemap, 0, 0, 1); - m_spr->draw_sprites(m_sprvram[0], 0x2000, screen, bitmap, cliprect); - break; -#ifdef MAME_DEBUG - case 3: - popmessage("unsupported priority 3\n"); -#endif - } - } - return 0; -} - -/*************************************************************************** - - BOOTLEG SUPPORT - -***************************************************************************/ - -// BOOTLEG -void f1gp_state::f1gpb_draw_sprites( screen_device &screen,bitmap_ind16 &bitmap,const rectangle &cliprect ) -{ - uint16_t *spriteram = m_spriteram; - int attr_start, start_offset = m_spriteram.bytes() / 2 - 4; - - // find the "end of list" to draw the sprites in reverse order - for (attr_start = 4; attr_start < m_spriteram.bytes() / 2; attr_start += 4) - { - if (spriteram[attr_start + 3 - 4] == 0xffff) /* end of list marker */ - { - start_offset = attr_start - 4; - break; - } - } - - for (attr_start = start_offset;attr_start >= 4;attr_start -= 4) - { - int code, gfx; - int x, y, flipx, flipy, color, pri; - - x = (spriteram[attr_start + 2] & 0x03ff) - 48; - y = (256 - (spriteram[attr_start + 3 - 4] & 0x03ff)) - 15; - flipx = spriteram[attr_start + 1] & 0x0800; - flipy = spriteram[attr_start + 1] & 0x8000; - color = spriteram[attr_start + 1] & 0x000f; - code = spriteram[attr_start + 0] & 0x3fff; - pri = 0; //? - - if((spriteram[attr_start + 1] & 0x00f0) && (spriteram[attr_start + 1] & 0x00f0) != 0xc0) - { - printf("attr %X\n",spriteram[attr_start + 1] & 0x00f0); - code = machine().rand(); - } - -/* - if (spriteram[attr_start + 1] & ~0x88cf) - printf("1 = %X\n", spriteram[attr_start + 1] & ~0x88cf); -*/ - if(code >= 0x2000) - { - gfx = 1; - code -= 0x2000; - } - else - { - gfx = 0; - } - - m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap,cliprect, - code, - color, - flipx,flipy, - x,y, - screen.priority(), - pri ? 0 : 0x2,15); - - // wrap around x - m_gfxdecode->gfx(1 + gfx)->prio_transpen(bitmap,cliprect, - code, - color, - flipx,flipy, - x - 512,y, - screen.priority(), - pri ? 0 : 0x2,15); - } -} - -// BOOTLEG -uint32_t f1gp_state::screen_update_f1gpb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - uint32_t startx, starty; - int incxx, incxy, incyx, incyy; - - incxy = (int16_t)m_rozregs[1]; - incyx = -incxy; - incxx = incyy = (int16_t)m_rozregs[3]; - startx = m_rozregs[0] + 328; - starty = m_rozregs[2]; - - m_fg_tilemap->set_scrolly(0, m_fgregs[0] + 8); - - screen.priority().fill(0, cliprect); - - m_roz_tilemap->draw_roz(screen, bitmap, cliprect, - startx << 13, starty << 13, - incxx << 5, incxy << 5, incyx << 5, incyy << 5, - 1, 0, 0); - - m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 1); - - f1gpb_draw_sprites(screen, bitmap, cliprect); - - return 0; -} diff --git a/src/mame/vsystem/fromanc2.h b/src/mame/vsystem/fromanc2.h index 983e27d2c7e..efca9d2db8d 100644 --- a/src/mame/vsystem/fromanc2.h +++ b/src/mame/vsystem/fromanc2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Takahiro Nogi, Uki -#ifndef MAME_INCLUDES_FROMANC2_H -#define MAME_INCLUDES_FROMANC2_H +#ifndef MAME_VSYSTEM_FROMANC2_H +#define MAME_VSYSTEM_FROMANC2_H #pragma once @@ -131,4 +131,4 @@ private: void fromancr_main_map(address_map &map); }; -#endif // MAME_INCLUDES_FROMANC2_H +#endif // MAME_VSYSTEM_FROMANC2_H diff --git a/src/mame/vsystem/fromance.h b/src/mame/vsystem/fromance.h index f6bf0a54899..a4e7e80dc75 100644 --- a/src/mame/vsystem/fromance.h +++ b/src/mame/vsystem/fromance.h @@ -8,8 +8,8 @@ and Bryan McPhail, Nicola Salmoria, Aaron Giles ***************************************************************************/ -#ifndef MAME_INCLUDES_FROMANCE_H -#define MAME_INCLUDES_FROMANCE_H +#ifndef MAME_VSYSTEM_FROMANCE_H +#define MAME_VSYSTEM_FROMANCE_H #pragma once @@ -122,4 +122,4 @@ private: void nekkyoku_sub_map(address_map &map); }; -#endif // MAME_INCLUDES_FROMANCE_H +#endif // MAME_VSYSTEM_FROMANCE_H diff --git a/src/mame/vsystem/ojankohs.h b/src/mame/vsystem/ojankohs.h index 71279259c79..c5d4dcbd5a3 100644 --- a/src/mame/vsystem/ojankohs.h +++ b/src/mame/vsystem/ojankohs.h @@ -5,8 +5,8 @@ Ojanko High School & other Video System mahjong series *************************************************************************/ -#ifndef MAME_INCLUDES_OJANKOHS_H -#define MAME_INCLUDES_OJANKOHS_H +#ifndef MAME_VSYSTEM_OJANKOHS_H +#define MAME_VSYSTEM_OJANKOHS_H #pragma once @@ -183,4 +183,4 @@ private: void map(address_map &map); }; -#endif // MAME_INCLUDES_OJANKOHS_H +#endif // MAME_VSYSTEM_OJANKOHS_H diff --git a/src/mame/vsystem/taotaido.cpp b/src/mame/vsystem/taotaido.cpp index c1f60d48514..40724c9ea43 100644 --- a/src/mame/vsystem/taotaido.cpp +++ b/src/mame/vsystem/taotaido.cpp @@ -1,5 +1,6 @@ // license:BSD-3-Clause // copyright-holders:David Haywood + /*************************************************************************** Tao Taido (c) 1993 Video System @@ -59,24 +60,235 @@ Chips: VS9108 **************************************************************************** -zooming might be wrong +TODO: zooming might be wrong (only used on title logo?) ***************************************************************************/ #include "emu.h" -#include "taotaido.h" -#include "cpu/z80/z80.h" -#include "cpu/m68000/m68000.h" #include "vs9209.h" +#include "vsystem_spr.h" + +#include "cpu/m68000/m68000.h" +#include "cpu/z80/z80.h" +#include "machine/gen_latch.h" +#include "machine/mb3773.h" #include "sound/ymopn.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" +#include "tilemap.h" + +// configurable logging +#define LOG_TILEREG (1U << 1) + +//#define VERBOSE (LOG_GENERAL | LOG_TILEREG) + +#include "logmacro.h" + +#define LOGTILEREG(...) LOGMASKED(LOG_TILEREG, __VA_ARGS__) + + +namespace { #define TAOTAIDO_SHOW_ALL_INPUTS 0 +class taotaido_state : public driver_device +{ +public: + taotaido_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_audiocpu(*this, "audiocpu"), + m_gfxdecode(*this, "gfxdecode"), + m_spr(*this, "vsystem_spr"), + m_soundlatch(*this, "soundlatch"), + m_watchdog(*this, "watchdog"), + m_spriteram(*this, "spriteram%u", 1U), + m_scrollram(*this, "scrollram"), + m_bgram(*this, "bgram"), + m_soundbank(*this, "soundbank"), + m_spritebank(*this, "spritebank", 0x08, ENDIANNESS_BIG), + m_spriteram_old(*this, "spriteram_old", 0x2000U, ENDIANNESS_BIG), + m_spriteram2_old(*this, "spriteram2_old", 0x10000U, ENDIANNESS_BIG), + m_spriteram_older(*this, "spriteram_older", 0x2000U, ENDIANNESS_BIG), + m_spriteram2_older(*this, "spriteram2_older", 0x10000U, ENDIANNESS_BIG) + { } + + void taotaido(machine_config &config); + +protected: + virtual void machine_start() override; + virtual void video_start() override; + +private: + required_device m_maincpu; + required_device m_audiocpu; + required_device m_gfxdecode; + required_device m_spr; + required_device m_soundlatch; + required_device m_watchdog; + + required_shared_ptr_array m_spriteram; + required_shared_ptr m_scrollram; + required_shared_ptr m_bgram; + + required_memory_bank m_soundbank; + + memory_share_creator m_spritebank; + memory_share_creator m_spriteram_old; + memory_share_creator m_spriteram2_old; + memory_share_creator m_spriteram_older; + memory_share_creator m_spriteram2_older; + + uint8_t m_bgbank[8]{}; + tilemap_t *m_bg_tilemap = nullptr; + + uint16_t pending_command_r(); + void unknown_output_w(uint8_t data); + void sh_bankswitch_w(uint8_t data); + void spritebank_w(offs_t offset, uint8_t data); + void tileregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + void bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + + TILE_GET_INFO_MEMBER(bg_tile_info); + TILEMAP_MAPPER_MEMBER(tilemap_scan_rows); + + uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + DECLARE_WRITE_LINE_MEMBER(screen_vblank); + uint32_t tile_callback(uint32_t code); + void main_map(address_map &map); + void sound_map(address_map &map); + void sound_port_map(address_map &map); +}; + + +// video + +// sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers +void taotaido_state::spritebank_w(offs_t offset, uint8_t data) +{ + m_spritebank[offset] = data; +} + +// sprites are like the other Video System / Psikyo games, we can merge this with aerofgt and plenty of other things eventually + + +// the tilemap + +void taotaido_state::tileregs_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + switch (offset) + { + case 0: // would normally be x scroll? + case 1: // would normally be y scroll? + case 2: + case 3: + LOGTILEREG("unhanded tilemap register write offset %02x data %04x \n", offset, data); + break; + + // tile banks + case 4: + case 5: + case 6: + case 7: + if (ACCESSING_BITS_8_15) + m_bgbank[(offset - 4) << 1] = data >> 8; + if (ACCESSING_BITS_0_7) + m_bgbank[((offset - 4) << 1) + 1] = data & 0xff; + m_bg_tilemap->mark_all_dirty(); + break; + } +} + +void taotaido_state::bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) +{ + COMBINE_DATA(&m_bgram[offset]); + m_bg_tilemap->mark_tile_dirty(offset); +} + +TILE_GET_INFO_MEMBER(taotaido_state::bg_tile_info) +{ + int code = m_bgram[tile_index] & 0x01ff; + int const bank = (m_bgram[tile_index] & 0x0e00) >> 9; + int const col = (m_bgram[tile_index] & 0xf000) >> 12; + + code |= m_bgbank[bank] << 9; + + tileinfo.set(1, code, col, 0); +} + +TILEMAP_MAPPER_MEMBER(taotaido_state::tilemap_scan_rows) +{ + // logical (col,row) -> memory offset + return (col & 0x3f) | ((row & 0x3f) << 6) | ((col & 0x40) << 6); +} + + +uint32_t taotaido_state::tile_callback(uint32_t code) +{ + code = m_spriteram2_older[code & 0x7fff]; + + if (code > 0x3fff) + { + int const block = (code & 0x3800) >> 11; + code &= 0x07ff; + code |= m_spritebank[block] << 11; + } + + return code; +} + + +void taotaido_state::video_start() +{ + m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(taotaido_state::bg_tile_info)), tilemap_mapper_delegate(*this, FUNC(taotaido_state::tilemap_scan_rows)), 16, 16, 128, 64); + + save_item(NAME(m_bgbank)); +} + + +uint32_t taotaido_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) +{ +// m_bg_tilemap->set_scrollx(0,(m_scrollram[0x380 / 2] >> 4)); // the values put here end up being wrong every other frame +// m_bg_tilemap->set_scrolly(0,(m_scrollram[0x382 / 2] >> 4)); // the values put here end up being wrong every other frame + + // not amazingly efficient however it should be functional for row select and linescroll + rectangle clip = cliprect; + + for (int line = cliprect.top(); line <= cliprect.bottom(); line++) + { + clip.min_y = clip.max_y = line; + + m_bg_tilemap->set_scrollx(0, ((m_scrollram[(0x00 + 4 * line) / 2]) >> 4) + 30); + m_bg_tilemap->set_scrolly(0, ((m_scrollram[(0x02 + 4 * line) / 2]) >> 4) - line); + + m_bg_tilemap->draw(screen, bitmap, clip, 0, 0); + } + + m_spr->draw_sprites(m_spriteram_older.target(), m_spriteram[0].bytes(), screen, bitmap, cliprect); + return 0; +} + +WRITE_LINE_MEMBER(taotaido_state::screen_vblank) +{ + // rising edge + if (state) + { + // sprites need to be delayed by 2 frames? + + memcpy(m_spriteram2_older.target(), m_spriteram2_old.target(), 0x10000); + memcpy(m_spriteram2_old.target(), m_spriteram[1], 0x10000); + + memcpy(m_spriteram_older.target(), m_spriteram_old.target(), 0x2000); + memcpy(m_spriteram_old.target(), m_spriteram[0], 0x2000); + } +} + + +// machine void taotaido_state::machine_start() { @@ -86,7 +298,7 @@ void taotaido_state::machine_start() uint16_t taotaido_state::pending_command_r() { - /* Only bit 0 is tested */ + // Only bit 0 is tested return m_soundlatch->pending_r(); } @@ -100,23 +312,23 @@ void taotaido_state::unknown_output_w(uint8_t data) void taotaido_state::main_map(address_map &map) { map(0x000000, 0x0fffff).rom(); - map(0x800000, 0x803fff).ram().w(FUNC(taotaido_state::bgvideoram_w)).share("bgram"); // bg ram? - map(0xa00000, 0xa01fff).ram().share("spriteram"); // sprite ram - map(0xc00000, 0xc0ffff).ram().share("spriteram2"); // sprite tile lookup ram - map(0xfe0000, 0xfeffff).ram(); // main ram - map(0xffc000, 0xffcfff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); // palette ram - map(0xffe000, 0xffe3ff).ram().share("scrollram"); // rowscroll / rowselect / scroll ram + map(0x800000, 0x803fff).ram().w(FUNC(taotaido_state::bgvideoram_w)).share(m_bgram); + map(0xa00000, 0xa01fff).ram().share(m_spriteram[0]); + map(0xc00000, 0xc0ffff).ram().share(m_spriteram[1]); // sprite tile lookup RAM + map(0xfe0000, 0xfeffff).ram(); // main RAM + map(0xffc000, 0xffcfff).ram().w("palette", FUNC(palette_device::write16)).share("palette"); + map(0xffe000, 0xffe3ff).ram().share(m_scrollram); // rowscroll / rowselect / scroll RAM map(0xffff80, 0xffff9f).rw("io1", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff); map(0xffffa0, 0xffffbf).rw("io2", FUNC(vs9209_device::read), FUNC(vs9209_device::write)).umask16(0x00ff); map(0xffff00, 0xffff0f).w(FUNC(taotaido_state::tileregs_w)); - map(0xffff10, 0xffff11).nopw(); // unknown - map(0xffff20, 0xffff21).nopw(); // unknown - flip screen related + map(0xffff10, 0xffff11).nopw(); // unknown + map(0xffff20, 0xffff21).nopw(); // unknown - flip screen related map(0xffff40, 0xffff47).w(FUNC(taotaido_state::spritebank_w)); - map(0xffffc1, 0xffffc1).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // seems right + map(0xffffc1, 0xffffc1).w(m_soundlatch, FUNC(generic_latch_8_device::write)); // seems right map(0xffffe0, 0xffffe1).r(FUNC(taotaido_state::pending_command_r)); // guess - seems to be needed for all the sounds to work } -/* sound cpu - same as aerofgt */ +// sound CPU - same as aerofgt void taotaido_state::sh_bankswitch_w(uint8_t data) @@ -128,7 +340,7 @@ void taotaido_state::sound_map(address_map &map) { map(0x0000, 0x77ff).rom(); map(0x7800, 0x7fff).ram(); - map(0x8000, 0xffff).bankr("soundbank"); + map(0x8000, 0xffff).bankr(m_soundbank); } void taotaido_state::sound_port_map(address_map &map) @@ -142,7 +354,7 @@ void taotaido_state::sound_port_map(address_map &map) static INPUT_PORTS_START( taotaido ) - PORT_START("P1") /* 0xffff81.b */ + PORT_START("P1") // 0xffff81.b PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1) @@ -156,7 +368,7 @@ static INPUT_PORTS_START( taotaido ) #endif PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START("P2") /* 0xffff83.b */ + PORT_START("P2") // 0xffff83.b PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2) @@ -170,8 +382,8 @@ static INPUT_PORTS_START( taotaido ) #endif PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - /* These inputs are only to fit the test mode - leftover from another game ? */ - PORT_START("P3") /* 0xffffa1.b */ + // These inputs are only to fit the test mode - leftover from another game ? + PORT_START("P3") // 0xffffa1.b PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) #if TAOTAIDO_SHOW_ALL_INPUTS PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3) @@ -184,7 +396,7 @@ static INPUT_PORTS_START( taotaido ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) #endif - PORT_START("P4") /* 0xffffa3.b */ + PORT_START("P4") // 0xffffa3.b PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) #if TAOTAIDO_SHOW_ALL_INPUTS PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(4) @@ -197,7 +409,7 @@ static INPUT_PORTS_START( taotaido ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) #endif - PORT_START("SYSTEM") /* 0xffff85.b */ + PORT_START("SYSTEM") // 0xffff85.b PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) // see notes PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) @@ -211,7 +423,7 @@ static INPUT_PORTS_START( taotaido ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) // see notes - SERVICE in "test mode" PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) // VBLANK ? The game freezes when ON - PORT_START("DSW1") /* 0xffff87.b -> !0xfe2f6c.w or !0xfe30d0 */ + PORT_START("DSW1") // 0xffff87.b -> !0xfe2f6c.w or !0xfe30d0 PORT_DIPNAME( 0x01, 0x01, "Coin Slot" ) PORT_DIPSETTING( 0x01, "Same" ) PORT_DIPSETTING( 0x00, "Individual" ) @@ -231,7 +443,7 @@ static INPUT_PORTS_START( taotaido ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START("DSW2") /* 0xffff89.b -> !0xfe73c2.w or !0xfe751c.w */ + PORT_START("DSW2") // 0xffff89.b -> !0xfe73c2.w or !0xfe751c.w PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) // check code at 0x0963e2 or 0x845e2 PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -248,7 +460,7 @@ static INPUT_PORTS_START( taotaido ) PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW ) PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW ) - PORT_START("DSW3") /* 0xffff8b.b -> !0xfe2f94.w or !0xfe30f8.w */ + PORT_START("DSW3") // 0xffff8b.b -> !0xfe2f94.w or !0xfe30f8.w PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) // doesn't seem to be demo sounds PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) @@ -262,7 +474,7 @@ static INPUT_PORTS_START( taotaido ) PORT_DIPUNUSED( 0x40, IP_ACTIVE_LOW ) PORT_DIPUNUSED( 0x80, IP_ACTIVE_LOW ) - PORT_START("JP") /* Jumpers (0xffff8f.b) */ + PORT_START("JP") // Jumpers (0xffff8f.b) PORT_DIPNAME( 0x0f, 0x08, DEF_STR( Region ) ) PORT_DIPSETTING( 0x00, DEF_STR( USA ) ) // also (c) Mc O'River Inc PORT_DIPSETTING( 0x01, DEF_STR( Japan ) ) @@ -329,21 +541,21 @@ INPUT_PORTS_END static GFXDECODE_START( gfx_taotaido ) - GFXDECODE_ENTRY( "gfx1", 0, gfx_16x16x4_packed_lsb, 0x000, 256 ) /* sprites */ - GFXDECODE_ENTRY( "gfx2", 0, gfx_16x16x4_packed_lsb, 0x300, 256 ) /* bg tiles */ + GFXDECODE_ENTRY( "sprites", 0, gfx_16x16x4_packed_lsb, 0x000, 256 ) + GFXDECODE_ENTRY( "bgtiles", 0, gfx_16x16x4_packed_lsb, 0x300, 256 ) GFXDECODE_END void taotaido_state::taotaido(machine_config &config) { - M68000(config, m_maincpu, 32000000/2); + M68000(config, m_maincpu, 32'000'000 / 2); m_maincpu->set_addrmap(AS_PROGRAM, &taotaido_state::main_map); m_maincpu->set_vblank_int("screen", FUNC(taotaido_state::irq1_line_hold)); - Z80(config, m_audiocpu, 20000000/4); // ?? + Z80(config, m_audiocpu, 20'000'000 / 4); // ?? m_audiocpu->set_addrmap(AS_PROGRAM, &taotaido_state::sound_map); - m_audiocpu->set_addrmap(AS_IO, &taotaido_state::sound_port_map); /* IRQs are triggered by the YM2610 */ + m_audiocpu->set_addrmap(AS_IO, &taotaido_state::sound_port_map); // IRQs are triggered by the YM2610 vs9209_device &io1(VS9209(config, "io1", 0)); io1.porta_input_cb().set_ioport("P1"); @@ -356,8 +568,8 @@ void taotaido_state::taotaido(machine_config &config) io1.porth_input_cb().set_ioport("JP"); vs9209_device &io2(VS9209(config, "io2", 0)); - io2.porta_input_cb().set_ioport("P3"); // used only by taotaida - io2.portb_input_cb().set_ioport("P4"); // used only by taotaida + io2.porta_input_cb().set_ioport("P3"); // used only by taotaida + io2.portb_input_cb().set_ioport("P4"); // used only by taotaida MB3773(config, m_watchdog, 0); @@ -379,7 +591,7 @@ void taotaido_state::taotaido(machine_config &config) m_spr->set_gfx_region(0); m_spr->set_gfxdecode_tag(m_gfxdecode); - /* sound hardware */ + // sound hardware SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); @@ -387,7 +599,7 @@ void taotaido_state::taotaido(machine_config &config) m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI); m_soundlatch->set_separate_acknowledge(true); - ym2610_device &ymsnd(YM2610(config, "ymsnd", 8000000)); + ym2610_device &ymsnd(YM2610(config, "ymsnd", 8'000'000)); ymsnd.irq_handler().set_inputline(m_audiocpu, 0); ymsnd.add_route(0, "lspeaker", 0.25); ymsnd.add_route(0, "rspeaker", 0.25); @@ -397,74 +609,77 @@ void taotaido_state::taotaido(machine_config &config) ROM_START( taotaido ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 code ROM_LOAD16_WORD_SWAP( "1-u90.bin", 0x00000, 0x80000, CRC(a3ee30da) SHA1(920a83ce9192bf785bffdc041e280f1a420de4c9) ) ROM_LOAD16_WORD_SWAP( "2-u91.bin", 0x80000, 0x80000, CRC(30b7e4fb) SHA1(15e1f6d252c736fdee33b691a0a1a45f0307bffb) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) /* z80 Code */ + ROM_REGION( 0x20000, "audiocpu", 0 ) // Z80 code ROM_LOAD( "3-u113.bin", 0x000000, 0x20000, CRC(a167c4e4) SHA1(d32184e7040935cd440d4d82c66491b710ec87a8) ) - ROM_REGION( 0x200000, "ymsnd:adpcma", 0 ) /* sound samples */ - ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) + ROM_REGION( 0x200000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) /* sound samples */ - ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) - ROM_REGION( 0x600000, "gfx1", 0 ) /* Sprites */ + ROM_REGION( 0x600000, "sprites", 0 ) ROM_LOAD( "u86.bin", 0x000000, 0x200000, CRC(908e251e) SHA1(5a135787f3263bfb195f8fd1e814c580d840531f) ) ROM_LOAD( "u87.bin", 0x200000, 0x200000, CRC(c4290ba6) SHA1(4132ffad4668f1dd3f708f009e18435e7dd60120) ) ROM_LOAD( "u88.bin", 0x400000, 0x200000, CRC(407d9aeb) SHA1(d532c7b80f6c192dba86542fb6eb3ef24fbbbdb9) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* BG Tiles */ + ROM_REGION( 0x200000, "bgtiles", 0 ) ROM_LOAD( "u15.bin", 0x000000, 0x200000, CRC(e95823e9) SHA1(362583944ad4fdde4f9e29928cf34376c7ad931f) ) ROM_END ROM_START( taotaidoa ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 code ROM_LOAD16_WORD_SWAP( "tt0-u90.bin", 0x00000, 0x80000, CRC(69d4cca7) SHA1(f1aba74fef8fe4271d19763f428fc0e2674d08b3) ) ROM_LOAD16_WORD_SWAP( "tt1-u91.bin", 0x80000, 0x80000, CRC(41025469) SHA1(fa3a424ca3ecb513f418e436e4191ff76f6a0de1) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) /* z80 Code */ + ROM_REGION( 0x20000, "audiocpu", 0 ) // Z80 code ROM_LOAD( "3-u113.bin", 0x000000, 0x20000, CRC(a167c4e4) SHA1(d32184e7040935cd440d4d82c66491b710ec87a8) ) - ROM_REGION( 0x200000, "ymsnd:adpcma", 0 ) /* sound samples */ - ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) + ROM_REGION( 0x200000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) /* sound samples */ - ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) - ROM_REGION( 0x600000, "gfx1", 0 ) /* Sprites */ + ROM_REGION( 0x600000, "sprites", 0 ) ROM_LOAD( "u86.bin", 0x000000, 0x200000, CRC(908e251e) SHA1(5a135787f3263bfb195f8fd1e814c580d840531f) ) ROM_LOAD( "u87.bin", 0x200000, 0x200000, CRC(c4290ba6) SHA1(4132ffad4668f1dd3f708f009e18435e7dd60120) ) ROM_LOAD( "u88.bin", 0x400000, 0x200000, CRC(407d9aeb) SHA1(d532c7b80f6c192dba86542fb6eb3ef24fbbbdb9) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* BG Tiles */ + ROM_REGION( 0x200000, "bgtiles", 0 ) ROM_LOAD( "u15.bin", 0x000000, 0x200000, CRC(e95823e9) SHA1(362583944ad4fdde4f9e29928cf34376c7ad931f) ) ROM_END ROM_START( taotaido3 ) - ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */ + ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 code ROM_LOAD16_WORD_SWAP( "1.u90", 0x00000, 0x80000, CRC(27c5c626) SHA1(f2aea45a15db24c914aa889be21cd8994d138a59) ) ROM_LOAD16_WORD_SWAP( "2.u91", 0x80000, 0x80000, CRC(71a4e538) SHA1(608c2d77aa8c1c4bb39a419bdfdf73a2fd587403) ) - ROM_REGION( 0x20000, "audiocpu", 0 ) /* z80 Code */ + ROM_REGION( 0x20000, "audiocpu", 0 ) // Z80 code ROM_LOAD( "3-u113.bin", 0x000000, 0x20000, CRC(a167c4e4) SHA1(d32184e7040935cd440d4d82c66491b710ec87a8) ) - ROM_REGION( 0x200000, "ymsnd:adpcma", 0 ) /* sound samples */ - ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) + ROM_REGION( 0x200000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "u127.bin", 0x00000, 0x200000, CRC(0cf0cb23) SHA1(a87e7159db2fa0d50446cbf45ec9fbf585b8f396) ) - ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) /* sound samples */ - ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) + ROM_REGION( 0x100000, "ymsnd:adpcmb", 0 ) + ROM_LOAD( "u104.bin", 0x000000, 0x100000, CRC(e89387a9) SHA1(1deeee056af367d1a5aa0722dd3d6c68a82d0489) ) - ROM_REGION( 0x600000, "gfx1", 0 ) /* Sprites */ + ROM_REGION( 0x600000, "sprites", 0 ) ROM_LOAD( "u86.bin", 0x000000, 0x200000, CRC(908e251e) SHA1(5a135787f3263bfb195f8fd1e814c580d840531f) ) ROM_LOAD( "u87.bin", 0x200000, 0x200000, CRC(c4290ba6) SHA1(4132ffad4668f1dd3f708f009e18435e7dd60120) ) ROM_LOAD( "u88.bin", 0x400000, 0x200000, CRC(407d9aeb) SHA1(d532c7b80f6c192dba86542fb6eb3ef24fbbbdb9) ) - ROM_REGION( 0x200000, "gfx2", 0 ) /* BG Tiles */ + ROM_REGION( 0x200000, "bgtiles", 0 ) ROM_LOAD( "u15.bin", 0x000000, 0x200000, CRC(e95823e9) SHA1(362583944ad4fdde4f9e29928cf34376c7ad931f) ) ROM_END +} // anonymous namespace + + GAME( 1993, taotaido, 0, taotaido, taotaido, taotaido_state, empty_init, ROT0, "Video System Co.", "Tao Taido (2 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) GAME( 1993, taotaidoa, taotaido, taotaido, taotaido6, taotaido_state, empty_init, ROT0, "Video System Co.", "Tao Taido (6 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // maybe a prototype? has various debug features GAME( 1993, taotaido3, taotaido, taotaido, taotaido3, taotaido_state, empty_init, ROT0, "Video System Co.", "Tao Taido (2/3 button version)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/vsystem/taotaido.h b/src/mame/vsystem/taotaido.h deleted file mode 100644 index 10bf187e040..00000000000 --- a/src/mame/vsystem/taotaido.h +++ /dev/null @@ -1,80 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood -#ifndef MAME_INCLUDES_TAOTAIDO_H -#define MAME_INCLUDES_TAOTAIDO_H - -#pragma once - -#include "vsystem_spr.h" -#include "machine/gen_latch.h" -#include "machine/mb3773.h" -#include "tilemap.h" - -class taotaido_state : public driver_device -{ -public: - taotaido_state(const machine_config &mconfig, device_type type, const char *tag) : - driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), - m_gfxdecode(*this, "gfxdecode"), - m_spr(*this, "vsystem_spr"), - m_soundlatch(*this, "soundlatch"), - m_watchdog(*this, "watchdog"), - m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2"), - m_scrollram(*this, "scrollram"), - m_bgram(*this, "bgram"), - m_soundbank(*this, "soundbank"), - m_spritebank(*this, "spritebank", 0x08, ENDIANNESS_BIG) - { } - - void taotaido(machine_config &config); - -protected: - virtual void machine_start() override; - virtual void video_start() override; - -private: - required_device m_maincpu; - required_device m_audiocpu; - required_device m_gfxdecode; - required_device m_spr; - required_device m_soundlatch; - required_device m_watchdog; - - required_shared_ptr m_spriteram; - required_shared_ptr m_spriteram2; - required_shared_ptr m_scrollram; - required_shared_ptr m_bgram; - - required_memory_bank m_soundbank; - - memory_share_creator m_spritebank; - - uint8_t m_bgbank[8]{}; - tilemap_t *m_bg_tilemap = nullptr; - std::unique_ptr m_spriteram_old; - std::unique_ptr m_spriteram_older; - std::unique_ptr m_spriteram2_old; - std::unique_ptr m_spriteram2_older; - - uint16_t pending_command_r(); - void unknown_output_w(uint8_t data); - void sh_bankswitch_w(uint8_t data); - void spritebank_w(offs_t offset, uint8_t data); - void tileregs_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - void bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); - - TILE_GET_INFO_MEMBER(bg_tile_info); - TILEMAP_MAPPER_MEMBER(tilemap_scan_rows); - - uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(screen_vblank); - uint32_t tile_callback( uint32_t code ); - void main_map(address_map &map); - void sound_map(address_map &map); - void sound_port_map(address_map &map); -}; - -#endif // MAME_INCLUDES_TAOTAIDO_H diff --git a/src/mame/vsystem/taotaido_v.cpp b/src/mame/vsystem/taotaido_v.cpp deleted file mode 100644 index abb681ce213..00000000000 --- a/src/mame/vsystem/taotaido_v.cpp +++ /dev/null @@ -1,146 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:David Haywood -/* Tao Taido Video Hardware */ - -/* - -its similar to other video system games - -zooming might be wrong (only used on title logo?) - -*/ - -#include "emu.h" -#include "taotaido.h" -#include "screen.h" - -/* sprite tile codes 0x4000 - 0x7fff get remapped according to the content of these registers */ -void taotaido_state::spritebank_w(offs_t offset, uint8_t data) -{ - m_spritebank[offset] = data; -} - -/* sprites are like the other video system / psikyo games, we can merge this with aerofgt and plenty of other - things eventually */ - - -/* the tilemap */ - -void taotaido_state::tileregs_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - switch (offset) - { - case 0: // would normally be x scroll? - case 1: // would normally be y scroll? - case 2: - case 3: - logerror ("unhanded tilemap register write offset %02x data %04x \n",offset,data); - break; - - /* tile banks */ - case 4: - case 5: - case 6: - case 7: - if(ACCESSING_BITS_8_15) - m_bgbank[(offset - 4) << 1] = data >> 8; - if(ACCESSING_BITS_0_7) - m_bgbank[((offset - 4) << 1) + 1] = data & 0xff; - m_bg_tilemap->mark_all_dirty(); - break; - } -} - -void taotaido_state::bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask) -{ - COMBINE_DATA(&m_bgram[offset]); - m_bg_tilemap->mark_tile_dirty(offset); -} - -TILE_GET_INFO_MEMBER(taotaido_state::bg_tile_info) -{ - int code = m_bgram[tile_index] & 0x01ff; - int bank =(m_bgram[tile_index] & 0x0e00) >> 9; - int col =(m_bgram[tile_index] & 0xf000) >> 12; - - code |= m_bgbank[bank] << 9; - - tileinfo.set(1, code, col, 0); -} - -TILEMAP_MAPPER_MEMBER(taotaido_state::tilemap_scan_rows) -{ - /* logical (col,row) -> memory offset */ - return (col & 0x3f) | ((row & 0x3f) << 6) | ((col & 0x40) << 6); -} - - -uint32_t taotaido_state::tile_callback( uint32_t code ) -{ - code = m_spriteram2_older[code & 0x7fff]; - - if (code > 0x3fff) - { - int block = (code & 0x3800) >> 11; - code &= 0x07ff; - code |= m_spritebank[block] << 11; - } - - return code; -} - - -void taotaido_state::video_start() -{ - m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(taotaido_state::bg_tile_info)), tilemap_mapper_delegate(*this, FUNC(taotaido_state::tilemap_scan_rows)), 16,16, 128,64); - - m_spriteram_old = std::make_unique(0x2000/2); - m_spriteram_older = std::make_unique(0x2000/2); - - m_spriteram2_old = std::make_unique(0x10000/2); - m_spriteram2_older = std::make_unique(0x10000/2); - - save_item(NAME(m_bgbank)); - save_pointer(NAME(m_spriteram_old), 0x2000/2); - save_pointer(NAME(m_spriteram_older), 0x2000/2); - save_pointer(NAME(m_spriteram2_old), 0x10000/2); - save_pointer(NAME(m_spriteram2_older), 0x10000/2); -} - - -uint32_t taotaido_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ -// m_bg_tilemap->set_scrollx(0,(m_scrollram[0x380/2]>>4)); // the values put here end up being wrong every other frame -// m_bg_tilemap->set_scrolly(0,(m_scrollram[0x382/2]>>4)); // the values put here end up being wrong every other frame - - /* not amazingly efficient however it should be functional for row select and linescroll */ - rectangle clip = cliprect; - - for (int line = cliprect.top(); line <= cliprect.bottom(); line++) - { - clip.min_y = clip.max_y = line; - - m_bg_tilemap->set_scrollx(0, ((m_scrollram[(0x00 + 4 * line) / 2]) >> 4) + 30); - m_bg_tilemap->set_scrolly(0, ((m_scrollram[(0x02 + 4 * line) / 2]) >> 4) - line); - - m_bg_tilemap->draw(screen, bitmap, clip, 0,0); - } - - m_spr->draw_sprites(m_spriteram_older.get(), m_spriteram.bytes(), screen, bitmap, cliprect); - return 0; -} - -WRITE_LINE_MEMBER(taotaido_state::screen_vblank) -{ - // rising edge - if (state) - { - /* sprites need to be delayed by 2 frames? */ - - memcpy(m_spriteram2_older.get(),m_spriteram2_old.get(),0x10000); - memcpy(m_spriteram2_old.get(),m_spriteram2,0x10000); - - memcpy(m_spriteram_older.get(),m_spriteram_old.get(),0x2000); - memcpy(m_spriteram_old.get(),m_spriteram,0x2000); - } -} diff --git a/src/mame/vtech/crvision.h b/src/mame/vtech/crvision.h index e8cc12ee60a..a0be2d5d507 100644 --- a/src/mame/vtech/crvision.h +++ b/src/mame/vtech/crvision.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol, Curt Coder -#ifndef MAME_INCLUDES_CRVISION_H -#define MAME_INCLUDES_CRVISION_H +#ifndef MAME_VTECH_CRVISION_H +#define MAME_VTECH_CRVISION_H #include "cpu/m6502/m6502.h" #include "imagedev/cassette.h" @@ -113,4 +113,4 @@ private: virtual void machine_start() override; }; -#endif // MAME_INCLUDES_CRVISION_H +#endif // MAME_VTECH_CRVISION_H diff --git a/src/mame/vtech/pc4.h b/src/mame/vtech/pc4.h index 4bb2120ca11..2905c5fcdbb 100644 --- a/src/mame/vtech/pc4.h +++ b/src/mame/vtech/pc4.h @@ -5,8 +5,8 @@ VTech Laser PC4 ****************************************************************************/ -#ifndef MAME_INCLUDES_PC4_H -#define MAME_INCLUDES_PC4_H +#ifndef MAME_VTECH_PC4_H +#define MAME_VTECH_PC4_H #pragma once @@ -81,4 +81,4 @@ private: ioport_port *io_port[8]; }; -#endif // MAME_INCLUDES_PC4_H +#endif // MAME_VTECH_PC4_H diff --git a/src/mame/vtech/socrates_a.h b/src/mame/vtech/socrates_a.h index a3e6dc08837..0fc2085519d 100644 --- a/src/mame/vtech/socrates_a.h +++ b/src/mame/vtech/socrates_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Jonathan Gevaryahu -#ifndef MAME_VTECH_SOCRATES_H -#define MAME_VTECH_SOCRATES_H +#ifndef MAME_VTECH_SOCRATES_A_H +#define MAME_VTECH_SOCRATES_A_H #pragma once @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(SOCRATES_SOUND, socrates_snd_device) -#endif // MAME_VTECH_SOCRATES_H +#endif // MAME_VTECH_SOCRATES_A_H diff --git a/src/mame/vtech/vsmile.h b/src/mame/vtech/vsmile.h index 2f84760c50a..e6898f7867a 100644 --- a/src/mame/vtech/vsmile.h +++ b/src/mame/vtech/vsmile.h @@ -17,8 +17,8 @@ *******************************************************************************/ -#ifndef MAME_INCLUDES_VSMILE_H -#define MAME_INCLUDES_VSMILE_H +#ifndef MAME_VTECH_VSMILE_H +#define MAME_VTECH_VSMILE_H #include "bus/vsmile/vsmile_ctrl.h" #include "bus/vsmile/vsmile_slot.h" @@ -181,4 +181,4 @@ private: uint16_t m_mode = 0; }; -#endif // MAME_INCLUDES_VSMILE_H +#endif // MAME_VTECH_VSMILE_H diff --git a/src/mame/vtech/vtech2.h b/src/mame/vtech/vtech2.h index b74e13b2a0c..3817ac1ad3b 100644 --- a/src/mame/vtech/vtech2.h +++ b/src/mame/vtech/vtech2.h @@ -5,8 +5,8 @@ * includes/vtech2.h * ****************************************************************************/ -#ifndef MAME_INCLUDES_VTECH2_H -#define MAME_INCLUDES_VTECH2_H +#ifndef MAME_VTECH_VTECH2_H +#define MAME_VTECH_VTECH2_H #pragma once @@ -116,4 +116,4 @@ private: memory_region *m_cart_rom = nullptr; }; -#endif // MAME_INCLUDES_VTECH2_H +#endif // MAME_VTECH_VTECH2_H diff --git a/src/mame/wavemate/bullet.h b/src/mame/wavemate/bullet.h index cddf13c5bd9..fcde12c230a 100644 --- a/src/mame/wavemate/bullet.h +++ b/src/mame/wavemate/bullet.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_BULLET_H -#define MAME_INCLUDES_BULLET_H +#ifndef MAME_WAVEMATE_BULLET_H +#define MAME_WAVEMATE_BULLET_H #pragma once @@ -188,4 +188,4 @@ protected: int m_wrdy = 0; }; -#endif // MAME_INCLUDES_BULLET_H +#endif // MAME_WAVEMATE_BULLET_H diff --git a/src/mame/wing/lucky74.h b/src/mame/wing/lucky74.h index 459069a4b93..1db311b4937 100644 --- a/src/mame/wing/lucky74.h +++ b/src/mame/wing/lucky74.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Roberto Fresca -#ifndef MAME_INCLUDES_LUCKY74_H -#define MAME_INCLUDES_LUCKY74_H +#ifndef MAME_WING_LUCKY74_H +#define MAME_WING_LUCKY74_H #pragma once @@ -75,4 +75,4 @@ private: output_finder<12> m_lamps; }; -#endif // MAME_INCLUDES_LUCKY74_H +#endif // MAME_WING_LUCKY74_H diff --git a/src/mame/xerox/xerox820.h b/src/mame/xerox/xerox820.h index ec1252200f2..05e8f2ffea4 100644 --- a/src/mame/xerox/xerox820.h +++ b/src/mame/xerox/xerox820.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_INCLUDES_XEROX820_H -#define MAME_INCLUDES_XEROX820_H +#ifndef MAME_XEROX_XEROX820_H +#define MAME_XEROX_XEROX820_H #pragma once @@ -186,4 +186,4 @@ protected: required_device m_sasibus; }; -#endif // MAME_INCLUDES_XEROX820_H +#endif // MAME_XEROX_XEROX820_H diff --git a/src/mame/zaccaria/laserbat.h b/src/mame/zaccaria/laserbat.h index 133ac3d8439..5204edc6205 100644 --- a/src/mame/zaccaria/laserbat.h +++ b/src/mame/zaccaria/laserbat.h @@ -5,8 +5,8 @@ Laser Battle / Lazarian - Cat and Mouse *************************************************************************/ -#ifndef MAME_INCLUDES_LASERBAT_H -#define MAME_INCLUDES_LASERBAT_H +#ifndef MAME_ZACCARIA_LASERBAT_H +#define MAME_ZACCARIA_LASERBAT_H #pragma once @@ -188,4 +188,4 @@ protected: required_device m_audiopcb; }; -#endif // MAME_INCLUDES_LASERBAT_H +#endif // MAME_ZACCARIA_LASERBAT_H diff --git a/src/mame/zaccaria/zac2650.h b/src/mame/zaccaria/zac2650.h index 468f287df13..bab5fad237d 100644 --- a/src/mame/zaccaria/zac2650.h +++ b/src/mame/zaccaria/zac2650.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Coates -#ifndef MAME_INCLUDES_ZAC2650_H -#define MAME_INCLUDES_ZAC2650_H +#ifndef MAME_ZACCARIA_ZAC2650_H +#define MAME_ZACCARIA_ZAC2650_H #pragma once @@ -61,4 +61,4 @@ private: void main_map(address_map &map); }; -#endif // MAME_INCLUDES_ZAC2650_H +#endif // MAME_ZACCARIA_ZAC2650_H diff --git a/src/mame/zaccaria/zaccaria.h b/src/mame/zaccaria/zaccaria.h index 0c479dcce0d..a0775862a02 100644 --- a/src/mame/zaccaria/zaccaria.h +++ b/src/mame/zaccaria/zaccaria.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_INCLUDES_ZACCARIA_H -#define MAME_INCLUDES_ZACCARIA_H +#ifndef MAME_ZACCARIA_ZACCARIA_H +#define MAME_ZACCARIA_ZACCARIA_H #pragma once @@ -70,4 +70,4 @@ private: uint8_t m_nmi_mask = 0; }; -#endif // MAME_INCLUDES_ZACCARIA_H +#endif // MAME_ZACCARIA_ZACCARIA_H diff --git a/src/mame/zaccaria/zaccaria_a.h b/src/mame/zaccaria/zaccaria_a.h index a69c4cd3e8d..311a69e4051 100644 --- a/src/mame/zaccaria/zaccaria_a.h +++ b/src/mame/zaccaria/zaccaria_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -#ifndef MAME_ZACCARIA_ZACCARIA_H -#define MAME_ZACCARIA_ZACCARIA_H +#ifndef MAME_ZACCARIA_ZACCARIA_A_H +#define MAME_ZACCARIA_ZACCARIA_A_H #pragma once @@ -123,4 +123,4 @@ protected: u8 m_host_command; }; -#endif // MAME_ZACCARIA_ZACCARIA_H +#endif // MAME_ZACCARIA_ZACCARIA_A_H diff --git a/src/mame/zvt/pp01.h b/src/mame/zvt/pp01.h index 39ff68586e2..fd2c82465bf 100644 --- a/src/mame/zvt/pp01.h +++ b/src/mame/zvt/pp01.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_INCLUDES_PP01_H -#define MAME_INCLUDES_PP01_H +#ifndef MAME_ZVT_PP01_H +#define MAME_ZVT_PP01_H #pragma once @@ -88,4 +88,4 @@ private: required_ioport_array<17> m_io_keyboard; }; -#endif // MAME_INCLUDES_PP01_H +#endif // MAME_ZVT_PP01_H -- cgit v1.2.3