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

Timestamp:

2018-02-28T16:37:50Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

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) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -32 +33 @@
  */
 /** @file
- * Hub ports related functions.
+ * Hub port handling.
  */
 
@@ -40 +41 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/hub.h>
-#include <usb_iface.h>
+#include <usb/port.h>
 
 typedef struct usb_hub_dev usb_hub_dev_t;
@@ -46 +47 @@
 /** 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;
-        /** 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;
+        /** Speed at the time of enabling the port */
+        usb_speed_t speed;
 } usb_hub_port_t;
 
-/** 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_init(usb_hub_port_t *, usb_hub_dev_t *, unsigned int);
 
-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);
+void usb_hub_port_process_interrupt(usb_hub_port_t *port);
 
 #endif