Changeset d7ff048 in mainline for uspace/drv/bus/usb/usbhub/port.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/port.h (moved) (moved from uspace/drv/bus/usb/usbhub/ports.h ) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup drvusbhub
  * @{
@@ -33 +33 @@
  * Hub ports related functions.
  */
-#ifndef DRV_USBHUB_PORTS_H
-#define DRV_USBHUB_PORTS_H
+#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>
 
 typedef struct usb_hub_info_t usb_hub_info_t;
@@ -43 +44 @@
 /** Information about single port on a hub. */
 typedef struct {
-        /** Mutex needed by CV for checking port reset. */
-        fibril_mutex_t reset_mutex;
+        size_t port_number;
+        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;
@@ -62 +65 @@
  * @param port Port to be initialized.
  */
-static inline void usb_hub_port_init(usb_hub_port_t *port) {
+static inline void usb_hub_port_init(usb_hub_port_t *port, size_t port_number,
+    usb_pipe_t *control_pipe)
+{
+        assert(port);
         port->attached_device.address = -1;
         port->attached_device.handle = 0;
-        fibril_mutex_initialize(&port->reset_mutex);
+        port->port_number = port_number;
+        port->control_pipe = control_pipe;
+        fibril_mutex_initialize(&port->mutex);
         fibril_condvar_initialize(&port->reset_cv);
 }
 
-
-void usb_hub_process_port_interrupt(usb_hub_info_t *hub,
-        uint16_t port);
-
-
+void usb_hub_port_reset_fail(usb_hub_port_t *port);
+void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub);
+int usb_hub_port_clear_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature);
+int usb_hub_port_set_feature(
+    usb_hub_port_t *port, usb_hub_class_feature_t feature);
 
 #endif