Changes in uspace/drv/bus/usb/usbhub/usbhub.h [a1cb170:5203e256] in mainline

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
- * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -49 +49 @@
 #define NAME "usbhub"
 
-#include "port.h"
+#include "ports.h"
 
 /** Information about attached hub. */
@@ -56 +56 @@
         size_t port_count;
 
-        /** Attached device handles, for each port one */
+        /** attached device handles, for each port one */
         usb_hub_port_t *ports;
 
-        /** Connection to hcd */
+        fibril_mutex_t port_mutex;
+
+        /** connection to hcd */
         usb_hc_connection_t connection;
 
-        /** Generic usb device data*/
-        usb_device_t *usb_device;
+        /** default address is used indicator
+         *
+         * If default address is requested by this device, it cannot
+         * be requested by the same hub again, otherwise a deadlock will occur.
+         */
+        bool is_default_address_used;
+
+        /** convenience pointer to status change pipe
+         *
+         * Status change pipe is initialized in usb_device structure. This is
+         * pointer into this structure, so that it does not have to be
+         * searched again and again for the 'right pipe'.
+         */
+        usb_pipe_t * status_change_pipe;
+
+        /** convenience pointer to control pipe
+         *
+         * Control pipe is initialized in usb_device structure. This is
+         * pointer into this structure, so that it does not have to be
+         * searched again and again for the 'right pipe'.
+         */
+        usb_pipe_t * control_pipe;
+
+        /** generic usb device data*/
+        usb_device_t * usb_device;
 
         /** Number of pending operations on the mutex to prevent shooting
@@ -76 +101 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
+
 };