[PATCH 6/16] Propery set up name for PS/2 Logitech mice

Dmitry Torokhov
2004-12-29T07:57:04Z

===================================================================

ChangeSet@1.1957.1.33, 2004-11-12 01:30:17-05:00, dtor_core@ameritech.net
Input: psmouse - set mouse name to "Mouse" when using PS2++ and
don't have any other information about the mouse.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

logips2pp.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)

===================================================================

diff -Nru a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
--- a/drivers/input/mouse/logips2pp.c 2004-12-29 01:47:52 -05:00
+++ b/drivers/input/mouse/logips2pp.c 2004-12-29 01:47:52 -05:00
@@ -245,7 +245,8 @@
* Set up input device's properties based on the detected mouse model.
*/

-static void ps2pp_set_model_properties(struct psmouse *psmouse, struct ps2pp_info *model_info)
+static void ps2pp_set_model_properties(struct psmouse *psmouse, struct ps2pp_info *model_info,
+ int using_ps2pp)
{
if (model_info->features & PS2PP_SIDE_BTN)
set_bit(BTN_SIDE, psmouse->dev.keybit);
@@ -279,6 +280,16 @@
case PS2PP_KIND_TP3:
psmouse->name = "TouchPad 3";
break;
+
+ default:
+ /*
+ * Set name to "Mouse" only when using PS2++,
+ * otherwise let other protocols define suitable
+ * name
+ */
+ if (using_ps2pp)
+ psmouse->name = "Mouse";
+ break;
}
}

@@ -371,7 +382,7 @@
clear_bit(BTN_RIGHT, psmouse->dev.keybit);

if (model_info)
- ps2pp_set_model_properties(psmouse, model_info);
+ ps2pp_set_model_properties(psmouse, model_info, use_ps2pp);
}

return use_ps2pp ? 0 : -1;