diff options
author | 2008-11-06 22:53:42 +0000 | |
---|---|---|
committer | 2008-11-06 22:53:42 +0000 | |
commit | bc35b2d9e972f5bfe4c0b46f968a08f17e8e4f84 (patch) | |
tree | 9bb52a25ff88b736f6ce6b4d9388631871dd16f1 /src/emu | |
parent | 552fc58ce5355908968697fc1ddd50ef73ad377c (diff) |
Some more gcc 64bit tranquilizers
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/cpu/ds5002fp/ds5002fp.h | 4 | ||||
-rw-r--r-- | src/emu/cpu/dsp56k/dsp56def.h | 2 | ||||
-rw-r--r-- | src/emu/cpu/m68000/m68kcpu.h | 1 | ||||
-rw-r--r-- | src/emu/cpu/m68000/m68kmame.c | 10 |
4 files changed, 7 insertions, 10 deletions
diff --git a/src/emu/cpu/ds5002fp/ds5002fp.h b/src/emu/cpu/ds5002fp/ds5002fp.h index 9cb3ca2dab6..96529c7b697 100644 --- a/src/emu/cpu/ds5002fp/ds5002fp.h +++ b/src/emu/cpu/ds5002fp/ds5002fp.h @@ -114,10 +114,6 @@ struct _ds5002fp_config UINT8 crc; /* bootstrap loader CRC register */ }; -extern CPU_INIT( ds5002fp ); /* Initialize save states */ -extern CPU_RESET( ds5002fp ); /* Reset registers to the initial values */ -extern CPU_EXIT( ds5002fp ); /* Shut down CPU core */ -extern CPU_EXECUTE( ds5002fp ); /* Execute cycles - returns number of cycles actually run */ extern void ds5002fp_get_context (void *dst); /* Get registers, return context size */ extern void ds5002fp_set_context (void *src); /* Set registers */ extern unsigned ds5002fp_get_intram (int offset); diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/emu/cpu/dsp56k/dsp56def.h index 3cb6ac5bf77..7a2e85e403c 100644 --- a/src/emu/cpu/dsp56k/dsp56def.h +++ b/src/emu/cpu/dsp56k/dsp56def.h @@ -46,7 +46,7 @@ /*************************************************************************** PCU ***************************************************************************/ -static CPU_RESET( pcu ); +//static CPU_RESET( pcu ); #define PC (core.PCU.pc) #define LA (core.PCU.la) #define LC (core.PCU.lc) diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index 02eb6ab8883..632127e1da3 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -28,6 +28,7 @@ typedef struct _m68ki_cpu_core m68ki_cpu_core; +#include "devintrf.h" #include "m68k.h" #include <limits.h> #include <setjmp.h> diff --git a/src/emu/cpu/m68000/m68kmame.c b/src/emu/cpu/m68000/m68kmame.c index 3ffb60a05d0..cb557102bc7 100644 --- a/src/emu/cpu/m68000/m68kmame.c +++ b/src/emu/cpu/m68000/m68kmame.c @@ -161,7 +161,7 @@ static CPU_INIT( m68000 ) m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68000); m68k_memory_intf = interface_d16; m68k_state_register(m68k, "m68000", index); - m68k_set_int_ack_callback(m68k, (void *)device, irqcallback); + m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback); } static CPU_RESET( m68000 ) @@ -257,7 +257,7 @@ static CPU_INIT( m68010 ) m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68010); m68k_memory_intf = interface_d16; m68k_state_register(m68k, "m68010", index); - m68k_set_int_ack_callback(m68k, (void *)device, irqcallback); + m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback); } static offs_t m68010_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram) @@ -279,7 +279,7 @@ static CPU_INIT( m68020 ) m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68020); m68k_memory_intf = interface_d32; m68k_state_register(m68k, "m68020", index); - m68k_set_int_ack_callback(m68k, (void *)device, irqcallback); + m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback); } static CPU_RESET( m68020 ) @@ -327,7 +327,7 @@ static CPU_INIT( m68ec020 ) m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68EC020); m68k_memory_intf = interface_d32; m68k_state_register(m68k, "m68ec020", index); - m68k_set_int_ack_callback(m68k, (void *)device, irqcallback); + m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback); } static offs_t m68ec020_dasm(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram) @@ -350,7 +350,7 @@ static CPU_INIT( m68040 ) m68k_set_cpu_type(m68k, M68K_CPU_TYPE_68040); m68k_memory_intf = interface_d32; m68k_state_register(m68k, "m68040", index); - m68k_set_int_ack_callback(m68k, (void *)device, irqcallback); + m68k_set_int_ack_callback(m68k, (void *)device, (int (*)(void *param, int int_level)) irqcallback); } static CPU_RESET( m68040 ) |