X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_string.c;h=85d6383e878c321b1aeb598b44eab63fb318a54d;hp=daa5c14b2636b9d709e4b926f5ba87a8290efb56;hb=31f5a02654cbf172beed25f4c518dfb7be8c714e;hpb=65873a3ad1d8e8b5ec002be2576c6f496543306a

diff --git a/src/cc1111/ao_string.c b/src/cc1111/ao_string.c
index daa5c14b..85d6383e 100644
--- a/src/cc1111/ao_string.c
+++ b/src/cc1111/ao_string.c
@@ -18,26 +18,33 @@
 #include "ao.h"
 
 void
-_ao_xmemcpy(__xdata uint8_t *dst, __xdata uint8_t *src, uint8_t count)
+_ao_xmemcpy(__xdata void *dst, __xdata void *src, uint16_t count)
 {
-	while (count--)
-		*dst++ = *src++;
+	while (count--) {
+		*(__xdata uint8_t *) dst = *(__xdata uint8_t *) src;
+		dst = (__xdata uint8_t *) dst + 1;
+		src = (__xdata uint8_t *) src + 1;
+	}
 }
 
 void
-_ao_xmemset(__xdata uint8_t *dst, uint8_t v, uint8_t count)
+_ao_xmemset(__xdata void *dst, uint8_t v, uint16_t count)
 {
-	while (count--)
-		*dst++ = v;
+	while (count--) {
+		*(__xdata uint8_t *) dst = v;
+		dst = (__xdata uint8_t *) dst + 1;
+	}
 }
 
 int8_t
-_ao_xmemcmp(__xdata uint8_t *a, __xdata uint8_t *b, uint8_t count)
+_ao_xmemcmp(__xdata void *a, __xdata void *b, uint16_t count)
 {
 	while (count--) {
-		int8_t	d = *a++ - *b++;
+		int8_t	d = *(__xdata int8_t *) a - *(__xdata int8_t *) b;
 		if (d)
 			return d;
+		a = (__xdata int8_t *) a + 1;
+		b = (__xdata int8_t *) b + 1;
 	}
 	return 0;
 }