Changes in uspace/drv/usbkbd/kbddev.c [ef354b6:4125b7d] in mainline

File:

• uspace/drv/usbkbd/kbddev.c (modified) (14 diffs)

uspace/drv/usbkbd/kbddev.c

@@ -128 +128 @@
         0x15, 0x00,  //   Logical Minimum (0),
         0x25, 0x01,  //   Logical Maximum (1),
-        //0x85, 0x00,  //   Report ID,
-        //0xA4,      //   Push
         0x81, 0x02,  //   Input (Data, Variable, Absolute),   ; Modifier byte
-        //0xB4,      //   Pop
-        0x75, 0x08,  //   Report Size (1),
-        0x95, 0x01,  //   Report Count (8),       
+        0x95, 0x01,  //   Report Count (1),
+        0x75, 0x08,  //   Report Size (8),
         0x81, 0x01,  //   Input (Constant),                   ; Reserved byte
         0x95, 0x05,  //   Report Count (5),
@@ -268 +265 @@
 static void usb_kbd_set_led(usb_kbd_t *kbd_dev) 
 {
+        if (kbd_dev->output_size == 0) {
+                return;
+        }
+        
         unsigned i = 0;
         
@@ -289 +290 @@
         
         usb_log_debug("Creating output report.\n");
-
-        usb_hid_report_output_set_data(kbd_dev->parser, kbd_dev->led_path, 
-                                       USB_HID_PATH_COMPARE_END , kbd_dev->led_data, 
-                                       kbd_dev->led_output_size);
-        int rc = usb_hid_report_output_translate(kbd_dev->parser, 0,
-            kbd_dev->output_buffer, kbd_dev->output_size);
+        
+        int rc = usb_hid_report_output_translate(kbd_dev->parser, 
+            kbd_dev->led_path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+            kbd_dev->output_buffer, 
+            kbd_dev->output_size, kbd_dev->led_data, kbd_dev->led_output_size);
         
         if (rc != EOK) {
@@ -544 +545 @@
  *                  according to HID Usage Tables.
  * @param count Number of key codes in report (size of the report).
- * @param modifiers Bitmap of modifiers (Ctrl, Alt, Shift, GUI).
+ * @param report_id
  * @param arg User-specified argument. Expects pointer to the keyboard device
  *            structure representing the keyboard.
@@ -551 +552 @@
  */
 static void usb_kbd_process_keycodes(const uint8_t *key_codes, size_t count,
-    uint8_t modifiers, void *arg)
+    uint8_t report_id, void *arg)
 {
         if (arg == NULL) {
@@ -562 +563 @@
         assert(kbd_dev != NULL);
 
-        usb_log_debug("Got keys from parser (report id: %d): %s\n", modifiers, 
-            usb_debug_str_buffer(key_codes, count, 0));
+        usb_log_debug("Got keys from parser (report id: %u): %s\n", 
+            report_id, usb_debug_str_buffer(key_codes, count, 0));
         
         if (count != kbd_dev->key_count) {
-                usb_log_warning("Number of received keycodes (%d) differs from"
-                    " expected number (%d).\n", count, kbd_dev->key_count);
+                usb_log_warning("Number of received keycodes (%zu) differs from"
+                    " expected (%zu).\n", count, kbd_dev->key_count);
                 return;
         }
@@ -613 +614 @@
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0);
-
-        int rc = usb_hid_parse_report(kbd_dev->parser, buffer, actual_size);
-        usb_hid_descriptor_print (kbd_dev->parser);
+        usb_hid_report_path_set_report_id(path, 0);
+        
+        int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
+            actual_size, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+            callbacks, kbd_dev);
 
         usb_hid_report_path_free (path);
@@ -659 +663 @@
         memset(kbd_dev, 0, sizeof(usb_kbd_t));
         
-        kbd_dev->parser = (usb_hid_report_t *)(malloc(sizeof(
-            usb_hid_report_t)));
+        kbd_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
+            usb_hid_report_parser_t)));
         if (kbd_dev->parser == NULL) {
                 usb_log_fatal("No memory!\n");
@@ -728 +732 @@
         
         /* Initialize the report parser. */
-        //rc = usb_hid_parser_init(kbd_dev->parser);
-        //if (rc != EOK) {
-        //      usb_log_error("Failed to initialize report parser.\n");
-        //      return rc;
-        //}
+        rc = usb_hid_parser_init(kbd_dev->parser);
+        if (rc != EOK) {
+                usb_log_error("Failed to initialize report parser.\n");
+                return rc;
+        }
         
         /* Get the report descriptor and parse it. */
@@ -763 +767 @@
         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_input_length(
-            kbd_dev->parser, path, USB_HID_PATH_COMPARE_END);
+            kbd_dev->parser, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         usb_hid_report_path_free (path);
         
@@ -781 +789 @@
         kbd_dev->output_size = 0;
         kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, 
-            &kbd_dev->output_size, 0x00);
-        if (kbd_dev->output_buffer == NULL) {
+            &kbd_dev->output_size);
+        if (kbd_dev->output_buffer == NULL && kbd_dev->output_size != 0) {
                 usb_log_warning("Error creating output report buffer.\n");
                 free(kbd_dev->keys);
@@ -793 +801 @@
         usb_hid_report_path_append_item(
             kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0);
-        usb_hid_report_path_set_report_id(kbd_dev->led_path, 0x00);
         
         kbd_dev->led_output_size = usb_hid_report_output_size(kbd_dev->parser, 
-            kbd_dev->led_path, USB_HID_PATH_COMPARE_END);
+            kbd_dev->led_path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         
         usb_log_debug("Output report size (in items): %zu\n", 
@@ -841 +849 @@
          * Set Idle rate
          */
-        usb_kbd_set_led(kbd_dev);       
+        usb_kbd_set_led(kbd_dev);
         
         usbhid_req_set_idle(&kbd_dev->usb_dev->ctrl_pipe, 
@@ -926 +934 @@
         // destroy the parser
         if ((*kbd_dev)->parser != NULL) {
-                usb_hid_free_report((*kbd_dev)->parser);
+                usb_hid_free_report_parser((*kbd_dev)->parser);
         }