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

Timestamp:

2018-01-16T03:45:38Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c952abc4

Parents:

d2c3dcd

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-15 20:49:15)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-16 03:45:38)

Message:

usbhub: rewrite port handling

The state space of a usb hub port is a bit more complex than what was
there originally. Got rid of the active operations counting, and
replaced that with finite state machine. Fixes a lot of race conditions
and lack of synchronization when connect and disconnect events come very
fast.

File:

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

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

@@ -50 +50 @@
 
 #include "port.h"
+#include "status.h"
 
 /** Information about attached hub. */
@@ -61 +62 @@
         /** Data polling handle. */
         usb_polling_t polling;
-        /** 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;
         /** Pointer to usbhub function. */
         ddf_fun_t *hub_fun;
-        /** Status indicator */
-        volatile bool running;
+        /** Device communication pipe. */
+        usb_pipe_t *control_pipe;
         /** Hub supports port power switching. */
         bool power_switched;
@@ -84 +74 @@
 extern const usb_endpoint_description_t hub_status_change_endpoint_description;
 
-extern int usb_hub_device_add(usb_device_t *);
-extern int usb_hub_device_remove(usb_device_t *);
-extern int usb_hub_device_gone(usb_device_t *);
+int usb_hub_device_add(usb_device_t *);
+int usb_hub_device_remove(usb_device_t *);
+int usb_hub_device_gone(usb_device_t *);
 
-extern bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t,
-    void *);
+int usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *);
+int usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
+int 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 *);
 
 #endif