michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: switch to cbprintf as basis for printf functionality

Browse source 
Replace use of z_prf with cbprintf.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-11-03 15:14:16 -06:00 • committed by Anas Nashif
commit 125c5752a6
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
subsys/shell/shell_fprintf.c
View file

@ -6,13 +6,7 @@
#include <shell/shell_fprintf.h> #include <shell/shell_fprintf.h>
#include <shell/shell.h> #include <shell/shell.h>
#include <sys/cbprintf.h>
#ifdef CONFIG_NEWLIB_LIBC
typedef int (*out_func_t)(int c, void *ctx);
extern void z_vprintk(out_func_t out, void *ctx, const char *fmt, va_list ap);
#else
extern int z_prf(int (*func)(), void *dest, char *format, va_list vargs);
#endif
static int out_func(int c, void *ctx) static int out_func(int c, void *ctx)
{ {
@ -39,11 +33,7 @@ static int out_func(int c, void *ctx)
void shell_fprintf_fmt(const struct shell_fprintf *sh_fprintf, void shell_fprintf_fmt(const struct shell_fprintf *sh_fprintf,
const char *fmt, va_list args) const char *fmt, va_list args)
{ {
#if !defined(CONFIG_NEWLIB_LIBC) && !defined(CONFIG_ARCH_POSIX) (void)cbvprintf(out_func, (void *)sh_fprintf, fmt, args);
(void)z_prf(out_func, (void *)sh_fprintf, (char *)fmt, args);
#else
z_vprintk(out_func, (void *)sh_fprintf, fmt, args);
#endif
if (sh_fprintf->ctrl_blk->autoflush) { if (sh_fprintf->ctrl_blk->autoflush) {
shell_fprintf_buffer_flush(sh_fprintf); shell_fprintf_buffer_flush(sh_fprintf);