summaryrefslogtreecommitdiff
path: root/synaptics.c
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2003-06-15 12:30:15 +0200
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:00:58 +0200
commit6838991b9defc1fa46c494b79a2a3531e07ff1e6 (patch)
tree09178e731db30de1315833bea2f34e909d56f1c3 /synaptics.c
parent3a97613b2a86bda9969eee0772a236a4c6ac53c1 (diff)
Added "Protocol" option to activate the kernel input event
interface.
Diffstat (limited to 'synaptics.c')
-rw-r--r--synaptics.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/synaptics.c b/synaptics.c
index 3364b1e..60514f4 100644
--- a/synaptics.c
+++ b/synaptics.c
@@ -199,8 +199,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->repeat_timer = NULL;
priv->repeatButtons = 0;
- priv->proto = SYN_PROTO_PSAUX;
-
/* install shared memory or normal memory for parameter */
priv->shm_config = FALSE;
if(xf86SetBoolOption(local->options, "SHMConfig", FALSE))
@@ -226,6 +224,11 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
goto SetupProc_fail;
}
+ priv->proto = SYN_PROTO_PSAUX;
+ str_par = xf86FindOptionValue(local->options, "Protocol");
+ if (str_par && !strcmp(str_par, "event"))
+ priv->proto = SYN_PROTO_EVENT;
+
/* read the parameter */
priv->synpara->left_edge = xf86SetIntOption(local->options, "LeftEdge", 1900);
priv->synpara->right_edge = xf86SetIntOption(local->options, "RightEdge", 5400);