Changes in uspace/drv/usbhid/kbd/kbddev.c [252cf2a:bd2394b] in mainline

File:

• uspace/drv/usbhid/kbd/kbddev.c (modified) (9 diffs)

uspace/drv/usbhid/kbd/kbddev.c

@@ -255 +255 @@
         
         if (hid_dev == NULL || hid_dev->data == NULL) {
-                usb_log_debug("default_connection_handler: "
-                    "Missing parameter.\n");
                 async_answer_0(icallid, EINVAL);
                 return;
@@ -269 +267 @@
 
                 if (kbd_dev->console_phone != -1) {
-                        usb_log_debug("default_connection_handler: "
-                            "console phone already set\n");
                         async_answer_0(icallid, ELIMIT);
                         return;
@@ -276 +272 @@
 
                 kbd_dev->console_phone = callback;
-                
-                usb_log_debug("default_connection_handler: OK\n");
                 async_answer_0(icallid, EOK);
                 return;
         }
         
-        usb_log_debug("default_connection_handler: Wrong function.\n");
         async_answer_0(icallid, EINVAL);
 }
@@ -562 +555 @@
                         usb_log_debug2("Key pressed: %d (keycode: %d)\n", key,
                             kbd_dev->keys[i]);
+                        usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key);
                         if (!usb_kbd_is_lock(key)) {
                                 usb_kbd_repeat_start(kbd_dev, key);
                         }
-                        usb_kbd_push_ev(hid_dev, kbd_dev, KEY_PRESS, key);
                 } else {
                         // found, nothing happens
@@ -677 +670 @@
 //          callbacks, kbd_dev);
         usb_hid_report_path_t *path = usb_hid_report_path();
-        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_GENERIC_DESKTOP, 6);
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
         //usb_hid_report_path_set_report_id(path, 0);
 
@@ -695 +688 @@
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             hid_dev->report, NULL, path, 
-            USB_HID_PATH_COMPARE_BEGIN, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
             USB_HID_REPORT_TYPE_INPUT);
         unsigned i = 0;
-
+        
         while (field != NULL) {
                 //usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
@@ -716 +709 @@
                  *       two parts of the Report somehow.
                  */
-                usb_log_debug("value(%x), usage(%x)\n", field->value, field->usage);
                 if (field->value != 0) {
-                        //kbd_dev->keys[i] = field->usage;
+                        kbd_dev->keys[i] = field->usage;
                 }
                 else {
-                        //kbd_dev->keys[i] = 0;
+                        kbd_dev->keys[i] = 0;
                 }
-                //usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
+                usb_log_debug2("Saved %u. key usage %d\n", i, kbd_dev->keys[i]);
                 
                 ++i;
                 field = usb_hid_report_get_sibling(hid_dev->report, field, path, 
-                    USB_HID_PATH_COMPARE_BEGIN,
+                    USB_HID_PATH_COMPARE_END 
+                    | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
                     USB_HID_REPORT_TYPE_INPUT);
-                usb_log_debug("field -- %p\n", field);
         }
         
@@ -861 +853 @@
          * TODO: make more general
          */
+        usb_hid_report_path_t *path = usb_hid_report_path();
+        usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
+        
+        usb_hid_report_path_set_report_id(path, 0);
+        
         kbd_dev->key_count = usb_hid_report_size(
             hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT);
-        
-        usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count);   
+        usb_hid_report_path_free(path);
+        
+        usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count);
+        
         kbd_dev->keys = (int32_t *)calloc(kbd_dev->key_count, sizeof(int32_t));
         
@@ -980 +979 @@
                 return rc;
         }
-
+        
         return EOK;
 }