make memcpy32/memset32 take void *

[picodrive.git] / pico / misc.c

diff --git a/pico/misc.c b/pico/misc.c
index f9e85cd..a500ac8 100644 (file)
--- a/pico/misc.c
+++ b/pico/misc.c
@@ -125,21 +125,26 @@ PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count)
 }\r
 \r
 #ifndef _ASM_MISC_C_AMIPS\r
-PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count)\r
+PICO_INTERNAL_ASM void memcpy32(void *dest_in, const void *src_in, int count)\r
 {\r
-       intblock *bd = (intblock *) dest, *bs = (intblock *) src;\r
+       const intblock *bs = (intblock *) src_in;\r
+       intblock *bd = (intblock *) dest_in;\r
+       const int *src;\r
+       int *dest;\r
 \r
        for (; count >= sizeof(*bd)/4; count -= sizeof(*bd)/4)\r
                *bd++ = *bs++;\r
 \r
-       dest = (int *)bd; src = (int *)bs;\r
+       dest = (int *)bd; src = (const int *)bs;\r
        while (count--)\r
                *dest++ = *src++;\r
 }\r
 \r
 \r
-PICO_INTERNAL_ASM void memset32(int *dest, int c, int count)\r
+PICO_INTERNAL_ASM void memset32(void *dest_in, int c, int count)\r
 {\r
+       int *dest = dest_in;\r
+\r
        for (; count >= 8; count -= 8, dest += 8)\r
                dest[0] = dest[1] = dest[2] = dest[3] =\r
                dest[4] = dest[5] = dest[6] = dest[7] = c;\r