Changeset e1dbcbc in mainline for uspace/lib/usb/src/pipesinit.c

Timestamp:

2011-04-29T13:43:01Z (14 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/src/pipesinit.c (modified) (3 diffs)

uspace/lib/usb/src/pipesinit.c

@@ -365 +365 @@
         pipe->direction = direction;
         pipe->refcount = 0;
+        pipe->refcount_soft = 0;
+        pipe->auto_reset_halt = false;
 
         return EOK;
@@ -385 +387 @@
             0, USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE,
             USB_DIRECTION_BOTH);
+
+        pipe->auto_reset_halt = true;
 
         return rc;
@@ -416 +420 @@
         int rc;
 
-        rc = usb_pipe_start_long_transfer(pipe);
-        if (rc != EOK) {
-                return rc;
-        }
-
+        usb_pipe_start_long_transfer(pipe);
 
         uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];