Changeset 71f211f in mainline for uspace/lib/usbdev/include/usb/dev/poll.h

Timestamp:

2018-01-13T20:47:58Z (6 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

8a0c52a

Parents:

7dddd7b

git-author:

Petr Manek <petr.manek@…> (2018-01-13 20:44:08)

git-committer:

Petr Manek <petr.manek@…> (2018-01-13 20:47:58)

Message:

usbdev: refactor polling data structs

Symbols related to USB device endpoint polling have been moved around
and renamed in this commit.

usb_device_auto_polling_t, which has the semantics of a configuration
parameter struct, has been renamed to usb_device_polling_config_t.

usb_device_auto_polling() is now called usb_device_poll().

A new data structure, usb_device_polling_t, has been introduced to
serve as a user handle to the active polling process (WIP).

File:

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

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

@@ -44 +44 @@
 #include <stdint.h>
 
+/** Automated polling instance. */
+typedef struct usb_device_polling usb_device_polling_t;
+
 /** Parameters and callbacks for automated polling. */
-typedef struct {
+typedef struct usb_device_polling_config {
         /** Level of debugging messages from auto polling.
          * 0 - nothing
@@ -52 +55 @@
          */
         int debug;
+
         /** Maximum number of consecutive errors before polling termination. */
         size_t max_failures;
+
         /** Delay between poll requests in milliseconds.
          * Set to negative value to use value from endpoint descriptor.
          */
         int delay;
+
         /** Whether to automatically try to clear the HALT feature after
          * the endpoint stalls.
          */
         bool auto_clear_halt;
+
         /** Callback when data arrives.
          *
@@ -72 +79 @@
         bool (*on_data)(usb_device_t *dev, uint8_t *data, size_t data_size,
             void *arg);
+
         /** Callback when polling is terminated.
          *
@@ -80 +88 @@
         void (*on_polling_end)(usb_device_t *dev, bool due_to_errors,
             void *arg);
+
         /** Callback when error occurs.
          *
@@ -88 +97 @@
          */
         bool (*on_error)(usb_device_t *dev, int err_code, void *arg);
+
         /** Argument to pass to callbacks. */
         void *arg;
-} usb_device_auto_polling_t;
+} usb_device_polling_config_t;
 
-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 *);
-
-extern int usb_device_auto_polling(usb_device_t *, usb_endpoint_mapping_t *,
-    const usb_device_auto_polling_t *, size_t);
+extern int usb_device_poll(usb_device_t *, usb_endpoint_mapping_t *,
+    const usb_device_polling_config_t *, size_t, usb_device_polling_t **);
 
 #endif