diff options
| author | Vic Yang <victoryang@chromium.org> | 2014-11-20 12:43:46 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-21 02:44:07 +0000 |
| commit | b16bcb0eb08167c263aa8b53e23625e690331a7a (patch) | |
| tree | a077c8e6342715d02e63fbb0fe0825860ab8b787 /chip/stm32/usb_console.c | |
| parent | 1728af5b83a09a85945589ef639783ffe035023f (diff) | |
| download | chrome-ec-b16bcb0eb08167c263aa8b53e23625e690331a7a.tar.gz | |
stm32: Do not wait for USB host if USB is disabled
For USB console, we wait for USB host to grab the data before writing
the next chunk of characters. However, if the USB peripheral is
disabled, the current implementation is confused as to whether the host
has grabbed the previous chunk of data.
Fix this by explicitly checking for USB peripheral enabled.
BRANCH=ryu
BUG=None
TEST=Boot on Ryu and check console isn't slow.
Signed-off-by: Vic Yang <victoryang@chromium.org>
Change-Id: I438c95835e56707b7ca1796734f2e47062799f44
Reviewed-on: https://chromium-review.googlesource.com/231115
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'chip/stm32/usb_console.c')
| -rw-r--r-- | chip/stm32/usb_console.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chip/stm32/usb_console.c b/chip/stm32/usb_console.c index 6d81a5fa3c..665568a28a 100644 --- a/chip/stm32/usb_console.c +++ b/chip/stm32/usb_console.c @@ -146,6 +146,9 @@ static int usb_wait_console(void) timestamp_t deadline = get_time(); int wait_time_us = 1; + if (!is_enabled || !usb_is_enabled()) + return EC_SUCCESS; + deadline.val += USB_CONSOLE_TIMEOUT_US; /* |