Changeset 5050d9e in mainline for uspace/drv/usbhid/hiddev.c

Timestamp:

2011-03-08T20:29:51Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

32bfb96

Parents:

021351c

Message:

Report parser integration into HID driver + parsing of report descriptor.

File:

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

uspace/drv/usbhid/hiddev.c

@@ -135 +135 @@
         }
         
+        hid_dev->report_desc_size = length;
+        
         usb_log_debug("Done.\n");
         
@@ -219 +221 @@
         
         if (rc != EOK) {
-                usb_log_warning("Problem with parsing Report descriptor: %s.\n",
+                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;
@@ -243 +253 @@
         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;
         
@@ -319 +337 @@
                 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;
+        }
 
         /*