Changeset bad4a05 in mainline

Timestamp:

2018-01-11T04:12:06Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0892663a

Parents:

a6c4597

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-11 01:31:42)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-11 04:12:06)

Message:

usbhost: made device_remove and endpoint_unregister noexcept

Location:

uspace

Files:

• drv/bus/usb/ehci/ehci_bus.c (modified) (2 diffs)
• drv/bus/usb/ohci/ohci_bus.c (modified) (1 diff)
• drv/bus/usb/xhci/bus.c (modified) (6 diffs)
• drv/bus/usb/xhci/rh.c (modified) (2 diffs)
• lib/usbhost/include/usb/host/bus.h (modified) (4 diffs)
• lib/usbhost/src/bus.c (modified) (2 diffs)
• lib/usbhost/src/usb2_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -113 +113 @@
 }
 
-static int ehci_unregister_ep(endpoint_t *ep)
+static void ehci_unregister_ep(endpoint_t *ep)
 {
         bus_t *bus_base = endpoint_get_bus(ep);
@@ -120 +120 @@
         assert(ep);
 
-        const int err = usb2_bus_ops.endpoint_unregister(ep);
-        if (err)
-                return err;
-
+        usb2_bus_ops.endpoint_unregister(ep);
         hc_dequeue_endpoint(bus->hc, ep);
-        return EOK;
 }
 

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -118 +118 @@
 }
 
-static int ohci_unregister_ep(endpoint_t *ep)
+static void ohci_unregister_ep(endpoint_t *ep)
 {
         ohci_bus_t *bus = (ohci_bus_t *) endpoint_get_bus(ep);
         assert(ep);
 
-        const int err = usb2_bus_ops.endpoint_unregister(ep);
-        if (err)
-                return err;
-
+        usb2_bus_ops.endpoint_unregister(ep);
         hc_dequeue_endpoint(bus->hc, ep);
-        return EOK;
 }
 

uspace/drv/bus/usb/xhci/bus.c

@@ -193 +193 @@
 }
 
-static int endpoint_unregister(endpoint_t *);
-
 /**
  * Remove device from XHCI bus. Transition it to the offline state, abort all
@@ -205 +203 @@
  * @return Error code.
  */
-static int device_remove(device_t *dev)
+static void device_remove(device_t *dev)
 {
         int err;
@@ -249 +247 @@
                         continue;
 
-                if ((err = endpoint_unregister(dev->endpoints[i]))) {
-                        usb_log_warning("Failed to unregister endpoint " XHCI_EP_FMT ": %s",
-                            XHCI_EP_ARGS(*xhci_device_get_endpoint(xhci_dev, i)), str_error(err));
-                }
+                bus_endpoint_remove(dev->endpoints[i]);
         }
 
@@ -258 +253 @@
         /* XXX: Not a good idea, this method should not destroy devices. */
         hcd_ddf_fun_destroy(dev);
-
-        return EOK;
 }
 
@@ -415 +408 @@
  * Bus callback.
  */
-static int endpoint_unregister(endpoint_t *ep_base)
+static void endpoint_unregister(endpoint_t *ep_base)
 {
         int err;
@@ -433 +426 @@
                     " the slot has already been disabled.", XHCI_EP_ARGS(*ep));
         }
-
-        return EOK;
 }
 

uspace/drv/bus/usb/xhci/rh.c

@@ -188 +188 @@
 {
         assert(rh);
-        int err;
 
         /* Find XHCI device by the port. */
@@ -207 +206 @@
 
         /* Remove device from XHCI bus. */
-        if ((err = bus_device_remove(&dev->base))) {
-                usb_log_warning("Failed to remove device " XHCI_DEV_FMT " from XHCI bus: %s",
-                    XHCI_DEV_ARGS(*dev), str_error(err));
-        }
+        bus_device_remove(&dev->base);
 
         return EOK;

uspace/lib/usbhost/include/usb/host/bus.h

@@ -103 +103 @@
         /* Operations on device */
         int (*device_enumerate)(device_t *);
-        int (*device_remove)(device_t *);
+        void (*device_remove)(device_t *);
         int (*device_online)(device_t *);                       /**< Optional */
         int (*device_offline)(device_t *);                      /**< Optional */
@@ -110 +110 @@
         /* Operations on endpoint */
         int (*endpoint_register)(endpoint_t *);
-        int (*endpoint_unregister)(endpoint_t *);
+        void (*endpoint_unregister)(endpoint_t *);
         void (*endpoint_destroy)(endpoint_t *);                 /**< Optional */
         void (*endpoint_toggle_reset)(endpoint_t *);            /**< Optional */
@@ -117 +117 @@
 
         /* Operations on batch */
+        int (*batch_schedule)(usb_transfer_batch_t *);
         void (*batch_destroy)(usb_transfer_batch_t *);          /**< Optional */
-        int (*batch_schedule)(usb_transfer_batch_t *);
 };
 
@@ -149 +149 @@
 
 int bus_device_enumerate(device_t *);
-int bus_device_remove(device_t *);
+void bus_device_remove(device_t *);
 
 int bus_device_online(device_t *);

uspace/lib/usbhost/src/bus.c

@@ -112 +112 @@
  * Invoke the device_remove bus operation.
  */
-int bus_device_remove(device_t *dev)
+void bus_device_remove(device_t *dev)
 {
         assert(dev);
 
         const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_remove);
-        if (!ops)
-                return ENOTSUP;
+        assert(ops);
 
         return ops->device_remove(dev);
@@ -266 +265 @@
 
         fibril_mutex_lock(&device->guard);
-        const int r = ops->endpoint_unregister(ep);
-        if (!r)
-                device->endpoints[ep->endpoint] = NULL;
+        ops->endpoint_unregister(ep);
+        device->endpoints[ep->endpoint] = NULL;
         fibril_mutex_unlock(&device->guard);
-
-        if (r)
-                return r;
 
         /* Abort a transfer batch, if there was any */

uspace/lib/usbhost/src/usb2_bus.c

@@ -250 +250 @@
  * Release bandwidth reserved by the given endpoint.
  */
-static int usb2_bus_unregister_ep(endpoint_t *ep)
+static void usb2_bus_unregister_ep(endpoint_t *ep)
 {
         usb2_bus_t *bus = bus_to_usb2_bus(ep->device->bus);
@@ -256 +256 @@
 
         bus->free_bw += ep->bandwidth;
-
-        return EOK;
 }