Changeset c804484 in mainline

Timestamp:

2011-12-12T13:14:09Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3538b0e

Parents:

1561e8b

Message:

libusbdev: Move pipe init/init_default register/unregister impelmentation to pipes.c

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/pipes.h (modified) (4 diffs)
• src/pipes.c (modified) (1 diff)
• src/pipesinit.c (modified) (3 diffs)

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

@@ -44 +44 @@
 #include <usb/dev/usb_device_connection.h>
 
+#define CTRL_PIPE_MIN_PACKET_SIZE 8
 /** Abstraction of a logical connection to USB device endpoint.
  * It encapsulates endpoint attributes (transfer type etc.) as well
@@ -80 +81 @@
 } usb_pipe_t;
 
-
 /** Description of endpoint characteristics. */
 typedef struct {
@@ -115 +115 @@
 } usb_endpoint_mapping_t;
 
-
 int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,
     usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
@@ -124 +123 @@
 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 *);

uspace/lib/usbdev/src/pipes.c

@@ -292 +292 @@
         return usb_pipe_write_no_check(pipe, 0, buffer, size);
 }
+/*----------------------------------------------------------------------------*/
+/** Initialize USB endpoint pipe.
+ *
+ * @param pipe Endpoint pipe to be initialized.
+ * @param connection Connection to the USB device backing this pipe (the wire).
+ * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15).
+ * @param transfer_type Transfer type (e.g. interrupt or bulk).
+ * @param max_packet_size Maximum packet size in bytes.
+ * @param direction Endpoint direction (in/out).
+ * @return Error code.
+ */
+int usb_pipe_initialize(usb_pipe_t *pipe,
+    usb_device_connection_t *connection, usb_endpoint_t endpoint_no,
+    usb_transfer_type_t transfer_type, size_t max_packet_size,
+    usb_direction_t direction)
+{
+        assert(pipe);
+        assert(connection);
+
+        fibril_mutex_initialize(&pipe->guard);
+        pipe->wire = connection;
+        pipe->endpoint_no = endpoint_no;
+        pipe->transfer_type = transfer_type;
+        pipe->max_packet_size = max_packet_size;
+        pipe->direction = direction;
+        pipe->auto_reset_halt = false;
+
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+/** Initialize USB endpoint pipe as the default zero control pipe.
+ *
+ * @param pipe Endpoint pipe to be initialized.
+ * @param connection Connection to the USB device backing this pipe (the wire).
+ * @return Error code.
+ */
+int usb_pipe_initialize_default_control(usb_pipe_t *pipe,
+    usb_device_connection_t *connection)
+{
+        assert(pipe);
+        assert(connection);
+
+        int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL,
+            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH);
+
+        pipe->auto_reset_halt = true;
+
+        return rc;
+}
+/*----------------------------------------------------------------------------*/
+/** Register endpoint with the host controller.
+ *
+ * @param pipe Pipe to be registered.
+ * @param interval Polling interval.
+ * @return Error code.
+ */
+int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
+{
+        assert(pipe);
+        assert(pipe->wire);
+
+        return usb_device_register_endpoint(pipe->wire,
+           pipe->endpoint_no, pipe->transfer_type,
+           pipe->direction, pipe->max_packet_size, interval);
+}
+/*----------------------------------------------------------------------------*/
+/** Revert endpoint registration with the host controller.
+ *
+ * @param pipe Pipe to be unregistered.
+ * @return Error code.
+ */
+int usb_pipe_unregister(usb_pipe_t *pipe)
+{
+        assert(pipe);
+        assert(pipe->wire);
+
+        return usb_device_unregister_endpoint(pipe->wire,
+            pipe->endpoint_no, pipe->direction);
+}
+
 /**
  * @}

uspace/lib/usbdev/src/pipesinit.c

@@ -41 +41 @@
 #include <assert.h>
 
-#define CTRL_PIPE_MIN_PACKET_SIZE 8
 #define DEV_DESCR_MAX_PACKET_SIZE_OFFSET 7
-
 
 #define NESTING(parentname, childname) \
@@ -326 +324 @@
 
         return EOK;
-}
-
-/** Initialize USB endpoint pipe.
- *
- * @param pipe Endpoint pipe to be initialized.
- * @param connection Connection to the USB device backing this pipe (the wire).
- * @param endpoint_no Endpoint number (in USB 1.1 in range 0 to 15).
- * @param transfer_type Transfer type (e.g. interrupt or bulk).
- * @param max_packet_size Maximum packet size in bytes.
- * @param direction Endpoint direction (in/out).
- * @return Error code.
- */
-int usb_pipe_initialize(usb_pipe_t *pipe,
-    usb_device_connection_t *connection, usb_endpoint_t endpoint_no,
-    usb_transfer_type_t transfer_type, size_t max_packet_size,
-    usb_direction_t direction)
-{
-        assert(pipe);
-        assert(connection);
-
-        fibril_mutex_initialize(&pipe->guard);
-        pipe->wire = connection;
-        pipe->endpoint_no = endpoint_no;
-        pipe->transfer_type = transfer_type;
-        pipe->max_packet_size = max_packet_size;
-        pipe->direction = direction;
-        pipe->auto_reset_halt = false;
-
-        return EOK;
-}
-
-/** Initialize USB endpoint pipe as the default zero control pipe.
- *
- * @param pipe Endpoint pipe to be initialized.
- * @param connection Connection to the USB device backing this pipe (the wire).
- * @return Error code.
- */
-int usb_pipe_initialize_default_control(usb_pipe_t *pipe,
-    usb_device_connection_t *connection)
-{
-        assert(pipe);
-        assert(connection);
-
-        int rc = usb_pipe_initialize(pipe, connection, 0, USB_TRANSFER_CONTROL,
-            CTRL_PIPE_MIN_PACKET_SIZE, USB_DIRECTION_BOTH);
-
-        pipe->auto_reset_halt = true;
-
-        return rc;
 }
 
@@ -428 +377 @@
 }
 
-/** Register endpoint with the host controller.
- *
- * @param pipe Pipe to be registered.
- * @param interval Polling interval.
- * @return Error code.
- */
-int usb_pipe_register(usb_pipe_t *pipe, unsigned interval)
-{
-        assert(pipe);
-        assert(pipe->wire);
-
-        return usb_device_register_endpoint(pipe->wire,
-           pipe->endpoint_no, pipe->transfer_type,
-           pipe->direction, pipe->max_packet_size, interval);
-}
-
-/** Revert endpoint registration with the host controller.
- *
- * @param pipe Pipe to be unregistered.
- * @return Error code.
- */
-int usb_pipe_unregister(usb_pipe_t *pipe)
-{
-        assert(pipe);
-        assert(pipe->wire);
-
-        return usb_device_unregister_endpoint(pipe->wire,
-            pipe->endpoint_no, pipe->direction);
-}
-
 /**
  * @}