Changeset e1dbcbc in mainline for uspace/lib/usb/include/usb/pipes.h

Timestamp:

2011-04-29T13:43:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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 development/ changes

File:

• uspace/lib/usb/include/usb/pipes.h (modified) (2 diffs)

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

@@ -99 +99 @@
         /** 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.
+         * Valid only for control endpoint zero.
+         */
+        bool auto_reset_halt;
 } usb_pipe_t;
 
@@ -158 +177 @@
 int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
 
-int usb_pipe_start_session(usb_pipe_t *);
-int usb_pipe_end_session(usb_pipe_t *);
-bool usb_pipe_is_session_started(usb_pipe_t *);
-
-int usb_pipe_start_long_transfer(usb_pipe_t *);
+void usb_pipe_start_long_transfer(usb_pipe_t *);
 void usb_pipe_end_long_transfer(usb_pipe_t *);