psmouse-base.c (7e3b1207705c10ada363bbc7d0235730ce1f5b79) | psmouse-base.c (98ee377144935857d8ad5d7d70cdab1da4ede32e) |
---|---|
1/* 2 * PS/2 mouse driver 3 * 4 * Copyright (c) 1999-2002 Vojtech Pavlik 5 * Copyright (c) 2003-2004 Dmitry Torokhov 6 */ 7 8/* --- 23 unchanged lines hidden (view full) --- 32#include "lifebook.h" 33#include "trackpoint.h" 34#include "touchkit_ps2.h" 35#include "elantech.h" 36#include "sentelic.h" 37#include "cypress_ps2.h" 38#include "focaltech.h" 39#include "vmmouse.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/* --- 23 unchanged lines hidden (view full) --- 32#include "lifebook.h" 33#include "trackpoint.h" 34#include "touchkit_ps2.h" 35#include "elantech.h" 36#include "sentelic.h" 37#include "cypress_ps2.h" 38#include "focaltech.h" 39#include "vmmouse.h" |
40#include "byd.h" |
|
40 41#define DRIVER_DESC "PS/2 mouse driver" 42 43MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); 44MODULE_DESCRIPTION(DRIVER_DESC); 45MODULE_LICENSE("GPL"); 46 47static unsigned int psmouse_max_proto = PSMOUSE_AUTO; --- 789 unchanged lines hidden (view full) --- 837 { 838 .type = PSMOUSE_VMMOUSE, 839 .name = VMMOUSE_PSNAME, 840 .alias = "vmmouse", 841 .detect = vmmouse_detect, 842 .init = vmmouse_init, 843 }, 844#endif | 41 42#define DRIVER_DESC "PS/2 mouse driver" 43 44MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>"); 45MODULE_DESCRIPTION(DRIVER_DESC); 46MODULE_LICENSE("GPL"); 47 48static unsigned int psmouse_max_proto = PSMOUSE_AUTO; --- 789 unchanged lines hidden (view full) --- 838 { 839 .type = PSMOUSE_VMMOUSE, 840 .name = VMMOUSE_PSNAME, 841 .alias = "vmmouse", 842 .detect = vmmouse_detect, 843 .init = vmmouse_init, 844 }, 845#endif |
846#ifdef CONFIG_MOUSE_PS2_BYD |
|
845 { | 847 { |
848 .type = PSMOUSE_BYD, 849 .name = "BydPS/2", 850 .alias = "byd", 851 .detect = byd_detect, 852 .init = byd_init, 853 }, 854#endif 855 { |
|
846 .type = PSMOUSE_AUTO, 847 .name = "auto", 848 .alias = "any", 849 .maxproto = true, 850 }, 851}; 852 853static const struct psmouse_protocol *__psmouse_protocol_by_type(enum psmouse_type type) --- 246 unchanged lines hidden (view full) --- 1100 1101 if (psmouse_try_protocol(psmouse, PSMOUSE_TRACKPOINT, 1102 &max_proto, set_properties, true)) 1103 return PSMOUSE_TRACKPOINT; 1104 1105 if (psmouse_try_protocol(psmouse, PSMOUSE_TOUCHKIT_PS2, 1106 &max_proto, set_properties, true)) 1107 return PSMOUSE_TOUCHKIT_PS2; | 856 .type = PSMOUSE_AUTO, 857 .name = "auto", 858 .alias = "any", 859 .maxproto = true, 860 }, 861}; 862 863static const struct psmouse_protocol *__psmouse_protocol_by_type(enum psmouse_type type) --- 246 unchanged lines hidden (view full) --- 1110 1111 if (psmouse_try_protocol(psmouse, PSMOUSE_TRACKPOINT, 1112 &max_proto, set_properties, true)) 1113 return PSMOUSE_TRACKPOINT; 1114 1115 if (psmouse_try_protocol(psmouse, PSMOUSE_TOUCHKIT_PS2, 1116 &max_proto, set_properties, true)) 1117 return PSMOUSE_TOUCHKIT_PS2; |
1118 1119 if (psmouse_try_protocol(psmouse, PSMOUSE_BYD, 1120 &max_proto, set_properties, true)) 1121 return PSMOUSE_BYD; |
|
1108 } 1109 1110 /* 1111 * Try Finger Sensing Pad. We do it here because its probe upsets 1112 * Trackpoint devices (causing TP_READ_ID command to time out). 1113 */ 1114 if (max_proto > PSMOUSE_IMEX && 1115 psmouse_try_protocol(psmouse, PSMOUSE_FSP, --- 810 unchanged lines hidden --- | 1122 } 1123 1124 /* 1125 * Try Finger Sensing Pad. We do it here because its probe upsets 1126 * Trackpoint devices (causing TP_READ_ID command to time out). 1127 */ 1128 if (max_proto > PSMOUSE_IMEX && 1129 psmouse_try_protocol(psmouse, PSMOUSE_FSP, --- 810 unchanged lines hidden --- |