Changes in uspace/drv/usbhid/main.c [5e07e2b5:61257f4] in mainline

File:

• uspace/drv/usbhid/main.c (modified) (4 diffs)

uspace/drv/usbhid/main.c

@@ -42 +42 @@
 
 #include <usb/devdrv.h>
-#include <usb/devpoll.h>
 
 #include "usbhid.h"
@@ -99 +98 @@
         /* Create the function exposed under /dev/devices. */
         ddf_fun_t *hid_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, 
-            usb_hid_get_function_name(hid_dev));
+            usb_hid_get_function_name(hid_dev->device_type));
         if (hid_fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");
@@ -123 +122 @@
         }
         
-        rc = ddf_fun_add_to_class(hid_fun, usb_hid_get_class_name(hid_dev));
+        rc = ddf_fun_add_to_class(hid_fun, 
+            usb_hid_get_class_name(hid_dev->device_type));
         if (rc != EOK) {
                 usb_log_error(
@@ -142 +142 @@
            hid_dev->poll_pipe_index,
            /* Callback when data arrives. */
-           usb_hid_polling_callback,
+           hid_dev->poll_callback,
            /* How much data to request. */
            dev->pipes[hid_dev->poll_pipe_index].pipe->max_packet_size,