[PATCH 37/39] input: Check for IM Explorer mice even if IMPS check failed.

Vojtech Pavlik
2004-06-07T13:08:13Z

ChangeSet@1.1612.1.17, 2004-05-14 11:18:46+02:00, vojtech@suse.cz
input: Check for IM Explorer mice even if IMPS check failed.

psmouse-base.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)

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

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-07 13:10:27 +02:00
+++ b/drivers/input/mouse/psmouse-base.c 2004-06-07 13:10:27 +02:00
@@ -461,24 +461,25 @@
return type;
}

- if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
+ if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse)) {

if (set_properties) {
set_bit(REL_WHEEL, psmouse->dev.relbit);
+ set_bit(BTN_SIDE, psmouse->dev.keybit);
+ set_bit(BTN_EXTRA, psmouse->dev.keybit);
if (!psmouse->name)
- psmouse->name = "Wheel Mouse";
+ psmouse->name = "Explorer Mouse";
}

- if (max_proto >= PSMOUSE_IMEX && im_explorer_detect(psmouse)) {
+ return PSMOUSE_IMEX;
+ }

- if (!set_properties) {
- set_bit(BTN_SIDE, psmouse->dev.keybit);
- set_bit(BTN_EXTRA, psmouse->dev.keybit);
- if (!psmouse->name)
- psmouse->name = "Explorer Mouse";
- }
+ if (max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {

- return PSMOUSE_IMEX;
+ if (set_properties) {
+ set_bit(REL_WHEEL, psmouse->dev.relbit);
+ if (!psmouse->name)
+ psmouse->name = "Wheel Mouse";
}

return PSMOUSE_IMPS;