Changeset 63517c2 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-04-21T08:33:44Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

020559c9

Parents:

da1dd48 (diff), e50cd7f (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:

Changes to HID parser (report structure)

File:

• uspace/drv/usbhid/usbhid.c (modified) (3 diffs)

uspace/drv/usbhid/usbhid.c

@@ -341 +341 @@
         }
         
-        hid_dev->parser = (usb_hid_report_parser_t *)(malloc(sizeof(
-            usb_hid_report_parser_t)));
+        hid_dev->parser = (usb_hid_report_t *)(malloc(sizeof(
+            usb_hid_report_t)));
         if (hid_dev->parser == NULL) {
                 usb_log_fatal("No memory!\n");
@@ -382 +382 @@
                 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");
-                //usb_hid_free(&hid_dev);
-                return rc;
-        }
-        
+                
         /* Get the report descriptor and parse it. */
         rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, 
@@ -592 +584 @@
         // destroy the parser
         if ((*hid_dev)->parser != NULL) {
-                usb_hid_free_report_parser((*hid_dev)->parser);
+                usb_hid_free_report((*hid_dev)->parser);
         }