Changeset 71f211f 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:

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).

Location:

uspace/drv

Files:

• bus/usb/usbhub/usbhub.c (modified) (2 diffs)
• bus/usb/usbhub/usbhub.h (modified) (2 diffs)
• hid/usbhid/main.c (modified) (2 diffs)
• hid/usbhid/usbhid.h (modified) (2 diffs)

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

@@ -164 +164 @@
 
         /* Start hub operation. */
-        const usb_device_auto_polling_t auto_polling = {
+        const usb_device_polling_config_t config = {
                 .debug = 1,
                 .auto_clear_halt = true,
@@ -178 +178 @@
             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));
+        opResult = usb_device_poll(hub_dev->usb_device, epm, &config,
+            ((hub_dev->port_count + 1 + 7) / 8), &hub_dev->polling);
         
         if (opResult != EOK) {

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -44 +44 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
+#include <usb/dev/poll.h>
 
 #include <fibril_synch.h>
@@ -59 +60 @@
         /** Generic usb device data*/
         usb_device_t *usb_device;
-
+        /** Data polling handle. */
+        usb_device_polling_t *polling;
         /** Number of pending operations on the mutex to prevent shooting
          * ourselves in the foot.

uspace/drv/hid/usbhid/main.c

@@ -90 +90 @@
          * This will create a separate fibril that will query the device
          * for the data continuously. */
-        const usb_device_auto_polling_t auto_polling = {
+        const usb_device_polling_config_t config = {
                 .debug = 1,
                 .auto_clear_halt = true,
@@ -101 +101 @@
         };
 
-        rc = usb_device_auto_polling(dev, hid_dev->poll_pipe_mapping,
-            &auto_polling, hid_dev->poll_pipe_mapping->pipe.desc.max_transfer_size);
+        rc = usb_device_poll(dev, hid_dev->poll_pipe_mapping, &config,
+            hid_dev->poll_pipe_mapping->pipe.desc.max_transfer_size, &hid_dev->polling);
 
         if (rc != EOK) {

uspace/drv/hid/usbhid/usbhid.h

@@ -43 +43 @@
 #include <usb/dev/pipes.h>
 #include <usb/dev/driver.h>
+#include <usb/dev/poll.h>
 #include <usb/hid/hid.h>
 #include <stdbool.h>
@@ -107 +108 @@
         usb_endpoint_mapping_t *poll_pipe_mapping;
 
+        /** Device polling handle. */
+        usb_device_polling_t *polling;
+
         /** Subdrivers. */
         usb_hid_subdriver_t *subdrivers;