From 60266d74d9fa2f352d04589dde9d48a6a8f8b34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sun, 2 Nov 2008 11:47:51 +0000 Subject: [PATCH] * ps2_synaptics.c - small cleanup * 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 --- src/add-ons/kernel/bus_managers/ps2/ps2_dev.c | 2 +- src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c index c2afd6871c..85d137dd8b 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_dev.c @@ -102,7 +102,7 @@ ps2_dev_detect_pointing(ps2_dev *dev, device_hooks **hooks) // probe devices // the probe function has to set the dev name and the dev packet size -#if 1 +#if 0 status = probe_trackpoint(dev); if (status == B_OK) { *hooks = &gStandardMouseDeviceHooks; diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c index 7fed15e50c..e273496dee 100644 --- a/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c +++ b/src/add-ons/kernel/bus_managers/ps2/ps2_synaptics.c @@ -421,14 +421,14 @@ get_synaptics_movment(synaptics_cookie* cookie, mouse_movement *movement) event.yPosition = event_buffer[5]; val32 = event_buffer[1] & 0x0F; - event.xPosition+= val32 << 8; + event.xPosition += val32 << 8; val32 = event_buffer[1] >> 4 & 0x0F; - event.yPosition+= val32 << 8; + event.yPosition += val32 << 8; xTwelfBit = event_buffer[3] >> 4 & 1; - event.xPosition+= xTwelfBit << 12; + event.xPosition += xTwelfBit << 12; yTwelfBit = event_buffer[3] >> 5 & 1; - event.yPosition+= yTwelfBit << 12; + event.yPosition += yTwelfBit << 12; status = touchevent_to_movement(cookie, &event, movement);