michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: console: fix USB initialization

Browse source 
Initialize USB even if USB_UART_DTR_WAIT is not enabled.

Fixes: #25811

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
This commit is contained in:
Johann Fischer 2020-06-02 10:32:14 +02:00 • committed by Carles Cufí
commit 6da7e41592
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/console/uart_console.c
View file

@ -601,7 +601,7 @@ static int uart_console_init(struct device *arg)
__ASSERT_NO_MSG(uart_console_dev); __ASSERT_NO_MSG(uart_console_dev);
#if defined(CONFIG_USB_UART_CONSOLE) && defined(CONFIG_USB_UART_DTR_WAIT) #if defined(CONFIG_USB_UART_CONSOLE)
int ret; int ret;
ret = usb_enable(NULL); ret = usb_enable(NULL);
@ -609,6 +609,7 @@ static int uart_console_init(struct device *arg)
return ret; return ret;
} }
#if defined(CONFIG_USB_UART_DTR_WAIT)
while (1) { while (1) {
u32_t dtr = 0U; u32_t dtr = 0U;
@ -618,6 +619,7 @@ static int uart_console_init(struct device *arg)
} }
} }
k_busy_wait(1000000); k_busy_wait(1000000);
#endif
#endif #endif
uart_console_hook_install(); uart_console_hook_install();