Changeset e1dbcbc in mainline for uspace/lib/usb/src/hidreport.c

Timestamp:

2011-04-29T13:43:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a81a1d09

Parents:

380e0364 (diff), f19f1b7 (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/usb/src/hidreport.c (modified) (6 diffs)

uspace/lib/usb/src/hidreport.c

@@ -109 +109 @@
         
         if (*d != sizeof(usb_standard_hid_descriptor_t)) {
-                usb_log_error("HID descriptor hass wrong size (%u, expected %u"
+                usb_log_error("HID descriptor has wrong size (%u, expected %zu"
                     ")\n", *d, sizeof(usb_standard_hid_descriptor_t));
                 return EINVAL;
@@ -119 +119 @@
         uint16_t length =  hid_desc->report_desc_info.length;
         size_t actual_size = 0;
-        
-        /*
-         * Start session for the control transfer.
-         */
-        int sess_rc = usb_pipe_start_session(&dev->ctrl_pipe);
-        if (sess_rc != EOK) {
-                usb_log_warning("Failed to start a session: %s.\n",
-                    str_error(sess_rc));
-                return sess_rc;
-        }
 
         /*
@@ -159 +149 @@
                 free(*report_desc);
                 *report_desc = NULL;
-                usb_log_error("Report descriptor has wrong size (%u, expected "
+                usb_log_error("Report descriptor has wrong size (%zu, expected "
                     "%u)\n", actual_size, length);
                 return EINVAL;
         }
         
-        /*
-         * End session for the control transfer.
-         */
-        sess_rc = usb_pipe_end_session(&dev->ctrl_pipe);
-        if (sess_rc != EOK) {
-                usb_log_warning("Failed to end a session: %s.\n",
-                    str_error(sess_rc));
-                free(*report_desc);
-                *report_desc = NULL;
-                return sess_rc;
-        }
-        
         *size = length;
         
@@ -186 +164 @@
 
 int usb_hid_process_report_descriptor(usb_device_t *dev, 
-    usb_hid_report_parser_t *parser)
+    usb_hid_report_t *report)
 {
-        if (dev == NULL || parser == NULL) {
+        if (dev == NULL || report == NULL) {
                 usb_log_error("Failed to process Report descriptor: wrong "
                     "parameters given.\n");
@@ -211 +189 @@
         assert(report_desc != NULL);
         
-        rc = usb_hid_parse_report_descriptor(parser, report_desc, report_size);
+        rc = usb_hid_parse_report_descriptor(report, report_desc, report_size);
         if (rc != EOK) {
                 usb_log_error("Problem parsing Report descriptor: %s.\n",
@@ -219 +197 @@
         }
         
-        usb_hid_descriptor_print(parser);
+        usb_hid_descriptor_print(report);
         free(report_desc);