diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-17 15:32:37 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-06-22 11:19:24 +1000 |
| commit | 3ecabe9bd95b666fdd2a913ef1623751263e221d (patch) | |
| tree | 0fdff14f8e42f04fc4d4c9f19aaad2396f3c33e4 /conf | |
| parent | aa382e6c8818e97538b2dad5d9b121a9cb533ed7 (diff) | |
| download | xf86-input-wacom-3ecabe9bd95b666fdd2a913ef1623751263e221d.tar.gz | |
Purge ForceDevice option - unneeded.
We're smart enough to detect if the device is running off a serial port or
off a USB port. The only thing we did with the ForceDevice option was to set
it once (based on a serial ioctl) and then check for it later during the
BaudRate xorg.conf option parsing.
Get rid of the field, parse the BaudRate for all devices even though we
don't actually care about it in the USB code. So setting an invalid baud
rate for a USB device will fail the device init but then again - don't do
that.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/50-wacom.conf | 2 | ||||
| -rw-r--r-- | conf/wacom.fdi | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf index 39abdf2..ce49613 100644 --- a/conf/50-wacom.conf +++ b/conf/50-wacom.conf @@ -12,14 +12,12 @@ Section "InputClass" Identifier "Wacom serial class" MatchProduct "Serial Wacom Tablet" Driver "wacom" - Option "ForceDevice" "ISDV4" EndSection Section "InputClass" Identifier "Wacom serial class identifiers" MatchProduct "WACf|FUJ02e5|FUJ02e7" Driver "wacom" - Option "ForceDevice" "ISDV4" EndSection diff --git a/conf/wacom.fdi b/conf/wacom.fdi index 5c71563..984eaf9 100644 --- a/conf/wacom.fdi +++ b/conf/wacom.fdi @@ -11,7 +11,6 @@ <match key="@info.parent:pnp.id" contains_outof="WACf;FUJ02e5;FUJ02e7"> <append key="info.capabilities" type="strlist">input</append> <merge key="input.x11_driver" type="string">wacom</merge> - <merge key="input.x11_options.ForceDevice" type="string">ISDV4</merge> <merge key="input.device" type="copy_property">serial.device</merge> </match> </match> |