|
Lines 1451-1457
Link Here
|
| 1451 |
indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL); |
1451 |
indp[count - 1].extraOptions = xf86addNewOption(NULL, "CorePointer", NULL); |
| 1452 |
indp[count].identifier = NULL; |
1452 |
indp[count].identifier = NULL; |
| 1453 |
servlayoutp->inputs = indp; |
1453 |
servlayoutp->inputs = indp; |
| 1454 |
} else { |
1454 |
} else if (!havePointer) { |
| 1455 |
/* This should never happen. */ |
1455 |
/* This should never happen. */ |
| 1456 |
xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n"); |
1456 |
xf86Msg(X_ERROR, "Cannot locate a core pointer device.\n"); |
| 1457 |
return FALSE; |
1457 |
return FALSE; |
|
Lines 1473-1479
Link Here
|
| 1473 |
indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL); |
1473 |
indp[count - 1].extraOptions = xf86addNewOption(NULL, "CoreKeyboard", NULL); |
| 1474 |
indp[count].identifier = NULL; |
1474 |
indp[count].identifier = NULL; |
| 1475 |
servlayoutp->inputs = indp; |
1475 |
servlayoutp->inputs = indp; |
| 1476 |
} else { |
1476 |
} else if (!haveKeyboard) { |
| 1477 |
/* This should never happen. */ |
1477 |
/* This should never happen. */ |
| 1478 |
xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n"); |
1478 |
xf86Msg(X_ERROR, "Cannot locate a core keyboard device\n"); |
| 1479 |
return FALSE; |
1479 |
return FALSE; |
