Changeset 9620a54 in mainline for uspace/drv/bus/usb/xhci/endpoint.h

Timestamp:

2017-10-29T10:51:59Z (8 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

d33dc780

Parents:

62f8025

Message:

Small changes. Temporarily fixed no device problem for endpoint logging. Added similar macro for device logging. Changed log messages to adopt these macros. TRB rings can be freed again. Made ring finalizers noexcept. Upon detach, the entire slot is disabled prior to unregistering endpoints in order to prevent invalid HC commands. Removed active endpoints count from XHCI device. Device context is freed in HC, so DCBAA is not touched from anywhere else.

File:

• uspace/drv/bus/usb/xhci/endpoint.h (modified) (3 diffs)

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

@@ -91 +91 @@
 
 #define XHCI_EP_FMT  "(%d:%d %s)"
+/* FIXME: "Device -1" messes up log messages, figure out a better way. */
 #define XHCI_EP_ARGS(ep)                \
-        ((ep).base.device->address),    \
+        ((ep).base.device ? (ep).base.device->address : -1),    \
         ((ep).base.endpoint),           \
         (usb_str_transfer_type((ep).base.transfer_type))
@@ -114 +115 @@
         xhci_device_ctx_t *dev_ctx;
 
-        /** All endpoints of the device. Inactive ones are NULL */
+        /** All endpoints of the device. Dropped ones are NULL */
         xhci_endpoint_t *endpoints[XHCI_EP_COUNT];
-
-        /** Number of non-NULL endpoints. Reference count of sorts. */
-        uint8_t active_endpoint_count;
 
         /** Flag indicating whether the device is USB3 (it's USB2 otherwise). */
@@ -127 +125 @@
 } xhci_device_t;
 
+#define XHCI_DEV_FMT  "(%s, slot %d)"
+#define XHCI_DEV_ARGS(dev)               ddf_fun_get_name((dev).base.fun), (dev).slot_id
+
 int xhci_endpoint_init(xhci_endpoint_t *, xhci_bus_t *);
 void xhci_endpoint_fini(xhci_endpoint_t *);
 int xhci_endpoint_alloc_transfer_ds(xhci_endpoint_t *);
-int xhci_endpoint_free_transfer_ds(xhci_endpoint_t *);
+void xhci_endpoint_free_transfer_ds(xhci_endpoint_t *);
 
 int xhci_endpoint_request_streams(xhci_hc_t *, xhci_device_t *, xhci_endpoint_t *, unsigned);