From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261475AbUL2H5E (ORCPT ); Wed, 29 Dec 2004 02:57:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261473AbUL2Hka (ORCPT ); Wed, 29 Dec 2004 02:40:30 -0500 Received: from smtp802.mail.sc5.yahoo.com ([66.163.168.181]:14511 "HELO smtp802.mail.sc5.yahoo.com") by vger.kernel.org with SMTP id S261424AbUL2Hd0 (ORCPT ); Wed, 29 Dec 2004 02:33:26 -0500 From: Dmitry Torokhov To: Vojtech Pavlik Subject: [PATCH 6/16] Propery set up name for PS/2 Logitech mice Date: Wed, 29 Dec 2004 02:23:22 -0500 User-Agent: KMail/1.6.2 Cc: linux-input@atrey.karlin.mff.cuni.cz, LKML References: <200412290217.36282.dtor_core@ameritech.net> <200412290221.33869.dtor_core@ameritech.net> <200412290222.25300.dtor_core@ameritech.net> In-Reply-To: <200412290222.25300.dtor_core@ameritech.net> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <200412290223.24307.dtor_core@ameritech.net> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org =================================================================== 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 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;