From b97765105da8eedce27674906390cf5640bcbfa7 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 27 Nov 2024 05:12:25 +1100 Subject: dynax/dynax.cpp: Added DIP switches that are sometimes populated to Ougon no Pai. Also fixed a bunch more #include guards. --- src/devices/cpu/f2mc16/f2mc16_reload.h | 6 +++--- src/devices/cpu/f2mc16/mb90640a.h | 6 +++--- src/devices/cpu/gigatron/gigatron.h | 19 ++++++++----------- src/devices/cpu/i386/cycles.h | 8 ++++---- src/devices/cpu/i386/i386priv.h | 8 ++++---- src/devices/cpu/i386/x87priv.h | 8 ++++---- src/devices/cpu/i8089/i8089_channel.h | 6 +++--- src/devices/cpu/i8089/i8089_dasm.h | 6 +++--- src/devices/cpu/lr35902/lr35902d.h | 6 +++--- src/devices/cpu/m68000/m68000mcu.h | 6 +++--- src/devices/cpu/mb86235/mb86235fe.h | 8 ++++---- src/devices/cpu/mcs48/mcs48dsm.h | 6 +++--- src/devices/cpu/minx/minxd.h | 6 +++--- src/devices/cpu/patinhofeio/patinhofeio_cpu.h | 6 +++--- src/devices/cpu/pdp8/pdp8.h | 8 ++++---- src/devices/cpu/sh/sh3comn.h | 8 ++++---- src/devices/cpu/sh/sh4.h | 7 +++---- src/devices/cpu/sh/sh4comn.h | 8 ++++---- src/devices/cpu/sh/sh4regs.h | 8 ++++---- src/devices/cpu/sh/sh7604_wdt.h | 7 +++---- src/devices/cpu/sh/sh_dasm.h | 6 +++--- src/devices/cpu/sparc/sparcdasm.h | 6 +++--- src/devices/cpu/sparc/sparcdefs.h | 8 ++++---- src/devices/cpu/spc700/spc700ds.h | 7 ++++--- src/devices/cpu/ssp1601/ssp1601d.h | 6 +++--- src/devices/cpu/st62xx/st62xx.h | 6 +++--- src/devices/cpu/st62xx/st62xx_dasm.h | 6 +++--- src/devices/cpu/tms32010/32010dsm.h | 6 +++--- src/devices/cpu/tms32025/tms32025.h | 6 +++--- src/devices/cpu/tms9900/9900dasm.h | 6 +++--- src/devices/cpu/tms9900/tms9995.h | 6 +++--- src/devices/cpu/tms9900/tms99com.h | 9 ++++++--- src/devices/cpu/upd7810/upd7810_dasm.h | 6 +++--- src/devices/cpu/v30mz/v30mz.h | 6 +++--- src/devices/cpu/v620/v620dasm.h | 6 +++--- src/devices/imagedev/avivideo.h | 6 +++--- src/devices/imagedev/bitbngr.h | 8 +++++--- src/devices/imagedev/cartrom.h | 6 +++--- src/devices/imagedev/cassette.h | 8 +++++--- src/devices/imagedev/cdromimg.h | 6 +++--- src/devices/imagedev/diablo.h | 6 +++--- src/devices/imagedev/flopdrv.h | 6 +++--- src/devices/imagedev/floppy.h | 6 +++--- src/devices/imagedev/harddriv.h | 6 +++--- src/devices/imagedev/magtape.h | 6 +++--- src/devices/imagedev/memcard.h | 6 +++--- src/devices/imagedev/mfmhd.h | 6 +++--- src/devices/imagedev/microdrv.h | 6 +++--- src/devices/imagedev/papertape.h | 6 +++--- src/devices/imagedev/picture.h | 6 +++--- src/devices/imagedev/printer.h | 6 +++--- src/devices/imagedev/simh_tape_image.h | 6 +++--- src/devices/imagedev/snapquik.h | 6 +++--- src/devices/imagedev/wafadrive.h | 10 +++++----- src/devices/machine/6821pia.h | 9 +++------ src/devices/machine/68307bus.h | 6 +++--- src/mame/dynax/dynax.cpp | 10 +++++++++- 57 files changed, 201 insertions(+), 193 deletions(-) diff --git a/src/devices/cpu/f2mc16/f2mc16_reload.h b/src/devices/cpu/f2mc16/f2mc16_reload.h index 185f2bbabb3..2543290a81c 100644 --- a/src/devices/cpu/f2mc16/f2mc16_reload.h +++ b/src/devices/cpu/f2mc16/f2mc16_reload.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_CPU_F2MC16_F2MC16_TIMER_H -#define MAME_CPU_F2MC16_F2MC16_TIMER_H +#ifndef MAME_CPU_F2MC16_F2MC16_RELOAD_H +#define MAME_CPU_F2MC16_F2MC16_RELOAD_H #pragma once @@ -72,4 +72,4 @@ protected: DECLARE_DEVICE_TYPE(F2MC16_RELOAD_TIMER, f2mc16_reload_timer_device) -#endif +#endif // MAME_CPU_F2MC16_F2MC16_RELOAD_H diff --git a/src/devices/cpu/f2mc16/mb90640a.h b/src/devices/cpu/f2mc16/mb90640a.h index dbf5b198960..c4bcff49a46 100644 --- a/src/devices/cpu/f2mc16/mb90640a.h +++ b/src/devices/cpu/f2mc16/mb90640a.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:smf -#ifndef MAME_CPU_F2MC16_MB90640_H -#define MAME_CPU_F2MC16_MB90640_H +#ifndef MAME_CPU_F2MC16_MB90640A_H +#define MAME_CPU_F2MC16_MB90640A_H #pragma once @@ -49,4 +49,4 @@ public: DECLARE_DEVICE_TYPE(MB90641A, mb90641a_device) -#endif // MAME_CPU_F2MC16_MB90640_H +#endif // MAME_CPU_F2MC16_MB90640A_H diff --git a/src/devices/cpu/gigatron/gigatron.h b/src/devices/cpu/gigatron/gigatron.h index 23c505c24c9..af516640240 100644 --- a/src/devices/cpu/gigatron/gigatron.h +++ b/src/devices/cpu/gigatron/gigatron.h @@ -11,8 +11,8 @@ * *****************************************************************************/ -#ifndef MAME_CPU_GTRON_H -#define MAME_CPU_GTRON_H +#ifndef MAME_CPU_GIGATRON_GIGATRON_H +#define MAME_CPU_GIGATRON_GIGATRON_H #pragma once @@ -34,23 +34,23 @@ public: auto ir_cb() { return m_ir_cb.bind(); } protected: - // device-level overrides + // device_t implementation virtual void device_start() override ATTR_COLD; virtual void device_reset() override ATTR_COLD; - // device_execute_interface overrides + // device_execute_interface implementation virtual uint32_t execute_min_cycles() const noexcept override { return 1; } virtual uint32_t execute_max_cycles() const noexcept override { return 7; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - // device_state_interface overrides + // device_state_interface implementation virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; - // device_disasm_interface overrides + // device_disasm_interface implementation virtual std::unique_ptr create_disassembler() override; - // device_memory_interface overrides + // device_memory_interface implementation virtual space_config_vector memory_space_config() const override; void reset_cpu(); @@ -92,7 +92,4 @@ private: DECLARE_DEVICE_TYPE(GTRON, gigatron_cpu_device) - - -#endif // MAME_CPU_GTRON_H - +#endif // MAME_CPU_GIGATRON_GIGATRON_H diff --git a/src/devices/cpu/i386/cycles.h b/src/devices/cpu/i386/cycles.h index 2ca28aff180..f6721a39549 100644 --- a/src/devices/cpu/i386/cycles.h +++ b/src/devices/cpu/i386/cycles.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Ville Linde, Barry Rodewald, Carl, Philip Bennett -#pragma once +#ifndef MAME_CPU_I386_CYCLES_H +#define MAME_CPU_I386_CYCLES_H -#ifndef __CYCLES_H__ -#define __CYCLES_H__ +#pragma once struct X86_CYCLE_TABLE { @@ -340,4 +340,4 @@ static const X86_CYCLE_TABLE x86_cycle_table[] = { CYCLES_CMPXCHG_REG_MEM_F, { { 0, 0 }, { 10, 10 }, { 10, 10 }, { 10, 10 } } }, }; -#endif /* __CYCLES_H__ */ +#endif // MAME_CPU_I386_CYCLES_H diff --git a/src/devices/cpu/i386/i386priv.h b/src/devices/cpu/i386/i386priv.h index 63814d2dc6e..3e5ea5b70f8 100644 --- a/src/devices/cpu/i386/i386priv.h +++ b/src/devices/cpu/i386/i386priv.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Ville Linde, Barry Rodewald, Carl, Philip Bennett -#pragma once +#ifndef MAME_CPU_I386_I386PRIV_H +#define MAME_CPU_I386_I386PRIV_H -#ifndef __I386_H__ -#define __I386_H__ +#pragma once #include "i386dasm.h" @@ -724,4 +724,4 @@ enum X86_CYCLES #define OP_4BYTE3AF2 0x00400000 #define OP_4BYTE38F3 0x00200000 -#endif /* __I386_H__ */ +#endif // MAME_CPU_I386_I386PRIV_H diff --git a/src/devices/cpu/i386/x87priv.h b/src/devices/cpu/i386/x87priv.h index 1d2c227b292..379a929f954 100644 --- a/src/devices/cpu/i386/x87priv.h +++ b/src/devices/cpu/i386/x87priv.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Philip Bennett -#pragma once +#ifndef MAME_CPU_I386_X87PRIV_H +#define MAME_CPU_I386_X87PRIV_H -#ifndef __X87PRIV_H__ -#define __X87PRIV_H__ +#pragma once #include @@ -165,4 +165,4 @@ void i386_device::WRITE80(uint32_t ea, floatx80 t) WRITE16(ea + 8, t.high); } -#endif /* __X87PRIV_H__ */ +#endif // MAME_CPU_I386_X87PRIV_H diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h index a2481a97fb1..97a1ac36c4f 100644 --- a/src/devices/cpu/i8089/i8089_channel.h +++ b/src/devices/cpu/i8089/i8089_channel.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_CPU_I8080_I8089_CHANNEL_H -#define MAME_CPU_I8080_I8089_CHANNEL_H +#ifndef MAME_CPU_I8089_I8089_CHANNEL_H +#define MAME_CPU_I8089_I8089_CHANNEL_H #pragma once @@ -206,4 +206,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(I8089_CHANNEL, i8089_channel_device) -#endif // MAME_CPU_I8080_I8089_CHANNEL_H +#endif // MAME_CPU_I8089_I8089_CHANNEL_H diff --git a/src/devices/cpu/i8089/i8089_dasm.h b/src/devices/cpu/i8089/i8089_dasm.h index de699f7fb5d..f2626725081 100644 --- a/src/devices/cpu/i8089/i8089_dasm.h +++ b/src/devices/cpu/i8089/i8089_dasm.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_CPU_I8089_I8089DASM_H -#define MAME_CPU_I8089_I8089DASM_H +#ifndef MAME_CPU_I8089_I8089_DASM_H +#define MAME_CPU_I8089_I8089_DASM_H #pragma once @@ -68,4 +68,4 @@ private: void load_instruction(); }; -#endif +#endif // MAME_CPU_I8089_I8089_DASM_H diff --git a/src/devices/cpu/lr35902/lr35902d.h b/src/devices/cpu/lr35902/lr35902d.h index 550a8bdaef8..55216605f14 100644 --- a/src/devices/cpu/lr35902/lr35902d.h +++ b/src/devices/cpu/lr35902/lr35902d.h @@ -7,8 +7,8 @@ * *****************************************************************************/ -#ifndef MAME_CPU_LR35902_LR35902DASM_H -#define MAME_CPU_LR35902_LR35902DASM_H +#ifndef MAME_CPU_LR35902_LR35902D_H +#define MAME_CPU_LR35902_LR35902D_H #pragma once @@ -45,4 +45,4 @@ private: static const lr35902dasm mnemonic_main[256]; }; -#endif +#endif // MAME_CPU_LR35902_LR35902D_H diff --git a/src/devices/cpu/m68000/m68000mcu.h b/src/devices/cpu/m68000/m68000mcu.h index aa6d8309c44..8b50865f01f 100644 --- a/src/devices/cpu/m68000/m68000mcu.h +++ b/src/devices/cpu/m68000/m68000mcu.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_CPU_M68000_M68000mcu_H -#define MAME_CPU_M68000_M68000mcu_H +#ifndef MAME_CPU_M68000_M68000MCU_H +#define MAME_CPU_M68000_M68000MCU_H #pragma once @@ -33,4 +33,4 @@ protected: void set_current_interrupt_level(u32 level); }; -#endif +#endif // MAME_CPU_M68000_M68000MCU_H diff --git a/src/devices/cpu/mb86235/mb86235fe.h b/src/devices/cpu/mb86235/mb86235fe.h index ef8bff02df8..309b30b9133 100644 --- a/src/devices/cpu/mb86235/mb86235fe.h +++ b/src/devices/cpu/mb86235/mb86235fe.h @@ -7,14 +7,14 @@ ******************************************************************************/ +#ifndef MAME_CPU_MB86235_MB86235FE_H +#define MAME_CPU_MB86235_MB86235FE_H + #pragma once #include "mb86235.h" #include "cpu/drcfe.h" -#ifndef __MB86235FE_H__ -#define __MB86235FE_H__ - class mb86235_frontend : public drc_frontend { public: @@ -44,4 +44,4 @@ private: void describe_ea(opcode_desc &desc, int md, int arx, int ary, int disp); }; -#endif /* __MB86235FE_H__ */ +#endif // MAME_CPU_MB86235_MB86235FE_H diff --git a/src/devices/cpu/mcs48/mcs48dsm.h b/src/devices/cpu/mcs48/mcs48dsm.h index af437879212..3144796ad1a 100644 --- a/src/devices/cpu/mcs48/mcs48dsm.h +++ b/src/devices/cpu/mcs48/mcs48dsm.h @@ -7,8 +7,8 @@ ***************************************************************************/ -#ifndef MAME_CPU_MCS48_MCS48DASM_H -#define MAME_CPU_MCS48_MCS48DASM_H +#ifndef MAME_CPU_MCS48_MCS48DSM_H +#define MAME_CPU_MCS48_MCS48DSM_H #pragma once @@ -28,4 +28,4 @@ private: bool m_i802x; }; -#endif +#endif // MAME_CPU_MCS48_MCS48DSM_H diff --git a/src/devices/cpu/minx/minxd.h b/src/devices/cpu/minx/minxd.h index 08786c5dda8..4ab5803d1bb 100644 --- a/src/devices/cpu/minx/minxd.h +++ b/src/devices/cpu/minx/minxd.h @@ -7,8 +7,8 @@ ************************************************************/ -#ifndef MAME_CPU_MINX_MINXDASM_H -#define MAME_CPU_MINX_MINXDASM_H +#ifndef MAME_CPU_MINX_MINXD_H +#define MAME_CPU_MINX_MINXD_H #pragma once @@ -86,4 +86,4 @@ private: static const minxdasm mnemonic_cf[256]; }; -#endif +#endif // MAME_CPU_MINX_MINXD_H diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index fdef1418dce..a5df23f86dd 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -1,7 +1,7 @@ // license:GPL-2.0+ // copyright-holders:Felipe Sanches -#ifndef MAME_DEVICES_CPU_PATINHOFEIO_CPU_H -#define MAME_DEVICES_CPU_PATINHOFEIO_CPU_H +#ifndef MAME_CPU_PATINHOFEIO_PATINHOFEIO_CPU_H +#define MAME_CPU_PATINHOFEIO_PATINHOFEIO_CPU_H #pragma once @@ -132,4 +132,4 @@ private: DECLARE_DEVICE_TYPE(PATO_FEIO_CPU, patinho_feio_cpu_device) -#endif // MAME_DEVICES_CPU_PATINHOFEIO_CPU_H +#endif // MAME_CPU_PATINHOFEIO_PATINHOFEIO_CPU_H diff --git a/src/devices/cpu/pdp8/pdp8.h b/src/devices/cpu/pdp8/pdp8.h index d481f2752bb..f8352f5fda5 100644 --- a/src/devices/cpu/pdp8/pdp8.h +++ b/src/devices/cpu/pdp8/pdp8.h @@ -6,10 +6,10 @@ Written by Ryan Holtz */ -#pragma once +#ifndef MAME_CPU_PDP8_PDP8_H +#define MAME_CPU_PDP8_PDP8_H -#ifndef __PDP8_H__ -#define __PDP8_H__ +#pragma once //************************************************************************** // TYPE DEFINITIONS @@ -105,4 +105,4 @@ enum PDP8_HALT }; -#endif /* __PDP8_H__ */ +#endif // MAME_CPU_PDP8_PDP8_H diff --git a/src/devices/cpu/sh/sh3comn.h b/src/devices/cpu/sh/sh3comn.h index 30f8e59ab68..29aeef4cead 100644 --- a/src/devices/cpu/sh/sh3comn.h +++ b/src/devices/cpu/sh/sh3comn.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#pragma once +#ifndef MAME_CPU_SH_SH3COMN_H +#define MAME_CPU_SH_SH3COMN_H -#ifndef __SH3COMN_H__ -#define __SH3COMN_H__ +#pragma once // actual port handling is more complex than this @@ -95,4 +95,4 @@ #define SH3_EXPEVT_ADDR ((0xffffffd4 - SH3_UPPER_REGBASE)/4) #define SH3_INTEVT_ADDR ((0xffffffd8 - SH3_UPPER_REGBASE)/4) -#endif /* __SH3COMN_H__ */ +#endif // MAME_CPU_SH_SH3COMN_H diff --git a/src/devices/cpu/sh/sh4.h b/src/devices/cpu/sh/sh4.h index 329cd9d2c71..cefe18843db 100644 --- a/src/devices/cpu/sh/sh4.h +++ b/src/devices/cpu/sh/sh4.h @@ -10,8 +10,8 @@ * *****************************************************************************/ -#ifndef MAME_CPU_SH4_SH4_H -#define MAME_CPU_SH4_SH4_H +#ifndef MAME_CPU_SH_SH4_H +#define MAME_CPU_SH_SH4_H #pragma once @@ -807,5 +807,4 @@ DECLARE_DEVICE_TYPE(SH3BE, sh3be_device) DECLARE_DEVICE_TYPE(SH4LE, sh4_device) DECLARE_DEVICE_TYPE(SH4BE, sh4be_device) - -#endif // MAME_CPU_SH4_SH4_H +#endif // MAME_CPU_SH_SH4_H diff --git a/src/devices/cpu/sh/sh4comn.h b/src/devices/cpu/sh/sh4comn.h index 5f02378ed9f..bac004d36b4 100644 --- a/src/devices/cpu/sh/sh4comn.h +++ b/src/devices/cpu/sh/sh4comn.h @@ -8,10 +8,10 @@ * *****************************************************************************/ -#pragma once +#ifndef MAME_CPU_SH_SH4COMN_H +#define MAME_CPU_SH_SH4COMN_H -#ifndef __SH4COMN_H__ -#define __SH4COMN_H__ +#pragma once #include "sh.h" @@ -73,4 +73,4 @@ enum #define REGFLAG_SSR (1 << 10) #define REGFLAG_SPC (1 << 11) -#endif /* __SH4COMN_H__ */ +#endif // MAME_CPU_SH_SH4COMN_H diff --git a/src/devices/cpu/sh/sh4regs.h b/src/devices/cpu/sh/sh4regs.h index 384f062858e..59f0044e283 100644 --- a/src/devices/cpu/sh/sh4regs.h +++ b/src/devices/cpu/sh/sh4regs.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont -#pragma once +#ifndef MAME_CPU_SH_SH4REGS_H +#define MAME_CPU_SH_SH4REGS_H -#ifndef __SH4REGS_H__ -#define __SH4REGS_H__ +#pragma once /* 00000001111111100000000011111100 */ #define PTEH 0x2000 /* FF000000 */ @@ -180,4 +180,4 @@ #define PVR_SH7751R 0x04050000 #define PRR_SH7751R 0x00000110 -#endif /* __SH4REGS_H__ */ +#endif // MAME_CPU_SH_SH4REGS_H diff --git a/src/devices/cpu/sh/sh7604_wdt.h b/src/devices/cpu/sh/sh7604_wdt.h index a0d977f7c01..88f33b0e9e8 100644 --- a/src/devices/cpu/sh/sh7604_wdt.h +++ b/src/devices/cpu/sh/sh7604_wdt.h @@ -6,13 +6,12 @@ ***************************************************************************/ -#ifndef MAME_CPU_SH7604_WDT_H -#define MAME_CPU_SH7604_WDT_H +#ifndef MAME_CPU_SH_SH7604_WDT_H +#define MAME_CPU_SH_SH7604_WDT_H #pragma once - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -44,4 +43,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(SH7604_WDT, sh7604_wdt_device) -#endif // MAME_CPU_SH7604_WDT_H +#endif // MAME_CPU_SH_SH7604_WDT_H diff --git a/src/devices/cpu/sh/sh_dasm.h b/src/devices/cpu/sh/sh_dasm.h index 52d6b2eb723..820dce618a1 100644 --- a/src/devices/cpu/sh/sh_dasm.h +++ b/src/devices/cpu/sh/sh_dasm.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Juergen Buchmueller, R. Belmont -#ifndef MAME_CPU_SH_SHDASM_H -#define MAME_CPU_SH_SHDASM_H +#ifndef MAME_CPU_SH_SH_SHDASM_H +#define MAME_CPU_SH_SH_SHDASM_H #pragma once @@ -42,4 +42,4 @@ private: bool m_is_sh34; }; -#endif +#endif // MAME_CPU_SH_SH_SHDASM_H diff --git a/src/devices/cpu/sparc/sparcdasm.h b/src/devices/cpu/sparc/sparcdasm.h index 91a22df173a..78c5fe58f42 100644 --- a/src/devices/cpu/sparc/sparcdasm.h +++ b/src/devices/cpu/sparc/sparcdasm.h @@ -4,8 +4,8 @@ SPARC disassembler */ -#ifndef MAME_DEVICES_CPU_SPARC_SPARC_DASM_H -#define MAME_DEVICES_CPU_SPARC_SPARC_DASM_H +#ifndef MAME_CPU_SPARC_SPARC_DASM_H +#define MAME_CPU_SPARC_SPARC_DASM_H #pragma once @@ -255,4 +255,4 @@ private: vis_op_desc_map m_vis_op_desc; }; -#endif // MAME_DEVICES_CPU_SPARC_SPARC_DASM_H +#endif // MAME_CPU_SPARC_SPARC_DASM_H diff --git a/src/devices/cpu/sparc/sparcdefs.h b/src/devices/cpu/sparc/sparcdefs.h index 66147c37780..19784b173a7 100644 --- a/src/devices/cpu/sparc/sparcdefs.h +++ b/src/devices/cpu/sparc/sparcdefs.h @@ -7,10 +7,10 @@ // //================================================================ -#pragma once +#ifndef MAME_CPU_SPARC_SPARCDEFS_H +#define MAME_CPU_SPARC_SPARCDEFS_H -#ifndef CPU_SPARC_SPARC_DEFS_H -#define CPU_SPARC_SPARC_DEFS_H +#pragma once #define PSR_CWP_MASK 0x0000001f #define PSR_ET_SHIFT 5 @@ -485,4 +485,4 @@ #define FPOP_FCMPED 0x056 #define FPOP_FCMPEX 0x057 -#endif // CPU_SPARC_SPARC_DEFS_H +#endif // MAME_CPU_SPARC_SPARCDEFS_H diff --git a/src/devices/cpu/spc700/spc700ds.h b/src/devices/cpu/spc700/spc700ds.h index fdd7bbeba7b..98a7f249e27 100644 --- a/src/devices/cpu/spc700/spc700ds.h +++ b/src/devices/cpu/spc700/spc700ds.h @@ -1,9 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Karl Stenerud +#ifndef MAME_CPU_SPC800_SPC700DS_H +#define MAME_CPU_SPC800_SPC700DS_H + #pragma once -#ifndef __SPC700DS_H__ -#define __SPC700DS_H__ /* ======================================================================== */ /* =============================== COPYRIGHT ============================== */ /* ======================================================================== */ @@ -62,4 +63,4 @@ private: }; -#endif /* __SPC700DS_H__ */ +#endif // MAME_CPU_SPC800_SPC700DS_H diff --git a/src/devices/cpu/ssp1601/ssp1601d.h b/src/devices/cpu/ssp1601/ssp1601d.h index 9c868a5d308..6ebd8db47aa 100644 --- a/src/devices/cpu/ssp1601/ssp1601d.h +++ b/src/devices/cpu/ssp1601/ssp1601d.h @@ -8,8 +8,8 @@ */ -#ifndef MAME_CPU_SSP1601_SSP1601DASM_H -#define MAME_CPU_SSP1601_SSP1601DASM_H +#ifndef MAME_CPU_SSP1601_SSP1601D_H +#define MAME_CPU_SSP1601_SSP1601D_H #pragma once @@ -34,4 +34,4 @@ private: static std::string get_cond(int op); }; -#endif +#endif // MAME_CPU_SSP1601_SSP1601D_H diff --git a/src/devices/cpu/st62xx/st62xx.h b/src/devices/cpu/st62xx/st62xx.h index e897dab172a..5d584d9db19 100644 --- a/src/devices/cpu/st62xx/st62xx.h +++ b/src/devices/cpu/st62xx/st62xx.h @@ -30,8 +30,8 @@ **********************************************************************/ -#ifndef MAME_CPU_ST62XX_H -#define MAME_CPU_ST62XX_H +#ifndef MAME_CPU_ST62XX_ST62XX_H +#define MAME_CPU_ST62XX_ST62XX_H #pragma once @@ -308,4 +308,4 @@ protected: DECLARE_DEVICE_TYPE(ST6228, st6228_device) -#endif // MAME_CPU_ST62XX_H +#endif // MAME_CPU_ST62XX_ST62XX_H diff --git a/src/devices/cpu/st62xx/st62xx_dasm.h b/src/devices/cpu/st62xx/st62xx_dasm.h index 1e30f04dd47..5a93b964921 100644 --- a/src/devices/cpu/st62xx/st62xx_dasm.h +++ b/src/devices/cpu/st62xx/st62xx_dasm.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_CPU_ST62XX_DASM_H -#define MAME_CPU_ST62XX_DASM_H +#ifndef MAME_CPU_ST62XX_ST62XX_DASM_H +#define MAME_CPU_ST62XX_ST62XX_DASM_H #pragma once @@ -24,4 +24,4 @@ protected: std::string reg_name(const uint8_t reg); }; -#endif // MAME_CPU_ST62XX_DASM_H +#endif // MAME_CPU_ST62XX_ST62XX_DASM_H diff --git a/src/devices/cpu/tms32010/32010dsm.h b/src/devices/cpu/tms32010/32010dsm.h index d2b93d5f5a4..bbbd7876fa5 100644 --- a/src/devices/cpu/tms32010/32010dsm.h +++ b/src/devices/cpu/tms32010/32010dsm.h @@ -24,8 +24,8 @@ * * \**************************************************************************/ -#ifndef MAME_CPU_TMS32010_DIS32010_H -#define MAME_CPU_TMS32010_DIS32010_H +#ifndef MAME_CPU_TMS32010_32010DSM_H +#define MAME_CPU_TMS32010_32010DSM_H #pragma once @@ -56,4 +56,4 @@ private: std::vector Op; }; -#endif +#endif // MAME_CPU_TMS32010_32010DSM_H diff --git a/src/devices/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h index 687675f74f1..c35a2841c74 100644 --- a/src/devices/cpu/tms32025/tms32025.h +++ b/src/devices/cpu/tms32025/tms32025.h @@ -17,8 +17,8 @@ * * \***************************************************************************/ -#ifndef MAME_TMS32025_TMS32025_H -#define MAME_TMS32025_TMS32025_H +#ifndef MAME_CPU_TMS32025_TMS32025_H +#define MAME_CPU_TMS32025_TMS32025_H #pragma once @@ -404,4 +404,4 @@ DECLARE_DEVICE_TYPE(TMS32020, tms32020_device) DECLARE_DEVICE_TYPE(TMS32025, tms32025_device) DECLARE_DEVICE_TYPE(TMS32026, tms32026_device) -#endif // MAME_TMS32025_TMS32025_H +#endif // MAME_CPU_TMS32025_TMS32025_H diff --git a/src/devices/cpu/tms9900/9900dasm.h b/src/devices/cpu/tms9900/9900dasm.h index bdae664e297..5b5df98313c 100644 --- a/src/devices/cpu/tms9900/9900dasm.h +++ b/src/devices/cpu/tms9900/9900dasm.h @@ -7,8 +7,8 @@ * *****************************************************************************/ -#ifndef MAME_CPU_TMS9900_TMS9900DASM_H -#define MAME_CPU_TMS9900_TMS9900DASM_H +#ifndef MAME_CPU_TMS9900_9900DASM_H +#define MAME_CPU_TMS9900_9900DASM_H #pragma once @@ -133,4 +133,4 @@ private: void print_arg (std::ostream &stream, int mode, int arg, const data_buffer ¶ms, offs_t &PC); }; -#endif +#endif // MAME_CPU_TMS9900_9900DASM_H diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index 4e0689e406f..c175906eeaf 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -7,8 +7,8 @@ Also see tms9900.h for types of TMS99xx processors. */ -#ifndef MAME_CPU_TMS9995_TMS9995_H -#define MAME_CPU_TMS9995_TMS9995_H +#ifndef MAME_CPU_TMS9900_TMS9995_H +#define MAME_CPU_TMS9900_TMS9995_H #pragma once @@ -416,4 +416,4 @@ public: } }; -#endif // MAME_CPU_TMS9995_TMS9995_H +#endif // MAME_CPU_TMS9900_TMS9995_H diff --git a/src/devices/cpu/tms9900/tms99com.h b/src/devices/cpu/tms9900/tms99com.h index 02cc729263d..a293f161b53 100644 --- a/src/devices/cpu/tms9900/tms99com.h +++ b/src/devices/cpu/tms9900/tms99com.h @@ -42,8 +42,10 @@ significant changes (e.g. privileged mode, address mapper). */ -#ifndef __TMS99COMMON_H__ -#define __TMS99COMMON_H__ +#ifndef MAME_CPU_TMS9900_TMS99COM_H +#define MAME_CPU_TMS9900_TMS99COM_H + +#pragma once enum { @@ -80,4 +82,5 @@ enum TMS99xx_BUS_DBIN = 1, TMS99xx_BUS_IAQ = 2 }; -#endif /* __TMS99COMMON_H__ */ + +#endif // MAME_CPU_TMS9900_TMS99COM_H diff --git a/src/devices/cpu/upd7810/upd7810_dasm.h b/src/devices/cpu/upd7810/upd7810_dasm.h index a367ab24a48..7aaf47e8d14 100644 --- a/src/devices/cpu/upd7810/upd7810_dasm.h +++ b/src/devices/cpu/upd7810/upd7810_dasm.h @@ -8,8 +8,8 @@ * *****************************************************************************/ -#ifndef MAME_CPU_UPD7810_UPD7810DASM_H -#define MAME_CPU_UPD7810_UPD7810DASM_H +#ifndef MAME_CPU_UPD7810_UPD7810_DASM_H +#define MAME_CPU_UPD7810_UPD7810_DASM_H #pragma once @@ -288,4 +288,4 @@ public: virtual ~upd78c05_disassembler() = default; }; -#endif +#endif // MAME_CPU_UPD7810_UPD7810_DASM_H diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index ab342184273..da1612977ff 100644 --- a/src/devices/cpu/v30mz/v30mz.h +++ b/src/devices/cpu/v30mz/v30mz.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Wilbert Pol,Bryan McPhail -#ifndef MAME_CPU_V32MZ_V30MZ_H -#define MAME_CPU_V32MZ_V30MZ_H +#ifndef MAME_CPU_V30MZ_V30MZ_H +#define MAME_CPU_V30MZ_V30MZ_H #include "cpu/nec/necdasm.h" @@ -229,4 +229,4 @@ protected: uint16_t m_debugger_temp; }; -#endif // MAME_CPU_V32MZ_V30MZ_H +#endif // MAME_CPU_V30MZ_V30MZ_H diff --git a/src/devices/cpu/v620/v620dasm.h b/src/devices/cpu/v620/v620dasm.h index 8c93150cf9b..58be863ba9b 100644 --- a/src/devices/cpu/v620/v620dasm.h +++ b/src/devices/cpu/v620/v620dasm.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_CPU_V620_V620_H -#define MAME_CPU_V620_V620_H +#ifndef MAME_CPU_V620_V620DASM_H +#define MAME_CPU_V620_V620DASM_H #pragma once @@ -51,4 +51,4 @@ protected: virtual offs_t dasm_io(std::ostream &stream, u16 inst, offs_t pc, const data_buffer &opcodes) const override; }; -#endif // MAME_CPU_V620_V620_H +#endif // MAME_CPU_V620_V620DASM_H diff --git a/src/devices/imagedev/avivideo.h b/src/devices/imagedev/avivideo.h index e14b4298415..67d0f30d132 100644 --- a/src/devices/imagedev/avivideo.h +++ b/src/devices/imagedev/avivideo.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_AVIVIDEO_H -#define MAME_DEVICES_IMAGEDEV_AVIVIDEO_H +#ifndef MAME_IMAGEDEV_AVIVIDEO_H +#define MAME_IMAGEDEV_AVIVIDEO_H #pragma once @@ -69,4 +69,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(IMAGE_AVIVIDEO, avivideo_image_device) -#endif // MAME_DEVICES_IMAGEDEV_AVIVIDEO_H +#endif // MAME_IMAGEDEV_AVIVIDEO_H diff --git a/src/devices/imagedev/bitbngr.h b/src/devices/imagedev/bitbngr.h index 7fdc7deaa6b..a10cfc80bb1 100644 --- a/src/devices/imagedev/bitbngr.h +++ b/src/devices/imagedev/bitbngr.h @@ -6,8 +6,10 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_BITBNGR_H -#define MAME_DEVICES_IMAGEDEV_BITBNGR_H +#ifndef MAME_IMAGEDEV_BITBNGR_H +#define MAME_IMAGEDEV_BITBNGR_H + +#pragma once class bitbanger_device : public device_t, public device_image_interface @@ -53,4 +55,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(BITBANGER, bitbanger_device) -#endif // MAME_DEVICES_IMAGEDEV_BITBNGR_H +#endif // MAME_IMAGEDEV_BITBNGR_H diff --git a/src/devices/imagedev/cartrom.h b/src/devices/imagedev/cartrom.h index 851f7238892..07b58c786cb 100644 --- a/src/devices/imagedev/cartrom.h +++ b/src/devices/imagedev/cartrom.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_CARTROM_H -#define MAME_DEVICES_IMAGEDEV_CARTROM_H +#ifndef MAME_IMAGEDEV_CARTROM_H +#define MAME_IMAGEDEV_CARTROM_H #pragma once @@ -52,4 +52,4 @@ protected: device_cartrom_image_interface(const machine_config &mconfig, device_t &device); }; -#endif // MAME_DEVICES_IMAGEDEV_CARTROM_H +#endif // MAME_IMAGEDEV_CARTROM_H diff --git a/src/devices/imagedev/cassette.h b/src/devices/imagedev/cassette.h index a123d349e9c..60bd0357324 100644 --- a/src/devices/imagedev/cassette.h +++ b/src/devices/imagedev/cassette.h @@ -8,8 +8,10 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_CASSETTE_H -#define MAME_DEVICES_IMAGEDEV_CASSETTE_H +#ifndef MAME_IMAGEDEV_CASSETTE_H +#define MAME_IMAGEDEV_CASSETTE_H + +#pragma once #include "formats/cassimg.h" @@ -142,4 +144,4 @@ DECLARE_DEVICE_TYPE(CASSETTE, cassette_image_device) // device iterator typedef device_type_enumerator cassette_device_enumerator; -#endif // MAME_DEVICES_IMAGEDEV_CASSETTE_H +#endif // MAME_IMAGEDEV_CASSETTE_H diff --git a/src/devices/imagedev/cdromimg.h b/src/devices/imagedev/cdromimg.h index 6b423c5ca5a..e7d9feaa62d 100644 --- a/src/devices/imagedev/cdromimg.h +++ b/src/devices/imagedev/cdromimg.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_CHD_CD_H -#define MAME_DEVICES_IMAGEDEV_CHD_CD_H +#ifndef MAME_IMAGEDEV_CDROMIMG_H +#define MAME_IMAGEDEV_CDROMIMG_H #pragma once @@ -114,4 +114,4 @@ public: }; -#endif // MAME_DEVICES_IMAGEDEV_CHD_CD_H +#endif // MAME_IMAGEDEV_CDROMIMG_H diff --git a/src/devices/imagedev/diablo.h b/src/devices/imagedev/diablo.h index 56a1f4ef7c2..c4b6e9408cf 100644 --- a/src/devices/imagedev/diablo.h +++ b/src/devices/imagedev/diablo.h @@ -4,8 +4,8 @@ * DIABLO drive image to hard disk interface **********************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_DIABLO_H -#define MAME_DEVICES_IMAGEDEV_DIABLO_H +#ifndef MAME_IMAGEDEV_DIABLO_H +#define MAME_IMAGEDEV_DIABLO_H #pragma once @@ -78,4 +78,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(DIABLO, diablo_image_device) -#endif // MAME_DEVICES_IMAGEDEV_DIABLO_H +#endif // MAME_IMAGEDEV_DIABLO_H diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index a07307c05aa..0f5f0b01f7d 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -2,8 +2,8 @@ // copyright-holders:Nathan Woods, Miodrag Milanovic /* flopdrv provides simple emulation of a disc drive */ -#ifndef MAME_DEVICES_IMAGEDV_FLOPDRV_H -#define MAME_DEVICES_IMAGEDV_FLOPDRV_H +#ifndef MAME_IMAGEDV_FLOPDRV_H +#define MAME_IMAGEDV_FLOPDRV_H #pragma once @@ -224,4 +224,4 @@ protected: char m_extension_list[256]; }; -#endif // MAME_DEVICES_IMAGEDV_FLOPDRV_H +#endif // MAME_IMAGEDV_FLOPDRV_H diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index 3419bd180fc..8e03f9438a7 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_FLOPPY_H -#define MAME_DEVICES_IMAGEDEV_FLOPPY_H +#ifndef MAME_IMAGEDEV_FLOPPY_H +#define MAME_IMAGEDEV_FLOPPY_H #pragma once @@ -488,4 +488,4 @@ DECLARE_DEVICE_TYPE(FLOPPY_CONNECTOR, floppy_connector) extern template class device_finder; extern template class device_finder; -#endif // MAME_DEVICES_IMAGEDEV_FLOPPY_H +#endif // MAME_IMAGEDEV_FLOPPY_H diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h index d360f06f623..852c1f3c79a 100644 --- a/src/devices/imagedev/harddriv.h +++ b/src/devices/imagedev/harddriv.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_HARDDRIV_H -#define MAME_DEVICES_IMAGEDEV_HARDDRIV_H +#ifndef MAME_IMAGEDEV_HARDDRIV_H +#define MAME_IMAGEDEV_HARDDRIV_H #include "softlist_dev.h" @@ -111,4 +111,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(HARDDISK, harddisk_image_device) -#endif // MAME_DEVICES_IMAGEDEV_HARDDRIV_H +#endif // MAME_IMAGEDEV_HARDDRIV_H diff --git a/src/devices/imagedev/magtape.h b/src/devices/imagedev/magtape.h index 8d302a93a58..200c5252925 100644 --- a/src/devices/imagedev/magtape.h +++ b/src/devices/imagedev/magtape.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_MAGTAPE_H -#define MAME_DEVICES_IMAGEDEV_MAGTAPE_H +#ifndef MAME_IMAGEDEV_MAGTAPE_H +#define MAME_IMAGEDEV_MAGTAPE_H #pragma once @@ -53,4 +53,4 @@ protected: virtual const char *image_brief_type_name() const noexcept override { return "utap"; } }; -#endif // MAME_DEVICES_IMAGEDEV_MAGTAPE_H +#endif // MAME_IMAGEDEV_MAGTAPE_H diff --git a/src/devices/imagedev/memcard.h b/src/devices/imagedev/memcard.h index afac414a39a..8bc41fd1425 100644 --- a/src/devices/imagedev/memcard.h +++ b/src/devices/imagedev/memcard.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_MEMCARD_H -#define MAME_DEVICES_IMAGEDEV_MEMCARD_H +#ifndef MAME_IMAGEDEV_MEMCARD_H +#define MAME_IMAGEDEV_MEMCARD_H #pragma once @@ -36,4 +36,4 @@ protected: device_memcard_image_interface(const machine_config &mconfig, device_t &device); }; -#endif // MAME_DEVICES_IMAGEDEV_MEMCARD_H +#endif // MAME_IMAGEDEV_MEMCARD_H diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index 8bf9b057683..2d733f5a9af 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -11,8 +11,8 @@ *****************************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_MFMHD_H -#define MAME_DEVICES_IMAGEDEV_MFMHD_H +#ifndef MAME_IMAGEDEV_MFMHD_H +#define MAME_IMAGEDEV_MFMHD_H #pragma once @@ -269,4 +269,4 @@ private: DECLARE_DEVICE_TYPE(MFM_HD_CONNECTOR, mfm_harddisk_connector) -#endif // MAME_DEVICES_IMAGEDEV_MFMHD_H +#endif // MAME_IMAGEDEV_MFMHD_H diff --git a/src/devices/imagedev/microdrv.h b/src/devices/imagedev/microdrv.h index 26aa9db97db..c4480fade69 100644 --- a/src/devices/imagedev/microdrv.h +++ b/src/devices/imagedev/microdrv.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_MICRODRV_H -#define MAME_DEVICES_IMAGEDEV_MICRODRV_H +#ifndef MAME_IMAGEDEV_MICRODRV_H +#define MAME_IMAGEDEV_MICRODRV_H #pragma once @@ -85,4 +85,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(MICRODRIVE, microdrive_image_device) -#endif // MAME_DEVICES_IMAGEDEV_MICRODRV_H +#endif // MAME_IMAGEDEV_MICRODRV_H diff --git a/src/devices/imagedev/papertape.h b/src/devices/imagedev/papertape.h index a0fa6b9cada..cb4359860c1 100644 --- a/src/devices/imagedev/papertape.h +++ b/src/devices/imagedev/papertape.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_PAPERTAPE_H -#define MAME_DEVICES_IMAGEDEV_PAPERTAPE_H +#ifndef MAME_IMAGEDEV_PAPERTAPE_H +#define MAME_IMAGEDEV_PAPERTAPE_H #pragma once @@ -68,4 +68,4 @@ protected: paper_tape_punch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); }; -#endif // MAME_DEVICES_IMAGEDEV_PAPERTAPE_H +#endif // MAME_IMAGEDEV_PAPERTAPE_H diff --git a/src/devices/imagedev/picture.h b/src/devices/imagedev/picture.h index 4e10f533458..4e57d01714f 100644 --- a/src/devices/imagedev/picture.h +++ b/src/devices/imagedev/picture.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_PICTURE_H -#define MAME_DEVICES_IMAGEDEV_PICTURE_H +#ifndef MAME_IMAGEDEV_PICTURE_H +#define MAME_IMAGEDEV_PICTURE_H #pragma once @@ -55,4 +55,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(IMAGE_PICTURE, picture_image_device) -#endif // MAME_DEVICES_IMAGEDEV_PICTURE_H +#endif // MAME_IMAGEDEV_PICTURE_H diff --git a/src/devices/imagedev/printer.h b/src/devices/imagedev/printer.h index ae3b78fd7fa..46346a87ff4 100644 --- a/src/devices/imagedev/printer.h +++ b/src/devices/imagedev/printer.h @@ -8,8 +8,8 @@ ****************************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_PRINTER_H -#define MAME_DEVICES_IMAGEDEV_PRINTER_H +#ifndef MAME_IMAGEDEV_PRINTER_H +#define MAME_IMAGEDEV_PRINTER_H #pragma once @@ -61,4 +61,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(PRINTER, printer_image_device) -#endif // MAME_DEVICES_IMAGEDEV_PRINTER_H +#endif // MAME_IMAGEDEV_PRINTER_H diff --git a/src/devices/imagedev/simh_tape_image.h b/src/devices/imagedev/simh_tape_image.h index 15607015e55..887122be593 100644 --- a/src/devices/imagedev/simh_tape_image.h +++ b/src/devices/imagedev/simh_tape_image.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Mietek Bak -#ifndef MAME_DEVICES_IMAGEDEV_SIMH_TAPE_IMAGE_H -#define MAME_DEVICES_IMAGEDEV_SIMH_TAPE_IMAGE_H +#ifndef MAME_IMAGEDEV_SIMH_TAPE_IMAGE_H +#define MAME_IMAGEDEV_SIMH_TAPE_IMAGE_H #pragma once @@ -49,4 +49,4 @@ protected: ////////////////////////////////////////////////////////////////////////////// -#endif // MAME_DEVICES_IMAGEDEV_SIMH_TAPE_IMAGE_H +#endif // MAME_IMAGEDEV_SIMH_TAPE_IMAGE_H diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index 32f6f7c782f..7e12778a3b0 100644 --- a/src/devices/imagedev/snapquik.h +++ b/src/devices/imagedev/snapquik.h @@ -8,8 +8,8 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_SNAPQUIK_H -#define MAME_DEVICES_IMAGEDEV_SNAPQUIK_H +#ifndef MAME_IMAGEDEV_SNAPQUIK_H +#define MAME_IMAGEDEV_SNAPQUIK_H #pragma once @@ -112,4 +112,4 @@ DECLARE_DEVICE_TYPE(QUICKLOAD, quickload_image_device) #define QUICKLOAD_LOAD_MEMBER(_name) std::pair _name(snapshot_image_device &image) #define DECLARE_QUICKLOAD_LOAD_MEMBER(_name) QUICKLOAD_LOAD_MEMBER(_name) -#endif // MAME_DEVICES_IMAGEDEV_SNAPQUIK_H +#endif // MAME_IMAGEDEV_SNAPQUIK_H diff --git a/src/devices/imagedev/wafadrive.h b/src/devices/imagedev/wafadrive.h index b4de79654cb..79e20ea913b 100644 --- a/src/devices/imagedev/wafadrive.h +++ b/src/devices/imagedev/wafadrive.h @@ -9,13 +9,13 @@ *********************************************************************/ -#ifndef MAME_DEVICES_IMAGEDEV_WAFADRIVE_H -#define MAME_DEVICES_IMAGEDEV_WAFADRIVE_H - -#include "magtape.h" +#ifndef MAME_IMAGEDEV_WAFADRIVE_H +#define MAME_IMAGEDEV_WAFADRIVE_H #pragma once +#include "magtape.h" + /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -46,4 +46,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(WAFADRIVE_IMAGE, wafadrive_image_device) -#endif // MAME_DEVICES_IMAGEDEV_WAFADRIVE_H +#endif // MAME_IMAGEDEV_WAFADRIVE_H diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index 22d5009a745..e888e176658 100644 --- a/src/devices/machine/6821pia.h +++ b/src/devices/machine/6821pia.h @@ -16,14 +16,12 @@ **********************************************************************/ -#ifndef MAME_DEVICES_MACHINE_6821PIA_H -#define MAME_DEVICES_MACHINE_6821PIA_H +#ifndef MAME_MACHINE_6821PIA_H +#define MAME_MACHINE_6821PIA_H #pragma once - - /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -216,5 +214,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(PIA6821, pia6821_device) - -#endif // MAME_DEVICES_MACHINE_6821PIA_H +#endif // MAME_MACHINE_6821PIA_H diff --git a/src/devices/machine/68307bus.h b/src/devices/machine/68307bus.h index e927979c034..d0ff1e244b7 100644 --- a/src/devices/machine/68307bus.h +++ b/src/devices/machine/68307bus.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_68307_BUS_H -#define MAME_MACHINE_68307_BUS_H +#ifndef MAME_MACHINE_68307BUS_H +#define MAME_MACHINE_68307BUS_H #pragma once @@ -19,4 +19,4 @@ public: void reset(); }; -#endif // MAME_MACHINE_68307_BUS_H +#endif // MAME_MACHINE_68307BUS_H diff --git a/src/mame/dynax/dynax.cpp b/src/mame/dynax/dynax.cpp index 5c101a985ea..0e5e947329e 100644 --- a/src/mame/dynax/dynax.cpp +++ b/src/mame/dynax/dynax.cpp @@ -3930,6 +3930,11 @@ INPUT_PORTS_START( ougonhai ) // SW 3 OFF OFF ON ON ON ON OFF OFF OFF OFF OFF ON ON ON ON OFF // SW 4 OFF ON ON OFF OFF OFF OFF OFF ON ON ON OFF OFF OFF OFF OFF + // The manual implies SW 3 and SW 4 are banks of eight DIP switches, however + // the board has pads for banks of ten DIP switches, and ten DIP switches + // are shown in the input test. Boards have been found populated with banks + // of eight DIP switches or ten DIP switches. + PORT_INCLUDE( tenkai ) PORT_MODIFY("DSW2") @@ -3969,7 +3974,10 @@ INPUT_PORTS_START( ougonhai ) PORT_DIPNAME( 0x08, 0x00, "Renchan Rate" ) PORT_DIPLOCATION("SW 2:10") // 連荘レート PORT_DIPSETTING( 0x08, DEF_STR(Off) ) // 無 PORT_DIPSETTING( 0x00, DEF_STR(On) ) // 有 - PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW 3:9" ) // not documented + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW 3:10" ) // not documented + PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "SW 4:9" ) // not documented + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "SW 4:10" ) // not documented INPUT_PORTS_END -- cgit v1.2.3