2005-03-07 00:58:43

by Michael Marineau

[permalink] [raw]
Subject: [PATCH] Treat ALPS mouse buttons as mouse buttons

The following patch changes the ALPS touchpad driver to treat some mouse
buttons as mouse buttons rather than what appears to be joystick buttons.
This is needed for the Dell Inspiron 8500's DualPoint stick buttons. Without
this patch only the touchpad buttons behave properly.

--- linux-2.6.11/drivers/input/mouse/alps.c 2005-03-01 23:38:13.000000000 -0800
+++ linux-2.6.11-gentoo-r2/drivers/input/mouse/alps.c 2005-03-06 16:45:07.000000000 -0800
@@ -97,8 +97,8 @@

input_report_rel(dev, REL_X, x);
input_report_rel(dev, REL_Y, -y);
- input_report_key(dev, BTN_A, left);
- input_report_key(dev, BTN_B, right);
+ input_report_key(dev, BTN_LEFT, left);
+ input_report_key(dev, BTN_RIGHT, right);
input_sync(dev);
return;
}
@@ -389,8 +389,6 @@
psmouse->dev.evbit[LONG(EV_REL)] |= BIT(EV_REL);
psmouse->dev.relbit[LONG(REL_X)] |= BIT(REL_X);
psmouse->dev.relbit[LONG(REL_Y)] |= BIT(REL_Y);
- psmouse->dev.keybit[LONG(BTN_A)] |= BIT(BTN_A);
- psmouse->dev.keybit[LONG(BTN_B)] |= BIT(BTN_B);

psmouse->dev.evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
input_set_abs_params(&psmouse->dev, ABS_X, 0, 1023, 0, 0);

--
Michael Marineau
[email protected]
Oregon State University


Attachments:
signature.asc (256.00 B)
OpenPGP digital signature

2005-03-07 05:49:39

by Vojtech Pavlik

[permalink] [raw]
Subject: Re: [PATCH] Treat ALPS mouse buttons as mouse buttons

On Sun, Mar 06, 2005 at 04:58:15PM -0800, Micheal Marineau wrote:

> The following patch changes the ALPS touchpad driver to treat some mouse
> buttons as mouse buttons rather than what appears to be joystick buttons.
> This is needed for the Dell Inspiron 8500's DualPoint stick buttons. Without
> this patch only the touchpad buttons behave properly.

Thanks for the patch. I'll try to put this change into my the latest
version of the ALPS driver, which, unfortunately, has been reworked
significantly.

Can you send me the output of /proc/bus/input/devices on your machine?
I'd like to know the ID of your ALPS dualpoint.

> --- linux-2.6.11/drivers/input/mouse/alps.c 2005-03-01 23:38:13.000000000 -0800
> +++ linux-2.6.11-gentoo-r2/drivers/input/mouse/alps.c 2005-03-06 16:45:07.000000000 -0800
> @@ -97,8 +97,8 @@
>
> input_report_rel(dev, REL_X, x);
> input_report_rel(dev, REL_Y, -y);
> - input_report_key(dev, BTN_A, left);
> - input_report_key(dev, BTN_B, right);
> + input_report_key(dev, BTN_LEFT, left);
> + input_report_key(dev, BTN_RIGHT, right);
> input_sync(dev);
> return;
> }
> @@ -389,8 +389,6 @@
> psmouse->dev.evbit[LONG(EV_REL)] |= BIT(EV_REL);
> psmouse->dev.relbit[LONG(REL_X)] |= BIT(REL_X);
> psmouse->dev.relbit[LONG(REL_Y)] |= BIT(REL_Y);
> - psmouse->dev.keybit[LONG(BTN_A)] |= BIT(BTN_A);
> - psmouse->dev.keybit[LONG(BTN_B)] |= BIT(BTN_B);
>
> psmouse->dev.evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
> input_set_abs_params(&psmouse->dev, ABS_X, 0, 1023, 0, 0);

--
Vojtech Pavlik
SuSE Labs, SuSE CR

2005-03-07 06:13:36

by Michael Marineau

[permalink] [raw]
Subject: Re: [PATCH] Treat ALPS mouse buttons as mouse buttons

Vojtech Pavlik wrote:
> On Sun, Mar 06, 2005 at 04:58:15PM -0800, Micheal Marineau wrote:
>
>
>>The following patch changes the ALPS touchpad driver to treat some mouse
>>buttons as mouse buttons rather than what appears to be joystick buttons.
>>This is needed for the Dell Inspiron 8500's DualPoint stick buttons. Without
>>this patch only the touchpad buttons behave properly.
>
>
> Thanks for the patch. I'll try to put this change into my the latest
> version of the ALPS driver, which, unfortunately, has been reworked
> significantly.
>
> Can you send me the output of /proc/bus/input/devices on your machine?
> I'd like to know the ID of your ALPS dualpoint.
>

I just looked at the new version in 2.6.11-mm1 and it appears that my
change as already been covered in different ways and I'm not having any
problem with the buttons on mm1. Just in case you still want to know,
the following is the ouptput if /proc/bus/input/devices.

I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
N: Name="AT Translated Set 2 keyboard"
P: Phys=isa0060/serio0/input0
H: Handlers=kbd
B: EV=120013
B: KEY=4 2000000 3802078 f840d001 f2ffffdf ffefffff ffffffff fffffffe
B: MSC=10
B: LED=7

I: Bus=0011 Vendor=0002 Product=0008 Version=0000
N: Name="AlpsPS/2 ALPS TouchPad"
P: Phys=isa0060/serio1/input0
H: Handlers=mouse0
B: EV=f
B: KEY=420 0 670000 0 0 0 0 0 0 0 0
B: REL=3
B: ABS=1000003


--
Michael Marineau
[email protected]
Oregon State University


Attachments:
signature.asc (256.00 B)
OpenPGP digital signature

2005-03-07 06:23:59

by Vojtech Pavlik

[permalink] [raw]
Subject: Re: [PATCH] Treat ALPS mouse buttons as mouse buttons

On Sun, Mar 06, 2005 at 04:58:15PM -0800, Micheal Marineau wrote:

> The following patch changes the ALPS touchpad driver to treat some mouse
> buttons as mouse buttons rather than what appears to be joystick buttons.
> This is needed for the Dell Inspiron 8500's DualPoint stick buttons. Without
> this patch only the touchpad buttons behave properly.

After investigating the problem deeper it looks like this should already
be fixed in Andrew Morton's -mm tree. Can you try it?

> --- linux-2.6.11/drivers/input/mouse/alps.c 2005-03-01 23:38:13.000000000 -0800
> +++ linux-2.6.11-gentoo-r2/drivers/input/mouse/alps.c 2005-03-06 16:45:07.000000000 -0800
> @@ -97,8 +97,8 @@
>
> input_report_rel(dev, REL_X, x);
> input_report_rel(dev, REL_Y, -y);
> - input_report_key(dev, BTN_A, left);
> - input_report_key(dev, BTN_B, right);
> + input_report_key(dev, BTN_LEFT, left);
> + input_report_key(dev, BTN_RIGHT, right);
> input_sync(dev);
> return;
> }
> @@ -389,8 +389,6 @@
> psmouse->dev.evbit[LONG(EV_REL)] |= BIT(EV_REL);
> psmouse->dev.relbit[LONG(REL_X)] |= BIT(REL_X);
> psmouse->dev.relbit[LONG(REL_Y)] |= BIT(REL_Y);
> - psmouse->dev.keybit[LONG(BTN_A)] |= BIT(BTN_A);
> - psmouse->dev.keybit[LONG(BTN_B)] |= BIT(BTN_B);
>
> psmouse->dev.evbit[LONG(EV_ABS)] |= BIT(EV_ABS);
> input_set_abs_params(&psmouse->dev, ABS_X, 0, 1023, 0, 0);

--
Vojtech Pavlik
SuSE Labs, SuSE CR

2005-03-07 06:25:50

by Vojtech Pavlik

[permalink] [raw]
Subject: Re: [PATCH] Treat ALPS mouse buttons as mouse buttons

On Sun, Mar 06, 2005 at 10:12:00PM -0800, Micheal Marineau wrote:

> >>The following patch changes the ALPS touchpad driver to treat some mouse
> >>buttons as mouse buttons rather than what appears to be joystick buttons.
> >>This is needed for the Dell Inspiron 8500's DualPoint stick buttons. Without
> >>this patch only the touchpad buttons behave properly.
> >
> >
> > Thanks for the patch. I'll try to put this change into my the latest
> > version of the ALPS driver, which, unfortunately, has been reworked
> > significantly.
> >
> > Can you send me the output of /proc/bus/input/devices on your machine?
> > I'd like to know the ID of your ALPS dualpoint.
>
> I just looked at the new version in 2.6.11-mm1 and it appears that my
> change as already been covered in different ways and I'm not having any
> problem with the buttons on mm1.

Good. I just noticed the same. :)

> Just in case you still want to know,
> the following is the ouptput if /proc/bus/input/devices.
>
> I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
> N: Name="AT Translated Set 2 keyboard"
> P: Phys=isa0060/serio0/input0
> H: Handlers=kbd
> B: EV=120013
> B: KEY=4 2000000 3802078 f840d001 f2ffffdf ffefffff ffffffff fffffffe
> B: MSC=10
> B: LED=7
>
> I: Bus=0011 Vendor=0002 Product=0008 Version=0000
> N: Name="AlpsPS/2 ALPS TouchPad"
> P: Phys=isa0060/serio1/input0
> H: Handlers=mouse0
> B: EV=f
> B: KEY=420 0 670000 0 0 0 0 0 0 0 0
> B: REL=3
> B: ABS=1000003

Thanks. Could you also attach the one from -mm1? It's a bit different.

--
Vojtech Pavlik
SuSE Labs, SuSE CR

2005-03-07 06:35:50

by Michael Marineau

[permalink] [raw]
Subject: Re: [PATCH] Treat ALPS mouse buttons as mouse buttons

Vojtech Pavlik wrote:
> On Sun, Mar 06, 2005 at 10:12:00PM -0800, Micheal Marineau wrote:
>
>
>>>>The following patch changes the ALPS touchpad driver to treat some mouse
>>>>buttons as mouse buttons rather than what appears to be joystick buttons.
>>>>This is needed for the Dell Inspiron 8500's DualPoint stick buttons. Without
>>>>this patch only the touchpad buttons behave properly.
>>>
>>>
>>>Thanks for the patch. I'll try to put this change into my the latest
>>>version of the ALPS driver, which, unfortunately, has been reworked
>>>significantly.
>>>
>>>Can you send me the output of /proc/bus/input/devices on your machine?
>>>I'd like to know the ID of your ALPS dualpoint.
>>
>>I just looked at the new version in 2.6.11-mm1 and it appears that my
>>change as already been covered in different ways and I'm not having any
>>problem with the buttons on mm1.
>
>
> Good. I just noticed the same. :)
>
>
>>Just in case you still want to know,
>>the following is the ouptput if /proc/bus/input/devices.
>>
>>I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
>>N: Name="AT Translated Set 2 keyboard"
>>P: Phys=isa0060/serio0/input0
>>H: Handlers=kbd
>>B: EV=120013
>>B: KEY=4 2000000 3802078 f840d001 f2ffffdf ffefffff ffffffff fffffffe
>>B: MSC=10
>>B: LED=7
>>
>>I: Bus=0011 Vendor=0002 Product=0008 Version=0000
>>N: Name="AlpsPS/2 ALPS TouchPad"
>>P: Phys=isa0060/serio1/input0
>>H: Handlers=mouse0
>>B: EV=f
>>B: KEY=420 0 670000 0 0 0 0 0 0 0 0
>>B: REL=3
>>B: ABS=1000003
>
>
> Thanks. Could you also attach the one from -mm1? It's a bit different.
>
here is the mm1 version:
I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
N: Name="AT Translated Set 2 keyboard"
P: Phys=isa0060/serio0/input0
H: Handlers=kbd mouse0
B: EV=120017
B: KEY=40000 4 2000000 3802078 f840d001 b2ffffdf ffefffff ffffffff fffffffe
B: REL=140
B: MSC=10
B: LED=7

I: Bus=0011 Vendor=0002 Product=0008 Version=0000
N: Name="PS/2 Mouse"
P: Phys=isa0060/serio1/input1
H: Handlers=mouse1
B: EV=7
B: KEY=70000 0 0 0 0 0 0 0 0
B: REL=3

I: Bus=0011 Vendor=0002 Product=0008 Version=6337
N: Name="AlpsPS/2 ALPS GlidePoint"
P: Phys=isa0060/serio1/input0
H: Handlers=mouse2
B: EV=f
B: KEY=420 0 70000 0 0 0 0 0 0 0 0
B: REL=3
B: ABS=1000003


--
Michael Marineau
[email protected]
Oregon State University


Attachments:
signature.asc (256.00 B)
OpenPGP digital signature

2005-03-07 06:56:26

by Vojtech Pavlik

[permalink] [raw]
Subject: Re: [PATCH] Treat ALPS mouse buttons as mouse buttons

On Sun, Mar 06, 2005 at 10:35:26PM -0800, Micheal Marineau wrote:

> > Thanks. Could you also attach the one from -mm1? It's a bit different.
> >
> here is the mm1 version:
> I: Bus=0011 Vendor=0001 Product=0001 Version=ab41
> N: Name="AT Translated Set 2 keyboard"
> P: Phys=isa0060/serio0/input0
> H: Handlers=kbd mouse0
> B: EV=120017
> B: KEY=40000 4 2000000 3802078 f840d001 b2ffffdf ffefffff ffffffff fffffffe
> B: REL=140
> B: MSC=10
> B: LED=7
>
> I: Bus=0011 Vendor=0002 Product=0008 Version=0000
> N: Name="PS/2 Mouse"
> P: Phys=isa0060/serio1/input1
> H: Handlers=mouse1
> B: EV=7
> B: KEY=70000 0 0 0 0 0 0 0 0
> B: REL=3
>
> I: Bus=0011 Vendor=0002 Product=0008 Version=6337
> N: Name="AlpsPS/2 ALPS GlidePoint"
> P: Phys=isa0060/serio1/input0
> H: Handlers=mouse2
> B: EV=f
> B: KEY=420 0 70000 0 0 0 0 0 0 0 0
> B: REL=3
> B: ABS=1000003

Thanks!

--
Vojtech Pavlik
SuSE Labs, SuSE CR