From 5908f5a4ab810b5808b0888d45c16c960693f1ba Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Wed, 18 Jan 2023 07:22:01 +0100 Subject: mame/b*-e*: put drivers in anonymous namespaces where applicable, updated #ifndef guards to the current tree structure --- src/mame/banctec/banctec.cpp | 6 ++++++ src/mame/bandai/design_master.cpp | 7 ++++++- src/mame/bandai/rx78.cpp | 6 ++++++ src/mame/bandai/sv8000.cpp | 6 ++++++ src/mame/bandai/wswan_v.h | 6 +++--- src/mame/barcrest/mpu2.cpp | 5 +++++ src/mame/barcrest/mpu3.cpp | 4 ++++ src/mame/barcrest/mpu4_characteriser_bootleg.h | 6 +++--- src/mame/barcrest/mpu4_characteriser_pal.h | 6 +++--- src/mame/barcrest/mpu4_characteriser_pal_bwb.h | 6 +++--- src/mame/barcrest/mpu4dealem.cpp | 5 +++++ src/mame/bfm/bfm_bd1.h | 6 +++--- src/mame/bfm/bfm_bda.h | 6 +++--- src/mame/bfm/bfm_dm01.h | 6 +++--- src/mame/bfm/bfm_sc2.cpp | 7 +++++-- src/mame/bfm/bfm_swp.cpp | 5 ++++- src/mame/bfm/bfmsys83.cpp | 5 +++++ src/mame/bfm/rastersp.cpp | 6 ++++++ src/mame/bitcorp/gamate.cpp | 5 +++++ src/mame/bitcorp/gamate_v.h | 6 +++--- src/mame/bmc/bmcbowl.cpp | 7 ++++++- src/mame/bmc/bmcpokr.cpp | 6 ++++++ src/mame/bmc/popobear.cpp | 6 ++++++ src/mame/booth/apexc_m.h | 6 +++--- src/mame/camputers/camplynx.cpp | 4 ++++ src/mame/cantab/jupace.cpp | 3 +++ src/mame/capcom/alien.cpp | 6 ++++++ src/mame/capcom/bionicc.cpp | 4 ++++ src/mame/capcom/cps1bl_5205.cpp | 5 +++++ src/mame/capcom/cps1bl_pic.cpp | 4 ++++ src/mame/capcom/cps2comm.h | 6 +++--- src/mame/capcom/cps2crypt.h | 6 +++--- src/mame/capcom/cps3_a.h | 6 +++--- src/mame/capcom/egghunt.cpp | 6 ++++++ src/mame/capcom/instantm.cpp | 5 +++++ src/mame/capcom/kenseim.cpp | 5 +++++ src/mame/capcom/sf.cpp | 3 +++ src/mame/capcom/tigeroad_spr.h | 6 +++--- src/mame/capcom/tvcapcom.cpp | 6 ++++++ src/mame/casio/casio_rompack.cpp | 4 ++++ src/mame/casio/casloopy.cpp | 10 ++++++++-- src/mame/casio/cfx9850.cpp | 5 +++++ src/mame/casio/fp1100.cpp | 6 ++++++ src/mame/casio/fp200.cpp | 6 ++++++ src/mame/casio/fp6000.cpp | 4 ++++ src/mame/casio/fp6000_kbd.h | 6 +++--- src/mame/casio/ht6000.cpp | 4 ++++ src/mame/casio/pb1000.cpp | 5 +++++ src/mame/casio/pv2000.cpp | 5 +++++ src/mame/ces/cesclass.cpp | 5 +++++ src/mame/ces/galgames.cpp | 5 +++++ src/mame/cinematronics/cinemat_a.h | 6 +++--- src/mame/cinematronics/dlair.cpp | 3 +++ src/mame/cinematronics/dlair2.cpp | 5 +++++ src/mame/cinematronics/leland_a.h | 6 +++--- src/mame/cinematronics/nl_armora.h | 6 +++--- src/mame/cinematronics/nl_barrier.h | 6 +++--- src/mame/cinematronics/nl_boxingb.h | 6 +++--- src/mame/cinematronics/nl_cinemat_common.h | 6 +++--- src/mame/cinematronics/nl_ripoff.h | 6 +++--- src/mame/cinematronics/nl_solarq.h | 6 +++--- src/mame/cinematronics/nl_spacewar.h | 6 +++--- src/mame/cinematronics/nl_speedfrk.h | 6 +++--- src/mame/cinematronics/nl_starcas.h | 6 +++--- src/mame/cinematronics/nl_starhawk.h | 6 +++--- src/mame/cinematronics/nl_sundance.h | 6 +++--- src/mame/cinematronics/nl_tailg.h | 6 +++--- src/mame/cinematronics/nl_warrior.h | 6 +++--- src/mame/citoh/cit101.cpp | 6 ++++++ src/mame/citoh/cit101_kbd.h | 6 +++--- src/mame/citoh/cit101xl.cpp | 6 ++++++ src/mame/citoh/cit220.cpp | 4 ++++ src/mame/citoh/cit220_kbd.h | 6 +++--- src/mame/coleco/coleco_m.h | 6 +++--- src/mame/commodore/c64.cpp | 6 +++++- src/mame/commodore/c64dtv.cpp | 3 +++ src/mame/commodore/c900.cpp | 5 +++++ src/mame/commodore/cbm2.cpp | 4 ++++ src/mame/commodore/cbm_snqk.h | 6 +++--- src/mame/commodore/clcd.cpp | 5 +++++ src/mame/commodore/mps1230.cpp | 6 ++++++ src/mame/commodore/pet.cpp | 10 +++++++--- src/mame/commodore/plus4.cpp | 4 ++++ src/mame/commodore/vic10.cpp | 4 ++++ src/mame/commodore/vic20.cpp | 4 ++++ src/mame/compugraphic/pwrview.cpp | 6 ++++++ src/mame/conitec/prof80mmu.h | 6 +++--- src/mame/cromemco/mcb216.cpp | 5 +++++ src/mame/dai/dai_snd.h | 6 +++--- src/mame/dataeast/backfire.cpp | 5 +++++ src/mame/dataeast/cntsteer.cpp | 4 ++++ src/mame/dataeast/dblewing.cpp | 5 +++++ src/mame/dataeast/decbac06.h | 6 +++--- src/mame/dataeast/deckarn.h | 6 +++--- src/mame/dataeast/decmxc06.h | 6 +++--- src/mame/dataeast/deco104.h | 6 +++--- src/mame/dataeast/deco146.h | 6 +++--- src/mame/dataeast/deco156_m.h | 6 +++--- src/mame/dataeast/deco16ic.h | 6 +++--- src/mame/dataeast/deco222.h | 6 +++--- src/mame/dataeast/deco_ace.h | 6 +++--- src/mame/dataeast/deco_irq.h | 6 +++--- src/mame/dataeast/decocass_tape.h | 6 +++--- src/mame/dataeast/decocomn.h | 6 +++--- src/mame/dataeast/decocpu6.h | 6 +++--- src/mame/dataeast/decocpu7.h | 6 +++--- src/mame/dataeast/decrmc3.h | 6 +++--- src/mame/dataeast/deshoros.cpp | 6 ++++++ src/mame/dataeast/dreambal.cpp | 6 ++++++ src/mame/dataeast/madmotor.cpp | 4 ++++ src/mame/dataeast/mirage.cpp | 7 ++++++- src/mame/dataeast/progolf.cpp | 4 ++++ src/mame/dataeast/vaportra.cpp | 5 +++++ src/mame/ddr/ac1.cpp | 6 ++++++ src/mame/ddr/bcs3.cpp | 5 +++++ src/mame/ddr/jtc.cpp | 6 ++++++ src/mame/ddr/k7659kb.h | 6 +++--- src/mame/ddr/kc_keyb.h | 6 +++--- src/mame/ddr/kramermc.cpp | 6 ++++++ src/mame/ddr/mc8020.cpp | 5 +++++ src/mame/ddr/mc8030.cpp | 5 +++++ src/mame/ddr/nanos.cpp | 5 +++++ src/mame/ddr/pcm.cpp | 5 +++++ src/mame/ddr/vcs80.cpp | 6 ++++++ src/mame/dec/dc305.h | 6 +++--- src/mame/dec/dct11em.cpp | 5 +++++ src/mame/dec/dec_lk201.h | 6 +++--- src/mame/dec/decioga.h | 6 +++--- src/mame/dec/decmate2.cpp | 6 ++++++ src/mame/dec/dectalk.cpp | 6 +++++- src/mame/dec/decwritr.cpp | 4 ++++ src/mame/dec/rainbow.cpp | 6 ++++++ src/mame/dec/rx01.h | 6 +++--- src/mame/dec/vax11.cpp | 6 +++++- src/mame/dec/vk100.cpp | 7 ++++++- src/mame/dec/vt100.cpp | 5 +++++ src/mame/dec/vt220.cpp | 5 +++++ src/mame/dec/vt240.cpp | 5 +++++ src/mame/dec/vt320.cpp | 5 +++++ src/mame/dec/vt52.cpp | 6 ++++++ src/mame/dec/vt520.cpp | 5 +++++ src/mame/dec/vt62.cpp | 5 +++++ src/mame/dec/vtvideo.h | 6 +++--- src/mame/dgrm/blackt96.cpp | 5 +++++ src/mame/dms/dms5000.cpp | 5 +++++ src/mame/dms/zsbc3.cpp | 5 +++++ src/mame/drc/zrt80.cpp | 6 ++++++ src/mame/dynax/dynax_blitter_rev2.h | 6 +++--- src/mame/eaca/cgenie.cpp | 4 ++++ src/mame/edevices/diverboy.cpp | 2 ++ src/mame/edevices/edevices.h | 6 +++--- src/mame/edevices/mwarr.cpp | 6 ++++++ src/mame/edevices/pzletime.cpp | 5 +++++ src/mame/efo/cedar_magnet.cpp | 5 +++++ src/mame/efo/cedar_magnet_flop.h | 6 +++--- src/mame/efo/cedar_magnet_plane.h | 6 +++--- src/mame/efo/cedar_magnet_sprite.h | 6 +++--- src/mame/efo/nightmare.cpp | 5 +++++ src/mame/elektor/elekscmp.cpp | 5 +++++ src/mame/elektor/junior.cpp | 5 +++++ src/mame/elektron/elektronmono.cpp | 5 +++++ src/mame/emusys/emax.cpp | 6 ++++++ src/mame/emusys/emu2.cpp | 6 ++++++ src/mame/emusys/emu3.cpp | 6 ++++++ src/mame/emusys/emu68k.cpp | 6 ++++++ src/mame/ensoniq/enmirage.cpp | 6 ++++++ src/mame/ensoniq/esq1.cpp | 5 +++++ src/mame/ensoniq/esqasr.cpp | 5 +++++ src/mame/ensoniq/esqlcd.h | 6 +++--- src/mame/ensoniq/esqmr.cpp | 5 +++++ src/mame/ensoniq/esqpanel.h | 6 +++--- src/mame/ensoniq/esqvfd.h | 6 +++--- src/mame/enterprise/ep64.cpp | 3 +++ src/mame/enterprise/nick.h | 6 +++--- src/mame/eolith/eolith16.cpp | 5 +++++ src/mame/eolith/vegaeo.cpp | 5 +++++ src/mame/epoch/scv.cpp | 4 ++++ src/mame/epson/px4.cpp | 4 ++++ src/mame/epson/qx10.cpp | 5 +++++ src/mame/ericsson/e9161.cpp | 4 ++++ src/mame/ericsson/eispc.cpp | 6 ++++++ src/mame/ericsson/eispc_kb.h | 6 +++--- src/mame/excellent/dblcrown.cpp | 6 ++++++ src/mame/excellent/excellent_spr.h | 6 +++--- src/mame/exidy/exidy440_a.h | 6 +++--- src/mame/exidy/exidyttl.cpp | 7 +++++++ src/mame/exidy/micropolis.h | 6 +++--- src/mame/exidy/nl_carpolo.h | 6 +++--- src/mame/exidy/nl_fireone.h | 6 +++--- src/mame/exidy/nl_starfire.h | 6 +++--- 190 files changed, 814 insertions(+), 234 deletions(-) diff --git a/src/mame/banctec/banctec.cpp b/src/mame/banctec/banctec.cpp index 220ad278819..db1faffa5b2 100644 --- a/src/mame/banctec/banctec.cpp +++ b/src/mame/banctec/banctec.cpp @@ -22,6 +22,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class banctec_state : public driver_device { public: @@ -174,6 +177,9 @@ ROM_START(banctec) ROM_LOAD("banctec_eseries_panel.u20", 0x0000, 0x1000, CRC(5b6ecec9) SHA1(35aff8f965bce77205e3a43d71e39097585091a7)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/bandai/design_master.cpp b/src/mame/bandai/design_master.cpp index 6331ae22f70..5d1e34e8b88 100644 --- a/src/mame/bandai/design_master.cpp +++ b/src/mame/bandai/design_master.cpp @@ -44,6 +44,9 @@ #include "softlist_dev.h" //#include "speaker.h" + +namespace { + class bdsm_state : public driver_device { public: @@ -70,7 +73,7 @@ private: uint32_t screen_update(screen_device& screen, bitmap_rgb32& bitmap, const rectangle& cliprect); - DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load_bdesignm); + [[maybe_unused]] DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load_bdesignm); required_device m_maincpu; required_device m_cartslot; @@ -158,5 +161,7 @@ ROM_START( bdesignm ) ROM_LOAD( "h8_328.bin", 0x00000, 0x6000, NO_DUMP ) // internal rom (When the console is booted up without a cart it enters the default (builtin) art / drawing program, otherwise probably not used as carts contain boot vectors etc.) ROM_END +} // anonymous namespace + CONS( 1995, bdesignm, 0, 0, bdesignm, bdesignm, bdsm_state, empty_init, "Bandai", "Design Master Denshi Mangajuku", MACHINE_IS_SKELETON ) diff --git a/src/mame/bandai/rx78.cpp b/src/mame/bandai/rx78.cpp index 9c68f4073c0..edeecc99116 100644 --- a/src/mame/bandai/rx78.cpp +++ b/src/mame/bandai/rx78.cpp @@ -76,6 +76,9 @@ BTANB: #include "softlist_dev.h" #include "speaker.h" + +namespace { + class rx78_state : public driver_device { public: @@ -570,6 +573,9 @@ void rx78_state::init_rx78() prg.unmap_readwrite(0x6000, 0xafff); } +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/bandai/sv8000.cpp b/src/mame/bandai/sv8000.cpp index 5e36607c628..7d7c61471e5 100644 --- a/src/mame/bandai/sv8000.cpp +++ b/src/mame/bandai/sv8000.cpp @@ -36,6 +36,9 @@ Looking at the code of the cartridges it seems there is: #include "softlist_dev.h" #include "speaker.h" + +namespace { + class sv8000_state : public driver_device { public: @@ -420,6 +423,9 @@ ROM_START( sv8000 ) ROM_REGION( 0x1000, "maincpu", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/bandai/wswan_v.h b/src/mame/bandai/wswan_v.h index 030f9ef5f1b..8b8ed439739 100644 --- a/src/mame/bandai/wswan_v.h +++ b/src/mame/bandai/wswan_v.h @@ -11,8 +11,8 @@ **********************************************************************/ -#ifndef MAME_VIDEO_WSWAN_H -#define MAME_VIDEO_WSWAN_H +#ifndef MAME_BANDAI_WSWAN_H +#define MAME_BANDAI_WSWAN_H #pragma once @@ -134,4 +134,4 @@ protected: DECLARE_DEVICE_TYPE(WSWAN_VIDEO, wswan_video_device) -#endif // MAME_VIDEO_WSWAN_H +#endif // MAME_BANDAI_WSWAN_H diff --git a/src/mame/barcrest/mpu2.cpp b/src/mame/barcrest/mpu2.cpp index 914dd61b447..ad5afb45894 100644 --- a/src/mame/barcrest/mpu2.cpp +++ b/src/mame/barcrest/mpu2.cpp @@ -41,6 +41,8 @@ #include "cpu/m6800/m6800.h" +namespace { + class mpu2_state : public driver_device { public: @@ -106,5 +108,8 @@ ROM_START( m2svlite ) ROM_LOAD( "sl1.bin", 0x0000, 0x0800, CRC(afe04b5a) SHA1(3b3385a9b039992279fda5b87926b5089a448581) ) ROM_END +} // anonymous namespace + + GAME(198?, m2hilite, 0, mpu2, mpu2, mpu2_state, empty_init, ROT0, "Barcrest", "Hi-Lights (Barcrest) (MPU2)", MACHINE_IS_SKELETON_MECHANICAL) GAME(198?, m2svlite, 0, mpu2, mpu2, mpu2_state, empty_init, ROT0, "Barcrest", "Silver Lights (Barcrest) (MPU2)", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/barcrest/mpu3.cpp b/src/mame/barcrest/mpu3.cpp index 372afb9bee2..fe732a3ee82 100644 --- a/src/mame/barcrest/mpu3.cpp +++ b/src/mame/barcrest/mpu3.cpp @@ -170,6 +170,9 @@ TODO: - Distinguish door switches using manual #define LOG(x) do { if (MPU3VERBOSE) logerror x; } while (0) + +namespace { + class mpu3_state : public driver_device { public: @@ -1562,6 +1565,7 @@ ROM_START( m3winstra ) ROM_COPY( "maincpu", 0x0000, 0x8000, 0x8000 ) ROM_END +} // anonymous namespace /* Barcrest */ diff --git a/src/mame/barcrest/mpu4_characteriser_bootleg.h b/src/mame/barcrest/mpu4_characteriser_bootleg.h index 85496f437ee..9e1856098d2 100644 --- a/src/mame/barcrest/mpu4_characteriser_bootleg.h +++ b/src/mame/barcrest/mpu4_characteriser_bootleg.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_MPU4_CHARACTERISER_BL_H -#define MAME_MACHINE_MPU4_CHARACTERISER_BL_H +#ifndef MAME_BARCREST_MPU4_CHARACTERISER_BL_H +#define MAME_BARCREST_MPU4_CHARACTERISER_BL_H #pragma once @@ -67,4 +67,4 @@ protected: int m_prot_col = 0; }; -#endif // MAME_MACHINE_MPU4_CHARACTERISER_BL_H +#endif // MAME_BARCREST_MPU4_CHARACTERISER_BL_H diff --git a/src/mame/barcrest/mpu4_characteriser_pal.h b/src/mame/barcrest/mpu4_characteriser_pal.h index c2291c6d174..98c0bea143f 100644 --- a/src/mame/barcrest/mpu4_characteriser_pal.h +++ b/src/mame/barcrest/mpu4_characteriser_pal.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, James Wallace -#ifndef MAME_MACHINE_MPU4_CHARACTERISER_PAL_H -#define MAME_MACHINE_MPU4_CHARACTERISER_PAL_H +#ifndef MAME_BARCREST_MPU4_CHARACTERISER_PAL_H +#define MAME_BARCREST_MPU4_CHARACTERISER_PAL_H #pragma once @@ -1435,4 +1435,4 @@ private: uint8_t m_temp_debug_table[64]; }; -#endif // MAME_MACHINE_MPU4_CHARACTERISER_PAL_H +#endif // MAME_BARCREST_MPU4_CHARACTERISER_PAL_H diff --git a/src/mame/barcrest/mpu4_characteriser_pal_bwb.h b/src/mame/barcrest/mpu4_characteriser_pal_bwb.h index 3777029602d..3064b6dee26 100644 --- a/src/mame/barcrest/mpu4_characteriser_pal_bwb.h +++ b/src/mame/barcrest/mpu4_characteriser_pal_bwb.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, James Wallace -#ifndef MAME_MACHINE_MPU4_CHARACTERISER_PAL_BWB_H -#define MAME_MACHINE_MPU4_CHARACTERISER_PAL_BWB_H +#ifndef MAME_BARCREST_MPU4_CHARACTERISER_PAL_BWB_H +#define MAME_BARCREST_MPU4_CHARACTERISER_PAL_BWB_H #pragma once @@ -48,4 +48,4 @@ private: uint32_t m_otherkey = 0x00000000; }; -#endif // MAME_MACHINE_MPU4_CHARACTERISER_PAL_BWB_H +#endif // MAME_BARCREST_MPU4_CHARACTERISER_PAL_BWB_H diff --git a/src/mame/barcrest/mpu4dealem.cpp b/src/mame/barcrest/mpu4dealem.cpp index ede4ec1ee9a..8586fe9ccba 100644 --- a/src/mame/barcrest/mpu4dealem.cpp +++ b/src/mame/barcrest/mpu4dealem.cpp @@ -22,6 +22,8 @@ the Deal 'Em board design, rather than the one they ultimately used, suggesting #include "tilemap.h" +namespace { + class mpu4dealem_state : public mpu4_state { public: @@ -399,6 +401,9 @@ ROM_START( v4dealem ) ROM_LOAD( "zenndlem.u10", 0x000, 0x104, CRC(e3103c05) SHA1(91b7be75c5fb37025039ab54b484e46a033969b5) ) ROM_END +} // anonymous namespace + + /*Deal 'Em was a conversion kit designed to make early MPU4 machines into video games by replacing the top glass and reel assembly with this kit and a supplied monitor. This explains why the cabinet switch alters lamp data and buttons. The original Deal 'Em ran on Summit Coin hardware, and was made by someone else. diff --git a/src/mame/bfm/bfm_bd1.h b/src/mame/bfm/bfm_bd1.h index 911ede2cd31..2d0b735535e 100644 --- a/src/mame/bfm/bfm_bd1.h +++ b/src/mame/bfm/bfm_bd1.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_BFM_BD1_H -#define MAME_MACHINE_BFM_BD1_H +#ifndef MAME_BFM_BFM_BD1_H +#define MAME_BFM_BFM_BD1_H #pragma once @@ -70,4 +70,4 @@ private: DECLARE_DEVICE_TYPE(BFM_BD1, bfm_bd1_device) -#endif // MAME_MACHINE_BFM_BD1_H +#endif // MAME_BFM_BFM_BD1_H diff --git a/src/mame/bfm/bfm_bda.h b/src/mame/bfm/bfm_bda.h index 9d0c486b1cc..cea0da23c06 100644 --- a/src/mame/bfm/bfm_bda.h +++ b/src/mame/bfm/bfm_bda.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_BFM_BDA_H -#define MAME_MACHINE_BFM_BDA_H +#ifndef MAME_BFM_BFM_BDA_H +#define MAME_BFM_BFM_BDA_H #pragma once @@ -67,4 +67,4 @@ private: DECLARE_DEVICE_TYPE(BFM_BDA, bfm_bda_device) -#endif // MAME_MACHINE_BFM_BDA_H +#endif // MAME_BFM_BFM_BDA_H diff --git a/src/mame/bfm/bfm_dm01.h b/src/mame/bfm/bfm_dm01.h index 9bb459ea5df..03d6df0efff 100644 --- a/src/mame/bfm/bfm_dm01.h +++ b/src/mame/bfm/bfm_dm01.h @@ -5,8 +5,8 @@ Bellfruit dotmatrix driver, (under heavy construction !!!) *************************************************************************************/ -#ifndef MAME_VIDEO_BFM_DM01 -#define MAME_VIDEO_BFM_DM01 +#ifndef MAME_BFM_BFM_DM01 +#define MAME_BFM_BFM_DM01 #pragma once @@ -64,4 +64,4 @@ private: DECLARE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device) -#endif // MAME_VIDEO_BFM_DM01 +#endif // MAME_BFM_BFM_DM01 diff --git a/src/mame/bfm/bfm_sc2.cpp b/src/mame/bfm/bfm_sc2.cpp index cbfeb4c944d..f62f965422d 100644 --- a/src/mame/bfm/bfm_sc2.cpp +++ b/src/mame/bfm/bfm_sc2.cpp @@ -194,6 +194,8 @@ Adder hardware: #include "sc2prem2.lh" +namespace { + class bfm_sc2_state : public driver_device { public: @@ -247,7 +249,7 @@ protected: void uart2data_w(uint8_t data); uint8_t key_r(offs_t offset); void vfd1_bd1_w(uint8_t data); - void vfd2_data_w(uint8_t data); + [[maybe_unused]] void vfd2_data_w(uint8_t data); void e2ram_w(uint8_t data); uint8_t direct_input_r(); int recdata(int changed, int data); @@ -257,7 +259,7 @@ protected: INTERRUPT_GEN_MEMBER(timer_irq); void on_scorpion2_reset(); void Scorpion2_SetSwitchState(int strobe, int data, int state); - int Scorpion2_GetSwitchState(int strobe, int data); + [[maybe_unused]] int Scorpion2_GetSwitchState(int strobe, int data); void e2ram_reset(); int recAck(int changed, int data); int read_e2ram(); @@ -8588,6 +8590,7 @@ ROM_START( sc2cvega4p ) sc2_plds ROM_END +} // anonymous namespace /* Video Based (Adder 2) */ diff --git a/src/mame/bfm/bfm_swp.cpp b/src/mame/bfm/bfm_swp.cpp index 9205d6ea68b..3a67fbf9c4b 100644 --- a/src/mame/bfm/bfm_swp.cpp +++ b/src/mame/bfm/bfm_swp.cpp @@ -107,6 +107,9 @@ TEST.TXT - suggests the content of a prototype version, which was expanded to ma #include "screen.h" #include "speaker.h" + +namespace { + class bfm_swp_state : public driver_device { public: @@ -291,7 +294,7 @@ ROM_START( c3_ppays ) DISK_IMAGE_READONLY( "cd or hdd", 0, NO_DUMP ) ROM_END - +} // anonymous namespace GAME( 199?, c3_rtime, 0, bfm_swp, bfm_swp, bfm_swp_state, empty_init, ROT0, "BFM", "Radio Times (Bellfruit) (Cobra 3)", MACHINE_IS_SKELETON ) diff --git a/src/mame/bfm/bfmsys83.cpp b/src/mame/bfm/bfmsys83.cpp index a5b654979d6..406289a0786 100644 --- a/src/mame/bfm/bfmsys83.cpp +++ b/src/mame/bfm/bfmsys83.cpp @@ -9,6 +9,8 @@ #include "speaker.h" +namespace { + class bfmsys83_state : public driver_device { public: @@ -66,5 +68,8 @@ ROM_START( b83cops ) // was marked as sys85, but I think this is the sys83 set? ROM_LOAD( "cops.p4", 0x8000, 0x2000, CRC(ce573b35) SHA1(f2ba22f0d55f882dd91b37e80e4bb14effd9113a) ) ROM_END +} // anonymous namespace + + GAME( 198?, b83catms, 0, bfmsys83, bfmsys83, bfmsys83_state, empty_init, ROT0, "BFM", "Cat & Mouse (Bellfruit) (System 83)", MACHINE_IS_SKELETON_MECHANICAL) GAME( 198?, b83cops, 0, bfmsys83, bfmsys83, bfmsys83_state, empty_init, ROT0, "BFM", "Cops & Robbers (Bellfruit) (System 83)", MACHINE_IS_SKELETON_MECHANICAL) diff --git a/src/mame/bfm/rastersp.cpp b/src/mame/bfm/rastersp.cpp index d412f6d3bd3..c151957d51a 100644 --- a/src/mame/bfm/rastersp.cpp +++ b/src/mame/bfm/rastersp.cpp @@ -35,6 +35,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + /************************************* * * Defines @@ -1603,6 +1606,9 @@ ROM_START( fbcrazy ) DISK_IMAGE_READONLY( "95100303", 0, SHA1(9ba47c96de27ec2bea9c6624d78d309b67705406) ) ROM_END +} // anonymous namespace + + /************************************* * * Game drivers diff --git a/src/mame/bitcorp/gamate.cpp b/src/mame/bitcorp/gamate.cpp index 5218223f293..df846ce0b8a 100644 --- a/src/mame/bitcorp/gamate.cpp +++ b/src/mame/bitcorp/gamate.cpp @@ -20,6 +20,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + class gamate_state : public driver_device { public: @@ -230,6 +233,8 @@ ROM_START(gamate) ROMX_LOAD("gamate_bios_bit.bin", 0x0000, 0x1000, CRC(03a5f3a7) SHA1(4e9dfbfe916ca485530ef4221593ab68738e2217), ROM_BIOS(1)) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS CONS( 1990, gamate, 0, 0, gamate, gamate, gamate_state, init_gamate, "Bit Corp", "Gamate", 0 ) diff --git a/src/mame/bitcorp/gamate_v.h b/src/mame/bitcorp/gamate_v.h index b3d593165e6..534dcc3acea 100644 --- a/src/mame/bitcorp/gamate_v.h +++ b/src/mame/bitcorp/gamate_v.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Peter Wilhelmsen, Kevtris -#ifndef MAME_VIDEO_GAMATE_H -#define MAME_VIDEO_GAMATE_H +#ifndef MAME_BITCORP_GAMATE_H +#define MAME_BITCORP_GAMATE_H #pragma once @@ -60,4 +60,4 @@ private: int m_displayblank; }; -#endif // MAME_VIDEO_GAMATE_H +#endif // MAME_BITCORP_GAMATE_H diff --git a/src/mame/bmc/bmcbowl.cpp b/src/mame/bmc/bmcbowl.cpp index 55d1de7bed4..c38dc14a047 100644 --- a/src/mame/bmc/bmcbowl.cpp +++ b/src/mame/bmc/bmcbowl.cpp @@ -113,6 +113,9 @@ Main board: #include "screen.h" #include "speaker.h" + +namespace { + #define NVRAM_HACK @@ -522,7 +525,9 @@ ROM_START( bmcbowl ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "bmc_10.bin", 0x00000, 0x20000, CRC(f840c17f) SHA1(82891a85c8dc60f727b5a8c8e8ab09e8e4bd8af4) ) - ROM_END +} // anonymous namespace + + GAME( 1994, bmcbowl, 0, bmcbowl, bmcbowl, bmcbowl_state, empty_init, ROT0, "BMC", "Konkyuu no Hoshi", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/bmc/bmcpokr.cpp b/src/mame/bmc/bmcpokr.cpp index ee027673297..882a50c7682 100644 --- a/src/mame/bmc/bmcpokr.cpp +++ b/src/mame/bmc/bmcpokr.cpp @@ -28,6 +28,9 @@ Other: BMC B816140 (CPLD) #include "speaker.h" #include "tilemap.h" + +namespace { + class bmcpokr_state : public driver_device { public: @@ -947,5 +950,8 @@ ROM_START( mjmaglmp ) ROM_LOAD( "ja-a-901.u6", 0x00000, 0x40000, CRC(25f36d00) SHA1(c182348340ca67ad69d1a67c58b47d6371a725c9) ) ROM_END +} // anonymous namespace + + GAME( 1999, bmcpokr, 0, bmcpokr, bmcpokr, bmcpokr_state, empty_init, ROT0, "BMC", "Dongfang Shenlong", MACHINE_SUPPORTS_SAVE ) GAME( 2000, mjmaglmp, 0, mjmaglmp, mjmaglmp, bmcpokr_state, empty_init, ROT0, "BMC", "Mahjong Magic Lamp (v. JAA02)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/bmc/popobear.cpp b/src/mame/bmc/popobear.cpp index e865562587c..f61c669d133 100644 --- a/src/mame/bmc/popobear.cpp +++ b/src/mame/bmc/popobear.cpp @@ -87,6 +87,9 @@ Component Side A B Solder Side #include "speaker.h" #include "tilemap.h" + +namespace { + class popobear_state : public driver_device { public: @@ -683,4 +686,7 @@ ROM_START( popobear ) ROM_LOAD( "popobear_ta-a-901.u9", 0x00000, 0x40000, CRC(f1e94926) SHA1(f4d6f5b5811d90d0069f6efbb44d725ff0d07e1c) ) ROM_END +} // anonymous namespace + + GAME( 2000, popobear, 0, popobear, popobear, popobear_state, empty_init, ROT0, "BMC", "PoPo Bear", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/booth/apexc_m.h b/src/mame/booth/apexc_m.h index 24e3e3215c9..b39b94b2d8c 100644 --- a/src/mame/booth/apexc_m.h +++ b/src/mame/booth/apexc_m.h @@ -8,8 +8,8 @@ see cpu/apexc.cpp for background and tech info */ -#ifndef MAME_MACHINE_APEXC -#define MAME_MACHINE_APEXC +#ifndef MAME_BOOTH_APEXC +#define MAME_BOOTH_APEXC #pragma once @@ -138,4 +138,4 @@ DECLARE_DEVICE_TYPE(APEXC_CYLINDER, apexc_cylinder_image_device) DECLARE_DEVICE_TYPE(APEXC_TAPE_PUNCHER, apexc_tape_puncher_image_device) DECLARE_DEVICE_TYPE(APEXC_TAPE_READER, apexc_tape_reader_image_device) -#endif // MAME_MACHINE_APEXC +#endif // MAME_BOOTH_APEXC diff --git a/src/mame/camputers/camplynx.cpp b/src/mame/camputers/camplynx.cpp index f179beb7354..53c7c1dd278 100644 --- a/src/mame/camputers/camplynx.cpp +++ b/src/mame/camputers/camplynx.cpp @@ -176,6 +176,8 @@ #include "speaker.h" +namespace { + class camplynx_state : public driver_device { public: @@ -1023,6 +1025,8 @@ ROM_START( lynx128k ) ROM_LOAD( "dosrom.rom", 0xe000, 0x2000, CRC(011e106a) SHA1(e77f0ca99790551a7122945f3194516b2390fb69) ) ROM_END +} // anonymous namespace + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/cantab/jupace.cpp b/src/mame/cantab/jupace.cpp index b8d3e12e51a..6896b7d47cd 100644 --- a/src/mame/cantab/jupace.cpp +++ b/src/mame/cantab/jupace.cpp @@ -63,6 +63,8 @@ Ports: #include "formats/ace_tap.h" +namespace { + #define Z80_TAG "z0" #define AY8910_TAG "ay8910" #define I8255_TAG "i8255" @@ -839,6 +841,7 @@ ROM_START( jupace ) ROM_LOAD( "sp0256-al2.ic1", 0x000, 0x800, CRC(b504ac15) SHA1(e60fcb5fa16ff3f3b69d36c7a6e955744d3feafc) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/capcom/alien.cpp b/src/mame/capcom/alien.cpp index de96368549f..da1ba890e23 100644 --- a/src/mame/capcom/alien.cpp +++ b/src/mame/capcom/alien.cpp @@ -75,6 +75,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + #define MASTER_CLOCK XTAL(200'000'000) class alien_state : public driver_device @@ -348,6 +351,9 @@ ROM_START( wontame ) DISK_IMAGE( "wontame", 0, SHA1(eb4fe73d5f723b3af08d96c6d3061c9bbc7b2488) ) ROM_END +} // anonymous namespace + + // Custom GAME( 2005, alien, 0, alien, alien, alien_state, empty_init, ROT0, "Capcom", "Alien: The Arcade Medal Edition", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) GAME( 2007, dkbanana, 0, alien, alien, alien_state, empty_init, ROT0, "Capcom", "Donkey Kong Banana Kingdom (host)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) diff --git a/src/mame/capcom/bionicc.cpp b/src/mame/capcom/bionicc.cpp index fb2af5b2ee7..8f30ecd088c 100644 --- a/src/mame/capcom/bionicc.cpp +++ b/src/mame/capcom/bionicc.cpp @@ -94,6 +94,8 @@ #include "tilemap.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -985,6 +987,8 @@ ROM_START( bioniccbl2 ) // only the 4 maincpu ROMs differ, they came from an ori ROM_LOAD( "63s141.18f", 0x0000, 0x0100, CRC(b58d0023) SHA1(e8a4a2e2951bf73b3d9eed6957e9ee1e61c9c58a) ) /* priority (not used), Labeled "TSB" */ ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/capcom/cps1bl_5205.cpp b/src/mame/capcom/cps1bl_5205.cpp index 507f11002c7..661394a0f3d 100644 --- a/src/mame/capcom/cps1bl_5205.cpp +++ b/src/mame/capcom/cps1bl_5205.cpp @@ -39,6 +39,8 @@ knightsb3: OK. #include "speaker.h" +namespace { + #define CPS1_ROWSCROLL_OFFS (0x20/2) /* base of row scroll offsets in other RAM */ #define CODE_SIZE 0x400000 @@ -1363,6 +1365,9 @@ ROM_START( sf2mdtb ) ROM_RELOAD( 0x10000, 0x20000 ) ROM_END +} // anonymous namespace + + // ************************************************************************* DRIVER MACROS GAME( 1991, captcommb2, captcomm, captcommb2, captcommb2, captcommb2_state, init_captcommb2, ROT0, "bootleg", "Captain Commando (bootleg with 2xMSM5205)", MACHINE_SUPPORTS_SAVE ) // 911014 ETC diff --git a/src/mame/capcom/cps1bl_pic.cpp b/src/mame/capcom/cps1bl_pic.cpp index d6ece77ad21..8a6d17f9012 100644 --- a/src/mame/capcom/cps1bl_pic.cpp +++ b/src/mame/capcom/cps1bl_pic.cpp @@ -52,6 +52,8 @@ brightness circuity present on pcb? #include "speaker.h" +namespace { + #define CPS1_ROWSCROLL_OFFS (0x20/2) /* base of row scroll offsets in other RAM */ #define CODE_SIZE 0x400000 @@ -1725,6 +1727,8 @@ ROM_START( wofpic ) ROM_LOAD( "ma12073.4mm", 0x00000, 0x80000, CRC(ac421276) SHA1(56786c23b0d96e1a2540e7269aa20fd390f98b5b) ) ROM_END +} // anonymous namespace + // ************************************************************************* DRIVER MACROS diff --git a/src/mame/capcom/cps2comm.h b/src/mame/capcom/cps2comm.h index 97f4e017f4e..f2adf378704 100644 --- a/src/mame/capcom/cps2comm.h +++ b/src/mame/capcom/cps2comm.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -#ifndef MAME_MACHINE_CPS2COMM_H -#define MAME_MACHINE_CPS2COMM_H +#ifndef MAME_CAPCOM_CPS2COMM_H +#define MAME_CAPCOM_CPS2COMM_H #pragma once @@ -55,4 +55,4 @@ protected: DECLARE_DEVICE_TYPE(CAPCOM_CPS2_COMM, cps2_comm_device) -#endif // MAME_MACHINE_CPS2COMM_H +#endif // MAME_CAPCOM_CPS2COMM_H diff --git a/src/mame/capcom/cps2crypt.h b/src/mame/capcom/cps2crypt.h index d6a28fd4857..b2595f85284 100644 --- a/src/mame/capcom/cps2crypt.h +++ b/src/mame/capcom/cps2crypt.h @@ -5,11 +5,11 @@ CPS-2 Encryption ******************************************************************************/ -#ifndef MAME_MACHINE_CPS2CRYPT_H -#define MAME_MACHINE_CPS2CRYPT_H +#ifndef MAME_CAPCOM_CPS2CRYPT_H +#define MAME_CAPCOM_CPS2CRYPT_H #pragma once void cps2_decrypt(running_machine &machine, uint16_t *rom, uint16_t *dec, int length, const uint32_t *master_key, uint32_t lower_limit, uint32_t upper_limit); -#endif // MAME_MACHINE_CPS2CRYPT_H +#endif // MAME_CAPCOM_CPS2CRYPT_H diff --git a/src/mame/capcom/cps3_a.h b/src/mame/capcom/cps3_a.h index 101fa8903ce..be6f451374d 100644 --- a/src/mame/capcom/cps3_a.h +++ b/src/mame/capcom/cps3_a.h @@ -5,8 +5,8 @@ Capcom CPS-3 Sound Hardware ****************************************************************************/ -#ifndef MAME_AUDIO_CPS3_H -#define MAME_AUDIO_CPS3_H +#ifndef MAME_CAPCOM_CPS3_H +#define MAME_CAPCOM_CPS3_H #pragma once @@ -57,4 +57,4 @@ private: DECLARE_DEVICE_TYPE(CPS3, cps3_sound_device) -#endif // MAME_AUDIO_CPS3_H +#endif // MAME_CAPCOM_CPS3_H diff --git a/src/mame/capcom/egghunt.cpp b/src/mame/capcom/egghunt.cpp index e2012e26fb1..3388d7da4c3 100644 --- a/src/mame/capcom/egghunt.cpp +++ b/src/mame/capcom/egghunt.cpp @@ -52,6 +52,9 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f #include "speaker.h" #include "tilemap.h" + +namespace { + class egghunt_state : public driver_device { public: @@ -462,6 +465,9 @@ void egghunt_state::egghunt(machine_config &config) OKIM6295(config, m_oki, 1056000, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); // clock frequency & pin 7 not verified } +} // anonymous namespace + + ROM_START( egghunt ) ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD( "prg.bin", 0x00000, 0x20000, CRC(eb647145) SHA1(792951b76b5fac01e72ae34a2fe2108e373c5b62) ) diff --git a/src/mame/capcom/instantm.cpp b/src/mame/capcom/instantm.cpp index 0089da7b754..ec47f290434 100644 --- a/src/mame/capcom/instantm.cpp +++ b/src/mame/capcom/instantm.cpp @@ -30,6 +30,9 @@ At the moment it simply outputs all the speech strings, one after the other, the #include "sound/dac.h" #include "speaker.h" + +namespace { + class instantm_state : public driver_device { public: @@ -153,5 +156,7 @@ ROM_START( instantm ) ROM_LOAD( "speechus10.u20", 0x00000, 0x10000, CRC(1797bcee) SHA1(c6fb7fbe8592dfae3ba44b49b5ce447206515b77) ) ROM_END +} // anonymous namespace + GAME( 199?, instantm, 0, instantm, instantm, instantm_state, empty_init, ROT0, "Capcom / Polaroid", "Polaroid Instant Memories", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/capcom/kenseim.cpp b/src/mame/capcom/kenseim.cpp index 546e3cf9857..f5eff4878a5 100644 --- a/src/mame/capcom/kenseim.cpp +++ b/src/mame/capcom/kenseim.cpp @@ -146,6 +146,9 @@ GND | 20 #include "cps1.h" #include "kenseim.lh" + +namespace { + class kenseim_state : public cps_state { public: @@ -707,6 +710,8 @@ void kenseim_state::init_kenseim() m_moleb.resolve(); } +} // anonymous namespace + // 1994.04.18 is from extra PCB rom, Siguma or Sigma? (Siguma is in the ROM) // the CPS1 board roms contain "M O G U R A 9 2 0 9 2 4" strings suggesting that part of the code was developed earlier diff --git a/src/mame/capcom/sf.cpp b/src/mame/capcom/sf.cpp index b25bfeb0c40..d89247815cc 100644 --- a/src/mame/capcom/sf.cpp +++ b/src/mame/capcom/sf.cpp @@ -22,6 +22,8 @@ #include "tilemap.h" +namespace { + class sf_state : public driver_device { public: @@ -1413,6 +1415,7 @@ ROM_START( sfp ) ROM_LOAD( "mmi-7603.13h", 0x0300, 0x0020, CRC(06bcda53) SHA1(fa69b77697bb12aa6012d82ef5b504d3a1d20232) ) /* unknown */ ROM_END +} // anonymous namespace GAME( 1987, sf, 0, sfus, sfus, sf_state, empty_init, ROT0, "Capcom", "Street Fighter (US, set 1)", MACHINE_SUPPORTS_SAVE ) // Shows Capcom copyright diff --git a/src/mame/capcom/tigeroad_spr.h b/src/mame/capcom/tigeroad_spr.h index b41e049e34d..32455692c98 100644 --- a/src/mame/capcom/tigeroad_spr.h +++ b/src/mame/capcom/tigeroad_spr.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_TIGEROAD_SPR_H -#define MAME_VIDEO_TIGEROAD_SPR_H +#ifndef MAME_CAPCOM_TIGEROAD_SPR_H +#define MAME_CAPCOM_TIGEROAD_SPR_H #pragma once @@ -28,4 +28,4 @@ private: DECLARE_DEVICE_TYPE(TIGEROAD_SPRITE, tigeroad_spr_device) -#endif // MAME_VIDEO_TIGEROAD_SPR_H +#endif // MAME_CAPCOM_TIGEROAD_SPR_H diff --git a/src/mame/capcom/tvcapcom.cpp b/src/mame/capcom/tvcapcom.cpp index 8e010cd477e..7f2a8b8b961 100644 --- a/src/mame/capcom/tvcapcom.cpp +++ b/src/mame/capcom/tvcapcom.cpp @@ -15,6 +15,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class tvcapcom_state : public driver_device { public: @@ -88,4 +91,7 @@ ROM_START( tvcapcom ) ROM_END +} // anonymous namespace + + GAME( 2008, tvcapcom, 0, tvcapcom, tvcapcom, tvcapcom_state, empty_init, ROT0, "Capcom", "Tatsunoko Vs Capcom : Cross Generation of Heroes", MACHINE_IS_SKELETON ) diff --git a/src/mame/casio/casio_rompack.cpp b/src/mame/casio/casio_rompack.cpp index 87693fc56a9..6757d846570 100644 --- a/src/mame/casio/casio_rompack.cpp +++ b/src/mame/casio/casio_rompack.cpp @@ -18,6 +18,8 @@ #include "softlist_dev.h" +namespace { + class casiorom_state : public driver_device { public: @@ -57,5 +59,7 @@ void casiorom_state::casiorom(machine_config &config) ROM_START( casiorom ) ROM_END +} // anonymous namespace + CONS( 198?, casiorom, 0, 0, casiorom, casiorom, casiorom_state, empty_init, "Casio", "Casio ROM Pack Software List holder", MACHINE_IS_SKELETON ) diff --git a/src/mame/casio/casloopy.cpp b/src/mame/casio/casloopy.cpp index dc082852876..0cd13ab76ef 100644 --- a/src/mame/casio/casloopy.cpp +++ b/src/mame/casio/casloopy.cpp @@ -157,6 +157,9 @@ PCB 'Z545-1 A240570-1' #include "softlist_dev.h" #include "speaker.h" + +namespace { + class casloopy_state : public driver_device { public: @@ -201,8 +204,8 @@ private: void pal_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t vram_r(offs_t offset); void vram_w(offs_t offset, uint8_t data); - uint16_t sh7021_r(offs_t offset); - void sh7021_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + [[maybe_unused]] uint16_t sh7021_r(offs_t offset); + [[maybe_unused]] void sh7021_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); uint8_t bitmap_r(offs_t offset); void bitmap_w(offs_t offset, uint8_t data); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load); @@ -566,4 +569,7 @@ void casloopy_state::init_casloopy() m_bios_rom[i] = 0x000b0009; // RTS + NOP } +} // anonymous namespace + + CONS( 1995, casloopy, 0, 0, casloopy, casloopy, casloopy_state, init_casloopy, "Casio", "Loopy", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_NODEVICE_PRINTER ) diff --git a/src/mame/casio/cfx9850.cpp b/src/mame/casio/cfx9850.cpp index cfd718e9aa1..1eba48b0037 100644 --- a/src/mame/casio/cfx9850.cpp +++ b/src/mame/casio/cfx9850.cpp @@ -30,6 +30,9 @@ Debugging information: #include "emupal.h" #include "screen.h" + +namespace { + class cfx9850_state : public driver_device { public: @@ -318,5 +321,7 @@ ROM_START(cfx9850) ROMX_LOAD("cfx9850b.bin", 0x00000, 0x80000, CRC(cd3c497f) SHA1(1d1aa38205eec7aba3ed6bef7389767e38afe075), ROM_BIOS(1)) ROM_END +} // anonymous namespace + COMP(1996, cfx9850, 0, 0, cfx9850, cfx9850, cfx9850_state, empty_init, "Casio", "CFX-9850G", MACHINE_NO_SOUND | MACHINE_NOT_WORKING) diff --git a/src/mame/casio/fp1100.cpp b/src/mame/casio/fp1100.cpp index 562f212bdea..21486724446 100644 --- a/src/mame/casio/fp1100.cpp +++ b/src/mame/casio/fp1100.cpp @@ -50,6 +50,9 @@ #define VERBOSE 0 #include "logmacro.h" + +namespace { + #define MAIN_CLOCK 15.9744_MHz_XTAL class fp1100_state : public driver_device @@ -710,6 +713,9 @@ ROM_START( fp1100 ) ROM_LOAD( "sub3.rom", 0x2000, 0xf80, BAD_DUMP CRC(fb2b577a) SHA1(a9ae6b03e06ea2f5db30dfd51ebf5aede01d9672)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/casio/fp200.cpp b/src/mame/casio/fp200.cpp index 943f657833f..2e693dca4d3 100644 --- a/src/mame/casio/fp200.cpp +++ b/src/mame/casio/fp200.cpp @@ -26,6 +26,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + static constexpr XTAL MAIN_CLOCK = 6.144_MHz_XTAL; class fp200_state : public driver_device @@ -623,4 +626,7 @@ ROM_START( fp200 ) ROM_REGION( 0x800, "chargen", ROMREGION_ERASE00 ) ROM_END +} // anonymous namespace + + COMP( 1982, fp200, 0, 0, fp200, fp200, fp200_state, empty_init, "Casio", "FP-200 (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW ) diff --git a/src/mame/casio/fp6000.cpp b/src/mame/casio/fp6000.cpp index 7b3b6558f58..37577e19f39 100644 --- a/src/mame/casio/fp6000.cpp +++ b/src/mame/casio/fp6000.cpp @@ -29,6 +29,8 @@ #include "speaker.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -520,6 +522,8 @@ ROM_START( fp6000 ) ROM_LOAD("mcu", 0x0000, 0x1000, NO_DUMP) // unknown MCU type ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/casio/fp6000_kbd.h b/src/mame/casio/fp6000_kbd.h index 1570eea16c6..1cdd4051052 100644 --- a/src/mame/casio/fp6000_kbd.h +++ b/src/mame/casio/fp6000_kbd.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_FP6000_KBD_H -#define MAME_MACHINE_FP6000_KBD_H +#ifndef MAME_CASIO_FP6000_KBD_H +#define MAME_CASIO_FP6000_KBD_H #pragma once @@ -62,4 +62,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(FP6000_KBD, fp6000_kbd_device) -#endif // MAME_MACHINE_FP6000_KBD_H +#endif // MAME_CASIO_FP6000_KBD_H diff --git a/src/mame/casio/ht6000.cpp b/src/mame/casio/ht6000.cpp index 2012b76b8ac..f2ecf65fb7e 100644 --- a/src/mame/casio/ht6000.cpp +++ b/src/mame/casio/ht6000.cpp @@ -15,6 +15,8 @@ #include "cpu/mcs48/mcs48.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -337,6 +339,8 @@ ROM_START( ht6000 ) ROM_LOAD("187_8734h7.bin", 0x000, 0x800, CRC(47b47af7) SHA1(8f0515f95dcc6e224a8a59e0c2cd7ddb4796e34e)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/casio/pb1000.cpp b/src/mame/casio/pb1000.cpp index 9a4f9218ce6..75771e5a48b 100644 --- a/src/mame/casio/pb1000.cpp +++ b/src/mame/casio/pb1000.cpp @@ -39,6 +39,8 @@ #include "utf8.h" +namespace { + class pb1000_state : public driver_device { public: @@ -553,6 +555,9 @@ ROM_START( ai1000 ) ROM_LOAD( "charset.bin", 0x0000, 0x0800, CRC(7f144716) SHA1(a02f1ecc6dc0ac55b94f00931d8f5cb6b9ffb7b4)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/casio/pv2000.cpp b/src/mame/casio/pv2000.cpp index f9f94ea78c8..9ac899e3451 100644 --- a/src/mame/casio/pv2000.cpp +++ b/src/mame/casio/pv2000.cpp @@ -40,6 +40,9 @@ For BIOS CRC confirmation #include "softlist_dev.h" #include "speaker.h" + +namespace { + class pv2000_state : public driver_device { public: @@ -422,6 +425,8 @@ ROM_START (pv2000) ROM_LOAD( "hn613128pc64.bin", 0x0000, 0x4000, CRC(8f31f297) SHA1(94b5f54dd7bce321e377fdaaf592acd3870cf621) ) ROM_END +} // anonymous namespace + /* System Drivers */ diff --git a/src/mame/ces/cesclass.cpp b/src/mame/ces/cesclass.cpp index 1ebb1c639f9..ec95c479ad8 100644 --- a/src/mame/ces/cesclass.cpp +++ b/src/mame/ces/cesclass.cpp @@ -30,6 +30,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class cesclassic_state : public driver_device { public: @@ -294,6 +297,8 @@ ROM_START(tsclass) ROM_LOAD( "tsclassic-v100-u28.bin", 0x00000, 0x80000, CRC(5bf53ca3) SHA1(5767391175fa9488ba0fb17a16de6d5013712a01) ) ROM_END +} // anonymous namespace + GAME(1997, hrclass, 0, cesclassic, cesclassic, cesclassic_state, empty_init, ROT0, "Creative Electronics And Software", "Home Run Classic (v1.21 12-feb-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) GAME(1997, ccclass, 0, cesclassic, cesclassic, cesclassic_state, empty_init, ROT0, "Creative Electronics And Software", "Country Club Classic (v1.10 03-apr-1997)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/ces/galgames.cpp b/src/mame/ces/galgames.cpp index 7c4087a3b0d..8d11d94ead5 100644 --- a/src/mame/ces/galgames.cpp +++ b/src/mame/ces/galgames.cpp @@ -719,6 +719,9 @@ WRITE_LINE_MEMBER(galgames_slot_device::eeprom_cs_write) m_carts[m_cart]->eeprom_cs_write(state); } + +namespace { + /*************************************************************************** General @@ -1231,6 +1234,8 @@ ROM_START(galgame4) GALGAMES_MB_PALS ROM_END +} // anonymous namespace + GAME(1998, galgbios, 0, galgbios, galgames, galgames_state, empty_init, ROT0, "Creative Electronics & Software", "Galaxy Games BIOS", MACHINE_IS_BIOS_ROOT) GAME(1998, galgame2, galgbios, galgame2, galgames, galgames_state, empty_init, ROT0, "Creative Electronics & Software / Namco", "Galaxy Games StarPak 2", 0) diff --git a/src/mame/cinematronics/cinemat_a.h b/src/mame/cinematronics/cinemat_a.h index dd7791668f9..507a8affb71 100644 --- a/src/mame/cinematronics/cinemat_a.h +++ b/src/mame/cinematronics/cinemat_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_CINEMAT_H -#define MAME_AUDIO_CINEMAT_H +#ifndef MAME_CINEMATRONICS_CINEMAT_H +#define MAME_CINEMATRONICS_CINEMAT_H #pragma once @@ -139,4 +139,4 @@ DECLARE_DEVICE_TYPE(BOXING_BUGS_AUDIO, boxingb_audio_device) DECLARE_DEVICE_TYPE(STAR_CASTLE_AUDIO, starcas_audio_device) DECLARE_DEVICE_TYPE(WAR_OF_THE_WORLDS_AUDIO, wotw_audio_device) -#endif // MAME_AUDIO_CINEMAT_H +#endif // MAME_CINEMATRONICS_CINEMAT_H diff --git a/src/mame/cinematronics/dlair.cpp b/src/mame/cinematronics/dlair.cpp index 7f2490d1a20..6de5be53143 100644 --- a/src/mame/cinematronics/dlair.cpp +++ b/src/mame/cinematronics/dlair.cpp @@ -51,6 +51,8 @@ #include "dlair.lh" +namespace { + class dlair_state : public driver_device { public: @@ -1026,6 +1028,7 @@ void dlair_state::init_variable() // m_laserdisc_type = LASERDISC_TYPE_VARIABLE; } +} // anonymous namespace /************************************* diff --git a/src/mame/cinematronics/dlair2.cpp b/src/mame/cinematronics/dlair2.cpp index 0a06a7eff18..c1a38078ab6 100644 --- a/src/mame/cinematronics/dlair2.cpp +++ b/src/mame/cinematronics/dlair2.cpp @@ -36,6 +36,9 @@ http://www.dragons-lair-project.com/tech/pages/dl2.asp #include "screen.h" #include "speaker.h" + +namespace { + #define MAIN_CLOCK XTAL(30'000'000) class dlair2_state : public driver_device @@ -338,6 +341,8 @@ ROM_START( spacea91_13e ) DISK_IMAGE_READONLY( "spaceace91", 0, NO_DUMP ) ROM_END +} // anonymous namespace + GAME( 1991, dlair2, 0, dlair2, dlair2, dlair2_state, empty_init, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (US v3.19)", MACHINE_IS_SKELETON ) GAME( 1991, dlair2_319e, dlair2, dlair2, dlair2, dlair2_state, empty_init, ROT0, "Leland Corporation", "Dragon's Lair 2: Time Warp (Euro v3.19)", MACHINE_IS_SKELETON ) diff --git a/src/mame/cinematronics/leland_a.h b/src/mame/cinematronics/leland_a.h index f2e33db8609..5e86e2f9db5 100644 --- a/src/mame/cinematronics/leland_a.h +++ b/src/mame/cinematronics/leland_a.h @@ -5,8 +5,8 @@ Cinemat/Leland driver *************************************************************************/ -#ifndef MAME_AUDIO_LELAND_H -#define MAME_AUDIO_LELAND_H +#ifndef MAME_CINEMATRONICS_LELAND_H +#define MAME_CINEMATRONICS_LELAND_H #pragma once @@ -129,4 +129,4 @@ DECLARE_DEVICE_TYPE(REDLINE_80186, redline_80186_sound_device) DECLARE_DEVICE_TYPE(ATAXX_80186, ataxx_80186_sound_device) DECLARE_DEVICE_TYPE(WSF_80186, wsf_80186_sound_device) -#endif // MAME_AUDIO_LELAND_H +#endif // MAME_CINEMATRONICS_LELAND_H diff --git a/src/mame/cinematronics/nl_armora.h b/src/mame/cinematronics/nl_armora.h index fb6a359bad1..bbb7501dc86 100644 --- a/src/mame/cinematronics/nl_armora.h +++ b/src/mame/cinematronics/nl_armora.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_ARMORA_H -#define MAME_AUDIO_NL_ARMORA_H +#ifndef MAME_CINEMATRONICS_NL_ARMORA_H +#define MAME_CINEMATRONICS_NL_ARMORA_H #pragma once NETLIST_EXTERNAL(armora) -#endif // MAME_AUDIO_NL_ARMORA_H +#endif // MAME_CINEMATRONICS_NL_ARMORA_H diff --git a/src/mame/cinematronics/nl_barrier.h b/src/mame/cinematronics/nl_barrier.h index 37a9d0f75e9..1d20e6ca285 100644 --- a/src/mame/cinematronics/nl_barrier.h +++ b/src/mame/cinematronics/nl_barrier.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_BARRIER_H -#define MAME_AUDIO_NL_BARRIER_H +#ifndef MAME_CINEMATRONICS_NL_BARRIER_H +#define MAME_CINEMATRONICS_NL_BARRIER_H #pragma once NETLIST_EXTERNAL(barrier) -#endif // MAME_AUDIO_NL_BARRIER_H +#endif // MAME_CINEMATRONICS_NL_BARRIER_H diff --git a/src/mame/cinematronics/nl_boxingb.h b/src/mame/cinematronics/nl_boxingb.h index 2d0f140a27d..237fcf6b6e0 100644 --- a/src/mame/cinematronics/nl_boxingb.h +++ b/src/mame/cinematronics/nl_boxingb.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_BOXINGB_H -#define MAME_AUDIO_NL_BOXINGB_H +#ifndef MAME_CINEMATRONICS_NL_BOXINGB_H +#define MAME_CINEMATRONICS_NL_BOXINGB_H #pragma once NETLIST_EXTERNAL(boxingb) -#endif // MAME_AUDIO_NL_BOXINGB_H +#endif // MAME_CINEMATRONICS_NL_BOXINGB_H diff --git a/src/mame/cinematronics/nl_cinemat_common.h b/src/mame/cinematronics/nl_cinemat_common.h index fed10b49377..c269289ba5f 100644 --- a/src/mame/cinematronics/nl_cinemat_common.h +++ b/src/mame/cinematronics/nl_cinemat_common.h @@ -1,7 +1,7 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles,Couriersud -#ifndef MAME_AUDIO_NL_CINEMAT_COMMON_H -#define MAME_AUDIO_NL_CINEMAT_COMMON_H +#ifndef MAME_CINEMATRONICS_NL_CINEMAT_COMMON_H +#define MAME_CINEMATRONICS_NL_CINEMAT_COMMON_H // @@ -380,4 +380,4 @@ static NETLIST_START(_CA3080_SLOW_DIP) LOCAL_SOURCE(_CA3080_SLOW_DIP) \ -#endif // MAME_AUDIO_NL_CINEMAT_COMMON_H +#endif // MAME_CINEMATRONICS_NL_CINEMAT_COMMON_H diff --git a/src/mame/cinematronics/nl_ripoff.h b/src/mame/cinematronics/nl_ripoff.h index fafd8f9f2f5..7ed38f68a50 100644 --- a/src/mame/cinematronics/nl_ripoff.h +++ b/src/mame/cinematronics/nl_ripoff.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_RIPOFF_H -#define MAME_AUDIO_NL_RIPOFF_H +#ifndef MAME_CINEMATRONICS_NL_RIPOFF_H +#define MAME_CINEMATRONICS_NL_RIPOFF_H #pragma once NETLIST_EXTERNAL(ripoff) -#endif // MAME_AUDIO_NL_RIPOFF_H +#endif // MAME_CINEMATRONICS_NL_RIPOFF_H diff --git a/src/mame/cinematronics/nl_solarq.h b/src/mame/cinematronics/nl_solarq.h index 08943e20a78..67af8ec6e56 100644 --- a/src/mame/cinematronics/nl_solarq.h +++ b/src/mame/cinematronics/nl_solarq.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_SOLARQ_H -#define MAME_AUDIO_NL_SOLARQ_H +#ifndef MAME_CINEMATRONICS_NL_SOLARQ_H +#define MAME_CINEMATRONICS_NL_SOLARQ_H #pragma once NETLIST_EXTERNAL(solarq) -#endif // MAME_AUDIO_NL_SOLARQ_H +#endif // MAME_CINEMATRONICS_NL_SOLARQ_H diff --git a/src/mame/cinematronics/nl_spacewar.h b/src/mame/cinematronics/nl_spacewar.h index 250b94142ae..4d9d04ad2e5 100644 --- a/src/mame/cinematronics/nl_spacewar.h +++ b/src/mame/cinematronics/nl_spacewar.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_SPACEWAR_H -#define MAME_AUDIO_NL_SPACEWAR_H +#ifndef MAME_CINEMATRONICS_NL_SPACEWAR_H +#define MAME_CINEMATRONICS_NL_SPACEWAR_H #pragma once NETLIST_EXTERNAL(spacewar) -#endif // MAME_AUDIO_NL_SPACEWAR_H +#endif // MAME_CINEMATRONICS_NL_SPACEWAR_H diff --git a/src/mame/cinematronics/nl_speedfrk.h b/src/mame/cinematronics/nl_speedfrk.h index f0f67f50140..06c10f3ab23 100644 --- a/src/mame/cinematronics/nl_speedfrk.h +++ b/src/mame/cinematronics/nl_speedfrk.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_SPEEDFRK_H -#define MAME_AUDIO_NL_SPEEDFRK_H +#ifndef MAME_CINEMATRONICS_NL_SPEEDFRK_H +#define MAME_CINEMATRONICS_NL_SPEEDFRK_H #pragma once NETLIST_EXTERNAL(speedfrk) -#endif // MAME_AUDIO_NL_SPEEDFRK_H +#endif // MAME_CINEMATRONICS_NL_SPEEDFRK_H diff --git a/src/mame/cinematronics/nl_starcas.h b/src/mame/cinematronics/nl_starcas.h index 93d3cefa514..c4328c74de3 100644 --- a/src/mame/cinematronics/nl_starcas.h +++ b/src/mame/cinematronics/nl_starcas.h @@ -1,11 +1,11 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_STARCAS_H -#define MAME_AUDIO_NL_STARCAS_H +#ifndef MAME_CINEMATRONICS_NL_STARCAS_H +#define MAME_CINEMATRONICS_NL_STARCAS_H #pragma once NETLIST_EXTERNAL(starcas) NETLIST_EXTERNAL(wotw) -#endif // MAME_AUDIO_NL_STARCAS_H +#endif // MAME_CINEMATRONICS_NL_STARCAS_H diff --git a/src/mame/cinematronics/nl_starhawk.h b/src/mame/cinematronics/nl_starhawk.h index 00afc259d99..413d1224776 100644 --- a/src/mame/cinematronics/nl_starhawk.h +++ b/src/mame/cinematronics/nl_starhawk.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_STARHAWK_H -#define MAME_AUDIO_NL_STARHAWK_H +#ifndef MAME_CINEMATRONICS_NL_STARHAWK_H +#define MAME_CINEMATRONICS_NL_STARHAWK_H #pragma once NETLIST_EXTERNAL(starhawk) -#endif // MAME_AUDIO_NL_STARHAWK_H +#endif // MAME_CINEMATRONICS_NL_STARHAWK_H diff --git a/src/mame/cinematronics/nl_sundance.h b/src/mame/cinematronics/nl_sundance.h index cd7ed39cbb9..6512f846d90 100644 --- a/src/mame/cinematronics/nl_sundance.h +++ b/src/mame/cinematronics/nl_sundance.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_SUNDANCE_H -#define MAME_AUDIO_NL_SUNDANCE_H +#ifndef MAME_CINEMATRONICS_NL_SUNDANCE_H +#define MAME_CINEMATRONICS_NL_SUNDANCE_H #pragma once NETLIST_EXTERNAL(sundance) -#endif // MAME_AUDIO_NL_SUNDANCE_H +#endif // MAME_CINEMATRONICS_NL_SUNDANCE_H diff --git a/src/mame/cinematronics/nl_tailg.h b/src/mame/cinematronics/nl_tailg.h index 3c409bdcbc7..d12ae363a71 100644 --- a/src/mame/cinematronics/nl_tailg.h +++ b/src/mame/cinematronics/nl_tailg.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_TAILG_H -#define MAME_AUDIO_NL_TAILG_H +#ifndef MAME_CINEMATRONICS_NL_TAILG_H +#define MAME_CINEMATRONICS_NL_TAILG_H #pragma once NETLIST_EXTERNAL(tailg) -#endif // MAME_AUDIO_NL_TAILG_H +#endif // MAME_CINEMATRONICS_NL_TAILG_H diff --git a/src/mame/cinematronics/nl_warrior.h b/src/mame/cinematronics/nl_warrior.h index 206c838d881..d5a7b8a8388 100644 --- a/src/mame/cinematronics/nl_warrior.h +++ b/src/mame/cinematronics/nl_warrior.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_NL_WARRIOR_H -#define MAME_AUDIO_NL_WARRIOR_H +#ifndef MAME_CINEMATRONICS_NL_WARRIOR_H +#define MAME_CINEMATRONICS_NL_WARRIOR_H #pragma once NETLIST_EXTERNAL(warrior) -#endif // MAME_AUDIO_NL_WARRIOR_H +#endif // MAME_CINEMATRONICS_NL_WARRIOR_H diff --git a/src/mame/citoh/cit101.cpp b/src/mame/citoh/cit101.cpp index 094185b43be..12f480d6ad7 100644 --- a/src/mame/citoh/cit101.cpp +++ b/src/mame/citoh/cit101.cpp @@ -67,6 +67,9 @@ The NVR checksum error reported when the terminal is first used is nonfatal. Def #include "cit101_kbd.h" + +namespace { + class cit101_state : public driver_device { public: @@ -531,5 +534,8 @@ ROM_START(cit101e) ROM_LOAD("4t=it2=06.bin", 0x1a0, 0x020, NO_DUMP) // position labeled (TBP)18S030 ROM_END +} // anonymous namespace + + COMP(1980, cit101, 0, 0, cit101, cit101, cit101_state, empty_init, "C. Itoh Electronics", "CIT-101 Video Terminal", MACHINE_SUPPORTS_SAVE) COMP(1983, cit101e, 0, 0, cit101e, cit101, cit101_state, empty_init, "C. Itoh Electronics", "CIT-101e Video Terminal", MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/citoh/cit101_kbd.h b/src/mame/citoh/cit101_kbd.h index 1f3a842ad21..0f71a70b8f8 100644 --- a/src/mame/citoh/cit101_kbd.h +++ b/src/mame/citoh/cit101_kbd.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_CIT101_KBD_H -#define MAME_MACHINE_CIT101_KBD_H +#ifndef MAME_CITOH_CIT101_KBD_H +#define MAME_CITOH_CIT101_KBD_H #pragma once @@ -87,4 +87,4 @@ protected: DECLARE_DEVICE_TYPE(CIT101_KEYBOARD, cit101_keyboard_device) DECLARE_DEVICE_TYPE(CIT101E_KEYBOARD, cit101e_keyboard_device) -#endif +#endif // MAME_CITOH_CIT101_KBD_H diff --git a/src/mame/citoh/cit101xl.cpp b/src/mame/citoh/cit101xl.cpp index ccb56d6bb82..bd543aaf189 100644 --- a/src/mame/citoh/cit101xl.cpp +++ b/src/mame/citoh/cit101xl.cpp @@ -13,6 +13,9 @@ Skeleton driver for CIE Terminals (C. Itoh) CIT-50+ and CIT-101XL video terminal #include "video/scn2674.h" #include "screen.h" + +namespace { + class cit101xl_state : public driver_device { public: @@ -109,4 +112,7 @@ ROM_START(cit101xl) ROM_LOAD("tmm2464ap_1104_cit50p_v1.2.u3", 0x0000, 0x2000, CRC(e07723f7) SHA1(466d69382cc75ac0abcda08e1a227da73fc77980)) // Toshiba OTP ROM with silkscreened label ROM_END +} // anonymous namespace + + COMP(1987, cit101xl, 0, 0, cit101xl, cit101xl, cit101xl_state, empty_init, "CIE Terminals", "CIT-101XL Video Display Terminal", MACHINE_IS_SKELETON) diff --git a/src/mame/citoh/cit220.cpp b/src/mame/citoh/cit220.cpp index 998f9552443..710134bce4b 100644 --- a/src/mame/citoh/cit220.cpp +++ b/src/mame/citoh/cit220.cpp @@ -25,6 +25,8 @@ and the SCN2674 video timing parameters appear to be identical. #include "screen.h" +namespace { + class cit220_state : public driver_device { public: @@ -254,6 +256,8 @@ ROM_START(vp122) ROM_LOAD("223-48700.uk4", 0x0000, 0x2000, CRC(4dbab4bd) SHA1(18e9a23ba22e2096fa529541fa329f5a56740e62)) ROM_END +} // anonymous namespace + COMP(1984, cit220p, 0, 0, cit220p, cit220p, cit220_state, empty_init, "C. Itoh Electronics", "CIT-220+ Video Terminal", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND) COMP(1985, vp122, 0, 0, vp122, cit220p, cit220_state, empty_init, "ADDS", "Viewpoint 122", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND) diff --git a/src/mame/citoh/cit220_kbd.h b/src/mame/citoh/cit220_kbd.h index f63b07daf47..f8d14b616f9 100644 --- a/src/mame/citoh/cit220_kbd.h +++ b/src/mame/citoh/cit220_kbd.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_MACHINE_CIT220_KBD_H -#define MAME_MACHINE_CIT220_KBD_H +#ifndef MAME_CITOH_CIT220_KBD_H +#define MAME_CITOH_CIT220_KBD_H #pragma once @@ -60,4 +60,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(CIT220P_KEYBOARD, cit220p_keyboard_device) -#endif // MAME_MACHINE_CIT220_KBD_H +#endif // MAME_CITOH_CIT220_KBD_H diff --git a/src/mame/coleco/coleco_m.h b/src/mame/coleco/coleco_m.h index 41b71564383..c860c23e679 100644 --- a/src/mame/coleco/coleco_m.h +++ b/src/mame/coleco/coleco_m.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Mike Balfour, Ben Bruscella, Sean Young -#ifndef MAME_MACHINE_COLECO_H -#define MAME_MACHINE_COLECO_H +#ifndef MAME_COLECO_COLECO_H +#define MAME_COLECO_COLECO_H #pragma once INPUT_PORTS_EXTERN( coleco ); -#endif // MAME_MACHINE_COLECO_H +#endif // MAME_COLECO_COLECO_H diff --git a/src/mame/commodore/c64.cpp b/src/mame/commodore/c64.cpp index 29779e8b897..b9f2c96ac2b 100644 --- a/src/mame/commodore/c64.cpp +++ b/src/mame/commodore/c64.cpp @@ -34,6 +34,9 @@ #include "sound/mos6581.h" #include "video/mos6566.h" + +namespace { + #define MOS6567_TAG "u19" #define MOS6569_TAG "u19" #define MOS6581_TAG "u18" @@ -100,7 +103,7 @@ public: virtual void machine_start() override; virtual void machine_reset() override; - void check_interrupts(); + [[maybe_unused]] void check_interrupts(); int read_pla(offs_t offset, offs_t va, int rw, int aec, int ba); uint8_t read_memory(offs_t offset, offs_t va, int aec, int ba); void write_memory(offs_t offset, uint8_t data, int aec, int ba); @@ -2246,6 +2249,7 @@ ROM_START( clipper ) ROM_LOAD( "thdr5.bin", 0x0000, 0x1000, CRC(b4296e62) SHA1(4b6edadbb810c409ece77d5834568fcc2e0bbd61) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/commodore/c64dtv.cpp b/src/mame/commodore/c64dtv.cpp index ba115565d03..eb22b822ad6 100644 --- a/src/mame/commodore/c64dtv.cpp +++ b/src/mame/commodore/c64dtv.cpp @@ -15,6 +15,8 @@ Crystals: 32.720 (X1), unmarked (X2). #include "screen.h" +namespace { + //************************************************************************** // DRIVER STATE //************************************************************************** @@ -73,6 +75,7 @@ ROM_START( c64dtv ) ROM_LOAD( "flash.u2", 0x000000, 0x200000, CRC(b820375a) SHA1(b9f88919e2bed825eb2b2cb605977d55971b423b) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/commodore/c900.cpp b/src/mame/commodore/c900.cpp index 8a0bda9c801..be9d51f630a 100644 --- a/src/mame/commodore/c900.cpp +++ b/src/mame/commodore/c900.cpp @@ -41,6 +41,8 @@ To Do: #include "speaker.h" +namespace { + class c900_state : public driver_device { public: @@ -167,5 +169,8 @@ ROM_START( c900 ) ROM_LOAD( "380217-01.u2", 0x0000, 0x1000, CRC(64cb4171) SHA1(e60d796170addfd27e2c33090f9c512c7e3f99f5) ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1985, c900, 0, 0, c900, c900, c900_state, empty_init, "Commodore", "Commodore 900", MACHINE_IS_SKELETON | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/commodore/cbm2.cpp b/src/mame/commodore/cbm2.cpp index 52dbc52afdd..0d92bacc087 100644 --- a/src/mame/commodore/cbm2.cpp +++ b/src/mame/commodore/cbm2.cpp @@ -41,6 +41,9 @@ #include "utf8.h" + +namespace { + #define PLA1_TAG "u78" #define PLA2_TAG "u88" #define MOS6567_TAG "u23" @@ -3064,6 +3067,7 @@ ROM_START( cbm720_se ) ROM_LOAD( "906114-05.u75", 0x00, 0xf5, CRC(ff6ba6b6) SHA1(45808c570eb2eda7091c51591b3dbd2db1ac646a) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/commodore/cbm_snqk.h b/src/mame/commodore/cbm_snqk.h index b53bbc5fb1d..70ed094fc58 100644 --- a/src/mame/commodore/cbm_snqk.h +++ b/src/mame/commodore/cbm_snqk.h @@ -6,8 +6,8 @@ ***********************************************/ -#ifndef MAME_MACHINE_CBM_SNQK_H -#define MAME_MACHINE_CBM_SNQK_H +#ifndef MAME_COMMODORE_CBM_SNQK_H +#define MAME_COMMODORE_CBM_SNQK_H #pragma once @@ -23,4 +23,4 @@ image_init_result general_cbm_loadsnap( void cbm_quick_sethiaddress(address_space &space, uint16_t hiaddress); -#endif // MAME_MACHINE_CBM_SNQK_H +#endif // MAME_COMMODORE_CBM_SNQK_H diff --git a/src/mame/commodore/clcd.cpp b/src/mame/commodore/clcd.cpp index 73513efadf5..0eb6f13abbb 100644 --- a/src/mame/commodore/clcd.cpp +++ b/src/mame/commodore/clcd.cpp @@ -29,6 +29,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class clcd_state : public driver_device { public: @@ -804,6 +807,8 @@ ROM_START( clcd ) ROM_IGNORE(0x800) ROM_END +} // anonymous namespace + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1985, clcd, 0, 0, clcd, clcd, clcd_state, empty_init, "Commodore Business Machines", "LCD (Prototype)", 0 ) diff --git a/src/mame/commodore/mps1230.cpp b/src/mame/commodore/mps1230.cpp index 8020dfe26f2..6b365d098ce 100644 --- a/src/mame/commodore/mps1230.cpp +++ b/src/mame/commodore/mps1230.cpp @@ -83,6 +83,9 @@ Notes: (all IC's shown) #include "cpu/upd7810/upd7810.h" #include "cpu/z80/z80.h" + +namespace { + #define CPU_TAG "maincpu" class mps1230_state : public driver_device @@ -172,6 +175,9 @@ ROM_START(mps1230) ROM_LOAD( "peek.f03ee", 0x000000, 0x010000, CRC(b5215f25) SHA1(dcfdd16942652447c472301392d9b39514547af1) ) // ver 2.1E, 09/AUG/1989 ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ SYST( 1986, mps1000, 0, 0, mps1000, mps1230, mps1230_state, empty_init, "Commodore Business Machines", "MPS-1000 Printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW ) SYST( 1988, mps1230, 0, 0, mps1230, mps1230, mps1230_state, empty_init, "Commodore Business Machines", "MPS-1230 NLQ Printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW ) diff --git a/src/mame/commodore/pet.cpp b/src/mame/commodore/pet.cpp index b086fb65566..a3b9e050360 100644 --- a/src/mame/commodore/pet.cpp +++ b/src/mame/commodore/pet.cpp @@ -177,6 +177,9 @@ ROM sockets: UA3 2K or 4K character #include "sound/spkrdev.h" #include "video/mc6845.h" + +namespace { + #define M6502_TAG "f3" #define M6522_TAG "a5" #define M6520_1_TAG "g8" @@ -441,9 +444,9 @@ private: DECLARE_MACHINE_START( cbm8296 ); DECLARE_MACHINE_RESET( cbm8296 ); - void read_pla1(offs_t offset, int phi2, int brw, int noscreen, int noio, int ramsela, int ramsel9, int ramon, int norom, - int &cswff, int &cs9, int &csa, int &csio, int &cse, int &cskb, int &fa12, int &casena1); - void read_pla2(offs_t offset, int phi2, int brw, int casena1, int &endra, int &noscreen, int &casena2, int &fa15); + [[maybe_unused]] void read_pla1(offs_t offset, int phi2, int brw, int noscreen, int noio, int ramsela, int ramsel9, int ramon, int norom, + int &cswff, int &cs9, int &csa, int &csio, int &cse, int &cskb, int &fa12, int &casena1); + [[maybe_unused]] void read_pla2(offs_t offset, int phi2, int brw, int casena1, int &endra, int &noscreen, int &casena2, int &fa15); void read_pla1_eprom(offs_t offset, int phi2, int brw, int noscreen, int noio, int ramsela, int ramsel9, int ramon, int norom, int &cswff, int &cs9, int &csa, int &csio, int &cse, int &cskb, int &fa12, int &casena1); @@ -2598,6 +2601,7 @@ ROM_START( cbm8296dgv_de ) // SER.NO.WG 8947 ROM_LOAD( "324745-01.ue5", 0x00, 0xf5, NO_DUMP ) // 8700-008 ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/commodore/plus4.cpp b/src/mame/commodore/plus4.cpp index 4092e92a361..4e32403ae32 100644 --- a/src/mame/commodore/plus4.cpp +++ b/src/mame/commodore/plus4.cpp @@ -34,6 +34,9 @@ #include "sound/mos7360.h" #include "sound/t6721a.h" + +namespace { + #define MOS7360_TAG "u1" #define MOS6551_TAG "u3" #define MOS6529_USER_TAG "u5" @@ -1227,6 +1230,7 @@ ROM_START( c116 ) ROM_LOAD( "251641-02.u101", 0x00, 0xf5, CRC(83be2076) SHA1(a89b18b2261233443c933c8b4663b108e7630924) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/commodore/vic10.cpp b/src/mame/commodore/vic10.cpp index 6681bc70a6d..7a612bd34f6 100644 --- a/src/mame/commodore/vic10.cpp +++ b/src/mame/commodore/vic10.cpp @@ -23,6 +23,9 @@ #include "sound/mos6581.h" #include "video/mos6566.h" + +namespace { + #define MOS6566_TAG "u2" #define MOS6581_TAG "u6" #define MOS6526_TAG "u9" @@ -711,6 +714,7 @@ ROM_START( vic10 ) ROM_LOAD( "6703.u4", 0x000, 0x100, NO_DUMP ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/commodore/vic20.cpp b/src/mame/commodore/vic20.cpp index 780ba25c053..827e6b9a78c 100644 --- a/src/mame/commodore/vic20.cpp +++ b/src/mame/commodore/vic20.cpp @@ -24,6 +24,9 @@ #include "machine/ram.h" #include "sound/mos6560.h" + +namespace { + #define M6502_TAG "ue10" #define M6522_1_TAG "uab3" #define M6522_2_TAG "uab1" @@ -1023,6 +1026,7 @@ ROM_START( vic20_se ) ROM_LOAD( "nec22101.207", 0x0000, 0x1000, CRC(d808551d) SHA1(f403f0b0ce5922bd61bbd768bdd6f0b38e648c9f) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/compugraphic/pwrview.cpp b/src/mame/compugraphic/pwrview.cpp index a92c6d2c5ca..351137b75ad 100644 --- a/src/mame/compugraphic/pwrview.cpp +++ b/src/mame/compugraphic/pwrview.cpp @@ -18,6 +18,9 @@ #include "video/mc6845.h" #include "bus/rs232/rs232.h" + +namespace { + class pwrview_state : public driver_device { public: @@ -553,4 +556,7 @@ ROM_START(pwrview) ROMX_LOAD("215856-004.bin", 0x0001, 0x4000, CRC(4fd01e0a) SHA1(c4d1d40d4e8e529c03857f4a3c8428ccf6b8ff99), ROM_SKIP(1) | ROM_BIOS(0)) ROM_END +} // anonymous namespace + + COMP(1984, pwrview, 0, 0, pwrview, 0, pwrview_state, empty_init, "Compugraphic", "MCS PowerView 10", MACHINE_NOT_WORKING) diff --git a/src/mame/conitec/prof80mmu.h b/src/mame/conitec/prof80mmu.h index f4bea24d3bb..21e2f326f9a 100644 --- a/src/mame/conitec/prof80mmu.h +++ b/src/mame/conitec/prof80mmu.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_PROF80MMU_H -#define MAME_MACHINE_PROF80MMU_H +#ifndef MAME_CONITEC_PROF80MMU_H +#define MAME_CONITEC_PROF80MMU_H #pragma once @@ -52,4 +52,4 @@ DECLARE_DEVICE_TYPE(PROF80_MMU, prof80_mmu_device) -#endif // MAME_MACHINE_PROF80MMU_H +#endif // MAME_CONITEC_PROF80MMU_H diff --git a/src/mame/cromemco/mcb216.cpp b/src/mame/cromemco/mcb216.cpp index 863a01321f7..85a6510d2b2 100644 --- a/src/mame/cromemco/mcb216.cpp +++ b/src/mame/cromemco/mcb216.cpp @@ -35,6 +35,8 @@ only storage is paper-tape. #include "bus/rs232/rs232.h" +namespace { + class mcb216_state : public driver_device { public: @@ -161,6 +163,9 @@ ROM_START( cb308 ) ROM_LOAD( "74904.ic25", 0x00, 0x20, NO_DUMP ) // TBP18S030 or equivalent ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dai/dai_snd.h b/src/mame/dai/dai_snd.h index 7e7b141b96e..c91630218ce 100644 --- a/src/mame/dai/dai_snd.h +++ b/src/mame/dai/dai_snd.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_AUDIO_DAI_SND_H -#define MAME_AUDIO_DAI_SND_H +#ifndef MAME_DAI_DAI_SND_H +#define MAME_DAI_DAI_SND_H // ======================> dai_sound_device @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(DAI_SOUND, dai_sound_device) -#endif // MAME_AUDIO_DAI_SND_H +#endif // MAME_DAI_DAI_SND_H diff --git a/src/mame/dataeast/backfire.cpp b/src/mame/dataeast/backfire.cpp index 2f835bd36d4..812cbeda521 100644 --- a/src/mame/dataeast/backfire.cpp +++ b/src/mame/dataeast/backfire.cpp @@ -28,6 +28,8 @@ #include "speaker.h" +namespace { + class backfire_state : public driver_device { public: @@ -614,5 +616,8 @@ void backfire_state::init_backfire() m_maincpu->space(AS_PROGRAM).install_read_handler(0x0170018, 0x017001b, read32smo_delegate(*this, FUNC(backfire_state::backfire_speedup_r))); } +} // anonymous namespace + + GAME( 1995, backfire, 0, backfire, backfire, backfire_state, init_backfire, ROT0, "Data East Corporation", "Backfire! (Japan, set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1995, backfirea, backfire, backfire, backfire, backfire_state, init_backfire, ROT0, "Data East Corporation", "Backfire! (Japan, set 2)", MACHINE_SUPPORTS_SAVE ) // defaults to wheel controls, must change to joystick to play diff --git a/src/mame/dataeast/cntsteer.cpp b/src/mame/dataeast/cntsteer.cpp index f0b12b8daef..64fe6766cf0 100644 --- a/src/mame/dataeast/cntsteer.cpp +++ b/src/mame/dataeast/cntsteer.cpp @@ -46,6 +46,8 @@ #include "tilemap.h" +namespace { + class cntsteer_state : public driver_device { public: @@ -1281,6 +1283,8 @@ void cntsteer_state::init_zerotrgt() zerotrgt_rearrange_gfx(0x02000, 0x10000); } +} // anonymous namespace + /***************************************************************************/ diff --git a/src/mame/dataeast/dblewing.cpp b/src/mame/dataeast/dblewing.cpp index 88706ab89f2..4b2d8451bbc 100644 --- a/src/mame/dataeast/dblewing.cpp +++ b/src/mame/dataeast/dblewing.cpp @@ -83,6 +83,9 @@ Notes: #include "screen.h" #include "speaker.h" + +namespace { + class dblewing_state : public driver_device { public: @@ -492,6 +495,8 @@ void dblewing_state::init_dblewing() save_item(NAME(m_soundlatch_pending)); } +} // anonymous namespace + GAME( 1993, dblewing, 0, dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1993, dblewinga, dblewing, dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dataeast/decbac06.h b/src/mame/dataeast/decbac06.h index 8cf9fcc9cae..91ff7bb8ff0 100644 --- a/src/mame/dataeast/decbac06.h +++ b/src/mame/dataeast/decbac06.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood -#ifndef MAME_VIDEO_DECOBAC06_H -#define MAME_VIDEO_DECOBAC06_H +#ifndef MAME_DATAEAST_DECOBAC06_H +#define MAME_DATAEAST_DECOBAC06_H #pragma once @@ -148,4 +148,4 @@ private: DECLARE_DEVICE_TYPE(DECO_BAC06, deco_bac06_device) -#endif // MAME_VIDEO_DECOBAC06_H +#endif // MAME_DATAEAST_DECOBAC06_H diff --git a/src/mame/dataeast/deckarn.h b/src/mame/dataeast/deckarn.h index 6563dd5a8a3..8d755e51144 100644 --- a/src/mame/dataeast/deckarn.h +++ b/src/mame/dataeast/deckarn.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail,David Haywood -#ifndef MAME_VIDEO_DECKARN_H -#define MAME_VIDEO_DECKARN_H +#ifndef MAME_DATAEAST_DECKARN_H +#define MAME_DATAEAST_DECKARN_H #pragma once @@ -29,4 +29,4 @@ private: DECLARE_DEVICE_TYPE(DECO_KARNOVSPRITES, deco_karnovsprites_device) -#endif // MAME_VIDEO_DECKARN_H +#endif // MAME_DATAEAST_DECKARN_H diff --git a/src/mame/dataeast/decmxc06.h b/src/mame/dataeast/decmxc06.h index f0b7071a83a..0005504d90f 100644 --- a/src/mame/dataeast/decmxc06.h +++ b/src/mame/dataeast/decmxc06.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood -#ifndef MAME_VIDEO_DECMXC06_H -#define MAME_VIDEO_DECMXC06_H +#ifndef MAME_DATAEAST_DECMXC06_H +#define MAME_DATAEAST_DECMXC06_H #pragma once @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(DECO_MXC06, deco_mxc06_device) -#endif // MAME_VIDEO_DECMXC06_H +#endif // MAME_DATAEAST_DECMXC06_H diff --git a/src/mame/dataeast/deco104.h b/src/mame/dataeast/deco104.h index f2649f71601..c89191e4ecc 100644 --- a/src/mame/dataeast/deco104.h +++ b/src/mame/dataeast/deco104.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_DECO104_H -#define MAME_MACHINE_DECO104_H +#ifndef MAME_DATAEAST_DECO104_H +#define MAME_DATAEAST_DECO104_H #pragma once @@ -22,4 +22,4 @@ protected: DECLARE_DEVICE_TYPE(DECO104PROT, deco104_device) -#endif // MAME_MACHINE_DECO104_H +#endif // MAME_DATAEAST_DECO104_H diff --git a/src/mame/dataeast/deco146.h b/src/mame/dataeast/deco146.h index 31a4b5a4af5..b696d100c75 100644 --- a/src/mame/dataeast/deco146.h +++ b/src/mame/dataeast/deco146.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Charles MacDonald -#ifndef MAME_MACHINE_DECO146_H -#define MAME_MACHINE_DECO146_H +#ifndef MAME_DATAEAST_DECO146_H +#define MAME_DATAEAST_DECO146_H #pragma once @@ -133,4 +133,4 @@ public: DECLARE_DEVICE_TYPE(DECO146PROT, deco146_device) -#endif // MAME_MACHINE_DECO146_H +#endif // MAME_DATAEAST_DECO146_H diff --git a/src/mame/dataeast/deco156_m.h b/src/mame/dataeast/deco156_m.h index f33670c459a..c84af1781b5 100644 --- a/src/mame/dataeast/deco156_m.h +++ b/src/mame/dataeast/deco156_m.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_MACHINE_DECO156_H -#define MAME_MACHINE_DECO156_H +#ifndef MAME_DATAEAST_DECO156_H +#define MAME_DATAEAST_DECO156_H #pragma once void deco156_decrypt(running_machine &machine); -#endif // MAME_MACHINE_DECO156_H +#endif // MAME_DATAEAST_DECO156_H diff --git a/src/mame/dataeast/deco16ic.h b/src/mame/dataeast/deco16ic.h index af35e1ddebb..0702bfb6117 100644 --- a/src/mame/dataeast/deco16ic.h +++ b/src/mame/dataeast/deco16ic.h @@ -8,8 +8,8 @@ Data East IC 55 / 56 / 74 / 141 **************************************************************************/ -#ifndef MAME_VIDEO_DECO16IC_H -#define MAME_VIDEO_DECO16IC_H +#ifndef MAME_DATAEAST_DECO16IC_H +#define MAME_DATAEAST_DECO16IC_H #pragma once @@ -173,4 +173,4 @@ DECLARE_DEVICE_TYPE(DECO16IC, deco16ic_device) // function definition for a callback #define DECO16IC_BANK_CB_MEMBER(_name) int _name(int bank) -#endif // MAME_VIDEO_DECO16IC_H +#endif // MAME_DATAEAST_DECO16IC_H diff --git a/src/mame/dataeast/deco222.h b/src/mame/dataeast/deco222.h index e7a6d6b8990..0edf7a5891b 100644 --- a/src/mame/dataeast/deco222.h +++ b/src/mame/dataeast/deco222.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_DECO222 -#define MAME_MACHINE_DECO222 +#ifndef MAME_DATAEAST_DECO222 +#define MAME_DATAEAST_DECO222 #pragma once @@ -67,4 +67,4 @@ protected: DECLARE_DEVICE_TYPE(DECO_222, deco_222_device) DECLARE_DEVICE_TYPE(DECO_C10707, deco_c10707_device) -#endif // MAME_MACHINE_DECO222 +#endif // MAME_DATAEAST_DECO222 diff --git a/src/mame/dataeast/deco_ace.h b/src/mame/dataeast/deco_ace.h index e79680aae98..519ba4e8c77 100644 --- a/src/mame/dataeast/deco_ace.h +++ b/src/mame/dataeast/deco_ace.h @@ -9,8 +9,8 @@ Original source (from deco32.cpp) by Bryan McPhail, split by cam900. **************************************************************************/ -#ifndef MAME_VIDEO_DECO_ACE_H -#define MAME_VIDEO_DECO_ACE_H +#ifndef MAME_DATAEAST_DECO_ACE_H +#define MAME_DATAEAST_DECO_ACE_H #pragma once @@ -55,4 +55,4 @@ private: DECLARE_DEVICE_TYPE(DECO_ACE, deco_ace_device) -#endif // MAME_VIDEO_DECO_ACE_H +#endif // MAME_DATAEAST_DECO_ACE_H diff --git a/src/mame/dataeast/deco_irq.h b/src/mame/dataeast/deco_irq.h index 2ad9417cde3..3c25ff8e753 100644 --- a/src/mame/dataeast/deco_irq.h +++ b/src/mame/dataeast/deco_irq.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_DECO_IRQ_H -#define MAME_MACHINE_DECO_IRQ_H +#ifndef MAME_DATAEAST_DECO_IRQ_H +#define MAME_DATAEAST_DECO_IRQ_H #pragma once @@ -89,4 +89,4 @@ private: DECLARE_DEVICE_TYPE(DECO_IRQ, deco_irq_device) -#endif // MAME_MACHINE_DECO_IRQ_H +#endif // MAME_DATAEAST_DECO_IRQ_H diff --git a/src/mame/dataeast/decocass_tape.h b/src/mame/dataeast/decocass_tape.h index 051e6af3784..1f2b20a2950 100644 --- a/src/mame/dataeast/decocass_tape.h +++ b/src/mame/dataeast/decocass_tape.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Juergen Buchmueller, David Haywood -#ifndef MAME_MACHINE_DECOCASS_TAPE_H -#define MAME_MACHINE_DECOCASS_TAPE_H +#ifndef MAME_DATAEAST_DECOCASS_TAPE_H +#define MAME_DATAEAST_DECOCASS_TAPE_H #pragma once @@ -73,4 +73,4 @@ private: DECLARE_DEVICE_TYPE(DECOCASS_TAPE, decocass_tape_device) -#endif // MAME_MACHINE_DECOCASS_TAPE_H +#endif // MAME_DATAEAST_DECOCASS_TAPE_H diff --git a/src/mame/dataeast/decocomn.h b/src/mame/dataeast/decocomn.h index 3e9aad17d20..6976db2648b 100644 --- a/src/mame/dataeast/decocomn.h +++ b/src/mame/dataeast/decocomn.h @@ -5,8 +5,8 @@ decocomn.h **************************************************************************/ -#ifndef MAME_VIDEO_DECOCOMN_H -#define MAME_VIDEO_DECOCOMN_H +#ifndef MAME_DATAEAST_DECOCOMN_H +#define MAME_DATAEAST_DECOCOMN_H #pragma once @@ -49,4 +49,4 @@ private: DECLARE_DEVICE_TYPE(DECOCOMN, decocomn_device) -#endif // MAME_VIDEO_DECOCOMN_H +#endif // MAME_DATAEAST_DECOCOMN_H diff --git a/src/mame/dataeast/decocpu6.h b/src/mame/dataeast/decocpu6.h index 3b46ec1093e..14968198ddf 100644 --- a/src/mame/dataeast/decocpu6.h +++ b/src/mame/dataeast/decocpu6.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_DECOCPU6_H -#define MAME_MACHINE_DECOCPU6_H +#ifndef MAME_DATAEAST_DECOCPU6_H +#define MAME_DATAEAST_DECOCPU6_H #pragma once @@ -33,4 +33,4 @@ protected: DECLARE_DEVICE_TYPE(DECO_CPU6, deco_cpu6_device) -#endif // MAME_MACHINE_DECOCPU6_H +#endif // MAME_DATAEAST_DECOCPU6_H diff --git a/src/mame/dataeast/decocpu7.h b/src/mame/dataeast/decocpu7.h index 824f80834ff..0a5e9f1c9f0 100644 --- a/src/mame/dataeast/decocpu7.h +++ b/src/mame/dataeast/decocpu7.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_DECOCPU7_H -#define MAME_MACHINE_DECOCPU7_H +#ifndef MAME_DATAEAST_DECOCPU7_H +#define MAME_DATAEAST_DECOCPU7_H #pragma once @@ -39,4 +39,4 @@ protected: DECLARE_DEVICE_TYPE(DECO_CPU7, deco_cpu7_device) -#endif // MAME_MACHINE_DECOCPU7_H +#endif // MAME_DATAEAST_DECOCPU7_H diff --git a/src/mame/dataeast/decrmc3.h b/src/mame/dataeast/decrmc3.h index aa5da4e3982..4daa37d989f 100644 --- a/src/mame/dataeast/decrmc3.h +++ b/src/mame/dataeast/decrmc3.h @@ -14,8 +14,8 @@ ******************************************************************************/ -#ifndef MAME_VIDEO_DECORMC3_H -#define MAME_VIDEO_DECORMC3_H +#ifndef MAME_DATAEAST_DECORMC3_H +#define MAME_DATAEAST_DECORMC3_H #pragma once @@ -111,4 +111,4 @@ private: memory_array m_paletteram_ext; // extended memory }; -#endif // MAME_VIDEO_DECORMC3_H +#endif // MAME_DATAEAST_DECORMC3_H diff --git a/src/mame/dataeast/deshoros.cpp b/src/mame/dataeast/deshoros.cpp index 7c6b9c29997..a0df6cad327 100644 --- a/src/mame/dataeast/deshoros.cpp +++ b/src/mame/dataeast/deshoros.cpp @@ -36,6 +36,9 @@ TODO: #include "screen.h" #include "speaker.h" + +namespace { + class destiny_state : public driver_device { public: @@ -318,4 +321,7 @@ ROM_START( destiny ) ROM_LOAD( "ag11.18a", 0x16000, 0x2000, CRC(5f7bf9f9) SHA1(281f89c0bccfcc2bdc1d4d0a5b9cc9a8ab2e7869) ) ROM_END +} // anonymous namespace + + GAME( 1983, destiny, 0, destiny, destiny, destiny_state, empty_init, ROT0, "Data East Corporation", "Destiny - The Fortuneteller (USA)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS|MACHINE_NODEVICE_PRINTER ) diff --git a/src/mame/dataeast/dreambal.cpp b/src/mame/dataeast/dreambal.cpp index edd0f39796a..8ee4cf870e8 100644 --- a/src/mame/dataeast/dreambal.cpp +++ b/src/mame/dataeast/dreambal.cpp @@ -32,6 +32,9 @@ lamps? #include "screen.h" #include "speaker.h" + +namespace { + class dreambal_state : public driver_device { public: @@ -373,5 +376,8 @@ void dreambal_state::init_dreambal() deco56_decrypt_gfx(machine(), "gfx1"); } +} // anonymous namespace + + // Ver 2.4 JPN 93.12.02 GAME( 1993, dreambal, 0, dreambal, dreambal, dreambal_state, init_dreambal, ROT0, "NDK / Data East", "Dream Ball (Japan V2.4)", MACHINE_SUPPORTS_SAVE ) // copyright shows NDK, board is Data East, code seems Data East-like too diff --git a/src/mame/dataeast/madmotor.cpp b/src/mame/dataeast/madmotor.cpp index 847184979b6..152ec7acb37 100644 --- a/src/mame/dataeast/madmotor.cpp +++ b/src/mame/dataeast/madmotor.cpp @@ -31,6 +31,8 @@ #include "speaker.h" +namespace { + class madmotor_state : public driver_device { public: @@ -349,6 +351,8 @@ void madmotor_state::init_madmotor() } } +} // anonymous namespace + /* The title screen is undated, but it's (c) 1989 Data East at 0xefa0 */ GAME( 1989, madmotor, 0, madmotor, madmotor, madmotor_state, init_madmotor, ROT0, "Mitchell", "Mad Motor (prototype)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dataeast/mirage.cpp b/src/mame/dataeast/mirage.cpp index 6822ce3114a..c2a5efb9439 100644 --- a/src/mame/dataeast/mirage.cpp +++ b/src/mame/dataeast/mirage.cpp @@ -50,7 +50,9 @@ MR_01-.3A [a0b758aa] #include "screen.h" #include "speaker.h" -// mirage_state was also defined in mess/drivers/mirage.c + +namespace { + class miragemj_state : public driver_device { public: @@ -365,4 +367,7 @@ void miragemj_state::init_mirage() deco56_decrypt_gfx(machine(), "gfx1"); } +} // anonymous namespace + + GAME( 1994, mirage, 0, mirage, mirage, miragemj_state, init_mirage, ROT0, "Mitchell", "Mirage Youjuu Mahjongden (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dataeast/progolf.cpp b/src/mame/dataeast/progolf.cpp index fbfe985b508..742e595dc12 100644 --- a/src/mame/dataeast/progolf.cpp +++ b/src/mame/dataeast/progolf.cpp @@ -154,6 +154,8 @@ GCM/GBM/GAM - Harris M3 7603-5 Bipolar PROM (compatible with 82S123) #include "speaker.h" +namespace { + class progolf_state : public driver_device { public: @@ -588,6 +590,8 @@ ROM_START( progolfa ) ROM_LOAD( "gam.k11", 0x0040, 0x0020, CRC(b9665de3) SHA1(4c5aba5f6589f4bce4692c0d5bb2811ab8e14aed) ) ROM_END +} // anonymous namespace + // this uses DECO222 style encryption GAME( 1981, progolf, 0, progolf, progolf, progolf_state, empty_init, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dataeast/vaportra.cpp b/src/mame/dataeast/vaportra.cpp index a531204898b..19f6ea78ac1 100644 --- a/src/mame/dataeast/vaportra.cpp +++ b/src/mame/dataeast/vaportra.cpp @@ -34,6 +34,8 @@ #include "speaker.h" +namespace { + class vaportra_state : public driver_device { public: @@ -608,6 +610,9 @@ void vaportra_state::driver_init() /******************************************************************************/ +} // anonymous namespace + + GAME( 1989, vaportra, 0, vaportra, vaportra, vaportra_state, driver_init, ROT270, "Data East Corporation", "Vapor Trail - Hyper Offence Formation (World revision 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, vaportra3, vaportra, vaportra, vaportra, vaportra_state, driver_init, ROT270, "Data East Corporation", "Vapor Trail - Hyper Offence Formation (World revision 3?)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, vaportrau, vaportra, vaportra, vaportra, vaportra_state, driver_init, ROT270, "Data East USA", "Vapor Trail - Hyper Offence Formation (US)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ddr/ac1.cpp b/src/mame/ddr/ac1.cpp index 3caf06bb921..aefa3e4ee27 100644 --- a/src/mame/ddr/ac1.cpp +++ b/src/mame/ddr/ac1.cpp @@ -28,6 +28,9 @@ #include "sound/spkrdev.h" #include "emupal.h" + +namespace { + class ac1_state : public driver_device { public: @@ -426,6 +429,9 @@ ROM_START( ac1scch ) ROM_LOAD("zg_scch.bin", 0x0000, 0x0800, CRC(fbfaf5da) SHA1(667568c5909e9a17675cf09dfbce2fc090c420ab)) ROM_END +} // anonymous namespace + + // Driver // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1984, ac1, 0, 0, ac1, ac1, ac1_state, init_upper, "Frank Heyder", "Amateurcomputer AC1 Berlin", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ddr/bcs3.cpp b/src/mame/ddr/bcs3.cpp index 68b970f21d0..44d79fdf601 100644 --- a/src/mame/ddr/bcs3.cpp +++ b/src/mame/ddr/bcs3.cpp @@ -90,6 +90,8 @@ To Do: #include "speaker.h" +namespace { + class bcs3_state : public driver_device { public: @@ -555,6 +557,9 @@ ROM_START( bcs3d ) ROM_LOAD( "bcs_zg_33.d21", 0x0000, 0x0400, CRC(b27f1c07) SHA1(61c80c585f198370ba5e856839c12b15acdc58ee)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ddr/jtc.cpp b/src/mame/ddr/jtc.cpp index 312b83e0497..88a0d12bfb9 100644 --- a/src/mame/ddr/jtc.cpp +++ b/src/mame/ddr/jtc.cpp @@ -30,6 +30,9 @@ To Do: #include "speaker.h" #include "utf8.h" + +namespace { + #define UB8830D_TAG "ub8830d" #define CENTRONICS_TAG "centronics" @@ -915,6 +918,9 @@ ROM_START( jtces40 ) ROM_LOAD( "es40_0800.bin", 0x0800, 0x1800, CRC(770c87ce) SHA1(1a5227ba15917f2a572cb6c27642c456f5b32b90) ) ROM_END +} // anonymous namespace + + /* System Drivers */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ddr/k7659kb.h b/src/mame/ddr/k7659kb.h index e01ba695418..0e71732d22a 100644 --- a/src/mame/ddr/k7659kb.h +++ b/src/mame/ddr/k7659kb.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_MACHINE_K7659KB_H -#define MAME_MACHINE_K7659KB_H +#ifndef MAME_DDR_K7659KB_H +#define MAME_DDR_K7659KB_H #pragma once @@ -62,4 +62,4 @@ private: DECLARE_DEVICE_TYPE(K7659_KEYBOARD, k7659_keyboard_device) -#endif // MAME_MACHINE_K7659KB_H +#endif // MAME_DDR_K7659KB_H diff --git a/src/mame/ddr/kc_keyb.h b/src/mame/ddr/kc_keyb.h index c05cb8c1e5e..7d7036daacf 100644 --- a/src/mame/ddr/kc_keyb.h +++ b/src/mame/ddr/kc_keyb.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_MACHINE_KC_KEYB_H -#define MAME_MACHINE_KC_KEYB_H +#ifndef MAME_DDR_KC_KEYB_H +#define MAME_DDR_KC_KEYB_H #pragma once @@ -61,4 +61,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(KC_KEYBOARD, kc_keyboard_device) -#endif // MAME_MACHINE_KC_KEYB_H +#endif // MAME_DDR_KC_KEYB_H diff --git a/src/mame/ddr/kramermc.cpp b/src/mame/ddr/kramermc.cpp index 13ef6bb5b2e..195670c4136 100644 --- a/src/mame/ddr/kramermc.cpp +++ b/src/mame/ddr/kramermc.cpp @@ -62,6 +62,9 @@ drops every second character. #include "sound/spkrdev.h" #include "speaker.h" + +namespace { + class kramermc_state : public driver_device { public: @@ -282,6 +285,9 @@ ROM_START( kramermc ) ROM_LOAD ("chargen.kmc", 0x0000, 0x0800, CRC(1ba52f9f) SHA1(71bbad90dd427d0132c871a4d3848ab3d4d84b8a) ) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ddr/mc8020.cpp b/src/mame/ddr/mc8020.cpp index 0637de0b950..d3844320024 100644 --- a/src/mame/ddr/mc8020.cpp +++ b/src/mame/ddr/mc8020.cpp @@ -23,6 +23,9 @@ ToDo: #include "emupal.h" #include "screen.h" + +namespace { + class mc8020_state : public driver_device { public: @@ -373,6 +376,8 @@ ROM_START( mc8020 ) ROM_LOAD( "mo16.rom", 0x5c00, 0x0400, CRC(403be935) SHA1(4e74355a78ab090ce180437156fed8e4a1d1c787)) ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/ddr/mc8030.cpp b/src/mame/ddr/mc8030.cpp index e8f0abcdfe1..d61c67d02d9 100644 --- a/src/mame/ddr/mc8030.cpp +++ b/src/mame/ddr/mc8030.cpp @@ -29,6 +29,8 @@ The asp ctc needs at least 2 triggers. The purpose of the zve pio is unknown. #include "machine/z80sio.h" +namespace { + class mc8030_state : public driver_device { public: @@ -290,6 +292,9 @@ ROM_START( mc8030 ) ROM_LOAD( "spe_2a.rom", 0x2800, 0x000400, CRC(9ec8f287) SHA1(cdf5a9583d898814ba480ffbc8d906a642c6dc81) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ddr/nanos.cpp b/src/mame/ddr/nanos.cpp index 51049295a5c..7cd15310752 100644 --- a/src/mame/ddr/nanos.cpp +++ b/src/mame/ddr/nanos.cpp @@ -28,6 +28,8 @@ Status: #include "screen.h" +namespace { + class nanos_state : public driver_device { public: @@ -538,6 +540,9 @@ ROM_START( nanos ) ROM_LOAD( "zg_nanos.rom", 0x0000, 0x0800, CRC(5682d3f9) SHA1(5b738972c815757821c050ee38b002654f8da163)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ddr/pcm.cpp b/src/mame/ddr/pcm.cpp index 03b3a0d6586..b89a7d1fe01 100644 --- a/src/mame/ddr/pcm.cpp +++ b/src/mame/ddr/pcm.cpp @@ -68,6 +68,8 @@ ToDo: #include "speaker.h" +namespace { + class pcm_state : public driver_device { public: @@ -373,6 +375,9 @@ ROM_START( pcm ) ROM_LOAD( "charrom.d113", 0x0000, 0x0800, CRC(5684b3c3) SHA1(418054aa70a0fd120611e32059eb2051d3b82b5a)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ddr/vcs80.cpp b/src/mame/ddr/vcs80.cpp index ce6d6e0ba6e..eaf441f057d 100644 --- a/src/mame/ddr/vcs80.cpp +++ b/src/mame/ddr/vcs80.cpp @@ -47,6 +47,9 @@ the CPU's WAIT pin. #include "video/pwm.h" #include "vcs80.lh" + +namespace { + class vcs80_state : public driver_device { public: @@ -291,6 +294,9 @@ ROM_START( vcs80 ) ROM_LOAD( "monitor.rom", 0x0000, 0x0200, CRC(44aff4e9) SHA1(3472e5a9357eaba3ed6de65dee2b1c6b29349dd2) ) ROM_END +} // anonymous namespace + + /* System Drivers */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/dc305.h b/src/mame/dec/dc305.h index c2dbd0672d8..9721a66176a 100644 --- a/src/mame/dec/dc305.h +++ b/src/mame/dec/dc305.h @@ -29,8 +29,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_DC305_H -#define MAME_MACHINE_DC305_H +#ifndef MAME_DEC_DC305_H +#define MAME_DEC_DC305_H #pragma once @@ -72,4 +72,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(DC305, dc305_device) -#endif // MAME_MACHINE_DC305_H +#endif // MAME_DEC_DC305_H diff --git a/src/mame/dec/dct11em.cpp b/src/mame/dec/dct11em.cpp index 5fc66f2c4ab..5bff43fd5bd 100644 --- a/src/mame/dec/dct11em.cpp +++ b/src/mame/dec/dct11em.cpp @@ -28,6 +28,8 @@ TODO: #include "dct11em.lh" +namespace { + class dct11em_state : public driver_device { public: @@ -311,6 +313,9 @@ ROM_START( dct11em ) ROM_COPY("maincpu", 0x8000, 0xc000, 0x2000) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/dec_lk201.h b/src/mame/dec/dec_lk201.h index 9ed6d7c5368..9f564bbca38 100644 --- a/src/mame/dec/dec_lk201.h +++ b/src/mame/dec/dec_lk201.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont, M. Burke -#ifndef MAME_MACHINE_DEC_LK201_H -#define MAME_MACHINE_DEC_LK201_H +#ifndef MAME_DEC_DEC_LK201_H +#define MAME_DEC_DEC_LK201_H #pragma once @@ -129,4 +129,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(LK201, lk201_device) -#endif // MAME_MACHINE_DEC_LK201_H +#endif // MAME_DEC_DEC_LK201_H diff --git a/src/mame/dec/decioga.h b/src/mame/dec/decioga.h index 88c70556dfb..90300d4f624 100644 --- a/src/mame/dec/decioga.h +++ b/src/mame/dec/decioga.h @@ -6,8 +6,8 @@ * * */ -#ifndef MAME_MACHINE_DECIOGA_H -#define MAME_MACHINE_DECIOGA_H +#ifndef MAME_DEC_DECIOGA_H +#define MAME_DEC_DECIOGA_H #pragma once @@ -59,4 +59,4 @@ private: DECLARE_DEVICE_TYPE(DECSTATION_IOGA, dec_ioga_device) -#endif // MAME_MACHINE_DECIOGA_H +#endif // MAME_DEC_DECIOGA_H diff --git a/src/mame/dec/decmate2.cpp b/src/mame/dec/decmate2.cpp index 0c401a2766f..fb56ab5cb6b 100644 --- a/src/mame/dec/decmate2.cpp +++ b/src/mame/dec/decmate2.cpp @@ -62,6 +62,9 @@ #include "video/crt9007.h" #include "screen.h" + +namespace { + class decmate2_state : public driver_device { public: @@ -1003,5 +1006,8 @@ ROM_START(decmate3) // TODO: add NO_DUMP entry for PAL (23-097K5) ROM_END +} // anonymous namespace + + COMP(1982, decmate2, 0, 0, pc278, decmate2, decmate2_state, init_pc278, "Digital Equipment Corporation", "DECmate II (PC278)", MACHINE_IS_SKELETON) COMP(1984, decmate3, 0, 0, pc238, decmate2, decmate2_state, init_pc238, "Digital Equipment Corporation", "DECmate III (PC238)", MACHINE_IS_SKELETON) diff --git a/src/mame/dec/dectalk.cpp b/src/mame/dec/dectalk.cpp index 25704baa1da..363af6faeaf 100644 --- a/src/mame/dec/dectalk.cpp +++ b/src/mame/dec/dectalk.cpp @@ -248,6 +248,8 @@ dgc (dg(no!spam)cx@mac.com) #include "speaker.h" +namespace { + class dectalk_state : public driver_device { public: @@ -973,9 +975,11 @@ ROM_START( dectalk ) ROM_FILL(0xfd, 0x01, 0x02) // " ROM_FILL(0xfe, 0x01, 0x05) // " ROM_FILL(0xff, 0x01, 0x0b) // " - ROM_END +} // anonymous namespace + + /****************************************************************************** Drivers ******************************************************************************/ diff --git a/src/mame/dec/decwritr.cpp b/src/mame/dec/decwritr.cpp index e5ada3255d7..be48c86cf0c 100644 --- a/src/mame/dec/decwritr.cpp +++ b/src/mame/dec/decwritr.cpp @@ -23,6 +23,8 @@ #include "speaker.h" +namespace { + #define KBD_VERBOSE 1 #define LED_VERBOSE 0 #define DC305_VERBOSE 0 @@ -491,6 +493,8 @@ ROM_START( la120 ) // there is another romset used on the Bell Teleprinter 1000 (Model LAS12) which I believe is 23-004e4.e6 and 23-086e2.e4 ROM_END +} // anonymous namespace + //************************************************************************** // DRIVERS diff --git a/src/mame/dec/rainbow.cpp b/src/mame/dec/rainbow.cpp index 000821799a4..2662c499539 100644 --- a/src/mame/dec/rainbow.cpp +++ b/src/mame/dec/rainbow.cpp @@ -358,6 +358,9 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND). #include "rainbow.lh" // BEZEL - LAYOUT with LEDs for diag 1-7, keyboard 8-11 and floppy 20-23 + +namespace { + #define RD51_MAX_HEAD 8 #define RD51_MAX_CYLINDER 1024 #define RD51_SECTORS_PER_TRACK 17 @@ -3458,6 +3461,9 @@ ROM_START(rainbow190) ROM_END //---------------------------------------------------------------------------------------- +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/rx01.h b/src/mame/dec/rx01.h index a6c128f71e8..c4a4ff3404e 100644 --- a/src/mame/dec/rx01.h +++ b/src/mame/dec/rx01.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_RX01_H -#define MAME_MACHINE_RX01_H +#ifndef MAME_DEC_RX01_H +#define MAME_DEC_RX01_H #pragma once @@ -81,4 +81,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(RX01, rx01_device) -#endif // MAME_MACHINE_RX01_H +#endif // MAME_DEC_RX01_H diff --git a/src/mame/dec/vax11.cpp b/src/mame/dec/vax11.cpp index 34061d3061a..cdcdf0f24a0 100644 --- a/src/mame/dec/vax11.cpp +++ b/src/mame/dec/vax11.cpp @@ -71,6 +71,8 @@ #include "rx01.h" +namespace { + class vax11_state : public driver_device { public: @@ -171,8 +173,10 @@ ROM_START( vax785 ) ROMX_LOAD( "23-237f1-00.e69", 0xd000, 0x0400, CRC(2bf8cf0b) SHA1(6db79c5392b265e38b5b8b386528d7c138d995e9), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(1)) ROMX_LOAD( "23-238f1-00.e85", 0xd001, 0x0400, CRC(ff569f71) SHA1(05985396047fb4639959000a1abe50d2f184deaa), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(1)) ROMX_LOAD( "23-239f1-00.e73", 0xd001, 0x0400, CRC(cec7abe3) SHA1(8b8b52bd46340c58efa5adef3f306e0cdcb77520), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(1)) - ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ COMP( 1984, vax785, 0, 0, vax11, vax11, vax11_state, empty_init, "Digital Equipment Corporation", "VAX-11/785", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/dec/vk100.cpp b/src/mame/dec/vk100.cpp index ce2535aac6e..01012011aaa 100644 --- a/src/mame/dec/vk100.cpp +++ b/src/mame/dec/vk100.cpp @@ -140,6 +140,8 @@ state machine and sees if the GO bit ever finishes and goes back to 0 #include "vk100.lh" +namespace { + // named timer IDs #define TID_I8251_RX 1 #define TID_I8251_TX 2 @@ -217,7 +219,7 @@ private: DECLARE_WRITE_LINE_MEMBER(crtc_vsync); DECLARE_WRITE_LINE_MEMBER(i8251_rxrdy_int); DECLARE_WRITE_LINE_MEMBER(i8251_txrdy_int); - DECLARE_WRITE_LINE_MEMBER(i8251_rts); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(i8251_rts); uint8_t vram_read(); uint8_t vram_attr_read(); MC6845_UPDATE_ROW(crtc_update_row); @@ -1270,6 +1272,9 @@ ROM_START( vk100 ) ROM_LOAD( "wb8014_297a1.74s288.pr6.ic89", 0x0000, 0x0020, CRC(e2f7c566) SHA1(a4c3dc5d07667141ad799168a862cb3c489b4934)) // label verified from nigwil's and andy's board ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/vt100.cpp b/src/mame/dec/vt100.cpp index 8c50cd35a23..ef58cdb0f6e 100644 --- a/src/mame/dec/vt100.cpp +++ b/src/mame/dec/vt100.cpp @@ -55,6 +55,8 @@ #include "vt100.lh" +namespace { + class vt100_state : public driver_device { public: @@ -864,6 +866,9 @@ ROM_START( vt180 ) ROM_LOAD( "23-017e3-00.bin", 0x1000, 0x1000, CRC(4bdd2398) SHA1(84f288def6c143a2d2ed9dedf947c862c66bb18e)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/vt220.cpp b/src/mame/dec/vt220.cpp index 107f832e41c..8ca17299ee7 100644 --- a/src/mame/dec/vt220.cpp +++ b/src/mame/dec/vt220.cpp @@ -42,6 +42,8 @@ #include "screen.h" +namespace { + class vt220_state : public driver_device { public: @@ -175,6 +177,9 @@ ROM_START(vt220a) ROM_LOAD("23-348e4.e13", 0x0000, 0x2000, CRC(994f3e37) SHA1(fe72a9fe9adb3a24743a6288d88ae07570cfea9a)) // this can maybe be read as well as a read/writable ram for custom characters which lives ?above? it in chargen address space by setting a bit in a config register. I haven't figured out where in 8051 address space it appears when readable nor where the ram appears. ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/vt240.cpp b/src/mame/dec/vt240.cpp index bdf51fecbfe..707f603c030 100644 --- a/src/mame/dec/vt240.cpp +++ b/src/mame/dec/vt240.cpp @@ -24,6 +24,8 @@ #include "screen.h" +namespace { + class vt240_state : public driver_device { public: @@ -770,6 +772,9 @@ ROM_START( vt240 ) ROM_LOAD( "x2212", 0x000, 0x100, CRC(31c90c64) SHA1(21a0f1d4eec1ced04b85923151783bf23d18bfbd) ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1983, vt240, 0, 0, vt240, vt240, vt240_state, empty_init, "Digital Equipment Corporation", "VT240", MACHINE_IMPERFECT_GRAPHICS ) //COMP( 1983, vt241, 0, 0, vt220, vt220, vt240_state, empty_init, "Digital Equipment Corporation", "VT241", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/dec/vt320.cpp b/src/mame/dec/vt320.cpp index 0a9443ae540..6af07ad6a0d 100644 --- a/src/mame/dec/vt320.cpp +++ b/src/mame/dec/vt320.cpp @@ -15,6 +15,8 @@ #include "screen.h" +namespace { + class vt320_state : public driver_device { public: @@ -133,6 +135,9 @@ ROM_START( vt330 ) ROMX_LOAD( "23-236e6", 0x0000, 0x8000, CRC(38379339) SHA1(394e8511581abc796c8c612149eff280146b0ac8), ROM_BIOS(0) ) // 27256 EPROM ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dec/vt52.cpp b/src/mame/dec/vt52.cpp index 378ab8eb66e..b38da49129c 100644 --- a/src/mame/dec/vt52.cpp +++ b/src/mame/dec/vt52.cpp @@ -27,6 +27,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class vt52_state : public driver_device { public: @@ -438,4 +441,7 @@ ROM_START(vt52) // K1 or L1 version may use either 23-001B4 or 23-002B4 ROM_END +} // anonymous namespace + + COMP(1975, vt52, 0, 0, vt52, vt52, vt52_state, empty_init, "Digital Equipment Corporation", "VT52 Video Display Terminal (M4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_PRINTER) diff --git a/src/mame/dec/vt520.cpp b/src/mame/dec/vt520.cpp index 3d96c721a9c..cfcb416ed38 100644 --- a/src/mame/dec/vt520.cpp +++ b/src/mame/dec/vt520.cpp @@ -16,6 +16,8 @@ #include "screen.h" +namespace { + class vt520_state : public driver_device { public: @@ -149,6 +151,9 @@ ROM_START( vt520 ) ROM_LOAD( "23-010ed-00.e20", 0x0000, 0x80000, CRC(2502cc22) SHA1(0437c3107412f69e09d050fef003f2a81d8a3163)) // "(C)DEC94 23-010ED-00 // 9739 D" dumped from a VT520-A4 model ROM_END +} // anonymous namespace + + /* Driver */ COMP( 1990, vt420, 0, 0, vt420, vt520, vt520_state, empty_init, "Digital Equipment Corporation", "VT420 Video Terminal", MACHINE_IS_SKELETON ) diff --git a/src/mame/dec/vt62.cpp b/src/mame/dec/vt62.cpp index ec37e99515d..41fd85c1b4f 100644 --- a/src/mame/dec/vt62.cpp +++ b/src/mame/dec/vt62.cpp @@ -14,6 +14,8 @@ #include "screen.h" //#include "speaker.h" +namespace { + class vt62_state : public driver_device { public: @@ -117,5 +119,8 @@ ROM_START(vt62) ROM_CONTINUE( 0x100, 0x100) ROM_END +} // anonymous namespace + + //COMP(1977, vt61t, 0, 0, vt61t, vt61t, vt61_state, empty_init, "Digital Equipment Corporation", "VT61/t", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) COMP(1978, vt62, 0, 0, vt62, vt62, vt62_state, empty_init, "Digital Equipment Corporation", "VT62 DECscope", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/dec/vtvideo.h b/src/mame/dec/vtvideo.h index 9e1c6d91814..075f6ee7b0f 100644 --- a/src/mame/dec/vtvideo.h +++ b/src/mame/dec/vtvideo.h @@ -9,8 +9,8 @@ DEC VT Terminal video emulation **********************************************************************/ -#ifndef MAME_VIDEO_VTVIDEO_H -#define MAME_VIDEO_VTVIDEO_H +#ifndef MAME_DEC_VTVIDEO_H +#define MAME_DEC_VTVIDEO_H #pragma once @@ -109,4 +109,4 @@ DECLARE_DEVICE_TYPE(VT100_VIDEO, vt100_video_device) DECLARE_DEVICE_TYPE(RAINBOW_VIDEO, rainbow_video_device) -#endif // MAME_VIDEO_VTVIDEO_H +#endif // MAME_DEC_VTVIDEO_H diff --git a/src/mame/dgrm/blackt96.cpp b/src/mame/dgrm/blackt96.cpp index ce7942b4a42..aa8b4c8ed66 100644 --- a/src/mame/dgrm/blackt96.cpp +++ b/src/mame/dgrm/blackt96.cpp @@ -91,6 +91,8 @@ Bugs (all of these looks BTANBs): #include "tilemap.h" +namespace { + class blackt96_state : public driver_device { public: @@ -563,5 +565,8 @@ ROM_START( blackt96 ) ROM_CONTINUE( 0x00001, 0x08000 ) // first half is empty ROM_END +} // anonymous namespace + + // I'm not really sure this needs MACHINE_IS_INCOMPLETE just because there are some original game bugs, it's quite typical of this type of Korean release GAME( 1996, blackt96, 0, blackt96, blackt96, blackt96_state, empty_init, ROT0, "D.G.R.M.", "Black Touch '96", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/dms/dms5000.cpp b/src/mame/dms/dms5000.cpp index ffadaa98778..c29fe06f124 100644 --- a/src/mame/dms/dms5000.cpp +++ b/src/mame/dms/dms5000.cpp @@ -16,6 +16,8 @@ Digital Microsystems DMS-5000 #include "screen.h" +namespace { + class dms5000_state : public driver_device { public: @@ -112,6 +114,9 @@ ROM_START( dms5000 ) ROM_LOAD16_BYTE( "dms-5000_54-8672e.bin", 0x0000, 0x2000, CRC(94d64c06) SHA1(be5a53da7bb29a5fa9ac31efe550d5d6ff8b77cd)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dms/zsbc3.cpp b/src/mame/dms/zsbc3.cpp index 4ffdfe3161e..c0be77bc1cd 100644 --- a/src/mame/dms/zsbc3.cpp +++ b/src/mame/dms/zsbc3.cpp @@ -42,6 +42,8 @@ #include "bus/rs232/rs232.h" +namespace { + class zsbc3_state : public driver_device { public: @@ -119,6 +121,9 @@ ROM_START( zsbc3 ) ROM_LOAD( "54-8622_hdc13.bin", 0x0000, 0x0400, CRC(02c7cd6d) SHA1(494281ba081a0f7fbadfc30a7d2ea18c59e55101)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/drc/zrt80.cpp b/src/mame/drc/zrt80.cpp index c2c595d85dd..d0f01e85660 100644 --- a/src/mame/drc/zrt80.cpp +++ b/src/mame/drc/zrt80.cpp @@ -27,6 +27,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class zrt80_state : public driver_device { public: @@ -318,6 +321,9 @@ ROM_START( zrt80 ) ROM_LOAD("zrt80chr.z30", 0x0000, 0x0800, CRC(4dbdc60f) SHA1(20e393f7207a8440029c8290cdf2f121d317a37e) ) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/dynax/dynax_blitter_rev2.h b/src/mame/dynax/dynax_blitter_rev2.h index 2e26a5f0faa..003da125fe5 100644 --- a/src/mame/dynax/dynax_blitter_rev2.h +++ b/src/mame/dynax/dynax_blitter_rev2.h @@ -5,8 +5,8 @@ Dynax blitter, "revision 2" (TC17G032AP-0246 custom DIP64) **********************************************************************/ -#ifndef MAME_VIDEO_DYNAX_BLITTER_REV2_H -#define MAME_VIDEO_DYNAX_BLITTER_REV2_H +#ifndef MAME_DYNAX_DYNAX_BLITTER_REV2_H +#define MAME_DYNAX_DYNAX_BLITTER_REV2_H #pragma once @@ -92,4 +92,4 @@ private: DECLARE_DEVICE_TYPE(DYNAX_BLITTER_REV2, dynax_blitter_rev2_device) DECLARE_DEVICE_TYPE(CDRACULA_BLITTER, cdracula_blitter_device) -#endif // MAME_VIDEO_DYNAX_BLITTER_REV2_H +#endif // MAME_DYNAX_DYNAX_BLITTER_REV2_H diff --git a/src/mame/eaca/cgenie.cpp b/src/mame/eaca/cgenie.cpp index 62de40ad27f..b56c2235fa5 100644 --- a/src/mame/eaca/cgenie.cpp +++ b/src/mame/eaca/cgenie.cpp @@ -27,6 +27,8 @@ #include "speaker.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -518,6 +520,8 @@ ROM_START( cgenienz ) ROM_LOAD("cgenie1.fnt", 0x0000, 0x0800, CRC(4fed774a) SHA1(d53df8212b521892cc56be690db0bb474627d2ff)) ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/edevices/diverboy.cpp b/src/mame/edevices/diverboy.cpp index 01c0510097e..474517972dd 100644 --- a/src/mame/edevices/diverboy.cpp +++ b/src/mame/edevices/diverboy.cpp @@ -58,6 +58,7 @@ #include "speaker.h" +namespace { class diverboy_state : public driver_device { @@ -332,6 +333,7 @@ ROM_START( diverboy ) ROM_RELOAD( 0xe0000, 0x20000 ) ROM_END +} // anonymous namespace GAME( 1992, diverboy, 0, diverboy, diverboy, diverboy_state, empty_init, ORIENTATION_FLIP_X, "Gamart (Electronic Devices Italy license)", "Diver Boy", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/edevices/edevices.h b/src/mame/edevices/edevices.h index 536250445a9..d7b781da549 100644 --- a/src/mame/edevices/edevices.h +++ b/src/mame/edevices/edevices.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_EDEVICES_H -#define MAME_VIDEO_EDEVICES_H +#ifndef MAME_EDEVICES_EDEVICES_H +#define MAME_EDEVICES_EDEVICES_H #pragma once @@ -91,4 +91,4 @@ protected: DECLARE_DEVICE_TYPE(EDEVICES_VID, edevices_device) DECLARE_DEVICE_TYPE(EDEVICES_SFORCE_VID, edevices_sforce_device) -#endif // MAME_VIDEO_EDEVICES_H +#endif // MAME_EDEVICES_EDEVICES_H diff --git a/src/mame/edevices/mwarr.cpp b/src/mame/edevices/mwarr.cpp index 7d46dc1f15c..eb98ca0c8d5 100644 --- a/src/mame/edevices/mwarr.cpp +++ b/src/mame/edevices/mwarr.cpp @@ -48,6 +48,9 @@ Notes: #include "speaker.h" #include "edevices.h" + +namespace { + #define MASTER_CLOCK XTAL(12'000'000) #define SOUND_CLOCK XTAL(45'000'000) @@ -402,6 +405,9 @@ ROM_START( mwarr ) ROM_LOAD( "oki1", 0x000000, 0x80000, CRC(bcde2330) SHA1(452d871360fa907d2e4ebad93c3fba9a3fa32fa7) ) // no date ROM_END +} // anonymous namespace + + /************************************* * * Game driver(s) diff --git a/src/mame/edevices/pzletime.cpp b/src/mame/edevices/pzletime.cpp index 7f1cd4fd7a0..a613c729f79 100644 --- a/src/mame/edevices/pzletime.cpp +++ b/src/mame/edevices/pzletime.cpp @@ -26,6 +26,8 @@ #include "tilemap.h" +namespace { + class pzletime_state : public driver_device { public: @@ -355,4 +357,7 @@ ROM_START( pzletime ) ROM_LOAD( "pzletime.nv", 0x0000, 0x0080, CRC(e5ed3d40) SHA1(8c163a6e5839e5c82d52f046d3268202fdf9f4d1) ) ROM_END +} // anonymous namespace + + GAME( 199?, pzletime, 0, pzletime, pzletime, pzletime_state, empty_init, ROT0, "Elettronica Video-Games S.R.L.", "Puzzle Time (prototype)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/efo/cedar_magnet.cpp b/src/mame/efo/cedar_magnet.cpp index 89bd13ffe85..fc73d10184f 100644 --- a/src/mame/efo/cedar_magnet.cpp +++ b/src/mame/efo/cedar_magnet.cpp @@ -286,6 +286,8 @@ MASTER BOARD #include "screen.h" +namespace { + #define LOG_IC49_PIO_PB 0 #define LOG_IC48_PIO_PB 0 #define LOG_IC48_PIO_PA 0 @@ -1156,6 +1158,9 @@ void cedar_magnet_state::kludge_protection() } } +} // anonymous namespace + + GAME( 1987, cedmag, 0, cedar_magnet, cedar_magnet, cedar_magnet_state, empty_init, ROT0, "EFO SA / Cedar", "Magnet System", MACHINE_IS_BIOS_ROOT ) GAME( 1987, mag_time, cedmag, cedar_magnet, cedar_magnet, cedar_magnet_state, empty_init, ROT90, "EFO SA / Cedar", "Time Scanner (TS 2.0, Magnet System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // original game was by Sega diff --git a/src/mame/efo/cedar_magnet_flop.h b/src/mame/efo/cedar_magnet_flop.h index fecedcdedd4..488db20eb76 100644 --- a/src/mame/efo/cedar_magnet_flop.h +++ b/src/mame/efo/cedar_magnet_flop.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_CEDAR_MAGNET_FLOP_H -#define MAME_MACHINE_CEDAR_MAGNET_FLOP_H +#ifndef MAME_EFO_CEDAR_MAGNET_FLOP_H +#define MAME_EFO_CEDAR_MAGNET_FLOP_H #pragma once @@ -45,4 +45,4 @@ private: }; -#endif // MAME_MACHINE_CEDAR_MAGNET_FLOP_H +#endif // MAME_EFO_CEDAR_MAGNET_FLOP_H diff --git a/src/mame/efo/cedar_magnet_plane.h b/src/mame/efo/cedar_magnet_plane.h index 532a9ba628b..7ffd0335828 100644 --- a/src/mame/efo/cedar_magnet_plane.h +++ b/src/mame/efo/cedar_magnet_plane.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_CEDAR_MAGNET_PLANE_H -#define MAME_MACHINE_CEDAR_MAGNET_PLANE_H +#ifndef MAME_EFO_CEDAR_MAGNET_PLANE_H +#define MAME_EFO_CEDAR_MAGNET_PLANE_H #pragma once @@ -57,4 +57,4 @@ private: void pio1_pb_w(u8 data); }; -#endif // MAME_MACHINE_CEDAR_MAGNET_PLANE_H +#endif // MAME_EFO_CEDAR_MAGNET_PLANE_H diff --git a/src/mame/efo/cedar_magnet_sprite.h b/src/mame/efo/cedar_magnet_sprite.h index feb6c38604d..c9b70351571 100644 --- a/src/mame/efo/cedar_magnet_sprite.h +++ b/src/mame/efo/cedar_magnet_sprite.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_CEDAR_MAGNET_SPRITE_H -#define MAME_MACHINE_CEDAR_MAGNET_SPRITE_H +#ifndef MAME_EFO_CEDAR_MAGNET_SPRITE_H +#define MAME_EFO_CEDAR_MAGNET_SPRITE_H #pragma once @@ -77,4 +77,4 @@ private: required_device_array m_pio; }; -#endif // MAME_MACHINE_CEDAR_MAGNET_SPRITE_H +#endif // MAME_EFO_CEDAR_MAGNET_SPRITE_H diff --git a/src/mame/efo/nightmare.cpp b/src/mame/efo/nightmare.cpp index 6149f79af17..b36cbbb40bd 100644 --- a/src/mame/efo/nightmare.cpp +++ b/src/mame/efo/nightmare.cpp @@ -213,6 +213,8 @@ #include "machine/sda2006.h" +namespace { + #define MASTER_CLOCK XTAL(10'816'000) #define SOUND_CLOCK XTAL( 2'950'000) @@ -470,4 +472,7 @@ ROM_START( nightmare ) ROM_LOAD( "eeprom", 0x00, 0x40, CRC(7824e1f8) SHA1(2ccac62b4e8abcb2b3d66fa4025947fea184664e) ) ROM_END +} // anonymous namespace + + GAME( 1982, nightmare, 0, nightmare, nightmare, nightmare_state, empty_init, ROT90, "E.F.O.", "Night Mare (Spain)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NO_COCKTAIL ) diff --git a/src/mame/elektor/elekscmp.cpp b/src/mame/elektor/elekscmp.cpp index 4809462dd59..6fa7b3d8fb2 100644 --- a/src/mame/elektor/elekscmp.cpp +++ b/src/mame/elektor/elekscmp.cpp @@ -31,6 +31,8 @@ ToDo: #include "elekscmp.lh" +namespace { + class elekscmp_state : public driver_device { public: @@ -226,6 +228,9 @@ ROM_START( elekscmp ) ROM_LOAD( "elbug.003", 0x0400, 0x0200, CRC(13585ad1) SHA1(93f722b3e84095a1b701b04bf9018c891933b9ff)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/elektor/junior.cpp b/src/mame/elektor/junior.cpp index 078c06dbced..5e58c38116e 100644 --- a/src/mame/elektor/junior.cpp +++ b/src/mame/elektor/junior.cpp @@ -44,6 +44,8 @@ To Do: #include "junior.lh" +namespace { + class junior_state : public driver_device { public: @@ -224,6 +226,9 @@ ROM_START( junior ) ROMX_LOAD( "junior27321a.ic2", 0x0000, 0x0400, CRC(e22f24cc) SHA1(a6edb52a9eea5e99624c128065e748e5a3fb2e4c), ROM_BIOS(2)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/elektron/elektronmono.cpp b/src/mame/elektron/elektronmono.cpp index 12cf4aecee8..bcfc007cd14 100644 --- a/src/mame/elektron/elektronmono.cpp +++ b/src/mame/elektron/elektronmono.cpp @@ -115,6 +115,8 @@ #include "speaker.h" +namespace { + class elekmono_state : public driver_device { public: @@ -176,5 +178,8 @@ ROM_START( machdrum ) ROM_LOAD( "elektron_sps1-1uw_os1.63.bin", 0x000000, 0x800000, CRC(3d552c99) SHA1(a872a2f3527063673d6ea6d3080c4c62ef0cadc1) ) ROM_END +} // anonymous namespace + + CONS( 2004, monomach, 0, 0, elektron, elektron, elekmono_state, empty_init, "Elektron", "Monomachine SFX6 MK2", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) CONS( 2007, machdrum, 0, 0, elektron, elektron, elekmono_state, empty_init, "Elektron", "Machinedrum SPS-1 MK2", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/emusys/emax.cpp b/src/mame/emusys/emax.cpp index 24181200f9f..fa83491b452 100644 --- a/src/mame/emusys/emax.cpp +++ b/src/mame/emusys/emax.cpp @@ -18,6 +18,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class emax_state : public driver_device { public: @@ -302,6 +305,9 @@ ROM_START(emax2) ROM_LOAD("93c06n.ic24", 0x00, 0x20, CRC(403ef05b) SHA1(893ef614127ac1898d8ac529521f87ff62207138)) ROM_END +} // anonymous namespace + + SYST(1986, emax, 0, 0, emax, emax, emax_state, empty_init, "E-mu Systems", "Emax Digital Sampling Keyboard", MACHINE_IS_SKELETON) SYST(198?, emaxp, emax, 0, emaxp, emax, emax_state, empty_init, "E-mu Systems", "Emax Plus Digital Sampling Keyboard", MACHINE_IS_SKELETON) SYST(1989, emax2, 0, 0, emax2, emax2, emax_state, empty_init, "E-mu Systems", "Emax II 16-Bit Digital Sound System", MACHINE_IS_SKELETON) diff --git a/src/mame/emusys/emu2.cpp b/src/mame/emusys/emu2.cpp index 0aff2193370..2a00a73ae7a 100644 --- a/src/mame/emusys/emu2.cpp +++ b/src/mame/emusys/emu2.cpp @@ -17,6 +17,9 @@ #include "machine/z80pio.h" #include "machine/z80sio.h" + +namespace { + class emu2_state : public driver_device { public: @@ -326,4 +329,7 @@ ROM_START(emu2) ROM_LOAD("74s472.ic135", 0x200, 0x200, NO_DUMP) ROM_END +} // anonymous namespace + + SYST(1984, emu2, 0, 0, emu2, emu2, emu2_state, empty_init, "E-mu Systems", "Emulator II", MACHINE_IS_SKELETON) diff --git a/src/mame/emusys/emu3.cpp b/src/mame/emusys/emu3.cpp index 5bc87d93251..9f2d29ada77 100644 --- a/src/mame/emusys/emu3.cpp +++ b/src/mame/emusys/emu3.cpp @@ -40,6 +40,9 @@ #define VERBOSE 0 #include "logmacro.h" + +namespace { + class emu3_state : public driver_device { public: @@ -293,4 +296,7 @@ ROM_START(emu3) ROM_LOAD("im368.ic31", 0x000, 0xc00, NO_DUMP) ROM_END +} // anonymous namespace + + SYST(1987, emu3, 0, 0, emu3, emu3, emu3_state, empty_init, "E-mu Systems", "Emulator Three Digital Sound Production System", MACHINE_IS_SKELETON) diff --git a/src/mame/emusys/emu68k.cpp b/src/mame/emusys/emu68k.cpp index 8a4eb6367f0..dd19d83d16b 100644 --- a/src/mame/emusys/emu68k.cpp +++ b/src/mame/emusys/emu68k.cpp @@ -13,6 +13,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class emu68k_state : public driver_device { public: @@ -234,6 +237,9 @@ ROM_START(carnaval) ROM_LOAD16_BYTE("carnaval-1.00-lsb.bin", 0x00001, 0x40000, CRC(95506a6f) SHA1(1f6f2cce4fac36f4daa22bded1013f3dd0ca72db)) ROM_END +} // anonymous namespace + + SYST(1989, proteus1, 0, 0, proteus1, proteus1, emu68k_state, empty_init, "E-mu Systems", "Proteus/1 16-Bit Multi-Timbral Digital Sound Module", MACHINE_IS_SKELETON) SYST(1989, proteusxr, 0, 0, proteusxr, proteus1, emu68k_state, empty_init, "E-mu Systems", "Proteus/1 XR 16-Bit Multi-Timbral Digital Sound Module", MACHINE_IS_SKELETON) SYST(1991, procuss, 0, 0, proteusxr, procuss, emu68k_state, empty_init, "E-mu Systems", "Pro/Cussion Maximum Percussion Module", MACHINE_IS_SKELETON) diff --git a/src/mame/ensoniq/enmirage.cpp b/src/mame/ensoniq/enmirage.cpp index 5684c66d0fe..23828be1a06 100644 --- a/src/mame/ensoniq/enmirage.cpp +++ b/src/mame/ensoniq/enmirage.cpp @@ -90,6 +90,9 @@ #define LOGADCREAD(...) LOGMASKED(LOG_ADC_READ, __VA_ARGS__) #define LOGFILTERWRITE(...) LOGMASKED(LOG_FILTER_WRITE, __VA_ARGS__) + +namespace { + #define PITCH_TAG "pitch" #define MOD_TAG "mod" @@ -435,4 +438,7 @@ void enmirage_state::init_mirage() } } +} // anonymous namespace + + CONS(1984, enmirage, 0, 0, mirage, mirage, enmirage_state, init_mirage, "Ensoniq", "Mirage DMS-8", MACHINE_NOT_WORKING) diff --git a/src/mame/ensoniq/esq1.cpp b/src/mame/ensoniq/esq1.cpp index b39b7c2d67a..2bcc5360c9e 100644 --- a/src/mame/ensoniq/esq1.cpp +++ b/src/mame/ensoniq/esq1.cpp @@ -383,6 +383,9 @@ void esq1_filters::sound_stream_update(sound_stream &stream, std::vector #include @@ -100,4 +100,4 @@ DECLARE_DEVICE_TYPE(ESQ1X22, esq1x22_device) DECLARE_DEVICE_TYPE(ESQ2X40, esq2x40_device) DECLARE_DEVICE_TYPE(ESQ2X40_SQ1, esq2x40_sq1_device) -#endif // MAME_MACHINE_ESQVFD_H +#endif // MAME_ENSONIQ_ESQVFD_H diff --git a/src/mame/enterprise/ep64.cpp b/src/mame/enterprise/ep64.cpp index e86c39ffd38..447e6c59d30 100644 --- a/src/mame/enterprise/ep64.cpp +++ b/src/mame/enterprise/ep64.cpp @@ -166,6 +166,8 @@ Notes: (All IC's shown) #include "speaker.h" +namespace { + #define Z80_TAG "u1" #define DAVE_TAG "u3" #define NICK_TAG "u4" @@ -679,6 +681,7 @@ ROM_START( ep128 ) ROM_LOAD( "9256ds-0019_enter08-45-a.u2", 0x0000, 0x8000, CRC(982a3b44) SHA1(55315b20fecb4441a07ee4bc5dc7153f396e0a2e) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/enterprise/nick.h b/src/mame/enterprise/nick.h index 9420142c37e..28151d587fe 100644 --- a/src/mame/enterprise/nick.h +++ b/src/mame/enterprise/nick.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_VIDEO_NICK_H -#define MAME_VIDEO_NICK_H +#ifndef MAME_ENTERPRISE_NICK_H +#define MAME_ENTERPRISE_NICK_H #pragma once @@ -164,4 +164,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(NICK, nick_device) -#endif // MAME_VIDEO_NICK_H +#endif // MAME_ENTERPRISE_NICK_H diff --git a/src/mame/eolith/eolith16.cpp b/src/mame/eolith/eolith16.cpp index 47f4d2b408b..1828de8b4df 100644 --- a/src/mame/eolith/eolith16.cpp +++ b/src/mame/eolith/eolith16.cpp @@ -22,6 +22,8 @@ #include "speaker.h" +namespace { + class eolith16_state : public eolith_state { public: @@ -250,4 +252,7 @@ void eolith16_state::init_eolith16() init_speedup(); } +} // anonymous namespace + + GAME( 1999, klondkp, 0, eolith16, eolith16, eolith16_state, init_eolith16, ROT0, "Eolith", "KlonDike+", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/eolith/vegaeo.cpp b/src/mame/eolith/vegaeo.cpp index c644b62f369..a2f308f4411 100644 --- a/src/mame/eolith/vegaeo.cpp +++ b/src/mame/eolith/vegaeo.cpp @@ -23,6 +23,8 @@ #include "speaker.h" +namespace { + class vegaeo_state : public eolith_state { public: @@ -298,4 +300,7 @@ void vegaeo_state::init_vegaeo() init_speedup(); } +} // anonymous namespace + + GAME( 2002, crazywar, 0, vega, crazywar, vegaeo_state, init_vegaeo, ROT0, "Eolith", "Crazy War", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/epoch/scv.cpp b/src/mame/epoch/scv.cpp index 6e6a25c7f24..2e1a0b950b0 100644 --- a/src/mame/epoch/scv.cpp +++ b/src/mame/epoch/scv.cpp @@ -17,6 +17,8 @@ #include "speaker.h" +namespace { + class scv_state : public driver_device { public: @@ -688,6 +690,8 @@ ROM_START( scv_pal ) ROM_LOAD( "epochtv.chr", 0, 0x400, BAD_DUMP CRC(db521533) SHA1(40b4e44838c35191f115437a14f200f052e71509) ) ROM_END +} // anonymous namespace + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ CONS( 1984, scv, 0, 0, scv, scv, scv_state, empty_init, "Epoch", "Super Cassette Vision", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/epson/px4.cpp b/src/mame/epson/px4.cpp index a687561333a..e2ce0e0638c 100644 --- a/src/mame/epson/px4.cpp +++ b/src/mame/epson/px4.cpp @@ -34,6 +34,8 @@ #include "px4.lh" +namespace { + //************************************************************************** // CONSTANTS //************************************************************************** @@ -1593,6 +1595,8 @@ ROM_START( px4p ) ROM_LOAD("upd7508.bin", 0x0000, 0x1000, NO_DUMP) ROM_END +} // anonymous namespace + //************************************************************************** // GAME DRIVERS diff --git a/src/mame/epson/qx10.cpp b/src/mame/epson/qx10.cpp index 95b5095182c..656bafbd4b1 100644 --- a/src/mame/epson/qx10.cpp +++ b/src/mame/epson/qx10.cpp @@ -59,6 +59,8 @@ #include "imagedev/snapquik.h" +namespace { + #define MAIN_CLK 15974400 #define RS232_TAG "rs232" @@ -1075,6 +1077,9 @@ ROM_START( qx10 ) ROM_LOAD( "qga.2e", 0x0000, 0x1000, CRC(4120b128) SHA1(9b96f6d78cfd402f8aec7c063ffb70a21b78eff0)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ericsson/e9161.cpp b/src/mame/ericsson/e9161.cpp index 4901a34a4c9..46e47c41601 100644 --- a/src/mame/ericsson/e9161.cpp +++ b/src/mame/ericsson/e9161.cpp @@ -16,6 +16,8 @@ #include "video/am8052.h" +namespace { + class e9161_state : public driver_device { public: @@ -97,5 +99,7 @@ ROM_START(e9161) ROM_LOAD16_BYTE("e3405_87080_7303.bin", 0x0001, 0x2000, CRC(ec94aec4) SHA1(f41ae1b7f04ca3a2d0def6ff9aad3ff41782589a)) ROM_END +} // anonymous namespace + COMP(198?, e9161, 0, 0, e9161, e9161, e9161_state, empty_init, "Ericsson", "9161 Display Processor Unit", MACHINE_IS_SKELETON) diff --git a/src/mame/ericsson/eispc.cpp b/src/mame/ericsson/eispc.cpp index 605a3a63e27..8011d2defc6 100644 --- a/src/mame/ericsson/eispc.cpp +++ b/src/mame/ericsson/eispc.cpp @@ -105,6 +105,9 @@ #define LOGFPU(...) LOGMASKED(LOG_FPU, __VA_ARGS__) #define LOGCOM(...) LOGMASKED(LOG_COM, __VA_ARGS__) + +namespace { + class epc_state : public driver_device { public: @@ -1066,5 +1069,8 @@ ROM_START( epc ) ROMX_LOAD("epcbios3.bin", 0xc000, 0x02000, CRC(70483280) SHA1(b44b09da94d77b0269fc48f07d130b2d74c4bb8f), ROM_BIOS(1)) ROM_END +} // anonymous namespace + + COMP( 1985, epc, 0, 0, epc, epc_ports, epc_state, init_epc, "Ericsson Information System", "Ericsson PC" , 0) //COMP( 1985, eppc, ibm5150, 0, pccga, pccga, pc_state, empty_init, "Ericsson Information System", "Ericsson Portable PC", MACHINE_NOT_WORKING ) diff --git a/src/mame/ericsson/eispc_kb.h b/src/mame/ericsson/eispc_kb.h index 19b627c8d40..16af62455c8 100644 --- a/src/mame/ericsson/eispc_kb.h +++ b/src/mame/ericsson/eispc_kb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Joakim Larsson Edström -#ifndef MAME_MACHINE_EISPC_KB_H -#define MAME_MACHINE_EISPC_KB_H +#ifndef MAME_ERICSSON_EISPC_KB_H +#define MAME_ERICSSON_EISPC_KB_H #pragma once @@ -46,4 +46,4 @@ protected: void eispc_kb_mem(address_map &map); }; -#endif // MAME_MACHINE_EISPC_KB_H +#endif // MAME_ERICSSON_EISPC_KB_H diff --git a/src/mame/excellent/dblcrown.cpp b/src/mame/excellent/dblcrown.cpp index 5fd87e2e704..4d65b7fd2f7 100644 --- a/src/mame/excellent/dblcrown.cpp +++ b/src/mame/excellent/dblcrown.cpp @@ -56,6 +56,10 @@ #include "speaker.h" #include "dblcrown.lh" + + +namespace { + #define DEBUG_VRAM class dblcrown_state : public driver_device @@ -640,6 +644,8 @@ ROM_START( dblcrown ) ROM_LOAD("palce16v8h.u39", 0x0000, 0x0117, CRC(c74231ee) SHA1(f1b9e98f1fde53eee64d5da38fb8a6c22b6333e2) ) ROM_END +} // anonymous namespace + /* YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS LAYOUT */ GAMEL( 1997, dblcrown, 0, dblcrown, dblcrown, dblcrown_state, empty_init, ROT0, "Cadence Technology", "Double Crown (v1.0.3)", MACHINE_IMPERFECT_GRAPHICS, layout_dblcrown ) // 1997 DYNA copyright in tile GFX diff --git a/src/mame/excellent/excellent_spr.h b/src/mame/excellent/excellent_spr.h index 12e27c5922b..6fd9b7af0a7 100644 --- a/src/mame/excellent/excellent_spr.h +++ b/src/mame/excellent/excellent_spr.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_EXCELLENT_SPR_H -#define MAME_VIDEO_EXCELLENT_SPR_H +#ifndef MAME_EXCELLENT_EXCELLENT_SPR_H +#define MAME_EXCELLENT_EXCELLENT_SPR_H #pragma once @@ -35,4 +35,4 @@ private: DECLARE_DEVICE_TYPE(EXCELLENT_SPRITE, excellent_spr_device) -#endif // MAME_VIDEO_EXCELLENT_SPR_H +#endif // MAME_EXCELLENT_EXCELLENT_SPR_H diff --git a/src/mame/exidy/exidy440_a.h b/src/mame/exidy/exidy440_a.h index 05c456da79a..2fab62f1e46 100644 --- a/src/mame/exidy/exidy440_a.h +++ b/src/mame/exidy/exidy440_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Aaron Giles -#ifndef MAME_AUDIO_EXIDY440_H -#define MAME_AUDIO_EXIDY440_H +#ifndef MAME_EXIDY_EXIDY440_H +#define MAME_EXIDY_EXIDY440_H #pragma once @@ -118,4 +118,4 @@ private: DECLARE_DEVICE_TYPE(EXIDY440, exidy440_sound_device) -#endif // MAME_AUDIO_EXIDY440_H +#endif // MAME_EXIDY_EXIDY440_H diff --git a/src/mame/exidy/exidyttl.cpp b/src/mame/exidy/exidyttl.cpp index 311892078f2..bdcf89154a9 100644 --- a/src/mame/exidy/exidyttl.cpp +++ b/src/mame/exidy/exidyttl.cpp @@ -26,6 +26,9 @@ Exidy discrete hardware games #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -272,6 +275,10 @@ ROM_START( deathrac ) ROM_END #define rom_rhunting rom_deathrac + +} // anonymous namespace + + GAME( 1977, attckexd, 0, attack, 0, exidyttl_state, empty_init, ROT0, "Exidy", "Attack (set 1) [TTL]", MACHINE_IS_SKELETON ) GAME( 1977, attckexd2, attckexd, attack, 0, exidyttl_state, empty_init, ROT0, "Exidy", "Attack (set 2) [TTL]", MACHINE_IS_SKELETON ) GAME( 1976, deathrac, 0, deathrac, 0, exidyttl_state, empty_init, ROT0, "Exidy", "Death Race [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/exidy/micropolis.h b/src/mame/exidy/micropolis.h index b63ae0357d4..0e7e09661df 100644 --- a/src/mame/exidy/micropolis.h +++ b/src/mame/exidy/micropolis.h @@ -9,8 +9,8 @@ *********************************************************************/ -#ifndef MAME_MACHINE_MICROPOLIS_H -#define MAME_MACHINE_MICROPOLIS_H +#ifndef MAME_EXIDY_MICROPOLIS_H +#define MAME_EXIDY_MICROPOLIS_H #pragma once @@ -90,4 +90,4 @@ private: DECLARE_DEVICE_TYPE(MICROPOLIS, micropolis_device) -#endif // MAME_MACHINE_MICROPOLIS_H +#endif // MAME_EXIDY_MICROPOLIS_H diff --git a/src/mame/exidy/nl_carpolo.h b/src/mame/exidy/nl_carpolo.h index baa9b49bd33..942dbc00328 100644 --- a/src/mame/exidy/nl_carpolo.h +++ b/src/mame/exidy/nl_carpolo.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_AUDIO_NL_CARPOLO_H -#define MAME_AUDIO_NL_CARPOLO_H +#ifndef MAME_EXIDY_NL_CARPOLO_H +#define MAME_EXIDY_NL_CARPOLO_H #pragma once NETLIST_EXTERNAL(carpolo) -#endif // MAME_AUDIO_NL_CARPOLO_H +#endif // MAME_EXIDY_NL_CARPOLO_H diff --git a/src/mame/exidy/nl_fireone.h b/src/mame/exidy/nl_fireone.h index 1c3c48ef1de..2bf4fcc9218 100644 --- a/src/mame/exidy/nl_fireone.h +++ b/src/mame/exidy/nl_fireone.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_AUDIO_NL_FIREONE_H -#define MAME_AUDIO_NL_FIREONE_H +#ifndef MAME_EXIDY_NL_FIREONE_H +#define MAME_EXIDY_NL_FIREONE_H #pragma once NETLIST_EXTERNAL(fireone) -#endif // MAME_AUDIO_NL_FIREONE_H +#endif // MAME_EXIDY_NL_FIREONE_H diff --git a/src/mame/exidy/nl_starfire.h b/src/mame/exidy/nl_starfire.h index 19835d3b974..070e6da94fb 100644 --- a/src/mame/exidy/nl_starfire.h +++ b/src/mame/exidy/nl_starfire.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_AUDIO_NL_STARFIRE_H -#define MAME_AUDIO_NL_STARFIRE_H +#ifndef MAME_EXIDY_NL_STARFIRE_H +#define MAME_EXIDY_NL_STARFIRE_H #pragma once NETLIST_EXTERNAL(starfire) -#endif // MAME_AUDIO_NL_STARFIRE_H +#endif // MAME_EXIDY_NL_STARFIRE_H -- cgit v1.2.3