Changeset 6843a9c in mainline for uspace/lib/usbdev/include/usb/dev/poll.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:

• uspace/lib/usbdev/include/usb/dev/poll.h (modified) (2 diffs)

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

@@ -39 +39 @@
 #include <time.h>
 
+/** Parameters and callbacks for automated polling. */
 typedef struct {
         /** Level of debugging messages from auto polling.
@@ -82 +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, usb_device_auto_polling_t *,
-    size_t, void *);
+int usb_device_auto_polling(usb_device_t *, size_t,
+    const usb_device_auto_polling_t *, size_t);
 
 typedef bool (*usb_polling_callback_t)(usb_device_t *,