Changeset 8a20380 in mainline for uspace/drv/usbhid/kbddev.c

Timestamp:

2011-03-06T18:55:51Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4ed80ce8, d4beec3

Parents:

a60150a (diff), 24d5432 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development changes

File:

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

uspace/drv/usbhid/kbddev.c

@@ -63 +63 @@
 static const size_t BOOTP_BUFFER_SIZE = 8;
 static const size_t BOOTP_BUFFER_OUT_SIZE = 1;
+static const uint8_t BOOTP_ERROR_ROLLOVER = 1;
 static const uint8_t IDLE_RATE = 0;
 
@@ -181 +182 @@
             usb_debug_str_buffer(buffer, BOOTP_BUFFER_OUT_SIZE, 0));
         
-        uint16_t value = 0;
-        value |= (USB_HID_REPORT_TYPE_OUTPUT << 8);
-
         assert(kbd_dev->hid_dev != NULL);
         assert(kbd_dev->hid_dev->initialized);
-        usbhid_req_set_report(kbd_dev->hid_dev, value, buffer, 
-            BOOTP_BUFFER_OUT_SIZE);
+        usbhid_req_set_report(kbd_dev->hid_dev, USB_HID_REPORT_TYPE_OUTPUT, 
+            buffer, BOOTP_BUFFER_OUT_SIZE);
 }
 
@@ -322 +320 @@
     const uint8_t *key_codes)
 {
-        // TODO: phantom state!!
-        
         unsigned int key;
         unsigned int i, j;
+        
+        /*
+         * First of all, check if the kbd have reported phantom state.
+         */
+        i = 0;
+        // all fields should report Error Rollover
+        while (i < kbd_dev->keycode_count &&
+            key_codes[i] == BOOTP_ERROR_ROLLOVER) {
+                ++i;
+        }
+        if (i == kbd_dev->keycode_count) {
+                usb_log_debug("Phantom state occured.\n");
+                // phantom state, do nothing
+                return;
+        }
         
         // TODO: quite dummy right now, think of better implementation
@@ -344 +355 @@
                         key = usbhid_parse_scancode(kbd_dev->keycodes[j]);
                         usbhid_kbd_push_ev(kbd_dev, KEY_RELEASE, key);
-                        usb_log_debug2("\nKey released: %d\n", key);
+                        usb_log_debug2("Key released: %d\n", key);
                 } else {
                         // found, nothing happens
@@ -364 +375 @@
                         // not found, i.e. new key pressed
                         key = usbhid_parse_scancode(key_codes[i]);
-                        usb_log_debug2("\nKey pressed: %d (keycode: %d)\n", key,
+                        usb_log_debug2("Key pressed: %d (keycode: %d)\n", key,
                             key_codes[i]);
                         usbhid_kbd_push_ev(kbd_dev, KEY_PRESS, key);
@@ -375 +386 @@
 //              if (key_codes[i] != 0) {
 //                      key = usbhid_parse_scancode(key_codes[i]);
-//                      usb_log_debug2("\nKey pressed: %d (keycode: %d)\n", key,
+//                      usb_log_debug2("Key pressed: %d (keycode: %d)\n", key,
 //                          key_codes[i]);
 //                      usbhid_kbd_push_ev(kbd_dev, KEY_PRESS, key);