Changeset 662da50 in mainline for uspace/drv/usbhid/mouse/mousedev.c

Timestamp:

2011-06-16T10:21:33Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d022500

Parents:

854eddd6 (diff), bbfa425 (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:

Merge last-minute USB changes

File:

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

uspace/drv/usbhid/mouse/mousedev.c

@@ -230 +230 @@
 
 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) {
@@ -247 +247 @@
          */
         
-        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;
+//      }
         
         /*
@@ -270 +270 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_X);
 
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(
@@ -293 +293 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_Y);
 
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
 
         field = usb_hid_report_get_sibling(
@@ -321 +321 @@
             USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL);
 
-        usb_hid_report_path_set_report_id(path, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
         
         field = usb_hid_report_get_sibling(
@@ -345 +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, report_id);
+        usb_hid_report_path_set_report_id(path, hid_dev->report_id);
         
         field = usb_hid_report_get_sibling(
@@ -510 +510 @@
 /*----------------------------------------------------------------------------*/
 
-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) {
@@ -524 +524 @@
         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*/);
 }