Changeset 6b1931b in mainline

Timestamp:

2011-02-12T20:27:49Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3937bda

Parents:

f6a1386 (diff), 8f5b6561 (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:

Merge development/ changes

File:

• uspace/lib/usb/src/recognise.c (modified) (2 diffs)

uspace/lib/usb/src/recognise.c

@@ -161 +161 @@
                 /* First, with release number. */
                 rc = usb_add_match_id(matches, 100,
-                    "usb&vendor=%d&product=%d&release=" BCD_FMT,
+                    "usb&vendor=0x%04x&product=0x%04x&release=" BCD_FMT,
                     (int) device_descriptor->vendor_id,
                     (int) device_descriptor->product_id,
@@ -170 +170 @@
                 
                 /* Next, without release number. */
-                rc = usb_add_match_id(matches, 90, "usb&vendor=%d&product=%d",
+                rc = usb_add_match_id(matches, 90,
+                    "usb&vendor=0x%04x&product=0x%04x",
                     (int) device_descriptor->vendor_id,
                     (int) device_descriptor->product_id);