Changeset 3f0ad85a in mainline

Timestamp:

2011-11-26T13:52:35Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3ddbd38

Parents:

8969f46

Message:

libusbdev: Reorder functions in pipesio.c

File:

• uspace/lib/usbdev/src/pipesio.c (modified) (3 diffs)

uspace/lib/usbdev/src/pipesio.c

@@ -93 +93 @@
 }
 
-/** Request a read (in) transfer on an endpoint pipe.
- *
- * @param[in] pipe Pipe used for the transfer.
- * @param[out] buffer Buffer where to store the data.
- * @param[in] size Size of the buffer (in bytes).
- * @param[out] size_transfered Number of bytes that were actually transfered.
- * @return Error code.
- */
-int usb_pipe_read(usb_pipe_t *pipe,
-    void *buffer, size_t size, size_t *size_transfered)
-{
-        assert(pipe);
-
-        if (buffer == NULL) {
-                return EINVAL;
-        }
-
-        if (size == 0) {
-                return EINVAL;
-        }
-
-        if (pipe->direction != USB_DIRECTION_IN) {
-                return EBADF;
-        }
-
-        if (pipe->transfer_type == USB_TRANSFER_CONTROL) {
-                return EBADF;
-        }
-
-        size_t act_size = 0;
-        const int rc = usb_pipe_read_no_check(pipe, 0, buffer, size, &act_size);
-
-
-        if (rc == EOK && size_transfered != NULL) {
-                *size_transfered = act_size;
-        }
-
-        return rc;
-}
-
 /** Request an out transfer, no checking of input parameters.
  *
@@ -170 +130 @@
 }
 
-/** Request a write (out) transfer on an endpoint pipe.
- *
- * @param[in] pipe Pipe used for the transfer.
- * @param[in] buffer Buffer with data to transfer.
- * @param[in] size Size of the buffer (in bytes).
- * @return Error code.
- */
-int usb_pipe_write(usb_pipe_t *pipe, const void *buffer, size_t size)
-{
-        assert(pipe);
-
-        if (buffer == NULL || size == 0) {
-                return EINVAL;
-        }
-
-        if (pipe->direction != USB_DIRECTION_OUT) {
-                return EBADF;
-        }
-
-        if (pipe->transfer_type == USB_TRANSFER_CONTROL) {
-                return EBADF;
-        }
-
-        return usb_pipe_write_no_check(pipe, 0, buffer, size);
-}
-
 /** Try to clear endpoint halt of default control pipe.
  *
@@ -311 +245 @@
         return rc;
 }
+
+/** Request a read (in) transfer on an endpoint pipe.
+ *
+ * @param[in] pipe Pipe used for the transfer.
+ * @param[out] buffer Buffer where to store the data.
+ * @param[in] size Size of the buffer (in bytes).
+ * @param[out] size_transfered Number of bytes that were actually transfered.
+ * @return Error code.
+ */
+int usb_pipe_read(usb_pipe_t *pipe,
+    void *buffer, size_t size, size_t *size_transfered)
+{
+        assert(pipe);
+
+        if (buffer == NULL) {
+                return EINVAL;
+        }
+
+        if (size == 0) {
+                return EINVAL;
+        }
+
+        if (pipe->direction != USB_DIRECTION_IN) {
+                return EBADF;
+        }
+
+        if (pipe->transfer_type == USB_TRANSFER_CONTROL) {
+                return EBADF;
+        }
+
+        size_t act_size = 0;
+        const int rc = usb_pipe_read_no_check(pipe, 0, buffer, size, &act_size);
+
+
+        if (rc == EOK && size_transfered != NULL) {
+                *size_transfered = act_size;
+        }
+
+        return rc;
+}
+
+/** Request a write (out) transfer on an endpoint pipe.
+ *
+ * @param[in] pipe Pipe used for the transfer.
+ * @param[in] buffer Buffer with data to transfer.
+ * @param[in] size Size of the buffer (in bytes).
+ * @return Error code.
+ */
+int usb_pipe_write(usb_pipe_t *pipe, const void *buffer, size_t size)
+{
+        assert(pipe);
+
+        if (buffer == NULL || size == 0) {
+                return EINVAL;
+        }
+
+        if (pipe->direction != USB_DIRECTION_OUT) {
+                return EBADF;
+        }
+
+        if (pipe->transfer_type == USB_TRANSFER_CONTROL) {
+                return EBADF;
+        }
+
+        return usb_pipe_write_no_check(pipe, 0, buffer, size);
+}
+
 /**
  * @}