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

File:

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

uspace/drv/usbhid/multimedia/multimedia.c

@@ -40 +40 @@
 #include "keymap.h"
 
-#include <usb/hid/hidparser.h>
+#include <usb/classes/hidparser.h>
 #include <usb/debug.h>
-#include <usb/hid/usages/core.h>
-#include <usb/hid/usages/consumer.h>
+#include <usb/classes/hidut.h>
 
 #include <errno.h>
@@ -59 +58 @@
 typedef struct usb_multimedia_t {
         /** Previously pressed keys (not translated to key codes). */
-        //int32_t *keys_old;
+        int32_t *keys_old;
         /** Currently pressed keys (not translated to key codes). */
-        //int32_t *keys;
+        int32_t *keys;
         /** Count of stored keys (i.e. number of keys in the report). */
-        //size_t key_count;     
+        size_t key_count;       
         /** IPC phone to the console device (for sending key events). */
         int console_phone;
@@ -175 +174 @@
         
         // free all buffers
-//      if ((*multim_dev)->keys != NULL) {
-//              free((*multim_dev)->keys);
-//      }
-//      if ((*multim_dev)->keys_old != NULL) {
-//              free((*multim_dev)->keys_old);
-//      }
+        if ((*multim_dev)->keys != NULL) {
+                free((*multim_dev)->keys);
+        }
+        if ((*multim_dev)->keys_old != NULL) {
+                free((*multim_dev)->keys_old);
+        }
 
         free(*multim_dev);
@@ -210 +209 @@
                 return rc;
         }
-        
-        usb_log_debug("%s function created. Handle: %d\n", NAME, fun->handle);
         
         rc = ddf_fun_add_to_class(fun, "keyboard");
@@ -244 +241 @@
         multim_dev->console_phone = -1;
         
-//      usb_hid_report_path_t *path = usb_hid_report_path();
-//      usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
-        
-//      usb_hid_report_path_set_report_id(path, 1);
-        
-//      multim_dev->key_count = usb_hid_report_size(
-//          hid_dev->report, 1, USB_HID_REPORT_TYPE_INPUT);
-
-//      usb_hid_report_path_free(path);
-        
-//      usb_log_debug(NAME " Size of the input report: %zu\n", 
-//          multim_dev->key_count);
-        
-//      multim_dev->keys = (int32_t *)calloc(multim_dev->key_count, 
-//          sizeof(int32_t));
-        
-//      if (multim_dev->keys == NULL) {
-//              usb_log_fatal("No memory!\n");
-//              free(multim_dev);
-//              return ENOMEM;
-//      }
-        
-//      multim_dev->keys_old = 
-//              (int32_t *)calloc(multim_dev->key_count, sizeof(int32_t));
-        
-//      if (multim_dev->keys_old == NULL) {
-//              usb_log_fatal("No memory!\n");
-//              free(multim_dev->keys);
-//              free(multim_dev);
-//              return ENOMEM;
-//      }
+        usb_hid_report_path_t *path = usb_hid_report_path();
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 0);
+        
+        usb_hid_report_path_set_report_id(path, 1);
+        
+        multim_dev->key_count = usb_hid_report_size(
+            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
+
+        usb_hid_report_path_free(path);
+        
+        usb_log_debug(NAME " Size of the input report: %zu\n", 
+            multim_dev->key_count);
+        
+        multim_dev->keys = (int32_t *)calloc(multim_dev->key_count, 
+            sizeof(int32_t));
+        
+        if (multim_dev->keys == NULL) {
+                usb_log_fatal("No memory!\n");
+                free(multim_dev);
+                return ENOMEM;
+        }
+        
+        multim_dev->keys_old = 
+                (int32_t *)calloc(multim_dev->key_count, sizeof(int32_t));
+        
+        if (multim_dev->keys_old == NULL) {
+                usb_log_fatal("No memory!\n");
+                free(multim_dev->keys);
+                free(multim_dev);
+                return ENOMEM;
+        }
         
         /*! @todo Autorepeat */
@@ -360 +357 @@
                             usb_multimedia_map_usage(field->usage);
                         const char *key_str = 
-                            usbhid_multimedia_usage_to_str(field->usage);
+                            usb_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,