Changeset b77931d in mainline for uspace/lib/usbdev/src/devpoll.c

Timestamp:

2011-11-05T16:08:01Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d176b1d

Parents:

ab27e01

Message:

usb: usb_pipe_t was always allocated in usb_endpoint_mapping_t, embed it.

File:

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

uspace/lib/usbdev/src/devpoll.c

@@ -73 +73 @@
 
         usb_pipe_t *pipe
-            = polling_data->dev->pipes[polling_data->pipe_index].pipe;
+            = &polling_data->dev->pipes[polling_data->pipe_index].pipe;
         
         if (polling_data->debug > 0) {
@@ -208 +208 @@
                 return EINVAL;
         }
-        if ((dev->pipes[pipe_index].pipe->transfer_type != USB_TRANSFER_INTERRUPT)
-            || (dev->pipes[pipe_index].pipe->direction != USB_DIRECTION_IN)) {
+        if ((dev->pipes[pipe_index].pipe.transfer_type != USB_TRANSFER_INTERRUPT)
+            || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) {
                 return EINVAL;
         }
@@ -254 +254 @@
                 return EINVAL;
         }
-        if ((dev->pipes[pipe_index].pipe->transfer_type != USB_TRANSFER_INTERRUPT)
-            || (dev->pipes[pipe_index].pipe->direction != USB_DIRECTION_IN)) {
+        if ((dev->pipes[pipe_index].pipe.transfer_type != USB_TRANSFER_INTERRUPT)
+            || (dev->pipes[pipe_index].pipe.direction != USB_DIRECTION_IN)) {
                 return EINVAL;
         }