usb: host: add command to get the current device configuration

Add command to get the current device configuration.
Revise the shell part to have a set|get configuration
subcommands.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

subsys/usb/host/usbh_ch9.c

@@ -194,6 +194,30 @@ int usbh_req_set_cfg(struct usb_device *const udev,
 	return ret;
 }
 
+int usbh_req_get_cfg(struct usb_device *const udev,
+		     uint8_t *const cfg)
+{
+	const uint8_t bmRequestType = USB_REQTYPE_DIR_TO_HOST << 7;
+	const uint8_t bRequest = USB_SREQ_GET_CONFIGURATION;
+	const uint16_t wLength = 1;
+	struct net_buf *buf;
+	int ret;
+
+	buf = usbh_xfer_buf_alloc(udev, wLength);
+	if (!buf) {
+		return -ENOMEM;
+	}
+
+	ret = usbh_req_setup(udev, bmRequestType, bRequest, 0, 0, wLength, buf);
+	if (ret == 0 && buf->len == wLength) {
+		*cfg = buf->data[0];
+	}
+
+	usbh_xfer_buf_free(udev, buf);
+
+	return ret;
+}
+
 int usbh_req_set_alt(struct usb_device *const udev,
 		     const uint8_t iface, const uint8_t alt)
 {

subsys/usb/host/usbh_ch9.h

@@ -44,6 +44,9 @@ int usbh_req_set_address(struct usb_device *const udev,
 int usbh_req_set_cfg(struct usb_device *const udev,
 		     const uint8_t cfg);
 
+int usbh_req_get_cfg(struct usb_device *const udev,
+		     uint8_t *const cfg);
+
 int usbh_req_set_sfs_rwup(struct usb_device *const udev);
 
 int usbh_req_clear_sfs_rwup(struct usb_device *const udev);

subsys/usb/host/usbh_shell.c

@@ -291,8 +291,8 @@ static int cmd_feature_set_prst(const struct shell *sh,
 	return err;
 }
 
-static int cmd_device_config(const struct shell *sh,
-			     size_t argc, char **argv)
+static int cmd_config_set(const struct shell *sh,
+			  size_t argc, char **argv)
 {
 	uint8_t cfg;
 	int err;
@@ -310,6 +310,23 @@ static int cmd_device_config(const struct shell *sh,
 	return err;
 }
 
+static int cmd_config_get(const struct shell *sh,
+			  size_t argc, char **argv)
+{
+	uint8_t cfg;
+	int err;
+
+	err = usbh_req_get_cfg(udev, &cfg);
+	if (err) {
+		shell_error(sh, "host: Failed to set configuration");
+	} else {
+		shell_print(sh, "host: Device 0x%02x, current configuration %u",
+			    udev->addr, cfg);
+	}
+
+	return err;
+}
+
 static int cmd_device_interface(const struct shell *sh,
 				size_t argc, char **argv)
 {
@@ -484,11 +501,19 @@ SHELL_STATIC_SUBCMD_SET_CREATE(feature_clear_cmds,
 	SHELL_SUBCMD_SET_END
 );
 
+SHELL_STATIC_SUBCMD_SET_CREATE(config_cmds,
+	SHELL_CMD_ARG(get, NULL, NULL,
+		      cmd_config_get, 1, 0),
+	SHELL_CMD_ARG(set, NULL, "<configuration>",
+		      cmd_config_set, 2, 0),
+	SHELL_SUBCMD_SET_END
+);
+
 SHELL_STATIC_SUBCMD_SET_CREATE(device_cmds,
 	SHELL_CMD_ARG(address, NULL, "<address>",
 		      cmd_device_address, 2, 0),
-	SHELL_CMD_ARG(config, NULL, "<config>",
-		      cmd_device_config, 2, 0),
+	SHELL_CMD_ARG(config, &config_cmds, "get|set configuration",
+		      NULL, 1, 0),
 	SHELL_CMD_ARG(interface, NULL, "<interface> <alternate>",
 		      cmd_device_interface, 3, 0),
 	SHELL_CMD_ARG(descriptor, &desc_cmds, "descriptor request",