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
David Sidrane
parent
ee81b5a1d5
commit
1d0ade6fa2
@ -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
|
||||
****************************************************************************/
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
#include <semaphore.h>
|
||||
|
||||
#include <nuttx/lib/lib.h>
|
||||
#include <nuttx/kmalloc.h>
|
||||
#include <nuttx/streams.h>
|
||||
|
||||
/****************************************************************************
|
||||
@ -52,51 +51,6 @@
|
||||
# define CONFIG_LIB_HOMEDIR "/"
|
||||
#endif
|
||||
|
||||
/* 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
|
||||
|
||||
#define LIB_BUFLEN_UNKNOWN INT_MAX
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
@ -33,55 +33,13 @@
|
||||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include <nuttx/kmalloc.h>
|
||||
#include <nuttx/lib/lib.h>
|
||||
#include <nuttx/streams.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* The NuttX NX library can be build 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 NX-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_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_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_ufree(p) free(p)
|
||||
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Public Types
|
||||
****************************************************************************/
|
||||
|
||||
@ -26,29 +26,7 @@
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
//***************************************************************************
|
||||
// Definitions
|
||||
//***************************************************************************
|
||||
|
||||
// The NuttX C library an be build in two modes: (1) as a standard, C-libary
|
||||
// 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__)
|
||||
# include <nuttx/kmalloc.h>
|
||||
# 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_free(p) kmm_free(p)
|
||||
#else
|
||||
# include <cstdlib>
|
||||
# define lib_malloc(s) malloc(s)
|
||||
# define lib_zalloc(s) zalloc(s)
|
||||
# define lib_realloc(p,s) realloc(p,s)
|
||||
# define lib_free(p) free(p)
|
||||
#endif
|
||||
#include <nuttx/lib/lib.h>
|
||||
|
||||
//***************************************************************************
|
||||
// Public Types
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user