projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Define AO_LOG_FORMAT in */ao_pins.h. Use in ao_cmd.c
[fw/altos]
/
src
/
cc1111
/
ao_string.c
diff --git
a/src/cc1111/ao_string.c
b/src/cc1111/ao_string.c
index daa5c14b2636b9d709e4b926f5ba87a8290efb56..dd62ca3d4ab43cdae87be4689ac44a0b1e58cf7f 100644
(file)
--- a/
src/cc1111/ao_string.c
+++ b/
src/cc1111/ao_string.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,26
+19,33
@@
#include "ao.h"
void
#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
}
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
}
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--) {
{
while (count--) {
- int8_t d = *
a++ - *b++
;
+ int8_t d = *
(__xdata int8_t *) a - *(__xdata int8_t *) b
;
if (d)
return d;
if (d)
return d;
+ a = (__xdata int8_t *) a + 1;
+ b = (__xdata int8_t *) b + 1;
}
return 0;
}
}
return 0;
}