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

Timestamp:

2011-04-22T09:26:50Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

7304663

Parents:

1553cbf (diff), 1775ebc (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:

new report structure and usbhid merge

File:

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

uspace/drv/usbhid/usbhid.c

@@ -158 +158 @@
     const usb_hid_subdriver_mapping_t *mapping)
 {
-        return false;
+        assert(hid_dev != NULL);
+        assert(hid_dev->usb_dev != NULL);
+        
+        return (hid_dev->usb_dev->descriptors.device.vendor_id 
+            == mapping->vendor_id
+            && hid_dev->usb_dev->descriptors.device.product_id 
+            == mapping->product_id);
 }
 
@@ -192 +198 @@
         }
         
-        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: %d\n", size);
+        usb_log_debug("Size of the input report: %zuB\n", size);
         
         usb_hid_report_path_free(usage_path);
@@ -251 +257 @@
         while (count < USB_HID_MAX_SUBDRIVERS &&
             (mapping->usage_path != NULL
-            || mapping->vendor_id != 0 || mapping->product_id != 0)) {
+            || mapping->vendor_id >= 0 || mapping->product_id >= 0)) {
                 // check the vendor & product ID
-                if (mapping->vendor_id != 0 && mapping->product_id == 0) {
-                        usb_log_warning("Missing Product ID for Vendor ID %u\n",
+                if (mapping->vendor_id >= 0 && mapping->product_id < 0) {
+                        usb_log_warning("Missing Product ID for Vendor ID %d\n",
                             mapping->vendor_id);
                         return EINVAL;
                 }
-                if (mapping->product_id != 0 && mapping->vendor_id == 0) {
-                        usb_log_warning("Missing Vendor ID for Product ID %u\n",
+                if (mapping->product_id >= 0 && mapping->vendor_id < 0) {
+                        usb_log_warning("Missing Vendor ID for Product ID %d\n",
                             mapping->product_id);
                         return EINVAL;
@@ -267 +273 @@
                 matched = false;
                 
-                if (mapping->vendor_id != 0) {
-                        assert(mapping->product_id != 0);
+                if (mapping->vendor_id >= 0) {
+                        assert(mapping->product_id >= 0);
                         usb_log_debug("Comparing device against vendor ID %u"
                             " and product ID %u.\n", mapping->vendor_id,
@@ -341 +347 @@
         }
         
-        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 +391 @@
         /* 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 +589 @@
 
         // 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);
         }