Changeset 382f3266 in mainline for uspace/drv/usbhid/hiddev.c

Timestamp:

2011-03-18T16:50:37Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

411d9fa, f51594fa

Parents:

054ed84 (diff), 98637224 (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/drv/usbhid/hiddev.c (modified) (4 diffs)

uspace/drv/usbhid/hiddev.c

@@ -158 +158 @@
         }
         
+        hid_dev->report_desc_size = length;
+        
         usb_log_debug("Done.\n");
         
@@ -262 +264 @@
         
         if (rc != EOK) {
-                usb_log_warning("Problem with parsing Report descriptor: %s.\n",
-                    str_error(rc));
-                return rc;
-        }
+                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);
         
         return EOK;
@@ -289 +301 @@
         
         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;
@@ -399 +419 @@
 
         /*
+         * 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;
+        }
+
+        /*
          * Get descriptors, parse descriptors and save endpoints.
          */