summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/nec
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-15 21:47:30 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-15 21:47:30 +0000
commitab97dc30efdd5cc1abf8c65b8ce29af364219167 (patch)
tree5ab46b3c21f6e0e4173a79a4151e019b3f2dc17e /src/emu/cpu/nec
parentd1da89cc7817315f05269205a3f56d36ebba170b (diff)
First pass at modernizing struct definitions.
Diffstat (limited to 'src/emu/cpu/nec')
-rw-r--r--src/emu/cpu/nec/nec.h73
-rw-r--r--src/emu/cpu/nec/necdasm.c3
-rw-r--r--src/emu/cpu/nec/necpriv.h3
-rw-r--r--src/emu/cpu/nec/v25priv.h3
4 files changed, 39 insertions, 43 deletions
diff --git a/src/emu/cpu/nec/nec.h b/src/emu/cpu/nec/nec.h
index d0a6e4816c5..06a624cf612 100644
--- a/src/emu/cpu/nec/nec.h
+++ b/src/emu/cpu/nec/nec.h
@@ -1,37 +1,36 @@
-/* ASG 971222 -- rewrote this interface */
-#ifndef __NEC_H_
-#define __NEC_H_
-
-
-typedef struct _nec_config nec_config;
-struct _nec_config
-{
- const UINT8* v25v35_decryptiontable; // internal decryption table
-};
-
-#define NEC_INPUT_LINE_INTP0 10
-#define NEC_INPUT_LINE_INTP1 11
-#define NEC_INPUT_LINE_INTP2 12
-#define NEC_INPUT_LINE_POLL 20
-
-#define V25_PORT_P0 0x10000
-#define V25_PORT_P1 0x10002
-#define V25_PORT_P2 0x10004
-#define V25_PORT_PT 0x10006
-
-enum
-{
- NEC_PC=0,
- NEC_IP, NEC_AW, NEC_CW, NEC_DW, NEC_BW, NEC_SP, NEC_BP, NEC_IX, NEC_IY,
- NEC_FLAGS, NEC_ES, NEC_CS, NEC_SS, NEC_DS,
- NEC_PENDING
-};
-
-/* Public functions */
-DECLARE_LEGACY_CPU_DEVICE(V20, v20);
-DECLARE_LEGACY_CPU_DEVICE(V25, v25);
-DECLARE_LEGACY_CPU_DEVICE(V30, v30);
-DECLARE_LEGACY_CPU_DEVICE(V33, v33);
-DECLARE_LEGACY_CPU_DEVICE(V35, v35);
-
-#endif
+/* ASG 971222 -- rewrote this interface */
+#ifndef __NEC_H_
+#define __NEC_H_
+
+
+struct nec_config
+{
+ const UINT8* v25v35_decryptiontable; // internal decryption table
+};
+
+#define NEC_INPUT_LINE_INTP0 10
+#define NEC_INPUT_LINE_INTP1 11
+#define NEC_INPUT_LINE_INTP2 12
+#define NEC_INPUT_LINE_POLL 20
+
+#define V25_PORT_P0 0x10000
+#define V25_PORT_P1 0x10002
+#define V25_PORT_P2 0x10004
+#define V25_PORT_PT 0x10006
+
+enum
+{
+ NEC_PC=0,
+ NEC_IP, NEC_AW, NEC_CW, NEC_DW, NEC_BW, NEC_SP, NEC_BP, NEC_IX, NEC_IY,
+ NEC_FLAGS, NEC_ES, NEC_CS, NEC_SS, NEC_DS,
+ NEC_PENDING
+};
+
+/* Public functions */
+DECLARE_LEGACY_CPU_DEVICE(V20, v20);
+DECLARE_LEGACY_CPU_DEVICE(V25, v25);
+DECLARE_LEGACY_CPU_DEVICE(V30, v30);
+DECLARE_LEGACY_CPU_DEVICE(V33, v33);
+DECLARE_LEGACY_CPU_DEVICE(V35, v35);
+
+#endif
diff --git a/src/emu/cpu/nec/necdasm.c b/src/emu/cpu/nec/necdasm.c
index ba4662a598b..9f9631a2898 100644
--- a/src/emu/cpu/nec/necdasm.c
+++ b/src/emu/cpu/nec/necdasm.c
@@ -7,8 +7,7 @@
#include "emu.h"
-typedef struct _nec_config nec_config;
-struct _nec_config
+struct nec_config
{
const UINT8* v25v35_decryptiontable; // internal decryption table
};
diff --git a/src/emu/cpu/nec/necpriv.h b/src/emu/cpu/nec/necpriv.h
index f59cb7523bd..e0ffe8297de 100644
--- a/src/emu/cpu/nec/necpriv.h
+++ b/src/emu/cpu/nec/necpriv.h
@@ -33,8 +33,7 @@ typedef union
UINT8 b[16]; /* or as 8 bit registers */
} necbasicregs;
-typedef struct _nec_state_t nec_state_t;
-struct _nec_state_t
+struct nec_state_t
{
necbasicregs regs;
offs_t fetch_xor;
diff --git a/src/emu/cpu/nec/v25priv.h b/src/emu/cpu/nec/v25priv.h
index 3f8eca8c541..685792bf2ff 100644
--- a/src/emu/cpu/nec/v25priv.h
+++ b/src/emu/cpu/nec/v25priv.h
@@ -66,8 +66,7 @@ typedef union
UINT8 b[256];
} internalram;
-typedef struct _v25_state_t v25_state_t;
-struct _v25_state_t
+struct v25_state_t
{
internalram ram;
offs_t fetch_xor;