Skip to content

manifest: sdk-zephyr: USB cherry pick series for NCS 2.7.99-CS2 #17426

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 2 commits into from
Closed

manifest: sdk-zephyr: USB cherry pick series for NCS 2.7.99-CS2 #17426

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
86580a4
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Sep 23, 2024
f584061
applications: nrf_desktop: Add NULL string descriptors
tmon-nordic Sep 23, 2024
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
4 changes: 2 additions & 2 deletions applications/nrf_desktop/src/modules/usb_state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,8 +1424,8 @@ static struct usbd_context *usb_init_next_usbd_init(void)
static const uint8_t attributes = IS_ENABLED(CONFIG_DESKTOP_USB_REMOTE_WAKEUP) ?
(USB_SCD_REMOTE_WAKEUP) : (0);

USBD_CONFIGURATION_DEFINE(fs_config, attributes, max_power);
USBD_CONFIGURATION_DEFINE(hs_config, attributes, max_power);
USBD_CONFIGURATION_DEFINE(fs_config, attributes, max_power, NULL);
USBD_CONFIGURATION_DEFINE(hs_config, attributes, max_power, NULL);

if (!usbd_can_detect_vbus(&usbd)) {
LOG_ERR("USBD controller cannot detect VBUS state change");
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 5bb7bb0af17cbdbd13c06ed5ea1268ec9b9358fc
revision: pull/2038/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading