svn commit: r250288 - in stable/9/sys/dev/usb: . serial

[Gavin Atkinson]

Author: gavin
Date: Sun May  5 19:53:53 2013
New Revision: 250288
URL: http://svnweb.freebsd.org/changeset/base/250288

Log:
  Merge r248175 from head:
    Add support for Optoelectronics USB barcode readers to uftdi(4).
    Add entries for other Optoelectronics devices to usbdevs.

Modified:
  stable/9/sys/dev/usb/serial/uftdi.c
  stable/9/sys/dev/usb/usbdevs
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/serial/uftdi.c
==============================================================================
--- stable/9/sys/dev/usb/serial/uftdi.c	Sun May  5 19:24:51 2013	(r250287)
+++ stable/9/sys/dev/usb/serial/uftdi.c	Sun May  5 19:53:53 2013	(r250288)
@@ -753,6 +753,8 @@ static const STRUCT_USB_HOST_ID uftdi_de
 	UFTDI_DEV(MOBILITY, USB_SERIAL, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(OLIMEX, ARM_USB_OCD, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
 	UFTDI_DEV(OLIMEX, ARM_USB_OCD_H, UFTDI_TYPE_AUTO | UFTDI_FLAG_JTAG),
+	UFTDI_DEV(OPTO, CRD7734, UFTDI_TYPE_AUTO),
+	UFTDI_DEV(OPTO, CRD7734_1, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(PAPOUCH, AD4USB, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(PAPOUCH, AP485, UFTDI_TYPE_AUTO),
 	UFTDI_DEV(PAPOUCH, AP485_2, UFTDI_TYPE_AUTO),

Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs	Sun May  5 19:24:51 2013	(r250287)
+++ stable/9/sys/dev/usb/usbdevs	Sun May  5 19:53:53 2013	(r250288)
@@ -323,6 +323,7 @@ vendor GUNZE		0x0637	Gunze Electronics U
 vendor AVISION		0x0638	Avision
 vendor TEAC		0x0644	TEAC
 vendor ACTON		0x0647	Acton Research Corp.
+vendor OPTO		0x065a	Optoelectronics Co., Ltd
 vendor SGI		0x065e	Silicon Graphics
 vendor SANWASUPPLY	0x0663	Sanwa Supply
 vendor MEGATEC		0x0665	Megatec
@@ -3140,6 +3141,13 @@ product OPTION ICON321		0xd031	Globetrot
 product OPTION ICON505		0xd055	Globetrotter iCON 505
 product OPTION ICON452		0x7901	Globetrotter iCON 452
 
+/* Optoelectronics Co., Ltd */
+product OPTO BARCODE		0x0001	Barcode Reader
+product OPTO OPTICONCODE	0x0009	Opticon Code Reader
+product OPTO BARCODE_1		0xa002	Barcode Reader
+product OPTO CRD7734		0xc000	USB Cradle CRD-7734-RU
+product OPTO CRD7734_1		0xc001	USB Cradle CRD-7734-RU
+
 /* OvisLink product */
 product OVISLINK RT3072		0x3072	RT3072