Changeset c386d6d in mainline

Timestamp:

2018-01-09T18:23:47Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

970f6e1

Parents:

cf5cbac4

git-author:

Petr Manek <petr.manek@…> (2018-01-09 18:23:40)

git-committer:

Petr Manek <petr.manek@…> (2018-01-09 18:23:47)

Message:

usbdev: refactoring

Polling syntax sugar API extended to allow custom error handlers. USB
hub polling changed to follow suit.

Location:

uspace

Files:

• drv/bus/usb/usbhub/usbhub.c (modified) (1 diff)
• lib/usbdev/include/usb/dev/poll.h (modified) (2 diffs)
• lib/usbdev/src/devpoll.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -151 +151 @@
             &hub_status_change_endpoint_description,
             hub_port_changes_callback, ((hub_dev->port_count + 1 + 7) / 8),
-            -1, usb_hub_polling_terminated_callback, hub_dev);
+            -1, NULL, usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
                 /* Function is already bound */

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

@@ -93 +93 @@
 
 typedef bool (*usb_polling_callback_t)(usb_device_t *, uint8_t *, size_t, void *);
+typedef bool (*usb_polling_error_callback_t)(usb_device_t *, int, void *);
 typedef void (*usb_polling_terminted_callback_t)(usb_device_t *, bool, void *);
 
@@ -107 +108 @@
 extern int usb_device_auto_poll_desc(usb_device_t *,
     const usb_endpoint_description_t *, usb_polling_callback_t, size_t, int,
-    usb_polling_terminted_callback_t, void *);
+    usb_polling_error_callback_t, usb_polling_terminted_callback_t, void *);
 
 #endif

uspace/lib/usbdev/src/devpoll.c

@@ -332 +332 @@
 int usb_device_auto_poll_desc(usb_device_t * usb_dev,
     const usb_endpoint_description_t *desc, usb_polling_callback_t callback,
-    size_t req_size, int delay,
+    size_t req_size, int delay, usb_polling_error_callback_t error_callback,
     usb_polling_terminted_callback_t terminated_callback, void *arg)
 {
@@ -342 +342 @@
                 .on_data = callback,
                 .on_polling_end = terminated_callback,
-                .on_error = NULL,
+                .on_error = error_callback,
                 .arg = arg,
         };