Merge pull request #2656 from vikrant-proxy/console-rtt-minmal-fix

sys/console/minimal: Fix RTT console compiler error for minimal console
apache · Aug 7, 2021 · 4aa5ad3 · 4aa5ad3
2 parents b71b1f0 + b14131a
commit 4aa5ad3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/sys/console/minimal/src/console.c b/sys/console/minimal/src/console.c
@@ -134,7 +134,6 @@ console_unlock(void)
     return rc;
 }
 
-#if MYNEWT_VAL(CONSOLE_UART)
 int
 console_out(int c)
 {
@@ -151,7 +150,6 @@ console_out(int c)
 
     return rc;
 }
-#endif
 
 void
 console_prompt_set(const char *prompt, const char *line)

diff --git a/sys/console/minimal/src/rtt_console.c b/sys/console/minimal/src/rtt_console.c
@@ -33,7 +33,7 @@ static struct hal_timer rtt_timer;
 static const char CR = '\r';
 
 int
-console_out(int character)
+console_out_nolock(int character)
 {
     char c = (char)character;