Changes in uspace/drv/bus/usb/usbhub/usbhub.h [34d750c:d15797d] in mainline

File:

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

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

@@ -39 +39 @@
 
 #include <ddf/driver.h>
-#include <fibril_synch.h>
 
 #include <usb/classes/hub.h>
@@ -45 +44 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
-#include <usb/dev/poll.h>
+
+#include <fibril_synch.h>
 
 #define NAME "usbhub"
 
 #include "port.h"
-#include "status.h"
 
 /** Information about attached hub. */
@@ -58 +57 @@
         /** 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;
-        /** 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;
-        /** Device communication pipe. */
-        usb_pipe_t *control_pipe;
+        /** Status indicator */
+        bool running;
         /** 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 *usb_hub_endpoints [];
+extern const usb_endpoint_description_t hub_status_change_endpoint_description;
 
-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 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_set_depth(const usb_hub_dev_t *);
-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 *);
-
-int usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *);
-int usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *);
+extern bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t,
+    void *);
 
 #endif