From db6b9175c118c7bda26111453139f815fefe120c Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Mon, 30 Jan 2023 18:02:54 +0100 Subject: mame/t*,u*: put drivers in anonymous namespaces where applicable, updated #ifndef guards to the current tree structure --- src/mame/ta/alphatpx.cpp | 4 +++ src/mame/ta/alphatro.cpp | 5 ++++ src/mame/tab/e22_kbd.h | 6 ++--- src/mame/taito/2mindril.cpp | 5 ++++ src/mame/taito/bingowav.cpp | 5 ++++ src/mame/taito/capr1.cpp | 4 +++ src/mame/taito/caprcyc.cpp | 4 +++ src/mame/taito/cchance.cpp | 5 ++++ src/mame/taito/cpzodiac.cpp | 4 +++ src/mame/taito/cyclemb.cpp | 4 +++ src/mame/taito/dinoking.cpp | 4 +++ src/mame/taito/invqix.cpp | 6 +++++ src/mame/taito/jollyjgr.cpp | 3 +++ src/mame/taito/lgp.cpp | 5 ++++ src/mame/taito/marinedt.cpp | 6 +++++ src/mame/taito/minivadr.cpp | 4 +++ src/mame/taito/missb2.cpp | 5 ++++ src/mame/taito/pc080sn.h | 6 ++--- src/mame/taito/pc090oj.h | 6 ++--- src/mame/taito/sbowling.cpp | 5 ++++ src/mame/taito/scyclone.cpp | 5 ++++ src/mame/taito/taito_en.h | 6 ++--- src/mame/taito/taito_helper.h | 6 ++--- src/mame/taito/taitocchip.h | 6 ++--- src/mame/taito/taitoio.h | 6 ++--- src/mame/taito/taitoio_yoke.h | 6 ++--- src/mame/taito/taitopjc.cpp | 8 +++++- src/mame/taito/taitosjsec.h | 6 ++--- src/mame/taito/taitottl.cpp | 5 ++++ src/mame/taito/taitotx.cpp | 4 +++ src/mame/taito/tc0080vco.h | 6 ++--- src/mame/taito/tc0100scn.h | 6 ++--- src/mame/taito/tc0110pcr.h | 6 ++--- src/mame/taito/tc0150rod.h | 6 ++--- src/mame/taito/tc0180vcu.h | 6 ++--- src/mame/taito/tc0280grd.h | 6 ++--- src/mame/taito/tc0360pri.h | 6 ++--- src/mame/taito/tc0480scp.h | 6 ++--- src/mame/taito/tc0780fpa.h | 6 ++--- src/mame/tangerine/alphatan.cpp | 4 +++ src/mame/tangerine/hhtiger.cpp | 4 +++ src/mame/tangerine/oric.cpp | 4 +++ src/mame/tatsumi/kingdrby.cpp | 4 +++ src/mame/tatsumi/tx1_a.h | 6 ++--- src/mame/tatung/einstein.cpp | 4 +++ src/mame/tch/wheelfir.cpp | 5 ++++ src/mame/tecmo/tecmo_mix.h | 6 ++--- src/mame/tektronix/tek410x.cpp | 5 ++++ src/mame/tektronix/tek410x_kbd.h | 6 ++--- src/mame/tektronix/tek440x.cpp | 5 ++++ src/mame/tektronix/tekxp33x.cpp | 5 ++++ src/mame/telenova/compis.cpp | 4 +++ src/mame/televideo/ts3000.cpp | 6 +++++ src/mame/televideo/ts802.cpp | 6 +++++ src/mame/televideo/ts803.cpp | 3 +++ src/mame/televideo/ts816.cpp | 6 +++++ src/mame/televideo/tv910.cpp | 6 +++++ src/mame/televideo/tv924.cpp | 6 +++++ src/mame/televideo/tv950.cpp | 6 +++++ src/mame/televideo/tv950kb.h | 6 ++--- src/mame/televideo/tv955.cpp | 6 +++++ src/mame/televideo/tv955kb.h | 6 ++--- src/mame/televideo/tv965.cpp | 6 +++++ src/mame/televideo/tv990.cpp | 5 ++++ src/mame/tesla/pmi80.cpp | 6 +++++ src/mame/ti/733_asr.h | 6 ++--- src/mame/ti/911_vdt.h | 6 ++--- src/mame/ti/evmbug.cpp | 5 ++++ src/mame/ti/exelv.cpp | 4 +++ src/mame/ti/geneve.cpp | 6 +++++ src/mame/ti/ti931.cpp | 6 +++++ src/mame/ti/ti990_10.cpp | 7 +++++- src/mame/ti/ti990_4.cpp | 5 ++++ src/mame/ti/ti99_4x.cpp | 10 ++++++-- src/mame/tigertel/docg3.h | 6 ++--- src/mame/tigertel/gizmondo.cpp | 5 ++++ src/mame/toaplan/gp9001.h | 6 ++--- src/mame/toaplan/mjsister.cpp | 4 +++ src/mame/toaplan/toaplan_scu.h | 6 ++--- src/mame/tomy/tomy_princ.cpp | 6 +++++ src/mame/toshiba/paso1600.cpp | 4 +++ src/mame/trainer/amico2k.cpp | 4 +++ src/mame/trainer/babbage.cpp | 5 ++++ src/mame/trainer/bob85.cpp | 5 ++++ src/mame/trainer/crei680.cpp | 5 ++++ src/mame/trainer/dolphunk.cpp | 5 ++++ src/mame/trainer/emma2.cpp | 4 +++ src/mame/trainer/instruct.cpp | 5 ++++ src/mame/trainer/pro80.cpp | 5 ++++ src/mame/trainer/savia84.cpp | 5 ++++ src/mame/trainer/selz80.cpp | 4 +++ src/mame/trainer/tk80.cpp | 4 +++ src/mame/trainer/zapcomputer.cpp | 6 +++++ src/mame/trs/6883sam.h | 6 ++--- src/mame/trs/coco_vhd.h | 6 ++--- src/mame/trs/gime.h | 6 ++--- src/mame/trs/max80.cpp | 8 +++++- src/mame/trs/meritum.cpp | 5 ++++ src/mame/trs/radionic.cpp | 5 ++++ src/mame/trs/tandy2kb.h | 6 ++--- src/mame/trs/trs80m2kb.h | 6 ++--- src/mame/tvgames/actions_atj2279b.cpp | 4 +++ src/mame/tvgames/bl_handhelds_lcdc.h | 6 ++--- src/mame/tvgames/elan_ep3a19a.cpp | 6 +++++ src/mame/tvgames/elan_ep3a19asys.h | 6 ++--- src/mame/tvgames/elan_eu3a05.cpp | 6 +++++ src/mame/tvgames/elan_eu3a05_a.h | 6 ++--- src/mame/tvgames/elan_eu3a05commonsys.h | 6 ++--- src/mame/tvgames/elan_eu3a05commonvid.h | 6 ++--- src/mame/tvgames/elan_eu3a05gpio.h | 6 ++--- src/mame/tvgames/elan_eu3a05sys.h | 6 ++--- src/mame/tvgames/elan_eu3a05vid.h | 6 ++--- src/mame/tvgames/elan_eu3a14.cpp | 4 +++ src/mame/tvgames/elan_eu3a14sys.h | 6 ++--- src/mame/tvgames/elan_eu3a14vid.h | 6 ++--- src/mame/tvgames/generalplus_gpl16250_m.h | 6 ++--- src/mame/tvgames/generalplus_gpl16250_mobigo.cpp | 5 ++++ src/mame/tvgames/generalplus_gpl16250_spi.cpp | 4 +++ .../tvgames/generalplus_gpl16250_spi_direct.cpp | 6 +++++ src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp | 4 +++ src/mame/tvgames/generalplus_gpl32612.cpp | 5 ++++ src/mame/tvgames/generalplus_gpl_unknown.cpp | 4 +++ src/mame/tvgames/hyperscan_card.h | 6 ++--- src/mame/tvgames/hyperscan_ctrl.h | 6 ++--- src/mame/tvgames/magiceyes_pollux_vr3520f.cpp | 4 +++ src/mame/tvgames/monkey_king_3b.cpp | 6 +++++ src/mame/tvgames/pubint_storyreader.cpp | 6 +++++ src/mame/tvgames/spg110.cpp | 5 ++++ src/mame/tvgames/spg29x.cpp | 3 +++ src/mame/tvgames/spg29x_lexibook_jg7425.cpp | 5 ++++ src/mame/tvgames/spg2xx_digimake.cpp | 5 ++++ src/mame/tvgames/spg2xx_dreamlife.cpp | 5 ++++ src/mame/tvgames/spg2xx_ican.cpp | 4 +++ src/mame/tvgames/spg2xx_jakks.cpp | 5 ++++ src/mame/tvgames/spg2xx_jakks_gkr.cpp | 7 ++++-- src/mame/tvgames/spg2xx_jakks_sharp.cpp | 5 ++++ src/mame/tvgames/spg2xx_jakks_tvtouch.cpp | 5 ++++ src/mame/tvgames/spg2xx_lexibook.cpp | 4 +++ src/mame/tvgames/spg2xx_mysprtch.cpp | 5 ++++ src/mame/tvgames/spg2xx_pdc.cpp | 5 ++++ src/mame/tvgames/spg2xx_playvision.cpp | 5 ++++ src/mame/tvgames/spg2xx_senario.cpp | 3 +++ src/mame/tvgames/spg2xx_senario_poker.cpp | 5 ++++ src/mame/tvgames/spg2xx_senca.cpp | 3 +++ src/mame/tvgames/spg2xx_shredmjr.cpp | 4 ++- src/mame/tvgames/spg2xx_skannerztv.cpp | 6 +++++ src/mame/tvgames/spg2xx_smarttv.cpp | 4 +++ src/mame/tvgames/spg2xx_telestory.cpp | 4 +++ src/mame/tvgames/spg2xx_tvgogo.cpp | 4 +++ src/mame/tvgames/spg2xx_vii.cpp | 5 ++++ src/mame/tvgames/spg2xx_wiwi.cpp | 5 ++++ src/mame/tvgames/spg2xx_zone.cpp | 5 ++++ src/mame/tvgames/st2302u_bbl_rom.cpp | 6 +++++ src/mame/tvgames/st2302u_bbl_spi.cpp | 6 +++++ src/mame/tvgames/trkfldch.cpp | 5 ++++ src/mame/tvgames/xavix2.cpp | 5 ++++ src/mame/tvgames/xavix2002_io.h | 6 ++--- src/mame/tvgames/xavix_adc.h | 6 ++--- src/mame/tvgames/xavix_anport.h | 6 ++--- src/mame/tvgames/xavix_io.h | 6 ++--- src/mame/tvgames/xavix_madfb_ball.h | 6 ++--- src/mame/tvgames/xavix_math.h | 6 ++--- src/mame/tvgames/xavix_mtrk_wheel.h | 6 ++--- src/mame/ultimachine/rambo.cpp | 6 +++++ src/mame/ultratec/minicom.cpp | 6 +++++ src/mame/unicard/bbcbc.cpp | 6 +++++ src/mame/unico/goori.cpp | 5 ++++ src/mame/unico/unianapc.cpp | 6 +++++ src/mame/unisonic/gic.h | 6 ++--- src/mame/unisonic/unichamp.cpp | 4 +++ src/mame/universal/cheekyms_a.h | 6 ++--- src/mame/universal/cosmicg.cpp | 4 +++ src/mame/universal/ladybug_video.h | 6 ++--- src/mame/universal/nl_cheekyms.h | 6 ++--- src/mame/universal/superdq.cpp | 3 +++ src/mame/universal/zerohour_stars.h | 6 ++--- src/mame/ussr/cm1800.cpp | 5 ++++ src/mame/ussr/dvk_kcgd.cpp | 29 +++++++++++++--------- src/mame/ussr/dvk_ksm.cpp | 29 +++++++++++++--------- src/mame/ussr/ie15.cpp | 5 ++++ src/mame/ussr/irisha.cpp | 6 +++++ src/mame/ussr/km035.h | 6 ++--- src/mame/ussr/mikrosha.cpp | 5 ++++ src/mame/ussr/mk85.cpp | 5 ++++ src/mame/ussr/mk90.cpp | 5 ++++ src/mame/ussr/mk98.cpp | 4 +++ src/mame/ussr/ms6102.cpp | 5 ++++ src/mame/ussr/pyl601.cpp | 6 +++++ src/mame/ussr/sm1800.cpp | 5 ++++ src/mame/ussr/sm7238.cpp | 15 +++++++---- src/mame/ussr/specialsound.h | 6 ++--- src/mame/ussr/tiamc1_a.h | 6 ++--- src/mame/ussr/uknc.cpp | 5 ++++ 193 files changed, 860 insertions(+), 220 deletions(-) diff --git a/src/mame/ta/alphatpx.cpp b/src/mame/ta/alphatpx.cpp index 8037770f157..bed4bc40878 100644 --- a/src/mame/ta/alphatpx.cpp +++ b/src/mame/ta/alphatpx.cpp @@ -82,6 +82,8 @@ #include "debugger.h" +namespace { + //************************************************************************** // TYPE DEFINITIONS - Alphatronic P1, P2, P2S, P2U and Hell 2069 //************************************************************************** @@ -1439,6 +1441,8 @@ ROM_START( alphatp30 ) // P30 add-on card with 8088 needs to be emulated to boot ROM_LOAD("caxp_02_02_13.bin", 0x00000, 0x2000, CRC(e6bf6dd5) SHA1(dc87210bbcd96f3c1370565174a45199e3c1bc70)) // P30 ROM from 8088 card ROM_END +} // anonymous namespace + //************************************************************************** // SYSTEM DRIVERS diff --git a/src/mame/ta/alphatro.cpp b/src/mame/ta/alphatro.cpp index b4bb6da7e13..66828e05577 100644 --- a/src/mame/ta/alphatro.cpp +++ b/src/mame/ta/alphatro.cpp @@ -51,6 +51,8 @@ #include "speaker.h" +namespace { + class alphatro_state : public driver_device { public: @@ -947,6 +949,9 @@ ROM_START( alphatrob ) ROMX_LOAD( "b40r_ic1067.bin", 0x0000, 0x1000, CRC(543e3ee8) SHA1(3e6c6f8c85d3a5d0735edfec52709c5670ff1646), ROM_BIOS(0) ) ROM_END +} // anonymous namespace + + COMP( 1983, alphatro, 0, 0, alphatro, alphatro, alphatro_pal_state, empty_init, "Triumph-Adler", "Alphatronic PC (PAL)", MACHINE_SUPPORTS_SAVE ) COMP( 1983, alphatron, alphatro, 0, alphatro, alphatro, alphatro_ntsc_state, empty_init, "Triumph-Adler", "Alphatronic PC (NTSC)", MACHINE_SUPPORTS_SAVE ) COMP( 1984, alphatrob, alphatro, 0, alphatro, alphatro, alphatro_bicom_state, empty_init, "Triumph-Adler", "Alphatronic PC w/BiCom Graphics", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/tab/e22_kbd.h b/src/mame/tab/e22_kbd.h index a3bac1d98d6..b3f35769763 100644 --- a/src/mame/tab/e22_kbd.h +++ b/src/mame/tab/e22_kbd.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_E22_KBD_H -#define MAME_MACHINE_E22_KBD_H +#ifndef MAME_TAB_E22_KBD_H +#define MAME_TAB_E22_KBD_H #pragma once @@ -59,4 +59,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(E22_KBD_HLE, e22_kbd_hle_device) -#endif // MAME_MACHINE_E22_KBD_H +#endif // MAME_TAB_E22_KBD_H diff --git a/src/mame/taito/2mindril.cpp b/src/mame/taito/2mindril.cpp index 675a62885bb..6dda1e2801e 100644 --- a/src/mame/taito/2mindril.cpp +++ b/src/mame/taito/2mindril.cpp @@ -43,6 +43,8 @@ DAC -26.6860Mhz #include "speaker.h" +namespace { + class _2mindril_state : public taito_f3_state { public: @@ -409,5 +411,8 @@ void _2mindril_state::init_drill() tile_decode(); } +} // anonymous namespace + + // YEAR NAME PARENT MACHINE INPUT CLASS INIT ROT COMPANY FULLNAME FLAGS GAME( 1993, 2mindril, 0, drill, drill, _2mindril_state, init_drill, ROT0, "Taito America Corporation", "Two Minute Drill (Ver 2.93A 1994/02/16)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_MECHANICAL) diff --git a/src/mame/taito/bingowav.cpp b/src/mame/taito/bingowav.cpp index ce8a7404240..441cd528b65 100644 --- a/src/mame/taito/bingowav.cpp +++ b/src/mame/taito/bingowav.cpp @@ -47,6 +47,9 @@ #include "sound/ymopn.h" #include "taitosnd.h" + +namespace { + class bingowav_state : public driver_device { public: @@ -164,5 +167,7 @@ ROM_START( bingowav ) ROM_LOAD( "ic1", 0x00000, 0x20000, CRC(d257bbaf) SHA1(9d1414594dc1c1fca256ab5b6039e733bff1414a) ) ROM_END +} // anonymous namespace + GAME( 1994, bingowav, 0, bingowav, bingowav, bingowav_state, empty_init, ROT0, "Taito", "Bingo Wave", MACHINE_IS_SKELETON ) diff --git a/src/mame/taito/capr1.cpp b/src/mame/taito/capr1.cpp index 3834c2afe1c..a91a70a5538 100644 --- a/src/mame/taito/capr1.cpp +++ b/src/mame/taito/capr1.cpp @@ -39,6 +39,8 @@ TODO: #include "speaker.h" +namespace { + class capr1_state : public driver_device { public: @@ -262,5 +264,7 @@ ROM_START( cspin2 ) ROM_LOAD( "e30-02.bin", 0x000000, 0x040000, CRC(519e5474) SHA1(04b344b34d780f2f83207bf6eee2573cc0ce421e) ) ROM_END +} // anonymous namespace + GAME( 1996, cspin2, 0, cspin2, cspin2, capr1_state, empty_init, ROT0, "Taito", "Capriccio Spin 2", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/taito/caprcyc.cpp b/src/mame/taito/caprcyc.cpp index c4debe1e3b6..3e96a4bc3a7 100644 --- a/src/mame/taito/caprcyc.cpp +++ b/src/mame/taito/caprcyc.cpp @@ -19,6 +19,8 @@ TODO: #include "cpu/mips/mips3.h" +namespace { + class caprcyc_state : public driver_device { public: @@ -94,5 +96,7 @@ ROM_START( caprcyc ) ROM_LOAD( "e69-02.ic3", 0x000000, 0x200000, CRC(ca0ea2ed) SHA1(de2306207c8b8faa0dac3559ad93904cb957fa28) ) ROM_END +} // anonymous namespace + GAME( 1999, caprcyc, 0, caprcyc, caprcyc, caprcyc_state, empty_init, ROT0, "Taito", "Capriccio Cyclone", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/taito/cchance.cpp b/src/mame/taito/cchance.cpp index cbad0b3cf01..e0d849c083f 100644 --- a/src/mame/taito/cchance.cpp +++ b/src/mame/taito/cchance.cpp @@ -44,6 +44,8 @@ cha3 $10d8 #include "speaker.h" +namespace { + class cchance_state : public tnzs_base_state { public: @@ -263,4 +265,7 @@ ROM_START( cchance ) ROM_LOAD( "prom2", 0x0200, 0x0200, NO_DUMP ) ROM_END +} // anonymous namespace + + GAME( 1987?, cchance, 0, cchance, cchance, cchance_state, empty_init, ROT0, "", "Cherry Chance", MACHINE_NOT_WORKING | MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/cpzodiac.cpp b/src/mame/taito/cpzodiac.cpp index efc5f4c0962..947042fd7ac 100644 --- a/src/mame/taito/cpzodiac.cpp +++ b/src/mame/taito/cpzodiac.cpp @@ -37,6 +37,8 @@ TODO: #include "speaker.h" +namespace { + class cpzodiac_state : public driver_device { public: @@ -241,6 +243,8 @@ ROM_START( cpzodiacj ) ROM_LOAD( "d52-02.ic38", 0x0000, 0x0aee, CRC(6be9b935) SHA1(d36af591b03873aee3098b7c74b53ac6370ca064) ) // PAL16L8BCN ROM_END +} // anonymous namespace + // YEAR NAME PARENT MACHINE INPUT STATE INIT SCREEN COMPANY FULLNAME FLAGS GAME( 1993, cpzodiac, 0, cpzodiac, cpzodiac, cpzodiac_state, empty_init, ROT0, "Taito Corporation", "Captain Zodiac (World)", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL | MACHINE_NOT_WORKING ) diff --git a/src/mame/taito/cyclemb.cpp b/src/mame/taito/cyclemb.cpp index 3dea63bb223..2e769debda6 100644 --- a/src/mame/taito/cyclemb.cpp +++ b/src/mame/taito/cyclemb.cpp @@ -80,6 +80,8 @@ Dumped by Chack'n #include "speaker.h" +namespace { + class cyclemb_state : public driver_device { public: @@ -1157,6 +1159,8 @@ void cyclemb_state::init_skydest() m_use_dial = false; } +} // anonymous namespace + // year name parent machine input class init rot company fullname flags GAME( 1984, cyclemb, 0, cyclemb, cyclemb, cyclemb_state, init_cyclemb, ROT0, "Taito Corporation", "Cycle Maabou (Japan)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/dinoking.cpp b/src/mame/taito/dinoking.cpp index 3eab5caa0c0..b1f49b912c0 100644 --- a/src/mame/taito/dinoking.cpp +++ b/src/mame/taito/dinoking.cpp @@ -24,6 +24,8 @@ XTALs: 20 MHz near CPU and sound chip, 25 MHz near video chip #include "sound/okim9810.h" +namespace { + class dinoking_state : public driver_device { public: @@ -84,6 +86,8 @@ ROM_START( dkbattle ) ROM_LOAD( "f54-02.ic27", 0x000000, 0x400000, CRC(bd8e10e9) SHA1(a86fde5860501b06f63bafbc02ebc6160c682b1e) ) // MBM29F033C-90PTN ROM_END +} // anonymous namespace + GAME( 2004, dkkids, 0, dinoking, dinoking, dinoking_state, empty_init, ROT0, "Taito Corporation", "Dinoking Kids", MACHINE_IS_SKELETON ) GAME( 2005, dkbattle, 0, dinoking, dinoking, dinoking_state, empty_init, ROT0, "Taito Corporation", "Dinoking Battle", MACHINE_IS_SKELETON ) diff --git a/src/mame/taito/invqix.cpp b/src/mame/taito/invqix.cpp index 321287fb0fc..642b81c4b32 100644 --- a/src/mame/taito/invqix.cpp +++ b/src/mame/taito/invqix.cpp @@ -126,6 +126,9 @@ as well as Up Right, Cocktail or Flip Screen from the service menu. #include "screen.h" #include "speaker.h" + +namespace { + class invqix_state : public driver_device { public: @@ -364,4 +367,7 @@ ROM_START( invqix ) ROM_LOAD16_WORD_SWAP( "93c46.ic6", 0x000000, 0x000080, CRC(564b744e) SHA1(4d9ea7dc253797c513258d07a936dfb63d8ed18c) ) ROM_END +} // anonymous namespace + + GAME( 2003, invqix, 0, invqix, invqix, invqix_state, empty_init, ROT270, "Taito / Namco", "Space Invaders / Qix Silver Anniversary Edition (Ver. 2.03)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/jollyjgr.cpp b/src/mame/taito/jollyjgr.cpp index e1c3530563f..11dd586f332 100644 --- a/src/mame/taito/jollyjgr.cpp +++ b/src/mame/taito/jollyjgr.cpp @@ -126,6 +126,8 @@ Notes: #include "tilemap.h" +namespace { + class jollyjgr_state : public driver_device { public: @@ -777,6 +779,7 @@ ROM_START( fspiderb ) ROM_LOAD( "82s123.1f", 0x0000, 0x0020, CRC(cda6001a) SHA1(e10fe848e8123e53bd2db8a14cfa2d8c6621d6aa) ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/taito/lgp.cpp b/src/mame/taito/lgp.cpp index 9b76c5469de..875cb5ea3df 100644 --- a/src/mame/taito/lgp.cpp +++ b/src/mame/taito/lgp.cpp @@ -72,6 +72,8 @@ Dumping Notes: #include "speaker.h" +namespace { + class lgp_state : public driver_device { public: @@ -609,6 +611,9 @@ void lgp_state::init_lgp() { } +} // anonymous namespace + + /* YEAR NAME PARENT MACHINE INPUT STATE INIT MONITOR COMPANY FULLNAME FLAGS) */ GAME( 1983, lgp, 0, lgp, lgp, lgp_state, init_lgp, ROT0, "Taito", "Laser Grand Prix", MACHINE_NOT_WORKING|MACHINE_NO_SOUND) GAME( 1983, lgpalt, lgp, lgp, lgp, lgp_state, init_lgp, ROT0, "Taito", "Laser Grand Prix (alternate)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND) diff --git a/src/mame/taito/marinedt.cpp b/src/mame/taito/marinedt.cpp index 8f1bfcd27fd..0842e203361 100644 --- a/src/mame/taito/marinedt.cpp +++ b/src/mame/taito/marinedt.cpp @@ -108,6 +108,9 @@ Lower PCB is plugged in with components facing up. #include "speaker.h" #include "tilemap.h" + +namespace { + #define MAIN_CLOCK XTAL(9'987'000) class marinedt_state : public driver_device @@ -686,4 +689,7 @@ ROM_START( marinedt ) ROM_LOAD( "mg17.bpr", 0x0060, 0x0020, CRC(13261a02) SHA1(050edd18e4f79d19d5206f55f329340432fd4099) ) // sea bitmap colors ROM_END +} // anonymous namespace + + GAME( 1981, marinedt, 0, marinedt, marinedt, marinedt_state, empty_init, ROT270, "Taito", "Marine Date", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_COLORS | MACHINE_NO_SOUND ) diff --git a/src/mame/taito/minivadr.cpp b/src/mame/taito/minivadr.cpp index c5d51f5b8e6..de29c66c4db 100644 --- a/src/mame/taito/minivadr.cpp +++ b/src/mame/taito/minivadr.cpp @@ -39,6 +39,8 @@ Notes: (all ICs shown) #include "screen.h" +namespace { + class minivadr_state : public driver_device { public: @@ -136,5 +138,7 @@ ROM_START( minivadr ) ROM_LOAD( "d26-01.ic7", 0x0000, 0x2000, CRC(a96c823d) SHA1(aa9969ff80e94b0fff0f3530863f6b300510162e) ) ROM_END +} // anonymous namespace + GAME( 1990, minivadr, 0, minivadr, minivadr, minivadr_state, empty_init, ROT0, "Taito Corporation", "Mini Vaders", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW ) diff --git a/src/mame/taito/missb2.cpp b/src/mame/taito/missb2.cpp index 899c2b1d532..7752518b7de 100644 --- a/src/mame/taito/missb2.cpp +++ b/src/mame/taito/missb2.cpp @@ -26,6 +26,8 @@ written, so it may be normal behaviour. #include "speaker.h" +namespace { + class missb2_state : public bublbobl_state { public: @@ -607,6 +609,9 @@ void missb2_state::init_missb2() m_video_enable = 0; } +} // anonymous namespace + + /* Game Drivers */ GAME( 1996, missb2, 0, missb2, missb2, missb2_state, init_missb2, ROT0, "Alpha Co.", "Miss Bubble II", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/pc080sn.h b/src/mame/taito/pc080sn.h index 7396913d260..6a08cc10fee 100644 --- a/src/mame/taito/pc080sn.h +++ b/src/mame/taito/pc080sn.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_PC080SN_H -#define MAME_VIDEO_PC080SN_H +#ifndef MAME_TAITO_PC080SN_H +#define MAME_TAITO_PC080SN_H #pragma once @@ -75,4 +75,4 @@ private: DECLARE_DEVICE_TYPE(PC080SN, pc080sn_device) -#endif // MAME_VIDEO_PC080SN_H +#endif // MAME_TAITO_PC080SN_H diff --git a/src/mame/taito/pc090oj.h b/src/mame/taito/pc090oj.h index 42a5b5bd245..fd3493ea04c 100644 --- a/src/mame/taito/pc090oj.h +++ b/src/mame/taito/pc090oj.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_PC090OJ_H -#define MAME_VIDEO_PC090OJ_H +#ifndef MAME_TAITO_PC090OJ_H +#define MAME_TAITO_PC090OJ_H #pragma once @@ -60,4 +60,4 @@ private: DECLARE_DEVICE_TYPE(PC090OJ, pc090oj_device) -#endif // MAME_VIDEO_PC090)J_H +#endif // MAME_TAITO_PC090)J_H diff --git a/src/mame/taito/sbowling.cpp b/src/mame/taito/sbowling.cpp index 3ceb7ea2052..b9bcbc7bfb7 100644 --- a/src/mame/taito/sbowling.cpp +++ b/src/mame/taito/sbowling.cpp @@ -52,6 +52,8 @@ PROMs : NEC B406 (1kx4) x2 #include "tilemap.h" +namespace { + class sbowling_state : public driver_device { public: @@ -456,4 +458,7 @@ ROM_START( sbowling ) ROM_LOAD( "kb09.6m", 0x0400, 0x0400, CRC(e29191a6) SHA1(9a2c78a96ef6d118f4dacbea0b7d454b66a452ae)) ROM_END +} // anonymous namespace + + GAME( 1982, sbowling, 0, sbowling, sbowling, sbowling_state, empty_init, ROT90, "Taito Corporation", "Strike Bowling", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/scyclone.cpp b/src/mame/taito/scyclone.cpp index 8189389ae23..ba4875dda29 100644 --- a/src/mame/taito/scyclone.cpp +++ b/src/mame/taito/scyclone.cpp @@ -51,6 +51,8 @@ #include "speaker.h" +namespace { + class scyclone_state : public driver_device { public: @@ -685,4 +687,7 @@ ROM_START( scyclone ) ROM_LOAD( "de17.2e.82s123", 0x0020, 0x0020, CRC(3c8572e4) SHA1(c908c4ed99828fff576c3d0963cd8b99edeb993b) ) ROM_END +} // anonymous namespace + + GAME( 1980, scyclone, 0, scyclone, scyclone, scyclone_state, empty_init, ROT270, "Taito Corporation", "Space Cyclone", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/taito/taito_en.h b/src/mame/taito/taito_en.h index 6d7aad2da3f..e36e6b6238c 100644 --- a/src/mame/taito/taito_en.h +++ b/src/mame/taito/taito_en.h @@ -5,8 +5,8 @@ Taito Ensoniq ES5505-based sound hardware ****************************************************************************/ -#ifndef MAME_AUDIO_TAITO_EN_H -#define MAME_AUDIO_TAITO_EN_H +#ifndef MAME_TAITO_TAITO_EN_H +#define MAME_TAITO_TAITO_EN_H #pragma once @@ -73,4 +73,4 @@ private: DECLARE_DEVICE_TYPE(TAITO_EN, taito_en_device) -#endif // MAME_AUDIO_TAITO_EN_H +#endif // MAME_TAITO_TAITO_EN_H diff --git a/src/mame/taito/taito_helper.h b/src/mame/taito/taito_helper.h index 7efa52f2228..48d7cf753a2 100644 --- a/src/mame/taito/taito_helper.h +++ b/src/mame/taito/taito_helper.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TAITO_HELPER_H -#define MAME_VIDEO_TAITO_HELPER_H +#ifndef MAME_TAITO_TAITO_HELPER_H +#define MAME_TAITO_TAITO_HELPER_H #pragma once @@ -10,4 +10,4 @@ void taitoic_drawscanline(bitmap_ind16 &bitmap, const rectangle &cliprect, int x, int y, const u16 *src, bool transparent, u32 orient, bitmap_ind8 &priority, u8 pri, u8 primask = 0); -#endif // MAME_VIDEO_TAITO_HELPER_H +#endif // MAME_TAITO_TAITO_HELPER_H diff --git a/src/mame/taito/taitocchip.h b/src/mame/taito/taitocchip.h index eac1e06ed78..5dddc1ec6f5 100644 --- a/src/mame/taito/taitocchip.h +++ b/src/mame/taito/taitocchip.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Jonathan Gevaryahu -#ifndef MAME_MACHINE_TAITOCCHIP_H -#define MAME_MACHINE_TAITOCCHIP_H +#ifndef MAME_TAITO_TAITOCCHIP_H +#define MAME_TAITO_TAITOCCHIP_H #pragma once @@ -65,4 +65,4 @@ private: devcb_write8 m_out_pc_cb; }; -#endif // MAME_MACHINE_TAITOCCHIP_H +#endif // MAME_TAITO_TAITOCCHIP_H diff --git a/src/mame/taito/taitoio.h b/src/mame/taito/taitoio.h index 1d864c18b78..de624a0f5ac 100644 --- a/src/mame/taito/taitoio.h +++ b/src/mame/taito/taitoio.h @@ -8,8 +8,8 @@ **************************************************************************/ -#ifndef MAME_MACHINE_TAITOIO_H -#define MAME_MACHINE_TAITOIO_H +#ifndef MAME_TAITO_TAITOIO_H +#define MAME_TAITO_TAITOIO_H #pragma once @@ -182,4 +182,4 @@ protected: DECLARE_DEVICE_TYPE(TC0640FIO, tc0640fio_device) -#endif // MAME_MACHINE_TAITOIO_H +#endif // MAME_TAITO_TAITOIO_H diff --git a/src/mame/taito/taitoio_yoke.h b/src/mame/taito/taitoio_yoke.h index d531ade856a..09f16fbd5f3 100644 --- a/src/mame/taito/taitoio_yoke.h +++ b/src/mame/taito/taitoio_yoke.h @@ -5,8 +5,8 @@ Taito Yoke + Throttle Flight device ***************************************************************************/ -#ifndef MAME_MACHINE_TAITO_YOKE_H -#define MAME_MACHINE_TAITO_YOKE_H +#ifndef MAME_TAITO_TAITO_YOKE_H +#define MAME_TAITO_TAITO_YOKE_H #pragma once @@ -51,4 +51,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TAITOIO_YOKE, taitoio_yoke_device) -#endif // MAME_MACHINE_TAITO_YOKE_H +#endif // MAME_TAITO_TAITO_YOKE_H diff --git a/src/mame/taito/taitopjc.cpp b/src/mame/taito/taitopjc.cpp index a2e4dca4b12..98a7c3fe2b2 100644 --- a/src/mame/taito/taitopjc.cpp +++ b/src/mame/taito/taitopjc.cpp @@ -94,6 +94,9 @@ #include "screen.h" #include "tilemap.h" + +namespace { + #define LOG_TLCS_TO_PPC_COMMANDS 0 #define LOG_PPC_TO_TLCS_COMMANDS 0 #define LOG_DISPLAY_LIST 0 @@ -155,7 +158,7 @@ private: uint32_t videochip_r(offs_t address); void videochip_w(offs_t address, uint32_t data); void video_exit(); - void print_display_list(); + [[maybe_unused]] void print_display_list(); TILE_GET_INFO_MEMBER(tile_get_info); TILEMAP_MAPPER_MEMBER(tile_scan_layer0); TILEMAP_MAPPER_MEMBER(tile_scan_layer1); @@ -938,4 +941,7 @@ ROM_START( optiger ) ROM_LOAD( "e63-08_palce16v8h-15-4.ic49", 0x739, 0x117, CRC(c305c56d) SHA1(49592fa43c548ac6b08951d03677a3f23e9c8de8) ) ROM_END +} // anonymous namespace + + GAME( 1998, optiger, 0, taitopjc, taitopjc, taitopjc_state, init_optiger, ROT0, "Taito", "Operation Tiger (Ver 2.14 O)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND ) diff --git a/src/mame/taito/taitosjsec.h b/src/mame/taito/taitosjsec.h index 265305af26a..a6997d776d5 100644 --- a/src/mame/taito/taitosjsec.h +++ b/src/mame/taito/taitosjsec.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -#ifndef MAME_MACHINE_TAITSJSEC_H -#define MAME_MACHINE_TAITSJSEC_H +#ifndef MAME_TAITO_TAITSJSEC_H +#define MAME_TAITO_TAITSJSEC_H #pragma once @@ -91,4 +91,4 @@ private: bool m_busak, m_reset; }; -#endif // MAME_MACHINE_TATISJSEC_H +#endif // MAME_TAITO_TATISJSEC_H diff --git a/src/mame/taito/taitottl.cpp b/src/mame/taito/taitottl.cpp index 2c89fa22773..af540c8af34 100644 --- a/src/mame/taito/taitottl.cpp +++ b/src/mame/taito/taitottl.cpp @@ -69,6 +69,9 @@ #include "netlist/devices/net_lib.h" #include "video/fixfreq.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -435,6 +438,8 @@ ROM_START( srdchamp ) ROM_LOAD( "cs222_mr38.11j", 0x000, 0x100, CRC(fb775d23) SHA1(8dd3fca4d08c235c0999bd3623127331eed004d9) ) ROM_END +} // anonymous namespace + GAME( 1977, fisco400, 0, taitottl, 0, taitottl_state, empty_init, ROT0, "Taito", "Cisco/Fisco 400 [TTL]", MACHINE_IS_SKELETON ) GAME( 1977, gunman, 0, taitottl, 0, taitottl_state, empty_init, ROT0, "Taito", "Gunman [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/taito/taitotx.cpp b/src/mame/taito/taitotx.cpp index 74158a82a4b..6af7a3d20e2 100644 --- a/src/mame/taito/taitotx.cpp +++ b/src/mame/taito/taitotx.cpp @@ -153,6 +153,9 @@ TODO: #include "cpu/i386/i386.h" #include "machine/pci.h" + +namespace { + class taito_type_x_state : public driver_device { public: @@ -189,6 +192,7 @@ void taito_type_x_state::taito_type_x(machine_config &config) // ... } +} // anonymous namespace /*************************************************************************** diff --git a/src/mame/taito/tc0080vco.h b/src/mame/taito/tc0080vco.h index 34f804bda6b..660330c3897 100644 --- a/src/mame/taito/tc0080vco.h +++ b/src/mame/taito/tc0080vco.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0080VCO_H -#define MAME_VIDEO_TC0080VCO_H +#ifndef MAME_TAITO_TC0080VCO_H +#define MAME_TAITO_TC0080VCO_H #pragma once @@ -103,4 +103,4 @@ private: DECLARE_DEVICE_TYPE(TC0080VCO, tc0080vco_device) -#endif // MAME_VIDEO_TC0080VCO_H +#endif // MAME_TAITO_TC0080VCO_H diff --git a/src/mame/taito/tc0100scn.h b/src/mame/taito/tc0100scn.h index 11202989f1a..ed0938537d6 100644 --- a/src/mame/taito/tc0100scn.h +++ b/src/mame/taito/tc0100scn.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0100SCN_H -#define MAME_VIDEO_TC0100SCN_H +#ifndef MAME_TAITO_TC0100SCN_H +#define MAME_TAITO_TC0100SCN_H #pragma once @@ -140,4 +140,4 @@ private: DECLARE_DEVICE_TYPE(TC0100SCN, tc0100scn_device) DECLARE_DEVICE_TYPE(TC0620SCC, tc0620scc_device) -#endif // MAME_VIDEO_TC0100SCN_H +#endif // MAME_TAITO_TC0100SCN_H diff --git a/src/mame/taito/tc0110pcr.h b/src/mame/taito/tc0110pcr.h index 4a5f7c402b5..f41e93be152 100644 --- a/src/mame/taito/tc0110pcr.h +++ b/src/mame/taito/tc0110pcr.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0110PCR_H -#define MAME_VIDEO_TC0110PCR_H +#ifndef MAME_TAITO_TC0110PCR_H +#define MAME_TAITO_TC0110PCR_H #pragma once @@ -38,4 +38,4 @@ private: DECLARE_DEVICE_TYPE(TC0110PCR, tc0110pcr_device) -#endif // MAME_VIDEO_TC0110PCR_H +#endif // MAME_TAITO_TC0110PCR_H diff --git a/src/mame/taito/tc0150rod.h b/src/mame/taito/tc0150rod.h index 2b396e67ddd..0d7f1069715 100644 --- a/src/mame/taito/tc0150rod.h +++ b/src/mame/taito/tc0150rod.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0150ROD_H -#define MAME_VIDEO_TC0150ROD_H +#ifndef MAME_TAITO_TC0150ROD_H +#define MAME_TAITO_TC0150ROD_H #pragma once @@ -27,4 +27,4 @@ private: DECLARE_DEVICE_TYPE(TC0150ROD, tc0150rod_device) -#endif // MAME_VIDEO_TC0150ROD_H +#endif // MAME_TAITO_TC0150ROD_H diff --git a/src/mame/taito/tc0180vcu.h b/src/mame/taito/tc0180vcu.h index 4074742e582..d063c646fe8 100644 --- a/src/mame/taito/tc0180vcu.h +++ b/src/mame/taito/tc0180vcu.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0180VCU_H -#define MAME_VIDEO_TC0180VCU_H +#ifndef MAME_TAITO_TC0180VCU_H +#define MAME_TAITO_TC0180VCU_H #pragma once @@ -79,4 +79,4 @@ private: DECLARE_DEVICE_TYPE(TC0180VCU, tc0180vcu_device) -#endif // MAME_VIDEO_TC0180VCU_H +#endif // MAME_TAITO_TC0180VCU_H diff --git a/src/mame/taito/tc0280grd.h b/src/mame/taito/tc0280grd.h index 281e1befdc1..c3e7dc8b5b5 100644 --- a/src/mame/taito/tc0280grd.h +++ b/src/mame/taito/tc0280grd.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0280GRD_H -#define MAME_VIDEO_TC0280GRD_H +#ifndef MAME_TAITO_TC0280GRD_H +#define MAME_TAITO_TC0280GRD_H #pragma once @@ -54,4 +54,4 @@ DECLARE_DEVICE_TYPE(TC0280GRD, tc0280grd_device) #define TC0430GRW TC0280GRD -#endif // MAME_VIDEO_TC0280GRD_H +#endif // MAME_TAITO_TC0280GRD_H diff --git a/src/mame/taito/tc0360pri.h b/src/mame/taito/tc0360pri.h index 058cd070db1..bdee37b911a 100644 --- a/src/mame/taito/tc0360pri.h +++ b/src/mame/taito/tc0360pri.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0360PRI_H -#define MAME_VIDEO_TC0360PRI_H +#ifndef MAME_TAITO_TC0360PRI_H +#define MAME_TAITO_TC0360PRI_H #pragma once @@ -26,4 +26,4 @@ private: DECLARE_DEVICE_TYPE(TC0360PRI, tc0360pri_device) -#endif // MAME_VIDEO_TC0360PRI_H +#endif // MAME_TAITO_TC0360PRI_H diff --git a/src/mame/taito/tc0480scp.h b/src/mame/taito/tc0480scp.h index 21a09bf64bd..91ac5eca93a 100644 --- a/src/mame/taito/tc0480scp.h +++ b/src/mame/taito/tc0480scp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_TC0480SCP_H -#define MAME_VIDEO_TC0480SCP_H +#ifndef MAME_TAITO_TC0480SCP_H +#define MAME_TAITO_TC0480SCP_H #pragma once @@ -100,4 +100,4 @@ private: DECLARE_DEVICE_TYPE(TC0480SCP, tc0480scp_device) -#endif // MAME_VIDEO_TC0480SCP_H +#endif // MAME_TAITO_TC0480SCP_H diff --git a/src/mame/taito/tc0780fpa.h b/src/mame/taito/tc0780fpa.h index 2591b39d5f3..8def72602a9 100644 --- a/src/mame/taito/tc0780fpa.h +++ b/src/mame/taito/tc0780fpa.h @@ -1,8 +1,8 @@ // license:LGPL-2.1+ // copyright-holders:Ville Linde, Angelo Salese, hap -#ifndef MAME_VIDEO_TC0780FPA_H -#define MAME_VIDEO_TC0780FPA_H +#ifndef MAME_TAITO_TC0780FPA_H +#define MAME_TAITO_TC0780FPA_H #pragma once @@ -76,4 +76,4 @@ private: DECLARE_DEVICE_TYPE(TC0780FPA, tc0780fpa_device) -#endif // MAME_VIDEO_TC0780FPA_H +#endif // MAME_TAITO_TC0780FPA_H diff --git a/src/mame/tangerine/alphatan.cpp b/src/mame/tangerine/alphatan.cpp index 0bf5eb7ed1f..1f4a48f299f 100644 --- a/src/mame/tangerine/alphatan.cpp +++ b/src/mame/tangerine/alphatan.cpp @@ -39,6 +39,8 @@ #include "screen.h" +namespace { + class alphatan_state : public driver_device { public: @@ -226,6 +228,8 @@ ROM_START(alphatan) ROM_LOAD("tantel2732.bin", 0x0000, 0x1000, CRC(875c1ce9) SHA1(76e874cbc5d1341b09f57424181f24bdb31da210)) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1981, alphatan, 0, 0, alphatan, alphatan, alphatan_state, empty_init, "Tantel", "AlphaTantel", MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING ) diff --git a/src/mame/tangerine/hhtiger.cpp b/src/mame/tangerine/hhtiger.cpp index 739887f9377..410d0a9a1e3 100644 --- a/src/mame/tangerine/hhtiger.cpp +++ b/src/mame/tangerine/hhtiger.cpp @@ -56,6 +56,8 @@ Operating system: CP/M #include "logmacro.h" +namespace { + class hhtiger_state : public driver_device { public: @@ -593,6 +595,8 @@ ROM_START(hhtiger) ROMX_LOAD("rel1.3-77c1.ic15", 0x2000, 0x2000, CRC(dd2f15d5) SHA1(139a2b97cb8c27a50e3bfa3f42a9572203e453e0), ROM_BIOS(1)) ROM_END +} // anonymous namespace + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1983, hhtiger, 0, 0, hhtiger, hhtiger, hhtiger_state, empty_init, "H/H Microcomputers", "H/H Tiger", MACHINE_IS_SKELETON ) diff --git a/src/mame/tangerine/oric.cpp b/src/mame/tangerine/oric.cpp index bd16f31a4d3..1f596aef3cc 100644 --- a/src/mame/tangerine/oric.cpp +++ b/src/mame/tangerine/oric.cpp @@ -44,6 +44,8 @@ #include "formats/oric_tap.h" +namespace { + class oric_state : public driver_device { public: @@ -998,6 +1000,8 @@ ROM_START(prav8dd) // ROM_LOAD_OPTIONAL( "8ddoshi.rom", 0x014100, 0x0200, CRC(66309641) SHA1(9c2e82b3c4d385ade6215fcb89f8b92e6fd2bf4b) ) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1983, oric1, 0, 0, oric, oric, oric_state, empty_init, "Tangerine", "Oric 1" , MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/tatsumi/kingdrby.cpp b/src/mame/tatsumi/kingdrby.cpp index 2183b938fcc..a0305a77b66 100644 --- a/src/mame/tatsumi/kingdrby.cpp +++ b/src/mame/tatsumi/kingdrby.cpp @@ -88,6 +88,8 @@ sg1_b.e1 4096 0x92ef3c13 D2732D #include "kingdrby.lh" +namespace { + class kingdrby_state : public driver_device { public: @@ -1236,6 +1238,8 @@ ROM_START( kingdrbb2 ) ROM_LOAD( "clr", 0x000, 0x200, CRC(ffabacc9) SHA1(9769fb27fc5b6998e6600cb6050086385caa3f96) ) ROM_END +} // anonymous namespace + GAMEL( 1981, kingdrby, 0, kingdrby, kingdrby, kingdrby_state, empty_init, ROT0, "Tazmi", "King Derby (1981)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND, layout_kingdrby ) GAME( 1986, kingdrbb, kingdrby, kingdrbb, kingdrbb, kingdrby_state, empty_init, ROT0, "bootleg (Casino Electronics)", "King Derby (Taiwan bootleg)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_COLORS ) diff --git a/src/mame/tatsumi/tx1_a.h b/src/mame/tatsumi/tx1_a.h index 8d8e4d49739..8403a55804a 100644 --- a/src/mame/tatsumi/tx1_a.h +++ b/src/mame/tatsumi/tx1_a.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_AUDIO_TX1_H -#define MAME_AUDIO_TX1_H +#ifndef MAME_TATSUMI_TX1_H +#define MAME_TATSUMI_TX1_H #pragma once @@ -192,4 +192,4 @@ DECLARE_DEVICE_TYPE(TX1J_SOUND, tx1j_sound_device) DECLARE_DEVICE_TYPE(BUGGYBOY_SOUND, buggyboy_sound_device) DECLARE_DEVICE_TYPE(BUGGYBOYJR_SOUND, buggyboyjr_sound_device) -#endif // MAME_AUDIO_TX1_H +#endif // MAME_TATSUMI_TX1_H diff --git a/src/mame/tatung/einstein.cpp b/src/mame/tatung/einstein.cpp index 7fbbda192a3..9bb3ca54af6 100644 --- a/src/mame/tatung/einstein.cpp +++ b/src/mame/tatung/einstein.cpp @@ -41,6 +41,8 @@ #include "speaker.h" +namespace { + /*************************************************************************** CONSTANTS ***************************************************************************/ @@ -1061,6 +1063,8 @@ ROM_START( einst256 ) ROM_LOAD("mos21.i008", 0x0000, 0x4000, CRC(d1bb5efc) SHA1(9168df70af6746c88748049d1b9d119a29e605de) ) ROM_END +} // anonymous namespace + /*************************************************************************** GAME DRIVERS diff --git a/src/mame/tch/wheelfir.cpp b/src/mame/tch/wheelfir.cpp index 2d02c34c8c1..d3339991985 100644 --- a/src/mame/tch/wheelfir.cpp +++ b/src/mame/tch/wheelfir.cpp @@ -179,6 +179,8 @@ BIT N - ( scale < 50% ) ? 1 : 0 #include "speaker.h" +namespace { + static const int ZOOM_TABLE_SIZE=1<<14; static const int NUM_SCANLINES=256-8; static const int NUM_VBLANK_LINES=8; @@ -783,4 +785,7 @@ ROM_START( wheelfir ) ROM_LOAD16_WORD_SWAP( "eeprom", 0x000000, 0x000080, CRC(961e4bc9) SHA1(8944504bf56a272e9aa08185e73c6b4212d52383) ) ROM_END +} // anonymous namespace + + GAME( 199?, wheelfir, 0, wheelfir, wheelfir, wheelfir_state, empty_init, ROT0, "TCH", "Wheels & Fire", MACHINE_IMPERFECT_GRAPHICS) diff --git a/src/mame/tecmo/tecmo_mix.h b/src/mame/tecmo/tecmo_mix.h index 69b3d5ef326..50fcefb9958 100644 --- a/src/mame/tecmo/tecmo_mix.h +++ b/src/mame/tecmo/tecmo_mix.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood /* Tecmo Mixer */ -#ifndef MAME_VIDEO_TECMO_MIX_H -#define MAME_VIDEO_TECMO_MIX_H +#ifndef MAME_TECMO_TECMO_MIX_H +#define MAME_TECMO_TECMO_MIX_H #pragma once @@ -84,4 +84,4 @@ DECLARE_DEVICE_TYPE(TECMO_MIXER, tecmo_mix_device) -#endif // MAME_VIDEO_TECMO_MIX_H +#endif // MAME_TECMO_TECMO_MIX_H diff --git a/src/mame/tektronix/tek410x.cpp b/src/mame/tektronix/tek410x.cpp index 8329a9729b8..5b5e4835df6 100644 --- a/src/mame/tektronix/tek410x.cpp +++ b/src/mame/tektronix/tek410x.cpp @@ -18,6 +18,8 @@ #include "screen.h" +namespace { + class tek4107a_state : public driver_device { public: @@ -371,6 +373,9 @@ ROM_START( tek4109a ) ROM_LOAD( "160-3087 v1.0.u855", 0x0000, 0x1000, CRC(97479528) SHA1(e9e15f1f64b3b6bd139accd51950bae71fdc2193) ) ROM_END +} // anonymous namespace + + /* System Drivers */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/tektronix/tek410x_kbd.h b/src/mame/tektronix/tek410x_kbd.h index 095f7648094..47b841cd5e9 100644 --- a/src/mame/tektronix/tek410x_kbd.h +++ b/src/mame/tektronix/tek410x_kbd.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_MACHINE_TEK410X_KEYBOARD_H -#define MAME_MACHINE_TEK410X_KEYBOARD_H +#ifndef MAME_TEKTRONIX_TEK410X_KEYBOARD_H +#define MAME_TEKTRONIX_TEK410X_KEYBOARD_H #pragma once @@ -66,4 +66,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(TEK410X_KEYBOARD, tek410x_keyboard_device) -#endif // MAME_MACHINE_TEK410X_KEYBOARD_H +#endif // MAME_TEKTRONIX_TEK410X_KEYBOARD_H diff --git a/src/mame/tektronix/tek440x.cpp b/src/mame/tektronix/tek440x.cpp index 1f9916f8a4a..02b77a6df42 100644 --- a/src/mame/tektronix/tek440x.cpp +++ b/src/mame/tektronix/tek440x.cpp @@ -59,6 +59,8 @@ #include "speaker.h" +namespace { + class tek440x_state : public driver_device { public: @@ -424,6 +426,9 @@ ROM_START( tek4404 ) ROM_LOAD( "scsi_mfm.bin", 0x000000, 0x002000, CRC(b4293435) SHA1(5e2b96c19c4f5c63a5afa2de504d29fe64a4c908) ) ROM_END +} // anonymous namespace + + /************************************* * * Game driver(s) diff --git a/src/mame/tektronix/tekxp33x.cpp b/src/mame/tektronix/tekxp33x.cpp index ed2e4bb74f1..fc78a08dc6f 100644 --- a/src/mame/tektronix/tekxp33x.cpp +++ b/src/mame/tektronix/tekxp33x.cpp @@ -42,6 +42,8 @@ #include "screen.h" +namespace { + #define SCREEN_TAG "screen" class tekxp330_state : public driver_device @@ -126,6 +128,9 @@ ROM_START( tekxp330 ) ROM_LOAD32_DWORD( "xp300.bin", 0x000000, 0x200000, CRC(9a324588) SHA1(a6e10275f8215f446be91128bab4c643693da653) ) ROM_END +} // anonymous namespace + + /* System Drivers */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/telenova/compis.cpp b/src/mame/telenova/compis.cpp index 4643249e468..5f6c9731193 100644 --- a/src/mame/telenova/compis.cpp +++ b/src/mame/telenova/compis.cpp @@ -66,6 +66,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + #define I80186_TAG "ic1" #define I80130_TAG "ic15" #define I8251A_TAG "ic59" @@ -874,6 +877,7 @@ ROM_END #define rom_compis2 rom_compis +} // anonymous namespace //************************************************************************** diff --git a/src/mame/televideo/ts3000.cpp b/src/mame/televideo/ts3000.cpp index 65fdb5d6312..7233cff98ad 100644 --- a/src/mame/televideo/ts3000.cpp +++ b/src/mame/televideo/ts3000.cpp @@ -13,6 +13,9 @@ There are 25-pin serial and parallel ports, and a FDC connector. There's an undu #include "emu.h" #include "cpu/i86/i86.h" + +namespace { + class ts3000_state : public driver_device { public: @@ -55,4 +58,7 @@ ROM_START( ts3000 ) ROM_LOAD( "u25 ver 2.03 bios d.u25", 0x0000, 0x4000, CRC(abaff64c) SHA1(b2f0e73d2a25a03d5bac558580919bd0400f4fcf) ) // The D at the end is handwritten ROM_END +} // anonymous namespace + + COMP( 198?, ts3000, 0, 0, ts3000, ts3000, ts3000_state, empty_init, "Televideo", "TS-3000", MACHINE_IS_SKELETON ) diff --git a/src/mame/televideo/ts802.cpp b/src/mame/televideo/ts802.cpp index f75d4d0df89..471681d8cae 100644 --- a/src/mame/televideo/ts802.cpp +++ b/src/mame/televideo/ts802.cpp @@ -31,6 +31,9 @@ #include "machine/z80sio.h" #include "machine/wd_fdc.h" + +namespace { + class ts802_state : public driver_device { public: @@ -241,6 +244,9 @@ ROM_START( ts802h ) ROM_LOAD( "800000-002a.a67", 0x0800, 0x0800, CRC(4b6c6e29) SHA1(c236e4625bc16062154cbebc4dbc8d62183ef9ab) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/televideo/ts803.cpp b/src/mame/televideo/ts803.cpp index 1f229a57f29..69683ffb8ce 100644 --- a/src/mame/televideo/ts803.cpp +++ b/src/mame/televideo/ts803.cpp @@ -60,6 +60,8 @@ PAGE SEL bit in PORT0 set to 1: #include "screen.h" +namespace { + class ts803_state : public driver_device { public: @@ -482,6 +484,7 @@ ROM_START( ts803h ) ROM_LOAD( "803h_vid.a119", 0x0000, 0x0800, CRC(d5ce2814) SHA1(ce527479464757223dffac384a85ab74b174952c) ) ROM_END +} // anonymous namespace // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/televideo/ts816.cpp b/src/mame/televideo/ts816.cpp index 1ff3c43ab21..d20201d7d6f 100644 --- a/src/mame/televideo/ts816.cpp +++ b/src/mame/televideo/ts816.cpp @@ -26,6 +26,9 @@ TODO: #include "machine/z80sio.h" #include "machine/z80dma.h" + +namespace { + class ts816_state : public driver_device { public: @@ -321,6 +324,9 @@ ROM_START( ts816 ) ROM_REGION(0x20000, "rams", ROMREGION_ERASEFF) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/televideo/tv910.cpp b/src/mame/televideo/tv910.cpp index 30b3c43abad..6b407bc6509 100644 --- a/src/mame/televideo/tv910.cpp +++ b/src/mame/televideo/tv910.cpp @@ -38,6 +38,9 @@ #include "utf8.h" + +namespace { + #define ACIA_TAG "acia" #define CRTC_TAG "crtc" #define RS232_TAG "rs232" @@ -576,6 +579,9 @@ ROM_START( tv910 ) ROM_LOAD( "1800000-019b_bell_a2_43d6.bin", 0x000000, 0x000800, CRC(de954a77) SHA1(c4f7c19799c15d12d89f08dc31064fc6be9befb0) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1981, tv910, 0, 0, tv910, tv910, tv910_state, empty_init, "TeleVideo Systems", "TeleVideo Model 910", 0 ) diff --git a/src/mame/televideo/tv924.cpp b/src/mame/televideo/tv924.cpp index 31d51bc3ace..c5ad001e451 100644 --- a/src/mame/televideo/tv924.cpp +++ b/src/mame/televideo/tv924.cpp @@ -16,6 +16,9 @@ #include "video/scn2674.h" #include "screen.h" + +namespace { + class tv924_state : public driver_device { public: @@ -95,4 +98,7 @@ ROM_START(tv924) ROM_LOAD("d8049hc.bin", 0x000, 0x800, NO_DUMP) ROM_END +} // anonymous namespace + + COMP(1984, tv924, 0, 0, tv924, tv924, tv924_state, empty_init, "TeleVideo Systems", "TeleVideo 924 Video Display Terminal", MACHINE_IS_SKELETON) diff --git a/src/mame/televideo/tv950.cpp b/src/mame/televideo/tv950.cpp index b6dc2a4e8e3..881e4a75e81 100644 --- a/src/mame/televideo/tv950.cpp +++ b/src/mame/televideo/tv950.cpp @@ -46,6 +46,9 @@ #include "video/mc6845.h" #include "screen.h" + +namespace { + #define MASTER_CLOCK XTAL(23'814'000) class tv950_state : public driver_device @@ -360,6 +363,9 @@ ROM_START( tv950 ) ROM_LOAD( "1800000-002a.a33", 0x0000, 0x1000, CRC(856dd85c) SHA1(e2570017e098b0e1ead7749e9c2ac40be2367433) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1981, tv950, 0, 0, tv950, tv950, tv950_state, empty_init, "TeleVideo", "Model 950 Video Display Terminal", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/televideo/tv950kb.h b/src/mame/televideo/tv950kb.h index 319f690b363..0a9ebb5a51a 100644 --- a/src/mame/televideo/tv950kb.h +++ b/src/mame/televideo/tv950kb.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_MACHINE_TV950KB_H -#define MAME_MACHINE_TV950KB_H +#ifndef MAME_TELEVIDEO_TV950KB_H +#define MAME_TELEVIDEO_TV950KB_H #pragma once @@ -52,4 +52,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TV950_KEYBOARD, tv950kb_device) -#endif // MAME_MACHINE_TV950KB_H +#endif // MAME_TELEVIDEO_TV950KB_H diff --git a/src/mame/televideo/tv955.cpp b/src/mame/televideo/tv955.cpp index 2196dcc9b17..20b8e58bb1e 100644 --- a/src/mame/televideo/tv955.cpp +++ b/src/mame/televideo/tv955.cpp @@ -16,6 +16,9 @@ Skeleton driver for "third generation" TeleVideo terminals (905, 955, 9220). #include "video/scn2674.h" #include "screen.h" + +namespace { + class tv955_state : public driver_device { public: @@ -219,4 +222,7 @@ ROM_START( tv955 ) ROM_LOAD( "t180002-26b.u45", 0x0000, 0x1000, CRC(69c9ebc7) SHA1(32282c816ec597a7c45e939acb7a4155d35ea584) ) ROM_END +} // anonymous namespace + + COMP( 1985, tv955, 0, 0, tv955, tv955, tv955_state, empty_init, "TeleVideo Systems", "TeleVideo 955", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/televideo/tv955kb.h b/src/mame/televideo/tv955kb.h index 8b45986b622..e054cb628b6 100644 --- a/src/mame/televideo/tv955kb.h +++ b/src/mame/televideo/tv955kb.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_MACHINE_TV955KB_H -#define MAME_MACHINE_TV955KB_H +#ifndef MAME_TELEVIDEO_TV955KB_H +#define MAME_TELEVIDEO_TV955KB_H #pragma once @@ -60,4 +60,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TV955_KEYBOARD, tv955kb_device) -#endif // MAME_MACHINE_TV955KB_H +#endif // MAME_TELEVIDEO_TV955KB_H diff --git a/src/mame/televideo/tv965.cpp b/src/mame/televideo/tv965.cpp index d70c580e230..f307f69dd24 100644 --- a/src/mame/televideo/tv965.cpp +++ b/src/mame/televideo/tv965.cpp @@ -16,6 +16,9 @@ TeleVideo 9320 appears to run on similar hardware with a 2681 DUART replacing th #include "video/scn2674.h" #include "screen.h" + +namespace { + class tv965_state : public driver_device { public: @@ -112,4 +115,7 @@ ROM_START( tv965 ) ROM_LOAD( "180003-38h.u9", 0x00000, 0x08000, CRC(30fae408) SHA1(f05bb2a9ce2df60b046733f746d8d8a1eb3ac8bc) ) ROM_END +} // anonymous namespace + + COMP( 1989, tv965, 0, 0, tv965, tv965, tv965_state, empty_init, "TeleVideo Systems", "TeleVideo 965", MACHINE_IS_SKELETON ) diff --git a/src/mame/televideo/tv990.cpp b/src/mame/televideo/tv990.cpp index 07a86a293da..1231ab30dd9 100644 --- a/src/mame/televideo/tv990.cpp +++ b/src/mame/televideo/tv990.cpp @@ -42,6 +42,8 @@ #include "speaker.h" +namespace { + #define RS232A_TAG "rs232a" #define RS232B_TAG "rs232b" #define LPT_TAG "lpt" @@ -435,6 +437,9 @@ ROM_START( tv995 ) ROM_LOAD16_BYTE( "995-65_u4.bin", 0x000001, 0x020000, CRC(dc002af2) SHA1(9608e7a729c5ac0fc58f673eaf441d2f4f591ec6) ) ROM_END +} // anonymous namespace + + /* Driver */ COMP( 1992, tv990, 0, 0, tv990, tv990, tv990_state, empty_init, "TeleVideo", "TeleVideo 990", MACHINE_SUPPORTS_SAVE ) COMP( 1994, tv995, 0, 0, tv990, tv990, tv990_state, empty_init, "TeleVideo", "TeleVideo 995-65", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/tesla/pmi80.cpp b/src/mame/tesla/pmi80.cpp index a8f2a72d3c4..5f7b0a3ad6e 100644 --- a/src/mame/tesla/pmi80.cpp +++ b/src/mame/tesla/pmi80.cpp @@ -41,6 +41,9 @@ Paste test: #include "speaker.h" #include "pmi80.lh" + +namespace { + class pmi80_state : public driver_device { public: @@ -243,6 +246,9 @@ ROM_START( pmi80 ) //ROM_LOAD("expansion.io11", 0x0400, 0x0400, NO_DUMP) Empty ROM socket ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ti/733_asr.h b/src/mame/ti/733_asr.h index a15bf0e0037..b047683b712 100644 --- a/src/mame/ti/733_asr.h +++ b/src/mame/ti/733_asr.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Raphael Nabet -#ifndef MAME_VIDEO_733_ASR -#define MAME_VIDEO_733_ASR +#ifndef MAME_TI_733_ASR +#define MAME_TI_733_ASR #pragma once @@ -79,4 +79,4 @@ private: DECLARE_DEVICE_TYPE(ASR733, asr733_device) -#endif // MAME_VIDEO_733_ASR +#endif // MAME_TI_733_ASR diff --git a/src/mame/ti/911_vdt.h b/src/mame/ti/911_vdt.h index 7b45480124c..f9d8c712055 100644 --- a/src/mame/ti/911_vdt.h +++ b/src/mame/ti/911_vdt.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Raphael Nabet -#ifndef MAME_VIDEO_911_VDT_H -#define MAME_VIDEO_911_VDT_H +#ifndef MAME_TI_911_VDT_H +#define MAME_TI_911_VDT_H #pragma once @@ -112,4 +112,4 @@ private: DECLARE_DEVICE_TYPE(VDT911, vdt911_device) -#endif // MAME_VIDEO_911_VDT_H +#endif // MAME_TI_911_VDT_H diff --git a/src/mame/ti/evmbug.cpp b/src/mame/ti/evmbug.cpp index 35a004aec09..8e0775ed1ab 100644 --- a/src/mame/ti/evmbug.cpp +++ b/src/mame/ti/evmbug.cpp @@ -32,6 +32,8 @@ http://www.stuartconner.me.uk/tms9995_breadboard/tms9995_breadboard.htm #include "machine/terminal.h" +namespace { + class evmbug_state : public driver_device { public: @@ -191,6 +193,9 @@ ROM_START( tms9995bb ) ROMX_LOAD( "test3.bin", 0x0000, 0x8000, CRC(a28579eb) SHA1(477f853970f132592714bcdd048ec932e96c8593), ROM_BIOS(6) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ti/exelv.cpp b/src/mame/ti/exelv.cpp index 40765b98e28..3af4016175d 100644 --- a/src/mame/ti/exelv.cpp +++ b/src/mame/ti/exelv.cpp @@ -119,6 +119,8 @@ TODO: #include "logmacro.h" +namespace { + class exelv_state : public driver_device { public: @@ -961,6 +963,8 @@ ROM_START(exeltel) ROM_LOAD("cm62312.bin", 0x0000, 0x4000, CRC(93b817de) SHA1(03863087a071b8f22d36a52d18243f1c33e17ff7)) /* system speech ROM */ ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP(1984, exl100, 0, 0, exl100, exelv, exelv_state, empty_init, "Exelvision", "EXL 100", MACHINE_NOT_WORKING) diff --git a/src/mame/ti/geneve.cpp b/src/mame/ti/geneve.cpp index 4f1ebdc96e1..6bcd41dc156 100644 --- a/src/mame/ti/geneve.cpp +++ b/src/mame/ti/geneve.cpp @@ -205,6 +205,9 @@ #include "logmacro.h" + +namespace { + #define GENEVE_SRAM_TAG "sram" #define GENEVE_SRAMX_TAG "sramexp" #define GENEVE_DRAM_TAG "dram" @@ -1267,6 +1270,9 @@ ROM_START(genmod) ROMX_LOAD("gnmbt200.bin", 0x0000, 0x4000, CRC(0a66c714) SHA1(139ed03d365b21123295cd99c73736ee424dbb74), ROM_BIOS(1)) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1987, geneve, 0, 0, geneve, geneve, geneve_state, init_geneve, "Myarc", "Geneve 9640", MACHINE_SUPPORTS_SAVE) COMP( 1990, genmod, 0, 0, genmod, genmod, geneve_state, init_genmod, "Myarc / Ron G. Walters", "Geneve 9640 Mod", MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/ti/ti931.cpp b/src/mame/ti/ti931.cpp index aabcfe9839e..a0ea9f24916 100644 --- a/src/mame/ti/ti931.cpp +++ b/src/mame/ti/ti931.cpp @@ -15,6 +15,9 @@ #include "video/scn2674.h" #include "screen.h" + +namespace { + class ti931_state : public driver_device { public: @@ -140,5 +143,8 @@ ROM_START(ti931) ROM_LOAD("2229199-2_xu1.bin", 0x0000, 0x0800, CRC(f76bb2bb) SHA1(57ec0392a2b5798eef43f0408347402c2941cee1)) // 01/29/85 CTE ROM_END +} // anonymous namespace + + COMP(1983, ti931, 0, 0, ti931, ti931, ti931_state, empty_init, "Texas Instruments", "Model 931 Video Display Terminal", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND) diff --git a/src/mame/ti/ti990_10.cpp b/src/mame/ti/ti990_10.cpp index c65b24bd518..d197514438b 100644 --- a/src/mame/ti/ti990_10.cpp +++ b/src/mame/ti/ti990_10.cpp @@ -78,6 +78,8 @@ TODO : #include "911_vdt.h" +namespace { + class ti990_10_state : public driver_device { public: @@ -102,7 +104,7 @@ private: WRITE_LINE_MEMBER( line_interrupt ); WRITE_LINE_MEMBER( tape_interrupt ); WRITE_LINE_MEMBER( set_int13 ); - WRITE_LINE_MEMBER( ckon_ckof_callback ); + [[maybe_unused]] WRITE_LINE_MEMBER( ckon_ckof_callback ); uint8_t panel_read(offs_t offset); void panel_write(uint8_t data); @@ -398,5 +400,8 @@ ROM_START(ti990_10) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1975, ti990_10, 0, 0, ti990_10, 0, ti990_10_state, empty_init, "Texas Instruments", "TI Model 990/10 Minicomputer System", MACHINE_NOT_WORKING ) diff --git a/src/mame/ti/ti990_4.cpp b/src/mame/ti/ti990_4.cpp index e56598800d6..69da44fb49c 100644 --- a/src/mame/ti/ti990_4.cpp +++ b/src/mame/ti/ti990_4.cpp @@ -47,6 +47,8 @@ TODO: #include "bus/ti99x/990_dk.h" +namespace { + class ti990_4_state : public driver_device { public: @@ -357,6 +359,9 @@ ROM_START(ti990_4v) ROM_REGION(vdt911_device::chr_region_len, vdt911_chr_region, ROMREGION_ERASEFF) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1976, ti990_4, 0, 0, ti990_4, 0, ti990_4_state, empty_init, "Texas Instruments", "TI Model 990/4 Microcomputer System", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) COMP( 1976, ti990_4v, ti990_4, 0, ti990_4v, 0, ti990_4_state, empty_init, "Texas Instruments", "TI Model 990/4 Microcomputer System with Video Display Terminal", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/ti/ti99_4x.cpp b/src/mame/ti/ti99_4x.cpp index d2caef21afc..8fd14328ed7 100644 --- a/src/mame/ti/ti99_4x.cpp +++ b/src/mame/ti/ti99_4x.cpp @@ -71,6 +71,9 @@ #include "logmacro.h" + +namespace { + /* The console. */ @@ -132,11 +135,11 @@ private: // Connections from outside towards the CPU (callbacks) DECLARE_WRITE_LINE_MEMBER( console_ready_dmux ); DECLARE_WRITE_LINE_MEMBER( console_ready_sound ); - DECLARE_WRITE_LINE_MEMBER( console_ready_pbox ); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( console_ready_pbox ); DECLARE_WRITE_LINE_MEMBER( console_ready_cart ); DECLARE_WRITE_LINE_MEMBER( console_ready_grom ); DECLARE_WRITE_LINE_MEMBER( console_reset ); - DECLARE_WRITE_LINE_MEMBER( notconnected ); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER( notconnected ); // GROM clock DECLARE_WRITE_LINE_MEMBER( gromclk_in ); @@ -1192,6 +1195,9 @@ ROM_START(ti99_4ev) ROM_LOAD("994a_grom2.u502", 0x4000, 0x1800, CRC(e0bb5341) SHA1(e255f0d65d69b927cecb8fcfac7a4c17d585ea96)) /* system GROM 2 */ ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1979, ti99_4, 0, 0, ti99_4_60hz, ti99_4, ti99_4x_state, empty_init, "Texas Instruments", "TI-99/4 Home Computer (US)", MACHINE_SUPPORTS_SAVE) COMP( 1980, ti99_4e, ti99_4, 0, ti99_4_50hz, ti99_4, ti99_4x_state, empty_init, "Texas Instruments", "TI-99/4 Home Computer (Europe)", MACHINE_SUPPORTS_SAVE) diff --git a/src/mame/tigertel/docg3.h b/src/mame/tigertel/docg3.h index 8c7c7caf659..8c097188af8 100644 --- a/src/mame/tigertel/docg3.h +++ b/src/mame/tigertel/docg3.h @@ -8,8 +8,8 @@ */ -#ifndef MAME_MACHINE_DOCG3_H -#define MAME_MACHINE_DOCG3_H +#ifndef MAME_TIGERTEL_DOCG3_H +#define MAME_TIGERTEL_DOCG3_H #pragma once @@ -97,4 +97,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(DISKONCHIP_G3, diskonchip_g3_device) -#endif // MAME_MACHINE_DOCG3_H +#endif // MAME_TIGERTEL_DOCG3_H diff --git a/src/mame/tigertel/gizmondo.cpp b/src/mame/tigertel/gizmondo.cpp index c1f2c0ca166..bd40626dbd2 100644 --- a/src/mame/tigertel/gizmondo.cpp +++ b/src/mame/tigertel/gizmondo.cpp @@ -37,6 +37,8 @@ SYSINTR_GPS = INT_EINT3, INT_EINT8_23 (EINT18) #include "screen.h" +namespace { + #define BITS(x,m,n) (((x)>>(n))&(((uint32_t)1<<((m)-(n)+1))-1)) class gizmondo_state : public driver_device @@ -237,4 +239,7 @@ ROM_START( gizmondo ) ROMX_LOAD( "fboot.bin", 0, 0x800, CRC(28887c29) SHA1(e625caaa63b9db74cb6d7499dce12ac758c5fe76), ROM_BIOS(0) ) ROM_END +} // anonymous namespace + + CONS(2005, gizmondo, 0, 0, gizmondo, gizmondo, gizmondo_state, init_gizmondo, "Tiger Telematics", "Gizmondo", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/toaplan/gp9001.h b/src/mame/toaplan/gp9001.h index 157dfd3cc6f..66b06d169df 100644 --- a/src/mame/toaplan/gp9001.h +++ b/src/mame/toaplan/gp9001.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Quench, David Haywood /* GP9001 Video Controller */ -#ifndef MAME_VIDEO_GP9001_H -#define MAME_VIDEO_GP9001_H +#ifndef MAME_TOAPLAN_GP9001_H +#define MAME_TOAPLAN_GP9001_H #pragma once @@ -151,4 +151,4 @@ private: DECLARE_DEVICE_TYPE(GP9001_VDP, gp9001vdp_device) -#endif // MAME_VIDEO_GP9001_H +#endif // MAME_TOAPLAN_GP9001_H diff --git a/src/mame/toaplan/mjsister.cpp b/src/mame/toaplan/mjsister.cpp index 3cc21ff6559..1e6fb0ef3bc 100644 --- a/src/mame/toaplan/mjsister.cpp +++ b/src/mame/toaplan/mjsister.cpp @@ -19,6 +19,8 @@ #include "speaker.h" +namespace { + #define MCLK 12000000 @@ -494,6 +496,8 @@ ROM_START( mjsister ) ROM_LOAD( "ms08.bpr", 0x0300, 0x0100, CRC(da2b3b38) SHA1(4de99c17b227653bc1b904f1309f447f5a0ab516) ) // ? ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/toaplan/toaplan_scu.h b/src/mame/toaplan/toaplan_scu.h index 6bbb89a7a7b..12a0f73e63b 100644 --- a/src/mame/toaplan/toaplan_scu.h +++ b/src/mame/toaplan/toaplan_scu.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Quench /* toaplan SCU */ -#ifndef MAME_VIDEO_TOAPLAN_SCU_H -#define MAME_VIDEO_TOAPLAN_SCU_H +#ifndef MAME_TOAPLAN_TOAPLAN_SCU_H +#define MAME_TOAPLAN_TOAPLAN_SCU_H #pragma once @@ -42,4 +42,4 @@ private: DECLARE_DEVICE_TYPE(TOAPLAN_SCU, toaplan_scu_device) -#endif // MAME_VIDEO_TOAPLAN_SCU_H +#endif // MAME_TOAPLAN_TOAPLAN_SCU_H diff --git a/src/mame/tomy/tomy_princ.cpp b/src/mame/tomy/tomy_princ.cpp index c003788abe3..46b871fdded 100644 --- a/src/mame/tomy/tomy_princ.cpp +++ b/src/mame/tomy/tomy_princ.cpp @@ -55,6 +55,9 @@ #include "bus/generic/slot.h" #include "bus/generic/carts.h" + +namespace { + class tomy_princ_state : public driver_device { public: @@ -161,4 +164,7 @@ ROM_START( princ ) ROM_LOAD("29f800t.u4", 0x00000, 0x100000, CRC(30b6b864) SHA1(7ada3af85dd8dd3f95ca8965ad8e642c26445293)) ROM_END +} // anonymous namespace + + COMP( 1996?, princ, 0, 0, tomy_princ, tomy_princ, tomy_princ_state, empty_init, "Tomy", "Prin-C", MACHINE_IS_SKELETON ) diff --git a/src/mame/toshiba/paso1600.cpp b/src/mame/toshiba/paso1600.cpp index d2e259d08d9..fd05dd99833 100644 --- a/src/mame/toshiba/paso1600.cpp +++ b/src/mame/toshiba/paso1600.cpp @@ -19,6 +19,8 @@ #include "screen.h" +namespace { + class paso1600_state : public driver_device { public: @@ -338,6 +340,8 @@ ROM_START( paso1600 ) ROM_LOAD( "kanji.rom", 0x0000, 0x20000, NO_DUMP) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 198?, paso1600, 0, 0, paso1600, paso1600, paso1600_state, empty_init, "Toshiba", "Pasopia 1600", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/trainer/amico2k.cpp b/src/mame/trainer/amico2k.cpp index 96877b7a607..937906e3aef 100644 --- a/src/mame/trainer/amico2k.cpp +++ b/src/mame/trainer/amico2k.cpp @@ -38,6 +38,8 @@ #include "amico2k.lh" +namespace { + class amico2k_state : public driver_device { public: @@ -246,6 +248,8 @@ ROM_START( amico2k ) ROM_LOAD( "prom.ic7", 0x100, 0x100, CRC(8785d864) SHA1(d169c3b5f5690664083030948db9f33571b08656) ) ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/trainer/babbage.cpp b/src/mame/trainer/babbage.cpp index e24a0756d9f..1d20dd3a994 100644 --- a/src/mame/trainer/babbage.cpp +++ b/src/mame/trainer/babbage.cpp @@ -29,6 +29,9 @@ #include "video/pwm.h" #include "babbage.lh" + +namespace { + #define MAIN_CLOCK 25e5 class babbage_state : public driver_device @@ -278,6 +281,8 @@ ROM_START(babbage) ROM_LOAD("mon.rom", 0x0000, 0x0200, CRC(469bd607) SHA1(8f3489a0f96de6a03b05c1ee01b89d9848f4b152) ) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1986, babbage, 0, 0, babbage, babbage, babbage_state, empty_init, "Mr Takafumi Aihara", "Babbage-2nd", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/trainer/bob85.cpp b/src/mame/trainer/bob85.cpp index 141502272e9..b5ea57fb2f1 100644 --- a/src/mame/trainer/bob85.cpp +++ b/src/mame/trainer/bob85.cpp @@ -30,6 +30,8 @@ Test Paste: #include "bob85.lh" +namespace { + class bob85_state : public driver_device { public: @@ -256,6 +258,9 @@ ROM_START( bob85 ) ROM_LOAD( "bob85.rom", 0x0000, 0x0300, BAD_DUMP CRC(adde33a8) SHA1(00f26dd0c52005e7705e6cc9cb11a20e572682c6) ) // should be 6 separate 74S287's (256x4) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/trainer/crei680.cpp b/src/mame/trainer/crei680.cpp index f6645efa3d5..21d4b80b787 100644 --- a/src/mame/trainer/crei680.cpp +++ b/src/mame/trainer/crei680.cpp @@ -41,6 +41,8 @@ TODO: #include "crei680.lh" +namespace { + class crei680_state : public driver_device { public: @@ -335,5 +337,8 @@ ROM_START( crei680 ) ROM_LOAD( "mcm6674p.u9", 0x0000, 0x0400, CRC(1c22088a) SHA1(b5f0bd0cfdec0cd5c1cb764506bef3c17d6af0eb) ) // video board ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 19??, crei680, 0, 0, crei680, crei680, crei680_state, empty_init, "Capital Radio Engineering Institute", "CREI 680", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/trainer/dolphunk.cpp b/src/mame/trainer/dolphunk.cpp index 039e0e67d8b..b721397e9d4 100644 --- a/src/mame/trainer/dolphunk.cpp +++ b/src/mame/trainer/dolphunk.cpp @@ -96,6 +96,8 @@ Thanks to Amigan site for various documents. #include "dolphunk.lh" +namespace { + class dauphin_state : public driver_device { public: @@ -282,6 +284,9 @@ ROM_START( dauphin ) //ROM_LOAD( "reflexes.bin", 0x0c00, 0x0072, CRC(c4bed94b) SHA1(cf525755a1dbce6a4681353be692ddf0346f323b) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/trainer/emma2.cpp b/src/mame/trainer/emma2.cpp index 9bc53bbf736..2bfbdf1cc5b 100644 --- a/src/mame/trainer/emma2.cpp +++ b/src/mame/trainer/emma2.cpp @@ -55,6 +55,8 @@ To Do: #include "emma2.lh" +namespace { + class emma2_state : public driver_device { public: @@ -225,6 +227,8 @@ ROM_START( emma2 ) ROM_LOAD( "se116a_d8-dd_fe-ff", 0x0800, 0x0800, CRC(ef0f1513) SHA1(46089ba0402828b4204812a04134b313d9be0f93) ) // 0xd800 ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/trainer/instruct.cpp b/src/mame/trainer/instruct.cpp index 00c20880c68..353882e64b4 100644 --- a/src/mame/trainer/instruct.cpp +++ b/src/mame/trainer/instruct.cpp @@ -57,6 +57,8 @@ ToDO: #include "instruct.lh" +namespace { + class instruct_state : public driver_device { public: @@ -468,6 +470,9 @@ ROM_START( instruct ) ROM_LOAD( "82s103.20", 0x0020, 0x8000, NO_DUMP ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/trainer/pro80.cpp b/src/mame/trainer/pro80.cpp index 1ae71b40915..4ff840b4169 100644 --- a/src/mame/trainer/pro80.cpp +++ b/src/mame/trainer/pro80.cpp @@ -33,6 +33,8 @@ Then press W to save. To load, press L. If it says r at the end, it indicates a #include "pro80.lh" +namespace { + class pro80_state : public driver_device { public: @@ -210,6 +212,9 @@ ROM_START( pro80 ) ROM_LOAD( "pro80.bin", 0x0000, 0x0400, CRC(1bf6e0a5) SHA1(eb45816337e08ed8c30b589fc24960dc98b94db2)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/trainer/savia84.cpp b/src/mame/trainer/savia84.cpp index e3d8e1d7d42..e8e78653482 100644 --- a/src/mame/trainer/savia84.cpp +++ b/src/mame/trainer/savia84.cpp @@ -33,6 +33,8 @@ Here is a test program. Copy the text and Paste into the emulator. #include "savia84.lh" +namespace { + class savia84_state : public driver_device { public: @@ -201,6 +203,9 @@ ROM_START( savia84 ) //ROM_LOAD("savia84_1kb.bin", 0x0000, 0x0400, CRC(23a5c15e) SHA1(7e769ed8960d8c591a25cfe4effffcca3077c94b)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/trainer/selz80.cpp b/src/mame/trainer/selz80.cpp index 7bfde1bc4c0..ead2f36baa1 100644 --- a/src/mame/trainer/selz80.cpp +++ b/src/mame/trainer/selz80.cpp @@ -41,6 +41,8 @@ ToDo: #include "selz80.lh" +namespace { + class selz80_state : public driver_device { public: @@ -291,6 +293,8 @@ ROM_START( dagz80 ) ROM_LOAD( "moni_1.5_15.08.1988.bin", 0x0000, 0x2000, CRC(318aee6e) SHA1(c698fdee401b88e673791aabcba6a9628938a075) ) ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/trainer/tk80.cpp b/src/mame/trainer/tk80.cpp index 061411d655a..ebe70f15bbb 100644 --- a/src/mame/trainer/tk80.cpp +++ b/src/mame/trainer/tk80.cpp @@ -54,6 +54,8 @@ ICS8080 #include "tk80.lh" +namespace { + class tk80_state : public driver_device { public: @@ -417,6 +419,8 @@ ROM_START( nd80z ) ROM_LOAD( "ndf.bin", 0x0000, 0x0800, CRC(fe829f1d) SHA1(6fff31884b8d984076d4450ca3a3e48efadeb648)) ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/trainer/zapcomputer.cpp b/src/mame/trainer/zapcomputer.cpp index 7d22a74f415..d2bf1148d81 100644 --- a/src/mame/trainer/zapcomputer.cpp +++ b/src/mame/trainer/zapcomputer.cpp @@ -35,6 +35,9 @@ #include "cpu/z80/z80.h" #include "zapcomputer.lh" + +namespace { + class zapcomp_state : public driver_device { public: @@ -175,5 +178,8 @@ ROM_START( zapcomp ) ROM_LOAD("zap.rom", 0x0000, 0x0400, CRC(3f4416e9) SHA1(d6493707bfba1a1e1e551f8144194afa5bda3316) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1981, zapcomp, 0, 0, zapcomp, zapcomp, zapcomp_state, empty_init, "Steve Ciarcia / BYTE / McGRAW-HILL", "ZAP - Z80 Applications Processor", MACHINE_NO_SOUND_HW ) diff --git a/src/mame/trs/6883sam.h b/src/mame/trs/6883sam.h index 1a283d74e66..0ee558f6c72 100644 --- a/src/mame/trs/6883sam.h +++ b/src/mame/trs/6883sam.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_6883SAM_H -#define MAME_MACHINE_6883SAM_H +#ifndef MAME_TRS_6883SAM_H +#define MAME_TRS_6883SAM_H #pragma once @@ -216,4 +216,4 @@ private: DECLARE_DEVICE_TYPE(SAM6883, sam6883_device) -#endif // MAME_MACHINE_6883SAM_H +#endif // MAME_TRS_6883SAM_H diff --git a/src/mame/trs/coco_vhd.h b/src/mame/trs/coco_vhd.h index 98463dcc5db..14769df91b7 100644 --- a/src/mame/trs/coco_vhd.h +++ b/src/mame/trs/coco_vhd.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_COCO_VHD_H -#define MAME_MACHINE_COCO_VHD_H +#ifndef MAME_TRS_COCO_VHD_H +#define MAME_TRS_COCO_VHD_H #pragma once @@ -70,4 +70,4 @@ DECLARE_DEVICE_TYPE(COCO_VHD, coco_vhd_image_device) ***************************************************************************/ -#endif // MAME_MACHINE_COCO_VHD_H +#endif // MAME_TRS_COCO_VHD_H diff --git a/src/mame/trs/gime.h b/src/mame/trs/gime.h index 1791358646b..ddeb178fd75 100644 --- a/src/mame/trs/gime.h +++ b/src/mame/trs/gime.h @@ -9,8 +9,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_GIME_H -#define MAME_VIDEO_GIME_H +#ifndef MAME_TRS_GIME_H +#define MAME_TRS_GIME_H #pragma once @@ -290,4 +290,4 @@ public: DECLARE_DEVICE_TYPE(GIME_NTSC, gime_ntsc_device) DECLARE_DEVICE_TYPE(GIME_PAL, gime_pal_device) -#endif //MAME_VIDEO_GIME_H +#endif //MAME_TRS_GIME_H diff --git a/src/mame/trs/max80.cpp b/src/mame/trs/max80.cpp index 3406015b5aa..2b1ec3660df 100644 --- a/src/mame/trs/max80.cpp +++ b/src/mame/trs/max80.cpp @@ -82,6 +82,9 @@ Status: Beeps every so often. Unable to read the disk. #include "utf8.h" + +namespace { + class max80_state : public driver_device { public: @@ -115,7 +118,7 @@ protected: private: static void floppy_formats(format_registration &fr); - u8 keyboard_r(offs_t offset); + [[maybe_unused]] u8 keyboard_r(offs_t offset); void beep_w(offs_t offset, u8 data); void mode_w(offs_t offset, u8 data); void drive_w(offs_t offset, u8 data); @@ -507,5 +510,8 @@ ROM_START(max80) ROM_LOAD("max80.e12", 0x0000, 0x0200, CRC(cf316f25) SHA1(78663711c6100a67ef18382284565feda2bbbf77) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1982, max80, 0, trs80l2, max80, max80, max80_state, empty_init, "Lobo Systems", "MAX-80", MACHINE_NOT_WORKING ) //| MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/trs/meritum.cpp b/src/mame/trs/meritum.cpp index fe20b986d81..8ccecdf780b 100644 --- a/src/mame/trs/meritum.cpp +++ b/src/mame/trs/meritum.cpp @@ -68,6 +68,9 @@ For Model III: #include "utf8.h" + +namespace { + class meritum_state : public trs80_state { public: @@ -469,6 +472,8 @@ ROM_START( meritum_net ) ROM_LOAD( "char.ic72", 0x0000, 0x1000, CRC(2c09a5a7) SHA1(146891b3ddfc2de95e6a5371536394a657880054)) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1983, meritum1, 0, trs80l2, meritum1, meritum, meritum_state, empty_init, "Mera-Elzab", "Meritum I (Model 1)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/trs/radionic.cpp b/src/mame/trs/radionic.cpp index 008e8b92ecf..385c053234c 100644 --- a/src/mame/trs/radionic.cpp +++ b/src/mame/trs/radionic.cpp @@ -116,6 +116,9 @@ To Do / Status: #include "softlist_dev.h" #include "utf8.h" + +namespace { + #define MASTER_XTAL 12164800 @@ -576,6 +579,8 @@ ROM_START(radionic) ROM_LOAD("trschar.z58", 0x0000, 0x1000, CRC(02e767b6) SHA1(c431fcc6bd04ce2800ca8c36f6f8aeb2f91ce9f7) ) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1983, radionic, 0, trs80l2, radionic, radionic, radionic_state, empty_init, "Komtek", "Radionic R1001/Komtek 1", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/trs/tandy2kb.h b/src/mame/trs/tandy2kb.h index 769d91ed521..09704267b10 100644 --- a/src/mame/trs/tandy2kb.h +++ b/src/mame/trs/tandy2kb.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_MACHINE_TANDY2KB_H -#define MAME_MACHINE_TANDY2KB_H +#ifndef MAME_TRS_TANDY2KB_H +#define MAME_TRS_TANDY2KB_H #pragma once @@ -79,4 +79,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TANDY2K_KEYBOARD, tandy2k_keyboard_device) -#endif // MAME_MACHINE_TANDY2KB_H +#endif // MAME_TRS_TANDY2KB_H diff --git a/src/mame/trs/trs80m2kb.h b/src/mame/trs/trs80m2kb.h index 2b4383008a2..2a6eea1a3a9 100644 --- a/src/mame/trs/trs80m2kb.h +++ b/src/mame/trs/trs80m2kb.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_TRS80M2KB_H -#define MAME_MACHINE_TRS80M2KB_H +#ifndef MAME_TRS_TRS80M2KB_H +#define MAME_TRS_TRS80M2KB_H #pragma once @@ -80,4 +80,4 @@ DECLARE_DEVICE_TYPE(TRS80M2_KEYBOARD, trs80m2_keyboard_device) -#endif // MAME_MACHINE_TRS80M2KB_H +#endif // MAME_TRS_TRS80M2KB_H diff --git a/src/mame/tvgames/actions_atj2279b.cpp b/src/mame/tvgames/actions_atj2279b.cpp index beb53f04e9e..9d63f7d2b4b 100644 --- a/src/mame/tvgames/actions_atj2279b.cpp +++ b/src/mame/tvgames/actions_atj2279b.cpp @@ -32,6 +32,8 @@ #include "screen.h" +namespace { + class actions_atj2279b_state : public driver_device { public: @@ -98,6 +100,8 @@ ROM_START( rbitgen ) ROM_LOAD16_WORD_SWAP( "nand.bin", 0x000000, 0x21000000, CRC(92576add) SHA1(1fe61ef1d2dd24e5b5d48c477846ef0c83ec6568) ) ROM_END +} // anonymous namespace + // year, name, parent, compat, machine, input, class, init, company, fullname, flags CONS( 2016, rbitgen, 0, 0, actions_atj2279b, actions_atj2279b, actions_atj2279b_state, empty_init, "Retro-Bit", "Generations (Retro-Bit)", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/bl_handhelds_lcdc.h b/src/mame/tvgames/bl_handhelds_lcdc.h index 7b47a07fe04..8089e0a5d3a 100644 --- a/src/mame/tvgames/bl_handhelds_lcdc.h +++ b/src/mame/tvgames/bl_handhelds_lcdc.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_BL_HANDHELDS_LCDC_H -#define MAME_MACHINE_BL_HANDHELDS_LCDC_H +#ifndef MAME_TVGAMES_BL_HANDHELDS_LCDC_H +#define MAME_TVGAMES_BL_HANDHELDS_LCDC_H #pragma once @@ -34,4 +34,4 @@ private: }; -#endif // MAME_MACHINE_BL_HANDHELDS_LCDC_H +#endif // MAME_TVGAMES_BL_HANDHELDS_LCDC_H diff --git a/src/mame/tvgames/elan_ep3a19a.cpp b/src/mame/tvgames/elan_ep3a19a.cpp index 920c13d30d7..030a2842eb5 100644 --- a/src/mame/tvgames/elan_ep3a19a.cpp +++ b/src/mame/tvgames/elan_ep3a19a.cpp @@ -20,6 +20,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class elan_ep3a19a_state : public driver_device { public: @@ -346,6 +349,9 @@ void elan_ep3a19a_state::init_tvbg() } } +} // anonymous namespace + + CONS( 2007, tvbg6a, 0, 0, elan_ep3a19a, tvbg_1button, elan_ep3a19a_state, init_tvbg, "NSI International / Mammoth Toys (Licensed by Hasbro)", "TV Board Games 6-in-1: Silly 6 Pins, Candy Land, Hungry Hungry Hippos, Match 'em, Mixin' Pics, Checkers", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // https://www.youtube.com/watch?v=zajzQo47YYA CONS( 2007, tvbg6b, 0, 0, elan_ep3a19a, tvbg_1button, elan_ep3a19a_state, init_tvbg, "NSI International / Mammoth Toys (Licensed by Hasbro)", "TV Board Games 6-in-1: Simon, Battleship, Mouse Trap, Checkers, Link-a-Line, Roll Over", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // https://www.youtube.com/watch?v=JbrR67kY8MI diff --git a/src/mame/tvgames/elan_ep3a19asys.h b/src/mame/tvgames/elan_ep3a19asys.h index 25789370ec2..238ab91db65 100644 --- a/src/mame/tvgames/elan_ep3a19asys.h +++ b/src/mame/tvgames/elan_ep3a19asys.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_ELAN_EP3A19ASYS_H -#define MAME_MACHINE_ELAN_EP3A19ASYS_H +#ifndef MAME_TVGAMES_ELAN_EP3A19ASYS_H +#define MAME_TVGAMES_ELAN_EP3A19ASYS_H #include "elan_eu3a05commonsys.h" @@ -35,4 +35,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EP3A19A_SYS, elan_ep3a19asys_device) -#endif // MAME_MACHINE_ELAN_EP3A19ASYS_H +#endif // MAME_TVGAMES_ELAN_EP3A19ASYS_H diff --git a/src/mame/tvgames/elan_eu3a05.cpp b/src/mame/tvgames/elan_eu3a05.cpp index e6b3fa89727..0cf4b87ba56 100644 --- a/src/mame/tvgames/elan_eu3a05.cpp +++ b/src/mame/tvgames/elan_eu3a05.cpp @@ -223,6 +223,9 @@ Set 5043 bit 0 low #include "bus/generic/slot.h" #include "bus/generic/carts.h" + +namespace { + class elan_eu3a05_state : public driver_device { public: @@ -972,6 +975,9 @@ void elan_eu3a05_pvwwcas_state::init_pvwwcas() ROM[0x3f8d94] = 0xea; } +} // anonymous namespace + + CONS( 2004, rad_sinv, 0, 0, elan_eu3a05, rad_sinv, elan_eu3a05_state, empty_init, "Radica (licensed from Taito)", "Space Invaders [Lunar Rescue, Colony 7, Qix, Phoenix] (Radica, Arcade Legends TV Game)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // "5 Taito games in 1" CONS( 2004, rad_tetr, 0, 0, elan_eu3a05, rad_tetr, elan_eu3a05_state, empty_init, "Radica (licensed from Elorg / The Tetris Company)", "Tetris (Radica, Arcade Legends TV Game)", MACHINE_NOT_WORKING ) // "5 Tetris games in 1" diff --git a/src/mame/tvgames/elan_eu3a05_a.h b/src/mame/tvgames/elan_eu3a05_a.h index 692d685cf64..1ceff48f493 100644 --- a/src/mame/tvgames/elan_eu3a05_a.h +++ b/src/mame/tvgames/elan_eu3a05_a.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_AUDIO_ELAN_EU3A05_H -#define MAME_AUDIO_ELAN_EU3A05_H +#ifndef MAME_TVGAMES_ELAN_EU3A05_H +#define MAME_TVGAMES_ELAN_EU3A05_H #include "sound/okiadpcm.h" @@ -86,4 +86,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_SOUND, elan_eu3a05_sound_device) -#endif // MAME_AUDIO_RAD_EU3A05_H +#endif // MAME_TVGAMES_RAD_EU3A05_H diff --git a/src/mame/tvgames/elan_eu3a05commonsys.h b/src/mame/tvgames/elan_eu3a05commonsys.h index 77c185b72ee..74702c850ae 100644 --- a/src/mame/tvgames/elan_eu3a05commonsys.h +++ b/src/mame/tvgames/elan_eu3a05commonsys.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_ELAN_EU3A05COMMONSYS_H -#define MAME_MACHINE_ELAN_EU3A05COMMONSYS_H +#ifndef MAME_TVGAMES_ELAN_EU3A05COMMONSYS_H +#define MAME_TVGAMES_ELAN_EU3A05COMMONSYS_H #include "cpu/m6502/m6502.h" #include "machine/bankdev.h" @@ -70,4 +70,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_COMMONSYS, elan_eu3a05commonsys_device) -#endif // MAME_MACHINE_ELAN_EU3A05COMMONSYS_H +#endif // MAME_TVGAMES_ELAN_EU3A05COMMONSYS_H diff --git a/src/mame/tvgames/elan_eu3a05commonvid.h b/src/mame/tvgames/elan_eu3a05commonvid.h index 890072f1e5b..ec110ac8d9b 100644 --- a/src/mame/tvgames/elan_eu3a05commonvid.h +++ b/src/mame/tvgames/elan_eu3a05commonvid.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_ELAN_EU3A05COMMONVID_H -#define MAME_VIDEO_ELAN_EU3A05COMMONVID_H +#ifndef MAME_TVGAMES_ELAN_EU3A05COMMONVID_H +#define MAME_TVGAMES_ELAN_EU3A05COMMONVID_H #include "emupal.h" @@ -32,4 +32,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_COMMONVID, elan_eu3a05commonvid_device) -#endif // MAME_VIDEO_ELAN_EU3A05COMMONVID_H +#endif // MAME_TVGAMES_ELAN_EU3A05COMMONVID_H diff --git a/src/mame/tvgames/elan_eu3a05gpio.h b/src/mame/tvgames/elan_eu3a05gpio.h index 5f1e22cbde9..bcdc62f0679 100644 --- a/src/mame/tvgames/elan_eu3a05gpio.h +++ b/src/mame/tvgames/elan_eu3a05gpio.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_ELAN_EU3A05GPIO_H -#define MAME_MACHINE_ELAN_EU3A05GPIO_H +#ifndef MAME_TVGAMES_ELAN_EU3A05GPIO_H +#define MAME_TVGAMES_ELAN_EU3A05GPIO_H class elan_eu3a05gpio_device : public device_t @@ -46,4 +46,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_GPIO, elan_eu3a05gpio_device) -#endif // MAME_MACHINE_RAD_EU3A05GPIO_H +#endif // MAME_TVGAMES_RAD_EU3A05GPIO_H diff --git a/src/mame/tvgames/elan_eu3a05sys.h b/src/mame/tvgames/elan_eu3a05sys.h index 57fc5d9fce7..42099cb2f96 100644 --- a/src/mame/tvgames/elan_eu3a05sys.h +++ b/src/mame/tvgames/elan_eu3a05sys.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_ELAN_EU3A05SYS_H -#define MAME_MACHINE_ELAN_EU3A05SYS_H +#ifndef MAME_TVGAMES_ELAN_EU3A05SYS_H +#define MAME_TVGAMES_ELAN_EU3A05SYS_H #include "elan_eu3a05commonsys.h" @@ -32,4 +32,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_SYS, elan_eu3a05sys_device) -#endif // MAME_MACHINE_ELAN_EU3A05SYS_H +#endif // MAME_TVGAMES_ELAN_EU3A05SYS_H diff --git a/src/mame/tvgames/elan_eu3a05vid.h b/src/mame/tvgames/elan_eu3a05vid.h index b8693bc7ec0..1be6f359f81 100644 --- a/src/mame/tvgames/elan_eu3a05vid.h +++ b/src/mame/tvgames/elan_eu3a05vid.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_ELAN_EU3A05VID_H -#define MAME_VIDEO_ELAN_EU3A05VID_H +#ifndef MAME_TVGAMES_ELAN_EU3A05VID_H +#define MAME_TVGAMES_ELAN_EU3A05VID_H #include "elan_eu3a05commonvid.h" #include "cpu/m6502/m6502.h" @@ -95,4 +95,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A05_VID, elan_eu3a05vid_device) -#endif // MAME_VIDEO_ELAN_EU3A05VID_H +#endif // MAME_TVGAMES_ELAN_EU3A05VID_H diff --git a/src/mame/tvgames/elan_eu3a14.cpp b/src/mame/tvgames/elan_eu3a14.cpp index d0c1b105bc3..eac056fa339 100644 --- a/src/mame/tvgames/elan_eu3a14.cpp +++ b/src/mame/tvgames/elan_eu3a14.cpp @@ -75,6 +75,7 @@ #include "speaker.h" +namespace { class elan_eu3a14_state : public driver_device { @@ -878,6 +879,9 @@ ROM_START( rad_baskp ) ROM_LOAD( "basketball.bin", 0x000000, 0x400000, CRC(7d6ff53c) SHA1(1c75261d55e0107a3b8e8d4c1eb2854750f2d0e8) ) ROM_END +} // anonymous namespace + + CONS( 2006, rad_gtg, 0, 0, radica_eu3a14_altrambase_adc, rad_gtg, elan_eu3a14_state, empty_init, "Radica / FarSight Studios (licensed from Incredible Technologies)", "Golden Tee Golf: Home Edition", MACHINE_NOT_WORKING ) CONS( 2005, rad_rsg, 0, 0, radica_eu3a14_altrambase, rad_rsg, elan_eu3a14_state, empty_init, "Radica / FarSight Studios", "Play TV Real Swing Golf", MACHINE_NOT_WORKING ) diff --git a/src/mame/tvgames/elan_eu3a14sys.h b/src/mame/tvgames/elan_eu3a14sys.h index 3734597ee2b..7cbba058557 100644 --- a/src/mame/tvgames/elan_eu3a14sys.h +++ b/src/mame/tvgames/elan_eu3a14sys.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_ELAN_EU3A14SYS_H -#define MAME_MACHINE_ELAN_EU3A14SYS_H +#ifndef MAME_TVGAMES_ELAN_EU3A14SYS_H +#define MAME_TVGAMES_ELAN_EU3A14SYS_H #include "elan_eu3a05commonsys.h" @@ -34,4 +34,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A14_SYS, elan_eu3a14sys_device) -#endif // MAME_MACHINE_ELAN_EU3A14SYS_H +#endif // MAME_TVGAMES_ELAN_EU3A14SYS_H diff --git a/src/mame/tvgames/elan_eu3a14vid.h b/src/mame/tvgames/elan_eu3a14vid.h index 6726144d8df..7769df85a2d 100644 --- a/src/mame/tvgames/elan_eu3a14vid.h +++ b/src/mame/tvgames/elan_eu3a14vid.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_VIDEO_ELAN_EU3A14VID_H -#define MAME_VIDEO_ELAN_EU3A14VID_H +#ifndef MAME_TVGAMES_ELAN_EU3A14VID_H +#define MAME_TVGAMES_ELAN_EU3A14VID_H #include "elan_eu3a05commonvid.h" #include "cpu/m6502/m6502.h" @@ -99,4 +99,4 @@ private: DECLARE_DEVICE_TYPE(ELAN_EU3A14_VID, elan_eu3a14vid_device) -#endif // MAME_VIDEO_ELAN_EU3A14VID_H +#endif // MAME_TVGAMES_ELAN_EU3A14VID_H diff --git a/src/mame/tvgames/generalplus_gpl16250_m.h b/src/mame/tvgames/generalplus_gpl16250_m.h index e06f34a5f62..a622bd222a5 100644 --- a/src/mame/tvgames/generalplus_gpl16250_m.h +++ b/src/mame/tvgames/generalplus_gpl16250_m.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_GENERALPLUS_GPL16250_H -#define MAME_MACHINE_GENERALPLUS_GPL16250_H +#ifndef MAME_TVGAMES_GENERALPLUS_GPL16250_H +#define MAME_TVGAMES_GENERALPLUS_GPL16250_H #pragma once @@ -39,4 +39,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(FULL_MEMORY, full_memory_device) -#endif // MAME_MACHINE_GENERALPLUS_GPL16250_H +#endif // MAME_TVGAMES_GENERALPLUS_GPL16250_H diff --git a/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp b/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp index bb62a93fff1..f9ba2ed7c12 100644 --- a/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_mobigo.cpp @@ -26,6 +26,8 @@ #include "screen.h" +namespace { + class mobigo2_state : public generalplus_gpac800_game_state { public: @@ -164,6 +166,9 @@ ROM_START( mobigo2 ) ROM_LOAD( "mobigo2_bios_ger.bin", 0x00000, 0x8400000, CRC(d5ab613d) SHA1(6fb104057dc3484fa958e2cb20c5dd0c19589f75) ) // SPANSION S34ML01G100TF100 ROM_END +} // anonymous namespace + + CONS( 2010, mobigo, 0, 0, mobigo, mobigo, mobigo_state, init_mobigo , "VTech", "MobiGo", MACHINE_IS_SKELETON ) CONS( 2010, mobigos, mobigo, 0, mobigo, mobigo, mobigo_state, init_mobigo , "VTech", "MobiGo (Spain)", MACHINE_IS_SKELETON ) CONS( 2012, mobigo2, 0, 0, mobigo2, mobigo, mobigo2_state, nand_init840, "VTech", "MobiGo 2 (Germany)", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/generalplus_gpl16250_spi.cpp b/src/mame/tvgames/generalplus_gpl16250_spi.cpp index 8b4c5fdeac3..baa9957a56d 100644 --- a/src/mame/tvgames/generalplus_gpl16250_spi.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_spi.cpp @@ -17,6 +17,8 @@ #include "softlist_dev.h" +namespace { + class generalplus_gpspispi_game_state : public gcm394_game_state { public: @@ -182,5 +184,7 @@ void generalplus_gpspispi_game_state::init_spi() internal[0x7fff] = vectorbase + 0x1e; } +} // anonymous namespace + CONS(200?, bkrankp, 0, 0, generalplus_gpspispi_bkrankp, gcm394, generalplus_gpspispi_bkrankp_game_state , init_spi, "Bandai", "Karaoke Ranking Party (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) diff --git a/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp b/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp index dd085fee7f9..844ae934897 100644 --- a/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp +++ b/src/mame/tvgames/generalplus_gpl16250_spi_direct.cpp @@ -13,6 +13,9 @@ #include "emu.h" #include "generalplus_gpl16250.h" + +namespace { + class generalplus_gpspi_direct_game_state : public gcm394_game_state { public: @@ -218,6 +221,9 @@ void generalplus_gpspi_direct_game_state::init_fif() } } +} // anonymous namespace + + CONS(2017, fixitflx, 0, 0, generalplus_gpspi_direct, bfmpac, generalplus_gpspi_direct_game_state, init_fif, "Basic Fun", "Fix It Felix Jr. (mini arcade)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) CONS(2018, wiwcs, 0, 0, generalplus_gpspi_direct, bfmpac, generalplus_gpspi_direct_game_state, init_fif, "Basic Fun", "Where in the World Is Carmen Sandiego? (handheld)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) CONS(2018, bfpacman, 0, 0, generalplus_gpspi_direct, bfmpac, generalplus_gpspi_direct_game_state, init_fif, "Basic Fun", "Pac-Man (mini arcade)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND) diff --git a/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp b/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp index 6a78ff04068..fc854a7006b 100644 --- a/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp +++ b/src/mame/tvgames/generalplus_gpl162xx_lcdtype.cpp @@ -39,6 +39,8 @@ #include "logmacro.h" +namespace { + class gpl162xx_lcdtype_state : public driver_device { public: @@ -881,6 +883,8 @@ ROM_START( bkid218 ) ROM_LOAD( "218n1_25q64csig_c84017.bin", 0x000000, 0x800000, CRC(94f35dbd) SHA1(a1bd6defd2465ae14753cd83be5c31f99e9158ec) ) ROM_END +} // anonymous namespace + CONS( 200?, pcp8718, 0, 0, gpl162xx_lcdtype, gpl162xx_lcdtype, gpl162xx_lcdtype_state, empty_init, "PCP", "PCP 8718 - HD 360 Degrees Rocker Palm Eyecare Console - 788 in 1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) CONS( 200?, pcp8728, 0, 0, gpl162xx_lcdtype, gpl162xx_lcdtype, gpl162xx_lcdtype_state, empty_init, "PCP", "PCP 8728 - 788 in 1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // what name was this sold under? diff --git a/src/mame/tvgames/generalplus_gpl32612.cpp b/src/mame/tvgames/generalplus_gpl32612.cpp index 68254388e0c..1645d396ef7 100644 --- a/src/mame/tvgames/generalplus_gpl32612.cpp +++ b/src/mame/tvgames/generalplus_gpl32612.cpp @@ -31,6 +31,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class generalplus_gpl32612_game_state : public driver_device { public: @@ -312,6 +315,8 @@ void generalplus_gpl32612_game_state::nand_init840() bootstrap(); } +} // anonymous namespace + // year, name, parent, compat, machine, input, class, init, company, fullname, flags CONS( 200?, jak_swbstrik, 0, 0, gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init840, "JAKKS Pacific Inc", "Star Wars Blaster Strike", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/generalplus_gpl_unknown.cpp b/src/mame/tvgames/generalplus_gpl_unknown.cpp index dacc222477f..6b435606d64 100644 --- a/src/mame/tvgames/generalplus_gpl_unknown.cpp +++ b/src/mame/tvgames/generalplus_gpl_unknown.cpp @@ -33,6 +33,8 @@ #include "logmacro.h" +namespace { + class generalplus_gpl_unknown_state : public driver_device { public: @@ -618,6 +620,8 @@ ROM_START( taturtf ) ROM_LOAD16_WORD_SWAP( "tinyarcadeturtlefighter_25q32bst16_684016.bin", 0x000000, 0x400000, CRC(8e046f2d) SHA1(e48492cf953f22a47fa2b88a8f96a1e459b8c487) ) ROM_END +} // anonymous namespace + // The 'Micro Arcade' units are credit card sized handheld devices CONS( 2017, mapacman, 0, 0, generalplus_gpl_unknown, generalplus_gpl_unknown, generalplus_gpl_unknown_state, empty_init, "Super Impulse", "Pac-Man (Micro Arcade)", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/hyperscan_card.h b/src/mame/tvgames/hyperscan_card.h index 5518bf4ee7e..b2f8d66b97a 100644 --- a/src/mame/tvgames/hyperscan_card.h +++ b/src/mame/tvgames/hyperscan_card.h @@ -2,8 +2,8 @@ // copyright-holders:Sandro Ronco -#ifndef MAME_MACHINE_HYPERSCAN_CARD_H -#define MAME_MACHINE_HYPERSCAN_CARD_H +#ifndef MAME_TVGAMES_HYPERSCAN_CARD_H +#define MAME_TVGAMES_HYPERSCAN_CARD_H #pragma once @@ -51,4 +51,4 @@ private: DECLARE_DEVICE_TYPE(HYPERSCAN_CARD, hyperscan_card_device) -#endif // MAME_MACHINE_HYPERSCAN_CARD_H +#endif // MAME_TVGAMES_HYPERSCAN_CARD_H diff --git a/src/mame/tvgames/hyperscan_ctrl.h b/src/mame/tvgames/hyperscan_ctrl.h index f85ce86b88a..4c54c870d67 100644 --- a/src/mame/tvgames/hyperscan_ctrl.h +++ b/src/mame/tvgames/hyperscan_ctrl.h @@ -2,8 +2,8 @@ // copyright-holders:Sandro Ronco -#ifndef MAME_MACHINE_HYPERSCAN_CTRL_H -#define MAME_MACHINE_HYPERSCAN_CTRL_H +#ifndef MAME_TVGAMES_HYPERSCAN_CTRL_H +#define MAME_TVGAMES_HYPERSCAN_CTRL_H #pragma once @@ -28,4 +28,4 @@ private: DECLARE_DEVICE_TYPE(HYPERSCAN_CTRL, hyperscan_ctrl_device) -#endif // MAME_MACHINE_HYPERSCAN_CTRL_H +#endif // MAME_TVGAMES_HYPERSCAN_CTRL_H diff --git a/src/mame/tvgames/magiceyes_pollux_vr3520f.cpp b/src/mame/tvgames/magiceyes_pollux_vr3520f.cpp index 505b95eba5c..6f44af2d9e6 100644 --- a/src/mame/tvgames/magiceyes_pollux_vr3520f.cpp +++ b/src/mame/tvgames/magiceyes_pollux_vr3520f.cpp @@ -30,6 +30,8 @@ #include "screen.h" +namespace { + class magiceyes_vr3520f_game_state : public driver_device { public: @@ -116,5 +118,7 @@ ROM_START( didj ) // is there an internal bootloader beyond copying code from NAND into RAM? ROM_END +} // anonymous namespace + CONS( 2008, didj, 0, 0, leapfrog_didj, leapfrog_didj, magiceyes_vr3520f_game_state, empty_init, "LeapFrog", "Didj", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/monkey_king_3b.cpp b/src/mame/tvgames/monkey_king_3b.cpp index 158ed564f00..7f92741565b 100644 --- a/src/mame/tvgames/monkey_king_3b.cpp +++ b/src/mame/tvgames/monkey_king_3b.cpp @@ -69,6 +69,9 @@ TODO: #include "emupal.h" #include "screen.h" + +namespace { + class mk3b_soc_state : public driver_device { public: @@ -249,4 +252,7 @@ ROM_START( rs70_648 ) ROM_LOAD("s29gl512p.bin", 0x000000, 0x04000000, CRC(cb452bd7) SHA1(0b19a13a3d0b829725c10d64d7ff852ff5202ed0) ) ROM_END +} // anonymous namespace + + CONS( 2019, rs70_648, 0, 0, mk3b_soc, mk3b_soc, mk3b_soc_state, init_rs70, "CoolBoy", "RS-70 648-in-1", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/pubint_storyreader.cpp b/src/mame/tvgames/pubint_storyreader.cpp index 704f713d172..81293e2515e 100644 --- a/src/mame/tvgames/pubint_storyreader.cpp +++ b/src/mame/tvgames/pubint_storyreader.cpp @@ -75,6 +75,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + class pi_storyreader_state : public driver_device { public: @@ -164,6 +167,9 @@ ROM_START( pi_stry2 ) ROM_LOAD( "internal.mcu.rom", 0x0000, 0x1000, NO_DUMP ) // unknown type / size ROM_END +} // anonymous namespace + + // year, name, parent, compat, machine, input, class, init, company, fullname, flags // These are said to not be compatible with each other diff --git a/src/mame/tvgames/spg110.cpp b/src/mame/tvgames/spg110.cpp index 1dec3fb938d..143a8d0fc6f 100644 --- a/src/mame/tvgames/spg110.cpp +++ b/src/mame/tvgames/spg110.cpp @@ -32,6 +32,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + class spg110_game_state : public driver_device { public: @@ -626,6 +629,8 @@ ROM_START( sstarkar ) // no internal BIOS ROM_END +} // anonymous namespace + // JAKKS Pacific Inc TV games CONS( 2004, jak_capb, 0, 0, spg110_base, jak_capb, spg110_game_state, empty_init, "JAKKS Pacific Inc / HotGen Ltd", "Classic Arcade Pinball (JAKKS Pacific TV Game)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/tvgames/spg29x.cpp b/src/mame/tvgames/spg29x.cpp index 60c3e827549..4f750e2400f 100644 --- a/src/mame/tvgames/spg29x.cpp +++ b/src/mame/tvgames/spg29x.cpp @@ -82,6 +82,7 @@ #include "softlist_dev.h" +namespace { class spg29x_game_state : public driver_device { @@ -608,6 +609,8 @@ ROM_START( zone3d ) ROM_LOAD32_DWORD("internal.rom", 0x000000, 0x008000, NO_DUMP) ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/tvgames/spg29x_lexibook_jg7425.cpp b/src/mame/tvgames/spg29x_lexibook_jg7425.cpp index 24efca6eed2..6eeea9688db 100644 --- a/src/mame/tvgames/spg29x_lexibook_jg7425.cpp +++ b/src/mame/tvgames/spg29x_lexibook_jg7425.cpp @@ -22,6 +22,9 @@ If SPG290, should probably be merged with hyperscan.cpp (it is) #include "screen.h" #include "cpu/score/score.h" + +namespace { + class lexibook_jg7425_state : public driver_device { public: @@ -114,6 +117,8 @@ ROM_START( lx_aven ) DISK_IMAGE( "sd-card", 0, SHA1(911da7bf7dac391e3329e17e3f411caafac52f0f) ) ROM_END +} // anonymous namespace + CONS( 2015, lx_jg7425, 0, 0, lexibook_jg7425, lexibook_jg7425, lexibook_jg7425_state, empty_init, "Lexibook", "Lexibook JG7425 221-in-1", MACHINE_IS_SKELETON ) CONS( 201?, lx_aven, 0, 0, lexibook_jg7425, lexibook_jg7425, lexibook_jg7425_state, empty_init, "Lexibook", "Marvel Avengers TV Game Console (32-bit) (Lexibook)", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/spg2xx_digimake.cpp b/src/mame/tvgames/spg2xx_digimake.cpp index 8e0016d06c0..20e751f9a1e 100644 --- a/src/mame/tvgames/spg2xx_digimake.cpp +++ b/src/mame/tvgames/spg2xx_digimake.cpp @@ -8,6 +8,9 @@ #include "spg2xx.h" #include "machine/nvram.h" + +namespace { + class spg2xx_game_digimake_state : public spg2xx_game_state { public: @@ -216,5 +219,7 @@ ROM_START( rad_digi ) ROM_LOAD16_WORD_SWAP( "digimakeover.bin", 0x000000, 0x400000, CRC(bbe60bc2) SHA1(fb0c96d1f35af85d6d0fa76c390e42e2eda301ae) ) ROM_END +} // anonymous namespace + CONS( 2005, rad_digi, 0, 0, digimake, rad_digi, spg2xx_game_digimake_state, init_crc, "Radica", "Digi Makeover (Girl Tech)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) diff --git a/src/mame/tvgames/spg2xx_dreamlife.cpp b/src/mame/tvgames/spg2xx_dreamlife.cpp index 6a8483df05c..ae2ad432733 100644 --- a/src/mame/tvgames/spg2xx_dreamlife.cpp +++ b/src/mame/tvgames/spg2xx_dreamlife.cpp @@ -6,6 +6,9 @@ #include "machine/eepromser.h" + +namespace { + class dreamlif_state : public spg2xx_game_state { public: @@ -101,6 +104,8 @@ ROM_START( dsgnwrld ) ROM_LOAD16_WORD_SWAP( "designersworld.bin", 0x000000, 0x800000, CRC(b3987161) SHA1(f7d03b172fd0accc6370d9ccc340b3aa6317426f) ) ROM_END +} // anonymous namespace + // Hasbro games CONS( 2005, dreamlif, 0, 0, dreamlif, dreamlif, dreamlif_state, empty_init, "Hasbro", "Dream Life (Version 1.0, Feb 07 2005)", MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/tvgames/spg2xx_ican.cpp b/src/mame/tvgames/spg2xx_ican.cpp index 3a68ac35d0e..1f22c07a410 100644 --- a/src/mame/tvgames/spg2xx_ican.cpp +++ b/src/mame/tvgames/spg2xx_ican.cpp @@ -11,6 +11,8 @@ #include "softlist_dev.h" +namespace { + class icanguit_state : public spg2xx_game_state { public: @@ -502,6 +504,8 @@ ROM_START( icanpian ) // no internal ROM, requires a cartridge ROM_END +} // anonymous namespace + // Fisher-Price games CONS( 2007, icanguit, 0, 0, icanguit, icanguit, icanguit_state, empty_init, "Fisher-Price", "I Can Play Guitar", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // how is data saved? diff --git a/src/mame/tvgames/spg2xx_jakks.cpp b/src/mame/tvgames/spg2xx_jakks.cpp index bfcb7e8f1ed..e7291c733fb 100644 --- a/src/mame/tvgames/spg2xx_jakks.cpp +++ b/src/mame/tvgames/spg2xx_jakks.cpp @@ -8,6 +8,9 @@ #include "spg2xx.h" #include "machine/nvram.h" + +namespace { + class jakks_state : public spg2xx_game_state { public: @@ -199,6 +202,8 @@ ROM_START( jak_mpacw ) ROM_LOAD16_WORD_SWAP( "wirelessnamco.bin", 0x000000, 0x200000, CRC(78a318ca) SHA1(3c2601cbb023edb6a1f3d4bce686e0be1ef63eee) ) ROM_END +} // anonymous namespace + // Pre-GameKey units diff --git a/src/mame/tvgames/spg2xx_jakks_gkr.cpp b/src/mame/tvgames/spg2xx_jakks_gkr.cpp index 1d0284e49ae..b39d4f9820d 100644 --- a/src/mame/tvgames/spg2xx_jakks_gkr.cpp +++ b/src/mame/tvgames/spg2xx_jakks_gkr.cpp @@ -10,6 +10,8 @@ #include "softlist_dev.h" +namespace { + class jakks_gkr_state : public spg2xx_game_state { public: @@ -42,8 +44,8 @@ public: DECLARE_READ_LINE_MEMBER(i2c_gkr_r); protected: - uint16_t jakks_porta_r(); - void jakks_porta_w(uint16_t data); + [[maybe_unused]] uint16_t jakks_porta_r(); + [[maybe_unused]] void jakks_porta_w(uint16_t data); void jakks_portb_w(uint16_t data); private: @@ -704,6 +706,7 @@ ROM_START( jak_capc ) ROM_LOAD16_WORD_SWAP( "capcomgkr.bin", 0x000000, 0x200000, CRC(6d47cce4) SHA1(263926a991d55459aa3cee90049d2202c1e3a70e) ) ROM_END +} // anonymous namespace // 'Game-Key Ready' JAKKS games (these can also take per-game specific expansion cartridges, although not all games had them released) diff --git a/src/mame/tvgames/spg2xx_jakks_sharp.cpp b/src/mame/tvgames/spg2xx_jakks_sharp.cpp index d5389d761d4..0598019479a 100644 --- a/src/mame/tvgames/spg2xx_jakks_sharp.cpp +++ b/src/mame/tvgames/spg2xx_jakks_sharp.cpp @@ -7,6 +7,9 @@ #include "spg2xx.h" #include "machine/nvram.h" + +namespace { + class jakks_sharp_state : public spg2xx_game_state { public: @@ -95,6 +98,8 @@ ROM_START( jsc_sdoo ) ROM_LOAD16_WORD_SWAP( "shckscooby.bin", 0x000000, 0x200000, CRC(ce7039a4) SHA1(d5815149b75262253d03fac946b10c43e96945c0) ) ROM_END +} // anonymous namespace + // The UK version has UK specific voice actors CONS( 2007, jsc_thom, 0, 0, base_config_pal, jak_sharp, jakks_sharp_state, empty_init, "JAKKS Pacific Inc / Child Guidance / Pronto Games", "Thomas & Friends - Learning Circus Express (Sharp Cookie) (PAL, UK)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp b/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp index 98ac6a11ff1..4b8a273c7a9 100644 --- a/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp +++ b/src/mame/tvgames/spg2xx_jakks_tvtouch.cpp @@ -4,6 +4,9 @@ #include "emu.h" #include "spg2xx.h" + +namespace { + class jakks_tvtouch_state : public spg2xx_game_state { public: @@ -284,6 +287,8 @@ ROM_START( tvtchsb ) ROM_LOAD16_WORD_SWAP( "touchspongebob.bin", 0x000000, 0x400000, CRC(a6d7f544) SHA1(fc15b3d2bbbd951d82c81bef59f45506d6c4e2e3) ) ROM_END +} // anonymous namespace + // TV Touch Games (these are re-release versions of classic JAKKS games but using a touchpad controller) CONS( 2012, tvtchsw, 0, 0, tvtouch, tvtouch, jakks_tvtouch_state, empty_init, "JAKKS Pacific Inc / Code Mystics", "TV Touch Games: Star Wars Original Trilogy", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // Touch games have 24C04 diff --git a/src/mame/tvgames/spg2xx_lexibook.cpp b/src/mame/tvgames/spg2xx_lexibook.cpp index 0cdebba05d0..497804fb6ea 100644 --- a/src/mame/tvgames/spg2xx_lexibook.cpp +++ b/src/mame/tvgames/spg2xx_lexibook.cpp @@ -9,6 +9,8 @@ #include "spg2xx.h" +namespace { + class spg2xx_lexizeus_game_state : public spg2xx_game_state { public: @@ -414,6 +416,8 @@ ROM_START( vgcap35 ) ROM_RELOAD(0x1000000,0x1000000) ROM_END +} // anonymous namespace + // these all have the same ROM scrambling diff --git a/src/mame/tvgames/spg2xx_mysprtch.cpp b/src/mame/tvgames/spg2xx_mysprtch.cpp index 479cff6faa1..60089bc95f8 100644 --- a/src/mame/tvgames/spg2xx_mysprtch.cpp +++ b/src/mame/tvgames/spg2xx_mysprtch.cpp @@ -6,6 +6,8 @@ #include "spg2xx.h" +namespace { + class spg2xx_game_mysprt_plus_state : public spg2xx_game_state { public: @@ -455,6 +457,9 @@ ROM_START( mgt20in1 ) ROM_LOAD16_WORD_SWAP( "m29gl128.u2", 0x000000, 0x1000000, CRC(41d594e3) SHA1(351890455bed28bcaf173d8fd9a4cc997c404d94) ) ROM_END +} // anonymous namespace + + // Original release, with 24MB ROM package, Unit has Black surround to power button CONS( 200?, mysprtch, 0, 0, mysprtch, mysprtch, spg2xx_game_mysprt_orig_state, init_mysprtcp, "Senario / V-Tac Technology Co Ltd.", "My Sports Challenge (5-in-1 version)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // from a QVC licensed unit with a different physical shape etc. uses a 32MByte rom with only 24MByte used diff --git a/src/mame/tvgames/spg2xx_pdc.cpp b/src/mame/tvgames/spg2xx_pdc.cpp index 178af8d33ba..86fb215c653 100644 --- a/src/mame/tvgames/spg2xx_pdc.cpp +++ b/src/mame/tvgames/spg2xx_pdc.cpp @@ -5,6 +5,8 @@ #include "spg2xx.h" +namespace { + class spg2xx_pdc_game_state : public spg2xx_game_state { public: @@ -325,6 +327,9 @@ ROM_START( vjpp2 ) ROM_LOAD16_WORD_SWAP( "29lv320at.u2", 0x000000, 0x400000, CRC(de2592eb) SHA1(9b537205808c502cf872e62f9701357ef8e28f3c) ) ROM_END +} // anonymous namespace + + // there were older models eg. PDC30 with fewer games, and some differences (eg "Jo Ma" instead of "Jo Ma 2") // "Jo Ma 2" shows "Licensed by Mitchell Corporation" (Mitchell made the original Puzzloop on which this style of game is based) Videos of the original Jo Ma show it lacking this text. diff --git a/src/mame/tvgames/spg2xx_playvision.cpp b/src/mame/tvgames/spg2xx_playvision.cpp index 291b598d469..c3f701b5941 100644 --- a/src/mame/tvgames/spg2xx_playvision.cpp +++ b/src/mame/tvgames/spg2xx_playvision.cpp @@ -7,6 +7,8 @@ #include "pvmil.lh" +namespace { + class pvmil_state : public spg2xx_game_state { public: @@ -228,4 +230,7 @@ ROM_START( pvmil ) ROM_LOAD16_WORD_SWAP( "millionare4.bin", 0x000000, 0x400000, CRC(9c43d0f2) SHA1(fb4ba0115000b10b7c0e0d44b9fa3234c900e694) ) ROM_END +} // anonymous namespace + + CONS( 2006, pvmil, 0, 0, pvmil, pvmil, pvmil_state, empty_init, "Play Vision", "Who Wants to Be a Millionaire? (Play Vision, Plug and Play, UK)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/tvgames/spg2xx_senario.cpp b/src/mame/tvgames/spg2xx_senario.cpp index 497b95f60d2..9f4003efac6 100644 --- a/src/mame/tvgames/spg2xx_senario.cpp +++ b/src/mame/tvgames/spg2xx_senario.cpp @@ -20,6 +20,8 @@ #include "machine/intelfsh.h" +namespace { + class spg2xx_senario_state : public spg2xx_game_state { public: @@ -324,6 +326,7 @@ ROM_START( senbbs ) ROM_LOAD16_WORD_SWAP( "bigbonusslots.bin", 0x000000, 0x800000, CRC(071effc3) SHA1(892c05a8b64a388b331ad0d361bf4c523c6c14c9) ) ROM_END +} // anonymous namespace CONS( 2005, senbbs, 0, 0, senbbs, senbbs, spg2xx_senario_bbs_state, empty_init, "Senario", "Big Bonus Slots (Senario, Plug and Play)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/tvgames/spg2xx_senario_poker.cpp b/src/mame/tvgames/spg2xx_senario_poker.cpp index 9fba0e2ee5e..c23078ff4ad 100644 --- a/src/mame/tvgames/spg2xx_senario_poker.cpp +++ b/src/mame/tvgames/spg2xx_senario_poker.cpp @@ -14,6 +14,8 @@ improve controller hookup / simulation and remove PC-based hacks! #include "sentx6p.lh" +namespace { + class sentx6p_state : public spg2xx_game_state { public: @@ -721,6 +723,9 @@ void sentx6p_state::init_sentx6pd() m_controller_sense_addr = 0x1e3a; } +} // anonymous namespace + + CONS( 2004, sentx6p, 0, 0, sentx6p, sentx6p, sentx6p_state, init_sentx6p, "Senario", "Vs Maxx Texas Hold'em TV Poker - 6 Player Edition (US)", MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // from a US version, values in USD CONS( 2004, sentx6puk, sentx6p, 0, sentx6p, sentx6p, sentx6p_state, init_sentx6puk, "Senario / Play Vision", "Vs Maxx Texas Hold'em TV Poker - 6 Player Edition (UK)", MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // from a UK Play Vision branded box, values in GBP diff --git a/src/mame/tvgames/spg2xx_senca.cpp b/src/mame/tvgames/spg2xx_senca.cpp index 884907efe70..a006d561477 100644 --- a/src/mame/tvgames/spg2xx_senca.cpp +++ b/src/mame/tvgames/spg2xx_senca.cpp @@ -7,6 +7,8 @@ #include "spg2xx.h" +namespace { + class zon32bit_state : public spg2xx_game_state { public: @@ -1035,6 +1037,7 @@ void denver_200in1_state::init_m521neo() rom[0x43c30 + (0x6000000 / 2)] = 0xf165; // boot main bank } +} // anonymous namespace // Box advertises this as '40 Games Included' but the cartridge, which was glued directly to the PCB, not removable, is a 41-in-1. Maybe some versions exist with a 40 game selection. diff --git a/src/mame/tvgames/spg2xx_shredmjr.cpp b/src/mame/tvgames/spg2xx_shredmjr.cpp index c0f9dc93c00..d192b78fc04 100644 --- a/src/mame/tvgames/spg2xx_shredmjr.cpp +++ b/src/mame/tvgames/spg2xx_shredmjr.cpp @@ -5,6 +5,8 @@ #include "spg2xx.h" +namespace { + class shredmjr_game_state : public spg2xx_game_state { public: @@ -223,7 +225,7 @@ ROM_START( guitarstp ) ROM_LOAD16_WORD_SWAP( "29gl064.u2", 0x000000, 0x800000, CRC(1dbcff73) SHA1(b179e4da6f38e7d5ec796bf846a63492d30eb0f5) ) ROM_END - +} // anonymous namespace diff --git a/src/mame/tvgames/spg2xx_skannerztv.cpp b/src/mame/tvgames/spg2xx_skannerztv.cpp index d0069ad0ca3..45e9a77b2fc 100644 --- a/src/mame/tvgames/spg2xx_skannerztv.cpp +++ b/src/mame/tvgames/spg2xx_skannerztv.cpp @@ -292,6 +292,9 @@ doPlayerMore(player) #include "spg2xx.h" #include "machine/nvram.h" + +namespace { + class skannerztv_state : public spg2xx_game_state { public: @@ -429,4 +432,7 @@ ROM_START( rad_sktv ) TODO: find details on MCU so that we know capacity etc. */ ROM_END +} // anonymous namespace + + CONS( 2007, rad_sktv, 0, 0, rad_sktv, rad_sktv, skannerztv_state, init_crc, "Radica", "Skannerz TV", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) diff --git a/src/mame/tvgames/spg2xx_smarttv.cpp b/src/mame/tvgames/spg2xx_smarttv.cpp index b632a1391fc..cb9aa4eb439 100644 --- a/src/mame/tvgames/spg2xx_smarttv.cpp +++ b/src/mame/tvgames/spg2xx_smarttv.cpp @@ -14,6 +14,8 @@ #include "softlist_dev.h" +namespace { + class smarttv_state : public spg2xx_game_state { public: @@ -228,6 +230,8 @@ ROM_START( smartvad ) // no internal ROM (just the single SunPlus SoC glob) ROM_END +} // anonymous namespace + // Toyquest games CONS( 2005, smartvad, 0, 0, smarttv, smarttv, smarttv_state, empty_init, "WinFun / KidConnection", "SmarTV Adventures", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/tvgames/spg2xx_telestory.cpp b/src/mame/tvgames/spg2xx_telestory.cpp index 82b73c8968f..de78c09e3b4 100644 --- a/src/mame/tvgames/spg2xx_telestory.cpp +++ b/src/mame/tvgames/spg2xx_telestory.cpp @@ -9,6 +9,8 @@ #include "softlist_dev.h" +namespace { + class telestory_state : public spg2xx_game_state { public: @@ -295,6 +297,8 @@ ROM_START( telestry ) // no internal ROM, only RAM ROM_END +} // anonymous namespace + /* Sound data for the narrator is written to the SIO data port 013127: D319 3D54 [3d54] = r1 (Cinderella) - 4-bit data? diff --git a/src/mame/tvgames/spg2xx_tvgogo.cpp b/src/mame/tvgames/spg2xx_tvgogo.cpp index 54221210bc5..91dc7c075b0 100644 --- a/src/mame/tvgames/spg2xx_tvgogo.cpp +++ b/src/mame/tvgames/spg2xx_tvgogo.cpp @@ -9,6 +9,8 @@ #include "softlist_dev.h" +namespace { + class tvgogo_state : public spg2xx_game_state { public: @@ -264,6 +266,8 @@ ROM_START( tvgogo ) // no internal ROM? (Camera might have an MCU tho) ROM_END +} // anonymous namespace + // Toyquest games CONS( 2005, tvgogo, 0, 0, tvgogo, tvgogo, tvgogo_state, empty_init, "Toyquest", "GoGo TV Video Vision", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // or TV Go Go - the game addons call it the 'Video Vision console' diff --git a/src/mame/tvgames/spg2xx_vii.cpp b/src/mame/tvgames/spg2xx_vii.cpp index 495a65a487a..897f8895f06 100644 --- a/src/mame/tvgames/spg2xx_vii.cpp +++ b/src/mame/tvgames/spg2xx_vii.cpp @@ -9,6 +9,8 @@ #include "softlist_dev.h" +namespace { + class vii_state : public spg2xx_game_state { public: @@ -171,5 +173,8 @@ ROM_START( vii ) ROM_LOAD16_WORD_SWAP( "vii.bin", 0x0000, 0x2000000, CRC(04627639) SHA1(f883a92d31b53c9a5b0cdb112d07cd793c95fc43)) ROM_END +} // anonymous namespace + + // Jungle Soft TV games CONS( 2007, vii, 0, 0, vii, vii, vii_state, empty_init, "Jungle Soft / KenSingTon / Siatronics", "Vii", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // motion controls are awkward, but playable for the most part diff --git a/src/mame/tvgames/spg2xx_wiwi.cpp b/src/mame/tvgames/spg2xx_wiwi.cpp index 2df08259d60..6a1430b25f8 100644 --- a/src/mame/tvgames/spg2xx_wiwi.cpp +++ b/src/mame/tvgames/spg2xx_wiwi.cpp @@ -17,6 +17,9 @@ #include "emu.h" #include "spg2xx.h" + +namespace { + class spg2xx_game_wiwi18_state : public spg2xx_game_state { public: @@ -981,6 +984,8 @@ ROM_START( ddmmeg12 ) ROM_LOAD16_WORD_SWAP( "doubledancemania.bin", 0x000000, 0x800000, CRC(fcffb21e) SHA1(802a3c2d6bcbd729b9a483d42d912ca8b9abdccd) ) ROM_END +} // anonymous namespace + // box marked 'Wireless game console' 'Drahtlose Spielekonsole' 87 Sports games included : 18 hyper sports games, 69 arcade games. // Unit marked 'Hamy System' 'WiWi' diff --git a/src/mame/tvgames/spg2xx_zone.cpp b/src/mame/tvgames/spg2xx_zone.cpp index 3780f5e9358..5e4eb92ca31 100644 --- a/src/mame/tvgames/spg2xx_zone.cpp +++ b/src/mame/tvgames/spg2xx_zone.cpp @@ -8,6 +8,8 @@ #include "spg2xx.h" +namespace { + class wireless60_state : public spg2xx_game_state { public: @@ -357,6 +359,9 @@ ROM_START( lx_jg7410 ) ROM_LOAD16_WORD_SWAP( "55lv100.u4", 0x0000, 0x8000000, CRC(60476576) SHA1(83592e43d9169c95f6b22903e8d708e96ad02611) ) ROM_END +} // anonymous namespace + + // These have games from Waixing and were likely manufactured by Subor and sold by Ultimate Products Ltd. // Many of these games are rewrites of VT1682 based titles, which in turn were based on older NES/VT ones // Badminton hangs in units where it is present (cause not yet investigated), otherwise everything runs diff --git a/src/mame/tvgames/st2302u_bbl_rom.cpp b/src/mame/tvgames/st2302u_bbl_rom.cpp index 624ba18269c..14786ec5c3c 100644 --- a/src/mame/tvgames/st2302u_bbl_rom.cpp +++ b/src/mame/tvgames/st2302u_bbl_rom.cpp @@ -7,6 +7,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class st22xx_bbl338_state : public driver_device { public: @@ -377,6 +380,9 @@ ROM_START( dphh8213 ) ROM_FILL( 0x00009f, 2, 0xea ) // NOP out SPI check ROM_END +} // anonymous namespace + + // this is uses a higher resolution display than the common units, but not as high as the SunPlus based ones COMP( 201?, bbl338, 0, 0, st22xx_bbl338, dphh8213, st22xx_bbl338_sim_state, empty_init, "BaoBaoLong", "Portable Game Player BBL-338 (BaoBaoLong, 48-in-1)", MACHINE_IS_SKELETON ) diff --git a/src/mame/tvgames/st2302u_bbl_spi.cpp b/src/mame/tvgames/st2302u_bbl_spi.cpp index aa29a00c68b..fec017581b5 100644 --- a/src/mame/tvgames/st2302u_bbl_spi.cpp +++ b/src/mame/tvgames/st2302u_bbl_spi.cpp @@ -37,6 +37,9 @@ #include "emupal.h" #include "speaker.h" + +namespace { + class bbl380_state : public driver_device { public: @@ -364,6 +367,9 @@ ROM_START(supreme) ROM_LOAD("25q32.bin", 0x000000, 0x400000, CRC(93072a3d) SHA1(9f8770839032922e64d5ddd8864441357623c45f)) ROM_END +} // anonymous namespace + + // older releases (primarily for Asian market?) CONS( 201?, bbl380, 0, 0, bbl380, bbl380, bbl380_state, empty_init, "BaoBaoLong", "BBL380 - 180 in 1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/tvgames/trkfldch.cpp b/src/mame/tvgames/trkfldch.cpp index b83743a9eb2..f205f3f9e7e 100644 --- a/src/mame/tvgames/trkfldch.cpp +++ b/src/mame/tvgames/trkfldch.cpp @@ -42,6 +42,8 @@ Territory Pursuit uses y-flipped sprites #include "machine/timer.h" +namespace { + class trkfldch_state : public driver_device { public: @@ -1467,6 +1469,9 @@ ROM_START( shtscore ) ROM_LOAD( "shootnscore.bin", 0x000000, 0x400000, CRC(37aa16bd) SHA1(609d0191301480c51ec1188c67101a4e88a5170f) ) ROM_END +} // anonymous namespace + + CONS( 2007, trkfldch, 0, 0, trkfldch, trkfldch,trkfldch_state, empty_init, "Konami", "Track & Field Challenge", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) CONS( 2006, my1stddr, 0, 0, trkfldch, my1stddr,trkfldch_state, empty_init, "Konami", "My First Dance Dance Revolution (US)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // Japan version has different songs CONS( 200?, abl4play, 0, 0, trkfldch, abl4play,trkfldch_state, empty_init, "Advance Bright Ltd", "4 Player System - 10 in 1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/tvgames/xavix2.cpp b/src/mame/tvgames/xavix2.cpp index 56f30c5447e..f8c06b8c5ba 100644 --- a/src/mame/tvgames/xavix2.cpp +++ b/src/mame/tvgames/xavix2.cpp @@ -20,6 +20,9 @@ #include "machine/i2cmem.h" #include + +namespace { + class xavix2_state : public driver_device { public: @@ -752,6 +755,8 @@ ROM_START( dombikec ) ROM_LOAD( "xpbikeconcept.bin", 0x000000, 0x1000000, CRC(3447fce5) SHA1(c7e9e9cd789a17ac886ecf253f67753213cf8d21) ) ROM_END +} // anonymous namespace + CONS( 2006, ltv_naru, 0, 0, config, naruto, naruto_state, empty_init, "Bandai / SSD Company LTD", "Let's TV Play Naruto", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/tvgames/xavix2002_io.h b/src/mame/tvgames/xavix2002_io.h index 97af1cee883..6c35b899747 100644 --- a/src/mame/tvgames/xavix2002_io.h +++ b/src/mame/tvgames/xavix2002_io.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX2002_IO_H -#define MAME_MACHINE_XAVIX2002_IO_H +#ifndef MAME_TVGAMES_XAVIX2002_IO_H +#define MAME_TVGAMES_XAVIX2002_IO_H class xavix2002_io_device : public device_t @@ -46,4 +46,4 @@ private: DECLARE_DEVICE_TYPE(XAVIX2002IO, xavix2002_io_device) -#endif // MAME_MACHINE_XAVIX2002_IO_H +#endif // MAME_TVGAMES_XAVIX2002_IO_H diff --git a/src/mame/tvgames/xavix_adc.h b/src/mame/tvgames/xavix_adc.h index 53aac3ea934..817158b919b 100644 --- a/src/mame/tvgames/xavix_adc.h +++ b/src/mame/tvgames/xavix_adc.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX_ADC_H -#define MAME_MACHINE_XAVIX_ADC_H +#ifndef MAME_TVGAMES_XAVIX_ADC_H +#define MAME_TVGAMES_XAVIX_ADC_H class xavix_adc_device : public device_t { @@ -47,4 +47,4 @@ private: DECLARE_DEVICE_TYPE(XAVIX_ADC, xavix_adc_device) -#endif // MAME_MACHINE_XAVIX_ADC_H +#endif // MAME_TVGAMES_XAVIX_ADC_H diff --git a/src/mame/tvgames/xavix_anport.h b/src/mame/tvgames/xavix_anport.h index ae4972ea081..7864ec15b46 100644 --- a/src/mame/tvgames/xavix_anport.h +++ b/src/mame/tvgames/xavix_anport.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX_ANPORT_H -#define MAME_MACHINE_XAVIX_ANPORT_H +#ifndef MAME_TVGAMES_XAVIX_ANPORT_H +#define MAME_TVGAMES_XAVIX_ANPORT_H class xavix_anport_device : public device_t { @@ -38,4 +38,4 @@ private: DECLARE_DEVICE_TYPE(XAVIX_ANPORT, xavix_anport_device) -#endif // MAME_MACHINE_XAVIX_ANPORT_H +#endif // MAME_TVGAMES_XAVIX_ANPORT_H diff --git a/src/mame/tvgames/xavix_io.h b/src/mame/tvgames/xavix_io.h index fe9b46fdd8e..177c754a59f 100644 --- a/src/mame/tvgames/xavix_io.h +++ b/src/mame/tvgames/xavix_io.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX_IO_H -#define MAME_MACHINE_XAVIX_IO_H +#ifndef MAME_TVGAMES_XAVIX_IO_H +#define MAME_TVGAMES_XAVIX_IO_H class xavix_io_device : public device_t { @@ -39,4 +39,4 @@ private: DECLARE_DEVICE_TYPE(XAVIXIO, xavix_io_device) -#endif // MAME_MACHINE_XAVIX_IO_H +#endif // MAME_TVGAMES_XAVIX_IO_H diff --git a/src/mame/tvgames/xavix_madfb_ball.h b/src/mame/tvgames/xavix_madfb_ball.h index 6ee5d266fb0..ad7dbe4b998 100644 --- a/src/mame/tvgames/xavix_madfb_ball.h +++ b/src/mame/tvgames/xavix_madfb_ball.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX_MADFB_BALL_H -#define MAME_MACHINE_XAVIX_MADFB_BALL_H +#ifndef MAME_TVGAMES_XAVIX_MADFB_BALL_H +#define MAME_TVGAMES_XAVIX_MADFB_BALL_H #pragma once @@ -36,4 +36,4 @@ private: int m_is_running; }; -#endif // MAME_MACHINE_XAVIX_MADFB_BALL_H +#endif // MAME_TVGAMES_XAVIX_MADFB_BALL_H diff --git a/src/mame/tvgames/xavix_math.h b/src/mame/tvgames/xavix_math.h index 0ca20d8e156..e9fb6dedb5f 100644 --- a/src/mame/tvgames/xavix_math.h +++ b/src/mame/tvgames/xavix_math.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX_MATH_H -#define MAME_MACHINE_XAVIX_MATH_H +#ifndef MAME_TVGAMES_XAVIX_MATH_H +#define MAME_TVGAMES_XAVIX_MATH_H class xavix_math_device : public device_t { @@ -31,4 +31,4 @@ private: DECLARE_DEVICE_TYPE(XAVIX_MATH, xavix_math_device) -#endif // MAME_MACHINE_XAVIX_MATH_H +#endif // MAME_TVGAMES_XAVIX_MATH_H diff --git a/src/mame/tvgames/xavix_mtrk_wheel.h b/src/mame/tvgames/xavix_mtrk_wheel.h index 593fdf4808d..f36f1845507 100644 --- a/src/mame/tvgames/xavix_mtrk_wheel.h +++ b/src/mame/tvgames/xavix_mtrk_wheel.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_XAVIX_MTRK_WHEEL_H -#define MAME_MACHINE_XAVIX_MTRK_WHEEL_H +#ifndef MAME_TVGAMES_XAVIX_MTRK_WHEEL_H +#define MAME_TVGAMES_XAVIX_MTRK_WHEEL_H #pragma once @@ -37,4 +37,4 @@ private: int m_is_running; }; -#endif // MAME_MACHINE_XAVIX_MTRK_WHEEL_H +#endif // MAME_TVGAMES_XAVIX_MTRK_WHEEL_H diff --git a/src/mame/ultimachine/rambo.cpp b/src/mame/ultimachine/rambo.cpp index 1667cb535e6..8db72f89f8b 100644 --- a/src/mame/ultimachine/rambo.cpp +++ b/src/mame/ultimachine/rambo.cpp @@ -20,6 +20,9 @@ #include "emu.h" #include "cpu/avr8/avr8.h" + +namespace { + #define MASTER_CLOCK 16000000 /****************************************************\ @@ -161,5 +164,8 @@ ROM_START( metamaq2 ) ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP(2012, metamaq2, 0, 0, rambo, 0, rambo_state, empty_init, "Metamaquina", "Metamaquina 2 desktop 3d printer", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/ultratec/minicom.cpp b/src/mame/ultratec/minicom.cpp index 050da20b75f..25cafc478c3 100644 --- a/src/mame/ultratec/minicom.cpp +++ b/src/mame/ultratec/minicom.cpp @@ -44,6 +44,9 @@ Segment data is sent to each 14seg digit by first writing half of the data to po #include "cpu/mcs51/mcs51.h" #include "minicom.lh" + +namespace { + class minicom_state : public driver_device { public: @@ -249,6 +252,9 @@ ROM_START( mcom4_02 ) ROM_LOAD( "ultratec_minicom_iv_20020419.rom", 0x0000, 0x2000, CRC(99b6cc35) SHA1(32577005bf02042f893c8880f8ce5b3d8a5f55f9) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1997, minicom, 0, 0, minicom, 0, minicom_state, init_minicom, "Ultratec", "Minicom IV (1997-08-11)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND ) // fw release data: 11th Aug 1997 COMP( 2002, mcom4_02, 0, 0, minicom, 0, minicom_state, init_minicom, "Ultratec", "Minicom IV (2002-04-19)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND ) // fw release data: 19th Apr 2002 diff --git a/src/mame/unicard/bbcbc.cpp b/src/mame/unicard/bbcbc.cpp index fad42efee58..4b1c9136b3b 100644 --- a/src/mame/unicard/bbcbc.cpp +++ b/src/mame/unicard/bbcbc.cpp @@ -36,6 +36,9 @@ #include "bus/generic/carts.h" #include "softlist_dev.h" + +namespace { + class bbcbc_state : public driver_device { public: @@ -174,6 +177,9 @@ ROM_START( bbcbc ) ROM_LOAD("br_4_2.ic4", 0x2000, 0x2000, CRC(16a33aef) SHA1(9529f9f792718a3715af2063b91a5fb18f741226)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/unico/goori.cpp b/src/mame/unico/goori.cpp index 4e4d5b5751e..cb93e943c34 100644 --- a/src/mame/unico/goori.cpp +++ b/src/mame/unico/goori.cpp @@ -63,6 +63,8 @@ ROMS: #include "tilemap.h" +namespace { + class goori_state : public driver_device { public: @@ -325,5 +327,8 @@ ROM_START( goori ) ROM_LOAD( "1", 0x000000, 0x040000, CRC(c74351b9) SHA1(397f4b6aea23e6619e099c5cc99f38bae74bc3e8) ) // Unico style label, simply labeled 1 ROM_END +} // anonymous namespace + + GAME( 1999, goori, 0, goori, goori, goori_state, empty_init, ROT0, "Unico", "Goori Goori", 0 ) diff --git a/src/mame/unico/unianapc.cpp b/src/mame/unico/unianapc.cpp index cc4abbb1142..c29f0dc8540 100644 --- a/src/mame/unico/unianapc.cpp +++ b/src/mame/unico/unianapc.cpp @@ -31,6 +31,9 @@ #include "cpu/i386/i386.h" #include "machine/pci.h" + +namespace { + class unianapc_state : public driver_device { public: @@ -96,5 +99,8 @@ ROM_START( hogwild ) DISK_IMAGE( "hog wild", 0, BAD_DUMP SHA1(f05b7f64830d995db2e2a2f7f95ae0100de5dab1) ) ROM_END +} // anonymous namespace + + GAME( 2002, dhunting, 0, unianapc, unianapc, unianapc_state, empty_init, ROT0, "Game Box Entertainment", "Dream Hunting (US)", MACHINE_IS_SKELETON ) // Ver 1007? GAME( 2003, hogwild, 0, unianapc, unianapc, unianapc_state, empty_init, ROT0, "Uniana", "Hog Wild (US)", MACHINE_IS_SKELETON ) // Ver.00.26.b? diff --git a/src/mame/unisonic/gic.h b/src/mame/unisonic/gic.h index 5e939b0a2b0..1115e70fa9e 100644 --- a/src/mame/unisonic/gic.h +++ b/src/mame/unisonic/gic.h @@ -11,8 +11,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_GIC_H -#define MAME_VIDEO_GIC_H +#ifndef MAME_UNISONIC_GIC_H +#define MAME_UNISONIC_GIC_H #pragma once @@ -96,4 +96,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(GIC, gic_device) -#endif // MAME_VIDEO_GIC_H +#endif // MAME_UNISONIC_GIC_H diff --git a/src/mame/unisonic/unichamp.cpp b/src/mame/unisonic/unichamp.cpp index 41716e53ae7..a491062d120 100644 --- a/src/mame/unisonic/unichamp.cpp +++ b/src/mame/unisonic/unichamp.cpp @@ -53,6 +53,8 @@ #include "speaker.h" +namespace { + class unichamp_state : public driver_device { public: @@ -278,5 +280,7 @@ ROM_START(unichamp) //ROM_LOAD16_WORD( "pac-05.bin", 0x1000<<1, 0x1000, CRC(d54a6090) SHA1(e85593096f43dcf14b08fd2c9fda277008a8df8b)) ROM_END +} // anonymous namespace + CONS( 1977, unichamp, 0, 0, unichamp, unichamp, unichamp_state, empty_init, "Unisonic", "Champion 2711", 0/*MACHINE_IMPERFECT_GRAPHICS*/ ) diff --git a/src/mame/universal/cheekyms_a.h b/src/mame/universal/cheekyms_a.h index 65b25753e5f..ce638af63b0 100644 --- a/src/mame/universal/cheekyms_a.h +++ b/src/mame/universal/cheekyms_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -#ifndef MAME_AUDIO_CHEEKYMS_H -#define MAME_AUDIO_CHEEKYMS_H +#ifndef MAME_UNIVERSAL_CHEEKYMS_H +#define MAME_UNIVERSAL_CHEEKYMS_H #pragma once @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(CHEEKY_MOUSE_AUDIO, cheekyms_audio_device) -#endif // MAME_AUDIO_CHEEKYMS_H +#endif // MAME_UNIVERSAL_CHEEKYMS_H diff --git a/src/mame/universal/cosmicg.cpp b/src/mame/universal/cosmicg.cpp index e53e873ee77..52168f3afb7 100644 --- a/src/mame/universal/cosmicg.cpp +++ b/src/mame/universal/cosmicg.cpp @@ -22,6 +22,8 @@ Notes: #include "speaker.h" +namespace { + class cosmicg_state : public driver_device { public: @@ -434,6 +436,8 @@ void cosmicg_state::init_cosmicg() } } +} // anonymous namespace + GAME( 1979, cosmicg, 0, cosmicg, cosmicg, cosmicg_state, init_cosmicg, ROT270, "Universal", "Cosmic Guerilla", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1979, cosmicgi, cosmicg, cosmicg, cosmicg, cosmicg_state, init_cosmicg, ROT270, "bootleg (Inder)", "Cosmic Guerilla (Spanish bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/universal/ladybug_video.h b/src/mame/universal/ladybug_video.h index add6b8f3bd9..4907c231c3e 100644 --- a/src/mame/universal/ladybug_video.h +++ b/src/mame/universal/ladybug_video.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_VIDEO_LADYBUG_H -#define MAME_VIDEO_LADYBUG_H +#ifndef MAME_UNIVERSAL_LADYBUG_H +#define MAME_UNIVERSAL_LADYBUG_H #pragma once @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(LADYBUG_VIDEO, ladybug_video_device) -#endif // MAME_VIDEO_LADYBUG_H +#endif // MAME_UNIVERSAL_LADYBUG_H diff --git a/src/mame/universal/nl_cheekyms.h b/src/mame/universal/nl_cheekyms.h index f71547cf18a..c5ffc5c0790 100644 --- a/src/mame/universal/nl_cheekyms.h +++ b/src/mame/universal/nl_cheekyms.h @@ -1,7 +1,7 @@ // license:CC0-1.0 // copyright-holders:Vas Crabb -#ifndef MAME_AUDIO_NL_CHEEKYMS_H -#define MAME_AUDIO_NL_CHEEKYMS_H +#ifndef MAME_UNIVERSAL_NL_CHEEKYMS_H +#define MAME_UNIVERSAL_NL_CHEEKYMS_H #pragma once @@ -9,4 +9,4 @@ NETLIST_EXTERNAL(cheekyms) -#endif // MAME_AUDIO_NL_CHEEKYMS_H +#endif // MAME_UNIVERSAL_NL_CHEEKYMS_H diff --git a/src/mame/universal/superdq.cpp b/src/mame/universal/superdq.cpp index 202e81bdf23..3500258b152 100644 --- a/src/mame/universal/superdq.cpp +++ b/src/mame/universal/superdq.cpp @@ -29,6 +29,8 @@ #include "tilemap.h" +namespace { + #define MASTER_CLOCK 20000000 @@ -412,6 +414,7 @@ ROM_START( superdqa ) /* short scenes, alternate */ DISK_IMAGE_READONLY( "superdq", 0, NO_DUMP ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/universal/zerohour_stars.h b/src/mame/universal/zerohour_stars.h index eb4aa9d5d96..ef8e477bad2 100644 --- a/src/mame/universal/zerohour_stars.h +++ b/src/mame/universal/zerohour_stars.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Frank Palazzolo -#ifndef MAME_VIDEO_ZEROHOUR_STARS_H -#define MAME_VIDEO_ZEROHOUR_STARS_H +#ifndef MAME_UNIVERSAL_ZEROHOUR_STARS_H +#define MAME_UNIVERSAL_ZEROHOUR_STARS_H #pragma once @@ -39,4 +39,4 @@ private: DECLARE_DEVICE_TYPE(ZEROHOUR_STARS, zerohour_stars_device) -#endif // MAME_VIDEO_ZEROHOUR_STARS_H +#endif // MAME_UNIVERSAL_ZEROHOUR_STARS_H diff --git a/src/mame/ussr/cm1800.cpp b/src/mame/ussr/cm1800.cpp index b8439a69cff..3e6edbdcc34 100644 --- a/src/mame/ussr/cm1800.cpp +++ b/src/mame/ussr/cm1800.cpp @@ -40,6 +40,8 @@ to be a save command. #include "bus/rs232/rs232.h" +namespace { + class cm1800_state : public driver_device { public: @@ -124,6 +126,9 @@ ROM_START( cm1800 ) ROM_LOAD( "cm1800.rom", 0x0000, 0x0800, CRC(85d71d25) SHA1(42dc87d2eddc2906fa26d35db88a2e29d50fb481) ) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/dvk_kcgd.cpp b/src/mame/ussr/dvk_kcgd.cpp index 60b3a1a1120..d55fd45478f 100644 --- a/src/mame/ussr/dvk_kcgd.cpp +++ b/src/mame/ussr/dvk_kcgd.cpp @@ -45,6 +45,20 @@ #include "screen.h" +//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already +#define LOG_VRAM (1U << 1) +#define LOG_DEBUG (1U << 2) + +//#define VERBOSE (LOG_DEBUG) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" + +#define LOGVRAM(...) LOGMASKED(LOG_VRAM, __VA_ARGS__) +#define LOGDBG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__) + + +namespace { + // these are unverified static constexpr int KCGD_TOTAL_HORZ = 977; static constexpr int KCGD_DISP_HORZ = 800; @@ -58,18 +72,6 @@ static constexpr int KCGD_PAGE_0 = 015574; static constexpr int KCGD_PAGE_1 = 005574; -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_VRAM (1U << 1) -#define LOG_DEBUG (1U << 2) - -//#define VERBOSE (LOG_DEBUG) -//#define LOG_OUTPUT_FUNC osd_printf_info -#include "logmacro.h" - -#define LOGVRAM(...) LOGMASKED(LOG_VRAM, __VA_ARGS__) -#define LOGDBG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__) - - class kcgd_state : public driver_device { public: @@ -442,6 +444,9 @@ ROM_START( dvk_kcgd ) ROMX_LOAD("kr1801re2-182.bin", 0100000, 020000, CRC(3ca2921a) SHA1(389b30c40ed7e41dae71d58c7bff630359a48153), ROM_BIOS(1)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/dvk_ksm.cpp b/src/mame/ussr/dvk_ksm.cpp index 51c5560551f..25d6cbb31d5 100644 --- a/src/mame/ussr/dvk_ksm.cpp +++ b/src/mame/ussr/dvk_ksm.cpp @@ -65,6 +65,20 @@ ksm|DVK KSM, #include "screen.h" +//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already +#define LOG_KEYBOARD (1U << 1) +#define LOG_DEBUG (1U << 2) + +//#define VERBOSE (LOG_DEBUG) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" + +#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__) +#define LOGDBG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__) + + +namespace { + static constexpr int SCREEN_PAGE = 80 * 48; static constexpr int KSM_TOTAL_HORZ = 1000; @@ -79,18 +93,6 @@ static constexpr int KSM_STATUSLINE_TOTAL = 11; static constexpr int KSM_STATUSLINE_VRAM = 0xF8B0; -//#define LOG_GENERAL (1U << 0) //defined in logmacro.h already -#define LOG_KEYBOARD (1U << 1) -#define LOG_DEBUG (1U << 2) - -//#define VERBOSE (LOG_DEBUG) -//#define LOG_OUTPUT_FUNC osd_printf_info -#include "logmacro.h" - -#define LOGKBD(...) LOGMASKED(LOG_KEYBOARD, __VA_ARGS__) -#define LOGDBG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__) - - class ksm_state : public driver_device { public: @@ -466,6 +468,9 @@ ROM_START( dvk_ksm ) ROM_LOAD("ksm_03_cg_d31.bin", 0x0000, 0x0800, CRC(6a8477e2) SHA1(c7871a96f135db05c3c8d718fbdf1728e22e72b7)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/ie15.cpp b/src/mame/ussr/ie15.cpp index 6699a9c2805..63f4dd65b5d 100644 --- a/src/mame/ussr/ie15.cpp +++ b/src/mame/ussr/ie15.cpp @@ -19,6 +19,8 @@ #include "machine/ie15_kbd.h" +namespace { + class ie15_state : public driver_device { public: @@ -56,5 +58,8 @@ void ie15_state::ie15(machine_config &config) ROM_START(ie15) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1980, ie15, 0, 0, ie15, 0, ie15_state, empty_init, "USSR", "15IE-00-013", 0) diff --git a/src/mame/ussr/irisha.cpp b/src/mame/ussr/irisha.cpp index fd8319d1aec..a74557c8e9b 100644 --- a/src/mame/ussr/irisha.cpp +++ b/src/mame/ussr/irisha.cpp @@ -34,6 +34,9 @@ TODO: #include "screen.h" #include "speaker.h" + +namespace { + class irisha_state : public driver_device { public: @@ -428,6 +431,9 @@ ROM_START( irisha ) ROM_LOAD( "ir_conou.bin", 0x2000, 0x2000, CRC(bf92beed) SHA1(696c482ba53bc6261db11061ecc7141c67f1d820)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1983, irisha, 0, 0, irisha, irisha, irisha_state, empty_init, "MGU", "Irisha", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ussr/km035.h b/src/mame/ussr/km035.h index 4d342737c23..a665c7f81e1 100644 --- a/src/mame/ussr/km035.h +++ b/src/mame/ussr/km035.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Sergey Svishchev -#ifndef MAME_MACHINE_KM035_H -#define MAME_MACHINE_KM035_H +#ifndef MAME_USSR_KM035_H +#define MAME_USSR_KM035_H #pragma once @@ -58,4 +58,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(KM035, km035_device) -#endif // MAME_MACHINE_KM035_H +#endif // MAME_USSR_KM035_H diff --git a/src/mame/ussr/mikrosha.cpp b/src/mame/ussr/mikrosha.cpp index 45bde38ca55..e4b9adca20a 100644 --- a/src/mame/ussr/mikrosha.cpp +++ b/src/mame/ussr/mikrosha.cpp @@ -21,6 +21,8 @@ #include "formats/rk_cas.h" +namespace { + class mikrosha_state : public radio86_state { public: @@ -291,6 +293,9 @@ ROM_START( m86rk ) ROM_LOAD ("mikrosha.fnt", 0x0000, 0x0800, CRC(b315da1c) SHA1(b5bf9abc0fff75b1aba709a7f08b23d4a89bb04b)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1987, mikrosha, radio86, 0, mikrosha, mikrosha, mikrosha_state, init_radio86, "Lianozovo Electromechanical Factory", "Mikrosha", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ussr/mk85.cpp b/src/mame/ussr/mk85.cpp index e7afc40516d..d0ee410211f 100644 --- a/src/mame/ussr/mk85.cpp +++ b/src/mame/ussr/mk85.cpp @@ -25,6 +25,8 @@ Models: #include "screen.h" +namespace { + class mk85_state : public driver_device { public: @@ -98,6 +100,9 @@ ROM_START( mk85 ) ROM_LOAD( "mk85.rom", 0x0000, 0x4000, CRC(398e4fd1) SHA1(5e2f877d0f451b46840f01190004552bad5248c8)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/mk90.cpp b/src/mame/ussr/mk90.cpp index 0effd6ccd8b..afba469a7b5 100644 --- a/src/mame/ussr/mk90.cpp +++ b/src/mame/ussr/mk90.cpp @@ -24,6 +24,8 @@ Status: Starts in the weeds. #include "screen.h" +namespace { + class mk90_state : public driver_device { public: @@ -109,6 +111,9 @@ ROM_START( mk90 ) ROMX_LOAD( "mk90ro20t.bin", 0x4000, 0x4000, CRC(0f4b9434) SHA1(c74bbde6d201913c9e67ef8e2abe14b784187f8d), ROM_BIOS(1)) // Expansion ROM ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/mk98.cpp b/src/mame/ussr/mk98.cpp index cf9dde16fcd..f462dacf2e5 100644 --- a/src/mame/ussr/mk98.cpp +++ b/src/mame/ussr/mk98.cpp @@ -60,6 +60,8 @@ #define LOGDBG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__) +namespace { + class mk98_state : public driver_device { public: @@ -479,6 +481,8 @@ ROM_START( mk98 ) ROM_LOAD("e0000.bin", 0, 0x20000, CRC(85785bd5) SHA1(b10811715f44cf8e2b41baea7b62a35082e04048)) ROM_END +} // anonymous namespace + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1998, mk98, 0, 0, mk98, 0, mk98_state, empty_init, "Elektronika", "MK-98", MACHINE_IS_SKELETON) diff --git a/src/mame/ussr/ms6102.cpp b/src/mame/ussr/ms6102.cpp index 246e0b84416..e3cd35ddea6 100644 --- a/src/mame/ussr/ms6102.cpp +++ b/src/mame/ussr/ms6102.cpp @@ -55,6 +55,8 @@ #include "logmacro.h" +namespace { + class ms6102_state : public driver_device { public: @@ -384,6 +386,9 @@ ROM_START( ms6102 ) ROM_LOAD("mc6102_02_k556rt4_d64", 0x0000, 0x0100, CRC(a59fdaa7) SHA1(0851a8b12e838e8f7e5ce840a0262facce303442)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/pyl601.cpp b/src/mame/ussr/pyl601.cpp index 1cb0ffbcafc..2ff30dc7b24 100644 --- a/src/mame/ussr/pyl601.cpp +++ b/src/mame/ussr/pyl601.cpp @@ -53,6 +53,8 @@ The BASIC #include "utf8.h" +namespace { + class pyl601_state : public driver_device { public: @@ -641,6 +643,10 @@ ROM_START( pyl601a ) ROM_REGION(0x0800, "keyboard", 0) ROM_LOAD( "keyboard.rom", 0x0000, 0x0800, CRC(41fbe5ca) SHA1(875adaef53bc37e92ad0b6b6ee3d8fd28344d358)) ROM_END + +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/sm1800.cpp b/src/mame/ussr/sm1800.cpp index 9f70c78868f..66fa689104c 100644 --- a/src/mame/ussr/sm1800.cpp +++ b/src/mame/ussr/sm1800.cpp @@ -24,6 +24,8 @@ #include "screen.h" +namespace { + class sm1800_state : public driver_device { public: @@ -203,6 +205,9 @@ ROM_START( sm1800 ) ROM_LOAD( "font.bin", 0x0000, 0x0800, CRC(28ed9ebc) SHA1(f561136962a06a5dcb5a0436931d29e940155d24)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/ussr/sm7238.cpp b/src/mame/ussr/sm7238.cpp index 0bd2aa5312e..c8256721282 100644 --- a/src/mame/ussr/sm7238.cpp +++ b/src/mame/ussr/sm7238.cpp @@ -31,6 +31,13 @@ #include "screen.h" +//#define VERBOSE (LOG_DEBUG) +//#define LOG_OUTPUT_FUNC osd_printf_info +#include "logmacro.h" + + +namespace { + static constexpr int KSM_COLUMNS_MAX = 132; static constexpr int KSM_TOTAL_HORZ = KSM_COLUMNS_MAX * 10; @@ -40,11 +47,6 @@ static constexpr int KSM_TOTAL_VERT = 260; static constexpr int KSM_DISP_VERT = 250; -//#define VERBOSE (LOG_DEBUG) -//#define LOG_OUTPUT_FUNC osd_printf_info -#include "logmacro.h" - - class sm7238_state : public driver_device { public: @@ -433,6 +435,9 @@ ROM_START( sm7238 ) ROM_LOAD( "bsk1_00_2.064", 0x0000, 0x2000, CRC(1e3d5885) SHA1(5afdc10f775f424473c2a78de62e3bfc82bdddd1)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ussr/specialsound.h b/src/mame/ussr/specialsound.h index 51dca82f12f..4b4a3b5c300 100644 --- a/src/mame/ussr/specialsound.h +++ b/src/mame/ussr/specialsound.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_AUDIO_SPECIAL_H -#define MAME_AUDIO_SPECIAL_H +#ifndef MAME_USSR_SPECIAL_H +#define MAME_USSR_SPECIAL_H #pragma once @@ -35,4 +35,4 @@ private: DECLARE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device) -#endif // MAME_AUDIO_SPECIAL_H +#endif // MAME_USSR_SPECIAL_H diff --git a/src/mame/ussr/tiamc1_a.h b/src/mame/ussr/tiamc1_a.h index f469e8a40e0..aaf856a4156 100644 --- a/src/mame/ussr/tiamc1_a.h +++ b/src/mame/ussr/tiamc1_a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Eugene Sandulenko -#ifndef MAME_AUDIO_TIAMC1_H -#define MAME_AUDIO_TIAMC1_H +#ifndef MAME_USSR_TIAMC1_H +#define MAME_USSR_TIAMC1_H #pragma once @@ -64,4 +64,4 @@ private: DECLARE_DEVICE_TYPE(TIAMC1, tiamc1_sound_device) -#endif // MAME_AUDIO_TIAMC1_H +#endif // MAME_USSR_TIAMC1_H diff --git a/src/mame/ussr/uknc.cpp b/src/mame/ussr/uknc.cpp index 85d9704b26f..e5d4a86627a 100644 --- a/src/mame/ussr/uknc.cpp +++ b/src/mame/ussr/uknc.cpp @@ -19,6 +19,8 @@ Status: both CPUs start in the weeds. #include "screen.h" +namespace { + class uknc_state : public driver_device { public: @@ -102,6 +104,9 @@ ROM_START( uknc ) ROM_REGION( 0x8000, "subcpu", ROMREGION_ERASEFF ) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ -- cgit v1.2.3