|
@@ -25,7 +25,7 @@
|
|
|
|
|
|
#ifdef RT_USING_MODULE
|
|
|
#include <dlmodule.h>
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_MODULE */
|
|
|
|
|
|
/* use precision */
|
|
|
#define RT_PRINTF_PRECISION
|
|
@@ -194,7 +194,7 @@ RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count)
|
|
|
#undef LBLOCKSIZE
|
|
|
#undef UNALIGNED
|
|
|
#undef TOO_SMALL
|
|
|
-#endif
|
|
|
+#endif /* RT_KSERVICE_USING_TINY_SIZE */
|
|
|
}
|
|
|
RTM_EXPORT(rt_memset);
|
|
|
|
|
@@ -277,7 +277,7 @@ RT_WEAK void *rt_memcpy(void *dst, const void *src, rt_ubase_t count)
|
|
|
#undef BIGBLOCKSIZE
|
|
|
#undef LITTLEBLOCKSIZE
|
|
|
#undef TOO_SMALL
|
|
|
-#endif
|
|
|
+#endif /* RT_KSERVICE_USING_TINY_SIZE */
|
|
|
}
|
|
|
RTM_EXPORT(rt_memcpy);
|
|
|
|
|
@@ -509,7 +509,7 @@ rt_size_t rt_strlen(const char *s)
|
|
|
}
|
|
|
RTM_EXPORT(rt_strlen);
|
|
|
|
|
|
-#endif /*RT_KSERVICE_USING_STDLIB*/
|
|
|
+#endif /* RT_KSERVICE_USING_STDLIB */
|
|
|
|
|
|
#ifdef RT_USING_HEAP
|
|
|
/**
|
|
@@ -535,7 +535,7 @@ RTM_EXPORT(rt_strdup);
|
|
|
#if defined(__CC_ARM) || defined(__CLANG_ARM)
|
|
|
char *strdup(const char *s) __attribute__((alias("rt_strdup")));
|
|
|
#endif
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_HEAP */
|
|
|
|
|
|
/**
|
|
|
* This function will show the version of rt-thread rtos
|
|
@@ -591,7 +591,7 @@ rt_inline int divide(long *n, int base)
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
|
|
|
rt_inline int skip_atoi(const char **s)
|
|
|
{
|
|
@@ -617,7 +617,7 @@ static char *print_number(char *buf,
|
|
|
long long num,
|
|
|
#else
|
|
|
long num,
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
int base,
|
|
|
int s,
|
|
|
int precision,
|
|
@@ -629,18 +629,18 @@ static char *print_number(char *buf,
|
|
|
long long num,
|
|
|
#else
|
|
|
long num,
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
int base,
|
|
|
int s,
|
|
|
int type)
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
{
|
|
|
char c, sign;
|
|
|
#ifdef RT_PRINTF_LONGLONG
|
|
|
char tmp[32];
|
|
|
#else
|
|
|
char tmp[16];
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
int precision_bak = precision;
|
|
|
const char *digits;
|
|
|
static const char small_digits[] = "0123456789abcdef";
|
|
@@ -679,7 +679,7 @@ static char *print_number(char *buf,
|
|
|
else if (base == 8)
|
|
|
size--;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_SPECIAL */
|
|
|
|
|
|
i = 0;
|
|
|
if (num == 0)
|
|
@@ -696,7 +696,7 @@ static char *print_number(char *buf,
|
|
|
size -= precision;
|
|
|
#else
|
|
|
size -= i;
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
|
|
|
if (!(type & (ZEROPAD | LEFT)))
|
|
|
{
|
|
@@ -742,7 +742,7 @@ static char *print_number(char *buf,
|
|
|
++ buf;
|
|
|
}
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_SPECIAL */
|
|
|
|
|
|
/* no align to the left */
|
|
|
if (!(type & LEFT))
|
|
@@ -762,7 +762,7 @@ static char *print_number(char *buf,
|
|
|
*buf = '0';
|
|
|
++ buf;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
|
|
|
/* put number in the temporary buffer */
|
|
|
while (i-- > 0 && (precision_bak != 0))
|
|
@@ -791,7 +791,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
unsigned long long num;
|
|
|
#else
|
|
|
rt_uint32_t num;
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
int i, len;
|
|
|
char *str, *end, c;
|
|
|
const char *s;
|
|
@@ -803,7 +803,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
|
|
|
#ifdef RT_PRINTF_PRECISION
|
|
|
int precision; /* min. # of digits for integers and max for a string */
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
|
|
|
str = buf;
|
|
|
end = buf + size;
|
|
@@ -870,14 +870,14 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
}
|
|
|
if (precision < 0) precision = 0;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
/* get the conversion qualifier */
|
|
|
qualifier = 0;
|
|
|
#ifdef RT_PRINTF_LONGLONG
|
|
|
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L')
|
|
|
#else
|
|
|
if (*fmt == 'h' || *fmt == 'l')
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
{
|
|
|
qualifier = *fmt;
|
|
|
++ fmt;
|
|
@@ -887,7 +887,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
qualifier = 'L';
|
|
|
++ fmt;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
}
|
|
|
|
|
|
/* the default base */
|
|
@@ -925,7 +925,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
for (len = 0; (len != field_width) && (s[len] != '\0'); len++);
|
|
|
#ifdef RT_PRINTF_PRECISION
|
|
|
if (precision > 0 && len > precision) len = precision;
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
|
|
|
if (!(flags & LEFT))
|
|
|
{
|
|
@@ -964,7 +964,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
str = print_number(str, end,
|
|
|
(long)va_arg(args, void *),
|
|
|
16, field_width, flags);
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
continue;
|
|
|
|
|
|
case '%':
|
|
@@ -1010,7 +1010,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
else if (qualifier == 'l')
|
|
|
#else
|
|
|
if (qualifier == 'l')
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_LONGLONG */
|
|
|
{
|
|
|
num = va_arg(args, rt_uint32_t);
|
|
|
if (flags & SIGN) num = (rt_int32_t)num;
|
|
@@ -1029,7 +1029,7 @@ rt_int32_t rt_vsnprintf(char *buf,
|
|
|
str = print_number(str, end, num, base, field_width, precision, flags);
|
|
|
#else
|
|
|
str = print_number(str, end, num, base, field_width, flags);
|
|
|
-#endif
|
|
|
+#endif /* RT_PRINTF_PRECISION */
|
|
|
}
|
|
|
|
|
|
if (size > 0)
|
|
@@ -1152,7 +1152,7 @@ rt_device_t rt_console_set_device(const char *name)
|
|
|
return old_device;
|
|
|
}
|
|
|
RTM_EXPORT(rt_console_set_device);
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_DEVICE */
|
|
|
|
|
|
RT_WEAK void rt_hw_console_output(const char *str)
|
|
|
{
|
|
@@ -1184,7 +1184,7 @@ void rt_kputs(const char *str)
|
|
|
}
|
|
|
#else
|
|
|
rt_hw_console_output(str);
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_DEVICE */
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1222,11 +1222,11 @@ RT_WEAK void rt_kprintf(const char *fmt, ...)
|
|
|
}
|
|
|
#else
|
|
|
rt_hw_console_output(rt_log_buf);
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_DEVICE */
|
|
|
va_end(args);
|
|
|
}
|
|
|
RTM_EXPORT(rt_kprintf);
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_CONSOLE */
|
|
|
|
|
|
#ifdef RT_USING_HEAP
|
|
|
/**
|
|
@@ -1292,7 +1292,7 @@ void rt_free_align(void *ptr)
|
|
|
rt_free(real_ptr);
|
|
|
}
|
|
|
RTM_EXPORT(rt_free_align);
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_HEAP */
|
|
|
|
|
|
#ifndef RT_USING_CPU_FFS
|
|
|
const rt_uint8_t __lowest_bit_bitmap[] =
|
|
@@ -1340,7 +1340,7 @@ int __rt_ffs(int value)
|
|
|
|
|
|
return __lowest_bit_bitmap[(value & 0xff000000) >> 24] + 25;
|
|
|
}
|
|
|
-#endif
|
|
|
+#endif /* RT_USING_CPU_FFS */
|
|
|
|
|
|
#ifdef RT_DEBUG
|
|
|
/* RT_ASSERT(EX)'s hook */
|
|
@@ -1377,7 +1377,7 @@ void rt_assert_handler(const char *ex_string, const char *func, rt_size_t line)
|
|
|
dlmodule_exit(-1);
|
|
|
}
|
|
|
else
|
|
|
-#endif
|
|
|
+#endif /*RT_USING_MODULE*/
|
|
|
{
|
|
|
rt_kprintf("(%s) assertion failed at function:%s, line number:%d \n", ex_string, func, line);
|
|
|
while (dummy == 0);
|