From 1235c64ecd25dc6faccc2ba9cf5ef541953b564b Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Mon, 16 Jan 2023 18:27:28 +0100 Subject: mame/a*: put drivers in anonymous namespaces where applicable, updated #ifndef guards to the current tree structure --- src/mame/access/acvirus.cpp | 10 ++++++++-- src/mame/acorn/acrnsys1.cpp | 4 ++++ src/mame/acorn/aristmk5.cpp | 5 +++++ src/mame/acorn/cms.cpp | 4 ++++ src/mame/acorn/ertictac.cpp | 5 +++++ src/mame/acorn/riscpc.cpp | 6 ++++++ src/mame/acorn/upd65031.h | 6 +++--- src/mame/acorn/z88_impexp.h | 6 +++--- src/mame/act/apricotkb.h | 6 +++--- src/mame/act/apricotp.cpp | 7 +++++-- src/mame/act/victor9k_fdc.h | 6 +++--- src/mame/act/victor9k_kb.h | 6 +++--- src/mame/adc/superslave.cpp | 4 ++++ src/mame/adp/manohman.cpp | 4 ++++ src/mame/adp/stellafr.cpp | 4 ++++ src/mame/agat/agat.cpp | 5 +++++ src/mame/agat/agat7.h | 6 +++--- src/mame/agat/agat9.h | 6 +++--- src/mame/agat/agatkeyb.h | 6 +++--- src/mame/akai/akaiax80.cpp | 6 ++++++ src/mame/akai/akaivx600.cpp | 6 ++++++ src/mame/alba/rmhaihai.cpp | 4 ++++ src/mame/alliedleisure/ace.cpp | 5 +++++ src/mame/alliedleisure/aleisttl.cpp | 5 +++++ src/mame/alliedleisure/clayshoo.cpp | 3 +++ src/mame/alpha/ad_sound.h | 6 +++--- src/mame/alpha/alpha8201.h | 6 +++--- src/mame/altos/acs8600_ics.h | 6 +++--- src/mame/altos/altos2.cpp | 6 ++++++ src/mame/altos/altos486.cpp | 6 ++++++ src/mame/altos/altos8600.cpp | 6 ++++++ src/mame/amiga/amigaaga.h | 6 +++--- src/mame/amiga/arsystems.cpp | 4 ++++ src/mame/amiga/cubo.cpp | 4 ++++ src/mame/amiga/mquake.cpp | 3 +++ src/mame/amirix/wxstar4000.cpp | 6 ++++++ src/mame/ampro/ampro.cpp | 6 ++++++ src/mame/ampro/lb186.cpp | 6 ++++++ src/mame/ampro/lbpc.cpp | 5 +++++ src/mame/amstrad/ams40041.h | 6 +++--- src/mame/amstrad/pc1512kb.h | 6 +++--- src/mame/amstrad/pda600.cpp | 5 +++++ src/mame/apollo/apollo_dbg.h | 6 +++--- src/mame/apollo/apollo_kbd.h | 6 +++--- src/mame/apple/adbmodem.h | 6 +++--- src/mame/apple/apple1.cpp | 6 ++++++ src/mame/apple/apple2common.h | 6 +++--- src/mame/apple/cuda.h | 6 +++--- src/mame/apple/egret.h | 6 +++--- src/mame/apple/iphone2g.cpp | 6 ++++++ src/mame/apple/mac128.cpp | 6 ++++++ src/mame/apple/macadb.h | 6 +++--- src/mame/apple/macpdm.cpp | 11 ++++++++--- src/mame/apple/macprtb.cpp | 6 ++++++ src/mame/apple/macpwrbk030.cpp | 6 ++++++ src/mame/apple/macrtc.h | 6 +++--- src/mame/apple/macscsi.h | 6 +++--- src/mame/apple/newton.cpp | 6 ++++++ src/mame/arcadia/arcadia_a.h | 6 +++--- src/mame/aristocrat/aristmk4.cpp | 7 +++++-- src/mame/aristocrat/caswin.cpp | 5 +++++ src/mame/atari/akkaarrh.cpp | 3 +++ src/mame/atari/antic.h | 6 +++--- src/mame/atari/asic65.h | 6 +++--- src/mame/atari/atarifdc.h | 6 +++--- src/mame/atari/atarigen.h | 6 +++--- src/mame/atari/atarijsa.h | 6 +++--- src/mame/atari/atarimo.h | 6 +++--- src/mame/atari/atarirle.h | 6 +++--- src/mame/atari/atarisac.h | 6 +++--- src/mame/atari/atariscom.h | 6 +++--- src/mame/atari/atarist_v.h | 6 +++--- src/mame/atari/ataristb.h | 6 +++--- src/mame/atari/atarisy4.cpp | 4 ++++ src/mame/atari/atarivad.h | 6 +++--- src/mame/atari/atarixga.h | 6 +++--- src/mame/atari/boxer.cpp | 5 +++++ src/mame/atari/cball.cpp | 4 ++++ src/mame/atari/cmmb.cpp | 6 ++++++ src/mame/atari/destroyr.cpp | 4 ++++ src/mame/atari/firefox.cpp | 3 +++ src/mame/atari/flyball.cpp | 5 +++++ src/mame/atari/gtia.h | 6 +++--- src/mame/atari/jag_blitter.h | 6 +++--- src/mame/atari/marblmd2.cpp | 6 ++++++ src/mame/atari/maria.h | 6 +++--- src/mame/atari/mathbox.h | 6 +++--- src/mame/atari/maxaflex.cpp | 4 ++++ src/mame/atari/mgolf.cpp | 5 +++++ src/mame/atari/nl_destroyr.h | 6 +++--- src/mame/atari/nl_flyball.h | 6 +++--- src/mame/atari/nl_stuntcyc.h | 6 +++--- src/mame/atari/nl_tank.h | 6 +++--- src/mame/atari/pofo_kbd.h | 6 +++--- src/mame/atari/pong.cpp | 6 ++++++ src/mame/atari/redbaron.h | 6 +++--- src/mame/atari/sbrkout.cpp | 6 ++++++ src/mame/atari/tia.h | 6 +++--- src/mame/atari/tourtabl.cpp | 4 ++++ src/mame/atlus/bowltry.cpp | 5 +++++ src/mame/atlus/patapata.cpp | 5 +++++ src/mame/att/att3b2.cpp | 6 ++++++ src/mame/att/att4425.cpp | 5 +++++ src/mame/att/att610.cpp | 6 ++++++ src/mame/att/att630.cpp | 6 ++++++ src/mame/ausnz/binbug.cpp | 5 +++++ src/mame/ausnz/d6800.cpp | 5 +++++ src/mame/ausnz/datum.cpp | 5 +++++ src/mame/ausnz/dg680.cpp | 5 +++++ src/mame/ausnz/eacc.cpp | 4 ++++ src/mame/ausnz/eti660.cpp | 6 ++++++ src/mame/ausnz/magnum.cpp | 6 ++++++ src/mame/ausnz/pipbug.cpp | 5 +++++ src/mame/ausnz/proteus.cpp | 4 ++++ src/mame/ausnz/tec1.cpp | 5 +++++ 115 files changed, 486 insertions(+), 153 deletions(-) diff --git a/src/mame/access/acvirus.cpp b/src/mame/access/acvirus.cpp index a18a3c9bbd4..a253f59a859 100644 --- a/src/mame/access/acvirus.cpp +++ b/src/mame/access/acvirus.cpp @@ -40,12 +40,12 @@ and banks 8-14 seem to contain factory default settings. There are flash programming routines at the beginning of banks 7 and 15, and two at the end of bank 6. Not sure why there are so many, and not all are - identical, so there's probably additional bank swithing logic to match. + identical, so there's probably additional bank switching logic to match. All display a charming "DO NOT TOUCH ME" message while programming. :) The same bank switching also seems to affect external memory, but I'm not sure how the smaller SRAM is mapped. Some external memory locations - are used for other tasks, like communicatng with the DSP. + are used for other tasks, like communicating with the DSP. The initial DSP program and data upload routine is at 0x1FAA. After setting up the bus, it churns out all the 24-bit words in banks 3-6 @@ -67,6 +67,9 @@ #include "machine/intelfsh.h" #include "speaker.h" + +namespace { + class acvirus_state : public driver_device { public: @@ -148,6 +151,9 @@ ROM_START( viruscl ) ROM_LOAD( "virus_cl_061_release.bin", 0x000000, 0x080000, CRC(a202e443) SHA1(33d5f4ebbacc817ab1e5dd572e8dc755f6c5e253) ) ROM_END +} // anonymous namespace + + CONS( 1997, virusa, 0, 0, virus, virus, acvirus_state, empty_init, "Access", "Virus A", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) CONS( 1999, virusb, 0, 0, virus, virus, acvirus_state, empty_init, "Access", "Virus B (Ver. T)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) CONS( 2002, virusc, 0, 0, virus, virus, acvirus_state, empty_init, "Access", "Virus C", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) diff --git a/src/mame/acorn/acrnsys1.cpp b/src/mame/acorn/acrnsys1.cpp index af84fb30161..3cd886af6cb 100644 --- a/src/mame/acorn/acrnsys1.cpp +++ b/src/mame/acorn/acrnsys1.cpp @@ -58,6 +58,8 @@ Note that left-most digit is not wired up, and therefore will always be blank. #include "acrnsys1.lh" +namespace { + class acrnsys1_state : public driver_device { public: @@ -300,6 +302,8 @@ ROM_START( acrnsys1 ) ROM_LOAD("acrnsys1.bin", 0x0000, 0x0200, CRC(43dcfc16) SHA1(b987354c55beb5e2ced761970c3339b895a8c09d)) ROM_END +} // anonymous namespace + /*************************************************************************** GAME DRIVERS diff --git a/src/mame/acorn/aristmk5.cpp b/src/mame/acorn/aristmk5.cpp index 5c699ed4155..c6897d39d0f 100644 --- a/src/mame/acorn/aristmk5.cpp +++ b/src/mame/acorn/aristmk5.cpp @@ -707,6 +707,9 @@ #include "swhr2u.lh" // 5 1, 2, 3, 4, 5 25 #include "wnpost.lh" // 5 1, 2, 3, 5, 10 50 + +namespace { + #define MASTER_CLOCK 72_MHz_XTAL /* confirmed */ class aristmk5_state : public driver_device @@ -8630,6 +8633,8 @@ ROM_START( yukongl5 ) ROM_LOAD32_WORD( "03j00191.u13", 0x200002, 0x80000, CRC(e514b87f) SHA1(5423215bc03ab8468d5ebec0dba6ba7820cdcd50) ) ROM_END +} // anonymous namespace + /************************* * Game Drivers * diff --git a/src/mame/acorn/cms.cpp b/src/mame/acorn/cms.cpp index 8c9b5389276..83749ec13b0 100644 --- a/src/mame/acorn/cms.cpp +++ b/src/mame/acorn/cms.cpp @@ -52,6 +52,8 @@ #include "bus/acorn/bus.h" +namespace { + class cms_state : public driver_device { public: @@ -205,6 +207,8 @@ ROM_START( cms6502 ) ROM_LOAD("bassys2.ic8", 0x0000, 0x0200, CRC(417ff0b4) SHA1(878718accb83f18456fefaf67a0e4a6a407113e4)) // 512x8 ROM_END +} // anonymous namespace + /* Driver */ diff --git a/src/mame/acorn/ertictac.cpp b/src/mame/acorn/ertictac.cpp index 035348bbced..d7f8d611a1f 100644 --- a/src/mame/acorn/ertictac.cpp +++ b/src/mame/acorn/ertictac.cpp @@ -31,6 +31,8 @@ PCB has a single OSC at 24MHz #include "screen.h" +namespace { + class ertictac_state : public driver_device { public: @@ -345,6 +347,9 @@ ROM_START( poizone ) ROM_LOAD32_BYTE( "p_son24.bin", 0x140003, 0x10000, CRC(a09d7f55) SHA1(e0d562c655c16034b40db93de801b98b7948beb2) ) ROM_END +} // anonymous namespace + + GAME( 1990, ertictac, 0, ertictac, ertictac, ertictac_state, init_ertictac, ROT0, "Sisteme", "Erotictac/Tactic", MACHINE_IMPERFECT_SOUND) GAME( 1990, ertictaca, ertictac, ertictac, ertictac, ertictac_state, init_ertictac, ROT0, "Sisteme", "Erotictac/Tactic (ver 01)", MACHINE_IMPERFECT_SOUND) GAME( 1990, ertictacb, ertictac, ertictac, ertictac, ertictac_state, init_ertictac, ROT0, "Sisteme", "Erotictac/Tactic (set 2)", MACHINE_IMPERFECT_SOUND) diff --git a/src/mame/acorn/riscpc.cpp b/src/mame/acorn/riscpc.cpp index e09a9348165..905393ad722 100644 --- a/src/mame/acorn/riscpc.cpp +++ b/src/mame/acorn/riscpc.cpp @@ -30,6 +30,9 @@ #include "speaker.h" #include "debugger.h" + +namespace { + class riscpc_state : public driver_device { public: @@ -322,6 +325,9 @@ ROM_START(sarpc_j233) ROMX_LOAD("1203,262-01.bin", 0x000002, 0x200000, CRC(cf4615b4) SHA1(c340f29aeda3557ebd34419fcb28559fc9b620f8), ROM_GROUPWORD | ROM_SKIP(2) | ROM_BIOS(0)) ROM_END +} // anonymous namespace + + /*************************************************************************** Game driver(s) diff --git a/src/mame/acorn/upd65031.h b/src/mame/acorn/upd65031.h index 427ba877408..13dd6710647 100644 --- a/src/mame/acorn/upd65031.h +++ b/src/mame/acorn/upd65031.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_UPD65031_H -#define MAME_MACHINE_UPD65031_H +#ifndef MAME_ACORN_UPD65031_H +#define MAME_ACORN_UPD65031_H #pragma once @@ -117,4 +117,4 @@ private: DECLARE_DEVICE_TYPE(UPD65031, upd65031_device) -#endif // MAME_MACHINE_UPD65031_H +#endif // MAME_ACORN_UPD65031_H diff --git a/src/mame/acorn/z88_impexp.h b/src/mame/acorn/z88_impexp.h index c73bc04a041..afba9947383 100644 --- a/src/mame/acorn/z88_impexp.h +++ b/src/mame/acorn/z88_impexp.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Sandro Ronco -#ifndef MAME_MACHINE_Z88_IMPEXP_H -#define MAME_MACHINE_Z88_IMPEXP_H +#ifndef MAME_ACORN_Z88_IMPEXP_H +#define MAME_ACORN_Z88_IMPEXP_H #pragma once @@ -68,4 +68,4 @@ private: DECLARE_DEVICE_TYPE(Z88_IMPEXP, z88_impexp_device) -#endif // MAME_MACHINE_Z88_IMPEXP_H +#endif // MAME_ACORN_Z88_IMPEXP_H diff --git a/src/mame/act/apricotkb.h b/src/mame/act/apricotkb.h index e9a9d401ef0..c471f6f825a 100644 --- a/src/mame/act/apricotkb.h +++ b/src/mame/act/apricotkb.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_MACHINE_APRICOTKB_H -#define MAME_MACHINE_APRICOTKB_H +#ifndef MAME_ACT_APRICOTKB_H +#define MAME_ACT_APRICOTKB_H #pragma once @@ -72,4 +72,4 @@ DECLARE_DEVICE_TYPE(APRICOT_KEYBOARD, apricot_keyboard_device) -#endif // MAME_MACHINE_APRICOTKB_H +#endif // MAME_ACT_APRICOTKB_H diff --git a/src/mame/act/apricotp.cpp b/src/mame/act/apricotp.cpp index c40cdcb0a7a..4f534e5e3a4 100644 --- a/src/mame/act/apricotp.cpp +++ b/src/mame/act/apricotp.cpp @@ -43,6 +43,8 @@ #include "apricotp.lh" +namespace { + //************************************************************************** // MACROS / CONSTANTS //************************************************************************** @@ -130,11 +132,11 @@ private: void mem_w(offs_t offset, uint16_t data); uint8_t prtr_snd_r(); void pint_clr_w(uint8_t data); - void ls_w(uint8_t data); + [[maybe_unused]] void ls_w(uint8_t data); void contrast_w(uint8_t data); void palette_w(uint8_t data); void video_w(uint16_t data); - void lat_w(offs_t offset, uint8_t data); + [[maybe_unused]] void lat_w(offs_t offset, uint8_t data); void lat_ls259_w(offs_t offset, int state); @@ -675,6 +677,7 @@ ROM_START( fp ) ROM_LOAD( "pal3 pal12l6.ic77", 0x000, 0x100, NO_DUMP ) // ? ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/act/victor9k_fdc.h b/src/mame/act/victor9k_fdc.h index 6f91f426d48..44abe04c863 100644 --- a/src/mame/act/victor9k_fdc.h +++ b/src/mame/act/victor9k_fdc.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_VICTOR9K_FDC_H -#define MAME_MACHINE_VICTOR9K_FDC_H +#ifndef MAME_ACT_VICTOR9K_FDC_H +#define MAME_ACT_VICTOR9K_FDC_H #pragma once @@ -226,4 +226,4 @@ private: DECLARE_DEVICE_TYPE(VICTOR_9000_FDC, victor_9000_fdc_device) -#endif // MAME_MACHINE_VICTOR9K_FDC_H +#endif // MAME_ACT_VICTOR9K_FDC_H diff --git a/src/mame/act/victor9k_kb.h b/src/mame/act/victor9k_kb.h index ae5c614c95e..29735baffa2 100644 --- a/src/mame/act/victor9k_kb.h +++ b/src/mame/act/victor9k_kb.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_MACHINE_VICTOR9K_KB_H -#define MAME_MACHINE_VICTOR9K_KB_H +#ifndef MAME_ACT_VICTOR9K_KB_H +#define MAME_ACT_VICTOR9K_KB_H #pragma once @@ -66,4 +66,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(VICTOR9K_KEYBOARD, victor_9000_keyboard_device) -#endif // MAME_MACHINE_VICTOR9K_KB_H +#endif // MAME_ACT_VICTOR9K_KB_H diff --git a/src/mame/adc/superslave.cpp b/src/mame/adc/superslave.cpp index 9f6b843e6b4..4496e49f5a5 100644 --- a/src/mame/adc/superslave.cpp +++ b/src/mame/adc/superslave.cpp @@ -31,6 +31,9 @@ Oxx,yy = Out port #include "machine/z80pio.h" #include "machine/z80sio.h" + +namespace { + #define Z80_TAG "u45" #define Z80DART_0_TAG "u14" #define Z80DART_1_TAG "u30" @@ -441,6 +444,7 @@ ROM_START( superslv ) ROM_LOAD( "adcs6_slave_v3.2.bin", 0x000, 0x800, CRC(7f39322d) SHA1(2e9621e09378a1bb6fc05317bb58ae7865e52744) ) ROM_END +} // anonymous namespace //************************************************************************** diff --git a/src/mame/adp/manohman.cpp b/src/mame/adp/manohman.cpp index 77bd6d7c3ed..df89fc6a667 100644 --- a/src/mame/adp/manohman.cpp +++ b/src/mame/adp/manohman.cpp @@ -141,6 +141,8 @@ #include "speaker.h" +namespace { + class manohman_state : public driver_device { public: @@ -274,6 +276,8 @@ ROM_START( backgamn ) ROM_LOAD16_BYTE( "b_f2_ii.bin", 0x00001, 0x10000, CRC(8e0ee50c) SHA1(2a05c337db1131b873646aa4109593636ebaa356) ) ROM_END +} // anonymous namespace + /********************************************* * Game Drivers * diff --git a/src/mame/adp/stellafr.cpp b/src/mame/adp/stellafr.cpp index e71916c1e4e..be493f95331 100644 --- a/src/mame/adp/stellafr.cpp +++ b/src/mame/adp/stellafr.cpp @@ -17,6 +17,8 @@ Possibly related to ADP hardware? The HD63484 video board is definitely absent h #include "sound/ay8910.h" #include "speaker.h" +namespace { + class stellafr_state : public driver_device { public: @@ -121,6 +123,8 @@ ROM_START( st_vulkn ) ROM_LOAD16_BYTE( "vulkan_f1_2.bin", 0x00001, 0x010000, CRC(951baf42) SHA1(1346043155ba85926b2bf9eef8136b377953abe1) ) ROM_END +} // anonymous namespace + GAME(199?, st_ohla, 0, stellafr, stellafr, stellafr_state, empty_init, ROT0, "Stella", "Oh La La (Stella)", MACHINE_IS_SKELETON_MECHANICAL ) GAME(199?, st_vulkn, 0, stellafr, stellafr, stellafr_state, empty_init, ROT0, "Stella", "Vulkan (Stella)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/agat/agat.cpp b/src/mame/agat/agat.cpp index bb523edca4a..aa3d4430e15 100644 --- a/src/mame/agat/agat.cpp +++ b/src/mame/agat/agat.cpp @@ -92,6 +92,8 @@ #include "speaker.h" +namespace { + #define A7_CPU_TAG "maincpu" #define A7_SPEAKER_TAG "speaker" #define A7_CASSETTE_TAG "tape" @@ -1364,6 +1366,9 @@ ROM_START( agat9 ) ROM_LOAD( "agathe9.fnt", 0x0000, 0x0800, CRC(8c55c984) SHA1(5a5a202000576b88b4ae2e180dd2d1b9b337b594)) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1983, agat7, apple2, 0, agat7, agat7, agat7_state, empty_init, "Agat", "Agat-7", MACHINE_IMPERFECT_GRAPHICS) COMP( 1988, agat9, apple2, 0, agat9, agat7, agat9_state, empty_init, "Agat", "Agat-9", MACHINE_NOT_WORKING) diff --git a/src/mame/agat/agat7.h b/src/mame/agat/agat7.h index 7c54582510b..77aa67f954a 100644 --- a/src/mame/agat/agat7.h +++ b/src/mame/agat/agat7.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_VIDEO_AGAT7_H -#define MAME_VIDEO_AGAT7_H +#ifndef MAME_AGAT_AGAT7_H +#define MAME_AGAT_AGAT7_H #pragma once @@ -75,4 +75,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(AGAT7VIDEO, agat7video_device) -#endif // MAME_VIDEO_AGAT7_H +#endif // MAME_AGAT_AGAT7_H diff --git a/src/mame/agat/agat9.h b/src/mame/agat/agat9.h index d9c2116f72a..2bc11b716f5 100644 --- a/src/mame/agat/agat9.h +++ b/src/mame/agat/agat9.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_VIDEO_AGAT9_H -#define MAME_VIDEO_AGAT9_H +#ifndef MAME_AGAT_AGAT9_H +#define MAME_AGAT_AGAT9_H #pragma once @@ -93,4 +93,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(AGAT9VIDEO, agat9video_device) -#endif // MAME_VIDEO_AGAT9_H +#endif // MAME_AGAT_AGAT9_H diff --git a/src/mame/agat/agatkeyb.h b/src/mame/agat/agatkeyb.h index fe56998c05d..e9d2b0a7866 100644 --- a/src/mame/agat/agatkeyb.h +++ b/src/mame/agat/agatkeyb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Sergey Svishchev -#ifndef MAME_MACHINE_AGATKEYB_H -#define MAME_MACHINE_AGATKEYB_H +#ifndef MAME_AGAT_AGATKEYB_H +#define MAME_AGAT_AGATKEYB_H #pragma once @@ -67,4 +67,4 @@ private: devcb_write_line m_out_reset_cb; }; -#endif // MAME_MACHINE_AGATKEYB_H +#endif // MAME_AGAT_AGATKEYB_H diff --git a/src/mame/akai/akaiax80.cpp b/src/mame/akai/akaiax80.cpp index a4231325afb..1abf9c241a0 100644 --- a/src/mame/akai/akaiax80.cpp +++ b/src/mame/akai/akaiax80.cpp @@ -42,6 +42,9 @@ #include "machine/i8255.h" #include "machine/i8279.h" + +namespace { + #define PIT0_TAG "pit0" #define PIT1_TAG "pit1" #define PIT2_TAG "pit2" @@ -132,4 +135,7 @@ ROM_START( ax80 ) ROMX_LOAD( "ax-80i.ic4", 0x000000, 0x002000, CRC(d616e435) SHA1(84820522e6a96fc29966f82e76254e54df15d7e6), ROM_BIOS(2) ) ROM_END +} // anonymous namespace + + CONS( 1984, ax80, 0, 0, ax80, ax80, ax80_state, empty_init, "Akai", "AX80", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) diff --git a/src/mame/akai/akaivx600.cpp b/src/mame/akai/akaivx600.cpp index 123c73b0c6d..22b5c3f348b 100644 --- a/src/mame/akai/akaivx600.cpp +++ b/src/mame/akai/akaivx600.cpp @@ -14,6 +14,9 @@ #include "machine/pit8253.h" //#include "screen.h" + +namespace { + class akaivx600_state : public driver_device { public: @@ -96,5 +99,8 @@ ROM_START(vx600) ROM_LOAD("vx600_-2-_v1.12.ic47", 0x0000, 0x2000, CRC(1b3ee178) SHA1(20a319392824f9f3074f370d9d9eb2f312d69ac4)) // 27C64 ROM_END +} // anonymous namespace + + SYST(1988, vx600, 0, 0, vx600, vx600, akaivx600_state, empty_init, "Akai", "VX600 Programmable Matrix Synthesizer", MACHINE_IS_SKELETON) diff --git a/src/mame/alba/rmhaihai.cpp b/src/mame/alba/rmhaihai.cpp index 471ca6ae24f..c92b7e3646f 100644 --- a/src/mame/alba/rmhaihai.cpp +++ b/src/mame/alba/rmhaihai.cpp @@ -40,6 +40,8 @@ TODO: #include "tilemap.h" +namespace { + class rmhaihai_state : public driver_device { public: @@ -780,6 +782,8 @@ void rmhaihai_state::init_rmhaihai() } } +} // anonymous namespace + GAME( 1985, rmhaihai, 0, rmhaihai, rmhaihai, rmhaihai_state, init_rmhaihai, ROT0, "Alba", "Real Mahjong Haihai (Japan, newer)", MACHINE_SUPPORTS_SAVE ) // writes Homedata in NVRAM GAME( 1985, rmhaihai2, rmhaihai, rmhaihai, rmhaihai, rmhaihai_state, init_rmhaihai, ROT0, "Alba", "Real Mahjong Haihai (Japan, older)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/alliedleisure/ace.cpp b/src/mame/alliedleisure/ace.cpp index ac48b9b3120..519ca6fcd54 100644 --- a/src/mame/alliedleisure/ace.cpp +++ b/src/mame/alliedleisure/ace.cpp @@ -46,6 +46,9 @@ A1 2101 2101 #include "ace.lh" + +namespace { + static constexpr XTAL MASTER_CLOCK = 18_MHz_XTAL; @@ -363,5 +366,7 @@ ROM_START( ace ) ROM_LOAD( "ace.k4", 0x0000, 0x0200, CRC(daa05ec6) SHA1(8b71ffb802293dc93f6b492ff128a704e676a5fd) ) ROM_END +} // anonymous namespace + GAMEL(1976, ace, 0, ace, ace, aceal_state, empty_init, ROT0, "Allied Leisure", "Ace", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND, layout_ace ) diff --git a/src/mame/alliedleisure/aleisttl.cpp b/src/mame/alliedleisure/aleisttl.cpp index 0b207a4bdb5..7bc01d96f90 100644 --- a/src/mame/alliedleisure/aleisttl.cpp +++ b/src/mame/alliedleisure/aleisttl.cpp @@ -32,6 +32,9 @@ #include "video/fixfreq.h" #include "screen.h" + +namespace { + // copied by Pong, not accurate for this driver! // start #define MASTER_CLOCK 7159000 @@ -131,5 +134,7 @@ ROM_START( sburners ) ROM_LOAD( "url1.c15", 0x0000, 0x0200, CRC(e7941edb) SHA1(e3661a4b883e827fa8f0e5191007b948159cb3f4) ) ROM_END +} // anonymous namespace + GAME( 1975, sburners, 0, sburners, 0, sburners_state, empty_init, ROT0, "Allied Leisure", "Street Burners [TTL]", MACHINE_IS_SKELETON ) diff --git a/src/mame/alliedleisure/clayshoo.cpp b/src/mame/alliedleisure/clayshoo.cpp index 22aaf533664..1ad73e09ecd 100644 --- a/src/mame/alliedleisure/clayshoo.cpp +++ b/src/mame/alliedleisure/clayshoo.cpp @@ -23,6 +23,8 @@ #include "screen.h" +namespace { + class clayshoo_state : public driver_device { public: @@ -364,6 +366,7 @@ ROM_START( clayshoo ) ROM_LOAD( "4", 0x4000, 0x0800, CRC(3da16196) SHA1(eb0c0cf0c8fc3db05ac0c469fb20fe92ae6f27ce) ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/alpha/ad_sound.h b/src/mame/alpha/ad_sound.h index c508386c221..e46acefa986 100644 --- a/src/mame/alpha/ad_sound.h +++ b/src/mame/alpha/ad_sound.h @@ -5,8 +5,8 @@ // Functions to emulate the Alpha Denshi "59MC07" audio board //**************************************************************************** -#ifndef MAME_AUDIO_AD_SOUND_H -#define MAME_AUDIO_AD_SOUND_H +#ifndef MAME_ALPHA_AD_SOUND_H +#define MAME_ALPHA_AD_SOUND_H #pragma once @@ -128,4 +128,4 @@ private: INTERRUPT_GEN_MEMBER(sound_irq) { m_audiocpu->set_input_line(0, HOLD_LINE); } }; -#endif // MAME_AUDIO_AD_SOUND_H +#endif // MAME_ALPHA_AD_SOUND_H diff --git a/src/mame/alpha/alpha8201.h b/src/mame/alpha/alpha8201.h index 77b292fb17c..7ce6e0ab3ab 100644 --- a/src/mame/alpha/alpha8201.h +++ b/src/mame/alpha/alpha8201.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_ALPHA8201_H -#define MAME_MACHINE_ALPHA8201_H +#ifndef MAME_ALPHA_ALPHA8201_H +#define MAME_ALPHA_ALPHA8201_H #include "cpu/hmcs40/hmcs40.h" @@ -51,4 +51,4 @@ private: DECLARE_DEVICE_TYPE(ALPHA_8201, alpha_8201_device) -#endif // MAME_MACHINE_ALPHA8201_H +#endif // MAME_ALPHA_ALPHA8201_H diff --git a/src/mame/altos/acs8600_ics.h b/src/mame/altos/acs8600_ics.h index 1252bf7988d..4f28e14e5cc 100644 --- a/src/mame/altos/acs8600_ics.h +++ b/src/mame/altos/acs8600_ics.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Carl -#ifndef MAME_MACHINE_ACS8600_ICS_H -#define MAME_MACHINE_ACS8600_ICS_H +#ifndef MAME_ALTOS_ACS8600_ICS_H +#define MAME_ALTOS_ACS8600_ICS_H #pragma once @@ -44,4 +44,4 @@ private: DECLARE_DEVICE_TYPE(ACS8600_ICS, acs8600_ics_device) -#endif // MAME_MACHINE_ACS8600_ICS_H +#endif // MAME_ALTOS_ACS8600_ICS_H diff --git a/src/mame/altos/altos2.cpp b/src/mame/altos/altos2.cpp index 129da0e7433..fddd81fdd8d 100644 --- a/src/mame/altos/altos2.cpp +++ b/src/mame/altos/altos2.cpp @@ -27,6 +27,9 @@ Keyboard: P8035L CPU, undumped 2716 labelled "358_2758", XTAL marked "4608-300-1 #include "screen.h" #include "speaker.h" + +namespace { + class altos2_state : public driver_device { public: @@ -183,4 +186,7 @@ ROM_START( altos2 ) ROM_LOAD( "358_7258", 0x0000, 0x0800, NO_DUMP ) ROM_END +} // anonymous namespace + + COMP(1983, altos2, 0, 0, altos2, altos2, altos2_state, empty_init, "Altos Computer Systems", "Altos II Terminal", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS) diff --git a/src/mame/altos/altos486.cpp b/src/mame/altos/altos486.cpp index dd6f4728d14..962ab4f16f1 100644 --- a/src/mame/altos/altos486.cpp +++ b/src/mame/altos/altos486.cpp @@ -15,6 +15,9 @@ #include "machine/i8255.h" #include "bus/rs232/rs232.h" + +namespace { + class altos486_state : public driver_device { public: @@ -237,4 +240,7 @@ ROM_START( altos486 ) ROM_LOAD( "15020.bin", 0x0000, 0x0020, CRC(6a2bd961) SHA1(e9a9ed235574c9871dc32a80ff5ca4df6bd531e1) ) ROM_END +} // anonymous namespace + + COMP( 1984, altos486, 0, 0, altos486, 0, altos486_state, empty_init, "Altos Computer Systems", "Altos 486", MACHINE_NOT_WORKING | MACHINE_NO_SOUND) diff --git a/src/mame/altos/altos8600.cpp b/src/mame/altos/altos8600.cpp index b57c3cd81b0..01a8ee2b0c0 100644 --- a/src/mame/altos/altos8600.cpp +++ b/src/mame/altos/altos8600.cpp @@ -16,6 +16,9 @@ #include "imagedev/harddriv.h" #include "bus/rs232/rs232.h" + +namespace { + class altos8600_state : public driver_device { public: @@ -810,4 +813,7 @@ ROM_START(altos8600) ROMX_LOAD("11753_1.5_hi.bin", 0x0001, 0x1000, CRC(9b5e812c) SHA1(c2ef24859edd48d2096db47e16855c9bc01dae75), ROM_SKIP(1) | ROM_BIOS(0)) ROM_END +} // anonymous namespace + + COMP( 1981, altos8600, 0, 0, altos8600, 0, altos8600_state, empty_init, "Altos Computer Systems", "ACS8600", MACHINE_NO_SOUND_HW) diff --git a/src/mame/amiga/amigaaga.h b/src/mame/amiga/amigaaga.h index e45baac243f..3baeca8cf9b 100644 --- a/src/mame/amiga/amigaaga.h +++ b/src/mame/amiga/amigaaga.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ernesto Corvi, Mariusz Wojcieszek -#ifndef MAME_VIDEO_AMIGAAGA_H -#define MAME_VIDEO_AMIGAAGA_H +#ifndef MAME_AMIGA_AMIGAAGA_H +#define MAME_AMIGA_AMIGAAGA_H #pragma once void amiga_aga_palette_write(running_machine &machine, int color_reg, uint16_t data); -#endif // MAME_VIDEO_AMIGAAGA_H +#endif // MAME_AMIGA_AMIGAAGA_H diff --git a/src/mame/amiga/arsystems.cpp b/src/mame/amiga/arsystems.cpp index 51992073fe6..f8938cc9dca 100644 --- a/src/mame/amiga/arsystems.cpp +++ b/src/mame/amiga/arsystems.cpp @@ -59,6 +59,8 @@ #include "speaker.h" +namespace { + // arcadia_state was also defined in mess/includes/arcadia.h class arcadia_amiga_state : public amiga_state { @@ -1003,6 +1005,8 @@ void arcadia_amiga_state::init_pm() { init_arcadia(); generic_decode("user3", void arcadia_amiga_state::init_dlta() { init_arcadia(); generic_decode("user3", 4, 1, 7, 6, 2, 0, 3, 5); } void arcadia_amiga_state::init_argh() { init_arcadia(); generic_decode("user3", 5, 0, 2, 4, 7, 6, 1, 3); } +} // anonymous namespace + /************************************* * diff --git a/src/mame/amiga/cubo.cpp b/src/mame/amiga/cubo.cpp index 370b64e60ae..f204393dff4 100644 --- a/src/mame/amiga/cubo.cpp +++ b/src/mame/amiga/cubo.cpp @@ -323,6 +323,8 @@ routines : #include "speaker.h" +namespace { + /* set to 0 to use control panel with only buttons (as in quiz games) - joy is default in dispenser setup */ #define MGPREM11_USE_JOY 1 #define MGNUMBER_USE_JOY 1 @@ -1364,6 +1366,8 @@ void cubo_state::init_mgprem11() m_input_hack = &cubo_state::mgprem11_input_hack; } +} // anonymous namespace + GAME( 1993, cubo, 0, cubo, cubo, cubo_state, init_cubo, ROT0, "Commodore", "Cubo BIOS", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_IS_BIOS_ROOT ) GAME( 1995, cndypuzl, cubo, cubo, cndypuzl, cubo_state, init_cndypuzl, ROT0, "CD Express", "Candy Puzzle (v1.0)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/amiga/mquake.cpp b/src/mame/amiga/mquake.cpp index 32a1eefe122..2c139e82d17 100644 --- a/src/mame/amiga/mquake.cpp +++ b/src/mame/amiga/mquake.cpp @@ -44,6 +44,8 @@ #include "speaker.h" +namespace { + class mquake_state : public amiga_state { public: @@ -425,6 +427,7 @@ void mquake_state::init_mquake() } +} // anonymous namespace /************************************* diff --git a/src/mame/amirix/wxstar4000.cpp b/src/mame/amirix/wxstar4000.cpp index e0a3900c8c6..b62d08c51c6 100644 --- a/src/mame/amirix/wxstar4000.cpp +++ b/src/mame/amirix/wxstar4000.cpp @@ -67,6 +67,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class wxstar4k_state : public driver_device { public: @@ -284,4 +287,7 @@ ROM_START( wxstar4k ) ROM_LOAD16_BYTE( "u43 rom high.bin", 0x000000, 0x008000, CRC(6f2a7592) SHA1(1aa2394db42b6f28277e35a48a7cef348c213e05) ) ROM_END +} // anonymous namespace + + COMP( 1990, wxstar4k, 0, 0, wxstar4k, wxstar4k, wxstar4k_state, empty_init, "Applied Microelectronics Institute/The Weather Channel", "WeatherSTAR 4000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW ) diff --git a/src/mame/ampro/ampro.cpp b/src/mame/ampro/ampro.cpp index 074751c87db..812f218fa14 100644 --- a/src/mame/ampro/ampro.cpp +++ b/src/mame/ampro/ampro.cpp @@ -32,6 +32,9 @@ of a hard drive of up to 88MB. #include "machine/timer.h" #include "softlist_dev.h" + +namespace { + class ampro_state : public driver_device { public: @@ -276,6 +279,9 @@ ROM_START( ampro ) ROMX_LOAD( "scsi", 0x0000, 0x1000, CRC(8eb20e5d) SHA1(0ab1ff65cf6d3c1a713a8ac5c1ee4c662ac3da0c), ROM_BIOS(2)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ampro/lb186.cpp b/src/mame/ampro/lb186.cpp index 4847ea9ee21..d8e75cba675 100644 --- a/src/mame/ampro/lb186.cpp +++ b/src/mame/ampro/lb186.cpp @@ -12,6 +12,9 @@ #include "formats/pc_dsk.h" #include "formats/naslite_dsk.h" + +namespace { + class lb186_state : public driver_device { public: @@ -165,4 +168,7 @@ ROM_START( lb186 ) ROMX_LOAD("a75524.rom", 0x0001, 0x2000, CRC(9c9b249c) SHA1(e988e92d9fa6fe66f89ef748021e9a0501d2807e), ROM_SKIP(1) | ROM_BIOS(1)) ROM_END +} // anonymous namespace + + COMP( 1985, lb186, 0, 0, lb186, 0, lb186_state, empty_init, "Ampro Computers", "Little Board/186", MACHINE_NO_SOUND_HW ) diff --git a/src/mame/ampro/lbpc.cpp b/src/mame/ampro/lbpc.cpp index 2c83db5cb87..82c60ef49c3 100644 --- a/src/mame/ampro/lbpc.cpp +++ b/src/mame/ampro/lbpc.cpp @@ -33,6 +33,9 @@ #define VERBOSE 0 #include "logmacro.h" + +namespace { + class lbpc_state : public driver_device { public: @@ -411,5 +414,7 @@ ROM_START(lbpc) ROM_LOAD("lbpc-bio.rom", 0x0000, 0x8000, CRC(47bddf8b) SHA1(8a04fe34502f9f3bfe1e233762bbd5bbdd1c455d)) ROM_END +} // anonymous namespace + COMP(1989, lbpc, 0, 0, lbpc, lbpc, lbpc_state, empty_init, "Ampro Computers", "Little Board/PC", MACHINE_NOT_WORKING) diff --git a/src/mame/amstrad/ams40041.h b/src/mame/amstrad/ams40041.h index 34acdc077c6..c6bf52cb04a 100644 --- a/src/mame/amstrad/ams40041.h +++ b/src/mame/amstrad/ams40041.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_VIDEO_AMS40041_H -#define MAME_VIDEO_AMS40041_H +#ifndef MAME_AMSTRAD_AMS40041_H +#define MAME_AMSTRAD_AMS40041_H #pragma once @@ -67,4 +67,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(AMS40041, ams40041_device) -#endif // MAME_VIDEO_AMS40041_H +#endif // MAME_AMSTRAD_AMS40041_H diff --git a/src/mame/amstrad/pc1512kb.h b/src/mame/amstrad/pc1512kb.h index d6a69f29061..5c85a6ea532 100644 --- a/src/mame/amstrad/pc1512kb.h +++ b/src/mame/amstrad/pc1512kb.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_PC1512KB_H -#define MAME_MACHINE_PC1512KB_H +#ifndef MAME_AMSTRAD_PC1512KB_H +#define MAME_AMSTRAD_PC1512KB_H #pragma once @@ -94,4 +94,4 @@ private: DECLARE_DEVICE_TYPE(PC1512_KEYBOARD, pc1512_keyboard_device) -#endif // MAME_MACHINE_PC1512KB_H +#endif // MAME_AMSTRAD_PC1512KB_H diff --git a/src/mame/amstrad/pda600.cpp b/src/mame/amstrad/pda600.cpp index bd3c17f938f..3b66fda4cab 100644 --- a/src/mame/amstrad/pda600.cpp +++ b/src/mame/amstrad/pda600.cpp @@ -63,6 +63,8 @@ #include "screen.h" +namespace { + class pda600_state : public driver_device { public: @@ -235,6 +237,9 @@ ROM_START( pda600 ) ROM_LOAD( "pdarom.bin", 0x00000, 0x20000, CRC(f793a6c5) SHA1(ab14b0fdcedb927c66357368a2bfff605ba758fb)) ROM_END +} // anonymous namespace + + /* Driver */ /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/apollo/apollo_dbg.h b/src/mame/apollo/apollo_dbg.h index f9f77b8b8d7..11359656bad 100644 --- a/src/mame/apollo/apollo_dbg.h +++ b/src/mame/apollo/apollo_dbg.h @@ -8,8 +8,8 @@ * */ -#ifndef MAME_MACHINE_APOLLO_DBG_H -#define MAME_MACHINE_APOLLO_DBG_H +#ifndef MAME_APOLLO_APOLLO_DBG_H +#define MAME_APOLLO_APOLLO_DBG_H #pragma once @@ -18,4 +18,4 @@ int apollo_debug_instruction_hook(m68000_base_device *device, offs_t curpc); -#endif // MAME_MACHINE_APOLLO_DBG_H +#endif // MAME_APOLLO_APOLLO_DBG_H diff --git a/src/mame/apollo/apollo_kbd.h b/src/mame/apollo/apollo_kbd.h index bb3027663ae..fe4f64f1fb2 100644 --- a/src/mame/apollo/apollo_kbd.h +++ b/src/mame/apollo/apollo_kbd.h @@ -8,8 +8,8 @@ * */ -#ifndef MAME_MACHINE_APOLLO_KBD_H -#define MAME_MACHINE_APOLLO_KBD_H +#ifndef MAME_APOLLO_APOLLO_KBD_H +#define MAME_APOLLO_APOLLO_KBD_H #pragma once @@ -149,4 +149,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(APOLLO_KBD, apollo_kbd_device) -#endif // MAME_MACHINE_APOLLO_KBD_H +#endif // MAME_APOLLO_APOLLO_KBD_H diff --git a/src/mame/apple/adbmodem.h b/src/mame/apple/adbmodem.h index e27ec122940..d7efd94ffbe 100644 --- a/src/mame/apple/adbmodem.h +++ b/src/mame/apple/adbmodem.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#ifndef MAME_MACHINE_ADBMODEM_H -#define MAME_MACHINE_ADBMODEM_H +#ifndef MAME_APPLE_ADBMODEM_H +#define MAME_APPLE_ADBMODEM_H #pragma once @@ -95,4 +95,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(ADBMODEM, adbmodem_device) -#endif // MAME_MACHINE_ADBMODEM_H +#endif // MAME_APPLE_ADBMODEM_H diff --git a/src/mame/apple/apple1.cpp b/src/mame/apple/apple1.cpp index 418c333779f..e0413d4c36e 100644 --- a/src/mame/apple/apple1.cpp +++ b/src/mame/apple/apple1.cpp @@ -84,6 +84,9 @@ #include "screen.h" #include "softlist_dev.h" + +namespace { + #define A1_CPU_TAG "maincpu" #define A1_PIA_TAG "pia6821" #define A1_BUS_TAG "a1bus" @@ -624,5 +627,8 @@ ROM_START(apple1) ROM_LOAD("s2513.d2", 0x0000, 0x0200, CRC(a7e567fc) SHA1(b18aae0a2d4f92f5a7e22640719bbc4652f3f4ee)) // apple1.vid ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ COMP( 1976, apple1, 0, 0, apple1, apple1, apple1_state, empty_init, "Apple Computer", "Apple I", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/apple/apple2common.h b/src/mame/apple/apple2common.h index ba179a30ad9..6d4b6365288 100644 --- a/src/mame/apple/apple2common.h +++ b/src/mame/apple/apple2common.h @@ -7,8 +7,8 @@ Apple II stuff shared between apple2/apple2e/apple2gs. *********************************************************************/ -#ifndef MAME_MACHINE_APPLE2_COMMON_H -#define MAME_MACHINE_APPLE2_COMMON_H +#ifndef MAME_APPLE_APPLE2_COMMON_H +#define MAME_APPLE_APPLE2_COMMON_H #pragma once @@ -51,4 +51,4 @@ private: DECLARE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device) -#endif // MAME_MACHINE_APPLE2_COMMON_H +#endif // MAME_APPLE_APPLE2_COMMON_H diff --git a/src/mame/apple/cuda.h b/src/mame/apple/cuda.h index b6ccf42a755..07c23a84a4e 100644 --- a/src/mame/apple/cuda.h +++ b/src/mame/apple/cuda.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#ifndef MAME_MACHINE_CUDA_H -#define MAME_MACHINE_CUDA_H +#ifndef MAME_APPLE_CUDA_H +#define MAME_APPLE_CUDA_H #pragma once @@ -113,4 +113,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(CUDA, cuda_device) -#endif // MAME_MACHINE_CUDA_H +#endif // MAME_APPLE_CUDA_H diff --git a/src/mame/apple/egret.h b/src/mame/apple/egret.h index f82c4a2e203..14f97ff3c83 100644 --- a/src/mame/apple/egret.h +++ b/src/mame/apple/egret.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#ifndef MAME_MACHINE_EGRET_H -#define MAME_MACHINE_EGRET_H +#ifndef MAME_APPLE_EGRET_H +#define MAME_APPLE_EGRET_H #pragma once @@ -137,4 +137,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(EGRET, egret_device) -#endif // MAME_MACHINE_EGRET_H +#endif // MAME_APPLE_EGRET_H diff --git a/src/mame/apple/iphone2g.cpp b/src/mame/apple/iphone2g.cpp index cf1b4904422..ec4a2d3b446 100644 --- a/src/mame/apple/iphone2g.cpp +++ b/src/mame/apple/iphone2g.cpp @@ -210,6 +210,9 @@ iphone2g_timer_device::iphone2g_timer_device(const machine_config &mconfig, cons { } + +namespace { + class iphone2g_state : public driver_device { public: @@ -321,6 +324,9 @@ ROM_START(iphone2g) ROM_LOAD("s5l8900-bootrom.bin", 0x00000, 0x10000, CRC(beb15cd1) SHA1(079a3acab577eb52cc349ea811af3cbd5d01b8f5)) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT STATE INIT COMPANY FULLNAME FLAGS */ // console section CONS( 2007, iphone2g, 0, 0, iphone2g, 0, iphone2g_state, empty_init, "Apple", "iPhone (A1203)", MACHINE_IS_SKELETON ) diff --git a/src/mame/apple/mac128.cpp b/src/mame/apple/mac128.cpp index 0bfafd7af89..a94f9074ace 100644 --- a/src/mame/apple/mac128.cpp +++ b/src/mame/apple/mac128.cpp @@ -115,6 +115,9 @@ Scanline 0 is the start of vblank. #include "softlist.h" #include "speaker.h" + +namespace { + #define C7M (15.6672_MHz_XTAL / 2) #define C3_7M (15.6672_MHz_XTAL / 4).value() @@ -1532,6 +1535,9 @@ ROM_START( macclasc ) ROM_LOAD( "341-0813__=c=1983-90_apple__japan__910d_d.27c4096_be.ue1", 0x000000, 0x080000, CRC(510d7d38) SHA1(ccd10904ddc0fb6a1d216b2e9effd5ec6cf5a83d) ) ROM_END +} // anonymous namespace + + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ //COMP( 1983, mactw, 0, 0, mac128k, macplus, mac128_state, mac_driver_init, "Apple Computer", "Macintosh (4.3T Prototype)", MACHINE_SUPPORTS_SAVE ) COMP( 1984, mac128k, 0, 0, mac128k, macplus, mac128_state, mac_driver_init, "Apple Computer", "Macintosh 128k", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/apple/macadb.h b/src/mame/apple/macadb.h index 8d7b9b0ba7e..2cdcbd0d79b 100644 --- a/src/mame/apple/macadb.h +++ b/src/mame/apple/macadb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#ifndef MAME_MACHINE_MACADB_H -#define MAME_MACHINE_MACADB_H +#ifndef MAME_APPLE_MACADB_H +#define MAME_APPLE_MACADB_H #pragma once @@ -89,4 +89,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(MACADB, macadb_device) -#endif // MAME_MACHINE_MACADB_H +#endif // MAME_APPLE_MACADB_H diff --git a/src/mame/apple/macpdm.cpp b/src/mame/apple/macpdm.cpp index 19e11ad9e80..0169f215b85 100644 --- a/src/mame/apple/macpdm.cpp +++ b/src/mame/apple/macpdm.cpp @@ -19,6 +19,9 @@ #include "sound/awacs.h" #include "speaker.h" + +namespace { + constexpr auto IO_CLOCK = 31.3344_MHz_XTAL; constexpr auto ENET_CLOCK = 20_MHz_XTAL; constexpr auto SOUND_CLOCK = 45.1584_MHz_XTAL; @@ -108,13 +111,13 @@ private: DECLARE_WRITE_LINE_MEMBER(sndi_err_irq); DECLARE_WRITE_LINE_MEMBER(vblank_irq); - DECLARE_WRITE_LINE_MEMBER(slot2_irq); - DECLARE_WRITE_LINE_MEMBER(slot1_irq); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(slot2_irq); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(slot1_irq); DECLARE_WRITE_LINE_MEMBER(slot0_irq); DECLARE_WRITE_LINE_MEMBER(fdc_irq); DECLARE_WRITE_LINE_MEMBER(fdc_drq); - DECLARE_WRITE_LINE_MEMBER(sound_irq); + [[maybe_unused]] DECLARE_WRITE_LINE_MEMBER(sound_irq); DECLARE_WRITE_LINE_MEMBER(scsi_irq); DECLARE_WRITE_LINE_MEMBER(scsi_drq); @@ -1155,5 +1158,7 @@ ROM_START( pmac6100 ) ROM_LOAD( "9feb69b3.rom", 0x000000, 0x400000, CRC(a43fadbc) SHA1(6fac1c4e920a077c077b03902fef9199d5e8f2c3) ) ROM_END +} // anonymous namespace + COMP( 1994, pmac6100, 0, 0, macpdm, macpdm, macpdm_state, driver_init, "Apple Computer", "Power Macintosh 6100/60", MACHINE_NOT_WORKING ) diff --git a/src/mame/apple/macprtb.cpp b/src/mame/apple/macprtb.cpp index 4b9b669d94a..d93064705d3 100644 --- a/src/mame/apple/macprtb.cpp +++ b/src/mame/apple/macprtb.cpp @@ -110,6 +110,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + #define C32M (31.3344_MHz_XTAL) #define C15M (C32M/2) #define C7M (C32M/4) @@ -615,5 +618,8 @@ ROM_START(macpb100) ROM_LOAD("342s0743-1.u29", 0x000, 0xc00, NO_DUMP) ROM_END +} // anonymous namespace + + COMP(1989, macprtb, 0, 0, macprtb, macadb, macportable_state, init_macprtb, "Apple Computer", "Macintosh Portable", MACHINE_NOT_WORKING) COMP(1991, macpb100, 0, 0, macprtb, macadb, macportable_state, init_macprtb, "Apple Computer", "Macintosh PowerBook 100", MACHINE_NOT_WORKING ) diff --git a/src/mame/apple/macpwrbk030.cpp b/src/mame/apple/macpwrbk030.cpp index 3dfe9d5583a..b6435239355 100644 --- a/src/mame/apple/macpwrbk030.cpp +++ b/src/mame/apple/macpwrbk030.cpp @@ -127,6 +127,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + #define C32M (31.3344_MHz_XTAL) #define C15M (C32M/2) #define C7M (C32M/4) @@ -1189,6 +1192,9 @@ ROM_START(macpd210) ROM_REGION(0x1800, "pmu", ROMREGION_ERASE00) ROM_END +} // anonymous namespace + + COMP(1991, macpb140, 0, 0, macpb140, macadb, macpb030_state, init_macpb140, "Apple Computer", "Macintosh PowerBook 140", MACHINE_NOT_WORKING) COMP(1991, macpb170, macpb140, 0, macpb170, macadb, macpb030_state, init_macpb140, "Apple Computer", "Macintosh PowerBook 170", MACHINE_NOT_WORKING) COMP(1992, macpb145, macpb140, 0, macpb145, macadb, macpb030_state, init_macpb140, "Apple Computer", "Macintosh PowerBook 145", MACHINE_NOT_WORKING) diff --git a/src/mame/apple/macrtc.h b/src/mame/apple/macrtc.h index a06abb70636..299fd0fdcb7 100644 --- a/src/mame/apple/macrtc.h +++ b/src/mame/apple/macrtc.h @@ -7,8 +7,8 @@ **********************************************************************/ -#ifndef MAME_MACHINE_MACRTC_H -#define MAME_MACHINE_MACRTC_H +#ifndef MAME_APPLE_MACRTC_H +#define MAME_APPLE_MACRTC_H #pragma once @@ -117,4 +117,4 @@ protected: DECLARE_DEVICE_TYPE(RTC3430040, rtc3430040_device) DECLARE_DEVICE_TYPE(RTC3430042, rtc3430042_device) -#endif // MAME_MACHINE_MACRTC_H +#endif // MAME_APPLE_MACRTC_H diff --git a/src/mame/apple/macscsi.h b/src/mame/apple/macscsi.h index dcefbf494cf..53562aac9c8 100644 --- a/src/mame/apple/macscsi.h +++ b/src/mame/apple/macscsi.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_MACHINE_MACSCSI_H -#define MAME_MACHINE_MACSCSI_H +#ifndef MAME_APPLE_MACSCSI_H +#define MAME_APPLE_MACSCSI_H #pragma once @@ -67,4 +67,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(MAC_SCSI_HELPER, mac_scsi_helper_device) -#endif // MAME_MACHINE_MACSCSI_H +#endif // MAME_APPLE_MACSCSI_H diff --git a/src/mame/apple/newton.cpp b/src/mame/apple/newton.cpp index f9c6f787516..f4cfe2b620d 100644 --- a/src/mame/apple/newton.cpp +++ b/src/mame/apple/newton.cpp @@ -27,6 +27,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class newton_state : public driver_device { public: @@ -179,6 +182,9 @@ ROM_START( mp2100 ) ROMX_LOAD( "mp2100.rom", 0x000000, 0x800000, CRC(81d5efc6) SHA1(82a191652b2689ce0e254ee11c6f43c84b5185cc), ROM_REVERSE | ROM_GROUPDWORD ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/arcadia/arcadia_a.h b/src/mame/arcadia/arcadia_a.h index 029236e6295..e705583d397 100644 --- a/src/mame/arcadia/arcadia_a.h +++ b/src/mame/arcadia/arcadia_a.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Peter Trauner -#ifndef MAME_AUDIO_ARCADIA_H -#define MAME_AUDIO_ARCADIA_H +#ifndef MAME_ARCADIA_ARCADIA_H +#define MAME_ARCADIA_ARCADIA_H //************************************************************************** // TYPE DEFINITIONS @@ -34,4 +34,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(ARCADIA_SOUND, arcadia_sound_device) -#endif // MAME_AUDIO_ARCADIA_H +#endif // MAME_ARCADIA_ARCADIA_H diff --git a/src/mame/aristocrat/aristmk4.cpp b/src/mame/aristocrat/aristmk4.cpp index 5f53816b824..11a00334839 100644 --- a/src/mame/aristocrat/aristmk4.cpp +++ b/src/mame/aristocrat/aristmk4.cpp @@ -349,8 +349,8 @@ #include "gunnrose.lh" // Video poker #include "wildone.lh" // Video poker -uint8_t crtc_cursor_index = 0; -uint8_t crtc_reg = 0; + +namespace { class aristmk4_state : public driver_device { @@ -2514,6 +2514,9 @@ ROM_START( 86lions ) // ROM_LOAD( "prom.x", 0x00, 0x20, NO_DUMP ) ROM_END +} // anonymous namespace + + GAMEL( 1985, 86lions, 0, _86lions, aristmk4, aristmk4_state, init_aristmk4, ROT0, "Aristocrat", "86 Lions", MACHINE_NOT_WORKING, layout_topgear ) GAMEL( 1996, eforest, 0, aristmk4, eforest, aristmk4_state, init_aristmk4, ROT0, "Aristocrat", "Enchanted Forest (12XF528902, US)", 0, layout_eforest ) // 92.778% GAMEL( 1995, eforesta, eforest, aristmk4, aristmk4, aristmk4_state, init_aristmk4, ROT0, "Aristocrat", "Enchanted Forest (4VXFC818, NSW)", 0, layout_aristmk4 ) // 10c, $1 = 10 credits, 90.483% diff --git a/src/mame/aristocrat/caswin.cpp b/src/mame/aristocrat/caswin.cpp index 5763f71c144..31b71bc04c6 100644 --- a/src/mame/aristocrat/caswin.cpp +++ b/src/mame/aristocrat/caswin.cpp @@ -77,6 +77,8 @@ TODO: #include "tilemap.h" +namespace { + class caswin_state : public driver_device { public: @@ -446,6 +448,9 @@ ROM_START( rcasino2 ) ROM_LOAD( "mb7051.e8", 0x0020, 0x0020, CRC(2b5c7826) SHA1(c0de392aebd6982e5846c12aeb2e871358be60d7) ) ROM_END +} // anonymous namespace + + GAME( 1984, rcasino, 0, vvillage, vvillage, caswin_state, empty_init, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-2)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1984, rcasino1, rcasino, vvillage, vvillage, caswin_state, empty_init, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-1, Larger Board)", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1984, rcasinoo, rcasino, vvillage, vvillage, caswin_state, empty_init, ROT270, "Dyna Electronics", "Royal Casino (D-2608208A1-1, Smaller Board, set 1)", MACHINE_IMPERFECT_GRAPHICS ) diff --git a/src/mame/atari/akkaarrh.cpp b/src/mame/atari/akkaarrh.cpp index 863107568a0..66d9706a5e3 100644 --- a/src/mame/atari/akkaarrh.cpp +++ b/src/mame/atari/akkaarrh.cpp @@ -26,6 +26,8 @@ #include "akkaarrh.lh" +namespace { + class akkaarrh_state : public driver_device { public: @@ -437,6 +439,7 @@ ROM_START( akkaarrh ) ROM_LOAD( "akka_mo3.b11", 0x3000, 0x1000, CRC(adcf6a36) SHA1(0555a252ba39400d2c533add6ac492926674d6ad) ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/atari/antic.h b/src/mame/atari/antic.h index 8aaf838abe8..098229e7879 100644 --- a/src/mame/atari/antic.h +++ b/src/mame/atari/antic.h @@ -10,8 +10,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_ANTIC_H -#define MAME_VIDEO_ANTIC_H +#ifndef MAME_ATARI_ANTIC_H +#define MAME_ATARI_ANTIC_H #pragma once @@ -196,4 +196,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(ATARI_ANTIC, antic_device) -#endif // MAME_VIDEO_ANTIC_H +#endif // MAME_ATARI_ANTIC_H diff --git a/src/mame/atari/asic65.h b/src/mame/atari/asic65.h index 16950cf47e6..eb04a3fa863 100644 --- a/src/mame/atari/asic65.h +++ b/src/mame/atari/asic65.h @@ -5,8 +5,8 @@ * Implementation of ASIC65 * *************************************/ -#ifndef MAME_MACHINE_ASIC65_H -#define MAME_MACHINE_ASIC65_H +#ifndef MAME_ATARI_ASIC65_H +#define MAME_ATARI_ASIC65_H #pragma once @@ -78,4 +78,4 @@ private: DECLARE_DEVICE_TYPE(ASIC65, asic65_device) -#endif // MAME_MACHINE_ASIC65_H +#endif // MAME_ATARI_ASIC65_H diff --git a/src/mame/atari/atarifdc.h b/src/mame/atari/atarifdc.h index 8608b538397..4f2382d0a96 100644 --- a/src/mame/atari/atarifdc.h +++ b/src/mame/atari/atarifdc.h @@ -5,8 +5,8 @@ */ -#ifndef MAME_MACHINE_ATARIFDC_H -#define MAME_MACHINE_ATARIFDC_H +#ifndef MAME_ATARI_ATARIFDC_H +#define MAME_ATARI_ATARIFDC_H #include "imagedev/flopdrv.h" #include "machine/6821pia.h" @@ -71,4 +71,4 @@ private: DECLARE_DEVICE_TYPE(ATARI_FDC, atari_fdc_device) -#endif // MAME_MACHINE_ATARIFDC_H +#endif // MAME_ATARI_ATARIFDC_H diff --git a/src/mame/atari/atarigen.h b/src/mame/atari/atarigen.h index 32aafb7b9f6..ffa8a6b6539 100644 --- a/src/mame/atari/atarigen.h +++ b/src/mame/atari/atarigen.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_ATARIGEN_H -#define MAME_MACHINE_ATARIGEN_H +#ifndef MAME_ATARI_ATARIGEN_H +#define MAME_ATARI_ATARIGEN_H #include "screen.h" @@ -94,4 +94,4 @@ protected: ***************************************************************************/ -#endif // MAME_MACHINE_ATARIGEN_H +#endif // MAME_ATARI_ATARIGEN_H diff --git a/src/mame/atari/atarijsa.h b/src/mame/atari/atarijsa.h index 7d3efe36663..f2c522f57b7 100644 --- a/src/mame/atari/atarijsa.h +++ b/src/mame/atari/atarijsa.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_AUDIO_ATARI_JSA_H -#define MAME_AUDIO_ATARI_JSA_H +#ifndef MAME_ATARI_ATARI_JSA_H +#define MAME_ATARI_ATARI_JSA_H #pragma once @@ -264,4 +264,4 @@ protected: }; -#endif // MAME_AUDIO_ATARI_JSA_H +#endif // MAME_ATARI_ATARI_JSA_H diff --git a/src/mame/atari/atarimo.h b/src/mame/atari/atarimo.h index 8c3c38ca44c..e6a267655e2 100644 --- a/src/mame/atari/atarimo.h +++ b/src/mame/atari/atarimo.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_ATARIMO_H -#define MAME_VIDEO_ATARIMO_H +#ifndef MAME_ATARI_ATARIMO_H +#define MAME_ATARI_ATARIMO_H #include "video/sprite.h" @@ -220,4 +220,4 @@ private: }; -#endif // MAME_VIDEO_ATARIMO_H +#endif // MAME_ATARI_ATARIMO_H diff --git a/src/mame/atari/atarirle.h b/src/mame/atari/atarirle.h index 1b1ae2ce8e0..fe69da2b571 100644 --- a/src/mame/atari/atarirle.h +++ b/src/mame/atari/atarirle.h @@ -9,8 +9,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_ATARIRLE_H -#define MAME_VIDEO_ATARIRLE_H +#ifndef MAME_ATARI_ATARIRLE_H +#define MAME_ATARI_ATARIRLE_H #include "memarray.h" @@ -177,4 +177,4 @@ private: u16 m_rle_table_data[0x500]; }; -#endif // MAME_VIDEO_ATARIRLE_H +#endif // MAME_ATARI_ATARIRLE_H diff --git a/src/mame/atari/atarisac.h b/src/mame/atari/atarisac.h index f085fc78168..6393855a7b6 100644 --- a/src/mame/atari/atarisac.h +++ b/src/mame/atari/atarisac.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_AUDIO_ATARI_SAC_H -#define MAME_AUDIO_ATARI_SAC_H +#ifndef MAME_ATARI_ATARI_SAC_H +#define MAME_ATARI_ATARI_SAC_H #pragma once @@ -76,4 +76,4 @@ private: }; -#endif // MAME_AUDIO_ATARI_SAC_H +#endif // MAME_ATARI_ATARI_SAC_H diff --git a/src/mame/atari/atariscom.h b/src/mame/atari/atariscom.h index 39633550b75..e90037e1cb6 100644 --- a/src/mame/atari/atariscom.h +++ b/src/mame/atari/atariscom.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_ATARISCOM_H -#define MAME_MACHINE_ATARISCOM_H +#ifndef MAME_ATARI_ATARISCOM_H +#define MAME_ATARI_ATARISCOM_H #pragma once @@ -86,4 +86,4 @@ private: }; -#endif // MAME_MACHINE_ATARISCOM_H +#endif // MAME_ATARI_ATARISCOM_H diff --git a/src/mame/atari/atarist_v.h b/src/mame/atari/atarist_v.h index dd41f293652..3e9c8786613 100644 --- a/src/mame/atari/atarist_v.h +++ b/src/mame/atari/atarist_v.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Olivier Galibert -#ifndef MAME_VIDEO_ATARIST_H -#define MAME_VIDEO_ATARIST_H +#ifndef MAME_ATARI_ATARIST_H +#define MAME_ATARI_ATARIST_H #pragma once @@ -131,4 +131,4 @@ DECLARE_DEVICE_TYPE(STE_VIDEO, ste_video_device) //DECLARE_DEVICE_TYPE(STBOOK_VIDEO, stbook_video_device) //DECLARE_DEVICE_TYPE(TT_VIDEO, tt_video_device) -#endif // MAME_VIDEO_ATARIST_H +#endif // MAME_ATARI_ATARIST_H diff --git a/src/mame/atari/ataristb.h b/src/mame/atari/ataristb.h index 87efdafa183..28041a2c8e7 100644 --- a/src/mame/atari/ataristb.h +++ b/src/mame/atari/ataristb.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder, Olivier Galibert -#ifndef MAME_MACHINE_ATARISTB_H -#define MAME_MACHINE_ATARISTB_H +#ifndef MAME_ATARI_ATARISTB_H +#define MAME_ATARI_ATARISTB_H #pragma once @@ -87,4 +87,4 @@ private: // device type declaration DECLARE_DEVICE_TYPE(ST_BLITTER, st_blitter_device) -#endif // MAME_MACHINE_ATARISTB_H +#endif // MAME_ATARI_ATARISTB_H diff --git a/src/mame/atari/atarisy4.cpp b/src/mame/atari/atarisy4.cpp index 567c9050974..abb3c434a43 100644 --- a/src/mame/atari/atarisy4.cpp +++ b/src/mame/atari/atarisy4.cpp @@ -24,6 +24,8 @@ #include "screen.h" +namespace { + class atarisy4_state : public driver_device { public: @@ -1097,6 +1099,8 @@ void airrace_state::machine_reset() m_dsp1->set_input_line(INPUT_LINE_RESET, ASSERT_LINE); } +} // anonymous namespace + /************************************* * diff --git a/src/mame/atari/atarivad.h b/src/mame/atari/atarivad.h index d51b31ba9dc..c71841a2069 100644 --- a/src/mame/atari/atarivad.h +++ b/src/mame/atari/atarivad.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_ATARIVAD_H -#define MAME_VIDEO_ATARIVAD_H +#ifndef MAME_ATARI_ATARIVAD_H +#define MAME_ATARI_ATARIVAD_H #include "atarimo.h" #include "tilemap.h" @@ -101,4 +101,4 @@ private: }; -#endif // MAME_VIDEO_ATARIVAD_H +#endif // MAME_ATARI_ATARIVAD_H diff --git a/src/mame/atari/atarixga.h b/src/mame/atari/atarixga.h index 6d7e1861de9..34972771d15 100644 --- a/src/mame/atari/atarixga.h +++ b/src/mame/atari/atarixga.h @@ -8,8 +8,8 @@ *************************************************************************/ -#ifndef MAME_MACHINE_ATARIXGA_H -#define MAME_MACHINE_ATARIXGA_H +#ifndef MAME_ATARI_ATARIXGA_H +#define MAME_ATARI_ATARIXGA_H DECLARE_DEVICE_TYPE(ATARI_136094_0072, atari_136094_0072_device) DECLARE_DEVICE_TYPE(ATARI_136095_0072, atari_136095_0072_device) @@ -108,4 +108,4 @@ private: }; -#endif // MAME_MACHINE_ATARIXGA_H +#endif // MAME_ATARI_ATARIXGA_H diff --git a/src/mame/atari/boxer.cpp b/src/mame/atari/boxer.cpp index b76b3d61bae..5d74dc8884f 100644 --- a/src/mame/atari/boxer.cpp +++ b/src/mame/atari/boxer.cpp @@ -16,6 +16,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + #define MASTER_CLOCK XTAL(12'096'000) /************************************* @@ -526,6 +529,8 @@ ROM_START( boxer ) ROM_LOAD( "9402.m3", 0x0000, 0x0100, CRC(00e224a0) SHA1(1a384ef488791c62566c91b18d6a1fb4a5def2ba) ) ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/atari/cball.cpp b/src/mame/atari/cball.cpp index 2b24dd6c626..743816083f3 100644 --- a/src/mame/atari/cball.cpp +++ b/src/mame/atari/cball.cpp @@ -13,6 +13,8 @@ #include "tilemap.h" +namespace { + class cball_state : public driver_device { public: @@ -288,5 +290,7 @@ ROM_START( cball ) ROM_LOAD( "canball.6h", 0x0000, 0x0100, CRC(b8094b4c) SHA1(82dc6799a19984f3b204ee3aeeb007e55afc8be3) ) /* sync */ ROM_END +} // anonymous namespace + GAME( 1976, cball, 0, cball, cball, cball_state, empty_init, ROT0, "Atari", "Cannonball (Atari, prototype)", MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/atari/cmmb.cpp b/src/mame/atari/cmmb.cpp index f3bb3b887f7..b5dca5a3533 100644 --- a/src/mame/atari/cmmb.cpp +++ b/src/mame/atari/cmmb.cpp @@ -56,6 +56,9 @@ OSC @ 72.576MHz #include "emupal.h" #include "screen.h" + +namespace { + #define MAIN_CLOCK XTAL(72'576'000) class cmmb_state : public driver_device @@ -453,5 +456,8 @@ ROM_START( cmmb103 ) //ROM_FILL( 0x1c124, 2, 0xea ) // temporary patch to avoid waiting on IRQs ROM_END +} // anonymous namespace + + GAME( 2001, cmmb103, 0, cmmb, cmmb, cmmb_state, empty_init, ROT270, "Cosmodog / Team Play (licensed from Infogrames via Midway Games West)", "Centipede / Millipede / Missile Command (rev 1.03)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING ) GAME( 2002, cmmb162, 0, cmmb, cmmb, cmmb_state, empty_init, ROT270, "Cosmodog / Team Play (licensed from Infogrames via Midway Games West)", "Centipede / Millipede / Missile Command / Let's Go Bowling (rev 1.62)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING ) diff --git a/src/mame/atari/destroyr.cpp b/src/mame/atari/destroyr.cpp index 5ac190f0f49..cb719a24853 100644 --- a/src/mame/atari/destroyr.cpp +++ b/src/mame/atari/destroyr.cpp @@ -25,6 +25,8 @@ TODO: #include "destroyr.lh" +namespace { + class destroyr_state : public driver_device { public: @@ -565,6 +567,8 @@ ROM_START( destroyr1 ) ROM_LOAD( "030131-01.m1", 0x0000, 0x0100, CRC(b8094b4c) SHA1(82dc6799a19984f3b204ee3aeeb007e55afc8be3) ) ROM_END +} // anonymous namespace + GAMEL( 1977, destroyr, 0, destroyr, destroyr, destroyr_state, empty_init, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O2)", MACHINE_SUPPORTS_SAVE, layout_destroyr ) GAMEL( 1977, destroyr1, destroyr, destroyr, destroyr, destroyr_state, empty_init, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O1)", MACHINE_SUPPORTS_SAVE, layout_destroyr ) diff --git a/src/mame/atari/firefox.cpp b/src/mame/atari/firefox.cpp index 3706cf28594..84a9ae967a1 100644 --- a/src/mame/atari/firefox.cpp +++ b/src/mame/atari/firefox.cpp @@ -46,6 +46,8 @@ but requires a special level III player for proper control. Video: CAV. Audio: A #include "tilemap.h" +namespace { + class firefox_state : public driver_device { public: @@ -802,6 +804,7 @@ ROM_START( firefoxa ) DISK_IMAGE_READONLY( "firefox", 0, SHA1(3c4be40f55b44d0352b64c0861b6d1b650451ce7) ) ROM_END +} // anonymous namespace /************************************* diff --git a/src/mame/atari/flyball.cpp b/src/mame/atari/flyball.cpp index 947bf7e1c55..986c8b59a2e 100644 --- a/src/mame/atari/flyball.cpp +++ b/src/mame/atari/flyball.cpp @@ -25,6 +25,9 @@ Etched in copper on top of board: #include "netlist/nl_setup.h" #include "nl_flyball.h" + +namespace { + static constexpr XTAL MASTER_CLOCK = 12.096_MHz_XTAL; static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 2; @@ -548,6 +551,8 @@ ROM_START( flyball1 ) ROM_LOAD16_BYTE( "6138.f2", 0x0001, 0x0200, CRC(aab314f6) SHA1(6625c719fdc000d6af94bc9474de8f7e977cee97) ) ROM_END +} // anonymous namespace + /************************************* * diff --git a/src/mame/atari/gtia.h b/src/mame/atari/gtia.h index a9e6cc9e9e2..eb8ffa67557 100644 --- a/src/mame/atari/gtia.h +++ b/src/mame/atari/gtia.h @@ -10,8 +10,8 @@ ***************************************************************************/ -#ifndef MAME_VIDEO_GTIA_H -#define MAME_VIDEO_GTIA_H +#ifndef MAME_ATARI_GTIA_H +#define MAME_ATARI_GTIA_H #pragma once @@ -190,4 +190,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(ATARI_GTIA, gtia_device) -#endif // MAME_VIDEO_GTIA_H +#endif // MAME_ATARI_GTIA_H diff --git a/src/mame/atari/jag_blitter.h b/src/mame/atari/jag_blitter.h index 10d062a6b3b..8fb7ed33f6f 100644 --- a/src/mame/atari/jag_blitter.h +++ b/src/mame/atari/jag_blitter.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_MACHINE_JAG_BLITTER_H -#define MAME_MACHINE_JAG_BLITTER_H +#ifndef MAME_ATARI_JAG_BLITTER_H +#define MAME_ATARI_JAG_BLITTER_H #pragma once @@ -95,4 +95,4 @@ DECLARE_DEVICE_TYPE(JAG_BLITTER, jag_blitter_device) //************************************************************************** -#endif // MAME_MACHINE_JAG_BLITTER_H +#endif // MAME_ATARI_JAG_BLITTER_H diff --git a/src/mame/atari/marblmd2.cpp b/src/mame/atari/marblmd2.cpp index 2da70cc4cb3..9f0adebd7d8 100644 --- a/src/mame/atari/marblmd2.cpp +++ b/src/mame/atari/marblmd2.cpp @@ -35,6 +35,9 @@ #include "speaker.h" #include "tilemap.h" + +namespace { + class marblmd2_state : public driver_device { public: @@ -384,4 +387,7 @@ ROM_START( marblmd2 ) ROM_LOAD( "sound.12e", 0x60000, 0x20000, CRC(bab2f8e5) SHA1(bbe2d693d40e5eeba315fe7b6380a2030b66f23e) ) ROM_END +} // anonymous namespace + + GAME( 1991, marblmd2, 0, marblmd2, marblmd2, marblmd2_state, empty_init, ROT0, "Atari Games", "Marble Madness II (prototype)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/atari/maria.h b/src/mame/atari/maria.h index 130bc4de367..d65777d2efc 100644 --- a/src/mame/atari/maria.h +++ b/src/mame/atari/maria.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Dan Boris -#ifndef MAME_VIDEO_MARIA_H -#define MAME_VIDEO_MARIA_H +#ifndef MAME_ATARI_MARIA_H +#define MAME_ATARI_MARIA_H #pragma once @@ -65,4 +65,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(ATARI_MARIA, atari_maria_device) -#endif // MAME_VIDEO_MARIA_H +#endif // MAME_ATARI_MARIA_H diff --git a/src/mame/atari/mathbox.h b/src/mame/atari/mathbox.h index 665dd93d8ed..efc1e1b8828 100644 --- a/src/mame/atari/mathbox.h +++ b/src/mame/atari/mathbox.h @@ -6,8 +6,8 @@ * Copyright Eric Smith * */ -#ifndef MAME_MACHINE_MATHBOX_H -#define MAME_MACHINE_MATHBOX_H +#ifndef MAME_ATARI_MATHBOX_H +#define MAME_ATARI_MATHBOX_H #pragma once @@ -40,4 +40,4 @@ protected: DECLARE_DEVICE_TYPE(MATHBOX, mathbox_device) -#endif // MAME_MACHINE_MATHBOX_H +#endif // MAME_ATARI_MATHBOX_H diff --git a/src/mame/atari/maxaflex.cpp b/src/mame/atari/maxaflex.cpp index 3ffa2d27fc8..36cb41b3d04 100644 --- a/src/mame/atari/maxaflex.cpp +++ b/src/mame/atari/maxaflex.cpp @@ -34,6 +34,8 @@ #include "maxaflex.lh" +namespace { + class maxaflex_state : public atari_common_state { public: @@ -438,6 +440,8 @@ ROM_START(mf_flip) ROM_LOAD("maxprom.prm", 0x0000, 0x0200, CRC(edf5c950) SHA1(9ad046ea41a61585dd8d2f2d4167a3cc39d2928f)) /* for simulating keystrokes ?*/ ROM_END +} // anonymous namespace + GAME( 1984, maxaflex, 0, maxaflex, a600xl, maxaflex_state, empty_init, ROT0, "Exidy", "Max-A-Flex", MACHINE_IS_BIOS_ROOT ) GAME( 1982, mf_achas, maxaflex, maxaflex, a600xl, maxaflex_state, empty_init, ROT0, "Exidy / First Star Software", "Astro Chase (Max-A-Flex)", 0 ) diff --git a/src/mame/atari/mgolf.cpp b/src/mame/atari/mgolf.cpp index 645aadc752c..a2bf23e5f24 100644 --- a/src/mame/atari/mgolf.cpp +++ b/src/mame/atari/mgolf.cpp @@ -12,6 +12,9 @@ #include "screen.h" #include "tilemap.h" + +namespace { + class mgolf_state : public driver_device { public: @@ -390,5 +393,7 @@ ROM_START( mgolf ) ROM_LOAD( "33756-01.m7", 0x0000, 0x0200, CRC(4cec9bf3) SHA1(6dd49f045fb53ae9f412639117b107faa93dfd99) ) ROM_END +} // anonymous namespace + GAME( 1978, mgolf, 0, mgolf, mgolf, mgolf_state, empty_init, ROT270, "Atari", "Mini Golf (Atari, prototype)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/atari/nl_destroyr.h b/src/mame/atari/nl_destroyr.h index 676127f5ebd..4244901f516 100644 --- a/src/mame/atari/nl_destroyr.h +++ b/src/mame/atari/nl_destroyr.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_AUDIO_NL_DESTROYR_H -#define MAME_AUDIO_NL_DESTROYR_H +#ifndef MAME_ATARI_NL_DESTROYR_H +#define MAME_ATARI_NL_DESTROYR_H #pragma once NETLIST_EXTERNAL(destroyr) -#endif // MAME_AUDIO_NL_DESTROYR_H +#endif // MAME_ATARI_NL_DESTROYR_H diff --git a/src/mame/atari/nl_flyball.h b/src/mame/atari/nl_flyball.h index 82fd9792d0d..816bb44852d 100644 --- a/src/mame/atari/nl_flyball.h +++ b/src/mame/atari/nl_flyball.h @@ -1,10 +1,10 @@ // license:CC0-1.0 // copyright-holders:Ivan Vangelista, Ryan Holtz -#ifndef MAME_AUDIO_NL_FLYBALL_H -#define MAME_AUDIO_NL_FLYBALL_H +#ifndef MAME_ATARI_NL_FLYBALL_H +#define MAME_ATARI_NL_FLYBALL_H #pragma once NETLIST_EXTERNAL(flyball) -#endif // MAME_AUDIO_NL_FLYBALL_H +#endif // MAME_ATARI_NL_FLYBALL_H diff --git a/src/mame/atari/nl_stuntcyc.h b/src/mame/atari/nl_stuntcyc.h index f31f7c889fc..4ebdc40d3f1 100644 --- a/src/mame/atari/nl_stuntcyc.h +++ b/src/mame/atari/nl_stuntcyc.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_MACHINE_NL_STUNTCYC_H -#define MAME_MACHINE_NL_STUNTCYC_H +#ifndef MAME_ATARI_NL_STUNTCYC_H +#define MAME_ATARI_NL_STUNTCYC_H #pragma once @@ -9,4 +9,4 @@ NETLIST_EXTERNAL(stuntcyc) -#endif // MAME_MACHINE_NL_STUNTCYC_H +#endif // MAME_ATARI_NL_STUNTCYC_H diff --git a/src/mame/atari/nl_tank.h b/src/mame/atari/nl_tank.h index f3cc88d7cf1..8f566108e56 100644 --- a/src/mame/atari/nl_tank.h +++ b/src/mame/atari/nl_tank.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ryan Holtz -#ifndef MAME_MACHINE_NL_TANK_H -#define MAME_MACHINE_NL_TANK_H +#ifndef MAME_ATARI_NL_TANK_H +#define MAME_ATARI_NL_TANK_H #pragma once @@ -9,4 +9,4 @@ NETLIST_EXTERNAL(tank) -#endif // MAME_MACHINE_NL_TANK_H +#endif // MAME_ATARI_NL_TANK_H diff --git a/src/mame/atari/pofo_kbd.h b/src/mame/atari/pofo_kbd.h index 07762ff6af5..d8a95626191 100644 --- a/src/mame/atari/pofo_kbd.h +++ b/src/mame/atari/pofo_kbd.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Jaen Saul -#ifndef MAME_MACHINE_POFO_KBD_H -#define MAME_MACHINE_POFO_KBD_H +#ifndef MAME_ATARI_POFO_KBD_H +#define MAME_ATARI_POFO_KBD_H #pragma once @@ -36,4 +36,4 @@ private: DECLARE_DEVICE_TYPE(POFO_KEYBOARD, pofo_keyboard_device); -#endif // MAME_MACHINE_POFO_KBD_H +#endif // MAME_ATARI_POFO_KBD_H diff --git a/src/mame/atari/pong.cpp b/src/mame/atari/pong.cpp index 7bd96d00b6a..2803c857472 100644 --- a/src/mame/atari/pong.cpp +++ b/src/mame/atari/pong.cpp @@ -104,6 +104,9 @@ TODO: Volleyball... * */ + +namespace { + static const int NS_PER_CLOCK_PONG = static_cast((double) netlist::config::INTERNAL_RES::value / (double) 7159000 + 0.5); static const int MASTER_CLOCK_PONG = static_cast((double) netlist::config::INTERNAL_RES::value / (double) NS_PER_CLOCK_PONG + 0.5); @@ -689,6 +692,9 @@ ROM_START( consolet ) // dummy to satisfy game entry ROM_END */ +} // anonymous namespace + + GAME( 1972, pong, 0, pong, pong, pong_state, empty_init, ROT0, "Atari", "Pong (Rev E) [TTL]", MACHINE_SUPPORTS_SAVE) GAME( 1973, pongd, 0, pongd, pongd, pong_state, empty_init, ROT0, "Atari", "Pong Doubles [TTL]", MACHINE_SUPPORTS_SAVE) GAMEL( 1974, rebound, 0, rebound, rebound, rebound_state, empty_init, ROT0, "Atari", "Rebound (Rev B) [TTL]", MACHINE_SUPPORTS_SAVE, layout_rebound) diff --git a/src/mame/atari/redbaron.h b/src/mame/atari/redbaron.h index 8262f9619db..50db411f473 100644 --- a/src/mame/atari/redbaron.h +++ b/src/mame/atari/redbaron.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Brad Oliver, Nicola Salmoria -#ifndef MAME_AUDIO_REDBARON_H -#define MAME_AUDIO_REDBARON_H +#ifndef MAME_ATARI_REDBARON_H +#define MAME_ATARI_REDBARON_H //************************************************************************** // TYPE DEFINITIONS @@ -48,4 +48,4 @@ private: DECLARE_DEVICE_TYPE(REDBARON, redbaron_sound_device) -#endif // MAME_AUDIO_REDBARON_H +#endif // MAME_ATARI_REDBARON_H diff --git a/src/mame/atari/sbrkout.cpp b/src/mame/atari/sbrkout.cpp index 6c6de61b814..7822983783a 100644 --- a/src/mame/atari/sbrkout.cpp +++ b/src/mame/atari/sbrkout.cpp @@ -45,6 +45,9 @@ #include "tilemap.h" #include "sbrkout.lh" + +namespace { + class sbrkout_state : public driver_device { public: @@ -669,6 +672,9 @@ ROM_START( sbrkoutct ) // built from original Atari source code ROM_LOAD( "006401.e2", 0x0100, 0x0020, CRC(857df8db) SHA1(06313d5bde03220b2bc313d18e50e4bb1d0cfbbb) ) /* memory mapper */ ROM_END +} // anonymous namespace + + /************************************* * * Game drivers diff --git a/src/mame/atari/tia.h b/src/mame/atari/tia.h index 8a169e24415..285ff3614eb 100644 --- a/src/mame/atari/tia.h +++ b/src/mame/atari/tia.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol,Stefan Jokisch -#ifndef MAME_VIDEO_VIDEO_TIA_H -#define MAME_VIDEO_VIDEO_TIA_H +#ifndef MAME_ATARI_TIA_H +#define MAME_ATARI_TIA_H #pragma once @@ -242,4 +242,4 @@ protected: DECLARE_DEVICE_TYPE(TIA_PAL_VIDEO, tia_pal_video_device) DECLARE_DEVICE_TYPE(TIA_NTSC_VIDEO, tia_ntsc_video_device) -#endif // MAME_VIDEO_TIA_H +#endif // MAME_ATARI_TIA_H diff --git a/src/mame/atari/tourtabl.cpp b/src/mame/atari/tourtabl.cpp index 122667da571..88e7896f186 100644 --- a/src/mame/atari/tourtabl.cpp +++ b/src/mame/atari/tourtabl.cpp @@ -18,6 +18,8 @@ #include "speaker.h" +namespace { + class tourtabl_state : public driver_device { public: @@ -202,6 +204,8 @@ ROM_START( tourtab2 ) ROM_LOAD( "030753.ab4", 0x1800, 0x0800, CRC(3978b269) SHA1(4fa05c655bb74711eb99428f36df838ec70da699) ) ROM_END +} // anonymous namespace + GAME( 1978, tourtabl, 0, tourtabl, tourtabl, tourtabl_state, empty_init, ROT0, "Atari", "Tournament Table (set 1)", MACHINE_SUPPORTS_SAVE ) GAME( 1978, tourtab2, tourtabl, tourtabl, tourtabl, tourtabl_state, empty_init, ROT0, "Atari", "Tournament Table (set 2)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/atlus/bowltry.cpp b/src/mame/atlus/bowltry.cpp index 172035cfd57..7e6d5146b80 100644 --- a/src/mame/atlus/bowltry.cpp +++ b/src/mame/atlus/bowltry.cpp @@ -47,6 +47,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class bowltry_state : public driver_device { public: @@ -192,5 +195,7 @@ ROM_START( bowltry ) ROM_LOAD( "u24_v1.00.u24", 0x000000, 0x400000, CRC(4e082d58) SHA1(d2eb58bc3d8ade2ea556960013d580f0fb952090) ) ROM_END +} // anonymous namespace + GAME( 200?, bowltry, 0, bowltry, bowltry, bowltry_state, empty_init, ROT0, "Atlus", "Bowling Try!", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/atlus/patapata.cpp b/src/mame/atlus/patapata.cpp index f17781ff276..cdc075bc440 100644 --- a/src/mame/atlus/patapata.cpp +++ b/src/mame/atlus/patapata.cpp @@ -29,6 +29,8 @@ maybe close to jalmah.cpp? #include "tilemap.h" +namespace { + class patapata_state : public driver_device { public: @@ -330,5 +332,8 @@ ROM_START( patapata ) ROM_LOAD( "n82s135n.u137", 0x000, 0x100, CRC(cb90eedc) SHA1(6577cb1999a90b9209b150cbedde11de9ac30018) ) ROM_END +} // anonymous namespace + + // cabinet shows Atlus logo, though there's no copyright on the title screen and PCB is NTC / NMK GAME( 1993, patapata, 0, patapata, patapata, patapata_state, empty_init, ROT0, "Atlus", "Pata Pata Panic", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/att/att3b2.cpp b/src/mame/att/att3b2.cpp index ba081e2e23a..78978252c91 100644 --- a/src/mame/att/att3b2.cpp +++ b/src/mame/att/att3b2.cpp @@ -14,6 +14,9 @@ //#include "machine/upd7261.h" #include "machine/wd_fdc.h" + +namespace { + class att3b2_state : public driver_device { public: @@ -130,6 +133,9 @@ ROM_START(3b2_600) ROM_LOAD32_BYTE("abtrt.bin", 0x0003, 0x8000, CRC(0f075161) SHA1(b67c9c4549dc789df33b5a38e4b35fe26fdfbea6)) ROM_END +} // anonymous namespace + + COMP(1984, 3b2_300, 0, 0, att3b2v2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/300", MACHINE_IS_SKELETON) COMP(1985, 3b2_310, 3b2_300, 0, att3b2v2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/310", MACHINE_IS_SKELETON) COMP(1985, 3b2_400, 3b2_300, 0, att3b2v2, att3b2, att3b2_state, empty_init, "AT&T", "3B2/400", MACHINE_IS_SKELETON) diff --git a/src/mame/att/att4425.cpp b/src/mame/att/att4425.cpp index 3399fd99ac9..678b936f5b8 100644 --- a/src/mame/att/att4425.cpp +++ b/src/mame/att/att4425.cpp @@ -29,6 +29,8 @@ #include "screen.h" +namespace { + #define SCREEN_TAG "screen" #define Z80_TAG "maincpu" #define Z80CTC_TAG "z80ctc" @@ -302,6 +304,9 @@ ROM_START( att4425 ) ROM_LOAD( "char.bin", 0x0000, 0x2000, CRC(cca962cc) SHA1(201d97b954f782ceae8d17a08fb9a1c4d5ae7a58) ) ROM_END +} // anonymous namespace + + /* System Drivers */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/att/att610.cpp b/src/mame/att/att610.cpp index 35ce4f2ced5..8fa0e315f4a 100644 --- a/src/mame/att/att610.cpp +++ b/src/mame/att/att610.cpp @@ -29,6 +29,9 @@ #include "emupal.h" #include "screen.h" + +namespace { + class att610_state : public driver_device { public: @@ -181,5 +184,8 @@ ROM_START( att615 ) ROM_LOAD("20417-21_8031.bin", 0x0000, 0x1000, CRC(c48b4a2a) SHA1(f01dadc0239f81a58d50ae077f5cb3a029bad110)) ROM_END +} // anonymous namespace + + COMP(1986, att610, 0, 0, att610, att610, att610_state, empty_init, "AT&T", "610 Business Communication Terminal", MACHINE_IS_SKELETON) COMP(1987, att615, 0, 0, att610, att610, att610_state, empty_init, "AT&T", "615 MT", MACHINE_IS_SKELETON) diff --git a/src/mame/att/att630.cpp b/src/mame/att/att630.cpp index 925893cb9cf..b16ed08c0c1 100644 --- a/src/mame/att/att630.cpp +++ b/src/mame/att/att630.cpp @@ -12,6 +12,9 @@ Skeleton driver for AT&T 630 MTG terminal. #include "machine/nvram.h" #include "screen.h" + +namespace { + class att630_state : public driver_device { public: @@ -157,5 +160,8 @@ ROM_START( att730x ) ROM_LOAD16_BYTE( "846541902_6d82_000.b10", 0x00001, 0x10000, CRC(dcf9165c) SHA1(3f264193228bbf935a2699e64bbff08ceb1c2164) ) ROM_END +} // anonymous namespace + + COMP( 1986, att630, 0, 0, att630, att630, att630_state, empty_init, "AT&T", "630 MTG", MACHINE_IS_SKELETON ) COMP( 1990, att730x, 0, 0, att730x, att630, att630_state, empty_init, "AT&T", "730X", MACHINE_IS_SKELETON ) diff --git a/src/mame/ausnz/binbug.cpp b/src/mame/ausnz/binbug.cpp index 300af799dd4..ca84929c952 100644 --- a/src/mame/ausnz/binbug.cpp +++ b/src/mame/ausnz/binbug.cpp @@ -52,6 +52,8 @@ #include "speaker.h" +namespace { + class binbug_state : public driver_device { public: @@ -287,6 +289,9 @@ ROM_START( binbug ) ROM_LOAD( "binbug.rom", 0x0000, 0x0400, CRC(2cb1ac6e) SHA1(a969883fc767484d6b0fa103cfa4b4129b90441b) ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ausnz/d6800.cpp b/src/mame/ausnz/d6800.cpp index a0981b8ad48..28b886a8e49 100644 --- a/src/mame/ausnz/d6800.cpp +++ b/src/mame/ausnz/d6800.cpp @@ -59,6 +59,8 @@ #include "speaker.h" +namespace { + class d6800_state : public driver_device { public: @@ -430,5 +432,8 @@ ROM_START( d6800 ) ROMX_LOAD( "d6800d2m.bin", 0x0000, 0x0800, CRC(eec8e56f) SHA1(f587ccbc0872f2982d61120d033f481a862b902b), ROM_BIOS(2) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1979, d6800, 0, 0, d6800, d6800, d6800_state, empty_init, "Michael Bauer", "Dream 6800", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ausnz/datum.cpp b/src/mame/ausnz/datum.cpp index e8763504aca..60ec0651d44 100644 --- a/src/mame/ausnz/datum.cpp +++ b/src/mame/ausnz/datum.cpp @@ -59,6 +59,8 @@ Z1000G #include "datum.lh" +namespace { + class datum_state : public driver_device { public: @@ -229,5 +231,8 @@ ROM_START( datum ) ROM_LOAD( "datum.bin", 0x0000, 0x0800, BAD_DUMP CRC(6fb11628) SHA1(8a77a846b62eee0d12848da76e16b4c66ef445d8) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1982, datum, 0, 0, datum, datum, datum_state, empty_init, "Gammatron", "Datum", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ausnz/dg680.cpp b/src/mame/ausnz/dg680.cpp index ccb6b441e00..7fe18949a95 100644 --- a/src/mame/ausnz/dg680.cpp +++ b/src/mame/ausnz/dg680.cpp @@ -72,6 +72,8 @@ ToDo: #include "speaker.h" +namespace { + class dg680_state : public driver_device { public: @@ -331,6 +333,9 @@ ROM_START( dg680 ) ROM_LOAD( "82s123.bin", 0x0000, 0x0020, NO_DUMP ) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ausnz/eacc.cpp b/src/mame/ausnz/eacc.cpp index 57102dac044..49595a5522b 100644 --- a/src/mame/ausnz/eacc.cpp +++ b/src/mame/ausnz/eacc.cpp @@ -56,6 +56,8 @@ #include "machine/nvram.h" +namespace { + class eacc_state : public driver_device { public: @@ -293,6 +295,8 @@ ROM_START(eacc) ROM_LOAD("eacc.bin", 0x0000, 0x0800, CRC(287a63c0) SHA1(f61b397d33ea40e5742e34d5f5468572125e8b39) ) ROM_END +} // anonymous namespace + /****************************************************************************** Drivers diff --git a/src/mame/ausnz/eti660.cpp b/src/mame/ausnz/eti660.cpp index df72dd86e63..ef631e104b5 100644 --- a/src/mame/ausnz/eti660.cpp +++ b/src/mame/ausnz/eti660.cpp @@ -47,6 +47,9 @@ #include "softlist_dev.h" #include "speaker.h" + +namespace { + #define CDP1802_TAG "ic3" #define CDP1864_TAG "ic4" #define MC6821_TAG "ic5" @@ -407,5 +410,8 @@ ROM_START( eti660 ) ROM_LOAD( "eti660.bin", 0x0000, 0x0400, CRC(811dfa62) SHA1(c0c4951e02f873f15560bdc3f35cdf3f99653922) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1981, eti660, 0, 0, eti660, eti660, eti660_state, empty_init, "Electronics Today International", "ETI-660 Learners' Microcomputer", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/ausnz/magnum.cpp b/src/mame/ausnz/magnum.cpp index f6e17c87b27..9af2a2a52b0 100644 --- a/src/mame/ausnz/magnum.cpp +++ b/src/mame/ausnz/magnum.cpp @@ -17,6 +17,9 @@ #include "screen.h" #include "speaker.h" + +namespace { + class magnum_state : public driver_device { public: @@ -334,4 +337,7 @@ ROM_START( magnum ) ROM_LOAD("dulmontcharrom.bin", 0x0000, 0x1000, CRC(9dff89bf) SHA1(d359aeba7f0b0c81accf3bca25e7da636c033721)) ROM_END +} // anonymous namespace + + COMP( 1983, magnum, 0, 0, magnum, magnum, magnum_state, empty_init, "Dulmont", "Magnum", MACHINE_IMPERFECT_SOUND) diff --git a/src/mame/ausnz/pipbug.cpp b/src/mame/ausnz/pipbug.cpp index 9c56eac0505..f59c1b84339 100644 --- a/src/mame/ausnz/pipbug.cpp +++ b/src/mame/ausnz/pipbug.cpp @@ -53,6 +53,8 @@ After load completes, G440 to run. #include "speaker.h" +namespace { + class pipbug_state : public driver_device { public: @@ -242,6 +244,9 @@ ROM_START( pipbug ) ROM_LOAD( "pipbug.rom", 0x0000, 0x0400, CRC(f242b93e) SHA1(f82857cc882e6b5fc9f00b20b375988024f413ff)) ROM_END +} // anonymous namespace + + /* Driver */ // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS diff --git a/src/mame/ausnz/proteus.cpp b/src/mame/ausnz/proteus.cpp index cccc4cc2cac..518c7b1d043 100644 --- a/src/mame/ausnz/proteus.cpp +++ b/src/mame/ausnz/proteus.cpp @@ -58,6 +58,8 @@ #include "softlist_dev.h" +namespace { + class proteus_state : public driver_device { public: @@ -428,6 +430,8 @@ ROM_START(proteus) ROMX_LOAD("300986.u28", 0x0000, 0x1000, CRC(f607d396) SHA1(0b9d9d3178b5587e60da56885b9e8a83f7d5dd26), ROM_BIOS(1)) ROM_END +} // anonymous namespace + /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ COMP( 1982, proteus, 0, 0, proteus, proteus, proteus_state, empty_init, "Polycorp", "Poly Proteus (Standalone)", MACHINE_NOT_WORKING ) diff --git a/src/mame/ausnz/tec1.cpp b/src/mame/ausnz/tec1.cpp index eb3a3ff630c..969642bca6b 100644 --- a/src/mame/ausnz/tec1.cpp +++ b/src/mame/ausnz/tec1.cpp @@ -81,6 +81,8 @@ JMON ToDo: #include "tec1.lh" +namespace { + class tec1_state : public driver_device { public: @@ -405,6 +407,9 @@ ROM_START(tecjmon) ROM_LOAD("util.rom", 0x0800, 0x0800, CRC(7c19700d) SHA1(dc5b3ade66bb11c54430056966ed99cdd299d82b) ) ROM_END +} // anonymous namespace + + // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS COMP( 1984, tec1, 0, 0, tec1, tec1, tec1_state, empty_init, "Talking Electronics magazine", "TEC-1", MACHINE_SUPPORTS_SAVE ) COMP( 1984, tecjmon, tec1, 0, tecjmon, tec1, tec1_state, empty_init, "Talking Electronics magazine", "TEC-1A with JMON", MACHINE_SUPPORTS_SAVE ) -- cgit v1.2.3