2 files changed, 42 insertions, 9 deletions

diff --git a/src/console/console.c b/src/console/console.c
index 67da10794e..5b8a872e0e 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -25,28 +25,35 @@ void console_hw_init(void)
 	__system76_ec_init();
 }
 
-void console_tx_byte(unsigned char byte)
+void console_interactive_tx_byte(unsigned char byte, void *data_unused)
 {
-	__cbmemc_tx_byte(byte);
-	__spkmodem_tx_byte(byte);
-	__qemu_debugcon_tx_byte(byte);
-
-	/* Some consoles want newline conversion
-	 * to keep terminals happy.
-	 */
 	if (byte == '\n') {
+		/* Some consoles want newline conversion to keep terminals happy. */
 		__uart_tx_byte('\r');
 		__usb_tx_byte('\r');
 	}
 
+	__spkmodem_tx_byte(byte);
+	__qemu_debugcon_tx_byte(byte);
 	__uart_tx_byte(byte);
 	__ne2k_tx_byte(byte);
 	__usb_tx_byte(byte);
 	__spiconsole_tx_byte(byte);
-	__flashconsole_tx_byte(byte);
 	__system76_ec_tx_byte(byte);
 }
 
+void console_stored_tx_byte(unsigned char byte, void *data_unused)
+{
+	__flashconsole_tx_byte(byte);
+	__cbmemc_tx_byte(byte);
+}
+
+void console_tx_byte(unsigned char byte)
+{
+	console_interactive_tx_byte(byte, NULL);
+	console_stored_tx_byte(byte, NULL);
+}
+
 void console_tx_flush(void)
 {
 	__uart_tx_flush();
diff --git a/src/console/printk.c b/src/console/printk.c
index ef3d29f490..ddd14c0589 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -67,9 +67,35 @@ union log_state {
 	};
 };
 
+static void wrap_interactive_printf(const char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	vtxprintf(console_interactive_tx_byte, fmt, args, NULL);
+}
+
+static void line_start(union log_state state)
+{
+	if (state.level > BIOS_LOG_PREFIX_MAX_LEVEL)
+		return;
+	if (state.speed == CONSOLE_LOG_FAST)
+		return;
+
+	/* Interactive consoles get a `[DEBUG]  ` style readable prefix. */
+	wrap_interactive_printf(BIOS_LOG_PREFIX_PATTERN, bios_log_prefix[state.level]);
+}
+
 static void wrap_putchar(unsigned char byte, void *data)
 {
 	union log_state state = { .as_ptr = data };
+	static bool line_started = false;
+
+	if (byte == '\n') {
+		line_started = false;
+	} else if (!line_started) {
+		line_start(state);
+		line_started = true;
+	}
 
 	if (state.speed == CONSOLE_LOG_FAST)
 		__cbmemc_tx_byte(byte);