Module Name: src
Committed By: soren
Date: Sat Aug 3 16:06:08 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.642 -r1.643 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.643 -r1.644 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.642 src/sys/dev/usb/usbdevs.h:1.643
--- src/sys/dev/usb/usbdevs.h:1.642 Mon May 27 16:38:35 2013
+++ src/sys/dev/usb/usbdevs.h Sat Aug 3 16:06:08 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.642 2013/05/27 16:38:35 kiyohara Exp $ */
+/* $NetBSD: usbdevs.h,v 1.643 2013/08/03 16:06:08 soren Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.650 2013/05/27 16:32:58 kiyohara Exp
+ * NetBSD: usbdevs,v 1.651 2013/08/03 16:04:30 soren Exp
*/
/*
@@ -536,7 +536,7 @@
#define USB_VENDOR_QCOM 0x18e8 /* Qcom */
#define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */
#define USB_VENDOR_MEINBERG 0x1938 /* Meinberg Funkuhren */
-#define USB_VENDOR_QUALCOMMINC 0x19d2 /* Qualcomm, Incorporated */
+#define USB_VENDOR_ZTE 0x19d2 /* ZTE */
#define USB_VENDOR_QUANTA 0x1a32 /* Quanta */
#define USB_VENDOR_TERMINUS 0x1a40 /* Terminus Technology */
#define USB_VENDOR_WINCHIPHEAD2 0x1a86 /* QinHeng Electronics */
@@ -2585,10 +2585,6 @@
#define USB_PRODUCT_QUALCOMM_MSM_HSDPA 0x6613 /* HSDPA MSM */
#define USB_PRODUCT_QUALCOMM2_RWT_FCT 0x3100 /* RWT FCT-CDMA 2000 1xRTT modem */
#define USB_PRODUCT_QUALCOMM2_CDMA_MSM 0x3196 /* CDMA Technologies MSM modem */
-#define USB_PRODUCT_QUALCOMMINC_CDMA_MSM 0x0001 /* CDMA Technologies MSM modem */
-#define USB_PRODUCT_QUALCOMMINC_ZTE_MF626 0x0031 /* CDMA Technologies MSM modem */
-#define USB_PRODUCT_QUALCOMMINC_ZTE_STOR 0x2000 /* USB ZTE Storage */
-#define USB_PRODUCT_QUALCOMMINC_AC8700 0xfffe /* CDMA 1xEVDO USB modem */
/* Qualcomm Kyocera products */
#define USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K 0x17da /* Qualcomm Kyocera CDMA Technologies MSM */
@@ -2692,6 +2688,8 @@
#define USB_PRODUCT_ROLAND_FANTOMX 0x006d /* Fantom-X MIDI Synth. */
#define USB_PRODUCT_ROLAND_UA25 0x0074 /* EDIROL UA-25 */
#define USB_PRODUCT_ROLAND_UA101 0x007d /* EDIROL UA-101 */
+#define USB_PRODUCT_ROLAND_PC50A 0x008b /* EDIROL PC-50 (advanced) */
+#define USB_PRODUCT_ROLAND_PC50 0x008c /* EDIROL PC-50 */
#define USB_PRODUCT_ROLAND_UA101F 0x008d /* EDIROL UA-101 USB1 */
#define USB_PRODUCT_ROLAND_UA1EX 0x0096 /* EDIROL UA-1EX */
#define USB_PRODUCT_ROLAND_UM3 0x009A /* EDIROL UM-3 */
@@ -3307,6 +3305,16 @@
#define USB_PRODUCT_ZOOM_2986L 0x9700 /* 2986L Fax modem */
#define USB_PRODUCT_ZOOM_3095 0x3095 /* 3095 USB Fax modem */
+/* ZTE products */
+#define USB_PRODUCT_ZTE_MF622 0x0001 /* MF622 modem */
+#define USB_PRODUCT_ZTE_MF628 0x0015 /* MF628 modem */
+#define USB_PRODUCT_ZTE_MF626 0x0031 /* MF626 modem */
+#define USB_PRODUCT_ZTE_MF820D_INSTALLER 0x0166 /* MF820D CD */
+#define USB_PRODUCT_ZTE_MF820D 0x0167 /* MF820D modem */
+#define USB_PRODUCT_ZTE_INSTALLER 0x2000 /* UMTS CD */
+#define USB_PRODUCT_ZTE_MC2718 0xffe8 /* MC2718 modem */
+#define USB_PRODUCT_ZTE_AC8700 0xfffe /* CDMA 1xEVDO USB modem */
+
/* Zydas Technology Corporation products */
#define USB_PRODUCT_ZYDAS_ZD1201 0x1201 /* ZD1201 */
#define USB_PRODUCT_ZYDAS_ZD1211 0x1211 /* ZD1211 WLAN abg */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.643 src/sys/dev/usb/usbdevs_data.h:1.644
--- src/sys/dev/usb/usbdevs_data.h:1.643 Mon May 27 16:38:35 2013
+++ src/sys/dev/usb/usbdevs_data.h Sat Aug 3 16:06:08 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.643 2013/05/27 16:38:35 kiyohara Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.644 2013/08/03 16:06:08 soren Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.650 2013/05/27 16:32:58 kiyohara Exp
+ * NetBSD: usbdevs,v 1.651 2013/08/03 16:04:30 soren Exp
*/
/*
@@ -1923,8 +1923,8 @@ const struct usb_vendor usb_vendors[] =
"Meinberg Funkuhren",
},
{
- USB_VENDOR_QUALCOMMINC,
- "Qualcomm, Incorporated",
+ USB_VENDOR_ZTE,
+ "ZTE",
},
{
USB_VENDOR_QUANTA,
@@ -7883,22 +7883,6 @@ const struct usb_product usb_products[]
"CDMA Technologies MSM modem",
},
{
- USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM,
- "CDMA Technologies MSM modem",
- },
- {
- USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_MF626,
- "CDMA Technologies MSM modem",
- },
- {
- USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_ZTE_STOR,
- "USB ZTE Storage",
- },
- {
- USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_AC8700,
- "CDMA 1xEVDO USB modem",
- },
- {
USB_VENDOR_QUALCOMM_K, USB_PRODUCT_QUALCOMM_K_CDMA_MSM_K,
"Qualcomm Kyocera CDMA Technologies MSM",
},
@@ -8223,6 +8207,14 @@ const struct usb_product usb_products[]
"EDIROL UA-101",
},
{
+ USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_PC50A,
+ "EDIROL PC-50 (advanced)",
+ },
+ {
+ USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_PC50,
+ "EDIROL PC-50",
+ },
+ {
USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA101F,
"EDIROL UA-101 USB1",
},
@@ -9879,6 +9871,38 @@ const struct usb_product usb_products[]
"3095 USB Fax modem",
},
{
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF622,
+ "MF622 modem",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF628,
+ "MF628 modem",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF626,
+ "MF626 modem",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF820D_INSTALLER,
+ "MF820D CD",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF820D,
+ "MF820D modem",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_INSTALLER,
+ "UMTS CD",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MC2718,
+ "MC2718 modem",
+ },
+ {
+ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_AC8700,
+ "CDMA 1xEVDO USB modem",
+ },
+ {
USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1201,
"ZD1201",
},
@@ -9979,4 +10003,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1960;
+const int usb_nproducts = 1966;
