Changeset 62f4212 in mainline for uspace/lib/usb/src/devpoll.c

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/src/devpoll.c (modified) (3 diffs)

uspace/lib/usb/src/devpoll.c

@@ -64 +64 @@
         assert(polling_data);
 
-        usb_endpoint_pipe_t *pipe
+        usb_pipe_t *pipe
             = polling_data->dev->pipes[polling_data->pipe_index].pipe;
 
@@ -71 +71 @@
                 int rc;
 
-                rc = usb_endpoint_pipe_start_session(pipe);
+                rc = usb_pipe_start_session(pipe);
                 if (rc != EOK) {
                         failed_attempts++;
@@ -78 +78 @@
 
                 size_t actual_size;
-                rc = usb_endpoint_pipe_read(pipe, polling_data->buffer,
+                rc = usb_pipe_read(pipe, polling_data->buffer,
                     polling_data->request_size, &actual_size);
 
                 /* Quit the session regardless of errors. */
-                usb_endpoint_pipe_end_session(pipe);
+                usb_pipe_end_session(pipe);
 
                 if (rc != EOK) {