GitHub-Mirror/bl_mcu_sdk
2
0
Fork 0
mirror of https://github.com/Fishwaldo/bl_mcu_sdk.git synced 2025-07-08 05:48:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fix][util] fix printf, use alias bflb_printf to reduce size

Browse source
This commit is contained in:
jzlv 2022-11-23 10:55:06 +08:00
parent d906c9e306
commit eef2ce183c
3 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utils/CMakeLists.txt
View file

@ -53,14 +53,12 @@ if(CONFIG_VLIBC)
sdk_add_compile_definitions(-DCONFIG_VLIBC_FATFS) sdk_add_compile_definitions(-DCONFIG_VLIBC_FATFS)
endif() endif()
# sdk_add_compile_definitions(-Dprintf=vlibc_printf)
sdk_library_add_sources(vlibc/printf.c) sdk_library_add_sources(vlibc/printf.c)
sdk_library_add_sources(vlibc/syscalls.c) sdk_library_add_sources(vlibc/syscalls.c)
sdk_library_add_sources(vlibc/vlibc_stdio.c) sdk_library_add_sources(vlibc/vlibc_stdio.c)
sdk_library_add_sources(vlibc/vlibc_vsnprintf.c) sdk_library_add_sources(vlibc/vlibc_vsnprintf.c)
sdk_add_include_directories(vlibc) sdk_add_include_directories(vlibc)
else() else()
# sdk_add_compile_definitions(-Dprintf=bflb_printf)
sdk_library_add_sources(libc/vsnprintf.c) sdk_library_add_sources(libc/vsnprintf.c)
sdk_library_add_sources(libc/syscalls.c) sdk_library_add_sources(libc/syscalls.c)
sdk_library_add_sources(libc/printf.c) sdk_library_add_sources(libc/printf.c)

16
utils/libc/printf.c
View file

@ -3,19 +3,10 @@
struct bflb_device_s *console = NULL; struct bflb_device_s *console = NULL;
#ifdef CONFIG_CUSTOM_PRINTF int puts(const char *fmt) __attribute__((alias("bflb_printf")));
int puts(const char *s) int printf(const char *fmt, ...) __attribute__((alias("bflb_printf")));
{
int len = strlen(s);
bflb_uart_put(console, (uint8_t *)s, len); int bflb_printf(const char *fmt, ...)
if (s[len - 1] == '\r') {
bflb_uart_putchar(console, '\n');
}
return len;
}
int printf(const char *fmt, ...)
{ {
char print_buf[128]; char print_buf[128];
uint32_t len; uint32_t len;
@ -31,7 +22,6 @@ int printf(const char *fmt, ...)
return 0; return 0;
} }
#endif
#define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ') #define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ')
void bflb_dump_hex(const void *ptr, uint32_t buflen) void bflb_dump_hex(const void *ptr, uint32_t buflen)

2
utils/libc/syscalls.c
View file

@ -10,7 +10,7 @@ extern struct bflb_device_s *console;
/* Reentrant versions of system calls. */ /* Reentrant versions of system calls. */
/* global errno in RT-Thread */ /* global errno */
static volatile int _sys_errno = 0; static volatile int _sys_errno = 0;
#ifndef _REENT_ONLY #ifndef _REENT_ONLY