Don't overwrite the user-assigned name and use XI_TOUCHSCREEN for type_name. Don't allow Option "DeviceName", use Identifier instead.
Signed-off-by: Peter Hutterer <[email protected]> --- man/elographics.man | 3 --- src/xf86Elo.c | 4 +--- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/man/elographics.man b/man/elographics.man index 7ce590a..32efda4 100644 --- a/man/elographics.man +++ b/man/elographics.man @@ -38,9 +38,6 @@ The following driver options are supported: The device that is attached to the touchscreen interface. Default is "/dev/ttyS1". .TP -.BI "Option \*qDeviceName\*q \*q" string \*q -Set the X11 device name for the touchscreen. Default is "TOUCHSCREEN". -.TP .BI "Option \*qMinX\*q \*q" integer \*q Set the minimum value for the touchscreen X axis. Default is 600. .TP diff --git a/src/xf86Elo.c b/src/xf86Elo.c index 5aba02f..e779642 100644 --- a/src/xf86Elo.c +++ b/src/xf86Elo.c @@ -892,7 +892,7 @@ xf86EloAllocate(InputDriverPtr drv, InputInfoPtr pInfo) pInfo->control_proc = NULL; pInfo->switch_mode = NULL; pInfo->private = priv; - pInfo->type_name = "Elographics TouchScreen"; + pInfo->type_name = XI_TOUCHSCREEN; return Success; } @@ -967,8 +967,6 @@ xf86EloInit(InputDriverPtr drv, model++; } - pInfo->name = xf86SetStrOption(pInfo->options, "DeviceName", XI_TOUCHSCREEN); - xf86Msg(X_CONFIG, "Elographics X device name: %s\n", pInfo->name); priv->screen_no = xf86SetIntOption(pInfo->options, "ScreenNo", 0); xf86Msg(X_CONFIG, "Elographics associated screen: %d\n", priv->screen_no); priv->untouch_delay = xf86SetIntOption(pInfo->options, "UntouchDelay", ELO_UNTOUCH_DELAY); -- 1.7.5.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
