Changeset 662da50 in mainline for uspace/drv/usbhid/multimedia/multimedia.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/multimedia/multimedia.c (modified) (1 diff)

uspace/drv/usbhid/multimedia/multimedia.c

@@ -274 +274 @@
 /*----------------------------------------------------------------------------*/
 
-bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data, 
-    uint8_t *buffer, size_t buffer_size)
+bool usb_multimedia_polling_callback(struct usb_hid_dev *hid_dev, void *data/*, 
+    uint8_t *buffer, size_t buffer_size*/)
 {
         // TODO: checks
-        if (hid_dev == NULL || data == NULL || buffer == NULL) {
+        if (hid_dev == NULL || data == NULL/* || buffer == NULL*/) {
                 return false;
         }
         
-        usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
-            hid_dev, buffer, buffer_size);
+//      usb_log_debug(NAME " usb_lgtch_polling_callback(%p, %p, %zu)\n",
+//          hid_dev, buffer, buffer_size);
         
         usb_multimedia_t *multim_dev = (usb_multimedia_t *)data;
 
-        usb_log_debug(NAME " Calling usb_hid_parse_report() with "
-            "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
+//      usb_log_debug(NAME " Calling usb_hid_parse_report() with "
+//          "buffer %s\n", usb_debug_str_buffer(buffer, buffer_size, 0));
         
         usb_hid_report_path_t *path = usb_hid_report_path();
         usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_CONSUMER, 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_hid_report_path_set_report_id(path, report_id);
+//      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_hid_report_path_set_report_id(path, hid_dev->report_id);
 
         usb_hid_report_field_t *field = usb_hid_report_get_sibling(