CVS log for src/sys/dev/pckbport/synaptics.c

Up to [cvs.NetBSD.org] / src / sys / dev / pckbport

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

hw.synaptics.aux_mid_button_scroll translates vertical movements
of an aux device (like a trackpoint) into a scroll event when
the middle mouse button is pressed.

Make this work with either the middle mouse button of the main
device (buttonmask 0x02) or the middle mouse button of the aux
device (buttonmask 0x40).

Fixes PR 58435.

Pull up following revision(s) (requested by gutteridge in ticket #718):

	sys/dev/pckbport/synaptics.c: revision 1.83

Renamed border/boundary variables to better describe their use.

Fix edge default values, factor out percentage calculation for more
consistent
values. Use device_printf/DPRINTF to show errors instead of aprint
variants.

Print raw input for debugging.

Correct capability parsing. Old devices were probed with nonexistent
commands and then used undefined boundary values that made them
unusuable.

Fixes PR 57874.

Renamed border/boundary variables to better describe their use.
Fix edge default values, factor out percentage calculation for more consistent
values. Use device_printf/DPRINTF to show errors instead of aprint variants.
Print raw input for debugging.

Correct capability parsing. Old devices were probed with nonexistent
commands and then used undefined boundary values that made them unusuable.

Fixes PR 57874.

panic on an condition that shouldn't be possible.

appease GCC 12.

synaptics: Lower scale factor to give less sluggish mouse performance
on modern displays.

- synaptics_filter_policy no longer generates movements from stale data.
- button boundary is now computed consistently.
- multi finger operation now works for MULTI_FINGER and MULTI_FINGER_REPORT.

Fixes PR kern/56476 and probably kern/56998.

fix various typos in comments, documentation and messages.

Use the original right boundary when calculating the vertical scroll
region so the boundary does not creep left on each subsequent setting.
Thanks to Martin@ for the report.

Fix regression introduced when fixing PR kern/56613 and related tweaks

* A trackpad with external buttons needs to mask a number of lower bits
  of the X and Y coordinates IFF a button is down.  This was not being
  done so a button held down looked like an out of range packet and
  was therefore dropped.

* Now that trackpads are probed for their boundaries make the emulated
  button boundary settable by a percentage, also allow the right and
  bottom boundaries to be adjusted by a percentage to allow for
  horizontal and vertical scroll regions.

Fix for PR kern/56613

* For trackpads that report max and min coordinates, retrieve these and
  use them as the boundaries instead of the hard coded limits.
* Drop packets that are have x/y values that are outside the limits of
  the trackpad.  Some trackpads report a stream of low values in some
  situations that cause cursor jumping.

Pull up following revision(s) (requested by riastradh in ticket #1397):

	sys/dev/pckbport/synaptics.c: revision 1.71

synaptics(4): New sysctl knob for debug output.

Set hw.synaptics.debug=1 to re-enable it; the compile-time DIAGNOSTIC
option was inappropriate for this.

synaptics: Fix tracking of extended buttons.

- Ensure that packets are processed whenever any button change
  occurs, instead of just processing packets when there is movement
  or trackpad finger activity
- Only transfer the state of the "extended buttons" to the button
  masks when actual changes occur OR a button is being held down.

With this patch, my middle mouse button no longer gets "stuck down",
but proper press/release tracking and dragging behavior is preserved.

Thanks to blymn for pointers.

fix various typos in comments, log messages and documentation.

Significant update to the synaptics touchpad driver.

* Accumulate packets for primary, secondary, finger count packets
  before handing off to pms_synaptics_process_packet.  This means
  that both primary and, possibly, secondary finger locations will
  be processed at the same time.  Previously the processing each
  packet as it arrived.

* Fix the secondary finger position reporting, there was an off by
  one in the shifts when decoding which effectively halved the
  reported position.

* For a clickpad, make the emulated button region "dead" so that finger
  movements in this region are ignored.  This makes it easier to click
  a button without accidentally repositioning the cursor.  There is a
  sysctl variable "button_region_movement_enable" that will allow
  these finger movements to be reported if this is desirable.

* Reset the finger ballistics when the number of fingers changes.  This
  stops the annoying position jumps when a second finger touch is added
  to or removed from the touchpad.

* Add a level argument to the DPRINTF macro so one can choose their
  level of debug spam via the debug sysctl variable.

synaptics: use the new WSCONS_EVENT_(H|V)SCROLL event types
to implement two-finger scrolling. remove non-functional code for
detecting reported finger width.

Sync w/ HEAD.

sync with head

synaptics(4): New sysctl knob for debug output.

Set hw.synaptics.debug=1 to re-enable it; the compile-time DIAGNOSTIC
option was inappropriate for this.

Pull up following revision(s) (requested by nia in ticket #1100):

	sys/dev/pckbport/synaptics.c: revision 1.69
	sys/dev/pckbport/synaptics.c: revision 1.70
	share/man/man4/pms.4: revision 1.38

erect a signpost for weary travellers

synaptics: Emulate scrolling when the middle button is held with TrackPoints
idea stolen from various other operating systems.

this configurable with a sysctl in case somebody wants to hold the middle
button, e.g.  with old window managers that close menus when a button is
released.

synaptics: Emulate scrolling when the middle button is held with TrackPoints

idea stolen from various other operating systems.

this configurable with a sysctl in case somebody wants to hold the middle
button, e.g.  with old window managers that close menus when a button is
released.

erect a signpost for weary travellers

comment was likely true in 2007 but no longer reflects the reality of hw

Pull up following revision(s) (requested by nia in ticket #954):

	sys/dev/pckbport/synaptics.c: revision 1.67

synaptics: Don't reset the device multiple times in succession
Cherrypicked from a patch from an anonymous contributor.

synaptics: Don't reset the device multiple times in succession

Cherrypicked from a patch from an anonymous contributor.

Pull up following revision(s) (requested by jmcneill in ticket #865):

	sys/dev/pckbport/synaptics.c: revision 1.66

pms_synaptics_enable: no need to send PMS_DEV_ENABLE here because
pms_enable does this for us. Seems to resolve issues with my trackpoint
not working immediately after starting X on ThinkPad X260.

pms_synaptics_enable: no need to send PMS_DEV_ENABLE here because
pms_enable does this for us. Seems to resolve issues with my trackpoint
not working immediately after starting X on ThinkPad X260.

Pull up following revision(s) (requested by jmcneill in ticket #863):

	sys/dev/pckbport/synaptics.c: revision 1.65
	sys/dev/pckbport/synapticsvar.h: revision 1.10

Extended buttons are reported separate from touchpad buttons, so track
button press / release state separate from touch events.

Extended buttons are reported separate from touchpad buttons, so track
button press / release state separate from touch events.

Mostly merge changes from HEAD upto 20200411

Pull up following revision(s) (requested by nia in ticket #818):

	sys/dev/pckbport/synaptics.c: revision 1.64

synaptics: Maintain the left/right buttons when up/down are remapped
Reported on current-users by Mandacarú Cascavel

synaptics: Maintain the left/right buttons when up/down are remapped

Reported on current-users by Mandacarú Cascavel

Pull up following revision(s) (requested by nia in ticket #810):

	sys/dev/pckbport/synaptics.c: revision 1.57
	sys/dev/pckbport/synaptics.c: revision 1.58

synaptics: Allow the max_speed sysctls to be set
synaptics: fix syntax

Pull up following revision(s) (requested by nia in ticket #809):

	sys/dev/pckbport/synaptics.c: revision 1.55
	sys/dev/pckbport/synaptics.c: revision 1.56
	share/man/man4/pms.4: revision 1.35
	share/man/man4/pms.4: revision 1.36

synaptics: Make up_down_emulation useful for single-button clickpads

On devices such as the Thinkpad X250, the clickpad can be pressed
to generate mouse button events 1 and 2. There are also additional
physical buttons which the pms(4) driver recognizes as "up/down" buttons
(mouse buttons 3 and 4). Allow these to be remapped to buttons 1 and 2
and used like normal touchpad buttons with the following sysctl:

While here, adjust the existing "middle button emulation"
(hw.synaptics.up_down_emulation=1) so it works with single-button
clickpads.

XXX: 3 may be a more useful default than the current default,
depending on hardware availability of touchpads with "up/down buttons".

Update the documentation accordingly.

synaptics: Set up_down_emulation=3 by default.

It's a less surprising default for modern hardware.

synaptics: Revert changes that broke gestures in cases where they worked.

It seems I have to figure out another way to make scrolling work for me.

synaptics: Increase default scale_z for more precise scrolling

synaptics: Check for single-finger event jitter in all cases.

I now have smooth two-finger scrolling.

synaptics: Detect multiple fingers outside the gesture period

I suspect this code doesn't make any sense if we want two-finger scrolling

synaptics: Automatically scroll when multiple fingers are detected

This will mean we automatically get two-finger scrolling on multitouch
pads.

This works, but the scrolling is janky. Why does it eventually move the
mouse cursor (only one finger detected, but two are still there), and why
does it jump up slightly?

synaptics: fix syntax

synaptics: Allow the max_speed sysctls to be set

synaptics: Set up_down_emulation=3 by default.

It's a less surprising default for modern hardware.

synaptics: Make up_down_emulation useful for single-button clickpads

On devices such as the Thinkpad X250, the clickpad can be pressed
to generate mouse button events 1 and 2. There are also additional
physical buttons which the pms(4) driver recognizes as "up/down" buttons
(mouse buttons 3 and 4). Allow these to be remapped to buttons 1 and 2
and used like normal touchpad buttons with the following sysctl:

# sysctl -w hw.synaptics.up_down_emulation=3

While here, adjust the existing "middle button emulation"
(hw.synaptics.up_down_emulation=1) so it works with single-button
clickpads.

XXX: 3 may be a more useful default than the current default,
depending on hardware availability of touchpads with "up/down buttons".

Update the documentation accordingly.

Sync with head.

Messages in pms_synaptics_input() should not start with "pms_input"

Use "pms_synaptics_input" instead for another 2 messages.

Messages in pms_synaptics_input() should not start with "pms_input"

Use "pms_synaptics_input" instead.

Do not enter extended W mode conditional for non extended W mode device

Even without extended W mode, sp_w can be 2. This causes
"invalid extended w mode N" warning messages.
Restrict extended W mode conditional for hardwares with extended W
support.

Tested with Synaptics 6.2 device on Panasonic CF-Y8, however it does
not work with X.

Remove a trailing tab.

Resynchronizing the input stream could infinitely wait when the touchpad
is in the wrong (relative) mode. The detection of relative mode is never
reached.

Limit the resynchronization to 6 bytes, then trigger a reset.

Sync with HEAD

Changes based on code from an anonymous contributor.  This should make
trackpads work for Thinkpads.  Also adds code to handle externally
connected buttons (synaptics parlance), the first five are mapped to
mouse buttons 1-5.  The rest are currently not reported but could be
decoded if required.

Modify driver to use bits(3) to extract capabilities.  Thanks to
Anon Ymous for the fix.

Fix minor comment nit.

Sync with HEAD, resolve a few conflicts

* Increase the default scaling of the two finger scroll to make it
  less sensitive
* Fix range check for hw.synaptics.scale_z so it can be set with sysctl

* Increase minimum finger width to prevent entering scroll mode erroneously
* Attempt to clarify what the sysctl variables for finger scroll do
* Add hysteresis to validity check so changing it does not get rejected

Thanks to Martin Husemann and Michael van Elst for reporting the issues.

Sync with HEAD, resolve a couple of conflicts

Add double finger scroll feature.  If the detected width is between a
defined range then report y movement as z-axis.  Effectively emulating
a mouse scroll wheel.

Fix clamping of deltas so it works for both positive and negative deltas.

Sync with HEAD

Send the 'magic reverse engineered sequence' with a single sliced command,
don't wait for individual ACKs. Fixes kern/53444.

While here:
- use better descriptive names for functions
- use a function for the extended write command
- add macro for number from the old synaptics documentation
- don't get the resp from the command sequence if we're going to ignore
it anyway

most from uwe.

Sync with HEAD

restore \n printing.

use a more data-driven :-) approach to avoid cut-n-pasted code.

Enable Synaptics multifinger capability (Extended W mode)

Magic parameters are taken from
  https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller/.
Tested on HP ProBook 4630s, Lenovo E530, VAIO Pro 11 and HP Spectre x360 ae.

Remove double and trailing whitespaces

Remove trailing tab

Add hw.synaptics.movement_enable sysctl. Default value is 1, but if set
to 0 disables movement events from the touchpad.

While here, fixup a few sysctl nodenum comparisons in
pms_sysctl_synaptics_verify to compare against node numbers instead of
values.

update from HEAD

Return res in non-synaptics case like before. Fix ALPS case

Add two finger support and middle/right button emulation.

Sync with HEAD

Pull up following revision(s) (requested by nonaka in ticket #629):
	sys/dev/pckbport/synaptics.c: revision 1.33
Fix clickpad button detection (From Rhialto)

Fix clickpad button detection (From Rhialto)

Rebase to HEAD as of a few days ago.

Rebase.

PR/48831: Jörg Grundmann: Synaptics Touch pad (ClickPad) and
Klick-by-tap-gestures do not work

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

sync with head

Ensure that the top level sysctl nodes (kern, vfs, net, ...) exist before
the sysctl link sets are processed, and remove redundancy.

Shaves >13kB off of an amd64 GENERIC, not to mention >1k duplicate
lines of code.

Remove a couple of (void *) casts added in the previous commin.
They aren't needed here (script error).

Add some pre-processor magic to verify that the type of the data item
  passed to sysctl_createv() actually matches the declared type for
  the item itself.
In the places where the caller specifies a function and a structure
  address (typically the 'softc') an explicit (void *) cast is now needed.
Fixes bugs in sys/dev/acpi/asus_acpi.c sys/dev/bluetooth/bcsp.c
  sys/kern/vfs_bio.c sys/miscfs/syncfs/sync_subr.c and setting
  AcpiGbl_EnableAmlDebugObject.
(mostly passing the address of a uint64_t when typed as CTLTYPE_INT).
I've test built quite a few kernels, but there may be some unfixed MD
  fallout. Most likely passing &char[] to char *.
Also add CTLFLAG_UNSIGNED for unsiged decimals - not set yet.

Correct and improve some comments.  Collect unused variables.  Add a define.

Replace pms_synaptics_send_command() and identical pms_elantech_send_command()
with pms_sliced_command().  Linux shows that this sequence can also be used by
"Logitech PS/2++" protocol as well.

Sync with HEAD.

sync with head

Sync with HEAD

use aprint_debug_dev and get rid of SYNAPTICSDEBUG

Pull up following revision(s) (requested by plunky in ticket #1383):
	sys/dev/pckbport/synapticsreg.h: revision 1.6
	sys/dev/pckbport/synaptics.c: revision 1.22
	sys/dev/pckbport/synaptics.c: revision 1.23
	sys/dev/pckbport/synaptics.c: revision 1.24
some definitions from the Linux driver (via PR kern/42853)
Extended capability probes can confuse the passthrough device,
reset the touchpad on enable to cure that.
send the SET_SCALE11 command before the 'sliced' command as per the
Linux driver (and elantech(4)), via PR kern/42853

wakeup needs sys/proc.h.

sync with head.

sync with head

Sync with HEAD.

send the SET_SCALE11 command before the 'sliced' command as per the
Linux driver (and elantech(4)), via PR kern/42853

Extended capability probes can confuse the passthrough device,
reset the touchpad on enable to cure that.

some definitions from the Linux driver (via PR kern/42853)

Sync with HEAD.

sync with head.

sync with head.

Make various bits of debug code compile again.

Sync with HEAD.

sync with head.

sync with HEAD

sync with head.

Split device_t and softc for pckbd(4) and pms(4).

Sync with HEAD.

sync with head.

Change synaptics 'unusual delay' printf to aprint_debug. I'm tired of
seeing it over and over again.

De-noisify resume handler.

sync with head

sync with HEAD

Sync with head.

Sync with HEAD

sync with head.

use __KERNEL_RCSID()

sync with HEAD

sync with head.

Sync with HEAD.

Follow the merge of pmap.c on i386 and amd64 and move
pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup
code to restore CR4 before jumping back into kernel space as the large
page option might cover that.

Sync with HEAD.

Sync with head.

machine/{bus,cpu,intr}.h -> sys/{bus,cpu,intr}.h

sync with head.

Sync with head.

sync with head.

Sync with head.

Pull up following revision(s) (requested by mlelstv in ticket #550):
	sys/dev/pckbport/synaptics.c: revisions 1.14, 1.15
Handle events from passthrough devices like the Thinkpad
'Navistick'.
add missing W coordinate

Pullup to -current

add missing W coordinate

Handle events from passthrough devices like the Thinkpad 'Navistick'.

sync with head.

sync with head.

Sync with head.

__unused removal on arguments; approved by core.

Tidy away wsmouse_input() abstractions and update
documentation to include the W direction.

sync with head

- sprinkle __unused on function decls.
- fix a couple of unused bugs
- no more -Wno-unused for i386

sync with head

sync with head.

sync with head.

Sync with head.

merge FreeBSD timecounters from branch simonb-timecounters
- struct timeval time is gone
  time.tv_sec -> time_second
- struct timeval mono_time is gone
  mono_time.tv_sec -> time_uptime
- access to time via
	{get,}{micro,nano,bin}time()
	get* versions are fast but less precise
- support NTP nanokernel implementation (NTP API 4)
- further reading:
  Timecounter Paper: http://phk.freebsd.dk/pubs/timecounter.pdf
  NTP Nanokernel: http://www.eecis.udel.edu/~mills/ntp/html/kern.html

remove int s; (for spl level) as time counter conversion makes
that obsolete.

Adapt for timecounters: mostly use get*time() and use "time_second"
instead of "time.tv_sec".

Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.

merge ktrace-lwp.

Sync with HEAD. Here we go again...

sync with head.

s/SYNAPTICS_DEBUG/SYNAPTICSDEBUG/ to keep consistency.

Change the rest of the sysctl subsystem to use const consistently.
The __UNCONST macro is now used only where necessary and the RW macros
are gone.  Most of the changes here are consumers of the
sysctl_createv(9) interface that now takes a pair of const pointers
which used not to be.

sync with -current

sync with head.  xen and whitespace.  xen part is not finished.

Sync with HEAD.

Hi Perry!

nuke trailing whitespace

Sync with HEAD.

Address PR kern/28990 by making Synaptics Touchpad support contingent
on "options PMS_SYNAPTICS_TOUCHPAD" in the kernel config file. See
the PR for details on why this is necessary.

While here, defflag PMS_DISABLE_POWERHOOK.

Sync with HEAD.

file synaptics.c was added on branch ktrace-lwp on 2005-01-17 19:31:51 +0000

Major re-write of the recently-committed Synaptics Touchpad driver,
prompted by jittery and/or random movement during tap gestures, lack
of edge motion, and a general desire to make use of the extra features
available with the native protocol.

 - Ditch the kernel thread; it was overkill for the small amount of
   processing required to deal with touchpad events.

 - If we fail to probe a Synaptics touchpad, issue a RESET command
   to ensure that whatever device is out there is left in a sane
   state (thanks to Reinoud Zandijk for the hint).

 - Completely re-write gesture support.

 - Put the touchpad in 80 packets per second mode and count them so
   they can be used to time gesture durations (instead of using
   mono_time).

 - Enhance up/down button support with options to use them to emulate
   the middle button or Z-axis events (like a traditional wheel mouse).

 - Add 'edge motion'. If a drag gesture is in progress, and the reported
   finger position moves to the touchpad's border region, continue
   to report movement events at a fixed rate as if the finger carried
   on moving in the same direction. This restores some functionality
   usually provided by the touchpad's firmware in PS/2 mode.

 - Filter successive movement events to reduce jitter. When scaling
   movement events, fold the remainder into the next event to prevent
   loss of information during slow/small finger movements. Pointer
   movement is now much more refined.

 - Add support for touchpads which can report more than one finger on
   the pad simultaneously. Optionally use this feature for middle/right
   button emulation (i.e. tap two fingers to emulate middle button).
   This feature is disabled by default (for now) to avoid surprise
   pasting of clipboard text. ;-)

- cleanup some debugging stuff.
- don't create the sysctl nodes if we don't have a synaptics pad.

PR/28774: Kentaro A. Kurahone: Add synaptics touchpad driver