diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-06-10 06:15:41 -0700 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-11 09:30:33 +1000 |
| commit | 87a1507da7e7788232d74285ef377b67b70e0fa4 (patch) | |
| tree | 5fe21b2ea4299acfad7603259abfd7330781abee /hw/xfree86/common/xf86Xinput.c | |
| parent | 645679c1523eee7028f3244cee57936b93326a2a (diff) | |
xfree86: Match devices based on USB ID
Sometimes the vendor and product names aren't specific enough to target
a USB device, so expose the numeric codes in the ID. A MatchUSBID entry
has been added that supports shell pattern matching when fnmatch(3) is
available. For example:
MatchUSBID "046d:*"
The IDs are stored in lowercase hex separated by a ':' like "lsusb" or
"lspci -n".
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.c')
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 5b0ec8f26..421803962 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -604,6 +604,10 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, if (!MatchAttrToken(attrs->pnp_id, iclass->match_pnpid, match_pattern)) return FALSE; + /* MatchUSBID pattern */ + if (!MatchAttrToken(attrs->usb_id, iclass->match_usbid, match_pattern)) + return FALSE; + /* * MatchTag string * See if any of the device's tags match any of the MatchTag tokens. |