Changeset d33dc780 in mainline

Timestamp:

2017-10-29T10:56:02Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

ef1a3a8

Parents:

9620a54

Message:

Refactoring. Renamed device array to better reflect its indexing.

Location:

uspace/drv/bus/usb/xhci

Files:

• rh.c (modified) (6 diffs)
• rh.h (modified) (1 diff)

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 **) calloc(rh->max_ports, sizeof(xhci_device_t *));
+        rh->devices_by_port = (xhci_device_t **) calloc(rh->max_ports, sizeof(xhci_device_t *));
         rh->hc_device = device;
 
@@ -90 +90 @@
         assert(rh->hc_device);
 
-        assert(rh->devices[port_id - 1] == NULL);
+        assert(rh->devices_by_port[port_id - 1] == NULL);
 
         xhci_bus_t *bus = &rh->hc->bus;
@@ -126 +126 @@
         fibril_mutex_lock(&rh->device.base.guard);
         list_append(&dev->link, &rh->device.base.devices);
-        rh->devices[port_id - 1] = xhci_dev;
+        rh->devices_by_port[port_id - 1] = xhci_dev;
         fibril_mutex_unlock(&rh->device.base.guard);
 
@@ -180 +180 @@
 
         /* Find XHCI device by the port. */
-        xhci_device_t *dev = rh->devices[port_id - 1];
+        xhci_device_t *dev = rh->devices_by_port[port_id - 1];
         if (!dev) {
                 /* Must be extraneous call. */
@@ -192 +192 @@
         fibril_mutex_lock(&rh->device.base.guard);
         list_remove(&dev->base.link);
-        rh->devices[port_id - 1] = NULL;
+        rh->devices_by_port[port_id - 1] = NULL;
         fibril_mutex_unlock(&rh->device.base.guard);
 
@@ -358 +358 @@
         usb_log_debug2("Called xhci_rh_fini().");
 
-        free(rh->devices);
+        free(rh->devices_by_port);
 
         return EOK;

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

@@ -77 +77 @@
 
         /* Device pointers connected to RH ports or NULL. (size is `max_ports`) */
-        xhci_device_t **devices;
+        xhci_device_t **devices_by_port;
 } xhci_rh_t;