Skip to content
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

USB: Fix console priority #16613

Merged
merged 2 commits into from
Jun 5, 2019
Merged

USB: Fix console priority #16613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7b61b
usb: console: Initialize USB console after USB Device stack
finikorg Jun 4, 2019
889bfbb
usb: usb_descriptor: Trivial syntax correct
finikorg Jun 4, 2019
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
1 change: 1 addition & 0 deletions drivers/console/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ config UART_CONSOLE

config UART_CONSOLE_INIT_PRIORITY
int "Init priority"
default 95 if USB_UART_CONSOLE
default 60
depends on UART_CONSOLE
help
Expand Down
2 changes: 2 additions & 0 deletions samples/subsys/usb/console/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ CONFIG_USB_UART_CONSOLE=y
CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_UART_LINE_CTRL=y
CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"

CONFIG_USB_UART_DTR_WAIT=y
3 changes: 1 addition & 2 deletions subsys/usb/usb_descriptor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,7 @@ __weak u8_t *usb_update_sn_string_descriptor(void)
return NULL;
}

static void
usb_fix_ascii_sn_string_descriptor(struct usb_sn_descriptor *sn)
static void usb_fix_ascii_sn_string_descriptor(struct usb_sn_descriptor *sn)
{
u8_t *runtime_sn = usb_update_sn_string_descriptor();
int runtime_sn_len, default_sn_len;
Expand Down