Re: New ALPS code in -mm
On Mon, Mar 07, 2005 at 02:14:17AM -0500, Daniel Barkalow wrote: > On Fri, 4 Mar 2005, Vojtech Pavlik wrote: > > > /* Relative movement packet */ > > if (z == 127) { > > - input_report_rel(dev2, REL_X, (x > 383 ? x : (x - > > 768))); > > - input_report_rel(dev2, REL_Y, -(y > 255 ? y : (x - > > 512))); > > + input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : > > x)); > > + input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : > > y)); > > Not that I have any idea, but (y - 512) seems much more likely here. > > > + if ((priv->i->flags & ALPS_DUALPOINT) && z == 127) { > > + input_report_key(dev2, BTN_LEFT, left); > > + input_report_key(dev2, BTN_RIGHT, right); > > + input_report_key(dev2, BTN_MIDDLE, middle); > > + input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : x)); > > + input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : y)); > > Also here. Indeed. It took me a while to find it. -- Vojtech Pavlik SuSE Labs, SuSE CR - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: New ALPS code in -mm
On Fri, 4 Mar 2005, Vojtech Pavlik wrote: > /* Relative movement packet */ > if (z == 127) { > - input_report_rel(dev2, REL_X, (x > 383 ? x : (x - > 768))); > - input_report_rel(dev2, REL_Y, -(y > 255 ? y : (x - > 512))); > + input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : > x)); > + input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : > y)); Not that I have any idea, but (y - 512) seems much more likely here. > + if ((priv->i->flags & ALPS_DUALPOINT) && z == 127) { > + input_report_key(dev2, BTN_LEFT, left); > + input_report_key(dev2, BTN_RIGHT, right); > + input_report_key(dev2, BTN_MIDDLE, middle); > + input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : x)); > + input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : y)); Also here. -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: New ALPS code in -mm
On Fri, Mar 04, 2005 at 10:02:03PM +0100, Benoit Boissinot wrote: > On Tue, 1 Mar 2005 12:54:32 +0100, Vojtech Pavlik <[EMAIL PROTECTED]> wrote: > > > > Can you check with a current -mm kernel whether any of the issues is > > still there? Everything seems to work smoothly with my ALPS. > > > > I have problems with ALPS and 2.6.11-mm1. If I move the pointer with > the touchpad, it activates button modifiers at the same time. (xev > reports a MotionNotify event with state = 0x600 or sometimes 0x200 > instead of the expected 0x0). > > Moreover the pointer sometimes jump at the bottom right of the screen. > > It worked fine with 2.6.11-rc5-mm1. > > relevant portion of dmesg: > > - with rc5: > > Linux version 2.6.11-rc5-mm1 ([EMAIL PROTECTED]) (gcc version > 3.4.3-20050110 (Gentoo Linux 3.4.3.20050110, > ssp-3.4.3.20050110-0, pie-8.7.7)) #2 Tue Mar 1 13:33:05 CET 2005 > input: AT Translated Set 2 keyboard on isa0060/serio0 > ALPS Touchpad (Dualpoint) detected > Enabling hardware tapping > input: AlpsPS/2 ALPS TouchPad on isa0060/serio1 > > - with .11 > > Linux version 2.6.11-mm1 ([EMAIL PROTECTED]) (gcc version 3.4.3-20050110 > (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, > pie-8.7.7)) #5 Fri Mar 4 16:49:47 CET 2005 > input: AT Translated Set 2 keyboard on isa0060/serio0 >Enabling hardware tapping > input: DualPoint Stick on isa0060/serio1 > input: AlpsPS/2 ALPS DualPoint TouchPad on isa0060/serio1 > > I hope it can help. Can you check if this patch helps? [EMAIL PROTECTED], 2005-03-04 20:19:05+01:00, [EMAIL PROTECTED] input: Fix inverted conditions in ALPS DualPoint stick packet decoding. [EMAIL PROTECTED], 2005-03-04 21:55:23+01:00, [EMAIL PROTECTED] input: Fix ALPS DualPoint stick buttons. Testing shows that they're at the same place as the pad ones, but packet has z==127. alps.c | 26 +--- 1 files changed, 10 insertions(+), 16 deletions(-) diff -Nru a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c --- a/drivers/input/mouse/alps.c2005-03-04 22:00:33 +01:00 +++ b/drivers/input/mouse/alps.c2005-03-04 22:00:33 +01:00 @@ -124,8 +124,8 @@ /* Relative movement packet */ if (z == 127) { - input_report_rel(dev2, REL_X, (x > 383 ? x : (x - 768))); - input_report_rel(dev2, REL_Y, -(y > 255 ? y : (x - 512))); + input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : x)); + input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : y)); input_sync(dev2); return; } diff -Nru a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c --- a/drivers/input/mouse/alps.c2005-03-04 22:00:49 +01:00 +++ b/drivers/input/mouse/alps.c2005-03-04 22:00:49 +01:00 @@ -115,20 +115,14 @@ ges = packet[2] & 1; fin = packet[2] & 2; - /* Dualpoint has stick buttons in byte 0 */ - if (priv->i->flags & ALPS_DUALPOINT) { - - input_report_key(dev2, BTN_LEFT,packet[0] & 1); - input_report_key(dev2, BTN_MIDDLE, (packet[0] >> 2) & 1); - input_report_key(dev2, BTN_RIGHT, (packet[0] >> 1) & 1); - - /* Relative movement packet */ - if (z == 127) { - input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : x)); - input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : y)); - input_sync(dev2); - return; - } + if ((priv->i->flags & ALPS_DUALPOINT) && z == 127) { + input_report_key(dev2, BTN_LEFT, left); + input_report_key(dev2, BTN_RIGHT, right); + input_report_key(dev2, BTN_MIDDLE, middle); + input_report_rel(dev2, REL_X, (x > 383 ? (x - 768) : x)); + input_report_rel(dev2, REL_Y, -(y > 255 ? (x - 512) : y)); + input_sync(dev2); + return; } /* Convert hardware tap to a reasonable Z value */ -- Vojtech Pavlik SuSE Labs, SuSE CR - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
New ALPS code in -mm
On Tue, 1 Mar 2005 12:54:32 +0100, Vojtech Pavlik <[EMAIL PROTECTED]> wrote: > > Can you check with a current -mm kernel whether any of the issues is > still there? Everything seems to work smoothly with my ALPS. > I have problems with ALPS and 2.6.11-mm1. If I move the pointer with the touchpad, it activates button modifiers at the same time. (xev reports a MotionNotify event with state = 0x600 or sometimes 0x200 instead of the expected 0x0). Moreover the pointer sometimes jump at the bottom right of the screen. It worked fine with 2.6.11-rc5-mm1. relevant portion of dmesg: - with rc5: Linux version 2.6.11-rc5-mm1 ([EMAIL PROTECTED]) (gcc version 3.4.3-20050110 (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, pie-8.7.7)) #2 Tue Mar 1 13:33:05 CET 2005 input: AT Translated Set 2 keyboard on isa0060/serio0 ALPS Touchpad (Dualpoint) detected Enabling hardware tapping input: AlpsPS/2 ALPS TouchPad on isa0060/serio1 - with .11 Linux version 2.6.11-mm1 ([EMAIL PROTECTED]) (gcc version 3.4.3-20050110 (Gentoo Linux 3.4.3.20050110, ssp-3.4.3.20050110-0, pie-8.7.7)) #5 Fri Mar 4 16:49:47 CET 2005 input: AT Translated Set 2 keyboard on isa0060/serio0 Enabling hardware tapping input: DualPoint Stick on isa0060/serio1 input: AlpsPS/2 ALPS DualPoint TouchPad on isa0060/serio1 I hope it can help. Benoit :00:00.0 Host bridge: Intel Corporation 82855PM Processor to I/O Controller (rev 03) Flags: bus master, fast devsel, latency 0 Memory at e000 (32-bit, prefetchable) Capabilities: :00:01.0 PCI bridge: Intel Corporation 82855PM Processor to AGP Controller (rev 03) (prog-if 00 [Normal decode]) Flags: bus master, 66Mhz, fast devsel, latency 32 Bus: primary=00, secondary=01, subordinate=01, sec-latency=32 I/O behind bridge: c000-cfff Memory behind bridge: fc00-fdff Prefetchable memory behind bridge: e800-efff Expansion ROM at c000 [disabled] [size=4K] :00:1d.0 USB Controller: Intel Corporation 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1 (rev 01) (prog-if 00 [UHCI]) Subsystem: Intel Corporation: Unknown device 4541 Flags: bus master, medium devsel, latency 0, IRQ 11 I/O ports at bf80 [size=32] :00:1d.1 USB Controller: Intel Corporation 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2 (rev 01) (prog-if 00 [UHCI]) Subsystem: Intel Corporation: Unknown device 4541 Flags: bus master, medium devsel, latency 0, IRQ 11 I/O ports at bf40 [size=32] :00:1d.2 USB Controller: Intel Corporation 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3 (rev 01) (prog-if 00 [UHCI]) Subsystem: Intel Corporation: Unknown device 4541 Flags: bus master, medium devsel, latency 0, IRQ 11 I/O ports at bf20 [size=32] :00:1d.7 USB Controller: Intel Corporation 82801DB/DBM (ICH4/ICH4-M) USB2 EHCI Controller (rev 01) (prog-if 20 [EHCI]) Subsystem: Dell: Unknown device 011d Flags: bus master, medium devsel, latency 0, IRQ 11 Memory at f4fffc00 (32-bit, non-prefetchable) Capabilities: :00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 81) (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=02, subordinate=02, sec-latency=32 I/O behind bridge: d000-efff Memory behind bridge: f600-fbff :00:1f.0 ISA bridge: Intel Corporation 82801DBM (ICH4-M) LPC Interface Bridge (rev 01) Flags: bus master, medium devsel, latency 0 :00:1f.1 IDE interface: Intel Corporation 82801DBM (ICH4-M) IDE Controller (rev 01) (prog-if 8a [Master SecP PriP]) Subsystem: Intel Corporation: Unknown device 4541 Flags: bus master, medium devsel, latency 0, IRQ 11 I/O ports at I/O ports at I/O ports at I/O ports at I/O ports at bfa0 [size=16] Memory at 2000 (32-bit, non-prefetchable) [size=1K] :00:1f.5 Multimedia audio controller: Intel Corporation 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller (rev 01) Subsystem: Dell: Unknown device 011d Flags: bus master, medium devsel, latency 0, IRQ 5 I/O ports at b800 I/O ports at bc40 [size=64] Memory at f4fff800 (32-bit, non-prefetchable) [size=512] Memory at f4fff400 (32-bit, non-prefetchable) [size=256] Capabilities: :00:1f.6 Modem: Intel Corporation 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller (rev 01) (prog-if 00 [Generic]) Subsystem: Conexant: Unknown device 5422 Flags: bus master, medium devsel, latency 0, IRQ 11 I/O ports at b400 I/O ports at b080 [size=128] Capabilities: :01:00.0 VGA compatible controller: ATI Technologies Inc Radeon R250 Lf [FireGL 9000] (rev 02) (prog-if 00 [VGA]) Subsystem: Dell: Unknown device 011d Flags: bus master, VGA palette snoop, stepping, 66Mhz, medium devsel, latency 32, IRQ 11 Memory at e800 (32-bit, prefetchable) I/O ports at c000 [size=256] Memory at fcff (32-bit, non-prefetchable) [size=64K] Capabilities: :02:00.0 Ethernet controller: Broadcom Corporation NetXtr