Changeset 867b375 in mainline for uspace/lib/usbhost/include

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.

Location:

uspace/lib/usbhost/include/usb/host

Files:

• ddf_helpers.h (modified) (3 diffs)
• endpoint.h (modified) (1 diff)
• hcd.h (modified) (3 diffs)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -49 +49 @@
 typedef int (*claim_t)(hcd_t *, ddf_dev_t *);
 typedef int (*driver_start_t)(hcd_t *, bool irq);
-typedef int (*setup_root_hub_t)(ddf_dev_t *);
+typedef int (*setup_root_hub_t)(hcd_t *, ddf_dev_t *);
 
 typedef void (*driver_stop_t)(hcd_t *);
@@ -81 +81 @@
 void hcd_ddf_clean_hc(ddf_dev_t *device);
 
-int hcd_setup_virtual_root_hub(ddf_dev_t *);
+int hcd_setup_virtual_root_hub(hcd_t *, ddf_dev_t *);
 
 hcd_t *dev_to_hcd(ddf_dev_t *dev);
@@ -93 +93 @@
 void ddf_hcd_gen_irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev);
 
+/* For xHCI, we need to drive the roothub without roothub having assigned an
+ * address. Thus we cannot create function for it, and we have to carry the
+ * usb_dev_t somewhere.
+ *
+ * This is sort of hacky, but at least does not expose the internals of ddf_helpers.
+ */
+typedef struct hcd_roothub hcd_roothub_t;
+
+hcd_roothub_t *hcd_roothub_create(hcd_t *, ddf_dev_t *, usb_speed_t);
+int hcd_roothub_new_device(hcd_roothub_t *, unsigned port);
+
 #endif
 

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -79 +79 @@
         fibril_condvar_t avail;
         /** High speed TT data */
-        struct {
-                usb_address_t address;
-                unsigned port;
-        } tt;
+        usb_tt_address_t tt;
 
         /* This structure is meant to be extended by overriding. */

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -50 +50 @@
 
 typedef int (*schedule_hook_t)(hcd_t *, usb_transfer_batch_t *);
-typedef int (*ep_add_hook_t)(hcd_t *, endpoint_t *);
-typedef void (*ep_remove_hook_t)(hcd_t *, endpoint_t *);
 typedef void (*interrupt_hook_t)(hcd_t *, uint32_t);
 typedef int (*status_hook_t)(hcd_t *, uint32_t *);
+typedef int (*address_device_hook_t)(hcd_t *, usb_speed_t, usb_tt_address_t, usb_address_t *);
 
 typedef struct {
@@ -62 +61 @@
         /** Periodic polling hook */
         status_hook_t status_hook;
+        /** Hook to setup device address */
+        address_device_hook_t address_device;
 } hcd_ops_t;
 
@@ -112 +113 @@
 
 extern int hcd_add_ep(hcd_t *, usb_target_t, usb_direction_t,
-    usb_transfer_type_t, size_t, unsigned int, size_t, usb_address_t,
-    unsigned int);
+    usb_transfer_type_t, size_t, unsigned int, size_t, usb_tt_address_t);
 
 extern int hcd_remove_ep(hcd_t *, usb_target_t, usb_direction_t);