Changeset 400735e in mainline for uspace/lib/usbhid/src/hidreport.c

Timestamp:

2011-05-28T14:30:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fb5a3e

Parents:

e8f826b (diff), 48141f0 (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 development/ changes

File:

• uspace/lib/usbhid/src/hidreport.c (modified) (2 diffs)

uspace/lib/usbhid/src/hidreport.c

@@ -164 +164 @@
 
 int usb_hid_process_report_descriptor(usb_device_t *dev, 
-    usb_hid_report_t *report)
+    usb_hid_report_t *report, uint8_t **report_desc, size_t *report_size)
 {
         if (dev == NULL || report == NULL) {
@@ -172 +172 @@
         }
         
-        uint8_t *report_desc = NULL;
-        size_t report_size;
-        
-        int rc = usb_hid_get_report_descriptor(dev, &report_desc, 
-            &report_size);
+//      uint8_t *report_desc = NULL;
+//      size_t report_size;
+        
+        int rc = usb_hid_get_report_descriptor(dev, report_desc, report_size);
         
         if (rc != EOK) {
                 usb_log_error("Problem with getting Report descriptor: %s.\n",
                     str_error(rc));
-                if (report_desc != NULL) {
-                        free(report_desc);
+                if (*report_desc != NULL) {
+                        free(*report_desc);
+                        *report_desc = NULL;
                 }
                 return rc;
         }
         
-        assert(report_desc != NULL);
-        
-        rc = usb_hid_parse_report_descriptor(report, report_desc, report_size);
+        assert(*report_desc != NULL);
+        
+        rc = usb_hid_parse_report_descriptor(report, *report_desc, *report_size);
         if (rc != EOK) {
                 usb_log_error("Problem parsing Report descriptor: %s.\n",
                     str_error(rc));
-                free(report_desc);
+                free(*report_desc);
+                *report_desc = NULL;
                 return rc;
         }
         
         usb_hid_descriptor_print(report);
-        free(report_desc);
         
         return EOK;