Changes in uspace/drv/usbhid/kbd/kbddev.c [65c3794:19e0560e] in mainline

File:

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

uspace/drv/usbhid/kbd/kbddev.c

@@ -529 +529 @@
  *     usb_hid_parse_report().
  */
-static void usb_kbd_process_data(usb_hid_dev_t *hid_dev, usb_kbd_t *kbd_dev/*,
-                                 uint8_t *buffer, size_t actual_size*/)
+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);
@@ -536 +536 @@
         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_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);
 
-//      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, 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
@@ -848 +848 @@
 /*----------------------------------------------------------------------------*/
 
-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) {
+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;
@@ -860 +860 @@
         
         // TODO: add return value from this function
-        usb_kbd_process_data(hid_dev, kbd_dev/*, buffer, buffer_size*/);
+        usb_kbd_process_data(hid_dev, kbd_dev, buffer, buffer_size);
         
         return true;