Changeset 766043c in mainline

Timestamp:

2017-10-21T23:18:09Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

2b61945

Parents:

5fd9c30

Message:

Keeping track of root hub devices by port id.

Location:

uspace/drv/bus/usb/xhci

Files:

• rh.c (modified) (4 diffs)
• rh.h (modified) (2 diffs)

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

@@ -68 +68 @@
         rh->hc = hc;
         rh->max_ports = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_PORTS);
+        rh->devices = (xhci_device_t **) malloc(rh->max_ports * sizeof(xhci_device_t *));
         hc->rh.hc_device = device;
+
+        memset(rh->devices, 0, rh->max_ports * sizeof(xhci_device_t *));
 
         return device_init(&hc->rh.device);
@@ -175 +178 @@
         xhci_dev->hc = hc;
 
-        // TODO: Save anything else?
+        if (!rh->devices[dev->port - 1]) {
+                /* Only save the device if it's the first one connected to this port. */
+                rh->devices[dev->port - 1] = xhci_dev;
+        }
 
         return EOK;
@@ -280 +286 @@
 static int handle_disconnected_device(xhci_rh_t *rh, uint8_t port_id)
 {
-        // TODO: Find XHCI device by the port.
+        /* Find XHCI device by the port. */
+        xhci_device_t *dev = rh->devices[port_id - 1];
+        if (!dev) {
+                /* Must be extraneous call */
+                return EOK;
+        }
+
+        usb_log_info("Device at port %u has been disconnected.", port_id);
+
         // TODO: Destroy DDF function using _gone.
         // TODO: Remove device endpoints on the bus.
@@ -437 +451 @@
         /* TODO: Implement me! */
         usb_log_debug2("Called xhci_rh_fini().");
+
+        free(rh->devices);
+
         return EOK;
 }

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

@@ -55 +55 @@
 typedef struct hcd_roothub hcd_roothub_t;
 typedef struct xhci_bus xhci_bus_t;
+typedef struct xhci_device xhci_device_t;
 
 /* XHCI root hub instance */
@@ -75 +76 @@
         /* Number of hub ports. */
         uint8_t max_ports;
+
+        /* Device pointers connected to RH ports or NULL. (size is `max_ports`) */
+        xhci_device_t **devices;
 } xhci_rh_t;