Changeset df6ded8 in mainline for uspace/drv/bus/usb/usbhub/usbhub.h

Timestamp:

2018-02-28T16:37:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

File:

• uspace/drv/bus/usb/usbhub/usbhub.h (modified) (4 diffs)

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -2 +2 @@
  * Copyright (c) 2010 Vojtech Horky
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty, Petr Manek
  * All rights reserved.
  *
@@ -39 +40 @@
 
 #include <ddf/driver.h>
+#include <fibril_synch.h>
 
 #include <usb/classes/hub.h>
@@ -44 +46 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
-
-#include <fibril_synch.h>
+#include <usb/dev/poll.h>
 
 #define NAME "usbhub"
 
 #include "port.h"
+#include "status.h"
 
 /** Information about attached hub. */
@@ -57 +59 @@
         /** Port structures, one for each port */
         usb_hub_port_t *ports;
+        /** Speed of the hub */
+        usb_speed_t speed;
         /** Generic usb device data*/
         usb_device_t *usb_device;
-
-        /** Number of pending operations on the mutex to prevent shooting
-         * ourselves in the foot.
-         * When the hub is disconnected but we are in the middle of some
-         * operation, we cannot destroy this structure right away because
-         * the pending operation might use it.
-         */
-        size_t pending_ops_count;
-        /** Guard for pending_ops_count. */
-        fibril_mutex_t pending_ops_mutex;
-        /** Condition variable for pending_ops_count. */
-        fibril_condvar_t pending_ops_cv;
+        /** Data polling handle. */
+        usb_polling_t polling;
         /** Pointer to usbhub function. */
         ddf_fun_t *hub_fun;
-        /** Status indicator */
-        bool running;
+        /** Device communication pipe. */
+        usb_pipe_t *control_pipe;
         /** Hub supports port power switching. */
         bool power_switched;
         /** Each port is switched individually. */
         bool per_port_power;
+        /** Whether MTT is available */
+        bool mtt_available;
 };
 
-extern const usb_endpoint_description_t hub_status_change_endpoint_description;
+extern const usb_endpoint_description_t *usb_hub_endpoints [];
 
-extern errno_t usb_hub_device_add(usb_device_t *);
-extern errno_t usb_hub_device_remove(usb_device_t *);
-extern errno_t usb_hub_device_gone(usb_device_t *);
+errno_t usb_hub_device_add(usb_device_t *);
+errno_t usb_hub_device_remove(usb_device_t *);
+errno_t usb_hub_device_gone(usb_device_t *);
 
-extern bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t,
-    void *);
+errno_t usb_hub_set_depth(const usb_hub_dev_t *);
+errno_t usb_hub_get_port_status(const usb_hub_dev_t *, size_t,
+    usb_port_status_t *);
+errno_t usb_hub_set_port_feature(const usb_hub_dev_t *, size_t,
+    usb_hub_class_feature_t);
+errno_t usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t,
+    usb_hub_class_feature_t);
+
+bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t, void *);
+
+errno_t usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *,
+    usb_port_t *);
+errno_t usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *);
 
 #endif