xfree86: Remove extraOptions parameter from xf86CollectInputOptions.
And unexport it, drivers don't need to call this in the new init process. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This commit is contained in:
parent
2199842ed5
commit
34ade08174
|
@ -133,12 +133,9 @@ xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts)
|
|||
*/
|
||||
|
||||
void
|
||||
xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts,
|
||||
pointer extraOpts)
|
||||
xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
|
||||
{
|
||||
XF86OptionPtr tmp;
|
||||
XF86OptionPtr extras = (XF86OptionPtr)extraOpts;
|
||||
|
||||
pInfo->options = NULL;
|
||||
if (defaultOpts) {
|
||||
pInfo->options = xf86OptionListCreate(defaultOpts, -1, 0);
|
||||
|
@ -150,14 +147,6 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts,
|
|||
else
|
||||
pInfo->options = tmp;
|
||||
}
|
||||
if (extras) {
|
||||
tmp = xf86optionListDup(extras);
|
||||
if (pInfo->options)
|
||||
pInfo->options = xf86optionListMerge(pInfo->options, tmp);
|
||||
else
|
||||
pInfo->options = tmp;
|
||||
}
|
||||
|
||||
if (pInfo->conf_idev && pInfo->conf_idev->attrs) {
|
||||
pInfo->attrs = pInfo->conf_idev->attrs;
|
||||
}
|
||||
|
|
|
@ -668,7 +668,7 @@ xf86AllocateInput(InputDriverPtr drv, IDevPtr idev)
|
|||
new->type_name = "UNKNOWN";
|
||||
new->conf_idev = idev;
|
||||
|
||||
xf86CollectInputOptions(new, (const char**)drv->default_options, NULL);
|
||||
xf86CollectInputOptions(new, (const char**)drv->default_options);
|
||||
xf86ProcessCommonOptions(new, new->options);
|
||||
|
||||
return new;
|
||||
|
|
|
@ -185,8 +185,7 @@ extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,
|
|||
va_list args);
|
||||
|
||||
/* xf86Option.c */
|
||||
extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts,
|
||||
pointer extraOpts);
|
||||
extern void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
|
||||
|
||||
|
||||
/* Legacy hatred */
|
||||
|
|
Loading…
Reference in New Issue
Block a user