commit 16c4aef4be253d70ec6f39c09032a309d8ea97cf
author Chris Frantz <cfrantz@google.com> Wed Jul 20 15:00:22 2022 -0700
committer cfrantz <frantzcj+github@gmail.com> Thu Jul 21 08:46:55 2022 -0700
tree ee99c276eccc07a10a8b06c46747107839607ea2
parent 45f56546c54cae125a8c7bd077cdf596adb27940

[ottool] Handle line endings in the console

Code running in the OpenTitan cpu may not always emit CRLF at the end of
lines.  Convert instances of LF to CRLF in the client.

Signed-off-by: Chris Frantz <cfrantz@google.com>

sw/host/opentitanlib/src/uart/console.rs

diff --git a/sw/host/opentitanlib/src/uart/console.rs b/sw/host/opentitanlib/src/uart/console.rs
index d28caca..8151225 100644
--- a/sw/host/opentitanlib/src/uart/console.rs
+++ b/sw/host/opentitanlib/src/uart/console.rs
@@ -87,10 +87,14 @@
                     .map_or(Ok(()), |out| out.write_fmt(format_args!("[{}]", t)))?;
                 self.newline = false;
             }
-            stdout
-                .as_mut()
-                .map_or(Ok(()), |out| out.write_all(&buf[i..i + 1]))?;
             self.newline = buf[i] == b'\n';
+            stdout.as_mut().map_or(Ok(()), |out| {
+                out.write_all(if self.newline {
+                    b"\r\n"
+                } else {
+                    &buf[i..i + 1]
+                })
+            })?;
         }
         stdout.as_mut().map_or(Ok(()), |out| out.flush())?;