Make sure function prototype signatures match, and put typedefs into

separate header file

diff --git a/cpu/sh2/sh2.h b/cpu/sh2/sh2.h
index b9267d7..7177b75 100644 (file)
--- a/cpu/sh2/sh2.h
+++ b/cpu/sh2/sh2.h
@@ -1,6 +1,7 @@
 #ifndef __SH2_H__\r
 #define __SH2_H__\r
 \r
+#include "../../pico/pico_types.h"\r
 #include "../../pico/pico_port.h"\r
 \r
 // registers - matches structure order\r
@@ -129,12 +130,12 @@ static __inline int sh2_execute(SH2 *sh2, int cycles)
 \r
 // pico memhandlers\r
 // XXX: move somewhere else\r
-unsigned int REGPARM(2) p32x_sh2_read8(unsigned int a, SH2 *sh2);\r
-unsigned int REGPARM(2) p32x_sh2_read16(unsigned int a, SH2 *sh2);\r
-unsigned int REGPARM(2) p32x_sh2_read32(unsigned int a, SH2 *sh2);\r
-void REGPARM(3) p32x_sh2_write8 (unsigned int a, unsigned int d, SH2 *sh2);\r
-void REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
-void REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
+unsigned int REGPARM(2) p32x_sh2_read8(u32 a, SH2 *sh2);\r
+unsigned int REGPARM(2) p32x_sh2_read16(u32 a, SH2 *sh2);\r
+unsigned int REGPARM(2) p32x_sh2_read32(u32 a, SH2 *sh2);\r
+void REGPARM(3) p32x_sh2_write8 (u32 a, u32 d, SH2 *sh2);\r
+void REGPARM(3) p32x_sh2_write16(u32 a, u32 d, SH2 *sh2);\r
+void REGPARM(3) p32x_sh2_write32(u32 a, u32 d, SH2 *sh2);\r
 \r
 // debug\r
 #ifdef DRC_CMP\r

diff --git a/pico/pico_int.h b/pico/pico_int.h
index da063bc..8757f7c 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -9,7 +9,6 @@
 \r
 #ifndef PICO_INTERNAL_INCLUDED\r
 #define PICO_INTERNAL_INCLUDED\r
-\r
 #include <stdio.h>\r
 #include <string.h>\r
 #include "pico_port.h"\r
@@ -32,16 +31,7 @@
 extern "C" {\r
 #endif\r
 \r
-\r
-#ifndef UTYPES_DEFINED\r
-typedef uint8_t        u8;\r
-typedef int8_t         s8;\r
-typedef uint16_t       u16;\r
-typedef int16_t        s16;\r
-typedef uint32_t       u32;\r
-typedef int32_t        s32;\r
-#endif\r
-typedef uintptr_t      uptr; // unsigned pointer-sized int\r
+#include "pico_types.h"\r
 \r
 // ----------------------- 68000 CPU -----------------------\r
 #ifdef EMU_C68K\r
@@ -965,22 +955,22 @@ void p32x_schedule_hint(SH2 *sh2, unsigned int m68k_cycles);
 \r
 // 32x/memory.c\r
 extern struct Pico32xMem *Pico32xMem;\r
-unsigned int PicoRead8_32x(unsigned int a);\r
-unsigned int PicoRead16_32x(unsigned int a);\r
-void PicoWrite8_32x(unsigned int a, unsigned int d);\r
-void PicoWrite16_32x(unsigned int a, unsigned int d);\r
+unsigned int PicoRead8_32x(u32 a);\r
+unsigned int PicoRead16_32x(u32 a);\r
+void PicoWrite8_32x(u32 a, u32 d);\r
+void PicoWrite16_32x(u32 a, u32 d);\r
 void PicoMemSetup32x(void);\r
 void Pico32xSwapDRAM(int b);\r
 void Pico32xMemStateLoaded(void);\r
 void p32x_update_banks(void);\r
-void p32x_m68k_poll_event(unsigned int flags);\r
-unsigned int REGPARM(3) p32x_sh2_poll_memory8(unsigned int a, unsigned int d, SH2 *sh2);\r
-unsigned int REGPARM(3) p32x_sh2_poll_memory16(unsigned int a, unsigned int d, SH2 *sh2);\r
-unsigned int REGPARM(3) p32x_sh2_poll_memory32(unsigned int a, unsigned int d, SH2 *sh2);\r
+void p32x_m68k_poll_event(u32 flags);\r
+unsigned int REGPARM(3) p32x_sh2_poll_memory8(u32 a, u32 d, SH2 *sh2);\r
+unsigned int REGPARM(3) p32x_sh2_poll_memory16(u32 a, u32 d, SH2 *sh2);\r
+unsigned int REGPARM(3) p32x_sh2_poll_memory32(u32 a, u32 d, SH2 *sh2);\r
 void *p32x_sh2_get_mem_ptr(unsigned int a, unsigned int *mask, SH2 *sh2);\r
-void p32x_sh2_poll_detect(unsigned int a, SH2 *sh2, unsigned int flags, int maxcnt);\r
-void p32x_sh2_poll_event(SH2 *sh2, unsigned int flags, unsigned int m68k_cycles);\r
-int p32x_sh2_memcpy(unsigned int dst, unsigned int src, int count, int size, SH2 *sh2);\r
+void p32x_sh2_poll_detect(u32 a, SH2 *sh2, u32 flags, int maxcnt);\r
+void p32x_sh2_poll_event(SH2 *sh2, u32 flags, u32 m68k_cycles);\r
+int p32x_sh2_memcpy(u32 dst, u32 src, int count, int size, SH2 *sh2);\r
 \r
 // 32x/draw.c\r
 void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode);\r
@@ -1016,12 +1006,12 @@ void p32x_dreq1_trigger(void);
 void p32x_timers_recalc(void);\r
 void p32x_timer_do(SH2 *sh2, unsigned int m68k_slice);\r
 void sh2_peripheral_reset(SH2 *sh2);\r
-unsigned int REGPARM(2) sh2_peripheral_read8(unsigned int a, SH2 *sh2);\r
-unsigned int REGPARM(2) sh2_peripheral_read16(unsigned int a, SH2 *sh2);\r
-unsigned int REGPARM(2) sh2_peripheral_read32(unsigned int a, SH2 *sh2);\r
-void REGPARM(3) sh2_peripheral_write8(unsigned int a, unsigned int d, SH2 *sh2);\r
-void REGPARM(3) sh2_peripheral_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
-void REGPARM(3) sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
+u32 REGPARM(2) sh2_peripheral_read8(u32 a, SH2 *sh2);\r
+u32 REGPARM(2) sh2_peripheral_read16(u32 a, SH2 *sh2);\r
+u32 REGPARM(2) sh2_peripheral_read32(u32 a, SH2 *sh2);\r
+void REGPARM(3) sh2_peripheral_write8(u32 a, u32 d, SH2 *sh2);\r
+void REGPARM(3) sh2_peripheral_write16(u32 a, u32 d, SH2 *sh2);\r
+void REGPARM(3) sh2_peripheral_write32(u32 a, u32 d, SH2 *sh2);\r
 \r
 #else\r
 #define Pico32xInit()\r

diff --git a/pico/pico_types.h b/pico/pico_types.h
new file mode 100644 (file)
index 0000000..c1a7db8
--- /dev/null
+++ b/pico/pico_types.h
@@ -0,0 +1,16 @@
+#ifndef PICO_TYPES\r
+#define PICO_TYPES\r
+\r
+#include <stdint.h>\r
+\r
+#ifndef UTYPES_DEFINED\r
+typedef uint8_t        u8;\r
+typedef int8_t         s8;\r
+typedef uint16_t       u16;\r
+typedef int16_t        s16;\r
+typedef uint32_t       u32;\r
+typedef int32_t        s32;\r
+#endif\r
+typedef uintptr_t      uptr; /* unsigned pointer-sized int */\r
+\r
+#endif\r