diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-09-13 11:22:19 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-09-14 00:32:13 +0000 |
| commit | 573e695a69ffd8e1bfc5d8507ebc3dfc3e2647ff (patch) | |
| tree | 15b18c3a5a7e04a3dd4d3ccf8552e85c7e8ef9e7 /common | |
| parent | fa76d68ce9b59b82ef69ed297613c67dd6725964 (diff) | |
| download | chrome-ec-573e695a69ffd8e1bfc5d8507ebc3dfc3e2647ff.tar.gz | |
Simplify uart_tx_start()
All calls to it did
if (uart_tx_stopped())
uart_tx_start();
And that was the only use of uart_tx_stopped(). Merge the functions.
BUG=chrome-os-partner:20485
BRANCH=none
TEST=EC debug console still prints output and accepts commands.
Ctrl+Q pauses output and Ctrl+S resumes it.
Change-Id: I113c64f5fdfc6b02b63034a74b1a3c6c6a76c351
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/169329
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/uart_buffering.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/common/uart_buffering.c b/common/uart_buffering.c index 784e117503..560e783c41 100644 --- a/common/uart_buffering.c +++ b/common/uart_buffering.c @@ -146,8 +146,7 @@ void uart_process_input(void) } else if (c == CTRL('S')) { /* Software flow control - XON */ uart_suspended = 0; - if (uart_tx_stopped()) - uart_tx_start(); + uart_tx_start(); } else if (rx_buf_next != rx_buf_tail) { /* Buffer all other input */ rx_buf[rx_buf_head] = c; @@ -165,7 +164,7 @@ int uart_putc(int c) { int rv = __tx_char(NULL, c); - if (!uart_suspended && uart_tx_stopped()) + if (!uart_suspended) uart_tx_start(); return rv ? EC_ERROR_OVERFLOW : EC_SUCCESS; @@ -179,7 +178,7 @@ int uart_puts(const char *outstr) break; } - if (!uart_suspended && uart_tx_stopped()) + if (!uart_suspended) uart_tx_start(); /* Successful if we consumed all output */ @@ -190,7 +189,7 @@ int uart_vprintf(const char *format, va_list args) { int rv = vfnprintf(__tx_char, NULL, format, args); - if (!uart_suspended && uart_tx_stopped()) + if (!uart_suspended) uart_tx_start(); return rv; @@ -222,7 +221,7 @@ void uart_flush_output(void) * we're in now. */ uart_process_output(); - } else if (uart_tx_stopped()) { + } else { /* * It's possible we switched from a previous context * which was doing a printf() or puts() but hadn't |