Changeset 867b375 in mainline for uspace/drv/bus/usb/xhci/main.c

Timestamp:

2017-10-15T02:04:10Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

20eaa82

Parents:

d7869d7e

Message:

hcd_ddf_new_device refactoring

This long function is now split into parts. Instead of passing dozens of arguments, it now creates the usb_dev_t right away, and uses that to pass it along. The address_device part is now modifiable by drivers.

There is still a work to be done. The biggest problem I see is in the addressing - currently, there is usb_address_t, and for high speed transaction translating there is another address. For (near) future extensibility, we should pass address as a structure. Or even better, make a way how to reference a device, maybe in a similar way how we work with endpoints.

File:

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

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

@@ -42 +42 @@
 
 #include "hc.h"
+#include "rh.h"
 #include "endpoint.h"
 
@@ -50 +51 @@
 static int hcd_claim(hcd_t *, ddf_dev_t *);
 static int hcd_start(hcd_t *, bool);
+static int hcd_setup_root_hub(hcd_t *, ddf_dev_t *);
 static int hcd_status(hcd_t *, uint32_t *);
 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 *);
 
@@ -62 +65 @@
         .claim = hcd_claim,
         .start = hcd_start,
+        .setup_root_hub = hcd_setup_root_hub,
         .fini = hc_driver_fini,
         .ops = {
@@ -67 +71 @@
                 .irq_hook       = hcd_interrupt,
                 .status_hook    = hcd_status,
+                .address_device = hcd_address_device,
         }
 };
@@ -116 +121 @@
 }
 
+static int hcd_setup_root_hub(hcd_t *hcd, ddf_dev_t *dev)
+{
+        xhci_hc_t *hc = hcd_get_driver_data(hcd);
+        assert(hc);
+
+        hc->rh.hcd_rh = hcd_roothub_create(hcd, dev, USB_SPEED_SUPER);
+        return hc->rh.hcd_rh ? EOK : ENOMEM;
+}
+
 static int hcd_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
 {
@@ -139 +153 @@
 
         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);
 }