Changeset 63431db in mainline

Timestamp:

2018-01-07T01:15:24Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5e2b1ae6

Parents:

56257ba

Message:

xhci: remove unnecessary field

Location:

uspace/drv/bus/usb/xhci

Files:

• hc.c (modified) (1 diff)
• rh.c (modified) (4 diffs)
• rh.h (modified) (2 diffs)

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

@@ -215 +215 @@
                 goto err_cmd;
 
-        if ((err = xhci_rh_init(&hc->rh, hc, device)))
+        if ((err = xhci_rh_init(&hc->rh, hc)))
                 goto err_bus;
 

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

@@ -61 +61 @@
         XHCI_REG_MASK(XHCI_PORT_CEC);
 
-int xhci_rh_init(xhci_rh_t *rh, xhci_hc_t *hc, ddf_dev_t *device)
+int xhci_rh_init(xhci_rh_t *rh, xhci_hc_t *hc)
 {
         assert(rh);
@@ -69 +69 @@
         rh->max_ports = XHCI_REG_RD(hc->cap_regs, XHCI_CAP_MAX_PORTS);
         rh->devices_by_port = (xhci_device_t **) calloc(rh->max_ports, sizeof(xhci_device_t *));
-        rh->hc_device = device;
 
         const int err = bus_device_init(&rh->device.base, &rh->hc->bus.base);
@@ -88 +87 @@
         int err;
         assert(rh);
-        assert(rh->hc_device);
 
         assert(rh->devices_by_port[port_id - 1] == NULL);
@@ -353 +351 @@
 int xhci_rh_fini(xhci_rh_t *rh)
 {
-        /* TODO: Implement me! */
-        usb_log_debug2("Called xhci_rh_fini().");
-
+        assert(rh);
         free(rh->devices_by_port);
-
         return EOK;
 }

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

@@ -67 +67 @@
         xhci_device_t device;
 
-        /* We need this to attach children to */
-        ddf_dev_t *hc_device;
-
         /** Interrupt transfer waiting for an actual interrupt to occur */
         usb_transfer_batch_t *unfinished_interrupt_transfer;
@@ -80 +77 @@
 } xhci_rh_t;
 
-int xhci_rh_init(xhci_rh_t *, xhci_hc_t *, ddf_dev_t *);
+int xhci_rh_init(xhci_rh_t *, xhci_hc_t *);
 int xhci_rh_fini(xhci_rh_t *);
 const xhci_port_speed_t *xhci_rh_get_port_speed(xhci_rh_t *, uint8_t);