Changes in uspace/drv/bus/usb/usbhub/port.h [9d58539:58563585] in mainline

File:

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

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

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup drvusbhub
  * @{
@@ -33 +34 @@
  * Hub ports related functions.
  */
+
 #ifndef DRV_USBHUB_PORT_H
 #define DRV_USBHUB_PORT_H
 
 #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 +46 @@
 /** 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 int port_number;
         /** Device communication pipe. */
         usb_pipe_t *control_pipe;
@@ -52 +54 @@
         /** 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 +71 @@
  * @param port Port to be initialized.
  */
-static inline void usb_hub_port_init(usb_hub_port_t *port, size_t port_number,
-    usb_pipe_t *control_pipe)
+static inline void usb_hub_port_init(usb_hub_port_t *port,
+    unsigned int 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);
 }
+
 int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub);
 int usb_hub_port_clear_feature(
@@ -87 +92 @@
 
 #endif
+
 /**
  * @}