diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-08 15:51:08 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-12-10 12:44:21 +1000 |
| commit | e1cbd668de52ff3f35c8cc1ca362adc019935288 (patch) | |
| tree | daf7485f1ed0414e5a729416e28bebf43e3fa1ad | |
| parent | bad2015301a83c0c50d18c177d57b1105a173673 (diff) | |
| download | xf86-input-wacom-e1cbd668de52ff3f35c8cc1ca362adc019935288.tar.gz | |
Support future udev backend.
udev support isn't actually in the server yet but it will announce itself as
server/udev in the source. If so, hook onto it in the same manner as onto
HAL.
This allows for easier testing with a udev-enabled development server (which
is already in Debian).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmValidateDevice.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c index 86156b7..ed02507 100644 --- a/src/wcmValidateDevice.c +++ b/src/wcmValidateDevice.c @@ -351,8 +351,8 @@ void wcmHotplugOthers(LocalDevicePtr local, unsigned long* keys) /** * Return 1 if the device needs auto-hotplugging from within the driver. * This is the case if we don't get passed a "type" option (invalid in - * xorg.conf configurations) and we come from HAL or whatever future config - * backend. + * xorg.conf configurations) and we come from HAL, udev or whatever future + * config backend. * * This changes the source to _driver/wacom, all auto-hotplugged devices * will have the same source. @@ -366,8 +366,7 @@ int wcmNeedAutoHotplug(LocalDevicePtr local, const char **type, if (*type) /* type specified, don't hotplug */ return 0; - /* Only supporting HAL so far */ - if (strcmp(source, "server/hal")) + if (strcmp(source, "server/hal") && strcmp(source, "server/udev")) return 0; /* no type specified, so we need to pick the first one applicable |