Changeset deb2e55 in mainline

Timestamp:

2017-12-28T21:54:38Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

415c5116

Parents:

66c16b0

git-author:

Petr Manek <petr.manek@…> (2017-12-28 21:54:31)

git-committer:

Petr Manek <petr.manek@…> (2017-12-28 21:54:38)

Message:

usbhost: refactoring

Moved the "online" attribute from xhci_device_t to device_t. Changed
USB2 bus implementation to produce online devices (not to break
functionality on older buses).

Location:

uspace

Files:

• drv/bus/usb/xhci/bus.c (modified) (3 diffs)
• drv/bus/usb/xhci/endpoint.c (modified) (1 diff)
• drv/bus/usb/xhci/endpoint.h (modified) (1 diff)
• drv/bus/usb/xhci/hc.c (modified) (1 diff)
• drv/bus/usb/xhci/transfers.c (modified) (3 diffs)
• lib/usbhost/include/usb/host/bus.h (modified) (1 diff)
• lib/usbhost/src/endpoint.c (modified) (1 diff)
• lib/usbhost/src/usb2_bus.c (modified) (1 diff)

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

@@ -217 +217 @@
         usb_log_debug2("Device " XHCI_DEV_FMT " going offline.", XHCI_DEV_ARGS(*xhci_dev));
         fibril_mutex_lock(&dev->guard);
-        xhci_dev->online = false;
+        dev->online = false;
         fibril_mutex_unlock(&dev->guard);
 
@@ -304 +304 @@
         usb_log_debug2("Device " XHCI_DEV_FMT " going online.", XHCI_DEV_ARGS(*dev));
         fibril_mutex_lock(&dev_base->guard);
-        dev->online = true;
+        dev_base->online = true;
         fibril_mutex_unlock(&dev_base->guard);
 
@@ -332 +332 @@
         usb_log_debug2("Device " XHCI_DEV_FMT " going offline.", XHCI_DEV_ARGS(*dev));
         fibril_mutex_lock(&dev_base->guard);
-        dev->online = false;
+        dev_base->online = false;
         fibril_mutex_unlock(&dev_base->guard);
 

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

@@ -463 +463 @@
 
         /* Offline devices don't create new endpoints other than EP0. */
-        if (!dev->online && ep->base.endpoint > 0) {
+        if (!dev->base.online && ep->base.endpoint > 0) {
                 return EAGAIN;
         }

uspace/drv/bus/usb/xhci/endpoint.h

@@ -141 +141 @@
         /** Flag indicating whether the device is USB3 (it's USB2 otherwise). */
         bool usb3;
-
-        /** True if the device can add new endpoints and schedule transfers. */
-        volatile bool online;
 } xhci_device_t;
 

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

@@ -706 +706 @@
         /* From now on, the device is officially online, yay! */
         fibril_mutex_lock(&dev->base.guard);
-        dev->online = true;
+        dev->base.online = true;
         fibril_mutex_unlock(&dev->base.guard);
 

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

@@ -261 +261 @@
         size_t tdpc = len / 1024 + ((len % 1024) ? 1 : 0);
         size_t tbc = tdpc / (ep->max_burst + 1);
-        if(!tdpc % (ep->max_burst + 1)) --tbc;
+        if (!tdpc % (ep->max_burst + 1)) --tbc;
         size_t bsp = tdpc % (ep->max_burst + 1);
         size_t tlbpc = (bsp ? bsp - 1 : ep->max_burst);
@@ -520 +520 @@
         xhci_device_t *xhci_dev = xhci_ep_to_dev(xhci_ep);
 
-        /* Offline devices don't schedule transfers other than on EP0. */
-        if (!xhci_dev->online && ep->endpoint > 0) {
-                return EAGAIN;
-        }
-
         // FIXME: find a better way to check if the ring is not initialized
         if (!xhci_ep->ring.segment_count) {
@@ -533 +528 @@
 
         // Isochronous transfer needs to be handled differently
-        if(batch->ep->transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+        if (batch->ep->transfer_type == USB_TRANSFER_ISOCHRONOUS) {
                 return schedule_isochronous(hc, transfer, xhci_ep, xhci_dev);
         }

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

@@ -79 +79 @@
         /* Managing bus */
         bus_t *bus;
+
+        /** True if the device can add new endpoints and schedule transfers. */
+        volatile bool online;
 
         /* This structure is meant to be extended by overriding. */

uspace/lib/usbhost/src/endpoint.c

@@ -214 +214 @@
         }
 
+        /* Offline devices don't schedule transfers other than on EP0. */
+        if (!ep->device->online && ep->endpoint > 0) {
+                return EAGAIN;
+        }
+
         const size_t bw = endpoint_count_bw(ep, size);
         /* Check if we have enough bandwidth reserved */

uspace/lib/usbhost/src/usb2_bus.c

@@ -271 +271 @@
         }
 
+        /* From now on, the device is officially online, yay! */
+        fibril_mutex_lock(&dev->guard);
+        dev->online = true;
+        fibril_mutex_unlock(&dev->guard);
+
         return EOK;