From 52b64a5c8ce6b60eef318e28631205938a80de00 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Thu, 19 Jan 2023 18:43:50 +0100 Subject: mame/m*,n*: put drivers in anonymous namespaces where applicable, updated #ifndef guards to the current tree structure --- src/mame/makerbot/replicator.cpp | 6 ++++++ src/mame/matic/barata.cpp | 6 ++++++ src/mame/matsushita/duet16.cpp | 6 ++++++ src/mame/matsushita/jr200.cpp | 5 +++++ src/mame/matsushita/myb3k.cpp | 6 ++++++ src/mame/mattel/stic.h | 6 +++--- src/mame/maygay/maygayep.cpp | 4 ++++ src/mame/maygay/maygayew.cpp | 6 ++++++ src/mame/maygay/mmm.cpp | 5 +++++ src/mame/mchester/ssem.cpp | 4 ++++ src/mame/meadows/meadwttl.cpp | 4 ++++ src/mame/meadows/warpsped.cpp | 5 +++++ src/mame/mera/ec7915.cpp | 5 +++++ src/mame/mera/konin.cpp | 6 ++++++ src/mame/mera/m79152pc.cpp | 5 +++++ src/mame/mera/vdm7932x.cpp | 4 ++++ src/mame/merit/merit.cpp | 6 ++++++ src/mame/merit/meritm.cpp | 9 +++++++-- src/mame/merit/meritsdx.cpp | 4 ++++ src/mame/merit/mgames.cpp | 4 ++++ src/mame/merit/mtouchxl.cpp | 6 ++++++ src/mame/merit/pubtimed.cpp | 6 ++++++ src/mame/metro/rabbit.cpp | 5 +++++ src/mame/metro/tmmjprd.cpp | 4 ++++ src/mame/mg1/kbd.h | 6 +++--- src/mame/microsoft/mct_adr.h | 6 +++--- src/mame/microsoft/xbox.cpp | 4 ++++ src/mame/microterm/ergo201.cpp | 6 ++++++ src/mame/microterm/microterm_f8.cpp | 6 ++++++ src/mame/midcoin/24cdjuke.cpp | 5 +++++ src/mame/midcoin/wink.cpp | 5 +++++ src/mame/midw8080/8080bw_a.h | 6 +++--- src/mame/midw8080/mw8080bw_a.h | 6 +++--- src/mame/midw8080/nl_280zzzap.h | 6 +++--- src/mame/midw8080/nl_gunfight.h | 6 +++--- src/mame/midw8080/rotaryf.cpp | 4 ++++ src/mame/midway/csd.h | 6 +++--- src/mame/midway/midtunit_v.h | 6 +++--- src/mame/midway/midway.h | 6 +++--- src/mame/midway/mw18w.cpp | 4 ++++ src/mame/midway/mwsub.cpp | 4 ++++ src/mame/midway/nl_sspeedr.h | 6 +++--- src/mame/midway/sente6vb.h | 6 +++--- src/mame/midway/tmaster.cpp | 6 ++++++ src/mame/midway/wmg.cpp | 4 ++++ src/mame/midway/zwackery.cpp | 4 ++++ src/mame/mips/mips_rambo.h | 6 +++--- src/mame/misc/5clown.cpp | 4 ++++ src/mame/misc/ace_sp_reelctrl.h | 6 +++--- src/mame/misc/acefruit.cpp | 4 ++++ src/mame/misc/aces1.cpp | 4 ++++ src/mame/misc/acesp.cpp | 6 ++++++ src/mame/misc/age_candy.cpp | 5 +++++ src/mame/misc/alinvade.cpp | 4 ++++ src/mame/misc/amaticmg.cpp | 4 ++++ src/mame/misc/amerihok.cpp | 5 +++++ src/mame/misc/amusco.cpp | 5 +++++ src/mame/misc/arachnid.cpp | 6 ++++++ src/mame/misc/astrafr.cpp | 4 ++++ src/mame/misc/astropc.cpp | 6 ++++++ src/mame/misc/atronic.cpp | 6 +++++- src/mame/misc/attckufo.cpp | 4 ++++ src/mame/misc/bailey.cpp | 5 +++++ src/mame/misc/beaminv.cpp | 3 +++ src/mame/misc/beezer.cpp | 4 ++++ src/mame/misc/belatra.cpp | 5 +++++ src/mame/misc/bingoman.cpp | 4 ++++ src/mame/misc/bingor.cpp | 4 ++++ src/mame/misc/blocktax.cpp | 6 +++++- src/mame/misc/bntyhunt.cpp | 4 ++++ src/mame/misc/buster.cpp | 4 ++++ src/mame/misc/cardline.cpp | 5 +++++ src/mame/misc/carrera.cpp | 6 ++++++ src/mame/misc/castle.cpp | 5 +++++ src/mame/misc/cavepc.cpp | 4 ++++ src/mame/misc/cb2001.cpp | 5 +++++ src/mame/misc/chance32.cpp | 4 ++++ src/mame/misc/changyu.cpp | 6 ++++++ src/mame/misc/chicago.cpp | 5 +++++ src/mame/misc/chsuper.cpp | 4 ++++ src/mame/misc/clowndwn.cpp | 5 +++++ src/mame/misc/clpoker.cpp | 4 ++++ src/mame/misc/cocoloco.cpp | 4 ++++ src/mame/misc/coinmvga.cpp | 4 ++++ src/mame/misc/comebaby.cpp | 4 ++++ src/mame/misc/cowtipping.cpp | 5 +++++ src/mame/misc/crazybal.cpp | 5 +++++ src/mame/misc/cromptons.cpp | 5 +++++ src/mame/misc/crospuzl.cpp | 6 ++++++ src/mame/misc/cubeqst.cpp | 6 ++++++ src/mame/misc/cupidon.cpp | 5 +++++ src/mame/misc/cybertnk.cpp | 5 +++++ src/mame/misc/daryde.cpp | 6 ++++++ src/mame/misc/dfruit.cpp | 6 ++++++ src/mame/misc/dgpix.cpp | 5 +++++ src/mame/misc/dominob.cpp | 6 ++++++ src/mame/misc/dorachan.cpp | 3 +++ src/mame/misc/drdmania.cpp | 6 ++++++ src/mame/misc/dreamwld.cpp | 6 ++++++ src/mame/misc/dwarfd.cpp | 6 ++++++ src/mame/misc/dynadice.cpp | 5 +++++ src/mame/misc/dynamoah.cpp | 6 ++++++ src/mame/misc/ecoinf1.cpp | 5 +++++ src/mame/misc/ecoinf3.cpp | 3 +++ src/mame/misc/electra.cpp | 5 +++++ src/mame/misc/esh.cpp | 5 +++++ src/mame/misc/ettrivia.cpp | 5 +++++ src/mame/misc/ez2d.cpp | 6 ++++++ src/mame/misc/fastinvaders.cpp | 5 +++++ src/mame/misc/fireball.cpp | 5 +++++ src/mame/misc/flipjack.cpp | 4 ++++ src/mame/misc/flower.cpp | 5 +++++ src/mame/misc/flower_a.h | 6 +++--- src/mame/misc/fortecar.cpp | 4 ++++ src/mame/misc/freeway.cpp | 5 +++++ src/mame/misc/fresh.cpp | 4 +++- src/mame/misc/galaxi.cpp | 5 +++++ src/mame/misc/galgame.cpp | 5 +++++ src/mame/misc/gamemasters.cpp | 4 ++++ src/mame/misc/gamtor.cpp | 3 +++ src/mame/misc/globalfr.cpp | 4 ++++ src/mame/misc/globalvr.cpp | 5 +++++ src/mame/misc/gluck2.cpp | 4 ++++ src/mame/misc/goldngam.cpp | 4 ++++ src/mame/misc/gsspade.cpp | 5 +++++ src/mame/misc/h01x.cpp | 6 ++++++ src/mame/misc/hapyfish.cpp | 13 ++++++------- src/mame/misc/hazelgr.cpp | 4 ++++ src/mame/misc/hideseek.cpp | 4 ++++ src/mame/misc/hitpoker.cpp | 5 +++++ src/mame/misc/hobbyplay.cpp | 6 ++++++ src/mame/misc/hotblock.cpp | 6 ++++++ src/mame/misc/hotstuff.cpp | 5 +++++ src/mame/misc/imolagp.cpp | 4 ++++ src/mame/misc/inder_sb.h | 6 +++--- src/mame/misc/intrscti.cpp | 5 +++++ src/mame/misc/island.cpp | 4 ++++ src/mame/misc/itgambl2.cpp | 5 +++++ src/mame/misc/itgambl3.cpp | 5 +++++ src/mame/misc/itgamble.cpp | 4 ++++ src/mame/misc/jackpool.cpp | 5 +++++ src/mame/misc/jankenmn.cpp | 5 +++++ src/mame/misc/jokrwild.cpp | 5 +++++ src/mame/misc/joystand.cpp | 6 ++++++ src/mame/misc/jubilee.cpp | 5 +++++ src/mame/misc/kas89.cpp | 4 ++++ src/mame/misc/kurukuru.cpp | 5 +++++ src/mame/misc/laz_aftrshok.cpp | 4 ++++ src/mame/misc/laz_ribrac.cpp | 5 +++++ src/mame/misc/lependu.cpp | 5 +++++ src/mame/misc/limenko.cpp | 5 +++++ src/mame/misc/ltcasino.cpp | 4 ++++ src/mame/misc/luckybal.cpp | 4 ++++ src/mame/misc/marywu.cpp | 6 ++++++ src/mame/misc/matrix.cpp | 5 +++++ src/mame/misc/meyc8080.cpp | 4 ++++ src/mame/misc/meyc8088.cpp | 4 ++++ src/mame/misc/mgavegas.cpp | 4 ++++ src/mame/misc/micro3d_a.h | 6 +++--- src/mame/misc/microdar.cpp | 5 +++++ src/mame/misc/miniboy7.cpp | 4 ++++ src/mame/misc/minivideo.cpp | 5 +++++ src/mame/misc/mirax.cpp | 5 +++++ src/mame/misc/mjsenpu.cpp | 5 +++++ src/mame/misc/mole.cpp | 4 ++++ src/mame/misc/monon_color.cpp | 6 ++++++ src/mame/misc/mpu12wbk.cpp | 5 +++++ src/mame/misc/murogem.cpp | 5 +++++ src/mame/misc/murogmbl.cpp | 5 +++++ src/mame/misc/nexus3d.cpp | 4 ++++ src/mame/misc/nibble.cpp | 6 +++++- src/mame/misc/notechan.cpp | 4 ++++ src/mame/misc/nsg6809.cpp | 4 ++++ src/mame/misc/nsmpoker.cpp | 5 +++++ src/mame/misc/odyssey.cpp | 5 +++++ src/mame/misc/othello.cpp | 5 +++++ src/mame/misc/pachifev.cpp | 7 ++++++- src/mame/misc/pasha2.cpp | 5 +++++ src/mame/misc/photon.cpp | 5 +++++ src/mame/misc/photon2.cpp | 5 +++++ src/mame/misc/piggypas.cpp | 3 +++ src/mame/misc/pkscram.cpp | 4 ++++ src/mame/misc/pntnpuzl.cpp | 5 +++++ src/mame/misc/pokerout.cpp | 5 +++++ src/mame/misc/potgoldu.cpp | 5 +++++ src/mame/misc/proconn.cpp | 9 +++++++-- src/mame/misc/psattack.cpp | 5 +++++ src/mame/misc/pse.cpp | 5 +++++ src/mame/misc/quizo.cpp | 5 +++++ src/mame/misc/roul.cpp | 5 +++++ src/mame/misc/rulechan.cpp | 5 +++++ src/mame/misc/sanremmg.cpp | 5 +++++ src/mame/misc/scm_500.cpp | 6 ++++++ src/mame/misc/sealy.cpp | 5 +++++ src/mame/misc/sealy_fr.cpp | 5 +++++ src/mame/misc/sfbonus.cpp | 4 ++++ src/mame/misc/skeetsht.cpp | 4 ++++ src/mame/misc/skimaxx.cpp | 4 ++++ src/mame/misc/skopro.cpp | 5 +++++ src/mame/misc/skyarmy.cpp | 5 +++++ src/mame/misc/smotor.cpp | 5 +++++ src/mame/misc/smsmcorp.cpp | 4 ++++ src/mame/misc/spool99.cpp | 3 +++ src/mame/misc/sprcros2.cpp | 6 ++++++ src/mame/misc/sstrangr.cpp | 4 ++++ src/mame/misc/statriv2.cpp | 3 +++ src/mame/misc/strkzn.cpp | 6 ++++++ src/mame/misc/stuntair.cpp | 4 ++++ src/mame/misc/summit.cpp | 4 ++++ src/mame/misc/sumt8035.cpp | 4 ++++ src/mame/misc/tapatune.cpp | 5 +++++ src/mame/misc/teamjocs.cpp | 4 ++++ src/mame/misc/tecnodar.cpp | 5 +++++ src/mame/misc/thayers.cpp | 6 ++++++ src/mame/misc/triviaquiz.cpp | 6 ++++++ src/mame/misc/trvmadns.cpp | 4 ++++ src/mame/misc/tugboat.cpp | 4 ++++ src/mame/misc/tvg01.cpp | 4 ++++ src/mame/misc/unkpoker.cpp | 6 ++++++ src/mame/misc/usbilliards.cpp | 6 ++++++ src/mame/misc/v0bowl.cpp | 6 ++++++ src/mame/misc/vcombat.cpp | 5 +++++ src/mame/misc/video21.cpp | 6 ++++++ src/mame/misc/videosaa.cpp | 4 ++++ src/mame/misc/vroulet.cpp | 5 +++++ src/mame/misc/wildpkr.cpp | 4 ++++ src/mame/misc/wms.cpp | 4 ++++ src/mame/misc/yuvomz80.cpp | 6 ++++++ src/mame/mitsubishi/multi16.cpp | 5 +++++ src/mame/mitsubishi/multi8.cpp | 5 +++++ src/mame/mizar/mzr8105.cpp | 6 ++++++ src/mame/morrow/microdec.cpp | 5 +++++ src/mame/morrow/tricep.cpp | 6 ++++++ src/mame/motorola/ampscarp.cpp | 6 ++++++ src/mame/motorola/exorciser.cpp | 21 +++++++++++++-------- src/mame/motorola/exorterm.cpp | 6 ++++++ src/mame/motorola/m6805evs.cpp | 6 +++++- src/mame/motorola/mekd1.cpp | 6 ++++++ src/mame/motorola/mekd2.cpp | 6 ++++++ src/mame/motorola/mekd3.cpp | 6 ++++++ src/mame/motorola/mekd4.cpp | 5 +++++ src/mame/motorola/mekd5.cpp | 6 ++++++ src/mame/motorola/mvme147.cpp | 8 +++++++- src/mame/motorola/mvme162.cpp | 6 ++++++ src/mame/motorola/powerstack.cpp | 6 ++++++ src/mame/motorola/uchroma68.cpp | 6 ++++++ src/mame/mr/sshot.cpp | 4 ++++ src/mame/msx/big10.cpp | 4 ++++ src/mame/msx/forte2.cpp | 5 +++++ src/mame/msx/pengadvb.cpp | 5 +++++ src/mame/msx/sangho.cpp | 5 +++++ src/mame/msx/sfkick.cpp | 4 ++++ src/mame/multitech/mkit09.cpp | 5 +++++ src/mame/mupid/mdisk.cpp | 4 ++++ src/mame/mupid/mupid2.cpp | 4 ++++ src/mame/namco/30test.cpp | 3 +++ src/mame/namco/c117.h | 6 +++--- src/mame/namco/cswat.cpp | 4 ++++ src/mame/namco/dkmb.cpp | 6 ++++++ src/mame/namco/gal3.cpp | 6 ++++++ src/mame/namco/geebee.h | 6 +++--- src/mame/namco/namco06.h | 6 +++--- src/mame/namco/namco50.h | 6 +++--- src/mame/namco/namco51.h | 6 +++--- src/mame/namco/namco52.h | 6 +++--- src/mame/namco/namco53.h | 6 +++--- src/mame/namco/namco54.h | 6 +++--- src/mame/namco/namco62.h | 6 +++--- src/mame/namco/namco65.h | 6 +++--- src/mame/namco/namco68.h | 6 +++--- src/mame/namco/namco_c116.h | 6 +++--- src/mame/namco/namco_c123tmap.h | 6 +++--- src/mame/namco/namco_c139.h | 6 +++--- src/mame/namco/namco_c148.h | 6 +++--- src/mame/namco/namco_c169roz.h | 6 +++--- src/mame/namco/namco_c45road.h | 6 +++--- src/mame/namco/namco_c67.h | 6 +++--- src/mame/namco/namco_settings.h | 6 +++--- src/mame/namco/namcoio.h | 6 +++--- src/mame/namco/namcoio_gearbox.h | 6 +++--- src/mame/namco/namcomcu.h | 6 +++--- src/mame/namco/namcops2.cpp | 5 +++++ src/mame/namco/namcos11.cpp | 6 ++++++ src/mame/namco/namcos12.cpp | 5 +++++ src/mame/namco/namcos1b.cpp | 5 +++++ src/mame/namco/namcos21_3d.h | 6 +++--- src/mame/namco/namcos21_c67.cpp | 6 ++++++ src/mame/namco/namcos21_dsp.h | 6 +++--- src/mame/namco/namcos23.cpp | 4 ++++ src/mame/namco/namcos2_roz.h | 6 +++--- src/mame/namco/namcos2_sprite.h | 6 +++--- src/mame/namco/nl_tankbatt.h | 6 +++--- src/mame/namco/ns10crypt.h | 6 +++--- src/mame/namco/ns11prot.h | 6 +++--- src/mame/namco/polepos_a.h | 6 +++--- src/mame/namco/shootaway2.cpp | 6 ++++++ src/mame/namco/starfield_05xx.h | 6 +++--- src/mame/namco/sweetland.cpp | 5 +++++ src/mame/namco/toypop.cpp | 5 +++++ src/mame/namco/wacky_gator.cpp | 5 +++++ src/mame/namco/warpwarp_a.h | 6 +++--- src/mame/namco/ygv608.h | 6 +++--- src/mame/natsemi/ns5652.cpp | 6 ++++++ src/mame/ncd/bert_m.h | 6 +++--- src/mame/ncd/ncd68k.cpp | 6 ++++++ src/mame/ncd/ncdmips.cpp | 6 ++++++ src/mame/ncd/ncdppc.cpp | 6 ++++++ src/mame/nec/apc.cpp | 6 ++++++ src/mame/nec/pc100.cpp | 5 +++++ src/mame/nec/pc80s31k.h | 6 +++--- src/mame/nec/pc9801_cd.h | 6 +++--- src/mame/nec/pc9801_kbd.h | 6 +++--- src/mame/nec/pc9801_memsw.h | 6 +++--- src/mame/nec/pce_cd.h | 6 +++--- src/mame/neogeo/neogeo_spr.h | 6 +++--- src/mame/neogeo/neogeocd.cpp | 4 ++++ src/mame/neogeo/neopcb.cpp | 4 ++++ src/mame/neogeo/ng_memcard.h | 6 +++--- src/mame/netronics/exp85.cpp | 6 ++++++ src/mame/next/nextkbd.h | 6 +++--- src/mame/next/nextmo.h | 6 +++--- src/mame/nichibutsu/csplayh5.cpp | 6 +++++- src/mame/nichibutsu/dacholer.cpp | 5 +++++ src/mame/nichibutsu/gomoku_a.h | 6 +++--- src/mame/nichibutsu/jangou.cpp | 4 ++++ src/mame/nichibutsu/nb1412m2.h | 6 +++--- src/mame/nichibutsu/nb1413m3.h | 6 +++--- src/mame/nichibutsu/nb1414m4.h | 6 +++--- src/mame/nichibutsu/nichild.cpp | 6 ++++++ src/mame/nichibutsu/nichisnd.h | 6 +++--- src/mame/nichibutsu/nightgal.cpp | 5 +++++ src/mame/nichibutsu/wiping_a.h | 6 +++--- src/mame/nintendo/compmahj.cpp | 6 ++++++ src/mame/nintendo/gamecube.cpp | 4 ++++ src/mame/nintendo/multigam.cpp | 5 +++++ src/mame/nintendo/nes_clone.cpp | 5 +++++ src/mame/nintendo/nes_sh6578.cpp | 6 ++++++ src/mame/nintendo/nes_vt02_vt03.cpp | 13 ++++++++----- src/mame/nintendo/nes_vt09.cpp | 10 ++++++++-- src/mame/nintendo/nes_vt09_soc.h | 6 +++--- src/mame/nintendo/nes_vt32.cpp | 7 ++++++- src/mame/nintendo/nes_vt32_soc.h | 6 +++--- src/mame/nintendo/nes_vt369_vtunknown.cpp | 14 ++++++++++---- src/mame/nintendo/nes_vt369_vtunknown_soc.h | 6 +++--- src/mame/nintendo/nes_vt_soc.h | 6 +++--- src/mame/nintendo/pin64.h | 6 +++--- src/mame/nintendo/pokemini.cpp | 4 ++++ src/mame/nintendo/vboy.cpp | 5 +++++ src/mame/nintendo/vt1682.cpp | 9 ++++++--- src/mame/nintendo/vt1682_alu.h | 6 +++--- src/mame/nintendo/vt1682_io.h | 6 +++--- src/mame/nintendo/vt1682_timer.h | 6 +++--- src/mame/nintendo/vt1682_uio.h | 6 +++--- src/mame/nintendo/vt_unknown.cpp | 5 +++++ src/mame/nmk/ddealer.cpp | 6 ++++++ src/mame/nmk/nmk004.h | 6 +++--- src/mame/nmk/nmk16spr.h | 6 +++--- src/mame/nokia/dbox.cpp | 6 ++++++ src/mame/nokia/mm1kb.h | 6 +++--- src/mame/nokia/nokia_3310.cpp | 4 ++++ src/mame/northstar/horizon.cpp | 22 ++++++++++++---------- src/mame/novation/basssta.cpp | 6 ++++++ src/mame/novation/drumsta.cpp | 6 ++++++ 363 files changed, 1665 insertions(+), 286 deletions(-) diff --git a/src/mame/makerbot/replicator.cpp b/src/mame/makerbot/replicator.cpp index d6d6128985f..e7b79161d97 100644 --- a/src/mame/makerbot/replicator.cpp +++ b/src/mame/makerbot/replicator.cpp @@ -49,6 +49,9 @@ #define VERBOSE (0) #include "logmacro.h" + +namespace { + #define MASTER_CLOCK 16000000 //Port A bits: @@ -820,5 +823,8 @@ ROM_START( replica1 ) ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ COMP(2012, replica1, 0, 0, replicator, replicator, replicator_state, empty_init, "Makerbot", "Replicator 1 desktop 3d printer", MACHINE_NOT_WORKING) diff --git a/src/mame/matic/barata.cpp b/src/mame/matic/barata.cpp index b1f0c131632..dfc937aa8b8 100644 --- a/src/mame/matic/barata.cpp +++ b/src/mame/matic/barata.cpp @@ -40,6 +40,9 @@ #include "barata.lh" + +namespace { + #define CPU_CLOCK (XTAL(6'000'000)) /* main cpu clock */ class barata_state : public driver_device @@ -336,6 +339,9 @@ ROM_START( barata ) ROM_LOAD( "barata.bin", 0x0000, 0x06a8, CRC(a5b68617) SHA1(4c7cd7c494d20236732c8d1f2b2904bfe99f5252) ) ROM_END +} // anonymous namespace + + /************************* * Game Drivers * *************************/ diff --git a/src/mame/matsushita/duet16.cpp b/src/mame/matsushita/duet16.cpp index 12df48118a9..9c93e8ccc13 100644 --- a/src/mame/matsushita/duet16.cpp +++ b/src/mame/matsushita/duet16.cpp @@ -22,6 +22,9 @@ #include "bus/rs232/rs232.h" #include "bus/rs232/keyboard.h" + +namespace { + class duet16_state : public driver_device { public: @@ -457,4 +460,7 @@ ROM_START(duet16) ROM_LOAD("duet16_key_8741ak001b_z.bin", 0x000, 0x400, CRC(d23ee68d) SHA1(3b6a86fe2a304823c5385cd673f9580a35199dac)) ROM_END +} // anonymous namespace + + COMP( 1983, duet16, 0, 0, duet16, 0, duet16_state, empty_init, "Panafacom (Panasonic/Fujitsu)", "Duet-16", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/matsushita/jr200.cpp b/src/mame/matsushita/jr200.cpp index 5a17659fbc9..9b2d9e5d2a3 100644 --- a/src/mame/matsushita/jr200.cpp +++ b/src/mame/matsushita/jr200.cpp @@ -68,6 +68,8 @@ TODO: #include "utf8.h" +namespace { + class jr200_state : public driver_device { public: @@ -652,6 +654,9 @@ ROM_START( jr200u ) ROM_LOAD( "char.rom", 0x0000, 0x0800, CRC(cb641624) SHA1(6fe890757ebc65bbde67227f9c7c490d8edd84f2) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/matsushita/myb3k.cpp b/src/mame/matsushita/myb3k.cpp index abe48efca6e..2fb2ad1e83b 100644 --- a/src/mame/matsushita/myb3k.cpp +++ b/src/mame/matsushita/myb3k.cpp @@ -79,6 +79,9 @@ #define LOGCENT(...) LOGMASKED(LOG_CENT, __VA_ARGS__) #define LOGRAM(...) LOGMASKED(LOG_RAM, __VA_ARGS__) + +namespace { + class myb3k_state : public driver_device { public: @@ -1067,6 +1070,9 @@ ROM_START( stepone ) ROM_LOAD( "steponebios-v2.07.bin", 0xe000, 0x2000, CRC(322c1618) SHA1(a7a3cc2af7cc9556007d98014714ba656f6e79d1)) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1982, myb3k, 0, 0, myb3k, myb3k, myb3k_state, empty_init, "Matsushita", "MyBrain 3000", 0) COMP( 1982, jb3000, myb3k, 0, jb3000, myb3k, myb3k_state, empty_init, "Panasonic", "JB-3000", 0) diff --git a/src/mame/mattel/stic.h b/src/mame/mattel/stic.h index 92aa74bfa59..d62eab5236f 100644 --- a/src/mame/mattel/stic.h +++ b/src/mame/mattel/stic.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_VIDEO_STIC_H -#define MAME_VIDEO_STIC_H +#ifndef MAME_MATTEL_STIC_H +#define MAME_MATTEL_STIC_H // the Intellivision emulation scales to match the output format at the last // step. The Intellivision keyboard component appears to be 320x96, but can @@ -182,4 +182,4 @@ private: DECLARE_DEVICE_TYPE(STIC, stic_device) -#endif // MAME_VIDEO_STIC_H +#endif // MAME_MATTEL_STIC_H diff --git a/src/mame/maygay/maygayep.cpp b/src/mame/maygay/maygayep.cpp index 83776d9a690..b9de0397413 100644 --- a/src/mame/maygay/maygayep.cpp +++ b/src/mame/maygay/maygayep.cpp @@ -38,6 +38,8 @@ #include "speaker.h" +namespace { + class maygayep_state : public driver_device { public: @@ -7046,6 +7048,8 @@ ROM_START( ep_party ) MISSING_SOUND ROM_END +} // anonymous namespace + /* header info */ diff --git a/src/mame/maygay/maygayew.cpp b/src/mame/maygay/maygayew.cpp index 7baf9cdeb13..e13f6736d03 100644 --- a/src/mame/maygay/maygayew.cpp +++ b/src/mame/maygay/maygayew.cpp @@ -104,6 +104,9 @@ #include "sound/okim6376.h" #include "speaker.h" + +namespace { + class maygayew_state : public driver_device { public: @@ -455,6 +458,9 @@ ROM_START( mg_scl ) ROM_LOAD( "snd.u3", 0x000000, 0x080000, NO_DUMP ) ROM_END +} // anonymous namespace + + // complete(?) dump GAME( 199?, mg_gbr , 0 , maygayew, maygayew, maygayew_state, empty_init, ROT0, "Maygay", "Guinness Book Of Records (Maygay M2)", MACHINE_IS_SKELETON ) GAME( 199?, mg_risk , 0 , maygayew, maygayew, maygayew_state, empty_init, ROT0, "Maygay", "Risk (Maygay M2)", MACHINE_IS_SKELETON ) diff --git a/src/mame/maygay/mmm.cpp b/src/mame/maygay/mmm.cpp index 67b4ff9b14c..e07b0f8ab17 100644 --- a/src/mame/maygay/mmm.cpp +++ b/src/mame/maygay/mmm.cpp @@ -13,6 +13,9 @@ #include "sound/ay8910.h" #include "speaker.h" + +namespace { + class mmm_state : public driver_device { public: @@ -207,5 +210,7 @@ ROM_START( mmm_ldip ) ROM_LOAD( "ld4.bin", 0x3000, 0x1000, CRC(970b749f) SHA1(fe6da7abc699db69c0761304f588b5bed899c674) ) ROM_END +} // anonymous namespace + GAME( 198?, mmm_ldip, 0, mmm, mmm, mmm_state, empty_init, ROT0, "Maygay", "Lucky Dip (Maygay)", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/mchester/ssem.cpp b/src/mame/mchester/ssem.cpp index 189ae8a6d63..ada168260a7 100644 --- a/src/mame/mchester/ssem.cpp +++ b/src/mame/mchester/ssem.cpp @@ -15,6 +15,8 @@ #include +namespace { + class ssem_state : public driver_device { public: @@ -689,6 +691,8 @@ ROM_START( ssem ) ROM_REGION( 0x80, "maincpu", ROMREGION_ERASE00 ) /* Main Store */ ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME COMP(1948, ssem, 0, 0, ssem, ssem, ssem_state, empty_init, "Manchester University", "Small-Scale Experimental Machine (SSEM), 'Baby'", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/meadows/meadwttl.cpp b/src/mame/meadows/meadwttl.cpp index 8cbac779c3c..d8ddef54103 100644 --- a/src/mame/meadows/meadwttl.cpp +++ b/src/mame/meadows/meadwttl.cpp @@ -23,6 +23,9 @@ #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -162,6 +165,7 @@ ROM_START( mead4in1 ) ROM_LOAD( "hockey.b2", 0x0000, 0x0020, CRC(2dab2259) SHA1(1d20d6a3e3ee1719b7e9e92765aea3109be4e375) ) ROM_END +} // anonymous namespace GAME( 1976, bombaway, 0, meadows, 0, meadwttl_state, empty_init, ROT0, "Meadows", "Bombs Away [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/meadows/warpsped.cpp b/src/mame/meadows/warpsped.cpp index fefe1686086..ee481bd5db5 100644 --- a/src/mame/meadows/warpsped.cpp +++ b/src/mame/meadows/warpsped.cpp @@ -91,6 +91,9 @@ L10, L15, L18 and G18 all read the same #include "screen.h" #include "tilemap.h" + +namespace { + class warpspeed_state : public driver_device { public: @@ -379,5 +382,7 @@ ROM_START( warpsped ) ROM_END +} // anonymous namespace + GAME( 1979?, warpsped, 0, warpspeed, warpspeed, warpspeed_state, empty_init, ROT0, "Meadows Games, Inc.", "Warp Speed (prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // year not shown, 1979 is according to date stamps on PCB chips. diff --git a/src/mame/mera/ec7915.cpp b/src/mame/mera/ec7915.cpp index e2e8de9a3fb..0bd2663f81f 100644 --- a/src/mame/mera/ec7915.cpp +++ b/src/mame/mera/ec7915.cpp @@ -14,6 +14,9 @@ #include "machine/i8255.h" //#include "screen.h" + +namespace { + class ec7915_state : public driver_device { public: @@ -89,5 +92,7 @@ ROM_START( ec7915 ) // 6k ram // amber ROM_LOAD( "char.bin", 0x0000, 0x0800, CRC(e75a6bc4) SHA1(04b56d1f5ab7f2145699555df5ac44d078804821) ) ROM_END +} // anonymous namespace + COMP(198?, ec7915, 0, 0, ec7915, ec7915, ec7915_state, empty_init, "Mera-Elzab", "EC-7915 (EC-7950)", MACHINE_IS_SKELETON) diff --git a/src/mame/mera/konin.cpp b/src/mame/mera/konin.cpp index 37a82cebfd7..b9240395f0d 100644 --- a/src/mame/mera/konin.cpp +++ b/src/mame/mera/konin.cpp @@ -26,6 +26,9 @@ Terminal settings: 8 data bits, 2 stop bits, no parity @ 9600 #include "machine/i8255.h" #include "bus/rs232/rs232.h" + +namespace { + class konin_state : public driver_device { public: @@ -149,6 +152,9 @@ ROM_START( konin ) ROM_LOAD( "010.bin", 0x4800, 0x0800, CRC(f0157e0c) SHA1(60ace1eaf0ba01a45987c2286e18f3d56441c994)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/mera/m79152pc.cpp b/src/mame/mera/m79152pc.cpp index bdd535b525e..28534d55647 100644 --- a/src/mame/mera/m79152pc.cpp +++ b/src/mame/mera/m79152pc.cpp @@ -36,6 +36,8 @@ #include "speaker.h" +namespace { + class m79152pc_state : public driver_device { public: @@ -360,6 +362,9 @@ ROM_START( m79152pc ) ROM_LOAD( "7641apc.bin", 0x0000, 0x0200, NO_DUMP) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/mera/vdm7932x.cpp b/src/mame/mera/vdm7932x.cpp index 4ced0d44493..9260ec8d75f 100644 --- a/src/mame/mera/vdm7932x.cpp +++ b/src/mame/mera/vdm7932x.cpp @@ -15,6 +15,8 @@ #include "machine/z80sio.h" +namespace { + class vdm7932x_state : public driver_device { public: @@ -140,5 +142,7 @@ ROM_START( vdm79322 ) // 8k ram // b&w (amber) ROM_LOAD( "27128_w322-3700.bin", 0x00000, 0x04000, CRC(e5e76ca2) SHA1(bb18c9fa29ef9fa0563aa07d2b856cf6594fc020) ) ROM_END +} // anonymous namespace + COMP(1992, vdm79322, 0, 0, vdm7932x, vdm7932x, vdm7932x_state, empty_init, "Mera-Elzab", "VDM 79322/CM 7233", MACHINE_IS_SKELETON) diff --git a/src/mame/merit/merit.cpp b/src/mame/merit/merit.cpp index 8306d346f37..1ced0fd23c9 100644 --- a/src/mame/merit/merit.cpp +++ b/src/mame/merit/merit.cpp @@ -78,6 +78,9 @@ Merit Riviera Notes - There are several known versions: #include "screen.h" #include "speaker.h" + +namespace { + #define MASTER_CLOCK (XTAL(10'000'000)) #define CPU_CLOCK (MASTER_CLOCK / 4) #define PIXEL_CLOCK (MASTER_CLOCK / 1) @@ -2648,6 +2651,9 @@ void merit_state::init_dtrvwz5() m_decryption_key = 6; } +} // anonymous namespace + + /* Gambling type games */ GAME( 1983, pitboss, 0, pitboss, pitbossa, merit_state, empty_init, ROT0, "Merit", "The Pit Boss (2214-07, U5-0A)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS ) /* "7" hand written over a 5 */ diff --git a/src/mame/merit/meritm.cpp b/src/mame/merit/meritm.cpp index 95d1fa3d60a..e7950a2b3d0 100644 --- a/src/mame/merit/meritm.cpp +++ b/src/mame/merit/meritm.cpp @@ -190,6 +190,8 @@ Not all regional versions are available for each Megatouch series #include "speaker.h" +namespace { + class meritm_state : public driver_device { public: @@ -267,8 +269,8 @@ private: void switch_banks( ); int touch_coord_transform(int *touch_x, int *touch_y); uint8_t binary_to_BCD(uint8_t data); - DECLARE_WRITE_LINE_MEMBER(vdp0_interrupt); - DECLARE_WRITE_LINE_MEMBER(vdp1_interrupt); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(vdp0_interrupt); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(vdp1_interrupt); void crt250_crt258_io_map(address_map &map); void crt250_io_map(address_map &map); void crt250_map(address_map &map); @@ -2434,6 +2436,9 @@ void meritm_state::init_megat3te() m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfff8, 0xffff, read8sm_delegate(*this, FUNC(meritm_state::ds1644_r)), write8sm_delegate(*this, FUNC(meritm_state::ds1644_w))); } +} // anonymous namespace + + /* CRT-250 */ GAME( 1987, americna, 0, crt250, americna, meritm_state, empty_init, ROT0, "Merit", "Americana (9131-01)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1987, americnaa, americna, crt250, americna, meritm_state, empty_init, ROT0, "Merit", "Americana (9131-00)", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/merit/meritsdx.cpp b/src/mame/merit/meritsdx.cpp index 5433a5c2a4d..1aa2083a562 100644 --- a/src/mame/merit/meritsdx.cpp +++ b/src/mame/merit/meritsdx.cpp @@ -25,6 +25,8 @@ #include "speaker.h" +namespace { + class meritsdx_state : public driver_device { public: @@ -80,5 +82,7 @@ ROM_START(scrpndx) ROM_LOAD( "sc_3987_pc104_palce22v10q-25.u88", 0x2dd, 0x2dd, CRC(460aea86) SHA1(8ffbd42bfc90e356db7d618b376fab7fe761e216) ) ROM_END +} // anonymous namespace + GAME(1996, scrpndx, 0, scrpndx, scrpndx, meritsdx_state, empty_init, ROT0, "Merit", "Scorpion DX", MACHINE_IS_SKELETON_MECHANICAL) // OCT 15 1996 -- ASM 15:30 diff --git a/src/mame/merit/mgames.cpp b/src/mame/merit/mgames.cpp index dddf610f2a5..ea65c22abfe 100644 --- a/src/mame/merit/mgames.cpp +++ b/src/mame/merit/mgames.cpp @@ -224,6 +224,8 @@ #include "mgames.lh" +namespace { + class mgames_state : public driver_device { public: @@ -684,6 +686,8 @@ ROM_START( mgames ) ROM_LOAD( "u65_cgm3_mk2716j.bin", 0x1800, 0x0800, CRC(d61ae9d1) SHA1(219123518999fc925397db4f442ac444dfddffbe) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/merit/mtouchxl.cpp b/src/mame/merit/mtouchxl.cpp index 7a155c77c51..07388dda653 100644 --- a/src/mame/merit/mtouchxl.cpp +++ b/src/mame/merit/mtouchxl.cpp @@ -50,6 +50,9 @@ #include "sound/ad1848.h" #include "speaker.h" + +namespace { + class mtxl_state : public driver_device { public: @@ -492,6 +495,9 @@ ROM_START( mtchxlti ) DISK_IMAGE_READONLY("r00", 0, SHA1(8e9a2f9e670f02139cee11b7e8f758639d8b2838)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/merit/pubtimed.cpp b/src/mame/merit/pubtimed.cpp index 9b30bf4540b..fc8bedaa7f3 100644 --- a/src/mame/merit/pubtimed.cpp +++ b/src/mame/merit/pubtimed.cpp @@ -11,6 +11,9 @@ #include "sound/dac.h" #include "speaker.h" + +namespace { + class pubtimed_state : public driver_device { public: @@ -65,4 +68,7 @@ ROM_START(pubtimed) ROM_LOAD("sc3922_pal20l10.u11", 0x000, 0x117, NO_DUMP) ROM_END +} // anonymous namespace + + GAME(1987, pubtimed, 0, pubtimed, pubtimed, pubtimed_state, empty_init, ROT0, "Merit-Nomac Industries", "Pub Time Darts", MACHINE_NOT_WORKING | MACHINE_MECHANICAL) diff --git a/src/mame/metro/rabbit.cpp b/src/mame/metro/rabbit.cpp index 794b68bcc2c..01fc06afafc 100644 --- a/src/mame/metro/rabbit.cpp +++ b/src/mame/metro/rabbit.cpp @@ -89,6 +89,8 @@ Custom: Imagetek I5000 (2ch video & 2ch sound) #include "tilemap.h" +namespace { + class rabbit_state : public driver_device { public: @@ -1084,6 +1086,9 @@ ROM_START( rabbitjt ) ROM_LOAD( "epm7032.u1", 0x0000, 0x0798, CRC(bb1c930e) SHA1(7513ed6a0d797276dab1e3446fe346a9c340e69d) ) // unprotected ROM_END +} // anonymous namespace + + GAME( 1997, rabbit, 0, rabbit, rabbit, rabbit_state, empty_init, ROT0, "Aorn / Electronic Arts", "Rabbit (Asia 3/6)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // For use in Japan notice, English text, (C) 1997 GAME( 1996, rabbita, rabbit, rabbit, rabbit, rabbit_state, empty_init, ROT0, "Aorn / Electronic Arts", "Rabbit (Asia 1/28?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // For use in Japan notice, English text, (C) 1996 GAME( 1997, rabbitj, rabbit, rabbit, rabbit, rabbit_state, empty_init, ROT0, "Aorn / Electronic Arts", "Rabbit (Japan 3/6?)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // For use in Japan notice, Japanese text, (C) 1997 diff --git a/src/mame/metro/tmmjprd.cpp b/src/mame/metro/tmmjprd.cpp index a92250d51cc..8b5c44f1c47 100644 --- a/src/mame/metro/tmmjprd.cpp +++ b/src/mame/metro/tmmjprd.cpp @@ -38,6 +38,8 @@ #include "layout/generic.h" +namespace { + #define EMULATE_BLITTER 0 // FIXME: code is incomplete class tmmjprd_state : public driver_device @@ -845,6 +847,8 @@ ROM_START( tmpdoki ) ROM_LOAD( "21.bin", 0x0000000, 0x400000, CRC(bb5fa8da) SHA1(620e609b3e2524d06d58844625f186fd4682205f)) ROM_END +} // anonymous namespace + GAME( 1997, tmmjprd, 0, tmmjprd, tmmjprd, tmmjprd_state, empty_init, ROT0, "Media / Sonnet", "Tokimeki Mahjong Paradise - Dear My Love", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1998, tmpdoki, tmmjprd, tmpdoki, tmmjprd, tmmjprd_state, empty_init, ROT0, "Media / Sonnet", "Tokimeki Mahjong Paradise - Doki Doki Hen", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // missing gfx due to wrong roms? diff --git a/src/mame/mg1/kbd.h b/src/mame/mg1/kbd.h index 7cb5128a2ba..85d111ba092 100644 --- a/src/mame/mg1/kbd.h +++ b/src/mame/mg1/kbd.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Patrick Mackinlay -#ifndef MAME_MACHINE_MG1_KBD_H -#define MAME_MACHINE_MG1_KBD_H +#ifndef MAME_MG1_KBD_H +#define MAME_MG1_KBD_H #pragma once @@ -36,4 +36,4 @@ private: DECLARE_DEVICE_TYPE(MG1_KBD, mg1_kbd_device) -#endif // MAME_MACHINE_MG1_KBD_H +#endif // MAME_MG1_KBD_H diff --git a/src/mame/microsoft/mct_adr.h b/src/mame/microsoft/mct_adr.h index 4034414a8f7..1fc8bd2cb33 100644 --- a/src/mame/microsoft/mct_adr.h +++ b/src/mame/microsoft/mct_adr.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Patrick Mackinlay -#ifndef MAME_MACHINE_MCT_ADR_H -#define MAME_MACHINE_MCT_ADR_H +#ifndef MAME_MICROSOFT_MCT_ADR_H +#define MAME_MICROSOFT_MCT_ADR_H #pragma once @@ -161,4 +161,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(MCT_ADR, mct_adr_device) -#endif // MAME_MACHINE_MCT_ADR_H +#endif // MAME_MICROSOFT_MCT_ADR_H diff --git a/src/mame/microsoft/xbox.cpp b/src/mame/microsoft/xbox.cpp index 68bb27b9b50..d1e0e172907 100644 --- a/src/mame/microsoft/xbox.cpp +++ b/src/mame/microsoft/xbox.cpp @@ -22,6 +22,8 @@ #include "bitmap.h" +namespace { + #define CPU_DIV 64 class xbox_state : public xbox_base_state @@ -213,5 +215,7 @@ ROM_START( xbox ) ROM_LOAD( "5838_256k.bin", 0x0C0000, 0x040000, CRC(5be2413d) SHA1(b9489e883c650b5e5fe2f83a32237dbf74f0e9f1) ) ROM_END +} // anonymous namespace + CONS( 2001, xbox, 0, 0, xbox, xbox, xbox_state, empty_init, "Microsoft", "XBOX", MACHINE_IS_SKELETON ) diff --git a/src/mame/microterm/ergo201.cpp b/src/mame/microterm/ergo201.cpp index dfe9fe5cb18..ea2772bac1c 100644 --- a/src/mame/microterm/ergo201.cpp +++ b/src/mame/microterm/ergo201.cpp @@ -33,6 +33,9 @@ #include "video/tms9927.h" #include "screen.h" + +namespace { + class ergo201_state : public driver_device { public: @@ -180,4 +183,7 @@ ROM_START(ergo201) ROM_LOAD("201.u53", 0x0000, 0x1000, CRC(907dac04) SHA1(5bae6680f1ef3f5335a223bdf403e8f3ef272430)) // MBM2732A-35 ROM_END +} // anonymous namespace + + COMP(1985, ergo201, 0, 0, ergo201, ergo201, ergo201_state, empty_init, "Micro-Term / Kurzweil Computer Products", "ERGO 201 (Special #9233)", MACHINE_IS_SKELETON) diff --git a/src/mame/microterm/microterm_f8.cpp b/src/mame/microterm/microterm_f8.cpp index 42c358703d6..efe55258893 100644 --- a/src/mame/microterm/microterm_f8.cpp +++ b/src/mame/microterm/microterm_f8.cpp @@ -17,6 +17,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class microterm_f8_state : public driver_device { public: @@ -570,6 +573,9 @@ ROM_START(act5a) ROM_LOAD("act5a_9316.u55", 0x0000, 0x2000, CRC(8f96b7c8) SHA1(652d420ab5be9412cae322cd1799f8a9e3959c44)) ROM_END +} // anonymous namespace + + //COMP(1976, act4, 0, 0, act5a, act5a, microterm_f8_state, empty_init, "Micro-Term", "ACT-IV", MACHINE_NOT_WORKING) //COMP(1978, act5, 0, 0, act5a, act5a, microterm_f8_state, empty_init, "Micro-Term", "ACT-V", MACHINE_NOT_WORKING) COMP(1980, act5a, 0, 0, act5a, act5a, microterm_f8_state, empty_init, "Micro-Term", "ACT-5A", MACHINE_NOT_WORKING) diff --git a/src/mame/midcoin/24cdjuke.cpp b/src/mame/midcoin/24cdjuke.cpp index 66d93739cb2..e52d360d0ff 100644 --- a/src/mame/midcoin/24cdjuke.cpp +++ b/src/mame/midcoin/24cdjuke.cpp @@ -58,6 +58,9 @@ http://www.tilt.it/deb/i-midcoin.html #include "machine/i8255.h" #include "24cdjuke.lh" + +namespace { + class midcoin24cdjuke_state : public driver_device { public: @@ -325,5 +328,7 @@ ROM_START( 24cdjuke ) ROM_LOAD( "m1-7611a-5.ic28", 0x000, 0x100, CRC(29b068e8) SHA1(477e2445c58b7d14c56a3ad4050eb22474d56005) ) ROM_END +} // anonymous namespace + GAME( 1988, 24cdjuke, 0, midcoin24cdjuke, midcoin24cdjuke, midcoin24cdjuke_state, empty_init, ROT0, "Midcoin", "Midcoin Juke Box 24CD", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) // what name was it sold under? name is from the PCB text diff --git a/src/mame/midcoin/wink.cpp b/src/mame/midcoin/wink.cpp index f4478db313c..ab1eee26b27 100644 --- a/src/mame/midcoin/wink.cpp +++ b/src/mame/midcoin/wink.cpp @@ -24,6 +24,8 @@ #include "tilemap.h" +namespace { + class wink_state : public driver_device { public: @@ -482,5 +484,8 @@ void wink_state::init_wink() ROM[i] += bitswap<8>(i & 0xff, 7,5,3,1,6,4,2,0); } +} // anonymous namespace + + GAME( 1985, wink, 0, wink, wink, wink_state, init_wink, ROT0, "Midcoin", "Wink (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) GAME( 1985, winka, wink, wink, wink, wink_state, init_wink, ROT0, "Midcoin", "Wink (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/midw8080/8080bw_a.h b/src/mame/midw8080/8080bw_a.h index 170c8a8aceb..ebdc7aed222 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_AUDIO_8080BW_H -#define MAME_AUDIO_8080BW_H +#ifndef MAME_MIDW8080_8080BW_H +#define MAME_MIDW8080_8080BW_H #pragma once @@ -42,4 +42,4 @@ private: DECLARE_DEVICE_TYPE(CANE_AUDIO, cane_audio_device) -#endif // MAME_AUDIO_8080BW_H +#endif // MAME_MIDW8080_8080BW_H diff --git a/src/mame/midw8080/mw8080bw_a.h b/src/mame/midw8080/mw8080bw_a.h index 371781db4ca..f7df37a5095 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_AUDIO_MW8080BW_H -#define MAME_AUDIO_MW8080BW_H +#ifndef MAME_MIDW8080_MW8080BW_H +#define MAME_MIDW8080_MW8080BW_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_AUDIO_MW8080BW_H +#endif // MAME_MIDW8080_MW8080BW_H diff --git a/src/mame/midw8080/nl_280zzzap.h b/src/mame/midw8080/nl_280zzzap.h index 02dae9596f9..7e13810e0c3 100644 --- a/src/mame/midw8080/nl_280zzzap.h +++ b/src/mame/midw8080/nl_280zzzap.h @@ -1,7 +1,7 @@ // license:CC0-1.0 // copyright-holders:Colin Douglas Howell -#ifndef MAME_AUDIO_NL_280ZZZAP_H -#define MAME_AUDIO_NL_280ZZZAP_H +#ifndef MAME_MIDW8080_NL_280ZZZAP_H +#define MAME_MIDW8080_NL_280ZZZAP_H #pragma once @@ -10,4 +10,4 @@ NETLIST_EXTERNAL(280zzzap) NETLIST_EXTERNAL(lagunar) -#endif // MAME_AUDIO_NL_280ZZZAP_H +#endif // MAME_MIDW8080_NL_280ZZZAP_H diff --git a/src/mame/midw8080/nl_gunfight.h b/src/mame/midw8080/nl_gunfight.h index b46d4b11048..d00f0a77ed8 100644 --- a/src/mame/midw8080/nl_gunfight.h +++ b/src/mame/midw8080/nl_gunfight.h @@ -1,7 +1,7 @@ // license:CC0-1.0 // copyright-holders:Colin Douglas Howell -#ifndef MAME_AUDIO_NL_GUNFIGHT_H -#define MAME_AUDIO_NL_GUNFIGHT_H +#ifndef MAME_MIDW8080_NL_GUNFIGHT_H +#define MAME_MIDW8080_NL_GUNFIGHT_H #pragma once @@ -9,4 +9,4 @@ NETLIST_EXTERNAL(gunfight) -#endif // MAME_AUDIO_NL_GUNFIGHT_H +#endif // MAME_MIDW8080_NL_GUNFIGHT_H diff --git a/src/mame/midw8080/rotaryf.cpp b/src/mame/midw8080/rotaryf.cpp index 9b2786e42a8..122f8756310 100644 --- a/src/mame/midw8080/rotaryf.cpp +++ b/src/mame/midw8080/rotaryf.cpp @@ -26,6 +26,8 @@ driver by Barry Rodewald #include "speaker.h" +namespace { + class rotaryf_state : public driver_device { public: @@ -312,5 +314,7 @@ ROM_START( rotaryf ) ROM_LOAD( "krf-6.bin", 0x1400, 0x0400, CRC(e28b3713) SHA1(428f73891125f80c722357f1029b18fa9416bcfd) ) ROM_END +} // anonymous namespace + GAME( 1979, rotaryf, 0, rotaryf, rotaryf, rotaryf_state, empty_init, ROT270, "Kasco", "Rotary Fighter", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/midway/csd.h b/src/mame/midway/csd.h index 4b5952b5369..2619e8b74e3 100644 --- a/src/mame/midway/csd.h +++ b/src/mame/midway/csd.h @@ -5,8 +5,8 @@ Cheap Squeak Deluxe / Artificial Artist Sound Board ***************************************************************************/ -#ifndef MAME_AUDIO_CSD_H -#define MAME_AUDIO_CSD_H +#ifndef MAME_MIDWAY_CSD_H +#define MAME_MIDWAY_CSD_H #pragma once @@ -67,4 +67,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(MIDWAY_CHEAP_SQUEAK_DELUXE, midway_cheap_squeak_deluxe_device) -#endif // MAME_AUDIO_CSD_H +#endif // MAME_MIDWAY_CSD_H diff --git a/src/mame/midway/midtunit_v.h b/src/mame/midway/midtunit_v.h index b37cb56253e..1030fad9b08 100644 --- a/src/mame/midway/midtunit_v.h +++ b/src/mame/midway/midtunit_v.h @@ -7,8 +7,8 @@ **************************************************************************/ -#ifndef MAME_VIDEO_MIDTUNIT_H -#define MAME_VIDEO_MIDTUNIT_H +#ifndef MAME_MIDWAY_MIDTUNIT_V_H +#define MAME_MIDWAY_MIDTUNIT_V_H #pragma once @@ -234,4 +234,4 @@ DECLARE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device) DECLARE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device) DECLARE_DEVICE_TYPE(MIDXUNIT_VIDEO, midxunit_video_device) -#endif // MAME_VIDEO_MIDTUNIT_H +#endif // MAME_MIDWAY_MIDTUNIT_V_H diff --git a/src/mame/midway/midway.h b/src/mame/midway/midway.h index 26cb92cde25..6d10732dd46 100644 --- a/src/mame/midway/midway.h +++ b/src/mame/midway/midway.h @@ -7,8 +7,8 @@ Functions to emulate general the various Midway sound cards. ***************************************************************************/ -#ifndef MAME_AUDIO_MIDWAY_H -#define MAME_AUDIO_MIDWAY_H +#ifndef MAME_MIDWAY_MIDWAY_H +#define MAME_MIDWAY_MIDWAY_H #pragma once @@ -205,4 +205,4 @@ private: DECLARE_WRITE_LINE_MEMBER(irq_w); }; -#endif // MAME_AUDIO_MIDWAY_H +#endif // MAME_MIDWAY_MIDWAY_H diff --git a/src/mame/midway/mw18w.cpp b/src/mame/midway/mw18w.cpp index 6accfac5bb5..ca5b0454f20 100644 --- a/src/mame/midway/mw18w.cpp +++ b/src/mame/midway/mw18w.cpp @@ -23,6 +23,8 @@ To diagnose game, turn on service mode and: #include "18w.lh" +namespace { + class mw18w_state : public driver_device { public: @@ -319,6 +321,8 @@ ROM_START( 18w2 ) ROM_LOAD( "18w_b4.rom4", 0x1800, 0x0800, CRC(e88ad6a9) SHA1(ac010aa7e0288197ff9342801522623b64dd2a47) ) ROM_END +} // anonymous namespace + GAMEL( 1979, 18w, 0, mw18w, mw18w, mw18w_state, empty_init, ROT0, "Midway", "18 Wheeler (set 1)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_18w ) GAMEL( 1979, 18w2, 18w, mw18w, mw18w, mw18w_state, empty_init, ROT0, "Midway", "18 Wheeler (set 2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_18w ) diff --git a/src/mame/midway/mwsub.cpp b/src/mame/midway/mwsub.cpp index 6c7b051d112..1da286f4ea2 100644 --- a/src/mame/midway/mwsub.cpp +++ b/src/mame/midway/mwsub.cpp @@ -18,6 +18,8 @@ TODO: #include "submar.lh" +namespace { + class submar_state : public driver_device { public: @@ -252,5 +254,7 @@ ROM_START( submar ) ROM_LOAD( "sub.a2", 0x0800, 0x0800, CRC(f5780dd0) SHA1(f775dd6f64a730a2fb6c9baf5787698434150bc5) ) ROM_END +} // anonymous namespace + GAMEL( 1979, submar, 0, submar, submar, submar_state, empty_init, ROT0, "Midway", "Submarine (Midway)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_submar ) diff --git a/src/mame/midway/nl_sspeedr.h b/src/mame/midway/nl_sspeedr.h index 771b4970619..1f9f2ee4057 100644 --- a/src/mame/midway/nl_sspeedr.h +++ b/src/mame/midway/nl_sspeedr.h @@ -1,7 +1,7 @@ // license:CC0-1.0 // copyright-holders:Colin Douglas Howell -#ifndef MAME_AUDIO_NL_SSPEEDR_H -#define MAME_AUDIO_NL_SSPEEDR_H +#ifndef MAME_MIDWAY_NL_SSPEEDR_H +#define MAME_MIDWAY_NL_SSPEEDR_H #pragma once @@ -9,4 +9,4 @@ NETLIST_EXTERNAL(sspeedr) -#endif // MAME_AUDIO_NL_SSPEEDR_H +#endif // MAME_MIDWAY_NL_SSPEEDR_H diff --git a/src/mame/midway/sente6vb.h b/src/mame/midway/sente6vb.h index ee199817360..04bc8c925f0 100644 --- a/src/mame/midway/sente6vb.h +++ b/src/mame/midway/sente6vb.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_AUDIO_SENTE6VB_H -#define MAME_AUDIO_SENTE6VB_H +#ifndef MAME_MIDWAY_SENTE6VB_H +#define MAME_MIDWAY_SENTE6VB_H #pragma once @@ -81,4 +81,4 @@ private: DECLARE_DEVICE_TYPE(SENTE6VB, sente6vb_device) -#endif // MAME_AUDIO_SENTE6VB_H +#endif // MAME_MIDWAY_SENTE6VB_H diff --git a/src/mame/midway/tmaster.cpp b/src/mame/midway/tmaster.cpp index 3cadd56147d..460eb0da74b 100644 --- a/src/mame/midway/tmaster.cpp +++ b/src/mame/midway/tmaster.cpp @@ -103,6 +103,9 @@ Chips: #include "screen.h" #include "speaker.h" + +namespace { + /*************************************************************************** General @@ -1215,6 +1218,9 @@ ROM_START( tm8k902 ) ROM_LOAD( "9.0_touchmaster_8000_u8_sound.u8", 0x00000, 0x100000, CRC(c6070a60) SHA1(2dc20bf2217a36374b5a691133ad43f53dbe29ca) ) /* Mask rom labeled 5341-16513-03 U8 SOUND */ ROM_END +} // anonymous namespace + + GAME( 1996, tm, 0, tm, tm, tmaster_state, empty_init, ROT0, "Midway Games Inc. / CES Inc.", "Touchmaster (v3.00 Euro)", 0 ) GAME( 1996, tmdo, tm, tm, tm, tmaster_state, empty_init, ROT0, "Midway Games Inc. / CES Inc.", "Touchmaster (v2.2-01 Standard)", 0 ) GAME( 1996, tm2k, 0, tm, tm2k, tmaster_state, empty_init, ROT0, "Midway Games Inc.", "Touchmaster 2000 Plus (v4.63 Standard)", 0 ) diff --git a/src/mame/midway/wmg.cpp b/src/mame/midway/wmg.cpp index dfe2a74c48b..5b303260e5d 100644 --- a/src/mame/midway/wmg.cpp +++ b/src/mame/midway/wmg.cpp @@ -78,6 +78,8 @@ of save-state is also needed. #include "speaker.h" +namespace { + #define MASTER_CLOCK (XTAL(12'000'000)) #define SOUND_CLOCK (XTAL(3'579'545)) @@ -586,6 +588,8 @@ ROM_START( wmg ) ROM_LOAD( "decoder.6", 0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) ) ROM_END +} // anonymous namespace + /******************************************************* * diff --git a/src/mame/midway/zwackery.cpp b/src/mame/midway/zwackery.cpp index ec194c18532..d3c8ca6c844 100644 --- a/src/mame/midway/zwackery.cpp +++ b/src/mame/midway/zwackery.cpp @@ -31,6 +31,8 @@ #include "tilemap.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -590,6 +592,8 @@ ROM_START( zwackery ) ROM_LOAD( "pal.5j", 0x000b, 0x00001, NO_DUMP ) // BGBDCD PAL ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/mips/mips_rambo.h b/src/mame/mips/mips_rambo.h index 540b5d80391..783689716c6 100644 --- a/src/mame/mips/mips_rambo.h +++ b/src/mame/mips/mips_rambo.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Patrick Mackinlay -#ifndef MAME_MACHINE_MIPS_RAMBO_H -#define MAME_MACHINE_MIPS_RAMBO_H +#ifndef MAME_MIPS_MIPS_RAMBO_H +#define MAME_MIPS_MIPS_RAMBO_H #pragma once @@ -144,4 +144,4 @@ private: DECLARE_DEVICE_TYPE(MIPS_RAMBO, mips_rambo_device) -#endif // MAME_MACHINE_MIPS_RAMBO_H +#endif // MAME_MIPS_MIPS_RAMBO_H diff --git a/src/mame/misc/5clown.cpp b/src/mame/misc/5clown.cpp index e0bb680ea8c..b4cd138628a 100644 --- a/src/mame/misc/5clown.cpp +++ b/src/mame/misc/5clown.cpp @@ -465,6 +465,8 @@ #include "speaker.h" +namespace { + #define MASTER_CLOCK XTAL(10'000'000) @@ -1215,6 +1217,8 @@ void _5clown_state::init_fclown() } } +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/ace_sp_reelctrl.h b/src/mame/misc/ace_sp_reelctrl.h index 949e4755382..b6c6490aba8 100644 --- a/src/mame/misc/ace_sp_reelctrl.h +++ b/src/mame/misc/ace_sp_reelctrl.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_ACE_SP_REELCTRL_H -#define MAME_MACHINE_ACE_SP_REELCTRL_H +#ifndef MAME_MISC_ACE_SP_REELCTRL_H +#define MAME_MISC_ACE_SP_REELCTRL_H #pragma once @@ -50,5 +50,5 @@ DECLARE_DEVICE_TYPE(ACE_SP_REELCTRL, ace_sp_reelctrl_device) DECLARE_DEVICE_TYPE(ACE_SP_REELCTRL_PCP, ace_sp_reelctrl_pcp_device) -#endif // #define MAME_MACHINE_ACE_SP_REELCTRL_H +#endif // #define MAME_MISC_ACE_SP_REELCTRL_H diff --git a/src/mame/misc/acefruit.cpp b/src/mame/misc/acefruit.cpp index a7a9829d3d1..c8461635144 100644 --- a/src/mame/misc/acefruit.cpp +++ b/src/mame/misc/acefruit.cpp @@ -20,6 +20,8 @@ Inputs and Dip Switches by Stephh #include "sidewndr.lh" +namespace { + class acefruit_state : public driver_device { public: @@ -746,6 +748,8 @@ ROM_START( acefruit ) ROM_LOAD( "16-1-101.b11", 0x0200, 0x0100, NO_DUMP ) ROM_END +} // anonymous namespace + GAMEL( 1981?, sidewndr, 0, acefruit, sidewndr, acefruit_state, init_sidewndr, ROT270, "ACE", "Sidewinder", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_sidewndr ) GAMEL( 1981?, spellbnd, 0, acefruit, spellbnd, acefruit_state, empty_init, ROT270, "ACE", "Spellbound", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND, layout_sidewndr ) diff --git a/src/mame/misc/aces1.cpp b/src/mame/misc/aces1.cpp index 8a53834bf40..abe31ca731c 100644 --- a/src/mame/misc/aces1.cpp +++ b/src/mame/misc/aces1.cpp @@ -50,6 +50,7 @@ JPM style Reel MCU? Certainly reel data seems to be muxed together in a weird wa #include "ac1taklv.lh" +namespace { class aces1_state : public driver_device { @@ -861,6 +862,9 @@ void aces1_state::init_aces1() { } +} // anonymous namespace + + GAMEL( 199?, ac1clbmn, 0, aces1, aces1, aces1_state, init_aces1, ROT0, "Ace", "Club Money (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1clbmn ) GAMEL( 199?, ac1gogld, 0, aces1, aces1, aces1_state, init_aces1, ROT0, "Ace", "Go For Gold (Ace) (ACESYS1) (set 1)", MACHINE_IS_SKELETON_MECHANICAL, layout_ac1gogld ) GAME( 199?, ac1hotpf, 0, aces1, aces1, aces1_state, init_aces1, ROT0, "Ace", "Hot Profit (Ace) (ACESYS1)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/acesp.cpp b/src/mame/misc/acesp.cpp index 8bf5efec72c..17317aba7ed 100644 --- a/src/mame/misc/acesp.cpp +++ b/src/mame/misc/acesp.cpp @@ -32,6 +32,9 @@ #include "ace_sp_dmd.lh" + +namespace { + class ace_sp_state : public driver_device { public: @@ -3971,6 +3974,9 @@ void ace_sp_state::init_ace_sp() { } +} // anonymous namespace + + GAME( 199?, sp_cbowl, 0, ace_sp, ace_sp, ace_sp_state, init_ace_sp, ROT0, "Ace", "Cash Bowl (Ace) (sp.ACE) (set 1)",MACHINE_IS_SKELETON_MECHANICAL ) GAME( 199?, sp_cbowla, sp_cbowl, ace_sp, ace_sp, ace_sp_state, init_ace_sp, ROT0, "Ace", "Cash Bowl (Ace) (sp.ACE) (set 2)",MACHINE_IS_SKELETON_MECHANICAL ) GAME( 199?, sp_cbowlb, sp_cbowl, ace_sp, ace_sp, ace_sp_state, init_ace_sp, ROT0, "Ace", "Cash Bowl (Ace) (sp.ACE) (set 3)",MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/age_candy.cpp b/src/mame/misc/age_candy.cpp index 49c55908dd8..d275661af5a 100644 --- a/src/mame/misc/age_candy.cpp +++ b/src/mame/misc/age_candy.cpp @@ -17,6 +17,8 @@ Device is a 27c256 location U3 #include "speaker.h" +namespace { + class age_candy_state : public driver_device { public: @@ -69,4 +71,7 @@ ROM_START( age_cand ) ROM_LOAD( "agecandy.u3", 0x0000, 0x8000, CRC(c8cfc666) SHA1(a1c475ae105746e984741af0723a712f09d7b847) ) ROM_END +} // anonymous namespace + + GAME( 19??, age_cand, 0, age_candy, age_candy, age_candy_state, empty_init, ROT0, "Advanced Games & Engineering", "Candy Crane (AGE)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/alinvade.cpp b/src/mame/misc/alinvade.cpp index 2a5fee7bdad..0a53094ff31 100644 --- a/src/mame/misc/alinvade.cpp +++ b/src/mame/misc/alinvade.cpp @@ -28,6 +28,8 @@ #include "alinvade.lh" +namespace { + class alinvade_state : public driver_device { public: @@ -240,5 +242,7 @@ ROM_START( alinvade ) ROM_FILL( 0x0f, 0x01, 0x60 ) // rts for whole area, interrupt code jumps to various addresses here, check note on top. ROM_END +} // anonymous namespace + GAMEL( 198?, alinvade, 0, alinvade, alinvade, alinvade_state, empty_init, ROT90, "Forbes?", "Alien Invaders", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_alinvade ) diff --git a/src/mame/misc/amaticmg.cpp b/src/mame/misc/amaticmg.cpp index fd881d421f8..d16fa10fb7c 100644 --- a/src/mame/misc/amaticmg.cpp +++ b/src/mame/misc/amaticmg.cpp @@ -424,6 +424,8 @@ #include "suprstar.lh" +namespace { + #define MASTER_CLOCK XTAL(16'000'000) #define CPU_CLOCK MASTER_CLOCK/4 /* guess */ #define SND_CLOCK MASTER_CLOCK/4 /* guess */ @@ -1297,6 +1299,8 @@ void amaticmg_state::init_ama8000_3_o() decrypt(0x56e, 0xa7); } +} // anonymous namespace + /************************************ * Game Drivers * diff --git a/src/mame/misc/amerihok.cpp b/src/mame/misc/amerihok.cpp index cf3bd5d6be5..c8bca0a11f7 100644 --- a/src/mame/misc/amerihok.cpp +++ b/src/mame/misc/amerihok.cpp @@ -25,6 +25,8 @@ Processor is a ROMless MCU from the Z8 family. #include "amerihok.lh" +namespace { + class amerihok_state : public driver_device { public: @@ -185,4 +187,7 @@ ROM_START( amerihok ) ROM_LOAD( "airh-u10", 0x80000, 0x40000, CRC(71ee6421) SHA1(10131fc7c009158308c4a8bb2b037101622c07a1) ) ROM_END +} // anonymous namespace + + GAMEL( 199?, amerihok, 0, amerihok, amerihok, amerihok_state, empty_init, ROT0, "Ameri", "Ameri-Hockey", MACHINE_NOT_WORKING | MACHINE_MECHANICAL, layout_amerihok ) diff --git a/src/mame/misc/amusco.cpp b/src/mame/misc/amusco.cpp index 2b6ac3d2cf1..de05eab61c6 100644 --- a/src/mame/misc/amusco.cpp +++ b/src/mame/misc/amusco.cpp @@ -88,6 +88,8 @@ #include "amusco.lh" +namespace { + #define MASTER_CLOCK 22.1184_MHz_XTAL /* confirmed */ #define SECOND_CLOCK 15_MHz_XTAL /* confirmed */ @@ -646,6 +648,9 @@ ROM_START( draw88pkr ) ROM_LOAD( "u37.bin", 0x8000, 0x4000, CRC(6e23b9f2) SHA1(6916828d84d1ecb44dc454e6786f97801a8550c7) ) ROM_END +} // anonymous namespace + + /************************* * Game Drivers * *************************/ diff --git a/src/mame/misc/arachnid.cpp b/src/mame/misc/arachnid.cpp index f2b65143876..fe7f475f329 100644 --- a/src/mame/misc/arachnid.cpp +++ b/src/mame/misc/arachnid.cpp @@ -145,6 +145,9 @@ THE OFF POSIION UNLESS THE COINAGES #include "video/tms9928a.h" #include "speaker.h" + +namespace { + #define SCREEN_TAG "screen" #define M6809_TAG "u3" #define TMS9118_TAG "u11" @@ -545,6 +548,9 @@ ROM_START( arac6spa ) ROM_LOAD( "1.u15", 0x0000, 0x8000, CRC(397e890e) SHA1(5b532b046f36dcfbd7118bd5a0fab3436b0b8dc1) ) ROM_END +} // anonymous namespace + + /*************************************************************************** SYSTEM DRIVERS ***************************************************************************/ diff --git a/src/mame/misc/astrafr.cpp b/src/mame/misc/astrafr.cpp index e170feac5f3..410c42437ad 100644 --- a/src/mame/misc/astrafr.cpp +++ b/src/mame/misc/astrafr.cpp @@ -16,6 +16,7 @@ Platform also used by Lowen? (at least some of their sets use the same address l #include "machine/68340.h" +namespace { class astrafr_state : public driver_device { @@ -2164,6 +2165,9 @@ void astrafr_state::init_astradec_sml_dual() astra_addresslines( (uint16_t*)memregion( "slavecpu" )->base(), memregion( "slavecpu" )->bytes(), 1 ); } +} // anonymous namespace + + // Single games? GAME( 200?, as_srb, 0, astra_single, astrafr, astrafr_state, empty_init, ROT0, "Astra", "Super Ring a Bell (Astra, V004)" , MACHINE_IS_SKELETON_MECHANICAL) GAME( 200?, as_srba, as_srb, astra_single, astrafr, astrafr_state, empty_init, ROT0, "Astra", "Super Ring a Bell (Astra, V100)" , MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/misc/astropc.cpp b/src/mame/misc/astropc.cpp index 252333f2169..58f98da8702 100644 --- a/src/mame/misc/astropc.cpp +++ b/src/mame/misc/astropc.cpp @@ -31,6 +31,9 @@ Note: It's "Hawaii" the same game as "Treasure Hunting"? #include "emu.h" #include "cpu/i386/i386.h" + +namespace { + class astropc_state : public driver_device { public: @@ -185,6 +188,9 @@ void astropc_state::init_astropc() { } +} // anonymous namespace + + GAME( 2002, blackbd, 0, astropc, astropc, astropc_state, init_astropc, ROT0, "Astro", "Black Beard (Russia, set 1)", MACHINE_IS_SKELETON ) GAME( 2002, blackbda, blackbd, astropc, astropc, astropc_state, init_astropc, ROT0, "Astro", "Black Beard (Russia, set 2)", MACHINE_IS_SKELETON ) GAME( 2002, blackbdb, blackbd, astropc, astropc, astropc_state, init_astropc, ROT0, "Astro", "Black Beard (Russia, set 3)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/atronic.cpp b/src/mame/misc/atronic.cpp index 19fe4c15a7e..6d374fb270d 100644 --- a/src/mame/misc/atronic.cpp +++ b/src/mame/misc/atronic.cpp @@ -324,6 +324,9 @@ Markings bottom: 6 470.5020 00.07 #include "screen.h" #include "video/ramdac.h" + +namespace { + class atronic_state : public driver_device { public: @@ -340,7 +343,7 @@ public: void atronic(machine_config &config); private: - u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + [[maybe_unused]] u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); u8 serial_r(); void serial_w(u8 data); @@ -1329,6 +1332,7 @@ ROM_START( santam ) ROM_LOAD( "sb_u21_8m_m27c801-100f1_94cch.bin", 0x0000, 0x100000, CRC(c740b5be) SHA1(dafe80431197fe22cddd0fc295436edc37256603) ) ROM_END +} // anonymous namespace GAME( 1999, atronic, 0, atronic, atronic, atronic_state, empty_init, ROT0, "Atronic", "Atronic SetUp/Clear Chips (Russia, set 1)", MACHINE_IS_SKELETON) diff --git a/src/mame/misc/attckufo.cpp b/src/mame/misc/attckufo.cpp index 5874906e2f7..51d798e4bfa 100644 --- a/src/mame/misc/attckufo.cpp +++ b/src/mame/misc/attckufo.cpp @@ -17,6 +17,8 @@ #include "speaker.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -161,6 +163,8 @@ ROM_START( attckufo ) ROM_LOAD("8", 0x1c00, 0x0400, CRC(9ce93eb0) SHA1(68753e88db4e920446b9582b5cb713b1beec3b27)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/misc/bailey.cpp b/src/mame/misc/bailey.cpp index cfde4b01ef9..d51b759c9c2 100644 --- a/src/mame/misc/bailey.cpp +++ b/src/mame/misc/bailey.cpp @@ -18,6 +18,9 @@ #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -153,6 +156,8 @@ ROM_START( fun4a ) ROM_LOAD( "bailey1.g4", 0x0000, 0x0020, CRC(99f918d5) SHA1(74fb3a0f0f86b2900a1bd0dac77ae7e129885a1d) ) ROM_END +} // anonymous namespace + GAME( 1976, fun4, 0, bailey, 0, bailey_state, empty_init, ROT0, "Bailey International", "Fun Four (set 1) [TTL]", MACHINE_IS_SKELETON ) GAME( 1976, fun4a, fun4, bailey, 0, bailey_state, empty_init, ROT0, "Bailey International", "Fun Four (set 2) [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/beaminv.cpp b/src/mame/misc/beaminv.cpp index 3ff0fbf0dec..33344b51d95 100644 --- a/src/mame/misc/beaminv.cpp +++ b/src/mame/misc/beaminv.cpp @@ -64,6 +64,8 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "beaminv.lh" +namespace { + class beaminv_state : public driver_device { public: @@ -449,6 +451,7 @@ ROM_START( ctainv ) ROM_LOAD( "6.bin", 0x1800, 0x0400, CRC(06dcb63c) SHA1(4d5260b3785e2c215dd0b3c9f8457cf4a557a452) ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/misc/beezer.cpp b/src/mame/misc/beezer.cpp index 8b282da9d29..e757ba05ce2 100644 --- a/src/mame/misc/beezer.cpp +++ b/src/mame/misc/beezer.cpp @@ -39,6 +39,8 @@ #include "speaker.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -592,6 +594,8 @@ ROM_START( beezer1 ) ROM_LOAD("e1.cpu", 0x100, 0x100, CRC(3c775c5e) SHA1(ac86f45938c0c9d5fec1245bf86718442baf445b)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/misc/belatra.cpp b/src/mame/misc/belatra.cpp index 39b3855f32c..3c1546b312d 100644 --- a/src/mame/misc/belatra.cpp +++ b/src/mame/misc/belatra.cpp @@ -46,6 +46,9 @@ Viking?s Fun Mill #include "cpu/arm7/arm7core.h" #include "speaker.h" + +namespace { + class belatra_state : public driver_device { public: @@ -125,6 +128,8 @@ ROM_START( ldrinka ) ROM_LOAD( "zld-0012534-2belatra.bin", 0x200000, 0x200000, CRC(e3e74597) SHA1(0157dbf806eb2e5f0c9b9e8ed68d38748a713a6e) ) ROM_END +} // anonymous namespace + GAME( 2004, fairyl2, 0, belatra, belatra, belatra_state, empty_init, ROT0, "Belatra","Fairy Land 2 (set 1)", MACHINE_IS_SKELETON ) GAME( 2004, fairyl2a, fairyl2, belatra, belatra, belatra_state, empty_init, ROT0, "Belatra","Fairy Land 2 (set 2)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/bingoman.cpp b/src/mame/misc/bingoman.cpp index 29f891d0701..632162ad27f 100644 --- a/src/mame/misc/bingoman.cpp +++ b/src/mame/misc/bingoman.cpp @@ -247,6 +247,8 @@ #include "speaker.h" +namespace { + class bingoman_state : public driver_device { public: @@ -465,6 +467,8 @@ ROM_START( bingomana ) ROM_LOAD( "103u1301_atf16v8bql.u13", 0x9000, 0x0892, CRC(e8b65072) SHA1(b2f7d70ee228c28a19c2594fc3631b8afd4a0f5e) ) ROM_END +} // anonymous namespace + /*************************************************************************** diff --git a/src/mame/misc/bingor.cpp b/src/mame/misc/bingor.cpp index 1d20658a6e3..00d497716ac 100644 --- a/src/mame/misc/bingor.cpp +++ b/src/mame/misc/bingor.cpp @@ -519,6 +519,8 @@ #include "speaker.h" +namespace { + class bingor_state : public driver_device { public: @@ -936,6 +938,8 @@ ROM_START( vip2000 ) ROM_LOAD( "24c04a.bin", 0x000, 0x200, CRC(4e231420) SHA1(24dcfc90ef9903692030be7de0f04fc9370021fd) ) ROM_END +} // anonymous namespace + // YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS GAME( 1992, bingor1, 0, bingor, bingor, bingor_state, empty_init, ROT0, "Rosenauer Electronic Austria?", "Bingo Roll / Bell Star? (set 1)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/misc/blocktax.cpp b/src/mame/misc/blocktax.cpp index 1b43e664755..cd9b3a001f3 100644 --- a/src/mame/misc/blocktax.cpp +++ b/src/mame/misc/blocktax.cpp @@ -37,6 +37,8 @@ there is no code to emulate tho as it is all inside the MCU. #include "speaker.h" +namespace { + class blocktax_state : public driver_device { public: @@ -52,7 +54,7 @@ protected: private: uint32_t screen_update_blocktax(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void blocktax_map(address_map &map); + [[maybe_unused]] void blocktax_map(address_map &map); required_device m_maincpu; }; @@ -107,5 +109,7 @@ ROM_START( blocktax ) ROM_LOAD( "3_ht27c020.bin", 0x40000, 0x40000, CRC(ea1c66a2) SHA1(d10b9ca56d140235b6f31ab939613784f232caeb) ) ROM_END +} // anonymous namespace + GAME( 2002, blocktax, 0, blocktax, blocktax, blocktax_state, empty_init, ROT0, "TAX / Game Revival", "Blockout (TAX)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/bntyhunt.cpp b/src/mame/misc/bntyhunt.cpp index ae0b1a2de56..3cf788c556d 100644 --- a/src/mame/misc/bntyhunt.cpp +++ b/src/mame/misc/bntyhunt.cpp @@ -38,6 +38,8 @@ Running this in pcipc will successfully boot a custom Korean Windows 98SE (no Mi #include "machine/pci.h" +namespace { + class bntyhunt_state : public driver_device { public: @@ -80,5 +82,7 @@ ROM_START(bntyhunt) DISK_IMAGE( "bntyhunt", 0, SHA1(e50937d14d5c6adfb5e0012db5a7df090eebc2e1) ) ROM_END +} // anonymous namespace + GAME( 2002?, bntyhunt, 0, bntyhunt, bntyhunt, bntyhunt_state, empty_init, ROT0, "GC-Tech Co., LTD", "Bounty Hunter (GC-Tech Co., LTD)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/buster.cpp b/src/mame/misc/buster.cpp index b0eed8d3c7c..9b40a8bea82 100644 --- a/src/mame/misc/buster.cpp +++ b/src/mame/misc/buster.cpp @@ -22,6 +22,8 @@ TODO: #include "speaker.h" +namespace { + class buster_state : public driver_device { public: @@ -365,5 +367,7 @@ ROM_START( buster ) ROM_LOAD( "b-blu.bin", 0x04000, 0x2000, CRC(3b6bfe7b) SHA1(1888149a2ef85db59845d7e6e9227449f80c8f22) ) ROM_END +} // anonymous namespace + GAME( 1982, buster, 0, buster, buster, buster_state, empty_init, ROT0, "Marian Electronics Ltd.", "Buster", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/misc/cardline.cpp b/src/mame/misc/cardline.cpp index ad413e02609..4d7f15aabc1 100644 --- a/src/mame/misc/cardline.cpp +++ b/src/mame/misc/cardline.cpp @@ -31,6 +31,8 @@ #include "cardline.lh" +namespace { + #define MASTER_CLOCK XTAL(12'000'000) class cardline_state : public driver_device @@ -380,4 +382,7 @@ ROM_START( cardline ) ROM_END +} // anonymous namespace + + GAME( 199?, cardline, 0, cardline, cardline, cardline_state, empty_init, ROT0, "Veltmeijer", "Card Line" , MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/misc/carrera.cpp b/src/mame/misc/carrera.cpp index 3d2fba4526d..b1e94452804 100644 --- a/src/mame/misc/carrera.cpp +++ b/src/mame/misc/carrera.cpp @@ -53,6 +53,9 @@ TODO: #include "screen.h" #include "speaker.h" + +namespace { + #define MASTER_CLOCK XTAL(22'118'400) @@ -376,5 +379,8 @@ ROM_START( bsebman ) ROM_LOAD( "am27s19.ic39", 0x00, 0x20, CRC(af16359f) SHA1(1ff5c9d7807e52be09c0ded56fb68a47e41b3fcf) ) ROM_END +} // anonymous namespace + + GAME( 19??, carrera, 0, carrera, carrera, carrera_state, empty_init, ROT0, "BS Electronics", "Carrera (Version 6.7)", MACHINE_SUPPORTS_SAVE ) GAME( 19??, bsebman, carrera, carrera, carrera, carrera_state, empty_init, ROT0, "BS Electronics", "Bomberman (Version 6.6)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/castle.cpp b/src/mame/misc/castle.cpp index 7a10dfd8331..3a7469f4615 100644 --- a/src/mame/misc/castle.cpp +++ b/src/mame/misc/castle.cpp @@ -48,6 +48,9 @@ #include "cpu/m6800/m6801.h" #include "machine/6821pia.h" + +namespace { + class castle_state : public driver_device { public: @@ -126,6 +129,8 @@ ROM_START( castfpt ) ROM_LOAD( "fp1.bin", 0x8000, 0x008000, CRC(fb458850) SHA1(71343099c7b83db1a4e093f546e5061b9761aa3a) ) ROM_END +} // anonymous namespace + // 4.00 JACKPOT. VERSION 1 (for revision E CPU) Written by and copyright of David John Powell - 25th February 1987 GAME( 1987, castrev, 0, castle_V1rvE, castrev, castle_state, empty_init, ROT0, "Castle","Revolution (Castle) (MACH2000 V1rvE)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/cavepc.cpp b/src/mame/misc/cavepc.cpp index 597e5f3e46c..23bff811146 100644 --- a/src/mame/misc/cavepc.cpp +++ b/src/mame/misc/cavepc.cpp @@ -58,6 +58,8 @@ TODO: #include "machine/pci.h" +namespace { + class cavepc_state : public driver_device { public: @@ -147,6 +149,8 @@ ROM_START(deathsm2) DISK_IMAGE( "cave_ds2_usb", 0, SHA1(b601985c7f6e6a20b0b7999167b7ccdd12ab80d0) ) ROM_END +} // anonymous namespace + /*****************************************************************************/ diff --git a/src/mame/misc/cb2001.cpp b/src/mame/misc/cb2001.cpp index f512925b11a..2b1eaae7519 100644 --- a/src/mame/misc/cb2001.cpp +++ b/src/mame/misc/cb2001.cpp @@ -52,6 +52,8 @@ this seems more like 8-bit hardware, maybe it should be v25, not v35... #include "tilemap.h" +namespace { + class cb2001_state : public driver_device { public: @@ -886,5 +888,8 @@ ROM_START( scherrym ) ROM_LOAD( "n82s135-2.bin", 0x200, 0x100, CRC(a19821db) SHA1(62dda90dd67dfbc0b96f161f1f2b7a46a5805eae) ) ROM_END +} // anonymous namespace + + GAME( 2001, cb2001, 0, cb2001, cb2001, cb2001_state, empty_init, ROT0, "Dyna", "Cherry Bonus 2001", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) GAME( 2001, scherrym, 0, cb2001, cb2001, cb2001_state, empty_init, ROT0, "Dyna", "Super Cherry Master", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // 2001 version? (we have bootlegs running on z80 hw of a 1996 version) diff --git a/src/mame/misc/chance32.cpp b/src/mame/misc/chance32.cpp index b49445876b5..19eaf5b1806 100644 --- a/src/mame/misc/chance32.cpp +++ b/src/mame/misc/chance32.cpp @@ -30,6 +30,8 @@ #include "chance32.lh" +namespace { + class chance32_state : public driver_device { public: @@ -525,6 +527,8 @@ ROM_START( chance32 ) ROM_LOAD( "gal16v8a.u24.jed.bin", 0x0000, 0x117, NO_DUMP ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/changyu.cpp b/src/mame/misc/changyu.cpp index 114267d0558..6f6fc70c069 100644 --- a/src/mame/misc/changyu.cpp +++ b/src/mame/misc/changyu.cpp @@ -52,6 +52,9 @@ main PCB (marked 9101): #include "sound/ymopl.h" #include "video/mc6845.h" + +namespace { + class changyu_state : public driver_device { public: @@ -243,5 +246,8 @@ ROM_START( changyu2 ) // 999 ROM999 II BY HUANGYEH string ROM_LOAD( "9b", 0x200, 0x104, NO_DUMP ) ROM_END +} // anonymous namespace + + GAME( 1989, changyu, 0, changyu, changyu, changyu_state, empty_init, ROT0, "Chang Yu Electronic", "unknown Chang Yu Electronic gambling game 1", MACHINE_IS_SKELETON ) // Wing Co. in GFX1, year taken from start of maincpu ROM GAME( 19??, changyu2, 0, changyu2, changyu, changyu_state, empty_init, ROT0, "Chang Yu Electronic", "unknown Chang Yu Electronic gambling game 2", MACHINE_IS_SKELETON ) // Wing Co. in GFX1 diff --git a/src/mame/misc/chicago.cpp b/src/mame/misc/chicago.cpp index 4982583cfec..333c86ed065 100644 --- a/src/mame/misc/chicago.cpp +++ b/src/mame/misc/chicago.cpp @@ -24,6 +24,9 @@ #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -141,5 +144,7 @@ ROM_START( dmodrbcc ) ROM_LOAD( "cdi.r1", 0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) ) ROM_END +} // anonymous namespace + GAME( 1976, dmodrbcc, 0, chicago, 0, chicago_state, empty_init, ROT0, "Chicago Coin", "Demolition Derby [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/chsuper.cpp b/src/mame/misc/chsuper.cpp index 5ebe8cef7bc..68efab16983 100644 --- a/src/mame/misc/chsuper.cpp +++ b/src/mame/misc/chsuper.cpp @@ -32,6 +32,8 @@ #include "chsuper.lh" +namespace { + class chsuper_state : public driver_device { public: @@ -542,6 +544,8 @@ void chsuper_state::init_chmpnum() memcpy(rom,buffer.get(),0x100000); } +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/clowndwn.cpp b/src/mame/misc/clowndwn.cpp index 1112277744c..15560a06e5c 100644 --- a/src/mame/misc/clowndwn.cpp +++ b/src/mame/misc/clowndwn.cpp @@ -15,6 +15,8 @@ can't find any info on this? #include "machine/6821pia.h" +namespace { + class clowndwn_state : public driver_device { public: @@ -83,4 +85,7 @@ ROM_START( clowndwn ) ROM_LOAD( "clwnroll.z9", 0x1000, 0x1000, CRC(aeef885e) SHA1(bc6805b638625a347e1288a927ce30e030afe9e3) ) ROM_END +} // anonymous namespace + + GAME( 1987, clowndwn, 0, clowndwn, clowndwn, clowndwn_state, empty_init, ROT0, "Elwood Electronics", "Clown Roll Down (Elwood)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/clpoker.cpp b/src/mame/misc/clpoker.cpp index d3ff1a63ad3..e9a28c73cec 100644 --- a/src/mame/misc/clpoker.cpp +++ b/src/mame/misc/clpoker.cpp @@ -40,6 +40,8 @@ There also are unpopulated locations that might fit a YM3812 and YM3014. #include "tilemap.h" +namespace { + class clpoker_state : public driver_device { public: @@ -310,5 +312,7 @@ ROM_START( clpoker ) ROM_LOAD( "gal20v8a.pl5", 0x00, 0x157, NO_DUMP ) ROM_END +} // anonymous namespace + GAME( 1994, clpoker, 0, clpoker, clpoker, clpoker_state, empty_init, ROT0, "Chain Leisure", "Poker Genius", MACHINE_SUPPORTS_SAVE ) // Year taken from string in main CPU ROM diff --git a/src/mame/misc/cocoloco.cpp b/src/mame/misc/cocoloco.cpp index edbb7fb000e..967e70f1983 100644 --- a/src/mame/misc/cocoloco.cpp +++ b/src/mame/misc/cocoloco.cpp @@ -188,6 +188,8 @@ #include "nl_cocoloco.h" +namespace { + #define MASTER_CLOCK XTAL(20'000'000) // confirmed #define CPU_CLOCK MASTER_CLOCK / 16 // confirmed #define SND_CLOCK MASTER_CLOCK / 8 // confirmed @@ -550,6 +552,8 @@ ROM_START( cocolocob ) ROM_LOAD( "tbp18s22n.bin", 0x0000, 0x0100, CRC(3bf3ccb0) SHA1(d61d19d38045f42a9adecf295e479fee239bed48) ) // verified. ROM_END +} // anonymous namespace + /*********************************** * Game Drivers * diff --git a/src/mame/misc/coinmvga.cpp b/src/mame/misc/coinmvga.cpp index d30e64d7e43..cff65e14f18 100644 --- a/src/mame/misc/coinmvga.cpp +++ b/src/mame/misc/coinmvga.cpp @@ -226,6 +226,8 @@ #include "speaker.h" +namespace { + #define CPU_CLOCK XTAL(14'745'600) #define MACH_CLOCK XTAL(50'000'000) // 50.35 #define COM_CLOCK XTAL(20'000'000) @@ -890,6 +892,8 @@ void coinmvga_state::init_cmrltv75() { } +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/comebaby.cpp b/src/mame/misc/comebaby.cpp index 975c742b54f..d52abf7e667 100644 --- a/src/mame/misc/comebaby.cpp +++ b/src/mame/misc/comebaby.cpp @@ -191,6 +191,8 @@ TODO: #include "machine/pci.h" +namespace { + class comebaby_state : public driver_device { public: @@ -238,5 +240,7 @@ ROM_START(comebaby) DISK_IMAGE( "comebaby", 0, BAD_DUMP SHA1(ea57919319c0b6a1d4abd7822cff028855bf082f) ) ROM_END +} // anonymous namespace + GAME( 2000, comebaby, 0, comebaby, comebaby, comebaby_state, empty_init, ROT0, "ExPotato", "Come On Baby", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/cowtipping.cpp b/src/mame/misc/cowtipping.cpp index 211f6fc680b..fecd4d9fbda 100644 --- a/src/mame/misc/cowtipping.cpp +++ b/src/mame/misc/cowtipping.cpp @@ -29,6 +29,9 @@ The PIC is undumped, but on PCB the game seems to run without it, hanging when c #include "screen.h" #include "speaker.h" + +namespace { + class cowtipping_state : public driver_device { public: @@ -108,6 +111,8 @@ ROM_START( cowtippa ) ROM_LOAD( "54_pic12c508-04p.u3", 0x000, 0x09db, NO_DUMP ) ROM_END +} // anonymous namespace + GAME( 2004, cowtipp, 0, cowtipping, cowtipping, cowtipping_state, empty_init, ROT270, "Game Refuge / Team Play", "Cow Tipping - Shake Cattle & Roll (set 1)", MACHINE_IS_SKELETON ) GAME( 2004, cowtippa, cowtipp, cowtipping, cowtipping, cowtipping_state, empty_init, ROT270, "Game Refuge / Team Play", "Cow Tipping - Shake Cattle & Roll (set 2)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/crazybal.cpp b/src/mame/misc/crazybal.cpp index 4cb286f4cf3..259aec337b2 100644 --- a/src/mame/misc/crazybal.cpp +++ b/src/mame/misc/crazybal.cpp @@ -23,6 +23,9 @@ A PCB set is available for tracing. #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -121,5 +124,7 @@ ROM_START( crazybal ) ROM_LOAD( "3.12l", 0x000, 0x100, CRC(e2ca8670) SHA1(60bc4be4185c50a9afd3a28d1fb9e8f46c93764a) ) // Sn74S287N ROM_END +} // anonymous namespace + GAME( 1978, crazybal, 0, crazybal, 0, crazybal_state, empty_init, ROT0, "Electronic Games Systems", "Crazy Balls [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/cromptons.cpp b/src/mame/misc/cromptons.cpp index c446989aa0a..ef64e14cb1b 100644 --- a/src/mame/misc/cromptons.cpp +++ b/src/mame/misc/cromptons.cpp @@ -31,6 +31,9 @@ #include "machine/timekpr.h" #include "screen.h" + +namespace { + class cromptons_state : public driver_device { public: @@ -161,5 +164,7 @@ ROM_START( ffruits ) ROM_LOAD( "frntf_m48t08-100pc1.ic12", 0x0000, 0x2000, CRC(19f1c93a) SHA1(4fb01299c72e50c91af80939f8ffa8a8447f5211) ) ROM_END +} // anonymous namespace + GAME( 2000, ffruits, 0, cromptons, cromptons, cromptons_state, empty_init, ROT0, "Cromptons Leisure Machines", "Frantic Fruits", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/crospuzl.cpp b/src/mame/misc/crospuzl.cpp index 7a1419ce329..a80f0f1bf97 100644 --- a/src/mame/misc/crospuzl.cpp +++ b/src/mame/misc/crospuzl.cpp @@ -40,6 +40,9 @@ #include + +namespace { + class crospuzl_state : public driver_device { public: @@ -382,4 +385,7 @@ ROM_START( crospuzl ) ROM_COPY( "flash", 0x20000, 0x00000, 0x20000 ) ROM_END +} // anonymous namespace + + GAME( 200?, crospuzl, 0, crospuzl, crospuzl, crospuzl_state, empty_init, ROT0, "", "Cross Puzzle", MACHINE_NOT_WORKING ) diff --git a/src/mame/misc/cubeqst.cpp b/src/mame/misc/cubeqst.cpp index 495d96e640b..8e873e775b2 100644 --- a/src/mame/misc/cubeqst.cpp +++ b/src/mame/misc/cubeqst.cpp @@ -27,6 +27,9 @@ #include "sound/dac.h" #include "speaker.h" + +namespace { + class cubeqst_state : public driver_device { public: @@ -749,6 +752,9 @@ ROM_START( cubeqsta ) DISK_IMAGE_READONLY_OPTIONAL( "cubeqst", 0, SHA1(d0e24bb5d0ae424e0816110ec7d6b21189044d57) ) ROM_END +} // anonymous namespace + + /************************************* * * Game driver(s) diff --git a/src/mame/misc/cupidon.cpp b/src/mame/misc/cupidon.cpp index 4981a566d3b..1478ef7d9d9 100644 --- a/src/mame/misc/cupidon.cpp +++ b/src/mame/misc/cupidon.cpp @@ -20,6 +20,8 @@ #include "speaker.h" +namespace { + class cupidon_state : public driver_device { public: @@ -171,6 +173,9 @@ void cupidon_state::init_funnyfm() { } +} // anonymous namespace + + /* (c) date is from string in ROM, revision date is noted next to sets - Spellings are as found in ROM */ GAME( 2004, tsarevna, 0, cupidon, cupidon, cupidon_state, init_cupidon, ROT0, "Kupidon", "Tsarevna (v1.29)", MACHINE_IS_SKELETON ) // 12 Oct 2005 GAME( 2004, tsarevnaa, tsarevna, cupidon, cupidon, cupidon_state, init_cupidon, ROT0, "Kupidon", "Tsarevna (v1.31)", MACHINE_IS_SKELETON ) // 17 Jan 2007 diff --git a/src/mame/misc/cybertnk.cpp b/src/mame/misc/cybertnk.cpp index 38e1c88c101..7f8150d71d1 100644 --- a/src/mame/misc/cybertnk.cpp +++ b/src/mame/misc/cybertnk.cpp @@ -181,6 +181,8 @@ lev 7 : 0x7c : 0000 07e0 - input device clear? #include "tilemap.h" +namespace { + class cybertnk_state : public driver_device { public: @@ -974,4 +976,7 @@ void cybertnk_state::init_cybertnk() } +} // anonymous namespace + + GAME( 1988, cybertnk, 0, cybertnk, cybertnk, cybertnk_state, init_cybertnk, ROT0, "Coreland", "Cyber Tank (v1.4)", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/misc/daryde.cpp b/src/mame/misc/daryde.cpp index 977ab59b00a..618bd171b23 100644 --- a/src/mame/misc/daryde.cpp +++ b/src/mame/misc/daryde.cpp @@ -10,6 +10,9 @@ #include "cpu/z180/z180.h" #include "machine/timekpr.h" + +namespace { + class daryde_state : public driver_device { public: @@ -182,6 +185,9 @@ ROM_START(kurdart) // No NVRAM on this PCB ROM_END +} // anonymous namespace + + GAME(1995, cricket, 0, pandart, pandart, daryde_state, empty_init, ROT0, "Daryde S. L.", "Cricket", MACHINE_IS_SKELETON_MECHANICAL) GAME(1999, pandart, 0, pandart, pandart, daryde_state, empty_init, ROT0, "Daryde S. L.", "Panther Darts", MACHINE_IS_SKELETON_MECHANICAL) GAME(199?, kurdart, 0, pandart, pandart, daryde_state, empty_init, ROT0, "K7 Kursaal", "Kursaal Darts", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/misc/dfruit.cpp b/src/mame/misc/dfruit.cpp index 316e5c79b60..37f76bf26ae 100644 --- a/src/mame/misc/dfruit.cpp +++ b/src/mame/misc/dfruit.cpp @@ -27,6 +27,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class dfruit_state : public driver_device { public: @@ -335,5 +338,8 @@ ROM_START( gemcrush ) ROM_LOAD( "gcj_01.ic10", 0x000000, 0x080000, CRC(5b9e7a6e) SHA1(345357feed8e80e6a06093fcb69f2b38063d057a) ) /* HN27C4096 EPROM */ ROM_END +} // anonymous namespace + + GAME( 1993, dfruit, 0, dfruit, dfruit, dfruit_state, empty_init, ROT0, "Nippon Data Kiki / Star Fish", "Fruit Dream (Japan)", 0 ) GAME( 1996, gemcrush, 0, dfruit, gemcrush, dfruit_state, empty_init, ROT270, "Star Fish", "Gemcrush (Japan, prototype)", MACHINE_NO_COCKTAIL ) diff --git a/src/mame/misc/dgpix.cpp b/src/mame/misc/dgpix.cpp index b0007f2187b..d50122de17b 100644 --- a/src/mame/misc/dgpix.cpp +++ b/src/mame/misc/dgpix.cpp @@ -166,6 +166,8 @@ Notes: #include "speaker.h" +namespace { + class dgpix_state : public driver_device { public: @@ -718,6 +720,9 @@ void dgpix_state::init_fmaniac3() m_flash_roms = 2; } +} // anonymous namespace + + GAME( 1999, elfin, 0, dgpix, dgpix, dgpix_state, init_elfin, ROT0, "dgPIX Entertainment Inc.", "Elfin", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1999, jumpjump, 0, dgpix, dgpix, dgpix_state, init_jumpjump, ROT0, "dgPIX Entertainment Inc.", "Jump Jump", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1999, xfiles, 0, dgpix, dgpix, dgpix_state, init_xfiles, ROT0, "dgPIX Entertainment Inc.", "The X-Files", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/dominob.cpp b/src/mame/misc/dominob.cpp index 40c99c71b1e..b2f539876da 100644 --- a/src/mame/misc/dominob.cpp +++ b/src/mame/misc/dominob.cpp @@ -69,6 +69,9 @@ Notes: #include "screen.h" #include "speaker.h" + +namespace { + class dominob_state : public driver_device { public: @@ -361,5 +364,8 @@ ROM_START( dominobv2 ) ROM_LOAD( "u114v2", 0xc0000, 0x40000, CRC(df17ee65) SHA1(1cb434719a8c406726d2c966392be03a2dc1d758) ) ROM_END +} // anonymous namespace + + GAME( 1996, dominob, 0, dominob, dominob, dominob_state, empty_init, ROT0, "Wonwoo Systems", "Domino Block", MACHINE_SUPPORTS_SAVE ) GAME( 1996, dominobv2, dominob, dominob, dominob, dominob_state, empty_init, ROT0, "Wonwoo Systems", "Domino Block ver.2", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/dorachan.cpp b/src/mame/misc/dorachan.cpp index fca600c29e4..63562e27f14 100644 --- a/src/mame/misc/dorachan.cpp +++ b/src/mame/misc/dorachan.cpp @@ -23,6 +23,8 @@ It appears that unused bits in port 03 are to operate the discrete sound channel #include "screen.h" +namespace { + class dorachan_state : public driver_device { public: @@ -271,6 +273,7 @@ ROM_START( dorachan ) ROM_LOAD( "d14.rom", 0x0000, 0x0400, CRC(c0d3ee84) SHA1(f2207c685ce8d5144a373c28f11d2cebf9518b65) ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/misc/drdmania.cpp b/src/mame/misc/drdmania.cpp index 2c96b1e1b06..39c41850de0 100644 --- a/src/mame/misc/drdmania.cpp +++ b/src/mame/misc/drdmania.cpp @@ -61,6 +61,9 @@ #include "emupal.h" #include "speaker.h" + +namespace { + class drdmania_state : public driver_device { public: @@ -223,4 +226,7 @@ void drdmania_state::init_drdmania() ROM[0x8e00] ^= 0x02; // wrong, different bit flipped? } +} // anonymous namespace + + GAME(1994, drdmania, 0, drdmania, drdmania, drdmania_state, init_drdmania, ROT0, "Sleic", "Dardomania (v2.1)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL ) diff --git a/src/mame/misc/dreamwld.cpp b/src/mame/misc/dreamwld.cpp index c593c0583df..6af0b738fa7 100644 --- a/src/mame/misc/dreamwld.cpp +++ b/src/mame/misc/dreamwld.cpp @@ -114,6 +114,9 @@ Stephh's notes (based on the game M68EC020 code and some tests) : #include + +namespace { + class dreamwld_state : public driver_device { public: @@ -1260,6 +1263,9 @@ ROM_START( gaialast ) ROM_LOAD( "9", 0x000000, 0x10000, CRC(0da8db45) SHA1(7d5bd71c5b0b28ff74c732edd7c662f46f2ab25b) ) ROM_END +} // anonymous namespace + + GAME( 1997, baryon, 0, baryon, baryon, dreamwld_state, empty_init, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1997, baryona, baryon, baryon, baryon, dreamwld_state, empty_init, ROT270, "SemiCom / Tirano", "Baryon - Future Assault (set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1998, cutefght, 0, dreamwld, cutefght, dreamwld_state, empty_init, ROT0, "SemiCom", "Cute Fighter", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/dwarfd.cpp b/src/mame/misc/dwarfd.cpp index 4e040d7581b..2d124330e54 100644 --- a/src/mame/misc/dwarfd.cpp +++ b/src/mame/misc/dwarfd.cpp @@ -305,6 +305,9 @@ uPC1352C @ N3 #include "screen.h" #include "speaker.h" + +namespace { + class dwarfd_state : public driver_device { public: @@ -994,6 +997,9 @@ void dwarfd_state::init_qc() } +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT STATE INIT ORENTATION, COMPANY FULLNAME FLAGS GAME( 1979, pokeresp, 0, pokeresp, dwarfd, dwarfd_state, init_dwarfd, ROT0, "Electro-Sport", "Poker (Electro-Sport)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1981, dwarfd, 0, dwarfd, dwarfd, dwarfd_state, init_dwarfd, ROT0, "Electro-Sport", "Draw Poker III / Dwarfs Den (Dwarf Gfx)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/dynadice.cpp b/src/mame/misc/dynadice.cpp index b2daa99a8bd..cb984c5ee55 100644 --- a/src/mame/misc/dynadice.cpp +++ b/src/mame/misc/dynadice.cpp @@ -45,6 +45,8 @@ dy_6.bin (near Z80) #include "tilemap.h" +namespace { + class dynadice_state : public driver_device { public: @@ -317,4 +319,7 @@ void dynadice_state::init_dynadice() gfx2[(i << 3) + j] = (gfx1[i] & (0x80 >> j)) ? (usr1[i] & 7) : (usr1[i] >> 4); } +} // anonymous namespace + + GAME( 19??, dynadice, 0, dynadice, dynadice, dynadice_state, init_dynadice, ROT90, "", "Dynamic Dice", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/dynamoah.cpp b/src/mame/misc/dynamoah.cpp index 4aa2f1c99b2..5d68a2722d0 100644 --- a/src/mame/misc/dynamoah.cpp +++ b/src/mame/misc/dynamoah.cpp @@ -19,6 +19,9 @@ #define VERBOSE 0 #include "logmacro.h" + +namespace { + class dynamoah_state : public driver_device { public: @@ -116,5 +119,8 @@ void dynamoah_state::security_decrypt() } } +} // anonymous namespace + + GAME( 199?, dynamoah, 0, dynamoah, dynamoah, dynamoah_state, security_decrypt, ROT0, "Dynamo", "Air Hockey (6.12?, encrypted)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 199?, dynamoaha, dynamoah, dynamoah, dynamoah, dynamoah_state, security_decrypt, ROT0, "Dynamo", "Air Hockey (6.03, encrypted)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/ecoinf1.cpp b/src/mame/misc/ecoinf1.cpp index f0853e9542c..8cc91ed33a8 100644 --- a/src/mame/misc/ecoinf1.cpp +++ b/src/mame/misc/ecoinf1.cpp @@ -11,6 +11,8 @@ #include "cpu/z80/z80.h" +namespace { + class ecoinf1_state : public driver_device { public: @@ -360,6 +362,9 @@ ROM_START( ec_casbxoa ) ROM_LOAD( "bx5c10p.a2", 0x2000, 0x1000, CRC(0bd21303) SHA1(eb60749d3097ce77f0955586fc8ed1d16993286a) ) ROM_END +} // anonymous namespace + + // all roms might really be for the same game, just in different cabinet styles // these ALL contain "Ver 3 BAR-X V1:84 TYPE T" strings GAME( 19??, ec_barxo, 0, ecoinf1_older, ecoinf1, ecoinf1_state, empty_init, ROT0, "Electrocoin", "Bar X (older PCB) (Electrocoin) (set 1)", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/misc/ecoinf3.cpp b/src/mame/misc/ecoinf3.cpp index 399de71eb8d..1782cbf55ee 100644 --- a/src/mame/misc/ecoinf3.cpp +++ b/src/mame/misc/ecoinf3.cpp @@ -28,6 +28,8 @@ #include +namespace { + class ecoinf3_state : public driver_device { public: @@ -848,6 +850,7 @@ void ecoinf3_state::init_ecoinf3_swap() } +} // anonymous namespace // another hw type (similar to stuff in ecoinf2.c) (watchdog on port 58?) diff --git a/src/mame/misc/electra.cpp b/src/mame/misc/electra.cpp index f93be802ea7..82297d6c3f4 100644 --- a/src/mame/misc/electra.cpp +++ b/src/mame/misc/electra.cpp @@ -27,6 +27,9 @@ Wings / Wings Cocktail (1976) EG-1040 YES #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -139,6 +142,8 @@ ROM_START( flyingf ) ROM_LOAD( "prom.1d", 0x0300, 0x0020, CRC(4fabe931) SHA1(ac3c2a59dce080460b4a9230f5d36d2b2627f729) ) ROM_END +} // anonymous namespace + GAME( 1975, avenger, 0, electra, 0, electra_state, empty_init, ROT0, "Electra", "Avenger [TTL]", MACHINE_IS_SKELETON ) GAME( 1976, flyingf, 0, electra, 0, electra_state, empty_init, ROT0, "Electra", "Flying Fortress [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/esh.cpp b/src/mame/misc/esh.cpp index 5677a091818..d83598579d0 100644 --- a/src/mame/misc/esh.cpp +++ b/src/mame/misc/esh.cpp @@ -34,6 +34,8 @@ Todo: #include "speaker.h" +namespace { + class esh_state : public driver_device { public: @@ -453,6 +455,9 @@ void esh_state::init_esh() { } +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS GAME( 1983, esh, 0, esh, esh, esh_state, init_esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 1)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS) GAME( 1983, esha, esh, esh, esh, esh_state, init_esh, ROT0, "Funai/Gakken", "Esh's Aurunmilla (set 2)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_COLORS) diff --git a/src/mame/misc/ettrivia.cpp b/src/mame/misc/ettrivia.cpp index 1550f4ef5da..f7fd491fdc8 100644 --- a/src/mame/misc/ettrivia.cpp +++ b/src/mame/misc/ettrivia.cpp @@ -37,6 +37,8 @@ Notes: #include "tilemap.h" +namespace { + class ettrivia_state : public driver_device { public: @@ -476,6 +478,9 @@ ROM_START( strvmstr ) ROM_LOAD( "entrtn.hi3", 0x38000, 0x8000, CRC(a8cf603b) SHA1(6efa5753d8d252452b3f5be8635a28364e4d8de1) ) ROM_END +} // anonymous namespace + + GAME( 1985, promutrv, 0, ettrivia, ettrivia, ettrivia_state, empty_init, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 1)", 0 ) GAME( 1985, promutrva, promutrv, ettrivia, ettrivia, ettrivia_state, empty_init, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 2)", 0 ) GAME( 1985, promutrvb, promutrv, ettrivia, ettrivia, ettrivia_state, empty_init, ROT270, "Enerdyne Technologies Inc.", "Progressive Music Trivia (Question set 3)", 0 ) diff --git a/src/mame/misc/ez2d.cpp b/src/mame/misc/ez2d.cpp index 21d8c3f42bb..7dfb058f0dd 100644 --- a/src/mame/misc/ez2d.cpp +++ b/src/mame/misc/ez2d.cpp @@ -47,6 +47,9 @@ Ez2DJ series: #include "cpu/i386/i386.h" #include "machine/pci.h" + +namespace { + class ez2d_state : public driver_device { public: @@ -104,4 +107,7 @@ ROM_START( ez2d2m ) DISK_IMAGE( "ez2d2m", 0, SHA1(431f0bef3b81f83dad3818bca8994faa8ce9d5b7) ) ROM_END +} // anonymous namespace + + GAME( 2001, ez2d2m, 0, ez2d, ez2d, ez2d_state, empty_init, ROT0, "Amuse World", "Ez2dancer 2nd Move", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/fastinvaders.cpp b/src/mame/misc/fastinvaders.cpp index beb8ec699f9..68cbba9b998 100644 --- a/src/mame/misc/fastinvaders.cpp +++ b/src/mame/misc/fastinvaders.cpp @@ -22,6 +22,8 @@ http://www.citylan.it/wiki/index.php/Fast_Invaders_%288275_version%29 #include "screen.h" +namespace { + class fastinvaders_state : public driver_device { public: @@ -773,6 +775,9 @@ ROM_START( fi6845 ) ROM_LOAD( "93427.bin", 0x0000, 0x0100, CRC(f59c8573) SHA1(5aed4866abe1690fd0f088af1cfd99b3c85afe9a) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS GAME( 1979, fi6845, 0, fastinvaders_6845, fastinvaders, fastinvaders_state, init_fi6845, ROT270, "Fiberglass", "Fast Invaders (6845 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) GAME( 1979, fi8275, fi6845, fastinvaders_8275, fastinvaders, fastinvaders_state, init_fi6845, ROT270, "Fiberglass", "Fast Invaders (8275 version)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/misc/fireball.cpp b/src/mame/misc/fireball.cpp index 7c8b47d1ddb..31dfdcd9d07 100644 --- a/src/mame/misc/fireball.cpp +++ b/src/mame/misc/fireball.cpp @@ -25,6 +25,8 @@ #include "fireball.lh" +namespace { + /**************************** * LOG defines * ****************************/ @@ -529,6 +531,9 @@ ROM_START(fireball) ROM_LOAD( "fireball.nv", 0x0000, 0x020, CRC(1d0f5f0f) SHA1(8e68fcd8782f39ed3b1df6162db9be83cb3335e4) ) //default setting ROM_END +} // anonymous namespace + + /************************* * Game Drivers * *************************/ diff --git a/src/mame/misc/flipjack.cpp b/src/mame/misc/flipjack.cpp index e0eb29c1691..4c4c338c0ae 100644 --- a/src/mame/misc/flipjack.cpp +++ b/src/mame/misc/flipjack.cpp @@ -86,6 +86,8 @@ ________________________|___________________________ #include "speaker.h" +namespace { + #define MASTER_CLOCK 16_MHz_XTAL #define VIDEO_CLOCK 6_MHz_XTAL @@ -486,5 +488,7 @@ ROM_START( flipjack ) ROM_LOAD( "m3-7611-5.f8", 0x0000, 0x0100, CRC(f0248102) SHA1(22d87935c941e2e8bba5427599f6fd5fa1262ebc) ) ROM_END +} // anonymous namespace + GAME( 1983?, flipjack, 0, flipjack, flipjack, flipjack_state, empty_init, ROT270, "Jackson Co., Ltd.", "Flipper Jack", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) // copyright not shown, datecodes on pcb suggests mid-1983 diff --git a/src/mame/misc/flower.cpp b/src/mame/misc/flower.cpp index 40b4c454bdd..51036c11b27 100644 --- a/src/mame/misc/flower.cpp +++ b/src/mame/misc/flower.cpp @@ -92,6 +92,9 @@ CHIP # POSITION TYPE #include "speaker.h" #include "tilemap.h" + +namespace { + #define MASTER_CLOCK XTAL(18'432'000) class flower_state : public driver_device @@ -620,6 +623,8 @@ ROM_START( flowerj ) /* Sega/Alpha version. Sega game number 834-5998 */ ROM_LOAD( "82s129.a1", 0x0420, 0x0100, CRC(c8dad3fc) SHA1(8e852efac70223d02e45b20ed8a12e38c5010a78) ) ROM_END +} // anonymous namespace + GAME( 1986, flower, 0, flower, flower, flower_state, empty_init, ROT0, "Clarue (Komax license)", "Flower (US)", MACHINE_IMPERFECT_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NO_COCKTAIL ) GAME( 1986, flowerj, flower, flower, flower, flower_state, empty_init, ROT0, "Clarue (Sega / Alpha Denshi Co. license)", "Flower (Japan)", MACHINE_IMPERFECT_SOUND|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NO_COCKTAIL ) diff --git a/src/mame/misc/flower_a.h b/src/mame/misc/flower_a.h index 5b97e1e35cd..7ea953746da 100644 --- a/src/mame/misc/flower_a.h +++ b/src/mame/misc/flower_a.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_AUDIO_FLOWER_H -#define MAME_AUDIO_FLOWER_H +#ifndef MAME_MISC_FLOWER_H +#define MAME_MISC_FLOWER_H #pragma once @@ -91,4 +91,4 @@ private: DECLARE_DEVICE_TYPE(FLOWER_CUSTOM, flower_sound_device) -#endif // MAME_AUDIO_FLOWER_H +#endif // MAME_MISC_FLOWER_H diff --git a/src/mame/misc/fortecar.cpp b/src/mame/misc/fortecar.cpp index 673825224c1..d6e0e41c7e8 100644 --- a/src/mame/misc/fortecar.cpp +++ b/src/mame/misc/fortecar.cpp @@ -337,6 +337,8 @@ #include "fortecrd.lh" +namespace { + #define MASTER_CLOCK XTAL(12'000'000) #define CPU_CLOCK (MASTER_CLOCK/4) #define CRTC_CLOCK (MASTER_CLOCK/8) @@ -796,6 +798,8 @@ ROM_START( fortecrde ) ROM_LOAD( "forte_card_82s147.u47", 0x0000, 0x0200, CRC(7e631818) SHA1(ac08b0de30260278af3a1c5dee5810d4304cb9ca) ) ROM_END +} // anonymous namespace + /*********************************** * Game Drivers * diff --git a/src/mame/misc/freeway.cpp b/src/mame/misc/freeway.cpp index cc391f110cc..9e6088e273e 100644 --- a/src/mame/misc/freeway.cpp +++ b/src/mame/misc/freeway.cpp @@ -19,6 +19,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class freeway_state : public driver_device { public: @@ -192,6 +195,8 @@ ROM_START(freewaya) ROM_LOAD("ram_m48t08_431", 0x0000, 0x21ee, CRC(e8fe8d9c) SHA1(bf93ead6ae0f03a646b4952cb999cf0dbc58d223)) // weird size, check when emulation is more mature ROM_END +} // anonymous namespace + GAME(1999, freeway, 0, freeway, freeway, freeway_state, empty_init, ROT0, "NVC Electronica", "FreeWay (V5.12)", MACHINE_IS_SKELETON) GAME(1997, freewaya, freeway, freeway, freeway, freeway_state, empty_init, ROT0, "NVC Electronica", "FreeWay (V4.31)", MACHINE_IS_SKELETON) diff --git a/src/mame/misc/fresh.cpp b/src/mame/misc/fresh.cpp index b7c1d9c6fda..af947aff5c9 100644 --- a/src/mame/misc/fresh.cpp +++ b/src/mame/misc/fresh.cpp @@ -31,7 +31,8 @@ rom 5 and 6 are prg roms #include "tilemap.h" - +namespace { + class fresh_state : public driver_device { public: @@ -624,6 +625,7 @@ ROM_START( fresh ) ROM_LOAD( "fruit-fresh4.u46", 0x80000, 0x80000, CRC(9b6c7571) SHA1(649cf3c50e2cd8c02f0f730e5ded59cf0ea37c37) ) ROM_END +} // anonymous namespace // title shows Fruit Fresh but on resetting you get text strings of 'Dream World V2.41SI 97. 1.28' diff --git a/src/mame/misc/galaxi.cpp b/src/mame/misc/galaxi.cpp index 7d6a0ea4bfc..c81d319b89a 100644 --- a/src/mame/misc/galaxi.cpp +++ b/src/mame/misc/galaxi.cpp @@ -44,6 +44,9 @@ #include "galaxi.lh" + +namespace { + #define CPU_CLOCK (XTAL(10'000'000)) #define SND_CLOCK (XTAL(16'000'000))/16 @@ -590,6 +593,8 @@ ROM_START( lastfour ) ROM_LOAD( "21.u38", 0x00000, 0x20000, CRC(e48523dd) SHA1(47bc2e5c2164b93d685fa134397845e0ed7aaa5f) ) ROM_END +} // anonymous namespace + /*************************************************************************** Game Drivers diff --git a/src/mame/misc/galgame.cpp b/src/mame/misc/galgame.cpp index 2cb0a664bef..092c44eebac 100644 --- a/src/mame/misc/galgame.cpp +++ b/src/mame/misc/galgame.cpp @@ -16,6 +16,8 @@ #include "screen.h" +namespace { + #define MAX_POINTS 2048 class galaxygame_state : public driver_device @@ -465,4 +467,7 @@ void galaxygame_state::init_galaxygame() main.write_word(8, 000500 - 10); } +} // anonymous namespace + + GAME(1971, galgame, 0, galaxygame, galaxygame, galaxygame_state, init_galaxygame, ROT270, "Computer Recreations, Inc", "Galaxy Game", MACHINE_NO_SOUND_HW ) diff --git a/src/mame/misc/gamemasters.cpp b/src/mame/misc/gamemasters.cpp index 26f84f87785..c5800e9828f 100644 --- a/src/mame/misc/gamemasters.cpp +++ b/src/mame/misc/gamemasters.cpp @@ -18,6 +18,8 @@ #include "speaker.h" +namespace { + class gamemasters_state : public driver_device { public: @@ -149,5 +151,7 @@ ROM_START(gmsshoot) ROM_LOAD("sharp_shooter__u20_2764.bin", 0x0000, 0x2000, CRC(902bd63b) SHA1(606e9d1083677d7eb90ad3626a6340238a260253)) // M2764AFI ROM_END +} // anonymous namespace + GAME(1989, gmsshoot, 0, gmsshoot, gmsshoot, gamemasters_state, empty_init, ROT0, "GameMasters", "Sharpshooter (coin pusher)", MACHINE_IS_SKELETON_MECHANICAL) // flyer and PCB dated 1988, but program strings claim 1989 copyright diff --git a/src/mame/misc/gamtor.cpp b/src/mame/misc/gamtor.cpp index 6d25e78a259..f5305230a7d 100644 --- a/src/mame/misc/gamtor.cpp +++ b/src/mame/misc/gamtor.cpp @@ -33,6 +33,8 @@ #include "speaker.h" +namespace { + class gaminator_state : public driver_device { public: @@ -1281,6 +1283,7 @@ void gaminator_state::init_gaminator() { } +} // anonymous namespace #define GAME_FLAGS MACHINE_NOT_WORKING|MACHINE_NO_SOUND diff --git a/src/mame/misc/globalfr.cpp b/src/mame/misc/globalfr.cpp index f9425d22175..22086310167 100644 --- a/src/mame/misc/globalfr.cpp +++ b/src/mame/misc/globalfr.cpp @@ -21,6 +21,9 @@ /******************************************************************************/ + +namespace { + class globalfr_state : public driver_device { public: @@ -198,6 +201,7 @@ ROM_START( gl_hbhcla ) ROM_LOAD( "hbrk_hot.p1", 0x0000, 0x080000, CRC(17b4e037) SHA1(394e73109d3f327544db2b8aa37513b3df1ffbf2) ) ROM_END +} // anonymous namespace /******************************************************************************/ diff --git a/src/mame/misc/globalvr.cpp b/src/mame/misc/globalvr.cpp index 44afd892d57..86707012c96 100644 --- a/src/mame/misc/globalvr.cpp +++ b/src/mame/misc/globalvr.cpp @@ -90,6 +90,9 @@ UltraPin 2006 #include "cpu/i386/i386.h" #include "machine/pci.h" + +namespace { + class globalvr_state : public driver_device { public: @@ -244,6 +247,8 @@ ROM_START( nfsug ) DISK_IMAGE_READONLY( "nfsug-recovery", 0, SHA1(e306bacb3498582a025706ff81a665776b8a18da) ) ROM_END +} // anonymous namespace + // OS/Global VR specific Setup Installers GAME( 2002, hyperv2, 0, globalvr, globalvr, globalvr_state, empty_init, ROT0, "Global VR", "Hyper V2 (Global VR) Install - 06/12/02", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/gluck2.cpp b/src/mame/misc/gluck2.cpp index d4d99826747..3174df6b740 100644 --- a/src/mame/misc/gluck2.cpp +++ b/src/mame/misc/gluck2.cpp @@ -201,6 +201,8 @@ #include "tilemap.h" +namespace { + #define MASTER_CLOCK XTAL(10'000'000) #define SND_CLOCK XTAL(3'579'545) @@ -548,6 +550,8 @@ ROM_START( gluck2 ) ROM_LOAD( "v3.u25", 0x0200, 0x0100, CRC(a4d2c9c3) SHA1(a799875b8b92391696419081244da2e56216e024) ) ROM_END +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/goldngam.cpp b/src/mame/misc/goldngam.cpp index 27c0b483c20..90dd657f830 100644 --- a/src/mame/misc/goldngam.cpp +++ b/src/mame/misc/goldngam.cpp @@ -241,6 +241,8 @@ #include "speaker.h" +namespace { + #define MASTER_CLOCK XTAL(8'000'000) /* from CPU Board */ #define SECONDARY_CLOCK XTAL(6'000'000) /* from GFX Board */ @@ -670,6 +672,8 @@ ROM_START( moviecrd ) ROM_LOAD16_BYTE( "v1.2_lo.gfx", 0x00001, 0x10000, CRC(70e8e9d5) SHA1(c026493b4bd302d389219ba564aafa42fca86491) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/gsspade.cpp b/src/mame/misc/gsspade.cpp index d0c47cc48b7..0780e4d6102 100644 --- a/src/mame/misc/gsspade.cpp +++ b/src/mame/misc/gsspade.cpp @@ -17,6 +17,9 @@ #include "sound/ymopl.h" #include "speaker.h" + +namespace { + class gsspade_state : public driver_device { public: @@ -87,5 +90,7 @@ ROM_START(gsspade) ROM_LOAD("spade-gs-dm-5.u2", 0x0000, 0x2000, CRC(c359201b) SHA1(5e5ac815bcd50f918f9c8b7447bcf6cf9426ae74)) ROM_END +} // anonymous namespace + GAME(199?, gsspade, 0, gsspade, gsspade, gsspade_state, empty_init, ROT0, "Guan Shing", "Spade", MACHINE_NOT_WORKING | MACHINE_MECHANICAL) diff --git a/src/mame/misc/h01x.cpp b/src/mame/misc/h01x.cpp index c2c9625c48c..ce80902ee9d 100644 --- a/src/mame/misc/h01x.cpp +++ b/src/mame/misc/h01x.cpp @@ -29,6 +29,9 @@ TODO: #include "sound/spkrdev.h" #include "imagedev/cassette.h" + +namespace { + class h01x_state : public driver_device { public: @@ -600,6 +603,9 @@ ROM_START(h01jce) ROM_LOAD("hn4827128g_f0f9.bin", 0x0000, 0x4000, CRC(36bffec0) SHA1(5b4b24c54eba0a8b69f291ca656ea27a3685f42e)) ROM_END +} // anonymous namespace + + /* Driver */ // H-01B中文教育电脑 diff --git a/src/mame/misc/hapyfish.cpp b/src/mame/misc/hapyfish.cpp index 00518350289..0fd9a31dbba 100644 --- a/src/mame/misc/hapyfish.cpp +++ b/src/mame/misc/hapyfish.cpp @@ -67,6 +67,9 @@ #define VERBOSE (LOG_GPIO | LOG_ADC | LOG_I2C | LOG_INPUTS) #include "logmacro.h" + +namespace { + class hapyfish_state : public driver_device { public: @@ -83,8 +86,6 @@ public: void hapyfish(machine_config &config); - void init_mini2440(); - private: required_device m_maincpu; required_device m_s3c2440; @@ -506,11 +507,6 @@ void hapyfish_state::hapyfish_map(address_map &map) MACHINE DRIVERS ***************************************************************************/ -void hapyfish_state::init_mini2440() -{ - // do nothing -} - void hapyfish_state::hapyfish(machine_config &config) { ARM920T(config, m_maincpu, 100000000); @@ -611,4 +607,7 @@ ROM_START( hapyfsh2 ) ROM_LOAD( "flash.u28", 0x00000000, 0x84000000, CRC(f00a25cd) SHA1(9c33f8e26b84cea957d9c37fb83a686b948c6834) ) ROM_END +} // anonymous namespace + + GAME( 201?, hapyfsh2, 0, hapyfish, hapyfish, hapyfish_state, empty_init, ROT0, "bootleg", "Happy Fish (V2 PCB, 302-in-1)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/hazelgr.cpp b/src/mame/misc/hazelgr.cpp index 419fb7b355c..52d4452fd19 100644 --- a/src/mame/misc/hazelgr.cpp +++ b/src/mame/misc/hazelgr.cpp @@ -14,6 +14,8 @@ #include "machine/z80pio.h" +namespace { + class haze_state : public driver_device { public: @@ -116,5 +118,7 @@ ROM_START( hg_frd ) ROM_LOAD( "fd v 3-2 c.bin", 0x1000, 0x0800, CRC(77bb8d8c) SHA1(65b7dd8024747175c3bd5bc341e2e1a92699f1c6) ) ROM_END +} // anonymous namespace + GAME( 198?, hg_frd, 0, haze, haze, haze_state, empty_init, ROT0, "Hazel Grove", "Fruit Deuce (Hazel Grove)", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/misc/hideseek.cpp b/src/mame/misc/hideseek.cpp index f1e124e5f7f..f8012e54546 100644 --- a/src/mame/misc/hideseek.cpp +++ b/src/mame/misc/hideseek.cpp @@ -33,6 +33,8 @@ Other stuff: NEC D4992 (RTC?) and xtal possibly 32.768kHz, 3V coin battery, 93L4 #include "speaker.h" +namespace { + class hideseek_state : public driver_device { public: @@ -162,5 +164,7 @@ void hideseek_state::init_hideseek() { } +} // anonymous namespace + GAME( 200?, hideseek, 0, hideseek, hideseek, hideseek_state, init_hideseek, ROT0, "", "Hide & Seek", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/misc/hitpoker.cpp b/src/mame/misc/hitpoker.cpp index ee9061d6e08..84e11965d2f 100644 --- a/src/mame/misc/hitpoker.cpp +++ b/src/mame/misc/hitpoker.cpp @@ -53,6 +53,8 @@ Some debug tricks (let's test this CPU as more as possible): #include "speaker.h" +namespace { + class hitpoker_state : public driver_device { public: @@ -406,4 +408,7 @@ ROM_START( hitpoker ) ROM_LOAD16_BYTE( "u45.bin", 0x80000, 0x40000, CRC(e65b3e52) SHA1(c0c1a360a4a1823bf71c0a4105ff41f4102862e8) ) // the first part of these 2 is almost empty as the standard gfx are 4bpp ROM_END +} // anonymous namespace + + GAME( 1997, hitpoker, 0, hitpoker, hitpoker, hitpoker_state, init_hitpoker, ROT0, "Accept Ltd.", "Hit Poker (Bulgaria)", MACHINE_NOT_WORKING ) diff --git a/src/mame/misc/hobbyplay.cpp b/src/mame/misc/hobbyplay.cpp index 32bc805ae33..17089beb1cf 100644 --- a/src/mame/misc/hobbyplay.cpp +++ b/src/mame/misc/hobbyplay.cpp @@ -33,6 +33,9 @@ various TTL chips #include "cpu/z80/z80.h" #include "machine/i8255.h" + +namespace { + class hobbyplay_state : public driver_device { public: @@ -101,4 +104,7 @@ ROM_START( unkhpslt ) ROM_LOAD( "hobby_play_661.bin", 0x0000, 0x0800, CRC(e721d720) SHA1(23d84d2013f1ec42b1bcf6983ee28093071d4b8e) ) ROM_END +} // anonymous namespace + + GAME( 198?, unkhpslt, 0, hobbyplay, hobbyplay, hobbyplay_state, empty_init, ROT0, "Hobby Play", "unknown Hobby Play slot machine", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/hotblock.cpp b/src/mame/misc/hotblock.cpp index 5d94af556f1..0006c7430ee 100644 --- a/src/mame/misc/hotblock.cpp +++ b/src/mame/misc/hotblock.cpp @@ -63,6 +63,9 @@ to be honored - the game writes the value to RAM but never reads it. #include "screen.h" #include "speaker.h" + +namespace { + class hotblock_state : public driver_device { public: @@ -253,6 +256,9 @@ ROM_START( hotblockb ) ROM_LOAD( "pld.3", 0x45c, 0x117, NO_DUMP ) // Type unknown, surface scratched out ROM_END +} // anonymous namespace + + GAME( 1993, hotblock, 0, hotblock, hotblock, hotblock_state, empty_init, ROT0, "NIX?", "Hot Blocks - Tetrix II (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1993, hotblocka, hotblock, hotblock, hotblock, hotblock_state, empty_init, ROT0, "NIX?", "Hot Blocks - Tetrix II (set 2)", MACHINE_SUPPORTS_SAVE ) GAME( 1993, hotblockb, hotblock, hotblock, hotblock, hotblock_state, empty_init, ROT0, "NIX?", "Hot Blocks - Tetrix II (set 3)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/hotstuff.cpp b/src/mame/misc/hotstuff.cpp index 05c1b1ffb77..06206665d48 100644 --- a/src/mame/misc/hotstuff.cpp +++ b/src/mame/misc/hotstuff.cpp @@ -10,6 +10,8 @@ #include "screen.h" +namespace { + class hotstuff_state : public driver_device { public: @@ -129,4 +131,7 @@ ROM_START( hotstuff ) ROM_LOAD16_WORD_SWAP( "hot stuff symbol u8,68000.bin", 0x00000, 0x80000, CRC(f154a157) SHA1(92ae0fb977e2dcc0377487d768f95c6e447e990b) ) ROM_END +} // anonymous namespace + + GAME( ????, hotstuff, 0, hotstuff, hotstuff, hotstuff_state, empty_init, ROT0, "Olympic Video Gaming", "Olympic Hot Stuff (TAS 5 Reel System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/misc/imolagp.cpp b/src/mame/misc/imolagp.cpp index d1be2a24cc1..bdd6197d774 100644 --- a/src/mame/misc/imolagp.cpp +++ b/src/mame/misc/imolagp.cpp @@ -114,6 +114,8 @@ silkscreened by Falgas and the cab contains Falgas logos with a small note that #include "imolagp.lh" +namespace { + class imolagp_state : public driver_device { public: @@ -622,6 +624,8 @@ ROM_START( imolagpo ) ROM_LOAD( "xe.bin", 0x3c00, 0x0400, CRC(e0e81120) SHA1(14a77dfd069be342df4dbb1b747443c6d121d3fe) ) // ? car+misc ROM_END +} // anonymous namespace + // YEAR, NAME, PARENT, MACHINE, INPUT, CLASS, INIT, MONITOR, COMPANY, FULLNAME, FLAGS GAMEL(1983?, imolagp, 0, imolagp, imolagp, imolagp_state, empty_init, ROT90, "RB Bologna", "Imola Grand Prix (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE, layout_imolagp ) // made by Alberici? year not shown, PCB labels suggests it's from 1983 diff --git a/src/mame/misc/inder_sb.h b/src/mame/misc/inder_sb.h index 0dcd608bdeb..4f2986f37ab 100644 --- a/src/mame/misc/inder_sb.h +++ b/src/mame/misc/inder_sb.h @@ -3,8 +3,8 @@ /* */ -#ifndef MAME_MACHINE_INDER_SB_H -#define MAME_MACHINE_INDER_SB_H +#ifndef MAME_MISC_INDER_SB_H +#define MAME_MISC_INDER_SB_H #pragma once @@ -59,4 +59,4 @@ private: uint8_t m_soundback; }; -#endif // MAME_MACHINE_INDER_SB_H +#endif // MAME_MISC_INDER_SB_H diff --git a/src/mame/misc/intrscti.cpp b/src/mame/misc/intrscti.cpp index 4d2c2e89b10..cb6161b30ee 100644 --- a/src/mame/misc/intrscti.cpp +++ b/src/mame/misc/intrscti.cpp @@ -19,6 +19,8 @@ I've not had a chance to wire up the board yet, but it might be possible to writ #include "screen.h" +namespace { + class intrscti_state : public driver_device { public: @@ -249,4 +251,7 @@ void intrscti_state::init_intrscti() } } +} // anonymous namespace + + GAME( 19??, intrscti, 0, intrscti, intrscti, intrscti_state, init_intrscti, ROT0, "", "Intersecti", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND ) diff --git a/src/mame/misc/island.cpp b/src/mame/misc/island.cpp index 0c6e032618c..3549dd31c3b 100644 --- a/src/mame/misc/island.cpp +++ b/src/mame/misc/island.cpp @@ -16,6 +16,8 @@ #include "speaker.h" +namespace { + class island_state : public driver_device { public: @@ -77,5 +79,7 @@ ROM_START(isld_vortex) ROM_LOAD("vortex.u29", 0x00000, 0x80000, CRC(2b0cc5c7) SHA1(ca9426351cec304b29a47ca66da12080269eb6e3)) ROM_END +} // anonymous namespace + GAME(1995, isld_vortex, 0, vortex, vortex, island_state, empty_init, ROT0, "Island Design", "Vortex (Island Design)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_MECHANICAL) diff --git a/src/mame/misc/itgambl2.cpp b/src/mame/misc/itgambl2.cpp index 435a21ffaa7..8cb168fd3c9 100644 --- a/src/mame/misc/itgambl2.cpp +++ b/src/mame/misc/itgambl2.cpp @@ -60,6 +60,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + #define MAIN_CLOCK XTAL(16'000'000) #define SND_CLOCK XTAL(14'318'181) @@ -1159,6 +1162,8 @@ ROM_START( toptcash ) ROM_LOAD( "top t. cash msg0.bin", 0x00000, 0x80000, CRC(babe87c7) SHA1(7ed226224c03a094844e838aebaead67e9ae9a2d) ) // 1xxxxxxxxxxxxxxxxxx = 0x00 ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/itgambl3.cpp b/src/mame/misc/itgambl3.cpp index a4aee2632f3..4c23fee3f00 100644 --- a/src/mame/misc/itgambl3.cpp +++ b/src/mame/misc/itgambl3.cpp @@ -47,6 +47,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + #define MAIN_CLOCK XTAL(16'000'000) @@ -512,6 +515,8 @@ ROM_START( ejollyx9 ) ROM_LOAD( "nm.u3", 0x00000, 0x80000, CRC(0529696b) SHA1(7e182051baae0b7de1f5a2c18f1b68b695f339d8) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/itgamble.cpp b/src/mame/misc/itgamble.cpp index c3701df621e..17e9d189c9a 100644 --- a/src/mame/misc/itgamble.cpp +++ b/src/mame/misc/itgamble.cpp @@ -124,6 +124,8 @@ Known games on this hardware revision are: #include "speaker.h" +namespace { + class itgamble_state : public driver_device { public: @@ -665,6 +667,8 @@ ROM_START( mnumber ) /* clocks should be changed for this game */ ROM_LOAD( "mysterynumber5.u6", 0x00000, 0x40000, CRC(80aba466) SHA1(e9bf7e1c3d1c6b1b0dba43dd79a71f89e63df814) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/jackpool.cpp b/src/mame/misc/jackpool.cpp index a7d1b23f1dc..1c0456d7a9f 100644 --- a/src/mame/misc/jackpool.cpp +++ b/src/mame/misc/jackpool.cpp @@ -28,6 +28,8 @@ TODO: #include "speaker.h" +namespace { + class jackpool_state : public driver_device { public: @@ -305,4 +307,7 @@ void jackpool_state::init_jackpool() rom[0x9040/2] = 0x6602; } +} // anonymous namespace + + GAME( 1997, jackpool, 0, jackpool, jackpool, jackpool_state, init_jackpool, ROT0, "Electronic Projects", "Jackpot Cards / Jackpot Pool (Italy)",MACHINE_NOT_WORKING ) diff --git a/src/mame/misc/jankenmn.cpp b/src/mame/misc/jankenmn.cpp index 4ce86c50ef8..6b201671496 100644 --- a/src/mame/misc/jankenmn.cpp +++ b/src/mame/misc/jankenmn.cpp @@ -155,6 +155,9 @@ #include "jankenmn.lh" + +namespace { + #define MASTER_CLOCK XTAL(2'500'000) @@ -430,6 +433,8 @@ ROM_START( jankenmn ) ROM_LOAD( "pcg1.bin", 0x0000, 0x4000, CRC(a9c5aa2e) SHA1(c3b81eeefa5c442231cd26615aaf6c682063b26f) ) ROM_END +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/jokrwild.cpp b/src/mame/misc/jokrwild.cpp index 89756db60f0..a3c6c27d3df 100644 --- a/src/mame/misc/jokrwild.cpp +++ b/src/mame/misc/jokrwild.cpp @@ -80,6 +80,9 @@ #include "screen.h" #include "tilemap.h" + +namespace{ + #define MASTER_CLOCK XTAL(8'000'000) /* guess */ @@ -509,6 +512,8 @@ void jokrwild_state::init_jokrwild() } } +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/joystand.cpp b/src/mame/misc/joystand.cpp index e911bce21e7..36c0488822a 100644 --- a/src/mame/misc/joystand.cpp +++ b/src/mame/misc/joystand.cpp @@ -106,6 +106,9 @@ TODO: #include "speaker.h" #include "tilemap.h" + +namespace { + class joystand_state : public driver_device { public: @@ -651,4 +654,7 @@ ROM_START( joystand ) ROM_LOAD( "jsp-xct.ic5", 0x000, 0x117, NO_DUMP ) ROM_END +} // anonymous namespace + + GAME( 1997, joystand, 0, joystand, joystand, joystand_state, empty_init, ROT0, "Yuvo", "Joy Stand Private", MACHINE_NOT_WORKING | MACHINE_NODEVICE_PRINTER | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/jubilee.cpp b/src/mame/misc/jubilee.cpp index 98dba549605..33770cd7e9c 100644 --- a/src/mame/misc/jubilee.cpp +++ b/src/mame/misc/jubilee.cpp @@ -201,6 +201,9 @@ #include "screen.h" #include "tilemap.h" + +namespace { + #define MASTER_CLOCK XTAL(6'000'000) /* confirmed */ #define CPU_CLOCK MASTER_CLOCK /* guess */ #define CRTC_CLOCK (MASTER_CLOCK / 8) /* guess */ @@ -718,6 +721,8 @@ ROM_START( jubileep ) ROM_LOAD( "jubileep_videoworkram.bin", 0x0000, 0x0800, CRC(595bf2b3) SHA1(ae311873b15d8cebfb6ef6a80f27fafc9544178c) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/kas89.cpp b/src/mame/misc/kas89.cpp index 4b7968e29e8..3038e7413a8 100644 --- a/src/mame/misc/kas89.cpp +++ b/src/mame/misc/kas89.cpp @@ -201,6 +201,8 @@ #include "kas89.lh" +namespace { + #define MASTER_CLOCK XTAL(21'477'272) #define VDP_MEM 0x40000 @@ -838,6 +840,8 @@ void kas89_state::init_kas89() } } +} // anonymous namespace + /************************************** * Game Driver(s) * diff --git a/src/mame/misc/kurukuru.cpp b/src/mame/misc/kurukuru.cpp index 5f40df35c4e..2fb575633a9 100644 --- a/src/mame/misc/kurukuru.cpp +++ b/src/mame/misc/kurukuru.cpp @@ -393,6 +393,9 @@ #include "video/v9938.h" #include "speaker.h" + +namespace { + #define UNICODE_10YEN "\xC2\xA5" "10" #define UNICODE_100YEN "\xC2\xA5" "100" @@ -957,6 +960,8 @@ ROM_START( ppj ) ROM_LOAD( "pal12l6a_7908b-4.ic32", 0x0600, 0x0034, CRC(bddf925e) SHA1(861cf5966444d0c0392241e5cfa08db475fb439a) ) // identical to kurukuru... ROM_END +} // anonymous namespace + /*************************************************************************** * Game Drivers * diff --git a/src/mame/misc/laz_aftrshok.cpp b/src/mame/misc/laz_aftrshok.cpp index 5747a248c19..4ff8b613943 100644 --- a/src/mame/misc/laz_aftrshok.cpp +++ b/src/mame/misc/laz_aftrshok.cpp @@ -36,6 +36,8 @@ Spin to Win runs on the same hardware. #include "speaker.h" +namespace { + class aftrshok_state : public driver_device { public: @@ -250,6 +252,8 @@ ROM_START( aftrshoka ) ROM_LOAD( "aftrshok.u25", 0x20000, 0x10000, CRC(d5d1c606) SHA1(ad72a00c211ee7f5bc0772d6f469d59047131095) ) ROM_END +} // anonymous namespace + GAME( 19??, aftrshok, 0, aftrshok, aftrshok, aftrshok_state, empty_init, ROT0, "Lazer-Tron", "Aftershock (Lazer-Tron, set 1)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL ) GAME( 19??, aftrshoka, aftrshok, aftrshok, aftrshok, aftrshok_state, empty_init, ROT0, "Lazer-Tron", "Aftershock (Lazer-Tron, set 2)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL ) diff --git a/src/mame/misc/laz_ribrac.cpp b/src/mame/misc/laz_ribrac.cpp index 91012fc96a9..0ba536fcfb6 100644 --- a/src/mame/misc/laz_ribrac.cpp +++ b/src/mame/misc/laz_ribrac.cpp @@ -27,6 +27,8 @@ Awesome tossem u21 = 27c512 #include "speaker.h" +namespace { + class ribrac_state : public driver_device { public: @@ -355,5 +357,8 @@ ROM_START( awetoss ) ROM_LOAD( "awsmtoss.u11", 0x30000, 0x10000, CRC(8ae9d4f0) SHA1(58d1d8972c8e4c9a7c63e9d63e267ea81515d22a) ) ROM_END +} // anonymous namespace + + GAME( 1993, ribrac, 0, ribrac, ribrac, ribrac_state, empty_init, ROT0, "Lazer-Tron", "Ribbit Racin (Lazer-Tron)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 19??, awetoss, 0, ribrac, awetoss, ribrac_state, empty_init, ROT0, "Lazer-Tron", "Awesome Toss 'Em (Lazer-Tron)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL ) diff --git a/src/mame/misc/lependu.cpp b/src/mame/misc/lependu.cpp index 8cd5144a85e..66cf72bcbdc 100644 --- a/src/mame/misc/lependu.cpp +++ b/src/mame/misc/lependu.cpp @@ -88,6 +88,9 @@ #include "lependu.lh" + +namespace { + #define MASTER_CLOCK XTAL(10'000'000) #define CPU_CLOCK (MASTER_CLOCK/16) #define PIXEL_CLOCK (MASTER_CLOCK/2) @@ -626,6 +629,8 @@ void lependu_state::init_lependu() ROM[0xdd79] = 0xb7; } +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/limenko.cpp b/src/mame/misc/limenko.cpp index a9d3272cda2..ad94e4f5b64 100644 --- a/src/mame/misc/limenko.cpp +++ b/src/mame/misc/limenko.cpp @@ -36,6 +36,8 @@ #include "tilemap.h" +namespace { + class limenko_state : public driver_device { public: @@ -1124,6 +1126,9 @@ void limenko_state::init_spotty() save_item(NAME(m_audiocpu_p3)); } +} // anonymous namespace + + GAME(2000, dynabomb, 0, limenko, sb2003, limenko_state, init_dynabomb, ROT0, "Limenko", "Dynamite Bomber (Korea, Rev 1.5)", MACHINE_SUPPORTS_SAVE) GAME(2000, legendoh, 0, limenko, legendoh, limenko_state, init_legendoh, ROT0, "Limenko", "Legend of Heroes", MACHINE_SUPPORTS_SAVE) GAME(2003, sb2003, 0, limenko, sb2003, limenko_state, init_sb2003, ROT0, "Limenko", "Super Bubble 2003 (World, Ver 1.0)", MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/misc/ltcasino.cpp b/src/mame/misc/ltcasino.cpp index 58fa071b839..139ecc05cca 100644 --- a/src/mame/misc/ltcasino.cpp +++ b/src/mame/misc/ltcasino.cpp @@ -83,6 +83,8 @@ Other: Hitachi HD46821P 1MHz NMOS Peripheral Interface Adapter (PIA) x 2 #include "ltcasinn.lh" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -628,6 +630,8 @@ ROM_START( ltcasin2a ) ROM_LOAD( "v17_00_rv.bin", 0x0000, 0x1000, CRC(84cbee7b) SHA1(742831d5ae0db6c7c644a18a837831ee0474d472) ) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/misc/luckybal.cpp b/src/mame/misc/luckybal.cpp index fc16f3fe452..995be5f36b8 100644 --- a/src/mame/misc/luckybal.cpp +++ b/src/mame/misc/luckybal.cpp @@ -281,6 +281,8 @@ #include "luckybal.lh" +namespace { + class luckybal_state : public driver_device { public: @@ -722,6 +724,8 @@ void luckybal_state::init_luckybald() membank("bank1")->configure_entries(0, 0x40, &rom[0x10000], 0x2000); } +} // anonymous namespace + /************************************** * Game Driver(s) * diff --git a/src/mame/misc/marywu.cpp b/src/mame/misc/marywu.cpp index 0908ff18d91..e045bdfe93e 100644 --- a/src/mame/misc/marywu.cpp +++ b/src/mame/misc/marywu.cpp @@ -24,6 +24,9 @@ #include "marywu.lh" + +namespace { + class marywu_state : public driver_device { public: @@ -221,5 +224,8 @@ ROM_START( marywu ) ROM_LOAD( "marywu_sunkiss_chen.rom", 0x0000, 0x8000, CRC(11f67c7d) SHA1(9c1fd1a5cc6e2b0d675f0217aa8ff21c30609a0c) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS GAME( ????, marywu, 0, marywu, marywu, marywu_state, empty_init, ROT0, "", "unknown Labeled 'WU- MARY-1A' Music by: SunKiss Chen", MACHINE_NOT_WORKING ) diff --git a/src/mame/misc/matrix.cpp b/src/mame/misc/matrix.cpp index b52c599783b..d67b96b101d 100644 --- a/src/mame/misc/matrix.cpp +++ b/src/mame/misc/matrix.cpp @@ -25,6 +25,9 @@ #include "cpu/i386/i386.h" #include "screen.h" + +namespace { + class matrix_state : public driver_device { public: @@ -81,5 +84,7 @@ ROM_START( matrix ) ROM_LOAD( "matrix_031203u20.bin", 0x280000, 0x080000, CRC(f87ac4ae) SHA1(ef9b730a1113d36ef6a041fe36d77edfa255ad98) ) ROM_END +} // anonymous namespace + GAME( 200?, matrix, 0, matrix, matrix, matrix_state, empty_init, ROT0, "", "Matrix", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/meyc8080.cpp b/src/mame/misc/meyc8080.cpp index 66cb57c71c0..8fac19fc431 100644 --- a/src/mame/misc/meyc8080.cpp +++ b/src/mame/misc/meyc8080.cpp @@ -67,6 +67,8 @@ #include "meybjack.lh" +namespace { + class meyc8080_state : public driver_device { public: @@ -726,6 +728,8 @@ ROM_START( casbjack ) ROM_LOAD( "k2", 0x3000, 0x0800, CRC(5f82eafa) SHA1(4f5a4dc773ceae9a69ec532166047867db4ddadf) ) ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/misc/meyc8088.cpp b/src/mame/misc/meyc8088.cpp index 47cc00bd80d..18dcf0cecf1 100644 --- a/src/mame/misc/meyc8088.cpp +++ b/src/mame/misc/meyc8088.cpp @@ -36,6 +36,8 @@ #include "gldarrow.lh" +namespace { + class meyc8088_state : public driver_device { public: @@ -413,5 +415,7 @@ ROM_START( gldarrow ) ROM_LOAD( "prom.2c", 0x00, 0x20, CRC(2839bb14) SHA1(c9acdb3ae00c2f9344aedaf77c0f4e860a3184fc) ) // M3-7602-5 color prom ROM_END +} // anonymous namespace + GAMEL( 1984, gldarrow, 0, meyc8088, gldarrow, meyc8088_state, empty_init, ROT0, "Meyco Games, Inc.", "Golden Arrow (Standard G8-03)", MACHINE_SUPPORTS_SAVE, layout_gldarrow ) diff --git a/src/mame/misc/mgavegas.cpp b/src/mame/misc/mgavegas.cpp index 6b9a9e35df9..db368ce2ebe 100644 --- a/src/mame/misc/mgavegas.cpp +++ b/src/mame/misc/mgavegas.cpp @@ -30,6 +30,8 @@ Ver. 2.2 should exist #include "mgavegas.lh" +namespace { + /**************************** * LOG defines * ****************************/ @@ -644,6 +646,8 @@ ROM_START(mgavegas133) ROM_LOAD( "mgavegas133.nv", 0x0000, 0x2000, CRC(20fe4db7) SHA1(887b69468ac7e6490827a06cd1f0ff15228a9c73) ) //default setting ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/micro3d_a.h b/src/mame/misc/micro3d_a.h index ca54dff85bb..3b6852d541a 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_AUDIO_MICRO3D_H -#define MAME_AUDIO_MICRO3D_H +#ifndef MAME_MISC_MICRO3D_H +#define MAME_MISC_MICRO3D_H #pragma once @@ -75,4 +75,4 @@ private: DECLARE_DEVICE_TYPE(MICRO3D_SOUND, micro3d_sound_device) -#endif // MAME_AUDIO_MICRO3D_H +#endif // MAME_MISC_MICRO3D_H diff --git a/src/mame/misc/microdar.cpp b/src/mame/misc/microdar.cpp index cfff2aa9da2..23529f65d5f 100644 --- a/src/mame/misc/microdar.cpp +++ b/src/mame/misc/microdar.cpp @@ -83,6 +83,9 @@ ________________________________________________________________________________ #include "machine/i2cmem.h" #include "machine/nvram.h" + +namespace { + class microdar_state : public driver_device { public: @@ -492,6 +495,8 @@ ROM_START(covidarts) ROM_LOAD("palce16v8h-25.ic7", 0x000, 0x117, BAD_DUMP CRC(3a35a751) SHA1(e39fc8784d94ff09e0ff814f469ce23e52bb35fd)) // Bruteforced and verified OK ROM_END +} // anonymous namespace + GAME(199?, dibifuca, 0, microdar, microdar, microdar_state, empty_init, ROT0, "Compumatic / Bifuca", "Diana Bifuca (v9.25)", MACHINE_IS_SKELETON_MECHANICAL) GAME(199?, dibif743, dibifuca, microdar, microdar, microdar_state, empty_init, ROT0, "Compumatic / Bifuca", "Diana Bifuca (v7.43)", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/misc/miniboy7.cpp b/src/mame/misc/miniboy7.cpp index 9423a10432d..1910950fe9a 100644 --- a/src/mame/misc/miniboy7.cpp +++ b/src/mame/misc/miniboy7.cpp @@ -225,6 +225,8 @@ NOTE: 10MHz XTAL verified for Joker Poker, Super Mini-Boy is stated as 12.4725MH #include "miniboy7.lh" +namespace { + #define MASTER_CLOCK XTAL(12'472'500) /* 12.4725 MHz */ @@ -831,6 +833,8 @@ ROM_START( bejpoker ) /* MVX-001-02 PCB */ ROM_LOAD( "jdx.10f", 0x0100, 0x0100, CRC(2dd8d3ce) SHA1(6e3d67f9c5ccc210963e02e32fceee4859d8e651) ) /* 63S141 BPROM */ ROM_END +} // anonymous namespace + /*********************************** * Game Drivers * diff --git a/src/mame/misc/minivideo.cpp b/src/mame/misc/minivideo.cpp index 4231a7ab549..57d8d331754 100644 --- a/src/mame/misc/minivideo.cpp +++ b/src/mame/misc/minivideo.cpp @@ -31,6 +31,9 @@ #include "cpu/h8/h83002.h" #include "screen.h" + +namespace { + class minivideo_state : public driver_device { public: @@ -141,6 +144,8 @@ ROM_START( fiches12 ) ROM_LOAD( "lf3.u16", 0x100000, 0x80000, CRC(539e3ae3) SHA1(e23d7e2c914682688dae60f3485d13e822af6736) ) ROM_END +} // anonymous namespace + GAME( 1995?, fiches, 0, minivideo, minivideo, minivideo_state, empty_init, ROT0, "Minivideo", "Les Fiches (ver 1.3)", MACHINE_IS_SKELETON ) GAME( 1995?, fiches12, fiches, minivideo, minivideo, minivideo_state, empty_init, ROT0, "Minivideo", "Les Fiches (ver 1.2)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/mirax.cpp b/src/mame/misc/mirax.cpp index be5a4a0ebe1..366f3faf878 100644 --- a/src/mame/misc/mirax.cpp +++ b/src/mame/misc/mirax.cpp @@ -110,6 +110,8 @@ Stephh's notes (based on the games Z80 code and some tests) : #include "speaker.h" +namespace { + class mirax_state : public driver_device { public: @@ -586,5 +588,8 @@ void mirax_state::init_mirax() ROM[bitswap<16>(i, 15,14,13,12,11,10,9, 5,7,6,8, 4,3,2,1,0)] = (bitswap<8>(DATA[i], 1, 3, 7, 0, 5, 6, 4, 2) ^ 0xff); } +} // anonymous namespace + + GAME( 1985, mirax, 0, mirax, mirax, mirax_state, init_mirax, ROT90, "Current Technologies", "Mirax (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, miraxa, mirax, mirax, miraxa, mirax_state, init_mirax, ROT90, "Current Technologies", "Mirax (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/mjsenpu.cpp b/src/mame/misc/mjsenpu.cpp index d699314e5bc..7493f7dff58 100644 --- a/src/mame/misc/mjsenpu.cpp +++ b/src/mame/misc/mjsenpu.cpp @@ -51,6 +51,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class mjsenpu_state : public driver_device { public: @@ -535,5 +538,7 @@ void mjsenpu_state::init_mjsenpu() m_maincpu->space(AS_PROGRAM).install_read_handler(0x23468, 0x2346b, read32smo_delegate(*this, FUNC(mjsenpu_state::mjsenpu_speedup_r))); } +} // anonymous namespace + GAME( 2002, mjsenpu, 0, mjsenpu, mjsenpu, mjsenpu_state, init_mjsenpu, ROT0, "Oriental Soft", "Mahjong Senpu", 0 ) diff --git a/src/mame/misc/mole.cpp b/src/mame/misc/mole.cpp index c3a42fdb32f..32886042653 100644 --- a/src/mame/misc/mole.cpp +++ b/src/mame/misc/mole.cpp @@ -58,6 +58,8 @@ #include "tilemap.h" +namespace { + class mole_state : public driver_device { public: @@ -371,6 +373,8 @@ ROM_START( mole ) // ALL ROMS ARE 2732 ROM_LOAD( "mba.8a", 0x5000, 0x1000, CRC(50c43fc9) SHA1(af478f3d89cd6c87f32dcdda7fabce25738c340b) ) ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/misc/monon_color.cpp b/src/mame/misc/monon_color.cpp index 0aaa364022d..37b58c4bcbd 100644 --- a/src/mame/misc/monon_color.cpp +++ b/src/mame/misc/monon_color.cpp @@ -72,6 +72,9 @@ #include "logmacro.h" + +namespace { + class monon_color_state : public driver_device { public: @@ -986,4 +989,7 @@ ROM_START( mononcol ) ROM_FILL( 0x1ffd, 0x1, 0x20 ) ROM_END +} // anonymous namespace + + CONS( 2014, mononcol, 0, 0, monon_color, monon_color, monon_color_state, empty_init, "M&D", "Monon Color", MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/misc/mpu12wbk.cpp b/src/mame/misc/mpu12wbk.cpp index 199bd96ba41..91ac24cd042 100644 --- a/src/mame/misc/mpu12wbk.cpp +++ b/src/mame/misc/mpu12wbk.cpp @@ -436,6 +436,9 @@ #include "fruitstb.lh" + +namespace { + #define MASTER_CLOCK XTAL(8'000'000) @@ -1061,6 +1064,8 @@ void mpu12wbk_state::init_mpu12wbk() // just in case... } +} // anonymous namespace + /******************************** * Game Drivers * diff --git a/src/mame/misc/murogem.cpp b/src/mame/misc/murogem.cpp index 5acf37d4b63..388f6323a5b 100644 --- a/src/mame/misc/murogem.cpp +++ b/src/mame/misc/murogem.cpp @@ -115,6 +115,8 @@ val (hex): 27 20 22 04 26 00 20 20 00 07 00 00 80 00 00 00 ns #include "speaker.h" +namespace { + class murogem_state : public driver_device { public: @@ -332,6 +334,9 @@ ROM_START( lasvegas ) ROM_LOAD( "a3.1b", 0x0000, 0x0020, CRC(abddfb6b) SHA1(ed78b93701b5a3bf2053d2584e9a354fb6cec203) ) /* 74s288 at 1B */ ROM_END +} // anonymous namespace + + GAME( 198?, murogem, 0, murogem, murogem, murogem_state, empty_init, ROT0, "", "Muroge Monaco (set 1)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) GAME( 198?, murogema, murogem, murogem, murogem, murogem_state, empty_init, ROT0, "", "Muroge Monaco (set 2)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) GAME( 198?, murogemb, murogem, murogem, murogem, murogem_state, empty_init, ROT0, "", "Muroge Monaco (set 3)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/murogmbl.cpp b/src/mame/misc/murogmbl.cpp index fb1329eaf7a..894c6989c49 100644 --- a/src/mame/misc/murogmbl.cpp +++ b/src/mame/misc/murogmbl.cpp @@ -44,6 +44,8 @@ Dumped: 06/04/2009 f205v #include "speaker.h" +namespace { + class murogmbl_state : public driver_device { public: @@ -419,6 +421,9 @@ ROM_START(slotunbl) ROM_LOAD( "74s288.a8", 0x0000, 0x0020, NO_DUMP ) ROM_END +} // anonymous namespace + + GAME( 1982, murogmbl, murogem, murogmbl, murogmbl, murogmbl_state, empty_init, ROT0, "bootleg?", "Muroge Monaco (bootleg?)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1982, slotunbl, 0, slotunbl, slotunbl, slotunbl_state, empty_init, ROT0, "bootleg?", "Slot (unknown bootleg?)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/nexus3d.cpp b/src/mame/misc/nexus3d.cpp index 0868d5eb465..23b9538aeae 100644 --- a/src/mame/misc/nexus3d.cpp +++ b/src/mame/misc/nexus3d.cpp @@ -24,6 +24,7 @@ //#include "machine/i2cmem.h" +namespace { class nexus3d_state : public driver_device { @@ -376,5 +377,8 @@ void nexus3d_state::init_acheartf() // 0x107c serial? } +} // anonymous namespace + + GAME( 2005, acheart, 0, nexus3d, nexus3d, nexus3d_state, init_acheart, ROT0, "Examu", "Arcana Heart", MACHINE_IS_SKELETON ) GAME( 2006, acheartf, 0, nexus3d, nexus3d, nexus3d_state, init_acheartf, ROT0, "Examu", "Arcana Heart Full", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/nibble.cpp b/src/mame/misc/nibble.cpp index 0680bb01500..fe9305cc184 100644 --- a/src/mame/misc/nibble.cpp +++ b/src/mame/misc/nibble.cpp @@ -57,6 +57,8 @@ #include "tilemap.h" +namespace { + #define MASTER_CLOCK XTAL(12'000'000) @@ -88,7 +90,7 @@ private: void nibble_palette(palette_device &palette) const; uint32_t screen_update_nibble(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(nibble_interrupt); + [[maybe_unused]] INTERRUPT_GEN_MEMBER(nibble_interrupt); void nibble_map(address_map &map); void ramdac1_map(address_map &map); @@ -401,6 +403,8 @@ ROM_START( l9nibble ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/notechan.cpp b/src/mame/misc/notechan.cpp index 60324690faf..936e7fa3b40 100644 --- a/src/mame/misc/notechan.cpp +++ b/src/mame/misc/notechan.cpp @@ -294,6 +294,8 @@ #include "notechan.lh" +namespace { + #define MASTER_CLOCK XTAL(8'448'000) #define CPU_CLOCK MASTER_CLOCK / 2 // guess... not verified #define SND_CLOCK MASTER_CLOCK / 8 // guess... not verified @@ -534,6 +536,8 @@ ROM_START( notechan ) ROM_LOAD( "p-650_s1_ver1.00.ic21", 0x0000, 0x80000, CRC(1b8c835b) SHA1(73749c0077605f9ad56e9dd73b60ee04fe54eb73) ) ROM_END +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/nsg6809.cpp b/src/mame/misc/nsg6809.cpp index 77dfe7166f1..6a579fe9bf9 100644 --- a/src/mame/misc/nsg6809.cpp +++ b/src/mame/misc/nsg6809.cpp @@ -41,6 +41,8 @@ #include "machine/watchdog.h" +namespace { + class nsg6809_state : public driver_device { public: @@ -104,5 +106,7 @@ ROM_START( pitchhit ) ROM_LOAD( "ph101c__ck_a790.u14", 0x0000, 0x8000, CRC(1d306ab7) SHA1(13faf7c6dca8e5482672b2d09a99616896c4ae55) ) ROM_END +} // anonymous namespace + GAME(1993, pitchhit, 0, pitchhit, pitchhit, nsg6809_state, empty_init, ROT0, "National Sports Games", "Pitch Hitter - Baseball Challenge", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/nsmpoker.cpp b/src/mame/misc/nsmpoker.cpp index 66e4fd6d722..e3bee7928ea 100644 --- a/src/mame/misc/nsmpoker.cpp +++ b/src/mame/misc/nsmpoker.cpp @@ -66,6 +66,9 @@ #include "tilemap.h" + +namespace { + #define MASTER_CLOCK XTAL(22'118'400) @@ -464,6 +467,8 @@ ROM_START( nsmpoker ) ROM_LOAD( "113_281.2g", 0xb000, 0x2000, CRC(4b9b448a) SHA1(3ca1f5714cf5535d2ea1e7e03bca456c89af222c) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/odyssey.cpp b/src/mame/misc/odyssey.cpp index 3287a1019e3..da9082ceed9 100644 --- a/src/mame/misc/odyssey.cpp +++ b/src/mame/misc/odyssey.cpp @@ -69,6 +69,9 @@ #include "cpu/i386/i386.h" #include "machine/pci.h" + +namespace { + class odyssey_state : public driver_device { public: @@ -158,6 +161,8 @@ ROM_START( odyssey ) ROM_END +} // anonymous namespace + /************************************** * Game Driver(s) * diff --git a/src/mame/misc/othello.cpp b/src/mame/misc/othello.cpp index 8896a7aa3a2..55941bf047d 100644 --- a/src/mame/misc/othello.cpp +++ b/src/mame/misc/othello.cpp @@ -49,6 +49,8 @@ Limit for help/undo (matta): #include "speaker.h" +namespace { + constexpr uint8_t TILE_WIDTH = 6; @@ -449,4 +451,7 @@ ROM_START( othello ) ROM_LOAD( "7.ic42", 0x4000, 0x2000, CRC(a76705f7) SHA1(b7d2a65d65d065732ddd0b3b738749369b382b48)) ROM_END +} // anonymous namespace + + GAME( 1984, othello, 0, othello, othello, othello_state, empty_init, ROT0, "Success", "Othello (version 3.0)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/pachifev.cpp b/src/mame/misc/pachifev.cpp index de4a8aff2c0..b41d5adafeb 100644 --- a/src/mame/misc/pachifev.cpp +++ b/src/mame/misc/pachifev.cpp @@ -86,6 +86,9 @@ Stephh's notes (based on the game TMS9995 code and some tests) : #include "video/tms9928a.h" #include "speaker.h" + +namespace { + #define USE_MSM 0 #define NUM_PLUNGER_REPEATS 50 @@ -389,7 +392,9 @@ ROM_START( pachifev ) ROM_REGION( 0x4000, "adpcm", 0 ) ROM_LOAD( "ic66.10", 0x0000, 0x2000, CRC(217c573e) SHA1(6fb90865d1d81f5ea00fa7916d0ccb6756ef5ce5) ) - ROM_END +} // anonymous namespace + + GAME( 1983, pachifev, 0, pachifev, pachifev, pachifev_state, empty_init, ROT270, "Sanki Denshi Kogyo", "Pachifever", MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/misc/pasha2.cpp b/src/mame/misc/pasha2.cpp index fdf88f2ac0e..b2ea504134e 100644 --- a/src/mame/misc/pasha2.cpp +++ b/src/mame/misc/pasha2.cpp @@ -92,6 +92,8 @@ Notes: #include "pasha2.lh" +namespace { + class pasha2_state : public driver_device { public: @@ -595,5 +597,8 @@ void pasha2_state::init_pasha2() m_maincpu->space(AS_PROGRAM).install_read_handler(0x95744, 0x95747, read16sm_delegate(*this, FUNC(pasha2_state::pasha2_speedup_r))); } +} // anonymous namespace + + GAMEL( 1998, pasha2, 0, pasha2, pasha2, pasha2_state, init_pasha2, ROT0, "Dong Sung", "Pasha Pasha 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_pasha2 ) GAME ( 2000, zdrum, 0, zdrum, zdrum, pasha2_state, empty_init, ROT0, "PARA Enterprises", "Zooty Drum", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // missing HD dump, MP3 board emulation. Inputs seem to be read differently. diff --git a/src/mame/misc/photon.cpp b/src/mame/misc/photon.cpp index dbb4eccfe11..f58e56c2143 100644 --- a/src/mame/misc/photon.cpp +++ b/src/mame/misc/photon.cpp @@ -29,6 +29,8 @@ #include "speaker.h" +namespace { + class photon_state : public pk8000_base_state { public: @@ -285,6 +287,9 @@ ROM_START( phklad ) ROM_LOAD( "klad.bin", 0x0000, 0x4000, BAD_DUMP CRC(49cc7d65) SHA1(d966cfc1d973a533df8044a71fad37f7177da554) ) ROM_END +} // anonymous namespace + + GAME( 19??, phtetris, 0, photon, photon, photon_state, empty_init, ROT0, "", "Tetris (Photon System)", MACHINE_SUPPORTS_SAVE ) GAME( 1989?, phpython, 0, photon, photon, photon_state, empty_init, ROT0, "", "Python (Photon System)", MACHINE_SUPPORTS_SAVE ) GAME( 19??, phklad, 0, photon, photon, photon_state, empty_init, ROT0, "", "Klad / Labyrinth (Photon System)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/photon2.cpp b/src/mame/misc/photon2.cpp index 22124872757..b341954cd63 100644 --- a/src/mame/misc/photon2.cpp +++ b/src/mame/misc/photon2.cpp @@ -31,6 +31,8 @@ #include "speaker.h" +namespace { + class photon2_state : public driver_device { public: @@ -424,6 +426,9 @@ ROM_START( brod ) ROM_LOAD( "brod13.bin", 0xa000, 0x2000, CRC(1177cd17) SHA1(58c5c09a7b857ce6311339c4d0f4d8c1a7e232a3) ) ROM_END +} // anonymous namespace + + GAME( 19??, kok, 0, photon2, photon2, photon2_state, empty_init, ROT0, "bootleg", "Povar / Sobrat' Buran / Agroprom (Arcade multi-game bootleg of ZX Spectrum 'Cookie', 'Jetpac' & 'Pssst')", MACHINE_SUPPORTS_SAVE ) // originals (c)1983 ACG / Ultimate GAME( 19??, black, 0, photon2, black, photon2_state, empty_init, ROT0, "bootleg", "Czernyj Korabl (Arcade bootleg of ZX Spectrum 'Blackbeard')", MACHINE_SUPPORTS_SAVE ) // original (c)1988 Toposoft GAME( 19??, brod, 0, photon2, black, photon2_state, empty_init, ROT0, "bootleg", "Brodjaga (Arcade bootleg of ZX Spectrum 'Inspector Gadget and the Circus of Fear')", MACHINE_IMPERFECT_CONTROLS | MACHINE_SUPPORTS_SAVE ) // original (c)1987 BEAM software diff --git a/src/mame/misc/piggypas.cpp b/src/mame/misc/piggypas.cpp index f1c06052db6..989ecbbefa6 100644 --- a/src/mame/misc/piggypas.cpp +++ b/src/mame/misc/piggypas.cpp @@ -23,6 +23,8 @@ game details unknown #include "piggypas.lh" +namespace { + class piggypas_state : public driver_device { public: @@ -367,6 +369,7 @@ ROM_START( 3lilpigs ) ROM_LOAD( "3-pigs.u14", 0x00000, 0x40000, CRC(62eb76e2) SHA1(c4cad241dedf2c290f9bf80038415fe39b3ce17d) ) ROM_END +} // anonymous namespace // COPYRIGHT (c) 1990, 1991, 1992, DOYLE & ASSOC., INC. VERSION 04.40 diff --git a/src/mame/misc/pkscram.cpp b/src/mame/misc/pkscram.cpp index 5da4aca8ec7..89e1869fa71 100644 --- a/src/mame/misc/pkscram.cpp +++ b/src/mame/misc/pkscram.cpp @@ -24,6 +24,8 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli #include "tilemap.h" +namespace { + class pkscram_state : public driver_device { public: @@ -356,5 +358,7 @@ ROM_START( pkscram ) ROM_LOAD16_BYTE( "pk4.1e", 0x00001, 0x20000, CRC(a232d993) SHA1(1b7b15cf0fabf3b2b2e429506a78ff4c08f4f7a5) ) ROM_END +} // anonymous namespace + GAME( 1993, pkscram, 0, pkscramble, pkscramble, pkscram_state, empty_init, ROT0, "Cosmo Electronics Corporation", "PK Scramble", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/pntnpuzl.cpp b/src/mame/misc/pntnpuzl.cpp index 8d10de6c592..619a637e01c 100644 --- a/src/mame/misc/pntnpuzl.cpp +++ b/src/mame/misc/pntnpuzl.cpp @@ -148,6 +148,8 @@ CN1 standard DB15 VGA connector (15KHz) #include "screen.h" +namespace { + class pntnpuzl_state : public driver_device { public: @@ -426,4 +428,7 @@ void pntnpuzl_state::init_pip() } +} // anonymous namespace + + GAME( 1993, pntnpuzl, 0, pntnpuzl, pntnpuzl, pntnpuzl_state, init_pip, ROT90, "Century Vending", "Paint 'N Puzzle", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) diff --git a/src/mame/misc/pokerout.cpp b/src/mame/misc/pokerout.cpp index 72ede521bc5..f4da8d2b0c0 100644 --- a/src/mame/misc/pokerout.cpp +++ b/src/mame/misc/pokerout.cpp @@ -194,6 +194,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + #define MASTER_CLOCK XTAL(10'738'000) #define VDP_CLOCK MASTER_CLOCK #define CPU_CLOCK MASTER_CLOCK / 3 @@ -388,6 +391,8 @@ ROM_START(pokerout) ROM_LOAD("f_tms128a.8f", 0x4000, 0x4000, CRC(57a7bff2) SHA1(a466c881fcd2a339960936e21da7e2079e7d75ca)) ROM_END +} // anonymous namespace + /*************************************************************************** * Game Drivers * diff --git a/src/mame/misc/potgoldu.cpp b/src/mame/misc/potgoldu.cpp index bfb586162ad..e7ac22b4c49 100644 --- a/src/mame/misc/potgoldu.cpp +++ b/src/mame/misc/potgoldu.cpp @@ -25,6 +25,8 @@ #include "screen.h" +namespace { + class potgold_state : public driver_device { public: @@ -132,5 +134,8 @@ ROM_START( potgoldu580 ) // TMS34010FNL-40 + MC68H705 + YMF704C + ADV476KP35 RAM ROM_LOAD( "potgoldu_mc68hc705j1acp.bin", 0x000, 0x800, CRC(4130e596) SHA1(cd7e80a371abd4208a64c537fc84f1525be9203c) ) // 'Ver 1.00a' (assumed to be for this set) ROM_END +} // anonymous namespace + + GAME( 200?, potgoldu, 0, potgold, potgold, potgold_state, empty_init, ROT0, "U.S. Games Inc.", "Pot O' Gold (U.S. Games, v400x?)", MACHINE_IS_SKELETON ) GAME( 2001, potgoldu580, potgoldu, potgold580, potgold, potgold_state, empty_init, ROT0, "U.S. Games Inc.", "Pot O' Gold (U.S. Games, v580F)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/proconn.cpp b/src/mame/misc/proconn.cpp index c8716f13d67..bcd909e5670 100644 --- a/src/mame/misc/proconn.cpp +++ b/src/mame/misc/proconn.cpp @@ -41,6 +41,8 @@ #include "proconn.lh" +namespace { + class proconn_state : public driver_device { public: @@ -143,8 +145,8 @@ private: int m_meter = 0; virtual void machine_reset() override; void meter_w(uint8_t data); - void serial_transmit(offs_t offset, uint16_t data); - uint16_t serial_receive(offs_t offset); + [[maybe_unused]] void serial_transmit(offs_t offset, uint16_t data); + [[maybe_unused]] uint16_t serial_receive(offs_t offset); }; void proconn_state::proconn_map(address_map &map) @@ -1233,6 +1235,9 @@ void proconn_state::init_proconn() { } +} // anonymous namespace + + GAME( 199?, pr_lday, 0, proconn, proconn, proconn_state, init_proconn, ROT0, "Project", "'L' Of A Day (Project) (Cash set) (PROCONN)",MACHINE_IS_SKELETON_MECHANICAL ) GAME( 199?, pr_ldaya, pr_lday, proconn, proconn, proconn_state, init_proconn, ROT0, "Project", "'L' Of A Day (Project) (Token set) (PROCONN)",MACHINE_IS_SKELETON_MECHANICAL ) GAME( 199?, pr_5xcsh, 0, proconn, proconn, proconn_state, init_proconn, ROT0, "Project", "5x Cash (Project) (PROCONN)",MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/psattack.cpp b/src/mame/misc/psattack.cpp index 0a64c19c60a..03d21c77bf1 100644 --- a/src/mame/misc/psattack.cpp +++ b/src/mame/misc/psattack.cpp @@ -134,6 +134,8 @@ GUN_xP are 6 pin gun connectors (pins 3-6 match the UNICO sytle guns): #include "emupal.h" +namespace { + class psattack_state : public driver_device { public: @@ -267,5 +269,8 @@ void psattack_state::init_psattack() { } +} // anonymous namespace + + GAME( 2004, psattack, 0, psattack, psattack, psattack_state, init_psattack, ROT0, "Uniana", "P's Attack", MACHINE_IS_SKELETON ) // has a CF card instead of flash roms diff --git a/src/mame/misc/pse.cpp b/src/mame/misc/pse.cpp index c8d01c92a89..76b611d5cd5 100644 --- a/src/mame/misc/pse.cpp +++ b/src/mame/misc/pse.cpp @@ -30,6 +30,9 @@ #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -206,6 +209,8 @@ ROM_START( gametree ) ROM_LOAD( "bd2a3.a3", 0x1020, 0x0020, CRC(63dc8c9b) SHA1(0956180a3d8877aed181513887f5a8b15cd81b93)) // Contains PROM address codes and image speeds. PCB has MMI 6331; schematics show 82S123 or 6331-1 ROM_END +} // anonymous namespace + GAME( 1976, bazooka, 0, pse, 0, pse_state, empty_init, ROT0, "Project Support Engineering", "Bazooka [TTL]", MACHINE_IS_SKELETON ) GAME( 1977, bazookabr, bazooka, pse, 0, pse_state, empty_init, ROT0, "Taito do Brasil", "Bazooka (Brazil) [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/quizo.cpp b/src/mame/misc/quizo.cpp index 835d42e31ed..828dd6ba9e6 100644 --- a/src/mame/misc/quizo.cpp +++ b/src/mame/misc/quizo.cpp @@ -33,6 +33,8 @@ Xtals 8MHz, 21.47727MHz #include "speaker.h" +namespace { + class quizo_state : public driver_device { public: @@ -256,5 +258,8 @@ ROM_START( quizoa ) ROM_LOAD("82s123", 0x00, 0x20, CRC(c3f15914) SHA1(19fd8e6f2a1256ae51c500a3bf1d7358810ef97e)) ROM_END +} // anonymous namespace + + GAME( 1985, quizo, 0, quizo, quizo, quizo_state, empty_init, ROT0, "Seoul Coin Corp.", "Quiz Olympic (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1985, quizoa, quizo, quizo, quizo, quizo_state, empty_init, ROT0, "Seoul Coin Corp.", "Quiz Olympic (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/roul.cpp b/src/mame/misc/roul.cpp index 6685e731076..804d4576e72 100644 --- a/src/mame/misc/roul.cpp +++ b/src/mame/misc/roul.cpp @@ -74,6 +74,8 @@ Stephh's notes (based on the game Z80 code and some tests) : #include "roul.lh" +namespace { + class roul_state : public driver_device { public: @@ -356,4 +358,7 @@ ROM_START(roul) ROM_LOAD( "roul.u38", 0x0020, 0x0020, CRC(23ae22c1) SHA1(bf0383462976ec6341ffa8a173264ce820bc654a) ) ROM_END +} // anonymous namespace + + GAMEL( 1990, roul, 0, roul, roul, roul_state, empty_init, ROT0, "bootleg", "Super Lucky Roulette", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE, layout_roul ) diff --git a/src/mame/misc/rulechan.cpp b/src/mame/misc/rulechan.cpp index 56478fe5258..f0f01802b10 100644 --- a/src/mame/misc/rulechan.cpp +++ b/src/mame/misc/rulechan.cpp @@ -179,6 +179,9 @@ #include "rulechan.lh" + +namespace { + #define CPU_CLOCK XTAL(8'000'000) // guess #define VID_CLOCK XTAL(21'477'272) // guess #define TMS_CLOCK (CPU_CLOCK / 4) // guess @@ -800,6 +803,8 @@ void rulechan_state::rulechan_init() m_updn4 = 0; } +} // anonymous namespace + /************************************** * Game Driver(s) * diff --git a/src/mame/misc/sanremmg.cpp b/src/mame/misc/sanremmg.cpp index 68278f6de4c..bc3db5d4c5d 100644 --- a/src/mame/misc/sanremmg.cpp +++ b/src/mame/misc/sanremmg.cpp @@ -38,6 +38,8 @@ M30624FG (M16C/62A family) needs CPU core and dumping of internal ROM #include "screen.h" +namespace { + class sanremmg_state : public driver_device { public: @@ -139,6 +141,9 @@ ROM_START( elsygame ) // there is space for what looks like a 3rd rom ROM_END +} // anonymous namespace + + GAME( 2003, sanremmg, 0, sanremmg, sanremmg, sanremmg_state, empty_init, ROT0, "San Remo Games", "unknown San Remo / Elsy Multigame", MACHINE_IS_SKELETON ) GAME( 200?, elsypokr, 0, sanremmg, sanremmg, sanremmg_state, empty_init, ROT0, "Electro System (Elsy)", "unknown Elsy poker", MACHINE_IS_SKELETON ) GAME( 2002, elsygame, 0, sanremmg, sanremmg, sanremmg_state, empty_init, ROT0, "Electro System (Elsy)", "unknown Elsy game", MACHINE_IS_SKELETON ) // Fruit Diamont (sic)? diff --git a/src/mame/misc/scm_500.cpp b/src/mame/misc/scm_500.cpp index 535644f35b0..bbbe700a006 100644 --- a/src/mame/misc/scm_500.cpp +++ b/src/mame/misc/scm_500.cpp @@ -13,6 +13,9 @@ http://www.standardchange.com/frequently-asked-questions #include "emu.h" #include "cpu/mcs51/mcs51.h" + +namespace { + class scm_500_state : public driver_device { public: @@ -93,5 +96,8 @@ ROM_START( scm_500 ) ROM_LOAD_BIOS( 4, "stndxgr_307", 0x00000, 0x10000, CRC(4d0d91c6) SHA1(85ff5d43ec331bcd4cde6aaf82f6143acc7e020c) ) // USA 03.07 (could be 500E specific) ROM_END +} // anonymous namespace + + GAME( 1987, scm_500, 0, scm_500, scm_500, scm_500_state, empty_init, ROT0, "Standard Change-Makers", "Standard Change-Makers System 500 / 500E", MACHINE_IS_SKELETON_MECHANICAL ) // 1995 - 500E - same basic hw? diff --git a/src/mame/misc/sealy.cpp b/src/mame/misc/sealy.cpp index 93d3c697800..32292b784c9 100644 --- a/src/mame/misc/sealy.cpp +++ b/src/mame/misc/sealy.cpp @@ -34,6 +34,9 @@ Notes: #include "screen.h" #include "speaker.h" + +namespace { + // 13.0 MHz? PCB is labeled with 13.5M #define MAIN_CLOCK 13000000 @@ -139,5 +142,7 @@ ROM_START( crzyddz ) ROM_LOAD( "3", 0x00000, 0x80000, CRC(cb626168) SHA1(652b20e92c82de480e3cd41c2e3c984fcb0c120a) ) ROM_END +} // anonymous namespace + GAME( 2004?, crzyddz, 0, sealy, sealy, sealy_state, empty_init, ROT0, "Sealy", "Crazy Dou Di Zhu", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/sealy_fr.cpp b/src/mame/misc/sealy_fr.cpp index 8c809a223ae..66bde56b5f9 100644 --- a/src/mame/misc/sealy_fr.cpp +++ b/src/mame/misc/sealy_fr.cpp @@ -16,6 +16,9 @@ #include "emu.h" #include "screen.h" + +namespace { + class sealy_fr_state : public driver_device { public: @@ -40,6 +43,8 @@ void sealy_fr_state::sealy_fr(machine_config &config) // unemulated Frontrunner1s SOC } +} // anonymous namespace + ROM_START( snowbwar ) DISK_REGION( "sdcard" ) // 4GB Micro SD Card (Kingston SDC4/4GB 111) diff --git a/src/mame/misc/sfbonus.cpp b/src/mame/misc/sfbonus.cpp index eecf2bb6550..2183d4d1914 100644 --- a/src/mame/misc/sfbonus.cpp +++ b/src/mame/misc/sfbonus.cpp @@ -285,6 +285,8 @@ MH86171 Color Palette RAMDAC #include "pirpok2.lh" +namespace { + class sfbonus_state : public driver_device { public: @@ -5965,6 +5967,8 @@ void sfbonus_state::init_fb3g() { sfbonus_bitswap( 0x39, 1,2,7,6,5,4 void sfbonus_state::init_getrich() { sfbonus_bitswap( 0x3c, 1,2,7,6,5,4,3,0, 0xea, 2,7,6,5,4,3,0,1, 0x23, 1,0,2,7,6,5,4,3, 0xa8, 4,3,1,2,0,7,6,5, 0x3b, 1,0,7,6,5,4,3,2, 0xec, 1,7,6,5,4,3,2,0, 0x24, 0,2,1,7,6,5,4,3, 0xa9, 4,3,0,1,2,7,6,5); } void sfbonus_state::init_mcircus() { sfbonus_bitswap( 0x39, 1,2,7,6,5,4,3,0, 0xef, 2,7,6,5,4,3,0,1, 0x21, 1,0,2,7,6,5,4,3, 0xa8, 4,3,1,2,0,7,6,5, 0x3b, 1,0,7,6,5,4,3,2, 0xe9, 1,7,6,5,4,3,2,0, 0x23, 0,2,1,7,6,5,4,3, 0xac, 4,3,0,1,2,7,6,5); } +} // anonymous namespace + GAME( 2002, suprball, 0, sfbonus, amcoe2_reels3, sfbonus_state, init_suprball, ROT0, "Amcoe", "Super Ball (Version 1.3)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/skeetsht.cpp b/src/mame/misc/skeetsht.cpp index 25da1912e19..fc2401d2ab7 100644 --- a/src/mame/misc/skeetsht.cpp +++ b/src/mame/misc/skeetsht.cpp @@ -21,6 +21,8 @@ #include "speaker.h" +namespace { + /************************************* * * Structs @@ -280,6 +282,8 @@ ROM_START( popshot ) DISK_IMAGE_READONLY( "popshot", 0, NO_DUMP ) // unknown disc label? ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/misc/skimaxx.cpp b/src/mame/misc/skimaxx.cpp index d9bfdc55c3e..eabc589b56b 100644 --- a/src/mame/misc/skimaxx.cpp +++ b/src/mame/misc/skimaxx.cpp @@ -45,6 +45,8 @@ #include "speaker.h" +namespace { + class skimaxx_state : public driver_device { public: @@ -614,6 +616,8 @@ ROM_START( skimaxx ) ROM_LOAD( "main2_0.u4", 0x000000, 0x80000, CRC(c84b3c46) SHA1(b956358518495aa822a5b699cbad1abac212dd09) ) // identical to main2_0.u2 ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/misc/skopro.cpp b/src/mame/misc/skopro.cpp index 0748ecc5b48..53ce8cea4db 100644 --- a/src/mame/misc/skopro.cpp +++ b/src/mame/misc/skopro.cpp @@ -26,6 +26,9 @@ #include "cpu/i386/i386.h" #include "machine/pci.h" + +namespace { + class skopro_state : public driver_device { public: @@ -74,5 +77,7 @@ ROM_START( drgdance ) DISK_IMAGE( "dragon_dance", 0, SHA1(73868dd9354d936100ba56f460e872087ede012c) ) ROM_END +} // anonymous namespace + GAME( 2008, drgdance, 0, skopro, skopro, skopro_state, empty_init, ROT0, "Success", "Dragon Dance (V1.02J)", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/skyarmy.cpp b/src/mame/misc/skyarmy.cpp index 12b810b78b8..7fc37ad633b 100644 --- a/src/mame/misc/skyarmy.cpp +++ b/src/mame/misc/skyarmy.cpp @@ -34,6 +34,8 @@ #include "tilemap.h" +namespace { + class skyarmy_state : public driver_device { public: @@ -374,4 +376,7 @@ ROM_START( skyarmy ) ROM_LOAD( "a6.bin", 0x0000, 0x0020, CRC(c721220b) SHA1(61b3320fb616c0600d56840cb6438616c7e0c6eb) ) ROM_END +} // anonymous namespace + + GAME( 1982, skyarmy, 0, skyarmy, skyarmy, skyarmy_state, empty_init, ROT90, "Shoei", "Sky Army", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/smotor.cpp b/src/mame/misc/smotor.cpp index 518d1e9fbd4..1c63e793caf 100644 --- a/src/mame/misc/smotor.cpp +++ b/src/mame/misc/smotor.cpp @@ -133,6 +133,9 @@ #include "speaker.h" #include "tilemap.h" + +namespace { + #define FIRST_CLOCK XTAL(5'000'000) #define SECOND_CLOCK XTAL(20'000'000) #define CPU_CLOCK (FIRST_CLOCK) // verified 5 MHz. @@ -528,6 +531,8 @@ ROM_START( smotor ) ROM_LOAD( "3_gal16v8.l2", 0x0000, 0x0117, NO_DUMP ) // device is dead ROM_END +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/smsmcorp.cpp b/src/mame/misc/smsmcorp.cpp index 60710d5bc94..078e8db9f3f 100644 --- a/src/mame/misc/smsmcorp.cpp +++ b/src/mame/misc/smsmcorp.cpp @@ -225,6 +225,8 @@ U145 1Brown PAL14H4CN #include "speaker.h" +namespace { + class smsmfg_state : public driver_device { public: @@ -970,6 +972,8 @@ ROM_START( secondch ) ROM_RELOAD( 0x1000, 0x1000 ) ROM_END +} // anonymous namespace + GAME( 1984, trvhang, 0, sms, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 1)", MACHINE_SUPPORTS_SAVE ) // Version Trivia-1-050185 GAME( 1984, trvhanga, 0, sms, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 2)", MACHINE_NOT_WORKING ) // Version Trivia-2-011586 diff --git a/src/mame/misc/spool99.cpp b/src/mame/misc/spool99.cpp index 0f2f62540e1..716a97dc834 100644 --- a/src/mame/misc/spool99.cpp +++ b/src/mame/misc/spool99.cpp @@ -101,6 +101,8 @@ Note #include "tilemap.h" +namespace { + class spool99_state : public driver_device { public: @@ -473,6 +475,7 @@ void spool99_state::init_spool99() memcpy(m_main, ROM, 0x100); } +} // anonymous namespace GAME( 1998, spool99, 0, spool99, spool99, spool99_state, init_spool99, ROT0, "Electronic Projects", "Super Pool 99 (Version 0.36)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/sprcros2.cpp b/src/mame/misc/sprcros2.cpp index 3d77b266c62..9abb61d8904 100644 --- a/src/mame/misc/sprcros2.cpp +++ b/src/mame/misc/sprcros2.cpp @@ -60,6 +60,9 @@ SC-61.5A #include "screen.h" #include "speaker.h" + +namespace { + #define MAIN_CLOCK XTAL(10'000'000) class sprcros2_state : public driver_device @@ -571,5 +574,8 @@ ROM_START( sprcros2a ) ROM_LOAD( "sc-60.4k", 0x0320, 0x0100, CRC(d7a4e57d) SHA1(6db02ec6aa55b05422cb505e63c71e36b4b11b4a) ) //fg clut ROM_END +} // anonymous namespace + + GAME( 1986, sprcros2, 0, sprcros2, sprcros2, sprcros2_state, empty_init, ROT0, "GM Shoji", "Super Cross II (Japan, set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1986, sprcros2a, sprcros2, sprcros2, sprcros2, sprcros2_state, empty_init, ROT0, "GM Shoji", "Super Cross II (Japan, set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/sstrangr.cpp b/src/mame/misc/sstrangr.cpp index 72b13d954f2..faf496ab0e9 100644 --- a/src/mame/misc/sstrangr.cpp +++ b/src/mame/misc/sstrangr.cpp @@ -333,6 +333,8 @@ TODO: #include "sstrangr.lh" +namespace { + class sstrangr_state : public driver_device { public: @@ -685,6 +687,8 @@ ROM_START( sstrangr2 ) ROM_LOAD( "2708.15", 0x0000, 0x0400, CRC(c176a89d) SHA1(955dd540dc3787091c3f34ae122a13e6b7523414) ) ROM_END +} // anonymous namespace + GAMEL( 1978, sstrangr, 0, sstrangr, sstrangr, sstrangr_state, empty_init, ROT270, "Yachiyo Electronics, Ltd.", "Space Stranger", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_sstrangr ) GAME( 1979, sstrangr2, sstrangr, sstrngr2, sstrngr2, sstrangr_state, empty_init, ROT270, "Yachiyo Electronics, Ltd.", "Space Stranger 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/statriv2.cpp b/src/mame/misc/statriv2.cpp index fa81b8e14a0..cb225c6da5a 100644 --- a/src/mame/misc/statriv2.cpp +++ b/src/mame/misc/statriv2.cpp @@ -81,6 +81,8 @@ Issues: #include "tilemap.h" +namespace { + class statriv2_state : public driver_device { public: @@ -1704,6 +1706,7 @@ void statriv2_state::init_laserdisc() ); } +} // anonymous namespace /************************************* diff --git a/src/mame/misc/strkzn.cpp b/src/mame/misc/strkzn.cpp index c8cc13becbe..2c6f8a7ad48 100644 --- a/src/mame/misc/strkzn.cpp +++ b/src/mame/misc/strkzn.cpp @@ -13,6 +13,9 @@ #include "cpu/z80/z80.h" #include "cpu/i86/i186.h" + +namespace { + class strkzn_state : public driver_device { public: @@ -81,4 +84,7 @@ ROM_START( strkzn ) ROM_LOAD( "strkznu16", 0x00000, 0x80000, CRC(67f7674b) SHA1(451a26da55315fcaccdc02817521c78acdd8eb8a) ) ROM_END +} // anonymous namespace + + GAME( 1994, strkzn, 0, strkzn, strkzn, strkzn_state, empty_init, ROT0, "Purple Star", "Strike Zone (Purple Star)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/stuntair.cpp b/src/mame/misc/stuntair.cpp index 8dff861403b..c51196e07d2 100644 --- a/src/mame/misc/stuntair.cpp +++ b/src/mame/misc/stuntair.cpp @@ -92,6 +92,8 @@ Bprom dump by f205v #include "tilemap.h" +namespace { + class stuntair_state : public driver_device { public: @@ -595,5 +597,7 @@ ROM_START( stuntair ) ROM_LOAD_NIB_LOW ( "dm74s288n.7a", 0x100, 0x020, CRC(5779e751) SHA1(89c955ef8635ad3e9d699f33ec0e4d6c9205d01c) ) // ? ROM_END +} // anonymous namespace + GAME( 1983, stuntair, 0, stuntair, stuntair, stuntair_state, empty_init, ROT90, "Nuova Videotron", "Stunt Air", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/misc/summit.cpp b/src/mame/misc/summit.cpp index 9d7d50f208a..1c02e10f23a 100644 --- a/src/mame/misc/summit.cpp +++ b/src/mame/misc/summit.cpp @@ -32,6 +32,8 @@ #include "summit.lh" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -436,6 +438,8 @@ ROM_START( pushover ) ROM_LOAD( "prom4.bin", 0xc00, 0x400, CRC(ce26b2c4) SHA1(a44b7a05c0c72592fe6083244c785e9ed1149909) ) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/misc/sumt8035.cpp b/src/mame/misc/sumt8035.cpp index d1e67fd4e00..c74f385f72f 100644 --- a/src/mame/misc/sumt8035.cpp +++ b/src/mame/misc/sumt8035.cpp @@ -16,6 +16,8 @@ hardware. We don't have the ROMs for that though. #include "cpu/mcs48/mcs48.h" +namespace { + class sumt8035_state : public driver_device { public: @@ -260,6 +262,8 @@ ROM_START( sm_ultng ) ROM_LOAD( "ultnudge.p2", 0x0800, 0x000803, CRC(2e9fbd57) SHA1(3a6a695b6d8e9de5635186301dd857e5f1080078) ) ROM_END +} // anonymous namespace + GAME( 1981, sm_ngacc, 0, summit, summit, sumt8035_state, empty_init, ROT270, "Summit Coin", "Nudge Accumulator (Summit Coin)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1981, sm_ultng, 0, summit, summit, sumt8035_state, empty_init, ROT270, "Summit Coin", "Ultimate Nudge (Summit Coin)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/misc/tapatune.cpp b/src/mame/misc/tapatune.cpp index 66fd313b89e..f7e5782ca80 100644 --- a/src/mame/misc/tapatune.cpp +++ b/src/mame/misc/tapatune.cpp @@ -47,6 +47,8 @@ #include "speaker.h" +namespace { + /************************************* * * Driver state @@ -643,6 +645,9 @@ ROM_START( smartoss ) ROM_LOAD( "s-tossem.u27", 0x0000, 0x40000, CRC(703d19b7) SHA1(75641d885885a67bd66afa38577c7907fa505b0b) ) ROM_END +} // anonymous namespace + + /************************************* * * Game driver(s) diff --git a/src/mame/misc/teamjocs.cpp b/src/mame/misc/teamjocs.cpp index cdbd7512aea..7dff04d0e74 100644 --- a/src/mame/misc/teamjocs.cpp +++ b/src/mame/misc/teamjocs.cpp @@ -38,6 +38,8 @@ #include "speaker.h" +namespace { + class teamjocs_state : public driver_device { public: @@ -78,5 +80,7 @@ ROM_START(diaelite) ROM_LOAD( "m28c17.ic13", 0x000, 0x800, CRC(4a292b0d) SHA1(1f86e52b52ed53a7a8197e1ee394876dfc51fb91) ) ROM_END +} // anonymous namespace + GAME(199?, diaelite, 0, teamjocs, teamjocs, teamjocs_state, empty_init, ROT0, "Recreativos Presas", "Diana Elite", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/misc/tecnodar.cpp b/src/mame/misc/tecnodar.cpp index d2c14f04c2b..58cadfeea42 100644 --- a/src/mame/misc/tecnodar.cpp +++ b/src/mame/misc/tecnodar.cpp @@ -45,6 +45,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class tecnodar_state : public driver_device { public: @@ -353,6 +356,8 @@ ROM_START(tecnodargr) ROM_LOAD("16as25hb1.bin", 0x000, 0x117, NO_DUMP) ROM_END +} // anonymous namespace + GAME(1991, tecnodar, 0, tecnodar, tecnodar, tecnodar_state, empty_init, ROT0, "Automatics Pasqual", "Tecnodarts", MACHINE_MECHANICAL | MACHINE_NOT_WORKING) GAME(1991, tecnodargr, tecnodar, tecnodar, tecnodar, tecnodar_state, empty_init, ROT0, "Automatics Pasqual / Recreativos G.R.", "Tecnodarts (Recreativos G.R. license)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING) diff --git a/src/mame/misc/thayers.cpp b/src/mame/misc/thayers.cpp index 5b5ce89b9cf..6a9b4883dae 100644 --- a/src/mame/misc/thayers.cpp +++ b/src/mame/misc/thayers.cpp @@ -22,6 +22,9 @@ #include "thayers.lh" +namespace { + + #define LOG 0 struct ssi263_t @@ -862,6 +865,9 @@ ROM_START( thayersa ) DISK_IMAGE_READONLY( "thayers", 0, NO_DUMP ) ROM_END +} // anonymous namespace + + /* Game Drivers */ // YEAR NAME PARENT MACHINE INPUT CLASS INIT MONITOR COMPANY FULLNAME FLAGS LAYOUT diff --git a/src/mame/misc/triviaquiz.cpp b/src/mame/misc/triviaquiz.cpp index a19b0eb88a4..7caf207be38 100644 --- a/src/mame/misc/triviaquiz.cpp +++ b/src/mame/misc/triviaquiz.cpp @@ -37,6 +37,9 @@ #include "video/tms9928a.h" #include "screen.h" + +namespace { + class triviaquiz_state : public driver_device { public: @@ -200,5 +203,8 @@ ROM_START( triviaqz2 ) ROM_LOAD( "norway_historie_1.bin", 0x20000, 0x8000, CRC(b2fbce41) SHA1(9e94fc4efd03aff180a5bd94727f5be59647af52) ) ROM_END +} // anonymous namespace + + GAME( 1985, triviaqz, 0, triviaquiz, triviaquiz, triviaquiz_state, empty_init, ROT0, "Intermatic Manufacturing", "Professor Trivia (set 1)", MACHINE_NO_SOUND ) // or Trivia Video Quiz? Professor Trivia appears on more screens GAME( 1985, triviaqz2, triviaqz, triviaquiz, triviaquiz, triviaquiz_state, empty_init, ROT0, "Intermatic Manufacturing", "Professor Trivia (set 2)", MACHINE_NO_SOUND ) diff --git a/src/mame/misc/trvmadns.cpp b/src/mame/misc/trvmadns.cpp index 831e139e962..1c24ea38eb2 100644 --- a/src/mame/misc/trvmadns.cpp +++ b/src/mame/misc/trvmadns.cpp @@ -88,6 +88,8 @@ Roms: row d-e sex a1 - type 27128 #include "trvmadns.lh" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -429,6 +431,8 @@ ROM_START( trvmadnsa ) ROM_LOAD("pal10l8_la1.u5", 0x00, 0x2c, CRC(66d6eee0) SHA1(f95d9bfc2a6038237014eec30d859d8b8c296725)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/misc/tugboat.cpp b/src/mame/misc/tugboat.cpp index 516ad959c4c..248a9ca5aa2 100644 --- a/src/mame/misc/tugboat.cpp +++ b/src/mame/misc/tugboat.cpp @@ -34,6 +34,8 @@ always false - counter was reloaded and incremented before interrupt occurs #include "speaker.h" +namespace { + class tugboat_state : public driver_device { public: @@ -437,6 +439,8 @@ ROM_START( berenstn ) ROM_LOAD( "n.t.2-031j.24s10", 0x0000, 0x0100, CRC(236672bf) SHA1(57482d0a23223ef7b211045ad28d3e41e90f961e) ) ROM_END +} // anonymous namespace + GAME( 1982, tugboat, 0, tugboat, tugboat, tugboat_state, empty_init, ROT90, "Enter-Tech, Ltd.", "Tugboat", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1983, noahsark, 0, tugboat, noahsark, tugboat_state, empty_init, ROT90, "Enter-Tech, Ltd.", "Noah's Ark", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/tvg01.cpp b/src/mame/misc/tvg01.cpp index e252298ea25..2f30155df83 100644 --- a/src/mame/misc/tvg01.cpp +++ b/src/mame/misc/tvg01.cpp @@ -63,6 +63,8 @@ #include "speaker.h" +namespace { + class tvg01_state : public driver_device { public: @@ -328,6 +330,8 @@ ROM_START(theboat) // Empty socket for one more ROM (IC16), ROM_END +} // anonymous namespace + // YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS GAME(1987, theboat, 0, theboat, theboat, tvg01_state, empty_init, ROT0, "Hit Gun Co, LTD", "The Boat", MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/misc/unkpoker.cpp b/src/mame/misc/unkpoker.cpp index 0d248b3c1ee..8d0332b44be 100644 --- a/src/mame/misc/unkpoker.cpp +++ b/src/mame/misc/unkpoker.cpp @@ -38,6 +38,9 @@ TODO: stuck if it isn't immediately coined up at boot. #include "emupal.h" #include "speaker.h" + +namespace { + class unkpoker_state : public driver_device { public: @@ -179,4 +182,7 @@ ROM_START( unkpoker ) ROM_LOAD( "cd.3c", 0x0800, 0x0800, CRC(b61adb76) SHA1(9805593fc6d9b01e4a63bfc35e5442c4c547c103) ) ROM_END +} // anonymous namespace + + GAME(1980?, unkpoker, 0, unkpoker, unkpoker, unkpoker_state, empty_init, ROT0, "", "unknown 1980 poker game", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/misc/usbilliards.cpp b/src/mame/misc/usbilliards.cpp index 23d1aa3aad7..ea410036802 100644 --- a/src/mame/misc/usbilliards.cpp +++ b/src/mame/misc/usbilliards.cpp @@ -22,6 +22,9 @@ #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied from Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -134,4 +137,7 @@ ROM_START( sharkusb ) ROM_LOAD( "82s123_a.6n", 0x0100, 0x0100, CRC(63f621cb) SHA1(6c6e6f22313db33afd069dae1b0180b5ccddfa56) ) // 82s123 - handwritten A - A also etched in copper next to socket ROM_END +} // anonymous namespace + + GAME( 1975, sharkusb, 0, usbilliards, 0, usbilliards_state, empty_init, ROT0, "US Billiards Inc.", "Shark [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/misc/v0bowl.cpp b/src/mame/misc/v0bowl.cpp index db28d0fbb56..3cea1ed2976 100644 --- a/src/mame/misc/v0bowl.cpp +++ b/src/mame/misc/v0bowl.cpp @@ -18,6 +18,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class v0bowl_state : public driver_device { public: @@ -153,4 +156,7 @@ ROM_START( v0bowl ) ROM_LOAD( "bowling.001", 0x000000, 0x1e8be000, BAD_DUMP CRC(aebb2b01) SHA1(cd11f74f6512350ac10f822937b8769f552aabf3) ) ROM_END +} // anonymous namespace + + GAME( 200?, v0bowl, 0, v0bowl, v0bowl, v0bowl_state, empty_init, ROT0, "A1 Amusement One", "unknown VRender0+ bowling game", MACHINE_IS_SKELETON ) // Return Bowl? diff --git a/src/mame/misc/vcombat.cpp b/src/mame/misc/vcombat.cpp index ddb2e29853c..d1c96f9168b 100644 --- a/src/mame/misc/vcombat.cpp +++ b/src/mame/misc/vcombat.cpp @@ -97,6 +97,8 @@ TODO : This is a partially working driver. Most of the memory maps for #include "logmacro.h" +namespace { + class vcombat_state : public driver_device { public: @@ -821,6 +823,9 @@ ROM_START( shadfgtr ) /* The second upper-board PAL couldn't be read */ ROM_END +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS GAME( 1993, vcombat, 0, vcombat, vcombat, vcombat_state, init_vcombat, ORIENTATION_FLIP_X, "VR8 Inc.", "Virtual Combat", MACHINE_NOT_WORKING ) GAME( 1993, shadfgtr, 0, shadfgtr, shadfgtr, vcombat_state, init_shadfgtr, ROT0, "Dutech Inc.", "Shadow Fighters", MACHINE_NOT_WORKING ) diff --git a/src/mame/misc/video21.cpp b/src/mame/misc/video21.cpp index f9d1cf15def..355c6711ace 100644 --- a/src/mame/misc/video21.cpp +++ b/src/mame/misc/video21.cpp @@ -32,6 +32,9 @@ When booted, press Key out (mapped to W by default) to get it going. #include "video21.lh" + +namespace { + class video21_state : public driver_device { public: @@ -297,4 +300,7 @@ ROM_START( video21 ) ROM_LOAD_NIB_LOW ( "43", 0x0000, 0x0400, CRC(0ecb0aab) SHA1(7f3f1b93a5d38828ae3e97e5f8ef1a6a96dc798b) ) ROM_END +} // anonymous namespace + + GAMEL(1980?, video21, 0, video21, video21, video21_state, empty_init, ROT0, "Video Games GmbH", "Video 21", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_video21) diff --git a/src/mame/misc/videosaa.cpp b/src/mame/misc/videosaa.cpp index eb72ecad27e..4fecce9b480 100644 --- a/src/mame/misc/videosaa.cpp +++ b/src/mame/misc/videosaa.cpp @@ -50,6 +50,8 @@ #include "videosaa.lh" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -535,6 +537,8 @@ ROM_START( toureiff ) ROM_LOAD( "pal.9c", 0x000, 0x117, NO_DUMP ) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/misc/vroulet.cpp b/src/mame/misc/vroulet.cpp index 1ca848fce68..036798a74cb 100644 --- a/src/mame/misc/vroulet.cpp +++ b/src/mame/misc/vroulet.cpp @@ -47,6 +47,8 @@ Tomasz Slanina 20050225 #include "tilemap.h" +namespace { + class vroulet_state : public driver_device { public: @@ -333,6 +335,9 @@ ROM_START( vroulet ) ROM_LOAD( "roul.gfx", 0x0000, 0x8000, CRC(4e4f46d2) SHA1(efd00e2b564ff4a9013c67ffaaf91124089b310b) ) ROM_END +} // anonymous namespace + + /* Game Driver */ GAME( 1989, vroulet, 0, vroulet, vroulet, vroulet_state, empty_init, ROT90, "World Game", "Vegas Roulette", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/misc/wildpkr.cpp b/src/mame/misc/wildpkr.cpp index cda282aea22..978d3997f95 100644 --- a/src/mame/misc/wildpkr.cpp +++ b/src/mame/misc/wildpkr.cpp @@ -171,6 +171,8 @@ #include "speaker.h" +namespace { + #define MAIN_CLOCK XTAL(12'000'000) #define AY_CLOCK MAIN_CLOCK / 8 #define SEC_CLOCK XTAL(3'686'400) @@ -602,6 +604,8 @@ void wildpkr_state::init_wildpkr() { } +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/misc/wms.cpp b/src/mame/misc/wms.cpp index 369a81ccc2f..d4d60996104 100644 --- a/src/mame/misc/wms.cpp +++ b/src/mame/misc/wms.cpp @@ -83,6 +83,8 @@ #include "screen.h" +namespace { + #define MAIN_CLOCK XTAL(40'000'000) // Pletronics 40.000 MHz. Crystal. Used for CPU clock. #define VIDEO_CLOCK XTAL(14'318'181) // Pletronics MP49 14.31818 MHz. Crystal. Used in common VGA ISA cards. @@ -627,6 +629,8 @@ void wms_state::init_wms() { } +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/misc/yuvomz80.cpp b/src/mame/misc/yuvomz80.cpp index c07855ee1b1..99828628c60 100644 --- a/src/mame/misc/yuvomz80.cpp +++ b/src/mame/misc/yuvomz80.cpp @@ -40,6 +40,9 @@ Yuvo PCI117B - I/O board - connectors and ttl chips */ + +namespace { + class yuvomz80_state : public driver_device { public: @@ -163,5 +166,8 @@ ROM_START( hexaprsz ) ROM_LOAD( "ghp_pcm-b_ver.1.01.ic13", 0x80000, 0x80000, CRC(161838c9) SHA1(52b9c324b01702c1164a462af371d82e8c2eea43) ) ROM_END +} // anonymous namespace + + GAME( 1995, hexaprs, 0, hexaprs, hexaprs, yuvomz80_state, empty_init, ROT0, "Yuvo / Yubis", "Hexa President (YM2610 set)", MACHINE_IS_SKELETON_MECHANICAL ) GAME( 1995, hexaprsz, hexaprs, hexaprsz, hexaprs, yuvomz80_state, empty_init, ROT0, "Yuvo / Yubis", "Hexa President (YMZ280B set)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/mitsubishi/multi16.cpp b/src/mame/mitsubishi/multi16.cpp index 057afc35418..edfe26632ad 100644 --- a/src/mame/mitsubishi/multi16.cpp +++ b/src/mame/mitsubishi/multi16.cpp @@ -43,6 +43,8 @@ #include "screen.h" +namespace { + class multi16_state : public driver_device { public: @@ -193,6 +195,9 @@ ROM_START( multi16 ) ROM_LOAD("kanji.rom", 0x00000, 0x20000, NO_DUMP) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/mitsubishi/multi8.cpp b/src/mame/mitsubishi/multi8.cpp index 8386c98fce1..d825d790e30 100644 --- a/src/mame/mitsubishi/multi8.cpp +++ b/src/mame/mitsubishi/multi8.cpp @@ -34,6 +34,8 @@ #include "speaker.h" +namespace { + class multi8_state : public driver_device { public: @@ -693,6 +695,9 @@ ROM_START( multi8 ) ROM_REGION( 0x4000, "wram", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/mizar/mzr8105.cpp b/src/mame/mizar/mzr8105.cpp index 8487468ffb2..c4d0b8583ff 100644 --- a/src/mame/mizar/mzr8105.cpp +++ b/src/mame/mizar/mzr8105.cpp @@ -169,6 +169,9 @@ #include "cpu/m68000/m68000.h" #include "machine/clock.h" + +namespace { + class mzr8105_state : public driver_device { public: @@ -231,6 +234,9 @@ ROM_START (mzr8105) ROM_LOAD16_BYTE ("mzros9hb.bin", 0x000000, 0x2000, CRC (d18e69a6) SHA1 (a00b68f4d649bcc09a29361f8692e52be12b3792)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1987, mzr8105, 0, 0, mzr8105, mzr8105, mzr8105_state, empty_init, "Mizar Inc", "Mizar VME8105", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW ) diff --git a/src/mame/morrow/microdec.cpp b/src/mame/morrow/microdec.cpp index a83b9550fd5..0b2e4bec550 100644 --- a/src/mame/morrow/microdec.cpp +++ b/src/mame/morrow/microdec.cpp @@ -36,6 +36,8 @@ ToDo: #include "softlist_dev.h" +namespace { + class microdec_state : public driver_device { public: @@ -266,6 +268,9 @@ ROM_START( md3 ) ROMX_LOAD("md3-31.bin", 0x0000, 0x1000, CRC(bd4014f6) SHA1(5b33220af34c64676756177db4915f97840b2996), ROM_BIOS(2)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/morrow/tricep.cpp b/src/mame/morrow/tricep.cpp index bb09057d6cc..1913f2b14cf 100644 --- a/src/mame/morrow/tricep.cpp +++ b/src/mame/morrow/tricep.cpp @@ -18,6 +18,9 @@ #include "cpu/m68000/m68000.h" #include "machine/scn_pci.h" + +namespace { + class tricep_state : public driver_device { public: @@ -135,6 +138,9 @@ ROM_START( tricep ) ROM_LOAD16_BYTE( "tri2.4_even.u36", 0x0000, 0x1000, CRC(4414dcdc) SHA1(00a3d293617dc691748ae85b6ccdd6723daefc0a)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/motorola/ampscarp.cpp b/src/mame/motorola/ampscarp.cpp index 8da8d3c86c5..3870f9786a1 100644 --- a/src/mame/motorola/ampscarp.cpp +++ b/src/mame/motorola/ampscarp.cpp @@ -14,6 +14,9 @@ whatever MCU type this uses boots from an internal ROM/PROM/EPROM but can also e #include "emu.h" #include "cpu/mc68hc11/mc68hc11.h" + +namespace { + class ampscarp_state : public driver_device { public: @@ -48,4 +51,7 @@ ROM_START( ampscarp ) ROM_LOAD( "motorola_amps_car_phone_dump.bin", 0x0000, 0x20000, CRC(677ec85e) SHA1(219611b6c4b16461705e2df61d79a0f7ac8f529f) ) ROM_END +} // anonymous namespace + + COMP( 1998, ampscarp, 0, 0, ampscarp, ampscarp, ampscarp_state, empty_init, "Motorola", "AMPS Car Phone", MACHINE_IS_SKELETON ) diff --git a/src/mame/motorola/exorciser.cpp b/src/mame/motorola/exorciser.cpp index 11e3abd59b7..07ca51092e4 100644 --- a/src/mame/motorola/exorciser.cpp +++ b/src/mame/motorola/exorciser.cpp @@ -129,6 +129,11 @@ References: ****************************************************************************/ #include "emu.h" +#include "bus/rs232/exorterm.h" +#include "bus/rs232/null_modem.h" +#include "bus/rs232/pty.h" +#include "bus/rs232/rs232.h" +#include "bus/rs232/terminal.h" #include "cpu/m6800/m6800.h" #include "machine/bankdev.h" #include "machine/input_merger.h" @@ -137,11 +142,13 @@ References: #include "machine/mc14411.h" #include "machine/m68sfdc.h" -#include "bus/rs232/rs232.h" #include "imagedev/printer.h" #include "formats/mdos_dsk.h" + +namespace { + class exorciser_state : public driver_device { public: @@ -207,11 +214,11 @@ private: // RS232 bit rate generator clocks DECLARE_WRITE_LINE_MEMBER(write_f1_clock); DECLARE_WRITE_LINE_MEMBER(write_f3_clock); - DECLARE_WRITE_LINE_MEMBER(write_f5_clock); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(write_f5_clock); DECLARE_WRITE_LINE_MEMBER(write_f7_clock); DECLARE_WRITE_LINE_MEMBER(write_f8_clock); DECLARE_WRITE_LINE_MEMBER(write_f9_clock); - DECLARE_WRITE_LINE_MEMBER(write_f11_clock); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(write_f11_clock); DECLARE_WRITE_LINE_MEMBER(write_f13_clock); u8 m_restart_count; @@ -636,11 +643,6 @@ static DEVICE_INPUT_DEFAULTS_START(printer) DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1) DEVICE_INPUT_DEFAULTS_END -#include "bus/rs232/exorterm.h" -#include "bus/rs232/null_modem.h" -#include "bus/rs232/pty.h" -#include "bus/rs232/terminal.h" - void exorciser_state::exorciser_rs232_devices(device_slot_interface &device) { device.option_add("exorterm155", SERIAL_TERMINAL_EXORTERM155); @@ -805,6 +807,9 @@ ROM_START( exorciser ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/motorola/exorterm.cpp b/src/mame/motorola/exorterm.cpp index 6762bb90afe..9be13317c64 100644 --- a/src/mame/motorola/exorterm.cpp +++ b/src/mame/motorola/exorterm.cpp @@ -10,6 +10,9 @@ #include "machine/exorterm.h" #include "bus/rs232/rs232.h" + +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -50,6 +53,9 @@ void exorterm155_state::exorterm155(machine_config &config) ROM_START(exorterm155) ROM_END +} // anonymous namespace + + //************************************************************************** // SYSTEM DRIVERS //************************************************************************** diff --git a/src/mame/motorola/m6805evs.cpp b/src/mame/motorola/m6805evs.cpp index 84187dd31da..5db6a895bed 100644 --- a/src/mame/motorola/m6805evs.cpp +++ b/src/mame/motorola/m6805evs.cpp @@ -64,6 +64,8 @@ ToDo: #include "cpu/m6805/m68hc05.h" +namespace { + class m6805evs_state : public driver_device { public: @@ -75,7 +77,7 @@ public: void m6805evs(machine_config &config); private: - void mem_map(address_map &map); + [[maybe_unused]] void mem_map(address_map &map); required_device m_maincpu; virtual void machine_reset() override; @@ -113,6 +115,8 @@ ROM_START(m6805evs) ROM_LOAD( "mc68hc705p9cp.bin", 0x0000, 0x2000, NO_DUMP) ROM_END +} // anonymous namespace + /*************************************************************************** diff --git a/src/mame/motorola/mekd1.cpp b/src/mame/motorola/mekd1.cpp index 594eb7b1cee..cc3880370fc 100644 --- a/src/mame/motorola/mekd1.cpp +++ b/src/mame/motorola/mekd1.cpp @@ -93,6 +93,9 @@ References: #include "bus/rs232/rs232.h" #include "machine/terminal.h" + +namespace { + class mekd1_state : public driver_device { public: @@ -457,6 +460,9 @@ ROM_START( mekd1 ) ROM_LOAD("mikbugv9.bin", 0x0000, 0x0200, CRC(f5ff896f) SHA1(32990115ad9eebe7a1a5a03b4b1ea83360b1820f)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/motorola/mekd2.cpp b/src/mame/motorola/mekd2.cpp index 71e0994bc20..ce80de0f710 100644 --- a/src/mame/motorola/mekd2.cpp +++ b/src/mame/motorola/mekd2.cpp @@ -84,6 +84,9 @@ TODO #include "mekd2.lh" + +namespace { + #define XTAL_MEKD2 1228800 class mekd2_state : public driver_device @@ -412,6 +415,9 @@ ROM_START(mekd2) ROM_LOAD("jbug.rom", 0x0000, 0x0400, CRC(5ed08792) SHA1(b06e74652a4c4e67c4a12ddc191ffb8c07f3332e) ) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/motorola/mekd3.cpp b/src/mame/motorola/mekd3.cpp index 753345c1932..5c78b533e05 100644 --- a/src/mame/motorola/mekd3.cpp +++ b/src/mame/motorola/mekd3.cpp @@ -127,6 +127,9 @@ The ROM support is still TODO. #include "screen.h" #include "render.h" + +namespace { + #define XTAL_MEKD3 3.579545_MHz_XTAL class mekd3_state : public driver_device @@ -1061,6 +1064,9 @@ ROM_START(mekd3) ROM_LOAD("mcm6674p.chr", 0x0000, 0x0400, CRC(1c22088a) SHA1(b5f0bd0cfdec0cd5c1cb764506bef3c17d6af0eb)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/motorola/mekd4.cpp b/src/mame/motorola/mekd4.cpp index f34127eccc5..6f3828dbc26 100644 --- a/src/mame/motorola/mekd4.cpp +++ b/src/mame/motorola/mekd4.cpp @@ -266,6 +266,8 @@ FS 0 to F #include "mekd4.lh" +namespace { + class mekd4_state : public driver_device { public: @@ -1070,6 +1072,9 @@ ROM_START(mekd4) ROM_LOAD("d4map00.rom", 0x0000, 0x0400, CRC(7e676444) SHA1(4f8a7443da509561be958786f9bd72eac3969a89)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/motorola/mekd5.cpp b/src/mame/motorola/mekd5.cpp index 17d9f8e8068..b9f7e676667 100644 --- a/src/mame/motorola/mekd5.cpp +++ b/src/mame/motorola/mekd5.cpp @@ -89,6 +89,9 @@ FS 0 to F #include "render.h" #include "mekd5.lh" + +namespace { + #define XTAL_MEKD5 3.579545_MHz_XTAL class mekd5_state : public driver_device @@ -508,6 +511,9 @@ ROM_START(mekd5) ROM_LOAD("d5bug.rom", 0xf000, 0x0800, CRC(67c00a2c) SHA1(ae321dbca0baf4b67d62bfec77266d9132b973bf)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/motorola/mvme147.cpp b/src/mame/motorola/mvme147.cpp index 575557cfaf8..eec5592fb3b 100644 --- a/src/mame/motorola/mvme147.cpp +++ b/src/mame/motorola/mvme147.cpp @@ -183,7 +183,10 @@ #define FUNCNAME __PRETTY_FUNCTION__ #endif -/* from documentataion: http://www.m88k.com/Docs/147/147aih.pdf but crystal and divider not known */ + +namespace { + +/* from documentation: http://www.m88k.com/Docs/147/147aih.pdf but crystal and divider not known */ #define BAUDGEN_CLOCK 5_MHz_XTAL #define SCC_CLOCK (BAUDGEN_CLOCK) /* This gives prompt at the RS232 terminal device (9600) */ @@ -716,6 +719,9 @@ ROM_START (mvme147) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1989, mvme147, 0, 0, mvme147, mvme147, mvme147_state, empty_init, "Motorola", "MVME-147", MACHINE_NO_SOUND_HW ) diff --git a/src/mame/motorola/mvme162.cpp b/src/mame/motorola/mvme162.cpp index cfe4a9a4128..56b97a2db60 100644 --- a/src/mame/motorola/mvme162.cpp +++ b/src/mame/motorola/mvme162.cpp @@ -189,6 +189,9 @@ The vector is modified based upon the interrupt source within the Z85230. Interr programmed via the MCchip. The Z85230s are interfaced as DTE (data terminal equipment) with EIA-232-D signal levels. The four serial ports are routed to four RJ45 telephone connectors on the MVME162LX front panel.*/ + +namespace { + /* This gives prompt at the RS232 terminal device (9600) */ #define BAUDGEN_CLOCK 10_MHz_XTAL // Not verified nor seen on the PCB:s #define SCC_CLOCK (BAUDGEN_CLOCK) @@ -329,6 +332,9 @@ ROM_START (mvme162) ROMX_LOAD("vxworks_5.1.1_162lx-223.bin", 0xa00000, 0x20000, CRC (b40b39ac) SHA1 (fbc7f7e05ff276fe4570daeadcc5c08fc11f1a2b), ROM_BIOS(3)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP (1993, mvme162, 0, 0, mvme162, mvme162, mvme162_state, empty_init, "Motorola", "MVME-162", MACHINE_NOT_WORKING) diff --git a/src/mame/motorola/powerstack.cpp b/src/mame/motorola/powerstack.cpp index d5444770d65..c929d23b20a 100644 --- a/src/mame/motorola/powerstack.cpp +++ b/src/mame/motorola/powerstack.cpp @@ -11,6 +11,9 @@ Motorola Powerstack II. CPU is a PowerPC 604e @ 300MHz. #include "emu.h" #include "cpu/powerpc/ppc.h" + +namespace { + class powerstack_state : public driver_device { public: @@ -38,4 +41,7 @@ ROM_START( powerstk ) ROM_LOAD( "motorola_powerstack2.bin", 0x0000, 0x80000, CRC(948e8fcd) SHA1(9a8c32b621c98bc33ee525f66747c34d39851685) ) ROM_END +} // anonymous namespace + + COMP( 1996, powerstk, 0, 0, powerstack, powerstack, powerstack_state, empty_init, "Motorola", "Powerstack II", MACHINE_IS_SKELETON ) diff --git a/src/mame/motorola/uchroma68.cpp b/src/mame/motorola/uchroma68.cpp index e45e2fcb59e..44205a454c3 100644 --- a/src/mame/motorola/uchroma68.cpp +++ b/src/mame/motorola/uchroma68.cpp @@ -132,6 +132,9 @@ expansion. #include "video/mc6845.h" #include "screen.h" + +namespace { + #define XTAL_UCHROMA68 3.579545_MHz_XTAL class uchroma68_state : public driver_device @@ -482,6 +485,9 @@ ROM_START(uchroma68) ROM_LOAD("uch68s19.rom", 0xe800, 0x0400, CRC(8932484f) SHA1(231098ab10185d400032415cf9b7273d736d3b87)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/mr/sshot.cpp b/src/mame/mr/sshot.cpp index 7c45e14c5f2..f2f9e59b7bf 100644 --- a/src/mame/mr/sshot.cpp +++ b/src/mame/mr/sshot.cpp @@ -171,6 +171,8 @@ Given CS numbers this is released after the other GunChamp #include "gunchamps.lh" +namespace { + class supershot_state : public driver_device { public: @@ -392,6 +394,8 @@ ROM_START( gunchamps ) ROM_LOAD( "snd82s23.b7", 0x0100, 0x0020, CRC(f4fa91d4) SHA1(0e0903532c8609c2d42491c2013647a42d13749a) ) ROM_END +} // anonymous namespace + GAME( 1979, sshot, 0, supershot, supershot, supershot_state, empty_init, ROT0, "Model Racing", "Super Shot", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND ) GAMEL(1980, gunchamps, gunchamp, supershot, supershot, supershot_state, empty_init, ROT0, "Model Racing", "Gun Champ (newer, Super Shot hardware)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_NOT_WORKING, layout_gunchamps ) diff --git a/src/mame/msx/big10.cpp b/src/mame/msx/big10.cpp index 4f53961a8e0..d8c359e9446 100644 --- a/src/mame/msx/big10.cpp +++ b/src/mame/msx/big10.cpp @@ -64,6 +64,8 @@ #include "speaker.h" +namespace { + class big10_state : public driver_device { public: @@ -268,6 +270,8 @@ ROM_START( big10 ) ROM_LOAD( "3", 0x8000, 0x4000, CRC(8d15da74) SHA1(0e114de6fcf79beac800575bfb739e6a6bf35660) ) ROM_END +} // anonymous namespace + /************************************** * Game Driver(s) * diff --git a/src/mame/msx/forte2.cpp b/src/mame/msx/forte2.cpp index 94d28229d79..d7aa9270f06 100644 --- a/src/mame/msx/forte2.cpp +++ b/src/mame/msx/forte2.cpp @@ -44,6 +44,8 @@ found/dumped yet. */ #include "speaker.h" +namespace { + class forte2_state : public driver_device { public: @@ -173,4 +175,7 @@ ROM_START( pesadelo ) ROM_LOAD( "epr2764.15", 0x00000, 0x10000, CRC(1ae2f724) SHA1(12880dd7ad82acf04861843fb9d4f0f926d18f6b) ) ROM_END +} // anonymous namespace + + GAME( 1989, pesadelo, 0, pesadelo, pesadelo, forte2_state, init_pesadelo, ROT0, "bootleg (Forte II Games)", "Pesadelo (bootleg of Konami Knightmare)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/msx/pengadvb.cpp b/src/mame/msx/pengadvb.cpp index 98a680a1332..b026e1820d9 100644 --- a/src/mame/msx/pengadvb.cpp +++ b/src/mame/msx/pengadvb.cpp @@ -47,6 +47,8 @@ TODO: #include "speaker.h" +namespace { + class pengadvb_state : public driver_device { public: @@ -394,5 +396,8 @@ ROM_START( pengadvb2 ) // CBK1029 PCB ROM_LOAD( "7e", 0x18000, 0x8000, CRC(60764899) SHA1(a75e59c2ecf8cebdb99708cb18390157ad7b6993) ) ROM_END +} // anonymous namespace + + GAME( 1988, pengadvb, 0, pengadvb, pengadvb, pengadvb_state, init_pengadvb, ROT0, "bootleg (Screen)", "Penguin Adventure (bootleg of MSX version, encrypted)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, pengadvb2, pengadvb, pengadvb, pengadvb2, pengadvb_state, init_pengadvb2, ROT0, "bootleg (Comet)", "Penguin Adventure (bootleg of MSX version, not encrypted)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/msx/sangho.cpp b/src/mame/msx/sangho.cpp index 614b9d798c5..e123ba19c45 100644 --- a/src/mame/msx/sangho.cpp +++ b/src/mame/msx/sangho.cpp @@ -54,6 +54,8 @@ TODO: #include "speaker.h" +namespace { + class sangho_state : public driver_device { public: @@ -578,6 +580,9 @@ void pzlestar_state::init_pzlestar() ROM[0x12ca8] = 0x00; } +} // anonymous namespace + + GAME( 1991, pzlestar, 0, pzlestar, pzlestar, pzlestar_state, init_pzlestar, ROT270, "Sang Ho Soft", "Puzzle Star (Sang Ho Soft)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND ) GAME( 1992, sexyboom, 0, sexyboom, sexyboom, sexyboom_state, empty_init, ROT270, "Sang Ho Soft", "Sexy Boom", 0 ) GAME( 1991, sprpuzzle, sexyboom, sexyboom, sexyboom, sexyboom_state, empty_init, ROT270, "Sang Ho Soft", "Super Puzzle (Sang Ho Soft)", 0 ) diff --git a/src/mame/msx/sfkick.cpp b/src/mame/msx/sfkick.cpp index 381f25f2d00..cb2d7f766ec 100644 --- a/src/mame/msx/sfkick.cpp +++ b/src/mame/msx/sfkick.cpp @@ -163,6 +163,8 @@ DIPSW-2 #include "speaker.h" +namespace { + class sfkick_state : public driver_device { public: @@ -511,6 +513,8 @@ ROM_START( spinkick ) ROM_LOAD( "spinkick.r1", 0x00000, 0x8000, CRC(2f5e3b7a) SHA1(d2ff566b415ab10c0681fa1eb221a56e3c137ecf) ) ROM_END +} // anonymous namespace + GAME( 1988, sfkick, 0, sfkick, sfkick, sfkick_state, empty_init, ROT90, "Haesung/HJ Corp", "Super Free Kick (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 198?, sfkicka, sfkick, sfkick, sfkick, sfkick_state, empty_init, ROT90, "Haesung", "Super Free Kick (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/multitech/mkit09.cpp b/src/mame/multitech/mkit09.cpp index 2f9bac8f65a..8371333813b 100644 --- a/src/mame/multitech/mkit09.cpp +++ b/src/mame/multitech/mkit09.cpp @@ -46,6 +46,8 @@ Test Paste: #include "mkit09.lh" +namespace { + class mkit09_state : public driver_device { public: @@ -351,6 +353,9 @@ ROM_START( mkit09a ) ROM_FILL(0x99c,1,0x63) // ... so that MEM starts at 0000 instead of F908. ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/mupid/mdisk.cpp b/src/mame/mupid/mdisk.cpp index 3910b08ccf3..d37295fb43f 100644 --- a/src/mame/mupid/mdisk.cpp +++ b/src/mame/mupid/mdisk.cpp @@ -25,6 +25,8 @@ #include "imagedev/floppy.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -261,6 +263,8 @@ ROM_START( fl100 ) ROM_LOAD("fl100.bin", 0x0000, 0x2000, CRC(68800982) SHA1(501c8877a18cef091476b780de605b2bea3853fb)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/mupid/mupid2.cpp b/src/mame/mupid/mupid2.cpp index 7dbcff55c32..c27344c28ed 100644 --- a/src/mame/mupid/mupid2.cpp +++ b/src/mame/mupid/mupid2.cpp @@ -23,6 +23,8 @@ #include "emupal.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -287,6 +289,8 @@ ROM_START( ptc100 ) ROM_CONTINUE(0x000, 0x400) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/namco/30test.cpp b/src/mame/namco/30test.cpp index 480a7369d6f..b9678742b2f 100644 --- a/src/mame/namco/30test.cpp +++ b/src/mame/namco/30test.cpp @@ -50,6 +50,8 @@ testmode (hold 9, press F2). Voice language cannot be changed here though. #include "30test.lh" +namespace { + class namco_30test_state : public driver_device { public: @@ -281,6 +283,7 @@ ROM_START( 30test ) ROM_LOAD( "tt1-voi0.7p", 0x0000, 0x80000, CRC(b4fc5921) SHA1(92a88d5adb50dae48715847f12e88a35e37ef78c) ) ROM_END +} // anonymous namespace /****************************************************************************** diff --git a/src/mame/namco/c117.h b/src/mame/namco/c117.h index d41ee5fde5b..30b40d5706e 100644 --- a/src/mame/namco/c117.h +++ b/src/mame/namco/c117.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Alex W. Jackson -#ifndef MAME_MACHINE_C117_H -#define MAME_MACHINE_C117_H +#ifndef MAME_NAMCO_C117_H +#define MAME_NAMCO_C117_H #pragma once @@ -75,4 +75,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(NAMCO_C117, namco_c117_device) -#endif // MAME_MACHINE_C117_H +#endif // MAME_NAMCO_C117_H diff --git a/src/mame/namco/cswat.cpp b/src/mame/namco/cswat.cpp index 8ff78126339..d546b74982d 100644 --- a/src/mame/namco/cswat.cpp +++ b/src/mame/namco/cswat.cpp @@ -31,6 +31,8 @@ TODO: #include "tilemap.h" +namespace { + class cswat_state : public driver_device { public: @@ -307,5 +309,7 @@ ROM_START( cswat ) ROM_LOAD( "cs2-1.1p", 0x0000, 0x0001, NO_DUMP ) ROM_END +} // anonymous namespace + GAME( 1984, cswat, 0, cswat, cswat, cswat_state, empty_init, ROT0, "Namco", "Cosmoswat", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/namco/dkmb.cpp b/src/mame/namco/dkmb.cpp index 715c0c03bbb..55481b8a602 100644 --- a/src/mame/namco/dkmb.cpp +++ b/src/mame/namco/dkmb.cpp @@ -31,6 +31,9 @@ Some interesting notes from the dumper: #include "screen.h" #include "speaker.h" + +namespace { + class dkmb_state : public driver_device { public: @@ -155,4 +158,7 @@ ROM_START( dkmb ) ROM_LOAD("12c508.u12", 0x000, 0x09db, BAD_DUMP CRC(3adb3e33) SHA1(36a96886d83b64633eea83e57bdfa8a20c6d4f6a) ) ROM_END +} // anonymous namespace + + GAME( 2003, dkmb, 0, dkmb, dkmb, dkmb_state, empty_init, ROT270, "Namco / Nintendo / Cosmodog", "Donkey Kong / Donkey Kong Jr / Mario Bros", MACHINE_IS_SKELETON ) diff --git a/src/mame/namco/gal3.cpp b/src/mame/namco/gal3.cpp index 4c6f43151ac..295cf6cfa89 100644 --- a/src/mame/namco/gal3.cpp +++ b/src/mame/namco/gal3.cpp @@ -140,6 +140,9 @@ better notes (complete chip lists) for each board still needed #include "namcos21_3d.h" #include "emupal.h" + +namespace { + class gal3_state : public driver_device { public: @@ -903,6 +906,9 @@ ROM_START( gal3 ) DISK_IMAGE_READONLY( "gal3_ld2", 0, NO_DUMP ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT MACHINE INPUT CLASS INIT MONITOR COMPANY FULLNAME FLAGS */ GAMEL( 1992, gal3, 0, gal3, gal3, gal3_state, empty_init, ROT0, "Namco", "Galaxian 3 - Theater 6 : Project Dragoon", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_dualhsxs ) //GAMEL( 1994, gal3zlgr, 0, gal3, gal3, driver_device, 0, ROT0, "Namco", "Galaxian 3 - Theater 6 J2 : Attack of The Zolgear", MACHINE_NOT_WORKING | MACHINE_NO_SOUND, layout_dualhsxs ) diff --git a/src/mame/namco/geebee.h b/src/mame/namco/geebee.h index a0aab1ef412..f927e10177f 100644 --- a/src/mame/namco/geebee.h +++ b/src/mame/namco/geebee.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller -#ifndef MAME_AUDIO_GEEBEE_H -#define MAME_AUDIO_GEEBEE_H +#ifndef MAME_NAMCO_GEEBEE_H +#define MAME_NAMCO_GEEBEE_H #pragma once @@ -35,4 +35,4 @@ private: DECLARE_DEVICE_TYPE(GEEBEE_SOUND, geebee_sound_device) -#endif // MAME_AUDIO_GEEBEE_H +#endif // MAME_NAMCO_GEEBEE_H diff --git a/src/mame/namco/namco06.h b/src/mame/namco/namco06.h index 30a76e9af2e..20820a1d33d 100644 --- a/src/mame/namco/namco06.h +++ b/src/mame/namco/namco06.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Harris, Aaron Giles -#ifndef MAME_MACHINE_NAMCO06_H -#define MAME_MACHINE_NAMCO06_H +#ifndef MAME_NAMCO_NAMCO06_H +#define MAME_NAMCO_NAMCO06_H #pragma once @@ -53,4 +53,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_06XX, namco_06xx_device) -#endif // MAME_MACHINE_NAMCO06_H +#endif // MAME_NAMCO_NAMCO06_H diff --git a/src/mame/namco/namco50.h b/src/mame/namco/namco50.h index d24a52b8f35..23ca251f4e5 100644 --- a/src/mame/namco/namco50.h +++ b/src/mame/namco/namco50.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_MACHINE_NAMCO50_H -#define MAME_MACHINE_NAMCO50_H +#ifndef MAME_NAMCO_NAMCO50_H +#define MAME_NAMCO_NAMCO50_H #pragma once @@ -44,4 +44,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_50XX, namco_50xx_device) -#endif // MAME_MACHINE_NAMCO50_H +#endif // MAME_NAMCO_NAMCO50_H diff --git a/src/mame/namco/namco51.h b/src/mame/namco/namco51.h index 35cec6458f2..c25b82188f9 100644 --- a/src/mame/namco/namco51.h +++ b/src/mame/namco/namco51.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Mike Harris, Aaron Giles -#ifndef MAME_MACHINE_NAMCO51_H -#define MAME_MACHINE_NAMCO51_H +#ifndef MAME_NAMCO_NAMCO51_H +#define MAME_NAMCO_NAMCO51_H #pragma once @@ -54,4 +54,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_51XX, namco_51xx_device) -#endif // NAMCO_51XX +#endif // MAME_NAMCO_51XX diff --git a/src/mame/namco/namco52.h b/src/mame/namco/namco52.h index a775921b6a7..badd340de19 100644 --- a/src/mame/namco/namco52.h +++ b/src/mame/namco/namco52.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NAMCO52_H -#define MAME_AUDIO_NAMCO52_H +#ifndef MAME_NAMCO_NAMCO52_H +#define MAME_NAMCO_NAMCO52_H #include "sound/discrete.h" #include "cpu/mb88xx/mb88xx.h" @@ -62,4 +62,4 @@ DECLARE_DEVICE_TYPE(NAMCO_52XX, namco_52xx_device) #define NAMCO_52XX_P_DATA(base) (base) -#endif // MAME_AUDIO_NAMCO52_H +#endif // MAME_NAMCO_NAMCO52_H diff --git a/src/mame/namco/namco53.h b/src/mame/namco/namco53.h index 2cd473b3c05..7fe105524ec 100644 --- a/src/mame/namco/namco53.h +++ b/src/mame/namco/namco53.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_MACHINE_NAMCO53_H -#define MAME_MACHINE_NAMCO53_H +#ifndef MAME_NAMCO_NAMCO53_H +#define MAME_NAMCO_NAMCO53_H #pragma once @@ -47,4 +47,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_53XX, namco_53xx_device) -#endif // MAME_MACHINE_NAMCO53_H +#endif // MAME_NAMCO_NAMCO53_H diff --git a/src/mame/namco/namco54.h b/src/mame/namco/namco54.h index 6bb0264820f..4e93895237e 100644 --- a/src/mame/namco/namco54.h +++ b/src/mame/namco/namco54.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NAMCO54_H -#define MAME_AUDIO_NAMCO54_H +#ifndef MAME_NAMCO_NAMCO54_H +#define MAME_NAMCO_NAMCO54_H #include "sound/discrete.h" #include "cpu/mb88xx/mb88xx.h" @@ -51,4 +51,4 @@ DECLARE_DEVICE_TYPE(NAMCO_54XX, namco_54xx_device) #define NAMCO_54XX_P_DATA(base) (NODE_RELATIVE(base, 3)) -#endif // MAME_AUDIO_NAMCO54_H +#endif // MAME_NAMCO_NAMCO54_H diff --git a/src/mame/namco/namco62.h b/src/mame/namco/namco62.h index a18c1b948cd..54d58c4654c 100644 --- a/src/mame/namco/namco62.h +++ b/src/mame/namco/namco62.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett -#ifndef MAME_MACHINE_NAMCO62_H -#define MAME_MACHINE_NAMCO62_H +#ifndef MAME_NAMCO_NAMCO62_H +#define MAME_NAMCO_NAMCO62_H #include "cpu/mb88xx/mb88xx.h" @@ -29,4 +29,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_62XX, namco_62xx_device) -#endif // MAME_MACHINE_NAMCO62_H +#endif // MAME_NAMCO_NAMCO62_H diff --git a/src/mame/namco/namco65.h b/src/mame/namco/namco65.h index dcad845680c..6e7f3c3dedb 100644 --- a/src/mame/namco/namco65.h +++ b/src/mame/namco/namco65.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NAMCO65_H -#define MAME_MACHINE_NAMCO65_H +#ifndef MAME_NAMCO_NAMCO65_H +#define MAME_NAMCO_NAMCO65_H #pragma once @@ -91,4 +91,4 @@ private: int m_mcu_analog_complete; }; -#endif // MAME_MACHINE_NAMCO65_H +#endif // MAME_NAMCO_NAMCO65_H diff --git a/src/mame/namco/namco68.h b/src/mame/namco/namco68.h index 2e8527619c0..a11fa15ed94 100644 --- a/src/mame/namco/namco68.h +++ b/src/mame/namco/namco68.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NAMCO68_H -#define MAME_MACHINE_NAMCO68_H +#ifndef MAME_NAMCO_NAMCO68_H +#define MAME_NAMCO_NAMCO68_H #pragma once @@ -95,4 +95,4 @@ private: uint8_t m_player_mux; }; -#endif // MAME_MACHINE_NAMCO68_H +#endif // MAME_NAMCO_NAMCO68_H diff --git a/src/mame/namco/namco_c116.h b/src/mame/namco/namco_c116.h index 1fed49db5f4..cefb4f97665 100644 --- a/src/mame/namco/namco_c116.h +++ b/src/mame/namco/namco_c116.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Alex W. Jackson -#ifndef MAME_VIDEO_NAMCO_C116_H -#define MAME_VIDEO_NAMCO_C116_H +#ifndef MAME_NAMCO_NAMCO_C116_H +#define MAME_NAMCO_NAMCO_C116_H #pragma once @@ -48,4 +48,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_C116, namco_c116_device) -#endif // MAME_VIDEO_NAMCO_C116_H +#endif // MAME_NAMCO_NAMCO_C116_H diff --git a/src/mame/namco/namco_c123tmap.h b/src/mame/namco/namco_c123tmap.h index 3ae46b869b0..7da23d3f264 100644 --- a/src/mame/namco/namco_c123tmap.h +++ b/src/mame/namco/namco_c123tmap.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_NAMCO_C123TMAP_H -#define MAME_VIDEO_NAMCO_C123TMAP_H +#ifndef MAME_NAMCO_NAMCO_C123TMAP_H +#define MAME_NAMCO_NAMCO_C123TMAP_H #pragma once @@ -82,5 +82,5 @@ private: // device type definition DECLARE_DEVICE_TYPE(NAMCO_C123TMAP, namco_c123tmap_device) -#endif // MAME_VIDEO_NAMCO_C123TMAP_H +#endif // MAME_NAMCO_NAMCO_C123TMAP_H diff --git a/src/mame/namco/namco_c139.h b/src/mame/namco/namco_c139.h index 53c16499624..47f191cf20a 100644 --- a/src/mame/namco/namco_c139.h +++ b/src/mame/namco/namco_c139.h @@ -5,8 +5,8 @@ Namco C139 - Serial I/F Controller ***************************************************************************/ -#ifndef MAME_MACHINE_NAMCO_C139_H -#define MAME_MACHINE_NAMCO_C139_H +#ifndef MAME_NAMCO_NAMCO_C139_H +#define MAME_NAMCO_NAMCO_C139_H #pragma once @@ -62,4 +62,4 @@ DECLARE_DEVICE_TYPE(NAMCO_C139, namco_c139_device) -#endif // MAME_MACHINE_NAMCO_C139_H +#endif // MAME_NAMCO_NAMCO_C139_H diff --git a/src/mame/namco/namco_c148.h b/src/mame/namco/namco_c148.h index 0cd79c3e08e..3b8d3cf29aa 100644 --- a/src/mame/namco/namco_c148.h +++ b/src/mame/namco/namco_c148.h @@ -5,8 +5,8 @@ Namco C148 - CPU Bus Manager ***************************************************************************/ -#ifndef MAME_MACHINE_NAMCO_C148_H -#define MAME_MACHINE_NAMCO_C148_H +#ifndef MAME_NAMCO_NAMCO_C148_H +#define MAME_NAMCO_NAMCO_C148_H #pragma once @@ -116,4 +116,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_C148, namco_c148_device) -#endif // MAME_MACHINE_NAMCO_C148_H +#endif // MAME_NAMCO_NAMCO_C148_H diff --git a/src/mame/namco/namco_c169roz.h b/src/mame/namco/namco_c169roz.h index 60786c0d159..185bb57afab 100644 --- a/src/mame/namco/namco_c169roz.h +++ b/src/mame/namco/namco_c169roz.h @@ -2,8 +2,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_NAMCO_C169ROZ_H -#define MAME_VIDEO_NAMCO_C169ROZ_H +#ifndef MAME_NAMCO_NAMCO_C169ROZ_H +#define MAME_NAMCO_NAMCO_C169ROZ_H #pragma once @@ -69,5 +69,5 @@ private: // device type definition DECLARE_DEVICE_TYPE(NAMCO_C169ROZ, namco_c169roz_device) -#endif // MAME_VIDEO_NAMCO_C169ROZ_H +#endif // MAME_NAMCO_NAMCO_C169ROZ_H diff --git a/src/mame/namco/namco_c45road.h b/src/mame/namco/namco_c45road.h index 04f7e6d0880..03187de35fe 100644 --- a/src/mame/namco/namco_c45road.h +++ b/src/mame/namco/namco_c45road.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, Aaron Giles, Alex W. Jackson -#ifndef MAME_VIDEO_C45_H -#define MAME_VIDEO_C45_H +#ifndef MAME_NAMCO_C45_H +#define MAME_NAMCO_C45_H #pragma once @@ -69,4 +69,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(NAMCO_C45_ROAD, namco_c45_road_device) -#endif // MAME_VIDEO_C45_H +#endif // MAME_NAMCO_C45_H diff --git a/src/mame/namco/namco_c67.h b/src/mame/namco/namco_c67.h index 9aa54dac090..ef288379978 100644 --- a/src/mame/namco/namco_c67.h +++ b/src/mame/namco/namco_c67.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NAMCO_C67_H -#define MAME_MACHINE_NAMCO_C67_H +#ifndef MAME_NAMCO_NAMCO_C67_H +#define MAME_NAMCO_NAMCO_C67_H #pragma once @@ -22,4 +22,4 @@ DECLARE_DEVICE_TYPE(NAMCO_C67, namco_c67_device) -#endif // MAME_MACHINE_NAMCO_C67_H +#endif // MAME_NAMCO_NAMCO_C67_H diff --git a/src/mame/namco/namco_settings.h b/src/mame/namco/namco_settings.h index fe5a7f1f0c1..735148d3b59 100644 --- a/src/mame/namco/namco_settings.h +++ b/src/mame/namco/namco_settings.h @@ -3,8 +3,8 @@ // Namco system 12/23 settings device -#ifndef MAME_MACHINE_NAMCO_SETTINGS_H -#define MAME_MACHINE_NAMCO_SETTINGS_H +#ifndef MAME_NAMCO_NAMCO_SETTINGS_H +#define MAME_NAMCO_NAMCO_SETTINGS_H #pragma once @@ -28,4 +28,4 @@ private: DECLARE_DEVICE_TYPE(NAMCO_SETTINGS, namco_settings_device) -#endif // MAME_MACHINE_NAMCO_SETTINGS_H +#endif // MAME_NAMCO_NAMCO_SETTINGS_H diff --git a/src/mame/namco/namcoio.h b/src/mame/namco/namcoio.h index f444e77f076..ed789a150b2 100644 --- a/src/mame/namco/namcoio.h +++ b/src/mame/namco/namcoio.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_MACHINE_NAMCOIO_H -#define MAME_MACHINE_NAMCOIO_H +#ifndef MAME_NAMCO_NAMCOIO_H +#define MAME_NAMCO_NAMCOIO_H /*************************************************************************** @@ -89,4 +89,4 @@ DECLARE_DEVICE_TYPE(NAMCO_56XX, namco56xx_device) DECLARE_DEVICE_TYPE(NAMCO_58XX, namco58xx_device) DECLARE_DEVICE_TYPE(NAMCO_59XX, namco59xx_device) -#endif // MAME_MACHINE_NAMCOIO_H +#endif // MAME_NAMCO_NAMCOIO_H diff --git a/src/mame/namco/namcoio_gearbox.h b/src/mame/namco/namcoio_gearbox.h index f234a4fb160..36c5480ba4c 100644 --- a/src/mame/namco/namcoio_gearbox.h +++ b/src/mame/namco/namcoio_gearbox.h @@ -5,8 +5,8 @@ Namco 6-speed Gearbox device ***************************************************************************/ -#ifndef MAME_MACHINE_NAMCOIO_GEARBOX_H -#define MAME_MACHINE_NAMCOIO_GEARBOX_H +#ifndef MAME_NAMCO_NAMCOIO_GEARBOX_H +#define MAME_NAMCO_NAMCOIO_GEARBOX_H #pragma once @@ -40,4 +40,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(NAMCOIO_GEARBOX, namcoio_gearbox_device) -#endif // MAME_MACHINE_NAMCOIO_GEARBOX_H +#endif // MAME_NAMCO_NAMCOIO_GEARBOX_H diff --git a/src/mame/namco/namcomcu.h b/src/mame/namco/namcomcu.h index c7332e2faeb..907da50e3f8 100644 --- a/src/mame/namco/namcomcu.h +++ b/src/mame/namco/namcomcu.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Alex W. Jackson -#ifndef MAME_MACHINE_NAMCOMCU_H -#define MAME_MACHINE_NAMCOMCU_H +#ifndef MAME_NAMCO_NAMCOMCU_H +#define MAME_NAMCO_NAMCOMCU_H #pragma once @@ -60,4 +60,4 @@ DECLARE_DEVICE_TYPE(NAMCO_C75, namco_c75_device) DECLARE_DEVICE_TYPE(NAMCO_C76, namco_c76_device) -#endif // MAME_MACHINE_NAMCOMCU_H +#endif // MAME_NAMCO_NAMCOMCU_H diff --git a/src/mame/namco/namcops2.cpp b/src/mame/namco/namcops2.cpp index c5599c09101..8764c226897 100644 --- a/src/mame/namco/namcops2.cpp +++ b/src/mame/namco/namcops2.cpp @@ -878,6 +878,8 @@ Notes: #include "screen.h" +namespace { + class namcops2_state : public driver_device { public: @@ -1654,6 +1656,9 @@ ROM_START( motogp ) DISK_IMAGE_READONLY( "mgp1004-na-hdd0-a", 0, SHA1(599940b9fe7fc8e46fd80a32c7e795ae143ee645) ) ROM_END +} // anonymous namespace + + // System 246 GAME(2001, sys246, 0, system246, system246, namcops2_state, empty_init, ROT0, "Namco", "System 246 BIOS", MACHINE_IS_SKELETON|MACHINE_IS_BIOS_ROOT) GAME(2000, rrvac, sys246, system246, system246, namcops2_state, empty_init, ROT0, "Namco", "Ridge Racer V Arcade Battle (RRV3 Ver. A)", MACHINE_IS_SKELETON) diff --git a/src/mame/namco/namcos11.cpp b/src/mame/namco/namcos11.cpp index efe3af41903..edd52e80443 100644 --- a/src/mame/namco/namcos11.cpp +++ b/src/mame/namco/namcos11.cpp @@ -324,6 +324,9 @@ Pin 22 Solder Side - Gun 2 Trigger #include + +namespace { + #define C76_SPEEDUP ( 1 ) /* sound cpu idle skipping */ #define VERBOSE_LEVEL ( 0 ) @@ -1830,6 +1833,9 @@ ROM_END 9 = Location Test */ +} // anonymous namespace + + GAME( 1994, tekken, 0, tekken, tekken, namcos11_state, empty_init, ROT0, "Namco", "Tekken (World, TE2/VER.C)", 0 ) GAME( 1994, tekkenac, tekken, tekken, tekken, namcos11_state, empty_init, ROT0, "Namco", "Tekken (Asia, TE4/VER.C)", 0 ) GAME( 1994, tekkenb, tekken, tekken, tekken, namcos11_state, empty_init, ROT0, "Namco", "Tekken (World, TE2/VER.B)", 0 ) diff --git a/src/mame/namco/namcos12.cpp b/src/mame/namco/namcos12.cpp index a3e798b9721..56a5951b00e 100644 --- a/src/mame/namco/namcos12.cpp +++ b/src/mame/namco/namcos12.cpp @@ -1108,6 +1108,8 @@ The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-wa #include +namespace { + #define VERBOSE_LEVEL ( 0 ) class namcos12_state : public driver_device @@ -3353,6 +3355,9 @@ ROM_START( aplarail ) ROM_LOAD( "at28c16", 0x000000, 0x000800, CRC(db1b63c5) SHA1(01fc3386a2d1cb1bed1b7fd9bd2fd59e503832d3) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME, FLAGS GAME( 1996, tekken3, 0, coh700, namcos12, namcos12_state, init_namcos12, ROT0, "Namco", "Tekken 3 (World, TET2/VER.E1)", 0 ) /* KC006 */ GAME( 1996, tekken3d, tekken3, coh700, namcos12, namcos12_state, init_namcos12, ROT0, "Namco", "Tekken 3 (World, TET2/VER.D)", 0 ) /* KC006 */ diff --git a/src/mame/namco/namcos1b.cpp b/src/mame/namco/namcos1b.cpp index baf5b27f8c1..eba968e0346 100644 --- a/src/mame/namco/namcos1b.cpp +++ b/src/mame/namco/namcos1b.cpp @@ -21,6 +21,9 @@ No Namco custom chips #include "cpu/m6809/m6809.h" #include "sound/okim6295.h" + +namespace { + class namcos1b_state : public driver_device { public: @@ -144,5 +147,7 @@ ROM_START( tankfrceb ) // ROMs dumped from 2 different PCBs, marked KMW-2801/03/ ROM_LOAD( "tk_r5-uj24.uj24", 0x00000, 0x40000, CRC(7e8e7852) SHA1(7a85d8b0bb3cb0366455b7f105b8f97bca045094) ) // identical to obj0 + obj1 ROM_END +} // anonymous namespace + GAME( 199?, tankfrceb, tankfrce, namcos1b, namcos1b, namcos1b_state, empty_init, ROT0, "bootleg", "Tank Force (bootleg)", MACHINE_IS_SKELETON ) diff --git a/src/mame/namco/namcos21_3d.h b/src/mame/namco/namcos21_3d.h index 2973e0a6df2..c37aec5532c 100644 --- a/src/mame/namco/namcos21_3d.h +++ b/src/mame/namco/namcos21_3d.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_NAMCOS21_3D_H -#define MAME_VIDEO_NAMCOS21_3D_H +#ifndef MAME_NAMCO_NAMCOS21_3D_H +#define MAME_NAMCO_NAMCOS21_3D_H #pragma once @@ -68,4 +68,4 @@ private: DECLARE_DEVICE_TYPE(NAMCOS21_3D, namcos21_3d_device) -#endif // MAME_VIDEO_NAMCOS21_3D_H +#endif // MAME_NAMCO_NAMCOS21_3D_H diff --git a/src/mame/namco/namcos21_c67.cpp b/src/mame/namco/namcos21_c67.cpp index 0cd87c0611d..3f3ae942ba4 100644 --- a/src/mame/namco/namcos21_c67.cpp +++ b/src/mame/namco/namcos21_c67.cpp @@ -273,6 +273,9 @@ Namco System 21 Video Hardware #define ENABLE_LOGGING 0 + +namespace { + class namcos21_c67_state : public driver_device { public: @@ -1231,6 +1234,9 @@ void namcos21_c67_state::init_solvalou() mem[0x20cf4/2+2] = 0x4e71; } +} // anonymous namespace + + /* YEAR NAME PARENT MACHINE INPUT CLASS INIT MONITOR COMPANY FULLNAME FLAGS */ // uses 5x TMS320C25 (C67, has internal ROM - dumped) diff --git a/src/mame/namco/namcos21_dsp.h b/src/mame/namco/namcos21_dsp.h index fb01c650277..1040f89e54e 100644 --- a/src/mame/namco/namcos21_dsp.h +++ b/src/mame/namco/namcos21_dsp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_NAMCOS21_DSP_H -#define MAME_VIDEO_NAMCOS21_DSP_H +#ifndef MAME_NAMCO_NAMCOS21_DSP_H +#define MAME_NAMCO_NAMCOS21_DSP_H #pragma once @@ -82,4 +82,4 @@ private: DECLARE_DEVICE_TYPE(NAMCOS21_DSP, namcos21_dsp_device) -#endif // MAME_VIDEO_NAMCOS21_DSP_H +#endif // MAME_NAMCO_NAMCOS21_DSP_H diff --git a/src/mame/namco/namcos23.cpp b/src/mame/namco/namcos23.cpp index 17ff8eb79da..0a2251fb039 100644 --- a/src/mame/namco/namcos23.cpp +++ b/src/mame/namco/namcos23.cpp @@ -1340,6 +1340,8 @@ Notes: #include +namespace { + #define JVSCLOCK (XTAL(14'745'600)) //#define H8CLOCK (16737350) /* from 2061 */ @@ -5454,6 +5456,8 @@ ROM_START( crszonev2a ) ROM_LOAD( "csz1ccrh.7k", 0x000000, 0x200000, CRC(bc2fa03c) SHA1(e63d8e75494a383bf9a213edfa9c472a010f8efe) ) ROM_END +} // anonymous namespace + /* Games */ #define GAME_FLAGS (MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/namco/namcos2_roz.h b/src/mame/namco/namcos2_roz.h index d08225ad4f4..1168b05eb4b 100644 --- a/src/mame/namco/namcos2_roz.h +++ b/src/mame/namco/namcos2_roz.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_NAMCOS2_ROZ_H -#define MAME_VIDEO_NAMCOS2_ROZ_H +#ifndef MAME_NAMCO_NAMCOS2_ROZ_H +#define MAME_NAMCO_NAMCOS2_ROZ_H #pragma once @@ -43,5 +43,5 @@ private: // device type definition DECLARE_DEVICE_TYPE(NAMCOS2_ROZ, namcos2_roz_device) -#endif // MAME_VIDEO_NAMCOS2_ROZ_H +#endif // MAME_NAMCO_NAMCOS2_ROZ_H diff --git a/src/mame/namco/namcos2_sprite.h b/src/mame/namco/namcos2_sprite.h index 4b9e4a03040..b02f5d961ae 100644 --- a/src/mame/namco/namcos2_sprite.h +++ b/src/mame/namco/namcos2_sprite.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_NAMCOS2_SPRITE_H -#define MAME_VIDEO_NAMCOS2_SPRITE_H +#ifndef MAME_NAMCO_NAMCOS2_SPRITE_H +#define MAME_NAMCO_NAMCOS2_SPRITE_H #pragma once @@ -64,4 +64,4 @@ DECLARE_DEVICE_TYPE(NAMCOS2_SPRITE, namcos2_sprite_device) DECLARE_DEVICE_TYPE(NAMCOS2_SPRITE_FINALLAP, namcos2_sprite_finallap_device) DECLARE_DEVICE_TYPE(NAMCOS2_SPRITE_METALHAWK, namcos2_sprite_metalhawk_device) -#endif // MAME_VIDEO_NAMCOS2_SPRITE_H +#endif // MAME_NAMCO_NAMCOS2_SPRITE_H diff --git a/src/mame/namco/nl_tankbatt.h b/src/mame/namco/nl_tankbatt.h index 6fa318cc2d6..fcd8a156e51 100644 --- a/src/mame/namco/nl_tankbatt.h +++ b/src/mame/namco/nl_tankbatt.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_AUDIO_NL_TANKBATT_H -#define MAME_AUDIO_NL_TANKBATT_H +#ifndef MAME_NAMCO_NL_TANKBATT_H +#define MAME_NAMCO_NL_TANKBATT_H #pragma once NETLIST_EXTERNAL(tankbatt) -#endif // MAME_AUDIO_NL_TANKBATT_H +#endif // MAME_NAMCO_NL_TANKBATT_H diff --git a/src/mame/namco/ns10crypt.h b/src/mame/namco/ns10crypt.h index 56e12062d2d..72cb57f293b 100644 --- a/src/mame/namco/ns10crypt.h +++ b/src/mame/namco/ns10crypt.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Andreas Naive -#ifndef MAME_MACHINE_NS10CRYPT_H -#define MAME_MACHINE_NS10CRYPT_H +#ifndef MAME_NAMCO_NS10CRYPT_H +#define MAME_NAMCO_NS10CRYPT_H #include @@ -167,4 +167,4 @@ DECLARE_DEVICE_TYPE(MRDRILR2_DECRYPTER, mrdrilr2_decrypter_device) DECLARE_DEVICE_TYPE(NFLCLSFB_DECRYPTER, nflclsfb_decrypter_device) DECLARE_DEVICE_TYPE(STARTRGN_DECRYPTER, startrgn_decrypter_device) -#endif // MAME_MACHINE_NS10CRYPT_H +#endif // MAME_NAMCO_NS10CRYPT_H diff --git a/src/mame/namco/ns11prot.h b/src/mame/namco/ns11prot.h index 279835ea44f..93e5dfe2b0f 100644 --- a/src/mame/namco/ns11prot.h +++ b/src/mame/namco/ns11prot.h @@ -4,8 +4,8 @@ * Namco System 11 Protection * */ -#ifndef MAME_MACHINE_NS11PROT_H -#define MAME_MACHINE_NS11PROT_H +#ifndef MAME_NAMCO_NS11PROT_H +#define MAME_NAMCO_NS11PROT_H #pragma once @@ -144,4 +144,4 @@ public: DECLARE_DEVICE_TYPE(KEYCUS_C443, keycus_c443_device) -#endif // MAME_MACHINE_NS11PROT_H +#endif // MAME_NAMCO_NS11PROT_H diff --git a/src/mame/namco/polepos_a.h b/src/mame/namco/polepos_a.h index b8611218284..be325ecab88 100644 --- a/src/mame/namco/polepos_a.h +++ b/src/mame/namco/polepos_a.h @@ -1,5 +1,5 @@ -#ifndef MAME_AUDIO_POLEPOS_H -#define MAME_AUDIO_POLEPOS_H +#ifndef MAME_NAMCO_POLEPOS_H +#define MAME_NAMCO_POLEPOS_H #pragma once @@ -54,4 +54,4 @@ DECLARE_DEVICE_TYPE(POLEPOS_SOUND, polepos_sound_device) DISCRETE_SOUND_EXTERN( polepos_discrete ); -#endif // MAME_AUDIO_POLEPOS_H +#endif // MAME_NAMCO_POLEPOS_H diff --git a/src/mame/namco/shootaway2.cpp b/src/mame/namco/shootaway2.cpp index 69cc2c03424..4bf2b13e7e0 100644 --- a/src/mame/namco/shootaway2.cpp +++ b/src/mame/namco/shootaway2.cpp @@ -22,6 +22,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class m74_state : public driver_device { public: @@ -114,4 +117,7 @@ ROM_START(shootaw2) ROM_LOAD( "unknown_label.5e", 0x000000, 0x040000, CRC(fa75e91e) SHA1(d06ca906135a3f23c1f0dadff75f940ea7ca0e4a) ) ROM_END +} // anonymous namespace + + GAME( 1996, shootaw2, 0, m74, m74, m74_state, empty_init, ROT0, "Namco", "Shoot Away II", MACHINE_NOT_WORKING ) diff --git a/src/mame/namco/starfield_05xx.h b/src/mame/namco/starfield_05xx.h index 2597166f95c..5a8db088fb9 100644 --- a/src/mame/namco/starfield_05xx.h +++ b/src/mame/namco/starfield_05xx.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Robert Hildinger -#ifndef MAME_VIDEO_STARFIELD_05XX_H -#define MAME_VIDEO_STARFIELD_05XX_H +#ifndef MAME_NAMCO_STARFIELD_05XX_H +#define MAME_NAMCO_STARFIELD_05XX_H // used by galaga, bosconian, and their various clones class starfield_05xx_device : public device_t @@ -37,4 +37,4 @@ private: DECLARE_DEVICE_TYPE(STARFIELD_05XX, starfield_05xx_device) -#endif // MAME_VIDEO_STARFIELD_05XX_H +#endif // MAME_NAMCO_STARFIELD_05XX_H diff --git a/src/mame/namco/sweetland.cpp b/src/mame/namco/sweetland.cpp index 7773c5cb95d..4119f73ed9f 100644 --- a/src/mame/namco/sweetland.cpp +++ b/src/mame/namco/sweetland.cpp @@ -86,6 +86,9 @@ SWEET LAND III (1998) main PCB layout #include "machine/i8255.h" #include "sound/ymopn.h" + +namespace { + class sweetland_state : public driver_device { public: @@ -174,5 +177,7 @@ ROM_START(sweetlnd) ROM_LOAD( "sw1.5h", 0x0000, 0x4000, CRC(6e361ae5) SHA1(b12ce39aa8235993d0acdc623ff8dbce9feb146e) ) ROM_END +} // anonymous namespace + GAME( 1986, sweetlnd, 0, sweetland, sweetland, sweetland_state, empty_init, ROT0, "Namco", "Sweet Land", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/namco/toypop.cpp b/src/mame/namco/toypop.cpp index b86cf71fa6d..ae6aaf664c2 100644 --- a/src/mame/namco/toypop.cpp +++ b/src/mame/namco/toypop.cpp @@ -38,6 +38,8 @@ #include "speaker.h" +namespace { + #define MASTER_CLOCK XTAL(6'144'000) class namcos16_state : public driver_device @@ -806,5 +808,8 @@ ROM_START( toypop ) ROM_LOAD( "tp1-6.3d", 0x0000, 0x0100, CRC(16a9166a) SHA1(847cbaf7c88616576c410177e066ae1d792ac0ba) ) ROM_END +} // anonymous namespace + + GAME( 1983, liblrabl, 0, liblrabl, liblrabl, namcos16_state, empty_init, ROT0, "Namco", "Libble Rabble", 0 ) GAME( 1986, toypop, 0, toypop, toypop, namcos16_state, empty_init, ROT180, "Namco", "Toypop", 0 ) diff --git a/src/mame/namco/wacky_gator.cpp b/src/mame/namco/wacky_gator.cpp index 1dfbcf2a069..a717918fcc5 100644 --- a/src/mame/namco/wacky_gator.cpp +++ b/src/mame/namco/wacky_gator.cpp @@ -30,6 +30,8 @@ #include "wackygtr.lh" +namespace { + class wackygtr_state : public driver_device { public: @@ -346,4 +348,7 @@ ROM_START( wackygtr ) ROM_LOAD("wp3-vo0.2h", 0x0000, 0x10000, CRC(91c7986f) SHA1(bc9fa0d41c1caa0f909a349f511d022b7e42c6cd)) ROM_END +} // anonymous namespace + + GAME(1988, wackygtr, 0, wackygtr, wackygtr, wackygtr_state, empty_init, ROT0, "Namco (Data East license)", "Wacky Gator (US)", MACHINE_IS_SKELETON_MECHANICAL | MACHINE_CLICKABLE_ARTWORK) diff --git a/src/mame/namco/warpwarp_a.h b/src/mame/namco/warpwarp_a.h index 41f369ca2c7..3cb11c762eb 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_AUDIO_WARPWARP_H -#define MAME_AUDIO_WARPWARP_H +#ifndef MAME_NAMCO_WARPWARP_H +#define MAME_NAMCO_WARPWARP_H #pragma once @@ -50,4 +50,4 @@ private: DECLARE_DEVICE_TYPE(WARPWARP_SOUND, warpwarp_sound_device) -#endif // MAME_AUDIO_WARPWARP_H +#endif // MAME_NAMCO_WARPWARP_H diff --git a/src/mame/namco/ygv608.h b/src/mame/namco/ygv608.h index 548c9a67df7..8510d935f14 100644 --- a/src/mame/namco/ygv608.h +++ b/src/mame/namco/ygv608.h @@ -5,8 +5,8 @@ * - Mark McDougall */ -#ifndef MAME_VIDEO_YGV608_H -#define MAME_VIDEO_YGV608_H +#ifndef MAME_NAMCO_YGV608_H +#define MAME_NAMCO_YGV608_H #pragma once @@ -310,4 +310,4 @@ private: DECLARE_DEVICE_TYPE(YGV608, ygv608_device) -#endif +#endif // MAME_NAMCO_YGV608_H diff --git a/src/mame/natsemi/ns5652.cpp b/src/mame/natsemi/ns5652.cpp index 6e4e25f474b..e62c6bc01e0 100644 --- a/src/mame/natsemi/ns5652.cpp +++ b/src/mame/natsemi/ns5652.cpp @@ -10,6 +10,9 @@ #include "cpu/pace/pace.h" #include "machine/ins8250.h" + +namespace { + class ns5652_state : public driver_device { public: @@ -88,4 +91,7 @@ ROM_START(ns5652) ROM_LOAD("5930_001a.bin", 0x000, 0x100, NO_DUMP) // MM5203Q (256x8 organization) ROM_END +} // anonymous namespace + + COMP(19??, ns5652, 0, 0, ns5652, ns5652, ns5652_state, empty_init, "National Semiconductor", "unknown INS8900 Multibus card (980305652)", MACHINE_IS_SKELETON) diff --git a/src/mame/ncd/bert_m.h b/src/mame/ncd/bert_m.h index 410fbcf61c1..e913bb45e8c 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_MACHINE_BERT_H -#define MAME_MACHINE_BERT_H +#ifndef MAME_NCD_BERT_H +#define MAME_NCD_BERT_H #pragma once @@ -37,4 +37,4 @@ private: DECLARE_DEVICE_TYPE(BERT, bert_device) -#endif // MAME_MACHINE_BERT_H +#endif // MAME_NCD_BERT_H diff --git a/src/mame/ncd/ncd68k.cpp b/src/mame/ncd/ncd68k.cpp index 51489a7d1d6..185b6072718 100644 --- a/src/mame/ncd/ncd68k.cpp +++ b/src/mame/ncd/ncd68k.cpp @@ -83,6 +83,9 @@ //#define VERBOSE (LOG_GENERAL|LOG_MCU) #include "logmacro.h" + +namespace { + class ncd68k_state : public driver_device { public: @@ -704,6 +707,9 @@ ROM_START(ncd19) ROM_LOAD("ncd4200005.u18", 0x000, 0x800, CRC(075c3746) SHA1(6954cfab5141138df975f1b15d2c8e08d4d203c1)) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP(1989, ncd16, 0, 0, configure, ncd68k, ncd16_state, initialise, "Network Computing Devices", "NCD 16", MACHINE_NOT_WORKING|MACHINE_NO_SOUND) COMP(1990, ncd17c, 0, 0, configure, ncd68k, ncd17c_state, initialise, "Network Computing Devices", "NCD 17C", MACHINE_NOT_WORKING|MACHINE_NO_SOUND) diff --git a/src/mame/ncd/ncdmips.cpp b/src/mame/ncd/ncdmips.cpp index aaff9ea3951..64669b3befd 100644 --- a/src/mame/ncd/ncdmips.cpp +++ b/src/mame/ncd/ncdmips.cpp @@ -20,6 +20,9 @@ #include "machine/mc68681.h" #include "screen.h" + +namespace { + class ncd_mips_state : public driver_device { public: @@ -131,5 +134,8 @@ ROM_START( hmxpro ) ROM_LOAD16_BYTE( "ncdhmx_bm_v2.7.2_b0o.bin", 0x000001, 0x020000, CRC(7f7af795) SHA1(5b31bda8cb42dfb52869d29637fe415e43aa53f4) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1994, hmxpro, 0, 0, hmxpro, hmxpro, ncd_mips_state, empty_init, "Network Computing Devices", "NCD HMX PRO", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/ncd/ncdppc.cpp b/src/mame/ncd/ncdppc.cpp index 18fc94387f8..0d90f90b0a4 100644 --- a/src/mame/ncd/ncdppc.cpp +++ b/src/mame/ncd/ncdppc.cpp @@ -20,6 +20,9 @@ #include "cpu/powerpc/ppc.h" #include "screen.h" + +namespace { + class ncd_ppc_state : public driver_device { public: @@ -101,5 +104,8 @@ ROM_START( explorapro ) ROM_LOAD( "explora__v2.7.6_bm.u37", 0x000000, 0x040000, CRC(038fb1dc) SHA1(036836359f59e70d5bebc50d69083bbe020ddf98) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1995, explorapro, 0, 0, explorapro, explorapro, ncd_ppc_state, empty_init, "Network Computing Devices", "NCD Explora Pro XQ", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/nec/apc.cpp b/src/mame/nec/apc.cpp index d4d4240bdfe..fb285a5194c 100644 --- a/src/mame/nec/apc.cpp +++ b/src/mame/nec/apc.cpp @@ -69,6 +69,9 @@ #include "speaker.h" //#include "sound/ay8910.h" + +namespace { + #define MAIN_CLOCK XTAL(5'000'000) class apc_state : public driver_device @@ -999,4 +1002,7 @@ void apc_state::init_apc() // ... } +} // anonymous namespace + + COMP( 1982, apc, 0, 0, apc, apc, apc_state, init_apc, "NEC", "APC", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/nec/pc100.cpp b/src/mame/nec/pc100.cpp index 6bbdb60cffa..53186ea2af0 100644 --- a/src/mame/nec/pc100.cpp +++ b/src/mame/nec/pc100.cpp @@ -72,6 +72,8 @@ #include "formats/mfi_dsk.h" +namespace { + class pc100_state : public driver_device { public: @@ -701,6 +703,9 @@ ROM_START( pc100 ) ROM_REGION16_LE( 0x20000*4, "vram", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/nec/pc80s31k.h b/src/mame/nec/pc80s31k.h index bc244932612..71a81b39d8f 100644 --- a/src/mame/nec/pc80s31k.h +++ b/src/mame/nec/pc80s31k.h @@ -6,8 +6,8 @@ NEC PC-80S31K ***************************************************************************/ -#ifndef MAME_MACHINE_PC80S31K_H -#define MAME_MACHINE_PC80S31K_H +#ifndef MAME_NEC_PC80S31K_H +#define MAME_NEC_PC80S31K_H #pragma once @@ -131,4 +131,4 @@ DECLARE_DEVICE_TYPE(PC80S31, pc80s31_device) DECLARE_DEVICE_TYPE(PC80S31K, pc80s31k_device) DECLARE_DEVICE_TYPE(PC88VA2_FD_IF, pc88va2_fd_if_device) -#endif // MAME_MACHINE_PC80S31K_H +#endif // MAME_NEC_PC80S31K_H diff --git a/src/mame/nec/pc9801_cd.h b/src/mame/nec/pc9801_cd.h index 69f7e00241f..a5d4bb06133 100644 --- a/src/mame/nec/pc9801_cd.h +++ b/src/mame/nec/pc9801_cd.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:smf -#ifndef MAME_MACHINE_PC9801_CD_H -#define MAME_MACHINE_PC9801_CD_H +#ifndef MAME_NEC_PC9801_CD_H +#define MAME_NEC_PC9801_CD_H #include "bus/ata/atapicdr.h" @@ -20,4 +20,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(PC9801_CD, pc9801_cd_device) -#endif // MAME_MACHINE_PC9801_CD_H +#endif // MAME_NEC_PC9801_CD_H diff --git a/src/mame/nec/pc9801_kbd.h b/src/mame/nec/pc9801_kbd.h index b9c0aaa9523..de8c4c6927b 100644 --- a/src/mame/nec/pc9801_kbd.h +++ b/src/mame/nec/pc9801_kbd.h @@ -5,8 +5,8 @@ PC-9801 Keyboard simulation ***************************************************************************/ -#ifndef MAME_MACHINE_PC9801_KBD_H -#define MAME_MACHINE_PC9801_KBD_H +#ifndef MAME_NEC_PC9801_KBD_H +#define MAME_NEC_PC9801_KBD_H #pragma once @@ -61,4 +61,4 @@ DECLARE_DEVICE_TYPE(PC9801_KBD, pc9801_kbd_device) -#endif // MAME_MACHINE_PC9801_KBD_H +#endif // MAME_NEC_PC9801_KBD_H diff --git a/src/mame/nec/pc9801_memsw.h b/src/mame/nec/pc9801_memsw.h index 4c0bf46d080..1dd7dca7002 100644 --- a/src/mame/nec/pc9801_memsw.h +++ b/src/mame/nec/pc9801_memsw.h @@ -6,8 +6,8 @@ Template for skeleton device ***************************************************************************/ -#ifndef MAME_MACHINE_PC9801_MEMSW_H -#define MAME_MACHINE_PC9801_MEMSW_H +#ifndef MAME_NEC_PC9801_MEMSW_H +#define MAME_NEC_PC9801_MEMSW_H #pragma once @@ -53,4 +53,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(PC9801_MEMSW, pc9801_memsw_device) -#endif // MAME_MACHINE_PC9801_MEMSW_H +#endif // MAME_NEC_PC9801_MEMSW_H diff --git a/src/mame/nec/pce_cd.h b/src/mame/nec/pce_cd.h index 30882f1d099..b96071aee05 100644 --- a/src/mame/nec/pce_cd.h +++ b/src/mame/nec/pce_cd.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol -#ifndef MAME_MACHINE_PCE_CD_H -#define MAME_MACHINE_PCE_CD_H +#ifndef MAME_NEC_PCE_CD_H +#define MAME_NEC_PCE_CD_H #pragma once @@ -221,4 +221,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(PCE_CD, pce_cd_device) -#endif // MAME_MACHINE_PCE_CD_H +#endif // MAME_NEC_PCE_CD_H diff --git a/src/mame/neogeo/neogeo_spr.h b/src/mame/neogeo/neogeo_spr.h index bc546b8a44a..28e85a7fa9c 100644 --- a/src/mame/neogeo/neogeo_spr.h +++ b/src/mame/neogeo/neogeo_spr.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail,Ernesto Corvi,Andrew Prime,Zsolt Vasvari // thanks-to:Fuzz -#ifndef MAME_VIDEO_NEOGEO_SPR_H -#define MAME_VIDEO_NEOGEO_SPR_H +#ifndef MAME_NEOGEO_NEOGEO_SPR_H +#define MAME_NEOGEO_NEOGEO_SPR_H #pragma once @@ -143,4 +143,4 @@ public: DECLARE_DEVICE_TYPE(NEOGEO_SPRITE_MIDAS, neosprite_midas_device) -#endif // MAME_VIDEO_NEOGEO_SPR_H +#endif // MAME_NEOGEO_NEOGEO_SPR_H diff --git a/src/mame/neogeo/neogeocd.cpp b/src/mame/neogeo/neogeocd.cpp index 6b4a8166abe..0ffbcb818f1 100644 --- a/src/mame/neogeo/neogeocd.cpp +++ b/src/mame/neogeo/neogeocd.cpp @@ -35,6 +35,8 @@ #include "softlist.h" +namespace { + // was it actually released in eu / asia? #define NEOCD_REGION_ASIA 3 // IronClad runs with a darkened screen (MVS has the same issue) #define NEOCD_REGION_EUROPE 2 // ^ @@ -1118,6 +1120,8 @@ void ngcd_state::init_neocdzj() m_system_region = NEOCD_REGION_JAPAN; } +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ CONS( 1996, neocdz, 0, 0, neocd_ntsc, neocd, ngcd_state, init_neocdz, "SNK", "Neo-Geo CDZ (US)", 0 ) // the CDZ is the newer model diff --git a/src/mame/neogeo/neopcb.cpp b/src/mame/neogeo/neopcb.cpp index 88ce619d7fb..9a378cbd17f 100644 --- a/src/mame/neogeo/neopcb.cpp +++ b/src/mame/neogeo/neopcb.cpp @@ -11,6 +11,8 @@ #include "bus/neogeo/prot_pvc.h" +namespace { + class neopcb_state : public ngarcade_base_state { public: @@ -556,6 +558,8 @@ void neopcb_state::init_kf2k3pcb() m_maincpu->space(AS_PROGRAM).install_rom(0xc00000, 0xc7ffff, 0x080000, memregion("mainbios")->base()); // 512k bios } +} // anonymous namespace + GAME( 2003, ms5pcb, 0, neopcb, dualbios, neopcb_state, init_ms5pcb, ROT0, "SNK Playmore", "Metal Slug 5 (JAMMA PCB)", MACHINE_SUPPORTS_SAVE ) GAME( 2003, svcpcb, 0, neopcb, dualbios, neopcb_state, init_svcpcb, ROT0, "Playmore / Capcom", "SNK vs. Capcom - SVC Chaos (JAMMA PCB, set 1)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/neogeo/ng_memcard.h b/src/mame/neogeo/ng_memcard.h index 186a998cc17..32d6a93a9dc 100644 --- a/src/mame/neogeo/ng_memcard.h +++ b/src/mame/neogeo/ng_memcard.h @@ -7,8 +7,8 @@ NEOGEO Memory card functions. *********************************************************************/ -#ifndef MAME_MACHINE_NG_MEMCARD_H -#define MAME_MACHINE_NG_MEMCARD_H +#ifndef MAME_NEOGEO_NG_MEMCARD_H +#define MAME_NEOGEO_NG_MEMCARD_H #pragma once @@ -50,4 +50,4 @@ private: DECLARE_DEVICE_TYPE(NG_MEMCARD, ng_memcard_device) -#endif // MAME_MACHINE_NG_MEMCARD_H +#endif // MAME_NEOGEO_NG_MEMCARD_H diff --git a/src/mame/netronics/exp85.cpp b/src/mame/netronics/exp85.cpp index 26d2a906fe0..4449118cd4c 100644 --- a/src/mame/netronics/exp85.cpp +++ b/src/mame/netronics/exp85.cpp @@ -41,6 +41,9 @@ #include "imagedev/cassette.h" #include "sound/spkrdev.h" + +namespace { + #define I8085A_TAG "u100" #define I8155_TAG "u106" #define I8355_TAG "u105" @@ -275,6 +278,9 @@ ROM_START( exp85 ) ROMX_LOAD( "hex.u105", 0xf000, 0x0800, NO_DUMP, ROM_BIOS(1) )*/ ROM_END +} // anonymous namespace + + /* System Drivers */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1979, exp85, 0, 0, exp85, exp85, exp85_state, empty_init, "Netronics", "Explorer/85", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/next/nextkbd.h b/src/mame/next/nextkbd.h index f07afaf405a..308779772e0 100644 --- a/src/mame/next/nextkbd.h +++ b/src/mame/next/nextkbd.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_MACHINE_NEXTKBD_H -#define MAME_MACHINE_NEXTKBD_H +#ifndef MAME_NEXT_NEXTKBD_H +#define MAME_NEXT_NEXTKBD_H #pragma once @@ -109,4 +109,4 @@ private: DECLARE_DEVICE_TYPE(NEXTKBD, nextkbd_device) -#endif // MAME_MACHINE_NEXTKBD_H +#endif // MAME_NEXT_NEXTKBD_H diff --git a/src/mame/next/nextmo.h b/src/mame/next/nextmo.h index a73380d9cef..d60cf5c05ef 100644 --- a/src/mame/next/nextmo.h +++ b/src/mame/next/nextmo.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_MACHINE_NEXTMO_H -#define MAME_MACHINE_NEXTMO_H +#ifndef MAME_NEXT_NEXTMO_H +#define MAME_NEXT_NEXTMO_H #pragma once @@ -55,4 +55,4 @@ private: DECLARE_DEVICE_TYPE(NEXTMO, nextmo_device) -#endif // MAME_MACHINE_NEXTMO_H +#endif // MAME_NEXT_NEXTMO_H diff --git a/src/mame/nichibutsu/csplayh5.cpp b/src/mame/nichibutsu/csplayh5.cpp index f9730e6aac1..4532aac8540 100644 --- a/src/mame/nichibutsu/csplayh5.cpp +++ b/src/mame/nichibutsu/csplayh5.cpp @@ -40,6 +40,9 @@ #include "video/v9938.h" #include "nichisnd.h" + +namespace { + #define USE_H8 0 #define DVD_CLOCK XTAL(27'000'000) @@ -904,11 +907,12 @@ ROM_START( konhaji ) ROM_LOAD( "gal16v8b.bin", 0x000000, 0x000117, CRC(9f0dec43) SHA1(d836e564da496c3049e16f025daf362cced413d4) ) ROM_END +} // anonymous namespace /*************************************************************************** - Game metadatas + Game metadata ***************************************************************************/ diff --git a/src/mame/nichibutsu/dacholer.cpp b/src/mame/nichibutsu/dacholer.cpp index 0ca73468e70..b9b2e6870fd 100644 --- a/src/mame/nichibutsu/dacholer.cpp +++ b/src/mame/nichibutsu/dacholer.cpp @@ -43,6 +43,9 @@ #include "speaker.h" #include "tilemap.h" + +namespace { + class dacholer_state : public driver_device { public: @@ -842,6 +845,8 @@ ROM_START( itaten ) ROM_LOAD( "af-1.3n", 0x0040, 0x0020, CRC(5638e485) SHA1(5d892111936a8eb7646c03a17300069be9a2b442) ) ROM_END +} // anonymous namespace + GAME( 1983, dacholer, 0, dacholer, dacholer, dacholer_state, empty_init, ROT0, "Nichibutsu", "Dacholer", MACHINE_SUPPORTS_SAVE ) GAME( 1983, kickboy, 0, dacholer, kickboy, dacholer_state, empty_init, ROT0, "Nichibutsu", "Kick Boy", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nichibutsu/gomoku_a.h b/src/mame/nichibutsu/gomoku_a.h index 0c077de96bd..239c709d9e6 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_AUDIO_GOMOKU_H -#define MAME_AUDIO_GOMOKU_H +#ifndef MAME_NICHIBUTSU_GOMOKU_H +#define MAME_NICHIBUTSU_GOMOKU_H //************************************************************************** // TYPE DEFINITIONS @@ -60,4 +60,4 @@ private: DECLARE_DEVICE_TYPE(GOMOKU_SOUND, gomoku_sound_device) -#endif // MAME_AUDIO_GOMOKU_H +#endif // MAME_NICHIBUTSU_GOMOKU_H diff --git a/src/mame/nichibutsu/jangou.cpp b/src/mame/nichibutsu/jangou.cpp index 46ef242d6d7..a0e0dee348a 100644 --- a/src/mame/nichibutsu/jangou.cpp +++ b/src/mame/nichibutsu/jangou.cpp @@ -43,6 +43,8 @@ $c088-$c095 player tiles #include "video/resnet.h" +namespace { + #define MASTER_CLOCK XTAL(19'968'000) class jangou_state : public driver_device @@ -1373,6 +1375,8 @@ void jangou_state::init_jngolady() m_nsc->space(AS_PROGRAM).install_read_handler(0x08, 0x08, read8smo_delegate(*this, FUNC(jangou_state::jngolady_rng_r))); } +} // anonymous namespace + /************************************* * diff --git a/src/mame/nichibutsu/nb1412m2.h b/src/mame/nichibutsu/nb1412m2.h index f91b3110767..bfec1041986 100644 --- a/src/mame/nichibutsu/nb1412m2.h +++ b/src/mame/nichibutsu/nb1412m2.h @@ -6,8 +6,8 @@ Nichibutsu 1412M2 device emulation ***************************************************************************/ -#ifndef MAME_MACHINE_NB1412M2_H -#define MAME_MACHINE_NB1412M2_H +#ifndef MAME_NICHIBUTSU_NB1412M2_H +#define MAME_NICHIBUTSU_NB1412M2_H #pragma once @@ -87,4 +87,4 @@ DECLARE_DEVICE_TYPE(NB1412M2, nb1412m2_device) //************************************************************************** -#endif // MAME_MACHINE_NB1412M2_H +#endif // MAME_NICHIBUTSU_NB1412M2_H diff --git a/src/mame/nichibutsu/nb1413m3.h b/src/mame/nichibutsu/nb1413m3.h index 9aa0d587352..7603ad9a188 100644 --- a/src/mame/nichibutsu/nb1413m3.h +++ b/src/mame/nichibutsu/nb1413m3.h @@ -7,8 +7,8 @@ Driver by Takahiro Nogi 1999/11/05 - ******************************************************************************/ -#ifndef MAME_MACHINE_NB1413M3_H -#define MAME_MACHINE_NB1413M3_H +#ifndef MAME_NICHIBUTSU_NB1413M3_H +#define MAME_NICHIBUTSU_NB1413M3_H #pragma once @@ -200,4 +200,4 @@ INPUT_PORTS_EXTERN( nbhf2_ctrl ); DECLARE_DEVICE_TYPE(NB1413M3, nb1413m3_device) -#endif // MAME_MACHINE_NB1413M3_H +#endif // MAME_NICHIBUTSU_NB1413M3_H diff --git a/src/mame/nichibutsu/nb1414m4.h b/src/mame/nichibutsu/nb1414m4.h index 8ee764d3978..c7193dc3a78 100644 --- a/src/mame/nichibutsu/nb1414m4.h +++ b/src/mame/nichibutsu/nb1414m4.h @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese -#ifndef MAME_MACHINE_NB1414M4_H -#define MAME_MACHINE_NB1414M4_H +#ifndef MAME_NICHIBUTSU_NB1414M4_H +#define MAME_NICHIBUTSU_NB1414M4_H #pragma once @@ -38,4 +38,4 @@ private: DECLARE_DEVICE_TYPE(NB1414M4, nb1414m4_device) -#endif // MAME_MACHINE_NB1414M4_H +#endif // MAME_NICHIBUTSU_NB1414M4_H diff --git a/src/mame/nichibutsu/nichild.cpp b/src/mame/nichibutsu/nichild.cpp index f25c86ab1a0..140c7c45c81 100644 --- a/src/mame/nichibutsu/nichild.cpp +++ b/src/mame/nichibutsu/nichild.cpp @@ -35,6 +35,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + #define MAIN_CLOCK XTAL(21'477'272) #define SOUND_CLOCK XTAL(4'000'000) @@ -308,5 +311,8 @@ ROM_START( ldquiz4 ) DISK_IMAGE_READONLY( "ldquiz4", 0, NO_DUMP ) ROM_END +} // anonymous namespace + + GAME( 1991, shabdama, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu", "LD Mahjong #4 Shabon-Dama (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) GAME( 1992, ldquiz4, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu", "LD Quiz dai 4-dan - Kotaetamon Gachi! (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/nichibutsu/nichisnd.h b/src/mame/nichibutsu/nichisnd.h index 30ddda36f7b..03a3cc5fdfc 100644 --- a/src/mame/nichibutsu/nichisnd.h +++ b/src/mame/nichibutsu/nichisnd.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_AUDIO_NICHISND_H -#define MAME_AUDIO_NICHISND_H +#ifndef MAME_NICHIBUTSU_NICHISND_H +#define MAME_NICHIBUTSU_NICHISND_H #pragma once @@ -63,4 +63,4 @@ DECLARE_DEVICE_TYPE(NICHISND, nichisnd_device) //************************************************************************** -#endif // MAME_MACHINE_NICHISND_H +#endif // MAME_NICHIBUTSU_NICHISND_H diff --git a/src/mame/nichibutsu/nightgal.cpp b/src/mame/nichibutsu/nightgal.cpp index fd42c7219e3..9a4fcb90710 100644 --- a/src/mame/nichibutsu/nightgal.cpp +++ b/src/mame/nichibutsu/nightgal.cpp @@ -38,6 +38,8 @@ TODO: #include "speaker.h" +namespace { + #define MASTER_CLOCK XTAL(19'968'000) class nightgal_state : public driver_device @@ -1322,6 +1324,9 @@ void nightgal_state::init_ngalsumr() // 0x6003 some kind of f/f state } +} // anonymous namespace + + /* Type 1 HW */ GAME( 1984, nightgal, 0, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Night Gal (Japan 840920 AG 1-00)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) GAME( 1984, ngtbunny, 0, royalqn, sexygal, nightgal_state, empty_init, ROT0, "Nichibutsu", "Night Bunny (Japan 840601 MRN 2-10)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nichibutsu/wiping_a.h b/src/mame/nichibutsu/wiping_a.h index 6a5ca1c1de5..ef95e672aff 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_AUDIO_WIPING_H -#define MAME_AUDIO_WIPING_H +#ifndef MAME_NICHIBUTSU_WIPING_H +#define MAME_NICHIBUTSU_WIPING_H #pragma once @@ -57,4 +57,4 @@ private: DECLARE_DEVICE_TYPE(WIPING_CUSTOM, wiping_sound_device) -#endif // MAME_AUDIO_WIPING_H +#endif // MAME_NICHIBUTSU_WIPING_H diff --git a/src/mame/nintendo/compmahj.cpp b/src/mame/nintendo/compmahj.cpp index 999e85aec0d..bea3f03c2ee 100644 --- a/src/mame/nintendo/compmahj.cpp +++ b/src/mame/nintendo/compmahj.cpp @@ -38,6 +38,9 @@ linking 2 Computer Mahjongs together, using MJ 8002 link cable. #include "emu.h" #include "cpu/lh5801/lh5801.h" + +namespace { + class compmahj_state : public driver_device { public: @@ -89,5 +92,8 @@ ROM_START( compmahj ) ROM_LOAD( "mj-02", 0x0000, 0x2000, CRC(56d51944) SHA1(5923d72753642314f1e64bd30a6bd69da3985ce9) ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ CONS( 1983, compmahj, 0, 0, compmahj, compmahj, compmahj_state, empty_init, "Nintendo", "Computer Mah-jong Yakuman", MACHINE_IS_SKELETON ) diff --git a/src/mame/nintendo/gamecube.cpp b/src/mame/nintendo/gamecube.cpp index 3917e09d375..73b5a4a54e0 100644 --- a/src/mame/nintendo/gamecube.cpp +++ b/src/mame/nintendo/gamecube.cpp @@ -13,6 +13,8 @@ #include "cpu/powerpc/ppc.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -237,6 +239,8 @@ ROM_START( gcbr ) // DOL-002(BRA); NTSC gamecube board, outputs video with PAL-M ROM_LOAD("dsp_rom.bin", 0x0000, 0x2000, CRC(47daaa65) SHA1(3c6cc6e04fdd0b2a392d7a6ed769455444846be7)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/nintendo/multigam.cpp b/src/mame/nintendo/multigam.cpp index d85964c6afb..a247ac893d5 100644 --- a/src/mame/nintendo/multigam.cpp +++ b/src/mame/nintendo/multigam.cpp @@ -114,6 +114,8 @@ Eproms are 27512,27010,274001 #include "speaker.h" +namespace { + class multigam_state : public driver_device { public: @@ -1403,6 +1405,9 @@ void multigam_state::init_multigmt() multigam_switch_prg_rom(0x01); } +} // anonymous namespace + + GAME( 1992, multigam, 0, multigam, multigam, multigam_state, init_multigam, ROT0, "", "Multi Game (set 1)", 0 ) GAME( 1992, multigmb, multigam, multigam, multigam, multigam_state, init_multigam, ROT0, "", "Multi Game (set 2)", 0 ) GAME( 1992, multigm2, 0, multigm3, multigm2, multigam_state, init_multigm3, ROT0, "Seo Jin", "Multi Game 2", 0 ) diff --git a/src/mame/nintendo/nes_clone.cpp b/src/mame/nintendo/nes_clone.cpp index 17283886d29..8a36248ce02 100644 --- a/src/mame/nintendo/nes_clone.cpp +++ b/src/mame/nintendo/nes_clone.cpp @@ -13,6 +13,9 @@ #include "speaker.h" #include "machine/bankdev.h" + +namespace { + class nes_clone_state : public driver_device { public: @@ -1250,6 +1253,8 @@ void nes_clone_state::init_nes_clone() { } +} // anonymous namespace + // aka 'Atari Flashback' or 'Atari Flashback 1' // "Flashback Mini 7800 uses normal NES-style hardware, together with a mapper chipset similar to the Waixing kk33xx cartridges (NES 2.0 Mapper 534)" diff --git a/src/mame/nintendo/nes_sh6578.cpp b/src/mame/nintendo/nes_sh6578.cpp index 0f2a223472a..0ed79a2ad1d 100644 --- a/src/mame/nintendo/nes_sh6578.cpp +++ b/src/mame/nintendo/nes_sh6578.cpp @@ -30,6 +30,9 @@ #include "logmacro.h" + +namespace { + class nes_sh6578_state : public driver_device { public: @@ -705,6 +708,9 @@ ROM_START( dancmix3 ) ROM_LOAD( "e28f008sa.u5", 0x00000, 0x100000, CRC(faf6480c) SHA1(68bf79910e091443aecc7bf256cd5378a04c550e) ) ROM_END +} // anonymous namespace + + CONS( 200?, maxx5in1, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Senario / JungleTac", "Vs Maxx 5-in-1 Casino / Senario Card & Casino Games", 0 ) // advertised on box as 'With Solitaire" (was there an even older version without it?) CONS( 200?, maxx6in1, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Senario / JungleTac", "Vs Maxx 6-in-1 Casino / Senario Card & Casino Games", 0 ) // advertised on box as "With Texas Hold 'Em" (which is the added game since the 5-in-1) diff --git a/src/mame/nintendo/nes_vt02_vt03.cpp b/src/mame/nintendo/nes_vt02_vt03.cpp index 04fc724d9bf..795ad437ba4 100644 --- a/src/mame/nintendo/nes_vt02_vt03.cpp +++ b/src/mame/nintendo/nes_vt02_vt03.cpp @@ -18,6 +18,9 @@ #include "emu.h" #include "nes_vt_soc.h" + +namespace { + class nes_vt_base_state : public driver_device { public: @@ -51,13 +54,13 @@ protected: required_region_ptr m_prgrom; uint8_t vt_rom_r(offs_t offset); - void vtspace_w(offs_t offset, uint8_t data); + [[maybe_unused]] void vtspace_w(offs_t offset, uint8_t data); void configure_soc(nes_vt02_vt03_soc_device* soc); - uint8_t upper_412c_r(); - uint8_t upper_412d_r(); - void upper_412c_w(uint8_t data); + [[maybe_unused]] uint8_t upper_412c_r(); + [[maybe_unused]] uint8_t upper_412d_r(); + [[maybe_unused]] void upper_412c_w(uint8_t data); private: /* Extra IO */ @@ -1309,7 +1312,7 @@ void nes_vt_state::init_protpp() } } - +} // anonymous namespace // earlier version of vdogdemo diff --git a/src/mame/nintendo/nes_vt09.cpp b/src/mame/nintendo/nes_vt09.cpp index 0cc7111e52c..e12ca16de5b 100644 --- a/src/mame/nintendo/nes_vt09.cpp +++ b/src/mame/nintendo/nes_vt09.cpp @@ -25,6 +25,9 @@ #include "softlist_dev.h" + +namespace { + class nes_vt09_common_base_state : public driver_device { public: @@ -58,7 +61,7 @@ protected: required_region_ptr m_prgrom; uint8_t vt_rom_r(offs_t offset); - void vtspace_w(offs_t offset, uint8_t data); + [[maybe_unused]] void vtspace_w(offs_t offset, uint8_t data); void configure_soc(nes_vt02_vt03_soc_device* soc); @@ -85,7 +88,7 @@ public: void vt_external_space_map_4mbyte(address_map& map); void vt_external_space_map_2mbyte(address_map& map); void vt_external_space_map_1mbyte(address_map& map); - void vt_external_space_map_512kbyte(address_map& map); + [[maybe_unused]] void vt_external_space_map_512kbyte(address_map& map); protected: @@ -534,6 +537,9 @@ ROM_START( timetp25 ) ROM_FILL(0x1fce36, 0x01, 0x04 | 0x40) // the code doesn't set the 'alt 4bpp' mode bit, but needs it? why? it isn't hardcoded as the system takes cartridges which don't want it ROM_END +} // anonymous namespace + + // MSI Entertainment games (MSI previously operated as Majesco Entertainment) // There are meant to be multiple revisions of this software, some with theme tunes for the new wrestlers, some without. This one appears to lack them. diff --git a/src/mame/nintendo/nes_vt09_soc.h b/src/mame/nintendo/nes_vt09_soc.h index a26cc233d7b..49b97e3e62f 100644 --- a/src/mame/nintendo/nes_vt09_soc.h +++ b/src/mame/nintendo/nes_vt09_soc.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NES_VT09_SOC_H -#define MAME_MACHINE_NES_VT09_SOC_H +#ifndef MAME_NINTENDO_NES_VT09_SOC_H +#define MAME_NINTENDO_NES_VT09_SOC_H #pragma once @@ -45,4 +45,4 @@ protected: DECLARE_DEVICE_TYPE(NES_VT09_SOC, nes_vt09_soc_device) -#endif // MAME_MACHINE_NES_VT09_SOC_H +#endif // MAME_NINTENDO_NES_VT09_SOC_H diff --git a/src/mame/nintendo/nes_vt32.cpp b/src/mame/nintendo/nes_vt32.cpp index f1eb1ce6487..f6b4c7d5cc3 100644 --- a/src/mame/nintendo/nes_vt32.cpp +++ b/src/mame/nintendo/nes_vt32.cpp @@ -15,6 +15,9 @@ #include "nes_vt369_vtunknown_soc.h" #include "nes_vt32_soc.h" + +namespace { + class nes_vt32_base_state : public driver_device { public: @@ -56,7 +59,7 @@ protected: required_region_ptr m_prgrom; uint8_t vt_rom_r(offs_t offset); - void vtspace_w(offs_t offset, uint8_t data); + [[maybe_unused]] void vtspace_w(offs_t offset, uint8_t data); void configure_soc(nes_vt02_vt03_soc_device* soc); @@ -363,6 +366,8 @@ ROM_START( fcpocket ) ROM_LOAD( "s29gl01gp.bin", 0x00000, 0x8000000, CRC(8703b18a) SHA1(07943443294e80ca93f83181c8bdbf950b87c52f) ) // 2nd half = 0x00 (so 64MByte of content) ROM_END +} // anonymous namespace + CONS( 2015, dgun2573, 0, 0, nes_vt32_32mb, nes_vt32, nes_vt32_unk_state, empty_init, "dreamGEAR", "My Arcade Gamer V Portable Gaming System (DGUN-2573) (set 1, newer)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) CONS( 2015, dgun2573a, dgun2573, 0, nes_vt32_32mb, nes_vt32, nes_vt32_unk_state, empty_init, "dreamGEAR", "My Arcade Gamer V Portable Gaming System (DGUN-2573) (set 2, older)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // some menu graphics haven't been updated to reflect 'Panda' theme to the sports games diff --git a/src/mame/nintendo/nes_vt32_soc.h b/src/mame/nintendo/nes_vt32_soc.h index 9a08171d04b..d77560ef9ec 100644 --- a/src/mame/nintendo/nes_vt32_soc.h +++ b/src/mame/nintendo/nes_vt32_soc.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NES_VT32_SOC_H -#define MAME_MACHINE_NES_VT32_SOC_H +#ifndef MAME_NINTENDO_NES_VT32_SOC_H +#define MAME_NINTENDO_NES_VT32_SOC_H #pragma once @@ -49,4 +49,4 @@ protected: DECLARE_DEVICE_TYPE(NES_VT32_SOC, nes_vt32_soc_device) DECLARE_DEVICE_TYPE(NES_VT32_SOC_PAL, nes_vt32_soc_pal_device) -#endif // MAME_MACHINE_NES_VT32_SOC_H +#endif // MAME_NINTENDO_NES_VT32_SOC_H diff --git a/src/mame/nintendo/nes_vt369_vtunknown.cpp b/src/mame/nintendo/nes_vt369_vtunknown.cpp index 5bec2f21c42..55e8bfe9d42 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown.cpp +++ b/src/mame/nintendo/nes_vt369_vtunknown.cpp @@ -26,6 +26,9 @@ #include "nes_vt369_vtunknown_soc.h" #include "nes_vt32_soc.h" + +namespace { + class nes_vt369_vtunknown_base_state : public driver_device { public: @@ -67,7 +70,7 @@ protected: required_region_ptr m_prgrom; uint8_t vt_rom_r(offs_t offset); - void vtspace_w(offs_t offset, uint8_t data); + [[maybe_unused]] void vtspace_w(offs_t offset, uint8_t data); void configure_soc(nes_vt02_vt03_soc_device* soc); @@ -95,9 +98,9 @@ public: void vt_external_space_map_16mbyte(address_map& map); void vt_external_space_map_8mbyte(address_map& map); void vt_external_space_map_4mbyte(address_map& map); - void vt_external_space_map_2mbyte(address_map& map); + [[maybe_unused]] void vt_external_space_map_2mbyte(address_map& map); void vt_external_space_map_1mbyte(address_map& map); - void vt_external_space_map_512kbyte(address_map& map); + [[maybe_unused]] void vt_external_space_map_512kbyte(address_map& map); void init_lxcmcypp(); @@ -174,7 +177,7 @@ public: private: uint8_t vt_rom_banked_r(offs_t offset); - void vt_external_space_map_fp_2x32mbyte(address_map& map); + [[maybe_unused]] void vt_external_space_map_fp_2x32mbyte(address_map& map); }; uint8_t nes_vt369_vtunknown_base_state::vt_rom_r(offs_t offset) @@ -890,6 +893,9 @@ void nes_vt369_vtunknown_state::init_lxcmcypp() } } +} // anonymous namespace + + // Runs well, only issues in SMB3 which crashes CONS( 2017, bittboy, 0, 0, nes_vt369_vtunknown_bt_2x16mb, nes_vt369_vtunknown, nes_vt369_vtunknown_cy_state, empty_init, "BittBoy", "BittBoy Mini FC 300 in 1", MACHINE_IMPERFECT_GRAPHICS ) // has external banking (2x 16mbyte banks) // No title screen, but press start and menu and games run fine. Makes odd diff --git a/src/mame/nintendo/nes_vt369_vtunknown_soc.h b/src/mame/nintendo/nes_vt369_vtunknown_soc.h index 89c5bddbbc8..21a66f96ba2 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown_soc.h +++ b/src/mame/nintendo/nes_vt369_vtunknown_soc.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NES_VT369_VTUNKOWN_SOC_H -#define MAME_MACHINE_NES_VT369_VTUNKOWN_SOC_H +#ifndef MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H +#define MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H #pragma once @@ -138,4 +138,4 @@ DECLARE_DEVICE_TYPE(NES_VT369_SOC_SWAP, nes_vt369_alt_swap_d5_d6_soc_device) DECLARE_DEVICE_TYPE(NES_VTUNKNOWN_SOC_DG, nes_vtunknown_soc_dg_device) DECLARE_DEVICE_TYPE(NES_VTUNKNOWN_SOC_FA, nes_vtunknown_soc_fa_device) -#endif // MAME_MACHINE_NES_VT369_VTUNKOWN_SOC_H +#endif // MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H diff --git a/src/mame/nintendo/nes_vt_soc.h b/src/mame/nintendo/nes_vt_soc.h index 1fd7dbcdc5b..0404fe65abd 100644 --- a/src/mame/nintendo/nes_vt_soc.h +++ b/src/mame/nintendo/nes_vt_soc.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_NES_VT_SOC_H -#define MAME_MACHINE_NES_VT_SOC_H +#ifndef MAME_NINTENDO_NES_VT_SOC_H +#define MAME_NINTENDO_NES_VT_SOC_H #pragma once @@ -181,4 +181,4 @@ DECLARE_DEVICE_TYPE(NES_VT02_VT03_SOC, nes_vt02_vt03_soc_device) DECLARE_DEVICE_TYPE(NES_VT02_VT03_SOC_PAL, nes_vt02_vt03_soc_pal_device) DECLARE_DEVICE_TYPE(NES_VT02_VT03_SOC_SCRAMBLE, nes_vt02_vt03_soc_scramble_device) -#endif // MAME_MACHINE_NES_VT_SOC_H +#endif // MAME_NINTENDO_NES_VT_SOC_H diff --git a/src/mame/nintendo/pin64.h b/src/mame/nintendo/pin64.h index 31b836f7ed9..64cf5fb5eb4 100644 --- a/src/mame/nintendo/pin64.h +++ b/src/mame/nintendo/pin64.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_VIDEO_PIN64_H -#define MAME_VIDEO_PIN64_H +#ifndef MAME_NINTENDO_PIN64_H +#define MAME_NINTENDO_PIN64_H #pragma once @@ -177,4 +177,4 @@ private: static const uint8_t CAP_ID[8]; }; -#endif // MAME_VIDEO_PIN64_H +#endif // MAME_NINTENDO_PIN64_H diff --git a/src/mame/nintendo/pokemini.cpp b/src/mame/nintendo/pokemini.cpp index 7eccbea2e1d..e4ee6ef8bd6 100644 --- a/src/mame/nintendo/pokemini.cpp +++ b/src/mame/nintendo/pokemini.cpp @@ -21,6 +21,8 @@ The LCD is likely to be a SSD1828 LCD. #include "speaker.h" +namespace { + class pokemini_state : public driver_device { public: @@ -1733,5 +1735,7 @@ ROM_START( pokemini ) ROM_LOAD( "bios.min", 0x0000, 0x1000, CRC(aed3c14d) SHA1(daad4113713ed776fbd47727762bca81ba74915f) ) ROM_END +} // anonymous namespace + CONS( 2001, pokemini, 0, 0, pokemini, pokemini, pokemini_state, empty_init, "Nintendo", "Pokemon Mini", MACHINE_NO_SOUND ) diff --git a/src/mame/nintendo/vboy.cpp b/src/mame/nintendo/vboy.cpp index 9ac29bedd26..5d5674f1a46 100644 --- a/src/mame/nintendo/vboy.cpp +++ b/src/mame/nintendo/vboy.cpp @@ -42,6 +42,8 @@ #include "vboy.lh" +namespace { + #define READ_BGMAP(bgoffs) m_bgmap[(bgoffs) & 0xffff] #define READ_WORLD(wldoffs) READ_BGMAP((0x1d800 >> 1) + wldoffs) #define READ_COLTAB1(wldoffs) READ_BGMAP((0x1dc00 >> 1) + wldoffs) @@ -1291,6 +1293,9 @@ ROM_START( vboy ) ROM_REGION( 0x2000000, "maincpu", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/nintendo/vt1682.cpp b/src/mame/nintendo/vt1682.cpp index 7053ada918a..a79659aa4c3 100644 --- a/src/mame/nintendo/vt1682.cpp +++ b/src/mame/nintendo/vt1682.cpp @@ -81,6 +81,9 @@ #define VERBOSE (0) #include "logmacro.h" + +namespace { + // NTSC uses XTAL(21'477'272) Sound CPU runs at exactly this, Main CPU runs at this / 4 // PAL uses XTAL(26'601'712) Sound CPU runs at exactly this, Main CPU runs at this / 5 @@ -125,7 +128,7 @@ public: m_render_timer(*this, "render_timer") { } - void vt_vt1682(machine_config& config); + [[maybe_unused]] void vt_vt1682(machine_config& config); void regular_init(); protected: @@ -606,7 +609,7 @@ private: int get_address_for_tilepos(int x, int y, int tilesize, uint16_t* pagebases); void draw_tile_pixline(int segment, int tile, int yy, int x, int y, int palselect, int pal, int is16pix_high, int is16pix_wide, int bpp, int depth, int opaque, int flipx, int flipy, const rectangle& cliprect); - void draw_tile(int segment, int tile, int x, int y, int palselect, int pal, int is16pix_high, int is16pix_wide, int bpp, int depth, int opaque, int flipx, int flipy, const rectangle& cliprect); + [[maybe_unused]] void draw_tile(int segment, int tile, int x, int y, int palselect, int pal, int is16pix_high, int is16pix_wide, int bpp, int depth, int opaque, int flipx, int flipy, const rectangle& cliprect); void draw_layer(int which, int opaque, const rectangle& cliprect); void draw_sprites(const rectangle& cliprect); }; @@ -6184,7 +6187,7 @@ ROM_START( gm235upc ) // also has RAM ROM_END - +} // anonymous namespace // TODO: this is a cartridge based system (actually, verify this, it seems some versions simply had built in games) move these to SL if verified as from cartridge config diff --git a/src/mame/nintendo/vt1682_alu.h b/src/mame/nintendo/vt1682_alu.h index c506af9b6d6..89b6a98820d 100644 --- a/src/mame/nintendo/vt1682_alu.h +++ b/src/mame/nintendo/vt1682_alu.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_VT1682_ALU_H -#define MAME_MACHINE_VT1682_ALU_H +#ifndef MAME_NINTENDO_VT1682_ALU_H +#define MAME_NINTENDO_VT1682_ALU_H #pragma once @@ -47,4 +47,4 @@ private: uint8_t m_alu_out[6]; }; -#endif // MAME_MACHINE_VT1682_ALU_H +#endif // MAME_NINTENDO_VT1682_ALU_H diff --git a/src/mame/nintendo/vt1682_io.h b/src/mame/nintendo/vt1682_io.h index 678124cb627..ac6174e2c82 100644 --- a/src/mame/nintendo/vt1682_io.h +++ b/src/mame/nintendo/vt1682_io.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_VT1682_IO_H -#define MAME_MACHINE_VT1682_IO_H +#ifndef MAME_NINTENDO_VT1682_IO_H +#define MAME_NINTENDO_VT1682_IO_H #pragma once @@ -52,4 +52,4 @@ private: devcb_read8 m_portd_in; }; -#endif // MAME_MACHINE_VT1682_IO_H +#endif // MAME_NINTENDO_VT1682_IO_H diff --git a/src/mame/nintendo/vt1682_timer.h b/src/mame/nintendo/vt1682_timer.h index d2e35280a33..9088929d46b 100644 --- a/src/mame/nintendo/vt1682_timer.h +++ b/src/mame/nintendo/vt1682_timer.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_VT1682_TIMER_H -#define MAME_MACHINE_VT1682_TIMER_H +#ifndef MAME_NINTENDO_VT1682_TIMER_H +#define MAME_NINTENDO_VT1682_TIMER_H #pragma once @@ -54,4 +54,4 @@ private: devcb_write_line m_irq_cb; }; -#endif // MAME_MACHINE_VT1682_TIMER_H +#endif // MAME_NINTENDO_VT1682_TIMER_H diff --git a/src/mame/nintendo/vt1682_uio.h b/src/mame/nintendo/vt1682_uio.h index ef86aaaa2f2..3b2b90d319f 100644 --- a/src/mame/nintendo/vt1682_uio.h +++ b/src/mame/nintendo/vt1682_uio.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_VT1682_UIO_H -#define MAME_MACHINE_VT1682_UIO_H +#ifndef MAME_NINTENDO_VT1682_UIO_H +#define MAME_NINTENDO_VT1682_UIO_H #pragma once @@ -53,4 +53,4 @@ private: }; -#endif // MAME_MACHINE_VT1682_UIO_H +#endif // MAME_NINTENDO_VT1682_UIO_H diff --git a/src/mame/nintendo/vt_unknown.cpp b/src/mame/nintendo/vt_unknown.cpp index 63c45fa8fb0..5ac4f34af0a 100644 --- a/src/mame/nintendo/vt_unknown.cpp +++ b/src/mame/nintendo/vt_unknown.cpp @@ -12,6 +12,9 @@ #include "emupal.h" #include "speaker.h" + +namespace { + class vt_unknown_state : public driver_device { public: @@ -99,5 +102,7 @@ ROM_START( dgun2572 ) ROM_LOAD( "dreamgearwgun.bin", 0x00000, 0x2000000, CRC(92b55c75) SHA1(c7b2319e304a4bf480b5dcd4f24af2e6ba834d0d) ) ROM_END +} // anonymous namespace + CONS( 201?, dgun2572, 0, 0, vt_unknown, vt_unknown, vt_unknown_state, empty_init, "dreamGEAR", "My Arcade Wireless Video Game Station 200-in-1 (DGUN-2572)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/nmk/ddealer.cpp b/src/mame/nmk/ddealer.cpp index 1088ceaee0d..38b83eb70d4 100644 --- a/src/mame/nmk/ddealer.cpp +++ b/src/mame/nmk/ddealer.cpp @@ -122,6 +122,9 @@ #include "speaker.h" #include "tilemap.h" + +namespace { + class ddealer_state : public driver_device { public: @@ -678,4 +681,7 @@ ROM_START( ddealer ) ROM_LOAD( "6.ic86", 0x100, 0x100, CRC(435653a2) SHA1(575b4a46ea65179de3042614da438d2f6d8b572e) ) // 82S129 ROM_END +} // anonymous namespace + + GAME( 1991, ddealer, 0, ddealer, ddealer, ddealer_state, init_ddealer, ROT0, "NMK", "Double Dealer", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) diff --git a/src/mame/nmk/nmk004.h b/src/mame/nmk/nmk004.h index f5045de324f..3194ca0cb8b 100644 --- a/src/mame/nmk/nmk004.h +++ b/src/mame/nmk/nmk004.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_NMK004_H -#define MAME_MACHINE_NMK004_H +#ifndef MAME_NMK_NMK004_H +#define MAME_NMK_NMK004_H #include "cpu/tlcs90/tlcs90.h" @@ -51,4 +51,4 @@ private: DECLARE_DEVICE_TYPE(NMK004, nmk004_device) -#endif // MAME_MACHINE_NMK004_H +#endif // MAME_NMK_NMK004_H diff --git a/src/mame/nmk/nmk16spr.h b/src/mame/nmk/nmk16spr.h index 192fbe8409a..288042b6556 100644 --- a/src/mame/nmk/nmk16spr.h +++ b/src/mame/nmk/nmk16spr.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_VIDEO_NMK16SPR_H -#define MAME_VIDEO_NMK16SPR_H +#ifndef MAME_NMK_NMK16SPR_H +#define MAME_NMK_NMK16SPR_H #pragma once @@ -51,4 +51,4 @@ private: DECLARE_DEVICE_TYPE(NMK_16BIT_SPRITE, nmk_16bit_sprite_device) -#endif // MAME_VIDEO_NMK16SPR_H +#endif // MAME_NMK_NMK16SPR_H diff --git a/src/mame/nokia/dbox.cpp b/src/mame/nokia/dbox.cpp index a7ebe8e6507..46554d7fa82 100644 --- a/src/mame/nokia/dbox.cpp +++ b/src/mame/nokia/dbox.cpp @@ -433,6 +433,9 @@ #define FUNCNAME __PRETTY_FUNCTION__ #endif + +namespace { + #define LOCALFLASH 0 // 1 = local flash rom implementation 0 = intelflash_device class dbox_state : public driver_device @@ -658,4 +661,7 @@ ROM_START( dbox ) ROMX_LOAD( "bootci106.bin", 0x000000, 0x020000, BAD_DUMP CRC(641762a9) SHA1(7c5233390cc66d3ddf4c730a3418ccfba1dc2905), ROM_BIOS(2) ) ROM_END +} // anonymous namespace + + COMP( 1996, dbox, 0, 0, dbox, dbox, dbox_state, init_dbox, "Nokia Multimedia", "D-box 1, Kirsch gruppe", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/nokia/mm1kb.h b/src/mame/nokia/mm1kb.h index 3a38b086a0a..e4be360848a 100644 --- a/src/mame/nokia/mm1kb.h +++ b/src/mame/nokia/mm1kb.h @@ -5,8 +5,8 @@ Nokia MikroMikko 1 keyboard emulation *********************************************************************/ -#ifndef MAME_MACHINE_MM1KB_H -#define MAME_MACHINE_MM1KB_H +#ifndef MAME_NOKIA_MM1KB_H +#define MAME_NOKIA_MM1KB_H #pragma once @@ -78,4 +78,4 @@ DECLARE_DEVICE_TYPE(MM1_KEYBOARD, mm1_keyboard_device) -#endif // MAME_MACHINE_MM1KB_H +#endif // MAME_NOKIA_MM1KB_H diff --git a/src/mame/nokia/nokia_3310.cpp b/src/mame/nokia/nokia_3310.cpp index 9bd90f2c260..0fb3572a401 100644 --- a/src/mame/nokia/nokia_3310.cpp +++ b/src/mame/nokia/nokia_3310.cpp @@ -23,6 +23,8 @@ #include "screen.h" +namespace { + #define LOG_MAD2_REGISTER_ACCESS (0) #define LOG_CCONT_REGISTER_ACCESS (0) @@ -883,6 +885,8 @@ ROM_START( noki8890 ) ROM_LOAD("8890 virgin eeprom 003d0000.fls", 0x1d0000, 0x030000, CRC(1d8ef3b5) SHA1(cc0924cfd4c0ce796fca157c640fc3183c2b5f2c)) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS SYST( 1999, noki3210, 0, 0, noki3310, noki3310, noki3310_state, empty_init, "Nokia", "Nokia 3210", MACHINE_IS_SKELETON ) diff --git a/src/mame/northstar/horizon.cpp b/src/mame/northstar/horizon.cpp index 8fad5d37200..d8397baa6c4 100644 --- a/src/mame/northstar/horizon.cpp +++ b/src/mame/northstar/horizon.cpp @@ -39,10 +39,21 @@ involves replacing the XTAL and reconnecting one jumper. #include "emu.h" #include "bus/rs232/rs232.h" #include "bus/s100/s100.h" +#include "bus/s100/am310.h" +//#include "bus/s100/dj2db.h" +//#include "bus/s100/djdma.h" +//#include "bus/s100/mm65k16s.h" +#include "bus/s100/nsmdsa.h" +#include "bus/s100/nsmdsad.h" +#include "bus/s100/seals8k.h" +//#include "bus/s100/wunderbus.h" #include "cpu/z80/z80.h" #include "machine/i8251.h" #include "softlist_dev.h" + +namespace { + #define Z80_TAG "z80" #define I8251_L_TAG "3a" #define I8251_R_TAG "4a" @@ -150,16 +161,6 @@ DEVICE_INPUT_DEFAULTS_END // S100_INTERFACE( s100_intf ) //------------------------------------------------- -// slot devices -#include "bus/s100/am310.h" -//#include "bus/s100/dj2db.h" -//#include "bus/s100/djdma.h" -//#include "bus/s100/mm65k16s.h" -#include "bus/s100/nsmdsa.h" -#include "bus/s100/nsmdsad.h" -#include "bus/s100/seals8k.h" -//#include "bus/s100/wunderbus.h" - static void horizon_s100_cards(device_slot_interface &device) { device.option_add("mdsa", S100_MDS_A); @@ -264,6 +265,7 @@ ROM_START( vector1 ) // This one have different I/O ROM_LOAD( "horizon.bin", 0x0000, 0x0100, CRC(7aafa134) SHA1(bf1552c4818f30473798af4f54e65e1957e0db48)) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/novation/basssta.cpp b/src/mame/novation/basssta.cpp index 0ccac7b2462..040ebab0d2e 100644 --- a/src/mame/novation/basssta.cpp +++ b/src/mame/novation/basssta.cpp @@ -10,6 +10,9 @@ #include "cpu/mn1880/mn1880.h" #include "machine/eeprompar.h" + +namespace { + class basssta_state : public driver_device { public: @@ -105,5 +108,8 @@ ROM_START(sbasssta) ROM_LOAD("v1.9.bin", 0x00000, 0x10000, CRC(045bf9e3) SHA1(69155026c2497a4731162cadb6b441e00902d3f6)) ROM_END +} // anonymous namespace + + SYST(1995, bassstr, 0, 0, bassstr, basssta, basssta_state, empty_init, "Novation", "BassStation Rack Analogue Synthesizer Module", MACHINE_IS_SKELETON) SYST(1997, sbasssta, 0, 0, sbasssta, basssta, basssta_state, empty_init, "Novation", "Super Bass Station", MACHINE_IS_SKELETON) diff --git a/src/mame/novation/drumsta.cpp b/src/mame/novation/drumsta.cpp index b231ce73d1d..a5c0f295d31 100644 --- a/src/mame/novation/drumsta.cpp +++ b/src/mame/novation/drumsta.cpp @@ -11,6 +11,9 @@ #include "cpu/mn1880/mn1880.h" #include "machine/eeprompar.h" + +namespace { + class drumsta_state : public driver_device { public: @@ -69,4 +72,7 @@ ROM_START(drumsta) ROM_LOAD("v1.2.u28", 0x00000, 0x80000, CRC(dbbc9cfe) SHA1(61474c0bc6cfff3efe95527c57e4891f886b02aa)) ROM_END +} // anonymous namespace + + SYST(1995, drumsta, 0, 0, drumsta, drumsta, drumsta_state, empty_init, "Novation", "Drum Station", MACHINE_IS_SKELETON) -- cgit v1.2.3