diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-06 09:53:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-06 10:43:16 +1000 |
| commit | 5d89d256862e5cba64c1349899003021c2f359d0 (patch) | |
| tree | ff89632d6c2d99d8aab5c45b893072f5a6cd065d /src/wcmConfig.c | |
| parent | d90519b2f95c5da17659a1efbd41f1a0039435bc (diff) | |
| download | xf86-input-wacom-5d89d256862e5cba64c1349899003021c2f359d0.tar.gz | |
BaudRate only needs checking for ISDV4 devices.
Remove BaudRate from default_options, supply as default to xf86SetIntOption
instead - has the same effect.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/wcmConfig.c')
| -rwxr-xr-x | src/wcmConfig.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 0f26a6a..99a4826 100755 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -311,7 +311,6 @@ Bool xf86WcmAreaListOverlap(WacomToolAreaPtr area, WacomToolAreaPtr list) static const char *default_options[] = { - "BaudRate", "9600", "StopBits", "1", "DataBits", "8", "Parity", "None", @@ -1140,21 +1139,17 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) } } - /* baud rate */ - { + if (common->wcmForceDevice == DEVICE_ISDV4) + { int val; - val = xf86SetIntOption(local->options, "BaudRate", 0); + val = xf86SetIntOption(local->options, "BaudRate", 9600); switch(val) { case 38400: - common->wcmISDV4Speed = 38400; - break; case 19200: - common->wcmISDV4Speed = 19200; - break; case 9600: - common->wcmISDV4Speed = 9600; + common->wcmISDV4Speed = val; break; default: xf86Msg(X_ERROR, "%s: Illegal speed value " @@ -1162,7 +1157,7 @@ static LocalDevicePtr xf86WcmInit(InputDriverPtr drv, IDevPtr dev, int flags) local->name); break; } - } /* baud rate */ + } priv->speed = xf86SetRealOption(local->options, "Speed", DEFAULT_SPEED); priv->accel = xf86SetIntOption(local->options, "Accel", 0); |