Changeset 399a13c in mainline for uspace/drv/usbhub/usbhub.h

Timestamp:

2011-05-30T13:50:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

17d1542

Parents:

a5fc431 (diff), 8971926 (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:

Development changes

File:

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

uspace/drv/usbhub/usbhub.h

@@ -51 +51 @@
 #include "ports.h"
 
-
-
 /** Information about attached hub. */
-struct usb_hub_info_t{
+struct usb_hub_info_t {
         /** Number of ports. */
         size_t port_count;
@@ -60 +58 @@
         /** attached device handles, for each port one */
         usb_hub_port_t *ports;
+
+        fibril_mutex_t port_mutex;
 
         /** connection to hcd */
@@ -89 +89 @@
         /** 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;
+
 };
 
-//int usb_hub_control_loop(void * hub_info_param);
-
-int usb_hub_add_device(usb_device_t * usb_dev);
+int usb_hub_add_device(usb_device_t *usb_dev);
 
 bool hub_port_changes_callback(usb_device_t *dev,