Changes in uspace/drv/bus/usb/usbhub/port.h [0f79283b:b7fd2a0] in mainline

File:

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

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

@@ -2 +2 @@
  * Copyright (c) 2011 Vojtech Horky
  * Copyright (c) 2011 Jan Vesely
- * Copyright (c) 2017 Ondra Hlavaty
  * All rights reserved.
  *
@@ -33 +32 @@
  */
 /** @file
- * Hub port handling.
+ * Hub ports related functions.
  */
 
@@ -41 +40 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/hub.h>
-#include <usb/port.h>
+#include <usb_iface.h>
 
 typedef struct usb_hub_dev usb_hub_dev_t;
@@ -47 +46 @@
 /** Information about single port on a hub. */
 typedef struct {
-        usb_port_t base;
-        /* Parenting hub */
-        usb_hub_dev_t *hub;
         /** Port number as reported in descriptors. */
         unsigned int port_number;
-        /** Speed at the time of enabling the port */
-        usb_speed_t speed;
+        /** Device communication pipe. */
+        usb_pipe_t *control_pipe;
+        /** Mutex needed not only by CV for checking port reset. */
+        fibril_mutex_t mutex;
+        /** CV for waiting to port reset completion. */
+        fibril_condvar_t reset_cv;
+        /** Port reset status.
+         * Guarded by @c reset_mutex.
+         */
+        enum {
+                NO_RESET,
+                IN_RESET,
+                RESET_OK,
+                RESET_FAIL,
+        } reset_status;
+        /** Device reported to USB bus driver */
+        bool device_attached;
 } usb_hub_port_t;
 
-void usb_hub_port_init(usb_hub_port_t *, usb_hub_dev_t *, unsigned int);
+/** Initialize hub port information.
+ *
+ * @param port Port to be initialized.
+ */
+static inline void usb_hub_port_init(usb_hub_port_t *port,
+    unsigned int port_number, usb_pipe_t *control_pipe)
+{
+        assert(port);
+        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);
+}
 
-void usb_hub_port_process_interrupt(usb_hub_port_t *port);
+errno_t usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub);
+errno_t usb_hub_port_clear_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature);
+errno_t usb_hub_port_set_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature);
+void usb_hub_port_reset_fail(usb_hub_port_t *port);
+void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_dev_t *hub);
 
 #endif