drivers: uhc: move transfer status to transfer structure

Aling with the changes in UDC done in the commit ad81b3b
("drivers: udc: move transfer status to buffer info structure")
This allows us to get the result of synchronous transfer and
simplify uhc_submit_event().

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

Author: jfischer-no

drivers/usb/uhc/uhc_common.c

@@ -21,13 +21,11 @@ NET_BUF_POOL_VAR_DEFINE(uhc_ep_pool,
 
 int uhc_submit_event(const struct device *dev,
 		     const enum uhc_event_type type,
-		     const int status,
-		     struct uhc_transfer *const xfer)
+		     const int status)
 {
 	struct uhc_data *data = dev->data;
 	struct uhc_event drv_evt = {
 		.type = type,
-		.xfer = xfer,
 		.status = status,
 		.dev = dev,
 	};
@@ -43,10 +41,19 @@ void uhc_xfer_return(const struct device *dev,
 		     struct uhc_transfer *const xfer,
 		     const int err)
 {
+	struct uhc_data *data = dev->data;
+	struct uhc_event drv_evt = {
+		.type = UHC_EVT_EP_REQUEST,
+		.xfer = xfer,
+		.dev = dev,
+	};
+
 	sys_dlist_remove(&xfer->node);
 	xfer->queued = 0;
 	xfer->claimed = 0;
-	uhc_submit_event(dev, UHC_EVT_EP_REQUEST, err, xfer);
+	xfer->err = err;
+
+	data->event_cb(dev, &drv_evt);
 }
 
 struct uhc_transfer *uhc_xfer_get_next(const struct device *dev)

drivers/usb/uhc/uhc_common.h

@@ -173,14 +173,12 @@ int uhc_xfer_append(const struct device *dev,
  * @param[in] dev    Pointer to device struct of the driver instance
  * @param[in] type   Event type
  * @param[in] status Event status
- * @param[in] xfer   Pointer to UHC transfer
  *
  * @return 0 on success, all other values should be treated as error.
  * @retval -EPERM controller is not initialized
  */
 int uhc_submit_event(const struct device *dev,
 		     const enum uhc_event_type type,
-		     const int status,
-		     struct uhc_transfer *const xfer);
+		     const int status);
 
 #endif /* ZEPHYR_INCLUDE_UHC_COMMON_H */

drivers/usb/uhc/uhc_max3421e.c

@@ -607,7 +607,7 @@ static void max3421e_handle_condet(const struct device *dev)
 		type = UHC_EVT_DEV_CONNECTED_LS;
 	}
 
-	uhc_submit_event(dev, type, 0, NULL);
+	uhc_submit_event(dev, type, 0);
 }
 
 static void max3421e_bus_event(const struct device *dev)
@@ -617,13 +617,13 @@ static void max3421e_bus_event(const struct device *dev)
 	if (atomic_test_and_clear_bit(&priv->state,
 				      MAX3421E_STATE_BUS_RESUME)) {
 		/* Resume operation done event */
-		uhc_submit_event(dev, UHC_EVT_RESUMED, 0, NULL);
+		uhc_submit_event(dev, UHC_EVT_RESUMED, 0);
 	}
 
 	if (atomic_test_and_clear_bit(&priv->state,
 				      MAX3421E_STATE_BUS_RESET)) {
 		/* Reset operation done event */
-		uhc_submit_event(dev, UHC_EVT_RESETED, 0, NULL);
+		uhc_submit_event(dev, UHC_EVT_RESETED, 0);
 	}
 }
 
@@ -654,7 +654,7 @@ static int max3421e_handle_bus_irq(const struct device *dev)
 	/* Suspend operation Done Interrupt (bus suspended) */
 	if (hirq & MAX3421E_SUSDN) {
 		ret = max3421e_hien_disable(dev, MAX3421E_SUSDN);
-		uhc_submit_event(dev, UHC_EVT_SUSPENDED, 0, NULL);
+		uhc_submit_event(dev, UHC_EVT_SUSPENDED, 0);
 	}
 
 	/* Peripheral Connect/Disconnect Interrupt */
@@ -664,7 +664,7 @@ static int max3421e_handle_bus_irq(const struct device *dev)
 
 	/* Remote Wakeup Interrupt */
 	if (hirq & MAX3421E_RWU) {
-		uhc_submit_event(dev, UHC_EVT_RWUP, 0, NULL);
+		uhc_submit_event(dev, UHC_EVT_RWUP, 0);
 	}
 
 	/* Bus Reset or Bus Resume event */
@@ -695,7 +695,7 @@ static void uhc_max3421e_thread(const struct device *dev)
 		 */
 		err = max3421e_update_hrsl_hirq(dev);
 		if (unlikely(err)) {
-			uhc_submit_event(dev, UHC_EVT_ERROR, err, NULL);
+			uhc_submit_event(dev, UHC_EVT_ERROR, err);
 		}
 
 		/* Host Transfer Done Interrupt */
@@ -713,20 +713,20 @@ static void uhc_max3421e_thread(const struct device *dev)
 		if (priv->hirq & ~(MAX3421E_FRAME | MAX3421E_HXFRDN)) {
 			err = max3421e_handle_bus_irq(dev);
 			if (unlikely(err)) {
-				uhc_submit_event(dev, UHC_EVT_ERROR, err, NULL);
+				uhc_submit_event(dev, UHC_EVT_ERROR, err);
 			}
 		}
 
 		/* Clear interrupts and schedule new bus transfer */
 		err = max3421e_clear_hirq(dev, priv->hirq);
 		if (unlikely(err)) {
-			uhc_submit_event(dev, UHC_EVT_ERROR, err, NULL);
+			uhc_submit_event(dev, UHC_EVT_ERROR, err);
 		}
 
 		if (schedule) {
 			err = max3421e_schedule_xfer(dev);
 			if (unlikely(err)) {
-				uhc_submit_event(dev, UHC_EVT_ERROR, err, NULL);
+				uhc_submit_event(dev, UHC_EVT_ERROR, err);
 			}
 		}
 

drivers/usb/uhc/uhc_virtual.c

@@ -374,7 +374,7 @@ static void xfer_work_handler(struct k_work *work)
 		if (schedule && !priv->busy) {
 			err = vrt_schedule_xfer(dev);
 			if (unlikely(err)) {
-				uhc_submit_event(dev, UHC_EVT_ERROR, err, NULL);
+				uhc_submit_event(dev, UHC_EVT_ERROR, err);
 			}
 		}
 
@@ -411,7 +411,7 @@ static void vrt_device_act(const struct device *dev,
 		type = UHC_EVT_ERROR;
 	}
 
-	uhc_submit_event(dev, type, 0, NULL);
+	uhc_submit_event(dev, type, 0);
 }
 
 static void uhc_vrt_uvb_cb(const void *const vrt_priv,

include/zephyr/drivers/usb/uhc.h

@@ -60,6 +60,8 @@ struct uhc_transfer {
 	unsigned int setup : 1;
 	/** Transfer owner */
 	void *owner;
+	/** Transfer result, 0 on success, other values on error */
+	int err;
 };
 
 /**
@@ -105,13 +107,11 @@ struct uhc_event {
 	/** Event type */
 	enum uhc_event_type type;
 	union {
-		/** Event value */
-		uint32_t value;
+		/** Event status value, if any */
+		int status;
 		/** Pointer to request used only for UHC_EVT_EP_REQUEST */
 		struct uhc_transfer *xfer;
 	};
-	/** Event status, 0 on success, other (transfer) values on error */
-	int status;
 	/** Pointer to controller's device struct */
 	const struct device *dev;
 };