Problem with psmouse detecting generic ImExPS/2

Problem with psmouse detecting generic ImExPS/2

[Michael Langley]

I noticed this after upgrading 2.6.6->2.6.7

Even after building psmouse as a module, and specifying the protocol,
all I get is an ImPS/2 Generic Wheel Mouse.

[root@purgatory root]# modprobe psmouse proto=exps
Jun 21 01:51:57 purgatory kernel: input: ImPS/2 Generic Wheel Mouse on
isa0060/serio1

My ImExPS/2 was detected correctly in <=2.6.6 and after examining the
current psmouse code, and the changes in patch-2.6.7, I can't figure out
what's breaking it.  A little help?

Kernel version: Linux version 2.6.7 (root@purgatory) (gcc version 3.3.3
(Debian 20040422)) #1 Fri Jun 18 17:20:28 CDT 2004

Re: Problem with psmouse detecting generic ImExPS/2

[Vojtech Pavlik]

On Mon, Jun 21, 2004 at 02:16:51AM -0500, Michael Langley wrote:
> I noticed this after upgrading 2.6.6->2.6.7
> 
> Even after building psmouse as a module, and specifying the protocol,
> all I get is an ImPS/2 Generic Wheel Mouse.
> 
> [root@purgatory root]# modprobe psmouse proto=exps
> Jun 21 01:51:57 purgatory kernel: input: ImPS/2 Generic Wheel Mouse on
> isa0060/serio1
> 
> My ImExPS/2 was detected correctly in <=2.6.6 and after examining the
> current psmouse code, and the changes in patch-2.6.7, I can't figure out
> what's breaking it.  A little help?
 
Maybe your mouse needs the ImPS/2 init before the ExPS/2 one. You can
try to copy and-paste the ImPS/2 init once more in the code, without a
return, of course.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

Re: Problem with psmouse detecting generic ImExPS/2

[Michael Langley]

On Mon, 21 Jun 2004 10:28:31 +0200
Vojtech Pavlik <vojtech@suse.cz> wrote:

> On Mon, Jun 21, 2004 at 02:16:51AM -0500, Michael Langley wrote:
> > I noticed this after upgrading 2.6.6->2.6.7
> > 
> > Even after building psmouse as a module, and specifying the protocol,
> > all I get is an ImPS/2 Generic Wheel Mouse.
> > 
> > [root@purgatory root]# modprobe psmouse proto=exps
> > Jun 21 01:51:57 purgatory kernel: input: ImPS/2 Generic Wheel Mouse on
> > isa0060/serio1
> > 
> > My ImExPS/2 was detected correctly in <=2.6.6 and after examining the
> > current psmouse code, and the changes in patch-2.6.7, I can't figure out
> > what's breaking it.  A little help?
>  
> Maybe your mouse needs the ImPS/2 init before the ExPS/2 one. You can
> try to copy and-paste the ImPS/2 init once more in the code, without a
> return, of course.
> 
> -- 
> Vojtech Pavlik
> SuSE Labs, SuSE CR


Right.  That did the trick.

--- a/drivers/input/mouse/psmouse-base.c   2004-06-21 12:21:21.000000000 -0500
+++ b/drivers/input/mouse/psmouse-base.c   2004-06-21 12:12:39.000000000 -0500
@@ -455,6 +455,15 @@
                return PSMOUSE_GENPS;
        }

+   if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
+
+      if (set_properties) {
+         set_bit(REL_WHEEL, psmouse->dev.relbit);
+         if (!psmouse->name)
+            psmouse->name = "Wheel Mouse";
+      }
+   }
+
        if (max_proto > PSMOUSE_IMEX) {
                int type = ps2pp_init(psmouse, set_properties);
                if (type > PSMOUSE_PS2)


[root@purgatory root]# modprobe psmouse proto=exps
Jun 21 12:41:36 purgatory kernel: input: ImExPS/2 Generic Wheel Mouse on isa0060/serio1

Much thanks for the help.  I couldn't live without the extra buttons in X.

Re: Problem with psmouse detecting generic ImExPS/2

[Vojtech Pavlik]

[-- Attachment #1: Type: text/plain, Size: 1352 bytes --]

On Mon, Jun 21, 2004 at 12:45:06PM -0500, Michael Langley wrote:
> On Mon, 21 Jun 2004 10:28:31 +0200
> Vojtech Pavlik <vojtech@suse.cz> wrote:
> 
> > On Mon, Jun 21, 2004 at 02:16:51AM -0500, Michael Langley wrote:
> > > I noticed this after upgrading 2.6.6->2.6.7
> > > 
> > > Even after building psmouse as a module, and specifying the protocol,
> > > all I get is an ImPS/2 Generic Wheel Mouse.
> > > 
> > > [root@purgatory root]# modprobe psmouse proto=exps
> > > Jun 21 01:51:57 purgatory kernel: input: ImPS/2 Generic Wheel Mouse on
> > > isa0060/serio1
> > > 
> > > My ImExPS/2 was detected correctly in <=2.6.6 and after examining the
> > > current psmouse code, and the changes in patch-2.6.7, I can't figure out
> > > what's breaking it.  A little help?
> >  
> > Maybe your mouse needs the ImPS/2 init before the ExPS/2 one. You can
> > try to copy and-paste the ImPS/2 init once more in the code, without a
> > return, of course.
> > 
> > -- 
> > Vojtech Pavlik
> > SuSE Labs, SuSE CR
> 
> 
> Right.  That did the trick.

> [root@purgatory root]# modprobe psmouse proto=exps
> Jun 21 12:41:36 purgatory kernel: input: ImExPS/2 Generic Wheel Mouse on isa0060/serio1
> 
> Much thanks for the help.  I couldn't live without the extra buttons in X.

Can you check if this patch fixes it for you as well?

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR

[-- Attachment #2: imex-fix --]
[-- Type: text/plain, Size: 751 bytes --]

ChangeSet@1.1767, 2004-06-21 20:31:56+02:00, vojtech@suse.cz
  input: when probing for ImExPS/2 mice, the ImPS/2 sequence needs
         to be sent first, but the result should be ignored.
  
  Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>


 psmouse-base.c |    2 ++
 1 files changed, 2 insertions(+)


diff -Nru a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/psmouse-base.c	2004-06-21 20:32:54 +02:00
+++ b/drivers/input/mouse/psmouse-base.c	2004-06-21 20:32:54 +02:00
@@ -418,6 +418,8 @@
 {
 	unsigned char param[2];
 
+	intellimouse_detect(psmouse);
+
 	param[0] = 200;
 	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
 	param[0] = 200;
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>

Re: Problem with psmouse detecting generic ImExPS/2

[Michael Langley]

On Mon, 21 Jun 2004 20:34:59 +0200
Vojtech Pavlik <vojtech@suse.cz> wrote:

> On Mon, Jun 21, 2004 at 12:45:06PM -0500, Michael Langley wrote:
> > On Mon, 21 Jun 2004 10:28:31 +0200
> > Vojtech Pavlik <vojtech@suse.cz> wrote:
> > 
> > > On Mon, Jun 21, 2004 at 02:16:51AM -0500, Michael Langley wrote:
> > > > I noticed this after upgrading 2.6.6->2.6.7
> > > > 
> > > > Even after building psmouse as a module, and specifying the protocol,
> > > > all I get is an ImPS/2 Generic Wheel Mouse.
> > > > 
> > > > [root@purgatory root]# modprobe psmouse proto=exps
> > > > Jun 21 01:51:57 purgatory kernel: input: ImPS/2 Generic Wheel Mouse on
> > > > isa0060/serio1
> > > > 
> > > > My ImExPS/2 was detected correctly in <=2.6.6 and after examining the
> > > > current psmouse code, and the changes in patch-2.6.7, I can't figure out
> > > > what's breaking it.  A little help?
> > >  
> > > Maybe your mouse needs the ImPS/2 init before the ExPS/2 one. You can
> > > try to copy and-paste the ImPS/2 init once more in the code, without a
> > > return, of course.
> > > 
> > > -- 
> > > Vojtech Pavlik
> > > SuSE Labs, SuSE CR
> > 
> > 
> > Right.  That did the trick.
> 
> > [root@purgatory root]# modprobe psmouse proto=exps
> > Jun 21 12:41:36 purgatory kernel: input: ImExPS/2 Generic Wheel Mouse on isa0060/serio1
> > 
> > Much thanks for the help.  I couldn't live without the extra buttons in X.
> 
> Can you check if this patch fixes it for you as well?
> 
> -- 
> Vojtech Pavlik
> SuSE Labs, SuSE CR
> 

Indeed, it does.  And much more efficiently.  Thanks again.

Re: Problem with psmouse detecting generic ImExPS/2

[Vojtech Pavlik]

On Mon, Jun 21, 2004 at 02:32:53PM -0500, Michael Langley wrote:

> > > [root@purgatory root]# modprobe psmouse proto=exps
> > > Jun 21 12:41:36 purgatory kernel: input: ImExPS/2 Generic Wheel Mouse on isa0060/serio1
> > > 
> > > Much thanks for the help.  I couldn't live without the extra buttons in X.
> > 
> > Can you check if this patch fixes it for you as well?

> Indeed, it does.  And much more efficiently.  Thanks again.

Ok, I'll push it upstream.

-- 
Vojtech Pavlik
SuSE Labs, SuSE CR