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

Timestamp:

2011-03-21T20:22:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56c5b5b

Parents:

4fb6d9ee (diff), 31b568e (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:

Development branch changes (including OHCI)

File:

• uspace/lib/usb/src/pipesinit.c (modified) (10 diffs)

uspace/lib/usb/src/pipesinit.c

@@ -193 +193 @@
         }
 
-        int rc = usb_endpoint_pipe_initialize(ep_mapping->pipe, wire,
+        int rc = usb_pipe_initialize(ep_mapping->pipe, wire,
             ep_no, description.transfer_type, endpoint->max_packet_size,
             description.direction);
@@ -276 +276 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_initialize_from_configuration(
+int usb_pipe_initialize_from_configuration(
     usb_endpoint_mapping_t *mapping, size_t mapping_count,
     uint8_t *configuration_descriptor, size_t configuration_descriptor_size,
@@ -342 +342 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe,
+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,
@@ -367 +367 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *pipe,
+int usb_pipe_initialize_default_control(usb_pipe_t *pipe,
     usb_device_connection_t *connection)
 {
@@ -373 +373 @@
         assert(connection);
 
-        int rc = usb_endpoint_pipe_initialize(pipe, connection,
+        int rc = usb_pipe_initialize(pipe, connection,
             0, USB_TRANSFER_CONTROL, CTRL_PIPE_MIN_PACKET_SIZE,
             USB_DIRECTION_BOTH);
@@ -390 +390 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *pipe)
+int usb_pipe_probe_default_control(usb_pipe_t *pipe)
 {
         assert(pipe);
@@ -408 +408 @@
 
         TRY_LOOP(failed_attempts) {
-                rc = usb_endpoint_pipe_start_session(pipe);
+                rc = usb_pipe_start_session(pipe);
                 if (rc == EOK) {
                         break;
@@ -433 +433 @@
                 }
         }
-        usb_endpoint_pipe_end_session(pipe);
+        usb_pipe_end_session(pipe);
         if (rc != EOK) {
                 return rc;
@@ -451 +451 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_register(usb_endpoint_pipe_t *pipe,
+int usb_pipe_register(usb_pipe_t *pipe,
     unsigned int interval,
     usb_hc_connection_t *hc_connection)
@@ -479 +479 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *pipe,
+int usb_pipe_unregister(usb_pipe_t *pipe,
     usb_hc_connection_t *hc_connection)
 {