Input: psmouse - allow disabling of synaptics protocol extension
PATCH 3/3 Input: psmouse - allow disabling of synaptics protocol extension
Allow disabling of synaptics via CONFIG_MOUSE_PS2_SYNAPTICS; we leave synaptic_detect and synaptic_reset (for synaptics hardware that emulates other protocols), but get rid of synaptic_init.
Signed-off-by Andres Salomon <[email protected]>
drivers/input/mouse/psmouse-base.c +5 -0
@@ -583,8 +583,11 @@ static int psmouse_extensions(struct psmouse *psmouse, synaptics_hardware =1 ;if (max_proto >PSMOUSE_IMEX ) { +#ifdef CONFIG_MOUSE_PS2_SYNAPTICS if (!set_properties ||synaptics_init (psmouse) ==0 )return PSMOUSE_SYNAPTICS ; +#endif +/* * Some Synaptics touchpads can emulate extended protocols (like IMPS/2). * Unfortunately Logitech/Genius probes confuse some firmware versions so
@@ -702,6 +705,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { .maxproto = 1, .detect = im_explorer_detect, }, +#ifdef CONFIG_MOUSE_PS2_SYNAPTICS { .type = PSMOUSE_SYNAPTICS, .name = "SynPS/2",
@@ -709,6 +713,7 @@ static const struct psmouse_protocol psmouse_protocols[] = { .detect = synaptics_detect, .init = synaptics_init, }, +#endif #ifdef CONFIG_MOUSE_PS2_ALPS { .type = PSMOUSE_ALPS,
drivers/input/mouse/synaptics.c +22 -12
@@ -45,28 +45,30 @@****************************************************************************/ /* -* Send a command to the synpatics touchpad by special commands +* Set the synaptics touchpad mode byte by special commands */ -static int synaptics_send_cmd (struct psmouse *psmouse,unsigned char c,unsigned char *param) +static int synaptics_mode_cmd (struct psmouse *psmouse,unsigned char mode) { -if (psmouse_sliced_command (psmouse, c)) +unsigned char param[1 ]; + +if (psmouse_sliced_command (psmouse, mode))return -1 ; -if (ps2_command (&psmouse->ps2dev, param,PSMOUSE_CMD_GETINFO )) + param[0 ] =SYN_PS_SET_MODE2 ; +if (ps2_command (&psmouse->ps2dev, param,PSMOUSE_CMD_SETRATE ))return -1 ;return 0 ; } +#ifdef CONFIG_MOUSE_PS2_SYNAPTICS +/* -* Set the synaptics touchpad mode byte by special commands +* Send a command to the synpatics touchpad by special commands */ -static int synaptics_mode_cmd (struct psmouse *psmouse,unsigned char mode) +static int synaptics_send_cmd (struct psmouse *psmouse,unsigned char c,unsigned char *param) { -unsigned char param[1 ]; - -if (psmouse_sliced_command (psmouse, mode)) +if (psmouse_sliced_command (psmouse, c))return -1 ; - param[0 ] =SYN_PS_SET_MODE2 ; -if (ps2_command (&psmouse->ps2dev, param,PSMOUSE_CMD_SETRATE )) +if (ps2_command (&psmouse->ps2dev, param,PSMOUSE_CMD_GETINFO ))return -1 ;return 0 ; }
@@ -529,12 +531,16 @@ static void set_input_params(struct input_dev *dev, struct synaptics_data *priv)clear_bit (REL_Y , dev->relbit); } +#endif /* CONFIG_MOUSE_PS2_SYNAPTICS */ +void synaptics_reset (struct psmouse *psmouse) {/* reset touchpad back to relative mode, gestures enabled */ synaptics_mode_cmd (psmouse,0 ); } +#ifdef CONFIG_MOUSE_PS2_SYNAPTICS +static void synaptics_disconnect (struct psmouse *psmouse) {synaptics_reset (psmouse);
@@ -569,6 +575,8 @@ static int synaptics_reconnect(struct psmouse *psmouse) return 0; } +#endif /* CONFIG_MOUSE_PS2_SYNAPTICS */ +int synaptics_detect (struct psmouse *psmouse,int set_properties) {struct ps2dev *ps2dev = &psmouse->ps2dev;
@@ -593,6 +601,8 @@ int synaptics_detect(struct psmouse *psmouse, int set_properties)return 0 ; } +#ifdef CONFIG_MOUSE_PS2_SYNAPTICS +#if defined(__i386__)#include <linux/dmi.h> static struct dmi_system_id toshiba_dmi_table[] = {
@@ -679,4 +689,4 @@ int synaptics_init(struct psmouse *psmouse) return -1; } - +#endif /* CONFIG_MOUSE_PS2_SYNAPTICS */
Signature · 1 line
1.4.4.2