Changeset e60436b in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-04-21T19:58:20Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

36f737a

Parents:

3bcac68

Message:

Properly ported HID driver and KBD subdriver to the new parser API.

File:

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

uspace/drv/usbhid/usbhid.c

@@ -192 +192 @@
         }
         
-        assert(hid_dev->parser != NULL);
+        assert(hid_dev->report != NULL);
         
         usb_log_debug("Compare flags: %d\n", mapping->compare);
-        size_t size = usb_hid_report_input_length(hid_dev->parser, usage_path, 
+        size_t size = usb_hid_report_input_length(hid_dev->report, usage_path, 
             mapping->compare);
         usb_log_debug("Size of the input report: %zuB\n", size);
@@ -341 +341 @@
         }
         
-        hid_dev->parser = (usb_hid_report_t *)(malloc(sizeof(
+        hid_dev->report = (usb_hid_report_t *)(malloc(sizeof(
             usb_hid_report_t)));
-        if (hid_dev->parser == NULL) {
+        if (hid_dev->report == NULL) {
                 usb_log_fatal("No memory!\n");
                 free(hid_dev);
@@ -385 +385 @@
         /* Get the report descriptor and parse it. */
         rc = usb_hid_process_report_descriptor(hid_dev->usb_dev, 
-            hid_dev->parser);
+            hid_dev->report);
         
         bool fallback = false;
@@ -583 +583 @@
 
         // destroy the parser
-        if ((*hid_dev)->parser != NULL) {
-                usb_hid_free_report((*hid_dev)->parser);
+        if ((*hid_dev)->report != NULL) {
+                usb_hid_free_report((*hid_dev)->report);
         }