On Thu, Jul 18, 2013 at 08:08:47PM +0100, Edd Barrett wrote: > Hi, > > I have been working with mpi@ and matthieu@ to improve support for my > x230t, in particular the digitiser/pen. Last week I committed a small > change to uhts(4) which enables basic support for the digitiser. > > During our discussions we noticed that uhts(4) is almost identical to > the code of ums(4). > > The following diff merges uhts(4) into ums(4). There should be no > functional change. Please can people test for mouse regressions and > provide feedback. If this is good, then uhts(4) can disappear and the > commented lines in ums_match() can be restored. > > I have CC'd people who may be interested. > > Thanks > > Index: share/man/man4/ums.4 > =================================================================== > RCS file: /cvs/src/share/man/man4/ums.4,v > retrieving revision 1.10 > diff -u -p -r1.10 ums.4 > --- share/man/man4/ums.4 26 Jun 2008 05:42:07 -0000 1.10 > +++ share/man/man4/ums.4 18 Jul 2013 17:13:33 -0000 > @@ -28,23 +28,30 @@ > .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > THE > .\" POSSIBILITY OF SUCH DAMAGE. > .\" > -.Dd $Mdocdate: June 26 2008 $ > +.Dd $Mdocdate: July 17 2013 $ > .Dt UMS 4 > .Os > .Sh NAME > .Nm ums > -.Nd USB mouse support > +.Nd USB HID mouse, touchscreen and digitiser support > .Sh SYNOPSIS > .Cd "ums* at uhidev?" > .Cd "wsmouse* at ums? mux 0" > .Sh DESCRIPTION > The > .Nm > -driver provides support for USB mice. > -Access to the mouse is through the > +driver provides support for USB HID mice, touchscreens and digitisers. > +Access to these devices is through the > .Xr wscons 4 > driver. > +.Pp > +If the touchscreen sensor is poorly aligned, then > +.Xr xtsscale 1 > +should be used to provide calibration results to the > +.Nm > +driver. > .Sh SEE ALSO > +.Xr xtsscale 1 , > .Xr uhidev 4 , > .Xr usb 4 , > .Xr wsmouse 4 > @@ -54,3 +61,16 @@ The > driver > first appeared in > .Ox 2.8 . > +.Sh AUTHORS > +.An -nosplit > +HID touchscreen and digitiser support was written by > +.An Robert Nagy > +and > +.An Matthieu Herrb > +then later merged into the generic > +.Xr ums 4 > +driver by > +.An Edd Barrett.
you want a space before the full stop (above) > +.Sh CAVEATS > +Touchscreen and digitiser pressure sensitivity is not yet implemented. > + and zap this blank line > Index: share/man/man4/usb.4 > =================================================================== > RCS file: /cvs/src/share/man/man4/usb.4,v > retrieving revision 1.140 > diff -u -p -r1.140 usb.4 > --- share/man/man4/usb.4 1 Jun 2013 17:04:57 -0000 1.140 > +++ share/man/man4/usb.4 18 Jul 2013 17:13:33 -0000 > @@ -252,7 +252,7 @@ HID touchscreen support > keyboards that follow the boot protocol > .It Xr ums 4 > .Tn USB > -mouse devices > +HID mouse, touchscreen and digitiser devices the Nd should match exactly, so either change "suuport" in the man page, or "devices" here > .It Xr uoaklux 4 > Toradex OAK USB illuminance sensor > .It Xr uoakrh 4 jmc
