You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by vi...@apache.org on 2021/07/29 05:26:05 UTC

[mynewt-core] branch master updated: sys/console/minimal: Compile `console_out` for UART console only. RTT console has it's own implementation of `console_out` which conflicts if RTT_CONSOLE is used with console/minimal

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 b22aea6  sys/console/minimal: Compile `console_out` for UART console only. RTT console has it's own implementation of `console_out` which conflicts if RTT_CONSOLE is used with console/minimal
     new 15cc93e  Merge pull request #2649 from vikrant-proxy/console-rtt-minimal
b22aea6 is described below

commit b22aea6433dd2663861ed8c2ea56cc229c6c64dd
Author: Vikrant More <vi...@proxy.com>
AuthorDate: Wed Jul 28 22:06:46 2021 -0700

    sys/console/minimal: Compile `console_out` for UART console only. RTT console has it's own implementation of `console_out` which conflicts if RTT_CONSOLE is used with console/minimal
---
 sys/console/minimal/src/console.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/console/minimal/src/console.c b/sys/console/minimal/src/console.c
index 3b7c28f..bc920a4 100644
--- a/sys/console/minimal/src/console.c
+++ b/sys/console/minimal/src/console.c
@@ -134,6 +134,7 @@ end:
     return rc;
 }
 
+#if MYNEWT_VAL(CONSOLE_UART)
 int
 console_out(int c)
 {
@@ -150,6 +151,7 @@ console_out(int c)
 
     return rc;
 }
+#endif
 
 void
 console_prompt_set(const char *prompt, const char *line)