summaryrefslogtreecommitdiff
path: root/include/rtthread.h
diff options
context:
space:
mode:
authorMan, Jianting (Meco) <[email protected]>2022-04-08 12:40:36 -0400
committerGitHub <[email protected]>2022-04-09 00:40:36 +0800
commit03823b5016daf7357836170b15851f9855430c55 (patch)
tree6e40ccccb1d58752a749b4f3860b58101cf8cae7 /include/rtthread.h
parenteb2fc60207fc86229460fe1ec066134751014871 (diff)
[kconfig] add 64bit default value for stack size. set tick HZ as 1000 by default (#5778)
* [kconfig] add 64bit default value for stack size. set tick HZ as 1000 by default * 用RT_KSERVICE_USING_STDLIB_MEMXXX代替RT_KSERVICE_USING_STDLIB_MEMCP/MEMSET 将RT_KSERVICE_USING_STDLIB设置为默认开启 * 优化rt_kprintf支持longlong的能力,默认在64位CPU为开启状态 RT_PRINTF_LONGLONG命名不规范,更改为RT_KPRINTF_USING_LONGLONG * fix commit error * fix error * 优化 system 函数 * RT_KSERVICE_USING_STDLIB_MEMXXX->RT_KSERVICE_USING_STDLIB_MEMORY
Diffstat (limited to 'include/rtthread.h')
-rw-r--r--include/rtthread.h20
1 files changed, 8 insertions, 12 deletions
diff --git a/include/rtthread.h b/include/rtthread.h
index 729ee4c405..c45091151c 100644
--- a/include/rtthread.h
+++ b/include/rtthread.h
@@ -599,17 +599,14 @@ int *_rt_errno(void);
int __rt_ffs(int value);
-#ifndef RT_KSERVICE_USING_STDLIB_MEMSET
+#ifndef RT_KSERVICE_USING_STDLIB_MEMORY
void *rt_memset(void *src, int c, rt_ubase_t n);
-#endif /* RT_KSERVICE_USING_STDLIB_MEMSET */
-#ifndef RT_KSERVICE_USING_STDLIB_MEMCPY
void *rt_memcpy(void *dest, const void *src, rt_ubase_t n);
-#endif /* RT_KSERVICE_USING_STDLIB_MEMCPY */
-char *rt_strdup(const char *s);
-
-#ifndef RT_KSERVICE_USING_STDLIB
void *rt_memmove(void *dest, const void *src, rt_size_t n);
rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_size_t count);
+#endif /* RT_KSERVICE_USING_STDLIB_MEMORY */
+
+#ifndef RT_KSERVICE_USING_STDLIB
char *rt_strstr(const char *str1, const char *str2);
rt_int32_t rt_strcasecmp(const char *a, const char *b);
char *rt_strcpy(char *dst, const char *src);
@@ -619,14 +616,12 @@ rt_int32_t rt_strcmp(const char *cs, const char *ct);
rt_size_t rt_strlen(const char *src);
#else
#include <string.h>
-#ifdef RT_KSERVICE_USING_STDLIB_MEMSET
+#ifdef RT_KSERVICE_USING_STDLIB_MEMORY
#define rt_memset(s, c, count) memset(s, c, count)
-#endif /* RT_KSERVICE_USING_STDLIB_MEMSET */
-#ifdef RT_KSERVICE_USING_STDLIB_MEMCPY
#define rt_memcpy(dst, src, count) memcpy(dst, src, count)
-#endif /* RT_KSERVICE_USING_STDLIB_MEMCPY */
#define rt_memmove(dest, src, n) memmove(dest, src, n)
#define rt_memcmp(cs, ct, count) memcmp(cs, ct, count)
+#endif /* RT_KSERVICE_USING_STDLIB_MEMORY */
#define rt_strstr(str1, str2) strstr(str1, str2)
#define rt_strcasecmp(a, b) strcasecmp(a, b)
#define rt_strcpy(dest, src) strcpy(dest, src)
@@ -636,6 +631,8 @@ rt_size_t rt_strlen(const char *src);
#define rt_strlen(src) strlen(src)
#endif /*RT_KSERVICE_USING_STDLIB*/
+char *rt_strdup(const char *s);
+
#if !defined(RT_KSERVICE_USING_STDLIB) || defined(__ARMCC_VERSION)
rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen);
#else
@@ -644,7 +641,6 @@ rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen);
#ifdef __ARMCC_VERSION
/* MDK doesn't have these APIs */
-char* strdup(const char* str);
rt_size_t strnlen(const char *s, rt_size_t maxlen);
#endif /* __ARMCC_VERSION */