psmouse-base.c (68d482214bb0eaac138ace329e72390d6c8d44ff) | psmouse-base.c (df08ef27a7f91961c91a2a718f5d1e616f1c8e57) |
---|---|
1/* 2 * PS/2 mouse driver 3 * 4 * Copyright (c) 1999-2002 Vojtech Pavlik 5 * Copyright (c) 2003-2004 Dmitry Torokhov 6 */ 7 8/* --- 11 unchanged lines hidden (view full) --- 20#include <linux/init.h> 21#include <linux/libps2.h> 22#include <linux/mutex.h> 23 24#include "psmouse.h" 25#include "synaptics.h" 26#include "logips2pp.h" 27#include "alps.h" | 1/* 2 * PS/2 mouse driver 3 * 4 * Copyright (c) 1999-2002 Vojtech Pavlik 5 * Copyright (c) 2003-2004 Dmitry Torokhov 6 */ 7 8/* --- 11 unchanged lines hidden (view full) --- 20#include <linux/init.h> 21#include <linux/libps2.h> 22#include <linux/mutex.h> 23 24#include "psmouse.h" 25#include "synaptics.h" 26#include "logips2pp.h" 27#include "alps.h" |
28#include "hgpk.h" |
|
28#include "lifebook.h" 29#include "trackpoint.h" 30#include "touchkit_ps2.h" 31 32#define DRIVER_DESC "PS/2 mouse driver" 33 34MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); 35MODULE_DESCRIPTION(DRIVER_DESC); --- 595 unchanged lines hidden (view full) --- 631 return PSMOUSE_ALPS; 632/* 633 * Init failed, try basic relative protocols 634 */ 635 max_proto = PSMOUSE_IMEX; 636 } 637 } 638 | 29#include "lifebook.h" 30#include "trackpoint.h" 31#include "touchkit_ps2.h" 32 33#define DRIVER_DESC "PS/2 mouse driver" 34 35MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); 36MODULE_DESCRIPTION(DRIVER_DESC); --- 595 unchanged lines hidden (view full) --- 632 return PSMOUSE_ALPS; 633/* 634 * Init failed, try basic relative protocols 635 */ 636 max_proto = PSMOUSE_IMEX; 637 } 638 } 639 |
639 if (max_proto > PSMOUSE_IMEX) { | 640/* 641 * Try OLPC HGPK touchpad. 642 */ 643 if (max_proto > PSMOUSE_IMEX && 644 hgpk_detect(psmouse, set_properties) == 0) { 645 if (!set_properties || hgpk_init(psmouse) == 0) 646 return PSMOUSE_HGPK; 647/* 648 * Init failed, try basic relative protocols 649 */ 650 max_proto = PSMOUSE_IMEX; 651 } |
640 | 652 |
653 if (max_proto > PSMOUSE_IMEX) { |
|
641 if (genius_detect(psmouse, set_properties) == 0) 642 return PSMOUSE_GENPS; 643 644 if (ps2pp_init(psmouse, set_properties) == 0) 645 return PSMOUSE_PS2PP; 646 647 if (trackpoint_detect(psmouse, set_properties) == 0) 648 return PSMOUSE_TRACKPOINT; --- 114 unchanged lines hidden (view full) --- 763#ifdef CONFIG_MOUSE_PS2_TOUCHKIT 764 { 765 .type = PSMOUSE_TOUCHKIT_PS2, 766 .name = "touchkitPS/2", 767 .alias = "touchkit", 768 .detect = touchkit_ps2_detect, 769 }, 770#endif | 654 if (genius_detect(psmouse, set_properties) == 0) 655 return PSMOUSE_GENPS; 656 657 if (ps2pp_init(psmouse, set_properties) == 0) 658 return PSMOUSE_PS2PP; 659 660 if (trackpoint_detect(psmouse, set_properties) == 0) 661 return PSMOUSE_TRACKPOINT; --- 114 unchanged lines hidden (view full) --- 776#ifdef CONFIG_MOUSE_PS2_TOUCHKIT 777 { 778 .type = PSMOUSE_TOUCHKIT_PS2, 779 .name = "touchkitPS/2", 780 .alias = "touchkit", 781 .detect = touchkit_ps2_detect, 782 }, 783#endif |
784#ifdef CONFIG_MOUSE_PS2_OLPC |
|
771 { | 785 { |
786 .type = PSMOUSE_HGPK, 787 .name = "OLPC HGPK", 788 .alias = "hgpk", 789 .detect = hgpk_detect, 790 }, 791#endif 792 { |
|
772 .type = PSMOUSE_CORTRON, 773 .name = "CortronPS/2", 774 .alias = "cortps", 775 .detect = cortron_detect, 776 }, 777 { 778 .type = PSMOUSE_AUTO, 779 .name = "auto", --- 849 unchanged lines hidden --- | 793 .type = PSMOUSE_CORTRON, 794 .name = "CortronPS/2", 795 .alias = "cortps", 796 .detect = cortron_detect, 797 }, 798 { 799 .type = PSMOUSE_AUTO, 800 .name = "auto", --- 849 unchanged lines hidden --- |