Changeset 20eaa82 in mainline for uspace/drv/bus/usb/xhci/main.c

Timestamp:

2017-10-15T13:44:39Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2770b66

Parents:

867b375

Message:

usbhost refactoring: introduced bus→enumerate_device

File:

• uspace/drv/bus/usb/xhci/main.c (modified) (5 diffs)

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

@@ -55 +55 @@
 static void hcd_interrupt(hcd_t *, uint32_t);
 static int hcd_schedule(hcd_t *, usb_transfer_batch_t *);
-static int hcd_address_device(hcd_t *, usb_speed_t, usb_tt_address_t, usb_address_t *);
 static void hc_driver_fini(hcd_t *);
 
 static const ddf_hc_driver_t xhci_ddf_hc_driver = {
-        .hc_speed = USB_SPEED_SUPER,
         .name = "XHCI-PCI",
         .init = hc_driver_init,
@@ -71 +69 @@
                 .irq_hook       = hcd_interrupt,
                 .status_hook    = hcd_status,
-                .address_device = hcd_address_device,
         }
 };
@@ -90 +87 @@
 
         hcd_set_implementation(hcd, hc, &xhci_ddf_hc_driver.ops, &hc->bus.base);
+        hc->hcd = hcd;
 
         return EOK;
@@ -126 +124 @@
         assert(hc);
 
-        hc->rh.hcd_rh = hcd_roothub_create(hcd, dev, USB_SPEED_SUPER);
-        return hc->rh.hcd_rh ? EOK : ENOMEM;
+        hc->rh.hc_device = dev;
+        return device_init(&hc->rh.device);
 }
 
@@ -153 +151 @@
 
         hc_interrupt(hc, status);
-}
-
-static int hcd_address_device(hcd_t *hcd, usb_speed_t speed, usb_tt_address_t tt, usb_address_t *address)
-{
-        xhci_hc_t *hc = hcd_get_driver_data(hcd);
-        assert(hc);
-
-        return xhci_rh_address_device(&hc->rh, speed, tt, address);
 }