Changeset d0a6e54 in mainline

Timestamp:

2011-04-21T17:16:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

3bcac68

Parents:

020559c9

Message:

Product and Vendor ID may be 0 - changed type to int.

Fixes #193

Location:

uspace/drv/usbhid

Files:

• subdrivers.c (modified) (2 diffs)
• subdrivers.h (modified) (1 diff)
• usbhid.c (modified) (2 diffs)

uspace/drv/usbhid/subdrivers.c

@@ -55 +55 @@
                 USB_HID_PATH_COMPARE_END 
                 | USB_HID_PATH_COMPARE_USAGE_PAGE_ONLY,
-                0,
-                0,
+                -1,
+                -1,
                 {
                         .init = usb_kbd_init,
@@ -79 +79 @@
                 }
         },
-        {NULL, -1, 0, 0, 0, {NULL, NULL, NULL, NULL}}
+        {NULL, -1, 0, -1, -1, {NULL, NULL, NULL, NULL}}
 };
 

uspace/drv/usbhid/subdrivers.h

@@ -56 +56 @@
         int report_id;
         int compare;
-        uint16_t vendor_id;
-        uint16_t product_id;
+        int vendor_id;
+        int product_id;
         usb_hid_subdriver_t subdriver;
 } usb_hid_subdriver_mapping_t;

uspace/drv/usbhid/usbhid.c

@@ -251 +251 @@
         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 +267 @@
                 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,