diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /drivers/ps2/ps2_mouse.c | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'drivers/ps2/ps2_mouse.c')
| -rw-r--r-- | drivers/ps2/ps2_mouse.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c index 66b48bb3c3..b32ad1e222 100644 --- a/drivers/ps2/ps2_mouse.c +++ b/drivers/ps2/ps2_mouse.c @@ -80,7 +80,7 @@ void ps2_mouse_task(void) { uint8_t rcv; rcv = ps2_host_send(PS2_MOUSE_READ_DATA); if (rcv == PS2_ACK) { - mouse_report.buttons = ps2_host_recv_response() | tp_buttons; + mouse_report.buttons = ps2_host_recv_response(); mouse_report.x = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER; mouse_report.y = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER; # ifdef PS2_MOUSE_ENABLE_SCROLLING @@ -88,11 +88,10 @@ void ps2_mouse_task(void) { # endif } else { if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n"); - return; } #else if (pbuf_has_data()) { - mouse_report.buttons = ps2_host_recv_response() | tp_buttons; + mouse_report.buttons = ps2_host_recv_response(); mouse_report.x = ps2_host_recv_response() * PS2_MOUSE_X_MULTIPLIER; mouse_report.y = ps2_host_recv_response() * PS2_MOUSE_Y_MULTIPLIER; # ifdef PS2_MOUSE_ENABLE_SCROLLING @@ -100,10 +99,10 @@ void ps2_mouse_task(void) { # endif } else { if (debug_mouse) print("ps2_mouse: fail to get mouse packet\n"); - return; } #endif + mouse_report.buttons |= tp_buttons; /* if mouse moves or buttons state changes */ if (mouse_report.x || mouse_report.y || mouse_report.v || ((mouse_report.buttons ^ buttons_prev) & PS2_MOUSE_BTN_MASK)) { #ifdef PS2_MOUSE_DEBUG_RAW |