frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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:
Peter Hutterer 2010-09-02 14:04:50 +10:00
parent 2199842ed5
commit 34ade08174
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xfree86/common/xf86Option.c
View File

@ -133,12 +133,9 @@ xf86CollectOptions(ScrnInfoPtr pScrn, pointer extraOpts)
*/ */
void void
xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts)
pointer extraOpts)
{ {
XF86OptionPtr tmp; XF86OptionPtr tmp;
XF86OptionPtr extras = (XF86OptionPtr)extraOpts;
pInfo->options = NULL; pInfo->options = NULL;
if (defaultOpts) { if (defaultOpts) {
pInfo->options = xf86OptionListCreate(defaultOpts, -1, 0); pInfo->options = xf86OptionListCreate(defaultOpts, -1, 0);
@ -150,14 +147,6 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts,
else else
pInfo->options = tmp; 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) { if (pInfo->conf_idev && pInfo->conf_idev->attrs) {
pInfo->attrs = pInfo->conf_idev->attrs; pInfo->attrs = pInfo->conf_idev->attrs;
} }

2
hw/xfree86/common/xf86Xinput.c
View File

@ -668,7 +668,7 @@ xf86AllocateInput(InputDriverPtr drv, IDevPtr idev)
new->type_name = "UNKNOWN"; new->type_name = "UNKNOWN";
new->conf_idev = idev; new->conf_idev = idev;
xf86CollectInputOptions(new, (const char**)drv->default_options, NULL); xf86CollectInputOptions(new, (const char**)drv->default_options);
xf86ProcessCommonOptions(new, new->options); xf86ProcessCommonOptions(new, new->options);
return new; return new;

3
hw/xfree86/common/xf86Xinput.h
View File

@ -185,8 +185,7 @@ extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,
va_list args); va_list args);
/* xf86Option.c */ /* xf86Option.c */
extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, extern void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
pointer extraOpts);
/* Legacy hatred */ /* Legacy hatred */