Changes in uspace/drv/usbhid/mouse/mousedev.c [4d3c13e:5f88293] in mainline

File:

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

uspace/drv/usbhid/mouse/mousedev.c

@@ -229 +229 @@
 /*----------------------------------------------------------------------------*/
 
-static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
-    usb_mouse_t *mouse_dev)
+static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, 
+                                     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));
         
         if (mouse_dev->mouse_phone < 0) {
@@ -240 +244 @@
 
         /*
+         * parse the input report
+         */
+        
+        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;
+        }
+        
+        /*
          * X
          */
@@ -248 +270 @@
             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(
@@ -271 +293 @@
             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(
@@ -299 +321 @@
             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(
@@ -323 +345 @@
         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(
@@ -488 +510 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data)
+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);
         
         if (hid_dev == NULL || data == NULL) {
@@ -500 +524 @@
         usb_mouse_t *mouse_dev = (usb_mouse_t *)data;
                 
-        return usb_mouse_process_report(hid_dev, mouse_dev);
+        return usb_mouse_process_report(hid_dev, mouse_dev, buffer, 
+                                        buffer_size);
 }