Changeset 7dddd7b in mainline for uspace/drv

Timestamp:

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

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

71f211f

Parents:

2489353

git-author:

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

git-committer:

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

Message:

usbdev: refactor polling

Until now, device polling had to be executed by calling one of four
proxy functions, which served as a syntax sugar and had no clear
distinction between each other (not to mention misleading names and high
number of arguments).

In this commit, the four mentioned functions are discarded in favor of
one main function, which was proxied by them either way. The number of
arguments have decreased in favor of named struct fields in the auto
polling config structure.

Drivers, which make use of polling, such as usbhid and usbhub were
updated to the latest API design.

Location:

uspace/drv

Files:

• bus/usb/usbhub/usbhub.c (modified) (1 diff)
• hid/usbhid/main.c (modified) (1 diff)

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

@@ -164 +164 @@
 
         /* Start hub operation. */
-        opResult = usb_device_auto_poll_desc(hub_dev->usb_device,
-            &hub_status_change_endpoint_description,
-            hub_port_changes_callback, ((hub_dev->port_count + 1 + 7) / 8),
-            -1, usb_hub_polling_error_callback,
-            usb_hub_polling_terminated_callback, hub_dev);
+        const usb_device_auto_polling_t auto_polling = {
+                .debug = 1,
+                .auto_clear_halt = true,
+                .delay = -1,
+                .max_failures = 3,
+                .on_data = hub_port_changes_callback,
+                .on_polling_end = usb_hub_polling_terminated_callback,
+                .on_error = usb_hub_polling_error_callback,
+                .arg = hub_dev,
+        };
+
+        usb_endpoint_mapping_t *epm =
+            usb_device_get_mapped_ep_desc(hub_dev->usb_device,
+            &hub_status_change_endpoint_description);
+        opResult = usb_device_auto_polling(hub_dev->usb_device, epm,
+            &auto_polling, ((hub_dev->port_count + 1 + 7) / 8));
+        
         if (opResult != EOK) {
                 /* Function is already bound */

uspace/drv/hid/usbhid/main.c

@@ -90 +90 @@
          * This will create a separate fibril that will query the device
          * for the data continuously. */
-        rc = usb_device_auto_poll_desc(dev,
-           /* Index of the polling pipe. */
-           hid_dev->poll_pipe_mapping->description,
-           /* Callback when data arrives. */
-           usb_hid_polling_callback,
-           /* How much data to request. */
-           hid_dev->poll_pipe_mapping->pipe.desc.max_transfer_size,
-           /* Delay */
-           -1,
-           /* Callback when the polling fails. */
-           usb_hid_polling_error_callback,
-           /* Callback when the polling ends. */
-           usb_hid_polling_ended_callback,
-           /* Custom argument. */
-           hid_dev);
+        const usb_device_auto_polling_t auto_polling = {
+                .debug = 1,
+                .auto_clear_halt = true,
+                .delay = -1,
+                .max_failures = 3,
+                .on_data = usb_hid_polling_callback,
+                .on_polling_end = usb_hid_polling_ended_callback,
+                .on_error = usb_hid_polling_error_callback,
+                .arg = hid_dev,
+        };
+
+        rc = usb_device_auto_polling(dev, hid_dev->poll_pipe_mapping,
+            &auto_polling, hid_dev->poll_pipe_mapping->pipe.desc.max_transfer_size);
 
         if (rc != EOK) {