manifest: Update sdk-zephyr

Change updates sdk-zephyr to cherry-pick fixes for USB next stack. Change also aligns callback implementation and renames usbd_contex to usbd_context in the nRF Desktop application. Jira: NCSDK-27730 Signed-off-by: Marek Pieta <[email protected]>
nrfconnect · Jun 4, 2024 · 2070909 · 2070909
1 parent 2edaa8b
commit 2070909
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/applications/nrf_desktop/src/modules/usb_state.c b/applications/nrf_desktop/src/modules/usb_state.c
@@ -93,7 +93,7 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_DESKTOP_HID_STATE_ENABLE) ||
 	     IS_ENABLED(CONFIG_DESKTOP_USB_SELECTIVE_REPORT_SUBSCRIPTION) ||
 	     (ARRAY_SIZE(usb_hid_device) <= 1));
 
-static struct usbd_contex *usbd_ctx;
+static struct usbd_context *usbd_ctx;
 
 static struct config_channel_transport cfg_chan_transport;
 
@@ -870,7 +870,10 @@ static int get_report_next(const struct device *dev, const uint8_t type, const u
 {
 	/* Omit the first byte - HID report ID. */
 	buf[0] = id;
-	return get_report(dev, type, id, buf + 1, len - 1);
+
+	int err = get_report(dev, type, id, buf + 1, len - 1);
+
+	return err ? err : len;
 }
 
 static int set_report_next(const struct device *dev, const uint8_t type, const uint8_t id,
@@ -946,7 +949,7 @@ static int usb_init_next_hids_init(void)
 	return err;
 }
 
-static void usb_init_next_status_cb(struct usbd_contex *const contex,
+static void usb_init_next_status_cb(struct usbd_context *const usbd,
 				    const struct usbd_msg *const msg)
 {
 	static enum usb_state before_suspend;
@@ -1015,7 +1018,7 @@ static void usb_init_next_status_cb(struct usbd_contex *const contex,
 	}
 }
 
-static int usb_init_next_register_fs_classes(struct usbd_contex *usbd)
+static int usb_init_next_register_fs_classes(struct usbd_context *usbd)
 {
 	int err = 0;
 
@@ -1031,7 +1034,7 @@ static int usb_init_next_register_fs_classes(struct usbd_contex *usbd)
 	return err;
 }
 
-static int usb_init_next_register_hs_classes(struct usbd_contex *usbd)
+static int usb_init_next_register_hs_classes(struct usbd_context *usbd)
 {
 	int err = 0;
 
@@ -1047,7 +1050,7 @@ static int usb_init_next_register_hs_classes(struct usbd_contex *usbd)
 	return err;
 }
 
-static int usb_init_next_add_configuration(struct usbd_contex *usbd,
+static int usb_init_next_add_configuration(struct usbd_context *usbd,
 					   const enum usbd_speed speed,
 					   struct usbd_config_node *config)
 {
@@ -1086,7 +1089,7 @@ static int usb_init_next_add_configuration(struct usbd_contex *usbd,
 	return 0;
 }
 
-static struct usbd_contex *usb_init_next_usbd_init(void)
+static struct usbd_context *usb_init_next_usbd_init(void)
 {
 	int err;
 
@@ -1162,7 +1165,7 @@ static int usb_init_next(void)
 		return err;
 	}
 
-	struct usbd_contex *usbd = usb_init_next_usbd_init();
+	struct usbd_context *usbd = usb_init_next_usbd_init();
 
 	if (!usbd) {
 		LOG_ERR("usb_init_next_usbd_init failed");

diff --git a/west.yml b/west.yml
@@ -63,7 +63,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 18285a0ea4b93e0e37dacebfc715cd39c7640994
+      revision: 09fb10eac8795316e69bc697526dc0e969be235a
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above