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

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

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

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

@@ -37 +37 @@
 
 #include <usb/dev/driver.h>
-#include <usb/dev/hub.h>
 #include <usb/classes/hub.h>
+#include <usb_iface.h>
 
 typedef struct usb_hub_dev usb_hub_dev_t;
@@ -44 +44 @@
 /** Information about single port on a hub. */
 typedef struct {
-        /* Port number as reported in descriptors. */
-        size_t port_number;
+        /** Port number as reported in descriptors. */
+        unsigned port_number;
         /** Device communication pipe. */
         usb_pipe_t *control_pipe;
@@ -52 +52 @@
         /** CV for waiting to port reset completion. */
         fibril_condvar_t reset_cv;
-        /** Whether port reset is completed.
+        /** Port reset status.
          * Guarded by @c reset_mutex.
          */
-        bool reset_completed;
-        /** Whether to announce the port reset as successful. */
-        bool reset_okay;
-
-        /** Information about attached device. */
-        usb_hub_attached_device_t attached_device;
+        enum {
+                NO_RESET,
+                IN_RESET,
+                RESET_OK,
+                RESET_FAIL,
+        } reset_status;
+        /** Device reported to USB bus driver */
+        bool device_attached;
 } usb_hub_port_t;
 
@@ -67 +69 @@
  * @param port Port to be initialized.
  */
-static inline void usb_hub_port_init(usb_hub_port_t *port, size_t port_number,
+static inline void usb_hub_port_init(usb_hub_port_t *port, unsigned port_number,
     usb_pipe_t *control_pipe)
 {
         assert(port);
-        port->attached_device.address = -1;
-        port->attached_device.fun = NULL;
         port->port_number = port_number;
         port->control_pipe = control_pipe;
+        port->reset_status = NO_RESET;
+        port->device_attached = false;
         fibril_mutex_initialize(&port->mutex);
         fibril_condvar_initialize(&port->reset_cv);