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

xfree86: Make OutputClassMatches take a xf86_platform_device 

Make OutputClassMatches directly take a xf86_platform_device as argument,
rather then an index into xf86_platform_devices. This makes things
easier for callers which already have a xf86_platform_device pointer.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans De Goede 2016-12-12 17:03:13 +01:00 committed by Adam Jackson
parent c57c1e53ea
commit 08b84d7287
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/common/xf86platformBus.c
View File

@ -214,9 +214,10 @@ MatchToken(const char *value, struct xorg_list *patterns,
} }
static Bool static Bool
OutputClassMatches(const XF86ConfOutputClassPtr oclass, int index) OutputClassMatches(const XF86ConfOutputClassPtr oclass,
struct xf86_platform_device *dev)
{ {
char *driver = xf86_platform_odev_attributes(index)->driver; char *driver = dev->attribs->driver;
if (!MatchToken(driver, &oclass->match_driver, strcmp)) if (!MatchToken(driver, &oclass->match_driver, strcmp))
return FALSE; return FALSE;
@ -234,7 +235,7 @@ xf86OutputClassDriverList(int index, char *matches[], int nmatches)
return 0; return 0;
for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) {
if (OutputClassMatches(cl, index)) { if (OutputClassMatches(cl, &xf86_platform_devices[index])) {
char *path = xf86_platform_odev_attributes(index)->path; char *path = xf86_platform_odev_attributes(index)->path;
xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n", xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n",