|
Lines 34-39
Link Here
|
| 34 |
{ |
34 |
{ |
| 35 |
int match = 0; |
35 |
int match = 0; |
| 36 |
InputInfoPtr pDevices = xf86FirstLocalDevice(); |
36 |
InputInfoPtr pDevices = xf86FirstLocalDevice(); |
|
|
37 |
char* fsource = xf86CheckStrOption(pInfo->options, "_source", ""); |
| 37 |
|
38 |
|
| 38 |
for (; !match && pDevices != NULL; pDevices = pDevices->next) |
39 |
for (; !match && pDevices != NULL; pDevices = pDevices->next) |
| 39 |
{ |
40 |
{ |
|
Lines 51-57
Link Here
|
| 51 |
if (pInfo != pDevices) |
52 |
if (pInfo != pDevices) |
| 52 |
{ |
53 |
{ |
| 53 |
WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common; |
54 |
WacomCommonPtr pCommon = ((WacomDevicePtr)pDevices->private)->common; |
| 54 |
char* fsource = xf86CheckStrOption(pInfo->options, "_source", ""); |
|
|
| 55 |
char* psource = xf86CheckStrOption(pDevices->options, "_source", ""); |
55 |
char* psource = xf86CheckStrOption(pDevices->options, "_source", ""); |
| 56 |
|
56 |
|
| 57 |
if (pCommon->min_maj && |
57 |
if (pCommon->min_maj && |
|
Lines 62-71
Link Here
|
| 62 |
if (strcmp(fsource, psource)) |
62 |
if (strcmp(fsource, psource)) |
| 63 |
match = 1; |
63 |
match = 1; |
| 64 |
} |
64 |
} |
| 65 |
free(fsource); |
|
|
| 66 |
free(psource); |
65 |
free(psource); |
| 67 |
} |
66 |
} |
| 68 |
} |
67 |
} |
|
|
68 |
free(fsource); |
| 69 |
|
| 69 |
if (match) |
70 |
if (match) |
| 70 |
xf86Msg(X_WARNING, "%s: device file already in use by %s. " |
71 |
xf86Msg(X_WARNING, "%s: device file already in use by %s. " |
| 71 |
"Ignoring.\n", pInfo->name, pDevices->name); |
72 |
"Ignoring.\n", pInfo->name, pDevices->name); |
|
Lines 205-210
Link Here
|
| 205 |
case 0x314: /* Intuos Pro S */ |
206 |
case 0x314: /* Intuos Pro S */ |
| 206 |
case 0x315: /* Intuos Pro M */ |
207 |
case 0x315: /* Intuos Pro M */ |
| 207 |
case 0x317: /* Intuos Pro L */ |
208 |
case 0x317: /* Intuos Pro L */ |
|
|
209 |
case 0x33B: /* Intuos Draw small */ |
| 210 |
case 0x33C: /* Intuos Art/Photo/Comic small */ |
| 211 |
case 0x33D: /* Intuos Draw medium */ |
| 212 |
case 0x33E: /* Intuos Art medium */ |
| 208 |
case 0x26: /* I5 */ |
213 |
case 0x26: /* I5 */ |
| 209 |
case 0x27: /* I5 */ |
214 |
case 0x27: /* I5 */ |
| 210 |
case 0x28: /* I5 */ |
215 |
case 0x28: /* I5 */ |
|
Lines 623-630
Link Here
|
| 623 |
|
628 |
|
| 624 |
if (!source) /* xorg.conf device, don't auto-pick type */ |
629 |
if (!source) /* xorg.conf device, don't auto-pick type */ |
| 625 |
goto out; |
630 |
goto out; |
| 626 |
|
631 |
if (strcmp(source, "server/hal") && |
| 627 |
if (source && strcmp(source, "server/hal") && strcmp(source, "server/udev")) |
632 |
strcmp(source, "server/udev") && |
|
|
633 |
strcmp(source, "server/devd") && |
| 634 |
strcmp(source, "server/wscons")) |
| 628 |
goto out; |
635 |
goto out; |
| 629 |
|
636 |
|
| 630 |
/* no type specified, so we need to pick the first one applicable |
637 |
/* no type specified, so we need to pick the first one applicable |