drivers: uhc: remove UHC transfer parameter addr and attrib

Address parameter/argument is no longer needed because we have a pointer
to the USB device. The Attrib parameter has never been used and will be
replaced by the interval and start-frame parameters in the future.

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

Author: jfischer-no

drivers/usb/uhc/uhc_common.c

@@ -92,9 +92,7 @@ void uhc_xfer_buf_free(const struct device *dev, struct net_buf *const buf)
 }
 
 struct uhc_transfer *uhc_xfer_alloc(const struct device *dev,
-				    const uint8_t addr,
 				    const uint8_t ep,
-				    const uint8_t attrib,
 				    const uint16_t mps,
 				    void *const udev,
 				    void *const cb)
@@ -108,18 +106,15 @@ struct uhc_transfer *uhc_xfer_alloc(const struct device *dev,
 		goto xfer_alloc_error;
 	}
 
-	LOG_DBG("Allocate xfer, ep 0x%02x attrib 0x%02x cb %p",
-		ep, attrib, cb);
+	LOG_DBG("Allocate xfer, ep 0x%02x cb %p", ep, cb);
 
 	if (k_mem_slab_alloc(&uhc_xfer_pool, (void **)&xfer, K_NO_WAIT)) {
 		LOG_ERR("Failed to allocate transfer");
 		goto xfer_alloc_error;
 	}
 
 	memset(xfer, 0, sizeof(struct uhc_transfer));
-	xfer->addr = addr;
 	xfer->ep = ep;
-	xfer->attrib = attrib;
 	xfer->mps = mps;
 	xfer->udev = udev;
 	xfer->cb = cb;
@@ -131,9 +126,7 @@ struct uhc_transfer *uhc_xfer_alloc(const struct device *dev,
 }
 
 struct uhc_transfer *uhc_xfer_alloc_with_buf(const struct device *dev,
-					     const uint8_t addr,
 					     const uint8_t ep,
-					     const uint8_t attrib,
 					     const uint16_t mps,
 					     void *const udev,
 					     void *const cb,
@@ -147,7 +140,7 @@ struct uhc_transfer *uhc_xfer_alloc_with_buf(const struct device *dev,
 		return NULL;
 	}
 
-	xfer = uhc_xfer_alloc(dev, addr, ep, attrib, mps, udev, cb);
+	xfer = uhc_xfer_alloc(dev, ep, mps, udev, cb);
 	if (xfer == NULL) {
 		net_buf_unref(buf);
 		return NULL;

drivers/usb/uhc/uhc_max3421e.c

@@ -392,7 +392,7 @@ static int max3421e_schedule_xfer(const struct device *dev)
 		}
 
 		LOG_DBG("Next transfer %p", priv->last_xfer);
-		ret = max3421e_peraddr(dev, priv->last_xfer->addr);
+		ret = max3421e_peraddr(dev, priv->last_xfer->udev->addr);
 		if (ret) {
 			return ret;
 		}

drivers/usb/uhc/uhc_virtual.c

@@ -98,7 +98,7 @@ static int vrt_xfer_control(const struct device *dev,
 	if (xfer->stage == UHC_CONTROL_STAGE_SETUP) {
 		LOG_DBG("Handle SETUP stage");
 		uvb_pkt = uvb_alloc_pkt(UVB_REQUEST_SETUP,
-					xfer->addr, USB_CONTROL_EP_OUT,
+					xfer->udev->addr, USB_CONTROL_EP_OUT,
 					xfer->setup_pkt, sizeof(xfer->setup_pkt));
 		if (uvb_pkt == NULL) {
 			LOG_ERR("Failed to allocate UVB packet");
@@ -121,7 +121,7 @@ static int vrt_xfer_control(const struct device *dev,
 
 		LOG_DBG("Handle DATA stage");
 		uvb_pkt = uvb_alloc_pkt(UVB_REQUEST_DATA,
-					xfer->addr, xfer->ep,
+					xfer->udev->addr, xfer->ep,
 					data, length);
 		if (uvb_pkt == NULL) {
 			LOG_ERR("Failed to allocate UVB packet");
@@ -144,7 +144,7 @@ static int vrt_xfer_control(const struct device *dev,
 		}
 
 		uvb_pkt = uvb_alloc_pkt(UVB_REQUEST_DATA,
-					xfer->addr, ep,
+					xfer->udev->addr, ep,
 					NULL, 0);
 		if (uvb_pkt == NULL) {
 			LOG_ERR("Failed to allocate UVB packet");
@@ -176,7 +176,7 @@ static int vrt_xfer_bulk(const struct device *dev,
 		data = buf->data;
 	}
 
-	uvb_pkt = uvb_alloc_pkt(UVB_REQUEST_DATA, xfer->addr, xfer->ep,
+	uvb_pkt = uvb_alloc_pkt(UVB_REQUEST_DATA, xfer->udev->addr, xfer->ep,
 				data, length);
 	if (uvb_pkt == NULL) {
 		LOG_ERR("Failed to allocate UVB packet");

include/zephyr/drivers/usb/uhc.h

@@ -77,12 +77,8 @@ struct uhc_transfer {
 	uint8_t setup_pkt[8];
 	/** Transfer data buffer */
 	struct net_buf *buf;
-	/** Device (peripheral) address */
-	uint8_t addr;
 	/** Endpoint to which request is associated */
 	uint8_t ep;
-	/** Endpoint attributes (TBD) */
-	uint8_t attrib;
 	/** Maximum packet size */
 	uint16_t mps;
 	/** Flag marks request buffer is queued */
@@ -358,19 +354,15 @@ static inline int uhc_bus_resume(const struct device *dev)
  * and added from different pools.
  *
  * @param[in] dev     Pointer to device struct of the driver instance
- * @param[in] addr    Device (peripheral) address
  * @param[in] ep      Endpoint address
- * @param[in] attrib  Endpoint attributes
  * @param[in] mps     Maximum packet size of the endpoint
  * @param[in] udev    Opaque pointer to USB device
  * @param[in] cb      Transfer completion callback
  *
  * @return pointer to allocated transfer or NULL on error.
  */
 struct uhc_transfer *uhc_xfer_alloc(const struct device *dev,
-				    const uint8_t addr,
 				    const uint8_t ep,
-				    const uint8_t attrib,
 				    const uint16_t mps,
 				    void *const udev,
 				    void *const cb);
@@ -381,9 +373,7 @@ struct uhc_transfer *uhc_xfer_alloc(const struct device *dev,
  * Allocate a new transfer from common transfer pool with buffer.
  *
  * @param[in] dev     Pointer to device struct of the driver instance
- * @param[in] addr    Device (peripheral) address
  * @param[in] ep      Endpoint address
- * @param[in] attrib  Endpoint attributes
  * @param[in] mps     Maximum packet size of the endpoint
  * @param[in] udev    Opaque pointer to USB device
  * @param[in] cb      Transfer completion callback
@@ -392,9 +382,7 @@ struct uhc_transfer *uhc_xfer_alloc(const struct device *dev,
  * @return pointer to allocated transfer or NULL on error.
  */
 struct uhc_transfer *uhc_xfer_alloc_with_buf(const struct device *dev,
-					     const uint8_t addr,
 					     const uint8_t ep,
-					     const uint8_t attrib,
 					     const uint16_t mps,
 					     void *const udev,
 					     void *const cb,

subsys/usb/host/usbh_ch9.c

@@ -60,7 +60,7 @@ int usbh_req_setup(struct usb_device *const udev,
 	uint8_t ep = usb_reqtype_is_to_device(&req) ? 0x00 : 0x80;
 	int ret;
 
-	xfer = usbh_xfer_alloc(udev, ep, 0, 64, ch9_req_cb);
+	xfer = usbh_xfer_alloc(udev, ep, 64, ch9_req_cb);
 	if (!xfer) {
 		return -ENOMEM;
 	}

subsys/usb/host/usbh_device.h

@@ -24,13 +24,12 @@ struct usb_device *usbh_device_get_any(struct usbh_contex *const ctx);
 /* Wrappers around to avoid glue UHC calls. */
 static inline struct uhc_transfer *usbh_xfer_alloc(struct usb_device *udev,
 						   const uint8_t ep,
-						   const uint8_t attrib,
 						   const uint16_t mps,
 						   usbh_udev_cb_t cb)
 {
 	struct usbh_contex *const ctx = udev->ctx;
 
-	return uhc_xfer_alloc(ctx->dev, udev->addr, ep, attrib, mps, udev, cb);
+	return uhc_xfer_alloc(ctx->dev, ep, mps, udev, cb);
 }
 
 static inline int usbh_xfer_buf_add(const struct usb_device *udev,

subsys/usb/host/usbh_shell.c

@@ -87,7 +87,7 @@ static int cmd_bulk(const struct shell *sh, size_t argc, char **argv)
 	ep = strtol(argv[1], NULL, 16);
 	len = MIN(sizeof(vreq_test_buf), strtol(argv[2], NULL, 10));
 
-	xfer = usbh_xfer_alloc(udev, ep, 0, 512, bulk_req_cb);
+	xfer = usbh_xfer_alloc(udev, ep, 512, bulk_req_cb);
 	if (!xfer) {
 		shell_error(sh, "host: Failed to allocate transfer");
 		return -ENOMEM;