Changeset b4b534ac in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (6 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -65 +65 @@
         }
 
-        if (dev->interface_no < 0) {
+        if (usb_device_get_iface_number(dev) < 0) {
                 usb_log_error("Failed to add HID device: endpoints not found."
                     "\n");
@@ -89 +89 @@
          * This will create a separate fibril that will query the device
          * for the data continuously. */
-       rc = usb_device_auto_poll(dev,
+        rc = usb_device_auto_poll_desc(dev,
            /* Index of the polling pipe. */
-           hid_dev->poll_pipe_index,
+           hid_dev->poll_pipe_mapping->description,
            /* Callback when data arrives. */
            usb_hid_polling_callback,
            /* How much data to request. */
-           dev->pipes[hid_dev->poll_pipe_index].pipe.max_packet_size,
+           hid_dev->poll_pipe_mapping->pipe.max_packet_size,
+           /* Delay */
+           -1,
            /* Callback when the polling ends. */
            usb_hid_polling_ended_callback,
@@ -103 +105 @@
         if (rc != EOK) {
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
-                    ddf_dev_get_name(dev->ddf_dev));
+                    usb_device_get_name(dev));
                 usb_hid_deinit(hid_dev);
                 return rc;
@@ -109 +111 @@
         hid_dev->running = true;
 
-        usb_log_info("HID device `%s' ready to use.\n",
-            ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev));
 
         return EOK;
@@ -137 +138 @@
 {
         assert(dev);
-        assert(dev->driver_data);
-        usb_hid_dev_t *hid_dev = dev->driver_data;
+        usb_hid_dev_t *hid_dev = usb_device_data_get(dev);
+        assert(hid_dev);
         unsigned tries = 100;
         /* Wait for fail. */
@@ -150 +151 @@
 
         usb_hid_deinit(hid_dev);
-        usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));
         return EOK;
 }