Changes in uspace/drv/bus/usb/usbhid/main.c [bb70637:920d0fc] in mainline

File:

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

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

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