Changeset 20eaa82 in mainline for uspace/drv/bus/usb/xhci/rh.h

Timestamp:

2017-10-15T13:44:39Z (8 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/rh.h (modified) (4 diffs)

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

@@ -38 +38 @@
 
 #include <usb/host/usb_transfer_batch.h>
+#include <usb/host/bus.h>
 #include "hw_struct/regs.h"
 
 typedef struct xhci_hc xhci_hc_t;
+typedef struct ddf_dev ddf_dev_t;
 
 /**
@@ -58 +60 @@
         xhci_hc_t *hc;
 
+        /* Root for the device tree */
+        device_t device;
+
+        /* We need this to attach children to */
+        ddf_dev_t *hc_device;
+
         /** Port speeds reported from HC */
         xhci_port_speed_t speeds [16];
@@ -66 +74 @@
         /* Number of hub ports. */
         uint8_t max_ports;
-
-        /* We need this to create child devices */
-        hcd_roothub_t *hcd_rh;
 } xhci_rh_t;
 
@@ -79 +84 @@
 void xhci_rh_handle_port_change(xhci_rh_t *);
 
-int xhci_rh_address_device(xhci_rh_t *, usb_speed_t, usb_tt_address_t, usb_address_t *);
+int xhci_rh_address_device(xhci_rh_t *rh, device_t *dev);
 
 #endif