Merge uhts(1) into ums(1). The code is amost the same, so no need to duplicate.

A part of ongoing work to improve touchscreen/digitiser support.

A diff will follow shortly to remove uhts(1).

OK matthieu@, with input from mpi@

2 files changed, 27 insertions, 8 deletions

diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 69d93620e5c..69953618abe 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ums.4,v 1.10 2008/06/26 05:42:07 ray Exp $
+.\" $OpenBSD: ums.4,v 1.11 2013/08/09 22:10:17 edd Exp $
 .\" $NetBSD: ums.4,v 1.7 2001/12/28 17:38:00 augustss Exp $
 .\"
 .\" Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -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: August 9 2013 $
 .Dt UMS 4
 .Os
 .Sh NAME
 .Nm ums
-.Nd USB mouse support
+.Nd USB HID mouse, touchscreen and digitiser devices
 .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,15 @@ 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 .
+.Sh CAVEATS
+Touchscreen and digitiser pressure sensitivity is not yet implemented.
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index f41eca221e9..9430f4b67ac 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.4,v 1.140 2013/06/01 17:04:57 jmc Exp $
+.\"	$OpenBSD: usb.4,v 1.141 2013/08/09 22:10:17 edd Exp $
 .\"	$NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 1 2013 $
+.Dd $Mdocdate: August 9 2013 $
 .Dt USB 4
 .Os
 .Sh NAME
@@ -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
 .It Xr uoaklux 4
 Toradex OAK USB illuminance sensor
 .It Xr uoakrh 4