make memcpy32/memset32 take void *

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 48d5237..c85319c 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -434,15 +434,7 @@ typedef struct
     unsigned char pcm_ram[0x10000];\r
     unsigned char pcm_ram_b[0x10][0x1000];\r
   };\r
-  union {\r
-    unsigned char s68k_regs[0x200];            // 110000: GA, not CPU regs\r
-    union {\r
-      struct {\r
-        unsigned char h;\r
-        unsigned char l;\r
-      } byte;\r
-    } regs[0x200/2];\r
-  };\r
+  unsigned char s68k_regs[0x200];              // 110000: GA, not CPU regs\r
   unsigned char bram[0x2000];                  // 110200: 8K\r
   struct mcd_misc m;                           // 112200: misc\r
   struct mcd_pcm pcm;                          // 112240:\r
@@ -778,8 +770,8 @@ extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, u
 // misc.c\r
 PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count);\r
 PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count);\r
-PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count\r
-PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);\r
+PICO_INTERNAL_ASM void memcpy32(void *dest, const void *src, int count); // 32bit word count\r
+PICO_INTERNAL_ASM void memset32(void *dest, int c, int count);\r
 \r
 // eeprom.c\r
 void EEPROM_write8(unsigned int a, unsigned int d);\r