From 3c2b00d332842db1d1d69311958597f78bd5f534 Mon Sep 17 00:00:00 2001 From: Derrick Renaud Date: Mon, 11 Aug 2008 03:06:59 +0000 Subject: [PATCH] structure, lower-casing functions and re-inclusion updates of the src\emu\cpu headers up to I. It's mostly just re-inclusion renaming, but there are few other re-nameings. --- src/emu/cpu/adsp2100/adsp2100.h | 16 +++++++++------- src/emu/cpu/alph8201/alph8201.h | 8 +++++--- src/emu/cpu/apexc/apexc.h | 6 ++++++ src/emu/cpu/arm/arm.h | 8 +++++--- src/emu/cpu/arm7/arm7.h | 8 +++++--- src/emu/cpu/arm7/arm7core.h | 8 +++++--- src/emu/cpu/asap/asap.h | 8 +++++--- src/emu/cpu/ccpu/ccpu.c | 2 +- src/emu/cpu/ccpu/ccpu.h | 11 +++++++---- src/emu/cpu/cdp1802/cdp1802.h | 8 +++++--- src/emu/cpu/cop400/cop400.h | 2 ++ src/emu/cpu/cp1610/cp1610.h | 8 +++++--- src/emu/cpu/ds5002fp/ds5002fp.h | 10 +++++----- src/emu/cpu/dsp32/dsp32.c | 2 +- src/emu/cpu/dsp32/dsp32.h | 9 ++++++--- src/emu/cpu/dsp56k/dsp56def.h | 8 ++++++++ src/emu/cpu/dsp56k/dsp56k.h | 11 +++++++---- src/emu/cpu/e132xs/e132xs.h | 8 +++++--- src/emu/cpu/f8/f3853.c | 4 ++-- src/emu/cpu/f8/f3853.h | 15 ++++++++++++--- src/emu/cpu/f8/f8.h | 8 ++++---- src/emu/cpu/g65816/g65816.h | 8 +++++--- src/emu/cpu/g65816/g65816cm.h | 13 ++++++++----- src/emu/cpu/g65816/g65816ds.h | 8 +++++--- src/emu/cpu/g65816/g65816op.h | 11 +++++++---- src/emu/cpu/h6280/h6280.c | 8 ++++---- src/emu/cpu/h6280/h6280.h | 16 +++++++++------- src/emu/cpu/h6280/h6280ops.h | 6 ++++++ src/emu/cpu/h83002/h83002.h | 8 +++++--- src/emu/cpu/h83002/h8priv.h | 13 ++++++++----- src/emu/cpu/hd6309/hd6309.h | 9 +++++---- src/emu/cpu/i386/cycles.h | 7 +++++++ src/emu/cpu/i386/i386.h | 8 +++++--- src/emu/cpu/i386/i386intf.h | 8 +++++--- src/emu/cpu/i386/i386ops.h | 7 +++++++ src/emu/cpu/i8039/i8039.h | 20 +++++++++++--------- src/emu/cpu/i8051/i8051.h | 10 +++++----- src/emu/cpu/i8085/i8085cpu.h | 8 ++++++++ src/emu/cpu/i8085/i8085daa.h | 7 +++++++ src/emu/cpu/i86/ea.h | 8 ++++++++ src/emu/cpu/i86/host.h | 8 ++++++++ src/emu/cpu/i86/i186intf.h | 6 +++--- src/emu/cpu/i86/i188intf.h | 8 +++++--- src/emu/cpu/i86/i286intf.h | 8 +++++--- src/emu/cpu/i86/i86.h | 8 +++++--- src/emu/cpu/i86/i86intf.h | 8 +++++--- src/emu/cpu/i86/i86mem.h | 12 ++++++++++-- src/emu/cpu/i86/i88intf.h | 8 +++++--- src/emu/cpu/i86/instr186.h | 7 +++++++ src/emu/cpu/i86/instr286.h | 8 ++++++++ src/emu/cpu/i86/instr86.h | 7 +++++++ src/emu/cpu/i86/instrv30.h | 7 +++++++ src/emu/cpu/i86/modrm.h | 8 +++++++- src/emu/cpu/i86/table186.h | 7 +++++++ src/emu/cpu/i86/table286.h | 6 ++++++ src/emu/cpu/i86/table86.h | 7 +++++++ src/emu/cpu/i86/tablev30.h | 7 +++++++ src/emu/cpu/i86/v20intf.h | 8 +++++--- src/emu/cpu/i86/v30.h | 7 +++++++ src/emu/cpu/i86/v30intf.h | 8 +++++--- src/emu/cpu/i86/v33intf.h | 6 +++--- src/emu/cpu/i8x41/i8x41.h | 20 +++++++++++++------- src/emu/cpu/i960/i960.h | 8 +++++--- src/emu/cpu/i960/i960dis.h | 11 ++++++----- src/mame/drivers/actfancr.c | 2 +- src/mame/drivers/battlera.c | 4 ++-- src/mame/drivers/boogwing.c | 4 ++-- src/mame/drivers/cbuster.c | 4 ++-- src/mame/drivers/cinemat.c | 4 ++-- src/mame/drivers/cninja.c | 8 ++++---- src/mame/drivers/darkseal.c | 4 ++-- src/mame/drivers/dassault.c | 4 ++-- src/mame/drivers/dec0.c | 8 ++++---- src/mame/drivers/deco32.c | 4 ++-- src/mame/drivers/dietgo.c | 4 ++-- src/mame/drivers/funkyjet.c | 4 ++-- src/mame/drivers/harddriv.c | 2 +- src/mame/drivers/madmotor.c | 4 ++-- src/mame/drivers/paranoia.c | 4 ++-- src/mame/drivers/rohga.c | 4 ++-- src/mame/drivers/supbtime.c | 4 ++-- src/mame/drivers/tumblep.c | 4 ++-- src/mame/drivers/uapce.c | 4 ++-- src/mame/drivers/vaportra.c | 4 ++-- 84 files changed, 430 insertions(+), 203 deletions(-) diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h index e490388b43d..53d060ef8e7 100644 --- a/src/emu/cpu/adsp2100/adsp2100.h +++ b/src/emu/cpu/adsp2100/adsp2100.h @@ -6,8 +6,10 @@ ***************************************************************************/ -#ifndef _ADSP2100_H -#define _ADSP2100_H +#pragma once + +#ifndef __ADSP2100_H__ +#define __ADSP2100_H__ #include "cpuintrf.h" @@ -100,7 +102,7 @@ extern void adsp2101_get_info(UINT32 state, cpuinfo *info); extern void adsp2104_get_info(UINT32 state, cpuinfo *info); extern void adsp2104_load_boot_data(UINT8 *srcdata, UINT32 *dstdata); -#endif +#endif /* (HAS_ADSP2104) */ #if (HAS_ADSP2105) /************************************************************************** @@ -116,7 +118,7 @@ extern void adsp2104_load_boot_data(UINT8 *srcdata, UINT32 *dstdata); extern void adsp2105_get_info(UINT32 state, cpuinfo *info); extern void adsp2105_load_boot_data(UINT8 *srcdata, UINT32 *dstdata); -#endif +#endif /* (HAS_ADSP2105) */ #if (HAS_ADSP2115) /************************************************************************** @@ -134,7 +136,7 @@ extern void adsp2105_load_boot_data(UINT8 *srcdata, UINT32 *dstdata); extern void adsp2115_get_info(UINT32 state, cpuinfo *info); extern void adsp2115_load_boot_data(UINT8 *srcdata, UINT32 *dstdata); -#endif +#endif /* (HAS_ADSP2115) */ #if (HAS_ADSP2181) /************************************************************************** @@ -159,6 +161,6 @@ extern void adsp2181_idma_addr_w(UINT16 data); extern UINT16 adsp2181_idma_addr_r(void); extern void adsp2181_idma_data_w(UINT16 data); extern UINT16 adsp2181_idma_data_r(void); -#endif +#endif /* (HAS_ADSP2181) */ -#endif /* _ADSP2100_H */ +#endif /* __ADSP2100_H__ */ diff --git a/src/emu/cpu/alph8201/alph8201.h b/src/emu/cpu/alph8201/alph8201.h index f2b50e291bc..62a86429790 100644 --- a/src/emu/cpu/alph8201/alph8201.h +++ b/src/emu/cpu/alph8201/alph8201.h @@ -7,8 +7,10 @@ * * \**************************************************************************/ -#ifndef _ALPH8202_H -#define _ALPH8202_H +#pragma once + +#ifndef __ALPH8201_H__ +#define __ALPH8201_H__ #ifndef INLINE #define INLINE static inline @@ -67,4 +69,4 @@ extern void alpha8301_get_info(UINT32 state, cpuinfo *info); offs_t ALPHA8201_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); -#endif /* _ALPHA8201_H */ +#endif /* __ALPH8201_H__ */ diff --git a/src/emu/cpu/apexc/apexc.h b/src/emu/cpu/apexc/apexc.h index 073dd398348..eb3bbcac088 100644 --- a/src/emu/cpu/apexc/apexc.h +++ b/src/emu/cpu/apexc/apexc.h @@ -1,4 +1,9 @@ /* register names for apexc_get_reg & apexc_set_reg */ +#pragma once + +#ifndef __APEXC_H__ +#define __APEXC_H__ + enum { APEXC_CR =1, /* control register */ @@ -32,3 +37,4 @@ unsigned apexc_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *op #define apexc_readop(address) apexc_readmem(address) +#endif /* __APEXC_H__ */ diff --git a/src/emu/cpu/arm/arm.h b/src/emu/cpu/arm/arm.h index 8504dc6597c..5819207d619 100644 --- a/src/emu/cpu/arm/arm.h +++ b/src/emu/cpu/arm/arm.h @@ -1,5 +1,7 @@ -#ifndef ARM_H -#define ARM_H +#pragma once + +#ifndef __ARM_H__ +#define __ARM_H__ #include "cpuintrf.h" @@ -27,4 +29,4 @@ enum ARM32_IR13, ARM32_IR14, ARM32_SR13, ARM32_SR14 }; -#endif /* ARM_H */ +#endif /* __ARM_H__ */ diff --git a/src/emu/cpu/arm7/arm7.h b/src/emu/cpu/arm7/arm7.h index 046a151b217..ee7d3347c1e 100644 --- a/src/emu/cpu/arm7/arm7.h +++ b/src/emu/cpu/arm7/arm7.h @@ -28,8 +28,10 @@ ******************************************************************************/ -#ifndef ARM7_H -#define ARM7_H +#pragma once + +#ifndef __ARM7_H__ +#define __ARM7_H__ #include "cpuintrf.h" @@ -38,4 +40,4 @@ ***************************************************************************************************/ extern void arm7_get_info(UINT32 state, cpuinfo *info); -#endif /* ARM7_H */ +#endif /* __ARM7_H__ */ diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h index 78738d04dba..76863adac7f 100644 --- a/src/emu/cpu/arm7/arm7core.h +++ b/src/emu/cpu/arm7/arm7core.h @@ -28,8 +28,10 @@ ******************************************************************************/ -#ifndef ARM7CORE_H -#define ARM7CORE_H +#pragma once + +#ifndef __ARM7CORE_H__ +#define __ARM7CORE_H__ #include "cpuintrf.h" @@ -405,4 +407,4 @@ extern char *(*arm7_dasm_cop_dt_callback)(char *pBuf, UINT32 opcode, char *pCond extern char *(*arm7_dasm_cop_rt_callback)(char *pBuf, UINT32 opcode, char *pConditionCode, char *pBuf0); extern char *(*arm7_dasm_cop_do_callback)(char *pBuf, UINT32 opcode, char *pConditionCode, char *pBuf0); -#endif /* ARM7CORE_H */ +#endif /* __ARM7CORE_H__ */ diff --git a/src/emu/cpu/asap/asap.h b/src/emu/cpu/asap/asap.h index cecdc0034b7..1a5e537798c 100644 --- a/src/emu/cpu/asap/asap.h +++ b/src/emu/cpu/asap/asap.h @@ -6,8 +6,10 @@ ***************************************************************************/ -#ifndef _ASAP_H -#define _ASAP_H +#pragma once + +#ifndef __ASAP_H__ +#define __ASAP_H__ #include "cpuintrf.h" @@ -39,4 +41,4 @@ enum extern void asap_get_info(UINT32 state, cpuinfo *info); -#endif /* _ASAP_H */ +#endif /* __ASAP_H__ */ diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index f6826d6f1bf..a86596d4d59 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -135,7 +135,7 @@ void ccpu_wdt_timer_trigger(void) static void ccpu_init(int index, int clock, const void *_config, int (*irqcallback)(int)) { - const struct CCPUConfig *config = _config; + const ccpu_config *config = _config; /* copy input params */ ccpu.external_input = config->external_input ? config->external_input : read_jmi; diff --git a/src/emu/cpu/ccpu/ccpu.h b/src/emu/cpu/ccpu/ccpu.h index a1075c106c7..895614ffa4f 100644 --- a/src/emu/cpu/ccpu/ccpu.h +++ b/src/emu/cpu/ccpu/ccpu.h @@ -8,8 +8,10 @@ ***************************************************************************/ -#ifndef _CCPU_H_ -#define _CCPU_H_ +#pragma once + +#ifndef __CCPU_H__ +#define __CCPU_H__ #include "cpuintrf.h" @@ -38,7 +40,8 @@ enum CONFIG STRUCTURE ***************************************************************************/ -struct CCPUConfig +typedef struct _ccpu_config ccpu_config; +struct _ccpu_config { UINT8 (*external_input)(void); /* if NULL, assume JMI jumper is present */ void (*vector_callback)(INT16 sx, INT16 sy, INT16 ex, INT16 ey, UINT8 shift); @@ -55,4 +58,4 @@ void ccpu_wdt_timer_trigger(void); offs_t ccpu_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); -#endif +#endif /* __CCPU_H__ */ diff --git a/src/emu/cpu/cdp1802/cdp1802.h b/src/emu/cpu/cdp1802/cdp1802.h index 6e2fbd1d065..59356d52a86 100644 --- a/src/emu/cpu/cdp1802/cdp1802.h +++ b/src/emu/cpu/cdp1802/cdp1802.h @@ -1,5 +1,7 @@ -#ifndef _CDP1802_H -#define _CDP1802_H +#pragma once + +#ifndef __CDP1802_H__ +#define __CDP1802_H__ #include "cpuintrf.h" @@ -112,4 +114,4 @@ struct _cdp1802_interface offs_t cdp1802_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); -#endif +#endif /* __CDP1802_H__ */ diff --git a/src/emu/cpu/cop400/cop400.h b/src/emu/cpu/cop400/cop400.h index 3f6172136a6..4936badeed4 100644 --- a/src/emu/cpu/cop400/cop400.h +++ b/src/emu/cpu/cop400/cop400.h @@ -9,6 +9,8 @@ ***************************************************************************/ +#pragma once + #ifndef __COP400__ #define __COP400__ diff --git a/src/emu/cpu/cp1610/cp1610.h b/src/emu/cpu/cp1610/cp1610.h index 0a84fc02ebb..0fe2768840c 100644 --- a/src/emu/cpu/cp1610/cp1610.h +++ b/src/emu/cpu/cp1610/cp1610.h @@ -17,8 +17,10 @@ * *****************************************************************************/ -#ifndef _CP1610_H -#define _CP1610_H +#pragma once + +#ifndef __CP1610_H__ +#define __CP1610_H__ #include "cpuintrf.h" @@ -42,4 +44,4 @@ unsigned cp1610_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *o #define cp1610_readmem16(A) program_read_word_16be((A)<<1) #define cp1610_writemem16(A,B) program_write_word_16be((A)<<1,B) -#endif /* _CP1610_H */ +#endif /* __CP1610_H__ */ diff --git a/src/emu/cpu/ds5002fp/ds5002fp.h b/src/emu/cpu/ds5002fp/ds5002fp.h index d108d381f42..40a84d11c97 100644 --- a/src/emu/cpu/ds5002fp/ds5002fp.h +++ b/src/emu/cpu/ds5002fp/ds5002fp.h @@ -37,8 +37,10 @@ * *****************************************************************************/ -#ifndef _DS5002FP_H -#define _DS5002FP_H +#pragma once + +#ifndef __DS5002FP_H__ +#define __DS5002FP_H__ #include "cpuintrf.h" @@ -136,6 +138,4 @@ extern offs_t ds5002fp_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const U void ds5002fp_get_info(UINT32 state, cpuinfo *info); -#endif /* _DS5002FP_H */ - - +#endif /* __DS5002FP_H__ */ diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index 943ca675b48..cc89497034f 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -347,7 +347,7 @@ static void dsp32c_set_context(void *src) static void dsp32c_init(int index, int clock, const void *_config, int (*irqcallback)(int)) { - const struct dsp32_config *config = _config; + const dsp32_config *config = _config; /* copy in config data */ if (config) diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/emu/cpu/dsp32/dsp32.h index 7b2facfe16b..c52df8cd0af 100644 --- a/src/emu/cpu/dsp32/dsp32.h +++ b/src/emu/cpu/dsp32/dsp32.h @@ -6,7 +6,9 @@ ***************************************************************************/ -#ifndef _DSP32_H +#pragma once + +#ifndef __DSP32_H__ #define _DSP32_H #include "cpuintrf.h" @@ -65,7 +67,8 @@ enum #define DSP32_OUTPUT_PIF 0x01 -struct dsp32_config +typedef struct _dsp32_config dsp32_config; +struct _dsp32_config { void (*output_pins_changed)(UINT32 pins); /* a change has occurred on an output pin */ }; @@ -81,4 +84,4 @@ extern void dsp32c_get_info(UINT32 state, cpuinfo *info); extern void dsp32c_pio_w(int cpunum, int reg, int data); extern int dsp32c_pio_r(int cpunum, int reg); -#endif /* _DSP32_H */ +#endif /* __DSP32_H__ */ diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/emu/cpu/dsp56k/dsp56def.h index 5ad8db9144a..1719a2e2d73 100644 --- a/src/emu/cpu/dsp56k/dsp56def.h +++ b/src/emu/cpu/dsp56k/dsp56def.h @@ -6,6 +6,12 @@ ALU ***************************************************************************/ +#pragma once + +#ifndef __DSP56DEF_H__ +#define __DSP56DEF_H__ + + #define X core.ALU.x.d #define X1 core.ALU.x.w.h #define X0 core.ALU.x.w.l @@ -381,3 +387,5 @@ static void PCDDR_set(UINT16 value); /* Port C Dtaa Register (PCD) */ static void PCD_set(UINT16 value); + +#endif /* __DSP56DEF_H__ */ diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h index 11f7ee0e695..f17c4fcad3b 100644 --- a/src/emu/cpu/dsp56k/dsp56k.h +++ b/src/emu/cpu/dsp56k/dsp56k.h @@ -7,8 +7,10 @@ ***************************************************************************/ -#ifndef _DSP56K_H -#define _DSP56K_H +#pragma once + +#ifndef __DSP56K_H__ +#define __DSP56K_H__ #include "cpuintrf.h" @@ -64,7 +66,7 @@ enum }; // For Debugger and opcodes -enum parallelMoveType +enum _parallel_move_type { PARALLEL_TYPE_XMDM, PARALLEL_TYPE_XMDM_SPECIAL, @@ -72,6 +74,7 @@ enum parallelMoveType PARALLEL_TYPE_ARU, PARALLEL_TYPE_RRDM }; +typedef enum _parallelMoveType parallelMoveType; extern void dsp56k_get_info(UINT32 state, cpuinfo *info); @@ -80,4 +83,4 @@ UINT8 dsp56k_host_interface_read(UINT8 offset); UINT16 dsp56k_get_peripheral_memory(UINT16 addr); -#endif // _DSP56K_H +#endif /* __DSP56K_H__ */ diff --git a/src/emu/cpu/e132xs/e132xs.h b/src/emu/cpu/e132xs/e132xs.h index f3229892a30..ed435117bab 100644 --- a/src/emu/cpu/e132xs/e132xs.h +++ b/src/emu/cpu/e132xs/e132xs.h @@ -1,5 +1,7 @@ -#ifndef E132XS_H -#define E132XS_H +#pragma once + +#ifndef __E132XS_H__ +#define __E132XS_H__ #include "cpuintrf.h" @@ -194,4 +196,4 @@ extern int hyp_type_16bit; #define E132XS_ENTRY_IRAM 3 #define E132XS_ENTRY_MEM3 7 -#endif /* E132XS_H */ +#endif /* __E132XS_H__ */ diff --git a/src/emu/cpu/f8/f3853.c b/src/emu/cpu/f8/f3853.c index e3a84bc98ee..959eb1013f9 100644 --- a/src/emu/cpu/f8/f3853.c +++ b/src/emu/cpu/f8/f3853.c @@ -23,7 +23,7 @@ static UINT8 f3853_value_to_cycle[0x100]; static struct { - F3853_CONFIG config; + f3853_config config; UINT8 high,low; // bit 7 set to 0 for timer interrupt, to 1 for external interrupt int external_enable; @@ -72,7 +72,7 @@ static TIMER_CALLBACK( f3853_timer_callback ) } -void f3853_init(const F3853_CONFIG *config) +void f3853_init(const f3853_config *config) { UINT8 reg=0xfe; int i; diff --git a/src/emu/cpu/f8/f3853.h b/src/emu/cpu/f8/f3853.h index 35e5f78a7a1..2b756769008 100644 --- a/src/emu/cpu/f8/f3853.h +++ b/src/emu/cpu/f8/f3853.h @@ -5,14 +5,22 @@ timer shift register basically the same as in f3851! */ +#pragma once + +#ifndef __F3853_H__ +#define __F3853_H__ + + #include "cpuintrf.h" -typedef struct { +typedef struct _f3853_config f3853_config; +struct _f3853_config +{ int frequency; void (*interrupt_request)(UINT16 addr, int level); -} F3853_CONFIG; +}; -void f3853_init(const F3853_CONFIG *config); +void f3853_init(const f3853_config *config); void f3853_reset(void); // ports 0x0c - 0x0f @@ -22,3 +30,4 @@ WRITE8_HANDLER(f3853_w); void f3853_set_external_interrupt_in_line(int level); void f3853_set_priority_in_line(int level); +#endif /* __F3853_H__ */ diff --git a/src/emu/cpu/f8/f8.h b/src/emu/cpu/f8/f8.h index 7d75c1f3599..5e865c272c1 100644 --- a/src/emu/cpu/f8/f8.h +++ b/src/emu/cpu/f8/f8.h @@ -19,7 +19,9 @@ * *****************************************************************************/ -#ifndef _F8_H +#pragma once + +#ifndef __F8_H__ #define _F8_H #include "cpuintrf.h" @@ -50,6 +52,4 @@ void f8_get_info(UINT32 state, cpuinfo *info); } #endif -#endif /* _F8_H */ - - +#endif /* __F8_H__ */ diff --git a/src/emu/cpu/g65816/g65816.h b/src/emu/cpu/g65816/g65816.h index aab39bb9cd7..8dbed092954 100644 --- a/src/emu/cpu/g65816/g65816.h +++ b/src/emu/cpu/g65816/g65816.h @@ -1,5 +1,7 @@ -#ifndef HEADER__G65816 -#define HEADER__G65816 +#pragma once + +#ifndef __G65816_H__ +#define __G65816_H__ /* ======================================================================== */ /* =============================== COPYRIGHT ============================== */ @@ -103,4 +105,4 @@ void g65816_get_info(UINT32 state, cpuinfo *info); /* ============================== END OF FILE ============================= */ /* ======================================================================== */ -#endif /* HEADER__G65816 */ +#endif /* __G65816_H__ */ diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h index dfd0b586b03..3fbe8eb50d4 100644 --- a/src/emu/cpu/g65816/g65816cm.h +++ b/src/emu/cpu/g65816/g65816cm.h @@ -1,5 +1,7 @@ -#ifndef HEADER__G65816CM -#define HEADER__G65816CM +#pragma once + +#ifndef __G65816CM_H__ +#define __G65816CM_H__ #define g65816i_branching(A) #define g65816i_jumping(A) @@ -60,7 +62,8 @@ INLINE int MAKE_INT_8(int A) {return (A & 0x80) ? A | ~0xff : A & 0xff;} /* ======================================================================== */ /* CPU Structure */ -typedef struct +typedef struct _g65816i_cpu_struct g65816i_cpu_struct; +struct _g65816i_cpu_struct { uint a; /* Accumulator */ uint b; /* holds high byte of accumulator */ @@ -93,7 +96,7 @@ typedef struct void (*set_reg)(int regnum, uint val); void (*set_line)(int line, int state); int (*execute)(int cycles); -} g65816i_cpu_struct; +}; extern g65816i_cpu_struct g65816i_cpu; extern int g65816_ICount; @@ -306,4 +309,4 @@ INLINE void g65816i_set_execution_mode(uint mode) /* ======================================================================== */ /* ================================== CPU ================================= */ /* ======================================================================== */ -#endif /* HEADER__G65816CM */ +#endif /* __G65816CM_H__ */ diff --git a/src/emu/cpu/g65816/g65816ds.h b/src/emu/cpu/g65816/g65816ds.h index 9561df64ce7..af86043726d 100644 --- a/src/emu/cpu/g65816/g65816ds.h +++ b/src/emu/cpu/g65816/g65816ds.h @@ -1,5 +1,7 @@ -#ifndef HEADER__G65816DS -#define HEADER__G65816DS +#pragma once + +#ifndef __G65816DS_H__ +#define __G65816DS_H__ /* ======================================================================== */ /* =============================== COPYRIGHT ============================== */ /* ======================================================================== */ @@ -20,4 +22,4 @@ author (Karl Stenerud) at karl@higashiyama-unet.ocn.ne.jp. unsigned g65816_disassemble(char* buff, unsigned int pc, unsigned int pb, const UINT8 *oprom, int m_flag, int x_flag); -#endif /* HEADER__G65816DS */ +#endif /* __G65816DS_H__ */ diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h index e71e4958846..495749fe675 100644 --- a/src/emu/cpu/g65816/g65816op.h +++ b/src/emu/cpu/g65816/g65816op.h @@ -1,3 +1,9 @@ +#pragma once + +#ifndef __G65816OP_H__ +#define __G65816OP_H__ + + #include "deprecat.h" /* ======================================================================== */ @@ -2448,7 +2454,4 @@ TABLE_FUNCTION(int, execute, (int clocks)) return clocks; } - -/* ======================================================================== */ -/* ================================== EOF ================================= */ -/* ======================================================================== */ +#endif /* __G65816OP_H__ */ diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c index 3b98ec3b1ec..dd25d952272 100644 --- a/src/emu/cpu/h6280/h6280.c +++ b/src/emu/cpu/h6280/h6280.c @@ -319,7 +319,7 @@ static void set_irq_line(int irqline, int state) /*****************************************************************************/ -READ8_HANDLER( H6280_irq_status_r ) +READ8_HANDLER( h6280_irq_status_r ) { int status; @@ -338,7 +338,7 @@ READ8_HANDLER( H6280_irq_status_r ) } } -WRITE8_HANDLER( H6280_irq_status_w ) +WRITE8_HANDLER( h6280_irq_status_w ) { h6280.io_buffer=data; switch (offset&3) @@ -355,13 +355,13 @@ WRITE8_HANDLER( H6280_irq_status_w ) } } -READ8_HANDLER( H6280_timer_r ) +READ8_HANDLER( h6280_timer_r ) { /* only returns countdown */ return ((h6280.timer_value/1024)&0x7F)|(h6280.io_buffer&0x80); } -WRITE8_HANDLER( H6280_timer_w ) +WRITE8_HANDLER( h6280_timer_w ) { h6280.io_buffer=data; switch (offset) { diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h index 3a06480d278..7ce9aed7d3a 100644 --- a/src/emu/cpu/h6280/h6280.h +++ b/src/emu/cpu/h6280/h6280.h @@ -10,8 +10,10 @@ ******************************************************************************/ -#ifndef _H6280_H -#define _H6280_H +#pragma once + +#ifndef __H6280_H__ +#define __H6280_H__ #include "cpuintrf.h" @@ -34,11 +36,11 @@ enum { void h6280_get_info(UINT32 state, cpuinfo *info); -READ8_HANDLER( H6280_irq_status_r ); -WRITE8_HANDLER( H6280_irq_status_w ); +READ8_HANDLER( h6280_irq_status_r ); +WRITE8_HANDLER( h6280_irq_status_w ); -READ8_HANDLER( H6280_timer_r ); -WRITE8_HANDLER( H6280_timer_w ); +READ8_HANDLER( h6280_timer_r ); +WRITE8_HANDLER( h6280_timer_w ); /* functions for use by the PSG and joypad port only! */ UINT8 h6280io_get_buffer(void); @@ -46,4 +48,4 @@ void h6280io_set_buffer(UINT8); offs_t h6280_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); -#endif /* _H6280_H */ +#endif /* __H6280_H__ */ diff --git a/src/emu/cpu/h6280/h6280ops.h b/src/emu/cpu/h6280/h6280ops.h index 9969907a268..bc2058487b1 100644 --- a/src/emu/cpu/h6280/h6280ops.h +++ b/src/emu/cpu/h6280/h6280ops.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __H6280OPS_H__ +#define __H6280OPS_H__ + /***************************************************************************** h6280ops.h - Addressing modes and opcode macros for the Hu6820 cpu @@ -1380,3 +1385,4 @@ INLINE void WRMEM(offs_t addr, UINT8 data) { #define CSL \ h6280.clocks_per_cycle = 4; +#endif /* __H6280OPS_H__ */ diff --git a/src/emu/cpu/h83002/h83002.h b/src/emu/cpu/h83002/h83002.h index 480b14a46fa..1adb631eddb 100644 --- a/src/emu/cpu/h83002/h83002.h +++ b/src/emu/cpu/h83002/h83002.h @@ -4,8 +4,10 @@ ****************************************************************************/ -#ifndef _H83002_H_ -#define _H83002_H_ +#pragma once + +#ifndef __H83002_H__ +#define __H83002_H__ #include "cpuintrf.h" @@ -75,4 +77,4 @@ void h8_3002_get_info(UINT32 state, cpuinfo *info); void h8_3002_InterruptRequest(UINT8 source); -#endif +#endif /* __H83002_H__ */ diff --git a/src/emu/cpu/h83002/h8priv.h b/src/emu/cpu/h83002/h8priv.h index 923eca4005d..ee0bf8fce9f 100644 --- a/src/emu/cpu/h83002/h8priv.h +++ b/src/emu/cpu/h83002/h8priv.h @@ -4,10 +4,13 @@ ****************************************************************************/ -#ifndef _H8PRIV_H_ -#define _H8PRIV_H_ +#pragma once -typedef struct +#ifndef __H8PRIV_H__ +#define __H8PRIV_H__ + +typedef struct _h83002_state h83002_state; +struct _h83002_state { // main CPU stuff UINT32 h8err; @@ -32,7 +35,7 @@ typedef struct int cpu_number; -} h83002_state; +}; extern h83002_state h8; @@ -51,4 +54,4 @@ UINT8 h8_3007_itu_read8(UINT8 reg); void h8_itu_write8(UINT8 reg, UINT8 val); void h8_3007_itu_write8(UINT8 reg, UINT8 val); -#endif +#endif /* __H8PRIV_H__ */ diff --git a/src/emu/cpu/hd6309/hd6309.h b/src/emu/cpu/hd6309/hd6309.h index 1f7217009b8..c39d2198d15 100644 --- a/src/emu/cpu/hd6309/hd6309.h +++ b/src/emu/cpu/hd6309/hd6309.h @@ -1,7 +1,9 @@ /*** hd6309: Portable 6309 emulator ******************************************/ -#ifndef _HD6309_H -#define _HD6309_H +#pragma once + +#ifndef __HD6309_H__ +#define __HD6309_H__ #include "cpuintrf.h" @@ -48,5 +50,4 @@ void hd6309_get_info(UINT32 state, cpuinfo *info); # define TRUE (!FALSE) #endif -#endif /* _HD6309_H */ - +#endif /* __HD6309_H__ */ diff --git a/src/emu/cpu/i386/cycles.h b/src/emu/cpu/i386/cycles.h index 7f0844a22c1..daeeb17f229 100644 --- a/src/emu/cpu/i386/cycles.h +++ b/src/emu/cpu/i386/cycles.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __CYCLES_H__ +#define __CYCLES_H__ + typedef enum { CYCLES_MOV_REG_REG, CYCLES_MOV_REG_MEM, @@ -664,3 +669,5 @@ static const X86_CYCLE_TABLE x86_cycle_table[] = { CYCLES_CMPXCHG_REG_MEM_T, { { 0, 0 }, { 7, 7 }, { 7, 7 }, { 7, 7 } } }, { CYCLES_CMPXCHG_REG_MEM_F, { { 0, 0 }, { 10, 10 }, { 10, 10 }, { 10, 10 } } }, }; + +#endif /* __CYCLES_H__ */ diff --git a/src/emu/cpu/i386/i386.h b/src/emu/cpu/i386/i386.h index 9fd26383c6f..2aeb9a54f3f 100644 --- a/src/emu/cpu/i386/i386.h +++ b/src/emu/cpu/i386/i386.h @@ -1,5 +1,7 @@ -#ifndef __I386_H_ -#define __I386_H_ +#pragma once + +#ifndef __I386_H__ +#define __I386_H__ #include "cpuintrf.h" @@ -893,4 +895,4 @@ INLINE void BUMP_DI(int adjustment) #define WRITEPORT16(port, value) (io_write_word_32le(port, value)) #define WRITEPORT32(port, value) (io_write_dword_32le(port, value)) -#endif +#endif /* __I386_H__ */ diff --git a/src/emu/cpu/i386/i386intf.h b/src/emu/cpu/i386/i386intf.h index d8af4a27bd4..4ba18918b57 100644 --- a/src/emu/cpu/i386/i386intf.h +++ b/src/emu/cpu/i386/i386intf.h @@ -1,5 +1,7 @@ -#ifndef __I386INTF_H -#define __I386INTF_H +#pragma once + +#ifndef __I386INTF_H__ +#define __I386INTF_H__ #include "cpuintrf.h" @@ -8,4 +10,4 @@ void i486_get_info(UINT32, cpuinfo*); void pentium_get_info(UINT32, cpuinfo*); void mediagx_get_info(UINT32, cpuinfo*); -#endif /* __I386INTF_H */ +#endif /* __I386INTF_H__ */ diff --git a/src/emu/cpu/i386/i386ops.h b/src/emu/cpu/i386/i386ops.h index 797d89f6b72..6d316bc7cdb 100644 --- a/src/emu/cpu/i386/i386ops.h +++ b/src/emu/cpu/i386/i386ops.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __I386OPS_H__ +#define __I386OPS_H__ + typedef struct { UINT8 opcode; UINT32 flags; @@ -367,3 +372,5 @@ static const X86_OPCODE x86_opcode_table[] = { 0xC1, OP_2BYTE|OP_I486, I486OP(xadd_rm16_r16), I486OP(xadd_rm32_r32), }, { 0xC7, OP_2BYTE|OP_PENTIUM, PENTIUMOP(cmpxchg8b_m64), PENTIUMOP(cmpxchg8b_m64), } }; + +#endif /* __I386OPS_H__ */ diff --git a/src/emu/cpu/i8039/i8039.h b/src/emu/cpu/i8039/i8039.h index 4508e3a3c35..f0b7f5bfff4 100644 --- a/src/emu/cpu/i8039/i8039.h +++ b/src/emu/cpu/i8039/i8039.h @@ -7,8 +7,10 @@ * Please, notify me, if you make any changes to this file * **************************************************************************/ -#ifndef _I8039_H -#define _I8039_H +#pragma once + +#ifndef __I8039_H__ +#define __I8039_H__ #ifndef INLINE #define INLINE static inline @@ -75,7 +77,7 @@ extern void i8039_get_info(UINT32 state, cpuinfo *info); #define i8035_ICount i8039_ICount extern void i8035_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* (HAS_I8035) */ /************************************************************************** * I8048 section @@ -100,7 +102,7 @@ extern void i8035_get_info(UINT32 state, cpuinfo *info); #define i8048_ICount i8039_ICount extern void i8048_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* (HAS_I8048) */ /************************************************************************** * I8749 section @@ -125,7 +127,7 @@ extern void i8048_get_info(UINT32 state, cpuinfo *info); #define i8749_ICount i8039_ICount extern void i8749_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* (HAS_I8749) */ /************************************************************************** * N7751 section @@ -150,7 +152,7 @@ extern void i8749_get_info(UINT32 state, cpuinfo *info); #define n7751_ICount i8039_ICount extern void n7751_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* (HAS_N7751) */ /************************************************************************** * MB8884 section @@ -175,7 +177,7 @@ extern void n7751_get_info(UINT32 state, cpuinfo *info); #define mb8884_ICount i8039_ICount extern void mb8884_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* (HAS_MB8884) */ /************************************************************************** * M58715 section @@ -200,7 +202,7 @@ extern void mb8884_get_info(UINT32 state, cpuinfo *info); #define m58715_ICount i8039_ICount extern void m58715_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* (HAS_M58715) */ /* * Input a UINT8 from given I/O port @@ -243,4 +245,4 @@ extern void m58715_get_info(UINT32 state, cpuinfo *info); offs_t i8039_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); -#endif /* _I8039_H */ +#endif /* __I8039_H__ */ diff --git a/src/emu/cpu/i8051/i8051.h b/src/emu/cpu/i8051/i8051.h index a3832b2ff47..bd99eef41e4 100644 --- a/src/emu/cpu/i8051/i8051.h +++ b/src/emu/cpu/i8051/i8051.h @@ -30,8 +30,10 @@ * *****************************************************************************/ -#ifndef _I8051_H -#define _I8051_H +#pragma once + +#ifndef __I8051_H__ +#define __I8051_H__ #include "cpuintrf.h" @@ -144,6 +146,4 @@ void i8052_get_info(UINT32 state, cpuinfo *info); void i8751_get_info(UINT32 state, cpuinfo *info); void i8752_get_info(UINT32 state, cpuinfo *info); -#endif /* _I8051_H */ - - +#endif /* __I8051_H__ */ diff --git a/src/emu/cpu/i8085/i8085cpu.h b/src/emu/cpu/i8085/i8085cpu.h index 6c6e8b30267..737844b431c 100644 --- a/src/emu/cpu/i8085/i8085cpu.h +++ b/src/emu/cpu/i8085/i8085cpu.h @@ -10,6 +10,12 @@ * *******************************************************/ +#pragma once + +#ifndef __I8085CPU_H__ +#define __I8085CPU_H__ + + #define SF 0x80 #define ZF 0x40 #define YF 0x20 @@ -186,3 +192,5 @@ int q = I.AF.b.h+R; \ (((I.BC.b.h^I.HL.b.h)&(I.HL.b.h^q)&SF)>>5); \ if (I.HL.b.l!=0) I.AF.b.l&=~ZF; \ } + +#endif /* __I8085CPU_H__ */ diff --git a/src/emu/cpu/i8085/i8085daa.h b/src/emu/cpu/i8085/i8085daa.h index bd6533b2dce..af3e00906fa 100644 --- a/src/emu/cpu/i8085/i8085daa.h +++ b/src/emu/cpu/i8085/i8085daa.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __I8085DAA_H__ +#define __I8085DAA_H__ + static const UINT16 DAA[2048] = { (0x00<<8) +ZF +VF , (0x01<<8) , @@ -2048,3 +2053,5 @@ static const UINT16 DAA[2048] = { (0x98<<8)+SF +XF +NF+CF, (0x99<<8)+SF +XF+VF+NF+CF }; + +#endif /* __I8085DAA_H__ */ diff --git a/src/emu/cpu/i86/ea.h b/src/emu/cpu/i86/ea.h index dca12337a5b..04c20ea5a84 100644 --- a/src/emu/cpu/i86/ea.h +++ b/src/emu/cpu/i86/ea.h @@ -1,3 +1,9 @@ +#pragma once + +#ifndef __EA_H__ +#define __EA_H__ + + static unsigned EA; static UINT16 EO; /* HJB 12/13/98 effective offset of the address (before segment is added) */ @@ -56,3 +62,5 @@ static unsigned (*const GetEA[192])(void)={ EA_200, EA_201, EA_202, EA_203, EA_204, EA_205, EA_206, EA_207, EA_200, EA_201, EA_202, EA_203, EA_204, EA_205, EA_206, EA_207 }; + +#endif /* __EA_H__ */ diff --git a/src/emu/cpu/i86/host.h b/src/emu/cpu/i86/host.h index d19042c7e28..a487644eeca 100644 --- a/src/emu/cpu/i86/host.h +++ b/src/emu/cpu/i86/host.h @@ -1,6 +1,12 @@ /*****************************************************************************/ /* host dependent types */ +#pragma once + +#ifndef __HOST_H__ +#define __HOST_H__ + + /*#define BIGCASE*/ #include "cpuintrf.h" @@ -10,3 +16,5 @@ typedef UINT8 BOOLEAN; typedef UINT8 BYTE; typedef UINT16 WORD; typedef UINT32 DWORD; + +#endif /* __HOST_H__ */ diff --git a/src/emu/cpu/i86/i186intf.h b/src/emu/cpu/i86/i186intf.h index bfc6275bb6e..2597b7df59c 100644 --- a/src/emu/cpu/i86/i186intf.h +++ b/src/emu/cpu/i86/i186intf.h @@ -1,10 +1,10 @@ /* ASG 971222 -- rewrote this interface */ -#ifndef __I186INTR_H_ -#define __I186INTR_H_ +#ifndef __I186INTF_H__ +#define __I186INTF_H__ #include "i86intf.h" /* Public functions */ void i80186_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __I186INTF_H__ */ diff --git a/src/emu/cpu/i86/i188intf.h b/src/emu/cpu/i86/i188intf.h index 49675a8a332..5947b2bf5b8 100644 --- a/src/emu/cpu/i86/i188intf.h +++ b/src/emu/cpu/i86/i188intf.h @@ -1,9 +1,11 @@ -#ifndef __I188INTR_H_ -#define __I188INTR_H_ +#pragma once + +#ifndef __I186INTF_H__ +#define __I186INTF_H__ #include "i186intf.h" /* Public functions */ void i80188_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __I186INTF_H__ */ diff --git a/src/emu/cpu/i86/i286intf.h b/src/emu/cpu/i86/i286intf.h index c1c92a78c30..7a6f25094b6 100644 --- a/src/emu/cpu/i86/i286intf.h +++ b/src/emu/cpu/i86/i286intf.h @@ -1,6 +1,8 @@ /* ASG 971222 -- rewrote this interface */ -#ifndef __I286INTR_H_ -#define __I286INTR_H_ +#pragma once + +#ifndef __I286INTF_H__ +#define __I286INTF_H__ #include "i86intf.h" @@ -43,4 +45,4 @@ enum /* Public functions */ void i80286_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __I286INTF_H__ */ diff --git a/src/emu/cpu/i86/i86.h b/src/emu/cpu/i86/i86.h index fa7912644df..d78e4bfd224 100644 --- a/src/emu/cpu/i86/i86.h +++ b/src/emu/cpu/i86/i86.h @@ -3,8 +3,10 @@ /* (initial work based on David Hedley's pcemu) */ /* */ /****************************************************************************/ -#ifndef __I86_H_ -#define __I86_H_ +#pragma once + +#ifndef __I86_H__ +#define __I86_H__ #define I8086_NMI_INT_VECTOR 2 #define INPUT_LINE_TEST 20 /* PJB 03/05 */ @@ -123,5 +125,5 @@ typedef enum { AH,AL,CH,CL,DH,DL,BH,BL,SPH,SPL,BPH,BPL,SIH,SIL,DIH,DIL } BREGS; I.DirVal = ((f) & 1024) ? -1 : 1; \ I.OverVal = (f) & 2048; \ } -#endif +#endif /* __I86_H__ */ diff --git a/src/emu/cpu/i86/i86intf.h b/src/emu/cpu/i86/i86intf.h index 0f7b8984102..4fc194d2ec6 100644 --- a/src/emu/cpu/i86/i86intf.h +++ b/src/emu/cpu/i86/i86intf.h @@ -1,6 +1,8 @@ /* ASG 971222 -- rewrote this interface */ -#ifndef __I86INTRF_H_ -#define __I86INTRF_H_ +#pragma once + +#ifndef __I86INTF_H__ +#define __I86INTF_H__ #include "cpuintrf.h" @@ -27,4 +29,4 @@ enum /* Public functions */ void i8086_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __I86INTF_H__ */ diff --git a/src/emu/cpu/i86/i86mem.h b/src/emu/cpu/i86/i86mem.h index 1233b4816c9..b31497ad918 100644 --- a/src/emu/cpu/i86/i86mem.h +++ b/src/emu/cpu/i86/i86mem.h @@ -1,4 +1,10 @@ -typedef struct +#pragma once + +#ifndef __I86MEM_H__ +#define __I86MEM_H__ + +typedef struct _memory_interface memory_interface; +struct _memory_interface { offs_t fetch_xor; @@ -11,4 +17,6 @@ typedef struct UINT16 (*rword_port)(offs_t); void (*wbyte_port)(offs_t, UINT8); void (*wword_port)(offs_t, UINT16); -} memory_interface; +}; + +#endif /* __I86MEM_H__ */ diff --git a/src/emu/cpu/i86/i88intf.h b/src/emu/cpu/i86/i88intf.h index 76555583cd8..71a76d83a46 100644 --- a/src/emu/cpu/i86/i88intf.h +++ b/src/emu/cpu/i86/i88intf.h @@ -1,9 +1,11 @@ -#ifndef __I88INTR_H_ -#define __I88INTR_H_ +#pragma once + +#ifndef __I88INTF_H__ +#define __I88INTF_H__ #include "i86intf.h" /* Public functions */ void i8088_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __I88INTF_H__ */ diff --git a/src/emu/cpu/i86/instr186.h b/src/emu/cpu/i86/instr186.h index 54de28e18ad..3c7fe303b5f 100644 --- a/src/emu/cpu/i86/instr186.h +++ b/src/emu/cpu/i86/instr186.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __INSTR186_H__ +#define __INSTR186_H__ + /**************************************************************************** * real mode i286 emulator v1.4 by Fabrice Frances * * (initial work based on David Hedley's pcemu) * @@ -25,3 +30,5 @@ static void PREFIX186(_outsw)(void); /* changed instructions */ static void PREFIX186(_repne)(void); static void PREFIX186(_repe)(void); + +#endif /* __INSTR186_H__ */ diff --git a/src/emu/cpu/i86/instr286.h b/src/emu/cpu/i86/instr286.h index 53431ada3be..8edc90115c3 100644 --- a/src/emu/cpu/i86/instr286.h +++ b/src/emu/cpu/i86/instr286.h @@ -1,3 +1,9 @@ +#pragma once + +#ifndef __INSTR286_H__ +#define __INSTR286_H__ + + #define ILLEGAL_INSTRUCTION 6 #define GENERAL_PROTECTION_FAULT 0xd @@ -11,3 +17,5 @@ static void i80286_code_descriptor(UINT16 selector, UINT16 offset); static void i80286_data_descriptor(int reg, UINT16 selector); static void PREFIX286(_0fpre)(void); static void PREFIX286(_arpl)(void); + +#endif /* __INSTR286_H__ */ diff --git a/src/emu/cpu/i86/instr86.h b/src/emu/cpu/i86/instr86.h index 6bcf350479a..08583948678 100644 --- a/src/emu/cpu/i86/instr86.h +++ b/src/emu/cpu/i86/instr86.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __INSTR86_H__ +#define __INSTR86_H__ + /**************************************************************************** * real mode i286 emulator v1.4 by Fabrice Frances * * (initial work based on David Hedley's pcemu) * @@ -235,3 +240,5 @@ static void PREFIX86(_std)(void); static void PREFIX86(_fepre)(void); static void PREFIX86(_ffpre)(void); static void PREFIX86(_wait)(void); + +#endif /* __INSTR86_H__ */ diff --git a/src/emu/cpu/i86/instrv30.h b/src/emu/cpu/i86/instrv30.h index 0647ae8d841..5d4580ec231 100644 --- a/src/emu/cpu/i86/instrv30.h +++ b/src/emu/cpu/i86/instrv30.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __INSTRV30_H__ +#define __INSTRV30_H__ + static void PREFIXV30(_0fpre)(void); static void PREFIXV30(_repnc)(void); static void PREFIXV30(_repc)(void); @@ -5,3 +10,5 @@ static void PREFIXV30(_setalc)(void); #if 0 static void PREFIXV30(_brks)(void); #endif + +#endif /* __INSTRV30_H__ */ diff --git a/src/emu/cpu/i86/modrm.h b/src/emu/cpu/i86/modrm.h index 146ee13e348..cee4325e77f 100644 --- a/src/emu/cpu/i86/modrm.h +++ b/src/emu/cpu/i86/modrm.h @@ -1,3 +1,9 @@ +#pragma once + +#ifndef __MODRM_H__ +#define __MODRM_H__ + + static struct { struct { WREGS w[256]; @@ -115,4 +121,4 @@ static struct { unsigned dst = I.regs.w[AX]; \ src += (FETCH << 8) - +#endif /* __MODRM_H__ */ diff --git a/src/emu/cpu/i86/table186.h b/src/emu/cpu/i86/table186.h index 9a415558f0f..8659e7531be 100644 --- a/src/emu/cpu/i86/table186.h +++ b/src/emu/cpu/i86/table186.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __TABLE186_H__ +#define __TABLE186_H__ + static void (*const PREFIX186(_instruction)[256])(void) = { PREFIX86(_add_br8), /* 0x00 */ @@ -523,3 +528,5 @@ static void (*const PREFIX186(_instruction)[256])(void) = #else #define TABLE186 PREFIX186(_instruction)[FETCHOP](); #endif + +#endif /* __TABLE186_H__ */ diff --git a/src/emu/cpu/i86/table286.h b/src/emu/cpu/i86/table286.h index 6b79dcfaedc..70dc32d17f5 100644 --- a/src/emu/cpu/i86/table286.h +++ b/src/emu/cpu/i86/table286.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __TABLE286_H__ +#define __TABLE286_H__ + /* * special 286 protected mode instructions missing * at the time the same like table186.h @@ -529,3 +534,4 @@ static void (*const PREFIX286(_instruction)[256])(void) = #define TABLE286 PREFIX286(_instruction)[FETCHOP](); #endif +#endif /* __TABLE286_H__ */ diff --git a/src/emu/cpu/i86/table86.h b/src/emu/cpu/i86/table86.h index 1038501bd03..75ce17fcacc 100644 --- a/src/emu/cpu/i86/table86.h +++ b/src/emu/cpu/i86/table86.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __TABLE86_H__ +#define __TABLE86_H__ + static void (*const PREFIX86(_instruction)[256])(void) = { PREFIX86(_add_br8), /* 0x00 */ @@ -523,3 +528,5 @@ static void (*const PREFIX86(_instruction)[256])(void) = #else #define TABLE86 PREFIX86(_instruction)[FETCHOP](); #endif + +#endif /* __TABLE86_H__ */ diff --git a/src/emu/cpu/i86/tablev30.h b/src/emu/cpu/i86/tablev30.h index 3c29bf85678..a1581bbaaef 100644 --- a/src/emu/cpu/i86/tablev30.h +++ b/src/emu/cpu/i86/tablev30.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __TABLEV30_H__ +#define __TABLEV30_H__ + // special nec instructions missing // at the time the same like table186.h @@ -526,3 +531,5 @@ static void (*const PREFIXV30(_instruction)[256])(void) = #else #define TABLEV30 PREFIXV30(_instruction)[FETCHOP](); #endif + +#endif /* __TABLEV30_H__ */ diff --git a/src/emu/cpu/i86/v20intf.h b/src/emu/cpu/i86/v20intf.h index 88a42617d48..0afd287d8c4 100644 --- a/src/emu/cpu/i86/v20intf.h +++ b/src/emu/cpu/i86/v20intf.h @@ -1,6 +1,8 @@ /* ASG 971222 -- rewrote this interface */ -#ifndef __V20INTRF_H_ -#define __V20INTRF_H_ +#pragma once + +#ifndef __V20INTF_H__ +#define __V20INTF_H__ #include "i86intrf.h" #include "v30intrf.h" @@ -8,4 +10,4 @@ /* Public functions */ void v20_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __V20INTF_H__ */ diff --git a/src/emu/cpu/i86/v30.h b/src/emu/cpu/i86/v30.h index 61792b5176d..33513beb7c3 100644 --- a/src/emu/cpu/i86/v30.h +++ b/src/emu/cpu/i86/v30.h @@ -1,3 +1,8 @@ +#pragma once + +#ifndef __V30_H__ +#define __V30_H__ + #define SetMD(x) (I.MF = (x)) /* OB [19.07.99] Mode Flag V30 */ #define MD (I.MF!=0) @@ -21,3 +26,5 @@ I.OverVal = (f) & 2048; \ I.MF = ((f) & 0x8000) == 0x8000; \ } + +#endif /* __V30_H__ */ diff --git a/src/emu/cpu/i86/v30intf.h b/src/emu/cpu/i86/v30intf.h index 3eb09015980..2355c36df0e 100644 --- a/src/emu/cpu/i86/v30intf.h +++ b/src/emu/cpu/i86/v30intf.h @@ -1,9 +1,11 @@ -#ifndef __V30INTRF_H_ -#define __V30INTRF_H_ +#pragma once + +#ifndef __V30INTF_H__ +#define __V30INTF_H__ #include "i86intf.h" /* Public functions */ void v30_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __V30INTF_H__ */ diff --git a/src/emu/cpu/i86/v33intf.h b/src/emu/cpu/i86/v33intf.h index fa74dcf0781..50c4e501db4 100644 --- a/src/emu/cpu/i86/v33intf.h +++ b/src/emu/cpu/i86/v33intf.h @@ -1,5 +1,5 @@ -#ifndef __V33INTRF_H_ -#define __V33INTRF_H_ +#ifndef __V33INTF_H__ +#define __V33INTF_H__ #include "i86intrf.h" #include "v30intrf.h" @@ -7,4 +7,4 @@ /* Public functions */ void v33_get_info(UINT32 state, cpuinfo *info); -#endif +#endif /* __V33INTF_H__ */ diff --git a/src/emu/cpu/i8x41/i8x41.h b/src/emu/cpu/i8x41/i8x41.h index 41830aa7266..9c1a586771d 100644 --- a/src/emu/cpu/i8x41/i8x41.h +++ b/src/emu/cpu/i8x41/i8x41.h @@ -23,8 +23,10 @@ * *****************************************************************************/ -#ifndef _I8X41_H -#define _I8X41_H +#pragma once + +#ifndef __I8X41_H__ +#define __I8X41_H__ #include "cpuintrf.h" @@ -38,14 +40,18 @@ * I8X41_STAT is A0 = 1 and R only */ -typedef enum { +enum _i8x41_type +{ TYPE_I8X41, TYPE_I8X42 -} i8x41_type; +}; +typedef enum _i8x41_type i8x41_type; -typedef struct { +typedef struct _i8x41_config i8x41_config; +struct _i8x41_config +{ i8x41_type type; -} i8x41_config; +}; /**************************************************************************** * Interrupt constants @@ -93,4 +99,4 @@ extern void i8x41_get_info(UINT32 state, cpuinfo *info); extern offs_t i8x41_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram); -#endif /* _I8X41_H */ +#endif /* __I8X41_H__ */ diff --git a/src/emu/cpu/i960/i960.h b/src/emu/cpu/i960/i960.h index 320d25c77a6..0116c2df531 100644 --- a/src/emu/cpu/i960/i960.h +++ b/src/emu/cpu/i960/i960.h @@ -1,5 +1,7 @@ -#ifndef __I960_H -#define __I960_H +#pragma once + +#ifndef __I960_H__ +#define __I960_H__ #include "cpuintrf.h" @@ -61,4 +63,4 @@ void i960_get_info(UINT32 state, cpuinfo *info); void i960_noburst(void); void i960_stall(void); -#endif +#endif /* __I960_H__ */ diff --git a/src/emu/cpu/i960/i960dis.h b/src/emu/cpu/i960/i960dis.h index 82f0c3bf467..150ae0e0faf 100644 --- a/src/emu/cpu/i960/i960dis.h +++ b/src/emu/cpu/i960/i960dis.h @@ -1,15 +1,16 @@ -#ifndef _I960DISASSEMBLER_H -#define _I960DISASSEMBLER_H +#ifndef __I960DIS_H__ +#define __I960DIS_H__ -typedef struct +typedef struct _disassemble_t disassemble_t; +struct _disassemble_t { char *buffer; // output buffer unsigned long IP; unsigned long IPinc; const UINT8 *oprom; UINT32 disflags; -} disassemble_t; +}; char *i960_disassemble(disassemble_t *diss); -#endif // _I960DISASSEMBLER_H +#endif /* __I960DIS_H__ */ diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index e75c1b39088..7ac1271b6ab 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -107,7 +107,7 @@ static ADDRESS_MAP_START( triothep_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x140000, 0x140001) AM_READNOP /* Value doesn't matter */ AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM AM_BASE(&actfancr_ram) /* Main ram */ AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(triothep_control_r, triothep_control_select_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index d0c2fcd7e7b..1f2ead68e2f 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -83,7 +83,7 @@ static ADDRESS_MAP_START( battlera_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fe000, 0x1fe001) AM_READWRITE(HuC6270_register_r, HuC6270_register_w) AM_RANGE(0x1fe002, 0x1fe003) AM_WRITE(HuC6270_data_w) AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(control_data_r, control_data_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( battlera_portmap, ADDRESS_SPACE_IO, 8 ) @@ -132,7 +132,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1fe800, 0x1fe80f) AM_WRITE(c6280_0_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(7) /* Main ram */ AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(soundlatch_r, battlera_adpcm_reset_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index cbc9a46041b..8e715653d70 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -137,8 +137,8 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x130000, 0x130001) AM_READWRITE(okim6295_status_1_r, okim6295_data_1_w) AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK8, SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index b1ac138e76e..8e6d0bc3593 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -197,8 +197,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c index b34971eb6ce..31ece2ed43c 100644 --- a/src/mame/drivers/cinemat.c +++ b/src/mame/drivers/cinemat.c @@ -957,13 +957,13 @@ INPUT_PORTS_END * *************************************/ -static const struct CCPUConfig config_nojmi = +static const ccpu_config config_nojmi = { joystick_read, cinemat_vector_callback }; -static const struct CCPUConfig config_jmi = +static const ccpu_config config_jmi = { NULL, cinemat_vector_callback diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 0f05dabb41a..9087245b3d7 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -342,8 +342,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) @@ -363,8 +363,8 @@ static ADDRESS_MAP_START( sound_writemem_mutantf, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( stoneage_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index 0765de465c3..85a8072961d 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -141,8 +141,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index d8b311be977..8987bf81bc1 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -285,8 +285,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /**********************************************************************************/ diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index b405fee7d76..db096c2793e 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -176,7 +176,7 @@ static ADDRESS_MAP_START( robocop_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_RAM) /* Main ram */ AM_RANGE(0x1f2000, 0x1f3fff) AM_WRITE(SMH_RAM) AM_BASE(&robocop_shared_ram) /* Shared ram */ - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( hippodrm_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -195,7 +195,7 @@ static ADDRESS_MAP_START( hippodrm_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1a1000, 0x1a17ff) AM_WRITE(dec0_pf3_data_8bit_w) AM_RANGE(0x1d0000, 0x1d00ff) AM_WRITE(hippodrm_prot_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( slyspy_readmem, ADDRESS_SPACE_PROGRAM, 16 ) @@ -344,7 +344,7 @@ static ADDRESS_MAP_START( slyspy_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0b0000, 0x0b0001) AM_WRITE(YM2203_w) AM_RANGE(0x0e0000, 0x0e0001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( midres_s_readmem, ADDRESS_SPACE_PROGRAM, 8 ) @@ -360,7 +360,7 @@ static ADDRESS_MAP_START( midres_s_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x118000, 0x118001) AM_WRITE(YM2203_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) /* Main ram */ - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 4209da0ec81..4e1b18592b1 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1155,8 +1155,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END static ADDRESS_MAP_START( sound_readmem_tattass, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 2c282274a60..4fe57e64810 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -60,8 +60,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 131028783a5..c1be375f835 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -148,8 +148,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index d529c8975be..fc698deb4db 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -278,7 +278,7 @@ static const tms34010_config msp_config = }; -static const struct dsp32_config dsp32c_config = +static const dsp32_config dsp32c_config = { hddsk_update_pif /* a change has occurred on an output pin */ }; diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index 9009bb12453..a5e86af5109 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -126,8 +126,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c index bc6f67ce278..222d95481f8 100644 --- a/src/mame/drivers/paranoia.c +++ b/src/mame/drivers/paranoia.c @@ -58,9 +58,9 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8) AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w ) AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w ) AM_RANGE( 0x1FE800, 0x1FEBFF) AM_READWRITE( c6280_r, c6280_0_w ) - AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( H6280_timer_r, H6280_timer_w ) + AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( h6280_timer_r, h6280_timer_w ) AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w ) - AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( H6280_irq_status_r, H6280_irq_status_w ) + AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( pce_io , ADDRESS_SPACE_IO, 8) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 5c505c3a93a..05c4b9e647b 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -342,8 +342,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /**********************************************************************************/ diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c index 17b201426f6..f7229b2ef8b 100644 --- a/src/mame/drivers/supbtime.c +++ b/src/mame/drivers/supbtime.c @@ -146,8 +146,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w) AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP) AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 5e08da25be7..fb51d261858 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -148,8 +148,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x130000, 0x130001) AM_NOP /* This board only has 1 oki chip */ AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK8, SMH_BANK8) - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/ diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index cc68be47ccd..1199d1d5c07 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -168,9 +168,9 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8) AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w ) AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w ) AM_RANGE( 0x1FE800, 0x1FEBFF) AM_READWRITE( c6280_r, c6280_0_w ) - AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( H6280_timer_r, H6280_timer_w ) + AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( h6280_timer_r, h6280_timer_w ) AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w ) - AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( H6280_irq_status_r, H6280_irq_status_w ) + AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w ) ADDRESS_MAP_END static ADDRESS_MAP_START( pce_io , ADDRESS_SPACE_IO, 8) diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index 37c96c39ea9..75c759e4167 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -110,8 +110,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x130000, 0x130001) AM_READWRITE(okim6295_status_1_r, okim6295_data_1_w) AM_RANGE(0x140000, 0x140001) AM_READ(vaportra_soundlatch_r) AM_RANGE(0x1f0000, 0x1f1fff) AM_READWRITE(SMH_BANK8,SMH_BANK8) /* ??? LOOKUP ??? */ - AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(H6280_timer_w) - AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w) + AM_RANGE(0x1fec00, 0x1fec01) AM_WRITE(h6280_timer_w) + AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w) ADDRESS_MAP_END /******************************************************************************/