Changes in uspace/lib/usbdev/include/usb/dev/pipes.h [47dfb34:b4292e7] in mainline

File:

• uspace/lib/usbdev/include/usb/dev/pipes.h (modified) (6 diffs)

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libusbdev
  * @{
@@ -37 +38 @@
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/dev.h>
+#include <usb/hc.h>
 #include <usb/descriptor.h>
 #include <ipc/devman.h>
@@ -43 +44 @@
 #include <fibril_synch.h>
 #include <async.h>
+
+/** Abstraction of a physical connection to the device.
+ * This type is an abstraction of the USB wire that connects the host and
+ * the function (device).
+ */
+typedef struct {
+        /** Handle of the host controller device is connected to. */
+        devman_handle_t hc_handle;
+        /** Address of the device. */
+        usb_address_t address;
+} usb_device_connection_t;
 
 /** Abstraction of a logical connection to USB device endpoint.
@@ -73 +85 @@
         /** Maximum packet size for the endpoint. */
         size_t max_packet_size;
+
+        /** Session to the host controller.
+         * NULL when no session is active.
+         * It is an error to access this member without @c hc_sess_mutex
+         * being locked.
+         * If call over the phone is to be made, it must be preceeded by
+         * call to pipe_add_ref() [internal libusb function].
+         */
+        async_sess_t *hc_sess;
+
+        /** Guard for serialization of requests over the session. */
+        fibril_mutex_t hc_sess_mutex;
+
+        /** Number of active transfers over the pipe. */
+        int refcount;
+        /** Number of failed attempts to open the HC phone.
+         * When user requests usb_pipe_start_long_transfer() and the operation
+         * fails, there is no way to report this to the user.
+         * That the soft reference counter is increased to record the attempt.
+         * When the user then request e.g. usb_pipe_read(), it will try to
+         * add reference as well.
+         * If that fails, it is reported to the user. If it is okay, the
+         * real reference counter is incremented.
+         * The problem might arise when ending the long transfer (since
+         * the number of references would be only 1, but logically it shall be
+         * two).
+         * Decrementing the soft counter first shall solve this.
+         */
+        int refcount_soft;
 
         /** Whether to automatically reset halt on the endpoint.
@@ -115 +156 @@
 } usb_endpoint_mapping_t;
 
+int usb_device_connection_initialize_on_default_address(
+    usb_device_connection_t *, usb_hc_connection_t *);
+int usb_device_connection_initialize_from_device(usb_device_connection_t *,
+    const ddf_dev_t *);
+int usb_device_connection_initialize(usb_device_connection_t *,
+    devman_handle_t, usb_address_t);
 
 int usb_device_get_assigned_interface(const ddf_dev_t *);
@@ -122 +169 @@
 int usb_pipe_initialize_default_control(usb_pipe_t *,
     usb_device_connection_t *);
-
 int usb_pipe_probe_default_control(usb_pipe_t *);
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, const uint8_t *, size_t, usb_device_connection_t *);
-int usb_pipe_register(usb_pipe_t *, unsigned);
-int usb_pipe_unregister(usb_pipe_t *);
+int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *);
+int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
 
-int usb_pipe_start_long_transfer(usb_pipe_t *);
-int usb_pipe_end_long_transfer(usb_pipe_t *);
+void usb_pipe_start_long_transfer(usb_pipe_t *);
+void usb_pipe_end_long_transfer(usb_pipe_t *);
 
 int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);