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

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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 mainline changes

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.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup drvusbhub
  * @{
@@ -49 +49 @@
 #define NAME "usbhub"
 
-#include "ports.h"
+#include "port.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;
 
-        fibril_mutex_t port_mutex;
-
-        /** connection to hcd */
+        /** Connection to hcd */
         usb_hc_connection_t connection;
 
-        /** 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;
+        /** Generic usb device data*/
+        usb_device_t *usb_device;
 
         /** Number of pending operations on the mutex to prevent shooting
@@ -101 +76 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
-
 };