[mynewt-core] branch master updated: sys/console/minimal: Revert changes in commit b22aea6433dd2663861ed8c2ea56cc229c6c64dd. Instead rename `console_out` to `console_out_nolock` in rtt_console.c

[vipulrahane]

This is an automated email from the ASF dual-hosted git repository.

vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new b14131a  sys/console/minimal: Revert changes in commit 
b22aea6433dd2663861ed8c2ea56cc229c6c64dd. Instead rename `console_out` to 
`console_out_nolock` in rtt_console.c
     new 4aa5ad3  Merge pull request #2656 from 
vikrant-proxy/console-rtt-minmal-fix
b14131a is described below

commit b14131aa11797fe76e5fab39dddd00d2738ec569
Author: Vikrant More <vikr...@proxy.com>
AuthorDate: Sat Aug 7 08:12:50 2021 -0700

    sys/console/minimal: Revert changes in commit 
b22aea6433dd2663861ed8c2ea56cc229c6c64dd. Instead rename `console_out` to 
`console_out_nolock` in rtt_console.c
---
 sys/console/minimal/src/console.c     | 2 --
 sys/console/minimal/src/rtt_console.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sys/console/minimal/src/console.c 
b/sys/console/minimal/src/console.c
index bc920a4..3b7c28f 100644
--- a/sys/console/minimal/src/console.c
+++ b/sys/console/minimal/src/console.c
@@ -134,7 +134,6 @@ end:
     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
index af66f1f..711f0a3 100644
--- 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;