Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ps2: Fix Werrors.

Browse Source
This commit is contained in:
Augustin Cavalier 2018-11-03 15:22:53 -04:00
parent 4e1ffc1266
commit c87601b89a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/bus_managers/ps2/ps2_elantech.cpp
View File

@ -158,7 +158,8 @@ get_elantech_movement(elantech_cookie *cookie, mouse_movement *movement)
case STATUS_PACKET: case STATUS_PACKET:
//fingers, no palm //fingers, no palm
cookie->fingers = (packet[4] & 0x80) == 0 ? packet[1] & 0x1f: 0; cookie->fingers = (packet[4] & 0x80) == 0 ? packet[1] & 0x1f: 0;
dprintf("ELANTECH: Fingers %d, raw %x (STATUS)\n", cookie->fingers, packet[1]); dprintf("ELANTECH: Fingers %" B_PRId32 ", raw %x (STATUS)\n",
cookie->fingers, packet[1]);
break; break;
case HEAD_PACKET: case HEAD_PACKET:
dprintf("ELANTECH: Fingers %d, raw %x (HEAD)\n", (packet[3] & 0xe0) >>5, packet[3]); dprintf("ELANTECH: Fingers %d, raw %x (HEAD)\n", (packet[3] & 0xe0) >>5, packet[3]);
@ -172,7 +173,8 @@ get_elantech_movement(elantech_cookie *cookie, mouse_movement *movement)
cookie->x = event.xPosition = ((packet[1] & 0xf) << 8) | packet[2]; cookie->x = event.xPosition = ((packet[1] & 0xf) << 8) | packet[2];
cookie->y = event.yPosition = ((packet[4] & 0xf) << 8) | packet[5]; cookie->y = event.yPosition = ((packet[4] & 0xf) << 8) | packet[5];
dprintf("ELANTECH: Pos: %d:%d\n (HEAD)", cookie->x, cookie->y); dprintf("ELANTECH: Pos: %" B_PRId32 ":%" B_PRId32 "\n (HEAD)",
cookie->x, cookie->y);
TRACE("ELANTECH: buttons 0x%x x %" B_PRIu32 " y %" B_PRIu32 TRACE("ELANTECH: buttons 0x%x x %" B_PRIu32 " y %" B_PRIu32
" z %d\n", event.buttons, event.xPosition, event.yPosition, " z %d\n", event.buttons, event.xPosition, event.yPosition,
event.zPressure); event.zPressure);
@ -188,7 +190,8 @@ get_elantech_movement(elantech_cookie *cookie, mouse_movement *movement)
event.xPosition = cookie->x += (int8)packet[1]; event.xPosition = cookie->x += (int8)packet[1];
event.yPosition = cookie->y += (int8)packet[2]; event.yPosition = cookie->y += (int8)packet[2];
} }
dprintf("ELANTECH: Pos: %d:%d (Motion\n", cookie->x, cookie->y); dprintf("ELANTECH: Pos: %" B_PRId32 ":%" B_PRId32 " (Motion)\n",
cookie->x, cookie->y);
break; break;
default: default: