Changeset 4166fb1 in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-05-28T19:33:52Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

5c1a65e

Parents:

151293d (diff), a066122c (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.

Message:

merge with usb/development

File:

• uspace/drv/usbhub/usbhub.h (modified) (2 diffs)

uspace/drv/usbhub/usbhub.h

@@ -61 +61 @@
         usb_hub_port_t *ports;
 
+        fibril_mutex_t port_mutex;
+
         /** connection to hcd */
         usb_hc_connection_t connection;
@@ -89 +91 @@
         /** 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;
+
 };