microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Input: psmouse - use switch statement in psmouse_process_byte() 

Instead of a series mostly exclusive "if" statements testing protocol type
of the mouse let's use "switch" statement.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Tested-by: Marcin Sochacki <msochacki+kernel@gmail.com>
Tested-by: Till <till2.schaefer@uni-dortmund.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2015-11-27 20:29:22 -08:00
Родитель 6a13feb9c8
Коммит 0a88d60784
1 изменённых файлов: 32 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

67
drivers/input/mouse/psmouse-base.c
Просмотреть файл

@ -138,22 +138,16 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
if (psmouse->pktcnt < psmouse->pktsize) if (psmouse->pktcnt < psmouse->pktsize)
return PSMOUSE_GOOD_DATA; return PSMOUSE_GOOD_DATA;
/* /* Full packet accumulated, process it */
* Full packet accumulated, process it
*/
/* switch (psmouse->type) {
* Scroll wheel on IntelliMice, scroll buttons on NetMice case PSMOUSE_IMPS:
*/ /* IntelliMouse has scroll wheel */
if (psmouse->type == PSMOUSE_IMPS || psmouse->type == PSMOUSE_GENPS)
input_report_rel(dev, REL_WHEEL, -(signed char) packet[3]); input_report_rel(dev, REL_WHEEL, -(signed char) packet[3]);
break;
/* case PSMOUSE_IMEX:
* Scroll wheel and buttons on IntelliMouse Explorer /* Scroll wheel and buttons on IntelliMouse Explorer */
*/
if (psmouse->type == PSMOUSE_IMEX) {
switch (packet[3] & 0xC0) { switch (packet[3] & 0xC0) {
case 0x80: /* vertical scroll on IntelliMouse Explorer 4.0 */ case 0x80: /* vertical scroll on IntelliMouse Explorer 4.0 */
input_report_rel(dev, REL_WHEEL, (int) (packet[3] & 32) - (int) (packet[3] & 31)); input_report_rel(dev, REL_WHEEL, (int) (packet[3] & 32) - (int) (packet[3] & 31));
@ -168,39 +162,42 @@ psmouse_ret_t psmouse_process_byte(struct psmouse *psmouse)
input_report_key(dev, BTN_EXTRA, (packet[3] >> 5) & 1); input_report_key(dev, BTN_EXTRA, (packet[3] >> 5) & 1);
break; break;
} }
} break;
/* case PSMOUSE_GENPS:
* Extra buttons on Genius NewNet 3D /* Report scroll buttons on NetMice */
*/ input_report_rel(dev, REL_WHEEL, -(signed char) packet[3]);
if (psmouse->type == PSMOUSE_GENPS) { /* Extra buttons on Genius NewNet 3D */
input_report_key(dev, BTN_SIDE, (packet[0] >> 6) & 1); input_report_key(dev, BTN_SIDE, (packet[0] >> 6) & 1);
input_report_key(dev, BTN_EXTRA, (packet[0] >> 7) & 1); input_report_key(dev, BTN_EXTRA, (packet[0] >> 7) & 1);
} break;
/* case PSMOUSE_THINKPS:
* Extra button on ThinkingMouse /* Extra button on ThinkingMouse */
*/
if (psmouse->type == PSMOUSE_THINKPS) {
input_report_key(dev, BTN_EXTRA, (packet[0] >> 3) & 1); input_report_key(dev, BTN_EXTRA, (packet[0] >> 3) & 1);
/* Without this bit of weirdness moving up gives wildly high Y changes. */
packet[1] |= (packet[0] & 0x40) << 1;
}
/* /*
* Cortron PS2 Trackball reports SIDE button on the 4th bit of the first * Without this bit of weirdness moving up gives wildly
* byte. * high Y changes.
*/ */
if (psmouse->type == PSMOUSE_CORTRON) { packet[1] |= (packet[0] & 0x40) << 1;
break;
case PSMOUSE_CORTRON:
/*
* Cortron PS2 Trackball reports SIDE button in the
* 4th bit of the first byte.
*/
input_report_key(dev, BTN_SIDE, (packet[0] >> 3) & 1); input_report_key(dev, BTN_SIDE, (packet[0] >> 3) & 1);
packet[0] |= 0x08; packet[0] |= 0x08;
break;
default:
break;
} }
/* /* Generic PS/2 Mouse */
* Generic PS/2 Mouse
*/
input_report_key(dev, BTN_LEFT, packet[0] & 1); input_report_key(dev, BTN_LEFT, packet[0] & 1);
input_report_key(dev, BTN_MIDDLE, (packet[0] >> 2) & 1); input_report_key(dev, BTN_MIDDLE, (packet[0] >> 2) & 1);
input_report_key(dev, BTN_RIGHT, (packet[0] >> 1) & 1); input_report_key(dev, BTN_RIGHT, (packet[0] >> 1) & 1);