i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* ps2_synaptics.c - small cleanup

Browse Source 
* ps2_dev.c - accidentally turned Synaptics support back on with my last commit. Sorry.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28460 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-11-02 11:47:51 +00:00
parent 03973d27eb
commit 60266d74d9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
+1 -1
View File
@@ -102,7 +102,7 @@ ps2_dev_detect_pointing(ps2_dev *dev, device_hooks **hooks)
// probe devices // probe devices
// the probe function has to set the dev name and the dev packet size // the probe function has to set the dev name and the dev packet size
#if 1 #if 0
status = probe_trackpoint(dev); status = probe_trackpoint(dev);
if (status == B_OK) { if (status == B_OK) {
*hooks = &gStandardMouseDeviceHooks; *hooks = &gStandardMouseDeviceHooks;
src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c
+4 -4
View File
@@ -421,14 +421,14 @@ get_synaptics_movment(synaptics_cookie* cookie, mouse_movement *movement)
event.yPosition = event_buffer[5]; event.yPosition = event_buffer[5];
val32 = event_buffer[1] & 0x0F; val32 = event_buffer[1] & 0x0F;
event.xPosition+= val32 << 8; event.xPosition += val32 << 8;
val32 = event_buffer[1] >> 4 & 0x0F; val32 = event_buffer[1] >> 4 & 0x0F;
event.yPosition+= val32 << 8; event.yPosition += val32 << 8;
xTwelfBit = event_buffer[3] >> 4 & 1; xTwelfBit = event_buffer[3] >> 4 & 1;
event.xPosition+= xTwelfBit << 12; event.xPosition += xTwelfBit << 12;
yTwelfBit = event_buffer[3] >> 5 & 1; yTwelfBit = event_buffer[3] >> 5 & 1;
event.yPosition+= yTwelfBit << 12; event.yPosition += yTwelfBit << 12;
status = touchevent_to_movement(cookie, &event, movement); status = touchevent_to_movement(cookie, &event, movement);