summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/sh
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2024-11-27 05:12:25 +1100
committer Vas Crabb <vas@vastheman.com>2024-11-27 05:12:25 +1100
commitb97765105da8eedce27674906390cf5640bcbfa7 (patch)
tree1055e43125759b86988ad7848ec2a5c4c776bc19 /src/devices/cpu/sh
parentdc8ba812c1099cb34f419bce0c7cc5eaf5aa3dc0 (diff)
dynax/dynax.cpp: Added DIP switches that are sometimes populated to Ougon no Pai.
Also fixed a bunch more #include guards.
Diffstat (limited to 'src/devices/cpu/sh')
-rw-r--r--src/devices/cpu/sh/sh3comn.h8
-rw-r--r--src/devices/cpu/sh/sh4.h7
-rw-r--r--src/devices/cpu/sh/sh4comn.h8
-rw-r--r--src/devices/cpu/sh/sh4regs.h8
-rw-r--r--src/devices/cpu/sh/sh7604_wdt.h7
-rw-r--r--src/devices/cpu/sh/sh_dasm.h6
6 files changed, 21 insertions, 23 deletions
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