diff options
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ubsa.c | 10 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 17 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 22 |
3 files changed, 27 insertions, 22 deletions
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 3662001bedd..60449399040 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.47 2009/10/13 19:33:17 pirofti Exp $ */ +/* $OpenBSD: ubsa.c,v 1.48 2010/02/22 23:35:10 mpf Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -215,10 +215,10 @@ const struct usb_devno ubsa_devs[] = { { USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232 }, /* Peracom */ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, - /* Qualcomm Inc. ZTE CMDMA MSM modem */ - { USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_CDMA_MSM }, - /* Qualcomm Inc. AC8700 */ - { USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_AC8700 }, + /* ZTE Inc. CMDMA MSM modem */ + { USB_VENDOR_ZTE, USB_PRODUCT_ZTE_CDMA_MSM }, + /* ZTE Inc. AC8700 */ + { USB_VENDOR_ZTE, USB_PRODUCT_ZTE_AC8700 }, }; #define ubsa_lookup(v, p) usb_lookup(ubsa_devs, v, p) diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 39097991d0c..93c174c8a6e 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.481 2010/02/20 11:45:40 jsg Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.482 2010/02/22 23:35:10 mpf Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.471 2010/02/20 11:44:56 jsg Exp + * OpenBSD: usbdevs,v 1.472 2010/02/22 23:32:59 mpf Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -539,7 +539,7 @@ #define USB_VENDOR_QCOM 0x18e8 /* Qcom */ #define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */ #define USB_VENDOR_MEINBERG 0x1938 /* Meinberg Funkuhren */ -#define USB_VENDOR_QUALCOMM3 0x19d2 /* Qualcomm Inc. */ +#define USB_VENDOR_ZTE 0x19d2 /* ZTE Inc. */ #define USB_VENDOR_QUANTA 0x1a32 /* Quanta */ #define USB_VENDOR_TERMINUS 0x1a40 /* Terminus Technology */ #define USB_VENDOR_WCH2 0x1a86 /* QinHeng Electronics */ @@ -2579,11 +2579,12 @@ /* Qualcomm(2) products */ #define USB_PRODUCT_QUALCOMM2_MSM_PHONE 0x6000 /* CDMA MSM phone */ -/* Qualcomm(3) / ZTE products */ -#define USB_PRODUCT_QUALCOMM3_CDMA_MSM 0x0001 /* CDMA Technologies MSM modem */ -#define USB_PRODUCT_QUALCOMM3_K3565Z 0x0063 /* ZTE K3565-Z USB MSM modem */ -#define USB_PRODUCT_QUALCOMM3_K3565Z_UMASS 0x2000 /* ZTE K3565-Z USB MSM (umass) */ -#define USB_PRODUCT_QUALCOMM3_AC8700 0xfffe /* AC8700 CDMA USB modem */ +/* ZTE products */ +#define USB_PRODUCT_ZTE_CDMA_MSM 0x0001 /* CDMA Technologies MSM modem */ +#define USB_PRODUCT_ZTE_MF637 0x0031 /* ZTE MF637 HSUPA USB modem */ +#define USB_PRODUCT_ZTE_K3565Z 0x0063 /* ZTE K3565-Z USB MSM modem */ +#define USB_PRODUCT_ZTE_UMASS 0x2000 /* ZTE USB MSM (umass mode) */ +#define USB_PRODUCT_ZTE_AC8700 0xfffe /* AC8700 CDMA USB modem */ /* Quanta products */ #define USB_PRODUCT_QUANTA_RT3070 0x0304 /* RT3070 */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 076322c4bf6..e8616bd8fd9 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.475 2010/02/20 11:45:40 jsg Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.476 2010/02/22 23:35:10 mpf Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.471 2010/02/20 11:44:56 jsg Exp + * OpenBSD: usbdevs,v 1.472 2010/02/22 23:32:59 mpf Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -5646,19 +5646,23 @@ const struct usb_known_product usb_known_products[] = { "CDMA MSM phone", }, { - USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_CDMA_MSM, + USB_VENDOR_ZTE, USB_PRODUCT_ZTE_CDMA_MSM, "CDMA Technologies MSM modem", }, { - USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_K3565Z, + USB_VENDOR_ZTE, USB_PRODUCT_ZTE_MF637, + "ZTE MF637 HSUPA USB modem", + }, + { + USB_VENDOR_ZTE, USB_PRODUCT_ZTE_K3565Z, "ZTE K3565-Z USB MSM modem", }, { - USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_K3565Z_UMASS, - "ZTE K3565-Z USB MSM (umass)", + USB_VENDOR_ZTE, USB_PRODUCT_ZTE_UMASS, + "ZTE USB MSM (umass mode)", }, { - USB_VENDOR_QUALCOMM3, USB_PRODUCT_QUALCOMM3_AC8700, + USB_VENDOR_ZTE, USB_PRODUCT_ZTE_AC8700, "AC8700 CDMA USB modem", }, { @@ -9626,8 +9630,8 @@ const struct usb_known_vendor usb_known_vendors[] = { "Meinberg Funkuhren", }, { - USB_VENDOR_QUALCOMM3, - "Qualcomm Inc.", + USB_VENDOR_ZTE, + "ZTE Inc.", }, { USB_VENDOR_QUANTA, |