Changeset a0487a2 in mainline

Timestamp:

2011-12-14T16:04:52Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5dd4294b

Parents:

6e3c005

Message:

libusbdev: Move arg callback argument from poling_data_t to usb_device_auto_polling_t.

That's where the callbacks are.

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/poll.h (modified) (1 diff)
• src/devpoll.c (modified) (7 diffs)

uspace/lib/usbdev/include/usb/dev/poll.h

@@ -83 +83 @@
          */
         bool (*on_error)(usb_device_t *dev, int err_code, void *arg);
+        /** Argument to pass to callbacks. */
+        void *arg;
 } usb_device_auto_polling_t;
 
 int usb_device_auto_polling(usb_device_t *, size_t,
-    const usb_device_auto_polling_t *, size_t, void *);
+    const usb_device_auto_polling_t *, size_t);
 
 typedef bool (*usb_polling_callback_t)(usb_device_t *,

uspace/lib/usbdev/src/devpoll.c

@@ -57 +57 @@
         /** Data buffer. */
         uint8_t *buffer;
-        /** Argument to pass to callbacks. */
-        void *custom_arg;
 } polling_data_t;
 
@@ -125 +123 @@
                         ++failed_attempts;
                         const bool cont = (params->on_error == NULL) ? true :
-                            params->on_error(data->dev, rc, data->custom_arg);
+                            params->on_error(data->dev, rc, params->arg);
                         if (!cont) {
                                 failed_attempts = params->max_failures;
@@ -135 +133 @@
                 assert(params->on_data);
                 const bool carry_on = params->on_data(
-                    data->dev, data->buffer, actual_size, data->custom_arg);
+                    data->dev, data->buffer, actual_size, params->arg);
 
                 if (!carry_on) {
@@ -155 +153 @@
 
         if (params->on_polling_end != NULL) {
-                params->on_polling_end(data->dev, failed, data->custom_arg);
+                params->on_polling_end(data->dev, failed, params->arg);
         }
 
@@ -205 +203 @@
                 .on_polling_end = terminated_callback,
                 .on_error = NULL,
+                .arg = arg,
         };
 
         return usb_device_auto_polling(dev, pipe_index, &auto_polling,
-           request_size, arg);
+           request_size);
 }
 
@@ -230 +229 @@
 int usb_device_auto_polling(usb_device_t *dev, size_t pipe_index,
     const usb_device_auto_polling_t *polling,
-    size_t request_size, void *arg)
+    size_t request_size)
 {
         if ((dev == NULL) || (polling == NULL) || (polling->on_data == NULL)) {
@@ -258 +257 @@
         polling_data->dev = dev;
         polling_data->pipe_index = pipe_index;
-        polling_data->custom_arg = arg;
 
         /* Copy provided settings. */