diff --git a/components/net/lwip-1.4.1/src/lwipopts.h b/components/net/lwip-1.4.1/src/lwipopts.h index 312f4f83ec5cc1ef7f2c7e0b9659c16cfc602475..d7a6807cbd8c6f8bd8a85a34a1b5f3212666d6cf 100644 --- a/components/net/lwip-1.4.1/src/lwipopts.h +++ b/components/net/lwip-1.4.1/src/lwipopts.h @@ -218,11 +218,7 @@ #define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT) /* ---------- Memory options ---------- */ -#ifdef RT_USING_ASM_MEMCPY #define MEMCPY(dst,src,len) rt_memcpy(dst,src,len) -#else -#define MEMCPY(dst,src,len) memcpy(dst,src,len) -#endif /* RT_USING_ASM_MEMCPY */ #define SMEMCPY(dst,src,len) MEMCPY(dst,src,len) #define MEM_ALIGNMENT 4 diff --git a/components/net/lwip-2.0.2/src/lwipopts.h b/components/net/lwip-2.0.2/src/lwipopts.h index 9f5d03ebf7198f8962aa3e6ea2fac4fc1ba51333..5c99013d2ed7b98181a904e39737c908e4fc4e00 100644 --- a/components/net/lwip-2.0.2/src/lwipopts.h +++ b/components/net/lwip-2.0.2/src/lwipopts.h @@ -226,11 +226,7 @@ #define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT) /* ---------- Memory options ---------- */ -#ifdef RT_USING_ASM_MEMCPY #define MEMCPY(dst,src,len) rt_memcpy(dst,src,len) -#else -#define MEMCPY(dst,src,len) memcpy(dst,src,len) -#endif /* RT_USING_ASM_MEMCPY */ #define SMEMCPY(dst,src,len) MEMCPY(dst,src,len) #ifdef RT_LWIP_MEM_ALIGNMENT diff --git a/components/net/lwip-2.0.3/src/lwipopts.h b/components/net/lwip-2.0.3/src/lwipopts.h index 9f5d03ebf7198f8962aa3e6ea2fac4fc1ba51333..5c99013d2ed7b98181a904e39737c908e4fc4e00 100644 --- a/components/net/lwip-2.0.3/src/lwipopts.h +++ b/components/net/lwip-2.0.3/src/lwipopts.h @@ -226,11 +226,7 @@ #define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT) /* ---------- Memory options ---------- */ -#ifdef RT_USING_ASM_MEMCPY #define MEMCPY(dst,src,len) rt_memcpy(dst,src,len) -#else -#define MEMCPY(dst,src,len) memcpy(dst,src,len) -#endif /* RT_USING_ASM_MEMCPY */ #define SMEMCPY(dst,src,len) MEMCPY(dst,src,len) #ifdef RT_LWIP_MEM_ALIGNMENT diff --git a/components/net/lwip-2.1.2/src/lwipopts.h b/components/net/lwip-2.1.2/src/lwipopts.h index f5eb177d5d26c3688f9e773f10cd7bc681e502cb..95e88961d2215d20a764e24d39bea3e61874674b 100644 --- a/components/net/lwip-2.1.2/src/lwipopts.h +++ b/components/net/lwip-2.1.2/src/lwipopts.h @@ -238,11 +238,7 @@ #endif /* ---------- Memory options ---------- */ -#ifdef RT_USING_ASM_MEMCPY #define MEMCPY(dst,src,len) rt_memcpy(dst,src,len) -#else -#define MEMCPY(dst,src,len) memcpy(dst,src,len) -#endif /* RT_USING_ASM_MEMCPY */ #define SMEMCPY(dst,src,len) MEMCPY(dst,src,len) #define MEM_ALIGNMENT 4 diff --git a/src/Kconfig b/src/Kconfig index 2bc37cf451dcc618acbc408893f361d95ef5a166..7c22752ed03a55a3145ad80ba904fa1b8988fec9 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -134,14 +134,6 @@ menu "kservice optimization" bool "Enable kservice to use tiny size" default n - config RT_USING_ASM_MEMCPY - bool - default n - - config RT_USING_ASM_MEMSET - bool - default n - config RT_USING_TINY_FFS bool "Enable kservice to use tiny finding first bit set method" default n diff --git a/src/kservice.c b/src/kservice.c index 5d4311507dc9001caeb0590f8d54be134ac45c7e..a44112481627a22d80e914b2c58d99281ec86875 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -115,7 +115,6 @@ int *_rt_errno(void) } RTM_EXPORT(_rt_errno); -#ifndef RT_USING_ASM_MEMSET /** * This function will set the content of memory to specified value. * @@ -128,7 +127,7 @@ RTM_EXPORT(_rt_errno); * * @return The address of source memory. */ -void *rt_memset(void *s, int c, rt_ubase_t count) +RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count) { #ifdef RT_KSERVICE_USING_TINY_SIZE char *xs = (char *)s; @@ -201,9 +200,7 @@ void *rt_memset(void *s, int c, rt_ubase_t count) #endif /* RT_KSERVICE_USING_TINY_SIZE */ } RTM_EXPORT(rt_memset); -#endif /* RT_USING_ASM_MEMSET */ -#ifndef RT_USING_ASM_MEMCPY /** * This function will copy memory content from source address to destination address. * @@ -215,7 +212,7 @@ RTM_EXPORT(rt_memset); * * @return The address of destination memory */ -void *rt_memcpy(void *dst, const void *src, rt_ubase_t count) +RT_WEAK void *rt_memcpy(void *dst, const void *src, rt_ubase_t count) { #ifdef RT_KSERVICE_USING_TINY_SIZE char *tmp = (char *)dst, *s = (char *)src; @@ -287,7 +284,6 @@ void *rt_memcpy(void *dst, const void *src, rt_ubase_t count) #endif /* RT_KSERVICE_USING_TINY_SIZE */ } RTM_EXPORT(rt_memcpy); -#endif /* RT_USING_ASM_MEMCPY */ #ifndef RT_KSERVICE_USING_STDLIB