Changes in uspace/drv/usbhid/multimedia/multimedia.c [65b458c4:c0940a85] in mainline

File:

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

uspace/drv/usbhid/multimedia/multimedia.c

@@ -40 +40 @@
 #include "keymap.h"
 
-#include <usb/classes/hidparser.h>
+#include <usb/hid/hidparser.h>
 #include <usb/debug.h>
-#include <usb/classes/hidut.h>
+#include <usb/hid/usages/core.h>
+#include <usb/hid/usages/consumer.h>
 
 #include <errno.h>
@@ -210 +211 @@
         }
         
+        usb_log_debug("%s function created. Handle: %d\n", NAME, fun->handle);
+        
         rc = ddf_fun_add_to_class(fun, "keyboard");
         if (rc != EOK) {
@@ -247 +250 @@
         
         multim_dev->key_count = usb_hid_report_size(
-            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
+            hid_dev->report, 1, USB_HID_REPORT_TYPE_INPUT);
 
         usb_hid_report_path_free(path);
@@ -357 +360 @@
                             usb_multimedia_map_usage(field->usage);
                         const char *key_str = 
-                            usb_multimedia_usage_to_str(field->usage);
+                            usbhid_multimedia_usage_to_str(field->usage);
                         usb_log_info("Pressed key: %s\n", key_str);
                         usb_multimedia_push_ev(hid_dev, multim_dev, KEY_PRESS,