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

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

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

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

@@ -80 +80 @@
          */
         int hc_phone;
-} usb_endpoint_pipe_t;
+} usb_pipe_t;
 
 
@@ -102 +102 @@
 typedef struct {
         /** Endpoint pipe. */
-        usb_endpoint_pipe_t *pipe;
+        usb_pipe_t *pipe;
         /** Endpoint description. */
         const usb_endpoint_description_t *description;
@@ -125 +125 @@
 usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
-int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
-    usb_device_connection_t *,
+int usb_pipe_initialize(usb_pipe_t *, usb_device_connection_t *,
     usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
-int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
+int usb_pipe_initialize_default_control(usb_pipe_t *,
     usb_device_connection_t *);
-int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *);
-int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
+int usb_pipe_probe_default_control(usb_pipe_t *);
+int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
-int usb_endpoint_pipe_register(usb_endpoint_pipe_t *, unsigned int,
-    usb_hc_connection_t *);
-int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *, usb_hc_connection_t *);
+int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *);
+int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
 
-int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);
-int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *);
-bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_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_endpoint_pipe_read(usb_endpoint_pipe_t *, void *, size_t, size_t *);
-int usb_endpoint_pipe_write(usb_endpoint_pipe_t *, void *, size_t);
+int usb_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
+int usb_pipe_write(usb_pipe_t *, void *, size_t);
 
-int usb_endpoint_pipe_control_read(usb_endpoint_pipe_t *, void *, size_t,
+int usb_pipe_control_read(usb_pipe_t *, void *, size_t,
     void *, size_t, size_t *);
-int usb_endpoint_pipe_control_write(usb_endpoint_pipe_t *, void *, size_t,
+int usb_pipe_control_write(usb_pipe_t *, void *, size_t,
     void *, size_t);