Index: distrib/sets/lists/man/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v
retrieving revision 1.1185
diff -u -r1.1185 mi
--- distrib/sets/lists/man/mi 16 Jan 2010 15:34:23 -0000 1.1185
+++ distrib/sets/lists/man/mi 4 Feb 2010 21:35:01 -0000
@@ -1597,6 +1597,7 @@
./usr/share/man/cat4/uslsa.0 man-sys-catman .cat
./usr/share/man/cat4/usscanner.0 man-sys-catman .cat
./usr/share/man/cat4/ustir.0 man-sys-catman .cat
+./usr/share/man/cat4/uticom.0 man-sys-catman .cat
./usr/share/man/cat4/utoppy.0 man-sys-catman .cat
./usr/share/man/cat4/uvideo.0 man-sys-catman .cat
./usr/share/man/cat4/uvisor.0 man-sys-catman .cat
@@ -4155,6 +4156,7 @@
./usr/share/man/html4/uslsa.html man-sys-htmlman html
./usr/share/man/html4/usscanner.html man-sys-htmlman html
./usr/share/man/html4/ustir.html man-sys-htmlman html
+./usr/share/man/html4/uticom.html man-sys-htmlman html
./usr/share/man/html4/utoppy.html man-sys-htmlman html
./usr/share/man/html4/uvideo.html man-sys-htmlman html
./usr/share/man/html4/uvisor.html man-sys-htmlman html
@@ -6643,6 +6645,7 @@
./usr/share/man/man4/uslsa.4 man-sys-man .man
./usr/share/man/man4/usscanner.4 man-sys-man .man
./usr/share/man/man4/ustir.4 man-sys-man .man
+./usr/share/man/man4/uticom.4 man-sys-man .man
./usr/share/man/man4/utoppy.4 man-sys-man .man
./usr/share/man/man4/uvideo.4 man-sys-man .man
./usr/share/man/man4/uvisor.4 man-sys-man .man
Index: share/man/man4/Makefile
===================================================================
RCS file: /cvsroot/src/share/man/man4/Makefile,v
retrieving revision 1.501
diff -u -r1.501 Makefile
--- share/man/man4/Makefile 7 Jan 2010 09:23:54 -0000 1.501
+++ share/man/man4/Makefile 4 Feb 2010 21:37:16 -0000
@@ -70,8 +70,8 @@
udsbr.4 uftdi.4 ugen.4 ugensa.4 uhid.4 \
uhidev.4 uhmodem.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 upl.4 url.4 udav.4 \
+ uscanner.4 uslsa.4 usscanner.4 ustir.4 uticom.4 uvisor.4 uvscom.4 \
+ uyap.4 aue.4 atu.4 axe.4 cdce.4 cue.4 kue.4 upl.4 url.4 udav.4 \
ehci.4 ohci.4 slhci.4 uhci.4 utoppy.4 uvideo.4
# Ir devices
Index: share/man/man4/ucom.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/ucom.4,v
retrieving revision 1.21
diff -u -r1.21 ucom.4
--- share/man/man4/ucom.4 16 Dec 2009 01:42:41 -0000 1.21
+++ share/man/man4/ucom.4 4 Feb 2010 21:37:17 -0000
@@ -45,6 +45,7 @@
.Cd "ucom* at umodem?"
.Cd "ucom* at uplcom?"
.Cd "ucom* at uslsa?"
+.Cd "ucom* at uticom?"
.Cd "ucom* at uvisor? portno ?"
.Cd "ucom* at uvscom?"
.Sh DESCRIPTION
@@ -85,6 +86,7 @@
.Xr uplcom 4 ,
.Xr usb 4 ,
.Xr uslsa 4 ,
+.Xr uticom 4 ,
.Xr uvisor 4 ,
.Xr uvscom 4
.Sh HISTORY
Index: share/man/man4/usb.4
===================================================================
RCS file: /cvsroot/src/share/man/man4/usb.4,v
retrieving revision 1.91
diff -u -r1.91 usb.4
--- share/man/man4/usb.4 18 May 2009 00:07:47 -0000 1.91
+++ share/man/man4/usb.4 4 Feb 2010 21:37:22 -0000
@@ -181,6 +181,8 @@
Prolific PL-2303 USB serial adapter
.It Xr uslsa 4
Silicon Laboratories CP2101/CP2102 based USB serial adapter
+.It Xr uticom 4
+Texas Instruments TUSB3410 USB serial port controller
.It Xr uvisor 4
USB Handspring Visor
.It Xr uvscom 4
Index: sys/dev/DEVNAMES
===================================================================
RCS file: /cvsroot/src/sys/dev/DEVNAMES,v
retrieving revision 1.255
diff -u -r1.255 DEVNAMES
--- sys/dev/DEVNAMES 15 Jan 2010 20:57:13 -0000 1.255
+++ sys/dev/DEVNAMES 4 Feb 2010 21:37:47 -0000
@@ -1368,6 +1368,7 @@
usscanner MI
ustir MI
ut vax
+uticom MI
utoppy MI
uu vax
uvisor MI
Index: sys/dev/usb/files.usb
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/files.usb,v
retrieving revision 1.94
diff -u -r1.94 files.usb
--- sys/dev/usb/files.usb 7 Jan 2010 00:15:20 -0000 1.94
+++ sys/dev/usb/files.usb 4 Feb 2010 21:37:56 -0000
@@ -294,6 +294,11 @@
attach uchcom at usbdevif
file dev/usb/uchcom.c uchcom
+# Texas Instruments TUSB3410
+device uticom: ucombus, firmload
+attach uticom at usbdevif
+file dev/usb/uticom.c uticom
+
# Scanners
# Generic scanner support
device uscanner
Index: sys/dev/usb/usbdevs
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs,v
retrieving revision 1.541
diff -u -r1.541 usbdevs
--- sys/dev/usb/usbdevs 18 Jan 2010 20:54:22 -0000 1.541
+++ sys/dev/usb/usbdevs 4 Feb 2010 21:38:05 -0000
@@ -2319,6 +2319,7 @@
/* Texas Intel products */
product TI UTUSB41 0x1446 UT-USB41 hub
product TI TUSB2046 0x2046 TUSB2046 hub
+product TI TUSB3410 0x3410 TUSB3410 USB serial port controller
product TI NEXII 0x5409 Nex II Digital
/* Thrustmaster products */
Index: sys/dev/usb/usbdevs.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.536
diff -u -r1.536 usbdevs.h
--- sys/dev/usb/usbdevs.h 18 Jan 2010 20:55:37 -0000 1.536
+++ sys/dev/usb/usbdevs.h 4 Feb 2010 21:38:12 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.536 2010/01/18 20:55:37 martin Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -2326,6 +2326,7 @@
/* Texas Intel products */
#define USB_PRODUCT_TI_UTUSB41 0x1446 /* UT-USB41 hub */
#define USB_PRODUCT_TI_TUSB2046 0x2046 /* TUSB2046 hub */
+#define USB_PRODUCT_TI_TUSB3410 0x3410 /* TUSB3410 USB serial port controller */
#define USB_PRODUCT_TI_NEXII 0x5409 /* Nex II Digital */
/* Thrustmaster products */
Index: sys/dev/usb/usbdevs_data.h
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.537
diff -u -r1.537 usbdevs_data.h
--- sys/dev/usb/usbdevs_data.h 18 Jan 2010 20:55:37 -0000 1.537
+++ sys/dev/usb/usbdevs_data.h 4 Feb 2010 21:38:19 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.537 2010/01/18 20:55:37 martin Exp $ */
+/* $NetBSD$ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -6679,6 +6679,10 @@
"TUSB2046 hub",
},
{
+ USB_VENDOR_TI, USB_PRODUCT_TI_TUSB3410,
+ "TUSB3410 USB serial port controller",
+ },
+ {
USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
"Nex II Digital",
},
@@ -7047,4 +7051,4 @@
"Prestige",
},
};
-const int usb_nproducts = 1288;
+const int usb_nproducts = 1289;