Skip to content

Fix STDIO retarget implementation for CLANG and IAR to support stdin echo and stderr/out crlf extension #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VladimirUmek merged 1 commit into from
Jan 27, 2026
Merged

Fix STDIO retarget implementation for CLANG and IAR to support stdin echo and stderr/out crlf extension #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions source/core/clang/retarget_syscalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 ARM Limited or its affiliates. All rights reserved.
* Copyright (C) 2023-2026 ARM Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
Expand All @@ -22,14 +22,23 @@

#ifdef RTE_CMSIS_Compiler_STDERR
#include "retarget_stderr.h"
#ifdef RTE_CMSIS_Compiler_STDERR_UART_CMSIS
#include "stderr_cmsis_uart_config.h"
#endif
#endif

#ifdef RTE_CMSIS_Compiler_STDIN
#include "retarget_stdin.h"
#ifdef RTE_CMSIS_Compiler_STDIN_UART_CMSIS
#include "stdin_cmsis_uart_config.h"
#endif
#endif

#ifdef RTE_CMSIS_Compiler_STDOUT
#include "retarget_stdout.h"
#ifdef RTE_CMSIS_Compiler_STDOUT_UART_CMSIS
#include "stdout_cmsis_uart_config.h"
#endif
#endif

#if defined(RTE_CMSIS_Compiler_STDIN)
Expand All @@ -39,8 +48,16 @@
\return The next character from the input, or -1 on read error.
*/
static int stdin_getc(FILE *file) {
int ch;
(void)file;
return stdin_getchar();

ch = stdin_getchar();
#if (STDIN_ECHO != 0)
if (ch >= 0) {
stdout_putchar(ch);
}
#endif
return (ch);
}

static FILE __stdin = FDEV_SETUP_STREAM(NULL,
Expand All @@ -58,9 +75,15 @@ FILE *const stdin = &__stdin;
\param[in] ch Character to output
\return The character written, or -1 on write error.
*/
static int stdout_putc(char c, FILE *file) {
static int stdout_putc(char ch, FILE *file) {
(void)file;
return stdout_putchar(c);

#if (STDOUT_CR_LF != 0)
if (ch == '\n') {
stdout_putchar('\r');
}
#endif
return stdout_putchar(ch);
}

static FILE __stdout = FDEV_SETUP_STREAM(stdout_putc,
Expand All @@ -78,9 +101,16 @@ FILE *const stdout = &__stdout;
\param[in] ch Character to output
\return The character written, or -1 on write error.
*/
static int stderr_putc(char c, FILE *file) {
static int stderr_putc(char ch, FILE *file) {
(void)file;
return stderr_putchar(c);

#if (STDERR_CR_LF != 0)
if (ch == '\n') {
stderr_putchar('\r');
}
#endif

return stderr_putchar(ch);
}

static FILE __stderr = FDEV_SETUP_STREAM(stderr_putc,
Expand Down
24 changes: 23 additions & 1 deletion source/core/iar/retarget_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 ARM Limited or its affiliates. All rights reserved.
* Copyright (C) 2023-2026 ARM Limited or its affiliates. All rights reserved.
*
* SPDX-License-Identifier: Apache-2.0
*
Expand Down Expand Up @@ -27,14 +27,23 @@

#ifdef RTE_CMSIS_Compiler_STDERR
#include "retarget_stderr.h"
#ifdef RTE_CMSIS_Compiler_STDERR_UART_CMSIS
#include "stderr_cmsis_uart_config.h"
#endif
#endif

#ifdef RTE_CMSIS_Compiler_STDIN
#include "retarget_stdin.h"
#ifdef RTE_CMSIS_Compiler_STDIN_UART_CMSIS
#include "stdin_cmsis_uart_config.h"
#endif
#endif

#ifdef RTE_CMSIS_Compiler_STDOUT
#include "retarget_stdout.h"
#ifdef RTE_CMSIS_Compiler_STDOUT_UART_CMSIS
#include "stdout_cmsis_uart_config.h"
#endif
#endif

#if defined(RTE_CMSIS_Compiler_STDIN) || defined(RTE_CMSIS_Compiler_File_Interface)
Expand All @@ -52,6 +61,9 @@ size_t __read(int handle, unsigned char *buf, size_t bufSize)
break;
}
*buf++ = (unsigned char)c;
#if (STDIN_ECHO != 0)
stdout_putchar(c);
#endif
nChars++;
}
return nChars;
Expand Down Expand Up @@ -86,6 +98,11 @@ size_t __write(int handle, const unsigned char *buf, size_t bufSize)
if (handle == _LLIO_STDOUT) {
for (size_t i = bufSize; i > 0; --i)
{
#if (STDOUT_CR_LF != 0)
if (*buf == '\n') {
stdout_putchar('\r');
}
#endif
stdout_putchar(*buf++);
}
return bufSize;
Expand All @@ -96,6 +113,11 @@ size_t __write(int handle, const unsigned char *buf, size_t bufSize)
if (handle == _LLIO_STDERR) {
for (size_t i = bufSize; i > 0; --i)
{
#if (STDERR_CR_LF != 0)
if (*buf == '\n') {
stderr_putchar('\r');
}
#endif
stderr_putchar(*buf);
++buf;
}
Expand Down
Loading