libc: Remove the duplication lib_xxx macro

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I73c876ed40811c013dad83b8b2aeb7bdc3041913
This commit is contained in:
Xiang Xiao
2021-06-30 20:52:47 -07:00
committed by David Sidrane
parent ee81b5a1d5
commit 1d0ade6fa2
4 changed files with 48 additions and 112 deletions
+46
View File
@@ -28,11 +28,57 @@
#include <nuttx/config.h>
#include <nuttx/fs/fs.h>
#include <nuttx/kmalloc.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* The NuttX C library can be built in two modes: (1) as a standard,
* C-library that can be used by normal, user-space applications, or
* (2) as a special, kernel-mode C-library only used within the OS.
* If NuttX is not being built as separated kernel- and user-space modules,
* then only the first mode is supported.
*/
#if !defined(CONFIG_BUILD_FLAT) && defined(__KERNEL__)
/* Domain-specific allocations */
# define lib_malloc(s) kmm_malloc(s)
# define lib_zalloc(s) kmm_zalloc(s)
# define lib_realloc(p,s) kmm_realloc(p,s)
# define lib_memalign(p,s) kmm_memalign(p,s)
# define lib_free(p) kmm_free(p)
/* User-accessible allocations */
# define lib_umalloc(s) kumm_malloc(s)
# define lib_uzalloc(s) kumm_zalloc(s)
# define lib_urealloc(p,s) kumm_realloc(p,s)
# define lib_umemalign(p,s) kumm_memalign(p,s)
# define lib_ufree(p) kumm_free(p)
#else
/* Domain-specific allocations */
# define lib_malloc(s) malloc(s)
# define lib_zalloc(s) zalloc(s)
# define lib_realloc(p,s) realloc(p,s)
# define lib_memalign(p,s) memalign(p,s)
# define lib_free(p) free(p)
/* User-accessible allocations */
# define lib_umalloc(s) malloc(s)
# define lib_uzalloc(s) zalloc(s)
# define lib_urealloc(p,s) realloc(p,s)
# define lib_umemalign(p,s) memalign(p,s)
# define lib_ufree(p) free(p)
#endif
/****************************************************************************
* Public Data
****************************************************************************/