Attachment 165335 Details for Bug 206086 – add new devs, devd fix, optimization

[patch] add new devs, devd fix, optimization

patch-src-wcmValidateDevice.c (text/plain), 1.59 KB, created by Ivan Rozhuk on 2016-01-09 23:26:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2016-01-09 23:26:59 UTC

Size: 1.59 KB

patch

obsolete

>--- src/wcmValidateDevice.c.orig
>+++ src/wcmValidateDevice.c
>@@ -34,6 +34,7 @@
> {
> 	int match = 0;
> 	InputInfoPtr pDevices = xf86FirstLocalDevice();
>+	char* fsource = xf86CheckStrOption(pInfo->options, "_source", "");
> 
> 	for (; !match && pDevices != NULL; pDevices = pDevices->next)
> 	{
>@@ -51,7 +52,6 @@
> 		if (pInfo != pDevices)
> 		{
> 			WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common;
>-			char* fsource = xf86CheckStrOption(pInfo->options, "_source", "");
> 			char* psource = xf86CheckStrOption(pDevices->options, "_source", "");
> 
> 			if (pCommon->min_maj &&
>@@ -62,10 +62,11 @@
> 				if (strcmp(fsource, psource))
> 					match = 1;
> 			}
>-			free(fsource);
> 			free(psource);
> 		}
> 	}
>+	free(fsource);
>+
> 	if (match)
> 		xf86Msg(X_WARNING, "%s: device file already in use by %s. "
> 			"Ignoring.\n", pInfo->name, pDevices->name);
>@@ -205,6 +206,10 @@
> 		case 0x314: /* Intuos Pro S */
> 		case 0x315: /* Intuos Pro M */
> 		case 0x317: /* Intuos Pro L */
>+		case 0x33B: /* Intuos Draw small */
>+		case 0x33C: /* Intuos Art/Photo/Comic small */
>+		case 0x33D: /* Intuos Draw medium */
>+		case 0x33E: /* Intuos Art medium */
> 		case 0x26:  /* I5 */
> 		case 0x27:  /* I5 */
> 		case 0x28:  /* I5 */
>@@ -623,8 +628,10 @@
> 
> 	if (!source) /* xorg.conf device, don't auto-pick type */
> 		goto out;
>-
>-	if (source && strcmp(source, "server/hal") && strcmp(source, "server/udev"))
>+	if (strcmp(source, "server/hal") &&
>+	    strcmp(source, "server/udev") &&
>+	    strcmp(source, "server/devd") &&
>+	    strcmp(source, "server/wscons"))
> 		goto out;
> 
> 	/* no type specified, so we need to pick the first one applicable

Flags:

jbeich: maintainer-approval+

Actions: View | Diff

Attachments on bug 206086: 165334 | 165335 | 165337 | 165339