From 86580a43eaf43b484cbd1ed4f496a67b2445cebe Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Mon, 23 Sep 2024 06:32:18 +0000 Subject: [PATCH 1/2] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 1ba26136665b..47b2e8e987c2 100644 --- a/west.yml +++ b/west.yml @@ -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 From f584061a6ca3bc5ba4bd15b38c2071381383bf1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mo=C5=84?= Date: Mon, 23 Sep 2024 08:39:19 +0200 Subject: [PATCH 2/2] applications: nrf_desktop: Add NULL string descriptors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit USBD_CONFIGURATION_DEFINE() now takes four parameters instead of three. Add NULL configuration string to allow building the application and keep the functionality intact. Signed-off-by: Tomasz Moń --- applications/nrf_desktop/src/modules/usb_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/nrf_desktop/src/modules/usb_state.c b/applications/nrf_desktop/src/modules/usb_state.c index 0118597a2a4f..f9116b91d37a 100644 --- a/applications/nrf_desktop/src/modules/usb_state.c +++ b/applications/nrf_desktop/src/modules/usb_state.c @@ -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");