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

File:

• uspace/drv/usbhid/mouse/mousedev.c (modified) (8 diffs)

uspace/drv/usbhid/mouse/mousedev.c

@@ -225 +225 @@
 
 static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, 
-                                     usb_mouse_t *mouse_dev/*, uint8_t *buffer,
-                                     size_t buffer_size*/)
+                                     usb_mouse_t *mouse_dev, uint8_t *buffer,
+                                     size_t buffer_size)
 {
         assert(mouse_dev != NULL);
         
-//      usb_log_debug2("got buffer: %s.\n",
-//          usb_debug_str_buffer(buffer, buffer_size, 0));
+        usb_log_debug2("got buffer: %s.\n",
+            usb_debug_str_buffer(buffer, buffer_size, 0));
         
         if (mouse_dev->mouse_phone < 0) {
@@ -242 +242 @@
          */
         
-//      usb_log_debug(NAME " Calling usb_hid_parse_report() with "
-//          "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
-        
-//      uint8_t report_id;
-        
-//      int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
-//          &report_id);
-        
-//      if (rc != EOK) {
-//              usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
-//                  str_error(rc));
-//              return true;
-//      }
+        usb_log_debug(NAME " Calling usb_hid_parse_report() with "
+            "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
+        
+        uint8_t report_id;
+        
+        int rc = usb_hid_parse_report(hid_dev->report, buffer, buffer_size, 
+            &report_id);
+        
+        if (rc != EOK) {
+                usb_log_warning(NAME "Error in usb_hid_parse_report(): %s\n", 
+                    str_error(rc));
+                return true;
+        }
         
         /*
@@ -265 +265 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
 
-        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
+        usb_hid_report_path_set_report_id(path, report_id);
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
@@ -288 +288 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
 
-        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
+        usb_hid_report_path_set_report_id(path, report_id);
 
         field = usb_hid_report_get_sibling(
@@ -316 +316 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
-        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
+        usb_hid_report_path_set_report_id(path, report_id);
         
         field = usb_hid_report_get_sibling(
@@ -340 +340 @@
         path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0);
-        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
+        usb_hid_report_path_set_report_id(path, report_id);
         
         field = usb_hid_report_get_sibling(
@@ -505 +505 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data/*, 
-     uint8_t *buffer, size_t buffer_size*/)
+bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data, 
+     uint8_t *buffer, size_t buffer_size)
 {
         usb_log_debug("usb_mouse_polling_callback()\n");
-//      usb_debug_str_buffer(buffer, buffer_size, 0);
+        usb_debug_str_buffer(buffer, buffer_size, 0);
         
         if (hid_dev == NULL || data == NULL) {
@@ -519 +519 @@
         usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
                 
-        return usb_mouse_process_report(hid_dev, mouse_dev/*, buffer, 
-                                        buffer_size*/);
+        return usb_mouse_process_report(hid_dev, mouse_dev, buffer, 
+                                        buffer_size);
 }