X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=e7f530fe85b4c901669dcaa197788ad783aa4f4c;hb=c13c91cd04513cc6c0d12e9714a5952607323333;hp=76c4812eabeb75f0f5ee288c5ea2c4040534aeb5;hpb=274fcc35aa20e9777a8e09630a94088757384329;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 76c4812..e7f530f 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -32,6 +32,11 @@
 extern "C" {
 #endif
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#endif
 
 // ----------------------- 68000 CPU -----------------------
 #ifdef EMU_C68K
@@ -396,20 +401,21 @@ struct mcd_pcm
 
 struct mcd_misc
 {
-	unsigned short hint_vector;
-	unsigned char  busreq;		// not s68k_regs[1]
-	unsigned char  s68k_pend_ints;
-	unsigned int   state_flags;	// 04
-	unsigned int   stopwatch_base_c;
-	unsigned short m68k_poll_a;
-	unsigned short m68k_poll_cnt;
-	unsigned short s68k_poll_a;
-	unsigned short s68k_poll_cnt;
-	unsigned int   s68k_poll_clk;
-	unsigned char  bcram_reg;	// 18: battery-backed RAM cart register
-	unsigned char  dmna_ret_2m;
-	unsigned short pad3;
-	int pad4[9];
+  unsigned short hint_vector;
+  unsigned char  busreq;          // not s68k_regs[1]
+  unsigned char  s68k_pend_ints;
+  unsigned int   state_flags;     // 04
+  unsigned int   stopwatch_base_c;
+  unsigned short m68k_poll_a;
+  unsigned short m68k_poll_cnt;
+  unsigned short s68k_poll_a;
+  unsigned short s68k_poll_cnt;
+  unsigned int   s68k_poll_clk;
+  unsigned char  bcram_reg;       // 18: battery-backed RAM cart register
+  unsigned char  dmna_ret_2m;
+  unsigned char  need_sync;
+  unsigned char  pad3;
+  int pad4[9];
 };
 
 typedef struct
@@ -433,15 +439,7 @@ typedef struct
     unsigned char pcm_ram[0x10000];
     unsigned char pcm_ram_b[0x10][0x1000];
   };
-  union {
-    unsigned char s68k_regs[0x200];		// 110000: GA, not CPU regs
-    union {
-      struct {
-        unsigned char h;
-        unsigned char l;
-      } byte;
-    } regs[0x200/2];
-  };
+  unsigned char s68k_regs[0x200];		// 110000: GA, not CPU regs
   unsigned char bram[0x2000];			// 110200: 8K
   struct mcd_misc m;				// 112200: misc
   struct mcd_pcm pcm;				// 112240:
@@ -775,7 +773,7 @@ PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a);
 extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);
 
 // misc.c
-PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count);
+PICO_INTERNAL_ASM void pmemcpy16(unsigned short *dest, unsigned short *src, int count);
 PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count);
 PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count
 PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);
@@ -914,7 +912,7 @@ void REGPARM(3) sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2)
 #endif
 
 /* avoid dependency on newer glibc */
-static __inline int isspace_(int c)
+static INLINE int isspace_(int c)
 {
 	return (0x09 <= c && c <= 0x0d) || c == ' ';
 }