svn commit: r223417 - in stable/8/sys/dev/usb: . net

[Hans Petter Selasky]

Author: hselasky
Date: Wed Jun 22 08:22:29 2011
New Revision: 223417
URL: http://svn.freebsd.org/changeset/base/223417

Log:
  MFC r218864 and r223288.
  Add new USB ID's.

Modified:
  stable/8/sys/dev/usb/net/if_udav.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/net/if_udav.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_udav.c	Wed Jun 22 08:20:01 2011	(r223416)
+++ stable/8/sys/dev/usb/net/if_udav.c	Wed Jun 22 08:22:29 2011	(r223417)
@@ -206,6 +206,11 @@ static const struct usb_device_id udav_d
 	{USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ST268, 0)},
 	/* Corega USB-TXC */
 	{USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC, 0)},
+	/* ShanTou AMD8515 USB NIC */
+	{USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ADM8515, 0)},
+	/* Kontron AG USB Ethernet */
+	{USB_VPI(USB_VENDOR_KONTRON, USB_PRODUCT_KONTRON_DM9601, 0)},
+	{USB_VPI(USB_VENDOR_KONTRON, USB_PRODUCT_KONTRON_JP1082, 0)},
 };
 
 static void

Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs	Wed Jun 22 08:20:01 2011	(r223416)
+++ stable/8/sys/dev/usb/usbdevs	Wed Jun 22 08:22:29 2011	(r223417)
@@ -551,6 +551,7 @@ vendor VTECH		0x0f88	VTech
 vendor FALCOM		0x0f94	Falcom Wireless Communications GmbH
 vendor RIM		0x0fca	Research In Motion
 vendor DYNASTREAM	0x0fcf	Dynastream Innovations
+vendor KONTRON		0x0fe6	Kontron AG
 vendor QUALCOMM		0x1004	Qualcomm
 vendor APACER		0x1005	Apacer
 vendor MOTOROLA4	0x100d	Motorola
@@ -2009,6 +2010,10 @@ product KODAK DC290		0x0112	Digital Scie
 product KODAK DC240		0x0120	Digital Science DC240
 product KODAK DC280		0x0130	Digital Science DC280
 
+/* Kontron AG products */
+product KONTRON DM9601		0x8101	USB Ethernet
+product KONTRON JP1082		0x9700	USB Ethernet
+
 /* Konica Corp. Products */
 product KONICA CAMERA		0x0720	Digital Color Camera
 
@@ -2858,6 +2863,7 @@ product SENAO RT3072_5		0x9801	RT3072
 /* ShanTou products */
 product SHANTOU ST268		0x0268	ST268
 product SHANTOU DM9601		0x9601	DM 9601
+product SHANTOU ADM8515		0x8515	ADM8515
 
 /* Shark products */
 product SHARK PA		0x0400	Pocket Adapter