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

Timestamp:

2011-11-10T20:03:48Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fa76f81

Parents:

27ca3a3 (diff), 747ef72 (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:

Merge with mainline

File:

• uspace/lib/usbdev/src/devpoll.c (modified) (4 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;
         }
 
-        usb_device_auto_polling_t *auto_polling
-            = malloc(sizeof(usb_device_auto_polling_t));
-        if (auto_polling == NULL) {
-                return ENOMEM;
-        }
-
-        auto_polling->debug = 1;
-        auto_polling->auto_clear_halt = true;
-        auto_polling->delay = 0;
-        auto_polling->max_failures = MAX_FAILED_ATTEMPTS;
-        auto_polling->on_data = callback;
-        auto_polling->on_polling_end = terminated_callback;
-        auto_polling->on_error = NULL;
-
-        int rc = usb_device_auto_polling(dev, pipe_index, auto_polling,
+        const usb_device_auto_polling_t auto_polling = {
+                .debug = 1,
+                .auto_clear_halt = true,
+                .delay = 0,
+                .max_failures = MAX_FAILED_ATTEMPTS,
+                .on_data = callback,
+                .on_polling_end = terminated_callback,
+                .on_error = NULL,
+        };
+
+        return usb_device_auto_polling(dev, pipe_index, &auto_polling,
            request_size, arg);
-
-        free(auto_polling);
-
-        return rc;
 }
 
@@ -253 +245 @@
  */
 int usb_device_auto_polling(usb_device_t *dev, size_t pipe_index,
-    usb_device_auto_polling_t *polling,
+    const usb_device_auto_polling_t *polling,
     size_t request_size, void *arg)
 {
@@ -262 +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;
         }