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

File:

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

uspace/drv/usbhid/kbd/kbddev.c

@@ -313 +313 @@
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
             hid_dev->report, NULL, kbd_dev->led_path, 
-            USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY | USB_HID_PATH_COMPARE_END,
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
             USB_HID_REPORT_TYPE_OUTPUT);
         
-        while (field != NULL) {
-
+        while (field != NULL) {         
+                
                 if ((field->usage == USB_HID_LED_NUM_LOCK) 
                     && (kbd_dev->mods & KM_NUM_LOCK)){
@@ -334 +334 @@
                 
                 field = usb_hid_report_get_sibling(hid_dev->report, field,
-                    kbd_dev->led_path, USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY 
-                    | USB_HID_PATH_COMPARE_END, USB_HID_REPORT_TYPE_OUTPUT);
+                    kbd_dev->led_path,  
+                USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
+                        USB_HID_REPORT_TYPE_OUTPUT);
         }
         
@@ -677 +678 @@
 //          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 +696 @@
         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", 
-                //    field, field->value, field->usage);
+                usb_log_debug2("FIELD (%p) - VALUE(%d) USAGE(%u)\n", 
+                    field, field->value, field->usage);
                 
                 assert(i < kbd_dev->key_count);
@@ -716 +717 @@
                  *       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 +861 @@
          * 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);   
+            hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); 
+        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));
         
@@ -901 +908 @@
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
         
-        kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 0, 
-            USB_HID_REPORT_TYPE_OUTPUT);
+        kbd_dev->led_output_size = usb_hid_report_size(hid_dev->report, 
+            0, USB_HID_REPORT_TYPE_OUTPUT);
         
         usb_log_debug("Output report size (in items): %zu\n", 
@@ -980 +987 @@
                 return rc;
         }
-
+        
         return EOK;
 }