frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: search for PnPID on all parents (#75513) 

The PnPID for a device may not be on the immediate parent, so search up the
device tree until we find one.

X.Org Bug 75513 <http://bugs.freedesktop.org/show_bug.cgi?id=75513>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Peter Hutterer 2014-02-26 07:54:56 +10:00
parent 45fb3a934d
commit 795066477e
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/hal.c
View File

@ -185,8 +185,7 @@ device_added(LibHalContext * hal_ctx, const char *udi)
parent = get_prop_string(hal_ctx, udi, "info.parent"); parent = get_prop_string(hal_ctx, udi, "info.parent");
if (parent) { if (parent) {
int usb_vendor, usb_product; int usb_vendor, usb_product;
char *old_parent;
attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id");
/* construct USB ID in lowercase - "0000:ffff" */ /* construct USB ID in lowercase - "0000:ffff" */
usb_vendor = libhal_device_get_property_int(hal_ctx, parent, usb_vendor = libhal_device_get_property_int(hal_ctx, parent,
@ -204,7 +203,18 @@ device_added(LibHalContext * hal_ctx, const char *udi)
== -1) == -1)
attrs.usb_id = NULL; attrs.usb_id = NULL;
free(parent); attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id");
old_parent = parent;
while (!attrs.pnp_id &&
(parent = get_prop_string(hal_ctx, parent, "info.parent"))) {
attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id");
free(old_parent);
old_parent = parent;
}
free(old_parent);
} }
input_options = input_option_new(NULL, "_source", "server/hal"); input_options = input_option_new(NULL, "_source", "server/hal");

15
config/udev.c
View File

@ -149,10 +149,6 @@ device_added(struct udev_device *udev_device)
LOG_PROPERTY(ppath, "NAME", name); LOG_PROPERTY(ppath, "NAME", name);
} }
if (pnp_id)
attrs.pnp_id = strdup(pnp_id);
LOG_SYSATTR(ppath, "id", pnp_id);
/* construct USB ID in lowercase hex - "0000:ffff" */ /* construct USB ID in lowercase hex - "0000:ffff" */
if (product && if (product &&
sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) { sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) {
@ -164,6 +160,17 @@ device_added(struct udev_device *udev_device)
LOG_PROPERTY(ppath, "PRODUCT", product); LOG_PROPERTY(ppath, "PRODUCT", product);
attrs.usb_id = usb_id; attrs.usb_id = usb_id;
} }
while (!pnp_id && (parent = udev_device_get_parent(parent))) {
pnp_id = udev_device_get_sysattr_value(parent, "id");
if (!pnp_id)
continue;
attrs.pnp_id = strdup(pnp_id);
ppath = udev_device_get_devnode(parent);
LOG_SYSATTR(ppath, "id", pnp_id);
}
} }
if (!name) if (!name)
name = "(unnamed)"; name = "(unnamed)";