usb: remove Kconfig option USB_UART_CONSOLE #40428
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use same init level and priority as serial drivers. Align priority to the changes in commit ad14505 ("drivers: serial: Refactor drivers to use shared init priority Kconfig") Signed-off-by: Johann Fischer <[email protected]>
Do not change init level and priority of console driver if Kconfig option CONFIG_USB_UART_CONSOLE is enabled because commit 37f4d9b ("usb: cdc_acm: rework cdc_acm_poll_out to non-blocking") changed CDC ACM UART driver so that it more closely mimics the real controller and CDC ACM UART driver now uses the same init level and priority as regular serial driver. Signed-off-by: Johann Fischer <[email protected]>
This sample uses console driver and therefore Kconfig option CONFIG_CONSOLE and CONFIG_UART_CONSOLE are required. Kconfig option CONFIG_USB_UART_CONSOLE no longer has any influence here and should be removed. Signed-off-by: Johann Fischer <[email protected]>
Remove option CONFIG_USB_UART_CONSOLE where it has no influence or enable CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR without taking a detour through CONFIG_USB_UART_CONSOLE. Check the compatibility of chosen property instead of usage of CONFIG_USB_UART_CONSOLE option. Align how to wait for the readiness of CDC ACM UART. Signed-off-by: Johann Fischer <[email protected]>
Remove option CONFIG_USB_UART_CONSOLE where it has no influence or enable CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR without taking a detour through CONFIG_USB_UART_CONSOLE. Check the compatibility of chosen property instead of usage of CONFIG_USB_UART_CONSOLE option. Signed-off-by: Johann Fischer <[email protected]>
These boards try to configure CDC ACM UART as backend used by the console driver. CONFIG_USB_UART_CONSOLE has no more influence to console driver any and can be removed. Signed-off-by: Johann Fischer <[email protected]>
Since there are no more users and dependencies of Kconfig option USB_UART_CONSOLE in the tree, remove the remains and the option USB_UART_CONSOLE. Signed-off-by: Johann Fischer <[email protected]>
jfischer-no
added
area: Drivers
area: UART
jfischer-no
requested review from
carlescufi,
nordic-krch,
anangl and
eobalski
jfischer-no
requested review from
alwa-nordic,
galak,
jakub-uC,
jhedberg,
MaureenHelm,
nashif and
Vudentz
as code owners
github-actions
bot
added
area: Boards
area: Documentation
area: Samples
jhedberg
approved these changes
Nov 17, 2021
nordic-krch
reviewed
Nov 18, 2021
| usb_enable(NULL); | ||
| k_sleep(K_SECONDS(2)); | ||
| #if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_shell_uart), zephyr_cdc_acm_uart) | ||
| const struct device *dev; |
There was a problem hiding this comment.
what about moving this to shell backend. There is a enable function called from shell thread context. You can block there.
zephyr/subsys/shell/backends/shell_uart.c
Line 238 in 525fa76
There was a problem hiding this comment.
However, that will handle shell only and not printk :/ maybe it must stay here or we redirect printk to shell like log is redirected.
There was a problem hiding this comment.
I would like to keep it that way for now. That is consistent with other examples. Also CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR is enabled, waiting here is general for this sample.
nordic-krch
approved these changes
Nov 18, 2021
carlescufi
approved these changes
Nov 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adjust init level and priority of CDC ACM driver to regular serial drivers.
Limit scope of CONFIG_USB_UART_CONSOLE and finally remove this option.
Branched off from #40220