Changes in uspace/drv/usbhid/kbd/kbddev.c [313775b:e8a69913] in mainline

File:

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

uspace/drv/usbhid/kbd/kbddev.c

@@ -46 +46 @@
 #include <fibril.h>
 #include <fibril_synch.h>
-
-#include <ddf/log.h>
 
 #include <usb/usb.h>
@@ -410 +408 @@
         memcpy(kbd_dev->keys_old, kbd_dev->keys, kbd_dev->key_count * 4);
         
-        char key_buffer[512];
-        ddf_dump_buffer(key_buffer, 512,
-            kbd_dev->keys_old, 4, kbd_dev->key_count, 0);
-        usb_log_debug2("Stored keys %s.\n", key_buffer);
+        usb_log_debug2("New stored keys: ");
+        for (i = 0; i < kbd_dev->key_count; ++i) {
+                usb_log_debug2("%d ", kbd_dev->keys_old[i]);
+        }
+        usb_log_debug2("\n");
 }
 
@@ -435 +434 @@
  *     usb_hid_parse_report().
  */
-static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev)
+static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev,
+                                 uint8_t *buffer, size_t actual_size)
 {
         assert(hid_dev->report != NULL);
         assert(hid_dev != NULL);
         assert(kbd_dev != NULL);
+
+        usb_log_debug("Calling usb_hid_parse_report() with "
+            "buffer %s\n", usb_debug_str_buffer(buffer, actual_size, 0));
         
         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, hid_dev->report_id);
+        uint8_t report_id;
+        int rc = usb_hid_parse_report(hid_dev->report, buffer, actual_size, 
+            &report_id);
+        
+        if (rc != EOK) {
+                usb_log_warning("Error in usb_hid_parse_report():"
+                    "%s\n", str_error(rc));
+        }
+        
+        usb_hid_report_path_set_report_id (path, report_id);
         
         // fill in the currently pressed keys
@@ -744 +756 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, void *data)
-{
-        if (hid_dev == NULL/* || buffer == NULL*/ || data == NULL) {
+bool usb_kbd_polling_callback(usb_hid_dev_t *hid_dev, void *data, 
+     uint8_t *buffer, size_t buffer_size)
+{
+        if (hid_dev == NULL || buffer == NULL || data == NULL) {
                 // do not continue polling (???)
                 return false;
@@ -755 +768 @@
         
         // TODO: add return value from this function
-        usb_kbd_process_data(hid_dev, kbd_dev);
+        usb_kbd_process_data(hid_dev, kbd_dev, buffer, buffer_size);
         
         return true;
@@ -791 +804 @@
         if ((*kbd_dev)->repeat_mtx != NULL) {
                 //assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));
-                // FIXME - the fibril_mutex_is_locked may not cause
-                // fibril scheduling
                 while (fibril_mutex_is_locked((*kbd_dev)->repeat_mtx)) {}
                 free((*kbd_dev)->repeat_mtx);