fix uart console

378b8dab · Grzegorz Daniluk · e215868d · 378b8dab · 378b8dab
Commit 378b8dab authored Oct 09, 2020 by Grzegorz Daniluk
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

console.c dev/console.c +1 -0

simple_uart.c dev/simple_uart.c +1 -1

No files found.
--- a/dev/console.c
+++ b/dev/console.c
@@ -79,6 +79,7 @@ static int con_rx_internal(struct console_device* dev)
        }
        priv->state = CON_STATE_IDLE;
    }
+    return rx_char;
 }

 static int con_uart_put_string(struct console_device* dev, const char *s)

--- a/dev/simple_uart.c
+++ b/dev/simple_uart.c
@@ -72,7 +72,7 @@ int suart_poll(struct simple_uart_device *dev)

 int suart_read_byte(struct simple_uart_device *dev)
 {
-	if (suart_poll(dev) < 0)
+	if (!suart_poll(dev))
 		return -1;

 	return readl(dev->base + UART_REG_RDR) & 0xff;