Changeset a57fa32 in mainline

Timestamp:

2018-05-25T19:38:40Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ed88c8e

Parents:

a05ec66

Message:

Fix USB match IDs that need zero-padding

In format string, when using # and 0 flag characters, the field width
that follows needs to take into account the extra width of the "0x"
prefix for the x conversion specifier.

File:

• uspace/lib/usbhost/src/ddf_helpers.c (modified) (1 diff)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -373 +373 @@
                 /* First, with release number. */
                 ADD_MATCHID_OR_RETURN(l, 100,
-                    "usb&vendor=%#04x&product=%#04x&release=%x.%x",
+                    "usb&vendor=%#06x&product=%#06x&release=%x.%x",
                     d->vendor_id, d->product_id, (d->device_version >> 8),
                     (d->device_version & 0xff));
 
                 /* Next, without release number. */
-                ADD_MATCHID_OR_RETURN(l, 90, "usb&vendor=%#04x&product=%#04x",
+                ADD_MATCHID_OR_RETURN(l, 90, "usb&vendor=%#06x&product=%#06x",
                     d->vendor_id, d->product_id);
         }