Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src PR/45850: Pierre Pronchery: USB multi-touch panels are not s...
details: https://anonhg.NetBSD.org/src/rev/6ce445886a4a
branches: trunk
changeset: 772803:6ce445886a4a
user: christos <christos%NetBSD.org@localhost>
date: Tue Jan 17 03:49:19 2012 +0000
description:
PR/45850: Pierre Pronchery: USB multi-touch panels are not supported
diffstat:
lib/libusbhid/usb_hid_usages | 6 +-
share/man/man4/Makefile | 16 +-
share/man/man4/uts.4 | 64 ++++++
share/man/man4/wsmouse.4 | 5 +-
sys/arch/amd64/conf/GENERIC | 85 +++++---
sys/dev/usb/FILES | 1 +
sys/dev/usb/files.usb | 7 +-
sys/dev/usb/usbdevices.config | 6 +-
sys/dev/usb/usbhid.h | 4 +-
sys/dev/usb/uts.c | 387 ++++++++++++++++++++++++++++++++++++++++++
10 files changed, 533 insertions(+), 48 deletions(-)
diffs (truncated from 758 to 300 lines):
diff -r bd5c2624b8f2 -r 6ce445886a4a lib/libusbhid/usb_hid_usages
--- a/lib/libusbhid/usb_hid_usages Tue Jan 17 03:39:33 2012 +0000
+++ b/lib/libusbhid/usb_hid_usages Tue Jan 17 03:49:19 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: usb_hid_usages,v 1.4 2009/07/10 22:11:58 jakllsch Exp $
+# $NetBSD: usb_hid_usages,v 1.5 2012/01/17 03:49:20 christos Exp $
#
# USB HID usage table
# Syntax:
@@ -858,6 +858,10 @@
0x44 Barrel Switch
0x45 Eraser
0x46 Tablet Pick
+ 0x51 Contact ID
+ 0x53 Device Index
+ 0x54 Contact Count
+ 0x55 Contact Count Maximum
15 Physical Interface Device
diff -r bd5c2624b8f2 -r 6ce445886a4a share/man/man4/Makefile
--- a/share/man/man4/Makefile Tue Jan 17 03:39:33 2012 +0000
+++ b/share/man/man4/Makefile Tue Jan 17 03:49:19 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.577 2012/01/09 15:16:31 drochner Exp $
+# $NetBSD: Makefile,v 1.578 2012/01/17 03:49:19 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -70,14 +70,14 @@
zero.4 zstty.4 zyd.4
# USB devices
-MAN+= stuirda.4 u3g.4 uaudio.4 uberry.4 ubsa.4 ubt.4 uchcom.4 ucom.4 ucycom.4 \
- udsbr.4 uftdi.4 ugen.4 ugensa.4 uhid.4 \
+MAN+= atu.4 aue.4 axe.4 cdce.4 cue.4 ehci.4 kue.4 ohci.4 slhci.4 \
+ stuirda.4 u3g.4 uaudio.4 uberry.4 ubsa.4 ubt.4 uchcom.4 ucom.4 \
+ ucycom.4 udav.4 udsbr.4 uftdi.4 ugen.4 ugensa.4 uhci.4 uhid.4 \
uhidev.4 uhmodem.4 uhso.4 uipaq.4 uirda.4 ukbd.4 ukyopon.4 ulpt.4 \
- umass.4 umct.4 umidi.4 umodem.4 ums.4 uplcom.4 urio.4 usb.4 \
- uscanner.4 uslsa.4 usscanner.4 ustir.4 uvisor.4 uvscom.4 uyap.4 \
- aue.4 atu.4 axe.4 cdce.4 cue.4 kue.4 upgt.4 upl.4 url.4 udav.4 \
- ehci.4 ohci.4 slhci.4 uhci.4 uthum.4 utoppy.4 uvideo.4 uyurex.4 \
- urndis.4
+ umass.4 umct.4 umidi.4 umodem.4 ums.4 upgt.4 upl.4 uplcom.4 \
+ urio.4 url.4 urndis.4 usb.4 uscanner.4 uslsa.4 usscanner.4 \
+ ustir.4 uthum.4 utoppy.4 uts.4 uvideo.4 uvisor.4 uvscom.4 uyap.4 \
+ uyurex.4
# Ir devices
MAN+= irframe.4 cir.4 irframetty.4 oboe.4
diff -r bd5c2624b8f2 -r 6ce445886a4a share/man/man4/uts.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/uts.4 Tue Jan 17 03:49:19 2012 +0000
@@ -0,0 +1,64 @@
+.\" $NetBSD: uts.4,v 1.1 2012/01/17 03:49:19 christos Exp $
+.\"
+.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Pierre Pronchery.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd January 16, 2012
+.Dt UTS 4
+.Os
+.Sh NAME
+.Nm uts
+.Nd USB generic touchscreens
+.Sh SYNOPSIS
+.Cd "uts* at uhidev? reportid ?"
+.Cd "wsmouse* at uts?"
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for USB touchscreens, otherwise known as Touch
+Digitizer devices.
+Access to panel events is through the
+.Xr wsmouse 4
+driver.
+.Sh SEE ALSO
+.Xr uhidev 4 ,
+.Xr wsmouse 4
+.Sh HISTORY
+The
+.Nm
+driver was written by Pierre Pronchery for
+.Nx .
+The
+.Nm
+driver appeared in
+.Nx 6.0 .
+.Sh BUGS
+.Nm
+currently does not support calibration.
+Also, not all
+.Nx Ns -supplied
+X servers support the absolute position events it generates.
diff -r bd5c2624b8f2 -r 6ce445886a4a share/man/man4/wsmouse.4
--- a/share/man/man4/wsmouse.4 Tue Jan 17 03:39:33 2012 +0000
+++ b/share/man/man4/wsmouse.4 Tue Jan 17 03:49:19 2012 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsmouse.4,v 1.18 2009/03/09 19:24:28 joerg Exp $
+.\" $NetBSD: wsmouse.4,v 1.19 2012/01/17 03:49:19 christos Exp $
.\"
.\" Copyright (c) 1999
.\" Matthias Drochner. All rights reserved.
@@ -38,6 +38,8 @@
(PS/2 mouse, including ``IntelliMouse''-compatible wheel mice)
.Cd "wsmouse* at ums? mux 0"
(USB mouse)
+.Cd "wsmouse* at uts? mux 0"
+(USB touchscreen)
.Cd "wsmouse* at lms? mux 0"
(Logitech bus mouse, i386 only)
.Cd "wsmouse* at mms? mux 0"
@@ -124,6 +126,7 @@
.Xr pms 4 ,
.Xr uep 4 ,
.Xr ums 4 ,
+.Xr uts 4 ,
.Xr wscons 4 ,
.Xr wsmux 4 ,
.Xr moused 8 ,
diff -r bd5c2624b8f2 -r 6ce445886a4a sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Tue Jan 17 03:39:33 2012 +0000
+++ b/sys/arch/amd64/conf/GENERIC Tue Jan 17 03:49:19 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.345 2012/01/16 14:44:07 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.346 2012/01/17 03:49:19 christos Exp $
#
# GENERIC machine description file
#
@@ -22,10 +22,15 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.345 $"
+#ident "GENERIC-$Revision: 1.346 $"
maxusers 64 # estimated number of users
+# Common binary formats are statically compiled in by default.
+options EXEC_ELF32 # exec ELF 32-bits binaries
+#no options EXEC_ELF64 # exec ELF 64-bits binaries
+#no options EXEC_SCRIPT # exec #! scripts
+
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
@@ -67,6 +72,8 @@
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+#no options EXEC_ELF64 # exec ELF 64-bits binaries
+#no options EXEC_SCRIPT # exec #! scripts
options MODULAR # new style module(7) framework
options USERCONF # userconf(4) support
@@ -117,11 +124,10 @@
options COMPAT_43 # and 4.3BSD
#options COMPAT_386BSD_MBRPART # recognize old partition ID
-options COMPAT_OSSAUDIO
+#options COMPAT_OSSAUDIO
options COMPAT_NETBSD32
-options COMPAT_LINUX
-options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
-options EXEC_ELF32
+#options COMPAT_LINUX
+#options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
# Wedge support
@@ -135,22 +141,23 @@
file-system MFS # memory file system
file-system NFS # Network File System client
file-system TMPFS # Efficient memory file-system
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
-file-system PROCFS # /proc
-file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
-file-system CODA # Coda File System; also needs vcoda (below)
-file-system PTYFS # /dev/ptm support
+# File systems, built as module(7)s by default
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+#file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PROCFS # /proc
+#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
+#file-system CODA # Coda File System; also needs vcoda (below)
+#file-system PTYFS # /dev/ptm support
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
#file-system NILFS # experimental - NTT's NiLFS(2)
@@ -382,15 +389,19 @@
pcppi0 at isa?
sysbeep0 at pcppi?
-# DRI driver
-i915drm* at drm? # Intel i915, i945 DRM driver
-mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
-r128drm* at drm? # ATI Rage 128 DRM driver
-radeondrm* at drm? # ATI Radeon DRM driver
-savagedrm* at drm? # S3 Savage DRM driver
-sisdrm* at drm? # SiS DRM driver
-tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+# Legacy DRI driver
+#i915drm* at drm? # Intel i915, i945 DRM driver
+#mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
+#r128drm* at drm? # ATI Rage 128 DRM driver
+#radeondrm* at drm? # ATI Radeon DRM driver
+#savagedrm* at drm? # S3 Savage DRM driver
+#sisdrm* at drm? # SiS DRM driver
+#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+
+# New DRM/GEM driver ported from OpenBSD (Intel only)
+inteldrm* at drm?
+drmdev* at inteldrm?
# Cryptographic Devices
@@ -831,6 +842,10 @@
ums* at uhidev? reportid ?
wsmouse* at ums? mux 0
+# USB Touchscreens
+uts* at uhidev? reportid ?
+wsmouse* at uts? mux 0
+
# USB eGalax touch-panel
uep* at uhub? port ?
wsmouse* at uep? mux 0
@@ -1188,9 +1203,9 @@
pseudo-device agr # IEEE 802.3ad link aggregation
#
-# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+# accept filters, built as module(7)s by default
+#pseudo-device accf_data # "dataready" accept filter
+#pseudo-device accf_http # "httpready" accept filter
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
@@ -1206,7 +1221,7 @@
pseudo-device btuart # Bluetooth HCI UART (H4)
# a pseudo device needed for Coda # also needs CODA (above)
-pseudo-device vcoda 4 # coda minicache <-> venus comm.
+#pseudo-device vcoda 4 # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
diff -r bd5c2624b8f2 -r 6ce445886a4a sys/dev/usb/FILES
--- a/sys/dev/usb/FILES Tue Jan 17 03:39:33 2012 +0000
+++ b/sys/dev/usb/FILES Tue Jan 17 03:49:19 2012 +0000
Home |
Main Index |
Thread Index |
Old Index