diff options
author | 2008-08-13 02:48:52 +0000 | |
---|---|---|
committer | 2008-08-13 02:48:52 +0000 | |
commit | 1daf41e21826daaa7e136f095672035817afcea5 (patch) | |
tree | f6f543718bf84378508a6d80c042e47d5f16beb0 /src/emu/cpu/sc61860 | |
parent | 0f0b9208f62f0b631f6d5e91d12d244da9bb5c5e (diff) |
Final CPU header updates. Mostly just re-naming the re-inclusions.
The structures/names were getting too complex for my macros to handle. They would require hand editing and my computer is too slow to keep re-compiling.
Passes a clean compile.
Diffstat (limited to 'src/emu/cpu/sc61860')
-rw-r--r-- | src/emu/cpu/sc61860/sc.h | 3 | ||||
-rw-r--r-- | src/emu/cpu/sc61860/sc61860.c | 4 | ||||
-rw-r--r-- | src/emu/cpu/sc61860/sc61860.h | 15 | ||||
-rw-r--r-- | src/emu/cpu/sc61860/scdasm.c | 3 |
4 files changed, 16 insertions, 9 deletions
diff --git a/src/emu/cpu/sc61860/sc.h b/src/emu/cpu/sc61860/sc.h index 11e70cff8b4..1b00af1c65b 100644 --- a/src/emu/cpu/sc61860/sc.h +++ b/src/emu/cpu/sc61860/sc.h @@ -15,7 +15,8 @@ #define F0 94 #define C 95 -enum { +enum +{ SC61860_PC=1, SC61860_DP, SC61860_P, SC61860_Q, SC61860_R, SC61860_CARRY, diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 895cb092d87..58481475710 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -41,7 +41,7 @@ ****************************************************************************/ typedef struct { - SC61860_CONFIG *config; + sc61860_cpu_core *config; UINT8 ram[0x60]; // internal special ram UINT8 p, q, r; //7 bits only? @@ -87,7 +87,7 @@ static void sc61860_reset(void) static void sc61860_init(int index, int clock, const void *config, int (*irqcallback)(int)) { - sc61860.config = (SC61860_CONFIG *) config; + sc61860.config = (sc61860_cpu_core *) config; timer_pulse(ATTOTIME_IN_HZ(500), NULL, 0, sc61860_2ms_tick); } diff --git a/src/emu/cpu/sc61860/sc61860.h b/src/emu/cpu/sc61860/sc61860.h index 3b881861d26..12aa3ef2b5f 100644 --- a/src/emu/cpu/sc61860/sc61860.h +++ b/src/emu/cpu/sc61860/sc61860.h @@ -19,8 +19,11 @@ * - This entire notice must remain in the source code. * *****************************************************************************/ -#ifndef _SC61860_H -#define _SC61860_H + +#pragma once + +#ifndef __SC61860_H__ +#define __SC61860_H__ /* official names seam to be @@ -35,7 +38,9 @@ #include "cpuintrf.h" -typedef struct { +typedef struct _sc61860_cpu_core sc61860_cpu_core; +struct _sc61860_cpu_core +{ int (*reset)(void); int (*brk)(void); int (*x)(void); @@ -44,7 +49,7 @@ typedef struct { int (*inb)(void); void (*outb)(int); void (*outc)(int); -} SC61860_CONFIG; +}; unsigned sc61860_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); @@ -53,4 +58,4 @@ UINT8 *sc61860_internal_ram(void); void sc61860_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __SC61860_H__ */ diff --git a/src/emu/cpu/sc61860/scdasm.c b/src/emu/cpu/sc61860/scdasm.c index 2e6709af9b1..422bec9a3b4 100644 --- a/src/emu/cpu/sc61860/scdasm.c +++ b/src/emu/cpu/sc61860/scdasm.c @@ -79,7 +79,8 @@ */ -typedef enum { +typedef enum +{ Ill, Imp, Imm, ImmW, |