|
Lines 20-26
Link Here
|
| 20 |
{ |
19 |
{ |
| 21 |
KbdDevPtr pKbd = pInfo->private; |
20 |
KbdDevPtr pKbd = pInfo->private; |
| 22 |
|
21 |
|
| 23 |
@@ -521,3 +522,381 @@ |
22 |
@@ -532,3 +533,377 @@ |
| 24 |
#endif |
23 |
#endif |
| 25 |
return TRUE; |
24 |
return TRUE; |
| 26 |
} |
25 |
} |
|
Lines 390-403
Link Here
|
| 390 |
+ |
389 |
+ |
| 391 |
+ protocol = xf86SetStrOption(pInfo->options, "Protocol", NULL); |
390 |
+ protocol = xf86SetStrOption(pInfo->options, "Protocol", NULL); |
| 392 |
+ |
391 |
+ |
| 393 |
+ if (!protocol) |
392 |
+ if (xf86NameCmp(protocol, "evdev") == 0) |
| 394 |
+ ret = FALSE; |
|
|
| 395 |
+ else if (!strcmp(protocol, "standard")) |
| 396 |
+ ret = stdKbdPreInit(pInfo, protocol); |
| 397 |
+ else if (!strcmp(protocol, "evdev")) |
| 398 |
+ ret = evdevKbdPreInit(pInfo, protocol); |
393 |
+ ret = evdevKbdPreInit(pInfo, protocol); |
| 399 |
+ else |
394 |
+ else |
| 400 |
+ ret = FALSE; |
395 |
+ ret = stdKbdPreInit(pInfo, protocol); |
| 401 |
+ |
396 |
+ |
| 402 |
+ xfree(protocol); |
397 |
+ xfree(protocol); |
| 403 |
+ return ret; |
398 |
+ return ret; |
