summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-11 09:53:17 +1000
committerPeter Hutterer <peter.hutterer@redhat.com>2008-11-11 10:28:11 +1000
commit72d9bca079f40a705de5059eeea260b289d77e84 (patch)
tree2445f445ab9510e51b3d4bf750ae68f6f6746a9b
parent471552a62e0e5ba2a274196aef62d984b83f30e6 (diff)
Remove ALPS special options treatment.
Don't overwrite options set earlier based on a strstr(name, "ALPS"). If anything, the driver should just autoscale to the correct settings anyway. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
-rw-r--r--src/eventcomm.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 620f2f3..c917c80 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -205,24 +205,6 @@ EventQueryHardware(LocalDevicePtr local, struct SynapticsHwInfo *synhw)
xf86Msg(X_PROBED, "%s touchpad found\n", local->name);
- /* awful */
- if (strstr(local->name, "ALPS")) {
- SynapticsSHM *pars = ((SynapticsPrivate *)local->private)->synpara;
- void *opts = local->options;
-
- pars->left_edge = xf86SetIntOption(opts, "LeftEdge", 120);
- pars->right_edge = xf86SetIntOption(opts, "RightEdge", 830);
- pars->top_edge = xf86SetIntOption(opts, "TopEdge", 120);
- pars->bottom_edge = xf86SetIntOption(opts, "BottomEdge", 650);
- pars->finger_low = xf86SetIntOption(opts, "FingerLow", 14);
- pars->finger_high = xf86SetIntOption(opts, "FingerHigh", 15);
- pars->tap_move = xf86SetIntOption(opts, "MaxTapMove", 110);
- pars->scroll_dist_vert = xf86SetIntOption(opts, "VertScrollDelta", 20);
- pars->scroll_dist_horiz = xf86SetIntOption(opts, "HorizScrollDelta", 20);
- pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.3);
- pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.75);
- }
-
return TRUE;
}