Skip to content

usb: patches to resolve issues around Kconfig option USB_UART_CONSOLE #40220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

usb: patches to resolve issues around Kconfig option USB_UART_CONSOLE #40220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ee570c8
usb: cdc_acm: use same init level and priority as serial drivers
jfischer-no Nov 9, 2021
b0dc396
usb: limit scope of CONFIG_USB_UART_CONSOLE
jfischer-no Nov 9, 2021
623ace0
usb: deprecate Kconfig option USB_UART_CONSOLE
jfischer-no Nov 9, 2021
9b88cba
usb: add option to initialize USB device support at boot
jfischer-no Nov 12, 2021
4d53a79
shields: add generic shield to use CDC ACM UART as backend
jfischer-no Nov 12, 2021
1d52620
samples: shell_module: use generic CDC ACM shield
jfischer-no Nov 12, 2021
a92896b
tests: bluetooth: shell: use generic CDC ACM shield
jfischer-no Nov 12, 2021
561c894
tests: uart_basic_api: use generic CDC ACM shield
jfischer-no Nov 12, 2021
461b174
samples: sensortile_box: use generic CDC ACM shield
jfischer-no Nov 12, 2021
74b92d7
samples: usb: console: fix configuration
jfischer-no Nov 12, 2021
9c03497
boards: clean up CDC ACM configuration for nRF52840 based boards
jfischer-no Nov 12, 2021
105e3da
usb: remove the remains of USB_UART_CONSOLE
jfischer-no Nov 12, 2021
6c32698
shields: cdc_acm: add support for zephyr,bt-c2h-uart property
jfischer-no Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions tests/drivers/uart/uart_basic_api/overlay-usb.conf
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tests/drivers/uart/uart_basic_api/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* @}
*/

#include <usb/usb_device.h>
#include "test_uart.h"

#ifdef CONFIG_SHELL
Expand Down Expand Up @@ -63,7 +62,7 @@ void test_main(void)
uint32_t dtr = 0;

dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
if (!device_is_ready(dev) || usb_enable(NULL)) {
if (!device_is_ready(dev)) {
return;
}

Expand Down
3 changes: 1 addition & 2 deletions tests/drivers/uart/uart_basic_api/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ tests:
filter: CONFIG_UART_CONSOLE
harness: keyboard
drivers.uart.cdc_acm:
extra_args: OVERLAY_CONFIG="overlay-usb.conf"
DTC_OVERLAY_FILE="usb.overlay"
extra_args: SHIELD="cdc_acm_console"
Copy link
Member

@erwango erwango Nov 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A question here, I like the general direction, but I'd like to know how tests will work with boards that already declare usb for value of zephyr,console chosen.

Copy link
Contributor Author

@jfischer-no jfischer-no Nov 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK last property definition wins. With this PR, there are no more boards that define chosen property with reference to "zephyr,cdc-acm-uart" compatible node. But it works even if it is the case and shield is used, then there would be two CDC ACM devices, one of them would be used by the test.

tags: drivers usb
filter: CONFIG_UART_CONSOLE
depends_on: usb_device
Expand Down
18 changes: 0 additions & 18 deletions tests/drivers/uart/uart_basic_api/usb.overlay
View file
Open in desktop

This file was deleted.