Changes in uspace/drv/usbhid/hiddev.c [2f593872:1c6c4092] in mainline

File:

• uspace/drv/usbhid/hiddev.c (modified) (7 diffs)

uspace/drv/usbhid/hiddev.c

@@ -135 +135 @@
         }
         
-        hid_dev->report_desc_size = length;
-        
         usb_log_debug("Done.\n");
         
@@ -151 +149 @@
         usb_log_info("Processing descriptors...\n");
         
+        // get the first configuration descriptor
+        usb_standard_configuration_descriptor_t config_desc;
+        
         int rc;
-
-        uint8_t *descriptors = NULL;
-        size_t descriptors_size;
-        rc = usb_request_get_full_configuration_descriptor_alloc(
-            &hid_dev->ctrl_pipe, 0, (void **) &descriptors, &descriptors_size);
-        if (rc != EOK) {
-                usb_log_error("Failed to retrieve config descriptor: %s.\n",
-                    str_error(rc));
-                return rc;
+        rc = usb_request_get_bare_configuration_descriptor(&hid_dev->ctrl_pipe,
+            0, &config_desc);
+        
+        if (rc != EOK) {
+                usb_log_error("Failed to get bare config descriptor: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+        
+        // prepare space for all underlying descriptors
+        uint8_t *descriptors = (uint8_t *)malloc(config_desc.total_length);
+        if (descriptors == NULL) {
+                usb_log_error("No memory!.\n");
+                return ENOMEM;
+        }
+        
+        size_t transferred = 0;
+        // get full configuration descriptor
+        rc = usb_request_get_full_configuration_descriptor(&hid_dev->ctrl_pipe,
+            0, descriptors, config_desc.total_length, &transferred);
+        
+        if (rc != EOK) {
+                usb_log_error("Failed to get full config descriptor: %s.\n",
+                    str_error(rc));
+                free(descriptors);
+                return rc;
+        }
+        
+        if (transferred != config_desc.total_length) {
+                usb_log_error("Configuration descriptor has wrong size (%u, "
+                    "expected %u).\n", transferred, config_desc.total_length);
+                free(descriptors);
+                return ELIMIT;
         }
         
@@ -176 +201 @@
         
         rc = usb_endpoint_pipe_initialize_from_configuration(
-            endpoint_mapping, 1, descriptors, descriptors_size,
+            endpoint_mapping, 1, descriptors, config_desc.total_length,
             &hid_dev->wire);
         
@@ -208 +233 @@
         assert(endpoint_mapping[0].interface != NULL);
         
-        /*
-         * Save polling interval
-         */
-        hid_dev->poll_interval = endpoint_mapping[0].descriptor->poll_interval;
-        assert(hid_dev->poll_interval > 0);
-        
-        rc = usbhid_dev_get_report_descriptor(hid_dev,
-            descriptors, descriptors_size,
+        rc = usbhid_dev_get_report_descriptor(hid_dev, descriptors, transferred,
             (uint8_t *)endpoint_mapping[0].interface);
         
@@ -221 +239 @@
         
         if (rc != EOK) {
-                usb_log_warning("Problem with getting Report descriptor: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-        
-        rc = usb_hid_parse_report_descriptor(hid_dev->parser, 
-            hid_dev->report_desc, hid_dev->report_desc_size);
-        if (rc != EOK) {
-                usb_log_warning("Problem parsing Report descriptor: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
-        
-        usb_hid_descriptor_print(hid_dev->parser);
+                usb_log_warning("Problem with parsing Report descriptor: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
         
         return EOK;
@@ -255 +263 @@
         memset(dev, 0, sizeof(usbhid_dev_t));
         
-        dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
-            usb_hid_report_parser_t)));
-        if (dev->parser == NULL) {
-                usb_log_fatal("No memory!\n");
-                free(dev);
-                return NULL;
-        }
-        
         dev->initialized = 0;
         
@@ -339 +339 @@
                 return rc;
         }
-        
-        /*
-         * Initialize the report parser.
-         */
-        rc = usb_hid_parser_init(hid_dev->parser);
-        if (rc != EOK) {
-                usb_log_error("Failed to initialize report parser.\n");
-                return rc;
-        }
 
         /*