svn commit: r189659 - in stable/7: share/man/man4 sys/dev/usb

[Andrew Thompson]

Author: thompsa
Date: Wed Mar 11 01:03:32 2009
New Revision: 189659
URL: http://svn.freebsd.org/changeset/base/189659

Log:
  MFC r189360
  
   Add Mobile Action MA-620 Infrared Adapter.
  
  Manually merged due to different codebase.

Modified:
  stable/7/share/man/man4/uplcom.4
  stable/7/sys/dev/usb/uplcom.c
  stable/7/sys/dev/usb/usbdevs

Modified: stable/7/share/man/man4/uplcom.4
==============================================================================
--- stable/7/share/man/man4/uplcom.4	Wed Mar 11 00:58:22 2009	(r189658)
+++ stable/7/share/man/man4/uplcom.4	Wed Mar 11 01:03:32 2009	(r189659)
@@ -96,6 +96,8 @@ I/O DATA USB-RSAQ2
 .It
 I/O DATA USB-RSAQ3
 .It
+Mobile Action MA-620 Infrared Adapter
+.It
 PLANEX USB-RS232 URS-03
 .It
 RATOC REX-USB60

Modified: stable/7/sys/dev/usb/uplcom.c
==============================================================================
--- stable/7/sys/dev/usb/uplcom.c	Wed Mar 11 00:58:22 2009	(r189658)
+++ stable/7/sys/dev/usb/uplcom.c	Wed Mar 11 01:03:32 2009	(r189659)
@@ -272,6 +272,9 @@ static const struct uplcom_product {
 	{ USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_SERIAL, -1, TYPE_PL2303 },
 	/* Tripp-Lite U209-000-R */
 	{ USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209, -1, TYPE_PL2303X },
+	/* Mobile Action MA-620 Infrared Adapter */
+	{ USB_VENDOR_MOBILEACTION, USB_PRODUCT_MOBILEACTION_MA620, -1,
+	  TYPE_PL2303X },
 	{ 0, 0 }
 };
 

Modified: stable/7/sys/dev/usb/usbdevs
==============================================================================
--- stable/7/sys/dev/usb/usbdevs	Wed Mar 11 00:58:22 2009	(r189658)
+++ stable/7/sys/dev/usb/usbdevs	Wed Mar 11 01:03:32 2009	(r189659)
@@ -1716,6 +1716,9 @@ product MITSUMI CDRRW		0x0000	CD-R/RW Dr
 product MITSUMI BT_DONGLE	0x641f	Bluetooth USB dongle
 product MITSUMI FDD		0x6901	USB FDD
 
+/* Mobile Action products */
+product MOBILEACTION MA620	0x0620	MA-620 Infrared Adapter
+
 /* Mobility products */
 product MOBILITY EA		0x0204	Ethernet
 product MOBILITY EASIDOCK	0x0304	EasiDock Ethernet