mirror of
https://github.com/zephyrproject-rtos/zephyr
synced 2025-08-12 09:25:46 +00:00
e812ee6c21
shell_fprintf requires that formatted output be emitted with a putchar()-like output function. Newlib does not provide such a capability. Zephyr provides two solutions: z_prf() which is part of minimal libc and handles floating point formatting, and z_vprintk() which is core and does not support floating point. Move z_prf() out of minimal libc into the core lib area, and use it unconditionally in the shell. Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
51 lines
1.2 KiB
C
51 lines
1.2 KiB
C
/*
|
|
* Copyright (c) 2018 Nordic Semiconductor ASA
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <shell/shell_fprintf.h>
|
|
#include <shell/shell.h>
|
|
|
|
extern int z_prf(int (*func)(), void *dest, char *format, va_list vargs);
|
|
|
|
static int out_func(int c, void *ctx)
|
|
{
|
|
const struct shell_fprintf *sh_fprintf;
|
|
const struct shell *shell;
|
|
|
|
sh_fprintf = (const struct shell_fprintf *)ctx;
|
|
shell = (const struct shell *)sh_fprintf->user_ctx;
|
|
|
|
if ((shell->shell_flag == SHELL_FLAG_OLF_CRLF) && (c == '\n')) {
|
|
(void)out_func('\r', ctx);
|
|
}
|
|
|
|
sh_fprintf->buffer[sh_fprintf->ctrl_blk->buffer_cnt] = (uint8_t)c;
|
|
sh_fprintf->ctrl_blk->buffer_cnt++;
|
|
|
|
if (sh_fprintf->ctrl_blk->buffer_cnt == sh_fprintf->buffer_size) {
|
|
shell_fprintf_buffer_flush(sh_fprintf);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void shell_fprintf_fmt(const struct shell_fprintf *sh_fprintf,
|
|
const char *fmt, va_list args)
|
|
{
|
|
(void)z_prf(out_func, (void *)sh_fprintf, (char *)fmt, args);
|
|
|
|
if (sh_fprintf->ctrl_blk->autoflush) {
|
|
shell_fprintf_buffer_flush(sh_fprintf);
|
|
}
|
|
}
|
|
|
|
|
|
void shell_fprintf_buffer_flush(const struct shell_fprintf *sh_fprintf)
|
|
{
|
|
sh_fprintf->fwrite(sh_fprintf->user_ctx, sh_fprintf->buffer,
|
|
sh_fprintf->ctrl_blk->buffer_cnt);
|
|
sh_fprintf->ctrl_blk->buffer_cnt = 0;
|
|
}
|