svn commit: r223431 - in stable/8/sys/dev/usb: . serial

[Gavin Atkinson]

Author: gavin
Date: Wed Jun 22 18:18:05 2011
New Revision: 223431
URL: http://svn.freebsd.org/changeset/base/223431

Log:
  Merge r217202 from head:
    Add support for the Zeagle N2iTion3 Dive Computer to uplcom(4).
  
  Requested by:	hselasky

Modified:
  stable/8/sys/dev/usb/serial/uplcom.c
  stable/8/sys/dev/usb/usbdevs
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/usb/serial/uplcom.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uplcom.c	Wed Jun 22 18:02:28 2011	(r223430)
+++ stable/8/sys/dev/usb/serial/uplcom.c	Wed Jun 22 18:18:05 2011	(r223431)
@@ -257,6 +257,7 @@ static const struct usb_device_id uplcom
 	UPLCOM_DEV(BELKIN, F5U257),		/* Belkin F5U257 USB to Serial */
 	UPLCOM_DEV(COREGA, CGUSBRS232R),	/* Corega CG-USBRS232R */
 	UPLCOM_DEV(EPSON, CRESSI_EDY),		/* Cressi Edy diving computer */
+	UPLCOM_DEV(EPSON, N2ITION3),		/* Zeagle N2iTion3 diving computer */
 	UPLCOM_DEV(ELECOM, UCSGT),		/* ELECOM UC-SGT Serial Adapter */
 	UPLCOM_DEV(ELECOM, UCSGT0),		/* ELECOM UC-SGT Serial Adapter */
 	UPLCOM_DEV(HAL, IMR001),		/* HAL Corporation Crossam2+USB */

Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs	Wed Jun 22 18:02:28 2011	(r223430)
+++ stable/8/sys/dev/usb/usbdevs	Wed Jun 22 18:18:05 2011	(r223431)
@@ -1536,6 +1536,7 @@ product EPSON 2480		0x0121	Perfection 24
 product EPSON 3590		0x0122	Perfection 3590 scanner
 product EPSON 4990		0x012a	Perfection 4990 Photo scanner
 product EPSON CRESSI_EDY	0x0521	Cressi Edy diving computer
+product EPSON N2ITION3		0x0522	Zeagle N2iTion3 diving computer
 product EPSON STYLUS_875DC	0x0601	Stylus Photo 875DC Card Reader
 product EPSON STYLUS_895	0x0602	Stylus Photo 895 Card Reader
 product EPSON CX5400		0x0808	CX5400 scanner