Re: Logitech wheel and 2.5? (PS/2)

[Kari Hameenaho]

Gregoire Favre wrote:

>patched, but I got:
>
>  drivers/input/mouse/psmouse.c drivers/input/mouse/psmouse.c: In
>  function `psmouse_process_packet': drivers/input/mouse/psmouse.c:90:
>  label `out' used but not defined make[3]: ***
>  [drivers/input/mouse/psmouse.o] Error 1 make[2]: ***
>  [drivers/input/mouse] Error 2 make[1]: *** [drivers/input] Error 2
make: *** [drivers] Error 2

There was a line +out: in my patch, maybe you did not apply it correctly
or the mail caused some changes to patch part. Note that it is against 
2.5.45. All os the patch is in one function, so it is quite possible to do 
patching manually (it is only 5 lines anyway), if it somehow gets 
corrupted.

Here it is again:

--- linux-2.5.45/drivers/input/mouse/psmouse.c	Thu Oct 31 02:42:20 2002
+++ linux-2.5.45-usb/drivers/input/mouse/psmouse.c	Fri Nov  1 22:28:25 2002
@@ -85,6 +85,11 @@
 
 	if (psmouse->type == PSMOUSE_PS2PP || psmouse->type == PSMOUSE_PS2TPP) {
 
+		/* Logitech radio/battery status or strangeness ?????? */
+		if (packet[0] == 0xd8) {
+			goto out;
+		}
+
 		if ((packet[0] & 0x40) == 0x40 && (int) packet[1] - (int) ((packet[0] & 0x10) << 4) > 191 ) {
 
 			switch (((packet[1] >> 4) & 0x03) | ((packet[0] >> 2) & 0xc0)) {
@@ -157,6 +162,7 @@
 	input_report_rel(dev, REL_X, packet[1] ? (int) packet[1] - (int) ((packet[0] << 4) & 0x100) : 0);
 	input_report_rel(dev, REL_Y, packet[2] ? (int) ((packet[0] << 3) & 0x100) - (int) packet[2] : 0);
 
+out:
 	input_sync(dev);
 }