usb: Update to FreeBSD trunk 2016-08-23

FreeBSD trunk, 2016-08-23, 9fe7c416e6abb28b1398fd3e5687099846800cfd.

2 files changed, 82 insertions, 2 deletions

diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs.h b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
index cee4d28f..ccee2efd 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs.h
@@ -141,7 +141,7 @@
 #define	USB_VENDOR_LOGITECH	0x046d		/* Logitech */
 #define	USB_VENDOR_BTC	0x046e		/* Behavior Tech. Computer */
 #define	USB_VENDOR_PHILIPS	0x0471		/* Philips */
-#define	USB_VENDOR_SUN2	0x0472		/* Sun Microsystems (offical) */
+#define	USB_VENDOR_SUN2	0x0472		/* Sun Microsystems (official) */
 #define	USB_VENDOR_SANYO	0x0474		/* Sanyo Electric */
 #define	USB_VENDOR_SEAGATE	0x0477		/* Seagate */
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
@@ -842,6 +842,7 @@
 #define	USB_PRODUCT_ABOCOM_RTL8188CU_1	0x8188		/* RTL8188CU */
 #define	USB_PRODUCT_ABOCOM_RTL8188CU_2	0x8189		/* RTL8188CU */
 #define	USB_PRODUCT_ABOCOM_RTL8192CU	0x8178		/* RTL8192CU */
+#define	USB_PRODUCT_ABOCOM_RTL8188EU	0x8179		/* RTL8188EU */
 #define	USB_PRODUCT_ABOCOM_WUG2700	0xb21f		/* WUG2700 */
 
 /* Acton Research Corp. */
@@ -1138,6 +1139,10 @@
 #define	USB_PRODUCT_APPLE_WELLSPRING8_ANSI	0x0290		/* Apple Internal Keyboard/Trackpad */
 #define	USB_PRODUCT_APPLE_WELLSPRING8_ISO	0x0291		/* Apple Internal Keyboard/Trackpad */
 #define	USB_PRODUCT_APPLE_WELLSPRING8_JIS	0x0292		/* Apple Internal Keyboard/Trackpad */
+/* MacbookPro12,1 */
+#define	USB_PRODUCT_APPLE_WELLSPRING9_ANSI	0x0272		/* Apple Internal Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING9_ISO	0x0273		/* Apple Internal Keyboard/Trackpad */
+#define	USB_PRODUCT_APPLE_WELLSPRING9_JIS	0x0274		/* Apple Internal Keyboard/Trackpad */
 #define	USB_PRODUCT_APPLE_MOUSE	0x0301		/* Mouse M4848 */
 #define	USB_PRODUCT_APPLE_OPTMOUSE	0x0302		/* Optical mouse */
 #define	USB_PRODUCT_APPLE_MIGHTYMOUSE	0x0304		/* Mighty Mouse */
@@ -1512,6 +1517,7 @@
 /* Corsair products */
 #define	USB_PRODUCT_CORSAIR_K60	0x0a60		/* Corsair Vengeance K60 keyboard */
 #define	USB_PRODUCT_CORSAIR_K70	0x1b09		/* Corsair Vengeance K70 keyboard */
+#define	USB_PRODUCT_CORSAIR_STRAFE	0x1b15		/* Cossair STRAFE Gaming keyboard */
 
 /* Creative products */
 #define	USB_PRODUCT_CREATIVE_NOMAD_II	0x1002		/* Nomad II MP3 player */
@@ -1702,6 +1708,7 @@
 #define	USB_PRODUCT_DISPLAYLINK_LT1421	0x03e0		/* Lenovo ThinkVision LT1421 */
 #define	USB_PRODUCT_DISPLAYLINK_POLARIS2	0x0117		/* Polaris2 USB dock */
 #define	USB_PRODUCT_DISPLAYLINK_PLUGABLE	0x0377		/* Plugable docking station */
+#define	USB_PRODUCT_DISPLAYLINK_ITEC	0x02e9		/* i-tec USB 2.0 Docking Station */
 
 /* DMI products */
 #define	USB_PRODUCT_DMI_CFSM_RW	0xa109		/* CF/SM Reader/Writer */
@@ -2151,6 +2158,7 @@
 #define	USB_PRODUCT_FUJITSUSIEMENS_SCR	0x0009		/* Fujitsu-Siemens SCR USB Reader */
 
 /* Garmin products */
+#define	USB_PRODUCT_GARMIN_FORERUNNER230	0x086d		/* ForeRunner 230 */
 #define	USB_PRODUCT_GARMIN_IQUE_3600	0x0004		/* iQue 3600 */
 
 /* Gemalto products */
@@ -2269,6 +2277,9 @@
 #define	USB_PRODUCT_HITACHI_DVDCAM_DZ_MV100A	0x0004		/* DVD-CAM DZ-MV100A Camcorder */
 #define	USB_PRODUCT_HITACHI_DVDCAM_USB	0x001e		/* DVDCAM USB HS Interface */
 
+/* Holtek products */
+#define	USB_PRODUCT_HOLTEK_F85	0xa030		/* Holtek USB gaming keyboard */
+
 /* HP products */
 #define	USB_PRODUCT_HP_895C	0x0004		/* DeskJet 895C */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
@@ -2725,6 +2736,7 @@
 #define	USB_PRODUCT_LOGITECH_RK53	0xc501		/* Cordless mouse */
 #define	USB_PRODUCT_LOGITECH_RB6	0xc503		/* Cordless keyboard */
 #define	USB_PRODUCT_LOGITECH_MX700	0xc506		/* Cordless optical mouse */
+#define	USB_PRODUCT_LOGITECH_UNIFYING	0xc52b		/* Logitech Unifying Receiver */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO2	0xd001		/* QuickCam Pro */
 
 /* Logitec Corp. products */
@@ -3787,6 +3799,7 @@
 #define	USB_PRODUCT_REALTEK_RTL8188ETV	0x0179		/* RTL8188ETV */
 #define	USB_PRODUCT_REALTEK_RTL8188CTV	0x018a		/* RTL8188CTV */
 #define	USB_PRODUCT_REALTEK_USBKR100	0x8150		/* USBKR100 USB Ethernet */
+#define	USB_PRODUCT_REALTEK_RTL8152	0x8152		/* RTL8152 USB Ethernet */
 #define	USB_PRODUCT_REALTEK_RTL8153	0x8153		/* RTL8153 USB Ethernet */
 #define	USB_PRODUCT_REALTEK_RTL8188CE_0	0x8170		/* RTL8188CE */
 #define	USB_PRODUCT_REALTEK_RTL8171	0x8171		/* RTL8171 */
@@ -4205,6 +4218,7 @@
 #define	USB_PRODUCT_SITECOMEU_RTL8188CU_2	0x005c		/* RTL8188CU */
 #define	USB_PRODUCT_SITECOMEU_RTL8192CU	0x0061		/* RTL8192CU */
 #define	USB_PRODUCT_SITECOMEU_LN032	0x0072		/* LN-032 */
+#define	USB_PRODUCT_SITECOMEU_LN031	0x0056		/* LN-031 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
 #define	USB_PRODUCT_SITECOMEU_ZD1211B	0x9075		/* ZD1211B */
diff --git a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
index 945b06c5..d4712da6 100644
--- a/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
+++ b/rtemsbsd/include/rtems/bsd/local/usbdevs_data.h
@@ -304,6 +304,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RTL8192CU",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RTL8188EU,
+	    0,
+	    "AboCom Systems",
+	    "RTL8188EU",
+	},
+	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WUG2700,
 	    0,
 	    "AboCom Systems",
@@ -1396,6 +1402,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Apple Internal Keyboard/Trackpad",
 	},
 	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING9_ANSI,
+	    0,
+	    "Apple Computer",
+	    "Apple Internal Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING9_ISO,
+	    0,
+	    "Apple Computer",
+	    "Apple Internal Keyboard/Trackpad",
+	},
+	{
+	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_WELLSPRING9_JIS,
+	    0,
+	    "Apple Computer",
+	    "Apple Internal Keyboard/Trackpad",
+	},
+	{
 	    USB_VENDOR_APPLE, USB_PRODUCT_APPLE_MOUSE,
 	    0,
 	    "Apple Computer",
@@ -3118,6 +3142,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Corsair Vengeance K70 keyboard",
 	},
 	{
+	    USB_VENDOR_CORSAIR, USB_PRODUCT_CORSAIR_STRAFE,
+	    0,
+	    "Corsair",
+	    "Cossair STRAFE Gaming keyboard",
+	},
+	{
 	    USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II,
 	    0,
 	    "Creative Labs",
@@ -4006,6 +4036,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Plugable docking station",
 	},
 	{
+	    USB_VENDOR_DISPLAYLINK, USB_PRODUCT_DISPLAYLINK_ITEC,
+	    0,
+	    "DisplayLink",
+	    "i-tec USB 2.0 Docking Station",
+	},
+	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_CFSM_RW,
 	    0,
 	    "DMI",
@@ -6202,6 +6238,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Fujitsu-Siemens SCR USB Reader",
 	},
 	{
+	    USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_FORERUNNER230,
+	    0,
+	    "Garmin International",
+	    "ForeRunner 230",
+	},
+	{
 	    USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE_3600,
 	    0,
 	    "Garmin International",
@@ -6628,6 +6670,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DVDCAM USB HS Interface",
 	},
 	{
+	    USB_VENDOR_HOLTEK, USB_PRODUCT_HOLTEK_F85,
+	    0,
+	    "Holtek Semiconductor, Inc.",
+	    "Holtek USB gaming keyboard",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
 	    0,
 	    "Hewlett Packard",
@@ -8746,6 +8794,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Cordless optical mouse",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UNIFYING,
+	    0,
+	    "Logitech",
+	    "Logitech Unifying Receiver",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2,
 	    0,
 	    "Logitech",
@@ -13942,6 +13996,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USBKR100 USB Ethernet",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8152,
+	    0,
+	    "Realtek",
+	    "RTL8152 USB Ethernet",
+	},
+	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8153,
 	    0,
 	    "Realtek",
@@ -16060,6 +16120,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LN-032",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN031,
+	    0,
+	    "Sitecom Europe",
+	    "LN-031",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028,
 	    0,
 	    "Sitecom Europe",
@@ -18402,7 +18468,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_SUN2, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Sun Microsystems (offical)",
+	    "Sun Microsystems (official)",
 	    NULL,
 	},
 	{