Changes in uspace/drv/usbkbd/kbddev.c [70a71e5:b83edb93] in mainline

File:

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

uspace/drv/usbkbd/kbddev.c

@@ -70 +70 @@
 static const unsigned DEFAULT_ACTIVE_MODS = KM_NUM_LOCK;
 
-/** Boot protocol report size (key part). */
-static const size_t BOOTP_REPORT_SIZE = 6;
-
-/** Boot protocol total report size. */
-static const size_t BOOTP_BUFFER_SIZE = 8;
-
-/** Boot protocol output report size. */
-static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
-
-/** Boot protocol error key code. */
-static const uint8_t BOOTP_ERROR_ROLLOVER = 1;
+///** Boot protocol report size (key part). */
+//static const size_t BOOTP_REPORT_SIZE = 6;
+
+///** Boot protocol total report size. */
+//static const size_t BOOTP_BUFFER_SIZE = 8;
+
+///** Boot protocol output report size. */
+//static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
+
+///** Boot protocol error key code. */
+//static const uint8_t BOOTP_ERROR_ROLLOVER = 1;
+static const uint8_t ERROR_ROLLOVER = 1;
 
 /** Default idle rate for keyboards. */
@@ -264 +265 @@
 static void usb_kbd_set_led(usb_kbd_t *kbd_dev) 
 {
-//      uint8_t buffer[BOOTP_BUFFER_OUT_SIZE];
-//      int rc= 0;
-        
-//      memset(buffer, 0, BOOTP_BUFFER_OUT_SIZE);
-//      uint8_t leds = 0;
-
+        if (kbd_dev->output_size == 0) {
+                return;
+        }
+        
         unsigned i = 0;
+        
+        /* Reset the LED data. */
+        memset(kbd_dev->led_data, 0, kbd_dev->led_output_size * sizeof(int32_t));
         
         if ((kbd_dev->mods & KM_NUM_LOCK) && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_NUM_LOCK;
-//              leds |= USB_HID_LED_NUM_LOCK;
-        }
-        else {
-            kbd_dev->led_data[i++] = 0;
         }
         
         if ((kbd_dev->mods & KM_CAPS_LOCK) && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_CAPS_LOCK;
-//              leds |= USB_HID_LED_CAPS_LOCK;
-        }
-        else {
-            kbd_dev->led_data[i++] = 0;
         }
         
@@ -291 +285 @@
             && (i < kbd_dev->led_output_size)) {
                 kbd_dev->led_data[i++] = USB_HID_LED_SCROLL_LOCK;
-//              leds |= USB_HID_LED_SCROLL_LOCK;
-        }
-        else {
-            kbd_dev->led_data[i++] = 0;
-        }
-        
-        usb_log_debug("Output report data: ");
-        for (i = 0; i < kbd_dev->led_output_size; ++i) {
-                usb_log_debug("%u: %d", i, kbd_dev->led_data[i]);
         }
 
@@ -307 +292 @@
         
         int rc = usb_hid_report_output_translate(kbd_dev->parser, 
-            kbd_dev->led_path, USB_HID_PATH_COMPARE_END, kbd_dev->output_buffer, 
+            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);
         
@@ -315 +302 @@
                 return;
         }
-        
-//      if ((rc = usb_hid_boot_keyboard_output_report(
-//          leds, buffer, BOOTP_BUFFER_OUT_SIZE)) != EOK) {
-//              usb_log_warning("Error composing output report to the keyboard:"
-//                  "%s.\n", str_error(rc));
-//              return;
-//      }
         
         usb_log_debug("Output report buffer: %s\n", 
@@ -480 +460 @@
          * First of all, check if the kbd have reported phantom state.
          *
-         *  this must be changed as we don't know which keys are modifiers
-         *       and which are regular keys.
+         * As there is no way to distinguish keys from modifiers, we do not have
+         * a way to check that 'all keys report Error Rollover'. We thus check
+         * if there is at least one such error and in such case we ignore the
+         * whole input report.
          */
         i = 0;
-        // all fields should report Error Rollover
-        while (i < count &&
-            key_codes[i] == BOOTP_ERROR_ROLLOVER) {
+        while (i < count && key_codes[i] != ERROR_ROLLOVER) {
                 ++i;
         }
-        if (i == count) {
+        if (i != count) {
                 usb_log_debug("Phantom state occured.\n");
                 // phantom state, do nothing
@@ -565 +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.
@@ -572 +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) {
@@ -583 +563 @@
         assert(kbd_dev != NULL);
 
-        usb_log_debug("Got keys from parser: %s\n", 
-            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) {
@@ -634 +614 @@
         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, 1);
         
         int rc = usb_hid_parse_report(kbd_dev->parser, buffer,
-            actual_size, path, USB_HID_PATH_COMPARE_STRICT, callbacks, kbd_dev);
+            actual_size, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY, 
+            callbacks, kbd_dev);
 
         usb_hid_report_path_free (path);
@@ -784 +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, 1);
+        
         kbd_dev->key_count = usb_hid_report_input_length(
-            kbd_dev->parser, path, USB_HID_PATH_COMPARE_STRICT);
+            kbd_dev->parser, path, 
+            USB_HID_PATH_COMPARE_END | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY);
         usb_hid_report_path_free (path);
         
@@ -803 +790 @@
         kbd_dev->output_buffer = usb_hid_report_output(kbd_dev->parser, 
             &kbd_dev->output_size);
-        if (kbd_dev->output_buffer == NULL) {
+        if (kbd_dev->output_buffer == NULL && kbd_dev->output_size != 0) {
                 usb_log_warning("Error creating output report buffer.\n");
                 free(kbd_dev->keys);
@@ -816 +803 @@
         
         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",